From 018096266aec1b6d4a852b46c2f0c1d691d6c1bb Mon Sep 17 00:00:00 2001
From: Mordred <ffxivsapphire@gmail.com>
Date: Fri, 19 Apr 2019 00:39:42 +0200
Subject: [PATCH 001/351] Detour crowd experiments

---
 src/world/Actor/BNpc.cpp           | 13 +++++-
 src/world/Actor/Chara.cpp          | 10 +++++
 src/world/Actor/Chara.h            |  6 +++
 src/world/CMakeLists.txt           |  3 +-
 src/world/Manager/TerritoryMgr.cpp | 10 ++---
 src/world/Navi/NaviProvider.cpp    | 70 ++++++++++++++++++++++++++++++
 src/world/Navi/NaviProvider.h      | 16 +++++++
 src/world/Territory/Zone.cpp       | 32 +++++++++++++-
 src/world/Territory/Zone.h         |  3 ++
 9 files changed, 155 insertions(+), 8 deletions(-)

diff --git a/src/world/Actor/BNpc.cpp b/src/world/Actor/BNpc.cpp
index 93f96f25..e41f08f1 100644
--- a/src/world/Actor/BNpc.cpp
+++ b/src/world/Actor/BNpc.cpp
@@ -283,8 +283,11 @@ bool Sapphire::Entity::BNpc::moveTo( const FFXIVARR_POSITION3& pos )
     }
   }
 
-
   step();
+  auto pos1 = pNaviProvider->getMovePos( *this );
+
+  Logger::debug( "{} {} {}", pos1.x, pos1.y, pos1.z );
+  setPos( pos1 );
   m_pCurrentZone->updateActorPosition( *this );
   return false;
 }
@@ -471,6 +474,14 @@ void Sapphire::Entity::BNpc::update( uint64_t tickCount )
 
     case BNpcState::Roaming:
     {
+      auto pNaviMgr = m_pFw->get< World::Manager::NaviMgr >();
+      auto pNaviProvider = pNaviMgr->getNaviProvider( m_pCurrentZone->getBgPath() );
+
+      if( !pNaviProvider )
+      {
+        pNaviProvider->setMoveTarget( *this, m_roamPos );
+      }
+
       if( moveTo( m_roamPos ) )
       {
         m_lastRoamTargetReached = Util::getTimeSeconds();
diff --git a/src/world/Actor/Chara.cpp b/src/world/Actor/Chara.cpp
index 7fcae496..3af406f6 100644
--- a/src/world/Actor/Chara.cpp
+++ b/src/world/Actor/Chara.cpp
@@ -702,3 +702,13 @@ void Sapphire::Entity::Chara::setDirectorId( uint32_t directorId )
 {
   m_directorId = directorId;
 }
+
+uint32_t Sapphire::Entity::Chara::getAgentId() const
+{
+  return m_agentId;
+}
+
+void Sapphire::Entity::Chara::setAgentId( uint32_t agentId )
+{
+  m_agentId = agentId;
+}
diff --git a/src/world/Actor/Chara.h b/src/world/Actor/Chara.h
index 0f219638..a6a95776 100644
--- a/src/world/Actor/Chara.h
+++ b/src/world/Actor/Chara.h
@@ -128,6 +128,9 @@ namespace Sapphire::Entity
     std::map< uint8_t, StatusEffect::StatusEffectPtr > m_statusEffectMap;
     FrameworkPtr m_pFw;
 
+    /*! Detour Crowd AgentId */
+    uint32_t m_agentId;
+
   public:
     Chara( Common::ObjKind type, FrameworkPtr pFw );
 
@@ -269,6 +272,9 @@ namespace Sapphire::Entity
     uint32_t getDirectorId() const;
     void setDirectorId( uint32_t directorId );
 
+    uint32_t getAgentId() const;
+    void setAgentId( uint32_t agentId );
+
   };
 
 }
diff --git a/src/world/CMakeLists.txt b/src/world/CMakeLists.txt
index 66756f1d..824e9ed8 100644
--- a/src/world/CMakeLists.txt
+++ b/src/world/CMakeLists.txt
@@ -33,7 +33,8 @@ set_target_properties( world
 target_link_libraries( world
                          PUBLIC
                            common 
-                            Detour)
+                            Detour
+                            DetourCrowd )
 target_include_directories( world
                               PUBLIC
                                 "${CMAKE_CURRENT_SOURCE_DIR}"
diff --git a/src/world/Manager/TerritoryMgr.cpp b/src/world/Manager/TerritoryMgr.cpp
index 0ad37bd1..87474f17 100644
--- a/src/world/Manager/TerritoryMgr.cpp
+++ b/src/world/Manager/TerritoryMgr.cpp
@@ -180,9 +180,12 @@ bool Sapphire::World::Manager::TerritoryMgr::createDefaultTerritories()
 
     uint32_t guid = getNextInstanceId();
 
-    auto pNaviMgr = framework()->get< Manager::NaviMgr >();
+    auto pZone = make_Zone( territoryTypeId, guid, territoryInfo->name, pPlaceName->name, framework() );
+    pZone->init();
+
     std::string bgPath = territoryInfo->bg;
-    bool hasNaviMesh = pNaviMgr->setupTerritory( bgPath );
+
+    bool hasNaviMesh = pZone->getNaviProvider() != nullptr;
 
     Logger::info( "{0}\t{1}\t{2}\t{3:<10}\t{4}\t{5}\t{6}",
                   territoryTypeId,
@@ -193,9 +196,6 @@ bool Sapphire::World::Manager::TerritoryMgr::createDefaultTerritories()
                   hasNaviMesh ? "NAVI" : "",
                   pPlaceName->name );
 
-    auto pZone = make_Zone( territoryTypeId, guid, territoryInfo->name, pPlaceName->name, framework() );
-    pZone->init();
-
     InstanceIdToZonePtrMap instanceMap;
     instanceMap[ guid ] = pZone;
     m_guIdToZonePtrMap[ guid ] = pZone;
diff --git a/src/world/Navi/NaviProvider.cpp b/src/world/Navi/NaviProvider.cpp
index 2ba88eeb..edcbabe3 100644
--- a/src/world/Navi/NaviProvider.cpp
+++ b/src/world/Navi/NaviProvider.cpp
@@ -4,6 +4,9 @@
 #include <Logging/Logger.h>
 #include <ServerMgr.h>
 
+#include "Actor/Actor.h"
+#include "Actor/Chara.h"
+
 #include <Manager/RNGMgr.h>
 
 #include "NaviProvider.h"
@@ -40,6 +43,11 @@ bool Sapphire::World::Navi::NaviProvider::init()
     if( !loadMesh( baseMesh.string() ) )
       return false;
 
+    m_pCrowd = std::make_unique< dtCrowd >();
+
+    if( !m_pCrowd->init( 1000, 10.f, m_naviMesh ) )
+      return false;
+
     initQuery();
 
     return true;
@@ -521,3 +529,65 @@ bool Sapphire::World::Navi::NaviProvider::loadMesh( const std::string& path )
 
   return true;
 }
+
+int32_t Sapphire::World::Navi::NaviProvider::addAgent( Entity::Chara& chara )
+{
+  dtCrowdAgentParams params;
+  std::memset( &params, 0, sizeof( params ) );
+  params.height = 7.f;
+  params.maxAcceleration = 8.f;
+  params.maxSpeed = 3.5f;
+  params.radius = 5.f;
+  params.collisionQueryRange = params.radius * 12.0f;
+  params.pathOptimizationRange = params.radius * 30.0f;
+
+  float position[] = { chara.getPos().x, chara.getPos().y, chara.getPos().z };
+  return m_pCrowd->addAgent( position, &params );
+}
+
+void Sapphire::World::Navi::NaviProvider::updateCrowd( float timeInSeconds )
+{
+  dtCrowdAgentDebugInfo info;
+  m_pCrowd->update( timeInSeconds, &info );
+}
+
+void Sapphire::World::Navi::NaviProvider::removeAgent( Sapphire::Entity::Chara& chara )
+{
+  m_pCrowd->removeAgent( chara.getAgentId() );
+}
+
+void Sapphire::World::Navi::NaviProvider::calcVel( float* vel, const float* pos, const float* tgt, const float speed )
+{
+  dtVsub( vel, tgt, pos );
+  vel[ 1 ] = 0.0;
+  dtVnormalize( vel );
+  dtVscale( vel, vel, speed );
+}
+
+void Sapphire::World::Navi::NaviProvider::setMoveTarget( Entity::Chara& chara,
+                                                         const Sapphire::Common::FFXIVARR_POSITION3& endPos )
+{
+  // Find nearest point on navmesh and set move request to that location.
+  dtNavMeshQuery* navquery = m_naviMeshQuery;
+
+  const dtQueryFilter* filter = m_pCrowd->getFilter( 0 );
+  const float* halfExtents = m_pCrowd->getQueryExtents();
+
+  float vel[ 3 ];
+  float p[ 3 ] = { chara.getPos().x, chara.getPos().y, chara.getPos().z };
+
+  const dtCrowdAgent* ag = m_pCrowd->getAgent( chara.getAgentId() );
+  if( ag && ag->active )
+  {
+    calcVel( vel, ag->npos, p, ag->params.maxSpeed );
+    m_pCrowd->requestMoveVelocity( chara.getAgentId(), vel );
+  }
+}
+
+Sapphire::Common::FFXIVARR_POSITION3 Sapphire::World::Navi::NaviProvider::getMovePos( Entity::Chara& chara )
+{
+  const dtCrowdAgent* ag = m_pCrowd->getAgent( chara.getAgentId() );
+  if( !ag )
+    return { 0.f, 0.f, 0.f };
+  return { ag->npos[ 0 ], ag->npos[ 1 ], ag->npos[ 2 ] };
+}
\ No newline at end of file
diff --git a/src/world/Navi/NaviProvider.h b/src/world/Navi/NaviProvider.h
index 8547849f..2ad60cf2 100644
--- a/src/world/Navi/NaviProvider.h
+++ b/src/world/Navi/NaviProvider.h
@@ -5,6 +5,7 @@
 #include "ForwardsZone.h"
 #include <recastnavigation/Detour/Include/DetourNavMesh.h>
 #include <recastnavigation/Detour/Include/DetourNavMeshQuery.h>
+#include <recastnavigation/DetourCrowd/Include/DetourCrowd.h>
 
 namespace Sapphire::World::Navi
 {
@@ -47,11 +48,24 @@ namespace Sapphire::World::Navi
 
     bool hasNaviMesh() const;
 
+    int32_t addAgent( Entity::Chara& chara );
+
+    void removeAgent( Entity::Chara& chara );
+
+    void updateCrowd( float timeInSeconds );
+
+    static void calcVel( float* vel, const float* pos, const float* tgt, const float speed );
+
+    void setMoveTarget( Entity::Chara& chara, const Common::FFXIVARR_POSITION3& endPos );
+
+    Common::FFXIVARR_POSITION3 getMovePos( Entity::Chara& chara );
+
   protected:
     std::string m_internalName;
 
     dtNavMesh* m_naviMesh;
     dtNavMeshQuery* m_naviMeshQuery;
+    std::unique_ptr< dtCrowd > m_pCrowd;
 
     float m_polyFindRange[ 3 ];
 
@@ -63,6 +77,8 @@ namespace Sapphire::World::Navi
 		                     const dtPolyRef* path, const int32_t pathSize, float* steerPos, uint8_t& steerPosFlag,
 			       	           dtPolyRef& steerPosRef, float* outPoints = 0, int32_t* outPointCount = 0 );
 
+
+
     FrameworkPtr m_pFw;
   };
 
diff --git a/src/world/Territory/Zone.cpp b/src/world/Territory/Zone.cpp
index cd314158..94c780cd 100644
--- a/src/world/Territory/Zone.cpp
+++ b/src/world/Territory/Zone.cpp
@@ -19,6 +19,7 @@
 #include "InstanceContent.h"
 #include "QuestBattle.h"
 #include "Manager/TerritoryMgr.h"
+#include "Navi/Naviprovider.h"
 
 #include "Session.h"
 #include "Actor/Chara.h"
@@ -41,7 +42,8 @@
 #include "Zone.h"
 #include "Framework.h"
 
-#include <Manager/RNGMgr.h>
+#include "Manager/RNGMgr.h"
+#include "Manager/NaviMgr.h"
 
 using namespace Sapphire::Common;
 using namespace Sapphire::Network::Packets;
@@ -129,6 +131,11 @@ bool Sapphire::Zone::init()
     // all good
   }
 
+  auto pNaviMgr = m_pFw->get< World::Manager::NaviMgr >();
+  pNaviMgr->setupTerritory( m_territoryTypeInfo->bg );
+
+  m_pNaviProvider = pNaviMgr->getNaviProvider( m_territoryTypeInfo->bg );
+
   return true;
 }
 
@@ -231,10 +238,16 @@ void Sapphire::Zone::pushActor( Entity::ActorPtr pActor )
     }
   }
 
+  int32_t agentId = -1;
+
   if( pActor->isPlayer() )
   {
     auto pPlayer = pActor->getAsPlayer();
 
+    if( m_pNaviProvider )
+      agentId = m_pNaviProvider->addAgent( *pPlayer );
+    pPlayer->setAgentId( agentId );
+
     auto pServerZone = m_pFw->get< World::ServerMgr >();
     m_playerMap[ pPlayer->getId() ] = pPlayer;
     updateCellActivity( cx, cy, 2 );
@@ -243,6 +256,10 @@ void Sapphire::Zone::pushActor( Entity::ActorPtr pActor )
   {
     auto pBNpc = pActor->getAsBNpc();
 
+    if( m_pNaviProvider )
+      agentId = m_pNaviProvider->addAgent( *pBNpc );
+    pBNpc->setAgentId( agentId );
+
     m_bNpcMap[ pBNpc->getId() ] = pBNpc;
     updateCellActivity( cx, cy, 2 );
 
@@ -263,6 +280,9 @@ void Sapphire::Zone::removeActor( Entity::ActorPtr pActor )
   if( pActor->isPlayer() )
   {
 
+    if( m_pNaviProvider )
+      m_pNaviProvider->removeAgent( *pActor->getAsChara() );
+
     // If it's a player and he's inside boundaries - update his nearby cells
     if( pActor->getPos().x <= _maxX && pActor->getPos().x >= _minX &&
         pActor->getPos().z <= _maxY && pActor->getPos().z >= _minY )
@@ -278,6 +298,8 @@ void Sapphire::Zone::removeActor( Entity::ActorPtr pActor )
   }
   else if( pActor->isBattleNpc() )
   {
+    if( m_pNaviProvider )
+      m_pNaviProvider->removeAgent( *pActor->getAsChara() );
     m_bNpcMap.erase( pActor->getId() );
   }
 
@@ -451,6 +473,9 @@ bool Sapphire::Zone::update( uint64_t tickCount )
   //TODO: this should be moved to a updateWeather call and pulled out of updateSessions
   bool changedWeather = checkWeather();
 
+  if( m_pNaviProvider )
+    m_pNaviProvider->updateCrowd( 0.001f * tickCount  );
+
   updateSessions( tickCount, changedWeather );
   onUpdate( tickCount );
 
@@ -983,3 +1008,8 @@ Sapphire::Entity::BNpcPtr Sapphire::Zone::getActiveBNpcByLevelId( uint32_t level
   }
   return nullptr;
 }
+
+std::shared_ptr< Sapphire::World::Navi::NaviProvider > Sapphire::Zone::getNaviProvider()
+{
+  return m_pNaviProvider;
+}
diff --git a/src/world/Territory/Zone.h b/src/world/Territory/Zone.h
index 3f871f7c..217f0230 100644
--- a/src/world/Territory/Zone.h
+++ b/src/world/Territory/Zone.h
@@ -63,6 +63,7 @@ namespace Sapphire
     std::vector< Entity::SpawnGroup > m_spawnGroups;
 
     uint32_t m_effectCounter;
+    std::shared_ptr< World::Navi::NaviProvider > m_pNaviProvider;
 
   public:
     Zone();
@@ -171,6 +172,8 @@ namespace Sapphire
     void updateSpawnPoints();
 
     uint32_t getNextEffectSequence();
+
+    std::shared_ptr< World::Navi::NaviProvider > getNaviProvider();
   };
 
 }

From a344990a63de2f4f4376522cbd7db91dcd3bafd5 Mon Sep 17 00:00:00 2001
From: Mordred <ffxivsapphire@gmail.com>
Date: Fri, 19 Apr 2019 02:15:18 +0200
Subject: [PATCH 002/351] Crowd avoidance works. Roaming and following a
 player, not so much

---
 src/world/Actor/BNpc.cpp        | 20 +++++++----
 src/world/Navi/NaviProvider.cpp | 59 +++++++++++++++++++++++++++++----
 src/world/Navi/NaviProvider.h   |  3 ++
 src/world/Territory/Zone.cpp    |  2 +-
 4 files changed, 70 insertions(+), 14 deletions(-)

diff --git a/src/world/Actor/BNpc.cpp b/src/world/Actor/BNpc.cpp
index e41f08f1..bb5e8d4e 100644
--- a/src/world/Actor/BNpc.cpp
+++ b/src/world/Actor/BNpc.cpp
@@ -232,7 +232,7 @@ bool Sapphire::Entity::BNpc::moveTo( const FFXIVARR_POSITION3& pos )
   {
     // Reached destination
     m_naviLastPath.clear();
-    return true;
+  //  return true;
   }
 
   auto pNaviMgr = m_pFw->get< World::Manager::NaviMgr >();
@@ -246,7 +246,7 @@ bool Sapphire::Entity::BNpc::moveTo( const FFXIVARR_POSITION3& pos )
     return false;
   }
 
-  auto path = pNaviProvider->findFollowPath( m_pos, pos );
+  /*auto path = pNaviProvider->findFollowPath( m_pos, pos );
 
   if( !path.empty() )
   {
@@ -283,12 +283,17 @@ bool Sapphire::Entity::BNpc::moveTo( const FFXIVARR_POSITION3& pos )
     }
   }
 
-  step();
+  step();*/
+
+  //pNaviProvider->setMoveTarget( *this, pos );
   auto pos1 = pNaviProvider->getMovePos( *this );
 
-  Logger::debug( "{} {} {}", pos1.x, pos1.y, pos1.z );
-  setPos( pos1 );
+  //Logger::debug( "{} {} {}", pos1.x, pos1.y, pos1.z );
+
   m_pCurrentZone->updateActorPosition( *this );
+  face( pos1 );
+  setPos( pos1 );
+  sendPositionUpdate();
   return false;
 }
 
@@ -477,9 +482,10 @@ void Sapphire::Entity::BNpc::update( uint64_t tickCount )
       auto pNaviMgr = m_pFw->get< World::Manager::NaviMgr >();
       auto pNaviProvider = pNaviMgr->getNaviProvider( m_pCurrentZone->getBgPath() );
 
-      if( !pNaviProvider )
+      if( pNaviProvider )
       {
-        pNaviProvider->setMoveTarget( *this, m_roamPos );
+        //if( !pNaviProvider->isAgentActive( *this ) )
+          pNaviProvider->setMoveTarget( *this, m_roamPos );
       }
 
       if( moveTo( m_roamPos ) )
diff --git a/src/world/Navi/NaviProvider.cpp b/src/world/Navi/NaviProvider.cpp
index edcbabe3..f17b7f5e 100644
--- a/src/world/Navi/NaviProvider.cpp
+++ b/src/world/Navi/NaviProvider.cpp
@@ -48,6 +48,42 @@ bool Sapphire::World::Navi::NaviProvider::init()
     if( !m_pCrowd->init( 1000, 10.f, m_naviMesh ) )
       return false;
 
+    dtObstacleAvoidanceParams params;
+    // Use mostly default settings, copy from dtCrowd.
+    memcpy(&params, m_pCrowd->getObstacleAvoidanceParams(0), sizeof(dtObstacleAvoidanceParams));
+
+    // Low (11)
+    params.velBias = 0.5f;
+    params.adaptiveDivs = 5;
+    params.adaptiveRings = 2;
+    params.adaptiveDepth = 1;
+    m_pCrowd->setObstacleAvoidanceParams(0, &params);
+
+    // Medium (22)
+    params.velBias = 0.5f;
+    params.adaptiveDivs = 5;
+    params.adaptiveRings = 2;
+    params.adaptiveDepth = 2;
+    m_pCrowd->setObstacleAvoidanceParams(1, &params);
+
+    // Good (45)
+    params.velBias = 0.5f;
+    params.adaptiveDivs = 7;
+    params.adaptiveRings = 2;
+    params.adaptiveDepth = 3;
+    m_pCrowd->setObstacleAvoidanceParams(2, &params);
+
+    // High (66)
+    params.velBias = 0.5f;
+    params.adaptiveDivs = 7;
+    params.adaptiveRings = 3;
+    params.adaptiveDepth = 3;
+
+    m_pCrowd->setObstacleAvoidanceParams(3, &params);
+
+    m_vod = dtAllocObstacleAvoidanceDebugData();
+    m_vod->init( 2048 );
+
     initQuery();
 
     return true;
@@ -535,19 +571,23 @@ int32_t Sapphire::World::Navi::NaviProvider::addAgent( Entity::Chara& chara )
   dtCrowdAgentParams params;
   std::memset( &params, 0, sizeof( params ) );
   params.height = 7.f;
-  params.maxAcceleration = 8.f;
-  params.maxSpeed = 3.5f;
-  params.radius = 5.f;
+  params.maxAcceleration = 16.f;
+  params.maxSpeed = 13.5f;
+  params.radius = 2.f;
   params.collisionQueryRange = params.radius * 12.0f;
   params.pathOptimizationRange = params.radius * 30.0f;
-
+  params.updateFlags = 0;
+  //params.updateFlags |= DT_CROWD_OBSTACLE_AVOIDANCE;
   float position[] = { chara.getPos().x, chara.getPos().y, chara.getPos().z };
   return m_pCrowd->addAgent( position, &params );
 }
 
 void Sapphire::World::Navi::NaviProvider::updateCrowd( float timeInSeconds )
 {
+
   dtCrowdAgentDebugInfo info;
+  info.idx = -1;
+  info.vod = m_vod;
   m_pCrowd->update( timeInSeconds, &info );
 }
 
@@ -574,7 +614,7 @@ void Sapphire::World::Navi::NaviProvider::setMoveTarget( Entity::Chara& chara,
   const float* halfExtents = m_pCrowd->getQueryExtents();
 
   float vel[ 3 ];
-  float p[ 3 ] = { chara.getPos().x, chara.getPos().y, chara.getPos().z };
+  float p[ 3 ] = { endPos.x, endPos.y, endPos.z };
 
   const dtCrowdAgent* ag = m_pCrowd->getAgent( chara.getAgentId() );
   if( ag && ag->active )
@@ -590,4 +630,11 @@ Sapphire::Common::FFXIVARR_POSITION3 Sapphire::World::Navi::NaviProvider::getMov
   if( !ag )
     return { 0.f, 0.f, 0.f };
   return { ag->npos[ 0 ], ag->npos[ 1 ], ag->npos[ 2 ] };
-}
\ No newline at end of file
+}
+
+bool Sapphire::World::Navi::NaviProvider::isAgentActive( Entity::Chara& chara ) const
+{
+  const dtCrowdAgent* ag = m_pCrowd->getAgent( chara.getAgentId() );
+  return ag && ag->active;
+
+}
diff --git a/src/world/Navi/NaviProvider.h b/src/world/Navi/NaviProvider.h
index 2ad60cf2..9053dcd0 100644
--- a/src/world/Navi/NaviProvider.h
+++ b/src/world/Navi/NaviProvider.h
@@ -60,11 +60,14 @@ namespace Sapphire::World::Navi
 
     Common::FFXIVARR_POSITION3 getMovePos( Entity::Chara& chara );
 
+    bool isAgentActive( Entity::Chara& chara ) const;
+
   protected:
     std::string m_internalName;
 
     dtNavMesh* m_naviMesh;
     dtNavMeshQuery* m_naviMeshQuery;
+    dtObstacleAvoidanceDebugData* m_vod;
     std::unique_ptr< dtCrowd > m_pCrowd;
 
     float m_polyFindRange[ 3 ];
diff --git a/src/world/Territory/Zone.cpp b/src/world/Territory/Zone.cpp
index 94c780cd..ee52d012 100644
--- a/src/world/Territory/Zone.cpp
+++ b/src/world/Territory/Zone.cpp
@@ -474,7 +474,7 @@ bool Sapphire::Zone::update( uint64_t tickCount )
   bool changedWeather = checkWeather();
 
   if( m_pNaviProvider )
-    m_pNaviProvider->updateCrowd( 0.001f * tickCount  );
+    m_pNaviProvider->updateCrowd( 0.02f );
 
   updateSessions( tickCount, changedWeather );
   onUpdate( tickCount );

From a7f31c77a997684f0cb56ce71b9cb76768acc3db Mon Sep 17 00:00:00 2001
From: NotAdam <adam@notadam.me>
Date: Fri, 19 Apr 2019 18:52:55 +1000
Subject: [PATCH 003/351] fix naviprovider not being set on instances

---
 src/world/Actor/BNpc.cpp                | 47 +++----------------------
 src/world/Actor/BNpc.h                  |  2 --
 src/world/Manager/NaviMgr.cpp           |  2 +-
 src/world/Territory/InstanceContent.cpp |  5 ++-
 src/world/Territory/QuestBattle.cpp     |  3 ++
 5 files changed, 13 insertions(+), 46 deletions(-)

diff --git a/src/world/Actor/BNpc.cpp b/src/world/Actor/BNpc.cpp
index bb5e8d4e..28390970 100644
--- a/src/world/Actor/BNpc.cpp
+++ b/src/world/Actor/BNpc.cpp
@@ -224,19 +224,15 @@ void Sapphire::Entity::BNpc::step()
 
 bool Sapphire::Entity::BNpc::moveTo( const FFXIVARR_POSITION3& pos )
 {
-  // do this first, this will update local actor position and the position of other actors
-  // and then this npc will then path from the position after pushing/being pushed
-  //pushNearbyBNpcs();
-
   if( Util::distance( getPos(), pos ) <= m_naviTargetReachedDistance )
   {
     // Reached destination
     m_naviLastPath.clear();
-  //  return true;
+    return true;
   }
 
   auto pNaviMgr = m_pFw->get< World::Manager::NaviMgr >();
-  auto pNaviProvider = pNaviMgr->getNaviProvider( m_pCurrentZone->getBgPath() );
+  auto pNaviProvider = m_pCurrentZone->getNaviProvider();
 
   if( !pNaviProvider )
   {
@@ -285,7 +281,7 @@ bool Sapphire::Entity::BNpc::moveTo( const FFXIVARR_POSITION3& pos )
 
   step();*/
 
-  //pNaviProvider->setMoveTarget( *this, pos );
+  pNaviProvider->setMoveTarget( *this, pos );
   auto pos1 = pNaviProvider->getMovePos( *this );
 
   //Logger::debug( "{} {} {}", pos1.x, pos1.y, pos1.z );
@@ -480,7 +476,7 @@ void Sapphire::Entity::BNpc::update( uint64_t tickCount )
     case BNpcState::Roaming:
     {
       auto pNaviMgr = m_pFw->get< World::Manager::NaviMgr >();
-      auto pNaviProvider = pNaviMgr->getNaviProvider( m_pCurrentZone->getBgPath() );
+      auto pNaviProvider = m_pCurrentZone->getNaviProvider();
 
       if( pNaviProvider )
       {
@@ -507,7 +503,7 @@ void Sapphire::Entity::BNpc::update( uint64_t tickCount )
       if( !hasFlag( Immobile ) && ( Util::getTimeSeconds() - m_lastRoamTargetReached > roamTick ) )
       {
         auto pNaviMgr = m_pFw->get< World::Manager::NaviMgr >();
-        auto pNaviProvider = pNaviMgr->getNaviProvider( m_pCurrentZone->getBgPath() );
+        auto pNaviProvider = m_pCurrentZone->getNaviProvider();
 
         if( !pNaviProvider )
         {
@@ -671,39 +667,6 @@ void Sapphire::Entity::BNpc::checkAggro()
   }
 }
 
-void Sapphire::Entity::BNpc::pushNearbyBNpcs()
-{
-  for( auto& bNpc : m_inRangeBNpc )
-  {
-    auto pos = bNpc->getPos();
-    auto distance = Util::distance( m_pos, bNpc->getPos() );
-
-
-    // todo: not sure what's good here
-    auto factor = bNpc->getNaviTargetReachedDistance();
-
-    auto delta = static_cast< float >( Util::getTimeMs() - bNpc->getLastUpdateTime() ) / 1000.f;
-    delta = std::min< float >( factor, delta );
-
-    // too far away, ignore it
-    if( distance > factor )
-      continue;
-
-    auto angle = Util::calcAngFrom( m_pos.x, m_pos.y, pos.x, pos.y ) + PI;
-
-    auto x = ( cosf( angle ) );
-    auto z = ( sinf( angle ) );
-
-    bNpc->setPos( pos.x + ( x * factor * delta ),
-                  pos.y,
-                  pos.z + ( z * factor * delta ), true );
-
-//    setPos( m_pos.x + ( xBase * -pushDistance ),
-//            m_pos.y,
-//            m_pos.z + ( zBase * -pushDistance ) );
-  }
-}
-
 void Sapphire::Entity::BNpc::setOwner( Sapphire::Entity::CharaPtr m_pChara )
 {
   m_pOwner = m_pChara;
diff --git a/src/world/Actor/BNpc.h b/src/world/Actor/BNpc.h
index f9709745..453c178d 100644
--- a/src/world/Actor/BNpc.h
+++ b/src/world/Actor/BNpc.h
@@ -111,8 +111,6 @@ namespace Sapphire::Entity
 
     void checkAggro();
 
-    void pushNearbyBNpcs();
-
     void setOwner( CharaPtr m_pChara );
 
     void setLevelId( uint32_t levelId );
diff --git a/src/world/Manager/NaviMgr.cpp b/src/world/Manager/NaviMgr.cpp
index c3490920..62877ace 100644
--- a/src/world/Manager/NaviMgr.cpp
+++ b/src/world/Manager/NaviMgr.cpp
@@ -39,7 +39,7 @@ Sapphire::World::Navi::NaviProviderPtr Sapphire::World::Manager::NaviMgr::getNav
 
 std::string Sapphire::World::Manager::NaviMgr::getBgName( const std::string& bgPath )
 {
-  auto findPos = bgPath.find_last_of( "/" );
+  auto findPos = bgPath.find_last_of( '/' );
   if( findPos != std::string::npos )
     return bgPath.substr( findPos + 1 );
 
diff --git a/src/world/Territory/InstanceContent.cpp b/src/world/Territory/InstanceContent.cpp
index f6c0e77a..688b90a7 100644
--- a/src/world/Territory/InstanceContent.cpp
+++ b/src/world/Territory/InstanceContent.cpp
@@ -48,6 +48,9 @@ Sapphire::InstanceContent::InstanceContent( std::shared_ptr< Sapphire::Data::Ins
 
 bool Sapphire::InstanceContent::init()
 {
+  if( !Zone::init() )
+    return false;
+
   auto pScriptMgr = m_pFw->get< Scripting::ScriptMgr >();
   pScriptMgr->onInstanceInit( getAsInstanceContent() );
 
@@ -99,7 +102,7 @@ void Sapphire::InstanceContent::onUpdate( uint64_t tickCount )
   {
     case Created:
     {
-      if( m_boundPlayerIds.size() == 0 )
+      if( m_boundPlayerIds.empty() )
         return;
 
       for( auto playerId : m_boundPlayerIds )
diff --git a/src/world/Territory/QuestBattle.cpp b/src/world/Territory/QuestBattle.cpp
index ef23f08e..df3b71e8 100644
--- a/src/world/Territory/QuestBattle.cpp
+++ b/src/world/Territory/QuestBattle.cpp
@@ -48,6 +48,9 @@ Sapphire::QuestBattle::QuestBattle( std::shared_ptr< Sapphire::Data::QuestBattle
 
 bool Sapphire::QuestBattle::init()
 {
+  if( !Zone::init() )
+    return false;
+
   auto pScriptMgr = m_pFw->get< Scripting::ScriptMgr >();
   pScriptMgr->onInstanceInit( getAsQuestBattle() );
 

From 018046d03bb69a8cc41e9c972bc28b644c9ea7c3 Mon Sep 17 00:00:00 2001
From: Mordred <ffxivsapphire@gmail.com>
Date: Fri, 19 Apr 2019 12:15:09 +0200
Subject: [PATCH 004/351] Some progress on the crowd front, somehwat working
 roaming...

---
 src/world/Actor/BNpc.cpp        | 16 ++++++++--------
 src/world/Navi/NaviProvider.cpp | 11 +++++++++++
 src/world/Navi/NaviProvider.h   |  3 +++
 3 files changed, 22 insertions(+), 8 deletions(-)

diff --git a/src/world/Actor/BNpc.cpp b/src/world/Actor/BNpc.cpp
index 28390970..7c0e8808 100644
--- a/src/world/Actor/BNpc.cpp
+++ b/src/world/Actor/BNpc.cpp
@@ -224,12 +224,6 @@ void Sapphire::Entity::BNpc::step()
 
 bool Sapphire::Entity::BNpc::moveTo( const FFXIVARR_POSITION3& pos )
 {
-  if( Util::distance( getPos(), pos ) <= m_naviTargetReachedDistance )
-  {
-    // Reached destination
-    m_naviLastPath.clear();
-    return true;
-  }
 
   auto pNaviMgr = m_pFw->get< World::Manager::NaviMgr >();
   auto pNaviProvider = m_pCurrentZone->getNaviProvider();
@@ -281,9 +275,15 @@ bool Sapphire::Entity::BNpc::moveTo( const FFXIVARR_POSITION3& pos )
 
   step();*/
 
-  pNaviProvider->setMoveTarget( *this, pos );
+  //pNaviProvider->setMoveTarget( *this, pos );
   auto pos1 = pNaviProvider->getMovePos( *this );
 
+  if( Util::distance( pos1, pos ) < 0.1f )
+  {
+    // Reached destination
+    pNaviProvider->resetMoveTarget( *this );
+    return true;
+  }
   //Logger::debug( "{} {} {}", pos1.x, pos1.y, pos1.z );
 
   m_pCurrentZone->updateActorPosition( *this );
@@ -480,7 +480,7 @@ void Sapphire::Entity::BNpc::update( uint64_t tickCount )
 
       if( pNaviProvider )
       {
-        //if( !pNaviProvider->isAgentActive( *this ) )
+        //if( !pNaviProvider->hasTargetState( *this ) )
           pNaviProvider->setMoveTarget( *this, m_roamPos );
       }
 
diff --git a/src/world/Navi/NaviProvider.cpp b/src/world/Navi/NaviProvider.cpp
index f17b7f5e..ff735ac6 100644
--- a/src/world/Navi/NaviProvider.cpp
+++ b/src/world/Navi/NaviProvider.cpp
@@ -638,3 +638,14 @@ bool Sapphire::World::Navi::NaviProvider::isAgentActive( Entity::Chara& chara )
   return ag && ag->active;
 
 }
+
+bool Sapphire::World::Navi::NaviProvider::hasTargetState( Entity::Chara& chara ) const
+{
+  const dtCrowdAgent* ag = m_pCrowd->getAgent( chara.getAgentId() );
+  return ag->targetState != DT_CROWDAGENT_TARGET_NONE;
+}
+
+void Sapphire::World::Navi::NaviProvider::resetMoveTarget( Entity::Chara& chara )
+{
+  m_pCrowd->resetMoveTarget( chara.getAgentId() );
+}
diff --git a/src/world/Navi/NaviProvider.h b/src/world/Navi/NaviProvider.h
index 9053dcd0..95f7b488 100644
--- a/src/world/Navi/NaviProvider.h
+++ b/src/world/Navi/NaviProvider.h
@@ -61,6 +61,9 @@ namespace Sapphire::World::Navi
     Common::FFXIVARR_POSITION3 getMovePos( Entity::Chara& chara );
 
     bool isAgentActive( Entity::Chara& chara ) const;
+    bool hasTargetState( Entity::Chara& chara ) const;
+
+    void resetMoveTarget( Entity::Chara& chara );
 
   protected:
     std::string m_internalName;

From 19a0ea2e93e7331b7f8ce2b6ccfed0b6e92170bf Mon Sep 17 00:00:00 2001
From: Mordred <ffxivsapphire@gmail.com>
Date: Fri, 19 Apr 2019 14:04:38 +0200
Subject: [PATCH 005/351] Fix roaming

---
 src/world/Actor/BNpc.cpp        | 6 +++++-
 src/world/Navi/NaviProvider.cpp | 7 +++++++
 src/world/Navi/NaviProvider.h   | 2 ++
 3 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/src/world/Actor/BNpc.cpp b/src/world/Actor/BNpc.cpp
index 7c0e8808..0080d550 100644
--- a/src/world/Actor/BNpc.cpp
+++ b/src/world/Actor/BNpc.cpp
@@ -278,10 +278,14 @@ bool Sapphire::Entity::BNpc::moveTo( const FFXIVARR_POSITION3& pos )
   //pNaviProvider->setMoveTarget( *this, pos );
   auto pos1 = pNaviProvider->getMovePos( *this );
 
-  if( Util::distance( pos1, pos ) < 0.1f )
+  if( Util::distance( pos1, pos ) < 1.1f )
   {
     // Reached destination
+    face( pos1 );
+    setPos( pos1 );
+    sendPositionUpdate();
     pNaviProvider->resetMoveTarget( *this );
+    pNaviProvider->updateAgentPosition( *this );
     return true;
   }
   //Logger::debug( "{} {} {}", pos1.x, pos1.y, pos1.z );
diff --git a/src/world/Navi/NaviProvider.cpp b/src/world/Navi/NaviProvider.cpp
index ff735ac6..3d983b19 100644
--- a/src/world/Navi/NaviProvider.cpp
+++ b/src/world/Navi/NaviProvider.cpp
@@ -649,3 +649,10 @@ void Sapphire::World::Navi::NaviProvider::resetMoveTarget( Entity::Chara& chara
 {
   m_pCrowd->resetMoveTarget( chara.getAgentId() );
 }
+
+void Sapphire::World::Navi::NaviProvider::updateAgentPosition( Entity::Chara& chara )
+{
+  removeAgent( chara );
+  auto newIndex = addAgent( chara );
+  chara.setAgentId( newIndex );
+}
diff --git a/src/world/Navi/NaviProvider.h b/src/world/Navi/NaviProvider.h
index 95f7b488..965de453 100644
--- a/src/world/Navi/NaviProvider.h
+++ b/src/world/Navi/NaviProvider.h
@@ -65,6 +65,8 @@ namespace Sapphire::World::Navi
 
     void resetMoveTarget( Entity::Chara& chara );
 
+    void updateAgentPosition( Entity::Chara& chara );
+
   protected:
     std::string m_internalName;
 

From eeded4c4f0c26b91d22345fdd4e0b66519fd9cb6 Mon Sep 17 00:00:00 2001
From: Mordred <ffxivsapphire@gmail.com>
Date: Fri, 19 Apr 2019 14:19:14 +0200
Subject: [PATCH 006/351] Pushing of idle actors implemented

---
 src/world/Actor/BNpc.cpp        | 51 +++++----------------------------
 src/world/Navi/NaviProvider.cpp | 10 +++++++
 src/world/Navi/NaviProvider.h   |  2 ++
 3 files changed, 19 insertions(+), 44 deletions(-)

diff --git a/src/world/Actor/BNpc.cpp b/src/world/Actor/BNpc.cpp
index 0080d550..fc453a9d 100644
--- a/src/world/Actor/BNpc.cpp
+++ b/src/world/Actor/BNpc.cpp
@@ -236,46 +236,6 @@ bool Sapphire::Entity::BNpc::moveTo( const FFXIVARR_POSITION3& pos )
     return false;
   }
 
-  /*auto path = pNaviProvider->findFollowPath( m_pos, pos );
-
-  if( !path.empty() )
-  {
-    m_naviLastPath = path;
-    m_naviTarget = pos;
-    m_naviPathStep = 0;
-    m_naviLastUpdate = Util::getTimeMs();
-  }
-  else
-  {
-    Logger::debug( "No path found from x{0} y{1} z{2} to x{3} y{4} z{5} in {6}",
-                   getPos().x, getPos().y, getPos().z, pos.x, pos.y, pos.z, m_pCurrentZone->getInternalName() );
-
-
-    hateListClear();
-
-    if( m_state == BNpcState::Roaming )
-    {
-      Logger::warn( "BNpc Base#{0} Name#{1} unable to path from x{2} y{3} z{4} while roaming. "
-                    "Possible pathing error in area. Returning BNpc to spawn position x{5} y{6} z{7}.",
-                    m_bNpcBaseId, m_bNpcNameId,
-                    getPos().x, getPos().y, getPos().z,
-                    m_spawnPos.x, m_spawnPos.y, m_spawnPos.z );
-
-      m_lastRoamTargetReached = Util::getTimeSeconds();
-      m_state = BNpcState::Idle;
-
-      m_naviLastPath.clear();
-
-      setPos( m_spawnPos );
-      sendPositionUpdate();
-
-      return true;
-    }
-  }
-
-  step();*/
-
-  //pNaviProvider->setMoveTarget( *this, pos );
   auto pos1 = pNaviProvider->getMovePos( *this );
 
   if( Util::distance( pos1, pos ) < 1.1f )
@@ -284,11 +244,10 @@ bool Sapphire::Entity::BNpc::moveTo( const FFXIVARR_POSITION3& pos )
     face( pos1 );
     setPos( pos1 );
     sendPositionUpdate();
-    pNaviProvider->resetMoveTarget( *this );
+    //pNaviProvider->resetMoveTarget( *this );
     pNaviProvider->updateAgentPosition( *this );
     return true;
   }
-  //Logger::debug( "{} {} {}", pos1.x, pos1.y, pos1.z );
 
   m_pCurrentZone->updateActorPosition( *this );
   face( pos1 );
@@ -504,10 +463,14 @@ void Sapphire::Entity::BNpc::update( uint64_t tickCount )
       if( pHatedActor )
         aggro( pHatedActor );
 
+      auto pNaviMgr = m_pFw->get< World::Manager::NaviMgr >();
+      auto pNaviProvider = m_pCurrentZone->getNaviProvider();
+
+      if( pNaviProvider->syncPosToChara( *this ) )
+        sendPositionUpdate();
+
       if( !hasFlag( Immobile ) && ( Util::getTimeSeconds() - m_lastRoamTargetReached > roamTick ) )
       {
-        auto pNaviMgr = m_pFw->get< World::Manager::NaviMgr >();
-        auto pNaviProvider = m_pCurrentZone->getNaviProvider();
 
         if( !pNaviProvider )
         {
diff --git a/src/world/Navi/NaviProvider.cpp b/src/world/Navi/NaviProvider.cpp
index 3d983b19..690070a7 100644
--- a/src/world/Navi/NaviProvider.cpp
+++ b/src/world/Navi/NaviProvider.cpp
@@ -656,3 +656,13 @@ void Sapphire::World::Navi::NaviProvider::updateAgentPosition( Entity::Chara& ch
   auto newIndex = addAgent( chara );
   chara.setAgentId( newIndex );
 }
+
+bool Sapphire::World::Navi::NaviProvider::syncPosToChara( Entity::Chara& chara )
+{
+  auto pos = getMovePos( chara );
+  if( pos.x == chara.getPos().x && pos.y == chara.getPos().y && pos.z == chara.getPos().z )
+    return false;
+
+  chara.setPos( pos );
+  return true;
+}
\ No newline at end of file
diff --git a/src/world/Navi/NaviProvider.h b/src/world/Navi/NaviProvider.h
index 965de453..80cba51d 100644
--- a/src/world/Navi/NaviProvider.h
+++ b/src/world/Navi/NaviProvider.h
@@ -67,6 +67,8 @@ namespace Sapphire::World::Navi
 
     void updateAgentPosition( Entity::Chara& chara );
 
+    bool syncPosToChara( Entity::Chara& chara );
+
   protected:
     std::string m_internalName;
 

From c0c88ca783285d804d91101c052569c8101c8eeb Mon Sep 17 00:00:00 2001
From: Mordred <ffxivsapphire@gmail.com>
Date: Fri, 19 Apr 2019 14:50:00 +0200
Subject: [PATCH 007/351] Following and retreating works

---
 src/world/Actor/BNpc.cpp        | 17 ++++++++++++++++-
 src/world/Navi/NaviProvider.cpp |  2 +-
 2 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/src/world/Actor/BNpc.cpp b/src/world/Actor/BNpc.cpp
index fc453a9d..586341ba 100644
--- a/src/world/Actor/BNpc.cpp
+++ b/src/world/Actor/BNpc.cpp
@@ -419,6 +419,14 @@ void Sapphire::Entity::BNpc::update( uint64_t tickCount )
     {
       setInvincibilityType( InvincibilityType::InvincibilityIgnoreDamage );
 
+      auto pNaviMgr = m_pFw->get< World::Manager::NaviMgr >();
+      auto pNaviProvider = m_pCurrentZone->getNaviProvider();
+      if( pNaviProvider )
+      {
+        //if( !pNaviProvider->hasTargetState( *this ) )
+        pNaviProvider->setMoveTarget( *this, m_spawnPos );
+      }
+
       if( moveTo( m_spawnPos ) )
       {
         setInvincibilityType( InvincibilityType::InvincibilityNone );
@@ -521,9 +529,16 @@ void Sapphire::Entity::BNpc::update( uint64_t tickCount )
 
         if( !hasFlag( Immobile ) && ( distance > minActorDistance ) )
         {
+          auto pNaviMgr = m_pFw->get< World::Manager::NaviMgr >();
+          auto pNaviProvider = m_pCurrentZone->getNaviProvider();
+          if( pNaviProvider )
+          {
+            //if( !pNaviProvider->hasTargetState( *this ) )
+            pNaviProvider->setMoveTarget( *this, pHatedActor->getPos() );
+          }
           //auto pTeriMgr = m_pFw->get< World::Manager::TerritoryMgr >();
           //if ( ( currTime - m_lastAttack ) > 600 && pTeriMgr->isDefaultTerritory( getCurrentZone()->getTerritoryTypeId() ) )
-            moveTo( pHatedActor->getPos() );
+          moveTo( pHatedActor->getPos() );
         }
         else
         {
diff --git a/src/world/Navi/NaviProvider.cpp b/src/world/Navi/NaviProvider.cpp
index 690070a7..da0338c6 100644
--- a/src/world/Navi/NaviProvider.cpp
+++ b/src/world/Navi/NaviProvider.cpp
@@ -571,7 +571,7 @@ int32_t Sapphire::World::Navi::NaviProvider::addAgent( Entity::Chara& chara )
   dtCrowdAgentParams params;
   std::memset( &params, 0, sizeof( params ) );
   params.height = 7.f;
-  params.maxAcceleration = 16.f;
+  params.maxAcceleration = 26.f;
   params.maxSpeed = 13.5f;
   params.radius = 2.f;
   params.collisionQueryRange = params.radius * 12.0f;

From 19e6a0f748d9983e5c7444622a727453123802ec Mon Sep 17 00:00:00 2001
From: NotAdam <adam@notadam.me>
Date: Fri, 19 Apr 2019 23:01:27 +1000
Subject: [PATCH 008/351] more accurate bnpc scale calculation

---
 src/common/Exd/ExdDataGenerated.cpp |  7 +++++++
 src/common/Exd/ExdDataGenerated.h   | 17 +++++++++++++++++
 src/world/Actor/BNpc.cpp            | 13 ++++++++-----
 src/world/Actor/BNpc.h              |  2 +-
 src/world/Actor/Chara.cpp           |  9 ++++++++-
 src/world/Actor/Chara.h             |  5 +++++
 src/world/Navi/NaviProvider.cpp     |  3 +--
 7 files changed, 47 insertions(+), 9 deletions(-)

diff --git a/src/common/Exd/ExdDataGenerated.cpp b/src/common/Exd/ExdDataGenerated.cpp
index da9df8b1..c7485692 100644
--- a/src/common/Exd/ExdDataGenerated.cpp
+++ b/src/common/Exd/ExdDataGenerated.cpp
@@ -3906,6 +3906,12 @@ Sapphire::Data::ModelChara::ModelChara( uint32_t row_id, Sapphire::Data::ExdData
    variant = exdData->getField< uint8_t >( row, 3 );
 }
 
+Sapphire::Data::ModelSkeleton::ModelSkeleton( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
+{
+   auto row = exdData->m_ModelSkeletonDat.get_row( row_id );
+   scaleFactor = exdData->getField< float >( row, 0 );
+}
+
 Sapphire::Data::ModelState::ModelState( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
 {
    auto row = exdData->m_ModelStateDat.get_row( row_id );
@@ -6935,6 +6941,7 @@ bool Sapphire::Data::ExdDataGenerated::init( const std::string& path )
       m_MobHuntOrderTypeDat = setupDatAccess( "MobHuntOrderType", xiv::exd::Language::none );
       m_MobHuntTargetDat = setupDatAccess( "MobHuntTarget", xiv::exd::Language::none );
       m_ModelCharaDat = setupDatAccess( "ModelChara", xiv::exd::Language::none );
+      m_ModelSkeletonDat = setupDatAccess( "ModelSkeleton", xiv::exd::Language::none );
       m_ModelStateDat = setupDatAccess( "ModelState", xiv::exd::Language::none );
       m_MonsterNoteDat = setupDatAccess( "MonsterNote", xiv::exd::Language::en );
       m_MonsterNoteTargetDat = setupDatAccess( "MonsterNoteTarget", xiv::exd::Language::none );
diff --git a/src/common/Exd/ExdDataGenerated.h b/src/common/Exd/ExdDataGenerated.h
index 525c3bd3..97c6122b 100644
--- a/src/common/Exd/ExdDataGenerated.h
+++ b/src/common/Exd/ExdDataGenerated.h
@@ -342,6 +342,7 @@ struct MinionSkillType;
 struct MobHuntOrderType;
 struct MobHuntTarget;
 struct ModelChara;
+struct ModelSkeleton;
 struct ModelState;
 struct MonsterNote;
 struct MonsterNoteTarget;
@@ -3934,6 +3935,13 @@ struct ModelChara
    ModelChara( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
 
+struct ModelSkeleton
+{
+   float scaleFactor;
+
+   ModelSkeleton( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+};
+
 struct ModelState
 {
    uint16_t start;
@@ -5802,6 +5810,7 @@ struct ZoneSharedGroup
      xiv::exd::Exd m_MobHuntOrderTypeDat;
      xiv::exd::Exd m_MobHuntTargetDat;
      xiv::exd::Exd m_ModelCharaDat;
+     xiv::exd::Exd m_ModelSkeletonDat;
      xiv::exd::Exd m_ModelStateDat;
      xiv::exd::Exd m_MonsterNoteDat;
      xiv::exd::Exd m_MonsterNoteTargetDat;
@@ -6274,6 +6283,7 @@ struct ZoneSharedGroup
      using MobHuntOrderTypePtr = std::shared_ptr< MobHuntOrderType >;
      using MobHuntTargetPtr = std::shared_ptr< MobHuntTarget >;
      using ModelCharaPtr = std::shared_ptr< ModelChara >;
+     using ModelSkeletonPtr = std::shared_ptr< ModelSkeleton >;
      using ModelStatePtr = std::shared_ptr< ModelState >;
      using MonsterNotePtr = std::shared_ptr< MonsterNote >;
      using MonsterNoteTargetPtr = std::shared_ptr< MonsterNoteTarget >;
@@ -6777,6 +6787,7 @@ struct ZoneSharedGroup
      std::set< uint32_t > m_MobHuntOrderTypeIdList;
      std::set< uint32_t > m_MobHuntTargetIdList;
      std::set< uint32_t > m_ModelCharaIdList;
+     std::set< uint32_t > m_ModelSkeletonIdList;
      std::set< uint32_t > m_ModelStateIdList;
      std::set< uint32_t > m_MonsterNoteIdList;
      std::set< uint32_t > m_MonsterNoteTargetIdList;
@@ -8869,6 +8880,12 @@ const std::set< uint32_t >& getModelCharaIdList()
       loadIdList( m_ModelCharaDat, m_ModelCharaIdList );
    return m_ModelCharaIdList;
 }
+const std::set< uint32_t >& getModelSkeletonIdList()
+{
+   if( m_ModelSkeletonIdList.size() == 0 )
+      loadIdList( m_ModelSkeletonDat, m_ModelSkeletonIdList );
+   return m_ModelSkeletonIdList;
+}
 const std::set< uint32_t >& getModelStateIdList()
 {
    if( m_ModelStateIdList.size() == 0 )
diff --git a/src/world/Actor/BNpc.cpp b/src/world/Actor/BNpc.cpp
index 586341ba..a9e8be94 100644
--- a/src/world/Actor/BNpc.cpp
+++ b/src/world/Actor/BNpc.cpp
@@ -100,6 +100,14 @@ Sapphire::Entity::BNpc::BNpc( uint32_t id, BNpcTemplatePtr pTemplate, float posX
 
   m_scale = bNpcBaseData->scale;
 
+  auto modelChara = exdData->get< Data::ModelChara >( bNpcBaseData->modelChara );
+  if( modelChara )
+  {
+    auto modelSkeleton = exdData->get< Data::ModelSkeleton >( modelChara->model );
+    if( modelSkeleton )
+      m_scale *= modelSkeleton->scaleFactor;
+  }
+
   // todo: is this actually good?
   //m_naviTargetReachedDistance = m_scale * 2.f;
   m_naviTargetReachedDistance = 4.f;
@@ -117,11 +125,6 @@ float Sapphire::Entity::BNpc::getNaviTargetReachedDistance() const
   return m_naviTargetReachedDistance;
 }
 
-float Sapphire::Entity::BNpc::getScale() const
-{
-  return m_scale;
-}
-
 uint8_t Sapphire::Entity::BNpc::getEnemyType() const
 {
   return m_enemyType;
diff --git a/src/world/Actor/BNpc.h b/src/world/Actor/BNpc.h
index 453c178d..8ed859b9 100644
--- a/src/world/Actor/BNpc.h
+++ b/src/world/Actor/BNpc.h
@@ -71,7 +71,7 @@ namespace Sapphire::Entity
 
     uint8_t getAggressionMode() const;
 
-    float getScale() const;
+
     float getNaviTargetReachedDistance() const;
 
     // return true if it reached the position
diff --git a/src/world/Actor/Chara.cpp b/src/world/Actor/Chara.cpp
index 3af406f6..6eba77f9 100644
--- a/src/world/Actor/Chara.cpp
+++ b/src/world/Actor/Chara.cpp
@@ -38,7 +38,8 @@ Sapphire::Entity::Chara::Chara( ObjKind type, FrameworkPtr pFw ) :
   m_pose( 0 ),
   m_targetId( INVALID_GAME_OBJECT_ID64 ),
   m_pFw( std::move( std::move( pFw ) ) ),
-  m_directorId( 0 )
+  m_directorId( 0 ),
+  m_scale( 2.f )
 {
 
   m_lastTickTime = 0;
@@ -712,3 +713,9 @@ void Sapphire::Entity::Chara::setAgentId( uint32_t agentId )
 {
   m_agentId = agentId;
 }
+
+
+float Sapphire::Entity::Chara::getScale() const
+{
+  return m_scale;
+}
\ No newline at end of file
diff --git a/src/world/Actor/Chara.h b/src/world/Actor/Chara.h
index a6a95776..56638255 100644
--- a/src/world/Actor/Chara.h
+++ b/src/world/Actor/Chara.h
@@ -131,6 +131,9 @@ namespace Sapphire::Entity
     /*! Detour Crowd AgentId */
     uint32_t m_agentId;
 
+    /*! Detour Crowd actor scale */
+    float m_scale;
+
   public:
     Chara( Common::ObjKind type, FrameworkPtr pFw );
 
@@ -275,6 +278,8 @@ namespace Sapphire::Entity
     uint32_t getAgentId() const;
     void setAgentId( uint32_t agentId );
 
+    float getScale() const;
+
   };
 
 }
diff --git a/src/world/Navi/NaviProvider.cpp b/src/world/Navi/NaviProvider.cpp
index da0338c6..2db4bdcb 100644
--- a/src/world/Navi/NaviProvider.cpp
+++ b/src/world/Navi/NaviProvider.cpp
@@ -573,7 +573,7 @@ int32_t Sapphire::World::Navi::NaviProvider::addAgent( Entity::Chara& chara )
   params.height = 7.f;
   params.maxAcceleration = 26.f;
   params.maxSpeed = 13.5f;
-  params.radius = 2.f;
+  params.radius = chara.getScale() / 2;
   params.collisionQueryRange = params.radius * 12.0f;
   params.pathOptimizationRange = params.radius * 30.0f;
   params.updateFlags = 0;
@@ -584,7 +584,6 @@ int32_t Sapphire::World::Navi::NaviProvider::addAgent( Entity::Chara& chara )
 
 void Sapphire::World::Navi::NaviProvider::updateCrowd( float timeInSeconds )
 {
-
   dtCrowdAgentDebugInfo info;
   info.idx = -1;
   info.vod = m_vod;

From 8fa3fa325db7c33064e481d7b777b3630a3d7f08 Mon Sep 17 00:00:00 2001
From: Mordred <ffxivsapphire@gmail.com>
Date: Sat, 20 Apr 2019 00:11:00 +0200
Subject: [PATCH 009/351] Further improvement of crowd logic

---
 src/world/Actor/BNpc.cpp        | 67 +++++++++++++++++++++++----------
 src/world/Actor/BNpc.h          |  2 +
 src/world/Navi/NaviProvider.cpp |  6 +--
 3 files changed, 53 insertions(+), 22 deletions(-)

diff --git a/src/world/Actor/BNpc.cpp b/src/world/Actor/BNpc.cpp
index a9e8be94..5ec37921 100644
--- a/src/world/Actor/BNpc.cpp
+++ b/src/world/Actor/BNpc.cpp
@@ -241,7 +241,7 @@ bool Sapphire::Entity::BNpc::moveTo( const FFXIVARR_POSITION3& pos )
 
   auto pos1 = pNaviProvider->getMovePos( *this );
 
-  if( Util::distance( pos1, pos ) < 1.1f )
+  if( Util::distance( pos1, pos ) < ( getScale() / 2 ) )
   {
     // Reached destination
     face( pos1 );
@@ -259,6 +259,41 @@ bool Sapphire::Entity::BNpc::moveTo( const FFXIVARR_POSITION3& pos )
   return false;
 }
 
+bool Sapphire::Entity::BNpc::moveTo( const Entity::Chara& targetChara )
+{
+
+  auto pNaviMgr = m_pFw->get< World::Manager::NaviMgr >();
+  auto pNaviProvider = m_pCurrentZone->getNaviProvider();
+
+  if( !pNaviProvider )
+  {
+    Logger::error( "No NaviProvider for zone#{0} - {1}",
+                   m_pCurrentZone->getGuId(),
+                   m_pCurrentZone->getInternalName() );
+    return false;
+  }
+
+  auto pos1 = pNaviProvider->getMovePos( *this );
+
+  if( Util::distance( pos1, targetChara.getPos() ) <= ( ( getScale() / 2 + targetChara.getScale() / 2 ) ) )
+  {
+    // Reached destination
+    face( pos1 );
+    setPos( pos1 );
+    sendPositionUpdate();
+    //pNaviProvider->resetMoveTarget( *this );
+    pNaviProvider->updateAgentPosition( *this );
+    return true;
+  }
+
+  m_pCurrentZone->updateActorPosition( *this );
+  face( pos1 );
+  setPos( pos1 );
+  sendPositionUpdate();
+  return false;
+}
+
+
 void Sapphire::Entity::BNpc::sendPositionUpdate()
 {
   uint8_t unk1 = 0x3a;
@@ -411,6 +446,8 @@ void Sapphire::Entity::BNpc::update( uint64_t tickCount )
   const uint8_t maxDistanceToOrigin = 40;
   const uint32_t roamTick = 20;
 
+  auto pNaviMgr = m_pFw->get< World::Manager::NaviMgr >();
+  auto pNaviProvider = m_pCurrentZone->getNaviProvider();
 
   switch( m_state )
   {
@@ -422,11 +459,8 @@ void Sapphire::Entity::BNpc::update( uint64_t tickCount )
     {
       setInvincibilityType( InvincibilityType::InvincibilityIgnoreDamage );
 
-      auto pNaviMgr = m_pFw->get< World::Manager::NaviMgr >();
-      auto pNaviProvider = m_pCurrentZone->getNaviProvider();
       if( pNaviProvider )
       {
-        //if( !pNaviProvider->hasTargetState( *this ) )
         pNaviProvider->setMoveTarget( *this, m_spawnPos );
       }
 
@@ -449,13 +483,10 @@ void Sapphire::Entity::BNpc::update( uint64_t tickCount )
 
     case BNpcState::Roaming:
     {
-      auto pNaviMgr = m_pFw->get< World::Manager::NaviMgr >();
-      auto pNaviProvider = m_pCurrentZone->getNaviProvider();
 
       if( pNaviProvider )
       {
-        //if( !pNaviProvider->hasTargetState( *this ) )
-          pNaviProvider->setMoveTarget( *this, m_roamPos );
+        pNaviProvider->setMoveTarget( *this, m_roamPos );
       }
 
       if( moveTo( m_roamPos ) )
@@ -474,9 +505,6 @@ void Sapphire::Entity::BNpc::update( uint64_t tickCount )
       if( pHatedActor )
         aggro( pHatedActor );
 
-      auto pNaviMgr = m_pFw->get< World::Manager::NaviMgr >();
-      auto pNaviProvider = m_pCurrentZone->getNaviProvider();
-
       if( pNaviProvider->syncPosToChara( *this ) )
         sendPositionUpdate();
 
@@ -513,6 +541,9 @@ void Sapphire::Entity::BNpc::update( uint64_t tickCount )
         pHatedActor = hateListGetHighest();
       }
 
+      if( pNaviProvider->syncPosToChara( *this ) )
+        sendPositionUpdate();
+
       if( pHatedActor )
       {
         auto distance = Util::distance( getPos().x, getPos().y, getPos().z,
@@ -530,18 +561,16 @@ void Sapphire::Entity::BNpc::update( uint64_t tickCount )
           break;
         }
 
-        if( !hasFlag( Immobile ) && ( distance > minActorDistance ) )
+        if( distance > ( getScale() / 2 + pHatedActor->getScale() / 2 ) )
         {
-          auto pNaviMgr = m_pFw->get< World::Manager::NaviMgr >();
-          auto pNaviProvider = m_pCurrentZone->getNaviProvider();
+          if( hasFlag( Immobile ) )
+            break;
+
           if( pNaviProvider )
           {
-            //if( !pNaviProvider->hasTargetState( *this ) )
             pNaviProvider->setMoveTarget( *this, pHatedActor->getPos() );
           }
-          //auto pTeriMgr = m_pFw->get< World::Manager::TerritoryMgr >();
-          //if ( ( currTime - m_lastAttack ) > 600 && pTeriMgr->isDefaultTerritory( getCurrentZone()->getTerritoryTypeId() ) )
-          moveTo( pHatedActor->getPos() );
+          moveTo( *pHatedActor );
         }
         else
         {
@@ -666,7 +695,7 @@ void Sapphire::Entity::BNpc::setOwner( Sapphire::Entity::CharaPtr m_pChara )
   {
     auto setOwnerPacket = makeZonePacket< FFXIVIpcActorOwner >( getId() );
     setOwnerPacket->data().type = 0x01;
-    setOwnerPacket->data().actorId = 0;
+    setOwnerPacket->data().actorId = INVALID_GAME_OBJECT_ID;
     sendToInRangeSet( setOwnerPacket );
   }
 }
diff --git a/src/world/Actor/BNpc.h b/src/world/Actor/BNpc.h
index 8ed859b9..cb8156bc 100644
--- a/src/world/Actor/BNpc.h
+++ b/src/world/Actor/BNpc.h
@@ -77,6 +77,8 @@ namespace Sapphire::Entity
     // return true if it reached the position
     bool moveTo( const Common::FFXIVARR_POSITION3& pos );
 
+    bool moveTo( const Entity::Chara& targetChara );
+
     // processes movement
     void step();
 
diff --git a/src/world/Navi/NaviProvider.cpp b/src/world/Navi/NaviProvider.cpp
index 2db4bdcb..3feff0ed 100644
--- a/src/world/Navi/NaviProvider.cpp
+++ b/src/world/Navi/NaviProvider.cpp
@@ -571,11 +571,11 @@ int32_t Sapphire::World::Navi::NaviProvider::addAgent( Entity::Chara& chara )
   dtCrowdAgentParams params;
   std::memset( &params, 0, sizeof( params ) );
   params.height = 7.f;
-  params.maxAcceleration = 26.f;
+  params.maxAcceleration = 126.f;
   params.maxSpeed = 13.5f;
   params.radius = chara.getScale() / 2;
-  params.collisionQueryRange = params.radius * 12.0f;
-  params.pathOptimizationRange = params.radius * 30.0f;
+  params.collisionQueryRange = params.radius * 20.0f;
+  params.pathOptimizationRange = params.radius * 10.0f;
   params.updateFlags = 0;
   //params.updateFlags |= DT_CROWD_OBSTACLE_AVOIDANCE;
   float position[] = { chara.getPos().x, chara.getPos().y, chara.getPos().z };

From 4112ae712adb1d871d2d740ff6b94d3903d816f1 Mon Sep 17 00:00:00 2001
From: NotAdam <adam@notadam.me>
Date: Sat, 20 Apr 2019 15:13:46 +1000
Subject: [PATCH 010/351] correctly calculate deltatime, set agent flags on
 dormant bnpcs

---
 src/world/Actor/BNpc.cpp                | 21 +++++++++--------
 src/world/Actor/BNpc.h                  |  1 -
 src/world/Navi/NaviProvider.cpp         | 30 ++++++++++++++++++++-----
 src/world/Navi/NaviProvider.h           |  3 +++
 src/world/Territory/InstanceContent.cpp |  2 ++
 src/world/Territory/QuestBattle.cpp     |  2 ++
 src/world/Territory/Zone.cpp            | 10 +++++----
 7 files changed, 50 insertions(+), 19 deletions(-)

diff --git a/src/world/Actor/BNpc.cpp b/src/world/Actor/BNpc.cpp
index 5ec37921..1196341e 100644
--- a/src/world/Actor/BNpc.cpp
+++ b/src/world/Actor/BNpc.cpp
@@ -228,7 +228,6 @@ void Sapphire::Entity::BNpc::step()
 bool Sapphire::Entity::BNpc::moveTo( const FFXIVARR_POSITION3& pos )
 {
 
-  auto pNaviMgr = m_pFw->get< World::Manager::NaviMgr >();
   auto pNaviProvider = m_pCurrentZone->getNaviProvider();
 
   if( !pNaviProvider )
@@ -239,21 +238,24 @@ bool Sapphire::Entity::BNpc::moveTo( const FFXIVARR_POSITION3& pos )
     return false;
   }
 
+  pNaviProvider->addAgentUpdateFlag( *this, DT_CROWD_OBSTACLE_AVOIDANCE );
+
   auto pos1 = pNaviProvider->getMovePos( *this );
 
-  if( Util::distance( pos1, pos ) < ( getScale() / 2 ) )
+  if( Util::distance( pos1, pos ) < getScale() )
   {
     // Reached destination
-    face( pos1 );
+    face( pos );
     setPos( pos1 );
     sendPositionUpdate();
     //pNaviProvider->resetMoveTarget( *this );
     pNaviProvider->updateAgentPosition( *this );
+    pNaviProvider->removeAgentUpdateFlag( *this, DT_CROWD_OBSTACLE_AVOIDANCE );
     return true;
   }
 
   m_pCurrentZone->updateActorPosition( *this );
-  face( pos1 );
+  face( pos );
   setPos( pos1 );
   sendPositionUpdate();
   return false;
@@ -262,7 +264,6 @@ bool Sapphire::Entity::BNpc::moveTo( const FFXIVARR_POSITION3& pos )
 bool Sapphire::Entity::BNpc::moveTo( const Entity::Chara& targetChara )
 {
 
-  auto pNaviMgr = m_pFw->get< World::Manager::NaviMgr >();
   auto pNaviProvider = m_pCurrentZone->getNaviProvider();
 
   if( !pNaviProvider )
@@ -273,21 +274,24 @@ bool Sapphire::Entity::BNpc::moveTo( const Entity::Chara& targetChara )
     return false;
   }
 
+  pNaviProvider->addAgentUpdateFlag( *this, DT_CROWD_OBSTACLE_AVOIDANCE );
+
   auto pos1 = pNaviProvider->getMovePos( *this );
 
-  if( Util::distance( pos1, targetChara.getPos() ) <= ( ( getScale() / 2 + targetChara.getScale() / 2 ) ) )
+  if( Util::distance( pos1, targetChara.getPos() ) <= ( getScale() + targetChara.getScale() ) )
   {
     // Reached destination
-    face( pos1 );
+    face( targetChara.getPos() );
     setPos( pos1 );
     sendPositionUpdate();
     //pNaviProvider->resetMoveTarget( *this );
     pNaviProvider->updateAgentPosition( *this );
+    pNaviProvider->removeAgentUpdateFlag( *this, DT_CROWD_OBSTACLE_AVOIDANCE );
     return true;
   }
 
   m_pCurrentZone->updateActorPosition( *this );
-  face( pos1 );
+  face( targetChara.getPos() );
   setPos( pos1 );
   sendPositionUpdate();
   return false;
@@ -446,7 +450,6 @@ void Sapphire::Entity::BNpc::update( uint64_t tickCount )
   const uint8_t maxDistanceToOrigin = 40;
   const uint32_t roamTick = 20;
 
-  auto pNaviMgr = m_pFw->get< World::Manager::NaviMgr >();
   auto pNaviProvider = m_pCurrentZone->getNaviProvider();
 
   switch( m_state )
diff --git a/src/world/Actor/BNpc.h b/src/world/Actor/BNpc.h
index cb8156bc..5042118c 100644
--- a/src/world/Actor/BNpc.h
+++ b/src/world/Actor/BNpc.h
@@ -137,7 +137,6 @@ namespace Sapphire::Entity
 
     uint32_t m_flags;
 
-    float m_scale;
     float m_naviTargetReachedDistance;
 
     uint32_t m_timeOfDeath;
diff --git a/src/world/Navi/NaviProvider.cpp b/src/world/Navi/NaviProvider.cpp
index 3feff0ed..49383f59 100644
--- a/src/world/Navi/NaviProvider.cpp
+++ b/src/world/Navi/NaviProvider.cpp
@@ -570,12 +570,12 @@ int32_t Sapphire::World::Navi::NaviProvider::addAgent( Entity::Chara& chara )
 {
   dtCrowdAgentParams params;
   std::memset( &params, 0, sizeof( params ) );
-  params.height = 7.f;
-  params.maxAcceleration = 126.f;
-  params.maxSpeed = 13.5f;
+  params.height = 3.f;
+  params.maxAcceleration = 25.f;
+  params.maxSpeed = std::pow( 2, chara.getScale() * 0.35f ) + 1.f;
   params.radius = chara.getScale() / 2;
-  params.collisionQueryRange = params.radius * 20.0f;
-  params.pathOptimizationRange = params.radius * 10.0f;
+  params.collisionQueryRange = params.radius * 12.0f;
+  params.pathOptimizationRange = params.radius * 20.0f;
   params.updateFlags = 0;
   //params.updateFlags |= DT_CROWD_OBSTACLE_AVOIDANCE;
   float position[] = { chara.getPos().x, chara.getPos().y, chara.getPos().z };
@@ -664,4 +664,24 @@ bool Sapphire::World::Navi::NaviProvider::syncPosToChara( Entity::Chara& chara )
 
   chara.setPos( pos );
   return true;
+}
+
+void Sapphire::World::Navi::NaviProvider::addAgentUpdateFlag( Sapphire::Entity::Chara& chara, uint8_t flags )
+{
+  auto ag = m_pCrowd->getEditableAgent( chara.getAgentId() );
+
+  if( !ag )
+    return;
+
+  ag->params.updateFlags |= flags;
+}
+
+void Sapphire::World::Navi::NaviProvider::removeAgentUpdateFlag( Sapphire::Entity::Chara& chara, uint8_t flags )
+{
+  auto ag = m_pCrowd->getEditableAgent( chara.getAgentId() );
+
+  if( !ag )
+    return;
+
+  ag->params.updateFlags ^= flags;
 }
\ No newline at end of file
diff --git a/src/world/Navi/NaviProvider.h b/src/world/Navi/NaviProvider.h
index 80cba51d..d402cda0 100644
--- a/src/world/Navi/NaviProvider.h
+++ b/src/world/Navi/NaviProvider.h
@@ -69,6 +69,9 @@ namespace Sapphire::World::Navi
 
     bool syncPosToChara( Entity::Chara& chara );
 
+    void addAgentUpdateFlag( Entity::Chara& chara, uint8_t flags );
+    void removeAgentUpdateFlag( Entity::Chara& chara, uint8_t flags );
+
   protected:
     std::string m_internalName;
 
diff --git a/src/world/Territory/InstanceContent.cpp b/src/world/Territory/InstanceContent.cpp
index 688b90a7..81b9f868 100644
--- a/src/world/Territory/InstanceContent.cpp
+++ b/src/world/Territory/InstanceContent.cpp
@@ -159,6 +159,8 @@ void Sapphire::InstanceContent::onUpdate( uint64_t tickCount )
 
   auto pScriptMgr = m_pFw->get< Scripting::ScriptMgr >();
   pScriptMgr->onInstanceUpdate( getAsInstanceContent(), tickCount );
+
+  m_lastUpdate = tickCount;
 }
 
 void Sapphire::InstanceContent::onFinishLoading( Entity::Player& player )
diff --git a/src/world/Territory/QuestBattle.cpp b/src/world/Territory/QuestBattle.cpp
index df3b71e8..39d0f821 100644
--- a/src/world/Territory/QuestBattle.cpp
+++ b/src/world/Territory/QuestBattle.cpp
@@ -159,6 +159,8 @@ void Sapphire::QuestBattle::onUpdate( uint64_t tickCount )
 
   auto pScriptMgr = m_pFw->get< Scripting::ScriptMgr >();
   pScriptMgr->onInstanceUpdate( getAsQuestBattle(), tickCount );
+
+  m_lastUpdate = tickCount;
 }
 
 void Sapphire::QuestBattle::onFinishLoading( Entity::Player& player )
diff --git a/src/world/Territory/Zone.cpp b/src/world/Territory/Zone.cpp
index ee52d012..7245323f 100644
--- a/src/world/Territory/Zone.cpp
+++ b/src/world/Territory/Zone.cpp
@@ -473,17 +473,21 @@ bool Sapphire::Zone::update( uint64_t tickCount )
   //TODO: this should be moved to a updateWeather call and pulled out of updateSessions
   bool changedWeather = checkWeather();
 
+  auto dt = std::difftime( tickCount, m_lastUpdate ) / 1000.f;
+
   if( m_pNaviProvider )
-    m_pNaviProvider->updateCrowd( 0.02f );
+    m_pNaviProvider->updateCrowd( dt );
 
   updateSessions( tickCount, changedWeather );
   onUpdate( tickCount );
 
   updateSpawnPoints();
 
-  if( m_playerMap.size() > 0 )
+  if( !m_playerMap.empty() )
     m_lastActivityTime = tickCount;
 
+  m_lastUpdate = tickCount;
+
   return true;
 }
 
@@ -508,8 +512,6 @@ void Sapphire::Zone::updateSessions( uint64_t tickCount, bool changedWeather )
       return;
     }
 
-    m_lastUpdate = tickCount;
-
     if( changedWeather )
     {
       auto weatherChangePacket = makeZonePacket< FFXIVIpcWeatherChange >( pPlayer->getId() );

From c1da01436f66b712ba3e56986b77f984dd6c508c Mon Sep 17 00:00:00 2001
From: NotAdam <adam@notadam.me>
Date: Sat, 20 Apr 2019 19:40:44 +1000
Subject: [PATCH 011/351] fix build, not sure how that happened

---
 src/world/Territory/Zone.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/world/Territory/Zone.cpp b/src/world/Territory/Zone.cpp
index 7245323f..c9c2402b 100644
--- a/src/world/Territory/Zone.cpp
+++ b/src/world/Territory/Zone.cpp
@@ -19,7 +19,7 @@
 #include "InstanceContent.h"
 #include "QuestBattle.h"
 #include "Manager/TerritoryMgr.h"
-#include "Navi/Naviprovider.h"
+#include "Navi/NaviProvider.h"
 
 #include "Session.h"
 #include "Actor/Chara.h"

From 8f9c4dd960ebd659b56d5ddba6ebc215449d1131 Mon Sep 17 00:00:00 2001
From: NotAdam <adam@notadam.me>
Date: Sat, 20 Apr 2019 22:50:05 +1000
Subject: [PATCH 012/351] fix dumb mistake

---
 src/world/Navi/NaviProvider.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/world/Navi/NaviProvider.cpp b/src/world/Navi/NaviProvider.cpp
index 49383f59..2390e818 100644
--- a/src/world/Navi/NaviProvider.cpp
+++ b/src/world/Navi/NaviProvider.cpp
@@ -683,5 +683,5 @@ void Sapphire::World::Navi::NaviProvider::removeAgentUpdateFlag( Sapphire::Entit
   if( !ag )
     return;
 
-  ag->params.updateFlags ^= flags;
+  ag->params.updateFlags &= ~flags;
 }
\ No newline at end of file

From d934863673f5300fdaa3cabc46f5cb624f76643d Mon Sep 17 00:00:00 2001
From: Mordred <ffxivsapphire@gmail.com>
Date: Sat, 20 Apr 2019 15:42:48 +0200
Subject: [PATCH 013/351] Maybe better scales?

---
 src/world/Actor/BNpc.cpp        | 12 ++++--------
 src/world/Actor/Player.cpp      |  1 +
 src/world/Navi/NaviProvider.cpp |  2 +-
 3 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/src/world/Actor/BNpc.cpp b/src/world/Actor/BNpc.cpp
index 1196341e..fd44a708 100644
--- a/src/world/Actor/BNpc.cpp
+++ b/src/world/Actor/BNpc.cpp
@@ -278,7 +278,7 @@ bool Sapphire::Entity::BNpc::moveTo( const Entity::Chara& targetChara )
 
   auto pos1 = pNaviProvider->getMovePos( *this );
 
-  if( Util::distance( pos1, targetChara.getPos() ) <= ( getScale() + targetChara.getScale() ) )
+  if( Util::distance( pos1, targetChara.getPos() ) <= ( getScale() + targetChara.getScale() ) + 0.25f )
   {
     // Reached destination
     face( targetChara.getPos() );
@@ -534,9 +534,7 @@ void Sapphire::Entity::BNpc::update( uint64_t tickCount )
         return;
 
       auto distanceOrig = Util::distance( getPos().x, getPos().y, getPos().z,
-                                          m_spawnPos.x,
-                                          m_spawnPos.y,
-                                          m_spawnPos.z );
+                                          m_spawnPos.x, m_spawnPos.y,  m_spawnPos.z );
 
       if( pHatedActor && !pHatedActor->isAlive() )
       {
@@ -550,9 +548,7 @@ void Sapphire::Entity::BNpc::update( uint64_t tickCount )
       if( pHatedActor )
       {
         auto distance = Util::distance( getPos().x, getPos().y, getPos().z,
-                                        pHatedActor->getPos().x,
-                                        pHatedActor->getPos().y,
-                                        pHatedActor->getPos().z );
+                                        pHatedActor->getPos().x, pHatedActor->getPos().y, pHatedActor->getPos().z );
 
         if( !hasFlag( NoDeaggro ) && ( distanceOrig > maxDistanceToOrigin ) )
         {
@@ -564,7 +560,7 @@ void Sapphire::Entity::BNpc::update( uint64_t tickCount )
           break;
         }
 
-        if( distance > ( getScale() / 2 + pHatedActor->getScale() / 2 ) )
+        if( distance > ( getScale() + pHatedActor->getScale() ) )
         {
           if( hasFlag( Immobile ) )
             break;
diff --git a/src/world/Actor/Player.cpp b/src/world/Actor/Player.cpp
index de231a2b..84b1be39 100644
--- a/src/world/Actor/Player.cpp
+++ b/src/world/Actor/Player.cpp
@@ -84,6 +84,7 @@ Sapphire::Entity::Player::Player( FrameworkPtr pFw ) :
   m_queuedZoneing = nullptr;
   m_status = ActorStatus::Idle;
   m_invincibilityType = InvincibilityType::InvincibilityNone;
+  m_scale = 1.f;
 
   memset( m_questTracking, 0, sizeof( m_questTracking ) );
   memset( m_name, 0, sizeof( m_name ) );
diff --git a/src/world/Navi/NaviProvider.cpp b/src/world/Navi/NaviProvider.cpp
index 2390e818..9934b8cb 100644
--- a/src/world/Navi/NaviProvider.cpp
+++ b/src/world/Navi/NaviProvider.cpp
@@ -573,7 +573,7 @@ int32_t Sapphire::World::Navi::NaviProvider::addAgent( Entity::Chara& chara )
   params.height = 3.f;
   params.maxAcceleration = 25.f;
   params.maxSpeed = std::pow( 2, chara.getScale() * 0.35f ) + 1.f;
-  params.radius = chara.getScale() / 2;
+  params.radius = ( chara.getScale() ) * 0.9f;
   params.collisionQueryRange = params.radius * 12.0f;
   params.pathOptimizationRange = params.radius * 20.0f;
   params.updateFlags = 0;

From 37cff8580f23530025b0c9f581994ee64704f1ad Mon Sep 17 00:00:00 2001
From: Mordred <ffxivsapphire@gmail.com>
Date: Sat, 20 Apr 2019 23:15:58 +0200
Subject: [PATCH 014/351] Fix autoattack

---
 src/world/Actor/BNpc.cpp        | 3 ++-
 src/world/Navi/NaviProvider.cpp | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/world/Actor/BNpc.cpp b/src/world/Actor/BNpc.cpp
index fd44a708..e14b0f4b 100644
--- a/src/world/Actor/BNpc.cpp
+++ b/src/world/Actor/BNpc.cpp
@@ -571,7 +571,8 @@ void Sapphire::Entity::BNpc::update( uint64_t tickCount )
           }
           moveTo( *pHatedActor );
         }
-        else
+
+        if( ( distance - getScale() ) < 5 )
         {
           if( !hasFlag( TurningDisabled ) && face( pHatedActor->getPos() ) )
             sendPositionUpdate();
diff --git a/src/world/Navi/NaviProvider.cpp b/src/world/Navi/NaviProvider.cpp
index 9934b8cb..7a0d728a 100644
--- a/src/world/Navi/NaviProvider.cpp
+++ b/src/world/Navi/NaviProvider.cpp
@@ -573,7 +573,7 @@ int32_t Sapphire::World::Navi::NaviProvider::addAgent( Entity::Chara& chara )
   params.height = 3.f;
   params.maxAcceleration = 25.f;
   params.maxSpeed = std::pow( 2, chara.getScale() * 0.35f ) + 1.f;
-  params.radius = ( chara.getScale() ) * 0.9f;
+  params.radius = ( chara.getScale() ) * 0.75f;
   params.collisionQueryRange = params.radius * 12.0f;
   params.pathOptimizationRange = params.radius * 20.0f;
   params.updateFlags = 0;

From 6ebdad3855893cf1dab31d596f3fcc54836cb14a Mon Sep 17 00:00:00 2001
From: NotAdam <adam@notadam.me>
Date: Sun, 21 Apr 2019 23:52:41 +1000
Subject: [PATCH 015/351] make larger enemies stack further away from the
 player

---
 src/world/Actor/BNpc.cpp        | 13 +++++++------
 src/world/Actor/Chara.cpp       |  6 +++---
 src/world/Actor/Chara.h         |  4 ++--
 src/world/Actor/Player.cpp      |  2 +-
 src/world/Navi/NaviProvider.cpp |  4 ++--
 5 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/src/world/Actor/BNpc.cpp b/src/world/Actor/BNpc.cpp
index e14b0f4b..49ced95d 100644
--- a/src/world/Actor/BNpc.cpp
+++ b/src/world/Actor/BNpc.cpp
@@ -98,14 +98,14 @@ Sapphire::Entity::BNpc::BNpc( uint32_t id, BNpcTemplatePtr pTemplate, float posX
   auto bNpcBaseData = exdData->get< Data::BNpcBase >( m_bNpcBaseId );
   assert( bNpcBaseData );
 
-  m_scale = bNpcBaseData->scale;
+  m_radius = bNpcBaseData->scale;
 
   auto modelChara = exdData->get< Data::ModelChara >( bNpcBaseData->modelChara );
   if( modelChara )
   {
     auto modelSkeleton = exdData->get< Data::ModelSkeleton >( modelChara->model );
     if( modelSkeleton )
-      m_scale *= modelSkeleton->scaleFactor;
+      m_radius *= modelSkeleton->scaleFactor;
   }
 
   // todo: is this actually good?
@@ -242,7 +242,7 @@ bool Sapphire::Entity::BNpc::moveTo( const FFXIVARR_POSITION3& pos )
 
   auto pos1 = pNaviProvider->getMovePos( *this );
 
-  if( Util::distance( pos1, pos ) < getScale() )
+  if( Util::distance( pos1, pos ) < getRadius() + 3.f )
   {
     // Reached destination
     face( pos );
@@ -278,7 +278,7 @@ bool Sapphire::Entity::BNpc::moveTo( const Entity::Chara& targetChara )
 
   auto pos1 = pNaviProvider->getMovePos( *this );
 
-  if( Util::distance( pos1, targetChara.getPos() ) <= ( getScale() + targetChara.getScale() ) + 0.25f )
+  if( Util::distance( pos1, targetChara.getPos() ) <= ( getRadius() + targetChara.getRadius() ) + 3.f )
   {
     // Reached destination
     face( targetChara.getPos() );
@@ -560,7 +560,7 @@ void Sapphire::Entity::BNpc::update( uint64_t tickCount )
           break;
         }
 
-        if( distance > ( getScale() + pHatedActor->getScale() ) )
+        if( distance > ( getRadius() + pHatedActor->getRadius() ) )
         {
           if( hasFlag( Immobile ) )
             break;
@@ -572,10 +572,11 @@ void Sapphire::Entity::BNpc::update( uint64_t tickCount )
           moveTo( *pHatedActor );
         }
 
-        if( ( distance - getScale() ) < 5 )
+        if( distance < ( getRadius() + pHatedActor->getRadius() + 3.f ) )
         {
           if( !hasFlag( TurningDisabled ) && face( pHatedActor->getPos() ) )
             sendPositionUpdate();
+
           // in combat range. ATTACK!
           autoAttack( pHatedActor );
         }
diff --git a/src/world/Actor/Chara.cpp b/src/world/Actor/Chara.cpp
index 6eba77f9..b4e9303d 100644
--- a/src/world/Actor/Chara.cpp
+++ b/src/world/Actor/Chara.cpp
@@ -39,7 +39,7 @@ Sapphire::Entity::Chara::Chara( ObjKind type, FrameworkPtr pFw ) :
   m_targetId( INVALID_GAME_OBJECT_ID64 ),
   m_pFw( std::move( std::move( pFw ) ) ),
   m_directorId( 0 ),
-  m_scale( 2.f )
+  m_radius( 1.f )
 {
 
   m_lastTickTime = 0;
@@ -715,7 +715,7 @@ void Sapphire::Entity::Chara::setAgentId( uint32_t agentId )
 }
 
 
-float Sapphire::Entity::Chara::getScale() const
+float Sapphire::Entity::Chara::getRadius() const
 {
-  return m_scale;
+  return m_radius;
 }
\ No newline at end of file
diff --git a/src/world/Actor/Chara.h b/src/world/Actor/Chara.h
index 56638255..d882a18a 100644
--- a/src/world/Actor/Chara.h
+++ b/src/world/Actor/Chara.h
@@ -132,7 +132,7 @@ namespace Sapphire::Entity
     uint32_t m_agentId;
 
     /*! Detour Crowd actor scale */
-    float m_scale;
+    float m_radius;
 
   public:
     Chara( Common::ObjKind type, FrameworkPtr pFw );
@@ -278,7 +278,7 @@ namespace Sapphire::Entity
     uint32_t getAgentId() const;
     void setAgentId( uint32_t agentId );
 
-    float getScale() const;
+    float getRadius() const;
 
   };
 
diff --git a/src/world/Actor/Player.cpp b/src/world/Actor/Player.cpp
index 84b1be39..f6d32053 100644
--- a/src/world/Actor/Player.cpp
+++ b/src/world/Actor/Player.cpp
@@ -84,7 +84,7 @@ Sapphire::Entity::Player::Player( FrameworkPtr pFw ) :
   m_queuedZoneing = nullptr;
   m_status = ActorStatus::Idle;
   m_invincibilityType = InvincibilityType::InvincibilityNone;
-  m_scale = 1.f;
+  m_radius = 1.f;
 
   memset( m_questTracking, 0, sizeof( m_questTracking ) );
   memset( m_name, 0, sizeof( m_name ) );
diff --git a/src/world/Navi/NaviProvider.cpp b/src/world/Navi/NaviProvider.cpp
index 7a0d728a..99cb7079 100644
--- a/src/world/Navi/NaviProvider.cpp
+++ b/src/world/Navi/NaviProvider.cpp
@@ -572,8 +572,8 @@ int32_t Sapphire::World::Navi::NaviProvider::addAgent( Entity::Chara& chara )
   std::memset( &params, 0, sizeof( params ) );
   params.height = 3.f;
   params.maxAcceleration = 25.f;
-  params.maxSpeed = std::pow( 2, chara.getScale() * 0.35f ) + 1.f;
-  params.radius = ( chara.getScale() ) * 0.75f;
+  params.maxSpeed = std::pow( 2, chara.getRadius() * 0.35f ) + 1.f;
+  params.radius = ( chara.getRadius() ) * 0.75f;
   params.collisionQueryRange = params.radius * 12.0f;
   params.pathOptimizationRange = params.radius * 20.0f;
   params.updateFlags = 0;

From cb7a91d9d8d62e181b9d9e121e61aa5cc591bb2f Mon Sep 17 00:00:00 2001
From: NotAdam <adam@notadam.me>
Date: Mon, 22 Apr 2019 00:05:04 +1000
Subject: [PATCH 016/351] fix bnpcs not being pushed

---
 src/world/Actor/BNpc.cpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/world/Actor/BNpc.cpp b/src/world/Actor/BNpc.cpp
index 49ced95d..1b211251 100644
--- a/src/world/Actor/BNpc.cpp
+++ b/src/world/Actor/BNpc.cpp
@@ -238,7 +238,7 @@ bool Sapphire::Entity::BNpc::moveTo( const FFXIVARR_POSITION3& pos )
     return false;
   }
 
-  pNaviProvider->addAgentUpdateFlag( *this, DT_CROWD_OBSTACLE_AVOIDANCE );
+//  pNaviProvider->addAgentUpdateFlag( *this, DT_CROWD_OBSTACLE_AVOIDANCE );
 
   auto pos1 = pNaviProvider->getMovePos( *this );
 
@@ -250,7 +250,7 @@ bool Sapphire::Entity::BNpc::moveTo( const FFXIVARR_POSITION3& pos )
     sendPositionUpdate();
     //pNaviProvider->resetMoveTarget( *this );
     pNaviProvider->updateAgentPosition( *this );
-    pNaviProvider->removeAgentUpdateFlag( *this, DT_CROWD_OBSTACLE_AVOIDANCE );
+//    pNaviProvider->removeAgentUpdateFlag( *this, DT_CROWD_OBSTACLE_AVOIDANCE );
     return true;
   }
 
@@ -274,7 +274,7 @@ bool Sapphire::Entity::BNpc::moveTo( const Entity::Chara& targetChara )
     return false;
   }
 
-  pNaviProvider->addAgentUpdateFlag( *this, DT_CROWD_OBSTACLE_AVOIDANCE );
+//  pNaviProvider->addAgentUpdateFlag( *this, DT_CROWD_OBSTACLE_AVOIDANCE );
 
   auto pos1 = pNaviProvider->getMovePos( *this );
 
@@ -286,7 +286,7 @@ bool Sapphire::Entity::BNpc::moveTo( const Entity::Chara& targetChara )
     sendPositionUpdate();
     //pNaviProvider->resetMoveTarget( *this );
     pNaviProvider->updateAgentPosition( *this );
-    pNaviProvider->removeAgentUpdateFlag( *this, DT_CROWD_OBSTACLE_AVOIDANCE );
+//    pNaviProvider->removeAgentUpdateFlag( *this, DT_CROWD_OBSTACLE_AVOIDANCE );
     return true;
   }
 

From 1621b9fd20ecc331f111a980e5b6c8aeed3f2f24 Mon Sep 17 00:00:00 2001
From: Mordred <ffxivsapphire@gmail.com>
Date: Mon, 22 Apr 2019 00:16:39 +0200
Subject: [PATCH 017/351] Fxed bnpcs sometimes being immobile

---
 src/world/Actor/BNpc.cpp | 60 ++--------------------------------------
 src/world/Actor/BNpc.h   |  3 --
 2 files changed, 2 insertions(+), 61 deletions(-)

diff --git a/src/world/Actor/BNpc.cpp b/src/world/Actor/BNpc.cpp
index 1b211251..56ab6ead 100644
--- a/src/world/Actor/BNpc.cpp
+++ b/src/world/Actor/BNpc.cpp
@@ -70,6 +70,7 @@ Sapphire::Entity::BNpc::BNpc( uint32_t id, BNpcTemplatePtr pTemplate, float posX
   m_invincibilityType = InvincibilityNone;
   m_currentStance = Common::Stance::Passive;
   m_levelId = 0;
+  m_flags = 0;
 
   m_pCurrentZone = pZone;
 
@@ -182,49 +183,6 @@ void Sapphire::Entity::BNpc::setState( BNpcState state )
   m_state = state;
 }
 
-void Sapphire::Entity::BNpc::step()
-{
-  if( m_naviLastPath.empty() )
-    // No path to track
-    return;
-
-  auto stepPos = m_naviLastPath[ m_naviPathStep ];
-
-  auto distanceToStep = Util::distance( getPos(), stepPos );
-  auto distanceToDest = Util::distance( getPos(), m_naviTarget );
-
-  if( distanceToStep <= 4 && m_naviPathStep < m_naviLastPath.size() - 1 )
-  {
-    // Reached step in path
-    m_naviPathStep++;
-    stepPos = m_naviLastPath[ m_naviPathStep ];
-  }
-
-  // This is probably not a good way to do it but works fine for now
-  float angle = Util::calcAngFrom( getPos().x, getPos().z, stepPos.x, stepPos.z ) + PI;
-
-  auto delta = static_cast< float >( Util::getTimeMs() - m_lastUpdate ) / 1000.f;
-
-  float speed = 7.5f * delta;
-
-  if( m_state == BNpcState::Roaming )
-    speed *= 0.27f;
-
-  // this seems to fix it but i don't know why :(
-  if( speed > distanceToDest )
-    speed = distanceToDest / delta;
-
-  auto x = ( cosf( angle ) * speed );
-  auto y = stepPos.y;
-  auto z = ( sinf( angle ) * speed );
-
-
-  face( stepPos );
-  setPos( { getPos().x + x, y, getPos().z + z } );
-  sendPositionUpdate();
-
-}
-
 bool Sapphire::Entity::BNpc::moveTo( const FFXIVARR_POSITION3& pos )
 {
 
@@ -238,8 +196,6 @@ bool Sapphire::Entity::BNpc::moveTo( const FFXIVARR_POSITION3& pos )
     return false;
   }
 
-//  pNaviProvider->addAgentUpdateFlag( *this, DT_CROWD_OBSTACLE_AVOIDANCE );
-
   auto pos1 = pNaviProvider->getMovePos( *this );
 
   if( Util::distance( pos1, pos ) < getRadius() + 3.f )
@@ -248,9 +204,7 @@ bool Sapphire::Entity::BNpc::moveTo( const FFXIVARR_POSITION3& pos )
     face( pos );
     setPos( pos1 );
     sendPositionUpdate();
-    //pNaviProvider->resetMoveTarget( *this );
     pNaviProvider->updateAgentPosition( *this );
-//    pNaviProvider->removeAgentUpdateFlag( *this, DT_CROWD_OBSTACLE_AVOIDANCE );
     return true;
   }
 
@@ -274,8 +228,6 @@ bool Sapphire::Entity::BNpc::moveTo( const Entity::Chara& targetChara )
     return false;
   }
 
-//  pNaviProvider->addAgentUpdateFlag( *this, DT_CROWD_OBSTACLE_AVOIDANCE );
-
   auto pos1 = pNaviProvider->getMovePos( *this );
 
   if( Util::distance( pos1, targetChara.getPos() ) <= ( getRadius() + targetChara.getRadius() ) + 3.f )
@@ -284,9 +236,7 @@ bool Sapphire::Entity::BNpc::moveTo( const Entity::Chara& targetChara )
     face( targetChara.getPos() );
     setPos( pos1 );
     sendPositionUpdate();
-    //pNaviProvider->resetMoveTarget( *this );
     pNaviProvider->updateAgentPosition( *this );
-//    pNaviProvider->removeAgentUpdateFlag( *this, DT_CROWD_OBSTACLE_AVOIDANCE );
     return true;
   }
 
@@ -446,7 +396,6 @@ void Sapphire::Entity::BNpc::onTick()
 
 void Sapphire::Entity::BNpc::update( uint64_t tickCount )
 {
-  const uint8_t minActorDistance = 4;
   const uint8_t maxDistanceToOrigin = 40;
   const uint32_t roamTick = 20;
 
@@ -463,9 +412,7 @@ void Sapphire::Entity::BNpc::update( uint64_t tickCount )
       setInvincibilityType( InvincibilityType::InvincibilityIgnoreDamage );
 
       if( pNaviProvider )
-      {
         pNaviProvider->setMoveTarget( *this, m_spawnPos );
-      }
 
       if( moveTo( m_spawnPos ) )
       {
@@ -488,9 +435,7 @@ void Sapphire::Entity::BNpc::update( uint64_t tickCount )
     {
 
       if( pNaviProvider )
-      {
         pNaviProvider->setMoveTarget( *this, m_roamPos );
-      }
 
       if( moveTo( m_roamPos ) )
       {
@@ -566,9 +511,8 @@ void Sapphire::Entity::BNpc::update( uint64_t tickCount )
             break;
 
           if( pNaviProvider )
-          {
             pNaviProvider->setMoveTarget( *this, pHatedActor->getPos() );
-          }
+
           moveTo( *pHatedActor );
         }
 
diff --git a/src/world/Actor/BNpc.h b/src/world/Actor/BNpc.h
index 5042118c..6a38ecfa 100644
--- a/src/world/Actor/BNpc.h
+++ b/src/world/Actor/BNpc.h
@@ -79,9 +79,6 @@ namespace Sapphire::Entity
 
     bool moveTo( const Entity::Chara& targetChara );
 
-    // processes movement
-    void step();
-
     void sendPositionUpdate();
 
     BNpcState getState() const;

From ad4d8049e030cdc7bbfdff309824f4668e5a53d0 Mon Sep 17 00:00:00 2001
From: Mordred <ffxivsapphire@gmail.com>
Date: Mon, 22 Apr 2019 23:30:43 +0200
Subject: [PATCH 018/351] Movement speed of BNpcs will double when in combat or
 retreat mode

---
 src/world/Actor/BNpc.cpp        |  4 +++-
 src/world/Navi/NaviProvider.cpp | 17 +++++++++++++++++
 src/world/Navi/NaviProvider.h   |  2 ++
 3 files changed, 22 insertions(+), 1 deletion(-)

diff --git a/src/world/Actor/BNpc.cpp b/src/world/Actor/BNpc.cpp
index 56ab6ead..4454af44 100644
--- a/src/world/Actor/BNpc.cpp
+++ b/src/world/Actor/BNpc.cpp
@@ -247,7 +247,6 @@ bool Sapphire::Entity::BNpc::moveTo( const Entity::Chara& targetChara )
   return false;
 }
 
-
 void Sapphire::Entity::BNpc::sendPositionUpdate()
 {
   uint8_t unk1 = 0x3a;
@@ -478,6 +477,8 @@ void Sapphire::Entity::BNpc::update( uint64_t tickCount )
       if( !pHatedActor )
         return;
 
+      pNaviProvider->updateAgentParameters( *this );
+
       auto distanceOrig = Util::distance( getPos().x, getPos().y, getPos().z,
                                           m_spawnPos.x, m_spawnPos.y,  m_spawnPos.z );
 
@@ -531,6 +532,7 @@ void Sapphire::Entity::BNpc::update( uint64_t tickCount )
         setStance( Stance::Passive );
         //setOwner( nullptr );
         m_state = BNpcState::Retreat;
+        pNaviProvider->updateAgentParameters( *this );
       }
     }
   }
diff --git a/src/world/Navi/NaviProvider.cpp b/src/world/Navi/NaviProvider.cpp
index 99cb7079..aaee0ba7 100644
--- a/src/world/Navi/NaviProvider.cpp
+++ b/src/world/Navi/NaviProvider.cpp
@@ -6,6 +6,7 @@
 
 #include "Actor/Actor.h"
 #include "Actor/Chara.h"
+#include "Actor/BNpc.h"
 
 #include <Manager/RNGMgr.h>
 
@@ -582,6 +583,22 @@ int32_t Sapphire::World::Navi::NaviProvider::addAgent( Entity::Chara& chara )
   return m_pCrowd->addAgent( position, &params );
 }
 
+void Sapphire::World::Navi::NaviProvider::updateAgentParameters( Entity::BNpc& bnpc )
+{
+  dtCrowdAgentParams params;
+  std::memset( &params, 0, sizeof( params ) );
+  params.height = 3.f;
+  params.maxAcceleration = 25.f;
+  params.maxSpeed = std::pow( 2, bnpc.getRadius() * 0.35f ) + 1.f;
+  if( bnpc.getState() == Entity::BNpcState::Combat || bnpc.getState() == Entity::BNpcState::Retreat )
+    params.maxSpeed *= 2;
+  params.radius = ( bnpc.getRadius() ) * 0.75f;
+  params.collisionQueryRange = params.radius * 12.0f;
+  params.pathOptimizationRange = params.radius * 20.0f;
+  params.updateFlags = 0;
+  m_pCrowd->updateAgentParameters( bnpc.getAgentId(), &params );
+}
+
 void Sapphire::World::Navi::NaviProvider::updateCrowd( float timeInSeconds )
 {
   dtCrowdAgentDebugInfo info;
diff --git a/src/world/Navi/NaviProvider.h b/src/world/Navi/NaviProvider.h
index d402cda0..047abf17 100644
--- a/src/world/Navi/NaviProvider.h
+++ b/src/world/Navi/NaviProvider.h
@@ -72,6 +72,8 @@ namespace Sapphire::World::Navi
     void addAgentUpdateFlag( Entity::Chara& chara, uint8_t flags );
     void removeAgentUpdateFlag( Entity::Chara& chara, uint8_t flags );
 
+    void updateAgentParameters( Entity::BNpc& bnpc );
+
   protected:
     std::string m_internalName;
 

From 8002e88d10a0f6ce0574f6d66af5af5e0c1aaf3b Mon Sep 17 00:00:00 2001
From: Mordred <ffxivsapphire@gmail.com>
Date: Tue, 23 Apr 2019 00:00:07 +0200
Subject: [PATCH 019/351] Properly reset aggro on mob retreat

---
 src/world/Actor/BNpc.cpp        | 5 +++--
 src/world/Navi/NaviProvider.cpp | 2 +-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/world/Actor/BNpc.cpp b/src/world/Actor/BNpc.cpp
index 4454af44..841ff2b9 100644
--- a/src/world/Actor/BNpc.cpp
+++ b/src/world/Actor/BNpc.cpp
@@ -352,7 +352,7 @@ bool Sapphire::Entity::BNpc::hateListHasActor( Sapphire::Entity::CharaPtr pChara
 void Sapphire::Entity::BNpc::aggro( Sapphire::Entity::CharaPtr pChara )
 {
   auto pRNGMgr = m_pFw->get< World::Manager::RNGMgr >();
-  auto variation = static_cast< uint32_t >( pRNGMgr->getRandGenerator< float >( 50, 600 ).next() );
+  auto variation = static_cast< uint32_t >( pRNGMgr->getRandGenerator< float >( 500, 1000 ).next() );
 
   m_lastAttack = Util::getTimeMs() + variation;
   hateListUpdate( pChara, 1 );
@@ -380,7 +380,8 @@ void Sapphire::Entity::BNpc::deaggro( Sapphire::Entity::CharaPtr pChara )
   if( pChara->isPlayer() )
   {
     PlayerPtr tmpPlayer = pChara->getAsPlayer();
-    tmpPlayer->queuePacket( makeActorControl142( getId(), ActorControlType::ToggleWeapon, 0, 1, 1 ) );
+    sendToInRangeSet( makeActorControl142( getId(), ActorControlType::ToggleWeapon, 0, 1, 1 ) );
+    sendToInRangeSet( makeActorControl142( getId(), ActorControlType::ToggleAggro, 0, 0, 0 ) );
     tmpPlayer->onMobDeaggro( getAsBNpc() );
   }
 }
diff --git a/src/world/Navi/NaviProvider.cpp b/src/world/Navi/NaviProvider.cpp
index aaee0ba7..277f9299 100644
--- a/src/world/Navi/NaviProvider.cpp
+++ b/src/world/Navi/NaviProvider.cpp
@@ -578,7 +578,7 @@ int32_t Sapphire::World::Navi::NaviProvider::addAgent( Entity::Chara& chara )
   params.collisionQueryRange = params.radius * 12.0f;
   params.pathOptimizationRange = params.radius * 20.0f;
   params.updateFlags = 0;
-  //params.updateFlags |= DT_CROWD_OBSTACLE_AVOIDANCE;
+  params.updateFlags |= DT_CROWD_ANTICIPATE_TURNS;
   float position[] = { chara.getPos().x, chara.getPos().y, chara.getPos().z };
   return m_pCrowd->addAgent( position, &params );
 }

From e951a33d96da61a5fedd58be2902976fa15edcc1 Mon Sep 17 00:00:00 2001
From: NotAdam <adam@notadam.me>
Date: Tue, 23 Apr 2019 21:52:00 +1000
Subject: [PATCH 020/351] fix bnpcs not navigating around obstacles

---
 src/world/Navi/NaviProvider.cpp | 23 ++++++++++++++++++-----
 1 file changed, 18 insertions(+), 5 deletions(-)

diff --git a/src/world/Navi/NaviProvider.cpp b/src/world/Navi/NaviProvider.cpp
index 277f9299..4ea29654 100644
--- a/src/world/Navi/NaviProvider.cpp
+++ b/src/world/Navi/NaviProvider.cpp
@@ -181,11 +181,11 @@ int32_t Sapphire::World::Navi::NaviProvider::fixupShortcuts( dtPolyRef* path, in
   // in the path, short cut to that polygon directly.
   const int32_t maxLookAhead = 6;
   int32_t cut = 0;
-  for( int32_t i = dtMin( maxLookAhead, npath ) - 1; i > 1 && cut == 0; i-- ) 
+  for( int32_t i = dtMin( maxLookAhead, npath ) - 1; i > 1 && cut == 0; i-- )
   {
     for( int32_t j = 0; j < nneis; j++ )
     {
-      if( path[ i ] == neis[ j ] ) 
+      if( path[ i ] == neis[ j ] )
       {
         cut = i;
         break;
@@ -310,7 +310,7 @@ Sapphire::Common::FFXIVARR_POSITION3
   return { randomPt[ 0 ], randomPt[ 1 ], randomPt[ 2 ] };
 }
 
-std::vector< Sapphire::Common::FFXIVARR_POSITION3 > 
+std::vector< Sapphire::Common::FFXIVARR_POSITION3 >
   Sapphire::World::Navi::NaviProvider::findFollowPath( const Common::FFXIVARR_POSITION3& startPos,
                                                        const Common::FFXIVARR_POSITION3& endPos )
 {
@@ -546,7 +546,7 @@ bool Sapphire::World::Navi::NaviProvider::loadMesh( const std::string& path )
       break;
 
     auto data = reinterpret_cast< uint8_t* >( dtAlloc( tileHeader.dataSize, DT_ALLOC_PERM ) );
-    if( !data ) 
+    if( !data )
       break;
     memset( data, 0, tileHeader.dataSize );
     readLen = fread( data, tileHeader.dataSize, 1, fp );
@@ -632,11 +632,24 @@ void Sapphire::World::Navi::NaviProvider::setMoveTarget( Entity::Chara& chara,
   float vel[ 3 ];
   float p[ 3 ] = { endPos.x, endPos.y, endPos.z };
 
+  dtPolyRef ref;
+
+  auto status = m_naviMeshQuery->findNearestPoly( p, halfExtents, filter, &ref, nullptr );
+
+  if( !dtStatusSucceed( status ) )
+  {
+    Logger::error( "Failed to find nearest poly for Chara#{} for pos X: {} Y: {} Z: {}",
+                   chara.getId(), endPos.x, endPos.y, endPos.z );
+
+    return;
+  }
+
   const dtCrowdAgent* ag = m_pCrowd->getAgent( chara.getAgentId() );
   if( ag && ag->active )
   {
     calcVel( vel, ag->npos, p, ag->params.maxSpeed );
-    m_pCrowd->requestMoveVelocity( chara.getAgentId(), vel );
+    //m_pCrowd->requestMoveVelocity( chara.getAgentId(), vel );
+    m_pCrowd->requestMoveTarget( chara.getAgentId(), ref, p );
   }
 }
 

From a2e5d5a661dc6f4de22047b23e230afb6c80daf5 Mon Sep 17 00:00:00 2001
From: NotAdam <adam@notadam.me>
Date: Tue, 23 Apr 2019 22:04:24 +1000
Subject: [PATCH 021/351] some cleanup

---
 src/world/Navi/NaviProvider.cpp | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/src/world/Navi/NaviProvider.cpp b/src/world/Navi/NaviProvider.cpp
index 4ea29654..89534d0c 100644
--- a/src/world/Navi/NaviProvider.cpp
+++ b/src/world/Navi/NaviProvider.cpp
@@ -629,7 +629,6 @@ void Sapphire::World::Navi::NaviProvider::setMoveTarget( Entity::Chara& chara,
   const dtQueryFilter* filter = m_pCrowd->getFilter( 0 );
   const float* halfExtents = m_pCrowd->getQueryExtents();
 
-  float vel[ 3 ];
   float p[ 3 ] = { endPos.x, endPos.y, endPos.z };
 
   dtPolyRef ref;
@@ -647,8 +646,6 @@ void Sapphire::World::Navi::NaviProvider::setMoveTarget( Entity::Chara& chara,
   const dtCrowdAgent* ag = m_pCrowd->getAgent( chara.getAgentId() );
   if( ag && ag->active )
   {
-    calcVel( vel, ag->npos, p, ag->params.maxSpeed );
-    //m_pCrowd->requestMoveVelocity( chara.getAgentId(), vel );
     m_pCrowd->requestMoveTarget( chara.getAgentId(), ref, p );
   }
 }

From e2a3e560a6c45fe5e86aa13a834d67e9c5cda4cc Mon Sep 17 00:00:00 2001
From: mordred <you@example.com>
Date: Wed, 24 Apr 2019 08:31:42 +0200
Subject: [PATCH 022/351] nav_export takes a path to the dats again

---
 src/tools/nav_export/main.cpp | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/tools/nav_export/main.cpp b/src/tools/nav_export/main.cpp
index 600ba1dd..043410a7 100644
--- a/src/tools/nav_export/main.cpp
+++ b/src/tools/nav_export/main.cpp
@@ -314,6 +314,9 @@ int main( int argc, char* argv[] )
   if( generateNavmesh )
     exportFileType |= ExportFileType::Navmesh;
 
+  if( argc > 1 )
+    gamePath = std::string( argv[ 1 ] );
+
   try
   {
     initExd( gamePath );
@@ -321,7 +324,7 @@ int main( int argc, char* argv[] )
   }
   catch( std::exception& e )
   {
-    printf( "Unable to initialise EXD!\n Usage: pcb_reader <teri> \"path/to/FINAL FANTASY XIV - A REALM REBORN/game/sqpack\"\n" );
+    printf( "Unable to initialise EXD!\n Usage: nav_export \"path/to/FINAL FANTASY XIV - A REALM REBORN/game/sqpack\"\n" );
     return -1;
   }
   ExportMgr exportMgr( nJobs );
@@ -486,7 +489,7 @@ int main( int argc, char* argv[] )
     {
       printf( "%s", ( std::string( e.what() ) + "\n" ).c_str() );
       printf( "Unable to extract collision data.\n" );
-      printf( "Usage: pcb_reader2 territory \"path/to/game/sqpack/ffxiv\"\n" );
+      printf( "Usage: nav_export \"path/to/game/sqpack/ffxiv\"\n" );
     }
   }
   pCache->purge();

From 4de66b10645cf8ea978f72ec4d78dcef64c36d27 Mon Sep 17 00:00:00 2001
From: NotAdam <adam@notadam.me>
Date: Wed, 24 Apr 2019 23:25:07 +1000
Subject: [PATCH 023/351] autoattack damage stat calc funcs, bnpc stat
 calculation

---
 src/common/Exd/ExdDataGenerated.cpp |   1 +
 src/common/Exd/ExdDataGenerated.h   |   1 +
 src/world/Actor/BNpc.cpp            |  54 +++++++-
 src/world/Actor/BNpc.h              |   2 +
 src/world/Actor/Chara.cpp           |  11 ++
 src/world/Actor/Chara.h             |   2 +
 src/world/Actor/Player.cpp          |  15 +-
 src/world/Actor/Player.h            |   6 +-
 src/world/Actor/PlayerInventory.cpp |  15 +-
 src/world/Math/CalcStats.cpp        | 207 +++++++++++++++++++++-------
 src/world/Math/CalcStats.h          |  34 ++---
 11 files changed, 253 insertions(+), 95 deletions(-)

diff --git a/src/common/Exd/ExdDataGenerated.cpp b/src/common/Exd/ExdDataGenerated.cpp
index c7485692..fa51b627 100644
--- a/src/common/Exd/ExdDataGenerated.cpp
+++ b/src/common/Exd/ExdDataGenerated.cpp
@@ -1114,6 +1114,7 @@ Sapphire::Data::ClassJob::ClassJob( uint32_t row_id, Sapphire::Data::ExdDataGene
    classJobParent = exdData->getField< uint8_t >( row, 26 );
    nameEnglish = exdData->getField< std::string >( row, 27 );
    itemStartingWeapon = exdData->getField< int32_t >( row, 28 );
+   primaryStat = exdData->getField< uint8_t >( row, 33 );
    limitBreak1 = exdData->getField< uint16_t >( row, 34 );
    limitBreak2 = exdData->getField< uint16_t >( row, 35 );
    limitBreak3 = exdData->getField< uint16_t >( row, 36 );
diff --git a/src/common/Exd/ExdDataGenerated.h b/src/common/Exd/ExdDataGenerated.h
index 97c6122b..bcbba9b2 100644
--- a/src/common/Exd/ExdDataGenerated.h
+++ b/src/common/Exd/ExdDataGenerated.h
@@ -1485,6 +1485,7 @@ struct ClassJob
    uint8_t classJobParent;
    std::string nameEnglish;
    int32_t itemStartingWeapon;
+   uint8_t primaryStat;
    uint16_t limitBreak1;
    uint16_t limitBreak2;
    uint16_t limitBreak3;
diff --git a/src/world/Actor/BNpc.cpp b/src/world/Actor/BNpc.cpp
index 841ff2b9..9f7bd41f 100644
--- a/src/world/Actor/BNpc.cpp
+++ b/src/world/Actor/BNpc.cpp
@@ -22,18 +22,22 @@
 #include "Network/PacketWrappers/MoveActorPacket.h"
 #include "Navi/NaviProvider.h"
 
+#include "Math/CalcBattle.h"
+#include "Math/CalcStats.h"
+
 #include "StatusEffect/StatusEffect.h"
+
 #include "ServerMgr.h"
 #include "Session.h"
-#include "Math/CalcBattle.h"
 #include "Chara.h"
 #include "Player.h"
 #include "BNpc.h"
 #include "BNpcTemplate.h"
-#include "Manager/TerritoryMgr.h"
+
 #include "Common.h"
 #include "Framework.h"
-#include <Logging/Logger.h>
+
+#include <Manager/TerritoryMgr.h>
 #include <Manager/NaviMgr.h>
 #include <Manager/TerritoryMgr.h>
 #include <Manager/RNGMgr.h>
@@ -72,7 +76,9 @@ Sapphire::Entity::BNpc::BNpc( uint32_t id, BNpcTemplatePtr pTemplate, float posX
   m_levelId = 0;
   m_flags = 0;
 
-  m_pCurrentZone = pZone;
+  m_class = ClassJob::Adventurer;
+
+  m_pCurrentZone = std::move( pZone );
 
   m_spawnPos = m_pos;
 
@@ -112,6 +118,8 @@ Sapphire::Entity::BNpc::BNpc( uint32_t id, BNpcTemplatePtr pTemplate, float posX
   // todo: is this actually good?
   //m_naviTargetReachedDistance = m_scale * 2.f;
   m_naviTargetReachedDistance = 4.f;
+
+  calculateStats();
 }
 
 Sapphire::Entity::BNpc::~BNpc() = default;
@@ -262,7 +270,7 @@ void Sapphire::Entity::BNpc::sendPositionUpdate()
 void Sapphire::Entity::BNpc::hateListClear()
 {
   auto it = m_hateList.begin();
-  for( auto listEntry : m_hateList )
+  for( auto& listEntry : m_hateList )
   {
     if( isInRangeSet( listEntry->m_pChara ) )
       deaggro( listEntry->m_pChara );
@@ -681,7 +689,7 @@ void Sapphire::Entity::BNpc::autoAttack( CharaPtr pTarget )
     srand( static_cast< uint32_t >( tick ) );
 
     auto pRNGMgr = m_pFw->get< World::Manager::RNGMgr >();
-    auto damage = static_cast< uint16_t >( pRNGMgr->getRandGenerator< float >( m_level, m_level + m_level * 1.5f ).next() );
+    auto damage = Math::CalcStats::calculateAutoAttackDamage( *this );
 
     auto effectPacket = std::make_shared< Server::EffectPacket >( getId(), pTarget->getId(), 7 );
     effectPacket->setRotation( Util::floatToUInt16Rot( getRot() ) );
@@ -696,4 +704,38 @@ void Sapphire::Entity::BNpc::autoAttack( CharaPtr pTarget )
     pTarget->takeDamage( damage );
 
   }
+}
+
+void Sapphire::Entity::BNpc::calculateStats()
+{
+  uint8_t level = getLevel();
+  uint8_t job = static_cast< uint8_t >( getClass() );
+
+  auto pExdData = m_pFw->get< Data::ExdDataGenerated >();
+
+  auto classInfo = pExdData->get< Sapphire::Data::ClassJob >( job );
+  auto paramGrowthInfo = pExdData->get< Sapphire::Data::ParamGrow >( level );
+
+  float base = Math::CalcStats::calculateBaseStat( *this );
+
+  m_baseStats.str = static_cast< uint32_t >( base * ( static_cast< float >( classInfo->modifierStrength ) / 100 ) );
+  m_baseStats.dex = static_cast< uint32_t >( base * ( static_cast< float >( classInfo->modifierDexterity ) / 100 ) );
+  m_baseStats.vit = static_cast< uint32_t >( base * ( static_cast< float >( classInfo->modifierVitality ) / 100 ) );
+  m_baseStats.inte = static_cast< uint32_t >( base * ( static_cast< float >( classInfo->modifierIntelligence ) / 100 ) );
+  m_baseStats.mnd = static_cast< uint32_t >( base * ( static_cast< float >( classInfo->modifierMind ) / 100 ) );
+  m_baseStats.pie = static_cast< uint32_t >( base * ( static_cast< float >( classInfo->modifierPiety ) / 100 ) );
+
+  m_baseStats.determination = static_cast< uint32_t >( base );
+  m_baseStats.pie = static_cast< uint32_t >( base );
+  m_baseStats.skillSpeed = paramGrowthInfo->baseSpeed;
+  m_baseStats.spellSpeed = paramGrowthInfo->baseSpeed;
+  m_baseStats.accuracy = paramGrowthInfo->baseSpeed;
+  m_baseStats.critHitRate = paramGrowthInfo->baseSpeed;
+  m_baseStats.attackPotMagic = paramGrowthInfo->baseSpeed;
+  m_baseStats.healingPotMagic = paramGrowthInfo->baseSpeed;
+  m_baseStats.tenacity = paramGrowthInfo->baseSpeed;
+
+  m_baseStats.attack = m_baseStats.str;
+  m_baseStats.attackPotMagic = m_baseStats.inte;
+  m_baseStats.healingPotMagic = m_baseStats.mnd;
 }
\ No newline at end of file
diff --git a/src/world/Actor/BNpc.h b/src/world/Actor/BNpc.h
index 6a38ecfa..8f14e024 100644
--- a/src/world/Actor/BNpc.h
+++ b/src/world/Actor/BNpc.h
@@ -118,6 +118,8 @@ namespace Sapphire::Entity
     bool hasFlag( uint32_t flag ) const;
     void setFlag( uint32_t flags );
 
+    void calculateStats() override;
+
   private:
     uint32_t m_bNpcBaseId;
     uint32_t m_bNpcNameId;
diff --git a/src/world/Actor/Chara.cpp b/src/world/Actor/Chara.cpp
index b4e9303d..968698b0 100644
--- a/src/world/Actor/Chara.cpp
+++ b/src/world/Actor/Chara.cpp
@@ -718,4 +718,15 @@ void Sapphire::Entity::Chara::setAgentId( uint32_t agentId )
 float Sapphire::Entity::Chara::getRadius() const
 {
   return m_radius;
+}
+
+Sapphire::Common::BaseParam Sapphire::Entity::Chara::getPrimaryStat() const
+{
+  auto exdData = m_pFw->get< Data::ExdDataGenerated >();
+  assert( exdData );
+
+  auto classJob = exdData->get< Data::ClassJob >( static_cast< uint16_t >( getClass() ) );
+  assert( classJob );
+
+  return static_cast< Sapphire::Common::BaseParam >( classJob->primaryStat );
 }
\ No newline at end of file
diff --git a/src/world/Actor/Chara.h b/src/world/Actor/Chara.h
index d882a18a..4e2d8e9b 100644
--- a/src/world/Actor/Chara.h
+++ b/src/world/Actor/Chara.h
@@ -280,6 +280,8 @@ namespace Sapphire::Entity
 
     float getRadius() const;
 
+    Common::BaseParam getPrimaryStat() const;
+
   };
 
 }
diff --git a/src/world/Actor/Player.cpp b/src/world/Actor/Player.cpp
index f6d32053..1547a860 100644
--- a/src/world/Actor/Player.cpp
+++ b/src/world/Actor/Player.cpp
@@ -256,7 +256,7 @@ void Sapphire::Entity::Player::calculateStats()
   auto tribeInfo = pExdData->get< Sapphire::Data::Tribe >( tribe );
   auto paramGrowthInfo = pExdData->get< Sapphire::Data::ParamGrow >( level );
 
-  float base = Math::CalcStats::calculateBaseStat( getAsPlayer() );
+  float base = Math::CalcStats::calculateBaseStat( *this );
 
   m_baseStats.str = static_cast< uint32_t >( base * ( static_cast< float >( classInfo->modifierStrength ) / 100 ) +
                                              tribeInfo->sTR );
@@ -1559,8 +1559,7 @@ void Sapphire::Entity::Player::autoAttack( CharaPtr pTarget )
   auto pRNGMgr = m_pFw->get< World::Manager::RNGMgr >();
   auto variation = static_cast< uint32_t >( pRNGMgr->getRandGenerator< float >( 0, 3 ).next() );
 
-  auto damage = static_cast< uint32_t >( pRNGMgr->getRandGenerator< float >( static_cast< uint32_t > ( getLevel() * 1.5f ),
-                                         getLevel() + static_cast< uint32_t >( mainWeap->getAutoAttackDmg() * 2 ) ).next() );
+  auto damage = Math::CalcStats::calculateAutoAttackDamage( *this );
 
   if( getClass() == ClassJob::Machinist || getClass() == ClassJob::Bard || getClass() == ClassJob::Archer )
   {
@@ -2116,3 +2115,13 @@ Sapphire::World::SessionPtr Sapphire::Entity::Player::getSession()
   return m_pSession;
 }
 
+void Sapphire::Entity::Player::setActiveLand( uint8_t land, uint8_t ward )
+{
+  m_activeLand.plot = land;
+  m_activeLand.ward = ward;
+}
+
+Sapphire::Common::ActiveLand Sapphire::Entity::Player::getActiveLand() const
+{
+  return m_activeLand;
+}
diff --git a/src/world/Actor/Player.h b/src/world/Actor/Player.h
index b7becacb..3fbf9f88 100644
--- a/src/world/Actor/Player.h
+++ b/src/world/Actor/Player.h
@@ -933,6 +933,8 @@ namespace Sapphire::Entity
     /*! calculate and return player ilvl based off equipped gear */
     uint16_t calculateEquippedGearItemLevel();
 
+    ItemPtr getEquippedWeapon();
+
     /*! return the current amount of currency of type */
     uint32_t getCurrency( Common::CurrencyType type );
 
@@ -964,6 +966,8 @@ namespace Sapphire::Entity
 
     Sapphire::ItemPtr dropInventoryItem( Common::InventoryType type, uint16_t slotId );
 
+    //////////////////////////////////////////////////////////////////////////////////////////////////////
+
     Common::HuntingLogEntry& getHuntingLogEntry( uint8_t index );
 
     void sendHuntingLog();
@@ -974,8 +978,6 @@ namespace Sapphire::Entity
 
     World::SessionPtr getSession();
 
-    //////////////////////////////////////////////////////////////////////////////////////////////////////
-
     uint64_t m_lastMoveTime;
     uint8_t m_lastMoveflag;
     bool m_falling;
diff --git a/src/world/Actor/PlayerInventory.cpp b/src/world/Actor/PlayerInventory.cpp
index 97fec07b..3d25ad4f 100644
--- a/src/world/Actor/PlayerInventory.cpp
+++ b/src/world/Actor/PlayerInventory.cpp
@@ -831,17 +831,6 @@ void Sapphire::Entity::Player::discardItem( uint16_t fromInventoryId, uint8_t fr
   queuePacket( invTransFinPacket );
 }
 
-void Sapphire::Entity::Player::setActiveLand( uint8_t land, uint8_t ward )
-{
-  m_activeLand.plot = land;
-  m_activeLand.ward = ward;
-}
-
-Sapphire::Common::ActiveLand Sapphire::Entity::Player::getActiveLand() const
-{
-  return m_activeLand;
-}
-
 uint16_t Sapphire::Entity::Player::calculateEquippedGearItemLevel()
 {
   uint32_t iLvlResult = 0;
@@ -871,6 +860,10 @@ uint16_t Sapphire::Entity::Player::calculateEquippedGearItemLevel()
   return static_cast< uint16_t >( std::min( static_cast< int32_t >( iLvlResult / 13 ), 9999 ) );
 }
 
+Sapphire::ItemPtr Sapphire::Entity::Player::getEquippedWeapon()
+{
+  return m_storageMap[ GearSet0 ]->getItem( GearSetSlot::MainHand );
+}
 
 uint8_t Sapphire::Entity::Player::getFreeSlotsInBags()
 {
diff --git a/src/world/Math/CalcStats.cpp b/src/world/Math/CalcStats.cpp
index 859cedec..99c536c8 100644
--- a/src/world/Math/CalcStats.cpp
+++ b/src/world/Math/CalcStats.cpp
@@ -2,11 +2,13 @@
 
 #include <Exd/ExdDataGenerated.h>
 #include <Common.h>
+#include <Logging/Logger.h>
 
 #include "Actor/Chara.h"
-
 #include "Actor/Player.h"
 
+#include "Inventory/Item.h"
+
 #include "CalcStats.h"
 #include "Framework.h"
 
@@ -108,10 +110,10 @@ const int levelTable[71][7] =
 // 3 Versions. SB and HW are linear, ARR is polynomial.
 // Originally from Player.cpp, calculateStats().
 
-float CalcStats::calculateBaseStat( PlayerPtr pPlayer )
+float CalcStats::calculateBaseStat( const Chara& chara )
 {
   float base = 0.0f;
-  uint8_t level = pPlayer->getLevel();
+  uint8_t level = chara.getLevel();
 
   if( level > 70 )
     level = 70;
@@ -138,7 +140,7 @@ uint32_t CalcStats::calculateMaxHp( PlayerPtr pPlayer, Sapphire::FrameworkPtr pF
   uint8_t level = pPlayer->getLevel();
 
   auto vitMod = pPlayer->getBonusStat( Common::BaseParam::Vitality );
-  float baseStat = calculateBaseStat( pPlayer );
+  float baseStat = calculateBaseStat( *pPlayer );
   uint16_t vitStat = pPlayer->getStats().vit + static_cast< uint16_t >( vitMod );
   uint16_t hpMod = paramGrowthInfo->hpModifier;
   uint16_t jobModHp = classInfo->modifierHitPoints;
@@ -173,7 +175,7 @@ uint32_t CalcStats::calculateMaxMp( PlayerPtr pPlayer, Sapphire::FrameworkPtr pF
 
   auto pieMod = pPlayer->getBonusStat( Common::BaseParam::Piety );
 
-  float baseStat = calculateBaseStat( pPlayer );
+  float baseStat = calculateBaseStat( *pPlayer );
   uint16_t piety = pPlayer->getStats().pie + pieMod;
   uint16_t pietyScalar = paramGrowthInfo->mpModifier;
   uint16_t jobModMp = classInfo->modifierManaPoints;
@@ -308,49 +310,67 @@ float CalcStats::potency( uint16_t potency )
   return potency / 100.f;
 }
 
-//float CalcStats::weaponDamage( const Sapphire::Entity::Chara& chara, float weaponDamage, bool isMagicDamage )
-//{
-//  const auto& baseStats = chara.getStats();
-//  auto level = chara.getLevel();
-//
-//  auto mainVal = static_cast< float >( levelTable[ level ][ Common::LevelTableEntry::MAIN ] );
-//
-//  float jobAttribute = 1.f;
-//
-//  // todo: fix this
-//  return 1.f
-//}
+float CalcStats::weaponDamage( const Sapphire::Entity::Chara& chara, float weaponDamage )
+{
+  const auto& baseStats = chara.getStats();
+  auto level = chara.getLevel();
 
-// todo: this is all retarded, needs to be per weapon and etcetc
-//uint32_t CalcStats::getPrimaryClassJobAttribute( const Sapphire::Entity::Chara& chara )
-//{
-//
-//}
+  auto mainVal = static_cast< float >( levelTable[ level ][ Common::LevelTableEntry::MAIN ] );
+
+  uint32_t jobAttribute = 1;
+
+  switch( chara.getPrimaryStat() )
+  {
+    case Common::BaseParam::Intelligence:
+    {
+      jobAttribute = baseStats.healingPotMagic;
+      break;
+    }
+    case Common::BaseParam::Mind:
+    {
+      jobAttribute = baseStats.attackPotMagic;
+      break;
+    }
+
+    default:
+    {
+      jobAttribute = baseStats.attack;
+      break;
+    }
+  }
+
+  return std::floor( ( ( mainVal * jobAttribute ) / 1000.f ) + weaponDamage );
+}
 
 float CalcStats::calcAttackPower( uint32_t attackPower )
 {
   return std::floor( ( 125.f * ( attackPower - 292.f ) / 292.f ) + 100.f ) / 100.f;
 }
 
-float CalcStats::magicAttackPower( const Sapphire::Entity::Chara& chara )
-{
-  const auto& baseStats = chara.getStats();
-
-  return calcAttackPower( baseStats.attackPotMagic );
-}
-
-float CalcStats::healingMagicPower( const Sapphire::Entity::Chara& chara )
-{
-  const auto& baseStats = chara.getStats();
-
-  return calcAttackPower( baseStats.healingPotMagic );
-}
-
 float CalcStats::attackPower( const Sapphire::Entity::Chara& chara )
 {
   const auto& baseStats = chara.getStats();
 
-  return calcAttackPower( baseStats.attack );
+  // todo: this is wrong
+  if( chara.isBattleNpc() )
+    return calcAttackPower( baseStats.attack );
+
+  switch( chara.getPrimaryStat() )
+  {
+    case Common::BaseParam::Mind:
+    {
+      return calcAttackPower( baseStats.healingPotMagic );
+    }
+    case Common::BaseParam::Intelligence:
+    {
+      return calcAttackPower( baseStats.attackPotMagic );
+    }
+
+    default:
+    {
+      return calcAttackPower( baseStats.attack );
+    }
+  }
 }
 
 float CalcStats::determination( const Sapphire::Entity::Chara& chara )
@@ -386,18 +406,10 @@ float CalcStats::speed( const Sapphire::Entity::Chara& chara )
   uint32_t speedVal = 0;
 
   // check whether we use spellspeed or skillspeed
-  // todo: this is kinda shitty though
-  switch( chara.getClass() )
+  switch( chara.getPrimaryStat() )
   {
-    case Common::ClassJob::Arcanist:
-    case Common::ClassJob::Astrologian:
-    case Common::ClassJob::Whitemage:
-    case Common::ClassJob::Redmage:
-    case Common::ClassJob::Bluemage:
-    case Common::ClassJob::Blackmage:
-    case Common::ClassJob::Summoner:
-    case Common::ClassJob::Scholar:
-    case Common::ClassJob::Thaumaturge:
+    case Common::BaseParam::Intelligence:
+    case Common::BaseParam::Mind:
       speedVal = baseStats.spellSpeed;
       break;
 
@@ -439,14 +451,105 @@ float CalcStats::magicDefence( const Sapphire::Entity::Chara& chara )
   return std::floor( 15.f * baseStats.magicDefense ) / 100.f;
 }
 
-//float CalcStats::blockStrength( const Sapphire::Entity::Chara& chara )
-//{
-//
-//}
+float CalcStats::blockStrength( const Sapphire::Entity::Chara& chara )
+{
+  auto level = chara.getLevel();
+  auto blockStrength = static_cast< float >( chara.getBonusStat( Common::BaseParam::BlockStrength ) );
+  auto levelVal =  static_cast< float >( levelTable[ level ][ Common::LevelTableEntry::DIV ] );
+
+  return std::floor( ( 30 * blockStrength ) / levelVal + 10 ) / 100.f;
+}
+
+float CalcStats::autoAttack( const Sapphire::Entity::Chara& chara )
+{
+  // todo: default values for NPCs, not sure what we should have here
+  float autoAttackDelay = 2.f;
+  float weaponDamage = 10.f;
+
+  // fetch actual auto attack delay if its a player
+  if( chara.isPlayer() )
+  {
+    // todo: ew
+    auto pPlayer = const_cast< Entity::Chara& >( chara ).getAsPlayer();
+    assert( pPlayer );
+
+    auto pItem = pPlayer->getEquippedWeapon();
+    assert( pItem );
+
+    autoAttackDelay = pItem->getDelay() / 1000.f;
+    weaponDamage = pItem->getWeaponDmg();
+  }
+
+  auto level = chara.getLevel();
+  auto mainVal = static_cast< float >( levelTable[ level ][ Common::LevelTableEntry::MAIN ] );
+
+  auto innerCalc = std::floor( ( ( mainVal * primaryStatValue( chara ) ) / 1000.f ) + weaponDamage );
+
+  return std::floor( innerCalc * ( autoAttackDelay / 3.f ) );
+}
 
 float CalcStats::healingMagicPotency( const Sapphire::Entity::Chara& chara )
 {
   const auto& baseStats = chara.getStats();
 
   return std::floor( 100.f * ( baseStats.healingPotMagic - 292.f ) / 264.f + 100.f ) / 100.f;
+}
+
+////////
+
+float CalcStats::calculateAutoAttackDamage( const Sapphire::Entity::Chara& chara )
+{
+  // D = ⌊ f(ptc) × f(aa) × f(ap) × f(det) × f(tnc) × traits ⌋ × f(ss) ⌋ ×
+  // f(chr) ⌋ × f(dhr) ⌋ × rand[ 0.95, 1.05 ] ⌋ × buff_1 ⌋ × buff... ⌋
+
+  auto pot = potency( AUTO_ATTACK_POTENCY );
+  auto aa = autoAttack( chara );
+  //auto ap = attackPower( chara );
+  auto ap = 1.f;
+  auto det = determination( chara );
+  auto ten = tenacity( chara );
+
+  Logger::info( "auto attack: pot: {} aa: {} ap: {} det: {} ten: {}", pot, aa, ap, det, ten );
+
+  auto factor = std::floor( pot * aa * ap * det * ten );
+
+  // todo: traits
+
+  factor = std::floor( factor * speed( chara ) );
+
+  // todo: surely this aint right?
+  //factor = std::floor( factor * criticalHitProbability( chara ) );
+  //factor = std::floor( factor * directHitProbability( chara ) );
+
+  // todo: random 0.95 - 1.05 factor
+
+  // todo: buffs
+
+  return factor;
+}
+
+uint32_t CalcStats::primaryStatValue( const Sapphire::Entity::Chara& chara )
+{
+  const auto& baseStats = chara.getStats();
+
+  switch( chara.getPrimaryStat() )
+  {
+    default:
+      return 1;
+
+    case Common::BaseParam::Intelligence:
+      return baseStats.inte;
+
+    case Common::BaseParam::Mind:
+      return baseStats.mnd;
+
+    case Common::BaseParam::Strength:
+      return baseStats.str;
+
+    case Common::BaseParam::Vitality:
+      return baseStats.vit;
+
+    case Common::BaseParam::Dexterity:
+      return baseStats.dex;
+  }
 }
\ No newline at end of file
diff --git a/src/world/Math/CalcStats.h b/src/world/Math/CalcStats.h
index 6aab838d..11d9fac1 100644
--- a/src/world/Math/CalcStats.h
+++ b/src/world/Math/CalcStats.h
@@ -10,7 +10,9 @@ namespace Sapphire::Math
   class CalcStats
   {
   public:
-    static float calculateBaseStat( Sapphire::Entity::PlayerPtr pPlayer );
+    static const uint32_t AUTO_ATTACK_POTENCY = 100;
+
+    static float calculateBaseStat( const Entity::Chara& chara );
 
     static uint32_t calculateMaxMp( Sapphire::Entity::PlayerPtr pPlayer, FrameworkPtr pFw );
 
@@ -52,33 +54,17 @@ namespace Sapphire::Math
      *
      * @param chara The source/casting character.
      * @param weaponDamage the weapons physical or magic damage
-     * @param isMagicDamage true if the damage is magical, otherwise it's treated as physical damage
      */
-    static float weaponDamage( const Sapphire::Entity::Chara& chara, float weaponDamage, bool isMagicDamage );
+    static float weaponDamage( const Sapphire::Entity::Chara& chara, float weaponDamage );
 
     /*!
-     * @brief Calculates the contribution of physical attack power to damage dealt
+     * @brief Calculates the contribution of attack power to damage dealt with consideration for the primary stat
      * @todo Only works at level 70
      *
      * @param chara The source/casting character.
      */
     static float attackPower( const Sapphire::Entity::Chara& chara );
 
-    /*!
-     * @brief Calculates the contribution of magical attack power to damage dealt
-     * @todo Only works at level 70
-     *
-     * @param chara The source/casting character.
-     */
-    static float magicAttackPower( const Sapphire::Entity::Chara& chara );
-
-    /*!
-     * @brief Calculates the contribution of healing magic power to healing dealt
-     *
-     * @param chara The source/casting character.
-     */
-    static float healingMagicPower( const Sapphire::Entity::Chara& chara );
-
     /*!
      * @brief Calculates determinations contribution to damage and healing output.
      *
@@ -131,6 +117,8 @@ namespace Sapphire::Math
      */
     static float blockStrength( const Sapphire::Entity::Chara& chara );
 
+    static float autoAttack( const Sapphire::Entity::Chara& chara );
+
     /*!
      * @brief Calculates the multiplier that healing magic potency affects healing output
      *
@@ -140,9 +128,11 @@ namespace Sapphire::Math
      */
     static float healingMagicPotency( const Sapphire::Entity::Chara& chara );
 
-  private:
+    ////////////////////////////////////////////
 
-    static uint32_t getPrimaryClassJobAttribute( const Sapphire::Entity::Chara& chara );
+    static float calculateAutoAttackDamage( const Sapphire::Entity::Chara& chara );
+
+  private:
 
     /*!
      * @brief Has the main attack power calculation allowing for de-duplication of functions.
@@ -151,6 +141,8 @@ namespace Sapphire::Math
      */
     static float calcAttackPower( uint32_t attackPower );
 
+    static uint32_t primaryStatValue( const Sapphire::Entity::Chara& chara );
+
   };
 
 }

From c851a4a88b84cf10703119753e2e8abb94fb3aa1 Mon Sep 17 00:00:00 2001
From: NotAdam <adam@notadam.me>
Date: Wed, 24 Apr 2019 23:35:26 +1000
Subject: [PATCH 024/351] slightly better stat calc for bnpcs

---
 src/world/Math/CalcStats.cpp | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/src/world/Math/CalcStats.cpp b/src/world/Math/CalcStats.cpp
index 99c536c8..eda56f55 100644
--- a/src/world/Math/CalcStats.cpp
+++ b/src/world/Math/CalcStats.cpp
@@ -495,8 +495,6 @@ float CalcStats::healingMagicPotency( const Sapphire::Entity::Chara& chara )
   return std::floor( 100.f * ( baseStats.healingPotMagic - 292.f ) / 264.f + 100.f ) / 100.f;
 }
 
-////////
-
 float CalcStats::calculateAutoAttackDamage( const Sapphire::Entity::Chara& chara )
 {
   // D = ⌊ f(ptc) × f(aa) × f(ap) × f(det) × f(tnc) × traits ⌋ × f(ss) ⌋ ×
@@ -534,8 +532,9 @@ uint32_t CalcStats::primaryStatValue( const Sapphire::Entity::Chara& chara )
 
   switch( chara.getPrimaryStat() )
   {
+    case Common::BaseParam::Strength:
     default:
-      return 1;
+      return baseStats.str;
 
     case Common::BaseParam::Intelligence:
       return baseStats.inte;
@@ -543,9 +542,6 @@ uint32_t CalcStats::primaryStatValue( const Sapphire::Entity::Chara& chara )
     case Common::BaseParam::Mind:
       return baseStats.mnd;
 
-    case Common::BaseParam::Strength:
-      return baseStats.str;
-
     case Common::BaseParam::Vitality:
       return baseStats.vit;
 

From fc9f1e6673dc6fb3a8246b4b889a28719d775f6d Mon Sep 17 00:00:00 2001
From: NotAdam <adam@notadam.me>
Date: Wed, 24 Apr 2019 23:47:35 +1000
Subject: [PATCH 025/351] fix attack power calculation not using level value

---
 src/world/Math/CalcStats.cpp | 19 +++++++++++--------
 src/world/Math/CalcStats.h   |  2 +-
 2 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/src/world/Math/CalcStats.cpp b/src/world/Math/CalcStats.cpp
index eda56f55..1134ffa0 100644
--- a/src/world/Math/CalcStats.cpp
+++ b/src/world/Math/CalcStats.cpp
@@ -342,9 +342,13 @@ float CalcStats::weaponDamage( const Sapphire::Entity::Chara& chara, float weapo
   return std::floor( ( ( mainVal * jobAttribute ) / 1000.f ) + weaponDamage );
 }
 
-float CalcStats::calcAttackPower( uint32_t attackPower )
+float CalcStats::calcAttackPower( const Sapphire::Entity::Chara& chara, uint32_t attackPower )
 {
-  return std::floor( ( 125.f * ( attackPower - 292.f ) / 292.f ) + 100.f ) / 100.f;
+  auto level = chara.getLevel();
+  auto mainVal = static_cast< float >( levelTable[ level ][ Common::LevelTableEntry::MAIN ] );
+  auto divVal = static_cast< float >( levelTable[ level ][ Common::LevelTableEntry::DIV ] );
+
+  return std::floor( ( 125.f * ( attackPower - mainVal ) / divVal ) + 100.f ) / 100.f;
 }
 
 float CalcStats::attackPower( const Sapphire::Entity::Chara& chara )
@@ -353,22 +357,22 @@ float CalcStats::attackPower( const Sapphire::Entity::Chara& chara )
 
   // todo: this is wrong
   if( chara.isBattleNpc() )
-    return calcAttackPower( baseStats.attack );
+    return calcAttackPower( chara, baseStats.attack );
 
   switch( chara.getPrimaryStat() )
   {
     case Common::BaseParam::Mind:
     {
-      return calcAttackPower( baseStats.healingPotMagic );
+      return calcAttackPower( chara, baseStats.healingPotMagic );
     }
     case Common::BaseParam::Intelligence:
     {
-      return calcAttackPower( baseStats.attackPotMagic );
+      return calcAttackPower( chara, baseStats.attackPotMagic );
     }
 
     default:
     {
-      return calcAttackPower( baseStats.attack );
+      return calcAttackPower( chara, baseStats.attack );
     }
   }
 }
@@ -502,8 +506,7 @@ float CalcStats::calculateAutoAttackDamage( const Sapphire::Entity::Chara& chara
 
   auto pot = potency( AUTO_ATTACK_POTENCY );
   auto aa = autoAttack( chara );
-  //auto ap = attackPower( chara );
-  auto ap = 1.f;
+  auto ap = attackPower( chara );
   auto det = determination( chara );
   auto ten = tenacity( chara );
 
diff --git a/src/world/Math/CalcStats.h b/src/world/Math/CalcStats.h
index 11d9fac1..70859de6 100644
--- a/src/world/Math/CalcStats.h
+++ b/src/world/Math/CalcStats.h
@@ -139,7 +139,7 @@ namespace Sapphire::Math
      *
      * @param attackPower The magic/physical attack power value.
      */
-    static float calcAttackPower( uint32_t attackPower );
+    static float calcAttackPower( const Sapphire::Entity::Chara& chara, uint32_t attackPower );
 
     static uint32_t primaryStatValue( const Sapphire::Entity::Chara& chara );
 

From 9a26a24d31d9c8096e7433904edf175c2463e007 Mon Sep 17 00:00:00 2001
From: NotAdam <adam@notadam.me>
Date: Thu, 25 Apr 2019 18:26:35 +1000
Subject: [PATCH 026/351] ignore soulstones in ilvl calculation

---
 src/world/Actor/PlayerInventory.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/world/Actor/PlayerInventory.cpp b/src/world/Actor/PlayerInventory.cpp
index 3d25ad4f..77677c64 100644
--- a/src/world/Actor/PlayerInventory.cpp
+++ b/src/world/Actor/PlayerInventory.cpp
@@ -843,7 +843,7 @@ uint16_t Sapphire::Entity::Player::calculateEquippedGearItemLevel()
   {
     auto currItem = it->second;
 
-    if( currItem )
+    if( currItem && currItem->getCategory() != Common::ItemUICategory::SoulCrystal )
     {
       iLvlResult += currItem->getItemLevel();
 

From 0005b672a7d662df87d9a967675b0388eaa0209b Mon Sep 17 00:00:00 2001
From: NotAdam <adam@notadam.me>
Date: Thu, 25 Apr 2019 21:57:41 +1000
Subject: [PATCH 027/351] cleanup stat calculation code, slightly better
 working aa dmg calc

---
 src/world/Actor/Chara.cpp    | 130 ++++++++++++++++++++++++++++++++++-
 src/world/Actor/Chara.h      |   2 +
 src/world/Actor/Player.cpp   |  38 +++++-----
 src/world/Math/CalcStats.cpp |  85 +++++++++--------------
 src/world/Math/CalcStats.h   |   8 ++-
 5 files changed, 191 insertions(+), 72 deletions(-)

diff --git a/src/world/Actor/Chara.cpp b/src/world/Actor/Chara.cpp
index 968698b0..779c3afd 100644
--- a/src/world/Actor/Chara.cpp
+++ b/src/world/Actor/Chara.cpp
@@ -21,7 +21,7 @@
 #include "Action/Action.h"
 #include "ServerMgr.h"
 #include "Session.h"
-#include "Math/CalcBattle.h"
+#include "Math/CalcStats.h"
 #include "Chara.h"
 #include "Player.h"
 #include "Manager/TerritoryMgr.h"
@@ -729,4 +729,132 @@ Sapphire::Common::BaseParam Sapphire::Entity::Chara::getPrimaryStat() const
   assert( classJob );
 
   return static_cast< Sapphire::Common::BaseParam >( classJob->primaryStat );
+}
+
+uint32_t Sapphire::Entity::Chara::getStatValue( Sapphire::Common::BaseParam baseParam ) const
+{
+  uint32_t value = 0;
+
+  switch( baseParam )
+  {
+    case Common::BaseParam::Strength:
+    {
+      value = m_baseStats.str;
+      break;
+    }
+
+    case Common::BaseParam::Dexterity:
+    {
+      value = m_baseStats.dex;
+      break;
+    }
+
+    case Common::BaseParam::Vitality:
+    {
+      value = m_baseStats.vit;
+      break;
+    }
+
+    case Common::BaseParam::Intelligence:
+    {
+      value = m_baseStats.inte;
+      break;
+    }
+
+    case Common::BaseParam::Mind:
+    {
+      value = m_baseStats.mnd;
+      break;
+    }
+
+    case Common::BaseParam::Piety:
+    {
+      value = m_baseStats.pie;
+      break;
+    }
+
+    case Common::BaseParam::Determination:
+    {
+      value = m_baseStats.determination;
+      break;
+    }
+
+    case Common::BaseParam::HP:
+    {
+      value = m_baseStats.max_hp;
+      break;
+    }
+
+    case Common::BaseParam::MP:
+    {
+      value = m_baseStats.max_mp;
+      break;
+    }
+
+    case Common::BaseParam::AttackPower:
+    {
+      value = m_baseStats.attack;
+      break;
+    }
+
+    case Common::BaseParam::AttackMagicPotency:
+    {
+      value = m_baseStats.attackPotMagic;
+      break;
+    }
+
+    case Common::BaseParam::HealingMagicPotency:
+    {
+      value = m_baseStats.healingPotMagic;
+      break;
+    }
+
+    case Common::BaseParam::SkillSpeed:
+    {
+      value = m_baseStats.skillSpeed;
+      break;
+    }
+
+    case Common::BaseParam::SpellSpeed:
+    {
+      value = m_baseStats.spellSpeed;
+      break;
+    }
+
+    case Common::BaseParam::CriticalHit:
+    {
+      value = m_baseStats.critHitRate;
+      break;
+    }
+
+    case Common::BaseParam::Defense:
+    {
+      value = m_baseStats.defense;
+      break;
+    }
+
+    case Common::BaseParam::MagicDefense:
+    {
+      value = m_baseStats.magicDefense;
+      break;
+    }
+
+    case Common::BaseParam::Tenacity:
+    {
+      value = m_baseStats.tenacity;
+      break;
+    }
+
+    // todo: not sure if this is right?
+    case Common::BaseParam::DirectHitRate:
+    {
+      value = m_baseStats.accuracy;
+      break;
+    }
+
+    default:
+      break;
+  }
+
+  return value + getBonusStat( baseParam );
 }
\ No newline at end of file
diff --git a/src/world/Actor/Chara.h b/src/world/Actor/Chara.h
index 4e2d8e9b..5679b2cb 100644
--- a/src/world/Actor/Chara.h
+++ b/src/world/Actor/Chara.h
@@ -191,6 +191,8 @@ namespace Sapphire::Entity
 
     ActorStats getStats() const;
 
+    uint32_t getStatValue( Common::BaseParam baseParam ) const;
+
     uint32_t getHp() const;
 
     uint32_t getHpPercent() const;
diff --git a/src/world/Actor/Player.cpp b/src/world/Actor/Player.cpp
index 1547a860..32852714 100644
--- a/src/world/Actor/Player.cpp
+++ b/src/world/Actor/Player.cpp
@@ -313,28 +313,28 @@ void Sapphire::Entity::Player::sendStats()
 {
 
   auto statPacket = makeZonePacket< FFXIVIpcPlayerStats >( getId() );
-  statPacket->data().strength = m_baseStats.str + m_bonusStats[ static_cast< uint8_t >( Common::BaseParam::Strength ) ];
-  statPacket->data().dexterity = m_baseStats.dex + m_bonusStats[ static_cast< uint8_t >( Common::BaseParam::Dexterity ) ];
-  statPacket->data().vitality = m_baseStats.vit + m_bonusStats[ static_cast< uint8_t >( Common::BaseParam::Vitality ) ];
-  statPacket->data().intelligence = m_baseStats.inte + m_bonusStats[ static_cast< uint8_t >( Common::BaseParam::Intelligence ) ];
-  statPacket->data().mind = m_baseStats.mnd + m_bonusStats[ static_cast< uint8_t >( Common::BaseParam::Mind ) ];
-  statPacket->data().piety = m_baseStats.pie + m_bonusStats[ static_cast< uint8_t >( Common::BaseParam::Piety ) ];
-  statPacket->data().determination = m_baseStats.determination + m_bonusStats[ static_cast< uint8_t >( Common::BaseParam::Determination ) ];
-  statPacket->data().hp = m_baseStats.max_hp + m_bonusStats[ static_cast< uint8_t >( Common::BaseParam::HP ) ];
-  statPacket->data().mp = m_baseStats.max_mp + m_bonusStats[ static_cast< uint8_t >( Common::BaseParam::MP ) ];
+  statPacket->data().strength = getStatValue( Common::BaseParam::Strength );
+  statPacket->data().dexterity = getStatValue( Common::BaseParam::Dexterity );
+  statPacket->data().vitality = getStatValue( Common::BaseParam::Vitality );
+  statPacket->data().intelligence = getStatValue( Common::BaseParam::Intelligence );
+  statPacket->data().mind = getStatValue( Common::BaseParam::Mind );
+  statPacket->data().piety = getStatValue( Common::BaseParam::Piety );
+  statPacket->data().determination = getStatValue( Common::BaseParam::Determination );
+  statPacket->data().hp = getStatValue( Common::BaseParam::HP );
+  statPacket->data().mp = getStatValue( Common::BaseParam::MP );
   statPacket->data().accuracy = m_baseStats.accuracy;
-  statPacket->data().attack = m_baseStats.attack + m_bonusStats[ static_cast< uint8_t >( Common::BaseParam::AttackPower ) ];
-  statPacket->data().attackMagicPotency = m_baseStats.attackPotMagic + m_bonusStats[ static_cast< uint8_t >( Common::BaseParam::AttackMagicPotency ) ];
-  statPacket->data().healingMagicPotency = m_baseStats.healingPotMagic + m_bonusStats[ static_cast< uint8_t >( Common::BaseParam::HealingMagicPotency ) ];
-  statPacket->data().skillSpeed = m_baseStats.skillSpeed + m_bonusStats[ static_cast< uint8_t >( Common::BaseParam::SkillSpeed ) ];
-  statPacket->data().spellSpeed = m_baseStats.spellSpeed + m_bonusStats[ static_cast< uint8_t >( Common::BaseParam::SpellSpeed ) ];
-  statPacket->data().spellSpeed1 = m_baseStats.spellSpeed + m_bonusStats[ static_cast< uint8_t >( Common::BaseParam::SpellSpeed ) ];
+  statPacket->data().attack = getStatValue( Common::BaseParam::AttackPower );
+  statPacket->data().attackMagicPotency = getStatValue( Common::BaseParam::AttackMagicPotency );
+  statPacket->data().healingMagicPotency = getStatValue( Common::BaseParam::HealingMagicPotency );
+  statPacket->data().skillSpeed = getStatValue( Common::BaseParam::SkillSpeed );
+  statPacket->data().spellSpeed = getStatValue( Common::BaseParam::SpellSpeed );
+  statPacket->data().spellSpeed1 = getStatValue( Common::BaseParam::SpellSpeed );
   statPacket->data().spellSpeedMod = 100;
 
-  statPacket->data().criticalHitRate = m_baseStats.critHitRate + m_bonusStats[ static_cast< uint8_t >( Common::BaseParam::CriticalHit ) ];
-  statPacket->data().defense = m_baseStats.defense + m_bonusStats[ static_cast< uint8_t >( Common::BaseParam::Defense ) ];
-  statPacket->data().magicDefense = m_baseStats.magicDefense + m_bonusStats[ static_cast< uint8_t >( Common::BaseParam::MagicDefense ) ];
-  statPacket->data().tenacity = m_baseStats.tenacity + m_bonusStats[ static_cast< uint8_t >( Common::BaseParam::Tenacity ) ];
+  statPacket->data().criticalHitRate = getStatValue( Common::BaseParam::CriticalHit );
+  statPacket->data().defense = getStatValue( Common::BaseParam::Defense );
+  statPacket->data().magicDefense = getStatValue( Common::BaseParam::MagicDefense );
+  statPacket->data().tenacity = getStatValue( Common::BaseParam::Tenacity );
 
   queuePacket( statPacket );
 }
diff --git a/src/world/Math/CalcStats.cpp b/src/world/Math/CalcStats.cpp
index 1134ffa0..1542e2fd 100644
--- a/src/world/Math/CalcStats.cpp
+++ b/src/world/Math/CalcStats.cpp
@@ -270,7 +270,7 @@ uint16_t CalcStats::calculateMpCost( const Sapphire::Entity::Chara& chara, uint1
 float CalcStats::blockProbability( const Chara& chara )
 {
   auto level = chara.getLevel();
-  auto blockRate = static_cast< float >( chara.getBonusStat( Common::BaseParam::BlockRate ) );
+  auto blockRate = static_cast< float >( chara.getStatValue( Common::BaseParam::BlockRate ) );
   auto levelVal =  static_cast< float >( levelTable[ level ][ Common::LevelTableEntry::DIV ] );
 
   return std::floor( ( 30 * blockRate ) / levelVal + 10 );
@@ -281,8 +281,7 @@ float CalcStats::directHitProbability( const Chara& chara )
   const auto& baseStats = chara.getStats();
   auto level = chara.getLevel();
 
-  float dhRate = static_cast< float >( chara.getBonusStat( Common::BaseParam::DirectHitRate ) ) +
-                 baseStats.accuracy;
+  float dhRate = chara.getStatValue( Common::BaseParam::DirectHitRate );
 
   auto divVal = static_cast< float >( levelTable[ level ][ Common::LevelTableEntry::DIV ] );
   auto subVal = static_cast< float >( levelTable[ level ][ Common::LevelTableEntry::SUB ] );
@@ -295,8 +294,7 @@ float CalcStats::criticalHitProbability( const Chara& chara )
   const auto& baseStats = chara.getStats();
   auto level = chara.getLevel();
 
-  float chRate = static_cast< float >( chara.getBonusStat( Common::BaseParam::CriticalHit ) ) +
-                 baseStats.critHitRate;
+  float chRate = chara.getStatValue( Common::BaseParam::CriticalHit );
 
   auto divVal = static_cast< float >( levelTable[ level ][ Common::LevelTableEntry::DIV ] );
   auto subVal = static_cast< float >( levelTable[ level ][ Common::LevelTableEntry::SUB ] );
@@ -348,61 +346,70 @@ float CalcStats::calcAttackPower( const Sapphire::Entity::Chara& chara, uint32_t
   auto mainVal = static_cast< float >( levelTable[ level ][ Common::LevelTableEntry::MAIN ] );
   auto divVal = static_cast< float >( levelTable[ level ][ Common::LevelTableEntry::DIV ] );
 
+  // todo: not sure if its ( ap - mv ) / mv or ( ap - mv ) / dv
   return std::floor( ( 125.f * ( attackPower - mainVal ) / divVal ) + 100.f ) / 100.f;
 }
 
-float CalcStats::attackPower( const Sapphire::Entity::Chara& chara )
+float CalcStats::getPrimaryAttackPower( const Sapphire::Entity::Chara& chara )
 {
   const auto& baseStats = chara.getStats();
 
-  // todo: this is wrong
-  if( chara.isBattleNpc() )
-    return calcAttackPower( chara, baseStats.attack );
-
   switch( chara.getPrimaryStat() )
   {
     case Common::BaseParam::Mind:
     {
-      return calcAttackPower( chara, baseStats.healingPotMagic );
+      return healingMagicPower( chara );
     }
     case Common::BaseParam::Intelligence:
     {
-      return calcAttackPower( chara, baseStats.attackPotMagic );
+      return magicAttackPower( chara );
     }
 
     default:
     {
-      return calcAttackPower( chara, baseStats.attack );
+      return attackPower( chara );
     }
   }
 }
 
+float CalcStats::attackPower( const Sapphire::Entity::Chara& chara )
+{
+  return calcAttackPower( chara, chara.getStatValue( Common::BaseParam::AttackPower ) );
+}
+
+float CalcStats::magicAttackPower( const Sapphire::Entity::Chara& chara )
+{
+  return calcAttackPower( chara, chara.getStatValue( Common::BaseParam::AttackMagicPotency ) );
+}
+
+float CalcStats::healingMagicPower( const Sapphire::Entity::Chara& chara )
+{
+  return calcAttackPower( chara, chara.getStatValue( Common::BaseParam::HealingMagicPotency ) );
+}
+
 float CalcStats::determination( const Sapphire::Entity::Chara& chara )
 {
   auto level = chara.getLevel();
-  const auto& baseStats = chara.getStats();
 
   auto mainVal = static_cast< float >( levelTable[ level ][ Common::LevelTableEntry::MAIN ] );
   auto divVal = static_cast< float >( levelTable[ level ][ Common::LevelTableEntry::DIV ] );
 
-  return std::floor( 130.f * ( baseStats.determination - mainVal ) / divVal + 1000.f ) / 1000.f;
+  return std::floor( 130.f * ( chara.getStatValue( Common::BaseParam::Determination ) - mainVal ) / divVal + 1000.f ) / 1000.f;
 }
 
 float CalcStats::tenacity( const Sapphire::Entity::Chara& chara )
 {
   auto level = chara.getLevel();
-  const auto& baseStats = chara.getStats();
 
   auto subVal = static_cast< float >( levelTable[ level ][ Common::LevelTableEntry::SUB ] );
   auto divVal = static_cast< float >( levelTable[ level ][ Common::LevelTableEntry::DIV ] );
 
-  return std::floor( 100.f * ( baseStats.tenacity - subVal ) / divVal + 1000.f ) / 1000.f;
+  return std::floor( 100.f * ( chara.getStatValue( Common::BaseParam::Tenacity ) - subVal ) / divVal + 1000.f ) / 1000.f;
 }
 
 float CalcStats::speed( const Sapphire::Entity::Chara& chara )
 {
   auto level = chara.getLevel();
-  const auto& baseStats = chara.getStats();
 
   auto subVal = static_cast< float >( levelTable[ level ][ Common::LevelTableEntry::SUB ] );
   auto divVal = static_cast< float >( levelTable[ level ][ Common::LevelTableEntry::DIV ] );
@@ -414,11 +421,11 @@ float CalcStats::speed( const Sapphire::Entity::Chara& chara )
   {
     case Common::BaseParam::Intelligence:
     case Common::BaseParam::Mind:
-      speedVal = baseStats.spellSpeed;
+      speedVal = chara.getStatValue( Common::BaseParam::SpellSpeed );
       break;
 
     default:
-      speedVal = baseStats.skillSpeed;
+      speedVal = chara.getStatValue( Common::BaseParam::SkillSpeed );
   }
 
   return std::floor( 130.f * ( speedVal - subVal ) / divVal + 1000.f ) / 1000.f;
@@ -427,32 +434,29 @@ float CalcStats::speed( const Sapphire::Entity::Chara& chara )
 float CalcStats::criticalHitBonus( const Sapphire::Entity::Chara& chara )
 {
   auto level = chara.getLevel();
-  const auto& baseStats = chara.getStats();
 
   auto subVal = static_cast< float >( levelTable[ level ][ Common::LevelTableEntry::SUB ] );
   auto divVal = static_cast< float >( levelTable[ level ][ Common::LevelTableEntry::DIV ] );
 
-  return std::floor( 200.f * ( baseStats.critHitRate - subVal ) / divVal + 1400.f ) / 1000.f;
+  return std::floor( 200.f * ( chara.getStatValue( Common::BaseParam::CriticalHit ) - subVal ) / divVal + 1400.f ) / 1000.f;
 }
 
 float CalcStats::physicalDefence( const Sapphire::Entity::Chara& chara )
 {
   auto level = chara.getLevel();
-  const auto& baseStats = chara.getStats();
 
   auto divVal = static_cast< float >( levelTable[ level ][ Common::LevelTableEntry::DIV ] );
 
-  return std::floor( 15.f * baseStats.defense ) / 100.f;
+  return std::floor( 15.f * chara.getStatValue( Common::BaseParam::Defense ) ) / 100.f;
 }
 
 float CalcStats::magicDefence( const Sapphire::Entity::Chara& chara )
 {
   auto level = chara.getLevel();
-  const auto& baseStats = chara.getStats();
 
   auto divVal = static_cast< float >( levelTable[ level ][ Common::LevelTableEntry::DIV ] );
 
-  return std::floor( 15.f * baseStats.magicDefense ) / 100.f;
+  return std::floor( 15.f * chara.getStatValue( Common::BaseParam::MagicDefense ) ) / 100.f;
 }
 
 float CalcStats::blockStrength( const Sapphire::Entity::Chara& chara )
@@ -494,9 +498,7 @@ float CalcStats::autoAttack( const Sapphire::Entity::Chara& chara )
 
 float CalcStats::healingMagicPotency( const Sapphire::Entity::Chara& chara )
 {
-  const auto& baseStats = chara.getStats();
-
-  return std::floor( 100.f * ( baseStats.healingPotMagic - 292.f ) / 264.f + 100.f ) / 100.f;
+  return std::floor( 100.f * ( chara.getStatValue( Common::BaseParam::HealingMagicPotency ) - 292.f ) / 264.f + 100.f ) / 100.f;
 }
 
 float CalcStats::calculateAutoAttackDamage( const Sapphire::Entity::Chara& chara )
@@ -506,11 +508,11 @@ float CalcStats::calculateAutoAttackDamage( const Sapphire::Entity::Chara& chara
 
   auto pot = potency( AUTO_ATTACK_POTENCY );
   auto aa = autoAttack( chara );
-  auto ap = attackPower( chara );
+  auto ap = getPrimaryAttackPower( chara );
   auto det = determination( chara );
   auto ten = tenacity( chara );
 
-  Logger::info( "auto attack: pot: {} aa: {} ap: {} det: {} ten: {}", pot, aa, ap, det, ten );
+  Logger::debug( "auto attack: pot: {} aa: {} ap: {} det: {} ten: {}", pot, aa, ap, det, ten );
 
   auto factor = std::floor( pot * aa * ap * det * ten );
 
@@ -531,24 +533,5 @@ float CalcStats::calculateAutoAttackDamage( const Sapphire::Entity::Chara& chara
 
 uint32_t CalcStats::primaryStatValue( const Sapphire::Entity::Chara& chara )
 {
-  const auto& baseStats = chara.getStats();
-
-  switch( chara.getPrimaryStat() )
-  {
-    case Common::BaseParam::Strength:
-    default:
-      return baseStats.str;
-
-    case Common::BaseParam::Intelligence:
-      return baseStats.inte;
-
-    case Common::BaseParam::Mind:
-      return baseStats.mnd;
-
-    case Common::BaseParam::Vitality:
-      return baseStats.vit;
-
-    case Common::BaseParam::Dexterity:
-      return baseStats.dex;
-  }
+  return chara.getStatValue( chara.getPrimaryStat() );
 }
\ No newline at end of file
diff --git a/src/world/Math/CalcStats.h b/src/world/Math/CalcStats.h
index 70859de6..5f2b4060 100644
--- a/src/world/Math/CalcStats.h
+++ b/src/world/Math/CalcStats.h
@@ -63,8 +63,14 @@ namespace Sapphire::Math
      *
      * @param chara The source/casting character.
      */
+    static float getPrimaryAttackPower( const Sapphire::Entity::Chara& chara );
+
     static float attackPower( const Sapphire::Entity::Chara& chara );
 
+    static float magicAttackPower( const Sapphire::Entity::Chara& chara );
+
+    static float healingMagicPower( const Sapphire::Entity::Chara& chara );
+
     /*!
      * @brief Calculates determinations contribution to damage and healing output.
      *
@@ -132,6 +138,7 @@ namespace Sapphire::Math
 
     static float calculateAutoAttackDamage( const Sapphire::Entity::Chara& chara );
 
+    static uint32_t primaryStatValue( const Sapphire::Entity::Chara& chara );
   private:
 
     /*!
@@ -141,7 +148,6 @@ namespace Sapphire::Math
      */
     static float calcAttackPower( const Sapphire::Entity::Chara& chara, uint32_t attackPower );
 
-    static uint32_t primaryStatValue( const Sapphire::Entity::Chara& chara );
 
   };
 

From a0d596f40fa1b1c739624c0f361b290ab4e0f4b5 Mon Sep 17 00:00:00 2001
From: NotAdam <adam@notadam.me>
Date: Thu, 25 Apr 2019 22:45:23 +1000
Subject: [PATCH 028/351] fix autoattack range

---
 src/world/Actor/Chara.cpp  | 4 ++--
 src/world/Actor/Player.cpp | 5 +++--
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/world/Actor/Chara.cpp b/src/world/Actor/Chara.cpp
index 779c3afd..bb328c33 100644
--- a/src/world/Actor/Chara.cpp
+++ b/src/world/Actor/Chara.cpp
@@ -793,8 +793,8 @@ uint32_t Sapphire::Entity::Chara::getStatValue( Sapphire::Common::BaseParam base
 
     case Common::BaseParam::AttackPower:
     {
-      value = m_baseStats.attack;
-      break;
+      // todo: think this is right... not sure
+      return getStatValue( Common::BaseParam::Strength );
     }
 
     case Common::BaseParam::AttackMagicPotency:
diff --git a/src/world/Actor/Player.cpp b/src/world/Actor/Player.cpp
index 32852714..bae8edb5 100644
--- a/src/world/Actor/Player.cpp
+++ b/src/world/Actor/Player.cpp
@@ -1105,9 +1105,10 @@ void Sapphire::Entity::Player::update( uint64_t tickCount )
       {
         if( actor->getId() == m_targetId && actor->getAsChara()->isAlive() && mainWeap )
         {
+          auto chara = actor->getAsChara();
+
           // default autoattack range
-          // TODO make this dependant on bnpc size
-          uint32_t range = 7;
+          float range = 3.f + chara->getRadius();
 
           // default autoattack range for ranged classes
           if( getClass() == ClassJob::Machinist ||

From 8c3c6e7998053064c2eb196e812def57cf6accf7 Mon Sep 17 00:00:00 2001
From: Biscuit <umu@owo.icu>
Date: Fri, 26 Apr 2019 17:47:59 +1000
Subject: [PATCH 029/351] Document world visit packet

---
 src/common/Network/PacketDef/Ipcs.h               |  3 +++
 src/common/Network/PacketDef/Zone/ServerZoneDef.h | 13 +++++++++++++
 2 files changed, 16 insertions(+)

diff --git a/src/common/Network/PacketDef/Ipcs.h b/src/common/Network/PacketDef/Ipcs.h
index daed4d35..3c98ae7f 100644
--- a/src/common/Network/PacketDef/Ipcs.h
+++ b/src/common/Network/PacketDef/Ipcs.h
@@ -74,6 +74,9 @@ namespace Sapphire::Network::Packets
     CancelAllianceForming = 0x00C6, // updated 4.2
 
     Chat = 0x00F7, // updated 4.5?
+
+    WorldVisitList = 0x00FE, // added 4.5
+
     SocialList = 0x0103, // updated 4.5
 
     UpdateSearchInfo = 0x0106, // updated 4.5
diff --git a/src/common/Network/PacketDef/Zone/ServerZoneDef.h b/src/common/Network/PacketDef/Zone/ServerZoneDef.h
index 650979e4..924b0912 100644
--- a/src/common/Network/PacketDef/Zone/ServerZoneDef.h
+++ b/src/common/Network/PacketDef/Zone/ServerZoneDef.h
@@ -52,6 +52,19 @@ namespace Sapphire::Network::Packets::Server
     // client doesn't care about the data (zero sized) for this opcode anyway.
   };
 
+  /**
+  * Structural representation of the packet sent by the server
+  * to show a list of worlds for world visit
+  */
+  struct FFXIVIpcWorldVisitList : FFXIVIpcBasePacket< WorldVisitList >
+  {
+    struct worldEntry
+    {
+      uint16_t id; // this is the id of the world from lobby
+      uint16_t status; // 1 = available (this is what retail sends) | 2+ = unavailable (this will need to be checked with retail if it's exactly 2 or not since it does not actually lock the option)
+    } world[16];
+  };
+
   /**
   * Structural representation of the packet sent by the server
   * carrying chat messages

From fc2c3248de979beae7b00f6dd7693c119fca552d Mon Sep 17 00:00:00 2001
From: Mordred <ffxivsapphire@gmail.com>
Date: Sun, 28 Apr 2019 23:34:43 +0200
Subject: [PATCH 030/351] Some naming changes for actions

---
 src/common/Common.h                          |  1 +
 src/world/Action/Action.cpp                  |  4 ++--
 src/world/Manager/ActionMgr.cpp              |  4 ++--
 src/world/Manager/ActionMgr.h                |  4 ++--
 src/world/Network/GameConnection.cpp         |  2 +-
 src/world/Network/GameConnection.h           |  4 ++--
 src/world/Network/Handlers/ActionHandler.cpp | 14 +++++++-------
 7 files changed, 17 insertions(+), 16 deletions(-)

diff --git a/src/common/Common.h b/src/common/Common.h
index a2d59028..5965228f 100644
--- a/src/common/Common.h
+++ b/src/common/Common.h
@@ -983,6 +983,7 @@ namespace Sapphire::Common
     SingleTarget = 1,
     CircularAOE = 2,
     RectangularAOE = 4,
+    CircularAoEPlaced = 7
   };
 
   using PlayerStateFlagList = std::vector< PlayerStateFlag >;
diff --git a/src/world/Action/Action.cpp b/src/world/Action/Action.cpp
index d00e4cc4..c7c7790f 100644
--- a/src/world/Action/Action.cpp
+++ b/src/world/Action/Action.cpp
@@ -100,7 +100,7 @@ bool Sapphire::Action::Action::init()
   m_primaryCostType = static_cast< Common::ActionPrimaryCostType >( m_actionData->costType );
   m_primaryCost = m_actionData->cost;
 
-  if( !m_actionData->targetArea )
+  /*if( !m_actionData->targetArea )
   {
     // override pos to target position
     // todo: this is kinda dirty
@@ -112,7 +112,7 @@ bool Sapphire::Action::Action::init()
         break;
       }
     }
-  }
+  }*/
 
   // todo: add missing rows for secondaryCostType/secondaryCostType and rename the current rows to primaryCostX
 
diff --git a/src/world/Manager/ActionMgr.cpp b/src/world/Manager/ActionMgr.cpp
index aa02bb4d..1f03d840 100644
--- a/src/world/Manager/ActionMgr.cpp
+++ b/src/world/Manager/ActionMgr.cpp
@@ -17,8 +17,8 @@ World::Manager::ActionMgr::ActionMgr( Sapphire::FrameworkPtr pFw ) :
 
 }
 
-void World::Manager::ActionMgr::handleAoEPlayerAction( Entity::Player& player, uint32_t actionId,
-                                                       Data::ActionPtr actionData, Common::FFXIVARR_POSITION3 pos )
+void World::Manager::ActionMgr::handlePlacedPlayerAction( Entity::Player& player, uint32_t actionId,
+                                                          Data::ActionPtr actionData, Common::FFXIVARR_POSITION3 pos )
 {
   player.sendDebug( "got aoe act: {0}", actionData->name );
 
diff --git a/src/world/Manager/ActionMgr.h b/src/world/Manager/ActionMgr.h
index 67d2ea5f..e3ab37d3 100644
--- a/src/world/Manager/ActionMgr.h
+++ b/src/world/Manager/ActionMgr.h
@@ -23,8 +23,8 @@ namespace Sapphire::World::Manager
 
     void handleTargetedPlayerAction( Entity::Player& player, uint32_t actionId,
                                      Data::ActionPtr actionData, uint64_t targetId );
-    void handleAoEPlayerAction( Entity::Player& player, uint32_t actionId,
-                                Data::ActionPtr actionData, Common::FFXIVARR_POSITION3 pos );
+    void handlePlacedPlayerAction( Entity::Player& player, uint32_t actionId,
+                                   Data::ActionPtr actionData, Common::FFXIVARR_POSITION3 pos );
 
     void handleItemAction( Entity::Player& player, uint32_t itemId, Data::ItemActionPtr itemActionData,
                            uint16_t itemSourceSlot, uint16_t itemSourceContainer );
diff --git a/src/world/Network/GameConnection.cpp b/src/world/Network/GameConnection.cpp
index 1f16ae03..799835bb 100644
--- a/src/world/Network/GameConnection.cpp
+++ b/src/world/Network/GameConnection.cpp
@@ -73,7 +73,7 @@ Sapphire::Network::GameConnection::GameConnection( Sapphire::Network::HivePtr pH
   setZoneHandler( ClientZoneIpcType::DiscoveryHandler, "DiscoveryHandler", &GameConnection::discoveryHandler );
 
   setZoneHandler( ClientZoneIpcType::SkillHandler, "ActionHandler", &GameConnection::actionHandler );
-  setZoneHandler( ClientZoneIpcType::AoESkillHandler, "AoESkillHandler", &GameConnection::aoeActionHandler );
+  setZoneHandler( ClientZoneIpcType::AoESkillHandler, "AoESkillHandler", &GameConnection::placedActionHandler );
 
   setZoneHandler( ClientZoneIpcType::GMCommand1, "GMCommand1", &GameConnection::gm1Handler );
   setZoneHandler( ClientZoneIpcType::GMCommand2, "GMCommand2", &GameConnection::gm2Handler );
diff --git a/src/world/Network/GameConnection.h b/src/world/Network/GameConnection.h
index a83735e5..61be56c5 100644
--- a/src/world/Network/GameConnection.h
+++ b/src/world/Network/GameConnection.h
@@ -157,8 +157,8 @@ namespace Sapphire::Network
     DECLARE_HANDLER( cfDutyAccepted );
 
     DECLARE_HANDLER( actionHandler );
-    
-    DECLARE_HANDLER( aoeActionHandler );
+
+    DECLARE_HANDLER( placedActionHandler );
 
     DECLARE_HANDLER( gm1Handler );
 
diff --git a/src/world/Network/Handlers/ActionHandler.cpp b/src/world/Network/Handlers/ActionHandler.cpp
index 367f46e9..460c294a 100644
--- a/src/world/Network/Handlers/ActionHandler.cpp
+++ b/src/world/Network/Handlers/ActionHandler.cpp
@@ -27,7 +27,7 @@ void Sapphire::Network::GameConnection::actionHandler( FrameworkPtr pFw,
   const auto itemSourceSlot = packet.data().itemSourceSlot;
   const auto itemSourceContainer = packet.data().itemSourceContainer;
 
-//  player.sendDebug( "Skill type: {0}, sequence: {1}, actionId: {2}, targetId: {3}", type, sequence, actionId, targetId );
+  player.sendDebug( "Skill type: {0}, sequence: {1}, actionId: {2}, targetId: {3}", type, sequence, actionId, targetId );
 
   auto exdData = m_pFw->get< Data::ExdDataGenerated >();
   assert( exdData );
@@ -81,9 +81,9 @@ void Sapphire::Network::GameConnection::actionHandler( FrameworkPtr pFw,
 
 }
 
-void Sapphire::Network::GameConnection::aoeActionHandler( FrameworkPtr pFw,
-                                                          const Packets::FFXIVARR_PACKET_RAW& inPacket,
-                                                          Entity::Player& player )
+void Sapphire::Network::GameConnection::placedActionHandler( FrameworkPtr pFw,
+                                                             const Packets::FFXIVARR_PACKET_RAW& inPacket,
+                                                             Entity::Player& player )
 {
   const auto packet = ZoneChannelPacket< Client::FFXIVIpcAoESkillHandler >( inPacket );
 
@@ -99,8 +99,8 @@ void Sapphire::Network::GameConnection::aoeActionHandler( FrameworkPtr pFw,
     return;
   }
 
-//  player.sendDebug( "Skill type: {0}, sequence: {1}, actionId: {2}, x:{3}, y:{4}, z:{5}",
-//                    type, sequence, actionId, pos.x, pos.y, pos.z );
+  player.sendDebug( "Skill type: {0}, sequence: {1}, actionId: {2}, x:{3}, y:{4}, z:{5}",
+                    type, sequence, actionId, pos.x, pos.y, pos.z );
 
   auto exdData = m_pFw->get< Data::ExdDataGenerated >();
   assert( exdData );
@@ -112,5 +112,5 @@ void Sapphire::Network::GameConnection::aoeActionHandler( FrameworkPtr pFw,
     return;
 
   auto actionMgr = pFw->get< World::Manager::ActionMgr >();
-  actionMgr->handleAoEPlayerAction( player, actionId, action, pos );
+  actionMgr->handlePlacedPlayerAction( player, actionId, action, pos );
 }

From 3e4483053e04f8f482277bc47c3715eb92c2cb53 Mon Sep 17 00:00:00 2001
From: NotAdam <adam@notadam.me>
Date: Mon, 29 Apr 2019 19:36:57 +1000
Subject: [PATCH 031/351] fix stacktrace on windows

---
 CMakeLists.txt                     |    1 -
 deps/stackwalker/CMakeLists.txt    |   11 -
 deps/stackwalker/StackWalker.cpp   | 1469 ----------------------------
 deps/stackwalker/StackWalker.h     |  255 -----
 src/common/Util/CrashHandler.cpp   |   98 +-
 src/tools/exd_struct_test/main.cpp |    2 +
 6 files changed, 88 insertions(+), 1748 deletions(-)
 delete mode 100644 deps/stackwalker/CMakeLists.txt
 delete mode 100644 deps/stackwalker/StackWalker.cpp
 delete mode 100644 deps/stackwalker/StackWalker.h

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 2454d90b..f6a3419f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -44,7 +44,6 @@ add_subdirectory( "deps/MySQL" )
 add_subdirectory( "deps/datReader" )
 add_subdirectory( "deps/mysqlConnector" )
 add_subdirectory( "deps/recastnavigation" )
-add_subdirectory( "deps/stackwalker" )
 
 ##############################
 #  Main Sapphire Components  #
diff --git a/deps/stackwalker/CMakeLists.txt b/deps/stackwalker/CMakeLists.txt
deleted file mode 100644
index d0111465..00000000
--- a/deps/stackwalker/CMakeLists.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-cmake_minimum_required(VERSION 3.0.2)
-project(Sapphire)
-
-if( WIN32 )
-
-  file( GLOB STACKWALKER_INCLUDE_FILES "${CMAKE_CURRENT_SOURCE_DIR}/*.h*" )
-  file( GLOB STACKWALKER_SOURCE_FILES "${CMAKE_CURRENT_SOURCE_DIR}/*.c*" )
-
-  add_library( stackwalker ${STACKWALKER_INCLUDE_FILES} ${STACKWALKER_SOURCE_FILES} )
-
-endif()
\ No newline at end of file
diff --git a/deps/stackwalker/StackWalker.cpp b/deps/stackwalker/StackWalker.cpp
deleted file mode 100644
index 7008ac67..00000000
--- a/deps/stackwalker/StackWalker.cpp
+++ /dev/null
@@ -1,1469 +0,0 @@
-/**********************************************************************
- *
- * StackWalker.cpp
- * https://github.com/JochenKalmbach/StackWalker
- *
- * Old location: http://stackwalker.codeplex.com/
- *
- *
- * History:
- *  2005-07-27   v1    - First public release on http://www.codeproject.com/
- *                       http://www.codeproject.com/threads/StackWalker.asp
- *  2005-07-28   v2    - Changed the params of the constructor and ShowCallstack
- *                       (to simplify the usage)
- *  2005-08-01   v3    - Changed to use 'CONTEXT_FULL' instead of CONTEXT_ALL
- *                       (should also be enough)
- *                     - Changed to compile correctly with the PSDK of VC7.0
- *                       (GetFileVersionInfoSizeA and GetFileVersionInfoA is wrongly defined:
- *                        it uses LPSTR instead of LPCSTR as first parameter)
- *                     - Added declarations to support VC5/6 without using 'dbghelp.h'
- *                     - Added a 'pUserData' member to the ShowCallstack function and the
- *                       PReadProcessMemoryRoutine declaration (to pass some user-defined data,
- *                       which can be used in the readMemoryFunction-callback)
- *  2005-08-02   v4    - OnSymInit now also outputs the OS-Version by default
- *                     - Added example for doing an exception-callstack-walking in main.cpp
- *                       (thanks to owillebo: http://www.codeproject.com/script/profile/whos_who.asp?id=536268)
- *  2005-08-05   v5    - Removed most Lint (http://www.gimpel.com/) errors... thanks to Okko Willeboordse!
- *  2008-08-04   v6    - Fixed Bug: Missing LEAK-end-tag
- *                       http://www.codeproject.com/KB/applications/leakfinder.aspx?msg=2502890#xx2502890xx
- *                       Fixed Bug: Compiled with "WIN32_LEAN_AND_MEAN"
- *                       http://www.codeproject.com/KB/applications/leakfinder.aspx?msg=1824718#xx1824718xx
- *                       Fixed Bug: Compiling with "/Wall"
- *                       http://www.codeproject.com/KB/threads/StackWalker.aspx?msg=2638243#xx2638243xx
- *                       Fixed Bug: Now checking SymUseSymSrv
- *                       http://www.codeproject.com/KB/threads/StackWalker.aspx?msg=1388979#xx1388979xx
- *                       Fixed Bug: Support for recursive function calls
- *                       http://www.codeproject.com/KB/threads/StackWalker.aspx?msg=1434538#xx1434538xx
- *                       Fixed Bug: Missing FreeLibrary call in "GetModuleListTH32"
- *                       http://www.codeproject.com/KB/threads/StackWalker.aspx?msg=1326923#xx1326923xx
- *                       Fixed Bug: SymDia is number 7, not 9!
- *  2008-09-11   v7      For some (undocumented) reason, dbhelp.h is needing a packing of 8!
- *                       Thanks to Teajay which reported the bug...
- *                       http://www.codeproject.com/KB/applications/leakfinder.aspx?msg=2718933#xx2718933xx
- *  2008-11-27   v8      Debugging Tools for Windows are now stored in a different directory
- *                       Thanks to Luiz Salamon which reported this "bug"...
- *                       http://www.codeproject.com/KB/threads/StackWalker.aspx?msg=2822736#xx2822736xx
- *  2009-04-10   v9      License slightly corrected (<ORGANIZATION> replaced)
- *  2009-11-01   v10     Moved to http://stackwalker.codeplex.com/
- *  2009-11-02   v11     Now try to use IMAGEHLP_MODULE64_V3 if available
- *  2010-04-15   v12     Added support for VS2010 RTM
- *  2010-05-25   v13     Now using secure MyStrcCpy. Thanks to luke.simon:
- *                       http://www.codeproject.com/KB/applications/leakfinder.aspx?msg=3477467#xx3477467xx
- *  2013-01-07   v14     Runtime Check Error VS2010 Debug Builds fixed:
- *                       http://stackwalker.codeplex.com/workitem/10511
- *
- *
- * LICENSE (http://www.opensource.org/licenses/bsd-license.php)
- *
- *   Copyright (c) 2005-2013, Jochen Kalmbach
- *   All rights reserved.
- *
- *   Redistribution and use in source and binary forms, with or without modification,
- *   are permitted provided that the following conditions are met:
- *
- *   Redistributions of source code must retain the above copyright notice,
- *   this list of conditions and the following disclaimer.
- *   Redistributions in binary form must reproduce the above copyright notice,
- *   this list of conditions and the following disclaimer in the documentation
- *   and/or other materials provided with the distribution.
- *   Neither the name of Jochen Kalmbach nor the names of its contributors may be
- *   used to endorse or promote products derived from this software without
- *   specific prior written permission.
- *   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- *   AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
- *   THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- *   ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE
- *   FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- *   (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- *   LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- *   ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- *   (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- *   SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- **********************************************************************/
-
-#include "StackWalker.h"
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <tchar.h>
-#include <windows.h>
-#pragma comment(lib, "version.lib") // for "VerQueryValue"
-#pragma warning(disable : 4826)
-
-
-// If VC7 and later, then use the shipped 'dbghelp.h'-file
-#pragma pack(push, 8)
-#if _MSC_VER >= 1300
-#include <dbghelp.h>
-#else
-// inline the important dbghelp.h-declarations...
-typedef enum
-{
-  SymNone = 0,
-  SymCoff,
-  SymCv,
-  SymPdb,
-  SymExport,
-  SymDeferred,
-  SymSym,
-  SymDia,
-  SymVirtual,
-  NumSymTypes
-} SYM_TYPE;
-typedef struct _IMAGEHLP_LINE64
-{
-  DWORD   SizeOfStruct; // set to sizeof(IMAGEHLP_LINE64)
-  PVOID   Key;          // internal
-  DWORD   LineNumber;   // line number in file
-  PCHAR   FileName;     // full filename
-  DWORD64 Address;      // first instruction of line
-} IMAGEHLP_LINE64, *PIMAGEHLP_LINE64;
-typedef struct _IMAGEHLP_MODULE64
-{
-  DWORD    SizeOfStruct;         // set to sizeof(IMAGEHLP_MODULE64)
-  DWORD64  BaseOfImage;          // base load address of module
-  DWORD    ImageSize;            // virtual size of the loaded module
-  DWORD    TimeDateStamp;        // date/time stamp from pe header
-  DWORD    CheckSum;             // checksum from the pe header
-  DWORD    NumSyms;              // number of symbols in the symbol table
-  SYM_TYPE SymType;              // type of symbols loaded
-  CHAR     ModuleName[32];       // module name
-  CHAR     ImageName[256];       // image name
-  CHAR     LoadedImageName[256]; // symbol file name
-} IMAGEHLP_MODULE64, *PIMAGEHLP_MODULE64;
-typedef struct _IMAGEHLP_SYMBOL64
-{
-  DWORD   SizeOfStruct;  // set to sizeof(IMAGEHLP_SYMBOL64)
-  DWORD64 Address;       // virtual address including dll base address
-  DWORD   Size;          // estimated size of symbol, can be zero
-  DWORD   Flags;         // info about the symbols, see the SYMF defines
-  DWORD   MaxNameLength; // maximum size of symbol name in 'Name'
-  CHAR    Name[1];       // symbol name (null terminated string)
-} IMAGEHLP_SYMBOL64, *PIMAGEHLP_SYMBOL64;
-typedef enum
-{
-  AddrMode1616,
-  AddrMode1632,
-  AddrModeReal,
-  AddrModeFlat
-} ADDRESS_MODE;
-typedef struct _tagADDRESS64
-{
-  DWORD64      Offset;
-  WORD         Segment;
-  ADDRESS_MODE Mode;
-} ADDRESS64, *LPADDRESS64;
-typedef struct _KDHELP64
-{
-  DWORD64 Thread;
-  DWORD   ThCallbackStack;
-  DWORD   ThCallbackBStore;
-  DWORD   NextCallback;
-  DWORD   FramePointer;
-  DWORD64 KiCallUserMode;
-  DWORD64 KeUserCallbackDispatcher;
-  DWORD64 SystemRangeStart;
-  DWORD64 Reserved[8];
-} KDHELP64, *PKDHELP64;
-typedef struct _tagSTACKFRAME64
-{
-  ADDRESS64 AddrPC;         // program counter
-  ADDRESS64 AddrReturn;     // return address
-  ADDRESS64 AddrFrame;      // frame pointer
-  ADDRESS64 AddrStack;      // stack pointer
-  ADDRESS64 AddrBStore;     // backing store pointer
-  PVOID     FuncTableEntry; // pointer to pdata/fpo or NULL
-  DWORD64   Params[4];      // possible arguments to the function
-  BOOL      Far;            // WOW far call
-  BOOL      Virtual;        // is this a virtual frame?
-  DWORD64   Reserved[3];
-  KDHELP64  KdHelp;
-} STACKFRAME64, *LPSTACKFRAME64;
-typedef BOOL(__stdcall* PREAD_PROCESS_MEMORY_ROUTINE64)(HANDLE  hProcess,
-                                                        DWORD64 qwBaseAddress,
-                                                        PVOID   lpBuffer,
-                                                        DWORD   nSize,
-                                                        LPDWORD lpNumberOfBytesRead);
-typedef PVOID(__stdcall* PFUNCTION_TABLE_ACCESS_ROUTINE64)(HANDLE hProcess, DWORD64 AddrBase);
-typedef DWORD64(__stdcall* PGET_MODULE_BASE_ROUTINE64)(HANDLE hProcess, DWORD64 Address);
-typedef DWORD64(__stdcall* PTRANSLATE_ADDRESS_ROUTINE64)(HANDLE      hProcess,
-                                                         HANDLE      hThread,
-                                                         LPADDRESS64 lpaddr);
-
-// clang-format off
-#define SYMOPT_CASE_INSENSITIVE         0x00000001
-#define SYMOPT_UNDNAME                  0x00000002
-#define SYMOPT_DEFERRED_LOADS           0x00000004
-#define SYMOPT_NO_CPP                   0x00000008
-#define SYMOPT_LOAD_LINES               0x00000010
-#define SYMOPT_OMAP_FIND_NEAREST        0x00000020
-#define SYMOPT_LOAD_ANYTHING            0x00000040
-#define SYMOPT_IGNORE_CVREC             0x00000080
-#define SYMOPT_NO_UNQUALIFIED_LOADS     0x00000100
-#define SYMOPT_FAIL_CRITICAL_ERRORS     0x00000200
-#define SYMOPT_EXACT_SYMBOLS            0x00000400
-#define SYMOPT_ALLOW_ABSOLUTE_SYMBOLS   0x00000800
-#define SYMOPT_IGNORE_NT_SYMPATH        0x00001000
-#define SYMOPT_INCLUDE_32BIT_MODULES    0x00002000
-#define SYMOPT_PUBLICS_ONLY             0x00004000
-#define SYMOPT_NO_PUBLICS               0x00008000
-#define SYMOPT_AUTO_PUBLICS             0x00010000
-#define SYMOPT_NO_IMAGE_SEARCH          0x00020000
-#define SYMOPT_SECURE                   0x00040000
-#define SYMOPT_DEBUG                    0x80000000
-#define UNDNAME_COMPLETE                 (0x0000) // Enable full undecoration
-#define UNDNAME_NAME_ONLY                (0x1000) // Crack only the name for primary declaration;
-// clang-format on
-
-#endif // _MSC_VER < 1300
-#pragma pack(pop)
-
-// Some missing defines (for VC5/6):
-#ifndef INVALID_FILE_ATTRIBUTES
-#define INVALID_FILE_ATTRIBUTES ((DWORD)-1)
-#endif
-
-// secure-CRT_functions are only available starting with VC8
-#if _MSC_VER < 1400
-#define strcpy_s(dst, len, src) strcpy(dst, src)
-#define strncpy_s(dst, len, src, maxLen) strncpy(dst, len, src)
-#define strcat_s(dst, len, src) strcat(dst, src)
-#define _snprintf_s _snprintf
-#define _tcscat_s _tcscat
-#endif
-
-static void MyStrCpy(char* szDest, size_t nMaxDestSize, const char* szSrc)
-{
-  if (nMaxDestSize <= 0)
-    return;
-  strncpy_s(szDest, nMaxDestSize, szSrc, _TRUNCATE);
-  // INFO: _TRUNCATE will ensure that it is null-terminated;
-  // but with older compilers (<1400) it uses "strncpy" and this does not!)
-  szDest[nMaxDestSize - 1] = 0;
-} // MyStrCpy
-
-// Normally it should be enough to use 'CONTEXT_FULL' (better would be 'CONTEXT_ALL')
-#define USED_CONTEXT_FLAGS CONTEXT_FULL
-
-class StackWalkerInternal
-{
-public:
-  StackWalkerInternal(StackWalker* parent, HANDLE hProcess)
-  {
-    m_parent = parent;
-    m_hDbhHelp = NULL;
-    pSC = NULL;
-    m_hProcess = hProcess;
-    m_szSymPath = NULL;
-    pSFTA = NULL;
-    pSGLFA = NULL;
-    pSGMB = NULL;
-    pSGMI = NULL;
-    pSGO = NULL;
-    pSGSFA = NULL;
-    pSI = NULL;
-    pSLM = NULL;
-    pSSO = NULL;
-    pSW = NULL;
-    pUDSN = NULL;
-    pSGSP = NULL;
-  }
-  ~StackWalkerInternal()
-  {
-    if (pSC != NULL)
-      pSC(m_hProcess); // SymCleanup
-    if (m_hDbhHelp != NULL)
-      FreeLibrary(m_hDbhHelp);
-    m_hDbhHelp = NULL;
-    m_parent = NULL;
-    if (m_szSymPath != NULL)
-      free(m_szSymPath);
-    m_szSymPath = NULL;
-  }
-  BOOL Init(LPCSTR szSymPath)
-  {
-    if (m_parent == NULL)
-      return FALSE;
-    // Dynamically load the Entry-Points for dbghelp.dll:
-    // First try to load the newest one from
-    TCHAR szTemp[4096];
-    // But before we do this, we first check if the ".local" file exists
-    if (GetModuleFileName(NULL, szTemp, 4096) > 0)
-    {
-      _tcscat_s(szTemp, _T(".local"));
-      if (GetFileAttributes(szTemp) == INVALID_FILE_ATTRIBUTES)
-      {
-        // ".local" file does not exist, so we can try to load the dbghelp.dll from the "Debugging Tools for Windows"
-        // Ok, first try the new path according to the architecture:
-#ifdef _M_IX86
-        if ((m_hDbhHelp == NULL) && (GetEnvironmentVariable(_T("ProgramFiles"), szTemp, 4096) > 0))
-        {
-          _tcscat_s(szTemp, _T("\\Debugging Tools for Windows (x86)\\dbghelp.dll"));
-          // now check if the file exists:
-          if (GetFileAttributes(szTemp) != INVALID_FILE_ATTRIBUTES)
-          {
-            m_hDbhHelp = LoadLibrary(szTemp);
-          }
-        }
-#elif _M_X64
-        if ((m_hDbhHelp == NULL) && (GetEnvironmentVariable(_T("ProgramFiles"), szTemp, 4096) > 0))
-        {
-          _tcscat_s(szTemp, _T("\\Debugging Tools for Windows (x64)\\dbghelp.dll"));
-          // now check if the file exists:
-          if (GetFileAttributes(szTemp) != INVALID_FILE_ATTRIBUTES)
-          {
-            m_hDbhHelp = LoadLibrary(szTemp);
-          }
-        }
-#elif _M_IA64
-        if ((m_hDbhHelp == NULL) && (GetEnvironmentVariable(_T("ProgramFiles"), szTemp, 4096) > 0))
-        {
-          _tcscat_s(szTemp, _T("\\Debugging Tools for Windows (ia64)\\dbghelp.dll"));
-          // now check if the file exists:
-          if (GetFileAttributes(szTemp) != INVALID_FILE_ATTRIBUTES)
-          {
-            m_hDbhHelp = LoadLibrary(szTemp);
-          }
-        }
-#endif
-        // If still not found, try the old directories...
-        if ((m_hDbhHelp == NULL) && (GetEnvironmentVariable(_T("ProgramFiles"), szTemp, 4096) > 0))
-        {
-          _tcscat_s(szTemp, _T("\\Debugging Tools for Windows\\dbghelp.dll"));
-          // now check if the file exists:
-          if (GetFileAttributes(szTemp) != INVALID_FILE_ATTRIBUTES)
-          {
-            m_hDbhHelp = LoadLibrary(szTemp);
-          }
-        }
-#if defined _M_X64 || defined _M_IA64
-        // Still not found? Then try to load the (old) 64-Bit version:
-        if ((m_hDbhHelp == NULL) && (GetEnvironmentVariable(_T("ProgramFiles"), szTemp, 4096) > 0))
-        {
-          _tcscat_s(szTemp, _T("\\Debugging Tools for Windows 64-Bit\\dbghelp.dll"));
-          if (GetFileAttributes(szTemp) != INVALID_FILE_ATTRIBUTES)
-          {
-            m_hDbhHelp = LoadLibrary(szTemp);
-          }
-        }
-#endif
-      }
-    }
-    if (m_hDbhHelp == NULL) // if not already loaded, try to load a default-one
-      m_hDbhHelp = LoadLibrary(_T("dbghelp.dll"));
-    if (m_hDbhHelp == NULL)
-      return FALSE;
-    pSI = (tSI)GetProcAddress(m_hDbhHelp, "SymInitialize");
-    pSC = (tSC)GetProcAddress(m_hDbhHelp, "SymCleanup");
-
-    pSW = (tSW)GetProcAddress(m_hDbhHelp, "StackWalk64");
-    pSGO = (tSGO)GetProcAddress(m_hDbhHelp, "SymGetOptions");
-    pSSO = (tSSO)GetProcAddress(m_hDbhHelp, "SymSetOptions");
-
-    pSFTA = (tSFTA)GetProcAddress(m_hDbhHelp, "SymFunctionTableAccess64");
-    pSGLFA = (tSGLFA)GetProcAddress(m_hDbhHelp, "SymGetLineFromAddr64");
-    pSGMB = (tSGMB)GetProcAddress(m_hDbhHelp, "SymGetModuleBase64");
-    pSGMI = (tSGMI)GetProcAddress(m_hDbhHelp, "SymGetModuleInfo64");
-    pSGSFA = (tSGSFA)GetProcAddress(m_hDbhHelp, "SymGetSymFromAddr64");
-    pUDSN = (tUDSN)GetProcAddress(m_hDbhHelp, "UnDecorateSymbolName");
-    pSLM = (tSLM)GetProcAddress(m_hDbhHelp, "SymLoadModule64");
-    pSGSP = (tSGSP)GetProcAddress(m_hDbhHelp, "SymGetSearchPath");
-
-    if (pSC == NULL || pSFTA == NULL || pSGMB == NULL || pSGMI == NULL || pSGO == NULL ||
-        pSGSFA == NULL || pSI == NULL || pSSO == NULL || pSW == NULL || pUDSN == NULL ||
-        pSLM == NULL)
-    {
-      FreeLibrary(m_hDbhHelp);
-      m_hDbhHelp = NULL;
-      pSC = NULL;
-      return FALSE;
-    }
-
-    // SymInitialize
-    if (szSymPath != NULL)
-      m_szSymPath = _strdup(szSymPath);
-    if (this->pSI(m_hProcess, m_szSymPath, FALSE) == FALSE)
-      this->m_parent->OnDbgHelpErr("SymInitialize", GetLastError(), 0);
-
-    DWORD symOptions = this->pSGO(); // SymGetOptions
-    symOptions |= SYMOPT_LOAD_LINES;
-    symOptions |= SYMOPT_FAIL_CRITICAL_ERRORS;
-    //symOptions |= SYMOPT_NO_PROMPTS;
-    // SymSetOptions
-    symOptions = this->pSSO(symOptions);
-
-    char buf[StackWalker::STACKWALK_MAX_NAMELEN] = {0};
-    if (this->pSGSP != NULL)
-    {
-      if (this->pSGSP(m_hProcess, buf, StackWalker::STACKWALK_MAX_NAMELEN) == FALSE)
-        this->m_parent->OnDbgHelpErr("SymGetSearchPath", GetLastError(), 0);
-    }
-    char  szUserName[1024] = {0};
-    DWORD dwSize = 1024;
-    GetUserNameA(szUserName, &dwSize);
-    this->m_parent->OnSymInit(buf, symOptions, szUserName);
-
-    return TRUE;
-  }
-
-  StackWalker* m_parent;
-
-  HMODULE m_hDbhHelp;
-  HANDLE  m_hProcess;
-  LPSTR   m_szSymPath;
-
-#pragma pack(push, 8)
-  typedef struct IMAGEHLP_MODULE64_V3
-  {
-    DWORD    SizeOfStruct;         // set to sizeof(IMAGEHLP_MODULE64)
-    DWORD64  BaseOfImage;          // base load address of module
-    DWORD    ImageSize;            // virtual size of the loaded module
-    DWORD    TimeDateStamp;        // date/time stamp from pe header
-    DWORD    CheckSum;             // checksum from the pe header
-    DWORD    NumSyms;              // number of symbols in the symbol table
-    SYM_TYPE SymType;              // type of symbols loaded
-    CHAR     ModuleName[32];       // module name
-    CHAR     ImageName[256];       // image name
-    CHAR     LoadedImageName[256]; // symbol file name
-    // new elements: 07-Jun-2002
-    CHAR  LoadedPdbName[256];   // pdb file name
-    DWORD CVSig;                // Signature of the CV record in the debug directories
-    CHAR  CVData[MAX_PATH * 3]; // Contents of the CV record
-    DWORD PdbSig;               // Signature of PDB
-    GUID  PdbSig70;             // Signature of PDB (VC 7 and up)
-    DWORD PdbAge;               // DBI age of pdb
-    BOOL  PdbUnmatched;         // loaded an unmatched pdb
-    BOOL  DbgUnmatched;         // loaded an unmatched dbg
-    BOOL  LineNumbers;          // we have line number information
-    BOOL  GlobalSymbols;        // we have internal symbol information
-    BOOL  TypeInfo;             // we have type information
-    // new elements: 17-Dec-2003
-    BOOL SourceIndexed; // pdb supports source server
-    BOOL Publics;       // contains public symbols
-  };
-
-  typedef struct IMAGEHLP_MODULE64_V2
-  {
-    DWORD    SizeOfStruct;         // set to sizeof(IMAGEHLP_MODULE64)
-    DWORD64  BaseOfImage;          // base load address of module
-    DWORD    ImageSize;            // virtual size of the loaded module
-    DWORD    TimeDateStamp;        // date/time stamp from pe header
-    DWORD    CheckSum;             // checksum from the pe header
-    DWORD    NumSyms;              // number of symbols in the symbol table
-    SYM_TYPE SymType;              // type of symbols loaded
-    CHAR     ModuleName[32];       // module name
-    CHAR     ImageName[256];       // image name
-    CHAR     LoadedImageName[256]; // symbol file name
-  };
-#pragma pack(pop)
-
-  // SymCleanup()
-  typedef BOOL(__stdcall* tSC)(IN HANDLE hProcess);
-  tSC pSC;
-
-  // SymFunctionTableAccess64()
-  typedef PVOID(__stdcall* tSFTA)(HANDLE hProcess, DWORD64 AddrBase);
-  tSFTA pSFTA;
-
-  // SymGetLineFromAddr64()
-  typedef BOOL(__stdcall* tSGLFA)(IN HANDLE hProcess,
-                                  IN DWORD64 dwAddr,
-                                  OUT PDWORD pdwDisplacement,
-                                  OUT PIMAGEHLP_LINE64 Line);
-  tSGLFA pSGLFA;
-
-  // SymGetModuleBase64()
-  typedef DWORD64(__stdcall* tSGMB)(IN HANDLE hProcess, IN DWORD64 dwAddr);
-  tSGMB pSGMB;
-
-  // SymGetModuleInfo64()
-  typedef BOOL(__stdcall* tSGMI)(IN HANDLE hProcess,
-                                 IN DWORD64 dwAddr,
-                                 OUT IMAGEHLP_MODULE64_V3* ModuleInfo);
-  tSGMI pSGMI;
-
-  // SymGetOptions()
-  typedef DWORD(__stdcall* tSGO)(VOID);
-  tSGO pSGO;
-
-  // SymGetSymFromAddr64()
-  typedef BOOL(__stdcall* tSGSFA)(IN HANDLE hProcess,
-                                  IN DWORD64 dwAddr,
-                                  OUT PDWORD64 pdwDisplacement,
-                                  OUT PIMAGEHLP_SYMBOL64 Symbol);
-  tSGSFA pSGSFA;
-
-  // SymInitialize()
-  typedef BOOL(__stdcall* tSI)(IN HANDLE hProcess, IN PSTR UserSearchPath, IN BOOL fInvadeProcess);
-  tSI pSI;
-
-  // SymLoadModule64()
-  typedef DWORD64(__stdcall* tSLM)(IN HANDLE hProcess,
-                                   IN HANDLE hFile,
-                                   IN PSTR ImageName,
-                                   IN PSTR ModuleName,
-                                   IN DWORD64 BaseOfDll,
-                                   IN DWORD SizeOfDll);
-  tSLM pSLM;
-
-  // SymSetOptions()
-  typedef DWORD(__stdcall* tSSO)(IN DWORD SymOptions);
-  tSSO pSSO;
-
-  // StackWalk64()
-  typedef BOOL(__stdcall* tSW)(DWORD                            MachineType,
-                               HANDLE                           hProcess,
-                               HANDLE                           hThread,
-                               LPSTACKFRAME64                   StackFrame,
-                               PVOID                            ContextRecord,
-                               PREAD_PROCESS_MEMORY_ROUTINE64   ReadMemoryRoutine,
-                               PFUNCTION_TABLE_ACCESS_ROUTINE64 FunctionTableAccessRoutine,
-                               PGET_MODULE_BASE_ROUTINE64       GetModuleBaseRoutine,
-                               PTRANSLATE_ADDRESS_ROUTINE64     TranslateAddress);
-  tSW pSW;
-
-  // UnDecorateSymbolName()
-  typedef DWORD(__stdcall WINAPI* tUDSN)(PCSTR DecoratedName,
-                                         PSTR  UnDecoratedName,
-                                         DWORD UndecoratedLength,
-                                         DWORD Flags);
-  tUDSN pUDSN;
-
-  typedef BOOL(__stdcall WINAPI* tSGSP)(HANDLE hProcess, PSTR SearchPath, DWORD SearchPathLength);
-  tSGSP pSGSP;
-
-private:
-// **************************************** ToolHelp32 ************************
-#define MAX_MODULE_NAME32 255
-#define TH32CS_SNAPMODULE 0x00000008
-#pragma pack(push, 8)
-  typedef struct tagMODULEENTRY32
-  {
-    DWORD   dwSize;
-    DWORD   th32ModuleID;  // This module
-    DWORD   th32ProcessID; // owning process
-    DWORD   GlblcntUsage;  // Global usage count on the module
-    DWORD   ProccntUsage;  // Module usage count in th32ProcessID's context
-    BYTE*   modBaseAddr;   // Base address of module in th32ProcessID's context
-    DWORD   modBaseSize;   // Size in bytes of module starting at modBaseAddr
-    HMODULE hModule;       // The hModule of this module in th32ProcessID's context
-    char    szModule[MAX_MODULE_NAME32 + 1];
-    char    szExePath[MAX_PATH];
-  } MODULEENTRY32;
-  typedef MODULEENTRY32* PMODULEENTRY32;
-  typedef MODULEENTRY32* LPMODULEENTRY32;
-#pragma pack(pop)
-
-  BOOL GetModuleListTH32(HANDLE hProcess, DWORD pid)
-  {
-    // CreateToolhelp32Snapshot()
-    typedef HANDLE(__stdcall * tCT32S)(DWORD dwFlags, DWORD th32ProcessID);
-    // Module32First()
-    typedef BOOL(__stdcall * tM32F)(HANDLE hSnapshot, LPMODULEENTRY32 lpme);
-    // Module32Next()
-    typedef BOOL(__stdcall * tM32N)(HANDLE hSnapshot, LPMODULEENTRY32 lpme);
-
-    // try both dlls...
-    const TCHAR* dllname[] = {_T("kernel32.dll"), _T("tlhelp32.dll")};
-    HINSTANCE    hToolhelp = NULL;
-    tCT32S       pCT32S = NULL;
-    tM32F        pM32F = NULL;
-    tM32N        pM32N = NULL;
-
-    HANDLE        hSnap;
-    MODULEENTRY32 me;
-    me.dwSize = sizeof(me);
-    BOOL   keepGoing;
-    size_t i;
-
-    for (i = 0; i < (sizeof(dllname) / sizeof(dllname[0])); i++)
-    {
-      hToolhelp = LoadLibrary(dllname[i]);
-      if (hToolhelp == NULL)
-        continue;
-      pCT32S = (tCT32S)GetProcAddress(hToolhelp, "CreateToolhelp32Snapshot");
-      pM32F = (tM32F)GetProcAddress(hToolhelp, "Module32First");
-      pM32N = (tM32N)GetProcAddress(hToolhelp, "Module32Next");
-      if ((pCT32S != NULL) && (pM32F != NULL) && (pM32N != NULL))
-        break; // found the functions!
-      FreeLibrary(hToolhelp);
-      hToolhelp = NULL;
-    }
-
-    if (hToolhelp == NULL)
-      return FALSE;
-
-    hSnap = pCT32S(TH32CS_SNAPMODULE, pid);
-    if (hSnap == (HANDLE)-1)
-    {
-      FreeLibrary(hToolhelp);
-      return FALSE;
-    }
-
-    keepGoing = !!pM32F(hSnap, &me);
-    int cnt = 0;
-    while (keepGoing)
-    {
-      this->LoadModule(hProcess, me.szExePath, me.szModule, (DWORD64)me.modBaseAddr,
-                       me.modBaseSize);
-      cnt++;
-      keepGoing = !!pM32N(hSnap, &me);
-    }
-    CloseHandle(hSnap);
-    FreeLibrary(hToolhelp);
-    if (cnt <= 0)
-      return FALSE;
-    return TRUE;
-  } // GetModuleListTH32
-
-  // **************************************** PSAPI ************************
-  typedef struct _MODULEINFO
-  {
-    LPVOID lpBaseOfDll;
-    DWORD  SizeOfImage;
-    LPVOID EntryPoint;
-  } MODULEINFO, *LPMODULEINFO;
-
-  BOOL GetModuleListPSAPI(HANDLE hProcess)
-  {
-    // EnumProcessModules()
-    typedef BOOL(__stdcall * tEPM)(HANDLE hProcess, HMODULE * lphModule, DWORD cb,
-                                   LPDWORD lpcbNeeded);
-    // GetModuleFileNameEx()
-    typedef DWORD(__stdcall * tGMFNE)(HANDLE hProcess, HMODULE hModule, LPSTR lpFilename,
-                                      DWORD nSize);
-    // GetModuleBaseName()
-    typedef DWORD(__stdcall * tGMBN)(HANDLE hProcess, HMODULE hModule, LPSTR lpFilename,
-                                     DWORD nSize);
-    // GetModuleInformation()
-    typedef BOOL(__stdcall * tGMI)(HANDLE hProcess, HMODULE hModule, LPMODULEINFO pmi, DWORD nSize);
-
-    HINSTANCE hPsapi;
-    tEPM      pEPM;
-    tGMFNE    pGMFNE;
-    tGMBN     pGMBN;
-    tGMI      pGMI;
-
-    DWORD i;
-    //ModuleEntry e;
-    DWORD        cbNeeded;
-    MODULEINFO   mi;
-    HMODULE*     hMods = 0;
-    char*        tt = NULL;
-    char*        tt2 = NULL;
-    const SIZE_T TTBUFLEN = 8096;
-    int          cnt = 0;
-
-    hPsapi = LoadLibrary(_T("psapi.dll"));
-    if (hPsapi == NULL)
-      return FALSE;
-
-    pEPM = (tEPM)GetProcAddress(hPsapi, "EnumProcessModules");
-    pGMFNE = (tGMFNE)GetProcAddress(hPsapi, "GetModuleFileNameExA");
-    pGMBN = (tGMFNE)GetProcAddress(hPsapi, "GetModuleBaseNameA");
-    pGMI = (tGMI)GetProcAddress(hPsapi, "GetModuleInformation");
-    if ((pEPM == NULL) || (pGMFNE == NULL) || (pGMBN == NULL) || (pGMI == NULL))
-    {
-      // we couldn't find all functions
-      FreeLibrary(hPsapi);
-      return FALSE;
-    }
-
-    hMods = (HMODULE*)malloc(sizeof(HMODULE) * (TTBUFLEN / sizeof(HMODULE)));
-    tt = (char*)malloc(sizeof(char) * TTBUFLEN);
-    tt2 = (char*)malloc(sizeof(char) * TTBUFLEN);
-    if ((hMods == NULL) || (tt == NULL) || (tt2 == NULL))
-      goto cleanup;
-
-    if (!pEPM(hProcess, hMods, TTBUFLEN, &cbNeeded))
-    {
-      //_ftprintf(fLogFile, _T("%lu: EPM failed, GetLastError = %lu\n"), g_dwShowCount, gle );
-      goto cleanup;
-    }
-
-    if (cbNeeded > TTBUFLEN)
-    {
-      //_ftprintf(fLogFile, _T("%lu: More than %lu module handles. Huh?\n"), g_dwShowCount, lenof( hMods ) );
-      goto cleanup;
-    }
-
-    for (i = 0; i < cbNeeded / sizeof(hMods[0]); i++)
-    {
-      // base address, size
-      pGMI(hProcess, hMods[i], &mi, sizeof(mi));
-      // image file name
-      tt[0] = 0;
-      pGMFNE(hProcess, hMods[i], tt, TTBUFLEN);
-      // module name
-      tt2[0] = 0;
-      pGMBN(hProcess, hMods[i], tt2, TTBUFLEN);
-
-      DWORD dwRes = this->LoadModule(hProcess, tt, tt2, (DWORD64)mi.lpBaseOfDll, mi.SizeOfImage);
-      if (dwRes != ERROR_SUCCESS)
-        this->m_parent->OnDbgHelpErr("LoadModule", dwRes, 0);
-      cnt++;
-    }
-
-  cleanup:
-    if (hPsapi != NULL)
-      FreeLibrary(hPsapi);
-    if (tt2 != NULL)
-      free(tt2);
-    if (tt != NULL)
-      free(tt);
-    if (hMods != NULL)
-      free(hMods);
-
-    return cnt != 0;
-  } // GetModuleListPSAPI
-
-  DWORD LoadModule(HANDLE hProcess, LPCSTR img, LPCSTR mod, DWORD64 baseAddr, DWORD size)
-  {
-    CHAR* szImg = _strdup(img);
-    CHAR* szMod = _strdup(mod);
-    DWORD result = ERROR_SUCCESS;
-    if ((szImg == NULL) || (szMod == NULL))
-      result = ERROR_NOT_ENOUGH_MEMORY;
-    else
-    {
-      if (pSLM(hProcess, 0, szImg, szMod, baseAddr, size) == 0)
-        result = GetLastError();
-    }
-    ULONGLONG fileVersion = 0;
-    if ((m_parent != NULL) && (szImg != NULL))
-    {
-      // try to retrieve the file-version:
-      if ((this->m_parent->m_options & StackWalker::RetrieveFileVersion) != 0)
-      {
-        VS_FIXEDFILEINFO* fInfo = NULL;
-        DWORD             dwHandle;
-        DWORD             dwSize = GetFileVersionInfoSizeA(szImg, &dwHandle);
-        if (dwSize > 0)
-        {
-          LPVOID vData = malloc(dwSize);
-          if (vData != NULL)
-          {
-            if (GetFileVersionInfoA(szImg, dwHandle, dwSize, vData) != 0)
-            {
-              UINT  len;
-              TCHAR szSubBlock[] = _T("\\");
-              if (VerQueryValue(vData, szSubBlock, (LPVOID*)&fInfo, &len) == 0)
-                fInfo = NULL;
-              else
-              {
-                fileVersion =
-                    ((ULONGLONG)fInfo->dwFileVersionLS) + ((ULONGLONG)fInfo->dwFileVersionMS << 32);
-              }
-            }
-            free(vData);
-          }
-        }
-      }
-
-      // Retrieve some additional-infos about the module
-      IMAGEHLP_MODULE64_V3 Module;
-      const char*          szSymType = "-unknown-";
-      if (this->GetModuleInfo(hProcess, baseAddr, &Module) != FALSE)
-      {
-        switch (Module.SymType)
-        {
-          case SymNone:
-            szSymType = "-nosymbols-";
-            break;
-          case SymCoff: // 1
-            szSymType = "COFF";
-            break;
-          case SymCv: // 2
-            szSymType = "CV";
-            break;
-          case SymPdb: // 3
-            szSymType = "PDB";
-            break;
-          case SymExport: // 4
-            szSymType = "-exported-";
-            break;
-          case SymDeferred: // 5
-            szSymType = "-deferred-";
-            break;
-          case SymSym: // 6
-            szSymType = "SYM";
-            break;
-          case 7: // SymDia:
-            szSymType = "DIA";
-            break;
-          case 8: //SymVirtual:
-            szSymType = "Virtual";
-            break;
-        }
-      }
-      LPCSTR pdbName = Module.LoadedImageName;
-      if (Module.LoadedPdbName[0] != 0)
-        pdbName = Module.LoadedPdbName;
-      this->m_parent->OnLoadModule(img, mod, baseAddr, size, result, szSymType, pdbName,
-                                   fileVersion);
-    }
-    if (szImg != NULL)
-      free(szImg);
-    if (szMod != NULL)
-      free(szMod);
-    return result;
-  }
-
-public:
-  BOOL LoadModules(HANDLE hProcess, DWORD dwProcessId)
-  {
-    // first try toolhelp32
-    if (GetModuleListTH32(hProcess, dwProcessId))
-      return true;
-    // then try psapi
-    return GetModuleListPSAPI(hProcess);
-  }
-
-  BOOL GetModuleInfo(HANDLE hProcess, DWORD64 baseAddr, IMAGEHLP_MODULE64_V3* pModuleInfo)
-  {
-    memset(pModuleInfo, 0, sizeof(IMAGEHLP_MODULE64_V3));
-    if (this->pSGMI == NULL)
-    {
-      SetLastError(ERROR_DLL_INIT_FAILED);
-      return FALSE;
-    }
-    // First try to use the larger ModuleInfo-Structure
-    pModuleInfo->SizeOfStruct = sizeof(IMAGEHLP_MODULE64_V3);
-    void* pData = malloc(
-        4096); // reserve enough memory, so the bug in v6.3.5.1 does not lead to memory-overwrites...
-    if (pData == NULL)
-    {
-      SetLastError(ERROR_NOT_ENOUGH_MEMORY);
-      return FALSE;
-    }
-    memcpy(pData, pModuleInfo, sizeof(IMAGEHLP_MODULE64_V3));
-    static bool s_useV3Version = true;
-    if (s_useV3Version)
-    {
-      if (this->pSGMI(hProcess, baseAddr, (IMAGEHLP_MODULE64_V3*)pData) != FALSE)
-      {
-        // only copy as much memory as is reserved...
-        memcpy(pModuleInfo, pData, sizeof(IMAGEHLP_MODULE64_V3));
-        pModuleInfo->SizeOfStruct = sizeof(IMAGEHLP_MODULE64_V3);
-        free(pData);
-        return TRUE;
-      }
-      s_useV3Version = false; // to prevent unnecessary calls with the larger struct...
-    }
-
-    // could not retrieve the bigger structure, try with the smaller one (as defined in VC7.1)...
-    pModuleInfo->SizeOfStruct = sizeof(IMAGEHLP_MODULE64_V2);
-    memcpy(pData, pModuleInfo, sizeof(IMAGEHLP_MODULE64_V2));
-    if (this->pSGMI(hProcess, baseAddr, (IMAGEHLP_MODULE64_V3*)pData) != FALSE)
-    {
-      // only copy as much memory as is reserved...
-      memcpy(pModuleInfo, pData, sizeof(IMAGEHLP_MODULE64_V2));
-      pModuleInfo->SizeOfStruct = sizeof(IMAGEHLP_MODULE64_V2);
-      free(pData);
-      return TRUE;
-    }
-    free(pData);
-    SetLastError(ERROR_DLL_INIT_FAILED);
-    return FALSE;
-  }
-};
-
-// #############################################################
-StackWalker::StackWalker(DWORD dwProcessId, HANDLE hProcess)
-{
-  this->m_options = OptionsAll;
-  this->m_modulesLoaded = FALSE;
-  this->m_hProcess = hProcess;
-  this->m_sw = new StackWalkerInternal(this, this->m_hProcess);
-  this->m_dwProcessId = dwProcessId;
-  this->m_szSymPath = NULL;
-  this->m_MaxRecursionCount = 1000;
-}
-StackWalker::StackWalker(int options, LPCSTR szSymPath, DWORD dwProcessId, HANDLE hProcess)
-{
-  this->m_options = options;
-  this->m_modulesLoaded = FALSE;
-  this->m_hProcess = hProcess;
-  this->m_sw = new StackWalkerInternal(this, this->m_hProcess);
-  this->m_dwProcessId = dwProcessId;
-  if (szSymPath != NULL)
-  {
-    this->m_szSymPath = _strdup(szSymPath);
-    this->m_options |= SymBuildPath;
-  }
-  else
-    this->m_szSymPath = NULL;
-  this->m_MaxRecursionCount = 1000;
-}
-
-StackWalker::~StackWalker()
-{
-  if (m_szSymPath != NULL)
-    free(m_szSymPath);
-  m_szSymPath = NULL;
-  if (this->m_sw != NULL)
-    delete this->m_sw;
-  this->m_sw = NULL;
-}
-
-BOOL StackWalker::LoadModules()
-{
-  if (this->m_sw == NULL)
-  {
-    SetLastError(ERROR_DLL_INIT_FAILED);
-    return FALSE;
-  }
-  if (m_modulesLoaded != FALSE)
-    return TRUE;
-
-  // Build the sym-path:
-  char* szSymPath = NULL;
-  if ((this->m_options & SymBuildPath) != 0)
-  {
-    const size_t nSymPathLen = 4096;
-    szSymPath = (char*)malloc(nSymPathLen);
-    if (szSymPath == NULL)
-    {
-      SetLastError(ERROR_NOT_ENOUGH_MEMORY);
-      return FALSE;
-    }
-    szSymPath[0] = 0;
-    // Now first add the (optional) provided sympath:
-    if (this->m_szSymPath != NULL)
-    {
-      strcat_s(szSymPath, nSymPathLen, this->m_szSymPath);
-      strcat_s(szSymPath, nSymPathLen, ";");
-    }
-
-    strcat_s(szSymPath, nSymPathLen, ".;");
-
-    const size_t nTempLen = 1024;
-    char         szTemp[nTempLen];
-    // Now add the current directory:
-    if (GetCurrentDirectoryA(nTempLen, szTemp) > 0)
-    {
-      szTemp[nTempLen - 1] = 0;
-      strcat_s(szSymPath, nSymPathLen, szTemp);
-      strcat_s(szSymPath, nSymPathLen, ";");
-    }
-
-    // Now add the path for the main-module:
-    if (GetModuleFileNameA(NULL, szTemp, nTempLen) > 0)
-    {
-      szTemp[nTempLen - 1] = 0;
-      for (char* p = (szTemp + strlen(szTemp) - 1); p >= szTemp; --p)
-      {
-        // locate the rightmost path separator
-        if ((*p == '\\') || (*p == '/') || (*p == ':'))
-        {
-          *p = 0;
-          break;
-        }
-      } // for (search for path separator...)
-      if (strlen(szTemp) > 0)
-      {
-        strcat_s(szSymPath, nSymPathLen, szTemp);
-        strcat_s(szSymPath, nSymPathLen, ";");
-      }
-    }
-    if (GetEnvironmentVariableA("_NT_SYMBOL_PATH", szTemp, nTempLen) > 0)
-    {
-      szTemp[nTempLen - 1] = 0;
-      strcat_s(szSymPath, nSymPathLen, szTemp);
-      strcat_s(szSymPath, nSymPathLen, ";");
-    }
-    if (GetEnvironmentVariableA("_NT_ALTERNATE_SYMBOL_PATH", szTemp, nTempLen) > 0)
-    {
-      szTemp[nTempLen - 1] = 0;
-      strcat_s(szSymPath, nSymPathLen, szTemp);
-      strcat_s(szSymPath, nSymPathLen, ";");
-    }
-    if (GetEnvironmentVariableA("SYSTEMROOT", szTemp, nTempLen) > 0)
-    {
-      szTemp[nTempLen - 1] = 0;
-      strcat_s(szSymPath, nSymPathLen, szTemp);
-      strcat_s(szSymPath, nSymPathLen, ";");
-      // also add the "system32"-directory:
-      strcat_s(szTemp, nTempLen, "\\system32");
-      strcat_s(szSymPath, nSymPathLen, szTemp);
-      strcat_s(szSymPath, nSymPathLen, ";");
-    }
-
-    if ((this->m_options & SymUseSymSrv) != 0)
-    {
-      if (GetEnvironmentVariableA("SYSTEMDRIVE", szTemp, nTempLen) > 0)
-      {
-        szTemp[nTempLen - 1] = 0;
-        strcat_s(szSymPath, nSymPathLen, "SRV*");
-        strcat_s(szSymPath, nSymPathLen, szTemp);
-        strcat_s(szSymPath, nSymPathLen, "\\websymbols");
-        strcat_s(szSymPath, nSymPathLen, "*http://msdl.microsoft.com/download/symbols;");
-      }
-      else
-        strcat_s(szSymPath, nSymPathLen,
-                 "SRV*c:\\websymbols*http://msdl.microsoft.com/download/symbols;");
-    }
-  } // if SymBuildPath
-
-  // First Init the whole stuff...
-  BOOL bRet = this->m_sw->Init(szSymPath);
-  if (szSymPath != NULL)
-    free(szSymPath);
-  szSymPath = NULL;
-  if (bRet == FALSE)
-  {
-    this->OnDbgHelpErr("Error while initializing dbghelp.dll", 0, 0);
-    SetLastError(ERROR_DLL_INIT_FAILED);
-    return FALSE;
-  }
-
-  bRet = this->m_sw->LoadModules(this->m_hProcess, this->m_dwProcessId);
-  if (bRet != FALSE)
-    m_modulesLoaded = TRUE;
-  return bRet;
-}
-
-// The following is used to pass the "userData"-Pointer to the user-provided readMemoryFunction
-// This has to be done due to a problem with the "hProcess"-parameter in x64...
-// Because this class is in no case multi-threading-enabled (because of the limitations
-// of dbghelp.dll) it is "safe" to use a static-variable
-static StackWalker::PReadProcessMemoryRoutine s_readMemoryFunction = NULL;
-static LPVOID                                 s_readMemoryFunction_UserData = NULL;
-
-BOOL StackWalker::ShowCallstack(HANDLE                    hThread,
-                                const CONTEXT*            context,
-                                PReadProcessMemoryRoutine readMemoryFunction,
-                                LPVOID                    pUserData)
-{
-  CONTEXT                                   c;
-  CallstackEntry                            csEntry;
-  IMAGEHLP_SYMBOL64*                        pSym = NULL;
-  StackWalkerInternal::IMAGEHLP_MODULE64_V3 Module;
-  IMAGEHLP_LINE64                           Line;
-  int                                       frameNum;
-  bool                                      bLastEntryCalled = true;
-  int                                       curRecursionCount = 0;
-
-  if (m_modulesLoaded == FALSE)
-    this->LoadModules(); // ignore the result...
-
-  if (this->m_sw->m_hDbhHelp == NULL)
-  {
-    SetLastError(ERROR_DLL_INIT_FAILED);
-    return FALSE;
-  }
-
-  s_readMemoryFunction = readMemoryFunction;
-  s_readMemoryFunction_UserData = pUserData;
-
-  if (context == NULL)
-  {
-    // If no context is provided, capture the context
-    // See: https://stackwalker.codeplex.com/discussions/446958
-#if _WIN32_WINNT <= 0x0501
-    // If we need to support XP, we need to use the "old way", because "GetThreadId" is not available!
-    if (hThread == GetCurrentThread())
-#else
-    if (GetThreadId(hThread) == GetCurrentThreadId())
-#endif
-    {
-      GET_CURRENT_CONTEXT_STACKWALKER_CODEPLEX(c, USED_CONTEXT_FLAGS);
-    }
-    else
-    {
-      SuspendThread(hThread);
-      memset(&c, 0, sizeof(CONTEXT));
-      c.ContextFlags = USED_CONTEXT_FLAGS;
-
-      // TODO: Detect if you want to get a thread context of a different process, which is running a different processor architecture...
-      // This does only work if we are x64 and the target process is x64 or x86;
-      // It cannot work, if this process is x64 and the target process is x64... this is not supported...
-      // See also: http://www.howzatt.demon.co.uk/articles/DebuggingInWin64.html
-      if (GetThreadContext(hThread, &c) == FALSE)
-      {
-        ResumeThread(hThread);
-        return FALSE;
-      }
-    }
-  }
-  else
-    c = *context;
-
-  // init STACKFRAME for first call
-  STACKFRAME64 s; // in/out stackframe
-  memset(&s, 0, sizeof(s));
-  DWORD imageType;
-#ifdef _M_IX86
-  // normally, call ImageNtHeader() and use machine info from PE header
-  imageType = IMAGE_FILE_MACHINE_I386;
-  s.AddrPC.Offset = c.Eip;
-  s.AddrPC.Mode = AddrModeFlat;
-  s.AddrFrame.Offset = c.Ebp;
-  s.AddrFrame.Mode = AddrModeFlat;
-  s.AddrStack.Offset = c.Esp;
-  s.AddrStack.Mode = AddrModeFlat;
-#elif _M_X64
-  imageType = IMAGE_FILE_MACHINE_AMD64;
-  s.AddrPC.Offset = c.Rip;
-  s.AddrPC.Mode = AddrModeFlat;
-  s.AddrFrame.Offset = c.Rsp;
-  s.AddrFrame.Mode = AddrModeFlat;
-  s.AddrStack.Offset = c.Rsp;
-  s.AddrStack.Mode = AddrModeFlat;
-#elif _M_IA64
-  imageType = IMAGE_FILE_MACHINE_IA64;
-  s.AddrPC.Offset = c.StIIP;
-  s.AddrPC.Mode = AddrModeFlat;
-  s.AddrFrame.Offset = c.IntSp;
-  s.AddrFrame.Mode = AddrModeFlat;
-  s.AddrBStore.Offset = c.RsBSP;
-  s.AddrBStore.Mode = AddrModeFlat;
-  s.AddrStack.Offset = c.IntSp;
-  s.AddrStack.Mode = AddrModeFlat;
-#else
-#error "Platform not supported!"
-#endif
-
-  pSym = (IMAGEHLP_SYMBOL64*)malloc(sizeof(IMAGEHLP_SYMBOL64) + STACKWALK_MAX_NAMELEN);
-  if (!pSym)
-    goto cleanup; // not enough memory...
-  memset(pSym, 0, sizeof(IMAGEHLP_SYMBOL64) + STACKWALK_MAX_NAMELEN);
-  pSym->SizeOfStruct = sizeof(IMAGEHLP_SYMBOL64);
-  pSym->MaxNameLength = STACKWALK_MAX_NAMELEN;
-
-  memset(&Line, 0, sizeof(Line));
-  Line.SizeOfStruct = sizeof(Line);
-
-  memset(&Module, 0, sizeof(Module));
-  Module.SizeOfStruct = sizeof(Module);
-
-  for (frameNum = 0;; ++frameNum)
-  {
-    // get next stack frame (StackWalk64(), SymFunctionTableAccess64(), SymGetModuleBase64())
-    // if this returns ERROR_INVALID_ADDRESS (487) or ERROR_NOACCESS (998), you can
-    // assume that either you are done, or that the stack is so hosed that the next
-    // deeper frame could not be found.
-    // CONTEXT need not to be supplied if imageTyp is IMAGE_FILE_MACHINE_I386!
-    if (!this->m_sw->pSW(imageType, this->m_hProcess, hThread, &s, &c, myReadProcMem,
-                         this->m_sw->pSFTA, this->m_sw->pSGMB, NULL))
-    {
-      // INFO: "StackWalk64" does not set "GetLastError"...
-      this->OnDbgHelpErr("StackWalk64", 0, s.AddrPC.Offset);
-      break;
-    }
-
-    csEntry.offset = s.AddrPC.Offset;
-    csEntry.name[0] = 0;
-    csEntry.undName[0] = 0;
-    csEntry.undFullName[0] = 0;
-    csEntry.offsetFromSmybol = 0;
-    csEntry.offsetFromLine = 0;
-    csEntry.lineFileName[0] = 0;
-    csEntry.lineNumber = 0;
-    csEntry.loadedImageName[0] = 0;
-    csEntry.moduleName[0] = 0;
-    if (s.AddrPC.Offset == s.AddrReturn.Offset)
-    {
-      if ((this->m_MaxRecursionCount > 0) && (curRecursionCount > m_MaxRecursionCount))
-      {
-        this->OnDbgHelpErr("StackWalk64-Endless-Callstack!", 0, s.AddrPC.Offset);
-        break;
-      }
-      curRecursionCount++;
-    }
-    else
-      curRecursionCount = 0;
-    if (s.AddrPC.Offset != 0)
-    {
-      // we seem to have a valid PC
-      // show procedure info (SymGetSymFromAddr64())
-      if (this->m_sw->pSGSFA(this->m_hProcess, s.AddrPC.Offset, &(csEntry.offsetFromSmybol),
-                             pSym) != FALSE)
-      {
-        MyStrCpy(csEntry.name, STACKWALK_MAX_NAMELEN, pSym->Name);
-        // UnDecorateSymbolName()
-        this->m_sw->pUDSN(pSym->Name, csEntry.undName, STACKWALK_MAX_NAMELEN, UNDNAME_NAME_ONLY);
-        this->m_sw->pUDSN(pSym->Name, csEntry.undFullName, STACKWALK_MAX_NAMELEN, UNDNAME_COMPLETE);
-      }
-      else
-      {
-        this->OnDbgHelpErr("SymGetSymFromAddr64", GetLastError(), s.AddrPC.Offset);
-      }
-
-      // show line number info, NT5.0-method (SymGetLineFromAddr64())
-      if (this->m_sw->pSGLFA != NULL)
-      { // yes, we have SymGetLineFromAddr64()
-        if (this->m_sw->pSGLFA(this->m_hProcess, s.AddrPC.Offset, &(csEntry.offsetFromLine),
-                               &Line) != FALSE)
-        {
-          csEntry.lineNumber = Line.LineNumber;
-          MyStrCpy(csEntry.lineFileName, STACKWALK_MAX_NAMELEN, Line.FileName);
-        }
-        else
-        {
-          this->OnDbgHelpErr("SymGetLineFromAddr64", GetLastError(), s.AddrPC.Offset);
-        }
-      } // yes, we have SymGetLineFromAddr64()
-
-      // show module info (SymGetModuleInfo64())
-      if (this->m_sw->GetModuleInfo(this->m_hProcess, s.AddrPC.Offset, &Module) != FALSE)
-      { // got module info OK
-        switch (Module.SymType)
-        {
-          case SymNone:
-            csEntry.symTypeString = "-nosymbols-";
-            break;
-          case SymCoff:
-            csEntry.symTypeString = "COFF";
-            break;
-          case SymCv:
-            csEntry.symTypeString = "CV";
-            break;
-          case SymPdb:
-            csEntry.symTypeString = "PDB";
-            break;
-          case SymExport:
-            csEntry.symTypeString = "-exported-";
-            break;
-          case SymDeferred:
-            csEntry.symTypeString = "-deferred-";
-            break;
-          case SymSym:
-            csEntry.symTypeString = "SYM";
-            break;
-#if API_VERSION_NUMBER >= 9
-          case SymDia:
-            csEntry.symTypeString = "DIA";
-            break;
-#endif
-          case 8: //SymVirtual:
-            csEntry.symTypeString = "Virtual";
-            break;
-          default:
-            //_snprintf( ty, sizeof(ty), "symtype=%ld", (long) Module.SymType );
-            csEntry.symTypeString = NULL;
-            break;
-        }
-
-        MyStrCpy(csEntry.moduleName, STACKWALK_MAX_NAMELEN, Module.ModuleName);
-        csEntry.baseOfImage = Module.BaseOfImage;
-        MyStrCpy(csEntry.loadedImageName, STACKWALK_MAX_NAMELEN, Module.LoadedImageName);
-      } // got module info OK
-      else
-      {
-        this->OnDbgHelpErr("SymGetModuleInfo64", GetLastError(), s.AddrPC.Offset);
-      }
-    } // we seem to have a valid PC
-
-    CallstackEntryType et = nextEntry;
-    if (frameNum == 0)
-      et = firstEntry;
-    bLastEntryCalled = false;
-    this->OnCallstackEntry(et, csEntry);
-
-    if (s.AddrReturn.Offset == 0)
-    {
-      bLastEntryCalled = true;
-      this->OnCallstackEntry(lastEntry, csEntry);
-      SetLastError(ERROR_SUCCESS);
-      break;
-    }
-  } // for ( frameNum )
-
-cleanup:
-  if (pSym)
-    free(pSym);
-
-  if (bLastEntryCalled == false)
-    this->OnCallstackEntry(lastEntry, csEntry);
-
-  if (context == NULL)
-    ResumeThread(hThread);
-
-  return TRUE;
-}
-
-BOOL StackWalker::ShowObject(LPVOID pObject)
-{
-  // Load modules if not done yet
-  if (m_modulesLoaded == FALSE)
-    this->LoadModules(); // ignore the result...
-
-  // Verify that the DebugHelp.dll was actually found
-  if (this->m_sw->m_hDbhHelp == NULL)
-  {
-    SetLastError(ERROR_DLL_INIT_FAILED);
-    return FALSE;
-  }
-
-  // SymGetSymFromAddr64() is required
-  if (this->m_sw->pSGSFA == NULL)
-    return FALSE;
-
-  // Show object info (SymGetSymFromAddr64())
-  DWORD64            dwAddress = DWORD64(pObject);
-  DWORD64            dwDisplacement = 0;
-  IMAGEHLP_SYMBOL64* pSym =
-      (IMAGEHLP_SYMBOL64*)malloc(sizeof(IMAGEHLP_SYMBOL64) + STACKWALK_MAX_NAMELEN);
-  memset(pSym, 0, sizeof(IMAGEHLP_SYMBOL64) + STACKWALK_MAX_NAMELEN);
-  pSym->SizeOfStruct = sizeof(IMAGEHLP_SYMBOL64);
-  pSym->MaxNameLength = STACKWALK_MAX_NAMELEN;
-  if (this->m_sw->pSGSFA(this->m_hProcess, dwAddress, &dwDisplacement, pSym) == FALSE)
-  {
-    this->OnDbgHelpErr("SymGetSymFromAddr64", GetLastError(), dwAddress);
-    return FALSE;
-  }
-  // Object name output
-  this->OnOutput(pSym->Name);
-
-  free(pSym);
-  return TRUE;
-};
-
-BOOL __stdcall StackWalker::myReadProcMem(HANDLE  hProcess,
-                                          DWORD64 qwBaseAddress,
-                                          PVOID   lpBuffer,
-                                          DWORD   nSize,
-                                          LPDWORD lpNumberOfBytesRead)
-{
-  if (s_readMemoryFunction == NULL)
-  {
-    SIZE_T st;
-    BOOL   bRet = ReadProcessMemory(hProcess, (LPVOID)qwBaseAddress, lpBuffer, nSize, &st);
-    *lpNumberOfBytesRead = (DWORD)st;
-    //printf("ReadMemory: hProcess: %p, baseAddr: %p, buffer: %p, size: %d, read: %d, result: %d\n", hProcess, (LPVOID) qwBaseAddress, lpBuffer, nSize, (DWORD) st, (DWORD) bRet);
-    return bRet;
-  }
-  else
-  {
-    return s_readMemoryFunction(hProcess, qwBaseAddress, lpBuffer, nSize, lpNumberOfBytesRead,
-                                s_readMemoryFunction_UserData);
-  }
-}
-
-void StackWalker::OnLoadModule(LPCSTR    img,
-                               LPCSTR    mod,
-                               DWORD64   baseAddr,
-                               DWORD     size,
-                               DWORD     result,
-                               LPCSTR    symType,
-                               LPCSTR    pdbName,
-                               ULONGLONG fileVersion)
-{
-  CHAR   buffer[STACKWALK_MAX_NAMELEN];
-  size_t maxLen = STACKWALK_MAX_NAMELEN;
-#if _MSC_VER >= 1400
-  maxLen = _TRUNCATE;
-#endif
-  if (fileVersion == 0)
-    _snprintf_s(buffer, maxLen, "%s:%s (%p), size: %d (result: %d), SymType: '%s', PDB: '%s'\n",
-                img, mod, (LPVOID)baseAddr, size, result, symType, pdbName);
-  else
-  {
-    DWORD v4 = (DWORD)(fileVersion & 0xFFFF);
-    DWORD v3 = (DWORD)((fileVersion >> 16) & 0xFFFF);
-    DWORD v2 = (DWORD)((fileVersion >> 32) & 0xFFFF);
-    DWORD v1 = (DWORD)((fileVersion >> 48) & 0xFFFF);
-    _snprintf_s(
-        buffer, maxLen,
-        "%s:%s (%p), size: %d (result: %d), SymType: '%s', PDB: '%s', fileVersion: %d.%d.%d.%d\n",
-        img, mod, (LPVOID)baseAddr, size, result, symType, pdbName, v1, v2, v3, v4);
-  }
-  buffer[STACKWALK_MAX_NAMELEN - 1] = 0; // be sure it is NULL terminated
-  OnOutput(buffer);
-}
-
-void StackWalker::OnCallstackEntry(CallstackEntryType eType, CallstackEntry& entry)
-{
-  CHAR   buffer[STACKWALK_MAX_NAMELEN];
-  size_t maxLen = STACKWALK_MAX_NAMELEN;
-#if _MSC_VER >= 1400
-  maxLen = _TRUNCATE;
-#endif
-  if ((eType != lastEntry) && (entry.offset != 0))
-  {
-    if (entry.name[0] == 0)
-      MyStrCpy(entry.name, STACKWALK_MAX_NAMELEN, "(function-name not available)");
-    if (entry.undName[0] != 0)
-      MyStrCpy(entry.name, STACKWALK_MAX_NAMELEN, entry.undName);
-    if (entry.undFullName[0] != 0)
-      MyStrCpy(entry.name, STACKWALK_MAX_NAMELEN, entry.undFullName);
-    if (entry.lineFileName[0] == 0)
-    {
-      MyStrCpy(entry.lineFileName, STACKWALK_MAX_NAMELEN, "(filename not available)");
-      if (entry.moduleName[0] == 0)
-        MyStrCpy(entry.moduleName, STACKWALK_MAX_NAMELEN, "(module-name not available)");
-      _snprintf_s(buffer, maxLen, "%p (%s): %s: %s\n", (LPVOID)entry.offset, entry.moduleName,
-                  entry.lineFileName, entry.name);
-    }
-    else
-      _snprintf_s(buffer, maxLen, "%s (%d): %s\n", entry.lineFileName, entry.lineNumber,
-                  entry.name);
-    buffer[STACKWALK_MAX_NAMELEN - 1] = 0;
-    OnOutput(buffer);
-  }
-}
-
-void StackWalker::OnDbgHelpErr(LPCSTR szFuncName, DWORD gle, DWORD64 addr)
-{
-  CHAR   buffer[STACKWALK_MAX_NAMELEN];
-  size_t maxLen = STACKWALK_MAX_NAMELEN;
-#if _MSC_VER >= 1400
-  maxLen = _TRUNCATE;
-#endif
-  _snprintf_s(buffer, maxLen, "ERROR: %s, GetLastError: %d (Address: %p)\n", szFuncName, gle,
-              (LPVOID)addr);
-  buffer[STACKWALK_MAX_NAMELEN - 1] = 0;
-  OnOutput(buffer);
-}
-
-void StackWalker::OnSymInit(LPCSTR szSearchPath, DWORD symOptions, LPCSTR szUserName)
-{
-  CHAR   buffer[STACKWALK_MAX_NAMELEN];
-  size_t maxLen = STACKWALK_MAX_NAMELEN;
-#if _MSC_VER >= 1400
-  maxLen = _TRUNCATE;
-#endif
-  _snprintf_s(buffer, maxLen, "SymInit: Symbol-SearchPath: '%s', symOptions: %d, UserName: '%s'\n",
-              szSearchPath, symOptions, szUserName);
-  buffer[STACKWALK_MAX_NAMELEN - 1] = 0;
-  OnOutput(buffer);
-  // Also display the OS-version
-#if _MSC_VER <= 1200
-  OSVERSIONINFOA ver;
-  ZeroMemory(&ver, sizeof(OSVERSIONINFOA));
-  ver.dwOSVersionInfoSize = sizeof(ver);
-  if (GetVersionExA(&ver) != FALSE)
-  {
-    _snprintf_s(buffer, maxLen, "OS-Version: %d.%d.%d (%s)\n", ver.dwMajorVersion,
-                ver.dwMinorVersion, ver.dwBuildNumber, ver.szCSDVersion);
-    buffer[STACKWALK_MAX_NAMELEN - 1] = 0;
-    OnOutput(buffer);
-  }
-#else
-  OSVERSIONINFOEXA ver;
-  ZeroMemory(&ver, sizeof(OSVERSIONINFOEXA));
-  ver.dwOSVersionInfoSize = sizeof(ver);
-#if _MSC_VER >= 1900
-#pragma warning(push)
-#pragma warning(disable : 4996)
-#endif
-  if (GetVersionExA((OSVERSIONINFOA*)&ver) != FALSE)
-  {
-    _snprintf_s(buffer, maxLen, "OS-Version: %d.%d.%d (%s) 0x%x-0x%x\n", ver.dwMajorVersion,
-                ver.dwMinorVersion, ver.dwBuildNumber, ver.szCSDVersion, ver.wSuiteMask,
-                ver.wProductType);
-    buffer[STACKWALK_MAX_NAMELEN - 1] = 0;
-    OnOutput(buffer);
-  }
-#if _MSC_VER >= 1900
-#pragma warning(pop)
-#endif
-#endif
-}
-
-void StackWalker::OnOutput(LPCSTR buffer)
-{
-  OutputDebugStringA(buffer);
-}
diff --git a/deps/stackwalker/StackWalker.h b/deps/stackwalker/StackWalker.h
deleted file mode 100644
index 0a004d96..00000000
--- a/deps/stackwalker/StackWalker.h
+++ /dev/null
@@ -1,255 +0,0 @@
-#ifndef __STACKWALKER_H__
-#define __STACKWALKER_H__
-
-#if defined(_MSC_VER)
-
-/**********************************************************************
- *
- * StackWalker.h
- *
- *
- *
- * LICENSE (http://www.opensource.org/licenses/bsd-license.php)
- *
- *   Copyright (c) 2005-2009, Jochen Kalmbach
- *   All rights reserved.
- *
- *   Redistribution and use in source and binary forms, with or without modification,
- *   are permitted provided that the following conditions are met:
- *
- *   Redistributions of source code must retain the above copyright notice,
- *   this list of conditions and the following disclaimer.
- *   Redistributions in binary form must reproduce the above copyright notice,
- *   this list of conditions and the following disclaimer in the documentation
- *   and/or other materials provided with the distribution.
- *   Neither the name of Jochen Kalmbach nor the names of its contributors may be
- *   used to endorse or promote products derived from this software without
- *   specific prior written permission.
- *   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- *   AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
- *   THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- *   ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE
- *   FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- *   (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- *   LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- *   ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- *   (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- *   SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * **********************************************************************/
-// #pragma once is supported starting with _MSC_VER 1000,
-// so we need not to check the version (because we only support _MSC_VER >= 1100)!
-#pragma once
-
-#include <windows.h>
-
-#if _MSC_VER >= 1900
-#pragma warning(disable : 4091)
-#endif
-
-// special defines for VC5/6 (if no actual PSDK is installed):
-#if _MSC_VER < 1300
-typedef unsigned __int64 DWORD64, *PDWORD64;
-#if defined(_WIN64)
-typedef unsigned __int64 SIZE_T, *PSIZE_T;
-#else
-typedef unsigned long SIZE_T, *PSIZE_T;
-#endif
-#endif // _MSC_VER < 1300
-
-class StackWalkerInternal; // forward
-class StackWalker
-{
-public:
-  typedef enum StackWalkOptions
-  {
-    // No addition info will be retrieved
-    // (only the address is available)
-    RetrieveNone = 0,
-
-    // Try to get the symbol-name
-    RetrieveSymbol = 1,
-
-    // Try to get the line for this symbol
-    RetrieveLine = 2,
-
-    // Try to retrieve the module-infos
-    RetrieveModuleInfo = 4,
-
-    // Also retrieve the version for the DLL/EXE
-    RetrieveFileVersion = 8,
-
-    // Contains all the above
-    RetrieveVerbose = 0xF,
-
-    // Generate a "good" symbol-search-path
-    SymBuildPath = 0x10,
-
-    // Also use the public Microsoft-Symbol-Server
-    SymUseSymSrv = 0x20,
-
-    // Contains all the above "Sym"-options
-    SymAll = 0x30,
-
-    // Contains all options (default)
-    OptionsAll = 0x3F
-  } StackWalkOptions;
-
-  StackWalker(int    options = OptionsAll, // 'int' is by design, to combine the enum-flags
-              LPCSTR szSymPath = NULL,
-              DWORD  dwProcessId = GetCurrentProcessId(),
-              HANDLE hProcess = GetCurrentProcess());
-  StackWalker(DWORD dwProcessId, HANDLE hProcess);
-  virtual ~StackWalker();
-
-  typedef BOOL(__stdcall* PReadProcessMemoryRoutine)(
-      HANDLE  hProcess,
-      DWORD64 qwBaseAddress,
-      PVOID   lpBuffer,
-      DWORD   nSize,
-      LPDWORD lpNumberOfBytesRead,
-      LPVOID  pUserData // optional data, which was passed in "ShowCallstack"
-  );
-
-  BOOL LoadModules();
-
-  BOOL ShowCallstack(
-      HANDLE                    hThread = GetCurrentThread(),
-      const CONTEXT*            context = NULL,
-      PReadProcessMemoryRoutine readMemoryFunction = NULL,
-      LPVOID pUserData = NULL // optional to identify some data in the 'readMemoryFunction'-callback
-  );
-
-  BOOL ShowObject(LPVOID pObject);
-
-#if _MSC_VER >= 1300
-  // due to some reasons, the "STACKWALK_MAX_NAMELEN" must be declared as "public"
-  // in older compilers in order to use it... starting with VC7 we can declare it as "protected"
-protected:
-#endif
-  enum
-  {
-    STACKWALK_MAX_NAMELEN = 1024
-  }; // max name length for found symbols
-
-protected:
-  // Entry for each Callstack-Entry
-  typedef struct CallstackEntry
-  {
-    DWORD64 offset; // if 0, we have no valid entry
-    CHAR    name[STACKWALK_MAX_NAMELEN];
-    CHAR    undName[STACKWALK_MAX_NAMELEN];
-    CHAR    undFullName[STACKWALK_MAX_NAMELEN];
-    DWORD64 offsetFromSmybol;
-    DWORD   offsetFromLine;
-    DWORD   lineNumber;
-    CHAR    lineFileName[STACKWALK_MAX_NAMELEN];
-    DWORD   symType;
-    LPCSTR  symTypeString;
-    CHAR    moduleName[STACKWALK_MAX_NAMELEN];
-    DWORD64 baseOfImage;
-    CHAR    loadedImageName[STACKWALK_MAX_NAMELEN];
-  } CallstackEntry;
-
-  typedef enum CallstackEntryType
-  {
-    firstEntry,
-    nextEntry,
-    lastEntry
-  } CallstackEntryType;
-
-  virtual void OnSymInit(LPCSTR szSearchPath, DWORD symOptions, LPCSTR szUserName);
-  virtual void OnLoadModule(LPCSTR    img,
-                            LPCSTR    mod,
-                            DWORD64   baseAddr,
-                            DWORD     size,
-                            DWORD     result,
-                            LPCSTR    symType,
-                            LPCSTR    pdbName,
-                            ULONGLONG fileVersion);
-  virtual void OnCallstackEntry(CallstackEntryType eType, CallstackEntry& entry);
-  virtual void OnDbgHelpErr(LPCSTR szFuncName, DWORD gle, DWORD64 addr);
-  virtual void OnOutput(LPCSTR szText);
-
-  StackWalkerInternal* m_sw;
-  HANDLE               m_hProcess;
-  DWORD                m_dwProcessId;
-  BOOL                 m_modulesLoaded;
-  LPSTR                m_szSymPath;
-
-  int m_options;
-  int m_MaxRecursionCount;
-
-  static BOOL __stdcall myReadProcMem(HANDLE  hProcess,
-                                      DWORD64 qwBaseAddress,
-                                      PVOID   lpBuffer,
-                                      DWORD   nSize,
-                                      LPDWORD lpNumberOfBytesRead);
-
-  friend StackWalkerInternal;
-}; // class StackWalker
-
-// The "ugly" assembler-implementation is needed for systems before XP
-// If you have a new PSDK and you only compile for XP and later, then you can use
-// the "RtlCaptureContext"
-// Currently there is no define which determines the PSDK-Version...
-// So we just use the compiler-version (and assumes that the PSDK is
-// the one which was installed by the VS-IDE)
-
-// INFO: If you want, you can use the RtlCaptureContext if you only target XP and later...
-//       But I currently use it in x64/IA64 environments...
-//#if defined(_M_IX86) && (_WIN32_WINNT <= 0x0500) && (_MSC_VER < 1400)
-
-#if defined(_M_IX86)
-#ifdef CURRENT_THREAD_VIA_EXCEPTION
-// TODO: The following is not a "good" implementation,
-// because the callstack is only valid in the "__except" block...
-#define GET_CURRENT_CONTEXT_STACKWALKER_CODEPLEX(c, contextFlags)               \
-  do                                                                            \
-  {                                                                             \
-    memset(&c, 0, sizeof(CONTEXT));                                             \
-    EXCEPTION_POINTERS* pExp = NULL;                                            \
-    __try                                                                       \
-    {                                                                           \
-      throw 0;                                                                  \
-    }                                                                           \
-    __except (((pExp = GetExceptionInformation()) ? EXCEPTION_EXECUTE_HANDLER   \
-                                                  : EXCEPTION_EXECUTE_HANDLER)) \
-    {                                                                           \
-    }                                                                           \
-    if (pExp != NULL)                                                           \
-      memcpy(&c, pExp->ContextRecord, sizeof(CONTEXT));                         \
-    c.ContextFlags = contextFlags;                                              \
-  } while (0);
-#else
-// clang-format off
-// The following should be enough for walking the callstack...
-#define GET_CURRENT_CONTEXT_STACKWALKER_CODEPLEX(c, contextFlags) \
-  do                                                              \
-  {                                                               \
-    memset(&c, 0, sizeof(CONTEXT));                               \
-    c.ContextFlags = contextFlags;                                \
-    __asm    call x                                               \
-    __asm x: pop eax                                              \
-    __asm    mov c.Eip, eax                                       \
-    __asm    mov c.Ebp, ebp                                       \
-    __asm    mov c.Esp, esp                                       \
-  } while (0)
-// clang-format on
-#endif
-
-#else
-
-// The following is defined for x86 (XP and higher), x64 and IA64:
-#define GET_CURRENT_CONTEXT_STACKWALKER_CODEPLEX(c, contextFlags) \
-  do                                                              \
-  {                                                               \
-    memset(&c, 0, sizeof(CONTEXT));                               \
-    c.ContextFlags = contextFlags;                                \
-    RtlCaptureContext(&c);                                        \
-  } while (0);
-#endif
-
-#endif //defined(_MSC_VER)
-
-#endif // __STACKWALKER_H__
diff --git a/src/common/Util/CrashHandler.cpp b/src/common/Util/CrashHandler.cpp
index 462c19ae..065256e5 100644
--- a/src/common/Util/CrashHandler.cpp
+++ b/src/common/Util/CrashHandler.cpp
@@ -7,18 +7,26 @@
 #include <execinfo.h>
 #include <cxxabi.h>
 #else
-#include <stackwalker/StackWalker.h>
 
-class SapphireStackWalker : public StackWalker
+#include <windows.h>
+#include <intrin.h>
+#include <dbghelp.h>
+
+#pragma comment(lib, "dbghelp.lib")
+
+inline std::string basename( const std::string& file )
 {
-public:
-  SapphireStackWalker() : StackWalker() {}
-protected:
-  virtual void OnOutput( LPCSTR szText )
-  {
-    Sapphire::Logger::fatal( "{}", szText );
-  }
-};
+    size_t i = file.find_last_of( "\\/" );
+    if ( i == std::string::npos )
+    {
+        return file;
+    }
+    else
+    {
+        return file.substr( i + 1 );
+    }
+}
+
 #endif
 
 using namespace Sapphire::Common;
@@ -148,8 +156,74 @@ void Util::CrashHandler::printStackTrace( unsigned int max_frames )
 
 #else
 
-  SapphireStackWalker sw;
-  sw.ShowCallstack();
+  DWORD machine = IMAGE_FILE_MACHINE_AMD64;
+
+  HANDLE process = GetCurrentProcess();
+  HANDLE thread = GetCurrentThread();
+  CONTEXT context = {};
+  context.ContextFlags = CONTEXT_FULL;
+  RtlCaptureContext( &context );
+
+  SymInitialize( process, NULL, TRUE );
+  SymSetOptions( SYMOPT_LOAD_LINES );
+
+  STACKFRAME frame = {};
+  frame.AddrPC.Offset = context.Rip;
+  frame.AddrPC.Mode = AddrModeFlat;
+  frame.AddrFrame.Offset = context.Rbp;
+  frame.AddrFrame.Mode = AddrModeFlat;
+  frame.AddrStack.Offset = context.Rsp;
+  frame.AddrStack.Mode = AddrModeFlat;
+
+  while( StackWalk( machine, process, thread, &frame, &context, NULL, SymFunctionTableAccess, SymGetModuleBase, NULL ) )
+  {
+    auto moduleBase = SymGetModuleBase( process, frame.AddrPC.Offset );
+
+    std::string moduleName;
+    std::string funcName;
+    std::string fileName;
+    int lineNum = 0;
+
+    char moduelBuff[MAX_PATH];
+    if( moduleBase && GetModuleFileNameA( ( HINSTANCE ) moduleBase, moduelBuff, MAX_PATH ) )
+    {
+      moduleName = basename( moduelBuff );
+    }
+    else
+    {
+      moduleName = "Unknown Module";
+    }
+
+
+    DWORD64 offset = 0;
+    char symbolBuffer[sizeof( IMAGEHLP_SYMBOL ) + 255];
+    PIMAGEHLP_SYMBOL symbol = ( PIMAGEHLP_SYMBOL ) symbolBuffer;
+    symbol->SizeOfStruct = ( sizeof IMAGEHLP_SYMBOL ) + 255;
+    symbol->MaxNameLength = 254;
+
+    if( SymGetSymFromAddr( process, frame.AddrPC.Offset, &offset, symbol ) )
+    {
+      funcName = symbol->Name;
+    }
+    else
+    {
+      funcName = "Unknown Function";
+    }
+
+    IMAGEHLP_LINE line;
+    line.SizeOfStruct = sizeof( IMAGEHLP_LINE );
+
+    DWORD offset_ln = 0;
+    if( SymGetLineFromAddr( process, frame.AddrPC.Offset, &offset_ln, &line ) )
+    {
+      fileName = line.FileName;
+      lineNum = line.LineNumber;
+    }
+
+    Logger::fatal( "[{:x}] {}({}): {} ({})", frame.AddrPC.Offset, fileName, lineNum, funcName, moduleName );
+  }
+
+  SymCleanup( process );
 
 #endif
 }
\ No newline at end of file
diff --git a/src/tools/exd_struct_test/main.cpp b/src/tools/exd_struct_test/main.cpp
index 88ad0d46..ff783369 100644
--- a/src/tools/exd_struct_test/main.cpp
+++ b/src/tools/exd_struct_test/main.cpp
@@ -111,6 +111,8 @@ int main( int argc, char* argv[] )
 
   Logger::init( "struct_test" );
 
+  assert(false);
+
   Logger::info( "Setting up EXD data" );
   if( !g_exdData.init( datLocation ) )
   {

From 2b217a545bd862d41df3e3443d38048e315c7c53 Mon Sep 17 00:00:00 2001
From: NotAdam <adam@notadam.me>
Date: Mon, 29 Apr 2019 19:59:19 +1000
Subject: [PATCH 032/351] gracefully crash the server if no navmeshes exist
 with a useful error

---
 src/world/Manager/TerritoryMgr.cpp | 3 ++-
 src/world/Territory/Zone.cpp       | 6 ++++++
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/src/world/Manager/TerritoryMgr.cpp b/src/world/Manager/TerritoryMgr.cpp
index 87474f17..a43ce775 100644
--- a/src/world/Manager/TerritoryMgr.cpp
+++ b/src/world/Manager/TerritoryMgr.cpp
@@ -66,8 +66,9 @@ bool Sapphire::World::Manager::TerritoryMgr::init()
     createDefaultTerritories();
     createHousingTerritories();
   }
-  catch( std::runtime_error& )
+  catch( const std::runtime_error& ex )
   {
+    Logger::fatal( "Caught exception during territory init: {}", ex.what() );
     return false;
   }
 
diff --git a/src/world/Territory/Zone.cpp b/src/world/Territory/Zone.cpp
index c9c2402b..e735c6d1 100644
--- a/src/world/Territory/Zone.cpp
+++ b/src/world/Territory/Zone.cpp
@@ -136,6 +136,12 @@ bool Sapphire::Zone::init()
 
   m_pNaviProvider = pNaviMgr->getNaviProvider( m_territoryTypeInfo->bg );
 
+  if( !m_pNaviProvider )
+  {
+    Logger::fatal( "No navmesh found for TerritoryType#{}", getTerritoryTypeId() );
+    throw std::runtime_error( "Missing navmesh file(s)." );
+  }
+
   return true;
 }
 

From 6a20fc32f4d23f999b2200b9a0d9c347571a7d4d Mon Sep 17 00:00:00 2001
From: NotAdam <adam@notadam.me>
Date: Mon, 29 Apr 2019 20:01:27 +1000
Subject: [PATCH 033/351] remove assert left in for testing

---
 src/tools/exd_struct_test/main.cpp | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/tools/exd_struct_test/main.cpp b/src/tools/exd_struct_test/main.cpp
index ff783369..88ad0d46 100644
--- a/src/tools/exd_struct_test/main.cpp
+++ b/src/tools/exd_struct_test/main.cpp
@@ -111,8 +111,6 @@ int main( int argc, char* argv[] )
 
   Logger::init( "struct_test" );
 
-  assert(false);
-
   Logger::info( "Setting up EXD data" );
   if( !g_exdData.init( datLocation ) )
   {

From 75b7fb4c034c1703668b252ffa0fd2438139238c Mon Sep 17 00:00:00 2001
From: NotAdam <adam@notadam.me>
Date: Mon, 29 Apr 2019 20:29:50 +1000
Subject: [PATCH 034/351] fix build

---
 src/common/CMakeLists.txt | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/src/common/CMakeLists.txt b/src/common/CMakeLists.txt
index 0b494d98..88ab338d 100644
--- a/src/common/CMakeLists.txt
+++ b/src/common/CMakeLists.txt
@@ -26,10 +26,6 @@ if( UNIX )
                            PUBLIC
                              pthread
                              stdc++fs )
-else()
-  target_link_libraries( common
-                           PUBLIC
-                             stackwalker )
 endif()
 
 target_include_directories( common

From 0bc5d545d50a309703361cbae46d1cf3ff54b6af Mon Sep 17 00:00:00 2001
From: mordred <you@example.com>
Date: Mon, 29 Apr 2019 15:53:03 +0200
Subject: [PATCH 035/351] Parse more action info from tooltips

---
 src/tools/action_parse/main.cpp | 18 +++++++++++++++++-
 1 file changed, 17 insertions(+), 1 deletion(-)

diff --git a/src/tools/action_parse/main.cpp b/src/tools/action_parse/main.cpp
index 74c496c3..01e759e2 100644
--- a/src/tools/action_parse/main.cpp
+++ b/src/tools/action_parse/main.cpp
@@ -54,7 +54,9 @@ int main()
   auto gld1 = g_exdData.get< Sapphire::Data::ActionTransient >( id );
   if( gld )
   {
-    Logger::info( "got {0}", gld->name );
+    if( gld->classJob == -1 || gld->name.empty() )
+      continue;
+    Logger::info( "{0} - {1}", id, gld->name );
     std::string desc = gld1->description;
     stripUnicode( desc );;
     desc = std::regex_replace( desc, std::regex( "HI" ), "\n" );
@@ -125,7 +127,21 @@ int main()
 	Logger::info( "Combo Potency: {}", potStr);
       }
     }
+    
+    std::smatch sm5;
+    std::regex r5(R"(Cure Potency: \d*)");
+    if( std::regex_search(desc, sm5, r5 ) )
+    {
+      std::string potStr = sm5.str();
+      auto pos = potStr.find_last_of( " " );
+      if( pos  != std::string::npos )
+      {
+        potStr = potStr.substr( pos + 1 );
+	Logger::info( "Cure Potency: {}", potStr);
+      }
+    }
 
+    Logger::info( "-" );
   }
   else
     Logger::warn( "failed to get classjob {}", 1 );

From 3f6d7934a5bf3d6e78181fadeaf6c7b555859a1a Mon Sep 17 00:00:00 2001
From: NotAdam <adam@notadam.me>
Date: Tue, 30 Apr 2019 21:41:10 +1000
Subject: [PATCH 036/351] warn instead of crash with missing navmeshes

---
 src/common/Logging/Logger.cpp | 2 +-
 src/world/Actor/BNpc.cpp      | 3 +++
 src/world/Territory/Zone.cpp  | 3 +--
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/common/Logging/Logger.cpp b/src/common/Logging/Logger.cpp
index bc063b25..221f9291 100644
--- a/src/common/Logging/Logger.cpp
+++ b/src/common/Logging/Logger.cpp
@@ -1,6 +1,6 @@
 #include "Logger.h"
 
-#define SPDLOG_LEVEL_NAMES { "trace", "debug", "info", "warning", "error", "fatal", "off" }
+#define SPDLOG_LEVEL_NAMES { "trace", "debug", "info", "warn", "error", "fatal", "off" }
 
 #include <spdlog/spdlog.h>
 #include <spdlog/async.h>
diff --git a/src/world/Actor/BNpc.cpp b/src/world/Actor/BNpc.cpp
index 841ff2b9..57b0a842 100644
--- a/src/world/Actor/BNpc.cpp
+++ b/src/world/Actor/BNpc.cpp
@@ -401,6 +401,9 @@ void Sapphire::Entity::BNpc::update( uint64_t tickCount )
 
   auto pNaviProvider = m_pCurrentZone->getNaviProvider();
 
+  if( !pNaviProvider )
+    return;
+
   switch( m_state )
   {
     case BNpcState::Dead:
diff --git a/src/world/Territory/Zone.cpp b/src/world/Territory/Zone.cpp
index e735c6d1..339f6399 100644
--- a/src/world/Territory/Zone.cpp
+++ b/src/world/Territory/Zone.cpp
@@ -138,8 +138,7 @@ bool Sapphire::Zone::init()
 
   if( !m_pNaviProvider )
   {
-    Logger::fatal( "No navmesh found for TerritoryType#{}", getTerritoryTypeId() );
-    throw std::runtime_error( "Missing navmesh file(s)." );
+    Logger::warn( "No navmesh found for TerritoryType#{}", getTerritoryTypeId() );
   }
 
   return true;

From b6863678c8ebc5a94148f9c6392ae8ce9326540f Mon Sep 17 00:00:00 2001
From: Mordred <ffxivsapphire@gmail.com>
Date: Tue, 30 Apr 2019 22:54:35 +0200
Subject: [PATCH 037/351] Show default hit effect on autoattacks, also send 2nd
 hate packet

---
 src/common/Network/PacketDef/Ipcs.h               |  2 +-
 src/common/Network/PacketDef/Zone/ServerZoneDef.h | 11 +++++++++++
 src/world/Actor/BNpc.cpp                          |  1 +
 src/world/Actor/Chara.cpp                         |  1 +
 src/world/Actor/Player.cpp                        | 10 +++++++++-
 5 files changed, 23 insertions(+), 2 deletions(-)

diff --git a/src/common/Network/PacketDef/Ipcs.h b/src/common/Network/PacketDef/Ipcs.h
index 3c98ae7f..c6fdac98 100644
--- a/src/common/Network/PacketDef/Ipcs.h
+++ b/src/common/Network/PacketDef/Ipcs.h
@@ -131,7 +131,7 @@ namespace Sapphire::Network::Packets
     ActorCast = 0x017C, // updated 4.5
 
     PartyList = 0x017E, // updated 4.5
-
+    HateRank = 0x017F, // updated 4.5
     HateList = 0x0180, // updated 4.5
     ObjectSpawn = 0x0181, // updated 4.5
     ObjectDespawn = 0x0182, // updated 4.5
diff --git a/src/common/Network/PacketDef/Zone/ServerZoneDef.h b/src/common/Network/PacketDef/Zone/ServerZoneDef.h
index 924b0912..80588a04 100644
--- a/src/common/Network/PacketDef/Zone/ServerZoneDef.h
+++ b/src/common/Network/PacketDef/Zone/ServerZoneDef.h
@@ -719,6 +719,17 @@ namespace Sapphire::Network::Packets::Server
     uint32_t padding;
   };
 
+  struct FFXIVIpcHateRank : FFXIVIpcBasePacket< HateRank >
+  {
+    uint32_t numEntries;
+    struct
+    {
+      uint32_t actorId;
+      uint32_t hateAmount;
+    } entry[32];
+    uint32_t padding;
+  };
+
   struct FFXIVIpcUpdateClassInfo : FFXIVIpcBasePacket< UpdateClassInfo >
   {
     uint8_t classId;
diff --git a/src/world/Actor/BNpc.cpp b/src/world/Actor/BNpc.cpp
index 841ff2b9..03e143c9 100644
--- a/src/world/Actor/BNpc.cpp
+++ b/src/world/Actor/BNpc.cpp
@@ -689,6 +689,7 @@ void Sapphire::Entity::BNpc::autoAttack( CharaPtr pTarget )
     effectEntry.value = damage;
     effectEntry.effectType = ActionEffectType::Damage;
     effectEntry.hitSeverity = ActionHitSeverityType::NormalDamage;
+    effectEntry.param = 0x71;
     effectPacket->addEffect( effectEntry );
 
     sendToInRangeSet( effectPacket );
diff --git a/src/world/Actor/Chara.cpp b/src/world/Actor/Chara.cpp
index b4e9303d..3da8d362 100644
--- a/src/world/Actor/Chara.cpp
+++ b/src/world/Actor/Chara.cpp
@@ -436,6 +436,7 @@ void Sapphire::Entity::Chara::autoAttack( CharaPtr pTarget )
     effectEntry.value = damage;
     effectEntry.effectType = ActionEffectType::Damage;
     effectEntry.hitSeverity = ActionHitSeverityType::NormalDamage;
+    effectEntry.param = 0x71;
     effectPacket->addEffect( effectEntry );
 
     sendToInRangeSet( effectPacket );
diff --git a/src/world/Actor/Player.cpp b/src/world/Actor/Player.cpp
index f6d32053..925f7e11 100644
--- a/src/world/Actor/Player.cpp
+++ b/src/world/Actor/Player.cpp
@@ -1411,12 +1411,19 @@ void Sapphire::Entity::Player::sendHateList()
 {
   auto hateListPacket = makeZonePacket< FFXIVIpcHateList >( getId() );
   hateListPacket->data().numEntries = m_actorIdTohateSlotMap.size();
+  auto hateRankPacket = makeZonePacket< FFXIVIpcHateRank >( getId() );
+  hateRankPacket->data().numEntries = m_actorIdTohateSlotMap.size();
   auto it = m_actorIdTohateSlotMap.begin();
   for( int32_t i = 0; it != m_actorIdTohateSlotMap.end(); ++it, i++ )
   {
+    // TODO: get actual hate values for these
     hateListPacket->data().entry[ i ].actorId = it->first;
     hateListPacket->data().entry[ i ].hatePercent = 100;
+
+    hateRankPacket->data().entry[ i ].actorId = it->first;
+    hateRankPacket->data().entry[ i ].hateAmount = 1;
   }
+  queuePacket( hateRankPacket );
   queuePacket( hateListPacket );
 }
 
@@ -1571,7 +1578,7 @@ void Sapphire::Entity::Player::autoAttack( CharaPtr pTarget )
     entry.value = damage;
     entry.effectType = Common::ActionEffectType::Damage;
     entry.hitSeverity = Common::ActionHitSeverityType::NormalDamage;
-    entry.param = variation;
+    entry.param = 0x72;
 
     effectPacket->addEffect( entry );
 
@@ -1586,6 +1593,7 @@ void Sapphire::Entity::Player::autoAttack( CharaPtr pTarget )
     entry.value = damage;
     entry.effectType = Common::ActionEffectType::Damage;
     entry.hitSeverity = Common::ActionHitSeverityType::NormalDamage;
+    entry.param = 0x73;
 
     effectPacket->addEffect( entry );
 

From 591f57cec2476d67de0cc9bf39d3daac66269dd1 Mon Sep 17 00:00:00 2001
From: NotAdam <adam@notadam.me>
Date: Tue, 7 May 2019 22:10:55 +1000
Subject: [PATCH 038/351] fix a crash where !instance bind is used incorrectly,
 better getter name

---
 src/world/Actor/Player.cpp                       |  2 +-
 src/world/Manager/DebugCommandMgr.cpp            | 14 ++++++++++----
 src/world/Manager/TerritoryMgr.cpp               |  6 +++---
 src/world/Manager/TerritoryMgr.h                 |  2 +-
 src/world/Network/Handlers/GMCommandHandlers.cpp |  2 +-
 5 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/src/world/Actor/Player.cpp b/src/world/Actor/Player.cpp
index 925f7e11..3a96b640 100644
--- a/src/world/Actor/Player.cpp
+++ b/src/world/Actor/Player.cpp
@@ -430,7 +430,7 @@ bool Sapphire::Entity::Player::setInstance( uint32_t instanceContentId )
   m_onEnterEventDone = false;
   auto pTeriMgr = m_pFw->get< TerritoryMgr >();
 
-  auto instance = pTeriMgr->getInstanceZonePtr( instanceContentId );
+  auto instance = pTeriMgr->getTerritoryByGuId( instanceContentId );
   if( !instance )
     return false;
 
diff --git a/src/world/Manager/DebugCommandMgr.cpp b/src/world/Manager/DebugCommandMgr.cpp
index a9687604..f414c1bd 100644
--- a/src/world/Manager/DebugCommandMgr.cpp
+++ b/src/world/Manager/DebugCommandMgr.cpp
@@ -822,10 +822,16 @@ void Sapphire::World::Manager::DebugCommandMgr::instance( char* data, Entity::Pl
     uint32_t instanceId;
     sscanf( params.c_str(), "%d", &instanceId );
 
-    auto instance = pTeriMgr->getInstanceZonePtr( instanceId );
-    if( instance )
+    auto terri = pTeriMgr->getTerritoryByGuId( instanceId );
+    if( terri )
     {
-      auto pInstanceContent = instance->getAsInstanceContent();
+      auto pInstanceContent = terri->getAsInstanceContent();
+      if( !pInstanceContent )
+      {
+        player.sendDebug( "Instance id#{} is not an InstanceContent territory.", instanceId );
+        return;
+      }
+
       pInstanceContent->bindPlayer( player.getId() );
       player.sendDebug(
         "Now bound to instance with id: " + std::to_string( pInstanceContent->getGuId() ) +
@@ -839,7 +845,7 @@ void Sapphire::World::Manager::DebugCommandMgr::instance( char* data, Entity::Pl
     uint32_t instanceId;
     sscanf( params.c_str(), "%d", &instanceId );
 
-    auto instance = pTeriMgr->getInstanceZonePtr( instanceId );
+    auto instance = pTeriMgr->getTerritoryByGuId( instanceId );
     if( !instance )
     {
       player.sendDebug( "Unknown instance with id#{0} ", instanceId );
diff --git a/src/world/Manager/TerritoryMgr.cpp b/src/world/Manager/TerritoryMgr.cpp
index a43ce775..6c3d2769 100644
--- a/src/world/Manager/TerritoryMgr.cpp
+++ b/src/world/Manager/TerritoryMgr.cpp
@@ -436,7 +436,7 @@ Sapphire::ZonePtr Sapphire::World::Manager::TerritoryMgr::findOrCreateHousingInt
 bool Sapphire::World::Manager::TerritoryMgr::removeTerritoryInstance( uint32_t guId )
 {
   ZonePtr pZone;
-  if( ( pZone = getInstanceZonePtr( guId ) ) == nullptr )
+  if( ( pZone = getTerritoryByGuId( guId ) ) == nullptr )
     return false;
 
   m_guIdToZonePtrMap.erase( pZone->getGuId() );
@@ -455,7 +455,7 @@ bool Sapphire::World::Manager::TerritoryMgr::removeTerritoryInstance( uint32_t g
   return true;
 }
 
-Sapphire::ZonePtr Sapphire::World::Manager::TerritoryMgr::getInstanceZonePtr( uint32_t guId ) const
+Sapphire::ZonePtr Sapphire::World::Manager::TerritoryMgr::getTerritoryByGuId( uint32_t guId ) const
 {
   auto it = m_guIdToZonePtrMap.find( guId );
   if( it == m_guIdToZonePtrMap.end() )
@@ -646,7 +646,7 @@ Sapphire::ZonePtr Sapphire::World::Manager::TerritoryMgr::getLinkedInstance( uin
   auto it = m_playerIdToInstanceMap.find( playerId );
   if( it != m_playerIdToInstanceMap.end() )
   {
-    return getInstanceZonePtr( it->second );
+    return getTerritoryByGuId( it->second );
   }
   return nullptr;
 }
diff --git a/src/world/Manager/TerritoryMgr.h b/src/world/Manager/TerritoryMgr.h
index b9628756..67b0229b 100644
--- a/src/world/Manager/TerritoryMgr.h
+++ b/src/world/Manager/TerritoryMgr.h
@@ -116,7 +116,7 @@ namespace Sapphire::World::Manager
     bool removeTerritoryInstance( uint32_t guId );
 
     /*! returns a ZonePtr to the instance or nullptr if not found */
-    ZonePtr getInstanceZonePtr( uint32_t guId ) const;
+    ZonePtr getTerritoryByGuId( uint32_t guId ) const;
 
     /*! returns the cached detail of a territory, nullptr if not found */
     Data::TerritoryTypePtr getTerritoryDetail( uint32_t territoryTypeId ) const;
diff --git a/src/world/Network/Handlers/GMCommandHandlers.cpp b/src/world/Network/Handlers/GMCommandHandlers.cpp
index 4b8fb084..9b806521 100644
--- a/src/world/Network/Handlers/GMCommandHandlers.cpp
+++ b/src/world/Network/Handlers/GMCommandHandlers.cpp
@@ -465,7 +465,7 @@ void Sapphire::Network::GameConnection::gm1Handler( FrameworkPtr pFw,
     case GmCommand::Teri:
     {
       auto pTeriMgr = pFw->get< TerritoryMgr >();
-      if( auto instance = pTeriMgr->getInstanceZonePtr( param1 ) )
+      if( auto instance = pTeriMgr->getTerritoryByGuId( param1 ) )
       {
         player.sendDebug( "Found instance: {0}, id#{1}", instance->getName(), param1 );
 

From 0350b4dc229fd8d5aba7e5a8242fc1d0619c8630 Mon Sep 17 00:00:00 2001
From: NotAdam <adam@notadam.me>
Date: Tue, 7 May 2019 22:16:18 +1000
Subject: [PATCH 039/351] remove the code restricting ic territories from being
 created

---
 src/world/Manager/TerritoryMgr.cpp | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/world/Manager/TerritoryMgr.cpp b/src/world/Manager/TerritoryMgr.cpp
index 6c3d2769..fb5fd0ca 100644
--- a/src/world/Manager/TerritoryMgr.cpp
+++ b/src/world/Manager/TerritoryMgr.cpp
@@ -261,8 +261,9 @@ Sapphire::ZonePtr Sapphire::World::Manager::TerritoryMgr::createTerritoryInstanc
   if( !isValidTerritory( territoryTypeId ) )
     return nullptr;
 
-  if( isInstanceContentTerritory( territoryTypeId ) )
-    return nullptr;
+//  nb: disabled for now because there's not a real reason to have this constraint, makes testing some stuff easier too
+//  if( isInstanceContentTerritory( territoryTypeId ) )
+//    return nullptr;
 
   auto pExdData = framework()->get< Data::ExdDataGenerated >();
   auto pTeri = getTerritoryDetail( territoryTypeId );

From 3468a149f43c67980209028c1b7bc4abe8be52b0 Mon Sep 17 00:00:00 2001
From: NotAdam <adam@notadam.me>
Date: Sat, 11 May 2019 13:16:34 +1000
Subject: [PATCH 040/351] correct autoattack potency calculation, fix attack
 power calc

---
 src/world/Actor/Chara.cpp    |  9 ++++++++-
 src/world/Math/CalcStats.cpp | 38 ++++++++++++++++++++++++++++++++++--
 src/world/Math/CalcStats.h   |  5 ++++-
 3 files changed, 48 insertions(+), 4 deletions(-)

diff --git a/src/world/Actor/Chara.cpp b/src/world/Actor/Chara.cpp
index bb328c33..445eac47 100644
--- a/src/world/Actor/Chara.cpp
+++ b/src/world/Actor/Chara.cpp
@@ -793,7 +793,14 @@ uint32_t Sapphire::Entity::Chara::getStatValue( Sapphire::Common::BaseParam base
 
     case Common::BaseParam::AttackPower:
     {
-      // todo: think this is right... not sure
+      auto primaryStat = getPrimaryStat();
+
+      // everything else uses str for atk power except for brd/rogue/etc who use dex
+      if( primaryStat == Common::BaseParam::Dexterity )
+      {
+        return getStatValue( primaryStat );
+      }
+
       return getStatValue( Common::BaseParam::Strength );
     }
 
diff --git a/src/world/Math/CalcStats.cpp b/src/world/Math/CalcStats.cpp
index 1542e2fd..b455b48a 100644
--- a/src/world/Math/CalcStats.cpp
+++ b/src/world/Math/CalcStats.cpp
@@ -308,6 +308,40 @@ float CalcStats::potency( uint16_t potency )
   return potency / 100.f;
 }
 
+float CalcStats::autoAttackPotency( const Sapphire::Entity::Chara& chara )
+{
+  uint32_t aaPotency = AUTO_ATTACK_POTENCY;
+
+  // check if ranged class
+  switch( chara.getClass() )
+  {
+    case Common::ClassJob::Machinist:
+    case Common::ClassJob::Bard:
+    case Common::ClassJob::Archer:
+      aaPotency = RANGED_AUTO_ATTACK_POTENCY;
+
+    default:
+      break;
+  }
+
+  float autoAttackDelay = 2.5f;
+  // fetch actual auto attack delay if its a player
+  if( chara.isPlayer() )
+  {
+    // todo: ew
+    auto pPlayer = const_cast< Entity::Chara& >( chara ).getAsPlayer();
+    assert( pPlayer );
+
+    auto pItem = pPlayer->getEquippedWeapon();
+    assert( pItem );
+
+    autoAttackDelay = pItem->getDelay() / 1000.f;
+  }
+
+  // factors in f(PTC) in order to not lose precision
+  return std::floor( aaPotency / 3.f * autoAttackDelay ) / 100.f;
+}
+
 float CalcStats::weaponDamage( const Sapphire::Entity::Chara& chara, float weaponDamage )
 {
   const auto& baseStats = chara.getStats();
@@ -491,7 +525,7 @@ float CalcStats::autoAttack( const Sapphire::Entity::Chara& chara )
   auto level = chara.getLevel();
   auto mainVal = static_cast< float >( levelTable[ level ][ Common::LevelTableEntry::MAIN ] );
 
-  auto innerCalc = std::floor( ( ( mainVal * primaryStatValue( chara ) ) / 1000.f ) + weaponDamage );
+  auto innerCalc = std::floor( ( mainVal * primaryStatValue( chara ) / 1000.f ) + weaponDamage );
 
   return std::floor( innerCalc * ( autoAttackDelay / 3.f ) );
 }
@@ -506,7 +540,7 @@ float CalcStats::calculateAutoAttackDamage( const Sapphire::Entity::Chara& chara
   // D = ⌊ f(ptc) × f(aa) × f(ap) × f(det) × f(tnc) × traits ⌋ × f(ss) ⌋ ×
   // f(chr) ⌋ × f(dhr) ⌋ × rand[ 0.95, 1.05 ] ⌋ × buff_1 ⌋ × buff... ⌋
 
-  auto pot = potency( AUTO_ATTACK_POTENCY );
+  auto pot = autoAttackPotency( chara );
   auto aa = autoAttack( chara );
   auto ap = getPrimaryAttackPower( chara );
   auto det = determination( chara );
diff --git a/src/world/Math/CalcStats.h b/src/world/Math/CalcStats.h
index 5f2b4060..92402124 100644
--- a/src/world/Math/CalcStats.h
+++ b/src/world/Math/CalcStats.h
@@ -10,7 +10,8 @@ namespace Sapphire::Math
   class CalcStats
   {
   public:
-    static const uint32_t AUTO_ATTACK_POTENCY = 100;
+    static const uint32_t AUTO_ATTACK_POTENCY = 110;
+    static const uint32_t RANGED_AUTO_ATTACK_POTENCY = 100;
 
     static float calculateBaseStat( const Entity::Chara& chara );
 
@@ -49,6 +50,8 @@ namespace Sapphire::Math
      */
     static float potency( uint16_t potency );
 
+    static float autoAttackPotency( const Sapphire::Entity::Chara& chara );
+
     /*!
      * @brief Weapon damage is the contribution the weapon's damage rating
      *

From 1cab7afe0ecf5cfb36f688ef5d118b6f9e0155be Mon Sep 17 00:00:00 2001
From: NotAdam <adam@notadam.me>
Date: Tue, 28 May 2019 22:03:55 +1000
Subject: [PATCH 041/351] fix self targeted actions failing target snapshot,
 fix player being unable to complete chasing shadows

---
 .../instances/questbattles/ChasingShadows.cpp     | 15 +++++++--------
 src/world/Action/Action.cpp                       |  7 +++----
 src/world/Territory/QuestBattle.cpp               |  2 +-
 3 files changed, 11 insertions(+), 13 deletions(-)

diff --git a/src/scripts/instances/questbattles/ChasingShadows.cpp b/src/scripts/instances/questbattles/ChasingShadows.cpp
index 0c11887e..9923796c 100644
--- a/src/scripts/instances/questbattles/ChasingShadows.cpp
+++ b/src/scripts/instances/questbattles/ChasingShadows.cpp
@@ -67,6 +67,13 @@ public:
       return;
     }
 
+    if( instance.getCountEnemyBNpc() == 0 && successCalled == 0 )
+    {
+      instance.setCustomVar( SUCCESS_CALLED, 1 );
+      instance.success();
+      return;
+    }
+
     if( !boss || !ida || !papa )
       return;
 
@@ -141,14 +148,6 @@ public:
       a4->hateListAdd( pPlayer, 1 );
       a5->hateListAdd( pPlayer, 1 );
     }
-
-    if( instance.getCountEnemyBNpc() == 0 && successCalled == 0 )
-    {
-      instance.setCustomVar( SUCCESS_CALLED, 1 );
-      instance.success();
-      return;
-    }
-
   }
 
   void onEnterTerritory( QuestBattle& instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
diff --git a/src/world/Action/Action.cpp b/src/world/Action/Action.cpp
index c7c7790f..7f04a63f 100644
--- a/src/world/Action/Action.cpp
+++ b/src/world/Action/Action.cpp
@@ -491,7 +491,7 @@ bool Sapphire::Action::Action::consumeResources()
 
 bool Sapphire::Action::Action::snapshotAffectedActors( std::vector< Entity::CharaPtr >& actors )
 {
-  for( const auto& actor : m_pSource->getInRangeActors() )
+  for( const auto& actor : m_pSource->getInRangeActors( true ) )
   {
     // check for initial target validity based on flags in action exd (pc/enemy/etc.)
     if( !preFilterActor( *actor ) )
@@ -515,9 +515,8 @@ bool Sapphire::Action::Action::snapshotAffectedActors( std::vector< Entity::Char
       player->sendDebug( "hit actor#{}", actor->getId() );
     }
   }
-  if( actors.empty() )
-    return false;
-  return true;
+
+  return !actors.empty();
 }
 
 void Sapphire::Action::Action::addActorFilter( World::Util::ActorFilterPtr filter )
diff --git a/src/world/Territory/QuestBattle.cpp b/src/world/Territory/QuestBattle.cpp
index 39d0f821..0227bbcd 100644
--- a/src/world/Territory/QuestBattle.cpp
+++ b/src/world/Territory/QuestBattle.cpp
@@ -385,7 +385,7 @@ uint32_t Sapphire::QuestBattle::getQuestId() const
 uint32_t Sapphire::QuestBattle::getCountEnemyBNpc()
 {
   uint32_t count = 0;
-  for( auto bnpcIt : m_bNpcMap )
+  for( const auto& bnpcIt : m_bNpcMap )
   {
     if( bnpcIt.second->getEnemyType() == 4 && bnpcIt.second->isAlive() )
       count++;

From 4535c36def6ca490e8b6844d221a6b902ef423fd Mon Sep 17 00:00:00 2001
From: NotAdam <adam@notadam.me>
Date: Tue, 28 May 2019 22:30:47 +1000
Subject: [PATCH 042/351] if the 'boss' is killed instantly, spawn all add
 phases instantly

no mercy for //gm kill
---
 .../instances/questbattles/ChasingShadows.cpp | 26 +++++++++++--------
 1 file changed, 15 insertions(+), 11 deletions(-)

diff --git a/src/scripts/instances/questbattles/ChasingShadows.cpp b/src/scripts/instances/questbattles/ChasingShadows.cpp
index 9923796c..336cd0d6 100644
--- a/src/scripts/instances/questbattles/ChasingShadows.cpp
+++ b/src/scripts/instances/questbattles/ChasingShadows.cpp
@@ -61,23 +61,20 @@ public:
     auto papa = instance.getActiveBNpcByLevelId( INIT_P_POP_PAPARIMO );
     auto pPlayer = instance.getPlayerPtr();
 
+    uint32_t bossHpPercent = 0;
+    if( boss )
+      bossHpPercent = boss->getHpPercent();
+
     if( pPlayer && !pPlayer->isAlive() )
     {
       instance.fail();
       return;
     }
 
-    if( instance.getCountEnemyBNpc() == 0 && successCalled == 0 )
-    {
-      instance.setCustomVar( SUCCESS_CALLED, 1 );
-      instance.success();
-      return;
-    }
-
-    if( !boss || !ida || !papa )
+    if( !ida || !papa )
       return;
 
-    if( pair1Spawnd == 0 && boss->getHpPercent() <= 75 )
+    if( pair1Spawnd == 0 && bossHpPercent <= 75 )
     {
       instance.setCustomVar( SET_1_SPAWNED, 1 );
       auto a2 = instance.createBNpcFromLevelEntry( INIT_POP_ENEMY_B_03, 10, 0, 1440, 938,
@@ -105,7 +102,7 @@ public:
       a5->hateListAdd( pPlayer, 1 );
     }
 
-    if( pair2Spawnd == 0 && boss->getHpPercent() <= 50 )
+    if( pair2Spawnd == 0 && bossHpPercent <= 50 )
     {
       instance.setCustomVar( SET_2_SPAWNED, 1 );
       auto a2 = instance.createBNpcFromLevelEntry( INIT_POP_ENEMY_B_05, 10, 0, 1440, 938,
@@ -133,7 +130,7 @@ public:
 
     }
 
-    if( pair3Spawnd == 0 && boss->getHpPercent() <= 25 )
+    if( pair3Spawnd == 0 && bossHpPercent <= 25 )
     {
       instance.setCustomVar( SET_3_SPAWNED, 1 );
 
@@ -148,6 +145,13 @@ public:
       a4->hateListAdd( pPlayer, 1 );
       a5->hateListAdd( pPlayer, 1 );
     }
+
+    if( instance.getCountEnemyBNpc() == 0 && successCalled == 0 )
+    {
+      instance.setCustomVar( SUCCESS_CALLED, 1 );
+      instance.success();
+      return;
+    }
   }
 
   void onEnterTerritory( QuestBattle& instance, Entity::Player& player, uint32_t eventId, uint16_t param1,

From 81fb7ad247828b46e62579131db8a11cc3bdda31 Mon Sep 17 00:00:00 2001
From: NotAdam <adam@notadam.me>
Date: Thu, 30 May 2019 01:50:34 +1000
Subject: [PATCH 043/351] action_parse improvements

---
 src/tools/action_parse/main.cpp | 286 +++++++++++++++++++++-----------
 1 file changed, 190 insertions(+), 96 deletions(-)

diff --git a/src/tools/action_parse/main.cpp b/src/tools/action_parse/main.cpp
index 01e759e2..30eef883 100644
--- a/src/tools/action_parse/main.cpp
+++ b/src/tools/action_parse/main.cpp
@@ -11,6 +11,7 @@
 #include <set>
 #include <Exd/ExdDataGenerated.h>
 #include <Logging/Logger.h>
+#include <Common.h>
 
 #include <fstream>
 #include <streambuf>
@@ -23,16 +24,45 @@ using namespace Sapphire;
 const std::string datLocation( "/home/mordred/sqpack" );
 //const std::string datLocation( "/mnt/c/Program Files (x86)/Steam/steamapps/common/FINAL FANTASY XIV Online/game/sqpack" );
 
-bool invalidChar( char c ) 
-{  
-  return !( c >= 0 && c < 128 );   
-} 
-void stripUnicode( std::string& str ) 
-{ 
-    str.erase( std::remove_if( str.begin(), str.end(), invalidChar ), str.end() ); 
-   str.erase(std::remove_if(str.begin(), str.end(),
-                            [](char c) { return !std::isalpha(c) && !std::isdigit(c) && !std::isspace(c) && !std::ispunct(c); }),
-             str.end()); 
+struct ActionEntry
+{
+  uint32_t id;
+  std::string name;
+  uint32_t potency;
+  uint32_t comboPotency;
+  uint32_t flankPotency;
+  uint32_t frontPotency;
+  uint32_t rearPotency;
+  uint32_t curePotency;
+  uint32_t restorePercentage;
+};
+
+bool invalidChar( char c )
+{
+  return !( c >= 0 && c < 128 );
+}
+
+void stripUnicode( std::string& str )
+{
+  str.erase( std::remove_if( str.begin(), str.end(), invalidChar ), str.end() );
+  str.erase( std::remove_if( str.begin(), str.end(),
+                             []( char c )
+                             {
+                               return !std::isalpha( c ) && !std::isdigit( c ) && !std::isspace( c ) &&
+                                      !std::ispunct( c );
+                             } ),
+             str.end() );
+}
+
+uint32_t stripNonNumerics( std::string& str )
+{
+  str.erase( std::remove_if( str.begin(), str.end(),
+    []( char c )
+    {
+      return !std::isdigit( c );
+    }), str.end() );
+
+  return std::atoi( str.c_str() );
 }
 
 int main()
@@ -48,103 +78,167 @@ int main()
   }
   auto idList = g_exdData.getActionIdList();
 
+  std::unordered_map< uint32_t, ActionEntry > actions;
+
+  auto total = idList.size();
+  int cursor = 0;
+
   for( auto id : idList )
   {
-  auto gld = g_exdData.get< Sapphire::Data::Action >( id );
-  auto gld1 = g_exdData.get< Sapphire::Data::ActionTransient >( id );
-  if( gld )
-  {
-    if( gld->classJob == -1 || gld->name.empty() )
-      continue;
-    Logger::info( "{0} - {1}", id, gld->name );
-    std::string desc = gld1->description;
-    stripUnicode( desc );;
-    desc = std::regex_replace( desc, std::regex( "HI" ), "\n" );
-    desc = std::regex_replace( desc, std::regex( "IH" ), "" );
+    auto done = ( cursor++ / static_cast< float >( total ) ) * 100.f;
+    if( cursor % 50 == 0 && cursor > 0 )
+      Logger::info( "Processing {} actions of {} ({:.2f}%)", cursor, total, done );
+
+    auto action = g_exdData.get< Sapphire::Data::Action >( id );
+    auto actionTransient = g_exdData.get< Sapphire::Data::ActionTransient >( id );
+    if( action )
+    {
+      if( action->classJob == -1 || action->name.empty() )
+        continue;
+
+      if( action->isPvP )
+        continue;
+
+      auto classJob = g_exdData.get< Sapphire::Data::ClassJob >( action->classJob );
+      if( !classJob )
+        continue;
+
+      // exclude dol/doh
+      if( classJob->classJobCategory == 32 || classJob->classJobCategory == 33 )
+        continue;
+
+      auto ac = static_cast< Common::ActionCategory >( action->actionCategory );
+      if( ac != Common::ActionCategory::Ability &&
+          ac != Common::ActionCategory::Autoattack &&
+          ac != Common::ActionCategory::Spell &&
+          ac != Common::ActionCategory::Weaponskill &&
+          ac != Common::ActionCategory::LimitBreak )
+        continue;
+
+      ActionEntry entry{};
+
+      entry.name = action->name;
+      entry.id = id;
+
+      Logger::info( "  {0} - {1}", id, action->name );
+      std::string desc = actionTransient->description;
+      stripUnicode( desc );
+      desc = std::regex_replace( desc, std::regex( "HI" ), "\n" );
+      desc = std::regex_replace( desc, std::regex( "IH" ), "" );
 //    Logger::info( "got {0}", desc );
-    
-    std::smatch sm;
-    std::regex r(R"(with a potency of \d*)");
-    if( std::regex_search(desc, sm, r ) )
-    {
-      std::string potStr = sm.str();
-      auto pos = potStr.find_last_of( " " );
-      if( pos  != std::string::npos )
-      {
-        potStr = potStr.substr( pos + 1 );
-	Logger::info( "Base Potency: {}", potStr);
-      }
-    }
-    
-    std::smatch sm1;
-    std::regex r1(R"(\d* when executed from a target's rear)");
-    if( std::regex_search(desc, sm1, r1 ) )
-    {
-      std::string potStr = sm1.str();
-      auto pos = potStr.find_first_of( " " );
-      if( pos  != std::string::npos )
-      {
-        potStr = potStr.substr( 0, pos );
-	Logger::info( "Rear Potency: {}", potStr);
-      }
-    }
 
-    std::smatch sm2;
-    std::regex r2(R"(\d* when executed from a target's flank)");
-    if( std::regex_search(desc, sm2, r2 ) )
-    {
-      std::string potStr = sm2.str();
-      auto pos = potStr.find_first_of( " " );
-      if( pos  != std::string::npos )
+      std::smatch sm;
+      std::regex r( R"(with a potency of [\d,]*)" );
+      if( std::regex_search( desc, sm, r ) )
       {
-        potStr = potStr.substr( 0, pos );
-	Logger::info( "Flank Potency: {}", potStr);
+        std::string potStr = sm.str();
+        auto pos = potStr.find_last_of( " " );
+        if( pos != std::string::npos )
+        {
+          potStr = potStr.substr( pos + 1 );
+//          Logger::info( "Base Potency: {}", potStr );
+          entry.potency = stripNonNumerics( potStr );
+        }
       }
-    }
 
-    std::smatch sm3;
-    std::regex r3(R"(\d* when executed in front of target)");
-    if( std::regex_search(desc, sm3, r3 ) )
-    {
-      std::string potStr = sm3.str();
-      auto pos = potStr.find_first_of( " " );
-      if( pos  != std::string::npos )
+      std::smatch sm1;
+      std::regex r1( R"([\d,]* when executed from a target's rear)" );
+      if( std::regex_search( desc, sm1, r1 ) )
       {
-        potStr = potStr.substr( 0, pos );
-	Logger::info( "Frontal Potency: {}", potStr);
+        std::string potStr = sm1.str();
+        auto pos = potStr.find_first_of( " " );
+        if( pos != std::string::npos )
+        {
+          potStr = potStr.substr( 0, pos );
+//          Logger::info( "Rear Potency: {}", potStr );
+          entry.rearPotency = stripNonNumerics( potStr );
+        }
       }
-    }
-    
-    std::smatch sm4;
-    std::regex r4(R"(Combo Potency: \d*)");
-    if( std::regex_search(desc, sm4, r4 ) )
-    {
-      std::string potStr = sm4.str();
-      auto pos = potStr.find_last_of( " " );
-      if( pos  != std::string::npos )
-      {
-        potStr = potStr.substr( pos + 1 );
-	Logger::info( "Combo Potency: {}", potStr);
-      }
-    }
-    
-    std::smatch sm5;
-    std::regex r5(R"(Cure Potency: \d*)");
-    if( std::regex_search(desc, sm5, r5 ) )
-    {
-      std::string potStr = sm5.str();
-      auto pos = potStr.find_last_of( " " );
-      if( pos  != std::string::npos )
-      {
-        potStr = potStr.substr( pos + 1 );
-	Logger::info( "Cure Potency: {}", potStr);
-      }
-    }
 
-    Logger::info( "-" );
+      std::smatch sm2;
+      std::regex r2( R"([\d,]* when executed from a target's flank)" );
+      if( std::regex_search( desc, sm2, r2 ) )
+      {
+        std::string potStr = sm2.str();
+        auto pos = potStr.find_first_of( " " );
+        if( pos != std::string::npos )
+        {
+          potStr = potStr.substr( 0, pos );
+//          Logger::info( "Flank Potency: {}", potStr );
+          entry.flankPotency = stripNonNumerics( potStr );
+        }
+      }
+
+      std::smatch sm3;
+      std::regex r3( R"([\d,]* when executed in front of target)" );
+      if( std::regex_search( desc, sm3, r3 ) )
+      {
+        std::string potStr = sm3.str();
+        auto pos = potStr.find_first_of( " " );
+        if( pos != std::string::npos )
+        {
+          potStr = potStr.substr( 0, pos );
+//          Logger::info( "Frontal Potency: {}", potStr );
+          entry.frontPotency = stripNonNumerics( potStr );
+        }
+      }
+
+      std::smatch sm4;
+      std::regex r4( R"(Combo Potency: [\d,]*)" );
+      if( std::regex_search( desc, sm4, r4 ) )
+      {
+        std::string potStr = sm4.str();
+        auto pos = potStr.find_last_of( " " );
+        if( pos != std::string::npos )
+        {
+          potStr = potStr.substr( pos + 1 );
+//          Logger::info( "Combo Potency: {}", potStr );
+          entry.comboPotency = stripNonNumerics( potStr );
+        }
+      }
+
+      std::smatch sm5;
+      std::regex r5( R"(Cure Potency: [\d,]*)" );
+      if( std::regex_search( desc, sm5, r5 ) )
+      {
+        std::string potStr = sm5.str();
+        auto pos = potStr.find_last_of( " " );
+        if( pos != std::string::npos )
+        {
+          potStr = potStr.substr( pos + 1 );
+//          Logger::info( "Cure Potency: {}", potStr );
+          entry.curePotency = stripNonNumerics( potStr );
+        }
+      }
+
+      std::smatch sm6;
+      std::regex r6( R"(Restores \d*%)" );
+      if( std::regex_search( desc, sm6, r6 ) )
+      {
+        std::string resStr = sm6.str();
+        auto pos = resStr.find_last_of( " " );
+        if( pos != std::string::npos )
+        {
+          resStr = resStr.substr( pos + 1 );
+//          Logger::info( "Cure Percentage: {}", resStr );
+          entry.restorePercentage = stripNonNumerics( resStr );
+        }
+      }
+
+      actions[ id ] = std::move( entry );
+    }
+    else
+      Logger::warn( "failed to get classjob {}", 1 );
   }
-  else
-    Logger::warn( "failed to get classjob {}", 1 );
+
+  // dump entries
+  Logger::info( "Found {} player actions", actions.size() );
+  for( const auto& action : actions )
+  {
+    const auto& data = action.second;
+    Logger::info( " - {:<5} {:<25} pot: {:<4} flank pot: {:<4} front pot: {:<4} rear pot: {:<4} cure pot: {:<4} restore %: {:<4}",
+                  action.first, data.name, data.potency, data.flankPotency, data.frontPotency, data.rearPotency,
+                  data.curePotency, data.restorePercentage );
   }
 
   return 0;

From cd09f72a5bcc404373c7905eb9cb73b24e34c842 Mon Sep 17 00:00:00 2001
From: NotAdam <adam@notadam.me>
Date: Thu, 30 May 2019 15:35:05 +1000
Subject: [PATCH 044/351] action lut generation

---
 src/tools/action_parse/ActionLut.cpp.tmpl |    8 +
 src/tools/action_parse/main.cpp           |   35 +-
 src/world/Action/ActionLut.cpp            | 1120 +++++++++++++++++++++
 src/world/Action/ActionLut.h              |   28 +
 4 files changed, 1187 insertions(+), 4 deletions(-)
 create mode 100644 src/tools/action_parse/ActionLut.cpp.tmpl
 create mode 100644 src/world/Action/ActionLut.cpp
 create mode 100644 src/world/Action/ActionLut.h

diff --git a/src/tools/action_parse/ActionLut.cpp.tmpl b/src/tools/action_parse/ActionLut.cpp.tmpl
new file mode 100644
index 00000000..469b81be
--- /dev/null
+++ b/src/tools/action_parse/ActionLut.cpp.tmpl
@@ -0,0 +1,8 @@
+#include "ActionData.h"
+
+using namespace Sapphire::World::Action;
+
+ActionData::ActionLut ActionData::m_actionLut =
+{
+%INSERT_GARBAGE%
+};
\ No newline at end of file
diff --git a/src/tools/action_parse/main.cpp b/src/tools/action_parse/main.cpp
index 30eef883..c48194d3 100644
--- a/src/tools/action_parse/main.cpp
+++ b/src/tools/action_parse/main.cpp
@@ -17,8 +17,12 @@
 #include <streambuf>
 #include <regex>
 
+#include <experimental/filesystem>
+
 Sapphire::Data::ExdDataGenerated g_exdData;
 
+namespace fs = std::experimental::filesystem;
+
 using namespace Sapphire;
 
 const std::string datLocation( "/home/mordred/sqpack" );
@@ -70,6 +74,9 @@ int main()
 
   Logger::init( "action_parse" );
 
+  if( !fs::exists( "ActionLut.cpp.tmpl" ) )
+    throw std::runtime_error( "ActionLut.cpp.tmpl is missing in working directory" );
+
   Logger::info( "Setting up EXD data" );
   if( !g_exdData.init( datLocation ) )
   {
@@ -78,7 +85,7 @@ int main()
   }
   auto idList = g_exdData.getActionIdList();
 
-  std::unordered_map< uint32_t, ActionEntry > actions;
+  std::map< uint32_t, ActionEntry > actions;
 
   auto total = idList.size();
   int cursor = 0;
@@ -233,13 +240,33 @@ int main()
 
   // dump entries
   Logger::info( "Found {} player actions", actions.size() );
+
+  std::string output;
   for( const auto& action : actions )
   {
     const auto& data = action.second;
-    Logger::info( " - {:<5} {:<25} pot: {:<4} flank pot: {:<4} front pot: {:<4} rear pot: {:<4} cure pot: {:<4} restore %: {:<4}",
-                  action.first, data.name, data.potency, data.flankPotency, data.frontPotency, data.rearPotency,
-                  data.curePotency, data.restorePercentage );
+//    Logger::info( " - {:<5} {:<25} pot: {:<4} flank pot: {:<4} front pot: {:<4} rear pot: {:<4} cure pot: {:<4} restore %: {:<4}",
+//                  action.first, data.name, data.potency, data.flankPotency, data.frontPotency, data.rearPotency,
+//                  data.curePotency, data.restorePercentage );
+
+    auto out = fmt::format( "  // {}\n  {{ {}, {{ {}, {}, {}, {}, {} }} }},\n",
+                            data.name, action.first,
+                            data.potency, data.flankPotency, data.frontPotency, data.rearPotency, data.curePotency );
+
+    output += out;
+//    Logger::info( out );
   }
 
+  std::ifstream ifs( "ActionLut.cpp.tmpl" );
+
+  std::string actionTmpl( ( std::istreambuf_iterator< char >( ifs ) ),
+                            std::istreambuf_iterator< char >() );
+
+  auto result = std::regex_replace( actionTmpl, std::regex( "%INSERT_GARBAGE%" ), output );
+
+  std::ofstream outH( "ActionLut.cpp" );
+  outH << result;
+  outH.close();
+
   return 0;
 }
diff --git a/src/world/Action/ActionLut.cpp b/src/world/Action/ActionLut.cpp
new file mode 100644
index 00000000..1e9c1f97
--- /dev/null
+++ b/src/world/Action/ActionLut.cpp
@@ -0,0 +1,1120 @@
+#include "ActionLut.h"
+
+using namespace Sapphire::World::Action;
+
+ActionLut::Lut ActionLut::m_actionLut =
+{
+  // attack
+  { 7, { 0, 0, 0, 0, 0 } },
+  // Shot
+  { 8, { 0, 0, 0, 0, 0 } },
+  // Fast Blade
+  { 9, { 160, 0, 0, 0, 0 } },
+  // Savage Blade
+  { 11, { 100, 0, 0, 0, 0 } },
+  // Flash
+  { 14, { 0, 0, 0, 0, 0 } },
+  // Riot Blade
+  { 15, { 100, 0, 0, 0, 0 } },
+  // Shield Bash
+  { 16, { 110, 0, 0, 0, 0 } },
+  // Sentinel
+  { 17, { 0, 0, 0, 0, 0 } },
+  // Tempered Will
+  { 19, { 0, 0, 0, 0, 0 } },
+  // Fight or Flight
+  { 20, { 0, 0, 0, 0, 0 } },
+  // Rage of Halone
+  { 21, { 100, 0, 0, 0, 0 } },
+  // Bulwark
+  { 22, { 0, 0, 0, 0, 0 } },
+  // Circle of Scorn
+  { 23, { 100, 0, 0, 0, 0 } },
+  // Shield Lob
+  { 24, { 120, 0, 0, 0, 0 } },
+  // Shield Swipe
+  { 25, { 100, 0, 0, 0, 0 } },
+  // Sword Oath
+  { 26, { 75, 0, 0, 0, 0 } },
+  // Cover
+  { 27, { 0, 0, 0, 0, 0 } },
+  // Shield Oath
+  { 28, { 0, 0, 0, 0, 0 } },
+  // Spirits Within
+  { 29, { 300, 0, 0, 0, 0 } },
+  // Hallowed Ground
+  { 30, { 0, 0, 0, 0, 0 } },
+  // Heavy Swing
+  { 31, { 160, 0, 0, 0, 0 } },
+  // Skull Sunder
+  { 35, { 100, 0, 0, 0, 0 } },
+  // Maim
+  { 37, { 100, 0, 0, 0, 0 } },
+  // Berserk
+  { 38, { 0, 0, 0, 0, 0 } },
+  // Thrill of Battle
+  { 40, { 0, 0, 0, 0, 0 } },
+  // Overpower
+  { 41, { 130, 0, 0, 0, 0 } },
+  // Storm's Path
+  { 42, { 100, 0, 0, 0, 0 } },
+  // Holmgang
+  { 43, { 0, 0, 0, 0, 0 } },
+  // Vengeance
+  { 44, { 55, 0, 0, 0, 0 } },
+  // Storm's Eye
+  { 45, { 100, 0, 0, 0, 0 } },
+  // Tomahawk
+  { 46, { 140, 0, 0, 0, 0 } },
+  // Butcher's Block
+  { 47, { 100, 0, 0, 0, 0 } },
+  // Defiance
+  { 48, { 0, 0, 0, 0, 0 } },
+  // Inner Beast
+  { 49, { 350, 0, 0, 0, 0 } },
+  // Unchained
+  { 50, { 0, 0, 0, 0, 0 } },
+  // Steel Cyclone
+  { 51, { 200, 0, 0, 0, 0 } },
+  // Infuriate
+  { 52, { 0, 0, 0, 0, 0 } },
+  // Bootshine
+  { 53, { 140, 0, 0, 0, 0 } },
+  // True Strike
+  { 54, { 160, 0, 0, 180, 0 } },
+  // Snap Punch
+  { 56, { 150, 170, 0, 0, 0 } },
+  // Internal Release
+  { 59, { 0, 0, 0, 0, 0 } },
+  // Fists of Earth
+  { 60, { 0, 0, 0, 0, 0 } },
+  // Twin Snakes
+  { 61, { 110, 130, 0, 0, 0 } },
+  // Arm of the Destroyer
+  { 62, { 50, 0, 0, 0, 0 } },
+  // Fists of Fire
+  { 63, { 0, 0, 0, 0, 0 } },
+  // Steel Peak
+  { 64, { 150, 0, 0, 0, 0 } },
+  // Mantra
+  { 65, { 0, 0, 0, 0, 0 } },
+  // Demolish
+  { 66, { 50, 0, 0, 70, 0 } },
+  // Howling Fist
+  { 67, { 210, 0, 0, 0, 0 } },
+  // Perfect Balance
+  { 69, { 0, 0, 0, 0, 0 } },
+  // Rockbreaker
+  { 70, { 130, 0, 0, 0, 0 } },
+  // Shoulder Tackle
+  { 71, { 100, 0, 0, 0, 0 } },
+  // One Ilm Punch
+  { 72, { 120, 0, 0, 0, 0 } },
+  // Fists of Wind
+  { 73, { 0, 0, 0, 0, 0 } },
+  // Dragon Kick
+  { 74, { 120, 140, 0, 0, 0 } },
+  // True Thrust
+  { 75, { 160, 0, 0, 0, 0 } },
+  // Vorpal Thrust
+  { 78, { 100, 0, 0, 0, 0 } },
+  // Heavy Thrust
+  { 79, { 150, 190, 0, 0, 0 } },
+  // Impulse Drive
+  { 81, { 200, 0, 0, 0, 0 } },
+  // Life Surge
+  { 83, { 0, 0, 0, 0, 0 } },
+  // Full Thrust
+  { 84, { 100, 0, 0, 0, 0 } },
+  // Blood for Blood
+  { 85, { 0, 0, 0, 0, 0 } },
+  // Doom Spike
+  { 86, { 140, 0, 0, 0, 0 } },
+  // Disembowel
+  { 87, { 100, 0, 0, 0, 0 } },
+  // Chaos Thrust
+  { 88, { 100, 0, 0, 140, 0 } },
+  // Piercing Talon
+  { 90, { 120, 0, 0, 0, 0 } },
+  // Jump
+  { 92, { 260, 0, 0, 0, 0 } },
+  // Elusive Jump
+  { 94, { 0, 0, 0, 0, 0 } },
+  // Spineshatter Dive
+  { 95, { 210, 0, 0, 0, 0 } },
+  // Dragonfire Dive
+  { 96, { 320, 0, 0, 0, 0 } },
+  // Heavy Shot
+  { 97, { 150, 0, 0, 0, 0 } },
+  // Straight Shot
+  { 98, { 140, 0, 0, 0, 0 } },
+  // Venomous Bite
+  { 100, { 100, 0, 0, 0, 0 } },
+  // Raging Strikes
+  { 101, { 0, 0, 0, 0, 0 } },
+  // Misery's End
+  { 103, { 190, 0, 0, 0, 0 } },
+  // Quick Nock
+  { 106, { 110, 0, 0, 0, 0 } },
+  // Barrage
+  { 107, { 0, 0, 0, 0, 0 } },
+  // Bloodletter
+  { 110, { 130, 0, 0, 0, 0 } },
+  // Repelling Shot
+  { 112, { 0, 0, 0, 0, 0 } },
+  // Windbite
+  { 113, { 60, 0, 0, 0, 0 } },
+  // Mage's Ballad
+  { 114, { 100, 0, 0, 0, 0 } },
+  // Foe Requiem
+  { 115, { 0, 0, 0, 0, 0 } },
+  // Army's Paeon
+  { 116, { 100, 0, 0, 0, 0 } },
+  // Rain of Death
+  { 117, { 100, 0, 0, 0, 0 } },
+  // Battle Voice
+  { 118, { 0, 0, 0, 0, 0 } },
+  // Stone
+  { 119, { 140, 0, 0, 0, 0 } },
+  // Cure
+  { 120, { 0, 0, 0, 0, 450 } },
+  // Aero
+  { 121, { 50, 0, 0, 0, 0 } },
+  // Medica
+  { 124, { 0, 0, 0, 0, 300 } },
+  // Raise
+  { 125, { 0, 0, 0, 0, 0 } },
+  // Stone II
+  { 127, { 200, 0, 0, 0, 0 } },
+  // Repose
+  { 128, { 0, 0, 0, 0, 0 } },
+  // Cure III
+  { 131, { 0, 0, 0, 0, 550 } },
+  // Aero II
+  { 132, { 50, 0, 0, 0, 0 } },
+  // Medica II
+  { 133, { 0, 0, 0, 0, 200 } },
+  // Fluid Aura
+  { 134, { 0, 0, 0, 0, 0 } },
+  // Cure II
+  { 135, { 0, 0, 0, 0, 700 } },
+  // Presence of Mind
+  { 136, { 0, 0, 0, 0, 0 } },
+  // Regen
+  { 137, { 0, 0, 0, 0, 150 } },
+  // Holy
+  { 139, { 200, 0, 0, 0, 0 } },
+  // Benediction
+  { 140, { 0, 0, 0, 0, 0 } },
+  // Fire
+  { 141, { 180, 0, 0, 0, 0 } },
+  // Blizzard
+  { 142, { 180, 0, 0, 0, 0 } },
+  // Thunder
+  { 144, { 30, 0, 0, 0, 0 } },
+  // Sleep
+  { 145, { 0, 0, 0, 0, 0 } },
+  // Blizzard II
+  { 146, { 50, 0, 0, 0, 0 } },
+  // Fire II
+  { 147, { 80, 0, 0, 0, 0 } },
+  // Transpose
+  { 149, { 0, 0, 0, 0, 0 } },
+  // Fire III
+  { 152, { 240, 0, 0, 0, 0 } },
+  // Thunder III
+  { 153, { 70, 0, 0, 0, 0 } },
+  // Blizzard III
+  { 154, { 240, 0, 0, 0, 0 } },
+  // Aetherial Manipulation
+  { 155, { 0, 0, 0, 0, 0 } },
+  // Scathe
+  { 156, { 100, 0, 0, 0, 0 } },
+  // Manaward
+  { 157, { 0, 0, 0, 0, 0 } },
+  // Convert
+  { 158, { 0, 0, 0, 0, 0 } },
+  // Freeze
+  { 159, { 100, 0, 0, 0, 0 } },
+  // Flare
+  { 162, { 260, 0, 0, 0, 0 } },
+  // Ruin
+  { 163, { 100, 0, 0, 0, 0 } },
+  // Bio
+  { 164, { 0, 0, 0, 0, 0 } },
+  // Summon
+  { 165, { 0, 0, 0, 0, 0 } },
+  // Aetherflow
+  { 166, { 0, 0, 0, 0, 0 } },
+  // Energy Drain
+  { 167, { 150, 0, 0, 0, 0 } },
+  // Miasma
+  { 168, { 20, 0, 0, 0, 0 } },
+  // Summon II
+  { 170, { 0, 0, 0, 0, 0 } },
+  // Sustain
+  { 171, { 0, 0, 0, 0, 0 } },
+  // Ruin II
+  { 172, { 100, 0, 0, 0, 0 } },
+  // Resurrection
+  { 173, { 0, 0, 0, 0, 0 } },
+  // Bane
+  { 174, { 0, 0, 0, 0, 0 } },
+  // Rouse
+  { 176, { 0, 0, 0, 0, 0 } },
+  // Miasma II
+  { 177, { 100, 0, 0, 0, 0 } },
+  // Bio II
+  { 178, { 0, 0, 0, 0, 0 } },
+  // Shadow Flare
+  { 179, { 50, 0, 0, 0, 0 } },
+  // Summon III
+  { 180, { 0, 0, 0, 0, 0 } },
+  // Fester
+  { 181, { 150, 0, 0, 0, 0 } },
+  // Tri-bind
+  { 182, { 30, 0, 0, 0, 0 } },
+  // Enkindle
+  { 184, { 0, 0, 0, 0, 0 } },
+  // Adloquium
+  { 185, { 0, 0, 0, 0, 300 } },
+  // Succor
+  { 186, { 0, 0, 0, 0, 150 } },
+  // Sacred Soil
+  { 188, { 0, 0, 0, 0, 0 } },
+  // Lustrate
+  { 189, { 0, 0, 0, 0, 600 } },
+  // Physick
+  { 190, { 0, 0, 0, 0, 400 } },
+  // Shield Wall
+  { 197, { 0, 0, 0, 0, 0 } },
+  // Stronghold
+  { 198, { 0, 0, 0, 0, 0 } },
+  // Last Bastion
+  { 199, { 0, 0, 0, 0, 0 } },
+  // Braver
+  { 200, { 2400, 0, 0, 0, 0 } },
+  // Bladedance
+  { 201, { 5250, 0, 0, 0, 0 } },
+  // Final Heaven
+  { 202, { 9000, 0, 0, 0, 0 } },
+  // Skyshard
+  { 203, { 1650, 0, 0, 0, 0 } },
+  // Starstorm
+  { 204, { 3600, 0, 0, 0, 0 } },
+  // Meteor
+  { 205, { 6150, 0, 0, 0, 0 } },
+  // Healing Wind
+  { 206, { 0, 0, 0, 0, 0 } },
+  // Breath of the Earth
+  { 207, { 0, 0, 0, 0, 0 } },
+  // Pulse of Life
+  { 208, { 0, 0, 0, 0, 0 } },
+  // Magitek Cannon
+  { 1128, { 0, 0, 0, 0, 0 } },
+  // Photon Stream
+  { 1129, { 0, 0, 0, 0, 0 } },
+  // attack
+  { 1533, { 0, 0, 0, 0, 0 } },
+  // Spinning Edge
+  { 2240, { 150, 0, 0, 0, 0 } },
+  // Shade Shift
+  { 2241, { 0, 0, 0, 0, 0 } },
+  // Gust Slash
+  { 2242, { 100, 0, 0, 0, 0 } },
+  // Hide
+  { 2245, { 0, 0, 0, 0, 0 } },
+  // Assassinate
+  { 2246, { 200, 0, 0, 0, 0 } },
+  // Throwing Dagger
+  { 2247, { 120, 0, 0, 0, 0 } },
+  // Mug
+  { 2248, { 140, 0, 0, 0, 0 } },
+  // Hide
+  { 2253, { 0, 0, 0, 0, 0 } },
+  // Death Blossom
+  { 2254, { 110, 0, 0, 0, 0 } },
+  // Aeolian Edge
+  { 2255, { 100, 0, 0, 160, 0 } },
+  // Jugulate
+  { 2256, { 80, 0, 0, 0, 0 } },
+  // Shadow Fang
+  { 2257, { 100, 0, 0, 0, 0 } },
+  // Trick Attack
+  { 2258, { 240, 0, 0, 400, 0 } },
+  // Ten
+  { 2259, { 0, 0, 0, 0, 0 } },
+  // Ninjutsu
+  { 2260, { 0, 0, 0, 0, 0 } },
+  // Chi
+  { 2261, { 0, 0, 0, 0, 0 } },
+  // Shukuchi
+  { 2262, { 0, 0, 0, 0, 0 } },
+  // Jin
+  { 2263, { 0, 0, 0, 0, 0 } },
+  // Kassatsu
+  { 2264, { 0, 0, 0, 0, 0 } },
+  // Fuma Shuriken
+  { 2265, { 240, 0, 0, 0, 0 } },
+  // Katon
+  { 2266, { 250, 0, 0, 0, 0 } },
+  // Raiton
+  { 2267, { 360, 0, 0, 0, 0 } },
+  // Hyoton
+  { 2268, { 140, 0, 0, 0, 0 } },
+  // Huton
+  { 2269, { 0, 0, 0, 0, 0 } },
+  // Doton
+  { 2270, { 45, 0, 0, 0, 0 } },
+  // Suiton
+  { 2271, { 180, 0, 0, 0, 0 } },
+  // Rabbit Medium
+  { 2272, { 0, 0, 0, 0, 0 } },
+  // Rook Autoturret
+  { 2864, { 80, 0, 0, 0, 0 } },
+  // Bishop Autoturret
+  { 2865, { 60, 0, 0, 0, 0 } },
+  // Split Shot
+  { 2866, { 160, 0, 0, 0, 0 } },
+  // Reload
+  { 2867, { 0, 0, 0, 0, 0 } },
+  // Slug Shot
+  { 2868, { 100, 0, 0, 0, 0 } },
+  // Spread Shot
+  { 2870, { 80, 0, 0, 0, 0 } },
+  // Hot Shot
+  { 2872, { 120, 0, 0, 0, 0 } },
+  // Clean Shot
+  { 2873, { 100, 0, 0, 0, 0 } },
+  // Gauss Round
+  { 2874, { 210, 0, 0, 0, 0 } },
+  // Heartbreak
+  { 2875, { 240, 0, 0, 0, 0 } },
+  // Reassemble
+  { 2876, { 0, 0, 0, 0, 0 } },
+  // Wildfire
+  { 2878, { 0, 0, 0, 0, 0 } },
+  // Quick Reload
+  { 2879, { 0, 0, 0, 0, 0 } },
+  // Gauss Barrel
+  { 2880, { 0, 0, 0, 0, 0 } },
+  // Rapid Fire
+  { 2881, { 0, 0, 0, 0, 0 } },
+  // Hypercharge
+  { 2885, { 0, 0, 0, 0, 0 } },
+  // Dismantle
+  { 2887, { 0, 0, 0, 0, 0 } },
+  // Blank
+  { 2888, { 0, 0, 0, 0, 0 } },
+  // Ricochet
+  { 2890, { 320, 0, 0, 0, 0 } },
+  // Raiton
+  { 3203, { 0, 0, 0, 0, 0 } },
+  // Raiton
+  { 3204, { 0, 0, 0, 0, 0 } },
+  // Kanashibari
+  { 3207, { 0, 0, 0, 0, 0 } },
+  // Turret Retrieval
+  { 3487, { 0, 0, 0, 0, 0 } },
+  // Goring Blade
+  { 3538, { 100, 0, 0, 0, 0 } },
+  // Royal Authority
+  { 3539, { 100, 0, 0, 0, 0 } },
+  // Divine Veil
+  { 3540, { 0, 0, 0, 0, 0 } },
+  // Clemency
+  { 3541, { 0, 0, 0, 0, 1200 } },
+  // Sheltron
+  { 3542, { 0, 0, 0, 0, 0 } },
+  // Tornado Kick
+  { 3543, { 330, 0, 0, 0, 0 } },
+  // Purification
+  { 3544, { 0, 0, 0, 0, 0 } },
+  // Elixir Field
+  { 3545, { 220, 0, 0, 0, 0 } },
+  // Meditation
+  { 3546, { 0, 0, 0, 0, 0 } },
+  // the Forbidden Chakra
+  { 3547, { 250, 0, 0, 0, 0 } },
+  // Deliverance
+  { 3548, { 0, 0, 0, 0, 0 } },
+  // Fell Cleave
+  { 3549, { 520, 0, 0, 0, 0 } },
+  // Decimate
+  { 3550, { 280, 0, 0, 0, 0 } },
+  // Raw Intuition
+  { 3551, { 0, 0, 0, 0, 0 } },
+  // Equilibrium
+  { 3552, { 0, 0, 0, 0, 1200 } },
+  // Blood of the Dragon
+  { 3553, { 0, 0, 0, 0, 0 } },
+  // Fang and Claw
+  { 3554, { 260, 300, 0, 0, 0 } },
+  // Geirskogul
+  { 3555, { 230, 0, 0, 0, 0 } },
+  // Wheeling Thrust
+  { 3556, { 260, 0, 0, 300, 0 } },
+  // Battle Litany
+  { 3557, { 0, 0, 0, 0, 0 } },
+  // Empyreal Arrow
+  { 3558, { 230, 0, 0, 0, 0 } },
+  // the Wanderer's Minuet
+  { 3559, { 100, 0, 0, 0, 0 } },
+  // Iron Jaws
+  { 3560, { 100, 0, 0, 0, 0 } },
+  // the Warden's Paean
+  { 3561, { 0, 0, 0, 0, 0 } },
+  // Sidewinder
+  { 3562, { 100, 0, 0, 0, 0 } },
+  // Armor Crush
+  { 3563, { 100, 160, 0, 0, 0 } },
+  // Shadewalker
+  { 3564, { 0, 0, 0, 0, 0 } },
+  // Smoke Screen
+  { 3565, { 0, 0, 0, 0, 0 } },
+  // Dream Within a Dream
+  { 3566, { 150, 0, 0, 0, 0 } },
+  // Duality
+  { 3567, { 0, 0, 0, 0, 0 } },
+  // Stone III
+  { 3568, { 210, 0, 0, 0, 0 } },
+  // Asylum
+  { 3569, { 0, 0, 0, 0, 100 } },
+  // Tetragrammaton
+  { 3570, { 0, 0, 0, 0, 700 } },
+  // Assize
+  { 3571, { 400, 0, 0, 0, 400 } },
+  // Aero III
+  { 3572, { 50, 0, 0, 0, 0 } },
+  // Ley Lines
+  { 3573, { 0, 0, 0, 0, 0 } },
+  // Sharpcast
+  { 3574, { 0, 0, 0, 0, 0 } },
+  // Enochian
+  { 3575, { 0, 0, 0, 0, 0 } },
+  // Blizzard IV
+  { 3576, { 260, 0, 0, 0, 0 } },
+  // Fire IV
+  { 3577, { 300, 0, 0, 0, 0 } },
+  // Painflare
+  { 3578, { 180, 0, 0, 0, 0 } },
+  // Ruin III
+  { 3579, { 120, 0, 0, 0, 0 } },
+  // Tri-disaster
+  { 3580, { 0, 0, 0, 0, 0 } },
+  // Dreadwyrm Trance
+  { 3581, { 0, 0, 0, 0, 0 } },
+  // Deathflare
+  { 3582, { 400, 0, 0, 0, 0 } },
+  // Indomitability
+  { 3583, { 0, 0, 0, 0, 500 } },
+  // Broil
+  { 3584, { 190, 0, 0, 0, 0 } },
+  // Deployment Tactics
+  { 3585, { 0, 0, 0, 0, 0 } },
+  // Emergency Tactics
+  { 3586, { 0, 0, 0, 0, 0 } },
+  // Dissipation
+  { 3587, { 0, 0, 0, 0, 0 } },
+  // Draw
+  { 3590, { 0, 0, 0, 0, 0 } },
+  // Royal Road
+  { 3591, { 0, 0, 0, 0, 0 } },
+  // Spread
+  { 3592, { 0, 0, 0, 0, 0 } },
+  // Redraw
+  { 3593, { 0, 0, 0, 0, 0 } },
+  // Benefic
+  { 3594, { 0, 0, 0, 0, 400 } },
+  // Aspected Benefic
+  { 3595, { 0, 0, 0, 0, 200 } },
+  // Malefic
+  { 3596, { 150, 0, 0, 0, 0 } },
+  // Malefic II
+  { 3598, { 180, 0, 0, 0, 0 } },
+  // Combust
+  { 3599, { 0, 0, 0, 0, 0 } },
+  // Helios
+  { 3600, { 0, 0, 0, 0, 300 } },
+  // Aspected Helios
+  { 3601, { 0, 0, 0, 0, 200 } },
+  // Ascend
+  { 3603, { 0, 0, 0, 0, 0 } },
+  // Diurnal Sect
+  { 3604, { 0, 0, 0, 0, 0 } },
+  // Nocturnal Sect
+  { 3605, { 0, 0, 0, 0, 0 } },
+  // Lightspeed
+  { 3606, { 0, 0, 0, 0, 0 } },
+  // Combust II
+  { 3608, { 0, 0, 0, 0, 0 } },
+  // Benefic II
+  { 3610, { 0, 0, 0, 0, 650 } },
+  // Time Dilation
+  { 3611, { 0, 0, 0, 0, 0 } },
+  // Synastry
+  { 3612, { 0, 0, 0, 0, 0 } },
+  // Collective Unconscious
+  { 3613, { 0, 0, 0, 0, 150 } },
+  // Essential Dignity
+  { 3614, { 0, 0, 0, 0, 400 } },
+  // Gravity
+  { 3615, { 200, 0, 0, 0, 0 } },
+  // Celestial Opposition
+  { 3616, { 0, 0, 0, 0, 0 } },
+  // Hard Slash
+  { 3617, { 150, 0, 0, 0, 0 } },
+  // Spinning Slash
+  { 3619, { 100, 0, 0, 0, 0 } },
+  // Unleash
+  { 3621, { 50, 0, 0, 0, 0 } },
+  // Syphon Strike
+  { 3623, { 100, 0, 0, 0, 0 } },
+  // Unmend
+  { 3624, { 150, 0, 0, 0, 0 } },
+  // Blood Weapon
+  { 3625, { 0, 0, 0, 0, 0 } },
+  // Power Slash
+  { 3627, { 100, 0, 0, 0, 0 } },
+  // Darkside
+  { 3628, { 0, 0, 0, 0, 0 } },
+  // Grit
+  { 3629, { 0, 0, 0, 0, 0 } },
+  // Blood Price
+  { 3631, { 0, 0, 0, 0, 0 } },
+  // Souleater
+  { 3632, { 100, 0, 0, 0, 0 } },
+  // Dark Passenger
+  { 3633, { 140, 0, 0, 0, 0 } },
+  // Dark Mind
+  { 3634, { 0, 0, 0, 0, 0 } },
+  // Dark Arts
+  { 3635, { 0, 0, 0, 0, 0 } },
+  // Shadow Wall
+  { 3636, { 0, 0, 0, 0, 0 } },
+  // Living Dead
+  { 3638, { 0, 0, 0, 0, 0 } },
+  // Salted Earth
+  { 3639, { 75, 0, 0, 0, 0 } },
+  // Plunge
+  { 3640, { 200, 0, 0, 0, 0 } },
+  // Abyssal Drain
+  { 3641, { 120, 0, 0, 0, 0 } },
+  // Sole Survivor
+  { 3642, { 0, 0, 0, 0, 0 } },
+  // Carve and Spit
+  { 3643, { 100, 0, 0, 0, 0 } },
+  // Big Shot
+  { 4238, { 0, 0, 0, 0, 0 } },
+  // Desperado
+  { 4239, { 0, 0, 0, 0, 0 } },
+  // Land Waker
+  { 4240, { 0, 0, 0, 0, 0 } },
+  // Dark Force
+  { 4241, { 0, 0, 0, 0, 0 } },
+  // Dragonsong Dive
+  { 4242, { 0, 0, 0, 0, 0 } },
+  // Chimatsuri
+  { 4243, { 0, 0, 0, 0, 0 } },
+  // Sagittarius Arrow
+  { 4244, { 0, 0, 0, 0, 0 } },
+  // Satellite Beam
+  { 4245, { 0, 0, 0, 0, 0 } },
+  // Teraflare
+  { 4246, { 0, 0, 0, 0, 0 } },
+  // Angel Feathers
+  { 4247, { 0, 0, 0, 0, 0 } },
+  // Astral Stasis
+  { 4248, { 0, 0, 0, 0, 0 } },
+  // Form Shift
+  { 4262, { 0, 0, 0, 0, 0 } },
+  // Cannonfire
+  { 4271, { 0, 0, 0, 0, 0 } },
+  // the Balance
+  { 4401, { 0, 0, 0, 0, 0 } },
+  // the Bole
+  { 4402, { 0, 0, 0, 0, 0 } },
+  // the Arrow
+  { 4403, { 0, 0, 0, 0, 0 } },
+  // the Spear
+  { 4404, { 0, 0, 0, 0, 0 } },
+  // the Ewer
+  { 4405, { 0, 0, 0, 0, 0 } },
+  // the Spire
+  { 4406, { 0, 0, 0, 0, 0 } },
+  // the Balance
+  { 4407, { 0, 0, 0, 0, 0 } },
+  // the Bole
+  { 4408, { 0, 0, 0, 0, 0 } },
+  // the Arrow
+  { 4409, { 0, 0, 0, 0, 0 } },
+  // the Spear
+  { 4410, { 0, 0, 0, 0, 0 } },
+  // the Ewer
+  { 4411, { 0, 0, 0, 0, 0 } },
+  // the Spire
+  { 4412, { 0, 0, 0, 0, 0 } },
+  // the Balance
+  { 4413, { 0, 0, 0, 0, 0 } },
+  // the Bole
+  { 4414, { 0, 0, 0, 0, 0 } },
+  // the Arrow
+  { 4415, { 0, 0, 0, 0, 0 } },
+  // the Spear
+  { 4416, { 0, 0, 0, 0, 0 } },
+  // the Ewer
+  { 4417, { 0, 0, 0, 0, 0 } },
+  // the Spire
+  { 4418, { 0, 0, 0, 0, 0 } },
+  // the Balance
+  { 4419, { 0, 0, 0, 0, 0 } },
+  // the Bole
+  { 4420, { 0, 0, 0, 0, 0 } },
+  // the Arrow
+  { 4421, { 0, 0, 0, 0, 0 } },
+  // the Spear
+  { 4422, { 0, 0, 0, 0, 0 } },
+  // the Ewer
+  { 4423, { 0, 0, 0, 0, 0 } },
+  // the Spire
+  { 4424, { 0, 0, 0, 0, 0 } },
+  // Empty Road
+  { 4645, { 0, 0, 0, 0, 0 } },
+  // Undraw Spread
+  { 4646, { 0, 0, 0, 0, 0 } },
+  // Raiton
+  { 4977, { 0, 0, 0, 0, 0 } },
+  // Raiton
+  { 5069, { 0, 0, 0, 0, 0 } },
+  // attack
+  { 5199, { 0, 0, 0, 0, 0 } },
+  // attack
+  { 5846, { 0, 0, 0, 0, 0 } },
+  // Stickyloom
+  { 5874, { 0, 0, 0, 0, 0 } },
+  // Void Fire II
+  { 6274, { 0, 0, 0, 0, 0 } },
+  // Total Eclipse
+  { 7381, { 110, 0, 0, 0, 0 } },
+  // Intervention
+  { 7382, { 0, 0, 0, 0, 0 } },
+  // Requiescat
+  { 7383, { 350, 0, 0, 0, 0 } },
+  // Holy Spirit
+  { 7384, { 380, 0, 0, 0, 0 } },
+  // Passage of Arms
+  { 7385, { 0, 0, 0, 0, 0 } },
+  // Onslaught
+  { 7386, { 100, 0, 0, 0, 0 } },
+  // Upheaval
+  { 7387, { 300, 0, 0, 0, 0 } },
+  // Shake It Off
+  { 7388, { 0, 0, 0, 0, 0 } },
+  // Inner Release
+  { 7389, { 0, 0, 0, 0, 0 } },
+  // Delirium
+  { 7390, { 0, 0, 0, 0, 0 } },
+  // Quietus
+  { 7391, { 160, 0, 0, 0, 0 } },
+  // Bloodspiller
+  { 7392, { 400, 0, 0, 0, 0 } },
+  // The Blackest Night
+  { 7393, { 0, 0, 0, 0, 0 } },
+  // Riddle of Earth
+  { 7394, { 0, 0, 0, 0, 0 } },
+  // Riddle of Fire
+  { 7395, { 0, 0, 0, 0, 0 } },
+  // Brotherhood
+  { 7396, { 0, 0, 0, 0, 0 } },
+  // Sonic Thrust
+  { 7397, { 100, 0, 0, 0, 0 } },
+  // Dragon Sight
+  { 7398, { 0, 0, 0, 0, 0 } },
+  // Mirage Dive
+  { 7399, { 210, 0, 0, 0, 0 } },
+  // Nastrond
+  { 7400, { 330, 0, 0, 0, 0 } },
+  // Hellfrog Medium
+  { 7401, { 400, 0, 0, 0, 0 } },
+  // Bhavacakra
+  { 7402, { 600, 0, 0, 0, 0 } },
+  // Ten Chi Jin
+  { 7403, { 0, 0, 0, 0, 0 } },
+  // Pitch Perfect
+  { 7404, { 100, 0, 0, 0, 0 } },
+  // Troubadour
+  { 7405, { 0, 0, 0, 0, 0 } },
+  // Caustic Bite
+  { 7406, { 120, 0, 0, 0, 0 } },
+  // Stormbite
+  { 7407, { 120, 0, 0, 0, 0 } },
+  // Nature's Minne
+  { 7408, { 0, 0, 0, 0, 0 } },
+  // Refulgent Arrow
+  { 7409, { 300, 0, 0, 0, 0 } },
+  // Cooldown
+  { 7410, { 150, 0, 0, 0, 0 } },
+  // Heated Split Shot
+  { 7411, { 190, 0, 0, 0, 0 } },
+  // Heated Slug Shot
+  { 7412, { 100, 0, 0, 0, 0 } },
+  // Heated Clean Shot
+  { 7413, { 100, 0, 0, 0, 0 } },
+  // Barrel Stabilizer
+  { 7414, { 0, 0, 0, 0, 0 } },
+  // Rook Overdrive
+  { 7415, { 0, 0, 0, 0, 0 } },
+  // Flamethrower
+  { 7418, { 0, 0, 0, 0, 0 } },
+  // Between the Lines
+  { 7419, { 0, 0, 0, 0, 0 } },
+  // Thunder IV
+  { 7420, { 50, 0, 0, 0, 0 } },
+  // Triplecast
+  { 7421, { 0, 0, 0, 0, 0 } },
+  // Foul
+  { 7422, { 650, 0, 0, 0, 0 } },
+  // Aetherpact
+  { 7423, { 0, 0, 0, 0, 0 } },
+  // Bio III
+  { 7424, { 0, 0, 0, 0, 0 } },
+  // Miasma III
+  { 7425, { 50, 0, 0, 0, 0 } },
+  // Ruin IV
+  { 7426, { 200, 0, 0, 0, 0 } },
+  // Summon Bahamut
+  { 7427, { 0, 0, 0, 0, 0 } },
+  // Enkindle Bahamut
+  { 7429, { 0, 0, 0, 0, 0 } },
+  // Thin Air
+  { 7430, { 0, 0, 0, 0, 0 } },
+  // Stone IV
+  { 7431, { 250, 0, 0, 0, 0 } },
+  // Divine Benison
+  { 7432, { 0, 0, 0, 0, 0 } },
+  // Plenary Indulgence
+  { 7433, { 0, 0, 0, 0, 0 } },
+  // Excogitation
+  { 7434, { 0, 0, 0, 0, 800 } },
+  // Broil II
+  { 7435, { 230, 0, 0, 0, 0 } },
+  // Chain Stratagem
+  { 7436, { 0, 0, 0, 0, 0 } },
+  // Aetherpact
+  { 7437, { 0, 0, 0, 0, 0 } },
+  // Earthly Star
+  { 7439, { 150, 0, 0, 0, 540 } },
+  // Malefic III
+  { 7442, { 220, 0, 0, 0, 0 } },
+  // Minor Arcana
+  { 7443, { 0, 0, 0, 0, 0 } },
+  // Lord of Crowns
+  { 7444, { 300, 0, 0, 0, 0 } },
+  // Lady of Crowns
+  { 7445, { 0, 0, 0, 0, 500 } },
+  // Thunder II
+  { 7447, { 30, 0, 0, 0, 0 } },
+  // Sleeve Draw
+  { 7448, { 0, 0, 0, 0, 0 } },
+  // Hakaze
+  { 7477, { 150, 0, 0, 0, 0 } },
+  // Jinpu
+  { 7478, { 100, 0, 0, 0, 0 } },
+  // Shifu
+  { 7479, { 100, 0, 0, 0, 0 } },
+  // Yukikaze
+  { 7480, { 100, 0, 0, 0, 0 } },
+  // Gekko
+  { 7481, { 100, 0, 0, 0, 0 } },
+  // Kasha
+  { 7482, { 100, 0, 0, 0, 0 } },
+  // Fuga
+  { 7483, { 100, 0, 0, 0, 0 } },
+  // Mangetsu
+  { 7484, { 100, 0, 0, 0, 0 } },
+  // Oka
+  { 7485, { 100, 0, 0, 0, 0 } },
+  // Enpi
+  { 7486, { 100, 0, 0, 0, 0 } },
+  // Midare Setsugekka
+  { 7487, { 720, 0, 0, 0, 0 } },
+  // Tenka Goken
+  { 7488, { 360, 0, 0, 0, 0 } },
+  // Higanbana
+  { 7489, { 240, 0, 0, 0, 0 } },
+  // Hissatsu: Shinten
+  { 7490, { 300, 0, 0, 0, 0 } },
+  // Hissatsu: Kyuten
+  { 7491, { 150, 0, 0, 0, 0 } },
+  // Hissatsu: Gyoten
+  { 7492, { 100, 0, 0, 0, 0 } },
+  // Hissatsu: Yaten
+  { 7493, { 100, 0, 0, 0, 0 } },
+  // Hissatsu: Kaiten
+  { 7494, { 0, 0, 0, 0, 0 } },
+  // Hagakure
+  { 7495, { 0, 0, 0, 0, 0 } },
+  // Hissatsu: Guren
+  { 7496, { 800, 0, 0, 0, 0 } },
+  // Meditate
+  { 7497, { 0, 0, 0, 0, 0 } },
+  // Third Eye
+  { 7498, { 0, 0, 0, 0, 0 } },
+  // Meikyo Shisui
+  { 7499, { 0, 0, 0, 0, 0 } },
+  // Ageha
+  { 7500, { 250, 0, 0, 0, 0 } },
+  // Hissatsu: Seigan
+  { 7501, { 200, 0, 0, 0, 0 } },
+  // Merciful Eyes
+  { 7502, { 0, 0, 0, 0, 200 } },
+  // Jolt
+  { 7503, { 180, 0, 0, 0, 0 } },
+  // Riposte
+  { 7504, { 130, 0, 0, 0, 0 } },
+  // Verthunder
+  { 7505, { 310, 0, 0, 0, 0 } },
+  // Corps-a-corps
+  { 7506, { 130, 0, 0, 0, 0 } },
+  // Veraero
+  { 7507, { 310, 0, 0, 0, 0 } },
+  // Tether
+  { 7508, { 0, 0, 0, 0, 0 } },
+  // Scatter
+  { 7509, { 100, 0, 0, 0, 0 } },
+  // Verfire
+  { 7510, { 270, 0, 0, 0, 0 } },
+  // Verstone
+  { 7511, { 270, 0, 0, 0, 0 } },
+  // Zwerchhau
+  { 7512, { 100, 0, 0, 0, 0 } },
+  // Moulinet
+  { 7513, { 60, 0, 0, 0, 0 } },
+  // Vercure
+  { 7514, { 0, 0, 0, 0, 350 } },
+  // Displacement
+  { 7515, { 130, 0, 0, 0, 0 } },
+  // Redoublement
+  { 7516, { 100, 0, 0, 0, 0 } },
+  // Fleche
+  { 7517, { 420, 0, 0, 0, 0 } },
+  // Acceleration
+  { 7518, { 0, 0, 0, 0, 0 } },
+  // Contre Sixte
+  { 7519, { 350, 0, 0, 0, 0 } },
+  // Embolden
+  { 7520, { 0, 0, 0, 0, 0 } },
+  // Manafication
+  { 7521, { 0, 0, 0, 0, 0 } },
+  // Impact
+  { 7522, { 270, 0, 0, 0, 0 } },
+  // Verraise
+  { 7523, { 0, 0, 0, 0, 0 } },
+  // Jolt II
+  { 7524, { 240, 0, 0, 0, 0 } },
+  // Verflare
+  { 7525, { 600, 0, 0, 0, 0 } },
+  // Verholy
+  { 7526, { 600, 0, 0, 0, 0 } },
+  // Enchanted Riposte
+  { 7527, { 210, 0, 0, 0, 0 } },
+  // Enchanted Zwerchhau
+  { 7528, { 100, 0, 0, 0, 0 } },
+  // Enchanted Redoublement
+  { 7529, { 100, 0, 0, 0, 0 } },
+  // Enchanted Moulinet
+  { 7530, { 200, 0, 0, 0, 0 } },
+  // Magitek Cannon
+  { 7619, { 0, 0, 0, 0, 0 } },
+  // Photon Stream
+  { 7620, { 0, 0, 0, 0, 0 } },
+  // Diffractive Magitek Cannon
+  { 7621, { 0, 0, 0, 0, 0 } },
+  // High-powered Magitek Cannon
+  { 7622, { 0, 0, 0, 0, 0 } },
+  // Doom of the Living
+  { 7861, { 0, 0, 0, 0, 0 } },
+  // Vermillion Scourge
+  { 7862, { 0, 0, 0, 0, 0 } },
+  // Earth Tackle
+  { 7864, { 100, 0, 0, 0, 0 } },
+  // Wind Tackle
+  { 7865, { 65, 0, 0, 0, 0 } },
+  // Fire Tackle
+  { 7866, { 130, 0, 0, 0, 0 } },
+  // Iaijutsu
+  { 7867, { 0, 0, 0, 0, 0 } },
+  // Riddle of Wind
+  { 7868, { 65, 0, 0, 0, 0 } },
+  // Dissolve Union
+  { 7869, { 0, 0, 0, 0, 0 } },
+  // Stellar Detonation
+  { 8324, { 150, 0, 0, 0, 540 } },
+  // Broken Ridge
+  { 8395, { 0, 0, 0, 0, 0 } },
+  // Magitek Pulse
+  { 8624, { 0, 0, 0, 0, 0 } },
+  // Magitek Thunder
+  { 8625, { 0, 0, 0, 0, 0 } },
+  // attack
+  { 8687, { 0, 0, 0, 0, 0 } },
+  // Katon
+  { 9012, { 0, 0, 0, 0, 0 } },
+  // Remove Barrel
+  { 9015, { 0, 0, 0, 0, 0 } },
+  // Tenka Goken
+  { 9143, { 0, 0, 0, 0, 0 } },
+  // Thunderous Force
+  { 9294, { 0, 0, 0, 0, 0 } },
+  // Raiton
+  { 9301, { 0, 0, 0, 0, 0 } },
+  // Raiton
+  { 9302, { 0, 0, 0, 0, 0 } },
+  // Bishop Overdrive
+  { 9372, { 0, 0, 0, 0, 0 } },
+  // Undraw
+  { 9629, { 0, 0, 0, 0, 0 } },
+  // Self-detonate
+  { 9775, { 0, 0, 0, 0, 0 } },
+  // Shatterstone
+  { 9823, { 0, 0, 0, 0, 0 } },
+  // attack
+  { 9996, { 0, 0, 0, 0, 0 } },
+  // Ungarmax
+  { 10001, { 0, 0, 0, 0, 0 } },
+  // Starstorm
+  { 10894, { 0, 0, 0, 0, 0 } },
+  // attack
+  { 10946, { 0, 0, 0, 0, 0 } },
+  // attack
+  { 10947, { 0, 0, 0, 0, 0 } },
+  // Ruin III
+  { 11191, { 200, 0, 0, 0, 0 } },
+  // Physick
+  { 11192, { 0, 0, 0, 0, 400 } },
+  // Starstorm
+  { 11193, { 3600, 0, 0, 0, 0 } },
+  // Snort
+  { 11383, { 0, 0, 0, 0, 0 } },
+  // 4-tonze Weight
+  { 11384, { 110, 0, 0, 0, 0 } },
+  // Water Cannon
+  { 11385, { 120, 0, 0, 0, 0 } },
+  // Song of Torment
+  { 11386, { 50, 0, 0, 0, 0 } },
+  // High Voltage
+  { 11387, { 90, 0, 0, 0, 0 } },
+  // Bad Breath
+  { 11388, { 0, 0, 0, 0, 0 } },
+  // Flying Frenzy
+  { 11389, { 80, 0, 0, 0, 0 } },
+  // Aqua Breath
+  { 11390, { 90, 0, 0, 0, 0 } },
+  // Plaincracker
+  { 11391, { 130, 0, 0, 0, 0 } },
+  // Acorn Bomb
+  { 11392, { 0, 0, 0, 0, 0 } },
+  // Bristle
+  { 11393, { 0, 0, 0, 0, 0 } },
+  // Mind Blast
+  { 11394, { 100, 0, 0, 0, 0 } },
+  // Blood Drain
+  { 11395, { 20, 0, 0, 0, 0 } },
+  // Bomb Toss
+  { 11396, { 110, 0, 0, 0, 0 } },
+  // 1000 Needles
+  { 11397, { 0, 0, 0, 0, 0 } },
+  // Drill Cannons
+  { 11398, { 120, 0, 0, 0, 0 } },
+  // the Look
+  { 11399, { 130, 0, 0, 0, 0 } },
+  // Sharpened Knife
+  { 11400, { 120, 0, 0, 0, 0 } },
+  // Loom
+  { 11401, { 0, 0, 0, 0, 0 } },
+  // Flame Thrower
+  { 11402, { 130, 0, 0, 0, 0 } },
+  // Faze
+  { 11403, { 0, 0, 0, 0, 0 } },
+  // Glower
+  { 11404, { 130, 0, 0, 0, 0 } },
+  // Missile
+  { 11405, { 0, 0, 0, 0, 0 } },
+  // White Wind
+  { 11406, { 0, 0, 0, 0, 0 } },
+  // Final Sting
+  { 11407, { 1500, 0, 0, 0, 0 } },
+  // Self-destruct
+  { 11408, { 900, 0, 0, 0, 0 } },
+  // Transfusion
+  { 11409, { 0, 0, 0, 0, 0 } },
+  // Toad Oil
+  { 11410, { 0, 0, 0, 0, 0 } },
+  // Off-guard
+  { 11411, { 0, 0, 0, 0, 0 } },
+  // Sticky Tongue
+  { 11412, { 0, 0, 0, 0, 0 } },
+  // Tail Screw
+  { 11413, { 0, 0, 0, 0, 0 } },
+  // Level 5 Petrify
+  { 11414, { 0, 0, 0, 0, 0 } },
+  // Moon Flute
+  { 11415, { 0, 0, 0, 0, 0 } },
+  // Doom
+  { 11416, { 0, 0, 0, 0, 0 } },
+  // Mighty Guard
+  { 11417, { 0, 0, 0, 0, 0 } },
+  // Ice Spikes
+  { 11418, { 0, 0, 0, 0, 0 } },
+  // the Ram's Voice
+  { 11419, { 130, 0, 0, 0, 0 } },
+  // the Dragon's Voice
+  { 11420, { 110, 0, 0, 0, 0 } },
+  // Peculiar Light
+  { 11421, { 0, 0, 0, 0, 0 } },
+  // Ink Jet
+  { 11422, { 120, 0, 0, 0, 0 } },
+  // Flying Sardine
+  { 11423, { 10, 0, 0, 0, 0 } },
+  // Diamondback
+  { 11424, { 0, 0, 0, 0, 0 } },
+  // Fire Angon
+  { 11425, { 100, 0, 0, 0, 0 } },
+  // Feather Rain
+  { 11426, { 180, 0, 0, 0, 0 } },
+  // Eruption
+  { 11427, { 220, 0, 0, 0, 0 } },
+  // Mountain Buster
+  { 11428, { 310, 0, 0, 0, 0 } },
+  // Shock Strike
+  { 11429, { 310, 0, 0, 0, 0 } },
+  // Glass Dance
+  { 11430, { 290, 0, 0, 0, 0 } },
+  // Veil of the Whorl
+  { 11431, { 0, 0, 0, 0, 0 } },
+  // Tri-shackle
+  { 11482, { 30, 0, 0, 0, 0 } },
+  // attack
+  { 11784, { 0, 0, 0, 0, 0 } },
+  // Stone of the Seventh Dawn
+  { 13423, { 140, 0, 0, 0, 0 } },
+  // Aero of the Seventh Dawn
+  { 13424, { 50, 0, 0, 0, 0 } },
+  // Cure of the Seventh Dawn
+  { 13425, { 0, 0, 0, 0, 700 } },
+  // Aetherwell
+  { 13426, { 0, 0, 0, 0, 0 } },
+  // Thunderous Force
+  { 14587, { 0, 0, 0, 0, 0 } },
+  // Kyokufu
+  { 14840, { 180, 0, 0, 0, 0 } },
+  // Ajisai
+  { 14841, { 100, 0, 0, 0, 0 } },
+  // Hissatsu: Gyoten
+  { 14842, { 100, 0, 0, 0, 0 } },
+  // 冥界恐叫打
+  { 14843, { 0, 0, 0, 0, 0 } },
+  // Second Wind
+  { 15375, { 0, 0, 0, 0, 500 } },
+
+};
\ No newline at end of file
diff --git a/src/world/Action/ActionLut.h b/src/world/Action/ActionLut.h
new file mode 100644
index 00000000..df2e5332
--- /dev/null
+++ b/src/world/Action/ActionLut.h
@@ -0,0 +1,28 @@
+#ifndef SAPPHIRE_ACTIONLUT_H
+#define SAPPHIRE_ACTIONLUT_H
+
+#include <unordered_map>
+
+namespace Sapphire::World::Action
+{
+  struct ActionEntry
+  {
+    uint16_t potency;
+    uint16_t comboPotency;
+    uint16_t flankPotency;
+    uint16_t frontPotency;
+    uint16_t rearPotency;
+    uint16_t curePotency;
+//    uint16_t restorePercentage;
+  };
+
+  class ActionLut
+  {
+  public:
+    using Lut = std::unordered_map< uint16_t, ActionEntry >;
+
+    static Lut m_actionLut;
+  };
+}
+
+#endif //SAPPHIRE_ACTIONLUT_H

From 3ef207a724515bcee6472336241b8e172c9332f9 Mon Sep 17 00:00:00 2001
From: NotAdam <adam@notadam.me>
Date: Sun, 2 Jun 2019 00:34:07 +1000
Subject: [PATCH 045/351] move the actionlut data to its own isolated cpp file

---
 ...ionLut.cpp.tmpl => ActionLutData.cpp.tmpl} |    0
 src/world/Action/ActionLut.cpp                | 1125 +----------------
 src/world/Action/ActionLut.h                  |    2 +
 src/world/Action/ActionLutData.cpp            | 1120 ++++++++++++++++
 4 files changed, 1133 insertions(+), 1114 deletions(-)
 rename src/tools/action_parse/{ActionLut.cpp.tmpl => ActionLutData.cpp.tmpl} (100%)
 create mode 100644 src/world/Action/ActionLutData.cpp

diff --git a/src/tools/action_parse/ActionLut.cpp.tmpl b/src/tools/action_parse/ActionLutData.cpp.tmpl
similarity index 100%
rename from src/tools/action_parse/ActionLut.cpp.tmpl
rename to src/tools/action_parse/ActionLutData.cpp.tmpl
diff --git a/src/world/Action/ActionLut.cpp b/src/world/Action/ActionLut.cpp
index 1e9c1f97..9c33bb96 100644
--- a/src/world/Action/ActionLut.cpp
+++ b/src/world/Action/ActionLut.cpp
@@ -2,1119 +2,16 @@
 
 using namespace Sapphire::World::Action;
 
-ActionLut::Lut ActionLut::m_actionLut =
+bool ActionLut::validEntryExists( uint16_t actionId )
 {
-  // attack
-  { 7, { 0, 0, 0, 0, 0 } },
-  // Shot
-  { 8, { 0, 0, 0, 0, 0 } },
-  // Fast Blade
-  { 9, { 160, 0, 0, 0, 0 } },
-  // Savage Blade
-  { 11, { 100, 0, 0, 0, 0 } },
-  // Flash
-  { 14, { 0, 0, 0, 0, 0 } },
-  // Riot Blade
-  { 15, { 100, 0, 0, 0, 0 } },
-  // Shield Bash
-  { 16, { 110, 0, 0, 0, 0 } },
-  // Sentinel
-  { 17, { 0, 0, 0, 0, 0 } },
-  // Tempered Will
-  { 19, { 0, 0, 0, 0, 0 } },
-  // Fight or Flight
-  { 20, { 0, 0, 0, 0, 0 } },
-  // Rage of Halone
-  { 21, { 100, 0, 0, 0, 0 } },
-  // Bulwark
-  { 22, { 0, 0, 0, 0, 0 } },
-  // Circle of Scorn
-  { 23, { 100, 0, 0, 0, 0 } },
-  // Shield Lob
-  { 24, { 120, 0, 0, 0, 0 } },
-  // Shield Swipe
-  { 25, { 100, 0, 0, 0, 0 } },
-  // Sword Oath
-  { 26, { 75, 0, 0, 0, 0 } },
-  // Cover
-  { 27, { 0, 0, 0, 0, 0 } },
-  // Shield Oath
-  { 28, { 0, 0, 0, 0, 0 } },
-  // Spirits Within
-  { 29, { 300, 0, 0, 0, 0 } },
-  // Hallowed Ground
-  { 30, { 0, 0, 0, 0, 0 } },
-  // Heavy Swing
-  { 31, { 160, 0, 0, 0, 0 } },
-  // Skull Sunder
-  { 35, { 100, 0, 0, 0, 0 } },
-  // Maim
-  { 37, { 100, 0, 0, 0, 0 } },
-  // Berserk
-  { 38, { 0, 0, 0, 0, 0 } },
-  // Thrill of Battle
-  { 40, { 0, 0, 0, 0, 0 } },
-  // Overpower
-  { 41, { 130, 0, 0, 0, 0 } },
-  // Storm's Path
-  { 42, { 100, 0, 0, 0, 0 } },
-  // Holmgang
-  { 43, { 0, 0, 0, 0, 0 } },
-  // Vengeance
-  { 44, { 55, 0, 0, 0, 0 } },
-  // Storm's Eye
-  { 45, { 100, 0, 0, 0, 0 } },
-  // Tomahawk
-  { 46, { 140, 0, 0, 0, 0 } },
-  // Butcher's Block
-  { 47, { 100, 0, 0, 0, 0 } },
-  // Defiance
-  { 48, { 0, 0, 0, 0, 0 } },
-  // Inner Beast
-  { 49, { 350, 0, 0, 0, 0 } },
-  // Unchained
-  { 50, { 0, 0, 0, 0, 0 } },
-  // Steel Cyclone
-  { 51, { 200, 0, 0, 0, 0 } },
-  // Infuriate
-  { 52, { 0, 0, 0, 0, 0 } },
-  // Bootshine
-  { 53, { 140, 0, 0, 0, 0 } },
-  // True Strike
-  { 54, { 160, 0, 0, 180, 0 } },
-  // Snap Punch
-  { 56, { 150, 170, 0, 0, 0 } },
-  // Internal Release
-  { 59, { 0, 0, 0, 0, 0 } },
-  // Fists of Earth
-  { 60, { 0, 0, 0, 0, 0 } },
-  // Twin Snakes
-  { 61, { 110, 130, 0, 0, 0 } },
-  // Arm of the Destroyer
-  { 62, { 50, 0, 0, 0, 0 } },
-  // Fists of Fire
-  { 63, { 0, 0, 0, 0, 0 } },
-  // Steel Peak
-  { 64, { 150, 0, 0, 0, 0 } },
-  // Mantra
-  { 65, { 0, 0, 0, 0, 0 } },
-  // Demolish
-  { 66, { 50, 0, 0, 70, 0 } },
-  // Howling Fist
-  { 67, { 210, 0, 0, 0, 0 } },
-  // Perfect Balance
-  { 69, { 0, 0, 0, 0, 0 } },
-  // Rockbreaker
-  { 70, { 130, 0, 0, 0, 0 } },
-  // Shoulder Tackle
-  { 71, { 100, 0, 0, 0, 0 } },
-  // One Ilm Punch
-  { 72, { 120, 0, 0, 0, 0 } },
-  // Fists of Wind
-  { 73, { 0, 0, 0, 0, 0 } },
-  // Dragon Kick
-  { 74, { 120, 140, 0, 0, 0 } },
-  // True Thrust
-  { 75, { 160, 0, 0, 0, 0 } },
-  // Vorpal Thrust
-  { 78, { 100, 0, 0, 0, 0 } },
-  // Heavy Thrust
-  { 79, { 150, 190, 0, 0, 0 } },
-  // Impulse Drive
-  { 81, { 200, 0, 0, 0, 0 } },
-  // Life Surge
-  { 83, { 0, 0, 0, 0, 0 } },
-  // Full Thrust
-  { 84, { 100, 0, 0, 0, 0 } },
-  // Blood for Blood
-  { 85, { 0, 0, 0, 0, 0 } },
-  // Doom Spike
-  { 86, { 140, 0, 0, 0, 0 } },
-  // Disembowel
-  { 87, { 100, 0, 0, 0, 0 } },
-  // Chaos Thrust
-  { 88, { 100, 0, 0, 140, 0 } },
-  // Piercing Talon
-  { 90, { 120, 0, 0, 0, 0 } },
-  // Jump
-  { 92, { 260, 0, 0, 0, 0 } },
-  // Elusive Jump
-  { 94, { 0, 0, 0, 0, 0 } },
-  // Spineshatter Dive
-  { 95, { 210, 0, 0, 0, 0 } },
-  // Dragonfire Dive
-  { 96, { 320, 0, 0, 0, 0 } },
-  // Heavy Shot
-  { 97, { 150, 0, 0, 0, 0 } },
-  // Straight Shot
-  { 98, { 140, 0, 0, 0, 0 } },
-  // Venomous Bite
-  { 100, { 100, 0, 0, 0, 0 } },
-  // Raging Strikes
-  { 101, { 0, 0, 0, 0, 0 } },
-  // Misery's End
-  { 103, { 190, 0, 0, 0, 0 } },
-  // Quick Nock
-  { 106, { 110, 0, 0, 0, 0 } },
-  // Barrage
-  { 107, { 0, 0, 0, 0, 0 } },
-  // Bloodletter
-  { 110, { 130, 0, 0, 0, 0 } },
-  // Repelling Shot
-  { 112, { 0, 0, 0, 0, 0 } },
-  // Windbite
-  { 113, { 60, 0, 0, 0, 0 } },
-  // Mage's Ballad
-  { 114, { 100, 0, 0, 0, 0 } },
-  // Foe Requiem
-  { 115, { 0, 0, 0, 0, 0 } },
-  // Army's Paeon
-  { 116, { 100, 0, 0, 0, 0 } },
-  // Rain of Death
-  { 117, { 100, 0, 0, 0, 0 } },
-  // Battle Voice
-  { 118, { 0, 0, 0, 0, 0 } },
-  // Stone
-  { 119, { 140, 0, 0, 0, 0 } },
-  // Cure
-  { 120, { 0, 0, 0, 0, 450 } },
-  // Aero
-  { 121, { 50, 0, 0, 0, 0 } },
-  // Medica
-  { 124, { 0, 0, 0, 0, 300 } },
-  // Raise
-  { 125, { 0, 0, 0, 0, 0 } },
-  // Stone II
-  { 127, { 200, 0, 0, 0, 0 } },
-  // Repose
-  { 128, { 0, 0, 0, 0, 0 } },
-  // Cure III
-  { 131, { 0, 0, 0, 0, 550 } },
-  // Aero II
-  { 132, { 50, 0, 0, 0, 0 } },
-  // Medica II
-  { 133, { 0, 0, 0, 0, 200 } },
-  // Fluid Aura
-  { 134, { 0, 0, 0, 0, 0 } },
-  // Cure II
-  { 135, { 0, 0, 0, 0, 700 } },
-  // Presence of Mind
-  { 136, { 0, 0, 0, 0, 0 } },
-  // Regen
-  { 137, { 0, 0, 0, 0, 150 } },
-  // Holy
-  { 139, { 200, 0, 0, 0, 0 } },
-  // Benediction
-  { 140, { 0, 0, 0, 0, 0 } },
-  // Fire
-  { 141, { 180, 0, 0, 0, 0 } },
-  // Blizzard
-  { 142, { 180, 0, 0, 0, 0 } },
-  // Thunder
-  { 144, { 30, 0, 0, 0, 0 } },
-  // Sleep
-  { 145, { 0, 0, 0, 0, 0 } },
-  // Blizzard II
-  { 146, { 50, 0, 0, 0, 0 } },
-  // Fire II
-  { 147, { 80, 0, 0, 0, 0 } },
-  // Transpose
-  { 149, { 0, 0, 0, 0, 0 } },
-  // Fire III
-  { 152, { 240, 0, 0, 0, 0 } },
-  // Thunder III
-  { 153, { 70, 0, 0, 0, 0 } },
-  // Blizzard III
-  { 154, { 240, 0, 0, 0, 0 } },
-  // Aetherial Manipulation
-  { 155, { 0, 0, 0, 0, 0 } },
-  // Scathe
-  { 156, { 100, 0, 0, 0, 0 } },
-  // Manaward
-  { 157, { 0, 0, 0, 0, 0 } },
-  // Convert
-  { 158, { 0, 0, 0, 0, 0 } },
-  // Freeze
-  { 159, { 100, 0, 0, 0, 0 } },
-  // Flare
-  { 162, { 260, 0, 0, 0, 0 } },
-  // Ruin
-  { 163, { 100, 0, 0, 0, 0 } },
-  // Bio
-  { 164, { 0, 0, 0, 0, 0 } },
-  // Summon
-  { 165, { 0, 0, 0, 0, 0 } },
-  // Aetherflow
-  { 166, { 0, 0, 0, 0, 0 } },
-  // Energy Drain
-  { 167, { 150, 0, 0, 0, 0 } },
-  // Miasma
-  { 168, { 20, 0, 0, 0, 0 } },
-  // Summon II
-  { 170, { 0, 0, 0, 0, 0 } },
-  // Sustain
-  { 171, { 0, 0, 0, 0, 0 } },
-  // Ruin II
-  { 172, { 100, 0, 0, 0, 0 } },
-  // Resurrection
-  { 173, { 0, 0, 0, 0, 0 } },
-  // Bane
-  { 174, { 0, 0, 0, 0, 0 } },
-  // Rouse
-  { 176, { 0, 0, 0, 0, 0 } },
-  // Miasma II
-  { 177, { 100, 0, 0, 0, 0 } },
-  // Bio II
-  { 178, { 0, 0, 0, 0, 0 } },
-  // Shadow Flare
-  { 179, { 50, 0, 0, 0, 0 } },
-  // Summon III
-  { 180, { 0, 0, 0, 0, 0 } },
-  // Fester
-  { 181, { 150, 0, 0, 0, 0 } },
-  // Tri-bind
-  { 182, { 30, 0, 0, 0, 0 } },
-  // Enkindle
-  { 184, { 0, 0, 0, 0, 0 } },
-  // Adloquium
-  { 185, { 0, 0, 0, 0, 300 } },
-  // Succor
-  { 186, { 0, 0, 0, 0, 150 } },
-  // Sacred Soil
-  { 188, { 0, 0, 0, 0, 0 } },
-  // Lustrate
-  { 189, { 0, 0, 0, 0, 600 } },
-  // Physick
-  { 190, { 0, 0, 0, 0, 400 } },
-  // Shield Wall
-  { 197, { 0, 0, 0, 0, 0 } },
-  // Stronghold
-  { 198, { 0, 0, 0, 0, 0 } },
-  // Last Bastion
-  { 199, { 0, 0, 0, 0, 0 } },
-  // Braver
-  { 200, { 2400, 0, 0, 0, 0 } },
-  // Bladedance
-  { 201, { 5250, 0, 0, 0, 0 } },
-  // Final Heaven
-  { 202, { 9000, 0, 0, 0, 0 } },
-  // Skyshard
-  { 203, { 1650, 0, 0, 0, 0 } },
-  // Starstorm
-  { 204, { 3600, 0, 0, 0, 0 } },
-  // Meteor
-  { 205, { 6150, 0, 0, 0, 0 } },
-  // Healing Wind
-  { 206, { 0, 0, 0, 0, 0 } },
-  // Breath of the Earth
-  { 207, { 0, 0, 0, 0, 0 } },
-  // Pulse of Life
-  { 208, { 0, 0, 0, 0, 0 } },
-  // Magitek Cannon
-  { 1128, { 0, 0, 0, 0, 0 } },
-  // Photon Stream
-  { 1129, { 0, 0, 0, 0, 0 } },
-  // attack
-  { 1533, { 0, 0, 0, 0, 0 } },
-  // Spinning Edge
-  { 2240, { 150, 0, 0, 0, 0 } },
-  // Shade Shift
-  { 2241, { 0, 0, 0, 0, 0 } },
-  // Gust Slash
-  { 2242, { 100, 0, 0, 0, 0 } },
-  // Hide
-  { 2245, { 0, 0, 0, 0, 0 } },
-  // Assassinate
-  { 2246, { 200, 0, 0, 0, 0 } },
-  // Throwing Dagger
-  { 2247, { 120, 0, 0, 0, 0 } },
-  // Mug
-  { 2248, { 140, 0, 0, 0, 0 } },
-  // Hide
-  { 2253, { 0, 0, 0, 0, 0 } },
-  // Death Blossom
-  { 2254, { 110, 0, 0, 0, 0 } },
-  // Aeolian Edge
-  { 2255, { 100, 0, 0, 160, 0 } },
-  // Jugulate
-  { 2256, { 80, 0, 0, 0, 0 } },
-  // Shadow Fang
-  { 2257, { 100, 0, 0, 0, 0 } },
-  // Trick Attack
-  { 2258, { 240, 0, 0, 400, 0 } },
-  // Ten
-  { 2259, { 0, 0, 0, 0, 0 } },
-  // Ninjutsu
-  { 2260, { 0, 0, 0, 0, 0 } },
-  // Chi
-  { 2261, { 0, 0, 0, 0, 0 } },
-  // Shukuchi
-  { 2262, { 0, 0, 0, 0, 0 } },
-  // Jin
-  { 2263, { 0, 0, 0, 0, 0 } },
-  // Kassatsu
-  { 2264, { 0, 0, 0, 0, 0 } },
-  // Fuma Shuriken
-  { 2265, { 240, 0, 0, 0, 0 } },
-  // Katon
-  { 2266, { 250, 0, 0, 0, 0 } },
-  // Raiton
-  { 2267, { 360, 0, 0, 0, 0 } },
-  // Hyoton
-  { 2268, { 140, 0, 0, 0, 0 } },
-  // Huton
-  { 2269, { 0, 0, 0, 0, 0 } },
-  // Doton
-  { 2270, { 45, 0, 0, 0, 0 } },
-  // Suiton
-  { 2271, { 180, 0, 0, 0, 0 } },
-  // Rabbit Medium
-  { 2272, { 0, 0, 0, 0, 0 } },
-  // Rook Autoturret
-  { 2864, { 80, 0, 0, 0, 0 } },
-  // Bishop Autoturret
-  { 2865, { 60, 0, 0, 0, 0 } },
-  // Split Shot
-  { 2866, { 160, 0, 0, 0, 0 } },
-  // Reload
-  { 2867, { 0, 0, 0, 0, 0 } },
-  // Slug Shot
-  { 2868, { 100, 0, 0, 0, 0 } },
-  // Spread Shot
-  { 2870, { 80, 0, 0, 0, 0 } },
-  // Hot Shot
-  { 2872, { 120, 0, 0, 0, 0 } },
-  // Clean Shot
-  { 2873, { 100, 0, 0, 0, 0 } },
-  // Gauss Round
-  { 2874, { 210, 0, 0, 0, 0 } },
-  // Heartbreak
-  { 2875, { 240, 0, 0, 0, 0 } },
-  // Reassemble
-  { 2876, { 0, 0, 0, 0, 0 } },
-  // Wildfire
-  { 2878, { 0, 0, 0, 0, 0 } },
-  // Quick Reload
-  { 2879, { 0, 0, 0, 0, 0 } },
-  // Gauss Barrel
-  { 2880, { 0, 0, 0, 0, 0 } },
-  // Rapid Fire
-  { 2881, { 0, 0, 0, 0, 0 } },
-  // Hypercharge
-  { 2885, { 0, 0, 0, 0, 0 } },
-  // Dismantle
-  { 2887, { 0, 0, 0, 0, 0 } },
-  // Blank
-  { 2888, { 0, 0, 0, 0, 0 } },
-  // Ricochet
-  { 2890, { 320, 0, 0, 0, 0 } },
-  // Raiton
-  { 3203, { 0, 0, 0, 0, 0 } },
-  // Raiton
-  { 3204, { 0, 0, 0, 0, 0 } },
-  // Kanashibari
-  { 3207, { 0, 0, 0, 0, 0 } },
-  // Turret Retrieval
-  { 3487, { 0, 0, 0, 0, 0 } },
-  // Goring Blade
-  { 3538, { 100, 0, 0, 0, 0 } },
-  // Royal Authority
-  { 3539, { 100, 0, 0, 0, 0 } },
-  // Divine Veil
-  { 3540, { 0, 0, 0, 0, 0 } },
-  // Clemency
-  { 3541, { 0, 0, 0, 0, 1200 } },
-  // Sheltron
-  { 3542, { 0, 0, 0, 0, 0 } },
-  // Tornado Kick
-  { 3543, { 330, 0, 0, 0, 0 } },
-  // Purification
-  { 3544, { 0, 0, 0, 0, 0 } },
-  // Elixir Field
-  { 3545, { 220, 0, 0, 0, 0 } },
-  // Meditation
-  { 3546, { 0, 0, 0, 0, 0 } },
-  // the Forbidden Chakra
-  { 3547, { 250, 0, 0, 0, 0 } },
-  // Deliverance
-  { 3548, { 0, 0, 0, 0, 0 } },
-  // Fell Cleave
-  { 3549, { 520, 0, 0, 0, 0 } },
-  // Decimate
-  { 3550, { 280, 0, 0, 0, 0 } },
-  // Raw Intuition
-  { 3551, { 0, 0, 0, 0, 0 } },
-  // Equilibrium
-  { 3552, { 0, 0, 0, 0, 1200 } },
-  // Blood of the Dragon
-  { 3553, { 0, 0, 0, 0, 0 } },
-  // Fang and Claw
-  { 3554, { 260, 300, 0, 0, 0 } },
-  // Geirskogul
-  { 3555, { 230, 0, 0, 0, 0 } },
-  // Wheeling Thrust
-  { 3556, { 260, 0, 0, 300, 0 } },
-  // Battle Litany
-  { 3557, { 0, 0, 0, 0, 0 } },
-  // Empyreal Arrow
-  { 3558, { 230, 0, 0, 0, 0 } },
-  // the Wanderer's Minuet
-  { 3559, { 100, 0, 0, 0, 0 } },
-  // Iron Jaws
-  { 3560, { 100, 0, 0, 0, 0 } },
-  // the Warden's Paean
-  { 3561, { 0, 0, 0, 0, 0 } },
-  // Sidewinder
-  { 3562, { 100, 0, 0, 0, 0 } },
-  // Armor Crush
-  { 3563, { 100, 160, 0, 0, 0 } },
-  // Shadewalker
-  { 3564, { 0, 0, 0, 0, 0 } },
-  // Smoke Screen
-  { 3565, { 0, 0, 0, 0, 0 } },
-  // Dream Within a Dream
-  { 3566, { 150, 0, 0, 0, 0 } },
-  // Duality
-  { 3567, { 0, 0, 0, 0, 0 } },
-  // Stone III
-  { 3568, { 210, 0, 0, 0, 0 } },
-  // Asylum
-  { 3569, { 0, 0, 0, 0, 100 } },
-  // Tetragrammaton
-  { 3570, { 0, 0, 0, 0, 700 } },
-  // Assize
-  { 3571, { 400, 0, 0, 0, 400 } },
-  // Aero III
-  { 3572, { 50, 0, 0, 0, 0 } },
-  // Ley Lines
-  { 3573, { 0, 0, 0, 0, 0 } },
-  // Sharpcast
-  { 3574, { 0, 0, 0, 0, 0 } },
-  // Enochian
-  { 3575, { 0, 0, 0, 0, 0 } },
-  // Blizzard IV
-  { 3576, { 260, 0, 0, 0, 0 } },
-  // Fire IV
-  { 3577, { 300, 0, 0, 0, 0 } },
-  // Painflare
-  { 3578, { 180, 0, 0, 0, 0 } },
-  // Ruin III
-  { 3579, { 120, 0, 0, 0, 0 } },
-  // Tri-disaster
-  { 3580, { 0, 0, 0, 0, 0 } },
-  // Dreadwyrm Trance
-  { 3581, { 0, 0, 0, 0, 0 } },
-  // Deathflare
-  { 3582, { 400, 0, 0, 0, 0 } },
-  // Indomitability
-  { 3583, { 0, 0, 0, 0, 500 } },
-  // Broil
-  { 3584, { 190, 0, 0, 0, 0 } },
-  // Deployment Tactics
-  { 3585, { 0, 0, 0, 0, 0 } },
-  // Emergency Tactics
-  { 3586, { 0, 0, 0, 0, 0 } },
-  // Dissipation
-  { 3587, { 0, 0, 0, 0, 0 } },
-  // Draw
-  { 3590, { 0, 0, 0, 0, 0 } },
-  // Royal Road
-  { 3591, { 0, 0, 0, 0, 0 } },
-  // Spread
-  { 3592, { 0, 0, 0, 0, 0 } },
-  // Redraw
-  { 3593, { 0, 0, 0, 0, 0 } },
-  // Benefic
-  { 3594, { 0, 0, 0, 0, 400 } },
-  // Aspected Benefic
-  { 3595, { 0, 0, 0, 0, 200 } },
-  // Malefic
-  { 3596, { 150, 0, 0, 0, 0 } },
-  // Malefic II
-  { 3598, { 180, 0, 0, 0, 0 } },
-  // Combust
-  { 3599, { 0, 0, 0, 0, 0 } },
-  // Helios
-  { 3600, { 0, 0, 0, 0, 300 } },
-  // Aspected Helios
-  { 3601, { 0, 0, 0, 0, 200 } },
-  // Ascend
-  { 3603, { 0, 0, 0, 0, 0 } },
-  // Diurnal Sect
-  { 3604, { 0, 0, 0, 0, 0 } },
-  // Nocturnal Sect
-  { 3605, { 0, 0, 0, 0, 0 } },
-  // Lightspeed
-  { 3606, { 0, 0, 0, 0, 0 } },
-  // Combust II
-  { 3608, { 0, 0, 0, 0, 0 } },
-  // Benefic II
-  { 3610, { 0, 0, 0, 0, 650 } },
-  // Time Dilation
-  { 3611, { 0, 0, 0, 0, 0 } },
-  // Synastry
-  { 3612, { 0, 0, 0, 0, 0 } },
-  // Collective Unconscious
-  { 3613, { 0, 0, 0, 0, 150 } },
-  // Essential Dignity
-  { 3614, { 0, 0, 0, 0, 400 } },
-  // Gravity
-  { 3615, { 200, 0, 0, 0, 0 } },
-  // Celestial Opposition
-  { 3616, { 0, 0, 0, 0, 0 } },
-  // Hard Slash
-  { 3617, { 150, 0, 0, 0, 0 } },
-  // Spinning Slash
-  { 3619, { 100, 0, 0, 0, 0 } },
-  // Unleash
-  { 3621, { 50, 0, 0, 0, 0 } },
-  // Syphon Strike
-  { 3623, { 100, 0, 0, 0, 0 } },
-  // Unmend
-  { 3624, { 150, 0, 0, 0, 0 } },
-  // Blood Weapon
-  { 3625, { 0, 0, 0, 0, 0 } },
-  // Power Slash
-  { 3627, { 100, 0, 0, 0, 0 } },
-  // Darkside
-  { 3628, { 0, 0, 0, 0, 0 } },
-  // Grit
-  { 3629, { 0, 0, 0, 0, 0 } },
-  // Blood Price
-  { 3631, { 0, 0, 0, 0, 0 } },
-  // Souleater
-  { 3632, { 100, 0, 0, 0, 0 } },
-  // Dark Passenger
-  { 3633, { 140, 0, 0, 0, 0 } },
-  // Dark Mind
-  { 3634, { 0, 0, 0, 0, 0 } },
-  // Dark Arts
-  { 3635, { 0, 0, 0, 0, 0 } },
-  // Shadow Wall
-  { 3636, { 0, 0, 0, 0, 0 } },
-  // Living Dead
-  { 3638, { 0, 0, 0, 0, 0 } },
-  // Salted Earth
-  { 3639, { 75, 0, 0, 0, 0 } },
-  // Plunge
-  { 3640, { 200, 0, 0, 0, 0 } },
-  // Abyssal Drain
-  { 3641, { 120, 0, 0, 0, 0 } },
-  // Sole Survivor
-  { 3642, { 0, 0, 0, 0, 0 } },
-  // Carve and Spit
-  { 3643, { 100, 0, 0, 0, 0 } },
-  // Big Shot
-  { 4238, { 0, 0, 0, 0, 0 } },
-  // Desperado
-  { 4239, { 0, 0, 0, 0, 0 } },
-  // Land Waker
-  { 4240, { 0, 0, 0, 0, 0 } },
-  // Dark Force
-  { 4241, { 0, 0, 0, 0, 0 } },
-  // Dragonsong Dive
-  { 4242, { 0, 0, 0, 0, 0 } },
-  // Chimatsuri
-  { 4243, { 0, 0, 0, 0, 0 } },
-  // Sagittarius Arrow
-  { 4244, { 0, 0, 0, 0, 0 } },
-  // Satellite Beam
-  { 4245, { 0, 0, 0, 0, 0 } },
-  // Teraflare
-  { 4246, { 0, 0, 0, 0, 0 } },
-  // Angel Feathers
-  { 4247, { 0, 0, 0, 0, 0 } },
-  // Astral Stasis
-  { 4248, { 0, 0, 0, 0, 0 } },
-  // Form Shift
-  { 4262, { 0, 0, 0, 0, 0 } },
-  // Cannonfire
-  { 4271, { 0, 0, 0, 0, 0 } },
-  // the Balance
-  { 4401, { 0, 0, 0, 0, 0 } },
-  // the Bole
-  { 4402, { 0, 0, 0, 0, 0 } },
-  // the Arrow
-  { 4403, { 0, 0, 0, 0, 0 } },
-  // the Spear
-  { 4404, { 0, 0, 0, 0, 0 } },
-  // the Ewer
-  { 4405, { 0, 0, 0, 0, 0 } },
-  // the Spire
-  { 4406, { 0, 0, 0, 0, 0 } },
-  // the Balance
-  { 4407, { 0, 0, 0, 0, 0 } },
-  // the Bole
-  { 4408, { 0, 0, 0, 0, 0 } },
-  // the Arrow
-  { 4409, { 0, 0, 0, 0, 0 } },
-  // the Spear
-  { 4410, { 0, 0, 0, 0, 0 } },
-  // the Ewer
-  { 4411, { 0, 0, 0, 0, 0 } },
-  // the Spire
-  { 4412, { 0, 0, 0, 0, 0 } },
-  // the Balance
-  { 4413, { 0, 0, 0, 0, 0 } },
-  // the Bole
-  { 4414, { 0, 0, 0, 0, 0 } },
-  // the Arrow
-  { 4415, { 0, 0, 0, 0, 0 } },
-  // the Spear
-  { 4416, { 0, 0, 0, 0, 0 } },
-  // the Ewer
-  { 4417, { 0, 0, 0, 0, 0 } },
-  // the Spire
-  { 4418, { 0, 0, 0, 0, 0 } },
-  // the Balance
-  { 4419, { 0, 0, 0, 0, 0 } },
-  // the Bole
-  { 4420, { 0, 0, 0, 0, 0 } },
-  // the Arrow
-  { 4421, { 0, 0, 0, 0, 0 } },
-  // the Spear
-  { 4422, { 0, 0, 0, 0, 0 } },
-  // the Ewer
-  { 4423, { 0, 0, 0, 0, 0 } },
-  // the Spire
-  { 4424, { 0, 0, 0, 0, 0 } },
-  // Empty Road
-  { 4645, { 0, 0, 0, 0, 0 } },
-  // Undraw Spread
-  { 4646, { 0, 0, 0, 0, 0 } },
-  // Raiton
-  { 4977, { 0, 0, 0, 0, 0 } },
-  // Raiton
-  { 5069, { 0, 0, 0, 0, 0 } },
-  // attack
-  { 5199, { 0, 0, 0, 0, 0 } },
-  // attack
-  { 5846, { 0, 0, 0, 0, 0 } },
-  // Stickyloom
-  { 5874, { 0, 0, 0, 0, 0 } },
-  // Void Fire II
-  { 6274, { 0, 0, 0, 0, 0 } },
-  // Total Eclipse
-  { 7381, { 110, 0, 0, 0, 0 } },
-  // Intervention
-  { 7382, { 0, 0, 0, 0, 0 } },
-  // Requiescat
-  { 7383, { 350, 0, 0, 0, 0 } },
-  // Holy Spirit
-  { 7384, { 380, 0, 0, 0, 0 } },
-  // Passage of Arms
-  { 7385, { 0, 0, 0, 0, 0 } },
-  // Onslaught
-  { 7386, { 100, 0, 0, 0, 0 } },
-  // Upheaval
-  { 7387, { 300, 0, 0, 0, 0 } },
-  // Shake It Off
-  { 7388, { 0, 0, 0, 0, 0 } },
-  // Inner Release
-  { 7389, { 0, 0, 0, 0, 0 } },
-  // Delirium
-  { 7390, { 0, 0, 0, 0, 0 } },
-  // Quietus
-  { 7391, { 160, 0, 0, 0, 0 } },
-  // Bloodspiller
-  { 7392, { 400, 0, 0, 0, 0 } },
-  // The Blackest Night
-  { 7393, { 0, 0, 0, 0, 0 } },
-  // Riddle of Earth
-  { 7394, { 0, 0, 0, 0, 0 } },
-  // Riddle of Fire
-  { 7395, { 0, 0, 0, 0, 0 } },
-  // Brotherhood
-  { 7396, { 0, 0, 0, 0, 0 } },
-  // Sonic Thrust
-  { 7397, { 100, 0, 0, 0, 0 } },
-  // Dragon Sight
-  { 7398, { 0, 0, 0, 0, 0 } },
-  // Mirage Dive
-  { 7399, { 210, 0, 0, 0, 0 } },
-  // Nastrond
-  { 7400, { 330, 0, 0, 0, 0 } },
-  // Hellfrog Medium
-  { 7401, { 400, 0, 0, 0, 0 } },
-  // Bhavacakra
-  { 7402, { 600, 0, 0, 0, 0 } },
-  // Ten Chi Jin
-  { 7403, { 0, 0, 0, 0, 0 } },
-  // Pitch Perfect
-  { 7404, { 100, 0, 0, 0, 0 } },
-  // Troubadour
-  { 7405, { 0, 0, 0, 0, 0 } },
-  // Caustic Bite
-  { 7406, { 120, 0, 0, 0, 0 } },
-  // Stormbite
-  { 7407, { 120, 0, 0, 0, 0 } },
-  // Nature's Minne
-  { 7408, { 0, 0, 0, 0, 0 } },
-  // Refulgent Arrow
-  { 7409, { 300, 0, 0, 0, 0 } },
-  // Cooldown
-  { 7410, { 150, 0, 0, 0, 0 } },
-  // Heated Split Shot
-  { 7411, { 190, 0, 0, 0, 0 } },
-  // Heated Slug Shot
-  { 7412, { 100, 0, 0, 0, 0 } },
-  // Heated Clean Shot
-  { 7413, { 100, 0, 0, 0, 0 } },
-  // Barrel Stabilizer
-  { 7414, { 0, 0, 0, 0, 0 } },
-  // Rook Overdrive
-  { 7415, { 0, 0, 0, 0, 0 } },
-  // Flamethrower
-  { 7418, { 0, 0, 0, 0, 0 } },
-  // Between the Lines
-  { 7419, { 0, 0, 0, 0, 0 } },
-  // Thunder IV
-  { 7420, { 50, 0, 0, 0, 0 } },
-  // Triplecast
-  { 7421, { 0, 0, 0, 0, 0 } },
-  // Foul
-  { 7422, { 650, 0, 0, 0, 0 } },
-  // Aetherpact
-  { 7423, { 0, 0, 0, 0, 0 } },
-  // Bio III
-  { 7424, { 0, 0, 0, 0, 0 } },
-  // Miasma III
-  { 7425, { 50, 0, 0, 0, 0 } },
-  // Ruin IV
-  { 7426, { 200, 0, 0, 0, 0 } },
-  // Summon Bahamut
-  { 7427, { 0, 0, 0, 0, 0 } },
-  // Enkindle Bahamut
-  { 7429, { 0, 0, 0, 0, 0 } },
-  // Thin Air
-  { 7430, { 0, 0, 0, 0, 0 } },
-  // Stone IV
-  { 7431, { 250, 0, 0, 0, 0 } },
-  // Divine Benison
-  { 7432, { 0, 0, 0, 0, 0 } },
-  // Plenary Indulgence
-  { 7433, { 0, 0, 0, 0, 0 } },
-  // Excogitation
-  { 7434, { 0, 0, 0, 0, 800 } },
-  // Broil II
-  { 7435, { 230, 0, 0, 0, 0 } },
-  // Chain Stratagem
-  { 7436, { 0, 0, 0, 0, 0 } },
-  // Aetherpact
-  { 7437, { 0, 0, 0, 0, 0 } },
-  // Earthly Star
-  { 7439, { 150, 0, 0, 0, 540 } },
-  // Malefic III
-  { 7442, { 220, 0, 0, 0, 0 } },
-  // Minor Arcana
-  { 7443, { 0, 0, 0, 0, 0 } },
-  // Lord of Crowns
-  { 7444, { 300, 0, 0, 0, 0 } },
-  // Lady of Crowns
-  { 7445, { 0, 0, 0, 0, 500 } },
-  // Thunder II
-  { 7447, { 30, 0, 0, 0, 0 } },
-  // Sleeve Draw
-  { 7448, { 0, 0, 0, 0, 0 } },
-  // Hakaze
-  { 7477, { 150, 0, 0, 0, 0 } },
-  // Jinpu
-  { 7478, { 100, 0, 0, 0, 0 } },
-  // Shifu
-  { 7479, { 100, 0, 0, 0, 0 } },
-  // Yukikaze
-  { 7480, { 100, 0, 0, 0, 0 } },
-  // Gekko
-  { 7481, { 100, 0, 0, 0, 0 } },
-  // Kasha
-  { 7482, { 100, 0, 0, 0, 0 } },
-  // Fuga
-  { 7483, { 100, 0, 0, 0, 0 } },
-  // Mangetsu
-  { 7484, { 100, 0, 0, 0, 0 } },
-  // Oka
-  { 7485, { 100, 0, 0, 0, 0 } },
-  // Enpi
-  { 7486, { 100, 0, 0, 0, 0 } },
-  // Midare Setsugekka
-  { 7487, { 720, 0, 0, 0, 0 } },
-  // Tenka Goken
-  { 7488, { 360, 0, 0, 0, 0 } },
-  // Higanbana
-  { 7489, { 240, 0, 0, 0, 0 } },
-  // Hissatsu: Shinten
-  { 7490, { 300, 0, 0, 0, 0 } },
-  // Hissatsu: Kyuten
-  { 7491, { 150, 0, 0, 0, 0 } },
-  // Hissatsu: Gyoten
-  { 7492, { 100, 0, 0, 0, 0 } },
-  // Hissatsu: Yaten
-  { 7493, { 100, 0, 0, 0, 0 } },
-  // Hissatsu: Kaiten
-  { 7494, { 0, 0, 0, 0, 0 } },
-  // Hagakure
-  { 7495, { 0, 0, 0, 0, 0 } },
-  // Hissatsu: Guren
-  { 7496, { 800, 0, 0, 0, 0 } },
-  // Meditate
-  { 7497, { 0, 0, 0, 0, 0 } },
-  // Third Eye
-  { 7498, { 0, 0, 0, 0, 0 } },
-  // Meikyo Shisui
-  { 7499, { 0, 0, 0, 0, 0 } },
-  // Ageha
-  { 7500, { 250, 0, 0, 0, 0 } },
-  // Hissatsu: Seigan
-  { 7501, { 200, 0, 0, 0, 0 } },
-  // Merciful Eyes
-  { 7502, { 0, 0, 0, 0, 200 } },
-  // Jolt
-  { 7503, { 180, 0, 0, 0, 0 } },
-  // Riposte
-  { 7504, { 130, 0, 0, 0, 0 } },
-  // Verthunder
-  { 7505, { 310, 0, 0, 0, 0 } },
-  // Corps-a-corps
-  { 7506, { 130, 0, 0, 0, 0 } },
-  // Veraero
-  { 7507, { 310, 0, 0, 0, 0 } },
-  // Tether
-  { 7508, { 0, 0, 0, 0, 0 } },
-  // Scatter
-  { 7509, { 100, 0, 0, 0, 0 } },
-  // Verfire
-  { 7510, { 270, 0, 0, 0, 0 } },
-  // Verstone
-  { 7511, { 270, 0, 0, 0, 0 } },
-  // Zwerchhau
-  { 7512, { 100, 0, 0, 0, 0 } },
-  // Moulinet
-  { 7513, { 60, 0, 0, 0, 0 } },
-  // Vercure
-  { 7514, { 0, 0, 0, 0, 350 } },
-  // Displacement
-  { 7515, { 130, 0, 0, 0, 0 } },
-  // Redoublement
-  { 7516, { 100, 0, 0, 0, 0 } },
-  // Fleche
-  { 7517, { 420, 0, 0, 0, 0 } },
-  // Acceleration
-  { 7518, { 0, 0, 0, 0, 0 } },
-  // Contre Sixte
-  { 7519, { 350, 0, 0, 0, 0 } },
-  // Embolden
-  { 7520, { 0, 0, 0, 0, 0 } },
-  // Manafication
-  { 7521, { 0, 0, 0, 0, 0 } },
-  // Impact
-  { 7522, { 270, 0, 0, 0, 0 } },
-  // Verraise
-  { 7523, { 0, 0, 0, 0, 0 } },
-  // Jolt II
-  { 7524, { 240, 0, 0, 0, 0 } },
-  // Verflare
-  { 7525, { 600, 0, 0, 0, 0 } },
-  // Verholy
-  { 7526, { 600, 0, 0, 0, 0 } },
-  // Enchanted Riposte
-  { 7527, { 210, 0, 0, 0, 0 } },
-  // Enchanted Zwerchhau
-  { 7528, { 100, 0, 0, 0, 0 } },
-  // Enchanted Redoublement
-  { 7529, { 100, 0, 0, 0, 0 } },
-  // Enchanted Moulinet
-  { 7530, { 200, 0, 0, 0, 0 } },
-  // Magitek Cannon
-  { 7619, { 0, 0, 0, 0, 0 } },
-  // Photon Stream
-  { 7620, { 0, 0, 0, 0, 0 } },
-  // Diffractive Magitek Cannon
-  { 7621, { 0, 0, 0, 0, 0 } },
-  // High-powered Magitek Cannon
-  { 7622, { 0, 0, 0, 0, 0 } },
-  // Doom of the Living
-  { 7861, { 0, 0, 0, 0, 0 } },
-  // Vermillion Scourge
-  { 7862, { 0, 0, 0, 0, 0 } },
-  // Earth Tackle
-  { 7864, { 100, 0, 0, 0, 0 } },
-  // Wind Tackle
-  { 7865, { 65, 0, 0, 0, 0 } },
-  // Fire Tackle
-  { 7866, { 130, 0, 0, 0, 0 } },
-  // Iaijutsu
-  { 7867, { 0, 0, 0, 0, 0 } },
-  // Riddle of Wind
-  { 7868, { 65, 0, 0, 0, 0 } },
-  // Dissolve Union
-  { 7869, { 0, 0, 0, 0, 0 } },
-  // Stellar Detonation
-  { 8324, { 150, 0, 0, 0, 540 } },
-  // Broken Ridge
-  { 8395, { 0, 0, 0, 0, 0 } },
-  // Magitek Pulse
-  { 8624, { 0, 0, 0, 0, 0 } },
-  // Magitek Thunder
-  { 8625, { 0, 0, 0, 0, 0 } },
-  // attack
-  { 8687, { 0, 0, 0, 0, 0 } },
-  // Katon
-  { 9012, { 0, 0, 0, 0, 0 } },
-  // Remove Barrel
-  { 9015, { 0, 0, 0, 0, 0 } },
-  // Tenka Goken
-  { 9143, { 0, 0, 0, 0, 0 } },
-  // Thunderous Force
-  { 9294, { 0, 0, 0, 0, 0 } },
-  // Raiton
-  { 9301, { 0, 0, 0, 0, 0 } },
-  // Raiton
-  { 9302, { 0, 0, 0, 0, 0 } },
-  // Bishop Overdrive
-  { 9372, { 0, 0, 0, 0, 0 } },
-  // Undraw
-  { 9629, { 0, 0, 0, 0, 0 } },
-  // Self-detonate
-  { 9775, { 0, 0, 0, 0, 0 } },
-  // Shatterstone
-  { 9823, { 0, 0, 0, 0, 0 } },
-  // attack
-  { 9996, { 0, 0, 0, 0, 0 } },
-  // Ungarmax
-  { 10001, { 0, 0, 0, 0, 0 } },
-  // Starstorm
-  { 10894, { 0, 0, 0, 0, 0 } },
-  // attack
-  { 10946, { 0, 0, 0, 0, 0 } },
-  // attack
-  { 10947, { 0, 0, 0, 0, 0 } },
-  // Ruin III
-  { 11191, { 200, 0, 0, 0, 0 } },
-  // Physick
-  { 11192, { 0, 0, 0, 0, 400 } },
-  // Starstorm
-  { 11193, { 3600, 0, 0, 0, 0 } },
-  // Snort
-  { 11383, { 0, 0, 0, 0, 0 } },
-  // 4-tonze Weight
-  { 11384, { 110, 0, 0, 0, 0 } },
-  // Water Cannon
-  { 11385, { 120, 0, 0, 0, 0 } },
-  // Song of Torment
-  { 11386, { 50, 0, 0, 0, 0 } },
-  // High Voltage
-  { 11387, { 90, 0, 0, 0, 0 } },
-  // Bad Breath
-  { 11388, { 0, 0, 0, 0, 0 } },
-  // Flying Frenzy
-  { 11389, { 80, 0, 0, 0, 0 } },
-  // Aqua Breath
-  { 11390, { 90, 0, 0, 0, 0 } },
-  // Plaincracker
-  { 11391, { 130, 0, 0, 0, 0 } },
-  // Acorn Bomb
-  { 11392, { 0, 0, 0, 0, 0 } },
-  // Bristle
-  { 11393, { 0, 0, 0, 0, 0 } },
-  // Mind Blast
-  { 11394, { 100, 0, 0, 0, 0 } },
-  // Blood Drain
-  { 11395, { 20, 0, 0, 0, 0 } },
-  // Bomb Toss
-  { 11396, { 110, 0, 0, 0, 0 } },
-  // 1000 Needles
-  { 11397, { 0, 0, 0, 0, 0 } },
-  // Drill Cannons
-  { 11398, { 120, 0, 0, 0, 0 } },
-  // the Look
-  { 11399, { 130, 0, 0, 0, 0 } },
-  // Sharpened Knife
-  { 11400, { 120, 0, 0, 0, 0 } },
-  // Loom
-  { 11401, { 0, 0, 0, 0, 0 } },
-  // Flame Thrower
-  { 11402, { 130, 0, 0, 0, 0 } },
-  // Faze
-  { 11403, { 0, 0, 0, 0, 0 } },
-  // Glower
-  { 11404, { 130, 0, 0, 0, 0 } },
-  // Missile
-  { 11405, { 0, 0, 0, 0, 0 } },
-  // White Wind
-  { 11406, { 0, 0, 0, 0, 0 } },
-  // Final Sting
-  { 11407, { 1500, 0, 0, 0, 0 } },
-  // Self-destruct
-  { 11408, { 900, 0, 0, 0, 0 } },
-  // Transfusion
-  { 11409, { 0, 0, 0, 0, 0 } },
-  // Toad Oil
-  { 11410, { 0, 0, 0, 0, 0 } },
-  // Off-guard
-  { 11411, { 0, 0, 0, 0, 0 } },
-  // Sticky Tongue
-  { 11412, { 0, 0, 0, 0, 0 } },
-  // Tail Screw
-  { 11413, { 0, 0, 0, 0, 0 } },
-  // Level 5 Petrify
-  { 11414, { 0, 0, 0, 0, 0 } },
-  // Moon Flute
-  { 11415, { 0, 0, 0, 0, 0 } },
-  // Doom
-  { 11416, { 0, 0, 0, 0, 0 } },
-  // Mighty Guard
-  { 11417, { 0, 0, 0, 0, 0 } },
-  // Ice Spikes
-  { 11418, { 0, 0, 0, 0, 0 } },
-  // the Ram's Voice
-  { 11419, { 130, 0, 0, 0, 0 } },
-  // the Dragon's Voice
-  { 11420, { 110, 0, 0, 0, 0 } },
-  // Peculiar Light
-  { 11421, { 0, 0, 0, 0, 0 } },
-  // Ink Jet
-  { 11422, { 120, 0, 0, 0, 0 } },
-  // Flying Sardine
-  { 11423, { 10, 0, 0, 0, 0 } },
-  // Diamondback
-  { 11424, { 0, 0, 0, 0, 0 } },
-  // Fire Angon
-  { 11425, { 100, 0, 0, 0, 0 } },
-  // Feather Rain
-  { 11426, { 180, 0, 0, 0, 0 } },
-  // Eruption
-  { 11427, { 220, 0, 0, 0, 0 } },
-  // Mountain Buster
-  { 11428, { 310, 0, 0, 0, 0 } },
-  // Shock Strike
-  { 11429, { 310, 0, 0, 0, 0 } },
-  // Glass Dance
-  { 11430, { 290, 0, 0, 0, 0 } },
-  // Veil of the Whorl
-  { 11431, { 0, 0, 0, 0, 0 } },
-  // Tri-shackle
-  { 11482, { 30, 0, 0, 0, 0 } },
-  // attack
-  { 11784, { 0, 0, 0, 0, 0 } },
-  // Stone of the Seventh Dawn
-  { 13423, { 140, 0, 0, 0, 0 } },
-  // Aero of the Seventh Dawn
-  { 13424, { 50, 0, 0, 0, 0 } },
-  // Cure of the Seventh Dawn
-  { 13425, { 0, 0, 0, 0, 700 } },
-  // Aetherwell
-  { 13426, { 0, 0, 0, 0, 0 } },
-  // Thunderous Force
-  { 14587, { 0, 0, 0, 0, 0 } },
-  // Kyokufu
-  { 14840, { 180, 0, 0, 0, 0 } },
-  // Ajisai
-  { 14841, { 100, 0, 0, 0, 0 } },
-  // Hissatsu: Gyoten
-  { 14842, { 100, 0, 0, 0, 0 } },
-  // 冥界恐叫打
-  { 14843, { 0, 0, 0, 0, 0 } },
-  // Second Wind
-  { 15375, { 0, 0, 0, 0, 500 } },
+  auto it = m_actionLut.find( actionId );
 
-};
\ No newline at end of file
+  if( it == m_actionLut.end() )
+    return false;
+
+  const auto& entry = it->second;
+
+  // if all of the fields are 0, it's not 'valid' due to parse error or no useful data in the tooltip
+  return entry.potency != 0 || entry.comboPotency != 0 || entry.flankPotency != 0 || entry.frontPotency != 0 ||
+         entry.rearPotency != 0 || entry.curePotency != 0;
+}
\ No newline at end of file
diff --git a/src/world/Action/ActionLut.h b/src/world/Action/ActionLut.h
index df2e5332..36949eb5 100644
--- a/src/world/Action/ActionLut.h
+++ b/src/world/Action/ActionLut.h
@@ -21,6 +21,8 @@ namespace Sapphire::World::Action
   public:
     using Lut = std::unordered_map< uint16_t, ActionEntry >;
 
+    static bool validEntryExists( uint16_t actionId );
+
     static Lut m_actionLut;
   };
 }
diff --git a/src/world/Action/ActionLutData.cpp b/src/world/Action/ActionLutData.cpp
new file mode 100644
index 00000000..1e9c1f97
--- /dev/null
+++ b/src/world/Action/ActionLutData.cpp
@@ -0,0 +1,1120 @@
+#include "ActionLut.h"
+
+using namespace Sapphire::World::Action;
+
+ActionLut::Lut ActionLut::m_actionLut =
+{
+  // attack
+  { 7, { 0, 0, 0, 0, 0 } },
+  // Shot
+  { 8, { 0, 0, 0, 0, 0 } },
+  // Fast Blade
+  { 9, { 160, 0, 0, 0, 0 } },
+  // Savage Blade
+  { 11, { 100, 0, 0, 0, 0 } },
+  // Flash
+  { 14, { 0, 0, 0, 0, 0 } },
+  // Riot Blade
+  { 15, { 100, 0, 0, 0, 0 } },
+  // Shield Bash
+  { 16, { 110, 0, 0, 0, 0 } },
+  // Sentinel
+  { 17, { 0, 0, 0, 0, 0 } },
+  // Tempered Will
+  { 19, { 0, 0, 0, 0, 0 } },
+  // Fight or Flight
+  { 20, { 0, 0, 0, 0, 0 } },
+  // Rage of Halone
+  { 21, { 100, 0, 0, 0, 0 } },
+  // Bulwark
+  { 22, { 0, 0, 0, 0, 0 } },
+  // Circle of Scorn
+  { 23, { 100, 0, 0, 0, 0 } },
+  // Shield Lob
+  { 24, { 120, 0, 0, 0, 0 } },
+  // Shield Swipe
+  { 25, { 100, 0, 0, 0, 0 } },
+  // Sword Oath
+  { 26, { 75, 0, 0, 0, 0 } },
+  // Cover
+  { 27, { 0, 0, 0, 0, 0 } },
+  // Shield Oath
+  { 28, { 0, 0, 0, 0, 0 } },
+  // Spirits Within
+  { 29, { 300, 0, 0, 0, 0 } },
+  // Hallowed Ground
+  { 30, { 0, 0, 0, 0, 0 } },
+  // Heavy Swing
+  { 31, { 160, 0, 0, 0, 0 } },
+  // Skull Sunder
+  { 35, { 100, 0, 0, 0, 0 } },
+  // Maim
+  { 37, { 100, 0, 0, 0, 0 } },
+  // Berserk
+  { 38, { 0, 0, 0, 0, 0 } },
+  // Thrill of Battle
+  { 40, { 0, 0, 0, 0, 0 } },
+  // Overpower
+  { 41, { 130, 0, 0, 0, 0 } },
+  // Storm's Path
+  { 42, { 100, 0, 0, 0, 0 } },
+  // Holmgang
+  { 43, { 0, 0, 0, 0, 0 } },
+  // Vengeance
+  { 44, { 55, 0, 0, 0, 0 } },
+  // Storm's Eye
+  { 45, { 100, 0, 0, 0, 0 } },
+  // Tomahawk
+  { 46, { 140, 0, 0, 0, 0 } },
+  // Butcher's Block
+  { 47, { 100, 0, 0, 0, 0 } },
+  // Defiance
+  { 48, { 0, 0, 0, 0, 0 } },
+  // Inner Beast
+  { 49, { 350, 0, 0, 0, 0 } },
+  // Unchained
+  { 50, { 0, 0, 0, 0, 0 } },
+  // Steel Cyclone
+  { 51, { 200, 0, 0, 0, 0 } },
+  // Infuriate
+  { 52, { 0, 0, 0, 0, 0 } },
+  // Bootshine
+  { 53, { 140, 0, 0, 0, 0 } },
+  // True Strike
+  { 54, { 160, 0, 0, 180, 0 } },
+  // Snap Punch
+  { 56, { 150, 170, 0, 0, 0 } },
+  // Internal Release
+  { 59, { 0, 0, 0, 0, 0 } },
+  // Fists of Earth
+  { 60, { 0, 0, 0, 0, 0 } },
+  // Twin Snakes
+  { 61, { 110, 130, 0, 0, 0 } },
+  // Arm of the Destroyer
+  { 62, { 50, 0, 0, 0, 0 } },
+  // Fists of Fire
+  { 63, { 0, 0, 0, 0, 0 } },
+  // Steel Peak
+  { 64, { 150, 0, 0, 0, 0 } },
+  // Mantra
+  { 65, { 0, 0, 0, 0, 0 } },
+  // Demolish
+  { 66, { 50, 0, 0, 70, 0 } },
+  // Howling Fist
+  { 67, { 210, 0, 0, 0, 0 } },
+  // Perfect Balance
+  { 69, { 0, 0, 0, 0, 0 } },
+  // Rockbreaker
+  { 70, { 130, 0, 0, 0, 0 } },
+  // Shoulder Tackle
+  { 71, { 100, 0, 0, 0, 0 } },
+  // One Ilm Punch
+  { 72, { 120, 0, 0, 0, 0 } },
+  // Fists of Wind
+  { 73, { 0, 0, 0, 0, 0 } },
+  // Dragon Kick
+  { 74, { 120, 140, 0, 0, 0 } },
+  // True Thrust
+  { 75, { 160, 0, 0, 0, 0 } },
+  // Vorpal Thrust
+  { 78, { 100, 0, 0, 0, 0 } },
+  // Heavy Thrust
+  { 79, { 150, 190, 0, 0, 0 } },
+  // Impulse Drive
+  { 81, { 200, 0, 0, 0, 0 } },
+  // Life Surge
+  { 83, { 0, 0, 0, 0, 0 } },
+  // Full Thrust
+  { 84, { 100, 0, 0, 0, 0 } },
+  // Blood for Blood
+  { 85, { 0, 0, 0, 0, 0 } },
+  // Doom Spike
+  { 86, { 140, 0, 0, 0, 0 } },
+  // Disembowel
+  { 87, { 100, 0, 0, 0, 0 } },
+  // Chaos Thrust
+  { 88, { 100, 0, 0, 140, 0 } },
+  // Piercing Talon
+  { 90, { 120, 0, 0, 0, 0 } },
+  // Jump
+  { 92, { 260, 0, 0, 0, 0 } },
+  // Elusive Jump
+  { 94, { 0, 0, 0, 0, 0 } },
+  // Spineshatter Dive
+  { 95, { 210, 0, 0, 0, 0 } },
+  // Dragonfire Dive
+  { 96, { 320, 0, 0, 0, 0 } },
+  // Heavy Shot
+  { 97, { 150, 0, 0, 0, 0 } },
+  // Straight Shot
+  { 98, { 140, 0, 0, 0, 0 } },
+  // Venomous Bite
+  { 100, { 100, 0, 0, 0, 0 } },
+  // Raging Strikes
+  { 101, { 0, 0, 0, 0, 0 } },
+  // Misery's End
+  { 103, { 190, 0, 0, 0, 0 } },
+  // Quick Nock
+  { 106, { 110, 0, 0, 0, 0 } },
+  // Barrage
+  { 107, { 0, 0, 0, 0, 0 } },
+  // Bloodletter
+  { 110, { 130, 0, 0, 0, 0 } },
+  // Repelling Shot
+  { 112, { 0, 0, 0, 0, 0 } },
+  // Windbite
+  { 113, { 60, 0, 0, 0, 0 } },
+  // Mage's Ballad
+  { 114, { 100, 0, 0, 0, 0 } },
+  // Foe Requiem
+  { 115, { 0, 0, 0, 0, 0 } },
+  // Army's Paeon
+  { 116, { 100, 0, 0, 0, 0 } },
+  // Rain of Death
+  { 117, { 100, 0, 0, 0, 0 } },
+  // Battle Voice
+  { 118, { 0, 0, 0, 0, 0 } },
+  // Stone
+  { 119, { 140, 0, 0, 0, 0 } },
+  // Cure
+  { 120, { 0, 0, 0, 0, 450 } },
+  // Aero
+  { 121, { 50, 0, 0, 0, 0 } },
+  // Medica
+  { 124, { 0, 0, 0, 0, 300 } },
+  // Raise
+  { 125, { 0, 0, 0, 0, 0 } },
+  // Stone II
+  { 127, { 200, 0, 0, 0, 0 } },
+  // Repose
+  { 128, { 0, 0, 0, 0, 0 } },
+  // Cure III
+  { 131, { 0, 0, 0, 0, 550 } },
+  // Aero II
+  { 132, { 50, 0, 0, 0, 0 } },
+  // Medica II
+  { 133, { 0, 0, 0, 0, 200 } },
+  // Fluid Aura
+  { 134, { 0, 0, 0, 0, 0 } },
+  // Cure II
+  { 135, { 0, 0, 0, 0, 700 } },
+  // Presence of Mind
+  { 136, { 0, 0, 0, 0, 0 } },
+  // Regen
+  { 137, { 0, 0, 0, 0, 150 } },
+  // Holy
+  { 139, { 200, 0, 0, 0, 0 } },
+  // Benediction
+  { 140, { 0, 0, 0, 0, 0 } },
+  // Fire
+  { 141, { 180, 0, 0, 0, 0 } },
+  // Blizzard
+  { 142, { 180, 0, 0, 0, 0 } },
+  // Thunder
+  { 144, { 30, 0, 0, 0, 0 } },
+  // Sleep
+  { 145, { 0, 0, 0, 0, 0 } },
+  // Blizzard II
+  { 146, { 50, 0, 0, 0, 0 } },
+  // Fire II
+  { 147, { 80, 0, 0, 0, 0 } },
+  // Transpose
+  { 149, { 0, 0, 0, 0, 0 } },
+  // Fire III
+  { 152, { 240, 0, 0, 0, 0 } },
+  // Thunder III
+  { 153, { 70, 0, 0, 0, 0 } },
+  // Blizzard III
+  { 154, { 240, 0, 0, 0, 0 } },
+  // Aetherial Manipulation
+  { 155, { 0, 0, 0, 0, 0 } },
+  // Scathe
+  { 156, { 100, 0, 0, 0, 0 } },
+  // Manaward
+  { 157, { 0, 0, 0, 0, 0 } },
+  // Convert
+  { 158, { 0, 0, 0, 0, 0 } },
+  // Freeze
+  { 159, { 100, 0, 0, 0, 0 } },
+  // Flare
+  { 162, { 260, 0, 0, 0, 0 } },
+  // Ruin
+  { 163, { 100, 0, 0, 0, 0 } },
+  // Bio
+  { 164, { 0, 0, 0, 0, 0 } },
+  // Summon
+  { 165, { 0, 0, 0, 0, 0 } },
+  // Aetherflow
+  { 166, { 0, 0, 0, 0, 0 } },
+  // Energy Drain
+  { 167, { 150, 0, 0, 0, 0 } },
+  // Miasma
+  { 168, { 20, 0, 0, 0, 0 } },
+  // Summon II
+  { 170, { 0, 0, 0, 0, 0 } },
+  // Sustain
+  { 171, { 0, 0, 0, 0, 0 } },
+  // Ruin II
+  { 172, { 100, 0, 0, 0, 0 } },
+  // Resurrection
+  { 173, { 0, 0, 0, 0, 0 } },
+  // Bane
+  { 174, { 0, 0, 0, 0, 0 } },
+  // Rouse
+  { 176, { 0, 0, 0, 0, 0 } },
+  // Miasma II
+  { 177, { 100, 0, 0, 0, 0 } },
+  // Bio II
+  { 178, { 0, 0, 0, 0, 0 } },
+  // Shadow Flare
+  { 179, { 50, 0, 0, 0, 0 } },
+  // Summon III
+  { 180, { 0, 0, 0, 0, 0 } },
+  // Fester
+  { 181, { 150, 0, 0, 0, 0 } },
+  // Tri-bind
+  { 182, { 30, 0, 0, 0, 0 } },
+  // Enkindle
+  { 184, { 0, 0, 0, 0, 0 } },
+  // Adloquium
+  { 185, { 0, 0, 0, 0, 300 } },
+  // Succor
+  { 186, { 0, 0, 0, 0, 150 } },
+  // Sacred Soil
+  { 188, { 0, 0, 0, 0, 0 } },
+  // Lustrate
+  { 189, { 0, 0, 0, 0, 600 } },
+  // Physick
+  { 190, { 0, 0, 0, 0, 400 } },
+  // Shield Wall
+  { 197, { 0, 0, 0, 0, 0 } },
+  // Stronghold
+  { 198, { 0, 0, 0, 0, 0 } },
+  // Last Bastion
+  { 199, { 0, 0, 0, 0, 0 } },
+  // Braver
+  { 200, { 2400, 0, 0, 0, 0 } },
+  // Bladedance
+  { 201, { 5250, 0, 0, 0, 0 } },
+  // Final Heaven
+  { 202, { 9000, 0, 0, 0, 0 } },
+  // Skyshard
+  { 203, { 1650, 0, 0, 0, 0 } },
+  // Starstorm
+  { 204, { 3600, 0, 0, 0, 0 } },
+  // Meteor
+  { 205, { 6150, 0, 0, 0, 0 } },
+  // Healing Wind
+  { 206, { 0, 0, 0, 0, 0 } },
+  // Breath of the Earth
+  { 207, { 0, 0, 0, 0, 0 } },
+  // Pulse of Life
+  { 208, { 0, 0, 0, 0, 0 } },
+  // Magitek Cannon
+  { 1128, { 0, 0, 0, 0, 0 } },
+  // Photon Stream
+  { 1129, { 0, 0, 0, 0, 0 } },
+  // attack
+  { 1533, { 0, 0, 0, 0, 0 } },
+  // Spinning Edge
+  { 2240, { 150, 0, 0, 0, 0 } },
+  // Shade Shift
+  { 2241, { 0, 0, 0, 0, 0 } },
+  // Gust Slash
+  { 2242, { 100, 0, 0, 0, 0 } },
+  // Hide
+  { 2245, { 0, 0, 0, 0, 0 } },
+  // Assassinate
+  { 2246, { 200, 0, 0, 0, 0 } },
+  // Throwing Dagger
+  { 2247, { 120, 0, 0, 0, 0 } },
+  // Mug
+  { 2248, { 140, 0, 0, 0, 0 } },
+  // Hide
+  { 2253, { 0, 0, 0, 0, 0 } },
+  // Death Blossom
+  { 2254, { 110, 0, 0, 0, 0 } },
+  // Aeolian Edge
+  { 2255, { 100, 0, 0, 160, 0 } },
+  // Jugulate
+  { 2256, { 80, 0, 0, 0, 0 } },
+  // Shadow Fang
+  { 2257, { 100, 0, 0, 0, 0 } },
+  // Trick Attack
+  { 2258, { 240, 0, 0, 400, 0 } },
+  // Ten
+  { 2259, { 0, 0, 0, 0, 0 } },
+  // Ninjutsu
+  { 2260, { 0, 0, 0, 0, 0 } },
+  // Chi
+  { 2261, { 0, 0, 0, 0, 0 } },
+  // Shukuchi
+  { 2262, { 0, 0, 0, 0, 0 } },
+  // Jin
+  { 2263, { 0, 0, 0, 0, 0 } },
+  // Kassatsu
+  { 2264, { 0, 0, 0, 0, 0 } },
+  // Fuma Shuriken
+  { 2265, { 240, 0, 0, 0, 0 } },
+  // Katon
+  { 2266, { 250, 0, 0, 0, 0 } },
+  // Raiton
+  { 2267, { 360, 0, 0, 0, 0 } },
+  // Hyoton
+  { 2268, { 140, 0, 0, 0, 0 } },
+  // Huton
+  { 2269, { 0, 0, 0, 0, 0 } },
+  // Doton
+  { 2270, { 45, 0, 0, 0, 0 } },
+  // Suiton
+  { 2271, { 180, 0, 0, 0, 0 } },
+  // Rabbit Medium
+  { 2272, { 0, 0, 0, 0, 0 } },
+  // Rook Autoturret
+  { 2864, { 80, 0, 0, 0, 0 } },
+  // Bishop Autoturret
+  { 2865, { 60, 0, 0, 0, 0 } },
+  // Split Shot
+  { 2866, { 160, 0, 0, 0, 0 } },
+  // Reload
+  { 2867, { 0, 0, 0, 0, 0 } },
+  // Slug Shot
+  { 2868, { 100, 0, 0, 0, 0 } },
+  // Spread Shot
+  { 2870, { 80, 0, 0, 0, 0 } },
+  // Hot Shot
+  { 2872, { 120, 0, 0, 0, 0 } },
+  // Clean Shot
+  { 2873, { 100, 0, 0, 0, 0 } },
+  // Gauss Round
+  { 2874, { 210, 0, 0, 0, 0 } },
+  // Heartbreak
+  { 2875, { 240, 0, 0, 0, 0 } },
+  // Reassemble
+  { 2876, { 0, 0, 0, 0, 0 } },
+  // Wildfire
+  { 2878, { 0, 0, 0, 0, 0 } },
+  // Quick Reload
+  { 2879, { 0, 0, 0, 0, 0 } },
+  // Gauss Barrel
+  { 2880, { 0, 0, 0, 0, 0 } },
+  // Rapid Fire
+  { 2881, { 0, 0, 0, 0, 0 } },
+  // Hypercharge
+  { 2885, { 0, 0, 0, 0, 0 } },
+  // Dismantle
+  { 2887, { 0, 0, 0, 0, 0 } },
+  // Blank
+  { 2888, { 0, 0, 0, 0, 0 } },
+  // Ricochet
+  { 2890, { 320, 0, 0, 0, 0 } },
+  // Raiton
+  { 3203, { 0, 0, 0, 0, 0 } },
+  // Raiton
+  { 3204, { 0, 0, 0, 0, 0 } },
+  // Kanashibari
+  { 3207, { 0, 0, 0, 0, 0 } },
+  // Turret Retrieval
+  { 3487, { 0, 0, 0, 0, 0 } },
+  // Goring Blade
+  { 3538, { 100, 0, 0, 0, 0 } },
+  // Royal Authority
+  { 3539, { 100, 0, 0, 0, 0 } },
+  // Divine Veil
+  { 3540, { 0, 0, 0, 0, 0 } },
+  // Clemency
+  { 3541, { 0, 0, 0, 0, 1200 } },
+  // Sheltron
+  { 3542, { 0, 0, 0, 0, 0 } },
+  // Tornado Kick
+  { 3543, { 330, 0, 0, 0, 0 } },
+  // Purification
+  { 3544, { 0, 0, 0, 0, 0 } },
+  // Elixir Field
+  { 3545, { 220, 0, 0, 0, 0 } },
+  // Meditation
+  { 3546, { 0, 0, 0, 0, 0 } },
+  // the Forbidden Chakra
+  { 3547, { 250, 0, 0, 0, 0 } },
+  // Deliverance
+  { 3548, { 0, 0, 0, 0, 0 } },
+  // Fell Cleave
+  { 3549, { 520, 0, 0, 0, 0 } },
+  // Decimate
+  { 3550, { 280, 0, 0, 0, 0 } },
+  // Raw Intuition
+  { 3551, { 0, 0, 0, 0, 0 } },
+  // Equilibrium
+  { 3552, { 0, 0, 0, 0, 1200 } },
+  // Blood of the Dragon
+  { 3553, { 0, 0, 0, 0, 0 } },
+  // Fang and Claw
+  { 3554, { 260, 300, 0, 0, 0 } },
+  // Geirskogul
+  { 3555, { 230, 0, 0, 0, 0 } },
+  // Wheeling Thrust
+  { 3556, { 260, 0, 0, 300, 0 } },
+  // Battle Litany
+  { 3557, { 0, 0, 0, 0, 0 } },
+  // Empyreal Arrow
+  { 3558, { 230, 0, 0, 0, 0 } },
+  // the Wanderer's Minuet
+  { 3559, { 100, 0, 0, 0, 0 } },
+  // Iron Jaws
+  { 3560, { 100, 0, 0, 0, 0 } },
+  // the Warden's Paean
+  { 3561, { 0, 0, 0, 0, 0 } },
+  // Sidewinder
+  { 3562, { 100, 0, 0, 0, 0 } },
+  // Armor Crush
+  { 3563, { 100, 160, 0, 0, 0 } },
+  // Shadewalker
+  { 3564, { 0, 0, 0, 0, 0 } },
+  // Smoke Screen
+  { 3565, { 0, 0, 0, 0, 0 } },
+  // Dream Within a Dream
+  { 3566, { 150, 0, 0, 0, 0 } },
+  // Duality
+  { 3567, { 0, 0, 0, 0, 0 } },
+  // Stone III
+  { 3568, { 210, 0, 0, 0, 0 } },
+  // Asylum
+  { 3569, { 0, 0, 0, 0, 100 } },
+  // Tetragrammaton
+  { 3570, { 0, 0, 0, 0, 700 } },
+  // Assize
+  { 3571, { 400, 0, 0, 0, 400 } },
+  // Aero III
+  { 3572, { 50, 0, 0, 0, 0 } },
+  // Ley Lines
+  { 3573, { 0, 0, 0, 0, 0 } },
+  // Sharpcast
+  { 3574, { 0, 0, 0, 0, 0 } },
+  // Enochian
+  { 3575, { 0, 0, 0, 0, 0 } },
+  // Blizzard IV
+  { 3576, { 260, 0, 0, 0, 0 } },
+  // Fire IV
+  { 3577, { 300, 0, 0, 0, 0 } },
+  // Painflare
+  { 3578, { 180, 0, 0, 0, 0 } },
+  // Ruin III
+  { 3579, { 120, 0, 0, 0, 0 } },
+  // Tri-disaster
+  { 3580, { 0, 0, 0, 0, 0 } },
+  // Dreadwyrm Trance
+  { 3581, { 0, 0, 0, 0, 0 } },
+  // Deathflare
+  { 3582, { 400, 0, 0, 0, 0 } },
+  // Indomitability
+  { 3583, { 0, 0, 0, 0, 500 } },
+  // Broil
+  { 3584, { 190, 0, 0, 0, 0 } },
+  // Deployment Tactics
+  { 3585, { 0, 0, 0, 0, 0 } },
+  // Emergency Tactics
+  { 3586, { 0, 0, 0, 0, 0 } },
+  // Dissipation
+  { 3587, { 0, 0, 0, 0, 0 } },
+  // Draw
+  { 3590, { 0, 0, 0, 0, 0 } },
+  // Royal Road
+  { 3591, { 0, 0, 0, 0, 0 } },
+  // Spread
+  { 3592, { 0, 0, 0, 0, 0 } },
+  // Redraw
+  { 3593, { 0, 0, 0, 0, 0 } },
+  // Benefic
+  { 3594, { 0, 0, 0, 0, 400 } },
+  // Aspected Benefic
+  { 3595, { 0, 0, 0, 0, 200 } },
+  // Malefic
+  { 3596, { 150, 0, 0, 0, 0 } },
+  // Malefic II
+  { 3598, { 180, 0, 0, 0, 0 } },
+  // Combust
+  { 3599, { 0, 0, 0, 0, 0 } },
+  // Helios
+  { 3600, { 0, 0, 0, 0, 300 } },
+  // Aspected Helios
+  { 3601, { 0, 0, 0, 0, 200 } },
+  // Ascend
+  { 3603, { 0, 0, 0, 0, 0 } },
+  // Diurnal Sect
+  { 3604, { 0, 0, 0, 0, 0 } },
+  // Nocturnal Sect
+  { 3605, { 0, 0, 0, 0, 0 } },
+  // Lightspeed
+  { 3606, { 0, 0, 0, 0, 0 } },
+  // Combust II
+  { 3608, { 0, 0, 0, 0, 0 } },
+  // Benefic II
+  { 3610, { 0, 0, 0, 0, 650 } },
+  // Time Dilation
+  { 3611, { 0, 0, 0, 0, 0 } },
+  // Synastry
+  { 3612, { 0, 0, 0, 0, 0 } },
+  // Collective Unconscious
+  { 3613, { 0, 0, 0, 0, 150 } },
+  // Essential Dignity
+  { 3614, { 0, 0, 0, 0, 400 } },
+  // Gravity
+  { 3615, { 200, 0, 0, 0, 0 } },
+  // Celestial Opposition
+  { 3616, { 0, 0, 0, 0, 0 } },
+  // Hard Slash
+  { 3617, { 150, 0, 0, 0, 0 } },
+  // Spinning Slash
+  { 3619, { 100, 0, 0, 0, 0 } },
+  // Unleash
+  { 3621, { 50, 0, 0, 0, 0 } },
+  // Syphon Strike
+  { 3623, { 100, 0, 0, 0, 0 } },
+  // Unmend
+  { 3624, { 150, 0, 0, 0, 0 } },
+  // Blood Weapon
+  { 3625, { 0, 0, 0, 0, 0 } },
+  // Power Slash
+  { 3627, { 100, 0, 0, 0, 0 } },
+  // Darkside
+  { 3628, { 0, 0, 0, 0, 0 } },
+  // Grit
+  { 3629, { 0, 0, 0, 0, 0 } },
+  // Blood Price
+  { 3631, { 0, 0, 0, 0, 0 } },
+  // Souleater
+  { 3632, { 100, 0, 0, 0, 0 } },
+  // Dark Passenger
+  { 3633, { 140, 0, 0, 0, 0 } },
+  // Dark Mind
+  { 3634, { 0, 0, 0, 0, 0 } },
+  // Dark Arts
+  { 3635, { 0, 0, 0, 0, 0 } },
+  // Shadow Wall
+  { 3636, { 0, 0, 0, 0, 0 } },
+  // Living Dead
+  { 3638, { 0, 0, 0, 0, 0 } },
+  // Salted Earth
+  { 3639, { 75, 0, 0, 0, 0 } },
+  // Plunge
+  { 3640, { 200, 0, 0, 0, 0 } },
+  // Abyssal Drain
+  { 3641, { 120, 0, 0, 0, 0 } },
+  // Sole Survivor
+  { 3642, { 0, 0, 0, 0, 0 } },
+  // Carve and Spit
+  { 3643, { 100, 0, 0, 0, 0 } },
+  // Big Shot
+  { 4238, { 0, 0, 0, 0, 0 } },
+  // Desperado
+  { 4239, { 0, 0, 0, 0, 0 } },
+  // Land Waker
+  { 4240, { 0, 0, 0, 0, 0 } },
+  // Dark Force
+  { 4241, { 0, 0, 0, 0, 0 } },
+  // Dragonsong Dive
+  { 4242, { 0, 0, 0, 0, 0 } },
+  // Chimatsuri
+  { 4243, { 0, 0, 0, 0, 0 } },
+  // Sagittarius Arrow
+  { 4244, { 0, 0, 0, 0, 0 } },
+  // Satellite Beam
+  { 4245, { 0, 0, 0, 0, 0 } },
+  // Teraflare
+  { 4246, { 0, 0, 0, 0, 0 } },
+  // Angel Feathers
+  { 4247, { 0, 0, 0, 0, 0 } },
+  // Astral Stasis
+  { 4248, { 0, 0, 0, 0, 0 } },
+  // Form Shift
+  { 4262, { 0, 0, 0, 0, 0 } },
+  // Cannonfire
+  { 4271, { 0, 0, 0, 0, 0 } },
+  // the Balance
+  { 4401, { 0, 0, 0, 0, 0 } },
+  // the Bole
+  { 4402, { 0, 0, 0, 0, 0 } },
+  // the Arrow
+  { 4403, { 0, 0, 0, 0, 0 } },
+  // the Spear
+  { 4404, { 0, 0, 0, 0, 0 } },
+  // the Ewer
+  { 4405, { 0, 0, 0, 0, 0 } },
+  // the Spire
+  { 4406, { 0, 0, 0, 0, 0 } },
+  // the Balance
+  { 4407, { 0, 0, 0, 0, 0 } },
+  // the Bole
+  { 4408, { 0, 0, 0, 0, 0 } },
+  // the Arrow
+  { 4409, { 0, 0, 0, 0, 0 } },
+  // the Spear
+  { 4410, { 0, 0, 0, 0, 0 } },
+  // the Ewer
+  { 4411, { 0, 0, 0, 0, 0 } },
+  // the Spire
+  { 4412, { 0, 0, 0, 0, 0 } },
+  // the Balance
+  { 4413, { 0, 0, 0, 0, 0 } },
+  // the Bole
+  { 4414, { 0, 0, 0, 0, 0 } },
+  // the Arrow
+  { 4415, { 0, 0, 0, 0, 0 } },
+  // the Spear
+  { 4416, { 0, 0, 0, 0, 0 } },
+  // the Ewer
+  { 4417, { 0, 0, 0, 0, 0 } },
+  // the Spire
+  { 4418, { 0, 0, 0, 0, 0 } },
+  // the Balance
+  { 4419, { 0, 0, 0, 0, 0 } },
+  // the Bole
+  { 4420, { 0, 0, 0, 0, 0 } },
+  // the Arrow
+  { 4421, { 0, 0, 0, 0, 0 } },
+  // the Spear
+  { 4422, { 0, 0, 0, 0, 0 } },
+  // the Ewer
+  { 4423, { 0, 0, 0, 0, 0 } },
+  // the Spire
+  { 4424, { 0, 0, 0, 0, 0 } },
+  // Empty Road
+  { 4645, { 0, 0, 0, 0, 0 } },
+  // Undraw Spread
+  { 4646, { 0, 0, 0, 0, 0 } },
+  // Raiton
+  { 4977, { 0, 0, 0, 0, 0 } },
+  // Raiton
+  { 5069, { 0, 0, 0, 0, 0 } },
+  // attack
+  { 5199, { 0, 0, 0, 0, 0 } },
+  // attack
+  { 5846, { 0, 0, 0, 0, 0 } },
+  // Stickyloom
+  { 5874, { 0, 0, 0, 0, 0 } },
+  // Void Fire II
+  { 6274, { 0, 0, 0, 0, 0 } },
+  // Total Eclipse
+  { 7381, { 110, 0, 0, 0, 0 } },
+  // Intervention
+  { 7382, { 0, 0, 0, 0, 0 } },
+  // Requiescat
+  { 7383, { 350, 0, 0, 0, 0 } },
+  // Holy Spirit
+  { 7384, { 380, 0, 0, 0, 0 } },
+  // Passage of Arms
+  { 7385, { 0, 0, 0, 0, 0 } },
+  // Onslaught
+  { 7386, { 100, 0, 0, 0, 0 } },
+  // Upheaval
+  { 7387, { 300, 0, 0, 0, 0 } },
+  // Shake It Off
+  { 7388, { 0, 0, 0, 0, 0 } },
+  // Inner Release
+  { 7389, { 0, 0, 0, 0, 0 } },
+  // Delirium
+  { 7390, { 0, 0, 0, 0, 0 } },
+  // Quietus
+  { 7391, { 160, 0, 0, 0, 0 } },
+  // Bloodspiller
+  { 7392, { 400, 0, 0, 0, 0 } },
+  // The Blackest Night
+  { 7393, { 0, 0, 0, 0, 0 } },
+  // Riddle of Earth
+  { 7394, { 0, 0, 0, 0, 0 } },
+  // Riddle of Fire
+  { 7395, { 0, 0, 0, 0, 0 } },
+  // Brotherhood
+  { 7396, { 0, 0, 0, 0, 0 } },
+  // Sonic Thrust
+  { 7397, { 100, 0, 0, 0, 0 } },
+  // Dragon Sight
+  { 7398, { 0, 0, 0, 0, 0 } },
+  // Mirage Dive
+  { 7399, { 210, 0, 0, 0, 0 } },
+  // Nastrond
+  { 7400, { 330, 0, 0, 0, 0 } },
+  // Hellfrog Medium
+  { 7401, { 400, 0, 0, 0, 0 } },
+  // Bhavacakra
+  { 7402, { 600, 0, 0, 0, 0 } },
+  // Ten Chi Jin
+  { 7403, { 0, 0, 0, 0, 0 } },
+  // Pitch Perfect
+  { 7404, { 100, 0, 0, 0, 0 } },
+  // Troubadour
+  { 7405, { 0, 0, 0, 0, 0 } },
+  // Caustic Bite
+  { 7406, { 120, 0, 0, 0, 0 } },
+  // Stormbite
+  { 7407, { 120, 0, 0, 0, 0 } },
+  // Nature's Minne
+  { 7408, { 0, 0, 0, 0, 0 } },
+  // Refulgent Arrow
+  { 7409, { 300, 0, 0, 0, 0 } },
+  // Cooldown
+  { 7410, { 150, 0, 0, 0, 0 } },
+  // Heated Split Shot
+  { 7411, { 190, 0, 0, 0, 0 } },
+  // Heated Slug Shot
+  { 7412, { 100, 0, 0, 0, 0 } },
+  // Heated Clean Shot
+  { 7413, { 100, 0, 0, 0, 0 } },
+  // Barrel Stabilizer
+  { 7414, { 0, 0, 0, 0, 0 } },
+  // Rook Overdrive
+  { 7415, { 0, 0, 0, 0, 0 } },
+  // Flamethrower
+  { 7418, { 0, 0, 0, 0, 0 } },
+  // Between the Lines
+  { 7419, { 0, 0, 0, 0, 0 } },
+  // Thunder IV
+  { 7420, { 50, 0, 0, 0, 0 } },
+  // Triplecast
+  { 7421, { 0, 0, 0, 0, 0 } },
+  // Foul
+  { 7422, { 650, 0, 0, 0, 0 } },
+  // Aetherpact
+  { 7423, { 0, 0, 0, 0, 0 } },
+  // Bio III
+  { 7424, { 0, 0, 0, 0, 0 } },
+  // Miasma III
+  { 7425, { 50, 0, 0, 0, 0 } },
+  // Ruin IV
+  { 7426, { 200, 0, 0, 0, 0 } },
+  // Summon Bahamut
+  { 7427, { 0, 0, 0, 0, 0 } },
+  // Enkindle Bahamut
+  { 7429, { 0, 0, 0, 0, 0 } },
+  // Thin Air
+  { 7430, { 0, 0, 0, 0, 0 } },
+  // Stone IV
+  { 7431, { 250, 0, 0, 0, 0 } },
+  // Divine Benison
+  { 7432, { 0, 0, 0, 0, 0 } },
+  // Plenary Indulgence
+  { 7433, { 0, 0, 0, 0, 0 } },
+  // Excogitation
+  { 7434, { 0, 0, 0, 0, 800 } },
+  // Broil II
+  { 7435, { 230, 0, 0, 0, 0 } },
+  // Chain Stratagem
+  { 7436, { 0, 0, 0, 0, 0 } },
+  // Aetherpact
+  { 7437, { 0, 0, 0, 0, 0 } },
+  // Earthly Star
+  { 7439, { 150, 0, 0, 0, 540 } },
+  // Malefic III
+  { 7442, { 220, 0, 0, 0, 0 } },
+  // Minor Arcana
+  { 7443, { 0, 0, 0, 0, 0 } },
+  // Lord of Crowns
+  { 7444, { 300, 0, 0, 0, 0 } },
+  // Lady of Crowns
+  { 7445, { 0, 0, 0, 0, 500 } },
+  // Thunder II
+  { 7447, { 30, 0, 0, 0, 0 } },
+  // Sleeve Draw
+  { 7448, { 0, 0, 0, 0, 0 } },
+  // Hakaze
+  { 7477, { 150, 0, 0, 0, 0 } },
+  // Jinpu
+  { 7478, { 100, 0, 0, 0, 0 } },
+  // Shifu
+  { 7479, { 100, 0, 0, 0, 0 } },
+  // Yukikaze
+  { 7480, { 100, 0, 0, 0, 0 } },
+  // Gekko
+  { 7481, { 100, 0, 0, 0, 0 } },
+  // Kasha
+  { 7482, { 100, 0, 0, 0, 0 } },
+  // Fuga
+  { 7483, { 100, 0, 0, 0, 0 } },
+  // Mangetsu
+  { 7484, { 100, 0, 0, 0, 0 } },
+  // Oka
+  { 7485, { 100, 0, 0, 0, 0 } },
+  // Enpi
+  { 7486, { 100, 0, 0, 0, 0 } },
+  // Midare Setsugekka
+  { 7487, { 720, 0, 0, 0, 0 } },
+  // Tenka Goken
+  { 7488, { 360, 0, 0, 0, 0 } },
+  // Higanbana
+  { 7489, { 240, 0, 0, 0, 0 } },
+  // Hissatsu: Shinten
+  { 7490, { 300, 0, 0, 0, 0 } },
+  // Hissatsu: Kyuten
+  { 7491, { 150, 0, 0, 0, 0 } },
+  // Hissatsu: Gyoten
+  { 7492, { 100, 0, 0, 0, 0 } },
+  // Hissatsu: Yaten
+  { 7493, { 100, 0, 0, 0, 0 } },
+  // Hissatsu: Kaiten
+  { 7494, { 0, 0, 0, 0, 0 } },
+  // Hagakure
+  { 7495, { 0, 0, 0, 0, 0 } },
+  // Hissatsu: Guren
+  { 7496, { 800, 0, 0, 0, 0 } },
+  // Meditate
+  { 7497, { 0, 0, 0, 0, 0 } },
+  // Third Eye
+  { 7498, { 0, 0, 0, 0, 0 } },
+  // Meikyo Shisui
+  { 7499, { 0, 0, 0, 0, 0 } },
+  // Ageha
+  { 7500, { 250, 0, 0, 0, 0 } },
+  // Hissatsu: Seigan
+  { 7501, { 200, 0, 0, 0, 0 } },
+  // Merciful Eyes
+  { 7502, { 0, 0, 0, 0, 200 } },
+  // Jolt
+  { 7503, { 180, 0, 0, 0, 0 } },
+  // Riposte
+  { 7504, { 130, 0, 0, 0, 0 } },
+  // Verthunder
+  { 7505, { 310, 0, 0, 0, 0 } },
+  // Corps-a-corps
+  { 7506, { 130, 0, 0, 0, 0 } },
+  // Veraero
+  { 7507, { 310, 0, 0, 0, 0 } },
+  // Tether
+  { 7508, { 0, 0, 0, 0, 0 } },
+  // Scatter
+  { 7509, { 100, 0, 0, 0, 0 } },
+  // Verfire
+  { 7510, { 270, 0, 0, 0, 0 } },
+  // Verstone
+  { 7511, { 270, 0, 0, 0, 0 } },
+  // Zwerchhau
+  { 7512, { 100, 0, 0, 0, 0 } },
+  // Moulinet
+  { 7513, { 60, 0, 0, 0, 0 } },
+  // Vercure
+  { 7514, { 0, 0, 0, 0, 350 } },
+  // Displacement
+  { 7515, { 130, 0, 0, 0, 0 } },
+  // Redoublement
+  { 7516, { 100, 0, 0, 0, 0 } },
+  // Fleche
+  { 7517, { 420, 0, 0, 0, 0 } },
+  // Acceleration
+  { 7518, { 0, 0, 0, 0, 0 } },
+  // Contre Sixte
+  { 7519, { 350, 0, 0, 0, 0 } },
+  // Embolden
+  { 7520, { 0, 0, 0, 0, 0 } },
+  // Manafication
+  { 7521, { 0, 0, 0, 0, 0 } },
+  // Impact
+  { 7522, { 270, 0, 0, 0, 0 } },
+  // Verraise
+  { 7523, { 0, 0, 0, 0, 0 } },
+  // Jolt II
+  { 7524, { 240, 0, 0, 0, 0 } },
+  // Verflare
+  { 7525, { 600, 0, 0, 0, 0 } },
+  // Verholy
+  { 7526, { 600, 0, 0, 0, 0 } },
+  // Enchanted Riposte
+  { 7527, { 210, 0, 0, 0, 0 } },
+  // Enchanted Zwerchhau
+  { 7528, { 100, 0, 0, 0, 0 } },
+  // Enchanted Redoublement
+  { 7529, { 100, 0, 0, 0, 0 } },
+  // Enchanted Moulinet
+  { 7530, { 200, 0, 0, 0, 0 } },
+  // Magitek Cannon
+  { 7619, { 0, 0, 0, 0, 0 } },
+  // Photon Stream
+  { 7620, { 0, 0, 0, 0, 0 } },
+  // Diffractive Magitek Cannon
+  { 7621, { 0, 0, 0, 0, 0 } },
+  // High-powered Magitek Cannon
+  { 7622, { 0, 0, 0, 0, 0 } },
+  // Doom of the Living
+  { 7861, { 0, 0, 0, 0, 0 } },
+  // Vermillion Scourge
+  { 7862, { 0, 0, 0, 0, 0 } },
+  // Earth Tackle
+  { 7864, { 100, 0, 0, 0, 0 } },
+  // Wind Tackle
+  { 7865, { 65, 0, 0, 0, 0 } },
+  // Fire Tackle
+  { 7866, { 130, 0, 0, 0, 0 } },
+  // Iaijutsu
+  { 7867, { 0, 0, 0, 0, 0 } },
+  // Riddle of Wind
+  { 7868, { 65, 0, 0, 0, 0 } },
+  // Dissolve Union
+  { 7869, { 0, 0, 0, 0, 0 } },
+  // Stellar Detonation
+  { 8324, { 150, 0, 0, 0, 540 } },
+  // Broken Ridge
+  { 8395, { 0, 0, 0, 0, 0 } },
+  // Magitek Pulse
+  { 8624, { 0, 0, 0, 0, 0 } },
+  // Magitek Thunder
+  { 8625, { 0, 0, 0, 0, 0 } },
+  // attack
+  { 8687, { 0, 0, 0, 0, 0 } },
+  // Katon
+  { 9012, { 0, 0, 0, 0, 0 } },
+  // Remove Barrel
+  { 9015, { 0, 0, 0, 0, 0 } },
+  // Tenka Goken
+  { 9143, { 0, 0, 0, 0, 0 } },
+  // Thunderous Force
+  { 9294, { 0, 0, 0, 0, 0 } },
+  // Raiton
+  { 9301, { 0, 0, 0, 0, 0 } },
+  // Raiton
+  { 9302, { 0, 0, 0, 0, 0 } },
+  // Bishop Overdrive
+  { 9372, { 0, 0, 0, 0, 0 } },
+  // Undraw
+  { 9629, { 0, 0, 0, 0, 0 } },
+  // Self-detonate
+  { 9775, { 0, 0, 0, 0, 0 } },
+  // Shatterstone
+  { 9823, { 0, 0, 0, 0, 0 } },
+  // attack
+  { 9996, { 0, 0, 0, 0, 0 } },
+  // Ungarmax
+  { 10001, { 0, 0, 0, 0, 0 } },
+  // Starstorm
+  { 10894, { 0, 0, 0, 0, 0 } },
+  // attack
+  { 10946, { 0, 0, 0, 0, 0 } },
+  // attack
+  { 10947, { 0, 0, 0, 0, 0 } },
+  // Ruin III
+  { 11191, { 200, 0, 0, 0, 0 } },
+  // Physick
+  { 11192, { 0, 0, 0, 0, 400 } },
+  // Starstorm
+  { 11193, { 3600, 0, 0, 0, 0 } },
+  // Snort
+  { 11383, { 0, 0, 0, 0, 0 } },
+  // 4-tonze Weight
+  { 11384, { 110, 0, 0, 0, 0 } },
+  // Water Cannon
+  { 11385, { 120, 0, 0, 0, 0 } },
+  // Song of Torment
+  { 11386, { 50, 0, 0, 0, 0 } },
+  // High Voltage
+  { 11387, { 90, 0, 0, 0, 0 } },
+  // Bad Breath
+  { 11388, { 0, 0, 0, 0, 0 } },
+  // Flying Frenzy
+  { 11389, { 80, 0, 0, 0, 0 } },
+  // Aqua Breath
+  { 11390, { 90, 0, 0, 0, 0 } },
+  // Plaincracker
+  { 11391, { 130, 0, 0, 0, 0 } },
+  // Acorn Bomb
+  { 11392, { 0, 0, 0, 0, 0 } },
+  // Bristle
+  { 11393, { 0, 0, 0, 0, 0 } },
+  // Mind Blast
+  { 11394, { 100, 0, 0, 0, 0 } },
+  // Blood Drain
+  { 11395, { 20, 0, 0, 0, 0 } },
+  // Bomb Toss
+  { 11396, { 110, 0, 0, 0, 0 } },
+  // 1000 Needles
+  { 11397, { 0, 0, 0, 0, 0 } },
+  // Drill Cannons
+  { 11398, { 120, 0, 0, 0, 0 } },
+  // the Look
+  { 11399, { 130, 0, 0, 0, 0 } },
+  // Sharpened Knife
+  { 11400, { 120, 0, 0, 0, 0 } },
+  // Loom
+  { 11401, { 0, 0, 0, 0, 0 } },
+  // Flame Thrower
+  { 11402, { 130, 0, 0, 0, 0 } },
+  // Faze
+  { 11403, { 0, 0, 0, 0, 0 } },
+  // Glower
+  { 11404, { 130, 0, 0, 0, 0 } },
+  // Missile
+  { 11405, { 0, 0, 0, 0, 0 } },
+  // White Wind
+  { 11406, { 0, 0, 0, 0, 0 } },
+  // Final Sting
+  { 11407, { 1500, 0, 0, 0, 0 } },
+  // Self-destruct
+  { 11408, { 900, 0, 0, 0, 0 } },
+  // Transfusion
+  { 11409, { 0, 0, 0, 0, 0 } },
+  // Toad Oil
+  { 11410, { 0, 0, 0, 0, 0 } },
+  // Off-guard
+  { 11411, { 0, 0, 0, 0, 0 } },
+  // Sticky Tongue
+  { 11412, { 0, 0, 0, 0, 0 } },
+  // Tail Screw
+  { 11413, { 0, 0, 0, 0, 0 } },
+  // Level 5 Petrify
+  { 11414, { 0, 0, 0, 0, 0 } },
+  // Moon Flute
+  { 11415, { 0, 0, 0, 0, 0 } },
+  // Doom
+  { 11416, { 0, 0, 0, 0, 0 } },
+  // Mighty Guard
+  { 11417, { 0, 0, 0, 0, 0 } },
+  // Ice Spikes
+  { 11418, { 0, 0, 0, 0, 0 } },
+  // the Ram's Voice
+  { 11419, { 130, 0, 0, 0, 0 } },
+  // the Dragon's Voice
+  { 11420, { 110, 0, 0, 0, 0 } },
+  // Peculiar Light
+  { 11421, { 0, 0, 0, 0, 0 } },
+  // Ink Jet
+  { 11422, { 120, 0, 0, 0, 0 } },
+  // Flying Sardine
+  { 11423, { 10, 0, 0, 0, 0 } },
+  // Diamondback
+  { 11424, { 0, 0, 0, 0, 0 } },
+  // Fire Angon
+  { 11425, { 100, 0, 0, 0, 0 } },
+  // Feather Rain
+  { 11426, { 180, 0, 0, 0, 0 } },
+  // Eruption
+  { 11427, { 220, 0, 0, 0, 0 } },
+  // Mountain Buster
+  { 11428, { 310, 0, 0, 0, 0 } },
+  // Shock Strike
+  { 11429, { 310, 0, 0, 0, 0 } },
+  // Glass Dance
+  { 11430, { 290, 0, 0, 0, 0 } },
+  // Veil of the Whorl
+  { 11431, { 0, 0, 0, 0, 0 } },
+  // Tri-shackle
+  { 11482, { 30, 0, 0, 0, 0 } },
+  // attack
+  { 11784, { 0, 0, 0, 0, 0 } },
+  // Stone of the Seventh Dawn
+  { 13423, { 140, 0, 0, 0, 0 } },
+  // Aero of the Seventh Dawn
+  { 13424, { 50, 0, 0, 0, 0 } },
+  // Cure of the Seventh Dawn
+  { 13425, { 0, 0, 0, 0, 700 } },
+  // Aetherwell
+  { 13426, { 0, 0, 0, 0, 0 } },
+  // Thunderous Force
+  { 14587, { 0, 0, 0, 0, 0 } },
+  // Kyokufu
+  { 14840, { 180, 0, 0, 0, 0 } },
+  // Ajisai
+  { 14841, { 100, 0, 0, 0, 0 } },
+  // Hissatsu: Gyoten
+  { 14842, { 100, 0, 0, 0, 0 } },
+  // 冥界恐叫打
+  { 14843, { 0, 0, 0, 0, 0 } },
+  // Second Wind
+  { 15375, { 0, 0, 0, 0, 500 } },
+
+};
\ No newline at end of file

From 90d1fbc3eaf3f03c0efdf54b511e741208e41da3 Mon Sep 17 00:00:00 2001
From: NotAdam <adam@notadam.me>
Date: Sun, 2 Jun 2019 00:34:22 +1000
Subject: [PATCH 046/351] refactor Util -> Common::Util & Action to
 World::Action

---
 src/api/main.cpp                              |  2 +-
 src/api/server_http.hpp                       |  6 +-
 src/common/Database/DbConnection.cpp          |  2 +-
 src/common/Database/DbConnection.h            |  4 +-
 src/common/Database/DbWorker.cpp              |  4 +-
 src/common/Database/DbWorker.h                |  4 +-
 src/common/Database/DbWorkerPool.cpp          |  2 +-
 src/common/Database/DbWorkerPool.h            |  2 +-
 src/common/Database/ZoneDbConnection.cpp      |  2 +-
 src/common/Database/ZoneDbConnection.h        |  2 +-
 src/common/Network/GamePacket.h               |  2 +-
 src/common/Network/PacketContainer.cpp        |  2 +-
 src/common/Util/LockedQueue.h                 |  2 +-
 src/common/Util/LockedWaitQueue.h             |  2 +-
 src/common/Util/SpawnIndexAllocator.h         |  2 +-
 src/common/Util/Util.cpp                      | 22 ++---
 src/common/Util/Util.h                        |  2 +-
 src/common/Util/UtilMath.cpp                  | 22 ++---
 src/common/Util/UtilMath.h                    |  2 +-
 src/lobby/GameConnection.h                    |  4 +-
 src/lobby/LobbyPacketContainer.cpp            |  2 +-
 src/lobby/client_http.hpp                     |  6 +-
 src/scripts/action/common/ActionReturn6.cpp   |  2 +-
 src/scripts/action/common/ActionSprint3.cpp   |  2 +-
 src/scripts/action/common/ActionTeleport5.cpp |  2 +-
 .../archer/ActionHeavyShot97.cpp              |  2 +-
 .../playeractions/conjurer/ActionCure120.cpp  |  2 +-
 .../darkknight/ActionAbyssalDrain3641.cpp     |  2 +-
 .../darkknight/ActionHardSlash3617.cpp        |  2 +-
 .../darkknight/ActionPowerSlash3627.cpp       |  2 +-
 .../darkknight/ActionSpinningSlash3619.cpp    |  2 +-
 .../darkknight/ActionSyphonStrike3623.cpp     |  2 +-
 .../darkknight/ActionUnleash3621.cpp          |  2 +-
 .../whitemage/ActionAsylum3569.cpp            |  2 +-
 src/tools/action_parse/main.cpp               |  4 +-
 src/tools/discovery_parser/main.cpp           |  6 +-
 src/tools/event_object_parser/main.cpp        | 10 +--
 src/tools/exd_common_gen/main.cpp             |  2 +-
 src/tools/mob_parse/main.cpp                  |  2 +-
 src/tools/nav_export/main.cpp                 |  4 +-
 src/tools/pcb_reader/main.cpp                 |  4 +-
 src/world/Action/Action.cpp                   | 82 ++++++++++---------
 src/world/Action/Action.h                     |  2 +-
 src/world/Action/EventAction.cpp              | 17 ++--
 src/world/Action/EventAction.h                |  2 +-
 src/world/Actor/Chara.cpp                     |  4 +-
 src/world/Actor/Chara.h                       |  6 +-
 src/world/Actor/Player.cpp                    |  4 +-
 src/world/Actor/Player.h                      | 12 +--
 src/world/Actor/PlayerEvent.cpp               | 10 +--
 src/world/ForwardsZone.h                      |  2 +-
 src/world/Manager/DebugCommandMgr.cpp         |  2 +-
 src/world/Manager/MarketMgr.cpp               |  2 +-
 src/world/Network/GameConnection.cpp          |  2 +-
 src/world/Network/GameConnection.h            |  4 +-
 src/world/Network/Handlers/PacketHandlers.cpp |  2 +-
 .../Network/PacketWrappers/MoveActorPacket.h  |  8 +-
 .../Network/PacketWrappers/NpcSpawnPacket.h   |  4 +-
 .../PacketWrappers/PlayerSpawnPacket.h        |  4 +-
 src/world/Script/NativeScriptApi.cpp          | 10 +--
 src/world/Script/NativeScriptApi.h            |  8 +-
 src/world/Script/ScriptLoader.cpp             |  2 +-
 src/world/Script/ScriptMgr.cpp                |  6 +-
 src/world/Script/ScriptMgr.h                  |  6 +-
 src/world/ServerMgr.cpp                       |  4 +-
 src/world/Session.cpp                         | 16 ++--
 src/world/Territory/Zone.cpp                  |  2 +-
 src/world/Util/ActorFilter.cpp                |  2 +-
 68 files changed, 200 insertions(+), 181 deletions(-)

diff --git a/src/api/main.cpp b/src/api/main.cpp
index fd68af4f..3ea413f3 100644
--- a/src/api/main.cpp
+++ b/src/api/main.cpp
@@ -106,7 +106,7 @@ bool loadSettings( int32_t argc, char* argv[] )
 
     try
     {
-      arg = Sapphire::Util::toLowerCopy( std::string( args[ i ] ) );
+      arg = Common::Util::toLowerCopy( std::string( args[ i ] ) );
       val = std::string( args[ i + 1 ] );
 
       // trim '-' from start of arg
diff --git a/src/api/server_http.hpp b/src/api/server_http.hpp
index 7c831e69..8a6d2226 100644
--- a/src/api/server_http.hpp
+++ b/src/api/server_http.hpp
@@ -18,7 +18,7 @@
 class case_insensitive_equals {
 public:
   bool operator()(const std::string &key1, const std::string &key2) const {
-    return Sapphire::Util::toLowerCopy( key1 ) == Sapphire::Util::toLowerCopy( key2 );
+    return Sapphire::Common::Util::toLowerCopy( key1 ) == Sapphire::Common::Util::toLowerCopy( key2 );
   }
 };
 class case_insensitive_hash {
@@ -27,7 +27,7 @@ public:
   {
     std::size_t seed=0;
     for( auto &c : key )
-      Sapphire::Util::hashCombine< char >( seed, std::tolower( c ) );
+      Sapphire::Common::Util::hashCombine< char >( seed, std::tolower( c ) );
     return seed;
   }
 };
@@ -388,7 +388,7 @@ namespace SimpleWeb {
                         
                         auto range=request->header.equal_range("Connection");
                         for(auto it=range.first;it!=range.second;it++) {
-                            if( Sapphire::Util::toLowerCopy( it->second ) == "close" )
+                            if( Sapphire::Common::Util::toLowerCopy( it->second ) == "close" )
                                 return;
                         }
                         if(http_version>1.05)
diff --git a/src/common/Database/DbConnection.cpp b/src/common/Database/DbConnection.cpp
index 133baa56..f03b7f9e 100644
--- a/src/common/Database/DbConnection.cpp
+++ b/src/common/Database/DbConnection.cpp
@@ -17,7 +17,7 @@ Sapphire::Db::DbConnection::DbConnection( ConnectionInfo& connInfo ) :
 
 }
 
-Sapphire::Db::DbConnection::DbConnection( Sapphire::LockedWaitQueue< std::shared_ptr< Operation > >* queue,
+Sapphire::Db::DbConnection::DbConnection( Common::Util::LockedWaitQueue< std::shared_ptr< Operation > >* queue,
                                           Sapphire::Db::ConnectionInfo& connInfo ) :
   m_reconnecting( false ),
   m_prepareError( false ),
diff --git a/src/common/Database/DbConnection.h b/src/common/Database/DbConnection.h
index a31a531d..fc84b74f 100644
--- a/src/common/Database/DbConnection.h
+++ b/src/common/Database/DbConnection.h
@@ -42,7 +42,7 @@ namespace Sapphire::Db
     DbConnection( ConnectionInfo& connInfo );
 
     // Constructor for asynchronous connections.
-    DbConnection( Sapphire::LockedWaitQueue< std::shared_ptr< Operation > >* queue, ConnectionInfo& connInfo );
+    DbConnection( Common::Util::LockedWaitQueue< std::shared_ptr< Operation > >* queue, ConnectionInfo& connInfo );
 
     virtual ~DbConnection();
 
@@ -92,7 +92,7 @@ namespace Sapphire::Db
     bool m_prepareError;
 
   private:
-    LockedWaitQueue< std::shared_ptr< Operation > >* m_queue;
+    Common::Util::LockedWaitQueue< std::shared_ptr< Operation > >* m_queue;
     std::shared_ptr< DbWorker > m_worker;
     std::shared_ptr< Mysql::Connection > m_pConnection;
     ConnectionInfo& m_connectionInfo;
diff --git a/src/common/Database/DbWorker.cpp b/src/common/Database/DbWorker.cpp
index 74ee0378..d08f251f 100644
--- a/src/common/Database/DbWorker.cpp
+++ b/src/common/Database/DbWorker.cpp
@@ -2,7 +2,9 @@
 #include "Operation.h"
 #include "Util/LockedWaitQueue.h"
 
-Sapphire::Db::DbWorker::DbWorker( Sapphire::LockedWaitQueue< std::shared_ptr< Operation > >* newQueue,
+using namespace Sapphire::Common;
+
+Sapphire::Db::DbWorker::DbWorker( Util::LockedWaitQueue< std::shared_ptr< Operation > >* newQueue,
                                   DbConnection* pConn )
 {
   m_pConn = pConn;
diff --git a/src/common/Database/DbWorker.h b/src/common/Database/DbWorker.h
index 13250c19..655ef13f 100644
--- a/src/common/Database/DbWorker.h
+++ b/src/common/Database/DbWorker.h
@@ -14,12 +14,12 @@ namespace Sapphire::Db
   class DbWorker
   {
   public:
-    DbWorker( LockedWaitQueue< std::shared_ptr< Operation > >* newQueue, DbConnection* connection );
+    DbWorker( Common::Util::LockedWaitQueue< std::shared_ptr< Operation > >* newQueue, DbConnection* connection );
 
     ~DbWorker();
 
   private:
-    LockedWaitQueue< std::shared_ptr< Operation > >* m_queue;
+    Common::Util::LockedWaitQueue< std::shared_ptr< Operation > >* m_queue;
     DbConnection* m_pConn;
 
     void workerThread();
diff --git a/src/common/Database/DbWorkerPool.cpp b/src/common/Database/DbWorkerPool.cpp
index c9ef3b51..81b9d96d 100644
--- a/src/common/Database/DbWorkerPool.cpp
+++ b/src/common/Database/DbWorkerPool.cpp
@@ -21,7 +21,7 @@ class PingOperation : public Sapphire::Db::Operation
 
 template< class T >
 Sapphire::Db::DbWorkerPool< T >::DbWorkerPool() :
-  m_queue( new Sapphire::LockedWaitQueue< std::shared_ptr< Operation > >() ),
+  m_queue( new Common::Util::LockedWaitQueue< std::shared_ptr< Operation > >() ),
   m_asyncThreads( 0 ),
   m_synchThreads( 0 )
 {
diff --git a/src/common/Database/DbWorkerPool.h b/src/common/Database/DbWorkerPool.h
index a29bd3f1..bbc02e46 100644
--- a/src/common/Database/DbWorkerPool.h
+++ b/src/common/Database/DbWorkerPool.h
@@ -83,7 +83,7 @@ namespace Sapphire::Db
 
     const std::string& getDatabaseName() const;
 
-    std::unique_ptr< Sapphire::LockedWaitQueue< std::shared_ptr< Operation > > > m_queue;
+    std::unique_ptr< Common::Util::LockedWaitQueue< std::shared_ptr< Operation > > > m_queue;
     std::array< std::vector< std::shared_ptr< T > >, IDX_SIZE > m_connections;
     ConnectionInfo m_connectionInfo;
     uint8_t m_asyncThreads;
diff --git a/src/common/Database/ZoneDbConnection.cpp b/src/common/Database/ZoneDbConnection.cpp
index cceea22f..1c4c5a82 100644
--- a/src/common/Database/ZoneDbConnection.cpp
+++ b/src/common/Database/ZoneDbConnection.cpp
@@ -6,7 +6,7 @@ Sapphire::Db::ZoneDbConnection::ZoneDbConnection( ConnectionInfo& connInfo ) :
 {
 }
 
-Sapphire::Db::ZoneDbConnection::ZoneDbConnection( Sapphire::LockedWaitQueue< std::shared_ptr< Operation > >* q,
+Sapphire::Db::ZoneDbConnection::ZoneDbConnection( Common::Util::LockedWaitQueue< std::shared_ptr< Operation > >* q,
                                                   ConnectionInfo& connInfo ) :
   DbConnection( q, connInfo )
 {
diff --git a/src/common/Database/ZoneDbConnection.h b/src/common/Database/ZoneDbConnection.h
index 93bacc23..8c74bf19 100644
--- a/src/common/Database/ZoneDbConnection.h
+++ b/src/common/Database/ZoneDbConnection.h
@@ -112,7 +112,7 @@ namespace Sapphire::Db
 
     ZoneDbConnection( ConnectionInfo& connInfo );
 
-    ZoneDbConnection( Sapphire::LockedWaitQueue< std::shared_ptr< Operation > >* q, ConnectionInfo& connInfo );
+    ZoneDbConnection( Common::Util::LockedWaitQueue< std::shared_ptr< Operation > >* q, ConnectionInfo& connInfo );
 
     ~ZoneDbConnection();
 
diff --git a/src/common/Network/GamePacket.h b/src/common/Network/GamePacket.h
index f62c08ef..c1c06b76 100644
--- a/src/common/Network/GamePacket.h
+++ b/src/common/Network/GamePacket.h
@@ -257,7 +257,7 @@ namespace Sapphire::Network::Packets
 
       // The IPC type itself.
       m_ipcHdr.type = static_cast< ServerZoneIpcType >( m_data._ServerIpcType );
-      m_ipcHdr.timestamp = Util::getTimeSeconds();
+      m_ipcHdr.timestamp = Common::Util::getTimeSeconds();
       m_segHdr.size = sizeof( T ) + sizeof( FFXIVARR_IPC_HEADER ) + sizeof( FFXIVARR_PACKET_SEGMENT_HEADER );
     };
 
diff --git a/src/common/Network/PacketContainer.cpp b/src/common/Network/PacketContainer.cpp
index a61c38c0..d89c8df4 100644
--- a/src/common/Network/PacketContainer.cpp
+++ b/src/common/Network/PacketContainer.cpp
@@ -76,7 +76,7 @@ std::string Sapphire::Network::Packets::PacketContainer::toString()
   std::string str = "\n";
   for( uint32_t i = 0; i < m_ipcHdr.size; i++ )
   {
-    str += Util::intToHexString( static_cast< int32_t >( tmpBuffer[ i ] & 0xFF ) ) + " ";
+    str += Common::Util::intToHexString( static_cast< int32_t >( tmpBuffer[ i ] & 0xFF ) ) + " ";
 
     if( ( i + 1 ) % 16 == 0 )
       str += "\n";
diff --git a/src/common/Util/LockedQueue.h b/src/common/Util/LockedQueue.h
index 1e73f4ce..57397b59 100644
--- a/src/common/Util/LockedQueue.h
+++ b/src/common/Util/LockedQueue.h
@@ -7,7 +7,7 @@
 #include <algorithm>
 #include <utility>
 
-namespace Sapphire
+namespace Sapphire::Common::Util
 {
 
   template< class T >
diff --git a/src/common/Util/LockedWaitQueue.h b/src/common/Util/LockedWaitQueue.h
index 122cfd1c..1a1ffdc3 100644
--- a/src/common/Util/LockedWaitQueue.h
+++ b/src/common/Util/LockedWaitQueue.h
@@ -8,7 +8,7 @@
 #include <type_traits>
 #include <utility>
 
-namespace Sapphire
+namespace Sapphire::Common::Util
 {
 
   template< typename T >
diff --git a/src/common/Util/SpawnIndexAllocator.h b/src/common/Util/SpawnIndexAllocator.h
index f03951a3..27003e8f 100644
--- a/src/common/Util/SpawnIndexAllocator.h
+++ b/src/common/Util/SpawnIndexAllocator.h
@@ -5,7 +5,7 @@
 #include <unordered_map>
 #include <type_traits>
 
-namespace Sapphire::Util
+namespace Sapphire::Common::Util
 {
 
   template< typename T, typename ActorIdType = uint32_t >
diff --git a/src/common/Util/Util.cpp b/src/common/Util/Util.cpp
index f443ddf8..d653e29c 100644
--- a/src/common/Util/Util.cpp
+++ b/src/common/Util/Util.cpp
@@ -5,7 +5,9 @@
 #include <algorithm>
 #include <string>
 
-std::string Sapphire::Util::binaryToHexString( uint8_t* pBinData, uint16_t size )
+using namespace Sapphire::Common;
+
+std::string Util::binaryToHexString( uint8_t* pBinData, uint16_t size )
 {
   std::string outStr;
 
@@ -17,26 +19,26 @@ std::string Sapphire::Util::binaryToHexString( uint8_t* pBinData, uint16_t size
   return outStr;
 
 }
-std::string Sapphire::Util::toLowerCopy( const std::string& inStr )
+std::string Util::toLowerCopy( const std::string& inStr )
 {
   std::string out = inStr;
   std::transform( inStr.begin(), inStr.end(), out.begin(), [](unsigned char c) -> unsigned char { return ::tolower(c); });
   return out;
 }
 
-void Sapphire::Util::eraseAll( std::string& inOutStr, char remove )
+void Util::eraseAll( std::string& inOutStr, char remove )
 {
   inOutStr.erase( std::remove( inOutStr.begin(), inOutStr.end(), remove ), inOutStr.end() );
 }
 
-void Sapphire::Util::eraseAllIn( std::string& inOutStr, std::string& remove )
+void Util::eraseAllIn( std::string& inOutStr, std::string& remove )
 {
   for( auto rem : remove )
     inOutStr.erase( std::remove( inOutStr.begin(), inOutStr.end(), rem ), inOutStr.end() );
 }
 
 
-std::string Sapphire::Util::intToHexString( uint64_t intValue, uint8_t width )
+std::string Util::intToHexString( uint64_t intValue, uint8_t width )
 {
     std::string hexStr;
 
@@ -51,7 +53,7 @@ std::string Sapphire::Util::intToHexString( uint64_t intValue, uint8_t width )
     return hexStr;
 }
 
-std::string Sapphire::Util::binaryToHexDump( uint8_t* pBinData, uint16_t size )
+std::string Util::binaryToHexDump( uint8_t* pBinData, uint16_t size )
 {
   int bytesPerLine = 16;
   constexpr char hexChars[] = "0123456789ABCDEF";
@@ -112,25 +114,25 @@ std::string Sapphire::Util::binaryToHexDump( uint8_t* pBinData, uint16_t size )
 
 }
 
-uint64_t Sapphire::Util::getTimeMs()
+uint64_t Util::getTimeMs()
 {
   std::chrono::milliseconds epoch = std::chrono::duration_cast< std::chrono::milliseconds >
     ( std::chrono::system_clock::now().time_since_epoch() );
   return epoch.count();
 }
 
-uint32_t Sapphire::Util::getTimeSeconds()
+uint32_t Util::getTimeSeconds()
 {
   auto currClock = std::chrono::system_clock::now();
   return std::chrono::time_point_cast< std::chrono::seconds >( currClock ).time_since_epoch().count();
 }
 
-uint64_t Sapphire::Util::getEorzeanTimeStamp()
+uint64_t Util::getEorzeanTimeStamp()
 {
   return static_cast< uint64_t >( getTimeSeconds() * 20.571428571428573f );
 }
 
-void Sapphire::Util::valueToFlagByteIndexValue( uint32_t inVal, uint8_t& outVal, uint16_t& outIndex )
+void Util::valueToFlagByteIndexValue( uint32_t inVal, uint8_t& outVal, uint16_t& outIndex )
 {
   uint32_t id = inVal;
   outIndex = id / 8;
diff --git a/src/common/Util/Util.h b/src/common/Util/Util.h
index 4c4a5a32..e42dd7ee 100644
--- a/src/common/Util/Util.h
+++ b/src/common/Util/Util.h
@@ -5,7 +5,7 @@
 #include <string>
 #include <functional>
 
-namespace Sapphire::Util
+namespace Sapphire::Common::Util
 {
 
   std::string binaryToHexString( uint8_t* pBinData, uint16_t size );
diff --git a/src/common/Util/UtilMath.cpp b/src/common/Util/UtilMath.cpp
index f2e8cc2c..a1e1a01e 100644
--- a/src/common/Util/UtilMath.cpp
+++ b/src/common/Util/UtilMath.cpp
@@ -1,7 +1,9 @@
 #include <cmath>
 #include "UtilMath.h"
 
-float Sapphire::Util::distanceSq( float x, float y, float z, float x1, float y1, float z1 )
+using namespace Sapphire::Common;
+
+float Util::distanceSq( float x, float y, float z, float x1, float y1, float z1 )
 {
   float deltaX = x - x1;
   float deltaY = y - y1;
@@ -10,29 +12,29 @@ float Sapphire::Util::distanceSq( float x, float y, float z, float x1, float y1,
   return ( deltaX * deltaX + deltaY * deltaY + deltaZ * deltaZ );
 }
 
-float Sapphire::Util::distance( float x, float y, float z, float x1, float y1, float z1 )
+float Util::distance( float x, float y, float z, float x1, float y1, float z1 )
 {
   return sqrtf( distanceSq( x, y, z, x1, y1, z1 ) );
 }
 
-float Sapphire::Util::distance( const Common::FFXIVARR_POSITION3& pos1, const Common::FFXIVARR_POSITION3& pos2 )
+float Util::distance( const Common::FFXIVARR_POSITION3& pos1, const Common::FFXIVARR_POSITION3& pos2 )
 {
   return sqrtf( distanceSq( pos1.x, pos1.y, pos1.z, pos2.x, pos2.y, pos2.z ) );
 }
 
-float Sapphire::Util::distance2DSq( float x, float y, float x1, float y1 )
+float Util::distance2DSq( float x, float y, float x1, float y1 )
 {
   float deltaX = x - x1;
   float deltaY = y - y1;
   return ( deltaX * deltaX + deltaY * deltaY );
 }
 
-float Sapphire::Util::distance2D( float x, float y, float x1, float y1 )
+float Util::distance2D( float x, float y, float x1, float y1 )
 {
   return sqrtf( distance2DSq( x, y, x1, y1 ) );
 }
 
-float Sapphire::Util::calcAngTo( float x, float y, float x1, float y1 )
+float Util::calcAngTo( float x, float y, float x1, float y1 )
 {
   float dx = x - x1;
   float dy = y - y1;
@@ -46,7 +48,7 @@ float Sapphire::Util::calcAngTo( float x, float y, float x1, float y1 )
   }
 }
 
-float Sapphire::Util::calcAngFrom( float x, float y, float x1, float y1 )
+float Util::calcAngFrom( float x, float y, float x1, float y1 )
 {
   float dx = x - x1;
   float dy = y - y1;
@@ -60,17 +62,17 @@ float Sapphire::Util::calcAngFrom( float x, float y, float x1, float y1 )
   }
 }
 
-uint16_t Sapphire::Util::floatToUInt16( float val )
+uint16_t Util::floatToUInt16( float val )
 {
   return static_cast< uint16_t >( 0x8000 + val * 32.767f );
 }
 
-uint16_t Sapphire::Util::floatToUInt16Rot( float val )
+uint16_t Util::floatToUInt16Rot( float val )
 {
   return static_cast< uint16_t >( 0x8000 * ( ( val + PI ) ) / PI );
 }
 
-uint8_t Sapphire::Util::floatToUInt8Rot( float val )
+uint8_t Util::floatToUInt8Rot( float val )
 {
   return static_cast< uint8_t >( 0x80 * ( ( val + PI ) ) / PI );
 }
\ No newline at end of file
diff --git a/src/common/Util/UtilMath.h b/src/common/Util/UtilMath.h
index 5d34ee92..c35ef6be 100644
--- a/src/common/Util/UtilMath.h
+++ b/src/common/Util/UtilMath.h
@@ -5,7 +5,7 @@
 
 #define PI 3.14159265358979323846f
 
-namespace Sapphire::Util
+namespace Sapphire::Common::Util
 {
 
   float distanceSq( float x, float y, float z, float x1, float y1, float z1 );
diff --git a/src/lobby/GameConnection.h b/src/lobby/GameConnection.h
index 6bcb7122..42f0a3a2 100644
--- a/src/lobby/GameConnection.h
+++ b/src/lobby/GameConnection.h
@@ -36,8 +36,8 @@ namespace Sapphire::Network
 
     LobbySessionPtr m_pSession;
 
-    LockedQueue< Packets::GamePacketPtr > m_inQueue;
-    LockedQueue< Packets::GamePacketPtr > m_outQueue;
+    Common::Util::LockedQueue< Packets::GamePacketPtr > m_inQueue;
+    Common::Util::LockedQueue< Packets::GamePacketPtr > m_outQueue;
     std::vector< uint8_t > m_packets;
 
   public:
diff --git a/src/lobby/LobbyPacketContainer.cpp b/src/lobby/LobbyPacketContainer.cpp
index 2d217436..c1c7366c 100644
--- a/src/lobby/LobbyPacketContainer.cpp
+++ b/src/lobby/LobbyPacketContainer.cpp
@@ -48,7 +48,7 @@ uint8_t* Sapphire::Network::Packets::LobbyPacketContainer::getRawData( bool adds
   if( addstuff )
   {
     m_header.unknown_0 = 0xff41a05252;
-    m_header.timestamp = Sapphire::Util::getTimeMs();
+    m_header.timestamp = Common::Util::getTimeMs();
   }
   memcpy( m_dataBuf, &m_header, sizeof( Sapphire::Network::Packets::FFXIVARR_PACKET_HEADER ) );
   return m_dataBuf;
diff --git a/src/lobby/client_http.hpp b/src/lobby/client_http.hpp
index fc30d950..f22cb8d2 100644
--- a/src/lobby/client_http.hpp
+++ b/src/lobby/client_http.hpp
@@ -17,16 +17,16 @@
 class case_insensitive_equals {
 public:
   bool operator()(const std::string &key1, const std::string &key2) const {
-    return Sapphire::Util::toLowerCopy( key1 ) == Sapphire::Util::toLowerCopy( key2 );
+    return Sapphire::Common::Util::toLowerCopy( key1 ) == Sapphire::Common::Util::toLowerCopy( key2 );
   }
 };
 class case_insensitive_hash {
 public:
-  size_t operator()( const std::string &key ) const 
+  size_t operator()( const std::string &key ) const
   {
     std::size_t seed=0;
     for( auto &c : key )
-      Sapphire::Util::hashCombine< char >( seed, std::tolower( c ) );
+      Sapphire::Common::Util::hashCombine< char >( seed, std::tolower( c ) );
     return seed;
   }
 };
diff --git a/src/scripts/action/common/ActionReturn6.cpp b/src/scripts/action/common/ActionReturn6.cpp
index 9831c7e3..aedb0a38 100644
--- a/src/scripts/action/common/ActionReturn6.cpp
+++ b/src/scripts/action/common/ActionReturn6.cpp
@@ -12,7 +12,7 @@ public:
   {
   }
 
-  void onExecute( Sapphire::Action::Action& action ) override
+  void onExecute( Sapphire::World::Action::Action& action ) override
   {
     if( !action.getSourceChara()->isPlayer() )
       return;
diff --git a/src/scripts/action/common/ActionSprint3.cpp b/src/scripts/action/common/ActionSprint3.cpp
index 0067dcac..133cbb2e 100644
--- a/src/scripts/action/common/ActionSprint3.cpp
+++ b/src/scripts/action/common/ActionSprint3.cpp
@@ -11,7 +11,7 @@ public:
   {
   }
 
-  void onExecute( Sapphire::Action::Action& action ) override
+  void onExecute( Sapphire::World::Action::Action& action ) override
   {
     auto sourceChara = action.getSourceChara();
 
diff --git a/src/scripts/action/common/ActionTeleport5.cpp b/src/scripts/action/common/ActionTeleport5.cpp
index e08afda6..1a2fcd77 100644
--- a/src/scripts/action/common/ActionTeleport5.cpp
+++ b/src/scripts/action/common/ActionTeleport5.cpp
@@ -14,7 +14,7 @@ public:
   {
   }
 
-  void onExecute( Sapphire::Action::Action& action ) override
+  void onExecute( Sapphire::World::Action::Action& action ) override
   {
     auto player = action.getSourceChara()->getAsPlayer();
 
diff --git a/src/scripts/action/playeractions/archer/ActionHeavyShot97.cpp b/src/scripts/action/playeractions/archer/ActionHeavyShot97.cpp
index 882d4549..3c3ef16f 100644
--- a/src/scripts/action/playeractions/archer/ActionHeavyShot97.cpp
+++ b/src/scripts/action/playeractions/archer/ActionHeavyShot97.cpp
@@ -12,7 +12,7 @@ public:
   {
   }
 
-  void onExecute( Sapphire::Action::Action& action ) override
+  void onExecute( Sapphire::World::Action::Action& action ) override
   {
     if( auto player = action.getSourceChara()->getAsPlayer() )
       player->sendDebug( "Imagine you just hit an enemy for 150 potency. Incredible, right?" );
diff --git a/src/scripts/action/playeractions/conjurer/ActionCure120.cpp b/src/scripts/action/playeractions/conjurer/ActionCure120.cpp
index 9d6bc8a7..66284ecb 100644
--- a/src/scripts/action/playeractions/conjurer/ActionCure120.cpp
+++ b/src/scripts/action/playeractions/conjurer/ActionCure120.cpp
@@ -12,7 +12,7 @@ public:
   {
   }
 
-  void onExecute( Sapphire::Action::Action& action ) override
+  void onExecute( Sapphire::World::Action::Action& action ) override
   {
 
   }
diff --git a/src/scripts/action/playeractions/darkknight/ActionAbyssalDrain3641.cpp b/src/scripts/action/playeractions/darkknight/ActionAbyssalDrain3641.cpp
index 4d302333..3c369d1c 100644
--- a/src/scripts/action/playeractions/darkknight/ActionAbyssalDrain3641.cpp
+++ b/src/scripts/action/playeractions/darkknight/ActionAbyssalDrain3641.cpp
@@ -12,7 +12,7 @@ public:
   {
   }
 
-  void onExecute( Sapphire::Action::Action& action ) override
+  void onExecute( Sapphire::World::Action::Action& action ) override
   {
     for( auto& chara : action.getHitCharas() )
     {
diff --git a/src/scripts/action/playeractions/darkknight/ActionHardSlash3617.cpp b/src/scripts/action/playeractions/darkknight/ActionHardSlash3617.cpp
index 6d76fdb0..1143c0f7 100644
--- a/src/scripts/action/playeractions/darkknight/ActionHardSlash3617.cpp
+++ b/src/scripts/action/playeractions/darkknight/ActionHardSlash3617.cpp
@@ -12,7 +12,7 @@ public:
   {
   }
 
-  void onExecute( Sapphire::Action::Action& action ) override
+  void onExecute( Sapphire::World::Action::Action& action ) override
   {
     auto chara = action.getHitChara();
     chara->takeDamage( chara->getMaxHp() * 0.34f );
diff --git a/src/scripts/action/playeractions/darkknight/ActionPowerSlash3627.cpp b/src/scripts/action/playeractions/darkknight/ActionPowerSlash3627.cpp
index 6775947d..74cd54a0 100644
--- a/src/scripts/action/playeractions/darkknight/ActionPowerSlash3627.cpp
+++ b/src/scripts/action/playeractions/darkknight/ActionPowerSlash3627.cpp
@@ -12,7 +12,7 @@ public:
   {
   }
 
-  void onExecute( Sapphire::Action::Action& action ) override
+  void onExecute( Sapphire::World::Action::Action& action ) override
   {
 
   }
diff --git a/src/scripts/action/playeractions/darkknight/ActionSpinningSlash3619.cpp b/src/scripts/action/playeractions/darkknight/ActionSpinningSlash3619.cpp
index 3eb592df..1074da11 100644
--- a/src/scripts/action/playeractions/darkknight/ActionSpinningSlash3619.cpp
+++ b/src/scripts/action/playeractions/darkknight/ActionSpinningSlash3619.cpp
@@ -12,7 +12,7 @@ public:
   {
   }
 
-  void onExecute( Sapphire::Action::Action& action ) override
+  void onExecute( Sapphire::World::Action::Action& action ) override
   {
 
   }
diff --git a/src/scripts/action/playeractions/darkknight/ActionSyphonStrike3623.cpp b/src/scripts/action/playeractions/darkknight/ActionSyphonStrike3623.cpp
index e765f8d1..a1d18a74 100644
--- a/src/scripts/action/playeractions/darkknight/ActionSyphonStrike3623.cpp
+++ b/src/scripts/action/playeractions/darkknight/ActionSyphonStrike3623.cpp
@@ -12,7 +12,7 @@ public:
   {
   }
 
-  void onExecute( Sapphire::Action::Action& action ) override
+  void onExecute( Sapphire::World::Action::Action& action ) override
   {
 
   }
diff --git a/src/scripts/action/playeractions/darkknight/ActionUnleash3621.cpp b/src/scripts/action/playeractions/darkknight/ActionUnleash3621.cpp
index 2e735af6..5af2e472 100644
--- a/src/scripts/action/playeractions/darkknight/ActionUnleash3621.cpp
+++ b/src/scripts/action/playeractions/darkknight/ActionUnleash3621.cpp
@@ -12,7 +12,7 @@ public:
   {
   }
 
-  void onExecute( Sapphire::Action::Action& action ) override
+  void onExecute( Sapphire::World::Action::Action& action ) override
   {
     for( auto& chara : action.getHitCharas() )
     {
diff --git a/src/scripts/action/playeractions/whitemage/ActionAsylum3569.cpp b/src/scripts/action/playeractions/whitemage/ActionAsylum3569.cpp
index 1e71dd2e..6ac1c92c 100644
--- a/src/scripts/action/playeractions/whitemage/ActionAsylum3569.cpp
+++ b/src/scripts/action/playeractions/whitemage/ActionAsylum3569.cpp
@@ -12,7 +12,7 @@ public:
   {
   }
 
-  void onExecute( Sapphire::Action::Action& action ) override
+  void onExecute( Sapphire::World::Action::Action& action ) override
   {
 
   }
diff --git a/src/tools/action_parse/main.cpp b/src/tools/action_parse/main.cpp
index c48194d3..3adce507 100644
--- a/src/tools/action_parse/main.cpp
+++ b/src/tools/action_parse/main.cpp
@@ -257,14 +257,14 @@ int main()
 //    Logger::info( out );
   }
 
-  std::ifstream ifs( "ActionLut.cpp.tmpl" );
+  std::ifstream ifs( "ActionLutData.cpp.tmpl" );
 
   std::string actionTmpl( ( std::istreambuf_iterator< char >( ifs ) ),
                             std::istreambuf_iterator< char >() );
 
   auto result = std::regex_replace( actionTmpl, std::regex( "%INSERT_GARBAGE%" ), output );
 
-  std::ofstream outH( "ActionLut.cpp" );
+  std::ofstream outH( "ActionLutData.cpp" );
   outH << result;
   outH.close();
 
diff --git a/src/tools/discovery_parser/main.cpp b/src/tools/discovery_parser/main.cpp
index 41c833b6..0ded1f58 100644
--- a/src/tools/discovery_parser/main.cpp
+++ b/src/tools/discovery_parser/main.cpp
@@ -26,6 +26,8 @@
 #include <ExdCat.h>
 #include <Exd.h>
 
+using namespace Sapphire;
+
 // garbage to ignore models
 bool ignoreModels = false;
 
@@ -165,7 +167,7 @@ std::string zoneNameToPath( const std::string& name )
       info.name = teriName;
       zoneInfoMap[ row.first ] = info;
 
-      if( !found && ( Sapphire::Util::toLowerCopy( name ) == Sapphire::Util::toLowerCopy( teriName ) ) )
+      if( !found && ( Common::Util::toLowerCopy( name ) == Common::Util::toLowerCopy( teriName ) ) )
       {
         found = true;
         path = teriPath;
@@ -177,7 +179,7 @@ std::string zoneNameToPath( const std::string& name )
   {
     for( const auto& entry : zoneInfoMap )
     {
-      if( found = Sapphire::Util::toLowerCopy( name ) == Sapphire::Util::toLowerCopy( entry.second.name ) )
+      if( found = Common::Util::toLowerCopy( name ) == Common::Util::toLowerCopy( entry.second.name ) )
       {
         path = entry.second.path;
         zoneId = entry.second.id;
diff --git a/src/tools/event_object_parser/main.cpp b/src/tools/event_object_parser/main.cpp
index 16ab9ab6..a4d451a9 100644
--- a/src/tools/event_object_parser/main.cpp
+++ b/src/tools/event_object_parser/main.cpp
@@ -62,7 +62,7 @@ std::string zoneNameToPath( const std::string& name )
 {
   std::string path;
 
-  auto it = g_nameMap.find( Sapphire::Util::toLowerCopy( name ) );
+  auto it = g_nameMap.find( Common::Util::toLowerCopy( name ) );
   if( it != g_nameMap.end() )
     return it->second;
 
@@ -79,7 +79,7 @@ std::string zoneNameToPath( const std::string& name )
     if( teriName.empty() )
       continue;
     
-    if( Sapphire::Util::toLowerCopy( name ) == Sapphire::Util::toLowerCopy( teriName ) )
+    if( Common::Util::toLowerCopy( name ) == Common::Util::toLowerCopy( teriName ) )
     {
       path = teriPath;
       break;
@@ -90,7 +90,7 @@ std::string zoneNameToPath( const std::string& name )
   {
     path = std::string( "bg/" ) + path.substr( 0, path.find( "/level/" ) );
     Logger::debug( "Found path for {0}: {1}", name, path );
-    g_nameMap[ Sapphire::Util::toLowerCopy( name ) ] = path; 
+    g_nameMap[ Common::Util::toLowerCopy( name ) ] = path;
   }
   else
   {
@@ -161,7 +161,7 @@ void loadAllInstanceContentEntries()
       name = name.replace( name.begin() + i, name.begin() + i + 1, { '_' } );
     
     std::string remove = ",★_ '()[]-\xae\x1a\x1\x2\x1f\x1\x3.:";
-    Sapphire::Util::eraseAllIn( name, remove );
+    Common::Util::eraseAllIn( name, remove );
     name[ 0 ] = toupper( name[ 0 ] );
     contentList.push_back( { contentId, name, tt->name, type } );
   }
@@ -332,7 +332,7 @@ int main( int argc, char* argv[] )
               {
                 name = eobjNameMap[ id ];
                 std::string remove = ",★_ '()[]-\xae\x1a\x1\x2\x1f\x1\x3.:";
-                Sapphire::Util::eraseAllIn( name, remove );
+                Common::Util::eraseAllIn( name, remove );
                 name[ 0 ] = toupper( name[ 0 ] );
               }
               if( name.empty() )
diff --git a/src/tools/exd_common_gen/main.cpp b/src/tools/exd_common_gen/main.cpp
index a6c7fb60..43a27473 100644
--- a/src/tools/exd_common_gen/main.cpp
+++ b/src/tools/exd_common_gen/main.cpp
@@ -55,7 +55,7 @@ std::string generateEnum( const std::string& exd, int8_t nameIndex, const std::s
     }
 
     std::string remove = ",_-':!(){} \x02\x1f\x01\x03";
-    Sapphire::Util::eraseAllIn( value, remove );
+    Common::Util::eraseAllIn( value, remove );
 
     value[ 0 ] = std::toupper( value[ 0 ] );
 
diff --git a/src/tools/mob_parse/main.cpp b/src/tools/mob_parse/main.cpp
index 838ee51e..e8598da0 100644
--- a/src/tools/mob_parse/main.cpp
+++ b/src/tools/mob_parse/main.cpp
@@ -121,7 +121,7 @@ std::string binaryToHexString( uint8_t* pBinData, uint16_t size )
 
   for( uint32_t i = 0; i < size; i++ )
   {
-    outStr += Sapphire::Util::intToHexString( pBinData[ i ] & 0xFF );
+    outStr += Common::Util::intToHexString( pBinData[ i ] & 0xFF );
   }
 
   return outStr;
diff --git a/src/tools/nav_export/main.cpp b/src/tools/nav_export/main.cpp
index 043410a7..12e1c840 100644
--- a/src/tools/nav_export/main.cpp
+++ b/src/tools/nav_export/main.cpp
@@ -29,6 +29,8 @@
 #include <ExdCat.h>
 #include <Exd.h>
 
+using namespace Sapphire;
+
 // garbage to ignore models
 bool noObj = false;
 
@@ -121,7 +123,7 @@ std::string zoneNameToPath( const std::string& name )
     if( teriName.empty() )
       continue;
     auto teriPath = std::get< std::string >( fields.at( static_cast< size_t >( TerritoryTypeExdIndexes::Path ) ) );
-    if( !found && ( Sapphire::Util::toLowerCopy( name ) == Sapphire::Util::toLowerCopy( teriName ) ) )
+    if( !found && ( Common::Util::toLowerCopy( name ) == Common::Util::toLowerCopy( teriName ) ) )
     {
       path = teriPath;
       found = true;
diff --git a/src/tools/pcb_reader/main.cpp b/src/tools/pcb_reader/main.cpp
index 7c922a12..f4d29d2a 100644
--- a/src/tools/pcb_reader/main.cpp
+++ b/src/tools/pcb_reader/main.cpp
@@ -29,6 +29,8 @@
 #include <ExdCat.h>
 #include <Exd.h>
 
+using namespace Sapphire;
+
 // garbage to ignore models
 bool noObj = false;
 
@@ -123,7 +125,7 @@ std::string zoneNameToPath( const std::string& name )
     if( teriName.empty() )
       continue;
     auto teriPath = std::get< std::string >( fields.at( static_cast< size_t >( TerritoryTypeExdIndexes::Path ) ) );
-    if( !found && ( Sapphire::Util::toLowerCopy( name ) == Sapphire::Util::toLowerCopy( teriName ) ) )
+    if( !found && ( Common::Util::toLowerCopy( name ) == Common::Util::toLowerCopy( teriName ) ) )
     {
       path = teriPath;
       found = true;
diff --git a/src/world/Action/Action.cpp b/src/world/Action/Action.cpp
index 7f04a63f..3c6da8c5 100644
--- a/src/world/Action/Action.cpp
+++ b/src/world/Action/Action.cpp
@@ -1,4 +1,5 @@
 #include "Action.h"
+#include "ActionLut.h"
 
 #include <Exd/ExdDataGenerated.h>
 #include <Util/Util.h>
@@ -26,16 +27,18 @@ using namespace Sapphire::Network::Packets;
 using namespace Sapphire::Network::Packets::Server;
 using namespace Sapphire::Network::ActorControl;
 
+using namespace Sapphire::World::Action;
 
-Sapphire::Action::Action::Action() = default;
-Sapphire::Action::Action::~Action() = default;
 
-Sapphire::Action::Action::Action( Entity::CharaPtr caster, uint32_t actionId, FrameworkPtr fw ) :
+Action::Action() = default;
+Action::~Action() = default;
+
+Action::Action( Entity::CharaPtr caster, uint32_t actionId, FrameworkPtr fw ) :
                                   Action( std::move( caster ), actionId, nullptr, std::move( fw ) )
 {
 }
 
-Sapphire::Action::Action::Action( Entity::CharaPtr caster, uint32_t actionId,
+Action::Action( Entity::CharaPtr caster, uint32_t actionId,
                                   Data::ActionPtr actionData, FrameworkPtr fw ) :
                                   m_pSource( std::move( caster ) ),
                                   m_pFw( std::move( fw ) ),
@@ -47,12 +50,12 @@ Sapphire::Action::Action::Action( Entity::CharaPtr caster, uint32_t actionId,
 {
 }
 
-uint32_t Sapphire::Action::Action::getId() const
+uint32_t Action::getId() const
 {
   return m_id;
 }
 
-bool Sapphire::Action::Action::init()
+bool Action::init()
 {
   if( !m_actionData )
   {
@@ -121,62 +124,62 @@ bool Sapphire::Action::Action::init()
   return true;
 }
 
-void Sapphire::Action::Action::setPos( Sapphire::Common::FFXIVARR_POSITION3 pos )
+void Action::setPos( Sapphire::Common::FFXIVARR_POSITION3 pos )
 {
   m_pos = pos;
 }
 
-Sapphire::Common::FFXIVARR_POSITION3 Sapphire::Action::Action::getPos() const
+Sapphire::Common::FFXIVARR_POSITION3 Action::getPos() const
 {
   return m_pos;
 }
 
-void Sapphire::Action::Action::setTargetId( uint64_t targetId )
+void Action::setTargetId( uint64_t targetId )
 {
   m_targetId = targetId;
 }
 
-uint64_t Sapphire::Action::Action::getTargetId() const
+uint64_t Action::getTargetId() const
 {
   return m_targetId;
 }
 
-bool Sapphire::Action::Action::hasClientsideTarget() const
+bool Action::hasClientsideTarget() const
 {
   return m_targetId > 0xFFFFFFFF;
 }
 
-bool Sapphire::Action::Action::isInterrupted() const
+bool Action::isInterrupted() const
 {
   return m_interruptType != Common::ActionInterruptType::None;
 }
 
-void Sapphire::Action::Action::setInterrupted( Common::ActionInterruptType type )
+void Action::setInterrupted( Common::ActionInterruptType type )
 {
   m_interruptType = type;
 }
 
-uint32_t Sapphire::Action::Action::getCastTime() const
+uint32_t Action::getCastTime() const
 {
   return m_castTimeMs;
 }
 
-void Sapphire::Action::Action::setCastTime( uint32_t castTime )
+void Action::setCastTime( uint32_t castTime )
 {
   m_castTimeMs = castTime;
 }
 
-bool Sapphire::Action::Action::hasCastTime() const
+bool Action::hasCastTime() const
 {
   return m_castTimeMs > 0;
 }
 
-Sapphire::Entity::CharaPtr Sapphire::Action::Action::getSourceChara() const
+Sapphire::Entity::CharaPtr Action::getSourceChara() const
 {
   return m_pSource;
 }
 
-bool Sapphire::Action::Action::update()
+bool Action::update()
 {
   // action has not been started yet
   if( m_startTime == 0 )
@@ -193,7 +196,7 @@ bool Sapphire::Action::Action::update()
     // todo: check if the target is still in range
   }
 
-  uint64_t tickCount = Util::getTimeMs();
+  uint64_t tickCount = Common::Util::getTimeMs();
 
   if( !hasCastTime() || std::difftime( tickCount, m_startTime ) > m_castTimeMs )
   {
@@ -204,11 +207,11 @@ bool Sapphire::Action::Action::update()
   return false;
 }
 
-void Sapphire::Action::Action::start()
+void Action::start()
 {
   assert( m_pSource );
 
-  m_startTime = Util::getTimeMs();
+  m_startTime = Common::Util::getTimeMs();
 
   auto player = m_pSource->getAsPlayer();
 
@@ -238,6 +241,9 @@ void Sapphire::Action::Action::start()
   auto pScriptMgr = m_pFw->get< Scripting::ScriptMgr >();
   if( !pScriptMgr->onStart( *this ) )
   {
+    // check the lut initially and see if we have something usable, otherwise cancel the cast
+//    Sapphire::World::Action::ActionLut::validEntryExists( getId() );
+
     // script not implemented
     interrupt();
 
@@ -255,7 +261,7 @@ void Sapphire::Action::Action::start()
     execute();
 }
 
-void Sapphire::Action::Action::interrupt()
+void Action::interrupt()
 {
   assert( m_pSource );
 
@@ -289,7 +295,7 @@ void Sapphire::Action::Action::interrupt()
   pScriptMgr->onInterrupt( *this );
 }
 
-void Sapphire::Action::Action::execute()
+void Action::execute()
 {
   assert( m_pSource );
 
@@ -346,7 +352,7 @@ void Sapphire::Action::Action::execute()
   }
 }
 
-bool Sapphire::Action::Action::precheck()
+bool Action::precheck()
 {
   if( auto player = m_pSource->getAsPlayer() )
   {
@@ -357,7 +363,7 @@ bool Sapphire::Action::Action::precheck()
   return true;
 }
 
-bool Sapphire::Action::Action::playerPrecheck( Entity::Player& player )
+bool Action::playerPrecheck( Entity::Player& player )
 {
   // lol
   if( !player.isAlive() )
@@ -408,17 +414,17 @@ bool Sapphire::Action::Action::playerPrecheck( Entity::Player& player )
   return true;
 }
 
-uint32_t Sapphire::Action::Action::getAdditionalData() const
+uint32_t Action::getAdditionalData() const
 {
   return m_additionalData;
 }
 
-void Sapphire::Action::Action::setAdditionalData( uint32_t data )
+void Action::setAdditionalData( uint32_t data )
 {
   m_additionalData = data;
 }
 
-bool Sapphire::Action::Action::isComboAction() const
+bool Action::isComboAction() const
 {
   auto lastActionId = m_pSource->getLastComboActionId();
 
@@ -430,7 +436,7 @@ bool Sapphire::Action::Action::isComboAction() const
   return m_actionData->actionCombo == lastActionId;
 }
 
-bool Sapphire::Action::Action::primaryCostCheck( bool subtractCosts )
+bool Action::primaryCostCheck( bool subtractCosts )
 {
   switch( m_primaryCostType )
   {
@@ -473,23 +479,23 @@ bool Sapphire::Action::Action::primaryCostCheck( bool subtractCosts )
   }
 }
 
-bool Sapphire::Action::Action::secondaryCostCheck( bool subtractCosts )
+bool Action::secondaryCostCheck( bool subtractCosts )
 {
   // todo: these need to be mapped
   return true;
 }
 
-bool Sapphire::Action::Action::hasResources()
+bool Action::hasResources()
 {
   return primaryCostCheck( false ) && secondaryCostCheck( false );
 }
 
-bool Sapphire::Action::Action::consumeResources()
+bool Action::consumeResources()
 {
   return primaryCostCheck( true ) && secondaryCostCheck( true );
 }
 
-bool Sapphire::Action::Action::snapshotAffectedActors( std::vector< Entity::CharaPtr >& actors )
+bool Action::snapshotAffectedActors( std::vector< Entity::CharaPtr >& actors )
 {
   for( const auto& actor : m_pSource->getInRangeActors( true ) )
   {
@@ -519,12 +525,12 @@ bool Sapphire::Action::Action::snapshotAffectedActors( std::vector< Entity::Char
   return !actors.empty();
 }
 
-void Sapphire::Action::Action::addActorFilter( World::Util::ActorFilterPtr filter )
+void Action::addActorFilter( World::Util::ActorFilterPtr filter )
 {
   m_actorFilters.push_back( std::move( filter ) );
 }
 
-void Sapphire::Action::Action::addDefaultActorFilters()
+void Action::addDefaultActorFilters()
 {
   switch( m_castType )
   {
@@ -561,7 +567,7 @@ void Sapphire::Action::Action::addDefaultActorFilters()
   }
 }
 
-bool Sapphire::Action::Action::preFilterActor( Sapphire::Entity::Actor& actor ) const
+bool Action::preFilterActor( Sapphire::Entity::Actor& actor ) const
 {
   auto kind = actor.getObjKind();
 
@@ -574,12 +580,12 @@ bool Sapphire::Action::Action::preFilterActor( Sapphire::Entity::Actor& actor )
   return true;
 }
 
-std::vector< Sapphire::Entity::CharaPtr >& Sapphire::Action::Action::getHitCharas()
+std::vector< Sapphire::Entity::CharaPtr >& Action::getHitCharas()
 {
   return m_hitActors;
 }
 
-Sapphire::Entity::CharaPtr Sapphire::Action::Action::getHitChara()
+Sapphire::Entity::CharaPtr Action::getHitChara()
 {
   if( !m_hitActors.empty() )
   {
diff --git a/src/world/Action/Action.h b/src/world/Action/Action.h
index e1c57d2d..b4b12363 100644
--- a/src/world/Action/Action.h
+++ b/src/world/Action/Action.h
@@ -11,7 +11,7 @@ namespace Sapphire::Data
   using ActionPtr = std::shared_ptr< Action >;
 }
 
-namespace Sapphire::Action
+namespace Sapphire::World::Action
 {
 
   class Action
diff --git a/src/world/Action/EventAction.cpp b/src/world/Action/EventAction.cpp
index 349e9040..18c8d993 100644
--- a/src/world/Action/EventAction.cpp
+++ b/src/world/Action/EventAction.cpp
@@ -11,15 +11,16 @@
 #include "EventAction.h"
 #include "Framework.h"
 
+using namespace Sapphire::World;
 using namespace Sapphire::Common;
 using namespace Sapphire::Network;
 using namespace Sapphire::Network::Packets;
 using namespace Sapphire::Network::Packets::Server;
 using namespace Sapphire::Network::ActorControl;
 
-Sapphire::Action::EventAction::EventAction( Entity::CharaPtr pActor, uint32_t eventId, uint16_t action,
-                                            ActionCallback finishRef, ActionCallback interruptRef, uint64_t additional,
-                                            FrameworkPtr pFw )
+Action::EventAction::EventAction( Entity::CharaPtr pActor, uint32_t eventId, uint16_t action,
+                                  ActionCallback finishRef, ActionCallback interruptRef, uint64_t additional,
+                                  FrameworkPtr pFw )
 {
   m_additional = additional;
   m_eventId = eventId;
@@ -33,14 +34,14 @@ Sapphire::Action::EventAction::EventAction( Entity::CharaPtr pActor, uint32_t ev
   m_interruptType = Common::ActionInterruptType::None;
 }
 
-Sapphire::Action::EventAction::~EventAction() = default;
+Action::EventAction::~EventAction() = default;
 
-void Sapphire::Action::EventAction::start()
+void Action::EventAction::start()
 {
   if( !m_pSource )
     return;
 
-  m_startTime = Util::getTimeMs();
+  m_startTime = Common::Util::getTimeMs();
 
   auto control = makeActorControl142( m_pSource->getId(), ActorControlType::CastStart, 1, m_id, 0x4000004E );
 
@@ -54,7 +55,7 @@ void Sapphire::Action::EventAction::start()
     m_pSource->sendToInRangeSet( control );
 }
 
-void Sapphire::Action::EventAction::execute()
+void Action::EventAction::execute()
 {
   if( !m_pSource )
     return;
@@ -90,7 +91,7 @@ void Sapphire::Action::EventAction::execute()
 
 }
 
-void Sapphire::Action::EventAction::interrupt()
+void Action::EventAction::interrupt()
 {
   if( !m_pSource )
     return;
diff --git a/src/world/Action/EventAction.h b/src/world/Action/EventAction.h
index 37987634..4a9bb50a 100644
--- a/src/world/Action/EventAction.h
+++ b/src/world/Action/EventAction.h
@@ -6,7 +6,7 @@
 #include "ForwardsZone.h"
 #include "Action.h"
 
-namespace Sapphire::Action
+namespace Sapphire::World::Action
 {
 
 class EventAction : public Action
diff --git a/src/world/Actor/Chara.cpp b/src/world/Actor/Chara.cpp
index d2eac841..3942f112 100644
--- a/src/world/Actor/Chara.cpp
+++ b/src/world/Actor/Chara.cpp
@@ -391,13 +391,13 @@ void Sapphire::Entity::Chara::sendStatusUpdate()
 }
 
 /*! \return ActionPtr of the currently registered action, or nullptr */
-Sapphire::Action::ActionPtr Sapphire::Entity::Chara::getCurrentAction() const
+Sapphire::World::Action::ActionPtr Sapphire::Entity::Chara::getCurrentAction() const
 {
   return m_pCurrentAction;
 }
 
 /*! \param ActionPtr of the action to be registered */
-void Sapphire::Entity::Chara::setCurrentAction( Sapphire::Action::ActionPtr pAction )
+void Sapphire::Entity::Chara::setCurrentAction( Sapphire::World::Action::ActionPtr pAction )
 {
   m_pCurrentAction = std::move( pAction );
 }
diff --git a/src/world/Actor/Chara.h b/src/world/Actor/Chara.h
index 5679b2cb..83d14fb6 100644
--- a/src/world/Actor/Chara.h
+++ b/src/world/Actor/Chara.h
@@ -102,7 +102,7 @@ namespace Sapphire::Entity
     /*! Id of the currently selected target actor */
     uint64_t m_targetId;
     /*! Ptr to a queued action */
-    Action::ActionPtr m_pCurrentAction;
+    World::Action::ActionPtr m_pCurrentAction;
     /*! id of the director this chara is assigned to */
     uint32_t m_directorId;
 
@@ -265,9 +265,9 @@ namespace Sapphire::Entity
 
     virtual void update( uint64_t tickCount );
 
-    Action::ActionPtr getCurrentAction() const;
+    World::Action::ActionPtr getCurrentAction() const;
 
-    void setCurrentAction( Action::ActionPtr pAction );
+    void setCurrentAction( World::Action::ActionPtr pAction );
 
     uint32_t getLastComboActionId() const;
     void setLastComboActionId( uint32_t actionId );
diff --git a/src/world/Actor/Player.cpp b/src/world/Actor/Player.cpp
index 362dfa0e..f4abe67c 100644
--- a/src/world/Actor/Player.cpp
+++ b/src/world/Actor/Player.cpp
@@ -1621,7 +1621,7 @@ void Sapphire::Entity::Player::setCFPenaltyTimestamp( uint32_t timestamp )
 
 uint32_t Sapphire::Entity::Player::getCFPenaltyMinutes() const
 {
-  auto currentTimestamp = Sapphire::Util::getTimeSeconds();
+  auto currentTimestamp = Common::Util::getTimeSeconds();
   auto endTimestamp = getCFPenaltyTimestamp();
 
   // check if penalty timestamp already passed current time
@@ -1634,7 +1634,7 @@ uint32_t Sapphire::Entity::Player::getCFPenaltyMinutes() const
 
 void Sapphire::Entity::Player::setCFPenaltyMinutes( uint32_t minutes )
 {
-  auto currentTimestamp = Sapphire::Util::getTimeSeconds();
+  auto currentTimestamp = Common::Util::getTimeSeconds();
   setCFPenaltyTimestamp( currentTimestamp + minutes * 60 );
 }
 
diff --git a/src/world/Actor/Player.h b/src/world/Actor/Player.h
index 3fbf9f88..e277738a 100644
--- a/src/world/Actor/Player.h
+++ b/src/world/Actor/Player.h
@@ -53,12 +53,12 @@ namespace Sapphire::Entity
     // EventHandlers
     //////////////////////////////////////////////////////////////////////////////////////////////////////
     /*! start an event action */
-    void eventActionStart( uint32_t eventId, uint32_t action, Action::ActionCallback finishCallback,
-                           Action::ActionCallback interruptCallback, uint64_t additional );
+    void eventActionStart( uint32_t eventId, uint32_t action, World::Action::ActionCallback finishCallback,
+                           World::Action::ActionCallback interruptCallback, uint64_t additional );
 
     /*! start an event item action */
-    void eventItemActionStart( uint32_t eventId, uint32_t action, Action::ActionCallback finishCallback,
-                               Action::ActionCallback interruptCallback, uint64_t additional );
+    void eventItemActionStart( uint32_t eventId, uint32_t action, World::Action::ActionCallback finishCallback,
+                               World::Action::ActionCallback interruptCallback, uint64_t additional );
 
     /*! start/register a normal event */
     void eventStart( uint64_t actorId, uint32_t eventId, Event::EventHandler::EventType eventParam, uint8_t eventParam1,
@@ -1107,8 +1107,8 @@ namespace Sapphire::Entity
 
     Common::PlayerTeleportQuery m_teleportQuery;
 
-    Util::SpawnIndexAllocator< uint8_t > m_objSpawnIndexAllocator;
-    Util::SpawnIndexAllocator< uint8_t > m_actorSpawnIndexAllocator;
+    Common::Util::SpawnIndexAllocator< uint8_t > m_objSpawnIndexAllocator;
+    Common::Util::SpawnIndexAllocator< uint8_t > m_actorSpawnIndexAllocator;
 
     std::array< Common::HuntingLogEntry, 12 > m_huntingLogEntries;
 
diff --git a/src/world/Actor/PlayerEvent.cpp b/src/world/Actor/PlayerEvent.cpp
index f264d180..91c9060f 100644
--- a/src/world/Actor/PlayerEvent.cpp
+++ b/src/world/Actor/PlayerEvent.cpp
@@ -278,11 +278,11 @@ void Sapphire::Entity::Player::eventFinish( uint32_t eventId, uint32_t freePlaye
 
 void Sapphire::Entity::Player::eventActionStart( uint32_t eventId,
                                                  uint32_t action,
-                                                 Action::ActionCallback finishCallback,
-                                                 Action::ActionCallback interruptCallback,
+                                                 World::Action::ActionCallback finishCallback,
+                                                 World::Action::ActionCallback interruptCallback,
                                                  uint64_t additional )
 {
-  auto pEventAction = Action::make_EventAction( getAsChara(), eventId, action,
+  auto pEventAction = World::Action::make_EventAction( getAsChara(), eventId, action,
                                                 finishCallback, interruptCallback, additional, m_pFw );
 
   auto pEvent = getEvent( eventId );
@@ -309,8 +309,8 @@ void Sapphire::Entity::Player::eventActionStart( uint32_t eventId,
 
 void Sapphire::Entity::Player::eventItemActionStart( uint32_t eventId,
                                                      uint32_t action,
-                                                     Action::ActionCallback finishCallback,
-                                                     Action::ActionCallback interruptCallback,
+                                                     World::Action::ActionCallback finishCallback,
+                                                     World::Action::ActionCallback interruptCallback,
                                                      uint64_t additional )
 {
 //  Action::ActionPtr pEventItemAction = Action::make_EventItemAction( getAsChara(), eventId, action,
diff --git a/src/world/ForwardsZone.h b/src/world/ForwardsZone.h
index a432cac1..08de6d59 100644
--- a/src/world/ForwardsZone.h
+++ b/src/world/ForwardsZone.h
@@ -82,7 +82,7 @@ TYPE_FORWARD( Director );
 TYPE_FORWARD( EventHandler );
 }
 
-namespace Action
+namespace World::Action
 {
 TYPE_FORWARD( Action );
 TYPE_FORWARD( EventAction );
diff --git a/src/world/Manager/DebugCommandMgr.cpp b/src/world/Manager/DebugCommandMgr.cpp
index f414c1bd..933b7d94 100644
--- a/src/world/Manager/DebugCommandMgr.cpp
+++ b/src/world/Manager/DebugCommandMgr.cpp
@@ -683,7 +683,7 @@ void Sapphire::World::Manager::DebugCommandMgr::nudge( char* data, Entity::Playe
     setActorPosPacket->data().x = player.getPos().x;
     setActorPosPacket->data().y = player.getPos().y;
     setActorPosPacket->data().z = player.getPos().z;
-    setActorPosPacket->data().r16 = Util::floatToUInt16Rot( player.getRot() );
+    setActorPosPacket->data().r16 = Common::Util::floatToUInt16Rot( player.getRot() );
     player.queuePacket( setActorPosPacket );
   }
 }
diff --git a/src/world/Manager/MarketMgr.cpp b/src/world/Manager/MarketMgr.cpp
index 9b62e534..1ad81cf9 100644
--- a/src/world/Manager/MarketMgr.cpp
+++ b/src/world/Manager/MarketMgr.cpp
@@ -83,7 +83,7 @@ void Sapphire::World::Manager::MarketMgr::requestItemListingInfo( Sapphire::Enti
 
     listing.itemCatalogId = catalogId;
     listing.quantity = i + 1;
-    listing.purchaseTime = Sapphire::Util::getTimeSeconds();
+    listing.purchaseTime = Common::Util::getTimeSeconds();
     listing.salePrice = 69420420;
     listing.isHq = 1;
     listing.onMannequin = 1;
diff --git a/src/world/Network/GameConnection.cpp b/src/world/Network/GameConnection.cpp
index 799835bb..7109b2ba 100644
--- a/src/world/Network/GameConnection.cpp
+++ b/src/world/Network/GameConnection.cpp
@@ -424,7 +424,7 @@ void Sapphire::Network::GameConnection::handlePackets( const Sapphire::Network::
 
         auto pe = std::make_shared< FFXIVRawPacket >( 0x07, 0x18, 0, 0 );
         *( unsigned int* ) ( &pe->data()[ 0 ] ) = 0xE0037603;
-        *( unsigned int* ) ( &pe->data()[ 4 ] ) = Sapphire::Util::getTimeSeconds();
+        *( unsigned int* ) ( &pe->data()[ 4 ] ) = Common::Util::getTimeSeconds();
         sendSinglePacket( pe );
 
         // main connection, assinging it to the session
diff --git a/src/world/Network/GameConnection.h b/src/world/Network/GameConnection.h
index 61be56c5..56a8fc5d 100644
--- a/src/world/Network/GameConnection.h
+++ b/src/world/Network/GameConnection.h
@@ -51,8 +51,8 @@ namespace Sapphire::Network
 
     World::SessionPtr m_pSession;
 
-    LockedQueue< Sapphire::Network::Packets::FFXIVARR_PACKET_RAW > m_inQueue;
-    LockedQueue< Packets::FFXIVPacketBasePtr > m_outQueue;
+    Common::Util::LockedQueue< Sapphire::Network::Packets::FFXIVARR_PACKET_RAW > m_inQueue;
+    Common::Util::LockedQueue< Packets::FFXIVPacketBasePtr > m_outQueue;
     std::vector< uint8_t > m_packets;
 
   public:
diff --git a/src/world/Network/Handlers/PacketHandlers.cpp b/src/world/Network/Handlers/PacketHandlers.cpp
index afb97b0b..ba97168b 100644
--- a/src/world/Network/Handlers/PacketHandlers.cpp
+++ b/src/world/Network/Handlers/PacketHandlers.cpp
@@ -393,7 +393,7 @@ void Sapphire::Network::GameConnection::pingHandler( FrameworkPtr pFw,
 
   queueOutPacket( std::make_shared< Server::PingPacket >( player, packet.data().timestamp ) );
 
-  player.setLastPing( Sapphire::Util::getTimeSeconds() );
+  player.setLastPing( Common::Util::getTimeSeconds() );
 }
 
 
diff --git a/src/world/Network/PacketWrappers/MoveActorPacket.h b/src/world/Network/PacketWrappers/MoveActorPacket.h
index 78718b41..9cf724fc 100644
--- a/src/world/Network/PacketWrappers/MoveActorPacket.h
+++ b/src/world/Network/PacketWrappers/MoveActorPacket.h
@@ -28,15 +28,15 @@ namespace Sapphire::Network::Packets::Server
     void initialize( Entity::Chara& actor, uint8_t headRotation, uint8_t animationType, uint8_t state, uint16_t animationSpeed, uint8_t unknownRotation )
     {
 
-      m_data.rotation = Util::floatToUInt8Rot( actor.getRot() );
+      m_data.rotation = Common::Util::floatToUInt8Rot( actor.getRot() );
       m_data.headRotation = headRotation;
       m_data.animationType = animationType;
       m_data.animationState = state;
       m_data.animationSpeed = animationSpeed;
       m_data.unknownRotation = unknownRotation;
-      m_data.posX = Util::floatToUInt16( actor.getPos().x );
-      m_data.posY = Util::floatToUInt16( actor.getPos().y );
-      m_data.posZ = Util::floatToUInt16( actor.getPos().z );
+      m_data.posX = Common::Util::floatToUInt16( actor.getPos().x );
+      m_data.posY = Common::Util::floatToUInt16( actor.getPos().y );
+      m_data.posZ = Common::Util::floatToUInt16( actor.getPos().z );
 
     };
   };
diff --git a/src/world/Network/PacketWrappers/NpcSpawnPacket.h b/src/world/Network/PacketWrappers/NpcSpawnPacket.h
index 8f952c77..3cc99f89 100644
--- a/src/world/Network/PacketWrappers/NpcSpawnPacket.h
+++ b/src/world/Network/PacketWrappers/NpcSpawnPacket.h
@@ -49,7 +49,7 @@ namespace Sapphire::Network::Packets::Server
       m_data.pos.x = bnpc.getPos().x;
       m_data.pos.y = bnpc.getPos().y;
       m_data.pos.z = bnpc.getPos().z;
-      m_data.rotation = Util::floatToUInt16Rot( bnpc.getRot() );
+      m_data.rotation = Common::Util::floatToUInt16Rot( bnpc.getRot() );
       m_data.levelId = bnpc.getLevelId();
 
       m_data.enemyType = bnpc.getEnemyType();
@@ -87,7 +87,7 @@ namespace Sapphire::Network::Packets::Server
 
       m_data.targetId = static_cast< uint64_t >( bnpc.getTargetId() );
 
-      uint64_t currentTimeMs = Sapphire::Util::getTimeMs();
+      uint64_t currentTimeMs = Common::Util::getTimeMs();
 
       for( auto const& effect : bnpc.getStatusEffectMap() )
       {
diff --git a/src/world/Network/PacketWrappers/PlayerSpawnPacket.h b/src/world/Network/PacketWrappers/PlayerSpawnPacket.h
index 14e16754..4f384356 100644
--- a/src/world/Network/PacketWrappers/PlayerSpawnPacket.h
+++ b/src/world/Network/PacketWrappers/PlayerSpawnPacket.h
@@ -69,7 +69,7 @@ namespace Sapphire::Network::Packets::Server
       m_data.pos.x = player.getPos().x;
       m_data.pos.y = player.getPos().y;
       m_data.pos.z = player.getPos().z;
-      m_data.rotation = Util::floatToUInt16Rot( player.getRot() );
+      m_data.rotation = Common::Util::floatToUInt16Rot( player.getRot() );
 
 
       m_data.title = player.getTitle();
@@ -133,7 +133,7 @@ namespace Sapphire::Network::Packets::Server
       //m_data.unknown_60 = 3;
       //m_data.unknown_61 = 7;
 
-      uint64_t currentTimeMs = Sapphire::Util::getTimeMs();
+      uint64_t currentTimeMs = Common::Util::getTimeMs();
 
       for( auto const& effect : player.getStatusEffectMap() )
       {
diff --git a/src/world/Script/NativeScriptApi.cpp b/src/world/Script/NativeScriptApi.cpp
index 75d63621..d6dce0f6 100644
--- a/src/world/Script/NativeScriptApi.cpp
+++ b/src/world/Script/NativeScriptApi.cpp
@@ -83,20 +83,20 @@ namespace Sapphire::ScriptAPI
 
   ///////////////////////////////////////////////////////////////////
 
-  ActionScript::ActionScript( uint32_t abilityId ) :
-    ScriptObject( abilityId, typeid( ActionScript ).hash_code() )
+  ActionScript::ActionScript( uint32_t actionId ) :
+    ScriptObject( actionId, typeid( ActionScript ).hash_code() )
   {
   }
 
-  void ActionScript::onStart( Sapphire::Action::Action& action )
+  void ActionScript::onStart( Sapphire::World::Action::Action& action )
   {
   }
 
-  void ActionScript::onExecute( Sapphire::Action::Action& action )
+  void ActionScript::onExecute( Sapphire::World::Action::Action& action )
   {
   }
 
-  void ActionScript::onInterrupt( Sapphire::Action::Action& action )
+  void ActionScript::onInterrupt( Sapphire::World::Action::Action& action )
   {
   }
 
diff --git a/src/world/Script/NativeScriptApi.h b/src/world/Script/NativeScriptApi.h
index 4d31b5df..d7b33d00 100644
--- a/src/world/Script/NativeScriptApi.h
+++ b/src/world/Script/NativeScriptApi.h
@@ -138,13 +138,13 @@ namespace Sapphire::ScriptAPI
   class ActionScript :  public ScriptObject
   {
   public:
-    explicit ActionScript( uint32_t abilityId );
+    explicit ActionScript( uint32_t actionId );
 
-    virtual void onStart( Sapphire::Action::Action& action );
+    virtual void onStart( Sapphire::World::Action::Action& action );
 
-    virtual void onExecute( Sapphire::Action::Action& action );
+    virtual void onExecute( Sapphire::World::Action::Action& action );
 
-    virtual void onInterrupt( Sapphire::Action::Action& action );
+    virtual void onInterrupt( Sapphire::World::Action::Action& action );
   };
 
   /*!
diff --git a/src/world/Script/ScriptLoader.cpp b/src/world/Script/ScriptLoader.cpp
index f670c05c..ab72f61f 100644
--- a/src/world/Script/ScriptLoader.cpp
+++ b/src/world/Script/ScriptLoader.cpp
@@ -154,7 +154,7 @@ bool Sapphire::Scripting::ScriptLoader::isModuleLoaded( std::string name )
   for( auto it = m_scriptMap.begin(); it != m_scriptMap.end(); ++it )
   {
 
-    if( Util::toLowerCopy( it->second->library_name ) == Util::toLowerCopy( name ) )
+    if( Common::Util::toLowerCopy( it->second->library_name ) == Common::Util::toLowerCopy( name ) )
       return true;
   }
 
diff --git a/src/world/Script/ScriptMgr.cpp b/src/world/Script/ScriptMgr.cpp
index bb2a86e2..4b7bd27c 100644
--- a/src/world/Script/ScriptMgr.cpp
+++ b/src/world/Script/ScriptMgr.cpp
@@ -329,7 +329,7 @@ bool Sapphire::Scripting::ScriptMgr::onEObjHit( Sapphire::Entity::Player& player
   return didCallScript;
 }
 
-bool Sapphire::Scripting::ScriptMgr::onExecute( Action::Action& action )
+bool Sapphire::Scripting::ScriptMgr::onExecute( World::Action::Action& action )
 {
   auto script = m_nativeScriptMgr->getScript< Sapphire::ScriptAPI::ActionScript >( action.getId() );
 
@@ -341,7 +341,7 @@ bool Sapphire::Scripting::ScriptMgr::onExecute( Action::Action& action )
   return false;
 }
 
-bool Sapphire::Scripting::ScriptMgr::onInterrupt( Action::Action& action )
+bool Sapphire::Scripting::ScriptMgr::onInterrupt( World::Action::Action& action )
 {
   auto script = m_nativeScriptMgr->getScript< Sapphire::ScriptAPI::ActionScript >( action.getId() );
 
@@ -353,7 +353,7 @@ bool Sapphire::Scripting::ScriptMgr::onInterrupt( Action::Action& action )
   return false;
 }
 
-bool Sapphire::Scripting::ScriptMgr::onStart( Action::Action& action )
+bool Sapphire::Scripting::ScriptMgr::onStart( World::Action::Action& action )
 {
   auto script = m_nativeScriptMgr->getScript< Sapphire::ScriptAPI::ActionScript >( action.getId() );
 
diff --git a/src/world/Script/ScriptMgr.h b/src/world/Script/ScriptMgr.h
index 546ec425..94bc8067 100644
--- a/src/world/Script/ScriptMgr.h
+++ b/src/world/Script/ScriptMgr.h
@@ -72,11 +72,11 @@ namespace Sapphire::Scripting
 
     bool onEObjHit( Entity::Player& player, uint64_t actorId, uint32_t actionId );
 
-    bool onStart( Action::Action& action );
+    bool onStart( World::Action::Action& action );
 
-    bool onInterrupt( Action::Action& action );
+    bool onInterrupt( World::Action::Action& action );
 
-    bool onExecute( Action::Action& action );
+    bool onExecute( World::Action::Action& action );
 
     bool onStatusReceive( Entity::CharaPtr pActor, uint32_t effectId );
 
diff --git a/src/world/ServerMgr.cpp b/src/world/ServerMgr.cpp
index 71cef6a0..1929c765 100644
--- a/src/world/ServerMgr.cpp
+++ b/src/world/ServerMgr.cpp
@@ -270,8 +270,8 @@ void Sapphire::World::ServerMgr::mainLoop()
   {
     std::this_thread::sleep_for( std::chrono::milliseconds( 50 ) );
 
-    auto currTime = Util::getTimeSeconds();
-    auto tickCount = Util::getTimeMs();
+    auto currTime = Common::Util::getTimeSeconds();
+    auto tickCount = Common::Util::getTimeMs();
 
     pTeriMgr->updateTerritoryInstances( tickCount );
 
diff --git a/src/world/Session.cpp b/src/world/Session.cpp
index 6e612421..b1e2c615 100644
--- a/src/world/Session.cpp
+++ b/src/world/Session.cpp
@@ -14,8 +14,8 @@ namespace fs = std::experimental::filesystem;
 
 Sapphire::World::Session::Session( uint32_t sessionId, FrameworkPtr pFw ) :
   m_sessionId( sessionId ),
-  m_lastDataTime( Util::getTimeSeconds() ),
-  m_lastSqlTime( Util::getTimeSeconds() ),
+  m_lastDataTime( Common::Util::getTimeSeconds() ),
+  m_lastSqlTime( Common::Util::getTimeSeconds() ),
   m_isValid( false ),
   m_pFw( std::move( pFw ) ),
   m_isReplaying( false )
@@ -102,12 +102,12 @@ bool Sapphire::World::Session::isValid() const
 
 void Sapphire::World::Session::updateLastDataTime()
 {
-  m_lastDataTime = Util::getTimeSeconds();
+  m_lastDataTime = Common::Util::getTimeSeconds();
 }
 
 void Sapphire::World::Session::updateLastSqlTime()
 {
-  m_lastSqlTime = Util::getTimeSeconds();
+  m_lastSqlTime = Common::Util::getTimeSeconds();
 }
 
 void Sapphire::World::Session::startReplay( const std::string& path )
@@ -146,7 +146,7 @@ void Sapphire::World::Session::startReplay( const std::string& path )
   for( auto set : loadedSets )
   {
     m_replayCache.push_back( std::tuple< uint64_t, std::string >(
-      Util::getTimeMs() + ( std::get< 0 >( set ) - startTime ), std::get< 1 >( set ) ) );
+      Common::Util::getTimeMs() + ( std::get< 0 >( set ) - startTime ), std::get< 1 >( set ) ) );
 
     Logger::info( "Registering {0} for {1}", std::get< 1 >( set ), std::get< 0 >( set ) - startTime );
   }
@@ -166,7 +166,7 @@ void Sapphire::World::Session::processReplay()
   int at = 0;
   for( const auto& set : m_replayCache )
   {
-    if( std::get< 0 >( set ) <= Util::getTimeMs() )
+    if( std::get< 0 >( set ) <= Common::Util::getTimeMs() )
     {
       m_pZoneConnection->injectPacket( std::get< 1 >( set ), *getPlayer().get() );
       m_replayCache.erase( m_replayCache.begin() + at );
@@ -201,9 +201,9 @@ void Sapphire::World::Session::update()
     m_pZoneConnection->processInQueue();
 
     // SESSION LOGIC
-    m_pPlayer->update( Util::getTimeMs() );
+    m_pPlayer->update( Common::Util::getTimeMs() );
 
-    if( Util::getTimeSeconds() - static_cast< uint32_t >( getLastSqlTime() ) > 10 )
+    if( Common::Util::getTimeSeconds() - static_cast< uint32_t >( getLastSqlTime() ) > 10 )
     {
       updateLastSqlTime();
       m_pPlayer->updateSql();
diff --git a/src/world/Territory/Zone.cpp b/src/world/Territory/Zone.cpp
index 339f6399..e0a159c4 100644
--- a/src/world/Territory/Zone.cpp
+++ b/src/world/Territory/Zone.cpp
@@ -419,7 +419,7 @@ void Sapphire::Zone::updateBNpcs( uint64_t tickCount )
     return;
 
   m_lastMobUpdate = tickCount;
-  uint64_t currTime = Sapphire::Util::getTimeSeconds();
+  uint64_t currTime = Common::Util::getTimeSeconds();
 
   for( const auto& entry : m_bNpcMap )
   {
diff --git a/src/world/Util/ActorFilter.cpp b/src/world/Util/ActorFilter.cpp
index 4714e1d7..f15b074e 100644
--- a/src/world/Util/ActorFilter.cpp
+++ b/src/world/Util/ActorFilter.cpp
@@ -13,7 +13,7 @@ Sapphire::World::Util::ActorFilterInRange::ActorFilterInRange( Common::FFXIVARR_
 
 bool Sapphire::World::Util::ActorFilterInRange::conditionApplies( const Entity::Actor& actor )
 {
-  return Sapphire::Util::distance( m_startPos, actor.getPos() ) <= m_range;
+  return Sapphire::Common::Util::distance( m_startPos, actor.getPos() ) <= m_range;
 }
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////////

From d755ea2a321d0abb6383b66731699cc9bcfb3f99 Mon Sep 17 00:00:00 2001
From: NotAdam <adam@notadam.me>
Date: Sun, 2 Jun 2019 02:30:54 +1000
Subject: [PATCH 047/351] somewhat working action lut stuff

---
 .../archer/ActionHeavyShot97.cpp              | 23 ---------
 .../playeractions/conjurer/ActionCure120.cpp  | 22 --------
 .../darkknight/ActionAbyssalDrain3641.cpp     | 24 ---------
 .../darkknight/ActionHardSlash3617.cpp        | 23 ---------
 .../darkknight/ActionPowerSlash3627.cpp       | 22 --------
 .../darkknight/ActionSpinningSlash3619.cpp    | 22 --------
 .../darkknight/ActionSyphonStrike3623.cpp     | 22 --------
 .../darkknight/ActionUnleash3621.cpp          | 24 ---------
 .../whitemage/ActionAsylum3569.cpp            | 22 --------
 src/world/Action/Action.cpp                   | 50 +++++++++++--------
 src/world/Action/Action.h                     |  4 +-
 src/world/Action/ActionLut.cpp                | 10 ++++
 src/world/Action/ActionLut.h                  |  1 +
 src/world/Manager/ActionMgr.cpp               |  2 +-
 14 files changed, 44 insertions(+), 227 deletions(-)
 delete mode 100644 src/scripts/action/playeractions/archer/ActionHeavyShot97.cpp
 delete mode 100644 src/scripts/action/playeractions/conjurer/ActionCure120.cpp
 delete mode 100644 src/scripts/action/playeractions/darkknight/ActionAbyssalDrain3641.cpp
 delete mode 100644 src/scripts/action/playeractions/darkknight/ActionHardSlash3617.cpp
 delete mode 100644 src/scripts/action/playeractions/darkknight/ActionPowerSlash3627.cpp
 delete mode 100644 src/scripts/action/playeractions/darkknight/ActionSpinningSlash3619.cpp
 delete mode 100644 src/scripts/action/playeractions/darkknight/ActionSyphonStrike3623.cpp
 delete mode 100644 src/scripts/action/playeractions/darkknight/ActionUnleash3621.cpp
 delete mode 100644 src/scripts/action/playeractions/whitemage/ActionAsylum3569.cpp

diff --git a/src/scripts/action/playeractions/archer/ActionHeavyShot97.cpp b/src/scripts/action/playeractions/archer/ActionHeavyShot97.cpp
deleted file mode 100644
index 3c3ef16f..00000000
--- a/src/scripts/action/playeractions/archer/ActionHeavyShot97.cpp
+++ /dev/null
@@ -1,23 +0,0 @@
-#include <Script/NativeScriptApi.h>
-#include <ScriptObject.h>
-#include <Actor/Player.h>
-#include <Action/Action.h>
-
-class ActionHeavyShot97 :
-  public Sapphire::ScriptAPI::ActionScript
-{
-public:
-  ActionHeavyShot97() :
-    Sapphire::ScriptAPI::ActionScript( 97 )
-  {
-  }
-
-  void onExecute( Sapphire::World::Action::Action& action ) override
-  {
-    if( auto player = action.getSourceChara()->getAsPlayer() )
-      player->sendDebug( "Imagine you just hit an enemy for 150 potency. Incredible, right?" );
-  }
-
-};
-
-EXPOSE_SCRIPT( ActionHeavyShot97 );
\ No newline at end of file
diff --git a/src/scripts/action/playeractions/conjurer/ActionCure120.cpp b/src/scripts/action/playeractions/conjurer/ActionCure120.cpp
deleted file mode 100644
index 66284ecb..00000000
--- a/src/scripts/action/playeractions/conjurer/ActionCure120.cpp
+++ /dev/null
@@ -1,22 +0,0 @@
-#include <Script/NativeScriptApi.h>
-#include <ScriptObject.h>
-#include <Actor/Player.h>
-#include <Action/Action.h>
-
-class ActionCure120 :
-  public Sapphire::ScriptAPI::ActionScript
-{
-public:
-  ActionCure120() :
-    Sapphire::ScriptAPI::ActionScript( 120 )
-  {
-  }
-
-  void onExecute( Sapphire::World::Action::Action& action ) override
-  {
-
-  }
-
-};
-
-EXPOSE_SCRIPT( ActionCure120 );
\ No newline at end of file
diff --git a/src/scripts/action/playeractions/darkknight/ActionAbyssalDrain3641.cpp b/src/scripts/action/playeractions/darkknight/ActionAbyssalDrain3641.cpp
deleted file mode 100644
index 3c369d1c..00000000
--- a/src/scripts/action/playeractions/darkknight/ActionAbyssalDrain3641.cpp
+++ /dev/null
@@ -1,24 +0,0 @@
-#include <Script/NativeScriptApi.h>
-#include <ScriptObject.h>
-#include <Actor/Player.h>
-#include <Action/Action.h>
-
-class ActionAbyssalDrain3641 :
-  public Sapphire::ScriptAPI::ActionScript
-{
-public:
-  ActionAbyssalDrain3641() :
-    Sapphire::ScriptAPI::ActionScript( 3641 )
-  {
-  }
-
-  void onExecute( Sapphire::World::Action::Action& action ) override
-  {
-    for( auto& chara : action.getHitCharas() )
-    {
-      chara->takeDamage( chara->getMaxHp() * 0.5f );
-    }
-  }
-};
-
-EXPOSE_SCRIPT( ActionAbyssalDrain3641 );
\ No newline at end of file
diff --git a/src/scripts/action/playeractions/darkknight/ActionHardSlash3617.cpp b/src/scripts/action/playeractions/darkknight/ActionHardSlash3617.cpp
deleted file mode 100644
index 1143c0f7..00000000
--- a/src/scripts/action/playeractions/darkknight/ActionHardSlash3617.cpp
+++ /dev/null
@@ -1,23 +0,0 @@
-#include <Script/NativeScriptApi.h>
-#include <ScriptObject.h>
-#include <Actor/Player.h>
-#include <Action/Action.h>
-
-class ActionHardSlash3617 :
-  public Sapphire::ScriptAPI::ActionScript
-{
-public:
-  ActionHardSlash3617() :
-    Sapphire::ScriptAPI::ActionScript( 3617 )
-  {
-  }
-
-  void onExecute( Sapphire::World::Action::Action& action ) override
-  {
-    auto chara = action.getHitChara();
-    chara->takeDamage( chara->getMaxHp() * 0.34f );
-  }
-
-};
-
-EXPOSE_SCRIPT( ActionHardSlash3617 );
\ No newline at end of file
diff --git a/src/scripts/action/playeractions/darkknight/ActionPowerSlash3627.cpp b/src/scripts/action/playeractions/darkknight/ActionPowerSlash3627.cpp
deleted file mode 100644
index 74cd54a0..00000000
--- a/src/scripts/action/playeractions/darkknight/ActionPowerSlash3627.cpp
+++ /dev/null
@@ -1,22 +0,0 @@
-#include <Script/NativeScriptApi.h>
-#include <ScriptObject.h>
-#include <Actor/Player.h>
-#include <Action/Action.h>
-
-class ActionPowerSlash3627 :
-  public Sapphire::ScriptAPI::ActionScript
-{
-public:
-  ActionPowerSlash3627() :
-    Sapphire::ScriptAPI::ActionScript( 3627 )
-  {
-  }
-
-  void onExecute( Sapphire::World::Action::Action& action ) override
-  {
-
-  }
-
-};
-
-EXPOSE_SCRIPT( ActionPowerSlash3627 );
\ No newline at end of file
diff --git a/src/scripts/action/playeractions/darkknight/ActionSpinningSlash3619.cpp b/src/scripts/action/playeractions/darkknight/ActionSpinningSlash3619.cpp
deleted file mode 100644
index 1074da11..00000000
--- a/src/scripts/action/playeractions/darkknight/ActionSpinningSlash3619.cpp
+++ /dev/null
@@ -1,22 +0,0 @@
-#include <Script/NativeScriptApi.h>
-#include <ScriptObject.h>
-#include <Actor/Player.h>
-#include <Action/Action.h>
-
-class ActionSpinningSlash3619 :
-  public Sapphire::ScriptAPI::ActionScript
-{
-public:
-  ActionSpinningSlash3619() :
-    Sapphire::ScriptAPI::ActionScript( 3619 )
-  {
-  }
-
-  void onExecute( Sapphire::World::Action::Action& action ) override
-  {
-
-  }
-
-};
-
-EXPOSE_SCRIPT( ActionSpinningSlash3619 );
\ No newline at end of file
diff --git a/src/scripts/action/playeractions/darkknight/ActionSyphonStrike3623.cpp b/src/scripts/action/playeractions/darkknight/ActionSyphonStrike3623.cpp
deleted file mode 100644
index a1d18a74..00000000
--- a/src/scripts/action/playeractions/darkknight/ActionSyphonStrike3623.cpp
+++ /dev/null
@@ -1,22 +0,0 @@
-#include <Script/NativeScriptApi.h>
-#include <ScriptObject.h>
-#include <Actor/Player.h>
-#include <Action/Action.h>
-
-class ActionSyphonStrike3623 :
-  public Sapphire::ScriptAPI::ActionScript
-{
-public:
-  ActionSyphonStrike3623() :
-    Sapphire::ScriptAPI::ActionScript( 3623 )
-  {
-  }
-
-  void onExecute( Sapphire::World::Action::Action& action ) override
-  {
-
-  }
-
-};
-
-EXPOSE_SCRIPT( ActionSyphonStrike3623 );
\ No newline at end of file
diff --git a/src/scripts/action/playeractions/darkknight/ActionUnleash3621.cpp b/src/scripts/action/playeractions/darkknight/ActionUnleash3621.cpp
deleted file mode 100644
index 5af2e472..00000000
--- a/src/scripts/action/playeractions/darkknight/ActionUnleash3621.cpp
+++ /dev/null
@@ -1,24 +0,0 @@
-#include <Script/NativeScriptApi.h>
-#include <ScriptObject.h>
-#include <Actor/Player.h>
-#include <Action/Action.h>
-
-class ActionUnleash3621 :
-  public Sapphire::ScriptAPI::ActionScript
-{
-public:
-  ActionUnleash3621() :
-    Sapphire::ScriptAPI::ActionScript( 3621 )
-  {
-  }
-
-  void onExecute( Sapphire::World::Action::Action& action ) override
-  {
-    for( auto& chara : action.getHitCharas() )
-    {
-      chara->takeDamage( chara->getMaxHp() * 0.34f );
-    }
-  }
-};
-
-EXPOSE_SCRIPT( ActionUnleash3621 );
\ No newline at end of file
diff --git a/src/scripts/action/playeractions/whitemage/ActionAsylum3569.cpp b/src/scripts/action/playeractions/whitemage/ActionAsylum3569.cpp
deleted file mode 100644
index 6ac1c92c..00000000
--- a/src/scripts/action/playeractions/whitemage/ActionAsylum3569.cpp
+++ /dev/null
@@ -1,22 +0,0 @@
-#include <Script/NativeScriptApi.h>
-#include <ScriptObject.h>
-#include <Actor/Player.h>
-#include <Action/Action.h>
-
-class ActionAsylum3569 :
-  public Sapphire::ScriptAPI::ActionScript
-{
-public:
-  ActionAsylum3569() :
-    Sapphire::ScriptAPI::ActionScript( 3569 )
-  {
-  }
-
-  void onExecute( Sapphire::World::Action::Action& action ) override
-  {
-
-  }
-
-};
-
-EXPOSE_SCRIPT( ActionAsylum3569 );
\ No newline at end of file
diff --git a/src/world/Action/Action.cpp b/src/world/Action/Action.cpp
index 3c6da8c5..676c5e95 100644
--- a/src/world/Action/Action.cpp
+++ b/src/world/Action/Action.cpp
@@ -239,17 +239,16 @@ void Action::start()
   player->queuePacket( actionStartPkt );
 
   auto pScriptMgr = m_pFw->get< Scripting::ScriptMgr >();
-  if( !pScriptMgr->onStart( *this ) )
-  {
-    // check the lut initially and see if we have something usable, otherwise cancel the cast
-//    Sapphire::World::Action::ActionLut::validEntryExists( getId() );
 
-    // script not implemented
+  // check the lut too and see if we have something usable, otherwise cancel the cast
+  if( !pScriptMgr->onStart( *this ) && !ActionLut::validEntryExists( getId() ) )
+  {
+    // script not implemented and insufficient lut data (no potencies)
     interrupt();
 
     if( player )
     {
-      player->sendUrgent( "Action not implemented, missing script for action#{0}", getId() );
+      player->sendUrgent( "Action not implemented, missing script/lut entry for action#{0}", getId() );
       player->setCurrentAction( nullptr );
     }
 
@@ -335,7 +334,17 @@ void Action::execute()
     if( !m_hitActors.empty() )
     {
       // only call script if actors are hit
-      pScriptMgr->onExecute( *this );
+      if( !pScriptMgr->onExecute( *this ) && ActionLut::validEntryExists( getId() ) )
+      {
+        auto lutEntry = ActionLut::getEntry( getId() );
+
+        // no script exists but we have a valid lut entry
+        if( auto player = getSourceChara()->getAsPlayer() )
+        {
+          player->sendDebug( "Hit target: pot: {} (f: {}, r: {}), heal pot: {}",
+                             lutEntry.potency, lutEntry.flankPotency, lutEntry.rearPotency, lutEntry.curePotency );
+        }
+      }
     }
   }
   else if( auto player = m_pSource->getAsPlayer() )
@@ -352,18 +361,18 @@ void Action::execute()
   }
 }
 
-bool Action::precheck()
+bool Action::preCheck()
 {
   if( auto player = m_pSource->getAsPlayer() )
   {
-    if( !playerPrecheck( *player ) )
+    if( !playerPreCheck( *player ) )
       return false;
   }
 
   return true;
 }
 
-bool Action::playerPrecheck( Entity::Player& player )
+bool Action::playerPreCheck( Entity::Player& player )
 {
   // lol
   if( !player.isAlive() )
@@ -393,17 +402,18 @@ bool Action::playerPrecheck( Entity::Player& player )
       return false;
   }
 
-  // reset target on actions that can only be casted on yourself while having a target set
-  // todo: check what actions send when targeting an enemy
-//  if( m_actionData->canTargetSelf &&
-//      !m_actionData->canTargetFriendly &&
-//      !m_actionData->canTargetHostile &&
-//      !m_actionData->canTargetParty )
-//  {
-//    setTargetId( getSourceChara() );
-//  }
+  if( !m_actionData->canTargetSelf && getTargetId() == m_pSource->getId() )
+    return false;
 
-  // todo: party/enemy validation
+  // todo: does this need to check for party/alliance stuff or it's just same type?
+  // todo: m_pTarget doesn't exist at this stage because we only fill it when we snapshot targets
+//  if( !m_actionData->canTargetFriendly && m_pSource->getObjKind() == m_pTarget->getObjKind() )
+//    return false;
+//
+//  if( !m_actionData->canTargetHostile && m_pSource->getObjKind() != m_pTarget->getObjKind() )
+//    return false;
+
+  // todo: party/dead validation
 
   // validate range
 
diff --git a/src/world/Action/Action.h b/src/world/Action/Action.h
index b4b12363..9f6671ad 100644
--- a/src/world/Action/Action.h
+++ b/src/world/Action/Action.h
@@ -75,7 +75,7 @@ namespace Sapphire::World::Action
      * @brief Tests if an action is castable by the current source chara
      * @return true if castable, false if the caster doesn't meet the requirements
      */
-    bool precheck();
+    bool preCheck();
 
     /*!
      * @brief Snapshots characters affected by a cast.
@@ -135,7 +135,7 @@ namespace Sapphire::World::Action
     bool primaryCostCheck( bool subtractCosts );
     bool secondaryCostCheck( bool subtractCosts );
 
-    bool playerPrecheck( Entity::Player& player );
+    bool playerPreCheck( Entity::Player& player );
 
     bool preFilterActor( Entity::Actor& actor ) const;
 
diff --git a/src/world/Action/ActionLut.cpp b/src/world/Action/ActionLut.cpp
index 9c33bb96..16598e8e 100644
--- a/src/world/Action/ActionLut.cpp
+++ b/src/world/Action/ActionLut.cpp
@@ -1,3 +1,4 @@
+#include <cassert>
 #include "ActionLut.h"
 
 using namespace Sapphire::World::Action;
@@ -14,4 +15,13 @@ bool ActionLut::validEntryExists( uint16_t actionId )
   // if all of the fields are 0, it's not 'valid' due to parse error or no useful data in the tooltip
   return entry.potency != 0 || entry.comboPotency != 0 || entry.flankPotency != 0 || entry.frontPotency != 0 ||
          entry.rearPotency != 0 || entry.curePotency != 0;
+}
+
+const ActionEntry& ActionLut::getEntry( uint16_t actionId )
+{
+  auto it = m_actionLut.find( actionId );
+
+  assert( it != m_actionLut.end() );
+
+  return it->second;
 }
\ No newline at end of file
diff --git a/src/world/Action/ActionLut.h b/src/world/Action/ActionLut.h
index 36949eb5..f8eeafa8 100644
--- a/src/world/Action/ActionLut.h
+++ b/src/world/Action/ActionLut.h
@@ -22,6 +22,7 @@ namespace Sapphire::World::Action
     using Lut = std::unordered_map< uint16_t, ActionEntry >;
 
     static bool validEntryExists( uint16_t actionId );
+    static const ActionEntry& getEntry( uint16_t actionId );
 
     static Lut m_actionLut;
   };
diff --git a/src/world/Manager/ActionMgr.cpp b/src/world/Manager/ActionMgr.cpp
index 1f03d840..84e8cfb2 100644
--- a/src/world/Manager/ActionMgr.cpp
+++ b/src/world/Manager/ActionMgr.cpp
@@ -90,7 +90,7 @@ void World::Manager::ActionMgr::bootstrapAction( Entity::Player& player,
                                                  Action::ActionPtr currentAction,
                                                  Data::Action& actionData )
 {
-  if( !currentAction->precheck() )
+  if( !currentAction->preCheck() )
   {
     // forcefully interrupt the action and reset the cooldown
     currentAction->interrupt();

From f935dd42827d84054d076d68ef04d085e0a4b976 Mon Sep 17 00:00:00 2001
From: NotAdam <adam@notadam.me>
Date: Sun, 2 Jun 2019 20:45:18 +1000
Subject: [PATCH 048/351] move itemaction to own class, perchbird's effect
 command

---
 src/world/Action/Action.cpp           | 19 ++++---
 src/world/Action/ItemAction.cpp       | 73 +++++++++++++++++++++++++++
 src/world/Action/ItemAction.h         | 38 ++++++++++++++
 src/world/ForwardsZone.h              |  1 +
 src/world/Manager/ActionMgr.cpp       | 37 ++------------
 src/world/Manager/DebugCommandMgr.cpp | 24 +++++++++
 6 files changed, 150 insertions(+), 42 deletions(-)
 create mode 100644 src/world/Action/ItemAction.cpp
 create mode 100644 src/world/Action/ItemAction.h

diff --git a/src/world/Action/Action.cpp b/src/world/Action/Action.cpp
index 676c5e95..c1e071f5 100644
--- a/src/world/Action/Action.cpp
+++ b/src/world/Action/Action.cpp
@@ -34,19 +34,18 @@ Action::Action() = default;
 Action::~Action() = default;
 
 Action::Action( Entity::CharaPtr caster, uint32_t actionId, FrameworkPtr fw ) :
-                                  Action( std::move( caster ), actionId, nullptr, std::move( fw ) )
+  Action( std::move( caster ), actionId, nullptr, std::move( fw ) )
 {
 }
 
-Action::Action( Entity::CharaPtr caster, uint32_t actionId,
-                                  Data::ActionPtr actionData, FrameworkPtr fw ) :
-                                  m_pSource( std::move( caster ) ),
-                                  m_pFw( std::move( fw ) ),
-                                  m_actionData( std::move( actionData ) ),
-                                  m_id( actionId ),
-                                  m_targetId( 0 ),
-                                  m_startTime( 0 ),
-                                  m_interruptType( Common::ActionInterruptType::None )
+Action::Action( Entity::CharaPtr caster, uint32_t actionId, Data::ActionPtr actionData, FrameworkPtr fw ) :
+  m_pSource( std::move( caster ) ),
+  m_pFw( std::move( fw ) ),
+  m_actionData( std::move( actionData ) ),
+  m_id( actionId ),
+  m_targetId( 0 ),
+  m_startTime( 0 ),
+  m_interruptType( Common::ActionInterruptType::None )
 {
 }
 
diff --git a/src/world/Action/ItemAction.cpp b/src/world/Action/ItemAction.cpp
new file mode 100644
index 00000000..efbef2f4
--- /dev/null
+++ b/src/world/Action/ItemAction.cpp
@@ -0,0 +1,73 @@
+#include "ItemAction.h"
+
+#include <Exd/ExdDataGenerated.h>
+
+#include <Actor/Player.h>
+#include <Network/PacketWrappers/EffectPacket.h>
+
+using namespace Sapphire;
+using namespace Sapphire::World::Action;
+
+ItemAction::ItemAction( Sapphire::Entity::CharaPtr source, uint32_t itemId,
+                        Sapphire::Data::ItemActionPtr itemActionData, uint16_t itemSourceSlot,
+                        uint16_t itemSourceContainer, Sapphire::FrameworkPtr fw ) :
+  m_itemAction( std::move( itemActionData ) ),
+  m_itemSourceSlot( itemSourceSlot ),
+  m_itemSourceContainer( itemSourceContainer )
+{
+  m_id = itemId;
+  m_pSource = std::move( source );
+  m_pFw = std::move( fw );
+}
+
+void ItemAction::start()
+{
+  if( !m_pSource->isPlayer() )
+    return;
+
+  // todo: check inv slot for item
+
+  // todo: can we just do this?
+  execute();
+}
+
+void ItemAction::execute()
+{
+  switch( m_itemAction->type )
+  {
+    default:
+    {
+      getSourceChara()->getAsPlayer()->sendDebug( "ItemAction type {0} not supported.", m_itemAction->type );
+      break;
+    }
+
+    case Common::ItemActionType::ItemActionVFX:
+    case Common::ItemActionType::ItemActionVFX2:
+    {
+      handleVFXItem();
+
+      break;
+    }
+  }
+}
+
+void ItemAction::interrupt()
+{
+
+}
+
+void ItemAction::handleVFXItem()
+{
+  Common::EffectEntry effect{};
+  effect.effectType = Common::ActionEffectType::VFX;
+  effect.value = m_itemAction->data[ 0 ];
+
+  auto effectPacket = std::make_shared< Network::Packets::Server::EffectPacket >( getSourceChara()->getId(),
+                                                                                  getSourceChara()->getId(), getId() );
+  effectPacket->setTargetActor( getSourceChara()->getId() );
+  effectPacket->setAnimationId( Common::ItemActionType::ItemActionVFX );
+  effectPacket->setDisplayType( Common::ActionEffectDisplayType::ShowItemName );
+  effectPacket->addEffect( effect );
+
+  m_pSource->sendToInRangeSet( effectPacket, true );
+}
\ No newline at end of file
diff --git a/src/world/Action/ItemAction.h b/src/world/Action/ItemAction.h
new file mode 100644
index 00000000..f0f7c24f
--- /dev/null
+++ b/src/world/Action/ItemAction.h
@@ -0,0 +1,38 @@
+#ifndef SAPPHIRE_ITEMACTION_H
+#define SAPPHIRE_ITEMACTION_H
+
+#include "Action.h"
+
+namespace Sapphire::Data
+{
+  struct ItemAction;
+  using ItemActionPtr = std::shared_ptr< ItemAction >;
+}
+
+namespace Sapphire::World::Action
+{
+  class ItemAction : public Action
+  {
+  public:
+    ItemAction( Entity::CharaPtr source, uint32_t itemId, Data::ItemActionPtr itemActionData,
+                uint16_t itemSourceSlot, uint16_t itemSourceContainer, FrameworkPtr fw );
+    virtual ~ItemAction() = default;
+
+    void start() override;
+
+    void execute() override;
+
+    void interrupt() override;
+
+  private:
+    void handleVFXItem();
+
+  private:
+    Sapphire::Data::ItemActionPtr m_itemAction;
+
+    uint16_t m_itemSourceSlot;
+    uint16_t m_itemSourceContainer;
+  };
+}
+
+#endif //SAPPHIRE_ITEMACTION_H
diff --git a/src/world/ForwardsZone.h b/src/world/ForwardsZone.h
index 08de6d59..fb584c7b 100644
--- a/src/world/ForwardsZone.h
+++ b/src/world/ForwardsZone.h
@@ -86,6 +86,7 @@ namespace World::Action
 {
 TYPE_FORWARD( Action );
 TYPE_FORWARD( EventAction );
+TYPE_FORWARD( ItemAction );
 
 using ActionCallback = std::function< void( Entity::Player&, uint32_t, uint64_t ) >;
 }
diff --git a/src/world/Manager/ActionMgr.cpp b/src/world/Manager/ActionMgr.cpp
index 84e8cfb2..feced875 100644
--- a/src/world/Manager/ActionMgr.cpp
+++ b/src/world/Manager/ActionMgr.cpp
@@ -1,6 +1,7 @@
 #include "ActionMgr.h"
 
 #include "Action/Action.h"
+#include "Action/ItemAction.h"
 #include "Script/ScriptMgr.h"
 #include "Actor/Player.h"
 
@@ -66,24 +67,11 @@ void World::Manager::ActionMgr::handleItemAction( Sapphire::Entity::Player& play
 {
   player.sendDebug( "got item act: {0}, slot: {1}, container: {2}", itemId, itemSourceSlot, itemSourceContainer );
 
-  // todo: check we have item & remove item from inventory
+  auto action = Action::make_ItemAction( player.getAsChara(), itemId, itemActionData,
+                                         itemSourceSlot, itemSourceContainer, framework() );
 
-  switch( itemActionData->type )
-  {
-    default:
-    {
-      player.sendDebug( "ItemAction type {0} not supported.", itemActionData->type );
-      break;
-    }
-
-    case Common::ItemActionType::ItemActionVFX:
-    case Common::ItemActionType::ItemActionVFX2:
-    {
-      handleItemActionVFX( player, itemId, itemActionData->data[ 0 ] );
-
-      break;
-    }
-  }
+  // todo: item actions don't have cast times? if so we can just start it and we're good
+  action->start();
 }
 
 void World::Manager::ActionMgr::bootstrapAction( Entity::Player& player,
@@ -105,19 +93,4 @@ void World::Manager::ActionMgr::bootstrapAction( Entity::Player& player,
 
   // todo: what do in cases of swiftcast/etc? script callback?
   currentAction->start();
-}
-
-void World::Manager::ActionMgr::handleItemActionVFX( Sapphire::Entity::Player& player, uint32_t itemId, uint16_t vfxId )
-{
-  Common::EffectEntry effect{};
-  effect.effectType = Common::ActionEffectType::VFX;
-  effect.value = vfxId;
-
-  auto effectPacket = std::make_shared< Network::Packets::Server::EffectPacket >( player.getId(), player.getId(), itemId );
-  effectPacket->setTargetActor( player.getId() );
-  effectPacket->setAnimationId( Common::ItemActionType::ItemActionVFX );
-  effectPacket->setDisplayType( Common::ActionEffectDisplayType::ShowItemName );
-  effectPacket->addEffect( effect );
-
-  player.sendToInRangeSet( effectPacket, true );
 }
\ No newline at end of file
diff --git a/src/world/Manager/DebugCommandMgr.cpp b/src/world/Manager/DebugCommandMgr.cpp
index 933b7d94..796e254d 100644
--- a/src/world/Manager/DebugCommandMgr.cpp
+++ b/src/world/Manager/DebugCommandMgr.cpp
@@ -10,6 +10,7 @@
 #include <Exd/ExdDataGenerated.h>
 #include <Database/DatabaseDef.h>
 #include <cmath>
+#include <Network/PacketWrappers/EffectPacket.h>
 
 #include "DebugCommand/DebugCommand.h"
 #include "DebugCommandMgr.h"
@@ -522,6 +523,29 @@ void Sapphire::World::Manager::DebugCommandMgr::add( char* data, Entity::Player&
     sscanf( params.c_str(), "%d", &id );
     player.learnAction( id );
   }
+  else if ( subCommand == "effect")
+  {
+    uint16_t param1;
+    sscanf( params.c_str(), "%hu", &param1 );
+
+    auto effectPacket = std::make_shared< Server::EffectPacket >( player.getId(), player.getTargetId(), param1 );
+    effectPacket->setRotation( Common::Util::floatToUInt16Rot( player.getRot() ) );
+
+    Common::EffectEntry entry{};
+    entry.value = param1;
+    entry.effectType = Common::ActionEffectType::Damage;
+    entry.hitSeverity = Common::ActionHitSeverityType::NormalDamage;
+
+    effectPacket->addEffect( entry );
+
+    auto sequence = player.getCurrentZone()->getNextEffectSequence();
+    effectPacket->setSequence( sequence );
+
+//    effectPacket->setAnimationId( param1 );
+//    effectPacket->setEffectFlags( 0 );
+
+    player.queuePacket( effectPacket );
+  }
   else
   {
     player.sendUrgent( "{0} is not a valid ADD command.", subCommand );

From bee58c445fefe4d4354497d8f9e367ae2a90a383 Mon Sep 17 00:00:00 2001
From: NotAdam <adam@notadam.me>
Date: Sun, 2 Jun 2019 21:39:37 +1000
Subject: [PATCH 049/351] fix msvc build

---
 src/common/Util/UtilMath.cpp | 3 ++-
 src/common/Util/UtilMath.h   | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/common/Util/UtilMath.cpp b/src/common/Util/UtilMath.cpp
index a1e1a01e..ae61e171 100644
--- a/src/common/Util/UtilMath.cpp
+++ b/src/common/Util/UtilMath.cpp
@@ -17,7 +17,8 @@ float Util::distance( float x, float y, float z, float x1, float y1, float z1 )
   return sqrtf( distanceSq( x, y, z, x1, y1, z1 ) );
 }
 
-float Util::distance( const Common::FFXIVARR_POSITION3& pos1, const Common::FFXIVARR_POSITION3& pos2 )
+float Util::distance( const Sapphire::Common::FFXIVARR_POSITION3& pos1,
+                      const Sapphire::Common::FFXIVARR_POSITION3& pos2 )
 {
   return sqrtf( distanceSq( pos1.x, pos1.y, pos1.z, pos2.x, pos2.y, pos2.z ) );
 }
diff --git a/src/common/Util/UtilMath.h b/src/common/Util/UtilMath.h
index c35ef6be..93344253 100644
--- a/src/common/Util/UtilMath.h
+++ b/src/common/Util/UtilMath.h
@@ -11,7 +11,7 @@ namespace Sapphire::Common::Util
   float distanceSq( float x, float y, float z, float x1, float y1, float z1 );
 
   float distance( float x, float y, float z, float x1, float y1, float z1 );
-  float distance( const Common::FFXIVARR_POSITION3& pos1, const Common::FFXIVARR_POSITION3& pos2 );
+  float distance( const Sapphire::Common::FFXIVARR_POSITION3& pos1, const Sapphire::Common::FFXIVARR_POSITION3& pos2 );
 
   float distance2DSq( float x, float y, float x1, float y1 );
 

From eb5431a80e98ee7b5b4c5a7f1bf29b032b640efd Mon Sep 17 00:00:00 2001
From: NotAdam <adam@notadam.me>
Date: Sun, 2 Jun 2019 23:28:19 +1000
Subject: [PATCH 050/351] move lobby to Sapphire::Lobby, move common lib to
 Sapphire::Common

---
 src/common/Config/ConfigMgr.cpp               |  8 ++-
 src/common/Config/ConfigMgr.h                 |  2 +-
 src/common/Crypt/base64.cpp                   |  4 +-
 src/common/Crypt/base64.h                     |  2 +-
 src/common/Crypt/md5.cpp                      | 10 +--
 src/common/Crypt/md5.h                        |  2 +-
 src/common/Forwards.h                         |  6 +-
 src/common/Framework.h                        |  2 +-
 src/common/Network/Acceptor.cpp               | 29 +++++----
 src/common/Network/Acceptor.h                 |  2 +-
 src/common/Network/CommonActorControl.h       |  2 +-
 src/common/Network/CommonNetwork.h            |  2 +-
 src/common/Network/Connection.cpp             | 48 +++++++-------
 src/common/Network/Connection.h               |  6 +-
 src/common/Network/GamePacket.h               |  2 +-
 src/common/Network/GamePacketParser.cpp       | 15 +++--
 src/common/Network/GamePacketParser.h         |  2 +-
 src/common/Network/Hive.cpp                   | 18 +++---
 src/common/Network/Hive.h                     |  2 +-
 src/common/Network/PacketContainer.cpp        | 12 ++--
 src/common/Network/PacketContainer.h          |  2 +-
 .../Network/PacketDef/Chat/ServerChatDef.h    | 11 +---
 src/common/Network/PacketDef/Ipcs.h           |  2 +-
 .../Network/PacketDef/Lobby/ServerLobbyDef.h  |  9 +--
 .../Network/PacketDef/Zone/ClientZoneDef.h    |  9 +--
 .../Network/PacketDef/Zone/ServerZoneDef.h    |  2 +-
 src/lobby/Forwards.h                          | 12 ++--
 src/lobby/GameConnection.cpp                  | 64 +++++++++----------
 src/lobby/GameConnection.h                    | 32 +++++-----
 src/lobby/LobbyPacketContainer.cpp            | 19 +++---
 src/lobby/LobbyPacketContainer.h              |  6 +-
 src/lobby/LobbySession.cpp                    |  4 +-
 src/lobby/LobbySession.h                      |  2 +-
 src/lobby/RestConnector.cpp                   | 26 ++++----
 src/lobby/RestConnector.h                     |  2 +-
 src/lobby/ServerLobby.cpp                     | 14 ++--
 src/lobby/ServerLobby.h                       | 10 ++-
 src/lobby/mainLobbyServer.cpp                 |  2 +-
 src/world/Action/Action.h                     |  2 -
 src/world/Network/GameConnection.h            |  6 +-
 40 files changed, 208 insertions(+), 204 deletions(-)

diff --git a/src/common/Config/ConfigMgr.cpp b/src/common/Config/ConfigMgr.cpp
index a4fa1bdc..d8283dee 100644
--- a/src/common/Config/ConfigMgr.cpp
+++ b/src/common/Config/ConfigMgr.cpp
@@ -5,12 +5,14 @@
 
 namespace fs = std::experimental::filesystem;
 
+using namespace Sapphire::Common;
+
 /**
  * Loads an ini file and parses it
  * @param configName the name of ini file relative to m_configFolderRoot to load alongside global.ini
  * @return true if loading was successful
  */
-bool Sapphire::ConfigMgr::loadConfig( const std::string& configName )
+bool ConfigMgr::loadConfig( const std::string& configName )
 {
   // get global config
   auto configFile = fs::path( fs::path( m_configFolderRoot ) / configName );
@@ -29,7 +31,7 @@ bool Sapphire::ConfigMgr::loadConfig( const std::string& configName )
   return true;
 }
 
-bool Sapphire::ConfigMgr::loadGlobalConfig( Common::Config::GlobalConfig& config, const std::string& configName )
+bool ConfigMgr::loadGlobalConfig( Common::Config::GlobalConfig& config, const std::string& configName )
 {
   auto configFile = fs::path( fs::path( m_configFolderRoot ) / configName );
 
@@ -71,7 +73,7 @@ bool Sapphire::ConfigMgr::loadGlobalConfig( Common::Config::GlobalConfig& config
   return true;
 }
 
-bool Sapphire::ConfigMgr::copyDefaultConfig( const std::string& configName )
+bool ConfigMgr::copyDefaultConfig( const std::string& configName )
 {
   fs::path configPath( m_configFolderRoot );
   configPath /= configName;
diff --git a/src/common/Config/ConfigMgr.h b/src/common/Config/ConfigMgr.h
index 919762c2..b78da899 100644
--- a/src/common/Config/ConfigMgr.h
+++ b/src/common/Config/ConfigMgr.h
@@ -8,7 +8,7 @@
 #include <stdint.h>
 #include "ConfigDef.h"
 
-namespace Sapphire
+namespace Sapphire::Common
 {
     class ConfigMgr
     {
diff --git a/src/common/Crypt/base64.cpp b/src/common/Crypt/base64.cpp
index 591568b5..7d513c47 100644
--- a/src/common/Crypt/base64.cpp
+++ b/src/common/Crypt/base64.cpp
@@ -41,7 +41,7 @@ static inline bool is_base64( uint8_t c )
   return ( isalnum( c ) || ( c == '+' ) || ( c == '/' ) );
 }
 
-std::string Sapphire::Util::base64Encode( uint8_t const* bytes_to_encode, uint32_t in_len )
+std::string Sapphire::Common::Util::base64Encode( uint8_t const* bytes_to_encode, uint32_t in_len )
 {
   std::string ret;
   int32_t i = 0;
@@ -87,7 +87,7 @@ std::string Sapphire::Util::base64Encode( uint8_t const* bytes_to_encode, uint32
 
 }
 
-std::string Sapphire::Util::base64Decode( std::string const& encoded_string )
+std::string Sapphire::Common::Util::base64Decode( std::string const& encoded_string )
 {
   int32_t in_len = encoded_string.size();
   int32_t i = 0;
diff --git a/src/common/Crypt/base64.h b/src/common/Crypt/base64.h
index c95d09f3..9b5d9eff 100644
--- a/src/common/Crypt/base64.h
+++ b/src/common/Crypt/base64.h
@@ -1,6 +1,6 @@
 #include <string>
 
-namespace Sapphire::Util
+namespace Sapphire::Common::Util
 {
   std::string base64Encode( uint8_t const*, uint32_t len );
 
diff --git a/src/common/Crypt/md5.cpp b/src/common/Crypt/md5.cpp
index 130042e2..de5cf7ef 100644
--- a/src/common/Crypt/md5.cpp
+++ b/src/common/Crypt/md5.cpp
@@ -37,7 +37,7 @@
   (b)[(i) + 3] = (uint8_t) ( (n) >> 24 );       \
 }
 
-void Sapphire::Util::md5_starts( md5_context* ctx )
+void Sapphire::Common::Util::md5_starts( md5_context* ctx )
 {
   ctx->total[ 0 ] = 0;
   ctx->total[ 1 ] = 0;
@@ -48,7 +48,7 @@ void Sapphire::Util::md5_starts( md5_context* ctx )
   ctx->state[ 3 ] = 0x10325476;
 }
 
-void md5_process( Sapphire::Util::md5_context* ctx, uint8_t data[64] )
+void md5_process( Sapphire::Common::Util::md5_context* ctx, uint8_t data[64] )
 {
   uint32_t X[16], A, B, C, D;
 
@@ -171,7 +171,7 @@ void md5_process( Sapphire::Util::md5_context* ctx, uint8_t data[64] )
   ctx->state[ 3 ] += D;
 }
 
-void Sapphire::Util::md5_update( md5_context* ctx, uint8_t* input, uint32_t length )
+void Sapphire::Common::Util::md5_update( md5_context* ctx, uint8_t* input, uint32_t length )
 {
   uint32_t left, fill;
 
@@ -219,7 +219,7 @@ static uint8_t md5_padding[64] =
     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
   };
 
-void Sapphire::Util::md5_finish( md5_context* ctx, uint8_t digest[16] )
+void Sapphire::Common::Util::md5_finish( md5_context* ctx, uint8_t digest[16] )
 {
   uint32_t last, padn;
   uint32_t high, low;
@@ -248,7 +248,7 @@ void Sapphire::Util::md5_finish( md5_context* ctx, uint8_t digest[16] )
 * those are the standard RFC 1321 test vectors
 */
 
-void Sapphire::Util::md5( uint8_t* text, uint8_t* hash, int32_t size )
+void Sapphire::Common::Util::md5( uint8_t* text, uint8_t* hash, int32_t size )
 {
   md5_context ctx;
   md5_starts( &ctx );
diff --git a/src/common/Crypt/md5.h b/src/common/Crypt/md5.h
index cfdb4ad8..f27dd5a9 100644
--- a/src/common/Crypt/md5.h
+++ b/src/common/Crypt/md5.h
@@ -3,7 +3,7 @@
 
 #include <stdint.h>
 
-namespace Sapphire::Util
+namespace Sapphire::Common::Util
 {
   using md5_context = struct
   {
diff --git a/src/common/Forwards.h b/src/common/Forwards.h
index 7434f861..085dfbe9 100644
--- a/src/common/Forwards.h
+++ b/src/common/Forwards.h
@@ -3,7 +3,7 @@
 
 #include <memory>
 
-namespace Sapphire
+namespace Sapphire::Common
 {
   class ConfigMgr;
   class Framework;
@@ -11,7 +11,7 @@ namespace Sapphire
   using FrameworkPtr = std::shared_ptr< Framework >;
 }
 
-namespace Sapphire::Network
+namespace Sapphire::Common::Network
 {
   class Hive;
   class Acceptor;
@@ -21,7 +21,7 @@ namespace Sapphire::Network
   using ConnectionPtr = std::shared_ptr< Connection >;
 }
 
-namespace Sapphire::Network::Packets
+namespace Sapphire::Common::Network::Packets
 {
   class GamePacket;
   class FFXIVPacketBase;
diff --git a/src/common/Framework.h b/src/common/Framework.h
index 5714bdb3..0e752801 100644
--- a/src/common/Framework.h
+++ b/src/common/Framework.h
@@ -7,7 +7,7 @@
 #include <memory>
 #include <cassert>
 
-namespace Sapphire
+namespace Sapphire::Common
 {
 
   class Framework
diff --git a/src/common/Network/Acceptor.cpp b/src/common/Network/Acceptor.cpp
index ab76398c..2238b5fa 100644
--- a/src/common/Network/Acceptor.cpp
+++ b/src/common/Network/Acceptor.cpp
@@ -2,7 +2,10 @@
 #include "Acceptor.h"
 #include "Connection.h"
 
-Sapphire::Network::Acceptor::Acceptor( HivePtr hive ) :
+
+using namespace Sapphire::Common;
+
+Network::Acceptor::Acceptor( HivePtr hive ) :
   m_hive( hive ),
   m_acceptor( hive->getService() ),
   m_io_strand( hive->getService() ),
@@ -10,21 +13,21 @@ Sapphire::Network::Acceptor::Acceptor( HivePtr hive ) :
 {
 }
 
-Sapphire::Network::Acceptor::~Acceptor()
+Network::Acceptor::~Acceptor()
 {
 }
 
-bool Sapphire::Network::Acceptor::onAccept( ConnectionPtr connection, const std::string& host, uint16_t port )
+bool Network::Acceptor::onAccept( ConnectionPtr connection, const std::string& host, uint16_t port )
 {
   return true;
 }
 
-void Sapphire::Network::Acceptor::onError( const asio::error_code& error )
+void Network::Acceptor::onError( const asio::error_code& error )
 {
 
 }
 
-void Sapphire::Network::Acceptor::startError( const asio::error_code& error )
+void Network::Acceptor::startError( const asio::error_code& error )
 {
   uint32_t v1 = 1;
   uint32_t v2 = 0;
@@ -37,7 +40,7 @@ void Sapphire::Network::Acceptor::startError( const asio::error_code& error )
   }
 }
 
-void Sapphire::Network::Acceptor::dispatchAccept( ConnectionPtr connection )
+void Network::Acceptor::dispatchAccept( ConnectionPtr connection )
 {
   m_acceptor.async_accept( connection->getSocket(),
                            connection->getStrand().wrap( std::bind( &Acceptor::handleAccept,
@@ -46,7 +49,7 @@ void Sapphire::Network::Acceptor::dispatchAccept( ConnectionPtr connection )
                                                                     connection ) ) );
 }
 
-void Sapphire::Network::Acceptor::handleAccept( const asio::error_code& error, ConnectionPtr connection )
+void Network::Acceptor::handleAccept( const asio::error_code& error, ConnectionPtr connection )
 {
   if( error || hasError() || m_hive->hasStopped() )
   {
@@ -72,17 +75,17 @@ void Sapphire::Network::Acceptor::handleAccept( const asio::error_code& error, C
   }
 }
 
-void Sapphire::Network::Acceptor::stop()
+void Network::Acceptor::stop()
 {
 
 }
 
-void Sapphire::Network::Acceptor::accept( ConnectionPtr connection )
+void Network::Acceptor::accept( ConnectionPtr connection )
 {
   m_io_strand.post( std::bind( &Acceptor::dispatchAccept, shared_from_this(), connection ) );
 }
 
-void Sapphire::Network::Acceptor::listen( const std::string& host, const uint16_t& port )
+void Network::Acceptor::listen( const std::string& host, const uint16_t& port )
 {
   try
   {
@@ -103,17 +106,17 @@ void Sapphire::Network::Acceptor::listen( const std::string& host, const uint16_
 
 }
 
-Sapphire::Network::HivePtr Sapphire::Network::Acceptor::getHive()
+Network::HivePtr Network::Acceptor::getHive()
 {
   return m_hive;
 }
 
-asio::ip::tcp::acceptor& Sapphire::Network::Acceptor::getAcceptor()
+asio::ip::tcp::acceptor& Network::Acceptor::getAcceptor()
 {
   return m_acceptor;
 }
 
-bool Sapphire::Network::Acceptor::hasError()
+bool Network::Acceptor::hasError()
 {
   uint32_t v1 = 1;
   uint32_t v2 = 1;
diff --git a/src/common/Network/Acceptor.h b/src/common/Network/Acceptor.h
index faae123f..e1a663eb 100644
--- a/src/common/Network/Acceptor.h
+++ b/src/common/Network/Acceptor.h
@@ -13,7 +13,7 @@
 #include <vector>
 
 
-namespace Sapphire::Network
+namespace Sapphire::Common::Network
 {
 
   class Connection;
diff --git a/src/common/Network/CommonActorControl.h b/src/common/Network/CommonActorControl.h
index b3ecf167..043715f1 100644
--- a/src/common/Network/CommonActorControl.h
+++ b/src/common/Network/CommonActorControl.h
@@ -10,7 +10,7 @@
 // The following enumerations are structures to require their type be included.
 // They are also defined within the Sapphire::Common namespace to avoid collisions.
 // +---------------------------------------------------------------------------
-namespace Sapphire::Network::ActorControl
+namespace Sapphire::Common::Network::ActorControl
 {
 
 enum ActorControlType : uint16_t
diff --git a/src/common/Network/CommonNetwork.h b/src/common/Network/CommonNetwork.h
index 1a2bd4d6..c4a27604 100644
--- a/src/common/Network/CommonNetwork.h
+++ b/src/common/Network/CommonNetwork.h
@@ -5,7 +5,7 @@
 #include <vector>
 #include "PacketDef/Ipcs.h"
 
-namespace Sapphire::Network::Packets
+namespace Sapphire::Common::Network::Packets
 {
 
   /**
diff --git a/src/common/Network/Connection.cpp b/src/common/Network/Connection.cpp
index 21e8bee7..3ac0bee6 100644
--- a/src/common/Network/Connection.cpp
+++ b/src/common/Network/Connection.cpp
@@ -3,7 +3,9 @@
 #include <functional>
 #include "Framework.h"
 
-Sapphire::Network::Connection::Connection( HivePtr hive, FrameworkPtr pFw ) :
+using namespace Sapphire::Common;
+
+Network::Connection::Connection( HivePtr hive, FrameworkPtr pFw ) :
   m_hive( hive ),
   m_socket( hive->getService() ),
   m_io_strand( hive->getService() ),
@@ -13,11 +15,9 @@ Sapphire::Network::Connection::Connection( HivePtr hive, FrameworkPtr pFw ) :
 {
 }
 
-Sapphire::Network::Connection::~Connection()
-{
-}
+Network::Connection::~Connection() = default;
 
-void Sapphire::Network::Connection::bind( const std::string& ip, uint16_t port )
+void Network::Connection::bind( const std::string& ip, uint16_t port )
 {
   asio::ip::tcp::endpoint endpoint( asio::ip::address::from_string( ip ), port );
   m_socket.open( endpoint.protocol() );
@@ -25,7 +25,7 @@ void Sapphire::Network::Connection::bind( const std::string& ip, uint16_t port )
   m_socket.bind( endpoint );
 }
 
-void Sapphire::Network::Connection::startSend()
+void Network::Connection::startSend()
 {
   if( !m_pending_sends.empty() )
   {
@@ -38,7 +38,7 @@ void Sapphire::Network::Connection::startSend()
   }
 }
 
-void Sapphire::Network::Connection::startRecv( int32_t total_bytes )
+void Network::Connection::startRecv( int32_t total_bytes )
 {
   if( total_bytes > 0 )
   {
@@ -61,7 +61,7 @@ void Sapphire::Network::Connection::startRecv( int32_t total_bytes )
   }
 }
 
-void Sapphire::Network::Connection::startError( const asio::error_code& error )
+void Network::Connection::startError( const asio::error_code& error )
 {
   uint32_t v1 = 1;
   uint32_t v2 = 0;
@@ -74,7 +74,7 @@ void Sapphire::Network::Connection::startError( const asio::error_code& error )
   }
 }
 
-void Sapphire::Network::Connection::handleConnect( const asio::error_code& error )
+void Network::Connection::handleConnect( const asio::error_code& error )
 {
   if( error || hasError() || m_hive->hasStopped() )
   {
@@ -94,8 +94,8 @@ void Sapphire::Network::Connection::handleConnect( const asio::error_code& error
   }
 }
 
-void Sapphire::Network::Connection::handleSend( const asio::error_code& error,
-                                                std::list< std::vector< uint8_t > >::iterator itr )
+void Network::Connection::handleSend( const asio::error_code& error,
+                                      std::list< std::vector< uint8_t > >::iterator itr )
 {
   if( error || hasError() || m_hive->hasStopped() )
   {
@@ -109,7 +109,7 @@ void Sapphire::Network::Connection::handleSend( const asio::error_code& error,
   }
 }
 
-void Sapphire::Network::Connection::handleRecv( const asio::error_code& error, int32_t actual_bytes )
+void Network::Connection::handleRecv( const asio::error_code& error, int32_t actual_bytes )
 {
   if( error || hasError() || m_hive->hasStopped() )
   {
@@ -128,7 +128,7 @@ void Sapphire::Network::Connection::handleRecv( const asio::error_code& error, i
   }
 }
 
-void Sapphire::Network::Connection::dispatchSend( std::vector< uint8_t > buffer )
+void Network::Connection::dispatchSend( std::vector< uint8_t > buffer )
 {
   bool should_start_send = m_pending_sends.empty();
   m_pending_sends.push_back( buffer );
@@ -138,7 +138,7 @@ void Sapphire::Network::Connection::dispatchSend( std::vector< uint8_t > buffer
   }
 }
 
-void Sapphire::Network::Connection::dispatchRecv( int32_t total_bytes )
+void Network::Connection::dispatchRecv( int32_t total_bytes )
 {
   bool should_start_receive = m_pending_recvs.empty();
   m_pending_recvs.push_back( total_bytes );
@@ -149,7 +149,7 @@ void Sapphire::Network::Connection::dispatchRecv( int32_t total_bytes )
 }
 
 
-void Sapphire::Network::Connection::connect( const std::string& host, uint16_t port )
+void Network::Connection::connect( const std::string& host, uint16_t port )
 {
   asio::ip::tcp::resolver resolver( m_hive->getService() );
   asio::ip::tcp::resolver::query query( host, std::to_string( port ) );
@@ -160,48 +160,48 @@ void Sapphire::Network::Connection::connect( const std::string& host, uint16_t p
 
 }
 
-void Sapphire::Network::Connection::disconnect()
+void Network::Connection::disconnect()
 {
   onDisconnect();
   m_socket.close();
 }
 
-void Sapphire::Network::Connection::recv( int32_t total_bytes )
+void Network::Connection::recv( int32_t total_bytes )
 {
   m_io_strand.post( std::bind( &Connection::dispatchRecv, shared_from_this(), total_bytes ) );
 }
 
-void Sapphire::Network::Connection::send( const std::vector< uint8_t >& buffer )
+void Network::Connection::send( const std::vector< uint8_t >& buffer )
 {
   m_io_strand.post( std::bind( &Connection::dispatchSend, shared_from_this(), buffer ) );
 }
 
-asio::ip::tcp::socket& Sapphire::Network::Connection::getSocket()
+asio::ip::tcp::socket& Network::Connection::getSocket()
 {
   return m_socket;
 }
 
-asio::strand& Sapphire::Network::Connection::getStrand()
+asio::strand& Network::Connection::getStrand()
 {
   return m_io_strand;
 }
 
-Sapphire::Network::HivePtr Sapphire::Network::Connection::getHive()
+Network::HivePtr Network::Connection::getHive()
 {
   return m_hive;
 }
 
-void Sapphire::Network::Connection::setReceiveBufferSize( int32_t size )
+void Network::Connection::setReceiveBufferSize( int32_t size )
 {
   m_receive_buffer_size = size;
 }
 
-int32_t Sapphire::Network::Connection::getReceiveBufferSize() const
+int32_t Network::Connection::getReceiveBufferSize() const
 {
   return m_receive_buffer_size;
 }
 
-bool Sapphire::Network::Connection::hasError()
+bool Network::Connection::hasError()
 {
   uint32_t v1 = 1;
   uint32_t v2 = 1;
diff --git a/src/common/Network/Connection.h b/src/common/Network/Connection.h
index fbfc85c9..3a4623d2 100644
--- a/src/common/Network/Connection.h
+++ b/src/common/Network/Connection.h
@@ -12,13 +12,13 @@
 #include "Acceptor.h"
 #include <memory>
 
-namespace Sapphire
+namespace Sapphire::Common
 {
   class Framework;
   using FrameworkPtr = std::shared_ptr< Framework >;
 }
 
-namespace Sapphire::Network
+namespace Sapphire::Common::Network
 {
 
   class Hive;
@@ -41,7 +41,7 @@ namespace Sapphire::Network
     std::list< std::vector< uint8_t > > m_pending_sends;
     int32_t m_receive_buffer_size;
     std::atomic< uint32_t > m_error_state;
-    Sapphire::FrameworkPtr m_pFw;
+    FrameworkPtr m_pFw;
 
     Connection( HivePtr hive, FrameworkPtr pFw );
 
diff --git a/src/common/Network/GamePacket.h b/src/common/Network/GamePacket.h
index c1c06b76..f40eadc7 100644
--- a/src/common/Network/GamePacket.h
+++ b/src/common/Network/GamePacket.h
@@ -14,7 +14,7 @@
 #include "CommonNetwork.h"
 #include "PacketDef/Ipcs.h"
 
-namespace Sapphire::Network::Packets
+namespace Sapphire::Common::Network::Packets
 {
 
   // Must forward define these in order to enable the compiler to produce the
diff --git a/src/common/Network/GamePacketParser.cpp b/src/common/Network/GamePacketParser.cpp
index 6a18b718..4577c21e 100644
--- a/src/common/Network/GamePacketParser.cpp
+++ b/src/common/Network/GamePacketParser.cpp
@@ -3,9 +3,10 @@
 
 #include <string.h>   // memcpy
 
-using namespace Sapphire::Network::Packets;
+using namespace Sapphire::Common;
+using namespace Sapphire::Common::Network::Packets;
 
-PacketParseResult Sapphire::Network::Packets::getHeader( const std::vector< uint8_t >& buffer,
+PacketParseResult Network::Packets::getHeader( const std::vector< uint8_t >& buffer,
                                                          const uint32_t offset,
                                                          FFXIVARR_PACKET_HEADER& header )
 {
@@ -25,7 +26,7 @@ PacketParseResult Sapphire::Network::Packets::getHeader( const std::vector< uint
   return Success;
 }
 
-PacketParseResult Sapphire::Network::Packets::getSegmentHeader( const std::vector< uint8_t >& buffer,
+PacketParseResult Network::Packets::getSegmentHeader( const std::vector< uint8_t >& buffer,
                                                                 const uint32_t offset,
                                                                 FFXIVARR_PACKET_SEGMENT_HEADER& header )
 {
@@ -42,7 +43,7 @@ PacketParseResult Sapphire::Network::Packets::getSegmentHeader( const std::vecto
   return Success;
 }
 
-PacketParseResult Sapphire::Network::Packets::getPackets( const std::vector< uint8_t >& buffer,
+PacketParseResult Network::Packets::getPackets( const std::vector< uint8_t >& buffer,
                                                           const uint32_t offset,
                                                           const FFXIVARR_PACKET_HEADER& packetHeader,
                                                           std::vector< FFXIVARR_PACKET_RAW >& packets )
@@ -81,7 +82,7 @@ PacketParseResult Sapphire::Network::Packets::getPackets( const std::vector< uin
   return Success;
 }
 
-PacketParseResult Sapphire::Network::Packets::getPacket( const std::vector< uint8_t >& buffer, const uint32_t offset,
+PacketParseResult Network::Packets::getPacket( const std::vector< uint8_t >& buffer, const uint32_t offset,
                                                          FFXIVARR_PACKET_RAW& packet )
 {
   // Copy segment header
@@ -103,7 +104,7 @@ PacketParseResult Sapphire::Network::Packets::getPacket( const std::vector< uint
   return Success;
 }
 
-bool Sapphire::Network::Packets::checkHeader( const FFXIVARR_PACKET_HEADER& header )
+bool Network::Packets::checkHeader( const FFXIVARR_PACKET_HEADER& header )
 {
   // Max size of the packet is capped at 1MB for now.
   if( header.size > 1 * 1024 * 1024 )
@@ -116,7 +117,7 @@ bool Sapphire::Network::Packets::checkHeader( const FFXIVARR_PACKET_HEADER& head
   return true;
 }
 
-bool Sapphire::Network::Packets::checkSegmentHeader( const FFXIVARR_PACKET_SEGMENT_HEADER& header )
+bool Network::Packets::checkSegmentHeader( const FFXIVARR_PACKET_SEGMENT_HEADER& header )
 {
   // Max size of individual message is capped at 256KB for now.
   if( header.size > 256 * 1024 )
diff --git a/src/common/Network/GamePacketParser.h b/src/common/Network/GamePacketParser.h
index c50b486a..e847a7c4 100644
--- a/src/common/Network/GamePacketParser.h
+++ b/src/common/Network/GamePacketParser.h
@@ -3,7 +3,7 @@
 
 #include "CommonNetwork.h"
 
-namespace Sapphire::Network::Packets
+namespace Sapphire::Common::Network::Packets
 {
 
   enum PacketParseResult
diff --git a/src/common/Network/Hive.cpp b/src/common/Network/Hive.cpp
index 86460b2d..20279869 100644
--- a/src/common/Network/Hive.cpp
+++ b/src/common/Network/Hive.cpp
@@ -2,41 +2,43 @@
 #include <functional>
 #include "Hive.h"
 
+using namespace Sapphire::Common;
+
 //-----------------------------------------------------------------------------
 
-Sapphire::Network::Hive::Hive() :
+Network::Hive::Hive() :
   m_work_ptr( new asio::io_service::work( m_io_service ) ),
   m_shutdown( 0 )
 {
 }
 
-Sapphire::Network::Hive::~Hive()
+Network::Hive::~Hive()
 {
 }
 
-asio::io_service& Sapphire::Network::Hive::getService()
+asio::io_service& Network::Hive::getService()
 {
   return m_io_service;
 }
 
-bool Sapphire::Network::Hive::hasStopped()
+bool Network::Hive::hasStopped()
 {
   uint32_t v1 = 1;
   uint32_t v2 = 1;
   return m_shutdown.compare_exchange_strong( v1, v2 );
 }
 
-void Sapphire::Network::Hive::poll()
+void Network::Hive::poll()
 {
   m_io_service.poll();
 }
 
-void Sapphire::Network::Hive::run()
+void Network::Hive::run()
 {
   m_io_service.run();
 }
 
-void Sapphire::Network::Hive::stop()
+void Network::Hive::stop()
 {
   uint32_t v1 = 1;
   uint32_t v2 = 0;
@@ -48,7 +50,7 @@ void Sapphire::Network::Hive::stop()
   }
 }
 
-void Sapphire::Network::Hive::reset()
+void Network::Hive::reset()
 {
   uint32_t v1 = 0;
   uint32_t v2 = 1;
diff --git a/src/common/Network/Hive.h b/src/common/Network/Hive.h
index c8ea62e5..76e53814 100644
--- a/src/common/Network/Hive.h
+++ b/src/common/Network/Hive.h
@@ -5,7 +5,7 @@
 #include <atomic>
 #include <memory>
 
-namespace Sapphire:: Network
+namespace Sapphire::Common::Network
 {
 
   class Hive : public std::enable_shared_from_this< Hive >
diff --git a/src/common/Network/PacketContainer.cpp b/src/common/Network/PacketContainer.cpp
index d89c8df4..7cff0b48 100644
--- a/src/common/Network/PacketContainer.cpp
+++ b/src/common/Network/PacketContainer.cpp
@@ -7,7 +7,9 @@
 #include <string.h>
 #include <memory>
 
-Sapphire::Network::Packets::PacketContainer::PacketContainer( uint32_t segmentTargetOverride ) :
+using namespace Sapphire::Common;
+
+Network::Packets::PacketContainer::PacketContainer( uint32_t segmentTargetOverride ) :
   m_segmentTargetOverride( segmentTargetOverride )
 {
   memset( &m_ipcHdr, 0, sizeof( FFXIVARR_PACKET_HEADER ) );
@@ -15,12 +17,12 @@ Sapphire::Network::Packets::PacketContainer::PacketContainer( uint32_t segmentTa
   m_ipcHdr.count = 0;
 }
 
-Sapphire::Network::Packets::PacketContainer::~PacketContainer()
+Network::Packets::PacketContainer::~PacketContainer()
 {
   m_entryList.clear();
 }
 
-void Sapphire::Network::Packets::PacketContainer::addPacket( Sapphire::Network::Packets::FFXIVPacketBasePtr entry )
+void Network::Packets::PacketContainer::addPacket( Network::Packets::FFXIVPacketBasePtr entry )
 {
   m_entryList.push_back( entry );
 
@@ -28,7 +30,7 @@ void Sapphire::Network::Packets::PacketContainer::addPacket( Sapphire::Network::
   m_ipcHdr.count++;
 }
 
-void Sapphire::Network::Packets::PacketContainer::fillSendBuffer( std::vector< uint8_t >& sendBuffer )
+void Network::Packets::PacketContainer::fillSendBuffer( std::vector< uint8_t >& sendBuffer )
 {
   std::vector< uint8_t > tempBuffer( m_ipcHdr.size );
   memset( &tempBuffer[ 0 ], 0, m_ipcHdr.size );
@@ -67,7 +69,7 @@ void Sapphire::Network::Packets::PacketContainer::fillSendBuffer( std::vector< u
 
 }
 
-std::string Sapphire::Network::Packets::PacketContainer::toString()
+std::string Network::Packets::PacketContainer::toString()
 {
   std::vector< uint8_t > tmpBuffer;
 
diff --git a/src/common/Network/PacketContainer.h b/src/common/Network/PacketContainer.h
index 80a35cf1..337d73e0 100644
--- a/src/common/Network/PacketContainer.h
+++ b/src/common/Network/PacketContainer.h
@@ -8,7 +8,7 @@
 #include "GamePacket.h"
 #include "Forwards.h"
 
-namespace Sapphire::Network::Packets
+namespace Sapphire::Common::Network::Packets
 {
 
   using FFXIVPacketBasePtr = std::shared_ptr< FFXIVPacketBase >;
diff --git a/src/common/Network/PacketDef/Chat/ServerChatDef.h b/src/common/Network/PacketDef/Chat/ServerChatDef.h
index 755ad3c8..8c6c8e01 100644
--- a/src/common/Network/PacketDef/Chat/ServerChatDef.h
+++ b/src/common/Network/PacketDef/Chat/ServerChatDef.h
@@ -4,10 +4,8 @@
 #include <Common.h>
 #include <Network/CommonNetwork.h>
 
-namespace Sapphire {
-namespace Network {
-namespace Packets {
-namespace Server {
+namespace Sapphire::Common::Network::Packets::Server
+{
 
 /**
 * Structural representation of the packet sent by the server as response
@@ -31,10 +29,7 @@ struct FFXIVIpcTellErrNotFound : FFXIVIpcBasePacket< TellErrNotFound >
   char receipientName[32];
 };
 
-} /* Server */
-} /* Packets */
-} /* Network */
-} /* Sapphire */
+} /* Sapphire::Common::Network::Packets::Server */
 
 
 
diff --git a/src/common/Network/PacketDef/Ipcs.h b/src/common/Network/PacketDef/Ipcs.h
index c6fdac98..5d769f71 100644
--- a/src/common/Network/PacketDef/Ipcs.h
+++ b/src/common/Network/PacketDef/Ipcs.h
@@ -3,7 +3,7 @@
 
 #include <stdint.h>
 
-namespace Sapphire::Network::Packets
+namespace Sapphire::Common::Network::Packets
 {
 
   ////////////////////////////////////////////////////////////////////////////////
diff --git a/src/common/Network/PacketDef/Lobby/ServerLobbyDef.h b/src/common/Network/PacketDef/Lobby/ServerLobbyDef.h
index 57948d4b..d679db5e 100644
--- a/src/common/Network/PacketDef/Lobby/ServerLobbyDef.h
+++ b/src/common/Network/PacketDef/Lobby/ServerLobbyDef.h
@@ -4,10 +4,7 @@
 #include <Common.h>
 #include <Network/CommonNetwork.h>
 
-namespace Sapphire {
-namespace Network {
-namespace Packets {
-namespace Server {
+namespace Sapphire::Common::Network::Packets::Server {
 
 struct FFXIVIpcRetainerList :
   FFXIVIpcBasePacket< LobbyRetainerList >
@@ -152,7 +149,5 @@ struct FFXIVIpcLobbyError : FFXIVIpcBasePacket< LobbyError >
 };
 
 }
-}
-}
-}
+
 #endif
diff --git a/src/common/Network/PacketDef/Zone/ClientZoneDef.h b/src/common/Network/PacketDef/Zone/ClientZoneDef.h
index 3d439dc7..424602d8 100644
--- a/src/common/Network/PacketDef/Zone/ClientZoneDef.h
+++ b/src/common/Network/PacketDef/Zone/ClientZoneDef.h
@@ -4,10 +4,8 @@
 #include <Common.h>
 #include <Network/CommonNetwork.h>
 
-namespace Sapphire {
-namespace Network {
-namespace Packets {
-namespace Client {
+namespace Sapphire::Common::Network::Packets::Client
+{
 
 struct FFXIVIpcGmCommand1 :
   FFXIVIpcBasePacket< GMCommand1 >
@@ -325,9 +323,6 @@ struct FFXIVIpcMarketBoardRequestItemListingInfo :
   /* 0000 */ uint32_t requestId;
 };
 
-}
-}
-}
 }
 
 #endif //_CORE_NETWORK_PACKETS_ZONE_CLIENT_IPC_H
diff --git a/src/common/Network/PacketDef/Zone/ServerZoneDef.h b/src/common/Network/PacketDef/Zone/ServerZoneDef.h
index 80588a04..f95b2736 100644
--- a/src/common/Network/PacketDef/Zone/ServerZoneDef.h
+++ b/src/common/Network/PacketDef/Zone/ServerZoneDef.h
@@ -10,7 +10,7 @@
 #include <Common.h>
 #include <Network/CommonNetwork.h>
 
-namespace Sapphire::Network::Packets::Server
+namespace Sapphire::Common::Network::Packets::Server
 {
 
   /**
diff --git a/src/lobby/Forwards.h b/src/lobby/Forwards.h
index 9cc3ac76..d32f6f16 100644
--- a/src/lobby/Forwards.h
+++ b/src/lobby/Forwards.h
@@ -12,20 +12,24 @@ x ## Ptr make_ ## x( Args &&...args ) { \
 return std::make_shared< x >( std::forward< Args >( args ) ... ); }\
 typedef std::vector< x > x ## PtrList;
 
-namespace Sapphire
+namespace Sapphire::Lobby
 {
   TYPE_FORWARD( LobbySession );
 }
 
-namespace Sapphire::Network
+namespace Sapphire::Lobby::Network
+{
+  TYPE_FORWARD( GameConnection );
+}
+
+namespace Sapphire::Common::Network
 {
   TYPE_FORWARD( Hive );
   TYPE_FORWARD( Acceptor );
   TYPE_FORWARD( Connection );
-  TYPE_FORWARD( GameConnection );
 }
 
-namespace Sapphire::Network::Packets
+namespace Sapphire::Common::Network::Packets
 {
   TYPE_FORWARD( GamePacket );
   TYPE_FORWARD( FFXIVPacketBase );
diff --git a/src/lobby/GameConnection.cpp b/src/lobby/GameConnection.cpp
index 076bb9f6..1fca879b 100644
--- a/src/lobby/GameConnection.cpp
+++ b/src/lobby/GameConnection.cpp
@@ -15,30 +15,30 @@
 #include "RestConnector.h"
 #include "LobbySession.h"
 
-extern Sapphire::ServerLobby g_serverLobby;
-extern Sapphire::Network::RestConnector g_restConnector;
+using namespace Sapphire;
+using namespace Sapphire::Common::Network::Packets;
+using namespace Sapphire::Common::Network::Packets::Server;
 
-using namespace Sapphire::Common;
-using namespace Sapphire::Network::Packets;
-using namespace Sapphire::Network::Packets::Server;
+extern Lobby::ServerLobby g_serverLobby;
+extern Lobby::Network::RestConnector g_restConnector;
 
-Sapphire::Network::GameConnection::GameConnection( Sapphire::Network::HivePtr pHive,
-                                                   Sapphire::Network::AcceptorPtr pAcceptor,
-                                                   FrameworkPtr pFw ) :
-  Connection( pHive, pFw ),
+Lobby::Network::GameConnection::GameConnection( Common::Network::HivePtr pHive,
+                                                Common::Network::AcceptorPtr pAcceptor,
+                                                Common::FrameworkPtr pFw ) :
+  Common::Network::Connection( pHive, pFw ),
   m_pAcceptor( pAcceptor ),
   m_bEncryptionInitialized( false )
 {
 }
 
-Sapphire::Network::GameConnection::~GameConnection()
+Lobby::Network::GameConnection::~GameConnection()
 {
 
 }
 
 
 // overwrite the parents onConnect for our game socket needs
-void Sapphire::Network::GameConnection::onAccept( const std::string& host, uint16_t port )
+void Lobby::Network::GameConnection::onAccept( const std::string& host, uint16_t port )
 {
   auto connection = make_GameConnection( m_hive, m_pAcceptor, m_pFw );
   m_pAcceptor->accept( connection );
@@ -47,17 +47,17 @@ void Sapphire::Network::GameConnection::onAccept( const std::string& host, uint1
 }
 
 
-void Sapphire::Network::GameConnection::onDisconnect()
+void Lobby::Network::GameConnection::onDisconnect()
 {
   Logger::debug( "DISCONNECT" );
 }
 
-void Sapphire::Network::GameConnection::onRecv( std::vector< uint8_t >& buffer )
+void Lobby::Network::GameConnection::onRecv( std::vector< uint8_t >& buffer )
 {
   m_packets.insert( std::end( m_packets ), std::begin( buffer ), std::end( buffer ) );
   // This is assumed packet always start with valid FFXIVARR_PACKET_HEADER for now.
-  Packets::FFXIVARR_PACKET_HEADER packetHeader{};
-  const auto headerResult = Packets::getHeader( m_packets, 0, packetHeader );
+  Common::Network::Packets::FFXIVARR_PACKET_HEADER packetHeader{};
+  const auto headerResult = Common::Network::Packets::getHeader( m_packets, 0, packetHeader );
 
   if( headerResult == Incomplete )
     return;
@@ -70,9 +70,9 @@ void Sapphire::Network::GameConnection::onRecv( std::vector< uint8_t >& buffer )
   }
 
   // Dissect packet list
-  std::vector< Packets::FFXIVARR_PACKET_RAW > packetList;
-  const auto packetResult = Packets::getPackets( m_packets, sizeof( struct FFXIVARR_PACKET_HEADER ),
-                                                 packetHeader, packetList );
+  std::vector< Common::Network::Packets::FFXIVARR_PACKET_RAW > packetList;
+  const auto packetResult = Common::Network::Packets::getPackets( m_packets, sizeof( struct FFXIVARR_PACKET_HEADER ),
+                                                                  packetHeader, packetList );
 
   if( packetResult == Incomplete )
     return;
@@ -90,13 +90,13 @@ void Sapphire::Network::GameConnection::onRecv( std::vector< uint8_t >& buffer )
 
 }
 
-void Sapphire::Network::GameConnection::onError( const asio::error_code& error )
+void Lobby::Network::GameConnection::onError( const asio::error_code& error )
 {
   Logger::info( "GameConnection closed: {0}", error.message() );
 }
 
 void
-Sapphire::Network::GameConnection::sendError( uint64_t sequence, uint32_t errorcode, uint16_t messageId, uint32_t tmpId )
+Lobby::Network::GameConnection::sendError( uint64_t sequence, uint32_t errorcode, uint16_t messageId, uint32_t tmpId )
 {
   auto errorPacket = makeLobbyPacket< FFXIVIpcLobbyError >( tmpId );
   errorPacket->data().seq = sequence;
@@ -108,7 +108,7 @@ Sapphire::Network::GameConnection::sendError( uint64_t sequence, uint32_t errorc
   sendPacket( pRP );
 }
 
-void Sapphire::Network::GameConnection::getCharList( FFXIVARR_PACKET_RAW& packet, uint32_t tmpId )
+void Lobby::Network::GameConnection::getCharList( FFXIVARR_PACKET_RAW& packet, uint32_t tmpId )
 {
   uint64_t sequence = *reinterpret_cast< uint64_t* >( &packet.data[ 0 ] + 0x10 );
   Logger::info( "Sequence [{0}]", sequence );
@@ -192,7 +192,7 @@ void Sapphire::Network::GameConnection::getCharList( FFXIVARR_PACKET_RAW& packet
   }
 }
 
-void Sapphire::Network::GameConnection::enterWorld( FFXIVARR_PACKET_RAW& packet, uint32_t tmpId )
+void Lobby::Network::GameConnection::enterWorld( FFXIVARR_PACKET_RAW& packet, uint32_t tmpId )
 {
   uint64_t sequence = *reinterpret_cast< uint64_t* >( &packet.data[ 0 ] + 0x10 );
   Logger::info( "Sequence [{0}]", sequence );
@@ -234,7 +234,7 @@ void Sapphire::Network::GameConnection::enterWorld( FFXIVARR_PACKET_RAW& packet,
   sendPacket( pRP );
 }
 
-bool Sapphire::Network::GameConnection::sendServiceAccountList( FFXIVARR_PACKET_RAW& packet, uint32_t tmpId )
+bool Lobby::Network::GameConnection::sendServiceAccountList( FFXIVARR_PACKET_RAW& packet, uint32_t tmpId )
 {
   LobbySessionPtr pSession = g_serverLobby.getSession( ( char* ) &packet.data[ 0 ] + 0x22 );
 
@@ -273,7 +273,7 @@ bool Sapphire::Network::GameConnection::sendServiceAccountList( FFXIVARR_PACKET_
   return false;
 }
 
-bool Sapphire::Network::GameConnection::createOrModifyChar( FFXIVARR_PACKET_RAW& packet, uint32_t tmpId )
+bool Lobby::Network::GameConnection::createOrModifyChar( FFXIVARR_PACKET_RAW& packet, uint32_t tmpId )
 {
   uint64_t sequence = *reinterpret_cast< uint64_t* >( &packet.data[ 0 ] + 0x10 );
   uint8_t type = *reinterpret_cast< uint8_t* >( &packet.data[ 0 ] + 0x29 );
@@ -381,7 +381,7 @@ bool Sapphire::Network::GameConnection::createOrModifyChar( FFXIVARR_PACKET_RAW&
   return false;
 }
 
-void Sapphire::Network::GameConnection::handleGamePacket( Packets::FFXIVARR_PACKET_RAW& packet )
+void Lobby::Network::GameConnection::handleGamePacket( Common::Network::Packets::FFXIVARR_PACKET_RAW& packet )
 {
 
   uint32_t tmpId = packet.segHdr.target_actor;
@@ -419,7 +419,7 @@ void Sapphire::Network::GameConnection::handleGamePacket( Packets::FFXIVARR_PACK
 
 }
 
-void Sapphire::Network::GameConnection::sendPacket( Packets::LobbyPacketContainer& pLpc )
+void Lobby::Network::GameConnection::sendPacket( Packets::LobbyPacketContainer& pLpc )
 {
   uint16_t size = pLpc.getSize();
   uint8_t* dataPtr = pLpc.getRawData( false );
@@ -428,7 +428,7 @@ void Sapphire::Network::GameConnection::sendPacket( Packets::LobbyPacketContaine
   send( sendBuffer );
 }
 
-void Sapphire::Network::GameConnection::sendPackets( Packets::PacketContainer* pPacket )
+void Lobby::Network::GameConnection::sendPackets( Common::Network::Packets::PacketContainer* pPacket )
 {
   std::vector< uint8_t > sendBuffer;
 
@@ -436,14 +436,14 @@ void Sapphire::Network::GameConnection::sendPackets( Packets::PacketContainer* p
   send( sendBuffer );
 }
 
-void Sapphire::Network::GameConnection::sendSinglePacket( FFXIVPacketBasePtr pPacket )
+void Lobby::Network::GameConnection::sendSinglePacket( FFXIVPacketBasePtr pPacket )
 {
   PacketContainer pRP = PacketContainer();
   pRP.addPacket( pPacket );
   sendPackets( &pRP );
 }
 
-void Sapphire::Network::GameConnection::generateEncryptionKey( uint32_t key, const std::string& keyPhrase )
+void Lobby::Network::GameConnection::generateEncryptionKey( uint32_t key, const std::string& keyPhrase )
 {
   memset( m_baseKey, 0, 0x2C );
   m_baseKey[ 0 ] = 0x78;
@@ -454,11 +454,11 @@ void Sapphire::Network::GameConnection::generateEncryptionKey( uint32_t key, con
   m_baseKey[ 8 ] = 0xC6;
   m_baseKey[ 9 ] = 0x11;
   memcpy( ( char* ) m_baseKey + 0x0C, keyPhrase.c_str(), keyPhrase.size() );
-  Sapphire::Util::md5( m_baseKey, m_encKey, 0x2C );
+  Common::Util::md5( m_baseKey, m_encKey, 0x2C );
 }
 
-void Sapphire::Network::GameConnection::handlePackets( const Sapphire::Network::Packets::FFXIVARR_PACKET_HEADER& ipcHeader,
-                                                       const std::vector< Sapphire::Network::Packets::FFXIVARR_PACKET_RAW >& packetData )
+void Lobby::Network::GameConnection::handlePackets( const Common::Network::Packets::FFXIVARR_PACKET_HEADER& ipcHeader,
+                                                    const std::vector< Common::Network::Packets::FFXIVARR_PACKET_RAW >& packetData )
 {
 
   for( auto inPacket : packetData )
diff --git a/src/lobby/GameConnection.h b/src/lobby/GameConnection.h
index 42f0a3a2..a04a84f0 100644
--- a/src/lobby/GameConnection.h
+++ b/src/lobby/GameConnection.h
@@ -16,10 +16,10 @@
 
 #define DECLARE_HANDLER( x ) void x( Packets::GamePacketPtr pInPacket, Entity::PlayerPtr pPlayer )
 
-namespace Sapphire::Network
+namespace Sapphire::Lobby::Network
 {
 
-  class GameConnection : public Connection
+  class GameConnection : public Common::Network::Connection
   {
 
   private:
@@ -32,16 +32,16 @@ namespace Sapphire::Network
 
     bool m_bEncryptionInitialized;
 
-    AcceptorPtr m_pAcceptor;
+    Common::Network::AcceptorPtr m_pAcceptor;
 
     LobbySessionPtr m_pSession;
 
-    Common::Util::LockedQueue< Packets::GamePacketPtr > m_inQueue;
-    Common::Util::LockedQueue< Packets::GamePacketPtr > m_outQueue;
+    Common::Util::LockedQueue< Common::Network::Packets::GamePacketPtr > m_inQueue;
+    Common::Util::LockedQueue< Common::Network::Packets::GamePacketPtr > m_outQueue;
     std::vector< uint8_t > m_packets;
 
   public:
-    GameConnection( HivePtr pHive, AcceptorPtr pAcceptor, FrameworkPtr pFw );
+    GameConnection( Common::Network::HivePtr pHive, Common::Network::AcceptorPtr pAcceptor, Common::FrameworkPtr pFw );
 
     ~GameConnection();
 
@@ -58,26 +58,26 @@ namespace Sapphire::Network
 
     void sendError( uint64_t sequence, uint32_t errorcode, uint16_t messageId, uint32_t tmpId );
 
-    void getCharList( Packets::FFXIVARR_PACKET_RAW& packet, uint32_t tmpId );
+    void getCharList( Common::Network::Packets::FFXIVARR_PACKET_RAW& packet, uint32_t tmpId );
 
-    void enterWorld( Packets::FFXIVARR_PACKET_RAW& packet, uint32_t tmpId );
+    void enterWorld( Common::Network::Packets::FFXIVARR_PACKET_RAW& packet, uint32_t tmpId );
 
-    bool sendServiceAccountList( Packets::FFXIVARR_PACKET_RAW& packet, uint32_t tmpId );
+    bool sendServiceAccountList( Common::Network::Packets::FFXIVARR_PACKET_RAW& packet, uint32_t tmpId );
 
-    bool createOrModifyChar( Packets::FFXIVARR_PACKET_RAW& packet, uint32_t tmpId );
+    bool createOrModifyChar( Common::Network::Packets::FFXIVARR_PACKET_RAW& packet, uint32_t tmpId );
 
-    void handlePackets( const Packets::FFXIVARR_PACKET_HEADER& ipcHeader,
-                        const std::vector< Packets::FFXIVARR_PACKET_RAW >& packetData );
+    void handlePackets( const Common::Network::Packets::FFXIVARR_PACKET_HEADER& ipcHeader,
+                        const std::vector< Common::Network::Packets::FFXIVARR_PACKET_RAW >& packetData );
 
-    void handleGamePacket( Packets::FFXIVARR_PACKET_RAW& pPacket );
+    void handleGamePacket( Common::Network::Packets::FFXIVARR_PACKET_RAW& pPacket );
 
-    void handlePacket( Packets::FFXIVPacketBasePtr pPacket );
+    void handlePacket( Common::Network::Packets::FFXIVPacketBasePtr pPacket );
 
-    void sendPackets( Packets::PacketContainer* pPacket );
+    void sendPackets( Common::Network::Packets::PacketContainer* pPacket );
 
     void sendPacket( Packets::LobbyPacketContainer& pLpc );
 
-    void sendSinglePacket( Packets::FFXIVPacketBasePtr pPacket );
+    void sendSinglePacket( Common::Network::Packets::FFXIVPacketBasePtr pPacket );
 
 
   };
diff --git a/src/lobby/LobbyPacketContainer.cpp b/src/lobby/LobbyPacketContainer.cpp
index c1c7366c..8b81c3d8 100644
--- a/src/lobby/LobbyPacketContainer.cpp
+++ b/src/lobby/LobbyPacketContainer.cpp
@@ -4,25 +4,26 @@
 #include <Crypt/blowfish.h>
 #include <Common.h>
 
+using namespace Sapphire;
 using namespace Sapphire::Common;
-using namespace Sapphire::Network::Packets;
+using namespace Sapphire::Common::Network::Packets;
 
-Sapphire::Network::Packets::LobbyPacketContainer::LobbyPacketContainer( uint8_t* encKey )
+Lobby::Network::Packets::LobbyPacketContainer::LobbyPacketContainer( uint8_t* encKey )
 {
-  memset( &m_header, 0, sizeof( Sapphire::Network::Packets::FFXIVARR_PACKET_HEADER ) );
-  m_header.size = sizeof( Sapphire::Network::Packets::FFXIVARR_PACKET_HEADER );
+  memset( &m_header, 0, sizeof( Common::Network::Packets::FFXIVARR_PACKET_HEADER ) );
+  m_header.size = sizeof( Common::Network::Packets::FFXIVARR_PACKET_HEADER );
 
   m_encKey = encKey;
 
   memset( m_dataBuf, 0, 0x1570 );
 }
 
-Sapphire::Network::Packets::LobbyPacketContainer::~LobbyPacketContainer()
+Lobby::Network::Packets::LobbyPacketContainer::~LobbyPacketContainer()
 {
   m_entryList.clear();
 }
 
-void Sapphire::Network::Packets::LobbyPacketContainer::addPacket( FFXIVPacketBasePtr pEntry )
+void Lobby::Network::Packets::LobbyPacketContainer::addPacket( FFXIVPacketBasePtr pEntry )
 {
   memcpy( m_dataBuf + m_header.size, &pEntry->getData()[ 0 ], pEntry->getSize() );
 
@@ -38,18 +39,18 @@ void Sapphire::Network::Packets::LobbyPacketContainer::addPacket( FFXIVPacketBas
   m_header.count++;
 }
 
-uint16_t Sapphire::Network::Packets::LobbyPacketContainer::getSize() const
+uint16_t Lobby::Network::Packets::LobbyPacketContainer::getSize() const
 {
   return m_header.size;
 }
 
-uint8_t* Sapphire::Network::Packets::LobbyPacketContainer::getRawData( bool addstuff )
+uint8_t* Lobby::Network::Packets::LobbyPacketContainer::getRawData( bool addstuff )
 {
   if( addstuff )
   {
     m_header.unknown_0 = 0xff41a05252;
     m_header.timestamp = Common::Util::getTimeMs();
   }
-  memcpy( m_dataBuf, &m_header, sizeof( Sapphire::Network::Packets::FFXIVARR_PACKET_HEADER ) );
+  memcpy( m_dataBuf, &m_header, sizeof( Common::Network::Packets::FFXIVARR_PACKET_HEADER ) );
   return m_dataBuf;
 }
diff --git a/src/lobby/LobbyPacketContainer.h b/src/lobby/LobbyPacketContainer.h
index 9f40ef93..f6c714a8 100644
--- a/src/lobby/LobbyPacketContainer.h
+++ b/src/lobby/LobbyPacketContainer.h
@@ -9,10 +9,10 @@
 
 #include "Forwards.h"
 
-namespace Sapphire::Network::Packets
+namespace Sapphire::Lobby::Network::Packets
 {
 
-  using FFXIVPacketBasePtr = std::shared_ptr< FFXIVPacketBase >;
+  using FFXIVPacketBasePtr = std::shared_ptr< Common::Network::Packets::FFXIVPacketBase >;
 
   class LobbyPacketContainer
   {
@@ -28,7 +28,7 @@ namespace Sapphire::Network::Packets
     uint8_t* getRawData( bool addstuff = true );
 
   private:
-    Sapphire::Network::Packets::FFXIVARR_PACKET_HEADER m_header;
+    Common::Network::Packets::FFXIVARR_PACKET_HEADER m_header;
 
     uint8_t* m_encKey;
 
diff --git a/src/lobby/LobbySession.cpp b/src/lobby/LobbySession.cpp
index 4cdd58b8..dc30fae2 100644
--- a/src/lobby/LobbySession.cpp
+++ b/src/lobby/LobbySession.cpp
@@ -1,6 +1,7 @@
 #include "LobbySession.h"
 
-namespace Sapphire {
+using namespace Sapphire::Lobby;
+
 LobbySession::LobbySession( void )
 {
   //setSocket(NULL);
@@ -11,5 +12,4 @@ LobbySession::~LobbySession( void )
 {
 
 }
-}
 
diff --git a/src/lobby/LobbySession.h b/src/lobby/LobbySession.h
index 95eeb5f8..66a77c27 100644
--- a/src/lobby/LobbySession.h
+++ b/src/lobby/LobbySession.h
@@ -7,7 +7,7 @@
 #include <string>
 #include <string.h>
 
-namespace Sapphire
+namespace Sapphire::Lobby
 {
 
   class LobbySession
diff --git a/src/lobby/RestConnector.cpp b/src/lobby/RestConnector.cpp
index 94c988f0..738af406 100644
--- a/src/lobby/RestConnector.cpp
+++ b/src/lobby/RestConnector.cpp
@@ -8,19 +8,21 @@
 
 #include <nlohmann/json.hpp>
 
+using namespace Sapphire;
+
 typedef std::vector< std::tuple< std::string, uint32_t, uint64_t, std::string > > CharList;
 
-Sapphire::Network::RestConnector::RestConnector()
+Lobby::Network::RestConnector::RestConnector()
 {
 
 }
 
-Sapphire::Network::RestConnector::~RestConnector()
+Lobby::Network::RestConnector::~RestConnector()
 {
 
 }
 
-HttpResponse Sapphire::Network::RestConnector::requestApi( std::string endpoint, std::string data )
+HttpResponse Lobby::Network::RestConnector::requestApi( std::string endpoint, std::string data )
 {
   HttpClient client( restHost );
 
@@ -39,7 +41,7 @@ HttpResponse Sapphire::Network::RestConnector::requestApi( std::string endpoint,
   return r;
 }
 
-Sapphire::LobbySessionPtr Sapphire::Network::RestConnector::getSession( char* sId )
+Lobby::LobbySessionPtr Lobby::Network::RestConnector::getSession( char* sId )
 {
   std::string json_string = "{\"sId\": \"" + std::string( sId ) + "\",\"secret\": \"" + serverSecret + "\"}";
 
@@ -65,7 +67,7 @@ Sapphire::LobbySessionPtr Sapphire::Network::RestConnector::getSession( char* sI
 
     if( content.find( "invalid" ) == std::string::npos )
     {
-      LobbySessionPtr pSession( new Sapphire::LobbySession() );
+      LobbySessionPtr pSession( new Lobby::LobbySession() );
       pSession->setAccountID( json["result"].get< uint32_t >() );
       pSession->setSessionId( ( uint8_t* ) sId );
       return pSession;
@@ -81,7 +83,7 @@ Sapphire::LobbySessionPtr Sapphire::Network::RestConnector::getSession( char* sI
   }
 }
 
-bool Sapphire::Network::RestConnector::checkNameTaken( std::string name )
+bool Lobby::Network::RestConnector::checkNameTaken( std::string name )
 {
   std::string json_string = "{\"name\": \"" + name + "\",\"secret\": \"" + serverSecret + "\"}";
 
@@ -115,7 +117,7 @@ bool Sapphire::Network::RestConnector::checkNameTaken( std::string name )
   }
 }
 
-uint32_t Sapphire::Network::RestConnector::getNextCharId()
+uint32_t Lobby::Network::RestConnector::getNextCharId()
 {
   std::string json_string = "{\"secret\": \"" + serverSecret + "\"}";
 
@@ -154,7 +156,7 @@ uint32_t Sapphire::Network::RestConnector::getNextCharId()
   }
 }
 
-uint64_t Sapphire::Network::RestConnector::getNextContentId()
+uint64_t Lobby::Network::RestConnector::getNextContentId()
 {
   std::string json_string = "{\"secret\": \"" + serverSecret + "\"}";
 
@@ -193,7 +195,7 @@ uint64_t Sapphire::Network::RestConnector::getNextContentId()
   }
 }
 
-CharList Sapphire::Network::RestConnector::getCharList( char* sId )
+CharList Lobby::Network::RestConnector::getCharList( char* sId )
 {
   std::string json_string = "{\"sId\": \"" + std::string( sId, 56 ) + "\",\"secret\": \"" + serverSecret + "\"}";
 
@@ -249,7 +251,7 @@ CharList Sapphire::Network::RestConnector::getCharList( char* sId )
   }
 }
 
-bool Sapphire::Network::RestConnector::deleteCharacter( char* sId, std::string name )
+bool Lobby::Network::RestConnector::deleteCharacter( char* sId, std::string name )
 {
   std::string json_string =
     "{\"sId\": \"" + std::string( sId, 56 ) + "\",\"secret\": \"" + serverSecret + "\",\"name\": \"" + name + "\"}";
@@ -283,11 +285,11 @@ bool Sapphire::Network::RestConnector::deleteCharacter( char* sId, std::string n
   }
 }
 
-int Sapphire::Network::RestConnector::createCharacter( char* sId, std::string name, std::string infoJson )
+int Lobby::Network::RestConnector::createCharacter( char* sId, std::string name, std::string infoJson )
 {
   std::string json_string =
     "{\"sId\": \"" + std::string( sId, 56 ) + "\",\"secret\": \"" + serverSecret + "\",\"name\": \"" + name +
-    "\",\"infoJson\": \"" + Sapphire::Util::base64Encode( ( uint8_t* ) infoJson.c_str(), infoJson.length() ) + "\"}";
+    "\",\"infoJson\": \"" + Common::Util::base64Encode( ( uint8_t* ) infoJson.c_str(), infoJson.length() ) + "\"}";
 
   HttpResponse r = requestApi( "createCharacter", json_string );
 
diff --git a/src/lobby/RestConnector.h b/src/lobby/RestConnector.h
index b8c2935c..05461535 100644
--- a/src/lobby/RestConnector.h
+++ b/src/lobby/RestConnector.h
@@ -15,7 +15,7 @@ namespace Sapphire
   class Session;
 }
 
-namespace Sapphire::Network
+namespace Sapphire::Lobby::Network
 {
   class LobbySession;
 
diff --git a/src/lobby/ServerLobby.cpp b/src/lobby/ServerLobby.cpp
index 9d243624..68076f72 100644
--- a/src/lobby/ServerLobby.cpp
+++ b/src/lobby/ServerLobby.cpp
@@ -21,9 +21,9 @@
 
 #include <thread>
 
-Sapphire::Network::RestConnector g_restConnector;
+Sapphire::Lobby::Network::RestConnector g_restConnector;
 
-namespace Sapphire
+namespace Sapphire::Lobby
 {
 
 
@@ -31,7 +31,7 @@ namespace Sapphire
     m_configPath( configPath ),
     m_numConnections( 0 )
   {
-    m_pConfig = std::make_shared< ConfigMgr >();
+    m_pConfig = std::make_shared< Sapphire::Common::ConfigMgr >();
   }
 
   LobbySessionPtr ServerLobby::getSession( char* sessionId )
@@ -63,15 +63,15 @@ namespace Sapphire
 
     Logger::setLogLevel( m_config.global.general.logLevel );
 
-    auto pFw = std::make_shared< Framework >();
-    Network::HivePtr hive( new Network::Hive() );
-    Network::addServerToHive< Network::GameConnection >( m_ip, m_port, hive, pFw );
+    auto pFw = std::make_shared< Common::Framework >();
+    Common::Network::HivePtr hive( new Common::Network::Hive() );
+    Common::Network::addServerToHive< Network::GameConnection >( m_ip, m_port, hive, pFw );
 
     Logger::info( "Lobby server running on {0}:{1}", m_ip, m_port );
 
     std::vector< std::thread > threadGroup;
 
-    threadGroup.emplace_back( std::bind( &Network::Hive::run, hive.get() ) );
+    threadGroup.emplace_back( std::bind( &Common::Network::Hive::run, hive.get() ) );
 
     for( auto& thread : threadGroup )
       if( thread.joinable() )
diff --git a/src/lobby/ServerLobby.h b/src/lobby/ServerLobby.h
index 99e091ef..c258257a 100644
--- a/src/lobby/ServerLobby.h
+++ b/src/lobby/ServerLobby.h
@@ -9,10 +9,14 @@
 
 const std::string LOBBY_VERSION = "0.0.5";
 
-namespace Sapphire
+namespace Sapphire::Common
+{
+  class ConfigMgr;
+}
+
+namespace Sapphire::Lobby
 {
   class LobbySession;
-  class ConfigMgr;
 
   using LobbySessionMap = std::map< std::string, LobbySessionPtr >;
 
@@ -29,7 +33,7 @@ namespace Sapphire
     uint16_t m_port;
     std::string m_ip;
 
-    std::shared_ptr< ConfigMgr > m_pConfig;
+    std::shared_ptr< Sapphire::Common::ConfigMgr > m_pConfig;
 
   public:
     ServerLobby( const std::string& configPath );
diff --git a/src/lobby/mainLobbyServer.cpp b/src/lobby/mainLobbyServer.cpp
index 957604c8..eb3c7653 100644
--- a/src/lobby/mainLobbyServer.cpp
+++ b/src/lobby/mainLobbyServer.cpp
@@ -4,7 +4,7 @@
 
 Sapphire::Common::Util::CrashHandler crashHandler;
 
-Sapphire::ServerLobby g_serverLobby( "lobby.ini" );
+Sapphire::Lobby::ServerLobby g_serverLobby( "lobby.ini" );
 
 int main( int32_t argc, char* argv[] )
 {
diff --git a/src/world/Action/Action.h b/src/world/Action/Action.h
index 9f6671ad..6f3fccca 100644
--- a/src/world/Action/Action.h
+++ b/src/world/Action/Action.h
@@ -130,8 +130,6 @@ namespace Sapphire::World::Action
 
   protected:
 
-    void calculateActionCost();
-
     bool primaryCostCheck( bool subtractCosts );
     bool secondaryCostCheck( bool subtractCosts );
 
diff --git a/src/world/Network/GameConnection.h b/src/world/Network/GameConnection.h
index 56a8fc5d..b5063698 100644
--- a/src/world/Network/GameConnection.h
+++ b/src/world/Network/GameConnection.h
@@ -28,12 +28,12 @@ namespace Sapphire::Network
     None
   };
 
-  class GameConnection : public Connection
+  class GameConnection : public Common::Network::Connection
   {
 
   private:
     typedef void ( GameConnection::* Handler )( FrameworkPtr pFw,
-                                                const Sapphire::Network::Packets::FFXIVARR_PACKET_RAW& inPacket,
+                                                const Common::Network::Packets::FFXIVARR_PACKET_RAW& inPacket,
                                                 Entity::Player& player );
 
     using HandlerMap = std::map< uint16_t, Handler >;
@@ -51,7 +51,7 @@ namespace Sapphire::Network
 
     World::SessionPtr m_pSession;
 
-    Common::Util::LockedQueue< Sapphire::Network::Packets::FFXIVARR_PACKET_RAW > m_inQueue;
+    Common::Util::LockedQueue< Common::Network::Packets::FFXIVARR_PACKET_RAW > m_inQueue;
     Common::Util::LockedQueue< Packets::FFXIVPacketBasePtr > m_outQueue;
     std::vector< uint8_t > m_packets;
 

From 5dc4b94f106fd4c57e33fed5c169aeac08b09f72 Mon Sep 17 00:00:00 2001
From: NotAdam <adam@notadam.me>
Date: Mon, 3 Jun 2019 00:21:58 +1000
Subject: [PATCH 051/351] some cleanup, move lobby to Sapphire::Lobby

---
 src/api/Forwards.h                            | 89 -------------------
 src/api/LoginSession.cpp                      | 14 ---
 src/api/LoginSession.h                        | 57 ------------
 src/api/PlayerMinimal.cpp                     |  2 +-
 src/api/PlayerMinimal.h                       |  2 +-
 src/api/SapphireAPI.cpp                       | 34 +++----
 src/api/SapphireAPI.h                         |  8 +-
 src/api/Session.cpp                           |  4 +-
 src/api/Session.h                             |  2 +-
 src/api/main.cpp                              |  7 +-
 src/common/Forwards.h                         | 10 ++-
 src/common/Framework.h                        |  2 +-
 src/common/Network/Acceptor.cpp               |  2 +-
 src/common/Network/Acceptor.h                 |  2 +-
 src/common/Network/CommonActorControl.h       |  2 +-
 src/common/Network/CommonNetwork.h            |  2 +-
 src/common/Network/Connection.cpp             |  2 +-
 src/common/Network/Connection.h               |  8 +-
 src/common/Network/GamePacket.h               |  2 +-
 src/common/Network/GamePacketParser.cpp       |  4 +-
 src/common/Network/GamePacketParser.h         |  2 +-
 src/common/Network/Hive.cpp                   |  2 +-
 src/common/Network/Hive.h                     |  2 +-
 src/common/Network/PacketContainer.cpp        |  2 +-
 src/common/Network/PacketContainer.h          |  2 +-
 .../Network/PacketDef/Chat/ServerChatDef.h    |  2 +-
 src/common/Network/PacketDef/Ipcs.h           |  2 +-
 .../Network/PacketDef/Lobby/ServerLobbyDef.h  |  2 +-
 .../Network/PacketDef/Zone/ClientZoneDef.h    |  2 +-
 .../Network/PacketDef/Zone/ServerZoneDef.h    |  2 +-
 src/common/Vector3.cpp                        |  4 +-
 src/common/Version.cpp.in                     | 11 ++-
 src/dbm/DbManager.cpp                         |  5 +-
 src/lobby/Forwards.h                          |  9 +-
 src/lobby/GameConnection.cpp                  | 30 ++++---
 src/lobby/GameConnection.h                    | 30 +++----
 src/lobby/LobbyPacketContainer.cpp            |  8 +-
 src/lobby/LobbyPacketContainer.h              |  4 +-
 src/lobby/ServerLobby.cpp                     | 10 ++-
 src/world/Network/GameConnection.h            | 14 +--
 src/world/ServerMgr.cpp                       |  6 +-
 src/world/mainGameServer.cpp                  |  2 +-
 42 files changed, 126 insertions(+), 282 deletions(-)
 delete mode 100644 src/api/Forwards.h
 delete mode 100644 src/api/LoginSession.cpp
 delete mode 100644 src/api/LoginSession.h

diff --git a/src/api/Forwards.h b/src/api/Forwards.h
deleted file mode 100644
index 8c50d1ff..00000000
--- a/src/api/Forwards.h
+++ /dev/null
@@ -1,89 +0,0 @@
-#ifndef _FORWARDS_H
-#define _FORWARDS_H
-
-#include <memory>
-
-namespace Sapphire
-{
-  class Cell;
-  class Zone;
-  class Item;
-  class ItemContainer;
-  class Inventory;
-  class Session;
-  class ZonePosition;
-  using ZonePtr = std::shared_ptr< Zone >;
-  using ItemPtr =  std::shared_ptr< Item >;
-  using ItemContainerPtr = std::shared_ptr< ItemContainer >;
-  using InventoryPtr = std::shared_ptr< Inventory >;
-  using SessionPtr = std::shared_ptr< Session >;
-  using ZonePositionPtr = std::shared_ptr< ZonePosition >;
-
-  namespace StatusEffect
-  {
-    class StatusEffect;
-    class StatusEffectContainer;
-    using StatusEffectPtr = std::shared_ptr< StatusEffect >;
-    using StatusEffectContainerPtr = std::shared_ptr< StatusEffectContainer >;
-  }
-
-  namespace Entity
-  {
-    class Chara;
-    class Player;
-    class BattleNpc;
-    using ActorPtr = std::shared_ptr< Chara >;
-    using PlayerPtr = std::shared_ptr< Player >;
-    using BattleNpcPtr = std::shared_ptr< BattleNpc >;
-  }
-
-  namespace Event
-  {
-    class EventHandler;
-    using EventPtr = std::shared_ptr< EventHandler >;
-  }
-
-  namespace Action
-  {
-    class Action;
-    class ActionTeleport;
-    class EventAction;
-    using ActionPtr = std::shared_ptr< Action >;
-    using ActionTeleportPtr = std::shared_ptr< ActionTeleport >;
-    using EventActionPtr = std::shared_ptr< EventAction >;
-  }
-
-  namespace Network
-  {
-    class Hive;
-    class Acceptor;
-    class Connection;
-    class WorldConnection;
-    class SessionConnection;
-    class ZoneConnection;
-    using HivePtr = std::shared_ptr< Hive >;
-    using AcceptorPtr = std::shared_ptr< Acceptor >;
-    using ConnectionPtr = std::shared_ptr< Connection >;
-    using WorldConnectionPtr = std::shared_ptr< WorldConnection >;
-    using ZoneConnectionPtr = std::shared_ptr< ZoneConnection >;
-    using SessionConnectionPtr = std::shared_ptr< SessionConnection >;
-
-    namespace Packets
-    {
-      class GamePacket;
-      using GamePacketPtr = std::shared_ptr< GamePacket >;
-    }
-
-  }
-
-  namespace Scripting
-  {
-  using EventReturnCallback = std::function< void( Entity::Player&, uint32_t, uint16_t, uint16_t, uint16_t,
-                                                   uint16_t ) >;
-  }
-
-  using ActionCallback = std::function< void( Entity::Player&, uint32_t, uint64_t ) >;
-
-}
-
-#endif
diff --git a/src/api/LoginSession.cpp b/src/api/LoginSession.cpp
deleted file mode 100644
index 9b947d19..00000000
--- a/src/api/LoginSession.cpp
+++ /dev/null
@@ -1,14 +0,0 @@
-#include "LoginSession.h"
-
-namespace Sapphire {
-  LoginSession::LoginSession( void )
-  {
-    //setSocket(NULL);
-  }
-
-  LoginSession::~LoginSession( void )
-  {
-
-  }
-}
-
diff --git a/src/api/LoginSession.h b/src/api/LoginSession.h
deleted file mode 100644
index 1811bf09..00000000
--- a/src/api/LoginSession.h
+++ /dev/null
@@ -1,57 +0,0 @@
-#pragma once
-
-#ifndef _CLoginSession_H_
-#define _CLoginSession_H_
-
-#include <stdint.h>
-#include <string>
-#include <string.h>
-
-namespace Sapphire
-{
-
-  class LoginSession
-  {
-
-  private:
-    uint32_t m_ip;
-    uint32_t m_accountId;
-    uint8_t m_sessionId[56];
-
-  public:
-    std::string newCharName;
-
-    LoginSession( void );
-
-    ~LoginSession( void );
-
-    uint32_t getIp()
-    {
-      return m_ip;
-    }
-
-    void setSessionId( uint8_t* sessionId )
-    {
-      memcpy( m_sessionId, sessionId, 56 );
-    }
-
-    void setIp( uint32_t ip )
-    {
-      m_ip = ip;
-    }
-
-    uint32_t getAccountId()
-    {
-      return m_accountId;
-    }
-
-    void setAccountId( uint32_t id )
-    {
-      m_accountId = id;
-    }
-
-  };
-
-}
-
-#endif
diff --git a/src/api/PlayerMinimal.cpp b/src/api/PlayerMinimal.cpp
index 70aeca40..37d08121 100644
--- a/src/api/PlayerMinimal.cpp
+++ b/src/api/PlayerMinimal.cpp
@@ -8,7 +8,7 @@
 
 extern Sapphire::Data::ExdDataGenerated g_exdDataGen;
 
-namespace Sapphire {
+namespace Sapphire::API {
 
 using namespace Common;
 
diff --git a/src/api/PlayerMinimal.h b/src/api/PlayerMinimal.h
index dda3202e..a9af97bb 100644
--- a/src/api/PlayerMinimal.h
+++ b/src/api/PlayerMinimal.h
@@ -5,7 +5,7 @@
 #include <stdint.h>
 #include <string.h>
 
-namespace Sapphire
+namespace Sapphire::API
 {
 
   class PlayerMinimal
diff --git a/src/api/SapphireAPI.cpp b/src/api/SapphireAPI.cpp
index f07c7ce5..ed296ffd 100644
--- a/src/api/SapphireAPI.cpp
+++ b/src/api/SapphireAPI.cpp
@@ -10,7 +10,9 @@
 
 #include <Database/DatabaseDef.h>
 
-bool Sapphire::Network::SapphireAPI::login( const std::string& username, const std::string& pass, std::string& sId )
+using namespace Sapphire::API;
+
+bool SapphireAPI::login( const std::string& username, const std::string& pass, std::string& sId )
 {
   std::string query =
     "SELECT account_id FROM accounts WHERE account_name = '" + username + "' AND account_pass = '" + pass + "';";
@@ -53,7 +55,7 @@ bool Sapphire::Network::SapphireAPI::login( const std::string& username, const s
 }
 
 
-bool Sapphire::Network::SapphireAPI::insertSession( const uint32_t accountId, std::string& sId )
+bool SapphireAPI::insertSession( const uint32_t accountId, std::string& sId )
 {
   // create session for the new sessionid and store to sessionlist
   auto pSession = std::make_shared< Session >();
@@ -66,7 +68,7 @@ bool Sapphire::Network::SapphireAPI::insertSession( const uint32_t accountId, st
 
 }
 
-bool Sapphire::Network::SapphireAPI::createAccount( const std::string& username, const std::string& pass, std::string& sId )
+bool SapphireAPI::createAccount( const std::string& username, const std::string& pass, std::string& sId )
 {
   // get account from login name
   auto pQR = g_charaDb.query( "SELECT account_id FROM accounts WHERE account_name = '" + username + "';" );
@@ -96,11 +98,11 @@ bool Sapphire::Network::SapphireAPI::createAccount( const std::string& username,
 
 }
 
-int Sapphire::Network::SapphireAPI::createCharacter( const uint32_t accountId, const std::string& name,
-                                                     const std::string& infoJson,
-                                                     const uint32_t gmRank )
+int SapphireAPI::createCharacter( const uint32_t accountId, const std::string& name,
+                                           const std::string& infoJson,
+                                           const uint32_t gmRank )
 {
-  Sapphire::PlayerMinimal newPlayer;
+  API::PlayerMinimal newPlayer;
 
   newPlayer.setAccountId( accountId );
   newPlayer.setId( getNextCharId() );
@@ -169,7 +171,7 @@ int Sapphire::Network::SapphireAPI::createCharacter( const uint32_t accountId, c
   return newPlayer.getAccountId();
 }
 
-void Sapphire::Network::SapphireAPI::deleteCharacter( std::string name, const uint32_t accountId )
+void SapphireAPI::deleteCharacter( std::string name, const uint32_t accountId )
 {
   PlayerMinimal deletePlayer;
   auto charList = getCharList( accountId );
@@ -199,17 +201,17 @@ void Sapphire::Network::SapphireAPI::deleteCharacter( std::string name, const ui
   g_charaDb.execute( "DELETE FROM charaquest WHERE CharacterId LIKE '" + std::to_string( id ) + "';" );
 }
 
-std::vector< Sapphire::PlayerMinimal > Sapphire::Network::SapphireAPI::getCharList( uint32_t accountId )
+std::vector< PlayerMinimal > SapphireAPI::getCharList( uint32_t accountId )
 {
 
-  std::vector< Sapphire::PlayerMinimal > charList;
+  std::vector< API::PlayerMinimal > charList;
 
   auto pQR = g_charaDb.query(
     "SELECT CharacterId, ContentId FROM charainfo WHERE AccountId = " + std::to_string( accountId ) + ";" );
 
   while( pQR->next() )
   {
-    Sapphire::PlayerMinimal player;
+    API::PlayerMinimal player;
 
     uint32_t charId = pQR->getUInt( 1 );
 
@@ -220,7 +222,7 @@ std::vector< Sapphire::PlayerMinimal > Sapphire::Network::SapphireAPI::getCharLi
   return charList;
 }
 
-bool Sapphire::Network::SapphireAPI::checkNameTaken( std::string name )
+bool SapphireAPI::checkNameTaken( std::string name )
 {
 
   g_charaDb.escapeString( name );
@@ -234,7 +236,7 @@ bool Sapphire::Network::SapphireAPI::checkNameTaken( std::string name )
     return true;
 }
 
-uint32_t Sapphire::Network::SapphireAPI::getNextCharId()
+uint32_t SapphireAPI::getNextCharId()
 {
   uint32_t charId = 0;
 
@@ -250,7 +252,7 @@ uint32_t Sapphire::Network::SapphireAPI::getNextCharId()
   return charId;
 }
 
-uint64_t Sapphire::Network::SapphireAPI::getNextContentId()
+uint64_t SapphireAPI::getNextContentId()
 {
   uint64_t contentId = 0;
 
@@ -266,7 +268,7 @@ uint64_t Sapphire::Network::SapphireAPI::getNextContentId()
   return contentId;
 }
 
-int Sapphire::Network::SapphireAPI::checkSession( const std::string& sId )
+int SapphireAPI::checkSession( const std::string& sId )
 {
   auto it = m_sessionMap.find( sId );
 
@@ -277,7 +279,7 @@ int Sapphire::Network::SapphireAPI::checkSession( const std::string& sId )
 }
 
 
-bool Sapphire::Network::SapphireAPI::removeSession( const std::string& sId )
+bool SapphireAPI::removeSession( const std::string& sId )
 {
   auto it = m_sessionMap.find( sId );
 
diff --git a/src/api/SapphireAPI.h b/src/api/SapphireAPI.h
index 7b2bbd4c..222643b0 100644
--- a/src/api/SapphireAPI.h
+++ b/src/api/SapphireAPI.h
@@ -7,13 +7,9 @@
 #include <memory>
 #include "PlayerMinimal.h"
 
-namespace Sapphire
+namespace Sapphire::API
 {
   class Session;
-}
-
-namespace Sapphire::Network
-{
 
   class SapphireAPI
   {
@@ -34,7 +30,7 @@ namespace Sapphire::Network
 
     bool insertSession( uint32_t accountId, std::string& sId );
 
-    std::vector< Sapphire::PlayerMinimal > getCharList( uint32_t accountId );
+    std::vector< API::PlayerMinimal > getCharList( uint32_t accountId );
 
     bool checkNameTaken( std::string name );
 
diff --git a/src/api/Session.cpp b/src/api/Session.cpp
index fc40d265..b0992293 100644
--- a/src/api/Session.cpp
+++ b/src/api/Session.cpp
@@ -1,6 +1,7 @@
 #include "Session.h"
 
-namespace Sapphire {
+using namespace Sapphire::API;
+
 Session::Session()
 {
 
@@ -35,4 +36,3 @@ void Session::setAccountId( uint32_t id )
 {
   m_accountId = id;
 }
-}
diff --git a/src/api/Session.h b/src/api/Session.h
index 5d9efc41..c6fc26fe 100644
--- a/src/api/Session.h
+++ b/src/api/Session.h
@@ -5,7 +5,7 @@
 #include <string>
 #include <string.h>
 
-namespace Sapphire
+namespace Sapphire::API
 {
 
   class Session
diff --git a/src/api/main.cpp b/src/api/main.cpp
index 3ea413f3..191660e4 100644
--- a/src/api/main.cpp
+++ b/src/api/main.cpp
@@ -29,7 +29,6 @@
 #include <Framework.h>
 #include <Logging/Logger.h>
 
-#include "Forwards.h"
 #include "SapphireAPI.h"
 
 #include <Util/CrashHandler.h>
@@ -38,7 +37,7 @@ Sapphire::Common::Util::CrashHandler crashHandler;
 
 Sapphire::Db::DbWorkerPool< Sapphire::Db::ZoneDbConnection > g_charaDb;
 Sapphire::Data::ExdDataGenerated g_exdDataGen;
-Sapphire::Network::SapphireAPI g_sapphireAPI;
+Sapphire::API::SapphireAPI g_sapphireAPI;
 
 namespace fs = std::experimental::filesystem;
 
@@ -59,7 +58,7 @@ Sapphire::Common::Config::ApiConfig   m_config;
 
 void reloadConfig()
 {
-  auto pConfig = std::make_shared< Sapphire::ConfigMgr >();
+  auto pConfig = std::make_shared< Sapphire::Common::ConfigMgr >();
 
   Logger::info( "Loading config " + configPath );
 
@@ -336,7 +335,7 @@ void createCharacter( shared_ptr< HttpServer::Response > response, shared_ptr< H
     std::string name = json["name"];
     std::string infoJson = json["infoJson"];
 
-    std::string finalJson = Sapphire::Util::base64Decode( infoJson );
+    std::string finalJson = Common::Util::base64Decode( infoJson );
 
     // reloadConfig();
 
diff --git a/src/common/Forwards.h b/src/common/Forwards.h
index 085dfbe9..620e39a9 100644
--- a/src/common/Forwards.h
+++ b/src/common/Forwards.h
@@ -3,6 +3,12 @@
 
 #include <memory>
 
+namespace Sapphire
+{
+  class Framework;
+  using FrameworkPtr = std::shared_ptr< Framework >;
+}
+
 namespace Sapphire::Common
 {
   class ConfigMgr;
@@ -11,7 +17,7 @@ namespace Sapphire::Common
   using FrameworkPtr = std::shared_ptr< Framework >;
 }
 
-namespace Sapphire::Common::Network
+namespace Sapphire::Network
 {
   class Hive;
   class Acceptor;
@@ -21,7 +27,7 @@ namespace Sapphire::Common::Network
   using ConnectionPtr = std::shared_ptr< Connection >;
 }
 
-namespace Sapphire::Common::Network::Packets
+namespace Sapphire::Network::Packets
 {
   class GamePacket;
   class FFXIVPacketBase;
diff --git a/src/common/Framework.h b/src/common/Framework.h
index 0e752801..5714bdb3 100644
--- a/src/common/Framework.h
+++ b/src/common/Framework.h
@@ -7,7 +7,7 @@
 #include <memory>
 #include <cassert>
 
-namespace Sapphire::Common
+namespace Sapphire
 {
 
   class Framework
diff --git a/src/common/Network/Acceptor.cpp b/src/common/Network/Acceptor.cpp
index 2238b5fa..43c17d8f 100644
--- a/src/common/Network/Acceptor.cpp
+++ b/src/common/Network/Acceptor.cpp
@@ -3,7 +3,7 @@
 #include "Connection.h"
 
 
-using namespace Sapphire::Common;
+using namespace Sapphire;
 
 Network::Acceptor::Acceptor( HivePtr hive ) :
   m_hive( hive ),
diff --git a/src/common/Network/Acceptor.h b/src/common/Network/Acceptor.h
index e1a663eb..faae123f 100644
--- a/src/common/Network/Acceptor.h
+++ b/src/common/Network/Acceptor.h
@@ -13,7 +13,7 @@
 #include <vector>
 
 
-namespace Sapphire::Common::Network
+namespace Sapphire::Network
 {
 
   class Connection;
diff --git a/src/common/Network/CommonActorControl.h b/src/common/Network/CommonActorControl.h
index 043715f1..b3ecf167 100644
--- a/src/common/Network/CommonActorControl.h
+++ b/src/common/Network/CommonActorControl.h
@@ -10,7 +10,7 @@
 // The following enumerations are structures to require their type be included.
 // They are also defined within the Sapphire::Common namespace to avoid collisions.
 // +---------------------------------------------------------------------------
-namespace Sapphire::Common::Network::ActorControl
+namespace Sapphire::Network::ActorControl
 {
 
 enum ActorControlType : uint16_t
diff --git a/src/common/Network/CommonNetwork.h b/src/common/Network/CommonNetwork.h
index c4a27604..1a2bd4d6 100644
--- a/src/common/Network/CommonNetwork.h
+++ b/src/common/Network/CommonNetwork.h
@@ -5,7 +5,7 @@
 #include <vector>
 #include "PacketDef/Ipcs.h"
 
-namespace Sapphire::Common::Network::Packets
+namespace Sapphire::Network::Packets
 {
 
   /**
diff --git a/src/common/Network/Connection.cpp b/src/common/Network/Connection.cpp
index 3ac0bee6..1bc9054a 100644
--- a/src/common/Network/Connection.cpp
+++ b/src/common/Network/Connection.cpp
@@ -3,7 +3,7 @@
 #include <functional>
 #include "Framework.h"
 
-using namespace Sapphire::Common;
+using namespace Sapphire;
 
 Network::Connection::Connection( HivePtr hive, FrameworkPtr pFw ) :
   m_hive( hive ),
diff --git a/src/common/Network/Connection.h b/src/common/Network/Connection.h
index 3a4623d2..ef5c4070 100644
--- a/src/common/Network/Connection.h
+++ b/src/common/Network/Connection.h
@@ -12,13 +12,7 @@
 #include "Acceptor.h"
 #include <memory>
 
-namespace Sapphire::Common
-{
-  class Framework;
-  using FrameworkPtr = std::shared_ptr< Framework >;
-}
-
-namespace Sapphire::Common::Network
+namespace Sapphire::Network
 {
 
   class Hive;
diff --git a/src/common/Network/GamePacket.h b/src/common/Network/GamePacket.h
index f40eadc7..c1c06b76 100644
--- a/src/common/Network/GamePacket.h
+++ b/src/common/Network/GamePacket.h
@@ -14,7 +14,7 @@
 #include "CommonNetwork.h"
 #include "PacketDef/Ipcs.h"
 
-namespace Sapphire::Common::Network::Packets
+namespace Sapphire::Network::Packets
 {
 
   // Must forward define these in order to enable the compiler to produce the
diff --git a/src/common/Network/GamePacketParser.cpp b/src/common/Network/GamePacketParser.cpp
index 4577c21e..b14d2657 100644
--- a/src/common/Network/GamePacketParser.cpp
+++ b/src/common/Network/GamePacketParser.cpp
@@ -3,8 +3,8 @@
 
 #include <string.h>   // memcpy
 
-using namespace Sapphire::Common;
-using namespace Sapphire::Common::Network::Packets;
+using namespace Sapphire;
+using namespace Sapphire::Network::Packets;
 
 PacketParseResult Network::Packets::getHeader( const std::vector< uint8_t >& buffer,
                                                          const uint32_t offset,
diff --git a/src/common/Network/GamePacketParser.h b/src/common/Network/GamePacketParser.h
index e847a7c4..c50b486a 100644
--- a/src/common/Network/GamePacketParser.h
+++ b/src/common/Network/GamePacketParser.h
@@ -3,7 +3,7 @@
 
 #include "CommonNetwork.h"
 
-namespace Sapphire::Common::Network::Packets
+namespace Sapphire::Network::Packets
 {
 
   enum PacketParseResult
diff --git a/src/common/Network/Hive.cpp b/src/common/Network/Hive.cpp
index 20279869..758c30d3 100644
--- a/src/common/Network/Hive.cpp
+++ b/src/common/Network/Hive.cpp
@@ -2,7 +2,7 @@
 #include <functional>
 #include "Hive.h"
 
-using namespace Sapphire::Common;
+using namespace Sapphire;
 
 //-----------------------------------------------------------------------------
 
diff --git a/src/common/Network/Hive.h b/src/common/Network/Hive.h
index 76e53814..8ac37328 100644
--- a/src/common/Network/Hive.h
+++ b/src/common/Network/Hive.h
@@ -5,7 +5,7 @@
 #include <atomic>
 #include <memory>
 
-namespace Sapphire::Common::Network
+namespace Sapphire::Network
 {
 
   class Hive : public std::enable_shared_from_this< Hive >
diff --git a/src/common/Network/PacketContainer.cpp b/src/common/Network/PacketContainer.cpp
index 7cff0b48..0b6fa1b1 100644
--- a/src/common/Network/PacketContainer.cpp
+++ b/src/common/Network/PacketContainer.cpp
@@ -7,7 +7,7 @@
 #include <string.h>
 #include <memory>
 
-using namespace Sapphire::Common;
+using namespace Sapphire;
 
 Network::Packets::PacketContainer::PacketContainer( uint32_t segmentTargetOverride ) :
   m_segmentTargetOverride( segmentTargetOverride )
diff --git a/src/common/Network/PacketContainer.h b/src/common/Network/PacketContainer.h
index 337d73e0..80a35cf1 100644
--- a/src/common/Network/PacketContainer.h
+++ b/src/common/Network/PacketContainer.h
@@ -8,7 +8,7 @@
 #include "GamePacket.h"
 #include "Forwards.h"
 
-namespace Sapphire::Common::Network::Packets
+namespace Sapphire::Network::Packets
 {
 
   using FFXIVPacketBasePtr = std::shared_ptr< FFXIVPacketBase >;
diff --git a/src/common/Network/PacketDef/Chat/ServerChatDef.h b/src/common/Network/PacketDef/Chat/ServerChatDef.h
index 8c6c8e01..ce614f7c 100644
--- a/src/common/Network/PacketDef/Chat/ServerChatDef.h
+++ b/src/common/Network/PacketDef/Chat/ServerChatDef.h
@@ -4,7 +4,7 @@
 #include <Common.h>
 #include <Network/CommonNetwork.h>
 
-namespace Sapphire::Common::Network::Packets::Server
+namespace Sapphire::Network::Packets::Server
 {
 
 /**
diff --git a/src/common/Network/PacketDef/Ipcs.h b/src/common/Network/PacketDef/Ipcs.h
index 5d769f71..c6fdac98 100644
--- a/src/common/Network/PacketDef/Ipcs.h
+++ b/src/common/Network/PacketDef/Ipcs.h
@@ -3,7 +3,7 @@
 
 #include <stdint.h>
 
-namespace Sapphire::Common::Network::Packets
+namespace Sapphire::Network::Packets
 {
 
   ////////////////////////////////////////////////////////////////////////////////
diff --git a/src/common/Network/PacketDef/Lobby/ServerLobbyDef.h b/src/common/Network/PacketDef/Lobby/ServerLobbyDef.h
index d679db5e..811a6e4f 100644
--- a/src/common/Network/PacketDef/Lobby/ServerLobbyDef.h
+++ b/src/common/Network/PacketDef/Lobby/ServerLobbyDef.h
@@ -4,7 +4,7 @@
 #include <Common.h>
 #include <Network/CommonNetwork.h>
 
-namespace Sapphire::Common::Network::Packets::Server {
+namespace Sapphire::Network::Packets::Server {
 
 struct FFXIVIpcRetainerList :
   FFXIVIpcBasePacket< LobbyRetainerList >
diff --git a/src/common/Network/PacketDef/Zone/ClientZoneDef.h b/src/common/Network/PacketDef/Zone/ClientZoneDef.h
index 424602d8..bf19fb7e 100644
--- a/src/common/Network/PacketDef/Zone/ClientZoneDef.h
+++ b/src/common/Network/PacketDef/Zone/ClientZoneDef.h
@@ -4,7 +4,7 @@
 #include <Common.h>
 #include <Network/CommonNetwork.h>
 
-namespace Sapphire::Common::Network::Packets::Client
+namespace Sapphire::Network::Packets::Client
 {
 
 struct FFXIVIpcGmCommand1 :
diff --git a/src/common/Network/PacketDef/Zone/ServerZoneDef.h b/src/common/Network/PacketDef/Zone/ServerZoneDef.h
index f95b2736..80588a04 100644
--- a/src/common/Network/PacketDef/Zone/ServerZoneDef.h
+++ b/src/common/Network/PacketDef/Zone/ServerZoneDef.h
@@ -10,7 +10,7 @@
 #include <Common.h>
 #include <Network/CommonNetwork.h>
 
-namespace Sapphire::Common::Network::Packets::Server
+namespace Sapphire::Network::Packets::Server
 {
 
   /**
diff --git a/src/common/Vector3.cpp b/src/common/Vector3.cpp
index b2f7f993..e364fc99 100644
--- a/src/common/Vector3.cpp
+++ b/src/common/Vector3.cpp
@@ -1,6 +1,8 @@
 #include "Vector3.h"
 
-inline bool Sapphire::Common::FFXIVARR_POSITION3::operator == ( const FFXIVARR_POSITION3& target ) const
+using namespace Sapphire::Common;
+
+inline bool FFXIVARR_POSITION3::operator == ( const FFXIVARR_POSITION3& target ) const
 {
   return x == target.x && y == target.y && z == target.z;
 }
diff --git a/src/common/Version.cpp.in b/src/common/Version.cpp.in
index 9f973861..cd011ae5 100644
--- a/src/common/Version.cpp.in
+++ b/src/common/Version.cpp.in
@@ -1,10 +1,9 @@
 #include "Version.h"
 
-namespace Sapphire {
-namespace Version {
+namespace Sapphire::Version
+{
 
-const std::string GIT_HASH = "@GIT_SHA1@";
-const std::string VERSION = "@VERSION@";
+  const std::string GIT_HASH = "@GIT_SHA1@";
+  const std::string VERSION = "@VERSION@";
 
-} /* Version */
-} /* Sapphire */
+} /* Sapphire::Version */
diff --git a/src/dbm/DbManager.cpp b/src/dbm/DbManager.cpp
index 1be6b172..b81790a4 100644
--- a/src/dbm/DbManager.cpp
+++ b/src/dbm/DbManager.cpp
@@ -17,10 +17,7 @@ DbManager::DbManager( const std::string& host, const std::string& database, cons
 {
 }
 
-DbManager::~DbManager()
-{
-
-}
+DbManager::~DbManager() = default;
 
 bool DbManager::execute( const std::string& sql )
 {
diff --git a/src/lobby/Forwards.h b/src/lobby/Forwards.h
index d32f6f16..58a724d6 100644
--- a/src/lobby/Forwards.h
+++ b/src/lobby/Forwards.h
@@ -12,6 +12,11 @@ x ## Ptr make_ ## x( Args &&...args ) { \
 return std::make_shared< x >( std::forward< Args >( args ) ... ); }\
 typedef std::vector< x > x ## PtrList;
 
+namespace Sapphire
+{
+  TYPE_FORWARD( Framework );
+}
+
 namespace Sapphire::Lobby
 {
   TYPE_FORWARD( LobbySession );
@@ -22,14 +27,14 @@ namespace Sapphire::Lobby::Network
   TYPE_FORWARD( GameConnection );
 }
 
-namespace Sapphire::Common::Network
+namespace Sapphire::Network
 {
   TYPE_FORWARD( Hive );
   TYPE_FORWARD( Acceptor );
   TYPE_FORWARD( Connection );
 }
 
-namespace Sapphire::Common::Network::Packets
+namespace Sapphire::Network::Packets
 {
   TYPE_FORWARD( GamePacket );
   TYPE_FORWARD( FFXIVPacketBase );
diff --git a/src/lobby/GameConnection.cpp b/src/lobby/GameConnection.cpp
index 1fca879b..034b4755 100644
--- a/src/lobby/GameConnection.cpp
+++ b/src/lobby/GameConnection.cpp
@@ -15,17 +15,19 @@
 #include "RestConnector.h"
 #include "LobbySession.h"
 
+#include "Forwards.h"
+
 using namespace Sapphire;
-using namespace Sapphire::Common::Network::Packets;
-using namespace Sapphire::Common::Network::Packets::Server;
+using namespace Sapphire::Network::Packets;
+using namespace Sapphire::Network::Packets::Server;
 
 extern Lobby::ServerLobby g_serverLobby;
 extern Lobby::Network::RestConnector g_restConnector;
 
-Lobby::Network::GameConnection::GameConnection( Common::Network::HivePtr pHive,
-                                                Common::Network::AcceptorPtr pAcceptor,
-                                                Common::FrameworkPtr pFw ) :
-  Common::Network::Connection( pHive, pFw ),
+Lobby::Network::GameConnection::GameConnection( Sapphire::Network::HivePtr pHive,
+                                                Sapphire::Network::AcceptorPtr pAcceptor,
+                                                FrameworkPtr pFw ) :
+  Sapphire::Network::Connection( pHive, pFw ),
   m_pAcceptor( pAcceptor ),
   m_bEncryptionInitialized( false )
 {
@@ -56,8 +58,8 @@ void Lobby::Network::GameConnection::onRecv( std::vector< uint8_t >& buffer )
 {
   m_packets.insert( std::end( m_packets ), std::begin( buffer ), std::end( buffer ) );
   // This is assumed packet always start with valid FFXIVARR_PACKET_HEADER for now.
-  Common::Network::Packets::FFXIVARR_PACKET_HEADER packetHeader{};
-  const auto headerResult = Common::Network::Packets::getHeader( m_packets, 0, packetHeader );
+  Sapphire::Network::Packets::FFXIVARR_PACKET_HEADER packetHeader{};
+  const auto headerResult = Sapphire::Network::Packets::getHeader( m_packets, 0, packetHeader );
 
   if( headerResult == Incomplete )
     return;
@@ -70,8 +72,8 @@ void Lobby::Network::GameConnection::onRecv( std::vector< uint8_t >& buffer )
   }
 
   // Dissect packet list
-  std::vector< Common::Network::Packets::FFXIVARR_PACKET_RAW > packetList;
-  const auto packetResult = Common::Network::Packets::getPackets( m_packets, sizeof( struct FFXIVARR_PACKET_HEADER ),
+  std::vector< Sapphire::Network::Packets::FFXIVARR_PACKET_RAW > packetList;
+  const auto packetResult = Sapphire::Network::Packets::getPackets( m_packets, sizeof( struct FFXIVARR_PACKET_HEADER ),
                                                                   packetHeader, packetList );
 
   if( packetResult == Incomplete )
@@ -381,7 +383,7 @@ bool Lobby::Network::GameConnection::createOrModifyChar( FFXIVARR_PACKET_RAW& pa
   return false;
 }
 
-void Lobby::Network::GameConnection::handleGamePacket( Common::Network::Packets::FFXIVARR_PACKET_RAW& packet )
+void Lobby::Network::GameConnection::handleGamePacket( Sapphire::Network::Packets::FFXIVARR_PACKET_RAW& packet )
 {
 
   uint32_t tmpId = packet.segHdr.target_actor;
@@ -428,7 +430,7 @@ void Lobby::Network::GameConnection::sendPacket( Packets::LobbyPacketContainer&
   send( sendBuffer );
 }
 
-void Lobby::Network::GameConnection::sendPackets( Common::Network::Packets::PacketContainer* pPacket )
+void Lobby::Network::GameConnection::sendPackets( Sapphire::Network::Packets::PacketContainer* pPacket )
 {
   std::vector< uint8_t > sendBuffer;
 
@@ -457,8 +459,8 @@ void Lobby::Network::GameConnection::generateEncryptionKey( uint32_t key, const
   Common::Util::md5( m_baseKey, m_encKey, 0x2C );
 }
 
-void Lobby::Network::GameConnection::handlePackets( const Common::Network::Packets::FFXIVARR_PACKET_HEADER& ipcHeader,
-                                                    const std::vector< Common::Network::Packets::FFXIVARR_PACKET_RAW >& packetData )
+void Lobby::Network::GameConnection::handlePackets( const Sapphire::Network::Packets::FFXIVARR_PACKET_HEADER& ipcHeader,
+                                                    const std::vector< Sapphire::Network::Packets::FFXIVARR_PACKET_RAW >& packetData )
 {
 
   for( auto inPacket : packetData )
diff --git a/src/lobby/GameConnection.h b/src/lobby/GameConnection.h
index a04a84f0..1ca20a89 100644
--- a/src/lobby/GameConnection.h
+++ b/src/lobby/GameConnection.h
@@ -19,7 +19,7 @@
 namespace Sapphire::Lobby::Network
 {
 
-  class GameConnection : public Common::Network::Connection
+  class GameConnection : public Sapphire::Network::Connection
   {
 
   private:
@@ -32,16 +32,16 @@ namespace Sapphire::Lobby::Network
 
     bool m_bEncryptionInitialized;
 
-    Common::Network::AcceptorPtr m_pAcceptor;
+    Sapphire::Network::AcceptorPtr m_pAcceptor;
 
     LobbySessionPtr m_pSession;
 
-    Common::Util::LockedQueue< Common::Network::Packets::GamePacketPtr > m_inQueue;
-    Common::Util::LockedQueue< Common::Network::Packets::GamePacketPtr > m_outQueue;
+    Common::Util::LockedQueue< Sapphire::Network::Packets::GamePacketPtr > m_inQueue;
+    Common::Util::LockedQueue< Sapphire::Network::Packets::GamePacketPtr > m_outQueue;
     std::vector< uint8_t > m_packets;
 
   public:
-    GameConnection( Common::Network::HivePtr pHive, Common::Network::AcceptorPtr pAcceptor, Common::FrameworkPtr pFw );
+    GameConnection( Sapphire::Network::HivePtr pHive, Sapphire::Network::AcceptorPtr pAcceptor, FrameworkPtr pFw );
 
     ~GameConnection();
 
@@ -58,26 +58,26 @@ namespace Sapphire::Lobby::Network
 
     void sendError( uint64_t sequence, uint32_t errorcode, uint16_t messageId, uint32_t tmpId );
 
-    void getCharList( Common::Network::Packets::FFXIVARR_PACKET_RAW& packet, uint32_t tmpId );
+    void getCharList( Sapphire::Network::Packets::FFXIVARR_PACKET_RAW& packet, uint32_t tmpId );
 
-    void enterWorld( Common::Network::Packets::FFXIVARR_PACKET_RAW& packet, uint32_t tmpId );
+    void enterWorld( Sapphire::Network::Packets::FFXIVARR_PACKET_RAW& packet, uint32_t tmpId );
 
-    bool sendServiceAccountList( Common::Network::Packets::FFXIVARR_PACKET_RAW& packet, uint32_t tmpId );
+    bool sendServiceAccountList( Sapphire::Network::Packets::FFXIVARR_PACKET_RAW& packet, uint32_t tmpId );
 
-    bool createOrModifyChar( Common::Network::Packets::FFXIVARR_PACKET_RAW& packet, uint32_t tmpId );
+    bool createOrModifyChar( Sapphire::Network::Packets::FFXIVARR_PACKET_RAW& packet, uint32_t tmpId );
 
-    void handlePackets( const Common::Network::Packets::FFXIVARR_PACKET_HEADER& ipcHeader,
-                        const std::vector< Common::Network::Packets::FFXIVARR_PACKET_RAW >& packetData );
+    void handlePackets( const Sapphire::Network::Packets::FFXIVARR_PACKET_HEADER& ipcHeader,
+                        const std::vector< Sapphire::Network::Packets::FFXIVARR_PACKET_RAW >& packetData );
 
-    void handleGamePacket( Common::Network::Packets::FFXIVARR_PACKET_RAW& pPacket );
+    void handleGamePacket( Sapphire::Network::Packets::FFXIVARR_PACKET_RAW& pPacket );
 
-    void handlePacket( Common::Network::Packets::FFXIVPacketBasePtr pPacket );
+    void handlePacket( Sapphire::Network::Packets::FFXIVPacketBasePtr pPacket );
 
-    void sendPackets( Common::Network::Packets::PacketContainer* pPacket );
+    void sendPackets( Sapphire::Network::Packets::PacketContainer* pPacket );
 
     void sendPacket( Packets::LobbyPacketContainer& pLpc );
 
-    void sendSinglePacket( Common::Network::Packets::FFXIVPacketBasePtr pPacket );
+    void sendSinglePacket( Sapphire::Network::Packets::FFXIVPacketBasePtr pPacket );
 
 
   };
diff --git a/src/lobby/LobbyPacketContainer.cpp b/src/lobby/LobbyPacketContainer.cpp
index 8b81c3d8..ae270d8f 100644
--- a/src/lobby/LobbyPacketContainer.cpp
+++ b/src/lobby/LobbyPacketContainer.cpp
@@ -6,12 +6,12 @@
 
 using namespace Sapphire;
 using namespace Sapphire::Common;
-using namespace Sapphire::Common::Network::Packets;
+using namespace Sapphire::Network::Packets;
 
 Lobby::Network::Packets::LobbyPacketContainer::LobbyPacketContainer( uint8_t* encKey )
 {
-  memset( &m_header, 0, sizeof( Common::Network::Packets::FFXIVARR_PACKET_HEADER ) );
-  m_header.size = sizeof( Common::Network::Packets::FFXIVARR_PACKET_HEADER );
+  memset( &m_header, 0, sizeof( Sapphire::Network::Packets::FFXIVARR_PACKET_HEADER ) );
+  m_header.size = sizeof( Sapphire::Network::Packets::FFXIVARR_PACKET_HEADER );
 
   m_encKey = encKey;
 
@@ -51,6 +51,6 @@ uint8_t* Lobby::Network::Packets::LobbyPacketContainer::getRawData( bool addstuf
     m_header.unknown_0 = 0xff41a05252;
     m_header.timestamp = Common::Util::getTimeMs();
   }
-  memcpy( m_dataBuf, &m_header, sizeof( Common::Network::Packets::FFXIVARR_PACKET_HEADER ) );
+  memcpy( m_dataBuf, &m_header, sizeof( Sapphire::Network::Packets::FFXIVARR_PACKET_HEADER ) );
   return m_dataBuf;
 }
diff --git a/src/lobby/LobbyPacketContainer.h b/src/lobby/LobbyPacketContainer.h
index f6c714a8..44a5fd21 100644
--- a/src/lobby/LobbyPacketContainer.h
+++ b/src/lobby/LobbyPacketContainer.h
@@ -12,7 +12,7 @@
 namespace Sapphire::Lobby::Network::Packets
 {
 
-  using FFXIVPacketBasePtr = std::shared_ptr< Common::Network::Packets::FFXIVPacketBase >;
+  using FFXIVPacketBasePtr = std::shared_ptr< Sapphire::Network::Packets::FFXIVPacketBase >;
 
   class LobbyPacketContainer
   {
@@ -28,7 +28,7 @@ namespace Sapphire::Lobby::Network::Packets
     uint8_t* getRawData( bool addstuff = true );
 
   private:
-    Common::Network::Packets::FFXIVARR_PACKET_HEADER m_header;
+    Sapphire::Network::Packets::FFXIVARR_PACKET_HEADER m_header;
 
     uint8_t* m_encKey;
 
diff --git a/src/lobby/ServerLobby.cpp b/src/lobby/ServerLobby.cpp
index 68076f72..f8029b27 100644
--- a/src/lobby/ServerLobby.cpp
+++ b/src/lobby/ServerLobby.cpp
@@ -21,6 +21,8 @@
 
 #include <thread>
 
+using namespace Sapphire;
+
 Sapphire::Lobby::Network::RestConnector g_restConnector;
 
 namespace Sapphire::Lobby
@@ -63,15 +65,15 @@ namespace Sapphire::Lobby
 
     Logger::setLogLevel( m_config.global.general.logLevel );
 
-    auto pFw = std::make_shared< Common::Framework >();
-    Common::Network::HivePtr hive( new Common::Network::Hive() );
-    Common::Network::addServerToHive< Network::GameConnection >( m_ip, m_port, hive, pFw );
+    auto pFw = std::make_shared< Framework >();
+    auto hive = Sapphire::Network::make_Hive();
+    Sapphire::Network::addServerToHive< Network::GameConnection >( m_ip, m_port, hive, pFw );
 
     Logger::info( "Lobby server running on {0}:{1}", m_ip, m_port );
 
     std::vector< std::thread > threadGroup;
 
-    threadGroup.emplace_back( std::bind( &Common::Network::Hive::run, hive.get() ) );
+    threadGroup.emplace_back( std::bind( &Sapphire::Network::Hive::run, hive.get() ) );
 
     for( auto& thread : threadGroup )
       if( thread.joinable() )
diff --git a/src/world/Network/GameConnection.h b/src/world/Network/GameConnection.h
index b5063698..07962fd9 100644
--- a/src/world/Network/GameConnection.h
+++ b/src/world/Network/GameConnection.h
@@ -28,12 +28,12 @@ namespace Sapphire::Network
     None
   };
 
-  class GameConnection : public Common::Network::Connection
+  class GameConnection : public Network::Connection
   {
 
   private:
     typedef void ( GameConnection::* Handler )( FrameworkPtr pFw,
-                                                const Common::Network::Packets::FFXIVARR_PACKET_RAW& inPacket,
+                                                const Network::Packets::FFXIVARR_PACKET_RAW& inPacket,
                                                 Entity::Player& player );
 
     using HandlerMap = std::map< uint16_t, Handler >;
@@ -51,7 +51,7 @@ namespace Sapphire::Network
 
     World::SessionPtr m_pSession;
 
-    Common::Util::LockedQueue< Common::Network::Packets::FFXIVARR_PACKET_RAW > m_inQueue;
+    Common::Util::LockedQueue< Network::Packets::FFXIVARR_PACKET_RAW > m_inQueue;
     Common::Util::LockedQueue< Packets::FFXIVPacketBasePtr > m_outQueue;
     std::vector< uint8_t > m_packets;
 
@@ -82,15 +82,15 @@ namespace Sapphire::Network
 
     void processOutQueue();
 
-    void handlePacket( Sapphire::Network::Packets::FFXIVARR_PACKET_RAW& pPacket );
+    void handlePacket( Network::Packets::FFXIVARR_PACKET_RAW& pPacket );
 
-    void handleZonePacket( Sapphire::Network::Packets::FFXIVARR_PACKET_RAW& pPacket );
+    void handleZonePacket( Network::Packets::FFXIVARR_PACKET_RAW& pPacket );
 
-    void handleChatPacket( Sapphire::Network::Packets::FFXIVARR_PACKET_RAW& pPacket );
+    void handleChatPacket( Network::Packets::FFXIVARR_PACKET_RAW& pPacket );
 
     void sendPackets( Packets::PacketContainer* pPacket );
 
-    void sendSinglePacket( Sapphire::Network::Packets::FFXIVPacketBasePtr pPacket );
+    void sendSinglePacket( Network::Packets::FFXIVPacketBasePtr pPacket );
 
     void injectPacket( const std::string& packetpath, Entity::Player& player );
 
diff --git a/src/world/ServerMgr.cpp b/src/world/ServerMgr.cpp
index 1929c765..feffd356 100644
--- a/src/world/ServerMgr.cpp
+++ b/src/world/ServerMgr.cpp
@@ -66,7 +66,7 @@ size_t Sapphire::World::ServerMgr::getSessionCount() const
 
 bool Sapphire::World::ServerMgr::loadSettings( int32_t argc, char* argv[] )
 {
-  auto pConfig = framework()->get< Sapphire::ConfigMgr >();
+  auto pConfig = framework()->get< Common::ConfigMgr >();
 
   Logger::info( "Loading config {0}", m_configName );
 
@@ -123,8 +123,8 @@ void Sapphire::World::ServerMgr::run( int32_t argc, char* argv[] )
 
   printBanner();
 
-  auto pConfig = std::make_shared< ConfigMgr >();
-  framework()->set< ConfigMgr >( pConfig );
+  auto pConfig = std::make_shared< Common::ConfigMgr >();
+  framework()->set< Common::ConfigMgr >( pConfig );
   if( !loadSettings( argc, argv ) )
   {
     Logger::fatal( "Unable to load settings!" );
diff --git a/src/world/mainGameServer.cpp b/src/world/mainGameServer.cpp
index 6e4c1ceb..2c77ea66 100644
--- a/src/world/mainGameServer.cpp
+++ b/src/world/mainGameServer.cpp
@@ -12,7 +12,7 @@ Common::Util::CrashHandler crashHandler;
 
 int main( int32_t argc, char* argv[] )
 {
-  auto pFramework = Sapphire::make_Framework();
+  auto pFramework = make_Framework();
   auto pServer = std::make_shared< ServerMgr >( "world.ini", pFramework );
   pFramework->set< ServerMgr >( pServer );
   pServer->run( argc, argv );

From 6c176eb61d134b6aa0c5102453379b2653873135 Mon Sep 17 00:00:00 2001
From: NotAdam <adam@notadam.me>
Date: Mon, 3 Jun 2019 00:39:02 +1000
Subject: [PATCH 052/351] actually fix world building on msvc this time

---
 src/common/Config/ConfigMgr.cpp  |  1 +
 src/common/Forwards.h            |  2 -
 src/world/Action/Action.cpp      | 76 ++++++++++++++++----------------
 src/world/Action/EventAction.cpp |  1 +
 4 files changed, 40 insertions(+), 40 deletions(-)

diff --git a/src/common/Config/ConfigMgr.cpp b/src/common/Config/ConfigMgr.cpp
index d8283dee..8b8823f2 100644
--- a/src/common/Config/ConfigMgr.cpp
+++ b/src/common/Config/ConfigMgr.cpp
@@ -5,6 +5,7 @@
 
 namespace fs = std::experimental::filesystem;
 
+using namespace Sapphire;
 using namespace Sapphire::Common;
 
 /**
diff --git a/src/common/Forwards.h b/src/common/Forwards.h
index 620e39a9..1fa810c9 100644
--- a/src/common/Forwards.h
+++ b/src/common/Forwards.h
@@ -12,9 +12,7 @@ namespace Sapphire
 namespace Sapphire::Common
 {
   class ConfigMgr;
-  class Framework;
   using ConfigMgrPtr = std::shared_ptr< ConfigMgr >;
-  using FrameworkPtr = std::shared_ptr< Framework >;
 }
 
 namespace Sapphire::Network
diff --git a/src/world/Action/Action.cpp b/src/world/Action/Action.cpp
index c1e071f5..0f0c0bcd 100644
--- a/src/world/Action/Action.cpp
+++ b/src/world/Action/Action.cpp
@@ -21,24 +21,24 @@
 #include <Logging/Logger.h>
 #include <Util/ActorFilter.h>
 
+using namespace Sapphire;
 using namespace Sapphire::Common;
 using namespace Sapphire::Network;
 using namespace Sapphire::Network::Packets;
 using namespace Sapphire::Network::Packets::Server;
 using namespace Sapphire::Network::ActorControl;
-
-using namespace Sapphire::World::Action;
+using namespace Sapphire::World;
 
 
-Action::Action() = default;
-Action::~Action() = default;
+Action::Action::Action() = default;
+Action::Action::~Action() = default;
 
-Action::Action( Entity::CharaPtr caster, uint32_t actionId, FrameworkPtr fw ) :
+Action::Action::Action( Entity::CharaPtr caster, uint32_t actionId, FrameworkPtr fw ) :
   Action( std::move( caster ), actionId, nullptr, std::move( fw ) )
 {
 }
 
-Action::Action( Entity::CharaPtr caster, uint32_t actionId, Data::ActionPtr actionData, FrameworkPtr fw ) :
+Action::Action::Action( Entity::CharaPtr caster, uint32_t actionId, Data::ActionPtr actionData, FrameworkPtr fw ) :
   m_pSource( std::move( caster ) ),
   m_pFw( std::move( fw ) ),
   m_actionData( std::move( actionData ) ),
@@ -49,12 +49,12 @@ Action::Action( Entity::CharaPtr caster, uint32_t actionId, Data::ActionPtr acti
 {
 }
 
-uint32_t Action::getId() const
+uint32_t Action::Action::getId() const
 {
   return m_id;
 }
 
-bool Action::init()
+bool Action::Action::init()
 {
   if( !m_actionData )
   {
@@ -123,62 +123,62 @@ bool Action::init()
   return true;
 }
 
-void Action::setPos( Sapphire::Common::FFXIVARR_POSITION3 pos )
+void Action::Action::setPos( Sapphire::Common::FFXIVARR_POSITION3 pos )
 {
   m_pos = pos;
 }
 
-Sapphire::Common::FFXIVARR_POSITION3 Action::getPos() const
+Sapphire::Common::FFXIVARR_POSITION3 Action::Action::getPos() const
 {
   return m_pos;
 }
 
-void Action::setTargetId( uint64_t targetId )
+void Action::Action::setTargetId( uint64_t targetId )
 {
   m_targetId = targetId;
 }
 
-uint64_t Action::getTargetId() const
+uint64_t Action::Action::getTargetId() const
 {
   return m_targetId;
 }
 
-bool Action::hasClientsideTarget() const
+bool Action::Action::hasClientsideTarget() const
 {
   return m_targetId > 0xFFFFFFFF;
 }
 
-bool Action::isInterrupted() const
+bool Action::Action::isInterrupted() const
 {
   return m_interruptType != Common::ActionInterruptType::None;
 }
 
-void Action::setInterrupted( Common::ActionInterruptType type )
+void Action::Action::setInterrupted( Common::ActionInterruptType type )
 {
   m_interruptType = type;
 }
 
-uint32_t Action::getCastTime() const
+uint32_t Action::Action::getCastTime() const
 {
   return m_castTimeMs;
 }
 
-void Action::setCastTime( uint32_t castTime )
+void Action::Action::setCastTime( uint32_t castTime )
 {
   m_castTimeMs = castTime;
 }
 
-bool Action::hasCastTime() const
+bool Action::Action::hasCastTime() const
 {
   return m_castTimeMs > 0;
 }
 
-Sapphire::Entity::CharaPtr Action::getSourceChara() const
+Sapphire::Entity::CharaPtr Action::Action::getSourceChara() const
 {
   return m_pSource;
 }
 
-bool Action::update()
+bool Action::Action::update()
 {
   // action has not been started yet
   if( m_startTime == 0 )
@@ -206,7 +206,7 @@ bool Action::update()
   return false;
 }
 
-void Action::start()
+void Action::Action::start()
 {
   assert( m_pSource );
 
@@ -259,7 +259,7 @@ void Action::start()
     execute();
 }
 
-void Action::interrupt()
+void Action::Action::interrupt()
 {
   assert( m_pSource );
 
@@ -293,7 +293,7 @@ void Action::interrupt()
   pScriptMgr->onInterrupt( *this );
 }
 
-void Action::execute()
+void Action::Action::execute()
 {
   assert( m_pSource );
 
@@ -360,7 +360,7 @@ void Action::execute()
   }
 }
 
-bool Action::preCheck()
+bool Action::Action::preCheck()
 {
   if( auto player = m_pSource->getAsPlayer() )
   {
@@ -371,7 +371,7 @@ bool Action::preCheck()
   return true;
 }
 
-bool Action::playerPreCheck( Entity::Player& player )
+bool Action::Action::playerPreCheck( Entity::Player& player )
 {
   // lol
   if( !player.isAlive() )
@@ -423,17 +423,17 @@ bool Action::playerPreCheck( Entity::Player& player )
   return true;
 }
 
-uint32_t Action::getAdditionalData() const
+uint32_t Action::Action::getAdditionalData() const
 {
   return m_additionalData;
 }
 
-void Action::setAdditionalData( uint32_t data )
+void Action::Action::setAdditionalData( uint32_t data )
 {
   m_additionalData = data;
 }
 
-bool Action::isComboAction() const
+bool Action::Action::isComboAction() const
 {
   auto lastActionId = m_pSource->getLastComboActionId();
 
@@ -445,7 +445,7 @@ bool Action::isComboAction() const
   return m_actionData->actionCombo == lastActionId;
 }
 
-bool Action::primaryCostCheck( bool subtractCosts )
+bool Action::Action::primaryCostCheck( bool subtractCosts )
 {
   switch( m_primaryCostType )
   {
@@ -488,23 +488,23 @@ bool Action::primaryCostCheck( bool subtractCosts )
   }
 }
 
-bool Action::secondaryCostCheck( bool subtractCosts )
+bool Action::Action::secondaryCostCheck( bool subtractCosts )
 {
   // todo: these need to be mapped
   return true;
 }
 
-bool Action::hasResources()
+bool Action::Action::hasResources()
 {
   return primaryCostCheck( false ) && secondaryCostCheck( false );
 }
 
-bool Action::consumeResources()
+bool Action::Action::consumeResources()
 {
   return primaryCostCheck( true ) && secondaryCostCheck( true );
 }
 
-bool Action::snapshotAffectedActors( std::vector< Entity::CharaPtr >& actors )
+bool Action::Action::snapshotAffectedActors( std::vector< Entity::CharaPtr >& actors )
 {
   for( const auto& actor : m_pSource->getInRangeActors( true ) )
   {
@@ -534,12 +534,12 @@ bool Action::snapshotAffectedActors( std::vector< Entity::CharaPtr >& actors )
   return !actors.empty();
 }
 
-void Action::addActorFilter( World::Util::ActorFilterPtr filter )
+void Action::Action::addActorFilter( World::Util::ActorFilterPtr filter )
 {
   m_actorFilters.push_back( std::move( filter ) );
 }
 
-void Action::addDefaultActorFilters()
+void Action::Action::addDefaultActorFilters()
 {
   switch( m_castType )
   {
@@ -576,7 +576,7 @@ void Action::addDefaultActorFilters()
   }
 }
 
-bool Action::preFilterActor( Sapphire::Entity::Actor& actor ) const
+bool Action::Action::preFilterActor( Sapphire::Entity::Actor& actor ) const
 {
   auto kind = actor.getObjKind();
 
@@ -589,12 +589,12 @@ bool Action::preFilterActor( Sapphire::Entity::Actor& actor ) const
   return true;
 }
 
-std::vector< Sapphire::Entity::CharaPtr >& Action::getHitCharas()
+std::vector< Sapphire::Entity::CharaPtr >& Action::Action::getHitCharas()
 {
   return m_hitActors;
 }
 
-Sapphire::Entity::CharaPtr Action::getHitChara()
+Sapphire::Entity::CharaPtr Action::Action::getHitChara()
 {
   if( !m_hitActors.empty() )
   {
diff --git a/src/world/Action/EventAction.cpp b/src/world/Action/EventAction.cpp
index 18c8d993..4cf2cd2b 100644
--- a/src/world/Action/EventAction.cpp
+++ b/src/world/Action/EventAction.cpp
@@ -11,6 +11,7 @@
 #include "EventAction.h"
 #include "Framework.h"
 
+using namespace Sapphire;
 using namespace Sapphire::World;
 using namespace Sapphire::Common;
 using namespace Sapphire::Network;

From fff6847e9867d07724be91336cbc28db5d22c0e9 Mon Sep 17 00:00:00 2001
From: NotAdam <adam@notadam.me>
Date: Fri, 7 Jun 2019 18:12:35 +1000
Subject: [PATCH 053/351] clean up unnecessary namespace specialisation,
 flatten namespaces a bit

---
 src/api/PlayerMinimal.cpp                    |  2 +-
 src/api/PlayerMinimal.h                      |  2 +-
 src/api/{SapphireAPI.cpp => SapphireApi.cpp} | 36 ++++++------
 src/api/{SapphireAPI.h => SapphireApi.h}     | 10 ++--
 src/api/Session.cpp                          |  2 +-
 src/api/Session.h                            |  2 +-
 src/api/main.cpp                             |  4 +-
 src/common/Util/UtilMath.h                   |  2 +-
 src/lobby/Forwards.h                         |  4 --
 src/lobby/GameConnection.cpp                 | 58 ++++++++++----------
 src/lobby/GameConnection.h                   | 34 ++++++------
 src/lobby/LobbyPacketContainer.cpp           | 10 ++--
 src/lobby/LobbyPacketContainer.h             |  2 +-
 src/lobby/RestConnector.cpp                  | 20 +++----
 src/lobby/RestConnector.h                    |  2 +-
 src/lobby/ServerLobby.cpp                    |  8 +--
 16 files changed, 97 insertions(+), 101 deletions(-)
 rename src/api/{SapphireAPI.cpp => SapphireApi.cpp} (88%)
 rename src/api/{SapphireAPI.h => SapphireApi.h} (85%)

diff --git a/src/api/PlayerMinimal.cpp b/src/api/PlayerMinimal.cpp
index 37d08121..b95a3da1 100644
--- a/src/api/PlayerMinimal.cpp
+++ b/src/api/PlayerMinimal.cpp
@@ -8,7 +8,7 @@
 
 extern Sapphire::Data::ExdDataGenerated g_exdDataGen;
 
-namespace Sapphire::API {
+namespace Sapphire::Api {
 
 using namespace Common;
 
diff --git a/src/api/PlayerMinimal.h b/src/api/PlayerMinimal.h
index a9af97bb..b137af20 100644
--- a/src/api/PlayerMinimal.h
+++ b/src/api/PlayerMinimal.h
@@ -5,7 +5,7 @@
 #include <stdint.h>
 #include <string.h>
 
-namespace Sapphire::API
+namespace Sapphire::Api
 {
 
   class PlayerMinimal
diff --git a/src/api/SapphireAPI.cpp b/src/api/SapphireApi.cpp
similarity index 88%
rename from src/api/SapphireAPI.cpp
rename to src/api/SapphireApi.cpp
index ed296ffd..f12da082 100644
--- a/src/api/SapphireAPI.cpp
+++ b/src/api/SapphireApi.cpp
@@ -1,4 +1,4 @@
-#include "SapphireAPI.h"
+#include "SapphireApi.h"
 #include <Crypt/base64.h>
 #include "Session.h"
 #include "PlayerMinimal.h"
@@ -10,9 +10,9 @@
 
 #include <Database/DatabaseDef.h>
 
-using namespace Sapphire::API;
+using namespace Sapphire::Api;
 
-bool SapphireAPI::login( const std::string& username, const std::string& pass, std::string& sId )
+bool SapphireApi::login( const std::string& username, const std::string& pass, std::string& sId )
 {
   std::string query =
     "SELECT account_id FROM accounts WHERE account_name = '" + username + "' AND account_pass = '" + pass + "';";
@@ -55,7 +55,7 @@ bool SapphireAPI::login( const std::string& username, const std::string& pass, s
 }
 
 
-bool SapphireAPI::insertSession( const uint32_t accountId, std::string& sId )
+bool SapphireApi::insertSession( const uint32_t accountId, std::string& sId )
 {
   // create session for the new sessionid and store to sessionlist
   auto pSession = std::make_shared< Session >();
@@ -68,7 +68,7 @@ bool SapphireAPI::insertSession( const uint32_t accountId, std::string& sId )
 
 }
 
-bool SapphireAPI::createAccount( const std::string& username, const std::string& pass, std::string& sId )
+bool SapphireApi::createAccount( const std::string& username, const std::string& pass, std::string& sId )
 {
   // get account from login name
   auto pQR = g_charaDb.query( "SELECT account_id FROM accounts WHERE account_name = '" + username + "';" );
@@ -98,11 +98,11 @@ bool SapphireAPI::createAccount( const std::string& username, const std::string&
 
 }
 
-int SapphireAPI::createCharacter( const uint32_t accountId, const std::string& name,
-                                           const std::string& infoJson,
-                                           const uint32_t gmRank )
+int SapphireApi::createCharacter( const uint32_t accountId, const std::string& name,
+                                  const std::string& infoJson,
+                                  const uint32_t gmRank )
 {
-  API::PlayerMinimal newPlayer;
+  Api::PlayerMinimal newPlayer;
 
   newPlayer.setAccountId( accountId );
   newPlayer.setId( getNextCharId() );
@@ -171,7 +171,7 @@ int SapphireAPI::createCharacter( const uint32_t accountId, const std::string& n
   return newPlayer.getAccountId();
 }
 
-void SapphireAPI::deleteCharacter( std::string name, const uint32_t accountId )
+void SapphireApi::deleteCharacter( std::string name, const uint32_t accountId )
 {
   PlayerMinimal deletePlayer;
   auto charList = getCharList( accountId );
@@ -201,17 +201,17 @@ void SapphireAPI::deleteCharacter( std::string name, const uint32_t accountId )
   g_charaDb.execute( "DELETE FROM charaquest WHERE CharacterId LIKE '" + std::to_string( id ) + "';" );
 }
 
-std::vector< PlayerMinimal > SapphireAPI::getCharList( uint32_t accountId )
+std::vector< PlayerMinimal > SapphireApi::getCharList( uint32_t accountId )
 {
 
-  std::vector< API::PlayerMinimal > charList;
+  std::vector< Api::PlayerMinimal > charList;
 
   auto pQR = g_charaDb.query(
     "SELECT CharacterId, ContentId FROM charainfo WHERE AccountId = " + std::to_string( accountId ) + ";" );
 
   while( pQR->next() )
   {
-    API::PlayerMinimal player;
+    Api::PlayerMinimal player;
 
     uint32_t charId = pQR->getUInt( 1 );
 
@@ -222,7 +222,7 @@ std::vector< PlayerMinimal > SapphireAPI::getCharList( uint32_t accountId )
   return charList;
 }
 
-bool SapphireAPI::checkNameTaken( std::string name )
+bool SapphireApi::checkNameTaken( std::string name )
 {
 
   g_charaDb.escapeString( name );
@@ -236,7 +236,7 @@ bool SapphireAPI::checkNameTaken( std::string name )
     return true;
 }
 
-uint32_t SapphireAPI::getNextCharId()
+uint32_t SapphireApi::getNextCharId()
 {
   uint32_t charId = 0;
 
@@ -252,7 +252,7 @@ uint32_t SapphireAPI::getNextCharId()
   return charId;
 }
 
-uint64_t SapphireAPI::getNextContentId()
+uint64_t SapphireApi::getNextContentId()
 {
   uint64_t contentId = 0;
 
@@ -268,7 +268,7 @@ uint64_t SapphireAPI::getNextContentId()
   return contentId;
 }
 
-int SapphireAPI::checkSession( const std::string& sId )
+int SapphireApi::checkSession( const std::string& sId )
 {
   auto it = m_sessionMap.find( sId );
 
@@ -279,7 +279,7 @@ int SapphireAPI::checkSession( const std::string& sId )
 }
 
 
-bool SapphireAPI::removeSession( const std::string& sId )
+bool SapphireApi::removeSession( const std::string& sId )
 {
   auto it = m_sessionMap.find( sId );
 
diff --git a/src/api/SapphireAPI.h b/src/api/SapphireApi.h
similarity index 85%
rename from src/api/SapphireAPI.h
rename to src/api/SapphireApi.h
index 222643b0..c11b3c89 100644
--- a/src/api/SapphireAPI.h
+++ b/src/api/SapphireApi.h
@@ -7,15 +7,15 @@
 #include <memory>
 #include "PlayerMinimal.h"
 
-namespace Sapphire::API
+namespace Sapphire::Api
 {
   class Session;
 
-  class SapphireAPI
+  class SapphireApi
   {
   public:
-    SapphireAPI() = default;
-    ~SapphireAPI() = default;
+    SapphireApi() = default;
+    ~SapphireApi() = default;
 
     using SessionMap = std::map< std::string, std::shared_ptr< Session > >;
 
@@ -30,7 +30,7 @@ namespace Sapphire::API
 
     bool insertSession( uint32_t accountId, std::string& sId );
 
-    std::vector< API::PlayerMinimal > getCharList( uint32_t accountId );
+    std::vector< Api::PlayerMinimal > getCharList( uint32_t accountId );
 
     bool checkNameTaken( std::string name );
 
diff --git a/src/api/Session.cpp b/src/api/Session.cpp
index b0992293..c5030b2f 100644
--- a/src/api/Session.cpp
+++ b/src/api/Session.cpp
@@ -1,6 +1,6 @@
 #include "Session.h"
 
-using namespace Sapphire::API;
+using namespace Sapphire::Api;
 
 Session::Session()
 {
diff --git a/src/api/Session.h b/src/api/Session.h
index c6fc26fe..7bb0d71b 100644
--- a/src/api/Session.h
+++ b/src/api/Session.h
@@ -5,7 +5,7 @@
 #include <string>
 #include <string.h>
 
-namespace Sapphire::API
+namespace Sapphire::Api
 {
 
   class Session
diff --git a/src/api/main.cpp b/src/api/main.cpp
index 191660e4..5d661387 100644
--- a/src/api/main.cpp
+++ b/src/api/main.cpp
@@ -29,7 +29,7 @@
 #include <Framework.h>
 #include <Logging/Logger.h>
 
-#include "SapphireAPI.h"
+#include "SapphireApi.h"
 
 #include <Util/CrashHandler.h>
 
@@ -37,7 +37,7 @@ Sapphire::Common::Util::CrashHandler crashHandler;
 
 Sapphire::Db::DbWorkerPool< Sapphire::Db::ZoneDbConnection > g_charaDb;
 Sapphire::Data::ExdDataGenerated g_exdDataGen;
-Sapphire::API::SapphireAPI g_sapphireAPI;
+Sapphire::Api::SapphireApi g_sapphireAPI;
 
 namespace fs = std::experimental::filesystem;
 
diff --git a/src/common/Util/UtilMath.h b/src/common/Util/UtilMath.h
index 93344253..c35ef6be 100644
--- a/src/common/Util/UtilMath.h
+++ b/src/common/Util/UtilMath.h
@@ -11,7 +11,7 @@ namespace Sapphire::Common::Util
   float distanceSq( float x, float y, float z, float x1, float y1, float z1 );
 
   float distance( float x, float y, float z, float x1, float y1, float z1 );
-  float distance( const Sapphire::Common::FFXIVARR_POSITION3& pos1, const Sapphire::Common::FFXIVARR_POSITION3& pos2 );
+  float distance( const Common::FFXIVARR_POSITION3& pos1, const Common::FFXIVARR_POSITION3& pos2 );
 
   float distance2DSq( float x, float y, float x1, float y1 );
 
diff --git a/src/lobby/Forwards.h b/src/lobby/Forwards.h
index 58a724d6..1f54bcc7 100644
--- a/src/lobby/Forwards.h
+++ b/src/lobby/Forwards.h
@@ -20,10 +20,6 @@ namespace Sapphire
 namespace Sapphire::Lobby
 {
   TYPE_FORWARD( LobbySession );
-}
-
-namespace Sapphire::Lobby::Network
-{
   TYPE_FORWARD( GameConnection );
 }
 
diff --git a/src/lobby/GameConnection.cpp b/src/lobby/GameConnection.cpp
index 034b4755..306874c0 100644
--- a/src/lobby/GameConnection.cpp
+++ b/src/lobby/GameConnection.cpp
@@ -22,9 +22,9 @@ using namespace Sapphire::Network::Packets;
 using namespace Sapphire::Network::Packets::Server;
 
 extern Lobby::ServerLobby g_serverLobby;
-extern Lobby::Network::RestConnector g_restConnector;
+extern Lobby::RestConnector g_restConnector;
 
-Lobby::Network::GameConnection::GameConnection( Sapphire::Network::HivePtr pHive,
+Lobby::GameConnection::GameConnection( Sapphire::Network::HivePtr pHive,
                                                 Sapphire::Network::AcceptorPtr pAcceptor,
                                                 FrameworkPtr pFw ) :
   Sapphire::Network::Connection( pHive, pFw ),
@@ -33,14 +33,14 @@ Lobby::Network::GameConnection::GameConnection( Sapphire::Network::HivePtr pHive
 {
 }
 
-Lobby::Network::GameConnection::~GameConnection()
+Lobby::GameConnection::~GameConnection()
 {
 
 }
 
 
 // overwrite the parents onConnect for our game socket needs
-void Lobby::Network::GameConnection::onAccept( const std::string& host, uint16_t port )
+void Lobby::GameConnection::onAccept( const std::string& host, uint16_t port )
 {
   auto connection = make_GameConnection( m_hive, m_pAcceptor, m_pFw );
   m_pAcceptor->accept( connection );
@@ -49,12 +49,12 @@ void Lobby::Network::GameConnection::onAccept( const std::string& host, uint16_t
 }
 
 
-void Lobby::Network::GameConnection::onDisconnect()
+void Lobby::GameConnection::onDisconnect()
 {
   Logger::debug( "DISCONNECT" );
 }
 
-void Lobby::Network::GameConnection::onRecv( std::vector< uint8_t >& buffer )
+void Lobby::GameConnection::onRecv( std::vector< uint8_t >& buffer )
 {
   m_packets.insert( std::end( m_packets ), std::begin( buffer ), std::end( buffer ) );
   // This is assumed packet always start with valid FFXIVARR_PACKET_HEADER for now.
@@ -72,9 +72,9 @@ void Lobby::Network::GameConnection::onRecv( std::vector< uint8_t >& buffer )
   }
 
   // Dissect packet list
-  std::vector< Sapphire::Network::Packets::FFXIVARR_PACKET_RAW > packetList;
-  const auto packetResult = Sapphire::Network::Packets::getPackets( m_packets, sizeof( struct FFXIVARR_PACKET_HEADER ),
-                                                                  packetHeader, packetList );
+  std::vector< FFXIVARR_PACKET_RAW > packetList;
+  const auto packetResult = getPackets( m_packets, sizeof( struct FFXIVARR_PACKET_HEADER ),
+                                        packetHeader, packetList );
 
   if( packetResult == Incomplete )
     return;
@@ -92,31 +92,31 @@ void Lobby::Network::GameConnection::onRecv( std::vector< uint8_t >& buffer )
 
 }
 
-void Lobby::Network::GameConnection::onError( const asio::error_code& error )
+void Lobby::GameConnection::onError( const asio::error_code& error )
 {
   Logger::info( "GameConnection closed: {0}", error.message() );
 }
 
 void
-Lobby::Network::GameConnection::sendError( uint64_t sequence, uint32_t errorcode, uint16_t messageId, uint32_t tmpId )
+Lobby::GameConnection::sendError( uint64_t sequence, uint32_t errorcode, uint16_t messageId, uint32_t tmpId )
 {
   auto errorPacket = makeLobbyPacket< FFXIVIpcLobbyError >( tmpId );
   errorPacket->data().seq = sequence;
   errorPacket->data().error_id = errorcode;
   errorPacket->data().message_id = messageId;
 
-  Packets::LobbyPacketContainer pRP( m_encKey );
+  LobbyPacketContainer pRP( m_encKey );
   pRP.addPacket( errorPacket );
   sendPacket( pRP );
 }
 
-void Lobby::Network::GameConnection::getCharList( FFXIVARR_PACKET_RAW& packet, uint32_t tmpId )
+void Lobby::GameConnection::getCharList( FFXIVARR_PACKET_RAW& packet, uint32_t tmpId )
 {
   uint64_t sequence = *reinterpret_cast< uint64_t* >( &packet.data[ 0 ] + 0x10 );
   Logger::info( "Sequence [{0}]", sequence );
 
   Logger::info( "[{0}] ReqCharList", m_pSession->getAccountID() );
-  Packets::LobbyPacketContainer pRP( m_encKey );
+  LobbyPacketContainer pRP( m_encKey );
 
   auto serverListPacket = makeLobbyPacket< FFXIVIpcServerList >( tmpId );
   serverListPacket->data().seq = 1;
@@ -187,14 +187,14 @@ void Lobby::Network::GameConnection::getCharList( FFXIVARR_PACKET_RAW& packet, u
       charListPacket->data().counter = ( i * 4 ) + 1;
       charListPacket->data().unknown4 = 128;
     }
-    Packets::LobbyPacketContainer pRP( m_encKey );
+    LobbyPacketContainer pRP( m_encKey );
     pRP.addPacket( charListPacket );
     sendPacket( pRP );
 
   }
 }
 
-void Lobby::Network::GameConnection::enterWorld( FFXIVARR_PACKET_RAW& packet, uint32_t tmpId )
+void Lobby::GameConnection::enterWorld( FFXIVARR_PACKET_RAW& packet, uint32_t tmpId )
 {
   uint64_t sequence = *reinterpret_cast< uint64_t* >( &packet.data[ 0 ] + 0x10 );
   Logger::info( "Sequence [{0}]", sequence );
@@ -223,7 +223,7 @@ void Lobby::Network::GameConnection::enterWorld( FFXIVARR_PACKET_RAW& packet, ui
 
   Logger::info( "[{0}] Logging in as {1} ({2})", m_pSession->getAccountID(), logInCharName, logInCharId );
 
-  Packets::LobbyPacketContainer pRP( m_encKey );
+  LobbyPacketContainer pRP( m_encKey );
 
   auto enterWorldPacket = makeLobbyPacket< FFXIVIpcEnterWorld >( tmpId );
   enterWorldPacket->data().contentId = lookupId;
@@ -236,7 +236,7 @@ void Lobby::Network::GameConnection::enterWorld( FFXIVARR_PACKET_RAW& packet, ui
   sendPacket( pRP );
 }
 
-bool Lobby::Network::GameConnection::sendServiceAccountList( FFXIVARR_PACKET_RAW& packet, uint32_t tmpId )
+bool Lobby::GameConnection::sendServiceAccountList( FFXIVARR_PACKET_RAW& packet, uint32_t tmpId )
 {
   LobbySessionPtr pSession = g_serverLobby.getSession( ( char* ) &packet.data[ 0 ] + 0x22 );
 
@@ -261,7 +261,7 @@ bool Lobby::Network::GameConnection::sendServiceAccountList( FFXIVARR_PACKET_RAW
     serviceIdInfoPacket->data().u2 = 0x99;
     serviceIdInfoPacket->data().serviceAccount[ 0 ].id = 0x002E4A2B;
 
-    Packets::LobbyPacketContainer pRP( m_encKey );
+    LobbyPacketContainer pRP( m_encKey );
     pRP.addPacket( serviceIdInfoPacket );
     sendPacket( pRP );
   }
@@ -275,7 +275,7 @@ bool Lobby::Network::GameConnection::sendServiceAccountList( FFXIVARR_PACKET_RAW
   return false;
 }
 
-bool Lobby::Network::GameConnection::createOrModifyChar( FFXIVARR_PACKET_RAW& packet, uint32_t tmpId )
+bool Lobby::GameConnection::createOrModifyChar( FFXIVARR_PACKET_RAW& packet, uint32_t tmpId )
 {
   uint64_t sequence = *reinterpret_cast< uint64_t* >( &packet.data[ 0 ] + 0x10 );
   uint8_t type = *reinterpret_cast< uint8_t* >( &packet.data[ 0 ] + 0x29 );
@@ -294,7 +294,7 @@ bool Lobby::Network::GameConnection::createOrModifyChar( FFXIVARR_PACKET_RAW& pa
 
     Logger::info( "[{0}] Type 1: {1}", m_pSession->getAccountID(), name );
 
-    Packets::LobbyPacketContainer pRP( m_encKey );
+    LobbyPacketContainer pRP( m_encKey );
 
     m_pSession->newCharName = name;
 
@@ -325,7 +325,7 @@ bool Lobby::Network::GameConnection::createOrModifyChar( FFXIVARR_PACKET_RAW& pa
     if( g_restConnector.createCharacter( ( char* ) m_pSession->getSessionId(), m_pSession->newCharName, charDetails ) !=
         -1 )
     {
-      Packets::LobbyPacketContainer pRP( m_encKey );
+      LobbyPacketContainer pRP( m_encKey );
 
       auto charCreatePacket = makeLobbyPacket< FFXIVIpcCharCreate >( tmpId );
       charCreatePacket->data().content_id = newContentId;
@@ -367,7 +367,7 @@ bool Lobby::Network::GameConnection::createOrModifyChar( FFXIVARR_PACKET_RAW& pa
       charCreatePacket->data().unknown_7 = 1;
       charCreatePacket->data().unknown_8 = 1;
 
-      Packets::LobbyPacketContainer pRP( m_encKey );
+      LobbyPacketContainer pRP( m_encKey );
       pRP.addPacket( charCreatePacket );
       sendPacket( pRP );
     }
@@ -383,7 +383,7 @@ bool Lobby::Network::GameConnection::createOrModifyChar( FFXIVARR_PACKET_RAW& pa
   return false;
 }
 
-void Lobby::Network::GameConnection::handleGamePacket( Sapphire::Network::Packets::FFXIVARR_PACKET_RAW& packet )
+void Lobby::GameConnection::handleGamePacket( Sapphire::Network::Packets::FFXIVARR_PACKET_RAW& packet )
 {
 
   uint32_t tmpId = packet.segHdr.target_actor;
@@ -421,7 +421,7 @@ void Lobby::Network::GameConnection::handleGamePacket( Sapphire::Network::Packet
 
 }
 
-void Lobby::Network::GameConnection::sendPacket( Packets::LobbyPacketContainer& pLpc )
+void Lobby::GameConnection::sendPacket( LobbyPacketContainer& pLpc )
 {
   uint16_t size = pLpc.getSize();
   uint8_t* dataPtr = pLpc.getRawData( false );
@@ -430,7 +430,7 @@ void Lobby::Network::GameConnection::sendPacket( Packets::LobbyPacketContainer&
   send( sendBuffer );
 }
 
-void Lobby::Network::GameConnection::sendPackets( Sapphire::Network::Packets::PacketContainer* pPacket )
+void Lobby::GameConnection::sendPackets( Sapphire::Network::Packets::PacketContainer* pPacket )
 {
   std::vector< uint8_t > sendBuffer;
 
@@ -438,14 +438,14 @@ void Lobby::Network::GameConnection::sendPackets( Sapphire::Network::Packets::Pa
   send( sendBuffer );
 }
 
-void Lobby::Network::GameConnection::sendSinglePacket( FFXIVPacketBasePtr pPacket )
+void Lobby::GameConnection::sendSinglePacket( FFXIVPacketBasePtr pPacket )
 {
   PacketContainer pRP = PacketContainer();
   pRP.addPacket( pPacket );
   sendPackets( &pRP );
 }
 
-void Lobby::Network::GameConnection::generateEncryptionKey( uint32_t key, const std::string& keyPhrase )
+void Lobby::GameConnection::generateEncryptionKey( uint32_t key, const std::string& keyPhrase )
 {
   memset( m_baseKey, 0, 0x2C );
   m_baseKey[ 0 ] = 0x78;
@@ -459,7 +459,7 @@ void Lobby::Network::GameConnection::generateEncryptionKey( uint32_t key, const
   Common::Util::md5( m_baseKey, m_encKey, 0x2C );
 }
 
-void Lobby::Network::GameConnection::handlePackets( const Sapphire::Network::Packets::FFXIVARR_PACKET_HEADER& ipcHeader,
+void Lobby::GameConnection::handlePackets( const Sapphire::Network::Packets::FFXIVARR_PACKET_HEADER& ipcHeader,
                                                     const std::vector< Sapphire::Network::Packets::FFXIVARR_PACKET_RAW >& packetData )
 {
 
diff --git a/src/lobby/GameConnection.h b/src/lobby/GameConnection.h
index 1ca20a89..fbed9386 100644
--- a/src/lobby/GameConnection.h
+++ b/src/lobby/GameConnection.h
@@ -16,10 +16,10 @@
 
 #define DECLARE_HANDLER( x ) void x( Packets::GamePacketPtr pInPacket, Entity::PlayerPtr pPlayer )
 
-namespace Sapphire::Lobby::Network
+namespace Sapphire::Lobby
 {
 
-  class GameConnection : public Sapphire::Network::Connection
+  class GameConnection : public Network::Connection
   {
 
   private:
@@ -32,16 +32,16 @@ namespace Sapphire::Lobby::Network
 
     bool m_bEncryptionInitialized;
 
-    Sapphire::Network::AcceptorPtr m_pAcceptor;
+    Network::AcceptorPtr m_pAcceptor;
 
     LobbySessionPtr m_pSession;
 
-    Common::Util::LockedQueue< Sapphire::Network::Packets::GamePacketPtr > m_inQueue;
-    Common::Util::LockedQueue< Sapphire::Network::Packets::GamePacketPtr > m_outQueue;
+    Common::Util::LockedQueue< Network::Packets::GamePacketPtr > m_inQueue;
+    Common::Util::LockedQueue< Network::Packets::GamePacketPtr > m_outQueue;
     std::vector< uint8_t > m_packets;
 
   public:
-    GameConnection( Sapphire::Network::HivePtr pHive, Sapphire::Network::AcceptorPtr pAcceptor, FrameworkPtr pFw );
+    GameConnection( Network::HivePtr pHive, Network::AcceptorPtr pAcceptor, FrameworkPtr pFw );
 
     ~GameConnection();
 
@@ -58,26 +58,26 @@ namespace Sapphire::Lobby::Network
 
     void sendError( uint64_t sequence, uint32_t errorcode, uint16_t messageId, uint32_t tmpId );
 
-    void getCharList( Sapphire::Network::Packets::FFXIVARR_PACKET_RAW& packet, uint32_t tmpId );
+    void getCharList( Network::Packets::FFXIVARR_PACKET_RAW& packet, uint32_t tmpId );
 
-    void enterWorld( Sapphire::Network::Packets::FFXIVARR_PACKET_RAW& packet, uint32_t tmpId );
+    void enterWorld( Network::Packets::FFXIVARR_PACKET_RAW& packet, uint32_t tmpId );
 
-    bool sendServiceAccountList( Sapphire::Network::Packets::FFXIVARR_PACKET_RAW& packet, uint32_t tmpId );
+    bool sendServiceAccountList( Network::Packets::FFXIVARR_PACKET_RAW& packet, uint32_t tmpId );
 
-    bool createOrModifyChar( Sapphire::Network::Packets::FFXIVARR_PACKET_RAW& packet, uint32_t tmpId );
+    bool createOrModifyChar( Network::Packets::FFXIVARR_PACKET_RAW& packet, uint32_t tmpId );
 
-    void handlePackets( const Sapphire::Network::Packets::FFXIVARR_PACKET_HEADER& ipcHeader,
-                        const std::vector< Sapphire::Network::Packets::FFXIVARR_PACKET_RAW >& packetData );
+    void handlePackets( const Network::Packets::FFXIVARR_PACKET_HEADER& ipcHeader,
+                        const std::vector< Network::Packets::FFXIVARR_PACKET_RAW >& packetData );
 
-    void handleGamePacket( Sapphire::Network::Packets::FFXIVARR_PACKET_RAW& pPacket );
+    void handleGamePacket( Network::Packets::FFXIVARR_PACKET_RAW& pPacket );
 
-    void handlePacket( Sapphire::Network::Packets::FFXIVPacketBasePtr pPacket );
+    void handlePacket( Network::Packets::FFXIVPacketBasePtr pPacket );
 
-    void sendPackets( Sapphire::Network::Packets::PacketContainer* pPacket );
+    void sendPackets( Network::Packets::PacketContainer* pPacket );
 
-    void sendPacket( Packets::LobbyPacketContainer& pLpc );
+    void sendPacket( Network::Packets::LobbyPacketContainer& pLpc );
 
-    void sendSinglePacket( Sapphire::Network::Packets::FFXIVPacketBasePtr pPacket );
+    void sendSinglePacket( Network::Packets::FFXIVPacketBasePtr pPacket );
 
 
   };
diff --git a/src/lobby/LobbyPacketContainer.cpp b/src/lobby/LobbyPacketContainer.cpp
index ae270d8f..fcd4e459 100644
--- a/src/lobby/LobbyPacketContainer.cpp
+++ b/src/lobby/LobbyPacketContainer.cpp
@@ -8,7 +8,7 @@ using namespace Sapphire;
 using namespace Sapphire::Common;
 using namespace Sapphire::Network::Packets;
 
-Lobby::Network::Packets::LobbyPacketContainer::LobbyPacketContainer( uint8_t* encKey )
+LobbyPacketContainer::LobbyPacketContainer( uint8_t* encKey )
 {
   memset( &m_header, 0, sizeof( Sapphire::Network::Packets::FFXIVARR_PACKET_HEADER ) );
   m_header.size = sizeof( Sapphire::Network::Packets::FFXIVARR_PACKET_HEADER );
@@ -18,12 +18,12 @@ Lobby::Network::Packets::LobbyPacketContainer::LobbyPacketContainer( uint8_t* en
   memset( m_dataBuf, 0, 0x1570 );
 }
 
-Lobby::Network::Packets::LobbyPacketContainer::~LobbyPacketContainer()
+LobbyPacketContainer::~LobbyPacketContainer()
 {
   m_entryList.clear();
 }
 
-void Lobby::Network::Packets::LobbyPacketContainer::addPacket( FFXIVPacketBasePtr pEntry )
+void LobbyPacketContainer::addPacket( FFXIVPacketBasePtr pEntry )
 {
   memcpy( m_dataBuf + m_header.size, &pEntry->getData()[ 0 ], pEntry->getSize() );
 
@@ -39,12 +39,12 @@ void Lobby::Network::Packets::LobbyPacketContainer::addPacket( FFXIVPacketBasePt
   m_header.count++;
 }
 
-uint16_t Lobby::Network::Packets::LobbyPacketContainer::getSize() const
+uint16_t LobbyPacketContainer::getSize() const
 {
   return m_header.size;
 }
 
-uint8_t* Lobby::Network::Packets::LobbyPacketContainer::getRawData( bool addstuff )
+uint8_t* LobbyPacketContainer::getRawData( bool addstuff )
 {
   if( addstuff )
   {
diff --git a/src/lobby/LobbyPacketContainer.h b/src/lobby/LobbyPacketContainer.h
index 44a5fd21..0ac3d0b5 100644
--- a/src/lobby/LobbyPacketContainer.h
+++ b/src/lobby/LobbyPacketContainer.h
@@ -9,7 +9,7 @@
 
 #include "Forwards.h"
 
-namespace Sapphire::Lobby::Network::Packets
+namespace Sapphire::Network::Packets
 {
 
   using FFXIVPacketBasePtr = std::shared_ptr< Sapphire::Network::Packets::FFXIVPacketBase >;
diff --git a/src/lobby/RestConnector.cpp b/src/lobby/RestConnector.cpp
index 738af406..a8ee459f 100644
--- a/src/lobby/RestConnector.cpp
+++ b/src/lobby/RestConnector.cpp
@@ -12,17 +12,17 @@ using namespace Sapphire;
 
 typedef std::vector< std::tuple< std::string, uint32_t, uint64_t, std::string > > CharList;
 
-Lobby::Network::RestConnector::RestConnector()
+Lobby::RestConnector::RestConnector()
 {
 
 }
 
-Lobby::Network::RestConnector::~RestConnector()
+Lobby::RestConnector::~RestConnector()
 {
 
 }
 
-HttpResponse Lobby::Network::RestConnector::requestApi( std::string endpoint, std::string data )
+HttpResponse Lobby::RestConnector::requestApi( std::string endpoint, std::string data )
 {
   HttpClient client( restHost );
 
@@ -41,7 +41,7 @@ HttpResponse Lobby::Network::RestConnector::requestApi( std::string endpoint, st
   return r;
 }
 
-Lobby::LobbySessionPtr Lobby::Network::RestConnector::getSession( char* sId )
+Lobby::LobbySessionPtr Lobby::RestConnector::getSession( char* sId )
 {
   std::string json_string = "{\"sId\": \"" + std::string( sId ) + "\",\"secret\": \"" + serverSecret + "\"}";
 
@@ -83,7 +83,7 @@ Lobby::LobbySessionPtr Lobby::Network::RestConnector::getSession( char* sId )
   }
 }
 
-bool Lobby::Network::RestConnector::checkNameTaken( std::string name )
+bool Lobby::RestConnector::checkNameTaken( std::string name )
 {
   std::string json_string = "{\"name\": \"" + name + "\",\"secret\": \"" + serverSecret + "\"}";
 
@@ -117,7 +117,7 @@ bool Lobby::Network::RestConnector::checkNameTaken( std::string name )
   }
 }
 
-uint32_t Lobby::Network::RestConnector::getNextCharId()
+uint32_t Lobby::RestConnector::getNextCharId()
 {
   std::string json_string = "{\"secret\": \"" + serverSecret + "\"}";
 
@@ -156,7 +156,7 @@ uint32_t Lobby::Network::RestConnector::getNextCharId()
   }
 }
 
-uint64_t Lobby::Network::RestConnector::getNextContentId()
+uint64_t Lobby::RestConnector::getNextContentId()
 {
   std::string json_string = "{\"secret\": \"" + serverSecret + "\"}";
 
@@ -195,7 +195,7 @@ uint64_t Lobby::Network::RestConnector::getNextContentId()
   }
 }
 
-CharList Lobby::Network::RestConnector::getCharList( char* sId )
+CharList Lobby::RestConnector::getCharList( char* sId )
 {
   std::string json_string = "{\"sId\": \"" + std::string( sId, 56 ) + "\",\"secret\": \"" + serverSecret + "\"}";
 
@@ -251,7 +251,7 @@ CharList Lobby::Network::RestConnector::getCharList( char* sId )
   }
 }
 
-bool Lobby::Network::RestConnector::deleteCharacter( char* sId, std::string name )
+bool Lobby::RestConnector::deleteCharacter( char* sId, std::string name )
 {
   std::string json_string =
     "{\"sId\": \"" + std::string( sId, 56 ) + "\",\"secret\": \"" + serverSecret + "\",\"name\": \"" + name + "\"}";
@@ -285,7 +285,7 @@ bool Lobby::Network::RestConnector::deleteCharacter( char* sId, std::string name
   }
 }
 
-int Lobby::Network::RestConnector::createCharacter( char* sId, std::string name, std::string infoJson )
+int Lobby::RestConnector::createCharacter( char* sId, std::string name, std::string infoJson )
 {
   std::string json_string =
     "{\"sId\": \"" + std::string( sId, 56 ) + "\",\"secret\": \"" + serverSecret + "\",\"name\": \"" + name +
diff --git a/src/lobby/RestConnector.h b/src/lobby/RestConnector.h
index 05461535..f361416c 100644
--- a/src/lobby/RestConnector.h
+++ b/src/lobby/RestConnector.h
@@ -15,7 +15,7 @@ namespace Sapphire
   class Session;
 }
 
-namespace Sapphire::Lobby::Network
+namespace Sapphire::Lobby
 {
   class LobbySession;
 
diff --git a/src/lobby/ServerLobby.cpp b/src/lobby/ServerLobby.cpp
index f8029b27..b85380c9 100644
--- a/src/lobby/ServerLobby.cpp
+++ b/src/lobby/ServerLobby.cpp
@@ -23,7 +23,7 @@
 
 using namespace Sapphire;
 
-Sapphire::Lobby::Network::RestConnector g_restConnector;
+Sapphire::Lobby::RestConnector g_restConnector;
 
 namespace Sapphire::Lobby
 {
@@ -65,9 +65,9 @@ namespace Sapphire::Lobby
 
     Logger::setLogLevel( m_config.global.general.logLevel );
 
-    auto pFw = std::make_shared< Framework >();
-    auto hive = Sapphire::Network::make_Hive();
-    Sapphire::Network::addServerToHive< Network::GameConnection >( m_ip, m_port, hive, pFw );
+    auto pFw = make_Framework();
+    auto hive = Network::make_Hive();
+    Network::addServerToHive< GameConnection >( m_ip, m_port, hive, pFw );
 
     Logger::info( "Lobby server running on {0}:{1}", m_ip, m_port );
 

From e5d5f8ae6b73b836842304dce803e2baa405ca4f Mon Sep 17 00:00:00 2001
From: NotAdam <adam@notadam.me>
Date: Fri, 7 Jun 2019 18:15:22 +1000
Subject: [PATCH 054/351] missed a few namespaces that could be cleaned up

---
 src/lobby/GameConnection.cpp | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/lobby/GameConnection.cpp b/src/lobby/GameConnection.cpp
index 306874c0..f531f5c2 100644
--- a/src/lobby/GameConnection.cpp
+++ b/src/lobby/GameConnection.cpp
@@ -58,8 +58,8 @@ void Lobby::GameConnection::onRecv( std::vector< uint8_t >& buffer )
 {
   m_packets.insert( std::end( m_packets ), std::begin( buffer ), std::end( buffer ) );
   // This is assumed packet always start with valid FFXIVARR_PACKET_HEADER for now.
-  Sapphire::Network::Packets::FFXIVARR_PACKET_HEADER packetHeader{};
-  const auto headerResult = Sapphire::Network::Packets::getHeader( m_packets, 0, packetHeader );
+  FFXIVARR_PACKET_HEADER packetHeader{};
+  const auto headerResult = getHeader( m_packets, 0, packetHeader );
 
   if( headerResult == Incomplete )
     return;
@@ -383,7 +383,7 @@ bool Lobby::GameConnection::createOrModifyChar( FFXIVARR_PACKET_RAW& packet, uin
   return false;
 }
 
-void Lobby::GameConnection::handleGamePacket( Sapphire::Network::Packets::FFXIVARR_PACKET_RAW& packet )
+void Lobby::GameConnection::handleGamePacket( Network::Packets::FFXIVARR_PACKET_RAW& packet )
 {
 
   uint32_t tmpId = packet.segHdr.target_actor;
@@ -430,7 +430,7 @@ void Lobby::GameConnection::sendPacket( LobbyPacketContainer& pLpc )
   send( sendBuffer );
 }
 
-void Lobby::GameConnection::sendPackets( Sapphire::Network::Packets::PacketContainer* pPacket )
+void Lobby::GameConnection::sendPackets( Network::Packets::PacketContainer* pPacket )
 {
   std::vector< uint8_t > sendBuffer;
 
@@ -459,8 +459,8 @@ void Lobby::GameConnection::generateEncryptionKey( uint32_t key, const std::stri
   Common::Util::md5( m_baseKey, m_encKey, 0x2C );
 }
 
-void Lobby::GameConnection::handlePackets( const Sapphire::Network::Packets::FFXIVARR_PACKET_HEADER& ipcHeader,
-                                                    const std::vector< Sapphire::Network::Packets::FFXIVARR_PACKET_RAW >& packetData )
+void Lobby::GameConnection::handlePackets( const Network::Packets::FFXIVARR_PACKET_HEADER& ipcHeader,
+                                           const std::vector< Network::Packets::FFXIVARR_PACKET_RAW >& packetData )
 {
 
   for( auto inPacket : packetData )

From 7ef93ea02f990e8d66d95e83df94c03dbac55bb9 Mon Sep 17 00:00:00 2001
From: NotAdam <adam@notadam.me>
Date: Sat, 15 Jun 2019 19:25:59 +1000
Subject: [PATCH 055/351] fix exd generation with new separated definition
 files

---
 src/tools/exd_struct_gen/main.cpp | 156 ++++++++++++++++--------------
 1 file changed, 86 insertions(+), 70 deletions(-)

diff --git a/src/tools/exd_struct_gen/main.cpp b/src/tools/exd_struct_gen/main.cpp
index 13a29feb..8180a55d 100644
--- a/src/tools/exd_struct_gen/main.cpp
+++ b/src/tools/exd_struct_gen/main.cpp
@@ -11,6 +11,7 @@
 #include <set>
 #include <Exd/ExdDataGenerated.h>
 #include <Logging/Logger.h>
+#include <experimental/filesystem>
 
 #include <nlohmann/json.hpp>
 
@@ -21,6 +22,8 @@
 
 using namespace Sapphire;
 
+namespace fs = std::experimental::filesystem;
+
 Sapphire::Data::ExdDataGenerated g_exdData;
 bool skipUnmapped = true;
 
@@ -111,65 +114,63 @@ std::string generateStruct( const std::string& exd )
 
   int count = 0;
 
-  auto json = nlohmann::json();
-
-  std::ifstream exJson( "ex.json" );
-  exJson >> json;
-
-  for( auto& sheet : json[ "sheets" ] )
+  auto path = fmt::format( "Definitions/{}.json", exd );
+  if( !fs::exists( path ) )
   {
-    if( sheet[ "sheet" ] != exd )
-      continue;
-  
-    for( auto& definition : sheet[ "definitions" ] )
-    {
-      uint32_t index;
-      std::string converterTarget = "";
-      bool isRepeat = false;
-      int num = 0;
-      try
-      {
-        index = definition.at( "index" );
-      }
-      catch( ... )
-      {
-        index = 0;
-      }
- 
-      try
-      {
-        std::string fieldName = std::string( definition.at( "name" ) );
-        indexToNameMap[ index ] = fieldName;
-      }
-      catch( ... )
-      {
-      }
+    Logger::warn( "No definition for exd: {}", exd );
+    return "";
+  }
 
-      try
-      {
-        converterTarget = std::string( definition.at( "converter" ).at( "target" ) );
-        if( nameTaken.find( converterTarget ) != nameTaken.end() )
-          indexToTarget[ index ] = converterTarget;
-      }
-      catch( ... )
-      {
-      }
- 
-      try
-      {
-        num = definition.at( "count" );
-        isRepeat = true;
-        indexIsArrayMap[ index ] = true;
-        indexCountMap[ index ] = num;
-        std::string fName = definition.at( "definition" ).at( "name" );
-        indexToNameMap[ index ] = fName;
-      }
-      catch( ... )
-      {
-      }
+  auto sheet = nlohmann::json();
+  std::ifstream defJson( path );
+  defJson >> sheet;
+
+  for( auto& definition : sheet[ "definitions" ] )
+  {
+    uint32_t index;
+    std::string converterTarget = "";
+    bool isRepeat = false;
+    int num = 0;
+    try
+    {
+      index = definition.at( "index" );
+    }
+    catch( ... )
+    {
+      index = 0;
     }
 
+    try
+    {
+      std::string fieldName = std::string( definition.at( "name" ) );
+      indexToNameMap[ index ] = fieldName;
+    }
+    catch( ... )
+    {
+    }
 
+    try
+    {
+      converterTarget = std::string( definition.at( "converter" ).at( "target" ) );
+      if( nameTaken.find( converterTarget ) != nameTaken.end() )
+        indexToTarget[ index ] = converterTarget;
+    }
+    catch( ... )
+    {
+    }
+
+    try
+    {
+      num = definition.at( "count" );
+      isRepeat = true;
+      indexIsArrayMap[ index ] = true;
+      indexCountMap[ index ] = num;
+      std::string fName = definition.at( "definition" ).at( "name" );
+      indexToNameMap[ index ] = fName;
+    }
+    catch( ... )
+    {
+    }
   }
 
   std::string result = "struct " + exd + "\n{\n";
@@ -351,11 +352,6 @@ int main( int argc, char** argv )
                     std::istreambuf_iterator< char >() );
 
 
-  std::ifstream exJson( "ex.json" );
-
-  auto json = nlohmann::json();
-  exJson >> json;
-
   Logger::info( "Setting up EXD data" );
   if( !g_exdData.init( datLocation ) )
   {
@@ -380,19 +376,37 @@ int main( int argc, char** argv )
   //nameTaken[name] = "1";
   //}
   //
-  for( auto& sheet : json[ "sheets" ] )
-  { 
-      std::string name = sheet[ "sheet" ];
-      forwards += "struct " + name + ";\n";
-      structDefs += generateStruct( name );
-      dataDecl += generateDatAccessDecl( name );
-      idListsDecl += generateIdListDecl( name );
-      getterDecl += generateDirectGetters( name );
-      datAccCall += generateSetDatAccessCall( name );
-      constructorDecl += generateConstructorsDecl( name );
-      idListGetters += generateIdListGetter( name );
+
+  if( !fs::exists( "Definitions" ) )
+  {
+    Logger::error( "Missing definitions directory. Copy it from SaintCoinach to the working directory." );
+    return 1;
   }
 
+  uint32_t entryCount = 0;
+  for( auto& entry : fs::directory_iterator( "./Definitions/" ) )
+  {
+    auto& path = entry.path();
+
+    if( path.extension() != ".json" )
+      continue;
+
+    entryCount++;
+
+    auto name = path.stem().string();
+
+    forwards += "struct " + name + ";\n";
+    structDefs += generateStruct( name );
+    dataDecl += generateDatAccessDecl( name );
+    idListsDecl += generateIdListDecl( name );
+    getterDecl += generateDirectGetters( name );
+    datAccCall += generateSetDatAccessCall( name );
+    constructorDecl += generateConstructorsDecl( name );
+    idListGetters += generateIdListGetter( name );
+  }
+
+  Logger::info( "Processed {} definition files, writing files...", entryCount );
+
   getterDecl +=
     "\n     template< class T >\n"
     "     std::shared_ptr< T > get( uint32_t id )\n"
@@ -438,5 +452,7 @@ int main( int argc, char** argv )
 
 //   g_log.info( result );
 
+  Logger::info( "done." );
+
   return 0;
 }

From b2542f442c69ca67dbfb7be154577f797ef150a8 Mon Sep 17 00:00:00 2001
From: NotAdam <adam@notadam.me>
Date: Sat, 15 Jun 2019 20:56:19 +1000
Subject: [PATCH 056/351] update generated exd data, fix formatting outputted
 by exd_struct_gen

---
 src/common/Exd/ExdDataGenerated.cpp       | 10518 ++++++++++----------
 src/common/Exd/ExdDataGenerated.h         |  5465 +++++-----
 src/tools/exd_struct_gen/ExdData.cpp.tmpl |    42 +-
 src/tools/exd_struct_gen/ExdData.h.tmpl   |    54 +-
 src/tools/exd_struct_gen/main.cpp         |    40 +-
 src/world/Action/Action.cpp               |     4 +-
 6 files changed, 8209 insertions(+), 7914 deletions(-)

diff --git a/src/common/Exd/ExdDataGenerated.cpp b/src/common/Exd/ExdDataGenerated.cpp
index fa51b627..aef8af48 100644
--- a/src/common/Exd/ExdDataGenerated.cpp
+++ b/src/common/Exd/ExdDataGenerated.cpp
@@ -3,6585 +3,6710 @@
 
 Sapphire::Data::Achievement::Achievement( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
 {
-   auto row = exdData->m_AchievementDat.get_row( row_id );
-   achievementCategory = exdData->getField< uint8_t >( row, 0 );
-   name = exdData->getField< std::string >( row, 1 );
-   description = exdData->getField< std::string >( row, 2 );
-   points = exdData->getField< uint8_t >( row, 3 );
-   title = exdData->getField< uint16_t >( row, 4 );
-   item = exdData->getField< uint32_t >( row, 5 );
-   icon = exdData->getField< uint16_t >( row, 6 );
-   type = exdData->getField< uint8_t >( row, 8 );
-   key = exdData->getField< int32_t >( row, 9 );
-   data.push_back( exdData->getField< int32_t >( row, 10 ) );
-   data.push_back( exdData->getField< int32_t >( row, 11 ) );
-   data.push_back( exdData->getField< int32_t >( row, 12 ) );
-   data.push_back( exdData->getField< int32_t >( row, 13 ) );
-   data.push_back( exdData->getField< int32_t >( row, 14 ) );
-   data.push_back( exdData->getField< int32_t >( row, 15 ) );
-   data.push_back( exdData->getField< int32_t >( row, 16 ) );
-   data.push_back( exdData->getField< int32_t >( row, 17 ) );
-   order = exdData->getField< uint16_t >( row, 18 );
-   initialHide = exdData->getField< bool >( row, 20 );
+  auto row = exdData->m_AchievementDat.get_row( row_id );
+  achievementCategory = exdData->getField< uint8_t >( row, 0 );
+  name = exdData->getField< std::string >( row, 1 );
+  description = exdData->getField< std::string >( row, 2 );
+  points = exdData->getField< uint8_t >( row, 3 );
+  title = exdData->getField< uint16_t >( row, 4 );
+  item = exdData->getField< uint32_t >( row, 5 );
+  icon = exdData->getField< uint16_t >( row, 6 );
+  type = exdData->getField< uint8_t >( row, 8 );
+  key = exdData->getField< int32_t >( row, 9 );
+  data.push_back( exdData->getField< int32_t >( row, 10 ) );
+  data.push_back( exdData->getField< int32_t >( row, 11 ) );
+  data.push_back( exdData->getField< int32_t >( row, 12 ) );
+  data.push_back( exdData->getField< int32_t >( row, 13 ) );
+  data.push_back( exdData->getField< int32_t >( row, 14 ) );
+  data.push_back( exdData->getField< int32_t >( row, 15 ) );
+  data.push_back( exdData->getField< int32_t >( row, 16 ) );
+  data.push_back( exdData->getField< int32_t >( row, 17 ) );
+  order = exdData->getField< uint16_t >( row, 18 );
+  initialHide = exdData->getField< bool >( row, 20 );
 }
 
 Sapphire::Data::AchievementCategory::AchievementCategory( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
 {
-   auto row = exdData->m_AchievementCategoryDat.get_row( row_id );
-   name = exdData->getField< std::string >( row, 0 );
-   achievementKind = exdData->getField< uint8_t >( row, 1 );
-   hideCategory = exdData->getField< bool >( row, 3 );
+  auto row = exdData->m_AchievementCategoryDat.get_row( row_id );
+  name = exdData->getField< std::string >( row, 0 );
+  achievementKind = exdData->getField< uint8_t >( row, 1 );
+  hideCategory = exdData->getField< bool >( row, 3 );
 }
 
 Sapphire::Data::AchievementKind::AchievementKind( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
 {
-   auto row = exdData->m_AchievementKindDat.get_row( row_id );
-   name = exdData->getField< std::string >( row, 0 );
+  auto row = exdData->m_AchievementKindDat.get_row( row_id );
+  name = exdData->getField< std::string >( row, 0 );
 }
 
 Sapphire::Data::Action::Action( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
 {
-   auto row = exdData->m_ActionDat.get_row( row_id );
-   name = exdData->getField< std::string >( row, 0 );
-   icon = exdData->getField< uint16_t >( row, 2 );
-   actionCategory = exdData->getField< uint8_t >( row, 3 );
-   animationStart = exdData->getField< uint8_t >( row, 5 );
-   vFX = exdData->getField< uint8_t >( row, 6 );
-   animationEnd = exdData->getField< int16_t >( row, 7 );
-   actionTimelineHit = exdData->getField< uint16_t >( row, 8 );
-   classJob = exdData->getField< int8_t >( row, 10 );
-   classJobLevel = exdData->getField< uint8_t >( row, 12 );
-   isRoleAction = exdData->getField< bool >( row, 13 );
-   range = exdData->getField< int8_t >( row, 14 );
-   canTargetSelf = exdData->getField< bool >( row, 15 );
-   canTargetParty = exdData->getField< bool >( row, 16 );
-   canTargetFriendly = exdData->getField< bool >( row, 17 );
-   canTargetHostile = exdData->getField< bool >( row, 18 );
-   targetArea = exdData->getField< bool >( row, 21 );
-   canTargetDead = exdData->getField< bool >( row, 25 );
-   castType = exdData->getField< uint8_t >( row, 27 );
-   effectRange = exdData->getField< uint8_t >( row, 28 );
-   xAxisModifier = exdData->getField< uint8_t >( row, 29 );
-   costType = exdData->getField< uint8_t >( row, 31 );
-   cost = exdData->getField< uint16_t >( row, 32 );
-   actionCombo = exdData->getField< uint16_t >( row, 35 );
-   preservesCombo = exdData->getField< bool >( row, 36 );
-   cast100ms = exdData->getField< uint16_t >( row, 37 );
-   recast100ms = exdData->getField< uint16_t >( row, 38 );
-   cooldownGroup = exdData->getField< uint8_t >( row, 39 );
-   attackType = exdData->getField< int8_t >( row, 40 );
-   aspect = exdData->getField< uint8_t >( row, 41 );
-   actionProcStatus = exdData->getField< uint8_t >( row, 42 );
-   statusGainSelf = exdData->getField< uint16_t >( row, 43 );
-   unlockLink = exdData->getField< uint32_t >( row, 44 );
-   classJobCategory = exdData->getField< uint8_t >( row, 45 );
-   affectsPosition = exdData->getField< bool >( row, 48 );
-   omen = exdData->getField< uint8_t >( row, 49 );
-   isPvP = exdData->getField< bool >( row, 50 );
-   isPlayerAction = exdData->getField< bool >( row, 62 );
+  auto row = exdData->m_ActionDat.get_row( row_id );
+  name = exdData->getField< std::string >( row, 0 );
+  icon = exdData->getField< uint16_t >( row, 2 );
+  actionCategory = exdData->getField< uint8_t >( row, 3 );
+  animationStart = exdData->getField< uint8_t >( row, 5 );
+  vFX = exdData->getField< uint8_t >( row, 6 );
+  animationEnd = exdData->getField< int16_t >( row, 7 );
+  actionTimelineHit = exdData->getField< uint16_t >( row, 8 );
+  classJob = exdData->getField< int8_t >( row, 10 );
+  classJobLevel = exdData->getField< uint8_t >( row, 12 );
+  isRoleAction = exdData->getField< bool >( row, 13 );
+  range = exdData->getField< int8_t >( row, 14 );
+  canTargetSelf = exdData->getField< bool >( row, 15 );
+  canTargetParty = exdData->getField< bool >( row, 16 );
+  canTargetFriendly = exdData->getField< bool >( row, 17 );
+  canTargetHostile = exdData->getField< bool >( row, 18 );
+  targetArea = exdData->getField< bool >( row, 21 );
+  canTargetDead = exdData->getField< bool >( row, 25 );
+  castType = exdData->getField< uint8_t >( row, 27 );
+  effectRange = exdData->getField< uint8_t >( row, 28 );
+  xAxisModifier = exdData->getField< uint8_t >( row, 29 );
+  primaryCostType = exdData->getField< uint8_t >( row, 31 );
+  primaryCostValue = exdData->getField< uint16_t >( row, 32 );
+  secondaryCostType = exdData->getField< uint8_t >( row, 33 );
+  secondaryCostValue = exdData->getField< uint16_t >( row, 34 );
+  actionCombo = exdData->getField< uint16_t >( row, 35 );
+  preservesCombo = exdData->getField< bool >( row, 36 );
+  cast100ms = exdData->getField< uint16_t >( row, 37 );
+  recast100ms = exdData->getField< uint16_t >( row, 38 );
+  cooldownGroup = exdData->getField< uint8_t >( row, 39 );
+  attackType = exdData->getField< int8_t >( row, 40 );
+  aspect = exdData->getField< uint8_t >( row, 41 );
+  actionProcStatus = exdData->getField< uint8_t >( row, 42 );
+  statusGainSelf = exdData->getField< uint16_t >( row, 43 );
+  unlockLink = exdData->getField< uint32_t >( row, 44 );
+  classJobCategory = exdData->getField< uint8_t >( row, 45 );
+  affectsPosition = exdData->getField< bool >( row, 48 );
+  omen = exdData->getField< uint8_t >( row, 49 );
+  isPvP = exdData->getField< bool >( row, 50 );
+  isPlayerAction = exdData->getField< bool >( row, 62 );
 }
 
 Sapphire::Data::ActionCastTimeline::ActionCastTimeline( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
 {
-   auto row = exdData->m_ActionCastTimelineDat.get_row( row_id );
-   name = exdData->getField< uint16_t >( row, 0 );
-   vFX = exdData->getField< uint16_t >( row, 1 );
+  auto row = exdData->m_ActionCastTimelineDat.get_row( row_id );
+  name = exdData->getField< uint16_t >( row, 0 );
+  vFX = exdData->getField< uint16_t >( row, 1 );
 }
 
 Sapphire::Data::ActionCastVFX::ActionCastVFX( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
 {
-   auto row = exdData->m_ActionCastVFXDat.get_row( row_id );
-   vFX = exdData->getField< uint16_t >( row, 0 );
+  auto row = exdData->m_ActionCastVFXDat.get_row( row_id );
+  vFX = exdData->getField< uint16_t >( row, 0 );
 }
 
 Sapphire::Data::ActionCategory::ActionCategory( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
 {
-   auto row = exdData->m_ActionCategoryDat.get_row( row_id );
-   name = exdData->getField< std::string >( row, 0 );
+  auto row = exdData->m_ActionCategoryDat.get_row( row_id );
+  name = exdData->getField< std::string >( row, 0 );
 }
 
 Sapphire::Data::ActionComboRoute::ActionComboRoute( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
 {
-   auto row = exdData->m_ActionComboRouteDat.get_row( row_id );
-   name = exdData->getField< std::string >( row, 0 );
-   action.push_back( exdData->getField< uint16_t >( row, 2 ) );
-   action.push_back( exdData->getField< uint16_t >( row, 3 ) );
-   action.push_back( exdData->getField< uint16_t >( row, 4 ) );
-   action.push_back( exdData->getField< uint16_t >( row, 5 ) );
+  auto row = exdData->m_ActionComboRouteDat.get_row( row_id );
+  name = exdData->getField< std::string >( row, 0 );
+  action.push_back( exdData->getField< uint16_t >( row, 2 ) );
+  action.push_back( exdData->getField< uint16_t >( row, 3 ) );
+  action.push_back( exdData->getField< uint16_t >( row, 4 ) );
+  action.push_back( exdData->getField< uint16_t >( row, 5 ) );
 }
 
 Sapphire::Data::ActionIndirection::ActionIndirection( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
 {
-   auto row = exdData->m_ActionIndirectionDat.get_row( row_id );
-   name = exdData->getField< int32_t >( row, 0 );
+  auto row = exdData->m_ActionIndirectionDat.get_row( row_id );
+  name = exdData->getField< int32_t >( row, 0 );
 }
 
 Sapphire::Data::ActionParam::ActionParam( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
 {
-   auto row = exdData->m_ActionParamDat.get_row( row_id );
-   name = exdData->getField< int16_t >( row, 0 );
+  auto row = exdData->m_ActionParamDat.get_row( row_id );
+  name = exdData->getField< int16_t >( row, 0 );
 }
 
 Sapphire::Data::ActionProcStatus::ActionProcStatus( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
 {
-   auto row = exdData->m_ActionProcStatusDat.get_row( row_id );
-   status = exdData->getField< uint16_t >( row, 0 );
+  auto row = exdData->m_ActionProcStatusDat.get_row( row_id );
+  status = exdData->getField< uint16_t >( row, 0 );
 }
 
 Sapphire::Data::ActionTimeline::ActionTimeline( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
 {
-   auto row = exdData->m_ActionTimelineDat.get_row( row_id );
-   key = exdData->getField< std::string >( row, 6 );
+  auto row = exdData->m_ActionTimelineDat.get_row( row_id );
+  key = exdData->getField< std::string >( row, 6 );
 }
 
 Sapphire::Data::ActionTimelineMove::ActionTimelineMove( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
 {
-   auto row = exdData->m_ActionTimelineMoveDat.get_row( row_id );
+  auto row = exdData->m_ActionTimelineMoveDat.get_row( row_id );
 }
 
 Sapphire::Data::ActionTimelineReplace::ActionTimelineReplace( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
 {
-   auto row = exdData->m_ActionTimelineReplaceDat.get_row( row_id );
-   old = exdData->getField< uint16_t >( row, 0 );
-   New = exdData->getField< uint16_t >( row, 1 );
+  auto row = exdData->m_ActionTimelineReplaceDat.get_row( row_id );
+  old = exdData->getField< uint16_t >( row, 0 );
+  _new = exdData->getField< uint16_t >( row, 1 );
 }
 
 Sapphire::Data::ActionTransient::ActionTransient( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
 {
-   auto row = exdData->m_ActionTransientDat.get_row( row_id );
-   description = exdData->getField< std::string >( row, 0 );
+  auto row = exdData->m_ActionTransientDat.get_row( row_id );
+  description = exdData->getField< std::string >( row, 0 );
 }
 
 Sapphire::Data::ActivityFeedButtons::ActivityFeedButtons( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
 {
-   auto row = exdData->m_ActivityFeedButtonsDat.get_row( row_id );
-   bannerURL = exdData->getField< std::string >( row, 1 );
-   description = exdData->getField< std::string >( row, 2 );
-   language = exdData->getField< std::string >( row, 3 );
-   pictureURL = exdData->getField< std::string >( row, 4 );
+  auto row = exdData->m_ActivityFeedButtonsDat.get_row( row_id );
+  bannerURL = exdData->getField< std::string >( row, 1 );
+  description = exdData->getField< std::string >( row, 2 );
+  language = exdData->getField< std::string >( row, 3 );
+  pictureURL = exdData->getField< std::string >( row, 4 );
 }
 
 Sapphire::Data::ActivityFeedCaptions::ActivityFeedCaptions( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
 {
-   auto row = exdData->m_ActivityFeedCaptionsDat.get_row( row_id );
-   jA = exdData->getField< std::string >( row, 0 );
-   eN = exdData->getField< std::string >( row, 1 );
-   dE = exdData->getField< std::string >( row, 2 );
-   fR = exdData->getField< std::string >( row, 3 );
+  auto row = exdData->m_ActivityFeedCaptionsDat.get_row( row_id );
+  jA = exdData->getField< std::string >( row, 0 );
+  eN = exdData->getField< std::string >( row, 1 );
+  dE = exdData->getField< std::string >( row, 2 );
+  fR = exdData->getField< std::string >( row, 3 );
 }
 
 Sapphire::Data::ActivityFeedGroupCaptions::ActivityFeedGroupCaptions( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
 {
-   auto row = exdData->m_ActivityFeedGroupCaptionsDat.get_row( row_id );
-   jA = exdData->getField< std::string >( row, 0 );
-   eN = exdData->getField< std::string >( row, 1 );
-   dE = exdData->getField< std::string >( row, 2 );
-   fR = exdData->getField< std::string >( row, 3 );
+  auto row = exdData->m_ActivityFeedGroupCaptionsDat.get_row( row_id );
+  jA = exdData->getField< std::string >( row, 0 );
+  eN = exdData->getField< std::string >( row, 1 );
+  dE = exdData->getField< std::string >( row, 2 );
+  fR = exdData->getField< std::string >( row, 3 );
 }
 
 Sapphire::Data::ActivityFeedImages::ActivityFeedImages( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
 {
-   auto row = exdData->m_ActivityFeedImagesDat.get_row( row_id );
-   expansionImage = exdData->getField< std::string >( row, 0 );
-   activityFeedJA = exdData->getField< std::string >( row, 1 );
-   activityFeedEN = exdData->getField< std::string >( row, 2 );
-   activityFeedDE = exdData->getField< std::string >( row, 3 );
-   activityFeedFR = exdData->getField< std::string >( row, 4 );
+  auto row = exdData->m_ActivityFeedImagesDat.get_row( row_id );
+  expansionImage = exdData->getField< std::string >( row, 0 );
+  activityFeedJA = exdData->getField< std::string >( row, 1 );
+  activityFeedEN = exdData->getField< std::string >( row, 2 );
+  activityFeedDE = exdData->getField< std::string >( row, 3 );
+  activityFeedFR = exdData->getField< std::string >( row, 4 );
 }
 
 Sapphire::Data::Addon::Addon( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
 {
-   auto row = exdData->m_AddonDat.get_row( row_id );
-   text = exdData->getField< std::string >( row, 0 );
+  auto row = exdData->m_AddonDat.get_row( row_id );
+  text = exdData->getField< std::string >( row, 0 );
 }
 
 Sapphire::Data::AddonHud::AddonHud( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
 {
-   auto row = exdData->m_AddonHudDat.get_row( row_id );
-   _long = exdData->getField< std::string >( row, 0 );
-   _short = exdData->getField< std::string >( row, 1 );
-   _function = exdData->getField< std::string >( row, 2 );
+  auto row = exdData->m_AddonHudDat.get_row( row_id );
+  _long = exdData->getField< std::string >( row, 0 );
+  _short = exdData->getField< std::string >( row, 1 );
+  function = exdData->getField< std::string >( row, 2 );
 }
 
 Sapphire::Data::Adventure::Adventure( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
 {
-   auto row = exdData->m_AdventureDat.get_row( row_id );
-   level = exdData->getField< int32_t >( row, 0 );
-   emote = exdData->getField< uint16_t >( row, 3 );
-   minTime = exdData->getField< uint16_t >( row, 4 );
-   maxTime = exdData->getField< uint16_t >( row, 5 );
-   placeName = exdData->getField< int32_t >( row, 6 );
-   iconList = exdData->getField< int32_t >( row, 7 );
-   iconDiscovered = exdData->getField< int32_t >( row, 8 );
-   name = exdData->getField< std::string >( row, 9 );
-   impression = exdData->getField< std::string >( row, 10 );
-   description = exdData->getField< std::string >( row, 11 );
-   iconUndiscovered = exdData->getField< int32_t >( row, 12 );
-   isInitial = exdData->getField< bool >( row, 13 );
+  auto row = exdData->m_AdventureDat.get_row( row_id );
+  level = exdData->getField< int32_t >( row, 0 );
+  emote = exdData->getField< uint16_t >( row, 3 );
+  minTime = exdData->getField< uint16_t >( row, 4 );
+  maxTime = exdData->getField< uint16_t >( row, 5 );
+  placeName = exdData->getField< int32_t >( row, 6 );
+  iconList = exdData->getField< int32_t >( row, 7 );
+  iconDiscovered = exdData->getField< int32_t >( row, 8 );
+  name = exdData->getField< std::string >( row, 9 );
+  impression = exdData->getField< std::string >( row, 10 );
+  description = exdData->getField< std::string >( row, 11 );
+  iconUndiscovered = exdData->getField< int32_t >( row, 12 );
+  isInitial = exdData->getField< bool >( row, 13 );
 }
 
 Sapphire::Data::AdventureExPhase::AdventureExPhase( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
 {
-   auto row = exdData->m_AdventureExPhaseDat.get_row( row_id );
-   quest = exdData->getField< uint32_t >( row, 0 );
-   adventureBegin = exdData->getField< uint32_t >( row, 1 );
-   adventureEnd = exdData->getField< uint32_t >( row, 2 );
+  auto row = exdData->m_AdventureExPhaseDat.get_row( row_id );
+  quest = exdData->getField< uint32_t >( row, 0 );
+  adventureBegin = exdData->getField< uint32_t >( row, 1 );
+  adventureEnd = exdData->getField< uint32_t >( row, 2 );
 }
 
 Sapphire::Data::AetherCurrent::AetherCurrent( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
 {
-   auto row = exdData->m_AetherCurrentDat.get_row( row_id );
-   quest = exdData->getField< uint32_t >( row, 0 );
+  auto row = exdData->m_AetherCurrentDat.get_row( row_id );
+  quest = exdData->getField< uint32_t >( row, 0 );
 }
 
 Sapphire::Data::AetherCurrentCompFlgSet::AetherCurrentCompFlgSet( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
 {
-   auto row = exdData->m_AetherCurrentCompFlgSetDat.get_row( row_id );
-   territory = exdData->getField< int32_t >( row, 0 );
-   aetherCurrent.push_back( exdData->getField< int32_t >( row, 2 ) );
-   aetherCurrent.push_back( exdData->getField< int32_t >( row, 3 ) );
-   aetherCurrent.push_back( exdData->getField< int32_t >( row, 4 ) );
-   aetherCurrent.push_back( exdData->getField< int32_t >( row, 5 ) );
-   aetherCurrent.push_back( exdData->getField< int32_t >( row, 6 ) );
-   aetherCurrent.push_back( exdData->getField< int32_t >( row, 7 ) );
-   aetherCurrent.push_back( exdData->getField< int32_t >( row, 8 ) );
-   aetherCurrent.push_back( exdData->getField< int32_t >( row, 9 ) );
-   aetherCurrent.push_back( exdData->getField< int32_t >( row, 10 ) );
-   aetherCurrent.push_back( exdData->getField< int32_t >( row, 11 ) );
-   aetherCurrent.push_back( exdData->getField< int32_t >( row, 12 ) );
-   aetherCurrent.push_back( exdData->getField< int32_t >( row, 13 ) );
-   aetherCurrent.push_back( exdData->getField< int32_t >( row, 14 ) );
-   aetherCurrent.push_back( exdData->getField< int32_t >( row, 15 ) );
-   aetherCurrent.push_back( exdData->getField< int32_t >( row, 16 ) );
+  auto row = exdData->m_AetherCurrentCompFlgSetDat.get_row( row_id );
+  territory = exdData->getField< int32_t >( row, 0 );
+  aetherCurrent.push_back( exdData->getField< int32_t >( row, 2 ) );
+  aetherCurrent.push_back( exdData->getField< int32_t >( row, 3 ) );
+  aetherCurrent.push_back( exdData->getField< int32_t >( row, 4 ) );
+  aetherCurrent.push_back( exdData->getField< int32_t >( row, 5 ) );
+  aetherCurrent.push_back( exdData->getField< int32_t >( row, 6 ) );
+  aetherCurrent.push_back( exdData->getField< int32_t >( row, 7 ) );
+  aetherCurrent.push_back( exdData->getField< int32_t >( row, 8 ) );
+  aetherCurrent.push_back( exdData->getField< int32_t >( row, 9 ) );
+  aetherCurrent.push_back( exdData->getField< int32_t >( row, 10 ) );
+  aetherCurrent.push_back( exdData->getField< int32_t >( row, 11 ) );
+  aetherCurrent.push_back( exdData->getField< int32_t >( row, 12 ) );
+  aetherCurrent.push_back( exdData->getField< int32_t >( row, 13 ) );
+  aetherCurrent.push_back( exdData->getField< int32_t >( row, 14 ) );
+  aetherCurrent.push_back( exdData->getField< int32_t >( row, 15 ) );
+  aetherCurrent.push_back( exdData->getField< int32_t >( row, 16 ) );
 }
 
 Sapphire::Data::AetherialWheel::AetherialWheel( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
 {
-   auto row = exdData->m_AetherialWheelDat.get_row( row_id );
-   itemUnprimed = exdData->getField< int32_t >( row, 0 );
-   itemPrimed = exdData->getField< int32_t >( row, 1 );
-   grade = exdData->getField< uint8_t >( row, 2 );
-   hoursRequired = exdData->getField< uint8_t >( row, 3 );
+  auto row = exdData->m_AetherialWheelDat.get_row( row_id );
+  itemUnprimed = exdData->getField< int32_t >( row, 0 );
+  itemPrimed = exdData->getField< int32_t >( row, 1 );
+  grade = exdData->getField< uint8_t >( row, 2 );
+  hoursRequired = exdData->getField< uint8_t >( row, 3 );
 }
 
 Sapphire::Data::Aetheryte::Aetheryte( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
 {
-   auto row = exdData->m_AetheryteDat.get_row( row_id );
-   singular = exdData->getField< std::string >( row, 0 );
-   adjective = exdData->getField< int8_t >( row, 1 );
-   plural = exdData->getField< std::string >( row, 2 );
-   possessivePronoun = exdData->getField< int8_t >( row, 3 );
-   startsWithVowel = exdData->getField< int8_t >( row, 4 );
-   pronoun = exdData->getField< int8_t >( row, 6 );
-   article = exdData->getField< int8_t >( row, 7 );
-   placeName = exdData->getField< uint16_t >( row, 8 );
-   aethernetName = exdData->getField< uint16_t >( row, 9 );
-   territory = exdData->getField< uint16_t >( row, 10 );
-   level.push_back( exdData->getField< uint32_t >( row, 11 ) );
-   level.push_back( exdData->getField< uint32_t >( row, 12 ) );
-   level.push_back( exdData->getField< uint32_t >( row, 13 ) );
-   level.push_back( exdData->getField< uint32_t >( row, 14 ) );
-   isAetheryte = exdData->getField< bool >( row, 15 );
-   aethernetGroup = exdData->getField< uint8_t >( row, 16 );
-   requiredQuest = exdData->getField< uint32_t >( row, 18 );
-   map = exdData->getField< uint16_t >( row, 19 );
-   aetherstreamX = exdData->getField< int16_t >( row, 20 );
-   aetherstreamY = exdData->getField< int16_t >( row, 21 );
+  auto row = exdData->m_AetheryteDat.get_row( row_id );
+  singular = exdData->getField< std::string >( row, 0 );
+  adjective = exdData->getField< int8_t >( row, 1 );
+  plural = exdData->getField< std::string >( row, 2 );
+  possessivePronoun = exdData->getField< int8_t >( row, 3 );
+  startsWithVowel = exdData->getField< int8_t >( row, 4 );
+  pronoun = exdData->getField< int8_t >( row, 6 );
+  article = exdData->getField< int8_t >( row, 7 );
+  placeName = exdData->getField< uint16_t >( row, 8 );
+  aethernetName = exdData->getField< uint16_t >( row, 9 );
+  territory = exdData->getField< uint16_t >( row, 10 );
+  level.push_back( exdData->getField< uint32_t >( row, 11 ) );
+  level.push_back( exdData->getField< uint32_t >( row, 12 ) );
+  level.push_back( exdData->getField< uint32_t >( row, 13 ) );
+  level.push_back( exdData->getField< uint32_t >( row, 14 ) );
+  isAetheryte = exdData->getField< bool >( row, 15 );
+  aethernetGroup = exdData->getField< uint8_t >( row, 16 );
+  requiredQuest = exdData->getField< uint32_t >( row, 18 );
+  map = exdData->getField< uint16_t >( row, 19 );
+  aetherstreamX = exdData->getField< int16_t >( row, 20 );
+  aetherstreamY = exdData->getField< int16_t >( row, 21 );
 }
 
 Sapphire::Data::AetheryteSystemDefine::AetheryteSystemDefine( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
 {
-   auto row = exdData->m_AetheryteSystemDefineDat.get_row( row_id );
-   text = exdData->getField< std::string >( row, 0 );
+  auto row = exdData->m_AetheryteSystemDefineDat.get_row( row_id );
+  text = exdData->getField< std::string >( row, 0 );
 }
 
 Sapphire::Data::AirshipExplorationLevel::AirshipExplorationLevel( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
 {
-   auto row = exdData->m_AirshipExplorationLevelDat.get_row( row_id );
-   expToNext = exdData->getField< uint32_t >( row, 1 );
+  auto row = exdData->m_AirshipExplorationLevelDat.get_row( row_id );
+  expToNext = exdData->getField< uint32_t >( row, 1 );
 }
 
 Sapphire::Data::AirshipExplorationLog::AirshipExplorationLog( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
 {
-   auto row = exdData->m_AirshipExplorationLogDat.get_row( row_id );
-   text = exdData->getField< std::string >( row, 0 );
+  auto row = exdData->m_AirshipExplorationLogDat.get_row( row_id );
+  text = exdData->getField< std::string >( row, 0 );
 }
 
 Sapphire::Data::AirshipExplorationParamType::AirshipExplorationParamType( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
 {
-   auto row = exdData->m_AirshipExplorationParamTypeDat.get_row( row_id );
-   name = exdData->getField< std::string >( row, 0 );
+  auto row = exdData->m_AirshipExplorationParamTypeDat.get_row( row_id );
+  name = exdData->getField< std::string >( row, 0 );
 }
 
 Sapphire::Data::AirshipExplorationPart::AirshipExplorationPart( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
 {
-   auto row = exdData->m_AirshipExplorationPartDat.get_row( row_id );
-   rank = exdData->getField< uint8_t >( row, 1 );
-   components = exdData->getField< uint8_t >( row, 2 );
-   surveillance = exdData->getField< int16_t >( row, 3 );
-   retrieval = exdData->getField< int16_t >( row, 4 );
-   speed = exdData->getField< int16_t >( row, 5 );
-   range = exdData->getField< int16_t >( row, 6 );
-   favor = exdData->getField< int16_t >( row, 7 );
-   repairMaterials = exdData->getField< uint8_t >( row, 9 );
+  auto row = exdData->m_AirshipExplorationPartDat.get_row( row_id );
+  rank = exdData->getField< uint8_t >( row, 1 );
+  components = exdData->getField< uint8_t >( row, 2 );
+  surveillance = exdData->getField< int16_t >( row, 3 );
+  retrieval = exdData->getField< int16_t >( row, 4 );
+  speed = exdData->getField< int16_t >( row, 5 );
+  range = exdData->getField< int16_t >( row, 6 );
+  favor = exdData->getField< int16_t >( row, 7 );
+  repairMaterials = exdData->getField< uint8_t >( row, 9 );
 }
 
 Sapphire::Data::AirshipExplorationPoint::AirshipExplorationPoint( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
 {
-   auto row = exdData->m_AirshipExplorationPointDat.get_row( row_id );
-   name = exdData->getField< std::string >( row, 0 );
-   nameShort = exdData->getField< std::string >( row, 1 );
-   requiredLevel = exdData->getField< uint8_t >( row, 5 );
-   requiredFuel = exdData->getField< uint16_t >( row, 6 );
-   durationmin = exdData->getField< uint16_t >( row, 7 );
-   requiredSurveillance = exdData->getField< uint8_t >( row, 10 );
-   expReward = exdData->getField< uint32_t >( row, 13 );
+  auto row = exdData->m_AirshipExplorationPointDat.get_row( row_id );
+  name = exdData->getField< std::string >( row, 0 );
+  nameShort = exdData->getField< std::string >( row, 1 );
+  requiredLevel = exdData->getField< uint8_t >( row, 5 );
+  requiredFuel = exdData->getField< uint16_t >( row, 6 );
+  durationmin = exdData->getField< uint16_t >( row, 7 );
+  requiredSurveillance = exdData->getField< uint8_t >( row, 10 );
+  expReward = exdData->getField< uint32_t >( row, 13 );
 }
 
 Sapphire::Data::AnimaWeapon5::AnimaWeapon5( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
 {
-   auto row = exdData->m_AnimaWeapon5Dat.get_row( row_id );
-   item = exdData->getField< int32_t >( row, 0 );
-   secondaryStatTotal = exdData->getField< uint8_t >( row, 2 );
-   parameter.push_back( exdData->getField< uint8_t >( row, 3 ) );
-   parameter.push_back( exdData->getField< uint8_t >( row, 4 ) );
-   parameter.push_back( exdData->getField< uint8_t >( row, 5 ) );
-   parameter.push_back( exdData->getField< uint8_t >( row, 6 ) );
-   parameter.push_back( exdData->getField< uint8_t >( row, 7 ) );
+  auto row = exdData->m_AnimaWeapon5Dat.get_row( row_id );
+  item = exdData->getField< int32_t >( row, 0 );
+  secondaryStatTotal = exdData->getField< uint8_t >( row, 2 );
+  parameter.push_back( exdData->getField< uint8_t >( row, 3 ) );
+  parameter.push_back( exdData->getField< uint8_t >( row, 4 ) );
+  parameter.push_back( exdData->getField< uint8_t >( row, 5 ) );
+  parameter.push_back( exdData->getField< uint8_t >( row, 6 ) );
+  parameter.push_back( exdData->getField< uint8_t >( row, 7 ) );
 }
 
 Sapphire::Data::AnimaWeapon5Param::AnimaWeapon5Param( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
 {
-   auto row = exdData->m_AnimaWeapon5ParamDat.get_row( row_id );
-   baseParam = exdData->getField< uint8_t >( row, 0 );
-   name = exdData->getField< std::string >( row, 1 );
+  auto row = exdData->m_AnimaWeapon5ParamDat.get_row( row_id );
+  baseParam = exdData->getField< uint8_t >( row, 0 );
+  name = exdData->getField< std::string >( row, 1 );
 }
 
 Sapphire::Data::AnimaWeapon5PatternGroup::AnimaWeapon5PatternGroup( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
 {
-   auto row = exdData->m_AnimaWeapon5PatternGroupDat.get_row( row_id );
-   name = exdData->getField< std::string >( row, 0 );
+  auto row = exdData->m_AnimaWeapon5PatternGroupDat.get_row( row_id );
+  name = exdData->getField< std::string >( row, 0 );
 }
 
 Sapphire::Data::AnimaWeapon5SpiritTalk::AnimaWeapon5SpiritTalk( uint32_t row_id, uint32_t subRow, Sapphire::Data::ExdDataGenerated* exdData )
 {
-   auto row = exdData->m_AnimaWeapon5SpiritTalkDat.get_row( row_id, subRow );
-   dialogue = exdData->getField< int32_t >( row, 0 );
+  auto row = exdData->m_AnimaWeapon5SpiritTalkDat.get_row( row_id, subRow );
+  dialogue = exdData->getField< int32_t >( row, 0 );
 }
 
 Sapphire::Data::AnimaWeapon5SpiritTalkParam::AnimaWeapon5SpiritTalkParam( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
 {
-   auto row = exdData->m_AnimaWeapon5SpiritTalkParamDat.get_row( row_id );
-   prologue = exdData->getField< std::string >( row, 0 );
-   epilogue = exdData->getField< std::string >( row, 1 );
+  auto row = exdData->m_AnimaWeapon5SpiritTalkParamDat.get_row( row_id );
+  prologue = exdData->getField< std::string >( row, 0 );
+  epilogue = exdData->getField< std::string >( row, 1 );
 }
 
 Sapphire::Data::AnimaWeapon5TradeItem::AnimaWeapon5TradeItem( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
 {
-   auto row = exdData->m_AnimaWeapon5TradeItemDat.get_row( row_id );
-   crystalSand = exdData->getField< uint32_t >( row, 1 );
-   qty = exdData->getField< uint8_t >( row, 2 );
-   category = exdData->getField< uint8_t >( row, 27 );
+  auto row = exdData->m_AnimaWeapon5TradeItemDat.get_row( row_id );
+  crystalSand = exdData->getField< uint32_t >( row, 1 );
+  qty = exdData->getField< uint8_t >( row, 2 );
+  category = exdData->getField< uint8_t >( row, 27 );
 }
 
 Sapphire::Data::AnimaWeaponFUITalk::AnimaWeaponFUITalk( uint32_t row_id, uint32_t subRow, Sapphire::Data::ExdDataGenerated* exdData )
 {
-   auto row = exdData->m_AnimaWeaponFUITalkDat.get_row( row_id, subRow );
-   dialogue = exdData->getField< int32_t >( row, 0 );
+  auto row = exdData->m_AnimaWeaponFUITalkDat.get_row( row_id, subRow );
+  dialogue = exdData->getField< int32_t >( row, 0 );
 }
 
 Sapphire::Data::AnimaWeaponFUITalkParam::AnimaWeaponFUITalkParam( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
 {
-   auto row = exdData->m_AnimaWeaponFUITalkParamDat.get_row( row_id );
-   prologue = exdData->getField< std::string >( row, 0 );
-   epilogue = exdData->getField< std::string >( row, 1 );
+  auto row = exdData->m_AnimaWeaponFUITalkParamDat.get_row( row_id );
+  prologue = exdData->getField< std::string >( row, 0 );
+  epilogue = exdData->getField< std::string >( row, 1 );
 }
 
 Sapphire::Data::AnimaWeaponIcon::AnimaWeaponIcon( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
 {
-   auto row = exdData->m_AnimaWeaponIconDat.get_row( row_id );
-   hyperconductive = exdData->getField< int32_t >( row, 0 );
-   reborn = exdData->getField< int32_t >( row, 1 );
-   sharpened = exdData->getField< int32_t >( row, 2 );
-   zodiac = exdData->getField< int32_t >( row, 3 );
-   zodiacLux = exdData->getField< int32_t >( row, 4 );
+  auto row = exdData->m_AnimaWeaponIconDat.get_row( row_id );
+  hyperconductive = exdData->getField< int32_t >( row, 0 );
+  reborn = exdData->getField< int32_t >( row, 1 );
+  sharpened = exdData->getField< int32_t >( row, 2 );
+  zodiac = exdData->getField< int32_t >( row, 3 );
+  zodiacLux = exdData->getField< int32_t >( row, 4 );
 }
 
 Sapphire::Data::AnimaWeaponItem::AnimaWeaponItem( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
 {
-   auto row = exdData->m_AnimaWeaponItemDat.get_row( row_id );
-   item.push_back( exdData->getField< uint32_t >( row, 0 ) );
-   item.push_back( exdData->getField< uint32_t >( row, 1 ) );
-   item.push_back( exdData->getField< uint32_t >( row, 2 ) );
-   item.push_back( exdData->getField< uint32_t >( row, 3 ) );
-   item.push_back( exdData->getField< uint32_t >( row, 4 ) );
-   item.push_back( exdData->getField< uint32_t >( row, 5 ) );
-   item.push_back( exdData->getField< uint32_t >( row, 6 ) );
-   item.push_back( exdData->getField< uint32_t >( row, 7 ) );
-   item.push_back( exdData->getField< uint32_t >( row, 8 ) );
-   item.push_back( exdData->getField< uint32_t >( row, 9 ) );
-   item.push_back( exdData->getField< uint32_t >( row, 10 ) );
-   item.push_back( exdData->getField< uint32_t >( row, 11 ) );
-   item.push_back( exdData->getField< uint32_t >( row, 12 ) );
-   item.push_back( exdData->getField< uint32_t >( row, 13 ) );
+  auto row = exdData->m_AnimaWeaponItemDat.get_row( row_id );
+  item.push_back( exdData->getField< uint32_t >( row, 0 ) );
+  item.push_back( exdData->getField< uint32_t >( row, 1 ) );
+  item.push_back( exdData->getField< uint32_t >( row, 2 ) );
+  item.push_back( exdData->getField< uint32_t >( row, 3 ) );
+  item.push_back( exdData->getField< uint32_t >( row, 4 ) );
+  item.push_back( exdData->getField< uint32_t >( row, 5 ) );
+  item.push_back( exdData->getField< uint32_t >( row, 6 ) );
+  item.push_back( exdData->getField< uint32_t >( row, 7 ) );
+  item.push_back( exdData->getField< uint32_t >( row, 8 ) );
+  item.push_back( exdData->getField< uint32_t >( row, 9 ) );
+  item.push_back( exdData->getField< uint32_t >( row, 10 ) );
+  item.push_back( exdData->getField< uint32_t >( row, 11 ) );
+  item.push_back( exdData->getField< uint32_t >( row, 12 ) );
+  item.push_back( exdData->getField< uint32_t >( row, 13 ) );
 }
 
 Sapphire::Data::AozAction::AozAction( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
 {
-   auto row = exdData->m_AozActionDat.get_row( row_id );
-   action = exdData->getField< uint32_t >( row, 0 );
+  auto row = exdData->m_AozActionDat.get_row( row_id );
+  action = exdData->getField< uint32_t >( row, 0 );
 }
 
 Sapphire::Data::AozActionTransient::AozActionTransient( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
 {
-   auto row = exdData->m_AozActionTransientDat.get_row( row_id );
-   icon = exdData->getField< uint32_t >( row, 1 );
-   stats = exdData->getField< std::string >( row, 2 );
-   description = exdData->getField< std::string >( row, 3 );
-   location = exdData->getField< uint16_t >( row, 5 );
-   startQuest = exdData->getField< uint32_t >( row, 6 );
-   nextQuest = exdData->getField< uint32_t >( row, 7 );
+  auto row = exdData->m_AozActionTransientDat.get_row( row_id );
+  icon = exdData->getField< uint32_t >( row, 1 );
+  stats = exdData->getField< std::string >( row, 2 );
+  description = exdData->getField< std::string >( row, 3 );
+  location = exdData->getField< uint16_t >( row, 5 );
+  startQuest = exdData->getField< uint32_t >( row, 6 );
+  nextQuest = exdData->getField< uint32_t >( row, 7 );
 }
 
 Sapphire::Data::AOZArrangement::AOZArrangement( uint32_t row_id, uint32_t subRow, Sapphire::Data::ExdDataGenerated* exdData )
 {
-   auto row = exdData->m_AOZArrangementDat.get_row( row_id, subRow );
-   aOZContentBriefingBNpc = exdData->getField< uint16_t >( row, 0 );
+  auto row = exdData->m_AOZArrangementDat.get_row( row_id, subRow );
+  aOZContentBriefingBNpc = exdData->getField< uint16_t >( row, 0 );
 }
 
 Sapphire::Data::AOZBoss::AOZBoss( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
 {
-   auto row = exdData->m_AOZBossDat.get_row( row_id );
-   boss = exdData->getField< uint16_t >( row, 0 );
+  auto row = exdData->m_AOZBossDat.get_row( row_id );
+  boss = exdData->getField< uint16_t >( row, 0 );
 }
 
 Sapphire::Data::AOZContent::AOZContent( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
 {
-   auto row = exdData->m_AOZContentDat.get_row( row_id );
-   standardFinishTime = exdData->getField< uint16_t >( row, 0 );
-   idealFinishTime = exdData->getField< uint16_t >( row, 1 );
-   act1FightType = exdData->getField< uint8_t >( row, 2 );
-   act1 = exdData->getField< uint16_t >( row, 3 );
-   arenaType1 = exdData->getField< uint8_t >( row, 4 );
-   act2FightType = exdData->getField< uint8_t >( row, 5 );
-   act2 = exdData->getField< uint16_t >( row, 6 );
-   arenaType2 = exdData->getField< uint8_t >( row, 7 );
-   act3FightType = exdData->getField< uint8_t >( row, 8 );
-   act3 = exdData->getField< uint16_t >( row, 9 );
-   arenaType3 = exdData->getField< uint8_t >( row, 10 );
-   contentEntry = exdData->getField< uint32_t >( row, 11 );
-   order = exdData->getField< uint8_t >( row, 12 );
-   gilReward = exdData->getField< uint16_t >( row, 13 );
-   alliedSealsReward = exdData->getField< uint16_t >( row, 14 );
-   tomestonesReward = exdData->getField< uint16_t >( row, 15 );
+  auto row = exdData->m_AOZContentDat.get_row( row_id );
+  standardFinishTime = exdData->getField< uint16_t >( row, 0 );
+  idealFinishTime = exdData->getField< uint16_t >( row, 1 );
+  act1FightType = exdData->getField< uint8_t >( row, 2 );
+  act1 = exdData->getField< uint16_t >( row, 3 );
+  arenaType1 = exdData->getField< uint8_t >( row, 4 );
+  act2FightType = exdData->getField< uint8_t >( row, 5 );
+  act2 = exdData->getField< uint16_t >( row, 6 );
+  arenaType2 = exdData->getField< uint8_t >( row, 7 );
+  act3FightType = exdData->getField< uint8_t >( row, 8 );
+  act3 = exdData->getField< uint16_t >( row, 9 );
+  arenaType3 = exdData->getField< uint8_t >( row, 10 );
+  contentEntry = exdData->getField< uint32_t >( row, 11 );
+  order = exdData->getField< uint8_t >( row, 12 );
+  gilReward = exdData->getField< uint16_t >( row, 13 );
+  alliedSealsReward = exdData->getField< uint16_t >( row, 14 );
+  tomestonesReward = exdData->getField< uint16_t >( row, 15 );
 }
 
 Sapphire::Data::AOZContentBriefingBNpc::AOZContentBriefingBNpc( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
 {
-   auto row = exdData->m_AOZContentBriefingBNpcDat.get_row( row_id );
-   bNpcName = exdData->getField< uint32_t >( row, 0 );
-   targetSmall = exdData->getField< uint32_t >( row, 1 );
-   targetLarge = exdData->getField< uint32_t >( row, 2 );
-   endurance = exdData->getField< uint8_t >( row, 4 );
-   fire = exdData->getField< uint8_t >( row, 5 );
-   ice = exdData->getField< uint8_t >( row, 6 );
-   wind = exdData->getField< uint8_t >( row, 7 );
-   earth = exdData->getField< uint8_t >( row, 8 );
-   thunder = exdData->getField< uint8_t >( row, 9 );
-   water = exdData->getField< uint8_t >( row, 10 );
-   slashing = exdData->getField< uint8_t >( row, 11 );
-   piercing = exdData->getField< uint8_t >( row, 12 );
-   blunt = exdData->getField< uint8_t >( row, 13 );
-   magic = exdData->getField< uint8_t >( row, 14 );
-   slowResistance = exdData->getField< bool >( row, 15 );
-   petrificationResistance = exdData->getField< bool >( row, 16 );
-   paralysisResistance = exdData->getField< bool >( row, 17 );
-   silenceResistance = exdData->getField< bool >( row, 18 );
-   blindResistance = exdData->getField< bool >( row, 19 );
-   stunResistance = exdData->getField< bool >( row, 20 );
-   sleepResistance = exdData->getField< bool >( row, 21 );
-   bindResistance = exdData->getField< bool >( row, 22 );
-   heavyResistance = exdData->getField< bool >( row, 23 );
-   instaDeathResistance = exdData->getField< bool >( row, 24 );
+  auto row = exdData->m_AOZContentBriefingBNpcDat.get_row( row_id );
+  bNpcName = exdData->getField< uint32_t >( row, 0 );
+  targetSmall = exdData->getField< uint32_t >( row, 1 );
+  targetLarge = exdData->getField< uint32_t >( row, 2 );
+  endurance = exdData->getField< uint8_t >( row, 4 );
+  fire = exdData->getField< uint8_t >( row, 5 );
+  ice = exdData->getField< uint8_t >( row, 6 );
+  wind = exdData->getField< uint8_t >( row, 7 );
+  earth = exdData->getField< uint8_t >( row, 8 );
+  thunder = exdData->getField< uint8_t >( row, 9 );
+  water = exdData->getField< uint8_t >( row, 10 );
+  slashing = exdData->getField< uint8_t >( row, 11 );
+  piercing = exdData->getField< uint8_t >( row, 12 );
+  blunt = exdData->getField< uint8_t >( row, 13 );
+  magic = exdData->getField< uint8_t >( row, 14 );
+  slowResistance = exdData->getField< bool >( row, 15 );
+  petrificationResistance = exdData->getField< bool >( row, 16 );
+  paralysisResistance = exdData->getField< bool >( row, 17 );
+  silenceResistance = exdData->getField< bool >( row, 18 );
+  blindResistance = exdData->getField< bool >( row, 19 );
+  stunResistance = exdData->getField< bool >( row, 20 );
+  sleepResistance = exdData->getField< bool >( row, 21 );
+  bindResistance = exdData->getField< bool >( row, 22 );
+  heavyResistance = exdData->getField< bool >( row, 23 );
+  instaDeathResistance = exdData->getField< bool >( row, 24 );
 }
 
 Sapphire::Data::AquariumFish::AquariumFish( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
 {
-   auto row = exdData->m_AquariumFishDat.get_row( row_id );
-   aquariumWater = exdData->getField< uint8_t >( row, 0 );
-   size = exdData->getField< uint8_t >( row, 1 );
-   item = exdData->getField< uint32_t >( row, 2 );
+  auto row = exdData->m_AquariumFishDat.get_row( row_id );
+  aquariumWater = exdData->getField< uint8_t >( row, 0 );
+  size = exdData->getField< uint8_t >( row, 1 );
+  item = exdData->getField< uint32_t >( row, 2 );
 }
 
 Sapphire::Data::AquariumWater::AquariumWater( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
 {
-   auto row = exdData->m_AquariumWaterDat.get_row( row_id );
-   name = exdData->getField< std::string >( row, 1 );
+  auto row = exdData->m_AquariumWaterDat.get_row( row_id );
+  name = exdData->getField< std::string >( row, 1 );
 }
 
 Sapphire::Data::ArrayEventHandler::ArrayEventHandler( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
 {
-   auto row = exdData->m_ArrayEventHandlerDat.get_row( row_id );
-   data.push_back( exdData->getField< uint32_t >( row, 0 ) );
-   data.push_back( exdData->getField< uint32_t >( row, 1 ) );
-   data.push_back( exdData->getField< uint32_t >( row, 2 ) );
-   data.push_back( exdData->getField< uint32_t >( row, 3 ) );
-   data.push_back( exdData->getField< uint32_t >( row, 4 ) );
-   data.push_back( exdData->getField< uint32_t >( row, 5 ) );
-   data.push_back( exdData->getField< uint32_t >( row, 6 ) );
-   data.push_back( exdData->getField< uint32_t >( row, 7 ) );
-   data.push_back( exdData->getField< uint32_t >( row, 8 ) );
-   data.push_back( exdData->getField< uint32_t >( row, 9 ) );
-   data.push_back( exdData->getField< uint32_t >( row, 10 ) );
-   data.push_back( exdData->getField< uint32_t >( row, 11 ) );
-   data.push_back( exdData->getField< uint32_t >( row, 12 ) );
-   data.push_back( exdData->getField< uint32_t >( row, 13 ) );
-   data.push_back( exdData->getField< uint32_t >( row, 14 ) );
-   data.push_back( exdData->getField< uint32_t >( row, 15 ) );
+  auto row = exdData->m_ArrayEventHandlerDat.get_row( row_id );
+  data.push_back( exdData->getField< uint32_t >( row, 0 ) );
+  data.push_back( exdData->getField< uint32_t >( row, 1 ) );
+  data.push_back( exdData->getField< uint32_t >( row, 2 ) );
+  data.push_back( exdData->getField< uint32_t >( row, 3 ) );
+  data.push_back( exdData->getField< uint32_t >( row, 4 ) );
+  data.push_back( exdData->getField< uint32_t >( row, 5 ) );
+  data.push_back( exdData->getField< uint32_t >( row, 6 ) );
+  data.push_back( exdData->getField< uint32_t >( row, 7 ) );
+  data.push_back( exdData->getField< uint32_t >( row, 8 ) );
+  data.push_back( exdData->getField< uint32_t >( row, 9 ) );
+  data.push_back( exdData->getField< uint32_t >( row, 10 ) );
+  data.push_back( exdData->getField< uint32_t >( row, 11 ) );
+  data.push_back( exdData->getField< uint32_t >( row, 12 ) );
+  data.push_back( exdData->getField< uint32_t >( row, 13 ) );
+  data.push_back( exdData->getField< uint32_t >( row, 14 ) );
+  data.push_back( exdData->getField< uint32_t >( row, 15 ) );
 }
 
 Sapphire::Data::AttackType::AttackType( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
 {
-   auto row = exdData->m_AttackTypeDat.get_row( row_id );
-   name = exdData->getField< std::string >( row, 0 );
+  auto row = exdData->m_AttackTypeDat.get_row( row_id );
+  name = exdData->getField< std::string >( row, 0 );
 }
 
 Sapphire::Data::BacklightColor::BacklightColor( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
 {
-   auto row = exdData->m_BacklightColorDat.get_row( row_id );
-   color = exdData->getField< uint32_t >( row, 0 );
+  auto row = exdData->m_BacklightColorDat.get_row( row_id );
+  color = exdData->getField< uint32_t >( row, 0 );
 }
 
 Sapphire::Data::Balloon::Balloon( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
 {
-   auto row = exdData->m_BalloonDat.get_row( row_id );
-   dialogue = exdData->getField< std::string >( row, 1 );
+  auto row = exdData->m_BalloonDat.get_row( row_id );
+  dialogue = exdData->getField< std::string >( row, 1 );
 }
 
 Sapphire::Data::BaseParam::BaseParam( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
 {
-   auto row = exdData->m_BaseParamDat.get_row( row_id );
-   order = exdData->getField< int8_t >( row, 0 );
-   name = exdData->getField< std::string >( row, 1 );
-   description = exdData->getField< std::string >( row, 2 );
-   oneHWpn = exdData->getField< uint8_t >( row, 4 );
-   oH = exdData->getField< uint8_t >( row, 5 );
-   head = exdData->getField< uint8_t >( row, 6 );
-   chest = exdData->getField< uint8_t >( row, 7 );
-   hands = exdData->getField< uint8_t >( row, 8 );
-   waist = exdData->getField< uint8_t >( row, 9 );
-   legs = exdData->getField< uint8_t >( row, 10 );
-   feet = exdData->getField< uint8_t >( row, 11 );
-   earring = exdData->getField< uint8_t >( row, 12 );
-   necklace = exdData->getField< uint8_t >( row, 13 );
-   bracelet = exdData->getField< uint8_t >( row, 14 );
-   ring = exdData->getField< uint8_t >( row, 15 );
-   twoHWpn = exdData->getField< uint8_t >( row, 16 );
-   chestHead = exdData->getField< uint8_t >( row, 18 );
-   chestHeadLegsFeet = exdData->getField< uint8_t >( row, 19 );
-   legsFeet = exdData->getField< uint8_t >( row, 21 );
-   headChestHandsLegsFeet = exdData->getField< uint8_t >( row, 22 );
-   chestLegsGloves = exdData->getField< uint8_t >( row, 23 );
-   chestLegsFeet = exdData->getField< uint8_t >( row, 24 );
+  auto row = exdData->m_BaseParamDat.get_row( row_id );
+  order = exdData->getField< int8_t >( row, 0 );
+  name = exdData->getField< std::string >( row, 1 );
+  description = exdData->getField< std::string >( row, 2 );
+  oneHWpn = exdData->getField< uint8_t >( row, 4 );
+  oH = exdData->getField< uint8_t >( row, 5 );
+  head = exdData->getField< uint8_t >( row, 6 );
+  chest = exdData->getField< uint8_t >( row, 7 );
+  hands = exdData->getField< uint8_t >( row, 8 );
+  waist = exdData->getField< uint8_t >( row, 9 );
+  legs = exdData->getField< uint8_t >( row, 10 );
+  feet = exdData->getField< uint8_t >( row, 11 );
+  earring = exdData->getField< uint8_t >( row, 12 );
+  necklace = exdData->getField< uint8_t >( row, 13 );
+  bracelet = exdData->getField< uint8_t >( row, 14 );
+  ring = exdData->getField< uint8_t >( row, 15 );
+  twoHWpn = exdData->getField< uint8_t >( row, 16 );
+  chestHead = exdData->getField< uint8_t >( row, 18 );
+  chestHeadLegsFeet = exdData->getField< uint8_t >( row, 19 );
+  legsFeet = exdData->getField< uint8_t >( row, 21 );
+  headChestHandsLegsFeet = exdData->getField< uint8_t >( row, 22 );
+  chestLegsGloves = exdData->getField< uint8_t >( row, 23 );
+  chestLegsFeet = exdData->getField< uint8_t >( row, 24 );
 }
 
 Sapphire::Data::BattleLeve::BattleLeve( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
 {
-   auto row = exdData->m_BattleLeveDat.get_row( row_id );
-   enemyLevel.push_back( exdData->getField< uint16_t >( row, 16 ) );
-   enemyLevel.push_back( exdData->getField< uint16_t >( row, 17 ) );
-   enemyLevel.push_back( exdData->getField< uint16_t >( row, 18 ) );
-   enemyLevel.push_back( exdData->getField< uint16_t >( row, 19 ) );
-   enemyLevel.push_back( exdData->getField< uint16_t >( row, 20 ) );
-   enemyLevel.push_back( exdData->getField< uint16_t >( row, 21 ) );
-   enemyLevel.push_back( exdData->getField< uint16_t >( row, 22 ) );
-   enemyLevel.push_back( exdData->getField< uint16_t >( row, 23 ) );
-   bNpcName.push_back( exdData->getField< uint32_t >( row, 24 ) );
-   bNpcName.push_back( exdData->getField< uint32_t >( row, 25 ) );
-   bNpcName.push_back( exdData->getField< uint32_t >( row, 26 ) );
-   bNpcName.push_back( exdData->getField< uint32_t >( row, 27 ) );
-   bNpcName.push_back( exdData->getField< uint32_t >( row, 28 ) );
-   bNpcName.push_back( exdData->getField< uint32_t >( row, 29 ) );
-   bNpcName.push_back( exdData->getField< uint32_t >( row, 30 ) );
-   bNpcName.push_back( exdData->getField< uint32_t >( row, 31 ) );
-   itemsInvolved.push_back( exdData->getField< int32_t >( row, 32 ) );
-   itemsInvolved.push_back( exdData->getField< int32_t >( row, 33 ) );
-   itemsInvolved.push_back( exdData->getField< int32_t >( row, 34 ) );
-   itemsInvolved.push_back( exdData->getField< int32_t >( row, 35 ) );
-   itemsInvolved.push_back( exdData->getField< int32_t >( row, 36 ) );
-   itemsInvolved.push_back( exdData->getField< int32_t >( row, 37 ) );
-   itemsInvolved.push_back( exdData->getField< int32_t >( row, 38 ) );
-   itemsInvolved.push_back( exdData->getField< int32_t >( row, 39 ) );
-   itemsInvolvedQty.push_back( exdData->getField< uint8_t >( row, 40 ) );
-   itemsInvolvedQty.push_back( exdData->getField< uint8_t >( row, 41 ) );
-   itemsInvolvedQty.push_back( exdData->getField< uint8_t >( row, 42 ) );
-   itemsInvolvedQty.push_back( exdData->getField< uint8_t >( row, 43 ) );
-   itemsInvolvedQty.push_back( exdData->getField< uint8_t >( row, 44 ) );
-   itemsInvolvedQty.push_back( exdData->getField< uint8_t >( row, 45 ) );
-   itemsInvolvedQty.push_back( exdData->getField< uint8_t >( row, 46 ) );
-   itemsInvolvedQty.push_back( exdData->getField< uint8_t >( row, 47 ) );
-   itemDropRate.push_back( exdData->getField< uint8_t >( row, 48 ) );
-   itemDropRate.push_back( exdData->getField< uint8_t >( row, 49 ) );
-   itemDropRate.push_back( exdData->getField< uint8_t >( row, 50 ) );
-   itemDropRate.push_back( exdData->getField< uint8_t >( row, 51 ) );
-   itemDropRate.push_back( exdData->getField< uint8_t >( row, 52 ) );
-   itemDropRate.push_back( exdData->getField< uint8_t >( row, 53 ) );
-   itemDropRate.push_back( exdData->getField< uint8_t >( row, 54 ) );
-   itemDropRate.push_back( exdData->getField< uint8_t >( row, 55 ) );
+  auto row = exdData->m_BattleLeveDat.get_row( row_id );
+  enemyLevel.push_back( exdData->getField< uint16_t >( row, 16 ) );
+  enemyLevel.push_back( exdData->getField< uint16_t >( row, 17 ) );
+  enemyLevel.push_back( exdData->getField< uint16_t >( row, 18 ) );
+  enemyLevel.push_back( exdData->getField< uint16_t >( row, 19 ) );
+  enemyLevel.push_back( exdData->getField< uint16_t >( row, 20 ) );
+  enemyLevel.push_back( exdData->getField< uint16_t >( row, 21 ) );
+  enemyLevel.push_back( exdData->getField< uint16_t >( row, 22 ) );
+  enemyLevel.push_back( exdData->getField< uint16_t >( row, 23 ) );
+  bNpcName.push_back( exdData->getField< uint32_t >( row, 24 ) );
+  bNpcName.push_back( exdData->getField< uint32_t >( row, 25 ) );
+  bNpcName.push_back( exdData->getField< uint32_t >( row, 26 ) );
+  bNpcName.push_back( exdData->getField< uint32_t >( row, 27 ) );
+  bNpcName.push_back( exdData->getField< uint32_t >( row, 28 ) );
+  bNpcName.push_back( exdData->getField< uint32_t >( row, 29 ) );
+  bNpcName.push_back( exdData->getField< uint32_t >( row, 30 ) );
+  bNpcName.push_back( exdData->getField< uint32_t >( row, 31 ) );
+  itemsInvolved.push_back( exdData->getField< int32_t >( row, 32 ) );
+  itemsInvolved.push_back( exdData->getField< int32_t >( row, 33 ) );
+  itemsInvolved.push_back( exdData->getField< int32_t >( row, 34 ) );
+  itemsInvolved.push_back( exdData->getField< int32_t >( row, 35 ) );
+  itemsInvolved.push_back( exdData->getField< int32_t >( row, 36 ) );
+  itemsInvolved.push_back( exdData->getField< int32_t >( row, 37 ) );
+  itemsInvolved.push_back( exdData->getField< int32_t >( row, 38 ) );
+  itemsInvolved.push_back( exdData->getField< int32_t >( row, 39 ) );
+  itemsInvolvedQty.push_back( exdData->getField< uint8_t >( row, 40 ) );
+  itemsInvolvedQty.push_back( exdData->getField< uint8_t >( row, 41 ) );
+  itemsInvolvedQty.push_back( exdData->getField< uint8_t >( row, 42 ) );
+  itemsInvolvedQty.push_back( exdData->getField< uint8_t >( row, 43 ) );
+  itemsInvolvedQty.push_back( exdData->getField< uint8_t >( row, 44 ) );
+  itemsInvolvedQty.push_back( exdData->getField< uint8_t >( row, 45 ) );
+  itemsInvolvedQty.push_back( exdData->getField< uint8_t >( row, 46 ) );
+  itemsInvolvedQty.push_back( exdData->getField< uint8_t >( row, 47 ) );
+  itemDropRate.push_back( exdData->getField< uint8_t >( row, 48 ) );
+  itemDropRate.push_back( exdData->getField< uint8_t >( row, 49 ) );
+  itemDropRate.push_back( exdData->getField< uint8_t >( row, 50 ) );
+  itemDropRate.push_back( exdData->getField< uint8_t >( row, 51 ) );
+  itemDropRate.push_back( exdData->getField< uint8_t >( row, 52 ) );
+  itemDropRate.push_back( exdData->getField< uint8_t >( row, 53 ) );
+  itemDropRate.push_back( exdData->getField< uint8_t >( row, 54 ) );
+  itemDropRate.push_back( exdData->getField< uint8_t >( row, 55 ) );
 }
 
 Sapphire::Data::BeastRankBonus::BeastRankBonus( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
 {
-   auto row = exdData->m_BeastRankBonusDat.get_row( row_id );
-   item = exdData->getField< uint32_t >( row, 8 );
-   itemQuantity.push_back( exdData->getField< uint8_t >( row, 9 ) );
-   itemQuantity.push_back( exdData->getField< uint8_t >( row, 10 ) );
-   itemQuantity.push_back( exdData->getField< uint8_t >( row, 11 ) );
-   itemQuantity.push_back( exdData->getField< uint8_t >( row, 12 ) );
-   itemQuantity.push_back( exdData->getField< uint8_t >( row, 13 ) );
-   itemQuantity.push_back( exdData->getField< uint8_t >( row, 14 ) );
-   itemQuantity.push_back( exdData->getField< uint8_t >( row, 15 ) );
-   itemQuantity.push_back( exdData->getField< uint8_t >( row, 16 ) );
+  auto row = exdData->m_BeastRankBonusDat.get_row( row_id );
+  item = exdData->getField< uint32_t >( row, 8 );
+  itemQuantity.push_back( exdData->getField< uint8_t >( row, 9 ) );
+  itemQuantity.push_back( exdData->getField< uint8_t >( row, 10 ) );
+  itemQuantity.push_back( exdData->getField< uint8_t >( row, 11 ) );
+  itemQuantity.push_back( exdData->getField< uint8_t >( row, 12 ) );
+  itemQuantity.push_back( exdData->getField< uint8_t >( row, 13 ) );
+  itemQuantity.push_back( exdData->getField< uint8_t >( row, 14 ) );
+  itemQuantity.push_back( exdData->getField< uint8_t >( row, 15 ) );
+  itemQuantity.push_back( exdData->getField< uint8_t >( row, 16 ) );
 }
 
 Sapphire::Data::BeastReputationRank::BeastReputationRank( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
 {
-   auto row = exdData->m_BeastReputationRankDat.get_row( row_id );
-   requiredReputation = exdData->getField< uint16_t >( row, 0 );
-   name = exdData->getField< std::string >( row, 1 );
+  auto row = exdData->m_BeastReputationRankDat.get_row( row_id );
+  requiredReputation = exdData->getField< uint16_t >( row, 0 );
+  name = exdData->getField< std::string >( row, 1 );
 }
 
 Sapphire::Data::BeastTribe::BeastTribe( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
 {
-   auto row = exdData->m_BeastTribeDat.get_row( row_id );
-   minLevel = exdData->getField< uint8_t >( row, 0 );
-   maxLevel = exdData->getField< uint8_t >( row, 1 );
-   beastRankBonus = exdData->getField< uint8_t >( row, 2 );
-   iconReputation = exdData->getField< uint32_t >( row, 3 );
-   icon = exdData->getField< uint32_t >( row, 4 );
-   maxRank = exdData->getField< uint8_t >( row, 5 );
-   alliedBeastTribeQuest = exdData->getField< uint32_t >( row, 6 );
-   expansion = exdData->getField< uint8_t >( row, 7 );
-   currencyItem = exdData->getField< uint32_t >( row, 8 );
-   displayOrder = exdData->getField< uint8_t >( row, 9 );
-   name = exdData->getField< std::string >( row, 10 );
-   nameRelation = exdData->getField< std::string >( row, 18 );
+  auto row = exdData->m_BeastTribeDat.get_row( row_id );
+  minLevel = exdData->getField< uint8_t >( row, 0 );
+  maxLevel = exdData->getField< uint8_t >( row, 1 );
+  beastRankBonus = exdData->getField< uint8_t >( row, 2 );
+  iconReputation = exdData->getField< uint32_t >( row, 3 );
+  icon = exdData->getField< uint32_t >( row, 4 );
+  maxRank = exdData->getField< uint8_t >( row, 5 );
+  alliedBeastTribeQuest = exdData->getField< uint32_t >( row, 6 );
+  expansion = exdData->getField< uint8_t >( row, 7 );
+  currencyItem = exdData->getField< uint32_t >( row, 8 );
+  displayOrder = exdData->getField< uint8_t >( row, 9 );
+  name = exdData->getField< std::string >( row, 10 );
+  nameRelation = exdData->getField< std::string >( row, 18 );
 }
 
 Sapphire::Data::Behavior::Behavior( uint32_t row_id, uint32_t subRow, Sapphire::Data::ExdDataGenerated* exdData )
 {
-   auto row = exdData->m_BehaviorDat.get_row( row_id, subRow );
-   balloon = exdData->getField< uint16_t >( row, 6 );
+  auto row = exdData->m_BehaviorDat.get_row( row_id, subRow );
+  balloon = exdData->getField< uint16_t >( row, 6 );
 }
 
 Sapphire::Data::BGM::BGM( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
 {
-   auto row = exdData->m_BGMDat.get_row( row_id );
-   file = exdData->getField< std::string >( row, 0 );
+  auto row = exdData->m_BGMDat.get_row( row_id );
+  file = exdData->getField< std::string >( row, 0 );
 }
 
 Sapphire::Data::BGMFade::BGMFade( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
 {
-   auto row = exdData->m_BGMFadeDat.get_row( row_id );
-   bGMFadeType = exdData->getField< int32_t >( row, 2 );
+  auto row = exdData->m_BGMFadeDat.get_row( row_id );
+  bGMFadeType = exdData->getField< int32_t >( row, 2 );
 }
 
 Sapphire::Data::BGMSituation::BGMSituation( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
 {
-   auto row = exdData->m_BGMSituationDat.get_row( row_id );
-   bGMDay = exdData->getField< uint16_t >( row, 0 );
-   bGMNight = exdData->getField< uint16_t >( row, 1 );
-   bGMBattle = exdData->getField< uint16_t >( row, 2 );
-   bGMField = exdData->getField< uint16_t >( row, 3 );
+  auto row = exdData->m_BGMSituationDat.get_row( row_id );
+  bGMDay = exdData->getField< uint16_t >( row, 0 );
+  bGMNight = exdData->getField< uint16_t >( row, 1 );
+  bGMBattle = exdData->getField< uint16_t >( row, 2 );
+  bGMField = exdData->getField< uint16_t >( row, 3 );
 }
 
 Sapphire::Data::BGMSwitch::BGMSwitch( uint32_t row_id, uint32_t subRow, Sapphire::Data::ExdDataGenerated* exdData )
 {
-   auto row = exdData->m_BGMSwitchDat.get_row( row_id, subRow );
-   bGMSystemDefine = exdData->getField< uint8_t >( row, 0 );
-   quest = exdData->getField< uint32_t >( row, 1 );
+  auto row = exdData->m_BGMSwitchDat.get_row( row_id, subRow );
+  bGMSystemDefine = exdData->getField< uint8_t >( row, 0 );
+  quest = exdData->getField< uint32_t >( row, 1 );
 }
 
 Sapphire::Data::BGMSystemDefine::BGMSystemDefine( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
 {
-   auto row = exdData->m_BGMSystemDefineDat.get_row( row_id );
-   define = exdData->getField< float >( row, 0 );
+  auto row = exdData->m_BGMSystemDefineDat.get_row( row_id );
+  define = exdData->getField< float >( row, 0 );
 }
 
 Sapphire::Data::BNpcAnnounceIcon::BNpcAnnounceIcon( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
 {
-   auto row = exdData->m_BNpcAnnounceIconDat.get_row( row_id );
-   icon = exdData->getField< uint32_t >( row, 0 );
+  auto row = exdData->m_BNpcAnnounceIconDat.get_row( row_id );
+  icon = exdData->getField< uint32_t >( row, 0 );
 }
 
 Sapphire::Data::BNpcBase::BNpcBase( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
 {
-   auto row = exdData->m_BNpcBaseDat.get_row( row_id );
-   behavior = exdData->getField< uint16_t >( row, 0 );
-   actionTimelineMove = exdData->getField< uint8_t >( row, 1 );
-   scale = exdData->getField< float >( row, 4 );
-   modelChara = exdData->getField< uint16_t >( row, 5 );
-   bNpcCustomize = exdData->getField< uint16_t >( row, 6 );
-   npcEquip = exdData->getField< uint16_t >( row, 7 );
-   arrayEventHandler = exdData->getField< int32_t >( row, 11 );
-   bNpcParts = exdData->getField< uint8_t >( row, 12 );
+  auto row = exdData->m_BNpcBaseDat.get_row( row_id );
+  behavior = exdData->getField< uint16_t >( row, 0 );
+  actionTimelineMove = exdData->getField< uint8_t >( row, 1 );
+  scale = exdData->getField< float >( row, 4 );
+  modelChara = exdData->getField< uint16_t >( row, 5 );
+  bNpcCustomize = exdData->getField< uint16_t >( row, 6 );
+  npcEquip = exdData->getField< uint16_t >( row, 7 );
+  arrayEventHandler = exdData->getField< int32_t >( row, 11 );
+  bNpcParts = exdData->getField< uint8_t >( row, 12 );
 }
 
 Sapphire::Data::BNpcCustomize::BNpcCustomize( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
 {
-   auto row = exdData->m_BNpcCustomizeDat.get_row( row_id );
-   race = exdData->getField< uint8_t >( row, 0 );
-   gender = exdData->getField< uint8_t >( row, 1 );
-   bodyType = exdData->getField< uint8_t >( row, 2 );
-   height = exdData->getField< uint8_t >( row, 3 );
-   tribe = exdData->getField< uint8_t >( row, 4 );
-   face = exdData->getField< uint8_t >( row, 5 );
-   hairStyle = exdData->getField< uint8_t >( row, 6 );
-   hairHighlight = exdData->getField< uint8_t >( row, 7 );
-   skinColor = exdData->getField< uint8_t >( row, 8 );
-   eyeHeterochromia = exdData->getField< uint8_t >( row, 9 );
-   hairColor = exdData->getField< uint8_t >( row, 10 );
-   hairHighlightColor = exdData->getField< uint8_t >( row, 11 );
-   facialFeature = exdData->getField< uint8_t >( row, 12 );
-   facialFeatureColor = exdData->getField< uint8_t >( row, 13 );
-   eyebrows = exdData->getField< uint8_t >( row, 14 );
-   eyeColor = exdData->getField< uint8_t >( row, 15 );
-   eyeShape = exdData->getField< uint8_t >( row, 16 );
-   nose = exdData->getField< uint8_t >( row, 17 );
-   jaw = exdData->getField< uint8_t >( row, 18 );
-   mouth = exdData->getField< uint8_t >( row, 19 );
-   lipColor = exdData->getField< uint8_t >( row, 20 );
-   bustOrTone1 = exdData->getField< uint8_t >( row, 21 );
-   extraFeature1 = exdData->getField< uint8_t >( row, 22 );
-   extraFeature2OrBust = exdData->getField< uint8_t >( row, 23 );
-   facePaint = exdData->getField< uint8_t >( row, 24 );
-   facePaintColor = exdData->getField< uint8_t >( row, 25 );
+  auto row = exdData->m_BNpcCustomizeDat.get_row( row_id );
+  race = exdData->getField< uint8_t >( row, 0 );
+  gender = exdData->getField< uint8_t >( row, 1 );
+  bodyType = exdData->getField< uint8_t >( row, 2 );
+  height = exdData->getField< uint8_t >( row, 3 );
+  tribe = exdData->getField< uint8_t >( row, 4 );
+  face = exdData->getField< uint8_t >( row, 5 );
+  hairStyle = exdData->getField< uint8_t >( row, 6 );
+  hairHighlight = exdData->getField< uint8_t >( row, 7 );
+  skinColor = exdData->getField< uint8_t >( row, 8 );
+  eyeHeterochromia = exdData->getField< uint8_t >( row, 9 );
+  hairColor = exdData->getField< uint8_t >( row, 10 );
+  hairHighlightColor = exdData->getField< uint8_t >( row, 11 );
+  facialFeature = exdData->getField< uint8_t >( row, 12 );
+  facialFeatureColor = exdData->getField< uint8_t >( row, 13 );
+  eyebrows = exdData->getField< uint8_t >( row, 14 );
+  eyeColor = exdData->getField< uint8_t >( row, 15 );
+  eyeShape = exdData->getField< uint8_t >( row, 16 );
+  nose = exdData->getField< uint8_t >( row, 17 );
+  jaw = exdData->getField< uint8_t >( row, 18 );
+  mouth = exdData->getField< uint8_t >( row, 19 );
+  lipColor = exdData->getField< uint8_t >( row, 20 );
+  bustOrTone1 = exdData->getField< uint8_t >( row, 21 );
+  extraFeature1 = exdData->getField< uint8_t >( row, 22 );
+  extraFeature2OrBust = exdData->getField< uint8_t >( row, 23 );
+  facePaint = exdData->getField< uint8_t >( row, 24 );
+  facePaintColor = exdData->getField< uint8_t >( row, 25 );
 }
 
 Sapphire::Data::BNpcName::BNpcName( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
 {
-   auto row = exdData->m_BNpcNameDat.get_row( row_id );
-   singular = exdData->getField< std::string >( row, 0 );
-   adjective = exdData->getField< int8_t >( row, 1 );
-   plural = exdData->getField< std::string >( row, 2 );
-   possessivePronoun = exdData->getField< int8_t >( row, 3 );
-   startsWithVowel = exdData->getField< int8_t >( row, 4 );
-   pronoun = exdData->getField< int8_t >( row, 6 );
-   article = exdData->getField< int8_t >( row, 7 );
+  auto row = exdData->m_BNpcNameDat.get_row( row_id );
+  singular = exdData->getField< std::string >( row, 0 );
+  adjective = exdData->getField< int8_t >( row, 1 );
+  plural = exdData->getField< std::string >( row, 2 );
+  possessivePronoun = exdData->getField< int8_t >( row, 3 );
+  startsWithVowel = exdData->getField< int8_t >( row, 4 );
+  pronoun = exdData->getField< int8_t >( row, 6 );
+  article = exdData->getField< int8_t >( row, 7 );
 }
 
 Sapphire::Data::BNpcParts::BNpcParts( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
 {
-   auto row = exdData->m_BNpcPartsDat.get_row( row_id );
-   bNpcBase1 = exdData->getField< uint16_t >( row, 0 );
-   partSlot1 = exdData->getField< uint8_t >( row, 1 );
-   x1 = exdData->getField< float >( row, 6 );
-   y1 = exdData->getField< float >( row, 7 );
-   z1 = exdData->getField< float >( row, 8 );
-   scale1 = exdData->getField< float >( row, 10 );
-   bNpcBase2 = exdData->getField< uint16_t >( row, 11 );
-   partSlot2 = exdData->getField< uint8_t >( row, 12 );
-   x2 = exdData->getField< float >( row, 17 );
-   y2 = exdData->getField< float >( row, 18 );
-   z2 = exdData->getField< float >( row, 19 );
-   scale2 = exdData->getField< float >( row, 21 );
-   bNpcBase3 = exdData->getField< uint16_t >( row, 22 );
-   partSlot3 = exdData->getField< uint8_t >( row, 23 );
-   x3 = exdData->getField< float >( row, 28 );
-   y3 = exdData->getField< float >( row, 29 );
-   z3 = exdData->getField< float >( row, 30 );
-   scale3 = exdData->getField< int16_t >( row, 31 );
-   bNpcBase4 = exdData->getField< uint16_t >( row, 33 );
-   partSlot4 = exdData->getField< uint8_t >( row, 34 );
-   x4 = exdData->getField< float >( row, 39 );
-   y4 = exdData->getField< float >( row, 40 );
-   z4 = exdData->getField< float >( row, 41 );
-   scale4 = exdData->getField< float >( row, 43 );
-   bNpcBase5 = exdData->getField< uint16_t >( row, 44 );
-   partSlot5 = exdData->getField< uint8_t >( row, 45 );
-   x5 = exdData->getField< float >( row, 50 );
-   y5 = exdData->getField< float >( row, 51 );
-   z5 = exdData->getField< float >( row, 52 );
-   scale5 = exdData->getField< float >( row, 54 );
+  auto row = exdData->m_BNpcPartsDat.get_row( row_id );
+  bNpcBase1 = exdData->getField< uint16_t >( row, 0 );
+  partSlot1 = exdData->getField< uint8_t >( row, 1 );
+  x1 = exdData->getField< float >( row, 6 );
+  y1 = exdData->getField< float >( row, 7 );
+  z1 = exdData->getField< float >( row, 8 );
+  scale1 = exdData->getField< float >( row, 10 );
+  bNpcBase2 = exdData->getField< uint16_t >( row, 11 );
+  partSlot2 = exdData->getField< uint8_t >( row, 12 );
+  x2 = exdData->getField< float >( row, 17 );
+  y2 = exdData->getField< float >( row, 18 );
+  z2 = exdData->getField< float >( row, 19 );
+  scale2 = exdData->getField< float >( row, 21 );
+  bNpcBase3 = exdData->getField< uint16_t >( row, 22 );
+  partSlot3 = exdData->getField< uint8_t >( row, 23 );
+  x3 = exdData->getField< float >( row, 28 );
+  y3 = exdData->getField< float >( row, 29 );
+  z3 = exdData->getField< float >( row, 30 );
+  scale3 = exdData->getField< int16_t >( row, 31 );
+  bNpcBase4 = exdData->getField< uint16_t >( row, 33 );
+  partSlot4 = exdData->getField< uint8_t >( row, 34 );
+  x4 = exdData->getField< float >( row, 39 );
+  y4 = exdData->getField< float >( row, 40 );
+  z4 = exdData->getField< float >( row, 41 );
+  scale4 = exdData->getField< float >( row, 43 );
+  bNpcBase5 = exdData->getField< uint16_t >( row, 44 );
+  partSlot5 = exdData->getField< uint8_t >( row, 45 );
+  x5 = exdData->getField< float >( row, 50 );
+  y5 = exdData->getField< float >( row, 51 );
+  z5 = exdData->getField< float >( row, 52 );
+  scale5 = exdData->getField< float >( row, 54 );
 }
 
 Sapphire::Data::Buddy::Buddy( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
 {
-   auto row = exdData->m_BuddyDat.get_row( row_id );
-   questRequirement2 = exdData->getField< int32_t >( row, 1 );
-   questRequirement1 = exdData->getField< int32_t >( row, 2 );
-   soundEffect4 = exdData->getField< std::string >( row, 4 );
-   soundEffect3 = exdData->getField< std::string >( row, 5 );
-   soundEffect2 = exdData->getField< std::string >( row, 6 );
-   soundEffect1 = exdData->getField< std::string >( row, 7 );
+  auto row = exdData->m_BuddyDat.get_row( row_id );
+  questRequirement2 = exdData->getField< int32_t >( row, 1 );
+  questRequirement1 = exdData->getField< int32_t >( row, 2 );
+  soundEffect4 = exdData->getField< std::string >( row, 4 );
+  soundEffect3 = exdData->getField< std::string >( row, 5 );
+  soundEffect2 = exdData->getField< std::string >( row, 6 );
+  soundEffect1 = exdData->getField< std::string >( row, 7 );
 }
 
 Sapphire::Data::BuddyAction::BuddyAction( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
 {
-   auto row = exdData->m_BuddyActionDat.get_row( row_id );
-   name = exdData->getField< std::string >( row, 0 );
-   description = exdData->getField< std::string >( row, 1 );
-   icon = exdData->getField< int32_t >( row, 2 );
-   iconStatus = exdData->getField< int32_t >( row, 3 );
+  auto row = exdData->m_BuddyActionDat.get_row( row_id );
+  name = exdData->getField< std::string >( row, 0 );
+  description = exdData->getField< std::string >( row, 1 );
+  icon = exdData->getField< int32_t >( row, 2 );
+  iconStatus = exdData->getField< int32_t >( row, 3 );
 }
 
 Sapphire::Data::BuddyEquip::BuddyEquip( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
 {
-   auto row = exdData->m_BuddyEquipDat.get_row( row_id );
-   singular = exdData->getField< std::string >( row, 0 );
-   adjective = exdData->getField< int8_t >( row, 1 );
-   plural = exdData->getField< std::string >( row, 2 );
-   possessivePronoun = exdData->getField< int8_t >( row, 3 );
-   startsWithVowel = exdData->getField< int8_t >( row, 4 );
-   pronoun = exdData->getField< int8_t >( row, 6 );
-   article = exdData->getField< int8_t >( row, 7 );
-   name = exdData->getField< std::string >( row, 8 );
-   modelTop = exdData->getField< int32_t >( row, 9 );
-   modelBody = exdData->getField< int32_t >( row, 10 );
-   modelLegs = exdData->getField< int32_t >( row, 11 );
-   grandCompany = exdData->getField< uint8_t >( row, 12 );
-   iconHead = exdData->getField< uint16_t >( row, 13 );
-   iconBody = exdData->getField< uint16_t >( row, 14 );
-   iconLegs = exdData->getField< uint16_t >( row, 15 );
+  auto row = exdData->m_BuddyEquipDat.get_row( row_id );
+  singular = exdData->getField< std::string >( row, 0 );
+  adjective = exdData->getField< int8_t >( row, 1 );
+  plural = exdData->getField< std::string >( row, 2 );
+  possessivePronoun = exdData->getField< int8_t >( row, 3 );
+  startsWithVowel = exdData->getField< int8_t >( row, 4 );
+  pronoun = exdData->getField< int8_t >( row, 6 );
+  article = exdData->getField< int8_t >( row, 7 );
+  name = exdData->getField< std::string >( row, 8 );
+  modelTop = exdData->getField< int32_t >( row, 9 );
+  modelBody = exdData->getField< int32_t >( row, 10 );
+  modelLegs = exdData->getField< int32_t >( row, 11 );
+  grandCompany = exdData->getField< uint8_t >( row, 12 );
+  iconHead = exdData->getField< uint16_t >( row, 13 );
+  iconBody = exdData->getField< uint16_t >( row, 14 );
+  iconLegs = exdData->getField< uint16_t >( row, 15 );
 }
 
 Sapphire::Data::BuddyItem::BuddyItem( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
 {
-   auto row = exdData->m_BuddyItemDat.get_row( row_id );
-   item = exdData->getField< uint16_t >( row, 0 );
+  auto row = exdData->m_BuddyItemDat.get_row( row_id );
+  item = exdData->getField< uint16_t >( row, 0 );
 }
 
 Sapphire::Data::BuddyRank::BuddyRank( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
 {
-   auto row = exdData->m_BuddyRankDat.get_row( row_id );
-   expRequired = exdData->getField< uint32_t >( row, 0 );
+  auto row = exdData->m_BuddyRankDat.get_row( row_id );
+  expRequired = exdData->getField< uint32_t >( row, 0 );
 }
 
 Sapphire::Data::BuddySkill::BuddySkill( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
 {
-   auto row = exdData->m_BuddySkillDat.get_row( row_id );
-   buddyLevel = exdData->getField< uint8_t >( row, 0 );
-   isActive = exdData->getField< bool >( row, 1 );
-   defender = exdData->getField< uint16_t >( row, 2 );
-   attacker = exdData->getField< uint16_t >( row, 3 );
-   healer = exdData->getField< uint16_t >( row, 4 );
+  auto row = exdData->m_BuddySkillDat.get_row( row_id );
+  buddyLevel = exdData->getField< uint8_t >( row, 0 );
+  isActive = exdData->getField< bool >( row, 1 );
+  defender = exdData->getField< uint16_t >( row, 2 );
+  attacker = exdData->getField< uint16_t >( row, 3 );
+  healer = exdData->getField< uint16_t >( row, 4 );
 }
 
 Sapphire::Data::Cabinet::Cabinet( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
 {
-   auto row = exdData->m_CabinetDat.get_row( row_id );
-   item = exdData->getField< int32_t >( row, 0 );
-   order = exdData->getField< uint16_t >( row, 1 );
-   category = exdData->getField< uint8_t >( row, 2 );
+  auto row = exdData->m_CabinetDat.get_row( row_id );
+  item = exdData->getField< int32_t >( row, 0 );
+  order = exdData->getField< uint16_t >( row, 1 );
+  category = exdData->getField< uint8_t >( row, 2 );
 }
 
 Sapphire::Data::CabinetCategory::CabinetCategory( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
 {
-   auto row = exdData->m_CabinetCategoryDat.get_row( row_id );
-   menuOrder = exdData->getField< uint8_t >( row, 0 );
-   icon = exdData->getField< int32_t >( row, 1 );
-   category = exdData->getField< int32_t >( row, 2 );
+  auto row = exdData->m_CabinetCategoryDat.get_row( row_id );
+  menuOrder = exdData->getField< uint8_t >( row, 0 );
+  icon = exdData->getField< int32_t >( row, 1 );
+  category = exdData->getField< int32_t >( row, 2 );
 }
 
 Sapphire::Data::Calendar::Calendar( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
 {
-   auto row = exdData->m_CalendarDat.get_row( row_id );
-   month.push_back( exdData->getField< uint8_t >( row, 0 ) );
-   month.push_back( exdData->getField< uint8_t >( row, 1 ) );
-   month.push_back( exdData->getField< uint8_t >( row, 2 ) );
-   month.push_back( exdData->getField< uint8_t >( row, 3 ) );
-   month.push_back( exdData->getField< uint8_t >( row, 4 ) );
-   month.push_back( exdData->getField< uint8_t >( row, 5 ) );
-   month.push_back( exdData->getField< uint8_t >( row, 6 ) );
-   month.push_back( exdData->getField< uint8_t >( row, 7 ) );
-   month.push_back( exdData->getField< uint8_t >( row, 8 ) );
-   month.push_back( exdData->getField< uint8_t >( row, 9 ) );
-   month.push_back( exdData->getField< uint8_t >( row, 10 ) );
-   month.push_back( exdData->getField< uint8_t >( row, 11 ) );
-   month.push_back( exdData->getField< uint8_t >( row, 12 ) );
-   month.push_back( exdData->getField< uint8_t >( row, 13 ) );
-   month.push_back( exdData->getField< uint8_t >( row, 14 ) );
-   month.push_back( exdData->getField< uint8_t >( row, 15 ) );
-   month.push_back( exdData->getField< uint8_t >( row, 16 ) );
-   month.push_back( exdData->getField< uint8_t >( row, 17 ) );
-   month.push_back( exdData->getField< uint8_t >( row, 18 ) );
-   month.push_back( exdData->getField< uint8_t >( row, 19 ) );
-   month.push_back( exdData->getField< uint8_t >( row, 20 ) );
-   month.push_back( exdData->getField< uint8_t >( row, 21 ) );
-   month.push_back( exdData->getField< uint8_t >( row, 22 ) );
-   month.push_back( exdData->getField< uint8_t >( row, 23 ) );
-   month.push_back( exdData->getField< uint8_t >( row, 24 ) );
-   month.push_back( exdData->getField< uint8_t >( row, 25 ) );
-   month.push_back( exdData->getField< uint8_t >( row, 26 ) );
-   month.push_back( exdData->getField< uint8_t >( row, 27 ) );
-   month.push_back( exdData->getField< uint8_t >( row, 28 ) );
-   month.push_back( exdData->getField< uint8_t >( row, 29 ) );
-   month.push_back( exdData->getField< uint8_t >( row, 30 ) );
-   month.push_back( exdData->getField< uint8_t >( row, 31 ) );
-   day.push_back( exdData->getField< uint8_t >( row, 32 ) );
-   day.push_back( exdData->getField< uint8_t >( row, 33 ) );
-   day.push_back( exdData->getField< uint8_t >( row, 34 ) );
-   day.push_back( exdData->getField< uint8_t >( row, 35 ) );
-   day.push_back( exdData->getField< uint8_t >( row, 36 ) );
-   day.push_back( exdData->getField< uint8_t >( row, 37 ) );
-   day.push_back( exdData->getField< uint8_t >( row, 38 ) );
-   day.push_back( exdData->getField< uint8_t >( row, 39 ) );
-   day.push_back( exdData->getField< uint8_t >( row, 40 ) );
-   day.push_back( exdData->getField< uint8_t >( row, 41 ) );
-   day.push_back( exdData->getField< uint8_t >( row, 42 ) );
-   day.push_back( exdData->getField< uint8_t >( row, 43 ) );
-   day.push_back( exdData->getField< uint8_t >( row, 44 ) );
-   day.push_back( exdData->getField< uint8_t >( row, 45 ) );
-   day.push_back( exdData->getField< uint8_t >( row, 46 ) );
-   day.push_back( exdData->getField< uint8_t >( row, 47 ) );
-   day.push_back( exdData->getField< uint8_t >( row, 48 ) );
-   day.push_back( exdData->getField< uint8_t >( row, 49 ) );
-   day.push_back( exdData->getField< uint8_t >( row, 50 ) );
-   day.push_back( exdData->getField< uint8_t >( row, 51 ) );
-   day.push_back( exdData->getField< uint8_t >( row, 52 ) );
-   day.push_back( exdData->getField< uint8_t >( row, 53 ) );
-   day.push_back( exdData->getField< uint8_t >( row, 54 ) );
-   day.push_back( exdData->getField< uint8_t >( row, 55 ) );
-   day.push_back( exdData->getField< uint8_t >( row, 56 ) );
-   day.push_back( exdData->getField< uint8_t >( row, 57 ) );
-   day.push_back( exdData->getField< uint8_t >( row, 58 ) );
-   day.push_back( exdData->getField< uint8_t >( row, 59 ) );
-   day.push_back( exdData->getField< uint8_t >( row, 60 ) );
-   day.push_back( exdData->getField< uint8_t >( row, 61 ) );
-   day.push_back( exdData->getField< uint8_t >( row, 62 ) );
-   day.push_back( exdData->getField< uint8_t >( row, 63 ) );
+  auto row = exdData->m_CalendarDat.get_row( row_id );
+  month.push_back( exdData->getField< uint8_t >( row, 0 ) );
+  month.push_back( exdData->getField< uint8_t >( row, 1 ) );
+  month.push_back( exdData->getField< uint8_t >( row, 2 ) );
+  month.push_back( exdData->getField< uint8_t >( row, 3 ) );
+  month.push_back( exdData->getField< uint8_t >( row, 4 ) );
+  month.push_back( exdData->getField< uint8_t >( row, 5 ) );
+  month.push_back( exdData->getField< uint8_t >( row, 6 ) );
+  month.push_back( exdData->getField< uint8_t >( row, 7 ) );
+  month.push_back( exdData->getField< uint8_t >( row, 8 ) );
+  month.push_back( exdData->getField< uint8_t >( row, 9 ) );
+  month.push_back( exdData->getField< uint8_t >( row, 10 ) );
+  month.push_back( exdData->getField< uint8_t >( row, 11 ) );
+  month.push_back( exdData->getField< uint8_t >( row, 12 ) );
+  month.push_back( exdData->getField< uint8_t >( row, 13 ) );
+  month.push_back( exdData->getField< uint8_t >( row, 14 ) );
+  month.push_back( exdData->getField< uint8_t >( row, 15 ) );
+  month.push_back( exdData->getField< uint8_t >( row, 16 ) );
+  month.push_back( exdData->getField< uint8_t >( row, 17 ) );
+  month.push_back( exdData->getField< uint8_t >( row, 18 ) );
+  month.push_back( exdData->getField< uint8_t >( row, 19 ) );
+  month.push_back( exdData->getField< uint8_t >( row, 20 ) );
+  month.push_back( exdData->getField< uint8_t >( row, 21 ) );
+  month.push_back( exdData->getField< uint8_t >( row, 22 ) );
+  month.push_back( exdData->getField< uint8_t >( row, 23 ) );
+  month.push_back( exdData->getField< uint8_t >( row, 24 ) );
+  month.push_back( exdData->getField< uint8_t >( row, 25 ) );
+  month.push_back( exdData->getField< uint8_t >( row, 26 ) );
+  month.push_back( exdData->getField< uint8_t >( row, 27 ) );
+  month.push_back( exdData->getField< uint8_t >( row, 28 ) );
+  month.push_back( exdData->getField< uint8_t >( row, 29 ) );
+  month.push_back( exdData->getField< uint8_t >( row, 30 ) );
+  month.push_back( exdData->getField< uint8_t >( row, 31 ) );
+  day.push_back( exdData->getField< uint8_t >( row, 32 ) );
+  day.push_back( exdData->getField< uint8_t >( row, 33 ) );
+  day.push_back( exdData->getField< uint8_t >( row, 34 ) );
+  day.push_back( exdData->getField< uint8_t >( row, 35 ) );
+  day.push_back( exdData->getField< uint8_t >( row, 36 ) );
+  day.push_back( exdData->getField< uint8_t >( row, 37 ) );
+  day.push_back( exdData->getField< uint8_t >( row, 38 ) );
+  day.push_back( exdData->getField< uint8_t >( row, 39 ) );
+  day.push_back( exdData->getField< uint8_t >( row, 40 ) );
+  day.push_back( exdData->getField< uint8_t >( row, 41 ) );
+  day.push_back( exdData->getField< uint8_t >( row, 42 ) );
+  day.push_back( exdData->getField< uint8_t >( row, 43 ) );
+  day.push_back( exdData->getField< uint8_t >( row, 44 ) );
+  day.push_back( exdData->getField< uint8_t >( row, 45 ) );
+  day.push_back( exdData->getField< uint8_t >( row, 46 ) );
+  day.push_back( exdData->getField< uint8_t >( row, 47 ) );
+  day.push_back( exdData->getField< uint8_t >( row, 48 ) );
+  day.push_back( exdData->getField< uint8_t >( row, 49 ) );
+  day.push_back( exdData->getField< uint8_t >( row, 50 ) );
+  day.push_back( exdData->getField< uint8_t >( row, 51 ) );
+  day.push_back( exdData->getField< uint8_t >( row, 52 ) );
+  day.push_back( exdData->getField< uint8_t >( row, 53 ) );
+  day.push_back( exdData->getField< uint8_t >( row, 54 ) );
+  day.push_back( exdData->getField< uint8_t >( row, 55 ) );
+  day.push_back( exdData->getField< uint8_t >( row, 56 ) );
+  day.push_back( exdData->getField< uint8_t >( row, 57 ) );
+  day.push_back( exdData->getField< uint8_t >( row, 58 ) );
+  day.push_back( exdData->getField< uint8_t >( row, 59 ) );
+  day.push_back( exdData->getField< uint8_t >( row, 60 ) );
+  day.push_back( exdData->getField< uint8_t >( row, 61 ) );
+  day.push_back( exdData->getField< uint8_t >( row, 62 ) );
+  day.push_back( exdData->getField< uint8_t >( row, 63 ) );
 }
 
 Sapphire::Data::CharaMakeCustomize::CharaMakeCustomize( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
 {
-   auto row = exdData->m_CharaMakeCustomizeDat.get_row( row_id );
-   icon = exdData->getField< uint32_t >( row, 1 );
-   data = exdData->getField< uint16_t >( row, 2 );
-   isPurchasable = exdData->getField< bool >( row, 3 );
+  auto row = exdData->m_CharaMakeCustomizeDat.get_row( row_id );
+  icon = exdData->getField< uint32_t >( row, 1 );
+  data = exdData->getField< uint16_t >( row, 2 );
+  isPurchasable = exdData->getField< bool >( row, 3 );
 }
 
 Sapphire::Data::CharaMakeType::CharaMakeType( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
 {
-   auto row = exdData->m_CharaMakeTypeDat.get_row( row_id );
-   race = exdData->getField< int32_t >( row, 0 );
-   tribe = exdData->getField< int32_t >( row, 1 );
-   gender = exdData->getField< int8_t >( row, 2 );
-   facialFeatureIcon.push_back( exdData->getField< int32_t >( row, 3291 ) );
-   facialFeatureIcon.push_back( exdData->getField< int32_t >( row, 3292 ) );
-   facialFeatureIcon.push_back( exdData->getField< int32_t >( row, 3293 ) );
-   facialFeatureIcon.push_back( exdData->getField< int32_t >( row, 3294 ) );
-   facialFeatureIcon.push_back( exdData->getField< int32_t >( row, 3295 ) );
-   facialFeatureIcon.push_back( exdData->getField< int32_t >( row, 3296 ) );
-   facialFeatureIcon.push_back( exdData->getField< int32_t >( row, 3297 ) );
-   facialFeatureIcon.push_back( exdData->getField< int32_t >( row, 3298 ) );
-   facialFeatureIcon.push_back( exdData->getField< int32_t >( row, 3299 ) );
-   facialFeatureIcon.push_back( exdData->getField< int32_t >( row, 3300 ) );
-   facialFeatureIcon.push_back( exdData->getField< int32_t >( row, 3301 ) );
-   facialFeatureIcon.push_back( exdData->getField< int32_t >( row, 3302 ) );
-   facialFeatureIcon.push_back( exdData->getField< int32_t >( row, 3303 ) );
-   facialFeatureIcon.push_back( exdData->getField< int32_t >( row, 3304 ) );
-   facialFeatureIcon.push_back( exdData->getField< int32_t >( row, 3305 ) );
-   facialFeatureIcon.push_back( exdData->getField< int32_t >( row, 3306 ) );
-   facialFeatureIcon.push_back( exdData->getField< int32_t >( row, 3307 ) );
-   facialFeatureIcon.push_back( exdData->getField< int32_t >( row, 3308 ) );
-   facialFeatureIcon.push_back( exdData->getField< int32_t >( row, 3309 ) );
-   facialFeatureIcon.push_back( exdData->getField< int32_t >( row, 3310 ) );
-   facialFeatureIcon.push_back( exdData->getField< int32_t >( row, 3311 ) );
-   facialFeatureIcon.push_back( exdData->getField< int32_t >( row, 3312 ) );
-   facialFeatureIcon.push_back( exdData->getField< int32_t >( row, 3313 ) );
-   facialFeatureIcon.push_back( exdData->getField< int32_t >( row, 3314 ) );
-   facialFeatureIcon.push_back( exdData->getField< int32_t >( row, 3315 ) );
-   facialFeatureIcon.push_back( exdData->getField< int32_t >( row, 3316 ) );
-   facialFeatureIcon.push_back( exdData->getField< int32_t >( row, 3317 ) );
-   facialFeatureIcon.push_back( exdData->getField< int32_t >( row, 3318 ) );
-   facialFeatureIcon.push_back( exdData->getField< int32_t >( row, 3319 ) );
-   facialFeatureIcon.push_back( exdData->getField< int32_t >( row, 3320 ) );
-   facialFeatureIcon.push_back( exdData->getField< int32_t >( row, 3321 ) );
-   facialFeatureIcon.push_back( exdData->getField< int32_t >( row, 3322 ) );
-   facialFeatureIcon.push_back( exdData->getField< int32_t >( row, 3323 ) );
-   facialFeatureIcon.push_back( exdData->getField< int32_t >( row, 3324 ) );
-   facialFeatureIcon.push_back( exdData->getField< int32_t >( row, 3325 ) );
-   facialFeatureIcon.push_back( exdData->getField< int32_t >( row, 3326 ) );
-   facialFeatureIcon.push_back( exdData->getField< int32_t >( row, 3327 ) );
-   facialFeatureIcon.push_back( exdData->getField< int32_t >( row, 3328 ) );
-   facialFeatureIcon.push_back( exdData->getField< int32_t >( row, 3329 ) );
-   facialFeatureIcon.push_back( exdData->getField< int32_t >( row, 3330 ) );
-   facialFeatureIcon.push_back( exdData->getField< int32_t >( row, 3331 ) );
-   facialFeatureIcon.push_back( exdData->getField< int32_t >( row, 3332 ) );
+  auto row = exdData->m_CharaMakeTypeDat.get_row( row_id );
+  race = exdData->getField< int32_t >( row, 0 );
+  tribe = exdData->getField< int32_t >( row, 1 );
+  gender = exdData->getField< int8_t >( row, 2 );
+  facialFeatureIcon.push_back( exdData->getField< int32_t >( row, 3291 ) );
+  facialFeatureIcon.push_back( exdData->getField< int32_t >( row, 3292 ) );
+  facialFeatureIcon.push_back( exdData->getField< int32_t >( row, 3293 ) );
+  facialFeatureIcon.push_back( exdData->getField< int32_t >( row, 3294 ) );
+  facialFeatureIcon.push_back( exdData->getField< int32_t >( row, 3295 ) );
+  facialFeatureIcon.push_back( exdData->getField< int32_t >( row, 3296 ) );
+  facialFeatureIcon.push_back( exdData->getField< int32_t >( row, 3297 ) );
+  facialFeatureIcon.push_back( exdData->getField< int32_t >( row, 3298 ) );
+  facialFeatureIcon.push_back( exdData->getField< int32_t >( row, 3299 ) );
+  facialFeatureIcon.push_back( exdData->getField< int32_t >( row, 3300 ) );
+  facialFeatureIcon.push_back( exdData->getField< int32_t >( row, 3301 ) );
+  facialFeatureIcon.push_back( exdData->getField< int32_t >( row, 3302 ) );
+  facialFeatureIcon.push_back( exdData->getField< int32_t >( row, 3303 ) );
+  facialFeatureIcon.push_back( exdData->getField< int32_t >( row, 3304 ) );
+  facialFeatureIcon.push_back( exdData->getField< int32_t >( row, 3305 ) );
+  facialFeatureIcon.push_back( exdData->getField< int32_t >( row, 3306 ) );
+  facialFeatureIcon.push_back( exdData->getField< int32_t >( row, 3307 ) );
+  facialFeatureIcon.push_back( exdData->getField< int32_t >( row, 3308 ) );
+  facialFeatureIcon.push_back( exdData->getField< int32_t >( row, 3309 ) );
+  facialFeatureIcon.push_back( exdData->getField< int32_t >( row, 3310 ) );
+  facialFeatureIcon.push_back( exdData->getField< int32_t >( row, 3311 ) );
+  facialFeatureIcon.push_back( exdData->getField< int32_t >( row, 3312 ) );
+  facialFeatureIcon.push_back( exdData->getField< int32_t >( row, 3313 ) );
+  facialFeatureIcon.push_back( exdData->getField< int32_t >( row, 3314 ) );
+  facialFeatureIcon.push_back( exdData->getField< int32_t >( row, 3315 ) );
+  facialFeatureIcon.push_back( exdData->getField< int32_t >( row, 3316 ) );
+  facialFeatureIcon.push_back( exdData->getField< int32_t >( row, 3317 ) );
+  facialFeatureIcon.push_back( exdData->getField< int32_t >( row, 3318 ) );
+  facialFeatureIcon.push_back( exdData->getField< int32_t >( row, 3319 ) );
+  facialFeatureIcon.push_back( exdData->getField< int32_t >( row, 3320 ) );
+  facialFeatureIcon.push_back( exdData->getField< int32_t >( row, 3321 ) );
+  facialFeatureIcon.push_back( exdData->getField< int32_t >( row, 3322 ) );
+  facialFeatureIcon.push_back( exdData->getField< int32_t >( row, 3323 ) );
+  facialFeatureIcon.push_back( exdData->getField< int32_t >( row, 3324 ) );
+  facialFeatureIcon.push_back( exdData->getField< int32_t >( row, 3325 ) );
+  facialFeatureIcon.push_back( exdData->getField< int32_t >( row, 3326 ) );
+  facialFeatureIcon.push_back( exdData->getField< int32_t >( row, 3327 ) );
+  facialFeatureIcon.push_back( exdData->getField< int32_t >( row, 3328 ) );
+  facialFeatureIcon.push_back( exdData->getField< int32_t >( row, 3329 ) );
+  facialFeatureIcon.push_back( exdData->getField< int32_t >( row, 3330 ) );
+  facialFeatureIcon.push_back( exdData->getField< int32_t >( row, 3331 ) );
+  facialFeatureIcon.push_back( exdData->getField< int32_t >( row, 3332 ) );
 }
 
 Sapphire::Data::ChocoboRace::ChocoboRace( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
 {
-   auto row = exdData->m_ChocoboRaceDat.get_row( row_id );
-   chocoboRaceRank = exdData->getField< uint8_t >( row, 0 );
-   chocoboRaceTerritory = exdData->getField< uint8_t >( row, 1 );
+  auto row = exdData->m_ChocoboRaceDat.get_row( row_id );
+  chocoboRaceRank = exdData->getField< uint8_t >( row, 0 );
+  chocoboRaceTerritory = exdData->getField< uint8_t >( row, 1 );
 }
 
 Sapphire::Data::ChocoboRaceAbility::ChocoboRaceAbility( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
 {
-   auto row = exdData->m_ChocoboRaceAbilityDat.get_row( row_id );
-   name = exdData->getField< std::string >( row, 0 );
-   description = exdData->getField< std::string >( row, 1 );
-   icon = exdData->getField< uint32_t >( row, 2 );
-   chocoboRaceAbilityType = exdData->getField< int8_t >( row, 3 );
-   value = exdData->getField< uint8_t >( row, 4 );
+  auto row = exdData->m_ChocoboRaceAbilityDat.get_row( row_id );
+  name = exdData->getField< std::string >( row, 0 );
+  description = exdData->getField< std::string >( row, 1 );
+  icon = exdData->getField< uint32_t >( row, 2 );
+  chocoboRaceAbilityType = exdData->getField< int8_t >( row, 3 );
+  value = exdData->getField< uint8_t >( row, 4 );
 }
 
 Sapphire::Data::ChocoboRaceAbilityType::ChocoboRaceAbilityType( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
 {
-   auto row = exdData->m_ChocoboRaceAbilityTypeDat.get_row( row_id );
-   isActive = exdData->getField< bool >( row, 0 );
+  auto row = exdData->m_ChocoboRaceAbilityTypeDat.get_row( row_id );
+  isActive = exdData->getField< bool >( row, 0 );
 }
 
 Sapphire::Data::ChocoboRaceItem::ChocoboRaceItem( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
 {
-   auto row = exdData->m_ChocoboRaceItemDat.get_row( row_id );
-   name = exdData->getField< std::string >( row, 0 );
-   description = exdData->getField< std::string >( row, 1 );
-   icon = exdData->getField< uint32_t >( row, 2 );
+  auto row = exdData->m_ChocoboRaceItemDat.get_row( row_id );
+  name = exdData->getField< std::string >( row, 0 );
+  description = exdData->getField< std::string >( row, 1 );
+  icon = exdData->getField< uint32_t >( row, 2 );
 }
 
 Sapphire::Data::ChocoboRaceRank::ChocoboRaceRank( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
 {
-   auto row = exdData->m_ChocoboRaceRankDat.get_row( row_id );
-   ratingMin = exdData->getField< uint16_t >( row, 0 );
-   ratingMax = exdData->getField< uint16_t >( row, 1 );
-   name = exdData->getField< uint16_t >( row, 2 );
-   fee = exdData->getField< uint16_t >( row, 3 );
-   icon = exdData->getField< int32_t >( row, 4 );
+  auto row = exdData->m_ChocoboRaceRankDat.get_row( row_id );
+  ratingMin = exdData->getField< uint16_t >( row, 0 );
+  ratingMax = exdData->getField< uint16_t >( row, 1 );
+  name = exdData->getField< uint16_t >( row, 2 );
+  fee = exdData->getField< uint16_t >( row, 3 );
+  icon = exdData->getField< int32_t >( row, 4 );
 }
 
 Sapphire::Data::ChocoboRaceStatus::ChocoboRaceStatus( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
 {
-   auto row = exdData->m_ChocoboRaceStatusDat.get_row( row_id );
-   status = exdData->getField< int32_t >( row, 0 );
+  auto row = exdData->m_ChocoboRaceStatusDat.get_row( row_id );
+  status = exdData->getField< int32_t >( row, 0 );
 }
 
 Sapphire::Data::ChocoboRaceTerritory::ChocoboRaceTerritory( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
 {
-   auto row = exdData->m_ChocoboRaceTerritoryDat.get_row( row_id );
-   name = exdData->getField< uint16_t >( row, 0 );
-   icon = exdData->getField< int32_t >( row, 1 );
+  auto row = exdData->m_ChocoboRaceTerritoryDat.get_row( row_id );
+  name = exdData->getField< uint16_t >( row, 0 );
+  icon = exdData->getField< int32_t >( row, 1 );
 }
 
 Sapphire::Data::ChocoboRaceTutorial::ChocoboRaceTutorial( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
 {
-   auto row = exdData->m_ChocoboRaceTutorialDat.get_row( row_id );
-   npcYell.push_back( exdData->getField< int32_t >( row, 0 ) );
-   npcYell.push_back( exdData->getField< int32_t >( row, 1 ) );
-   npcYell.push_back( exdData->getField< int32_t >( row, 2 ) );
-   npcYell.push_back( exdData->getField< int32_t >( row, 3 ) );
-   npcYell.push_back( exdData->getField< int32_t >( row, 4 ) );
-   npcYell.push_back( exdData->getField< int32_t >( row, 5 ) );
-   npcYell.push_back( exdData->getField< int32_t >( row, 6 ) );
-   npcYell.push_back( exdData->getField< int32_t >( row, 7 ) );
+  auto row = exdData->m_ChocoboRaceTutorialDat.get_row( row_id );
+  npcYell.push_back( exdData->getField< int32_t >( row, 0 ) );
+  npcYell.push_back( exdData->getField< int32_t >( row, 1 ) );
+  npcYell.push_back( exdData->getField< int32_t >( row, 2 ) );
+  npcYell.push_back( exdData->getField< int32_t >( row, 3 ) );
+  npcYell.push_back( exdData->getField< int32_t >( row, 4 ) );
+  npcYell.push_back( exdData->getField< int32_t >( row, 5 ) );
+  npcYell.push_back( exdData->getField< int32_t >( row, 6 ) );
+  npcYell.push_back( exdData->getField< int32_t >( row, 7 ) );
 }
 
 Sapphire::Data::ChocoboRaceWeather::ChocoboRaceWeather( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
 {
-   auto row = exdData->m_ChocoboRaceWeatherDat.get_row( row_id );
-   weatherType1 = exdData->getField< int32_t >( row, 0 );
-   weatherType2 = exdData->getField< int32_t >( row, 1 );
+  auto row = exdData->m_ChocoboRaceWeatherDat.get_row( row_id );
+  weatherType1 = exdData->getField< int32_t >( row, 0 );
+  weatherType2 = exdData->getField< int32_t >( row, 1 );
 }
 
 Sapphire::Data::ChocoboTaxi::ChocoboTaxi( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
 {
-   auto row = exdData->m_ChocoboTaxiDat.get_row( row_id );
-   location = exdData->getField< uint32_t >( row, 0 );
+  auto row = exdData->m_ChocoboTaxiDat.get_row( row_id );
+  location = exdData->getField< uint32_t >( row, 0 );
 }
 
 Sapphire::Data::ChocoboTaxiStand::ChocoboTaxiStand( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
 {
-   auto row = exdData->m_ChocoboTaxiStandDat.get_row( row_id );
-   placeName = exdData->getField< std::string >( row, 8 );
+  auto row = exdData->m_ChocoboTaxiStandDat.get_row( row_id );
+  placeName = exdData->getField< std::string >( row, 8 );
 }
 
 Sapphire::Data::ClassJob::ClassJob( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
 {
-   auto row = exdData->m_ClassJobDat.get_row( row_id );
-   name = exdData->getField< std::string >( row, 0 );
-   abbreviation = exdData->getField< std::string >( row, 1 );
-   classJobCategory = exdData->getField< uint8_t >( row, 3 );
-   expArrayIndex = exdData->getField< int8_t >( row, 4 );
-   modifierHitPoints = exdData->getField< uint16_t >( row, 9 );
-   modifierManaPoints = exdData->getField< uint16_t >( row, 10 );
-   modifierStrength = exdData->getField< uint16_t >( row, 11 );
-   modifierVitality = exdData->getField< uint16_t >( row, 12 );
-   modifierDexterity = exdData->getField< uint16_t >( row, 13 );
-   modifierIntelligence = exdData->getField< uint16_t >( row, 14 );
-   modifierMind = exdData->getField< uint16_t >( row, 15 );
-   modifierPiety = exdData->getField< uint16_t >( row, 16 );
-   classJobParent = exdData->getField< uint8_t >( row, 26 );
-   nameEnglish = exdData->getField< std::string >( row, 27 );
-   itemStartingWeapon = exdData->getField< int32_t >( row, 28 );
-   primaryStat = exdData->getField< uint8_t >( row, 33 );
-   limitBreak1 = exdData->getField< uint16_t >( row, 34 );
-   limitBreak2 = exdData->getField< uint16_t >( row, 35 );
-   limitBreak3 = exdData->getField< uint16_t >( row, 36 );
-   itemSoulCrystal = exdData->getField< uint32_t >( row, 38 );
-   unlockQuest = exdData->getField< uint32_t >( row, 39 );
-   relicQuest = exdData->getField< uint32_t >( row, 40 );
-   prerequisite = exdData->getField< uint32_t >( row, 41 );
-   startingLevel = exdData->getField< uint8_t >( row, 42 );
+  auto row = exdData->m_ClassJobDat.get_row( row_id );
+  name = exdData->getField< std::string >( row, 0 );
+  abbreviation = exdData->getField< std::string >( row, 1 );
+  classJobCategory = exdData->getField< uint8_t >( row, 3 );
+  expArrayIndex = exdData->getField< int8_t >( row, 4 );
+  modifierHitPoints = exdData->getField< uint16_t >( row, 9 );
+  modifierManaPoints = exdData->getField< uint16_t >( row, 10 );
+  modifierStrength = exdData->getField< uint16_t >( row, 11 );
+  modifierVitality = exdData->getField< uint16_t >( row, 12 );
+  modifierDexterity = exdData->getField< uint16_t >( row, 13 );
+  modifierIntelligence = exdData->getField< uint16_t >( row, 14 );
+  modifierMind = exdData->getField< uint16_t >( row, 15 );
+  modifierPiety = exdData->getField< uint16_t >( row, 16 );
+  classJobParent = exdData->getField< uint8_t >( row, 26 );
+  nameEnglish = exdData->getField< std::string >( row, 27 );
+  itemStartingWeapon = exdData->getField< int32_t >( row, 28 );
+  role = exdData->getField< uint8_t >( row, 30 );
+  startingTown = exdData->getField< uint8_t >( row, 31 );
+  primaryStat = exdData->getField< uint8_t >( row, 33 );
+  limitBreak1 = exdData->getField< uint16_t >( row, 34 );
+  limitBreak2 = exdData->getField< uint16_t >( row, 35 );
+  limitBreak3 = exdData->getField< uint16_t >( row, 36 );
+  itemSoulCrystal = exdData->getField< uint32_t >( row, 38 );
+  unlockQuest = exdData->getField< uint32_t >( row, 39 );
+  relicQuest = exdData->getField< uint32_t >( row, 40 );
+  prerequisite = exdData->getField< uint32_t >( row, 41 );
+  startingLevel = exdData->getField< uint8_t >( row, 42 );
+  partyBonus = exdData->getField< uint8_t >( row, 43 );
+  isLimitedJob = exdData->getField< bool >( row, 44 );
 }
 
 Sapphire::Data::ClassJobCategory::ClassJobCategory( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
 {
-   auto row = exdData->m_ClassJobCategoryDat.get_row( row_id );
-   name = exdData->getField< std::string >( row, 0 );
-   aDV = exdData->getField< bool >( row, 1 );
-   gLA = exdData->getField< bool >( row, 2 );
-   pGL = exdData->getField< bool >( row, 3 );
-   mRD = exdData->getField< bool >( row, 4 );
-   lNC = exdData->getField< bool >( row, 5 );
-   aRC = exdData->getField< bool >( row, 6 );
-   cNJ = exdData->getField< bool >( row, 7 );
-   tHM = exdData->getField< bool >( row, 8 );
-   cRP = exdData->getField< bool >( row, 9 );
-   bSM = exdData->getField< bool >( row, 10 );
-   aRM = exdData->getField< bool >( row, 11 );
-   gSM = exdData->getField< bool >( row, 12 );
-   lTW = exdData->getField< bool >( row, 13 );
-   wVR = exdData->getField< bool >( row, 14 );
-   aLC = exdData->getField< bool >( row, 15 );
-   cUL = exdData->getField< bool >( row, 16 );
-   mIN = exdData->getField< bool >( row, 17 );
-   bTN = exdData->getField< bool >( row, 18 );
-   fSH = exdData->getField< bool >( row, 19 );
-   pLD = exdData->getField< bool >( row, 20 );
-   mNK = exdData->getField< bool >( row, 21 );
-   wAR = exdData->getField< bool >( row, 22 );
-   dRG = exdData->getField< bool >( row, 23 );
-   bRD = exdData->getField< bool >( row, 24 );
-   wHM = exdData->getField< bool >( row, 25 );
-   bLM = exdData->getField< bool >( row, 26 );
-   aCN = exdData->getField< bool >( row, 27 );
-   sMN = exdData->getField< bool >( row, 28 );
-   sCH = exdData->getField< bool >( row, 29 );
-   rOG = exdData->getField< bool >( row, 30 );
-   nIN = exdData->getField< bool >( row, 31 );
-   mCH = exdData->getField< bool >( row, 32 );
-   dRK = exdData->getField< bool >( row, 33 );
-   aST = exdData->getField< bool >( row, 34 );
-   sAM = exdData->getField< bool >( row, 35 );
-   rDM = exdData->getField< bool >( row, 36 );
+  auto row = exdData->m_ClassJobCategoryDat.get_row( row_id );
+  name = exdData->getField< std::string >( row, 0 );
+  aDV = exdData->getField< bool >( row, 1 );
+  gLA = exdData->getField< bool >( row, 2 );
+  pGL = exdData->getField< bool >( row, 3 );
+  mRD = exdData->getField< bool >( row, 4 );
+  lNC = exdData->getField< bool >( row, 5 );
+  aRC = exdData->getField< bool >( row, 6 );
+  cNJ = exdData->getField< bool >( row, 7 );
+  tHM = exdData->getField< bool >( row, 8 );
+  cRP = exdData->getField< bool >( row, 9 );
+  bSM = exdData->getField< bool >( row, 10 );
+  aRM = exdData->getField< bool >( row, 11 );
+  gSM = exdData->getField< bool >( row, 12 );
+  lTW = exdData->getField< bool >( row, 13 );
+  wVR = exdData->getField< bool >( row, 14 );
+  aLC = exdData->getField< bool >( row, 15 );
+  cUL = exdData->getField< bool >( row, 16 );
+  mIN = exdData->getField< bool >( row, 17 );
+  bTN = exdData->getField< bool >( row, 18 );
+  fSH = exdData->getField< bool >( row, 19 );
+  pLD = exdData->getField< bool >( row, 20 );
+  mNK = exdData->getField< bool >( row, 21 );
+  wAR = exdData->getField< bool >( row, 22 );
+  dRG = exdData->getField< bool >( row, 23 );
+  bRD = exdData->getField< bool >( row, 24 );
+  wHM = exdData->getField< bool >( row, 25 );
+  bLM = exdData->getField< bool >( row, 26 );
+  aCN = exdData->getField< bool >( row, 27 );
+  sMN = exdData->getField< bool >( row, 28 );
+  sCH = exdData->getField< bool >( row, 29 );
+  rOG = exdData->getField< bool >( row, 30 );
+  nIN = exdData->getField< bool >( row, 31 );
+  mCH = exdData->getField< bool >( row, 32 );
+  dRK = exdData->getField< bool >( row, 33 );
+  aST = exdData->getField< bool >( row, 34 );
+  sAM = exdData->getField< bool >( row, 35 );
+  rDM = exdData->getField< bool >( row, 36 );
 }
 
 Sapphire::Data::Companion::Companion( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
 {
-   auto row = exdData->m_CompanionDat.get_row( row_id );
-   singular = exdData->getField< std::string >( row, 0 );
-   adjective = exdData->getField< int8_t >( row, 1 );
-   plural = exdData->getField< std::string >( row, 2 );
-   possessivePronoun = exdData->getField< int8_t >( row, 3 );
-   startsWithVowel = exdData->getField< int8_t >( row, 4 );
-   pronoun = exdData->getField< int8_t >( row, 6 );
-   article = exdData->getField< int8_t >( row, 7 );
-   model = exdData->getField< uint16_t >( row, 8 );
-   behavior = exdData->getField< uint8_t >( row, 14 );
-   icon = exdData->getField< uint16_t >( row, 26 );
-   cost = exdData->getField< uint8_t >( row, 30 );
-   hP = exdData->getField< uint16_t >( row, 31 );
-   skillAngle = exdData->getField< uint16_t >( row, 33 );
-   skillCost = exdData->getField< uint8_t >( row, 34 );
-   minionRace = exdData->getField< uint8_t >( row, 37 );
+  auto row = exdData->m_CompanionDat.get_row( row_id );
+  singular = exdData->getField< std::string >( row, 0 );
+  adjective = exdData->getField< int8_t >( row, 1 );
+  plural = exdData->getField< std::string >( row, 2 );
+  possessivePronoun = exdData->getField< int8_t >( row, 3 );
+  startsWithVowel = exdData->getField< int8_t >( row, 4 );
+  pronoun = exdData->getField< int8_t >( row, 6 );
+  article = exdData->getField< int8_t >( row, 7 );
+  model = exdData->getField< uint16_t >( row, 8 );
+  behavior = exdData->getField< uint8_t >( row, 14 );
+  icon = exdData->getField< uint16_t >( row, 26 );
+  order = exdData->getField< uint16_t >( row, 27 );
+  cost = exdData->getField< uint8_t >( row, 30 );
+  hP = exdData->getField< uint16_t >( row, 31 );
+  skillAngle = exdData->getField< uint16_t >( row, 33 );
+  skillCost = exdData->getField< uint8_t >( row, 34 );
+  minionRace = exdData->getField< uint8_t >( row, 37 );
 }
 
 Sapphire::Data::CompanionMove::CompanionMove( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
 {
-   auto row = exdData->m_CompanionMoveDat.get_row( row_id );
-   name = exdData->getField< std::string >( row, 0 );
+  auto row = exdData->m_CompanionMoveDat.get_row( row_id );
+  name = exdData->getField< std::string >( row, 0 );
 }
 
 Sapphire::Data::CompanionTransient::CompanionTransient( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
 {
-   auto row = exdData->m_CompanionTransientDat.get_row( row_id );
-   description = exdData->getField< std::string >( row, 0 );
-   descriptionEnhanced = exdData->getField< std::string >( row, 1 );
-   tooltip = exdData->getField< std::string >( row, 2 );
-   specialActionName = exdData->getField< std::string >( row, 3 );
-   specialActionDescription = exdData->getField< std::string >( row, 4 );
-   attack = exdData->getField< uint8_t >( row, 5 );
-   defense = exdData->getField< uint8_t >( row, 6 );
-   speed = exdData->getField< uint8_t >( row, 7 );
-   hasAreaAttack = exdData->getField< bool >( row, 8 );
-   strengthGate = exdData->getField< bool >( row, 9 );
-   strengthEye = exdData->getField< bool >( row, 10 );
-   strengthShield = exdData->getField< bool >( row, 11 );
-   strengthArcana = exdData->getField< bool >( row, 12 );
-   minionSkillType = exdData->getField< uint8_t >( row, 13 );
+  auto row = exdData->m_CompanionTransientDat.get_row( row_id );
+  description = exdData->getField< std::string >( row, 0 );
+  descriptionEnhanced = exdData->getField< std::string >( row, 1 );
+  tooltip = exdData->getField< std::string >( row, 2 );
+  specialActionName = exdData->getField< std::string >( row, 3 );
+  specialActionDescription = exdData->getField< std::string >( row, 4 );
+  attack = exdData->getField< uint8_t >( row, 5 );
+  defense = exdData->getField< uint8_t >( row, 6 );
+  speed = exdData->getField< uint8_t >( row, 7 );
+  hasAreaAttack = exdData->getField< bool >( row, 8 );
+  strengthGate = exdData->getField< bool >( row, 9 );
+  strengthEye = exdData->getField< bool >( row, 10 );
+  strengthShield = exdData->getField< bool >( row, 11 );
+  strengthArcana = exdData->getField< bool >( row, 12 );
+  minionSkillType = exdData->getField< uint8_t >( row, 13 );
 }
 
 Sapphire::Data::CompanyAction::CompanyAction( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
 {
-   auto row = exdData->m_CompanyActionDat.get_row( row_id );
-   name = exdData->getField< std::string >( row, 0 );
-   description = exdData->getField< std::string >( row, 1 );
-   icon = exdData->getField< int32_t >( row, 2 );
-   fCRank = exdData->getField< uint8_t >( row, 3 );
-   cost = exdData->getField< uint32_t >( row, 4 );
-   order = exdData->getField< uint8_t >( row, 5 );
-   purchasable = exdData->getField< bool >( row, 6 );
+  auto row = exdData->m_CompanyActionDat.get_row( row_id );
+  name = exdData->getField< std::string >( row, 0 );
+  description = exdData->getField< std::string >( row, 1 );
+  icon = exdData->getField< int32_t >( row, 2 );
+  fCRank = exdData->getField< uint8_t >( row, 3 );
+  cost = exdData->getField< uint32_t >( row, 4 );
+  order = exdData->getField< uint8_t >( row, 5 );
+  purchasable = exdData->getField< bool >( row, 6 );
 }
 
 Sapphire::Data::CompanyCraftDraft::CompanyCraftDraft( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
 {
-   auto row = exdData->m_CompanyCraftDraftDat.get_row( row_id );
-   name = exdData->getField< std::string >( row, 0 );
-   companyCraftDraftCategory = exdData->getField< uint8_t >( row, 1 );
-   order = exdData->getField< uint32_t >( row, 8 );
+  auto row = exdData->m_CompanyCraftDraftDat.get_row( row_id );
+  name = exdData->getField< std::string >( row, 0 );
+  companyCraftDraftCategory = exdData->getField< uint8_t >( row, 1 );
+  order = exdData->getField< uint32_t >( row, 8 );
 }
 
 Sapphire::Data::CompanyCraftDraftCategory::CompanyCraftDraftCategory( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
 {
-   auto row = exdData->m_CompanyCraftDraftCategoryDat.get_row( row_id );
-   name = exdData->getField< std::string >( row, 0 );
+  auto row = exdData->m_CompanyCraftDraftCategoryDat.get_row( row_id );
+  name = exdData->getField< std::string >( row, 0 );
 }
 
 Sapphire::Data::CompanyCraftManufactoryState::CompanyCraftManufactoryState( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
 {
-   auto row = exdData->m_CompanyCraftManufactoryStateDat.get_row( row_id );
-   name = exdData->getField< std::string >( row, 0 );
+  auto row = exdData->m_CompanyCraftManufactoryStateDat.get_row( row_id );
+  name = exdData->getField< std::string >( row, 0 );
 }
 
 Sapphire::Data::CompanyCraftPart::CompanyCraftPart( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
 {
-   auto row = exdData->m_CompanyCraftPartDat.get_row( row_id );
-   companyCraftType = exdData->getField< uint8_t >( row, 1 );
-   companyCraftProcess.push_back( exdData->getField< uint16_t >( row, 2 ) );
-   companyCraftProcess.push_back( exdData->getField< uint16_t >( row, 3 ) );
-   companyCraftProcess.push_back( exdData->getField< uint16_t >( row, 4 ) );
+  auto row = exdData->m_CompanyCraftPartDat.get_row( row_id );
+  companyCraftType = exdData->getField< uint8_t >( row, 1 );
+  companyCraftProcess.push_back( exdData->getField< uint16_t >( row, 2 ) );
+  companyCraftProcess.push_back( exdData->getField< uint16_t >( row, 3 ) );
+  companyCraftProcess.push_back( exdData->getField< uint16_t >( row, 4 ) );
 }
 
 Sapphire::Data::CompanyCraftProcess::CompanyCraftProcess( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
 {
-   auto row = exdData->m_CompanyCraftProcessDat.get_row( row_id );
+  auto row = exdData->m_CompanyCraftProcessDat.get_row( row_id );
 }
 
 Sapphire::Data::CompanyCraftSequence::CompanyCraftSequence( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
 {
-   auto row = exdData->m_CompanyCraftSequenceDat.get_row( row_id );
-   resultItem = exdData->getField< int32_t >( row, 0 );
-   companyCraftDraftCategory = exdData->getField< int32_t >( row, 2 );
-   companyCraftType = exdData->getField< int32_t >( row, 3 );
-   companyCraftDraft = exdData->getField< int32_t >( row, 4 );
-   companyCraftPart.push_back( exdData->getField< uint16_t >( row, 5 ) );
-   companyCraftPart.push_back( exdData->getField< uint16_t >( row, 6 ) );
-   companyCraftPart.push_back( exdData->getField< uint16_t >( row, 7 ) );
-   companyCraftPart.push_back( exdData->getField< uint16_t >( row, 8 ) );
-   companyCraftPart.push_back( exdData->getField< uint16_t >( row, 9 ) );
-   companyCraftPart.push_back( exdData->getField< uint16_t >( row, 10 ) );
-   companyCraftPart.push_back( exdData->getField< uint16_t >( row, 11 ) );
-   companyCraftPart.push_back( exdData->getField< uint16_t >( row, 12 ) );
+  auto row = exdData->m_CompanyCraftSequenceDat.get_row( row_id );
+  resultItem = exdData->getField< int32_t >( row, 0 );
+  companyCraftDraftCategory = exdData->getField< int32_t >( row, 2 );
+  companyCraftType = exdData->getField< int32_t >( row, 3 );
+  companyCraftDraft = exdData->getField< int32_t >( row, 4 );
+  companyCraftPart.push_back( exdData->getField< uint16_t >( row, 5 ) );
+  companyCraftPart.push_back( exdData->getField< uint16_t >( row, 6 ) );
+  companyCraftPart.push_back( exdData->getField< uint16_t >( row, 7 ) );
+  companyCraftPart.push_back( exdData->getField< uint16_t >( row, 8 ) );
+  companyCraftPart.push_back( exdData->getField< uint16_t >( row, 9 ) );
+  companyCraftPart.push_back( exdData->getField< uint16_t >( row, 10 ) );
+  companyCraftPart.push_back( exdData->getField< uint16_t >( row, 11 ) );
+  companyCraftPart.push_back( exdData->getField< uint16_t >( row, 12 ) );
 }
 
 Sapphire::Data::CompanyCraftSupplyItem::CompanyCraftSupplyItem( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
 {
-   auto row = exdData->m_CompanyCraftSupplyItemDat.get_row( row_id );
-   item = exdData->getField< uint32_t >( row, 0 );
+  auto row = exdData->m_CompanyCraftSupplyItemDat.get_row( row_id );
+  item = exdData->getField< uint32_t >( row, 0 );
 }
 
 Sapphire::Data::CompanyCraftType::CompanyCraftType( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
 {
-   auto row = exdData->m_CompanyCraftTypeDat.get_row( row_id );
-   name = exdData->getField< std::string >( row, 0 );
+  auto row = exdData->m_CompanyCraftTypeDat.get_row( row_id );
+  name = exdData->getField< std::string >( row, 0 );
+}
+
+Sapphire::Data::CompanyLeve::CompanyLeve( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
+{
+  auto row = exdData->m_CompanyLeveDat.get_row( row_id );
+  eventItem = exdData->getField< int32_t >( row, 32 );
+  eventItemAmount = exdData->getField< uint8_t >( row, 40 );
+  companyLeveRule = exdData->getField< int32_t >( row, 176 );
+}
+
+Sapphire::Data::CompanyLeveRule::CompanyLeveRule( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
+{
+  auto row = exdData->m_CompanyLeveRuleDat.get_row( row_id );
+  type = exdData->getField< std::string >( row, 0 );
 }
 
 Sapphire::Data::CompleteJournal::CompleteJournal( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
 {
-   auto row = exdData->m_CompleteJournalDat.get_row( row_id );
-   requiredLevel = exdData->getField< uint16_t >( row, 1 );
-   icon = exdData->getField< int32_t >( row, 3 );
-   name = exdData->getField< std::string >( row, 5 );
-   cutscene.push_back( exdData->getField< int32_t >( row, 6 ) );
-   cutscene.push_back( exdData->getField< int32_t >( row, 7 ) );
-   cutscene.push_back( exdData->getField< int32_t >( row, 8 ) );
-   cutscene.push_back( exdData->getField< int32_t >( row, 9 ) );
-   cutscene.push_back( exdData->getField< int32_t >( row, 10 ) );
-   cutscene.push_back( exdData->getField< int32_t >( row, 11 ) );
-   cutscene.push_back( exdData->getField< int32_t >( row, 12 ) );
-   cutscene.push_back( exdData->getField< int32_t >( row, 13 ) );
-   cutscene.push_back( exdData->getField< int32_t >( row, 14 ) );
-   cutscene.push_back( exdData->getField< int32_t >( row, 15 ) );
-   cutscene.push_back( exdData->getField< int32_t >( row, 16 ) );
-   cutscene.push_back( exdData->getField< int32_t >( row, 17 ) );
-   cutscene.push_back( exdData->getField< int32_t >( row, 18 ) );
-   cutscene.push_back( exdData->getField< int32_t >( row, 19 ) );
-   cutscene.push_back( exdData->getField< int32_t >( row, 20 ) );
-   cutscene.push_back( exdData->getField< int32_t >( row, 21 ) );
-   cutscene.push_back( exdData->getField< int32_t >( row, 22 ) );
-   cutscene.push_back( exdData->getField< int32_t >( row, 23 ) );
-   cutscene.push_back( exdData->getField< int32_t >( row, 24 ) );
-   cutscene.push_back( exdData->getField< int32_t >( row, 25 ) );
-   cutscene.push_back( exdData->getField< int32_t >( row, 26 ) );
-   cutscene.push_back( exdData->getField< int32_t >( row, 27 ) );
-   cutscene.push_back( exdData->getField< int32_t >( row, 28 ) );
-   cutscene.push_back( exdData->getField< int32_t >( row, 29 ) );
+  auto row = exdData->m_CompleteJournalDat.get_row( row_id );
+  requiredLevel = exdData->getField< uint16_t >( row, 1 );
+  icon = exdData->getField< int32_t >( row, 3 );
+  name = exdData->getField< std::string >( row, 5 );
+  cutscene.push_back( exdData->getField< int32_t >( row, 6 ) );
+  cutscene.push_back( exdData->getField< int32_t >( row, 7 ) );
+  cutscene.push_back( exdData->getField< int32_t >( row, 8 ) );
+  cutscene.push_back( exdData->getField< int32_t >( row, 9 ) );
+  cutscene.push_back( exdData->getField< int32_t >( row, 10 ) );
+  cutscene.push_back( exdData->getField< int32_t >( row, 11 ) );
+  cutscene.push_back( exdData->getField< int32_t >( row, 12 ) );
+  cutscene.push_back( exdData->getField< int32_t >( row, 13 ) );
+  cutscene.push_back( exdData->getField< int32_t >( row, 14 ) );
+  cutscene.push_back( exdData->getField< int32_t >( row, 15 ) );
+  cutscene.push_back( exdData->getField< int32_t >( row, 16 ) );
+  cutscene.push_back( exdData->getField< int32_t >( row, 17 ) );
+  cutscene.push_back( exdData->getField< int32_t >( row, 18 ) );
+  cutscene.push_back( exdData->getField< int32_t >( row, 19 ) );
+  cutscene.push_back( exdData->getField< int32_t >( row, 20 ) );
+  cutscene.push_back( exdData->getField< int32_t >( row, 21 ) );
+  cutscene.push_back( exdData->getField< int32_t >( row, 22 ) );
+  cutscene.push_back( exdData->getField< int32_t >( row, 23 ) );
+  cutscene.push_back( exdData->getField< int32_t >( row, 24 ) );
+  cutscene.push_back( exdData->getField< int32_t >( row, 25 ) );
+  cutscene.push_back( exdData->getField< int32_t >( row, 26 ) );
+  cutscene.push_back( exdData->getField< int32_t >( row, 27 ) );
+  cutscene.push_back( exdData->getField< int32_t >( row, 28 ) );
+  cutscene.push_back( exdData->getField< int32_t >( row, 29 ) );
 }
 
 Sapphire::Data::CompleteJournalCategory::CompleteJournalCategory( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
 {
-   auto row = exdData->m_CompleteJournalCategoryDat.get_row( row_id );
-   firstQuest = exdData->getField< uint32_t >( row, 0 );
-   lastQuest = exdData->getField< uint32_t >( row, 1 );
+  auto row = exdData->m_CompleteJournalCategoryDat.get_row( row_id );
+  firstQuest = exdData->getField< uint32_t >( row, 0 );
+  lastQuest = exdData->getField< uint32_t >( row, 1 );
 }
 
 Sapphire::Data::ContentCloseCycle::ContentCloseCycle( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
 {
-   auto row = exdData->m_ContentCloseCycleDat.get_row( row_id );
-   unixtime = exdData->getField< uint32_t >( row, 0 );
-   timeSeconds = exdData->getField< uint32_t >( row, 1 );
+  auto row = exdData->m_ContentCloseCycleDat.get_row( row_id );
+  unixtime = exdData->getField< uint32_t >( row, 0 );
+  timeSeconds = exdData->getField< uint32_t >( row, 1 );
 }
 
 Sapphire::Data::ContentExAction::ContentExAction( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
 {
-   auto row = exdData->m_ContentExActionDat.get_row( row_id );
-   name = exdData->getField< uint32_t >( row, 0 );
-   charges = exdData->getField< uint8_t >( row, 2 );
+  auto row = exdData->m_ContentExActionDat.get_row( row_id );
+  name = exdData->getField< uint32_t >( row, 0 );
+  charges = exdData->getField< uint8_t >( row, 2 );
 }
 
 Sapphire::Data::ContentFinderCondition::ContentFinderCondition( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
 {
-   auto row = exdData->m_ContentFinderConditionDat.get_row( row_id );
-   territoryType = exdData->getField< uint16_t >( row, 1 );
-   contentLinkType = exdData->getField< uint8_t >( row, 2 );
-   content = exdData->getField< uint16_t >( row, 3 );
-   contentMemberType = exdData->getField< uint8_t >( row, 9 );
-   classJobLevelRequired = exdData->getField< uint8_t >( row, 15 );
-   classJobLevelSync = exdData->getField< uint8_t >( row, 16 );
-   itemLevelRequired = exdData->getField< uint16_t >( row, 17 );
-   itemLevelSync = exdData->getField< uint16_t >( row, 18 );
-   allowReplacement = exdData->getField< bool >( row, 20 );
-   highEndDuty = exdData->getField< bool >( row, 26 );
-   dutyRecorderAllowed = exdData->getField< bool >( row, 30 );
-   name = exdData->getField< std::string >( row, 34 );
-   contentType = exdData->getField< uint8_t >( row, 35 );
-   transient = exdData->getField< uint32_t >( row, 37 );
-   image = exdData->getField< uint32_t >( row, 39 );
+  auto row = exdData->m_ContentFinderConditionDat.get_row( row_id );
+  territoryType = exdData->getField< uint16_t >( row, 1 );
+  contentLinkType = exdData->getField< uint8_t >( row, 2 );
+  content = exdData->getField< uint16_t >( row, 3 );
+  contentMemberType = exdData->getField< uint8_t >( row, 9 );
+  classJobLevelRequired = exdData->getField< uint8_t >( row, 15 );
+  classJobLevelSync = exdData->getField< uint8_t >( row, 16 );
+  itemLevelRequired = exdData->getField< uint16_t >( row, 17 );
+  itemLevelSync = exdData->getField< uint16_t >( row, 18 );
+  allowReplacement = exdData->getField< bool >( row, 20 );
+  highEndDuty = exdData->getField< bool >( row, 26 );
+  dutyRecorderAllowed = exdData->getField< bool >( row, 30 );
+  name = exdData->getField< std::string >( row, 34 );
+  contentType = exdData->getField< uint8_t >( row, 35 );
+  transient = exdData->getField< uint32_t >( row, 37 );
+  image = exdData->getField< uint32_t >( row, 39 );
+  levelingRoulette = exdData->getField< bool >( row, 42 );
+  level5060Roulette = exdData->getField< bool >( row, 43 );
+  mSQRoulette = exdData->getField< bool >( row, 44 );
+  guildHestRoulette = exdData->getField< bool >( row, 45 );
+  expertRoulette = exdData->getField< bool >( row, 46 );
+  trialRoulette = exdData->getField< bool >( row, 47 );
+  dailyFrontlineChallenge = exdData->getField< bool >( row, 48 );
+  level70Roulette = exdData->getField< bool >( row, 49 );
+  mentorRoulette = exdData->getField< bool >( row, 50 );
+  allianceRoulette = exdData->getField< bool >( row, 56 );
+  normalRaidRoulette = exdData->getField< bool >( row, 58 );
 }
 
 Sapphire::Data::ContentFinderConditionTransient::ContentFinderConditionTransient( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
 {
-   auto row = exdData->m_ContentFinderConditionTransientDat.get_row( row_id );
-   description = exdData->getField< std::string >( row, 0 );
+  auto row = exdData->m_ContentFinderConditionTransientDat.get_row( row_id );
+  description = exdData->getField< std::string >( row, 0 );
 }
 
 Sapphire::Data::ContentGauge::ContentGauge( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
 {
-   auto row = exdData->m_ContentGaugeDat.get_row( row_id );
-   name = exdData->getField< std::string >( row, 0 );
-   color = exdData->getField< uint8_t >( row, 1 );
-   textString = exdData->getField< std::string >( row, 3 );
+  auto row = exdData->m_ContentGaugeDat.get_row( row_id );
+  name = exdData->getField< std::string >( row, 0 );
+  color = exdData->getField< uint8_t >( row, 1 );
+  textString = exdData->getField< std::string >( row, 3 );
 }
 
 Sapphire::Data::ContentGaugeColor::ContentGaugeColor( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
 {
-   auto row = exdData->m_ContentGaugeColorDat.get_row( row_id );
-   androidColor1 = exdData->getField< uint32_t >( row, 0 );
-   androidColor2 = exdData->getField< uint32_t >( row, 1 );
-   androidColor3 = exdData->getField< uint32_t >( row, 2 );
+  auto row = exdData->m_ContentGaugeColorDat.get_row( row_id );
+  androidColor1 = exdData->getField< uint32_t >( row, 0 );
+  androidColor2 = exdData->getField< uint32_t >( row, 1 );
+  androidColor3 = exdData->getField< uint32_t >( row, 2 );
 }
 
 Sapphire::Data::ContentMemberType::ContentMemberType( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
 {
-   auto row = exdData->m_ContentMemberTypeDat.get_row( row_id );
-   tanksPerParty = exdData->getField< uint8_t >( row, 9 );
-   healersPerParty = exdData->getField< uint8_t >( row, 10 );
-   meleesPerParty = exdData->getField< uint8_t >( row, 11 );
-   rangedPerParty = exdData->getField< uint8_t >( row, 12 );
+  auto row = exdData->m_ContentMemberTypeDat.get_row( row_id );
+  tanksPerParty = exdData->getField< uint8_t >( row, 9 );
+  healersPerParty = exdData->getField< uint8_t >( row, 10 );
+  meleesPerParty = exdData->getField< uint8_t >( row, 11 );
+  rangedPerParty = exdData->getField< uint8_t >( row, 12 );
 }
 
 Sapphire::Data::ContentNpcTalk::ContentNpcTalk( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
 {
-   auto row = exdData->m_ContentNpcTalkDat.get_row( row_id );
-   contentTalk.push_back( exdData->getField< uint32_t >( row, 1 ) );
-   contentTalk.push_back( exdData->getField< uint32_t >( row, 2 ) );
-   contentTalk.push_back( exdData->getField< uint32_t >( row, 3 ) );
-   contentTalk.push_back( exdData->getField< uint32_t >( row, 4 ) );
-   contentTalk.push_back( exdData->getField< uint32_t >( row, 5 ) );
-   contentTalk.push_back( exdData->getField< uint32_t >( row, 6 ) );
-   contentTalk.push_back( exdData->getField< uint32_t >( row, 7 ) );
-   contentTalk.push_back( exdData->getField< uint32_t >( row, 8 ) );
+  auto row = exdData->m_ContentNpcTalkDat.get_row( row_id );
+  contentTalk.push_back( exdData->getField< uint32_t >( row, 1 ) );
+  contentTalk.push_back( exdData->getField< uint32_t >( row, 2 ) );
+  contentTalk.push_back( exdData->getField< uint32_t >( row, 3 ) );
+  contentTalk.push_back( exdData->getField< uint32_t >( row, 4 ) );
+  contentTalk.push_back( exdData->getField< uint32_t >( row, 5 ) );
+  contentTalk.push_back( exdData->getField< uint32_t >( row, 6 ) );
+  contentTalk.push_back( exdData->getField< uint32_t >( row, 7 ) );
+  contentTalk.push_back( exdData->getField< uint32_t >( row, 8 ) );
 }
 
 Sapphire::Data::ContentRoulette::ContentRoulette( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
 {
-   auto row = exdData->m_ContentRouletteDat.get_row( row_id );
-   name = exdData->getField< std::string >( row, 0 );
-   description = exdData->getField< std::string >( row, 2 );
-   dutyType = exdData->getField< std::string >( row, 3 );
-   isInDutyFinder = exdData->getField< bool >( row, 6 );
-   openRule = exdData->getField< uint8_t >( row, 7 );
-   requiredLevel = exdData->getField< uint8_t >( row, 9 );
-   itemLevelRequired = exdData->getField< uint16_t >( row, 11 );
-   icon = exdData->getField< uint32_t >( row, 13 );
-   contentRouletteRoleBonus = exdData->getField< uint8_t >( row, 14 );
-   rewardTomeA = exdData->getField< uint16_t >( row, 15 );
-   rewardTomeB = exdData->getField< uint16_t >( row, 16 );
-   rewardTomeC = exdData->getField< uint16_t >( row, 17 );
-   sortKey = exdData->getField< uint8_t >( row, 20 );
-   contentMemberType = exdData->getField< uint8_t >( row, 22 );
-   requireAllDuties = exdData->getField< bool >( row, 32 );
-   contentRouletteOpenRule = exdData->getField< uint8_t >( row, 34 );
-   instanceContent = exdData->getField< uint16_t >( row, 35 );
+  auto row = exdData->m_ContentRouletteDat.get_row( row_id );
+  name = exdData->getField< std::string >( row, 0 );
+  description = exdData->getField< std::string >( row, 2 );
+  dutyType = exdData->getField< std::string >( row, 3 );
+  isInDutyFinder = exdData->getField< bool >( row, 6 );
+  openRule = exdData->getField< uint8_t >( row, 7 );
+  requiredLevel = exdData->getField< uint8_t >( row, 9 );
+  itemLevelRequired = exdData->getField< uint16_t >( row, 11 );
+  icon = exdData->getField< uint32_t >( row, 13 );
+  contentRouletteRoleBonus = exdData->getField< uint8_t >( row, 14 );
+  rewardTomeA = exdData->getField< uint16_t >( row, 15 );
+  rewardTomeB = exdData->getField< uint16_t >( row, 16 );
+  rewardTomeC = exdData->getField< uint16_t >( row, 17 );
+  sortKey = exdData->getField< uint8_t >( row, 20 );
+  contentMemberType = exdData->getField< uint8_t >( row, 22 );
+  requireAllDuties = exdData->getField< bool >( row, 32 );
+  contentRouletteOpenRule = exdData->getField< uint8_t >( row, 34 );
+  instanceContent = exdData->getField< uint16_t >( row, 35 );
 }
 
 Sapphire::Data::ContentRouletteOpenRule::ContentRouletteOpenRule( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
 {
-   auto row = exdData->m_ContentRouletteOpenRuleDat.get_row( row_id );
-   type = exdData->getField< uint32_t >( row, 1 );
+  auto row = exdData->m_ContentRouletteOpenRuleDat.get_row( row_id );
+  type = exdData->getField< uint32_t >( row, 1 );
 }
 
 Sapphire::Data::ContentRouletteRoleBonus::ContentRouletteRoleBonus( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
 {
-   auto row = exdData->m_ContentRouletteRoleBonusDat.get_row( row_id );
-   itemRewardType = exdData->getField< uint32_t >( row, 6 );
-   rewardAmount = exdData->getField< uint8_t >( row, 7 );
+  auto row = exdData->m_ContentRouletteRoleBonusDat.get_row( row_id );
+  itemRewardType = exdData->getField< uint32_t >( row, 6 );
+  rewardAmount = exdData->getField< uint8_t >( row, 7 );
 }
 
 Sapphire::Data::ContentsNote::ContentsNote( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
 {
-   auto row = exdData->m_ContentsNoteDat.get_row( row_id );
-   contentType = exdData->getField< uint8_t >( row, 0 );
-   menuOrder = exdData->getField< uint8_t >( row, 2 );
-   requiredAmount = exdData->getField< int32_t >( row, 3 );
-   expMultiplier = exdData->getField< int32_t >( row, 5 );
-   gilRward = exdData->getField< int32_t >( row, 7 );
-   levelUnlock = exdData->getField< uint16_t >( row, 8 );
-   howTo = exdData->getField< uint16_t >( row, 9 );
-   name = exdData->getField< std::string >( row, 11 );
-   description = exdData->getField< std::string >( row, 12 );
-   expCap = exdData->getField< int32_t >( row, 13 );
+  auto row = exdData->m_ContentsNoteDat.get_row( row_id );
+  contentType = exdData->getField< uint8_t >( row, 0 );
+  menuOrder = exdData->getField< uint8_t >( row, 2 );
+  requiredAmount = exdData->getField< int32_t >( row, 3 );
+  expMultiplier = exdData->getField< int32_t >( row, 5 );
+  gilRward = exdData->getField< int32_t >( row, 7 );
+  levelUnlock = exdData->getField< uint16_t >( row, 8 );
+  howTo = exdData->getField< uint16_t >( row, 9 );
+  name = exdData->getField< std::string >( row, 11 );
+  description = exdData->getField< std::string >( row, 12 );
+  expCap = exdData->getField< int32_t >( row, 13 );
 }
 
 Sapphire::Data::ContentTalk::ContentTalk( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
 {
-   auto row = exdData->m_ContentTalkDat.get_row( row_id );
-   contentTalkParam = exdData->getField< uint8_t >( row, 0 );
-   text = exdData->getField< std::string >( row, 1 );
+  auto row = exdData->m_ContentTalkDat.get_row( row_id );
+  contentTalkParam = exdData->getField< uint8_t >( row, 0 );
+  text = exdData->getField< std::string >( row, 1 );
 }
 
 Sapphire::Data::ContentTalkParam::ContentTalkParam( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
 {
-   auto row = exdData->m_ContentTalkParamDat.get_row( row_id );
-   param = exdData->getField< bool >( row, 0 );
-   testAction = exdData->getField< uint32_t >( row, 2 );
+  auto row = exdData->m_ContentTalkParamDat.get_row( row_id );
+  param = exdData->getField< bool >( row, 0 );
+  testAction = exdData->getField< uint32_t >( row, 2 );
 }
 
 Sapphire::Data::ContentType::ContentType( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
 {
-   auto row = exdData->m_ContentTypeDat.get_row( row_id );
-   name = exdData->getField< std::string >( row, 0 );
-   icon = exdData->getField< uint32_t >( row, 1 );
-   iconDutyFinder = exdData->getField< uint32_t >( row, 2 );
+  auto row = exdData->m_ContentTypeDat.get_row( row_id );
+  name = exdData->getField< std::string >( row, 0 );
+  icon = exdData->getField< uint32_t >( row, 1 );
+  iconDutyFinder = exdData->getField< uint32_t >( row, 2 );
 }
 
 Sapphire::Data::CraftAction::CraftAction( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
 {
-   auto row = exdData->m_CraftActionDat.get_row( row_id );
-   name = exdData->getField< std::string >( row, 0 );
-   description = exdData->getField< std::string >( row, 1 );
-   animationStart = exdData->getField< uint16_t >( row, 2 );
-   animationEnd = exdData->getField< uint16_t >( row, 3 );
-   icon = exdData->getField< uint16_t >( row, 4 );
-   classJob = exdData->getField< int8_t >( row, 5 );
-   classJobCategory = exdData->getField< uint8_t >( row, 6 );
-   classJobLevel = exdData->getField< uint8_t >( row, 7 );
-   questRequirement = exdData->getField< uint32_t >( row, 8 );
-   specialist = exdData->getField< bool >( row, 9 );
-   cost = exdData->getField< uint8_t >( row, 11 );
-   cRP = exdData->getField< int32_t >( row, 12 );
-   bSM = exdData->getField< int32_t >( row, 13 );
-   aRM = exdData->getField< int32_t >( row, 14 );
-   gSM = exdData->getField< int32_t >( row, 15 );
-   lTW = exdData->getField< int32_t >( row, 16 );
-   wVR = exdData->getField< int32_t >( row, 17 );
-   aLC = exdData->getField< int32_t >( row, 18 );
-   cUL = exdData->getField< int32_t >( row, 19 );
+  auto row = exdData->m_CraftActionDat.get_row( row_id );
+  name = exdData->getField< std::string >( row, 0 );
+  description = exdData->getField< std::string >( row, 1 );
+  animationStart = exdData->getField< uint16_t >( row, 2 );
+  animationEnd = exdData->getField< uint16_t >( row, 3 );
+  icon = exdData->getField< uint16_t >( row, 4 );
+  classJob = exdData->getField< int8_t >( row, 5 );
+  classJobCategory = exdData->getField< uint8_t >( row, 6 );
+  classJobLevel = exdData->getField< uint8_t >( row, 7 );
+  questRequirement = exdData->getField< uint32_t >( row, 8 );
+  specialist = exdData->getField< bool >( row, 9 );
+  cost = exdData->getField< uint8_t >( row, 11 );
+  cRP = exdData->getField< int32_t >( row, 12 );
+  bSM = exdData->getField< int32_t >( row, 13 );
+  aRM = exdData->getField< int32_t >( row, 14 );
+  gSM = exdData->getField< int32_t >( row, 15 );
+  lTW = exdData->getField< int32_t >( row, 16 );
+  wVR = exdData->getField< int32_t >( row, 17 );
+  aLC = exdData->getField< int32_t >( row, 18 );
+  cUL = exdData->getField< int32_t >( row, 19 );
 }
 
 Sapphire::Data::CraftLeve::CraftLeve( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
 {
-   auto row = exdData->m_CraftLeveDat.get_row( row_id );
-   leve = exdData->getField< int32_t >( row, 0 );
-   craftLeveTalk = exdData->getField< int32_t >( row, 1 );
-   repeats = exdData->getField< uint8_t >( row, 2 );
+  auto row = exdData->m_CraftLeveDat.get_row( row_id );
+  leve = exdData->getField< int32_t >( row, 0 );
+  craftLeveTalk = exdData->getField< int32_t >( row, 1 );
+  repeats = exdData->getField< uint8_t >( row, 2 );
 }
 
 Sapphire::Data::CraftType::CraftType( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
 {
-   auto row = exdData->m_CraftTypeDat.get_row( row_id );
-   name = exdData->getField< std::string >( row, 2 );
+  auto row = exdData->m_CraftTypeDat.get_row( row_id );
+  name = exdData->getField< std::string >( row, 2 );
 }
 
 Sapphire::Data::Credit::Credit( uint32_t row_id, uint32_t subRow, Sapphire::Data::ExdDataGenerated* exdData )
 {
-   auto row = exdData->m_CreditDat.get_row( row_id, subRow );
-   roles1 = exdData->getField< uint16_t >( row, 1 );
-   japaneseCast1 = exdData->getField< uint16_t >( row, 2 );
-   englishCast1 = exdData->getField< uint16_t >( row, 3 );
-   frenchCast1 = exdData->getField< uint16_t >( row, 4 );
-   germanCast1 = exdData->getField< uint16_t >( row, 5 );
-   roles2 = exdData->getField< uint16_t >( row, 6 );
-   japaneseCast2 = exdData->getField< uint16_t >( row, 7 );
-   englishCast2 = exdData->getField< uint16_t >( row, 8 );
-   frenchCast2 = exdData->getField< uint16_t >( row, 9 );
-   germanCast2 = exdData->getField< uint16_t >( row, 10 );
+  auto row = exdData->m_CreditDat.get_row( row_id, subRow );
+  roles1 = exdData->getField< uint16_t >( row, 1 );
+  japaneseCast1 = exdData->getField< uint16_t >( row, 2 );
+  englishCast1 = exdData->getField< uint16_t >( row, 3 );
+  frenchCast1 = exdData->getField< uint16_t >( row, 4 );
+  germanCast1 = exdData->getField< uint16_t >( row, 5 );
+  roles2 = exdData->getField< uint16_t >( row, 6 );
+  japaneseCast2 = exdData->getField< uint16_t >( row, 7 );
+  englishCast2 = exdData->getField< uint16_t >( row, 8 );
+  frenchCast2 = exdData->getField< uint16_t >( row, 9 );
+  germanCast2 = exdData->getField< uint16_t >( row, 10 );
 }
 
 Sapphire::Data::CreditBackImage::CreditBackImage( uint32_t row_id, uint32_t subRow, Sapphire::Data::ExdDataGenerated* exdData )
 {
-   auto row = exdData->m_CreditBackImageDat.get_row( row_id, subRow );
-   backImage = exdData->getField< uint32_t >( row, 2 );
+  auto row = exdData->m_CreditBackImageDat.get_row( row_id, subRow );
+  backImage = exdData->getField< uint32_t >( row, 2 );
 }
 
 Sapphire::Data::CreditCast::CreditCast( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
 {
-   auto row = exdData->m_CreditCastDat.get_row( row_id );
-   name = exdData->getField< std::string >( row, 0 );
+  auto row = exdData->m_CreditCastDat.get_row( row_id );
+  name = exdData->getField< std::string >( row, 0 );
+}
+
+Sapphire::Data::CreditList::CreditList( uint32_t row_id, uint32_t subRow, Sapphire::Data::ExdDataGenerated* exdData )
+{
+  auto row = exdData->m_CreditListDat.get_row( row_id, subRow );
+  scale = exdData->getField< uint16_t >( row, 0 );
+  icon = exdData->getField< uint32_t >( row, 1 );
+  font = exdData->getField< uint32_t >( row, 2 );
+  cast = exdData->getField< uint32_t >( row, 5 );
+}
+
+Sapphire::Data::CreditListText::CreditListText( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
+{
+  auto row = exdData->m_CreditListTextDat.get_row( row_id );
+  name = exdData->getField< std::string >( row, 0 );
 }
 
 Sapphire::Data::Currency::Currency( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
 {
-   auto row = exdData->m_CurrencyDat.get_row( row_id );
-   item = exdData->getField< uint32_t >( row, 0 );
-   limit = exdData->getField< uint32_t >( row, 3 );
+  auto row = exdData->m_CurrencyDat.get_row( row_id );
+  item = exdData->getField< uint32_t >( row, 0 );
+  limit = exdData->getField< uint32_t >( row, 3 );
 }
 
 Sapphire::Data::CustomTalk::CustomTalk( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
 {
-   auto row = exdData->m_CustomTalkDat.get_row( row_id );
-   iconActor = exdData->getField< uint32_t >( row, 0 );
-   iconMap = exdData->getField< uint32_t >( row, 1 );
-   name = exdData->getField< std::string >( row, 2 );
-   scriptInstruction.push_back( exdData->getField< std::string >( row, 3 ) );
-   scriptInstruction.push_back( exdData->getField< std::string >( row, 4 ) );
-   scriptInstruction.push_back( exdData->getField< std::string >( row, 5 ) );
-   scriptInstruction.push_back( exdData->getField< std::string >( row, 6 ) );
-   scriptInstruction.push_back( exdData->getField< std::string >( row, 7 ) );
-   scriptInstruction.push_back( exdData->getField< std::string >( row, 8 ) );
-   scriptInstruction.push_back( exdData->getField< std::string >( row, 9 ) );
-   scriptInstruction.push_back( exdData->getField< std::string >( row, 10 ) );
-   scriptInstruction.push_back( exdData->getField< std::string >( row, 11 ) );
-   scriptInstruction.push_back( exdData->getField< std::string >( row, 12 ) );
-   scriptInstruction.push_back( exdData->getField< std::string >( row, 13 ) );
-   scriptInstruction.push_back( exdData->getField< std::string >( row, 14 ) );
-   scriptInstruction.push_back( exdData->getField< std::string >( row, 15 ) );
-   scriptInstruction.push_back( exdData->getField< std::string >( row, 16 ) );
-   scriptInstruction.push_back( exdData->getField< std::string >( row, 17 ) );
-   scriptInstruction.push_back( exdData->getField< std::string >( row, 18 ) );
-   scriptInstruction.push_back( exdData->getField< std::string >( row, 19 ) );
-   scriptInstruction.push_back( exdData->getField< std::string >( row, 20 ) );
-   scriptInstruction.push_back( exdData->getField< std::string >( row, 21 ) );
-   scriptInstruction.push_back( exdData->getField< std::string >( row, 22 ) );
-   scriptInstruction.push_back( exdData->getField< std::string >( row, 23 ) );
-   scriptInstruction.push_back( exdData->getField< std::string >( row, 24 ) );
-   scriptInstruction.push_back( exdData->getField< std::string >( row, 25 ) );
-   scriptInstruction.push_back( exdData->getField< std::string >( row, 26 ) );
-   scriptInstruction.push_back( exdData->getField< std::string >( row, 27 ) );
-   scriptInstruction.push_back( exdData->getField< std::string >( row, 28 ) );
-   scriptInstruction.push_back( exdData->getField< std::string >( row, 29 ) );
-   scriptInstruction.push_back( exdData->getField< std::string >( row, 30 ) );
-   scriptInstruction.push_back( exdData->getField< std::string >( row, 31 ) );
-   scriptInstruction.push_back( exdData->getField< std::string >( row, 32 ) );
-   scriptArg.push_back( exdData->getField< uint32_t >( row, 33 ) );
-   scriptArg.push_back( exdData->getField< uint32_t >( row, 34 ) );
-   scriptArg.push_back( exdData->getField< uint32_t >( row, 35 ) );
-   scriptArg.push_back( exdData->getField< uint32_t >( row, 36 ) );
-   scriptArg.push_back( exdData->getField< uint32_t >( row, 37 ) );
-   scriptArg.push_back( exdData->getField< uint32_t >( row, 38 ) );
-   scriptArg.push_back( exdData->getField< uint32_t >( row, 39 ) );
-   scriptArg.push_back( exdData->getField< uint32_t >( row, 40 ) );
-   scriptArg.push_back( exdData->getField< uint32_t >( row, 41 ) );
-   scriptArg.push_back( exdData->getField< uint32_t >( row, 42 ) );
-   scriptArg.push_back( exdData->getField< uint32_t >( row, 43 ) );
-   scriptArg.push_back( exdData->getField< uint32_t >( row, 44 ) );
-   scriptArg.push_back( exdData->getField< uint32_t >( row, 45 ) );
-   scriptArg.push_back( exdData->getField< uint32_t >( row, 46 ) );
-   scriptArg.push_back( exdData->getField< uint32_t >( row, 47 ) );
-   scriptArg.push_back( exdData->getField< uint32_t >( row, 48 ) );
-   scriptArg.push_back( exdData->getField< uint32_t >( row, 49 ) );
-   scriptArg.push_back( exdData->getField< uint32_t >( row, 50 ) );
-   scriptArg.push_back( exdData->getField< uint32_t >( row, 51 ) );
-   scriptArg.push_back( exdData->getField< uint32_t >( row, 52 ) );
-   scriptArg.push_back( exdData->getField< uint32_t >( row, 53 ) );
-   scriptArg.push_back( exdData->getField< uint32_t >( row, 54 ) );
-   scriptArg.push_back( exdData->getField< uint32_t >( row, 55 ) );
-   scriptArg.push_back( exdData->getField< uint32_t >( row, 56 ) );
-   scriptArg.push_back( exdData->getField< uint32_t >( row, 57 ) );
-   scriptArg.push_back( exdData->getField< uint32_t >( row, 58 ) );
-   scriptArg.push_back( exdData->getField< uint32_t >( row, 59 ) );
-   scriptArg.push_back( exdData->getField< uint32_t >( row, 60 ) );
-   scriptArg.push_back( exdData->getField< uint32_t >( row, 61 ) );
-   scriptArg.push_back( exdData->getField< uint32_t >( row, 62 ) );
-   text = exdData->getField< bool >( row, 66 );
+  auto row = exdData->m_CustomTalkDat.get_row( row_id );
+  iconActor = exdData->getField< uint32_t >( row, 0 );
+  iconMap = exdData->getField< uint32_t >( row, 1 );
+  name = exdData->getField< std::string >( row, 2 );
+  scriptInstruction.push_back( exdData->getField< std::string >( row, 3 ) );
+  scriptInstruction.push_back( exdData->getField< std::string >( row, 4 ) );
+  scriptInstruction.push_back( exdData->getField< std::string >( row, 5 ) );
+  scriptInstruction.push_back( exdData->getField< std::string >( row, 6 ) );
+  scriptInstruction.push_back( exdData->getField< std::string >( row, 7 ) );
+  scriptInstruction.push_back( exdData->getField< std::string >( row, 8 ) );
+  scriptInstruction.push_back( exdData->getField< std::string >( row, 9 ) );
+  scriptInstruction.push_back( exdData->getField< std::string >( row, 10 ) );
+  scriptInstruction.push_back( exdData->getField< std::string >( row, 11 ) );
+  scriptInstruction.push_back( exdData->getField< std::string >( row, 12 ) );
+  scriptInstruction.push_back( exdData->getField< std::string >( row, 13 ) );
+  scriptInstruction.push_back( exdData->getField< std::string >( row, 14 ) );
+  scriptInstruction.push_back( exdData->getField< std::string >( row, 15 ) );
+  scriptInstruction.push_back( exdData->getField< std::string >( row, 16 ) );
+  scriptInstruction.push_back( exdData->getField< std::string >( row, 17 ) );
+  scriptInstruction.push_back( exdData->getField< std::string >( row, 18 ) );
+  scriptInstruction.push_back( exdData->getField< std::string >( row, 19 ) );
+  scriptInstruction.push_back( exdData->getField< std::string >( row, 20 ) );
+  scriptInstruction.push_back( exdData->getField< std::string >( row, 21 ) );
+  scriptInstruction.push_back( exdData->getField< std::string >( row, 22 ) );
+  scriptInstruction.push_back( exdData->getField< std::string >( row, 23 ) );
+  scriptInstruction.push_back( exdData->getField< std::string >( row, 24 ) );
+  scriptInstruction.push_back( exdData->getField< std::string >( row, 25 ) );
+  scriptInstruction.push_back( exdData->getField< std::string >( row, 26 ) );
+  scriptInstruction.push_back( exdData->getField< std::string >( row, 27 ) );
+  scriptInstruction.push_back( exdData->getField< std::string >( row, 28 ) );
+  scriptInstruction.push_back( exdData->getField< std::string >( row, 29 ) );
+  scriptInstruction.push_back( exdData->getField< std::string >( row, 30 ) );
+  scriptInstruction.push_back( exdData->getField< std::string >( row, 31 ) );
+  scriptInstruction.push_back( exdData->getField< std::string >( row, 32 ) );
+  scriptArg.push_back( exdData->getField< uint32_t >( row, 33 ) );
+  scriptArg.push_back( exdData->getField< uint32_t >( row, 34 ) );
+  scriptArg.push_back( exdData->getField< uint32_t >( row, 35 ) );
+  scriptArg.push_back( exdData->getField< uint32_t >( row, 36 ) );
+  scriptArg.push_back( exdData->getField< uint32_t >( row, 37 ) );
+  scriptArg.push_back( exdData->getField< uint32_t >( row, 38 ) );
+  scriptArg.push_back( exdData->getField< uint32_t >( row, 39 ) );
+  scriptArg.push_back( exdData->getField< uint32_t >( row, 40 ) );
+  scriptArg.push_back( exdData->getField< uint32_t >( row, 41 ) );
+  scriptArg.push_back( exdData->getField< uint32_t >( row, 42 ) );
+  scriptArg.push_back( exdData->getField< uint32_t >( row, 43 ) );
+  scriptArg.push_back( exdData->getField< uint32_t >( row, 44 ) );
+  scriptArg.push_back( exdData->getField< uint32_t >( row, 45 ) );
+  scriptArg.push_back( exdData->getField< uint32_t >( row, 46 ) );
+  scriptArg.push_back( exdData->getField< uint32_t >( row, 47 ) );
+  scriptArg.push_back( exdData->getField< uint32_t >( row, 48 ) );
+  scriptArg.push_back( exdData->getField< uint32_t >( row, 49 ) );
+  scriptArg.push_back( exdData->getField< uint32_t >( row, 50 ) );
+  scriptArg.push_back( exdData->getField< uint32_t >( row, 51 ) );
+  scriptArg.push_back( exdData->getField< uint32_t >( row, 52 ) );
+  scriptArg.push_back( exdData->getField< uint32_t >( row, 53 ) );
+  scriptArg.push_back( exdData->getField< uint32_t >( row, 54 ) );
+  scriptArg.push_back( exdData->getField< uint32_t >( row, 55 ) );
+  scriptArg.push_back( exdData->getField< uint32_t >( row, 56 ) );
+  scriptArg.push_back( exdData->getField< uint32_t >( row, 57 ) );
+  scriptArg.push_back( exdData->getField< uint32_t >( row, 58 ) );
+  scriptArg.push_back( exdData->getField< uint32_t >( row, 59 ) );
+  scriptArg.push_back( exdData->getField< uint32_t >( row, 60 ) );
+  scriptArg.push_back( exdData->getField< uint32_t >( row, 61 ) );
+  scriptArg.push_back( exdData->getField< uint32_t >( row, 62 ) );
+  text = exdData->getField< bool >( row, 66 );
 }
 
 Sapphire::Data::CustomTalkDynamicIcon::CustomTalkDynamicIcon( uint32_t row_id, uint32_t subRow, Sapphire::Data::ExdDataGenerated* exdData )
 {
-   auto row = exdData->m_CustomTalkDynamicIconDat.get_row( row_id, subRow );
-   smallIcon = exdData->getField< uint32_t >( row, 0 );
-   largeIcon = exdData->getField< uint32_t >( row, 1 );
+  auto row = exdData->m_CustomTalkDynamicIconDat.get_row( row_id, subRow );
+  smallIcon = exdData->getField< uint32_t >( row, 0 );
+  largeIcon = exdData->getField< uint32_t >( row, 1 );
 }
 
 Sapphire::Data::CustomTalkNestHandlers::CustomTalkNestHandlers( uint32_t row_id, uint32_t subRow, Sapphire::Data::ExdDataGenerated* exdData )
 {
-   auto row = exdData->m_CustomTalkNestHandlersDat.get_row( row_id, subRow );
-   nestHandler = exdData->getField< uint32_t >( row, 0 );
+  auto row = exdData->m_CustomTalkNestHandlersDat.get_row( row_id, subRow );
+  nestHandler = exdData->getField< uint32_t >( row, 0 );
 }
 
 Sapphire::Data::Cutscene::Cutscene( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
 {
-   auto row = exdData->m_CutsceneDat.get_row( row_id );
-   path = exdData->getField< std::string >( row, 0 );
+  auto row = exdData->m_CutsceneDat.get_row( row_id );
+  path = exdData->getField< std::string >( row, 0 );
 }
 
 Sapphire::Data::CutScreenImage::CutScreenImage( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
 {
-   auto row = exdData->m_CutScreenImageDat.get_row( row_id );
-   image = exdData->getField< int32_t >( row, 1 );
+  auto row = exdData->m_CutScreenImageDat.get_row( row_id );
+  image = exdData->getField< int32_t >( row, 1 );
 }
 
 Sapphire::Data::DailySupplyItem::DailySupplyItem( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
 {
-   auto row = exdData->m_DailySupplyItemDat.get_row( row_id );
+  auto row = exdData->m_DailySupplyItemDat.get_row( row_id );
 }
 
 Sapphire::Data::DeepDungeon::DeepDungeon( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
 {
-   auto row = exdData->m_DeepDungeonDat.get_row( row_id );
-   name = exdData->getField< std::string >( row, 22 );
+  auto row = exdData->m_DeepDungeonDat.get_row( row_id );
+  name = exdData->getField< std::string >( row, 22 );
 }
 
 Sapphire::Data::DeepDungeonBan::DeepDungeonBan( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
 {
-   auto row = exdData->m_DeepDungeonBanDat.get_row( row_id );
-   screenImage = exdData->getField< uint16_t >( row, 0 );
-   logMessage = exdData->getField< uint16_t >( row, 1 );
-   name = exdData->getField< uint16_t >( row, 2 );
+  auto row = exdData->m_DeepDungeonBanDat.get_row( row_id );
+  screenImage = exdData->getField< uint16_t >( row, 0 );
+  logMessage = exdData->getField< uint16_t >( row, 1 );
+  name = exdData->getField< uint16_t >( row, 2 );
 }
 
 Sapphire::Data::DeepDungeonDanger::DeepDungeonDanger( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
 {
-   auto row = exdData->m_DeepDungeonDangerDat.get_row( row_id );
-   screenImage = exdData->getField< uint16_t >( row, 0 );
-   logMessage = exdData->getField< uint16_t >( row, 1 );
-   name = exdData->getField< uint16_t >( row, 2 );
+  auto row = exdData->m_DeepDungeonDangerDat.get_row( row_id );
+  screenImage = exdData->getField< uint16_t >( row, 0 );
+  logMessage = exdData->getField< uint16_t >( row, 1 );
+  name = exdData->getField< uint16_t >( row, 2 );
 }
 
 Sapphire::Data::DeepDungeonEquipment::DeepDungeonEquipment( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
 {
-   auto row = exdData->m_DeepDungeonEquipmentDat.get_row( row_id );
-   icon = exdData->getField< uint32_t >( row, 0 );
-   singular = exdData->getField< std::string >( row, 1 );
-   adjective = exdData->getField< int8_t >( row, 2 );
-   plural = exdData->getField< std::string >( row, 3 );
-   possessivePronoun = exdData->getField< int8_t >( row, 4 );
-   startsWithVowel = exdData->getField< int8_t >( row, 5 );
-   pronoun = exdData->getField< int8_t >( row, 7 );
-   article = exdData->getField< int8_t >( row, 8 );
-   name = exdData->getField< std::string >( row, 9 );
-   description = exdData->getField< std::string >( row, 10 );
+  auto row = exdData->m_DeepDungeonEquipmentDat.get_row( row_id );
+  icon = exdData->getField< uint32_t >( row, 0 );
+  singular = exdData->getField< std::string >( row, 1 );
+  adjective = exdData->getField< int8_t >( row, 2 );
+  plural = exdData->getField< std::string >( row, 3 );
+  possessivePronoun = exdData->getField< int8_t >( row, 4 );
+  startsWithVowel = exdData->getField< int8_t >( row, 5 );
+  pronoun = exdData->getField< int8_t >( row, 7 );
+  article = exdData->getField< int8_t >( row, 8 );
+  name = exdData->getField< std::string >( row, 9 );
+  description = exdData->getField< std::string >( row, 10 );
 }
 
 Sapphire::Data::DeepDungeonFloorEffectUI::DeepDungeonFloorEffectUI( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
 {
-   auto row = exdData->m_DeepDungeonFloorEffectUIDat.get_row( row_id );
-   icon = exdData->getField< uint32_t >( row, 0 );
-   name = exdData->getField< std::string >( row, 1 );
-   description = exdData->getField< std::string >( row, 2 );
+  auto row = exdData->m_DeepDungeonFloorEffectUIDat.get_row( row_id );
+  icon = exdData->getField< uint32_t >( row, 0 );
+  name = exdData->getField< std::string >( row, 1 );
+  description = exdData->getField< std::string >( row, 2 );
 }
 
 Sapphire::Data::DeepDungeonItem::DeepDungeonItem( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
 {
-   auto row = exdData->m_DeepDungeonItemDat.get_row( row_id );
-   icon = exdData->getField< uint32_t >( row, 0 );
-   singular = exdData->getField< std::string >( row, 1 );
-   adjective = exdData->getField< int8_t >( row, 2 );
-   plural = exdData->getField< std::string >( row, 3 );
-   possessivePronoun = exdData->getField< int8_t >( row, 4 );
-   startsWithVowel = exdData->getField< int8_t >( row, 5 );
-   pronoun = exdData->getField< int8_t >( row, 7 );
-   article = exdData->getField< int8_t >( row, 8 );
-   name = exdData->getField< std::string >( row, 9 );
-   tooltip = exdData->getField< std::string >( row, 10 );
-   action = exdData->getField< uint32_t >( row, 11 );
+  auto row = exdData->m_DeepDungeonItemDat.get_row( row_id );
+  icon = exdData->getField< uint32_t >( row, 0 );
+  singular = exdData->getField< std::string >( row, 1 );
+  adjective = exdData->getField< int8_t >( row, 2 );
+  plural = exdData->getField< std::string >( row, 3 );
+  possessivePronoun = exdData->getField< int8_t >( row, 4 );
+  startsWithVowel = exdData->getField< int8_t >( row, 5 );
+  pronoun = exdData->getField< int8_t >( row, 7 );
+  article = exdData->getField< int8_t >( row, 8 );
+  name = exdData->getField< std::string >( row, 9 );
+  tooltip = exdData->getField< std::string >( row, 10 );
+  action = exdData->getField< uint32_t >( row, 11 );
 }
 
 Sapphire::Data::DeepDungeonLayer::DeepDungeonLayer( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
 {
-   auto row = exdData->m_DeepDungeonLayerDat.get_row( row_id );
-   deepDungeon = exdData->getField< uint8_t >( row, 0 );
+  auto row = exdData->m_DeepDungeonLayerDat.get_row( row_id );
+  deepDungeon = exdData->getField< uint8_t >( row, 0 );
 }
 
 Sapphire::Data::DeepDungeonMagicStone::DeepDungeonMagicStone( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
 {
-   auto row = exdData->m_DeepDungeonMagicStoneDat.get_row( row_id );
-   icon = exdData->getField< uint32_t >( row, 0 );
-   singular = exdData->getField< std::string >( row, 1 );
-   adjective = exdData->getField< int8_t >( row, 2 );
-   plural = exdData->getField< std::string >( row, 3 );
-   possessivePronoun = exdData->getField< int8_t >( row, 4 );
-   startsWithVowel = exdData->getField< int8_t >( row, 5 );
-   pronoun = exdData->getField< int8_t >( row, 7 );
-   article = exdData->getField< int8_t >( row, 8 );
-   name = exdData->getField< std::string >( row, 9 );
-   tooltip = exdData->getField< std::string >( row, 10 );
+  auto row = exdData->m_DeepDungeonMagicStoneDat.get_row( row_id );
+  icon = exdData->getField< uint32_t >( row, 0 );
+  singular = exdData->getField< std::string >( row, 1 );
+  adjective = exdData->getField< int8_t >( row, 2 );
+  plural = exdData->getField< std::string >( row, 3 );
+  possessivePronoun = exdData->getField< int8_t >( row, 4 );
+  startsWithVowel = exdData->getField< int8_t >( row, 5 );
+  pronoun = exdData->getField< int8_t >( row, 7 );
+  article = exdData->getField< int8_t >( row, 8 );
+  name = exdData->getField< std::string >( row, 9 );
+  tooltip = exdData->getField< std::string >( row, 10 );
 }
 
 Sapphire::Data::DeepDungeonMap5X::DeepDungeonMap5X( uint32_t row_id, uint32_t subRow, Sapphire::Data::ExdDataGenerated* exdData )
 {
-   auto row = exdData->m_DeepDungeonMap5XDat.get_row( row_id, subRow );
-   deepDungeonRoom.push_back( exdData->getField< uint16_t >( row, 0 ) );
-   deepDungeonRoom.push_back( exdData->getField< uint16_t >( row, 1 ) );
-   deepDungeonRoom.push_back( exdData->getField< uint16_t >( row, 2 ) );
-   deepDungeonRoom.push_back( exdData->getField< uint16_t >( row, 3 ) );
-   deepDungeonRoom.push_back( exdData->getField< uint16_t >( row, 4 ) );
+  auto row = exdData->m_DeepDungeonMap5XDat.get_row( row_id, subRow );
+  deepDungeonRoom.push_back( exdData->getField< uint16_t >( row, 0 ) );
+  deepDungeonRoom.push_back( exdData->getField< uint16_t >( row, 1 ) );
+  deepDungeonRoom.push_back( exdData->getField< uint16_t >( row, 2 ) );
+  deepDungeonRoom.push_back( exdData->getField< uint16_t >( row, 3 ) );
+  deepDungeonRoom.push_back( exdData->getField< uint16_t >( row, 4 ) );
 }
 
 Sapphire::Data::DeepDungeonRoom::DeepDungeonRoom( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
 {
-   auto row = exdData->m_DeepDungeonRoomDat.get_row( row_id );
-   level.push_back( exdData->getField< uint32_t >( row, 0 ) );
-   level.push_back( exdData->getField< uint32_t >( row, 1 ) );
-   level.push_back( exdData->getField< uint32_t >( row, 2 ) );
-   level.push_back( exdData->getField< uint32_t >( row, 3 ) );
-   level.push_back( exdData->getField< uint32_t >( row, 4 ) );
+  auto row = exdData->m_DeepDungeonRoomDat.get_row( row_id );
+  level.push_back( exdData->getField< uint32_t >( row, 0 ) );
+  level.push_back( exdData->getField< uint32_t >( row, 1 ) );
+  level.push_back( exdData->getField< uint32_t >( row, 2 ) );
+  level.push_back( exdData->getField< uint32_t >( row, 3 ) );
+  level.push_back( exdData->getField< uint32_t >( row, 4 ) );
 }
 
 Sapphire::Data::DeepDungeonStatus::DeepDungeonStatus( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
 {
-   auto row = exdData->m_DeepDungeonStatusDat.get_row( row_id );
-   screenImage = exdData->getField< uint16_t >( row, 0 );
-   logMessage = exdData->getField< uint16_t >( row, 1 );
-   name = exdData->getField< uint16_t >( row, 2 );
+  auto row = exdData->m_DeepDungeonStatusDat.get_row( row_id );
+  screenImage = exdData->getField< uint16_t >( row, 0 );
+  logMessage = exdData->getField< uint16_t >( row, 1 );
+  name = exdData->getField< uint16_t >( row, 2 );
 }
 
 Sapphire::Data::DefaultTalk::DefaultTalk( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
 {
-   auto row = exdData->m_DefaultTalkDat.get_row( row_id );
-   actionTimelinePose.push_back( exdData->getField< uint16_t >( row, 5 ) );
-   actionTimelinePose.push_back( exdData->getField< uint16_t >( row, 6 ) );
-   actionTimelinePose.push_back( exdData->getField< uint16_t >( row, 7 ) );
-   text.push_back( exdData->getField< std::string >( row, 20 ) );
-   text.push_back( exdData->getField< std::string >( row, 21 ) );
-   text.push_back( exdData->getField< std::string >( row, 22 ) );
+  auto row = exdData->m_DefaultTalkDat.get_row( row_id );
+  actionTimelinePose.push_back( exdData->getField< uint16_t >( row, 5 ) );
+  actionTimelinePose.push_back( exdData->getField< uint16_t >( row, 6 ) );
+  actionTimelinePose.push_back( exdData->getField< uint16_t >( row, 7 ) );
+  text.push_back( exdData->getField< std::string >( row, 20 ) );
+  text.push_back( exdData->getField< std::string >( row, 21 ) );
+  text.push_back( exdData->getField< std::string >( row, 22 ) );
 }
 
 Sapphire::Data::DefaultTalkLipSyncType::DefaultTalkLipSyncType( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
 {
-   auto row = exdData->m_DefaultTalkLipSyncTypeDat.get_row( row_id );
-   actionTimeline = exdData->getField< int32_t >( row, 0 );
+  auto row = exdData->m_DefaultTalkLipSyncTypeDat.get_row( row_id );
+  actionTimeline = exdData->getField< int32_t >( row, 0 );
 }
 
 Sapphire::Data::DeliveryQuest::DeliveryQuest( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
 {
-   auto row = exdData->m_DeliveryQuestDat.get_row( row_id );
-   quest = exdData->getField< int32_t >( row, 0 );
+  auto row = exdData->m_DeliveryQuestDat.get_row( row_id );
+  quest = exdData->getField< int32_t >( row, 0 );
 }
 
 Sapphire::Data::DescriptionPage::DescriptionPage( uint32_t row_id, uint32_t subRow, Sapphire::Data::ExdDataGenerated* exdData )
 {
-   auto row = exdData->m_DescriptionPageDat.get_row( row_id, subRow );
-   text1 = exdData->getField< uint32_t >( row, 1 );
-   image1 = exdData->getField< uint32_t >( row, 2 );
-   text2 = exdData->getField< uint32_t >( row, 3 );
-   image2 = exdData->getField< uint32_t >( row, 4 );
-   text3 = exdData->getField< uint32_t >( row, 5 );
-   image3 = exdData->getField< uint32_t >( row, 6 );
-   text4 = exdData->getField< uint32_t >( row, 7 );
-   image4 = exdData->getField< uint32_t >( row, 8 );
-   text5 = exdData->getField< uint32_t >( row, 9 );
-   image5 = exdData->getField< uint32_t >( row, 10 );
-   text6 = exdData->getField< uint32_t >( row, 11 );
-   image6 = exdData->getField< uint32_t >( row, 12 );
-   text7 = exdData->getField< uint32_t >( row, 13 );
-   image7 = exdData->getField< uint32_t >( row, 14 );
-   text8 = exdData->getField< uint32_t >( row, 15 );
-   image8 = exdData->getField< uint32_t >( row, 16 );
-   text9 = exdData->getField< uint32_t >( row, 17 );
-   image9 = exdData->getField< uint32_t >( row, 18 );
+  auto row = exdData->m_DescriptionPageDat.get_row( row_id, subRow );
+  text1 = exdData->getField< uint32_t >( row, 1 );
+  image1 = exdData->getField< uint32_t >( row, 2 );
+  text2 = exdData->getField< uint32_t >( row, 3 );
+  image2 = exdData->getField< uint32_t >( row, 4 );
+  text3 = exdData->getField< uint32_t >( row, 5 );
+  image3 = exdData->getField< uint32_t >( row, 6 );
+  text4 = exdData->getField< uint32_t >( row, 7 );
+  image4 = exdData->getField< uint32_t >( row, 8 );
+  text5 = exdData->getField< uint32_t >( row, 9 );
+  image5 = exdData->getField< uint32_t >( row, 10 );
+  text6 = exdData->getField< uint32_t >( row, 11 );
+  image6 = exdData->getField< uint32_t >( row, 12 );
+  text7 = exdData->getField< uint32_t >( row, 13 );
+  image7 = exdData->getField< uint32_t >( row, 14 );
+  text8 = exdData->getField< uint32_t >( row, 15 );
+  image8 = exdData->getField< uint32_t >( row, 16 );
+  text9 = exdData->getField< uint32_t >( row, 17 );
+  image9 = exdData->getField< uint32_t >( row, 18 );
 }
 
 Sapphire::Data::DescriptionString::DescriptionString( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
 {
-   auto row = exdData->m_DescriptionStringDat.get_row( row_id );
-   text = exdData->getField< std::string >( row, 0 );
+  auto row = exdData->m_DescriptionStringDat.get_row( row_id );
+  text = exdData->getField< std::string >( row, 0 );
 }
 
 Sapphire::Data::DisposalShop::DisposalShop( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
 {
-   auto row = exdData->m_DisposalShopDat.get_row( row_id );
-   shopName = exdData->getField< std::string >( row, 0 );
+  auto row = exdData->m_DisposalShopDat.get_row( row_id );
+  shopName = exdData->getField< std::string >( row, 0 );
 }
 
 Sapphire::Data::DisposalShopFilterType::DisposalShopFilterType( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
 {
-   auto row = exdData->m_DisposalShopFilterTypeDat.get_row( row_id );
-   category = exdData->getField< std::string >( row, 0 );
+  auto row = exdData->m_DisposalShopFilterTypeDat.get_row( row_id );
+  category = exdData->getField< std::string >( row, 0 );
 }
 
 Sapphire::Data::DisposalShopItem::DisposalShopItem( uint32_t row_id, uint32_t subRow, Sapphire::Data::ExdDataGenerated* exdData )
 {
-   auto row = exdData->m_DisposalShopItemDat.get_row( row_id, subRow );
-   itemDisposed = exdData->getField< int32_t >( row, 0 );
-   itemReceived = exdData->getField< int32_t >( row, 2 );
-   quantityReceived = exdData->getField< uint32_t >( row, 4 );
+  auto row = exdData->m_DisposalShopItemDat.get_row( row_id, subRow );
+  itemDisposed = exdData->getField< int32_t >( row, 0 );
+  itemReceived = exdData->getField< int32_t >( row, 2 );
+  quantityReceived = exdData->getField< uint32_t >( row, 4 );
 }
 
 Sapphire::Data::DpsChallenge::DpsChallenge( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
 {
-   auto row = exdData->m_DpsChallengeDat.get_row( row_id );
-   playerLevel = exdData->getField< uint16_t >( row, 0 );
-   placeName = exdData->getField< uint16_t >( row, 1 );
-   icon = exdData->getField< uint32_t >( row, 2 );
-   order = exdData->getField< uint16_t >( row, 3 );
-   name = exdData->getField< std::string >( row, 4 );
-   description = exdData->getField< std::string >( row, 5 );
+  auto row = exdData->m_DpsChallengeDat.get_row( row_id );
+  playerLevel = exdData->getField< uint16_t >( row, 0 );
+  placeName = exdData->getField< uint16_t >( row, 1 );
+  icon = exdData->getField< uint32_t >( row, 2 );
+  order = exdData->getField< uint16_t >( row, 3 );
+  name = exdData->getField< std::string >( row, 4 );
+  description = exdData->getField< std::string >( row, 5 );
 }
 
 Sapphire::Data::DpsChallengeOfficer::DpsChallengeOfficer( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
 {
-   auto row = exdData->m_DpsChallengeOfficerDat.get_row( row_id );
-   unlockQuest = exdData->getField< uint32_t >( row, 0 );
-   challengeName.push_back( exdData->getField< uint16_t >( row, 1 ) );
-   challengeName.push_back( exdData->getField< uint16_t >( row, 2 ) );
-   challengeName.push_back( exdData->getField< uint16_t >( row, 3 ) );
-   challengeName.push_back( exdData->getField< uint16_t >( row, 4 ) );
-   challengeName.push_back( exdData->getField< uint16_t >( row, 5 ) );
-   challengeName.push_back( exdData->getField< uint16_t >( row, 6 ) );
-   challengeName.push_back( exdData->getField< uint16_t >( row, 7 ) );
-   challengeName.push_back( exdData->getField< uint16_t >( row, 8 ) );
-   challengeName.push_back( exdData->getField< uint16_t >( row, 9 ) );
-   challengeName.push_back( exdData->getField< uint16_t >( row, 10 ) );
-   challengeName.push_back( exdData->getField< uint16_t >( row, 11 ) );
-   challengeName.push_back( exdData->getField< uint16_t >( row, 12 ) );
-   challengeName.push_back( exdData->getField< uint16_t >( row, 13 ) );
-   challengeName.push_back( exdData->getField< uint16_t >( row, 14 ) );
-   challengeName.push_back( exdData->getField< uint16_t >( row, 15 ) );
-   challengeName.push_back( exdData->getField< uint16_t >( row, 16 ) );
-   challengeName.push_back( exdData->getField< uint16_t >( row, 17 ) );
-   challengeName.push_back( exdData->getField< uint16_t >( row, 18 ) );
-   challengeName.push_back( exdData->getField< uint16_t >( row, 19 ) );
-   challengeName.push_back( exdData->getField< uint16_t >( row, 20 ) );
-   challengeName.push_back( exdData->getField< uint16_t >( row, 21 ) );
-   challengeName.push_back( exdData->getField< uint16_t >( row, 22 ) );
-   challengeName.push_back( exdData->getField< uint16_t >( row, 23 ) );
-   challengeName.push_back( exdData->getField< uint16_t >( row, 24 ) );
-   challengeName.push_back( exdData->getField< uint16_t >( row, 25 ) );
+  auto row = exdData->m_DpsChallengeOfficerDat.get_row( row_id );
+  unlockQuest = exdData->getField< uint32_t >( row, 0 );
+  challengeName.push_back( exdData->getField< uint16_t >( row, 1 ) );
+  challengeName.push_back( exdData->getField< uint16_t >( row, 2 ) );
+  challengeName.push_back( exdData->getField< uint16_t >( row, 3 ) );
+  challengeName.push_back( exdData->getField< uint16_t >( row, 4 ) );
+  challengeName.push_back( exdData->getField< uint16_t >( row, 5 ) );
+  challengeName.push_back( exdData->getField< uint16_t >( row, 6 ) );
+  challengeName.push_back( exdData->getField< uint16_t >( row, 7 ) );
+  challengeName.push_back( exdData->getField< uint16_t >( row, 8 ) );
+  challengeName.push_back( exdData->getField< uint16_t >( row, 9 ) );
+  challengeName.push_back( exdData->getField< uint16_t >( row, 10 ) );
+  challengeName.push_back( exdData->getField< uint16_t >( row, 11 ) );
+  challengeName.push_back( exdData->getField< uint16_t >( row, 12 ) );
+  challengeName.push_back( exdData->getField< uint16_t >( row, 13 ) );
+  challengeName.push_back( exdData->getField< uint16_t >( row, 14 ) );
+  challengeName.push_back( exdData->getField< uint16_t >( row, 15 ) );
+  challengeName.push_back( exdData->getField< uint16_t >( row, 16 ) );
+  challengeName.push_back( exdData->getField< uint16_t >( row, 17 ) );
+  challengeName.push_back( exdData->getField< uint16_t >( row, 18 ) );
+  challengeName.push_back( exdData->getField< uint16_t >( row, 19 ) );
+  challengeName.push_back( exdData->getField< uint16_t >( row, 20 ) );
+  challengeName.push_back( exdData->getField< uint16_t >( row, 21 ) );
+  challengeName.push_back( exdData->getField< uint16_t >( row, 22 ) );
+  challengeName.push_back( exdData->getField< uint16_t >( row, 23 ) );
+  challengeName.push_back( exdData->getField< uint16_t >( row, 24 ) );
+  challengeName.push_back( exdData->getField< uint16_t >( row, 25 ) );
 }
 
 Sapphire::Data::DpsChallengeTransient::DpsChallengeTransient( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
 {
-   auto row = exdData->m_DpsChallengeTransientDat.get_row( row_id );
-   instanceContent = exdData->getField< uint16_t >( row, 0 );
+  auto row = exdData->m_DpsChallengeTransientDat.get_row( row_id );
+  instanceContent = exdData->getField< uint16_t >( row, 0 );
 }
 
 Sapphire::Data::EmjAddon::EmjAddon( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
 {
-   auto row = exdData->m_EmjAddonDat.get_row( row_id );
-   text = exdData->getField< std::string >( row, 0 );
+  auto row = exdData->m_EmjAddonDat.get_row( row_id );
+  text = exdData->getField< std::string >( row, 0 );
 }
 
 Sapphire::Data::EmjDani::EmjDani( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
 {
-   auto row = exdData->m_EmjDaniDat.get_row( row_id );
-   icon = exdData->getField< uint32_t >( row, 0 );
+  auto row = exdData->m_EmjDaniDat.get_row( row_id );
+  icon = exdData->getField< uint32_t >( row, 0 );
 }
 
 Sapphire::Data::Emote::Emote( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
 {
-   auto row = exdData->m_EmoteDat.get_row( row_id );
-   name = exdData->getField< std::string >( row, 0 );
-   actionTimeline.push_back( exdData->getField< uint16_t >( row, 1 ) );
-   actionTimeline.push_back( exdData->getField< uint16_t >( row, 2 ) );
-   actionTimeline.push_back( exdData->getField< uint16_t >( row, 3 ) );
-   actionTimeline.push_back( exdData->getField< uint16_t >( row, 4 ) );
-   actionTimeline.push_back( exdData->getField< uint16_t >( row, 5 ) );
-   actionTimeline.push_back( exdData->getField< uint16_t >( row, 6 ) );
-   actionTimeline.push_back( exdData->getField< uint16_t >( row, 7 ) );
-   emoteCategory = exdData->getField< uint8_t >( row, 11 );
-   emoteMode = exdData->getField< uint8_t >( row, 12 );
-   hasCancelEmote = exdData->getField< bool >( row, 15 );
-   drawsWeapon = exdData->getField< bool >( row, 16 );
-   textCommand = exdData->getField< int32_t >( row, 18 );
-   icon = exdData->getField< uint16_t >( row, 19 );
-   logMessageTargeted = exdData->getField< uint16_t >( row, 20 );
-   logMessageUntargeted = exdData->getField< uint16_t >( row, 21 );
-   unlockLink = exdData->getField< uint32_t >( row, 22 );
+  auto row = exdData->m_EmoteDat.get_row( row_id );
+  name = exdData->getField< std::string >( row, 0 );
+  actionTimeline.push_back( exdData->getField< uint16_t >( row, 1 ) );
+  actionTimeline.push_back( exdData->getField< uint16_t >( row, 2 ) );
+  actionTimeline.push_back( exdData->getField< uint16_t >( row, 3 ) );
+  actionTimeline.push_back( exdData->getField< uint16_t >( row, 4 ) );
+  actionTimeline.push_back( exdData->getField< uint16_t >( row, 5 ) );
+  actionTimeline.push_back( exdData->getField< uint16_t >( row, 6 ) );
+  actionTimeline.push_back( exdData->getField< uint16_t >( row, 7 ) );
+  emoteCategory = exdData->getField< uint8_t >( row, 11 );
+  emoteMode = exdData->getField< uint8_t >( row, 12 );
+  hasCancelEmote = exdData->getField< bool >( row, 15 );
+  drawsWeapon = exdData->getField< bool >( row, 16 );
+  textCommand = exdData->getField< int32_t >( row, 18 );
+  icon = exdData->getField< uint16_t >( row, 19 );
+  logMessageTargeted = exdData->getField< uint16_t >( row, 20 );
+  logMessageUntargeted = exdData->getField< uint16_t >( row, 21 );
+  unlockLink = exdData->getField< uint32_t >( row, 22 );
 }
 
 Sapphire::Data::EmoteCategory::EmoteCategory( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
 {
-   auto row = exdData->m_EmoteCategoryDat.get_row( row_id );
-   name = exdData->getField< std::string >( row, 0 );
+  auto row = exdData->m_EmoteCategoryDat.get_row( row_id );
+  name = exdData->getField< std::string >( row, 0 );
 }
 
 Sapphire::Data::ENpcBase::ENpcBase( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
 {
-   auto row = exdData->m_ENpcBaseDat.get_row( row_id );
-   eNpcData.push_back( exdData->getField< uint32_t >( row, 2 ) );
-   eNpcData.push_back( exdData->getField< uint32_t >( row, 3 ) );
-   eNpcData.push_back( exdData->getField< uint32_t >( row, 4 ) );
-   eNpcData.push_back( exdData->getField< uint32_t >( row, 5 ) );
-   eNpcData.push_back( exdData->getField< uint32_t >( row, 6 ) );
-   eNpcData.push_back( exdData->getField< uint32_t >( row, 7 ) );
-   eNpcData.push_back( exdData->getField< uint32_t >( row, 8 ) );
-   eNpcData.push_back( exdData->getField< uint32_t >( row, 9 ) );
-   eNpcData.push_back( exdData->getField< uint32_t >( row, 10 ) );
-   eNpcData.push_back( exdData->getField< uint32_t >( row, 11 ) );
-   eNpcData.push_back( exdData->getField< uint32_t >( row, 12 ) );
-   eNpcData.push_back( exdData->getField< uint32_t >( row, 13 ) );
-   eNpcData.push_back( exdData->getField< uint32_t >( row, 14 ) );
-   eNpcData.push_back( exdData->getField< uint32_t >( row, 15 ) );
-   eNpcData.push_back( exdData->getField< uint32_t >( row, 16 ) );
-   eNpcData.push_back( exdData->getField< uint32_t >( row, 17 ) );
-   eNpcData.push_back( exdData->getField< uint32_t >( row, 18 ) );
-   eNpcData.push_back( exdData->getField< uint32_t >( row, 19 ) );
-   eNpcData.push_back( exdData->getField< uint32_t >( row, 20 ) );
-   eNpcData.push_back( exdData->getField< uint32_t >( row, 21 ) );
-   eNpcData.push_back( exdData->getField< uint32_t >( row, 22 ) );
-   eNpcData.push_back( exdData->getField< uint32_t >( row, 23 ) );
-   eNpcData.push_back( exdData->getField< uint32_t >( row, 24 ) );
-   eNpcData.push_back( exdData->getField< uint32_t >( row, 25 ) );
-   eNpcData.push_back( exdData->getField< uint32_t >( row, 26 ) );
-   eNpcData.push_back( exdData->getField< uint32_t >( row, 27 ) );
-   eNpcData.push_back( exdData->getField< uint32_t >( row, 28 ) );
-   eNpcData.push_back( exdData->getField< uint32_t >( row, 29 ) );
-   eNpcData.push_back( exdData->getField< uint32_t >( row, 30 ) );
-   eNpcData.push_back( exdData->getField< uint32_t >( row, 31 ) );
-   eNpcData.push_back( exdData->getField< uint32_t >( row, 32 ) );
-   eNpcData.push_back( exdData->getField< uint32_t >( row, 33 ) );
-   race = exdData->getField< uint8_t >( row, 36 );
-   gender = exdData->getField< uint8_t >( row, 37 );
-   bodyType = exdData->getField< uint8_t >( row, 38 );
-   height = exdData->getField< uint8_t >( row, 39 );
-   tribe = exdData->getField< uint8_t >( row, 40 );
-   face = exdData->getField< uint8_t >( row, 41 );
-   hairStyle = exdData->getField< uint8_t >( row, 42 );
-   hairHighlight = exdData->getField< uint8_t >( row, 43 );
-   skinColor = exdData->getField< uint8_t >( row, 44 );
-   eyeHeterochromia = exdData->getField< uint8_t >( row, 45 );
-   hairColor = exdData->getField< uint8_t >( row, 46 );
-   hairHighlightColor = exdData->getField< uint8_t >( row, 47 );
-   facialFeature = exdData->getField< uint8_t >( row, 48 );
-   facialFeatureColor = exdData->getField< uint8_t >( row, 49 );
-   eyebrows = exdData->getField< uint8_t >( row, 50 );
-   eyeColor = exdData->getField< uint8_t >( row, 51 );
-   eyeShape = exdData->getField< uint8_t >( row, 52 );
-   nose = exdData->getField< uint8_t >( row, 53 );
-   jaw = exdData->getField< uint8_t >( row, 54 );
-   mouth = exdData->getField< uint8_t >( row, 55 );
-   lipColor = exdData->getField< uint8_t >( row, 56 );
-   bustOrTone1 = exdData->getField< uint8_t >( row, 57 );
-   extraFeature1 = exdData->getField< uint8_t >( row, 58 );
-   extraFeature2OrBust = exdData->getField< uint8_t >( row, 59 );
-   facePaint = exdData->getField< uint8_t >( row, 60 );
-   facePaintColor = exdData->getField< uint8_t >( row, 61 );
-   npcEquip = exdData->getField< uint16_t >( row, 63 );
-   behavior = exdData->getField< uint16_t >( row, 64 );
-   modelMainHand = exdData->getField< uint64_t >( row, 65 );
-   dyeMainHand = exdData->getField< uint8_t >( row, 66 );
-   modelOffHand = exdData->getField< uint64_t >( row, 67 );
-   dyeOffHand = exdData->getField< uint8_t >( row, 68 );
-   modelHead = exdData->getField< uint32_t >( row, 69 );
-   dyeHead = exdData->getField< uint8_t >( row, 70 );
-   visor = exdData->getField< bool >( row, 71 );
-   modelBody = exdData->getField< uint32_t >( row, 72 );
-   dyeBody = exdData->getField< uint8_t >( row, 73 );
-   modelHands = exdData->getField< uint32_t >( row, 74 );
-   dyeHands = exdData->getField< uint8_t >( row, 75 );
-   modelLegs = exdData->getField< uint32_t >( row, 76 );
-   dyeLegs = exdData->getField< uint8_t >( row, 77 );
-   modelFeet = exdData->getField< uint32_t >( row, 78 );
-   dyeFeet = exdData->getField< uint8_t >( row, 79 );
-   modelEars = exdData->getField< uint32_t >( row, 80 );
-   dyeEars = exdData->getField< uint8_t >( row, 81 );
-   modelNeck = exdData->getField< uint32_t >( row, 82 );
-   dyeNeck = exdData->getField< uint8_t >( row, 83 );
-   modelWrists = exdData->getField< uint32_t >( row, 84 );
-   dyeWrists = exdData->getField< uint8_t >( row, 85 );
-   modelLeftRing = exdData->getField< uint32_t >( row, 86 );
-   dyeLeftRing = exdData->getField< uint8_t >( row, 87 );
-   modelRightRing = exdData->getField< uint32_t >( row, 88 );
-   dyeRightRing = exdData->getField< uint8_t >( row, 89 );
-   balloon = exdData->getField< uint16_t >( row, 91 );
+  auto row = exdData->m_ENpcBaseDat.get_row( row_id );
+  eNpcData.push_back( exdData->getField< uint32_t >( row, 2 ) );
+  eNpcData.push_back( exdData->getField< uint32_t >( row, 3 ) );
+  eNpcData.push_back( exdData->getField< uint32_t >( row, 4 ) );
+  eNpcData.push_back( exdData->getField< uint32_t >( row, 5 ) );
+  eNpcData.push_back( exdData->getField< uint32_t >( row, 6 ) );
+  eNpcData.push_back( exdData->getField< uint32_t >( row, 7 ) );
+  eNpcData.push_back( exdData->getField< uint32_t >( row, 8 ) );
+  eNpcData.push_back( exdData->getField< uint32_t >( row, 9 ) );
+  eNpcData.push_back( exdData->getField< uint32_t >( row, 10 ) );
+  eNpcData.push_back( exdData->getField< uint32_t >( row, 11 ) );
+  eNpcData.push_back( exdData->getField< uint32_t >( row, 12 ) );
+  eNpcData.push_back( exdData->getField< uint32_t >( row, 13 ) );
+  eNpcData.push_back( exdData->getField< uint32_t >( row, 14 ) );
+  eNpcData.push_back( exdData->getField< uint32_t >( row, 15 ) );
+  eNpcData.push_back( exdData->getField< uint32_t >( row, 16 ) );
+  eNpcData.push_back( exdData->getField< uint32_t >( row, 17 ) );
+  eNpcData.push_back( exdData->getField< uint32_t >( row, 18 ) );
+  eNpcData.push_back( exdData->getField< uint32_t >( row, 19 ) );
+  eNpcData.push_back( exdData->getField< uint32_t >( row, 20 ) );
+  eNpcData.push_back( exdData->getField< uint32_t >( row, 21 ) );
+  eNpcData.push_back( exdData->getField< uint32_t >( row, 22 ) );
+  eNpcData.push_back( exdData->getField< uint32_t >( row, 23 ) );
+  eNpcData.push_back( exdData->getField< uint32_t >( row, 24 ) );
+  eNpcData.push_back( exdData->getField< uint32_t >( row, 25 ) );
+  eNpcData.push_back( exdData->getField< uint32_t >( row, 26 ) );
+  eNpcData.push_back( exdData->getField< uint32_t >( row, 27 ) );
+  eNpcData.push_back( exdData->getField< uint32_t >( row, 28 ) );
+  eNpcData.push_back( exdData->getField< uint32_t >( row, 29 ) );
+  eNpcData.push_back( exdData->getField< uint32_t >( row, 30 ) );
+  eNpcData.push_back( exdData->getField< uint32_t >( row, 31 ) );
+  eNpcData.push_back( exdData->getField< uint32_t >( row, 32 ) );
+  eNpcData.push_back( exdData->getField< uint32_t >( row, 33 ) );
+  scale = exdData->getField< float >( row, 34 );
+  modelChara = exdData->getField< uint16_t >( row, 35 );
+  race = exdData->getField< uint8_t >( row, 36 );
+  gender = exdData->getField< uint8_t >( row, 37 );
+  bodyType = exdData->getField< uint8_t >( row, 38 );
+  height = exdData->getField< uint8_t >( row, 39 );
+  tribe = exdData->getField< uint8_t >( row, 40 );
+  face = exdData->getField< uint8_t >( row, 41 );
+  hairStyle = exdData->getField< uint8_t >( row, 42 );
+  hairHighlight = exdData->getField< uint8_t >( row, 43 );
+  skinColor = exdData->getField< uint8_t >( row, 44 );
+  eyeHeterochromia = exdData->getField< uint8_t >( row, 45 );
+  hairColor = exdData->getField< uint8_t >( row, 46 );
+  hairHighlightColor = exdData->getField< uint8_t >( row, 47 );
+  facialFeature = exdData->getField< uint8_t >( row, 48 );
+  facialFeatureColor = exdData->getField< uint8_t >( row, 49 );
+  eyebrows = exdData->getField< uint8_t >( row, 50 );
+  eyeColor = exdData->getField< uint8_t >( row, 51 );
+  eyeShape = exdData->getField< uint8_t >( row, 52 );
+  nose = exdData->getField< uint8_t >( row, 53 );
+  jaw = exdData->getField< uint8_t >( row, 54 );
+  mouth = exdData->getField< uint8_t >( row, 55 );
+  lipColor = exdData->getField< uint8_t >( row, 56 );
+  bustOrTone1 = exdData->getField< uint8_t >( row, 57 );
+  extraFeature1 = exdData->getField< uint8_t >( row, 58 );
+  extraFeature2OrBust = exdData->getField< uint8_t >( row, 59 );
+  facePaint = exdData->getField< uint8_t >( row, 60 );
+  facePaintColor = exdData->getField< uint8_t >( row, 61 );
+  npcEquip = exdData->getField< uint16_t >( row, 63 );
+  behavior = exdData->getField< uint16_t >( row, 64 );
+  modelMainHand = exdData->getField< uint64_t >( row, 65 );
+  dyeMainHand = exdData->getField< uint8_t >( row, 66 );
+  modelOffHand = exdData->getField< uint64_t >( row, 67 );
+  dyeOffHand = exdData->getField< uint8_t >( row, 68 );
+  modelHead = exdData->getField< uint32_t >( row, 69 );
+  dyeHead = exdData->getField< uint8_t >( row, 70 );
+  visor = exdData->getField< bool >( row, 71 );
+  modelBody = exdData->getField< uint32_t >( row, 72 );
+  dyeBody = exdData->getField< uint8_t >( row, 73 );
+  modelHands = exdData->getField< uint32_t >( row, 74 );
+  dyeHands = exdData->getField< uint8_t >( row, 75 );
+  modelLegs = exdData->getField< uint32_t >( row, 76 );
+  dyeLegs = exdData->getField< uint8_t >( row, 77 );
+  modelFeet = exdData->getField< uint32_t >( row, 78 );
+  dyeFeet = exdData->getField< uint8_t >( row, 79 );
+  modelEars = exdData->getField< uint32_t >( row, 80 );
+  dyeEars = exdData->getField< uint8_t >( row, 81 );
+  modelNeck = exdData->getField< uint32_t >( row, 82 );
+  dyeNeck = exdData->getField< uint8_t >( row, 83 );
+  modelWrists = exdData->getField< uint32_t >( row, 84 );
+  dyeWrists = exdData->getField< uint8_t >( row, 85 );
+  modelLeftRing = exdData->getField< uint32_t >( row, 86 );
+  dyeLeftRing = exdData->getField< uint8_t >( row, 87 );
+  modelRightRing = exdData->getField< uint32_t >( row, 88 );
+  dyeRightRing = exdData->getField< uint8_t >( row, 89 );
+  balloon = exdData->getField< uint16_t >( row, 91 );
 }
 
 Sapphire::Data::ENpcDressUp::ENpcDressUp( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
 {
-   auto row = exdData->m_ENpcDressUpDat.get_row( row_id );
-   eNpcDressUpDress = exdData->getField< uint8_t >( row, 1 );
+  auto row = exdData->m_ENpcDressUpDat.get_row( row_id );
+  eNpcDressUpDress = exdData->getField< uint8_t >( row, 1 );
 }
 
 Sapphire::Data::ENpcDressUpDress::ENpcDressUpDress( uint32_t row_id, uint32_t subRow, Sapphire::Data::ExdDataGenerated* exdData )
 {
-   auto row = exdData->m_ENpcDressUpDressDat.get_row( row_id, subRow );
-   eNpc = exdData->getField< uint32_t >( row, 6 );
+  auto row = exdData->m_ENpcDressUpDressDat.get_row( row_id, subRow );
+  eNpc = exdData->getField< uint32_t >( row, 6 );
 }
 
 Sapphire::Data::ENpcResident::ENpcResident( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
 {
-   auto row = exdData->m_ENpcResidentDat.get_row( row_id );
-   singular = exdData->getField< std::string >( row, 0 );
-   adjective = exdData->getField< int8_t >( row, 1 );
-   plural = exdData->getField< std::string >( row, 2 );
-   possessivePronoun = exdData->getField< int8_t >( row, 3 );
-   startsWithVowel = exdData->getField< int8_t >( row, 4 );
-   pronoun = exdData->getField< int8_t >( row, 6 );
-   article = exdData->getField< int8_t >( row, 7 );
-   title = exdData->getField< std::string >( row, 8 );
-   map = exdData->getField< uint8_t >( row, 9 );
+  auto row = exdData->m_ENpcResidentDat.get_row( row_id );
+  singular = exdData->getField< std::string >( row, 0 );
+  adjective = exdData->getField< int8_t >( row, 1 );
+  plural = exdData->getField< std::string >( row, 2 );
+  possessivePronoun = exdData->getField< int8_t >( row, 3 );
+  startsWithVowel = exdData->getField< int8_t >( row, 4 );
+  pronoun = exdData->getField< int8_t >( row, 6 );
+  article = exdData->getField< int8_t >( row, 7 );
+  title = exdData->getField< std::string >( row, 8 );
+  map = exdData->getField< uint8_t >( row, 9 );
 }
 
 Sapphire::Data::EObj::EObj( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
 {
-   auto row = exdData->m_EObjDat.get_row( row_id );
-   data = exdData->getField< uint32_t >( row, 9 );
-   sgbPath = exdData->getField< uint16_t >( row, 11 );
+  auto row = exdData->m_EObjDat.get_row( row_id );
+  data = exdData->getField< uint32_t >( row, 9 );
+  sgbPath = exdData->getField< uint16_t >( row, 11 );
 }
 
 Sapphire::Data::EObjName::EObjName( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
 {
-   auto row = exdData->m_EObjNameDat.get_row( row_id );
-   singular = exdData->getField< std::string >( row, 0 );
-   adjective = exdData->getField< int8_t >( row, 1 );
-   plural = exdData->getField< std::string >( row, 2 );
-   possessivePronoun = exdData->getField< int8_t >( row, 3 );
-   startsWithVowel = exdData->getField< int8_t >( row, 4 );
-   pronoun = exdData->getField< int8_t >( row, 6 );
-   article = exdData->getField< int8_t >( row, 7 );
+  auto row = exdData->m_EObjNameDat.get_row( row_id );
+  singular = exdData->getField< std::string >( row, 0 );
+  adjective = exdData->getField< int8_t >( row, 1 );
+  plural = exdData->getField< std::string >( row, 2 );
+  possessivePronoun = exdData->getField< int8_t >( row, 3 );
+  startsWithVowel = exdData->getField< int8_t >( row, 4 );
+  pronoun = exdData->getField< int8_t >( row, 6 );
+  article = exdData->getField< int8_t >( row, 7 );
 }
 
 Sapphire::Data::EquipRaceCategory::EquipRaceCategory( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
 {
-   auto row = exdData->m_EquipRaceCategoryDat.get_row( row_id );
-   hyur = exdData->getField< bool >( row, 0 );
-   elezen = exdData->getField< bool >( row, 1 );
-   lalafell = exdData->getField< bool >( row, 2 );
-   miqote = exdData->getField< bool >( row, 3 );
-   roegadyn = exdData->getField< bool >( row, 4 );
-   auRa = exdData->getField< bool >( row, 5 );
-   male = exdData->getField< bool >( row, 6 );
-   female = exdData->getField< bool >( row, 7 );
+  auto row = exdData->m_EquipRaceCategoryDat.get_row( row_id );
+  hyur = exdData->getField< bool >( row, 0 );
+  elezen = exdData->getField< bool >( row, 1 );
+  lalafell = exdData->getField< bool >( row, 2 );
+  miqote = exdData->getField< bool >( row, 3 );
+  roegadyn = exdData->getField< bool >( row, 4 );
+  auRa = exdData->getField< bool >( row, 5 );
+  male = exdData->getField< bool >( row, 6 );
+  female = exdData->getField< bool >( row, 7 );
 }
 
 Sapphire::Data::EquipSlotCategory::EquipSlotCategory( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
 {
-   auto row = exdData->m_EquipSlotCategoryDat.get_row( row_id );
-   mainHand = exdData->getField< int8_t >( row, 0 );
-   offHand = exdData->getField< int8_t >( row, 1 );
-   head = exdData->getField< int8_t >( row, 2 );
-   body = exdData->getField< int8_t >( row, 3 );
-   gloves = exdData->getField< int8_t >( row, 4 );
-   waist = exdData->getField< int8_t >( row, 5 );
-   legs = exdData->getField< int8_t >( row, 6 );
-   feet = exdData->getField< int8_t >( row, 7 );
-   ears = exdData->getField< int8_t >( row, 8 );
-   neck = exdData->getField< int8_t >( row, 9 );
-   wrists = exdData->getField< int8_t >( row, 10 );
-   fingerL = exdData->getField< int8_t >( row, 11 );
-   fingerR = exdData->getField< int8_t >( row, 12 );
-   soulCrystal = exdData->getField< int8_t >( row, 13 );
+  auto row = exdData->m_EquipSlotCategoryDat.get_row( row_id );
+  mainHand = exdData->getField< int8_t >( row, 0 );
+  offHand = exdData->getField< int8_t >( row, 1 );
+  head = exdData->getField< int8_t >( row, 2 );
+  body = exdData->getField< int8_t >( row, 3 );
+  gloves = exdData->getField< int8_t >( row, 4 );
+  waist = exdData->getField< int8_t >( row, 5 );
+  legs = exdData->getField< int8_t >( row, 6 );
+  feet = exdData->getField< int8_t >( row, 7 );
+  ears = exdData->getField< int8_t >( row, 8 );
+  neck = exdData->getField< int8_t >( row, 9 );
+  wrists = exdData->getField< int8_t >( row, 10 );
+  fingerL = exdData->getField< int8_t >( row, 11 );
+  fingerR = exdData->getField< int8_t >( row, 12 );
+  soulCrystal = exdData->getField< int8_t >( row, 13 );
 }
 
 Sapphire::Data::EurekaAetherItem::EurekaAetherItem( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
 {
-   auto row = exdData->m_EurekaAetherItemDat.get_row( row_id );
-   singular = exdData->getField< std::string >( row, 0 );
-   adjective = exdData->getField< int8_t >( row, 1 );
-   plural = exdData->getField< std::string >( row, 2 );
-   possessivePronoun = exdData->getField< int8_t >( row, 3 );
-   startsWithVowel = exdData->getField< int8_t >( row, 4 );
-   pronoun = exdData->getField< int8_t >( row, 6 );
-   article = exdData->getField< int8_t >( row, 7 );
-   name = exdData->getField< std::string >( row, 8 );
+  auto row = exdData->m_EurekaAetherItemDat.get_row( row_id );
+  singular = exdData->getField< std::string >( row, 0 );
+  adjective = exdData->getField< int8_t >( row, 1 );
+  plural = exdData->getField< std::string >( row, 2 );
+  possessivePronoun = exdData->getField< int8_t >( row, 3 );
+  startsWithVowel = exdData->getField< int8_t >( row, 4 );
+  pronoun = exdData->getField< int8_t >( row, 6 );
+  article = exdData->getField< int8_t >( row, 7 );
+  name = exdData->getField< std::string >( row, 8 );
 }
 
 Sapphire::Data::EurekaAethernet::EurekaAethernet( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
 {
-   auto row = exdData->m_EurekaAethernetDat.get_row( row_id );
-   location = exdData->getField< uint16_t >( row, 0 );
+  auto row = exdData->m_EurekaAethernetDat.get_row( row_id );
+  location = exdData->getField< uint16_t >( row, 0 );
 }
 
 Sapphire::Data::EurekaGrowData::EurekaGrowData( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
 {
-   auto row = exdData->m_EurekaGrowDataDat.get_row( row_id );
-   baseResistance = exdData->getField< uint16_t >( row, 0 );
+  auto row = exdData->m_EurekaGrowDataDat.get_row( row_id );
+  baseResistance = exdData->getField< uint16_t >( row, 0 );
 }
 
 Sapphire::Data::EurekaLogosMixerProbability::EurekaLogosMixerProbability( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
 {
-   auto row = exdData->m_EurekaLogosMixerProbabilityDat.get_row( row_id );
-   probability = exdData->getField< uint8_t >( row, 0 );
+  auto row = exdData->m_EurekaLogosMixerProbabilityDat.get_row( row_id );
+  probability = exdData->getField< uint8_t >( row, 0 );
 }
 
 Sapphire::Data::EurekaMagiaAction::EurekaMagiaAction( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
 {
-   auto row = exdData->m_EurekaMagiaActionDat.get_row( row_id );
-   action = exdData->getField< uint32_t >( row, 0 );
-   maxUses = exdData->getField< uint8_t >( row, 1 );
+  auto row = exdData->m_EurekaMagiaActionDat.get_row( row_id );
+  action = exdData->getField< uint32_t >( row, 0 );
+  maxUses = exdData->getField< uint8_t >( row, 1 );
 }
 
 Sapphire::Data::EurekaMagiciteItem::EurekaMagiciteItem( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
 {
-   auto row = exdData->m_EurekaMagiciteItemDat.get_row( row_id );
-   eurekaMagiciteItemType = exdData->getField< uint8_t >( row, 0 );
-   classJobCategory = exdData->getField< uint8_t >( row, 1 );
-   item = exdData->getField< uint32_t >( row, 2 );
+  auto row = exdData->m_EurekaMagiciteItemDat.get_row( row_id );
+  eurekaMagiciteItemType = exdData->getField< uint8_t >( row, 0 );
+  classJobCategory = exdData->getField< uint8_t >( row, 1 );
+  item = exdData->getField< uint32_t >( row, 2 );
 }
 
 Sapphire::Data::EurekaMagiciteItemType::EurekaMagiciteItemType( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
 {
-   auto row = exdData->m_EurekaMagiciteItemTypeDat.get_row( row_id );
-   type = exdData->getField< std::string >( row, 0 );
+  auto row = exdData->m_EurekaMagiciteItemTypeDat.get_row( row_id );
+  type = exdData->getField< std::string >( row, 0 );
 }
 
 Sapphire::Data::EurekaSphereElementAdjust::EurekaSphereElementAdjust( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
 {
-   auto row = exdData->m_EurekaSphereElementAdjustDat.get_row( row_id );
-   powerModifier = exdData->getField< uint16_t >( row, 0 );
+  auto row = exdData->m_EurekaSphereElementAdjustDat.get_row( row_id );
+  powerModifier = exdData->getField< uint16_t >( row, 0 );
 }
 
 Sapphire::Data::EventAction::EventAction( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
 {
-   auto row = exdData->m_EventActionDat.get_row( row_id );
-   name = exdData->getField< std::string >( row, 0 );
-   icon = exdData->getField< uint16_t >( row, 1 );
-   castTime = exdData->getField< uint8_t >( row, 2 );
-   animation.push_back( exdData->getField< uint16_t >( row, 3 ) );
-   animation.push_back( exdData->getField< uint16_t >( row, 4 ) );
-   animation.push_back( exdData->getField< uint16_t >( row, 5 ) );
+  auto row = exdData->m_EventActionDat.get_row( row_id );
+  name = exdData->getField< std::string >( row, 0 );
+  icon = exdData->getField< uint16_t >( row, 1 );
+  castTime = exdData->getField< uint8_t >( row, 2 );
+  animation.push_back( exdData->getField< uint16_t >( row, 3 ) );
+  animation.push_back( exdData->getField< uint16_t >( row, 4 ) );
+  animation.push_back( exdData->getField< uint16_t >( row, 5 ) );
 }
 
 Sapphire::Data::EventIconPriority::EventIconPriority( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
 {
-   auto row = exdData->m_EventIconPriorityDat.get_row( row_id );
-   icon.push_back( exdData->getField< uint32_t >( row, 0 ) );
-   icon.push_back( exdData->getField< uint32_t >( row, 1 ) );
-   icon.push_back( exdData->getField< uint32_t >( row, 2 ) );
-   icon.push_back( exdData->getField< uint32_t >( row, 3 ) );
-   icon.push_back( exdData->getField< uint32_t >( row, 4 ) );
-   icon.push_back( exdData->getField< uint32_t >( row, 5 ) );
-   icon.push_back( exdData->getField< uint32_t >( row, 6 ) );
-   icon.push_back( exdData->getField< uint32_t >( row, 7 ) );
-   icon.push_back( exdData->getField< uint32_t >( row, 8 ) );
-   icon.push_back( exdData->getField< uint32_t >( row, 9 ) );
-   icon.push_back( exdData->getField< uint32_t >( row, 10 ) );
-   icon.push_back( exdData->getField< uint32_t >( row, 11 ) );
-   icon.push_back( exdData->getField< uint32_t >( row, 12 ) );
-   icon.push_back( exdData->getField< uint32_t >( row, 13 ) );
-   icon.push_back( exdData->getField< uint32_t >( row, 14 ) );
-   icon.push_back( exdData->getField< uint32_t >( row, 15 ) );
+  auto row = exdData->m_EventIconPriorityDat.get_row( row_id );
+  icon.push_back( exdData->getField< uint32_t >( row, 0 ) );
+  icon.push_back( exdData->getField< uint32_t >( row, 1 ) );
+  icon.push_back( exdData->getField< uint32_t >( row, 2 ) );
+  icon.push_back( exdData->getField< uint32_t >( row, 3 ) );
+  icon.push_back( exdData->getField< uint32_t >( row, 4 ) );
+  icon.push_back( exdData->getField< uint32_t >( row, 5 ) );
+  icon.push_back( exdData->getField< uint32_t >( row, 6 ) );
+  icon.push_back( exdData->getField< uint32_t >( row, 7 ) );
+  icon.push_back( exdData->getField< uint32_t >( row, 8 ) );
+  icon.push_back( exdData->getField< uint32_t >( row, 9 ) );
+  icon.push_back( exdData->getField< uint32_t >( row, 10 ) );
+  icon.push_back( exdData->getField< uint32_t >( row, 11 ) );
+  icon.push_back( exdData->getField< uint32_t >( row, 12 ) );
+  icon.push_back( exdData->getField< uint32_t >( row, 13 ) );
+  icon.push_back( exdData->getField< uint32_t >( row, 14 ) );
+  icon.push_back( exdData->getField< uint32_t >( row, 15 ) );
 }
 
 Sapphire::Data::EventIconType::EventIconType( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
 {
-   auto row = exdData->m_EventIconTypeDat.get_row( row_id );
-   npcIconAvailable = exdData->getField< uint32_t >( row, 0 );
-   mapIconAvailable = exdData->getField< uint32_t >( row, 1 );
-   npcIconInvalid = exdData->getField< uint32_t >( row, 2 );
-   mapIconInvalid = exdData->getField< uint32_t >( row, 3 );
-   iconRange = exdData->getField< uint8_t >( row, 4 );
+  auto row = exdData->m_EventIconTypeDat.get_row( row_id );
+  npcIconAvailable = exdData->getField< uint32_t >( row, 0 );
+  mapIconAvailable = exdData->getField< uint32_t >( row, 1 );
+  npcIconInvalid = exdData->getField< uint32_t >( row, 2 );
+  mapIconInvalid = exdData->getField< uint32_t >( row, 3 );
+  iconRange = exdData->getField< uint8_t >( row, 4 );
 }
 
 Sapphire::Data::EventItem::EventItem( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
 {
-   auto row = exdData->m_EventItemDat.get_row( row_id );
-   singular = exdData->getField< std::string >( row, 0 );
-   adjective = exdData->getField< int8_t >( row, 1 );
-   plural = exdData->getField< std::string >( row, 2 );
-   possessivePronoun = exdData->getField< int8_t >( row, 3 );
-   startsWithVowel = exdData->getField< int8_t >( row, 4 );
-   pronoun = exdData->getField< int8_t >( row, 6 );
-   article = exdData->getField< int8_t >( row, 7 );
-   name = exdData->getField< std::string >( row, 9 );
-   icon = exdData->getField< uint16_t >( row, 10 );
-   action = exdData->getField< uint16_t >( row, 11 );
-   stackSize = exdData->getField< uint8_t >( row, 12 );
-   quest = exdData->getField< uint32_t >( row, 14 );
-   castTime = exdData->getField< uint8_t >( row, 15 );
+  auto row = exdData->m_EventItemDat.get_row( row_id );
+  singular = exdData->getField< std::string >( row, 0 );
+  adjective = exdData->getField< int8_t >( row, 1 );
+  plural = exdData->getField< std::string >( row, 2 );
+  possessivePronoun = exdData->getField< int8_t >( row, 3 );
+  startsWithVowel = exdData->getField< int8_t >( row, 4 );
+  pronoun = exdData->getField< int8_t >( row, 6 );
+  article = exdData->getField< int8_t >( row, 7 );
+  name = exdData->getField< std::string >( row, 9 );
+  icon = exdData->getField< uint16_t >( row, 10 );
+  action = exdData->getField< uint16_t >( row, 11 );
+  stackSize = exdData->getField< uint8_t >( row, 12 );
+  quest = exdData->getField< uint32_t >( row, 14 );
+  castTime = exdData->getField< uint8_t >( row, 15 );
 }
 
 Sapphire::Data::EventItemCastTimeline::EventItemCastTimeline( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
 {
-   auto row = exdData->m_EventItemCastTimelineDat.get_row( row_id );
-   actionTimeline = exdData->getField< uint32_t >( row, 0 );
+  auto row = exdData->m_EventItemCastTimelineDat.get_row( row_id );
+  actionTimeline = exdData->getField< uint32_t >( row, 0 );
 }
 
 Sapphire::Data::EventItemHelp::EventItemHelp( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
 {
-   auto row = exdData->m_EventItemHelpDat.get_row( row_id );
-   description = exdData->getField< std::string >( row, 0 );
+  auto row = exdData->m_EventItemHelpDat.get_row( row_id );
+  description = exdData->getField< std::string >( row, 0 );
 }
 
 Sapphire::Data::EventItemTimeline::EventItemTimeline( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
 {
-   auto row = exdData->m_EventItemTimelineDat.get_row( row_id );
-   actionTimeline = exdData->getField< uint32_t >( row, 0 );
+  auto row = exdData->m_EventItemTimelineDat.get_row( row_id );
+  actionTimeline = exdData->getField< uint32_t >( row, 0 );
 }
 
 Sapphire::Data::ExportedSG::ExportedSG( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
 {
-   auto row = exdData->m_ExportedSGDat.get_row( row_id );
-   sgbPath = exdData->getField< std::string >( row, 0 );
+  auto row = exdData->m_ExportedSGDat.get_row( row_id );
+  sgbPath = exdData->getField< std::string >( row, 0 );
 }
 
 Sapphire::Data::ExVersion::ExVersion( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
 {
-   auto row = exdData->m_ExVersionDat.get_row( row_id );
-   name = exdData->getField< std::string >( row, 0 );
+  auto row = exdData->m_ExVersionDat.get_row( row_id );
+  name = exdData->getField< std::string >( row, 0 );
 }
 
 Sapphire::Data::Fate::Fate( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
 {
-   auto row = exdData->m_FateDat.get_row( row_id );
-   eurekaFate = exdData->getField< uint8_t >( row, 0 );
-   location = exdData->getField< uint32_t >( row, 2 );
-   classJobLevel = exdData->getField< uint8_t >( row, 3 );
-   classJobLevelMax = exdData->getField< uint8_t >( row, 4 );
-   eventItem = exdData->getField< uint32_t >( row, 5 );
-   iconObjective = exdData->getField< uint32_t >( row, 10 );
-   iconMap = exdData->getField< uint32_t >( row, 11 );
-   music = exdData->getField< int32_t >( row, 13 );
-   hasWorldMapIcon = exdData->getField< bool >( row, 19 );
-   name = exdData->getField< std::string >( row, 27 );
-   description = exdData->getField< std::string >( row, 28 );
-   objective = exdData->getField< std::string >( row, 29 );
-   statusText.push_back( exdData->getField< std::string >( row, 30 ) );
-   statusText.push_back( exdData->getField< std::string >( row, 31 ) );
-   statusText.push_back( exdData->getField< std::string >( row, 32 ) );
-   arrayIndex = exdData->getField< uint32_t >( row, 33 );
+  auto row = exdData->m_FateDat.get_row( row_id );
+  eurekaFate = exdData->getField< uint8_t >( row, 0 );
+  location = exdData->getField< uint32_t >( row, 2 );
+  classJobLevel = exdData->getField< uint8_t >( row, 3 );
+  classJobLevelMax = exdData->getField< uint8_t >( row, 4 );
+  eventItem = exdData->getField< uint32_t >( row, 5 );
+  iconObjective = exdData->getField< uint32_t >( row, 10 );
+  iconMap = exdData->getField< uint32_t >( row, 11 );
+  music = exdData->getField< int32_t >( row, 13 );
+  hasWorldMapIcon = exdData->getField< bool >( row, 19 );
+  name = exdData->getField< std::string >( row, 27 );
+  description = exdData->getField< std::string >( row, 28 );
+  objective = exdData->getField< std::string >( row, 29 );
+  statusText.push_back( exdData->getField< std::string >( row, 30 ) );
+  statusText.push_back( exdData->getField< std::string >( row, 31 ) );
+  statusText.push_back( exdData->getField< std::string >( row, 32 ) );
+  arrayIndex = exdData->getField< uint32_t >( row, 33 );
 }
 
 Sapphire::Data::FCActivity::FCActivity( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
 {
-   auto row = exdData->m_FCActivityDat.get_row( row_id );
-   text = exdData->getField< std::string >( row, 0 );
-   fCActivityCategory = exdData->getField< uint8_t >( row, 4 );
+  auto row = exdData->m_FCActivityDat.get_row( row_id );
+  text = exdData->getField< std::string >( row, 0 );
+  fCActivityCategory = exdData->getField< uint8_t >( row, 4 );
 }
 
 Sapphire::Data::FCActivityCategory::FCActivityCategory( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
 {
-   auto row = exdData->m_FCActivityCategoryDat.get_row( row_id );
-   name = exdData->getField< std::string >( row, 1 );
+  auto row = exdData->m_FCActivityCategoryDat.get_row( row_id );
+  name = exdData->getField< std::string >( row, 1 );
 }
 
 Sapphire::Data::FCAuthority::FCAuthority( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
 {
-   auto row = exdData->m_FCAuthorityDat.get_row( row_id );
-   name = exdData->getField< std::string >( row, 0 );
-   fCAuthorityCategory = exdData->getField< int32_t >( row, 1 );
+  auto row = exdData->m_FCAuthorityDat.get_row( row_id );
+  name = exdData->getField< std::string >( row, 0 );
+  fCAuthorityCategory = exdData->getField< int32_t >( row, 1 );
 }
 
 Sapphire::Data::FCAuthorityCategory::FCAuthorityCategory( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
 {
-   auto row = exdData->m_FCAuthorityCategoryDat.get_row( row_id );
-   name = exdData->getField< std::string >( row, 0 );
+  auto row = exdData->m_FCAuthorityCategoryDat.get_row( row_id );
+  name = exdData->getField< std::string >( row, 0 );
 }
 
 Sapphire::Data::FCChestName::FCChestName( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
 {
-   auto row = exdData->m_FCChestNameDat.get_row( row_id );
-   name = exdData->getField< std::string >( row, 0 );
+  auto row = exdData->m_FCChestNameDat.get_row( row_id );
+  name = exdData->getField< std::string >( row, 0 );
 }
 
 Sapphire::Data::FccShop::FccShop( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
 {
-   auto row = exdData->m_FccShopDat.get_row( row_id );
-   name = exdData->getField< std::string >( row, 0 );
+  auto row = exdData->m_FccShopDat.get_row( row_id );
+  name = exdData->getField< std::string >( row, 0 );
 }
 
 Sapphire::Data::FCHierarchy::FCHierarchy( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
 {
-   auto row = exdData->m_FCHierarchyDat.get_row( row_id );
-   name = exdData->getField< std::string >( row, 0 );
+  auto row = exdData->m_FCHierarchyDat.get_row( row_id );
+  name = exdData->getField< std::string >( row, 0 );
 }
 
 Sapphire::Data::FCProfile::FCProfile( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
 {
-   auto row = exdData->m_FCProfileDat.get_row( row_id );
-   name = exdData->getField< std::string >( row, 1 );
+  auto row = exdData->m_FCProfileDat.get_row( row_id );
+  name = exdData->getField< std::string >( row, 1 );
 }
 
 Sapphire::Data::FCReputation::FCReputation( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
 {
-   auto row = exdData->m_FCReputationDat.get_row( row_id );
-   pointsToNext = exdData->getField< uint32_t >( row, 0 );
-   requiredPoints = exdData->getField< uint32_t >( row, 1 );
-   name = exdData->getField< std::string >( row, 4 );
+  auto row = exdData->m_FCReputationDat.get_row( row_id );
+  pointsToNext = exdData->getField< uint32_t >( row, 0 );
+  requiredPoints = exdData->getField< uint32_t >( row, 1 );
+  name = exdData->getField< std::string >( row, 4 );
 }
 
 Sapphire::Data::FCRights::FCRights( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
 {
-   auto row = exdData->m_FCRightsDat.get_row( row_id );
-   name = exdData->getField< std::string >( row, 0 );
-   description = exdData->getField< std::string >( row, 1 );
-   icon = exdData->getField< uint16_t >( row, 2 );
-   fCRank = exdData->getField< uint8_t >( row, 3 );
+  auto row = exdData->m_FCRightsDat.get_row( row_id );
+  name = exdData->getField< std::string >( row, 0 );
+  description = exdData->getField< std::string >( row, 1 );
+  icon = exdData->getField< uint16_t >( row, 2 );
+  fCRank = exdData->getField< uint8_t >( row, 3 );
 }
 
 Sapphire::Data::Festival::Festival( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
 {
-   auto row = exdData->m_FestivalDat.get_row( row_id );
-   name = exdData->getField< std::string >( row, 0 );
+  auto row = exdData->m_FestivalDat.get_row( row_id );
+  name = exdData->getField< std::string >( row, 0 );
 }
 
 Sapphire::Data::FieldMarker::FieldMarker( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
 {
-   auto row = exdData->m_FieldMarkerDat.get_row( row_id );
-   vFX = exdData->getField< int32_t >( row, 0 );
-   icon = exdData->getField< uint16_t >( row, 1 );
+  auto row = exdData->m_FieldMarkerDat.get_row( row_id );
+  vFX = exdData->getField< int32_t >( row, 0 );
+  icon = exdData->getField< uint16_t >( row, 1 );
 }
 
 Sapphire::Data::FishingRecordType::FishingRecordType( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
 {
-   auto row = exdData->m_FishingRecordTypeDat.get_row( row_id );
-   addon = exdData->getField< int32_t >( row, 0 );
+  auto row = exdData->m_FishingRecordTypeDat.get_row( row_id );
+  addon = exdData->getField< int32_t >( row, 0 );
 }
 
 Sapphire::Data::FishingRecordTypeTransient::FishingRecordTypeTransient( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
 {
-   auto row = exdData->m_FishingRecordTypeTransientDat.get_row( row_id );
-   image = exdData->getField< int32_t >( row, 0 );
+  auto row = exdData->m_FishingRecordTypeTransientDat.get_row( row_id );
+  image = exdData->getField< int32_t >( row, 0 );
 }
 
 Sapphire::Data::FishingSpot::FishingSpot( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
 {
-   auto row = exdData->m_FishingSpotDat.get_row( row_id );
-   gatheringLevel = exdData->getField< uint8_t >( row, 0 );
-   bigFishOnReach = exdData->getField< std::string >( row, 1 );
-   bigFishOnEnd = exdData->getField< std::string >( row, 2 );
-   fishingSpotCategory = exdData->getField< uint8_t >( row, 3 );
-   territoryType = exdData->getField< uint16_t >( row, 5 );
-   x = exdData->getField< int16_t >( row, 6 );
-   z = exdData->getField< int16_t >( row, 7 );
-   radius = exdData->getField< uint16_t >( row, 8 );
-   item.push_back( exdData->getField< int32_t >( row, 10 ) );
-   item.push_back( exdData->getField< int32_t >( row, 11 ) );
-   item.push_back( exdData->getField< int32_t >( row, 12 ) );
-   item.push_back( exdData->getField< int32_t >( row, 13 ) );
-   item.push_back( exdData->getField< int32_t >( row, 14 ) );
-   item.push_back( exdData->getField< int32_t >( row, 15 ) );
-   item.push_back( exdData->getField< int32_t >( row, 16 ) );
-   item.push_back( exdData->getField< int32_t >( row, 17 ) );
-   item.push_back( exdData->getField< int32_t >( row, 18 ) );
-   item.push_back( exdData->getField< int32_t >( row, 19 ) );
-   placeName = exdData->getField< uint16_t >( row, 20 );
+  auto row = exdData->m_FishingSpotDat.get_row( row_id );
+  gatheringLevel = exdData->getField< uint8_t >( row, 0 );
+  bigFishOnReach = exdData->getField< std::string >( row, 1 );
+  bigFishOnEnd = exdData->getField< std::string >( row, 2 );
+  fishingSpotCategory = exdData->getField< uint8_t >( row, 3 );
+  territoryType = exdData->getField< uint16_t >( row, 5 );
+  x = exdData->getField< int16_t >( row, 6 );
+  z = exdData->getField< int16_t >( row, 7 );
+  radius = exdData->getField< uint16_t >( row, 8 );
+  item.push_back( exdData->getField< int32_t >( row, 10 ) );
+  item.push_back( exdData->getField< int32_t >( row, 11 ) );
+  item.push_back( exdData->getField< int32_t >( row, 12 ) );
+  item.push_back( exdData->getField< int32_t >( row, 13 ) );
+  item.push_back( exdData->getField< int32_t >( row, 14 ) );
+  item.push_back( exdData->getField< int32_t >( row, 15 ) );
+  item.push_back( exdData->getField< int32_t >( row, 16 ) );
+  item.push_back( exdData->getField< int32_t >( row, 17 ) );
+  item.push_back( exdData->getField< int32_t >( row, 18 ) );
+  item.push_back( exdData->getField< int32_t >( row, 19 ) );
+  placeName = exdData->getField< uint16_t >( row, 20 );
 }
 
 Sapphire::Data::FishParameter::FishParameter( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
 {
-   auto row = exdData->m_FishParameterDat.get_row( row_id );
-   text = exdData->getField< std::string >( row, 0 );
-   item = exdData->getField< int32_t >( row, 1 );
-   gatheringItemLevel = exdData->getField< uint16_t >( row, 2 );
-   isHidden = exdData->getField< bool >( row, 3 );
-   fishingRecordType = exdData->getField< uint8_t >( row, 5 );
-   territoryType = exdData->getField< int32_t >( row, 6 );
-   isInLog = exdData->getField< bool >( row, 7 );
-   timeRestricted = exdData->getField< bool >( row, 8 );
-   weatherRestricted = exdData->getField< bool >( row, 9 );
-   gatheringSubCategory = exdData->getField< uint16_t >( row, 10 );
+  auto row = exdData->m_FishParameterDat.get_row( row_id );
+  text = exdData->getField< std::string >( row, 0 );
+  item = exdData->getField< int32_t >( row, 1 );
+  gatheringItemLevel = exdData->getField< uint16_t >( row, 2 );
+  isHidden = exdData->getField< bool >( row, 3 );
+  fishingRecordType = exdData->getField< uint8_t >( row, 5 );
+  territoryType = exdData->getField< int32_t >( row, 6 );
+  isInLog = exdData->getField< bool >( row, 7 );
+  timeRestricted = exdData->getField< bool >( row, 8 );
+  weatherRestricted = exdData->getField< bool >( row, 9 );
+  gatheringSubCategory = exdData->getField< uint16_t >( row, 10 );
 }
 
 Sapphire::Data::Frontline03::Frontline03( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
 {
-   auto row = exdData->m_Frontline03Dat.get_row( row_id );
-   emptyIcon.push_back( exdData->getField< uint32_t >( row, 9 ) );
-   emptyIcon.push_back( exdData->getField< uint32_t >( row, 10 ) );
-   emptyIcon.push_back( exdData->getField< uint32_t >( row, 11 ) );
-   maelstromIcon.push_back( exdData->getField< uint32_t >( row, 12 ) );
-   maelstromIcon.push_back( exdData->getField< uint32_t >( row, 13 ) );
-   maelstromIcon.push_back( exdData->getField< uint32_t >( row, 14 ) );
-   twinAdderIcon.push_back( exdData->getField< uint32_t >( row, 15 ) );
-   twinAdderIcon.push_back( exdData->getField< uint32_t >( row, 16 ) );
-   twinAdderIcon.push_back( exdData->getField< uint32_t >( row, 17 ) );
-   immortalFlamesIcon.push_back( exdData->getField< uint32_t >( row, 18 ) );
-   immortalFlamesIcon.push_back( exdData->getField< uint32_t >( row, 19 ) );
-   immortalFlamesIcon.push_back( exdData->getField< uint32_t >( row, 20 ) );
+  auto row = exdData->m_Frontline03Dat.get_row( row_id );
+  emptyIcon.push_back( exdData->getField< uint32_t >( row, 9 ) );
+  emptyIcon.push_back( exdData->getField< uint32_t >( row, 10 ) );
+  emptyIcon.push_back( exdData->getField< uint32_t >( row, 11 ) );
+  maelstromIcon.push_back( exdData->getField< uint32_t >( row, 12 ) );
+  maelstromIcon.push_back( exdData->getField< uint32_t >( row, 13 ) );
+  maelstromIcon.push_back( exdData->getField< uint32_t >( row, 14 ) );
+  twinAdderIcon.push_back( exdData->getField< uint32_t >( row, 15 ) );
+  twinAdderIcon.push_back( exdData->getField< uint32_t >( row, 16 ) );
+  twinAdderIcon.push_back( exdData->getField< uint32_t >( row, 17 ) );
+  immortalFlamesIcon.push_back( exdData->getField< uint32_t >( row, 18 ) );
+  immortalFlamesIcon.push_back( exdData->getField< uint32_t >( row, 19 ) );
+  immortalFlamesIcon.push_back( exdData->getField< uint32_t >( row, 20 ) );
 }
 
 Sapphire::Data::Frontline04::Frontline04( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
 {
-   auto row = exdData->m_Frontline04Dat.get_row( row_id );
-   level1 = exdData->getField< int32_t >( row, 0 );
-   level2 = exdData->getField< int32_t >( row, 1 );
-   level3 = exdData->getField< int32_t >( row, 2 );
-   unknownLevel.push_back( exdData->getField< int32_t >( row, 6 ) );
-   unknownLevel.push_back( exdData->getField< int32_t >( row, 7 ) );
-   unknownLevel.push_back( exdData->getField< int32_t >( row, 8 ) );
-   unknownLevel.push_back( exdData->getField< int32_t >( row, 9 ) );
-   unknownLevel.push_back( exdData->getField< int32_t >( row, 10 ) );
-   unknownLevel.push_back( exdData->getField< int32_t >( row, 11 ) );
-   unknownLevel.push_back( exdData->getField< int32_t >( row, 12 ) );
-   unknownLevel.push_back( exdData->getField< int32_t >( row, 13 ) );
-   unknownLevel.push_back( exdData->getField< int32_t >( row, 14 ) );
-   unknownLevel.push_back( exdData->getField< int32_t >( row, 15 ) );
-   unknownLevel.push_back( exdData->getField< int32_t >( row, 16 ) );
-   unknownLevel.push_back( exdData->getField< int32_t >( row, 17 ) );
-   unknownLevel.push_back( exdData->getField< int32_t >( row, 18 ) );
-   unknownLevel.push_back( exdData->getField< int32_t >( row, 19 ) );
-   unknownLevel.push_back( exdData->getField< int32_t >( row, 20 ) );
-   unknownLevel.push_back( exdData->getField< int32_t >( row, 21 ) );
-   unknownLevel.push_back( exdData->getField< int32_t >( row, 22 ) );
-   unknownLevel.push_back( exdData->getField< int32_t >( row, 23 ) );
-   unknownLevel.push_back( exdData->getField< int32_t >( row, 24 ) );
-   unknownLevel.push_back( exdData->getField< int32_t >( row, 25 ) );
-   unknownLevel.push_back( exdData->getField< int32_t >( row, 26 ) );
-   unknownLevel.push_back( exdData->getField< int32_t >( row, 27 ) );
-   unknownLevel.push_back( exdData->getField< int32_t >( row, 28 ) );
-   unknownLevel.push_back( exdData->getField< int32_t >( row, 29 ) );
-   unknownLevel.push_back( exdData->getField< int32_t >( row, 30 ) );
-   unknownLevel.push_back( exdData->getField< int32_t >( row, 31 ) );
-   unknownLevel.push_back( exdData->getField< int32_t >( row, 32 ) );
+  auto row = exdData->m_Frontline04Dat.get_row( row_id );
+  level1 = exdData->getField< int32_t >( row, 0 );
+  level2 = exdData->getField< int32_t >( row, 1 );
+  level3 = exdData->getField< int32_t >( row, 2 );
+  unknownLevel.push_back( exdData->getField< int32_t >( row, 6 ) );
+  unknownLevel.push_back( exdData->getField< int32_t >( row, 7 ) );
+  unknownLevel.push_back( exdData->getField< int32_t >( row, 8 ) );
+  unknownLevel.push_back( exdData->getField< int32_t >( row, 9 ) );
+  unknownLevel.push_back( exdData->getField< int32_t >( row, 10 ) );
+  unknownLevel.push_back( exdData->getField< int32_t >( row, 11 ) );
+  unknownLevel.push_back( exdData->getField< int32_t >( row, 12 ) );
+  unknownLevel.push_back( exdData->getField< int32_t >( row, 13 ) );
+  unknownLevel.push_back( exdData->getField< int32_t >( row, 14 ) );
+  unknownLevel.push_back( exdData->getField< int32_t >( row, 15 ) );
+  unknownLevel.push_back( exdData->getField< int32_t >( row, 16 ) );
+  unknownLevel.push_back( exdData->getField< int32_t >( row, 17 ) );
+  unknownLevel.push_back( exdData->getField< int32_t >( row, 18 ) );
+  unknownLevel.push_back( exdData->getField< int32_t >( row, 19 ) );
+  unknownLevel.push_back( exdData->getField< int32_t >( row, 20 ) );
+  unknownLevel.push_back( exdData->getField< int32_t >( row, 21 ) );
+  unknownLevel.push_back( exdData->getField< int32_t >( row, 22 ) );
+  unknownLevel.push_back( exdData->getField< int32_t >( row, 23 ) );
+  unknownLevel.push_back( exdData->getField< int32_t >( row, 24 ) );
+  unknownLevel.push_back( exdData->getField< int32_t >( row, 25 ) );
+  unknownLevel.push_back( exdData->getField< int32_t >( row, 26 ) );
+  unknownLevel.push_back( exdData->getField< int32_t >( row, 27 ) );
+  unknownLevel.push_back( exdData->getField< int32_t >( row, 28 ) );
+  unknownLevel.push_back( exdData->getField< int32_t >( row, 29 ) );
+  unknownLevel.push_back( exdData->getField< int32_t >( row, 30 ) );
+  unknownLevel.push_back( exdData->getField< int32_t >( row, 31 ) );
+  unknownLevel.push_back( exdData->getField< int32_t >( row, 32 ) );
 }
 
 Sapphire::Data::GardeningSeed::GardeningSeed( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
 {
-   auto row = exdData->m_GardeningSeedDat.get_row( row_id );
-   item = exdData->getField< uint32_t >( row, 0 );
-   icon = exdData->getField< uint32_t >( row, 2 );
+  auto row = exdData->m_GardeningSeedDat.get_row( row_id );
+  item = exdData->getField< uint32_t >( row, 0 );
+  icon = exdData->getField< uint32_t >( row, 2 );
 }
 
 Sapphire::Data::GatheringCondition::GatheringCondition( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
 {
-   auto row = exdData->m_GatheringConditionDat.get_row( row_id );
-   text = exdData->getField< std::string >( row, 0 );
+  auto row = exdData->m_GatheringConditionDat.get_row( row_id );
+  text = exdData->getField< std::string >( row, 0 );
 }
 
 Sapphire::Data::GatheringExp::GatheringExp( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
 {
-   auto row = exdData->m_GatheringExpDat.get_row( row_id );
-   exp = exdData->getField< uint16_t >( row, 0 );
+  auto row = exdData->m_GatheringExpDat.get_row( row_id );
+  exp = exdData->getField< uint16_t >( row, 0 );
 }
 
 Sapphire::Data::GatheringItem::GatheringItem( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
 {
-   auto row = exdData->m_GatheringItemDat.get_row( row_id );
-   item = exdData->getField< int32_t >( row, 0 );
-   gatheringItemLevel = exdData->getField< uint16_t >( row, 1 );
-   isHidden = exdData->getField< bool >( row, 2 );
+  auto row = exdData->m_GatheringItemDat.get_row( row_id );
+  item = exdData->getField< int32_t >( row, 0 );
+  gatheringItemLevel = exdData->getField< uint16_t >( row, 1 );
+  isHidden = exdData->getField< bool >( row, 2 );
 }
 
 Sapphire::Data::GatheringItemLevelConvertTable::GatheringItemLevelConvertTable( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
 {
-   auto row = exdData->m_GatheringItemLevelConvertTableDat.get_row( row_id );
-   gatheringItemLevel = exdData->getField< uint8_t >( row, 0 );
-   stars = exdData->getField< uint8_t >( row, 1 );
+  auto row = exdData->m_GatheringItemLevelConvertTableDat.get_row( row_id );
+  gatheringItemLevel = exdData->getField< uint8_t >( row, 0 );
+  stars = exdData->getField< uint8_t >( row, 1 );
 }
 
 Sapphire::Data::GatheringItemPoint::GatheringItemPoint( uint32_t row_id, uint32_t subRow, Sapphire::Data::ExdDataGenerated* exdData )
 {
-   auto row = exdData->m_GatheringItemPointDat.get_row( row_id, subRow );
-   gatheringPoint = exdData->getField< uint32_t >( row, 0 );
+  auto row = exdData->m_GatheringItemPointDat.get_row( row_id, subRow );
+  gatheringPoint = exdData->getField< uint32_t >( row, 0 );
 }
 
 Sapphire::Data::GatheringLeve::GatheringLeve( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
 {
-   auto row = exdData->m_GatheringLeveDat.get_row( row_id );
-   requiredItem1 = exdData->getField< int32_t >( row, 4 );
-   leveLevel = exdData->getField< uint8_t >( row, 5 );
-   requiredItem2 = exdData->getField< int32_t >( row, 6 );
+  auto row = exdData->m_GatheringLeveDat.get_row( row_id );
+  requiredItem1 = exdData->getField< int32_t >( row, 4 );
+  leveLevel = exdData->getField< uint8_t >( row, 5 );
+  requiredItem2 = exdData->getField< int32_t >( row, 6 );
 }
 
 Sapphire::Data::GatheringLeveRoute::GatheringLeveRoute( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
 {
-   auto row = exdData->m_GatheringLeveRouteDat.get_row( row_id );
+  auto row = exdData->m_GatheringLeveRouteDat.get_row( row_id );
 }
 
 Sapphire::Data::GatheringNotebookList::GatheringNotebookList( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
 {
-   auto row = exdData->m_GatheringNotebookListDat.get_row( row_id );
-   gatheringItem.push_back( exdData->getField< int32_t >( row, 1 ) );
-   gatheringItem.push_back( exdData->getField< int32_t >( row, 2 ) );
-   gatheringItem.push_back( exdData->getField< int32_t >( row, 3 ) );
-   gatheringItem.push_back( exdData->getField< int32_t >( row, 4 ) );
-   gatheringItem.push_back( exdData->getField< int32_t >( row, 5 ) );
-   gatheringItem.push_back( exdData->getField< int32_t >( row, 6 ) );
-   gatheringItem.push_back( exdData->getField< int32_t >( row, 7 ) );
-   gatheringItem.push_back( exdData->getField< int32_t >( row, 8 ) );
-   gatheringItem.push_back( exdData->getField< int32_t >( row, 9 ) );
-   gatheringItem.push_back( exdData->getField< int32_t >( row, 10 ) );
-   gatheringItem.push_back( exdData->getField< int32_t >( row, 11 ) );
-   gatheringItem.push_back( exdData->getField< int32_t >( row, 12 ) );
-   gatheringItem.push_back( exdData->getField< int32_t >( row, 13 ) );
-   gatheringItem.push_back( exdData->getField< int32_t >( row, 14 ) );
-   gatheringItem.push_back( exdData->getField< int32_t >( row, 15 ) );
-   gatheringItem.push_back( exdData->getField< int32_t >( row, 16 ) );
-   gatheringItem.push_back( exdData->getField< int32_t >( row, 17 ) );
-   gatheringItem.push_back( exdData->getField< int32_t >( row, 18 ) );
-   gatheringItem.push_back( exdData->getField< int32_t >( row, 19 ) );
-   gatheringItem.push_back( exdData->getField< int32_t >( row, 20 ) );
-   gatheringItem.push_back( exdData->getField< int32_t >( row, 21 ) );
-   gatheringItem.push_back( exdData->getField< int32_t >( row, 22 ) );
-   gatheringItem.push_back( exdData->getField< int32_t >( row, 23 ) );
-   gatheringItem.push_back( exdData->getField< int32_t >( row, 24 ) );
-   gatheringItem.push_back( exdData->getField< int32_t >( row, 25 ) );
-   gatheringItem.push_back( exdData->getField< int32_t >( row, 26 ) );
-   gatheringItem.push_back( exdData->getField< int32_t >( row, 27 ) );
-   gatheringItem.push_back( exdData->getField< int32_t >( row, 28 ) );
-   gatheringItem.push_back( exdData->getField< int32_t >( row, 29 ) );
-   gatheringItem.push_back( exdData->getField< int32_t >( row, 30 ) );
-   gatheringItem.push_back( exdData->getField< int32_t >( row, 31 ) );
-   gatheringItem.push_back( exdData->getField< int32_t >( row, 32 ) );
-   gatheringItem.push_back( exdData->getField< int32_t >( row, 33 ) );
-   gatheringItem.push_back( exdData->getField< int32_t >( row, 34 ) );
-   gatheringItem.push_back( exdData->getField< int32_t >( row, 35 ) );
-   gatheringItem.push_back( exdData->getField< int32_t >( row, 36 ) );
-   gatheringItem.push_back( exdData->getField< int32_t >( row, 37 ) );
-   gatheringItem.push_back( exdData->getField< int32_t >( row, 38 ) );
-   gatheringItem.push_back( exdData->getField< int32_t >( row, 39 ) );
-   gatheringItem.push_back( exdData->getField< int32_t >( row, 40 ) );
-   gatheringItem.push_back( exdData->getField< int32_t >( row, 41 ) );
-   gatheringItem.push_back( exdData->getField< int32_t >( row, 42 ) );
-   gatheringItem.push_back( exdData->getField< int32_t >( row, 43 ) );
-   gatheringItem.push_back( exdData->getField< int32_t >( row, 44 ) );
-   gatheringItem.push_back( exdData->getField< int32_t >( row, 45 ) );
-   gatheringItem.push_back( exdData->getField< int32_t >( row, 46 ) );
-   gatheringItem.push_back( exdData->getField< int32_t >( row, 47 ) );
-   gatheringItem.push_back( exdData->getField< int32_t >( row, 48 ) );
-   gatheringItem.push_back( exdData->getField< int32_t >( row, 49 ) );
-   gatheringItem.push_back( exdData->getField< int32_t >( row, 50 ) );
-   gatheringItem.push_back( exdData->getField< int32_t >( row, 51 ) );
-   gatheringItem.push_back( exdData->getField< int32_t >( row, 52 ) );
-   gatheringItem.push_back( exdData->getField< int32_t >( row, 53 ) );
-   gatheringItem.push_back( exdData->getField< int32_t >( row, 54 ) );
-   gatheringItem.push_back( exdData->getField< int32_t >( row, 55 ) );
-   gatheringItem.push_back( exdData->getField< int32_t >( row, 56 ) );
-   gatheringItem.push_back( exdData->getField< int32_t >( row, 57 ) );
-   gatheringItem.push_back( exdData->getField< int32_t >( row, 58 ) );
-   gatheringItem.push_back( exdData->getField< int32_t >( row, 59 ) );
-   gatheringItem.push_back( exdData->getField< int32_t >( row, 60 ) );
-   gatheringItem.push_back( exdData->getField< int32_t >( row, 61 ) );
-   gatheringItem.push_back( exdData->getField< int32_t >( row, 62 ) );
-   gatheringItem.push_back( exdData->getField< int32_t >( row, 63 ) );
-   gatheringItem.push_back( exdData->getField< int32_t >( row, 64 ) );
-   gatheringItem.push_back( exdData->getField< int32_t >( row, 65 ) );
-   gatheringItem.push_back( exdData->getField< int32_t >( row, 66 ) );
-   gatheringItem.push_back( exdData->getField< int32_t >( row, 67 ) );
-   gatheringItem.push_back( exdData->getField< int32_t >( row, 68 ) );
-   gatheringItem.push_back( exdData->getField< int32_t >( row, 69 ) );
-   gatheringItem.push_back( exdData->getField< int32_t >( row, 70 ) );
-   gatheringItem.push_back( exdData->getField< int32_t >( row, 71 ) );
-   gatheringItem.push_back( exdData->getField< int32_t >( row, 72 ) );
-   gatheringItem.push_back( exdData->getField< int32_t >( row, 73 ) );
-   gatheringItem.push_back( exdData->getField< int32_t >( row, 74 ) );
-   gatheringItem.push_back( exdData->getField< int32_t >( row, 75 ) );
-   gatheringItem.push_back( exdData->getField< int32_t >( row, 76 ) );
-   gatheringItem.push_back( exdData->getField< int32_t >( row, 77 ) );
-   gatheringItem.push_back( exdData->getField< int32_t >( row, 78 ) );
-   gatheringItem.push_back( exdData->getField< int32_t >( row, 79 ) );
-   gatheringItem.push_back( exdData->getField< int32_t >( row, 80 ) );
-   gatheringItem.push_back( exdData->getField< int32_t >( row, 81 ) );
-   gatheringItem.push_back( exdData->getField< int32_t >( row, 82 ) );
-   gatheringItem.push_back( exdData->getField< int32_t >( row, 83 ) );
-   gatheringItem.push_back( exdData->getField< int32_t >( row, 84 ) );
-   gatheringItem.push_back( exdData->getField< int32_t >( row, 85 ) );
-   gatheringItem.push_back( exdData->getField< int32_t >( row, 86 ) );
-   gatheringItem.push_back( exdData->getField< int32_t >( row, 87 ) );
-   gatheringItem.push_back( exdData->getField< int32_t >( row, 88 ) );
-   gatheringItem.push_back( exdData->getField< int32_t >( row, 89 ) );
-   gatheringItem.push_back( exdData->getField< int32_t >( row, 90 ) );
-   gatheringItem.push_back( exdData->getField< int32_t >( row, 91 ) );
-   gatheringItem.push_back( exdData->getField< int32_t >( row, 92 ) );
-   gatheringItem.push_back( exdData->getField< int32_t >( row, 93 ) );
-   gatheringItem.push_back( exdData->getField< int32_t >( row, 94 ) );
-   gatheringItem.push_back( exdData->getField< int32_t >( row, 95 ) );
-   gatheringItem.push_back( exdData->getField< int32_t >( row, 96 ) );
-   gatheringItem.push_back( exdData->getField< int32_t >( row, 97 ) );
-   gatheringItem.push_back( exdData->getField< int32_t >( row, 98 ) );
-   gatheringItem.push_back( exdData->getField< int32_t >( row, 99 ) );
-   gatheringItem.push_back( exdData->getField< int32_t >( row, 100 ) );
+  auto row = exdData->m_GatheringNotebookListDat.get_row( row_id );
+  gatheringItem.push_back( exdData->getField< int32_t >( row, 1 ) );
+  gatheringItem.push_back( exdData->getField< int32_t >( row, 2 ) );
+  gatheringItem.push_back( exdData->getField< int32_t >( row, 3 ) );
+  gatheringItem.push_back( exdData->getField< int32_t >( row, 4 ) );
+  gatheringItem.push_back( exdData->getField< int32_t >( row, 5 ) );
+  gatheringItem.push_back( exdData->getField< int32_t >( row, 6 ) );
+  gatheringItem.push_back( exdData->getField< int32_t >( row, 7 ) );
+  gatheringItem.push_back( exdData->getField< int32_t >( row, 8 ) );
+  gatheringItem.push_back( exdData->getField< int32_t >( row, 9 ) );
+  gatheringItem.push_back( exdData->getField< int32_t >( row, 10 ) );
+  gatheringItem.push_back( exdData->getField< int32_t >( row, 11 ) );
+  gatheringItem.push_back( exdData->getField< int32_t >( row, 12 ) );
+  gatheringItem.push_back( exdData->getField< int32_t >( row, 13 ) );
+  gatheringItem.push_back( exdData->getField< int32_t >( row, 14 ) );
+  gatheringItem.push_back( exdData->getField< int32_t >( row, 15 ) );
+  gatheringItem.push_back( exdData->getField< int32_t >( row, 16 ) );
+  gatheringItem.push_back( exdData->getField< int32_t >( row, 17 ) );
+  gatheringItem.push_back( exdData->getField< int32_t >( row, 18 ) );
+  gatheringItem.push_back( exdData->getField< int32_t >( row, 19 ) );
+  gatheringItem.push_back( exdData->getField< int32_t >( row, 20 ) );
+  gatheringItem.push_back( exdData->getField< int32_t >( row, 21 ) );
+  gatheringItem.push_back( exdData->getField< int32_t >( row, 22 ) );
+  gatheringItem.push_back( exdData->getField< int32_t >( row, 23 ) );
+  gatheringItem.push_back( exdData->getField< int32_t >( row, 24 ) );
+  gatheringItem.push_back( exdData->getField< int32_t >( row, 25 ) );
+  gatheringItem.push_back( exdData->getField< int32_t >( row, 26 ) );
+  gatheringItem.push_back( exdData->getField< int32_t >( row, 27 ) );
+  gatheringItem.push_back( exdData->getField< int32_t >( row, 28 ) );
+  gatheringItem.push_back( exdData->getField< int32_t >( row, 29 ) );
+  gatheringItem.push_back( exdData->getField< int32_t >( row, 30 ) );
+  gatheringItem.push_back( exdData->getField< int32_t >( row, 31 ) );
+  gatheringItem.push_back( exdData->getField< int32_t >( row, 32 ) );
+  gatheringItem.push_back( exdData->getField< int32_t >( row, 33 ) );
+  gatheringItem.push_back( exdData->getField< int32_t >( row, 34 ) );
+  gatheringItem.push_back( exdData->getField< int32_t >( row, 35 ) );
+  gatheringItem.push_back( exdData->getField< int32_t >( row, 36 ) );
+  gatheringItem.push_back( exdData->getField< int32_t >( row, 37 ) );
+  gatheringItem.push_back( exdData->getField< int32_t >( row, 38 ) );
+  gatheringItem.push_back( exdData->getField< int32_t >( row, 39 ) );
+  gatheringItem.push_back( exdData->getField< int32_t >( row, 40 ) );
+  gatheringItem.push_back( exdData->getField< int32_t >( row, 41 ) );
+  gatheringItem.push_back( exdData->getField< int32_t >( row, 42 ) );
+  gatheringItem.push_back( exdData->getField< int32_t >( row, 43 ) );
+  gatheringItem.push_back( exdData->getField< int32_t >( row, 44 ) );
+  gatheringItem.push_back( exdData->getField< int32_t >( row, 45 ) );
+  gatheringItem.push_back( exdData->getField< int32_t >( row, 46 ) );
+  gatheringItem.push_back( exdData->getField< int32_t >( row, 47 ) );
+  gatheringItem.push_back( exdData->getField< int32_t >( row, 48 ) );
+  gatheringItem.push_back( exdData->getField< int32_t >( row, 49 ) );
+  gatheringItem.push_back( exdData->getField< int32_t >( row, 50 ) );
+  gatheringItem.push_back( exdData->getField< int32_t >( row, 51 ) );
+  gatheringItem.push_back( exdData->getField< int32_t >( row, 52 ) );
+  gatheringItem.push_back( exdData->getField< int32_t >( row, 53 ) );
+  gatheringItem.push_back( exdData->getField< int32_t >( row, 54 ) );
+  gatheringItem.push_back( exdData->getField< int32_t >( row, 55 ) );
+  gatheringItem.push_back( exdData->getField< int32_t >( row, 56 ) );
+  gatheringItem.push_back( exdData->getField< int32_t >( row, 57 ) );
+  gatheringItem.push_back( exdData->getField< int32_t >( row, 58 ) );
+  gatheringItem.push_back( exdData->getField< int32_t >( row, 59 ) );
+  gatheringItem.push_back( exdData->getField< int32_t >( row, 60 ) );
+  gatheringItem.push_back( exdData->getField< int32_t >( row, 61 ) );
+  gatheringItem.push_back( exdData->getField< int32_t >( row, 62 ) );
+  gatheringItem.push_back( exdData->getField< int32_t >( row, 63 ) );
+  gatheringItem.push_back( exdData->getField< int32_t >( row, 64 ) );
+  gatheringItem.push_back( exdData->getField< int32_t >( row, 65 ) );
+  gatheringItem.push_back( exdData->getField< int32_t >( row, 66 ) );
+  gatheringItem.push_back( exdData->getField< int32_t >( row, 67 ) );
+  gatheringItem.push_back( exdData->getField< int32_t >( row, 68 ) );
+  gatheringItem.push_back( exdData->getField< int32_t >( row, 69 ) );
+  gatheringItem.push_back( exdData->getField< int32_t >( row, 70 ) );
+  gatheringItem.push_back( exdData->getField< int32_t >( row, 71 ) );
+  gatheringItem.push_back( exdData->getField< int32_t >( row, 72 ) );
+  gatheringItem.push_back( exdData->getField< int32_t >( row, 73 ) );
+  gatheringItem.push_back( exdData->getField< int32_t >( row, 74 ) );
+  gatheringItem.push_back( exdData->getField< int32_t >( row, 75 ) );
+  gatheringItem.push_back( exdData->getField< int32_t >( row, 76 ) );
+  gatheringItem.push_back( exdData->getField< int32_t >( row, 77 ) );
+  gatheringItem.push_back( exdData->getField< int32_t >( row, 78 ) );
+  gatheringItem.push_back( exdData->getField< int32_t >( row, 79 ) );
+  gatheringItem.push_back( exdData->getField< int32_t >( row, 80 ) );
+  gatheringItem.push_back( exdData->getField< int32_t >( row, 81 ) );
+  gatheringItem.push_back( exdData->getField< int32_t >( row, 82 ) );
+  gatheringItem.push_back( exdData->getField< int32_t >( row, 83 ) );
+  gatheringItem.push_back( exdData->getField< int32_t >( row, 84 ) );
+  gatheringItem.push_back( exdData->getField< int32_t >( row, 85 ) );
+  gatheringItem.push_back( exdData->getField< int32_t >( row, 86 ) );
+  gatheringItem.push_back( exdData->getField< int32_t >( row, 87 ) );
+  gatheringItem.push_back( exdData->getField< int32_t >( row, 88 ) );
+  gatheringItem.push_back( exdData->getField< int32_t >( row, 89 ) );
+  gatheringItem.push_back( exdData->getField< int32_t >( row, 90 ) );
+  gatheringItem.push_back( exdData->getField< int32_t >( row, 91 ) );
+  gatheringItem.push_back( exdData->getField< int32_t >( row, 92 ) );
+  gatheringItem.push_back( exdData->getField< int32_t >( row, 93 ) );
+  gatheringItem.push_back( exdData->getField< int32_t >( row, 94 ) );
+  gatheringItem.push_back( exdData->getField< int32_t >( row, 95 ) );
+  gatheringItem.push_back( exdData->getField< int32_t >( row, 96 ) );
+  gatheringItem.push_back( exdData->getField< int32_t >( row, 97 ) );
+  gatheringItem.push_back( exdData->getField< int32_t >( row, 98 ) );
+  gatheringItem.push_back( exdData->getField< int32_t >( row, 99 ) );
+  gatheringItem.push_back( exdData->getField< int32_t >( row, 100 ) );
 }
 
 Sapphire::Data::GatheringPoint::GatheringPoint( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
 {
-   auto row = exdData->m_GatheringPointDat.get_row( row_id );
-   gatheringPointBase = exdData->getField< int32_t >( row, 1 );
-   gatheringPointBonus.push_back( exdData->getField< uint16_t >( row, 3 ) );
-   gatheringPointBonus.push_back( exdData->getField< uint16_t >( row, 4 ) );
-   territoryType = exdData->getField< uint16_t >( row, 5 );
-   placeName = exdData->getField< uint16_t >( row, 6 );
-   gatheringSubCategory = exdData->getField< uint16_t >( row, 7 );
+  auto row = exdData->m_GatheringPointDat.get_row( row_id );
+  gatheringPointBase = exdData->getField< int32_t >( row, 1 );
+  gatheringPointBonus.push_back( exdData->getField< uint16_t >( row, 3 ) );
+  gatheringPointBonus.push_back( exdData->getField< uint16_t >( row, 4 ) );
+  territoryType = exdData->getField< uint16_t >( row, 5 );
+  placeName = exdData->getField< uint16_t >( row, 6 );
+  gatheringSubCategory = exdData->getField< uint16_t >( row, 7 );
 }
 
 Sapphire::Data::GatheringPointBase::GatheringPointBase( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
 {
-   auto row = exdData->m_GatheringPointBaseDat.get_row( row_id );
-   gatheringType = exdData->getField< int32_t >( row, 0 );
-   gatheringLevel = exdData->getField< uint8_t >( row, 1 );
-   item.push_back( exdData->getField< int32_t >( row, 2 ) );
-   item.push_back( exdData->getField< int32_t >( row, 3 ) );
-   item.push_back( exdData->getField< int32_t >( row, 4 ) );
-   item.push_back( exdData->getField< int32_t >( row, 5 ) );
-   item.push_back( exdData->getField< int32_t >( row, 6 ) );
-   item.push_back( exdData->getField< int32_t >( row, 7 ) );
-   item.push_back( exdData->getField< int32_t >( row, 8 ) );
-   item.push_back( exdData->getField< int32_t >( row, 9 ) );
-   isLimited = exdData->getField< bool >( row, 10 );
+  auto row = exdData->m_GatheringPointBaseDat.get_row( row_id );
+  gatheringType = exdData->getField< int32_t >( row, 0 );
+  gatheringLevel = exdData->getField< uint8_t >( row, 1 );
+  item.push_back( exdData->getField< int32_t >( row, 2 ) );
+  item.push_back( exdData->getField< int32_t >( row, 3 ) );
+  item.push_back( exdData->getField< int32_t >( row, 4 ) );
+  item.push_back( exdData->getField< int32_t >( row, 5 ) );
+  item.push_back( exdData->getField< int32_t >( row, 6 ) );
+  item.push_back( exdData->getField< int32_t >( row, 7 ) );
+  item.push_back( exdData->getField< int32_t >( row, 8 ) );
+  item.push_back( exdData->getField< int32_t >( row, 9 ) );
+  isLimited = exdData->getField< bool >( row, 10 );
 }
 
 Sapphire::Data::GatheringPointBonus::GatheringPointBonus( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
 {
-   auto row = exdData->m_GatheringPointBonusDat.get_row( row_id );
-   condition = exdData->getField< uint8_t >( row, 0 );
-   conditionValue = exdData->getField< uint16_t >( row, 1 );
-   bonusType = exdData->getField< uint8_t >( row, 3 );
-   bonusValue = exdData->getField< uint16_t >( row, 4 );
+  auto row = exdData->m_GatheringPointBonusDat.get_row( row_id );
+  condition = exdData->getField< uint8_t >( row, 0 );
+  conditionValue = exdData->getField< uint16_t >( row, 1 );
+  bonusType = exdData->getField< uint8_t >( row, 3 );
+  bonusValue = exdData->getField< uint16_t >( row, 4 );
 }
 
 Sapphire::Data::GatheringPointBonusType::GatheringPointBonusType( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
 {
-   auto row = exdData->m_GatheringPointBonusTypeDat.get_row( row_id );
-   text = exdData->getField< std::string >( row, 0 );
+  auto row = exdData->m_GatheringPointBonusTypeDat.get_row( row_id );
+  text = exdData->getField< std::string >( row, 0 );
 }
 
 Sapphire::Data::GatheringPointName::GatheringPointName( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
 {
-   auto row = exdData->m_GatheringPointNameDat.get_row( row_id );
-   singular = exdData->getField< std::string >( row, 0 );
-   adjective = exdData->getField< int8_t >( row, 1 );
-   plural = exdData->getField< std::string >( row, 2 );
-   possessivePronoun = exdData->getField< int8_t >( row, 3 );
-   startsWithVowel = exdData->getField< int8_t >( row, 4 );
-   pronoun = exdData->getField< int8_t >( row, 6 );
-   article = exdData->getField< int8_t >( row, 7 );
+  auto row = exdData->m_GatheringPointNameDat.get_row( row_id );
+  singular = exdData->getField< std::string >( row, 0 );
+  adjective = exdData->getField< int8_t >( row, 1 );
+  plural = exdData->getField< std::string >( row, 2 );
+  possessivePronoun = exdData->getField< int8_t >( row, 3 );
+  startsWithVowel = exdData->getField< int8_t >( row, 4 );
+  pronoun = exdData->getField< int8_t >( row, 6 );
+  article = exdData->getField< int8_t >( row, 7 );
 }
 
 Sapphire::Data::GatheringSubCategory::GatheringSubCategory( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
 {
-   auto row = exdData->m_GatheringSubCategoryDat.get_row( row_id );
-   item = exdData->getField< int32_t >( row, 4 );
-   folkloreBook = exdData->getField< std::string >( row, 5 );
+  auto row = exdData->m_GatheringSubCategoryDat.get_row( row_id );
+  item = exdData->getField< int32_t >( row, 4 );
+  folkloreBook = exdData->getField< std::string >( row, 5 );
 }
 
 Sapphire::Data::GatheringType::GatheringType( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
 {
-   auto row = exdData->m_GatheringTypeDat.get_row( row_id );
-   name = exdData->getField< std::string >( row, 0 );
-   iconMain = exdData->getField< int32_t >( row, 1 );
-   iconOff = exdData->getField< int32_t >( row, 2 );
+  auto row = exdData->m_GatheringTypeDat.get_row( row_id );
+  name = exdData->getField< std::string >( row, 0 );
+  iconMain = exdData->getField< int32_t >( row, 1 );
+  iconOff = exdData->getField< int32_t >( row, 2 );
 }
 
 Sapphire::Data::GcArmyCaptureTactics::GcArmyCaptureTactics( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
 {
-   auto row = exdData->m_GcArmyCaptureTacticsDat.get_row( row_id );
-   name = exdData->getField< int32_t >( row, 0 );
-   hP = exdData->getField< uint8_t >( row, 1 );
-   damageDealt = exdData->getField< uint8_t >( row, 2 );
-   damageReceived = exdData->getField< uint8_t >( row, 3 );
-   tactic = exdData->getField< uint32_t >( row, 4 );
-   icon = exdData->getField< uint32_t >( row, 5 );
+  auto row = exdData->m_GcArmyCaptureTacticsDat.get_row( row_id );
+  name = exdData->getField< int32_t >( row, 0 );
+  hP = exdData->getField< uint8_t >( row, 1 );
+  damageDealt = exdData->getField< uint8_t >( row, 2 );
+  damageReceived = exdData->getField< uint8_t >( row, 3 );
+  tactic = exdData->getField< uint32_t >( row, 4 );
+  icon = exdData->getField< uint32_t >( row, 5 );
 }
 
 Sapphire::Data::GcArmyExpedition::GcArmyExpedition( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
 {
-   auto row = exdData->m_GcArmyExpeditionDat.get_row( row_id );
-   requiredFlag = exdData->getField< uint8_t >( row, 0 );
-   unlockFlag = exdData->getField< uint8_t >( row, 1 );
-   requiredLevel = exdData->getField< uint8_t >( row, 2 );
-   requiredSeals = exdData->getField< uint16_t >( row, 3 );
-   rewardExperience = exdData->getField< uint32_t >( row, 4 );
-   percentBase = exdData->getField< uint8_t >( row, 5 );
-   gcArmyExpeditionType = exdData->getField< uint8_t >( row, 7 );
-   name = exdData->getField< std::string >( row, 8 );
-   description = exdData->getField< std::string >( row, 9 );
+  auto row = exdData->m_GcArmyExpeditionDat.get_row( row_id );
+  requiredFlag = exdData->getField< uint8_t >( row, 0 );
+  unlockFlag = exdData->getField< uint8_t >( row, 1 );
+  requiredLevel = exdData->getField< uint8_t >( row, 2 );
+  requiredSeals = exdData->getField< uint16_t >( row, 3 );
+  rewardExperience = exdData->getField< uint32_t >( row, 4 );
+  percentBase = exdData->getField< uint8_t >( row, 5 );
+  gcArmyExpeditionType = exdData->getField< uint8_t >( row, 7 );
+  name = exdData->getField< std::string >( row, 8 );
+  description = exdData->getField< std::string >( row, 9 );
 }
 
 Sapphire::Data::GcArmyExpeditionMemberBonus::GcArmyExpeditionMemberBonus( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
 {
-   auto row = exdData->m_GcArmyExpeditionMemberBonusDat.get_row( row_id );
-   race = exdData->getField< uint8_t >( row, 0 );
-   classJob = exdData->getField< uint8_t >( row, 1 );
+  auto row = exdData->m_GcArmyExpeditionMemberBonusDat.get_row( row_id );
+  race = exdData->getField< uint8_t >( row, 0 );
+  classJob = exdData->getField< uint8_t >( row, 1 );
 }
 
 Sapphire::Data::GcArmyExpeditionType::GcArmyExpeditionType( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
 {
-   auto row = exdData->m_GcArmyExpeditionTypeDat.get_row( row_id );
-   name = exdData->getField< std::string >( row, 0 );
+  auto row = exdData->m_GcArmyExpeditionTypeDat.get_row( row_id );
+  name = exdData->getField< std::string >( row, 0 );
 }
 
 Sapphire::Data::GcArmyMemberGrow::GcArmyMemberGrow( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
 {
-   auto row = exdData->m_GcArmyMemberGrowDat.get_row( row_id );
-   classJob = exdData->getField< uint8_t >( row, 0 );
-   classBook = exdData->getField< int32_t >( row, 1 );
+  auto row = exdData->m_GcArmyMemberGrowDat.get_row( row_id );
+  classJob = exdData->getField< uint8_t >( row, 0 );
+  classBook = exdData->getField< int32_t >( row, 1 );
 }
 
 Sapphire::Data::GcArmyTraining::GcArmyTraining( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
 {
-   auto row = exdData->m_GcArmyTrainingDat.get_row( row_id );
-   physicalBonus = exdData->getField< int8_t >( row, 0 );
-   mentalBonus = exdData->getField< int8_t >( row, 1 );
-   tacticalBonus = exdData->getField< int8_t >( row, 2 );
-   experience = exdData->getField< uint32_t >( row, 3 );
-   name = exdData->getField< std::string >( row, 4 );
-   description = exdData->getField< std::string >( row, 5 );
+  auto row = exdData->m_GcArmyTrainingDat.get_row( row_id );
+  physicalBonus = exdData->getField< int8_t >( row, 0 );
+  mentalBonus = exdData->getField< int8_t >( row, 1 );
+  tacticalBonus = exdData->getField< int8_t >( row, 2 );
+  experience = exdData->getField< uint32_t >( row, 3 );
+  name = exdData->getField< std::string >( row, 4 );
+  description = exdData->getField< std::string >( row, 5 );
 }
 
 Sapphire::Data::GCRankGridaniaFemaleText::GCRankGridaniaFemaleText( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
 {
-   auto row = exdData->m_GCRankGridaniaFemaleTextDat.get_row( row_id );
-   singular = exdData->getField< std::string >( row, 0 );
-   adjective = exdData->getField< int8_t >( row, 1 );
-   plural = exdData->getField< std::string >( row, 2 );
-   possessivePronoun = exdData->getField< int8_t >( row, 3 );
-   startsWithVowel = exdData->getField< int8_t >( row, 4 );
-   pronoun = exdData->getField< int8_t >( row, 6 );
-   article = exdData->getField< int8_t >( row, 7 );
-   nameRank = exdData->getField< std::string >( row, 8 );
+  auto row = exdData->m_GCRankGridaniaFemaleTextDat.get_row( row_id );
+  singular = exdData->getField< std::string >( row, 0 );
+  adjective = exdData->getField< int8_t >( row, 1 );
+  plural = exdData->getField< std::string >( row, 2 );
+  possessivePronoun = exdData->getField< int8_t >( row, 3 );
+  startsWithVowel = exdData->getField< int8_t >( row, 4 );
+  pronoun = exdData->getField< int8_t >( row, 6 );
+  article = exdData->getField< int8_t >( row, 7 );
+  nameRank = exdData->getField< std::string >( row, 8 );
 }
 
 Sapphire::Data::GCRankGridaniaMaleText::GCRankGridaniaMaleText( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
 {
-   auto row = exdData->m_GCRankGridaniaMaleTextDat.get_row( row_id );
-   singular = exdData->getField< std::string >( row, 0 );
-   adjective = exdData->getField< int8_t >( row, 1 );
-   plural = exdData->getField< std::string >( row, 2 );
-   possessivePronoun = exdData->getField< int8_t >( row, 3 );
-   startsWithVowel = exdData->getField< int8_t >( row, 4 );
-   pronoun = exdData->getField< int8_t >( row, 6 );
-   article = exdData->getField< int8_t >( row, 7 );
-   nameRank = exdData->getField< std::string >( row, 8 );
+  auto row = exdData->m_GCRankGridaniaMaleTextDat.get_row( row_id );
+  singular = exdData->getField< std::string >( row, 0 );
+  adjective = exdData->getField< int8_t >( row, 1 );
+  plural = exdData->getField< std::string >( row, 2 );
+  possessivePronoun = exdData->getField< int8_t >( row, 3 );
+  startsWithVowel = exdData->getField< int8_t >( row, 4 );
+  pronoun = exdData->getField< int8_t >( row, 6 );
+  article = exdData->getField< int8_t >( row, 7 );
+  nameRank = exdData->getField< std::string >( row, 8 );
 }
 
 Sapphire::Data::GCRankLimsaFemaleText::GCRankLimsaFemaleText( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
 {
-   auto row = exdData->m_GCRankLimsaFemaleTextDat.get_row( row_id );
-   singular = exdData->getField< std::string >( row, 0 );
-   adjective = exdData->getField< int8_t >( row, 1 );
-   plural = exdData->getField< std::string >( row, 2 );
-   possessivePronoun = exdData->getField< int8_t >( row, 3 );
-   startsWithVowel = exdData->getField< int8_t >( row, 4 );
-   pronoun = exdData->getField< int8_t >( row, 6 );
-   article = exdData->getField< int8_t >( row, 7 );
-   nameRank = exdData->getField< std::string >( row, 8 );
+  auto row = exdData->m_GCRankLimsaFemaleTextDat.get_row( row_id );
+  singular = exdData->getField< std::string >( row, 0 );
+  adjective = exdData->getField< int8_t >( row, 1 );
+  plural = exdData->getField< std::string >( row, 2 );
+  possessivePronoun = exdData->getField< int8_t >( row, 3 );
+  startsWithVowel = exdData->getField< int8_t >( row, 4 );
+  pronoun = exdData->getField< int8_t >( row, 6 );
+  article = exdData->getField< int8_t >( row, 7 );
+  nameRank = exdData->getField< std::string >( row, 8 );
 }
 
 Sapphire::Data::GCRankLimsaMaleText::GCRankLimsaMaleText( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
 {
-   auto row = exdData->m_GCRankLimsaMaleTextDat.get_row( row_id );
-   singular = exdData->getField< std::string >( row, 0 );
-   adjective = exdData->getField< int8_t >( row, 1 );
-   plural = exdData->getField< std::string >( row, 2 );
-   possessivePronoun = exdData->getField< int8_t >( row, 3 );
-   startsWithVowel = exdData->getField< int8_t >( row, 4 );
-   pronoun = exdData->getField< int8_t >( row, 6 );
-   article = exdData->getField< int8_t >( row, 7 );
-   nameRank = exdData->getField< std::string >( row, 8 );
+  auto row = exdData->m_GCRankLimsaMaleTextDat.get_row( row_id );
+  singular = exdData->getField< std::string >( row, 0 );
+  adjective = exdData->getField< int8_t >( row, 1 );
+  plural = exdData->getField< std::string >( row, 2 );
+  possessivePronoun = exdData->getField< int8_t >( row, 3 );
+  startsWithVowel = exdData->getField< int8_t >( row, 4 );
+  pronoun = exdData->getField< int8_t >( row, 6 );
+  article = exdData->getField< int8_t >( row, 7 );
+  nameRank = exdData->getField< std::string >( row, 8 );
 }
 
 Sapphire::Data::GCRankUldahFemaleText::GCRankUldahFemaleText( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
 {
-   auto row = exdData->m_GCRankUldahFemaleTextDat.get_row( row_id );
-   singular = exdData->getField< std::string >( row, 0 );
-   adjective = exdData->getField< int8_t >( row, 1 );
-   plural = exdData->getField< std::string >( row, 2 );
-   possessivePronoun = exdData->getField< int8_t >( row, 3 );
-   startsWithVowel = exdData->getField< int8_t >( row, 4 );
-   pronoun = exdData->getField< int8_t >( row, 6 );
-   article = exdData->getField< int8_t >( row, 7 );
-   nameRank = exdData->getField< std::string >( row, 8 );
+  auto row = exdData->m_GCRankUldahFemaleTextDat.get_row( row_id );
+  singular = exdData->getField< std::string >( row, 0 );
+  adjective = exdData->getField< int8_t >( row, 1 );
+  plural = exdData->getField< std::string >( row, 2 );
+  possessivePronoun = exdData->getField< int8_t >( row, 3 );
+  startsWithVowel = exdData->getField< int8_t >( row, 4 );
+  pronoun = exdData->getField< int8_t >( row, 6 );
+  article = exdData->getField< int8_t >( row, 7 );
+  nameRank = exdData->getField< std::string >( row, 8 );
 }
 
 Sapphire::Data::GCRankUldahMaleText::GCRankUldahMaleText( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
 {
-   auto row = exdData->m_GCRankUldahMaleTextDat.get_row( row_id );
-   singular = exdData->getField< std::string >( row, 0 );
-   adjective = exdData->getField< int8_t >( row, 1 );
-   plural = exdData->getField< std::string >( row, 2 );
-   possessivePronoun = exdData->getField< int8_t >( row, 3 );
-   startsWithVowel = exdData->getField< int8_t >( row, 4 );
-   pronoun = exdData->getField< int8_t >( row, 6 );
-   article = exdData->getField< int8_t >( row, 7 );
-   nameRank = exdData->getField< std::string >( row, 8 );
+  auto row = exdData->m_GCRankUldahMaleTextDat.get_row( row_id );
+  singular = exdData->getField< std::string >( row, 0 );
+  adjective = exdData->getField< int8_t >( row, 1 );
+  plural = exdData->getField< std::string >( row, 2 );
+  possessivePronoun = exdData->getField< int8_t >( row, 3 );
+  startsWithVowel = exdData->getField< int8_t >( row, 4 );
+  pronoun = exdData->getField< int8_t >( row, 6 );
+  article = exdData->getField< int8_t >( row, 7 );
+  nameRank = exdData->getField< std::string >( row, 8 );
 }
 
 Sapphire::Data::GCScripShopCategory::GCScripShopCategory( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
 {
-   auto row = exdData->m_GCScripShopCategoryDat.get_row( row_id );
-   grandCompany = exdData->getField< int8_t >( row, 0 );
-   tier = exdData->getField< int8_t >( row, 1 );
-   subCategory = exdData->getField< int8_t >( row, 2 );
+  auto row = exdData->m_GCScripShopCategoryDat.get_row( row_id );
+  grandCompany = exdData->getField< int8_t >( row, 0 );
+  tier = exdData->getField< int8_t >( row, 1 );
+  subCategory = exdData->getField< int8_t >( row, 2 );
 }
 
 Sapphire::Data::GCScripShopItem::GCScripShopItem( uint32_t row_id, uint32_t subRow, Sapphire::Data::ExdDataGenerated* exdData )
 {
-   auto row = exdData->m_GCScripShopItemDat.get_row( row_id, subRow );
-   item = exdData->getField< int32_t >( row, 0 );
-   requiredGrandCompanyRank = exdData->getField< int32_t >( row, 1 );
-   costGCSeals = exdData->getField< uint32_t >( row, 2 );
-   sortKey = exdData->getField< uint8_t >( row, 3 );
+  auto row = exdData->m_GCScripShopItemDat.get_row( row_id, subRow );
+  item = exdData->getField< int32_t >( row, 0 );
+  requiredGrandCompanyRank = exdData->getField< int32_t >( row, 1 );
+  costGCSeals = exdData->getField< uint32_t >( row, 2 );
+  sortKey = exdData->getField< uint8_t >( row, 3 );
 }
 
 Sapphire::Data::GCShop::GCShop( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
 {
-   auto row = exdData->m_GCShopDat.get_row( row_id );
-   grandCompany = exdData->getField< int8_t >( row, 0 );
+  auto row = exdData->m_GCShopDat.get_row( row_id );
+  grandCompany = exdData->getField< int8_t >( row, 0 );
 }
 
 Sapphire::Data::GCShopItemCategory::GCShopItemCategory( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
 {
-   auto row = exdData->m_GCShopItemCategoryDat.get_row( row_id );
-   name = exdData->getField< std::string >( row, 0 );
+  auto row = exdData->m_GCShopItemCategoryDat.get_row( row_id );
+  name = exdData->getField< std::string >( row, 0 );
 }
 
 Sapphire::Data::GCSupplyDuty::GCSupplyDuty( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
 {
-   auto row = exdData->m_GCSupplyDutyDat.get_row( row_id );
+  auto row = exdData->m_GCSupplyDutyDat.get_row( row_id );
 }
 
 Sapphire::Data::GCSupplyDutyReward::GCSupplyDutyReward( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
 {
-   auto row = exdData->m_GCSupplyDutyRewardDat.get_row( row_id );
-   experienceSupply = exdData->getField< uint32_t >( row, 0 );
-   experienceProvisioning = exdData->getField< uint32_t >( row, 1 );
-   sealsExpertDelivery = exdData->getField< uint32_t >( row, 2 );
-   sealsSupply = exdData->getField< uint32_t >( row, 3 );
-   sealsProvisioning = exdData->getField< uint32_t >( row, 4 );
+  auto row = exdData->m_GCSupplyDutyRewardDat.get_row( row_id );
+  experienceSupply = exdData->getField< uint32_t >( row, 0 );
+  experienceProvisioning = exdData->getField< uint32_t >( row, 1 );
+  sealsExpertDelivery = exdData->getField< uint32_t >( row, 2 );
+  sealsSupply = exdData->getField< uint32_t >( row, 3 );
+  sealsProvisioning = exdData->getField< uint32_t >( row, 4 );
 }
 
 Sapphire::Data::GeneralAction::GeneralAction( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
 {
-   auto row = exdData->m_GeneralActionDat.get_row( row_id );
-   name = exdData->getField< std::string >( row, 0 );
-   description = exdData->getField< std::string >( row, 1 );
-   action = exdData->getField< uint16_t >( row, 3 );
-   unlockLink = exdData->getField< uint16_t >( row, 4 );
-   icon = exdData->getField< int32_t >( row, 7 );
+  auto row = exdData->m_GeneralActionDat.get_row( row_id );
+  name = exdData->getField< std::string >( row, 0 );
+  description = exdData->getField< std::string >( row, 1 );
+  action = exdData->getField< uint16_t >( row, 3 );
+  unlockLink = exdData->getField< uint16_t >( row, 4 );
+  icon = exdData->getField< int32_t >( row, 7 );
 }
 
 Sapphire::Data::GFATE::GFATE( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
 {
-   auto row = exdData->m_GFATEDat.get_row( row_id );
-   icon.push_back( exdData->getField< uint32_t >( row, 22 ) );
-   icon.push_back( exdData->getField< uint32_t >( row, 23 ) );
-   icon.push_back( exdData->getField< uint32_t >( row, 24 ) );
-   icon.push_back( exdData->getField< uint32_t >( row, 25 ) );
-   icon.push_back( exdData->getField< uint32_t >( row, 26 ) );
-   icon.push_back( exdData->getField< uint32_t >( row, 27 ) );
-   icon.push_back( exdData->getField< uint32_t >( row, 28 ) );
-   icon.push_back( exdData->getField< uint32_t >( row, 29 ) );
-   icon.push_back( exdData->getField< uint32_t >( row, 30 ) );
-   icon.push_back( exdData->getField< uint32_t >( row, 31 ) );
-   icon.push_back( exdData->getField< uint32_t >( row, 32 ) );
-   icon.push_back( exdData->getField< uint32_t >( row, 33 ) );
-   icon.push_back( exdData->getField< uint32_t >( row, 34 ) );
-   icon.push_back( exdData->getField< uint32_t >( row, 35 ) );
-   icon.push_back( exdData->getField< uint32_t >( row, 36 ) );
-   icon.push_back( exdData->getField< uint32_t >( row, 37 ) );
+  auto row = exdData->m_GFATEDat.get_row( row_id );
+  icon.push_back( exdData->getField< uint32_t >( row, 22 ) );
+  icon.push_back( exdData->getField< uint32_t >( row, 23 ) );
+  icon.push_back( exdData->getField< uint32_t >( row, 24 ) );
+  icon.push_back( exdData->getField< uint32_t >( row, 25 ) );
+  icon.push_back( exdData->getField< uint32_t >( row, 26 ) );
+  icon.push_back( exdData->getField< uint32_t >( row, 27 ) );
+  icon.push_back( exdData->getField< uint32_t >( row, 28 ) );
+  icon.push_back( exdData->getField< uint32_t >( row, 29 ) );
+  icon.push_back( exdData->getField< uint32_t >( row, 30 ) );
+  icon.push_back( exdData->getField< uint32_t >( row, 31 ) );
+  icon.push_back( exdData->getField< uint32_t >( row, 32 ) );
+  icon.push_back( exdData->getField< uint32_t >( row, 33 ) );
+  icon.push_back( exdData->getField< uint32_t >( row, 34 ) );
+  icon.push_back( exdData->getField< uint32_t >( row, 35 ) );
+  icon.push_back( exdData->getField< uint32_t >( row, 36 ) );
+  icon.push_back( exdData->getField< uint32_t >( row, 37 ) );
 }
 
 Sapphire::Data::GFateClimbing2::GFateClimbing2( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
 {
-   auto row = exdData->m_GFateClimbing2Dat.get_row( row_id );
-   contentEntry = exdData->getField< uint32_t >( row, 0 );
+  auto row = exdData->m_GFateClimbing2Dat.get_row( row_id );
+  contentEntry = exdData->getField< uint32_t >( row, 0 );
 }
 
 Sapphire::Data::GFateClimbing2Content::GFateClimbing2Content( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
 {
-   auto row = exdData->m_GFateClimbing2ContentDat.get_row( row_id );
-   publicContentTextData = exdData->getField< uint32_t >( row, 0 );
+  auto row = exdData->m_GFateClimbing2ContentDat.get_row( row_id );
+  publicContentTextData = exdData->getField< uint32_t >( row, 0 );
 }
 
 Sapphire::Data::GFateClimbing2TotemType::GFateClimbing2TotemType( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
 {
-   auto row = exdData->m_GFateClimbing2TotemTypeDat.get_row( row_id );
-   publicContentTextData = exdData->getField< uint32_t >( row, 0 );
+  auto row = exdData->m_GFateClimbing2TotemTypeDat.get_row( row_id );
+  publicContentTextData = exdData->getField< uint32_t >( row, 0 );
 }
 
 Sapphire::Data::GFateRideShooting::GFateRideShooting( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
 {
-   auto row = exdData->m_GFateRideShootingDat.get_row( row_id );
-   contentEntry = exdData->getField< uint32_t >( row, 0 );
+  auto row = exdData->m_GFateRideShootingDat.get_row( row_id );
+  contentEntry = exdData->getField< uint32_t >( row, 0 );
 }
 
 Sapphire::Data::GilShop::GilShop( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
 {
-   auto row = exdData->m_GilShopDat.get_row( row_id );
-   name = exdData->getField< std::string >( row, 0 );
-   icon = exdData->getField< uint32_t >( row, 1 );
-   questRequired.push_back( exdData->getField< uint32_t >( row, 2 ) );
-   questRequired.push_back( exdData->getField< uint32_t >( row, 3 ) );
-   questRequired.push_back( exdData->getField< uint32_t >( row, 4 ) );
-   questRequired.push_back( exdData->getField< uint32_t >( row, 5 ) );
-   acceptTalk = exdData->getField< int32_t >( row, 6 );
-   failTalk = exdData->getField< int32_t >( row, 7 );
+  auto row = exdData->m_GilShopDat.get_row( row_id );
+  name = exdData->getField< std::string >( row, 0 );
+  icon = exdData->getField< uint32_t >( row, 1 );
+  questRequired.push_back( exdData->getField< uint32_t >( row, 2 ) );
+  questRequired.push_back( exdData->getField< uint32_t >( row, 3 ) );
+  questRequired.push_back( exdData->getField< uint32_t >( row, 4 ) );
+  questRequired.push_back( exdData->getField< uint32_t >( row, 5 ) );
+  acceptTalk = exdData->getField< int32_t >( row, 6 );
+  failTalk = exdData->getField< int32_t >( row, 7 );
 }
 
 Sapphire::Data::GilShopItem::GilShopItem( uint32_t row_id, uint32_t subRow, Sapphire::Data::ExdDataGenerated* exdData )
 {
-   auto row = exdData->m_GilShopItemDat.get_row( row_id, subRow );
-   item = exdData->getField< int32_t >( row, 0 );
-   rowRequired.push_back( exdData->getField< int32_t >( row, 3 ) );
-   rowRequired.push_back( exdData->getField< int32_t >( row, 4 ) );
-   rowRequired.push_back( exdData->getField< int32_t >( row, 5 ) );
-   stateRequired = exdData->getField< uint16_t >( row, 7 );
-   patch = exdData->getField< uint16_t >( row, 8 );
+  auto row = exdData->m_GilShopItemDat.get_row( row_id, subRow );
+  item = exdData->getField< int32_t >( row, 0 );
+  rowRequired.push_back( exdData->getField< int32_t >( row, 3 ) );
+  rowRequired.push_back( exdData->getField< int32_t >( row, 4 ) );
+  rowRequired.push_back( exdData->getField< int32_t >( row, 5 ) );
+  stateRequired = exdData->getField< uint16_t >( row, 7 );
+  patch = exdData->getField< uint16_t >( row, 8 );
 }
 
 Sapphire::Data::GoldSaucerArcadeMachine::GoldSaucerArcadeMachine( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
 {
-   auto row = exdData->m_GoldSaucerArcadeMachineDat.get_row( row_id );
-   failImage = exdData->getField< uint32_t >( row, 6 );
-   poor = exdData->getField< uint32_t >( row, 35 );
-   good = exdData->getField< uint32_t >( row, 36 );
-   great = exdData->getField< uint32_t >( row, 37 );
-   excellent = exdData->getField< uint32_t >( row, 38 );
+  auto row = exdData->m_GoldSaucerArcadeMachineDat.get_row( row_id );
+  failImage = exdData->getField< uint32_t >( row, 6 );
+  poor = exdData->getField< uint32_t >( row, 35 );
+  good = exdData->getField< uint32_t >( row, 36 );
+  great = exdData->getField< uint32_t >( row, 37 );
+  excellent = exdData->getField< uint32_t >( row, 38 );
 }
 
 Sapphire::Data::GoldSaucerTextData::GoldSaucerTextData( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
 {
-   auto row = exdData->m_GoldSaucerTextDataDat.get_row( row_id );
-   text = exdData->getField< std::string >( row, 0 );
+  auto row = exdData->m_GoldSaucerTextDataDat.get_row( row_id );
+  text = exdData->getField< std::string >( row, 0 );
 }
 
 Sapphire::Data::GrandCompany::GrandCompany( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
 {
-   auto row = exdData->m_GrandCompanyDat.get_row( row_id );
-   name = exdData->getField< std::string >( row, 0 );
+  auto row = exdData->m_GrandCompanyDat.get_row( row_id );
+  name = exdData->getField< std::string >( row, 0 );
 }
 
 Sapphire::Data::GrandCompanyRank::GrandCompanyRank( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
 {
-   auto row = exdData->m_GrandCompanyRankDat.get_row( row_id );
-   tier = exdData->getField< uint8_t >( row, 0 );
-   order = exdData->getField< uint8_t >( row, 1 );
-   maxSeals = exdData->getField< uint32_t >( row, 2 );
-   requiredSeals = exdData->getField< uint32_t >( row, 3 );
-   iconMaelstrom = exdData->getField< int32_t >( row, 4 );
-   iconSerpents = exdData->getField< int32_t >( row, 5 );
-   iconFlames = exdData->getField< int32_t >( row, 6 );
-   questMaelstrom = exdData->getField< int32_t >( row, 7 );
-   questSerpents = exdData->getField< int32_t >( row, 8 );
-   questFlames = exdData->getField< int32_t >( row, 9 );
+  auto row = exdData->m_GrandCompanyRankDat.get_row( row_id );
+  tier = exdData->getField< uint8_t >( row, 0 );
+  order = exdData->getField< uint8_t >( row, 1 );
+  maxSeals = exdData->getField< uint32_t >( row, 2 );
+  requiredSeals = exdData->getField< uint32_t >( row, 3 );
+  iconMaelstrom = exdData->getField< int32_t >( row, 4 );
+  iconSerpents = exdData->getField< int32_t >( row, 5 );
+  iconFlames = exdData->getField< int32_t >( row, 6 );
+  questMaelstrom = exdData->getField< int32_t >( row, 7 );
+  questSerpents = exdData->getField< int32_t >( row, 8 );
+  questFlames = exdData->getField< int32_t >( row, 9 );
 }
 
 Sapphire::Data::GuardianDeity::GuardianDeity( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
 {
-   auto row = exdData->m_GuardianDeityDat.get_row( row_id );
-   name = exdData->getField< std::string >( row, 0 );
-   description = exdData->getField< std::string >( row, 1 );
-   icon = exdData->getField< uint16_t >( row, 2 );
+  auto row = exdData->m_GuardianDeityDat.get_row( row_id );
+  name = exdData->getField< std::string >( row, 0 );
+  description = exdData->getField< std::string >( row, 1 );
+  icon = exdData->getField< uint16_t >( row, 2 );
 }
 
 Sapphire::Data::GuildleveAssignment::GuildleveAssignment( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
 {
-   auto row = exdData->m_GuildleveAssignmentDat.get_row( row_id );
-   assignmentTalk = exdData->getField< uint32_t >( row, 1 );
-   quest.push_back( exdData->getField< uint32_t >( row, 2 ) );
-   quest.push_back( exdData->getField< uint32_t >( row, 3 ) );
+  auto row = exdData->m_GuildleveAssignmentDat.get_row( row_id );
+  assignmentTalk = exdData->getField< uint32_t >( row, 1 );
+  quest.push_back( exdData->getField< uint32_t >( row, 2 ) );
+  quest.push_back( exdData->getField< uint32_t >( row, 3 ) );
 }
 
 Sapphire::Data::GuildleveAssignmentCategory::GuildleveAssignmentCategory( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
 {
-   auto row = exdData->m_GuildleveAssignmentCategoryDat.get_row( row_id );
-   category.push_back( exdData->getField< int32_t >( row, 0 ) );
-   category.push_back( exdData->getField< int32_t >( row, 1 ) );
-   category.push_back( exdData->getField< int32_t >( row, 2 ) );
-   category.push_back( exdData->getField< int32_t >( row, 3 ) );
-   category.push_back( exdData->getField< int32_t >( row, 4 ) );
-   category.push_back( exdData->getField< int32_t >( row, 5 ) );
-   category.push_back( exdData->getField< int32_t >( row, 6 ) );
-   category.push_back( exdData->getField< int32_t >( row, 7 ) );
+  auto row = exdData->m_GuildleveAssignmentCategoryDat.get_row( row_id );
+  category.push_back( exdData->getField< int32_t >( row, 0 ) );
+  category.push_back( exdData->getField< int32_t >( row, 1 ) );
+  category.push_back( exdData->getField< int32_t >( row, 2 ) );
+  category.push_back( exdData->getField< int32_t >( row, 3 ) );
+  category.push_back( exdData->getField< int32_t >( row, 4 ) );
+  category.push_back( exdData->getField< int32_t >( row, 5 ) );
+  category.push_back( exdData->getField< int32_t >( row, 6 ) );
+  category.push_back( exdData->getField< int32_t >( row, 7 ) );
 }
 
 Sapphire::Data::GuildOrderGuide::GuildOrderGuide( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
 {
-   auto row = exdData->m_GuildOrderGuideDat.get_row( row_id );
+  auto row = exdData->m_GuildOrderGuideDat.get_row( row_id );
 }
 
 Sapphire::Data::GuildOrderOfficer::GuildOrderOfficer( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
 {
-   auto row = exdData->m_GuildOrderOfficerDat.get_row( row_id );
+  auto row = exdData->m_GuildOrderOfficerDat.get_row( row_id );
 }
 
 Sapphire::Data::HairMakeType::HairMakeType( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
 {
-   auto row = exdData->m_HairMakeTypeDat.get_row( row_id );
-   race = exdData->getField< int32_t >( row, 0 );
-   tribe = exdData->getField< int32_t >( row, 1 );
-   gender = exdData->getField< int8_t >( row, 2 );
+  auto row = exdData->m_HairMakeTypeDat.get_row( row_id );
+  race = exdData->getField< int32_t >( row, 0 );
+  tribe = exdData->getField< int32_t >( row, 1 );
+  gender = exdData->getField< int8_t >( row, 2 );
 }
 
 Sapphire::Data::HouseRetainerPose::HouseRetainerPose( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
 {
-   auto row = exdData->m_HouseRetainerPoseDat.get_row( row_id );
-   actionTimeline = exdData->getField< uint16_t >( row, 0 );
+  auto row = exdData->m_HouseRetainerPoseDat.get_row( row_id );
+  actionTimeline = exdData->getField< uint16_t >( row, 0 );
 }
 
 Sapphire::Data::HousingAethernet::HousingAethernet( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
 {
-   auto row = exdData->m_HousingAethernetDat.get_row( row_id );
-   level = exdData->getField< uint32_t >( row, 0 );
-   territoryType = exdData->getField< uint16_t >( row, 1 );
-   placeName = exdData->getField< uint16_t >( row, 2 );
-   order = exdData->getField< uint8_t >( row, 3 );
+  auto row = exdData->m_HousingAethernetDat.get_row( row_id );
+  level = exdData->getField< uint32_t >( row, 0 );
+  territoryType = exdData->getField< uint16_t >( row, 1 );
+  placeName = exdData->getField< uint16_t >( row, 2 );
+  order = exdData->getField< uint8_t >( row, 3 );
 }
 
 Sapphire::Data::HousingAppeal::HousingAppeal( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
 {
-   auto row = exdData->m_HousingAppealDat.get_row( row_id );
-   tag = exdData->getField< std::string >( row, 0 );
-   icon = exdData->getField< uint32_t >( row, 1 );
-   order = exdData->getField< uint8_t >( row, 2 );
+  auto row = exdData->m_HousingAppealDat.get_row( row_id );
+  tag = exdData->getField< std::string >( row, 0 );
+  icon = exdData->getField< uint32_t >( row, 1 );
+  order = exdData->getField< uint8_t >( row, 2 );
 }
 
 Sapphire::Data::HousingEmploymentNpcList::HousingEmploymentNpcList( uint32_t row_id, uint32_t subRow, Sapphire::Data::ExdDataGenerated* exdData )
 {
-   auto row = exdData->m_HousingEmploymentNpcListDat.get_row( row_id, subRow );
-   race = exdData->getField< uint8_t >( row, 0 );
-   eNpcBase.push_back( exdData->getField< uint32_t >( row, 1 ) );
-   eNpcBase.push_back( exdData->getField< uint32_t >( row, 2 ) );
+  auto row = exdData->m_HousingEmploymentNpcListDat.get_row( row_id, subRow );
+  race = exdData->getField< uint8_t >( row, 0 );
+  eNpcBase.push_back( exdData->getField< uint32_t >( row, 1 ) );
+  eNpcBase.push_back( exdData->getField< uint32_t >( row, 2 ) );
 }
 
 Sapphire::Data::HousingEmploymentNpcRace::HousingEmploymentNpcRace( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
 {
-   auto row = exdData->m_HousingEmploymentNpcRaceDat.get_row( row_id );
-   race = exdData->getField< std::string >( row, 0 );
+  auto row = exdData->m_HousingEmploymentNpcRaceDat.get_row( row_id );
+  race = exdData->getField< std::string >( row, 0 );
 }
 
 Sapphire::Data::HousingExterior::HousingExterior( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
 {
-   auto row = exdData->m_HousingExteriorDat.get_row( row_id );
-   placeName = exdData->getField< uint16_t >( row, 2 );
-   housingSize = exdData->getField< uint8_t >( row, 3 );
-   model = exdData->getField< std::string >( row, 4 );
+  auto row = exdData->m_HousingExteriorDat.get_row( row_id );
+  placeName = exdData->getField< uint16_t >( row, 2 );
+  housingSize = exdData->getField< uint8_t >( row, 3 );
+  model = exdData->getField< std::string >( row, 4 );
 }
 
 Sapphire::Data::HousingFurniture::HousingFurniture( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
 {
-   auto row = exdData->m_HousingFurnitureDat.get_row( row_id );
-   modelKey = exdData->getField< uint16_t >( row, 0 );
-   housingItemCategory = exdData->getField< uint8_t >( row, 1 );
-   usageType = exdData->getField< uint8_t >( row, 2 );
-   usageParameter = exdData->getField< uint32_t >( row, 3 );
-   housingLayoutLimit = exdData->getField< uint8_t >( row, 4 );
-   aquariumTier = exdData->getField< uint8_t >( row, 5 );
-   customTalk = exdData->getField< uint32_t >( row, 6 );
-   item = exdData->getField< uint32_t >( row, 7 );
-   destroyOnRemoval = exdData->getField< bool >( row, 8 );
-   tooltip = exdData->getField< bool >( row, 9 );
-}
-
-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 );
-}
-
-Sapphire::Data::HousingMerchantPose::HousingMerchantPose( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
-{
-   auto row = exdData->m_HousingMerchantPoseDat.get_row( row_id );
-   actionTimeline = exdData->getField< uint16_t >( row, 0 );
-   pose = exdData->getField< std::string >( row, 1 );
+  auto row = exdData->m_HousingFurnitureDat.get_row( row_id );
+  modelKey = exdData->getField< uint16_t >( row, 0 );
+  housingItemCategory = exdData->getField< uint8_t >( row, 1 );
+  usageType = exdData->getField< uint8_t >( row, 2 );
+  usageParameter = exdData->getField< uint32_t >( row, 3 );
+  aquariumTier = exdData->getField< uint8_t >( row, 5 );
+  customTalk = exdData->getField< uint32_t >( row, 6 );
+  item = exdData->getField< uint32_t >( row, 7 );
+  destroyOnRemoval = exdData->getField< bool >( row, 8 );
+  tooltip = exdData->getField< bool >( row, 9 );
 }
 
 Sapphire::Data::HousingLandSet::HousingLandSet( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
 {
-   auto row = exdData->m_HousingLandSetDat.get_row( row_id );
-   plotSize.push_back( exdData->getField< uint8_t >( row, 0 ) );
-   plotSize.push_back( exdData->getField< uint8_t >( row, 1 ) );
-   plotSize.push_back( exdData->getField< uint8_t >( row, 2 ) );
-   plotSize.push_back( exdData->getField< uint8_t >( row, 3 ) );
-   plotSize.push_back( exdData->getField< uint8_t >( row, 4 ) );
-   plotSize.push_back( exdData->getField< uint8_t >( row, 5 ) );
-   plotSize.push_back( exdData->getField< uint8_t >( row, 6 ) );
-   plotSize.push_back( exdData->getField< uint8_t >( row, 7 ) );
-   plotSize.push_back( exdData->getField< uint8_t >( row, 8 ) );
-   plotSize.push_back( exdData->getField< uint8_t >( row, 9 ) );
-   plotSize.push_back( exdData->getField< uint8_t >( row, 10 ) );
-   plotSize.push_back( exdData->getField< uint8_t >( row, 11 ) );
-   plotSize.push_back( exdData->getField< uint8_t >( row, 12 ) );
-   plotSize.push_back( exdData->getField< uint8_t >( row, 13 ) );
-   plotSize.push_back( exdData->getField< uint8_t >( row, 14 ) );
-   plotSize.push_back( exdData->getField< uint8_t >( row, 15 ) );
-   plotSize.push_back( exdData->getField< uint8_t >( row, 16 ) );
-   plotSize.push_back( exdData->getField< uint8_t >( row, 17 ) );
-   plotSize.push_back( exdData->getField< uint8_t >( row, 18 ) );
-   plotSize.push_back( exdData->getField< uint8_t >( row, 19 ) );
-   plotSize.push_back( exdData->getField< uint8_t >( row, 20 ) );
-   plotSize.push_back( exdData->getField< uint8_t >( row, 21 ) );
-   plotSize.push_back( exdData->getField< uint8_t >( row, 22 ) );
-   plotSize.push_back( exdData->getField< uint8_t >( row, 23 ) );
-   plotSize.push_back( exdData->getField< uint8_t >( row, 24 ) );
-   plotSize.push_back( exdData->getField< uint8_t >( row, 25 ) );
-   plotSize.push_back( exdData->getField< uint8_t >( row, 26 ) );
-   plotSize.push_back( exdData->getField< uint8_t >( row, 27 ) );
-   plotSize.push_back( exdData->getField< uint8_t >( row, 28 ) );
-   plotSize.push_back( exdData->getField< uint8_t >( row, 29 ) );
-   plotSize.push_back( exdData->getField< uint8_t >( row, 30 ) );
-   plotSize.push_back( exdData->getField< uint8_t >( row, 31 ) );
-   plotSize.push_back( exdData->getField< uint8_t >( row, 32 ) );
-   plotSize.push_back( exdData->getField< uint8_t >( row, 33 ) );
-   plotSize.push_back( exdData->getField< uint8_t >( row, 34 ) );
-   plotSize.push_back( exdData->getField< uint8_t >( row, 35 ) );
-   plotSize.push_back( exdData->getField< uint8_t >( row, 36 ) );
-   plotSize.push_back( exdData->getField< uint8_t >( row, 37 ) );
-   plotSize.push_back( exdData->getField< uint8_t >( row, 38 ) );
-   plotSize.push_back( exdData->getField< uint8_t >( row, 39 ) );
-   plotSize.push_back( exdData->getField< uint8_t >( row, 40 ) );
-   plotSize.push_back( exdData->getField< uint8_t >( row, 41 ) );
-   plotSize.push_back( exdData->getField< uint8_t >( row, 42 ) );
-   plotSize.push_back( exdData->getField< uint8_t >( row, 43 ) );
-   plotSize.push_back( exdData->getField< uint8_t >( row, 44 ) );
-   plotSize.push_back( exdData->getField< uint8_t >( row, 45 ) );
-   plotSize.push_back( exdData->getField< uint8_t >( row, 46 ) );
-   plotSize.push_back( exdData->getField< uint8_t >( row, 47 ) );
-   plotSize.push_back( exdData->getField< uint8_t >( row, 48 ) );
-   plotSize.push_back( exdData->getField< uint8_t >( row, 49 ) );
-   plotSize.push_back( exdData->getField< uint8_t >( row, 50 ) );
-   plotSize.push_back( exdData->getField< uint8_t >( row, 51 ) );
-   plotSize.push_back( exdData->getField< uint8_t >( row, 52 ) );
-   plotSize.push_back( exdData->getField< uint8_t >( row, 53 ) );
-   plotSize.push_back( exdData->getField< uint8_t >( row, 54 ) );
-   plotSize.push_back( exdData->getField< uint8_t >( row, 55 ) );
-   plotSize.push_back( exdData->getField< uint8_t >( row, 56 ) );
-   plotSize.push_back( exdData->getField< uint8_t >( row, 57 ) );
-   plotSize.push_back( exdData->getField< uint8_t >( row, 58 ) );
-   plotSize.push_back( exdData->getField< uint8_t >( row, 59 ) );
-   for ( int i = 60; i < 60 + 60; i++ )
-     minPrice.push_back( exdData->getField< uint32_t >( row, i ) );
-   initialPrice.push_back( exdData->getField< uint32_t >( row, 300 ) );
-   initialPrice.push_back( exdData->getField< uint32_t >( row, 301 ) );
-   initialPrice.push_back( exdData->getField< uint32_t >( row, 302 ) );
-   initialPrice.push_back( exdData->getField< uint32_t >( row, 303 ) );
-   initialPrice.push_back( exdData->getField< uint32_t >( row, 304 ) );
-   initialPrice.push_back( exdData->getField< uint32_t >( row, 305 ) );
-   initialPrice.push_back( exdData->getField< uint32_t >( row, 306 ) );
-   initialPrice.push_back( exdData->getField< uint32_t >( row, 307 ) );
-   initialPrice.push_back( exdData->getField< uint32_t >( row, 308 ) );
-   initialPrice.push_back( exdData->getField< uint32_t >( row, 309 ) );
-   initialPrice.push_back( exdData->getField< uint32_t >( row, 310 ) );
-   initialPrice.push_back( exdData->getField< uint32_t >( row, 311 ) );
-   initialPrice.push_back( exdData->getField< uint32_t >( row, 312 ) );
-   initialPrice.push_back( exdData->getField< uint32_t >( row, 313 ) );
-   initialPrice.push_back( exdData->getField< uint32_t >( row, 314 ) );
-   initialPrice.push_back( exdData->getField< uint32_t >( row, 315 ) );
-   initialPrice.push_back( exdData->getField< uint32_t >( row, 316 ) );
-   initialPrice.push_back( exdData->getField< uint32_t >( row, 317 ) );
-   initialPrice.push_back( exdData->getField< uint32_t >( row, 318 ) );
-   initialPrice.push_back( exdData->getField< uint32_t >( row, 319 ) );
-   initialPrice.push_back( exdData->getField< uint32_t >( row, 320 ) );
-   initialPrice.push_back( exdData->getField< uint32_t >( row, 321 ) );
-   initialPrice.push_back( exdData->getField< uint32_t >( row, 322 ) );
-   initialPrice.push_back( exdData->getField< uint32_t >( row, 323 ) );
-   initialPrice.push_back( exdData->getField< uint32_t >( row, 324 ) );
-   initialPrice.push_back( exdData->getField< uint32_t >( row, 325 ) );
-   initialPrice.push_back( exdData->getField< uint32_t >( row, 326 ) );
-   initialPrice.push_back( exdData->getField< uint32_t >( row, 327 ) );
-   initialPrice.push_back( exdData->getField< uint32_t >( row, 328 ) );
-   initialPrice.push_back( exdData->getField< uint32_t >( row, 329 ) );
-   initialPrice.push_back( exdData->getField< uint32_t >( row, 330 ) );
-   initialPrice.push_back( exdData->getField< uint32_t >( row, 331 ) );
-   initialPrice.push_back( exdData->getField< uint32_t >( row, 332 ) );
-   initialPrice.push_back( exdData->getField< uint32_t >( row, 333 ) );
-   initialPrice.push_back( exdData->getField< uint32_t >( row, 334 ) );
-   initialPrice.push_back( exdData->getField< uint32_t >( row, 335 ) );
-   initialPrice.push_back( exdData->getField< uint32_t >( row, 336 ) );
-   initialPrice.push_back( exdData->getField< uint32_t >( row, 337 ) );
-   initialPrice.push_back( exdData->getField< uint32_t >( row, 338 ) );
-   initialPrice.push_back( exdData->getField< uint32_t >( row, 339 ) );
-   initialPrice.push_back( exdData->getField< uint32_t >( row, 340 ) );
-   initialPrice.push_back( exdData->getField< uint32_t >( row, 341 ) );
-   initialPrice.push_back( exdData->getField< uint32_t >( row, 342 ) );
-   initialPrice.push_back( exdData->getField< uint32_t >( row, 343 ) );
-   initialPrice.push_back( exdData->getField< uint32_t >( row, 344 ) );
-   initialPrice.push_back( exdData->getField< uint32_t >( row, 345 ) );
-   initialPrice.push_back( exdData->getField< uint32_t >( row, 346 ) );
-   initialPrice.push_back( exdData->getField< uint32_t >( row, 347 ) );
-   initialPrice.push_back( exdData->getField< uint32_t >( row, 348 ) );
-   initialPrice.push_back( exdData->getField< uint32_t >( row, 349 ) );
-   initialPrice.push_back( exdData->getField< uint32_t >( row, 350 ) );
-   initialPrice.push_back( exdData->getField< uint32_t >( row, 351 ) );
-   initialPrice.push_back( exdData->getField< uint32_t >( row, 352 ) );
-   initialPrice.push_back( exdData->getField< uint32_t >( row, 353 ) );
-   initialPrice.push_back( exdData->getField< uint32_t >( row, 354 ) );
-   initialPrice.push_back( exdData->getField< uint32_t >( row, 355 ) );
-   initialPrice.push_back( exdData->getField< uint32_t >( row, 356 ) );
-   initialPrice.push_back( exdData->getField< uint32_t >( row, 357 ) );
-   initialPrice.push_back( exdData->getField< uint32_t >( row, 358 ) );
-   initialPrice.push_back( exdData->getField< uint32_t >( row, 359 ) );
+  auto row = exdData->m_HousingLandSetDat.get_row( row_id );
+  plotSize.push_back( exdData->getField< uint8_t >( row, 0 ) );
+  plotSize.push_back( exdData->getField< uint8_t >( row, 1 ) );
+  plotSize.push_back( exdData->getField< uint8_t >( row, 2 ) );
+  plotSize.push_back( exdData->getField< uint8_t >( row, 3 ) );
+  plotSize.push_back( exdData->getField< uint8_t >( row, 4 ) );
+  plotSize.push_back( exdData->getField< uint8_t >( row, 5 ) );
+  plotSize.push_back( exdData->getField< uint8_t >( row, 6 ) );
+  plotSize.push_back( exdData->getField< uint8_t >( row, 7 ) );
+  plotSize.push_back( exdData->getField< uint8_t >( row, 8 ) );
+  plotSize.push_back( exdData->getField< uint8_t >( row, 9 ) );
+  plotSize.push_back( exdData->getField< uint8_t >( row, 10 ) );
+  plotSize.push_back( exdData->getField< uint8_t >( row, 11 ) );
+  plotSize.push_back( exdData->getField< uint8_t >( row, 12 ) );
+  plotSize.push_back( exdData->getField< uint8_t >( row, 13 ) );
+  plotSize.push_back( exdData->getField< uint8_t >( row, 14 ) );
+  plotSize.push_back( exdData->getField< uint8_t >( row, 15 ) );
+  plotSize.push_back( exdData->getField< uint8_t >( row, 16 ) );
+  plotSize.push_back( exdData->getField< uint8_t >( row, 17 ) );
+  plotSize.push_back( exdData->getField< uint8_t >( row, 18 ) );
+  plotSize.push_back( exdData->getField< uint8_t >( row, 19 ) );
+  plotSize.push_back( exdData->getField< uint8_t >( row, 20 ) );
+  plotSize.push_back( exdData->getField< uint8_t >( row, 21 ) );
+  plotSize.push_back( exdData->getField< uint8_t >( row, 22 ) );
+  plotSize.push_back( exdData->getField< uint8_t >( row, 23 ) );
+  plotSize.push_back( exdData->getField< uint8_t >( row, 24 ) );
+  plotSize.push_back( exdData->getField< uint8_t >( row, 25 ) );
+  plotSize.push_back( exdData->getField< uint8_t >( row, 26 ) );
+  plotSize.push_back( exdData->getField< uint8_t >( row, 27 ) );
+  plotSize.push_back( exdData->getField< uint8_t >( row, 28 ) );
+  plotSize.push_back( exdData->getField< uint8_t >( row, 29 ) );
+  plotSize.push_back( exdData->getField< uint8_t >( row, 30 ) );
+  plotSize.push_back( exdData->getField< uint8_t >( row, 31 ) );
+  plotSize.push_back( exdData->getField< uint8_t >( row, 32 ) );
+  plotSize.push_back( exdData->getField< uint8_t >( row, 33 ) );
+  plotSize.push_back( exdData->getField< uint8_t >( row, 34 ) );
+  plotSize.push_back( exdData->getField< uint8_t >( row, 35 ) );
+  plotSize.push_back( exdData->getField< uint8_t >( row, 36 ) );
+  plotSize.push_back( exdData->getField< uint8_t >( row, 37 ) );
+  plotSize.push_back( exdData->getField< uint8_t >( row, 38 ) );
+  plotSize.push_back( exdData->getField< uint8_t >( row, 39 ) );
+  plotSize.push_back( exdData->getField< uint8_t >( row, 40 ) );
+  plotSize.push_back( exdData->getField< uint8_t >( row, 41 ) );
+  plotSize.push_back( exdData->getField< uint8_t >( row, 42 ) );
+  plotSize.push_back( exdData->getField< uint8_t >( row, 43 ) );
+  plotSize.push_back( exdData->getField< uint8_t >( row, 44 ) );
+  plotSize.push_back( exdData->getField< uint8_t >( row, 45 ) );
+  plotSize.push_back( exdData->getField< uint8_t >( row, 46 ) );
+  plotSize.push_back( exdData->getField< uint8_t >( row, 47 ) );
+  plotSize.push_back( exdData->getField< uint8_t >( row, 48 ) );
+  plotSize.push_back( exdData->getField< uint8_t >( row, 49 ) );
+  plotSize.push_back( exdData->getField< uint8_t >( row, 50 ) );
+  plotSize.push_back( exdData->getField< uint8_t >( row, 51 ) );
+  plotSize.push_back( exdData->getField< uint8_t >( row, 52 ) );
+  plotSize.push_back( exdData->getField< uint8_t >( row, 53 ) );
+  plotSize.push_back( exdData->getField< uint8_t >( row, 54 ) );
+  plotSize.push_back( exdData->getField< uint8_t >( row, 55 ) );
+  plotSize.push_back( exdData->getField< uint8_t >( row, 56 ) );
+  plotSize.push_back( exdData->getField< uint8_t >( row, 57 ) );
+  plotSize.push_back( exdData->getField< uint8_t >( row, 58 ) );
+  plotSize.push_back( exdData->getField< uint8_t >( row, 59 ) );
+  minPrice.push_back( exdData->getField< uint32_t >( row, 60 ) );
+  minPrice.push_back( exdData->getField< uint32_t >( row, 61 ) );
+  minPrice.push_back( exdData->getField< uint32_t >( row, 62 ) );
+  minPrice.push_back( exdData->getField< uint32_t >( row, 63 ) );
+  minPrice.push_back( exdData->getField< uint32_t >( row, 64 ) );
+  minPrice.push_back( exdData->getField< uint32_t >( row, 65 ) );
+  minPrice.push_back( exdData->getField< uint32_t >( row, 66 ) );
+  minPrice.push_back( exdData->getField< uint32_t >( row, 67 ) );
+  minPrice.push_back( exdData->getField< uint32_t >( row, 68 ) );
+  minPrice.push_back( exdData->getField< uint32_t >( row, 69 ) );
+  minPrice.push_back( exdData->getField< uint32_t >( row, 70 ) );
+  minPrice.push_back( exdData->getField< uint32_t >( row, 71 ) );
+  minPrice.push_back( exdData->getField< uint32_t >( row, 72 ) );
+  minPrice.push_back( exdData->getField< uint32_t >( row, 73 ) );
+  minPrice.push_back( exdData->getField< uint32_t >( row, 74 ) );
+  minPrice.push_back( exdData->getField< uint32_t >( row, 75 ) );
+  minPrice.push_back( exdData->getField< uint32_t >( row, 76 ) );
+  minPrice.push_back( exdData->getField< uint32_t >( row, 77 ) );
+  minPrice.push_back( exdData->getField< uint32_t >( row, 78 ) );
+  minPrice.push_back( exdData->getField< uint32_t >( row, 79 ) );
+  minPrice.push_back( exdData->getField< uint32_t >( row, 80 ) );
+  minPrice.push_back( exdData->getField< uint32_t >( row, 81 ) );
+  minPrice.push_back( exdData->getField< uint32_t >( row, 82 ) );
+  minPrice.push_back( exdData->getField< uint32_t >( row, 83 ) );
+  minPrice.push_back( exdData->getField< uint32_t >( row, 84 ) );
+  minPrice.push_back( exdData->getField< uint32_t >( row, 85 ) );
+  minPrice.push_back( exdData->getField< uint32_t >( row, 86 ) );
+  minPrice.push_back( exdData->getField< uint32_t >( row, 87 ) );
+  minPrice.push_back( exdData->getField< uint32_t >( row, 88 ) );
+  minPrice.push_back( exdData->getField< uint32_t >( row, 89 ) );
+  minPrice.push_back( exdData->getField< uint32_t >( row, 90 ) );
+  minPrice.push_back( exdData->getField< uint32_t >( row, 91 ) );
+  minPrice.push_back( exdData->getField< uint32_t >( row, 92 ) );
+  minPrice.push_back( exdData->getField< uint32_t >( row, 93 ) );
+  minPrice.push_back( exdData->getField< uint32_t >( row, 94 ) );
+  minPrice.push_back( exdData->getField< uint32_t >( row, 95 ) );
+  minPrice.push_back( exdData->getField< uint32_t >( row, 96 ) );
+  minPrice.push_back( exdData->getField< uint32_t >( row, 97 ) );
+  minPrice.push_back( exdData->getField< uint32_t >( row, 98 ) );
+  minPrice.push_back( exdData->getField< uint32_t >( row, 99 ) );
+  minPrice.push_back( exdData->getField< uint32_t >( row, 100 ) );
+  minPrice.push_back( exdData->getField< uint32_t >( row, 101 ) );
+  minPrice.push_back( exdData->getField< uint32_t >( row, 102 ) );
+  minPrice.push_back( exdData->getField< uint32_t >( row, 103 ) );
+  minPrice.push_back( exdData->getField< uint32_t >( row, 104 ) );
+  minPrice.push_back( exdData->getField< uint32_t >( row, 105 ) );
+  minPrice.push_back( exdData->getField< uint32_t >( row, 106 ) );
+  minPrice.push_back( exdData->getField< uint32_t >( row, 107 ) );
+  minPrice.push_back( exdData->getField< uint32_t >( row, 108 ) );
+  minPrice.push_back( exdData->getField< uint32_t >( row, 109 ) );
+  minPrice.push_back( exdData->getField< uint32_t >( row, 110 ) );
+  minPrice.push_back( exdData->getField< uint32_t >( row, 111 ) );
+  minPrice.push_back( exdData->getField< uint32_t >( row, 112 ) );
+  minPrice.push_back( exdData->getField< uint32_t >( row, 113 ) );
+  minPrice.push_back( exdData->getField< uint32_t >( row, 114 ) );
+  minPrice.push_back( exdData->getField< uint32_t >( row, 115 ) );
+  minPrice.push_back( exdData->getField< uint32_t >( row, 116 ) );
+  minPrice.push_back( exdData->getField< uint32_t >( row, 117 ) );
+  minPrice.push_back( exdData->getField< uint32_t >( row, 118 ) );
+  minPrice.push_back( exdData->getField< uint32_t >( row, 119 ) );
+  initialPrice.push_back( exdData->getField< uint32_t >( row, 300 ) );
+  initialPrice.push_back( exdData->getField< uint32_t >( row, 301 ) );
+  initialPrice.push_back( exdData->getField< uint32_t >( row, 302 ) );
+  initialPrice.push_back( exdData->getField< uint32_t >( row, 303 ) );
+  initialPrice.push_back( exdData->getField< uint32_t >( row, 304 ) );
+  initialPrice.push_back( exdData->getField< uint32_t >( row, 305 ) );
+  initialPrice.push_back( exdData->getField< uint32_t >( row, 306 ) );
+  initialPrice.push_back( exdData->getField< uint32_t >( row, 307 ) );
+  initialPrice.push_back( exdData->getField< uint32_t >( row, 308 ) );
+  initialPrice.push_back( exdData->getField< uint32_t >( row, 309 ) );
+  initialPrice.push_back( exdData->getField< uint32_t >( row, 310 ) );
+  initialPrice.push_back( exdData->getField< uint32_t >( row, 311 ) );
+  initialPrice.push_back( exdData->getField< uint32_t >( row, 312 ) );
+  initialPrice.push_back( exdData->getField< uint32_t >( row, 313 ) );
+  initialPrice.push_back( exdData->getField< uint32_t >( row, 314 ) );
+  initialPrice.push_back( exdData->getField< uint32_t >( row, 315 ) );
+  initialPrice.push_back( exdData->getField< uint32_t >( row, 316 ) );
+  initialPrice.push_back( exdData->getField< uint32_t >( row, 317 ) );
+  initialPrice.push_back( exdData->getField< uint32_t >( row, 318 ) );
+  initialPrice.push_back( exdData->getField< uint32_t >( row, 319 ) );
+  initialPrice.push_back( exdData->getField< uint32_t >( row, 320 ) );
+  initialPrice.push_back( exdData->getField< uint32_t >( row, 321 ) );
+  initialPrice.push_back( exdData->getField< uint32_t >( row, 322 ) );
+  initialPrice.push_back( exdData->getField< uint32_t >( row, 323 ) );
+  initialPrice.push_back( exdData->getField< uint32_t >( row, 324 ) );
+  initialPrice.push_back( exdData->getField< uint32_t >( row, 325 ) );
+  initialPrice.push_back( exdData->getField< uint32_t >( row, 326 ) );
+  initialPrice.push_back( exdData->getField< uint32_t >( row, 327 ) );
+  initialPrice.push_back( exdData->getField< uint32_t >( row, 328 ) );
+  initialPrice.push_back( exdData->getField< uint32_t >( row, 329 ) );
+  initialPrice.push_back( exdData->getField< uint32_t >( row, 330 ) );
+  initialPrice.push_back( exdData->getField< uint32_t >( row, 331 ) );
+  initialPrice.push_back( exdData->getField< uint32_t >( row, 332 ) );
+  initialPrice.push_back( exdData->getField< uint32_t >( row, 333 ) );
+  initialPrice.push_back( exdData->getField< uint32_t >( row, 334 ) );
+  initialPrice.push_back( exdData->getField< uint32_t >( row, 335 ) );
+  initialPrice.push_back( exdData->getField< uint32_t >( row, 336 ) );
+  initialPrice.push_back( exdData->getField< uint32_t >( row, 337 ) );
+  initialPrice.push_back( exdData->getField< uint32_t >( row, 338 ) );
+  initialPrice.push_back( exdData->getField< uint32_t >( row, 339 ) );
+  initialPrice.push_back( exdData->getField< uint32_t >( row, 340 ) );
+  initialPrice.push_back( exdData->getField< uint32_t >( row, 341 ) );
+  initialPrice.push_back( exdData->getField< uint32_t >( row, 342 ) );
+  initialPrice.push_back( exdData->getField< uint32_t >( row, 343 ) );
+  initialPrice.push_back( exdData->getField< uint32_t >( row, 344 ) );
+  initialPrice.push_back( exdData->getField< uint32_t >( row, 345 ) );
+  initialPrice.push_back( exdData->getField< uint32_t >( row, 346 ) );
+  initialPrice.push_back( exdData->getField< uint32_t >( row, 347 ) );
+  initialPrice.push_back( exdData->getField< uint32_t >( row, 348 ) );
+  initialPrice.push_back( exdData->getField< uint32_t >( row, 349 ) );
+  initialPrice.push_back( exdData->getField< uint32_t >( row, 350 ) );
+  initialPrice.push_back( exdData->getField< uint32_t >( row, 351 ) );
+  initialPrice.push_back( exdData->getField< uint32_t >( row, 352 ) );
+  initialPrice.push_back( exdData->getField< uint32_t >( row, 353 ) );
+  initialPrice.push_back( exdData->getField< uint32_t >( row, 354 ) );
+  initialPrice.push_back( exdData->getField< uint32_t >( row, 355 ) );
+  initialPrice.push_back( exdData->getField< uint32_t >( row, 356 ) );
+  initialPrice.push_back( exdData->getField< uint32_t >( row, 357 ) );
+  initialPrice.push_back( exdData->getField< uint32_t >( row, 358 ) );
+  initialPrice.push_back( exdData->getField< uint32_t >( row, 359 ) );
+}
+
+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 );
+  map = exdData->getField< uint16_t >( row, 4 );
+}
+
+Sapphire::Data::HousingMerchantPose::HousingMerchantPose( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
+{
+  auto row = exdData->m_HousingMerchantPoseDat.get_row( row_id );
+  actionTimeline = exdData->getField< uint16_t >( row, 0 );
+  pose = exdData->getField< std::string >( row, 1 );
 }
 
 Sapphire::Data::HousingPlacement::HousingPlacement( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
 {
-   auto row = exdData->m_HousingPlacementDat.get_row( row_id );
-   text = exdData->getField< std::string >( row, 0 );
+  auto row = exdData->m_HousingPlacementDat.get_row( row_id );
+  text = exdData->getField< std::string >( row, 0 );
 }
 
 Sapphire::Data::HousingPreset::HousingPreset( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
 {
-   auto row = exdData->m_HousingPresetDat.get_row( row_id );
-   singular = exdData->getField< std::string >( row, 0 );
-   adjective = exdData->getField< int8_t >( row, 1 );
-   plural = exdData->getField< std::string >( row, 2 );
-   possessivePronoun = exdData->getField< int8_t >( row, 3 );
-   startsWithVowel = exdData->getField< int8_t >( row, 4 );
-   pronoun = exdData->getField< int8_t >( row, 6 );
-   article = exdData->getField< int8_t >( row, 7 );
-   placeName = exdData->getField< uint16_t >( row, 8 );
-   housingSize = exdData->getField< uint8_t >( row, 9 );
-   exteriorRoof = exdData->getField< int32_t >( row, 10 );
-   exteriorWall = exdData->getField< int32_t >( row, 11 );
-   exteriorWindow = exdData->getField< int32_t >( row, 12 );
-   exteriorDoor = exdData->getField< int32_t >( row, 13 );
-   interiorWall = exdData->getField< int32_t >( row, 14 );
-   interiorFlooring = exdData->getField< int32_t >( row, 15 );
-   interiorLighting = exdData->getField< int32_t >( row, 16 );
-   otherFloorWall = exdData->getField< int32_t >( row, 17 );
-   otherFloorFlooring = exdData->getField< int32_t >( row, 18 );
-   otherFloorLighting = exdData->getField< int32_t >( row, 19 );
-   basementWall = exdData->getField< int32_t >( row, 20 );
-   basementFlooring = exdData->getField< int32_t >( row, 21 );
-   basementLighting = exdData->getField< int32_t >( row, 22 );
-   mansionLighting = exdData->getField< int32_t >( row, 23 );
+  auto row = exdData->m_HousingPresetDat.get_row( row_id );
+  singular = exdData->getField< std::string >( row, 0 );
+  adjective = exdData->getField< int8_t >( row, 1 );
+  plural = exdData->getField< std::string >( row, 2 );
+  possessivePronoun = exdData->getField< int8_t >( row, 3 );
+  startsWithVowel = exdData->getField< int8_t >( row, 4 );
+  pronoun = exdData->getField< int8_t >( row, 6 );
+  article = exdData->getField< int8_t >( row, 7 );
+  placeName = exdData->getField< uint16_t >( row, 8 );
+  housingSize = exdData->getField< uint8_t >( row, 9 );
+  exteriorRoof = exdData->getField< int32_t >( row, 10 );
+  exteriorWall = exdData->getField< int32_t >( row, 11 );
+  exteriorWindow = exdData->getField< int32_t >( row, 12 );
+  exteriorDoor = exdData->getField< int32_t >( row, 13 );
+  interiorWall = exdData->getField< int32_t >( row, 14 );
+  interiorFlooring = exdData->getField< int32_t >( row, 15 );
+  interiorLighting = exdData->getField< int32_t >( row, 16 );
+  otherFloorWall = exdData->getField< int32_t >( row, 17 );
+  otherFloorFlooring = exdData->getField< int32_t >( row, 18 );
+  otherFloorLighting = exdData->getField< int32_t >( row, 19 );
+  basementWall = exdData->getField< int32_t >( row, 20 );
+  basementFlooring = exdData->getField< int32_t >( row, 21 );
+  basementLighting = exdData->getField< int32_t >( row, 22 );
+  mansionLighting = exdData->getField< int32_t >( row, 23 );
 }
 
 Sapphire::Data::HousingUnitedExterior::HousingUnitedExterior( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
 {
-   auto row = exdData->m_HousingUnitedExteriorDat.get_row( row_id );
-   item.push_back( exdData->getField< uint32_t >( row, 1 ) );
-   item.push_back( exdData->getField< uint32_t >( row, 2 ) );
-   item.push_back( exdData->getField< uint32_t >( row, 3 ) );
-   item.push_back( exdData->getField< uint32_t >( row, 4 ) );
-   item.push_back( exdData->getField< uint32_t >( row, 5 ) );
-   item.push_back( exdData->getField< uint32_t >( row, 6 ) );
-   item.push_back( exdData->getField< uint32_t >( row, 7 ) );
-   item.push_back( exdData->getField< uint32_t >( row, 8 ) );
+  auto row = exdData->m_HousingUnitedExteriorDat.get_row( row_id );
+  item.push_back( exdData->getField< uint32_t >( row, 1 ) );
+  item.push_back( exdData->getField< uint32_t >( row, 2 ) );
+  item.push_back( exdData->getField< uint32_t >( row, 3 ) );
+  item.push_back( exdData->getField< uint32_t >( row, 4 ) );
+  item.push_back( exdData->getField< uint32_t >( row, 5 ) );
+  item.push_back( exdData->getField< uint32_t >( row, 6 ) );
+  item.push_back( exdData->getField< uint32_t >( row, 7 ) );
+  item.push_back( exdData->getField< uint32_t >( row, 8 ) );
 }
 
 Sapphire::Data::HousingYardObject::HousingYardObject( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
 {
-   auto row = exdData->m_HousingYardObjectDat.get_row( row_id );
-   modelKey = exdData->getField< uint8_t >( row, 0 );
-   housingItemCategory = exdData->getField< uint8_t >( row, 1 );
-   usageType = exdData->getField< uint8_t >( row, 2 );
-   usageParameter = exdData->getField< uint32_t >( row, 3 );
-   housingLayoutLimit = exdData->getField< uint8_t >( row, 4 );
-   customTalk = exdData->getField< uint32_t >( row, 5 );
-   item = exdData->getField< uint32_t >( row, 6 );
-   destroyOnRemoval = exdData->getField< bool >( row, 7 );
+  auto row = exdData->m_HousingYardObjectDat.get_row( row_id );
+  modelKey = exdData->getField< uint8_t >( row, 0 );
+  housingItemCategory = exdData->getField< uint8_t >( row, 1 );
+  usageType = exdData->getField< uint8_t >( row, 2 );
+  usageParameter = exdData->getField< uint32_t >( row, 3 );
+  customTalk = exdData->getField< uint32_t >( row, 5 );
+  item = exdData->getField< uint32_t >( row, 6 );
+  destroyOnRemoval = exdData->getField< bool >( row, 7 );
 }
 
 Sapphire::Data::HowTo::HowTo( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
 {
-   auto row = exdData->m_HowToDat.get_row( row_id );
-   images.push_back( exdData->getField< int16_t >( row, 2 ) );
-   images.push_back( exdData->getField< int16_t >( row, 3 ) );
-   images.push_back( exdData->getField< int16_t >( row, 4 ) );
-   images.push_back( exdData->getField< int16_t >( row, 5 ) );
-   images.push_back( exdData->getField< int16_t >( row, 6 ) );
-   images.push_back( exdData->getField< int16_t >( row, 7 ) );
-   images.push_back( exdData->getField< int16_t >( row, 8 ) );
-   images.push_back( exdData->getField< int16_t >( row, 9 ) );
-   images.push_back( exdData->getField< int16_t >( row, 10 ) );
-   images.push_back( exdData->getField< int16_t >( row, 11 ) );
-   category = exdData->getField< int8_t >( row, 12 );
+  auto row = exdData->m_HowToDat.get_row( row_id );
+  images.push_back( exdData->getField< int16_t >( row, 2 ) );
+  images.push_back( exdData->getField< int16_t >( row, 3 ) );
+  images.push_back( exdData->getField< int16_t >( row, 4 ) );
+  images.push_back( exdData->getField< int16_t >( row, 5 ) );
+  images.push_back( exdData->getField< int16_t >( row, 6 ) );
+  images.push_back( exdData->getField< int16_t >( row, 7 ) );
+  images.push_back( exdData->getField< int16_t >( row, 8 ) );
+  images.push_back( exdData->getField< int16_t >( row, 9 ) );
+  images.push_back( exdData->getField< int16_t >( row, 10 ) );
+  images.push_back( exdData->getField< int16_t >( row, 11 ) );
+  category = exdData->getField< int8_t >( row, 12 );
 }
 
 Sapphire::Data::HowToCategory::HowToCategory( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
 {
-   auto row = exdData->m_HowToCategoryDat.get_row( row_id );
-   category = exdData->getField< std::string >( row, 0 );
+  auto row = exdData->m_HowToCategoryDat.get_row( row_id );
+  category = exdData->getField< std::string >( row, 0 );
 }
 
 Sapphire::Data::HowToPage::HowToPage( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
 {
-   auto row = exdData->m_HowToPageDat.get_row( row_id );
-   image = exdData->getField< int32_t >( row, 2 );
+  auto row = exdData->m_HowToPageDat.get_row( row_id );
+  image = exdData->getField< int32_t >( row, 2 );
 }
 
 Sapphire::Data::InstanceContent::InstanceContent( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
 {
-   auto row = exdData->m_InstanceContentDat.get_row( row_id );
-   instanceContentType = exdData->getField< uint8_t >( row, 0 );
-   weekRestriction = exdData->getField< uint8_t >( row, 1 );
-   timeLimitmin = exdData->getField< uint16_t >( row, 2 );
-   name = exdData->getField< std::string >( row, 3 );
-   bGM = exdData->getField< uint16_t >( row, 5 );
-   winBGM = exdData->getField< uint16_t >( row, 6 );
-   cutscene = exdData->getField< uint32_t >( row, 7 );
-   order = exdData->getField< uint16_t >( row, 9 );
-   instanceContentTextDataBossStart = exdData->getField< uint32_t >( row, 12 );
-   instanceContentTextDataBossEnd = exdData->getField< uint32_t >( row, 13 );
-   bNpcBaseBoss = exdData->getField< uint32_t >( row, 14 );
-   instanceContentTextDataObjectiveStart = exdData->getField< uint32_t >( row, 15 );
-   instanceContentTextDataObjectiveEnd = exdData->getField< uint32_t >( row, 16 );
-   sortKey = exdData->getField< uint16_t >( row, 17 );
-   newPlayerBonusA = exdData->getField< uint16_t >( row, 20 );
-   newPlayerBonusB = exdData->getField< uint16_t >( row, 21 );
-   finalBossExp = exdData->getField< uint32_t >( row, 22 );
-   finalBossCurrencyA = exdData->getField< uint16_t >( row, 23 );
-   finalBossCurrencyB = exdData->getField< uint16_t >( row, 24 );
-   finalBossCurrencyC = exdData->getField< uint16_t >( row, 25 );
-   instanceClearExp = exdData->getField< uint32_t >( row, 46 );
-   instanceContentBuff = exdData->getField< int32_t >( row, 51 );
-   reqInstance = exdData->getField< uint32_t >( row, 52 );
-   partyCondition = exdData->getField< uint8_t >( row, 54 );
+  auto row = exdData->m_InstanceContentDat.get_row( row_id );
+  instanceContentType = exdData->getField< uint8_t >( row, 0 );
+  weekRestriction = exdData->getField< uint8_t >( row, 1 );
+  timeLimitmin = exdData->getField< uint16_t >( row, 2 );
+  name = exdData->getField< std::string >( row, 3 );
+  bGM = exdData->getField< uint16_t >( row, 5 );
+  winBGM = exdData->getField< uint16_t >( row, 6 );
+  cutscene = exdData->getField< uint32_t >( row, 7 );
+  order = exdData->getField< uint16_t >( row, 9 );
+  instanceContentTextDataBossStart = exdData->getField< uint32_t >( row, 12 );
+  instanceContentTextDataBossEnd = exdData->getField< uint32_t >( row, 13 );
+  bNpcBaseBoss = exdData->getField< uint32_t >( row, 14 );
+  instanceContentTextDataObjectiveStart = exdData->getField< uint32_t >( row, 15 );
+  instanceContentTextDataObjectiveEnd = exdData->getField< uint32_t >( row, 16 );
+  sortKey = exdData->getField< uint16_t >( row, 17 );
+  newPlayerBonusA = exdData->getField< uint16_t >( row, 20 );
+  newPlayerBonusB = exdData->getField< uint16_t >( row, 21 );
+  finalBossExp = exdData->getField< uint32_t >( row, 22 );
+  finalBossCurrencyA = exdData->getField< uint16_t >( row, 23 );
+  finalBossCurrencyB = exdData->getField< uint16_t >( row, 24 );
+  finalBossCurrencyC = exdData->getField< uint16_t >( row, 25 );
+  instanceClearExp = exdData->getField< uint32_t >( row, 46 );
+  instanceContentBuff = exdData->getField< int32_t >( row, 51 );
+  reqInstance = exdData->getField< uint32_t >( row, 52 );
+  partyCondition = exdData->getField< uint8_t >( row, 54 );
 }
 
 Sapphire::Data::InstanceContentBuff::InstanceContentBuff( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
 {
-   auto row = exdData->m_InstanceContentBuffDat.get_row( row_id );
-   echoStart = exdData->getField< uint16_t >( row, 0 );
-   echoDeath = exdData->getField< uint16_t >( row, 1 );
+  auto row = exdData->m_InstanceContentBuffDat.get_row( row_id );
+  echoStart = exdData->getField< uint16_t >( row, 0 );
+  echoDeath = exdData->getField< uint16_t >( row, 1 );
 }
 
 Sapphire::Data::InstanceContentCSBonus::InstanceContentCSBonus( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
 {
-   auto row = exdData->m_InstanceContentCSBonusDat.get_row( row_id );
-   instance = exdData->getField< uint16_t >( row, 0 );
-   item = exdData->getField< uint32_t >( row, 1 );
+  auto row = exdData->m_InstanceContentCSBonusDat.get_row( row_id );
+  instance = exdData->getField< uint16_t >( row, 0 );
+  item = exdData->getField< uint32_t >( row, 1 );
 }
 
 Sapphire::Data::InstanceContentGuide::InstanceContentGuide( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
 {
-   auto row = exdData->m_InstanceContentGuideDat.get_row( row_id );
-   instance = exdData->getField< uint32_t >( row, 0 );
+  auto row = exdData->m_InstanceContentGuideDat.get_row( row_id );
+  instance = exdData->getField< uint32_t >( row, 0 );
 }
 
 Sapphire::Data::InstanceContentTextData::InstanceContentTextData( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
 {
-   auto row = exdData->m_InstanceContentTextDataDat.get_row( row_id );
-   text = exdData->getField< std::string >( row, 0 );
+  auto row = exdData->m_InstanceContentTextDataDat.get_row( row_id );
+  text = exdData->getField< std::string >( row, 0 );
 }
 
 Sapphire::Data::Item::Item( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
 {
-   auto row = exdData->m_ItemDat.get_row( row_id );
-   singular = exdData->getField< std::string >( row, 0 );
-   adjective = exdData->getField< int8_t >( row, 1 );
-   plural = exdData->getField< std::string >( row, 2 );
-   possessivePronoun = exdData->getField< int8_t >( row, 3 );
-   startsWithVowel = exdData->getField< int8_t >( row, 4 );
-   pronoun = exdData->getField< int8_t >( row, 6 );
-   article = exdData->getField< int8_t >( row, 7 );
-   description = exdData->getField< std::string >( row, 8 );
-   name = exdData->getField< std::string >( row, 9 );
-   icon = exdData->getField< uint16_t >( row, 10 );
-   levelItem = exdData->getField< uint16_t >( row, 11 );
-   rarity = exdData->getField< uint8_t >( row, 12 );
-   filterGroup = exdData->getField< uint8_t >( row, 13 );
-   additionalData = exdData->getField< uint32_t >( row, 14 );
-   itemUICategory = exdData->getField< uint8_t >( row, 15 );
-   itemSearchCategory = exdData->getField< uint8_t >( row, 16 );
-   equipSlotCategory = exdData->getField< uint8_t >( row, 17 );
-   stackSize = exdData->getField< uint32_t >( row, 19 );
-   isUnique = exdData->getField< bool >( row, 20 );
-   isUntradable = exdData->getField< bool >( row, 21 );
-   isIndisposable = exdData->getField< bool >( row, 22 );
-   isEquippable = exdData->getField< bool >( row, 23 );
-   priceMid = exdData->getField< uint32_t >( row, 24 );
-   priceLow = exdData->getField< uint32_t >( row, 25 );
-   canBeHq = exdData->getField< bool >( row, 26 );
-   isDyeable = exdData->getField< bool >( row, 27 );
-   isCrestWorthy = exdData->getField< bool >( row, 28 );
-   itemAction = exdData->getField< uint16_t >( row, 29 );
-   cooldowns = exdData->getField< uint16_t >( row, 31 );
-   classJobRepair = exdData->getField< uint8_t >( row, 32 );
-   itemRepair = exdData->getField< int32_t >( row, 33 );
-   itemGlamour = exdData->getField< int32_t >( row, 34 );
-   salvage = exdData->getField< uint16_t >( row, 35 );
-   isCollectable = exdData->getField< bool >( row, 36 );
-   aetherialReduce = exdData->getField< uint16_t >( row, 37 );
-   levelEquip = exdData->getField< uint8_t >( row, 38 );
-   equipRestriction = exdData->getField< uint8_t >( row, 40 );
-   classJobCategory = exdData->getField< uint8_t >( row, 41 );
-   grandCompany = exdData->getField< uint8_t >( row, 42 );
-   itemSeries = exdData->getField< uint8_t >( row, 43 );
-   baseParamModifier = exdData->getField< uint8_t >( row, 44 );
-   modelMain = exdData->getField< uint64_t >( row, 45 );
-   modelSub = exdData->getField< uint64_t >( row, 46 );
-   classJobUse = exdData->getField< uint8_t >( row, 47 );
-   damagePhys = exdData->getField< uint16_t >( row, 49 );
-   damageMag = exdData->getField< uint16_t >( row, 50 );
-   delayms = exdData->getField< uint16_t >( row, 51 );
-   blockRate = exdData->getField< uint16_t >( row, 53 );
-   block = exdData->getField< uint16_t >( row, 54 );
-   defensePhys = exdData->getField< uint16_t >( row, 55 );
-   defenseMag = exdData->getField< uint16_t >( row, 56 );
-   itemSpecialBonus = exdData->getField< uint8_t >( row, 69 );
-   itemSpecialBonusParam = exdData->getField< uint8_t >( row, 70 );
-   materializeType = exdData->getField< uint8_t >( row, 83 );
-   materiaSlotCount = exdData->getField< uint8_t >( row, 84 );
-   isAdvancedMeldingPermitted = exdData->getField< bool >( row, 85 );
-   isPvP = exdData->getField< bool >( row, 86 );
-   isGlamourous = exdData->getField< bool >( row, 88 );
+  auto row = exdData->m_ItemDat.get_row( row_id );
+  singular = exdData->getField< std::string >( row, 0 );
+  adjective = exdData->getField< int8_t >( row, 1 );
+  plural = exdData->getField< std::string >( row, 2 );
+  possessivePronoun = exdData->getField< int8_t >( row, 3 );
+  startsWithVowel = exdData->getField< int8_t >( row, 4 );
+  pronoun = exdData->getField< int8_t >( row, 6 );
+  article = exdData->getField< int8_t >( row, 7 );
+  description = exdData->getField< std::string >( row, 8 );
+  name = exdData->getField< std::string >( row, 9 );
+  icon = exdData->getField< uint16_t >( row, 10 );
+  levelItem = exdData->getField< uint16_t >( row, 11 );
+  rarity = exdData->getField< uint8_t >( row, 12 );
+  filterGroup = exdData->getField< uint8_t >( row, 13 );
+  additionalData = exdData->getField< uint32_t >( row, 14 );
+  itemUICategory = exdData->getField< uint8_t >( row, 15 );
+  itemSearchCategory = exdData->getField< uint8_t >( row, 16 );
+  equipSlotCategory = exdData->getField< uint8_t >( row, 17 );
+  stackSize = exdData->getField< uint32_t >( row, 19 );
+  isUnique = exdData->getField< bool >( row, 20 );
+  isUntradable = exdData->getField< bool >( row, 21 );
+  isIndisposable = exdData->getField< bool >( row, 22 );
+  isEquippable = exdData->getField< bool >( row, 23 );
+  priceMid = exdData->getField< uint32_t >( row, 24 );
+  priceLow = exdData->getField< uint32_t >( row, 25 );
+  canBeHq = exdData->getField< bool >( row, 26 );
+  isDyeable = exdData->getField< bool >( row, 27 );
+  isCrestWorthy = exdData->getField< bool >( row, 28 );
+  itemAction = exdData->getField< uint16_t >( row, 29 );
+  cooldowns = exdData->getField< uint16_t >( row, 31 );
+  classJobRepair = exdData->getField< uint8_t >( row, 32 );
+  itemRepair = exdData->getField< int32_t >( row, 33 );
+  itemGlamour = exdData->getField< int32_t >( row, 34 );
+  salvage = exdData->getField< uint16_t >( row, 35 );
+  isCollectable = exdData->getField< bool >( row, 36 );
+  aetherialReduce = exdData->getField< uint16_t >( row, 37 );
+  levelEquip = exdData->getField< uint8_t >( row, 38 );
+  equipRestriction = exdData->getField< uint8_t >( row, 40 );
+  classJobCategory = exdData->getField< uint8_t >( row, 41 );
+  grandCompany = exdData->getField< uint8_t >( row, 42 );
+  itemSeries = exdData->getField< uint8_t >( row, 43 );
+  baseParamModifier = exdData->getField< uint8_t >( row, 44 );
+  modelMain = exdData->getField< uint64_t >( row, 45 );
+  modelSub = exdData->getField< uint64_t >( row, 46 );
+  classJobUse = exdData->getField< uint8_t >( row, 47 );
+  damagePhys = exdData->getField< uint16_t >( row, 49 );
+  damageMag = exdData->getField< uint16_t >( row, 50 );
+  delayms = exdData->getField< uint16_t >( row, 51 );
+  blockRate = exdData->getField< uint16_t >( row, 53 );
+  block = exdData->getField< uint16_t >( row, 54 );
+  defensePhys = exdData->getField< uint16_t >( row, 55 );
+  defenseMag = exdData->getField< uint16_t >( row, 56 );
+  itemSpecialBonus = exdData->getField< uint8_t >( row, 69 );
+  itemSpecialBonusParam = exdData->getField< uint8_t >( row, 70 );
+  materializeType = exdData->getField< uint8_t >( row, 83 );
+  materiaSlotCount = exdData->getField< uint8_t >( row, 84 );
+  isAdvancedMeldingPermitted = exdData->getField< bool >( row, 85 );
+  isPvP = exdData->getField< bool >( row, 86 );
+  isGlamourous = exdData->getField< bool >( row, 88 );
 
-   for( int i = 0; i < 6; ++i )
-   {
-     param[i].baseparam = exdData->getField< uint8_t >( row, 57 + i * 2 );
-     param[i].value = exdData->getField< int16_t >( row, 58 + i * 2 );
-   }
+  for( int i = 0; i < 6; ++i )
+  {
+    param[i].baseparam = exdData->getField< uint8_t >( row, 57 + i * 2 );
+    param[i].value = exdData->getField< int16_t >( row, 58 + i * 2 );
+  }
 }
 
 Sapphire::Data::ItemAction::ItemAction( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
 {
-   auto row = exdData->m_ItemActionDat.get_row( row_id );
-   type = exdData->getField< uint16_t >( row, 4 );
-   data.push_back( exdData->getField< uint16_t >( row, 5 ) );
-   data.push_back( exdData->getField< uint16_t >( row, 6 ) );
-   data.push_back( exdData->getField< uint16_t >( row, 7 ) );
-   data.push_back( exdData->getField< uint16_t >( row, 8 ) );
-   data.push_back( exdData->getField< uint16_t >( row, 9 ) );
-   data.push_back( exdData->getField< uint16_t >( row, 10 ) );
-   data.push_back( exdData->getField< uint16_t >( row, 11 ) );
-   data.push_back( exdData->getField< uint16_t >( row, 12 ) );
-   data.push_back( exdData->getField< uint16_t >( row, 13 ) );
-   dataHQ.push_back( exdData->getField< uint16_t >( row, 14 ) );
-   dataHQ.push_back( exdData->getField< uint16_t >( row, 15 ) );
-   dataHQ.push_back( exdData->getField< uint16_t >( row, 16 ) );
-   dataHQ.push_back( exdData->getField< uint16_t >( row, 17 ) );
-   dataHQ.push_back( exdData->getField< uint16_t >( row, 18 ) );
-   dataHQ.push_back( exdData->getField< uint16_t >( row, 19 ) );
-   dataHQ.push_back( exdData->getField< uint16_t >( row, 20 ) );
-   dataHQ.push_back( exdData->getField< uint16_t >( row, 21 ) );
-   dataHQ.push_back( exdData->getField< uint16_t >( row, 22 ) );
+  auto row = exdData->m_ItemActionDat.get_row( row_id );
+  type = exdData->getField< uint16_t >( row, 4 );
+  data.push_back( exdData->getField< uint16_t >( row, 5 ) );
+  data.push_back( exdData->getField< uint16_t >( row, 6 ) );
+  data.push_back( exdData->getField< uint16_t >( row, 7 ) );
+  data.push_back( exdData->getField< uint16_t >( row, 8 ) );
+  data.push_back( exdData->getField< uint16_t >( row, 9 ) );
+  data.push_back( exdData->getField< uint16_t >( row, 10 ) );
+  data.push_back( exdData->getField< uint16_t >( row, 11 ) );
+  data.push_back( exdData->getField< uint16_t >( row, 12 ) );
+  data.push_back( exdData->getField< uint16_t >( row, 13 ) );
+  dataHQ.push_back( exdData->getField< uint16_t >( row, 14 ) );
+  dataHQ.push_back( exdData->getField< uint16_t >( row, 15 ) );
+  dataHQ.push_back( exdData->getField< uint16_t >( row, 16 ) );
+  dataHQ.push_back( exdData->getField< uint16_t >( row, 17 ) );
+  dataHQ.push_back( exdData->getField< uint16_t >( row, 18 ) );
+  dataHQ.push_back( exdData->getField< uint16_t >( row, 19 ) );
+  dataHQ.push_back( exdData->getField< uint16_t >( row, 20 ) );
+  dataHQ.push_back( exdData->getField< uint16_t >( row, 21 ) );
+  dataHQ.push_back( exdData->getField< uint16_t >( row, 22 ) );
 }
 
 Sapphire::Data::ItemFood::ItemFood( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
 {
-   auto row = exdData->m_ItemFoodDat.get_row( row_id );
+  auto row = exdData->m_ItemFoodDat.get_row( row_id );
+  eXPBonus = exdData->getField< uint8_t >( row, 0 );
 }
 
 Sapphire::Data::ItemLevel::ItemLevel( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
 {
-   auto row = exdData->m_ItemLevelDat.get_row( row_id );
-   strength = exdData->getField< uint16_t >( row, 0 );
-   dexterity = exdData->getField< uint16_t >( row, 1 );
-   vitality = exdData->getField< uint16_t >( row, 2 );
-   intelligence = exdData->getField< uint16_t >( row, 3 );
-   mind = exdData->getField< uint16_t >( row, 4 );
-   piety = exdData->getField< uint16_t >( row, 5 );
-   hP = exdData->getField< uint16_t >( row, 6 );
-   mP = exdData->getField< uint16_t >( row, 7 );
-   tP = exdData->getField< uint16_t >( row, 8 );
-   gP = exdData->getField< uint16_t >( row, 9 );
-   cP = exdData->getField< uint16_t >( row, 10 );
-   physicalDamage = exdData->getField< uint16_t >( row, 11 );
-   magicalDamage = exdData->getField< uint16_t >( row, 12 );
-   delay = exdData->getField< uint16_t >( row, 13 );
-   additionalEffect = exdData->getField< uint16_t >( row, 14 );
-   attackSpeed = exdData->getField< uint16_t >( row, 15 );
-   blockRate = exdData->getField< uint16_t >( row, 16 );
-   blockStrength = exdData->getField< uint16_t >( row, 17 );
-   tenacity = exdData->getField< uint16_t >( row, 18 );
-   attackPower = exdData->getField< uint16_t >( row, 19 );
-   defense = exdData->getField< uint16_t >( row, 20 );
-   directHitRate = exdData->getField< uint16_t >( row, 21 );
-   evasion = exdData->getField< uint16_t >( row, 22 );
-   magicDefense = exdData->getField< uint16_t >( row, 23 );
-   criticalHitPower = exdData->getField< uint16_t >( row, 24 );
-   criticalHitResilience = exdData->getField< uint16_t >( row, 25 );
-   criticalHit = exdData->getField< uint16_t >( row, 26 );
-   criticalHitEvasion = exdData->getField< uint16_t >( row, 27 );
-   slashingResistance = exdData->getField< uint16_t >( row, 28 );
-   piercingResistance = exdData->getField< uint16_t >( row, 29 );
-   bluntResistance = exdData->getField< uint16_t >( row, 30 );
-   projectileResistance = exdData->getField< uint16_t >( row, 31 );
-   attackMagicPotency = exdData->getField< uint16_t >( row, 32 );
-   healingMagicPotency = exdData->getField< uint16_t >( row, 33 );
-   enhancementMagicPotency = exdData->getField< uint16_t >( row, 34 );
-   enfeeblingMagicPotency = exdData->getField< uint16_t >( row, 35 );
-   fireResistance = exdData->getField< uint16_t >( row, 36 );
-   iceResistance = exdData->getField< uint16_t >( row, 37 );
-   windResistance = exdData->getField< uint16_t >( row, 38 );
-   earthResistance = exdData->getField< uint16_t >( row, 39 );
-   lightningResistance = exdData->getField< uint16_t >( row, 40 );
-   waterResistance = exdData->getField< uint16_t >( row, 41 );
-   magicResistance = exdData->getField< uint16_t >( row, 42 );
-   determination = exdData->getField< uint16_t >( row, 43 );
-   skillSpeed = exdData->getField< uint16_t >( row, 44 );
-   spellSpeed = exdData->getField< uint16_t >( row, 45 );
-   haste = exdData->getField< uint16_t >( row, 46 );
-   morale = exdData->getField< uint16_t >( row, 47 );
-   enmity = exdData->getField< uint16_t >( row, 48 );
-   enmityReduction = exdData->getField< uint16_t >( row, 49 );
-   carefulDesynthesis = exdData->getField< uint16_t >( row, 50 );
-   eXPBonus = exdData->getField< uint16_t >( row, 51 );
-   regen = exdData->getField< uint16_t >( row, 52 );
-   refresh = exdData->getField< uint16_t >( row, 53 );
-   movementSpeed = exdData->getField< uint16_t >( row, 54 );
-   spikes = exdData->getField< uint16_t >( row, 55 );
-   slowResistance = exdData->getField< uint16_t >( row, 56 );
-   petrificationResistance = exdData->getField< uint16_t >( row, 57 );
-   paralysisResistance = exdData->getField< uint16_t >( row, 58 );
-   silenceResistance = exdData->getField< uint16_t >( row, 59 );
-   blindResistance = exdData->getField< uint16_t >( row, 60 );
-   poisonResistance = exdData->getField< uint16_t >( row, 61 );
-   stunResistance = exdData->getField< uint16_t >( row, 62 );
-   sleepResistance = exdData->getField< uint16_t >( row, 63 );
-   bindResistance = exdData->getField< uint16_t >( row, 64 );
-   heavyResistance = exdData->getField< uint16_t >( row, 65 );
-   doomResistance = exdData->getField< uint16_t >( row, 66 );
-   reducedDurabilityLoss = exdData->getField< uint16_t >( row, 67 );
-   increasedSpiritbondGain = exdData->getField< uint16_t >( row, 68 );
-   craftsmanship = exdData->getField< uint16_t >( row, 69 );
-   control = exdData->getField< uint16_t >( row, 70 );
-   gathering = exdData->getField< uint16_t >( row, 71 );
-   perception = exdData->getField< uint16_t >( row, 72 );
+  auto row = exdData->m_ItemLevelDat.get_row( row_id );
+  strength = exdData->getField< uint16_t >( row, 0 );
+  dexterity = exdData->getField< uint16_t >( row, 1 );
+  vitality = exdData->getField< uint16_t >( row, 2 );
+  intelligence = exdData->getField< uint16_t >( row, 3 );
+  mind = exdData->getField< uint16_t >( row, 4 );
+  piety = exdData->getField< uint16_t >( row, 5 );
+  hP = exdData->getField< uint16_t >( row, 6 );
+  mP = exdData->getField< uint16_t >( row, 7 );
+  tP = exdData->getField< uint16_t >( row, 8 );
+  gP = exdData->getField< uint16_t >( row, 9 );
+  cP = exdData->getField< uint16_t >( row, 10 );
+  physicalDamage = exdData->getField< uint16_t >( row, 11 );
+  magicalDamage = exdData->getField< uint16_t >( row, 12 );
+  delay = exdData->getField< uint16_t >( row, 13 );
+  additionalEffect = exdData->getField< uint16_t >( row, 14 );
+  attackSpeed = exdData->getField< uint16_t >( row, 15 );
+  blockRate = exdData->getField< uint16_t >( row, 16 );
+  blockStrength = exdData->getField< uint16_t >( row, 17 );
+  tenacity = exdData->getField< uint16_t >( row, 18 );
+  attackPower = exdData->getField< uint16_t >( row, 19 );
+  defense = exdData->getField< uint16_t >( row, 20 );
+  directHitRate = exdData->getField< uint16_t >( row, 21 );
+  evasion = exdData->getField< uint16_t >( row, 22 );
+  magicDefense = exdData->getField< uint16_t >( row, 23 );
+  criticalHitPower = exdData->getField< uint16_t >( row, 24 );
+  criticalHitResilience = exdData->getField< uint16_t >( row, 25 );
+  criticalHit = exdData->getField< uint16_t >( row, 26 );
+  criticalHitEvasion = exdData->getField< uint16_t >( row, 27 );
+  slashingResistance = exdData->getField< uint16_t >( row, 28 );
+  piercingResistance = exdData->getField< uint16_t >( row, 29 );
+  bluntResistance = exdData->getField< uint16_t >( row, 30 );
+  projectileResistance = exdData->getField< uint16_t >( row, 31 );
+  attackMagicPotency = exdData->getField< uint16_t >( row, 32 );
+  healingMagicPotency = exdData->getField< uint16_t >( row, 33 );
+  enhancementMagicPotency = exdData->getField< uint16_t >( row, 34 );
+  enfeeblingMagicPotency = exdData->getField< uint16_t >( row, 35 );
+  fireResistance = exdData->getField< uint16_t >( row, 36 );
+  iceResistance = exdData->getField< uint16_t >( row, 37 );
+  windResistance = exdData->getField< uint16_t >( row, 38 );
+  earthResistance = exdData->getField< uint16_t >( row, 39 );
+  lightningResistance = exdData->getField< uint16_t >( row, 40 );
+  waterResistance = exdData->getField< uint16_t >( row, 41 );
+  magicResistance = exdData->getField< uint16_t >( row, 42 );
+  determination = exdData->getField< uint16_t >( row, 43 );
+  skillSpeed = exdData->getField< uint16_t >( row, 44 );
+  spellSpeed = exdData->getField< uint16_t >( row, 45 );
+  haste = exdData->getField< uint16_t >( row, 46 );
+  morale = exdData->getField< uint16_t >( row, 47 );
+  enmity = exdData->getField< uint16_t >( row, 48 );
+  enmityReduction = exdData->getField< uint16_t >( row, 49 );
+  carefulDesynthesis = exdData->getField< uint16_t >( row, 50 );
+  eXPBonus = exdData->getField< uint16_t >( row, 51 );
+  regen = exdData->getField< uint16_t >( row, 52 );
+  refresh = exdData->getField< uint16_t >( row, 53 );
+  movementSpeed = exdData->getField< uint16_t >( row, 54 );
+  spikes = exdData->getField< uint16_t >( row, 55 );
+  slowResistance = exdData->getField< uint16_t >( row, 56 );
+  petrificationResistance = exdData->getField< uint16_t >( row, 57 );
+  paralysisResistance = exdData->getField< uint16_t >( row, 58 );
+  silenceResistance = exdData->getField< uint16_t >( row, 59 );
+  blindResistance = exdData->getField< uint16_t >( row, 60 );
+  poisonResistance = exdData->getField< uint16_t >( row, 61 );
+  stunResistance = exdData->getField< uint16_t >( row, 62 );
+  sleepResistance = exdData->getField< uint16_t >( row, 63 );
+  bindResistance = exdData->getField< uint16_t >( row, 64 );
+  heavyResistance = exdData->getField< uint16_t >( row, 65 );
+  doomResistance = exdData->getField< uint16_t >( row, 66 );
+  reducedDurabilityLoss = exdData->getField< uint16_t >( row, 67 );
+  increasedSpiritbondGain = exdData->getField< uint16_t >( row, 68 );
+  craftsmanship = exdData->getField< uint16_t >( row, 69 );
+  control = exdData->getField< uint16_t >( row, 70 );
+  gathering = exdData->getField< uint16_t >( row, 71 );
+  perception = exdData->getField< uint16_t >( row, 72 );
 }
 
 Sapphire::Data::ItemSearchCategory::ItemSearchCategory( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
 {
-   auto row = exdData->m_ItemSearchCategoryDat.get_row( row_id );
-   name = exdData->getField< std::string >( row, 0 );
-   icon = exdData->getField< int32_t >( row, 1 );
-   category = exdData->getField< uint8_t >( row, 2 );
-   order = exdData->getField< uint8_t >( row, 3 );
-   classJob = exdData->getField< int8_t >( row, 4 );
+  auto row = exdData->m_ItemSearchCategoryDat.get_row( row_id );
+  name = exdData->getField< std::string >( row, 0 );
+  icon = exdData->getField< int32_t >( row, 1 );
+  category = exdData->getField< uint8_t >( row, 2 );
+  order = exdData->getField< uint8_t >( row, 3 );
+  classJob = exdData->getField< int8_t >( row, 4 );
 }
 
 Sapphire::Data::ItemSeries::ItemSeries( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
 {
-   auto row = exdData->m_ItemSeriesDat.get_row( row_id );
-   name = exdData->getField< std::string >( row, 0 );
+  auto row = exdData->m_ItemSeriesDat.get_row( row_id );
+  name = exdData->getField< std::string >( row, 0 );
 }
 
 Sapphire::Data::ItemSpecialBonus::ItemSpecialBonus( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
 {
-   auto row = exdData->m_ItemSpecialBonusDat.get_row( row_id );
-   name = exdData->getField< std::string >( row, 0 );
+  auto row = exdData->m_ItemSpecialBonusDat.get_row( row_id );
+  name = exdData->getField< std::string >( row, 0 );
 }
 
 Sapphire::Data::ItemUICategory::ItemUICategory( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
 {
-   auto row = exdData->m_ItemUICategoryDat.get_row( row_id );
-   name = exdData->getField< std::string >( row, 0 );
-   icon = exdData->getField< int32_t >( row, 1 );
-   orderMinor = exdData->getField< uint8_t >( row, 2 );
-   orderMajor = exdData->getField< uint8_t >( row, 3 );
+  auto row = exdData->m_ItemUICategoryDat.get_row( row_id );
+  name = exdData->getField< std::string >( row, 0 );
+  icon = exdData->getField< int32_t >( row, 1 );
+  orderMinor = exdData->getField< uint8_t >( row, 2 );
+  orderMajor = exdData->getField< uint8_t >( row, 3 );
 }
 
 Sapphire::Data::JournalCategory::JournalCategory( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
 {
-   auto row = exdData->m_JournalCategoryDat.get_row( row_id );
-   name = exdData->getField< std::string >( row, 0 );
-   journalSection = exdData->getField< uint8_t >( row, 3 );
+  auto row = exdData->m_JournalCategoryDat.get_row( row_id );
+  name = exdData->getField< std::string >( row, 0 );
+  journalSection = exdData->getField< uint8_t >( row, 3 );
 }
 
 Sapphire::Data::JournalGenre::JournalGenre( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
 {
-   auto row = exdData->m_JournalGenreDat.get_row( row_id );
-   icon = exdData->getField< int32_t >( row, 0 );
-   journalCategory = exdData->getField< uint8_t >( row, 1 );
-   name = exdData->getField< std::string >( row, 2 );
+  auto row = exdData->m_JournalGenreDat.get_row( row_id );
+  icon = exdData->getField< int32_t >( row, 0 );
+  journalCategory = exdData->getField< uint8_t >( row, 1 );
+  name = exdData->getField< std::string >( row, 2 );
 }
 
 Sapphire::Data::JournalSection::JournalSection( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
 {
-   auto row = exdData->m_JournalSectionDat.get_row( row_id );
-   name = exdData->getField< std::string >( row, 0 );
+  auto row = exdData->m_JournalSectionDat.get_row( row_id );
+  name = exdData->getField< std::string >( row, 0 );
 }
 
 Sapphire::Data::Leve::Leve( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
 {
-   auto row = exdData->m_LeveDat.get_row( row_id );
-   name = exdData->getField< std::string >( row, 0 );
-   description = exdData->getField< std::string >( row, 1 );
-   leveClient = exdData->getField< int32_t >( row, 2 );
-   leveAssignmentType = exdData->getField< int32_t >( row, 3 );
-   classJobLevel = exdData->getField< uint16_t >( row, 5 );
-   allowanceCost = exdData->getField< uint8_t >( row, 7 );
-   placeNameStart = exdData->getField< int32_t >( row, 9 );
-   placeNameIssued = exdData->getField< int32_t >( row, 10 );
-   classJobCategory = exdData->getField< uint8_t >( row, 12 );
-   journalGenre = exdData->getField< int32_t >( row, 13 );
-   placeNameStartZone = exdData->getField< int32_t >( row, 15 );
-   iconCityState = exdData->getField< int32_t >( row, 16 );
-   dataId = exdData->getField< int32_t >( row, 17 );
-   expReward = exdData->getField< uint32_t >( row, 21 );
-   gilReward = exdData->getField< uint32_t >( row, 22 );
-   leveRewardItem = exdData->getField< uint16_t >( row, 23 );
-   leveVfx = exdData->getField< uint8_t >( row, 24 );
-   leveVfxFrame = exdData->getField< uint8_t >( row, 25 );
-   levelLevemete = exdData->getField< uint32_t >( row, 26 );
-   iconIssuer = exdData->getField< int32_t >( row, 27 );
-   levelStart = exdData->getField< uint32_t >( row, 29 );
-   bGM = exdData->getField< uint16_t >( row, 30 );
+  auto row = exdData->m_LeveDat.get_row( row_id );
+  name = exdData->getField< std::string >( row, 0 );
+  description = exdData->getField< std::string >( row, 1 );
+  leveClient = exdData->getField< int32_t >( row, 2 );
+  leveAssignmentType = exdData->getField< int32_t >( row, 3 );
+  classJobLevel = exdData->getField< uint16_t >( row, 5 );
+  allowanceCost = exdData->getField< uint8_t >( row, 7 );
+  placeNameStart = exdData->getField< int32_t >( row, 9 );
+  placeNameIssued = exdData->getField< int32_t >( row, 10 );
+  classJobCategory = exdData->getField< uint8_t >( row, 12 );
+  journalGenre = exdData->getField< int32_t >( row, 13 );
+  placeNameStartZone = exdData->getField< int32_t >( row, 15 );
+  iconCityState = exdData->getField< int32_t >( row, 16 );
+  dataId = exdData->getField< int32_t >( row, 17 );
+  expReward = exdData->getField< uint32_t >( row, 21 );
+  gilReward = exdData->getField< uint32_t >( row, 22 );
+  leveRewardItem = exdData->getField< uint16_t >( row, 23 );
+  leveVfx = exdData->getField< uint8_t >( row, 24 );
+  leveVfxFrame = exdData->getField< uint8_t >( row, 25 );
+  levelLevemete = exdData->getField< uint32_t >( row, 26 );
+  iconIssuer = exdData->getField< int32_t >( row, 27 );
+  levelStart = exdData->getField< uint32_t >( row, 29 );
+  bGM = exdData->getField< uint16_t >( row, 30 );
 }
 
 Sapphire::Data::LeveAssignmentType::LeveAssignmentType( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
 {
-   auto row = exdData->m_LeveAssignmentTypeDat.get_row( row_id );
-   isFaction = exdData->getField< bool >( row, 0 );
-   icon = exdData->getField< int32_t >( row, 1 );
-   name = exdData->getField< std::string >( row, 2 );
+  auto row = exdData->m_LeveAssignmentTypeDat.get_row( row_id );
+  isFaction = exdData->getField< bool >( row, 0 );
+  icon = exdData->getField< int32_t >( row, 1 );
+  name = exdData->getField< std::string >( row, 2 );
 }
 
 Sapphire::Data::LeveClient::LeveClient( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
 {
-   auto row = exdData->m_LeveClientDat.get_row( row_id );
-   name = exdData->getField< std::string >( row, 0 );
+  auto row = exdData->m_LeveClientDat.get_row( row_id );
+  name = exdData->getField< std::string >( row, 0 );
 }
 
 Sapphire::Data::Level::Level( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
 {
-   auto row = exdData->m_LevelDat.get_row( row_id );
-   x = exdData->getField< float >( row, 0 );
-   y = exdData->getField< float >( row, 1 );
-   z = exdData->getField< float >( row, 2 );
-   yaw = exdData->getField< float >( row, 3 );
-   radius = exdData->getField< float >( row, 4 );
-   type = exdData->getField< uint8_t >( row, 5 );
-   object = exdData->getField< uint32_t >( row, 6 );
-   map = exdData->getField< uint16_t >( row, 7 );
-   eventId = exdData->getField< uint32_t >( row, 8 );
-   territory = exdData->getField< uint16_t >( row, 9 );
+  auto row = exdData->m_LevelDat.get_row( row_id );
+  x = exdData->getField< float >( row, 0 );
+  y = exdData->getField< float >( row, 1 );
+  z = exdData->getField< float >( row, 2 );
+  yaw = exdData->getField< float >( row, 3 );
+  radius = exdData->getField< float >( row, 4 );
+  type = exdData->getField< uint8_t >( row, 5 );
+  object = exdData->getField< uint32_t >( row, 6 );
+  map = exdData->getField< uint16_t >( row, 7 );
+  eventId = exdData->getField< uint32_t >( row, 8 );
+  territory = exdData->getField< uint16_t >( row, 9 );
 }
 
 Sapphire::Data::LeveRewardItem::LeveRewardItem( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
 {
-   auto row = exdData->m_LeveRewardItemDat.get_row( row_id );
+  auto row = exdData->m_LeveRewardItemDat.get_row( row_id );
 }
 
 Sapphire::Data::LeveRewardItemGroup::LeveRewardItemGroup( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
 {
-   auto row = exdData->m_LeveRewardItemGroupDat.get_row( row_id );
+  auto row = exdData->m_LeveRewardItemGroupDat.get_row( row_id );
 }
 
 Sapphire::Data::LeveVfx::LeveVfx( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
 {
-   auto row = exdData->m_LeveVfxDat.get_row( row_id );
-   effect = exdData->getField< std::string >( row, 0 );
-   icon = exdData->getField< int32_t >( row, 1 );
+  auto row = exdData->m_LeveVfxDat.get_row( row_id );
+  effect = exdData->getField< std::string >( row, 0 );
+  icon = exdData->getField< int32_t >( row, 1 );
 }
 
 Sapphire::Data::LogFilter::LogFilter( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
 {
-   auto row = exdData->m_LogFilterDat.get_row( row_id );
-   logKind = exdData->getField< uint8_t >( row, 0 );
-   name = exdData->getField< std::string >( row, 6 );
-   example = exdData->getField< std::string >( row, 7 );
+  auto row = exdData->m_LogFilterDat.get_row( row_id );
+  logKind = exdData->getField< uint8_t >( row, 0 );
+  name = exdData->getField< std::string >( row, 6 );
+  example = exdData->getField< std::string >( row, 7 );
 }
 
 Sapphire::Data::LogKind::LogKind( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
 {
-   auto row = exdData->m_LogKindDat.get_row( row_id );
-   format = exdData->getField< std::string >( row, 1 );
-   name = exdData->getField< std::string >( row, 2 );
-   example = exdData->getField< std::string >( row, 3 );
-   logKindCategoryText = exdData->getField< uint8_t >( row, 4 );
+  auto row = exdData->m_LogKindDat.get_row( row_id );
+  format = exdData->getField< std::string >( row, 1 );
+  name = exdData->getField< std::string >( row, 2 );
+  example = exdData->getField< std::string >( row, 3 );
+  logKindCategoryText = exdData->getField< uint8_t >( row, 4 );
 }
 
 Sapphire::Data::LogKindCategoryText::LogKindCategoryText( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
 {
-   auto row = exdData->m_LogKindCategoryTextDat.get_row( row_id );
-   text = exdData->getField< std::string >( row, 0 );
+  auto row = exdData->m_LogKindCategoryTextDat.get_row( row_id );
+  text = exdData->getField< std::string >( row, 0 );
 }
 
 Sapphire::Data::LogMessage::LogMessage( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
 {
-   auto row = exdData->m_LogMessageDat.get_row( row_id );
-   logKind = exdData->getField< uint16_t >( row, 0 );
-   text = exdData->getField< std::string >( row, 4 );
+  auto row = exdData->m_LogMessageDat.get_row( row_id );
+  logKind = exdData->getField< uint16_t >( row, 0 );
+  text = exdData->getField< std::string >( row, 4 );
 }
 
 Sapphire::Data::LotteryExchangeShop::LotteryExchangeShop( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
 {
-   auto row = exdData->m_LotteryExchangeShopDat.get_row( row_id );
-   itemAccepted.push_back( exdData->getField< int32_t >( row, 1 ) );
-   itemAccepted.push_back( exdData->getField< int32_t >( row, 2 ) );
-   itemAccepted.push_back( exdData->getField< int32_t >( row, 3 ) );
-   itemAccepted.push_back( exdData->getField< int32_t >( row, 4 ) );
-   itemAccepted.push_back( exdData->getField< int32_t >( row, 5 ) );
-   itemAccepted.push_back( exdData->getField< int32_t >( row, 6 ) );
-   itemAccepted.push_back( exdData->getField< int32_t >( row, 7 ) );
-   itemAccepted.push_back( exdData->getField< int32_t >( row, 8 ) );
-   itemAccepted.push_back( exdData->getField< int32_t >( row, 9 ) );
-   itemAccepted.push_back( exdData->getField< int32_t >( row, 10 ) );
-   itemAccepted.push_back( exdData->getField< int32_t >( row, 11 ) );
-   itemAccepted.push_back( exdData->getField< int32_t >( row, 12 ) );
-   itemAccepted.push_back( exdData->getField< int32_t >( row, 13 ) );
-   itemAccepted.push_back( exdData->getField< int32_t >( row, 14 ) );
-   itemAccepted.push_back( exdData->getField< int32_t >( row, 15 ) );
-   itemAccepted.push_back( exdData->getField< int32_t >( row, 16 ) );
-   amountAccepted.push_back( exdData->getField< uint32_t >( row, 17 ) );
-   amountAccepted.push_back( exdData->getField< uint32_t >( row, 18 ) );
-   amountAccepted.push_back( exdData->getField< uint32_t >( row, 19 ) );
-   amountAccepted.push_back( exdData->getField< uint32_t >( row, 20 ) );
-   amountAccepted.push_back( exdData->getField< uint32_t >( row, 21 ) );
-   amountAccepted.push_back( exdData->getField< uint32_t >( row, 22 ) );
-   amountAccepted.push_back( exdData->getField< uint32_t >( row, 23 ) );
-   amountAccepted.push_back( exdData->getField< uint32_t >( row, 24 ) );
-   amountAccepted.push_back( exdData->getField< uint32_t >( row, 25 ) );
-   amountAccepted.push_back( exdData->getField< uint32_t >( row, 26 ) );
-   amountAccepted.push_back( exdData->getField< uint32_t >( row, 27 ) );
-   amountAccepted.push_back( exdData->getField< uint32_t >( row, 28 ) );
-   amountAccepted.push_back( exdData->getField< uint32_t >( row, 29 ) );
-   amountAccepted.push_back( exdData->getField< uint32_t >( row, 30 ) );
-   amountAccepted.push_back( exdData->getField< uint32_t >( row, 31 ) );
-   amountAccepted.push_back( exdData->getField< uint32_t >( row, 32 ) );
+  auto row = exdData->m_LotteryExchangeShopDat.get_row( row_id );
+  itemAccepted.push_back( exdData->getField< int32_t >( row, 1 ) );
+  itemAccepted.push_back( exdData->getField< int32_t >( row, 2 ) );
+  itemAccepted.push_back( exdData->getField< int32_t >( row, 3 ) );
+  itemAccepted.push_back( exdData->getField< int32_t >( row, 4 ) );
+  itemAccepted.push_back( exdData->getField< int32_t >( row, 5 ) );
+  itemAccepted.push_back( exdData->getField< int32_t >( row, 6 ) );
+  itemAccepted.push_back( exdData->getField< int32_t >( row, 7 ) );
+  itemAccepted.push_back( exdData->getField< int32_t >( row, 8 ) );
+  itemAccepted.push_back( exdData->getField< int32_t >( row, 9 ) );
+  itemAccepted.push_back( exdData->getField< int32_t >( row, 10 ) );
+  itemAccepted.push_back( exdData->getField< int32_t >( row, 11 ) );
+  itemAccepted.push_back( exdData->getField< int32_t >( row, 12 ) );
+  itemAccepted.push_back( exdData->getField< int32_t >( row, 13 ) );
+  itemAccepted.push_back( exdData->getField< int32_t >( row, 14 ) );
+  itemAccepted.push_back( exdData->getField< int32_t >( row, 15 ) );
+  itemAccepted.push_back( exdData->getField< int32_t >( row, 16 ) );
+  amountAccepted.push_back( exdData->getField< uint32_t >( row, 17 ) );
+  amountAccepted.push_back( exdData->getField< uint32_t >( row, 18 ) );
+  amountAccepted.push_back( exdData->getField< uint32_t >( row, 19 ) );
+  amountAccepted.push_back( exdData->getField< uint32_t >( row, 20 ) );
+  amountAccepted.push_back( exdData->getField< uint32_t >( row, 21 ) );
+  amountAccepted.push_back( exdData->getField< uint32_t >( row, 22 ) );
+  amountAccepted.push_back( exdData->getField< uint32_t >( row, 23 ) );
+  amountAccepted.push_back( exdData->getField< uint32_t >( row, 24 ) );
+  amountAccepted.push_back( exdData->getField< uint32_t >( row, 25 ) );
+  amountAccepted.push_back( exdData->getField< uint32_t >( row, 26 ) );
+  amountAccepted.push_back( exdData->getField< uint32_t >( row, 27 ) );
+  amountAccepted.push_back( exdData->getField< uint32_t >( row, 28 ) );
+  amountAccepted.push_back( exdData->getField< uint32_t >( row, 29 ) );
+  amountAccepted.push_back( exdData->getField< uint32_t >( row, 30 ) );
+  amountAccepted.push_back( exdData->getField< uint32_t >( row, 31 ) );
+  amountAccepted.push_back( exdData->getField< uint32_t >( row, 32 ) );
 }
 
 Sapphire::Data::MacroIcon::MacroIcon( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
 {
-   auto row = exdData->m_MacroIconDat.get_row( row_id );
-   icon = exdData->getField< int32_t >( row, 0 );
+  auto row = exdData->m_MacroIconDat.get_row( row_id );
+  icon = exdData->getField< int32_t >( row, 0 );
 }
 
 Sapphire::Data::MacroIconRedirectOld::MacroIconRedirectOld( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
 {
-   auto row = exdData->m_MacroIconRedirectOldDat.get_row( row_id );
-   iconOld = exdData->getField< uint32_t >( row, 0 );
-   iconNew = exdData->getField< int32_t >( row, 1 );
+  auto row = exdData->m_MacroIconRedirectOldDat.get_row( row_id );
+  iconOld = exdData->getField< uint32_t >( row, 0 );
+  iconNew = exdData->getField< int32_t >( row, 1 );
 }
 
 Sapphire::Data::MainCommand::MainCommand( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
 {
-   auto row = exdData->m_MainCommandDat.get_row( row_id );
-   icon = exdData->getField< int32_t >( row, 0 );
-   mainCommandCategory = exdData->getField< uint8_t >( row, 2 );
-   name = exdData->getField< std::string >( row, 4 );
-   description = exdData->getField< std::string >( row, 5 );
+  auto row = exdData->m_MainCommandDat.get_row( row_id );
+  icon = exdData->getField< int32_t >( row, 0 );
+  mainCommandCategory = exdData->getField< uint8_t >( row, 2 );
+  name = exdData->getField< std::string >( row, 4 );
+  description = exdData->getField< std::string >( row, 5 );
 }
 
 Sapphire::Data::MainCommandCategory::MainCommandCategory( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
 {
-   auto row = exdData->m_MainCommandCategoryDat.get_row( row_id );
-   name = exdData->getField< std::string >( row, 1 );
+  auto row = exdData->m_MainCommandCategoryDat.get_row( row_id );
+  name = exdData->getField< std::string >( row, 1 );
 }
 
 Sapphire::Data::ManeuversArmor::ManeuversArmor( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
 {
-   auto row = exdData->m_ManeuversArmorDat.get_row( row_id );
-   bNpcBase.push_back( exdData->getField< uint32_t >( row, 1 ) );
-   bNpcBase.push_back( exdData->getField< uint32_t >( row, 2 ) );
-   icon.push_back( exdData->getField< uint32_t >( row, 5 ) );
-   icon.push_back( exdData->getField< uint32_t >( row, 6 ) );
-   icon.push_back( exdData->getField< uint32_t >( row, 7 ) );
-   icon.push_back( exdData->getField< uint32_t >( row, 8 ) );
-   icon.push_back( exdData->getField< uint32_t >( row, 9 ) );
+  auto row = exdData->m_ManeuversArmorDat.get_row( row_id );
+  bNpcBase.push_back( exdData->getField< uint32_t >( row, 1 ) );
+  bNpcBase.push_back( exdData->getField< uint32_t >( row, 2 ) );
+  icon.push_back( exdData->getField< uint32_t >( row, 5 ) );
+  icon.push_back( exdData->getField< uint32_t >( row, 6 ) );
+  icon.push_back( exdData->getField< uint32_t >( row, 7 ) );
+  icon.push_back( exdData->getField< uint32_t >( row, 8 ) );
+  icon.push_back( exdData->getField< uint32_t >( row, 9 ) );
 }
 
 Sapphire::Data::Map::Map( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
 {
-   auto row = exdData->m_MapDat.get_row( row_id );
-   mapIndex = exdData->getField< int8_t >( row, 2 );
-   hierarchy = exdData->getField< uint8_t >( row, 3 );
-   mapMarkerRange = exdData->getField< uint16_t >( row, 4 );
-   id = exdData->getField< std::string >( row, 5 );
-   sizeFactor = exdData->getField< uint16_t >( row, 6 );
-   offsetX = exdData->getField< int16_t >( row, 7 );
-   offsetY = exdData->getField< int16_t >( row, 8 );
-   placeNameRegion = exdData->getField< uint16_t >( row, 9 );
-   placeName = exdData->getField< uint16_t >( row, 10 );
-   placeNameSub = exdData->getField< uint16_t >( row, 11 );
-   discoveryIndex = exdData->getField< int16_t >( row, 12 );
-   territoryType = exdData->getField< uint16_t >( row, 14 );
-   discoveryArrayByte = exdData->getField< bool >( row, 15 );
+  auto row = exdData->m_MapDat.get_row( row_id );
+  mapIndex = exdData->getField< int8_t >( row, 2 );
+  hierarchy = exdData->getField< uint8_t >( row, 3 );
+  mapMarkerRange = exdData->getField< uint16_t >( row, 4 );
+  id = exdData->getField< std::string >( row, 5 );
+  sizeFactor = exdData->getField< uint16_t >( row, 6 );
+  offsetX = exdData->getField< int16_t >( row, 7 );
+  offsetY = exdData->getField< int16_t >( row, 8 );
+  placeNameRegion = exdData->getField< uint16_t >( row, 9 );
+  placeName = exdData->getField< uint16_t >( row, 10 );
+  placeNameSub = exdData->getField< uint16_t >( row, 11 );
+  discoveryIndex = exdData->getField< int16_t >( row, 12 );
+  territoryType = exdData->getField< uint16_t >( row, 14 );
+  discoveryArrayByte = exdData->getField< bool >( row, 15 );
 }
 
 Sapphire::Data::MapMarker::MapMarker( uint32_t row_id, uint32_t subRow, Sapphire::Data::ExdDataGenerated* exdData )
 {
-   auto row = exdData->m_MapMarkerDat.get_row( row_id, subRow );
-   x = exdData->getField< int16_t >( row, 0 );
-   y = exdData->getField< int16_t >( row, 1 );
-   icon = exdData->getField< uint16_t >( row, 2 );
-   placeNameSubtext = exdData->getField< uint16_t >( row, 3 );
-   subtextOrientation = exdData->getField< uint8_t >( row, 4 );
-   mapMarkerRegion = exdData->getField< uint8_t >( row, 5 );
-   type = exdData->getField< uint8_t >( row, 6 );
-   dataType = exdData->getField< uint8_t >( row, 7 );
-   dataKey = exdData->getField< uint16_t >( row, 8 );
+  auto row = exdData->m_MapMarkerDat.get_row( row_id, subRow );
+  x = exdData->getField< int16_t >( row, 0 );
+  y = exdData->getField< int16_t >( row, 1 );
+  icon = exdData->getField< uint16_t >( row, 2 );
+  placeNameSubtext = exdData->getField< uint16_t >( row, 3 );
+  subtextOrientation = exdData->getField< uint8_t >( row, 4 );
+  mapMarkerRegion = exdData->getField< uint8_t >( row, 5 );
+  type = exdData->getField< uint8_t >( row, 6 );
+  dataType = exdData->getField< uint8_t >( row, 7 );
+  dataKey = exdData->getField< uint16_t >( row, 8 );
 }
 
 Sapphire::Data::MapMarkerRegion::MapMarkerRegion( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
 {
-   auto row = exdData->m_MapMarkerRegionDat.get_row( row_id );
-   x = exdData->getField< int16_t >( row, 0 );
+  auto row = exdData->m_MapMarkerRegionDat.get_row( row_id );
+  x = exdData->getField< int16_t >( row, 0 );
 }
 
 Sapphire::Data::MapSymbol::MapSymbol( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
 {
-   auto row = exdData->m_MapSymbolDat.get_row( row_id );
-   icon = exdData->getField< int32_t >( row, 0 );
-   placeName = exdData->getField< int32_t >( row, 1 );
+  auto row = exdData->m_MapSymbolDat.get_row( row_id );
+  icon = exdData->getField< int32_t >( row, 0 );
+  placeName = exdData->getField< int32_t >( row, 1 );
 }
 
 Sapphire::Data::Marker::Marker( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
 {
-   auto row = exdData->m_MarkerDat.get_row( row_id );
-   icon = exdData->getField< int32_t >( row, 0 );
-   name = exdData->getField< std::string >( row, 1 );
+  auto row = exdData->m_MarkerDat.get_row( row_id );
+  icon = exdData->getField< int32_t >( row, 0 );
+  name = exdData->getField< std::string >( row, 1 );
 }
 
 Sapphire::Data::MasterpieceSupplyDuty::MasterpieceSupplyDuty( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
 {
-   auto row = exdData->m_MasterpieceSupplyDutyDat.get_row( row_id );
-   classJob = exdData->getField< uint8_t >( row, 0 );
-   classJobLevel = exdData->getField< uint8_t >( row, 1 );
-   rewardCurrency = exdData->getField< uint16_t >( row, 2 );
+  auto row = exdData->m_MasterpieceSupplyDutyDat.get_row( row_id );
+  classJob = exdData->getField< uint8_t >( row, 0 );
+  classJobLevel = exdData->getField< uint8_t >( row, 1 );
+  rewardCurrency = exdData->getField< uint16_t >( row, 2 );
 }
 
 Sapphire::Data::MasterpieceSupplyMultiplier::MasterpieceSupplyMultiplier( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
 {
-   auto row = exdData->m_MasterpieceSupplyMultiplierDat.get_row( row_id );
-   xpMultiplier.push_back( exdData->getField< uint16_t >( row, 0 ) );
-   xpMultiplier.push_back( exdData->getField< uint16_t >( row, 1 ) );
-   currencyMultiplier.push_back( exdData->getField< uint16_t >( row, 4 ) );
-   currencyMultiplier.push_back( exdData->getField< uint16_t >( row, 5 ) );
+  auto row = exdData->m_MasterpieceSupplyMultiplierDat.get_row( row_id );
+  xpMultiplier.push_back( exdData->getField< uint16_t >( row, 0 ) );
+  xpMultiplier.push_back( exdData->getField< uint16_t >( row, 1 ) );
+  currencyMultiplier.push_back( exdData->getField< uint16_t >( row, 4 ) );
+  currencyMultiplier.push_back( exdData->getField< uint16_t >( row, 5 ) );
 }
 
 Sapphire::Data::Materia::Materia( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
 {
-   auto row = exdData->m_MateriaDat.get_row( row_id );
-   item.push_back( exdData->getField< int32_t >( row, 0 ) );
-   item.push_back( exdData->getField< int32_t >( row, 1 ) );
-   item.push_back( exdData->getField< int32_t >( row, 2 ) );
-   item.push_back( exdData->getField< int32_t >( row, 3 ) );
-   item.push_back( exdData->getField< int32_t >( row, 4 ) );
-   item.push_back( exdData->getField< int32_t >( row, 5 ) );
-   item.push_back( exdData->getField< int32_t >( row, 6 ) );
-   item.push_back( exdData->getField< int32_t >( row, 7 ) );
-   item.push_back( exdData->getField< int32_t >( row, 8 ) );
-   item.push_back( exdData->getField< int32_t >( row, 9 ) );
-   baseParam = exdData->getField< uint8_t >( row, 10 );
-   value.push_back( exdData->getField< uint8_t >( row, 11 ) );
-   value.push_back( exdData->getField< uint8_t >( row, 12 ) );
-   value.push_back( exdData->getField< uint8_t >( row, 13 ) );
-   value.push_back( exdData->getField< uint8_t >( row, 14 ) );
-   value.push_back( exdData->getField< uint8_t >( row, 15 ) );
-   value.push_back( exdData->getField< uint8_t >( row, 16 ) );
-   value.push_back( exdData->getField< uint8_t >( row, 17 ) );
-   value.push_back( exdData->getField< uint8_t >( row, 18 ) );
-   value.push_back( exdData->getField< uint8_t >( row, 19 ) );
-   value.push_back( exdData->getField< uint8_t >( row, 20 ) );
+  auto row = exdData->m_MateriaDat.get_row( row_id );
+  item.push_back( exdData->getField< int32_t >( row, 0 ) );
+  item.push_back( exdData->getField< int32_t >( row, 1 ) );
+  item.push_back( exdData->getField< int32_t >( row, 2 ) );
+  item.push_back( exdData->getField< int32_t >( row, 3 ) );
+  item.push_back( exdData->getField< int32_t >( row, 4 ) );
+  item.push_back( exdData->getField< int32_t >( row, 5 ) );
+  item.push_back( exdData->getField< int32_t >( row, 6 ) );
+  item.push_back( exdData->getField< int32_t >( row, 7 ) );
+  item.push_back( exdData->getField< int32_t >( row, 8 ) );
+  item.push_back( exdData->getField< int32_t >( row, 9 ) );
+  baseParam = exdData->getField< uint8_t >( row, 10 );
+  value.push_back( exdData->getField< uint8_t >( row, 11 ) );
+  value.push_back( exdData->getField< uint8_t >( row, 12 ) );
+  value.push_back( exdData->getField< uint8_t >( row, 13 ) );
+  value.push_back( exdData->getField< uint8_t >( row, 14 ) );
+  value.push_back( exdData->getField< uint8_t >( row, 15 ) );
+  value.push_back( exdData->getField< uint8_t >( row, 16 ) );
+  value.push_back( exdData->getField< uint8_t >( row, 17 ) );
+  value.push_back( exdData->getField< uint8_t >( row, 18 ) );
+  value.push_back( exdData->getField< uint8_t >( row, 19 ) );
+  value.push_back( exdData->getField< uint8_t >( row, 20 ) );
 }
 
 Sapphire::Data::MiniGameRA::MiniGameRA( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
 {
-   auto row = exdData->m_MiniGameRADat.get_row( row_id );
-   icon = exdData->getField< int32_t >( row, 1 );
-   bGM = exdData->getField< int32_t >( row, 2 );
+  auto row = exdData->m_MiniGameRADat.get_row( row_id );
+  icon = exdData->getField< int32_t >( row, 1 );
+  bGM = exdData->getField< int32_t >( row, 2 );
 }
 
 Sapphire::Data::MinionRace::MinionRace( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
 {
-   auto row = exdData->m_MinionRaceDat.get_row( row_id );
-   name = exdData->getField< std::string >( row, 0 );
+  auto row = exdData->m_MinionRaceDat.get_row( row_id );
+  name = exdData->getField< std::string >( row, 0 );
 }
 
 Sapphire::Data::MinionRules::MinionRules( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
 {
-   auto row = exdData->m_MinionRulesDat.get_row( row_id );
-   rule = exdData->getField< std::string >( row, 0 );
-   description = exdData->getField< std::string >( row, 1 );
+  auto row = exdData->m_MinionRulesDat.get_row( row_id );
+  rule = exdData->getField< std::string >( row, 0 );
+  description = exdData->getField< std::string >( row, 1 );
 }
 
 Sapphire::Data::MinionSkillType::MinionSkillType( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
 {
-   auto row = exdData->m_MinionSkillTypeDat.get_row( row_id );
-   name = exdData->getField< std::string >( row, 0 );
+  auto row = exdData->m_MinionSkillTypeDat.get_row( row_id );
+  name = exdData->getField< std::string >( row, 0 );
 }
 
 Sapphire::Data::MobHuntOrderType::MobHuntOrderType( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
 {
-   auto row = exdData->m_MobHuntOrderTypeDat.get_row( row_id );
-   quest = exdData->getField< uint32_t >( row, 1 );
-   eventItem = exdData->getField< uint32_t >( row, 2 );
+  auto row = exdData->m_MobHuntOrderTypeDat.get_row( row_id );
+  quest = exdData->getField< uint32_t >( row, 1 );
+  eventItem = exdData->getField< uint32_t >( row, 2 );
 }
 
 Sapphire::Data::MobHuntTarget::MobHuntTarget( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
 {
-   auto row = exdData->m_MobHuntTargetDat.get_row( row_id );
-   name = exdData->getField< uint16_t >( row, 0 );
-   fATE = exdData->getField< uint16_t >( row, 1 );
-   icon = exdData->getField< uint32_t >( row, 2 );
-   territoryType = exdData->getField< uint16_t >( row, 3 );
-   placeName = exdData->getField< uint16_t >( row, 4 );
+  auto row = exdData->m_MobHuntTargetDat.get_row( row_id );
+  name = exdData->getField< uint16_t >( row, 0 );
+  fATE = exdData->getField< uint16_t >( row, 1 );
+  icon = exdData->getField< uint32_t >( row, 2 );
+  territoryType = exdData->getField< uint16_t >( row, 3 );
+  placeName = exdData->getField< uint16_t >( row, 4 );
 }
 
 Sapphire::Data::ModelChara::ModelChara( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
 {
-   auto row = exdData->m_ModelCharaDat.get_row( row_id );
-   type = exdData->getField< uint8_t >( row, 0 );
-   model = exdData->getField< uint16_t >( row, 1 );
-   base = exdData->getField< uint8_t >( row, 2 );
-   variant = exdData->getField< uint8_t >( row, 3 );
+  auto row = exdData->m_ModelCharaDat.get_row( row_id );
+  type = exdData->getField< uint8_t >( row, 0 );
+  model = exdData->getField< uint16_t >( row, 1 );
+  base = exdData->getField< uint8_t >( row, 2 );
+  variant = exdData->getField< uint8_t >( row, 3 );
 }
 
 Sapphire::Data::ModelSkeleton::ModelSkeleton( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
 {
-   auto row = exdData->m_ModelSkeletonDat.get_row( row_id );
-   scaleFactor = exdData->getField< float >( row, 0 );
+  auto row = exdData->m_ModelSkeletonDat.get_row( row_id );
+  scaleFactor = exdData->getField< float >( row, 0 );
 }
 
 Sapphire::Data::ModelState::ModelState( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
 {
-   auto row = exdData->m_ModelStateDat.get_row( row_id );
-   start = exdData->getField< uint16_t >( row, 0 );
-   end = exdData->getField< uint16_t >( row, 1 );
+  auto row = exdData->m_ModelStateDat.get_row( row_id );
+  start = exdData->getField< uint16_t >( row, 0 );
+  end = exdData->getField< uint16_t >( row, 1 );
 }
 
 Sapphire::Data::MonsterNote::MonsterNote( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
 {
-   auto row = exdData->m_MonsterNoteDat.get_row( row_id );
-   monsterNoteTarget.push_back( exdData->getField< uint16_t >( row, 0 ) );
-   monsterNoteTarget.push_back( exdData->getField< uint16_t >( row, 1 ) );
-   monsterNoteTarget.push_back( exdData->getField< uint16_t >( row, 2 ) );
-   monsterNoteTarget.push_back( exdData->getField< uint16_t >( row, 3 ) );
-   count.push_back( exdData->getField< uint8_t >( row, 4 ) );
-   count.push_back( exdData->getField< uint8_t >( row, 5 ) );
-   count.push_back( exdData->getField< uint8_t >( row, 6 ) );
-   count.push_back( exdData->getField< uint8_t >( row, 7 ) );
-   reward = exdData->getField< uint32_t >( row, 8 );
-   name = exdData->getField< std::string >( row, 9 );
+  auto row = exdData->m_MonsterNoteDat.get_row( row_id );
+  monsterNoteTarget.push_back( exdData->getField< uint16_t >( row, 0 ) );
+  monsterNoteTarget.push_back( exdData->getField< uint16_t >( row, 1 ) );
+  monsterNoteTarget.push_back( exdData->getField< uint16_t >( row, 2 ) );
+  monsterNoteTarget.push_back( exdData->getField< uint16_t >( row, 3 ) );
+  count.push_back( exdData->getField< uint8_t >( row, 4 ) );
+  count.push_back( exdData->getField< uint8_t >( row, 5 ) );
+  count.push_back( exdData->getField< uint8_t >( row, 6 ) );
+  count.push_back( exdData->getField< uint8_t >( row, 7 ) );
+  reward = exdData->getField< uint32_t >( row, 8 );
+  name = exdData->getField< std::string >( row, 9 );
 }
 
 Sapphire::Data::MonsterNoteTarget::MonsterNoteTarget( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
 {
-   auto row = exdData->m_MonsterNoteTargetDat.get_row( row_id );
-   bNpcName = exdData->getField< uint16_t >( row, 0 );
-   icon = exdData->getField< int32_t >( row, 1 );
+  auto row = exdData->m_MonsterNoteTargetDat.get_row( row_id );
+  bNpcName = exdData->getField< uint16_t >( row, 0 );
+  icon = exdData->getField< int32_t >( row, 1 );
 }
 
 Sapphire::Data::Mount::Mount( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
 {
-   auto row = exdData->m_MountDat.get_row( row_id );
-   singular = exdData->getField< std::string >( row, 0 );
-   adjective = exdData->getField< int8_t >( row, 1 );
-   plural = exdData->getField< std::string >( row, 2 );
-   possessivePronoun = exdData->getField< int8_t >( row, 3 );
-   startsWithVowel = exdData->getField< int8_t >( row, 4 );
-   pronoun = exdData->getField< int8_t >( row, 6 );
-   article = exdData->getField< int8_t >( row, 7 );
-   modelChara = exdData->getField< int32_t >( row, 8 );
-   flyingCondition = exdData->getField< uint8_t >( row, 10 );
-   isFlying = exdData->getField< uint8_t >( row, 14 );
-   mountCustomize = exdData->getField< uint8_t >( row, 16 );
-   rideBGM = exdData->getField< uint16_t >( row, 17 );
-   order = exdData->getField< int16_t >( row, 29 );
-   icon = exdData->getField< uint16_t >( row, 30 );
-   extraSeats = exdData->getField< uint8_t >( row, 36 );
-   mountAction = exdData->getField< uint16_t >( row, 37 );
-   isAirborne = exdData->getField< bool >( row, 38 );
-   useEP = exdData->getField< bool >( row, 40 );
-   isImmobile = exdData->getField< bool >( row, 42 );
+  auto row = exdData->m_MountDat.get_row( row_id );
+  singular = exdData->getField< std::string >( row, 0 );
+  adjective = exdData->getField< int8_t >( row, 1 );
+  plural = exdData->getField< std::string >( row, 2 );
+  possessivePronoun = exdData->getField< int8_t >( row, 3 );
+  startsWithVowel = exdData->getField< int8_t >( row, 4 );
+  pronoun = exdData->getField< int8_t >( row, 6 );
+  article = exdData->getField< int8_t >( row, 7 );
+  modelChara = exdData->getField< int32_t >( row, 8 );
+  flyingCondition = exdData->getField< uint8_t >( row, 10 );
+  isFlying = exdData->getField< uint8_t >( row, 14 );
+  mountCustomize = exdData->getField< uint8_t >( row, 16 );
+  rideBGM = exdData->getField< uint16_t >( row, 17 );
+  order = exdData->getField< int16_t >( row, 29 );
+  icon = exdData->getField< uint16_t >( row, 30 );
+  extraSeats = exdData->getField< uint8_t >( row, 36 );
+  mountAction = exdData->getField< uint16_t >( row, 37 );
+  isAirborne = exdData->getField< bool >( row, 38 );
+  useEP = exdData->getField< bool >( row, 40 );
+  isImmobile = exdData->getField< bool >( row, 42 );
 }
 
 Sapphire::Data::MountAction::MountAction( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
 {
-   auto row = exdData->m_MountActionDat.get_row( row_id );
-   action.push_back( exdData->getField< uint16_t >( row, 0 ) );
-   action.push_back( exdData->getField< uint16_t >( row, 1 ) );
-   action.push_back( exdData->getField< uint16_t >( row, 2 ) );
-   action.push_back( exdData->getField< uint16_t >( row, 3 ) );
-   action.push_back( exdData->getField< uint16_t >( row, 4 ) );
-   action.push_back( exdData->getField< uint16_t >( row, 5 ) );
+  auto row = exdData->m_MountActionDat.get_row( row_id );
+  action.push_back( exdData->getField< uint16_t >( row, 0 ) );
+  action.push_back( exdData->getField< uint16_t >( row, 1 ) );
+  action.push_back( exdData->getField< uint16_t >( row, 2 ) );
+  action.push_back( exdData->getField< uint16_t >( row, 3 ) );
+  action.push_back( exdData->getField< uint16_t >( row, 4 ) );
+  action.push_back( exdData->getField< uint16_t >( row, 5 ) );
 }
 
 Sapphire::Data::MountCustomize::MountCustomize( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
 {
-   auto row = exdData->m_MountCustomizeDat.get_row( row_id );
-   hyurMaleScale = exdData->getField< float >( row, 1 );
-   hyurFemaleScale = exdData->getField< float >( row, 2 );
-   elezenMaleScale = exdData->getField< float >( row, 3 );
-   elezenFemaleScale = exdData->getField< float >( row, 4 );
-   lalaMaleScale = exdData->getField< float >( row, 5 );
-   lalaFemaleScale = exdData->getField< float >( row, 6 );
-   miqoMaleScale = exdData->getField< float >( row, 7 );
-   miqoFemaleScale = exdData->getField< float >( row, 8 );
-   roeMaleScale = exdData->getField< float >( row, 9 );
-   roeFemaleScale = exdData->getField< float >( row, 10 );
-   auRaMaleScale = exdData->getField< float >( row, 11 );
-   auRaFemaleScale = exdData->getField< float >( row, 12 );
-   hyurMaleCameraHeight = exdData->getField< uint8_t >( row, 13 );
-   hyurFemaleCameraHeight = exdData->getField< uint8_t >( row, 14 );
-   elezenMaleCameraHeight = exdData->getField< uint8_t >( row, 15 );
-   elezenFemaleCameraHeight = exdData->getField< uint8_t >( row, 16 );
-   lalaMaleCameraHeight = exdData->getField< uint8_t >( row, 17 );
-   lalaFemaleCameraHeight = exdData->getField< uint8_t >( row, 18 );
-   miqoMaleCameraHeight = exdData->getField< uint8_t >( row, 19 );
-   miqoFemaleCameraHeight = exdData->getField< uint8_t >( row, 20 );
-   roeMaleCameraHeight = exdData->getField< uint8_t >( row, 21 );
-   roeFemaleCameraHeight = exdData->getField< uint8_t >( row, 22 );
-   auRaMaleCameraHeight = exdData->getField< uint8_t >( row, 23 );
-   auRaFemaleCameraHeight = exdData->getField< uint8_t >( row, 24 );
+  auto row = exdData->m_MountCustomizeDat.get_row( row_id );
+  hyurMaleScale = exdData->getField< float >( row, 1 );
+  hyurFemaleScale = exdData->getField< float >( row, 2 );
+  elezenMaleScale = exdData->getField< float >( row, 3 );
+  elezenFemaleScale = exdData->getField< float >( row, 4 );
+  lalaMaleScale = exdData->getField< float >( row, 5 );
+  lalaFemaleScale = exdData->getField< float >( row, 6 );
+  miqoMaleScale = exdData->getField< float >( row, 7 );
+  miqoFemaleScale = exdData->getField< float >( row, 8 );
+  roeMaleScale = exdData->getField< float >( row, 9 );
+  roeFemaleScale = exdData->getField< float >( row, 10 );
+  auRaMaleScale = exdData->getField< float >( row, 11 );
+  auRaFemaleScale = exdData->getField< float >( row, 12 );
+  hyurMaleCameraHeight = exdData->getField< uint8_t >( row, 13 );
+  hyurFemaleCameraHeight = exdData->getField< uint8_t >( row, 14 );
+  elezenMaleCameraHeight = exdData->getField< uint8_t >( row, 15 );
+  elezenFemaleCameraHeight = exdData->getField< uint8_t >( row, 16 );
+  lalaMaleCameraHeight = exdData->getField< uint8_t >( row, 17 );
+  lalaFemaleCameraHeight = exdData->getField< uint8_t >( row, 18 );
+  miqoMaleCameraHeight = exdData->getField< uint8_t >( row, 19 );
+  miqoFemaleCameraHeight = exdData->getField< uint8_t >( row, 20 );
+  roeMaleCameraHeight = exdData->getField< uint8_t >( row, 21 );
+  roeFemaleCameraHeight = exdData->getField< uint8_t >( row, 22 );
+  auRaMaleCameraHeight = exdData->getField< uint8_t >( row, 23 );
+  auRaFemaleCameraHeight = exdData->getField< uint8_t >( row, 24 );
 }
 
 Sapphire::Data::MountFlyingCondition::MountFlyingCondition( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
 {
-   auto row = exdData->m_MountFlyingConditionDat.get_row( row_id );
-   quest = exdData->getField< uint32_t >( row, 0 );
+  auto row = exdData->m_MountFlyingConditionDat.get_row( row_id );
+  quest = exdData->getField< uint32_t >( row, 0 );
 }
 
 Sapphire::Data::MountSpeed::MountSpeed( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
 {
-   auto row = exdData->m_MountSpeedDat.get_row( row_id );
-   quest = exdData->getField< uint32_t >( row, 0 );
+  auto row = exdData->m_MountSpeedDat.get_row( row_id );
+  quest = exdData->getField< uint32_t >( row, 0 );
 }
 
 Sapphire::Data::MountTransient::MountTransient( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
 {
-   auto row = exdData->m_MountTransientDat.get_row( row_id );
-   description = exdData->getField< std::string >( row, 0 );
-   descriptionEnhanced = exdData->getField< std::string >( row, 1 );
-   tooltip = exdData->getField< std::string >( row, 2 );
+  auto row = exdData->m_MountTransientDat.get_row( row_id );
+  description = exdData->getField< std::string >( row, 0 );
+  descriptionEnhanced = exdData->getField< std::string >( row, 1 );
+  tooltip = exdData->getField< std::string >( row, 2 );
 }
 
 Sapphire::Data::MoveTimeline::MoveTimeline( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
 {
-   auto row = exdData->m_MoveTimelineDat.get_row( row_id );
-   idle = exdData->getField< uint16_t >( row, 0 );
-   moveForward = exdData->getField< uint16_t >( row, 1 );
-   moveBack = exdData->getField< uint16_t >( row, 2 );
-   moveLeft = exdData->getField< uint16_t >( row, 3 );
-   moveRight = exdData->getField< uint16_t >( row, 4 );
-   moveUp = exdData->getField< uint16_t >( row, 5 );
-   moveDown = exdData->getField< uint16_t >( row, 6 );
-   moveTurnLeft = exdData->getField< uint16_t >( row, 7 );
-   moveTurnRight = exdData->getField< uint16_t >( row, 8 );
-   extra = exdData->getField< uint16_t >( row, 9 );
+  auto row = exdData->m_MoveTimelineDat.get_row( row_id );
+  idle = exdData->getField< uint16_t >( row, 0 );
+  moveForward = exdData->getField< uint16_t >( row, 1 );
+  moveBack = exdData->getField< uint16_t >( row, 2 );
+  moveLeft = exdData->getField< uint16_t >( row, 3 );
+  moveRight = exdData->getField< uint16_t >( row, 4 );
+  moveUp = exdData->getField< uint16_t >( row, 5 );
+  moveDown = exdData->getField< uint16_t >( row, 6 );
+  moveTurnLeft = exdData->getField< uint16_t >( row, 7 );
+  moveTurnRight = exdData->getField< uint16_t >( row, 8 );
+  extra = exdData->getField< uint16_t >( row, 9 );
 }
 
 Sapphire::Data::MoveVfx::MoveVfx( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
 {
-   auto row = exdData->m_MoveVfxDat.get_row( row_id );
-   vFXNormal = exdData->getField< uint16_t >( row, 0 );
-   vFXWalking = exdData->getField< uint16_t >( row, 1 );
+  auto row = exdData->m_MoveVfxDat.get_row( row_id );
+  vFXNormal = exdData->getField< uint16_t >( row, 0 );
+  vFXWalking = exdData->getField< uint16_t >( row, 1 );
+}
+
+Sapphire::Data::NotebookDivision::NotebookDivision( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
+{
+  auto row = exdData->m_NotebookDivisionDat.get_row( row_id );
+  name = exdData->getField< std::string >( row, 0 );
+  notebookDivisionCategory = exdData->getField< uint8_t >( row, 1 );
+}
+
+Sapphire::Data::NotebookDivisionCategory::NotebookDivisionCategory( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
+{
+  auto row = exdData->m_NotebookDivisionCategoryDat.get_row( row_id );
+  name = exdData->getField< std::string >( row, 0 );
 }
 
 Sapphire::Data::NpcEquip::NpcEquip( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
 {
-   auto row = exdData->m_NpcEquipDat.get_row( row_id );
-   modelMainHand = exdData->getField< uint64_t >( row, 0 );
-   dyeMainHand = exdData->getField< uint8_t >( row, 1 );
-   modelOffHand = exdData->getField< uint64_t >( row, 2 );
-   dyeOffHand = exdData->getField< uint8_t >( row, 3 );
-   modelHead = exdData->getField< uint32_t >( row, 4 );
-   dyeHead = exdData->getField< uint8_t >( row, 5 );
-   visor = exdData->getField< bool >( row, 6 );
-   modelBody = exdData->getField< uint32_t >( row, 7 );
-   dyeBody = exdData->getField< uint8_t >( row, 8 );
-   modelHands = exdData->getField< uint32_t >( row, 9 );
-   dyeHands = exdData->getField< uint8_t >( row, 10 );
-   modelLegs = exdData->getField< uint32_t >( row, 11 );
-   dyeLegs = exdData->getField< uint8_t >( row, 12 );
-   modelFeet = exdData->getField< uint32_t >( row, 13 );
-   dyeFeet = exdData->getField< uint8_t >( row, 14 );
-   modelEars = exdData->getField< uint32_t >( row, 15 );
-   dyeEars = exdData->getField< uint8_t >( row, 16 );
-   modelNeck = exdData->getField< uint32_t >( row, 17 );
-   dyeNeck = exdData->getField< uint8_t >( row, 18 );
-   modelWrists = exdData->getField< uint32_t >( row, 19 );
-   dyeWrists = exdData->getField< uint8_t >( row, 20 );
-   modelLeftRing = exdData->getField< uint32_t >( row, 21 );
-   dyeLeftRing = exdData->getField< uint8_t >( row, 22 );
-   modelRightRing = exdData->getField< uint32_t >( row, 23 );
-   dyeRightRing = exdData->getField< uint8_t >( row, 24 );
+  auto row = exdData->m_NpcEquipDat.get_row( row_id );
+  modelMainHand = exdData->getField< uint64_t >( row, 0 );
+  dyeMainHand = exdData->getField< uint8_t >( row, 1 );
+  modelOffHand = exdData->getField< uint64_t >( row, 2 );
+  dyeOffHand = exdData->getField< uint8_t >( row, 3 );
+  modelHead = exdData->getField< uint32_t >( row, 4 );
+  dyeHead = exdData->getField< uint8_t >( row, 5 );
+  visor = exdData->getField< bool >( row, 6 );
+  modelBody = exdData->getField< uint32_t >( row, 7 );
+  dyeBody = exdData->getField< uint8_t >( row, 8 );
+  modelHands = exdData->getField< uint32_t >( row, 9 );
+  dyeHands = exdData->getField< uint8_t >( row, 10 );
+  modelLegs = exdData->getField< uint32_t >( row, 11 );
+  dyeLegs = exdData->getField< uint8_t >( row, 12 );
+  modelFeet = exdData->getField< uint32_t >( row, 13 );
+  dyeFeet = exdData->getField< uint8_t >( row, 14 );
+  modelEars = exdData->getField< uint32_t >( row, 15 );
+  dyeEars = exdData->getField< uint8_t >( row, 16 );
+  modelNeck = exdData->getField< uint32_t >( row, 17 );
+  dyeNeck = exdData->getField< uint8_t >( row, 18 );
+  modelWrists = exdData->getField< uint32_t >( row, 19 );
+  dyeWrists = exdData->getField< uint8_t >( row, 20 );
+  modelLeftRing = exdData->getField< uint32_t >( row, 21 );
+  dyeLeftRing = exdData->getField< uint8_t >( row, 22 );
+  modelRightRing = exdData->getField< uint32_t >( row, 23 );
+  dyeRightRing = exdData->getField< uint8_t >( row, 24 );
 }
 
 Sapphire::Data::NpcYell::NpcYell( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
 {
-   auto row = exdData->m_NpcYellDat.get_row( row_id );
-   text = exdData->getField< std::string >( row, 9 );
+  auto row = exdData->m_NpcYellDat.get_row( row_id );
+  text = exdData->getField< std::string >( row, 9 );
 }
 
 Sapphire::Data::Omen::Omen( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
 {
-   auto row = exdData->m_OmenDat.get_row( row_id );
-   fileName = exdData->getField< std::string >( row, 0 );
+  auto row = exdData->m_OmenDat.get_row( row_id );
+  fileName = exdData->getField< std::string >( row, 0 );
 }
 
 Sapphire::Data::OnlineStatus::OnlineStatus( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
 {
-   auto row = exdData->m_OnlineStatusDat.get_row( row_id );
-   priority = exdData->getField< uint8_t >( row, 2 );
-   name = exdData->getField< std::string >( row, 3 );
-   icon = exdData->getField< uint32_t >( row, 4 );
+  auto row = exdData->m_OnlineStatusDat.get_row( row_id );
+  priority = exdData->getField< uint8_t >( row, 2 );
+  name = exdData->getField< std::string >( row, 3 );
+  icon = exdData->getField< uint32_t >( row, 4 );
 }
 
 Sapphire::Data::Opening::Opening( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
 {
-   auto row = exdData->m_OpeningDat.get_row( row_id );
-   name = exdData->getField< std::string >( row, 0 );
-   quest = exdData->getField< uint32_t >( row, 1 );
+  auto row = exdData->m_OpeningDat.get_row( row_id );
+  name = exdData->getField< std::string >( row, 0 );
+  quest = exdData->getField< uint32_t >( row, 1 );
 }
 
 Sapphire::Data::Orchestrion::Orchestrion( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
 {
-   auto row = exdData->m_OrchestrionDat.get_row( row_id );
-   name = exdData->getField< std::string >( row, 0 );
-   description = exdData->getField< std::string >( row, 1 );
+  auto row = exdData->m_OrchestrionDat.get_row( row_id );
+  name = exdData->getField< std::string >( row, 0 );
+  description = exdData->getField< std::string >( row, 1 );
 }
 
 Sapphire::Data::OrchestrionCategory::OrchestrionCategory( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
 {
-   auto row = exdData->m_OrchestrionCategoryDat.get_row( row_id );
-   name = exdData->getField< std::string >( row, 0 );
+  auto row = exdData->m_OrchestrionCategoryDat.get_row( row_id );
+  name = exdData->getField< std::string >( row, 0 );
 }
 
 Sapphire::Data::OrchestrionPath::OrchestrionPath( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
 {
-   auto row = exdData->m_OrchestrionPathDat.get_row( row_id );
-   file = exdData->getField< std::string >( row, 0 );
+  auto row = exdData->m_OrchestrionPathDat.get_row( row_id );
+  file = exdData->getField< std::string >( row, 0 );
 }
 
 Sapphire::Data::OrchestrionUiparam::OrchestrionUiparam( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
 {
-   auto row = exdData->m_OrchestrionUiparamDat.get_row( row_id );
-   orchestrionCategory = exdData->getField< uint8_t >( row, 0 );
-   order = exdData->getField< uint16_t >( row, 1 );
+  auto row = exdData->m_OrchestrionUiparamDat.get_row( row_id );
+  orchestrionCategory = exdData->getField< uint8_t >( row, 0 );
+  order = exdData->getField< uint16_t >( row, 1 );
 }
 
 Sapphire::Data::ParamGrow::ParamGrow( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
 {
-   auto row = exdData->m_ParamGrowDat.get_row( row_id );
-   expToNext = exdData->getField< int32_t >( row, 0 );
-   additionalActions = exdData->getField< uint8_t >( row, 1 );
-   mpModifier = exdData->getField< int32_t >( row, 4 );
-   baseSpeed = exdData->getField< int32_t >( row, 5 );
-   levelModifier = exdData->getField< int32_t >( row, 6 );
-   questExpModifier = exdData->getField< uint8_t >( row, 7 );
-   hpModifier = exdData->getField< uint16_t >( row, 8 );
-   huntingLogExpReward = exdData->getField< int32_t >( row, 9 );
+  auto row = exdData->m_ParamGrowDat.get_row( row_id );
+  expToNext = exdData->getField< int32_t >( row, 0 );
+  additionalActions = exdData->getField< uint8_t >( row, 1 );
+  scaledQuestXP = exdData->getField< uint16_t >( row, 3 );
+  mpModifier = exdData->getField< int32_t >( row, 4 );
+  baseSpeed = exdData->getField< int32_t >( row, 5 );
+  levelModifier = exdData->getField< int32_t >( row, 6 );
+  questExpModifier = exdData->getField< uint8_t >( row, 7 );
+  hpModifier = exdData->getField< uint16_t >( row, 8 );
+  huntingLogExpReward = exdData->getField< int32_t >( row, 9 );
+  itemLevelSync = exdData->getField< uint16_t >( row, 11 );
 }
 
 Sapphire::Data::PartyContent::PartyContent( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
 {
-   auto row = exdData->m_PartyContentDat.get_row( row_id );
-   key = exdData->getField< uint8_t >( row, 0 );
-   timeLimit = exdData->getField< uint16_t >( row, 1 );
-   name = exdData->getField< std::string >( row, 2 );
-   textDataStart = exdData->getField< uint32_t >( row, 3 );
-   textDataEnd = exdData->getField< uint32_t >( row, 4 );
-   contentFinderCondition = exdData->getField< uint16_t >( row, 33 );
-   image = exdData->getField< uint32_t >( row, 34 );
+  auto row = exdData->m_PartyContentDat.get_row( row_id );
+  key = exdData->getField< uint8_t >( row, 0 );
+  timeLimit = exdData->getField< uint16_t >( row, 1 );
+  name = exdData->getField< std::string >( row, 2 );
+  textDataStart = exdData->getField< uint32_t >( row, 3 );
+  textDataEnd = exdData->getField< uint32_t >( row, 4 );
+  contentFinderCondition = exdData->getField< uint16_t >( row, 33 );
+  image = exdData->getField< uint32_t >( row, 34 );
 }
 
 Sapphire::Data::PartyContentCutscene::PartyContentCutscene( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
 {
-   auto row = exdData->m_PartyContentCutsceneDat.get_row( row_id );
-   cutscene = exdData->getField< uint32_t >( row, 0 );
+  auto row = exdData->m_PartyContentCutsceneDat.get_row( row_id );
+  cutscene = exdData->getField< uint32_t >( row, 0 );
 }
 
 Sapphire::Data::PartyContentTextData::PartyContentTextData( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
 {
-   auto row = exdData->m_PartyContentTextDataDat.get_row( row_id );
-   data = exdData->getField< std::string >( row, 0 );
+  auto row = exdData->m_PartyContentTextDataDat.get_row( row_id );
+  data = exdData->getField< std::string >( row, 0 );
 }
 
 Sapphire::Data::Perform::Perform( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
 {
-   auto row = exdData->m_PerformDat.get_row( row_id );
-   name = exdData->getField< std::string >( row, 0 );
-   modelKey = exdData->getField< uint64_t >( row, 2 );
-   animationStart = exdData->getField< uint16_t >( row, 3 );
-   animationEnd = exdData->getField< uint16_t >( row, 4 );
-   animationIdle = exdData->getField< uint16_t >( row, 5 );
-   animationPlay01 = exdData->getField< uint16_t >( row, 6 );
-   animationPlay02 = exdData->getField< uint16_t >( row, 7 );
-   stopAnimation = exdData->getField< int32_t >( row, 8 );
-   instrument = exdData->getField< std::string >( row, 9 );
-   transient = exdData->getField< uint8_t >( row, 11 );
+  auto row = exdData->m_PerformDat.get_row( row_id );
+  name = exdData->getField< std::string >( row, 0 );
+  modelKey = exdData->getField< uint64_t >( row, 2 );
+  animationStart = exdData->getField< uint16_t >( row, 3 );
+  animationEnd = exdData->getField< uint16_t >( row, 4 );
+  animationIdle = exdData->getField< uint16_t >( row, 5 );
+  animationPlay01 = exdData->getField< uint16_t >( row, 6 );
+  animationPlay02 = exdData->getField< uint16_t >( row, 7 );
+  stopAnimation = exdData->getField< int32_t >( row, 8 );
+  instrument = exdData->getField< std::string >( row, 9 );
+  transient = exdData->getField< uint8_t >( row, 11 );
 }
 
 Sapphire::Data::PerformTransient::PerformTransient( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
 {
-   auto row = exdData->m_PerformTransientDat.get_row( row_id );
-   text = exdData->getField< std::string >( row, 0 );
+  auto row = exdData->m_PerformTransientDat.get_row( row_id );
+  text = exdData->getField< std::string >( row, 0 );
 }
 
 Sapphire::Data::Pet::Pet( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
 {
-   auto row = exdData->m_PetDat.get_row( row_id );
-   name = exdData->getField< std::string >( row, 0 );
+  auto row = exdData->m_PetDat.get_row( row_id );
+  name = exdData->getField< std::string >( row, 0 );
 }
 
 Sapphire::Data::PetAction::PetAction( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
 {
-   auto row = exdData->m_PetActionDat.get_row( row_id );
-   name = exdData->getField< std::string >( row, 0 );
-   description = exdData->getField< std::string >( row, 1 );
-   icon = exdData->getField< int32_t >( row, 2 );
-   action = exdData->getField< uint16_t >( row, 3 );
-   pet = exdData->getField< uint8_t >( row, 4 );
+  auto row = exdData->m_PetActionDat.get_row( row_id );
+  name = exdData->getField< std::string >( row, 0 );
+  description = exdData->getField< std::string >( row, 1 );
+  icon = exdData->getField< int32_t >( row, 2 );
+  action = exdData->getField< uint16_t >( row, 3 );
+  pet = exdData->getField< uint8_t >( row, 4 );
 }
 
 Sapphire::Data::Picture::Picture( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
 {
-   auto row = exdData->m_PictureDat.get_row( row_id );
-   item = exdData->getField< int32_t >( row, 0 );
-   image = exdData->getField< int32_t >( row, 1 );
-   signature = exdData->getField< int32_t >( row, 2 );
+  auto row = exdData->m_PictureDat.get_row( row_id );
+  item = exdData->getField< int32_t >( row, 0 );
+  image = exdData->getField< int32_t >( row, 1 );
+  signature = exdData->getField< int32_t >( row, 2 );
 }
 
 Sapphire::Data::PlaceName::PlaceName( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
 {
-   auto row = exdData->m_PlaceNameDat.get_row( row_id );
-   name = exdData->getField< std::string >( row, 0 );
-   nameNoArticle = exdData->getField< std::string >( row, 2 );
+  auto row = exdData->m_PlaceNameDat.get_row( row_id );
+  name = exdData->getField< std::string >( row, 0 );
+  nameNoArticle = exdData->getField< std::string >( row, 2 );
 }
 
 Sapphire::Data::PlantPotFlowerSeed::PlantPotFlowerSeed( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
 {
-   auto row = exdData->m_PlantPotFlowerSeedDat.get_row( row_id );
-   seedIcon.push_back( exdData->getField< uint32_t >( row, 0 ) );
-   seedIcon.push_back( exdData->getField< uint32_t >( row, 1 ) );
-   seedIcon.push_back( exdData->getField< uint32_t >( row, 2 ) );
-   seedIcon.push_back( exdData->getField< uint32_t >( row, 3 ) );
-   seedIcon.push_back( exdData->getField< uint32_t >( row, 4 ) );
-   seedIcon.push_back( exdData->getField< uint32_t >( row, 5 ) );
-   seedIcon.push_back( exdData->getField< uint32_t >( row, 6 ) );
-   seedIcon.push_back( exdData->getField< uint32_t >( row, 7 ) );
-   seedIcon.push_back( exdData->getField< uint32_t >( row, 8 ) );
+  auto row = exdData->m_PlantPotFlowerSeedDat.get_row( row_id );
+  seedIcon.push_back( exdData->getField< uint32_t >( row, 0 ) );
+  seedIcon.push_back( exdData->getField< uint32_t >( row, 1 ) );
+  seedIcon.push_back( exdData->getField< uint32_t >( row, 2 ) );
+  seedIcon.push_back( exdData->getField< uint32_t >( row, 3 ) );
+  seedIcon.push_back( exdData->getField< uint32_t >( row, 4 ) );
+  seedIcon.push_back( exdData->getField< uint32_t >( row, 5 ) );
+  seedIcon.push_back( exdData->getField< uint32_t >( row, 6 ) );
+  seedIcon.push_back( exdData->getField< uint32_t >( row, 7 ) );
+  seedIcon.push_back( exdData->getField< uint32_t >( row, 8 ) );
 }
 
 Sapphire::Data::PreHandler::PreHandler( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
 {
-   auto row = exdData->m_PreHandlerDat.get_row( row_id );
-   gilShop = exdData->getField< uint32_t >( row, 0 );
-   actionTimeline = exdData->getField< uint16_t >( row, 2 );
+  auto row = exdData->m_PreHandlerDat.get_row( row_id );
+  target = exdData->getField< uint32_t >( row, 0 );
+  actionTimeline = exdData->getField< uint16_t >( row, 2 );
 }
 
 Sapphire::Data::PublicContent::PublicContent( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
 {
-   auto row = exdData->m_PublicContentDat.get_row( row_id );
-   type = exdData->getField< uint8_t >( row, 0 );
-   timeLimit = exdData->getField< uint16_t >( row, 1 );
-   mapIcon = exdData->getField< uint32_t >( row, 2 );
-   name = exdData->getField< std::string >( row, 3 );
-   textDataStart = exdData->getField< uint32_t >( row, 4 );
-   textDataEnd = exdData->getField< uint32_t >( row, 5 );
-   contentFinderCondition = exdData->getField< uint16_t >( row, 8 );
-   additionalData = exdData->getField< uint16_t >( row, 9 );
+  auto row = exdData->m_PublicContentDat.get_row( row_id );
+  type = exdData->getField< uint8_t >( row, 0 );
+  timeLimit = exdData->getField< uint16_t >( row, 1 );
+  mapIcon = exdData->getField< uint32_t >( row, 2 );
+  name = exdData->getField< std::string >( row, 3 );
+  textDataStart = exdData->getField< uint32_t >( row, 4 );
+  textDataEnd = exdData->getField< uint32_t >( row, 5 );
+  contentFinderCondition = exdData->getField< uint16_t >( row, 8 );
+  additionalData = exdData->getField< uint16_t >( row, 9 );
 }
 
 Sapphire::Data::PublicContentCutscene::PublicContentCutscene( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
 {
-   auto row = exdData->m_PublicContentCutsceneDat.get_row( row_id );
-   cutscene = exdData->getField< uint32_t >( row, 0 );
-   cutscene2 = exdData->getField< uint32_t >( row, 1 );
+  auto row = exdData->m_PublicContentCutsceneDat.get_row( row_id );
+  cutscene = exdData->getField< uint32_t >( row, 0 );
+  cutscene2 = exdData->getField< uint32_t >( row, 1 );
 }
 
 Sapphire::Data::PublicContentTextData::PublicContentTextData( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
 {
-   auto row = exdData->m_PublicContentTextDataDat.get_row( row_id );
-   textData = exdData->getField< std::string >( row, 0 );
+  auto row = exdData->m_PublicContentTextDataDat.get_row( row_id );
+  textData = exdData->getField< std::string >( row, 0 );
 }
 
 Sapphire::Data::PvPAction::PvPAction( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
 {
-   auto row = exdData->m_PvPActionDat.get_row( row_id );
-   action = exdData->getField< uint16_t >( row, 0 );
+  auto row = exdData->m_PvPActionDat.get_row( row_id );
+  action = exdData->getField< uint16_t >( row, 0 );
 }
 
 Sapphire::Data::PvPActionSort::PvPActionSort( uint32_t row_id, uint32_t subRow, Sapphire::Data::ExdDataGenerated* exdData )
 {
-   auto row = exdData->m_PvPActionSortDat.get_row( row_id, subRow );
-   name = exdData->getField< uint8_t >( row, 0 );
-   action = exdData->getField< uint16_t >( row, 1 );
+  auto row = exdData->m_PvPActionSortDat.get_row( row_id, subRow );
+  name = exdData->getField< uint8_t >( row, 0 );
+  action = exdData->getField< uint16_t >( row, 1 );
 }
 
 Sapphire::Data::PvPRank::PvPRank( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
 {
-   auto row = exdData->m_PvPRankDat.get_row( row_id );
-   expRequired = exdData->getField< uint32_t >( row, 0 );
+  auto row = exdData->m_PvPRankDat.get_row( row_id );
+  expRequired = exdData->getField< uint32_t >( row, 0 );
 }
 
 Sapphire::Data::PvPSelectTrait::PvPSelectTrait( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
 {
-   auto row = exdData->m_PvPSelectTraitDat.get_row( row_id );
-   effect = exdData->getField< std::string >( row, 0 );
-   icon = exdData->getField< uint32_t >( row, 1 );
-   value = exdData->getField< int16_t >( row, 2 );
+  auto row = exdData->m_PvPSelectTraitDat.get_row( row_id );
+  effect = exdData->getField< std::string >( row, 0 );
+  icon = exdData->getField< uint32_t >( row, 1 );
+  value = exdData->getField< int16_t >( row, 2 );
 }
 
 Sapphire::Data::PvPTrait::PvPTrait( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
 {
-   auto row = exdData->m_PvPTraitDat.get_row( row_id );
-   trait1 = exdData->getField< uint16_t >( row, 0 );
-   trait2 = exdData->getField< uint16_t >( row, 1 );
-   trait3 = exdData->getField< uint16_t >( row, 2 );
+  auto row = exdData->m_PvPTraitDat.get_row( row_id );
+  trait1 = exdData->getField< uint16_t >( row, 0 );
+  trait2 = exdData->getField< uint16_t >( row, 1 );
+  trait3 = exdData->getField< uint16_t >( row, 2 );
 }
 
 Sapphire::Data::Quest::Quest( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
 {
-   auto row = exdData->m_QuestDat.get_row( row_id );
-   name = exdData->getField< std::string >( row, 0 );
-   id = exdData->getField< std::string >( row, 1 );
-   expansion = exdData->getField< uint8_t >( row, 2 );
-   classJobCategory0 = exdData->getField< uint8_t >( row, 3 );
-   classJobLevel0 = exdData->getField< uint16_t >( row, 4 );
-   questLevelOffset = exdData->getField< uint8_t >( row, 5 );
-   levelMax = exdData->getField< uint16_t >( row, 6 );
-   classJobCategory1 = exdData->getField< uint8_t >( row, 7 );
-   classJobLevel1 = exdData->getField< uint16_t >( row, 8 );
-   previousQuestJoin = exdData->getField< uint8_t >( row, 9 );
-   previousQuest0 = exdData->getField< uint32_t >( row, 10 );
-   previousQuest1 = exdData->getField< uint32_t >( row, 12 );
-   previousQuest2 = exdData->getField< uint32_t >( row, 13 );
-   questLockJoin = exdData->getField< uint8_t >( row, 14 );
-   questLock.push_back( exdData->getField< uint32_t >( row, 15 ) );
-   questLock.push_back( exdData->getField< uint32_t >( row, 16 ) );
-   classJobUnlock = exdData->getField< uint8_t >( row, 20 );
-   grandCompany = exdData->getField< uint8_t >( row, 21 );
-   grandCompanyRank = exdData->getField< uint8_t >( row, 22 );
-   instanceContentJoin = exdData->getField< uint8_t >( row, 23 );
-   instanceContent.push_back( exdData->getField< uint32_t >( row, 24 ) );
-   instanceContent.push_back( exdData->getField< uint32_t >( row, 25 ) );
-   instanceContent.push_back( exdData->getField< uint32_t >( row, 26 ) );
-   festival = exdData->getField< uint8_t >( row, 27 );
-   bellStart = exdData->getField< uint16_t >( row, 30 );
-   bellEnd = exdData->getField< uint16_t >( row, 31 );
-   beastTribe = exdData->getField< uint8_t >( row, 32 );
-   beastReputationRank = exdData->getField< uint8_t >( row, 33 );
-   mountRequired = exdData->getField< int32_t >( row, 37 );
-   isHouseRequired = exdData->getField< bool >( row, 38 );
-   deliveryQuest = exdData->getField< uint8_t >( row, 39 );
-   issuerStart = exdData->getField< uint32_t >( row, 40 );
-   behavior = exdData->getField< uint16_t >( row, 41 );
-   targetEnd = exdData->getField< uint32_t >( row, 42 );
-   isRepeatable = exdData->getField< bool >( row, 43 );
-   repeatIntervalType = exdData->getField< uint8_t >( row, 44 );
-   questRepeatFlag = exdData->getField< uint8_t >( row, 45 );
-   unlocksSystemContent = exdData->getField< bool >( row, 46 );
-   type = exdData->getField< uint8_t >( row, 48 );
-   questClassJobSupply = exdData->getField< uint16_t >( row, 49 );
-   scriptInstruction.push_back( exdData->getField< std::string >( row, 50 ) );
-   scriptInstruction.push_back( exdData->getField< std::string >( row, 51 ) );
-   scriptInstruction.push_back( exdData->getField< std::string >( row, 52 ) );
-   scriptInstruction.push_back( exdData->getField< std::string >( row, 53 ) );
-   scriptInstruction.push_back( exdData->getField< std::string >( row, 54 ) );
-   scriptInstruction.push_back( exdData->getField< std::string >( row, 55 ) );
-   scriptInstruction.push_back( exdData->getField< std::string >( row, 56 ) );
-   scriptInstruction.push_back( exdData->getField< std::string >( row, 57 ) );
-   scriptInstruction.push_back( exdData->getField< std::string >( row, 58 ) );
-   scriptInstruction.push_back( exdData->getField< std::string >( row, 59 ) );
-   scriptInstruction.push_back( exdData->getField< std::string >( row, 60 ) );
-   scriptInstruction.push_back( exdData->getField< std::string >( row, 61 ) );
-   scriptInstruction.push_back( exdData->getField< std::string >( row, 62 ) );
-   scriptInstruction.push_back( exdData->getField< std::string >( row, 63 ) );
-   scriptInstruction.push_back( exdData->getField< std::string >( row, 64 ) );
-   scriptInstruction.push_back( exdData->getField< std::string >( row, 65 ) );
-   scriptInstruction.push_back( exdData->getField< std::string >( row, 66 ) );
-   scriptInstruction.push_back( exdData->getField< std::string >( row, 67 ) );
-   scriptInstruction.push_back( exdData->getField< std::string >( row, 68 ) );
-   scriptInstruction.push_back( exdData->getField< std::string >( row, 69 ) );
-   scriptInstruction.push_back( exdData->getField< std::string >( row, 70 ) );
-   scriptInstruction.push_back( exdData->getField< std::string >( row, 71 ) );
-   scriptInstruction.push_back( exdData->getField< std::string >( row, 72 ) );
-   scriptInstruction.push_back( exdData->getField< std::string >( row, 73 ) );
-   scriptInstruction.push_back( exdData->getField< std::string >( row, 74 ) );
-   scriptInstruction.push_back( exdData->getField< std::string >( row, 75 ) );
-   scriptInstruction.push_back( exdData->getField< std::string >( row, 76 ) );
-   scriptInstruction.push_back( exdData->getField< std::string >( row, 77 ) );
-   scriptInstruction.push_back( exdData->getField< std::string >( row, 78 ) );
-   scriptInstruction.push_back( exdData->getField< std::string >( row, 79 ) );
-   scriptInstruction.push_back( exdData->getField< std::string >( row, 80 ) );
-   scriptInstruction.push_back( exdData->getField< std::string >( row, 81 ) );
-   scriptInstruction.push_back( exdData->getField< std::string >( row, 82 ) );
-   scriptInstruction.push_back( exdData->getField< std::string >( row, 83 ) );
-   scriptInstruction.push_back( exdData->getField< std::string >( row, 84 ) );
-   scriptInstruction.push_back( exdData->getField< std::string >( row, 85 ) );
-   scriptInstruction.push_back( exdData->getField< std::string >( row, 86 ) );
-   scriptInstruction.push_back( exdData->getField< std::string >( row, 87 ) );
-   scriptInstruction.push_back( exdData->getField< std::string >( row, 88 ) );
-   scriptInstruction.push_back( exdData->getField< std::string >( row, 89 ) );
-   scriptInstruction.push_back( exdData->getField< std::string >( row, 90 ) );
-   scriptInstruction.push_back( exdData->getField< std::string >( row, 91 ) );
-   scriptInstruction.push_back( exdData->getField< std::string >( row, 92 ) );
-   scriptInstruction.push_back( exdData->getField< std::string >( row, 93 ) );
-   scriptInstruction.push_back( exdData->getField< std::string >( row, 94 ) );
-   scriptInstruction.push_back( exdData->getField< std::string >( row, 95 ) );
-   scriptInstruction.push_back( exdData->getField< std::string >( row, 96 ) );
-   scriptInstruction.push_back( exdData->getField< std::string >( row, 97 ) );
-   scriptInstruction.push_back( exdData->getField< std::string >( row, 98 ) );
-   scriptInstruction.push_back( exdData->getField< std::string >( row, 99 ) );
-   scriptArg.push_back( exdData->getField< uint32_t >( row, 100 ) );
-   scriptArg.push_back( exdData->getField< uint32_t >( row, 101 ) );
-   scriptArg.push_back( exdData->getField< uint32_t >( row, 102 ) );
-   scriptArg.push_back( exdData->getField< uint32_t >( row, 103 ) );
-   scriptArg.push_back( exdData->getField< uint32_t >( row, 104 ) );
-   scriptArg.push_back( exdData->getField< uint32_t >( row, 105 ) );
-   scriptArg.push_back( exdData->getField< uint32_t >( row, 106 ) );
-   scriptArg.push_back( exdData->getField< uint32_t >( row, 107 ) );
-   scriptArg.push_back( exdData->getField< uint32_t >( row, 108 ) );
-   scriptArg.push_back( exdData->getField< uint32_t >( row, 109 ) );
-   scriptArg.push_back( exdData->getField< uint32_t >( row, 110 ) );
-   scriptArg.push_back( exdData->getField< uint32_t >( row, 111 ) );
-   scriptArg.push_back( exdData->getField< uint32_t >( row, 112 ) );
-   scriptArg.push_back( exdData->getField< uint32_t >( row, 113 ) );
-   scriptArg.push_back( exdData->getField< uint32_t >( row, 114 ) );
-   scriptArg.push_back( exdData->getField< uint32_t >( row, 115 ) );
-   scriptArg.push_back( exdData->getField< uint32_t >( row, 116 ) );
-   scriptArg.push_back( exdData->getField< uint32_t >( row, 117 ) );
-   scriptArg.push_back( exdData->getField< uint32_t >( row, 118 ) );
-   scriptArg.push_back( exdData->getField< uint32_t >( row, 119 ) );
-   scriptArg.push_back( exdData->getField< uint32_t >( row, 120 ) );
-   scriptArg.push_back( exdData->getField< uint32_t >( row, 121 ) );
-   scriptArg.push_back( exdData->getField< uint32_t >( row, 122 ) );
-   scriptArg.push_back( exdData->getField< uint32_t >( row, 123 ) );
-   scriptArg.push_back( exdData->getField< uint32_t >( row, 124 ) );
-   scriptArg.push_back( exdData->getField< uint32_t >( row, 125 ) );
-   scriptArg.push_back( exdData->getField< uint32_t >( row, 126 ) );
-   scriptArg.push_back( exdData->getField< uint32_t >( row, 127 ) );
-   scriptArg.push_back( exdData->getField< uint32_t >( row, 128 ) );
-   scriptArg.push_back( exdData->getField< uint32_t >( row, 129 ) );
-   scriptArg.push_back( exdData->getField< uint32_t >( row, 130 ) );
-   scriptArg.push_back( exdData->getField< uint32_t >( row, 131 ) );
-   scriptArg.push_back( exdData->getField< uint32_t >( row, 132 ) );
-   scriptArg.push_back( exdData->getField< uint32_t >( row, 133 ) );
-   scriptArg.push_back( exdData->getField< uint32_t >( row, 134 ) );
-   scriptArg.push_back( exdData->getField< uint32_t >( row, 135 ) );
-   scriptArg.push_back( exdData->getField< uint32_t >( row, 136 ) );
-   scriptArg.push_back( exdData->getField< uint32_t >( row, 137 ) );
-   scriptArg.push_back( exdData->getField< uint32_t >( row, 138 ) );
-   scriptArg.push_back( exdData->getField< uint32_t >( row, 139 ) );
-   scriptArg.push_back( exdData->getField< uint32_t >( row, 140 ) );
-   scriptArg.push_back( exdData->getField< uint32_t >( row, 141 ) );
-   scriptArg.push_back( exdData->getField< uint32_t >( row, 142 ) );
-   scriptArg.push_back( exdData->getField< uint32_t >( row, 143 ) );
-   scriptArg.push_back( exdData->getField< uint32_t >( row, 144 ) );
-   scriptArg.push_back( exdData->getField< uint32_t >( row, 145 ) );
-   scriptArg.push_back( exdData->getField< uint32_t >( row, 146 ) );
-   scriptArg.push_back( exdData->getField< uint32_t >( row, 147 ) );
-   scriptArg.push_back( exdData->getField< uint32_t >( row, 148 ) );
-   scriptArg.push_back( exdData->getField< uint32_t >( row, 149 ) );
-   actorSpawnSeq.push_back( exdData->getField< uint8_t >( row, 150 ) );
-   actorSpawnSeq.push_back( exdData->getField< uint8_t >( row, 151 ) );
-   actorSpawnSeq.push_back( exdData->getField< uint8_t >( row, 152 ) );
-   actorSpawnSeq.push_back( exdData->getField< uint8_t >( row, 153 ) );
-   actorSpawnSeq.push_back( exdData->getField< uint8_t >( row, 154 ) );
-   actorSpawnSeq.push_back( exdData->getField< uint8_t >( row, 155 ) );
-   actorSpawnSeq.push_back( exdData->getField< uint8_t >( row, 156 ) );
-   actorSpawnSeq.push_back( exdData->getField< uint8_t >( row, 157 ) );
-   actorSpawnSeq.push_back( exdData->getField< uint8_t >( row, 158 ) );
-   actorSpawnSeq.push_back( exdData->getField< uint8_t >( row, 159 ) );
-   actorSpawnSeq.push_back( exdData->getField< uint8_t >( row, 160 ) );
-   actorSpawnSeq.push_back( exdData->getField< uint8_t >( row, 161 ) );
-   actorSpawnSeq.push_back( exdData->getField< uint8_t >( row, 162 ) );
-   actorSpawnSeq.push_back( exdData->getField< uint8_t >( row, 163 ) );
-   actorSpawnSeq.push_back( exdData->getField< uint8_t >( row, 164 ) );
-   actorSpawnSeq.push_back( exdData->getField< uint8_t >( row, 165 ) );
-   actorSpawnSeq.push_back( exdData->getField< uint8_t >( row, 166 ) );
-   actorSpawnSeq.push_back( exdData->getField< uint8_t >( row, 167 ) );
-   actorSpawnSeq.push_back( exdData->getField< uint8_t >( row, 168 ) );
-   actorSpawnSeq.push_back( exdData->getField< uint8_t >( row, 169 ) );
-   actorSpawnSeq.push_back( exdData->getField< uint8_t >( row, 170 ) );
-   actorSpawnSeq.push_back( exdData->getField< uint8_t >( row, 171 ) );
-   actorSpawnSeq.push_back( exdData->getField< uint8_t >( row, 172 ) );
-   actorSpawnSeq.push_back( exdData->getField< uint8_t >( row, 173 ) );
-   actorSpawnSeq.push_back( exdData->getField< uint8_t >( row, 174 ) );
-   actorSpawnSeq.push_back( exdData->getField< uint8_t >( row, 175 ) );
-   actorSpawnSeq.push_back( exdData->getField< uint8_t >( row, 176 ) );
-   actorSpawnSeq.push_back( exdData->getField< uint8_t >( row, 177 ) );
-   actorSpawnSeq.push_back( exdData->getField< uint8_t >( row, 178 ) );
-   actorSpawnSeq.push_back( exdData->getField< uint8_t >( row, 179 ) );
-   actorSpawnSeq.push_back( exdData->getField< uint8_t >( row, 180 ) );
-   actorSpawnSeq.push_back( exdData->getField< uint8_t >( row, 181 ) );
-   actorSpawnSeq.push_back( exdData->getField< uint8_t >( row, 182 ) );
-   actorSpawnSeq.push_back( exdData->getField< uint8_t >( row, 183 ) );
-   actorSpawnSeq.push_back( exdData->getField< uint8_t >( row, 184 ) );
-   actorSpawnSeq.push_back( exdData->getField< uint8_t >( row, 185 ) );
-   actorSpawnSeq.push_back( exdData->getField< uint8_t >( row, 186 ) );
-   actorSpawnSeq.push_back( exdData->getField< uint8_t >( row, 187 ) );
-   actorSpawnSeq.push_back( exdData->getField< uint8_t >( row, 188 ) );
-   actorSpawnSeq.push_back( exdData->getField< uint8_t >( row, 189 ) );
-   actorSpawnSeq.push_back( exdData->getField< uint8_t >( row, 190 ) );
-   actorSpawnSeq.push_back( exdData->getField< uint8_t >( row, 191 ) );
-   actorSpawnSeq.push_back( exdData->getField< uint8_t >( row, 192 ) );
-   actorSpawnSeq.push_back( exdData->getField< uint8_t >( row, 193 ) );
-   actorSpawnSeq.push_back( exdData->getField< uint8_t >( row, 194 ) );
-   actorSpawnSeq.push_back( exdData->getField< uint8_t >( row, 195 ) );
-   actorSpawnSeq.push_back( exdData->getField< uint8_t >( row, 196 ) );
-   actorSpawnSeq.push_back( exdData->getField< uint8_t >( row, 197 ) );
-   actorSpawnSeq.push_back( exdData->getField< uint8_t >( row, 198 ) );
-   actorSpawnSeq.push_back( exdData->getField< uint8_t >( row, 199 ) );
-   actorSpawnSeq.push_back( exdData->getField< uint8_t >( row, 200 ) );
-   actorSpawnSeq.push_back( exdData->getField< uint8_t >( row, 201 ) );
-   actorSpawnSeq.push_back( exdData->getField< uint8_t >( row, 202 ) );
-   actorSpawnSeq.push_back( exdData->getField< uint8_t >( row, 203 ) );
-   actorSpawnSeq.push_back( exdData->getField< uint8_t >( row, 204 ) );
-   actorSpawnSeq.push_back( exdData->getField< uint8_t >( row, 205 ) );
-   actorSpawnSeq.push_back( exdData->getField< uint8_t >( row, 206 ) );
-   actorSpawnSeq.push_back( exdData->getField< uint8_t >( row, 207 ) );
-   actorSpawnSeq.push_back( exdData->getField< uint8_t >( row, 208 ) );
-   actorSpawnSeq.push_back( exdData->getField< uint8_t >( row, 209 ) );
-   actorSpawnSeq.push_back( exdData->getField< uint8_t >( row, 210 ) );
-   actorSpawnSeq.push_back( exdData->getField< uint8_t >( row, 211 ) );
-   actorSpawnSeq.push_back( exdData->getField< uint8_t >( row, 212 ) );
-   actorSpawnSeq.push_back( exdData->getField< uint8_t >( row, 213 ) );
-   actorDespawnSeq.push_back( exdData->getField< uint8_t >( row, 214 ) );
-   actorDespawnSeq.push_back( exdData->getField< uint8_t >( row, 215 ) );
-   actorDespawnSeq.push_back( exdData->getField< uint8_t >( row, 216 ) );
-   actorDespawnSeq.push_back( exdData->getField< uint8_t >( row, 217 ) );
-   actorDespawnSeq.push_back( exdData->getField< uint8_t >( row, 218 ) );
-   actorDespawnSeq.push_back( exdData->getField< uint8_t >( row, 219 ) );
-   actorDespawnSeq.push_back( exdData->getField< uint8_t >( row, 220 ) );
-   actorDespawnSeq.push_back( exdData->getField< uint8_t >( row, 221 ) );
-   actorDespawnSeq.push_back( exdData->getField< uint8_t >( row, 222 ) );
-   actorDespawnSeq.push_back( exdData->getField< uint8_t >( row, 223 ) );
-   actorDespawnSeq.push_back( exdData->getField< uint8_t >( row, 224 ) );
-   actorDespawnSeq.push_back( exdData->getField< uint8_t >( row, 225 ) );
-   actorDespawnSeq.push_back( exdData->getField< uint8_t >( row, 226 ) );
-   actorDespawnSeq.push_back( exdData->getField< uint8_t >( row, 227 ) );
-   actorDespawnSeq.push_back( exdData->getField< uint8_t >( row, 228 ) );
-   actorDespawnSeq.push_back( exdData->getField< uint8_t >( row, 229 ) );
-   actorDespawnSeq.push_back( exdData->getField< uint8_t >( row, 230 ) );
-   actorDespawnSeq.push_back( exdData->getField< uint8_t >( row, 231 ) );
-   actorDespawnSeq.push_back( exdData->getField< uint8_t >( row, 232 ) );
-   actorDespawnSeq.push_back( exdData->getField< uint8_t >( row, 233 ) );
-   actorDespawnSeq.push_back( exdData->getField< uint8_t >( row, 234 ) );
-   actorDespawnSeq.push_back( exdData->getField< uint8_t >( row, 235 ) );
-   actorDespawnSeq.push_back( exdData->getField< uint8_t >( row, 236 ) );
-   actorDespawnSeq.push_back( exdData->getField< uint8_t >( row, 237 ) );
-   actorDespawnSeq.push_back( exdData->getField< uint8_t >( row, 238 ) );
-   actorDespawnSeq.push_back( exdData->getField< uint8_t >( row, 239 ) );
-   actorDespawnSeq.push_back( exdData->getField< uint8_t >( row, 240 ) );
-   actorDespawnSeq.push_back( exdData->getField< uint8_t >( row, 241 ) );
-   actorDespawnSeq.push_back( exdData->getField< uint8_t >( row, 242 ) );
-   actorDespawnSeq.push_back( exdData->getField< uint8_t >( row, 243 ) );
-   actorDespawnSeq.push_back( exdData->getField< uint8_t >( row, 244 ) );
-   actorDespawnSeq.push_back( exdData->getField< uint8_t >( row, 245 ) );
-   actorDespawnSeq.push_back( exdData->getField< uint8_t >( row, 246 ) );
-   actorDespawnSeq.push_back( exdData->getField< uint8_t >( row, 247 ) );
-   actorDespawnSeq.push_back( exdData->getField< uint8_t >( row, 248 ) );
-   actorDespawnSeq.push_back( exdData->getField< uint8_t >( row, 249 ) );
-   actorDespawnSeq.push_back( exdData->getField< uint8_t >( row, 250 ) );
-   actorDespawnSeq.push_back( exdData->getField< uint8_t >( row, 251 ) );
-   actorDespawnSeq.push_back( exdData->getField< uint8_t >( row, 252 ) );
-   actorDespawnSeq.push_back( exdData->getField< uint8_t >( row, 253 ) );
-   actorDespawnSeq.push_back( exdData->getField< uint8_t >( row, 254 ) );
-   actorDespawnSeq.push_back( exdData->getField< uint8_t >( row, 255 ) );
-   actorDespawnSeq.push_back( exdData->getField< uint8_t >( row, 256 ) );
-   actorDespawnSeq.push_back( exdData->getField< uint8_t >( row, 257 ) );
-   actorDespawnSeq.push_back( exdData->getField< uint8_t >( row, 258 ) );
-   actorDespawnSeq.push_back( exdData->getField< uint8_t >( row, 259 ) );
-   actorDespawnSeq.push_back( exdData->getField< uint8_t >( row, 260 ) );
-   actorDespawnSeq.push_back( exdData->getField< uint8_t >( row, 261 ) );
-   actorDespawnSeq.push_back( exdData->getField< uint8_t >( row, 262 ) );
-   actorDespawnSeq.push_back( exdData->getField< uint8_t >( row, 263 ) );
-   actorDespawnSeq.push_back( exdData->getField< uint8_t >( row, 264 ) );
-   actorDespawnSeq.push_back( exdData->getField< uint8_t >( row, 265 ) );
-   actorDespawnSeq.push_back( exdData->getField< uint8_t >( row, 266 ) );
-   actorDespawnSeq.push_back( exdData->getField< uint8_t >( row, 267 ) );
-   actorDespawnSeq.push_back( exdData->getField< uint8_t >( row, 268 ) );
-   actorDespawnSeq.push_back( exdData->getField< uint8_t >( row, 269 ) );
-   actorDespawnSeq.push_back( exdData->getField< uint8_t >( row, 270 ) );
-   actorDespawnSeq.push_back( exdData->getField< uint8_t >( row, 271 ) );
-   actorDespawnSeq.push_back( exdData->getField< uint8_t >( row, 272 ) );
-   actorDespawnSeq.push_back( exdData->getField< uint8_t >( row, 273 ) );
-   actorDespawnSeq.push_back( exdData->getField< uint8_t >( row, 274 ) );
-   actorDespawnSeq.push_back( exdData->getField< uint8_t >( row, 275 ) );
-   actorDespawnSeq.push_back( exdData->getField< uint8_t >( row, 276 ) );
-   actorDespawnSeq.push_back( exdData->getField< uint8_t >( row, 277 ) );
-   actorSpawn.push_back( exdData->getField< uint32_t >( row, 278 ) );
-   actorSpawn.push_back( exdData->getField< uint32_t >( row, 279 ) );
-   actorSpawn.push_back( exdData->getField< uint32_t >( row, 280 ) );
-   actorSpawn.push_back( exdData->getField< uint32_t >( row, 281 ) );
-   actorSpawn.push_back( exdData->getField< uint32_t >( row, 282 ) );
-   actorSpawn.push_back( exdData->getField< uint32_t >( row, 283 ) );
-   actorSpawn.push_back( exdData->getField< uint32_t >( row, 284 ) );
-   actorSpawn.push_back( exdData->getField< uint32_t >( row, 285 ) );
-   actorSpawn.push_back( exdData->getField< uint32_t >( row, 286 ) );
-   actorSpawn.push_back( exdData->getField< uint32_t >( row, 287 ) );
-   actorSpawn.push_back( exdData->getField< uint32_t >( row, 288 ) );
-   actorSpawn.push_back( exdData->getField< uint32_t >( row, 289 ) );
-   actorSpawn.push_back( exdData->getField< uint32_t >( row, 290 ) );
-   actorSpawn.push_back( exdData->getField< uint32_t >( row, 291 ) );
-   actorSpawn.push_back( exdData->getField< uint32_t >( row, 292 ) );
-   actorSpawn.push_back( exdData->getField< uint32_t >( row, 293 ) );
-   actorSpawn.push_back( exdData->getField< uint32_t >( row, 294 ) );
-   actorSpawn.push_back( exdData->getField< uint32_t >( row, 295 ) );
-   actorSpawn.push_back( exdData->getField< uint32_t >( row, 296 ) );
-   actorSpawn.push_back( exdData->getField< uint32_t >( row, 297 ) );
-   actorSpawn.push_back( exdData->getField< uint32_t >( row, 298 ) );
-   actorSpawn.push_back( exdData->getField< uint32_t >( row, 299 ) );
-   actorSpawn.push_back( exdData->getField< uint32_t >( row, 300 ) );
-   actorSpawn.push_back( exdData->getField< uint32_t >( row, 301 ) );
-   actorSpawn.push_back( exdData->getField< uint32_t >( row, 302 ) );
-   actorSpawn.push_back( exdData->getField< uint32_t >( row, 303 ) );
-   actorSpawn.push_back( exdData->getField< uint32_t >( row, 304 ) );
-   actorSpawn.push_back( exdData->getField< uint32_t >( row, 305 ) );
-   actorSpawn.push_back( exdData->getField< uint32_t >( row, 306 ) );
-   actorSpawn.push_back( exdData->getField< uint32_t >( row, 307 ) );
-   actorSpawn.push_back( exdData->getField< uint32_t >( row, 308 ) );
-   actorSpawn.push_back( exdData->getField< uint32_t >( row, 309 ) );
-   actorSpawn.push_back( exdData->getField< uint32_t >( row, 310 ) );
-   actorSpawn.push_back( exdData->getField< uint32_t >( row, 311 ) );
-   actorSpawn.push_back( exdData->getField< uint32_t >( row, 312 ) );
-   actorSpawn.push_back( exdData->getField< uint32_t >( row, 313 ) );
-   actorSpawn.push_back( exdData->getField< uint32_t >( row, 314 ) );
-   actorSpawn.push_back( exdData->getField< uint32_t >( row, 315 ) );
-   actorSpawn.push_back( exdData->getField< uint32_t >( row, 316 ) );
-   actorSpawn.push_back( exdData->getField< uint32_t >( row, 317 ) );
-   actorSpawn.push_back( exdData->getField< uint32_t >( row, 318 ) );
-   actorSpawn.push_back( exdData->getField< uint32_t >( row, 319 ) );
-   actorSpawn.push_back( exdData->getField< uint32_t >( row, 320 ) );
-   actorSpawn.push_back( exdData->getField< uint32_t >( row, 321 ) );
-   actorSpawn.push_back( exdData->getField< uint32_t >( row, 322 ) );
-   actorSpawn.push_back( exdData->getField< uint32_t >( row, 323 ) );
-   actorSpawn.push_back( exdData->getField< uint32_t >( row, 324 ) );
-   actorSpawn.push_back( exdData->getField< uint32_t >( row, 325 ) );
-   actorSpawn.push_back( exdData->getField< uint32_t >( row, 326 ) );
-   actorSpawn.push_back( exdData->getField< uint32_t >( row, 327 ) );
-   actorSpawn.push_back( exdData->getField< uint32_t >( row, 328 ) );
-   actorSpawn.push_back( exdData->getField< uint32_t >( row, 329 ) );
-   actorSpawn.push_back( exdData->getField< uint32_t >( row, 330 ) );
-   actorSpawn.push_back( exdData->getField< uint32_t >( row, 331 ) );
-   actorSpawn.push_back( exdData->getField< uint32_t >( row, 332 ) );
-   actorSpawn.push_back( exdData->getField< uint32_t >( row, 333 ) );
-   actorSpawn.push_back( exdData->getField< uint32_t >( row, 334 ) );
-   actorSpawn.push_back( exdData->getField< uint32_t >( row, 335 ) );
-   actorSpawn.push_back( exdData->getField< uint32_t >( row, 336 ) );
-   actorSpawn.push_back( exdData->getField< uint32_t >( row, 337 ) );
-   actorSpawn.push_back( exdData->getField< uint32_t >( row, 338 ) );
-   actorSpawn.push_back( exdData->getField< uint32_t >( row, 339 ) );
-   actorSpawn.push_back( exdData->getField< uint32_t >( row, 340 ) );
-   actorSpawn.push_back( exdData->getField< uint32_t >( row, 341 ) );
-   questUInt8A.push_back( exdData->getField< uint8_t >( row, 342 ) );
-   questUInt8A.push_back( exdData->getField< uint8_t >( row, 343 ) );
-   questUInt8A.push_back( exdData->getField< uint8_t >( row, 344 ) );
-   questUInt8A.push_back( exdData->getField< uint8_t >( row, 345 ) );
-   questUInt8A.push_back( exdData->getField< uint8_t >( row, 346 ) );
-   questUInt8A.push_back( exdData->getField< uint8_t >( row, 347 ) );
-   questUInt8A.push_back( exdData->getField< uint8_t >( row, 348 ) );
-   questUInt8A.push_back( exdData->getField< uint8_t >( row, 349 ) );
-   questUInt8A.push_back( exdData->getField< uint8_t >( row, 350 ) );
-   questUInt8A.push_back( exdData->getField< uint8_t >( row, 351 ) );
-   questUInt8A.push_back( exdData->getField< uint8_t >( row, 352 ) );
-   questUInt8A.push_back( exdData->getField< uint8_t >( row, 353 ) );
-   questUInt8A.push_back( exdData->getField< uint8_t >( row, 354 ) );
-   questUInt8A.push_back( exdData->getField< uint8_t >( row, 355 ) );
-   questUInt8A.push_back( exdData->getField< uint8_t >( row, 356 ) );
-   questUInt8A.push_back( exdData->getField< uint8_t >( row, 357 ) );
-   questUInt8A.push_back( exdData->getField< uint8_t >( row, 358 ) );
-   questUInt8A.push_back( exdData->getField< uint8_t >( row, 359 ) );
-   questUInt8A.push_back( exdData->getField< uint8_t >( row, 360 ) );
-   questUInt8A.push_back( exdData->getField< uint8_t >( row, 361 ) );
-   questUInt8A.push_back( exdData->getField< uint8_t >( row, 362 ) );
-   questUInt8A.push_back( exdData->getField< uint8_t >( row, 363 ) );
-   questUInt8A.push_back( exdData->getField< uint8_t >( row, 364 ) );
-   questUInt8A.push_back( exdData->getField< uint8_t >( row, 365 ) );
-   questUInt8A.push_back( exdData->getField< uint8_t >( row, 366 ) );
-   questUInt8A.push_back( exdData->getField< uint8_t >( row, 367 ) );
-   questUInt8A.push_back( exdData->getField< uint8_t >( row, 368 ) );
-   questUInt8A.push_back( exdData->getField< uint8_t >( row, 369 ) );
-   questUInt8A.push_back( exdData->getField< uint8_t >( row, 370 ) );
-   questUInt8A.push_back( exdData->getField< uint8_t >( row, 371 ) );
-   questUInt8A.push_back( exdData->getField< uint8_t >( row, 372 ) );
-   questUInt8A.push_back( exdData->getField< uint8_t >( row, 373 ) );
-   questUInt8B.push_back( exdData->getField< uint8_t >( row, 374 ) );
-   questUInt8B.push_back( exdData->getField< uint8_t >( row, 375 ) );
-   questUInt8B.push_back( exdData->getField< uint8_t >( row, 376 ) );
-   questUInt8B.push_back( exdData->getField< uint8_t >( row, 377 ) );
-   questUInt8B.push_back( exdData->getField< uint8_t >( row, 378 ) );
-   questUInt8B.push_back( exdData->getField< uint8_t >( row, 379 ) );
-   questUInt8B.push_back( exdData->getField< uint8_t >( row, 380 ) );
-   questUInt8B.push_back( exdData->getField< uint8_t >( row, 381 ) );
-   questUInt8B.push_back( exdData->getField< uint8_t >( row, 382 ) );
-   questUInt8B.push_back( exdData->getField< uint8_t >( row, 383 ) );
-   questUInt8B.push_back( exdData->getField< uint8_t >( row, 384 ) );
-   questUInt8B.push_back( exdData->getField< uint8_t >( row, 385 ) );
-   questUInt8B.push_back( exdData->getField< uint8_t >( row, 386 ) );
-   questUInt8B.push_back( exdData->getField< uint8_t >( row, 387 ) );
-   questUInt8B.push_back( exdData->getField< uint8_t >( row, 388 ) );
-   questUInt8B.push_back( exdData->getField< uint8_t >( row, 389 ) );
-   questUInt8B.push_back( exdData->getField< uint8_t >( row, 390 ) );
-   questUInt8B.push_back( exdData->getField< uint8_t >( row, 391 ) );
-   questUInt8B.push_back( exdData->getField< uint8_t >( row, 392 ) );
-   questUInt8B.push_back( exdData->getField< uint8_t >( row, 393 ) );
-   questUInt8B.push_back( exdData->getField< uint8_t >( row, 394 ) );
-   questUInt8B.push_back( exdData->getField< uint8_t >( row, 395 ) );
-   questUInt8B.push_back( exdData->getField< uint8_t >( row, 396 ) );
-   questUInt8B.push_back( exdData->getField< uint8_t >( row, 397 ) );
-   questUInt8B.push_back( exdData->getField< uint8_t >( row, 398 ) );
-   questUInt8B.push_back( exdData->getField< uint8_t >( row, 399 ) );
-   questUInt8B.push_back( exdData->getField< uint8_t >( row, 400 ) );
-   questUInt8B.push_back( exdData->getField< uint8_t >( row, 401 ) );
-   questUInt8B.push_back( exdData->getField< uint8_t >( row, 402 ) );
-   questUInt8B.push_back( exdData->getField< uint8_t >( row, 403 ) );
-   questUInt8B.push_back( exdData->getField< uint8_t >( row, 404 ) );
-   questUInt8B.push_back( exdData->getField< uint8_t >( row, 405 ) );
-   toDoCompleteSeq.push_back( exdData->getField< uint8_t >( row, 1174 ) );
-   toDoCompleteSeq.push_back( exdData->getField< uint8_t >( row, 1175 ) );
-   toDoCompleteSeq.push_back( exdData->getField< uint8_t >( row, 1176 ) );
-   toDoCompleteSeq.push_back( exdData->getField< uint8_t >( row, 1177 ) );
-   toDoCompleteSeq.push_back( exdData->getField< uint8_t >( row, 1178 ) );
-   toDoCompleteSeq.push_back( exdData->getField< uint8_t >( row, 1179 ) );
-   toDoCompleteSeq.push_back( exdData->getField< uint8_t >( row, 1180 ) );
-   toDoCompleteSeq.push_back( exdData->getField< uint8_t >( row, 1181 ) );
-   toDoCompleteSeq.push_back( exdData->getField< uint8_t >( row, 1182 ) );
-   toDoCompleteSeq.push_back( exdData->getField< uint8_t >( row, 1183 ) );
-   toDoCompleteSeq.push_back( exdData->getField< uint8_t >( row, 1184 ) );
-   toDoCompleteSeq.push_back( exdData->getField< uint8_t >( row, 1185 ) );
-   toDoCompleteSeq.push_back( exdData->getField< uint8_t >( row, 1186 ) );
-   toDoCompleteSeq.push_back( exdData->getField< uint8_t >( row, 1187 ) );
-   toDoCompleteSeq.push_back( exdData->getField< uint8_t >( row, 1188 ) );
-   toDoCompleteSeq.push_back( exdData->getField< uint8_t >( row, 1189 ) );
-   toDoCompleteSeq.push_back( exdData->getField< uint8_t >( row, 1190 ) );
-   toDoCompleteSeq.push_back( exdData->getField< uint8_t >( row, 1191 ) );
-   toDoCompleteSeq.push_back( exdData->getField< uint8_t >( row, 1192 ) );
-   toDoCompleteSeq.push_back( exdData->getField< uint8_t >( row, 1193 ) );
-   toDoCompleteSeq.push_back( exdData->getField< uint8_t >( row, 1194 ) );
-   toDoCompleteSeq.push_back( exdData->getField< uint8_t >( row, 1195 ) );
-   toDoCompleteSeq.push_back( exdData->getField< uint8_t >( row, 1196 ) );
-   toDoCompleteSeq.push_back( exdData->getField< uint8_t >( row, 1197 ) );
-   toDoQty.push_back( exdData->getField< uint8_t >( row, 1198 ) );
-   toDoQty.push_back( exdData->getField< uint8_t >( row, 1199 ) );
-   toDoQty.push_back( exdData->getField< uint8_t >( row, 1200 ) );
-   toDoQty.push_back( exdData->getField< uint8_t >( row, 1201 ) );
-   toDoQty.push_back( exdData->getField< uint8_t >( row, 1202 ) );
-   toDoQty.push_back( exdData->getField< uint8_t >( row, 1203 ) );
-   toDoQty.push_back( exdData->getField< uint8_t >( row, 1204 ) );
-   toDoQty.push_back( exdData->getField< uint8_t >( row, 1205 ) );
-   toDoQty.push_back( exdData->getField< uint8_t >( row, 1206 ) );
-   toDoQty.push_back( exdData->getField< uint8_t >( row, 1207 ) );
-   toDoQty.push_back( exdData->getField< uint8_t >( row, 1208 ) );
-   toDoQty.push_back( exdData->getField< uint8_t >( row, 1209 ) );
-   toDoQty.push_back( exdData->getField< uint8_t >( row, 1210 ) );
-   toDoQty.push_back( exdData->getField< uint8_t >( row, 1211 ) );
-   toDoQty.push_back( exdData->getField< uint8_t >( row, 1212 ) );
-   toDoQty.push_back( exdData->getField< uint8_t >( row, 1213 ) );
-   toDoQty.push_back( exdData->getField< uint8_t >( row, 1214 ) );
-   toDoQty.push_back( exdData->getField< uint8_t >( row, 1215 ) );
-   toDoQty.push_back( exdData->getField< uint8_t >( row, 1216 ) );
-   toDoQty.push_back( exdData->getField< uint8_t >( row, 1217 ) );
-   toDoQty.push_back( exdData->getField< uint8_t >( row, 1218 ) );
-   toDoQty.push_back( exdData->getField< uint8_t >( row, 1219 ) );
-   toDoQty.push_back( exdData->getField< uint8_t >( row, 1220 ) );
-   toDoQty.push_back( exdData->getField< uint8_t >( row, 1221 ) );
-   toDoMainLocation.push_back( exdData->getField< uint32_t >( row, 1222 ) );
-   toDoMainLocation.push_back( exdData->getField< uint32_t >( row, 1223 ) );
-   toDoMainLocation.push_back( exdData->getField< uint32_t >( row, 1224 ) );
-   toDoMainLocation.push_back( exdData->getField< uint32_t >( row, 1225 ) );
-   toDoMainLocation.push_back( exdData->getField< uint32_t >( row, 1226 ) );
-   toDoMainLocation.push_back( exdData->getField< uint32_t >( row, 1227 ) );
-   toDoMainLocation.push_back( exdData->getField< uint32_t >( row, 1228 ) );
-   toDoMainLocation.push_back( exdData->getField< uint32_t >( row, 1229 ) );
-   toDoMainLocation.push_back( exdData->getField< uint32_t >( row, 1230 ) );
-   toDoMainLocation.push_back( exdData->getField< uint32_t >( row, 1231 ) );
-   toDoMainLocation.push_back( exdData->getField< uint32_t >( row, 1232 ) );
-   toDoMainLocation.push_back( exdData->getField< uint32_t >( row, 1233 ) );
-   toDoMainLocation.push_back( exdData->getField< uint32_t >( row, 1234 ) );
-   toDoMainLocation.push_back( exdData->getField< uint32_t >( row, 1235 ) );
-   toDoMainLocation.push_back( exdData->getField< uint32_t >( row, 1236 ) );
-   toDoMainLocation.push_back( exdData->getField< uint32_t >( row, 1237 ) );
-   toDoMainLocation.push_back( exdData->getField< uint32_t >( row, 1238 ) );
-   toDoMainLocation.push_back( exdData->getField< uint32_t >( row, 1239 ) );
-   toDoMainLocation.push_back( exdData->getField< uint32_t >( row, 1240 ) );
-   toDoMainLocation.push_back( exdData->getField< uint32_t >( row, 1241 ) );
-   toDoMainLocation.push_back( exdData->getField< uint32_t >( row, 1242 ) );
-   toDoMainLocation.push_back( exdData->getField< uint32_t >( row, 1243 ) );
-   toDoMainLocation.push_back( exdData->getField< uint32_t >( row, 1244 ) );
-   toDoMainLocation.push_back( exdData->getField< uint32_t >( row, 1245 ) );
-   classJobRequired = exdData->getField< uint8_t >( row, 1438 );
-   expFactor = exdData->getField< uint16_t >( row, 1440 );
-   gilReward = exdData->getField< uint32_t >( row, 1441 );
-   gCSeals = exdData->getField< uint16_t >( row, 1443 );
-   itemCatalyst.push_back( exdData->getField< uint8_t >( row, 1444 ) );
-   itemCatalyst.push_back( exdData->getField< uint8_t >( row, 1445 ) );
-   itemCatalyst.push_back( exdData->getField< uint8_t >( row, 1446 ) );
-   itemCountCatalyst.push_back( exdData->getField< uint8_t >( row, 1447 ) );
-   itemCountCatalyst.push_back( exdData->getField< uint8_t >( row, 1448 ) );
-   itemCountCatalyst.push_back( exdData->getField< uint8_t >( row, 1449 ) );
-   itemRewardType = exdData->getField< uint8_t >( row, 1450 );
-   itemReward0.push_back( exdData->getField< uint32_t >( row, 1451 ) );
-   itemReward0.push_back( exdData->getField< uint32_t >( row, 1452 ) );
-   itemReward0.push_back( exdData->getField< uint32_t >( row, 1453 ) );
-   itemReward0.push_back( exdData->getField< uint32_t >( row, 1454 ) );
-   itemReward0.push_back( exdData->getField< uint32_t >( row, 1455 ) );
-   itemReward0.push_back( exdData->getField< uint32_t >( row, 1456 ) );
-   itemCountReward0.push_back( exdData->getField< uint8_t >( row, 1458 ) );
-   itemCountReward0.push_back( exdData->getField< uint8_t >( row, 1459 ) );
-   itemCountReward0.push_back( exdData->getField< uint8_t >( row, 1460 ) );
-   itemCountReward0.push_back( exdData->getField< uint8_t >( row, 1461 ) );
-   itemCountReward0.push_back( exdData->getField< uint8_t >( row, 1462 ) );
-   itemCountReward0.push_back( exdData->getField< uint8_t >( row, 1463 ) );
-   stainReward0.push_back( exdData->getField< uint8_t >( row, 1465 ) );
-   stainReward0.push_back( exdData->getField< uint8_t >( row, 1466 ) );
-   stainReward0.push_back( exdData->getField< uint8_t >( row, 1467 ) );
-   stainReward0.push_back( exdData->getField< uint8_t >( row, 1468 ) );
-   stainReward0.push_back( exdData->getField< uint8_t >( row, 1469 ) );
-   stainReward0.push_back( exdData->getField< uint8_t >( row, 1470 ) );
-   itemReward1.push_back( exdData->getField< uint32_t >( row, 1472 ) );
-   itemReward1.push_back( exdData->getField< uint32_t >( row, 1473 ) );
-   itemReward1.push_back( exdData->getField< uint32_t >( row, 1474 ) );
-   itemReward1.push_back( exdData->getField< uint32_t >( row, 1475 ) );
-   itemReward1.push_back( exdData->getField< uint32_t >( row, 1476 ) );
-   itemCountReward1.push_back( exdData->getField< uint8_t >( row, 1477 ) );
-   itemCountReward1.push_back( exdData->getField< uint8_t >( row, 1478 ) );
-   itemCountReward1.push_back( exdData->getField< uint8_t >( row, 1479 ) );
-   itemCountReward1.push_back( exdData->getField< uint8_t >( row, 1480 ) );
-   itemCountReward1.push_back( exdData->getField< uint8_t >( row, 1481 ) );
-   isHQReward1.push_back( exdData->getField< bool >( row, 1482 ) );
-   isHQReward1.push_back( exdData->getField< bool >( row, 1483 ) );
-   isHQReward1.push_back( exdData->getField< bool >( row, 1484 ) );
-   isHQReward1.push_back( exdData->getField< bool >( row, 1485 ) );
-   isHQReward1.push_back( exdData->getField< bool >( row, 1486 ) );
-   stainReward1.push_back( exdData->getField< uint8_t >( row, 1487 ) );
-   stainReward1.push_back( exdData->getField< uint8_t >( row, 1488 ) );
-   stainReward1.push_back( exdData->getField< uint8_t >( row, 1489 ) );
-   stainReward1.push_back( exdData->getField< uint8_t >( row, 1490 ) );
-   stainReward1.push_back( exdData->getField< uint8_t >( row, 1491 ) );
-   emoteReward = exdData->getField< uint8_t >( row, 1492 );
-   actionReward = exdData->getField< uint16_t >( row, 1493 );
-   generalActionReward.push_back( exdData->getField< uint8_t >( row, 1494 ) );
-   generalActionReward.push_back( exdData->getField< uint8_t >( row, 1495 ) );
-   otherReward = exdData->getField< uint8_t >( row, 1497 );
-   instanceContentUnlock = exdData->getField< uint32_t >( row, 1500 );
-   tomestoneReward = exdData->getField< uint8_t >( row, 1502 );
-   tomestoneCountReward = exdData->getField< uint8_t >( row, 1503 );
-   reputationReward = exdData->getField< uint8_t >( row, 1504 );
-   placeName = exdData->getField< uint16_t >( row, 1505 );
-   journalGenre = exdData->getField< uint8_t >( row, 1506 );
-   icon = exdData->getField< uint32_t >( row, 1508 );
-   iconSpecial = exdData->getField< uint32_t >( row, 1509 );
-   eventIconType = exdData->getField< uint8_t >( row, 1512 );
-   sortKey = exdData->getField< uint16_t >( row, 1514 );
+  auto row = exdData->m_QuestDat.get_row( row_id );
+  name = exdData->getField< std::string >( row, 0 );
+  id = exdData->getField< std::string >( row, 1 );
+  expansion = exdData->getField< uint8_t >( row, 2 );
+  classJobCategory0 = exdData->getField< uint8_t >( row, 3 );
+  classJobLevel0 = exdData->getField< uint16_t >( row, 4 );
+  questLevelOffset = exdData->getField< uint8_t >( row, 5 );
+  levelMax = exdData->getField< uint16_t >( row, 6 );
+  classJobCategory1 = exdData->getField< uint8_t >( row, 7 );
+  classJobLevel1 = exdData->getField< uint16_t >( row, 8 );
+  previousQuestJoin = exdData->getField< uint8_t >( row, 9 );
+  previousQuest0 = exdData->getField< uint32_t >( row, 10 );
+  previousQuest1 = exdData->getField< uint32_t >( row, 12 );
+  previousQuest2 = exdData->getField< uint32_t >( row, 13 );
+  questLockJoin = exdData->getField< uint8_t >( row, 14 );
+  questLock.push_back( exdData->getField< uint32_t >( row, 15 ) );
+  questLock.push_back( exdData->getField< uint32_t >( row, 16 ) );
+  classJobUnlock = exdData->getField< uint8_t >( row, 20 );
+  grandCompany = exdData->getField< uint8_t >( row, 21 );
+  grandCompanyRank = exdData->getField< uint8_t >( row, 22 );
+  instanceContentJoin = exdData->getField< uint8_t >( row, 23 );
+  instanceContent.push_back( exdData->getField< uint32_t >( row, 24 ) );
+  instanceContent.push_back( exdData->getField< uint32_t >( row, 25 ) );
+  instanceContent.push_back( exdData->getField< uint32_t >( row, 26 ) );
+  festival = exdData->getField< uint8_t >( row, 27 );
+  bellStart = exdData->getField< uint16_t >( row, 30 );
+  bellEnd = exdData->getField< uint16_t >( row, 31 );
+  beastTribe = exdData->getField< uint8_t >( row, 32 );
+  beastReputationRank = exdData->getField< uint8_t >( row, 33 );
+  mountRequired = exdData->getField< int32_t >( row, 37 );
+  isHouseRequired = exdData->getField< bool >( row, 38 );
+  deliveryQuest = exdData->getField< uint8_t >( row, 39 );
+  issuerStart = exdData->getField< uint32_t >( row, 40 );
+  behavior = exdData->getField< uint16_t >( row, 41 );
+  targetEnd = exdData->getField< uint32_t >( row, 42 );
+  isRepeatable = exdData->getField< bool >( row, 43 );
+  repeatIntervalType = exdData->getField< uint8_t >( row, 44 );
+  questRepeatFlag = exdData->getField< uint8_t >( row, 45 );
+  unlocksSystemContent = exdData->getField< bool >( row, 46 );
+  type = exdData->getField< uint8_t >( row, 48 );
+  questClassJobSupply = exdData->getField< uint16_t >( row, 49 );
+  scriptInstruction.push_back( exdData->getField< std::string >( row, 50 ) );
+  scriptInstruction.push_back( exdData->getField< std::string >( row, 51 ) );
+  scriptInstruction.push_back( exdData->getField< std::string >( row, 52 ) );
+  scriptInstruction.push_back( exdData->getField< std::string >( row, 53 ) );
+  scriptInstruction.push_back( exdData->getField< std::string >( row, 54 ) );
+  scriptInstruction.push_back( exdData->getField< std::string >( row, 55 ) );
+  scriptInstruction.push_back( exdData->getField< std::string >( row, 56 ) );
+  scriptInstruction.push_back( exdData->getField< std::string >( row, 57 ) );
+  scriptInstruction.push_back( exdData->getField< std::string >( row, 58 ) );
+  scriptInstruction.push_back( exdData->getField< std::string >( row, 59 ) );
+  scriptInstruction.push_back( exdData->getField< std::string >( row, 60 ) );
+  scriptInstruction.push_back( exdData->getField< std::string >( row, 61 ) );
+  scriptInstruction.push_back( exdData->getField< std::string >( row, 62 ) );
+  scriptInstruction.push_back( exdData->getField< std::string >( row, 63 ) );
+  scriptInstruction.push_back( exdData->getField< std::string >( row, 64 ) );
+  scriptInstruction.push_back( exdData->getField< std::string >( row, 65 ) );
+  scriptInstruction.push_back( exdData->getField< std::string >( row, 66 ) );
+  scriptInstruction.push_back( exdData->getField< std::string >( row, 67 ) );
+  scriptInstruction.push_back( exdData->getField< std::string >( row, 68 ) );
+  scriptInstruction.push_back( exdData->getField< std::string >( row, 69 ) );
+  scriptInstruction.push_back( exdData->getField< std::string >( row, 70 ) );
+  scriptInstruction.push_back( exdData->getField< std::string >( row, 71 ) );
+  scriptInstruction.push_back( exdData->getField< std::string >( row, 72 ) );
+  scriptInstruction.push_back( exdData->getField< std::string >( row, 73 ) );
+  scriptInstruction.push_back( exdData->getField< std::string >( row, 74 ) );
+  scriptInstruction.push_back( exdData->getField< std::string >( row, 75 ) );
+  scriptInstruction.push_back( exdData->getField< std::string >( row, 76 ) );
+  scriptInstruction.push_back( exdData->getField< std::string >( row, 77 ) );
+  scriptInstruction.push_back( exdData->getField< std::string >( row, 78 ) );
+  scriptInstruction.push_back( exdData->getField< std::string >( row, 79 ) );
+  scriptInstruction.push_back( exdData->getField< std::string >( row, 80 ) );
+  scriptInstruction.push_back( exdData->getField< std::string >( row, 81 ) );
+  scriptInstruction.push_back( exdData->getField< std::string >( row, 82 ) );
+  scriptInstruction.push_back( exdData->getField< std::string >( row, 83 ) );
+  scriptInstruction.push_back( exdData->getField< std::string >( row, 84 ) );
+  scriptInstruction.push_back( exdData->getField< std::string >( row, 85 ) );
+  scriptInstruction.push_back( exdData->getField< std::string >( row, 86 ) );
+  scriptInstruction.push_back( exdData->getField< std::string >( row, 87 ) );
+  scriptInstruction.push_back( exdData->getField< std::string >( row, 88 ) );
+  scriptInstruction.push_back( exdData->getField< std::string >( row, 89 ) );
+  scriptInstruction.push_back( exdData->getField< std::string >( row, 90 ) );
+  scriptInstruction.push_back( exdData->getField< std::string >( row, 91 ) );
+  scriptInstruction.push_back( exdData->getField< std::string >( row, 92 ) );
+  scriptInstruction.push_back( exdData->getField< std::string >( row, 93 ) );
+  scriptInstruction.push_back( exdData->getField< std::string >( row, 94 ) );
+  scriptInstruction.push_back( exdData->getField< std::string >( row, 95 ) );
+  scriptInstruction.push_back( exdData->getField< std::string >( row, 96 ) );
+  scriptInstruction.push_back( exdData->getField< std::string >( row, 97 ) );
+  scriptInstruction.push_back( exdData->getField< std::string >( row, 98 ) );
+  scriptInstruction.push_back( exdData->getField< std::string >( row, 99 ) );
+  scriptArg.push_back( exdData->getField< uint32_t >( row, 100 ) );
+  scriptArg.push_back( exdData->getField< uint32_t >( row, 101 ) );
+  scriptArg.push_back( exdData->getField< uint32_t >( row, 102 ) );
+  scriptArg.push_back( exdData->getField< uint32_t >( row, 103 ) );
+  scriptArg.push_back( exdData->getField< uint32_t >( row, 104 ) );
+  scriptArg.push_back( exdData->getField< uint32_t >( row, 105 ) );
+  scriptArg.push_back( exdData->getField< uint32_t >( row, 106 ) );
+  scriptArg.push_back( exdData->getField< uint32_t >( row, 107 ) );
+  scriptArg.push_back( exdData->getField< uint32_t >( row, 108 ) );
+  scriptArg.push_back( exdData->getField< uint32_t >( row, 109 ) );
+  scriptArg.push_back( exdData->getField< uint32_t >( row, 110 ) );
+  scriptArg.push_back( exdData->getField< uint32_t >( row, 111 ) );
+  scriptArg.push_back( exdData->getField< uint32_t >( row, 112 ) );
+  scriptArg.push_back( exdData->getField< uint32_t >( row, 113 ) );
+  scriptArg.push_back( exdData->getField< uint32_t >( row, 114 ) );
+  scriptArg.push_back( exdData->getField< uint32_t >( row, 115 ) );
+  scriptArg.push_back( exdData->getField< uint32_t >( row, 116 ) );
+  scriptArg.push_back( exdData->getField< uint32_t >( row, 117 ) );
+  scriptArg.push_back( exdData->getField< uint32_t >( row, 118 ) );
+  scriptArg.push_back( exdData->getField< uint32_t >( row, 119 ) );
+  scriptArg.push_back( exdData->getField< uint32_t >( row, 120 ) );
+  scriptArg.push_back( exdData->getField< uint32_t >( row, 121 ) );
+  scriptArg.push_back( exdData->getField< uint32_t >( row, 122 ) );
+  scriptArg.push_back( exdData->getField< uint32_t >( row, 123 ) );
+  scriptArg.push_back( exdData->getField< uint32_t >( row, 124 ) );
+  scriptArg.push_back( exdData->getField< uint32_t >( row, 125 ) );
+  scriptArg.push_back( exdData->getField< uint32_t >( row, 126 ) );
+  scriptArg.push_back( exdData->getField< uint32_t >( row, 127 ) );
+  scriptArg.push_back( exdData->getField< uint32_t >( row, 128 ) );
+  scriptArg.push_back( exdData->getField< uint32_t >( row, 129 ) );
+  scriptArg.push_back( exdData->getField< uint32_t >( row, 130 ) );
+  scriptArg.push_back( exdData->getField< uint32_t >( row, 131 ) );
+  scriptArg.push_back( exdData->getField< uint32_t >( row, 132 ) );
+  scriptArg.push_back( exdData->getField< uint32_t >( row, 133 ) );
+  scriptArg.push_back( exdData->getField< uint32_t >( row, 134 ) );
+  scriptArg.push_back( exdData->getField< uint32_t >( row, 135 ) );
+  scriptArg.push_back( exdData->getField< uint32_t >( row, 136 ) );
+  scriptArg.push_back( exdData->getField< uint32_t >( row, 137 ) );
+  scriptArg.push_back( exdData->getField< uint32_t >( row, 138 ) );
+  scriptArg.push_back( exdData->getField< uint32_t >( row, 139 ) );
+  scriptArg.push_back( exdData->getField< uint32_t >( row, 140 ) );
+  scriptArg.push_back( exdData->getField< uint32_t >( row, 141 ) );
+  scriptArg.push_back( exdData->getField< uint32_t >( row, 142 ) );
+  scriptArg.push_back( exdData->getField< uint32_t >( row, 143 ) );
+  scriptArg.push_back( exdData->getField< uint32_t >( row, 144 ) );
+  scriptArg.push_back( exdData->getField< uint32_t >( row, 145 ) );
+  scriptArg.push_back( exdData->getField< uint32_t >( row, 146 ) );
+  scriptArg.push_back( exdData->getField< uint32_t >( row, 147 ) );
+  scriptArg.push_back( exdData->getField< uint32_t >( row, 148 ) );
+  scriptArg.push_back( exdData->getField< uint32_t >( row, 149 ) );
+  actorSpawnSeq.push_back( exdData->getField< uint8_t >( row, 150 ) );
+  actorSpawnSeq.push_back( exdData->getField< uint8_t >( row, 151 ) );
+  actorSpawnSeq.push_back( exdData->getField< uint8_t >( row, 152 ) );
+  actorSpawnSeq.push_back( exdData->getField< uint8_t >( row, 153 ) );
+  actorSpawnSeq.push_back( exdData->getField< uint8_t >( row, 154 ) );
+  actorSpawnSeq.push_back( exdData->getField< uint8_t >( row, 155 ) );
+  actorSpawnSeq.push_back( exdData->getField< uint8_t >( row, 156 ) );
+  actorSpawnSeq.push_back( exdData->getField< uint8_t >( row, 157 ) );
+  actorSpawnSeq.push_back( exdData->getField< uint8_t >( row, 158 ) );
+  actorSpawnSeq.push_back( exdData->getField< uint8_t >( row, 159 ) );
+  actorSpawnSeq.push_back( exdData->getField< uint8_t >( row, 160 ) );
+  actorSpawnSeq.push_back( exdData->getField< uint8_t >( row, 161 ) );
+  actorSpawnSeq.push_back( exdData->getField< uint8_t >( row, 162 ) );
+  actorSpawnSeq.push_back( exdData->getField< uint8_t >( row, 163 ) );
+  actorSpawnSeq.push_back( exdData->getField< uint8_t >( row, 164 ) );
+  actorSpawnSeq.push_back( exdData->getField< uint8_t >( row, 165 ) );
+  actorSpawnSeq.push_back( exdData->getField< uint8_t >( row, 166 ) );
+  actorSpawnSeq.push_back( exdData->getField< uint8_t >( row, 167 ) );
+  actorSpawnSeq.push_back( exdData->getField< uint8_t >( row, 168 ) );
+  actorSpawnSeq.push_back( exdData->getField< uint8_t >( row, 169 ) );
+  actorSpawnSeq.push_back( exdData->getField< uint8_t >( row, 170 ) );
+  actorSpawnSeq.push_back( exdData->getField< uint8_t >( row, 171 ) );
+  actorSpawnSeq.push_back( exdData->getField< uint8_t >( row, 172 ) );
+  actorSpawnSeq.push_back( exdData->getField< uint8_t >( row, 173 ) );
+  actorSpawnSeq.push_back( exdData->getField< uint8_t >( row, 174 ) );
+  actorSpawnSeq.push_back( exdData->getField< uint8_t >( row, 175 ) );
+  actorSpawnSeq.push_back( exdData->getField< uint8_t >( row, 176 ) );
+  actorSpawnSeq.push_back( exdData->getField< uint8_t >( row, 177 ) );
+  actorSpawnSeq.push_back( exdData->getField< uint8_t >( row, 178 ) );
+  actorSpawnSeq.push_back( exdData->getField< uint8_t >( row, 179 ) );
+  actorSpawnSeq.push_back( exdData->getField< uint8_t >( row, 180 ) );
+  actorSpawnSeq.push_back( exdData->getField< uint8_t >( row, 181 ) );
+  actorSpawnSeq.push_back( exdData->getField< uint8_t >( row, 182 ) );
+  actorSpawnSeq.push_back( exdData->getField< uint8_t >( row, 183 ) );
+  actorSpawnSeq.push_back( exdData->getField< uint8_t >( row, 184 ) );
+  actorSpawnSeq.push_back( exdData->getField< uint8_t >( row, 185 ) );
+  actorSpawnSeq.push_back( exdData->getField< uint8_t >( row, 186 ) );
+  actorSpawnSeq.push_back( exdData->getField< uint8_t >( row, 187 ) );
+  actorSpawnSeq.push_back( exdData->getField< uint8_t >( row, 188 ) );
+  actorSpawnSeq.push_back( exdData->getField< uint8_t >( row, 189 ) );
+  actorSpawnSeq.push_back( exdData->getField< uint8_t >( row, 190 ) );
+  actorSpawnSeq.push_back( exdData->getField< uint8_t >( row, 191 ) );
+  actorSpawnSeq.push_back( exdData->getField< uint8_t >( row, 192 ) );
+  actorSpawnSeq.push_back( exdData->getField< uint8_t >( row, 193 ) );
+  actorSpawnSeq.push_back( exdData->getField< uint8_t >( row, 194 ) );
+  actorSpawnSeq.push_back( exdData->getField< uint8_t >( row, 195 ) );
+  actorSpawnSeq.push_back( exdData->getField< uint8_t >( row, 196 ) );
+  actorSpawnSeq.push_back( exdData->getField< uint8_t >( row, 197 ) );
+  actorSpawnSeq.push_back( exdData->getField< uint8_t >( row, 198 ) );
+  actorSpawnSeq.push_back( exdData->getField< uint8_t >( row, 199 ) );
+  actorSpawnSeq.push_back( exdData->getField< uint8_t >( row, 200 ) );
+  actorSpawnSeq.push_back( exdData->getField< uint8_t >( row, 201 ) );
+  actorSpawnSeq.push_back( exdData->getField< uint8_t >( row, 202 ) );
+  actorSpawnSeq.push_back( exdData->getField< uint8_t >( row, 203 ) );
+  actorSpawnSeq.push_back( exdData->getField< uint8_t >( row, 204 ) );
+  actorSpawnSeq.push_back( exdData->getField< uint8_t >( row, 205 ) );
+  actorSpawnSeq.push_back( exdData->getField< uint8_t >( row, 206 ) );
+  actorSpawnSeq.push_back( exdData->getField< uint8_t >( row, 207 ) );
+  actorSpawnSeq.push_back( exdData->getField< uint8_t >( row, 208 ) );
+  actorSpawnSeq.push_back( exdData->getField< uint8_t >( row, 209 ) );
+  actorSpawnSeq.push_back( exdData->getField< uint8_t >( row, 210 ) );
+  actorSpawnSeq.push_back( exdData->getField< uint8_t >( row, 211 ) );
+  actorSpawnSeq.push_back( exdData->getField< uint8_t >( row, 212 ) );
+  actorSpawnSeq.push_back( exdData->getField< uint8_t >( row, 213 ) );
+  actorDespawnSeq.push_back( exdData->getField< uint8_t >( row, 214 ) );
+  actorDespawnSeq.push_back( exdData->getField< uint8_t >( row, 215 ) );
+  actorDespawnSeq.push_back( exdData->getField< uint8_t >( row, 216 ) );
+  actorDespawnSeq.push_back( exdData->getField< uint8_t >( row, 217 ) );
+  actorDespawnSeq.push_back( exdData->getField< uint8_t >( row, 218 ) );
+  actorDespawnSeq.push_back( exdData->getField< uint8_t >( row, 219 ) );
+  actorDespawnSeq.push_back( exdData->getField< uint8_t >( row, 220 ) );
+  actorDespawnSeq.push_back( exdData->getField< uint8_t >( row, 221 ) );
+  actorDespawnSeq.push_back( exdData->getField< uint8_t >( row, 222 ) );
+  actorDespawnSeq.push_back( exdData->getField< uint8_t >( row, 223 ) );
+  actorDespawnSeq.push_back( exdData->getField< uint8_t >( row, 224 ) );
+  actorDespawnSeq.push_back( exdData->getField< uint8_t >( row, 225 ) );
+  actorDespawnSeq.push_back( exdData->getField< uint8_t >( row, 226 ) );
+  actorDespawnSeq.push_back( exdData->getField< uint8_t >( row, 227 ) );
+  actorDespawnSeq.push_back( exdData->getField< uint8_t >( row, 228 ) );
+  actorDespawnSeq.push_back( exdData->getField< uint8_t >( row, 229 ) );
+  actorDespawnSeq.push_back( exdData->getField< uint8_t >( row, 230 ) );
+  actorDespawnSeq.push_back( exdData->getField< uint8_t >( row, 231 ) );
+  actorDespawnSeq.push_back( exdData->getField< uint8_t >( row, 232 ) );
+  actorDespawnSeq.push_back( exdData->getField< uint8_t >( row, 233 ) );
+  actorDespawnSeq.push_back( exdData->getField< uint8_t >( row, 234 ) );
+  actorDespawnSeq.push_back( exdData->getField< uint8_t >( row, 235 ) );
+  actorDespawnSeq.push_back( exdData->getField< uint8_t >( row, 236 ) );
+  actorDespawnSeq.push_back( exdData->getField< uint8_t >( row, 237 ) );
+  actorDespawnSeq.push_back( exdData->getField< uint8_t >( row, 238 ) );
+  actorDespawnSeq.push_back( exdData->getField< uint8_t >( row, 239 ) );
+  actorDespawnSeq.push_back( exdData->getField< uint8_t >( row, 240 ) );
+  actorDespawnSeq.push_back( exdData->getField< uint8_t >( row, 241 ) );
+  actorDespawnSeq.push_back( exdData->getField< uint8_t >( row, 242 ) );
+  actorDespawnSeq.push_back( exdData->getField< uint8_t >( row, 243 ) );
+  actorDespawnSeq.push_back( exdData->getField< uint8_t >( row, 244 ) );
+  actorDespawnSeq.push_back( exdData->getField< uint8_t >( row, 245 ) );
+  actorDespawnSeq.push_back( exdData->getField< uint8_t >( row, 246 ) );
+  actorDespawnSeq.push_back( exdData->getField< uint8_t >( row, 247 ) );
+  actorDespawnSeq.push_back( exdData->getField< uint8_t >( row, 248 ) );
+  actorDespawnSeq.push_back( exdData->getField< uint8_t >( row, 249 ) );
+  actorDespawnSeq.push_back( exdData->getField< uint8_t >( row, 250 ) );
+  actorDespawnSeq.push_back( exdData->getField< uint8_t >( row, 251 ) );
+  actorDespawnSeq.push_back( exdData->getField< uint8_t >( row, 252 ) );
+  actorDespawnSeq.push_back( exdData->getField< uint8_t >( row, 253 ) );
+  actorDespawnSeq.push_back( exdData->getField< uint8_t >( row, 254 ) );
+  actorDespawnSeq.push_back( exdData->getField< uint8_t >( row, 255 ) );
+  actorDespawnSeq.push_back( exdData->getField< uint8_t >( row, 256 ) );
+  actorDespawnSeq.push_back( exdData->getField< uint8_t >( row, 257 ) );
+  actorDespawnSeq.push_back( exdData->getField< uint8_t >( row, 258 ) );
+  actorDespawnSeq.push_back( exdData->getField< uint8_t >( row, 259 ) );
+  actorDespawnSeq.push_back( exdData->getField< uint8_t >( row, 260 ) );
+  actorDespawnSeq.push_back( exdData->getField< uint8_t >( row, 261 ) );
+  actorDespawnSeq.push_back( exdData->getField< uint8_t >( row, 262 ) );
+  actorDespawnSeq.push_back( exdData->getField< uint8_t >( row, 263 ) );
+  actorDespawnSeq.push_back( exdData->getField< uint8_t >( row, 264 ) );
+  actorDespawnSeq.push_back( exdData->getField< uint8_t >( row, 265 ) );
+  actorDespawnSeq.push_back( exdData->getField< uint8_t >( row, 266 ) );
+  actorDespawnSeq.push_back( exdData->getField< uint8_t >( row, 267 ) );
+  actorDespawnSeq.push_back( exdData->getField< uint8_t >( row, 268 ) );
+  actorDespawnSeq.push_back( exdData->getField< uint8_t >( row, 269 ) );
+  actorDespawnSeq.push_back( exdData->getField< uint8_t >( row, 270 ) );
+  actorDespawnSeq.push_back( exdData->getField< uint8_t >( row, 271 ) );
+  actorDespawnSeq.push_back( exdData->getField< uint8_t >( row, 272 ) );
+  actorDespawnSeq.push_back( exdData->getField< uint8_t >( row, 273 ) );
+  actorDespawnSeq.push_back( exdData->getField< uint8_t >( row, 274 ) );
+  actorDespawnSeq.push_back( exdData->getField< uint8_t >( row, 275 ) );
+  actorDespawnSeq.push_back( exdData->getField< uint8_t >( row, 276 ) );
+  actorDespawnSeq.push_back( exdData->getField< uint8_t >( row, 277 ) );
+  actorSpawn.push_back( exdData->getField< uint32_t >( row, 278 ) );
+  actorSpawn.push_back( exdData->getField< uint32_t >( row, 279 ) );
+  actorSpawn.push_back( exdData->getField< uint32_t >( row, 280 ) );
+  actorSpawn.push_back( exdData->getField< uint32_t >( row, 281 ) );
+  actorSpawn.push_back( exdData->getField< uint32_t >( row, 282 ) );
+  actorSpawn.push_back( exdData->getField< uint32_t >( row, 283 ) );
+  actorSpawn.push_back( exdData->getField< uint32_t >( row, 284 ) );
+  actorSpawn.push_back( exdData->getField< uint32_t >( row, 285 ) );
+  actorSpawn.push_back( exdData->getField< uint32_t >( row, 286 ) );
+  actorSpawn.push_back( exdData->getField< uint32_t >( row, 287 ) );
+  actorSpawn.push_back( exdData->getField< uint32_t >( row, 288 ) );
+  actorSpawn.push_back( exdData->getField< uint32_t >( row, 289 ) );
+  actorSpawn.push_back( exdData->getField< uint32_t >( row, 290 ) );
+  actorSpawn.push_back( exdData->getField< uint32_t >( row, 291 ) );
+  actorSpawn.push_back( exdData->getField< uint32_t >( row, 292 ) );
+  actorSpawn.push_back( exdData->getField< uint32_t >( row, 293 ) );
+  actorSpawn.push_back( exdData->getField< uint32_t >( row, 294 ) );
+  actorSpawn.push_back( exdData->getField< uint32_t >( row, 295 ) );
+  actorSpawn.push_back( exdData->getField< uint32_t >( row, 296 ) );
+  actorSpawn.push_back( exdData->getField< uint32_t >( row, 297 ) );
+  actorSpawn.push_back( exdData->getField< uint32_t >( row, 298 ) );
+  actorSpawn.push_back( exdData->getField< uint32_t >( row, 299 ) );
+  actorSpawn.push_back( exdData->getField< uint32_t >( row, 300 ) );
+  actorSpawn.push_back( exdData->getField< uint32_t >( row, 301 ) );
+  actorSpawn.push_back( exdData->getField< uint32_t >( row, 302 ) );
+  actorSpawn.push_back( exdData->getField< uint32_t >( row, 303 ) );
+  actorSpawn.push_back( exdData->getField< uint32_t >( row, 304 ) );
+  actorSpawn.push_back( exdData->getField< uint32_t >( row, 305 ) );
+  actorSpawn.push_back( exdData->getField< uint32_t >( row, 306 ) );
+  actorSpawn.push_back( exdData->getField< uint32_t >( row, 307 ) );
+  actorSpawn.push_back( exdData->getField< uint32_t >( row, 308 ) );
+  actorSpawn.push_back( exdData->getField< uint32_t >( row, 309 ) );
+  actorSpawn.push_back( exdData->getField< uint32_t >( row, 310 ) );
+  actorSpawn.push_back( exdData->getField< uint32_t >( row, 311 ) );
+  actorSpawn.push_back( exdData->getField< uint32_t >( row, 312 ) );
+  actorSpawn.push_back( exdData->getField< uint32_t >( row, 313 ) );
+  actorSpawn.push_back( exdData->getField< uint32_t >( row, 314 ) );
+  actorSpawn.push_back( exdData->getField< uint32_t >( row, 315 ) );
+  actorSpawn.push_back( exdData->getField< uint32_t >( row, 316 ) );
+  actorSpawn.push_back( exdData->getField< uint32_t >( row, 317 ) );
+  actorSpawn.push_back( exdData->getField< uint32_t >( row, 318 ) );
+  actorSpawn.push_back( exdData->getField< uint32_t >( row, 319 ) );
+  actorSpawn.push_back( exdData->getField< uint32_t >( row, 320 ) );
+  actorSpawn.push_back( exdData->getField< uint32_t >( row, 321 ) );
+  actorSpawn.push_back( exdData->getField< uint32_t >( row, 322 ) );
+  actorSpawn.push_back( exdData->getField< uint32_t >( row, 323 ) );
+  actorSpawn.push_back( exdData->getField< uint32_t >( row, 324 ) );
+  actorSpawn.push_back( exdData->getField< uint32_t >( row, 325 ) );
+  actorSpawn.push_back( exdData->getField< uint32_t >( row, 326 ) );
+  actorSpawn.push_back( exdData->getField< uint32_t >( row, 327 ) );
+  actorSpawn.push_back( exdData->getField< uint32_t >( row, 328 ) );
+  actorSpawn.push_back( exdData->getField< uint32_t >( row, 329 ) );
+  actorSpawn.push_back( exdData->getField< uint32_t >( row, 330 ) );
+  actorSpawn.push_back( exdData->getField< uint32_t >( row, 331 ) );
+  actorSpawn.push_back( exdData->getField< uint32_t >( row, 332 ) );
+  actorSpawn.push_back( exdData->getField< uint32_t >( row, 333 ) );
+  actorSpawn.push_back( exdData->getField< uint32_t >( row, 334 ) );
+  actorSpawn.push_back( exdData->getField< uint32_t >( row, 335 ) );
+  actorSpawn.push_back( exdData->getField< uint32_t >( row, 336 ) );
+  actorSpawn.push_back( exdData->getField< uint32_t >( row, 337 ) );
+  actorSpawn.push_back( exdData->getField< uint32_t >( row, 338 ) );
+  actorSpawn.push_back( exdData->getField< uint32_t >( row, 339 ) );
+  actorSpawn.push_back( exdData->getField< uint32_t >( row, 340 ) );
+  actorSpawn.push_back( exdData->getField< uint32_t >( row, 341 ) );
+  questUInt8A.push_back( exdData->getField< uint8_t >( row, 342 ) );
+  questUInt8A.push_back( exdData->getField< uint8_t >( row, 343 ) );
+  questUInt8A.push_back( exdData->getField< uint8_t >( row, 344 ) );
+  questUInt8A.push_back( exdData->getField< uint8_t >( row, 345 ) );
+  questUInt8A.push_back( exdData->getField< uint8_t >( row, 346 ) );
+  questUInt8A.push_back( exdData->getField< uint8_t >( row, 347 ) );
+  questUInt8A.push_back( exdData->getField< uint8_t >( row, 348 ) );
+  questUInt8A.push_back( exdData->getField< uint8_t >( row, 349 ) );
+  questUInt8A.push_back( exdData->getField< uint8_t >( row, 350 ) );
+  questUInt8A.push_back( exdData->getField< uint8_t >( row, 351 ) );
+  questUInt8A.push_back( exdData->getField< uint8_t >( row, 352 ) );
+  questUInt8A.push_back( exdData->getField< uint8_t >( row, 353 ) );
+  questUInt8A.push_back( exdData->getField< uint8_t >( row, 354 ) );
+  questUInt8A.push_back( exdData->getField< uint8_t >( row, 355 ) );
+  questUInt8A.push_back( exdData->getField< uint8_t >( row, 356 ) );
+  questUInt8A.push_back( exdData->getField< uint8_t >( row, 357 ) );
+  questUInt8A.push_back( exdData->getField< uint8_t >( row, 358 ) );
+  questUInt8A.push_back( exdData->getField< uint8_t >( row, 359 ) );
+  questUInt8A.push_back( exdData->getField< uint8_t >( row, 360 ) );
+  questUInt8A.push_back( exdData->getField< uint8_t >( row, 361 ) );
+  questUInt8A.push_back( exdData->getField< uint8_t >( row, 362 ) );
+  questUInt8A.push_back( exdData->getField< uint8_t >( row, 363 ) );
+  questUInt8A.push_back( exdData->getField< uint8_t >( row, 364 ) );
+  questUInt8A.push_back( exdData->getField< uint8_t >( row, 365 ) );
+  questUInt8A.push_back( exdData->getField< uint8_t >( row, 366 ) );
+  questUInt8A.push_back( exdData->getField< uint8_t >( row, 367 ) );
+  questUInt8A.push_back( exdData->getField< uint8_t >( row, 368 ) );
+  questUInt8A.push_back( exdData->getField< uint8_t >( row, 369 ) );
+  questUInt8A.push_back( exdData->getField< uint8_t >( row, 370 ) );
+  questUInt8A.push_back( exdData->getField< uint8_t >( row, 371 ) );
+  questUInt8A.push_back( exdData->getField< uint8_t >( row, 372 ) );
+  questUInt8A.push_back( exdData->getField< uint8_t >( row, 373 ) );
+  questUInt8B.push_back( exdData->getField< uint8_t >( row, 374 ) );
+  questUInt8B.push_back( exdData->getField< uint8_t >( row, 375 ) );
+  questUInt8B.push_back( exdData->getField< uint8_t >( row, 376 ) );
+  questUInt8B.push_back( exdData->getField< uint8_t >( row, 377 ) );
+  questUInt8B.push_back( exdData->getField< uint8_t >( row, 378 ) );
+  questUInt8B.push_back( exdData->getField< uint8_t >( row, 379 ) );
+  questUInt8B.push_back( exdData->getField< uint8_t >( row, 380 ) );
+  questUInt8B.push_back( exdData->getField< uint8_t >( row, 381 ) );
+  questUInt8B.push_back( exdData->getField< uint8_t >( row, 382 ) );
+  questUInt8B.push_back( exdData->getField< uint8_t >( row, 383 ) );
+  questUInt8B.push_back( exdData->getField< uint8_t >( row, 384 ) );
+  questUInt8B.push_back( exdData->getField< uint8_t >( row, 385 ) );
+  questUInt8B.push_back( exdData->getField< uint8_t >( row, 386 ) );
+  questUInt8B.push_back( exdData->getField< uint8_t >( row, 387 ) );
+  questUInt8B.push_back( exdData->getField< uint8_t >( row, 388 ) );
+  questUInt8B.push_back( exdData->getField< uint8_t >( row, 389 ) );
+  questUInt8B.push_back( exdData->getField< uint8_t >( row, 390 ) );
+  questUInt8B.push_back( exdData->getField< uint8_t >( row, 391 ) );
+  questUInt8B.push_back( exdData->getField< uint8_t >( row, 392 ) );
+  questUInt8B.push_back( exdData->getField< uint8_t >( row, 393 ) );
+  questUInt8B.push_back( exdData->getField< uint8_t >( row, 394 ) );
+  questUInt8B.push_back( exdData->getField< uint8_t >( row, 395 ) );
+  questUInt8B.push_back( exdData->getField< uint8_t >( row, 396 ) );
+  questUInt8B.push_back( exdData->getField< uint8_t >( row, 397 ) );
+  questUInt8B.push_back( exdData->getField< uint8_t >( row, 398 ) );
+  questUInt8B.push_back( exdData->getField< uint8_t >( row, 399 ) );
+  questUInt8B.push_back( exdData->getField< uint8_t >( row, 400 ) );
+  questUInt8B.push_back( exdData->getField< uint8_t >( row, 401 ) );
+  questUInt8B.push_back( exdData->getField< uint8_t >( row, 402 ) );
+  questUInt8B.push_back( exdData->getField< uint8_t >( row, 403 ) );
+  questUInt8B.push_back( exdData->getField< uint8_t >( row, 404 ) );
+  questUInt8B.push_back( exdData->getField< uint8_t >( row, 405 ) );
+  toDoCompleteSeq.push_back( exdData->getField< uint8_t >( row, 1174 ) );
+  toDoCompleteSeq.push_back( exdData->getField< uint8_t >( row, 1175 ) );
+  toDoCompleteSeq.push_back( exdData->getField< uint8_t >( row, 1176 ) );
+  toDoCompleteSeq.push_back( exdData->getField< uint8_t >( row, 1177 ) );
+  toDoCompleteSeq.push_back( exdData->getField< uint8_t >( row, 1178 ) );
+  toDoCompleteSeq.push_back( exdData->getField< uint8_t >( row, 1179 ) );
+  toDoCompleteSeq.push_back( exdData->getField< uint8_t >( row, 1180 ) );
+  toDoCompleteSeq.push_back( exdData->getField< uint8_t >( row, 1181 ) );
+  toDoCompleteSeq.push_back( exdData->getField< uint8_t >( row, 1182 ) );
+  toDoCompleteSeq.push_back( exdData->getField< uint8_t >( row, 1183 ) );
+  toDoCompleteSeq.push_back( exdData->getField< uint8_t >( row, 1184 ) );
+  toDoCompleteSeq.push_back( exdData->getField< uint8_t >( row, 1185 ) );
+  toDoCompleteSeq.push_back( exdData->getField< uint8_t >( row, 1186 ) );
+  toDoCompleteSeq.push_back( exdData->getField< uint8_t >( row, 1187 ) );
+  toDoCompleteSeq.push_back( exdData->getField< uint8_t >( row, 1188 ) );
+  toDoCompleteSeq.push_back( exdData->getField< uint8_t >( row, 1189 ) );
+  toDoCompleteSeq.push_back( exdData->getField< uint8_t >( row, 1190 ) );
+  toDoCompleteSeq.push_back( exdData->getField< uint8_t >( row, 1191 ) );
+  toDoCompleteSeq.push_back( exdData->getField< uint8_t >( row, 1192 ) );
+  toDoCompleteSeq.push_back( exdData->getField< uint8_t >( row, 1193 ) );
+  toDoCompleteSeq.push_back( exdData->getField< uint8_t >( row, 1194 ) );
+  toDoCompleteSeq.push_back( exdData->getField< uint8_t >( row, 1195 ) );
+  toDoCompleteSeq.push_back( exdData->getField< uint8_t >( row, 1196 ) );
+  toDoCompleteSeq.push_back( exdData->getField< uint8_t >( row, 1197 ) );
+  toDoQty.push_back( exdData->getField< uint8_t >( row, 1198 ) );
+  toDoQty.push_back( exdData->getField< uint8_t >( row, 1199 ) );
+  toDoQty.push_back( exdData->getField< uint8_t >( row, 1200 ) );
+  toDoQty.push_back( exdData->getField< uint8_t >( row, 1201 ) );
+  toDoQty.push_back( exdData->getField< uint8_t >( row, 1202 ) );
+  toDoQty.push_back( exdData->getField< uint8_t >( row, 1203 ) );
+  toDoQty.push_back( exdData->getField< uint8_t >( row, 1204 ) );
+  toDoQty.push_back( exdData->getField< uint8_t >( row, 1205 ) );
+  toDoQty.push_back( exdData->getField< uint8_t >( row, 1206 ) );
+  toDoQty.push_back( exdData->getField< uint8_t >( row, 1207 ) );
+  toDoQty.push_back( exdData->getField< uint8_t >( row, 1208 ) );
+  toDoQty.push_back( exdData->getField< uint8_t >( row, 1209 ) );
+  toDoQty.push_back( exdData->getField< uint8_t >( row, 1210 ) );
+  toDoQty.push_back( exdData->getField< uint8_t >( row, 1211 ) );
+  toDoQty.push_back( exdData->getField< uint8_t >( row, 1212 ) );
+  toDoQty.push_back( exdData->getField< uint8_t >( row, 1213 ) );
+  toDoQty.push_back( exdData->getField< uint8_t >( row, 1214 ) );
+  toDoQty.push_back( exdData->getField< uint8_t >( row, 1215 ) );
+  toDoQty.push_back( exdData->getField< uint8_t >( row, 1216 ) );
+  toDoQty.push_back( exdData->getField< uint8_t >( row, 1217 ) );
+  toDoQty.push_back( exdData->getField< uint8_t >( row, 1218 ) );
+  toDoQty.push_back( exdData->getField< uint8_t >( row, 1219 ) );
+  toDoQty.push_back( exdData->getField< uint8_t >( row, 1220 ) );
+  toDoQty.push_back( exdData->getField< uint8_t >( row, 1221 ) );
+  toDoMainLocation.push_back( exdData->getField< uint32_t >( row, 1222 ) );
+  toDoMainLocation.push_back( exdData->getField< uint32_t >( row, 1223 ) );
+  toDoMainLocation.push_back( exdData->getField< uint32_t >( row, 1224 ) );
+  toDoMainLocation.push_back( exdData->getField< uint32_t >( row, 1225 ) );
+  toDoMainLocation.push_back( exdData->getField< uint32_t >( row, 1226 ) );
+  toDoMainLocation.push_back( exdData->getField< uint32_t >( row, 1227 ) );
+  toDoMainLocation.push_back( exdData->getField< uint32_t >( row, 1228 ) );
+  toDoMainLocation.push_back( exdData->getField< uint32_t >( row, 1229 ) );
+  toDoMainLocation.push_back( exdData->getField< uint32_t >( row, 1230 ) );
+  toDoMainLocation.push_back( exdData->getField< uint32_t >( row, 1231 ) );
+  toDoMainLocation.push_back( exdData->getField< uint32_t >( row, 1232 ) );
+  toDoMainLocation.push_back( exdData->getField< uint32_t >( row, 1233 ) );
+  toDoMainLocation.push_back( exdData->getField< uint32_t >( row, 1234 ) );
+  toDoMainLocation.push_back( exdData->getField< uint32_t >( row, 1235 ) );
+  toDoMainLocation.push_back( exdData->getField< uint32_t >( row, 1236 ) );
+  toDoMainLocation.push_back( exdData->getField< uint32_t >( row, 1237 ) );
+  toDoMainLocation.push_back( exdData->getField< uint32_t >( row, 1238 ) );
+  toDoMainLocation.push_back( exdData->getField< uint32_t >( row, 1239 ) );
+  toDoMainLocation.push_back( exdData->getField< uint32_t >( row, 1240 ) );
+  toDoMainLocation.push_back( exdData->getField< uint32_t >( row, 1241 ) );
+  toDoMainLocation.push_back( exdData->getField< uint32_t >( row, 1242 ) );
+  toDoMainLocation.push_back( exdData->getField< uint32_t >( row, 1243 ) );
+  toDoMainLocation.push_back( exdData->getField< uint32_t >( row, 1244 ) );
+  toDoMainLocation.push_back( exdData->getField< uint32_t >( row, 1245 ) );
+  classJobRequired = exdData->getField< uint8_t >( row, 1438 );
+  expFactor = exdData->getField< uint16_t >( row, 1440 );
+  gilReward = exdData->getField< uint32_t >( row, 1441 );
+  gCSeals = exdData->getField< uint16_t >( row, 1443 );
+  itemCatalyst.push_back( exdData->getField< uint8_t >( row, 1444 ) );
+  itemCatalyst.push_back( exdData->getField< uint8_t >( row, 1445 ) );
+  itemCatalyst.push_back( exdData->getField< uint8_t >( row, 1446 ) );
+  itemCountCatalyst.push_back( exdData->getField< uint8_t >( row, 1447 ) );
+  itemCountCatalyst.push_back( exdData->getField< uint8_t >( row, 1448 ) );
+  itemCountCatalyst.push_back( exdData->getField< uint8_t >( row, 1449 ) );
+  itemRewardType = exdData->getField< uint8_t >( row, 1450 );
+  itemReward0.push_back( exdData->getField< uint32_t >( row, 1451 ) );
+  itemReward0.push_back( exdData->getField< uint32_t >( row, 1452 ) );
+  itemReward0.push_back( exdData->getField< uint32_t >( row, 1453 ) );
+  itemReward0.push_back( exdData->getField< uint32_t >( row, 1454 ) );
+  itemReward0.push_back( exdData->getField< uint32_t >( row, 1455 ) );
+  itemReward0.push_back( exdData->getField< uint32_t >( row, 1456 ) );
+  itemCountReward0.push_back( exdData->getField< uint8_t >( row, 1458 ) );
+  itemCountReward0.push_back( exdData->getField< uint8_t >( row, 1459 ) );
+  itemCountReward0.push_back( exdData->getField< uint8_t >( row, 1460 ) );
+  itemCountReward0.push_back( exdData->getField< uint8_t >( row, 1461 ) );
+  itemCountReward0.push_back( exdData->getField< uint8_t >( row, 1462 ) );
+  itemCountReward0.push_back( exdData->getField< uint8_t >( row, 1463 ) );
+  stainReward0.push_back( exdData->getField< uint8_t >( row, 1465 ) );
+  stainReward0.push_back( exdData->getField< uint8_t >( row, 1466 ) );
+  stainReward0.push_back( exdData->getField< uint8_t >( row, 1467 ) );
+  stainReward0.push_back( exdData->getField< uint8_t >( row, 1468 ) );
+  stainReward0.push_back( exdData->getField< uint8_t >( row, 1469 ) );
+  stainReward0.push_back( exdData->getField< uint8_t >( row, 1470 ) );
+  itemReward1.push_back( exdData->getField< uint32_t >( row, 1472 ) );
+  itemReward1.push_back( exdData->getField< uint32_t >( row, 1473 ) );
+  itemReward1.push_back( exdData->getField< uint32_t >( row, 1474 ) );
+  itemReward1.push_back( exdData->getField< uint32_t >( row, 1475 ) );
+  itemReward1.push_back( exdData->getField< uint32_t >( row, 1476 ) );
+  itemCountReward1.push_back( exdData->getField< uint8_t >( row, 1477 ) );
+  itemCountReward1.push_back( exdData->getField< uint8_t >( row, 1478 ) );
+  itemCountReward1.push_back( exdData->getField< uint8_t >( row, 1479 ) );
+  itemCountReward1.push_back( exdData->getField< uint8_t >( row, 1480 ) );
+  itemCountReward1.push_back( exdData->getField< uint8_t >( row, 1481 ) );
+  isHQReward1.push_back( exdData->getField< bool >( row, 1482 ) );
+  isHQReward1.push_back( exdData->getField< bool >( row, 1483 ) );
+  isHQReward1.push_back( exdData->getField< bool >( row, 1484 ) );
+  isHQReward1.push_back( exdData->getField< bool >( row, 1485 ) );
+  isHQReward1.push_back( exdData->getField< bool >( row, 1486 ) );
+  stainReward1.push_back( exdData->getField< uint8_t >( row, 1487 ) );
+  stainReward1.push_back( exdData->getField< uint8_t >( row, 1488 ) );
+  stainReward1.push_back( exdData->getField< uint8_t >( row, 1489 ) );
+  stainReward1.push_back( exdData->getField< uint8_t >( row, 1490 ) );
+  stainReward1.push_back( exdData->getField< uint8_t >( row, 1491 ) );
+  emoteReward = exdData->getField< uint8_t >( row, 1492 );
+  actionReward = exdData->getField< uint16_t >( row, 1493 );
+  generalActionReward.push_back( exdData->getField< uint8_t >( row, 1494 ) );
+  generalActionReward.push_back( exdData->getField< uint8_t >( row, 1495 ) );
+  otherReward = exdData->getField< uint8_t >( row, 1497 );
+  instanceContentUnlock = exdData->getField< uint32_t >( row, 1500 );
+  tomestoneReward = exdData->getField< uint8_t >( row, 1502 );
+  tomestoneCountReward = exdData->getField< uint8_t >( row, 1503 );
+  reputationReward = exdData->getField< uint8_t >( row, 1504 );
+  placeName = exdData->getField< uint16_t >( row, 1505 );
+  journalGenre = exdData->getField< uint8_t >( row, 1506 );
+  icon = exdData->getField< uint32_t >( row, 1508 );
+  iconSpecial = exdData->getField< uint32_t >( row, 1509 );
+  eventIconType = exdData->getField< uint8_t >( row, 1512 );
+  sortKey = exdData->getField< uint16_t >( row, 1514 );
 }
 
 Sapphire::Data::QuestBattle::QuestBattle( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
 {
-   auto row = exdData->m_QuestBattleDat.get_row( row_id );
-   timeLimit = exdData->getField< uint16_t >( row, 2 );
+  auto row = exdData->m_QuestBattleDat.get_row( row_id );
   quest = exdData->getField< int32_t >( row, 0 );
+  timeLimit = exdData->getField< uint16_t >( row, 2 );
   levelSync = exdData->getField< uint16_t >( row, 3 );
-   scriptInstruction.push_back( exdData->getField< std::string >( row, 4 ) );
-   scriptInstruction.push_back( exdData->getField< std::string >( row, 5 ) );
-   scriptInstruction.push_back( exdData->getField< std::string >( row, 6 ) );
-   scriptInstruction.push_back( exdData->getField< std::string >( row, 7 ) );
-   scriptInstruction.push_back( exdData->getField< std::string >( row, 8 ) );
-   scriptInstruction.push_back( exdData->getField< std::string >( row, 9 ) );
-   scriptInstruction.push_back( exdData->getField< std::string >( row, 10 ) );
-   scriptInstruction.push_back( exdData->getField< std::string >( row, 11 ) );
-   scriptInstruction.push_back( exdData->getField< std::string >( row, 12 ) );
-   scriptInstruction.push_back( exdData->getField< std::string >( row, 13 ) );
-   scriptInstruction.push_back( exdData->getField< std::string >( row, 14 ) );
-   scriptInstruction.push_back( exdData->getField< std::string >( row, 15 ) );
-   scriptInstruction.push_back( exdData->getField< std::string >( row, 16 ) );
-   scriptInstruction.push_back( exdData->getField< std::string >( row, 17 ) );
-   scriptInstruction.push_back( exdData->getField< std::string >( row, 18 ) );
-   scriptInstruction.push_back( exdData->getField< std::string >( row, 19 ) );
-   scriptInstruction.push_back( exdData->getField< std::string >( row, 20 ) );
-   scriptInstruction.push_back( exdData->getField< std::string >( row, 21 ) );
-   scriptInstruction.push_back( exdData->getField< std::string >( row, 22 ) );
-   scriptInstruction.push_back( exdData->getField< std::string >( row, 23 ) );
-   scriptInstruction.push_back( exdData->getField< std::string >( row, 24 ) );
-   scriptInstruction.push_back( exdData->getField< std::string >( row, 25 ) );
-   scriptInstruction.push_back( exdData->getField< std::string >( row, 26 ) );
-   scriptInstruction.push_back( exdData->getField< std::string >( row, 27 ) );
-   scriptInstruction.push_back( exdData->getField< std::string >( row, 28 ) );
-   scriptInstruction.push_back( exdData->getField< std::string >( row, 29 ) );
-   scriptInstruction.push_back( exdData->getField< std::string >( row, 30 ) );
-   scriptInstruction.push_back( exdData->getField< std::string >( row, 31 ) );
-   scriptInstruction.push_back( exdData->getField< std::string >( row, 32 ) );
-   scriptInstruction.push_back( exdData->getField< std::string >( row, 33 ) );
-   scriptInstruction.push_back( exdData->getField< std::string >( row, 34 ) );
-   scriptInstruction.push_back( exdData->getField< std::string >( row, 35 ) );
-   scriptInstruction.push_back( exdData->getField< std::string >( row, 36 ) );
-   scriptInstruction.push_back( exdData->getField< std::string >( row, 37 ) );
-   scriptInstruction.push_back( exdData->getField< std::string >( row, 38 ) );
-   scriptInstruction.push_back( exdData->getField< std::string >( row, 39 ) );
-   scriptInstruction.push_back( exdData->getField< std::string >( row, 40 ) );
-   scriptInstruction.push_back( exdData->getField< std::string >( row, 41 ) );
-   scriptInstruction.push_back( exdData->getField< std::string >( row, 42 ) );
-   scriptInstruction.push_back( exdData->getField< std::string >( row, 43 ) );
-   scriptInstruction.push_back( exdData->getField< std::string >( row, 44 ) );
-   scriptInstruction.push_back( exdData->getField< std::string >( row, 45 ) );
-   scriptInstruction.push_back( exdData->getField< std::string >( row, 46 ) );
-   scriptInstruction.push_back( exdData->getField< std::string >( row, 47 ) );
-   scriptInstruction.push_back( exdData->getField< std::string >( row, 48 ) );
-   scriptInstruction.push_back( exdData->getField< std::string >( row, 49 ) );
-   scriptInstruction.push_back( exdData->getField< std::string >( row, 50 ) );
-   scriptInstruction.push_back( exdData->getField< std::string >( row, 51 ) );
-   scriptInstruction.push_back( exdData->getField< std::string >( row, 52 ) );
-   scriptInstruction.push_back( exdData->getField< std::string >( row, 53 ) );
-   scriptInstruction.push_back( exdData->getField< std::string >( row, 54 ) );
-   scriptInstruction.push_back( exdData->getField< std::string >( row, 55 ) );
-   scriptInstruction.push_back( exdData->getField< std::string >( row, 56 ) );
-   scriptInstruction.push_back( exdData->getField< std::string >( row, 57 ) );
-   scriptInstruction.push_back( exdData->getField< std::string >( row, 58 ) );
-   scriptInstruction.push_back( exdData->getField< std::string >( row, 59 ) );
-   scriptInstruction.push_back( exdData->getField< std::string >( row, 60 ) );
-   scriptInstruction.push_back( exdData->getField< std::string >( row, 61 ) );
-   scriptInstruction.push_back( exdData->getField< std::string >( row, 62 ) );
-   scriptInstruction.push_back( exdData->getField< std::string >( row, 63 ) );
-   scriptInstruction.push_back( exdData->getField< std::string >( row, 64 ) );
-   scriptInstruction.push_back( exdData->getField< std::string >( row, 65 ) );
-   scriptInstruction.push_back( exdData->getField< std::string >( row, 66 ) );
-   scriptInstruction.push_back( exdData->getField< std::string >( row, 67 ) );
-   scriptInstruction.push_back( exdData->getField< std::string >( row, 68 ) );
-   scriptInstruction.push_back( exdData->getField< std::string >( row, 69 ) );
-   scriptInstruction.push_back( exdData->getField< std::string >( row, 70 ) );
-   scriptInstruction.push_back( exdData->getField< std::string >( row, 71 ) );
-   scriptInstruction.push_back( exdData->getField< std::string >( row, 72 ) );
-   scriptInstruction.push_back( exdData->getField< std::string >( row, 73 ) );
-   scriptInstruction.push_back( exdData->getField< std::string >( row, 74 ) );
-   scriptInstruction.push_back( exdData->getField< std::string >( row, 75 ) );
-   scriptInstruction.push_back( exdData->getField< std::string >( row, 76 ) );
-   scriptInstruction.push_back( exdData->getField< std::string >( row, 77 ) );
-   scriptInstruction.push_back( exdData->getField< std::string >( row, 78 ) );
-   scriptInstruction.push_back( exdData->getField< std::string >( row, 79 ) );
-   scriptInstruction.push_back( exdData->getField< std::string >( row, 80 ) );
-   scriptInstruction.push_back( exdData->getField< std::string >( row, 81 ) );
-   scriptInstruction.push_back( exdData->getField< std::string >( row, 82 ) );
-   scriptInstruction.push_back( exdData->getField< std::string >( row, 83 ) );
-   scriptInstruction.push_back( exdData->getField< std::string >( row, 84 ) );
-   scriptInstruction.push_back( exdData->getField< std::string >( row, 85 ) );
-   scriptInstruction.push_back( exdData->getField< std::string >( row, 86 ) );
-   scriptInstruction.push_back( exdData->getField< std::string >( row, 87 ) );
-   scriptInstruction.push_back( exdData->getField< std::string >( row, 88 ) );
-   scriptInstruction.push_back( exdData->getField< std::string >( row, 89 ) );
-   scriptInstruction.push_back( exdData->getField< std::string >( row, 90 ) );
-   scriptInstruction.push_back( exdData->getField< std::string >( row, 91 ) );
-   scriptInstruction.push_back( exdData->getField< std::string >( row, 92 ) );
-   scriptInstruction.push_back( exdData->getField< std::string >( row, 93 ) );
-   scriptInstruction.push_back( exdData->getField< std::string >( row, 94 ) );
-   scriptInstruction.push_back( exdData->getField< std::string >( row, 95 ) );
-   scriptInstruction.push_back( exdData->getField< std::string >( row, 96 ) );
-   scriptInstruction.push_back( exdData->getField< std::string >( row, 97 ) );
-   scriptInstruction.push_back( exdData->getField< std::string >( row, 98 ) );
-   scriptInstruction.push_back( exdData->getField< std::string >( row, 99 ) );
-   scriptInstruction.push_back( exdData->getField< std::string >( row, 100 ) );
-   scriptInstruction.push_back( exdData->getField< std::string >( row, 101 ) );
-   scriptInstruction.push_back( exdData->getField< std::string >( row, 102 ) );
-   scriptInstruction.push_back( exdData->getField< std::string >( row, 103 ) );
-   scriptInstruction.push_back( exdData->getField< std::string >( row, 104 ) );
-   scriptInstruction.push_back( exdData->getField< std::string >( row, 105 ) );
-   scriptInstruction.push_back( exdData->getField< std::string >( row, 106 ) );
-   scriptInstruction.push_back( exdData->getField< std::string >( row, 107 ) );
-   scriptInstruction.push_back( exdData->getField< std::string >( row, 108 ) );
-   scriptInstruction.push_back( exdData->getField< std::string >( row, 109 ) );
-   scriptInstruction.push_back( exdData->getField< std::string >( row, 110 ) );
-   scriptInstruction.push_back( exdData->getField< std::string >( row, 111 ) );
-   scriptInstruction.push_back( exdData->getField< std::string >( row, 112 ) );
-   scriptInstruction.push_back( exdData->getField< std::string >( row, 113 ) );
-   scriptInstruction.push_back( exdData->getField< std::string >( row, 114 ) );
-   scriptInstruction.push_back( exdData->getField< std::string >( row, 115 ) );
-   scriptInstruction.push_back( exdData->getField< std::string >( row, 116 ) );
-   scriptInstruction.push_back( exdData->getField< std::string >( row, 117 ) );
-   scriptInstruction.push_back( exdData->getField< std::string >( row, 118 ) );
-   scriptInstruction.push_back( exdData->getField< std::string >( row, 119 ) );
-   scriptInstruction.push_back( exdData->getField< std::string >( row, 120 ) );
-   scriptInstruction.push_back( exdData->getField< std::string >( row, 121 ) );
-   scriptInstruction.push_back( exdData->getField< std::string >( row, 122 ) );
-   scriptInstruction.push_back( exdData->getField< std::string >( row, 123 ) );
-   scriptInstruction.push_back( exdData->getField< std::string >( row, 124 ) );
-   scriptInstruction.push_back( exdData->getField< std::string >( row, 125 ) );
-   scriptInstruction.push_back( exdData->getField< std::string >( row, 126 ) );
-   scriptInstruction.push_back( exdData->getField< std::string >( row, 127 ) );
-   scriptInstruction.push_back( exdData->getField< std::string >( row, 128 ) );
-   scriptInstruction.push_back( exdData->getField< std::string >( row, 129 ) );
-   scriptInstruction.push_back( exdData->getField< std::string >( row, 130 ) );
-   scriptInstruction.push_back( exdData->getField< std::string >( row, 131 ) );
-   scriptInstruction.push_back( exdData->getField< std::string >( row, 132 ) );
-   scriptInstruction.push_back( exdData->getField< std::string >( row, 133 ) );
-   scriptInstruction.push_back( exdData->getField< std::string >( row, 134 ) );
-   scriptInstruction.push_back( exdData->getField< std::string >( row, 135 ) );
-   scriptInstruction.push_back( exdData->getField< std::string >( row, 136 ) );
-   scriptInstruction.push_back( exdData->getField< std::string >( row, 137 ) );
-   scriptInstruction.push_back( exdData->getField< std::string >( row, 138 ) );
-   scriptInstruction.push_back( exdData->getField< std::string >( row, 139 ) );
-   scriptInstruction.push_back( exdData->getField< std::string >( row, 140 ) );
-   scriptInstruction.push_back( exdData->getField< std::string >( row, 141 ) );
-   scriptInstruction.push_back( exdData->getField< std::string >( row, 142 ) );
-   scriptInstruction.push_back( exdData->getField< std::string >( row, 143 ) );
-   scriptInstruction.push_back( exdData->getField< std::string >( row, 144 ) );
-   scriptInstruction.push_back( exdData->getField< std::string >( row, 145 ) );
-   scriptInstruction.push_back( exdData->getField< std::string >( row, 146 ) );
-   scriptInstruction.push_back( exdData->getField< std::string >( row, 147 ) );
-   scriptInstruction.push_back( exdData->getField< std::string >( row, 148 ) );
-   scriptInstruction.push_back( exdData->getField< std::string >( row, 149 ) );
-   scriptInstruction.push_back( exdData->getField< std::string >( row, 150 ) );
-   scriptInstruction.push_back( exdData->getField< std::string >( row, 151 ) );
-   scriptInstruction.push_back( exdData->getField< std::string >( row, 152 ) );
-   scriptInstruction.push_back( exdData->getField< std::string >( row, 153 ) );
-   scriptValue.push_back( exdData->getField< uint32_t >( row, 154 ) );
-   scriptValue.push_back( exdData->getField< uint32_t >( row, 155 ) );
-   scriptValue.push_back( exdData->getField< uint32_t >( row, 156 ) );
-   scriptValue.push_back( exdData->getField< uint32_t >( row, 157 ) );
-   scriptValue.push_back( exdData->getField< uint32_t >( row, 158 ) );
-   scriptValue.push_back( exdData->getField< uint32_t >( row, 159 ) );
-   scriptValue.push_back( exdData->getField< uint32_t >( row, 160 ) );
-   scriptValue.push_back( exdData->getField< uint32_t >( row, 161 ) );
-   scriptValue.push_back( exdData->getField< uint32_t >( row, 162 ) );
-   scriptValue.push_back( exdData->getField< uint32_t >( row, 163 ) );
-   scriptValue.push_back( exdData->getField< uint32_t >( row, 164 ) );
-   scriptValue.push_back( exdData->getField< uint32_t >( row, 165 ) );
-   scriptValue.push_back( exdData->getField< uint32_t >( row, 166 ) );
-   scriptValue.push_back( exdData->getField< uint32_t >( row, 167 ) );
-   scriptValue.push_back( exdData->getField< uint32_t >( row, 168 ) );
-   scriptValue.push_back( exdData->getField< uint32_t >( row, 169 ) );
-   scriptValue.push_back( exdData->getField< uint32_t >( row, 170 ) );
-   scriptValue.push_back( exdData->getField< uint32_t >( row, 171 ) );
-   scriptValue.push_back( exdData->getField< uint32_t >( row, 172 ) );
-   scriptValue.push_back( exdData->getField< uint32_t >( row, 173 ) );
-   scriptValue.push_back( exdData->getField< uint32_t >( row, 174 ) );
-   scriptValue.push_back( exdData->getField< uint32_t >( row, 175 ) );
-   scriptValue.push_back( exdData->getField< uint32_t >( row, 176 ) );
-   scriptValue.push_back( exdData->getField< uint32_t >( row, 177 ) );
-   scriptValue.push_back( exdData->getField< uint32_t >( row, 178 ) );
-   scriptValue.push_back( exdData->getField< uint32_t >( row, 179 ) );
-   scriptValue.push_back( exdData->getField< uint32_t >( row, 180 ) );
-   scriptValue.push_back( exdData->getField< uint32_t >( row, 181 ) );
-   scriptValue.push_back( exdData->getField< uint32_t >( row, 182 ) );
-   scriptValue.push_back( exdData->getField< uint32_t >( row, 183 ) );
-   scriptValue.push_back( exdData->getField< uint32_t >( row, 184 ) );
-   scriptValue.push_back( exdData->getField< uint32_t >( row, 185 ) );
-   scriptValue.push_back( exdData->getField< uint32_t >( row, 186 ) );
-   scriptValue.push_back( exdData->getField< uint32_t >( row, 187 ) );
-   scriptValue.push_back( exdData->getField< uint32_t >( row, 188 ) );
-   scriptValue.push_back( exdData->getField< uint32_t >( row, 189 ) );
-   scriptValue.push_back( exdData->getField< uint32_t >( row, 190 ) );
-   scriptValue.push_back( exdData->getField< uint32_t >( row, 191 ) );
-   scriptValue.push_back( exdData->getField< uint32_t >( row, 192 ) );
-   scriptValue.push_back( exdData->getField< uint32_t >( row, 193 ) );
-   scriptValue.push_back( exdData->getField< uint32_t >( row, 194 ) );
-   scriptValue.push_back( exdData->getField< uint32_t >( row, 195 ) );
-   scriptValue.push_back( exdData->getField< uint32_t >( row, 196 ) );
-   scriptValue.push_back( exdData->getField< uint32_t >( row, 197 ) );
-   scriptValue.push_back( exdData->getField< uint32_t >( row, 198 ) );
-   scriptValue.push_back( exdData->getField< uint32_t >( row, 199 ) );
-   scriptValue.push_back( exdData->getField< uint32_t >( row, 200 ) );
-   scriptValue.push_back( exdData->getField< uint32_t >( row, 201 ) );
-   scriptValue.push_back( exdData->getField< uint32_t >( row, 202 ) );
-   scriptValue.push_back( exdData->getField< uint32_t >( row, 203 ) );
-   scriptValue.push_back( exdData->getField< uint32_t >( row, 204 ) );
-   scriptValue.push_back( exdData->getField< uint32_t >( row, 205 ) );
-   scriptValue.push_back( exdData->getField< uint32_t >( row, 206 ) );
-   scriptValue.push_back( exdData->getField< uint32_t >( row, 207 ) );
-   scriptValue.push_back( exdData->getField< uint32_t >( row, 208 ) );
-   scriptValue.push_back( exdData->getField< uint32_t >( row, 209 ) );
-   scriptValue.push_back( exdData->getField< uint32_t >( row, 210 ) );
-   scriptValue.push_back( exdData->getField< uint32_t >( row, 211 ) );
-   scriptValue.push_back( exdData->getField< uint32_t >( row, 212 ) );
-   scriptValue.push_back( exdData->getField< uint32_t >( row, 213 ) );
-   scriptValue.push_back( exdData->getField< uint32_t >( row, 214 ) );
-   scriptValue.push_back( exdData->getField< uint32_t >( row, 215 ) );
-   scriptValue.push_back( exdData->getField< uint32_t >( row, 216 ) );
-   scriptValue.push_back( exdData->getField< uint32_t >( row, 217 ) );
-   scriptValue.push_back( exdData->getField< uint32_t >( row, 218 ) );
-   scriptValue.push_back( exdData->getField< uint32_t >( row, 219 ) );
-   scriptValue.push_back( exdData->getField< uint32_t >( row, 220 ) );
-   scriptValue.push_back( exdData->getField< uint32_t >( row, 221 ) );
-   scriptValue.push_back( exdData->getField< uint32_t >( row, 222 ) );
-   scriptValue.push_back( exdData->getField< uint32_t >( row, 223 ) );
-   scriptValue.push_back( exdData->getField< uint32_t >( row, 224 ) );
-   scriptValue.push_back( exdData->getField< uint32_t >( row, 225 ) );
-   scriptValue.push_back( exdData->getField< uint32_t >( row, 226 ) );
-   scriptValue.push_back( exdData->getField< uint32_t >( row, 227 ) );
-   scriptValue.push_back( exdData->getField< uint32_t >( row, 228 ) );
-   scriptValue.push_back( exdData->getField< uint32_t >( row, 229 ) );
-   scriptValue.push_back( exdData->getField< uint32_t >( row, 230 ) );
-   scriptValue.push_back( exdData->getField< uint32_t >( row, 231 ) );
-   scriptValue.push_back( exdData->getField< uint32_t >( row, 232 ) );
-   scriptValue.push_back( exdData->getField< uint32_t >( row, 233 ) );
-   scriptValue.push_back( exdData->getField< uint32_t >( row, 234 ) );
-   scriptValue.push_back( exdData->getField< uint32_t >( row, 235 ) );
-   scriptValue.push_back( exdData->getField< uint32_t >( row, 236 ) );
-   scriptValue.push_back( exdData->getField< uint32_t >( row, 237 ) );
-   scriptValue.push_back( exdData->getField< uint32_t >( row, 238 ) );
-   scriptValue.push_back( exdData->getField< uint32_t >( row, 239 ) );
-   scriptValue.push_back( exdData->getField< uint32_t >( row, 240 ) );
-   scriptValue.push_back( exdData->getField< uint32_t >( row, 241 ) );
-   scriptValue.push_back( exdData->getField< uint32_t >( row, 242 ) );
-   scriptValue.push_back( exdData->getField< uint32_t >( row, 243 ) );
-   scriptValue.push_back( exdData->getField< uint32_t >( row, 244 ) );
-   scriptValue.push_back( exdData->getField< uint32_t >( row, 245 ) );
-   scriptValue.push_back( exdData->getField< uint32_t >( row, 246 ) );
-   scriptValue.push_back( exdData->getField< uint32_t >( row, 247 ) );
-   scriptValue.push_back( exdData->getField< uint32_t >( row, 248 ) );
-   scriptValue.push_back( exdData->getField< uint32_t >( row, 249 ) );
-   scriptValue.push_back( exdData->getField< uint32_t >( row, 250 ) );
-   scriptValue.push_back( exdData->getField< uint32_t >( row, 251 ) );
-   scriptValue.push_back( exdData->getField< uint32_t >( row, 252 ) );
-   scriptValue.push_back( exdData->getField< uint32_t >( row, 253 ) );
-   scriptValue.push_back( exdData->getField< uint32_t >( row, 254 ) );
-   scriptValue.push_back( exdData->getField< uint32_t >( row, 255 ) );
-   scriptValue.push_back( exdData->getField< uint32_t >( row, 256 ) );
-   scriptValue.push_back( exdData->getField< uint32_t >( row, 257 ) );
-   scriptValue.push_back( exdData->getField< uint32_t >( row, 258 ) );
-   scriptValue.push_back( exdData->getField< uint32_t >( row, 259 ) );
-   scriptValue.push_back( exdData->getField< uint32_t >( row, 260 ) );
-   scriptValue.push_back( exdData->getField< uint32_t >( row, 261 ) );
-   scriptValue.push_back( exdData->getField< uint32_t >( row, 262 ) );
-   scriptValue.push_back( exdData->getField< uint32_t >( row, 263 ) );
-   scriptValue.push_back( exdData->getField< uint32_t >( row, 264 ) );
-   scriptValue.push_back( exdData->getField< uint32_t >( row, 265 ) );
-   scriptValue.push_back( exdData->getField< uint32_t >( row, 266 ) );
-   scriptValue.push_back( exdData->getField< uint32_t >( row, 267 ) );
-   scriptValue.push_back( exdData->getField< uint32_t >( row, 268 ) );
-   scriptValue.push_back( exdData->getField< uint32_t >( row, 269 ) );
-   scriptValue.push_back( exdData->getField< uint32_t >( row, 270 ) );
-   scriptValue.push_back( exdData->getField< uint32_t >( row, 271 ) );
-   scriptValue.push_back( exdData->getField< uint32_t >( row, 272 ) );
-   scriptValue.push_back( exdData->getField< uint32_t >( row, 273 ) );
-   scriptValue.push_back( exdData->getField< uint32_t >( row, 274 ) );
-   scriptValue.push_back( exdData->getField< uint32_t >( row, 275 ) );
-   scriptValue.push_back( exdData->getField< uint32_t >( row, 276 ) );
-   scriptValue.push_back( exdData->getField< uint32_t >( row, 277 ) );
-   scriptValue.push_back( exdData->getField< uint32_t >( row, 278 ) );
-   scriptValue.push_back( exdData->getField< uint32_t >( row, 279 ) );
-   scriptValue.push_back( exdData->getField< uint32_t >( row, 280 ) );
-   scriptValue.push_back( exdData->getField< uint32_t >( row, 281 ) );
-   scriptValue.push_back( exdData->getField< uint32_t >( row, 282 ) );
-   scriptValue.push_back( exdData->getField< uint32_t >( row, 283 ) );
-   scriptValue.push_back( exdData->getField< uint32_t >( row, 284 ) );
-   scriptValue.push_back( exdData->getField< uint32_t >( row, 285 ) );
-   scriptValue.push_back( exdData->getField< uint32_t >( row, 286 ) );
-   scriptValue.push_back( exdData->getField< uint32_t >( row, 287 ) );
-   scriptValue.push_back( exdData->getField< uint32_t >( row, 288 ) );
-   scriptValue.push_back( exdData->getField< uint32_t >( row, 289 ) );
-   scriptValue.push_back( exdData->getField< uint32_t >( row, 290 ) );
-   scriptValue.push_back( exdData->getField< uint32_t >( row, 291 ) );
-   scriptValue.push_back( exdData->getField< uint32_t >( row, 292 ) );
-   scriptValue.push_back( exdData->getField< uint32_t >( row, 293 ) );
-   scriptValue.push_back( exdData->getField< uint32_t >( row, 294 ) );
-   scriptValue.push_back( exdData->getField< uint32_t >( row, 295 ) );
-   scriptValue.push_back( exdData->getField< uint32_t >( row, 296 ) );
-   scriptValue.push_back( exdData->getField< uint32_t >( row, 297 ) );
-   scriptValue.push_back( exdData->getField< uint32_t >( row, 298 ) );
-   scriptValue.push_back( exdData->getField< uint32_t >( row, 299 ) );
-   scriptValue.push_back( exdData->getField< uint32_t >( row, 300 ) );
-   scriptValue.push_back( exdData->getField< uint32_t >( row, 301 ) );
-   scriptValue.push_back( exdData->getField< uint32_t >( row, 302 ) );
+  scriptInstruction.push_back( exdData->getField< std::string >( row, 4 ) );
+  scriptInstruction.push_back( exdData->getField< std::string >( row, 5 ) );
+  scriptInstruction.push_back( exdData->getField< std::string >( row, 6 ) );
+  scriptInstruction.push_back( exdData->getField< std::string >( row, 7 ) );
+  scriptInstruction.push_back( exdData->getField< std::string >( row, 8 ) );
+  scriptInstruction.push_back( exdData->getField< std::string >( row, 9 ) );
+  scriptInstruction.push_back( exdData->getField< std::string >( row, 10 ) );
+  scriptInstruction.push_back( exdData->getField< std::string >( row, 11 ) );
+  scriptInstruction.push_back( exdData->getField< std::string >( row, 12 ) );
+  scriptInstruction.push_back( exdData->getField< std::string >( row, 13 ) );
+  scriptInstruction.push_back( exdData->getField< std::string >( row, 14 ) );
+  scriptInstruction.push_back( exdData->getField< std::string >( row, 15 ) );
+  scriptInstruction.push_back( exdData->getField< std::string >( row, 16 ) );
+  scriptInstruction.push_back( exdData->getField< std::string >( row, 17 ) );
+  scriptInstruction.push_back( exdData->getField< std::string >( row, 18 ) );
+  scriptInstruction.push_back( exdData->getField< std::string >( row, 19 ) );
+  scriptInstruction.push_back( exdData->getField< std::string >( row, 20 ) );
+  scriptInstruction.push_back( exdData->getField< std::string >( row, 21 ) );
+  scriptInstruction.push_back( exdData->getField< std::string >( row, 22 ) );
+  scriptInstruction.push_back( exdData->getField< std::string >( row, 23 ) );
+  scriptInstruction.push_back( exdData->getField< std::string >( row, 24 ) );
+  scriptInstruction.push_back( exdData->getField< std::string >( row, 25 ) );
+  scriptInstruction.push_back( exdData->getField< std::string >( row, 26 ) );
+  scriptInstruction.push_back( exdData->getField< std::string >( row, 27 ) );
+  scriptInstruction.push_back( exdData->getField< std::string >( row, 28 ) );
+  scriptInstruction.push_back( exdData->getField< std::string >( row, 29 ) );
+  scriptInstruction.push_back( exdData->getField< std::string >( row, 30 ) );
+  scriptInstruction.push_back( exdData->getField< std::string >( row, 31 ) );
+  scriptInstruction.push_back( exdData->getField< std::string >( row, 32 ) );
+  scriptInstruction.push_back( exdData->getField< std::string >( row, 33 ) );
+  scriptInstruction.push_back( exdData->getField< std::string >( row, 34 ) );
+  scriptInstruction.push_back( exdData->getField< std::string >( row, 35 ) );
+  scriptInstruction.push_back( exdData->getField< std::string >( row, 36 ) );
+  scriptInstruction.push_back( exdData->getField< std::string >( row, 37 ) );
+  scriptInstruction.push_back( exdData->getField< std::string >( row, 38 ) );
+  scriptInstruction.push_back( exdData->getField< std::string >( row, 39 ) );
+  scriptInstruction.push_back( exdData->getField< std::string >( row, 40 ) );
+  scriptInstruction.push_back( exdData->getField< std::string >( row, 41 ) );
+  scriptInstruction.push_back( exdData->getField< std::string >( row, 42 ) );
+  scriptInstruction.push_back( exdData->getField< std::string >( row, 43 ) );
+  scriptInstruction.push_back( exdData->getField< std::string >( row, 44 ) );
+  scriptInstruction.push_back( exdData->getField< std::string >( row, 45 ) );
+  scriptInstruction.push_back( exdData->getField< std::string >( row, 46 ) );
+  scriptInstruction.push_back( exdData->getField< std::string >( row, 47 ) );
+  scriptInstruction.push_back( exdData->getField< std::string >( row, 48 ) );
+  scriptInstruction.push_back( exdData->getField< std::string >( row, 49 ) );
+  scriptInstruction.push_back( exdData->getField< std::string >( row, 50 ) );
+  scriptInstruction.push_back( exdData->getField< std::string >( row, 51 ) );
+  scriptInstruction.push_back( exdData->getField< std::string >( row, 52 ) );
+  scriptInstruction.push_back( exdData->getField< std::string >( row, 53 ) );
+  scriptInstruction.push_back( exdData->getField< std::string >( row, 54 ) );
+  scriptInstruction.push_back( exdData->getField< std::string >( row, 55 ) );
+  scriptInstruction.push_back( exdData->getField< std::string >( row, 56 ) );
+  scriptInstruction.push_back( exdData->getField< std::string >( row, 57 ) );
+  scriptInstruction.push_back( exdData->getField< std::string >( row, 58 ) );
+  scriptInstruction.push_back( exdData->getField< std::string >( row, 59 ) );
+  scriptInstruction.push_back( exdData->getField< std::string >( row, 60 ) );
+  scriptInstruction.push_back( exdData->getField< std::string >( row, 61 ) );
+  scriptInstruction.push_back( exdData->getField< std::string >( row, 62 ) );
+  scriptInstruction.push_back( exdData->getField< std::string >( row, 63 ) );
+  scriptInstruction.push_back( exdData->getField< std::string >( row, 64 ) );
+  scriptInstruction.push_back( exdData->getField< std::string >( row, 65 ) );
+  scriptInstruction.push_back( exdData->getField< std::string >( row, 66 ) );
+  scriptInstruction.push_back( exdData->getField< std::string >( row, 67 ) );
+  scriptInstruction.push_back( exdData->getField< std::string >( row, 68 ) );
+  scriptInstruction.push_back( exdData->getField< std::string >( row, 69 ) );
+  scriptInstruction.push_back( exdData->getField< std::string >( row, 70 ) );
+  scriptInstruction.push_back( exdData->getField< std::string >( row, 71 ) );
+  scriptInstruction.push_back( exdData->getField< std::string >( row, 72 ) );
+  scriptInstruction.push_back( exdData->getField< std::string >( row, 73 ) );
+  scriptInstruction.push_back( exdData->getField< std::string >( row, 74 ) );
+  scriptInstruction.push_back( exdData->getField< std::string >( row, 75 ) );
+  scriptInstruction.push_back( exdData->getField< std::string >( row, 76 ) );
+  scriptInstruction.push_back( exdData->getField< std::string >( row, 77 ) );
+  scriptInstruction.push_back( exdData->getField< std::string >( row, 78 ) );
+  scriptInstruction.push_back( exdData->getField< std::string >( row, 79 ) );
+  scriptInstruction.push_back( exdData->getField< std::string >( row, 80 ) );
+  scriptInstruction.push_back( exdData->getField< std::string >( row, 81 ) );
+  scriptInstruction.push_back( exdData->getField< std::string >( row, 82 ) );
+  scriptInstruction.push_back( exdData->getField< std::string >( row, 83 ) );
+  scriptInstruction.push_back( exdData->getField< std::string >( row, 84 ) );
+  scriptInstruction.push_back( exdData->getField< std::string >( row, 85 ) );
+  scriptInstruction.push_back( exdData->getField< std::string >( row, 86 ) );
+  scriptInstruction.push_back( exdData->getField< std::string >( row, 87 ) );
+  scriptInstruction.push_back( exdData->getField< std::string >( row, 88 ) );
+  scriptInstruction.push_back( exdData->getField< std::string >( row, 89 ) );
+  scriptInstruction.push_back( exdData->getField< std::string >( row, 90 ) );
+  scriptInstruction.push_back( exdData->getField< std::string >( row, 91 ) );
+  scriptInstruction.push_back( exdData->getField< std::string >( row, 92 ) );
+  scriptInstruction.push_back( exdData->getField< std::string >( row, 93 ) );
+  scriptInstruction.push_back( exdData->getField< std::string >( row, 94 ) );
+  scriptInstruction.push_back( exdData->getField< std::string >( row, 95 ) );
+  scriptInstruction.push_back( exdData->getField< std::string >( row, 96 ) );
+  scriptInstruction.push_back( exdData->getField< std::string >( row, 97 ) );
+  scriptInstruction.push_back( exdData->getField< std::string >( row, 98 ) );
+  scriptInstruction.push_back( exdData->getField< std::string >( row, 99 ) );
+  scriptInstruction.push_back( exdData->getField< std::string >( row, 100 ) );
+  scriptInstruction.push_back( exdData->getField< std::string >( row, 101 ) );
+  scriptInstruction.push_back( exdData->getField< std::string >( row, 102 ) );
+  scriptInstruction.push_back( exdData->getField< std::string >( row, 103 ) );
+  scriptInstruction.push_back( exdData->getField< std::string >( row, 104 ) );
+  scriptInstruction.push_back( exdData->getField< std::string >( row, 105 ) );
+  scriptInstruction.push_back( exdData->getField< std::string >( row, 106 ) );
+  scriptInstruction.push_back( exdData->getField< std::string >( row, 107 ) );
+  scriptInstruction.push_back( exdData->getField< std::string >( row, 108 ) );
+  scriptInstruction.push_back( exdData->getField< std::string >( row, 109 ) );
+  scriptInstruction.push_back( exdData->getField< std::string >( row, 110 ) );
+  scriptInstruction.push_back( exdData->getField< std::string >( row, 111 ) );
+  scriptInstruction.push_back( exdData->getField< std::string >( row, 112 ) );
+  scriptInstruction.push_back( exdData->getField< std::string >( row, 113 ) );
+  scriptInstruction.push_back( exdData->getField< std::string >( row, 114 ) );
+  scriptInstruction.push_back( exdData->getField< std::string >( row, 115 ) );
+  scriptInstruction.push_back( exdData->getField< std::string >( row, 116 ) );
+  scriptInstruction.push_back( exdData->getField< std::string >( row, 117 ) );
+  scriptInstruction.push_back( exdData->getField< std::string >( row, 118 ) );
+  scriptInstruction.push_back( exdData->getField< std::string >( row, 119 ) );
+  scriptInstruction.push_back( exdData->getField< std::string >( row, 120 ) );
+  scriptInstruction.push_back( exdData->getField< std::string >( row, 121 ) );
+  scriptInstruction.push_back( exdData->getField< std::string >( row, 122 ) );
+  scriptInstruction.push_back( exdData->getField< std::string >( row, 123 ) );
+  scriptInstruction.push_back( exdData->getField< std::string >( row, 124 ) );
+  scriptInstruction.push_back( exdData->getField< std::string >( row, 125 ) );
+  scriptInstruction.push_back( exdData->getField< std::string >( row, 126 ) );
+  scriptInstruction.push_back( exdData->getField< std::string >( row, 127 ) );
+  scriptInstruction.push_back( exdData->getField< std::string >( row, 128 ) );
+  scriptInstruction.push_back( exdData->getField< std::string >( row, 129 ) );
+  scriptInstruction.push_back( exdData->getField< std::string >( row, 130 ) );
+  scriptInstruction.push_back( exdData->getField< std::string >( row, 131 ) );
+  scriptInstruction.push_back( exdData->getField< std::string >( row, 132 ) );
+  scriptInstruction.push_back( exdData->getField< std::string >( row, 133 ) );
+  scriptInstruction.push_back( exdData->getField< std::string >( row, 134 ) );
+  scriptInstruction.push_back( exdData->getField< std::string >( row, 135 ) );
+  scriptInstruction.push_back( exdData->getField< std::string >( row, 136 ) );
+  scriptInstruction.push_back( exdData->getField< std::string >( row, 137 ) );
+  scriptInstruction.push_back( exdData->getField< std::string >( row, 138 ) );
+  scriptInstruction.push_back( exdData->getField< std::string >( row, 139 ) );
+  scriptInstruction.push_back( exdData->getField< std::string >( row, 140 ) );
+  scriptInstruction.push_back( exdData->getField< std::string >( row, 141 ) );
+  scriptInstruction.push_back( exdData->getField< std::string >( row, 142 ) );
+  scriptInstruction.push_back( exdData->getField< std::string >( row, 143 ) );
+  scriptInstruction.push_back( exdData->getField< std::string >( row, 144 ) );
+  scriptInstruction.push_back( exdData->getField< std::string >( row, 145 ) );
+  scriptInstruction.push_back( exdData->getField< std::string >( row, 146 ) );
+  scriptInstruction.push_back( exdData->getField< std::string >( row, 147 ) );
+  scriptInstruction.push_back( exdData->getField< std::string >( row, 148 ) );
+  scriptInstruction.push_back( exdData->getField< std::string >( row, 149 ) );
+  scriptInstruction.push_back( exdData->getField< std::string >( row, 150 ) );
+  scriptInstruction.push_back( exdData->getField< std::string >( row, 151 ) );
+  scriptInstruction.push_back( exdData->getField< std::string >( row, 152 ) );
+  scriptInstruction.push_back( exdData->getField< std::string >( row, 153 ) );
+  scriptValue.push_back( exdData->getField< uint32_t >( row, 154 ) );
+  scriptValue.push_back( exdData->getField< uint32_t >( row, 155 ) );
+  scriptValue.push_back( exdData->getField< uint32_t >( row, 156 ) );
+  scriptValue.push_back( exdData->getField< uint32_t >( row, 157 ) );
+  scriptValue.push_back( exdData->getField< uint32_t >( row, 158 ) );
+  scriptValue.push_back( exdData->getField< uint32_t >( row, 159 ) );
+  scriptValue.push_back( exdData->getField< uint32_t >( row, 160 ) );
+  scriptValue.push_back( exdData->getField< uint32_t >( row, 161 ) );
+  scriptValue.push_back( exdData->getField< uint32_t >( row, 162 ) );
+  scriptValue.push_back( exdData->getField< uint32_t >( row, 163 ) );
+  scriptValue.push_back( exdData->getField< uint32_t >( row, 164 ) );
+  scriptValue.push_back( exdData->getField< uint32_t >( row, 165 ) );
+  scriptValue.push_back( exdData->getField< uint32_t >( row, 166 ) );
+  scriptValue.push_back( exdData->getField< uint32_t >( row, 167 ) );
+  scriptValue.push_back( exdData->getField< uint32_t >( row, 168 ) );
+  scriptValue.push_back( exdData->getField< uint32_t >( row, 169 ) );
+  scriptValue.push_back( exdData->getField< uint32_t >( row, 170 ) );
+  scriptValue.push_back( exdData->getField< uint32_t >( row, 171 ) );
+  scriptValue.push_back( exdData->getField< uint32_t >( row, 172 ) );
+  scriptValue.push_back( exdData->getField< uint32_t >( row, 173 ) );
+  scriptValue.push_back( exdData->getField< uint32_t >( row, 174 ) );
+  scriptValue.push_back( exdData->getField< uint32_t >( row, 175 ) );
+  scriptValue.push_back( exdData->getField< uint32_t >( row, 176 ) );
+  scriptValue.push_back( exdData->getField< uint32_t >( row, 177 ) );
+  scriptValue.push_back( exdData->getField< uint32_t >( row, 178 ) );
+  scriptValue.push_back( exdData->getField< uint32_t >( row, 179 ) );
+  scriptValue.push_back( exdData->getField< uint32_t >( row, 180 ) );
+  scriptValue.push_back( exdData->getField< uint32_t >( row, 181 ) );
+  scriptValue.push_back( exdData->getField< uint32_t >( row, 182 ) );
+  scriptValue.push_back( exdData->getField< uint32_t >( row, 183 ) );
+  scriptValue.push_back( exdData->getField< uint32_t >( row, 184 ) );
+  scriptValue.push_back( exdData->getField< uint32_t >( row, 185 ) );
+  scriptValue.push_back( exdData->getField< uint32_t >( row, 186 ) );
+  scriptValue.push_back( exdData->getField< uint32_t >( row, 187 ) );
+  scriptValue.push_back( exdData->getField< uint32_t >( row, 188 ) );
+  scriptValue.push_back( exdData->getField< uint32_t >( row, 189 ) );
+  scriptValue.push_back( exdData->getField< uint32_t >( row, 190 ) );
+  scriptValue.push_back( exdData->getField< uint32_t >( row, 191 ) );
+  scriptValue.push_back( exdData->getField< uint32_t >( row, 192 ) );
+  scriptValue.push_back( exdData->getField< uint32_t >( row, 193 ) );
+  scriptValue.push_back( exdData->getField< uint32_t >( row, 194 ) );
+  scriptValue.push_back( exdData->getField< uint32_t >( row, 195 ) );
+  scriptValue.push_back( exdData->getField< uint32_t >( row, 196 ) );
+  scriptValue.push_back( exdData->getField< uint32_t >( row, 197 ) );
+  scriptValue.push_back( exdData->getField< uint32_t >( row, 198 ) );
+  scriptValue.push_back( exdData->getField< uint32_t >( row, 199 ) );
+  scriptValue.push_back( exdData->getField< uint32_t >( row, 200 ) );
+  scriptValue.push_back( exdData->getField< uint32_t >( row, 201 ) );
+  scriptValue.push_back( exdData->getField< uint32_t >( row, 202 ) );
+  scriptValue.push_back( exdData->getField< uint32_t >( row, 203 ) );
+  scriptValue.push_back( exdData->getField< uint32_t >( row, 204 ) );
+  scriptValue.push_back( exdData->getField< uint32_t >( row, 205 ) );
+  scriptValue.push_back( exdData->getField< uint32_t >( row, 206 ) );
+  scriptValue.push_back( exdData->getField< uint32_t >( row, 207 ) );
+  scriptValue.push_back( exdData->getField< uint32_t >( row, 208 ) );
+  scriptValue.push_back( exdData->getField< uint32_t >( row, 209 ) );
+  scriptValue.push_back( exdData->getField< uint32_t >( row, 210 ) );
+  scriptValue.push_back( exdData->getField< uint32_t >( row, 211 ) );
+  scriptValue.push_back( exdData->getField< uint32_t >( row, 212 ) );
+  scriptValue.push_back( exdData->getField< uint32_t >( row, 213 ) );
+  scriptValue.push_back( exdData->getField< uint32_t >( row, 214 ) );
+  scriptValue.push_back( exdData->getField< uint32_t >( row, 215 ) );
+  scriptValue.push_back( exdData->getField< uint32_t >( row, 216 ) );
+  scriptValue.push_back( exdData->getField< uint32_t >( row, 217 ) );
+  scriptValue.push_back( exdData->getField< uint32_t >( row, 218 ) );
+  scriptValue.push_back( exdData->getField< uint32_t >( row, 219 ) );
+  scriptValue.push_back( exdData->getField< uint32_t >( row, 220 ) );
+  scriptValue.push_back( exdData->getField< uint32_t >( row, 221 ) );
+  scriptValue.push_back( exdData->getField< uint32_t >( row, 222 ) );
+  scriptValue.push_back( exdData->getField< uint32_t >( row, 223 ) );
+  scriptValue.push_back( exdData->getField< uint32_t >( row, 224 ) );
+  scriptValue.push_back( exdData->getField< uint32_t >( row, 225 ) );
+  scriptValue.push_back( exdData->getField< uint32_t >( row, 226 ) );
+  scriptValue.push_back( exdData->getField< uint32_t >( row, 227 ) );
+  scriptValue.push_back( exdData->getField< uint32_t >( row, 228 ) );
+  scriptValue.push_back( exdData->getField< uint32_t >( row, 229 ) );
+  scriptValue.push_back( exdData->getField< uint32_t >( row, 230 ) );
+  scriptValue.push_back( exdData->getField< uint32_t >( row, 231 ) );
+  scriptValue.push_back( exdData->getField< uint32_t >( row, 232 ) );
+  scriptValue.push_back( exdData->getField< uint32_t >( row, 233 ) );
+  scriptValue.push_back( exdData->getField< uint32_t >( row, 234 ) );
+  scriptValue.push_back( exdData->getField< uint32_t >( row, 235 ) );
+  scriptValue.push_back( exdData->getField< uint32_t >( row, 236 ) );
+  scriptValue.push_back( exdData->getField< uint32_t >( row, 237 ) );
+  scriptValue.push_back( exdData->getField< uint32_t >( row, 238 ) );
+  scriptValue.push_back( exdData->getField< uint32_t >( row, 239 ) );
+  scriptValue.push_back( exdData->getField< uint32_t >( row, 240 ) );
+  scriptValue.push_back( exdData->getField< uint32_t >( row, 241 ) );
+  scriptValue.push_back( exdData->getField< uint32_t >( row, 242 ) );
+  scriptValue.push_back( exdData->getField< uint32_t >( row, 243 ) );
+  scriptValue.push_back( exdData->getField< uint32_t >( row, 244 ) );
+  scriptValue.push_back( exdData->getField< uint32_t >( row, 245 ) );
+  scriptValue.push_back( exdData->getField< uint32_t >( row, 246 ) );
+  scriptValue.push_back( exdData->getField< uint32_t >( row, 247 ) );
+  scriptValue.push_back( exdData->getField< uint32_t >( row, 248 ) );
+  scriptValue.push_back( exdData->getField< uint32_t >( row, 249 ) );
+  scriptValue.push_back( exdData->getField< uint32_t >( row, 250 ) );
+  scriptValue.push_back( exdData->getField< uint32_t >( row, 251 ) );
+  scriptValue.push_back( exdData->getField< uint32_t >( row, 252 ) );
+  scriptValue.push_back( exdData->getField< uint32_t >( row, 253 ) );
+  scriptValue.push_back( exdData->getField< uint32_t >( row, 254 ) );
+  scriptValue.push_back( exdData->getField< uint32_t >( row, 255 ) );
+  scriptValue.push_back( exdData->getField< uint32_t >( row, 256 ) );
+  scriptValue.push_back( exdData->getField< uint32_t >( row, 257 ) );
+  scriptValue.push_back( exdData->getField< uint32_t >( row, 258 ) );
+  scriptValue.push_back( exdData->getField< uint32_t >( row, 259 ) );
+  scriptValue.push_back( exdData->getField< uint32_t >( row, 260 ) );
+  scriptValue.push_back( exdData->getField< uint32_t >( row, 261 ) );
+  scriptValue.push_back( exdData->getField< uint32_t >( row, 262 ) );
+  scriptValue.push_back( exdData->getField< uint32_t >( row, 263 ) );
+  scriptValue.push_back( exdData->getField< uint32_t >( row, 264 ) );
+  scriptValue.push_back( exdData->getField< uint32_t >( row, 265 ) );
+  scriptValue.push_back( exdData->getField< uint32_t >( row, 266 ) );
+  scriptValue.push_back( exdData->getField< uint32_t >( row, 267 ) );
+  scriptValue.push_back( exdData->getField< uint32_t >( row, 268 ) );
+  scriptValue.push_back( exdData->getField< uint32_t >( row, 269 ) );
+  scriptValue.push_back( exdData->getField< uint32_t >( row, 270 ) );
+  scriptValue.push_back( exdData->getField< uint32_t >( row, 271 ) );
+  scriptValue.push_back( exdData->getField< uint32_t >( row, 272 ) );
+  scriptValue.push_back( exdData->getField< uint32_t >( row, 273 ) );
+  scriptValue.push_back( exdData->getField< uint32_t >( row, 274 ) );
+  scriptValue.push_back( exdData->getField< uint32_t >( row, 275 ) );
+  scriptValue.push_back( exdData->getField< uint32_t >( row, 276 ) );
+  scriptValue.push_back( exdData->getField< uint32_t >( row, 277 ) );
+  scriptValue.push_back( exdData->getField< uint32_t >( row, 278 ) );
+  scriptValue.push_back( exdData->getField< uint32_t >( row, 279 ) );
+  scriptValue.push_back( exdData->getField< uint32_t >( row, 280 ) );
+  scriptValue.push_back( exdData->getField< uint32_t >( row, 281 ) );
+  scriptValue.push_back( exdData->getField< uint32_t >( row, 282 ) );
+  scriptValue.push_back( exdData->getField< uint32_t >( row, 283 ) );
+  scriptValue.push_back( exdData->getField< uint32_t >( row, 284 ) );
+  scriptValue.push_back( exdData->getField< uint32_t >( row, 285 ) );
+  scriptValue.push_back( exdData->getField< uint32_t >( row, 286 ) );
+  scriptValue.push_back( exdData->getField< uint32_t >( row, 287 ) );
+  scriptValue.push_back( exdData->getField< uint32_t >( row, 288 ) );
+  scriptValue.push_back( exdData->getField< uint32_t >( row, 289 ) );
+  scriptValue.push_back( exdData->getField< uint32_t >( row, 290 ) );
+  scriptValue.push_back( exdData->getField< uint32_t >( row, 291 ) );
+  scriptValue.push_back( exdData->getField< uint32_t >( row, 292 ) );
+  scriptValue.push_back( exdData->getField< uint32_t >( row, 293 ) );
+  scriptValue.push_back( exdData->getField< uint32_t >( row, 294 ) );
+  scriptValue.push_back( exdData->getField< uint32_t >( row, 295 ) );
+  scriptValue.push_back( exdData->getField< uint32_t >( row, 296 ) );
+  scriptValue.push_back( exdData->getField< uint32_t >( row, 297 ) );
+  scriptValue.push_back( exdData->getField< uint32_t >( row, 298 ) );
+  scriptValue.push_back( exdData->getField< uint32_t >( row, 299 ) );
+  scriptValue.push_back( exdData->getField< uint32_t >( row, 300 ) );
+  scriptValue.push_back( exdData->getField< uint32_t >( row, 301 ) );
+  scriptValue.push_back( exdData->getField< uint32_t >( row, 302 ) );
+  scriptValue.push_back( exdData->getField< uint32_t >( row, 303 ) );
 }
 
 Sapphire::Data::QuestClassJobReward::QuestClassJobReward( uint32_t row_id, uint32_t subRow, Sapphire::Data::ExdDataGenerated* exdData )
 {
-   auto row = exdData->m_QuestClassJobRewardDat.get_row( row_id, subRow );
-   classJobCategory = exdData->getField< uint8_t >( row, 0 );
-   rewardItem.push_back( exdData->getField< uint32_t >( row, 1 ) );
-   rewardItem.push_back( exdData->getField< uint32_t >( row, 2 ) );
-   rewardItem.push_back( exdData->getField< uint32_t >( row, 3 ) );
-   rewardItem.push_back( exdData->getField< uint32_t >( row, 4 ) );
-   rewardAmount.push_back( exdData->getField< uint8_t >( row, 5 ) );
-   rewardAmount.push_back( exdData->getField< uint8_t >( row, 6 ) );
-   rewardAmount.push_back( exdData->getField< uint8_t >( row, 7 ) );
-   rewardAmount.push_back( exdData->getField< uint8_t >( row, 8 ) );
-   requiredItem.push_back( exdData->getField< uint32_t >( row, 9 ) );
-   requiredItem.push_back( exdData->getField< uint32_t >( row, 10 ) );
-   requiredItem.push_back( exdData->getField< uint32_t >( row, 11 ) );
-   requiredItem.push_back( exdData->getField< uint32_t >( row, 12 ) );
-   requiredAmount.push_back( exdData->getField< uint8_t >( row, 13 ) );
-   requiredAmount.push_back( exdData->getField< uint8_t >( row, 14 ) );
-   requiredAmount.push_back( exdData->getField< uint8_t >( row, 15 ) );
-   requiredAmount.push_back( exdData->getField< uint8_t >( row, 16 ) );
+  auto row = exdData->m_QuestClassJobRewardDat.get_row( row_id, subRow );
+  classJobCategory = exdData->getField< uint8_t >( row, 0 );
+  rewardItem.push_back( exdData->getField< uint32_t >( row, 1 ) );
+  rewardItem.push_back( exdData->getField< uint32_t >( row, 2 ) );
+  rewardItem.push_back( exdData->getField< uint32_t >( row, 3 ) );
+  rewardItem.push_back( exdData->getField< uint32_t >( row, 4 ) );
+  rewardAmount.push_back( exdData->getField< uint8_t >( row, 5 ) );
+  rewardAmount.push_back( exdData->getField< uint8_t >( row, 6 ) );
+  rewardAmount.push_back( exdData->getField< uint8_t >( row, 7 ) );
+  rewardAmount.push_back( exdData->getField< uint8_t >( row, 8 ) );
+  requiredItem.push_back( exdData->getField< uint32_t >( row, 9 ) );
+  requiredItem.push_back( exdData->getField< uint32_t >( row, 10 ) );
+  requiredItem.push_back( exdData->getField< uint32_t >( row, 11 ) );
+  requiredItem.push_back( exdData->getField< uint32_t >( row, 12 ) );
+  requiredAmount.push_back( exdData->getField< uint8_t >( row, 13 ) );
+  requiredAmount.push_back( exdData->getField< uint8_t >( row, 14 ) );
+  requiredAmount.push_back( exdData->getField< uint8_t >( row, 15 ) );
+  requiredAmount.push_back( exdData->getField< uint8_t >( row, 16 ) );
 }
 
 Sapphire::Data::QuestClassJobSupply::QuestClassJobSupply( uint32_t row_id, uint32_t subRow, Sapphire::Data::ExdDataGenerated* exdData )
 {
-   auto row = exdData->m_QuestClassJobSupplyDat.get_row( row_id, subRow );
-   classJobCategory = exdData->getField< uint8_t >( row, 0 );
-   eNpcResident = exdData->getField< uint32_t >( row, 2 );
-   item = exdData->getField< uint32_t >( row, 3 );
+  auto row = exdData->m_QuestClassJobSupplyDat.get_row( row_id, subRow );
+  classJobCategory = exdData->getField< uint8_t >( row, 0 );
+  eNpcResident = exdData->getField< uint32_t >( row, 2 );
+  item = exdData->getField< uint32_t >( row, 3 );
 }
 
 Sapphire::Data::QuestRepeatFlag::QuestRepeatFlag( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
 {
-   auto row = exdData->m_QuestRepeatFlagDat.get_row( row_id );
-   quest = exdData->getField< uint32_t >( row, 0 );
+  auto row = exdData->m_QuestRepeatFlagDat.get_row( row_id );
+  quest = exdData->getField< uint32_t >( row, 0 );
 }
 
 Sapphire::Data::QuestRewardOther::QuestRewardOther( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
 {
-   auto row = exdData->m_QuestRewardOtherDat.get_row( row_id );
-   icon = exdData->getField< uint32_t >( row, 0 );
-   name = exdData->getField< std::string >( row, 1 );
+  auto row = exdData->m_QuestRewardOtherDat.get_row( row_id );
+  icon = exdData->getField< uint32_t >( row, 0 );
+  name = exdData->getField< std::string >( row, 1 );
 }
 
 Sapphire::Data::QuickChat::QuickChat( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
 {
-   auto row = exdData->m_QuickChatDat.get_row( row_id );
-   nameAction = exdData->getField< std::string >( row, 0 );
-   icon = exdData->getField< int32_t >( row, 1 );
-   addon = exdData->getField< int32_t >( row, 2 );
-   quickChatTransient = exdData->getField< int8_t >( row, 3 );
+  auto row = exdData->m_QuickChatDat.get_row( row_id );
+  nameAction = exdData->getField< std::string >( row, 0 );
+  icon = exdData->getField< int32_t >( row, 1 );
+  addon = exdData->getField< int32_t >( row, 2 );
+  quickChatTransient = exdData->getField< int8_t >( row, 3 );
 }
 
 Sapphire::Data::QuickChatTransient::QuickChatTransient( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
 {
-   auto row = exdData->m_QuickChatTransientDat.get_row( row_id );
-   textOutput = exdData->getField< std::string >( row, 0 );
+  auto row = exdData->m_QuickChatTransientDat.get_row( row_id );
+  textOutput = exdData->getField< std::string >( row, 0 );
 }
 
 Sapphire::Data::Race::Race( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
 {
-   auto row = exdData->m_RaceDat.get_row( row_id );
-   masculine = exdData->getField< std::string >( row, 0 );
-   feminine = exdData->getField< std::string >( row, 1 );
-   rSEMBody = exdData->getField< int32_t >( row, 2 );
-   rSEMHands = exdData->getField< int32_t >( row, 3 );
-   rSEMLegs = exdData->getField< int32_t >( row, 4 );
-   rSEMFeet = exdData->getField< int32_t >( row, 5 );
-   rSEFBody = exdData->getField< int32_t >( row, 6 );
-   rSEFHands = exdData->getField< int32_t >( row, 7 );
-   rSEFLegs = exdData->getField< int32_t >( row, 8 );
-   rSEFFeet = exdData->getField< int32_t >( row, 9 );
+  auto row = exdData->m_RaceDat.get_row( row_id );
+  masculine = exdData->getField< std::string >( row, 0 );
+  feminine = exdData->getField< std::string >( row, 1 );
+  rSEMBody = exdData->getField< int32_t >( row, 2 );
+  rSEMHands = exdData->getField< int32_t >( row, 3 );
+  rSEMLegs = exdData->getField< int32_t >( row, 4 );
+  rSEMFeet = exdData->getField< int32_t >( row, 5 );
+  rSEFBody = exdData->getField< int32_t >( row, 6 );
+  rSEFHands = exdData->getField< int32_t >( row, 7 );
+  rSEFLegs = exdData->getField< int32_t >( row, 8 );
+  rSEFFeet = exdData->getField< int32_t >( row, 9 );
 }
 
 Sapphire::Data::RacingChocoboItem::RacingChocoboItem( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
 {
-   auto row = exdData->m_RacingChocoboItemDat.get_row( row_id );
-   item = exdData->getField< int32_t >( row, 0 );
-   category = exdData->getField< uint8_t >( row, 1 );
-   param.push_back( exdData->getField< uint8_t >( row, 2 ) );
-   param.push_back( exdData->getField< uint8_t >( row, 3 ) );
+  auto row = exdData->m_RacingChocoboItemDat.get_row( row_id );
+  item = exdData->getField< int32_t >( row, 0 );
+  category = exdData->getField< uint8_t >( row, 1 );
+  param.push_back( exdData->getField< uint8_t >( row, 2 ) );
+  param.push_back( exdData->getField< uint8_t >( row, 3 ) );
 }
 
 Sapphire::Data::RacingChocoboName::RacingChocoboName( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
 {
-   auto row = exdData->m_RacingChocoboNameDat.get_row( row_id );
-   name = exdData->getField< std::string >( row, 0 );
+  auto row = exdData->m_RacingChocoboNameDat.get_row( row_id );
+  name = exdData->getField< std::string >( row, 0 );
 }
 
 Sapphire::Data::RacingChocoboNameCategory::RacingChocoboNameCategory( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
 {
-   auto row = exdData->m_RacingChocoboNameCategoryDat.get_row( row_id );
-   sortKey = exdData->getField< uint8_t >( row, 0 );
-   name = exdData->getField< std::string >( row, 1 );
+  auto row = exdData->m_RacingChocoboNameCategoryDat.get_row( row_id );
+  sortKey = exdData->getField< uint8_t >( row, 0 );
+  name = exdData->getField< std::string >( row, 1 );
 }
 
 Sapphire::Data::RacingChocoboNameInfo::RacingChocoboNameInfo( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
 {
-   auto row = exdData->m_RacingChocoboNameInfoDat.get_row( row_id );
-   racingChocoboNameCategory = exdData->getField< uint8_t >( row, 0 );
+  auto row = exdData->m_RacingChocoboNameInfoDat.get_row( row_id );
+  racingChocoboNameCategory = exdData->getField< uint8_t >( row, 0 );
 }
 
 Sapphire::Data::RacingChocoboParam::RacingChocoboParam( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
 {
-   auto row = exdData->m_RacingChocoboParamDat.get_row( row_id );
-   name = exdData->getField< std::string >( row, 0 );
+  auto row = exdData->m_RacingChocoboParamDat.get_row( row_id );
+  name = exdData->getField< std::string >( row, 0 );
 }
 
 Sapphire::Data::RecastNavimesh::RecastNavimesh( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
 {
-   auto row = exdData->m_RecastNavimeshDat.get_row( row_id );
-   tileSize = exdData->getField< float >( row, 1 );
-   cellSize = exdData->getField< float >( row, 2 );
-   cellHeight = exdData->getField< float >( row, 3 );
-   agentHeight = exdData->getField< float >( row, 4 );
-   agentRadius = exdData->getField< float >( row, 5 );
-   agentMaxClimb = exdData->getField< float >( row, 6 );
-   agentMaxSlope = exdData->getField< float >( row, 7 );
-   regionMinSize = exdData->getField< float >( row, 9 );
-   regionMergedSize = exdData->getField< float >( row, 10 );
-   maxEdgeLength = exdData->getField< float >( row, 12 );
-   maxEdgeError = exdData->getField< float >( row, 13 );
-   vertsPerPoly = exdData->getField< float >( row, 14 );
-   detailMeshSampleDistance = exdData->getField< float >( row, 15 );
-   detailMeshMaxSampleError = exdData->getField< float >( row, 16 );
+  auto row = exdData->m_RecastNavimeshDat.get_row( row_id );
+  tileSize = exdData->getField< float >( row, 1 );
+  cellSize = exdData->getField< float >( row, 2 );
+  cellHeight = exdData->getField< float >( row, 3 );
+  agentHeight = exdData->getField< float >( row, 4 );
+  agentRadius = exdData->getField< float >( row, 5 );
+  agentMaxClimb = exdData->getField< float >( row, 6 );
+  agentMaxSlope = exdData->getField< float >( row, 7 );
+  regionMinSize = exdData->getField< float >( row, 9 );
+  regionMergedSize = exdData->getField< float >( row, 10 );
+  maxEdgeLength = exdData->getField< float >( row, 12 );
+  maxEdgeError = exdData->getField< float >( row, 13 );
+  vertsPerPoly = exdData->getField< float >( row, 14 );
+  detailMeshSampleDistance = exdData->getField< float >( row, 15 );
+  detailMeshMaxSampleError = exdData->getField< float >( row, 16 );
 }
 
 Sapphire::Data::Recipe::Recipe( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
 {
-   auto row = exdData->m_RecipeDat.get_row( row_id );
-   craftType = exdData->getField< int32_t >( row, 1 );
-   recipeLevelTable = exdData->getField< uint16_t >( row, 2 );
-   itemResult = exdData->getField< int32_t >( row, 3 );
-   amountResult = exdData->getField< uint8_t >( row, 4 );
-   recipeElement = exdData->getField< uint8_t >( row, 25 );
-   isSecondary = exdData->getField< bool >( row, 27 );
-   difficultyFactor = exdData->getField< uint16_t >( row, 28 );
-   qualityFactor = exdData->getField< uint16_t >( row, 29 );
-   durabilityFactor = exdData->getField< uint16_t >( row, 30 );
-   requiredCraftsmanship = exdData->getField< uint16_t >( row, 32 );
-   requiredControl = exdData->getField< uint16_t >( row, 33 );
-   quickSynthCraftsmanship = exdData->getField< uint16_t >( row, 34 );
-   quickSynthControl = exdData->getField< uint16_t >( row, 35 );
-   secretRecipeBook = exdData->getField< uint16_t >( row, 36 );
-   canQuickSynth = exdData->getField< bool >( row, 37 );
-   canHq = exdData->getField< bool >( row, 38 );
-   expRewarded = exdData->getField< bool >( row, 39 );
-   statusRequired = exdData->getField< int32_t >( row, 40 );
-   itemRequired = exdData->getField< int32_t >( row, 41 );
-   isSpecializationRequired = exdData->getField< bool >( row, 42 );
-   patchNumber = exdData->getField< uint16_t >( row, 44 );
+  auto row = exdData->m_RecipeDat.get_row( row_id );
+  craftType = exdData->getField< int32_t >( row, 1 );
+  recipeLevelTable = exdData->getField< uint16_t >( row, 2 );
+  itemResult = exdData->getField< int32_t >( row, 3 );
+  amountResult = exdData->getField< uint8_t >( row, 4 );
+  recipeElement = exdData->getField< uint8_t >( row, 25 );
+  isSecondary = exdData->getField< bool >( row, 27 );
+  difficultyFactor = exdData->getField< uint16_t >( row, 28 );
+  qualityFactor = exdData->getField< uint16_t >( row, 29 );
+  durabilityFactor = exdData->getField< uint16_t >( row, 30 );
+  requiredCraftsmanship = exdData->getField< uint16_t >( row, 32 );
+  requiredControl = exdData->getField< uint16_t >( row, 33 );
+  quickSynthCraftsmanship = exdData->getField< uint16_t >( row, 34 );
+  quickSynthControl = exdData->getField< uint16_t >( row, 35 );
+  secretRecipeBook = exdData->getField< uint16_t >( row, 36 );
+  canQuickSynth = exdData->getField< bool >( row, 37 );
+  canHq = exdData->getField< bool >( row, 38 );
+  expRewarded = exdData->getField< bool >( row, 39 );
+  statusRequired = exdData->getField< int32_t >( row, 40 );
+  itemRequired = exdData->getField< int32_t >( row, 41 );
+  isSpecializationRequired = exdData->getField< bool >( row, 42 );
+  patchNumber = exdData->getField< uint16_t >( row, 44 );
 }
 
 Sapphire::Data::RecipeElement::RecipeElement( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
 {
-   auto row = exdData->m_RecipeElementDat.get_row( row_id );
-   name = exdData->getField< std::string >( row, 0 );
+  auto row = exdData->m_RecipeElementDat.get_row( row_id );
+  name = exdData->getField< std::string >( row, 0 );
 }
 
 Sapphire::Data::RecipeLevelTable::RecipeLevelTable( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
 {
-   auto row = exdData->m_RecipeLevelTableDat.get_row( row_id );
-   classJobLevel = exdData->getField< uint8_t >( row, 0 );
-   stars = exdData->getField< uint8_t >( row, 1 );
-   suggestedCraftsmanship = exdData->getField< uint16_t >( row, 2 );
-   difficulty = exdData->getField< uint16_t >( row, 3 );
-   quality = exdData->getField< int16_t >( row, 4 );
-   durability = exdData->getField< uint16_t >( row, 5 );
+  auto row = exdData->m_RecipeLevelTableDat.get_row( row_id );
+  classJobLevel = exdData->getField< uint8_t >( row, 0 );
+  stars = exdData->getField< uint8_t >( row, 1 );
+  suggestedCraftsmanship = exdData->getField< uint16_t >( row, 2 );
+  difficulty = exdData->getField< uint16_t >( row, 3 );
+  quality = exdData->getField< int16_t >( row, 4 );
+  durability = exdData->getField< uint16_t >( row, 5 );
 }
 
 Sapphire::Data::RecipeNotebookList::RecipeNotebookList( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
 {
-   auto row = exdData->m_RecipeNotebookListDat.get_row( row_id );
-   recipe.push_back( exdData->getField< int32_t >( row, 1 ) );
-   recipe.push_back( exdData->getField< int32_t >( row, 2 ) );
-   recipe.push_back( exdData->getField< int32_t >( row, 3 ) );
-   recipe.push_back( exdData->getField< int32_t >( row, 4 ) );
-   recipe.push_back( exdData->getField< int32_t >( row, 5 ) );
-   recipe.push_back( exdData->getField< int32_t >( row, 6 ) );
-   recipe.push_back( exdData->getField< int32_t >( row, 7 ) );
-   recipe.push_back( exdData->getField< int32_t >( row, 8 ) );
-   recipe.push_back( exdData->getField< int32_t >( row, 9 ) );
-   recipe.push_back( exdData->getField< int32_t >( row, 10 ) );
-   recipe.push_back( exdData->getField< int32_t >( row, 11 ) );
-   recipe.push_back( exdData->getField< int32_t >( row, 12 ) );
-   recipe.push_back( exdData->getField< int32_t >( row, 13 ) );
-   recipe.push_back( exdData->getField< int32_t >( row, 14 ) );
-   recipe.push_back( exdData->getField< int32_t >( row, 15 ) );
-   recipe.push_back( exdData->getField< int32_t >( row, 16 ) );
-   recipe.push_back( exdData->getField< int32_t >( row, 17 ) );
-   recipe.push_back( exdData->getField< int32_t >( row, 18 ) );
-   recipe.push_back( exdData->getField< int32_t >( row, 19 ) );
-   recipe.push_back( exdData->getField< int32_t >( row, 20 ) );
-   recipe.push_back( exdData->getField< int32_t >( row, 21 ) );
-   recipe.push_back( exdData->getField< int32_t >( row, 22 ) );
-   recipe.push_back( exdData->getField< int32_t >( row, 23 ) );
-   recipe.push_back( exdData->getField< int32_t >( row, 24 ) );
-   recipe.push_back( exdData->getField< int32_t >( row, 25 ) );
-   recipe.push_back( exdData->getField< int32_t >( row, 26 ) );
-   recipe.push_back( exdData->getField< int32_t >( row, 27 ) );
-   recipe.push_back( exdData->getField< int32_t >( row, 28 ) );
-   recipe.push_back( exdData->getField< int32_t >( row, 29 ) );
-   recipe.push_back( exdData->getField< int32_t >( row, 30 ) );
-   recipe.push_back( exdData->getField< int32_t >( row, 31 ) );
-   recipe.push_back( exdData->getField< int32_t >( row, 32 ) );
-   recipe.push_back( exdData->getField< int32_t >( row, 33 ) );
-   recipe.push_back( exdData->getField< int32_t >( row, 34 ) );
-   recipe.push_back( exdData->getField< int32_t >( row, 35 ) );
-   recipe.push_back( exdData->getField< int32_t >( row, 36 ) );
-   recipe.push_back( exdData->getField< int32_t >( row, 37 ) );
-   recipe.push_back( exdData->getField< int32_t >( row, 38 ) );
-   recipe.push_back( exdData->getField< int32_t >( row, 39 ) );
-   recipe.push_back( exdData->getField< int32_t >( row, 40 ) );
-   recipe.push_back( exdData->getField< int32_t >( row, 41 ) );
-   recipe.push_back( exdData->getField< int32_t >( row, 42 ) );
-   recipe.push_back( exdData->getField< int32_t >( row, 43 ) );
-   recipe.push_back( exdData->getField< int32_t >( row, 44 ) );
-   recipe.push_back( exdData->getField< int32_t >( row, 45 ) );
-   recipe.push_back( exdData->getField< int32_t >( row, 46 ) );
-   recipe.push_back( exdData->getField< int32_t >( row, 47 ) );
-   recipe.push_back( exdData->getField< int32_t >( row, 48 ) );
-   recipe.push_back( exdData->getField< int32_t >( row, 49 ) );
-   recipe.push_back( exdData->getField< int32_t >( row, 50 ) );
-   recipe.push_back( exdData->getField< int32_t >( row, 51 ) );
-   recipe.push_back( exdData->getField< int32_t >( row, 52 ) );
-   recipe.push_back( exdData->getField< int32_t >( row, 53 ) );
-   recipe.push_back( exdData->getField< int32_t >( row, 54 ) );
-   recipe.push_back( exdData->getField< int32_t >( row, 55 ) );
-   recipe.push_back( exdData->getField< int32_t >( row, 56 ) );
-   recipe.push_back( exdData->getField< int32_t >( row, 57 ) );
-   recipe.push_back( exdData->getField< int32_t >( row, 58 ) );
-   recipe.push_back( exdData->getField< int32_t >( row, 59 ) );
-   recipe.push_back( exdData->getField< int32_t >( row, 60 ) );
-   recipe.push_back( exdData->getField< int32_t >( row, 61 ) );
-   recipe.push_back( exdData->getField< int32_t >( row, 62 ) );
-   recipe.push_back( exdData->getField< int32_t >( row, 63 ) );
-   recipe.push_back( exdData->getField< int32_t >( row, 64 ) );
-   recipe.push_back( exdData->getField< int32_t >( row, 65 ) );
-   recipe.push_back( exdData->getField< int32_t >( row, 66 ) );
-   recipe.push_back( exdData->getField< int32_t >( row, 67 ) );
-   recipe.push_back( exdData->getField< int32_t >( row, 68 ) );
-   recipe.push_back( exdData->getField< int32_t >( row, 69 ) );
-   recipe.push_back( exdData->getField< int32_t >( row, 70 ) );
-   recipe.push_back( exdData->getField< int32_t >( row, 71 ) );
-   recipe.push_back( exdData->getField< int32_t >( row, 72 ) );
-   recipe.push_back( exdData->getField< int32_t >( row, 73 ) );
-   recipe.push_back( exdData->getField< int32_t >( row, 74 ) );
-   recipe.push_back( exdData->getField< int32_t >( row, 75 ) );
-   recipe.push_back( exdData->getField< int32_t >( row, 76 ) );
-   recipe.push_back( exdData->getField< int32_t >( row, 77 ) );
-   recipe.push_back( exdData->getField< int32_t >( row, 78 ) );
-   recipe.push_back( exdData->getField< int32_t >( row, 79 ) );
-   recipe.push_back( exdData->getField< int32_t >( row, 80 ) );
-   recipe.push_back( exdData->getField< int32_t >( row, 81 ) );
-   recipe.push_back( exdData->getField< int32_t >( row, 82 ) );
-   recipe.push_back( exdData->getField< int32_t >( row, 83 ) );
-   recipe.push_back( exdData->getField< int32_t >( row, 84 ) );
-   recipe.push_back( exdData->getField< int32_t >( row, 85 ) );
-   recipe.push_back( exdData->getField< int32_t >( row, 86 ) );
-   recipe.push_back( exdData->getField< int32_t >( row, 87 ) );
-   recipe.push_back( exdData->getField< int32_t >( row, 88 ) );
-   recipe.push_back( exdData->getField< int32_t >( row, 89 ) );
-   recipe.push_back( exdData->getField< int32_t >( row, 90 ) );
-   recipe.push_back( exdData->getField< int32_t >( row, 91 ) );
-   recipe.push_back( exdData->getField< int32_t >( row, 92 ) );
-   recipe.push_back( exdData->getField< int32_t >( row, 93 ) );
-   recipe.push_back( exdData->getField< int32_t >( row, 94 ) );
-   recipe.push_back( exdData->getField< int32_t >( row, 95 ) );
-   recipe.push_back( exdData->getField< int32_t >( row, 96 ) );
-   recipe.push_back( exdData->getField< int32_t >( row, 97 ) );
-   recipe.push_back( exdData->getField< int32_t >( row, 98 ) );
-   recipe.push_back( exdData->getField< int32_t >( row, 99 ) );
-   recipe.push_back( exdData->getField< int32_t >( row, 100 ) );
-   recipe.push_back( exdData->getField< int32_t >( row, 101 ) );
-   recipe.push_back( exdData->getField< int32_t >( row, 102 ) );
-   recipe.push_back( exdData->getField< int32_t >( row, 103 ) );
-   recipe.push_back( exdData->getField< int32_t >( row, 104 ) );
-   recipe.push_back( exdData->getField< int32_t >( row, 105 ) );
-   recipe.push_back( exdData->getField< int32_t >( row, 106 ) );
-   recipe.push_back( exdData->getField< int32_t >( row, 107 ) );
-   recipe.push_back( exdData->getField< int32_t >( row, 108 ) );
-   recipe.push_back( exdData->getField< int32_t >( row, 109 ) );
-   recipe.push_back( exdData->getField< int32_t >( row, 110 ) );
-   recipe.push_back( exdData->getField< int32_t >( row, 111 ) );
-   recipe.push_back( exdData->getField< int32_t >( row, 112 ) );
-   recipe.push_back( exdData->getField< int32_t >( row, 113 ) );
-   recipe.push_back( exdData->getField< int32_t >( row, 114 ) );
-   recipe.push_back( exdData->getField< int32_t >( row, 115 ) );
-   recipe.push_back( exdData->getField< int32_t >( row, 116 ) );
-   recipe.push_back( exdData->getField< int32_t >( row, 117 ) );
-   recipe.push_back( exdData->getField< int32_t >( row, 118 ) );
-   recipe.push_back( exdData->getField< int32_t >( row, 119 ) );
-   recipe.push_back( exdData->getField< int32_t >( row, 120 ) );
-   recipe.push_back( exdData->getField< int32_t >( row, 121 ) );
-   recipe.push_back( exdData->getField< int32_t >( row, 122 ) );
-   recipe.push_back( exdData->getField< int32_t >( row, 123 ) );
-   recipe.push_back( exdData->getField< int32_t >( row, 124 ) );
-   recipe.push_back( exdData->getField< int32_t >( row, 125 ) );
-   recipe.push_back( exdData->getField< int32_t >( row, 126 ) );
-   recipe.push_back( exdData->getField< int32_t >( row, 127 ) );
-   recipe.push_back( exdData->getField< int32_t >( row, 128 ) );
-   recipe.push_back( exdData->getField< int32_t >( row, 129 ) );
-   recipe.push_back( exdData->getField< int32_t >( row, 130 ) );
-   recipe.push_back( exdData->getField< int32_t >( row, 131 ) );
-   recipe.push_back( exdData->getField< int32_t >( row, 132 ) );
-   recipe.push_back( exdData->getField< int32_t >( row, 133 ) );
-   recipe.push_back( exdData->getField< int32_t >( row, 134 ) );
-   recipe.push_back( exdData->getField< int32_t >( row, 135 ) );
-   recipe.push_back( exdData->getField< int32_t >( row, 136 ) );
-   recipe.push_back( exdData->getField< int32_t >( row, 137 ) );
-   recipe.push_back( exdData->getField< int32_t >( row, 138 ) );
-   recipe.push_back( exdData->getField< int32_t >( row, 139 ) );
-   recipe.push_back( exdData->getField< int32_t >( row, 140 ) );
-   recipe.push_back( exdData->getField< int32_t >( row, 141 ) );
-   recipe.push_back( exdData->getField< int32_t >( row, 142 ) );
-   recipe.push_back( exdData->getField< int32_t >( row, 143 ) );
-   recipe.push_back( exdData->getField< int32_t >( row, 144 ) );
-   recipe.push_back( exdData->getField< int32_t >( row, 145 ) );
-   recipe.push_back( exdData->getField< int32_t >( row, 146 ) );
-   recipe.push_back( exdData->getField< int32_t >( row, 147 ) );
-   recipe.push_back( exdData->getField< int32_t >( row, 148 ) );
-   recipe.push_back( exdData->getField< int32_t >( row, 149 ) );
-   recipe.push_back( exdData->getField< int32_t >( row, 150 ) );
-   recipe.push_back( exdData->getField< int32_t >( row, 151 ) );
-   recipe.push_back( exdData->getField< int32_t >( row, 152 ) );
-   recipe.push_back( exdData->getField< int32_t >( row, 153 ) );
-   recipe.push_back( exdData->getField< int32_t >( row, 154 ) );
-   recipe.push_back( exdData->getField< int32_t >( row, 155 ) );
-   recipe.push_back( exdData->getField< int32_t >( row, 156 ) );
-   recipe.push_back( exdData->getField< int32_t >( row, 157 ) );
-   recipe.push_back( exdData->getField< int32_t >( row, 158 ) );
-   recipe.push_back( exdData->getField< int32_t >( row, 159 ) );
-   recipe.push_back( exdData->getField< int32_t >( row, 160 ) );
+  auto row = exdData->m_RecipeNotebookListDat.get_row( row_id );
+  recipe.push_back( exdData->getField< int32_t >( row, 1 ) );
+  recipe.push_back( exdData->getField< int32_t >( row, 2 ) );
+  recipe.push_back( exdData->getField< int32_t >( row, 3 ) );
+  recipe.push_back( exdData->getField< int32_t >( row, 4 ) );
+  recipe.push_back( exdData->getField< int32_t >( row, 5 ) );
+  recipe.push_back( exdData->getField< int32_t >( row, 6 ) );
+  recipe.push_back( exdData->getField< int32_t >( row, 7 ) );
+  recipe.push_back( exdData->getField< int32_t >( row, 8 ) );
+  recipe.push_back( exdData->getField< int32_t >( row, 9 ) );
+  recipe.push_back( exdData->getField< int32_t >( row, 10 ) );
+  recipe.push_back( exdData->getField< int32_t >( row, 11 ) );
+  recipe.push_back( exdData->getField< int32_t >( row, 12 ) );
+  recipe.push_back( exdData->getField< int32_t >( row, 13 ) );
+  recipe.push_back( exdData->getField< int32_t >( row, 14 ) );
+  recipe.push_back( exdData->getField< int32_t >( row, 15 ) );
+  recipe.push_back( exdData->getField< int32_t >( row, 16 ) );
+  recipe.push_back( exdData->getField< int32_t >( row, 17 ) );
+  recipe.push_back( exdData->getField< int32_t >( row, 18 ) );
+  recipe.push_back( exdData->getField< int32_t >( row, 19 ) );
+  recipe.push_back( exdData->getField< int32_t >( row, 20 ) );
+  recipe.push_back( exdData->getField< int32_t >( row, 21 ) );
+  recipe.push_back( exdData->getField< int32_t >( row, 22 ) );
+  recipe.push_back( exdData->getField< int32_t >( row, 23 ) );
+  recipe.push_back( exdData->getField< int32_t >( row, 24 ) );
+  recipe.push_back( exdData->getField< int32_t >( row, 25 ) );
+  recipe.push_back( exdData->getField< int32_t >( row, 26 ) );
+  recipe.push_back( exdData->getField< int32_t >( row, 27 ) );
+  recipe.push_back( exdData->getField< int32_t >( row, 28 ) );
+  recipe.push_back( exdData->getField< int32_t >( row, 29 ) );
+  recipe.push_back( exdData->getField< int32_t >( row, 30 ) );
+  recipe.push_back( exdData->getField< int32_t >( row, 31 ) );
+  recipe.push_back( exdData->getField< int32_t >( row, 32 ) );
+  recipe.push_back( exdData->getField< int32_t >( row, 33 ) );
+  recipe.push_back( exdData->getField< int32_t >( row, 34 ) );
+  recipe.push_back( exdData->getField< int32_t >( row, 35 ) );
+  recipe.push_back( exdData->getField< int32_t >( row, 36 ) );
+  recipe.push_back( exdData->getField< int32_t >( row, 37 ) );
+  recipe.push_back( exdData->getField< int32_t >( row, 38 ) );
+  recipe.push_back( exdData->getField< int32_t >( row, 39 ) );
+  recipe.push_back( exdData->getField< int32_t >( row, 40 ) );
+  recipe.push_back( exdData->getField< int32_t >( row, 41 ) );
+  recipe.push_back( exdData->getField< int32_t >( row, 42 ) );
+  recipe.push_back( exdData->getField< int32_t >( row, 43 ) );
+  recipe.push_back( exdData->getField< int32_t >( row, 44 ) );
+  recipe.push_back( exdData->getField< int32_t >( row, 45 ) );
+  recipe.push_back( exdData->getField< int32_t >( row, 46 ) );
+  recipe.push_back( exdData->getField< int32_t >( row, 47 ) );
+  recipe.push_back( exdData->getField< int32_t >( row, 48 ) );
+  recipe.push_back( exdData->getField< int32_t >( row, 49 ) );
+  recipe.push_back( exdData->getField< int32_t >( row, 50 ) );
+  recipe.push_back( exdData->getField< int32_t >( row, 51 ) );
+  recipe.push_back( exdData->getField< int32_t >( row, 52 ) );
+  recipe.push_back( exdData->getField< int32_t >( row, 53 ) );
+  recipe.push_back( exdData->getField< int32_t >( row, 54 ) );
+  recipe.push_back( exdData->getField< int32_t >( row, 55 ) );
+  recipe.push_back( exdData->getField< int32_t >( row, 56 ) );
+  recipe.push_back( exdData->getField< int32_t >( row, 57 ) );
+  recipe.push_back( exdData->getField< int32_t >( row, 58 ) );
+  recipe.push_back( exdData->getField< int32_t >( row, 59 ) );
+  recipe.push_back( exdData->getField< int32_t >( row, 60 ) );
+  recipe.push_back( exdData->getField< int32_t >( row, 61 ) );
+  recipe.push_back( exdData->getField< int32_t >( row, 62 ) );
+  recipe.push_back( exdData->getField< int32_t >( row, 63 ) );
+  recipe.push_back( exdData->getField< int32_t >( row, 64 ) );
+  recipe.push_back( exdData->getField< int32_t >( row, 65 ) );
+  recipe.push_back( exdData->getField< int32_t >( row, 66 ) );
+  recipe.push_back( exdData->getField< int32_t >( row, 67 ) );
+  recipe.push_back( exdData->getField< int32_t >( row, 68 ) );
+  recipe.push_back( exdData->getField< int32_t >( row, 69 ) );
+  recipe.push_back( exdData->getField< int32_t >( row, 70 ) );
+  recipe.push_back( exdData->getField< int32_t >( row, 71 ) );
+  recipe.push_back( exdData->getField< int32_t >( row, 72 ) );
+  recipe.push_back( exdData->getField< int32_t >( row, 73 ) );
+  recipe.push_back( exdData->getField< int32_t >( row, 74 ) );
+  recipe.push_back( exdData->getField< int32_t >( row, 75 ) );
+  recipe.push_back( exdData->getField< int32_t >( row, 76 ) );
+  recipe.push_back( exdData->getField< int32_t >( row, 77 ) );
+  recipe.push_back( exdData->getField< int32_t >( row, 78 ) );
+  recipe.push_back( exdData->getField< int32_t >( row, 79 ) );
+  recipe.push_back( exdData->getField< int32_t >( row, 80 ) );
+  recipe.push_back( exdData->getField< int32_t >( row, 81 ) );
+  recipe.push_back( exdData->getField< int32_t >( row, 82 ) );
+  recipe.push_back( exdData->getField< int32_t >( row, 83 ) );
+  recipe.push_back( exdData->getField< int32_t >( row, 84 ) );
+  recipe.push_back( exdData->getField< int32_t >( row, 85 ) );
+  recipe.push_back( exdData->getField< int32_t >( row, 86 ) );
+  recipe.push_back( exdData->getField< int32_t >( row, 87 ) );
+  recipe.push_back( exdData->getField< int32_t >( row, 88 ) );
+  recipe.push_back( exdData->getField< int32_t >( row, 89 ) );
+  recipe.push_back( exdData->getField< int32_t >( row, 90 ) );
+  recipe.push_back( exdData->getField< int32_t >( row, 91 ) );
+  recipe.push_back( exdData->getField< int32_t >( row, 92 ) );
+  recipe.push_back( exdData->getField< int32_t >( row, 93 ) );
+  recipe.push_back( exdData->getField< int32_t >( row, 94 ) );
+  recipe.push_back( exdData->getField< int32_t >( row, 95 ) );
+  recipe.push_back( exdData->getField< int32_t >( row, 96 ) );
+  recipe.push_back( exdData->getField< int32_t >( row, 97 ) );
+  recipe.push_back( exdData->getField< int32_t >( row, 98 ) );
+  recipe.push_back( exdData->getField< int32_t >( row, 99 ) );
+  recipe.push_back( exdData->getField< int32_t >( row, 100 ) );
+  recipe.push_back( exdData->getField< int32_t >( row, 101 ) );
+  recipe.push_back( exdData->getField< int32_t >( row, 102 ) );
+  recipe.push_back( exdData->getField< int32_t >( row, 103 ) );
+  recipe.push_back( exdData->getField< int32_t >( row, 104 ) );
+  recipe.push_back( exdData->getField< int32_t >( row, 105 ) );
+  recipe.push_back( exdData->getField< int32_t >( row, 106 ) );
+  recipe.push_back( exdData->getField< int32_t >( row, 107 ) );
+  recipe.push_back( exdData->getField< int32_t >( row, 108 ) );
+  recipe.push_back( exdData->getField< int32_t >( row, 109 ) );
+  recipe.push_back( exdData->getField< int32_t >( row, 110 ) );
+  recipe.push_back( exdData->getField< int32_t >( row, 111 ) );
+  recipe.push_back( exdData->getField< int32_t >( row, 112 ) );
+  recipe.push_back( exdData->getField< int32_t >( row, 113 ) );
+  recipe.push_back( exdData->getField< int32_t >( row, 114 ) );
+  recipe.push_back( exdData->getField< int32_t >( row, 115 ) );
+  recipe.push_back( exdData->getField< int32_t >( row, 116 ) );
+  recipe.push_back( exdData->getField< int32_t >( row, 117 ) );
+  recipe.push_back( exdData->getField< int32_t >( row, 118 ) );
+  recipe.push_back( exdData->getField< int32_t >( row, 119 ) );
+  recipe.push_back( exdData->getField< int32_t >( row, 120 ) );
+  recipe.push_back( exdData->getField< int32_t >( row, 121 ) );
+  recipe.push_back( exdData->getField< int32_t >( row, 122 ) );
+  recipe.push_back( exdData->getField< int32_t >( row, 123 ) );
+  recipe.push_back( exdData->getField< int32_t >( row, 124 ) );
+  recipe.push_back( exdData->getField< int32_t >( row, 125 ) );
+  recipe.push_back( exdData->getField< int32_t >( row, 126 ) );
+  recipe.push_back( exdData->getField< int32_t >( row, 127 ) );
+  recipe.push_back( exdData->getField< int32_t >( row, 128 ) );
+  recipe.push_back( exdData->getField< int32_t >( row, 129 ) );
+  recipe.push_back( exdData->getField< int32_t >( row, 130 ) );
+  recipe.push_back( exdData->getField< int32_t >( row, 131 ) );
+  recipe.push_back( exdData->getField< int32_t >( row, 132 ) );
+  recipe.push_back( exdData->getField< int32_t >( row, 133 ) );
+  recipe.push_back( exdData->getField< int32_t >( row, 134 ) );
+  recipe.push_back( exdData->getField< int32_t >( row, 135 ) );
+  recipe.push_back( exdData->getField< int32_t >( row, 136 ) );
+  recipe.push_back( exdData->getField< int32_t >( row, 137 ) );
+  recipe.push_back( exdData->getField< int32_t >( row, 138 ) );
+  recipe.push_back( exdData->getField< int32_t >( row, 139 ) );
+  recipe.push_back( exdData->getField< int32_t >( row, 140 ) );
+  recipe.push_back( exdData->getField< int32_t >( row, 141 ) );
+  recipe.push_back( exdData->getField< int32_t >( row, 142 ) );
+  recipe.push_back( exdData->getField< int32_t >( row, 143 ) );
+  recipe.push_back( exdData->getField< int32_t >( row, 144 ) );
+  recipe.push_back( exdData->getField< int32_t >( row, 145 ) );
+  recipe.push_back( exdData->getField< int32_t >( row, 146 ) );
+  recipe.push_back( exdData->getField< int32_t >( row, 147 ) );
+  recipe.push_back( exdData->getField< int32_t >( row, 148 ) );
+  recipe.push_back( exdData->getField< int32_t >( row, 149 ) );
+  recipe.push_back( exdData->getField< int32_t >( row, 150 ) );
+  recipe.push_back( exdData->getField< int32_t >( row, 151 ) );
+  recipe.push_back( exdData->getField< int32_t >( row, 152 ) );
+  recipe.push_back( exdData->getField< int32_t >( row, 153 ) );
+  recipe.push_back( exdData->getField< int32_t >( row, 154 ) );
+  recipe.push_back( exdData->getField< int32_t >( row, 155 ) );
+  recipe.push_back( exdData->getField< int32_t >( row, 156 ) );
+  recipe.push_back( exdData->getField< int32_t >( row, 157 ) );
+  recipe.push_back( exdData->getField< int32_t >( row, 158 ) );
+  recipe.push_back( exdData->getField< int32_t >( row, 159 ) );
+  recipe.push_back( exdData->getField< int32_t >( row, 160 ) );
 }
 
 Sapphire::Data::RecommendContents::RecommendContents( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
 {
-   auto row = exdData->m_RecommendContentsDat.get_row( row_id );
-   level = exdData->getField< int32_t >( row, 0 );
+  auto row = exdData->m_RecommendContentsDat.get_row( row_id );
+  level = exdData->getField< int32_t >( row, 0 );
 }
 
 Sapphire::Data::Relic::Relic( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
 {
-   auto row = exdData->m_RelicDat.get_row( row_id );
-   itemAtma = exdData->getField< uint32_t >( row, 0 );
-   itemAnimus = exdData->getField< uint32_t >( row, 1 );
-   icon = exdData->getField< int32_t >( row, 2 );
+  auto row = exdData->m_RelicDat.get_row( row_id );
+  itemAtma = exdData->getField< uint32_t >( row, 0 );
+  itemAnimus = exdData->getField< uint32_t >( row, 1 );
+  icon = exdData->getField< int32_t >( row, 2 );
 }
 
 Sapphire::Data::Relic3::Relic3( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
 {
-   auto row = exdData->m_Relic3Dat.get_row( row_id );
-   itemAnimus = exdData->getField< uint32_t >( row, 0 );
-   itemScroll = exdData->getField< uint32_t >( row, 1 );
-   materiaLimit = exdData->getField< uint8_t >( row, 2 );
-   itemNovus = exdData->getField< uint32_t >( row, 3 );
-   icon = exdData->getField< int32_t >( row, 4 );
+  auto row = exdData->m_Relic3Dat.get_row( row_id );
+  itemAnimus = exdData->getField< uint32_t >( row, 0 );
+  itemScroll = exdData->getField< uint32_t >( row, 1 );
+  materiaLimit = exdData->getField< uint8_t >( row, 2 );
+  itemNovus = exdData->getField< uint32_t >( row, 3 );
+  icon = exdData->getField< int32_t >( row, 4 );
 }
 
 Sapphire::Data::RelicItem::RelicItem( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
 {
-   auto row = exdData->m_RelicItemDat.get_row( row_id );
-   gladiatorItem = exdData->getField< uint32_t >( row, 1 );
-   pugilistItem = exdData->getField< uint32_t >( row, 2 );
-   marauderItem = exdData->getField< uint32_t >( row, 3 );
-   lancerItem = exdData->getField< uint32_t >( row, 4 );
-   archerItem = exdData->getField< uint32_t >( row, 5 );
-   conjurerItem = exdData->getField< uint32_t >( row, 6 );
-   thaumaturgeItem = exdData->getField< uint32_t >( row, 7 );
-   arcanistSMNItem = exdData->getField< uint32_t >( row, 8 );
-   arcanistSCHItem = exdData->getField< uint32_t >( row, 9 );
-   shieldItem = exdData->getField< uint32_t >( row, 10 );
-   rogueItem = exdData->getField< uint32_t >( row, 11 );
+  auto row = exdData->m_RelicItemDat.get_row( row_id );
+  gladiatorItem = exdData->getField< uint32_t >( row, 1 );
+  pugilistItem = exdData->getField< uint32_t >( row, 2 );
+  marauderItem = exdData->getField< uint32_t >( row, 3 );
+  lancerItem = exdData->getField< uint32_t >( row, 4 );
+  archerItem = exdData->getField< uint32_t >( row, 5 );
+  conjurerItem = exdData->getField< uint32_t >( row, 6 );
+  thaumaturgeItem = exdData->getField< uint32_t >( row, 7 );
+  arcanistSMNItem = exdData->getField< uint32_t >( row, 8 );
+  arcanistSCHItem = exdData->getField< uint32_t >( row, 9 );
+  shieldItem = exdData->getField< uint32_t >( row, 10 );
+  rogueItem = exdData->getField< uint32_t >( row, 11 );
 }
 
 Sapphire::Data::RelicNote::RelicNote( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
 {
-   auto row = exdData->m_RelicNoteDat.get_row( row_id );
-   eventItem = exdData->getField< uint32_t >( row, 0 );
-   monsterNoteTargetNM.push_back( exdData->getField< uint16_t >( row, 21 ) );
-   monsterNoteTargetNM.push_back( exdData->getField< uint16_t >( row, 22 ) );
-   monsterNoteTargetNM.push_back( exdData->getField< uint16_t >( row, 23 ) );
-   leve.push_back( exdData->getField< uint16_t >( row, 31 ) );
-   leve.push_back( exdData->getField< uint16_t >( row, 32 ) );
-   leve.push_back( exdData->getField< uint16_t >( row, 33 ) );
+  auto row = exdData->m_RelicNoteDat.get_row( row_id );
+  eventItem = exdData->getField< uint32_t >( row, 0 );
+  monsterNoteTargetNM.push_back( exdData->getField< uint16_t >( row, 21 ) );
+  monsterNoteTargetNM.push_back( exdData->getField< uint16_t >( row, 22 ) );
+  monsterNoteTargetNM.push_back( exdData->getField< uint16_t >( row, 23 ) );
+  leve.push_back( exdData->getField< uint16_t >( row, 31 ) );
+  leve.push_back( exdData->getField< uint16_t >( row, 32 ) );
+  leve.push_back( exdData->getField< uint16_t >( row, 33 ) );
 }
 
 Sapphire::Data::RelicNoteCategory::RelicNoteCategory( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
 {
-   auto row = exdData->m_RelicNoteCategoryDat.get_row( row_id );
-   text = exdData->getField< std::string >( row, 1 );
+  auto row = exdData->m_RelicNoteCategoryDat.get_row( row_id );
+  text = exdData->getField< std::string >( row, 1 );
 }
 
 Sapphire::Data::Resident::Resident( uint32_t row_id, uint32_t subRow, Sapphire::Data::ExdDataGenerated* exdData )
 {
-   auto row = exdData->m_ResidentDat.get_row( row_id, subRow );
-   model = exdData->getField< uint64_t >( row, 1 );
-   npcYell = exdData->getField< int32_t >( row, 2 );
-   residentMotionType = exdData->getField< uint8_t >( row, 3 );
+  auto row = exdData->m_ResidentDat.get_row( row_id, subRow );
+  model = exdData->getField< uint64_t >( row, 1 );
+  npcYell = exdData->getField< int32_t >( row, 2 );
+  residentMotionType = exdData->getField< uint8_t >( row, 3 );
 }
 
 Sapphire::Data::RetainerTask::RetainerTask( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
 {
-   auto row = exdData->m_RetainerTaskDat.get_row( row_id );
-   isRandom = exdData->getField< bool >( row, 0 );
-   classJobCategory = exdData->getField< uint8_t >( row, 1 );
-   retainerLevel = exdData->getField< uint8_t >( row, 2 );
-   retainerTaskParameter = exdData->getField< uint16_t >( row, 4 );
-   ventureCost = exdData->getField< uint16_t >( row, 5 );
-   maxTimemin = exdData->getField< uint16_t >( row, 6 );
-   experience = exdData->getField< int32_t >( row, 7 );
-   requiredItemLevel = exdData->getField< uint16_t >( row, 8 );
-   requiredGathering = exdData->getField< uint16_t >( row, 11 );
-   task = exdData->getField< uint16_t >( row, 13 );
+  auto row = exdData->m_RetainerTaskDat.get_row( row_id );
+  isRandom = exdData->getField< bool >( row, 0 );
+  classJobCategory = exdData->getField< uint8_t >( row, 1 );
+  retainerLevel = exdData->getField< uint8_t >( row, 2 );
+  retainerTaskParameter = exdData->getField< uint16_t >( row, 4 );
+  ventureCost = exdData->getField< uint16_t >( row, 5 );
+  maxTimemin = exdData->getField< uint16_t >( row, 6 );
+  experience = exdData->getField< int32_t >( row, 7 );
+  requiredItemLevel = exdData->getField< uint16_t >( row, 8 );
+  requiredGathering = exdData->getField< uint16_t >( row, 11 );
+  task = exdData->getField< uint16_t >( row, 13 );
 }
 
 Sapphire::Data::RetainerTaskLvRange::RetainerTaskLvRange( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
 {
-   auto row = exdData->m_RetainerTaskLvRangeDat.get_row( row_id );
-   min = exdData->getField< uint8_t >( row, 0 );
-   max = exdData->getField< uint8_t >( row, 1 );
+  auto row = exdData->m_RetainerTaskLvRangeDat.get_row( row_id );
+  min = exdData->getField< uint8_t >( row, 0 );
+  max = exdData->getField< uint8_t >( row, 1 );
 }
 
 Sapphire::Data::RetainerTaskNormal::RetainerTaskNormal( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
 {
-   auto row = exdData->m_RetainerTaskNormalDat.get_row( row_id );
-   item = exdData->getField< int32_t >( row, 0 );
-   quantity0 = exdData->getField< uint8_t >( row, 1 );
-   quantity1 = exdData->getField< uint8_t >( row, 2 );
-   quantity2 = exdData->getField< uint8_t >( row, 3 );
-   gatheringLog = exdData->getField< int16_t >( row, 4 );
-   fishingLog = exdData->getField< int16_t >( row, 5 );
+  auto row = exdData->m_RetainerTaskNormalDat.get_row( row_id );
+  item = exdData->getField< int32_t >( row, 0 );
+  quantity0 = exdData->getField< uint8_t >( row, 1 );
+  quantity1 = exdData->getField< uint8_t >( row, 2 );
+  quantity2 = exdData->getField< uint8_t >( row, 3 );
+  gatheringLog = exdData->getField< int16_t >( row, 4 );
+  fishingLog = exdData->getField< int16_t >( row, 5 );
 }
 
 Sapphire::Data::RetainerTaskParameter::RetainerTaskParameter( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
 {
-   auto row = exdData->m_RetainerTaskParameterDat.get_row( row_id );
-   itemLevelDoW.push_back( exdData->getField< int16_t >( row, 0 ) );
-   itemLevelDoW.push_back( exdData->getField< int16_t >( row, 1 ) );
-   gatheringDoL.push_back( exdData->getField< int16_t >( row, 2 ) );
-   gatheringDoL.push_back( exdData->getField< int16_t >( row, 3 ) );
-   gatheringFSH.push_back( exdData->getField< int16_t >( row, 4 ) );
-   gatheringFSH.push_back( exdData->getField< int16_t >( row, 5 ) );
+  auto row = exdData->m_RetainerTaskParameterDat.get_row( row_id );
+  itemLevelDoW.push_back( exdData->getField< int16_t >( row, 0 ) );
+  itemLevelDoW.push_back( exdData->getField< int16_t >( row, 1 ) );
+  gatheringDoL.push_back( exdData->getField< int16_t >( row, 2 ) );
+  gatheringDoL.push_back( exdData->getField< int16_t >( row, 3 ) );
+  gatheringFSH.push_back( exdData->getField< int16_t >( row, 4 ) );
+  gatheringFSH.push_back( exdData->getField< int16_t >( row, 5 ) );
 }
 
 Sapphire::Data::RetainerTaskRandom::RetainerTaskRandom( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
 {
-   auto row = exdData->m_RetainerTaskRandomDat.get_row( row_id );
-   name = exdData->getField< std::string >( row, 0 );
-   requirement = exdData->getField< int16_t >( row, 1 );
+  auto row = exdData->m_RetainerTaskRandomDat.get_row( row_id );
+  name = exdData->getField< std::string >( row, 0 );
+  requirement = exdData->getField< int16_t >( row, 1 );
 }
 
 Sapphire::Data::RPParameter::RPParameter( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
 {
-   auto row = exdData->m_RPParameterDat.get_row( row_id );
-   bNpcName = exdData->getField< uint16_t >( row, 0 );
-   classJob = exdData->getField< uint8_t >( row, 1 );
+  auto row = exdData->m_RPParameterDat.get_row( row_id );
+  bNpcName = exdData->getField< uint16_t >( row, 0 );
+  classJob = exdData->getField< uint8_t >( row, 1 );
 }
 
 Sapphire::Data::Salvage::Salvage( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
 {
-   auto row = exdData->m_SalvageDat.get_row( row_id );
-   optimalSkill = exdData->getField< uint16_t >( row, 0 );
+  auto row = exdData->m_SalvageDat.get_row( row_id );
+  optimalSkill = exdData->getField< uint16_t >( row, 0 );
 }
 
 Sapphire::Data::SatisfactionNpc::SatisfactionNpc( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
 {
-   auto row = exdData->m_SatisfactionNpcDat.get_row( row_id );
-   npc = exdData->getField< int32_t >( row, 0 );
-   questRequired = exdData->getField< int32_t >( row, 1 );
-   deliveriesPerWeek = exdData->getField< uint8_t >( row, 3 );
-   supplyIndex.push_back( exdData->getField< int32_t >( row, 4 ) );
-   supplyIndex.push_back( exdData->getField< int32_t >( row, 5 ) );
-   supplyIndex.push_back( exdData->getField< int32_t >( row, 6 ) );
-   supplyIndex.push_back( exdData->getField< int32_t >( row, 7 ) );
-   supplyIndex.push_back( exdData->getField< int32_t >( row, 8 ) );
-   supplyIndex.push_back( exdData->getField< int32_t >( row, 9 ) );
-   satisfactionRequired.push_back( exdData->getField< uint16_t >( row, 10 ) );
-   satisfactionRequired.push_back( exdData->getField< uint16_t >( row, 11 ) );
-   satisfactionRequired.push_back( exdData->getField< uint16_t >( row, 12 ) );
-   satisfactionRequired.push_back( exdData->getField< uint16_t >( row, 13 ) );
-   satisfactionRequired.push_back( exdData->getField< uint16_t >( row, 14 ) );
-   satisfactionRequired.push_back( exdData->getField< uint16_t >( row, 15 ) );
-   icon = exdData->getField< int32_t >( row, 70 );
+  auto row = exdData->m_SatisfactionNpcDat.get_row( row_id );
+  npc = exdData->getField< int32_t >( row, 0 );
+  questRequired = exdData->getField< int32_t >( row, 1 );
+  deliveriesPerWeek = exdData->getField< uint8_t >( row, 3 );
+  supplyIndex.push_back( exdData->getField< int32_t >( row, 4 ) );
+  supplyIndex.push_back( exdData->getField< int32_t >( row, 5 ) );
+  supplyIndex.push_back( exdData->getField< int32_t >( row, 6 ) );
+  supplyIndex.push_back( exdData->getField< int32_t >( row, 7 ) );
+  supplyIndex.push_back( exdData->getField< int32_t >( row, 8 ) );
+  supplyIndex.push_back( exdData->getField< int32_t >( row, 9 ) );
+  satisfactionRequired.push_back( exdData->getField< uint16_t >( row, 10 ) );
+  satisfactionRequired.push_back( exdData->getField< uint16_t >( row, 11 ) );
+  satisfactionRequired.push_back( exdData->getField< uint16_t >( row, 12 ) );
+  satisfactionRequired.push_back( exdData->getField< uint16_t >( row, 13 ) );
+  satisfactionRequired.push_back( exdData->getField< uint16_t >( row, 14 ) );
+  satisfactionRequired.push_back( exdData->getField< uint16_t >( row, 15 ) );
+  icon = exdData->getField< int32_t >( row, 70 );
 }
 
 Sapphire::Data::SatisfactionSupply::SatisfactionSupply( uint32_t row_id, uint32_t subRow, Sapphire::Data::ExdDataGenerated* exdData )
 {
-   auto row = exdData->m_SatisfactionSupplyDat.get_row( row_id, subRow );
-   slot = exdData->getField< uint8_t >( row, 0 );
-   probability = exdData->getField< uint8_t >( row, 1 );
-   item = exdData->getField< int32_t >( row, 2 );
-   collectabilityLow = exdData->getField< uint16_t >( row, 3 );
-   collectabilityMid = exdData->getField< uint16_t >( row, 4 );
-   collectabilityHigh = exdData->getField< uint16_t >( row, 5 );
-   reward = exdData->getField< uint16_t >( row, 6 );
+  auto row = exdData->m_SatisfactionSupplyDat.get_row( row_id, subRow );
+  slot = exdData->getField< uint8_t >( row, 0 );
+  probability = exdData->getField< uint8_t >( row, 1 );
+  item = exdData->getField< int32_t >( row, 2 );
+  collectabilityLow = exdData->getField< uint16_t >( row, 3 );
+  collectabilityMid = exdData->getField< uint16_t >( row, 4 );
+  collectabilityHigh = exdData->getField< uint16_t >( row, 5 );
+  reward = exdData->getField< uint16_t >( row, 6 );
 }
 
 Sapphire::Data::SatisfactionSupplyReward::SatisfactionSupplyReward( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
 {
-   auto row = exdData->m_SatisfactionSupplyRewardDat.get_row( row_id );
-   satisfactionLow = exdData->getField< uint16_t >( row, 10 );
-   satisfactionMid = exdData->getField< uint16_t >( row, 11 );
-   satisfactionHigh = exdData->getField< uint16_t >( row, 12 );
-   gilLow = exdData->getField< uint16_t >( row, 13 );
-   gilMid = exdData->getField< uint16_t >( row, 14 );
-   gilHigh = exdData->getField< uint16_t >( row, 15 );
+  auto row = exdData->m_SatisfactionSupplyRewardDat.get_row( row_id );
+  satisfactionLow = exdData->getField< uint16_t >( row, 10 );
+  satisfactionMid = exdData->getField< uint16_t >( row, 11 );
+  satisfactionHigh = exdData->getField< uint16_t >( row, 12 );
+  gilLow = exdData->getField< uint16_t >( row, 13 );
+  gilMid = exdData->getField< uint16_t >( row, 14 );
+  gilHigh = exdData->getField< uint16_t >( row, 15 );
 }
 
 Sapphire::Data::ScenarioTree::ScenarioTree( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
 {
-   auto row = exdData->m_ScenarioTreeDat.get_row( row_id );
-   type = exdData->getField< uint8_t >( row, 0 );
-   image = exdData->getField< uint16_t >( row, 1 );
+  auto row = exdData->m_ScenarioTreeDat.get_row( row_id );
+  type = exdData->getField< uint8_t >( row, 0 );
+  image = exdData->getField< uint16_t >( row, 1 );
 }
 
 Sapphire::Data::ScenarioTreeTips::ScenarioTreeTips( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
 {
-   auto row = exdData->m_ScenarioTreeTipsDat.get_row( row_id );
-   tips1 = exdData->getField< uint32_t >( row, 1 );
-   tips2 = exdData->getField< uint32_t >( row, 3 );
+  auto row = exdData->m_ScenarioTreeTipsDat.get_row( row_id );
+  tips1 = exdData->getField< uint32_t >( row, 1 );
+  tips2 = exdData->getField< uint32_t >( row, 3 );
 }
 
 Sapphire::Data::ScenarioTreeTipsClassQuest::ScenarioTreeTipsClassQuest( uint32_t row_id, uint32_t subRow, Sapphire::Data::ExdDataGenerated* exdData )
 {
-   auto row = exdData->m_ScenarioTreeTipsClassQuestDat.get_row( row_id, subRow );
-   quest = exdData->getField< uint32_t >( row, 0 );
-   requiredLevel = exdData->getField< uint16_t >( row, 1 );
-   requiredExpansion = exdData->getField< uint8_t >( row, 2 );
-   requiredQuest = exdData->getField< uint32_t >( row, 3 );
+  auto row = exdData->m_ScenarioTreeTipsClassQuestDat.get_row( row_id, subRow );
+  quest = exdData->getField< uint32_t >( row, 0 );
+  requiredLevel = exdData->getField< uint16_t >( row, 1 );
+  requiredExpansion = exdData->getField< uint8_t >( row, 2 );
+  requiredQuest = exdData->getField< uint32_t >( row, 3 );
 }
 
 Sapphire::Data::ScenarioTreeTipsQuest::ScenarioTreeTipsQuest( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
 {
-   auto row = exdData->m_ScenarioTreeTipsQuestDat.get_row( row_id );
-   level = exdData->getField< uint32_t >( row, 0 );
+  auto row = exdData->m_ScenarioTreeTipsQuestDat.get_row( row_id );
+  level = exdData->getField< uint32_t >( row, 0 );
 }
 
 Sapphire::Data::ScenarioType::ScenarioType( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
 {
-   auto row = exdData->m_ScenarioTypeDat.get_row( row_id );
-   type = exdData->getField< std::string >( row, 0 );
+  auto row = exdData->m_ScenarioTypeDat.get_row( row_id );
+  type = exdData->getField< std::string >( row, 0 );
 }
 
 Sapphire::Data::ScreenImage::ScreenImage( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
 {
-   auto row = exdData->m_ScreenImageDat.get_row( row_id );
-   image = exdData->getField< uint32_t >( row, 0 );
+  auto row = exdData->m_ScreenImageDat.get_row( row_id );
+  image = exdData->getField< uint32_t >( row, 0 );
 }
 
 Sapphire::Data::SecretRecipeBook::SecretRecipeBook( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
 {
-   auto row = exdData->m_SecretRecipeBookDat.get_row( row_id );
-   item = exdData->getField< int32_t >( row, 0 );
-   name = exdData->getField< std::string >( row, 1 );
+  auto row = exdData->m_SecretRecipeBookDat.get_row( row_id );
+  item = exdData->getField< int32_t >( row, 0 );
+  name = exdData->getField< std::string >( row, 1 );
 }
 
 Sapphire::Data::SkyIsland2Mission::SkyIsland2Mission( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
 {
-   auto row = exdData->m_SkyIsland2MissionDat.get_row( row_id );
-   item1 = exdData->getField< uint32_t >( row, 0 );
-   item2 = exdData->getField< uint32_t >( row, 1 );
-   objective1 = exdData->getField< uint16_t >( row, 4 );
-   requiredAmount1 = exdData->getField< uint8_t >( row, 6 );
-   objective2 = exdData->getField< uint16_t >( row, 9 );
-   requiredAmount2 = exdData->getField< uint8_t >( row, 11 );
-   objective3 = exdData->getField< uint16_t >( row, 14 );
-   image = exdData->getField< uint32_t >( row, 20 );
+  auto row = exdData->m_SkyIsland2MissionDat.get_row( row_id );
+  item1 = exdData->getField< uint32_t >( row, 0 );
+  item2 = exdData->getField< uint32_t >( row, 1 );
+  objective1 = exdData->getField< uint16_t >( row, 4 );
+  requiredAmount1 = exdData->getField< uint8_t >( row, 6 );
+  objective2 = exdData->getField< uint16_t >( row, 9 );
+  requiredAmount2 = exdData->getField< uint8_t >( row, 11 );
+  objective3 = exdData->getField< uint16_t >( row, 14 );
+  image = exdData->getField< uint32_t >( row, 20 );
 }
 
 Sapphire::Data::SkyIsland2MissionDetail::SkyIsland2MissionDetail( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
 {
-   auto row = exdData->m_SkyIsland2MissionDetailDat.get_row( row_id );
-   type = exdData->getField< uint8_t >( row, 0 );
-   range = exdData->getField< uint8_t >( row, 2 );
-   eObj = exdData->getField< uint32_t >( row, 4 );
-   objective = exdData->getField< std::string >( row, 7 );
+  auto row = exdData->m_SkyIsland2MissionDetailDat.get_row( row_id );
+  type = exdData->getField< uint8_t >( row, 0 );
+  range = exdData->getField< uint8_t >( row, 2 );
+  eObj = exdData->getField< uint32_t >( row, 4 );
+  objective = exdData->getField< std::string >( row, 7 );
 }
 
 Sapphire::Data::SkyIsland2MissionType::SkyIsland2MissionType( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
 {
-   auto row = exdData->m_SkyIsland2MissionTypeDat.get_row( row_id );
-   type = exdData->getField< bool >( row, 0 );
+  auto row = exdData->m_SkyIsland2MissionTypeDat.get_row( row_id );
+  type = exdData->getField< bool >( row, 0 );
 }
 
 Sapphire::Data::SkyIsland2RangeType::SkyIsland2RangeType( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
 {
-   auto row = exdData->m_SkyIsland2RangeTypeDat.get_row( row_id );
-   type = exdData->getField< uint8_t >( row, 0 );
+  auto row = exdData->m_SkyIsland2RangeTypeDat.get_row( row_id );
+  type = exdData->getField< uint8_t >( row, 0 );
 }
 
 Sapphire::Data::SpearfishingItem::SpearfishingItem( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
 {
-   auto row = exdData->m_SpearfishingItemDat.get_row( row_id );
-   description = exdData->getField< std::string >( row, 0 );
-   item = exdData->getField< int32_t >( row, 1 );
-   gatheringItemLevel = exdData->getField< uint16_t >( row, 2 );
-   territoryType = exdData->getField< uint16_t >( row, 4 );
-   isVisible = exdData->getField< bool >( row, 5 );
+  auto row = exdData->m_SpearfishingItemDat.get_row( row_id );
+  description = exdData->getField< std::string >( row, 0 );
+  item = exdData->getField< int32_t >( row, 1 );
+  gatheringItemLevel = exdData->getField< uint16_t >( row, 2 );
+  territoryType = exdData->getField< uint16_t >( row, 4 );
+  isVisible = exdData->getField< bool >( row, 5 );
 }
 
 Sapphire::Data::SpearfishingNotebook::SpearfishingNotebook( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
 {
-   auto row = exdData->m_SpearfishingNotebookDat.get_row( row_id );
-   gatheringLevel = exdData->getField< uint8_t >( row, 0 );
-   territoryType = exdData->getField< int32_t >( row, 2 );
-   x = exdData->getField< int16_t >( row, 3 );
-   y = exdData->getField< int16_t >( row, 4 );
-   radius = exdData->getField< uint16_t >( row, 5 );
-   placeName = exdData->getField< uint16_t >( row, 7 );
-   gatheringPointBase = exdData->getField< uint16_t >( row, 9 );
+  auto row = exdData->m_SpearfishingNotebookDat.get_row( row_id );
+  gatheringLevel = exdData->getField< uint8_t >( row, 0 );
+  territoryType = exdData->getField< int32_t >( row, 2 );
+  x = exdData->getField< int16_t >( row, 3 );
+  y = exdData->getField< int16_t >( row, 4 );
+  radius = exdData->getField< uint16_t >( row, 5 );
+  placeName = exdData->getField< uint16_t >( row, 7 );
+  gatheringPointBase = exdData->getField< uint16_t >( row, 9 );
 }
 
 Sapphire::Data::SpearfishingRecordPage::SpearfishingRecordPage( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
 {
-   auto row = exdData->m_SpearfishingRecordPageDat.get_row( row_id );
-   placeName = exdData->getField< int32_t >( row, 3 );
-   image = exdData->getField< int32_t >( row, 4 );
+  auto row = exdData->m_SpearfishingRecordPageDat.get_row( row_id );
+  placeName = exdData->getField< int32_t >( row, 3 );
+  image = exdData->getField< int32_t >( row, 4 );
 }
 
 Sapphire::Data::SpecialShop::SpecialShop( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
 {
-   auto row = exdData->m_SpecialShopDat.get_row( row_id );
-   name = exdData->getField< std::string >( row, 0 );
-   questItem.push_back( exdData->getField< int32_t >( row, 1201 ) );
-   questItem.push_back( exdData->getField< int32_t >( row, 1202 ) );
-   questItem.push_back( exdData->getField< int32_t >( row, 1203 ) );
-   questItem.push_back( exdData->getField< int32_t >( row, 1204 ) );
-   questItem.push_back( exdData->getField< int32_t >( row, 1205 ) );
-   questItem.push_back( exdData->getField< int32_t >( row, 1206 ) );
-   questItem.push_back( exdData->getField< int32_t >( row, 1207 ) );
-   questItem.push_back( exdData->getField< int32_t >( row, 1208 ) );
-   questItem.push_back( exdData->getField< int32_t >( row, 1209 ) );
-   questItem.push_back( exdData->getField< int32_t >( row, 1210 ) );
-   questItem.push_back( exdData->getField< int32_t >( row, 1211 ) );
-   questItem.push_back( exdData->getField< int32_t >( row, 1212 ) );
-   questItem.push_back( exdData->getField< int32_t >( row, 1213 ) );
-   questItem.push_back( exdData->getField< int32_t >( row, 1214 ) );
-   questItem.push_back( exdData->getField< int32_t >( row, 1215 ) );
-   questItem.push_back( exdData->getField< int32_t >( row, 1216 ) );
-   questItem.push_back( exdData->getField< int32_t >( row, 1217 ) );
-   questItem.push_back( exdData->getField< int32_t >( row, 1218 ) );
-   questItem.push_back( exdData->getField< int32_t >( row, 1219 ) );
-   questItem.push_back( exdData->getField< int32_t >( row, 1220 ) );
-   questItem.push_back( exdData->getField< int32_t >( row, 1221 ) );
-   questItem.push_back( exdData->getField< int32_t >( row, 1222 ) );
-   questItem.push_back( exdData->getField< int32_t >( row, 1223 ) );
-   questItem.push_back( exdData->getField< int32_t >( row, 1224 ) );
-   questItem.push_back( exdData->getField< int32_t >( row, 1225 ) );
-   questItem.push_back( exdData->getField< int32_t >( row, 1226 ) );
-   questItem.push_back( exdData->getField< int32_t >( row, 1227 ) );
-   questItem.push_back( exdData->getField< int32_t >( row, 1228 ) );
-   questItem.push_back( exdData->getField< int32_t >( row, 1229 ) );
-   questItem.push_back( exdData->getField< int32_t >( row, 1230 ) );
-   questItem.push_back( exdData->getField< int32_t >( row, 1231 ) );
-   questItem.push_back( exdData->getField< int32_t >( row, 1232 ) );
-   questItem.push_back( exdData->getField< int32_t >( row, 1233 ) );
-   questItem.push_back( exdData->getField< int32_t >( row, 1234 ) );
-   questItem.push_back( exdData->getField< int32_t >( row, 1235 ) );
-   questItem.push_back( exdData->getField< int32_t >( row, 1236 ) );
-   questItem.push_back( exdData->getField< int32_t >( row, 1237 ) );
-   questItem.push_back( exdData->getField< int32_t >( row, 1238 ) );
-   questItem.push_back( exdData->getField< int32_t >( row, 1239 ) );
-   questItem.push_back( exdData->getField< int32_t >( row, 1240 ) );
-   questItem.push_back( exdData->getField< int32_t >( row, 1241 ) );
-   questItem.push_back( exdData->getField< int32_t >( row, 1242 ) );
-   questItem.push_back( exdData->getField< int32_t >( row, 1243 ) );
-   questItem.push_back( exdData->getField< int32_t >( row, 1244 ) );
-   questItem.push_back( exdData->getField< int32_t >( row, 1245 ) );
-   questItem.push_back( exdData->getField< int32_t >( row, 1246 ) );
-   questItem.push_back( exdData->getField< int32_t >( row, 1247 ) );
-   questItem.push_back( exdData->getField< int32_t >( row, 1248 ) );
-   questItem.push_back( exdData->getField< int32_t >( row, 1249 ) );
-   questItem.push_back( exdData->getField< int32_t >( row, 1250 ) );
-   questItem.push_back( exdData->getField< int32_t >( row, 1251 ) );
-   questItem.push_back( exdData->getField< int32_t >( row, 1252 ) );
-   questItem.push_back( exdData->getField< int32_t >( row, 1253 ) );
-   questItem.push_back( exdData->getField< int32_t >( row, 1254 ) );
-   questItem.push_back( exdData->getField< int32_t >( row, 1255 ) );
-   questItem.push_back( exdData->getField< int32_t >( row, 1256 ) );
-   questItem.push_back( exdData->getField< int32_t >( row, 1257 ) );
-   questItem.push_back( exdData->getField< int32_t >( row, 1258 ) );
-   questItem.push_back( exdData->getField< int32_t >( row, 1259 ) );
-   questItem.push_back( exdData->getField< int32_t >( row, 1260 ) );
-   unknown.push_back( exdData->getField< int32_t >( row, 1261 ) );
-   unknown.push_back( exdData->getField< int32_t >( row, 1262 ) );
-   unknown.push_back( exdData->getField< int32_t >( row, 1263 ) );
-   unknown.push_back( exdData->getField< int32_t >( row, 1264 ) );
-   unknown.push_back( exdData->getField< int32_t >( row, 1265 ) );
-   unknown.push_back( exdData->getField< int32_t >( row, 1266 ) );
-   unknown.push_back( exdData->getField< int32_t >( row, 1267 ) );
-   unknown.push_back( exdData->getField< int32_t >( row, 1268 ) );
-   unknown.push_back( exdData->getField< int32_t >( row, 1269 ) );
-   unknown.push_back( exdData->getField< int32_t >( row, 1270 ) );
-   unknown.push_back( exdData->getField< int32_t >( row, 1271 ) );
-   unknown.push_back( exdData->getField< int32_t >( row, 1272 ) );
-   unknown.push_back( exdData->getField< int32_t >( row, 1273 ) );
-   unknown.push_back( exdData->getField< int32_t >( row, 1274 ) );
-   unknown.push_back( exdData->getField< int32_t >( row, 1275 ) );
-   unknown.push_back( exdData->getField< int32_t >( row, 1276 ) );
-   unknown.push_back( exdData->getField< int32_t >( row, 1277 ) );
-   unknown.push_back( exdData->getField< int32_t >( row, 1278 ) );
-   unknown.push_back( exdData->getField< int32_t >( row, 1279 ) );
-   unknown.push_back( exdData->getField< int32_t >( row, 1280 ) );
-   unknown.push_back( exdData->getField< int32_t >( row, 1281 ) );
-   unknown.push_back( exdData->getField< int32_t >( row, 1282 ) );
-   unknown.push_back( exdData->getField< int32_t >( row, 1283 ) );
-   unknown.push_back( exdData->getField< int32_t >( row, 1284 ) );
-   unknown.push_back( exdData->getField< int32_t >( row, 1285 ) );
-   unknown.push_back( exdData->getField< int32_t >( row, 1286 ) );
-   unknown.push_back( exdData->getField< int32_t >( row, 1287 ) );
-   unknown.push_back( exdData->getField< int32_t >( row, 1288 ) );
-   unknown.push_back( exdData->getField< int32_t >( row, 1289 ) );
-   unknown.push_back( exdData->getField< int32_t >( row, 1290 ) );
-   unknown.push_back( exdData->getField< int32_t >( row, 1291 ) );
-   unknown.push_back( exdData->getField< int32_t >( row, 1292 ) );
-   unknown.push_back( exdData->getField< int32_t >( row, 1293 ) );
-   unknown.push_back( exdData->getField< int32_t >( row, 1294 ) );
-   unknown.push_back( exdData->getField< int32_t >( row, 1295 ) );
-   unknown.push_back( exdData->getField< int32_t >( row, 1296 ) );
-   unknown.push_back( exdData->getField< int32_t >( row, 1297 ) );
-   unknown.push_back( exdData->getField< int32_t >( row, 1298 ) );
-   unknown.push_back( exdData->getField< int32_t >( row, 1299 ) );
-   unknown.push_back( exdData->getField< int32_t >( row, 1300 ) );
-   unknown.push_back( exdData->getField< int32_t >( row, 1301 ) );
-   unknown.push_back( exdData->getField< int32_t >( row, 1302 ) );
-   unknown.push_back( exdData->getField< int32_t >( row, 1303 ) );
-   unknown.push_back( exdData->getField< int32_t >( row, 1304 ) );
-   unknown.push_back( exdData->getField< int32_t >( row, 1305 ) );
-   unknown.push_back( exdData->getField< int32_t >( row, 1306 ) );
-   unknown.push_back( exdData->getField< int32_t >( row, 1307 ) );
-   unknown.push_back( exdData->getField< int32_t >( row, 1308 ) );
-   unknown.push_back( exdData->getField< int32_t >( row, 1309 ) );
-   unknown.push_back( exdData->getField< int32_t >( row, 1310 ) );
-   unknown.push_back( exdData->getField< int32_t >( row, 1311 ) );
-   unknown.push_back( exdData->getField< int32_t >( row, 1312 ) );
-   unknown.push_back( exdData->getField< int32_t >( row, 1313 ) );
-   unknown.push_back( exdData->getField< int32_t >( row, 1314 ) );
-   unknown.push_back( exdData->getField< int32_t >( row, 1315 ) );
-   unknown.push_back( exdData->getField< int32_t >( row, 1316 ) );
-   unknown.push_back( exdData->getField< int32_t >( row, 1317 ) );
-   unknown.push_back( exdData->getField< int32_t >( row, 1318 ) );
-   unknown.push_back( exdData->getField< int32_t >( row, 1319 ) );
-   unknown.push_back( exdData->getField< int32_t >( row, 1320 ) );
-   achievementUnlock.push_back( exdData->getField< int32_t >( row, 1321 ) );
-   achievementUnlock.push_back( exdData->getField< int32_t >( row, 1322 ) );
-   achievementUnlock.push_back( exdData->getField< int32_t >( row, 1323 ) );
-   achievementUnlock.push_back( exdData->getField< int32_t >( row, 1324 ) );
-   achievementUnlock.push_back( exdData->getField< int32_t >( row, 1325 ) );
-   achievementUnlock.push_back( exdData->getField< int32_t >( row, 1326 ) );
-   achievementUnlock.push_back( exdData->getField< int32_t >( row, 1327 ) );
-   achievementUnlock.push_back( exdData->getField< int32_t >( row, 1328 ) );
-   achievementUnlock.push_back( exdData->getField< int32_t >( row, 1329 ) );
-   achievementUnlock.push_back( exdData->getField< int32_t >( row, 1330 ) );
-   achievementUnlock.push_back( exdData->getField< int32_t >( row, 1331 ) );
-   achievementUnlock.push_back( exdData->getField< int32_t >( row, 1332 ) );
-   achievementUnlock.push_back( exdData->getField< int32_t >( row, 1333 ) );
-   achievementUnlock.push_back( exdData->getField< int32_t >( row, 1334 ) );
-   achievementUnlock.push_back( exdData->getField< int32_t >( row, 1335 ) );
-   achievementUnlock.push_back( exdData->getField< int32_t >( row, 1336 ) );
-   achievementUnlock.push_back( exdData->getField< int32_t >( row, 1337 ) );
-   achievementUnlock.push_back( exdData->getField< int32_t >( row, 1338 ) );
-   achievementUnlock.push_back( exdData->getField< int32_t >( row, 1339 ) );
-   achievementUnlock.push_back( exdData->getField< int32_t >( row, 1340 ) );
-   achievementUnlock.push_back( exdData->getField< int32_t >( row, 1341 ) );
-   achievementUnlock.push_back( exdData->getField< int32_t >( row, 1342 ) );
-   achievementUnlock.push_back( exdData->getField< int32_t >( row, 1343 ) );
-   achievementUnlock.push_back( exdData->getField< int32_t >( row, 1344 ) );
-   achievementUnlock.push_back( exdData->getField< int32_t >( row, 1345 ) );
-   achievementUnlock.push_back( exdData->getField< int32_t >( row, 1346 ) );
-   achievementUnlock.push_back( exdData->getField< int32_t >( row, 1347 ) );
-   achievementUnlock.push_back( exdData->getField< int32_t >( row, 1348 ) );
-   achievementUnlock.push_back( exdData->getField< int32_t >( row, 1349 ) );
-   achievementUnlock.push_back( exdData->getField< int32_t >( row, 1350 ) );
-   achievementUnlock.push_back( exdData->getField< int32_t >( row, 1351 ) );
-   achievementUnlock.push_back( exdData->getField< int32_t >( row, 1352 ) );
-   achievementUnlock.push_back( exdData->getField< int32_t >( row, 1353 ) );
-   achievementUnlock.push_back( exdData->getField< int32_t >( row, 1354 ) );
-   achievementUnlock.push_back( exdData->getField< int32_t >( row, 1355 ) );
-   achievementUnlock.push_back( exdData->getField< int32_t >( row, 1356 ) );
-   achievementUnlock.push_back( exdData->getField< int32_t >( row, 1357 ) );
-   achievementUnlock.push_back( exdData->getField< int32_t >( row, 1358 ) );
-   achievementUnlock.push_back( exdData->getField< int32_t >( row, 1359 ) );
-   achievementUnlock.push_back( exdData->getField< int32_t >( row, 1360 ) );
-   achievementUnlock.push_back( exdData->getField< int32_t >( row, 1361 ) );
-   achievementUnlock.push_back( exdData->getField< int32_t >( row, 1362 ) );
-   achievementUnlock.push_back( exdData->getField< int32_t >( row, 1363 ) );
-   achievementUnlock.push_back( exdData->getField< int32_t >( row, 1364 ) );
-   achievementUnlock.push_back( exdData->getField< int32_t >( row, 1365 ) );
-   achievementUnlock.push_back( exdData->getField< int32_t >( row, 1366 ) );
-   achievementUnlock.push_back( exdData->getField< int32_t >( row, 1367 ) );
-   achievementUnlock.push_back( exdData->getField< int32_t >( row, 1368 ) );
-   achievementUnlock.push_back( exdData->getField< int32_t >( row, 1369 ) );
-   achievementUnlock.push_back( exdData->getField< int32_t >( row, 1370 ) );
-   achievementUnlock.push_back( exdData->getField< int32_t >( row, 1371 ) );
-   achievementUnlock.push_back( exdData->getField< int32_t >( row, 1372 ) );
-   achievementUnlock.push_back( exdData->getField< int32_t >( row, 1373 ) );
-   achievementUnlock.push_back( exdData->getField< int32_t >( row, 1374 ) );
-   achievementUnlock.push_back( exdData->getField< int32_t >( row, 1375 ) );
-   achievementUnlock.push_back( exdData->getField< int32_t >( row, 1376 ) );
-   achievementUnlock.push_back( exdData->getField< int32_t >( row, 1377 ) );
-   achievementUnlock.push_back( exdData->getField< int32_t >( row, 1378 ) );
-   achievementUnlock.push_back( exdData->getField< int32_t >( row, 1379 ) );
-   achievementUnlock.push_back( exdData->getField< int32_t >( row, 1380 ) );
-   patchNumber.push_back( exdData->getField< uint16_t >( row, 1801 ) );
-   patchNumber.push_back( exdData->getField< uint16_t >( row, 1802 ) );
-   patchNumber.push_back( exdData->getField< uint16_t >( row, 1803 ) );
-   patchNumber.push_back( exdData->getField< uint16_t >( row, 1804 ) );
-   patchNumber.push_back( exdData->getField< uint16_t >( row, 1805 ) );
-   patchNumber.push_back( exdData->getField< uint16_t >( row, 1806 ) );
-   patchNumber.push_back( exdData->getField< uint16_t >( row, 1807 ) );
-   patchNumber.push_back( exdData->getField< uint16_t >( row, 1808 ) );
-   patchNumber.push_back( exdData->getField< uint16_t >( row, 1809 ) );
-   patchNumber.push_back( exdData->getField< uint16_t >( row, 1810 ) );
-   patchNumber.push_back( exdData->getField< uint16_t >( row, 1811 ) );
-   patchNumber.push_back( exdData->getField< uint16_t >( row, 1812 ) );
-   patchNumber.push_back( exdData->getField< uint16_t >( row, 1813 ) );
-   patchNumber.push_back( exdData->getField< uint16_t >( row, 1814 ) );
-   patchNumber.push_back( exdData->getField< uint16_t >( row, 1815 ) );
-   patchNumber.push_back( exdData->getField< uint16_t >( row, 1816 ) );
-   patchNumber.push_back( exdData->getField< uint16_t >( row, 1817 ) );
-   patchNumber.push_back( exdData->getField< uint16_t >( row, 1818 ) );
-   patchNumber.push_back( exdData->getField< uint16_t >( row, 1819 ) );
-   patchNumber.push_back( exdData->getField< uint16_t >( row, 1820 ) );
-   patchNumber.push_back( exdData->getField< uint16_t >( row, 1821 ) );
-   patchNumber.push_back( exdData->getField< uint16_t >( row, 1822 ) );
-   patchNumber.push_back( exdData->getField< uint16_t >( row, 1823 ) );
-   patchNumber.push_back( exdData->getField< uint16_t >( row, 1824 ) );
-   patchNumber.push_back( exdData->getField< uint16_t >( row, 1825 ) );
-   patchNumber.push_back( exdData->getField< uint16_t >( row, 1826 ) );
-   patchNumber.push_back( exdData->getField< uint16_t >( row, 1827 ) );
-   patchNumber.push_back( exdData->getField< uint16_t >( row, 1828 ) );
-   patchNumber.push_back( exdData->getField< uint16_t >( row, 1829 ) );
-   patchNumber.push_back( exdData->getField< uint16_t >( row, 1830 ) );
-   patchNumber.push_back( exdData->getField< uint16_t >( row, 1831 ) );
-   patchNumber.push_back( exdData->getField< uint16_t >( row, 1832 ) );
-   patchNumber.push_back( exdData->getField< uint16_t >( row, 1833 ) );
-   patchNumber.push_back( exdData->getField< uint16_t >( row, 1834 ) );
-   patchNumber.push_back( exdData->getField< uint16_t >( row, 1835 ) );
-   patchNumber.push_back( exdData->getField< uint16_t >( row, 1836 ) );
-   patchNumber.push_back( exdData->getField< uint16_t >( row, 1837 ) );
-   patchNumber.push_back( exdData->getField< uint16_t >( row, 1838 ) );
-   patchNumber.push_back( exdData->getField< uint16_t >( row, 1839 ) );
-   patchNumber.push_back( exdData->getField< uint16_t >( row, 1840 ) );
-   patchNumber.push_back( exdData->getField< uint16_t >( row, 1841 ) );
-   patchNumber.push_back( exdData->getField< uint16_t >( row, 1842 ) );
-   patchNumber.push_back( exdData->getField< uint16_t >( row, 1843 ) );
-   patchNumber.push_back( exdData->getField< uint16_t >( row, 1844 ) );
-   patchNumber.push_back( exdData->getField< uint16_t >( row, 1845 ) );
-   patchNumber.push_back( exdData->getField< uint16_t >( row, 1846 ) );
-   patchNumber.push_back( exdData->getField< uint16_t >( row, 1847 ) );
-   patchNumber.push_back( exdData->getField< uint16_t >( row, 1848 ) );
-   patchNumber.push_back( exdData->getField< uint16_t >( row, 1849 ) );
-   patchNumber.push_back( exdData->getField< uint16_t >( row, 1850 ) );
-   patchNumber.push_back( exdData->getField< uint16_t >( row, 1851 ) );
-   patchNumber.push_back( exdData->getField< uint16_t >( row, 1852 ) );
-   patchNumber.push_back( exdData->getField< uint16_t >( row, 1853 ) );
-   patchNumber.push_back( exdData->getField< uint16_t >( row, 1854 ) );
-   patchNumber.push_back( exdData->getField< uint16_t >( row, 1855 ) );
-   patchNumber.push_back( exdData->getField< uint16_t >( row, 1856 ) );
-   patchNumber.push_back( exdData->getField< uint16_t >( row, 1857 ) );
-   patchNumber.push_back( exdData->getField< uint16_t >( row, 1858 ) );
-   patchNumber.push_back( exdData->getField< uint16_t >( row, 1859 ) );
-   patchNumber.push_back( exdData->getField< uint16_t >( row, 1860 ) );
-   questUnlock = exdData->getField< uint32_t >( row, 1862 );
-   questShop = exdData->getField< int32_t >( row, 1863 );
-   notCompleteText = exdData->getField< int32_t >( row, 1864 );
-   completeText = exdData->getField< int32_t >( row, 1865 );
+  auto row = exdData->m_SpecialShopDat.get_row( row_id );
+  name = exdData->getField< std::string >( row, 0 );
+  questItem.push_back( exdData->getField< int32_t >( row, 1201 ) );
+  questItem.push_back( exdData->getField< int32_t >( row, 1202 ) );
+  questItem.push_back( exdData->getField< int32_t >( row, 1203 ) );
+  questItem.push_back( exdData->getField< int32_t >( row, 1204 ) );
+  questItem.push_back( exdData->getField< int32_t >( row, 1205 ) );
+  questItem.push_back( exdData->getField< int32_t >( row, 1206 ) );
+  questItem.push_back( exdData->getField< int32_t >( row, 1207 ) );
+  questItem.push_back( exdData->getField< int32_t >( row, 1208 ) );
+  questItem.push_back( exdData->getField< int32_t >( row, 1209 ) );
+  questItem.push_back( exdData->getField< int32_t >( row, 1210 ) );
+  questItem.push_back( exdData->getField< int32_t >( row, 1211 ) );
+  questItem.push_back( exdData->getField< int32_t >( row, 1212 ) );
+  questItem.push_back( exdData->getField< int32_t >( row, 1213 ) );
+  questItem.push_back( exdData->getField< int32_t >( row, 1214 ) );
+  questItem.push_back( exdData->getField< int32_t >( row, 1215 ) );
+  questItem.push_back( exdData->getField< int32_t >( row, 1216 ) );
+  questItem.push_back( exdData->getField< int32_t >( row, 1217 ) );
+  questItem.push_back( exdData->getField< int32_t >( row, 1218 ) );
+  questItem.push_back( exdData->getField< int32_t >( row, 1219 ) );
+  questItem.push_back( exdData->getField< int32_t >( row, 1220 ) );
+  questItem.push_back( exdData->getField< int32_t >( row, 1221 ) );
+  questItem.push_back( exdData->getField< int32_t >( row, 1222 ) );
+  questItem.push_back( exdData->getField< int32_t >( row, 1223 ) );
+  questItem.push_back( exdData->getField< int32_t >( row, 1224 ) );
+  questItem.push_back( exdData->getField< int32_t >( row, 1225 ) );
+  questItem.push_back( exdData->getField< int32_t >( row, 1226 ) );
+  questItem.push_back( exdData->getField< int32_t >( row, 1227 ) );
+  questItem.push_back( exdData->getField< int32_t >( row, 1228 ) );
+  questItem.push_back( exdData->getField< int32_t >( row, 1229 ) );
+  questItem.push_back( exdData->getField< int32_t >( row, 1230 ) );
+  questItem.push_back( exdData->getField< int32_t >( row, 1231 ) );
+  questItem.push_back( exdData->getField< int32_t >( row, 1232 ) );
+  questItem.push_back( exdData->getField< int32_t >( row, 1233 ) );
+  questItem.push_back( exdData->getField< int32_t >( row, 1234 ) );
+  questItem.push_back( exdData->getField< int32_t >( row, 1235 ) );
+  questItem.push_back( exdData->getField< int32_t >( row, 1236 ) );
+  questItem.push_back( exdData->getField< int32_t >( row, 1237 ) );
+  questItem.push_back( exdData->getField< int32_t >( row, 1238 ) );
+  questItem.push_back( exdData->getField< int32_t >( row, 1239 ) );
+  questItem.push_back( exdData->getField< int32_t >( row, 1240 ) );
+  questItem.push_back( exdData->getField< int32_t >( row, 1241 ) );
+  questItem.push_back( exdData->getField< int32_t >( row, 1242 ) );
+  questItem.push_back( exdData->getField< int32_t >( row, 1243 ) );
+  questItem.push_back( exdData->getField< int32_t >( row, 1244 ) );
+  questItem.push_back( exdData->getField< int32_t >( row, 1245 ) );
+  questItem.push_back( exdData->getField< int32_t >( row, 1246 ) );
+  questItem.push_back( exdData->getField< int32_t >( row, 1247 ) );
+  questItem.push_back( exdData->getField< int32_t >( row, 1248 ) );
+  questItem.push_back( exdData->getField< int32_t >( row, 1249 ) );
+  questItem.push_back( exdData->getField< int32_t >( row, 1250 ) );
+  questItem.push_back( exdData->getField< int32_t >( row, 1251 ) );
+  questItem.push_back( exdData->getField< int32_t >( row, 1252 ) );
+  questItem.push_back( exdData->getField< int32_t >( row, 1253 ) );
+  questItem.push_back( exdData->getField< int32_t >( row, 1254 ) );
+  questItem.push_back( exdData->getField< int32_t >( row, 1255 ) );
+  questItem.push_back( exdData->getField< int32_t >( row, 1256 ) );
+  questItem.push_back( exdData->getField< int32_t >( row, 1257 ) );
+  questItem.push_back( exdData->getField< int32_t >( row, 1258 ) );
+  questItem.push_back( exdData->getField< int32_t >( row, 1259 ) );
+  questItem.push_back( exdData->getField< int32_t >( row, 1260 ) );
+  unknown.push_back( exdData->getField< int32_t >( row, 1261 ) );
+  unknown.push_back( exdData->getField< int32_t >( row, 1262 ) );
+  unknown.push_back( exdData->getField< int32_t >( row, 1263 ) );
+  unknown.push_back( exdData->getField< int32_t >( row, 1264 ) );
+  unknown.push_back( exdData->getField< int32_t >( row, 1265 ) );
+  unknown.push_back( exdData->getField< int32_t >( row, 1266 ) );
+  unknown.push_back( exdData->getField< int32_t >( row, 1267 ) );
+  unknown.push_back( exdData->getField< int32_t >( row, 1268 ) );
+  unknown.push_back( exdData->getField< int32_t >( row, 1269 ) );
+  unknown.push_back( exdData->getField< int32_t >( row, 1270 ) );
+  unknown.push_back( exdData->getField< int32_t >( row, 1271 ) );
+  unknown.push_back( exdData->getField< int32_t >( row, 1272 ) );
+  unknown.push_back( exdData->getField< int32_t >( row, 1273 ) );
+  unknown.push_back( exdData->getField< int32_t >( row, 1274 ) );
+  unknown.push_back( exdData->getField< int32_t >( row, 1275 ) );
+  unknown.push_back( exdData->getField< int32_t >( row, 1276 ) );
+  unknown.push_back( exdData->getField< int32_t >( row, 1277 ) );
+  unknown.push_back( exdData->getField< int32_t >( row, 1278 ) );
+  unknown.push_back( exdData->getField< int32_t >( row, 1279 ) );
+  unknown.push_back( exdData->getField< int32_t >( row, 1280 ) );
+  unknown.push_back( exdData->getField< int32_t >( row, 1281 ) );
+  unknown.push_back( exdData->getField< int32_t >( row, 1282 ) );
+  unknown.push_back( exdData->getField< int32_t >( row, 1283 ) );
+  unknown.push_back( exdData->getField< int32_t >( row, 1284 ) );
+  unknown.push_back( exdData->getField< int32_t >( row, 1285 ) );
+  unknown.push_back( exdData->getField< int32_t >( row, 1286 ) );
+  unknown.push_back( exdData->getField< int32_t >( row, 1287 ) );
+  unknown.push_back( exdData->getField< int32_t >( row, 1288 ) );
+  unknown.push_back( exdData->getField< int32_t >( row, 1289 ) );
+  unknown.push_back( exdData->getField< int32_t >( row, 1290 ) );
+  unknown.push_back( exdData->getField< int32_t >( row, 1291 ) );
+  unknown.push_back( exdData->getField< int32_t >( row, 1292 ) );
+  unknown.push_back( exdData->getField< int32_t >( row, 1293 ) );
+  unknown.push_back( exdData->getField< int32_t >( row, 1294 ) );
+  unknown.push_back( exdData->getField< int32_t >( row, 1295 ) );
+  unknown.push_back( exdData->getField< int32_t >( row, 1296 ) );
+  unknown.push_back( exdData->getField< int32_t >( row, 1297 ) );
+  unknown.push_back( exdData->getField< int32_t >( row, 1298 ) );
+  unknown.push_back( exdData->getField< int32_t >( row, 1299 ) );
+  unknown.push_back( exdData->getField< int32_t >( row, 1300 ) );
+  unknown.push_back( exdData->getField< int32_t >( row, 1301 ) );
+  unknown.push_back( exdData->getField< int32_t >( row, 1302 ) );
+  unknown.push_back( exdData->getField< int32_t >( row, 1303 ) );
+  unknown.push_back( exdData->getField< int32_t >( row, 1304 ) );
+  unknown.push_back( exdData->getField< int32_t >( row, 1305 ) );
+  unknown.push_back( exdData->getField< int32_t >( row, 1306 ) );
+  unknown.push_back( exdData->getField< int32_t >( row, 1307 ) );
+  unknown.push_back( exdData->getField< int32_t >( row, 1308 ) );
+  unknown.push_back( exdData->getField< int32_t >( row, 1309 ) );
+  unknown.push_back( exdData->getField< int32_t >( row, 1310 ) );
+  unknown.push_back( exdData->getField< int32_t >( row, 1311 ) );
+  unknown.push_back( exdData->getField< int32_t >( row, 1312 ) );
+  unknown.push_back( exdData->getField< int32_t >( row, 1313 ) );
+  unknown.push_back( exdData->getField< int32_t >( row, 1314 ) );
+  unknown.push_back( exdData->getField< int32_t >( row, 1315 ) );
+  unknown.push_back( exdData->getField< int32_t >( row, 1316 ) );
+  unknown.push_back( exdData->getField< int32_t >( row, 1317 ) );
+  unknown.push_back( exdData->getField< int32_t >( row, 1318 ) );
+  unknown.push_back( exdData->getField< int32_t >( row, 1319 ) );
+  unknown.push_back( exdData->getField< int32_t >( row, 1320 ) );
+  achievementUnlock.push_back( exdData->getField< int32_t >( row, 1321 ) );
+  achievementUnlock.push_back( exdData->getField< int32_t >( row, 1322 ) );
+  achievementUnlock.push_back( exdData->getField< int32_t >( row, 1323 ) );
+  achievementUnlock.push_back( exdData->getField< int32_t >( row, 1324 ) );
+  achievementUnlock.push_back( exdData->getField< int32_t >( row, 1325 ) );
+  achievementUnlock.push_back( exdData->getField< int32_t >( row, 1326 ) );
+  achievementUnlock.push_back( exdData->getField< int32_t >( row, 1327 ) );
+  achievementUnlock.push_back( exdData->getField< int32_t >( row, 1328 ) );
+  achievementUnlock.push_back( exdData->getField< int32_t >( row, 1329 ) );
+  achievementUnlock.push_back( exdData->getField< int32_t >( row, 1330 ) );
+  achievementUnlock.push_back( exdData->getField< int32_t >( row, 1331 ) );
+  achievementUnlock.push_back( exdData->getField< int32_t >( row, 1332 ) );
+  achievementUnlock.push_back( exdData->getField< int32_t >( row, 1333 ) );
+  achievementUnlock.push_back( exdData->getField< int32_t >( row, 1334 ) );
+  achievementUnlock.push_back( exdData->getField< int32_t >( row, 1335 ) );
+  achievementUnlock.push_back( exdData->getField< int32_t >( row, 1336 ) );
+  achievementUnlock.push_back( exdData->getField< int32_t >( row, 1337 ) );
+  achievementUnlock.push_back( exdData->getField< int32_t >( row, 1338 ) );
+  achievementUnlock.push_back( exdData->getField< int32_t >( row, 1339 ) );
+  achievementUnlock.push_back( exdData->getField< int32_t >( row, 1340 ) );
+  achievementUnlock.push_back( exdData->getField< int32_t >( row, 1341 ) );
+  achievementUnlock.push_back( exdData->getField< int32_t >( row, 1342 ) );
+  achievementUnlock.push_back( exdData->getField< int32_t >( row, 1343 ) );
+  achievementUnlock.push_back( exdData->getField< int32_t >( row, 1344 ) );
+  achievementUnlock.push_back( exdData->getField< int32_t >( row, 1345 ) );
+  achievementUnlock.push_back( exdData->getField< int32_t >( row, 1346 ) );
+  achievementUnlock.push_back( exdData->getField< int32_t >( row, 1347 ) );
+  achievementUnlock.push_back( exdData->getField< int32_t >( row, 1348 ) );
+  achievementUnlock.push_back( exdData->getField< int32_t >( row, 1349 ) );
+  achievementUnlock.push_back( exdData->getField< int32_t >( row, 1350 ) );
+  achievementUnlock.push_back( exdData->getField< int32_t >( row, 1351 ) );
+  achievementUnlock.push_back( exdData->getField< int32_t >( row, 1352 ) );
+  achievementUnlock.push_back( exdData->getField< int32_t >( row, 1353 ) );
+  achievementUnlock.push_back( exdData->getField< int32_t >( row, 1354 ) );
+  achievementUnlock.push_back( exdData->getField< int32_t >( row, 1355 ) );
+  achievementUnlock.push_back( exdData->getField< int32_t >( row, 1356 ) );
+  achievementUnlock.push_back( exdData->getField< int32_t >( row, 1357 ) );
+  achievementUnlock.push_back( exdData->getField< int32_t >( row, 1358 ) );
+  achievementUnlock.push_back( exdData->getField< int32_t >( row, 1359 ) );
+  achievementUnlock.push_back( exdData->getField< int32_t >( row, 1360 ) );
+  achievementUnlock.push_back( exdData->getField< int32_t >( row, 1361 ) );
+  achievementUnlock.push_back( exdData->getField< int32_t >( row, 1362 ) );
+  achievementUnlock.push_back( exdData->getField< int32_t >( row, 1363 ) );
+  achievementUnlock.push_back( exdData->getField< int32_t >( row, 1364 ) );
+  achievementUnlock.push_back( exdData->getField< int32_t >( row, 1365 ) );
+  achievementUnlock.push_back( exdData->getField< int32_t >( row, 1366 ) );
+  achievementUnlock.push_back( exdData->getField< int32_t >( row, 1367 ) );
+  achievementUnlock.push_back( exdData->getField< int32_t >( row, 1368 ) );
+  achievementUnlock.push_back( exdData->getField< int32_t >( row, 1369 ) );
+  achievementUnlock.push_back( exdData->getField< int32_t >( row, 1370 ) );
+  achievementUnlock.push_back( exdData->getField< int32_t >( row, 1371 ) );
+  achievementUnlock.push_back( exdData->getField< int32_t >( row, 1372 ) );
+  achievementUnlock.push_back( exdData->getField< int32_t >( row, 1373 ) );
+  achievementUnlock.push_back( exdData->getField< int32_t >( row, 1374 ) );
+  achievementUnlock.push_back( exdData->getField< int32_t >( row, 1375 ) );
+  achievementUnlock.push_back( exdData->getField< int32_t >( row, 1376 ) );
+  achievementUnlock.push_back( exdData->getField< int32_t >( row, 1377 ) );
+  achievementUnlock.push_back( exdData->getField< int32_t >( row, 1378 ) );
+  achievementUnlock.push_back( exdData->getField< int32_t >( row, 1379 ) );
+  achievementUnlock.push_back( exdData->getField< int32_t >( row, 1380 ) );
+  patchNumber.push_back( exdData->getField< uint16_t >( row, 1801 ) );
+  patchNumber.push_back( exdData->getField< uint16_t >( row, 1802 ) );
+  patchNumber.push_back( exdData->getField< uint16_t >( row, 1803 ) );
+  patchNumber.push_back( exdData->getField< uint16_t >( row, 1804 ) );
+  patchNumber.push_back( exdData->getField< uint16_t >( row, 1805 ) );
+  patchNumber.push_back( exdData->getField< uint16_t >( row, 1806 ) );
+  patchNumber.push_back( exdData->getField< uint16_t >( row, 1807 ) );
+  patchNumber.push_back( exdData->getField< uint16_t >( row, 1808 ) );
+  patchNumber.push_back( exdData->getField< uint16_t >( row, 1809 ) );
+  patchNumber.push_back( exdData->getField< uint16_t >( row, 1810 ) );
+  patchNumber.push_back( exdData->getField< uint16_t >( row, 1811 ) );
+  patchNumber.push_back( exdData->getField< uint16_t >( row, 1812 ) );
+  patchNumber.push_back( exdData->getField< uint16_t >( row, 1813 ) );
+  patchNumber.push_back( exdData->getField< uint16_t >( row, 1814 ) );
+  patchNumber.push_back( exdData->getField< uint16_t >( row, 1815 ) );
+  patchNumber.push_back( exdData->getField< uint16_t >( row, 1816 ) );
+  patchNumber.push_back( exdData->getField< uint16_t >( row, 1817 ) );
+  patchNumber.push_back( exdData->getField< uint16_t >( row, 1818 ) );
+  patchNumber.push_back( exdData->getField< uint16_t >( row, 1819 ) );
+  patchNumber.push_back( exdData->getField< uint16_t >( row, 1820 ) );
+  patchNumber.push_back( exdData->getField< uint16_t >( row, 1821 ) );
+  patchNumber.push_back( exdData->getField< uint16_t >( row, 1822 ) );
+  patchNumber.push_back( exdData->getField< uint16_t >( row, 1823 ) );
+  patchNumber.push_back( exdData->getField< uint16_t >( row, 1824 ) );
+  patchNumber.push_back( exdData->getField< uint16_t >( row, 1825 ) );
+  patchNumber.push_back( exdData->getField< uint16_t >( row, 1826 ) );
+  patchNumber.push_back( exdData->getField< uint16_t >( row, 1827 ) );
+  patchNumber.push_back( exdData->getField< uint16_t >( row, 1828 ) );
+  patchNumber.push_back( exdData->getField< uint16_t >( row, 1829 ) );
+  patchNumber.push_back( exdData->getField< uint16_t >( row, 1830 ) );
+  patchNumber.push_back( exdData->getField< uint16_t >( row, 1831 ) );
+  patchNumber.push_back( exdData->getField< uint16_t >( row, 1832 ) );
+  patchNumber.push_back( exdData->getField< uint16_t >( row, 1833 ) );
+  patchNumber.push_back( exdData->getField< uint16_t >( row, 1834 ) );
+  patchNumber.push_back( exdData->getField< uint16_t >( row, 1835 ) );
+  patchNumber.push_back( exdData->getField< uint16_t >( row, 1836 ) );
+  patchNumber.push_back( exdData->getField< uint16_t >( row, 1837 ) );
+  patchNumber.push_back( exdData->getField< uint16_t >( row, 1838 ) );
+  patchNumber.push_back( exdData->getField< uint16_t >( row, 1839 ) );
+  patchNumber.push_back( exdData->getField< uint16_t >( row, 1840 ) );
+  patchNumber.push_back( exdData->getField< uint16_t >( row, 1841 ) );
+  patchNumber.push_back( exdData->getField< uint16_t >( row, 1842 ) );
+  patchNumber.push_back( exdData->getField< uint16_t >( row, 1843 ) );
+  patchNumber.push_back( exdData->getField< uint16_t >( row, 1844 ) );
+  patchNumber.push_back( exdData->getField< uint16_t >( row, 1845 ) );
+  patchNumber.push_back( exdData->getField< uint16_t >( row, 1846 ) );
+  patchNumber.push_back( exdData->getField< uint16_t >( row, 1847 ) );
+  patchNumber.push_back( exdData->getField< uint16_t >( row, 1848 ) );
+  patchNumber.push_back( exdData->getField< uint16_t >( row, 1849 ) );
+  patchNumber.push_back( exdData->getField< uint16_t >( row, 1850 ) );
+  patchNumber.push_back( exdData->getField< uint16_t >( row, 1851 ) );
+  patchNumber.push_back( exdData->getField< uint16_t >( row, 1852 ) );
+  patchNumber.push_back( exdData->getField< uint16_t >( row, 1853 ) );
+  patchNumber.push_back( exdData->getField< uint16_t >( row, 1854 ) );
+  patchNumber.push_back( exdData->getField< uint16_t >( row, 1855 ) );
+  patchNumber.push_back( exdData->getField< uint16_t >( row, 1856 ) );
+  patchNumber.push_back( exdData->getField< uint16_t >( row, 1857 ) );
+  patchNumber.push_back( exdData->getField< uint16_t >( row, 1858 ) );
+  patchNumber.push_back( exdData->getField< uint16_t >( row, 1859 ) );
+  patchNumber.push_back( exdData->getField< uint16_t >( row, 1860 ) );
+  questUnlock = exdData->getField< uint32_t >( row, 1862 );
+  questShop = exdData->getField< int32_t >( row, 1863 );
+  notCompleteText = exdData->getField< int32_t >( row, 1864 );
+  completeText = exdData->getField< int32_t >( row, 1865 );
 }
 
 Sapphire::Data::SpecialShopItemCategory::SpecialShopItemCategory( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
 {
-   auto row = exdData->m_SpecialShopItemCategoryDat.get_row( row_id );
-   name = exdData->getField< std::string >( row, 0 );
+  auto row = exdData->m_SpecialShopItemCategoryDat.get_row( row_id );
+  name = exdData->getField< std::string >( row, 0 );
 }
 
 Sapphire::Data::Stain::Stain( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
 {
-   auto row = exdData->m_StainDat.get_row( row_id );
-   color = exdData->getField< uint32_t >( row, 0 );
-   shade = exdData->getField< uint8_t >( row, 1 );
-   name = exdData->getField< std::string >( row, 2 );
+  auto row = exdData->m_StainDat.get_row( row_id );
+  color = exdData->getField< uint32_t >( row, 0 );
+  shade = exdData->getField< uint8_t >( row, 1 );
+  name = exdData->getField< std::string >( row, 2 );
 }
 
 Sapphire::Data::StainTransient::StainTransient( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
 {
-   auto row = exdData->m_StainTransientDat.get_row( row_id );
-   item1 = exdData->getField< uint32_t >( row, 0 );
-   item2 = exdData->getField< uint32_t >( row, 1 );
+  auto row = exdData->m_StainTransientDat.get_row( row_id );
+  item1 = exdData->getField< uint32_t >( row, 0 );
+  item2 = exdData->getField< uint32_t >( row, 1 );
 }
 
 Sapphire::Data::Status::Status( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
 {
-   auto row = exdData->m_StatusDat.get_row( row_id );
-   name = exdData->getField< std::string >( row, 0 );
-   description = exdData->getField< std::string >( row, 1 );
-   icon = exdData->getField< uint16_t >( row, 2 );
-   maxStacks = exdData->getField< uint8_t >( row, 3 );
-   category = exdData->getField< uint8_t >( row, 4 );
-   hitEffect = exdData->getField< uint8_t >( row, 5 );
-   vFX = exdData->getField< uint8_t >( row, 6 );
-   lockMovement = exdData->getField< bool >( row, 7 );
-   lockActions = exdData->getField< bool >( row, 9 );
-   lockControl = exdData->getField< bool >( row, 10 );
-   transfiguration = exdData->getField< bool >( row, 11 );
-   canDispel = exdData->getField< bool >( row, 13 );
-   inflictedByActor = exdData->getField< bool >( row, 14 );
-   isPermanent = exdData->getField< bool >( row, 15 );
-   isFcBuff = exdData->getField< bool >( row, 21 );
-   invisibility = exdData->getField< bool >( row, 22 );
+  auto row = exdData->m_StatusDat.get_row( row_id );
+  name = exdData->getField< std::string >( row, 0 );
+  description = exdData->getField< std::string >( row, 1 );
+  icon = exdData->getField< uint16_t >( row, 2 );
+  maxStacks = exdData->getField< uint8_t >( row, 3 );
+  category = exdData->getField< uint8_t >( row, 4 );
+  hitEffect = exdData->getField< uint8_t >( row, 5 );
+  vFX = exdData->getField< uint8_t >( row, 6 );
+  lockMovement = exdData->getField< bool >( row, 7 );
+  lockActions = exdData->getField< bool >( row, 9 );
+  lockControl = exdData->getField< bool >( row, 10 );
+  transfiguration = exdData->getField< bool >( row, 11 );
+  canDispel = exdData->getField< bool >( row, 13 );
+  inflictedByActor = exdData->getField< bool >( row, 14 );
+  isPermanent = exdData->getField< bool >( row, 15 );
+  isFcBuff = exdData->getField< bool >( row, 21 );
+  invisibility = exdData->getField< bool >( row, 22 );
 }
 
 Sapphire::Data::StatusHitEffect::StatusHitEffect( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
 {
-   auto row = exdData->m_StatusHitEffectDat.get_row( row_id );
-   location = exdData->getField< uint16_t >( row, 0 );
+  auto row = exdData->m_StatusHitEffectDat.get_row( row_id );
+  location = exdData->getField< uint16_t >( row, 0 );
 }
 
 Sapphire::Data::StatusLoopVFX::StatusLoopVFX( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
 {
-   auto row = exdData->m_StatusLoopVFXDat.get_row( row_id );
-   vFX = exdData->getField< uint16_t >( row, 0 );
-   vFX2 = exdData->getField< uint16_t >( row, 2 );
-   vFX3 = exdData->getField< uint16_t >( row, 4 );
+  auto row = exdData->m_StatusLoopVFXDat.get_row( row_id );
+  vFX = exdData->getField< uint16_t >( row, 0 );
+  vFX2 = exdData->getField< uint16_t >( row, 2 );
+  vFX3 = exdData->getField< uint16_t >( row, 4 );
 }
 
 Sapphire::Data::Story::Story( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
 {
-   auto row = exdData->m_StoryDat.get_row( row_id );
+  auto row = exdData->m_StoryDat.get_row( row_id );
 }
 
 Sapphire::Data::SubmarineExploration::SubmarineExploration( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
 {
-   auto row = exdData->m_SubmarineExplorationDat.get_row( row_id );
-   destination = exdData->getField< std::string >( row, 0 );
-   location = exdData->getField< std::string >( row, 1 );
-   rankReq = exdData->getField< uint8_t >( row, 5 );
-   ceruleumTankReq = exdData->getField< uint8_t >( row, 6 );
-   durationmin = exdData->getField< uint16_t >( row, 7 );
-   distanceForSurvey = exdData->getField< uint8_t >( row, 8 );
-   expReward = exdData->getField< uint32_t >( row, 9 );
+  auto row = exdData->m_SubmarineExplorationDat.get_row( row_id );
+  destination = exdData->getField< std::string >( row, 0 );
+  location = exdData->getField< std::string >( row, 1 );
+  rankReq = exdData->getField< uint8_t >( row, 5 );
+  ceruleumTankReq = exdData->getField< uint8_t >( row, 6 );
+  durationmin = exdData->getField< uint16_t >( row, 7 );
+  distanceForSurvey = exdData->getField< uint8_t >( row, 8 );
+  expReward = exdData->getField< uint32_t >( row, 9 );
 }
 
 Sapphire::Data::SubmarinePart::SubmarinePart( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
 {
-   auto row = exdData->m_SubmarinePartDat.get_row( row_id );
-   slot = exdData->getField< uint8_t >( row, 0 );
-   rank = exdData->getField< uint8_t >( row, 1 );
-   components = exdData->getField< uint8_t >( row, 2 );
-   surveillance = exdData->getField< int16_t >( row, 3 );
-   retrieval = exdData->getField< int16_t >( row, 4 );
-   speed = exdData->getField< int16_t >( row, 5 );
-   range = exdData->getField< int16_t >( row, 6 );
-   favor = exdData->getField< int16_t >( row, 7 );
-   repairMaterials = exdData->getField< uint8_t >( row, 9 );
+  auto row = exdData->m_SubmarinePartDat.get_row( row_id );
+  slot = exdData->getField< uint8_t >( row, 0 );
+  rank = exdData->getField< uint8_t >( row, 1 );
+  components = exdData->getField< uint8_t >( row, 2 );
+  surveillance = exdData->getField< int16_t >( row, 3 );
+  retrieval = exdData->getField< int16_t >( row, 4 );
+  speed = exdData->getField< int16_t >( row, 5 );
+  range = exdData->getField< int16_t >( row, 6 );
+  favor = exdData->getField< int16_t >( row, 7 );
+  repairMaterials = exdData->getField< uint8_t >( row, 9 );
 }
 
 Sapphire::Data::SubmarineRank::SubmarineRank( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
 {
-   auto row = exdData->m_SubmarineRankDat.get_row( row_id );
-   rank = exdData->getField< uint16_t >( row, 0 );
-   expToNext = exdData->getField< uint32_t >( row, 1 );
+  auto row = exdData->m_SubmarineRankDat.get_row( row_id );
+  rank = exdData->getField< uint16_t >( row, 0 );
+  expToNext = exdData->getField< uint32_t >( row, 1 );
 }
 
 Sapphire::Data::SwitchTalk::SwitchTalk( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
 {
-   auto row = exdData->m_SwitchTalkDat.get_row( row_id );
-   quest.push_back( exdData->getField< uint32_t >( row, 2 ) );
-   quest.push_back( exdData->getField< uint32_t >( row, 3 ) );
-   quest.push_back( exdData->getField< uint32_t >( row, 4 ) );
-   quest.push_back( exdData->getField< uint32_t >( row, 5 ) );
-   quest.push_back( exdData->getField< uint32_t >( row, 6 ) );
-   quest.push_back( exdData->getField< uint32_t >( row, 7 ) );
-   quest.push_back( exdData->getField< uint32_t >( row, 8 ) );
-   quest.push_back( exdData->getField< uint32_t >( row, 9 ) );
-   quest.push_back( exdData->getField< uint32_t >( row, 10 ) );
-   quest.push_back( exdData->getField< uint32_t >( row, 11 ) );
-   quest.push_back( exdData->getField< uint32_t >( row, 12 ) );
-   quest.push_back( exdData->getField< uint32_t >( row, 13 ) );
-   quest.push_back( exdData->getField< uint32_t >( row, 14 ) );
-   quest.push_back( exdData->getField< uint32_t >( row, 15 ) );
-   quest.push_back( exdData->getField< uint32_t >( row, 16 ) );
-   defaultTalk.push_back( exdData->getField< uint32_t >( row, 17 ) );
-   defaultTalk.push_back( exdData->getField< uint32_t >( row, 18 ) );
-   defaultTalk.push_back( exdData->getField< uint32_t >( row, 19 ) );
-   defaultTalk.push_back( exdData->getField< uint32_t >( row, 20 ) );
-   defaultTalk.push_back( exdData->getField< uint32_t >( row, 21 ) );
-   defaultTalk.push_back( exdData->getField< uint32_t >( row, 22 ) );
-   defaultTalk.push_back( exdData->getField< uint32_t >( row, 23 ) );
-   defaultTalk.push_back( exdData->getField< uint32_t >( row, 24 ) );
-   defaultTalk.push_back( exdData->getField< uint32_t >( row, 25 ) );
-   defaultTalk.push_back( exdData->getField< uint32_t >( row, 26 ) );
-   defaultTalk.push_back( exdData->getField< uint32_t >( row, 27 ) );
-   defaultTalk.push_back( exdData->getField< uint32_t >( row, 28 ) );
-   defaultTalk.push_back( exdData->getField< uint32_t >( row, 29 ) );
-   defaultTalk.push_back( exdData->getField< uint32_t >( row, 30 ) );
-   defaultTalk.push_back( exdData->getField< uint32_t >( row, 31 ) );
-   defaultTalk.push_back( exdData->getField< uint32_t >( row, 32 ) );
+  auto row = exdData->m_SwitchTalkDat.get_row( row_id );
+  quest.push_back( exdData->getField< uint32_t >( row, 2 ) );
+  quest.push_back( exdData->getField< uint32_t >( row, 3 ) );
+  quest.push_back( exdData->getField< uint32_t >( row, 4 ) );
+  quest.push_back( exdData->getField< uint32_t >( row, 5 ) );
+  quest.push_back( exdData->getField< uint32_t >( row, 6 ) );
+  quest.push_back( exdData->getField< uint32_t >( row, 7 ) );
+  quest.push_back( exdData->getField< uint32_t >( row, 8 ) );
+  quest.push_back( exdData->getField< uint32_t >( row, 9 ) );
+  quest.push_back( exdData->getField< uint32_t >( row, 10 ) );
+  quest.push_back( exdData->getField< uint32_t >( row, 11 ) );
+  quest.push_back( exdData->getField< uint32_t >( row, 12 ) );
+  quest.push_back( exdData->getField< uint32_t >( row, 13 ) );
+  quest.push_back( exdData->getField< uint32_t >( row, 14 ) );
+  quest.push_back( exdData->getField< uint32_t >( row, 15 ) );
+  quest.push_back( exdData->getField< uint32_t >( row, 16 ) );
+  defaultTalk.push_back( exdData->getField< uint32_t >( row, 17 ) );
+  defaultTalk.push_back( exdData->getField< uint32_t >( row, 18 ) );
+  defaultTalk.push_back( exdData->getField< uint32_t >( row, 19 ) );
+  defaultTalk.push_back( exdData->getField< uint32_t >( row, 20 ) );
+  defaultTalk.push_back( exdData->getField< uint32_t >( row, 21 ) );
+  defaultTalk.push_back( exdData->getField< uint32_t >( row, 22 ) );
+  defaultTalk.push_back( exdData->getField< uint32_t >( row, 23 ) );
+  defaultTalk.push_back( exdData->getField< uint32_t >( row, 24 ) );
+  defaultTalk.push_back( exdData->getField< uint32_t >( row, 25 ) );
+  defaultTalk.push_back( exdData->getField< uint32_t >( row, 26 ) );
+  defaultTalk.push_back( exdData->getField< uint32_t >( row, 27 ) );
+  defaultTalk.push_back( exdData->getField< uint32_t >( row, 28 ) );
+  defaultTalk.push_back( exdData->getField< uint32_t >( row, 29 ) );
+  defaultTalk.push_back( exdData->getField< uint32_t >( row, 30 ) );
+  defaultTalk.push_back( exdData->getField< uint32_t >( row, 31 ) );
+  defaultTalk.push_back( exdData->getField< uint32_t >( row, 32 ) );
 }
 
 Sapphire::Data::TerritoryType::TerritoryType( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
 {
-   auto row = exdData->m_TerritoryTypeDat.get_row( row_id );
-   name = exdData->getField< std::string >( row, 0 );
-   bg = exdData->getField< std::string >( row, 1 );
-   placeNameRegion = exdData->getField< uint16_t >( row, 3 );
-   placeNameZone = exdData->getField< uint16_t >( row, 4 );
-   placeName = exdData->getField< uint16_t >( row, 5 );
-   map = exdData->getField< uint16_t >( row, 6 );
-   territoryIntendedUse = exdData->getField< uint8_t >( row, 9 );
-   weatherRate = exdData->getField< uint8_t >( row, 12 );
-   arrayEventHandler = exdData->getField< uint32_t >( row, 22 );
-   questBattle = exdData->getField< uint16_t >( row, 23 );
-   aetheryte = exdData->getField< int32_t >( row, 24 );
+  auto row = exdData->m_TerritoryTypeDat.get_row( row_id );
+  name = exdData->getField< std::string >( row, 0 );
+  bg = exdData->getField< std::string >( row, 1 );
+  placeNameRegion = exdData->getField< uint16_t >( row, 3 );
+  placeNameZone = exdData->getField< uint16_t >( row, 4 );
+  placeName = exdData->getField< uint16_t >( row, 5 );
+  map = exdData->getField< uint16_t >( row, 6 );
+  territoryIntendedUse = exdData->getField< uint8_t >( row, 9 );
+  weatherRate = exdData->getField< uint8_t >( row, 12 );
+  placeNameRegionIcon = exdData->getField< int32_t >( row, 20 );
+  placeNameIcon = exdData->getField< int32_t >( row, 21 );
+  arrayEventHandler = exdData->getField< uint32_t >( row, 22 );
+  questBattle = exdData->getField< uint16_t >( row, 23 );
+  aetheryte = exdData->getField< int32_t >( row, 24 );
+  isPvpZone = exdData->getField< bool >( row, 28 );
 }
 
 Sapphire::Data::TextCommand::TextCommand( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
 {
-   auto row = exdData->m_TextCommandDat.get_row( row_id );
-   command = exdData->getField< std::string >( row, 5 );
-   shortCommand = exdData->getField< std::string >( row, 6 );
-   description = exdData->getField< std::string >( row, 7 );
-   alias = exdData->getField< std::string >( row, 8 );
-   shortAlias = exdData->getField< std::string >( row, 9 );
+  auto row = exdData->m_TextCommandDat.get_row( row_id );
+  command = exdData->getField< std::string >( row, 5 );
+  shortCommand = exdData->getField< std::string >( row, 6 );
+  description = exdData->getField< std::string >( row, 7 );
+  alias = exdData->getField< std::string >( row, 8 );
+  shortAlias = exdData->getField< std::string >( row, 9 );
 }
 
 Sapphire::Data::Title::Title( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
 {
-   auto row = exdData->m_TitleDat.get_row( row_id );
-   masculine = exdData->getField< std::string >( row, 0 );
-   feminine = exdData->getField< std::string >( row, 1 );
-   isPrefix = exdData->getField< bool >( row, 2 );
-   order = exdData->getField< uint16_t >( row, 3 );
+  auto row = exdData->m_TitleDat.get_row( row_id );
+  masculine = exdData->getField< std::string >( row, 0 );
+  feminine = exdData->getField< std::string >( row, 1 );
+  isPrefix = exdData->getField< bool >( row, 2 );
+  order = exdData->getField< uint16_t >( row, 3 );
 }
 
 Sapphire::Data::Tomestones::Tomestones( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
 {
-   auto row = exdData->m_TomestonesDat.get_row( row_id );
-   weeklyLimit = exdData->getField< uint16_t >( row, 0 );
+  auto row = exdData->m_TomestonesDat.get_row( row_id );
+  weeklyLimit = exdData->getField< uint16_t >( row, 0 );
 }
 
 Sapphire::Data::TomestonesItem::TomestonesItem( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
 {
-   auto row = exdData->m_TomestonesItemDat.get_row( row_id );
-   item = exdData->getField< int32_t >( row, 0 );
-   tomestones = exdData->getField< int32_t >( row, 2 );
+  auto row = exdData->m_TomestonesItemDat.get_row( row_id );
+  item = exdData->getField< int32_t >( row, 0 );
+  tomestones = exdData->getField< int32_t >( row, 2 );
 }
 
 Sapphire::Data::TopicSelect::TopicSelect( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
 {
-   auto row = exdData->m_TopicSelectDat.get_row( row_id );
-   name = exdData->getField< std::string >( row, 0 );
+  auto row = exdData->m_TopicSelectDat.get_row( row_id );
+  name = exdData->getField< std::string >( row, 0 );
 }
 
 Sapphire::Data::Town::Town( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
 {
-   auto row = exdData->m_TownDat.get_row( row_id );
-   name = exdData->getField< std::string >( row, 0 );
-   icon = exdData->getField< int32_t >( row, 1 );
+  auto row = exdData->m_TownDat.get_row( row_id );
+  name = exdData->getField< std::string >( row, 0 );
+  icon = exdData->getField< int32_t >( row, 1 );
 }
 
 Sapphire::Data::Trait::Trait( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
 {
-   auto row = exdData->m_TraitDat.get_row( row_id );
-   name = exdData->getField< std::string >( row, 0 );
-   icon = exdData->getField< int32_t >( row, 1 );
-   classJob = exdData->getField< uint8_t >( row, 2 );
-   level = exdData->getField< uint8_t >( row, 3 );
-   quest = exdData->getField< uint32_t >( row, 4 );
-   value = exdData->getField< int16_t >( row, 5 );
-   classJobCategory = exdData->getField< uint8_t >( row, 6 );
+  auto row = exdData->m_TraitDat.get_row( row_id );
+  name = exdData->getField< std::string >( row, 0 );
+  icon = exdData->getField< int32_t >( row, 1 );
+  classJob = exdData->getField< uint8_t >( row, 2 );
+  level = exdData->getField< uint8_t >( row, 3 );
+  quest = exdData->getField< uint32_t >( row, 4 );
+  value = exdData->getField< int16_t >( row, 5 );
+  classJobCategory = exdData->getField< uint8_t >( row, 6 );
 }
 
 Sapphire::Data::TraitRecast::TraitRecast( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
 {
-   auto row = exdData->m_TraitRecastDat.get_row( row_id );
-   trait = exdData->getField< uint16_t >( row, 0 );
-   action = exdData->getField< uint16_t >( row, 1 );
-   timeds = exdData->getField< uint16_t >( row, 2 );
+  auto row = exdData->m_TraitRecastDat.get_row( row_id );
+  trait = exdData->getField< uint16_t >( row, 0 );
+  action = exdData->getField< uint16_t >( row, 1 );
+  timeds = exdData->getField< uint16_t >( row, 2 );
 }
 
 Sapphire::Data::TraitTransient::TraitTransient( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
 {
-   auto row = exdData->m_TraitTransientDat.get_row( row_id );
-   description = exdData->getField< std::string >( row, 0 );
+  auto row = exdData->m_TraitTransientDat.get_row( row_id );
+  description = exdData->getField< std::string >( row, 0 );
 }
 
 Sapphire::Data::Transformation::Transformation( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
 {
-   auto row = exdData->m_TransformationDat.get_row( row_id );
-   model = exdData->getField< int16_t >( row, 1 );
-   bNpcCustomize = exdData->getField< int32_t >( row, 4 );
-   action.push_back( exdData->getField< uint16_t >( row, 5 ) );
-   action.push_back( exdData->getField< uint16_t >( row, 6 ) );
-   action.push_back( exdData->getField< uint16_t >( row, 7 ) );
-   action.push_back( exdData->getField< uint16_t >( row, 8 ) );
-   action.push_back( exdData->getField< uint16_t >( row, 9 ) );
-   action.push_back( exdData->getField< uint16_t >( row, 10 ) );
-   speed = exdData->getField< float >( row, 13 );
-   scale = exdData->getField< float >( row, 14 );
-   isPvP = exdData->getField< bool >( row, 15 );
-   isEvent = exdData->getField< bool >( row, 16 );
-   playerCamera = exdData->getField< bool >( row, 17 );
+  auto row = exdData->m_TransformationDat.get_row( row_id );
+  model = exdData->getField< int16_t >( row, 1 );
+  bNpcName = exdData->getField< uint16_t >( row, 2 );
+  bNpcCustomize = exdData->getField< int32_t >( row, 3 );
+  npcEquip = exdData->getField< int32_t >( row, 4 );
+  action.push_back( exdData->getField< uint16_t >( row, 5 ) );
+  action.push_back( exdData->getField< uint16_t >( row, 6 ) );
+  action.push_back( exdData->getField< uint16_t >( row, 7 ) );
+  action.push_back( exdData->getField< uint16_t >( row, 8 ) );
+  action.push_back( exdData->getField< uint16_t >( row, 9 ) );
+  action.push_back( exdData->getField< uint16_t >( row, 10 ) );
+  speed = exdData->getField< float >( row, 13 );
+  scale = exdData->getField< float >( row, 14 );
+  isPvP = exdData->getField< bool >( row, 15 );
+  isEvent = exdData->getField< bool >( row, 16 );
+  playerCamera = exdData->getField< bool >( row, 17 );
+  startVFX = exdData->getField< uint16_t >( row, 18 );
+  endVFX = exdData->getField< uint16_t >( row, 19 );
+  rPParameter = exdData->getField< uint8_t >( row, 23 );
 }
 
 Sapphire::Data::Treasure::Treasure( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
 {
-   auto row = exdData->m_TreasureDat.get_row( row_id );
-   item = exdData->getField< uint32_t >( row, 8 );
+  auto row = exdData->m_TreasureDat.get_row( row_id );
+  item = exdData->getField< uint32_t >( row, 8 );
 }
 
 Sapphire::Data::TreasureHuntRank::TreasureHuntRank( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
 {
-   auto row = exdData->m_TreasureHuntRankDat.get_row( row_id );
-   icon = exdData->getField< uint32_t >( row, 1 );
-   itemName = exdData->getField< int32_t >( row, 2 );
-   keyItemName = exdData->getField< int32_t >( row, 3 );
-   instanceMap = exdData->getField< int32_t >( row, 4 );
-   maxPartySize = exdData->getField< uint8_t >( row, 5 );
-   minPartySize = exdData->getField< uint8_t >( row, 6 );
+  auto row = exdData->m_TreasureHuntRankDat.get_row( row_id );
+  icon = exdData->getField< uint32_t >( row, 1 );
+  itemName = exdData->getField< int32_t >( row, 2 );
+  keyItemName = exdData->getField< int32_t >( row, 3 );
+  instanceMap = exdData->getField< int32_t >( row, 4 );
+  maxPartySize = exdData->getField< uint8_t >( row, 5 );
+  minPartySize = exdData->getField< uint8_t >( row, 6 );
+}
+
+Sapphire::Data::TreasureSpot::TreasureSpot( uint32_t row_id, uint32_t subRow, Sapphire::Data::ExdDataGenerated* exdData )
+{
+  auto row = exdData->m_TreasureSpotDat.get_row( row_id, subRow );
+  location = exdData->getField< int32_t >( row, 0 );
 }
 
 Sapphire::Data::Tribe::Tribe( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
 {
-   auto row = exdData->m_TribeDat.get_row( row_id );
-   masculine = exdData->getField< std::string >( row, 0 );
-   feminine = exdData->getField< std::string >( row, 1 );
-   sTR = exdData->getField< int8_t >( row, 4 );
-   dEX = exdData->getField< int8_t >( row, 5 );
-   vIT = exdData->getField< int8_t >( row, 6 );
-   iNT = exdData->getField< int8_t >( row, 7 );
-   mND = exdData->getField< int8_t >( row, 8 );
-   pIE = exdData->getField< int8_t >( row, 9 );
+  auto row = exdData->m_TribeDat.get_row( row_id );
+  masculine = exdData->getField< std::string >( row, 0 );
+  feminine = exdData->getField< std::string >( row, 1 );
+  sTR = exdData->getField< int8_t >( row, 4 );
+  dEX = exdData->getField< int8_t >( row, 5 );
+  vIT = exdData->getField< int8_t >( row, 6 );
+  iNT = exdData->getField< int8_t >( row, 7 );
+  mND = exdData->getField< int8_t >( row, 8 );
+  pIE = exdData->getField< int8_t >( row, 9 );
 }
 
 Sapphire::Data::TripleTriad::TripleTriad( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
 {
-   auto row = exdData->m_TripleTriadDat.get_row( row_id );
-   tripleTriadCardFixed.push_back( exdData->getField< uint16_t >( row, 0 ) );
-   tripleTriadCardFixed.push_back( exdData->getField< uint16_t >( row, 1 ) );
-   tripleTriadCardFixed.push_back( exdData->getField< uint16_t >( row, 2 ) );
-   tripleTriadCardFixed.push_back( exdData->getField< uint16_t >( row, 3 ) );
-   tripleTriadCardFixed.push_back( exdData->getField< uint16_t >( row, 4 ) );
-   tripleTriadCardVariable.push_back( exdData->getField< uint16_t >( row, 5 ) );
-   tripleTriadCardVariable.push_back( exdData->getField< uint16_t >( row, 6 ) );
-   tripleTriadCardVariable.push_back( exdData->getField< uint16_t >( row, 7 ) );
-   tripleTriadCardVariable.push_back( exdData->getField< uint16_t >( row, 8 ) );
-   tripleTriadCardVariable.push_back( exdData->getField< uint16_t >( row, 9 ) );
-   tripleTriadRule.push_back( exdData->getField< uint8_t >( row, 10 ) );
-   tripleTriadRule.push_back( exdData->getField< uint8_t >( row, 11 ) );
-   usesRegionalRules = exdData->getField< bool >( row, 12 );
-   fee = exdData->getField< uint16_t >( row, 13 );
-   previousQuestJoin = exdData->getField< uint8_t >( row, 14 );
-   previousQuest.push_back( exdData->getField< uint32_t >( row, 15 ) );
-   previousQuest.push_back( exdData->getField< uint32_t >( row, 16 ) );
-   previousQuest.push_back( exdData->getField< uint32_t >( row, 17 ) );
-   startTime = exdData->getField< uint16_t >( row, 18 );
-   endTime = exdData->getField< uint16_t >( row, 19 );
-   defaultTalkChallenge = exdData->getField< uint32_t >( row, 20 );
-   defaultTalkUnavailable = exdData->getField< uint32_t >( row, 21 );
-   defaultTalkNPCWin = exdData->getField< uint32_t >( row, 22 );
-   defaultTalkDraw = exdData->getField< uint32_t >( row, 23 );
-   defaultTalkPCWin = exdData->getField< uint32_t >( row, 24 );
-   itemPossibleReward.push_back( exdData->getField< uint32_t >( row, 26 ) );
-   itemPossibleReward.push_back( exdData->getField< uint32_t >( row, 27 ) );
-   itemPossibleReward.push_back( exdData->getField< uint32_t >( row, 28 ) );
-   itemPossibleReward.push_back( exdData->getField< uint32_t >( row, 29 ) );
+  auto row = exdData->m_TripleTriadDat.get_row( row_id );
+  tripleTriadCardFixed.push_back( exdData->getField< uint16_t >( row, 0 ) );
+  tripleTriadCardFixed.push_back( exdData->getField< uint16_t >( row, 1 ) );
+  tripleTriadCardFixed.push_back( exdData->getField< uint16_t >( row, 2 ) );
+  tripleTriadCardFixed.push_back( exdData->getField< uint16_t >( row, 3 ) );
+  tripleTriadCardFixed.push_back( exdData->getField< uint16_t >( row, 4 ) );
+  tripleTriadCardVariable.push_back( exdData->getField< uint16_t >( row, 5 ) );
+  tripleTriadCardVariable.push_back( exdData->getField< uint16_t >( row, 6 ) );
+  tripleTriadCardVariable.push_back( exdData->getField< uint16_t >( row, 7 ) );
+  tripleTriadCardVariable.push_back( exdData->getField< uint16_t >( row, 8 ) );
+  tripleTriadCardVariable.push_back( exdData->getField< uint16_t >( row, 9 ) );
+  tripleTriadRule.push_back( exdData->getField< uint8_t >( row, 10 ) );
+  tripleTriadRule.push_back( exdData->getField< uint8_t >( row, 11 ) );
+  usesRegionalRules = exdData->getField< bool >( row, 12 );
+  fee = exdData->getField< uint16_t >( row, 13 );
+  previousQuestJoin = exdData->getField< uint8_t >( row, 14 );
+  previousQuest.push_back( exdData->getField< uint32_t >( row, 15 ) );
+  previousQuest.push_back( exdData->getField< uint32_t >( row, 16 ) );
+  previousQuest.push_back( exdData->getField< uint32_t >( row, 17 ) );
+  startTime = exdData->getField< uint16_t >( row, 18 );
+  endTime = exdData->getField< uint16_t >( row, 19 );
+  defaultTalkChallenge = exdData->getField< uint32_t >( row, 20 );
+  defaultTalkUnavailable = exdData->getField< uint32_t >( row, 21 );
+  defaultTalkNPCWin = exdData->getField< uint32_t >( row, 22 );
+  defaultTalkDraw = exdData->getField< uint32_t >( row, 23 );
+  defaultTalkPCWin = exdData->getField< uint32_t >( row, 24 );
+  itemPossibleReward.push_back( exdData->getField< uint32_t >( row, 26 ) );
+  itemPossibleReward.push_back( exdData->getField< uint32_t >( row, 27 ) );
+  itemPossibleReward.push_back( exdData->getField< uint32_t >( row, 28 ) );
+  itemPossibleReward.push_back( exdData->getField< uint32_t >( row, 29 ) );
 }
 
 Sapphire::Data::TripleTriadCard::TripleTriadCard( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
 {
-   auto row = exdData->m_TripleTriadCardDat.get_row( row_id );
-   name = exdData->getField< std::string >( row, 0 );
-   startsWithVowel = exdData->getField< int8_t >( row, 4 );
-   description = exdData->getField< std::string >( row, 8 );
+  auto row = exdData->m_TripleTriadCardDat.get_row( row_id );
+  name = exdData->getField< std::string >( row, 0 );
+  startsWithVowel = exdData->getField< int8_t >( row, 4 );
+  description = exdData->getField< std::string >( row, 8 );
 }
 
 Sapphire::Data::TripleTriadCardRarity::TripleTriadCardRarity( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
 {
-   auto row = exdData->m_TripleTriadCardRarityDat.get_row( row_id );
-   stars = exdData->getField< uint8_t >( row, 0 );
+  auto row = exdData->m_TripleTriadCardRarityDat.get_row( row_id );
+  stars = exdData->getField< uint8_t >( row, 0 );
 }
 
 Sapphire::Data::TripleTriadCardResident::TripleTriadCardResident( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
 {
-   auto row = exdData->m_TripleTriadCardResidentDat.get_row( row_id );
-   top = exdData->getField< uint8_t >( row, 1 );
-   bottom = exdData->getField< uint8_t >( row, 2 );
-   left = exdData->getField< uint8_t >( row, 3 );
-   right = exdData->getField< uint8_t >( row, 4 );
-   tripleTriadCardRarity = exdData->getField< uint8_t >( row, 5 );
-   tripleTriadCardType = exdData->getField< uint8_t >( row, 6 );
-   saleValue = exdData->getField< uint16_t >( row, 7 );
-   sortKey = exdData->getField< uint8_t >( row, 8 );
+  auto row = exdData->m_TripleTriadCardResidentDat.get_row( row_id );
+  top = exdData->getField< uint8_t >( row, 1 );
+  bottom = exdData->getField< uint8_t >( row, 2 );
+  left = exdData->getField< uint8_t >( row, 3 );
+  right = exdData->getField< uint8_t >( row, 4 );
+  tripleTriadCardRarity = exdData->getField< uint8_t >( row, 5 );
+  tripleTriadCardType = exdData->getField< uint8_t >( row, 6 );
+  saleValue = exdData->getField< uint16_t >( row, 7 );
+  sortKey = exdData->getField< uint8_t >( row, 8 );
 }
 
 Sapphire::Data::TripleTriadCardType::TripleTriadCardType( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
 {
-   auto row = exdData->m_TripleTriadCardTypeDat.get_row( row_id );
-   name = exdData->getField< std::string >( row, 0 );
+  auto row = exdData->m_TripleTriadCardTypeDat.get_row( row_id );
+  name = exdData->getField< std::string >( row, 0 );
 }
 
 Sapphire::Data::TripleTriadCompetition::TripleTriadCompetition( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
 {
-   auto row = exdData->m_TripleTriadCompetitionDat.get_row( row_id );
-   name = exdData->getField< std::string >( row, 0 );
+  auto row = exdData->m_TripleTriadCompetitionDat.get_row( row_id );
+  name = exdData->getField< std::string >( row, 0 );
 }
 
 Sapphire::Data::TripleTriadRule::TripleTriadRule( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
 {
-   auto row = exdData->m_TripleTriadRuleDat.get_row( row_id );
-   name = exdData->getField< std::string >( row, 0 );
+  auto row = exdData->m_TripleTriadRuleDat.get_row( row_id );
+  name = exdData->getField< std::string >( row, 0 );
 }
 
 Sapphire::Data::Tutorial::Tutorial( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
 {
-   auto row = exdData->m_TutorialDat.get_row( row_id );
-   exp = exdData->getField< uint32_t >( row, 4 );
-   gil = exdData->getField< uint32_t >( row, 5 );
-   rewardTank = exdData->getField< uint32_t >( row, 6 );
-   rewardMelee = exdData->getField< uint32_t >( row, 7 );
-   rewardRanged = exdData->getField< uint32_t >( row, 8 );
-   objective = exdData->getField< uint32_t >( row, 9 );
+  auto row = exdData->m_TutorialDat.get_row( row_id );
+  exp = exdData->getField< uint32_t >( row, 4 );
+  gil = exdData->getField< uint32_t >( row, 5 );
+  rewardTank = exdData->getField< uint32_t >( row, 6 );
+  rewardMelee = exdData->getField< uint32_t >( row, 7 );
+  rewardRanged = exdData->getField< uint32_t >( row, 8 );
+  objective = exdData->getField< uint32_t >( row, 9 );
 }
 
 Sapphire::Data::TutorialDPS::TutorialDPS( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
 {
-   auto row = exdData->m_TutorialDPSDat.get_row( row_id );
-   objective = exdData->getField< uint8_t >( row, 0 );
+  auto row = exdData->m_TutorialDPSDat.get_row( row_id );
+  objective = exdData->getField< uint8_t >( row, 0 );
 }
 
 Sapphire::Data::TutorialHealer::TutorialHealer( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
 {
-   auto row = exdData->m_TutorialHealerDat.get_row( row_id );
-   objective = exdData->getField< uint8_t >( row, 0 );
+  auto row = exdData->m_TutorialHealerDat.get_row( row_id );
+  objective = exdData->getField< uint8_t >( row, 0 );
 }
 
 Sapphire::Data::TutorialTank::TutorialTank( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
 {
-   auto row = exdData->m_TutorialTankDat.get_row( row_id );
-   objective = exdData->getField< uint8_t >( row, 0 );
+  auto row = exdData->m_TutorialTankDat.get_row( row_id );
+  objective = exdData->getField< uint8_t >( row, 0 );
 }
 
 Sapphire::Data::UIColor::UIColor( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
 {
-   auto row = exdData->m_UIColorDat.get_row( row_id );
-   uIForeground = exdData->getField< uint32_t >( row, 0 );
-   uIGlow = exdData->getField< uint32_t >( row, 1 );
+  auto row = exdData->m_UIColorDat.get_row( row_id );
+  uIForeground = exdData->getField< uint32_t >( row, 0 );
+  uIGlow = exdData->getField< uint32_t >( row, 1 );
 }
 
 Sapphire::Data::VaseFlower::VaseFlower( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
 {
-   auto row = exdData->m_VaseFlowerDat.get_row( row_id );
-   item = exdData->getField< uint32_t >( row, 3 );
+  auto row = exdData->m_VaseFlowerDat.get_row( row_id );
+  item = exdData->getField< uint32_t >( row, 3 );
 }
 
 Sapphire::Data::VFX::VFX( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
 {
-   auto row = exdData->m_VFXDat.get_row( row_id );
-   location = exdData->getField< std::string >( row, 0 );
+  auto row = exdData->m_VFXDat.get_row( row_id );
+  location = exdData->getField< std::string >( row, 0 );
 }
 
 Sapphire::Data::Warp::Warp( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
 {
-   auto row = exdData->m_WarpDat.get_row( row_id );
-   level = exdData->getField< uint32_t >( row, 0 );
-   placeName = exdData->getField< uint16_t >( row, 1 );
-   conditionSuccessEvent = exdData->getField< uint32_t >( row, 2 );
-   conditionFailEvent = exdData->getField< uint32_t >( row, 3 );
-   confirmEvent = exdData->getField< uint32_t >( row, 4 );
-   warpCondition = exdData->getField< uint16_t >( row, 5 );
-   warpLogic = exdData->getField< uint16_t >( row, 6 );
+  auto row = exdData->m_WarpDat.get_row( row_id );
+  level = exdData->getField< uint32_t >( row, 0 );
+  placeName = exdData->getField< uint16_t >( row, 1 );
+  conditionSuccessEvent = exdData->getField< uint32_t >( row, 2 );
+  conditionFailEvent = exdData->getField< uint32_t >( row, 3 );
+  confirmEvent = exdData->getField< uint32_t >( row, 4 );
+  warpCondition = exdData->getField< uint16_t >( row, 5 );
+  warpLogic = exdData->getField< uint16_t >( row, 6 );
 }
 
 Sapphire::Data::WarpCondition::WarpCondition( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
 {
-   auto row = exdData->m_WarpConditionDat.get_row( row_id );
-   requiredQuest1 = exdData->getField< uint32_t >( row, 2 );
-   requiredQuest2 = exdData->getField< uint32_t >( row, 3 );
-   dRequiredQuest3 = exdData->getField< uint32_t >( row, 4 );
-   requiredQuest4 = exdData->getField< uint32_t >( row, 5 );
+  auto row = exdData->m_WarpConditionDat.get_row( row_id );
+  requiredQuest1 = exdData->getField< uint32_t >( row, 2 );
+  requiredQuest2 = exdData->getField< uint32_t >( row, 3 );
+  dRequiredQuest3 = exdData->getField< uint32_t >( row, 4 );
+  requiredQuest4 = exdData->getField< uint32_t >( row, 5 );
 }
 
 Sapphire::Data::WarpLogic::WarpLogic( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
 {
-   auto row = exdData->m_WarpLogicDat.get_row( row_id );
-   warpName = exdData->getField< std::string >( row, 1 );
-   function.push_back( exdData->getField< std::string >( row, 3 ) );
-   function.push_back( exdData->getField< std::string >( row, 4 ) );
-   function.push_back( exdData->getField< std::string >( row, 5 ) );
-   function.push_back( exdData->getField< std::string >( row, 6 ) );
-   function.push_back( exdData->getField< std::string >( row, 7 ) );
-   function.push_back( exdData->getField< std::string >( row, 8 ) );
-   function.push_back( exdData->getField< std::string >( row, 9 ) );
-   function.push_back( exdData->getField< std::string >( row, 10 ) );
-   function.push_back( exdData->getField< std::string >( row, 11 ) );
-   function.push_back( exdData->getField< std::string >( row, 12 ) );
-   argument.push_back( exdData->getField< uint32_t >( row, 13 ) );
-   argument.push_back( exdData->getField< uint32_t >( row, 14 ) );
-   argument.push_back( exdData->getField< uint32_t >( row, 15 ) );
-   argument.push_back( exdData->getField< uint32_t >( row, 16 ) );
-   argument.push_back( exdData->getField< uint32_t >( row, 17 ) );
-   argument.push_back( exdData->getField< uint32_t >( row, 18 ) );
-   argument.push_back( exdData->getField< uint32_t >( row, 19 ) );
-   argument.push_back( exdData->getField< uint32_t >( row, 20 ) );
-   argument.push_back( exdData->getField< uint32_t >( row, 21 ) );
-   argument.push_back( exdData->getField< uint32_t >( row, 22 ) );
-   question = exdData->getField< std::string >( row, 23 );
-   responseYes = exdData->getField< std::string >( row, 24 );
-   responseNo = exdData->getField< std::string >( row, 25 );
+  auto row = exdData->m_WarpLogicDat.get_row( row_id );
+  warpName = exdData->getField< std::string >( row, 1 );
+  function.push_back( exdData->getField< std::string >( row, 3 ) );
+  function.push_back( exdData->getField< std::string >( row, 4 ) );
+  function.push_back( exdData->getField< std::string >( row, 5 ) );
+  function.push_back( exdData->getField< std::string >( row, 6 ) );
+  function.push_back( exdData->getField< std::string >( row, 7 ) );
+  function.push_back( exdData->getField< std::string >( row, 8 ) );
+  function.push_back( exdData->getField< std::string >( row, 9 ) );
+  function.push_back( exdData->getField< std::string >( row, 10 ) );
+  function.push_back( exdData->getField< std::string >( row, 11 ) );
+  function.push_back( exdData->getField< std::string >( row, 12 ) );
+  question = exdData->getField< std::string >( row, 23 );
+  responseYes = exdData->getField< std::string >( row, 24 );
+  responseNo = exdData->getField< std::string >( row, 25 );
 }
 
 Sapphire::Data::Weather::Weather( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
 {
-   auto row = exdData->m_WeatherDat.get_row( row_id );
-   icon = exdData->getField< int32_t >( row, 0 );
-   name = exdData->getField< std::string >( row, 1 );
-   description = exdData->getField< std::string >( row, 2 );
+  auto row = exdData->m_WeatherDat.get_row( row_id );
+  icon = exdData->getField< int32_t >( row, 0 );
+  name = exdData->getField< std::string >( row, 1 );
+  description = exdData->getField< std::string >( row, 2 );
 }
 
 Sapphire::Data::WeatherGroup::WeatherGroup( uint32_t row_id, uint32_t subRow, Sapphire::Data::ExdDataGenerated* exdData )
 {
-   auto row = exdData->m_WeatherGroupDat.get_row( row_id, subRow );
-   weatherRate = exdData->getField< int32_t >( row, 1 );
+  auto row = exdData->m_WeatherGroupDat.get_row( row_id, subRow );
+  weatherRate = exdData->getField< int32_t >( row, 1 );
 }
 
 Sapphire::Data::WeatherRate::WeatherRate( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
 {
-   auto row = exdData->m_WeatherRateDat.get_row( row_id );
+  auto row = exdData->m_WeatherRateDat.get_row( row_id );
 }
 
 Sapphire::Data::WeatherReportReplace::WeatherReportReplace( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
 {
-   auto row = exdData->m_WeatherReportReplaceDat.get_row( row_id );
-   placeNameSub = exdData->getField< uint16_t >( row, 0 );
-   placeNameParent = exdData->getField< uint16_t >( row, 1 );
+  auto row = exdData->m_WeatherReportReplaceDat.get_row( row_id );
+  placeNameSub = exdData->getField< uint16_t >( row, 0 );
+  placeNameParent = exdData->getField< uint16_t >( row, 1 );
 }
 
 Sapphire::Data::WeddingBGM::WeddingBGM( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
 {
-   auto row = exdData->m_WeddingBGMDat.get_row( row_id );
-   song = exdData->getField< uint16_t >( row, 0 );
-   songName = exdData->getField< std::string >( row, 1 );
+  auto row = exdData->m_WeddingBGMDat.get_row( row_id );
+  song = exdData->getField< uint16_t >( row, 0 );
+  songName = exdData->getField< std::string >( row, 1 );
 }
 
 Sapphire::Data::WeeklyBingoOrderData::WeeklyBingoOrderData( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
 {
-   auto row = exdData->m_WeeklyBingoOrderDataDat.get_row( row_id );
-   type = exdData->getField< uint32_t >( row, 0 );
-   data = exdData->getField< uint32_t >( row, 1 );
-   text = exdData->getField< uint8_t >( row, 3 );
-   icon = exdData->getField< uint32_t >( row, 4 );
+  auto row = exdData->m_WeeklyBingoOrderDataDat.get_row( row_id );
+  type = exdData->getField< uint32_t >( row, 0 );
+  data = exdData->getField< uint32_t >( row, 1 );
+  text = exdData->getField< uint8_t >( row, 3 );
+  icon = exdData->getField< uint32_t >( row, 4 );
 }
 
 Sapphire::Data::WeeklyBingoRewardData::WeeklyBingoRewardData( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
 {
-   auto row = exdData->m_WeeklyBingoRewardDataDat.get_row( row_id );
-   rewardItem2 = exdData->getField< uint32_t >( row, 10 );
-   rewardHQ2 = exdData->getField< bool >( row, 11 );
-   rewardQuantity2 = exdData->getField< uint16_t >( row, 12 );
+  auto row = exdData->m_WeeklyBingoRewardDataDat.get_row( row_id );
+  rewardItem2 = exdData->getField< uint32_t >( row, 10 );
+  rewardHQ2 = exdData->getField< bool >( row, 11 );
+  rewardQuantity2 = exdData->getField< uint16_t >( row, 12 );
 }
 
 Sapphire::Data::WeeklyBingoText::WeeklyBingoText( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
 {
-   auto row = exdData->m_WeeklyBingoTextDat.get_row( row_id );
-   description = exdData->getField< std::string >( row, 0 );
+  auto row = exdData->m_WeeklyBingoTextDat.get_row( row_id );
+  description = exdData->getField< std::string >( row, 0 );
 }
 
 Sapphire::Data::WeeklyLotBonus::WeeklyLotBonus( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
 {
-   auto row = exdData->m_WeeklyLotBonusDat.get_row( row_id );
-   weeklyLotBonusThreshold.push_back( exdData->getField< uint8_t >( row, 0 ) );
-   weeklyLotBonusThreshold.push_back( exdData->getField< uint8_t >( row, 1 ) );
-   weeklyLotBonusThreshold.push_back( exdData->getField< uint8_t >( row, 2 ) );
-   weeklyLotBonusThreshold.push_back( exdData->getField< uint8_t >( row, 3 ) );
-   weeklyLotBonusThreshold.push_back( exdData->getField< uint8_t >( row, 4 ) );
-   weeklyLotBonusThreshold.push_back( exdData->getField< uint8_t >( row, 5 ) );
-   weeklyLotBonusThreshold.push_back( exdData->getField< uint8_t >( row, 6 ) );
-   weeklyLotBonusThreshold.push_back( exdData->getField< uint8_t >( row, 7 ) );
-   weeklyLotBonusThreshold.push_back( exdData->getField< uint8_t >( row, 8 ) );
-   weeklyLotBonusThreshold.push_back( exdData->getField< uint8_t >( row, 9 ) );
-   weeklyLotBonusThreshold.push_back( exdData->getField< uint8_t >( row, 10 ) );
-   weeklyLotBonusThreshold.push_back( exdData->getField< uint8_t >( row, 11 ) );
-   weeklyLotBonusThreshold.push_back( exdData->getField< uint8_t >( row, 12 ) );
-   weeklyLotBonusThreshold.push_back( exdData->getField< uint8_t >( row, 13 ) );
-   weeklyLotBonusThreshold.push_back( exdData->getField< uint8_t >( row, 14 ) );
-   weeklyLotBonusThreshold.push_back( exdData->getField< uint8_t >( row, 15 ) );
-   weeklyLotBonusThreshold.push_back( exdData->getField< uint8_t >( row, 16 ) );
-   weeklyLotBonusThreshold.push_back( exdData->getField< uint8_t >( row, 17 ) );
-   weeklyLotBonusThreshold.push_back( exdData->getField< uint8_t >( row, 18 ) );
-   weeklyLotBonusThreshold.push_back( exdData->getField< uint8_t >( row, 19 ) );
-   weeklyLotBonusThreshold.push_back( exdData->getField< uint8_t >( row, 20 ) );
-   weeklyLotBonusThreshold.push_back( exdData->getField< uint8_t >( row, 21 ) );
-   weeklyLotBonusThreshold.push_back( exdData->getField< uint8_t >( row, 22 ) );
-   weeklyLotBonusThreshold.push_back( exdData->getField< uint8_t >( row, 23 ) );
-   weeklyLotBonusThreshold.push_back( exdData->getField< uint8_t >( row, 24 ) );
-   weeklyLotBonusThreshold.push_back( exdData->getField< uint8_t >( row, 25 ) );
-   weeklyLotBonusThreshold.push_back( exdData->getField< uint8_t >( row, 26 ) );
-   weeklyLotBonusThreshold.push_back( exdData->getField< uint8_t >( row, 27 ) );
-   weeklyLotBonusThreshold.push_back( exdData->getField< uint8_t >( row, 28 ) );
-   weeklyLotBonusThreshold.push_back( exdData->getField< uint8_t >( row, 29 ) );
-   weeklyLotBonusThreshold.push_back( exdData->getField< uint8_t >( row, 30 ) );
+  auto row = exdData->m_WeeklyLotBonusDat.get_row( row_id );
+  weeklyLotBonusThreshold.push_back( exdData->getField< uint8_t >( row, 0 ) );
+  weeklyLotBonusThreshold.push_back( exdData->getField< uint8_t >( row, 1 ) );
+  weeklyLotBonusThreshold.push_back( exdData->getField< uint8_t >( row, 2 ) );
+  weeklyLotBonusThreshold.push_back( exdData->getField< uint8_t >( row, 3 ) );
+  weeklyLotBonusThreshold.push_back( exdData->getField< uint8_t >( row, 4 ) );
+  weeklyLotBonusThreshold.push_back( exdData->getField< uint8_t >( row, 5 ) );
+  weeklyLotBonusThreshold.push_back( exdData->getField< uint8_t >( row, 6 ) );
+  weeklyLotBonusThreshold.push_back( exdData->getField< uint8_t >( row, 7 ) );
+  weeklyLotBonusThreshold.push_back( exdData->getField< uint8_t >( row, 8 ) );
+  weeklyLotBonusThreshold.push_back( exdData->getField< uint8_t >( row, 9 ) );
+  weeklyLotBonusThreshold.push_back( exdData->getField< uint8_t >( row, 10 ) );
+  weeklyLotBonusThreshold.push_back( exdData->getField< uint8_t >( row, 11 ) );
+  weeklyLotBonusThreshold.push_back( exdData->getField< uint8_t >( row, 12 ) );
+  weeklyLotBonusThreshold.push_back( exdData->getField< uint8_t >( row, 13 ) );
+  weeklyLotBonusThreshold.push_back( exdData->getField< uint8_t >( row, 14 ) );
+  weeklyLotBonusThreshold.push_back( exdData->getField< uint8_t >( row, 15 ) );
+  weeklyLotBonusThreshold.push_back( exdData->getField< uint8_t >( row, 16 ) );
+  weeklyLotBonusThreshold.push_back( exdData->getField< uint8_t >( row, 17 ) );
+  weeklyLotBonusThreshold.push_back( exdData->getField< uint8_t >( row, 18 ) );
+  weeklyLotBonusThreshold.push_back( exdData->getField< uint8_t >( row, 19 ) );
+  weeklyLotBonusThreshold.push_back( exdData->getField< uint8_t >( row, 20 ) );
+  weeklyLotBonusThreshold.push_back( exdData->getField< uint8_t >( row, 21 ) );
+  weeklyLotBonusThreshold.push_back( exdData->getField< uint8_t >( row, 22 ) );
+  weeklyLotBonusThreshold.push_back( exdData->getField< uint8_t >( row, 23 ) );
+  weeklyLotBonusThreshold.push_back( exdData->getField< uint8_t >( row, 24 ) );
+  weeklyLotBonusThreshold.push_back( exdData->getField< uint8_t >( row, 25 ) );
+  weeklyLotBonusThreshold.push_back( exdData->getField< uint8_t >( row, 26 ) );
+  weeklyLotBonusThreshold.push_back( exdData->getField< uint8_t >( row, 27 ) );
+  weeklyLotBonusThreshold.push_back( exdData->getField< uint8_t >( row, 28 ) );
+  weeklyLotBonusThreshold.push_back( exdData->getField< uint8_t >( row, 29 ) );
+  weeklyLotBonusThreshold.push_back( exdData->getField< uint8_t >( row, 30 ) );
 }
 
 Sapphire::Data::World::World( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
 {
-   auto row = exdData->m_WorldDat.get_row( row_id );
-   name = exdData->getField< std::string >( row, 0 );
-   dataCenter = exdData->getField< uint8_t >( row, 2 );
-   isPublic = exdData->getField< bool >( row, 3 );
+  auto row = exdData->m_WorldDat.get_row( row_id );
+  name = exdData->getField< std::string >( row, 0 );
+  dataCenter = exdData->getField< uint8_t >( row, 2 );
+  isPublic = exdData->getField< bool >( row, 3 );
 }
 
 Sapphire::Data::WorldDCGroupType::WorldDCGroupType( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
 {
-   auto row = exdData->m_WorldDCGroupTypeDat.get_row( row_id );
-   name = exdData->getField< std::string >( row, 0 );
-   region = exdData->getField< uint8_t >( row, 1 );
+  auto row = exdData->m_WorldDCGroupTypeDat.get_row( row_id );
+  name = exdData->getField< std::string >( row, 0 );
+  region = exdData->getField< uint8_t >( row, 1 );
 }
 
 Sapphire::Data::YKW::YKW( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
 {
-   auto row = exdData->m_YKWDat.get_row( row_id );
-   item = exdData->getField< uint32_t >( row, 1 );
-   location.push_back( exdData->getField< uint16_t >( row, 2 ) );
-   location.push_back( exdData->getField< uint16_t >( row, 3 ) );
-   location.push_back( exdData->getField< uint16_t >( row, 4 ) );
+  auto row = exdData->m_YKWDat.get_row( row_id );
+  item = exdData->getField< uint32_t >( row, 1 );
+  location.push_back( exdData->getField< uint16_t >( row, 2 ) );
+  location.push_back( exdData->getField< uint16_t >( row, 3 ) );
+  location.push_back( exdData->getField< uint16_t >( row, 4 ) );
 }
 
 Sapphire::Data::ZoneSharedGroup::ZoneSharedGroup( uint32_t row_id, uint32_t subRow, Sapphire::Data::ExdDataGenerated* exdData )
 {
-   auto row = exdData->m_ZoneSharedGroupDat.get_row( row_id, subRow );
-   quest1 = exdData->getField< uint32_t >( row, 2 );
-   quest2 = exdData->getField< uint32_t >( row, 6 );
-   quest3 = exdData->getField< uint32_t >( row, 10 );
-   quest4 = exdData->getField< uint32_t >( row, 14 );
-   quest5 = exdData->getField< uint32_t >( row, 18 );
-   quest6 = exdData->getField< uint32_t >( row, 22 );
+  auto row = exdData->m_ZoneSharedGroupDat.get_row( row_id, subRow );
+  quest1 = exdData->getField< uint32_t >( row, 2 );
+  quest2 = exdData->getField< uint32_t >( row, 6 );
+  quest3 = exdData->getField< uint32_t >( row, 10 );
+  quest4 = exdData->getField< uint32_t >( row, 14 );
+  quest5 = exdData->getField< uint32_t >( row, 18 );
+  quest6 = exdData->getField< uint32_t >( row, 22 );
 }
 
 
@@ -6595,508 +6720,515 @@ Sapphire::Data::ExdDataGenerated::~ExdDataGenerated()
 
 xiv::exd::Exd Sapphire::Data::ExdDataGenerated::setupDatAccess( const std::string& name, xiv::exd::Language lang )
 {
-   auto& cat = m_exd_data->get_category( name );
-   return static_cast< xiv::exd::Exd >( cat.get_data_ln( lang ) );
+  auto& cat = m_exd_data->get_category( name );
+  return static_cast< xiv::exd::Exd >( cat.get_data_ln( lang ) );
 };
 
 
 void Sapphire::Data::ExdDataGenerated::loadIdList( xiv::exd::Exd& data, std::set< uint32_t >& outIdList )
 {
-   auto pDataRows = data.get_rows();
+  auto pDataRows = data.get_rows();
 
-   for( auto row : pDataRows )
-   {
-      uint32_t id = row.first;
-      outIdList.insert( id );
-   }
+  for( auto row : pDataRows )
+  {
+    uint32_t id = row.first;
+    outIdList.insert( id );
+  }
 }
 
 bool Sapphire::Data::ExdDataGenerated::init( const std::string& path )
 {
-   try
-   {
-      m_data = std::make_shared< xiv::dat::GameData >( path );
-      m_exd_data = std::make_shared< xiv::exd::ExdData >( *m_data );
+  try
+  {
+    m_data = std::make_shared< xiv::dat::GameData >( path );
+    m_exd_data = std::make_shared< xiv::exd::ExdData >( *m_data );
 
-      m_AchievementDat = setupDatAccess( "Achievement", xiv::exd::Language::en );
-      m_AchievementCategoryDat = setupDatAccess( "AchievementCategory", xiv::exd::Language::en );
-      m_AchievementKindDat = setupDatAccess( "AchievementKind", xiv::exd::Language::en );
-      m_ActionDat = setupDatAccess( "Action", xiv::exd::Language::en );
-      m_ActionCastTimelineDat = setupDatAccess( "ActionCastTimeline", xiv::exd::Language::none );
-      m_ActionCastVFXDat = setupDatAccess( "ActionCastVFX", xiv::exd::Language::none );
-      m_ActionCategoryDat = setupDatAccess( "ActionCategory", xiv::exd::Language::en );
-      m_ActionComboRouteDat = setupDatAccess( "ActionComboRoute", xiv::exd::Language::en );
-      m_ActionIndirectionDat = setupDatAccess( "ActionIndirection", xiv::exd::Language::none );
-      m_ActionParamDat = setupDatAccess( "ActionParam", xiv::exd::Language::none );
-      m_ActionProcStatusDat = setupDatAccess( "ActionProcStatus", xiv::exd::Language::none );
-      m_ActionTimelineDat = setupDatAccess( "ActionTimeline", xiv::exd::Language::none );
-      m_ActionTimelineMoveDat = setupDatAccess( "ActionTimelineMove", xiv::exd::Language::none );
-      m_ActionTimelineReplaceDat = setupDatAccess( "ActionTimelineReplace", xiv::exd::Language::none );
-      m_ActionTransientDat = setupDatAccess( "ActionTransient", xiv::exd::Language::en );
-      m_ActivityFeedButtonsDat = setupDatAccess( "ActivityFeedButtons", xiv::exd::Language::none );
-      m_ActivityFeedCaptionsDat = setupDatAccess( "ActivityFeedCaptions", xiv::exd::Language::none );
-      m_ActivityFeedGroupCaptionsDat = setupDatAccess( "ActivityFeedGroupCaptions", xiv::exd::Language::none );
-      m_ActivityFeedImagesDat = setupDatAccess( "ActivityFeedImages", xiv::exd::Language::none );
-      m_AddonDat = setupDatAccess( "Addon", xiv::exd::Language::en );
-      m_AddonHudDat = setupDatAccess( "AddonHud", xiv::exd::Language::en );
-      m_AdventureDat = setupDatAccess( "Adventure", xiv::exd::Language::en );
-      m_AdventureExPhaseDat = setupDatAccess( "AdventureExPhase", xiv::exd::Language::none );
-      m_AetherCurrentDat = setupDatAccess( "AetherCurrent", xiv::exd::Language::none );
-      m_AetherCurrentCompFlgSetDat = setupDatAccess( "AetherCurrentCompFlgSet", xiv::exd::Language::none );
-      m_AetherialWheelDat = setupDatAccess( "AetherialWheel", xiv::exd::Language::none );
-      m_AetheryteDat = setupDatAccess( "Aetheryte", xiv::exd::Language::en );
-      m_AetheryteSystemDefineDat = setupDatAccess( "AetheryteSystemDefine", xiv::exd::Language::none );
-      m_AirshipExplorationLevelDat = setupDatAccess( "AirshipExplorationLevel", xiv::exd::Language::none );
-      m_AirshipExplorationLogDat = setupDatAccess( "AirshipExplorationLog", xiv::exd::Language::en );
-      m_AirshipExplorationParamTypeDat = setupDatAccess( "AirshipExplorationParamType", xiv::exd::Language::en );
-      m_AirshipExplorationPartDat = setupDatAccess( "AirshipExplorationPart", xiv::exd::Language::none );
-      m_AirshipExplorationPointDat = setupDatAccess( "AirshipExplorationPoint", xiv::exd::Language::en );
-      m_AnimaWeapon5Dat = setupDatAccess( "AnimaWeapon5", xiv::exd::Language::none );
-      m_AnimaWeapon5ParamDat = setupDatAccess( "AnimaWeapon5Param", xiv::exd::Language::en );
-      m_AnimaWeapon5PatternGroupDat = setupDatAccess( "AnimaWeapon5PatternGroup", xiv::exd::Language::en );
-      m_AnimaWeapon5SpiritTalkDat = setupDatAccess( "AnimaWeapon5SpiritTalk", xiv::exd::Language::none );
-      m_AnimaWeapon5SpiritTalkParamDat = setupDatAccess( "AnimaWeapon5SpiritTalkParam", xiv::exd::Language::en );
-      m_AnimaWeapon5TradeItemDat = setupDatAccess( "AnimaWeapon5TradeItem", xiv::exd::Language::none );
-      m_AnimaWeaponFUITalkDat = setupDatAccess( "AnimaWeaponFUITalk", xiv::exd::Language::none );
-      m_AnimaWeaponFUITalkParamDat = setupDatAccess( "AnimaWeaponFUITalkParam", xiv::exd::Language::en );
-      m_AnimaWeaponIconDat = setupDatAccess( "AnimaWeaponIcon", xiv::exd::Language::none );
-      m_AnimaWeaponItemDat = setupDatAccess( "AnimaWeaponItem", xiv::exd::Language::none );
-      m_AozActionDat = setupDatAccess( "AozAction", xiv::exd::Language::none );
-      m_AozActionTransientDat = setupDatAccess( "AozActionTransient", xiv::exd::Language::en );
-      m_AOZArrangementDat = setupDatAccess( "AOZArrangement", xiv::exd::Language::none );
-      m_AOZBossDat = setupDatAccess( "AOZBoss", xiv::exd::Language::none );
-      m_AOZContentDat = setupDatAccess( "AOZContent", xiv::exd::Language::none );
-      m_AOZContentBriefingBNpcDat = setupDatAccess( "AOZContentBriefingBNpc", xiv::exd::Language::none );
-      m_AquariumFishDat = setupDatAccess( "AquariumFish", xiv::exd::Language::none );
-      m_AquariumWaterDat = setupDatAccess( "AquariumWater", xiv::exd::Language::en );
-      m_ArrayEventHandlerDat = setupDatAccess( "ArrayEventHandler", xiv::exd::Language::none );
-      m_AttackTypeDat = setupDatAccess( "AttackType", xiv::exd::Language::en );
-      m_BacklightColorDat = setupDatAccess( "BacklightColor", xiv::exd::Language::none );
-      m_BalloonDat = setupDatAccess( "Balloon", xiv::exd::Language::en );
-      m_BaseParamDat = setupDatAccess( "BaseParam", xiv::exd::Language::en );
-      m_BattleLeveDat = setupDatAccess( "BattleLeve", xiv::exd::Language::none );
-      m_BeastRankBonusDat = setupDatAccess( "BeastRankBonus", xiv::exd::Language::none );
-      m_BeastReputationRankDat = setupDatAccess( "BeastReputationRank", xiv::exd::Language::en );
-      m_BeastTribeDat = setupDatAccess( "BeastTribe", xiv::exd::Language::en );
-      m_BehaviorDat = setupDatAccess( "Behavior", xiv::exd::Language::none );
-      m_BGMDat = setupDatAccess( "BGM", xiv::exd::Language::none );
-      m_BGMFadeDat = setupDatAccess( "BGMFade", xiv::exd::Language::none );
-      m_BGMSituationDat = setupDatAccess( "BGMSituation", xiv::exd::Language::none );
-      m_BGMSwitchDat = setupDatAccess( "BGMSwitch", xiv::exd::Language::none );
-      m_BGMSystemDefineDat = setupDatAccess( "BGMSystemDefine", xiv::exd::Language::none );
-      m_BNpcAnnounceIconDat = setupDatAccess( "BNpcAnnounceIcon", xiv::exd::Language::none );
-      m_BNpcBaseDat = setupDatAccess( "BNpcBase", xiv::exd::Language::none );
-      m_BNpcCustomizeDat = setupDatAccess( "BNpcCustomize", xiv::exd::Language::none );
-      m_BNpcNameDat = setupDatAccess( "BNpcName", xiv::exd::Language::en );
-      m_BNpcPartsDat = setupDatAccess( "BNpcParts", xiv::exd::Language::none );
-      m_BuddyDat = setupDatAccess( "Buddy", xiv::exd::Language::none );
-      m_BuddyActionDat = setupDatAccess( "BuddyAction", xiv::exd::Language::en );
-      m_BuddyEquipDat = setupDatAccess( "BuddyEquip", xiv::exd::Language::en );
-      m_BuddyItemDat = setupDatAccess( "BuddyItem", xiv::exd::Language::none );
-      m_BuddyRankDat = setupDatAccess( "BuddyRank", xiv::exd::Language::none );
-      m_BuddySkillDat = setupDatAccess( "BuddySkill", xiv::exd::Language::none );
-      m_CabinetDat = setupDatAccess( "Cabinet", xiv::exd::Language::none );
-      m_CabinetCategoryDat = setupDatAccess( "CabinetCategory", xiv::exd::Language::none );
-      m_CalendarDat = setupDatAccess( "Calendar", xiv::exd::Language::none );
-      m_CharaMakeCustomizeDat = setupDatAccess( "CharaMakeCustomize", xiv::exd::Language::none );
-      m_CharaMakeTypeDat = setupDatAccess( "CharaMakeType", xiv::exd::Language::en );
-      m_ChocoboRaceDat = setupDatAccess( "ChocoboRace", xiv::exd::Language::none );
-      m_ChocoboRaceAbilityDat = setupDatAccess( "ChocoboRaceAbility", xiv::exd::Language::en );
-      m_ChocoboRaceAbilityTypeDat = setupDatAccess( "ChocoboRaceAbilityType", xiv::exd::Language::none );
-      m_ChocoboRaceItemDat = setupDatAccess( "ChocoboRaceItem", xiv::exd::Language::en );
-      m_ChocoboRaceRankDat = setupDatAccess( "ChocoboRaceRank", xiv::exd::Language::none );
-      m_ChocoboRaceStatusDat = setupDatAccess( "ChocoboRaceStatus", xiv::exd::Language::none );
-      m_ChocoboRaceTerritoryDat = setupDatAccess( "ChocoboRaceTerritory", xiv::exd::Language::none );
-      m_ChocoboRaceTutorialDat = setupDatAccess( "ChocoboRaceTutorial", xiv::exd::Language::none );
-      m_ChocoboRaceWeatherDat = setupDatAccess( "ChocoboRaceWeather", xiv::exd::Language::none );
-      m_ChocoboTaxiDat = setupDatAccess( "ChocoboTaxi", xiv::exd::Language::none );
-      m_ChocoboTaxiStandDat = setupDatAccess( "ChocoboTaxiStand", xiv::exd::Language::en );
-      m_ClassJobDat = setupDatAccess( "ClassJob", xiv::exd::Language::en );
-      m_ClassJobCategoryDat = setupDatAccess( "ClassJobCategory", xiv::exd::Language::en );
-      m_CompanionDat = setupDatAccess( "Companion", xiv::exd::Language::en );
-      m_CompanionMoveDat = setupDatAccess( "CompanionMove", xiv::exd::Language::en );
-      m_CompanionTransientDat = setupDatAccess( "CompanionTransient", xiv::exd::Language::en );
-      m_CompanyActionDat = setupDatAccess( "CompanyAction", xiv::exd::Language::en );
-      m_CompanyCraftDraftDat = setupDatAccess( "CompanyCraftDraft", xiv::exd::Language::en );
-      m_CompanyCraftDraftCategoryDat = setupDatAccess( "CompanyCraftDraftCategory", xiv::exd::Language::en );
-      m_CompanyCraftManufactoryStateDat = setupDatAccess( "CompanyCraftManufactoryState", xiv::exd::Language::en );
-      m_CompanyCraftPartDat = setupDatAccess( "CompanyCraftPart", xiv::exd::Language::none );
-      m_CompanyCraftProcessDat = setupDatAccess( "CompanyCraftProcess", xiv::exd::Language::none );
-      m_CompanyCraftSequenceDat = setupDatAccess( "CompanyCraftSequence", xiv::exd::Language::none );
-      m_CompanyCraftSupplyItemDat = setupDatAccess( "CompanyCraftSupplyItem", xiv::exd::Language::none );
-      m_CompanyCraftTypeDat = setupDatAccess( "CompanyCraftType", xiv::exd::Language::en );
-      m_CompleteJournalDat = setupDatAccess( "CompleteJournal", xiv::exd::Language::en );
-      m_CompleteJournalCategoryDat = setupDatAccess( "CompleteJournalCategory", xiv::exd::Language::none );
-      m_ContentCloseCycleDat = setupDatAccess( "ContentCloseCycle", xiv::exd::Language::none );
-      m_ContentExActionDat = setupDatAccess( "ContentExAction", xiv::exd::Language::none );
-      m_ContentFinderConditionDat = setupDatAccess( "ContentFinderCondition", xiv::exd::Language::en );
-      m_ContentFinderConditionTransientDat = setupDatAccess( "ContentFinderConditionTransient", xiv::exd::Language::en );
-      m_ContentGaugeDat = setupDatAccess( "ContentGauge", xiv::exd::Language::en );
-      m_ContentGaugeColorDat = setupDatAccess( "ContentGaugeColor", xiv::exd::Language::none );
-      m_ContentMemberTypeDat = setupDatAccess( "ContentMemberType", xiv::exd::Language::none );
-      m_ContentNpcTalkDat = setupDatAccess( "ContentNpcTalk", xiv::exd::Language::none );
-      m_ContentRouletteDat = setupDatAccess( "ContentRoulette", xiv::exd::Language::en );
-      m_ContentRouletteOpenRuleDat = setupDatAccess( "ContentRouletteOpenRule", xiv::exd::Language::none );
-      m_ContentRouletteRoleBonusDat = setupDatAccess( "ContentRouletteRoleBonus", xiv::exd::Language::none );
-      m_ContentsNoteDat = setupDatAccess( "ContentsNote", xiv::exd::Language::en );
-      m_ContentTalkDat = setupDatAccess( "ContentTalk", xiv::exd::Language::en );
-      m_ContentTalkParamDat = setupDatAccess( "ContentTalkParam", xiv::exd::Language::none );
-      m_ContentTypeDat = setupDatAccess( "ContentType", xiv::exd::Language::en );
-      m_CraftActionDat = setupDatAccess( "CraftAction", xiv::exd::Language::en );
-      m_CraftLeveDat = setupDatAccess( "CraftLeve", xiv::exd::Language::none );
-      m_CraftTypeDat = setupDatAccess( "CraftType", xiv::exd::Language::en );
-      m_CreditDat = setupDatAccess( "Credit", xiv::exd::Language::none );
-      m_CreditBackImageDat = setupDatAccess( "CreditBackImage", xiv::exd::Language::none );
-      m_CreditCastDat = setupDatAccess( "CreditCast", xiv::exd::Language::en );
-      m_CurrencyDat = setupDatAccess( "Currency", xiv::exd::Language::none );
-      m_CustomTalkDat = setupDatAccess( "CustomTalk", xiv::exd::Language::en );
-      m_CustomTalkDynamicIconDat = setupDatAccess( "CustomTalkDynamicIcon", xiv::exd::Language::none );
-      m_CustomTalkNestHandlersDat = setupDatAccess( "CustomTalkNestHandlers", xiv::exd::Language::none );
-      m_CutsceneDat = setupDatAccess( "Cutscene", xiv::exd::Language::none );
-      m_CutScreenImageDat = setupDatAccess( "CutScreenImage", xiv::exd::Language::none );
-      m_DailySupplyItemDat = setupDatAccess( "DailySupplyItem", xiv::exd::Language::none );
-      m_DeepDungeonDat = setupDatAccess( "DeepDungeon", xiv::exd::Language::en );
-      m_DeepDungeonBanDat = setupDatAccess( "DeepDungeonBan", xiv::exd::Language::none );
-      m_DeepDungeonDangerDat = setupDatAccess( "DeepDungeonDanger", xiv::exd::Language::none );
-      m_DeepDungeonEquipmentDat = setupDatAccess( "DeepDungeonEquipment", xiv::exd::Language::en );
-      m_DeepDungeonFloorEffectUIDat = setupDatAccess( "DeepDungeonFloorEffectUI", xiv::exd::Language::en );
-      m_DeepDungeonItemDat = setupDatAccess( "DeepDungeonItem", xiv::exd::Language::en );
-      m_DeepDungeonLayerDat = setupDatAccess( "DeepDungeonLayer", xiv::exd::Language::none );
-      m_DeepDungeonMagicStoneDat = setupDatAccess( "DeepDungeonMagicStone", xiv::exd::Language::en );
-      m_DeepDungeonMap5XDat = setupDatAccess( "DeepDungeonMap5X", xiv::exd::Language::none );
-      m_DeepDungeonRoomDat = setupDatAccess( "DeepDungeonRoom", xiv::exd::Language::none );
-      m_DeepDungeonStatusDat = setupDatAccess( "DeepDungeonStatus", xiv::exd::Language::none );
-      m_DefaultTalkDat = setupDatAccess( "DefaultTalk", xiv::exd::Language::en );
-      m_DefaultTalkLipSyncTypeDat = setupDatAccess( "DefaultTalkLipSyncType", xiv::exd::Language::none );
-      m_DeliveryQuestDat = setupDatAccess( "DeliveryQuest", xiv::exd::Language::none );
-      m_DescriptionPageDat = setupDatAccess( "DescriptionPage", xiv::exd::Language::none );
-      m_DescriptionStringDat = setupDatAccess( "DescriptionString", xiv::exd::Language::en );
-      m_DisposalShopDat = setupDatAccess( "DisposalShop", xiv::exd::Language::en );
-      m_DisposalShopFilterTypeDat = setupDatAccess( "DisposalShopFilterType", xiv::exd::Language::en );
-      m_DisposalShopItemDat = setupDatAccess( "DisposalShopItem", xiv::exd::Language::none );
-      m_DpsChallengeDat = setupDatAccess( "DpsChallenge", xiv::exd::Language::en );
-      m_DpsChallengeOfficerDat = setupDatAccess( "DpsChallengeOfficer", xiv::exd::Language::none );
-      m_DpsChallengeTransientDat = setupDatAccess( "DpsChallengeTransient", xiv::exd::Language::none );
-      m_EmjAddonDat = setupDatAccess( "EmjAddon", xiv::exd::Language::en );
-      m_EmjDaniDat = setupDatAccess( "EmjDani", xiv::exd::Language::none );
-      m_EmoteDat = setupDatAccess( "Emote", xiv::exd::Language::en );
-      m_EmoteCategoryDat = setupDatAccess( "EmoteCategory", xiv::exd::Language::en );
-      m_ENpcBaseDat = setupDatAccess( "ENpcBase", xiv::exd::Language::none );
-      m_ENpcDressUpDat = setupDatAccess( "ENpcDressUp", xiv::exd::Language::none );
-      m_ENpcDressUpDressDat = setupDatAccess( "ENpcDressUpDress", xiv::exd::Language::none );
-      m_ENpcResidentDat = setupDatAccess( "ENpcResident", xiv::exd::Language::en );
-      m_EObjDat = setupDatAccess( "EObj", xiv::exd::Language::none );
-      m_EObjNameDat = setupDatAccess( "EObjName", xiv::exd::Language::en );
-      m_EquipRaceCategoryDat = setupDatAccess( "EquipRaceCategory", xiv::exd::Language::none );
-      m_EquipSlotCategoryDat = setupDatAccess( "EquipSlotCategory", xiv::exd::Language::none );
-      m_EurekaAetherItemDat = setupDatAccess( "EurekaAetherItem", xiv::exd::Language::en );
-      m_EurekaAethernetDat = setupDatAccess( "EurekaAethernet", xiv::exd::Language::none );
-      m_EurekaGrowDataDat = setupDatAccess( "EurekaGrowData", xiv::exd::Language::none );
-      m_EurekaLogosMixerProbabilityDat = setupDatAccess( "EurekaLogosMixerProbability", xiv::exd::Language::none );
-      m_EurekaMagiaActionDat = setupDatAccess( "EurekaMagiaAction", xiv::exd::Language::none );
-      m_EurekaMagiciteItemDat = setupDatAccess( "EurekaMagiciteItem", xiv::exd::Language::none );
-      m_EurekaMagiciteItemTypeDat = setupDatAccess( "EurekaMagiciteItemType", xiv::exd::Language::en );
-      m_EurekaSphereElementAdjustDat = setupDatAccess( "EurekaSphereElementAdjust", xiv::exd::Language::none );
-      m_EventActionDat = setupDatAccess( "EventAction", xiv::exd::Language::en );
-      m_EventIconPriorityDat = setupDatAccess( "EventIconPriority", xiv::exd::Language::none );
-      m_EventIconTypeDat = setupDatAccess( "EventIconType", xiv::exd::Language::none );
-      m_EventItemDat = setupDatAccess( "EventItem", xiv::exd::Language::en );
-      m_EventItemCastTimelineDat = setupDatAccess( "EventItemCastTimeline", xiv::exd::Language::none );
-      m_EventItemHelpDat = setupDatAccess( "EventItemHelp", xiv::exd::Language::en );
-      m_EventItemTimelineDat = setupDatAccess( "EventItemTimeline", xiv::exd::Language::none );
-      m_ExportedSGDat = setupDatAccess( "ExportedSG", xiv::exd::Language::none );
-      m_ExVersionDat = setupDatAccess( "ExVersion", xiv::exd::Language::en );
-      m_FateDat = setupDatAccess( "Fate", xiv::exd::Language::en );
-      m_FCActivityDat = setupDatAccess( "FCActivity", xiv::exd::Language::en );
-      m_FCActivityCategoryDat = setupDatAccess( "FCActivityCategory", xiv::exd::Language::en );
-      m_FCAuthorityDat = setupDatAccess( "FCAuthority", xiv::exd::Language::en );
-      m_FCAuthorityCategoryDat = setupDatAccess( "FCAuthorityCategory", xiv::exd::Language::en );
-      m_FCChestNameDat = setupDatAccess( "FCChestName", xiv::exd::Language::en );
-      m_FccShopDat = setupDatAccess( "FccShop", xiv::exd::Language::en );
-      m_FCHierarchyDat = setupDatAccess( "FCHierarchy", xiv::exd::Language::en );
-      m_FCProfileDat = setupDatAccess( "FCProfile", xiv::exd::Language::en );
-      m_FCReputationDat = setupDatAccess( "FCReputation", xiv::exd::Language::en );
-      m_FCRightsDat = setupDatAccess( "FCRights", xiv::exd::Language::en );
-      m_FestivalDat = setupDatAccess( "Festival", xiv::exd::Language::none );
-      m_FieldMarkerDat = setupDatAccess( "FieldMarker", xiv::exd::Language::en );
-      m_FishingRecordTypeDat = setupDatAccess( "FishingRecordType", xiv::exd::Language::none );
-      m_FishingRecordTypeTransientDat = setupDatAccess( "FishingRecordTypeTransient", xiv::exd::Language::none );
-      m_FishingSpotDat = setupDatAccess( "FishingSpot", xiv::exd::Language::en );
-      m_FishParameterDat = setupDatAccess( "FishParameter", xiv::exd::Language::en );
-      m_Frontline03Dat = setupDatAccess( "Frontline03", xiv::exd::Language::none );
-      m_Frontline04Dat = setupDatAccess( "Frontline04", xiv::exd::Language::none );
-      m_GardeningSeedDat = setupDatAccess( "GardeningSeed", xiv::exd::Language::none );
-      m_GatheringConditionDat = setupDatAccess( "GatheringCondition", xiv::exd::Language::en );
-      m_GatheringExpDat = setupDatAccess( "GatheringExp", xiv::exd::Language::none );
-      m_GatheringItemDat = setupDatAccess( "GatheringItem", xiv::exd::Language::none );
-      m_GatheringItemLevelConvertTableDat = setupDatAccess( "GatheringItemLevelConvertTable", xiv::exd::Language::none );
-      m_GatheringItemPointDat = setupDatAccess( "GatheringItemPoint", xiv::exd::Language::none );
-      m_GatheringLeveDat = setupDatAccess( "GatheringLeve", xiv::exd::Language::none );
-      m_GatheringLeveRouteDat = setupDatAccess( "GatheringLeveRoute", xiv::exd::Language::none );
-      m_GatheringNotebookListDat = setupDatAccess( "GatheringNotebookList", xiv::exd::Language::none );
-      m_GatheringPointDat = setupDatAccess( "GatheringPoint", xiv::exd::Language::none );
-      m_GatheringPointBaseDat = setupDatAccess( "GatheringPointBase", xiv::exd::Language::none );
-      m_GatheringPointBonusDat = setupDatAccess( "GatheringPointBonus", xiv::exd::Language::none );
-      m_GatheringPointBonusTypeDat = setupDatAccess( "GatheringPointBonusType", xiv::exd::Language::en );
-      m_GatheringPointNameDat = setupDatAccess( "GatheringPointName", xiv::exd::Language::en );
-      m_GatheringSubCategoryDat = setupDatAccess( "GatheringSubCategory", xiv::exd::Language::en );
-      m_GatheringTypeDat = setupDatAccess( "GatheringType", xiv::exd::Language::en );
-      m_GcArmyCaptureTacticsDat = setupDatAccess( "GcArmyCaptureTactics", xiv::exd::Language::none );
-      m_GcArmyExpeditionDat = setupDatAccess( "GcArmyExpedition", xiv::exd::Language::en );
-      m_GcArmyExpeditionMemberBonusDat = setupDatAccess( "GcArmyExpeditionMemberBonus", xiv::exd::Language::none );
-      m_GcArmyExpeditionTypeDat = setupDatAccess( "GcArmyExpeditionType", xiv::exd::Language::en );
-      m_GcArmyMemberGrowDat = setupDatAccess( "GcArmyMemberGrow", xiv::exd::Language::none );
-      m_GcArmyTrainingDat = setupDatAccess( "GcArmyTraining", xiv::exd::Language::en );
-      m_GCRankGridaniaFemaleTextDat = setupDatAccess( "GCRankGridaniaFemaleText", xiv::exd::Language::en );
-      m_GCRankGridaniaMaleTextDat = setupDatAccess( "GCRankGridaniaMaleText", xiv::exd::Language::en );
-      m_GCRankLimsaFemaleTextDat = setupDatAccess( "GCRankLimsaFemaleText", xiv::exd::Language::en );
-      m_GCRankLimsaMaleTextDat = setupDatAccess( "GCRankLimsaMaleText", xiv::exd::Language::en );
-      m_GCRankUldahFemaleTextDat = setupDatAccess( "GCRankUldahFemaleText", xiv::exd::Language::en );
-      m_GCRankUldahMaleTextDat = setupDatAccess( "GCRankUldahMaleText", xiv::exd::Language::en );
-      m_GCScripShopCategoryDat = setupDatAccess( "GCScripShopCategory", xiv::exd::Language::none );
-      m_GCScripShopItemDat = setupDatAccess( "GCScripShopItem", xiv::exd::Language::none );
-      m_GCShopDat = setupDatAccess( "GCShop", xiv::exd::Language::none );
-      m_GCShopItemCategoryDat = setupDatAccess( "GCShopItemCategory", xiv::exd::Language::en );
-      m_GCSupplyDutyDat = setupDatAccess( "GCSupplyDuty", xiv::exd::Language::none );
-      m_GCSupplyDutyRewardDat = setupDatAccess( "GCSupplyDutyReward", xiv::exd::Language::none );
-      m_GeneralActionDat = setupDatAccess( "GeneralAction", xiv::exd::Language::en );
-      m_GFATEDat = setupDatAccess( "GFATE", xiv::exd::Language::none );
-      m_GFateClimbing2Dat = setupDatAccess( "GFateClimbing2", xiv::exd::Language::none );
-      m_GFateClimbing2ContentDat = setupDatAccess( "GFateClimbing2Content", xiv::exd::Language::none );
-      m_GFateClimbing2TotemTypeDat = setupDatAccess( "GFateClimbing2TotemType", xiv::exd::Language::none );
-      m_GFateRideShootingDat = setupDatAccess( "GFateRideShooting", xiv::exd::Language::none );
-      m_GilShopDat = setupDatAccess( "GilShop", xiv::exd::Language::en );
-      m_GilShopItemDat = setupDatAccess( "GilShopItem", xiv::exd::Language::none );
-      m_GoldSaucerArcadeMachineDat = setupDatAccess( "GoldSaucerArcadeMachine", xiv::exd::Language::en );
-      m_GoldSaucerTextDataDat = setupDatAccess( "GoldSaucerTextData", xiv::exd::Language::en );
-      m_GrandCompanyDat = setupDatAccess( "GrandCompany", xiv::exd::Language::en );
-      m_GrandCompanyRankDat = setupDatAccess( "GrandCompanyRank", xiv::exd::Language::none );
-      m_GuardianDeityDat = setupDatAccess( "GuardianDeity", xiv::exd::Language::en );
-      m_GuildleveAssignmentDat = setupDatAccess( "GuildleveAssignment", xiv::exd::Language::none );
-      m_GuildleveAssignmentCategoryDat = setupDatAccess( "GuildleveAssignmentCategory", xiv::exd::Language::none );
-      m_GuildOrderGuideDat = setupDatAccess( "GuildOrderGuide", xiv::exd::Language::none );
-      m_GuildOrderOfficerDat = setupDatAccess( "GuildOrderOfficer", xiv::exd::Language::none );
-      m_HairMakeTypeDat = setupDatAccess( "HairMakeType", xiv::exd::Language::none );
-      m_HouseRetainerPoseDat = setupDatAccess( "HouseRetainerPose", xiv::exd::Language::none );
-      m_HousingAethernetDat = setupDatAccess( "HousingAethernet", xiv::exd::Language::none );
-      m_HousingAppealDat = setupDatAccess( "HousingAppeal", xiv::exd::Language::en );
-      m_HousingEmploymentNpcListDat = setupDatAccess( "HousingEmploymentNpcList", xiv::exd::Language::none );
-      m_HousingEmploymentNpcRaceDat = setupDatAccess( "HousingEmploymentNpcRace", xiv::exd::Language::en );
-      m_HousingExteriorDat = setupDatAccess( "HousingExterior", xiv::exd::Language::none );
-      m_HousingFurnitureDat = setupDatAccess( "HousingFurniture", xiv::exd::Language::none );
-      m_HousingLandSetDat = setupDatAccess( "HousingLandSet", xiv::exd::Language::none );
-      m_HousingMapMarkerInfoDat = setupDatAccess( "HousingMapMarkerInfo", xiv::exd::Language::none );
-      m_HousingMerchantPoseDat = setupDatAccess( "HousingMerchantPose", xiv::exd::Language::en );
-      m_HousingPlacementDat = setupDatAccess( "HousingPlacement", xiv::exd::Language::en );
-      m_HousingPresetDat = setupDatAccess( "HousingPreset", xiv::exd::Language::en );
-      m_HousingUnitedExteriorDat = setupDatAccess( "HousingUnitedExterior", xiv::exd::Language::none );
-      m_HousingYardObjectDat = setupDatAccess( "HousingYardObject", xiv::exd::Language::none );
-      m_HowToDat = setupDatAccess( "HowTo", xiv::exd::Language::en );
-      m_HowToCategoryDat = setupDatAccess( "HowToCategory", xiv::exd::Language::en );
-      m_HowToPageDat = setupDatAccess( "HowToPage", xiv::exd::Language::en );
-      m_InstanceContentDat = setupDatAccess( "InstanceContent", xiv::exd::Language::en );
-      m_InstanceContentBuffDat = setupDatAccess( "InstanceContentBuff", xiv::exd::Language::none );
-      m_InstanceContentCSBonusDat = setupDatAccess( "InstanceContentCSBonus", xiv::exd::Language::none );
-      m_InstanceContentGuideDat = setupDatAccess( "InstanceContentGuide", xiv::exd::Language::none );
-      m_InstanceContentTextDataDat = setupDatAccess( "InstanceContentTextData", xiv::exd::Language::en );
-      m_ItemDat = setupDatAccess( "Item", xiv::exd::Language::en );
-      m_ItemActionDat = setupDatAccess( "ItemAction", xiv::exd::Language::none );
-      m_ItemFoodDat = setupDatAccess( "ItemFood", xiv::exd::Language::none );
-      m_ItemLevelDat = setupDatAccess( "ItemLevel", xiv::exd::Language::none );
-      m_ItemSearchCategoryDat = setupDatAccess( "ItemSearchCategory", xiv::exd::Language::en );
-      m_ItemSeriesDat = setupDatAccess( "ItemSeries", xiv::exd::Language::en );
-      m_ItemSpecialBonusDat = setupDatAccess( "ItemSpecialBonus", xiv::exd::Language::en );
-      m_ItemUICategoryDat = setupDatAccess( "ItemUICategory", xiv::exd::Language::en );
-      m_JournalCategoryDat = setupDatAccess( "JournalCategory", xiv::exd::Language::en );
-      m_JournalGenreDat = setupDatAccess( "JournalGenre", xiv::exd::Language::en );
-      m_JournalSectionDat = setupDatAccess( "JournalSection", xiv::exd::Language::en );
-      m_LeveDat = setupDatAccess( "Leve", xiv::exd::Language::en );
-      m_LeveAssignmentTypeDat = setupDatAccess( "LeveAssignmentType", xiv::exd::Language::en );
-      m_LeveClientDat = setupDatAccess( "LeveClient", xiv::exd::Language::en );
-      m_LevelDat = setupDatAccess( "Level", xiv::exd::Language::none );
-      m_LeveRewardItemDat = setupDatAccess( "LeveRewardItem", xiv::exd::Language::none );
-      m_LeveRewardItemGroupDat = setupDatAccess( "LeveRewardItemGroup", xiv::exd::Language::none );
-      m_LeveVfxDat = setupDatAccess( "LeveVfx", xiv::exd::Language::none );
-      m_LogFilterDat = setupDatAccess( "LogFilter", xiv::exd::Language::en );
-      m_LogKindDat = setupDatAccess( "LogKind", xiv::exd::Language::en );
-      m_LogKindCategoryTextDat = setupDatAccess( "LogKindCategoryText", xiv::exd::Language::en );
-      m_LogMessageDat = setupDatAccess( "LogMessage", xiv::exd::Language::en );
-      m_LotteryExchangeShopDat = setupDatAccess( "LotteryExchangeShop", xiv::exd::Language::en );
-      m_MacroIconDat = setupDatAccess( "MacroIcon", xiv::exd::Language::none );
-      m_MacroIconRedirectOldDat = setupDatAccess( "MacroIconRedirectOld", xiv::exd::Language::none );
-      m_MainCommandDat = setupDatAccess( "MainCommand", xiv::exd::Language::en );
-      m_MainCommandCategoryDat = setupDatAccess( "MainCommandCategory", xiv::exd::Language::en );
-      m_ManeuversArmorDat = setupDatAccess( "ManeuversArmor", xiv::exd::Language::en );
-      m_MapDat = setupDatAccess( "Map", xiv::exd::Language::none );
-      m_MapMarkerDat = setupDatAccess( "MapMarker", xiv::exd::Language::none );
-      m_MapMarkerRegionDat = setupDatAccess( "MapMarkerRegion", xiv::exd::Language::none );
-      m_MapSymbolDat = setupDatAccess( "MapSymbol", xiv::exd::Language::none );
-      m_MarkerDat = setupDatAccess( "Marker", xiv::exd::Language::en );
-      m_MasterpieceSupplyDutyDat = setupDatAccess( "MasterpieceSupplyDuty", xiv::exd::Language::none );
-      m_MasterpieceSupplyMultiplierDat = setupDatAccess( "MasterpieceSupplyMultiplier", xiv::exd::Language::none );
-      m_MateriaDat = setupDatAccess( "Materia", xiv::exd::Language::none );
-      m_MiniGameRADat = setupDatAccess( "MiniGameRA", xiv::exd::Language::none );
-      m_MinionRaceDat = setupDatAccess( "MinionRace", xiv::exd::Language::en );
-      m_MinionRulesDat = setupDatAccess( "MinionRules", xiv::exd::Language::en );
-      m_MinionSkillTypeDat = setupDatAccess( "MinionSkillType", xiv::exd::Language::en );
-      m_MobHuntOrderTypeDat = setupDatAccess( "MobHuntOrderType", xiv::exd::Language::none );
-      m_MobHuntTargetDat = setupDatAccess( "MobHuntTarget", xiv::exd::Language::none );
-      m_ModelCharaDat = setupDatAccess( "ModelChara", xiv::exd::Language::none );
-      m_ModelSkeletonDat = setupDatAccess( "ModelSkeleton", xiv::exd::Language::none );
-      m_ModelStateDat = setupDatAccess( "ModelState", xiv::exd::Language::none );
-      m_MonsterNoteDat = setupDatAccess( "MonsterNote", xiv::exd::Language::en );
-      m_MonsterNoteTargetDat = setupDatAccess( "MonsterNoteTarget", xiv::exd::Language::none );
-      m_MountDat = setupDatAccess( "Mount", xiv::exd::Language::en );
-      m_MountActionDat = setupDatAccess( "MountAction", xiv::exd::Language::none );
-      m_MountCustomizeDat = setupDatAccess( "MountCustomize", xiv::exd::Language::none );
-      m_MountFlyingConditionDat = setupDatAccess( "MountFlyingCondition", xiv::exd::Language::none );
-      m_MountSpeedDat = setupDatAccess( "MountSpeed", xiv::exd::Language::none );
-      m_MountTransientDat = setupDatAccess( "MountTransient", xiv::exd::Language::en );
-      m_MoveTimelineDat = setupDatAccess( "MoveTimeline", xiv::exd::Language::none );
-      m_MoveVfxDat = setupDatAccess( "MoveVfx", xiv::exd::Language::none );
-      m_NpcEquipDat = setupDatAccess( "NpcEquip", xiv::exd::Language::none );
-      m_NpcYellDat = setupDatAccess( "NpcYell", xiv::exd::Language::en );
-      m_OmenDat = setupDatAccess( "Omen", xiv::exd::Language::none );
-      m_OnlineStatusDat = setupDatAccess( "OnlineStatus", xiv::exd::Language::en );
-      m_OpeningDat = setupDatAccess( "Opening", xiv::exd::Language::none );
-      m_OrchestrionDat = setupDatAccess( "Orchestrion", xiv::exd::Language::en );
-      m_OrchestrionCategoryDat = setupDatAccess( "OrchestrionCategory", xiv::exd::Language::en );
-      m_OrchestrionPathDat = setupDatAccess( "OrchestrionPath", xiv::exd::Language::none );
-      m_OrchestrionUiparamDat = setupDatAccess( "OrchestrionUiparam", xiv::exd::Language::none );
-      m_ParamGrowDat = setupDatAccess( "ParamGrow", xiv::exd::Language::none );
-      m_PartyContentDat = setupDatAccess( "PartyContent", xiv::exd::Language::en );
-      m_PartyContentCutsceneDat = setupDatAccess( "PartyContentCutscene", xiv::exd::Language::none );
-      m_PartyContentTextDataDat = setupDatAccess( "PartyContentTextData", xiv::exd::Language::en );
-      m_PerformDat = setupDatAccess( "Perform", xiv::exd::Language::en );
-      m_PerformTransientDat = setupDatAccess( "PerformTransient", xiv::exd::Language::en );
-      m_PetDat = setupDatAccess( "Pet", xiv::exd::Language::en );
-      m_PetActionDat = setupDatAccess( "PetAction", xiv::exd::Language::en );
-      m_PictureDat = setupDatAccess( "Picture", xiv::exd::Language::none );
-      m_PlaceNameDat = setupDatAccess( "PlaceName", xiv::exd::Language::en );
-      m_PlantPotFlowerSeedDat = setupDatAccess( "PlantPotFlowerSeed", xiv::exd::Language::none );
-      m_PreHandlerDat = setupDatAccess( "PreHandler", xiv::exd::Language::none );
-      m_PublicContentDat = setupDatAccess( "PublicContent", xiv::exd::Language::en );
-      m_PublicContentCutsceneDat = setupDatAccess( "PublicContentCutscene", xiv::exd::Language::none );
-      m_PublicContentTextDataDat = setupDatAccess( "PublicContentTextData", xiv::exd::Language::en );
-      m_PvPActionDat = setupDatAccess( "PvPAction", xiv::exd::Language::none );
-      m_PvPActionSortDat = setupDatAccess( "PvPActionSort", xiv::exd::Language::none );
-      m_PvPRankDat = setupDatAccess( "PvPRank", xiv::exd::Language::none );
-      m_PvPSelectTraitDat = setupDatAccess( "PvPSelectTrait", xiv::exd::Language::en );
-      m_PvPTraitDat = setupDatAccess( "PvPTrait", xiv::exd::Language::none );
-      m_QuestDat = setupDatAccess( "Quest", xiv::exd::Language::en );
-      m_QuestBattleDat = setupDatAccess( "QuestBattle", xiv::exd::Language::none );
-      m_QuestClassJobRewardDat = setupDatAccess( "QuestClassJobReward", xiv::exd::Language::none );
-      m_QuestClassJobSupplyDat = setupDatAccess( "QuestClassJobSupply", xiv::exd::Language::none );
-      m_QuestRepeatFlagDat = setupDatAccess( "QuestRepeatFlag", xiv::exd::Language::none );
-      m_QuestRewardOtherDat = setupDatAccess( "QuestRewardOther", xiv::exd::Language::en );
-      m_QuickChatDat = setupDatAccess( "QuickChat", xiv::exd::Language::en );
-      m_QuickChatTransientDat = setupDatAccess( "QuickChatTransient", xiv::exd::Language::en );
-      m_RaceDat = setupDatAccess( "Race", xiv::exd::Language::en );
-      m_RacingChocoboItemDat = setupDatAccess( "RacingChocoboItem", xiv::exd::Language::none );
-      m_RacingChocoboNameDat = setupDatAccess( "RacingChocoboName", xiv::exd::Language::en );
-      m_RacingChocoboNameCategoryDat = setupDatAccess( "RacingChocoboNameCategory", xiv::exd::Language::en );
-      m_RacingChocoboNameInfoDat = setupDatAccess( "RacingChocoboNameInfo", xiv::exd::Language::none );
-      m_RacingChocoboParamDat = setupDatAccess( "RacingChocoboParam", xiv::exd::Language::en );
-      m_RecastNavimeshDat = setupDatAccess( "RecastNavimesh", xiv::exd::Language::none );
-      m_RecipeDat = setupDatAccess( "Recipe", xiv::exd::Language::none );
-      m_RecipeElementDat = setupDatAccess( "RecipeElement", xiv::exd::Language::en );
-      m_RecipeLevelTableDat = setupDatAccess( "RecipeLevelTable", xiv::exd::Language::none );
-      m_RecipeNotebookListDat = setupDatAccess( "RecipeNotebookList", xiv::exd::Language::none );
-      m_RecommendContentsDat = setupDatAccess( "RecommendContents", xiv::exd::Language::none );
-      m_RelicDat = setupDatAccess( "Relic", xiv::exd::Language::none );
-      m_Relic3Dat = setupDatAccess( "Relic3", xiv::exd::Language::none );
-      m_RelicItemDat = setupDatAccess( "RelicItem", xiv::exd::Language::none );
-      m_RelicNoteDat = setupDatAccess( "RelicNote", xiv::exd::Language::none );
-      m_RelicNoteCategoryDat = setupDatAccess( "RelicNoteCategory", xiv::exd::Language::en );
-      m_ResidentDat = setupDatAccess( "Resident", xiv::exd::Language::none );
-      m_RetainerTaskDat = setupDatAccess( "RetainerTask", xiv::exd::Language::none );
-      m_RetainerTaskLvRangeDat = setupDatAccess( "RetainerTaskLvRange", xiv::exd::Language::none );
-      m_RetainerTaskNormalDat = setupDatAccess( "RetainerTaskNormal", xiv::exd::Language::none );
-      m_RetainerTaskParameterDat = setupDatAccess( "RetainerTaskParameter", xiv::exd::Language::none );
-      m_RetainerTaskRandomDat = setupDatAccess( "RetainerTaskRandom", xiv::exd::Language::en );
-      m_RPParameterDat = setupDatAccess( "RPParameter", xiv::exd::Language::none );
-      m_SalvageDat = setupDatAccess( "Salvage", xiv::exd::Language::none );
-      m_SatisfactionNpcDat = setupDatAccess( "SatisfactionNpc", xiv::exd::Language::none );
-      m_SatisfactionSupplyDat = setupDatAccess( "SatisfactionSupply", xiv::exd::Language::none );
-      m_SatisfactionSupplyRewardDat = setupDatAccess( "SatisfactionSupplyReward", xiv::exd::Language::none );
-      m_ScenarioTreeDat = setupDatAccess( "ScenarioTree", xiv::exd::Language::none );
-      m_ScenarioTreeTipsDat = setupDatAccess( "ScenarioTreeTips", xiv::exd::Language::none );
-      m_ScenarioTreeTipsClassQuestDat = setupDatAccess( "ScenarioTreeTipsClassQuest", xiv::exd::Language::none );
-      m_ScenarioTreeTipsQuestDat = setupDatAccess( "ScenarioTreeTipsQuest", xiv::exd::Language::none );
-      m_ScenarioTypeDat = setupDatAccess( "ScenarioType", xiv::exd::Language::en );
-      m_ScreenImageDat = setupDatAccess( "ScreenImage", xiv::exd::Language::none );
-      m_SecretRecipeBookDat = setupDatAccess( "SecretRecipeBook", xiv::exd::Language::en );
-      m_SkyIsland2MissionDat = setupDatAccess( "SkyIsland2Mission", xiv::exd::Language::en );
-      m_SkyIsland2MissionDetailDat = setupDatAccess( "SkyIsland2MissionDetail", xiv::exd::Language::en );
-      m_SkyIsland2MissionTypeDat = setupDatAccess( "SkyIsland2MissionType", xiv::exd::Language::none );
-      m_SkyIsland2RangeTypeDat = setupDatAccess( "SkyIsland2RangeType", xiv::exd::Language::none );
-      m_SpearfishingItemDat = setupDatAccess( "SpearfishingItem", xiv::exd::Language::en );
-      m_SpearfishingNotebookDat = setupDatAccess( "SpearfishingNotebook", xiv::exd::Language::none );
-      m_SpearfishingRecordPageDat = setupDatAccess( "SpearfishingRecordPage", xiv::exd::Language::none );
-      m_SpecialShopDat = setupDatAccess( "SpecialShop", xiv::exd::Language::en );
-      m_SpecialShopItemCategoryDat = setupDatAccess( "SpecialShopItemCategory", xiv::exd::Language::en );
-      m_StainDat = setupDatAccess( "Stain", xiv::exd::Language::en );
-      m_StainTransientDat = setupDatAccess( "StainTransient", xiv::exd::Language::none );
-      m_StatusDat = setupDatAccess( "Status", xiv::exd::Language::en );
-      m_StatusHitEffectDat = setupDatAccess( "StatusHitEffect", xiv::exd::Language::none );
-      m_StatusLoopVFXDat = setupDatAccess( "StatusLoopVFX", xiv::exd::Language::none );
-      m_StoryDat = setupDatAccess( "Story", xiv::exd::Language::none );
-      m_SubmarineExplorationDat = setupDatAccess( "SubmarineExploration", xiv::exd::Language::en );
-      m_SubmarinePartDat = setupDatAccess( "SubmarinePart", xiv::exd::Language::none );
-      m_SubmarineRankDat = setupDatAccess( "SubmarineRank", xiv::exd::Language::none );
-      m_SwitchTalkDat = setupDatAccess( "SwitchTalk", xiv::exd::Language::none );
-      m_TerritoryTypeDat = setupDatAccess( "TerritoryType", xiv::exd::Language::none );
-      m_TextCommandDat = setupDatAccess( "TextCommand", xiv::exd::Language::en );
-      m_TitleDat = setupDatAccess( "Title", xiv::exd::Language::en );
-      m_TomestonesDat = setupDatAccess( "Tomestones", xiv::exd::Language::none );
-      m_TomestonesItemDat = setupDatAccess( "TomestonesItem", xiv::exd::Language::none );
-      m_TopicSelectDat = setupDatAccess( "TopicSelect", xiv::exd::Language::en );
-      m_TownDat = setupDatAccess( "Town", xiv::exd::Language::en );
-      m_TraitDat = setupDatAccess( "Trait", xiv::exd::Language::en );
-      m_TraitRecastDat = setupDatAccess( "TraitRecast", xiv::exd::Language::none );
-      m_TraitTransientDat = setupDatAccess( "TraitTransient", xiv::exd::Language::en );
-      m_TransformationDat = setupDatAccess( "Transformation", xiv::exd::Language::none );
-      m_TreasureDat = setupDatAccess( "Treasure", xiv::exd::Language::en );
-      m_TreasureHuntRankDat = setupDatAccess( "TreasureHuntRank", xiv::exd::Language::none );
-      m_TribeDat = setupDatAccess( "Tribe", xiv::exd::Language::en );
-      m_TripleTriadDat = setupDatAccess( "TripleTriad", xiv::exd::Language::none );
-      m_TripleTriadCardDat = setupDatAccess( "TripleTriadCard", xiv::exd::Language::en );
-      m_TripleTriadCardRarityDat = setupDatAccess( "TripleTriadCardRarity", xiv::exd::Language::none );
-      m_TripleTriadCardResidentDat = setupDatAccess( "TripleTriadCardResident", xiv::exd::Language::none );
-      m_TripleTriadCardTypeDat = setupDatAccess( "TripleTriadCardType", xiv::exd::Language::en );
-      m_TripleTriadCompetitionDat = setupDatAccess( "TripleTriadCompetition", xiv::exd::Language::en );
-      m_TripleTriadRuleDat = setupDatAccess( "TripleTriadRule", xiv::exd::Language::en );
-      m_TutorialDat = setupDatAccess( "Tutorial", xiv::exd::Language::none );
-      m_TutorialDPSDat = setupDatAccess( "TutorialDPS", xiv::exd::Language::none );
-      m_TutorialHealerDat = setupDatAccess( "TutorialHealer", xiv::exd::Language::none );
-      m_TutorialTankDat = setupDatAccess( "TutorialTank", xiv::exd::Language::none );
-      m_UIColorDat = setupDatAccess( "UIColor", xiv::exd::Language::none );
-      m_VaseFlowerDat = setupDatAccess( "VaseFlower", xiv::exd::Language::none );
-      m_VFXDat = setupDatAccess( "VFX", xiv::exd::Language::none );
-      m_WarpDat = setupDatAccess( "Warp", xiv::exd::Language::en );
-      m_WarpConditionDat = setupDatAccess( "WarpCondition", xiv::exd::Language::none );
-      m_WarpLogicDat = setupDatAccess( "WarpLogic", xiv::exd::Language::en );
-      m_WeatherDat = setupDatAccess( "Weather", xiv::exd::Language::en );
-      m_WeatherGroupDat = setupDatAccess( "WeatherGroup", xiv::exd::Language::none );
-      m_WeatherRateDat = setupDatAccess( "WeatherRate", xiv::exd::Language::none );
-      m_WeatherReportReplaceDat = setupDatAccess( "WeatherReportReplace", xiv::exd::Language::none );
-      m_WeddingBGMDat = setupDatAccess( "WeddingBGM", xiv::exd::Language::en );
-      m_WeeklyBingoOrderDataDat = setupDatAccess( "WeeklyBingoOrderData", xiv::exd::Language::none );
-      m_WeeklyBingoRewardDataDat = setupDatAccess( "WeeklyBingoRewardData", xiv::exd::Language::none );
-      m_WeeklyBingoTextDat = setupDatAccess( "WeeklyBingoText", xiv::exd::Language::en );
-      m_WeeklyLotBonusDat = setupDatAccess( "WeeklyLotBonus", xiv::exd::Language::none );
-      m_WorldDat = setupDatAccess( "World", xiv::exd::Language::none );
-      m_WorldDCGroupTypeDat = setupDatAccess( "WorldDCGroupType", xiv::exd::Language::none );
-      m_YKWDat = setupDatAccess( "YKW", xiv::exd::Language::en );
-      m_ZoneSharedGroupDat = setupDatAccess( "ZoneSharedGroup", xiv::exd::Language::none );
+    m_AchievementDat = setupDatAccess( "Achievement", xiv::exd::Language::en );
+    m_AchievementCategoryDat = setupDatAccess( "AchievementCategory", xiv::exd::Language::en );
+    m_AchievementKindDat = setupDatAccess( "AchievementKind", xiv::exd::Language::en );
+    m_ActionDat = setupDatAccess( "Action", xiv::exd::Language::en );
+    m_ActionCastTimelineDat = setupDatAccess( "ActionCastTimeline", xiv::exd::Language::none );
+    m_ActionCastVFXDat = setupDatAccess( "ActionCastVFX", xiv::exd::Language::none );
+    m_ActionCategoryDat = setupDatAccess( "ActionCategory", xiv::exd::Language::en );
+    m_ActionComboRouteDat = setupDatAccess( "ActionComboRoute", xiv::exd::Language::en );
+    m_ActionIndirectionDat = setupDatAccess( "ActionIndirection", xiv::exd::Language::none );
+    m_ActionParamDat = setupDatAccess( "ActionParam", xiv::exd::Language::none );
+    m_ActionProcStatusDat = setupDatAccess( "ActionProcStatus", xiv::exd::Language::none );
+    m_ActionTimelineDat = setupDatAccess( "ActionTimeline", xiv::exd::Language::none );
+    m_ActionTimelineMoveDat = setupDatAccess( "ActionTimelineMove", xiv::exd::Language::none );
+    m_ActionTimelineReplaceDat = setupDatAccess( "ActionTimelineReplace", xiv::exd::Language::none );
+    m_ActionTransientDat = setupDatAccess( "ActionTransient", xiv::exd::Language::en );
+    m_ActivityFeedButtonsDat = setupDatAccess( "ActivityFeedButtons", xiv::exd::Language::none );
+    m_ActivityFeedCaptionsDat = setupDatAccess( "ActivityFeedCaptions", xiv::exd::Language::none );
+    m_ActivityFeedGroupCaptionsDat = setupDatAccess( "ActivityFeedGroupCaptions", xiv::exd::Language::none );
+    m_ActivityFeedImagesDat = setupDatAccess( "ActivityFeedImages", xiv::exd::Language::none );
+    m_AddonDat = setupDatAccess( "Addon", xiv::exd::Language::en );
+    m_AddonHudDat = setupDatAccess( "AddonHud", xiv::exd::Language::en );
+    m_AdventureDat = setupDatAccess( "Adventure", xiv::exd::Language::en );
+    m_AdventureExPhaseDat = setupDatAccess( "AdventureExPhase", xiv::exd::Language::none );
+    m_AetherCurrentDat = setupDatAccess( "AetherCurrent", xiv::exd::Language::none );
+    m_AetherCurrentCompFlgSetDat = setupDatAccess( "AetherCurrentCompFlgSet", xiv::exd::Language::none );
+    m_AetherialWheelDat = setupDatAccess( "AetherialWheel", xiv::exd::Language::none );
+    m_AetheryteDat = setupDatAccess( "Aetheryte", xiv::exd::Language::en );
+    m_AetheryteSystemDefineDat = setupDatAccess( "AetheryteSystemDefine", xiv::exd::Language::none );
+    m_AirshipExplorationLevelDat = setupDatAccess( "AirshipExplorationLevel", xiv::exd::Language::none );
+    m_AirshipExplorationLogDat = setupDatAccess( "AirshipExplorationLog", xiv::exd::Language::en );
+    m_AirshipExplorationParamTypeDat = setupDatAccess( "AirshipExplorationParamType", xiv::exd::Language::en );
+    m_AirshipExplorationPartDat = setupDatAccess( "AirshipExplorationPart", xiv::exd::Language::none );
+    m_AirshipExplorationPointDat = setupDatAccess( "AirshipExplorationPoint", xiv::exd::Language::en );
+    m_AnimaWeapon5Dat = setupDatAccess( "AnimaWeapon5", xiv::exd::Language::none );
+    m_AnimaWeapon5ParamDat = setupDatAccess( "AnimaWeapon5Param", xiv::exd::Language::en );
+    m_AnimaWeapon5PatternGroupDat = setupDatAccess( "AnimaWeapon5PatternGroup", xiv::exd::Language::en );
+    m_AnimaWeapon5SpiritTalkDat = setupDatAccess( "AnimaWeapon5SpiritTalk", xiv::exd::Language::none );
+    m_AnimaWeapon5SpiritTalkParamDat = setupDatAccess( "AnimaWeapon5SpiritTalkParam", xiv::exd::Language::en );
+    m_AnimaWeapon5TradeItemDat = setupDatAccess( "AnimaWeapon5TradeItem", xiv::exd::Language::none );
+    m_AnimaWeaponFUITalkDat = setupDatAccess( "AnimaWeaponFUITalk", xiv::exd::Language::none );
+    m_AnimaWeaponFUITalkParamDat = setupDatAccess( "AnimaWeaponFUITalkParam", xiv::exd::Language::en );
+    m_AnimaWeaponIconDat = setupDatAccess( "AnimaWeaponIcon", xiv::exd::Language::none );
+    m_AnimaWeaponItemDat = setupDatAccess( "AnimaWeaponItem", xiv::exd::Language::none );
+    m_AozActionDat = setupDatAccess( "AozAction", xiv::exd::Language::none );
+    m_AozActionTransientDat = setupDatAccess( "AozActionTransient", xiv::exd::Language::en );
+    m_AOZArrangementDat = setupDatAccess( "AOZArrangement", xiv::exd::Language::none );
+    m_AOZBossDat = setupDatAccess( "AOZBoss", xiv::exd::Language::none );
+    m_AOZContentDat = setupDatAccess( "AOZContent", xiv::exd::Language::none );
+    m_AOZContentBriefingBNpcDat = setupDatAccess( "AOZContentBriefingBNpc", xiv::exd::Language::none );
+    m_AquariumFishDat = setupDatAccess( "AquariumFish", xiv::exd::Language::none );
+    m_AquariumWaterDat = setupDatAccess( "AquariumWater", xiv::exd::Language::en );
+    m_ArrayEventHandlerDat = setupDatAccess( "ArrayEventHandler", xiv::exd::Language::none );
+    m_AttackTypeDat = setupDatAccess( "AttackType", xiv::exd::Language::en );
+    m_BacklightColorDat = setupDatAccess( "BacklightColor", xiv::exd::Language::none );
+    m_BalloonDat = setupDatAccess( "Balloon", xiv::exd::Language::en );
+    m_BaseParamDat = setupDatAccess( "BaseParam", xiv::exd::Language::en );
+    m_BattleLeveDat = setupDatAccess( "BattleLeve", xiv::exd::Language::none );
+    m_BeastRankBonusDat = setupDatAccess( "BeastRankBonus", xiv::exd::Language::none );
+    m_BeastReputationRankDat = setupDatAccess( "BeastReputationRank", xiv::exd::Language::en );
+    m_BeastTribeDat = setupDatAccess( "BeastTribe", xiv::exd::Language::en );
+    m_BehaviorDat = setupDatAccess( "Behavior", xiv::exd::Language::none );
+    m_BGMDat = setupDatAccess( "BGM", xiv::exd::Language::none );
+    m_BGMFadeDat = setupDatAccess( "BGMFade", xiv::exd::Language::none );
+    m_BGMSituationDat = setupDatAccess( "BGMSituation", xiv::exd::Language::none );
+    m_BGMSwitchDat = setupDatAccess( "BGMSwitch", xiv::exd::Language::none );
+    m_BGMSystemDefineDat = setupDatAccess( "BGMSystemDefine", xiv::exd::Language::none );
+    m_BNpcAnnounceIconDat = setupDatAccess( "BNpcAnnounceIcon", xiv::exd::Language::none );
+    m_BNpcBaseDat = setupDatAccess( "BNpcBase", xiv::exd::Language::none );
+    m_BNpcCustomizeDat = setupDatAccess( "BNpcCustomize", xiv::exd::Language::none );
+    m_BNpcNameDat = setupDatAccess( "BNpcName", xiv::exd::Language::en );
+    m_BNpcPartsDat = setupDatAccess( "BNpcParts", xiv::exd::Language::none );
+    m_BuddyDat = setupDatAccess( "Buddy", xiv::exd::Language::none );
+    m_BuddyActionDat = setupDatAccess( "BuddyAction", xiv::exd::Language::en );
+    m_BuddyEquipDat = setupDatAccess( "BuddyEquip", xiv::exd::Language::en );
+    m_BuddyItemDat = setupDatAccess( "BuddyItem", xiv::exd::Language::none );
+    m_BuddyRankDat = setupDatAccess( "BuddyRank", xiv::exd::Language::none );
+    m_BuddySkillDat = setupDatAccess( "BuddySkill", xiv::exd::Language::none );
+    m_CabinetDat = setupDatAccess( "Cabinet", xiv::exd::Language::none );
+    m_CabinetCategoryDat = setupDatAccess( "CabinetCategory", xiv::exd::Language::none );
+    m_CalendarDat = setupDatAccess( "Calendar", xiv::exd::Language::none );
+    m_CharaMakeCustomizeDat = setupDatAccess( "CharaMakeCustomize", xiv::exd::Language::none );
+    m_CharaMakeTypeDat = setupDatAccess( "CharaMakeType", xiv::exd::Language::en );
+    m_ChocoboRaceDat = setupDatAccess( "ChocoboRace", xiv::exd::Language::none );
+    m_ChocoboRaceAbilityDat = setupDatAccess( "ChocoboRaceAbility", xiv::exd::Language::en );
+    m_ChocoboRaceAbilityTypeDat = setupDatAccess( "ChocoboRaceAbilityType", xiv::exd::Language::none );
+    m_ChocoboRaceItemDat = setupDatAccess( "ChocoboRaceItem", xiv::exd::Language::en );
+    m_ChocoboRaceRankDat = setupDatAccess( "ChocoboRaceRank", xiv::exd::Language::none );
+    m_ChocoboRaceStatusDat = setupDatAccess( "ChocoboRaceStatus", xiv::exd::Language::none );
+    m_ChocoboRaceTerritoryDat = setupDatAccess( "ChocoboRaceTerritory", xiv::exd::Language::none );
+    m_ChocoboRaceTutorialDat = setupDatAccess( "ChocoboRaceTutorial", xiv::exd::Language::none );
+    m_ChocoboRaceWeatherDat = setupDatAccess( "ChocoboRaceWeather", xiv::exd::Language::none );
+    m_ChocoboTaxiDat = setupDatAccess( "ChocoboTaxi", xiv::exd::Language::none );
+    m_ChocoboTaxiStandDat = setupDatAccess( "ChocoboTaxiStand", xiv::exd::Language::en );
+    m_ClassJobDat = setupDatAccess( "ClassJob", xiv::exd::Language::en );
+    m_ClassJobCategoryDat = setupDatAccess( "ClassJobCategory", xiv::exd::Language::en );
+    m_CompanionDat = setupDatAccess( "Companion", xiv::exd::Language::en );
+    m_CompanionMoveDat = setupDatAccess( "CompanionMove", xiv::exd::Language::en );
+    m_CompanionTransientDat = setupDatAccess( "CompanionTransient", xiv::exd::Language::en );
+    m_CompanyActionDat = setupDatAccess( "CompanyAction", xiv::exd::Language::en );
+    m_CompanyCraftDraftDat = setupDatAccess( "CompanyCraftDraft", xiv::exd::Language::en );
+    m_CompanyCraftDraftCategoryDat = setupDatAccess( "CompanyCraftDraftCategory", xiv::exd::Language::en );
+    m_CompanyCraftManufactoryStateDat = setupDatAccess( "CompanyCraftManufactoryState", xiv::exd::Language::en );
+    m_CompanyCraftPartDat = setupDatAccess( "CompanyCraftPart", xiv::exd::Language::none );
+    m_CompanyCraftProcessDat = setupDatAccess( "CompanyCraftProcess", xiv::exd::Language::none );
+    m_CompanyCraftSequenceDat = setupDatAccess( "CompanyCraftSequence", xiv::exd::Language::none );
+    m_CompanyCraftSupplyItemDat = setupDatAccess( "CompanyCraftSupplyItem", xiv::exd::Language::none );
+    m_CompanyCraftTypeDat = setupDatAccess( "CompanyCraftType", xiv::exd::Language::en );
+    m_CompanyLeveDat = setupDatAccess( "CompanyLeve", xiv::exd::Language::none );
+    m_CompanyLeveRuleDat = setupDatAccess( "CompanyLeveRule", xiv::exd::Language::none );
+    m_CompleteJournalDat = setupDatAccess( "CompleteJournal", xiv::exd::Language::en );
+    m_CompleteJournalCategoryDat = setupDatAccess( "CompleteJournalCategory", xiv::exd::Language::none );
+    m_ContentCloseCycleDat = setupDatAccess( "ContentCloseCycle", xiv::exd::Language::none );
+    m_ContentExActionDat = setupDatAccess( "ContentExAction", xiv::exd::Language::none );
+    m_ContentFinderConditionDat = setupDatAccess( "ContentFinderCondition", xiv::exd::Language::en );
+    m_ContentFinderConditionTransientDat = setupDatAccess( "ContentFinderConditionTransient", xiv::exd::Language::en );
+    m_ContentGaugeDat = setupDatAccess( "ContentGauge", xiv::exd::Language::en );
+    m_ContentGaugeColorDat = setupDatAccess( "ContentGaugeColor", xiv::exd::Language::none );
+    m_ContentMemberTypeDat = setupDatAccess( "ContentMemberType", xiv::exd::Language::none );
+    m_ContentNpcTalkDat = setupDatAccess( "ContentNpcTalk", xiv::exd::Language::none );
+    m_ContentRouletteDat = setupDatAccess( "ContentRoulette", xiv::exd::Language::en );
+    m_ContentRouletteOpenRuleDat = setupDatAccess( "ContentRouletteOpenRule", xiv::exd::Language::none );
+    m_ContentRouletteRoleBonusDat = setupDatAccess( "ContentRouletteRoleBonus", xiv::exd::Language::none );
+    m_ContentsNoteDat = setupDatAccess( "ContentsNote", xiv::exd::Language::en );
+    m_ContentTalkDat = setupDatAccess( "ContentTalk", xiv::exd::Language::en );
+    m_ContentTalkParamDat = setupDatAccess( "ContentTalkParam", xiv::exd::Language::none );
+    m_ContentTypeDat = setupDatAccess( "ContentType", xiv::exd::Language::en );
+    m_CraftActionDat = setupDatAccess( "CraftAction", xiv::exd::Language::en );
+    m_CraftLeveDat = setupDatAccess( "CraftLeve", xiv::exd::Language::none );
+    m_CraftTypeDat = setupDatAccess( "CraftType", xiv::exd::Language::en );
+    m_CreditDat = setupDatAccess( "Credit", xiv::exd::Language::none );
+    m_CreditBackImageDat = setupDatAccess( "CreditBackImage", xiv::exd::Language::none );
+    m_CreditCastDat = setupDatAccess( "CreditCast", xiv::exd::Language::en );
+    m_CreditListDat = setupDatAccess( "CreditList", xiv::exd::Language::none );
+    m_CreditListTextDat = setupDatAccess( "CreditListText", xiv::exd::Language::en );
+    m_CurrencyDat = setupDatAccess( "Currency", xiv::exd::Language::none );
+    m_CustomTalkDat = setupDatAccess( "CustomTalk", xiv::exd::Language::en );
+    m_CustomTalkDynamicIconDat = setupDatAccess( "CustomTalkDynamicIcon", xiv::exd::Language::none );
+    m_CustomTalkNestHandlersDat = setupDatAccess( "CustomTalkNestHandlers", xiv::exd::Language::none );
+    m_CutsceneDat = setupDatAccess( "Cutscene", xiv::exd::Language::none );
+    m_CutScreenImageDat = setupDatAccess( "CutScreenImage", xiv::exd::Language::none );
+    m_DailySupplyItemDat = setupDatAccess( "DailySupplyItem", xiv::exd::Language::none );
+    m_DeepDungeonDat = setupDatAccess( "DeepDungeon", xiv::exd::Language::en );
+    m_DeepDungeonBanDat = setupDatAccess( "DeepDungeonBan", xiv::exd::Language::none );
+    m_DeepDungeonDangerDat = setupDatAccess( "DeepDungeonDanger", xiv::exd::Language::none );
+    m_DeepDungeonEquipmentDat = setupDatAccess( "DeepDungeonEquipment", xiv::exd::Language::en );
+    m_DeepDungeonFloorEffectUIDat = setupDatAccess( "DeepDungeonFloorEffectUI", xiv::exd::Language::en );
+    m_DeepDungeonItemDat = setupDatAccess( "DeepDungeonItem", xiv::exd::Language::en );
+    m_DeepDungeonLayerDat = setupDatAccess( "DeepDungeonLayer", xiv::exd::Language::none );
+    m_DeepDungeonMagicStoneDat = setupDatAccess( "DeepDungeonMagicStone", xiv::exd::Language::en );
+    m_DeepDungeonMap5XDat = setupDatAccess( "DeepDungeonMap5X", xiv::exd::Language::none );
+    m_DeepDungeonRoomDat = setupDatAccess( "DeepDungeonRoom", xiv::exd::Language::none );
+    m_DeepDungeonStatusDat = setupDatAccess( "DeepDungeonStatus", xiv::exd::Language::none );
+    m_DefaultTalkDat = setupDatAccess( "DefaultTalk", xiv::exd::Language::en );
+    m_DefaultTalkLipSyncTypeDat = setupDatAccess( "DefaultTalkLipSyncType", xiv::exd::Language::none );
+    m_DeliveryQuestDat = setupDatAccess( "DeliveryQuest", xiv::exd::Language::none );
+    m_DescriptionPageDat = setupDatAccess( "DescriptionPage", xiv::exd::Language::none );
+    m_DescriptionStringDat = setupDatAccess( "DescriptionString", xiv::exd::Language::en );
+    m_DisposalShopDat = setupDatAccess( "DisposalShop", xiv::exd::Language::en );
+    m_DisposalShopFilterTypeDat = setupDatAccess( "DisposalShopFilterType", xiv::exd::Language::en );
+    m_DisposalShopItemDat = setupDatAccess( "DisposalShopItem", xiv::exd::Language::none );
+    m_DpsChallengeDat = setupDatAccess( "DpsChallenge", xiv::exd::Language::en );
+    m_DpsChallengeOfficerDat = setupDatAccess( "DpsChallengeOfficer", xiv::exd::Language::none );
+    m_DpsChallengeTransientDat = setupDatAccess( "DpsChallengeTransient", xiv::exd::Language::none );
+    m_EmjAddonDat = setupDatAccess( "EmjAddon", xiv::exd::Language::en );
+    m_EmjDaniDat = setupDatAccess( "EmjDani", xiv::exd::Language::none );
+    m_EmoteDat = setupDatAccess( "Emote", xiv::exd::Language::en );
+    m_EmoteCategoryDat = setupDatAccess( "EmoteCategory", xiv::exd::Language::en );
+    m_ENpcBaseDat = setupDatAccess( "ENpcBase", xiv::exd::Language::none );
+    m_ENpcDressUpDat = setupDatAccess( "ENpcDressUp", xiv::exd::Language::none );
+    m_ENpcDressUpDressDat = setupDatAccess( "ENpcDressUpDress", xiv::exd::Language::none );
+    m_ENpcResidentDat = setupDatAccess( "ENpcResident", xiv::exd::Language::en );
+    m_EObjDat = setupDatAccess( "EObj", xiv::exd::Language::none );
+    m_EObjNameDat = setupDatAccess( "EObjName", xiv::exd::Language::en );
+    m_EquipRaceCategoryDat = setupDatAccess( "EquipRaceCategory", xiv::exd::Language::none );
+    m_EquipSlotCategoryDat = setupDatAccess( "EquipSlotCategory", xiv::exd::Language::none );
+    m_EurekaAetherItemDat = setupDatAccess( "EurekaAetherItem", xiv::exd::Language::en );
+    m_EurekaAethernetDat = setupDatAccess( "EurekaAethernet", xiv::exd::Language::none );
+    m_EurekaGrowDataDat = setupDatAccess( "EurekaGrowData", xiv::exd::Language::none );
+    m_EurekaLogosMixerProbabilityDat = setupDatAccess( "EurekaLogosMixerProbability", xiv::exd::Language::none );
+    m_EurekaMagiaActionDat = setupDatAccess( "EurekaMagiaAction", xiv::exd::Language::none );
+    m_EurekaMagiciteItemDat = setupDatAccess( "EurekaMagiciteItem", xiv::exd::Language::none );
+    m_EurekaMagiciteItemTypeDat = setupDatAccess( "EurekaMagiciteItemType", xiv::exd::Language::en );
+    m_EurekaSphereElementAdjustDat = setupDatAccess( "EurekaSphereElementAdjust", xiv::exd::Language::none );
+    m_EventActionDat = setupDatAccess( "EventAction", xiv::exd::Language::en );
+    m_EventIconPriorityDat = setupDatAccess( "EventIconPriority", xiv::exd::Language::none );
+    m_EventIconTypeDat = setupDatAccess( "EventIconType", xiv::exd::Language::none );
+    m_EventItemDat = setupDatAccess( "EventItem", xiv::exd::Language::en );
+    m_EventItemCastTimelineDat = setupDatAccess( "EventItemCastTimeline", xiv::exd::Language::none );
+    m_EventItemHelpDat = setupDatAccess( "EventItemHelp", xiv::exd::Language::en );
+    m_EventItemTimelineDat = setupDatAccess( "EventItemTimeline", xiv::exd::Language::none );
+    m_ExportedSGDat = setupDatAccess( "ExportedSG", xiv::exd::Language::none );
+    m_ExVersionDat = setupDatAccess( "ExVersion", xiv::exd::Language::en );
+    m_FateDat = setupDatAccess( "Fate", xiv::exd::Language::en );
+    m_FCActivityDat = setupDatAccess( "FCActivity", xiv::exd::Language::en );
+    m_FCActivityCategoryDat = setupDatAccess( "FCActivityCategory", xiv::exd::Language::en );
+    m_FCAuthorityDat = setupDatAccess( "FCAuthority", xiv::exd::Language::en );
+    m_FCAuthorityCategoryDat = setupDatAccess( "FCAuthorityCategory", xiv::exd::Language::en );
+    m_FCChestNameDat = setupDatAccess( "FCChestName", xiv::exd::Language::en );
+    m_FccShopDat = setupDatAccess( "FccShop", xiv::exd::Language::en );
+    m_FCHierarchyDat = setupDatAccess( "FCHierarchy", xiv::exd::Language::en );
+    m_FCProfileDat = setupDatAccess( "FCProfile", xiv::exd::Language::en );
+    m_FCReputationDat = setupDatAccess( "FCReputation", xiv::exd::Language::en );
+    m_FCRightsDat = setupDatAccess( "FCRights", xiv::exd::Language::en );
+    m_FestivalDat = setupDatAccess( "Festival", xiv::exd::Language::none );
+    m_FieldMarkerDat = setupDatAccess( "FieldMarker", xiv::exd::Language::en );
+    m_FishingRecordTypeDat = setupDatAccess( "FishingRecordType", xiv::exd::Language::none );
+    m_FishingRecordTypeTransientDat = setupDatAccess( "FishingRecordTypeTransient", xiv::exd::Language::none );
+    m_FishingSpotDat = setupDatAccess( "FishingSpot", xiv::exd::Language::en );
+    m_FishParameterDat = setupDatAccess( "FishParameter", xiv::exd::Language::en );
+    m_Frontline03Dat = setupDatAccess( "Frontline03", xiv::exd::Language::none );
+    m_Frontline04Dat = setupDatAccess( "Frontline04", xiv::exd::Language::none );
+    m_GardeningSeedDat = setupDatAccess( "GardeningSeed", xiv::exd::Language::none );
+    m_GatheringConditionDat = setupDatAccess( "GatheringCondition", xiv::exd::Language::en );
+    m_GatheringExpDat = setupDatAccess( "GatheringExp", xiv::exd::Language::none );
+    m_GatheringItemDat = setupDatAccess( "GatheringItem", xiv::exd::Language::none );
+    m_GatheringItemLevelConvertTableDat = setupDatAccess( "GatheringItemLevelConvertTable", xiv::exd::Language::none );
+    m_GatheringItemPointDat = setupDatAccess( "GatheringItemPoint", xiv::exd::Language::none );
+    m_GatheringLeveDat = setupDatAccess( "GatheringLeve", xiv::exd::Language::none );
+    m_GatheringLeveRouteDat = setupDatAccess( "GatheringLeveRoute", xiv::exd::Language::none );
+    m_GatheringNotebookListDat = setupDatAccess( "GatheringNotebookList", xiv::exd::Language::none );
+    m_GatheringPointDat = setupDatAccess( "GatheringPoint", xiv::exd::Language::none );
+    m_GatheringPointBaseDat = setupDatAccess( "GatheringPointBase", xiv::exd::Language::none );
+    m_GatheringPointBonusDat = setupDatAccess( "GatheringPointBonus", xiv::exd::Language::none );
+    m_GatheringPointBonusTypeDat = setupDatAccess( "GatheringPointBonusType", xiv::exd::Language::en );
+    m_GatheringPointNameDat = setupDatAccess( "GatheringPointName", xiv::exd::Language::en );
+    m_GatheringSubCategoryDat = setupDatAccess( "GatheringSubCategory", xiv::exd::Language::en );
+    m_GatheringTypeDat = setupDatAccess( "GatheringType", xiv::exd::Language::en );
+    m_GcArmyCaptureTacticsDat = setupDatAccess( "GcArmyCaptureTactics", xiv::exd::Language::none );
+    m_GcArmyExpeditionDat = setupDatAccess( "GcArmyExpedition", xiv::exd::Language::en );
+    m_GcArmyExpeditionMemberBonusDat = setupDatAccess( "GcArmyExpeditionMemberBonus", xiv::exd::Language::none );
+    m_GcArmyExpeditionTypeDat = setupDatAccess( "GcArmyExpeditionType", xiv::exd::Language::en );
+    m_GcArmyMemberGrowDat = setupDatAccess( "GcArmyMemberGrow", xiv::exd::Language::none );
+    m_GcArmyTrainingDat = setupDatAccess( "GcArmyTraining", xiv::exd::Language::en );
+    m_GCRankGridaniaFemaleTextDat = setupDatAccess( "GCRankGridaniaFemaleText", xiv::exd::Language::en );
+    m_GCRankGridaniaMaleTextDat = setupDatAccess( "GCRankGridaniaMaleText", xiv::exd::Language::en );
+    m_GCRankLimsaFemaleTextDat = setupDatAccess( "GCRankLimsaFemaleText", xiv::exd::Language::en );
+    m_GCRankLimsaMaleTextDat = setupDatAccess( "GCRankLimsaMaleText", xiv::exd::Language::en );
+    m_GCRankUldahFemaleTextDat = setupDatAccess( "GCRankUldahFemaleText", xiv::exd::Language::en );
+    m_GCRankUldahMaleTextDat = setupDatAccess( "GCRankUldahMaleText", xiv::exd::Language::en );
+    m_GCScripShopCategoryDat = setupDatAccess( "GCScripShopCategory", xiv::exd::Language::none );
+    m_GCScripShopItemDat = setupDatAccess( "GCScripShopItem", xiv::exd::Language::none );
+    m_GCShopDat = setupDatAccess( "GCShop", xiv::exd::Language::none );
+    m_GCShopItemCategoryDat = setupDatAccess( "GCShopItemCategory", xiv::exd::Language::en );
+    m_GCSupplyDutyDat = setupDatAccess( "GCSupplyDuty", xiv::exd::Language::none );
+    m_GCSupplyDutyRewardDat = setupDatAccess( "GCSupplyDutyReward", xiv::exd::Language::none );
+    m_GeneralActionDat = setupDatAccess( "GeneralAction", xiv::exd::Language::en );
+    m_GFATEDat = setupDatAccess( "GFATE", xiv::exd::Language::none );
+    m_GFateClimbing2Dat = setupDatAccess( "GFateClimbing2", xiv::exd::Language::none );
+    m_GFateClimbing2ContentDat = setupDatAccess( "GFateClimbing2Content", xiv::exd::Language::none );
+    m_GFateClimbing2TotemTypeDat = setupDatAccess( "GFateClimbing2TotemType", xiv::exd::Language::none );
+    m_GFateRideShootingDat = setupDatAccess( "GFateRideShooting", xiv::exd::Language::none );
+    m_GilShopDat = setupDatAccess( "GilShop", xiv::exd::Language::en );
+    m_GilShopItemDat = setupDatAccess( "GilShopItem", xiv::exd::Language::none );
+    m_GoldSaucerArcadeMachineDat = setupDatAccess( "GoldSaucerArcadeMachine", xiv::exd::Language::en );
+    m_GoldSaucerTextDataDat = setupDatAccess( "GoldSaucerTextData", xiv::exd::Language::en );
+    m_GrandCompanyDat = setupDatAccess( "GrandCompany", xiv::exd::Language::en );
+    m_GrandCompanyRankDat = setupDatAccess( "GrandCompanyRank", xiv::exd::Language::none );
+    m_GuardianDeityDat = setupDatAccess( "GuardianDeity", xiv::exd::Language::en );
+    m_GuildleveAssignmentDat = setupDatAccess( "GuildleveAssignment", xiv::exd::Language::none );
+    m_GuildleveAssignmentCategoryDat = setupDatAccess( "GuildleveAssignmentCategory", xiv::exd::Language::none );
+    m_GuildOrderGuideDat = setupDatAccess( "GuildOrderGuide", xiv::exd::Language::none );
+    m_GuildOrderOfficerDat = setupDatAccess( "GuildOrderOfficer", xiv::exd::Language::none );
+    m_HairMakeTypeDat = setupDatAccess( "HairMakeType", xiv::exd::Language::none );
+    m_HouseRetainerPoseDat = setupDatAccess( "HouseRetainerPose", xiv::exd::Language::none );
+    m_HousingAethernetDat = setupDatAccess( "HousingAethernet", xiv::exd::Language::none );
+    m_HousingAppealDat = setupDatAccess( "HousingAppeal", xiv::exd::Language::en );
+    m_HousingEmploymentNpcListDat = setupDatAccess( "HousingEmploymentNpcList", xiv::exd::Language::none );
+    m_HousingEmploymentNpcRaceDat = setupDatAccess( "HousingEmploymentNpcRace", xiv::exd::Language::en );
+    m_HousingExteriorDat = setupDatAccess( "HousingExterior", xiv::exd::Language::none );
+    m_HousingFurnitureDat = setupDatAccess( "HousingFurniture", xiv::exd::Language::none );
+    m_HousingLandSetDat = setupDatAccess( "HousingLandSet", xiv::exd::Language::none );
+    m_HousingMapMarkerInfoDat = setupDatAccess( "HousingMapMarkerInfo", xiv::exd::Language::none );
+    m_HousingMerchantPoseDat = setupDatAccess( "HousingMerchantPose", xiv::exd::Language::en );
+    m_HousingPlacementDat = setupDatAccess( "HousingPlacement", xiv::exd::Language::en );
+    m_HousingPresetDat = setupDatAccess( "HousingPreset", xiv::exd::Language::en );
+    m_HousingUnitedExteriorDat = setupDatAccess( "HousingUnitedExterior", xiv::exd::Language::none );
+    m_HousingYardObjectDat = setupDatAccess( "HousingYardObject", xiv::exd::Language::none );
+    m_HowToDat = setupDatAccess( "HowTo", xiv::exd::Language::en );
+    m_HowToCategoryDat = setupDatAccess( "HowToCategory", xiv::exd::Language::en );
+    m_HowToPageDat = setupDatAccess( "HowToPage", xiv::exd::Language::en );
+    m_InstanceContentDat = setupDatAccess( "InstanceContent", xiv::exd::Language::en );
+    m_InstanceContentBuffDat = setupDatAccess( "InstanceContentBuff", xiv::exd::Language::none );
+    m_InstanceContentCSBonusDat = setupDatAccess( "InstanceContentCSBonus", xiv::exd::Language::none );
+    m_InstanceContentGuideDat = setupDatAccess( "InstanceContentGuide", xiv::exd::Language::none );
+    m_InstanceContentTextDataDat = setupDatAccess( "InstanceContentTextData", xiv::exd::Language::en );
+    m_ItemDat = setupDatAccess( "Item", xiv::exd::Language::en );
+    m_ItemActionDat = setupDatAccess( "ItemAction", xiv::exd::Language::none );
+    m_ItemFoodDat = setupDatAccess( "ItemFood", xiv::exd::Language::none );
+    m_ItemLevelDat = setupDatAccess( "ItemLevel", xiv::exd::Language::none );
+    m_ItemSearchCategoryDat = setupDatAccess( "ItemSearchCategory", xiv::exd::Language::en );
+    m_ItemSeriesDat = setupDatAccess( "ItemSeries", xiv::exd::Language::en );
+    m_ItemSpecialBonusDat = setupDatAccess( "ItemSpecialBonus", xiv::exd::Language::en );
+    m_ItemUICategoryDat = setupDatAccess( "ItemUICategory", xiv::exd::Language::en );
+    m_JournalCategoryDat = setupDatAccess( "JournalCategory", xiv::exd::Language::en );
+    m_JournalGenreDat = setupDatAccess( "JournalGenre", xiv::exd::Language::en );
+    m_JournalSectionDat = setupDatAccess( "JournalSection", xiv::exd::Language::en );
+    m_LeveDat = setupDatAccess( "Leve", xiv::exd::Language::en );
+    m_LeveAssignmentTypeDat = setupDatAccess( "LeveAssignmentType", xiv::exd::Language::en );
+    m_LeveClientDat = setupDatAccess( "LeveClient", xiv::exd::Language::en );
+    m_LevelDat = setupDatAccess( "Level", xiv::exd::Language::none );
+    m_LeveRewardItemDat = setupDatAccess( "LeveRewardItem", xiv::exd::Language::none );
+    m_LeveRewardItemGroupDat = setupDatAccess( "LeveRewardItemGroup", xiv::exd::Language::none );
+    m_LeveVfxDat = setupDatAccess( "LeveVfx", xiv::exd::Language::none );
+    m_LogFilterDat = setupDatAccess( "LogFilter", xiv::exd::Language::en );
+    m_LogKindDat = setupDatAccess( "LogKind", xiv::exd::Language::en );
+    m_LogKindCategoryTextDat = setupDatAccess( "LogKindCategoryText", xiv::exd::Language::en );
+    m_LogMessageDat = setupDatAccess( "LogMessage", xiv::exd::Language::en );
+    m_LotteryExchangeShopDat = setupDatAccess( "LotteryExchangeShop", xiv::exd::Language::en );
+    m_MacroIconDat = setupDatAccess( "MacroIcon", xiv::exd::Language::none );
+    m_MacroIconRedirectOldDat = setupDatAccess( "MacroIconRedirectOld", xiv::exd::Language::none );
+    m_MainCommandDat = setupDatAccess( "MainCommand", xiv::exd::Language::en );
+    m_MainCommandCategoryDat = setupDatAccess( "MainCommandCategory", xiv::exd::Language::en );
+    m_ManeuversArmorDat = setupDatAccess( "ManeuversArmor", xiv::exd::Language::en );
+    m_MapDat = setupDatAccess( "Map", xiv::exd::Language::none );
+    m_MapMarkerDat = setupDatAccess( "MapMarker", xiv::exd::Language::none );
+    m_MapMarkerRegionDat = setupDatAccess( "MapMarkerRegion", xiv::exd::Language::none );
+    m_MapSymbolDat = setupDatAccess( "MapSymbol", xiv::exd::Language::none );
+    m_MarkerDat = setupDatAccess( "Marker", xiv::exd::Language::en );
+    m_MasterpieceSupplyDutyDat = setupDatAccess( "MasterpieceSupplyDuty", xiv::exd::Language::none );
+    m_MasterpieceSupplyMultiplierDat = setupDatAccess( "MasterpieceSupplyMultiplier", xiv::exd::Language::none );
+    m_MateriaDat = setupDatAccess( "Materia", xiv::exd::Language::none );
+    m_MiniGameRADat = setupDatAccess( "MiniGameRA", xiv::exd::Language::none );
+    m_MinionRaceDat = setupDatAccess( "MinionRace", xiv::exd::Language::en );
+    m_MinionRulesDat = setupDatAccess( "MinionRules", xiv::exd::Language::en );
+    m_MinionSkillTypeDat = setupDatAccess( "MinionSkillType", xiv::exd::Language::en );
+    m_MobHuntOrderTypeDat = setupDatAccess( "MobHuntOrderType", xiv::exd::Language::none );
+    m_MobHuntTargetDat = setupDatAccess( "MobHuntTarget", xiv::exd::Language::none );
+    m_ModelCharaDat = setupDatAccess( "ModelChara", xiv::exd::Language::none );
+    m_ModelSkeletonDat = setupDatAccess( "ModelSkeleton", xiv::exd::Language::none );
+    m_ModelStateDat = setupDatAccess( "ModelState", xiv::exd::Language::none );
+    m_MonsterNoteDat = setupDatAccess( "MonsterNote", xiv::exd::Language::en );
+    m_MonsterNoteTargetDat = setupDatAccess( "MonsterNoteTarget", xiv::exd::Language::none );
+    m_MountDat = setupDatAccess( "Mount", xiv::exd::Language::en );
+    m_MountActionDat = setupDatAccess( "MountAction", xiv::exd::Language::none );
+    m_MountCustomizeDat = setupDatAccess( "MountCustomize", xiv::exd::Language::none );
+    m_MountFlyingConditionDat = setupDatAccess( "MountFlyingCondition", xiv::exd::Language::none );
+    m_MountSpeedDat = setupDatAccess( "MountSpeed", xiv::exd::Language::none );
+    m_MountTransientDat = setupDatAccess( "MountTransient", xiv::exd::Language::en );
+    m_MoveTimelineDat = setupDatAccess( "MoveTimeline", xiv::exd::Language::none );
+    m_MoveVfxDat = setupDatAccess( "MoveVfx", xiv::exd::Language::none );
+    m_NotebookDivisionDat = setupDatAccess( "NotebookDivision", xiv::exd::Language::en );
+    m_NotebookDivisionCategoryDat = setupDatAccess( "NotebookDivisionCategory", xiv::exd::Language::en );
+    m_NpcEquipDat = setupDatAccess( "NpcEquip", xiv::exd::Language::none );
+    m_NpcYellDat = setupDatAccess( "NpcYell", xiv::exd::Language::en );
+    m_OmenDat = setupDatAccess( "Omen", xiv::exd::Language::none );
+    m_OnlineStatusDat = setupDatAccess( "OnlineStatus", xiv::exd::Language::en );
+    m_OpeningDat = setupDatAccess( "Opening", xiv::exd::Language::none );
+    m_OrchestrionDat = setupDatAccess( "Orchestrion", xiv::exd::Language::en );
+    m_OrchestrionCategoryDat = setupDatAccess( "OrchestrionCategory", xiv::exd::Language::en );
+    m_OrchestrionPathDat = setupDatAccess( "OrchestrionPath", xiv::exd::Language::none );
+    m_OrchestrionUiparamDat = setupDatAccess( "OrchestrionUiparam", xiv::exd::Language::none );
+    m_ParamGrowDat = setupDatAccess( "ParamGrow", xiv::exd::Language::none );
+    m_PartyContentDat = setupDatAccess( "PartyContent", xiv::exd::Language::en );
+    m_PartyContentCutsceneDat = setupDatAccess( "PartyContentCutscene", xiv::exd::Language::none );
+    m_PartyContentTextDataDat = setupDatAccess( "PartyContentTextData", xiv::exd::Language::en );
+    m_PerformDat = setupDatAccess( "Perform", xiv::exd::Language::en );
+    m_PerformTransientDat = setupDatAccess( "PerformTransient", xiv::exd::Language::en );
+    m_PetDat = setupDatAccess( "Pet", xiv::exd::Language::en );
+    m_PetActionDat = setupDatAccess( "PetAction", xiv::exd::Language::en );
+    m_PictureDat = setupDatAccess( "Picture", xiv::exd::Language::none );
+    m_PlaceNameDat = setupDatAccess( "PlaceName", xiv::exd::Language::en );
+    m_PlantPotFlowerSeedDat = setupDatAccess( "PlantPotFlowerSeed", xiv::exd::Language::none );
+    m_PreHandlerDat = setupDatAccess( "PreHandler", xiv::exd::Language::none );
+    m_PublicContentDat = setupDatAccess( "PublicContent", xiv::exd::Language::en );
+    m_PublicContentCutsceneDat = setupDatAccess( "PublicContentCutscene", xiv::exd::Language::none );
+    m_PublicContentTextDataDat = setupDatAccess( "PublicContentTextData", xiv::exd::Language::en );
+    m_PvPActionDat = setupDatAccess( "PvPAction", xiv::exd::Language::none );
+    m_PvPActionSortDat = setupDatAccess( "PvPActionSort", xiv::exd::Language::none );
+    m_PvPRankDat = setupDatAccess( "PvPRank", xiv::exd::Language::none );
+    m_PvPSelectTraitDat = setupDatAccess( "PvPSelectTrait", xiv::exd::Language::en );
+    m_PvPTraitDat = setupDatAccess( "PvPTrait", xiv::exd::Language::none );
+    m_QuestDat = setupDatAccess( "Quest", xiv::exd::Language::en );
+    m_QuestBattleDat = setupDatAccess( "QuestBattle", xiv::exd::Language::none );
+    m_QuestClassJobRewardDat = setupDatAccess( "QuestClassJobReward", xiv::exd::Language::none );
+    m_QuestClassJobSupplyDat = setupDatAccess( "QuestClassJobSupply", xiv::exd::Language::none );
+    m_QuestRepeatFlagDat = setupDatAccess( "QuestRepeatFlag", xiv::exd::Language::none );
+    m_QuestRewardOtherDat = setupDatAccess( "QuestRewardOther", xiv::exd::Language::en );
+    m_QuickChatDat = setupDatAccess( "QuickChat", xiv::exd::Language::en );
+    m_QuickChatTransientDat = setupDatAccess( "QuickChatTransient", xiv::exd::Language::en );
+    m_RaceDat = setupDatAccess( "Race", xiv::exd::Language::en );
+    m_RacingChocoboItemDat = setupDatAccess( "RacingChocoboItem", xiv::exd::Language::none );
+    m_RacingChocoboNameDat = setupDatAccess( "RacingChocoboName", xiv::exd::Language::en );
+    m_RacingChocoboNameCategoryDat = setupDatAccess( "RacingChocoboNameCategory", xiv::exd::Language::en );
+    m_RacingChocoboNameInfoDat = setupDatAccess( "RacingChocoboNameInfo", xiv::exd::Language::none );
+    m_RacingChocoboParamDat = setupDatAccess( "RacingChocoboParam", xiv::exd::Language::en );
+    m_RecastNavimeshDat = setupDatAccess( "RecastNavimesh", xiv::exd::Language::none );
+    m_RecipeDat = setupDatAccess( "Recipe", xiv::exd::Language::none );
+    m_RecipeElementDat = setupDatAccess( "RecipeElement", xiv::exd::Language::en );
+    m_RecipeLevelTableDat = setupDatAccess( "RecipeLevelTable", xiv::exd::Language::none );
+    m_RecipeNotebookListDat = setupDatAccess( "RecipeNotebookList", xiv::exd::Language::none );
+    m_RecommendContentsDat = setupDatAccess( "RecommendContents", xiv::exd::Language::none );
+    m_RelicDat = setupDatAccess( "Relic", xiv::exd::Language::none );
+    m_Relic3Dat = setupDatAccess( "Relic3", xiv::exd::Language::none );
+    m_RelicItemDat = setupDatAccess( "RelicItem", xiv::exd::Language::none );
+    m_RelicNoteDat = setupDatAccess( "RelicNote", xiv::exd::Language::none );
+    m_RelicNoteCategoryDat = setupDatAccess( "RelicNoteCategory", xiv::exd::Language::en );
+    m_ResidentDat = setupDatAccess( "Resident", xiv::exd::Language::none );
+    m_RetainerTaskDat = setupDatAccess( "RetainerTask", xiv::exd::Language::none );
+    m_RetainerTaskLvRangeDat = setupDatAccess( "RetainerTaskLvRange", xiv::exd::Language::none );
+    m_RetainerTaskNormalDat = setupDatAccess( "RetainerTaskNormal", xiv::exd::Language::none );
+    m_RetainerTaskParameterDat = setupDatAccess( "RetainerTaskParameter", xiv::exd::Language::none );
+    m_RetainerTaskRandomDat = setupDatAccess( "RetainerTaskRandom", xiv::exd::Language::en );
+    m_RPParameterDat = setupDatAccess( "RPParameter", xiv::exd::Language::none );
+    m_SalvageDat = setupDatAccess( "Salvage", xiv::exd::Language::none );
+    m_SatisfactionNpcDat = setupDatAccess( "SatisfactionNpc", xiv::exd::Language::none );
+    m_SatisfactionSupplyDat = setupDatAccess( "SatisfactionSupply", xiv::exd::Language::none );
+    m_SatisfactionSupplyRewardDat = setupDatAccess( "SatisfactionSupplyReward", xiv::exd::Language::none );
+    m_ScenarioTreeDat = setupDatAccess( "ScenarioTree", xiv::exd::Language::none );
+    m_ScenarioTreeTipsDat = setupDatAccess( "ScenarioTreeTips", xiv::exd::Language::none );
+    m_ScenarioTreeTipsClassQuestDat = setupDatAccess( "ScenarioTreeTipsClassQuest", xiv::exd::Language::none );
+    m_ScenarioTreeTipsQuestDat = setupDatAccess( "ScenarioTreeTipsQuest", xiv::exd::Language::none );
+    m_ScenarioTypeDat = setupDatAccess( "ScenarioType", xiv::exd::Language::en );
+    m_ScreenImageDat = setupDatAccess( "ScreenImage", xiv::exd::Language::none );
+    m_SecretRecipeBookDat = setupDatAccess( "SecretRecipeBook", xiv::exd::Language::en );
+    m_SkyIsland2MissionDat = setupDatAccess( "SkyIsland2Mission", xiv::exd::Language::en );
+    m_SkyIsland2MissionDetailDat = setupDatAccess( "SkyIsland2MissionDetail", xiv::exd::Language::en );
+    m_SkyIsland2MissionTypeDat = setupDatAccess( "SkyIsland2MissionType", xiv::exd::Language::none );
+    m_SkyIsland2RangeTypeDat = setupDatAccess( "SkyIsland2RangeType", xiv::exd::Language::none );
+    m_SpearfishingItemDat = setupDatAccess( "SpearfishingItem", xiv::exd::Language::en );
+    m_SpearfishingNotebookDat = setupDatAccess( "SpearfishingNotebook", xiv::exd::Language::none );
+    m_SpearfishingRecordPageDat = setupDatAccess( "SpearfishingRecordPage", xiv::exd::Language::none );
+    m_SpecialShopDat = setupDatAccess( "SpecialShop", xiv::exd::Language::en );
+    m_SpecialShopItemCategoryDat = setupDatAccess( "SpecialShopItemCategory", xiv::exd::Language::en );
+    m_StainDat = setupDatAccess( "Stain", xiv::exd::Language::en );
+    m_StainTransientDat = setupDatAccess( "StainTransient", xiv::exd::Language::none );
+    m_StatusDat = setupDatAccess( "Status", xiv::exd::Language::en );
+    m_StatusHitEffectDat = setupDatAccess( "StatusHitEffect", xiv::exd::Language::none );
+    m_StatusLoopVFXDat = setupDatAccess( "StatusLoopVFX", xiv::exd::Language::none );
+    m_StoryDat = setupDatAccess( "Story", xiv::exd::Language::none );
+    m_SubmarineExplorationDat = setupDatAccess( "SubmarineExploration", xiv::exd::Language::en );
+    m_SubmarinePartDat = setupDatAccess( "SubmarinePart", xiv::exd::Language::none );
+    m_SubmarineRankDat = setupDatAccess( "SubmarineRank", xiv::exd::Language::none );
+    m_SwitchTalkDat = setupDatAccess( "SwitchTalk", xiv::exd::Language::none );
+    m_TerritoryTypeDat = setupDatAccess( "TerritoryType", xiv::exd::Language::none );
+    m_TextCommandDat = setupDatAccess( "TextCommand", xiv::exd::Language::en );
+    m_TitleDat = setupDatAccess( "Title", xiv::exd::Language::en );
+    m_TomestonesDat = setupDatAccess( "Tomestones", xiv::exd::Language::none );
+    m_TomestonesItemDat = setupDatAccess( "TomestonesItem", xiv::exd::Language::none );
+    m_TopicSelectDat = setupDatAccess( "TopicSelect", xiv::exd::Language::en );
+    m_TownDat = setupDatAccess( "Town", xiv::exd::Language::en );
+    m_TraitDat = setupDatAccess( "Trait", xiv::exd::Language::en );
+    m_TraitRecastDat = setupDatAccess( "TraitRecast", xiv::exd::Language::none );
+    m_TraitTransientDat = setupDatAccess( "TraitTransient", xiv::exd::Language::en );
+    m_TransformationDat = setupDatAccess( "Transformation", xiv::exd::Language::none );
+    m_TreasureDat = setupDatAccess( "Treasure", xiv::exd::Language::en );
+    m_TreasureHuntRankDat = setupDatAccess( "TreasureHuntRank", xiv::exd::Language::none );
+    m_TreasureSpotDat = setupDatAccess( "TreasureSpot", xiv::exd::Language::none );
+    m_TribeDat = setupDatAccess( "Tribe", xiv::exd::Language::en );
+    m_TripleTriadDat = setupDatAccess( "TripleTriad", xiv::exd::Language::none );
+    m_TripleTriadCardDat = setupDatAccess( "TripleTriadCard", xiv::exd::Language::en );
+    m_TripleTriadCardRarityDat = setupDatAccess( "TripleTriadCardRarity", xiv::exd::Language::none );
+    m_TripleTriadCardResidentDat = setupDatAccess( "TripleTriadCardResident", xiv::exd::Language::none );
+    m_TripleTriadCardTypeDat = setupDatAccess( "TripleTriadCardType", xiv::exd::Language::en );
+    m_TripleTriadCompetitionDat = setupDatAccess( "TripleTriadCompetition", xiv::exd::Language::en );
+    m_TripleTriadRuleDat = setupDatAccess( "TripleTriadRule", xiv::exd::Language::en );
+    m_TutorialDat = setupDatAccess( "Tutorial", xiv::exd::Language::none );
+    m_TutorialDPSDat = setupDatAccess( "TutorialDPS", xiv::exd::Language::none );
+    m_TutorialHealerDat = setupDatAccess( "TutorialHealer", xiv::exd::Language::none );
+    m_TutorialTankDat = setupDatAccess( "TutorialTank", xiv::exd::Language::none );
+    m_UIColorDat = setupDatAccess( "UIColor", xiv::exd::Language::none );
+    m_VaseFlowerDat = setupDatAccess( "VaseFlower", xiv::exd::Language::none );
+    m_VFXDat = setupDatAccess( "VFX", xiv::exd::Language::none );
+    m_WarpDat = setupDatAccess( "Warp", xiv::exd::Language::en );
+    m_WarpConditionDat = setupDatAccess( "WarpCondition", xiv::exd::Language::none );
+    m_WarpLogicDat = setupDatAccess( "WarpLogic", xiv::exd::Language::en );
+    m_WeatherDat = setupDatAccess( "Weather", xiv::exd::Language::en );
+    m_WeatherGroupDat = setupDatAccess( "WeatherGroup", xiv::exd::Language::none );
+    m_WeatherRateDat = setupDatAccess( "WeatherRate", xiv::exd::Language::none );
+    m_WeatherReportReplaceDat = setupDatAccess( "WeatherReportReplace", xiv::exd::Language::none );
+    m_WeddingBGMDat = setupDatAccess( "WeddingBGM", xiv::exd::Language::en );
+    m_WeeklyBingoOrderDataDat = setupDatAccess( "WeeklyBingoOrderData", xiv::exd::Language::none );
+    m_WeeklyBingoRewardDataDat = setupDatAccess( "WeeklyBingoRewardData", xiv::exd::Language::none );
+    m_WeeklyBingoTextDat = setupDatAccess( "WeeklyBingoText", xiv::exd::Language::en );
+    m_WeeklyLotBonusDat = setupDatAccess( "WeeklyLotBonus", xiv::exd::Language::none );
+    m_WorldDat = setupDatAccess( "World", xiv::exd::Language::none );
+    m_WorldDCGroupTypeDat = setupDatAccess( "WorldDCGroupType", xiv::exd::Language::none );
+    m_YKWDat = setupDatAccess( "YKW", xiv::exd::Language::en );
+    m_ZoneSharedGroupDat = setupDatAccess( "ZoneSharedGroup", xiv::exd::Language::none );
 
-   }
-   catch( std::runtime_error )
-   {
-      return false;
-   }
+  }
+  catch( std::runtime_error )
+  {
+    return false;
+  }
 
-   return true;
+  return true;
 }
 
 ///////////////////////////////////////////////////////////////
diff --git a/src/common/Exd/ExdDataGenerated.h b/src/common/Exd/ExdDataGenerated.h
index bcbba9b2..8a165fc4 100644
--- a/src/common/Exd/ExdDataGenerated.h
+++ b/src/common/Exd/ExdDataGenerated.h
@@ -125,6 +125,8 @@ struct CompanyCraftProcess;
 struct CompanyCraftSequence;
 struct CompanyCraftSupplyItem;
 struct CompanyCraftType;
+struct CompanyLeve;
+struct CompanyLeveRule;
 struct CompleteJournal;
 struct CompleteJournalCategory;
 struct ContentCloseCycle;
@@ -148,6 +150,8 @@ struct CraftType;
 struct Credit;
 struct CreditBackImage;
 struct CreditCast;
+struct CreditList;
+struct CreditListText;
 struct Currency;
 struct CustomTalk;
 struct CustomTalkDynamicIcon;
@@ -354,6 +358,8 @@ struct MountSpeed;
 struct MountTransient;
 struct MoveTimeline;
 struct MoveVfx;
+struct NotebookDivision;
+struct NotebookDivisionCategory;
 struct NpcEquip;
 struct NpcYell;
 struct Omen;
@@ -458,6 +464,7 @@ struct TraitTransient;
 struct Transformation;
 struct Treasure;
 struct TreasureHuntRank;
+struct TreasureSpot;
 struct Tribe;
 struct TripleTriad;
 struct TripleTriadCard;
@@ -493,2753 +500,2805 @@ struct ZoneSharedGroup;
 
 struct Achievement
 {
-   uint8_t achievementCategory;
-   std::string name;
-   std::string description;
-   uint8_t points;
-   uint16_t title;
-   uint32_t item;
-   uint16_t icon;
-   uint8_t type;
-   int32_t key;
-   std::vector< int32_t > data;
-   uint16_t order;
-   bool initialHide;
+  uint8_t achievementCategory;
+  std::string name;
+  std::string description;
+  uint8_t points;
+  uint16_t title;
+  uint32_t item;
+  uint16_t icon;
+  uint8_t type;
+  int32_t key;
+  std::vector< int32_t > data;
+  uint16_t order;
+  bool initialHide;
 
-   Achievement( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+  Achievement( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
 
 struct AchievementCategory
 {
-   std::string name;
-   uint8_t achievementKind;
-   bool hideCategory;
+  std::string name;
+  uint8_t achievementKind;
+  bool hideCategory;
 
-   AchievementCategory( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+  AchievementCategory( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
 
 struct AchievementKind
 {
-   std::string name;
+  std::string name;
 
-   AchievementKind( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+  AchievementKind( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
 
 struct Action
 {
-   std::string name;
-   uint16_t icon;
-   uint8_t actionCategory;
-   uint8_t animationStart;
-   uint8_t vFX;
-   int16_t animationEnd;
-   uint16_t actionTimelineHit;
-   int8_t classJob;
-   uint8_t classJobLevel;
-   bool isRoleAction;
-   int8_t range;
-   bool canTargetSelf;
-   bool canTargetParty;
-   bool canTargetFriendly;
-   bool canTargetHostile;
-   bool targetArea;
-   bool canTargetDead;
-   uint8_t castType;
-   uint8_t effectRange;
-   uint8_t xAxisModifier;
-   uint8_t costType;
-   uint16_t cost;
-   uint16_t actionCombo;
-   bool preservesCombo;
-   uint16_t cast100ms;
-   uint16_t recast100ms;
-   uint8_t cooldownGroup;
-   int8_t attackType;
-   uint8_t aspect;
-   uint8_t actionProcStatus;
-   uint16_t statusGainSelf;
-   uint32_t unlockLink;
-   uint8_t classJobCategory;
-   bool affectsPosition;
-   uint8_t omen;
-   bool isPvP;
-   bool isPlayerAction;
+  std::string name;
+  uint16_t icon;
+  uint8_t actionCategory;
+  uint8_t animationStart;
+  uint8_t vFX;
+  int16_t animationEnd;
+  uint16_t actionTimelineHit;
+  int8_t classJob;
+  uint8_t classJobLevel;
+  bool isRoleAction;
+  int8_t range;
+  bool canTargetSelf;
+  bool canTargetParty;
+  bool canTargetFriendly;
+  bool canTargetHostile;
+  bool targetArea;
+  bool canTargetDead;
+  uint8_t castType;
+  uint8_t effectRange;
+  uint8_t xAxisModifier;
+  uint8_t primaryCostType;
+  uint16_t primaryCostValue;
+  uint8_t secondaryCostType;
+  uint16_t secondaryCostValue;
+  uint16_t actionCombo;
+  bool preservesCombo;
+  uint16_t cast100ms;
+  uint16_t recast100ms;
+  uint8_t cooldownGroup;
+  int8_t attackType;
+  uint8_t aspect;
+  uint8_t actionProcStatus;
+  uint16_t statusGainSelf;
+  uint32_t unlockLink;
+  uint8_t classJobCategory;
+  bool affectsPosition;
+  uint8_t omen;
+  bool isPvP;
+  bool isPlayerAction;
 
-   Action( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+  Action( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
 
 struct ActionCastTimeline
 {
-   uint16_t name;
-   uint16_t vFX;
+  uint16_t name;
+  uint16_t vFX;
 
-   ActionCastTimeline( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+  ActionCastTimeline( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
 
 struct ActionCastVFX
 {
-   uint16_t vFX;
+  uint16_t vFX;
 
-   ActionCastVFX( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+  ActionCastVFX( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
 
 struct ActionCategory
 {
-   std::string name;
+  std::string name;
 
-   ActionCategory( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+  ActionCategory( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
 
 struct ActionComboRoute
 {
-   std::string name;
-   std::vector< uint16_t > action;
+  std::string name;
+  std::vector< uint16_t > action;
 
-   ActionComboRoute( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+  ActionComboRoute( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
 
 struct ActionIndirection
 {
-   int32_t name;
+  int32_t name;
 
-   ActionIndirection( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+  ActionIndirection( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
 
 struct ActionParam
 {
-   int16_t name;
+  int16_t name;
 
-   ActionParam( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+  ActionParam( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
 
 struct ActionProcStatus
 {
-   uint16_t status;
+  uint16_t status;
 
-   ActionProcStatus( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+  ActionProcStatus( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
 
 struct ActionTimeline
 {
-   std::string key;
+  std::string key;
 
-   ActionTimeline( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+  ActionTimeline( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
 
 struct ActionTimelineMove
 {
 
-   ActionTimelineMove( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+  ActionTimelineMove( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
 
 struct ActionTimelineReplace
 {
-   uint16_t old;
-   uint16_t New;
+  uint16_t old;
+  uint16_t _new;
 
-   ActionTimelineReplace( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+  ActionTimelineReplace( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
 
 struct ActionTransient
 {
-   std::string description;
+  std::string description;
 
-   ActionTransient( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+  ActionTransient( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
 
 struct ActivityFeedButtons
 {
-   std::string bannerURL;
-   std::string description;
-   std::string language;
-   std::string pictureURL;
+  std::string bannerURL;
+  std::string description;
+  std::string language;
+  std::string pictureURL;
 
-   ActivityFeedButtons( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+  ActivityFeedButtons( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
 
 struct ActivityFeedCaptions
 {
-   std::string jA;
-   std::string eN;
-   std::string dE;
-   std::string fR;
+  std::string jA;
+  std::string eN;
+  std::string dE;
+  std::string fR;
 
-   ActivityFeedCaptions( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+  ActivityFeedCaptions( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
 
 struct ActivityFeedGroupCaptions
 {
-   std::string jA;
-   std::string eN;
-   std::string dE;
-   std::string fR;
+  std::string jA;
+  std::string eN;
+  std::string dE;
+  std::string fR;
 
-   ActivityFeedGroupCaptions( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+  ActivityFeedGroupCaptions( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
 
 struct ActivityFeedImages
 {
-   std::string expansionImage;
-   std::string activityFeedJA;
-   std::string activityFeedEN;
-   std::string activityFeedDE;
-   std::string activityFeedFR;
+  std::string expansionImage;
+  std::string activityFeedJA;
+  std::string activityFeedEN;
+  std::string activityFeedDE;
+  std::string activityFeedFR;
 
-   ActivityFeedImages( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+  ActivityFeedImages( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
 
 struct Addon
 {
-   std::string text;
+  std::string text;
 
-   Addon( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+  Addon( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
 
 struct AddonHud
 {
-   std::string _long;
-   std::string _short;
-   std::string _function;
+  std::string _long;
+  std::string _short;
+  std::string function;
 
-   AddonHud( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+  AddonHud( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
 
 struct Adventure
 {
-   int32_t level;
-   uint16_t emote;
-   uint16_t minTime;
-   uint16_t maxTime;
-   int32_t placeName;
-   int32_t iconList;
-   int32_t iconDiscovered;
-   std::string name;
-   std::string impression;
-   std::string description;
-   int32_t iconUndiscovered;
-   bool isInitial;
+  int32_t level;
+  uint16_t emote;
+  uint16_t minTime;
+  uint16_t maxTime;
+  int32_t placeName;
+  int32_t iconList;
+  int32_t iconDiscovered;
+  std::string name;
+  std::string impression;
+  std::string description;
+  int32_t iconUndiscovered;
+  bool isInitial;
 
-   Adventure( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+  Adventure( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
 
 struct AdventureExPhase
 {
-   uint32_t quest;
-   uint32_t adventureBegin;
-   uint32_t adventureEnd;
+  uint32_t quest;
+  uint32_t adventureBegin;
+  uint32_t adventureEnd;
 
-   AdventureExPhase( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+  AdventureExPhase( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
 
 struct AetherCurrent
 {
-   uint32_t quest;
+  uint32_t quest;
 
-   AetherCurrent( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+  AetherCurrent( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
 
 struct AetherCurrentCompFlgSet
 {
-   int32_t territory;
-   std::vector< int32_t > aetherCurrent;
+  int32_t territory;
+  std::vector< int32_t > aetherCurrent;
 
-   AetherCurrentCompFlgSet( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+  AetherCurrentCompFlgSet( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
 
 struct AetherialWheel
 {
-   int32_t itemUnprimed;
-   int32_t itemPrimed;
-   uint8_t grade;
-   uint8_t hoursRequired;
+  int32_t itemUnprimed;
+  int32_t itemPrimed;
+  uint8_t grade;
+  uint8_t hoursRequired;
 
-   AetherialWheel( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+  AetherialWheel( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
 
 struct Aetheryte
 {
-   std::string singular;
-   int8_t adjective;
-   std::string plural;
-   int8_t possessivePronoun;
-   int8_t startsWithVowel;
-   int8_t pronoun;
-   int8_t article;
-   uint16_t placeName;
-   uint16_t aethernetName;
-   uint16_t territory;
-   std::vector< uint32_t > level;
-   bool isAetheryte;
-   uint8_t aethernetGroup;
-   uint32_t requiredQuest;
-   uint16_t map;
-   int16_t aetherstreamX;
-   int16_t aetherstreamY;
+  std::string singular;
+  int8_t adjective;
+  std::string plural;
+  int8_t possessivePronoun;
+  int8_t startsWithVowel;
+  int8_t pronoun;
+  int8_t article;
+  uint16_t placeName;
+  uint16_t aethernetName;
+  uint16_t territory;
+  std::vector< uint32_t > level;
+  bool isAetheryte;
+  uint8_t aethernetGroup;
+  uint32_t requiredQuest;
+  uint16_t map;
+  int16_t aetherstreamX;
+  int16_t aetherstreamY;
 
-   Aetheryte( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+  Aetheryte( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
 
 struct AetheryteSystemDefine
 {
-   std::string text;
+  std::string text;
 
-   AetheryteSystemDefine( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+  AetheryteSystemDefine( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
 
 struct AirshipExplorationLevel
 {
-   uint32_t expToNext;
+  uint32_t expToNext;
 
-   AirshipExplorationLevel( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+  AirshipExplorationLevel( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
 
 struct AirshipExplorationLog
 {
-   std::string text;
+  std::string text;
 
-   AirshipExplorationLog( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+  AirshipExplorationLog( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
 
 struct AirshipExplorationParamType
 {
-   std::string name;
+  std::string name;
 
-   AirshipExplorationParamType( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+  AirshipExplorationParamType( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
 
 struct AirshipExplorationPart
 {
-   uint8_t rank;
-   uint8_t components;
-   int16_t surveillance;
-   int16_t retrieval;
-   int16_t speed;
-   int16_t range;
-   int16_t favor;
-   uint8_t repairMaterials;
+  uint8_t rank;
+  uint8_t components;
+  int16_t surveillance;
+  int16_t retrieval;
+  int16_t speed;
+  int16_t range;
+  int16_t favor;
+  uint8_t repairMaterials;
 
-   AirshipExplorationPart( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+  AirshipExplorationPart( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
 
 struct AirshipExplorationPoint
 {
-   std::string name;
-   std::string nameShort;
-   uint8_t requiredLevel;
-   uint16_t requiredFuel;
-   uint16_t durationmin;
-   uint8_t requiredSurveillance;
-   uint32_t expReward;
+  std::string name;
+  std::string nameShort;
+  uint8_t requiredLevel;
+  uint16_t requiredFuel;
+  uint16_t durationmin;
+  uint8_t requiredSurveillance;
+  uint32_t expReward;
 
-   AirshipExplorationPoint( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+  AirshipExplorationPoint( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
 
 struct AnimaWeapon5
 {
-   int32_t item;
-   uint8_t secondaryStatTotal;
-   std::vector< uint8_t > parameter;
+  int32_t item;
+  uint8_t secondaryStatTotal;
+  std::vector< uint8_t > parameter;
 
-   AnimaWeapon5( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+  AnimaWeapon5( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
 
 struct AnimaWeapon5Param
 {
-   uint8_t baseParam;
-   std::string name;
+  uint8_t baseParam;
+  std::string name;
 
-   AnimaWeapon5Param( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+  AnimaWeapon5Param( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
 
 struct AnimaWeapon5PatternGroup
 {
-   std::string name;
+  std::string name;
 
-   AnimaWeapon5PatternGroup( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+  AnimaWeapon5PatternGroup( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
 
 struct AnimaWeapon5SpiritTalk
 {
-   int32_t dialogue;
+  int32_t dialogue;
 
-   AnimaWeapon5SpiritTalk( uint32_t row_id, uint32_t subRow, Sapphire::Data::ExdDataGenerated* exdData );
+  AnimaWeapon5SpiritTalk( uint32_t row_id, uint32_t subRow, Sapphire::Data::ExdDataGenerated* exdData );
 };
 
 struct AnimaWeapon5SpiritTalkParam
 {
-   std::string prologue;
-   std::string epilogue;
+  std::string prologue;
+  std::string epilogue;
 
-   AnimaWeapon5SpiritTalkParam( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+  AnimaWeapon5SpiritTalkParam( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
 
 struct AnimaWeapon5TradeItem
 {
-   uint32_t crystalSand;
-   uint8_t qty;
-   uint8_t category;
+  uint32_t crystalSand;
+  uint8_t qty;
+  uint8_t category;
 
-   AnimaWeapon5TradeItem( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+  AnimaWeapon5TradeItem( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
 
 struct AnimaWeaponFUITalk
 {
-   int32_t dialogue;
+  int32_t dialogue;
 
-   AnimaWeaponFUITalk( uint32_t row_id, uint32_t subRow, Sapphire::Data::ExdDataGenerated* exdData );
+  AnimaWeaponFUITalk( uint32_t row_id, uint32_t subRow, Sapphire::Data::ExdDataGenerated* exdData );
 };
 
 struct AnimaWeaponFUITalkParam
 {
-   std::string prologue;
-   std::string epilogue;
+  std::string prologue;
+  std::string epilogue;
 
-   AnimaWeaponFUITalkParam( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+  AnimaWeaponFUITalkParam( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
 
 struct AnimaWeaponIcon
 {
-   int32_t hyperconductive;
-   int32_t reborn;
-   int32_t sharpened;
-   int32_t zodiac;
-   int32_t zodiacLux;
+  int32_t hyperconductive;
+  int32_t reborn;
+  int32_t sharpened;
+  int32_t zodiac;
+  int32_t zodiacLux;
 
-   AnimaWeaponIcon( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+  AnimaWeaponIcon( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
 
 struct AnimaWeaponItem
 {
-   std::vector< uint32_t > item;
+  std::vector< uint32_t > item;
 
-   AnimaWeaponItem( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+  AnimaWeaponItem( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
 
 struct AozAction
 {
-   uint32_t action;
+  uint32_t action;
 
-   AozAction( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+  AozAction( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
 
 struct AozActionTransient
 {
-   uint32_t icon;
-   std::string stats;
-   std::string description;
-   uint16_t location;
-   uint32_t startQuest;
-   uint32_t nextQuest;
+  uint32_t icon;
+  std::string stats;
+  std::string description;
+  uint16_t location;
+  uint32_t startQuest;
+  uint32_t nextQuest;
 
-   AozActionTransient( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+  AozActionTransient( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
 
 struct AOZArrangement
 {
-   uint16_t aOZContentBriefingBNpc;
+  uint16_t aOZContentBriefingBNpc;
 
-   AOZArrangement( uint32_t row_id, uint32_t subRow, Sapphire::Data::ExdDataGenerated* exdData );
+  AOZArrangement( uint32_t row_id, uint32_t subRow, Sapphire::Data::ExdDataGenerated* exdData );
 };
 
 struct AOZBoss
 {
-   uint16_t boss;
+  uint16_t boss;
 
-   AOZBoss( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+  AOZBoss( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
 
 struct AOZContent
 {
-   uint16_t standardFinishTime;
-   uint16_t idealFinishTime;
-   uint8_t act1FightType;
-   uint16_t act1;
-   uint8_t arenaType1;
-   uint8_t act2FightType;
-   uint16_t act2;
-   uint8_t arenaType2;
-   uint8_t act3FightType;
-   uint16_t act3;
-   uint8_t arenaType3;
-   uint32_t contentEntry;
-   uint8_t order;
-   uint16_t gilReward;
-   uint16_t alliedSealsReward;
-   uint16_t tomestonesReward;
+  uint16_t standardFinishTime;
+  uint16_t idealFinishTime;
+  uint8_t act1FightType;
+  uint16_t act1;
+  uint8_t arenaType1;
+  uint8_t act2FightType;
+  uint16_t act2;
+  uint8_t arenaType2;
+  uint8_t act3FightType;
+  uint16_t act3;
+  uint8_t arenaType3;
+  uint32_t contentEntry;
+  uint8_t order;
+  uint16_t gilReward;
+  uint16_t alliedSealsReward;
+  uint16_t tomestonesReward;
 
-   AOZContent( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+  AOZContent( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
 
 struct AOZContentBriefingBNpc
 {
-   uint32_t bNpcName;
-   uint32_t targetSmall;
-   uint32_t targetLarge;
-   uint8_t endurance;
-   uint8_t fire;
-   uint8_t ice;
-   uint8_t wind;
-   uint8_t earth;
-   uint8_t thunder;
-   uint8_t water;
-   uint8_t slashing;
-   uint8_t piercing;
-   uint8_t blunt;
-   uint8_t magic;
-   bool slowResistance;
-   bool petrificationResistance;
-   bool paralysisResistance;
-   bool silenceResistance;
-   bool blindResistance;
-   bool stunResistance;
-   bool sleepResistance;
-   bool bindResistance;
-   bool heavyResistance;
-   bool instaDeathResistance;
+  uint32_t bNpcName;
+  uint32_t targetSmall;
+  uint32_t targetLarge;
+  uint8_t endurance;
+  uint8_t fire;
+  uint8_t ice;
+  uint8_t wind;
+  uint8_t earth;
+  uint8_t thunder;
+  uint8_t water;
+  uint8_t slashing;
+  uint8_t piercing;
+  uint8_t blunt;
+  uint8_t magic;
+  bool slowResistance;
+  bool petrificationResistance;
+  bool paralysisResistance;
+  bool silenceResistance;
+  bool blindResistance;
+  bool stunResistance;
+  bool sleepResistance;
+  bool bindResistance;
+  bool heavyResistance;
+  bool instaDeathResistance;
 
-   AOZContentBriefingBNpc( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+  AOZContentBriefingBNpc( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
 
 struct AquariumFish
 {
-   uint8_t aquariumWater;
-   uint8_t size;
-   uint32_t item;
+  uint8_t aquariumWater;
+  uint8_t size;
+  uint32_t item;
 
-   AquariumFish( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+  AquariumFish( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
 
 struct AquariumWater
 {
-   std::string name;
+  std::string name;
 
-   AquariumWater( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+  AquariumWater( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
 
 struct ArrayEventHandler
 {
-   std::vector< uint32_t > data;
+  std::vector< uint32_t > data;
 
-   ArrayEventHandler( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+  ArrayEventHandler( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
 
 struct AttackType
 {
-   std::string name;
+  std::string name;
 
-   AttackType( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+  AttackType( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
 
 struct BacklightColor
 {
-   uint32_t color;
+  uint32_t color;
 
-   BacklightColor( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+  BacklightColor( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
 
 struct Balloon
 {
-   std::string dialogue;
+  std::string dialogue;
 
-   Balloon( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+  Balloon( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
 
 struct BaseParam
 {
-   int8_t order;
-   std::string name;
-   std::string description;
-   uint8_t oneHWpn;
-   uint8_t oH;
-   uint8_t head;
-   uint8_t chest;
-   uint8_t hands;
-   uint8_t waist;
-   uint8_t legs;
-   uint8_t feet;
-   uint8_t earring;
-   uint8_t necklace;
-   uint8_t bracelet;
-   uint8_t ring;
-   uint8_t twoHWpn;
-   uint8_t chestHead;
-   uint8_t chestHeadLegsFeet;
-   uint8_t legsFeet;
-   uint8_t headChestHandsLegsFeet;
-   uint8_t chestLegsGloves;
-   uint8_t chestLegsFeet;
+  int8_t order;
+  std::string name;
+  std::string description;
+  uint8_t oneHWpn;
+  uint8_t oH;
+  uint8_t head;
+  uint8_t chest;
+  uint8_t hands;
+  uint8_t waist;
+  uint8_t legs;
+  uint8_t feet;
+  uint8_t earring;
+  uint8_t necklace;
+  uint8_t bracelet;
+  uint8_t ring;
+  uint8_t twoHWpn;
+  uint8_t chestHead;
+  uint8_t chestHeadLegsFeet;
+  uint8_t legsFeet;
+  uint8_t headChestHandsLegsFeet;
+  uint8_t chestLegsGloves;
+  uint8_t chestLegsFeet;
 
-   BaseParam( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+  BaseParam( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
 
 struct BattleLeve
 {
-   std::vector< uint16_t > enemyLevel;
-   std::vector< uint32_t > bNpcName;
-   std::vector< int32_t > itemsInvolved;
-   std::vector< uint8_t > itemsInvolvedQty;
-   std::vector< uint8_t > itemDropRate;
+  std::vector< uint16_t > enemyLevel;
+  std::vector< uint32_t > bNpcName;
+  std::vector< int32_t > itemsInvolved;
+  std::vector< uint8_t > itemsInvolvedQty;
+  std::vector< uint8_t > itemDropRate;
 
-   BattleLeve( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+  BattleLeve( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
 
 struct BeastRankBonus
 {
-   uint32_t item;
-   std::vector< uint8_t > itemQuantity;
+  uint32_t item;
+  std::vector< uint8_t > itemQuantity;
 
-   BeastRankBonus( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+  BeastRankBonus( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
 
 struct BeastReputationRank
 {
-   uint16_t requiredReputation;
-   std::string name;
+  uint16_t requiredReputation;
+  std::string name;
 
-   BeastReputationRank( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+  BeastReputationRank( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
 
 struct BeastTribe
 {
-   uint8_t minLevel;
-   uint8_t maxLevel;
-   uint8_t beastRankBonus;
-   uint32_t iconReputation;
-   uint32_t icon;
-   uint8_t maxRank;
-   uint32_t alliedBeastTribeQuest;
-   uint8_t expansion;
-   uint32_t currencyItem;
-   uint8_t displayOrder;
-   std::string name;
-   std::string nameRelation;
+  uint8_t minLevel;
+  uint8_t maxLevel;
+  uint8_t beastRankBonus;
+  uint32_t iconReputation;
+  uint32_t icon;
+  uint8_t maxRank;
+  uint32_t alliedBeastTribeQuest;
+  uint8_t expansion;
+  uint32_t currencyItem;
+  uint8_t displayOrder;
+  std::string name;
+  std::string nameRelation;
 
-   BeastTribe( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+  BeastTribe( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
 
 struct Behavior
 {
-   uint16_t balloon;
+  uint16_t balloon;
 
-   Behavior( uint32_t row_id, uint32_t subRow, Sapphire::Data::ExdDataGenerated* exdData );
+  Behavior( uint32_t row_id, uint32_t subRow, Sapphire::Data::ExdDataGenerated* exdData );
 };
 
 struct BGM
 {
-   std::string file;
+  std::string file;
 
-   BGM( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+  BGM( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
 
 struct BGMFade
 {
-   int32_t bGMFadeType;
+  int32_t bGMFadeType;
 
-   BGMFade( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+  BGMFade( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
 
 struct BGMSituation
 {
-   uint16_t bGMDay;
-   uint16_t bGMNight;
-   uint16_t bGMBattle;
-   uint16_t bGMField;
+  uint16_t bGMDay;
+  uint16_t bGMNight;
+  uint16_t bGMBattle;
+  uint16_t bGMField;
 
-   BGMSituation( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+  BGMSituation( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
 
 struct BGMSwitch
 {
-   uint8_t bGMSystemDefine;
-   uint32_t quest;
+  uint8_t bGMSystemDefine;
+  uint32_t quest;
 
-   BGMSwitch( uint32_t row_id, uint32_t subRow, Sapphire::Data::ExdDataGenerated* exdData );
+  BGMSwitch( uint32_t row_id, uint32_t subRow, Sapphire::Data::ExdDataGenerated* exdData );
 };
 
 struct BGMSystemDefine
 {
-   float define;
+  float define;
 
-   BGMSystemDefine( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+  BGMSystemDefine( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
 
 struct BNpcAnnounceIcon
 {
-   uint32_t icon;
+  uint32_t icon;
 
-   BNpcAnnounceIcon( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+  BNpcAnnounceIcon( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
 
 struct BNpcBase
 {
-   uint16_t behavior;
-   uint8_t actionTimelineMove;
-   float scale;
-   uint16_t modelChara;
-   uint16_t bNpcCustomize;
-   uint16_t npcEquip;
-   int32_t arrayEventHandler;
-   uint8_t bNpcParts;
+  uint16_t behavior;
+  uint8_t actionTimelineMove;
+  float scale;
+  uint16_t modelChara;
+  uint16_t bNpcCustomize;
+  uint16_t npcEquip;
+  int32_t arrayEventHandler;
+  uint8_t bNpcParts;
 
-   BNpcBase( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+  BNpcBase( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
 
 struct BNpcCustomize
 {
-   uint8_t race;
-   uint8_t gender;
-   uint8_t bodyType;
-   uint8_t height;
-   uint8_t tribe;
-   uint8_t face;
-   uint8_t hairStyle;
-   uint8_t hairHighlight;
-   uint8_t skinColor;
-   uint8_t eyeHeterochromia;
-   uint8_t hairColor;
-   uint8_t hairHighlightColor;
-   uint8_t facialFeature;
-   uint8_t facialFeatureColor;
-   uint8_t eyebrows;
-   uint8_t eyeColor;
-   uint8_t eyeShape;
-   uint8_t nose;
-   uint8_t jaw;
-   uint8_t mouth;
-   uint8_t lipColor;
-   uint8_t bustOrTone1;
-   uint8_t extraFeature1;
-   uint8_t extraFeature2OrBust;
-   uint8_t facePaint;
-   uint8_t facePaintColor;
+  uint8_t race;
+  uint8_t gender;
+  uint8_t bodyType;
+  uint8_t height;
+  uint8_t tribe;
+  uint8_t face;
+  uint8_t hairStyle;
+  uint8_t hairHighlight;
+  uint8_t skinColor;
+  uint8_t eyeHeterochromia;
+  uint8_t hairColor;
+  uint8_t hairHighlightColor;
+  uint8_t facialFeature;
+  uint8_t facialFeatureColor;
+  uint8_t eyebrows;
+  uint8_t eyeColor;
+  uint8_t eyeShape;
+  uint8_t nose;
+  uint8_t jaw;
+  uint8_t mouth;
+  uint8_t lipColor;
+  uint8_t bustOrTone1;
+  uint8_t extraFeature1;
+  uint8_t extraFeature2OrBust;
+  uint8_t facePaint;
+  uint8_t facePaintColor;
 
-   BNpcCustomize( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+  BNpcCustomize( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
 
 struct BNpcName
 {
-   std::string singular;
-   int8_t adjective;
-   std::string plural;
-   int8_t possessivePronoun;
-   int8_t startsWithVowel;
-   int8_t pronoun;
-   int8_t article;
+  std::string singular;
+  int8_t adjective;
+  std::string plural;
+  int8_t possessivePronoun;
+  int8_t startsWithVowel;
+  int8_t pronoun;
+  int8_t article;
 
-   BNpcName( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+  BNpcName( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
 
 struct BNpcParts
 {
-   uint16_t bNpcBase1;
-   uint8_t partSlot1;
-   float x1;
-   float y1;
-   float z1;
-   float scale1;
-   uint16_t bNpcBase2;
-   uint8_t partSlot2;
-   float x2;
-   float y2;
-   float z2;
-   float scale2;
-   uint16_t bNpcBase3;
-   uint8_t partSlot3;
-   float x3;
-   float y3;
-   float z3;
-   int16_t scale3;
-   uint16_t bNpcBase4;
-   uint8_t partSlot4;
-   float x4;
-   float y4;
-   float z4;
-   float scale4;
-   uint16_t bNpcBase5;
-   uint8_t partSlot5;
-   float x5;
-   float y5;
-   float z5;
-   float scale5;
+  uint16_t bNpcBase1;
+  uint8_t partSlot1;
+  float x1;
+  float y1;
+  float z1;
+  float scale1;
+  uint16_t bNpcBase2;
+  uint8_t partSlot2;
+  float x2;
+  float y2;
+  float z2;
+  float scale2;
+  uint16_t bNpcBase3;
+  uint8_t partSlot3;
+  float x3;
+  float y3;
+  float z3;
+  int16_t scale3;
+  uint16_t bNpcBase4;
+  uint8_t partSlot4;
+  float x4;
+  float y4;
+  float z4;
+  float scale4;
+  uint16_t bNpcBase5;
+  uint8_t partSlot5;
+  float x5;
+  float y5;
+  float z5;
+  float scale5;
 
-   BNpcParts( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+  BNpcParts( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
 
 struct Buddy
 {
-   int32_t questRequirement2;
-   int32_t questRequirement1;
-   std::string soundEffect4;
-   std::string soundEffect3;
-   std::string soundEffect2;
-   std::string soundEffect1;
+  int32_t questRequirement2;
+  int32_t questRequirement1;
+  std::string soundEffect4;
+  std::string soundEffect3;
+  std::string soundEffect2;
+  std::string soundEffect1;
 
-   Buddy( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+  Buddy( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
 
 struct BuddyAction
 {
-   std::string name;
-   std::string description;
-   int32_t icon;
-   int32_t iconStatus;
+  std::string name;
+  std::string description;
+  int32_t icon;
+  int32_t iconStatus;
 
-   BuddyAction( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+  BuddyAction( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
 
 struct BuddyEquip
 {
-   std::string singular;
-   int8_t adjective;
-   std::string plural;
-   int8_t possessivePronoun;
-   int8_t startsWithVowel;
-   int8_t pronoun;
-   int8_t article;
-   std::string name;
-   int32_t modelTop;
-   int32_t modelBody;
-   int32_t modelLegs;
-   uint8_t grandCompany;
-   uint16_t iconHead;
-   uint16_t iconBody;
-   uint16_t iconLegs;
+  std::string singular;
+  int8_t adjective;
+  std::string plural;
+  int8_t possessivePronoun;
+  int8_t startsWithVowel;
+  int8_t pronoun;
+  int8_t article;
+  std::string name;
+  int32_t modelTop;
+  int32_t modelBody;
+  int32_t modelLegs;
+  uint8_t grandCompany;
+  uint16_t iconHead;
+  uint16_t iconBody;
+  uint16_t iconLegs;
 
-   BuddyEquip( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+  BuddyEquip( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
 
 struct BuddyItem
 {
-   uint16_t item;
+  uint16_t item;
 
-   BuddyItem( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+  BuddyItem( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
 
 struct BuddyRank
 {
-   uint32_t expRequired;
+  uint32_t expRequired;
 
-   BuddyRank( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+  BuddyRank( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
 
 struct BuddySkill
 {
-   uint8_t buddyLevel;
-   bool isActive;
-   uint16_t defender;
-   uint16_t attacker;
-   uint16_t healer;
+  uint8_t buddyLevel;
+  bool isActive;
+  uint16_t defender;
+  uint16_t attacker;
+  uint16_t healer;
 
-   BuddySkill( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+  BuddySkill( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
 
 struct Cabinet
 {
-   int32_t item;
-   uint16_t order;
-   uint8_t category;
+  int32_t item;
+  uint16_t order;
+  uint8_t category;
 
-   Cabinet( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+  Cabinet( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
 
 struct CabinetCategory
 {
-   uint8_t menuOrder;
-   int32_t icon;
-   int32_t category;
+  uint8_t menuOrder;
+  int32_t icon;
+  int32_t category;
 
-   CabinetCategory( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+  CabinetCategory( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
 
 struct Calendar
 {
-   std::vector< uint8_t > month;
-   std::vector< uint8_t > day;
+  std::vector< uint8_t > month;
+  std::vector< uint8_t > day;
 
-   Calendar( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+  Calendar( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
 
 struct CharaMakeCustomize
 {
-   uint32_t icon;
-   uint16_t data;
-   bool isPurchasable;
+  uint32_t icon;
+  uint16_t data;
+  bool isPurchasable;
 
-   CharaMakeCustomize( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+  CharaMakeCustomize( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
 
 struct CharaMakeType
 {
-   int32_t race;
-   int32_t tribe;
-   int8_t gender;
-   std::vector< int32_t > facialFeatureIcon;
+  int32_t race;
+  int32_t tribe;
+  int8_t gender;
+  std::vector< int32_t > facialFeatureIcon;
 
-   CharaMakeType( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+  CharaMakeType( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
 
 struct ChocoboRace
 {
-   uint8_t chocoboRaceRank;
-   uint8_t chocoboRaceTerritory;
+  uint8_t chocoboRaceRank;
+  uint8_t chocoboRaceTerritory;
 
-   ChocoboRace( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+  ChocoboRace( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
 
 struct ChocoboRaceAbility
 {
-   std::string name;
-   std::string description;
-   uint32_t icon;
-   int8_t chocoboRaceAbilityType;
-   uint8_t value;
+  std::string name;
+  std::string description;
+  uint32_t icon;
+  int8_t chocoboRaceAbilityType;
+  uint8_t value;
 
-   ChocoboRaceAbility( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+  ChocoboRaceAbility( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
 
 struct ChocoboRaceAbilityType
 {
-   bool isActive;
+  bool isActive;
 
-   ChocoboRaceAbilityType( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+  ChocoboRaceAbilityType( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
 
 struct ChocoboRaceItem
 {
-   std::string name;
-   std::string description;
-   uint32_t icon;
+  std::string name;
+  std::string description;
+  uint32_t icon;
 
-   ChocoboRaceItem( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+  ChocoboRaceItem( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
 
 struct ChocoboRaceRank
 {
-   uint16_t ratingMin;
-   uint16_t ratingMax;
-   uint16_t name;
-   uint16_t fee;
-   int32_t icon;
+  uint16_t ratingMin;
+  uint16_t ratingMax;
+  uint16_t name;
+  uint16_t fee;
+  int32_t icon;
 
-   ChocoboRaceRank( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+  ChocoboRaceRank( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
 
 struct ChocoboRaceStatus
 {
-   int32_t status;
+  int32_t status;
 
-   ChocoboRaceStatus( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+  ChocoboRaceStatus( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
 
 struct ChocoboRaceTerritory
 {
-   uint16_t name;
-   int32_t icon;
+  uint16_t name;
+  int32_t icon;
 
-   ChocoboRaceTerritory( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+  ChocoboRaceTerritory( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
 
 struct ChocoboRaceTutorial
 {
-   std::vector< int32_t > npcYell;
+  std::vector< int32_t > npcYell;
 
-   ChocoboRaceTutorial( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+  ChocoboRaceTutorial( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
 
 struct ChocoboRaceWeather
 {
-   int32_t weatherType1;
-   int32_t weatherType2;
+  int32_t weatherType1;
+  int32_t weatherType2;
 
-   ChocoboRaceWeather( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+  ChocoboRaceWeather( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
 
 struct ChocoboTaxi
 {
-   uint32_t location;
+  uint32_t location;
 
-   ChocoboTaxi( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+  ChocoboTaxi( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
 
 struct ChocoboTaxiStand
 {
-   std::string placeName;
+  std::string placeName;
 
-   ChocoboTaxiStand( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+  ChocoboTaxiStand( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
 
 struct ClassJob
 {
-   std::string name;
-   std::string abbreviation;
-   uint8_t classJobCategory;
-   int8_t expArrayIndex;
-   uint16_t modifierHitPoints;
-   uint16_t modifierManaPoints;
-   uint16_t modifierStrength;
-   uint16_t modifierVitality;
-   uint16_t modifierDexterity;
-   uint16_t modifierIntelligence;
-   uint16_t modifierMind;
-   uint16_t modifierPiety;
-   uint8_t classJobParent;
-   std::string nameEnglish;
-   int32_t itemStartingWeapon;
-   uint8_t primaryStat;
-   uint16_t limitBreak1;
-   uint16_t limitBreak2;
-   uint16_t limitBreak3;
-   uint32_t itemSoulCrystal;
-   uint32_t unlockQuest;
-   uint32_t relicQuest;
-   uint32_t prerequisite;
-   uint8_t startingLevel;
+  std::string name;
+  std::string abbreviation;
+  uint8_t classJobCategory;
+  int8_t expArrayIndex;
+  uint16_t modifierHitPoints;
+  uint16_t modifierManaPoints;
+  uint16_t modifierStrength;
+  uint16_t modifierVitality;
+  uint16_t modifierDexterity;
+  uint16_t modifierIntelligence;
+  uint16_t modifierMind;
+  uint16_t modifierPiety;
+  uint8_t classJobParent;
+  std::string nameEnglish;
+  int32_t itemStartingWeapon;
+  uint8_t role;
+  uint8_t startingTown;
+  uint8_t primaryStat;
+  uint16_t limitBreak1;
+  uint16_t limitBreak2;
+  uint16_t limitBreak3;
+  uint32_t itemSoulCrystal;
+  uint32_t unlockQuest;
+  uint32_t relicQuest;
+  uint32_t prerequisite;
+  uint8_t startingLevel;
+  uint8_t partyBonus;
+  bool isLimitedJob;
 
-   ClassJob( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+  ClassJob( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
 
 struct ClassJobCategory
 {
-   std::string name;
-   bool aDV;
-   bool gLA;
-   bool pGL;
-   bool mRD;
-   bool lNC;
-   bool aRC;
-   bool cNJ;
-   bool tHM;
-   bool cRP;
-   bool bSM;
-   bool aRM;
-   bool gSM;
-   bool lTW;
-   bool wVR;
-   bool aLC;
-   bool cUL;
-   bool mIN;
-   bool bTN;
-   bool fSH;
-   bool pLD;
-   bool mNK;
-   bool wAR;
-   bool dRG;
-   bool bRD;
-   bool wHM;
-   bool bLM;
-   bool aCN;
-   bool sMN;
-   bool sCH;
-   bool rOG;
-   bool nIN;
-   bool mCH;
-   bool dRK;
-   bool aST;
-   bool sAM;
-   bool rDM;
+  std::string name;
+  bool aDV;
+  bool gLA;
+  bool pGL;
+  bool mRD;
+  bool lNC;
+  bool aRC;
+  bool cNJ;
+  bool tHM;
+  bool cRP;
+  bool bSM;
+  bool aRM;
+  bool gSM;
+  bool lTW;
+  bool wVR;
+  bool aLC;
+  bool cUL;
+  bool mIN;
+  bool bTN;
+  bool fSH;
+  bool pLD;
+  bool mNK;
+  bool wAR;
+  bool dRG;
+  bool bRD;
+  bool wHM;
+  bool bLM;
+  bool aCN;
+  bool sMN;
+  bool sCH;
+  bool rOG;
+  bool nIN;
+  bool mCH;
+  bool dRK;
+  bool aST;
+  bool sAM;
+  bool rDM;
 
-   ClassJobCategory( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+  ClassJobCategory( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
 
 struct Companion
 {
-   std::string singular;
-   int8_t adjective;
-   std::string plural;
-   int8_t possessivePronoun;
-   int8_t startsWithVowel;
-   int8_t pronoun;
-   int8_t article;
-   uint16_t model;
-   uint8_t behavior;
-   uint16_t icon;
-   uint8_t cost;
-   uint16_t hP;
-   uint16_t skillAngle;
-   uint8_t skillCost;
-   uint8_t minionRace;
+  std::string singular;
+  int8_t adjective;
+  std::string plural;
+  int8_t possessivePronoun;
+  int8_t startsWithVowel;
+  int8_t pronoun;
+  int8_t article;
+  uint16_t model;
+  uint8_t behavior;
+  uint16_t icon;
+  uint16_t order;
+  uint8_t cost;
+  uint16_t hP;
+  uint16_t skillAngle;
+  uint8_t skillCost;
+  uint8_t minionRace;
 
-   Companion( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+  Companion( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
 
 struct CompanionMove
 {
-   std::string name;
+  std::string name;
 
-   CompanionMove( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+  CompanionMove( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
 
 struct CompanionTransient
 {
-   std::string description;
-   std::string descriptionEnhanced;
-   std::string tooltip;
-   std::string specialActionName;
-   std::string specialActionDescription;
-   uint8_t attack;
-   uint8_t defense;
-   uint8_t speed;
-   bool hasAreaAttack;
-   bool strengthGate;
-   bool strengthEye;
-   bool strengthShield;
-   bool strengthArcana;
-   uint8_t minionSkillType;
+  std::string description;
+  std::string descriptionEnhanced;
+  std::string tooltip;
+  std::string specialActionName;
+  std::string specialActionDescription;
+  uint8_t attack;
+  uint8_t defense;
+  uint8_t speed;
+  bool hasAreaAttack;
+  bool strengthGate;
+  bool strengthEye;
+  bool strengthShield;
+  bool strengthArcana;
+  uint8_t minionSkillType;
 
-   CompanionTransient( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+  CompanionTransient( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
 
 struct CompanyAction
 {
-   std::string name;
-   std::string description;
-   int32_t icon;
-   uint8_t fCRank;
-   uint32_t cost;
-   uint8_t order;
-   bool purchasable;
+  std::string name;
+  std::string description;
+  int32_t icon;
+  uint8_t fCRank;
+  uint32_t cost;
+  uint8_t order;
+  bool purchasable;
 
-   CompanyAction( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+  CompanyAction( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
 
 struct CompanyCraftDraft
 {
-   std::string name;
-   uint8_t companyCraftDraftCategory;
-   uint32_t order;
+  std::string name;
+  uint8_t companyCraftDraftCategory;
+  uint32_t order;
 
-   CompanyCraftDraft( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+  CompanyCraftDraft( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
 
 struct CompanyCraftDraftCategory
 {
-   std::string name;
+  std::string name;
 
-   CompanyCraftDraftCategory( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+  CompanyCraftDraftCategory( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
 
 struct CompanyCraftManufactoryState
 {
-   std::string name;
+  std::string name;
 
-   CompanyCraftManufactoryState( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+  CompanyCraftManufactoryState( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
 
 struct CompanyCraftPart
 {
-   uint8_t companyCraftType;
-   std::vector< uint16_t > companyCraftProcess;
+  uint8_t companyCraftType;
+  std::vector< uint16_t > companyCraftProcess;
 
-   CompanyCraftPart( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+  CompanyCraftPart( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
 
 struct CompanyCraftProcess
 {
 
-   CompanyCraftProcess( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+  CompanyCraftProcess( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
 
 struct CompanyCraftSequence
 {
-   int32_t resultItem;
-   int32_t companyCraftDraftCategory;
-   int32_t companyCraftType;
-   int32_t companyCraftDraft;
-   std::vector< uint16_t > companyCraftPart;
+  int32_t resultItem;
+  int32_t companyCraftDraftCategory;
+  int32_t companyCraftType;
+  int32_t companyCraftDraft;
+  std::vector< uint16_t > companyCraftPart;
 
-   CompanyCraftSequence( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+  CompanyCraftSequence( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
 
 struct CompanyCraftSupplyItem
 {
-   uint32_t item;
+  uint32_t item;
 
-   CompanyCraftSupplyItem( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+  CompanyCraftSupplyItem( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
 
 struct CompanyCraftType
 {
-   std::string name;
+  std::string name;
 
-   CompanyCraftType( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+  CompanyCraftType( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+};
+
+struct CompanyLeve
+{
+  int32_t eventItem;
+  uint8_t eventItemAmount;
+  int32_t companyLeveRule;
+
+  CompanyLeve( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+};
+
+struct CompanyLeveRule
+{
+  std::string type;
+
+  CompanyLeveRule( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
 
 struct CompleteJournal
 {
-   uint16_t requiredLevel;
-   int32_t icon;
-   std::string name;
-   std::vector< int32_t > cutscene;
+  uint16_t requiredLevel;
+  int32_t icon;
+  std::string name;
+  std::vector< int32_t > cutscene;
 
-   CompleteJournal( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+  CompleteJournal( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
 
 struct CompleteJournalCategory
 {
-   uint32_t firstQuest;
-   uint32_t lastQuest;
+  uint32_t firstQuest;
+  uint32_t lastQuest;
 
-   CompleteJournalCategory( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+  CompleteJournalCategory( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
 
 struct ContentCloseCycle
 {
-   uint32_t unixtime;
-   uint32_t timeSeconds;
+  uint32_t unixtime;
+  uint32_t timeSeconds;
 
-   ContentCloseCycle( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+  ContentCloseCycle( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
 
 struct ContentExAction
 {
-   uint32_t name;
-   uint8_t charges;
+  uint32_t name;
+  uint8_t charges;
 
-   ContentExAction( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+  ContentExAction( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
 
 struct ContentFinderCondition
 {
-   uint16_t territoryType;
-   uint8_t contentLinkType;
-   uint16_t content;
-   uint8_t contentMemberType;
-   uint8_t classJobLevelRequired;
-   uint8_t classJobLevelSync;
-   uint16_t itemLevelRequired;
-   uint16_t itemLevelSync;
-   bool allowReplacement;
-   bool highEndDuty;
-   bool dutyRecorderAllowed;
-   std::string name;
-   uint8_t contentType;
-   uint8_t transient;
-   uint32_t image;
+  uint16_t territoryType;
+  uint8_t contentLinkType;
+  uint16_t content;
+  uint8_t contentMemberType;
+  uint8_t classJobLevelRequired;
+  uint8_t classJobLevelSync;
+  uint16_t itemLevelRequired;
+  uint16_t itemLevelSync;
+  bool allowReplacement;
+  bool highEndDuty;
+  bool dutyRecorderAllowed;
+  std::string name;
+  uint8_t contentType;
+  uint32_t transient;
+  uint32_t image;
+  bool levelingRoulette;
+  bool level5060Roulette;
+  bool mSQRoulette;
+  bool guildHestRoulette;
+  bool expertRoulette;
+  bool trialRoulette;
+  bool dailyFrontlineChallenge;
+  bool level70Roulette;
+  bool mentorRoulette;
+  bool allianceRoulette;
+  bool normalRaidRoulette;
 
-   ContentFinderCondition( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+  ContentFinderCondition( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
 
 struct ContentFinderConditionTransient
 {
-   std::string description;
+  std::string description;
 
-   ContentFinderConditionTransient( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+  ContentFinderConditionTransient( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
 
 struct ContentGauge
 {
-   std::string name;
-   uint8_t color;
-   std::string textString;
+  std::string name;
+  uint8_t color;
+  std::string textString;
 
-   ContentGauge( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+  ContentGauge( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
 
 struct ContentGaugeColor
 {
-   uint32_t androidColor1;
-   uint32_t androidColor2;
-   uint32_t androidColor3;
+  uint32_t androidColor1;
+  uint32_t androidColor2;
+  uint32_t androidColor3;
 
-   ContentGaugeColor( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+  ContentGaugeColor( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
 
 struct ContentMemberType
 {
-   uint8_t tanksPerParty;
-   uint8_t healersPerParty;
-   uint8_t meleesPerParty;
-   uint8_t rangedPerParty;
+  uint8_t tanksPerParty;
+  uint8_t healersPerParty;
+  uint8_t meleesPerParty;
+  uint8_t rangedPerParty;
 
-   ContentMemberType( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+  ContentMemberType( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
 
 struct ContentNpcTalk
 {
-   std::vector< uint32_t > contentTalk;
+  std::vector< uint32_t > contentTalk;
 
-   ContentNpcTalk( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+  ContentNpcTalk( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
 
 struct ContentRoulette
 {
-   std::string name;
-   std::string description;
-   std::string dutyType;
-   bool isInDutyFinder;
-   uint8_t openRule;
-   uint8_t requiredLevel;
-   uint16_t itemLevelRequired;
-   uint32_t icon;
-   uint8_t contentRouletteRoleBonus;
-   uint16_t rewardTomeA;
-   uint16_t rewardTomeB;
-   uint16_t rewardTomeC;
-   uint8_t sortKey;
-   uint8_t contentMemberType;
-   bool requireAllDuties;
-   uint8_t contentRouletteOpenRule;
-   uint16_t instanceContent;
+  std::string name;
+  std::string description;
+  std::string dutyType;
+  bool isInDutyFinder;
+  uint8_t openRule;
+  uint8_t requiredLevel;
+  uint16_t itemLevelRequired;
+  uint32_t icon;
+  uint8_t contentRouletteRoleBonus;
+  uint16_t rewardTomeA;
+  uint16_t rewardTomeB;
+  uint16_t rewardTomeC;
+  uint8_t sortKey;
+  uint8_t contentMemberType;
+  bool requireAllDuties;
+  uint8_t contentRouletteOpenRule;
+  uint16_t instanceContent;
 
-   ContentRoulette( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+  ContentRoulette( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
 
 struct ContentRouletteOpenRule
 {
-   uint32_t type;
+  uint32_t type;
 
-   ContentRouletteOpenRule( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+  ContentRouletteOpenRule( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
 
 struct ContentRouletteRoleBonus
 {
-   uint32_t itemRewardType;
-   uint8_t rewardAmount;
+  uint32_t itemRewardType;
+  uint8_t rewardAmount;
 
-   ContentRouletteRoleBonus( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+  ContentRouletteRoleBonus( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
 
 struct ContentsNote
 {
-   uint8_t contentType;
-   uint8_t menuOrder;
-   int32_t requiredAmount;
-   int32_t expMultiplier;
-   int32_t gilRward;
-   uint16_t levelUnlock;
-   uint16_t howTo;
-   std::string name;
-   std::string description;
-   int32_t expCap;
+  uint8_t contentType;
+  uint8_t menuOrder;
+  int32_t requiredAmount;
+  int32_t expMultiplier;
+  int32_t gilRward;
+  uint16_t levelUnlock;
+  uint16_t howTo;
+  std::string name;
+  std::string description;
+  int32_t expCap;
 
-   ContentsNote( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+  ContentsNote( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
 
 struct ContentTalk
 {
-   uint8_t contentTalkParam;
-   std::string text;
+  uint8_t contentTalkParam;
+  std::string text;
 
-   ContentTalk( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+  ContentTalk( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
 
 struct ContentTalkParam
 {
-   bool param;
-   uint32_t testAction;
+  bool param;
+  uint32_t testAction;
 
-   ContentTalkParam( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+  ContentTalkParam( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
 
 struct ContentType
 {
-   std::string name;
-   uint32_t icon;
-   uint32_t iconDutyFinder;
+  std::string name;
+  uint32_t icon;
+  uint32_t iconDutyFinder;
 
-   ContentType( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+  ContentType( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
 
 struct CraftAction
 {
-   std::string name;
-   std::string description;
-   uint16_t animationStart;
-   uint16_t animationEnd;
-   uint16_t icon;
-   int8_t classJob;
-   uint8_t classJobCategory;
-   uint8_t classJobLevel;
-   uint32_t questRequirement;
-   bool specialist;
-   uint8_t cost;
-   int32_t cRP;
-   int32_t bSM;
-   int32_t aRM;
-   int32_t gSM;
-   int32_t lTW;
-   int32_t wVR;
-   int32_t aLC;
-   int32_t cUL;
+  std::string name;
+  std::string description;
+  uint16_t animationStart;
+  uint16_t animationEnd;
+  uint16_t icon;
+  int8_t classJob;
+  uint8_t classJobCategory;
+  uint8_t classJobLevel;
+  uint32_t questRequirement;
+  bool specialist;
+  uint8_t cost;
+  int32_t cRP;
+  int32_t bSM;
+  int32_t aRM;
+  int32_t gSM;
+  int32_t lTW;
+  int32_t wVR;
+  int32_t aLC;
+  int32_t cUL;
 
-   CraftAction( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+  CraftAction( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
 
 struct CraftLeve
 {
-   int32_t leve;
-   int32_t craftLeveTalk;
-   uint8_t repeats;
+  int32_t leve;
+  int32_t craftLeveTalk;
+  uint8_t repeats;
 
-   CraftLeve( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+  CraftLeve( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
 
 struct CraftType
 {
-   std::string name;
+  std::string name;
 
-   CraftType( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+  CraftType( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
 
 struct Credit
 {
-   uint16_t roles1;
-   uint16_t japaneseCast1;
-   uint16_t englishCast1;
-   uint16_t frenchCast1;
-   uint16_t germanCast1;
-   uint16_t roles2;
-   uint16_t japaneseCast2;
-   uint16_t englishCast2;
-   uint16_t frenchCast2;
-   uint16_t germanCast2;
+  uint16_t roles1;
+  uint16_t japaneseCast1;
+  uint16_t englishCast1;
+  uint16_t frenchCast1;
+  uint16_t germanCast1;
+  uint16_t roles2;
+  uint16_t japaneseCast2;
+  uint16_t englishCast2;
+  uint16_t frenchCast2;
+  uint16_t germanCast2;
 
-   Credit( uint32_t row_id, uint32_t subRow, Sapphire::Data::ExdDataGenerated* exdData );
+  Credit( uint32_t row_id, uint32_t subRow, Sapphire::Data::ExdDataGenerated* exdData );
 };
 
 struct CreditBackImage
 {
-   uint32_t backImage;
+  uint32_t backImage;
 
-   CreditBackImage( uint32_t row_id, uint32_t subRow, Sapphire::Data::ExdDataGenerated* exdData );
+  CreditBackImage( uint32_t row_id, uint32_t subRow, Sapphire::Data::ExdDataGenerated* exdData );
 };
 
 struct CreditCast
 {
-   std::string name;
+  std::string name;
 
-   CreditCast( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+  CreditCast( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+};
+
+struct CreditList
+{
+  uint16_t scale;
+  uint32_t icon;
+  uint32_t font;
+  uint32_t cast;
+
+  CreditList( uint32_t row_id, uint32_t subRow, Sapphire::Data::ExdDataGenerated* exdData );
+};
+
+struct CreditListText
+{
+  std::string name;
+
+  CreditListText( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
 
 struct Currency
 {
-   uint32_t item;
-   uint32_t limit;
+  uint32_t item;
+  uint32_t limit;
 
-   Currency( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+  Currency( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
 
 struct CustomTalk
 {
-   uint32_t iconActor;
-   uint32_t iconMap;
-   std::string name;
-   std::vector< std::string > scriptInstruction;
-   std::vector< uint32_t > scriptArg;
-   bool text;
+  uint32_t iconActor;
+  uint32_t iconMap;
+  std::string name;
+  std::vector< std::string > scriptInstruction;
+  std::vector< uint32_t > scriptArg;
+  bool text;
 
-   CustomTalk( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+  CustomTalk( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
 
 struct CustomTalkDynamicIcon
 {
-   uint32_t smallIcon;
-   uint32_t largeIcon;
+  uint32_t smallIcon;
+  uint32_t largeIcon;
 
-   CustomTalkDynamicIcon( uint32_t row_id, uint32_t subRow, Sapphire::Data::ExdDataGenerated* exdData );
+  CustomTalkDynamicIcon( uint32_t row_id, uint32_t subRow, Sapphire::Data::ExdDataGenerated* exdData );
 };
 
 struct CustomTalkNestHandlers
 {
-   uint32_t nestHandler;
+  uint32_t nestHandler;
 
-   CustomTalkNestHandlers( uint32_t row_id, uint32_t subRow, Sapphire::Data::ExdDataGenerated* exdData );
+  CustomTalkNestHandlers( uint32_t row_id, uint32_t subRow, Sapphire::Data::ExdDataGenerated* exdData );
 };
 
 struct Cutscene
 {
-   std::string path;
+  std::string path;
 
-   Cutscene( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+  Cutscene( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
 
 struct CutScreenImage
 {
-   int32_t image;
+  int32_t image;
 
-   CutScreenImage( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+  CutScreenImage( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
 
 struct DailySupplyItem
 {
 
-   DailySupplyItem( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+  DailySupplyItem( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
 
 struct DeepDungeon
 {
-   std::string name;
+  std::string name;
 
-   DeepDungeon( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+  DeepDungeon( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
 
 struct DeepDungeonBan
 {
-   uint16_t screenImage;
-   uint16_t logMessage;
-   uint16_t name;
+  uint16_t screenImage;
+  uint16_t logMessage;
+  uint16_t name;
 
-   DeepDungeonBan( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+  DeepDungeonBan( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
 
 struct DeepDungeonDanger
 {
-   uint16_t screenImage;
-   uint16_t logMessage;
-   uint16_t name;
+  uint16_t screenImage;
+  uint16_t logMessage;
+  uint16_t name;
 
-   DeepDungeonDanger( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+  DeepDungeonDanger( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
 
 struct DeepDungeonEquipment
 {
-   uint32_t icon;
-   std::string singular;
-   int8_t adjective;
-   std::string plural;
-   int8_t possessivePronoun;
-   int8_t startsWithVowel;
-   int8_t pronoun;
-   int8_t article;
-   std::string name;
-   std::string description;
+  uint32_t icon;
+  std::string singular;
+  int8_t adjective;
+  std::string plural;
+  int8_t possessivePronoun;
+  int8_t startsWithVowel;
+  int8_t pronoun;
+  int8_t article;
+  std::string name;
+  std::string description;
 
-   DeepDungeonEquipment( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+  DeepDungeonEquipment( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
 
 struct DeepDungeonFloorEffectUI
 {
-   uint32_t icon;
-   std::string name;
-   std::string description;
+  uint32_t icon;
+  std::string name;
+  std::string description;
 
-   DeepDungeonFloorEffectUI( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+  DeepDungeonFloorEffectUI( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
 
 struct DeepDungeonItem
 {
-   uint32_t icon;
-   std::string singular;
-   int8_t adjective;
-   std::string plural;
-   int8_t possessivePronoun;
-   int8_t startsWithVowel;
-   int8_t pronoun;
-   int8_t article;
-   std::string name;
-   std::string tooltip;
-   uint32_t action;
+  uint32_t icon;
+  std::string singular;
+  int8_t adjective;
+  std::string plural;
+  int8_t possessivePronoun;
+  int8_t startsWithVowel;
+  int8_t pronoun;
+  int8_t article;
+  std::string name;
+  std::string tooltip;
+  uint32_t action;
 
-   DeepDungeonItem( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+  DeepDungeonItem( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
 
 struct DeepDungeonLayer
 {
-   uint8_t deepDungeon;
+  uint8_t deepDungeon;
 
-   DeepDungeonLayer( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+  DeepDungeonLayer( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
 
 struct DeepDungeonMagicStone
 {
-   uint32_t icon;
-   std::string singular;
-   int8_t adjective;
-   std::string plural;
-   int8_t possessivePronoun;
-   int8_t startsWithVowel;
-   int8_t pronoun;
-   int8_t article;
-   std::string name;
-   std::string tooltip;
+  uint32_t icon;
+  std::string singular;
+  int8_t adjective;
+  std::string plural;
+  int8_t possessivePronoun;
+  int8_t startsWithVowel;
+  int8_t pronoun;
+  int8_t article;
+  std::string name;
+  std::string tooltip;
 
-   DeepDungeonMagicStone( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+  DeepDungeonMagicStone( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
 
 struct DeepDungeonMap5X
 {
-   std::vector< uint16_t > deepDungeonRoom;
+  std::vector< uint16_t > deepDungeonRoom;
 
-   DeepDungeonMap5X( uint32_t row_id, uint32_t subRow, Sapphire::Data::ExdDataGenerated* exdData );
+  DeepDungeonMap5X( uint32_t row_id, uint32_t subRow, Sapphire::Data::ExdDataGenerated* exdData );
 };
 
 struct DeepDungeonRoom
 {
-   std::vector< uint32_t > level;
+  std::vector< uint32_t > level;
 
-   DeepDungeonRoom( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+  DeepDungeonRoom( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
 
 struct DeepDungeonStatus
 {
-   uint16_t screenImage;
-   uint16_t logMessage;
-   uint16_t name;
+  uint16_t screenImage;
+  uint16_t logMessage;
+  uint16_t name;
 
-   DeepDungeonStatus( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+  DeepDungeonStatus( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
 
 struct DefaultTalk
 {
-   std::vector< uint16_t > actionTimelinePose;
-   std::vector< std::string > text;
+  std::vector< uint16_t > actionTimelinePose;
+  std::vector< std::string > text;
 
-   DefaultTalk( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+  DefaultTalk( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
 
 struct DefaultTalkLipSyncType
 {
-   int32_t actionTimeline;
+  int32_t actionTimeline;
 
-   DefaultTalkLipSyncType( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+  DefaultTalkLipSyncType( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
 
 struct DeliveryQuest
 {
-   int32_t quest;
+  int32_t quest;
 
-   DeliveryQuest( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+  DeliveryQuest( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
 
 struct DescriptionPage
 {
-   uint32_t text1;
-   uint32_t image1;
-   uint32_t text2;
-   uint32_t image2;
-   uint32_t text3;
-   uint32_t image3;
-   uint32_t text4;
-   uint32_t image4;
-   uint32_t text5;
-   uint32_t image5;
-   uint32_t text6;
-   uint32_t image6;
-   uint32_t text7;
-   uint32_t image7;
-   uint32_t text8;
-   uint32_t image8;
-   uint32_t text9;
-   uint32_t image9;
+  uint32_t text1;
+  uint32_t image1;
+  uint32_t text2;
+  uint32_t image2;
+  uint32_t text3;
+  uint32_t image3;
+  uint32_t text4;
+  uint32_t image4;
+  uint32_t text5;
+  uint32_t image5;
+  uint32_t text6;
+  uint32_t image6;
+  uint32_t text7;
+  uint32_t image7;
+  uint32_t text8;
+  uint32_t image8;
+  uint32_t text9;
+  uint32_t image9;
 
-   DescriptionPage( uint32_t row_id, uint32_t subRow, Sapphire::Data::ExdDataGenerated* exdData );
+  DescriptionPage( uint32_t row_id, uint32_t subRow, Sapphire::Data::ExdDataGenerated* exdData );
 };
 
 struct DescriptionString
 {
-   std::string text;
+  std::string text;
 
-   DescriptionString( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+  DescriptionString( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
 
 struct DisposalShop
 {
-   std::string shopName;
+  std::string shopName;
 
-   DisposalShop( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+  DisposalShop( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
 
 struct DisposalShopFilterType
 {
-   std::string category;
+  std::string category;
 
-   DisposalShopFilterType( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+  DisposalShopFilterType( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
 
 struct DisposalShopItem
 {
-   int32_t itemDisposed;
-   int32_t itemReceived;
-   uint32_t quantityReceived;
+  int32_t itemDisposed;
+  int32_t itemReceived;
+  uint32_t quantityReceived;
 
-   DisposalShopItem( uint32_t row_id, uint32_t subRow, Sapphire::Data::ExdDataGenerated* exdData );
+  DisposalShopItem( uint32_t row_id, uint32_t subRow, Sapphire::Data::ExdDataGenerated* exdData );
 };
 
 struct DpsChallenge
 {
-   uint16_t playerLevel;
-   uint16_t placeName;
-   uint32_t icon;
-   uint16_t order;
-   std::string name;
-   std::string description;
+  uint16_t playerLevel;
+  uint16_t placeName;
+  uint32_t icon;
+  uint16_t order;
+  std::string name;
+  std::string description;
 
-   DpsChallenge( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+  DpsChallenge( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
 
 struct DpsChallengeOfficer
 {
-   uint32_t unlockQuest;
-   std::vector< uint16_t > challengeName;
+  uint32_t unlockQuest;
+  std::vector< uint16_t > challengeName;
 
-   DpsChallengeOfficer( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+  DpsChallengeOfficer( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
 
 struct DpsChallengeTransient
 {
-   uint16_t instanceContent;
+  uint16_t instanceContent;
 
-   DpsChallengeTransient( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+  DpsChallengeTransient( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
 
 struct EmjAddon
 {
-   std::string text;
+  std::string text;
 
-   EmjAddon( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+  EmjAddon( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
 
 struct EmjDani
 {
-   uint32_t icon;
+  uint32_t icon;
 
-   EmjDani( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+  EmjDani( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
 
 struct Emote
 {
-   std::string name;
-   std::vector< uint16_t > actionTimeline;
-   uint8_t emoteCategory;
-   uint8_t emoteMode;
-   bool hasCancelEmote;
-   bool drawsWeapon;
-   int32_t textCommand;
-   uint16_t icon;
-   uint16_t logMessageTargeted;
-   uint16_t logMessageUntargeted;
-   uint32_t unlockLink;
+  std::string name;
+  std::vector< uint16_t > actionTimeline;
+  uint8_t emoteCategory;
+  uint8_t emoteMode;
+  bool hasCancelEmote;
+  bool drawsWeapon;
+  int32_t textCommand;
+  uint16_t icon;
+  uint16_t logMessageTargeted;
+  uint16_t logMessageUntargeted;
+  uint32_t unlockLink;
 
-   Emote( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+  Emote( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
 
 struct EmoteCategory
 {
-   std::string name;
+  std::string name;
 
-   EmoteCategory( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+  EmoteCategory( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
 
 struct ENpcBase
 {
-   std::vector< uint32_t > eNpcData;
-   uint8_t race;
-   uint8_t gender;
-   uint8_t bodyType;
-   uint8_t height;
-   uint8_t tribe;
-   uint8_t face;
-   uint8_t hairStyle;
-   uint8_t hairHighlight;
-   uint8_t skinColor;
-   uint8_t eyeHeterochromia;
-   uint8_t hairColor;
-   uint8_t hairHighlightColor;
-   uint8_t facialFeature;
-   uint8_t facialFeatureColor;
-   uint8_t eyebrows;
-   uint8_t eyeColor;
-   uint8_t eyeShape;
-   uint8_t nose;
-   uint8_t jaw;
-   uint8_t mouth;
-   uint8_t lipColor;
-   uint8_t bustOrTone1;
-   uint8_t extraFeature1;
-   uint8_t extraFeature2OrBust;
-   uint8_t facePaint;
-   uint8_t facePaintColor;
-   uint16_t npcEquip;
-   uint16_t behavior;
-   uint64_t modelMainHand;
-   uint8_t dyeMainHand;
-   uint64_t modelOffHand;
-   uint8_t dyeOffHand;
-   uint32_t modelHead;
-   uint8_t dyeHead;
-   bool visor;
-   uint32_t modelBody;
-   uint8_t dyeBody;
-   uint32_t modelHands;
-   uint8_t dyeHands;
-   uint32_t modelLegs;
-   uint8_t dyeLegs;
-   uint32_t modelFeet;
-   uint8_t dyeFeet;
-   uint32_t modelEars;
-   uint8_t dyeEars;
-   uint32_t modelNeck;
-   uint8_t dyeNeck;
-   uint32_t modelWrists;
-   uint8_t dyeWrists;
-   uint32_t modelLeftRing;
-   uint8_t dyeLeftRing;
-   uint32_t modelRightRing;
-   uint8_t dyeRightRing;
-   uint16_t balloon;
+  std::vector< uint32_t > eNpcData;
+  float scale;
+  uint16_t modelChara;
+  uint8_t race;
+  uint8_t gender;
+  uint8_t bodyType;
+  uint8_t height;
+  uint8_t tribe;
+  uint8_t face;
+  uint8_t hairStyle;
+  uint8_t hairHighlight;
+  uint8_t skinColor;
+  uint8_t eyeHeterochromia;
+  uint8_t hairColor;
+  uint8_t hairHighlightColor;
+  uint8_t facialFeature;
+  uint8_t facialFeatureColor;
+  uint8_t eyebrows;
+  uint8_t eyeColor;
+  uint8_t eyeShape;
+  uint8_t nose;
+  uint8_t jaw;
+  uint8_t mouth;
+  uint8_t lipColor;
+  uint8_t bustOrTone1;
+  uint8_t extraFeature1;
+  uint8_t extraFeature2OrBust;
+  uint8_t facePaint;
+  uint8_t facePaintColor;
+  uint16_t npcEquip;
+  uint16_t behavior;
+  uint64_t modelMainHand;
+  uint8_t dyeMainHand;
+  uint64_t modelOffHand;
+  uint8_t dyeOffHand;
+  uint32_t modelHead;
+  uint8_t dyeHead;
+  bool visor;
+  uint32_t modelBody;
+  uint8_t dyeBody;
+  uint32_t modelHands;
+  uint8_t dyeHands;
+  uint32_t modelLegs;
+  uint8_t dyeLegs;
+  uint32_t modelFeet;
+  uint8_t dyeFeet;
+  uint32_t modelEars;
+  uint8_t dyeEars;
+  uint32_t modelNeck;
+  uint8_t dyeNeck;
+  uint32_t modelWrists;
+  uint8_t dyeWrists;
+  uint32_t modelLeftRing;
+  uint8_t dyeLeftRing;
+  uint32_t modelRightRing;
+  uint8_t dyeRightRing;
+  uint16_t balloon;
 
-   ENpcBase( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+  ENpcBase( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
 
 struct ENpcDressUp
 {
-   uint8_t eNpcDressUpDress;
+  uint8_t eNpcDressUpDress;
 
-   ENpcDressUp( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+  ENpcDressUp( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
 
 struct ENpcDressUpDress
 {
-   uint32_t eNpc;
+  uint32_t eNpc;
 
-   ENpcDressUpDress( uint32_t row_id, uint32_t subRow, Sapphire::Data::ExdDataGenerated* exdData );
+  ENpcDressUpDress( uint32_t row_id, uint32_t subRow, Sapphire::Data::ExdDataGenerated* exdData );
 };
 
 struct ENpcResident
 {
-   std::string singular;
-   int8_t adjective;
-   std::string plural;
-   int8_t possessivePronoun;
-   int8_t startsWithVowel;
-   int8_t pronoun;
-   int8_t article;
-   std::string title;
-   uint8_t map;
+  std::string singular;
+  int8_t adjective;
+  std::string plural;
+  int8_t possessivePronoun;
+  int8_t startsWithVowel;
+  int8_t pronoun;
+  int8_t article;
+  std::string title;
+  uint8_t map;
 
-   ENpcResident( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+  ENpcResident( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
 
 struct EObj
 {
-   uint32_t data;
-   uint16_t sgbPath;
+  uint32_t data;
+  uint16_t sgbPath;
 
-   EObj( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+  EObj( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
 
 struct EObjName
 {
-   std::string singular;
-   int8_t adjective;
-   std::string plural;
-   int8_t possessivePronoun;
-   int8_t startsWithVowel;
-   int8_t pronoun;
-   int8_t article;
+  std::string singular;
+  int8_t adjective;
+  std::string plural;
+  int8_t possessivePronoun;
+  int8_t startsWithVowel;
+  int8_t pronoun;
+  int8_t article;
 
-   EObjName( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+  EObjName( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
 
 struct EquipRaceCategory
 {
-   bool hyur;
-   bool elezen;
-   bool lalafell;
-   bool miqote;
-   bool roegadyn;
-   bool auRa;
-   bool male;
-   bool female;
+  bool hyur;
+  bool elezen;
+  bool lalafell;
+  bool miqote;
+  bool roegadyn;
+  bool auRa;
+  bool male;
+  bool female;
 
-   EquipRaceCategory( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+  EquipRaceCategory( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
 
 struct EquipSlotCategory
 {
-   int8_t mainHand;
-   int8_t offHand;
-   int8_t head;
-   int8_t body;
-   int8_t gloves;
-   int8_t waist;
-   int8_t legs;
-   int8_t feet;
-   int8_t ears;
-   int8_t neck;
-   int8_t wrists;
-   int8_t fingerL;
-   int8_t fingerR;
-   int8_t soulCrystal;
+  int8_t mainHand;
+  int8_t offHand;
+  int8_t head;
+  int8_t body;
+  int8_t gloves;
+  int8_t waist;
+  int8_t legs;
+  int8_t feet;
+  int8_t ears;
+  int8_t neck;
+  int8_t wrists;
+  int8_t fingerL;
+  int8_t fingerR;
+  int8_t soulCrystal;
 
-   EquipSlotCategory( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+  EquipSlotCategory( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
 
 struct EurekaAetherItem
 {
-   std::string singular;
-   int8_t adjective;
-   std::string plural;
-   int8_t possessivePronoun;
-   int8_t startsWithVowel;
-   int8_t pronoun;
-   int8_t article;
-   std::string name;
+  std::string singular;
+  int8_t adjective;
+  std::string plural;
+  int8_t possessivePronoun;
+  int8_t startsWithVowel;
+  int8_t pronoun;
+  int8_t article;
+  std::string name;
 
-   EurekaAetherItem( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+  EurekaAetherItem( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
 
 struct EurekaAethernet
 {
-   uint16_t location;
+  uint16_t location;
 
-   EurekaAethernet( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+  EurekaAethernet( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
 
 struct EurekaGrowData
 {
-   uint16_t baseResistance;
+  uint16_t baseResistance;
 
-   EurekaGrowData( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+  EurekaGrowData( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
 
 struct EurekaLogosMixerProbability
 {
-   uint8_t probability;
+  uint8_t probability;
 
-   EurekaLogosMixerProbability( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+  EurekaLogosMixerProbability( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
 
 struct EurekaMagiaAction
 {
-   uint32_t action;
-   uint8_t maxUses;
+  uint32_t action;
+  uint8_t maxUses;
 
-   EurekaMagiaAction( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+  EurekaMagiaAction( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
 
 struct EurekaMagiciteItem
 {
-   uint8_t eurekaMagiciteItemType;
-   uint8_t classJobCategory;
-   uint32_t item;
+  uint8_t eurekaMagiciteItemType;
+  uint8_t classJobCategory;
+  uint32_t item;
 
-   EurekaMagiciteItem( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+  EurekaMagiciteItem( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
 
 struct EurekaMagiciteItemType
 {
-   std::string type;
+  std::string type;
 
-   EurekaMagiciteItemType( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+  EurekaMagiciteItemType( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
 
 struct EurekaSphereElementAdjust
 {
-   uint16_t powerModifier;
+  uint16_t powerModifier;
 
-   EurekaSphereElementAdjust( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+  EurekaSphereElementAdjust( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
 
 struct EventAction
 {
-   std::string name;
-   uint16_t icon;
-   uint8_t castTime;
-   std::vector< uint16_t > animation;
+  std::string name;
+  uint16_t icon;
+  uint8_t castTime;
+  std::vector< uint16_t > animation;
 
-   EventAction( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+  EventAction( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
 
 struct EventIconPriority
 {
-   std::vector< uint32_t > icon;
+  std::vector< uint32_t > icon;
 
-   EventIconPriority( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+  EventIconPriority( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
 
 struct EventIconType
 {
-   uint32_t npcIconAvailable;
-   uint32_t mapIconAvailable;
-   uint32_t npcIconInvalid;
-   uint32_t mapIconInvalid;
-   uint8_t iconRange;
+  uint32_t npcIconAvailable;
+  uint32_t mapIconAvailable;
+  uint32_t npcIconInvalid;
+  uint32_t mapIconInvalid;
+  uint8_t iconRange;
 
-   EventIconType( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+  EventIconType( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
 
 struct EventItem
 {
-   std::string singular;
-   int8_t adjective;
-   std::string plural;
-   int8_t possessivePronoun;
-   int8_t startsWithVowel;
-   int8_t pronoun;
-   int8_t article;
-   std::string name;
-   uint16_t icon;
-   uint16_t action;
-   uint8_t stackSize;
-   uint32_t quest;
-   uint8_t castTime;
+  std::string singular;
+  int8_t adjective;
+  std::string plural;
+  int8_t possessivePronoun;
+  int8_t startsWithVowel;
+  int8_t pronoun;
+  int8_t article;
+  std::string name;
+  uint16_t icon;
+  uint16_t action;
+  uint8_t stackSize;
+  uint32_t quest;
+  uint8_t castTime;
 
-   EventItem( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+  EventItem( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
 
 struct EventItemCastTimeline
 {
-   uint32_t actionTimeline;
+  uint32_t actionTimeline;
 
-   EventItemCastTimeline( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+  EventItemCastTimeline( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
 
 struct EventItemHelp
 {
-   std::string description;
+  std::string description;
 
-   EventItemHelp( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+  EventItemHelp( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
 
 struct EventItemTimeline
 {
-   uint32_t actionTimeline;
+  uint32_t actionTimeline;
 
-   EventItemTimeline( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+  EventItemTimeline( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
 
 struct ExportedSG
 {
-   std::string sgbPath;
+  std::string sgbPath;
 
-   ExportedSG( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+  ExportedSG( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
 
 struct ExVersion
 {
-   std::string name;
+  std::string name;
 
-   ExVersion( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+  ExVersion( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
 
 struct Fate
 {
-   uint8_t eurekaFate;
-   uint32_t location;
-   uint8_t classJobLevel;
-   uint8_t classJobLevelMax;
-   uint32_t eventItem;
-   uint32_t iconObjective;
-   uint32_t iconMap;
-   int32_t music;
-   bool hasWorldMapIcon;
-   std::string name;
-   std::string description;
-   std::string objective;
-   std::vector< std::string > statusText;
-   uint32_t arrayIndex;
+  uint8_t eurekaFate;
+  uint32_t location;
+  uint8_t classJobLevel;
+  uint8_t classJobLevelMax;
+  uint32_t eventItem;
+  uint32_t iconObjective;
+  uint32_t iconMap;
+  int32_t music;
+  bool hasWorldMapIcon;
+  std::string name;
+  std::string description;
+  std::string objective;
+  std::vector< std::string > statusText;
+  uint32_t arrayIndex;
 
-   Fate( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+  Fate( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
 
 struct FCActivity
 {
-   std::string text;
-   uint8_t fCActivityCategory;
+  std::string text;
+  uint8_t fCActivityCategory;
 
-   FCActivity( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+  FCActivity( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
 
 struct FCActivityCategory
 {
-   std::string name;
+  std::string name;
 
-   FCActivityCategory( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+  FCActivityCategory( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
 
 struct FCAuthority
 {
-   std::string name;
-   int32_t fCAuthorityCategory;
+  std::string name;
+  int32_t fCAuthorityCategory;
 
-   FCAuthority( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+  FCAuthority( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
 
 struct FCAuthorityCategory
 {
-   std::string name;
+  std::string name;
 
-   FCAuthorityCategory( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+  FCAuthorityCategory( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
 
 struct FCChestName
 {
-   std::string name;
+  std::string name;
 
-   FCChestName( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+  FCChestName( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
 
 struct FccShop
 {
-   std::string name;
+  std::string name;
 
-   FccShop( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+  FccShop( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
 
 struct FCHierarchy
 {
-   std::string name;
+  std::string name;
 
-   FCHierarchy( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+  FCHierarchy( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
 
 struct FCProfile
 {
-   std::string name;
+  std::string name;
 
-   FCProfile( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+  FCProfile( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
 
 struct FCReputation
 {
-   uint32_t pointsToNext;
-   uint32_t requiredPoints;
-   std::string name;
+  uint32_t pointsToNext;
+  uint32_t requiredPoints;
+  std::string name;
 
-   FCReputation( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+  FCReputation( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
 
 struct FCRights
 {
-   std::string name;
-   std::string description;
-   uint16_t icon;
-   uint8_t fCRank;
+  std::string name;
+  std::string description;
+  uint16_t icon;
+  uint8_t fCRank;
 
-   FCRights( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+  FCRights( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
 
 struct Festival
 {
-   std::string name;
+  std::string name;
 
-   Festival( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+  Festival( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
 
 struct FieldMarker
 {
-   int32_t vFX;
-   uint16_t icon;
+  int32_t vFX;
+  uint16_t icon;
 
-   FieldMarker( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+  FieldMarker( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
 
 struct FishingRecordType
 {
-   int32_t addon;
+  int32_t addon;
 
-   FishingRecordType( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+  FishingRecordType( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
 
 struct FishingRecordTypeTransient
 {
-   int32_t image;
+  int32_t image;
 
-   FishingRecordTypeTransient( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+  FishingRecordTypeTransient( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
 
 struct FishingSpot
 {
-   uint8_t gatheringLevel;
-   std::string bigFishOnReach;
-   std::string bigFishOnEnd;
-   uint8_t fishingSpotCategory;
-   uint16_t territoryType;
-   int16_t x;
-   int16_t z;
-   uint16_t radius;
-   std::vector< int32_t > item;
-   uint16_t placeName;
+  uint8_t gatheringLevel;
+  std::string bigFishOnReach;
+  std::string bigFishOnEnd;
+  uint8_t fishingSpotCategory;
+  uint16_t territoryType;
+  int16_t x;
+  int16_t z;
+  uint16_t radius;
+  std::vector< int32_t > item;
+  uint16_t placeName;
 
-   FishingSpot( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+  FishingSpot( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
 
 struct FishParameter
 {
-   std::string text;
-   int32_t item;
-   uint16_t gatheringItemLevel;
-   bool isHidden;
-   uint8_t fishingRecordType;
-   int32_t territoryType;
-   bool isInLog;
-   bool timeRestricted;
-   bool weatherRestricted;
-   uint16_t gatheringSubCategory;
+  std::string text;
+  int32_t item;
+  uint16_t gatheringItemLevel;
+  bool isHidden;
+  uint8_t fishingRecordType;
+  int32_t territoryType;
+  bool isInLog;
+  bool timeRestricted;
+  bool weatherRestricted;
+  uint16_t gatheringSubCategory;
 
-   FishParameter( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+  FishParameter( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
 
 struct Frontline03
 {
-   std::vector< uint32_t > emptyIcon;
-   std::vector< uint32_t > maelstromIcon;
-   std::vector< uint32_t > twinAdderIcon;
-   std::vector< uint32_t > immortalFlamesIcon;
+  std::vector< uint32_t > emptyIcon;
+  std::vector< uint32_t > maelstromIcon;
+  std::vector< uint32_t > twinAdderIcon;
+  std::vector< uint32_t > immortalFlamesIcon;
 
-   Frontline03( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+  Frontline03( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
 
 struct Frontline04
 {
-   int32_t level1;
-   int32_t level2;
-   int32_t level3;
-   std::vector< int32_t > unknownLevel;
+  int32_t level1;
+  int32_t level2;
+  int32_t level3;
+  std::vector< int32_t > unknownLevel;
 
-   Frontline04( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+  Frontline04( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
 
 struct GardeningSeed
 {
-   uint32_t item;
-   uint32_t icon;
+  uint32_t item;
+  uint32_t icon;
 
-   GardeningSeed( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+  GardeningSeed( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
 
 struct GatheringCondition
 {
-   std::string text;
+  std::string text;
 
-   GatheringCondition( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+  GatheringCondition( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
 
 struct GatheringExp
 {
-   uint16_t exp;
+  uint16_t exp;
 
-   GatheringExp( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+  GatheringExp( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
 
 struct GatheringItem
 {
-   int32_t item;
-   uint16_t gatheringItemLevel;
-   bool isHidden;
+  int32_t item;
+  uint16_t gatheringItemLevel;
+  bool isHidden;
 
-   GatheringItem( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+  GatheringItem( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
 
 struct GatheringItemLevelConvertTable
 {
-   uint8_t gatheringItemLevel;
-   uint8_t stars;
+  uint8_t gatheringItemLevel;
+  uint8_t stars;
 
-   GatheringItemLevelConvertTable( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+  GatheringItemLevelConvertTable( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
 
 struct GatheringItemPoint
 {
-   uint32_t gatheringPoint;
+  uint32_t gatheringPoint;
 
-   GatheringItemPoint( uint32_t row_id, uint32_t subRow, Sapphire::Data::ExdDataGenerated* exdData );
+  GatheringItemPoint( uint32_t row_id, uint32_t subRow, Sapphire::Data::ExdDataGenerated* exdData );
 };
 
 struct GatheringLeve
 {
-   int32_t requiredItem1;
-   uint8_t leveLevel;
-   int32_t requiredItem2;
+  int32_t requiredItem1;
+  uint8_t leveLevel;
+  int32_t requiredItem2;
 
-   GatheringLeve( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+  GatheringLeve( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
 
 struct GatheringLeveRoute
 {
 
-   GatheringLeveRoute( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+  GatheringLeveRoute( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
 
 struct GatheringNotebookList
 {
-   std::vector< int32_t > gatheringItem;
+  std::vector< int32_t > gatheringItem;
 
-   GatheringNotebookList( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+  GatheringNotebookList( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
 
 struct GatheringPoint
 {
-   int32_t gatheringPointBase;
-   std::vector< uint16_t > gatheringPointBonus;
-   uint16_t territoryType;
-   uint16_t placeName;
-   uint16_t gatheringSubCategory;
+  int32_t gatheringPointBase;
+  std::vector< uint16_t > gatheringPointBonus;
+  uint16_t territoryType;
+  uint16_t placeName;
+  uint16_t gatheringSubCategory;
 
-   GatheringPoint( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+  GatheringPoint( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
 
 struct GatheringPointBase
 {
-   int32_t gatheringType;
-   uint8_t gatheringLevel;
-   std::vector< int32_t > item;
-   bool isLimited;
+  int32_t gatheringType;
+  uint8_t gatheringLevel;
+  std::vector< int32_t > item;
+  bool isLimited;
 
-   GatheringPointBase( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+  GatheringPointBase( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
 
 struct GatheringPointBonus
 {
-   uint8_t condition;
-   uint16_t conditionValue;
-   uint8_t bonusType;
-   uint16_t bonusValue;
+  uint8_t condition;
+  uint16_t conditionValue;
+  uint8_t bonusType;
+  uint16_t bonusValue;
 
-   GatheringPointBonus( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+  GatheringPointBonus( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
 
 struct GatheringPointBonusType
 {
-   std::string text;
+  std::string text;
 
-   GatheringPointBonusType( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+  GatheringPointBonusType( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
 
 struct GatheringPointName
 {
-   std::string singular;
-   int8_t adjective;
-   std::string plural;
-   int8_t possessivePronoun;
-   int8_t startsWithVowel;
-   int8_t pronoun;
-   int8_t article;
+  std::string singular;
+  int8_t adjective;
+  std::string plural;
+  int8_t possessivePronoun;
+  int8_t startsWithVowel;
+  int8_t pronoun;
+  int8_t article;
 
-   GatheringPointName( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+  GatheringPointName( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
 
 struct GatheringSubCategory
 {
-   int32_t item;
-   std::string folkloreBook;
+  int32_t item;
+  std::string folkloreBook;
 
-   GatheringSubCategory( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+  GatheringSubCategory( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
 
 struct GatheringType
 {
-   std::string name;
-   int32_t iconMain;
-   int32_t iconOff;
+  std::string name;
+  int32_t iconMain;
+  int32_t iconOff;
 
-   GatheringType( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+  GatheringType( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
 
 struct GcArmyCaptureTactics
 {
-   int32_t name;
-   uint8_t hP;
-   uint8_t damageDealt;
-   uint8_t damageReceived;
-   uint32_t tactic;
-   uint32_t icon;
+  int32_t name;
+  uint8_t hP;
+  uint8_t damageDealt;
+  uint8_t damageReceived;
+  uint32_t tactic;
+  uint32_t icon;
 
-   GcArmyCaptureTactics( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+  GcArmyCaptureTactics( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
 
 struct GcArmyExpedition
 {
-   uint8_t requiredFlag;
-   uint8_t unlockFlag;
-   uint8_t requiredLevel;
-   uint16_t requiredSeals;
-   uint32_t rewardExperience;
-   uint8_t percentBase;
-   uint8_t gcArmyExpeditionType;
-   std::string name;
-   std::string description;
+  uint8_t requiredFlag;
+  uint8_t unlockFlag;
+  uint8_t requiredLevel;
+  uint16_t requiredSeals;
+  uint32_t rewardExperience;
+  uint8_t percentBase;
+  uint8_t gcArmyExpeditionType;
+  std::string name;
+  std::string description;
 
-   GcArmyExpedition( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+  GcArmyExpedition( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
 
 struct GcArmyExpeditionMemberBonus
 {
-   uint8_t race;
-   uint8_t classJob;
+  uint8_t race;
+  uint8_t classJob;
 
-   GcArmyExpeditionMemberBonus( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+  GcArmyExpeditionMemberBonus( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
 
 struct GcArmyExpeditionType
 {
-   std::string name;
+  std::string name;
 
-   GcArmyExpeditionType( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+  GcArmyExpeditionType( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
 
 struct GcArmyMemberGrow
 {
-   uint8_t classJob;
-   int32_t classBook;
+  uint8_t classJob;
+  int32_t classBook;
 
-   GcArmyMemberGrow( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+  GcArmyMemberGrow( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
 
 struct GcArmyTraining
 {
-   int8_t physicalBonus;
-   int8_t mentalBonus;
-   int8_t tacticalBonus;
-   uint32_t experience;
-   std::string name;
-   std::string description;
+  int8_t physicalBonus;
+  int8_t mentalBonus;
+  int8_t tacticalBonus;
+  uint32_t experience;
+  std::string name;
+  std::string description;
 
-   GcArmyTraining( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+  GcArmyTraining( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
 
 struct GCRankGridaniaFemaleText
 {
-   std::string singular;
-   int8_t adjective;
-   std::string plural;
-   int8_t possessivePronoun;
-   int8_t startsWithVowel;
-   int8_t pronoun;
-   int8_t article;
-   std::string nameRank;
+  std::string singular;
+  int8_t adjective;
+  std::string plural;
+  int8_t possessivePronoun;
+  int8_t startsWithVowel;
+  int8_t pronoun;
+  int8_t article;
+  std::string nameRank;
 
-   GCRankGridaniaFemaleText( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+  GCRankGridaniaFemaleText( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
 
 struct GCRankGridaniaMaleText
 {
-   std::string singular;
-   int8_t adjective;
-   std::string plural;
-   int8_t possessivePronoun;
-   int8_t startsWithVowel;
-   int8_t pronoun;
-   int8_t article;
-   std::string nameRank;
+  std::string singular;
+  int8_t adjective;
+  std::string plural;
+  int8_t possessivePronoun;
+  int8_t startsWithVowel;
+  int8_t pronoun;
+  int8_t article;
+  std::string nameRank;
 
-   GCRankGridaniaMaleText( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+  GCRankGridaniaMaleText( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
 
 struct GCRankLimsaFemaleText
 {
-   std::string singular;
-   int8_t adjective;
-   std::string plural;
-   int8_t possessivePronoun;
-   int8_t startsWithVowel;
-   int8_t pronoun;
-   int8_t article;
-   std::string nameRank;
+  std::string singular;
+  int8_t adjective;
+  std::string plural;
+  int8_t possessivePronoun;
+  int8_t startsWithVowel;
+  int8_t pronoun;
+  int8_t article;
+  std::string nameRank;
 
-   GCRankLimsaFemaleText( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+  GCRankLimsaFemaleText( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
 
 struct GCRankLimsaMaleText
 {
-   std::string singular;
-   int8_t adjective;
-   std::string plural;
-   int8_t possessivePronoun;
-   int8_t startsWithVowel;
-   int8_t pronoun;
-   int8_t article;
-   std::string nameRank;
+  std::string singular;
+  int8_t adjective;
+  std::string plural;
+  int8_t possessivePronoun;
+  int8_t startsWithVowel;
+  int8_t pronoun;
+  int8_t article;
+  std::string nameRank;
 
-   GCRankLimsaMaleText( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+  GCRankLimsaMaleText( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
 
 struct GCRankUldahFemaleText
 {
-   std::string singular;
-   int8_t adjective;
-   std::string plural;
-   int8_t possessivePronoun;
-   int8_t startsWithVowel;
-   int8_t pronoun;
-   int8_t article;
-   std::string nameRank;
+  std::string singular;
+  int8_t adjective;
+  std::string plural;
+  int8_t possessivePronoun;
+  int8_t startsWithVowel;
+  int8_t pronoun;
+  int8_t article;
+  std::string nameRank;
 
-   GCRankUldahFemaleText( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+  GCRankUldahFemaleText( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
 
 struct GCRankUldahMaleText
 {
-   std::string singular;
-   int8_t adjective;
-   std::string plural;
-   int8_t possessivePronoun;
-   int8_t startsWithVowel;
-   int8_t pronoun;
-   int8_t article;
-   std::string nameRank;
+  std::string singular;
+  int8_t adjective;
+  std::string plural;
+  int8_t possessivePronoun;
+  int8_t startsWithVowel;
+  int8_t pronoun;
+  int8_t article;
+  std::string nameRank;
 
-   GCRankUldahMaleText( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+  GCRankUldahMaleText( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
 
 struct GCScripShopCategory
 {
-   int8_t grandCompany;
-   int8_t tier;
-   int8_t subCategory;
+  int8_t grandCompany;
+  int8_t tier;
+  int8_t subCategory;
 
-   GCScripShopCategory( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+  GCScripShopCategory( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
 
 struct GCScripShopItem
 {
-   int32_t item;
-   int32_t requiredGrandCompanyRank;
-   uint32_t costGCSeals;
-   uint8_t sortKey;
+  int32_t item;
+  int32_t requiredGrandCompanyRank;
+  uint32_t costGCSeals;
+  uint8_t sortKey;
 
-   GCScripShopItem( uint32_t row_id, uint32_t subRow, Sapphire::Data::ExdDataGenerated* exdData );
+  GCScripShopItem( uint32_t row_id, uint32_t subRow, Sapphire::Data::ExdDataGenerated* exdData );
 };
 
 struct GCShop
 {
-   int8_t grandCompany;
+  int8_t grandCompany;
 
-   GCShop( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+  GCShop( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
 
 struct GCShopItemCategory
 {
-   std::string name;
+  std::string name;
 
-   GCShopItemCategory( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+  GCShopItemCategory( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
 
 struct GCSupplyDuty
 {
 
-   GCSupplyDuty( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+  GCSupplyDuty( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
 
 struct GCSupplyDutyReward
 {
-   uint32_t experienceSupply;
-   uint32_t experienceProvisioning;
-   uint32_t sealsExpertDelivery;
-   uint32_t sealsSupply;
-   uint32_t sealsProvisioning;
+  uint32_t experienceSupply;
+  uint32_t experienceProvisioning;
+  uint32_t sealsExpertDelivery;
+  uint32_t sealsSupply;
+  uint32_t sealsProvisioning;
 
-   GCSupplyDutyReward( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+  GCSupplyDutyReward( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
 
 struct GeneralAction
 {
-   std::string name;
-   std::string description;
-   uint16_t action;
-   uint16_t unlockLink;
-   int32_t icon;
+  std::string name;
+  std::string description;
+  uint16_t action;
+  uint16_t unlockLink;
+  int32_t icon;
 
-   GeneralAction( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+  GeneralAction( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
 
 struct GFATE
 {
-   std::vector< uint32_t > icon;
+  std::vector< uint32_t > icon;
 
-   GFATE( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+  GFATE( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
 
 struct GFateClimbing2
 {
-   uint32_t contentEntry;
+  uint32_t contentEntry;
 
-   GFateClimbing2( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+  GFateClimbing2( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
 
 struct GFateClimbing2Content
 {
-   uint32_t publicContentTextData;
+  uint32_t publicContentTextData;
 
-   GFateClimbing2Content( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+  GFateClimbing2Content( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
 
 struct GFateClimbing2TotemType
 {
-   uint32_t publicContentTextData;
+  uint32_t publicContentTextData;
 
-   GFateClimbing2TotemType( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+  GFateClimbing2TotemType( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
 
 struct GFateRideShooting
 {
-   uint32_t contentEntry;
+  uint32_t contentEntry;
 
-   GFateRideShooting( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+  GFateRideShooting( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
 
 struct GilShop
 {
-   std::string name;
-   uint32_t icon;
-   std::vector< uint32_t > questRequired;
-   int32_t acceptTalk;
-   int32_t failTalk;
+  std::string name;
+  uint32_t icon;
+  std::vector< uint32_t > questRequired;
+  int32_t acceptTalk;
+  int32_t failTalk;
 
-   GilShop( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+  GilShop( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
 
 struct GilShopItem
 {
-   int32_t item;
-   std::vector< int32_t > rowRequired;
-   uint16_t stateRequired;
-   uint16_t patch;
+  int32_t item;
+  std::vector< int32_t > rowRequired;
+  uint16_t stateRequired;
+  uint16_t patch;
 
-   GilShopItem( uint32_t row_id, uint32_t subRow, Sapphire::Data::ExdDataGenerated* exdData );
+  GilShopItem( uint32_t row_id, uint32_t subRow, Sapphire::Data::ExdDataGenerated* exdData );
 };
 
 struct GoldSaucerArcadeMachine
 {
-   uint32_t failImage;
-   uint32_t poor;
-   uint32_t good;
-   uint32_t great;
-   uint32_t excellent;
+  uint32_t failImage;
+  uint32_t poor;
+  uint32_t good;
+  uint32_t great;
+  uint32_t excellent;
 
-   GoldSaucerArcadeMachine( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+  GoldSaucerArcadeMachine( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
 
 struct GoldSaucerTextData
 {
-   std::string text;
+  std::string text;
 
-   GoldSaucerTextData( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+  GoldSaucerTextData( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
 
 struct GrandCompany
 {
-   std::string name;
+  std::string name;
 
-   GrandCompany( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+  GrandCompany( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
 
 struct GrandCompanyRank
 {
-   uint8_t tier;
-   uint8_t order;
-   uint32_t maxSeals;
-   uint32_t requiredSeals;
-   int32_t iconMaelstrom;
-   int32_t iconSerpents;
-   int32_t iconFlames;
-   int32_t questMaelstrom;
-   int32_t questSerpents;
-   int32_t questFlames;
+  uint8_t tier;
+  uint8_t order;
+  uint32_t maxSeals;
+  uint32_t requiredSeals;
+  int32_t iconMaelstrom;
+  int32_t iconSerpents;
+  int32_t iconFlames;
+  int32_t questMaelstrom;
+  int32_t questSerpents;
+  int32_t questFlames;
 
-   GrandCompanyRank( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+  GrandCompanyRank( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
 
 struct GuardianDeity
 {
-   std::string name;
-   std::string description;
-   uint16_t icon;
+  std::string name;
+  std::string description;
+  uint16_t icon;
 
-   GuardianDeity( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+  GuardianDeity( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
 
 struct GuildleveAssignment
 {
-   uint32_t assignmentTalk;
-   std::vector< uint32_t > quest;
+  uint32_t assignmentTalk;
+  std::vector< uint32_t > quest;
 
-   GuildleveAssignment( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+  GuildleveAssignment( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
 
 struct GuildleveAssignmentCategory
 {
-   std::vector< int32_t > category;
+  std::vector< int32_t > category;
 
-   GuildleveAssignmentCategory( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+  GuildleveAssignmentCategory( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
 
 struct GuildOrderGuide
 {
 
-   GuildOrderGuide( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+  GuildOrderGuide( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
 
 struct GuildOrderOfficer
 {
 
-   GuildOrderOfficer( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+  GuildOrderOfficer( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
 
 struct HairMakeType
 {
-   int32_t race;
-   int32_t tribe;
-   int8_t gender;
+  int32_t race;
+  int32_t tribe;
+  int8_t gender;
 
-   HairMakeType( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+  HairMakeType( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
 
 struct HouseRetainerPose
 {
-   uint16_t actionTimeline;
+  uint16_t actionTimeline;
 
-   HouseRetainerPose( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+  HouseRetainerPose( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
 
 struct HousingAethernet
 {
-   uint32_t level;
-   uint16_t territoryType;
-   uint16_t placeName;
-   uint8_t order;
+  uint32_t level;
+  uint16_t territoryType;
+  uint16_t placeName;
+  uint8_t order;
 
-   HousingAethernet( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+  HousingAethernet( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
 
 struct HousingAppeal
 {
-   std::string tag;
-   uint32_t icon;
-   uint8_t order;
+  std::string tag;
+  uint32_t icon;
+  uint8_t order;
 
-   HousingAppeal( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+  HousingAppeal( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
 
 struct HousingEmploymentNpcList
 {
-   uint8_t race;
-   std::vector< uint32_t > eNpcBase;
+  uint8_t race;
+  std::vector< uint32_t > eNpcBase;
 
-   HousingEmploymentNpcList( uint32_t row_id, uint32_t subRow, Sapphire::Data::ExdDataGenerated* exdData );
+  HousingEmploymentNpcList( uint32_t row_id, uint32_t subRow, Sapphire::Data::ExdDataGenerated* exdData );
 };
 
 struct HousingEmploymentNpcRace
 {
-   std::string race;
+  std::string race;
 
-   HousingEmploymentNpcRace( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+  HousingEmploymentNpcRace( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
 
 struct HousingExterior
 {
-   uint16_t placeName;
-   uint8_t housingSize;
-   std::string model;
+  uint16_t placeName;
+  uint8_t housingSize;
+  std::string model;
 
-   HousingExterior( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+  HousingExterior( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
 
 struct HousingFurniture
 {
-   uint16_t modelKey;
-   uint8_t housingItemCategory;
-   uint8_t usageType;
-   uint32_t usageParameter;
-   uint8_t housingLayoutLimit;
-   uint8_t aquariumTier;
-   uint32_t customTalk;
-   uint32_t item;
-   bool destroyOnRemoval;
-   bool tooltip;
+  uint16_t modelKey;
+  uint8_t housingItemCategory;
+  uint8_t usageType;
+  uint32_t usageParameter;
+  uint8_t aquariumTier;
+  uint32_t customTalk;
+  uint32_t item;
+  bool destroyOnRemoval;
+  bool tooltip;
 
-   HousingFurniture( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+  HousingFurniture( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
 
 struct HousingLandSet
@@ -3248,2220 +3307,2250 @@ struct HousingLandSet
   std::vector< uint32_t > minPrice;
   std::vector< uint32_t > initialPrice;
 
-   HousingLandSet( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+  HousingLandSet( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
 
 struct HousingMapMarkerInfo
 {
-   uint16_t map;
-   float x;
-   float y;
-   float z;
-   float plotNumberDistance;
+  float x;
+  float y;
+  float z;
+  uint16_t map;
 
-   HousingMapMarkerInfo( uint32_t row_id, uint32_t subRow, Sapphire::Data::ExdDataGenerated* exdData );
+  HousingMapMarkerInfo( uint32_t row_id, uint32_t subRow, Sapphire::Data::ExdDataGenerated* exdData );
 };
 
 struct HousingMerchantPose
 {
-   uint16_t actionTimeline;
-   std::string pose;
+  uint16_t actionTimeline;
+  std::string pose;
 
-   HousingMerchantPose( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+  HousingMerchantPose( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
 
 struct HousingPlacement
 {
-   std::string text;
+  std::string text;
 
-   HousingPlacement( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+  HousingPlacement( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
 
 struct HousingPreset
 {
-   std::string singular;
-   int8_t adjective;
-   std::string plural;
-   int8_t possessivePronoun;
-   int8_t startsWithVowel;
-   int8_t pronoun;
-   int8_t article;
-   uint16_t placeName;
-   uint8_t housingSize;
-   int32_t exteriorRoof;
-   int32_t exteriorWall;
-   int32_t exteriorWindow;
-   int32_t exteriorDoor;
-   int32_t interiorWall;
-   int32_t interiorFlooring;
-   int32_t interiorLighting;
-   int32_t otherFloorWall;
-   int32_t otherFloorFlooring;
-   int32_t otherFloorLighting;
-   int32_t basementWall;
-   int32_t basementFlooring;
-   int32_t basementLighting;
-   int32_t mansionLighting;
+  std::string singular;
+  int8_t adjective;
+  std::string plural;
+  int8_t possessivePronoun;
+  int8_t startsWithVowel;
+  int8_t pronoun;
+  int8_t article;
+  uint16_t placeName;
+  uint8_t housingSize;
+  int32_t exteriorRoof;
+  int32_t exteriorWall;
+  int32_t exteriorWindow;
+  int32_t exteriorDoor;
+  int32_t interiorWall;
+  int32_t interiorFlooring;
+  int32_t interiorLighting;
+  int32_t otherFloorWall;
+  int32_t otherFloorFlooring;
+  int32_t otherFloorLighting;
+  int32_t basementWall;
+  int32_t basementFlooring;
+  int32_t basementLighting;
+  int32_t mansionLighting;
 
-   HousingPreset( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+  HousingPreset( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
 
 struct HousingUnitedExterior
 {
-   std::vector< uint32_t > item;
+  std::vector< uint32_t > item;
 
-   HousingUnitedExterior( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+  HousingUnitedExterior( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
 
 struct HousingYardObject
 {
-   uint8_t modelKey;
-   uint8_t housingItemCategory;
-   uint8_t usageType;
-   uint32_t usageParameter;
-   uint8_t housingLayoutLimit;
-   uint32_t customTalk;
-   uint32_t item;
-   bool destroyOnRemoval;
+  uint8_t modelKey;
+  uint8_t housingItemCategory;
+  uint8_t usageType;
+  uint32_t usageParameter;
+  uint32_t customTalk;
+  uint32_t item;
+  bool destroyOnRemoval;
 
-   HousingYardObject( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+  HousingYardObject( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
 
 struct HowTo
 {
-   std::vector< int16_t > images;
-   int8_t category;
+  std::vector< int16_t > images;
+  int8_t category;
 
-   HowTo( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+  HowTo( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
 
 struct HowToCategory
 {
-   std::string category;
+  std::string category;
 
-   HowToCategory( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+  HowToCategory( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
 
 struct HowToPage
 {
-   int32_t image;
+  int32_t image;
 
-   HowToPage( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+  HowToPage( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
 
 struct InstanceContent
 {
-   uint8_t instanceContentType;
-   uint8_t weekRestriction;
-   uint16_t timeLimitmin;
-   std::string name;
-   uint16_t bGM;
-   uint16_t winBGM;
-   uint32_t cutscene;
-   uint16_t order;
-   uint32_t instanceContentTextDataBossStart;
-   uint32_t instanceContentTextDataBossEnd;
-   uint32_t bNpcBaseBoss;
-   uint32_t instanceContentTextDataObjectiveStart;
-   uint32_t instanceContentTextDataObjectiveEnd;
-   uint16_t sortKey;
-   uint16_t newPlayerBonusA;
-   uint16_t newPlayerBonusB;
-   uint32_t finalBossExp;
-   uint16_t finalBossCurrencyA;
-   uint16_t finalBossCurrencyB;
-   uint16_t finalBossCurrencyC;
-   uint32_t instanceClearExp;
-   int32_t instanceContentBuff;
-   uint32_t reqInstance;
-   uint8_t partyCondition;
+  uint8_t instanceContentType;
+  uint8_t weekRestriction;
+  uint16_t timeLimitmin;
+  std::string name;
+  uint16_t bGM;
+  uint16_t winBGM;
+  uint32_t cutscene;
+  uint16_t order;
+  uint32_t instanceContentTextDataBossStart;
+  uint32_t instanceContentTextDataBossEnd;
+  uint32_t bNpcBaseBoss;
+  uint32_t instanceContentTextDataObjectiveStart;
+  uint32_t instanceContentTextDataObjectiveEnd;
+  uint16_t sortKey;
+  uint16_t newPlayerBonusA;
+  uint16_t newPlayerBonusB;
+  uint32_t finalBossExp;
+  uint16_t finalBossCurrencyA;
+  uint16_t finalBossCurrencyB;
+  uint16_t finalBossCurrencyC;
+  uint32_t instanceClearExp;
+  int32_t instanceContentBuff;
+  uint32_t reqInstance;
+  uint8_t partyCondition;
 
-   InstanceContent( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+  InstanceContent( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
 
 struct InstanceContentBuff
 {
-   uint16_t echoStart;
-   uint16_t echoDeath;
+  uint16_t echoStart;
+  uint16_t echoDeath;
 
-   InstanceContentBuff( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+  InstanceContentBuff( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
 
 struct InstanceContentCSBonus
 {
-   uint16_t instance;
-   uint32_t item;
+  uint16_t instance;
+  uint32_t item;
 
-   InstanceContentCSBonus( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+  InstanceContentCSBonus( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
 
 struct InstanceContentGuide
 {
-   uint32_t instance;
+  uint32_t instance;
 
-   InstanceContentGuide( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+  InstanceContentGuide( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
 
 struct InstanceContentTextData
 {
-   std::string text;
+  std::string text;
 
-   InstanceContentTextData( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+  InstanceContentTextData( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
 
 struct Item
 {
-   std::string singular;
-   int8_t adjective;
-   std::string plural;
-   int8_t possessivePronoun;
-   int8_t startsWithVowel;
-   int8_t pronoun;
-   int8_t article;
-   std::string description;
-   std::string name;
-   uint16_t icon;
-   uint16_t levelItem;
-   uint8_t rarity;
-   uint8_t filterGroup;
-   uint32_t additionalData;
-   uint8_t itemUICategory;
-   uint8_t itemSearchCategory;
-   uint8_t equipSlotCategory;
-   uint32_t stackSize;
-   bool isUnique;
-   bool isUntradable;
-   bool isIndisposable;
-   bool isEquippable;
-   uint32_t priceMid;
-   uint32_t priceLow;
-   bool canBeHq;
-   bool isDyeable;
-   bool isCrestWorthy;
-   uint16_t itemAction;
-   uint16_t cooldowns;
-   uint8_t classJobRepair;
-   int32_t itemRepair;
-   int32_t itemGlamour;
-   uint16_t salvage;
-   bool isCollectable;
-   uint16_t aetherialReduce;
-   uint8_t levelEquip;
-   uint8_t equipRestriction;
-   uint8_t classJobCategory;
-   uint8_t grandCompany;
-   uint8_t itemSeries;
-   uint8_t baseParamModifier;
-   uint64_t modelMain;
-   uint64_t modelSub;
-   uint8_t classJobUse;
-   uint16_t damagePhys;
-   uint16_t damageMag;
-   uint16_t delayms;
-   uint16_t blockRate;
-   uint16_t block;
-   uint16_t defensePhys;
-   uint16_t defenseMag;
-   uint8_t itemSpecialBonus;
-   uint8_t itemSpecialBonusParam;
-   uint8_t materializeType;
-   uint8_t materiaSlotCount;
-   bool isAdvancedMeldingPermitted;
-   bool isPvP;
-   bool isGlamourous;
+  std::string singular;
+  int8_t adjective;
+  std::string plural;
+  int8_t possessivePronoun;
+  int8_t startsWithVowel;
+  int8_t pronoun;
+  int8_t article;
+  std::string description;
+  std::string name;
+  uint16_t icon;
+  uint16_t levelItem;
+  uint8_t rarity;
+  uint8_t filterGroup;
+  uint32_t additionalData;
+  uint8_t itemUICategory;
+  uint8_t itemSearchCategory;
+  uint8_t equipSlotCategory;
+  uint32_t stackSize;
+  bool isUnique;
+  bool isUntradable;
+  bool isIndisposable;
+  bool isEquippable;
+  uint32_t priceMid;
+  uint32_t priceLow;
+  bool canBeHq;
+  bool isDyeable;
+  bool isCrestWorthy;
+  uint16_t itemAction;
+  uint16_t cooldowns;
+  uint8_t classJobRepair;
+  int32_t itemRepair;
+  int32_t itemGlamour;
+  uint16_t salvage;
+  bool isCollectable;
+  uint16_t aetherialReduce;
+  uint8_t levelEquip;
+  uint8_t equipRestriction;
+  uint8_t classJobCategory;
+  uint8_t grandCompany;
+  uint8_t itemSeries;
+  uint8_t baseParamModifier;
+  uint64_t modelMain;
+  uint64_t modelSub;
+  uint8_t classJobUse;
+  uint16_t damagePhys;
+  uint16_t damageMag;
+  uint16_t delayms;
+  uint16_t blockRate;
+  uint16_t block;
+  uint16_t defensePhys;
+  uint16_t defenseMag;
+  uint8_t itemSpecialBonus;
+  uint8_t itemSpecialBonusParam;
+  uint8_t materializeType;
+  uint8_t materiaSlotCount;
+  bool isAdvancedMeldingPermitted;
+  bool isPvP;
+  bool isGlamourous;
 
-   struct
-   {
-     uint8_t baseparam;
-     int16_t value;
-   } param[6];
+  struct
+  {
+    uint8_t baseparam;
+    int16_t value;
+  } param[6];
 
-   Item( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+  Item( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
 
 struct ItemAction
 {
-   uint16_t type;
-   std::vector< uint16_t > data;
-   std::vector< uint16_t > dataHQ;
+  uint16_t type;
+  std::vector< uint16_t > data;
+  std::vector< uint16_t > dataHQ;
 
-   ItemAction( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+  ItemAction( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
 
 struct ItemFood
 {
+  uint8_t eXPBonus;
 
-   ItemFood( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+  ItemFood( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
 
 struct ItemLevel
 {
-   uint16_t strength;
-   uint16_t dexterity;
-   uint16_t vitality;
-   uint16_t intelligence;
-   uint16_t mind;
-   uint16_t piety;
-   uint16_t hP;
-   uint16_t mP;
-   uint16_t tP;
-   uint16_t gP;
-   uint16_t cP;
-   uint16_t physicalDamage;
-   uint16_t magicalDamage;
-   uint16_t delay;
-   uint16_t additionalEffect;
-   uint16_t attackSpeed;
-   uint16_t blockRate;
-   uint16_t blockStrength;
-   uint16_t tenacity;
-   uint16_t attackPower;
-   uint16_t defense;
-   uint16_t directHitRate;
-   uint16_t evasion;
-   uint16_t magicDefense;
-   uint16_t criticalHitPower;
-   uint16_t criticalHitResilience;
-   uint16_t criticalHit;
-   uint16_t criticalHitEvasion;
-   uint16_t slashingResistance;
-   uint16_t piercingResistance;
-   uint16_t bluntResistance;
-   uint16_t projectileResistance;
-   uint16_t attackMagicPotency;
-   uint16_t healingMagicPotency;
-   uint16_t enhancementMagicPotency;
-   uint16_t enfeeblingMagicPotency;
-   uint16_t fireResistance;
-   uint16_t iceResistance;
-   uint16_t windResistance;
-   uint16_t earthResistance;
-   uint16_t lightningResistance;
-   uint16_t waterResistance;
-   uint16_t magicResistance;
-   uint16_t determination;
-   uint16_t skillSpeed;
-   uint16_t spellSpeed;
-   uint16_t haste;
-   uint16_t morale;
-   uint16_t enmity;
-   uint16_t enmityReduction;
-   uint16_t carefulDesynthesis;
-   uint16_t eXPBonus;
-   uint16_t regen;
-   uint16_t refresh;
-   uint16_t movementSpeed;
-   uint16_t spikes;
-   uint16_t slowResistance;
-   uint16_t petrificationResistance;
-   uint16_t paralysisResistance;
-   uint16_t silenceResistance;
-   uint16_t blindResistance;
-   uint16_t poisonResistance;
-   uint16_t stunResistance;
-   uint16_t sleepResistance;
-   uint16_t bindResistance;
-   uint16_t heavyResistance;
-   uint16_t doomResistance;
-   uint16_t reducedDurabilityLoss;
-   uint16_t increasedSpiritbondGain;
-   uint16_t craftsmanship;
-   uint16_t control;
-   uint16_t gathering;
-   uint16_t perception;
+  uint16_t strength;
+  uint16_t dexterity;
+  uint16_t vitality;
+  uint16_t intelligence;
+  uint16_t mind;
+  uint16_t piety;
+  uint16_t hP;
+  uint16_t mP;
+  uint16_t tP;
+  uint16_t gP;
+  uint16_t cP;
+  uint16_t physicalDamage;
+  uint16_t magicalDamage;
+  uint16_t delay;
+  uint16_t additionalEffect;
+  uint16_t attackSpeed;
+  uint16_t blockRate;
+  uint16_t blockStrength;
+  uint16_t tenacity;
+  uint16_t attackPower;
+  uint16_t defense;
+  uint16_t directHitRate;
+  uint16_t evasion;
+  uint16_t magicDefense;
+  uint16_t criticalHitPower;
+  uint16_t criticalHitResilience;
+  uint16_t criticalHit;
+  uint16_t criticalHitEvasion;
+  uint16_t slashingResistance;
+  uint16_t piercingResistance;
+  uint16_t bluntResistance;
+  uint16_t projectileResistance;
+  uint16_t attackMagicPotency;
+  uint16_t healingMagicPotency;
+  uint16_t enhancementMagicPotency;
+  uint16_t enfeeblingMagicPotency;
+  uint16_t fireResistance;
+  uint16_t iceResistance;
+  uint16_t windResistance;
+  uint16_t earthResistance;
+  uint16_t lightningResistance;
+  uint16_t waterResistance;
+  uint16_t magicResistance;
+  uint16_t determination;
+  uint16_t skillSpeed;
+  uint16_t spellSpeed;
+  uint16_t haste;
+  uint16_t morale;
+  uint16_t enmity;
+  uint16_t enmityReduction;
+  uint16_t carefulDesynthesis;
+  uint16_t eXPBonus;
+  uint16_t regen;
+  uint16_t refresh;
+  uint16_t movementSpeed;
+  uint16_t spikes;
+  uint16_t slowResistance;
+  uint16_t petrificationResistance;
+  uint16_t paralysisResistance;
+  uint16_t silenceResistance;
+  uint16_t blindResistance;
+  uint16_t poisonResistance;
+  uint16_t stunResistance;
+  uint16_t sleepResistance;
+  uint16_t bindResistance;
+  uint16_t heavyResistance;
+  uint16_t doomResistance;
+  uint16_t reducedDurabilityLoss;
+  uint16_t increasedSpiritbondGain;
+  uint16_t craftsmanship;
+  uint16_t control;
+  uint16_t gathering;
+  uint16_t perception;
 
-   ItemLevel( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+  ItemLevel( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
 
 struct ItemSearchCategory
 {
-   std::string name;
-   int32_t icon;
-   uint8_t category;
-   uint8_t order;
-   int8_t classJob;
+  std::string name;
+  int32_t icon;
+  uint8_t category;
+  uint8_t order;
+  int8_t classJob;
 
-   ItemSearchCategory( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+  ItemSearchCategory( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
 
 struct ItemSeries
 {
-   std::string name;
+  std::string name;
 
-   ItemSeries( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+  ItemSeries( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
 
 struct ItemSpecialBonus
 {
-   std::string name;
+  std::string name;
 
-   ItemSpecialBonus( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+  ItemSpecialBonus( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
 
 struct ItemUICategory
 {
-   std::string name;
-   int32_t icon;
-   uint8_t orderMinor;
-   uint8_t orderMajor;
+  std::string name;
+  int32_t icon;
+  uint8_t orderMinor;
+  uint8_t orderMajor;
 
-   ItemUICategory( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+  ItemUICategory( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
 
 struct JournalCategory
 {
-   std::string name;
-   uint8_t journalSection;
+  std::string name;
+  uint8_t journalSection;
 
-   JournalCategory( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+  JournalCategory( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
 
 struct JournalGenre
 {
-   int32_t icon;
-   uint8_t journalCategory;
-   std::string name;
+  int32_t icon;
+  uint8_t journalCategory;
+  std::string name;
 
-   JournalGenre( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+  JournalGenre( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
 
 struct JournalSection
 {
-   std::string name;
+  std::string name;
 
-   JournalSection( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+  JournalSection( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
 
 struct Leve
 {
-   std::string name;
-   std::string description;
-   int32_t leveClient;
-   int32_t leveAssignmentType;
-   uint16_t classJobLevel;
-   uint8_t allowanceCost;
-   int32_t placeNameStart;
-   int32_t placeNameIssued;
-   uint8_t classJobCategory;
-   int32_t journalGenre;
-   int32_t placeNameStartZone;
-   int32_t iconCityState;
-   int32_t dataId;
-   uint32_t expReward;
-   uint32_t gilReward;
-   uint16_t leveRewardItem;
-   uint8_t leveVfx;
-   uint8_t leveVfxFrame;
-   uint32_t levelLevemete;
-   int32_t iconIssuer;
-   uint32_t levelStart;
-   uint16_t bGM;
+  std::string name;
+  std::string description;
+  int32_t leveClient;
+  int32_t leveAssignmentType;
+  uint16_t classJobLevel;
+  uint8_t allowanceCost;
+  int32_t placeNameStart;
+  int32_t placeNameIssued;
+  uint8_t classJobCategory;
+  int32_t journalGenre;
+  int32_t placeNameStartZone;
+  int32_t iconCityState;
+  int32_t dataId;
+  uint32_t expReward;
+  uint32_t gilReward;
+  uint16_t leveRewardItem;
+  uint8_t leveVfx;
+  uint8_t leveVfxFrame;
+  uint32_t levelLevemete;
+  int32_t iconIssuer;
+  uint32_t levelStart;
+  uint16_t bGM;
 
-   Leve( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+  Leve( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
 
 struct LeveAssignmentType
 {
-   bool isFaction;
-   int32_t icon;
-   std::string name;
+  bool isFaction;
+  int32_t icon;
+  std::string name;
 
-   LeveAssignmentType( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+  LeveAssignmentType( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
 
 struct LeveClient
 {
-   std::string name;
+  std::string name;
 
-   LeveClient( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+  LeveClient( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
 
 struct Level
 {
-   float x;
-   float y;
-   float z;
-   float yaw;
-   float radius;
-   uint8_t type;
-   uint32_t object;
-   uint16_t map;
-   uint32_t eventId;
-   uint16_t territory;
+  float x;
+  float y;
+  float z;
+  float yaw;
+  float radius;
+  uint8_t type;
+  uint32_t object;
+  uint16_t map;
+  uint32_t eventId;
+  uint16_t territory;
 
-   Level( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+  Level( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
 
 struct LeveRewardItem
 {
 
-   LeveRewardItem( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+  LeveRewardItem( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
 
 struct LeveRewardItemGroup
 {
 
-   LeveRewardItemGroup( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+  LeveRewardItemGroup( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
 
 struct LeveVfx
 {
-   std::string effect;
-   int32_t icon;
+  std::string effect;
+  int32_t icon;
 
-   LeveVfx( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+  LeveVfx( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
 
 struct LogFilter
 {
-   uint8_t logKind;
-   std::string name;
-   std::string example;
+  uint8_t logKind;
+  std::string name;
+  std::string example;
 
-   LogFilter( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+  LogFilter( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
 
 struct LogKind
 {
-   std::string format;
-   std::string name;
-   std::string example;
-   uint8_t logKindCategoryText;
+  std::string format;
+  std::string name;
+  std::string example;
+  uint8_t logKindCategoryText;
 
-   LogKind( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+  LogKind( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
 
 struct LogKindCategoryText
 {
-   std::string text;
+  std::string text;
 
-   LogKindCategoryText( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+  LogKindCategoryText( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
 
 struct LogMessage
 {
-   uint16_t logKind;
-   std::string text;
+  uint16_t logKind;
+  std::string text;
 
-   LogMessage( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+  LogMessage( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
 
 struct LotteryExchangeShop
 {
-   std::vector< int32_t > itemAccepted;
-   std::vector< uint32_t > amountAccepted;
+  std::vector< int32_t > itemAccepted;
+  std::vector< uint32_t > amountAccepted;
 
-   LotteryExchangeShop( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+  LotteryExchangeShop( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
 
 struct MacroIcon
 {
-   int32_t icon;
+  int32_t icon;
 
-   MacroIcon( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+  MacroIcon( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
 
 struct MacroIconRedirectOld
 {
-   uint32_t iconOld;
-   int32_t iconNew;
+  uint32_t iconOld;
+  int32_t iconNew;
 
-   MacroIconRedirectOld( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+  MacroIconRedirectOld( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
 
 struct MainCommand
 {
-   int32_t icon;
-   uint8_t mainCommandCategory;
-   std::string name;
-   std::string description;
+  int32_t icon;
+  uint8_t mainCommandCategory;
+  std::string name;
+  std::string description;
 
-   MainCommand( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+  MainCommand( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
 
 struct MainCommandCategory
 {
-   std::string name;
+  std::string name;
 
-   MainCommandCategory( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+  MainCommandCategory( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
 
 struct ManeuversArmor
 {
-   std::vector< uint32_t > bNpcBase;
-   std::vector< uint32_t > icon;
+  std::vector< uint32_t > bNpcBase;
+  std::vector< uint32_t > icon;
 
-   ManeuversArmor( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+  ManeuversArmor( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
 
 struct Map
 {
-   int8_t mapIndex;
-   uint8_t hierarchy;
-   uint16_t mapMarkerRange;
-   std::string id;
-   uint16_t sizeFactor;
-   int16_t offsetX;
-   int16_t offsetY;
-   uint16_t placeNameRegion;
-   uint16_t placeName;
-   uint16_t placeNameSub;
-   int16_t discoveryIndex;
-   uint16_t territoryType;
-   bool discoveryArrayByte;
+  int8_t mapIndex;
+  uint8_t hierarchy;
+  uint16_t mapMarkerRange;
+  std::string id;
+  uint16_t sizeFactor;
+  int16_t offsetX;
+  int16_t offsetY;
+  uint16_t placeNameRegion;
+  uint16_t placeName;
+  uint16_t placeNameSub;
+  int16_t discoveryIndex;
+  uint16_t territoryType;
+  bool discoveryArrayByte;
 
-   Map( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+  Map( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
 
 struct MapMarker
 {
-   int16_t x;
-   int16_t y;
-   uint16_t icon;
-   uint16_t placeNameSubtext;
-   uint8_t subtextOrientation;
-   uint8_t mapMarkerRegion;
-   uint8_t type;
-   uint8_t dataType;
-   uint16_t dataKey;
+  int16_t x;
+  int16_t y;
+  uint16_t icon;
+  uint16_t placeNameSubtext;
+  uint8_t subtextOrientation;
+  uint8_t mapMarkerRegion;
+  uint8_t type;
+  uint8_t dataType;
+  uint16_t dataKey;
 
-   MapMarker( uint32_t row_id, uint32_t subRow, Sapphire::Data::ExdDataGenerated* exdData );
+  MapMarker( uint32_t row_id, uint32_t subRow, Sapphire::Data::ExdDataGenerated* exdData );
 };
 
 struct MapMarkerRegion
 {
-   int16_t x;
+  int16_t x;
 
-   MapMarkerRegion( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+  MapMarkerRegion( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
 
 struct MapSymbol
 {
-   int32_t icon;
-   int32_t placeName;
+  int32_t icon;
+  int32_t placeName;
 
-   MapSymbol( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+  MapSymbol( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
 
 struct Marker
 {
-   int32_t icon;
-   std::string name;
+  int32_t icon;
+  std::string name;
 
-   Marker( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+  Marker( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
 
 struct MasterpieceSupplyDuty
 {
-   uint8_t classJob;
-   uint8_t classJobLevel;
-   uint16_t rewardCurrency;
+  uint8_t classJob;
+  uint8_t classJobLevel;
+  uint16_t rewardCurrency;
 
-   MasterpieceSupplyDuty( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+  MasterpieceSupplyDuty( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
 
 struct MasterpieceSupplyMultiplier
 {
-   std::vector< uint16_t > xpMultiplier;
-   std::vector< uint16_t > currencyMultiplier;
+  std::vector< uint16_t > xpMultiplier;
+  std::vector< uint16_t > currencyMultiplier;
 
-   MasterpieceSupplyMultiplier( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+  MasterpieceSupplyMultiplier( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
 
 struct Materia
 {
-   std::vector< int32_t > item;
-   uint8_t baseParam;
-   std::vector< uint8_t > value;
+  std::vector< int32_t > item;
+  uint8_t baseParam;
+  std::vector< uint8_t > value;
 
-   Materia( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+  Materia( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
 
 struct MiniGameRA
 {
-   int32_t icon;
-   int32_t bGM;
+  int32_t icon;
+  int32_t bGM;
 
-   MiniGameRA( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+  MiniGameRA( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
 
 struct MinionRace
 {
-   std::string name;
+  std::string name;
 
-   MinionRace( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+  MinionRace( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
 
 struct MinionRules
 {
-   std::string rule;
-   std::string description;
+  std::string rule;
+  std::string description;
 
-   MinionRules( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+  MinionRules( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
 
 struct MinionSkillType
 {
-   std::string name;
+  std::string name;
 
-   MinionSkillType( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+  MinionSkillType( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
 
 struct MobHuntOrderType
 {
-   uint32_t quest;
-   uint32_t eventItem;
+  uint32_t quest;
+  uint32_t eventItem;
 
-   MobHuntOrderType( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+  MobHuntOrderType( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
 
 struct MobHuntTarget
 {
-   uint16_t name;
-   uint16_t fATE;
-   uint32_t icon;
-   uint16_t territoryType;
-   uint16_t placeName;
+  uint16_t name;
+  uint16_t fATE;
+  uint32_t icon;
+  uint16_t territoryType;
+  uint16_t placeName;
 
-   MobHuntTarget( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+  MobHuntTarget( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
 
 struct ModelChara
 {
-   uint8_t type;
-   uint16_t model;
-   uint8_t base;
-   uint8_t variant;
+  uint8_t type;
+  uint16_t model;
+  uint8_t base;
+  uint8_t variant;
 
-   ModelChara( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+  ModelChara( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
 
 struct ModelSkeleton
 {
-   float scaleFactor;
+  float scaleFactor;
 
-   ModelSkeleton( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+  ModelSkeleton( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
 
 struct ModelState
 {
-   uint16_t start;
-   uint16_t end;
+  uint16_t start;
+  uint16_t end;
 
-   ModelState( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+  ModelState( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
 
 struct MonsterNote
 {
-   std::vector< uint16_t > monsterNoteTarget;
-   std::vector< uint8_t > count;
-   uint32_t reward;
-   std::string name;
+  std::vector< uint16_t > monsterNoteTarget;
+  std::vector< uint8_t > count;
+  uint32_t reward;
+  std::string name;
 
-   MonsterNote( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+  MonsterNote( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
 
 struct MonsterNoteTarget
 {
-   uint16_t bNpcName;
-   int32_t icon;
+  uint16_t bNpcName;
+  int32_t icon;
 
-   MonsterNoteTarget( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+  MonsterNoteTarget( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
 
 struct Mount
 {
-   std::string singular;
-   int8_t adjective;
-   std::string plural;
-   int8_t possessivePronoun;
-   int8_t startsWithVowel;
-   int8_t pronoun;
-   int8_t article;
-   int32_t modelChara;
-   uint8_t flyingCondition;
-   uint8_t isFlying;
-   uint8_t mountCustomize;
-   uint16_t rideBGM;
-   int16_t order;
-   uint16_t icon;
-   uint8_t extraSeats;
-   uint16_t mountAction;
-   bool isAirborne;
-   bool useEP;
-   bool isImmobile;
+  std::string singular;
+  int8_t adjective;
+  std::string plural;
+  int8_t possessivePronoun;
+  int8_t startsWithVowel;
+  int8_t pronoun;
+  int8_t article;
+  int32_t modelChara;
+  uint8_t flyingCondition;
+  uint8_t isFlying;
+  uint8_t mountCustomize;
+  uint16_t rideBGM;
+  int16_t order;
+  uint16_t icon;
+  uint8_t extraSeats;
+  uint16_t mountAction;
+  bool isAirborne;
+  bool useEP;
+  bool isImmobile;
 
-   Mount( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+  Mount( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
 
 struct MountAction
 {
-   std::vector< uint16_t > action;
+  std::vector< uint16_t > action;
 
-   MountAction( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+  MountAction( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
 
 struct MountCustomize
 {
-   float hyurMaleScale;
-   float hyurFemaleScale;
-   float elezenMaleScale;
-   float elezenFemaleScale;
-   float lalaMaleScale;
-   float lalaFemaleScale;
-   float miqoMaleScale;
-   float miqoFemaleScale;
-   float roeMaleScale;
-   float roeFemaleScale;
-   float auRaMaleScale;
-   float auRaFemaleScale;
-   uint8_t hyurMaleCameraHeight;
-   uint8_t hyurFemaleCameraHeight;
-   uint8_t elezenMaleCameraHeight;
-   uint8_t elezenFemaleCameraHeight;
-   uint8_t lalaMaleCameraHeight;
-   uint8_t lalaFemaleCameraHeight;
-   uint8_t miqoMaleCameraHeight;
-   uint8_t miqoFemaleCameraHeight;
-   uint8_t roeMaleCameraHeight;
-   uint8_t roeFemaleCameraHeight;
-   uint8_t auRaMaleCameraHeight;
-   uint8_t auRaFemaleCameraHeight;
+  float hyurMaleScale;
+  float hyurFemaleScale;
+  float elezenMaleScale;
+  float elezenFemaleScale;
+  float lalaMaleScale;
+  float lalaFemaleScale;
+  float miqoMaleScale;
+  float miqoFemaleScale;
+  float roeMaleScale;
+  float roeFemaleScale;
+  float auRaMaleScale;
+  float auRaFemaleScale;
+  uint8_t hyurMaleCameraHeight;
+  uint8_t hyurFemaleCameraHeight;
+  uint8_t elezenMaleCameraHeight;
+  uint8_t elezenFemaleCameraHeight;
+  uint8_t lalaMaleCameraHeight;
+  uint8_t lalaFemaleCameraHeight;
+  uint8_t miqoMaleCameraHeight;
+  uint8_t miqoFemaleCameraHeight;
+  uint8_t roeMaleCameraHeight;
+  uint8_t roeFemaleCameraHeight;
+  uint8_t auRaMaleCameraHeight;
+  uint8_t auRaFemaleCameraHeight;
 
-   MountCustomize( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+  MountCustomize( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
 
 struct MountFlyingCondition
 {
-   uint32_t quest;
+  uint32_t quest;
 
-   MountFlyingCondition( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+  MountFlyingCondition( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
 
 struct MountSpeed
 {
-   uint32_t quest;
+  uint32_t quest;
 
-   MountSpeed( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+  MountSpeed( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
 
 struct MountTransient
 {
-   std::string description;
-   std::string descriptionEnhanced;
-   std::string tooltip;
+  std::string description;
+  std::string descriptionEnhanced;
+  std::string tooltip;
 
-   MountTransient( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+  MountTransient( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
 
 struct MoveTimeline
 {
-   uint16_t idle;
-   uint16_t moveForward;
-   uint16_t moveBack;
-   uint16_t moveLeft;
-   uint16_t moveRight;
-   uint16_t moveUp;
-   uint16_t moveDown;
-   uint16_t moveTurnLeft;
-   uint16_t moveTurnRight;
-   uint16_t extra;
+  uint16_t idle;
+  uint16_t moveForward;
+  uint16_t moveBack;
+  uint16_t moveLeft;
+  uint16_t moveRight;
+  uint16_t moveUp;
+  uint16_t moveDown;
+  uint16_t moveTurnLeft;
+  uint16_t moveTurnRight;
+  uint16_t extra;
 
-   MoveTimeline( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+  MoveTimeline( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
 
 struct MoveVfx
 {
-   uint16_t vFXNormal;
-   uint16_t vFXWalking;
+  uint16_t vFXNormal;
+  uint16_t vFXWalking;
 
-   MoveVfx( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+  MoveVfx( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+};
+
+struct NotebookDivision
+{
+  std::string name;
+  uint8_t notebookDivisionCategory;
+
+  NotebookDivision( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+};
+
+struct NotebookDivisionCategory
+{
+  std::string name;
+
+  NotebookDivisionCategory( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
 
 struct NpcEquip
 {
-   uint64_t modelMainHand;
-   uint8_t dyeMainHand;
-   uint64_t modelOffHand;
-   uint8_t dyeOffHand;
-   uint32_t modelHead;
-   uint8_t dyeHead;
-   bool visor;
-   uint32_t modelBody;
-   uint8_t dyeBody;
-   uint32_t modelHands;
-   uint8_t dyeHands;
-   uint32_t modelLegs;
-   uint8_t dyeLegs;
-   uint32_t modelFeet;
-   uint8_t dyeFeet;
-   uint32_t modelEars;
-   uint8_t dyeEars;
-   uint32_t modelNeck;
-   uint8_t dyeNeck;
-   uint32_t modelWrists;
-   uint8_t dyeWrists;
-   uint32_t modelLeftRing;
-   uint8_t dyeLeftRing;
-   uint32_t modelRightRing;
-   uint8_t dyeRightRing;
+  uint64_t modelMainHand;
+  uint8_t dyeMainHand;
+  uint64_t modelOffHand;
+  uint8_t dyeOffHand;
+  uint32_t modelHead;
+  uint8_t dyeHead;
+  bool visor;
+  uint32_t modelBody;
+  uint8_t dyeBody;
+  uint32_t modelHands;
+  uint8_t dyeHands;
+  uint32_t modelLegs;
+  uint8_t dyeLegs;
+  uint32_t modelFeet;
+  uint8_t dyeFeet;
+  uint32_t modelEars;
+  uint8_t dyeEars;
+  uint32_t modelNeck;
+  uint8_t dyeNeck;
+  uint32_t modelWrists;
+  uint8_t dyeWrists;
+  uint32_t modelLeftRing;
+  uint8_t dyeLeftRing;
+  uint32_t modelRightRing;
+  uint8_t dyeRightRing;
 
-   NpcEquip( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+  NpcEquip( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
 
 struct NpcYell
 {
-   std::string text;
+  std::string text;
 
-   NpcYell( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+  NpcYell( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
 
 struct Omen
 {
-   std::string fileName;
+  std::string fileName;
 
-   Omen( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+  Omen( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
 
 struct OnlineStatus
 {
-   uint8_t priority;
-   std::string name;
-   uint32_t icon;
+  uint8_t priority;
+  std::string name;
+  uint32_t icon;
 
-   OnlineStatus( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+  OnlineStatus( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
 
 struct Opening
 {
-   std::string name;
-   uint32_t quest;
+  std::string name;
+  uint32_t quest;
 
-   Opening( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+  Opening( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
 
 struct Orchestrion
 {
-   std::string name;
-   std::string description;
+  std::string name;
+  std::string description;
 
-   Orchestrion( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+  Orchestrion( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
 
 struct OrchestrionCategory
 {
-   std::string name;
+  std::string name;
 
-   OrchestrionCategory( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+  OrchestrionCategory( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
 
 struct OrchestrionPath
 {
-   std::string file;
+  std::string file;
 
-   OrchestrionPath( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+  OrchestrionPath( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
 
 struct OrchestrionUiparam
 {
-   uint8_t orchestrionCategory;
-   uint16_t order;
+  uint8_t orchestrionCategory;
+  uint16_t order;
 
-   OrchestrionUiparam( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+  OrchestrionUiparam( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
 
 struct ParamGrow
 {
-   int32_t expToNext;
-   uint8_t additionalActions;
-   int32_t mpModifier;
-   int32_t baseSpeed;
-   int32_t levelModifier;
-   uint8_t questExpModifier;
-   uint16_t hpModifier;
-   int32_t huntingLogExpReward;
+  int32_t expToNext;
+  uint8_t additionalActions;
+  uint16_t scaledQuestXP;
+  int32_t mpModifier;
+  int32_t baseSpeed;
+  int32_t levelModifier;
+  uint8_t questExpModifier;
+  uint16_t hpModifier;
+  int32_t huntingLogExpReward;
+  uint16_t itemLevelSync;
 
-   ParamGrow( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+  ParamGrow( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
 
 struct PartyContent
 {
-   uint8_t key;
-   uint16_t timeLimit;
-   std::string name;
-   uint32_t textDataStart;
-   uint32_t textDataEnd;
-   uint16_t contentFinderCondition;
-   uint32_t image;
+  uint8_t key;
+  uint16_t timeLimit;
+  std::string name;
+  uint32_t textDataStart;
+  uint32_t textDataEnd;
+  uint16_t contentFinderCondition;
+  uint32_t image;
 
-   PartyContent( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+  PartyContent( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
 
 struct PartyContentCutscene
 {
-   uint32_t cutscene;
+  uint32_t cutscene;
 
-   PartyContentCutscene( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+  PartyContentCutscene( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
 
 struct PartyContentTextData
 {
-   std::string data;
+  std::string data;
 
-   PartyContentTextData( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+  PartyContentTextData( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
 
 struct Perform
 {
-   std::string name;
-   uint64_t modelKey;
-   uint16_t animationStart;
-   uint16_t animationEnd;
-   uint16_t animationIdle;
-   uint16_t animationPlay01;
-   uint16_t animationPlay02;
-   int32_t stopAnimation;
-   std::string instrument;
-   uint8_t transient;
+  std::string name;
+  uint64_t modelKey;
+  uint16_t animationStart;
+  uint16_t animationEnd;
+  uint16_t animationIdle;
+  uint16_t animationPlay01;
+  uint16_t animationPlay02;
+  int32_t stopAnimation;
+  std::string instrument;
+  uint8_t transient;
 
-   Perform( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+  Perform( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
 
 struct PerformTransient
 {
-   std::string text;
+  std::string text;
 
-   PerformTransient( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+  PerformTransient( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
 
 struct Pet
 {
-   std::string name;
+  std::string name;
 
-   Pet( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+  Pet( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
 
 struct PetAction
 {
-   std::string name;
-   std::string description;
-   int32_t icon;
-   uint16_t action;
-   uint8_t pet;
+  std::string name;
+  std::string description;
+  int32_t icon;
+  uint16_t action;
+  uint8_t pet;
 
-   PetAction( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+  PetAction( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
 
 struct Picture
 {
-   int32_t item;
-   int32_t image;
-   int32_t signature;
+  int32_t item;
+  int32_t image;
+  int32_t signature;
 
-   Picture( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+  Picture( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
 
 struct PlaceName
 {
-   std::string name;
-   std::string nameNoArticle;
+  std::string name;
+  std::string nameNoArticle;
 
-   PlaceName( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+  PlaceName( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
 
 struct PlantPotFlowerSeed
 {
-   std::vector< uint32_t > seedIcon;
+  std::vector< uint32_t > seedIcon;
 
-   PlantPotFlowerSeed( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+  PlantPotFlowerSeed( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
 
 struct PreHandler
 {
-   uint32_t gilShop;
-   uint16_t actionTimeline;
+  uint32_t target;
+  uint16_t actionTimeline;
 
-   PreHandler( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+  PreHandler( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
 
 struct PublicContent
 {
-   uint8_t type;
-   uint16_t timeLimit;
-   uint32_t mapIcon;
-   std::string name;
-   uint32_t textDataStart;
-   uint32_t textDataEnd;
-   uint16_t contentFinderCondition;
-   uint16_t additionalData;
+  uint8_t type;
+  uint16_t timeLimit;
+  uint32_t mapIcon;
+  std::string name;
+  uint32_t textDataStart;
+  uint32_t textDataEnd;
+  uint16_t contentFinderCondition;
+  uint16_t additionalData;
 
-   PublicContent( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+  PublicContent( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
 
 struct PublicContentCutscene
 {
-   uint32_t cutscene;
-   uint32_t cutscene2;
+  uint32_t cutscene;
+  uint32_t cutscene2;
 
-   PublicContentCutscene( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+  PublicContentCutscene( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
 
 struct PublicContentTextData
 {
-   std::string textData;
+  std::string textData;
 
-   PublicContentTextData( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+  PublicContentTextData( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
 
 struct PvPAction
 {
-   uint16_t action;
+  uint16_t action;
 
-   PvPAction( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+  PvPAction( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
 
 struct PvPActionSort
 {
-   uint8_t name;
-   uint16_t action;
+  uint8_t name;
+  uint16_t action;
 
-   PvPActionSort( uint32_t row_id, uint32_t subRow, Sapphire::Data::ExdDataGenerated* exdData );
+  PvPActionSort( uint32_t row_id, uint32_t subRow, Sapphire::Data::ExdDataGenerated* exdData );
 };
 
 struct PvPRank
 {
-   uint32_t expRequired;
+  uint32_t expRequired;
 
-   PvPRank( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+  PvPRank( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
 
 struct PvPSelectTrait
 {
-   std::string effect;
-   uint32_t icon;
-   int16_t value;
+  std::string effect;
+  uint32_t icon;
+  int16_t value;
 
-   PvPSelectTrait( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+  PvPSelectTrait( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
 
 struct PvPTrait
 {
-   uint16_t trait1;
-   uint16_t trait2;
-   uint16_t trait3;
+  uint16_t trait1;
+  uint16_t trait2;
+  uint16_t trait3;
 
-   PvPTrait( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+  PvPTrait( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
 
 struct Quest
 {
-   std::string name;
-   std::string id;
-   uint8_t expansion;
-   uint8_t classJobCategory0;
-   uint16_t classJobLevel0;
-   uint8_t questLevelOffset;
-   uint16_t levelMax;
-   uint8_t classJobCategory1;
-   uint16_t classJobLevel1;
-   uint8_t previousQuestJoin;
-   uint32_t previousQuest0;
-   uint32_t previousQuest1;
-   uint32_t previousQuest2;
-   uint8_t questLockJoin;
-   std::vector< uint32_t > questLock;
-   uint8_t classJobUnlock;
-   uint8_t grandCompany;
-   uint8_t grandCompanyRank;
-   uint8_t instanceContentJoin;
-   std::vector< uint32_t > instanceContent;
-   uint8_t festival;
-   uint16_t bellStart;
-   uint16_t bellEnd;
-   uint8_t beastTribe;
-   uint8_t beastReputationRank;
-   int32_t mountRequired;
-   bool isHouseRequired;
-   uint8_t deliveryQuest;
-   uint32_t issuerStart;
-   uint16_t behavior;
-   uint32_t targetEnd;
-   bool isRepeatable;
-   uint8_t repeatIntervalType;
-   uint8_t questRepeatFlag;
-   bool unlocksSystemContent;
-   uint8_t type;
-   uint16_t questClassJobSupply;
-   std::vector< std::string > scriptInstruction;
-   std::vector< uint32_t > scriptArg;
-   std::vector< uint8_t > actorSpawnSeq;
-   std::vector< uint8_t > actorDespawnSeq;
-   std::vector< uint32_t > actorSpawn;
-   std::vector< uint8_t > questUInt8A;
-   std::vector< uint8_t > questUInt8B;
-   std::vector< uint8_t > toDoCompleteSeq;
-   std::vector< uint8_t > toDoQty;
-   std::vector< uint32_t > toDoMainLocation;
-   uint8_t classJobRequired;
-   uint16_t expFactor;
-   uint32_t gilReward;
-   uint16_t gCSeals;
-   std::vector< uint8_t > itemCatalyst;
-   std::vector< uint8_t > itemCountCatalyst;
-   uint8_t itemRewardType;
-   std::vector< uint32_t > itemReward0;
-   std::vector< uint8_t > itemCountReward0;
-   std::vector< uint8_t > stainReward0;
-   std::vector< uint32_t > itemReward1;
-   std::vector< uint8_t > itemCountReward1;
-   std::vector< bool > isHQReward1;
-   std::vector< uint8_t > stainReward1;
-   uint8_t emoteReward;
-   uint16_t actionReward;
-   std::vector< uint8_t > generalActionReward;
-   uint8_t otherReward;
-   uint32_t instanceContentUnlock;
-   uint8_t tomestoneReward;
-   uint8_t tomestoneCountReward;
-   uint8_t reputationReward;
-   uint16_t placeName;
-   uint8_t journalGenre;
-   uint32_t icon;
-   uint32_t iconSpecial;
-   uint8_t eventIconType;
-   uint16_t sortKey;
+  std::string name;
+  std::string id;
+  uint8_t expansion;
+  uint8_t classJobCategory0;
+  uint16_t classJobLevel0;
+  uint8_t questLevelOffset;
+  uint16_t levelMax;
+  uint8_t classJobCategory1;
+  uint16_t classJobLevel1;
+  uint8_t previousQuestJoin;
+  uint32_t previousQuest0;
+  uint32_t previousQuest1;
+  uint32_t previousQuest2;
+  uint8_t questLockJoin;
+  std::vector< uint32_t > questLock;
+  uint8_t classJobUnlock;
+  uint8_t grandCompany;
+  uint8_t grandCompanyRank;
+  uint8_t instanceContentJoin;
+  std::vector< uint32_t > instanceContent;
+  uint8_t festival;
+  uint16_t bellStart;
+  uint16_t bellEnd;
+  uint8_t beastTribe;
+  uint8_t beastReputationRank;
+  int32_t mountRequired;
+  bool isHouseRequired;
+  uint8_t deliveryQuest;
+  uint32_t issuerStart;
+  uint16_t behavior;
+  uint32_t targetEnd;
+  bool isRepeatable;
+  uint8_t repeatIntervalType;
+  uint8_t questRepeatFlag;
+  bool unlocksSystemContent;
+  uint8_t type;
+  uint16_t questClassJobSupply;
+  std::vector< std::string > scriptInstruction;
+  std::vector< uint32_t > scriptArg;
+  std::vector< uint8_t > actorSpawnSeq;
+  std::vector< uint8_t > actorDespawnSeq;
+  std::vector< uint32_t > actorSpawn;
+  std::vector< uint8_t > questUInt8A;
+  std::vector< uint8_t > questUInt8B;
+  std::vector< uint8_t > toDoCompleteSeq;
+  std::vector< uint8_t > toDoQty;
+  std::vector< uint32_t > toDoMainLocation;
+  uint8_t classJobRequired;
+  uint16_t expFactor;
+  uint32_t gilReward;
+  uint16_t gCSeals;
+  std::vector< uint8_t > itemCatalyst;
+  std::vector< uint8_t > itemCountCatalyst;
+  uint8_t itemRewardType;
+  std::vector< uint32_t > itemReward0;
+  std::vector< uint8_t > itemCountReward0;
+  std::vector< uint8_t > stainReward0;
+  std::vector< uint32_t > itemReward1;
+  std::vector< uint8_t > itemCountReward1;
+  std::vector< bool > isHQReward1;
+  std::vector< uint8_t > stainReward1;
+  uint8_t emoteReward;
+  uint16_t actionReward;
+  std::vector< uint8_t > generalActionReward;
+  uint8_t otherReward;
+  uint32_t instanceContentUnlock;
+  uint8_t tomestoneReward;
+  uint8_t tomestoneCountReward;
+  uint8_t reputationReward;
+  uint16_t placeName;
+  uint8_t journalGenre;
+  uint32_t icon;
+  uint32_t iconSpecial;
+  uint8_t eventIconType;
+  uint16_t sortKey;
 
-   Quest( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+  Quest( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
 
 struct QuestBattle
 {
-   int32_t quest;
-   uint16_t timeLimit;
-   uint16_t levelSync;
-   std::vector< std::string > scriptInstruction;
-   std::vector< uint32_t > scriptValue;
+  int32_t quest;
+  uint16_t timeLimit;
+  uint16_t levelSync;
+  std::vector< std::string > scriptInstruction;
+  std::vector< uint32_t > scriptValue;
 
-   QuestBattle( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+  QuestBattle( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
 
 struct QuestClassJobReward
 {
-   uint8_t classJobCategory;
-   std::vector< uint32_t > rewardItem;
-   std::vector< uint8_t > rewardAmount;
-   std::vector< uint32_t > requiredItem;
-   std::vector< uint8_t > requiredAmount;
+  uint8_t classJobCategory;
+  std::vector< uint32_t > rewardItem;
+  std::vector< uint8_t > rewardAmount;
+  std::vector< uint32_t > requiredItem;
+  std::vector< uint8_t > requiredAmount;
 
-   QuestClassJobReward( uint32_t row_id, uint32_t subRow, Sapphire::Data::ExdDataGenerated* exdData );
+  QuestClassJobReward( uint32_t row_id, uint32_t subRow, Sapphire::Data::ExdDataGenerated* exdData );
 };
 
 struct QuestClassJobSupply
 {
-   uint8_t classJobCategory;
-   uint32_t eNpcResident;
-   uint32_t item;
+  uint8_t classJobCategory;
+  uint32_t eNpcResident;
+  uint32_t item;
 
-   QuestClassJobSupply( uint32_t row_id, uint32_t subRow, Sapphire::Data::ExdDataGenerated* exdData );
+  QuestClassJobSupply( uint32_t row_id, uint32_t subRow, Sapphire::Data::ExdDataGenerated* exdData );
 };
 
 struct QuestRepeatFlag
 {
-   uint32_t quest;
+  uint32_t quest;
 
-   QuestRepeatFlag( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+  QuestRepeatFlag( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
 
 struct QuestRewardOther
 {
-   uint32_t icon;
-   std::string name;
+  uint32_t icon;
+  std::string name;
 
-   QuestRewardOther( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+  QuestRewardOther( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
 
 struct QuickChat
 {
-   std::string nameAction;
-   int32_t icon;
-   int32_t addon;
-   int8_t quickChatTransient;
+  std::string nameAction;
+  int32_t icon;
+  int32_t addon;
+  int8_t quickChatTransient;
 
-   QuickChat( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+  QuickChat( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
 
 struct QuickChatTransient
 {
-   std::string textOutput;
+  std::string textOutput;
 
-   QuickChatTransient( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+  QuickChatTransient( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
 
 struct Race
 {
-   std::string masculine;
-   std::string feminine;
-   int32_t rSEMBody;
-   int32_t rSEMHands;
-   int32_t rSEMLegs;
-   int32_t rSEMFeet;
-   int32_t rSEFBody;
-   int32_t rSEFHands;
-   int32_t rSEFLegs;
-   int32_t rSEFFeet;
+  std::string masculine;
+  std::string feminine;
+  int32_t rSEMBody;
+  int32_t rSEMHands;
+  int32_t rSEMLegs;
+  int32_t rSEMFeet;
+  int32_t rSEFBody;
+  int32_t rSEFHands;
+  int32_t rSEFLegs;
+  int32_t rSEFFeet;
 
-   Race( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+  Race( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
 
 struct RacingChocoboItem
 {
-   int32_t item;
-   uint8_t category;
-   std::vector< uint8_t > param;
+  int32_t item;
+  uint8_t category;
+  std::vector< uint8_t > param;
 
-   RacingChocoboItem( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+  RacingChocoboItem( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
 
 struct RacingChocoboName
 {
-   std::string name;
+  std::string name;
 
-   RacingChocoboName( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+  RacingChocoboName( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
 
 struct RacingChocoboNameCategory
 {
-   uint8_t sortKey;
-   std::string name;
+  uint8_t sortKey;
+  std::string name;
 
-   RacingChocoboNameCategory( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+  RacingChocoboNameCategory( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
 
 struct RacingChocoboNameInfo
 {
-   uint8_t racingChocoboNameCategory;
+  uint8_t racingChocoboNameCategory;
 
-   RacingChocoboNameInfo( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+  RacingChocoboNameInfo( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
 
 struct RacingChocoboParam
 {
-   std::string name;
+  std::string name;
 
-   RacingChocoboParam( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+  RacingChocoboParam( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
 
 struct RecastNavimesh
 {
-   float tileSize;
-   float cellSize;
-   float cellHeight;
-   float agentHeight;
-   float agentRadius;
-   float agentMaxClimb;
-   float agentMaxSlope;
-   float regionMinSize;
-   float regionMergedSize;
-   float maxEdgeLength;
-   float maxEdgeError;
-   float vertsPerPoly;
-   float detailMeshSampleDistance;
-   float detailMeshMaxSampleError;
+  float tileSize;
+  float cellSize;
+  float cellHeight;
+  float agentHeight;
+  float agentRadius;
+  float agentMaxClimb;
+  float agentMaxSlope;
+  float regionMinSize;
+  float regionMergedSize;
+  float maxEdgeLength;
+  float maxEdgeError;
+  float vertsPerPoly;
+  float detailMeshSampleDistance;
+  float detailMeshMaxSampleError;
 
-   RecastNavimesh( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+  RecastNavimesh( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
 
 struct Recipe
 {
-   int32_t craftType;
-   uint16_t recipeLevelTable;
-   int32_t itemResult;
-   uint8_t amountResult;
-   uint8_t recipeElement;
-   bool isSecondary;
-   uint16_t difficultyFactor;
-   uint16_t qualityFactor;
-   uint16_t durabilityFactor;
-   uint16_t requiredCraftsmanship;
-   uint16_t requiredControl;
-   uint16_t quickSynthCraftsmanship;
-   uint16_t quickSynthControl;
-   uint16_t secretRecipeBook;
-   bool canQuickSynth;
-   bool canHq;
-   bool expRewarded;
-   int32_t statusRequired;
-   int32_t itemRequired;
-   bool isSpecializationRequired;
-   uint16_t patchNumber;
+  int32_t craftType;
+  uint16_t recipeLevelTable;
+  int32_t itemResult;
+  uint8_t amountResult;
+  uint8_t recipeElement;
+  bool isSecondary;
+  uint16_t difficultyFactor;
+  uint16_t qualityFactor;
+  uint16_t durabilityFactor;
+  uint16_t requiredCraftsmanship;
+  uint16_t requiredControl;
+  uint16_t quickSynthCraftsmanship;
+  uint16_t quickSynthControl;
+  uint16_t secretRecipeBook;
+  bool canQuickSynth;
+  bool canHq;
+  bool expRewarded;
+  int32_t statusRequired;
+  int32_t itemRequired;
+  bool isSpecializationRequired;
+  uint16_t patchNumber;
 
-   Recipe( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+  Recipe( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
 
 struct RecipeElement
 {
-   std::string name;
+  std::string name;
 
-   RecipeElement( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+  RecipeElement( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
 
 struct RecipeLevelTable
 {
-   uint8_t classJobLevel;
-   uint8_t stars;
-   uint16_t suggestedCraftsmanship;
-   uint16_t difficulty;
-   int16_t quality;
-   uint16_t durability;
+  uint8_t classJobLevel;
+  uint8_t stars;
+  uint16_t suggestedCraftsmanship;
+  uint16_t difficulty;
+  int16_t quality;
+  uint16_t durability;
 
-   RecipeLevelTable( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+  RecipeLevelTable( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
 
 struct RecipeNotebookList
 {
-   std::vector< int32_t > recipe;
+  std::vector< int32_t > recipe;
 
-   RecipeNotebookList( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+  RecipeNotebookList( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
 
 struct RecommendContents
 {
-   int32_t level;
+  int32_t level;
 
-   RecommendContents( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+  RecommendContents( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
 
 struct Relic
 {
-   uint32_t itemAtma;
-   uint32_t itemAnimus;
-   int32_t icon;
+  uint32_t itemAtma;
+  uint32_t itemAnimus;
+  int32_t icon;
 
-   Relic( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+  Relic( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
 
 struct Relic3
 {
-   uint32_t itemAnimus;
-   uint32_t itemScroll;
-   uint8_t materiaLimit;
-   uint32_t itemNovus;
-   int32_t icon;
+  uint32_t itemAnimus;
+  uint32_t itemScroll;
+  uint8_t materiaLimit;
+  uint32_t itemNovus;
+  int32_t icon;
 
-   Relic3( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+  Relic3( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
 
 struct RelicItem
 {
-   uint32_t gladiatorItem;
-   uint32_t pugilistItem;
-   uint32_t marauderItem;
-   uint32_t lancerItem;
-   uint32_t archerItem;
-   uint32_t conjurerItem;
-   uint32_t thaumaturgeItem;
-   uint32_t arcanistSMNItem;
-   uint32_t arcanistSCHItem;
-   uint32_t shieldItem;
-   uint32_t rogueItem;
+  uint32_t gladiatorItem;
+  uint32_t pugilistItem;
+  uint32_t marauderItem;
+  uint32_t lancerItem;
+  uint32_t archerItem;
+  uint32_t conjurerItem;
+  uint32_t thaumaturgeItem;
+  uint32_t arcanistSMNItem;
+  uint32_t arcanistSCHItem;
+  uint32_t shieldItem;
+  uint32_t rogueItem;
 
-   RelicItem( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+  RelicItem( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
 
 struct RelicNote
 {
-   uint32_t eventItem;
-   std::vector< uint16_t > monsterNoteTargetNM;
-   std::vector< uint16_t > leve;
+  uint32_t eventItem;
+  std::vector< uint16_t > monsterNoteTargetNM;
+  std::vector< uint16_t > leve;
 
-   RelicNote( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+  RelicNote( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
 
 struct RelicNoteCategory
 {
-   std::string text;
+  std::string text;
 
-   RelicNoteCategory( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+  RelicNoteCategory( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
 
 struct Resident
 {
-   uint64_t model;
-   int32_t npcYell;
-   uint8_t residentMotionType;
+  uint64_t model;
+  int32_t npcYell;
+  uint8_t residentMotionType;
 
-   Resident( uint32_t row_id, uint32_t subRow, Sapphire::Data::ExdDataGenerated* exdData );
+  Resident( uint32_t row_id, uint32_t subRow, Sapphire::Data::ExdDataGenerated* exdData );
 };
 
 struct RetainerTask
 {
-   bool isRandom;
-   uint8_t classJobCategory;
-   uint8_t retainerLevel;
-   uint16_t retainerTaskParameter;
-   uint16_t ventureCost;
-   uint16_t maxTimemin;
-   int32_t experience;
-   uint16_t requiredItemLevel;
-   uint16_t requiredGathering;
-   uint16_t task;
+  bool isRandom;
+  uint8_t classJobCategory;
+  uint8_t retainerLevel;
+  uint16_t retainerTaskParameter;
+  uint16_t ventureCost;
+  uint16_t maxTimemin;
+  int32_t experience;
+  uint16_t requiredItemLevel;
+  uint16_t requiredGathering;
+  uint16_t task;
 
-   RetainerTask( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+  RetainerTask( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
 
 struct RetainerTaskLvRange
 {
-   uint8_t min;
-   uint8_t max;
+  uint8_t min;
+  uint8_t max;
 
-   RetainerTaskLvRange( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+  RetainerTaskLvRange( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
 
 struct RetainerTaskNormal
 {
-   int32_t item;
-   uint8_t quantity0;
-   uint8_t quantity1;
-   uint8_t quantity2;
-   int16_t gatheringLog;
-   int16_t fishingLog;
+  int32_t item;
+  uint8_t quantity0;
+  uint8_t quantity1;
+  uint8_t quantity2;
+  int16_t gatheringLog;
+  int16_t fishingLog;
 
-   RetainerTaskNormal( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+  RetainerTaskNormal( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
 
 struct RetainerTaskParameter
 {
-   std::vector< int16_t > itemLevelDoW;
-   std::vector< int16_t > gatheringDoL;
-   std::vector< int16_t > gatheringFSH;
+  std::vector< int16_t > itemLevelDoW;
+  std::vector< int16_t > gatheringDoL;
+  std::vector< int16_t > gatheringFSH;
 
-   RetainerTaskParameter( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+  RetainerTaskParameter( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
 
 struct RetainerTaskRandom
 {
-   std::string name;
-   int16_t requirement;
+  std::string name;
+  int16_t requirement;
 
-   RetainerTaskRandom( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+  RetainerTaskRandom( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
 
 struct RPParameter
 {
-   uint16_t bNpcName;
-   uint8_t classJob;
+  uint16_t bNpcName;
+  uint8_t classJob;
 
-   RPParameter( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+  RPParameter( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
 
 struct Salvage
 {
-   uint16_t optimalSkill;
+  uint16_t optimalSkill;
 
-   Salvage( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+  Salvage( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
 
 struct SatisfactionNpc
 {
-   int32_t npc;
-   int32_t questRequired;
-   uint8_t deliveriesPerWeek;
-   std::vector< int32_t > supplyIndex;
-   std::vector< uint16_t > satisfactionRequired;
-   int32_t icon;
+  int32_t npc;
+  int32_t questRequired;
+  uint8_t deliveriesPerWeek;
+  std::vector< int32_t > supplyIndex;
+  std::vector< uint16_t > satisfactionRequired;
+  int32_t icon;
 
-   SatisfactionNpc( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+  SatisfactionNpc( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
 
 struct SatisfactionSupply
 {
-   uint8_t slot;
-   uint8_t probability;
-   int32_t item;
-   uint16_t collectabilityLow;
-   uint16_t collectabilityMid;
-   uint16_t collectabilityHigh;
-   uint16_t reward;
+  uint8_t slot;
+  uint8_t probability;
+  int32_t item;
+  uint16_t collectabilityLow;
+  uint16_t collectabilityMid;
+  uint16_t collectabilityHigh;
+  uint16_t reward;
 
-   SatisfactionSupply( uint32_t row_id, uint32_t subRow, Sapphire::Data::ExdDataGenerated* exdData );
+  SatisfactionSupply( uint32_t row_id, uint32_t subRow, Sapphire::Data::ExdDataGenerated* exdData );
 };
 
 struct SatisfactionSupplyReward
 {
-   uint16_t satisfactionLow;
-   uint16_t satisfactionMid;
-   uint16_t satisfactionHigh;
-   uint16_t gilLow;
-   uint16_t gilMid;
-   uint16_t gilHigh;
+  uint16_t satisfactionLow;
+  uint16_t satisfactionMid;
+  uint16_t satisfactionHigh;
+  uint16_t gilLow;
+  uint16_t gilMid;
+  uint16_t gilHigh;
 
-   SatisfactionSupplyReward( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+  SatisfactionSupplyReward( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
 
 struct ScenarioTree
 {
-   uint8_t type;
-   uint16_t image;
+  uint8_t type;
+  uint16_t image;
 
-   ScenarioTree( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+  ScenarioTree( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
 
 struct ScenarioTreeTips
 {
-   uint32_t tips1;
-   uint32_t tips2;
+  uint32_t tips1;
+  uint32_t tips2;
 
-   ScenarioTreeTips( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+  ScenarioTreeTips( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
 
 struct ScenarioTreeTipsClassQuest
 {
-   uint32_t quest;
-   uint16_t requiredLevel;
-   uint8_t requiredExpansion;
-   uint32_t requiredQuest;
+  uint32_t quest;
+  uint16_t requiredLevel;
+  uint8_t requiredExpansion;
+  uint32_t requiredQuest;
 
-   ScenarioTreeTipsClassQuest( uint32_t row_id, uint32_t subRow, Sapphire::Data::ExdDataGenerated* exdData );
+  ScenarioTreeTipsClassQuest( uint32_t row_id, uint32_t subRow, Sapphire::Data::ExdDataGenerated* exdData );
 };
 
 struct ScenarioTreeTipsQuest
 {
-   uint32_t level;
+  uint32_t level;
 
-   ScenarioTreeTipsQuest( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+  ScenarioTreeTipsQuest( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
 
 struct ScenarioType
 {
-   std::string type;
+  std::string type;
 
-   ScenarioType( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+  ScenarioType( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
 
 struct ScreenImage
 {
-   uint32_t image;
+  uint32_t image;
 
-   ScreenImage( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+  ScreenImage( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
 
 struct SecretRecipeBook
 {
-   int32_t item;
-   std::string name;
+  int32_t item;
+  std::string name;
 
-   SecretRecipeBook( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+  SecretRecipeBook( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
 
 struct SkyIsland2Mission
 {
-   uint32_t item1;
-   uint32_t item2;
-   uint16_t objective1;
-   uint8_t requiredAmount1;
-   uint16_t objective2;
-   uint8_t requiredAmount2;
-   uint16_t objective3;
-   uint32_t image;
+  uint32_t item1;
+  uint32_t item2;
+  uint16_t objective1;
+  uint8_t requiredAmount1;
+  uint16_t objective2;
+  uint8_t requiredAmount2;
+  uint16_t objective3;
+  uint32_t image;
 
-   SkyIsland2Mission( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+  SkyIsland2Mission( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
 
 struct SkyIsland2MissionDetail
 {
-   uint8_t type;
-   uint8_t range;
-   uint32_t eObj;
-   std::string objective;
+  uint8_t type;
+  uint8_t range;
+  uint32_t eObj;
+  std::string objective;
 
-   SkyIsland2MissionDetail( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+  SkyIsland2MissionDetail( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
 
 struct SkyIsland2MissionType
 {
-   bool type;
+  bool type;
 
-   SkyIsland2MissionType( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+  SkyIsland2MissionType( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
 
 struct SkyIsland2RangeType
 {
-   uint8_t type;
+  uint8_t type;
 
-   SkyIsland2RangeType( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+  SkyIsland2RangeType( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
 
 struct SpearfishingItem
 {
-   std::string description;
-   int32_t item;
-   uint16_t gatheringItemLevel;
-   uint16_t territoryType;
-   bool isVisible;
+  std::string description;
+  int32_t item;
+  uint16_t gatheringItemLevel;
+  uint16_t territoryType;
+  bool isVisible;
 
-   SpearfishingItem( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+  SpearfishingItem( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
 
 struct SpearfishingNotebook
 {
-   uint8_t gatheringLevel;
-   int32_t territoryType;
-   int16_t x;
-   int16_t y;
-   uint16_t radius;
-   uint16_t placeName;
-   uint16_t gatheringPointBase;
+  uint8_t gatheringLevel;
+  int32_t territoryType;
+  int16_t x;
+  int16_t y;
+  uint16_t radius;
+  uint16_t placeName;
+  uint16_t gatheringPointBase;
 
-   SpearfishingNotebook( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+  SpearfishingNotebook( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
 
 struct SpearfishingRecordPage
 {
-   int32_t placeName;
-   int32_t image;
+  int32_t placeName;
+  int32_t image;
 
-   SpearfishingRecordPage( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+  SpearfishingRecordPage( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
 
 struct SpecialShop
 {
-   std::string name;
-   std::vector< int32_t > questItem;
-   std::vector< int32_t > unknown;
-   std::vector< int32_t > achievementUnlock;
-   std::vector< uint16_t > patchNumber;
-   uint32_t questUnlock;
-   int32_t questShop;
-   int32_t notCompleteText;
-   int32_t completeText;
+  std::string name;
+  std::vector< int32_t > questItem;
+  std::vector< int32_t > unknown;
+  std::vector< int32_t > achievementUnlock;
+  std::vector< uint16_t > patchNumber;
+  uint32_t questUnlock;
+  int32_t questShop;
+  int32_t notCompleteText;
+  int32_t completeText;
 
-   SpecialShop( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+  SpecialShop( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
 
 struct SpecialShopItemCategory
 {
-   std::string name;
+  std::string name;
 
-   SpecialShopItemCategory( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+  SpecialShopItemCategory( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
 
 struct Stain
 {
-   uint32_t color;
-   uint8_t shade;
-   std::string name;
+  uint32_t color;
+  uint8_t shade;
+  std::string name;
 
-   Stain( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+  Stain( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
 
 struct StainTransient
 {
-   uint32_t item1;
-   uint32_t item2;
+  uint32_t item1;
+  uint32_t item2;
 
-   StainTransient( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+  StainTransient( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
 
 struct Status
 {
-   std::string name;
-   std::string description;
-   uint16_t icon;
-   uint8_t maxStacks;
-   uint8_t category;
-   uint8_t hitEffect;
-   uint8_t vFX;
-   bool lockMovement;
-   bool lockActions;
-   bool lockControl;
-   bool transfiguration;
-   bool canDispel;
-   bool inflictedByActor;
-   bool isPermanent;
-   bool isFcBuff;
-   bool invisibility;
+  std::string name;
+  std::string description;
+  uint16_t icon;
+  uint8_t maxStacks;
+  uint8_t category;
+  uint8_t hitEffect;
+  uint8_t vFX;
+  bool lockMovement;
+  bool lockActions;
+  bool lockControl;
+  bool transfiguration;
+  bool canDispel;
+  bool inflictedByActor;
+  bool isPermanent;
+  bool isFcBuff;
+  bool invisibility;
 
-   Status( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+  Status( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
 
 struct StatusHitEffect
 {
-   uint16_t location;
+  uint16_t location;
 
-   StatusHitEffect( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+  StatusHitEffect( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
 
 struct StatusLoopVFX
 {
-   uint16_t vFX;
-   uint16_t vFX2;
-   uint16_t vFX3;
+  uint16_t vFX;
+  uint16_t vFX2;
+  uint16_t vFX3;
 
-   StatusLoopVFX( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+  StatusLoopVFX( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
 
 struct Story
 {
 
-   Story( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+  Story( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
 
 struct SubmarineExploration
 {
-   std::string destination;
-   std::string location;
-   uint8_t rankReq;
-   uint8_t ceruleumTankReq;
-   uint16_t durationmin;
-   uint8_t distanceForSurvey;
-   uint32_t expReward;
+  std::string destination;
+  std::string location;
+  uint8_t rankReq;
+  uint8_t ceruleumTankReq;
+  uint16_t durationmin;
+  uint8_t distanceForSurvey;
+  uint32_t expReward;
 
-   SubmarineExploration( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+  SubmarineExploration( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
 
 struct SubmarinePart
 {
-   uint8_t slot;
-   uint8_t rank;
-   uint8_t components;
-   int16_t surveillance;
-   int16_t retrieval;
-   int16_t speed;
-   int16_t range;
-   int16_t favor;
-   uint8_t repairMaterials;
+  uint8_t slot;
+  uint8_t rank;
+  uint8_t components;
+  int16_t surveillance;
+  int16_t retrieval;
+  int16_t speed;
+  int16_t range;
+  int16_t favor;
+  uint8_t repairMaterials;
 
-   SubmarinePart( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+  SubmarinePart( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
 
 struct SubmarineRank
 {
-   uint16_t rank;
-   uint32_t expToNext;
+  uint16_t rank;
+  uint32_t expToNext;
 
-   SubmarineRank( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+  SubmarineRank( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
 
 struct SwitchTalk
 {
-   std::vector< uint32_t > quest;
-   std::vector< uint32_t > defaultTalk;
+  std::vector< uint32_t > quest;
+  std::vector< uint32_t > defaultTalk;
 
-   SwitchTalk( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+  SwitchTalk( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
 
 struct TerritoryType
 {
-   std::string name;
-   std::string bg;
-   uint16_t placeNameRegion;
-   uint16_t placeNameZone;
-   uint16_t placeName;
-   uint16_t map;
-   uint8_t territoryIntendedUse;
-   uint8_t weatherRate;
-   uint32_t arrayEventHandler;
-   uint16_t questBattle;
-   int32_t aetheryte;
+  std::string name;
+  std::string bg;
+  uint16_t placeNameRegion;
+  uint16_t placeNameZone;
+  uint16_t placeName;
+  uint16_t map;
+  uint8_t territoryIntendedUse;
+  uint8_t weatherRate;
+  int32_t placeNameRegionIcon;
+  int32_t placeNameIcon;
+  uint32_t arrayEventHandler;
+  uint16_t questBattle;
+  int32_t aetheryte;
+  bool isPvpZone;
 
-   TerritoryType( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+  TerritoryType( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
 
 struct TextCommand
 {
-   std::string command;
-   std::string shortCommand;
-   std::string description;
-   std::string alias;
-   std::string shortAlias;
+  std::string command;
+  std::string shortCommand;
+  std::string description;
+  std::string alias;
+  std::string shortAlias;
 
-   TextCommand( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+  TextCommand( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
 
 struct Title
 {
-   std::string masculine;
-   std::string feminine;
-   bool isPrefix;
-   uint16_t order;
+  std::string masculine;
+  std::string feminine;
+  bool isPrefix;
+  uint16_t order;
 
-   Title( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+  Title( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
 
 struct Tomestones
 {
-   uint16_t weeklyLimit;
+  uint16_t weeklyLimit;
 
-   Tomestones( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+  Tomestones( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
 
 struct TomestonesItem
 {
-   int32_t item;
-   int32_t tomestones;
+  int32_t item;
+  int32_t tomestones;
 
-   TomestonesItem( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+  TomestonesItem( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
 
 struct TopicSelect
 {
-   std::string name;
+  std::string name;
 
-   TopicSelect( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+  TopicSelect( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
 
 struct Town
 {
-   std::string name;
-   int32_t icon;
+  std::string name;
+  int32_t icon;
 
-   Town( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+  Town( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
 
 struct Trait
 {
-   std::string name;
-   int32_t icon;
-   uint8_t classJob;
-   uint8_t level;
-   uint32_t quest;
-   int16_t value;
-   uint8_t classJobCategory;
+  std::string name;
+  int32_t icon;
+  uint8_t classJob;
+  uint8_t level;
+  uint32_t quest;
+  int16_t value;
+  uint8_t classJobCategory;
 
-   Trait( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+  Trait( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
 
 struct TraitRecast
 {
-   uint16_t trait;
-   uint16_t action;
-   uint16_t timeds;
+  uint16_t trait;
+  uint16_t action;
+  uint16_t timeds;
 
-   TraitRecast( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+  TraitRecast( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
 
 struct TraitTransient
 {
-   std::string description;
+  std::string description;
 
-   TraitTransient( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+  TraitTransient( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
 
 struct Transformation
 {
-   int16_t model;
-   int32_t bNpcCustomize;
-   std::vector< uint16_t > action;
-   float speed;
-   float scale;
-   bool isPvP;
-   bool isEvent;
-   bool playerCamera;
+  int16_t model;
+  uint16_t bNpcName;
+  int32_t bNpcCustomize;
+  int32_t npcEquip;
+  std::vector< uint16_t > action;
+  float speed;
+  float scale;
+  bool isPvP;
+  bool isEvent;
+  bool playerCamera;
+  uint16_t startVFX;
+  uint16_t endVFX;
+  uint8_t rPParameter;
 
-   Transformation( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+  Transformation( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
 
 struct Treasure
 {
-   uint32_t item;
+  uint32_t item;
 
-   Treasure( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+  Treasure( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
 
 struct TreasureHuntRank
 {
-   uint32_t icon;
-   int32_t itemName;
-   int32_t keyItemName;
-   int32_t instanceMap;
-   uint8_t maxPartySize;
-   uint8_t minPartySize;
+  uint32_t icon;
+  int32_t itemName;
+  int32_t keyItemName;
+  int32_t instanceMap;
+  uint8_t maxPartySize;
+  uint8_t minPartySize;
 
-   TreasureHuntRank( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+  TreasureHuntRank( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+};
+
+struct TreasureSpot
+{
+  int32_t location;
+
+  TreasureSpot( uint32_t row_id, uint32_t subRow, Sapphire::Data::ExdDataGenerated* exdData );
 };
 
 struct Tribe
 {
-   std::string masculine;
-   std::string feminine;
-   int8_t sTR;
-   int8_t dEX;
-   int8_t vIT;
-   int8_t iNT;
-   int8_t mND;
-   int8_t pIE;
+  std::string masculine;
+  std::string feminine;
+  int8_t sTR;
+  int8_t dEX;
+  int8_t vIT;
+  int8_t iNT;
+  int8_t mND;
+  int8_t pIE;
 
-   Tribe( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+  Tribe( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
 
 struct TripleTriad
 {
-   std::vector< uint16_t > tripleTriadCardFixed;
-   std::vector< uint16_t > tripleTriadCardVariable;
-   std::vector< uint8_t > tripleTriadRule;
-   bool usesRegionalRules;
-   uint16_t fee;
-   uint8_t previousQuestJoin;
-   std::vector< uint32_t > previousQuest;
-   uint16_t startTime;
-   uint16_t endTime;
-   uint32_t defaultTalkChallenge;
-   uint32_t defaultTalkUnavailable;
-   uint32_t defaultTalkNPCWin;
-   uint32_t defaultTalkDraw;
-   uint32_t defaultTalkPCWin;
-   std::vector< uint32_t > itemPossibleReward;
+  std::vector< uint16_t > tripleTriadCardFixed;
+  std::vector< uint16_t > tripleTriadCardVariable;
+  std::vector< uint8_t > tripleTriadRule;
+  bool usesRegionalRules;
+  uint16_t fee;
+  uint8_t previousQuestJoin;
+  std::vector< uint32_t > previousQuest;
+  uint16_t startTime;
+  uint16_t endTime;
+  uint32_t defaultTalkChallenge;
+  uint32_t defaultTalkUnavailable;
+  uint32_t defaultTalkNPCWin;
+  uint32_t defaultTalkDraw;
+  uint32_t defaultTalkPCWin;
+  std::vector< uint32_t > itemPossibleReward;
 
-   TripleTriad( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+  TripleTriad( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
 
 struct TripleTriadCard
 {
-   std::string name;
-   int8_t startsWithVowel;
-   std::string description;
+  std::string name;
+  int8_t startsWithVowel;
+  std::string description;
 
-   TripleTriadCard( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+  TripleTriadCard( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
 
 struct TripleTriadCardRarity
 {
-   uint8_t stars;
+  uint8_t stars;
 
-   TripleTriadCardRarity( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+  TripleTriadCardRarity( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
 
 struct TripleTriadCardResident
 {
-   uint8_t top;
-   uint8_t bottom;
-   uint8_t left;
-   uint8_t right;
-   uint8_t tripleTriadCardRarity;
-   uint8_t tripleTriadCardType;
-   uint16_t saleValue;
-   uint8_t sortKey;
+  uint8_t top;
+  uint8_t bottom;
+  uint8_t left;
+  uint8_t right;
+  uint8_t tripleTriadCardRarity;
+  uint8_t tripleTriadCardType;
+  uint16_t saleValue;
+  uint8_t sortKey;
 
-   TripleTriadCardResident( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+  TripleTriadCardResident( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
 
 struct TripleTriadCardType
 {
-   std::string name;
+  std::string name;
 
-   TripleTriadCardType( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+  TripleTriadCardType( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
 
 struct TripleTriadCompetition
 {
-   std::string name;
+  std::string name;
 
-   TripleTriadCompetition( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+  TripleTriadCompetition( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
 
 struct TripleTriadRule
 {
-   std::string name;
+  std::string name;
 
-   TripleTriadRule( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+  TripleTriadRule( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
 
 struct Tutorial
 {
-   uint32_t exp;
-   uint32_t gil;
-   uint32_t rewardTank;
-   uint32_t rewardMelee;
-   uint32_t rewardRanged;
-   uint32_t objective;
+  uint32_t exp;
+  uint32_t gil;
+  uint32_t rewardTank;
+  uint32_t rewardMelee;
+  uint32_t rewardRanged;
+  uint32_t objective;
 
-   Tutorial( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+  Tutorial( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
 
 struct TutorialDPS
 {
-   uint8_t objective;
+  uint8_t objective;
 
-   TutorialDPS( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+  TutorialDPS( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
 
 struct TutorialHealer
 {
-   uint8_t objective;
+  uint8_t objective;
 
-   TutorialHealer( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+  TutorialHealer( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
 
 struct TutorialTank
 {
-   uint8_t objective;
+  uint8_t objective;
 
-   TutorialTank( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+  TutorialTank( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
 
 struct UIColor
 {
-   uint32_t uIForeground;
-   uint32_t uIGlow;
+  uint32_t uIForeground;
+  uint32_t uIGlow;
 
-   UIColor( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+  UIColor( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
 
 struct VaseFlower
 {
-   uint32_t item;
+  uint32_t item;
 
-   VaseFlower( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+  VaseFlower( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
 
 struct VFX
 {
-   std::string location;
+  std::string location;
 
-   VFX( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+  VFX( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
 
 struct Warp
 {
-   uint32_t level;
-   uint16_t placeName;
-   uint32_t conditionSuccessEvent;
-   uint32_t conditionFailEvent;
-   uint32_t confirmEvent;
-   uint16_t warpCondition;
-   uint16_t warpLogic;
+  uint32_t level;
+  uint16_t placeName;
+  uint32_t conditionSuccessEvent;
+  uint32_t conditionFailEvent;
+  uint32_t confirmEvent;
+  uint16_t warpCondition;
+  uint16_t warpLogic;
 
-   Warp( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+  Warp( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
 
 struct WarpCondition
 {
-   uint32_t requiredQuest1;
-   uint32_t requiredQuest2;
-   uint32_t dRequiredQuest3;
-   uint32_t requiredQuest4;
+  uint32_t requiredQuest1;
+  uint32_t requiredQuest2;
+  uint32_t dRequiredQuest3;
+  uint32_t requiredQuest4;
 
-   WarpCondition( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+  WarpCondition( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
 
 struct WarpLogic
 {
-   std::string warpName;
-   std::vector< std::string > function;
-   std::vector< uint32_t > argument;
-   std::string question;
-   std::string responseYes;
-   std::string responseNo;
+  std::string warpName;
+  std::vector< std::string > function;
+  std::string question;
+  std::string responseYes;
+  std::string responseNo;
 
-   WarpLogic( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+  WarpLogic( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
 
 struct Weather
 {
-   int32_t icon;
-   std::string name;
-   std::string description;
+  int32_t icon;
+  std::string name;
+  std::string description;
 
-   Weather( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+  Weather( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
 
 struct WeatherGroup
 {
-   int32_t weatherRate;
+  int32_t weatherRate;
 
-   WeatherGroup( uint32_t row_id, uint32_t subRow, Sapphire::Data::ExdDataGenerated* exdData );
+  WeatherGroup( uint32_t row_id, uint32_t subRow, Sapphire::Data::ExdDataGenerated* exdData );
 };
 
 struct WeatherRate
 {
 
-   WeatherRate( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+  WeatherRate( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
 
 struct WeatherReportReplace
 {
-   uint16_t placeNameSub;
-   uint16_t placeNameParent;
+  uint16_t placeNameSub;
+  uint16_t placeNameParent;
 
-   WeatherReportReplace( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+  WeatherReportReplace( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
 
 struct WeddingBGM
 {
-   uint16_t song;
-   std::string songName;
+  uint16_t song;
+  std::string songName;
 
-   WeddingBGM( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+  WeddingBGM( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
 
 struct WeeklyBingoOrderData
 {
-   uint32_t type;
-   uint32_t data;
-   uint8_t text;
-   uint32_t icon;
+  uint32_t type;
+  uint32_t data;
+  uint8_t text;
+  uint32_t icon;
 
-   WeeklyBingoOrderData( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+  WeeklyBingoOrderData( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
 
 struct WeeklyBingoRewardData
 {
-   uint32_t rewardItem2;
-   bool rewardHQ2;
-   uint16_t rewardQuantity2;
+  uint32_t rewardItem2;
+  bool rewardHQ2;
+  uint16_t rewardQuantity2;
 
-   WeeklyBingoRewardData( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+  WeeklyBingoRewardData( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
 
 struct WeeklyBingoText
 {
-   std::string description;
+  std::string description;
 
-   WeeklyBingoText( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+  WeeklyBingoText( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
 
 struct WeeklyLotBonus
 {
-   std::vector< uint8_t > weeklyLotBonusThreshold;
+  std::vector< uint8_t > weeklyLotBonusThreshold;
 
-   WeeklyLotBonus( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+  WeeklyLotBonus( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
 
 struct World
 {
-   std::string name;
-   uint8_t dataCenter;
-   bool isPublic;
+  std::string name;
+  uint8_t dataCenter;
+  bool isPublic;
 
-   World( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+  World( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
 
 struct WorldDCGroupType
 {
-   std::string name;
-   uint8_t region;
+  std::string name;
+  uint8_t region;
 
-   WorldDCGroupType( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+  WorldDCGroupType( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
 
 struct YKW
 {
-   uint32_t item;
-   std::vector< uint16_t > location;
+  uint32_t item;
+  std::vector< uint16_t > location;
 
-   YKW( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+  YKW( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
 
 struct ZoneSharedGroup
 {
-   uint32_t quest1;
-   uint32_t quest2;
-   uint32_t quest3;
-   uint32_t quest4;
-   uint32_t quest5;
-   uint32_t quest6;
+  uint32_t quest1;
+  uint32_t quest2;
+  uint32_t quest3;
+  uint32_t quest4;
+  uint32_t quest5;
+  uint32_t quest6;
 
-   ZoneSharedGroup( uint32_t row_id, uint32_t subRow, Sapphire::Data::ExdDataGenerated* exdData );
+  ZoneSharedGroup( uint32_t row_id, uint32_t subRow, Sapphire::Data::ExdDataGenerated* exdData );
 };
 
 
@@ -5469,23 +5558,53 @@ struct ZoneSharedGroup
   class ExdDataGenerated
   {
   public:
-     ExdDataGenerated();
-     ~ExdDataGenerated();
+    ExdDataGenerated();
+    ~ExdDataGenerated();
 
-     bool init( const std::string& path );
+    bool init( const std::string& path );
 
-     xiv::exd::Exd setupDatAccess( const std::string& name, xiv::exd::Language lang );
+    xiv::exd::Exd setupDatAccess( const std::string& name, xiv::exd::Language lang );
 
-     template< class T >
-     T getField( std::vector< xiv::exd::Field >& fields, uint32_t index )
-     {
-        return std::get< T >( fields.at( index ) );
-     }
+    template< class T >
+    T getField( std::vector< xiv::exd::Field >& fields, uint32_t index )
+    {
+       return std::get< T >( fields.at( index ) );
+    }
 
-     void loadIdList( xiv::exd::Exd& data, std::set< uint32_t >& outIdList );
+    void loadIdList( xiv::exd::Exd& data, std::set< uint32_t >& outIdList );
 
-     std::shared_ptr< xiv::dat::GameData > m_data;
-     std::shared_ptr< xiv::exd::ExdData > m_exd_data;
+    std::shared_ptr< xiv::dat::GameData > m_data;
+    std::shared_ptr< xiv::exd::ExdData > m_exd_data;
+
+    template< class T >
+    std::shared_ptr< T > get( uint32_t id )
+    {
+      try
+      {
+        auto info = std::make_shared< T >( id, this );
+        return info;
+      }
+      catch( ... )
+      {
+        return nullptr;
+      }
+      return nullptr;
+    }
+
+    template< class T >
+    std::shared_ptr< T > get( uint32_t id, uint32_t slotId )
+    {
+      try
+      {
+        auto info = std::make_shared< T >( id, slotId, this );
+        return info;
+      }
+      catch( ... )
+      {
+        return nullptr;
+      }
+      return nullptr;
+    }
 
      xiv::exd::Exd m_AchievementDat;
      xiv::exd::Exd m_AchievementCategoryDat;
@@ -5594,6 +5713,8 @@ struct ZoneSharedGroup
      xiv::exd::Exd m_CompanyCraftSequenceDat;
      xiv::exd::Exd m_CompanyCraftSupplyItemDat;
      xiv::exd::Exd m_CompanyCraftTypeDat;
+     xiv::exd::Exd m_CompanyLeveDat;
+     xiv::exd::Exd m_CompanyLeveRuleDat;
      xiv::exd::Exd m_CompleteJournalDat;
      xiv::exd::Exd m_CompleteJournalCategoryDat;
      xiv::exd::Exd m_ContentCloseCycleDat;
@@ -5617,6 +5738,8 @@ struct ZoneSharedGroup
      xiv::exd::Exd m_CreditDat;
      xiv::exd::Exd m_CreditBackImageDat;
      xiv::exd::Exd m_CreditCastDat;
+     xiv::exd::Exd m_CreditListDat;
+     xiv::exd::Exd m_CreditListTextDat;
      xiv::exd::Exd m_CurrencyDat;
      xiv::exd::Exd m_CustomTalkDat;
      xiv::exd::Exd m_CustomTalkDynamicIconDat;
@@ -5823,6 +5946,8 @@ struct ZoneSharedGroup
      xiv::exd::Exd m_MountTransientDat;
      xiv::exd::Exd m_MoveTimelineDat;
      xiv::exd::Exd m_MoveVfxDat;
+     xiv::exd::Exd m_NotebookDivisionDat;
+     xiv::exd::Exd m_NotebookDivisionCategoryDat;
      xiv::exd::Exd m_NpcEquipDat;
      xiv::exd::Exd m_NpcYellDat;
      xiv::exd::Exd m_OmenDat;
@@ -5927,6 +6052,7 @@ struct ZoneSharedGroup
      xiv::exd::Exd m_TransformationDat;
      xiv::exd::Exd m_TreasureDat;
      xiv::exd::Exd m_TreasureHuntRankDat;
+     xiv::exd::Exd m_TreasureSpotDat;
      xiv::exd::Exd m_TribeDat;
      xiv::exd::Exd m_TripleTriadDat;
      xiv::exd::Exd m_TripleTriadCardDat;
@@ -6067,6 +6193,8 @@ struct ZoneSharedGroup
      using CompanyCraftSequencePtr = std::shared_ptr< CompanyCraftSequence >;
      using CompanyCraftSupplyItemPtr = std::shared_ptr< CompanyCraftSupplyItem >;
      using CompanyCraftTypePtr = std::shared_ptr< CompanyCraftType >;
+     using CompanyLevePtr = std::shared_ptr< CompanyLeve >;
+     using CompanyLeveRulePtr = std::shared_ptr< CompanyLeveRule >;
      using CompleteJournalPtr = std::shared_ptr< CompleteJournal >;
      using CompleteJournalCategoryPtr = std::shared_ptr< CompleteJournalCategory >;
      using ContentCloseCyclePtr = std::shared_ptr< ContentCloseCycle >;
@@ -6090,6 +6218,8 @@ struct ZoneSharedGroup
      using CreditPtr = std::shared_ptr< Credit >;
      using CreditBackImagePtr = std::shared_ptr< CreditBackImage >;
      using CreditCastPtr = std::shared_ptr< CreditCast >;
+     using CreditListPtr = std::shared_ptr< CreditList >;
+     using CreditListTextPtr = std::shared_ptr< CreditListText >;
      using CurrencyPtr = std::shared_ptr< Currency >;
      using CustomTalkPtr = std::shared_ptr< CustomTalk >;
      using CustomTalkDynamicIconPtr = std::shared_ptr< CustomTalkDynamicIcon >;
@@ -6296,6 +6426,8 @@ struct ZoneSharedGroup
      using MountTransientPtr = std::shared_ptr< MountTransient >;
      using MoveTimelinePtr = std::shared_ptr< MoveTimeline >;
      using MoveVfxPtr = std::shared_ptr< MoveVfx >;
+     using NotebookDivisionPtr = std::shared_ptr< NotebookDivision >;
+     using NotebookDivisionCategoryPtr = std::shared_ptr< NotebookDivisionCategory >;
      using NpcEquipPtr = std::shared_ptr< NpcEquip >;
      using NpcYellPtr = std::shared_ptr< NpcYell >;
      using OmenPtr = std::shared_ptr< Omen >;
@@ -6400,6 +6532,7 @@ struct ZoneSharedGroup
      using TransformationPtr = std::shared_ptr< Transformation >;
      using TreasurePtr = std::shared_ptr< Treasure >;
      using TreasureHuntRankPtr = std::shared_ptr< TreasureHuntRank >;
+     using TreasureSpotPtr = std::shared_ptr< TreasureSpot >;
      using TribePtr = std::shared_ptr< Tribe >;
      using TripleTriadPtr = std::shared_ptr< TripleTriad >;
      using TripleTriadCardPtr = std::shared_ptr< TripleTriadCard >;
@@ -6432,37 +6565,6 @@ struct ZoneSharedGroup
      using YKWPtr = std::shared_ptr< YKW >;
      using ZoneSharedGroupPtr = std::shared_ptr< ZoneSharedGroup >;
 
-     template< class T >
-     std::shared_ptr< T > get( uint32_t id )
-     {
-        try
-        {
-           auto info = std::make_shared< T >( id, this );
-           return info;
-        }
-        catch( ... )
-        {
-           return nullptr;
-        }
-        return nullptr;
-     }
-
-    template< class T >
-    std::shared_ptr< T > get( uint32_t id, uint32_t slotId )
-    {
-      try
-      {
-        auto info = std::make_shared< T >( id, slotId, this );
-        return info;
-      }
-      catch( std::runtime_error error )
-      {
-        // std::cout << error.what();
-        return nullptr;
-      }
-      return nullptr;
-    }
-
 
      std::set< uint32_t > m_AchievementIdList;
      std::set< uint32_t > m_AchievementCategoryIdList;
@@ -6571,6 +6673,8 @@ struct ZoneSharedGroup
      std::set< uint32_t > m_CompanyCraftSequenceIdList;
      std::set< uint32_t > m_CompanyCraftSupplyItemIdList;
      std::set< uint32_t > m_CompanyCraftTypeIdList;
+     std::set< uint32_t > m_CompanyLeveIdList;
+     std::set< uint32_t > m_CompanyLeveRuleIdList;
      std::set< uint32_t > m_CompleteJournalIdList;
      std::set< uint32_t > m_CompleteJournalCategoryIdList;
      std::set< uint32_t > m_ContentCloseCycleIdList;
@@ -6594,6 +6698,8 @@ struct ZoneSharedGroup
      std::set< uint32_t > m_CreditIdList;
      std::set< uint32_t > m_CreditBackImageIdList;
      std::set< uint32_t > m_CreditCastIdList;
+     std::set< uint32_t > m_CreditListIdList;
+     std::set< uint32_t > m_CreditListTextIdList;
      std::set< uint32_t > m_CurrencyIdList;
      std::set< uint32_t > m_CustomTalkIdList;
      std::set< uint32_t > m_CustomTalkDynamicIconIdList;
@@ -6800,6 +6906,8 @@ struct ZoneSharedGroup
      std::set< uint32_t > m_MountTransientIdList;
      std::set< uint32_t > m_MoveTimelineIdList;
      std::set< uint32_t > m_MoveVfxIdList;
+     std::set< uint32_t > m_NotebookDivisionIdList;
+     std::set< uint32_t > m_NotebookDivisionCategoryIdList;
      std::set< uint32_t > m_NpcEquipIdList;
      std::set< uint32_t > m_NpcYellIdList;
      std::set< uint32_t > m_OmenIdList;
@@ -6904,6 +7012,7 @@ struct ZoneSharedGroup
      std::set< uint32_t > m_TransformationIdList;
      std::set< uint32_t > m_TreasureIdList;
      std::set< uint32_t > m_TreasureHuntRankIdList;
+     std::set< uint32_t > m_TreasureSpotIdList;
      std::set< uint32_t > m_TribeIdList;
      std::set< uint32_t > m_TripleTriadIdList;
      std::set< uint32_t > m_TripleTriadCardIdList;
@@ -7579,6 +7688,18 @@ const std::set< uint32_t >& getCompanyCraftTypeIdList()
       loadIdList( m_CompanyCraftTypeDat, m_CompanyCraftTypeIdList );
    return m_CompanyCraftTypeIdList;
 }
+const std::set< uint32_t >& getCompanyLeveIdList()
+{
+   if( m_CompanyLeveIdList.size() == 0 )
+      loadIdList( m_CompanyLeveDat, m_CompanyLeveIdList );
+   return m_CompanyLeveIdList;
+}
+const std::set< uint32_t >& getCompanyLeveRuleIdList()
+{
+   if( m_CompanyLeveRuleIdList.size() == 0 )
+      loadIdList( m_CompanyLeveRuleDat, m_CompanyLeveRuleIdList );
+   return m_CompanyLeveRuleIdList;
+}
 const std::set< uint32_t >& getCompleteJournalIdList()
 {
    if( m_CompleteJournalIdList.size() == 0 )
@@ -7717,6 +7838,18 @@ const std::set< uint32_t >& getCreditCastIdList()
       loadIdList( m_CreditCastDat, m_CreditCastIdList );
    return m_CreditCastIdList;
 }
+const std::set< uint32_t >& getCreditListIdList()
+{
+   if( m_CreditListIdList.size() == 0 )
+      loadIdList( m_CreditListDat, m_CreditListIdList );
+   return m_CreditListIdList;
+}
+const std::set< uint32_t >& getCreditListTextIdList()
+{
+   if( m_CreditListTextIdList.size() == 0 )
+      loadIdList( m_CreditListTextDat, m_CreditListTextIdList );
+   return m_CreditListTextIdList;
+}
 const std::set< uint32_t >& getCurrencyIdList()
 {
    if( m_CurrencyIdList.size() == 0 )
@@ -8953,6 +9086,18 @@ const std::set< uint32_t >& getMoveVfxIdList()
       loadIdList( m_MoveVfxDat, m_MoveVfxIdList );
    return m_MoveVfxIdList;
 }
+const std::set< uint32_t >& getNotebookDivisionIdList()
+{
+   if( m_NotebookDivisionIdList.size() == 0 )
+      loadIdList( m_NotebookDivisionDat, m_NotebookDivisionIdList );
+   return m_NotebookDivisionIdList;
+}
+const std::set< uint32_t >& getNotebookDivisionCategoryIdList()
+{
+   if( m_NotebookDivisionCategoryIdList.size() == 0 )
+      loadIdList( m_NotebookDivisionCategoryDat, m_NotebookDivisionCategoryIdList );
+   return m_NotebookDivisionCategoryIdList;
+}
 const std::set< uint32_t >& getNpcEquipIdList()
 {
    if( m_NpcEquipIdList.size() == 0 )
@@ -9577,6 +9722,12 @@ const std::set< uint32_t >& getTreasureHuntRankIdList()
       loadIdList( m_TreasureHuntRankDat, m_TreasureHuntRankIdList );
    return m_TreasureHuntRankIdList;
 }
+const std::set< uint32_t >& getTreasureSpotIdList()
+{
+   if( m_TreasureSpotIdList.size() == 0 )
+      loadIdList( m_TreasureSpotDat, m_TreasureSpotIdList );
+   return m_TreasureSpotIdList;
+}
 const std::set< uint32_t >& getTribeIdList()
 {
    if( m_TribeIdList.size() == 0 )
diff --git a/src/tools/exd_struct_gen/ExdData.cpp.tmpl b/src/tools/exd_struct_gen/ExdData.cpp.tmpl
index 72a2d752..77d1398f 100644
--- a/src/tools/exd_struct_gen/ExdData.cpp.tmpl
+++ b/src/tools/exd_struct_gen/ExdData.cpp.tmpl
@@ -1,9 +1,5 @@
 #include "ExdDataGenerated.h"
-#include <boost/make_shared.hpp>
-
-#include <boost/variant.hpp>
-
-
+#include <memory>
 CONSTRUCTORS
 
 Sapphire::Data::ExdDataGenerated::ExdDataGenerated()
@@ -16,37 +12,37 @@ Sapphire::Data::ExdDataGenerated::~ExdDataGenerated()
 
 xiv::exd::Exd Sapphire::Data::ExdDataGenerated::setupDatAccess( const std::string& name, xiv::exd::Language lang )
 {
-   auto& cat = m_exd_data->get_category( name );
-   return static_cast< xiv::exd::Exd >( cat.get_data_ln( lang ) );
+  auto& cat = m_exd_data->get_category( name );
+  return static_cast< xiv::exd::Exd >( cat.get_data_ln( lang ) );
 };
 
 
 void Sapphire::Data::ExdDataGenerated::loadIdList( xiv::exd::Exd& data, std::set< uint32_t >& outIdList )
 {
-   auto pDataRows = data.get_rows();
+  auto pDataRows = data.get_rows();
 
-   for( auto row : pDataRows )
-   {
-      uint32_t id = row.first;
-      outIdList.insert( id );
-   }
+  for( auto row : pDataRows )
+  {
+    uint32_t id = row.first;
+    outIdList.insert( id );
+  }
 }
 
 bool Sapphire::Data::ExdDataGenerated::init( const std::string& path )
 {
-   try
-   {
-      m_data = std::make_shared< xiv::dat::GameData >( path );
-      m_exd_data = std::make_shared< xiv::exd::ExdData >( *m_data );
+  try
+  {
+    m_data = std::make_shared< xiv::dat::GameData >( path );
+    m_exd_data = std::make_shared< xiv::exd::ExdData >( *m_data );
 
 SETUPDATACCESS
-   }
-   catch( std::runtime_error )
-   {
-      return false;
-   }
+  }
+  catch( std::runtime_error )
+  {
+    return false;
+  }
 
-   return true;
+  return true;
 }
 
 ///////////////////////////////////////////////////////////////
diff --git a/src/tools/exd_struct_gen/ExdData.h.tmpl b/src/tools/exd_struct_gen/ExdData.h.tmpl
index 6af410b4..4b344f7b 100644
--- a/src/tools/exd_struct_gen/ExdData.h.tmpl
+++ b/src/tools/exd_struct_gen/ExdData.h.tmpl
@@ -25,23 +25,53 @@ STRUCTS
   class ExdDataGenerated
   {
   public:
-     ExdDataGenerated();
-     ~ExdDataGenerated();
+    ExdDataGenerated();
+    ~ExdDataGenerated();
 
-     bool init( const std::string& path );
+    bool init( const std::string& path );
 
-     xiv::exd::Exd setupDatAccess( const std::string& name, xiv::exd::Language lang );
+    xiv::exd::Exd setupDatAccess( const std::string& name, xiv::exd::Language lang );
 
-     template< class T >
-     T getField( std::vector< xiv::exd::Field >& fields, uint32_t index )
-     {
-        return std::get< T >( fields.at( index ) );
-     }
+    template< class T >
+    T getField( std::vector< xiv::exd::Field >& fields, uint32_t index )
+    {
+       return std::get< T >( fields.at( index ) );
+    }
 
-     void loadIdList( xiv::exd::Exd& data, std::set< uint32_t >& outIdList );
+    void loadIdList( xiv::exd::Exd& data, std::set< uint32_t >& outIdList );
 
-     std::shared_ptr< xiv::dat::GameData > m_data;
-     std::shared_ptr< xiv::exd::ExdData > m_exd_data;
+    std::shared_ptr< xiv::dat::GameData > m_data;
+    std::shared_ptr< xiv::exd::ExdData > m_exd_data;
+
+    template< class T >
+    std::shared_ptr< T > get( uint32_t id )
+    {
+      try
+      {
+        auto info = std::make_shared< T >( id, this );
+        return info;
+      }
+      catch( ... )
+      {
+        return nullptr;
+      }
+      return nullptr;
+    }
+
+    template< class T >
+    std::shared_ptr< T > get( uint32_t id, uint32_t slotId )
+    {
+      try
+      {
+        auto info = std::make_shared< T >( id, slotId, this );
+        return info;
+      }
+      catch( ... )
+      {
+        return nullptr;
+      }
+      return nullptr;
+    }
 
 DATACCESS
 
diff --git a/src/tools/exd_struct_gen/main.cpp b/src/tools/exd_struct_gen/main.cpp
index 8180a55d..7e0a3493 100644
--- a/src/tools/exd_struct_gen/main.cpp
+++ b/src/tools/exd_struct_gen/main.cpp
@@ -41,10 +41,12 @@ std::map< char, std::string > numberToStringMap
     { '9', "nine" },
   };
 
-std::vector< std::string > cppKeyWords
+std::vector< std::string > reservedWords
   {
     "new",
-    "class"
+    "class",
+    "long",
+    "short"
   };
 
 //std::string datLocation( "/home/mordred/sqpack" );
@@ -89,7 +91,7 @@ std::string generateSetDatAccessCall( const std::string& exd )
   if( langs.size() > 1 )
     lang = "xiv::exd::Language::en";
 
-  return "      m_" + exd + "Dat = setupDatAccess( \"" + exd + "\", " + lang + " );\n";
+  return "    m_" + exd + "Dat = setupDatAccess( \"" + exd + "\", " + lang + " );\n";
 }
 
 std::string generateDirectGetterDef()
@@ -203,7 +205,7 @@ std::string generateStruct( const std::string& exd )
     }
     fieldName[ 0 ] = std::tolower( fieldName[ 0 ] );
 
-    std::string badChars = ",-':![](){}<>% \x02\x1f\x01\x03";
+    std::string badChars = ",-':![](){}/<>% \x02\x1f\x01\x03";
     std::for_each( badChars.begin(), badChars.end(), [ &fieldName ]( const char c ) 
     {
       fieldName.erase( std::remove( fieldName.begin(), fieldName.end(), c ), fieldName.end() );
@@ -218,23 +220,23 @@ std::string generateStruct( const std::string& exd )
       }
     }
 
-    for( std::string keyword : cppKeyWords )
+    for( std::string keyword : reservedWords )
     {
       if( fieldName == keyword )
-        fieldName[ 0 ] = toupper( fieldName[ 0 ] );
+        fieldName = fmt::format( "_{}", fieldName );
     }
 
     indexToNameMap[ count ] = fieldName;
     indexToTypeMap[ count ] = type;
     if( indexToTarget.find( count ) != indexToTarget.end() )
-      result += "   std::shared_ptr< " + indexToTarget[ count ] + "> " + fieldName + ";\n";
+      result += "  std::shared_ptr< " + indexToTarget[ count ] + "> " + fieldName + ";\n";
     else
     {
       if( indexIsArrayMap.find( count ) != indexIsArrayMap.end() )
       {
         type = "std::vector< " + type + " >";
       }
-      result += "   " + type + " " + fieldName + ";\n";
+      result += "  " + type + " " + fieldName + ";\n";
 
     }
 
@@ -244,11 +246,11 @@ std::string generateStruct( const std::string& exd )
   auto exhHead = exh.get_header();
   if( exhHead.variant == 2 )
   {
-    result += "\n   " + exd + "( uint32_t row_id, uint32_t subRow, Sapphire::Data::ExdDataGenerated* exdData );\n";
+    result += "\n  " + exd + "( uint32_t row_id, uint32_t subRow, Sapphire::Data::ExdDataGenerated* exdData );\n";
   }
   else
   {
-    result += "\n   " + exd + "( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );\n";
+    result += "\n  " + exd + "( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );\n";
   }
   result += "};\n\n";
 
@@ -265,7 +267,7 @@ std::string generateConstructorsDecl( const std::string& exd )
 
   int count = 0;
 
-  std::string indent = "   ";
+  std::string indent = "  ";
   auto exhHead = exh.get_header();
   if( exhHead.variant == 2 )
   {
@@ -407,22 +409,6 @@ int main( int argc, char** argv )
 
   Logger::info( "Processed {} definition files, writing files...", entryCount );
 
-  getterDecl +=
-    "\n     template< class T >\n"
-    "     std::shared_ptr< T > get( uint32_t id )\n"
-    "     {\n"
-    "        try\n"
-    "        {\n"
-    "           auto info = std::make_shared< T >( id, this );\n"
-    "           return info;\n"
-    "        }\n"
-    "        catch( ... )\n"
-    "        {\n"
-    "           return nullptr;\n"
-    "        }\n"
-    "        return nullptr;\n"
-    "     }\n";
-
   getterDef += generateDirectGetterDef();
 
   // for all sheets in the json i guess....
diff --git a/src/world/Action/Action.cpp b/src/world/Action/Action.cpp
index 0f0c0bcd..e4d67f4d 100644
--- a/src/world/Action/Action.cpp
+++ b/src/world/Action/Action.cpp
@@ -99,8 +99,8 @@ bool Action::Action::init()
     }
   }
 
-  m_primaryCostType = static_cast< Common::ActionPrimaryCostType >( m_actionData->costType );
-  m_primaryCost = m_actionData->cost;
+  m_primaryCostType = static_cast< Common::ActionPrimaryCostType >( m_actionData->primaryCostType );
+  m_primaryCost = m_actionData->primaryCostValue;
 
   /*if( !m_actionData->targetArea )
   {

From 537abfcf16cf2e127212100ea0fc61184c6c544b Mon Sep 17 00:00:00 2001
From: NotAdam <adam@notadam.me>
Date: Sun, 16 Jun 2019 00:14:05 +1000
Subject: [PATCH 057/351] add migration functionality to dbm

---
 sql/schema/schema.sql    |   5 ++
 src/common/Util/Util.cpp |  12 +++
 src/common/Util/Util.h   |   2 +
 src/dbm/DbManager.cpp    | 175 ++++++++++++++++++++++++++++++++++++++-
 src/dbm/DbManager.h      |  15 +++-
 src/dbm/main.cpp         |  38 ++++++++-
 6 files changed, 237 insertions(+), 10 deletions(-)

diff --git a/sql/schema/schema.sql b/sql/schema/schema.sql
index 9663e255..e58df240 100644
--- a/sql/schema/schema.sql
+++ b/sql/schema/schema.sql
@@ -602,3 +602,8 @@ CREATE TABLE `charamonsternote` (
   `UPDATE_DATE` datetime DEFAULT CURRENT_TIMESTAMP,
   PRIMARY KEY(`CharacterId`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1;
+
+CREATE TABLE `__Migration` (
+   `MigrationName` VARCHAR(250) NOT NULL,
+   PRIMARY KEY (`MigrationName`)
+) ENGINE=InnoDB;
diff --git a/src/common/Util/Util.cpp b/src/common/Util/Util.cpp
index d653e29c..2be5d946 100644
--- a/src/common/Util/Util.cpp
+++ b/src/common/Util/Util.cpp
@@ -141,3 +141,15 @@ void Util::valueToFlagByteIndexValue( uint32_t inVal, uint8_t& outVal, uint16_t&
   outVal = 1 << bitIndex;
 }
 
+
+std::string Util::fmtUtcTime( const std::string& fmt )
+{
+  auto t = std::time( nullptr );
+  auto tm = std::gmtime( &t );
+
+  std::stringstream ss;
+
+  ss << std::put_time( tm, fmt.c_str() );
+
+  return ss.str();
+}
diff --git a/src/common/Util/Util.h b/src/common/Util/Util.h
index e42dd7ee..b498b5bc 100644
--- a/src/common/Util/Util.h
+++ b/src/common/Util/Util.h
@@ -19,6 +19,8 @@ namespace Sapphire::Common::Util
 
   std::string toLowerCopy( const std::string& inStr );
 
+  std::string fmtUtcTime( const std::string& fmt );
+
   uint64_t getTimeMs();
 
   /*!
diff --git a/src/dbm/DbManager.cpp b/src/dbm/DbManager.cpp
index b81790a4..371273a2 100644
--- a/src/dbm/DbManager.cpp
+++ b/src/dbm/DbManager.cpp
@@ -4,6 +4,15 @@
 #include <fstream>
 #include <streambuf>
 #include <sstream>
+#include <Logging/Logger.h>
+#include <experimental/filesystem>
+
+#include <common/Util/Util.h>
+
+using namespace Sapphire;
+using namespace Sapphire::Common;
+
+namespace fs = std::experimental::filesystem;
 
 DbManager::DbManager( const std::string& host, const std::string& database, const std::string& user, const std::string& pw, uint16_t port ) :
   m_host( host ),
@@ -107,9 +116,14 @@ bool DbManager::performAction()
     case Mode::LIQUIDATE:
       result = modeLiquidate();
       break;
-    case Mode::UPDATE:
+    case Mode::MIGRATE:
+      result = modeMigrate();
       break;
     case Mode::CHECK:
+      result = modeCheck();
+      break;
+    case Mode::ADD_MIGRATION:
+      result = modeAddMigration();
       break;
     case Mode::CLEAN_CHARS:
       break;
@@ -195,8 +209,8 @@ bool DbManager::modeInit()
     content.erase( 0, pos + delimiter.length() );
   }
 
-  std::cout << "======================================================" << std::endl;
-  std::cout << "Inserting default values..." << std::endl;
+  Logger::info( "======================================================" );
+  Logger::info( "Inserting default values..." );
 
 
   std::ifstream t1( m_iFile );
@@ -273,7 +287,7 @@ bool DbManager::modeLiquidate()
 
     while( resultSet->next() )
     {
-      std::cout << "DROP TABLE `" + resultSet->getString( 1 ) + "`;" << "\n";
+      Logger::info( "DROP TABLE `{}`;", resultSet->getString( 1 ) );
       if( !execute( "DROP TABLE `" + resultSet->getString( 1 ) + "`;" ) )
         return false;
     }
@@ -297,4 +311,157 @@ void DbManager::setSchemaFile( const std::string& sFile )
   m_sFile = sFile;
 }
 
+void DbManager::setMigratioName( const std::string& name )
+{
+  m_migrationName = name;
+}
+
+bool DbManager::modeCheck()
+{
+  if( !selectSchema() )
+    return false;
+
+  std::string query = "SELECT MigrationName FROM __Migration;";
+
+  std::vector< std::string > appliedMigrations;
+
+  try
+  {
+    auto stmt = m_pConnection->createStatement();
+    auto resultSet = stmt->executeQuery( query );
+
+    while( resultSet->next() )
+    {
+      appliedMigrations.emplace_back( resultSet->getString( 1 ) );
+    }
+  }
+  catch( std::runtime_error& e )
+  {
+    m_lastError = e.what();
+    return false;
+  }
+
+  uint32_t missing = 0;
+  for( auto& entry : fs::directory_iterator( "sql/migrations" ) )
+  {
+    auto& path = entry.path();
+
+    // just in case...
+    if( path.extension() != ".sql" )
+      continue;
+
+    if( std::find( appliedMigrations.begin(), appliedMigrations.end(), path.filename().string() ) == appliedMigrations.end() )
+    {
+      Logger::info( "Missing migration: {}", path.filename().string() );
+      missing++;
+    }
+  }
+
+  if( missing > 0 )
+  {
+    Logger::warn( "Database is missing {} migrations.", missing );
+  }
+  else
+  {
+    Logger::info( "All available migrations have been applied." );
+  }
+
+  return true;
+}
+
+bool DbManager::modeMigrate()
+{
+  if( !selectSchema() )
+    return false;
+
+  std::string query = "SELECT MigrationName FROM __Migration;";
+
+  std::vector< std::string > appliedMigrations;
+
+  try
+  {
+    auto stmt = m_pConnection->createStatement();
+    auto resultSet = stmt->executeQuery( query );
+
+    while( resultSet->next() )
+    {
+      appliedMigrations.emplace_back( resultSet->getString( 1 ) );
+    }
+  }
+  catch( std::runtime_error& e )
+  {
+    m_lastError = e.what();
+    return false;
+  }
+
+  for( auto& entry : fs::directory_iterator( "sql/migrations" ) )
+  {
+    auto& path = entry.path();
+
+    // just in case...
+    if( path.extension() != ".sql" )
+      continue;
+
+    if( std::find( appliedMigrations.begin(), appliedMigrations.end(), path.filename().string() ) == appliedMigrations.end() )
+    {
+      Logger::info( "Applying migration: {}", path.filename().string() );
+
+      std::ifstream mFile( path.string() );
+      if( !mFile.is_open() )
+      {
+        m_lastError = "File " + path.string() + " does not exist!";
+        return false;
+      }
+      std::string sql( ( std::istreambuf_iterator< char >( mFile ) ),
+                       ( std::istreambuf_iterator< char >( ) ) );
+
+      try
+      {
+        auto stmt = m_pConnection->createStatement();
+        stmt->executeQuery( sql );
+      }
+      catch( std::runtime_error& e )
+      {
+        m_lastError = e.what();
+        return false;
+      }
+
+      // insert into migrations table
+      if( !execute( fmt::format( "INSERT INTO __Migration (`MigrationName`) VALUES ('{}');", path.filename().string() ) ) )
+        return false;
+    }
+  }
+
+  return true;
+}
+
+bool DbManager::modeAddMigration()
+{
+  if( !selectSchema() )
+    return false;
+
+  fs::create_directories( "sql/migrations" );
+
+  auto filename = fmt::format( "{}_{}.sql", Util::fmtUtcTime( "%Y%m%d%H%M%S" ), m_migrationName );
+
+  if( filename.size() > 250 )
+  {
+    Logger::error( "Migration name '{}' is longer than 250 characters, please shorten its name.", filename );
+    return false;
+  }
+
+  auto path = fmt::format( "sql/migrations/{}", filename );
+
+  std::ofstream mFile( path );
+
+  mFile << fmt::format( "-- Migration generated at {}", Util::fmtUtcTime( "%Y/%m/%d %H:%M:%S" ) ) << std::endl;
+  mFile << fmt::format( "-- {}", filename ) << std::endl << std::endl;
+
+  mFile.close();
+
+  Logger::info( "New migration created: {}", path );
+
+  return true;
+}
+
 
diff --git a/src/dbm/DbManager.h b/src/dbm/DbManager.h
index 302a5422..f5c1d632 100644
--- a/src/dbm/DbManager.h
+++ b/src/dbm/DbManager.h
@@ -13,9 +13,10 @@ enum class Mode
 {
   INIT,
   LIQUIDATE,
-  UPDATE,
+  MIGRATE,
   CHECK,
-  CLEAN_CHARS
+  CLEAN_CHARS,
+  ADD_MIGRATION,
 };
 
 class DbManager
@@ -37,6 +38,12 @@ class DbManager
 
     bool modeLiquidate();
 
+    bool modeCheck();
+
+    bool modeMigrate();
+
+    bool modeAddMigration();
+
     virtual ~DbManager();
 
     const std::string& getLastError();
@@ -49,6 +56,8 @@ class DbManager
 
     void setForceMode( bool mode );
 
+    void setMigratioName( const std::string& name );
+
   private:
     std::string m_host;
     std::string m_database;
@@ -61,6 +70,8 @@ class DbManager
     std::string m_iFile;
     std::string m_sFile;
     bool m_force;
+
+    std::string m_migrationName;
 };
 
 
diff --git a/src/dbm/main.cpp b/src/dbm/main.cpp
index dacf13f5..3eeebf2c 100644
--- a/src/dbm/main.cpp
+++ b/src/dbm/main.cpp
@@ -5,7 +5,10 @@
 #include <common/Logging/Logger.h>
 #include <experimental/filesystem>
 #include <MySqlConnector.h>
+#include <common/Util/CrashHandler.h>
+#include <common/Config/ConfigMgr.h>
 
+Sapphire::Common::Util::CrashHandler crashHandler;
 
 namespace filesys = std::experimental::filesystem;
 
@@ -77,13 +80,14 @@ std::string delChar( std::string &str, char del )
 
 void printUsage()
 {
-  Logger::info( " Usage: sapphire_dbm " );
+  Logger::info( " Usage: dbm " );
   Logger::info( "\t --mode" );
   Logger::info( "\t\t initialize -> Creates DB if not present and inserts default tables/data" );
   Logger::info( "\t\t check -> Checks if Sapphire DB-Version matches your DB-Version" );
-  Logger::info( "\t\t update -> Updates your DB-Version to Sapphire DB-Version" );
+  Logger::info( "\t\t migrate -> Updates your DB-Version to Sapphire DB-Version" );
   Logger::info( "\t\t clearchars -> Removes all character data from DB. Accounts will stay untouched" );
   Logger::info( "\t\t liquidate -> Removes all tables and deletes the DB" );
+  Logger::info( "\t\t add-migration -> Creates a new migration with the assoicated up/down sql files" );
   Logger::info( "\t --user <mysqlUserName>" );
   Logger::info( "\t --pass <mysqlPassword> ( default empty )" );
   Logger::info( "\t --host <mysqlHost> ( default 127.0.0.1 )" );
@@ -91,6 +95,7 @@ void printUsage()
   Logger::info( "\t --database <mysqlDatabase>" );
   Logger::info( "\t --sfile <path/to/schemafile> ( default sql/schema/schema.sql )" );
   Logger::info( "\t --force ( skips user input / auto Yes )" );
+  Logger::info( "\t --name <migration name>" );
 }
 
 int main( int32_t argc, char* argv[] )
@@ -109,8 +114,21 @@ int main( int32_t argc, char* argv[] )
   std::string sFile;
   std::string iFile;
 
+  std::string migrationName;
+
   bool force = false;
 
+  // load config first so it can still be overridden if required
+  Common::ConfigMgr configMgr;
+  Common::Config::GlobalConfig globalConfig;
+  if( configMgr.loadGlobalConfig( globalConfig ) )
+  {
+    host = globalConfig.database.host;
+    database = globalConfig.database.database;
+    user = globalConfig.database.user;
+    pass = globalConfig.database.password;
+  }
+
   std::vector< std::string > args( argv + 1, argv + argc );
   for( uint32_t i = 0; i + 1 < args.size(); i += 2 )
   {
@@ -137,6 +155,8 @@ int main( int32_t argc, char* argv[] )
       iFile = val;
     else if( arg == "force" )
       force = true;
+    else if( arg == "name" )
+      migrationName = val;
   }
 
   if( host.empty() )
@@ -155,6 +175,12 @@ int main( int32_t argc, char* argv[] )
     dbm.setInsertFile( iFile );
     dbm.setSchemaFile( sFile );
   }
+
+  if( !migrationName.empty() )
+  {
+    dbm.setMigratioName( migrationName );
+  }
+
   if( force )
     dbm.setForceMode( true );
   //initialize|check|update|clearchars|liquidate
@@ -166,9 +192,9 @@ int main( int32_t argc, char* argv[] )
   {
     dbm.setMode( Mode::CHECK );
   }
-  else if( mode.find( "update" ) != std::string::npos )
+  else if( mode.find( "migrate" ) != std::string::npos )
   {
-    dbm.setMode( Mode::UPDATE );
+    dbm.setMode( Mode::MIGRATE );
   }
   else if( mode.find( "clearchars" ) != std::string::npos )
   {
@@ -178,6 +204,10 @@ int main( int32_t argc, char* argv[] )
   {
     dbm.setMode( Mode::LIQUIDATE );
   }
+  else if( mode.find( "add-migration" ) != std::string::npos )
+  {
+    dbm.setMode( Mode::ADD_MIGRATION );
+  }
   else
   {
     Logger::fatal( "Not a valid mode: {0} !", mode );

From 7ae2d536647d8ba0de39f5845c821dfb4ff158ba Mon Sep 17 00:00:00 2001
From: NotAdam <adam@notadam.me>
Date: Sun, 16 Jun 2019 00:27:10 +1000
Subject: [PATCH 058/351] better grammar

---
 src/dbm/DbManager.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/dbm/DbManager.cpp b/src/dbm/DbManager.cpp
index 371273a2..6f973066 100644
--- a/src/dbm/DbManager.cpp
+++ b/src/dbm/DbManager.cpp
@@ -359,7 +359,7 @@ bool DbManager::modeCheck()
 
   if( missing > 0 )
   {
-    Logger::warn( "Database is missing {} migrations.", missing );
+    Logger::warn( "Database is missing {} migration(s).", missing );
   }
   else
   {

From 4f900b9093272fa59055c94958f6cb1a9a5e8d46 Mon Sep 17 00:00:00 2001
From: NotAdam <adam@notadam.me>
Date: Sun, 16 Jun 2019 15:33:01 +1000
Subject: [PATCH 059/351] force migration run order

---
 src/dbm/DbManager.cpp | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/src/dbm/DbManager.cpp b/src/dbm/DbManager.cpp
index 6f973066..92dbccb4 100644
--- a/src/dbm/DbManager.cpp
+++ b/src/dbm/DbManager.cpp
@@ -394,6 +394,7 @@ bool DbManager::modeMigrate()
     return false;
   }
 
+  std::vector< std::string > migrations;
   for( auto& entry : fs::directory_iterator( "sql/migrations" ) )
   {
     auto& path = entry.path();
@@ -402,6 +403,15 @@ bool DbManager::modeMigrate()
     if( path.extension() != ".sql" )
       continue;
 
+    migrations.emplace_back( path.string() );
+  }
+
+  std::sort( migrations.begin(), migrations.end() );
+
+  for( auto& entry : migrations )
+  {
+    auto path = fs::path( entry );
+
     if( std::find( appliedMigrations.begin(), appliedMigrations.end(), path.filename().string() ) == appliedMigrations.end() )
     {
       Logger::info( "Applying migration: {}", path.filename().string() );
@@ -432,6 +442,8 @@ bool DbManager::modeMigrate()
     }
   }
 
+
+
   return true;
 }
 
@@ -452,6 +464,12 @@ bool DbManager::modeAddMigration()
 
   auto path = fmt::format( "sql/migrations/{}", filename );
 
+  if( fs::exists( path ) )
+  {
+    Logger::error( "Migration '{}' already exists.", filename );
+    return false;
+  }
+
   std::ofstream mFile( path );
 
   mFile << fmt::format( "-- Migration generated at {}", Util::fmtUtcTime( "%Y/%m/%d %H:%M:%S" ) ) << std::endl;

From 6b44dc9a6e98171d0206476b35b5d9dc050b6834 Mon Sep 17 00:00:00 2001
From: NotAdam <adam@notadam.me>
Date: Thu, 20 Jun 2019 14:48:24 +1000
Subject: [PATCH 060/351] rename InitUI -> PlayerSetup, AddStatusEffect ->
 EffectResult

---
 src/common/Network/PacketDef/Ipcs.h                       | 4 ++--
 src/common/Network/PacketDef/Zone/ServerZoneDef.h         | 4 ++--
 src/world/Actor/Chara.cpp                                 | 2 +-
 src/world/Actor/Player.cpp                                | 4 ++--
 src/world/Actor/PlayerEvent.cpp                           | 2 +-
 src/world/Actor/PlayerSql.cpp                             | 2 +-
 src/world/Manager/DebugCommandMgr.cpp                     | 4 ++--
 src/world/Network/GameConnection.cpp                      | 2 +-
 src/world/Network/Handlers/ClientTriggerHandler.cpp       | 2 +-
 src/world/Network/Handlers/GMCommandHandlers.cpp          | 2 +-
 src/world/Network/Handlers/PacketHandlers.cpp             | 2 +-
 .../{InitUIPacket.h => PlayerSetupPacket.h}               | 8 ++++----
 12 files changed, 19 insertions(+), 19 deletions(-)
 rename src/world/Network/PacketWrappers/{InitUIPacket.h => PlayerSetupPacket.h} (91%)

diff --git a/src/common/Network/PacketDef/Ipcs.h b/src/common/Network/PacketDef/Ipcs.h
index c6fdac98..9979c9a9 100644
--- a/src/common/Network/PacketDef/Ipcs.h
+++ b/src/common/Network/PacketDef/Ipcs.h
@@ -51,7 +51,7 @@ namespace Sapphire::Network::Packets
     ActorFreeSpawn = 0x0191,
     InitZone = 0x019A,
 
-    AddStatusEffect = 0x0141,
+    EffectResult = 0x0141,
     ActorControl142 = 0x0142,
     ActorControl143 = 0x0143,
     ActorControl144 = 0x0144,
@@ -137,7 +137,7 @@ namespace Sapphire::Network::Packets
     ObjectDespawn = 0x0182, // updated 4.5
     UpdateClassInfo = 0x0183, // updated 4.5
     SilentSetClassJob = 0x0184, // updated 4.5 - seems to be the case, not sure if it's actually used for anything
-    InitUI = 0x0185, // updated 4.5
+    PlayerSetup = 0x0185, // updated 4.5
     PlayerStats = 0x0186, // updated 4.5
     ActorOwner = 0x0187, // updated 4.5
     PlayerStateFlags = 0x0188, // updated 4.5
diff --git a/src/common/Network/PacketDef/Zone/ServerZoneDef.h b/src/common/Network/PacketDef/Zone/ServerZoneDef.h
index 80588a04..dc93c0f0 100644
--- a/src/common/Network/PacketDef/Zone/ServerZoneDef.h
+++ b/src/common/Network/PacketDef/Zone/ServerZoneDef.h
@@ -305,7 +305,7 @@ namespace Sapphire::Network::Packets::Server
   * Structural representation of the packet sent by the server
   * add a status effect
   */
-  struct FFXIVIpcAddStatusEffect : FFXIVIpcBasePacket< AddStatusEffect >
+  struct FFXIVIpcEffectResult : FFXIVIpcBasePacket< EffectResult >
   {
     uint32_t unknown;
     uint32_t actor_id;
@@ -793,7 +793,7 @@ namespace Sapphire::Network::Packets::Server
   * Structural representation of the packet sent by the server to initialize
   * the client UI upon initial connection.
   */
-  struct FFXIVIpcInitUI : FFXIVIpcBasePacket< InitUI >
+  struct FFXIVIpcPlayerSetup : FFXIVIpcBasePacket< PlayerSetup >
   {
     // plain C types for a bit until the packet is actually fixed.
     // makes conversion between different editors easier.
diff --git a/src/world/Actor/Chara.cpp b/src/world/Actor/Chara.cpp
index 3942f112..c3a09a0c 100644
--- a/src/world/Actor/Chara.cpp
+++ b/src/world/Actor/Chara.cpp
@@ -457,7 +457,7 @@ void Sapphire::Entity::Chara::addStatusEffect( StatusEffect::StatusEffectPtr pEf
   pEffect->applyStatus();
   m_statusEffectMap[ nextSlot ] = pEffect;
 
-  auto statusEffectAdd = makeZonePacket< FFXIVIpcAddStatusEffect >( getId() );
+  auto statusEffectAdd = makeZonePacket< FFXIVIpcEffectResult >( getId() );
 
   statusEffectAdd->data().actor_id = pEffect->getTargetActorId();
   statusEffectAdd->data().actor_id1 = pEffect->getSrcActorId();
diff --git a/src/world/Actor/Player.cpp b/src/world/Actor/Player.cpp
index f4abe67c..adab91ab 100644
--- a/src/world/Actor/Player.cpp
+++ b/src/world/Actor/Player.cpp
@@ -25,7 +25,7 @@
 #include "Network/PacketWrappers/ActorControlPacket142.h"
 #include "Network/PacketWrappers/ActorControlPacket143.h"
 #include "Network/PacketWrappers/ActorControlPacket144.h"
-#include "Network/PacketWrappers/InitUIPacket.h"
+#include "Network/PacketWrappers/PlayerSetupPacket.h"
 #include "Network/PacketWrappers/ServerNoticePacket.h"
 #include "Network/PacketWrappers/ChatPacket.h"
 #include "Network/PacketWrappers/ModelEquipPacket.h"
@@ -1717,7 +1717,7 @@ void Sapphire::Entity::Player::sendZonePackets()
     }
     queuePacket( contentFinderList );
 
-    queuePacket( std::make_shared< InitUIPacket >( *this ) );
+    queuePacket( std::make_shared< PlayerSetupPacket >( *this ) );
 
     auto classInfoPacket = makeZonePacket< FFXIVIpcPlayerClassInfo >( getId() );
     classInfoPacket->data().classId = static_cast< uint8_t >( getClass() );
diff --git a/src/world/Actor/PlayerEvent.cpp b/src/world/Actor/PlayerEvent.cpp
index 91c9060f..507973c8 100644
--- a/src/world/Actor/PlayerEvent.cpp
+++ b/src/world/Actor/PlayerEvent.cpp
@@ -4,7 +4,7 @@
 
 #include "Network/GameConnection.h"
 #include "Network/PacketWrappers/ActorControlPacket142.h"
-#include "Network/PacketWrappers/InitUIPacket.h"
+#include "Network/PacketWrappers/PlayerSetupPacket.h"
 #include "Network/PacketWrappers/ServerNoticePacket.h"
 #include "Network/PacketWrappers/EventStartPacket.h"
 #include "Network/PacketWrappers/EventPlayPacket.h"
diff --git a/src/world/Actor/PlayerSql.cpp b/src/world/Actor/PlayerSql.cpp
index 4f5ca3de..91d032a3 100644
--- a/src/world/Actor/PlayerSql.cpp
+++ b/src/world/Actor/PlayerSql.cpp
@@ -10,7 +10,7 @@
 #include <Database/DatabaseDef.h>
 
 #include "Network/GameConnection.h"
-#include "Network/PacketWrappers/InitUIPacket.h"
+#include "Network/PacketWrappers/PlayerSetupPacket.h"
 
 #include "Manager/TerritoryMgr.h"
 #include "Territory/Zone.h"
diff --git a/src/world/Manager/DebugCommandMgr.cpp b/src/world/Manager/DebugCommandMgr.cpp
index 796e254d..76c89a7f 100644
--- a/src/world/Manager/DebugCommandMgr.cpp
+++ b/src/world/Manager/DebugCommandMgr.cpp
@@ -18,7 +18,7 @@
 #include "Network/PacketWrappers/ServerNoticePacket.h"
 #include "Network/PacketWrappers/ActorControlPacket142.h"
 #include "Network/PacketWrappers/ActorControlPacket143.h"
-#include "Network/PacketWrappers/InitUIPacket.h"
+#include "Network/PacketWrappers/PlayerSetupPacket.h"
 #include "Network/PacketWrappers/PlayerSpawnPacket.h"
 #include "Network/GameConnection.h"
 #include "Script/ScriptMgr.h"
@@ -237,7 +237,7 @@ void Sapphire::World::Manager::DebugCommandMgr::set( char* data, Entity::Player&
   else if( subCommand == "discovery_reset" )
   {
     player.resetDiscovery();
-    player.queuePacket( std::make_shared< InitUIPacket >( player ) );
+    player.queuePacket( std::make_shared< PlayerSetupPacket >( player ) );
   }
   else if( subCommand == "classjob" )
   {
diff --git a/src/world/Network/GameConnection.cpp b/src/world/Network/GameConnection.cpp
index 7109b2ba..e9c9f5f2 100644
--- a/src/world/Network/GameConnection.cpp
+++ b/src/world/Network/GameConnection.cpp
@@ -10,7 +10,7 @@
 
 #include "Territory/Zone.h"
 
-#include "Network/PacketWrappers/InitUIPacket.h"
+#include "Network/PacketWrappers/PlayerSetupPacket.h"
 
 #include "Manager/DebugCommandMgr.h"
 
diff --git a/src/world/Network/Handlers/ClientTriggerHandler.cpp b/src/world/Network/Handlers/ClientTriggerHandler.cpp
index e7ac0927..c309cc41 100644
--- a/src/world/Network/Handlers/ClientTriggerHandler.cpp
+++ b/src/world/Network/Handlers/ClientTriggerHandler.cpp
@@ -15,7 +15,7 @@
 #include "Network/GameConnection.h"
 
 #include "Network/PacketWrappers/ExaminePacket.h"
-#include "Network/PacketWrappers/InitUIPacket.h"
+#include "Network/PacketWrappers/PlayerSetupPacket.h"
 #include "Network/PacketWrappers/PingPacket.h"
 #include "Network/PacketWrappers/MoveActorPacket.h"
 #include "Network/PacketWrappers/ChatPacket.h"
diff --git a/src/world/Network/Handlers/GMCommandHandlers.cpp b/src/world/Network/Handlers/GMCommandHandlers.cpp
index 9b806521..658b3b73 100644
--- a/src/world/Network/Handlers/GMCommandHandlers.cpp
+++ b/src/world/Network/Handlers/GMCommandHandlers.cpp
@@ -17,7 +17,7 @@
 #include "Territory/Zone.h"
 #include "Territory/InstanceContent.h"
 
-#include "Network/PacketWrappers/InitUIPacket.h"
+#include "Network/PacketWrappers/PlayerSetupPacket.h"
 #include "Network/PacketWrappers/PingPacket.h"
 #include "Network/PacketWrappers/MoveActorPacket.h"
 #include "Network/PacketWrappers/ChatPacket.h"
diff --git a/src/world/Network/Handlers/PacketHandlers.cpp b/src/world/Network/Handlers/PacketHandlers.cpp
index ba97168b..709b65d1 100644
--- a/src/world/Network/Handlers/PacketHandlers.cpp
+++ b/src/world/Network/Handlers/PacketHandlers.cpp
@@ -21,7 +21,7 @@
 #include "Territory/ZonePosition.h"
 #include "Territory/House.h"
 
-#include "Network/PacketWrappers/InitUIPacket.h"
+#include "Network/PacketWrappers/PlayerSetupPacket.h"
 #include "Network/PacketWrappers/PingPacket.h"
 #include "Network/PacketWrappers/MoveActorPacket.h"
 #include "Network/PacketWrappers/ChatPacket.h"
diff --git a/src/world/Network/PacketWrappers/InitUIPacket.h b/src/world/Network/PacketWrappers/PlayerSetupPacket.h
similarity index 91%
rename from src/world/Network/PacketWrappers/InitUIPacket.h
rename to src/world/Network/PacketWrappers/PlayerSetupPacket.h
index 5f678a97..bc2ca1e0 100644
--- a/src/world/Network/PacketWrappers/InitUIPacket.h
+++ b/src/world/Network/PacketWrappers/PlayerSetupPacket.h
@@ -10,14 +10,14 @@ namespace Sapphire::Network::Packets::Server
 {
 
   /**
-  * @brief The Client UI Initialization packet. This must be sent to the client
+  * @brief The Client Player Initialization packet. This must be sent to the client
   * once upon connection to configure the UI.
   */
-  class InitUIPacket : public ZoneChannelPacket< FFXIVIpcInitUI >
+  class PlayerSetupPacket : public ZoneChannelPacket< FFXIVIpcPlayerSetup >
   {
   public:
-    InitUIPacket( Entity::Player& player ) :
-      ZoneChannelPacket< FFXIVIpcInitUI >( player.getId(), player.getId() )
+    PlayerSetupPacket( Entity::Player& player ) :
+      ZoneChannelPacket< FFXIVIpcPlayerSetup >( player.getId(), player.getId() )
     {
       initialize( player );
     };

From 149de7b545141c5d6a5751adbf0276e62f8a05ca Mon Sep 17 00:00:00 2001
From: NotAdam <adam@notadam.me>
Date: Fri, 28 Jun 2019 17:40:37 +1000
Subject: [PATCH 061/351] new exd data

---
 src/common/Exd/ExdDataGenerated.cpp | 673 +++++++++++++++++-----------
 src/common/Exd/ExdDataGenerated.h   | 106 +++--
 2 files changed, 462 insertions(+), 317 deletions(-)

diff --git a/src/common/Exd/ExdDataGenerated.cpp b/src/common/Exd/ExdDataGenerated.cpp
index aef8af48..04c8fa1e 100644
--- a/src/common/Exd/ExdDataGenerated.cpp
+++ b/src/common/Exd/ExdDataGenerated.cpp
@@ -22,7 +22,7 @@ Sapphire::Data::Achievement::Achievement( uint32_t row_id, Sapphire::Data::ExdDa
   data.push_back( exdData->getField< int32_t >( row, 16 ) );
   data.push_back( exdData->getField< int32_t >( row, 17 ) );
   order = exdData->getField< uint16_t >( row, 18 );
-  initialHide = exdData->getField< bool >( row, 20 );
+  initialHide = exdData->getField< uint8_t >( row, 20 );
 }
 
 Sapphire::Data::AchievementCategory::AchievementCategory( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
@@ -71,16 +71,16 @@ Sapphire::Data::Action::Action( uint32_t row_id, Sapphire::Data::ExdDataGenerate
   cast100ms = exdData->getField< uint16_t >( row, 37 );
   recast100ms = exdData->getField< uint16_t >( row, 38 );
   cooldownGroup = exdData->getField< uint8_t >( row, 39 );
-  attackType = exdData->getField< int8_t >( row, 40 );
-  aspect = exdData->getField< uint8_t >( row, 41 );
-  actionProcStatus = exdData->getField< uint8_t >( row, 42 );
-  statusGainSelf = exdData->getField< uint16_t >( row, 43 );
-  unlockLink = exdData->getField< uint32_t >( row, 44 );
-  classJobCategory = exdData->getField< uint8_t >( row, 45 );
-  affectsPosition = exdData->getField< bool >( row, 48 );
-  omen = exdData->getField< uint8_t >( row, 49 );
-  isPvP = exdData->getField< bool >( row, 50 );
-  isPlayerAction = exdData->getField< bool >( row, 62 );
+  attackType = exdData->getField< int8_t >( row, 42 );
+  aspect = exdData->getField< uint8_t >( row, 43 );
+  actionProcStatus = exdData->getField< uint8_t >( row, 44 );
+  statusGainSelf = exdData->getField< uint16_t >( row, 46 );
+  unlockLink = exdData->getField< uint32_t >( row, 47 );
+  classJobCategory = exdData->getField< uint8_t >( row, 48 );
+  affectsPosition = exdData->getField< bool >( row, 51 );
+  omen = exdData->getField< uint8_t >( row, 52 );
+  isPvP = exdData->getField< bool >( row, 53 );
+  isPlayerAction = exdData->getField< bool >( row, 65 );
 }
 
 Sapphire::Data::ActionCastTimeline::ActionCastTimeline( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
@@ -656,24 +656,22 @@ Sapphire::Data::BeastReputationRank::BeastReputationRank( uint32_t row_id, Sapph
 Sapphire::Data::BeastTribe::BeastTribe( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
 {
   auto row = exdData->m_BeastTribeDat.get_row( row_id );
-  minLevel = exdData->getField< uint8_t >( row, 0 );
-  maxLevel = exdData->getField< uint8_t >( row, 1 );
+  minLevel = exdData->getField< uint8_t >( row, 1 );
   beastRankBonus = exdData->getField< uint8_t >( row, 2 );
   iconReputation = exdData->getField< uint32_t >( row, 3 );
   icon = exdData->getField< uint32_t >( row, 4 );
   maxRank = exdData->getField< uint8_t >( row, 5 );
-  alliedBeastTribeQuest = exdData->getField< uint32_t >( row, 6 );
-  expansion = exdData->getField< uint8_t >( row, 7 );
-  currencyItem = exdData->getField< uint32_t >( row, 8 );
-  displayOrder = exdData->getField< uint8_t >( row, 9 );
-  name = exdData->getField< std::string >( row, 10 );
-  nameRelation = exdData->getField< std::string >( row, 18 );
+  expansion = exdData->getField< uint8_t >( row, 6 );
+  currencyItem = exdData->getField< uint32_t >( row, 7 );
+  displayOrder = exdData->getField< uint8_t >( row, 8 );
+  name = exdData->getField< std::string >( row, 9 );
+  nameRelation = exdData->getField< std::string >( row, 17 );
 }
 
 Sapphire::Data::Behavior::Behavior( uint32_t row_id, uint32_t subRow, Sapphire::Data::ExdDataGenerated* exdData )
 {
   auto row = exdData->m_BehaviorDat.get_row( row_id, subRow );
-  balloon = exdData->getField< uint16_t >( row, 6 );
+  balloon = exdData->getField< uint16_t >( row, 7 );
 }
 
 Sapphire::Data::BGM::BGM( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
@@ -968,8 +966,6 @@ Sapphire::Data::CharaMakeType::CharaMakeType( uint32_t row_id, Sapphire::Data::E
   race = exdData->getField< int32_t >( row, 0 );
   tribe = exdData->getField< int32_t >( row, 1 );
   gender = exdData->getField< int8_t >( row, 2 );
-  facialFeatureIcon.push_back( exdData->getField< int32_t >( row, 3291 ) );
-  facialFeatureIcon.push_back( exdData->getField< int32_t >( row, 3292 ) );
   facialFeatureIcon.push_back( exdData->getField< int32_t >( row, 3293 ) );
   facialFeatureIcon.push_back( exdData->getField< int32_t >( row, 3294 ) );
   facialFeatureIcon.push_back( exdData->getField< int32_t >( row, 3295 ) );
@@ -1010,6 +1006,20 @@ Sapphire::Data::CharaMakeType::CharaMakeType( uint32_t row_id, Sapphire::Data::E
   facialFeatureIcon.push_back( exdData->getField< int32_t >( row, 3330 ) );
   facialFeatureIcon.push_back( exdData->getField< int32_t >( row, 3331 ) );
   facialFeatureIcon.push_back( exdData->getField< int32_t >( row, 3332 ) );
+  facialFeatureIcon.push_back( exdData->getField< int32_t >( row, 3333 ) );
+  facialFeatureIcon.push_back( exdData->getField< int32_t >( row, 3334 ) );
+  facialFeatureIcon.push_back( exdData->getField< int32_t >( row, 3335 ) );
+  facialFeatureIcon.push_back( exdData->getField< int32_t >( row, 3336 ) );
+  facialFeatureIcon.push_back( exdData->getField< int32_t >( row, 3337 ) );
+  facialFeatureIcon.push_back( exdData->getField< int32_t >( row, 3338 ) );
+  facialFeatureIcon.push_back( exdData->getField< int32_t >( row, 3339 ) );
+  facialFeatureIcon.push_back( exdData->getField< int32_t >( row, 3340 ) );
+  facialFeatureIcon.push_back( exdData->getField< int32_t >( row, 3341 ) );
+  facialFeatureIcon.push_back( exdData->getField< int32_t >( row, 3342 ) );
+  facialFeatureIcon.push_back( exdData->getField< int32_t >( row, 3343 ) );
+  facialFeatureIcon.push_back( exdData->getField< int32_t >( row, 3344 ) );
+  facialFeatureIcon.push_back( exdData->getField< int32_t >( row, 3345 ) );
+  facialFeatureIcon.push_back( exdData->getField< int32_t >( row, 3346 ) );
 }
 
 Sapphire::Data::ChocoboRace::ChocoboRace( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
@@ -1368,6 +1378,7 @@ Sapphire::Data::ContentFinderCondition::ContentFinderCondition( uint32_t row_id,
   contentLinkType = exdData->getField< uint8_t >( row, 2 );
   content = exdData->getField< uint16_t >( row, 3 );
   contentMemberType = exdData->getField< uint8_t >( row, 9 );
+  unlockQuest = exdData->getField< uint32_t >( row, 13 );
   classJobLevelRequired = exdData->getField< uint8_t >( row, 15 );
   classJobLevelSync = exdData->getField< uint8_t >( row, 16 );
   itemLevelRequired = exdData->getField< uint16_t >( row, 17 );
@@ -1377,8 +1388,11 @@ Sapphire::Data::ContentFinderCondition::ContentFinderCondition( uint32_t row_id,
   dutyRecorderAllowed = exdData->getField< bool >( row, 30 );
   name = exdData->getField< std::string >( row, 34 );
   contentType = exdData->getField< uint8_t >( row, 35 );
+  transientKey = exdData->getField< uint8_t >( row, 36 );
   transient = exdData->getField< uint32_t >( row, 37 );
+  sortKey = exdData->getField< uint16_t >( row, 38 );
   image = exdData->getField< uint32_t >( row, 39 );
+  icon = exdData->getField< uint32_t >( row, 40 );
   levelingRoulette = exdData->getField< bool >( row, 42 );
   level5060Roulette = exdData->getField< bool >( row, 43 );
   mSQRoulette = exdData->getField< bool >( row, 44 );
@@ -1475,12 +1489,14 @@ Sapphire::Data::ContentsNote::ContentsNote( uint32_t row_id, Sapphire::Data::Exd
 {
   auto row = exdData->m_ContentsNoteDat.get_row( row_id );
   contentType = exdData->getField< uint8_t >( row, 0 );
+  icon = exdData->getField< int32_t >( row, 1 );
   menuOrder = exdData->getField< uint8_t >( row, 2 );
   requiredAmount = exdData->getField< int32_t >( row, 3 );
   expMultiplier = exdData->getField< int32_t >( row, 5 );
   gilRward = exdData->getField< int32_t >( row, 7 );
   levelUnlock = exdData->getField< uint16_t >( row, 8 );
   howTo = exdData->getField< uint16_t >( row, 9 );
+  reqUnlock = exdData->getField< uint32_t >( row, 10 );
   name = exdData->getField< std::string >( row, 11 );
   description = exdData->getField< std::string >( row, 12 );
   expCap = exdData->getField< int32_t >( row, 13 );
@@ -2067,6 +2083,21 @@ Sapphire::Data::ENpcDressUpDress::ENpcDressUpDress( uint32_t row_id, uint32_t su
 {
   auto row = exdData->m_ENpcDressUpDressDat.get_row( row_id, subRow );
   eNpc = exdData->getField< uint32_t >( row, 6 );
+  behavior = exdData->getField< uint16_t >( row, 8 );
+  modelMainHand = exdData->getField< uint64_t >( row, 35 );
+  dyeMainHand = exdData->getField< uint8_t >( row, 36 );
+  modelOffHand = exdData->getField< uint64_t >( row, 37 );
+  dyeOffHand = exdData->getField< uint8_t >( row, 38 );
+  modelHead = exdData->getField< uint32_t >( row, 39 );
+  dyeHead = exdData->getField< uint8_t >( row, 40 );
+  modelBody = exdData->getField< uint32_t >( row, 41 );
+  dyeBody = exdData->getField< uint8_t >( row, 42 );
+  modelHands = exdData->getField< uint32_t >( row, 43 );
+  dyeHands = exdData->getField< uint8_t >( row, 44 );
+  modelLegs = exdData->getField< uint32_t >( row, 45 );
+  dyeLegs = exdData->getField< uint8_t >( row, 46 );
+  modelFeet = exdData->getField< uint32_t >( row, 47 );
+  dyeFeet = exdData->getField< uint8_t >( row, 48 );
 }
 
 Sapphire::Data::ENpcResident::ENpcResident( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
@@ -2111,8 +2142,8 @@ Sapphire::Data::EquipRaceCategory::EquipRaceCategory( uint32_t row_id, Sapphire:
   miqote = exdData->getField< bool >( row, 3 );
   roegadyn = exdData->getField< bool >( row, 4 );
   auRa = exdData->getField< bool >( row, 5 );
-  male = exdData->getField< bool >( row, 6 );
-  female = exdData->getField< bool >( row, 7 );
+  male = exdData->getField< bool >( row, 8 );
+  female = exdData->getField< bool >( row, 9 );
 }
 
 Sapphire::Data::EquipSlotCategory::EquipSlotCategory( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
@@ -2290,17 +2321,17 @@ Sapphire::Data::Fate::Fate( uint32_t row_id, Sapphire::Data::ExdDataGenerated* e
   classJobLevel = exdData->getField< uint8_t >( row, 3 );
   classJobLevelMax = exdData->getField< uint8_t >( row, 4 );
   eventItem = exdData->getField< uint32_t >( row, 5 );
-  iconObjective = exdData->getField< uint32_t >( row, 10 );
-  iconMap = exdData->getField< uint32_t >( row, 11 );
-  music = exdData->getField< int32_t >( row, 13 );
-  hasWorldMapIcon = exdData->getField< bool >( row, 19 );
-  name = exdData->getField< std::string >( row, 27 );
-  description = exdData->getField< std::string >( row, 28 );
-  objective = exdData->getField< std::string >( row, 29 );
+  iconObjective = exdData->getField< uint32_t >( row, 9 );
+  iconMap = exdData->getField< uint32_t >( row, 10 );
+  music = exdData->getField< int32_t >( row, 12 );
+  hasWorldMapIcon = exdData->getField< bool >( row, 17 );
+  name = exdData->getField< std::string >( row, 25 );
+  description = exdData->getField< std::string >( row, 26 );
+  objective = exdData->getField< std::string >( row, 27 );
+  statusText.push_back( exdData->getField< std::string >( row, 28 ) );
+  statusText.push_back( exdData->getField< std::string >( row, 29 ) );
   statusText.push_back( exdData->getField< std::string >( row, 30 ) );
-  statusText.push_back( exdData->getField< std::string >( row, 31 ) );
-  statusText.push_back( exdData->getField< std::string >( row, 32 ) );
-  arrayIndex = exdData->getField< uint32_t >( row, 33 );
+  arrayIndex = exdData->getField< uint32_t >( row, 31 );
 }
 
 Sapphire::Data::FCActivity::FCActivity( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
@@ -2387,6 +2418,10 @@ Sapphire::Data::FishingRecordType::FishingRecordType( uint32_t row_id, Sapphire:
 {
   auto row = exdData->m_FishingRecordTypeDat.get_row( row_id );
   addon = exdData->getField< int32_t >( row, 0 );
+  rankBRequirement = exdData->getField< uint16_t >( row, 1 );
+  rankARequirement = exdData->getField< uint16_t >( row, 2 );
+  rankAARequirement = exdData->getField< uint16_t >( row, 3 );
+  rankAAARequirement = exdData->getField< uint16_t >( row, 4 );
 }
 
 Sapphire::Data::FishingRecordTypeTransient::FishingRecordTypeTransient( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
@@ -2417,6 +2452,7 @@ Sapphire::Data::FishingSpot::FishingSpot( uint32_t row_id, Sapphire::Data::ExdDa
   item.push_back( exdData->getField< int32_t >( row, 18 ) );
   item.push_back( exdData->getField< int32_t >( row, 19 ) );
   placeName = exdData->getField< uint16_t >( row, 20 );
+  order = exdData->getField< uint8_t >( row, 21 );
 }
 
 Sapphire::Data::FishParameter::FishParameter( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
@@ -2428,10 +2464,10 @@ Sapphire::Data::FishParameter::FishParameter( uint32_t row_id, Sapphire::Data::E
   isHidden = exdData->getField< bool >( row, 3 );
   fishingRecordType = exdData->getField< uint8_t >( row, 5 );
   territoryType = exdData->getField< int32_t >( row, 6 );
-  isInLog = exdData->getField< bool >( row, 7 );
-  timeRestricted = exdData->getField< bool >( row, 8 );
-  weatherRestricted = exdData->getField< bool >( row, 9 );
-  gatheringSubCategory = exdData->getField< uint16_t >( row, 10 );
+  gatheringSubCategory = exdData->getField< uint16_t >( row, 7 );
+  isInLog = exdData->getField< bool >( row, 8 );
+  timeRestricted = exdData->getField< bool >( row, 9 );
+  weatherRestricted = exdData->getField< bool >( row, 10 );
 }
 
 Sapphire::Data::Frontline03::Frontline03( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
@@ -2510,7 +2546,7 @@ Sapphire::Data::GatheringItem::GatheringItem( uint32_t row_id, Sapphire::Data::E
   auto row = exdData->m_GatheringItemDat.get_row( row_id );
   item = exdData->getField< int32_t >( row, 0 );
   gatheringItemLevel = exdData->getField< uint16_t >( row, 1 );
-  isHidden = exdData->getField< bool >( row, 2 );
+  isHidden = exdData->getField< bool >( row, 3 );
 }
 
 Sapphire::Data::GatheringItemLevelConvertTable::GatheringItemLevelConvertTable( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
@@ -2951,12 +2987,8 @@ Sapphire::Data::GilShop::GilShop( uint32_t row_id, Sapphire::Data::ExdDataGenera
   auto row = exdData->m_GilShopDat.get_row( row_id );
   name = exdData->getField< std::string >( row, 0 );
   icon = exdData->getField< uint32_t >( row, 1 );
-  questRequired.push_back( exdData->getField< uint32_t >( row, 2 ) );
-  questRequired.push_back( exdData->getField< uint32_t >( row, 3 ) );
-  questRequired.push_back( exdData->getField< uint32_t >( row, 4 ) );
-  questRequired.push_back( exdData->getField< uint32_t >( row, 5 ) );
-  acceptTalk = exdData->getField< int32_t >( row, 6 );
-  failTalk = exdData->getField< int32_t >( row, 7 );
+  acceptTalk = exdData->getField< int32_t >( row, 3 );
+  failTalk = exdData->getField< int32_t >( row, 4 );
 }
 
 Sapphire::Data::GilShopItem::GilShopItem( uint32_t row_id, uint32_t subRow, Sapphire::Data::ExdDataGenerated* exdData )
@@ -3036,6 +3068,20 @@ Sapphire::Data::GuildleveAssignmentCategory::GuildleveAssignmentCategory( uint32
   category.push_back( exdData->getField< int32_t >( row, 7 ) );
 }
 
+Sapphire::Data::GuildOrder::GuildOrder( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
+{
+  auto row = exdData->m_GuildOrderDat.get_row( row_id );
+  eNpcName = exdData->getField< uint32_t >( row, 0 );
+  objective = exdData->getField< std::string >( row, 1 );
+  description1 = exdData->getField< std::string >( row, 2 );
+  description2 = exdData->getField< std::string >( row, 3 );
+  description3 = exdData->getField< std::string >( row, 4 );
+  completionBonusExp = exdData->getField< uint32_t >( row, 5 );
+  rewardExp = exdData->getField< uint32_t >( row, 6 );
+  completionBonusGil = exdData->getField< uint32_t >( row, 7 );
+  rewardGil = exdData->getField< uint32_t >( row, 8 );
+}
+
 Sapphire::Data::GuildOrderGuide::GuildOrderGuide( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
 {
   auto row = exdData->m_GuildOrderGuideDat.get_row( row_id );
@@ -3236,66 +3282,66 @@ Sapphire::Data::HousingLandSet::HousingLandSet( uint32_t row_id, Sapphire::Data:
   minPrice.push_back( exdData->getField< uint32_t >( row, 117 ) );
   minPrice.push_back( exdData->getField< uint32_t >( row, 118 ) );
   minPrice.push_back( exdData->getField< uint32_t >( row, 119 ) );
-  initialPrice.push_back( exdData->getField< uint32_t >( row, 300 ) );
-  initialPrice.push_back( exdData->getField< uint32_t >( row, 301 ) );
-  initialPrice.push_back( exdData->getField< uint32_t >( row, 302 ) );
-  initialPrice.push_back( exdData->getField< uint32_t >( row, 303 ) );
-  initialPrice.push_back( exdData->getField< uint32_t >( row, 304 ) );
-  initialPrice.push_back( exdData->getField< uint32_t >( row, 305 ) );
-  initialPrice.push_back( exdData->getField< uint32_t >( row, 306 ) );
-  initialPrice.push_back( exdData->getField< uint32_t >( row, 307 ) );
-  initialPrice.push_back( exdData->getField< uint32_t >( row, 308 ) );
-  initialPrice.push_back( exdData->getField< uint32_t >( row, 309 ) );
-  initialPrice.push_back( exdData->getField< uint32_t >( row, 310 ) );
-  initialPrice.push_back( exdData->getField< uint32_t >( row, 311 ) );
-  initialPrice.push_back( exdData->getField< uint32_t >( row, 312 ) );
-  initialPrice.push_back( exdData->getField< uint32_t >( row, 313 ) );
-  initialPrice.push_back( exdData->getField< uint32_t >( row, 314 ) );
-  initialPrice.push_back( exdData->getField< uint32_t >( row, 315 ) );
-  initialPrice.push_back( exdData->getField< uint32_t >( row, 316 ) );
-  initialPrice.push_back( exdData->getField< uint32_t >( row, 317 ) );
-  initialPrice.push_back( exdData->getField< uint32_t >( row, 318 ) );
-  initialPrice.push_back( exdData->getField< uint32_t >( row, 319 ) );
-  initialPrice.push_back( exdData->getField< uint32_t >( row, 320 ) );
-  initialPrice.push_back( exdData->getField< uint32_t >( row, 321 ) );
-  initialPrice.push_back( exdData->getField< uint32_t >( row, 322 ) );
-  initialPrice.push_back( exdData->getField< uint32_t >( row, 323 ) );
-  initialPrice.push_back( exdData->getField< uint32_t >( row, 324 ) );
-  initialPrice.push_back( exdData->getField< uint32_t >( row, 325 ) );
-  initialPrice.push_back( exdData->getField< uint32_t >( row, 326 ) );
-  initialPrice.push_back( exdData->getField< uint32_t >( row, 327 ) );
-  initialPrice.push_back( exdData->getField< uint32_t >( row, 328 ) );
-  initialPrice.push_back( exdData->getField< uint32_t >( row, 329 ) );
-  initialPrice.push_back( exdData->getField< uint32_t >( row, 330 ) );
-  initialPrice.push_back( exdData->getField< uint32_t >( row, 331 ) );
-  initialPrice.push_back( exdData->getField< uint32_t >( row, 332 ) );
-  initialPrice.push_back( exdData->getField< uint32_t >( row, 333 ) );
-  initialPrice.push_back( exdData->getField< uint32_t >( row, 334 ) );
-  initialPrice.push_back( exdData->getField< uint32_t >( row, 335 ) );
-  initialPrice.push_back( exdData->getField< uint32_t >( row, 336 ) );
-  initialPrice.push_back( exdData->getField< uint32_t >( row, 337 ) );
-  initialPrice.push_back( exdData->getField< uint32_t >( row, 338 ) );
-  initialPrice.push_back( exdData->getField< uint32_t >( row, 339 ) );
-  initialPrice.push_back( exdData->getField< uint32_t >( row, 340 ) );
-  initialPrice.push_back( exdData->getField< uint32_t >( row, 341 ) );
-  initialPrice.push_back( exdData->getField< uint32_t >( row, 342 ) );
-  initialPrice.push_back( exdData->getField< uint32_t >( row, 343 ) );
-  initialPrice.push_back( exdData->getField< uint32_t >( row, 344 ) );
-  initialPrice.push_back( exdData->getField< uint32_t >( row, 345 ) );
-  initialPrice.push_back( exdData->getField< uint32_t >( row, 346 ) );
-  initialPrice.push_back( exdData->getField< uint32_t >( row, 347 ) );
-  initialPrice.push_back( exdData->getField< uint32_t >( row, 348 ) );
-  initialPrice.push_back( exdData->getField< uint32_t >( row, 349 ) );
-  initialPrice.push_back( exdData->getField< uint32_t >( row, 350 ) );
-  initialPrice.push_back( exdData->getField< uint32_t >( row, 351 ) );
-  initialPrice.push_back( exdData->getField< uint32_t >( row, 352 ) );
-  initialPrice.push_back( exdData->getField< uint32_t >( row, 353 ) );
-  initialPrice.push_back( exdData->getField< uint32_t >( row, 354 ) );
-  initialPrice.push_back( exdData->getField< uint32_t >( row, 355 ) );
-  initialPrice.push_back( exdData->getField< uint32_t >( row, 356 ) );
-  initialPrice.push_back( exdData->getField< uint32_t >( row, 357 ) );
-  initialPrice.push_back( exdData->getField< uint32_t >( row, 358 ) );
-  initialPrice.push_back( exdData->getField< uint32_t >( row, 359 ) );
+  initialPrice.push_back( exdData->getField< uint32_t >( row, 240 ) );
+  initialPrice.push_back( exdData->getField< uint32_t >( row, 241 ) );
+  initialPrice.push_back( exdData->getField< uint32_t >( row, 242 ) );
+  initialPrice.push_back( exdData->getField< uint32_t >( row, 243 ) );
+  initialPrice.push_back( exdData->getField< uint32_t >( row, 244 ) );
+  initialPrice.push_back( exdData->getField< uint32_t >( row, 245 ) );
+  initialPrice.push_back( exdData->getField< uint32_t >( row, 246 ) );
+  initialPrice.push_back( exdData->getField< uint32_t >( row, 247 ) );
+  initialPrice.push_back( exdData->getField< uint32_t >( row, 248 ) );
+  initialPrice.push_back( exdData->getField< uint32_t >( row, 249 ) );
+  initialPrice.push_back( exdData->getField< uint32_t >( row, 250 ) );
+  initialPrice.push_back( exdData->getField< uint32_t >( row, 251 ) );
+  initialPrice.push_back( exdData->getField< uint32_t >( row, 252 ) );
+  initialPrice.push_back( exdData->getField< uint32_t >( row, 253 ) );
+  initialPrice.push_back( exdData->getField< uint32_t >( row, 254 ) );
+  initialPrice.push_back( exdData->getField< uint32_t >( row, 255 ) );
+  initialPrice.push_back( exdData->getField< uint32_t >( row, 256 ) );
+  initialPrice.push_back( exdData->getField< uint32_t >( row, 257 ) );
+  initialPrice.push_back( exdData->getField< uint32_t >( row, 258 ) );
+  initialPrice.push_back( exdData->getField< uint32_t >( row, 259 ) );
+  initialPrice.push_back( exdData->getField< uint32_t >( row, 260 ) );
+  initialPrice.push_back( exdData->getField< uint32_t >( row, 261 ) );
+  initialPrice.push_back( exdData->getField< uint32_t >( row, 262 ) );
+  initialPrice.push_back( exdData->getField< uint32_t >( row, 263 ) );
+  initialPrice.push_back( exdData->getField< uint32_t >( row, 264 ) );
+  initialPrice.push_back( exdData->getField< uint32_t >( row, 265 ) );
+  initialPrice.push_back( exdData->getField< uint32_t >( row, 266 ) );
+  initialPrice.push_back( exdData->getField< uint32_t >( row, 267 ) );
+  initialPrice.push_back( exdData->getField< uint32_t >( row, 268 ) );
+  initialPrice.push_back( exdData->getField< uint32_t >( row, 269 ) );
+  initialPrice.push_back( exdData->getField< uint32_t >( row, 270 ) );
+  initialPrice.push_back( exdData->getField< uint32_t >( row, 271 ) );
+  initialPrice.push_back( exdData->getField< uint32_t >( row, 272 ) );
+  initialPrice.push_back( exdData->getField< uint32_t >( row, 273 ) );
+  initialPrice.push_back( exdData->getField< uint32_t >( row, 274 ) );
+  initialPrice.push_back( exdData->getField< uint32_t >( row, 275 ) );
+  initialPrice.push_back( exdData->getField< uint32_t >( row, 276 ) );
+  initialPrice.push_back( exdData->getField< uint32_t >( row, 277 ) );
+  initialPrice.push_back( exdData->getField< uint32_t >( row, 278 ) );
+  initialPrice.push_back( exdData->getField< uint32_t >( row, 279 ) );
+  initialPrice.push_back( exdData->getField< uint32_t >( row, 280 ) );
+  initialPrice.push_back( exdData->getField< uint32_t >( row, 281 ) );
+  initialPrice.push_back( exdData->getField< uint32_t >( row, 282 ) );
+  initialPrice.push_back( exdData->getField< uint32_t >( row, 283 ) );
+  initialPrice.push_back( exdData->getField< uint32_t >( row, 284 ) );
+  initialPrice.push_back( exdData->getField< uint32_t >( row, 285 ) );
+  initialPrice.push_back( exdData->getField< uint32_t >( row, 286 ) );
+  initialPrice.push_back( exdData->getField< uint32_t >( row, 287 ) );
+  initialPrice.push_back( exdData->getField< uint32_t >( row, 288 ) );
+  initialPrice.push_back( exdData->getField< uint32_t >( row, 289 ) );
+  initialPrice.push_back( exdData->getField< uint32_t >( row, 290 ) );
+  initialPrice.push_back( exdData->getField< uint32_t >( row, 291 ) );
+  initialPrice.push_back( exdData->getField< uint32_t >( row, 292 ) );
+  initialPrice.push_back( exdData->getField< uint32_t >( row, 293 ) );
+  initialPrice.push_back( exdData->getField< uint32_t >( row, 294 ) );
+  initialPrice.push_back( exdData->getField< uint32_t >( row, 295 ) );
+  initialPrice.push_back( exdData->getField< uint32_t >( row, 296 ) );
+  initialPrice.push_back( exdData->getField< uint32_t >( row, 297 ) );
+  initialPrice.push_back( exdData->getField< uint32_t >( row, 298 ) );
+  initialPrice.push_back( exdData->getField< uint32_t >( row, 299 ) );
 }
 
 Sapphire::Data::HousingMapMarkerInfo::HousingMapMarkerInfo( uint32_t row_id, uint32_t subRow, Sapphire::Data::ExdDataGenerated* exdData )
@@ -3418,13 +3464,15 @@ Sapphire::Data::InstanceContent::InstanceContent( uint32_t row_id, Sapphire::Dat
   instanceContentTextDataObjectiveStart = exdData->getField< uint32_t >( row, 15 );
   instanceContentTextDataObjectiveEnd = exdData->getField< uint32_t >( row, 16 );
   sortKey = exdData->getField< uint16_t >( row, 17 );
+  instanceClearExp = exdData->getField< uint32_t >( row, 18 );
   newPlayerBonusA = exdData->getField< uint16_t >( row, 20 );
-  newPlayerBonusB = exdData->getField< uint16_t >( row, 21 );
-  finalBossExp = exdData->getField< uint32_t >( row, 22 );
+  finalBossCurrencyC = exdData->getField< uint16_t >( row, 21 );
   finalBossCurrencyA = exdData->getField< uint16_t >( row, 23 );
   finalBossCurrencyB = exdData->getField< uint16_t >( row, 24 );
-  finalBossCurrencyC = exdData->getField< uint16_t >( row, 25 );
-  instanceClearExp = exdData->getField< uint32_t >( row, 46 );
+  newPlayerBonusB = exdData->getField< uint16_t >( row, 25 );
+  instanceClearGil = exdData->getField< uint32_t >( row, 47 );
+  instanceContentRewardItem = exdData->getField< uint32_t >( row, 48 );
+  finalBossExp = exdData->getField< uint32_t >( row, 50 );
   instanceContentBuff = exdData->getField< int32_t >( row, 51 );
   reqInstance = exdData->getField< uint32_t >( row, 52 );
   partyCondition = exdData->getField< uint8_t >( row, 54 );
@@ -3676,7 +3724,7 @@ Sapphire::Data::JournalGenre::JournalGenre( uint32_t row_id, Sapphire::Data::Exd
   auto row = exdData->m_JournalGenreDat.get_row( row_id );
   icon = exdData->getField< int32_t >( row, 0 );
   journalCategory = exdData->getField< uint8_t >( row, 1 );
-  name = exdData->getField< std::string >( row, 2 );
+  name = exdData->getField< std::string >( row, 3 );
 }
 
 Sapphire::Data::JournalSection::JournalSection( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
@@ -3900,7 +3948,7 @@ Sapphire::Data::MapMarker::MapMarker( uint32_t row_id, uint32_t subRow, Sapphire
 Sapphire::Data::MapMarkerRegion::MapMarkerRegion( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
 {
   auto row = exdData->m_MapMarkerRegionDat.get_row( row_id );
-  x = exdData->getField< int16_t >( row, 0 );
+  x = exdData->getField< int16_t >( row, 1 );
 }
 
 Sapphire::Data::MapSymbol::MapSymbol( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
@@ -4021,8 +4069,7 @@ Sapphire::Data::ModelSkeleton::ModelSkeleton( uint32_t row_id, Sapphire::Data::E
 Sapphire::Data::ModelState::ModelState( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
 {
   auto row = exdData->m_ModelStateDat.get_row( row_id );
-  start = exdData->getField< uint16_t >( row, 0 );
-  end = exdData->getField< uint16_t >( row, 1 );
+  start = exdData->getField< uint16_t >( row, 1 );
 }
 
 Sapphire::Data::MonsterNote::MonsterNote( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
@@ -4085,30 +4132,18 @@ Sapphire::Data::MountAction::MountAction( uint32_t row_id, Sapphire::Data::ExdDa
 Sapphire::Data::MountCustomize::MountCustomize( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
 {
   auto row = exdData->m_MountCustomizeDat.get_row( row_id );
-  hyurMaleScale = exdData->getField< float >( row, 1 );
-  hyurFemaleScale = exdData->getField< float >( row, 2 );
-  elezenMaleScale = exdData->getField< float >( row, 3 );
-  elezenFemaleScale = exdData->getField< float >( row, 4 );
-  lalaMaleScale = exdData->getField< float >( row, 5 );
-  lalaFemaleScale = exdData->getField< float >( row, 6 );
-  miqoMaleScale = exdData->getField< float >( row, 7 );
-  miqoFemaleScale = exdData->getField< float >( row, 8 );
-  roeMaleScale = exdData->getField< float >( row, 9 );
-  roeFemaleScale = exdData->getField< float >( row, 10 );
-  auRaMaleScale = exdData->getField< float >( row, 11 );
-  auRaFemaleScale = exdData->getField< float >( row, 12 );
-  hyurMaleCameraHeight = exdData->getField< uint8_t >( row, 13 );
-  hyurFemaleCameraHeight = exdData->getField< uint8_t >( row, 14 );
-  elezenMaleCameraHeight = exdData->getField< uint8_t >( row, 15 );
-  elezenFemaleCameraHeight = exdData->getField< uint8_t >( row, 16 );
-  lalaMaleCameraHeight = exdData->getField< uint8_t >( row, 17 );
-  lalaFemaleCameraHeight = exdData->getField< uint8_t >( row, 18 );
-  miqoMaleCameraHeight = exdData->getField< uint8_t >( row, 19 );
-  miqoFemaleCameraHeight = exdData->getField< uint8_t >( row, 20 );
-  roeMaleCameraHeight = exdData->getField< uint8_t >( row, 21 );
-  roeFemaleCameraHeight = exdData->getField< uint8_t >( row, 22 );
-  auRaMaleCameraHeight = exdData->getField< uint8_t >( row, 23 );
-  auRaFemaleCameraHeight = exdData->getField< uint8_t >( row, 24 );
+  hyurMaleCameraHeight = exdData->getField< uint8_t >( row, 17 );
+  hyurFemaleCameraHeight = exdData->getField< uint8_t >( row, 18 );
+  elezenMaleCameraHeight = exdData->getField< uint8_t >( row, 21 );
+  elezenFemaleCameraHeight = exdData->getField< uint8_t >( row, 22 );
+  lalaMaleCameraHeight = exdData->getField< uint8_t >( row, 23 );
+  lalaFemaleCameraHeight = exdData->getField< uint8_t >( row, 24 );
+  miqoMaleCameraHeight = exdData->getField< uint8_t >( row, 25 );
+  miqoFemaleCameraHeight = exdData->getField< uint8_t >( row, 26 );
+  roeMaleCameraHeight = exdData->getField< uint8_t >( row, 27 );
+  roeFemaleCameraHeight = exdData->getField< uint8_t >( row, 28 );
+  auRaMaleCameraHeight = exdData->getField< uint8_t >( row, 29 );
+  auRaFemaleCameraHeight = exdData->getField< uint8_t >( row, 30 );
 }
 
 Sapphire::Data::MountFlyingCondition::MountFlyingCondition( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
@@ -4431,40 +4466,41 @@ Sapphire::Data::Quest::Quest( uint32_t row_id, Sapphire::Data::ExdDataGenerated*
   classJobCategory0 = exdData->getField< uint8_t >( row, 3 );
   classJobLevel0 = exdData->getField< uint16_t >( row, 4 );
   questLevelOffset = exdData->getField< uint8_t >( row, 5 );
-  levelMax = exdData->getField< uint16_t >( row, 6 );
-  classJobCategory1 = exdData->getField< uint8_t >( row, 7 );
-  classJobLevel1 = exdData->getField< uint16_t >( row, 8 );
-  previousQuestJoin = exdData->getField< uint8_t >( row, 9 );
-  previousQuest0 = exdData->getField< uint32_t >( row, 10 );
-  previousQuest1 = exdData->getField< uint32_t >( row, 12 );
-  previousQuest2 = exdData->getField< uint32_t >( row, 13 );
-  questLockJoin = exdData->getField< uint8_t >( row, 14 );
+  classJobCategory1 = exdData->getField< uint8_t >( row, 6 );
+  classJobLevel1 = exdData->getField< uint16_t >( row, 7 );
+  previousQuestJoin = exdData->getField< uint8_t >( row, 8 );
+  previousQuest0 = exdData->getField< uint32_t >( row, 9 );
+  previousQuest1 = exdData->getField< uint32_t >( row, 11 );
+  previousQuest2 = exdData->getField< uint32_t >( row, 12 );
+  questLockJoin = exdData->getField< uint8_t >( row, 13 );
+  questLock.push_back( exdData->getField< uint32_t >( row, 14 ) );
   questLock.push_back( exdData->getField< uint32_t >( row, 15 ) );
-  questLock.push_back( exdData->getField< uint32_t >( row, 16 ) );
-  classJobUnlock = exdData->getField< uint8_t >( row, 20 );
-  grandCompany = exdData->getField< uint8_t >( row, 21 );
-  grandCompanyRank = exdData->getField< uint8_t >( row, 22 );
-  instanceContentJoin = exdData->getField< uint8_t >( row, 23 );
+  classJobUnlock = exdData->getField< uint8_t >( row, 19 );
+  grandCompany = exdData->getField< uint8_t >( row, 20 );
+  grandCompanyRank = exdData->getField< uint8_t >( row, 21 );
+  instanceContentJoin = exdData->getField< uint8_t >( row, 22 );
+  instanceContent.push_back( exdData->getField< uint32_t >( row, 23 ) );
   instanceContent.push_back( exdData->getField< uint32_t >( row, 24 ) );
   instanceContent.push_back( exdData->getField< uint32_t >( row, 25 ) );
-  instanceContent.push_back( exdData->getField< uint32_t >( row, 26 ) );
-  festival = exdData->getField< uint8_t >( row, 27 );
-  bellStart = exdData->getField< uint16_t >( row, 30 );
-  bellEnd = exdData->getField< uint16_t >( row, 31 );
-  beastTribe = exdData->getField< uint8_t >( row, 32 );
-  beastReputationRank = exdData->getField< uint8_t >( row, 33 );
-  mountRequired = exdData->getField< int32_t >( row, 37 );
-  isHouseRequired = exdData->getField< bool >( row, 38 );
-  deliveryQuest = exdData->getField< uint8_t >( row, 39 );
-  issuerStart = exdData->getField< uint32_t >( row, 40 );
-  behavior = exdData->getField< uint16_t >( row, 41 );
-  targetEnd = exdData->getField< uint32_t >( row, 42 );
-  isRepeatable = exdData->getField< bool >( row, 43 );
-  repeatIntervalType = exdData->getField< uint8_t >( row, 44 );
-  questRepeatFlag = exdData->getField< uint8_t >( row, 45 );
-  unlocksSystemContent = exdData->getField< bool >( row, 46 );
-  type = exdData->getField< uint8_t >( row, 48 );
-  questClassJobSupply = exdData->getField< uint16_t >( row, 49 );
+  festival = exdData->getField< uint8_t >( row, 26 );
+  bellStart = exdData->getField< uint16_t >( row, 29 );
+  bellEnd = exdData->getField< uint16_t >( row, 30 );
+  beastTribe = exdData->getField< uint8_t >( row, 31 );
+  beastReputationRank = exdData->getField< uint8_t >( row, 32 );
+  levelMax = exdData->getField< uint16_t >( row, 33 );
+  mountRequired = exdData->getField< int32_t >( row, 36 );
+  isHouseRequired = exdData->getField< bool >( row, 37 );
+  deliveryQuest = exdData->getField< uint8_t >( row, 38 );
+  issuerStart = exdData->getField< uint32_t >( row, 39 );
+  behavior = exdData->getField< uint16_t >( row, 40 );
+  targetEnd = exdData->getField< uint32_t >( row, 41 );
+  isRepeatable = exdData->getField< bool >( row, 42 );
+  repeatIntervalType = exdData->getField< uint8_t >( row, 43 );
+  questRepeatFlag = exdData->getField< uint8_t >( row, 44 );
+  unlocksSystemContent = exdData->getField< bool >( row, 45 );
+  type = exdData->getField< uint8_t >( row, 47 );
+  questClassJobSupply = exdData->getField< uint16_t >( row, 48 );
+  scriptInstruction.push_back( exdData->getField< std::string >( row, 49 ) );
   scriptInstruction.push_back( exdData->getField< std::string >( row, 50 ) );
   scriptInstruction.push_back( exdData->getField< std::string >( row, 51 ) );
   scriptInstruction.push_back( exdData->getField< std::string >( row, 52 ) );
@@ -4514,7 +4550,7 @@ Sapphire::Data::Quest::Quest( uint32_t row_id, Sapphire::Data::ExdDataGenerated*
   scriptInstruction.push_back( exdData->getField< std::string >( row, 96 ) );
   scriptInstruction.push_back( exdData->getField< std::string >( row, 97 ) );
   scriptInstruction.push_back( exdData->getField< std::string >( row, 98 ) );
-  scriptInstruction.push_back( exdData->getField< std::string >( row, 99 ) );
+  scriptArg.push_back( exdData->getField< uint32_t >( row, 99 ) );
   scriptArg.push_back( exdData->getField< uint32_t >( row, 100 ) );
   scriptArg.push_back( exdData->getField< uint32_t >( row, 101 ) );
   scriptArg.push_back( exdData->getField< uint32_t >( row, 102 ) );
@@ -4564,7 +4600,7 @@ Sapphire::Data::Quest::Quest( uint32_t row_id, Sapphire::Data::ExdDataGenerated*
   scriptArg.push_back( exdData->getField< uint32_t >( row, 146 ) );
   scriptArg.push_back( exdData->getField< uint32_t >( row, 147 ) );
   scriptArg.push_back( exdData->getField< uint32_t >( row, 148 ) );
-  scriptArg.push_back( exdData->getField< uint32_t >( row, 149 ) );
+  actorSpawnSeq.push_back( exdData->getField< uint8_t >( row, 149 ) );
   actorSpawnSeq.push_back( exdData->getField< uint8_t >( row, 150 ) );
   actorSpawnSeq.push_back( exdData->getField< uint8_t >( row, 151 ) );
   actorSpawnSeq.push_back( exdData->getField< uint8_t >( row, 152 ) );
@@ -4628,7 +4664,7 @@ Sapphire::Data::Quest::Quest( uint32_t row_id, Sapphire::Data::ExdDataGenerated*
   actorSpawnSeq.push_back( exdData->getField< uint8_t >( row, 210 ) );
   actorSpawnSeq.push_back( exdData->getField< uint8_t >( row, 211 ) );
   actorSpawnSeq.push_back( exdData->getField< uint8_t >( row, 212 ) );
-  actorSpawnSeq.push_back( exdData->getField< uint8_t >( row, 213 ) );
+  actorDespawnSeq.push_back( exdData->getField< uint8_t >( row, 213 ) );
   actorDespawnSeq.push_back( exdData->getField< uint8_t >( row, 214 ) );
   actorDespawnSeq.push_back( exdData->getField< uint8_t >( row, 215 ) );
   actorDespawnSeq.push_back( exdData->getField< uint8_t >( row, 216 ) );
@@ -4692,7 +4728,7 @@ Sapphire::Data::Quest::Quest( uint32_t row_id, Sapphire::Data::ExdDataGenerated*
   actorDespawnSeq.push_back( exdData->getField< uint8_t >( row, 274 ) );
   actorDespawnSeq.push_back( exdData->getField< uint8_t >( row, 275 ) );
   actorDespawnSeq.push_back( exdData->getField< uint8_t >( row, 276 ) );
-  actorDespawnSeq.push_back( exdData->getField< uint8_t >( row, 277 ) );
+  actorSpawn.push_back( exdData->getField< uint32_t >( row, 277 ) );
   actorSpawn.push_back( exdData->getField< uint32_t >( row, 278 ) );
   actorSpawn.push_back( exdData->getField< uint32_t >( row, 279 ) );
   actorSpawn.push_back( exdData->getField< uint32_t >( row, 280 ) );
@@ -4756,7 +4792,7 @@ Sapphire::Data::Quest::Quest( uint32_t row_id, Sapphire::Data::ExdDataGenerated*
   actorSpawn.push_back( exdData->getField< uint32_t >( row, 338 ) );
   actorSpawn.push_back( exdData->getField< uint32_t >( row, 339 ) );
   actorSpawn.push_back( exdData->getField< uint32_t >( row, 340 ) );
-  actorSpawn.push_back( exdData->getField< uint32_t >( row, 341 ) );
+  questUInt8A.push_back( exdData->getField< uint8_t >( row, 341 ) );
   questUInt8A.push_back( exdData->getField< uint8_t >( row, 342 ) );
   questUInt8A.push_back( exdData->getField< uint8_t >( row, 343 ) );
   questUInt8A.push_back( exdData->getField< uint8_t >( row, 344 ) );
@@ -4788,7 +4824,7 @@ Sapphire::Data::Quest::Quest( uint32_t row_id, Sapphire::Data::ExdDataGenerated*
   questUInt8A.push_back( exdData->getField< uint8_t >( row, 370 ) );
   questUInt8A.push_back( exdData->getField< uint8_t >( row, 371 ) );
   questUInt8A.push_back( exdData->getField< uint8_t >( row, 372 ) );
-  questUInt8A.push_back( exdData->getField< uint8_t >( row, 373 ) );
+  questUInt8B.push_back( exdData->getField< uint8_t >( row, 373 ) );
   questUInt8B.push_back( exdData->getField< uint8_t >( row, 374 ) );
   questUInt8B.push_back( exdData->getField< uint8_t >( row, 375 ) );
   questUInt8B.push_back( exdData->getField< uint8_t >( row, 376 ) );
@@ -4820,7 +4856,7 @@ Sapphire::Data::Quest::Quest( uint32_t row_id, Sapphire::Data::ExdDataGenerated*
   questUInt8B.push_back( exdData->getField< uint8_t >( row, 402 ) );
   questUInt8B.push_back( exdData->getField< uint8_t >( row, 403 ) );
   questUInt8B.push_back( exdData->getField< uint8_t >( row, 404 ) );
-  questUInt8B.push_back( exdData->getField< uint8_t >( row, 405 ) );
+  toDoCompleteSeq.push_back( exdData->getField< uint8_t >( row, 1173 ) );
   toDoCompleteSeq.push_back( exdData->getField< uint8_t >( row, 1174 ) );
   toDoCompleteSeq.push_back( exdData->getField< uint8_t >( row, 1175 ) );
   toDoCompleteSeq.push_back( exdData->getField< uint8_t >( row, 1176 ) );
@@ -4844,7 +4880,7 @@ Sapphire::Data::Quest::Quest( uint32_t row_id, Sapphire::Data::ExdDataGenerated*
   toDoCompleteSeq.push_back( exdData->getField< uint8_t >( row, 1194 ) );
   toDoCompleteSeq.push_back( exdData->getField< uint8_t >( row, 1195 ) );
   toDoCompleteSeq.push_back( exdData->getField< uint8_t >( row, 1196 ) );
-  toDoCompleteSeq.push_back( exdData->getField< uint8_t >( row, 1197 ) );
+  toDoQty.push_back( exdData->getField< uint8_t >( row, 1197 ) );
   toDoQty.push_back( exdData->getField< uint8_t >( row, 1198 ) );
   toDoQty.push_back( exdData->getField< uint8_t >( row, 1199 ) );
   toDoQty.push_back( exdData->getField< uint8_t >( row, 1200 ) );
@@ -4868,7 +4904,7 @@ Sapphire::Data::Quest::Quest( uint32_t row_id, Sapphire::Data::ExdDataGenerated*
   toDoQty.push_back( exdData->getField< uint8_t >( row, 1218 ) );
   toDoQty.push_back( exdData->getField< uint8_t >( row, 1219 ) );
   toDoQty.push_back( exdData->getField< uint8_t >( row, 1220 ) );
-  toDoQty.push_back( exdData->getField< uint8_t >( row, 1221 ) );
+  toDoMainLocation.push_back( exdData->getField< uint32_t >( row, 1221 ) );
   toDoMainLocation.push_back( exdData->getField< uint32_t >( row, 1222 ) );
   toDoMainLocation.push_back( exdData->getField< uint32_t >( row, 1223 ) );
   toDoMainLocation.push_back( exdData->getField< uint32_t >( row, 1224 ) );
@@ -4892,7 +4928,6 @@ Sapphire::Data::Quest::Quest( uint32_t row_id, Sapphire::Data::ExdDataGenerated*
   toDoMainLocation.push_back( exdData->getField< uint32_t >( row, 1242 ) );
   toDoMainLocation.push_back( exdData->getField< uint32_t >( row, 1243 ) );
   toDoMainLocation.push_back( exdData->getField< uint32_t >( row, 1244 ) );
-  toDoMainLocation.push_back( exdData->getField< uint32_t >( row, 1245 ) );
   classJobRequired = exdData->getField< uint8_t >( row, 1438 );
   expFactor = exdData->getField< uint16_t >( row, 1440 );
   gilReward = exdData->getField< uint32_t >( row, 1441 );
@@ -5115,56 +5150,56 @@ Sapphire::Data::QuestBattle::QuestBattle( uint32_t row_id, Sapphire::Data::ExdDa
   scriptInstruction.push_back( exdData->getField< std::string >( row, 151 ) );
   scriptInstruction.push_back( exdData->getField< std::string >( row, 152 ) );
   scriptInstruction.push_back( exdData->getField< std::string >( row, 153 ) );
-  scriptValue.push_back( exdData->getField< uint32_t >( row, 154 ) );
-  scriptValue.push_back( exdData->getField< uint32_t >( row, 155 ) );
-  scriptValue.push_back( exdData->getField< uint32_t >( row, 156 ) );
-  scriptValue.push_back( exdData->getField< uint32_t >( row, 157 ) );
-  scriptValue.push_back( exdData->getField< uint32_t >( row, 158 ) );
-  scriptValue.push_back( exdData->getField< uint32_t >( row, 159 ) );
-  scriptValue.push_back( exdData->getField< uint32_t >( row, 160 ) );
-  scriptValue.push_back( exdData->getField< uint32_t >( row, 161 ) );
-  scriptValue.push_back( exdData->getField< uint32_t >( row, 162 ) );
-  scriptValue.push_back( exdData->getField< uint32_t >( row, 163 ) );
-  scriptValue.push_back( exdData->getField< uint32_t >( row, 164 ) );
-  scriptValue.push_back( exdData->getField< uint32_t >( row, 165 ) );
-  scriptValue.push_back( exdData->getField< uint32_t >( row, 166 ) );
-  scriptValue.push_back( exdData->getField< uint32_t >( row, 167 ) );
-  scriptValue.push_back( exdData->getField< uint32_t >( row, 168 ) );
-  scriptValue.push_back( exdData->getField< uint32_t >( row, 169 ) );
-  scriptValue.push_back( exdData->getField< uint32_t >( row, 170 ) );
-  scriptValue.push_back( exdData->getField< uint32_t >( row, 171 ) );
-  scriptValue.push_back( exdData->getField< uint32_t >( row, 172 ) );
-  scriptValue.push_back( exdData->getField< uint32_t >( row, 173 ) );
-  scriptValue.push_back( exdData->getField< uint32_t >( row, 174 ) );
-  scriptValue.push_back( exdData->getField< uint32_t >( row, 175 ) );
-  scriptValue.push_back( exdData->getField< uint32_t >( row, 176 ) );
-  scriptValue.push_back( exdData->getField< uint32_t >( row, 177 ) );
-  scriptValue.push_back( exdData->getField< uint32_t >( row, 178 ) );
-  scriptValue.push_back( exdData->getField< uint32_t >( row, 179 ) );
-  scriptValue.push_back( exdData->getField< uint32_t >( row, 180 ) );
-  scriptValue.push_back( exdData->getField< uint32_t >( row, 181 ) );
-  scriptValue.push_back( exdData->getField< uint32_t >( row, 182 ) );
-  scriptValue.push_back( exdData->getField< uint32_t >( row, 183 ) );
-  scriptValue.push_back( exdData->getField< uint32_t >( row, 184 ) );
-  scriptValue.push_back( exdData->getField< uint32_t >( row, 185 ) );
-  scriptValue.push_back( exdData->getField< uint32_t >( row, 186 ) );
-  scriptValue.push_back( exdData->getField< uint32_t >( row, 187 ) );
-  scriptValue.push_back( exdData->getField< uint32_t >( row, 188 ) );
-  scriptValue.push_back( exdData->getField< uint32_t >( row, 189 ) );
-  scriptValue.push_back( exdData->getField< uint32_t >( row, 190 ) );
-  scriptValue.push_back( exdData->getField< uint32_t >( row, 191 ) );
-  scriptValue.push_back( exdData->getField< uint32_t >( row, 192 ) );
-  scriptValue.push_back( exdData->getField< uint32_t >( row, 193 ) );
-  scriptValue.push_back( exdData->getField< uint32_t >( row, 194 ) );
-  scriptValue.push_back( exdData->getField< uint32_t >( row, 195 ) );
-  scriptValue.push_back( exdData->getField< uint32_t >( row, 196 ) );
-  scriptValue.push_back( exdData->getField< uint32_t >( row, 197 ) );
-  scriptValue.push_back( exdData->getField< uint32_t >( row, 198 ) );
-  scriptValue.push_back( exdData->getField< uint32_t >( row, 199 ) );
-  scriptValue.push_back( exdData->getField< uint32_t >( row, 200 ) );
-  scriptValue.push_back( exdData->getField< uint32_t >( row, 201 ) );
-  scriptValue.push_back( exdData->getField< uint32_t >( row, 202 ) );
-  scriptValue.push_back( exdData->getField< uint32_t >( row, 203 ) );
+  scriptInstruction.push_back( exdData->getField< std::string >( row, 154 ) );
+  scriptInstruction.push_back( exdData->getField< std::string >( row, 155 ) );
+  scriptInstruction.push_back( exdData->getField< std::string >( row, 156 ) );
+  scriptInstruction.push_back( exdData->getField< std::string >( row, 157 ) );
+  scriptInstruction.push_back( exdData->getField< std::string >( row, 158 ) );
+  scriptInstruction.push_back( exdData->getField< std::string >( row, 159 ) );
+  scriptInstruction.push_back( exdData->getField< std::string >( row, 160 ) );
+  scriptInstruction.push_back( exdData->getField< std::string >( row, 161 ) );
+  scriptInstruction.push_back( exdData->getField< std::string >( row, 162 ) );
+  scriptInstruction.push_back( exdData->getField< std::string >( row, 163 ) );
+  scriptInstruction.push_back( exdData->getField< std::string >( row, 164 ) );
+  scriptInstruction.push_back( exdData->getField< std::string >( row, 165 ) );
+  scriptInstruction.push_back( exdData->getField< std::string >( row, 166 ) );
+  scriptInstruction.push_back( exdData->getField< std::string >( row, 167 ) );
+  scriptInstruction.push_back( exdData->getField< std::string >( row, 168 ) );
+  scriptInstruction.push_back( exdData->getField< std::string >( row, 169 ) );
+  scriptInstruction.push_back( exdData->getField< std::string >( row, 170 ) );
+  scriptInstruction.push_back( exdData->getField< std::string >( row, 171 ) );
+  scriptInstruction.push_back( exdData->getField< std::string >( row, 172 ) );
+  scriptInstruction.push_back( exdData->getField< std::string >( row, 173 ) );
+  scriptInstruction.push_back( exdData->getField< std::string >( row, 174 ) );
+  scriptInstruction.push_back( exdData->getField< std::string >( row, 175 ) );
+  scriptInstruction.push_back( exdData->getField< std::string >( row, 176 ) );
+  scriptInstruction.push_back( exdData->getField< std::string >( row, 177 ) );
+  scriptInstruction.push_back( exdData->getField< std::string >( row, 178 ) );
+  scriptInstruction.push_back( exdData->getField< std::string >( row, 179 ) );
+  scriptInstruction.push_back( exdData->getField< std::string >( row, 180 ) );
+  scriptInstruction.push_back( exdData->getField< std::string >( row, 181 ) );
+  scriptInstruction.push_back( exdData->getField< std::string >( row, 182 ) );
+  scriptInstruction.push_back( exdData->getField< std::string >( row, 183 ) );
+  scriptInstruction.push_back( exdData->getField< std::string >( row, 184 ) );
+  scriptInstruction.push_back( exdData->getField< std::string >( row, 185 ) );
+  scriptInstruction.push_back( exdData->getField< std::string >( row, 186 ) );
+  scriptInstruction.push_back( exdData->getField< std::string >( row, 187 ) );
+  scriptInstruction.push_back( exdData->getField< std::string >( row, 188 ) );
+  scriptInstruction.push_back( exdData->getField< std::string >( row, 189 ) );
+  scriptInstruction.push_back( exdData->getField< std::string >( row, 190 ) );
+  scriptInstruction.push_back( exdData->getField< std::string >( row, 191 ) );
+  scriptInstruction.push_back( exdData->getField< std::string >( row, 192 ) );
+  scriptInstruction.push_back( exdData->getField< std::string >( row, 193 ) );
+  scriptInstruction.push_back( exdData->getField< std::string >( row, 194 ) );
+  scriptInstruction.push_back( exdData->getField< std::string >( row, 195 ) );
+  scriptInstruction.push_back( exdData->getField< std::string >( row, 196 ) );
+  scriptInstruction.push_back( exdData->getField< std::string >( row, 197 ) );
+  scriptInstruction.push_back( exdData->getField< std::string >( row, 198 ) );
+  scriptInstruction.push_back( exdData->getField< std::string >( row, 199 ) );
+  scriptInstruction.push_back( exdData->getField< std::string >( row, 200 ) );
+  scriptInstruction.push_back( exdData->getField< std::string >( row, 201 ) );
+  scriptInstruction.push_back( exdData->getField< std::string >( row, 202 ) );
+  scriptInstruction.push_back( exdData->getField< std::string >( row, 203 ) );
   scriptValue.push_back( exdData->getField< uint32_t >( row, 204 ) );
   scriptValue.push_back( exdData->getField< uint32_t >( row, 205 ) );
   scriptValue.push_back( exdData->getField< uint32_t >( row, 206 ) );
@@ -5265,6 +5300,106 @@ Sapphire::Data::QuestBattle::QuestBattle( uint32_t row_id, Sapphire::Data::ExdDa
   scriptValue.push_back( exdData->getField< uint32_t >( row, 301 ) );
   scriptValue.push_back( exdData->getField< uint32_t >( row, 302 ) );
   scriptValue.push_back( exdData->getField< uint32_t >( row, 303 ) );
+  scriptValue.push_back( exdData->getField< uint32_t >( row, 304 ) );
+  scriptValue.push_back( exdData->getField< uint32_t >( row, 305 ) );
+  scriptValue.push_back( exdData->getField< uint32_t >( row, 306 ) );
+  scriptValue.push_back( exdData->getField< uint32_t >( row, 307 ) );
+  scriptValue.push_back( exdData->getField< uint32_t >( row, 308 ) );
+  scriptValue.push_back( exdData->getField< uint32_t >( row, 309 ) );
+  scriptValue.push_back( exdData->getField< uint32_t >( row, 310 ) );
+  scriptValue.push_back( exdData->getField< uint32_t >( row, 311 ) );
+  scriptValue.push_back( exdData->getField< uint32_t >( row, 312 ) );
+  scriptValue.push_back( exdData->getField< uint32_t >( row, 313 ) );
+  scriptValue.push_back( exdData->getField< uint32_t >( row, 314 ) );
+  scriptValue.push_back( exdData->getField< uint32_t >( row, 315 ) );
+  scriptValue.push_back( exdData->getField< uint32_t >( row, 316 ) );
+  scriptValue.push_back( exdData->getField< uint32_t >( row, 317 ) );
+  scriptValue.push_back( exdData->getField< uint32_t >( row, 318 ) );
+  scriptValue.push_back( exdData->getField< uint32_t >( row, 319 ) );
+  scriptValue.push_back( exdData->getField< uint32_t >( row, 320 ) );
+  scriptValue.push_back( exdData->getField< uint32_t >( row, 321 ) );
+  scriptValue.push_back( exdData->getField< uint32_t >( row, 322 ) );
+  scriptValue.push_back( exdData->getField< uint32_t >( row, 323 ) );
+  scriptValue.push_back( exdData->getField< uint32_t >( row, 324 ) );
+  scriptValue.push_back( exdData->getField< uint32_t >( row, 325 ) );
+  scriptValue.push_back( exdData->getField< uint32_t >( row, 326 ) );
+  scriptValue.push_back( exdData->getField< uint32_t >( row, 327 ) );
+  scriptValue.push_back( exdData->getField< uint32_t >( row, 328 ) );
+  scriptValue.push_back( exdData->getField< uint32_t >( row, 329 ) );
+  scriptValue.push_back( exdData->getField< uint32_t >( row, 330 ) );
+  scriptValue.push_back( exdData->getField< uint32_t >( row, 331 ) );
+  scriptValue.push_back( exdData->getField< uint32_t >( row, 332 ) );
+  scriptValue.push_back( exdData->getField< uint32_t >( row, 333 ) );
+  scriptValue.push_back( exdData->getField< uint32_t >( row, 334 ) );
+  scriptValue.push_back( exdData->getField< uint32_t >( row, 335 ) );
+  scriptValue.push_back( exdData->getField< uint32_t >( row, 336 ) );
+  scriptValue.push_back( exdData->getField< uint32_t >( row, 337 ) );
+  scriptValue.push_back( exdData->getField< uint32_t >( row, 338 ) );
+  scriptValue.push_back( exdData->getField< uint32_t >( row, 339 ) );
+  scriptValue.push_back( exdData->getField< uint32_t >( row, 340 ) );
+  scriptValue.push_back( exdData->getField< uint32_t >( row, 341 ) );
+  scriptValue.push_back( exdData->getField< uint32_t >( row, 342 ) );
+  scriptValue.push_back( exdData->getField< uint32_t >( row, 343 ) );
+  scriptValue.push_back( exdData->getField< uint32_t >( row, 344 ) );
+  scriptValue.push_back( exdData->getField< uint32_t >( row, 345 ) );
+  scriptValue.push_back( exdData->getField< uint32_t >( row, 346 ) );
+  scriptValue.push_back( exdData->getField< uint32_t >( row, 347 ) );
+  scriptValue.push_back( exdData->getField< uint32_t >( row, 348 ) );
+  scriptValue.push_back( exdData->getField< uint32_t >( row, 349 ) );
+  scriptValue.push_back( exdData->getField< uint32_t >( row, 350 ) );
+  scriptValue.push_back( exdData->getField< uint32_t >( row, 351 ) );
+  scriptValue.push_back( exdData->getField< uint32_t >( row, 352 ) );
+  scriptValue.push_back( exdData->getField< uint32_t >( row, 353 ) );
+  scriptValue.push_back( exdData->getField< uint32_t >( row, 354 ) );
+  scriptValue.push_back( exdData->getField< uint32_t >( row, 355 ) );
+  scriptValue.push_back( exdData->getField< uint32_t >( row, 356 ) );
+  scriptValue.push_back( exdData->getField< uint32_t >( row, 357 ) );
+  scriptValue.push_back( exdData->getField< uint32_t >( row, 358 ) );
+  scriptValue.push_back( exdData->getField< uint32_t >( row, 359 ) );
+  scriptValue.push_back( exdData->getField< uint32_t >( row, 360 ) );
+  scriptValue.push_back( exdData->getField< uint32_t >( row, 361 ) );
+  scriptValue.push_back( exdData->getField< uint32_t >( row, 362 ) );
+  scriptValue.push_back( exdData->getField< uint32_t >( row, 363 ) );
+  scriptValue.push_back( exdData->getField< uint32_t >( row, 364 ) );
+  scriptValue.push_back( exdData->getField< uint32_t >( row, 365 ) );
+  scriptValue.push_back( exdData->getField< uint32_t >( row, 366 ) );
+  scriptValue.push_back( exdData->getField< uint32_t >( row, 367 ) );
+  scriptValue.push_back( exdData->getField< uint32_t >( row, 368 ) );
+  scriptValue.push_back( exdData->getField< uint32_t >( row, 369 ) );
+  scriptValue.push_back( exdData->getField< uint32_t >( row, 370 ) );
+  scriptValue.push_back( exdData->getField< uint32_t >( row, 371 ) );
+  scriptValue.push_back( exdData->getField< uint32_t >( row, 372 ) );
+  scriptValue.push_back( exdData->getField< uint32_t >( row, 373 ) );
+  scriptValue.push_back( exdData->getField< uint32_t >( row, 374 ) );
+  scriptValue.push_back( exdData->getField< uint32_t >( row, 375 ) );
+  scriptValue.push_back( exdData->getField< uint32_t >( row, 376 ) );
+  scriptValue.push_back( exdData->getField< uint32_t >( row, 377 ) );
+  scriptValue.push_back( exdData->getField< uint32_t >( row, 378 ) );
+  scriptValue.push_back( exdData->getField< uint32_t >( row, 379 ) );
+  scriptValue.push_back( exdData->getField< uint32_t >( row, 380 ) );
+  scriptValue.push_back( exdData->getField< uint32_t >( row, 381 ) );
+  scriptValue.push_back( exdData->getField< uint32_t >( row, 382 ) );
+  scriptValue.push_back( exdData->getField< uint32_t >( row, 383 ) );
+  scriptValue.push_back( exdData->getField< uint32_t >( row, 384 ) );
+  scriptValue.push_back( exdData->getField< uint32_t >( row, 385 ) );
+  scriptValue.push_back( exdData->getField< uint32_t >( row, 386 ) );
+  scriptValue.push_back( exdData->getField< uint32_t >( row, 387 ) );
+  scriptValue.push_back( exdData->getField< uint32_t >( row, 388 ) );
+  scriptValue.push_back( exdData->getField< uint32_t >( row, 389 ) );
+  scriptValue.push_back( exdData->getField< uint32_t >( row, 390 ) );
+  scriptValue.push_back( exdData->getField< uint32_t >( row, 391 ) );
+  scriptValue.push_back( exdData->getField< uint32_t >( row, 392 ) );
+  scriptValue.push_back( exdData->getField< uint32_t >( row, 393 ) );
+  scriptValue.push_back( exdData->getField< uint32_t >( row, 394 ) );
+  scriptValue.push_back( exdData->getField< uint32_t >( row, 395 ) );
+  scriptValue.push_back( exdData->getField< uint32_t >( row, 396 ) );
+  scriptValue.push_back( exdData->getField< uint32_t >( row, 397 ) );
+  scriptValue.push_back( exdData->getField< uint32_t >( row, 398 ) );
+  scriptValue.push_back( exdData->getField< uint32_t >( row, 399 ) );
+  scriptValue.push_back( exdData->getField< uint32_t >( row, 400 ) );
+  scriptValue.push_back( exdData->getField< uint32_t >( row, 401 ) );
+  scriptValue.push_back( exdData->getField< uint32_t >( row, 402 ) );
+  scriptValue.push_back( exdData->getField< uint32_t >( row, 403 ) );
 }
 
 Sapphire::Data::QuestClassJobReward::QuestClassJobReward( uint32_t row_id, uint32_t subRow, Sapphire::Data::ExdDataGenerated* exdData )
@@ -5400,8 +5535,7 @@ Sapphire::Data::Recipe::Recipe( uint32_t row_id, Sapphire::Data::ExdDataGenerate
   recipeLevelTable = exdData->getField< uint16_t >( row, 2 );
   itemResult = exdData->getField< int32_t >( row, 3 );
   amountResult = exdData->getField< uint8_t >( row, 4 );
-  recipeElement = exdData->getField< uint8_t >( row, 25 );
-  isSecondary = exdData->getField< bool >( row, 27 );
+  isSecondary = exdData->getField< bool >( row, 26 );
   difficultyFactor = exdData->getField< uint16_t >( row, 28 );
   qualityFactor = exdData->getField< uint16_t >( row, 29 );
   durabilityFactor = exdData->getField< uint16_t >( row, 30 );
@@ -5419,21 +5553,15 @@ Sapphire::Data::Recipe::Recipe( uint32_t row_id, Sapphire::Data::ExdDataGenerate
   patchNumber = exdData->getField< uint16_t >( row, 44 );
 }
 
-Sapphire::Data::RecipeElement::RecipeElement( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
-{
-  auto row = exdData->m_RecipeElementDat.get_row( row_id );
-  name = exdData->getField< std::string >( row, 0 );
-}
-
 Sapphire::Data::RecipeLevelTable::RecipeLevelTable( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
 {
   auto row = exdData->m_RecipeLevelTableDat.get_row( row_id );
   classJobLevel = exdData->getField< uint8_t >( row, 0 );
   stars = exdData->getField< uint8_t >( row, 1 );
   suggestedCraftsmanship = exdData->getField< uint16_t >( row, 2 );
-  difficulty = exdData->getField< uint16_t >( row, 3 );
-  quality = exdData->getField< int16_t >( row, 4 );
-  durability = exdData->getField< uint16_t >( row, 5 );
+  difficulty = exdData->getField< uint16_t >( row, 4 );
+  quality = exdData->getField< uint32_t >( row, 5 );
+  durability = exdData->getField< uint16_t >( row, 6 );
 }
 
 Sapphire::Data::RecipeNotebookList::RecipeNotebookList( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
@@ -6131,9 +6259,8 @@ Sapphire::Data::SpecialShop::SpecialShop( uint32_t row_id, Sapphire::Data::ExdDa
   patchNumber.push_back( exdData->getField< uint16_t >( row, 1859 ) );
   patchNumber.push_back( exdData->getField< uint16_t >( row, 1860 ) );
   questUnlock = exdData->getField< uint32_t >( row, 1862 );
-  questShop = exdData->getField< int32_t >( row, 1863 );
-  notCompleteText = exdData->getField< int32_t >( row, 1864 );
-  completeText = exdData->getField< int32_t >( row, 1865 );
+  notCompleteText = exdData->getField< int32_t >( row, 1863 );
+  completeText = exdData->getField< int32_t >( row, 1864 );
 }
 
 Sapphire::Data::SpecialShopItemCategory::SpecialShopItemCategory( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
@@ -6164,18 +6291,18 @@ Sapphire::Data::Status::Status( uint32_t row_id, Sapphire::Data::ExdDataGenerate
   description = exdData->getField< std::string >( row, 1 );
   icon = exdData->getField< uint16_t >( row, 2 );
   maxStacks = exdData->getField< uint8_t >( row, 3 );
-  category = exdData->getField< uint8_t >( row, 4 );
-  hitEffect = exdData->getField< uint8_t >( row, 5 );
-  vFX = exdData->getField< uint8_t >( row, 6 );
-  lockMovement = exdData->getField< bool >( row, 7 );
-  lockActions = exdData->getField< bool >( row, 9 );
-  lockControl = exdData->getField< bool >( row, 10 );
-  transfiguration = exdData->getField< bool >( row, 11 );
-  canDispel = exdData->getField< bool >( row, 13 );
-  inflictedByActor = exdData->getField< bool >( row, 14 );
-  isPermanent = exdData->getField< bool >( row, 15 );
-  isFcBuff = exdData->getField< bool >( row, 21 );
-  invisibility = exdData->getField< bool >( row, 22 );
+  category = exdData->getField< uint8_t >( row, 5 );
+  hitEffect = exdData->getField< uint8_t >( row, 6 );
+  vFX = exdData->getField< uint8_t >( row, 7 );
+  lockMovement = exdData->getField< bool >( row, 8 );
+  lockActions = exdData->getField< bool >( row, 10 );
+  lockControl = exdData->getField< bool >( row, 11 );
+  transfiguration = exdData->getField< bool >( row, 12 );
+  canDispel = exdData->getField< bool >( row, 14 );
+  inflictedByActor = exdData->getField< bool >( row, 15 );
+  isPermanent = exdData->getField< bool >( row, 16 );
+  isFcBuff = exdData->getField< bool >( row, 24 );
+  invisibility = exdData->getField< bool >( row, 25 );
 }
 
 Sapphire::Data::StatusHitEffect::StatusHitEffect( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
@@ -6202,11 +6329,11 @@ Sapphire::Data::SubmarineExploration::SubmarineExploration( uint32_t row_id, Sap
   auto row = exdData->m_SubmarineExplorationDat.get_row( row_id );
   destination = exdData->getField< std::string >( row, 0 );
   location = exdData->getField< std::string >( row, 1 );
-  rankReq = exdData->getField< uint8_t >( row, 5 );
-  ceruleumTankReq = exdData->getField< uint8_t >( row, 6 );
-  durationmin = exdData->getField< uint16_t >( row, 7 );
-  distanceForSurvey = exdData->getField< uint8_t >( row, 8 );
-  expReward = exdData->getField< uint32_t >( row, 9 );
+  rankReq = exdData->getField< uint8_t >( row, 8 );
+  ceruleumTankReq = exdData->getField< uint8_t >( row, 9 );
+  durationmin = exdData->getField< uint16_t >( row, 10 );
+  distanceForSurvey = exdData->getField< uint8_t >( row, 11 );
+  expReward = exdData->getField< uint32_t >( row, 12 );
 }
 
 Sapphire::Data::SubmarinePart::SubmarinePart( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
@@ -6363,20 +6490,20 @@ Sapphire::Data::Transformation::Transformation( uint32_t row_id, Sapphire::Data:
   bNpcName = exdData->getField< uint16_t >( row, 2 );
   bNpcCustomize = exdData->getField< int32_t >( row, 3 );
   npcEquip = exdData->getField< int32_t >( row, 4 );
-  action.push_back( exdData->getField< uint16_t >( row, 5 ) );
-  action.push_back( exdData->getField< uint16_t >( row, 6 ) );
-  action.push_back( exdData->getField< uint16_t >( row, 7 ) );
-  action.push_back( exdData->getField< uint16_t >( row, 8 ) );
-  action.push_back( exdData->getField< uint16_t >( row, 9 ) );
   action.push_back( exdData->getField< uint16_t >( row, 10 ) );
-  speed = exdData->getField< float >( row, 13 );
-  scale = exdData->getField< float >( row, 14 );
-  isPvP = exdData->getField< bool >( row, 15 );
-  isEvent = exdData->getField< bool >( row, 16 );
-  playerCamera = exdData->getField< bool >( row, 17 );
-  startVFX = exdData->getField< uint16_t >( row, 18 );
-  endVFX = exdData->getField< uint16_t >( row, 19 );
-  rPParameter = exdData->getField< uint8_t >( row, 23 );
+  action.push_back( exdData->getField< uint16_t >( row, 11 ) );
+  action.push_back( exdData->getField< uint16_t >( row, 12 ) );
+  action.push_back( exdData->getField< uint16_t >( row, 13 ) );
+  action.push_back( exdData->getField< uint16_t >( row, 14 ) );
+  action.push_back( exdData->getField< uint16_t >( row, 15 ) );
+  rPParameter = exdData->getField< uint8_t >( row, 18 );
+  speed = exdData->getField< float >( row, 19 );
+  scale = exdData->getField< float >( row, 20 );
+  isPvP = exdData->getField< bool >( row, 21 );
+  isEvent = exdData->getField< bool >( row, 22 );
+  playerCamera = exdData->getField< bool >( row, 23 );
+  startVFX = exdData->getField< uint16_t >( row, 24 );
+  endVFX = exdData->getField< uint16_t >( row, 25 );
 }
 
 Sapphire::Data::Treasure::Treasure( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
@@ -7003,6 +7130,7 @@ bool Sapphire::Data::ExdDataGenerated::init( const std::string& path )
     m_GuardianDeityDat = setupDatAccess( "GuardianDeity", xiv::exd::Language::en );
     m_GuildleveAssignmentDat = setupDatAccess( "GuildleveAssignment", xiv::exd::Language::none );
     m_GuildleveAssignmentCategoryDat = setupDatAccess( "GuildleveAssignmentCategory", xiv::exd::Language::none );
+    m_GuildOrderDat = setupDatAccess( "GuildOrder", xiv::exd::Language::en );
     m_GuildOrderGuideDat = setupDatAccess( "GuildOrderGuide", xiv::exd::Language::none );
     m_GuildOrderOfficerDat = setupDatAccess( "GuildOrderOfficer", xiv::exd::Language::none );
     m_HairMakeTypeDat = setupDatAccess( "HairMakeType", xiv::exd::Language::none );
@@ -7130,7 +7258,6 @@ bool Sapphire::Data::ExdDataGenerated::init( const std::string& path )
     m_RacingChocoboParamDat = setupDatAccess( "RacingChocoboParam", xiv::exd::Language::en );
     m_RecastNavimeshDat = setupDatAccess( "RecastNavimesh", xiv::exd::Language::none );
     m_RecipeDat = setupDatAccess( "Recipe", xiv::exd::Language::none );
-    m_RecipeElementDat = setupDatAccess( "RecipeElement", xiv::exd::Language::en );
     m_RecipeLevelTableDat = setupDatAccess( "RecipeLevelTable", xiv::exd::Language::none );
     m_RecipeNotebookListDat = setupDatAccess( "RecipeNotebookList", xiv::exd::Language::none );
     m_RecommendContentsDat = setupDatAccess( "RecommendContents", xiv::exd::Language::none );
diff --git a/src/common/Exd/ExdDataGenerated.h b/src/common/Exd/ExdDataGenerated.h
index 8a165fc4..725fb2a7 100644
--- a/src/common/Exd/ExdDataGenerated.h
+++ b/src/common/Exd/ExdDataGenerated.h
@@ -278,6 +278,7 @@ struct GrandCompanyRank;
 struct GuardianDeity;
 struct GuildleveAssignment;
 struct GuildleveAssignmentCategory;
+struct GuildOrder;
 struct GuildOrderGuide;
 struct GuildOrderOfficer;
 struct HairMakeType;
@@ -405,7 +406,6 @@ struct RacingChocoboNameInfo;
 struct RacingChocoboParam;
 struct RecastNavimesh;
 struct Recipe;
-struct RecipeElement;
 struct RecipeLevelTable;
 struct RecipeNotebookList;
 struct RecommendContents;
@@ -511,7 +511,7 @@ struct Achievement
   int32_t key;
   std::vector< int32_t > data;
   uint16_t order;
-  bool initialHide;
+  uint8_t initialHide;
 
   Achievement( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
@@ -1111,12 +1111,10 @@ struct BeastReputationRank
 struct BeastTribe
 {
   uint8_t minLevel;
-  uint8_t maxLevel;
   uint8_t beastRankBonus;
   uint32_t iconReputation;
   uint32_t icon;
   uint8_t maxRank;
-  uint32_t alliedBeastTribeQuest;
   uint8_t expansion;
   uint32_t currencyItem;
   uint8_t displayOrder;
@@ -1734,6 +1732,7 @@ struct ContentFinderCondition
   uint8_t contentLinkType;
   uint16_t content;
   uint8_t contentMemberType;
+  uint32_t unlockQuest;
   uint8_t classJobLevelRequired;
   uint8_t classJobLevelSync;
   uint16_t itemLevelRequired;
@@ -1743,8 +1742,11 @@ struct ContentFinderCondition
   bool dutyRecorderAllowed;
   std::string name;
   uint8_t contentType;
+  uint8_t transientKey;
   uint32_t transient;
+  uint16_t sortKey;
   uint32_t image;
+  uint32_t icon;
   bool levelingRoulette;
   bool level5060Roulette;
   bool mSQRoulette;
@@ -1843,12 +1845,14 @@ struct ContentRouletteRoleBonus
 struct ContentsNote
 {
   uint8_t contentType;
+  int32_t icon;
   uint8_t menuOrder;
   int32_t requiredAmount;
   int32_t expMultiplier;
   int32_t gilRward;
   uint16_t levelUnlock;
   uint16_t howTo;
+  uint32_t reqUnlock;
   std::string name;
   std::string description;
   int32_t expCap;
@@ -2351,6 +2355,21 @@ struct ENpcDressUp
 struct ENpcDressUpDress
 {
   uint32_t eNpc;
+  uint16_t behavior;
+  uint64_t modelMainHand;
+  uint8_t dyeMainHand;
+  uint64_t modelOffHand;
+  uint8_t dyeOffHand;
+  uint32_t modelHead;
+  uint8_t dyeHead;
+  uint32_t modelBody;
+  uint8_t dyeBody;
+  uint32_t modelHands;
+  uint8_t dyeHands;
+  uint32_t modelLegs;
+  uint8_t dyeLegs;
+  uint32_t modelFeet;
+  uint8_t dyeFeet;
 
   ENpcDressUpDress( uint32_t row_id, uint32_t subRow, Sapphire::Data::ExdDataGenerated* exdData );
 };
@@ -2688,6 +2707,10 @@ struct FieldMarker
 struct FishingRecordType
 {
   int32_t addon;
+  uint16_t rankBRequirement;
+  uint16_t rankARequirement;
+  uint16_t rankAARequirement;
+  uint16_t rankAAARequirement;
 
   FishingRecordType( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
@@ -2711,6 +2734,7 @@ struct FishingSpot
   uint16_t radius;
   std::vector< int32_t > item;
   uint16_t placeName;
+  uint8_t order;
 
   FishingSpot( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
@@ -2723,10 +2747,10 @@ struct FishParameter
   bool isHidden;
   uint8_t fishingRecordType;
   int32_t territoryType;
+  uint16_t gatheringSubCategory;
   bool isInLog;
   bool timeRestricted;
   bool weatherRestricted;
-  uint16_t gatheringSubCategory;
 
   FishParameter( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
@@ -3133,7 +3157,6 @@ struct GilShop
 {
   std::string name;
   uint32_t icon;
-  std::vector< uint32_t > questRequired;
   int32_t acceptTalk;
   int32_t failTalk;
 
@@ -3215,6 +3238,21 @@ struct GuildleveAssignmentCategory
   GuildleveAssignmentCategory( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
 
+struct GuildOrder
+{
+  uint32_t eNpcName;
+  std::string objective;
+  std::string description1;
+  std::string description2;
+  std::string description3;
+  uint32_t completionBonusExp;
+  uint32_t rewardExp;
+  uint32_t completionBonusGil;
+  uint32_t rewardGil;
+
+  GuildOrder( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+};
+
 struct GuildOrderGuide
 {
 
@@ -3422,13 +3460,15 @@ struct InstanceContent
   uint32_t instanceContentTextDataObjectiveStart;
   uint32_t instanceContentTextDataObjectiveEnd;
   uint16_t sortKey;
+  uint32_t instanceClearExp;
   uint16_t newPlayerBonusA;
-  uint16_t newPlayerBonusB;
-  uint32_t finalBossExp;
+  uint16_t finalBossCurrencyC;
   uint16_t finalBossCurrencyA;
   uint16_t finalBossCurrencyB;
-  uint16_t finalBossCurrencyC;
-  uint32_t instanceClearExp;
+  uint16_t newPlayerBonusB;
+  uint32_t instanceClearGil;
+  uint32_t instanceContentRewardItem;
+  uint32_t finalBossExp;
   int32_t instanceContentBuff;
   uint32_t reqInstance;
   uint8_t partyCondition;
@@ -4004,7 +4044,6 @@ struct ModelSkeleton
 struct ModelState
 {
   uint16_t start;
-  uint16_t end;
 
   ModelState( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
@@ -4061,18 +4100,6 @@ struct MountAction
 
 struct MountCustomize
 {
-  float hyurMaleScale;
-  float hyurFemaleScale;
-  float elezenMaleScale;
-  float elezenFemaleScale;
-  float lalaMaleScale;
-  float lalaFemaleScale;
-  float miqoMaleScale;
-  float miqoFemaleScale;
-  float roeMaleScale;
-  float roeFemaleScale;
-  float auRaMaleScale;
-  float auRaFemaleScale;
   uint8_t hyurMaleCameraHeight;
   uint8_t hyurFemaleCameraHeight;
   uint8_t elezenMaleCameraHeight;
@@ -4436,7 +4463,6 @@ struct Quest
   uint8_t classJobCategory0;
   uint16_t classJobLevel0;
   uint8_t questLevelOffset;
-  uint16_t levelMax;
   uint8_t classJobCategory1;
   uint16_t classJobLevel1;
   uint8_t previousQuestJoin;
@@ -4455,6 +4481,7 @@ struct Quest
   uint16_t bellEnd;
   uint8_t beastTribe;
   uint8_t beastReputationRank;
+  uint16_t levelMax;
   int32_t mountRequired;
   bool isHouseRequired;
   uint8_t deliveryQuest;
@@ -4652,7 +4679,6 @@ struct Recipe
   uint16_t recipeLevelTable;
   int32_t itemResult;
   uint8_t amountResult;
-  uint8_t recipeElement;
   bool isSecondary;
   uint16_t difficultyFactor;
   uint16_t qualityFactor;
@@ -4673,20 +4699,13 @@ struct Recipe
   Recipe( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
 
-struct RecipeElement
-{
-  std::string name;
-
-  RecipeElement( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
-};
-
 struct RecipeLevelTable
 {
   uint8_t classJobLevel;
   uint8_t stars;
   uint16_t suggestedCraftsmanship;
   uint16_t difficulty;
-  int16_t quality;
+  uint32_t quality;
   uint16_t durability;
 
   RecipeLevelTable( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
@@ -5006,7 +5025,6 @@ struct SpecialShop
   std::vector< int32_t > achievementUnlock;
   std::vector< uint16_t > patchNumber;
   uint32_t questUnlock;
-  int32_t questShop;
   int32_t notCompleteText;
   int32_t completeText;
 
@@ -5232,6 +5250,7 @@ struct Transformation
   int32_t bNpcCustomize;
   int32_t npcEquip;
   std::vector< uint16_t > action;
+  uint8_t rPParameter;
   float speed;
   float scale;
   bool isPvP;
@@ -5239,7 +5258,6 @@ struct Transformation
   bool playerCamera;
   uint16_t startVFX;
   uint16_t endVFX;
-  uint8_t rPParameter;
 
   Transformation( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
@@ -5866,6 +5884,7 @@ struct ZoneSharedGroup
      xiv::exd::Exd m_GuardianDeityDat;
      xiv::exd::Exd m_GuildleveAssignmentDat;
      xiv::exd::Exd m_GuildleveAssignmentCategoryDat;
+     xiv::exd::Exd m_GuildOrderDat;
      xiv::exd::Exd m_GuildOrderGuideDat;
      xiv::exd::Exd m_GuildOrderOfficerDat;
      xiv::exd::Exd m_HairMakeTypeDat;
@@ -5993,7 +6012,6 @@ struct ZoneSharedGroup
      xiv::exd::Exd m_RacingChocoboParamDat;
      xiv::exd::Exd m_RecastNavimeshDat;
      xiv::exd::Exd m_RecipeDat;
-     xiv::exd::Exd m_RecipeElementDat;
      xiv::exd::Exd m_RecipeLevelTableDat;
      xiv::exd::Exd m_RecipeNotebookListDat;
      xiv::exd::Exd m_RecommendContentsDat;
@@ -6346,6 +6364,7 @@ struct ZoneSharedGroup
      using GuardianDeityPtr = std::shared_ptr< GuardianDeity >;
      using GuildleveAssignmentPtr = std::shared_ptr< GuildleveAssignment >;
      using GuildleveAssignmentCategoryPtr = std::shared_ptr< GuildleveAssignmentCategory >;
+     using GuildOrderPtr = std::shared_ptr< GuildOrder >;
      using GuildOrderGuidePtr = std::shared_ptr< GuildOrderGuide >;
      using GuildOrderOfficerPtr = std::shared_ptr< GuildOrderOfficer >;
      using HairMakeTypePtr = std::shared_ptr< HairMakeType >;
@@ -6473,7 +6492,6 @@ struct ZoneSharedGroup
      using RacingChocoboParamPtr = std::shared_ptr< RacingChocoboParam >;
      using RecastNavimeshPtr = std::shared_ptr< RecastNavimesh >;
      using RecipePtr = std::shared_ptr< Recipe >;
-     using RecipeElementPtr = std::shared_ptr< RecipeElement >;
      using RecipeLevelTablePtr = std::shared_ptr< RecipeLevelTable >;
      using RecipeNotebookListPtr = std::shared_ptr< RecipeNotebookList >;
      using RecommendContentsPtr = std::shared_ptr< RecommendContents >;
@@ -6826,6 +6844,7 @@ struct ZoneSharedGroup
      std::set< uint32_t > m_GuardianDeityIdList;
      std::set< uint32_t > m_GuildleveAssignmentIdList;
      std::set< uint32_t > m_GuildleveAssignmentCategoryIdList;
+     std::set< uint32_t > m_GuildOrderIdList;
      std::set< uint32_t > m_GuildOrderGuideIdList;
      std::set< uint32_t > m_GuildOrderOfficerIdList;
      std::set< uint32_t > m_HairMakeTypeIdList;
@@ -6953,7 +6972,6 @@ struct ZoneSharedGroup
      std::set< uint32_t > m_RacingChocoboParamIdList;
      std::set< uint32_t > m_RecastNavimeshIdList;
      std::set< uint32_t > m_RecipeIdList;
-     std::set< uint32_t > m_RecipeElementIdList;
      std::set< uint32_t > m_RecipeLevelTableIdList;
      std::set< uint32_t > m_RecipeNotebookListIdList;
      std::set< uint32_t > m_RecommendContentsIdList;
@@ -8606,6 +8624,12 @@ const std::set< uint32_t >& getGuildleveAssignmentCategoryIdList()
       loadIdList( m_GuildleveAssignmentCategoryDat, m_GuildleveAssignmentCategoryIdList );
    return m_GuildleveAssignmentCategoryIdList;
 }
+const std::set< uint32_t >& getGuildOrderIdList()
+{
+   if( m_GuildOrderIdList.size() == 0 )
+      loadIdList( m_GuildOrderDat, m_GuildOrderIdList );
+   return m_GuildOrderIdList;
+}
 const std::set< uint32_t >& getGuildOrderGuideIdList()
 {
    if( m_GuildOrderGuideIdList.size() == 0 )
@@ -9368,12 +9392,6 @@ const std::set< uint32_t >& getRecipeIdList()
       loadIdList( m_RecipeDat, m_RecipeIdList );
    return m_RecipeIdList;
 }
-const std::set< uint32_t >& getRecipeElementIdList()
-{
-   if( m_RecipeElementIdList.size() == 0 )
-      loadIdList( m_RecipeElementDat, m_RecipeElementIdList );
-   return m_RecipeElementIdList;
-}
 const std::set< uint32_t >& getRecipeLevelTableIdList()
 {
    if( m_RecipeLevelTableIdList.size() == 0 )

From 40a743c6af9085ade5d08e967d285689e6a3df3f Mon Sep 17 00:00:00 2001
From: NotAdam <adam@notadam.me>
Date: Fri, 28 Jun 2019 17:40:53 +1000
Subject: [PATCH 062/351] fix lobby encryption key

---
 src/lobby/GameConnection.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/lobby/GameConnection.cpp b/src/lobby/GameConnection.cpp
index f531f5c2..f90a4ff1 100644
--- a/src/lobby/GameConnection.cpp
+++ b/src/lobby/GameConnection.cpp
@@ -453,8 +453,8 @@ void Lobby::GameConnection::generateEncryptionKey( uint32_t key, const std::stri
   m_baseKey[ 2 ] = 0x34;
   m_baseKey[ 3 ] = 0x12;
   memcpy( m_baseKey + 0x04, &key, 4 );
-  m_baseKey[ 8 ] = 0xC6;
-  m_baseKey[ 9 ] = 0x11;
+  m_baseKey[ 8 ] = 0x88;
+  m_baseKey[ 9 ] = 0x13;
   memcpy( ( char* ) m_baseKey + 0x0C, keyPhrase.c_str(), keyPhrase.size() );
   Common::Util::md5( m_baseKey, m_encKey, 0x2C );
 }

From 62bd4666039100ee15bc0be556c54741d133457f Mon Sep 17 00:00:00 2001
From: NotAdam <adam@notadam.me>
Date: Fri, 28 Jun 2019 17:41:09 +1000
Subject: [PATCH 063/351] fix struct gen tool breaking after an update due to
 generated data being wrong

---
 src/tools/exd_struct_gen/main.cpp | 30 ++++++++++++++++++++----------
 1 file changed, 20 insertions(+), 10 deletions(-)

diff --git a/src/tools/exd_struct_gen/main.cpp b/src/tools/exd_struct_gen/main.cpp
index 7e0a3493..c418dd61 100644
--- a/src/tools/exd_struct_gen/main.cpp
+++ b/src/tools/exd_struct_gen/main.cpp
@@ -27,6 +27,9 @@ namespace fs = std::experimental::filesystem;
 Sapphire::Data::ExdDataGenerated g_exdData;
 bool skipUnmapped = true;
 
+std::shared_ptr< xiv::dat::GameData > m_data;
+std::shared_ptr< xiv::exd::ExdData > m_exd_data;
+
 std::map< char, std::string > numberToStringMap
   {
     { '0', "zero" },
@@ -83,7 +86,7 @@ std::string generateIdListGetter( const std::string& exd )
 
 std::string generateSetDatAccessCall( const std::string& exd )
 {
-  auto& cat = g_exdData.m_exd_data->get_category( exd );
+  auto& cat = m_exd_data->get_category( exd );
   auto exh = cat.get_header();
 
   std::string lang = "xiv::exd::Language::none";
@@ -110,7 +113,7 @@ std::map< std::string, std::string > nameTaken;
 
 std::string generateStruct( const std::string& exd )
 {
-  auto& cat = g_exdData.m_exd_data->get_category( exd );
+  auto& cat = m_exd_data->get_category( exd );
   auto exh = cat.get_header();
   auto exhMem = exh.get_exh_members();
 
@@ -261,7 +264,7 @@ std::string generateConstructorsDecl( const std::string& exd )
 {
   std::string result;
 
-  auto& cat = g_exdData.m_exd_data->get_category( exd );
+  auto& cat = m_exd_data->get_category( exd );
   auto exh = cat.get_header();
   auto exhMem = exh.get_exh_members();
 
@@ -355,11 +358,10 @@ int main( int argc, char** argv )
 
 
   Logger::info( "Setting up EXD data" );
-  if( !g_exdData.init( datLocation ) )
-  {
-    Logger::fatal( "Error setting up EXD data " );
-    return 0;
-  }
+
+  m_data = std::make_shared< xiv::dat::GameData >( datLocation );
+  m_exd_data = std::make_shared< xiv::exd::ExdData >( *m_data );
+
   Logger::info( "Generating structs, this may take several minutes..." );
   Logger::info( "Go grab a coffee..." );
 
@@ -385,6 +387,8 @@ int main( int argc, char** argv )
     return 1;
   }
 
+  auto& cats = m_exd_data->get_cat_names();
+
   uint32_t entryCount = 0;
   for( auto& entry : fs::directory_iterator( "./Definitions/" ) )
   {
@@ -393,10 +397,14 @@ int main( int argc, char** argv )
     if( path.extension() != ".json" )
       continue;
 
-    entryCount++;
-
     auto name = path.stem().string();
 
+    if( std::find( cats.begin(), cats.end(), name ) == cats.end() )
+    {
+      Logger::warn( "have definition for {} but the sheet doesn't exist", name );
+      continue;
+    }
+
     forwards += "struct " + name + ";\n";
     structDefs += generateStruct( name );
     dataDecl += generateDatAccessDecl( name );
@@ -405,6 +413,8 @@ int main( int argc, char** argv )
     datAccCall += generateSetDatAccessCall( name );
     constructorDecl += generateConstructorsDecl( name );
     idListGetters += generateIdListGetter( name );
+
+    entryCount++;
   }
 
   Logger::info( "Processed {} definition files, writing files...", entryCount );

From f8e74c7e0d41b22fd855e7072ede9b3f73217cbd Mon Sep 17 00:00:00 2001
From: NotAdam <adam@notadam.me>
Date: Fri, 28 Jun 2019 18:25:24 +1000
Subject: [PATCH 064/351] 5.0 opcodes: part 1

---
 src/common/Network/PacketDef/Ipcs.h | 64 ++++++++++++++---------------
 1 file changed, 32 insertions(+), 32 deletions(-)

diff --git a/src/common/Network/PacketDef/Ipcs.h b/src/common/Network/PacketDef/Ipcs.h
index 9979c9a9..a0c4df46 100644
--- a/src/common/Network/PacketDef/Ipcs.h
+++ b/src/common/Network/PacketDef/Ipcs.h
@@ -60,8 +60,8 @@ namespace Sapphire::Network::Packets
     ///////////////////////////////////////////////////
 
     ChatBanned = 0x006B,
-    Playtime = 0x006C, // updated 4.5
-    Logout = 0x0077, // updated 4.5
+    Playtime = 0x0100, // updated 5.0
+    Logout = 0x0077, // updated 5.0
     CFNotify = 0x0078,
     CFMemberStatus = 0x0079,
     CFDutyInfo = 0x007A,
@@ -77,20 +77,20 @@ namespace Sapphire::Network::Packets
 
     WorldVisitList = 0x00FE, // added 4.5
 
-    SocialList = 0x0103, // updated 4.5
+    SocialList = 0x010D, // updated 5.0
 
-    UpdateSearchInfo = 0x0106, // updated 4.5
-    InitSearchInfo = 0x0107, // updated 4.4
+    UpdateSearchInfo = 0x0110, // updated 5.0
+    InitSearchInfo = 0x0111, // updated 5.0
     ExamineSearchComment = 0x0102, // updated 4.1
 
-    ServerNoticeShort = 0x010B, // added 4.5
-    ServerNotice = 0x010C, // updated 4.5
-    SetOnlineStatus = 0x010D, // updated 4.5
+    ServerNoticeShort = 0x0115, // updated 5.0
+    ServerNotice = 0x0116, // updated 5.0
+    SetOnlineStatus = 0x0117, // updated 5.0
 
-    CountdownInitiate = 0x0114, // updated 4.5
-    CountdownCancel = 0x0115, // updated 4.5
+    CountdownInitiate = 0x011E, // updated 5.0
+    CountdownCancel = 0x011F, // updated 5.0
 
-    BlackList = 0x0118, // updated 4.5
+    BlackList = 0x0121, // updated 5.0
 
     LogMessage = 0x00D0,
 
@@ -121,27 +121,27 @@ namespace Sapphire::Network::Packets
 
     GCAffiliation = 0x0165, // updated 4.5
 
-    PlayerSpawn = 0x0175, // updated 4.5
-    NpcSpawn = 0x0176, // updated 4.5
-    NpcSpawn2 = 0x0177, // ( Bigger statuseffectlist? ) updated 4.5
-    ActorMove = 0x0178, // updated 4.5
+    PlayerSpawn = 0x017F, // updated 5.0
+    NpcSpawn = 0x0180, // updated 5.0
+    NpcSpawn2 = 0x0181, // ( Bigger statuseffectlist? ) updated 5.0
+    ActorMove = 0x0182, // updated 5.0
 
-    ActorSetPos = 0x017A, // updated 4.5
+    ActorSetPos = 0x0184, // updated 5.0
 
-    ActorCast = 0x017C, // updated 4.5
+    ActorCast = 0x0187, // updated 5.0
 
-    PartyList = 0x017E, // updated 4.5
-    HateRank = 0x017F, // updated 4.5
-    HateList = 0x0180, // updated 4.5
-    ObjectSpawn = 0x0181, // updated 4.5
-    ObjectDespawn = 0x0182, // updated 4.5
-    UpdateClassInfo = 0x0183, // updated 4.5
-    SilentSetClassJob = 0x0184, // updated 4.5 - seems to be the case, not sure if it's actually used for anything
-    PlayerSetup = 0x0185, // updated 4.5
-    PlayerStats = 0x0186, // updated 4.5
-    ActorOwner = 0x0187, // updated 4.5
-    PlayerStateFlags = 0x0188, // updated 4.5
-    PlayerClassInfo = 0x0189, // updated 4.5
+    PartyList = 0x0188, // updated 5.0
+    HateRank = 0x0189, // updated 5.0
+    HateList = 0x018A, // updated 5.0
+    ObjectSpawn = 0x018B, // updated 5.0
+    ObjectDespawn = 0x018C, // updated 5.0
+    UpdateClassInfo = 0x018D, // updated 5.0
+    SilentSetClassJob = 0x018E, // updated 5.0 - seems to be the case, not sure if it's actually used for anything
+    PlayerSetup = 0x018F, // updated 5.0
+    PlayerStats = 0x0190, // updated 5.0
+    ActorOwner = 0x0191, // updated 5.0
+    PlayerStateFlags = 0x0192, // updated 5.0
+    PlayerClassInfo = 0x0193, // updated 5.0
 
     ModelEquip = 0x018B, // updated 4.5
     Examine = 0x018C, // updated 4.5
@@ -149,12 +149,12 @@ namespace Sapphire::Network::Packets
 
     SetLevelSync = 0x1186, // not updated for 4.4, not sure what it is anymore
 
-    ItemInfo = 0x0196, // updated 4.5
-    ContainerInfo = 0x0197, // updated 4.5
+    ItemInfo = 0x01A1, // updated 5.0
+    ContainerInfo = 0x01A2, // updated 5.0
     InventoryTransactionFinish = 0x0198, // updated 4.5
     InventoryTransaction = 0x0199, // updated 4.5
 
-    CurrencyCrystalInfo = 0x019B, // updated 4.5
+    CurrencyCrystalInfo = 0x01A5, // updated 5.0
 
     InventoryActionAck = 0x019D, // updated 4.5
     UpdateInventorySlot = 0x019E, // updated 4.5

From bbc981d481a0bf7506768e3e872d539165d41b8f Mon Sep 17 00:00:00 2001
From: NotAdam <adam@notadam.me>
Date: Fri, 28 Jun 2019 18:35:26 +1000
Subject: [PATCH 065/351] enough to get ingame now

---
 src/common/Network/PacketDef/Ipcs.h | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/common/Network/PacketDef/Ipcs.h b/src/common/Network/PacketDef/Ipcs.h
index a0c4df46..9ae201af 100644
--- a/src/common/Network/PacketDef/Ipcs.h
+++ b/src/common/Network/PacketDef/Ipcs.h
@@ -159,11 +159,11 @@ namespace Sapphire::Network::Packets
     InventoryActionAck = 0x019D, // updated 4.5
     UpdateInventorySlot = 0x019E, // updated 4.5
 
-    HuntingLogEntry = 0x01A9, // added 4.5
+    HuntingLogEntry = 0x01B3, // updated 5.0
 
-    EventPlay = 0x01AB, // updated 4.5
-    DirectorPlayScene = 0x01AF, // updated 4.5
-    EventOpenGilShop = 0x01B2, // updated 4.5
+    EventPlay = 0x01B5, // updated 5.0
+    DirectorPlayScene = 0x01B9, // updated 5.0
+    EventOpenGilShop = 0x01BC, // updated 5.0
 
     EventStart = 0x01B4, // updated 4.5
     EventFinish = 0x01B5, // updated 4.5
@@ -233,8 +233,8 @@ namespace Sapphire::Network::Packets
 
     // Unknown IPC types that still need to be sent
     // TODO: figure all these out properly
-    IPCTYPE_UNK_320 = 0x0253, // updated 4.5
-    IPCTYPE_UNK_322 = 0x0255, // updated 4.5
+    IPCTYPE_UNK_320 = 0x025E, // updated 4.5
+    IPCTYPE_UNK_322 = 0x0260, // updated 4.5
 
     /// Doman Mahjong //////////////////////////////////////
     MahjongOpenGui = 0x02BC, // only available in mahjong instance

From b2b582fd92231daa2f0f03d30245119d3c7ad4e1 Mon Sep 17 00:00:00 2001
From: NotAdam <adam@notadam.me>
Date: Fri, 28 Jun 2019 20:21:58 +1000
Subject: [PATCH 066/351] add path arg to common gen, new common gen file

---
 src/common/CommonGen.h            | 49 +++++++++++++++++++++++--------
 src/tools/exd_common_gen/main.cpp | 15 ++++++----
 2 files changed, 47 insertions(+), 17 deletions(-)

diff --git a/src/common/CommonGen.h b/src/common/CommonGen.h
index 078efa3c..9b80d3f1 100644
--- a/src/common/CommonGen.h
+++ b/src/common/CommonGen.h
@@ -6,8 +6,7 @@
 /* This file has been automatically generated.
    Changes will be lost upon regeneration.
    To change the content edit tools/exd_common_gen */
-namespace Sapphire {
-namespace Common {
+namespace Sapphire::Common {
 
 ///////////////////////////////////////////////////////////
 //ActionCategory.exd
@@ -173,6 +172,8 @@ enum class ClassJob : uint8_t
   Samurai = 34,
   Redmage = 35,
   Bluemage = 36,
+  Gunbreaker = 37,
+  Dancer = 38,
 };
 
 ///////////////////////////////////////////////////////////
@@ -199,14 +200,10 @@ enum class ContentType : uint8_t
   DisciplesoftheHand = 17,
   RetainerVentures = 18,
   GoldSaucer = 19,
-  one = 20,
   DeepDungeons = 21,
-  two = 22,
-  three = 23,
   WondrousTails = 24,
   CustomDeliveries = 25,
   Eureka = 26,
-  four = 27,
 };
 
 ///////////////////////////////////////////////////////////
@@ -217,7 +214,6 @@ enum class EmoteCategory : uint8_t
   General = 1,
   Special = 2,
   Expressions = 3,
-  one = 4,
 };
 
 ///////////////////////////////////////////////////////////
@@ -227,7 +223,7 @@ enum class ExVersion : uint8_t
   ARealmReborn = 0,
   Heavensward = 1,
   Stormblood = 2,
-  three = 3,
+  Shadowbringers = 3,
 };
 
 ///////////////////////////////////////////////////////////
@@ -369,6 +365,8 @@ enum class ItemUICategory : uint8_t
   SubmersibleBow = 103,
   SubmersibleBridge = 104,
   BlueMagesArm = 105,
+  GunbreakersArm = 106,
+  DancersArm = 107,
 };
 
 ///////////////////////////////////////////////////////////
@@ -393,7 +391,7 @@ enum class ItemSearchCategory : uint8_t
   ConjurersArms = 15,
   ArcanistsArms = 16,
   Shields = 17,
-  ThrowingWeapons = 18,
+  DancersArms = 18,
   CarpentersTools = 19,
   BlacksmithsTools = 20,
   ArmorersTools = 21,
@@ -454,13 +452,15 @@ enum class ItemSearchCategory : uint8_t
   DarkKnightsArms = 76,
   MachinistsArms = 77,
   AstrologiansArms = 78,
-  Airship_SubmersibleComponents = 79,
+  AirshipSubmersibleComponents = 79,
   OrchestrionComponents = 80,
   GardeningItems = 81,
   Paintings = 82,
   SamuraisArms = 83,
   RedMagesArms = 84,
   ScholarsArms = 85,
+  GunbreakersArms = 86,
+  ThrowingWeapons = 87,
 };
 
 ///////////////////////////////////////////////////////////
@@ -527,6 +527,8 @@ enum class Race : uint8_t
   Miqote = 4,
   Roegadyn = 5,
   AuRa = 6,
+  Hrothgar = 7,
+  Viera = 8,
 };
 
 ///////////////////////////////////////////////////////////
@@ -546,6 +548,10 @@ enum class Tribe : uint8_t
   Hellsguard = 10,
   Raen = 11,
   Xaela = 12,
+  Helions = 13,
+  TheLost = 14,
+  Rava = 15,
+  Veena = 16,
 };
 
 ///////////////////////////////////////////////////////////
@@ -558,6 +564,7 @@ enum class Town : uint8_t
   Uldah = 3,
   Ishgard = 4,
   Kugane = 7,
+  TheCrystarium = 10,
 };
 
 ///////////////////////////////////////////////////////////
@@ -680,7 +687,21 @@ enum class Weather : uint8_t
   TrueBlue = 113,
   TrueBlue1 = 114,
   TrueBlue2 = 115,
+  UmbralTurbulence = 116,
   TrueBlue3 = 117,
+  EverlastingLight = 118,
+  Gales2 = 119,
+  Termination = 120,
+  Termination1 = 121,
+  Dreams = 122,
+  Dreams1 = 123,
+  Dreams2 = 124,
+  Brilliance = 125,
+  Brilliance1 = 126,
+  Termination2 = 127,
+  Termination3 = 128,
+  EverlastingLight1 = 129,
+  Termination4 = 131,
 };
 
 ///////////////////////////////////////////////////////////
@@ -695,7 +716,7 @@ enum class HousingAppeal : uint8_t
   Tavern = 5,
   Eatery = 6,
   ImmersiveExperience = 7,
-  Cafe = 8,
+  Café = 8,
   Aquarium = 9,
   Sanctum = 10,
   Venue = 11,
@@ -703,8 +724,12 @@ enum class HousingAppeal : uint8_t
   Library = 14,
   PhotoStudio = 15,
   HauntedHouse = 16,
+  Atelier = 17,
+  Bathhouse = 18,
+  Garden = 19,
+  FarEastern = 20,
 };
-}
+
 }
 #endif
 
diff --git a/src/tools/exd_common_gen/main.cpp b/src/tools/exd_common_gen/main.cpp
index 43a27473..768b53c4 100644
--- a/src/tools/exd_common_gen/main.cpp
+++ b/src/tools/exd_common_gen/main.cpp
@@ -21,7 +21,7 @@ Sapphire::Data::ExdDataGenerated g_exdData;
 using namespace Sapphire;
 
 //const std::string datLocation( "/opt/sapphire_3_15_0/bin/sqpack" );
-const std::string datLocation( "C:\\SquareEnix\\FINAL FANTASY XIV - A Realm Reborn\\game\\sqpack" );
+std::string datLocation( "C:\\SquareEnix\\FINAL FANTASY XIV - A Realm Reborn\\game\\sqpack" );
 
 std::string generateEnum( const std::string& exd, int8_t nameIndex, const std::string& type, bool useLang = true )
 {
@@ -86,13 +86,20 @@ std::string generateEnum( const std::string& exd, int8_t nameIndex, const std::s
 
 }
 
-int main()
+int main( int argc, char** argv )
 {
 
   Logger::init( "commongen" );
 
 
   Logger::info( "Setting up EXD data" );
+
+  if( argc > 1 )
+  {
+    Logger::info( "using dat path: {0}", std::string( argv[ 1 ] ) );
+    datLocation = std::string( argv[ 1 ] );
+  }
+
   if( !g_exdData.init( datLocation ) )
   {
     Logger::fatal( "Error setting up EXD data " );
@@ -107,8 +114,7 @@ int main()
     "/* This file has been automatically generated.\n   Changes will be lost upon regeneration.\n   To change the content edit tools/exd_common_gen */\n";
 
 
-  result += "namespace Sapphire {\n";
-  result += "namespace Common {\n";
+  result += "namespace Sapphire::Common {\n";
   result += generateEnum( "ActionCategory", 0, "uint8_t" );
   result += generateEnum( "BaseParam", 1, "uint8_t" );
   result += generateEnum( "BeastReputationRank", 1, "uint8_t" );
@@ -127,7 +133,6 @@ int main()
   result += generateEnum( "Town", 0, "uint8_t" );
   result += generateEnum( "Weather", 1, "uint8_t" );
   result += generateEnum( "HousingAppeal", 0, "uint8_t" );
-  result += "}\n";
   result += "}\n#endif\n";
   Logger::info( result );
   return 0;

From 93173e78b027cf8ea1c472f5db8fe6149e48fea7 Mon Sep 17 00:00:00 2001
From: NotAdam <adam@notadam.me>
Date: Fri, 28 Jun 2019 20:32:42 +1000
Subject: [PATCH 067/351] more opcodes

---
 src/common/CommonGen.h              |  2 +-
 src/common/Network/PacketDef/Ipcs.h | 70 +++++++++++++++++------------
 2 files changed, 42 insertions(+), 30 deletions(-)

diff --git a/src/common/CommonGen.h b/src/common/CommonGen.h
index 9b80d3f1..4833e57a 100644
--- a/src/common/CommonGen.h
+++ b/src/common/CommonGen.h
@@ -716,7 +716,7 @@ enum class HousingAppeal : uint8_t
   Tavern = 5,
   Eatery = 6,
   ImmersiveExperience = 7,
-  Café = 8,
+  Cafe = 8,
   Aquarium = 9,
   Sanctum = 10,
   Venue = 11,
diff --git a/src/common/Network/PacketDef/Ipcs.h b/src/common/Network/PacketDef/Ipcs.h
index 9ae201af..a1a17d1c 100644
--- a/src/common/Network/PacketDef/Ipcs.h
+++ b/src/common/Network/PacketDef/Ipcs.h
@@ -96,10 +96,21 @@ namespace Sapphire::Network::Packets
 
     LinkshellList = 0x011F, // updated 4.5
 
-    MailDeleteRequest = 0x0120, // updated 4.5
-    ReqMoogleMailList = 0x0121, // updated 4.5
-    ReqMoogleMailLetter = 0x0122, // updated 4.5
-    MailLetterNotification = 0x0123, // updated 4.5
+    MailDeleteRequest = 0x012B, // updated 5.0
+    // gap added in 5.0
+    //   0x12D
+    //   0x12E
+    //   0x12F
+    //   0x130
+    //   0x132
+    //   0x133
+    //   0x134
+    //   0x135
+    //   0x136
+    //   0x137
+    ReqMoogleMailList = 0x0138, // updated 5.0
+    ReqMoogleMailLetter = 0x0122, // unchanged 5.0???
+    MailLetterNotification = 0x0123, // unchanged 5.0???
 
     MarketBoardItemListingCount = 0x0125, // updated 4.5
     MarketBoardItemListing = 0x0126, // updated 4.5
@@ -111,15 +122,16 @@ namespace Sapphire::Network::Packets
     FreeCompanyInfo = 0x013D, // updated 4.5
     ExamineFreeCompanyInfo = 0x013E, // updated 4.5
 
-    StatusEffectList = 0x0151, // updated 4.5
-    Effect = 0x0154, // updated 4.5
-    AoeEffect8 = 0x0157, // updated 4.5
-    AoeEffect16 = 0x0158, // updated 4.5
-    AoeEffect24 = 0x0159, // updated 4.5
-    AoeEffect32 = 0x015A, // updated 4.5
-    PersistantEffect = 0x015B, // updated 4.5
+    StatusEffectList = 0x015B, // updated 5.0
+    EurekaStatusEffectList = 0x015C, // updated 5.0
+    Effect = 0x015E, // updated 5.0
+    AoeEffect8 = 0x0161, // updated 5.0
+    AoeEffect16 = 0x0162, // updated 5.0
+    AoeEffect24 = 0x0163, // updated 5.0
+    AoeEffect32 = 0x0164, // updated 5.0
+    PersistantEffect = 0x0165, // updated 5.0
 
-    GCAffiliation = 0x0165, // updated 4.5
+    GCAffiliation = 0x016F, // updated 5.0
 
     PlayerSpawn = 0x017F, // updated 5.0
     NpcSpawn = 0x0180, // updated 5.0
@@ -140,8 +152,8 @@ namespace Sapphire::Network::Packets
     PlayerSetup = 0x018F, // updated 5.0
     PlayerStats = 0x0190, // updated 5.0
     ActorOwner = 0x0191, // updated 5.0
-    PlayerStateFlags = 0x0192, // updated 5.0
-    PlayerClassInfo = 0x0193, // updated 5.0
+    PlayerStateFlags = 0x0193, // updated 5.0
+    PlayerClassInfo = 0x0194, // updated 5.0
 
     ModelEquip = 0x018B, // updated 4.5
     Examine = 0x018C, // updated 4.5
@@ -273,18 +285,18 @@ namespace Sapphire::Network::Packets
     SocialReqSendHandler = 0x00AE, // updated 4.1
     CreateCrossWorldLS = 0x00AF, // updated 4.3
 
-    ChatHandler = 0x00D7, // updated 4.5
+    ChatHandler = 0x00D9, // updated 5.0
 
-    SocialListHandler = 0x00DF, // updated 4.5
-    ReqSearchInfoHandler = 0x00E4, // updated 4.5
-    ReqExamineSearchCommentHandler = 0x00E5, // updated 4.5
+    SocialListHandler = 0x00E1, // updated 5.0
+    ReqSearchInfoHandler = 0x00E6, // updated 5.0
+    ReqExamineSearchCommentHandler = 0x00E7, // updated 5.0
 
-    SetSearchInfoHandler = 0x00E2, // unchanged 4.5
+    SetSearchInfoHandler = 0x00E4, // updated 5.0
 
-    BlackListHandler = 0x00F0, // updated 4.5
+    BlackListHandler = 0x00F2, // updated 5.0
     PlayerSearchHandler = 0x00E6, // updated 4.5
 
-    LinkshellListHandler = 0x00F8, // updated 4.5
+    LinkshellListHandler = 0x00FA, // updated 5.0
 
     MarketBoardRequestItemListingInfo = 0x0102, // updated 4.5
     MarketBoardRequestItemListings = 0x0103, // updated 4.5
@@ -302,18 +314,18 @@ namespace Sapphire::Network::Packets
     ReqCountdownCancel = 0x0134, // updated 4.5
     ClearWaymarks = 0x0135, // updated 4.5
 
-    ZoneLineHandler = 0x0137, // updated 4.5
-    ClientTrigger = 0x0138, // updated 4.5
-    DiscoveryHandler = 0x0139, // updated 4.5
+    ZoneLineHandler = 0x0139, // updated 5.0
+    ClientTrigger = 0x0140, // updated 5.0
+    DiscoveryHandler = 0x0141, // updated 5.0
 
     AddWaymark = 0x013A, // updated 4.5
 
-    SkillHandler = 0x013B, // updated 4.5
-    GMCommand1 = 0x013C, // updated 4.5
-    GMCommand2 = 0x013D, // updated 4.5
-    AoESkillHandler = 0x13E, // updated 4.5
+    SkillHandler = 0x013D, // updated 5.0
+    GMCommand1 = 0x013E, // updated 5.0
+    GMCommand2 = 0x013F, // updated 5.0
+    AoESkillHandler = 0x140, // updated 5.0
 
-    UpdatePositionHandler = 0x013F, // updated 4.5
+    UpdatePositionHandler = 0x0141, // updated 5.0
     UpdatePositionInstance = 0x0183, // updated 4.3
 
     InventoryModifyHandler = 0x0146, // updated 4.5 ( +4 )

From 4ec48641f51cf44de0d5d5373e00e5a429edf240 Mon Sep 17 00:00:00 2001
From: NotAdam <adam@notadam.me>
Date: Fri, 28 Jun 2019 21:06:23 +1000
Subject: [PATCH 068/351] fix client/server event opcodes

---
 src/common/Network/PacketDef/Ipcs.h | 46 ++++++++++++++---------------
 1 file changed, 23 insertions(+), 23 deletions(-)

diff --git a/src/common/Network/PacketDef/Ipcs.h b/src/common/Network/PacketDef/Ipcs.h
index a1a17d1c..95fe9ca8 100644
--- a/src/common/Network/PacketDef/Ipcs.h
+++ b/src/common/Network/PacketDef/Ipcs.h
@@ -151,7 +151,7 @@ namespace Sapphire::Network::Packets
     SilentSetClassJob = 0x018E, // updated 5.0 - seems to be the case, not sure if it's actually used for anything
     PlayerSetup = 0x018F, // updated 5.0
     PlayerStats = 0x0190, // updated 5.0
-    ActorOwner = 0x0191, // updated 5.0
+    ActorOwner = 0x0192, // updated 5.0
     PlayerStateFlags = 0x0193, // updated 5.0
     PlayerClassInfo = 0x0194, // updated 5.0
 
@@ -177,8 +177,8 @@ namespace Sapphire::Network::Packets
     DirectorPlayScene = 0x01B9, // updated 5.0
     EventOpenGilShop = 0x01BC, // updated 5.0
 
-    EventStart = 0x01B4, // updated 4.5
-    EventFinish = 0x01B5, // updated 4.5
+    EventStart = 0x01BE, // updated 5.0
+    EventFinish = 0x01BF, // updated 5.0
 
     EventLinkshell = 0x1169,
 
@@ -201,9 +201,9 @@ namespace Sapphire::Network::Packets
 
     CFAvailableContents = 0xF1FD, // updated 4.2
 
-    WeatherChange = 0x0205, // updated 4.5
-    PlayerTitleList = 0x0206, // updated 4.5?
-    Discovery = 0x0207, // updated 4.5?
+    WeatherChange = 0x0210, // updated 5.0
+    PlayerTitleList = 0x0211, // updated 5.0
+    Discovery = 0x0212, // updated 5.0
 
     EorzeaTimeOffset = 0x0209, // updated 4.5
 
@@ -328,34 +328,34 @@ namespace Sapphire::Network::Packets
     UpdatePositionHandler = 0x0141, // updated 5.0
     UpdatePositionInstance = 0x0183, // updated 4.3
 
-    InventoryModifyHandler = 0x0146, // updated 4.5 ( +4 )
+    InventoryModifyHandler = 0x0148, // updated 5.0
 
-    ReqPlaceHousingItem = 0x149, // updated 4.5
+    ReqPlaceHousingItem = 0x014B, // updated 5.0
+    BuildPresetHandler = 0x014F, // updated 5.0
 
-    BuildPresetHandler = 0x014E, // updated 4.5
-    TalkEventHandler = 0x014F, // updated 4.5
-    EmoteEventHandler = 0x0150, // updated 4.5
-    WithinRangeEventHandler = 0x0151, // updated 4.5
-    OutOfRangeEventHandler = 0x0152, // updated 4.5
-    EnterTeriEventHandler = 0x0153, // updated 4.5
+    TalkEventHandler = 0x0151, // updated 5.0
+    EmoteEventHandler = 0x0152, // updated 5.0
+    WithinRangeEventHandler = 0x0153, // updated 5.0
+    OutOfRangeEventHandler = 0x0154, // updated 5.0
+    EnterTeriEventHandler = 0x0155, // updated 5.0
+    ShopEventHandler = 0x0156, // updated 5.0
 
-    ShopEventHandler = 0x0155, // updated 4.5
-
-    ReturnEventHandler = 0x0158, // updated 4.5
-    TradeReturnEventHandler = 0x0159, // updated 4.5
+    ReturnEventHandler = 0x015A, // updated 5.0?
+    TradeReturnEventHandler = 0x015B, // updated 5.0?
 
     LinkshellEventHandler = 0x016B, // updated 4.5
     LinkshellEventHandler1 = 0x016C, // updated 4.5
 
-    LandRenameHandler = 0x0175, // updated 4.5
-    HousingUpdateHouseGreeting = 0x0176, // updated 4.5
-    HousingUpdateObjectPosition = 0x0177, // updated 4.5
+    ReqEquipDisplayFlagsChange = 0x0175, // updated 5.0
 
-    SetSharedEstateSettings = 0x017B, // updated 4.5
+    LandRenameHandler = 0x0177, // updated 5.0
+    HousingUpdateHouseGreeting = 0x0178, // updated 5.0
+    HousingUpdateObjectPosition = 0x0179, // updated 5.0
+
+    SetSharedEstateSettings = 0x017B, // updated 5.0
 
     PerformNoteHandler = 0x029B, // updated 4.3
 
-    ReqEquipDisplayFlagsChange = 0x0173, // updated 4.5
 
 
   };

From 64be2964c94f82781d5bfeea21c7a536c885bc37 Mon Sep 17 00:00:00 2001
From: NotAdam <adam@notadam.me>
Date: Fri, 28 Jun 2019 21:15:22 +1000
Subject: [PATCH 069/351] quest/housing related opcode fixes

---
 src/common/Network/PacketDef/Ipcs.h | 54 ++++++++++++++---------------
 1 file changed, 27 insertions(+), 27 deletions(-)

diff --git a/src/common/Network/PacketDef/Ipcs.h b/src/common/Network/PacketDef/Ipcs.h
index 95fe9ca8..05da10e8 100644
--- a/src/common/Network/PacketDef/Ipcs.h
+++ b/src/common/Network/PacketDef/Ipcs.h
@@ -182,22 +182,22 @@ namespace Sapphire::Network::Packets
 
     EventLinkshell = 0x1169,
 
-    QuestActiveList = 0x01C8, // updated 4.5
-    QuestUpdate = 0x01C9, // updated 4.5
-    QuestCompleteList = 0x01CA, // updated 4.5
+    QuestActiveList = 0x01D2, // updated 5.0
+    QuestUpdate = 0x01D3, // updated 5.0
+    QuestCompleteList = 0x01D4, // updated 5.0
 
-    QuestFinish = 0x01CB, // updated 4.5
-    MSQTrackerComplete = 0x01CC, // updated 4.5
+    QuestFinish = 0x01D5, // updated 5.0
+    MSQTrackerComplete = 0x01D6, // updated 5.0
     MSQTrackerProgress = 0xF1CD, // updated 4.5 ? this actually looks like the two opcodes have been combined, see #474
 
-    QuestMessage = 0x01D3, // updated 4.5
+    QuestMessage = 0x01DE, // updated 5.0
 
-    QuestTracker = 0x01D8, // updated 4.5
+    QuestTracker = 0x01E3, // updated 5.0
 
-    Mount = 0x01E8, // updated 4.5
+    Mount = 0x01F3, // updated 5.0
 
-    DirectorVars = 0x01EA, // updated 4.5
-    DirectorPopUp = 0x01F5, // display dialogue pop-ups in duties and FATEs, for example, Teraflare's countdown
+    DirectorVars = 0x01F5, // updated 5.0
+    DirectorPopUp = 0x0200, // updated 5.0 - display dialogue pop-ups in duties and FATEs, for example, Teraflare's countdown
 
     CFAvailableContents = 0xF1FD, // updated 4.2
 
@@ -205,29 +205,29 @@ namespace Sapphire::Network::Packets
     PlayerTitleList = 0x0211, // updated 5.0
     Discovery = 0x0212, // updated 5.0
 
-    EorzeaTimeOffset = 0x0209, // updated 4.5
+    EorzeaTimeOffset = 0x0214, // updated 5.0
 
-    EquipDisplayFlags = 0x0215, // updated 4.5
+    EquipDisplayFlags = 0x0220, // updated 5.0
 
     /// Housing //////////////////////////////////////
 
-    LandSetInitialize = 0x0229, // updated 4.5
-    LandUpdate = 0x022A, // updated 4.5
-    YardObjectSpawn = 0x022B, // updated 4.5
-    HousingIndoorInitialize = 0x022C, // updated 4.5
-    LandPriceUpdate = 0x022D, // updated 4.5
-    LandInfoSign = 0x022E, // updated 4.5
-    LandRename = 0x022F, // updated 4.5
-    HousingEstateGreeting = 0x0230, // updated 4.5
-    HousingUpdateLandFlagsSlot = 0x0231, // updated 4.5
-    HousingLandFlags = 0x0232, // updated 4.5
-    HousingShowEstateGuestAccess = 0x0233, // updated 4.5
+    LandSetInitialize = 0x0234, // updated 5.0
+    LandUpdate = 0x0235, // updated 5.0
+    YardObjectSpawn = 0x0236, // updated 5.0
+    HousingIndoorInitialize = 0x0237, // updated 5.0
+    LandPriceUpdate = 0x0238, // updated 5.0
+    LandInfoSign = 0x0239, // updated 5.0
+    LandRename = 0x023A, // updated 5.0
+    HousingEstateGreeting = 0x023B, // updated 5.0
+    HousingUpdateLandFlagsSlot = 0x023C, // updated 5.0
+    HousingLandFlags = 0x023D, // updated 5.0
+    HousingShowEstateGuestAccess = 0x023E, // updated 5.0
 
-    HousingObjectInitialize = 0x0235, // updated 4.45
-    HousingInternalObjectSpawn = 0x236, // updated 4.5
+    HousingObjectInitialize = 0x0240, // updated 5.0
+    HousingInternalObjectSpawn = 0x241, // updated 5.0
 
-    HousingWardInfo = 0x0238, // updated 4.5
-    HousingObjectMove = 0x0239, // updated 4.5
+    HousingWardInfo = 0x0243, // updated 5.0
+    HousingObjectMove = 0x0244, // updated 5.0
 
     SharedEstateSettingsResponse = 0x0245, // updated 4.5
 

From 324f1bd000e0796547bb0414ac838c859d67124b Mon Sep 17 00:00:00 2001
From: NotAdam <adam@notadam.me>
Date: Fri, 28 Jun 2019 21:27:53 +1000
Subject: [PATCH 070/351] fix modelequip, examine, etc

---
 src/common/Network/PacketDef/Ipcs.h | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/common/Network/PacketDef/Ipcs.h b/src/common/Network/PacketDef/Ipcs.h
index 05da10e8..c88ea182 100644
--- a/src/common/Network/PacketDef/Ipcs.h
+++ b/src/common/Network/PacketDef/Ipcs.h
@@ -155,9 +155,9 @@ namespace Sapphire::Network::Packets
     PlayerStateFlags = 0x0193, // updated 5.0
     PlayerClassInfo = 0x0194, // updated 5.0
 
-    ModelEquip = 0x018B, // updated 4.5
-    Examine = 0x018C, // updated 4.5
-    CharaNameReq = 0x018D, // updated 4.5
+    ModelEquip = 0x0196, // updated 5.0
+    Examine = 0x0197, // updated 5.0
+    CharaNameReq = 0x0198, // updated 5.0
 
     SetLevelSync = 0x1186, // not updated for 4.4, not sure what it is anymore
 

From a2a5a6bd6912e42d9b8aab37d05ad49917bcdeb8 Mon Sep 17 00:00:00 2001
From: NotAdam <adam@notadam.me>
Date: Fri, 28 Jun 2019 21:58:26 +1000
Subject: [PATCH 071/351] fix my inability to count in hexadecimal, in turn
 breaking everything

---
 src/common/Network/PacketDef/Ipcs.h | 28 ++++++++++++++--------------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/src/common/Network/PacketDef/Ipcs.h b/src/common/Network/PacketDef/Ipcs.h
index c88ea182..7f45fcb5 100644
--- a/src/common/Network/PacketDef/Ipcs.h
+++ b/src/common/Network/PacketDef/Ipcs.h
@@ -94,20 +94,20 @@ namespace Sapphire::Network::Packets
 
     LogMessage = 0x00D0,
 
-    LinkshellList = 0x011F, // updated 4.5
+    LinkshellList = 0x012A, // updated 5.0
 
     MailDeleteRequest = 0x012B, // updated 5.0
-    // gap added in 5.0
-    //   0x12D
-    //   0x12E
-    //   0x12F
-    //   0x130
-    //   0x132
-    //   0x133
-    //   0x134
-    //   0x135
-    //   0x136
-    //   0x137
+    // gap added in 5.0 - reshuffled from somewhere else?
+    //   0x012D
+    //   0x012E
+    //   0x012F
+    //   0x0130
+    //   0x0132
+    //   0x0133
+    //   0x0134
+    //   0x0135
+    //   0x0136
+    //   0x0137
     ReqMoogleMailList = 0x0138, // updated 5.0
     ReqMoogleMailLetter = 0x0122, // unchanged 5.0???
     MailLetterNotification = 0x0123, // unchanged 5.0???
@@ -315,8 +315,8 @@ namespace Sapphire::Network::Packets
     ClearWaymarks = 0x0135, // updated 4.5
 
     ZoneLineHandler = 0x0139, // updated 5.0
-    ClientTrigger = 0x0140, // updated 5.0
-    DiscoveryHandler = 0x0141, // updated 5.0
+    ClientTrigger = 0x013A, // updated 5.0
+    DiscoveryHandler = 0x013B, // updated 5.0
 
     AddWaymark = 0x013A, // updated 4.5
 

From 4aa8971195842fb5d59cfd2b6744e0c2ec56120c Mon Sep 17 00:00:00 2001
From: NotAdam <adam@notadam.me>
Date: Fri, 28 Jun 2019 22:49:42 +1000
Subject: [PATCH 072/351] fixed chat packet, may you be blessed by working
 debug messages

---
 src/common/Network/PacketDef/Ipcs.h | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/common/Network/PacketDef/Ipcs.h b/src/common/Network/PacketDef/Ipcs.h
index 7f45fcb5..1fa89fae 100644
--- a/src/common/Network/PacketDef/Ipcs.h
+++ b/src/common/Network/PacketDef/Ipcs.h
@@ -73,7 +73,7 @@ namespace Sapphire::Network::Packets
     SocialRequestResponse = 0x00BB, // updated 4.1
     CancelAllianceForming = 0x00C6, // updated 4.2
 
-    Chat = 0x00F7, // updated 4.5?
+    Chat = 0x0104, // updated 5.0
 
     WorldVisitList = 0x00FE, // added 4.5
 
@@ -288,11 +288,10 @@ namespace Sapphire::Network::Packets
     ChatHandler = 0x00D9, // updated 5.0
 
     SocialListHandler = 0x00E1, // updated 5.0
+    SetSearchInfoHandler = 0x00E4, // updated 5.0
     ReqSearchInfoHandler = 0x00E6, // updated 5.0
     ReqExamineSearchCommentHandler = 0x00E7, // updated 5.0
 
-    SetSearchInfoHandler = 0x00E4, // updated 5.0
-
     BlackListHandler = 0x00F2, // updated 5.0
     PlayerSearchHandler = 0x00E6, // updated 4.5
 

From 11bbb6d830887c25268a6f0e5558d80728070644 Mon Sep 17 00:00:00 2001
From: NotAdam <adam@notadam.me>
Date: Sun, 30 Jun 2019 18:32:44 +1000
Subject: [PATCH 073/351] fix a bunch of playersetup

---
 src/common/Network/PacketDef/Ipcs.h           | 12 +----------
 .../Network/PacketDef/Zone/ServerZoneDef.h    | 21 ++++++++++---------
 2 files changed, 12 insertions(+), 21 deletions(-)

diff --git a/src/common/Network/PacketDef/Ipcs.h b/src/common/Network/PacketDef/Ipcs.h
index 1fa89fae..754b1bf4 100644
--- a/src/common/Network/PacketDef/Ipcs.h
+++ b/src/common/Network/PacketDef/Ipcs.h
@@ -97,17 +97,7 @@ namespace Sapphire::Network::Packets
     LinkshellList = 0x012A, // updated 5.0
 
     MailDeleteRequest = 0x012B, // updated 5.0
-    // gap added in 5.0 - reshuffled from somewhere else?
-    //   0x012D
-    //   0x012E
-    //   0x012F
-    //   0x0130
-    //   0x0132
-    //   0x0133
-    //   0x0134
-    //   0x0135
-    //   0x0136
-    //   0x0137
+    // 12D - 137 - constant gap between 4.5x -> 5.0
     ReqMoogleMailList = 0x0138, // updated 5.0
     ReqMoogleMailLetter = 0x0122, // unchanged 5.0???
     MailLetterNotification = 0x0123, // unchanged 5.0???
diff --git a/src/common/Network/PacketDef/Zone/ServerZoneDef.h b/src/common/Network/PacketDef/Zone/ServerZoneDef.h
index dc93c0f0..bc188779 100644
--- a/src/common/Network/PacketDef/Zone/ServerZoneDef.h
+++ b/src/common/Network/PacketDef/Zone/ServerZoneDef.h
@@ -841,8 +841,9 @@ namespace Sapphire::Network::Packets::Server
     unsigned char namedayMonth;
     unsigned char namedayDay;
     unsigned char cityState;
+    unsigned char unknown80;
     unsigned char homepoint;
-    unsigned char unknown81;
+    unsigned char unknown82;
     unsigned char petHotBar;
     unsigned char companionRank;
     unsigned char companionStars;
@@ -856,16 +857,16 @@ namespace Sapphire::Network::Packets::Server
     unsigned char relicBookId;
     unsigned char unknown90[4];
     unsigned char craftingMasterMask;
-    unsigned char unknown95[10];
+    unsigned char unknown95[9];
     unsigned char unknown9F[2];
     unsigned char unknownA1[3];
-    unsigned int exp[26];
+    unsigned int exp[28];
     unsigned int unknown108;
     unsigned int pvpTotalExp;
     unsigned int unknownPvp110;
     unsigned int pvpExp;
     unsigned int pvpFrontlineOverallRanks[3];
-    unsigned short levels[26];
+    unsigned short levels[28];
     unsigned short unknown15C[9];
     unsigned short u1;
     unsigned short u2;
@@ -880,17 +881,17 @@ namespace Sapphire::Network::Packets::Server
     unsigned char companionAttRank;
     unsigned char companionHealRank;
     unsigned char u19[2];
-    unsigned char mountGuideMask[17];
+    unsigned char mountGuideMask[19];
     char name[32];
     unsigned char unknownOword[16];
     unsigned char unknownOw;
     unsigned char unlockBitmask[64];
-    unsigned char aetheryte[17];
-    unsigned char discovery[421];
+    unsigned char aetheryte[21];
+    unsigned char discovery[445];
     unsigned char howto[34];
-    unsigned char minions[42];
-    unsigned char chocoboTaxiMask[8];
-    unsigned char watchedCutscenes[118];
+    unsigned char minions[45];
+    unsigned char chocoboTaxiMask[10];
+    unsigned char watchedCutscenes[124];
     unsigned char companionBardingMask[9];
     unsigned char companionEquippedHead;
     unsigned char companionEquippedBody;

From 050465bd732fb5f32c77968a964906d3bc845191 Mon Sep 17 00:00:00 2001
From: NotAdam <adam@notadam.me>
Date: Sun, 30 Jun 2019 18:59:11 +1000
Subject: [PATCH 074/351] fix a bunch more playersetup masks

---
 src/common/Network/PacketDef/Zone/ServerZoneDef.h | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/common/Network/PacketDef/Zone/ServerZoneDef.h b/src/common/Network/PacketDef/Zone/ServerZoneDef.h
index bc188779..200e0907 100644
--- a/src/common/Network/PacketDef/Zone/ServerZoneDef.h
+++ b/src/common/Network/PacketDef/Zone/ServerZoneDef.h
@@ -835,13 +835,13 @@ namespace Sapphire::Network::Packets::Server
     unsigned char race;
     unsigned char tribe;
     unsigned char gender;
+    unsigned char unknown7A;
     unsigned char currentJob;
     unsigned char currentClass;
     unsigned char deity;
     unsigned char namedayMonth;
     unsigned char namedayDay;
     unsigned char cityState;
-    unsigned char unknown80;
     unsigned char homepoint;
     unsigned char unknown82;
     unsigned char petHotBar;
@@ -892,21 +892,21 @@ namespace Sapphire::Network::Packets::Server
     unsigned char minions[45];
     unsigned char chocoboTaxiMask[10];
     unsigned char watchedCutscenes[124];
-    unsigned char companionBardingMask[9];
+    unsigned char companionBardingMask[10];
     unsigned char companionEquippedHead;
     unsigned char companionEquippedBody;
     unsigned char companionEquippedLegs;
     unsigned char unknown52A[4];
     unsigned char unknownMask52E[11];
-    unsigned char fishingGuideMask[89];
-    unsigned char fishingSpotVisited[25];
-    unsigned char unknown59A[15];
-    unsigned char unknown5A9[5];
+    unsigned char fishingGuideMask[105];
+    unsigned char fishingSpotVisited[31];
+    unsigned char unknown59A[27];
+    unsigned char unknown5A9[7];
     unsigned char beastRank[11];
     unsigned char unknownPvp5AB[11];
     unsigned char unknown5B9[5];
-    unsigned char unknown5B91;
     unsigned char pose;
+    unsigned char unknown5B91;
     unsigned char challengeLogComplete[9];
     unsigned char weaponPose;
     unsigned char unknownMask673[10];

From 0efcfefa8c56f312f58bc6e2caf908bbd0099da7 Mon Sep 17 00:00:00 2001
From: NotAdam <adam@notadam.me>
Date: Sun, 30 Jun 2019 19:51:18 +1000
Subject: [PATCH 075/351] cap level to 80, enable shadowbringers, new mp calc

---
 src/common/Common.h                           |   3 +
 src/world/Action/Action.cpp                   |   2 +-
 src/world/Actor/Player.cpp                    |   2 +-
 src/world/Math/CalcStats.cpp                  | 100 +++---------------
 src/world/Math/CalcStats.h                    |   9 --
 .../PacketWrappers/PlayerSetupPacket.h        |   4 +-
 6 files changed, 23 insertions(+), 97 deletions(-)

diff --git a/src/common/Common.h b/src/common/Common.h
index 5965228f..05463273 100644
--- a/src/common/Common.h
+++ b/src/common/Common.h
@@ -21,6 +21,9 @@ namespace Sapphire::Common
   const int32_t INVALID_GAME_OBJECT_ID = 0xE0000000;
   const uint64_t INVALID_GAME_OBJECT_ID64 = 0xE0000000;
 
+  const uint16_t MAX_PLAYER_LEVEL = 80;
+  const uint8_t CURRENT_EXPANSION_ID = 3;
+
   /*!
    * @brief The maximum length (in ms) of a combo before it is canceled/voided.
    *
diff --git a/src/world/Action/Action.cpp b/src/world/Action/Action.cpp
index e4d67f4d..ba1665d0 100644
--- a/src/world/Action/Action.cpp
+++ b/src/world/Action/Action.cpp
@@ -466,7 +466,7 @@ bool Action::Action::primaryCostCheck( bool subtractCosts )
     {
       auto curMp = m_pSource->getMp();
 
-      auto cost = Math::CalcStats::calculateMpCost( *m_pSource, m_primaryCost );
+      auto cost = m_primaryCost * 100;
 
       if( curMp < cost )
         return false;
diff --git a/src/world/Actor/Player.cpp b/src/world/Actor/Player.cpp
index adab91ab..f51d4eb0 100644
--- a/src/world/Actor/Player.cpp
+++ b/src/world/Actor/Player.cpp
@@ -695,7 +695,7 @@ void Sapphire::Entity::Player::gainExp( uint32_t amount )
 
   queuePacket( makeActorControl143( getId(), GainExpMsg, static_cast< uint8_t >( getClass() ), amount ) );
 
-  if( level >= 70 ) // temporary fix for leveling over levelcap
+  if( level >= Common::MAX_PLAYER_LEVEL ) // temporary fix for leveling over levelcap
   {
     queuePacket( makeActorControl143( getId(), UpdateUiExp, static_cast< uint8_t >( getClass() ), amount ) );
     return;
diff --git a/src/world/Math/CalcStats.cpp b/src/world/Math/CalcStats.cpp
index b455b48a..f3cbc566 100644
--- a/src/world/Math/CalcStats.cpp
+++ b/src/world/Math/CalcStats.cpp
@@ -15,7 +15,7 @@
 using namespace Sapphire::Math;
 using namespace Sapphire::Entity;
 
-const int levelTable[71][7] =
+const int levelTable[81][7] =
 { 
 // PIE, MP, MAIN,SUB,DIV,HP,ELMT,THREAT
   { 1, 1, 1, 1, 1, 1, 1 },
@@ -88,7 +88,19 @@ const int levelTable[71][7] =
   { 830, 10560, 268, 361, 1643, 3300, 292 },
   { 860, 10980, 276, 362, 1802, 3400, 293 },
   { 890, 11450, 284, 363, 1978, 3500, 294 },
-  { 890, 12000, 292, 364, 2170, 3600, 295 } 
+  { 890, 12000, 292, 364, 2170, 3600, 295 },
+
+  // todo: add proper shbr values
+  { 890, 12000, 292, 364, 2170, 3600, 295 },
+  { 890, 12000, 292, 364, 2170, 3600, 295 },
+  { 890, 12000, 292, 364, 2170, 3600, 295 },
+  { 890, 12000, 292, 364, 2170, 3600, 295 },
+  { 890, 12000, 292, 364, 2170, 3600, 295 },
+  { 890, 12000, 292, 364, 2170, 3600, 295 },
+  { 890, 12000, 292, 364, 2170, 3600, 295 },
+  { 890, 12000, 292, 364, 2170, 3600, 295 },
+  { 890, 12000, 292, 364, 2170, 3600, 295 },
+  { 890, 12000, 292, 364, 2170, 3600, 295 },
 };
 
 /*
@@ -115,8 +127,8 @@ float CalcStats::calculateBaseStat( const Chara& chara )
   float base = 0.0f;
   uint8_t level = chara.getLevel();
 
-  if( level > 70 )
-    level = 70;
+  if( level > Common::MAX_PLAYER_LEVEL )
+    level = Common::MAX_PLAYER_LEVEL;
 
   return static_cast< float >( levelTable[level][2] );
 }
@@ -187,86 +199,6 @@ uint32_t CalcStats::calculateMaxMp( PlayerPtr pPlayer, Sapphire::FrameworkPtr pF
   return result;
 }
 
-uint16_t CalcStats::calculateMpCost( const Sapphire::Entity::Chara& chara, uint16_t baseCost )
-{
-  auto level = chara.getLevel();
-
-  // each level range is 1-10, 11-20, 21-30, ... therefore:
-  // level 50 should be in the 4th group, not the 5t
-  // dividing by 10 on the border will break this unless we subtract 1
-  auto levelGroup = std::max< uint8_t >( level - 1, 1 ) / 10;
-
-  float cost = baseCost;
-
-  // thanks to andrew for helping me figure this shit out
-  // played with this some more and it seems to be accurate for everything i've tried
-  switch( levelGroup )
-  {
-    // level 1-10
-    case 0:
-    {
-      // r^2 = 0.9999
-      cost = 0.0952f * level + 0.9467f;
-      break;
-    }
-
-    // level 11-20
-    case 1:
-    {
-      // r^2 = 1
-      cost = 0.19f * level;
-      break;
-    }
-
-    // level 21-30
-    case 2:
-    {
-      // r^2 = 1
-      cost = 0.38f * level - 3.8f;
-      break;
-    }
-
-    // level 31-40
-    case 3:
-    {
-      // r^2 = 1
-      cost = 0.6652f * level - 12.358f;
-      break;
-    }
-
-    // level 41-50
-    case 4:
-    {
-      // r^2 = 1
-      cost = 1.2352f * level - 35.159f;
-      break;
-    }
-
-    // level 51-60
-    case 5:
-    {
-      // r^2 = 1
-      cost = 0.0654f * std::exp( 0.1201f * level );
-      break;
-    }
-
-    // level 61-70
-    case 6:
-    {
-      // r^2 = 0.9998
-      cost = 0.2313f * ( level * level ) - 26.98f * level + 875.21f;
-      break;
-    }
-
-    default:
-    {
-      return 0;
-    }
-  }
-
-  return static_cast< uint16_t >( std::round( cost * baseCost ) );
-}
-
 float CalcStats::blockProbability( const Chara& chara )
 {
   auto level = chara.getLevel();
diff --git a/src/world/Math/CalcStats.h b/src/world/Math/CalcStats.h
index 92402124..ad8a086f 100644
--- a/src/world/Math/CalcStats.h
+++ b/src/world/Math/CalcStats.h
@@ -19,15 +19,6 @@ namespace Sapphire::Math
 
     static uint32_t calculateMaxHp( Sapphire::Entity::PlayerPtr pPlayer, FrameworkPtr pFw  );
 
-    /*!
-     * @brief Calculates the MP cost of a spell given its base cost
-     *
-     * @param chara The Chara that is casting the action
-     * @param baseCost The action cost
-     * @return The total MP to be consumed by a successful cast
-     */
-    static uint16_t calculateMpCost( const Sapphire::Entity::Chara& chara, uint16_t baseCost );
-
     /*!
      * @brief Calculates the probability of a block happening
      */
diff --git a/src/world/Network/PacketWrappers/PlayerSetupPacket.h b/src/world/Network/PacketWrappers/PlayerSetupPacket.h
index bc2ca1e0..2424e651 100644
--- a/src/world/Network/PacketWrappers/PlayerSetupPacket.h
+++ b/src/world/Network/PacketWrappers/PlayerSetupPacket.h
@@ -71,8 +71,8 @@ namespace Sapphire::Network::Packets::Server
       memcpy( m_data.howto, player.getHowToArray(), sizeof( m_data.howto ) );
 
       // possibly max level or current level
-      m_data.maxLevel = 0x46;
-      m_data.expansion = 2;
+      m_data.maxLevel = Common::MAX_PLAYER_LEVEL;
+      m_data.expansion = Common::CURRENT_EXPANSION_ID;
 
       // df stuff
       // todo: actually do this properly

From 9e862b022c7d9192426573179a9d13dffccd3901 Mon Sep 17 00:00:00 2001
From: NotAdam <adam@notadam.me>
Date: Sun, 30 Jun 2019 20:05:58 +1000
Subject: [PATCH 076/351] #565: add cancel logout opcode

---
 src/common/Network/PacketDef/Ipcs.h | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/common/Network/PacketDef/Ipcs.h b/src/common/Network/PacketDef/Ipcs.h
index 754b1bf4..ae64deb3 100644
--- a/src/common/Network/PacketDef/Ipcs.h
+++ b/src/common/Network/PacketDef/Ipcs.h
@@ -269,6 +269,7 @@ namespace Sapphire::Network::Packets
     CFRegisterRoulette = 0x0072,
     PlayTimeHandler = 0x0073, // unchanged 4.5
     LogoutHandler = 0x0074, // unchanged 4.5
+    CancelLogout = 0x0075, // updated 5.0
 
     CFDutyInfoHandler = 0x0078, // updated 4.2
 

From eefc9ab7a7fddc27d9a3ca52735cb4c40f47260d Mon Sep 17 00:00:00 2001
From: NotAdam <adam@notadam.me>
Date: Sun, 30 Jun 2019 20:06:14 +1000
Subject: [PATCH 077/351] more client opcode updates

---
 src/common/Network/PacketDef/Ipcs.h | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/src/common/Network/PacketDef/Ipcs.h b/src/common/Network/PacketDef/Ipcs.h
index ae64deb3..24126682 100644
--- a/src/common/Network/PacketDef/Ipcs.h
+++ b/src/common/Network/PacketDef/Ipcs.h
@@ -257,18 +257,18 @@ namespace Sapphire::Network::Packets
   enum ClientZoneIpcType : uint16_t
   {
 
-    PingHandler = 0x0065, // unchanged 4.5
-    InitHandler = 0x0066, // unchanged 4.5
+    PingHandler = 0x0065, // unchanged 5.0
+    InitHandler = 0x0066, // unchanged 5.0
 
-    FinishLoadingHandler = 0x0069, // unchanged 4.5
+    FinishLoadingHandler = 0x0069, // unchanged 5.0
 
     CFCommenceHandler = 0x006F,
 
 
     CFRegisterDuty = 0x0071,
     CFRegisterRoulette = 0x0072,
-    PlayTimeHandler = 0x0073, // unchanged 4.5
-    LogoutHandler = 0x0074, // unchanged 4.5
+    PlayTimeHandler = 0x0073, // unchanged 5.0
+    LogoutHandler = 0x0074, // unchanged 5.0
     CancelLogout = 0x0075, // updated 5.0
 
     CFDutyInfoHandler = 0x0078, // updated 4.2
@@ -283,8 +283,9 @@ namespace Sapphire::Network::Packets
     ReqSearchInfoHandler = 0x00E6, // updated 5.0
     ReqExamineSearchCommentHandler = 0x00E7, // updated 5.0
 
+    ReqRemovePlayerFromBlacklist = 0x00F1, // updated 5.0
     BlackListHandler = 0x00F2, // updated 5.0
-    PlayerSearchHandler = 0x00E6, // updated 4.5
+    PlayerSearchHandler = 0x00F4, // updated 5.0
 
     LinkshellListHandler = 0x00FA, // updated 5.0
 

From 8e688a48715e9bc1a80dd5103bbcbae7a279bf8c Mon Sep 17 00:00:00 2001
From: NotAdam <adam@notadam.me>
Date: Sun, 30 Jun 2019 20:22:22 +1000
Subject: [PATCH 078/351] fix #565: add retainer item sale price packet opcode

---
 src/common/Network/PacketDef/Ipcs.h | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/common/Network/PacketDef/Ipcs.h b/src/common/Network/PacketDef/Ipcs.h
index 24126682..06321639 100644
--- a/src/common/Network/PacketDef/Ipcs.h
+++ b/src/common/Network/PacketDef/Ipcs.h
@@ -149,6 +149,9 @@ namespace Sapphire::Network::Packets
     Examine = 0x0197, // updated 5.0
     CharaNameReq = 0x0198, // updated 5.0
 
+    // nb: see #565 on github
+    UpdateRetainerItemSalePrice = 0x019D, // updated 5.0
+
     SetLevelSync = 0x1186, // not updated for 4.4, not sure what it is anymore
 
     ItemInfo = 0x01A1, // updated 5.0

From d3337bbec79fbdbdf1555da124cdfc0aa4f8e405 Mon Sep 17 00:00:00 2001
From: NotAdam <adam@notadam.me>
Date: Sun, 30 Jun 2019 20:47:39 +1000
Subject: [PATCH 079/351] more opcode fixes

---
 src/common/Network/PacketDef/Ipcs.h | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/src/common/Network/PacketDef/Ipcs.h b/src/common/Network/PacketDef/Ipcs.h
index 06321639..2f3d180d 100644
--- a/src/common/Network/PacketDef/Ipcs.h
+++ b/src/common/Network/PacketDef/Ipcs.h
@@ -156,13 +156,13 @@ namespace Sapphire::Network::Packets
 
     ItemInfo = 0x01A1, // updated 5.0
     ContainerInfo = 0x01A2, // updated 5.0
-    InventoryTransactionFinish = 0x0198, // updated 4.5
-    InventoryTransaction = 0x0199, // updated 4.5
+    InventoryTransactionFinish = 0x01A3, // updated 5.0
+    InventoryTransaction = 0x01A4, // updated 5.0
 
     CurrencyCrystalInfo = 0x01A5, // updated 5.0
 
-    InventoryActionAck = 0x019D, // updated 4.5
-    UpdateInventorySlot = 0x019E, // updated 4.5
+    InventoryActionAck = 0x01A7, // updated 5.0
+    UpdateInventorySlot = 0x01A8, // updated 5.0
 
     HuntingLogEntry = 0x01B3, // updated 5.0
 
@@ -233,16 +233,17 @@ namespace Sapphire::Network::Packets
     DuelChallenge = 0x0277, // 4.2; this is responsible for opening the ui
     PerformNote = 0x0286, // updated 4.3
 
-    PrepareZoning = 0x0299, // updated 4.5
+    PrepareZoning = 0x02A4, // updated 5.0
     ActorGauge = 0x0292, // updated 4.3
 
     // Unknown IPC types that still need to be sent
     // TODO: figure all these out properly
-    IPCTYPE_UNK_320 = 0x025E, // updated 4.5
-    IPCTYPE_UNK_322 = 0x0260, // updated 4.5
+    // daily quest related, init seed and current quota probably
+    IPCTYPE_UNK_320 = 0x025E, // updated 5.0
+    IPCTYPE_UNK_322 = 0x0260, // updated 5.0
 
     /// Doman Mahjong //////////////////////////////////////
-    MahjongOpenGui = 0x02BC, // only available in mahjong instance
+    MahjongOpenGui = 0x02A4, // only available in mahjong instance
     MahjongNextRound = 0x02BD, // initial hands(baipai), # of riichi(wat), winds, honba, score and stuff
     MahjongPlayerAction = 0x02BE, // tsumo(as in drawing a tile) called chi/pon/kan/riichi
     MahjongEndRoundTsumo = 0x02BF, // called tsumo

From b558b45b046055ecc5331ad4e97d2d373e910702 Mon Sep 17 00:00:00 2001
From: NotAdam <adam@notadam.me>
Date: Sun, 30 Jun 2019 21:08:51 +1000
Subject: [PATCH 080/351] add some new blacklist opcodes, fix mail opcodes

---
 src/common/Network/PacketDef/Ipcs.h | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/src/common/Network/PacketDef/Ipcs.h b/src/common/Network/PacketDef/Ipcs.h
index 2f3d180d..196c747c 100644
--- a/src/common/Network/PacketDef/Ipcs.h
+++ b/src/common/Network/PacketDef/Ipcs.h
@@ -73,6 +73,8 @@ namespace Sapphire::Network::Packets
     SocialRequestResponse = 0x00BB, // updated 4.1
     CancelAllianceForming = 0x00C6, // updated 4.2
 
+    LogMessage = 0x00D0,
+
     Chat = 0x0104, // updated 5.0
 
     WorldVisitList = 0x00FE, // added 4.5
@@ -90,17 +92,17 @@ namespace Sapphire::Network::Packets
     CountdownInitiate = 0x011E, // updated 5.0
     CountdownCancel = 0x011F, // updated 5.0
 
-    BlackList = 0x0121, // updated 5.0
-
-    LogMessage = 0x00D0,
-
+    PlayerAddedToBlacklist = 0x0120, // updated 5.0
+    PlayerRemovedFromBlacklist = 0x0121, // updated 5.0
+    BlackList = 0x0123, // updated 5.0
+    
     LinkshellList = 0x012A, // updated 5.0
 
     MailDeleteRequest = 0x012B, // updated 5.0
     // 12D - 137 - constant gap between 4.5x -> 5.0
     ReqMoogleMailList = 0x0138, // updated 5.0
-    ReqMoogleMailLetter = 0x0122, // unchanged 5.0???
-    MailLetterNotification = 0x0123, // unchanged 5.0???
+    ReqMoogleMailLetter = 0x0139, // updated 5.0
+    MailLetterNotification = 0x013A, // updated 5.0
 
     MarketBoardItemListingCount = 0x0125, // updated 4.5
     MarketBoardItemListing = 0x0126, // updated 4.5

From cb107bd3b113ed1f70c9ba4e6669bfbd6aa22ff9 Mon Sep 17 00:00:00 2001
From: NotAdam <adam@notadam.me>
Date: Sat, 6 Jul 2019 14:47:23 +1000
Subject: [PATCH 081/351] dbm init runs migrations now

---
 src/dbm/DbManager.cpp | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/dbm/DbManager.cpp b/src/dbm/DbManager.cpp
index 92dbccb4..e39eedcd 100644
--- a/src/dbm/DbManager.cpp
+++ b/src/dbm/DbManager.cpp
@@ -239,7 +239,10 @@ bool DbManager::modeInit()
     content1.erase( 0, pos_ + delimiter1.length() );
   }
 
-  return true;
+  Logger::info( "======================================================" );
+  Logger::info( "Running migrations..." );
+
+  return modeMigrate();
 }
 
 bool promptForChar( const char* prompt, char& readch )

From bd6c2d853157c26e5e7ada384fc3afc9a6aa8775 Mon Sep 17 00:00:00 2001
From: NotAdam <adam@notadam.me>
Date: Sat, 6 Jul 2019 14:51:58 +1000
Subject: [PATCH 082/351] remove old max mp code, remove level modifiers for
 pie/mp, cap to 10k mp

---
 src/common/Common.h          |   2 -
 src/world/Actor/Player.cpp   |   2 +-
 src/world/Math/CalcStats.cpp | 193 +++++++++++++++--------------------
 src/world/Math/CalcStats.h   |   2 -
 4 files changed, 85 insertions(+), 114 deletions(-)

diff --git a/src/common/Common.h b/src/common/Common.h
index 05463273..283d3c49 100644
--- a/src/common/Common.h
+++ b/src/common/Common.h
@@ -971,8 +971,6 @@ namespace Sapphire::Common
 
   enum LevelTableEntry : uint8_t
   {
-    PIE,
-    MP,
     MAIN,
     SUB,
     DIV,
diff --git a/src/world/Actor/Player.cpp b/src/world/Actor/Player.cpp
index f51d4eb0..b008b987 100644
--- a/src/world/Actor/Player.cpp
+++ b/src/world/Actor/Player.cpp
@@ -285,7 +285,7 @@ void Sapphire::Entity::Player::calculateStats()
   m_baseStats.attackPotMagic = m_baseStats.inte;
   m_baseStats.healingPotMagic = m_baseStats.mnd;
 
-  m_baseStats.max_mp = Math::CalcStats::calculateMaxMp( getAsPlayer(), m_pFw );
+  m_baseStats.max_mp = 10000;
 
   m_baseStats.max_hp = Math::CalcStats::calculateMaxHp( getAsPlayer(), m_pFw );
 
diff --git a/src/world/Math/CalcStats.cpp b/src/world/Math/CalcStats.cpp
index f3cbc566..f697c73d 100644
--- a/src/world/Math/CalcStats.cpp
+++ b/src/world/Math/CalcStats.cpp
@@ -15,92 +15,93 @@
 using namespace Sapphire::Math;
 using namespace Sapphire::Entity;
 
-const int levelTable[81][7] =
+const int levelTable[81][5] =
 { 
-// PIE, MP, MAIN,SUB,DIV,HP,ELMT,THREAT
-  { 1, 1, 1, 1, 1, 1, 1 },
-  { 50, 104, 20, 56, 56, 0, 52 },
-  { 55, 114, 21, 57, 57, 0, 54 },
-  { 60, 123, 22, 60, 60, 0, 56 },
-  { 65, 133, 24, 62, 62, 0, 58 },
-  { 70, 142, 26, 65, 65, 0, 60 },
-  { 75, 152, 27, 68, 68, 0, 62 },
-  { 80, 161, 29, 70, 70, 0, 64 },
-  { 85, 171, 31, 73, 73, 0, 66 },
-  { 90, 180, 33, 76, 76, 0, 68 },
-  { 95, 190, 35, 78, 78, 0, 70 },
-  { 100, 209, 36, 82, 82, 0, 73 },
-  { 105, 228, 38, 85, 85, 0, 75 },
-  { 110, 247, 41, 89, 89, 0, 78 },
-  { 115, 266, 44, 93, 93, 0, 81 },
-  { 120, 285, 46, 96, 96, 0, 84 },
-  { 125, 304, 49, 100, 100, 0, 86 },
-  { 130, 323, 52, 104, 104, 0, 89 },
-  { 135, 342, 54, 109, 109, 0, 93 },
-  { 140, 361, 57, 113, 113, 0, 95 },
-  { 145, 380, 60, 116, 116, 0, 98 },
-  { 150, 418, 63, 122, 122, 0, 102 },
-  { 155, 456, 67, 127, 127, 0, 105 },
-  { 160, 494, 71, 133, 133, 0, 109 },
-  { 165, 532, 74, 138, 138, 0, 113 },
-  { 170, 570, 78, 144, 144, 0, 117 },
-  { 175, 608, 81, 150, 150, 0, 121 },
-  { 180, 646, 85, 155, 155, 0, 125 },
-  { 185, 684, 89, 162, 162, 0, 129 },
-  { 190, 722, 92, 168, 168, 0, 133 },
-  { 195, 760, 97, 173, 173, 0, 137 },
-  { 200, 826, 101, 181, 181, 0, 143 },
-  { 205, 893, 106, 188, 188, 0, 148 },
-  { 210, 959, 110, 194, 194, 0, 153 },
-  { 215, 1026, 115, 202, 202, 0, 159 },
-  { 220, 1092, 119, 209, 209, 0, 165 },
-  { 225, 1159, 124, 215, 215, 0, 170 },
-  { 230, 1225, 128, 223, 223, 0, 176 },
-  { 235, 1292, 134, 229, 229, 0, 181 },
-  { 240, 1358, 139, 236, 236, 0, 186 },
-  { 245, 1425, 144, 244, 244, 0, 192 },
-  { 250, 1548, 150, 253, 253, 0, 200 },
-  { 255, 1672, 155, 263, 263, 0, 207 },
-  { 260, 1795, 161, 272, 272, 0, 215 },
-  { 265, 1919, 166, 283, 283, 0, 223 },
-  { 270, 2042, 171, 292, 292, 0, 231 },
-  { 275, 2166, 177, 302, 302, 0, 238 },
-  { 280, 2289, 183, 311, 311, 0, 246 },
-  { 285, 2413, 189, 322, 322, 0, 254 },
-  { 290, 2536, 196, 331, 331, 0, 261 },
-  { 300, 2660, 202, 341, 341, 1700, 269 },
-  { 315, 3000, 204, 342, 393, 1774, 270 },
-  { 330, 3380, 205, 344, 444, 1851, 271 },
-  { 360, 3810, 207, 345, 496, 1931, 273 },
-  { 390, 4300, 209, 346, 548, 2015, 274 },
-  { 420, 4850, 210, 347, 600, 2102, 275 },
-  { 450, 5470, 212, 349, 651, 2194, 276 },
-  { 480, 6170, 214, 350, 703, 2289, 278 },
-  { 510, 6950, 215, 351, 755, 2388, 279 },
-  { 540, 7840, 217, 352, 806, 2492, 280 },
-  { 620, 8840, 218, 354, 858, 2600, 282 },
-  { 650, 8980, 224, 355, 941, 2700, 283 },
-  { 680, 9150, 228, 356, 1032, 2800, 284 },
-  { 710, 9350, 236, 357, 1133, 2900, 286 },
-  { 740, 9590, 244, 358, 1243, 3000, 287 },
-  { 770, 9870, 252, 359, 1364, 3100, 288 },
-  { 800, 10190, 260, 360, 1497, 3200, 290 },
-  { 830, 10560, 268, 361, 1643, 3300, 292 },
-  { 860, 10980, 276, 362, 1802, 3400, 293 },
-  { 890, 11450, 284, 363, 1978, 3500, 294 },
-  { 890, 12000, 292, 364, 2170, 3600, 295 },
+  // MAIN,SUB,DIV,HP,ELMT,THREAT
+  { 1, 1, 1, 1, 1 },
+  { 20, 56, 56, 0, 52 },
+  { 21, 57, 57, 0, 54 },
+  { 22, 60, 60, 0, 56 },
+  { 24, 62, 62, 0, 58 },
+  { 26, 65, 65, 0, 60 },
+  { 27, 68, 68, 0, 62 },
+  { 29, 70, 70, 0, 64 },
+  { 31, 73, 73, 0, 66 },
+  { 33, 76, 76, 0, 68 },
+  { 35, 78, 78, 0, 70 },
+  { 36, 82, 82, 0, 73 },
+  { 38, 85, 85, 0, 75 },
+  { 41, 89, 89, 0, 78 },
+  { 44, 93, 93, 0, 81 },
+  { 46, 96, 96, 0, 84 },
+  { 49, 100, 100, 0, 86 },
+  { 52, 104, 104, 0, 89 },
+  { 54, 109, 109, 0, 93 },
+  { 57, 113, 113, 0, 95 },
+  { 60, 116, 116, 0, 98 },
+  { 63, 122, 122, 0, 102 },
+  { 67, 127, 127, 0, 105 },
+  { 71, 133, 133, 0, 109 },
+  { 74, 138, 138, 0, 113 },
+  { 78, 144, 144, 0, 117 },
+  { 81, 150, 150, 0, 121 },
+  { 85, 155, 155, 0, 125 },
+  { 89, 162, 162, 0, 129 },
+  { 92, 168, 168, 0, 133 },
+  { 97, 173, 173, 0, 137 },
+  { 101, 181, 181, 0, 143 },
+  { 106, 188, 188, 0, 148 },
+  { 110, 194, 194, 0, 153 },
+  { 115, 202, 202, 0, 159 },
+  { 119, 209, 209, 0, 165 },
+  { 124, 215, 215, 0, 170 },
+  { 128, 223, 223, 0, 176 },
+  { 134, 229, 229, 0, 181 },
+  { 139, 236, 236, 0, 186 },
+  { 144, 244, 244, 0, 192 },
+  { 150, 253, 253, 0, 200 },
+  { 155, 263, 263, 0, 207 },
+  { 161, 272, 272, 0, 215 },
+  { 166, 283, 283, 0, 223 },
+  { 171, 292, 292, 0, 231 },
+  { 177, 302, 302, 0, 238 },
+  { 183, 311, 311, 0, 246 },
+  { 189, 322, 322, 0, 254 },
+  { 196, 331, 331, 0, 261 },
+  { 202, 341, 341, 1700, 269 },
+  { 204, 342, 393, 1774, 270 },
+  { 205, 344, 444, 1851, 271 },
+  { 207, 345, 496, 1931, 273 },
+  { 209, 346, 548, 2015, 274 },
+  { 210, 347, 600, 2102, 275 },
+  { 212, 349, 651, 2194, 276 },
+  { 214, 350, 703, 2289, 278 },
+  { 215, 351, 755, 2388, 279 },
+  { 217, 352, 806, 2492, 280 },
+  { 218, 354, 858, 2600, 282 },
+  { 224, 355, 941, 2700, 283 },
+  { 228, 356, 1032, 2800, 284 },
+  { 236, 357, 1133, 2900, 286 },
+  { 244, 358, 1243, 3000, 287 },
+  { 252, 359, 1364, 3100, 288 },
+  { 260, 360, 1497, 3200, 290 },
+  { 268, 361, 1643, 3300, 292 },
+  { 276, 362, 1802, 3400, 293 },
+  { 284, 363, 1978, 3500, 294 },
+  { 292, 364, 2170, 3600, 295 },
 
   // todo: add proper shbr values
-  { 890, 12000, 292, 364, 2170, 3600, 295 },
-  { 890, 12000, 292, 364, 2170, 3600, 295 },
-  { 890, 12000, 292, 364, 2170, 3600, 295 },
-  { 890, 12000, 292, 364, 2170, 3600, 295 },
-  { 890, 12000, 292, 364, 2170, 3600, 295 },
-  { 890, 12000, 292, 364, 2170, 3600, 295 },
-  { 890, 12000, 292, 364, 2170, 3600, 295 },
-  { 890, 12000, 292, 364, 2170, 3600, 295 },
-  { 890, 12000, 292, 364, 2170, 3600, 295 },
-  { 890, 12000, 292, 364, 2170, 3600, 295 },
+  // sub/div added from http://theoryjerks.akhmorning.com/resources/levelmods/
+  { 292, 365, 2263, 3600, 295 },
+  { 292, 366, 2360, 3600, 295 },
+  { 292, 367, 2461, 3600, 295 },
+  { 292, 368, 2566, 3600, 295 },
+  { 292, 370, 2676, 3600, 295 },
+  { 292, 372, 2790, 3600, 295 },
+  { 292, 374, 2910, 3600, 295 },
+  { 292, 376, 3034, 3600, 295 },
+  { 292, 378, 3164, 3600, 295 },
+  { 292, 380, 3300, 3600, 295 },
 };
 
 /*
@@ -173,32 +174,6 @@ uint32_t CalcStats::calculateMaxHp( PlayerPtr pPlayer, Sapphire::FrameworkPtr pF
   return result;
 }
 
-// Leggerless' MP Formula
-// ROUNDDOWN(((ROUNDDOWN(((PIE - BaseDET) * PieMPMod/100),0) + BaseMP) * JobModMP / 100),0)
-
-uint32_t CalcStats::calculateMaxMp( PlayerPtr pPlayer, Sapphire::FrameworkPtr pFw )
-{
-  auto pExdData = pFw->get< Data::ExdDataGenerated >();
-  auto classInfo = pExdData->get< Sapphire::Data::ClassJob >( static_cast< uint8_t >( pPlayer->getClass() ) );
-  auto paramGrowthInfo = pExdData->get< Sapphire::Data::ParamGrow >( pPlayer->getLevel() );
-
-  if( !classInfo || !paramGrowthInfo )
-    return 0;
-
-  auto pieMod = pPlayer->getBonusStat( Common::BaseParam::Piety );
-
-  float baseStat = calculateBaseStat( *pPlayer );
-  uint16_t piety = pPlayer->getStats().pie + pieMod;
-  uint16_t pietyScalar = paramGrowthInfo->mpModifier;
-  uint16_t jobModMp = classInfo->modifierManaPoints;
-  uint16_t baseMp = paramGrowthInfo->mpModifier;
-
-  uint16_t result = static_cast< uint16_t >( floor( floor( piety - baseStat ) * ( pietyScalar / 100 ) + baseMp ) *
-                                             jobModMp / 100 );
-
-  return result;
-}
-
 float CalcStats::blockProbability( const Chara& chara )
 {
   auto level = chara.getLevel();
diff --git a/src/world/Math/CalcStats.h b/src/world/Math/CalcStats.h
index ad8a086f..8b8f7d36 100644
--- a/src/world/Math/CalcStats.h
+++ b/src/world/Math/CalcStats.h
@@ -15,8 +15,6 @@ namespace Sapphire::Math
 
     static float calculateBaseStat( const Entity::Chara& chara );
 
-    static uint32_t calculateMaxMp( Sapphire::Entity::PlayerPtr pPlayer, FrameworkPtr pFw );
-
     static uint32_t calculateMaxHp( Sapphire::Entity::PlayerPtr pPlayer, FrameworkPtr pFw  );
 
     /*!

From bd1130fe73054c3fe0453b2b2d7a9b6d2f4b5896 Mon Sep 17 00:00:00 2001
From: NotAdam <adam@notadam.me>
Date: Sat, 6 Jul 2019 15:00:13 +1000
Subject: [PATCH 083/351] switch from binary to blobs, fix known array sizes in
 player obj

---
 ...0706035254_ConvertFixedSizeDataToBlobs.sql | 15 ++++++
 src/common/Database/ZoneDbConnection.cpp      | 50 +++++++++++--------
 src/common/Network/PacketDef/Ipcs.h           |  4 +-
 src/world/Actor/Player.h                      | 12 ++---
 .../PacketWrappers/PlayerSetupPacket.h        |  1 -
 5 files changed, 51 insertions(+), 31 deletions(-)
 create mode 100644 sql/migrations/20190706035254_ConvertFixedSizeDataToBlobs.sql

diff --git a/sql/migrations/20190706035254_ConvertFixedSizeDataToBlobs.sql b/sql/migrations/20190706035254_ConvertFixedSizeDataToBlobs.sql
new file mode 100644
index 00000000..97b617b5
--- /dev/null
+++ b/sql/migrations/20190706035254_ConvertFixedSizeDataToBlobs.sql
@@ -0,0 +1,15 @@
+-- Migration generated at 2019/07/06 03:52:54
+-- 20190706035254_ConvertFixedSizeDataToBlobs.sql
+
+ALTER TABLE `charainfo`
+	CHANGE COLUMN `TitleList` `TitleList` BLOB NULL DEFAULT NULL AFTER `ActiveTitle`,
+	CHANGE COLUMN `Achievement` `Achievement` BLOB NULL DEFAULT NULL AFTER `TitleList`,
+	CHANGE COLUMN `Aetheryte` `Aetheryte` BLOB NULL DEFAULT NULL AFTER `Achievement`,
+	CHANGE COLUMN `HowTo` `HowTo` BLOB NULL DEFAULT NULL AFTER `Aetheryte`,
+	CHANGE COLUMN `Minions` `Minions` BLOB NULL DEFAULT NULL AFTER `HowTo`,
+	CHANGE COLUMN `Mounts` `Mounts` BLOB NULL DEFAULT NULL AFTER `Minions`,
+	CHANGE COLUMN `Orchestrion` `Orchestrion` BLOB NULL DEFAULT NULL AFTER `Mounts`,
+	CHANGE COLUMN `QuestCompleteFlags` `QuestCompleteFlags` BLOB NULL DEFAULT NULL AFTER `ConfigFlags`,
+	CHANGE COLUMN `QuestTracking` `QuestTracking` BLOB NULL DEFAULT NULL AFTER `OpeningSequence`,
+	CHANGE COLUMN `Discovery` `Discovery` BLOB NULL DEFAULT NULL AFTER `GrandCompanyRank`,
+	CHANGE COLUMN `Unlocks` `Unlocks` BLOB NULL DEFAULT NULL AFTER `Pose`;
diff --git a/src/common/Database/ZoneDbConnection.cpp b/src/common/Database/ZoneDbConnection.cpp
index 1c4c5a82..a6ecb50c 100644
--- a/src/common/Database/ZoneDbConnection.cpp
+++ b/src/common/Database/ZoneDbConnection.cpp
@@ -22,18 +22,20 @@ void Sapphire::Db::ZoneDbConnection::doPrepareStatements()
     m_stmts.resize( MAX_STATEMENTS );
 
   /// CHARA
-  prepareStatement( CHARA_SEL, "SELECT ContentId, Name, Hp, Mp, Tp, Gp, Mode, Mount, InvincibleGM, Voice, "
-                               "Customize, ModelMainWeapon, ModelSubWeapon, ModelSystemWeapon, "
-                               "ModelEquip, EmoteModeType, FirstLoginTime, Language, IsNewGame, "
-                               "IsNewAdventurer, TerritoryType, TerritoryId, PosX, PosY, PosZ, PosR, "
-                               "OTerritoryType, OTerritoryId, OPosX, OPosY, OPosZ, OPosR, GuardianDeity, "
-                               "BirthDay, BirthMonth, Class, Status, TotalPlayTime, FirstClass, HomePoint, "
-                               "FavoritePoint, RestPoint, StartTown, ActiveTitle, TitleList, Achievement, "
-                               "Aetheryte, HowTo, Minions, Mounts, Orchestrion, EquippedMannequin, ConfigFlags, "
-                               "QuestCompleteFlags, OpeningSequence, QuestTracking, GrandCompany, "
-                               "GrandCompanyRank, Discovery, GMRank, EquipDisplayFlags, Unlocks, CFPenaltyUntil, "
-                               "Pose "
-                               "FROM charainfo WHERE CharacterId = ?;", CONNECTION_SYNC );
+  prepareStatement( CHARA_SEL,
+                    "SELECT ContentId, Name, Hp, Mp, Tp, Gp, Mode, Mount, InvincibleGM, Voice, "
+                    "Customize, ModelMainWeapon, ModelSubWeapon, ModelSystemWeapon, "
+                    "ModelEquip, EmoteModeType, FirstLoginTime, Language, IsNewGame, "
+                    "IsNewAdventurer, TerritoryType, TerritoryId, PosX, PosY, PosZ, PosR, "
+                    "OTerritoryType, OTerritoryId, OPosX, OPosY, OPosZ, OPosR, GuardianDeity, "
+                    "BirthDay, BirthMonth, Class, Status, TotalPlayTime, FirstClass, HomePoint, "
+                    "FavoritePoint, RestPoint, StartTown, ActiveTitle, TitleList, Achievement, "
+                    "Aetheryte, HowTo, Minions, Mounts, Orchestrion, EquippedMannequin, ConfigFlags, "
+                    "QuestCompleteFlags, OpeningSequence, QuestTracking, GrandCompany, "
+                    "GrandCompanyRank, Discovery, GMRank, EquipDisplayFlags, Unlocks, CFPenaltyUntil, "
+                    "Pose "
+                    "FROM charainfo WHERE CharacterId = ?;",
+                    CONNECTION_SYNC );
 
 
   prepareStatement( CHARA_UP,
@@ -47,19 +49,23 @@ void Sapphire::Db::ZoneDbConnection::doPrepareStatements()
                     "ActiveTitle = ?, TitleList = ?, Achievement = ?, Aetheryte = ?, HowTo = ?, Minions = ?, Mounts = ?, Orchestrion = ?, "
                     "EquippedMannequin = ?, ConfigFlags = ?, QuestCompleteFlags = ?, OpeningSequence = ?, "
                     "QuestTracking = ?, GrandCompany = ?, GrandCompanyRank = ?, Discovery = ?, GMRank = ?, EquipDisplayFlags = ?, Unlocks = ?, "
-                    "CFPenaltyUntil = ?, Pose = ? WHERE CharacterId = ?;", CONNECTION_ASYNC );
+                    "CFPenaltyUntil = ?, Pose = ? WHERE CharacterId = ?;",
+                    CONNECTION_ASYNC );
 
 
-  prepareStatement( CHARA_SEL_MINIMAL, "SELECT Name, Customize, ModelMainWeapon, ModelSubWeapon, ModelEquip, TerritoryType, GuardianDeity, "
-                                       "Class, ContentId, BirthDay, BirthMonth, EquipDisplayFlags "
-                                       "FROM charainfo WHERE CharacterId = ?;", CONNECTION_SYNC );
+  prepareStatement( CHARA_SEL_MINIMAL,
+                    "SELECT Name, Customize, ModelMainWeapon, ModelSubWeapon, ModelEquip, TerritoryType, GuardianDeity, "
+                    "Class, ContentId, BirthDay, BirthMonth, EquipDisplayFlags "
+                    "FROM charainfo WHERE CharacterId = ?;",
+                    CONNECTION_SYNC );
 
-  prepareStatement( CHARA_INS, "INSERT INTO charainfo (AccountId, CharacterId, ContentId, Name, Hp, Mp, "
-                               "Customize, Voice, IsNewGame, TerritoryType, PosX, PosY, PosZ, PosR, ModelEquip, "
-                               "IsNewAdventurer, GuardianDeity, Birthday, BirthMonth, Class, Status, FirstClass, "
-                               "HomePoint, StartTown, Discovery, HowTo, QuestCompleteFlags, Unlocks, QuestTracking, "
-                               "Aetheryte, GMRank, Mounts, Orchestrion, UPDATE_DATE ) "
-                               "VALUES ( ?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,NOW() );",
+  prepareStatement( CHARA_INS,
+                    "INSERT INTO charainfo (AccountId, CharacterId, ContentId, Name, Hp, Mp, "
+                    "Customize, Voice, IsNewGame, TerritoryType, PosX, PosY, PosZ, PosR, ModelEquip, "
+                    "IsNewAdventurer, GuardianDeity, Birthday, BirthMonth, Class, Status, FirstClass, "
+                    "HomePoint, StartTown, Discovery, HowTo, QuestCompleteFlags, Unlocks, QuestTracking, "
+                    "Aetheryte, GMRank, Mounts, Orchestrion, UPDATE_DATE ) "
+                    "VALUES ( ?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,NOW() );",
                     CONNECTION_SYNC );
 
   prepareStatement( CHARA_UP_NAME, "UPDATE charainfo SET Name = ? WHERE CharacterId = ?;", CONNECTION_ASYNC );
diff --git a/src/common/Network/PacketDef/Ipcs.h b/src/common/Network/PacketDef/Ipcs.h
index 196c747c..f1c5918b 100644
--- a/src/common/Network/PacketDef/Ipcs.h
+++ b/src/common/Network/PacketDef/Ipcs.h
@@ -95,7 +95,7 @@ namespace Sapphire::Network::Packets
     PlayerAddedToBlacklist = 0x0120, // updated 5.0
     PlayerRemovedFromBlacklist = 0x0121, // updated 5.0
     BlackList = 0x0123, // updated 5.0
-    
+
     LinkshellList = 0x012A, // updated 5.0
 
     MailDeleteRequest = 0x012B, // updated 5.0
@@ -152,7 +152,7 @@ namespace Sapphire::Network::Packets
     CharaNameReq = 0x0198, // updated 5.0
 
     // nb: see #565 on github
-    UpdateRetainerItemSalePrice = 0x019D, // updated 5.0
+    UpdateRetainerItemSalePrice = 0x019F, // updated 5.0
 
     SetLevelSync = 0x1186, // not updated for 4.4, not sure what it is anymore
 
diff --git a/src/world/Actor/Player.h b/src/world/Actor/Player.h
index e277738a..08caf559 100644
--- a/src/world/Actor/Player.h
+++ b/src/world/Actor/Player.h
@@ -1036,19 +1036,19 @@ namespace Sapphire::Entity
 
     uint16_t m_activeTitle;
     uint8_t m_titleList[48];
-    uint8_t m_howTo[33];
+    uint8_t m_howTo[34];
     uint8_t m_minions[40];
-    uint8_t m_mountGuide[17];
+    uint8_t m_mountGuide[19];
     uint8_t m_homePoint;
     uint8_t m_startTown;
     uint16_t m_townWarpFstFlags;
     uint8_t m_questCompleteFlags[476];
-    uint8_t m_discovery[421];
+    uint8_t m_discovery[445];
     uint32_t m_playTime;
 
-    uint16_t m_classArray[26];
-    uint32_t m_expArray[26];
-    uint8_t m_aetheryte[17];
+    uint16_t m_classArray[28];
+    uint32_t m_expArray[28];
+    uint8_t m_aetheryte[21];
     uint8_t m_unlocks[64];
     uint8_t m_orchestrion[40];
 
diff --git a/src/world/Network/PacketWrappers/PlayerSetupPacket.h b/src/world/Network/PacketWrappers/PlayerSetupPacket.h
index 2424e651..4cd52a8a 100644
--- a/src/world/Network/PacketWrappers/PlayerSetupPacket.h
+++ b/src/world/Network/PacketWrappers/PlayerSetupPacket.h
@@ -48,7 +48,6 @@ namespace Sapphire::Network::Packets::Server
       m_data.pose = player.getPose();
 
       memset( &m_data.name[ 0 ], 0, sizeof( m_data.name ) );
-
       strcpy( &m_data.name[ 0 ], player.getName().c_str() );
 
       memcpy( m_data.aetheryte, player.getAetheryteArray(), sizeof( m_data.aetheryte ) );

From 29b86879c15f9733d7f271888355cb15de79af4c Mon Sep 17 00:00:00 2001
From: NotAdam <adam@notadam.me>
Date: Tue, 9 Jul 2019 23:07:31 +1000
Subject: [PATCH 084/351] enable viera/hrothgar character creation

---
 src/lobby/GameConnection.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/lobby/GameConnection.cpp b/src/lobby/GameConnection.cpp
index f90a4ff1..53548626 100644
--- a/src/lobby/GameConnection.cpp
+++ b/src/lobby/GameConnection.cpp
@@ -180,7 +180,7 @@ void Lobby::GameConnection::getCharList( FFXIVARR_PACKET_RAW& packet, uint32_t t
     // TODO: Eventually move to account info storage
     if( i == 3 )
     {
-      charListPacket->data().entitledExpansion = 2;
+      charListPacket->data().entitledExpansion = 3;
       charListPacket->data().maxCharOnWorld = 25;
       charListPacket->data().unknown8 = 8;
       charListPacket->data().veteranRank = 12;

From ccadf7341c058e43b432f408f234a584db3999f6 Mon Sep 17 00:00:00 2001
From: NotAdam <adam@notadam.me>
Date: Sun, 14 Jul 2019 17:26:13 +1000
Subject: [PATCH 085/351] add gathering point event type

---
 src/world/Event/EventHandler.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/world/Event/EventHandler.h b/src/world/Event/EventHandler.h
index 5117b8f6..11b36c27 100644
--- a/src/world/Event/EventHandler.h
+++ b/src/world/Event/EventHandler.h
@@ -49,7 +49,7 @@ namespace Sapphire::Event
     {
       Quest = 0x0001,
       Warp = 0x0002,
-      Unknown = 0x0003, // Came up in the client with "Begin" unsure that means
+      GatheringPoint = 0x0003, // Came up in the client with "Begin" unsure that means
       Shop = 0x0004,
       Aetheryte = 0x0005,
       GuildLeveAssignment = 0x0006,

From 787c4d3614cfd7b5f593c1d797085f48ad5a8f2a Mon Sep 17 00:00:00 2001
From: NotAdam <adam@notadam.me>
Date: Sun, 14 Jul 2019 17:34:55 +1000
Subject: [PATCH 086/351] fix update position packet

---
 src/common/Network/PacketDef/Ipcs.h               |  3 ++-
 src/common/Network/PacketDef/Zone/ClientZoneDef.h | 10 +++++-----
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/src/common/Network/PacketDef/Ipcs.h b/src/common/Network/PacketDef/Ipcs.h
index f1c5918b..36d6c756 100644
--- a/src/common/Network/PacketDef/Ipcs.h
+++ b/src/common/Network/PacketDef/Ipcs.h
@@ -323,7 +323,6 @@ namespace Sapphire::Network::Packets
     AoESkillHandler = 0x140, // updated 5.0
 
     UpdatePositionHandler = 0x0141, // updated 5.0
-    UpdatePositionInstance = 0x0183, // updated 4.3
 
     InventoryModifyHandler = 0x0148, // updated 5.0
 
@@ -351,6 +350,8 @@ namespace Sapphire::Network::Packets
 
     SetSharedEstateSettings = 0x017B, // updated 5.0
 
+    UpdatePositionInstance = 0x0180, // updated 5.0
+
     PerformNoteHandler = 0x029B, // updated 4.3
 
 
diff --git a/src/common/Network/PacketDef/Zone/ClientZoneDef.h b/src/common/Network/PacketDef/Zone/ClientZoneDef.h
index bf19fb7e..b15936bf 100644
--- a/src/common/Network/PacketDef/Zone/ClientZoneDef.h
+++ b/src/common/Network/PacketDef/Zone/ClientZoneDef.h
@@ -51,11 +51,11 @@ struct FFXIVIpcUpdatePosition :
   /* 0000 */ float rotation;
   /* 0004 */ uint8_t unk_1[ 3 ];
   /* 0007 */ uint8_t headPosition;
-  /* 0008 */ uint8_t animationType;
-  /* 0009 */ uint8_t animationState;
-  /* 000A */ uint8_t clientAnimationType;
-  /* 000B */ uint8_t unk_2;
-  /* 000C */ Common::FFXIVARR_POSITION3 position;
+  /* 0008 */ Common::FFXIVARR_POSITION3 position;
+  /* 000C */ uint8_t animationType;
+  /* 000D */ uint8_t animationState;
+  /* 000E */ uint8_t clientAnimationType;
+  /* 000F */ uint8_t unk_2;
 };
 
 struct FFXIVIpcSkillHandler :

From fe41f42d3b16f180474b60290075da234fc07d90 Mon Sep 17 00:00:00 2001
From: NotAdam <adam@notadam.me>
Date: Sun, 14 Jul 2019 18:14:14 +1000
Subject: [PATCH 087/351] headrotation and rotation switched places, fixes
 actor rotation

---
 src/common/Network/PacketDef/Zone/ServerZoneDef.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/common/Network/PacketDef/Zone/ServerZoneDef.h b/src/common/Network/PacketDef/Zone/ServerZoneDef.h
index 200e0907..ef6b0e17 100644
--- a/src/common/Network/PacketDef/Zone/ServerZoneDef.h
+++ b/src/common/Network/PacketDef/Zone/ServerZoneDef.h
@@ -656,8 +656,8 @@ namespace Sapphire::Network::Packets::Server
   */
   struct FFXIVIpcActorMove : FFXIVIpcBasePacket< ActorMove >
   {
-    /* 0000 */ uint8_t rotation;
-    /* 0001 */ uint8_t headRotation;
+    /* 0000 */ uint8_t headRotation;
+    /* 0001 */ uint8_t rotation;
     /* 0002 */ uint8_t animationType;
     /* 0003 */ uint8_t animationState;
     /* 0004 */ uint8_t animationSpeed;

From 3c028e5f0092c15f8c44e09bc5c241f807edf771 Mon Sep 17 00:00:00 2001
From: NotAdam <adam@notadam.me>
Date: Tue, 16 Jul 2019 14:40:35 +1000
Subject: [PATCH 088/351] fix player levels not showing in lobby correctly

---
 src/api/PlayerMinimal.cpp                     | 19 ++++++++++++++++---
 src/api/PlayerMinimal.h                       |  2 ++
 src/common/Common.h                           |  2 ++
 .../Network/PacketDef/Zone/ServerZoneDef.h    |  4 ++--
 src/lobby/GameConnection.cpp                  |  2 +-
 5 files changed, 23 insertions(+), 6 deletions(-)

diff --git a/src/api/PlayerMinimal.cpp b/src/api/PlayerMinimal.cpp
index b95a3da1..c7f5fff1 100644
--- a/src/api/PlayerMinimal.cpp
+++ b/src/api/PlayerMinimal.cpp
@@ -1,11 +1,12 @@
 #include "PlayerMinimal.h"
 
-#include <Util/Util.h>
 #include <Common.h>
 #include <Exd/ExdDataGenerated.h>
 
 #include <Database/DatabaseDef.h>
 
+#include <nlohmann/json.hpp>
+
 extern Sapphire::Data::ExdDataGenerated g_exdDataGen;
 
 namespace Sapphire::Api {
@@ -123,11 +124,23 @@ std::string PlayerMinimal::getModelString()
   return modelString;
 }
 
+std::string PlayerMinimal::getLevelsString()
+{
+  auto levelsArray = nlohmann::json();
+
+  for( int i = 0; i < Common::CLASSJOB_SLOTS; ++i )
+  {
+    // these must be strings
+    levelsArray.push_back( std::to_string( m_classMap[ i ] ) );
+  }
+
+  return levelsArray.dump();
+}
+
 std::string PlayerMinimal::getInfoJson()
 {
   std::string charDetails = "{\"content\":[\"" + std::string( getName() ) + "\"," +
-                            "[\"0\",\"0\",\"0\",\"0\",\"" + std::to_string( m_classLevel ) +
-                            "\",\"0\",\"0\",\"0\",\"0\",\"0\",\"0\",\"0\",\"0\",\"0\",\"0\",\"0\",\"0\",\"0\",\"0\",\"0\",\"0\",\"0\",\"0\",\"0\",\"0\",\"0\"],"
+                            getLevelsString() + ","
                             "\"0\",\"0\",\"0\",\"" +
                             std::to_string( getBirthMonth() ) +
                             "\",\"" + std::to_string( getBirthDay() ) +
diff --git a/src/api/PlayerMinimal.h b/src/api/PlayerMinimal.h
index b137af20..17318358 100644
--- a/src/api/PlayerMinimal.h
+++ b/src/api/PlayerMinimal.h
@@ -31,6 +31,8 @@ namespace Sapphire::Api
 
     std::string getClassString();
 
+    std::string getLevelsString();
+
     uint8_t getClassLevel();
 
     // return the id of the actor
diff --git a/src/common/Common.h b/src/common/Common.h
index 283d3c49..96e41193 100644
--- a/src/common/Common.h
+++ b/src/common/Common.h
@@ -24,6 +24,8 @@ namespace Sapphire::Common
   const uint16_t MAX_PLAYER_LEVEL = 80;
   const uint8_t CURRENT_EXPANSION_ID = 3;
 
+  const uint8_t CLASSJOB_SLOTS = 28;
+
   /*!
    * @brief The maximum length (in ms) of a combo before it is canceled/voided.
    *
diff --git a/src/common/Network/PacketDef/Zone/ServerZoneDef.h b/src/common/Network/PacketDef/Zone/ServerZoneDef.h
index ef6b0e17..a9ba2da9 100644
--- a/src/common/Network/PacketDef/Zone/ServerZoneDef.h
+++ b/src/common/Network/PacketDef/Zone/ServerZoneDef.h
@@ -860,13 +860,13 @@ namespace Sapphire::Network::Packets::Server
     unsigned char unknown95[9];
     unsigned char unknown9F[2];
     unsigned char unknownA1[3];
-    unsigned int exp[28];
+    unsigned int exp[Common::CLASSJOB_SLOTS];
     unsigned int unknown108;
     unsigned int pvpTotalExp;
     unsigned int unknownPvp110;
     unsigned int pvpExp;
     unsigned int pvpFrontlineOverallRanks[3];
-    unsigned short levels[28];
+    unsigned short levels[Common::CLASSJOB_SLOTS];
     unsigned short unknown15C[9];
     unsigned short u1;
     unsigned short u2;
diff --git a/src/lobby/GameConnection.cpp b/src/lobby/GameConnection.cpp
index 53548626..16c4d4da 100644
--- a/src/lobby/GameConnection.cpp
+++ b/src/lobby/GameConnection.cpp
@@ -180,7 +180,7 @@ void Lobby::GameConnection::getCharList( FFXIVARR_PACKET_RAW& packet, uint32_t t
     // TODO: Eventually move to account info storage
     if( i == 3 )
     {
-      charListPacket->data().entitledExpansion = 3;
+      charListPacket->data().entitledExpansion = Common::CURRENT_EXPANSION_ID;
       charListPacket->data().maxCharOnWorld = 25;
       charListPacket->data().unknown8 = 8;
       charListPacket->data().veteranRank = 12;

From 9c3c51646889553a6106be95a56e39daaea82148 Mon Sep 17 00:00:00 2001
From: NotAdam <adam@notadam.me>
Date: Tue, 16 Jul 2019 20:10:51 +1000
Subject: [PATCH 089/351] fix bgm starting prematurely in instance cutscenes
 instead of muting bgm

---
 src/world/Territory/InstanceContent.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/world/Territory/InstanceContent.cpp b/src/world/Territory/InstanceContent.cpp
index 81b9f868..79d6be6c 100644
--- a/src/world/Territory/InstanceContent.cpp
+++ b/src/world/Territory/InstanceContent.cpp
@@ -395,7 +395,7 @@ Sapphire::InstanceContent::onEnterTerritory( Entity::Player& player, uint32_t ev
                                                   HIDE_HOTBAR | SILENT_ENTER_TERRI_BGM | SILENT_ENTER_TERRI_SE |
                                                   DISABLE_STEALTH | 0x00100000 | LOCK_HUD | LOCK_HOTBAR |
                                                   // todo: wtf is 0x00100000
-                                                  DISABLE_CANCEL_EMOTE, 0, 0x9, getCurrentBGM() );
+                                                  DISABLE_CANCEL_EMOTE, 0, 0x9, 0 );
   }
   else
     player.directorPlayScene( getDirectorId(), 2, NO_DEFAULT_CAMERA | HIDE_HOTBAR, 0, 0x9, getCurrentBGM() );

From 052db46b6a93763b05c8d3e63d681cb18572a60b Mon Sep 17 00:00:00 2001
From: karashiiro <49822414+karashiiro@users.noreply.github.com>
Date: Sat, 27 Jul 2019 01:19:59 -0700
Subject: [PATCH 090/351] added examinesearchinfo correctly this time

---
 src/common/Network/PacketDef/Ipcs.h | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/common/Network/PacketDef/Ipcs.h b/src/common/Network/PacketDef/Ipcs.h
index 36d6c756..e1357471 100644
--- a/src/common/Network/PacketDef/Ipcs.h
+++ b/src/common/Network/PacketDef/Ipcs.h
@@ -81,6 +81,7 @@ namespace Sapphire::Network::Packets
 
     SocialList = 0x010D, // updated 5.0
 
+    ExamineSearchInfo = 0x10F, // added 5.0
     UpdateSearchInfo = 0x0110, // updated 5.0
     InitSearchInfo = 0x0111, // updated 5.0
     ExamineSearchComment = 0x0102, // updated 4.1

From 7089e0feee82205d6d4909e6a48a418a486ab0f3 Mon Sep 17 00:00:00 2001
From: karashiiro <49822414+karashiiro@users.noreply.github.com>
Date: Sat, 27 Jul 2019 01:45:18 -0700
Subject: [PATCH 091/351] made boilerplate

I'll put stuff in it tomorrow morning
---
 src/common/Network/PacketDef/Zone/ServerZoneDef.h | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/common/Network/PacketDef/Zone/ServerZoneDef.h b/src/common/Network/PacketDef/Zone/ServerZoneDef.h
index a9ba2da9..5d1c9766 100644
--- a/src/common/Network/PacketDef/Zone/ServerZoneDef.h
+++ b/src/common/Network/PacketDef/Zone/ServerZoneDef.h
@@ -120,6 +120,10 @@ namespace Sapphire::Network::Packets::Server
     PlayerEntry entries[10];
   };
 
+  struct FFXIVIpcExamineSearchInfo : FFXIVIpcBasePacket< ExamineSearchInfo >
+  {
+    
+  };
 
   struct FFXIVIpcSetSearchInfo : FFXIVIpcBasePacket< UpdateSearchInfo >
   {

From dff68fba871b7d07ee7b59309d7c432d7a42ddbf Mon Sep 17 00:00:00 2001
From: karashiiro <49822414+karashiiro@users.noreply.github.com>
Date: Sat, 27 Jul 2019 10:18:09 -0700
Subject: [PATCH 092/351] added gp and cp to playerstats

GP `0x44` is a little weird in that it's set to 10000 as a non-gatherer. Trying it with both MIN and BTN does give the correct values in this address, though.
---
 src/common/Network/PacketDef/Zone/ServerZoneDef.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/common/Network/PacketDef/Zone/ServerZoneDef.h b/src/common/Network/PacketDef/Zone/ServerZoneDef.h
index 5d1c9766..62da674b 100644
--- a/src/common/Network/PacketDef/Zone/ServerZoneDef.h
+++ b/src/common/Network/PacketDef/Zone/ServerZoneDef.h
@@ -959,8 +959,8 @@ namespace Sapphire::Network::Packets::Server
     uint32_t hp;
     uint32_t mp;
     uint32_t tp;
-    uint32_t unknown;
-    uint32_t unknown_1;
+    uint32_t gp; // Set to 10000 as non-gatherer for some reason
+    uint32_t cp;
     uint32_t unknown_2;
     uint32_t tenacity;
     uint32_t attack;

From 620849d9386609438d1d811b64fa5f2d4de0cb51 Mon Sep 17 00:00:00 2001
From: karashiiro <49822414+karashiiro@users.noreply.github.com>
Date: Sat, 27 Jul 2019 10:47:10 -0700
Subject: [PATCH 093/351] starting examinesearchinfo

I'm pretty sure a searchMessage can only be 120 chars max, but everything else here is saying 193.
The longest FC name I've seen is only 18 characters long, so fcName may be 18 characters with 6 characters of padding?
---
 .../Network/PacketDef/Zone/ServerZoneDef.h    | 90 ++++++++++++++++++-
 1 file changed, 89 insertions(+), 1 deletion(-)

diff --git a/src/common/Network/PacketDef/Zone/ServerZoneDef.h b/src/common/Network/PacketDef/Zone/ServerZoneDef.h
index 62da674b..1c23edf1 100644
--- a/src/common/Network/PacketDef/Zone/ServerZoneDef.h
+++ b/src/common/Network/PacketDef/Zone/ServerZoneDef.h
@@ -122,7 +122,95 @@ namespace Sapphire::Network::Packets::Server
 
   struct FFXIVIpcExamineSearchInfo : FFXIVIpcBasePacket< ExamineSearchInfo >
   {
-    
+    uint32_t unknown;
+    uint16_t unknown1;
+    uint16_t unknown2;
+    char padding[16];
+    uint32_t unknown3;
+    uint16_t unknown4;
+    uint16_t unknown5;
+    uint16_t unknown6;
+    uint8_t worldId;
+    char searchMessage[193];
+    char fcName[24];
+    uint8_t unknown7;
+    uint16_t padding1;
+    uint16_t gldId; // 1
+    uint16_t gldLevel;
+    uint16_t pglId; // 2
+    uint16_t pglLevel;
+    uint16_t mrdId; // 3
+    uint16_t mrdLevel;
+    uint16_t lncId; // 4
+    uint16_t lncLevel;
+    uint16_t arcId; // 5
+    uint16_t arcLevel;
+    uint16_t cnjId; // 6
+    uint16_t cnjLevel;
+    uint16_t thmId; // 7
+    uint16_t thmLevel;
+    uint16_t crpId; // 8
+    uint16_t crpLevel;
+    uint16_t bsmId; // 9
+    uint16_t bsmLevel;
+    uint16_t armId; // 10
+    uint16_t armLevel;
+    uint16_t gsmId; // 11
+    uint16_t gsmLevel;
+    uint16_t ltwId; // 12
+    uint16_t ltwLevel;
+    uint16_t wvrId; // 13
+    uint16_t wvrLevel;
+    uint16_t alcId; // 14
+    uint16_t alcLevel;
+    uint16_t culId; // 15
+    uint16_t culLevel;
+    uint16_t minId; // 16
+    uint16_t minLevel;
+    uint16_t btnId; // 17
+    uint16_t btnLevel;
+    uint16_t fshId; // 18
+    uint16_t fshLevel;
+    uint16_t culId; // 19
+    uint16_t culLevel;
+    uint16_t mnkId; // 20
+    uint16_t mnkLevel;
+    uint16_t warId; // 21
+    uint16_t warLevel;
+    uint16_t drgId; // 22
+    uint16_t drgLevel;
+    uint16_t brdId; // 23
+    uint16_t brdLevel;
+    uint16_t pldId; // 24
+    uint16_t pldLevel;
+    uint16_t blmId; // 25
+    uint16_t blmLevel;
+    uint16_t acnId; // 26
+    uint16_t acnLevel;
+    uint16_t schId; // 27
+    uint16_t schLevel;
+    uint16_t smnId; // 28
+    uint16_t smnLevel;
+    uint16_t rogId; // 29
+    uint16_t rogLevel;
+    uint16_t ninId; // 30
+    uint16_t ninLevel;
+    uint16_t mchId; // 31
+    uint16_t mchLevel;
+    uint16_t drkId; // 32
+    uint16_t drkLevel;
+    uint16_t astId; // 33
+    uint16_t astLevel;
+    uint16_t samId; // 34
+    uint16_t samLevel;
+    uint16_t rdmId; // 35
+    uint16_t rdmLevel;
+    uint16_t bluId; // 36
+    uint16_t bluLevel;
+    uint16_t gnbId; // 37
+    uint16_t gnbLevel;
+    uint16_t dncId; // 38
+    uint16_t dncLevel;
   };
 
   struct FFXIVIpcSetSearchInfo : FFXIVIpcBasePacket< UpdateSearchInfo >

From 7b83ce73801f287f84c34b889d36df2dd0189354 Mon Sep 17 00:00:00 2001
From: karashiiro <49822414+karashiiro@users.noreply.github.com>
Date: Sat, 27 Jul 2019 10:59:44 -0700
Subject: [PATCH 094/351] collapsed classjobid and classjoblevel into array

If you don't have them, the actual IDs are in the last commit
---
 .../Network/PacketDef/Zone/ServerZoneDef.h    | 80 ++-----------------
 1 file changed, 6 insertions(+), 74 deletions(-)

diff --git a/src/common/Network/PacketDef/Zone/ServerZoneDef.h b/src/common/Network/PacketDef/Zone/ServerZoneDef.h
index 1c23edf1..3a84aaa0 100644
--- a/src/common/Network/PacketDef/Zone/ServerZoneDef.h
+++ b/src/common/Network/PacketDef/Zone/ServerZoneDef.h
@@ -135,82 +135,14 @@ namespace Sapphire::Network::Packets::Server
     char fcName[24];
     uint8_t unknown7;
     uint16_t padding1;
+    uint16_t classJobIdLevel[38 * 2]; // Pairs of classJobId, classJobLevel
+    /*
+    Like this:
     uint16_t gldId; // 1
     uint16_t gldLevel;
-    uint16_t pglId; // 2
-    uint16_t pglLevel;
-    uint16_t mrdId; // 3
-    uint16_t mrdLevel;
-    uint16_t lncId; // 4
-    uint16_t lncLevel;
-    uint16_t arcId; // 5
-    uint16_t arcLevel;
-    uint16_t cnjId; // 6
-    uint16_t cnjLevel;
-    uint16_t thmId; // 7
-    uint16_t thmLevel;
-    uint16_t crpId; // 8
-    uint16_t crpLevel;
-    uint16_t bsmId; // 9
-    uint16_t bsmLevel;
-    uint16_t armId; // 10
-    uint16_t armLevel;
-    uint16_t gsmId; // 11
-    uint16_t gsmLevel;
-    uint16_t ltwId; // 12
-    uint16_t ltwLevel;
-    uint16_t wvrId; // 13
-    uint16_t wvrLevel;
-    uint16_t alcId; // 14
-    uint16_t alcLevel;
-    uint16_t culId; // 15
-    uint16_t culLevel;
-    uint16_t minId; // 16
-    uint16_t minLevel;
-    uint16_t btnId; // 17
-    uint16_t btnLevel;
-    uint16_t fshId; // 18
-    uint16_t fshLevel;
-    uint16_t culId; // 19
-    uint16_t culLevel;
-    uint16_t mnkId; // 20
-    uint16_t mnkLevel;
-    uint16_t warId; // 21
-    uint16_t warLevel;
-    uint16_t drgId; // 22
-    uint16_t drgLevel;
-    uint16_t brdId; // 23
-    uint16_t brdLevel;
-    uint16_t pldId; // 24
-    uint16_t pldLevel;
-    uint16_t blmId; // 25
-    uint16_t blmLevel;
-    uint16_t acnId; // 26
-    uint16_t acnLevel;
-    uint16_t schId; // 27
-    uint16_t schLevel;
-    uint16_t smnId; // 28
-    uint16_t smnLevel;
-    uint16_t rogId; // 29
-    uint16_t rogLevel;
-    uint16_t ninId; // 30
-    uint16_t ninLevel;
-    uint16_t mchId; // 31
-    uint16_t mchLevel;
-    uint16_t drkId; // 32
-    uint16_t drkLevel;
-    uint16_t astId; // 33
-    uint16_t astLevel;
-    uint16_t samId; // 34
-    uint16_t samLevel;
-    uint16_t rdmId; // 35
-    uint16_t rdmLevel;
-    uint16_t bluId; // 36
-    uint16_t bluLevel;
-    uint16_t gnbId; // 37
-    uint16_t gnbLevel;
-    uint16_t dncId; // 38
-    uint16_t dncLevel;
+    uint16_t pglId;
+    etc... through DNC
+    */
   };
 
   struct FFXIVIpcSetSearchInfo : FFXIVIpcBasePacket< UpdateSearchInfo >

From 7005639b1a31eedd3e34ac684968155f20e9205e Mon Sep 17 00:00:00 2001
From: karashiiro <49822414+karashiiro@users.noreply.github.com>
Date: Sat, 27 Jul 2019 11:12:00 -0700
Subject: [PATCH 095/351] using proper constant

Just set it to the preexisting constant. Is it supposed to be 28? There are 38 classes and jobs.
---
 src/common/Network/PacketDef/Zone/ServerZoneDef.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/common/Network/PacketDef/Zone/ServerZoneDef.h b/src/common/Network/PacketDef/Zone/ServerZoneDef.h
index 3a84aaa0..e5ccb5bb 100644
--- a/src/common/Network/PacketDef/Zone/ServerZoneDef.h
+++ b/src/common/Network/PacketDef/Zone/ServerZoneDef.h
@@ -135,13 +135,13 @@ namespace Sapphire::Network::Packets::Server
     char fcName[24];
     uint8_t unknown7;
     uint16_t padding1;
-    uint16_t classJobIdLevel[38 * 2]; // Pairs of classJobId, classJobLevel
+    uint16_t classJobIdLevel[Common::CLASSJOB_SLOTS * 2]; // Pairs of classJobId, classJobLevel
     /*
     Like this:
     uint16_t gldId; // 1
     uint16_t gldLevel;
     uint16_t pglId;
-    etc... through DNC
+    etc... through DNC (38)
     */
   };
 

From d99d9aea30060fd9a6bf802ab47d8b6977c4b7a6 Mon Sep 17 00:00:00 2001
From: karashiiro <49822414+karashiiro@users.noreply.github.com>
Date: Sat, 27 Jul 2019 12:10:18 -0700
Subject: [PATCH 096/351] typo

---
 src/common/Network/PacketDef/Ipcs.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/common/Network/PacketDef/Ipcs.h b/src/common/Network/PacketDef/Ipcs.h
index e1357471..1dba302a 100644
--- a/src/common/Network/PacketDef/Ipcs.h
+++ b/src/common/Network/PacketDef/Ipcs.h
@@ -81,7 +81,7 @@ namespace Sapphire::Network::Packets
 
     SocialList = 0x010D, // updated 5.0
 
-    ExamineSearchInfo = 0x10F, // added 5.0
+    ExamineSearchInfo = 0x010F, // added 5.0
     UpdateSearchInfo = 0x0110, // updated 5.0
     InitSearchInfo = 0x0111, // updated 5.0
     ExamineSearchComment = 0x0102, // updated 4.1

From 89c6a37f927560099df0947283561a80435378c9 Mon Sep 17 00:00:00 2001
From: karashiiro <49822414+karashiiro@users.noreply.github.com>
Date: Sat, 27 Jul 2019 17:53:39 -0700
Subject: [PATCH 097/351] corrected

---
 src/common/Network/PacketDef/Zone/ServerZoneDef.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/common/Network/PacketDef/Zone/ServerZoneDef.h b/src/common/Network/PacketDef/Zone/ServerZoneDef.h
index e5ccb5bb..94ed0616 100644
--- a/src/common/Network/PacketDef/Zone/ServerZoneDef.h
+++ b/src/common/Network/PacketDef/Zone/ServerZoneDef.h
@@ -135,7 +135,7 @@ namespace Sapphire::Network::Packets::Server
     char fcName[24];
     uint8_t unknown7;
     uint16_t padding1;
-    uint16_t classJobIdLevel[Common::CLASSJOB_SLOTS * 2]; // Pairs of classJobId, classJobLevel
+    uint16_t classJobIdLevel[76]; // Pairs of classJobId, classJobLevel (38 * 2)
     /*
     Like this:
     uint16_t gldId; // 1

From 0a9f2d53853a9d26607a2307d27af05575b34823 Mon Sep 17 00:00:00 2001
From: karashiiro <49822414+karashiiro@users.noreply.github.com>
Date: Sat, 27 Jul 2019 17:59:23 -0700
Subject: [PATCH 098/351] struct array and new constant

---
 src/common/Network/PacketDef/Zone/ServerZoneDef.h | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/src/common/Network/PacketDef/Zone/ServerZoneDef.h b/src/common/Network/PacketDef/Zone/ServerZoneDef.h
index 94ed0616..4fe3733d 100644
--- a/src/common/Network/PacketDef/Zone/ServerZoneDef.h
+++ b/src/common/Network/PacketDef/Zone/ServerZoneDef.h
@@ -135,14 +135,11 @@ namespace Sapphire::Network::Packets::Server
     char fcName[24];
     uint8_t unknown7;
     uint16_t padding1;
-    uint16_t classJobIdLevel[76]; // Pairs of classJobId, classJobLevel (38 * 2)
-    /*
-    Like this:
-    uint16_t gldId; // 1
-    uint16_t gldLevel;
-    uint16_t pglId;
-    etc... through DNC (38)
-    */
+    struct ClassJobEntry
+    {
+      uint16_t id;
+      uint16_t level;
+    } levelEntries[Common::CLASSJOB_TOTAL];
   };
 
   struct FFXIVIpcSetSearchInfo : FFXIVIpcBasePacket< UpdateSearchInfo >

From f494ca7e0516a7a7989887d46b56faee66d0292e Mon Sep 17 00:00:00 2001
From: karashiiro <49822414+karashiiro@users.noreply.github.com>
Date: Sat, 27 Jul 2019 18:00:15 -0700
Subject: [PATCH 099/351] new const

---
 src/common/Common.h | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/common/Common.h b/src/common/Common.h
index 96e41193..a41095ca 100644
--- a/src/common/Common.h
+++ b/src/common/Common.h
@@ -24,6 +24,7 @@ namespace Sapphire::Common
   const uint16_t MAX_PLAYER_LEVEL = 80;
   const uint8_t CURRENT_EXPANSION_ID = 3;
 
+  const uint8_t CLASSJOB_TOTAL = 38;
   const uint8_t CLASSJOB_SLOTS = 28;
 
   /*!

From 6e7076372f0760d9c5b14bd91ec9f5063404902a Mon Sep 17 00:00:00 2001
From: karashiiro <49822414+karashiiro@users.noreply.github.com>
Date: Sun, 28 Jul 2019 17:27:57 -0700
Subject: [PATCH 100/351] added more FC opcodes and packet structures

---
 src/common/Network/PacketDef/Ipcs.h           |  6 +++++
 .../Network/PacketDef/Zone/ClientZoneDef.h    | 10 +++++++
 .../Network/PacketDef/Zone/ServerZoneDef.h    | 26 +++++++++++++++++++
 3 files changed, 42 insertions(+)

diff --git a/src/common/Network/PacketDef/Ipcs.h b/src/common/Network/PacketDef/Ipcs.h
index 1dba302a..fbcf40f7 100644
--- a/src/common/Network/PacketDef/Ipcs.h
+++ b/src/common/Network/PacketDef/Ipcs.h
@@ -100,6 +100,8 @@ namespace Sapphire::Network::Packets
     LinkshellList = 0x012A, // updated 5.0
 
     MailDeleteRequest = 0x012B, // updated 5.0
+
+    FreeCompanyMemberLogInOut = 0x012C, // added 5.0
     // 12D - 137 - constant gap between 4.5x -> 5.0
     ReqMoogleMailList = 0x0138, // updated 5.0
     ReqMoogleMailLetter = 0x0139, // updated 5.0
@@ -115,6 +117,8 @@ namespace Sapphire::Network::Packets
     FreeCompanyInfo = 0x013D, // updated 4.5
     ExamineFreeCompanyInfo = 0x013E, // updated 4.5
 
+    FreeCompanyUpdateShortMessage = 0x0157, // added 5.0
+
     StatusEffectList = 0x015B, // updated 5.0
     EurekaStatusEffectList = 0x015C, // updated 5.0
     Effect = 0x015E, // updated 5.0
@@ -304,6 +308,8 @@ namespace Sapphire::Network::Packets
 
     FcInfoReqHandler = 0x011A, // updated 4.2
 
+    FreeCompanyUpdateShortMessageHandler = 0x0123, // added 5.0
+
     ReqMarketWishList = 0x012C, // updated 4.3
 
     ReqJoinNoviceNetwork = 0x0129, // updated 4.2
diff --git a/src/common/Network/PacketDef/Zone/ClientZoneDef.h b/src/common/Network/PacketDef/Zone/ClientZoneDef.h
index b15936bf..c697e461 100644
--- a/src/common/Network/PacketDef/Zone/ClientZoneDef.h
+++ b/src/common/Network/PacketDef/Zone/ClientZoneDef.h
@@ -323,6 +323,16 @@ struct FFXIVIpcMarketBoardRequestItemListingInfo :
   /* 0000 */ uint32_t requestId;
 };
 
+struct FFXIVIpcFreeCompanyUpdateShortMessageHandler :
+  FFXIVIpcBasePacket< FreeCompanyUpdateShortMessageHandler >
+{
+  char shortMessage[104]; // Contains old/gibberish data in remaining slots if not filled
+  uint8_t padding;
+  uint8_t unknown;
+  uint32_t unknown1;
+  uint16_t unknown2;
+};
+
 }
 
 #endif //_CORE_NETWORK_PACKETS_ZONE_CLIENT_IPC_H
diff --git a/src/common/Network/PacketDef/Zone/ServerZoneDef.h b/src/common/Network/PacketDef/Zone/ServerZoneDef.h
index 4fe3733d..89f3e83a 100644
--- a/src/common/Network/PacketDef/Zone/ServerZoneDef.h
+++ b/src/common/Network/PacketDef/Zone/ServerZoneDef.h
@@ -247,6 +247,22 @@ namespace Sapphire::Network::Packets::Server
     } entry[8];
   };
 
+  struct FFXIVIpcFreeCompanyMemberLogInOut : FFXIVIpcBasePacket< FreeCompanyMemberLogInOut >
+  {
+    uint16_t unknown;
+    uint16_t unknown1;
+    uint16_t unknown2;
+    uint16_t unknown3;
+    uint16_t unknown4;
+    char padding[6];
+    uint8_t status; // 0x0F Login, 0x10 Logout
+    uint8_t padding1;
+    char padding2[6];
+    uint16_t unknown5;
+    char fc[46];
+    char character[32];
+  };
+
   /**
   * Structural representation of the packet sent by the server
   * to send a list of mail the player has
@@ -301,6 +317,16 @@ namespace Sapphire::Network::Packets::Server
     uint32_t padding4;
   };
 
+  struct FFXIVIpcFreeCompanyUpdateShortMessage : FFXIVIpcBasePacket< FreeCompanyUpdateShortMessage >
+  {
+    uint32_t unknown;
+    uint16_t unknown1;
+    uint16_t unknown2;
+    uint32_t unknown3;
+    uint32_t unknown5;
+    char shortMessage[104];
+  };
+
   struct FFXIVIpcStatusEffectList : FFXIVIpcBasePacket< StatusEffectList >
   {
     uint8_t classId;

From 7a6b11a8dde04aa37ae022b869ef2cb40645ac40 Mon Sep 17 00:00:00 2001
From: karashiiro <49822414+karashiiro@users.noreply.github.com>
Date: Wed, 7 Aug 2019 19:17:27 -0700
Subject: [PATCH 101/351] review response

---
 src/common/Network/PacketDef/Ipcs.h               | 2 +-
 src/common/Network/PacketDef/Zone/ClientZoneDef.h | 2 +-
 src/common/Network/PacketDef/Zone/ServerZoneDef.h | 8 ++++----
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/common/Network/PacketDef/Ipcs.h b/src/common/Network/PacketDef/Ipcs.h
index fbcf40f7..a21519ce 100644
--- a/src/common/Network/PacketDef/Ipcs.h
+++ b/src/common/Network/PacketDef/Ipcs.h
@@ -101,7 +101,7 @@ namespace Sapphire::Network::Packets
 
     MailDeleteRequest = 0x012B, // updated 5.0
 
-    FreeCompanyMemberLogInOut = 0x012C, // added 5.0
+    FreeCompanyEvent = 0x012C, // added 5.0
     // 12D - 137 - constant gap between 4.5x -> 5.0
     ReqMoogleMailList = 0x0138, // updated 5.0
     ReqMoogleMailLetter = 0x0139, // updated 5.0
diff --git a/src/common/Network/PacketDef/Zone/ClientZoneDef.h b/src/common/Network/PacketDef/Zone/ClientZoneDef.h
index c697e461..7b0d39ea 100644
--- a/src/common/Network/PacketDef/Zone/ClientZoneDef.h
+++ b/src/common/Network/PacketDef/Zone/ClientZoneDef.h
@@ -326,7 +326,7 @@ struct FFXIVIpcMarketBoardRequestItemListingInfo :
 struct FFXIVIpcFreeCompanyUpdateShortMessageHandler :
   FFXIVIpcBasePacket< FreeCompanyUpdateShortMessageHandler >
 {
-  char shortMessage[104]; // Contains old/gibberish data in remaining slots if not filled
+  char shortMessage[104];
   uint8_t padding;
   uint8_t unknown;
   uint32_t unknown1;
diff --git a/src/common/Network/PacketDef/Zone/ServerZoneDef.h b/src/common/Network/PacketDef/Zone/ServerZoneDef.h
index 89f3e83a..62208497 100644
--- a/src/common/Network/PacketDef/Zone/ServerZoneDef.h
+++ b/src/common/Network/PacketDef/Zone/ServerZoneDef.h
@@ -247,7 +247,7 @@ namespace Sapphire::Network::Packets::Server
     } entry[8];
   };
 
-  struct FFXIVIpcFreeCompanyMemberLogInOut : FFXIVIpcBasePacket< FreeCompanyMemberLogInOut >
+  struct FFXIVIpcFreeCompanyEvent : FFXIVIpcBasePacket< FreeCompanyEvent >
   {
     uint16_t unknown;
     uint16_t unknown1;
@@ -255,12 +255,12 @@ namespace Sapphire::Network::Packets::Server
     uint16_t unknown3;
     uint16_t unknown4;
     char padding[6];
-    uint8_t status; // 0x0F Login, 0x10 Logout
+    uint8_t eventID; // 0x0F Login, 0x10 Logout
     uint8_t padding1;
     char padding2[6];
     uint16_t unknown5;
-    char fc[46];
-    char character[32];
+    char fcName[46];
+    char characterName[32];
   };
 
   /**

From 64e3066efeecf9b498195ae52670d33e58df87d5 Mon Sep 17 00:00:00 2001
From: karashiiro <49822414+karashiiro@users.noreply.github.com>
Date: Wed, 7 Aug 2019 21:42:38 -0700
Subject: [PATCH 102/351] further corrections and documentation

---
 .../Network/PacketDef/Chat/ServerChatDef.h    | 30 +++++++++++++++++++
 src/common/Network/PacketDef/Ipcs.h           |  3 +-
 .../Network/PacketDef/Zone/ServerZoneDef.h    | 16 ----------
 3 files changed, 32 insertions(+), 17 deletions(-)

diff --git a/src/common/Network/PacketDef/Chat/ServerChatDef.h b/src/common/Network/PacketDef/Chat/ServerChatDef.h
index ce614f7c..a91004b7 100644
--- a/src/common/Network/PacketDef/Chat/ServerChatDef.h
+++ b/src/common/Network/PacketDef/Chat/ServerChatDef.h
@@ -29,6 +29,36 @@ struct FFXIVIpcTellErrNotFound : FFXIVIpcBasePacket< TellErrNotFound >
   char receipientName[32];
 };
 
+struct FFXIVIpcFreeCompanyEvent : FFXIVIpcBasePacket< FreeCompanyEvent >
+{
+  uint16_t unknown;
+  uint16_t unknown1;
+  uint16_t unknown2;
+  uint16_t unknown3;
+  uint16_t unknown4;
+  char padding[6];
+  uint8_t eventID;
+  /*
+  * 0x0F Login
+  * 0x10 Logout
+  */
+  uint8_t padding1;
+  char padding2[6];
+  uint16_t unknown5;
+  char parameter[46];
+  /**
+  * eventID  | parameter usage
+  * 0x0F       FC name
+  * 0x10       FC name
+  */
+  char parameter1[32];
+  /**
+  * eventID  | parameter1 usage
+  * 0x0F       Character name
+  * 0x10       Character name
+  */
+};
+
 } /* Sapphire::Common::Network::Packets::Server */
 
 
diff --git a/src/common/Network/PacketDef/Ipcs.h b/src/common/Network/PacketDef/Ipcs.h
index a21519ce..b30f73ae 100644
--- a/src/common/Network/PacketDef/Ipcs.h
+++ b/src/common/Network/PacketDef/Ipcs.h
@@ -101,7 +101,6 @@ namespace Sapphire::Network::Packets
 
     MailDeleteRequest = 0x012B, // updated 5.0
 
-    FreeCompanyEvent = 0x012C, // added 5.0
     // 12D - 137 - constant gap between 4.5x -> 5.0
     ReqMoogleMailList = 0x0138, // updated 5.0
     ReqMoogleMailLetter = 0x0139, // updated 5.0
@@ -374,6 +373,8 @@ namespace Sapphire::Network::Packets
   {
     Tell = 0x0064, // updated for sb
     TellErrNotFound = 0x0066,
+
+    FreeCompanyEvent = 0x012C, // added 5.0
   };
 
   /**
diff --git a/src/common/Network/PacketDef/Zone/ServerZoneDef.h b/src/common/Network/PacketDef/Zone/ServerZoneDef.h
index 62208497..6649feb8 100644
--- a/src/common/Network/PacketDef/Zone/ServerZoneDef.h
+++ b/src/common/Network/PacketDef/Zone/ServerZoneDef.h
@@ -247,22 +247,6 @@ namespace Sapphire::Network::Packets::Server
     } entry[8];
   };
 
-  struct FFXIVIpcFreeCompanyEvent : FFXIVIpcBasePacket< FreeCompanyEvent >
-  {
-    uint16_t unknown;
-    uint16_t unknown1;
-    uint16_t unknown2;
-    uint16_t unknown3;
-    uint16_t unknown4;
-    char padding[6];
-    uint8_t eventID; // 0x0F Login, 0x10 Logout
-    uint8_t padding1;
-    char padding2[6];
-    uint16_t unknown5;
-    char fcName[46];
-    char characterName[32];
-  };
-
   /**
   * Structural representation of the packet sent by the server
   * to send a list of mail the player has

From 83b7a659a822706fc01f0bb62fd4d2702df0e5ec Mon Sep 17 00:00:00 2001
From: NotAdam <adam@notadam.me>
Date: Sat, 20 Jul 2019 21:42:21 +1000
Subject: [PATCH 103/351] some api json cleanup

---
 src/api/PlayerMinimal.cpp | 90 ++++++++++++++++++++++++++++++++-------
 1 file changed, 74 insertions(+), 16 deletions(-)

diff --git a/src/api/PlayerMinimal.cpp b/src/api/PlayerMinimal.cpp
index c7f5fff1..3d0bc685 100644
--- a/src/api/PlayerMinimal.cpp
+++ b/src/api/PlayerMinimal.cpp
@@ -139,22 +139,80 @@ std::string PlayerMinimal::getLevelsString()
 
 std::string PlayerMinimal::getInfoJson()
 {
-  std::string charDetails = "{\"content\":[\"" + std::string( getName() ) + "\"," +
-                            getLevelsString() + ","
-                            "\"0\",\"0\",\"0\",\"" +
-                            std::to_string( getBirthMonth() ) +
-                            "\",\"" + std::to_string( getBirthDay() ) +
-                            "\",\"" + std::to_string( getGuardianDeity() ) +
-                            "\",\"" + std::to_string( m_class ) +
-                            "\",\"0\",\"" + std::to_string( getZoneId() ) +
-                            "\",\"0\"," +
-                            "[" + getLookString() + "]," +
-                            "\"" + std::to_string( m_modelMainWeapon ) + "\",\"" + std::to_string( m_modelSubWeapon ) + "\"," +
-                            "[" + getModelString() + "]," +
-                            "\"1\",\"0\",\"0\",\"0\",\"" + std::to_string( m_equipDisplayFlags ) +
-                            "\",\"0\",\"\",\"0\",\"0\"]," +
-                            "\"classname\":\"ClientSelectData\",\"classid\":116}";
-  return charDetails;
+  auto payload = nlohmann::json();
+  auto& c = payload["content"];
+
+  c.push_back( getName() );
+
+  // class levels
+  auto levelsArray = nlohmann::json();
+  for( int i = 0; i < Common::CLASSJOB_SLOTS; ++i )
+  {
+    // these must be strings
+    levelsArray.push_back( std::to_string( m_classMap[ i ] ) );
+  }
+
+  c.push_back( levelsArray );
+
+  // unknowns
+  c.push_back( "0" );
+  c.push_back( "0" );
+  c.push_back( "0" );
+
+  //
+  c.push_back( std::to_string( getBirthMonth() ) );
+  c.push_back( std::to_string( getBirthDay() ) );
+  c.push_back( std::to_string( getGuardianDeity() ) );
+
+  c.push_back( std::to_string( m_class ) );
+
+  // unknown
+  c.push_back( "0" );
+
+  c.push_back( std::to_string( getZoneId() ) );
+
+  // unknown
+  c.push_back( "0" );
+
+  // look map
+  auto lookArray = nlohmann::json();
+  for( auto& it : m_lookMap )
+  {
+    lookArray.push_back( std::to_string( it.second ) );
+  }
+  c.push_back( lookArray );
+
+  // weapons
+  c.push_back( std::to_string( m_modelMainWeapon ) );
+  c.push_back( std::to_string( m_modelSubWeapon ) );
+
+  // model
+  auto modelArray = nlohmann::json();
+  for( auto i : m_modelEquip )
+  {
+    modelArray.push_back( std::to_string( i ) );
+  }
+  c.push_back( modelArray );
+
+  // unknowns
+  c.push_back( "1" );
+  c.push_back( "0" );
+  c.push_back( "0" );
+  c.push_back( "0" );
+
+  c.push_back( std::to_string( m_equipDisplayFlags ) );
+
+  // unknowns
+  c.push_back( "0" );
+  c.push_back( "0" );
+  c.push_back( "0" );
+  c.push_back( "0" );
+
+
+  payload["classname"] = "ClientSelectData";
+  payload["classid"] = 116;
+
+  return payload.dump();
 }
 
 uint8_t PlayerMinimal::getClassLevel()

From 9574819decf6720eb9f886d7a16b55d29eafac23 Mon Sep 17 00:00:00 2001
From: NotAdam <adam@notadam.me>
Date: Sat, 20 Jul 2019 22:13:24 +1000
Subject: [PATCH 104/351] misc api cleanup

---
 src/api/PlayerMinimal.cpp | 84 +--------------------------------------
 src/api/PlayerMinimal.h   |  4 +-
 src/api/main.cpp          |  2 +-
 3 files changed, 4 insertions(+), 86 deletions(-)

diff --git a/src/api/PlayerMinimal.cpp b/src/api/PlayerMinimal.cpp
index 3d0bc685..2ea32f5f 100644
--- a/src/api/PlayerMinimal.cpp
+++ b/src/api/PlayerMinimal.cpp
@@ -14,17 +14,11 @@ namespace Sapphire::Api {
 using namespace Common;
 
 // player constructor
-PlayerMinimal::PlayerMinimal( void ) :
+PlayerMinimal::PlayerMinimal() :
   m_id( 0 )
 {
 
 
-}
-
-// deconstructor
-PlayerMinimal::~PlayerMinimal( void )
-{
-
 }
 
 // load player from the db
@@ -85,58 +79,6 @@ void PlayerMinimal::load( uint32_t charId )
   }
 }
 
-
-std::string PlayerMinimal::getLookString()
-{
-
-  auto it = m_lookMap.begin();
-
-  std::string lookString;
-
-  for( ; it != m_lookMap.end(); ++it )
-  {
-
-    std::string s = std::to_string( it->second );
-
-    lookString += "\"" + s + "\"";
-    if( it != m_lookMap.end() )
-    {
-      lookString += ",";
-    }
-  }
-
-  return lookString.substr( 0, lookString.size() - 1 );
-}
-
-std::string PlayerMinimal::getModelString()
-{
-  std::string modelString = "\""
-                            + std::to_string( m_modelEquip[ 0 ] ) + "\",\""
-                            + std::to_string( m_modelEquip[ 1 ] ) + "\",\""
-                            + std::to_string( m_modelEquip[ 2 ] ) + "\",\""
-                            + std::to_string( m_modelEquip[ 3 ] ) + "\",\""
-                            + std::to_string( m_modelEquip[ 4 ] ) + "\",\""
-                            + std::to_string( m_modelEquip[ 5 ] ) + "\",\""
-                            + std::to_string( m_modelEquip[ 6 ] ) + "\",\""
-                            + std::to_string( m_modelEquip[ 7 ] ) + "\",\""
-                            + std::to_string( m_modelEquip[ 8 ] ) + "\",\""
-                            + std::to_string( m_modelEquip[ 9 ] ) + "\"";
-  return modelString;
-}
-
-std::string PlayerMinimal::getLevelsString()
-{
-  auto levelsArray = nlohmann::json();
-
-  for( int i = 0; i < Common::CLASSJOB_SLOTS; ++i )
-  {
-    // these must be strings
-    levelsArray.push_back( std::to_string( m_classMap[ i ] ) );
-  }
-
-  return levelsArray.dump();
-}
-
 std::string PlayerMinimal::getInfoJson()
 {
   auto payload = nlohmann::json();
@@ -221,30 +163,6 @@ uint8_t PlayerMinimal::getClassLevel()
   return static_cast< uint8_t >( m_classMap[ classJobIndex ] );
 }
 
-std::string PlayerMinimal::getClassString()
-{
-
-  std::map< uint8_t, uint16_t >::iterator it;
-
-  it = m_classMap.begin();
-
-  std::string classString;
-
-  for( ; it != m_classMap.end(); ++it )
-  {
-
-    std::string s = std::to_string( it->second );
-
-    classString += "\"" + s + "\"";
-    if( it != m_classMap.end() )
-    {
-      classString += ",";
-    }
-  }
-
-  return classString.substr( 0, classString.size() - 1 );
-}
-
 void PlayerMinimal::saveAsNew()
 {
 
diff --git a/src/api/PlayerMinimal.h b/src/api/PlayerMinimal.h
index 17318358..39121928 100644
--- a/src/api/PlayerMinimal.h
+++ b/src/api/PlayerMinimal.h
@@ -11,9 +11,9 @@ namespace Sapphire::Api
   class PlayerMinimal
   {
   public:
-    PlayerMinimal( void );
+    PlayerMinimal();
 
-    ~PlayerMinimal( void );
+    ~PlayerMinimal() = default;
 
     // write player to the database
     void write();
diff --git a/src/api/main.cpp b/src/api/main.cpp
index 5d661387..004233ba 100644
--- a/src/api/main.cpp
+++ b/src/api/main.cpp
@@ -699,7 +699,7 @@ void defaultGet( shared_ptr< HttpServer::Response > response, shared_ptr< HttpSe
   catch( const exception& )
   {
     string content = "Path not found: " + request->path;
-    *response << buildHttpResponse( 400, content );
+    *response << buildHttpResponse( 404, content );
   }
 }
 

From 044030e9442af19b0f36f9a5f036e7b0a3dd9856 Mon Sep 17 00:00:00 2001
From: NotAdam <adam@notadam.me>
Date: Sun, 21 Jul 2019 17:44:29 +1000
Subject: [PATCH 105/351] add status entries to EffectResult packet

---
 .../Network/PacketDef/Zone/ServerZoneDef.h    | 21 ++++++++++++-------
 src/world/Actor/Chara.cpp                     | 13 +++++++-----
 2 files changed, 21 insertions(+), 13 deletions(-)

diff --git a/src/common/Network/PacketDef/Zone/ServerZoneDef.h b/src/common/Network/PacketDef/Zone/ServerZoneDef.h
index 6649feb8..c4e4897f 100644
--- a/src/common/Network/PacketDef/Zone/ServerZoneDef.h
+++ b/src/common/Network/PacketDef/Zone/ServerZoneDef.h
@@ -349,14 +349,19 @@ namespace Sapphire::Network::Packets::Server
     uint32_t max_hp;
     uint16_t max_mp;
     uint16_t max_something;
-    uint8_t effect_index; // which position do i display this
-    uint8_t unknown3;
-    uint16_t effect_id;
-    uint16_t param;
-    uint16_t unknown5;    // Sort this out (old right half of power/param property)
-    float duration;
-    uint32_t actor_id1;
-    uint8_t unknown4[52];
+
+    struct StatusEntry
+    {
+      uint8_t index; // which position do i display this
+      uint8_t unknown3;
+      uint16_t id;
+      uint16_t param;
+      uint16_t unknown5;    // Sort this out (old right half of power/param property)
+      float duration;
+      uint32_t sourceActorId;
+    } statusEntries[4];
+
+    uint32_t unknown4;
   };
 
   /**
diff --git a/src/world/Actor/Chara.cpp b/src/world/Actor/Chara.cpp
index c3a09a0c..15e75ae2 100644
--- a/src/world/Actor/Chara.cpp
+++ b/src/world/Actor/Chara.cpp
@@ -460,18 +460,21 @@ void Sapphire::Entity::Chara::addStatusEffect( StatusEffect::StatusEffectPtr pEf
   auto statusEffectAdd = makeZonePacket< FFXIVIpcEffectResult >( getId() );
 
   statusEffectAdd->data().actor_id = pEffect->getTargetActorId();
-  statusEffectAdd->data().actor_id1 = pEffect->getSrcActorId();
   statusEffectAdd->data().current_hp = getHp();
   statusEffectAdd->data().current_mp = getMp();
   statusEffectAdd->data().current_tp = getTp();
-  statusEffectAdd->data().duration = static_cast< float >( pEffect->getDuration() ) / 1000;
-  statusEffectAdd->data().effect_id = pEffect->getId();
-  statusEffectAdd->data().effect_index = nextSlot;
   statusEffectAdd->data().max_hp = getMaxHp();
   statusEffectAdd->data().max_mp = getMaxMp();
   statusEffectAdd->data().max_something = 1;
   //statusEffectAdd->data().unknown2 = 28;
-  statusEffectAdd->data().param = pEffect->getParam();
+
+  auto& status = statusEffectAdd->data().statusEntries[0];
+
+  status.sourceActorId = pEffect->getSrcActorId();
+  status.duration = static_cast< float >( pEffect->getDuration() ) / 1000;
+  status.id = pEffect->getId();
+  status.index = nextSlot;
+  status.param = pEffect->getParam();
 
   sendToInRangeSet( statusEffectAdd, isPlayer() );
 }

From f9f7da531a98b3a2542dd41bd0e40bb072b38f70 Mon Sep 17 00:00:00 2001
From: NotAdam <adam@notadam.me>
Date: Sun, 21 Jul 2019 17:54:19 +1000
Subject: [PATCH 106/351] update some client opcodes

---
 src/common/Network/CommonActorControl.h | 2 +-
 src/common/Network/PacketDef/Ipcs.h     | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/common/Network/CommonActorControl.h b/src/common/Network/CommonActorControl.h
index b3ecf167..e91b63bd 100644
--- a/src/common/Network/CommonActorControl.h
+++ b/src/common/Network/CommonActorControl.h
@@ -315,7 +315,7 @@ enum ActorControlType : uint16_t
     UpdatedSeenHowTos = 0x133,
     AllotAttribute = 0x135,
 
-    ClearWaymarks = 0x13A,
+    ClearFieldMarkers = 0x13A,
     CameraMode = 0x13B, // param12, 1 = camera mode enable, 0 = disable
     CharaNameReq = 0x13D, // requests character name by content id
     HuntingLogDetails = 0x194,
diff --git a/src/common/Network/PacketDef/Ipcs.h b/src/common/Network/PacketDef/Ipcs.h
index b30f73ae..04ddf0cd 100644
--- a/src/common/Network/PacketDef/Ipcs.h
+++ b/src/common/Network/PacketDef/Ipcs.h
@@ -313,15 +313,14 @@ namespace Sapphire::Network::Packets
 
     ReqJoinNoviceNetwork = 0x0129, // updated 4.2
 
-    ReqCountdownInitiate = 0x0133, // updated 4.5
-    ReqCountdownCancel = 0x0134, // updated 4.5
-    ClearWaymarks = 0x0135, // updated 4.5
+    ReqCountdownInitiate = 0x0135, // updated 5.0
+    ReqCountdownCancel = 0x0136, // updated 5.0
 
     ZoneLineHandler = 0x0139, // updated 5.0
     ClientTrigger = 0x013A, // updated 5.0
     DiscoveryHandler = 0x013B, // updated 5.0
 
-    AddWaymark = 0x013A, // updated 4.5
+    PlaceFieldMarker = 0x013C, // updated 5.0
 
     SkillHandler = 0x013D, // updated 5.0
     GMCommand1 = 0x013E, // updated 5.0
@@ -331,6 +330,7 @@ namespace Sapphire::Network::Packets
     UpdatePositionHandler = 0x0141, // updated 5.0
 
     InventoryModifyHandler = 0x0148, // updated 5.0
+    InventoryEquipRecommendedItems = 0x0149, // updated 5.0
 
     ReqPlaceHousingItem = 0x014B, // updated 5.0
     BuildPresetHandler = 0x014F, // updated 5.0

From 5d2ebba5ac19aedfa22185a0cda4ba3b3ad827ab Mon Sep 17 00:00:00 2001
From: NotAdam <adam@notadam.me>
Date: Sun, 21 Jul 2019 21:40:16 +1000
Subject: [PATCH 107/351] retail accuracy in charainfo json

---
 src/api/PlayerMinimal.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/api/PlayerMinimal.cpp b/src/api/PlayerMinimal.cpp
index 2ea32f5f..c0a6ba34 100644
--- a/src/api/PlayerMinimal.cpp
+++ b/src/api/PlayerMinimal.cpp
@@ -146,7 +146,7 @@ std::string PlayerMinimal::getInfoJson()
 
   // unknowns
   c.push_back( "0" );
-  c.push_back( "0" );
+  c.push_back( "" );
   c.push_back( "0" );
   c.push_back( "0" );
 

From 891a73720dedea2234853a83ac6ef42e3107de01 Mon Sep 17 00:00:00 2001
From: NotAdam <adam@notadam.me>
Date: Sun, 21 Jul 2019 22:33:33 +1000
Subject: [PATCH 108/351] rename zone to territory

---
 .../common/housing/CmnDefHousingSignboard.cpp |   1 -
 src/world/Action/Action.cpp                   |   2 +-
 src/world/Actor/Actor.cpp                     |  10 +-
 src/world/Actor/Actor.h                       |   6 +-
 src/world/Actor/BNpc.cpp                      |   4 +-
 src/world/Actor/BNpc.h                        |   2 +-
 src/world/Actor/Chara.cpp                     |   2 +-
 src/world/Actor/EventObject.cpp               |   4 +-
 src/world/Actor/EventObject.h                 |   8 +-
 src/world/Actor/Npc.cpp                       |   2 +-
 src/world/Actor/Player.cpp                    |   6 +-
 src/world/Actor/Player.h                      |   4 +-
 src/world/Actor/PlayerEvent.cpp               |   2 +-
 src/world/Actor/PlayerInventory.cpp           |   2 +-
 src/world/Actor/PlayerSql.cpp                 |   6 +-
 src/world/ForwardsZone.h                      |   2 +-
 src/world/Manager/DebugCommandMgr.cpp         |   4 +-
 src/world/Manager/HousingMgr.cpp              |   2 +-
 src/world/Manager/PlayerMgr.cpp               |   4 +-
 src/world/Manager/TerritoryMgr.cpp            |  68 +++++-----
 src/world/Manager/TerritoryMgr.h              |  46 +++----
 src/world/Navi/NaviProvider.cpp               |   2 +-
 src/world/Network/GameConnection.cpp          |   8 +-
 .../Network/Handlers/ClientTriggerHandler.cpp |   2 +-
 .../Network/Handlers/GMCommandHandlers.cpp    |   8 +-
 .../Network/Handlers/InventoryHandler.cpp     |   2 +-
 src/world/Network/Handlers/PacketHandlers.cpp |   2 +-
 src/world/Script/ScriptMgr.cpp                |   4 +-
 src/world/Script/ScriptMgr.h                  |   2 +-
 src/world/Territory/Cell.cpp                  |   4 +-
 src/world/Territory/Cell.h                    |   6 +-
 .../Housing/HousingInteriorTerritory.cpp      |   4 +-
 .../Housing/HousingInteriorTerritory.h        |   4 +-
 src/world/Territory/HousingZone.cpp           |   4 +-
 src/world/Territory/HousingZone.h             |   4 +-
 src/world/Territory/InstanceContent.cpp       |  10 +-
 src/world/Territory/InstanceContent.h         |   4 +-
 src/world/Territory/QuestBattle.cpp           |  10 +-
 src/world/Territory/QuestBattle.h             |   4 +-
 .../Territory/{Zone.cpp => Territory.cpp}     | 118 +++++++++---------
 src/world/Territory/{Zone.h => Territory.h}   |  10 +-
 41 files changed, 198 insertions(+), 201 deletions(-)
 rename src/world/Territory/{Zone.cpp => Territory.cpp} (86%)
 rename src/world/Territory/{Zone.h => Territory.h} (93%)

diff --git a/src/scripts/common/housing/CmnDefHousingSignboard.cpp b/src/scripts/common/housing/CmnDefHousingSignboard.cpp
index 941ebec7..3ef74e78 100644
--- a/src/scripts/common/housing/CmnDefHousingSignboard.cpp
+++ b/src/scripts/common/housing/CmnDefHousingSignboard.cpp
@@ -1,6 +1,5 @@
 #include <ScriptObject.h>
 #include <Actor/Player.h>
-#include <Territory/Zone.h>
 #include <Territory/HousingZone.h>
 #include <Manager/HousingMgr.h>
 #include <Network/PacketWrappers/ActorControlPacket143.h>
diff --git a/src/world/Action/Action.cpp b/src/world/Action/Action.cpp
index ba1665d0..8dd472f7 100644
--- a/src/world/Action/Action.cpp
+++ b/src/world/Action/Action.cpp
@@ -11,7 +11,7 @@
 #include "Actor/Player.h"
 #include "Actor/BNpc.h"
 
-#include "Territory/Zone.h"
+#include "Territory/Territory.h"
 
 #include <Network/CommonActorControl.h>
 #include "Network/PacketWrappers/ActorControlPacket142.h"
diff --git a/src/world/Actor/Actor.cpp b/src/world/Actor/Actor.cpp
index 5d6dbd7c..4bbf9a08 100644
--- a/src/world/Actor/Actor.cpp
+++ b/src/world/Actor/Actor.cpp
@@ -6,7 +6,7 @@
 #include <Util/UtilMath.h>
 #include <utility>
 
-#include "Territory/Zone.h"
+#include "Territory/Territory.h"
 
 #include "Network/GameConnection.h"
 
@@ -330,14 +330,14 @@ std::set< Sapphire::Entity::ActorPtr > Sapphire::Entity::Actor::getInRangeActors
   return tempInRange;
 }
 
-/*! \return ZonePtr to the current zone, nullptr if not set */
-Sapphire::ZonePtr Sapphire::Entity::Actor::getCurrentZone() const
+/*! \return TerritoryPtr to the current zone, nullptr if not set */
+Sapphire::TerritoryPtr Sapphire::Entity::Actor::getCurrentZone() const
 {
   return m_pCurrentZone;
 }
 
-/*! \param ZonePtr to the zone to be set as current */
-void Sapphire::Entity::Actor::setCurrentZone( ZonePtr currZone )
+/*! \param TerritoryPtr to the zone to be set as current */
+void Sapphire::Entity::Actor::setCurrentZone( TerritoryPtr currZone )
 {
   m_pCurrentZone = currZone;
 }
diff --git a/src/world/Actor/Actor.h b/src/world/Actor/Actor.h
index f251cbae..0df1d32c 100644
--- a/src/world/Actor/Actor.h
+++ b/src/world/Actor/Actor.h
@@ -32,7 +32,7 @@ namespace Sapphire::Entity
     /*! Id of the zone the actor currently is in */
     uint32_t m_territoryTypeId;
     /*! Ptr to the ZoneObj the actor belongs to */
-    ZonePtr m_pCurrentZone;
+    TerritoryPtr m_pCurrentZone;
 
     /*! list of various actors in range */
     std::set< ActorPtr > m_inRangeActor;
@@ -122,9 +122,9 @@ namespace Sapphire::Entity
 
     BNpcPtr getAsBNpc();
 
-    ZonePtr getCurrentZone() const;
+    TerritoryPtr getCurrentZone() const;
 
-    void setCurrentZone( ZonePtr currZone );
+    void setCurrentZone( TerritoryPtr currZone );
 
     InstanceContentPtr getCurrentInstance() const;
 
diff --git a/src/world/Actor/BNpc.cpp b/src/world/Actor/BNpc.cpp
index 548db5d8..6ccb3d47 100644
--- a/src/world/Actor/BNpc.cpp
+++ b/src/world/Actor/BNpc.cpp
@@ -11,7 +11,7 @@
 #include "Forwards.h"
 #include "Action/Action.h"
 
-#include "Territory/Zone.h"
+#include "Territory/Territory.h"
 
 #include "Network/GameConnection.h"
 #include "Network/PacketWrappers/ActorControlPacket142.h"
@@ -53,7 +53,7 @@ Sapphire::Entity::BNpc::BNpc( FrameworkPtr pFw ) :
 }
 
 Sapphire::Entity::BNpc::BNpc( uint32_t id, BNpcTemplatePtr pTemplate, float posX, float posY, float posZ, float rot,
-                              uint8_t level, uint32_t maxHp, ZonePtr pZone, FrameworkPtr pFw ) :
+                              uint8_t level, uint32_t maxHp, TerritoryPtr pZone, FrameworkPtr pFw ) :
   Npc( ObjKind::BattleNpc, pFw )
 {
   m_id = id;
diff --git a/src/world/Actor/BNpc.h b/src/world/Actor/BNpc.h
index 8f14e024..c76f8e99 100644
--- a/src/world/Actor/BNpc.h
+++ b/src/world/Actor/BNpc.h
@@ -51,7 +51,7 @@ namespace Sapphire::Entity
   public:
     BNpc( FrameworkPtr pFw );
     BNpc( uint32_t id, BNpcTemplatePtr pTemplate, float posX, float posY, float posZ, float rot,
-          uint8_t level, uint32_t maxHp, ZonePtr pZone,FrameworkPtr pFw );
+          uint8_t level, uint32_t maxHp, TerritoryPtr pZone,FrameworkPtr pFw );
 
     virtual ~BNpc() override;
 
diff --git a/src/world/Actor/Chara.cpp b/src/world/Actor/Chara.cpp
index 15e75ae2..7991c0bd 100644
--- a/src/world/Actor/Chara.cpp
+++ b/src/world/Actor/Chara.cpp
@@ -8,7 +8,7 @@
 
 #include "Forwards.h"
 
-#include "Territory/Zone.h"
+#include "Territory/Territory.h"
 
 #include "Network/GameConnection.h"
 #include "Network/PacketWrappers/ActorControlPacket142.h"
diff --git a/src/world/Actor/EventObject.cpp b/src/world/Actor/EventObject.cpp
index b8829d30..cc34720e 100644
--- a/src/world/Actor/EventObject.cpp
+++ b/src/world/Actor/EventObject.cpp
@@ -102,12 +102,12 @@ uint32_t Sapphire::Entity::EventObject::getHousingLink() const
   return m_housingLink;
 }
 
-void Sapphire::Entity::EventObject::setParentInstance( Sapphire::ZonePtr instance )
+void Sapphire::Entity::EventObject::setParentInstance( Sapphire::TerritoryPtr instance )
 {
   m_parentInstance = instance;
 }
 
-Sapphire::ZonePtr Sapphire::Entity::EventObject::getParentInstance() const
+Sapphire::TerritoryPtr Sapphire::Entity::EventObject::getParentInstance() const
 {
   return m_parentInstance;
 }
diff --git a/src/world/Actor/EventObject.h b/src/world/Actor/EventObject.h
index 5e99256d..7b38f64d 100644
--- a/src/world/Actor/EventObject.h
+++ b/src/world/Actor/EventObject.h
@@ -13,7 +13,7 @@ namespace Sapphire::Entity
                  Common::FFXIVARR_POSITION3 pos, float rotation, const std::string& givenName = "none" );
 
     using OnTalkEventHandler = std::function< void( Entity::Player&, Entity::EventObjectPtr,
-                                                    ZonePtr, uint64_t ) >;
+                                                    TerritoryPtr, uint64_t ) >;
 
     uint32_t getGimmickId() const;
 
@@ -35,9 +35,9 @@ namespace Sapphire::Entity
 
     const std::string& getName() const;
 
-    ZonePtr getParentInstance() const;
+    TerritoryPtr getParentInstance() const;
 
-    void setParentInstance( ZonePtr instance );
+    void setParentInstance( TerritoryPtr instance );
 
     void spawn( PlayerPtr pTarget ) override;
 
@@ -56,7 +56,7 @@ namespace Sapphire::Entity
     uint8_t m_state;
     float m_scale;
     std::string m_name;
-    ZonePtr m_parentInstance;
+    TerritoryPtr m_parentInstance;
     OnTalkEventHandler m_onTalkEventHandler;
 
 
diff --git a/src/world/Actor/Npc.cpp b/src/world/Actor/Npc.cpp
index b0c86a90..6dcf112f 100644
--- a/src/world/Actor/Npc.cpp
+++ b/src/world/Actor/Npc.cpp
@@ -9,7 +9,7 @@
 #include "Forwards.h"
 #include "Action/Action.h"
 
-#include "Territory/Zone.h"
+#include "Territory/Territory.h"
 
 #include "Network/GameConnection.h"
 #include "Network/PacketWrappers/ActorControlPacket142.h"
diff --git a/src/world/Actor/Player.cpp b/src/world/Actor/Player.cpp
index b008b987..ed003ed3 100644
--- a/src/world/Actor/Player.cpp
+++ b/src/world/Actor/Player.cpp
@@ -16,7 +16,7 @@
 #include "Manager/TerritoryMgr.h"
 #include "Manager/RNGMgr.h"
 
-#include "Territory/Zone.h"
+#include "Territory/Territory.h"
 #include "Territory/ZonePosition.h"
 #include "Territory/InstanceContent.h"
 #include "Territory/Land.h"
@@ -437,7 +437,7 @@ bool Sapphire::Entity::Player::setInstance( uint32_t instanceContentId )
   return setInstance( instance );
 }
 
-bool Sapphire::Entity::Player::setInstance( ZonePtr instance )
+bool Sapphire::Entity::Player::setInstance( TerritoryPtr instance )
 {
   m_onEnterEventDone = false;
   if( !instance )
@@ -458,7 +458,7 @@ bool Sapphire::Entity::Player::setInstance( ZonePtr instance )
   return pTeriMgr->movePlayer( instance, getAsPlayer() );
 }
 
-bool Sapphire::Entity::Player::setInstance( ZonePtr instance, Common::FFXIVARR_POSITION3 pos )
+bool Sapphire::Entity::Player::setInstance( TerritoryPtr instance, Common::FFXIVARR_POSITION3 pos )
 {
   m_onEnterEventDone = false;
   if( !instance )
diff --git a/src/world/Actor/Player.h b/src/world/Actor/Player.h
index 08caf559..efaf1f7d 100644
--- a/src/world/Actor/Player.h
+++ b/src/world/Actor/Player.h
@@ -480,10 +480,10 @@ namespace Sapphire::Entity
     bool setInstance( uint32_t instanceContentId );
 
     /*! sets the players instance & initiates zoning process */
-    bool setInstance( ZonePtr instance );
+    bool setInstance( TerritoryPtr instance );
 
     /*! sets the players instance & initiates zoning process */
-    bool setInstance( Sapphire::ZonePtr instance, Sapphire::Common::FFXIVARR_POSITION3 pos );
+    bool setInstance( Sapphire::TerritoryPtr instance, Sapphire::Common::FFXIVARR_POSITION3 pos );
 
     /*! returns the player to their position before zoning into an instance */
     bool exitInstance();
diff --git a/src/world/Actor/PlayerEvent.cpp b/src/world/Actor/PlayerEvent.cpp
index 507973c8..7db09d0b 100644
--- a/src/world/Actor/PlayerEvent.cpp
+++ b/src/world/Actor/PlayerEvent.cpp
@@ -11,7 +11,7 @@
 #include "Network/PacketWrappers/EventFinishPacket.h"
 #include "Network/PacketWrappers/DirectorPlayScenePacket.h"
 
-#include "Territory/Zone.h"
+#include "Territory/Territory.h"
 #include "ServerMgr.h"
 #include "Framework.h"
 
diff --git a/src/world/Actor/PlayerInventory.cpp b/src/world/Actor/PlayerInventory.cpp
index 77677c64..720f2f2e 100644
--- a/src/world/Actor/PlayerInventory.cpp
+++ b/src/world/Actor/PlayerInventory.cpp
@@ -3,7 +3,7 @@
 #include <Network/CommonActorControl.h>
 #include <algorithm>
 
-#include "Territory/Zone.h"
+#include "Territory/Territory.h"
 
 #include "Network/PacketWrappers/ActorControlPacket142.h"
 #include "Network/PacketWrappers/ActorControlPacket143.h"
diff --git a/src/world/Actor/PlayerSql.cpp b/src/world/Actor/PlayerSql.cpp
index 91d032a3..61bac0a7 100644
--- a/src/world/Actor/PlayerSql.cpp
+++ b/src/world/Actor/PlayerSql.cpp
@@ -13,7 +13,7 @@
 #include "Network/PacketWrappers/PlayerSetupPacket.h"
 
 #include "Manager/TerritoryMgr.h"
-#include "Territory/Zone.h"
+#include "Territory/Territory.h"
 #include "Inventory/Item.h"
 #include "Inventory/ItemContainer.h"
 #include "Manager/ItemMgr.h"
@@ -64,7 +64,7 @@ bool Sapphire::Entity::Player::load( uint32_t charId, World::SessionPtr pSession
   m_prevPos.z = res->getFloat( "OPosZ" );
   m_prevRot = res->getFloat( "OPosR" );
 
-  ZonePtr pCurrZone = nullptr;
+  TerritoryPtr pCurrZone = nullptr;
 
   // if the zone is an instanceContent zone, we need to actually find the instance
   if( pTeriMgr->isInstanceContentTerritory( zoneId ) )
@@ -108,7 +108,7 @@ bool Sapphire::Entity::Player::load( uint32_t charId, World::SessionPtr pSession
   // see if a valid zone could be found for the character
   if( !pCurrZone )
   {
-    Logger::error( "[{0}] Zone #{1} not found!", char_id_str, zoneId );
+    Logger::error( "[{0}] Territory #{1} not found!", char_id_str, zoneId );
     Logger::error( "[{0}] Setting default zone instead", char_id_str );
 
     // default to new gridania
diff --git a/src/world/ForwardsZone.h b/src/world/ForwardsZone.h
index fb584c7b..95ac658f 100644
--- a/src/world/ForwardsZone.h
+++ b/src/world/ForwardsZone.h
@@ -19,7 +19,7 @@ typedef std::vector< x > x ## PtrList;
 namespace Sapphire
 {
 TYPE_FORWARD( Cell );
-TYPE_FORWARD( Zone );
+TYPE_FORWARD( Territory );
 TYPE_FORWARD( HousingZone );
 TYPE_FORWARD( House );
 TYPE_FORWARD( InstanceContent );
diff --git a/src/world/Manager/DebugCommandMgr.cpp b/src/world/Manager/DebugCommandMgr.cpp
index 76c89a7f..ac4c73a0 100644
--- a/src/world/Manager/DebugCommandMgr.cpp
+++ b/src/world/Manager/DebugCommandMgr.cpp
@@ -27,7 +27,7 @@
 #include "Actor/EventObject.h"
 #include "Actor/BNpc.h"
 
-#include "Territory/Zone.h"
+#include "Territory/Territory.h"
 #include "Territory/HousingZone.h"
 #include "Territory/InstanceContent.h"
 #include "Territory/QuestBattle.h"
@@ -1267,7 +1267,7 @@ void Sapphire::World::Manager::DebugCommandMgr::housing( char* data, Entity::Pla
 //          player.sendLandFlags();
 //        }
 //        else
-//          player.sendDebug( "You aren't in a housing Zone." );
+//          player.sendDebug( "You aren't in a housing Territory." );
 //      }
 //    }
 //    else
diff --git a/src/world/Manager/HousingMgr.cpp b/src/world/Manager/HousingMgr.cpp
index 623c6073..beacd0f7 100644
--- a/src/world/Manager/HousingMgr.cpp
+++ b/src/world/Manager/HousingMgr.cpp
@@ -16,7 +16,7 @@
 #include "Event/EventDefs.h"
 
 #include "TerritoryMgr.h"
-#include "Territory/Zone.h"
+#include "Territory/Territory.h"
 #include "Territory/HousingZone.h"
 #include "Territory/Housing/HousingInteriorTerritory.h"
 #include "HousingMgr.h"
diff --git a/src/world/Manager/PlayerMgr.cpp b/src/world/Manager/PlayerMgr.cpp
index 557f9c7f..1f0f60a1 100644
--- a/src/world/Manager/PlayerMgr.cpp
+++ b/src/world/Manager/PlayerMgr.cpp
@@ -5,7 +5,7 @@
 
 #include <Manager/TerritoryMgr.h>
 #include <Territory/ZonePosition.h>
-#include <Territory/Zone.h>
+#include <Territory/Territory.h>
 
 #include <Manager/HousingMgr.h>
 
@@ -26,7 +26,7 @@ void Sapphire::World::Manager::PlayerMgr::movePlayerToLandDestination( Sapphire:
   if( !terriMgr )
     return;
 
-  Sapphire::ZonePtr destinationZone;
+  Sapphire::TerritoryPtr destinationZone;
 
   auto terriPos = terriMgr->getTerritoryPosition( landId );
   if( terriPos )
diff --git a/src/world/Manager/TerritoryMgr.cpp b/src/world/Manager/TerritoryMgr.cpp
index fb5fd0ca..3e707511 100644
--- a/src/world/Manager/TerritoryMgr.cpp
+++ b/src/world/Manager/TerritoryMgr.cpp
@@ -8,7 +8,7 @@
 
 #include "Actor/Player.h"
 
-#include "Territory/Zone.h"
+#include "Territory/Territory.h"
 #include "Territory/ZonePosition.h"
 #include "Territory/InstanceContent.h"
 #include "Territory/QuestBattle.h"
@@ -181,7 +181,7 @@ bool Sapphire::World::Manager::TerritoryMgr::createDefaultTerritories()
 
     uint32_t guid = getNextInstanceId();
 
-    auto pZone = make_Zone( territoryTypeId, guid, territoryInfo->name, pPlaceName->name, framework() );
+    auto pZone = make_Territory( territoryTypeId, guid, territoryInfo->name, pPlaceName->name, framework() );
     pZone->init();
 
     std::string bgPath = territoryInfo->bg;
@@ -197,9 +197,9 @@ bool Sapphire::World::Manager::TerritoryMgr::createDefaultTerritories()
                   hasNaviMesh ? "NAVI" : "",
                   pPlaceName->name );
 
-    InstanceIdToZonePtrMap instanceMap;
+    InstanceIdToTerritoryPtrMap instanceMap;
     instanceMap[ guid ] = pZone;
-    m_guIdToZonePtrMap[ guid ] = pZone;
+    m_guIdToTerritoryPtrMap[ guid ] = pZone;
     m_territoryTypeIdToInstanceGuidMap[ territoryTypeId ] = instanceMap;
     m_zoneSet.insert( { pZone } );
 
@@ -243,11 +243,11 @@ bool Sapphire::World::Manager::TerritoryMgr::createHousingTerritories()
                                             pPlaceName->name, framework() );
       pHousingZone->init();
 
-      InstanceIdToZonePtrMap instanceMap;
+      InstanceIdToTerritoryPtrMap instanceMap;
       instanceMap[ guid ] = pHousingZone;
-      m_guIdToZonePtrMap[ guid ] = pHousingZone;
+      m_guIdToTerritoryPtrMap[ guid ] = pHousingZone;
       m_territoryTypeIdToInstanceGuidMap[ territoryTypeId ][ guid ] = pHousingZone;
-      m_landSetIdToZonePtrMap[ pHousingZone->getLandSetId() ] = pHousingZone;
+      m_landSetIdToTerritoryPtrMap[ pHousingZone->getLandSetId() ] = pHousingZone;
       m_zoneSet.insert( { pHousingZone } );
     }
 
@@ -256,7 +256,7 @@ bool Sapphire::World::Manager::TerritoryMgr::createHousingTerritories()
   return true;
 }
 
-Sapphire::ZonePtr Sapphire::World::Manager::TerritoryMgr::createTerritoryInstance( uint32_t territoryTypeId )
+Sapphire::TerritoryPtr Sapphire::World::Manager::TerritoryMgr::createTerritoryInstance( uint32_t territoryTypeId )
 {
   if( !isValidTerritory( territoryTypeId ) )
     return nullptr;
@@ -274,17 +274,17 @@ Sapphire::ZonePtr Sapphire::World::Manager::TerritoryMgr::createTerritoryInstanc
 
   Logger::debug( "Starting instance for territory: {0} ({1})", territoryTypeId, pPlaceName->name );
 
-  auto pZone = make_Zone( territoryTypeId, getNextInstanceId(), pTeri->name, pPlaceName->name, framework() );
+  auto pZone = make_Territory( territoryTypeId, getNextInstanceId(), pTeri->name, pPlaceName->name, framework() );
   pZone->init();
 
-  m_guIdToZonePtrMap[ pZone->getGuId() ] = pZone;
+  m_guIdToTerritoryPtrMap[ pZone->getGuId() ] = pZone;
   m_territoryTypeIdToInstanceGuidMap[ pZone->getTerritoryTypeId() ][ pZone->getGuId() ] = pZone;
   m_zoneSet.insert( { pZone } );
 
   return pZone;
 }
 
-Sapphire::ZonePtr Sapphire::World::Manager::TerritoryMgr::createQuestBattle( uint32_t questBattleId )
+Sapphire::TerritoryPtr Sapphire::World::Manager::TerritoryMgr::createQuestBattle( uint32_t questBattleId )
 {
 
   auto it = m_questBattleToContentFinderMap.find( questBattleId );
@@ -321,13 +321,13 @@ Sapphire::ZonePtr Sapphire::World::Manager::TerritoryMgr::createQuestBattle( uin
   pZone->init();
 
   m_questBattleIdToInstanceMap[ questBattleId ][ pZone->getGuId() ] = pZone;
-  m_guIdToZonePtrMap[ pZone->getGuId() ] = pZone;
+  m_guIdToTerritoryPtrMap[ pZone->getGuId() ] = pZone;
   m_instanceZoneSet.insert( pZone );
 
   return pZone;
 }
 
-Sapphire::ZonePtr Sapphire::World::Manager::TerritoryMgr::createInstanceContent( uint32_t contentFinderConditionId )
+Sapphire::TerritoryPtr Sapphire::World::Manager::TerritoryMgr::createInstanceContent( uint32_t contentFinderConditionId )
 {
 
   auto pExdData = framework()->get< Data::ExdDataGenerated >();
@@ -355,19 +355,19 @@ Sapphire::ZonePtr Sapphire::World::Manager::TerritoryMgr::createInstanceContent(
   pZone->init();
 
   m_instanceContentIdToInstanceMap[ instanceContentId ][ pZone->getGuId() ] = pZone;
-  m_guIdToZonePtrMap[ pZone->getGuId() ] = pZone;
+  m_guIdToTerritoryPtrMap[ pZone->getGuId() ] = pZone;
   m_instanceZoneSet.insert( pZone );
 
   return pZone;
 }
 
-Sapphire::ZonePtr Sapphire::World::Manager::TerritoryMgr::findOrCreateHousingInterior( const Common::LandIdent landIdent )
+Sapphire::TerritoryPtr Sapphire::World::Manager::TerritoryMgr::findOrCreateHousingInterior( const Common::LandIdent landIdent )
 {
   // check if zone already spawned first
   auto ident = *reinterpret_cast< const uint64_t* >( &landIdent );
 
-  auto it = m_landIdentToZonePtrMap.find( ident );
-  if( it != m_landIdentToZonePtrMap.end() )
+  auto it = m_landIdentToTerritoryPtrMap.find( ident );
+  if( it != m_landIdentToTerritoryPtrMap.end() )
   {
     return it->second;
   }
@@ -427,8 +427,8 @@ Sapphire::ZonePtr Sapphire::World::Manager::TerritoryMgr::findOrCreateHousingInt
 
   zone->init();
 
-  m_landIdentToZonePtrMap[ ident ] = zone;
-  m_guIdToZonePtrMap[ zone->getGuId() ] = zone;
+  m_landIdentToTerritoryPtrMap[ ident ] = zone;
+  m_guIdToTerritoryPtrMap[ zone->getGuId() ] = zone;
   m_zoneSet.insert( { zone } );
 
   return zone;
@@ -436,11 +436,11 @@ Sapphire::ZonePtr Sapphire::World::Manager::TerritoryMgr::findOrCreateHousingInt
 
 bool Sapphire::World::Manager::TerritoryMgr::removeTerritoryInstance( uint32_t guId )
 {
-  ZonePtr pZone;
+  TerritoryPtr pZone;
   if( ( pZone = getTerritoryByGuId( guId ) ) == nullptr )
     return false;
 
-  m_guIdToZonePtrMap.erase( pZone->getGuId() );
+  m_guIdToTerritoryPtrMap.erase( pZone->getGuId() );
 
   m_instanceZoneSet.erase( pZone );
   m_zoneSet.erase( pZone );
@@ -456,10 +456,10 @@ bool Sapphire::World::Manager::TerritoryMgr::removeTerritoryInstance( uint32_t g
   return true;
 }
 
-Sapphire::ZonePtr Sapphire::World::Manager::TerritoryMgr::getTerritoryByGuId( uint32_t guId ) const
+Sapphire::TerritoryPtr Sapphire::World::Manager::TerritoryMgr::getTerritoryByGuId( uint32_t guId ) const
 {
-  auto it = m_guIdToZonePtrMap.find( guId );
-  if( it == m_guIdToZonePtrMap.end() )
+  auto it = m_guIdToTerritoryPtrMap.find( guId );
+  if( it == m_guIdToTerritoryPtrMap.end() )
     return nullptr;
 
   return it->second;
@@ -495,7 +495,7 @@ Sapphire::ZonePositionPtr Sapphire::World::Manager::TerritoryMgr::getTerritoryPo
   return nullptr;
 }
 
-Sapphire::ZonePtr Sapphire::World::Manager::TerritoryMgr::getZoneByTerritoryTypeId( uint32_t territoryTypeId ) const
+Sapphire::TerritoryPtr Sapphire::World::Manager::TerritoryMgr::getZoneByTerritoryTypeId( uint32_t territoryTypeId ) const
 {
   auto zoneMap = m_territoryTypeIdToInstanceGuidMap.find( territoryTypeId );
   if( zoneMap == m_territoryTypeIdToInstanceGuidMap.end() )
@@ -505,10 +505,10 @@ Sapphire::ZonePtr Sapphire::World::Manager::TerritoryMgr::getZoneByTerritoryType
   return zoneMap->second.begin()->second;
 }
 
-Sapphire::ZonePtr Sapphire::World::Manager::TerritoryMgr::getZoneByLandSetId( uint32_t landSetId ) const
+Sapphire::TerritoryPtr Sapphire::World::Manager::TerritoryMgr::getZoneByLandSetId( uint32_t landSetId ) const
 {
-  auto zoneMap = m_landSetIdToZonePtrMap.find( landSetId );
-  if( zoneMap == m_landSetIdToZonePtrMap.end() )
+  auto zoneMap = m_landSetIdToTerritoryPtrMap.find( landSetId );
+  if( zoneMap == m_landSetIdToTerritoryPtrMap.end() )
     return nullptr;
 
   return zoneMap->second;
@@ -527,7 +527,7 @@ void Sapphire::World::Manager::TerritoryMgr::updateTerritoryInstances( uint64_t
   }
 
   // remove internal house zones with nobody in them
-  for( auto it = m_landIdentToZonePtrMap.begin(); it != m_landIdentToZonePtrMap.end(); )
+  for( auto it = m_landIdentToTerritoryPtrMap.begin(); it != m_landIdentToTerritoryPtrMap.end(); )
   {
     auto zone = std::dynamic_pointer_cast< Territory::Housing::HousingInteriorTerritory >( it->second );
     assert( zone ); // wtf??
@@ -541,7 +541,7 @@ void Sapphire::World::Manager::TerritoryMgr::updateTerritoryInstances( uint64_t
 
       // remove zone from maps
       m_zoneSet.erase( zone );
-      it = m_landIdentToZonePtrMap.erase( it );
+      it = m_landIdentToTerritoryPtrMap.erase( it );
     }
     else
       it++;
@@ -565,7 +565,7 @@ void Sapphire::World::Manager::TerritoryMgr::updateTerritoryInstances( uint64_t
 
         // remove zone from maps
         m_instanceZoneSet.erase( zone );
-        m_guIdToZonePtrMap.erase( zone->getGuId() );
+        m_guIdToTerritoryPtrMap.erase( zone->getGuId() );
         inIt = m_questBattleIdToInstanceMap[ zone->getQuestBattleId() ].erase( inIt );
       }
       else
@@ -598,11 +598,11 @@ bool Sapphire::World::Manager::TerritoryMgr::movePlayer( uint32_t territoryTypeI
   return movePlayer( pZone, pPlayer );
 }
 
-bool Sapphire::World::Manager::TerritoryMgr::movePlayer( ZonePtr pZone, Sapphire::Entity::PlayerPtr pPlayer )
+bool Sapphire::World::Manager::TerritoryMgr::movePlayer( TerritoryPtr pZone, Sapphire::Entity::PlayerPtr pPlayer )
 {
   if( !pZone )
   {
-    Logger::error( "Zone not found on this server." );
+    Logger::error( "Territory not found on this server." );
     return false;
   }
 
@@ -642,7 +642,7 @@ bool Sapphire::World::Manager::TerritoryMgr::movePlayer( ZonePtr pZone, Sapphire
   return true;
 }
 
-Sapphire::ZonePtr Sapphire::World::Manager::TerritoryMgr::getLinkedInstance( uint32_t playerId ) const
+Sapphire::TerritoryPtr Sapphire::World::Manager::TerritoryMgr::getLinkedInstance( uint32_t playerId ) const
 {
   auto it = m_playerIdToInstanceMap.find( playerId );
   if( it != m_playerIdToInstanceMap.end() )
diff --git a/src/world/Manager/TerritoryMgr.h b/src/world/Manager/TerritoryMgr.h
index 67b0229b..d3060656 100644
--- a/src/world/Manager/TerritoryMgr.h
+++ b/src/world/Manager/TerritoryMgr.h
@@ -102,21 +102,21 @@ namespace Sapphire::World::Manager
     bool isHousingTerritory( uint32_t territoryTypeId ) const;
 
     /*! creates a new instance for a given territoryTypeId */
-    ZonePtr createTerritoryInstance( uint32_t territoryTypeId );
+    TerritoryPtr createTerritoryInstance( uint32_t territoryTypeId );
 
-    ZonePtr createInstanceContent( uint32_t contentFinderConditionId );
+    TerritoryPtr createInstanceContent( uint32_t contentFinderConditionId );
 
-    ZonePtr createQuestBattle( uint32_t contentFinderConditionId );
+    TerritoryPtr createQuestBattle( uint32_t contentFinderConditionId );
 
     void createAndJoinQuestBattle( Entity::Player& player, uint16_t contentFinderConditionId );
 
-    ZonePtr findOrCreateHousingInterior( const Common::LandIdent landIdent );
+    TerritoryPtr findOrCreateHousingInterior( const Common::LandIdent landIdent );
 
     /*! removes instance by instanceId, return true if successful */
     bool removeTerritoryInstance( uint32_t guId );
 
-    /*! returns a ZonePtr to the instance or nullptr if not found */
-    ZonePtr getTerritoryByGuId( uint32_t guId ) const;
+    /*! returns a TerritoryPtr to the instance or nullptr if not found */
+    TerritoryPtr getTerritoryByGuId( uint32_t guId ) const;
 
     /*! returns the cached detail of a territory, nullptr if not found */
     Data::TerritoryTypePtr getTerritoryDetail( uint32_t territoryTypeId ) const;
@@ -129,17 +129,17 @@ namespace Sapphire::World::Manager
 
     /*! returns a default Zone by territoryTypeId
         TODO: Mind multiple instances?! */
-    ZonePtr getZoneByTerritoryTypeId( uint32_t territoryTypeId ) const;
+    TerritoryPtr getZoneByTerritoryTypeId( uint32_t territoryTypeId ) const;
 
     /*! returns a Zone by landSetId */
-    ZonePtr getZoneByLandSetId( uint32_t landSetId ) const;
+    TerritoryPtr getZoneByLandSetId( uint32_t landSetId ) const;
 
     bool movePlayer( uint32_t territoryTypeId, Entity::PlayerPtr pPlayer );
 
-    bool movePlayer( ZonePtr, Entity::PlayerPtr pPlayer );
+    bool movePlayer( TerritoryPtr, Entity::PlayerPtr pPlayer );
 
     /*! returns an instancePtr if the player is still bound to an isntance */
-    ZonePtr getLinkedInstance( uint32_t playerId ) const;
+    TerritoryPtr getLinkedInstance( uint32_t playerId ) const;
 
     /*!
      * @brief Sets the current festival for every zone
@@ -163,16 +163,16 @@ namespace Sapphire::World::Manager
 
   private:
     using TerritoryTypeDetailCache = std::unordered_map< uint16_t, Data::TerritoryTypePtr >;
-    using InstanceIdToZonePtrMap = std::unordered_map< uint32_t, ZonePtr >;
-    using LandSetIdToZonePtrMap = std::unordered_map< uint32_t, ZonePtr >;
-    using TerritoryTypeIdToInstanceMap = std::unordered_map< uint16_t, InstanceIdToZonePtrMap >;
-    using InstanceContentIdToInstanceMap = std::unordered_map< uint16_t, InstanceIdToZonePtrMap >;
-    using QuestBattleIdToInstanceMap = std::unordered_map< uint16_t, InstanceIdToZonePtrMap >;
+    using InstanceIdToTerritoryPtrMap = std::unordered_map< uint32_t, TerritoryPtr >;
+    using LandSetIdToTerritoryPtrMap = std::unordered_map< uint32_t, TerritoryPtr >;
+    using TerritoryTypeIdToInstanceMap = std::unordered_map< uint16_t, InstanceIdToTerritoryPtrMap >;
+    using InstanceContentIdToInstanceMap = std::unordered_map< uint16_t, InstanceIdToTerritoryPtrMap >;
+    using QuestBattleIdToInstanceMap = std::unordered_map< uint16_t, InstanceIdToTerritoryPtrMap >;
     using QuestBattleIdToContentFinderCondMap = std::unordered_map< uint16_t, uint16_t >;
     using PlayerIdToInstanceIdMap = std::unordered_map< uint32_t, uint32_t >;
     using PositionMap = std::unordered_map< int32_t, ZonePositionPtr >;
     using InstanceIdList = std::vector< uint32_t >;
-    using LandIdentToZonePtrMap = std::unordered_map< uint64_t, ZonePtr >;
+    using LandIdentToTerritoryPtrMap = std::unordered_map< uint64_t, TerritoryPtr >;
 
     /*! map holding details for territory templates */
     TerritoryTypeDetailCache m_territoryTypeDetailCacheMap;
@@ -181,7 +181,7 @@ namespace Sapphire::World::Manager
     TerritoryTypeIdToInstanceMap m_territoryTypeIdToInstanceGuidMap;
 
     /*! map holding actual instances of default territories */
-    LandSetIdToZonePtrMap m_landSetIdToZonePtrMap;
+    LandSetIdToTerritoryPtrMap m_landSetIdToTerritoryPtrMap;
 
     /*! map holding actual instances of InstanceContent */
     InstanceContentIdToInstanceMap m_instanceContentIdToInstanceMap;
@@ -190,7 +190,7 @@ namespace Sapphire::World::Manager
     QuestBattleIdToInstanceMap m_questBattleIdToInstanceMap;
 
     /*! flat map for easier lookup of instances by guid */
-    InstanceIdToZonePtrMap m_guIdToZonePtrMap;
+    InstanceIdToTerritoryPtrMap m_guIdToTerritoryPtrMap;
 
     /*! map holding positions for zonelines */
     PositionMap m_territoryPositionMap;
@@ -199,16 +199,16 @@ namespace Sapphire::World::Manager
     PlayerIdToInstanceIdMap m_playerIdToInstanceMap;
 
     /*! map for storing landident to zones, used for internal housing zones */
-    LandIdentToZonePtrMap m_landIdentToZonePtrMap;
+    LandIdentToTerritoryPtrMap m_landIdentToTerritoryPtrMap;
 
     /*! internal counter for instanceIds */
     uint32_t m_lastInstanceId;
 
-    /*! set of ZonePtrs for quick iteration*/
-    std::set< ZonePtr > m_zoneSet;
+    /*! set of TerritoryPtrs for quick iteration*/
+    std::set< TerritoryPtr > m_zoneSet;
 
-    /*! set of ZonePtrs for quick iteration*/
-    std::set< ZonePtr > m_instanceZoneSet;
+    /*! set of TerritoryPtrs for quick iteration*/
+    std::set< TerritoryPtr > m_instanceZoneSet;
 
     /*! current festival(s) to set for public zones from festival.exd */
     std::pair< uint16_t, uint16_t > m_currentFestival;
diff --git a/src/world/Navi/NaviProvider.cpp b/src/world/Navi/NaviProvider.cpp
index 89534d0c..433a2408 100644
--- a/src/world/Navi/NaviProvider.cpp
+++ b/src/world/Navi/NaviProvider.cpp
@@ -1,6 +1,6 @@
 #include <Common.h>
 #include <Framework.h>
-#include <Territory/Zone.h>
+#include <Territory/Territory.h>
 #include <Logging/Logger.h>
 #include <ServerMgr.h>
 
diff --git a/src/world/Network/GameConnection.cpp b/src/world/Network/GameConnection.cpp
index e9c9f5f2..12489297 100644
--- a/src/world/Network/GameConnection.cpp
+++ b/src/world/Network/GameConnection.cpp
@@ -8,7 +8,7 @@
 #include <Network/PacketContainer.h>
 #include <Network/GamePacketParser.h>
 
-#include "Territory/Zone.h"
+#include "Territory/Territory.h"
 
 #include "Network/PacketWrappers/PlayerSetupPacket.h"
 
@@ -215,13 +215,13 @@ void Sapphire::Network::GameConnection::handleZonePacket( Sapphire::Network::Pac
     std::string name = itStr != m_zoneHandlerStrMap.end() ? itStr->second : "unknown";
     // dont display packet notification if it is a ping or pos update, don't want the spam
     if( opcode != PingHandler && opcode != UpdatePositionHandler )
-      Logger::debug( "[{0}] Handling Zone IPC : {1} ( {2:04X} )", m_pSession->getId(), name, opcode );
+      Logger::debug( "[{0}] Handling World IPC : {1} ( {2:04X} )", m_pSession->getId(), name, opcode );
 
     ( this->*( it->second ) )( m_pFw, pPacket, *m_pSession->getPlayer() );
   }
   else
   {
-    Logger::debug( "[{0}] Undefined Zone IPC : Unknown ( {1:04X} )", m_pSession->getId(), opcode );
+    Logger::debug( "[{0}] Undefined World IPC : Unknown ( {1:04X} )", m_pSession->getId(), opcode );
 
     Logger::debug( "Dump:\n{0}", Util::binaryToHexDump( const_cast< uint8_t* >( &pPacket.data[ 0 ] ),
                                                        pPacket.segHdr.size ) );
@@ -433,7 +433,7 @@ void Sapphire::Network::GameConnection::handlePackets( const Sapphire::Network::
           auto pe1 = std::make_shared< FFXIVRawPacket >( 0x02, 0x38, 0, 0 );
           *( unsigned int* ) ( &pe1->data()[ 0 ] ) = playerId;
           sendSinglePacket( pe1 );
-          Logger::info( "[{0}] Setting session for zone connection", id );
+          Logger::info( "[{0}] Setting session for world connection", id );
           session->setZoneConnection( pCon );
         }
           // chat connection, assinging it to the session
diff --git a/src/world/Network/Handlers/ClientTriggerHandler.cpp b/src/world/Network/Handlers/ClientTriggerHandler.cpp
index c309cc41..81515fd9 100644
--- a/src/world/Network/Handlers/ClientTriggerHandler.cpp
+++ b/src/world/Network/Handlers/ClientTriggerHandler.cpp
@@ -8,7 +8,7 @@
 #include <Network/PacketDef/Zone/ClientZoneDef.h>
 #include <Util/Util.h>
 
-#include "Territory/Zone.h"
+#include "Territory/Territory.h"
 #include "Territory/ZonePosition.h"
 #include "Manager/HousingMgr.h"
 
diff --git a/src/world/Network/Handlers/GMCommandHandlers.cpp b/src/world/Network/Handlers/GMCommandHandlers.cpp
index 658b3b73..5e30611c 100644
--- a/src/world/Network/Handlers/GMCommandHandlers.cpp
+++ b/src/world/Network/Handlers/GMCommandHandlers.cpp
@@ -14,7 +14,7 @@
 #include "Session.h"
 
 #include "Manager/TerritoryMgr.h"
-#include "Territory/Zone.h"
+#include "Territory/Territory.h"
 #include "Territory/InstanceContent.h"
 
 #include "Network/PacketWrappers/PlayerSetupPacket.h"
@@ -191,7 +191,7 @@ void Sapphire::Network::GameConnection::gm1Handler( FrameworkPtr pFw,
     case GmCommand::Weather:
     {
       targetPlayer->getCurrentZone()->setWeatherOverride( static_cast< Common::Weather >( param1 ) );
-      player.sendNotice( "Weather in Zone \"{0}\" of {1} set in range.",
+      player.sendNotice( "Weather in Territory \"{0}\" of {1} set in range.",
                          targetPlayer->getCurrentZone()->getName(), targetPlayer->getName() );
       break;
     }
@@ -208,7 +208,7 @@ void Sapphire::Network::GameConnection::gm1Handler( FrameworkPtr pFw,
     {
       player.sendNotice( "Name: {0}"
                          "\nGil: {1}"
-                         "\nZone: {2}"
+                         "\nTerritory: {2}"
                          "({3})"
                          "\nClass: {4}"
                          "\nLevel: {5}"
@@ -659,7 +659,7 @@ void Sapphire::Network::GameConnection::gm2Handler( FrameworkPtr pFw,
       }
       if( targetPlayer->getCurrentZone()->getGuId() != player.getCurrentZone()->getGuId() )
       {
-        // Checks if the target player is in an InstanceContent to avoid binding to a Zone or PublicContent
+        // Checks if the target player is in an InstanceContent to avoid binding to a Territory or PublicContent
         if( targetPlayer->getCurrentInstance() )
         {
           auto pInstanceContent = targetPlayer->getCurrentInstance()->getAsInstanceContent();
diff --git a/src/world/Network/Handlers/InventoryHandler.cpp b/src/world/Network/Handlers/InventoryHandler.cpp
index cf429b02..8fc94bdd 100644
--- a/src/world/Network/Handlers/InventoryHandler.cpp
+++ b/src/world/Network/Handlers/InventoryHandler.cpp
@@ -8,7 +8,7 @@
 #include "Network/GameConnection.h"
 #include "Network/PacketWrappers/ServerNoticePacket.h"
 
-#include "Territory/Zone.h"
+#include "Territory/Territory.h"
 #include "Territory/ZonePosition.h"
 
 #include "Manager/DebugCommandMgr.h"
diff --git a/src/world/Network/Handlers/PacketHandlers.cpp b/src/world/Network/Handlers/PacketHandlers.cpp
index 709b65d1..c3b9a178 100644
--- a/src/world/Network/Handlers/PacketHandlers.cpp
+++ b/src/world/Network/Handlers/PacketHandlers.cpp
@@ -15,7 +15,7 @@
 
 #include "Network/GameConnection.h"
 
-#include "Territory/Zone.h"
+#include "Territory/Territory.h"
 #include "Territory/HousingZone.h"
 #include "Territory/Land.h"
 #include "Territory/ZonePosition.h"
diff --git a/src/world/Script/ScriptMgr.cpp b/src/world/Script/ScriptMgr.cpp
index 4b7bd27c..47f3704b 100644
--- a/src/world/Script/ScriptMgr.cpp
+++ b/src/world/Script/ScriptMgr.cpp
@@ -3,7 +3,7 @@
 
 #include <watchdog/Watchdog.h>
 
-#include "Territory/Zone.h"
+#include "Territory/Territory.h"
 #include "Territory/InstanceContent.h"
 #include "Territory/QuestBattle.h"
 #include "Actor/Player.h"
@@ -412,7 +412,7 @@ bool Sapphire::Scripting::ScriptMgr::onStatusTimeOut( Entity::CharaPtr pChara, u
   return false;
 }
 
-bool Sapphire::Scripting::ScriptMgr::onZoneInit( ZonePtr pZone )
+bool Sapphire::Scripting::ScriptMgr::onZoneInit( TerritoryPtr pZone )
 {
   auto script = m_nativeScriptMgr->getScript< Sapphire::ScriptAPI::ZoneScript >( pZone->getTerritoryTypeId() );
   if( script )
diff --git a/src/world/Script/ScriptMgr.h b/src/world/Script/ScriptMgr.h
index 94bc8067..c68a0482 100644
--- a/src/world/Script/ScriptMgr.h
+++ b/src/world/Script/ScriptMgr.h
@@ -84,7 +84,7 @@ namespace Sapphire::Scripting
 
     bool onStatusTimeOut( Entity::CharaPtr pActor, uint32_t effectId );
 
-    bool onZoneInit( ZonePtr pZone );
+    bool onZoneInit( TerritoryPtr pZone );
 
     bool onEventHandlerReturn( Entity::Player& player, uint32_t eventId, uint16_t subEvent, uint16_t param1,
                                uint16_t param2, uint16_t param3 );
diff --git a/src/world/Territory/Cell.cpp b/src/world/Territory/Cell.cpp
index d4ea8bf0..ff495c90 100644
--- a/src/world/Territory/Cell.cpp
+++ b/src/world/Territory/Cell.cpp
@@ -2,7 +2,7 @@
 
 #include "Actor/Chara.h"
 #include "Forwards.h"
-#include "Zone.h"
+#include "Territory.h"
 #include <Logging/Logger.h>
 
 // TODO: the entire zone / areahandling is a bit outdated ( in parts i used this for the 1.0 iteration )
@@ -22,7 +22,7 @@ Sapphire::Cell::~Cell()
   removeActors();
 }
 
-void Sapphire::Cell::init( uint32_t x, uint32_t y, ZonePtr pZone )
+void Sapphire::Cell::init( uint32_t x, uint32_t y, TerritoryPtr pZone )
 {
   m_pZone = pZone;
   m_posX = x;
diff --git a/src/world/Territory/Cell.h b/src/world/Territory/Cell.h
index c1cf413d..23351b34 100644
--- a/src/world/Territory/Cell.h
+++ b/src/world/Territory/Cell.h
@@ -13,7 +13,7 @@ typedef std::set< Entity::ActorPtr > ActorSet;
 
 class Cell
 {
-  friend class Zone;
+  friend class Territory;
 
 private:
   bool m_bForcedActive;
@@ -25,14 +25,14 @@ private:
   bool m_bUnloadPending;
 
   uint16_t m_playerCount;
-  ZonePtr m_pZone;
+  TerritoryPtr m_pZone;
 
 public:
   Cell();
 
   ~Cell();
 
-  void init( uint32_t x, uint32_t y, ZonePtr pZone );
+  void init( uint32_t x, uint32_t y, TerritoryPtr pZone );
 
   void addActor( Entity::ActorPtr pAct );
 
diff --git a/src/world/Territory/Housing/HousingInteriorTerritory.cpp b/src/world/Territory/Housing/HousingInteriorTerritory.cpp
index 7ffa045c..0b8985d4 100644
--- a/src/world/Territory/Housing/HousingInteriorTerritory.cpp
+++ b/src/world/Territory/Housing/HousingInteriorTerritory.cpp
@@ -36,7 +36,7 @@ Sapphire::World::Territory::Housing::HousingInteriorTerritory::HousingInteriorTe
                                                                                          const std::string& internalName,
                                                                                          const std::string& contentName,
                                                                                          FrameworkPtr pFw ) :
-  Zone( territoryTypeId, guId, internalName, contentName, pFw ),
+  Territory( territoryTypeId, guId, internalName, contentName, pFw ),
   m_landIdent( ident )
 {
 }
@@ -54,7 +54,7 @@ void Sapphire::World::Territory::Housing::HousingInteriorTerritory::onPlayerZone
 {
   auto pHousingMgr = m_pFw->get< HousingMgr >();
 
-  Logger::debug( "HousingInteriorTerritory::onPlayerZoneIn: Zone#{0}|{1}, Entity#{2}",
+  Logger::debug( "HousingInteriorTerritory::onPlayerZoneIn: Territory#{0}|{1}, Entity#{2}",
                   getGuId(), getTerritoryTypeId(), player.getId() );
 
   auto indoorInitPacket = makeZonePacket< Server::FFXIVIpcHousingIndoorInitialize >( player.getId() );
diff --git a/src/world/Territory/Housing/HousingInteriorTerritory.h b/src/world/Territory/Housing/HousingInteriorTerritory.h
index 3993ba39..efc4860b 100644
--- a/src/world/Territory/Housing/HousingInteriorTerritory.h
+++ b/src/world/Territory/Housing/HousingInteriorTerritory.h
@@ -1,11 +1,11 @@
 #include "ForwardsZone.h"
-#include "Territory/Zone.h"
+#include "Territory/Territory.h"
 #include "Common.h"
 #include <array>
 
 namespace Sapphire::World::Territory::Housing
 {
-  class HousingInteriorTerritory : public Zone
+  class HousingInteriorTerritory : public Territory
   {
   public:
     HousingInteriorTerritory( Common::LandIdent ident, uint16_t territoryTypeId,
diff --git a/src/world/Territory/HousingZone.cpp b/src/world/Territory/HousingZone.cpp
index e138b38e..c252b909 100644
--- a/src/world/Territory/HousingZone.cpp
+++ b/src/world/Territory/HousingZone.cpp
@@ -33,7 +33,7 @@ Sapphire::HousingZone::HousingZone( uint8_t wardNum,
                                     const std::string& internalName,
                                     const std::string& contentName,
                                     FrameworkPtr pFw ) :
-  Zone( territoryTypeId, guId, internalName, contentName, pFw ),
+  Territory( territoryTypeId, guId, internalName, contentName, pFw ),
   m_wardNum( wardNum ),
   m_territoryTypeId( territoryTypeId ),
   m_landSetId( ( static_cast< uint32_t >( territoryTypeId ) << 16 ) | wardNum ),
@@ -155,7 +155,7 @@ bool Sapphire::HousingZone::init()
 
 void Sapphire::HousingZone::onPlayerZoneIn( Entity::Player& player )
 {
-  Logger::debug( "HousingZone::onPlayerZoneIn: Zone#{0}|{1}, Entity#{2}",
+  Logger::debug( "HousingZone::onPlayerZoneIn: Territory#{0}|{1}, Entity#{2}",
                  getGuId(), getTerritoryTypeId(), player.getId() );
 
   auto isInSubdivision = isPlayerSubInstance( player ) ? true : false;
diff --git a/src/world/Territory/HousingZone.h b/src/world/Territory/HousingZone.h
index 001f5a58..804624ed 100644
--- a/src/world/Territory/HousingZone.h
+++ b/src/world/Territory/HousingZone.h
@@ -1,7 +1,7 @@
 #ifndef SAPPHIRE_HOUSINGZONE_H
 #define SAPPHIRE_HOUSINGZONE_H
 
-#include "Zone.h"
+#include "Territory.h"
 #include "Forwards.h"
 
 #include <array>
@@ -24,7 +24,7 @@ namespace Sapphire
     RELOCATE = 4,
   };
 
-  class HousingZone : public Zone
+  class HousingZone : public Territory
   {
   public:
     HousingZone( uint8_t landSetId,
diff --git a/src/world/Territory/InstanceContent.cpp b/src/world/Territory/InstanceContent.cpp
index 79d6be6c..267da084 100644
--- a/src/world/Territory/InstanceContent.cpp
+++ b/src/world/Territory/InstanceContent.cpp
@@ -34,7 +34,7 @@ Sapphire::InstanceContent::InstanceContent( std::shared_ptr< Sapphire::Data::Ins
                                             const std::string& contentName,
                                             uint32_t instanceContentId,
                                             FrameworkPtr pFw ) :
-  Zone( static_cast< uint16_t >( territoryType ), guId, internalName, contentName, pFw ),
+  Territory( static_cast< uint16_t >( territoryType ), guId, internalName, contentName, pFw ),
   Director( Event::Director::InstanceContent, instanceContentId ),
   m_instanceConfiguration( pInstanceConfiguration ),
   m_instanceContentId( instanceContentId ),
@@ -48,7 +48,7 @@ Sapphire::InstanceContent::InstanceContent( std::shared_ptr< Sapphire::Data::Ins
 
 bool Sapphire::InstanceContent::init()
 {
-  if( !Zone::init() )
+  if( !Territory::init() )
     return false;
 
   auto pScriptMgr = m_pFw->get< Scripting::ScriptMgr >();
@@ -75,7 +75,7 @@ Sapphire::Data::ExdDataGenerated::InstanceContentPtr Sapphire::InstanceContent::
 
 void Sapphire::InstanceContent::onPlayerZoneIn( Entity::Player& player )
 {
-  Logger::debug( "InstanceContent::onPlayerZoneIn: Zone#{0}|{1}, Entity#{2}",
+  Logger::debug( "InstanceContent::onPlayerZoneIn: Territory#{0}|{1}, Entity#{2}",
                  getGuId(), getTerritoryTypeId(), player.getId() );
 
   // mark player as "bound by duty"
@@ -90,7 +90,7 @@ void Sapphire::InstanceContent::onPlayerZoneIn( Entity::Player& player )
 
 void Sapphire::InstanceContent::onLeaveTerritory( Entity::Player& player )
 {
-  Logger::debug( "InstanceContent::onLeaveTerritory: Zone#{0}|{1}, Entity#{2}",
+  Logger::debug( "InstanceContent::onLeaveTerritory: Territory#{0}|{1}, Entity#{2}",
                  getGuId(), getTerritoryTypeId(), player.getId() );
 
   clearDirector( player );
@@ -318,7 +318,7 @@ void Sapphire::InstanceContent::onRegisterEObj( Entity::EventObjectPtr object )
     // todo: data should be renamed to eventId
     m_eventIdToObjectMap[ objData->data ] = object;
   else
-    Logger::error( "InstanceContent::onRegisterEObj Zone " +
+    Logger::error( "InstanceContent::onRegisterEObj Territory " +
                    m_internalName + ": No EObj data found for EObj with ID: " +
                    std::to_string( object->getObjectId() ) );
 }
diff --git a/src/world/Territory/InstanceContent.h b/src/world/Territory/InstanceContent.h
index 2acae2b2..a34ac2fb 100644
--- a/src/world/Territory/InstanceContent.h
+++ b/src/world/Territory/InstanceContent.h
@@ -1,7 +1,7 @@
 #ifndef SAPPHIRE_INSTANCECONTENT_H
 #define SAPPHIRE_INSTANCECONTENT_H
 
-#include "Zone.h"
+#include "Territory.h"
 #include "Event/Director.h"
 #include "Forwards.h"
 
@@ -12,7 +12,7 @@ namespace Sapphire::Data
 
 namespace Sapphire
 {
-  class InstanceContent : public Event::Director, public Zone
+  class InstanceContent : public Event::Director, public Territory
   {
   public:
     enum InstanceContentState
diff --git a/src/world/Territory/QuestBattle.cpp b/src/world/Territory/QuestBattle.cpp
index 0227bbcd..63e60b9b 100644
--- a/src/world/Territory/QuestBattle.cpp
+++ b/src/world/Territory/QuestBattle.cpp
@@ -36,7 +36,7 @@ Sapphire::QuestBattle::QuestBattle( std::shared_ptr< Sapphire::Data::QuestBattle
                                     const std::string& contentName,
                                     uint32_t questBattleId,
                                     FrameworkPtr pFw ) :
-  Zone( static_cast< uint16_t >( territoryType ), guId, internalName, contentName, pFw ),
+  Territory( static_cast< uint16_t >( territoryType ), guId, internalName, contentName, pFw ),
   Director( Event::Director::QuestBattle, questBattleId ),
   m_pBattleDetails( pBattleDetails ),
   m_questBattleId( questBattleId ),
@@ -48,7 +48,7 @@ Sapphire::QuestBattle::QuestBattle( std::shared_ptr< Sapphire::Data::QuestBattle
 
 bool Sapphire::QuestBattle::init()
 {
-  if( !Zone::init() )
+  if( !Territory::init() )
     return false;
 
   auto pScriptMgr = m_pFw->get< Scripting::ScriptMgr >();
@@ -69,7 +69,7 @@ Sapphire::Data::ExdDataGenerated::QuestBattlePtr Sapphire::QuestBattle::getQuest
 
 void Sapphire::QuestBattle::onPlayerZoneIn( Entity::Player& player )
 {
-  Logger::debug( "QuestBattle::onPlayerZoneIn: Zone#{0}|{1}, Entity#{2}",
+  Logger::debug( "QuestBattle::onPlayerZoneIn: Territory#{0}|{1}, Entity#{2}",
                  getGuId(), getTerritoryTypeId(), player.getId() );
 
   m_pPlayer = player.getAsPlayer();
@@ -83,7 +83,7 @@ void Sapphire::QuestBattle::onPlayerZoneIn( Entity::Player& player )
 
 void Sapphire::QuestBattle::onLeaveTerritory( Entity::Player& player )
 {
-  Logger::debug( "QuestBattle::onLeaveTerritory: Zone#{0}|{1}, Entity#{2}",
+  Logger::debug( "QuestBattle::onLeaveTerritory: Territory#{0}|{1}, Entity#{2}",
                  getGuId(), getTerritoryTypeId(), player.getId() );
 
   clearDirector( player );
@@ -291,7 +291,7 @@ void Sapphire::QuestBattle::onRegisterEObj( Entity::EventObjectPtr object )
     // todo: data should be renamed to eventId
     m_eventIdToObjectMap[ objData->data ] = object;
   else
-    Logger::error( "InstanceContent::onRegisterEObj Zone " +
+    Logger::error( "InstanceContent::onRegisterEObj Territory " +
                    m_internalName + ": No EObj data found for EObj with ID: " +
                    std::to_string( object->getObjectId() ) );
 }
diff --git a/src/world/Territory/QuestBattle.h b/src/world/Territory/QuestBattle.h
index f4a40b61..4553fe06 100644
--- a/src/world/Territory/QuestBattle.h
+++ b/src/world/Territory/QuestBattle.h
@@ -1,7 +1,7 @@
 #ifndef SAPPHIRE_QUESTBATTLE_H
 #define SAPPHIRE_QUESTBATTLE_H
 
-#include "Zone.h"
+#include "Territory.h"
 #include "Event/Director.h"
 #include "Forwards.h"
 
@@ -12,7 +12,7 @@ namespace Sapphire::Data
 
 namespace Sapphire
 {
-  class QuestBattle : public Event::Director, public Zone
+  class QuestBattle : public Event::Director, public Territory
   {
   public:
     QuestBattle( std::shared_ptr< Sapphire::Data::QuestBattle > pBattleDetails,
diff --git a/src/world/Territory/Zone.cpp b/src/world/Territory/Territory.cpp
similarity index 86%
rename from src/world/Territory/Zone.cpp
rename to src/world/Territory/Territory.cpp
index e0a159c4..ea1ce4d7 100644
--- a/src/world/Territory/Zone.cpp
+++ b/src/world/Territory/Territory.cpp
@@ -15,7 +15,7 @@
 #include <Database/DatabaseDef.h>
 #include <Network/PacketWrappers/ActorControlPacket143.h>
 
-#include "Zone.h"
+#include "Territory.h"
 #include "InstanceContent.h"
 #include "QuestBattle.h"
 #include "Manager/TerritoryMgr.h"
@@ -39,7 +39,7 @@
 #include "ForwardsZone.h"
 #include "ServerMgr.h"
 #include "CellHandler.h"
-#include "Zone.h"
+#include "Territory.h"
 #include "Framework.h"
 
 #include "Manager/RNGMgr.h"
@@ -54,7 +54,7 @@ using namespace Sapphire::World::Manager;
 /**
 * \brief
 */
-Sapphire::Zone::Zone() :
+Sapphire::Territory::Territory() :
   m_territoryTypeId( 0 ),
   m_guId( 0 ),
   m_currentWeather( Weather::FairSkies ),
@@ -65,9 +65,9 @@ Sapphire::Zone::Zone() :
 {
 }
 
-Sapphire::Zone::Zone( uint16_t territoryTypeId, uint32_t guId,
-                      const std::string& internalName, const std::string& placeName,
-                      FrameworkPtr pFw ) :
+Sapphire::Territory::Territory( uint16_t territoryTypeId, uint32_t guId,
+                                const std::string& internalName, const std::string& placeName,
+                                FrameworkPtr pFw ) :
   m_currentWeather( Weather::FairSkies ),
   m_nextEObjId( 0x400D0000 ),
   m_nextActorId( 0x500D0000 ),
@@ -93,7 +93,7 @@ Sapphire::Zone::Zone( uint16_t territoryTypeId, uint32_t guId,
   m_currentWeather = getNextWeather();
 }
 
-void Sapphire::Zone::loadWeatherRates()
+void Sapphire::Territory::loadWeatherRates()
 {
   if( !m_territoryTypeInfo )
     return;
@@ -118,11 +118,9 @@ void Sapphire::Zone::loadWeatherRates()
   }
 }
 
-Sapphire::Zone::~Zone()
-{
-}
+Sapphire::Territory::~Territory() = default;
 
-bool Sapphire::Zone::init()
+bool Sapphire::Territory::init()
 {
   auto pScriptMgr = m_pFw->get< Scripting::ScriptMgr >();
 
@@ -144,22 +142,22 @@ bool Sapphire::Zone::init()
   return true;
 }
 
-void Sapphire::Zone::setWeatherOverride( Weather weather )
+void Sapphire::Territory::setWeatherOverride( Weather weather )
 {
   m_weatherOverride = weather;
 }
 
-Weather Sapphire::Zone::getCurrentWeather() const
+Weather Sapphire::Territory::getCurrentWeather() const
 {
   return m_currentWeather;
 }
 
-const Sapphire::FestivalPair& Sapphire::Zone::getCurrentFestival() const
+const Sapphire::FestivalPair& Sapphire::Territory::getCurrentFestival() const
 {
   return m_currentFestival;
 }
 
-void Sapphire::Zone::setCurrentFestival( uint16_t festivalId, uint16_t additionalFestivalId )
+void Sapphire::Territory::setCurrentFestival( uint16_t festivalId, uint16_t additionalFestivalId )
 {
   m_currentFestival = { festivalId, additionalFestivalId };
 
@@ -172,11 +170,11 @@ void Sapphire::Zone::setCurrentFestival( uint16_t festivalId, uint16_t additiona
   }
 }
 
-void Sapphire::Zone::loadCellCache()
+void Sapphire::Territory::loadCellCache()
 {
 }
 
-Weather Sapphire::Zone::getNextWeather()
+Weather Sapphire::Territory::getNextWeather()
 {
   uint32_t unixTime = Util::getTimeSeconds();
   // Get Eorzea hour for weather start
@@ -206,7 +204,7 @@ Weather Sapphire::Zone::getNextWeather()
   return Weather::FairSkies;
 }
 
-void Sapphire::Zone::pushActor( Entity::ActorPtr pActor )
+void Sapphire::Territory::pushActor( Entity::ActorPtr pActor )
 {
   float mx = pActor->getPos().x;
   float my = pActor->getPos().z;
@@ -271,7 +269,7 @@ void Sapphire::Zone::pushActor( Entity::ActorPtr pActor )
   }
 }
 
-void Sapphire::Zone::removeActor( Entity::ActorPtr pActor )
+void Sapphire::Territory::removeActor( Entity::ActorPtr pActor )
 {
   float mx = pActor->getPos().x;
   float my = pActor->getPos().z;
@@ -314,7 +312,7 @@ void Sapphire::Zone::removeActor( Entity::ActorPtr pActor )
 
 }
 
-void Sapphire::Zone::queuePacketForRange( Entity::Player& sourcePlayer, uint32_t range,
+void Sapphire::Territory::queuePacketForRange( Entity::Player& sourcePlayer, uint32_t range,
                                           Network::Packets::FFXIVPacketBasePtr pPacketEntry )
 {
   auto pTeriMgr = m_pFw->get< TerritoryMgr >();
@@ -339,7 +337,7 @@ void Sapphire::Zone::queuePacketForRange( Entity::Player& sourcePlayer, uint32_t
   }
 }
 
-void Sapphire::Zone::queuePacketForZone( Entity::Player& sourcePlayer,
+void Sapphire::Territory::queuePacketForZone( Entity::Player& sourcePlayer,
                                          Network::Packets::FFXIVPacketBasePtr pPacketEntry,
                                          bool forSelf )
 {
@@ -361,37 +359,37 @@ void Sapphire::Zone::queuePacketForZone( Entity::Player& sourcePlayer,
   }
 }
 
-uint32_t Sapphire::Zone::getTerritoryTypeId() const
+uint32_t Sapphire::Territory::getTerritoryTypeId() const
 {
   return m_territoryTypeId;
 }
 
-uint32_t Sapphire::Zone::getGuId() const
+uint32_t Sapphire::Territory::getGuId() const
 {
   return m_guId;
 }
 
-const std::string& Sapphire::Zone::getName() const
+const std::string& Sapphire::Territory::getName() const
 {
   return m_placeName;
 }
 
-const std::string& Sapphire::Zone::getInternalName() const
+const std::string& Sapphire::Territory::getInternalName() const
 {
   return m_internalName;
 }
 
-const std::string& Sapphire::Zone::getBgPath() const
+const std::string& Sapphire::Territory::getBgPath() const
 {
   return m_bgPath;
 }
 
-std::size_t Sapphire::Zone::getPopCount() const
+std::size_t Sapphire::Territory::getPopCount() const
 {
   return m_playerMap.size();
 }
 
-bool Sapphire::Zone::checkWeather()
+bool Sapphire::Territory::checkWeather()
 {
   if( m_weatherOverride != Weather::None )
   {
@@ -413,7 +411,7 @@ bool Sapphire::Zone::checkWeather()
   return false;
 }
 
-void Sapphire::Zone::updateBNpcs( uint64_t tickCount )
+void Sapphire::Territory::updateBNpcs( uint64_t tickCount )
 {
   if( ( tickCount - m_lastMobUpdate ) <= 250 )
     return;
@@ -468,12 +466,12 @@ void Sapphire::Zone::updateBNpcs( uint64_t tickCount )
 
 }
 
-uint64_t Sapphire::Zone::getLastActivityTime() const
+uint64_t Sapphire::Territory::getLastActivityTime() const
 {
   return m_lastActivityTime;
 }
 
-bool Sapphire::Zone::update( uint64_t tickCount )
+bool Sapphire::Territory::update( uint64_t tickCount )
 {
   //TODO: this should be moved to a updateWeather call and pulled out of updateSessions
   bool changedWeather = checkWeather();
@@ -496,7 +494,7 @@ bool Sapphire::Zone::update( uint64_t tickCount )
   return true;
 }
 
-void Sapphire::Zone::updateSessions( uint64_t tickCount, bool changedWeather )
+void Sapphire::Territory::updateSessions( uint64_t tickCount, bool changedWeather )
 {
   // update sessions in this zone
   for( auto it = m_playerMap.begin(); it != m_playerMap.end(); ++it )
@@ -534,7 +532,7 @@ void Sapphire::Zone::updateSessions( uint64_t tickCount, bool changedWeather )
   }
 }
 
-bool Sapphire::Zone::isCellActive( uint32_t x, uint32_t y )
+bool Sapphire::Territory::isCellActive( uint32_t x, uint32_t y )
 {
   uint32_t endX = ( ( x + 1 ) <= _sizeX ) ? x + 1 : ( _sizeX - 1 );
   uint32_t endY = ( ( y + 1 ) <= _sizeY ) ? y + 1 : ( _sizeY - 1 );
@@ -559,7 +557,7 @@ bool Sapphire::Zone::isCellActive( uint32_t x, uint32_t y )
   return false;
 }
 
-void Sapphire::Zone::updateCellActivity( uint32_t x, uint32_t y, int32_t radius )
+void Sapphire::Territory::updateCellActivity( uint32_t x, uint32_t y, int32_t radius )
 {
 
   uint32_t endX = ( x + radius ) <= _sizeX ? x + radius : ( _sizeX - 1 );
@@ -608,7 +606,7 @@ void Sapphire::Zone::updateCellActivity( uint32_t x, uint32_t y, int32_t radius
   }
 }
 
-void Sapphire::Zone::updateActorPosition( Entity::Actor& actor )
+void Sapphire::Territory::updateActorPosition( Entity::Actor& actor )
 {
 
   if( actor.getCurrentZone() != shared_from_this() )
@@ -679,7 +677,7 @@ void Sapphire::Zone::updateActorPosition( Entity::Actor& actor )
 }
 
 
-void Sapphire::Zone::updateInRangeSet( Entity::ActorPtr pActor, Cell* pCell )
+void Sapphire::Territory::updateInRangeSet( Entity::ActorPtr pActor, Cell* pCell )
 {
   if( pCell == nullptr )
     return;
@@ -728,37 +726,37 @@ void Sapphire::Zone::updateInRangeSet( Entity::ActorPtr pActor, Cell* pCell )
   }
 }
 
-void Sapphire::Zone::onPlayerZoneIn( Entity::Player& player )
+void Sapphire::Territory::onPlayerZoneIn( Entity::Player& player )
 {
-  Logger::debug( "Zone::onEnterTerritory: Zone#{0}|{1}, Entity#{2}", getGuId(), getTerritoryTypeId(), player.getId() );
+  Logger::debug( "Territory::onEnterTerritory: Territory#{0}|{1}, Entity#{2}", getGuId(), getTerritoryTypeId(), player.getId() );
 }
 
-void Sapphire::Zone::onLeaveTerritory( Entity::Player& player )
+void Sapphire::Territory::onLeaveTerritory( Entity::Player& player )
 {
-  Logger::debug( "Zone::onLeaveTerritory: Zone#{0}|{1}, Entity#{2}", getGuId(), getTerritoryTypeId(), player.getId() );
+  Logger::debug( "Territory::onLeaveTerritory: Territory#{0}|{1}, Entity#{2}", getGuId(), getTerritoryTypeId(), player.getId() );
 }
 
-void Sapphire::Zone::onUpdate( uint64_t tickCount )
+void Sapphire::Territory::onUpdate( uint64_t tickCount )
 {
   updateBNpcs( tickCount );
 }
 
-void Sapphire::Zone::onFinishLoading( Entity::Player& player )
+void Sapphire::Territory::onFinishLoading( Entity::Player& player )
 {
 
 }
 
-void Sapphire::Zone::onInitDirector( Entity::Player& player )
+void Sapphire::Territory::onInitDirector( Entity::Player& player )
 {
 
 }
 
-void Sapphire::Zone::onEnterTerritory( Sapphire::Entity::Player& player, uint32_t eventId, uint16_t param1, uint16_t param2 )
+void Sapphire::Territory::onEnterTerritory( Sapphire::Entity::Player& player, uint32_t eventId, uint16_t param1, uint16_t param2 )
 {
 
 }
 
-void Sapphire::Zone::registerEObj( Entity::EventObjectPtr object )
+void Sapphire::Territory::registerEObj( Entity::EventObjectPtr object )
 {
   if( !object )
     return;
@@ -772,7 +770,7 @@ void Sapphire::Zone::registerEObj( Entity::EventObjectPtr object )
   //Logger::debug( "Registered instance eobj: " + std::to_string( object->getId() ) );
 }
 
-Sapphire::Entity::EventObjectPtr Sapphire::Zone::getEObj( uint32_t objId )
+Sapphire::Entity::EventObjectPtr Sapphire::Territory::getEObj( uint32_t objId )
 {
   auto obj = m_eventObjects.find( objId );
   if( obj == m_eventObjects.end() )
@@ -781,28 +779,28 @@ Sapphire::Entity::EventObjectPtr Sapphire::Zone::getEObj( uint32_t objId )
   return obj->second;
 }
 
-Sapphire::InstanceContentPtr Sapphire::Zone::getAsInstanceContent()
+Sapphire::InstanceContentPtr Sapphire::Territory::getAsInstanceContent()
 {
-  return std::dynamic_pointer_cast< InstanceContent, Zone >( shared_from_this() );
+  return std::dynamic_pointer_cast< InstanceContent, Territory >( shared_from_this() );
 }
 
-Sapphire::QuestBattlePtr Sapphire::Zone::getAsQuestBattle()
+Sapphire::QuestBattlePtr Sapphire::Territory::getAsQuestBattle()
 {
-  return std::dynamic_pointer_cast< QuestBattle, Zone >( shared_from_this() );
+  return std::dynamic_pointer_cast< QuestBattle, Territory >( shared_from_this() );
 }
 
-uint32_t Sapphire::Zone::getNextEObjId()
+uint32_t Sapphire::Territory::getNextEObjId()
 {
   return ++m_nextEObjId;
 }
 
-uint32_t Sapphire::Zone::getNextActorId()
+uint32_t Sapphire::Territory::getNextActorId()
 {
   return ++m_nextActorId;
 }
 
 
-Sapphire::Entity::EventObjectPtr Sapphire::Zone::registerEObj( const std::string& name, uint32_t objectId, uint32_t mapLink,
+Sapphire::Entity::EventObjectPtr Sapphire::Territory::registerEObj( const std::string& name, uint32_t objectId, uint32_t mapLink,
                                                                uint8_t state, FFXIVARR_POSITION3 pos, float scale,
                                                                float rotation )
 {
@@ -813,12 +811,12 @@ Sapphire::Entity::EventObjectPtr Sapphire::Zone::registerEObj( const std::string
   return eObj;
 }
 
-Sapphire::Data::TerritoryTypePtr Sapphire::Zone::getTerritoryTypeInfo() const
+Sapphire::Data::TerritoryTypePtr Sapphire::Territory::getTerritoryTypeInfo() const
 {
   return m_territoryTypeInfo;
 }
 
-bool Sapphire::Zone::loadSpawnGroups()
+bool Sapphire::Territory::loadSpawnGroups()
 {
   auto pDb = m_pFw->get< Db::DbWorkerPool< Db::ZoneDbConnection > >();
   auto stmt = pDb->getPreparedStatement( Db::ZoneDbStatements::ZONE_SEL_SPAWNGROUPS );
@@ -863,7 +861,7 @@ bool Sapphire::Zone::loadSpawnGroups()
   return false;
 }
 
-void Sapphire::Zone::updateSpawnPoints()
+void Sapphire::Territory::updateSpawnPoints()
 {
   auto pRNGMgr = m_pFw->get< World::Manager::RNGMgr >();
   auto rng = pRNGMgr->getRandGenerator< float >( 0.f, PI * 2 );
@@ -906,13 +904,13 @@ void Sapphire::Zone::updateSpawnPoints()
 
 }
 
-uint32_t Sapphire::Zone::getNextEffectSequence()
+uint32_t Sapphire::Territory::getNextEffectSequence()
 {
   return m_effectCounter++;
 }
 
 Sapphire::Entity::BNpcPtr
-  Sapphire::Zone::createBNpcFromLevelEntry( uint32_t levelId, uint8_t level, uint8_t type,
+  Sapphire::Territory::createBNpcFromLevelEntry( uint32_t levelId, uint8_t level, uint8_t type,
                                             uint32_t hp, uint16_t nameId, uint32_t directorId,
                                             uint8_t bnpcType )
 {
@@ -1006,7 +1004,7 @@ Sapphire::Entity::BNpcPtr
   return bnpc;
 }
 
-Sapphire::Entity::BNpcPtr Sapphire::Zone::getActiveBNpcByLevelId( uint32_t levelId )
+Sapphire::Entity::BNpcPtr Sapphire::Territory::getActiveBNpcByLevelId( uint32_t levelId )
 {
   for( auto bnpcIt : m_bNpcMap )
   {
@@ -1016,7 +1014,7 @@ Sapphire::Entity::BNpcPtr Sapphire::Zone::getActiveBNpcByLevelId( uint32_t level
   return nullptr;
 }
 
-std::shared_ptr< Sapphire::World::Navi::NaviProvider > Sapphire::Zone::getNaviProvider()
+std::shared_ptr< Sapphire::World::Navi::NaviProvider > Sapphire::Territory::getNaviProvider()
 {
   return m_pNaviProvider;
 }
diff --git a/src/world/Territory/Zone.h b/src/world/Territory/Territory.h
similarity index 93%
rename from src/world/Territory/Zone.h
rename to src/world/Territory/Territory.h
index 217f0230..a73e5e53 100644
--- a/src/world/Territory/Zone.h
+++ b/src/world/Territory/Territory.h
@@ -29,7 +29,7 @@ namespace Sapphire
     struct TerritoryType;
   }
 
-  class Zone : public CellHandler< Cell >, public std::enable_shared_from_this< Zone >
+  class Territory : public CellHandler< Cell >, public std::enable_shared_from_this< Territory >
   {
   protected:
     uint32_t m_territoryTypeId;
@@ -66,12 +66,12 @@ namespace Sapphire
     std::shared_ptr< World::Navi::NaviProvider > m_pNaviProvider;
 
   public:
-    Zone();
+    Territory();
 
-    Zone( uint16_t territoryTypeId, uint32_t guId, const std::string& internalName,
-          const std::string& placeName, FrameworkPtr pFw );
+    Territory( uint16_t territoryTypeId, uint32_t guId, const std::string& internalName,
+               const std::string& placeName, FrameworkPtr pFw );
 
-    virtual ~Zone();
+    virtual ~Territory();
 
     /*! overrides the zone's weather, set to 0 to unlock */
     void setWeatherOverride( Common::Weather weather );

From 7f686ffee57196dcff3ad74060cbb67dc848ecdc Mon Sep 17 00:00:00 2001
From: NotAdam <adam@notadam.me>
Date: Sun, 21 Jul 2019 22:50:11 +1000
Subject: [PATCH 109/351] rename some getters and zonechannelpacket ->
 worldchannelpacket

---
 src/common/Network/GamePacket.h               |  6 +-
 .../common/aethernet/HousingAethernet.cpp     |  4 +-
 .../common/eobj/HousingEstateEntrance.cpp     |  2 +-
 .../common/housing/CmnDefHousingSignboard.cpp |  2 +-
 src/world/Action/Action.cpp                   |  2 +-
 src/world/Actor/Actor.cpp                     |  4 +-
 src/world/Actor/Actor.h                       |  4 +-
 src/world/Actor/BNpc.cpp                      |  4 +-
 src/world/Actor/Chara.cpp                     |  4 +-
 src/world/Actor/EventObject.cpp               |  2 +-
 src/world/Actor/Player.cpp                    | 72 ++++++++--------
 src/world/Actor/PlayerEvent.cpp               |  2 +-
 src/world/Actor/PlayerInventory.cpp           |  8 +-
 src/world/Actor/PlayerQuest.cpp               | 14 ++--
 src/world/Event/Director.cpp                  |  2 +-
 src/world/Manager/DebugCommandMgr.cpp         | 62 +++++++-------
 src/world/Manager/HousingMgr.cpp              | 57 +++++++------
 src/world/Manager/InventoryMgr.cpp            |  6 +-
 src/world/Manager/MarketMgr.cpp               |  6 +-
 src/world/Manager/TerritoryMgr.cpp            |  6 +-
 src/world/Network/Handlers/ActionHandler.cpp  |  4 +-
 src/world/Network/Handlers/CFHandlers.cpp     |  8 +-
 .../Network/Handlers/ClientTriggerHandler.cpp | 10 +--
 src/world/Network/Handlers/EventHandlers.cpp  | 18 ++--
 .../Network/Handlers/GMCommandHandlers.cpp    | 24 +++---
 .../Network/Handlers/InventoryHandler.cpp     |  4 +-
 src/world/Network/Handlers/PacketHandlers.cpp | 82 +++++++++----------
 .../PacketWrappers/ActorControlPacket142.h    |  4 +-
 .../PacketWrappers/ActorControlPacket143.h    |  4 +-
 .../PacketWrappers/ActorControlPacket144.h    |  4 +-
 src/world/Network/PacketWrappers/ChatPacket.h |  4 +-
 .../PacketWrappers/DirectorPlayScenePacket.h  |  4 +-
 .../Network/PacketWrappers/EffectPacket.h     |  4 +-
 .../PacketWrappers/EventFinishPacket.h        |  4 +-
 .../Network/PacketWrappers/EventPlayPacket.h  |  4 +-
 .../Network/PacketWrappers/EventStartPacket.h |  4 +-
 .../Network/PacketWrappers/ExaminePacket.h    |  4 +-
 .../Network/PacketWrappers/ModelEquipPacket.h |  4 +-
 .../Network/PacketWrappers/MoveActorPacket.h  |  4 +-
 .../Network/PacketWrappers/NpcSpawnPacket.h   |  4 +-
 src/world/Network/PacketWrappers/PingPacket.h |  4 +-
 .../PacketWrappers/PlayerSetupPacket.h        |  4 +-
 .../PacketWrappers/PlayerSpawnPacket.h        |  4 +-
 .../PacketWrappers/PlayerStateFlagsPacket.h   |  6 +-
 .../PacketWrappers/QuestMessagePacket.h       |  4 +-
 .../PacketWrappers/ServerNoticePacket.h       |  4 +-
 .../PacketWrappers/UpdateHpMpTpPacket.h       |  4 +-
 .../UpdateInventorySlotPacket.h               |  4 +-
 src/world/Script/ScriptMgr.cpp                |  2 +-
 src/world/ServerMgr.cpp                       |  2 +-
 src/world/Session.cpp                         |  2 +-
 .../Housing/HousingInteriorTerritory.cpp      |  8 +-
 src/world/Territory/HousingZone.cpp           | 12 +--
 src/world/Territory/Territory.cpp             |  8 +-
 54 files changed, 272 insertions(+), 267 deletions(-)

diff --git a/src/common/Network/GamePacket.h b/src/common/Network/GamePacket.h
index c1c06b76..0922c5d2 100644
--- a/src/common/Network/GamePacket.h
+++ b/src/common/Network/GamePacket.h
@@ -23,7 +23,7 @@ namespace Sapphire::Network::Packets
   class FFXIVIpcPacket;
 
   template< class T >
-  using ZoneChannelPacket = FFXIVIpcPacket< T, ServerZoneIpcType >;
+  using WorldChannelPacket = FFXIVIpcPacket< T, ServerZoneIpcType >;
 
   template< class T >
   using ChatChannelPacket = FFXIVIpcPacket< T, ServerChatIpcType >;
@@ -33,9 +33,9 @@ namespace Sapphire::Network::Packets
 
 
   template< class T, typename... Args >
-  std::shared_ptr< ZoneChannelPacket< T > > makeZonePacket( Args... args )
+  std::shared_ptr< WorldChannelPacket< T > > makeWorldPacket( Args... args )
   {
-    return std::make_shared< ZoneChannelPacket< T > >( args... );
+    return std::make_shared< WorldChannelPacket< T > >( args... );
   }
 
   template< class T, typename... Args >
diff --git a/src/scripts/common/aethernet/HousingAethernet.cpp b/src/scripts/common/aethernet/HousingAethernet.cpp
index 1e49410b..f89c6d4c 100644
--- a/src/scripts/common/aethernet/HousingAethernet.cpp
+++ b/src/scripts/common/aethernet/HousingAethernet.cpp
@@ -25,7 +25,7 @@ public:
       if( !pExdData )
         return;
 
-      auto housingZone = std::dynamic_pointer_cast< HousingZone >( player.getCurrentZone() );
+      auto housingZone = std::dynamic_pointer_cast< HousingZone >( player.getCurrentTerritory() );
       if( !housingZone )
         return;
 
@@ -35,7 +35,7 @@ public:
         return;
 
       // check we're teleporting to the same territorytype
-      if( player.getCurrentZone()->getTerritoryTypeId() != pHousingAethernet->territoryType )
+      if( player.getCurrentTerritory()->getTerritoryTypeId() != pHousingAethernet->territoryType )
         return;
 
       // todo: this needs to be done properly and used queued zoning + aethernet animation
diff --git a/src/scripts/common/eobj/HousingEstateEntrance.cpp b/src/scripts/common/eobj/HousingEstateEntrance.cpp
index 0c7733de..e0447f31 100644
--- a/src/scripts/common/eobj/HousingEstateEntrance.cpp
+++ b/src/scripts/common/eobj/HousingEstateEntrance.cpp
@@ -30,7 +30,7 @@ public:
       if( !terriMgr )
         return;
 
-      auto zone = std::dynamic_pointer_cast< HousingZone >( player.getCurrentZone() );
+      auto zone = std::dynamic_pointer_cast< HousingZone >( player.getCurrentTerritory() );
       if( !zone )
         return;
 
diff --git a/src/scripts/common/housing/CmnDefHousingSignboard.cpp b/src/scripts/common/housing/CmnDefHousingSignboard.cpp
index 3ef74e78..cf7ff4bf 100644
--- a/src/scripts/common/housing/CmnDefHousingSignboard.cpp
+++ b/src/scripts/common/housing/CmnDefHousingSignboard.cpp
@@ -34,7 +34,7 @@ public:
         auto activeLand = player.getActiveLand();
         auto territoryId = player.getTerritoryId();
 
-        auto pTerritory = player.getCurrentZone();
+        auto pTerritory = player.getCurrentTerritory();
         auto pHousing = std::dynamic_pointer_cast< HousingZone >( pTerritory );
         auto pHouMgr = pFw->get< HousingMgr >();
 
diff --git a/src/world/Action/Action.cpp b/src/world/Action/Action.cpp
index 8dd472f7..2eb44e2b 100644
--- a/src/world/Action/Action.cpp
+++ b/src/world/Action/Action.cpp
@@ -216,7 +216,7 @@ void Action::Action::start()
 
   if( hasCastTime() )
   {
-    auto castPacket = makeZonePacket< Server::FFXIVIpcActorCast >( getId() );
+    auto castPacket = makeWorldPacket< Server::FFXIVIpcActorCast >( getId() );
 
     castPacket->data().action_id = static_cast< uint16_t >( m_id );
     castPacket->data().skillType = Common::SkillType::Normal;
diff --git a/src/world/Actor/Actor.cpp b/src/world/Actor/Actor.cpp
index 4bbf9a08..24dd8171 100644
--- a/src/world/Actor/Actor.cpp
+++ b/src/world/Actor/Actor.cpp
@@ -331,13 +331,13 @@ std::set< Sapphire::Entity::ActorPtr > Sapphire::Entity::Actor::getInRangeActors
 }
 
 /*! \return TerritoryPtr to the current zone, nullptr if not set */
-Sapphire::TerritoryPtr Sapphire::Entity::Actor::getCurrentZone() const
+Sapphire::TerritoryPtr Sapphire::Entity::Actor::getCurrentTerritory() const
 {
   return m_pCurrentZone;
 }
 
 /*! \param TerritoryPtr to the zone to be set as current */
-void Sapphire::Entity::Actor::setCurrentZone( TerritoryPtr currZone )
+void Sapphire::Entity::Actor::setCurrentTerritory( TerritoryPtr currZone )
 {
   m_pCurrentZone = currZone;
 }
diff --git a/src/world/Actor/Actor.h b/src/world/Actor/Actor.h
index 0df1d32c..40d2fb9d 100644
--- a/src/world/Actor/Actor.h
+++ b/src/world/Actor/Actor.h
@@ -122,9 +122,9 @@ namespace Sapphire::Entity
 
     BNpcPtr getAsBNpc();
 
-    TerritoryPtr getCurrentZone() const;
+    TerritoryPtr getCurrentTerritory() const;
 
-    void setCurrentZone( TerritoryPtr currZone );
+    void setCurrentTerritory( TerritoryPtr currZone );
 
     InstanceContentPtr getCurrentInstance() const;
 
diff --git a/src/world/Actor/BNpc.cpp b/src/world/Actor/BNpc.cpp
index 6ccb3d47..e297c2fd 100644
--- a/src/world/Actor/BNpc.cpp
+++ b/src/world/Actor/BNpc.cpp
@@ -645,14 +645,14 @@ void Sapphire::Entity::BNpc::setOwner( Sapphire::Entity::CharaPtr m_pChara )
   m_pOwner = m_pChara;
   if( m_pChara != nullptr )
   {
-    auto setOwnerPacket = makeZonePacket< FFXIVIpcActorOwner >( m_pChara->getId() );
+    auto setOwnerPacket = makeWorldPacket< FFXIVIpcActorOwner >( m_pChara->getId() );
     setOwnerPacket->data().type = 0x01;
     setOwnerPacket->data().actorId = m_pChara->getId();
     sendToInRangeSet( setOwnerPacket );
   }
   else
   {
-    auto setOwnerPacket = makeZonePacket< FFXIVIpcActorOwner >( getId() );
+    auto setOwnerPacket = makeWorldPacket< FFXIVIpcActorOwner >( getId() );
     setOwnerPacket->data().type = 0x01;
     setOwnerPacket->data().actorId = INVALID_GAME_OBJECT_ID;
     sendToInRangeSet( setOwnerPacket );
diff --git a/src/world/Actor/Chara.cpp b/src/world/Actor/Chara.cpp
index 7991c0bd..7a2b94cd 100644
--- a/src/world/Actor/Chara.cpp
+++ b/src/world/Actor/Chara.cpp
@@ -457,7 +457,7 @@ void Sapphire::Entity::Chara::addStatusEffect( StatusEffect::StatusEffectPtr pEf
   pEffect->applyStatus();
   m_statusEffectMap[ nextSlot ] = pEffect;
 
-  auto statusEffectAdd = makeZonePacket< FFXIVIpcEffectResult >( getId() );
+  auto statusEffectAdd = makeWorldPacket< FFXIVIpcEffectResult >( getId() );
 
   statusEffectAdd->data().actor_id = pEffect->getTargetActorId();
   statusEffectAdd->data().current_hp = getHp();
@@ -578,7 +578,7 @@ void Sapphire::Entity::Chara::sendStatusEffectUpdate()
   uint64_t currentTimeMs = Util::getTimeMs();
 
 
-  auto statusEffectList = makeZonePacket< FFXIVIpcStatusEffectList >( getId() );
+  auto statusEffectList = makeWorldPacket< FFXIVIpcStatusEffectList >( getId() );
   statusEffectList->data().classId = static_cast< uint8_t >( getClass() );
   statusEffectList->data().level = getLevel();
   statusEffectList->data().level1 = getLevel();
diff --git a/src/world/Actor/EventObject.cpp b/src/world/Actor/EventObject.cpp
index cc34720e..f6376615 100644
--- a/src/world/Actor/EventObject.cpp
+++ b/src/world/Actor/EventObject.cpp
@@ -120,7 +120,7 @@ void Sapphire::Entity::EventObject::spawn( Sapphire::Entity::PlayerPtr pTarget )
 
   Logger::debug( "Spawning EObj: id#{0} name={1}", getId(), getName() );
 
-  auto eobjStatePacket = makeZonePacket< FFXIVIpcObjectSpawn >( getId(), pTarget->getId() );
+  auto eobjStatePacket = makeWorldPacket< FFXIVIpcObjectSpawn >( getId(), pTarget->getId() );
   eobjStatePacket->data().spawnIndex = spawnIndex;
   eobjStatePacket->data().objKind = getObjKind();
   eobjStatePacket->data().state = getState();
diff --git a/src/world/Actor/Player.cpp b/src/world/Actor/Player.cpp
index ed003ed3..375374ef 100644
--- a/src/world/Actor/Player.cpp
+++ b/src/world/Actor/Player.cpp
@@ -236,7 +236,7 @@ uint64_t Sapphire::Entity::Player::getOnlineStatusMask() const
 
 void Sapphire::Entity::Player::prepareZoning( uint16_t targetZone, bool fadeOut, uint8_t fadeOutTime, uint16_t animation )
 {
-  auto preparePacket = makeZonePacket< FFXIVIpcPrepareZoning >( getId() );
+  auto preparePacket = makeWorldPacket< FFXIVIpcPrepareZoning >( getId() );
   preparePacket->data().targetZone = targetZone;
   preparePacket->data().fadeOutTime = fadeOutTime;
   preparePacket->data().animation = animation;
@@ -312,7 +312,7 @@ bool Sapphire::Entity::Player::isAutoattackOn() const
 void Sapphire::Entity::Player::sendStats()
 {
 
-  auto statPacket = makeZonePacket< FFXIVIpcPlayerStats >( getId() );
+  auto statPacket = makeWorldPacket< FFXIVIpcPlayerStats >( getId() );
   statPacket->data().strength = getStatValue( Common::BaseParam::Strength );
   statPacket->data().dexterity = getStatValue( Common::BaseParam::Dexterity );
   statPacket->data().vitality = getStatValue( Common::BaseParam::Vitality );
@@ -444,7 +444,7 @@ bool Sapphire::Entity::Player::setInstance( TerritoryPtr instance )
     return false;
 
   auto pTeriMgr = m_pFw->get< TerritoryMgr >();
-  auto currentZone = getCurrentZone();
+  auto currentZone = getCurrentTerritory();
 
   // zoning within the same zone won't cause the prev data to be overwritten
   if( instance->getTerritoryTypeId() != m_territoryTypeId )
@@ -465,7 +465,7 @@ bool Sapphire::Entity::Player::setInstance( TerritoryPtr instance, Common::FFXIV
     return false;
 
   auto pTeriMgr = m_pFw->get< TerritoryMgr >();
-  auto currentZone = getCurrentZone();
+  auto currentZone = getCurrentTerritory();
 
   // zoning within the same zone won't cause the prev data to be overwritten
   if( instance->getTerritoryTypeId() != m_territoryTypeId )
@@ -489,7 +489,7 @@ bool Sapphire::Entity::Player::exitInstance()
 {
   auto pTeriMgr = m_pFw->get< TerritoryMgr >();
 
-  auto pZone = getCurrentZone();
+  auto pZone = getCurrentTerritory();
   auto pInstance = pZone->getAsInstanceContent();
 
   resetHp();
@@ -596,7 +596,7 @@ void Sapphire::Entity::Player::discover( int16_t map_id, int16_t sub_id )
   int32_t offset = 4;
 
   auto info = pExdData->get< Sapphire::Data::Map >(
-    pExdData->get< Sapphire::Data::TerritoryType >( getCurrentZone()->getTerritoryTypeId() )->map );
+    pExdData->get< Sapphire::Data::TerritoryType >( getCurrentTerritory()->getTerritoryTypeId() )->map );
   if( info->discoveryArrayByte )
     offset = 5 + 2 * info->discoveryIndex;
   else
@@ -733,7 +733,7 @@ void Sapphire::Entity::Player::gainLevel()
   m_hp = getMaxHp();
   m_mp = getMaxMp();
 
-  auto effectListPacket = makeZonePacket< FFXIVIpcStatusEffectList >( getId() );
+  auto effectListPacket = makeWorldPacket< FFXIVIpcStatusEffectList >( getId() );
   effectListPacket->data().classId = static_cast< uint8_t > ( getClass() );
   effectListPacket->data().level1 = getLevel();
   effectListPacket->data().level = getLevel();
@@ -747,7 +747,7 @@ void Sapphire::Entity::Player::gainLevel()
   sendToInRangeSet( makeActorControl142( getId(), LevelUpEffect, static_cast< uint8_t >( getClass() ),
                                          getLevel(), getLevel() - 1 ), true );
 
-  auto classInfoPacket = makeZonePacket< FFXIVIpcUpdateClassInfo >( getId() );
+  auto classInfoPacket = makeWorldPacket< FFXIVIpcUpdateClassInfo >( getId() );
   classInfoPacket->data().classId = static_cast< uint8_t > ( getClass() );
   classInfoPacket->data().level1 = getLevel();
   classInfoPacket->data().level = getLevel();
@@ -820,7 +820,7 @@ void Sapphire::Entity::Player::setClassJob( Common::ClassJob classJob )
 
   m_tp = 0;
 
-  auto classInfoPacket = makeZonePacket< FFXIVIpcPlayerClassInfo >( getId() );
+  auto classInfoPacket = makeWorldPacket< FFXIVIpcPlayerClassInfo >( getId() );
   classInfoPacket->data().classId = static_cast< uint8_t >( getClass() );
   classInfoPacket->data().classLevel = getLevel();
   classInfoPacket->data().syncedLevel = getLevel();
@@ -956,7 +956,7 @@ void Sapphire::Entity::Player::setGc( uint8_t gc )
 {
   m_gc = gc;
 
-  auto gcAffPacket = makeZonePacket< FFXIVGCAffiliation >( getId() );
+  auto gcAffPacket = makeWorldPacket< FFXIVGCAffiliation >( getId() );
   gcAffPacket->data().gcId = m_gc;
   gcAffPacket->data().gcRank[ 0 ] = m_gcRank[ 0 ];
   gcAffPacket->data().gcRank[ 1 ] = m_gcRank[ 1 ];
@@ -968,7 +968,7 @@ void Sapphire::Entity::Player::setGcRankAt( uint8_t index, uint8_t rank )
 {
   m_gcRank[ index ] = rank;
 
-  auto gcAffPacket = makeZonePacket< FFXIVGCAffiliation >( getId() );
+  auto gcAffPacket = makeWorldPacket< FFXIVGCAffiliation >( getId() );
   gcAffPacket->data().gcId = m_gc;
   gcAffPacket->data().gcRank[ 0 ] = m_gcRank[ 0 ];
   gcAffPacket->data().gcRank[ 1 ] = m_gcRank[ 1 ];
@@ -1065,13 +1065,13 @@ void Sapphire::Entity::Player::update( uint64_t tickCount )
   if( m_queuedZoneing && ( tickCount - m_queuedZoneing->m_queueTime ) > 800 )
   {
     Common::FFXIVARR_POSITION3 targetPos = m_queuedZoneing->m_targetPosition;
-    if( getCurrentZone()->getTerritoryTypeId() != m_queuedZoneing->m_targetZone )
+    if( getCurrentTerritory()->getTerritoryTypeId() != m_queuedZoneing->m_targetZone )
     {
       performZoning( m_queuedZoneing->m_targetZone, targetPos, m_queuedZoneing->m_targetRotation );
     }
     else
     {
-      auto setActorPosPacket = makeZonePacket< FFXIVIpcActorSetPos >( getId() );
+      auto setActorPosPacket = makeWorldPacket< FFXIVIpcActorSetPos >( getId() );
       setActorPosPacket->data().r16 = Util::floatToUInt16Rot( m_queuedZoneing->m_targetRotation );
       setActorPosPacket->data().waitForLoad = 0x04;
       setActorPosPacket->data().x = targetPos.x;
@@ -1155,7 +1155,7 @@ void Sapphire::Entity::Player::freePlayerSpawnId( uint32_t actorId )
   if( spawnId == m_actorSpawnIndexAllocator.getAllocFailId() )
     return;
 
-  auto freeActorSpawnPacket = makeZonePacket< FFXIVIpcActorFreeSpawn >( getId() );
+  auto freeActorSpawnPacket = makeWorldPacket< FFXIVIpcActorFreeSpawn >( getId() );
   freeActorSpawnPacket->data().actorId = actorId;
   freeActorSpawnPacket->data().spawnId = spawnId;
   queuePacket( freeActorSpawnPacket );
@@ -1410,9 +1410,9 @@ bool Sapphire::Entity::Player::hateListHasEntry( BNpcPtr pBNpc )
 
 void Sapphire::Entity::Player::sendHateList()
 {
-  auto hateListPacket = makeZonePacket< FFXIVIpcHateList >( getId() );
+  auto hateListPacket = makeWorldPacket< FFXIVIpcHateList >( getId() );
   hateListPacket->data().numEntries = m_actorIdTohateSlotMap.size();
-  auto hateRankPacket = makeZonePacket< FFXIVIpcHateRank >( getId() );
+  auto hateRankPacket = makeWorldPacket< FFXIVIpcHateRank >( getId() );
   hateRankPacket->data().numEntries = m_actorIdTohateSlotMap.size();
   auto it = m_actorIdTohateSlotMap.begin();
   for( int32_t i = 0; it != m_actorIdTohateSlotMap.end(); ++it, i++ )
@@ -1492,7 +1492,7 @@ void Sapphire::Entity::Player::setTitle( uint16_t titleId )
 void Sapphire::Entity::Player::setEquipDisplayFlags( uint8_t state )
 {
   m_equipDisplayFlags = state;
-  auto paramPacket = makeZonePacket< FFXIVIpcEquipDisplayFlags >( getId() );
+  auto paramPacket = makeWorldPacket< FFXIVIpcEquipDisplayFlags >( getId() );
   paramPacket->data().bitmask = m_equipDisplayFlags;
   sendToInRangeSet( paramPacket, true );
 }
@@ -1509,7 +1509,7 @@ void Sapphire::Entity::Player::mount( uint32_t id )
                                          static_cast< uint8_t >( Common::ActorStatus::Mounted ) ), true );
   sendToInRangeSet( makeActorControl143( getId(), 0x39e, 12 ), true ); //?
 
-  auto mountPacket = makeZonePacket< FFXIVIpcMount >( getId() );
+  auto mountPacket = makeWorldPacket< FFXIVIpcMount >( getId() );
   mountPacket->data().id = id;
   sendToInRangeSet( mountPacket, true );
 }
@@ -1657,7 +1657,7 @@ uint16_t Sapphire::Entity::Player::getItemLevel() const
 void Sapphire::Entity::Player::setEorzeaTimeOffset( uint64_t timestamp )
 {
   // TODO: maybe change to persistent?
-  auto packet = makeZonePacket< FFXIVIpcEorzeaTimeOffset >( getId() );
+  auto packet = makeWorldPacket< FFXIVIpcEorzeaTimeOffset >( getId() );
   packet->data().timestamp = timestamp;
 
   // Send to single player
@@ -1683,9 +1683,9 @@ void Sapphire::Entity::Player::sendZonePackets()
     pServerMgr->updatePlayerName( getId(), getName() );
   }
 
-  getCurrentZone()->onBeforePlayerZoneIn( *this );
+  getCurrentTerritory()->onBeforePlayerZoneIn( *this );
 
-  auto initPacket = makeZonePacket< FFXIVIpcInit >( getId() );
+  auto initPacket = makeWorldPacket< FFXIVIpcInit >( getId() );
   initPacket->data().charId = getId();
   queuePacket( initPacket );
 
@@ -1708,7 +1708,7 @@ void Sapphire::Entity::Player::sendZonePackets()
   // only initialize the UI if the player in fact just logged in.
   if( isLogin() )
   {
-    auto contentFinderList = makeZonePacket< FFXIVIpcCFAvailableContents >( getId() );
+    auto contentFinderList = makeWorldPacket< FFXIVIpcCFAvailableContents >( getId() );
 
     for( auto i = 0; i < sizeof( contentFinderList->data().contents ); i++ )
     {
@@ -1719,7 +1719,7 @@ void Sapphire::Entity::Player::sendZonePackets()
 
     queuePacket( std::make_shared< PlayerSetupPacket >( *this ) );
 
-    auto classInfoPacket = makeZonePacket< FFXIVIpcPlayerClassInfo >( getId() );
+    auto classInfoPacket = makeWorldPacket< FFXIVIpcPlayerClassInfo >( getId() );
     classInfoPacket->data().classId = static_cast< uint8_t >( getClass() );
     classInfoPacket->data().unknown = 1;
     classInfoPacket->data().syncedLevel = getLevel();
@@ -1748,25 +1748,25 @@ void Sapphire::Entity::Player::sendZonePackets()
 
   sendLandFlags();
 
-  auto initZonePacket = makeZonePacket< FFXIVIpcInitZone >( getId() );
-  initZonePacket->data().zoneId = getCurrentZone()->getTerritoryTypeId();
-  initZonePacket->data().weatherId = static_cast< uint8_t >( getCurrentZone()->getCurrentWeather() );
+  auto initZonePacket = makeWorldPacket< FFXIVIpcInitZone >( getId() );
+  initZonePacket->data().zoneId = getCurrentTerritory()->getTerritoryTypeId();
+  initZonePacket->data().weatherId = static_cast< uint8_t >( getCurrentTerritory()->getCurrentWeather() );
   initZonePacket->data().bitmask = 0x1;
-  initZonePacket->data().festivalId = getCurrentZone()->getCurrentFestival().first;
-  initZonePacket->data().additionalFestivalId = getCurrentZone()->getCurrentFestival().second;
+  initZonePacket->data().festivalId = getCurrentTerritory()->getCurrentFestival().first;
+  initZonePacket->data().additionalFestivalId = getCurrentTerritory()->getCurrentFestival().second;
   initZonePacket->data().pos.x = getPos().x;
   initZonePacket->data().pos.y = getPos().y;
   initZonePacket->data().pos.z = getPos().z;
   queuePacket( initZonePacket );
 
-  getCurrentZone()->onPlayerZoneIn( *this );
+  getCurrentTerritory()->onPlayerZoneIn( *this );
 
   if( isLogin() )
   {
-    auto unk322 = makeZonePacket< FFXIVARR_IPC_UNK322 >( getId() );
+    auto unk322 = makeWorldPacket< FFXIVARR_IPC_UNK322 >( getId() );
     queuePacket( unk322 );
 
-    auto unk320 = makeZonePacket< FFXIVARR_IPC_UNK320 >( getId() );
+    auto unk320 = makeWorldPacket< FFXIVARR_IPC_UNK320 >( getId() );
     queuePacket( unk320 );
   }
 
@@ -1788,7 +1788,7 @@ bool Sapphire::Entity::Player::isDirectorInitialized() const
 
 void Sapphire::Entity::Player::sendTitleList()
 {
-  auto titleListPacket = makeZonePacket< FFXIVIpcPlayerTitleList >( getId() );
+  auto titleListPacket = makeWorldPacket< FFXIVIpcPlayerTitleList >( getId() );
   memcpy( titleListPacket->data().titleList, getTitleList(), sizeof( titleListPacket->data().titleList ) );
 
   queuePacket( titleListPacket );
@@ -1932,7 +1932,7 @@ void Sapphire::Entity::Player::freeObjSpawnIndexForActorId( uint32_t actorId )
   if( spawnId == m_objSpawnIndexAllocator.getAllocFailId() )
     return;
 
-  auto freeObjectSpawnPacket = makeZonePacket< FFXIVIpcObjectDespawn >( getId() );
+  auto freeObjectSpawnPacket = makeWorldPacket< FFXIVIpcObjectDespawn >( getId() );
   freeObjectSpawnPacket->data().spawnIndex = spawnId;
   queuePacket( freeObjectSpawnPacket );
 }
@@ -1963,7 +1963,7 @@ void Sapphire::Entity::Player::setLandFlags( uint8_t flagSlot, uint32_t landFlag
 
 void Sapphire::Entity::Player::sendLandFlags()
 {
-  auto landFlags = makeZonePacket< FFXIVIpcHousingLandFlags >( getId() );
+  auto landFlags = makeWorldPacket< FFXIVIpcHousingLandFlags >( getId() );
 
   landFlags->data().freeCompanyHouse = m_landFlags[ Common::LandFlagsSlot::FreeCompany ];
   landFlags->data().privateHouse = m_landFlags[ Common::LandFlagsSlot::Private ];
@@ -1976,7 +1976,7 @@ void Sapphire::Entity::Player::sendLandFlags()
 
 void Sapphire::Entity::Player::sendLandFlagsSlot( Common::LandFlagsSlot slot )
 {
-  auto landFlags = makeZonePacket< FFXIVIpcHousingUpdateLandFlagsSlot >( getId() );
+  auto landFlags = makeWorldPacket< FFXIVIpcHousingUpdateLandFlagsSlot >( getId() );
 
   uint32_t type = 0;
 
@@ -2014,7 +2014,7 @@ void Sapphire::Entity::Player::sendHuntingLog()
   for( const auto& entry : m_huntingLogEntries )
   {
     uint64_t completionFlag = 0;
-    auto huntPacket = makeZonePacket< FFXIVIpcHuntingLogEntry >( getId() );
+    auto huntPacket = makeWorldPacket< FFXIVIpcHuntingLogEntry >( getId() );
 
     huntPacket->data().u0 = -1;
     huntPacket->data().rank = entry.rank;
diff --git a/src/world/Actor/PlayerEvent.cpp b/src/world/Actor/PlayerEvent.cpp
index 7db09d0b..945b5c1f 100644
--- a/src/world/Actor/PlayerEvent.cpp
+++ b/src/world/Actor/PlayerEvent.cpp
@@ -141,7 +141,7 @@ void Sapphire::Entity::Player::playGilShop( uint32_t eventId, uint32_t flags,
   pEvent->setEventReturnCallback( eventCallback );
   pEvent->setSceneChainCallback( nullptr );
 
-  auto openGilShopPacket = makeZonePacket< Server::FFXIVIpcEventOpenGilShop >( getId() );
+  auto openGilShopPacket = makeWorldPacket< Server::FFXIVIpcEventOpenGilShop >( getId() );
   openGilShopPacket->data().eventId = eventId;
   openGilShopPacket->data().sceneFlags = flags;
   openGilShopPacket->data().actorId = getId();
diff --git a/src/world/Actor/PlayerInventory.cpp b/src/world/Actor/PlayerInventory.cpp
index 720f2f2e..b2c4e1c3 100644
--- a/src/world/Actor/PlayerInventory.cpp
+++ b/src/world/Actor/PlayerInventory.cpp
@@ -815,7 +815,7 @@ void Sapphire::Entity::Player::discardItem( uint16_t fromInventoryId, uint8_t fr
   m_storageMap[ fromInventoryId ]->removeItem( fromSlotId );
   updateContainer( fromInventoryId, fromSlotId, nullptr );
 
-  auto invTransPacket = makeZonePacket< FFXIVIpcInventoryTransaction >( getId() );
+  auto invTransPacket = makeWorldPacket< FFXIVIpcInventoryTransaction >( getId() );
   invTransPacket->data().sequence = sequence;
   invTransPacket->data().ownerId = getId();
   invTransPacket->data().storageId = fromInventoryId;
@@ -825,7 +825,7 @@ void Sapphire::Entity::Player::discardItem( uint16_t fromInventoryId, uint8_t fr
   invTransPacket->data().type = 7;
   queuePacket( invTransPacket );
 
-  auto invTransFinPacket = makeZonePacket< FFXIVIpcInventoryTransactionFinish >( getId() );
+  auto invTransFinPacket = makeWorldPacket< FFXIVIpcInventoryTransactionFinish >( getId() );
   invTransFinPacket->data().sequenceId = sequence;
   invTransFinPacket->data().sequenceId1 = sequence;
   queuePacket( invTransFinPacket );
@@ -930,7 +930,7 @@ Sapphire::ItemPtr Sapphire::Entity::Player::dropInventoryItem( Sapphire::Common:
   auto seq = getNextInventorySequence();
 
   // send inv update
-  auto invTransPacket = makeZonePacket< FFXIVIpcInventoryTransaction >( getId() );
+  auto invTransPacket = makeWorldPacket< FFXIVIpcInventoryTransaction >( getId() );
   invTransPacket->data().sequence = seq;
   invTransPacket->data().ownerId = getId();
   invTransPacket->data().storageId = type;
@@ -940,7 +940,7 @@ Sapphire::ItemPtr Sapphire::Entity::Player::dropInventoryItem( Sapphire::Common:
   invTransPacket->data().type = 7;
   queuePacket( invTransPacket );
 
-  auto invTransFinPacket = makeZonePacket< FFXIVIpcInventoryTransactionFinish >( getId() );
+  auto invTransFinPacket = makeWorldPacket< FFXIVIpcInventoryTransactionFinish >( getId() );
   invTransFinPacket->data().sequenceId = seq;
   invTransFinPacket->data().sequenceId1 = seq;
   queuePacket( invTransFinPacket );
diff --git a/src/world/Actor/PlayerQuest.cpp b/src/world/Actor/PlayerQuest.cpp
index e503a273..be704ee8 100644
--- a/src/world/Actor/PlayerQuest.cpp
+++ b/src/world/Actor/PlayerQuest.cpp
@@ -39,13 +39,13 @@ void Sapphire::Entity::Player::removeQuest( uint16_t questId )
   if( ( idx != -1 ) && ( m_activeQuests[ idx ] != nullptr ) )
   {
 
-    auto questUpdatePacket = makeZonePacket< FFXIVIpcQuestUpdate >( getId() );
+    auto questUpdatePacket = makeWorldPacket< FFXIVIpcQuestUpdate >( getId() );
     questUpdatePacket->data().slot = static_cast< uint8_t >( idx );
     questUpdatePacket->data().questInfo.c.questId = 0;
     questUpdatePacket->data().questInfo.c.sequence = 0xFF;
     queuePacket( questUpdatePacket );
 
-    auto questFinishPacket = makeZonePacket< FFXIVIpcQuestFinish >( getId() );
+    auto questFinishPacket = makeWorldPacket< FFXIVIpcQuestFinish >( getId() );
     questFinishPacket->data().questId = questId;
     questFinishPacket->data().flag1 = 1;
     questFinishPacket->data().flag2 = 1;
@@ -890,7 +890,7 @@ void Sapphire::Entity::Player::updateQuest( uint16_t questId, uint8_t sequence )
     uint8_t index = getQuestIndex( questId );
     auto pNewQuest = m_activeQuests[ index ];
 
-    auto questUpdatePacket = makeZonePacket< FFXIVIpcQuestUpdate >( getId() );
+    auto questUpdatePacket = makeWorldPacket< FFXIVIpcQuestUpdate >( getId() );
     pNewQuest->c.sequence = sequence;
     questUpdatePacket->data().slot = index;
     questUpdatePacket->data().questInfo = *pNewQuest;
@@ -920,7 +920,7 @@ void Sapphire::Entity::Player::updateQuest( uint16_t questId, uint8_t sequence )
     m_questIdToQuestIdx[ questId ] = idx;
     m_questIdxToQuestId[ idx ] = questId;
 
-    auto questUpdatePacket = makeZonePacket< FFXIVIpcQuestUpdate >( getId() );
+    auto questUpdatePacket = makeWorldPacket< FFXIVIpcQuestUpdate >( getId() );
     questUpdatePacket->data().slot = idx;
     questUpdatePacket->data().questInfo = *pNewQuest;
     queuePacket( questUpdatePacket );
@@ -942,7 +942,7 @@ void Sapphire::Entity::Player::updateQuest( uint16_t questId, uint8_t sequence )
 
 void Sapphire::Entity::Player::sendQuestTracker()
 {
-  auto trackerPacket = makeZonePacket< FFXIVIpcQuestTracker >( getId() );
+  auto trackerPacket = makeWorldPacket< FFXIVIpcQuestTracker >( getId() );
 
   for( int32_t ii = 0; ii < 5; ii++ )
   {
@@ -987,7 +987,7 @@ void Sapphire::Entity::Player::setQuestTracker( uint16_t index, int16_t flag )
 
 void Sapphire::Entity::Player::sendQuestInfo()
 {
-  auto activeQuestListPacket = makeZonePacket< FFXIVIpcQuestActiveList >( getId() );
+  auto activeQuestListPacket = makeWorldPacket< FFXIVIpcQuestActiveList >( getId() );
 
   for( int32_t i = 0; i < 30; i++ )
   {
@@ -1003,7 +1003,7 @@ void Sapphire::Entity::Player::sendQuestInfo()
 
   queuePacket( activeQuestListPacket );
 
-  auto completeQuestListPacket = makeZonePacket< FFXIVIpcQuestCompleteList >( getId() );
+  auto completeQuestListPacket = makeWorldPacket< FFXIVIpcQuestCompleteList >( getId() );
   memcpy( completeQuestListPacket->data().questCompleteMask, m_questCompleteFlags, sizeof( m_questCompleteFlags ) );
   queuePacket( completeQuestListPacket );
 
diff --git a/src/world/Event/Director.cpp b/src/world/Event/Director.cpp
index 00710e77..4ae4a519 100644
--- a/src/world/Event/Director.cpp
+++ b/src/world/Event/Director.cpp
@@ -49,7 +49,7 @@ void Sapphire::Event::Director::sendDirectorClear( Sapphire::Entity::Player& pla
 
 void Sapphire::Event::Director::sendDirectorVars( Sapphire::Entity::Player& player ) const
 {
-  auto varPacket = makeZonePacket< FFXIVIpcDirectorVars >( player.getId() );
+  auto varPacket = makeWorldPacket< FFXIVIpcDirectorVars >( player.getId() );
   varPacket->data().m_directorId = getDirectorId();
   varPacket->data().m_sequence = getSequence();
   varPacket->data().m_branch = 0;
diff --git a/src/world/Manager/DebugCommandMgr.cpp b/src/world/Manager/DebugCommandMgr.cpp
index ac4c73a0..c2a06c9a 100644
--- a/src/world/Manager/DebugCommandMgr.cpp
+++ b/src/world/Manager/DebugCommandMgr.cpp
@@ -188,7 +188,7 @@ void Sapphire::World::Manager::DebugCommandMgr::set( char* data, Entity::Player&
                      player.getPos().y + static_cast< float >( posY ),
                      player.getPos().z + static_cast< float >( posZ ) );
 
-    auto setActorPosPacket = makeZonePacket< FFXIVIpcActorSetPos >( player.getId() );
+    auto setActorPosPacket = makeWorldPacket< FFXIVIpcActorSetPos >( player.getId() );
     setActorPosPacket->data().x = player.getPos().x;
     setActorPosPacket->data().y = player.getPos().y;
     setActorPosPacket->data().z = player.getPos().z;
@@ -208,7 +208,7 @@ void Sapphire::World::Manager::DebugCommandMgr::set( char* data, Entity::Player&
     int32_t discover_id;
     sscanf( params.c_str(), "%i %i", &map_id, &discover_id );
 
-    auto discoveryPacket = makeZonePacket< FFXIVIpcDiscovery >( player.getId() );
+    auto discoveryPacket = makeWorldPacket< FFXIVIpcDiscovery >( player.getId() );
     discoveryPacket->data().map_id = map_id;
     discoveryPacket->data().map_part_id = discover_id;
     player.queuePacket( discoveryPacket );
@@ -281,7 +281,7 @@ void Sapphire::World::Manager::DebugCommandMgr::set( char* data, Entity::Player&
     int32_t id;
     sscanf( params.c_str(), "%d", &id );
 
-    auto msqPacket = makeZonePacket< FFXIVIpcMSQTrackerProgress >( player.getId() );
+    auto msqPacket = makeWorldPacket< FFXIVIpcMSQTrackerProgress >( player.getId() );
     msqPacket->data().id = id;
     player.queuePacket( msqPacket );
 
@@ -292,7 +292,7 @@ void Sapphire::World::Manager::DebugCommandMgr::set( char* data, Entity::Player&
     int32_t id;
     sscanf( params.c_str(), "%d", &id );
 
-    auto msqPacket = makeZonePacket< FFXIVIpcMSQTrackerComplete >( player.getId() );
+    auto msqPacket = makeWorldPacket< FFXIVIpcMSQTrackerComplete >( player.getId() );
     msqPacket->data().id = id;
     player.queuePacket( msqPacket );
 
@@ -304,7 +304,7 @@ void Sapphire::World::Manager::DebugCommandMgr::set( char* data, Entity::Player&
 
     sscanf( params.c_str(), "%d", &weatherId );
 
-    player.getCurrentZone()->setWeatherOverride( static_cast< Common::Weather >( weatherId ) );
+    player.getCurrentTerritory()->setWeatherOverride( static_cast< Common::Weather >( weatherId ) );
   }
   else if( subCommand == "festival" )
   {
@@ -448,7 +448,7 @@ void Sapphire::World::Manager::DebugCommandMgr::add( char* data, Entity::Player&
       player.sendNotice( "Template {0} not found in cache!", params );
       return;
     }
-    auto playerZone = player.getCurrentZone();
+    auto playerZone = player.getCurrentTerritory();
     auto pBNpc = std::make_shared< Entity::BNpc >( playerZone->getNextActorId(),
                                                    bNpcTemplate,
                                                    player.getPos().x,
@@ -459,7 +459,7 @@ void Sapphire::World::Manager::DebugCommandMgr::add( char* data, Entity::Player&
 
 
 
-    //pBNpc->setCurrentZone( playerZone );
+    //pBNpc->setCurrentTerritory( playerZone );
     //pBNpc->setPos( player.getPos().x, player.getPos().y, player.getPos().z );
 
     playerZone->pushActor( pBNpc );
@@ -494,7 +494,7 @@ void Sapphire::World::Manager::DebugCommandMgr::add( char* data, Entity::Player&
 
     player.sendNotice( "Injecting ACTOR_CONTROL {0}", opcode );
 
-    auto actorControl = makeZonePacket< FFXIVIpcActorControl143 >( playerId, player.getId() );
+    auto actorControl = makeWorldPacket< FFXIVIpcActorControl143 >( playerId, player.getId() );
     actorControl->data().category = opcode;
     actorControl->data().param1 = param1;
     actorControl->data().param2 = param2;
@@ -538,7 +538,7 @@ void Sapphire::World::Manager::DebugCommandMgr::add( char* data, Entity::Player&
 
     effectPacket->addEffect( entry );
 
-    auto sequence = player.getCurrentZone()->getNextEffectSequence();
+    auto sequence = player.getCurrentTerritory()->getNextEffectSequence();
     effectPacket->setSequence( sequence );
 
 //    effectPacket->setAnimationId( param1 );
@@ -581,11 +581,11 @@ void Sapphire::World::Manager::DebugCommandMgr::get( char* data, Entity::Player&
   if( ( subCommand == "pos" ) )
   {
 
-    int16_t map_id = pExdData->get< Sapphire::Data::TerritoryType >( player.getCurrentZone()->getTerritoryTypeId() )->map;
+    int16_t map_id = pExdData->get< Sapphire::Data::TerritoryType >( player.getCurrentTerritory()->getTerritoryTypeId() )->map;
 
     player.sendNotice( "Pos:\n {0}\n {1}\n {2}\n {3}\n MapId: {4}\n ZoneId:{5}",
                        player.getPos().x, player.getPos().y, player.getPos().z,
-                       player.getRot(), map_id, player.getCurrentZone()->getTerritoryTypeId() );
+                       player.getRot(), map_id, player.getCurrentTerritory()->getTerritoryTypeId() );
   }
   else
   {
@@ -703,7 +703,7 @@ void Sapphire::World::Manager::DebugCommandMgr::nudge( char* data, Entity::Playe
   }
   if( offset != 0 )
   {
-    auto setActorPosPacket = makeZonePacket< FFXIVIpcActorSetPos >( player.getId() );
+    auto setActorPosPacket = makeWorldPacket< FFXIVIpcActorSetPos >( player.getId() );
     setActorPosPacket->data().x = player.getPos().x;
     setActorPosPacket->data().y = player.getPos().y;
     setActorPosPacket->data().z = player.getPos().z;
@@ -919,7 +919,7 @@ void Sapphire::World::Manager::DebugCommandMgr::instance( char* data, Entity::Pl
     sscanf( params.c_str(), "%d %d", &index, &value );
 
 
-    auto instance = std::dynamic_pointer_cast< InstanceContent >( player.getCurrentZone() );
+    auto instance = std::dynamic_pointer_cast< InstanceContent >( player.getCurrentTerritory() );
     if( !instance )
       return;
 
@@ -932,7 +932,7 @@ void Sapphire::World::Manager::DebugCommandMgr::instance( char* data, Entity::Pl
 
     sscanf( params.c_str(), "%s %hhu", objName, &state );
 
-    auto instance = std::dynamic_pointer_cast< InstanceContent >( player.getCurrentZone() );
+    auto instance = std::dynamic_pointer_cast< InstanceContent >( player.getCurrentTerritory() );
     if( !instance )
       return;
 
@@ -950,7 +950,7 @@ void Sapphire::World::Manager::DebugCommandMgr::instance( char* data, Entity::Pl
 
     sscanf( params.c_str(), "%s %i %i", objName, &state1, &state2 );
 
-    auto instance = std::dynamic_pointer_cast< InstanceContent >( player.getCurrentZone() );
+    auto instance = std::dynamic_pointer_cast< InstanceContent >( player.getCurrentTerritory() );
     if( !instance )
       return;
 
@@ -969,7 +969,7 @@ void Sapphire::World::Manager::DebugCommandMgr::instance( char* data, Entity::Pl
 
     sscanf( params.c_str(), "%hhu", &seq );
 
-    auto instance = std::dynamic_pointer_cast< InstanceContent >( player.getCurrentZone() );
+    auto instance = std::dynamic_pointer_cast< InstanceContent >( player.getCurrentTerritory() );
     if( !instance )
       return;
 
@@ -981,7 +981,7 @@ void Sapphire::World::Manager::DebugCommandMgr::instance( char* data, Entity::Pl
 
     sscanf( params.c_str(), "%hhu", &branch );
 
-    auto instance = std::dynamic_pointer_cast< InstanceContent >( player.getCurrentZone() );
+    auto instance = std::dynamic_pointer_cast< InstanceContent >( player.getCurrentTerritory() );
     if( !instance )
       return;
 
@@ -989,7 +989,7 @@ void Sapphire::World::Manager::DebugCommandMgr::instance( char* data, Entity::Pl
   }
   else if( subCommand == "qte_start" )
   {
-    auto instance = std::dynamic_pointer_cast< InstanceContent >( player.getCurrentZone() );
+    auto instance = std::dynamic_pointer_cast< InstanceContent >( player.getCurrentTerritory() );
     if( !instance )
       return;
 
@@ -998,7 +998,7 @@ void Sapphire::World::Manager::DebugCommandMgr::instance( char* data, Entity::Pl
   }
   else if( subCommand == "event_start" )
   {
-    auto instance = std::dynamic_pointer_cast< InstanceContent >( player.getCurrentZone() );
+    auto instance = std::dynamic_pointer_cast< InstanceContent >( player.getCurrentTerritory() );
     if( !instance )
       return;
 
@@ -1007,7 +1007,7 @@ void Sapphire::World::Manager::DebugCommandMgr::instance( char* data, Entity::Pl
   }
   else if( subCommand == "event_end" )
   {
-    auto instance = std::dynamic_pointer_cast< InstanceContent >( player.getCurrentZone() );
+    auto instance = std::dynamic_pointer_cast< InstanceContent >( player.getCurrentTerritory() );
     if( !instance )
       return;
 
@@ -1064,7 +1064,7 @@ void Sapphire::World::Manager::DebugCommandMgr::questBattle( char* data, Entity:
   else if( subCommand == "complete" )
   {
 
-    auto instance = std::dynamic_pointer_cast< QuestBattle >( player.getCurrentZone() );
+    auto instance = std::dynamic_pointer_cast< QuestBattle >( player.getCurrentTerritory() );
     if( !instance )
       return;
 
@@ -1074,7 +1074,7 @@ void Sapphire::World::Manager::DebugCommandMgr::questBattle( char* data, Entity:
   else if( subCommand == "fail" )
   {
 
-    auto instance = std::dynamic_pointer_cast< QuestBattle >( player.getCurrentZone() );
+    auto instance = std::dynamic_pointer_cast< QuestBattle >( player.getCurrentTerritory() );
     if( !instance )
       return;
 
@@ -1114,7 +1114,7 @@ void Sapphire::World::Manager::DebugCommandMgr::questBattle( char* data, Entity:
     sscanf( params.c_str(), "%d %d", &index, &value );
 
 
-    auto instance = std::dynamic_pointer_cast< QuestBattle >( player.getCurrentZone() );
+    auto instance = std::dynamic_pointer_cast< QuestBattle >( player.getCurrentTerritory() );
     if( !instance )
       return;
 
@@ -1127,7 +1127,7 @@ void Sapphire::World::Manager::DebugCommandMgr::questBattle( char* data, Entity:
 
     sscanf( params.c_str(), "%s %hhu", objName, &state );
 
-    auto instance = std::dynamic_pointer_cast< QuestBattle >( player.getCurrentZone() );
+    auto instance = std::dynamic_pointer_cast< QuestBattle >( player.getCurrentTerritory() );
     if( !instance )
       return;
 
@@ -1145,7 +1145,7 @@ void Sapphire::World::Manager::DebugCommandMgr::questBattle( char* data, Entity:
 
     sscanf( params.c_str(), "%s %i %i", objName, &state1, &state2 );
 
-    auto instance = std::dynamic_pointer_cast< QuestBattle >( player.getCurrentZone() );
+    auto instance = std::dynamic_pointer_cast< QuestBattle >( player.getCurrentTerritory() );
     if( !instance )
       return;
 
@@ -1164,7 +1164,7 @@ void Sapphire::World::Manager::DebugCommandMgr::questBattle( char* data, Entity:
 
     sscanf( params.c_str(), "%hhu", &seq );
 
-    auto instance = std::dynamic_pointer_cast< QuestBattle >( player.getCurrentZone() );
+    auto instance = std::dynamic_pointer_cast< QuestBattle >( player.getCurrentTerritory() );
     if( !instance )
       return;
 
@@ -1176,7 +1176,7 @@ void Sapphire::World::Manager::DebugCommandMgr::questBattle( char* data, Entity:
 
     sscanf( params.c_str(), "%hhu", &branch );
 
-    auto instance = std::dynamic_pointer_cast< QuestBattle >( player.getCurrentZone() );
+    auto instance = std::dynamic_pointer_cast< QuestBattle >( player.getCurrentTerritory() );
     if( !instance )
       return;
 
@@ -1184,7 +1184,7 @@ void Sapphire::World::Manager::DebugCommandMgr::questBattle( char* data, Entity:
   }
   else if( subCommand == "qte_start" )
   {
-    auto instance = std::dynamic_pointer_cast< QuestBattle >( player.getCurrentZone() );
+    auto instance = std::dynamic_pointer_cast< QuestBattle >( player.getCurrentTerritory() );
     if( !instance )
       return;
 
@@ -1193,7 +1193,7 @@ void Sapphire::World::Manager::DebugCommandMgr::questBattle( char* data, Entity:
   }
   else if( subCommand == "event_start" )
   {
-    auto instance = std::dynamic_pointer_cast< QuestBattle >( player.getCurrentZone() );
+    auto instance = std::dynamic_pointer_cast< QuestBattle >( player.getCurrentTerritory() );
     if( !instance )
       return;
 
@@ -1202,7 +1202,7 @@ void Sapphire::World::Manager::DebugCommandMgr::questBattle( char* data, Entity:
   }
   else if( subCommand == "event_end" )
   {
-    auto instance = std::dynamic_pointer_cast< QuestBattle >( player.getCurrentZone() );
+    auto instance = std::dynamic_pointer_cast< QuestBattle >( player.getCurrentTerritory() );
     if( !instance )
       return;
 
@@ -1252,7 +1252,7 @@ void Sapphire::World::Manager::DebugCommandMgr::housing( char* data, Entity::Pla
 //
 //    if ( permissionSet < 5 )
 //    {
-//      auto pZone = player.getCurrentZone();
+//      auto pZone = player.getCurrentTerritory();
 //      if( pTeriMgr->isHousingTerritory( pZone->getTerritoryTypeId() ) )
 //      {
 //        auto pHousing = std::dynamic_pointer_cast< HousingZone >( pZone );
diff --git a/src/world/Manager/HousingMgr.cpp b/src/world/Manager/HousingMgr.cpp
index beacd0f7..5c7962ba 100644
--- a/src/world/Manager/HousingMgr.cpp
+++ b/src/world/Manager/HousingMgr.cpp
@@ -322,7 +322,7 @@ void Sapphire::World::Manager::HousingMgr::sendLandSignOwned( Entity::Player& pl
   if( !land )
     return;
 
-  auto landInfoSignPacket = makeZonePacket< Server::FFXIVIpcLandInfoSign >( player.getId() );
+  auto landInfoSignPacket = makeWorldPacket< Server::FFXIVIpcLandInfoSign >( player.getId() );
   landInfoSignPacket->data().houseSize = land->getSize();
   landInfoSignPacket->data().houseType = static_cast< uint8_t >( land->getLandType() );
   landInfoSignPacket->data().landIdent = ident;
@@ -354,7 +354,7 @@ void Sapphire::World::Manager::HousingMgr::sendLandSignFree( Entity::Player& pla
     return;
 
   auto land = hZone->getLand( ident.landId );
-  auto plotPricePacket = makeZonePacket< Server::FFXIVIpcLandPriceUpdate >( player.getId() );
+  auto plotPricePacket = makeWorldPacket< Server::FFXIVIpcLandPriceUpdate >( player.getId() );
   plotPricePacket->data().price = land->getCurrentPrice();
   plotPricePacket->data().timeLeft = land->getDevaluationTime();
   player.queuePacket( plotPricePacket );
@@ -362,7 +362,7 @@ void Sapphire::World::Manager::HousingMgr::sendLandSignFree( Entity::Player& pla
 
 Sapphire::LandPurchaseResult Sapphire::World::Manager::HousingMgr::purchaseLand( Entity::Player& player, uint8_t plot, uint8_t state )
 {
-  auto pHousing = std::dynamic_pointer_cast< HousingZone >( player.getCurrentZone() );
+  auto pHousing = std::dynamic_pointer_cast< HousingZone >( player.getCurrentTerritory() );
 
   auto plotPrice = pHousing->getLand( plot )->getCurrentPrice();
   auto gilAvailable = player.getCurrency( CurrencyType::Gil );
@@ -418,7 +418,7 @@ bool Sapphire::World::Manager::HousingMgr::relinquishLand( Entity::Player& playe
 {
   // TODO: Fix "permissions" being sent incorrectly
   // TODO: Add checks for land state before relinquishing
-  auto pHousing = std::dynamic_pointer_cast< HousingZone >( player.getCurrentZone() );
+  auto pHousing = std::dynamic_pointer_cast< HousingZone >( player.getCurrentTerritory() );
 
   auto pLand = pHousing->getLand( plot );
   auto plotMaxPrice = pLand->getCurrentPrice();
@@ -469,7 +469,7 @@ void Sapphire::World::Manager::HousingMgr::sendWardLandInfo( Entity::Player& pla
   if( !hZone )
     return;
 
-  auto wardInfoPacket = makeZonePacket< Server::FFXIVIpcHousingWardInfo >( player.getId() );
+  auto wardInfoPacket = makeWorldPacket< Server::FFXIVIpcHousingWardInfo >( player.getId() );
   wardInfoPacket->data().landIdent.wardNum = wardId;
   wardInfoPacket->data().landIdent.territoryTypeId = territoryTypeId;
 
@@ -538,7 +538,7 @@ void Sapphire::World::Manager::HousingMgr::sendEstateGreeting( Entity::Player& p
   if( !house )
     return;
 
-  auto greetingPacket = makeZonePacket< FFXIVIpcHousingEstateGreeting >( player.getId() );
+  auto greetingPacket = makeWorldPacket< FFXIVIpcHousingEstateGreeting >( player.getId() );
 
   greetingPacket->data().landIdent = ident;
 
@@ -660,7 +660,7 @@ void Sapphire::World::Manager::HousingMgr::createHouse( Sapphire::HousePtr house
 
 void Sapphire::World::Manager::HousingMgr::buildPresetEstate( Entity::Player& player, uint8_t plotNum, uint32_t presetCatalogId )
 {
-  auto hZone = std::dynamic_pointer_cast< HousingZone >( player.getCurrentZone() );
+  auto hZone = std::dynamic_pointer_cast< HousingZone >( player.getCurrentTerritory() );
 
   if( !hZone )
     return;
@@ -723,7 +723,7 @@ void Sapphire::World::Manager::HousingMgr::requestEstateRename( Entity::Player&
   if( !house )
     return;
 
-  auto landRenamePacket = makeZonePacket< Server::FFXIVIpcLandRename >( player.getId() );
+  auto landRenamePacket = makeWorldPacket< Server::FFXIVIpcLandRename >( player.getId() );
 
   landRenamePacket->data().landIdent = ident;
   memcpy( &landRenamePacket->data().houseName, house->getHouseName().c_str(), 20 );
@@ -747,7 +747,7 @@ void Sapphire::World::Manager::HousingMgr::requestEstateEditGreeting( Entity::Pl
   if( !house )
     return;
 
-  auto estateGreetingPacket = makeZonePacket< Server::FFXIVIpcHousingEstateGreeting >( player.getId() );
+  auto estateGreetingPacket = makeWorldPacket< Server::FFXIVIpcHousingEstateGreeting >( player.getId() );
 
   estateGreetingPacket->data().landIdent = ident;
   memcpy( &estateGreetingPacket->data().message, house->getHouseGreeting().c_str(), sizeof( estateGreetingPacket->data().message ) );
@@ -795,7 +795,7 @@ void Sapphire::World::Manager::HousingMgr::requestEstateEditGuestAccess( Entity:
   if( !hasPermission( player, *land, 0 ) )
     return;
 
-  auto packet = makeZonePacket< Server::FFXIVIpcHousingShowEstateGuestAccess >( player.getId() );
+  auto packet = makeWorldPacket< Server::FFXIVIpcHousingShowEstateGuestAccess >( player.getId() );
   packet->data().ident = ident;
 
   player.queuePacket( packet );
@@ -830,7 +830,8 @@ void Sapphire::World::Manager::HousingMgr::sendEstateInventory( Entity::Player&
   // and we have to switch up our way of getting the LandPtr
   if( plotNum == 255 )
   {
-    auto internalZone = std::dynamic_pointer_cast< Territory::Housing::HousingInteriorTerritory >( player.getCurrentZone() );
+    auto internalZone = std::dynamic_pointer_cast< Territory::Housing::HousingInteriorTerritory >(
+      player.getCurrentTerritory() );
     if( !internalZone )
       return;
 
@@ -846,7 +847,7 @@ void Sapphire::World::Manager::HousingMgr::sendEstateInventory( Entity::Player&
   }
   else
   {
-    auto zone = std::dynamic_pointer_cast< HousingZone >( player.getCurrentZone() );
+    auto zone = std::dynamic_pointer_cast< HousingZone >( player.getCurrentTerritory() );
     if( !zone )
       return;
 
@@ -971,14 +972,15 @@ void Sapphire::World::Manager::HousingMgr::reqPlaceHousingItem( Sapphire::Entity
   bool isOutside = false;
 
   // inside housing territory
-  if( auto zone = std::dynamic_pointer_cast< HousingZone >( player.getCurrentZone() ) )
+  if( auto zone = std::dynamic_pointer_cast< HousingZone >( player.getCurrentTerritory() ) )
   {
     land = zone->getLand( landId );
 
     isOutside = true;
   }
   // otherwise, inside a house. landId is 0 when inside a plot
-  else if( auto zone = std::dynamic_pointer_cast< Territory::Housing::HousingInteriorTerritory >( player.getCurrentZone() ) )
+  else if( auto zone = std::dynamic_pointer_cast< Territory::Housing::HousingInteriorTerritory >(
+    player.getCurrentTerritory() ) )
   {
     // todo: this whole process is retarded and needs to be fixed
     // perhaps maintain a list of estates by ident inside housingmgr?
@@ -1043,12 +1045,13 @@ void Sapphire::World::Manager::HousingMgr::reqPlaceItemInStore( Sapphire::Entity
   LandPtr land;
   bool isOutside = false;
 
-  if( auto zone = std::dynamic_pointer_cast< HousingZone >( player.getCurrentZone() ) )
+  if( auto zone = std::dynamic_pointer_cast< HousingZone >( player.getCurrentTerritory() ) )
   {
     land = zone->getLand( landId );
     isOutside = true;
   }
-  else if( auto zone = std::dynamic_pointer_cast< Territory::Housing::HousingInteriorTerritory >( player.getCurrentZone() ) )
+  else if( auto zone = std::dynamic_pointer_cast< Territory::Housing::HousingInteriorTerritory >(
+    player.getCurrentTerritory() ) )
   {
     // todo: this whole process is retarded and needs to be fixed
     // perhaps maintain a list of estates by ident inside housingmgr?
@@ -1133,7 +1136,7 @@ bool Sapphire::World::Manager::HousingMgr::placeExternalItem( Entity::Player& pl
   invMgr->updateHousingItemPosition( item );
 
   // add to zone and spawn
-  auto zone = std::dynamic_pointer_cast< HousingZone >( player.getCurrentZone() );
+  auto zone = std::dynamic_pointer_cast< HousingZone >( player.getCurrentTerritory() );
   assert( zone );
 
   zone->spawnYardObject( ident.landId, freeSlot, *item );
@@ -1146,7 +1149,7 @@ bool Sapphire::World::Manager::HousingMgr::placeInteriorItem( Entity::Player& pl
 {
   auto invMgr = framework()->get< InventoryMgr >();
 
-  auto zone = std::dynamic_pointer_cast< Territory::Housing::HousingInteriorTerritory >( player.getCurrentZone() );
+  auto zone = std::dynamic_pointer_cast< Territory::Housing::HousingInteriorTerritory >( player.getCurrentTerritory() );
   assert( zone );
 
   auto ident = zone->getLandIdent();
@@ -1177,7 +1180,7 @@ bool Sapphire::World::Manager::HousingMgr::placeInteriorItem( Entity::Player& pl
     invMgr->saveHousingContainer( ident, container );
     invMgr->updateHousingItemPosition( item );
 
-    auto zone = std::dynamic_pointer_cast< Territory::Housing::HousingInteriorTerritory >( player.getCurrentZone() );
+    auto zone = std::dynamic_pointer_cast< Territory::Housing::HousingInteriorTerritory >( player.getCurrentTerritory() );
     assert( zone );
 
     zone->spawnHousingObject( containerIdx, freeSlot, containerId, item );
@@ -1202,7 +1205,7 @@ Sapphire::Common::HousingObject Sapphire::World::Manager::HousingMgr::getYardObj
 void Sapphire::World::Manager::HousingMgr::sendInternalEstateInventoryBatch( Sapphire::Entity::Player& player,
                                                                              bool storeroom )
 {
-  auto zone = std::dynamic_pointer_cast< Territory::Housing::HousingInteriorTerritory >( player.getCurrentZone() );
+  auto zone = std::dynamic_pointer_cast< Territory::Housing::HousingInteriorTerritory >( player.getCurrentTerritory() );
   if( !zone )
     return;
 
@@ -1243,11 +1246,12 @@ void Sapphire::World::Manager::HousingMgr::reqMoveHousingItem( Entity::Player& p
 
   // todo: what happens when either of these fail? how does the server let the client know that the moment failed
   // as is, if it does fail, the client will be locked and unable to move any item until reentering the territory
-  if( auto terri = std::dynamic_pointer_cast< Territory::Housing::HousingInteriorTerritory >( player.getCurrentZone() ) )
+  if( auto terri = std::dynamic_pointer_cast< Territory::Housing::HousingInteriorTerritory >(
+    player.getCurrentTerritory() ) )
   {
     moveInternalItem( player, ident, *terri, slot, pos, rot );
   }
-  else if( auto terri = std::dynamic_pointer_cast< HousingZone >( player.getCurrentZone() ) )
+  else if( auto terri = std::dynamic_pointer_cast< HousingZone >( player.getCurrentTerritory() ) )
   {
     moveExternalItem( player, ident, slot, *terri, pos, rot );
   }
@@ -1339,7 +1343,8 @@ void Sapphire::World::Manager::HousingMgr::reqRemoveHousingItem( Sapphire::Entit
                                                                  uint16_t containerId, uint8_t slot,
                                                                  bool sendToStoreroom )
 {
-  if( auto terri = std::dynamic_pointer_cast< Territory::Housing::HousingInteriorTerritory >( player.getCurrentZone() ) )
+  if( auto terri = std::dynamic_pointer_cast< Territory::Housing::HousingInteriorTerritory >(
+    player.getCurrentTerritory() ) )
   {
     auto ident = terri->getLandIdent();
     auto landSet = toLandSetId( ident.territoryTypeId, ident.wardNum );
@@ -1353,7 +1358,7 @@ void Sapphire::World::Manager::HousingMgr::reqRemoveHousingItem( Sapphire::Entit
 
     removeInternalItem( player, *terri, containerId, slot, sendToStoreroom );
   }
-  else if( auto terri = std::dynamic_pointer_cast< HousingZone >( player.getCurrentZone() ) )
+  else if( auto terri = std::dynamic_pointer_cast< HousingZone >( player.getCurrentTerritory() ) )
   {
     auto land = terri->getLand( plot );
     if( !land )
@@ -1542,7 +1547,7 @@ Sapphire::ItemContainerPtr Sapphire::World::Manager::HousingMgr::getFreeEstateIn
 
 void Sapphire::World::Manager::HousingMgr::reqEstateExteriorRemodel( Sapphire::Entity::Player& player, uint16_t plot )
 {
-  auto terri = std::dynamic_pointer_cast< HousingZone >( player.getCurrentZone() );
+  auto terri = std::dynamic_pointer_cast< HousingZone >( player.getCurrentTerritory() );
   if( !terri )
     return;
 
@@ -1569,7 +1574,7 @@ void Sapphire::World::Manager::HousingMgr::reqEstateExteriorRemodel( Sapphire::E
 
 void Sapphire::World::Manager::HousingMgr::reqEstateInteriorRemodel( Sapphire::Entity::Player& player )
 {
-  auto terri = std::dynamic_pointer_cast< Territory::Housing::HousingInteriorTerritory >( player.getCurrentZone() );
+  auto terri = std::dynamic_pointer_cast< Territory::Housing::HousingInteriorTerritory >( player.getCurrentTerritory() );
   if( !terri )
     return;
 
diff --git a/src/world/Manager/InventoryMgr.cpp b/src/world/Manager/InventoryMgr.cpp
index 6d8217c6..2bed5713 100644
--- a/src/world/Manager/InventoryMgr.cpp
+++ b/src/world/Manager/InventoryMgr.cpp
@@ -32,7 +32,7 @@ void Sapphire::World::Manager::InventoryMgr::sendInventoryContainer( Sapphire::E
 
     if( container->getId() == Common::InventoryType::Currency || container->getId() == Common::InventoryType::Crystal )
     {
-      auto currencyInfoPacket = makeZonePacket< Server::FFXIVIpcCurrencyCrystalInfo >( player.getId() );
+      auto currencyInfoPacket = makeWorldPacket< Server::FFXIVIpcCurrencyCrystalInfo >( player.getId() );
       currencyInfoPacket->data().containerSequence = sequence;
       currencyInfoPacket->data().catalogId = itM->second->getId();
       currencyInfoPacket->data().unknown = 1;
@@ -44,7 +44,7 @@ void Sapphire::World::Manager::InventoryMgr::sendInventoryContainer( Sapphire::E
     }
     else
     {
-      auto itemInfoPacket = makeZonePacket< Server::FFXIVIpcItemInfo >( player.getId() );
+      auto itemInfoPacket = makeWorldPacket< Server::FFXIVIpcItemInfo >( player.getId() );
       itemInfoPacket->data().containerSequence = sequence;
       itemInfoPacket->data().containerId = container->getId();
       itemInfoPacket->data().slot = itM->first;
@@ -60,7 +60,7 @@ void Sapphire::World::Manager::InventoryMgr::sendInventoryContainer( Sapphire::E
     }
   }
 
-  auto containerInfoPacket = makeZonePacket< Server::FFXIVIpcContainerInfo >( player.getId() );
+  auto containerInfoPacket = makeWorldPacket< Server::FFXIVIpcContainerInfo >( player.getId() );
   containerInfoPacket->data().containerSequence = sequence;
   containerInfoPacket->data().numItems = container->getEntryCount();
   containerInfoPacket->data().containerId = container->getId();
diff --git a/src/world/Manager/MarketMgr.cpp b/src/world/Manager/MarketMgr.cpp
index 1ad81cf9..8b13d2a7 100644
--- a/src/world/Manager/MarketMgr.cpp
+++ b/src/world/Manager/MarketMgr.cpp
@@ -64,14 +64,14 @@ bool Sapphire::World::Manager::MarketMgr::init()
 void Sapphire::World::Manager::MarketMgr::requestItemListingInfo( Sapphire::Entity::Player& player, uint32_t catalogId,
                                                                   uint32_t requestId )
 {
-  auto countPkt = makeZonePacket< Server::FFFXIVIpcMarketBoardItemListingCount >( player.getId() );
+  auto countPkt = makeWorldPacket< Server::FFFXIVIpcMarketBoardItemListingCount >( player.getId() );
   countPkt->data().quantity = 1 << 8;
   countPkt->data().itemCatalogId = catalogId;
   countPkt->data().requestId = requestId;
 
   player.queuePacket( countPkt );
 
-  auto historyPkt = makeZonePacket< Server::FFXIVIpcMarketBoardItemListingHistory >( player.getId() );
+  auto historyPkt = makeWorldPacket< Server::FFXIVIpcMarketBoardItemListingHistory >( player.getId() );
   historyPkt->data().itemCatalogId = catalogId;
   historyPkt->data().itemCatalogId2 = catalogId;
 
@@ -111,7 +111,7 @@ void Sapphire::World::Manager::MarketMgr::searchMarketboard( Entity::Player& pla
   auto endIdx = std::min< size_t >( startIdx + 20, numResults );
   auto size = endIdx - startIdx;
 
-  auto resultPkt = makeZonePacket< Server::FFXIVIpcMarketBoardSearchResult >( player.getId() );
+  auto resultPkt = makeWorldPacket< Server::FFXIVIpcMarketBoardSearchResult >( player.getId() );
   resultPkt->data().itemIndexStart = startIdx;
   resultPkt->data().requestId = requestId;
 
diff --git a/src/world/Manager/TerritoryMgr.cpp b/src/world/Manager/TerritoryMgr.cpp
index 3e707511..0889d5f5 100644
--- a/src/world/Manager/TerritoryMgr.cpp
+++ b/src/world/Manager/TerritoryMgr.cpp
@@ -628,10 +628,10 @@ bool Sapphire::World::Manager::TerritoryMgr::movePlayer( TerritoryPtr pZone, Sap
   // mark character as zoning in progress
   pPlayer->setLoadingComplete( false );
 
-  if( pPlayer->getLastPing() != 0 && pPlayer->getCurrentZone() )
-    pPlayer->getCurrentZone()->removeActor( pPlayer );
+  if( pPlayer->getLastPing() != 0 && pPlayer->getCurrentTerritory() )
+    pPlayer->getCurrentTerritory()->removeActor( pPlayer );
 
-  pPlayer->setCurrentZone( pZone );
+  pPlayer->setCurrentTerritory( pZone );
   pZone->pushActor( pPlayer );
 
   // map player to instanceId so it can be tracked.
diff --git a/src/world/Network/Handlers/ActionHandler.cpp b/src/world/Network/Handlers/ActionHandler.cpp
index 460c294a..99137c62 100644
--- a/src/world/Network/Handlers/ActionHandler.cpp
+++ b/src/world/Network/Handlers/ActionHandler.cpp
@@ -18,7 +18,7 @@ void Sapphire::Network::GameConnection::actionHandler( FrameworkPtr pFw,
                                                        const Packets::FFXIVARR_PACKET_RAW& inPacket,
                                                        Entity::Player& player )
 {
-  const auto packet = ZoneChannelPacket< Client::FFXIVIpcSkillHandler >( inPacket );
+  const auto packet = WorldChannelPacket< Client::FFXIVIpcSkillHandler >( inPacket );
 
   const auto type = packet.data().type;
   const auto actionId = packet.data().actionId;
@@ -85,7 +85,7 @@ void Sapphire::Network::GameConnection::placedActionHandler( FrameworkPtr pFw,
                                                              const Packets::FFXIVARR_PACKET_RAW& inPacket,
                                                              Entity::Player& player )
 {
-  const auto packet = ZoneChannelPacket< Client::FFXIVIpcAoESkillHandler >( inPacket );
+  const auto packet = WorldChannelPacket< Client::FFXIVIpcAoESkillHandler >( inPacket );
 
   const auto type = packet.data().type;
   const auto actionId = packet.data().actionId;
diff --git a/src/world/Network/Handlers/CFHandlers.cpp b/src/world/Network/Handlers/CFHandlers.cpp
index d51b6327..2234b749 100644
--- a/src/world/Network/Handlers/CFHandlers.cpp
+++ b/src/world/Network/Handlers/CFHandlers.cpp
@@ -25,7 +25,7 @@ void Sapphire::Network::GameConnection::cfDutyInfoRequest( FrameworkPtr pFw,
                                                            const Packets::FFXIVARR_PACKET_RAW& inPacket,
                                                            Entity::Player& player )
 {
-  auto dutyInfoPacket = makeZonePacket< FFXIVIpcCFDutyInfo >( player.getId() );
+  auto dutyInfoPacket = makeWorldPacket< FFXIVIpcCFDutyInfo >( player.getId() );
   auto penaltyMinutes = player.getCFPenaltyMinutes();
   if( penaltyMinutes > 255 )
   {
@@ -35,7 +35,7 @@ void Sapphire::Network::GameConnection::cfDutyInfoRequest( FrameworkPtr pFw,
   dutyInfoPacket->data().penaltyTime = penaltyMinutes;
   queueOutPacket( dutyInfoPacket );
 
-  auto inNeedsPacket = makeZonePacket< FFXIVIpcCFPlayerInNeed >( player.getId() );
+  auto inNeedsPacket = makeWorldPacket< FFXIVIpcCFPlayerInNeed >( player.getId() );
   queueOutPacket( inNeedsPacket );
 
 }
@@ -68,7 +68,7 @@ void Sapphire::Network::GameConnection::cfRegisterDuty( FrameworkPtr pFw,
   player.sendDebug( "Duty register request for contentid#{0}", contentId );
 
   // let's cancel it because otherwise you can't register it again
-  auto cfCancelPacket = makeZonePacket< FFXIVIpcCFNotify >( player.getId() );
+  auto cfCancelPacket = makeWorldPacket< FFXIVIpcCFNotify >( player.getId() );
   cfCancelPacket->data().state1 = 3;
   cfCancelPacket->data().state2 = 1; // Your registration is withdrawn.
   queueOutPacket( cfCancelPacket );
@@ -93,7 +93,7 @@ void Sapphire::Network::GameConnection::cfRegisterRoulette( FrameworkPtr pFw,
                                                             const Packets::FFXIVARR_PACKET_RAW& inPacket,
                                                             Entity::Player& player )
 {
-  auto cfCancelPacket = makeZonePacket< FFXIVIpcCFNotify >( player.getId() );
+  auto cfCancelPacket = makeWorldPacket< FFXIVIpcCFNotify >( player.getId() );
   cfCancelPacket->data().state1 = 3;
   cfCancelPacket->data().state2 = 1; // Your registration is withdrawn.
   queueOutPacket( cfCancelPacket );
diff --git a/src/world/Network/Handlers/ClientTriggerHandler.cpp b/src/world/Network/Handlers/ClientTriggerHandler.cpp
index 81515fd9..e46a91d5 100644
--- a/src/world/Network/Handlers/ClientTriggerHandler.cpp
+++ b/src/world/Network/Handlers/ClientTriggerHandler.cpp
@@ -67,7 +67,7 @@ void Sapphire::Network::GameConnection::clientTriggerHandler( FrameworkPtr pFw,
                                                               Entity::Player& player )
 {
 
-  const auto packet = ZoneChannelPacket< Client::FFXIVIpcClientTrigger >( inPacket );
+  const auto packet = WorldChannelPacket< Client::FFXIVIpcClientTrigger >( inPacket );
 
   const auto commandId = packet.data().commandId;
   const auto param1 = *reinterpret_cast< const uint64_t* >( &packet.data().param11 );
@@ -173,7 +173,7 @@ void Sapphire::Network::GameConnection::clientTriggerHandler( FrameworkPtr pFw,
       uint64_t targetContentId = param1;
       // todo: look up player by content id
       /*
-        auto packet = makeZonePacket< FFXIVIpcCharaNameReq >( player.getId() );
+        auto packet = makeWorldPacket< FFXIVIpcCharaNameReq >( player.getId() );
         packet->data().contentId = targetContentId;
 
         // lookup the name
@@ -287,12 +287,12 @@ void Sapphire::Network::GameConnection::clientTriggerHandler( FrameworkPtr pFw,
     }
     case ClientTriggerType::DirectorInitFinish: // Director init finish
     {
-      player.getCurrentZone()->onInitDirector( player );
+      player.getCurrentTerritory()->onInitDirector( player );
       break;
     }
     case ClientTriggerType::DirectorSync: // Director init finish
     {
-      player.getCurrentZone()->onDirectorSync( player );
+      player.getCurrentTerritory()->onDirectorSync( player );
       break;
     }
     case ClientTriggerType::EnterTerritoryEventFinished:// this may still be something else. I think i have seen it elsewhere
@@ -313,7 +313,7 @@ void Sapphire::Network::GameConnection::clientTriggerHandler( FrameworkPtr pFw,
     }
     case ClientTriggerType::RequestHousingBuildPreset:
     {
-      auto zone = player.getCurrentZone();
+      auto zone = player.getCurrentTerritory();
       auto hZone = std::dynamic_pointer_cast< HousingZone >( zone );
       if (!hZone)
         return;
diff --git a/src/world/Network/Handlers/EventHandlers.cpp b/src/world/Network/Handlers/EventHandlers.cpp
index 5c60ed7f..14e7c312 100644
--- a/src/world/Network/Handlers/EventHandlers.cpp
+++ b/src/world/Network/Handlers/EventHandlers.cpp
@@ -39,7 +39,7 @@ void Sapphire::Network::GameConnection::eventHandlerTalk( FrameworkPtr pFw,
   auto pExdData = pFw->get< Data::ExdDataGenerated >();
   auto pEventMgr = pFw->get< World::Manager::EventMgr >();
 
-  const auto packet = ZoneChannelPacket< Client::FFXIVIpcEventHandlerTalk >( inPacket );
+  const auto packet = WorldChannelPacket< Client::FFXIVIpcEventHandlerTalk >( inPacket );
 
   const auto actorId = packet.data().actorId;
   const auto eventId = packet.data().eventId;
@@ -81,7 +81,7 @@ void Sapphire::Network::GameConnection::eventHandlerEmote( FrameworkPtr pFw,
   auto pExdData = pFw->get< Data::ExdDataGenerated >();
   auto pEventMgr = pFw->get< World::Manager::EventMgr >();
 
-  const auto packet = ZoneChannelPacket< Client::FFXIVIpcEventHandlerEmote >( inPacket );
+  const auto packet = WorldChannelPacket< Client::FFXIVIpcEventHandlerEmote >( inPacket );
 
   const auto actorId = packet.data().actorId;
   const auto eventId = packet.data().eventId;
@@ -117,7 +117,7 @@ void Sapphire::Network::GameConnection::eventHandlerWithinRange( FrameworkPtr pF
   auto pScriptMgr = pFw->get< Scripting::ScriptMgr >();
   auto pEventMgr = pFw->get< World::Manager::EventMgr >();
 
-  const auto packet = ZoneChannelPacket< Client::FFXIVIpcEventHandlerWithinRange >( inPacket );
+  const auto packet = WorldChannelPacket< Client::FFXIVIpcEventHandlerWithinRange >( inPacket );
 
   const auto eventId = packet.data().eventId;
   const auto param1 = packet.data().param1;
@@ -141,7 +141,7 @@ void Sapphire::Network::GameConnection::eventHandlerOutsideRange( FrameworkPtr p
   auto pScriptMgr = pFw->get< Scripting::ScriptMgr >();
   auto pEventMgr = pFw->get< World::Manager::EventMgr >();
 
-  const auto packet = ZoneChannelPacket< Client::FFXIVIpcEventHandlerOutsideRange >( inPacket );
+  const auto packet = WorldChannelPacket< Client::FFXIVIpcEventHandlerOutsideRange >( inPacket );
   const auto eventId = packet.data().eventId;
   const auto param1 = packet.data().param1;
   const auto& pos = packet.data().position;
@@ -164,7 +164,7 @@ void Sapphire::Network::GameConnection::eventHandlerEnterTerritory( FrameworkPtr
   auto pScriptMgr = pFw->get< Scripting::ScriptMgr >();
   auto pEventMgr = pFw->get< World::Manager::EventMgr >();
 
-  const auto packet = ZoneChannelPacket< Client::FFXIVIpcEnterTerritoryHandler >( inPacket );
+  const auto packet = WorldChannelPacket< Client::FFXIVIpcEnterTerritoryHandler >( inPacket );
 
   const auto eventId = packet.data().eventId;
   const auto param1 = packet.data().param1;
@@ -201,7 +201,7 @@ void Sapphire::Network::GameConnection::eventHandlerReturn( FrameworkPtr pFw,
 {
   auto pEventMgr = pFw->get< World::Manager::EventMgr >();
 
-  const auto packet = ZoneChannelPacket< Client::FFXIVIpcEventHandlerReturn >( inPacket );
+  const auto packet = WorldChannelPacket< Client::FFXIVIpcEventHandlerReturn >( inPacket );
   const auto eventId = packet.data().eventId;
   const auto scene = packet.data().scene;
   const auto param1 = packet.data().param1;
@@ -246,9 +246,9 @@ void Sapphire::Network::GameConnection::eventHandlerLinkshell( FrameworkPtr pFw,
                                                                const Packets::FFXIVARR_PACKET_RAW& inPacket,
                                                                Entity::Player& player )
 {
-  const auto packet = ZoneChannelPacket< Client::FFXIVIpcLinkshellEventHandler >( inPacket );
+  const auto packet = WorldChannelPacket< Client::FFXIVIpcLinkshellEventHandler >( inPacket );
 
-  auto linkshellEvent = makeZonePacket< Server::FFXIVIpcEventLinkshell >( player.getId() );
+  auto linkshellEvent = makeWorldPacket< Server::FFXIVIpcEventLinkshell >( player.getId() );
   linkshellEvent->data().eventId = packet.data().eventId;
   linkshellEvent->data().scene = static_cast< uint8_t >( packet.data().scene );
   linkshellEvent->data().param3 = 1;
@@ -263,7 +263,7 @@ void Sapphire::Network::GameConnection::eventHandlerShop( FrameworkPtr pFw,
 {
   auto pEventMgr = pFw->get< World::Manager::EventMgr >();
 
-  const auto packet = ZoneChannelPacket< Client::FFXIVIpcShopEventHandler >( inPacket );
+  const auto packet = WorldChannelPacket< Client::FFXIVIpcShopEventHandler >( inPacket );
 
   auto pScriptMgr = pFw->get< Scripting::ScriptMgr >();
   auto pExdData = pFw->get< Data::ExdDataGenerated >();
diff --git a/src/world/Network/Handlers/GMCommandHandlers.cpp b/src/world/Network/Handlers/GMCommandHandlers.cpp
index 5e30611c..de3bb8a7 100644
--- a/src/world/Network/Handlers/GMCommandHandlers.cpp
+++ b/src/world/Network/Handlers/GMCommandHandlers.cpp
@@ -93,7 +93,7 @@ void Sapphire::Network::GameConnection::gm1Handler( FrameworkPtr pFw,
   if( player.getGmRank() <= 0 )
     return;
 
-  const auto packet = ZoneChannelPacket< Client::FFXIVIpcGmCommand1 >( inPacket );
+  const auto packet = WorldChannelPacket< Client::FFXIVIpcGmCommand1 >( inPacket );
   const auto commandId = packet.data().commandId;
   const auto param1 = packet.data().param1;
   const auto param2 = packet.data().param2;
@@ -190,9 +190,9 @@ void Sapphire::Network::GameConnection::gm1Handler( FrameworkPtr pFw,
     }
     case GmCommand::Weather:
     {
-      targetPlayer->getCurrentZone()->setWeatherOverride( static_cast< Common::Weather >( param1 ) );
+      targetPlayer->getCurrentTerritory()->setWeatherOverride( static_cast< Common::Weather >( param1 ) );
       player.sendNotice( "Weather in Territory \"{0}\" of {1} set in range.",
-                         targetPlayer->getCurrentZone()->getName(), targetPlayer->getName() );
+                         targetPlayer->getCurrentTerritory()->getName(), targetPlayer->getName() );
       break;
     }
     case GmCommand::Call:
@@ -217,7 +217,7 @@ void Sapphire::Network::GameConnection::gm1Handler( FrameworkPtr pFw,
                          "\nPlayTime: {8}",
                          targetPlayer->getName(),
                          targetPlayer->getCurrency( CurrencyType::Gil ),
-                         targetPlayer->getCurrentZone()->getName(),
+                         targetPlayer->getCurrentTerritory()->getName(),
                          targetPlayer->getZoneId(),
                          static_cast< uint8_t >( targetPlayer->getClass() ),
                          targetPlayer->getLevel(),
@@ -257,11 +257,11 @@ void Sapphire::Network::GameConnection::gm1Handler( FrameworkPtr pFw,
     {
       targetPlayer->setOnlineStatusMask( param1 );
 
-      auto statusPacket = makeZonePacket< FFXIVIpcSetOnlineStatus >( player.getId() );
+      auto statusPacket = makeWorldPacket< FFXIVIpcSetOnlineStatus >( player.getId() );
       statusPacket->data().onlineStatusFlags = param1;
       queueOutPacket( statusPacket );
 
-      auto searchInfoPacket = makeZonePacket< FFXIVIpcSetSearchInfo >( player.getId() );
+      auto searchInfoPacket = makeWorldPacket< FFXIVIpcSetSearchInfo >( player.getId() );
       searchInfoPacket->data().onlineStatusFlags = param1;
       searchInfoPacket->data().selectRegion = targetPlayer->getSearchSelectRegion();
       strcpy( searchInfoPacket->data().searchMessage, targetPlayer->getSearchMessage() );
@@ -551,7 +551,7 @@ void Sapphire::Network::GameConnection::gm1Handler( FrameworkPtr pFw,
     }
     case GmCommand::TeriInfo:
     {
-      auto pCurrentZone = player.getCurrentZone();
+      auto pCurrentZone = player.getCurrentTerritory();
       player.sendNotice( "ZoneId: {0}"
                          "\nName: {1}"
                          "\nInternalName: {2}"
@@ -596,7 +596,7 @@ void Sapphire::Network::GameConnection::gm2Handler( FrameworkPtr pFw,
 
   auto pServerZone = pFw->get< World::ServerMgr >();
 
-  const auto packet = ZoneChannelPacket< Client::FFXIVIpcGmCommand2 >( inPacket );
+  const auto packet = WorldChannelPacket< Client::FFXIVIpcGmCommand2 >( inPacket );
 
   const auto commandId = packet.data().commandId;
   const auto param1 = packet.data().param1;
@@ -657,7 +657,7 @@ void Sapphire::Network::GameConnection::gm2Handler( FrameworkPtr pFw,
       {
         player.exitInstance();
       }
-      if( targetPlayer->getCurrentZone()->getGuId() != player.getCurrentZone()->getGuId() )
+      if( targetPlayer->getCurrentTerritory()->getGuId() != player.getCurrentTerritory()->getGuId() )
       {
         // Checks if the target player is in an InstanceContent to avoid binding to a Territory or PublicContent
         if( targetPlayer->getCurrentInstance() )
@@ -666,7 +666,7 @@ void Sapphire::Network::GameConnection::gm2Handler( FrameworkPtr pFw,
           // Not sure if GMs actually get bound to an instance they jump to on retail. It's mostly here to avoid a crash for now
           pInstanceContent->bindPlayer( player.getId() );
         }
-        player.setInstance( targetPlayer->getCurrentZone()->getGuId() );
+        player.setInstance( targetPlayer->getCurrentTerritory()->getGuId() );
       }
       player.changePosition( targetActor->getPos().x, targetActor->getPos().y, targetActor->getPos().z,
                              targetActor->getRot() );
@@ -687,9 +687,9 @@ void Sapphire::Network::GameConnection::gm2Handler( FrameworkPtr pFw,
       {
         targetPlayer->exitInstance();
       }
-      if( targetPlayer->getCurrentZone()->getGuId() != player.getCurrentZone()->getGuId() )
+      if( targetPlayer->getCurrentTerritory()->getGuId() != player.getCurrentTerritory()->getGuId() )
       {
-        targetPlayer->setInstance( player.getCurrentZone()->getGuId() );
+        targetPlayer->setInstance( player.getCurrentTerritory()->getGuId() );
       }
       targetPlayer->changePosition( player.getPos().x, player.getPos().y, player.getPos().z, player.getRot() );
       targetPlayer->sendZoneInPackets( 0x00, 0x00, 0, 0, false );
diff --git a/src/world/Network/Handlers/InventoryHandler.cpp b/src/world/Network/Handlers/InventoryHandler.cpp
index 8fc94bdd..5a854794 100644
--- a/src/world/Network/Handlers/InventoryHandler.cpp
+++ b/src/world/Network/Handlers/InventoryHandler.cpp
@@ -27,7 +27,7 @@ void Sapphire::Network::GameConnection::inventoryModifyHandler( FrameworkPtr pFw
                                                                 const Packets::FFXIVARR_PACKET_RAW& inPacket,
                                                                 Entity::Player& player )
 {
-  const auto packet = ZoneChannelPacket< Client::FFXIVIpcInventoryModifyHandler >( inPacket );
+  const auto packet = WorldChannelPacket< Client::FFXIVIpcInventoryModifyHandler >( inPacket );
 
   const auto action = packet.data().action;
   const auto splitCount = packet.data().splitCount;
@@ -37,7 +37,7 @@ void Sapphire::Network::GameConnection::inventoryModifyHandler( FrameworkPtr pFw
   const auto toSlot = packet.data().toSlot;
   const auto toContainer = packet.data().toContainer;
 
-  auto ackPacket = makeZonePacket< Server::FFXIVIpcInventoryActionAck >( player.getId() );
+  auto ackPacket = makeWorldPacket< Server::FFXIVIpcInventoryActionAck >( player.getId() );
   ackPacket->data().sequence = packet.data().seq;
   ackPacket->data().type = 7;
   player.queuePacket( ackPacket );
diff --git a/src/world/Network/Handlers/PacketHandlers.cpp b/src/world/Network/Handlers/PacketHandlers.cpp
index c3b9a178..f002f1af 100644
--- a/src/world/Network/Handlers/PacketHandlers.cpp
+++ b/src/world/Network/Handlers/PacketHandlers.cpp
@@ -67,7 +67,7 @@ void Sapphire::Network::GameConnection::setSearchInfoHandler( FrameworkPtr pFw,
                                                               const Packets::FFXIVARR_PACKET_RAW& inPacket,
                                                               Entity::Player& player )
 {
-  const auto packet = ZoneChannelPacket< Client::FFXIVIpcSetSearchInfo >( inPacket );
+  const auto packet = WorldChannelPacket< Client::FFXIVIpcSetSearchInfo >( inPacket );
 
   const auto inval = packet.data().status1;
   const auto inval1 = packet.data().status2;
@@ -85,11 +85,11 @@ void Sapphire::Network::GameConnection::setSearchInfoHandler( FrameworkPtr pFw,
     // mark player as new adventurer
     player.setNewAdventurer( true );
 
-  auto statusPacket = makeZonePacket< FFXIVIpcSetOnlineStatus >( player.getId() );
+  auto statusPacket = makeWorldPacket< FFXIVIpcSetOnlineStatus >( player.getId() );
   statusPacket->data().onlineStatusFlags = status;
   queueOutPacket( statusPacket );
 
-  auto searchInfoPacket = makeZonePacket< FFXIVIpcSetSearchInfo >( player.getId() );
+  auto searchInfoPacket = makeWorldPacket< FFXIVIpcSetSearchInfo >( player.getId() );
   searchInfoPacket->data().onlineStatusFlags = status;
   searchInfoPacket->data().selectRegion = player.getSearchSelectRegion();
   strcpy( searchInfoPacket->data().searchMessage, player.getSearchMessage() );
@@ -103,7 +103,7 @@ void Sapphire::Network::GameConnection::reqSearchInfoHandler( FrameworkPtr pFw,
                                                               const Packets::FFXIVARR_PACKET_RAW& inPacket,
                                                               Entity::Player& player )
 {
-  auto searchInfoPacket = makeZonePacket< FFXIVIpcInitSearchInfo >( player.getId() );
+  auto searchInfoPacket = makeWorldPacket< FFXIVIpcInitSearchInfo >( player.getId() );
   searchInfoPacket->data().onlineStatusFlags = player.getOnlineStatusMask();
   searchInfoPacket->data().selectRegion = player.getSearchSelectRegion();
   strcpy( searchInfoPacket->data().searchMessage, player.getSearchMessage() );
@@ -130,7 +130,7 @@ void Sapphire::Network::GameConnection::reqExamineSearchCommentHandler( Framewor
         return;
 
       // retail sends the requester's id as both (isForSelf)
-      auto searchInfoPacket = makeZonePacket< FFXIVIpcExamineSearchComment >( player.getId() );
+      auto searchInfoPacket = makeWorldPacket< FFXIVIpcExamineSearchComment >( player.getId() );
       searchInfoPacket->data().charId = targetId;
       strcpy( searchInfoPacket->data().searchComment, pPlayer->getSearchMessage() );
       player.queuePacket( searchInfoPacket );
@@ -158,7 +158,7 @@ void Sapphire::Network::GameConnection::reqExamineFcInfo( FrameworkPtr pFw,
         return;
 
       // retail sends the requester's id as both (isForSelf)
-      auto examineFcInfoPacket = makeZonePacket< FFXIVIpcExamineFreeCompanyInfo >( player.getId() );
+      auto examineFcInfoPacket = makeWorldPacket< FFXIVIpcExamineFreeCompanyInfo >( player.getId() );
       examineFcInfoPacket->data().charId = targetId;
       // todo: populate with fc info
 
@@ -171,7 +171,7 @@ void Sapphire::Network::GameConnection::linkshellListHandler( FrameworkPtr pFw,
                                                               const Packets::FFXIVARR_PACKET_RAW& inPacket,
                                                               Entity::Player& player )
 {
-  auto linkshellListPacket = makeZonePacket< FFXIVIpcLinkshellList >( player.getId() );
+  auto linkshellListPacket = makeWorldPacket< FFXIVIpcLinkshellList >( player.getId() );
   queueOutPacket( linkshellListPacket );
 }
 
@@ -183,7 +183,7 @@ void Sapphire::Network::GameConnection::updatePositionHandler( FrameworkPtr pFw,
   if( player.isMarkedForZoning() )
     return;
 
-  const auto updatePositionPacket = ZoneChannelPacket< Client::FFXIVIpcUpdatePosition >( inPacket );
+  const auto updatePositionPacket = WorldChannelPacket< Client::FFXIVIpcUpdatePosition >( inPacket );
 
   bool bPosChanged = true;
   if( updatePositionPacket.data().position == player.getPos() )
@@ -276,12 +276,12 @@ void Sapphire::Network::GameConnection::zoneLineHandler( FrameworkPtr pFw,
 {
   auto pTeriMgr = pFw->get< TerritoryMgr >();
 
-  const auto packet = ZoneChannelPacket< Client::FFXIVIpcZoneLineHandler >( inPacket );
+  const auto packet = WorldChannelPacket< Client::FFXIVIpcZoneLineHandler >( inPacket );
   const auto zoneLineId = packet.data().zoneLineId;
 
   player.sendDebug( "Walking ZoneLine#{0}", zoneLineId );
 
-  auto pZone = player.getCurrentZone();
+  auto pZone = player.getCurrentTerritory();
 
   auto pLine = pTeriMgr->getTerritoryPosition( zoneLineId );
 
@@ -296,7 +296,7 @@ void Sapphire::Network::GameConnection::zoneLineHandler( FrameworkPtr pFw,
     targetZone = pLine->getTargetZoneId();
     rotation = pLine->getTargetRotation();
 
-    auto preparePacket = makeZonePacket< FFXIVIpcPrepareZoning >( player.getId() );
+    auto preparePacket = makeWorldPacket< FFXIVIpcPrepareZoning >( player.getId() );
     preparePacket->data().targetZone = targetZone;
 
     //ActorControlPacket143 controlPacket( pPlayer, ActorControlType::DespawnZoneScreenMsg,
@@ -321,7 +321,7 @@ void Sapphire::Network::GameConnection::discoveryHandler( FrameworkPtr pFw,
                                                           const Packets::FFXIVARR_PACKET_RAW& inPacket,
                                                           Entity::Player& player )
 {
-  const auto packet = ZoneChannelPacket< Client::FFXIVIpcDiscoveryHandler >( inPacket );
+  const auto packet = WorldChannelPacket< Client::FFXIVIpcDiscoveryHandler >( inPacket );
   const auto positionRef = packet.data().positionRef;
 
   auto pDb = pFw->get< Db::DbWorkerPool< Db::ZoneDbConnection > >();
@@ -336,7 +336,7 @@ void Sapphire::Network::GameConnection::discoveryHandler( FrameworkPtr pFw,
     return;
   }
 
-  auto discoveryPacket = makeZonePacket< FFXIVIpcDiscovery >( player.getId() );
+  auto discoveryPacket = makeWorldPacket< FFXIVIpcDiscovery >( player.getId() );
   discoveryPacket->data().map_id = pQR->getUInt( 2 );
   discoveryPacket->data().map_part_id = pQR->getUInt( 3 );
 
@@ -352,7 +352,7 @@ void Sapphire::Network::GameConnection::playTimeHandler( FrameworkPtr pFw,
                                                          const Packets::FFXIVARR_PACKET_RAW& inPacket,
                                                          Entity::Player& player )
 {
-  auto playTimePacket = makeZonePacket< FFXIVIpcPlayTime >( player.getId() );
+  auto playTimePacket = makeWorldPacket< FFXIVIpcPlayTime >( player.getId() );
   playTimePacket->data().playTimeInMinutes = player.getPlayTime() / 60;
   player.queuePacket( playTimePacket );
 }
@@ -375,7 +375,7 @@ void Sapphire::Network::GameConnection::blackListHandler( FrameworkPtr pFw,
 {
   uint8_t count = inPacket.data[ 0x11 ];
 
-  auto blackListPacket = makeZonePacket< FFXIVIpcBlackList >( player.getId() );
+  auto blackListPacket = makeWorldPacket< FFXIVIpcBlackList >( player.getId() );
   blackListPacket->data().sequence = count;
   // TODO: Fill with actual blacklist data
   //blackListPacket.data().entry[0].contentId = 1;
@@ -389,7 +389,7 @@ void Sapphire::Network::GameConnection::pingHandler( FrameworkPtr pFw,
                                                      const Packets::FFXIVARR_PACKET_RAW& inPacket,
                                                      Entity::Player& player )
 {
-  const auto packet = ZoneChannelPacket< Client::FFXIVIpcPingHandler >( inPacket );
+  const auto packet = WorldChannelPacket< Client::FFXIVIpcPingHandler >( inPacket );
 
   queueOutPacket( std::make_shared< Server::PingPacket >( player, packet.data().timestamp ) );
 
@@ -404,14 +404,14 @@ void Sapphire::Network::GameConnection::finishLoadingHandler( FrameworkPtr pFw,
   player.sendQuestInfo();
 
   // TODO: load and save this data instead of hardcoding
-  auto gcPacket = makeZonePacket< FFXIVGCAffiliation >( player.getId() );
+  auto gcPacket = makeWorldPacket< FFXIVGCAffiliation >( player.getId() );
   gcPacket->data().gcId = player.getGc();
   gcPacket->data().gcRank[ 0 ] = player.getGcRankArray()[ 0 ];
   gcPacket->data().gcRank[ 1 ] = player.getGcRankArray()[ 1 ];
   gcPacket->data().gcRank[ 2 ] = player.getGcRankArray()[ 2 ];
   player.queuePacket( gcPacket );
 
-  player.getCurrentZone()->onFinishLoading( player );
+  player.getCurrentTerritory()->onFinishLoading( player );
 
   // player is done zoning
   player.setLoadingComplete( true );
@@ -428,7 +428,7 @@ void Sapphire::Network::GameConnection::finishLoadingHandler( FrameworkPtr pFw,
   player.spawn( player.getAsPlayer() );
 
   // notify the zone of a change in position to force an "inRangeActor" update
-  player.getCurrentZone()->updateActorPosition( player );
+  player.getCurrentTerritory()->updateActorPosition( player );
 }
 
 void Sapphire::Network::GameConnection::socialListHandler( FrameworkPtr pFw,
@@ -442,7 +442,7 @@ void Sapphire::Network::GameConnection::socialListHandler( FrameworkPtr pFw,
   if( type == 0x02 )
   { // party list
 
-    auto listPacket = makeZonePacket< FFXIVIpcSocialList >( player.getId() );
+    auto listPacket = makeWorldPacket< FFXIVIpcSocialList >( player.getId() );
 
     listPacket->data().type = 2;
     listPacket->data().sequence = count;
@@ -450,7 +450,7 @@ void Sapphire::Network::GameConnection::socialListHandler( FrameworkPtr pFw,
     int32_t entrysizes = sizeof( listPacket->data().entries );
     memset( listPacket->data().entries, 0, sizeof( listPacket->data().entries ) );
 
-    listPacket->data().entries[ 0 ].bytes[ 2 ] = player.getCurrentZone()->getTerritoryTypeId();
+    listPacket->data().entries[ 0 ].bytes[ 2 ] = player.getCurrentTerritory()->getTerritoryTypeId();
     listPacket->data().entries[ 0 ].bytes[ 3 ] = 0x80;
     listPacket->data().entries[ 0 ].bytes[ 4 ] = 0x02;
     listPacket->data().entries[ 0 ].bytes[ 6 ] = 0x3B;
@@ -458,7 +458,7 @@ void Sapphire::Network::GameConnection::socialListHandler( FrameworkPtr pFw,
     listPacket->data().entries[ 0 ].classJob = static_cast< uint8_t >( player.getClass() );
     listPacket->data().entries[ 0 ].contentId = player.getContentId();
     listPacket->data().entries[ 0 ].level = player.getLevel();
-    listPacket->data().entries[ 0 ].zoneId = player.getCurrentZone()->getTerritoryTypeId();
+    listPacket->data().entries[ 0 ].zoneId = player.getCurrentTerritory()->getTerritoryTypeId();
     listPacket->data().entries[ 0 ].zoneId1 = 0x0100;
     // TODO: no idea what this does
     //listPacket.data().entries[0].one = 1;
@@ -476,7 +476,7 @@ void Sapphire::Network::GameConnection::socialListHandler( FrameworkPtr pFw,
   }
   else if( type == 0x0b )
   { // friend list
-    auto listPacket = makeZonePacket< FFXIVIpcSocialList >( player.getId() );
+    auto listPacket = makeWorldPacket< FFXIVIpcSocialList >( player.getId() );
     listPacket->data().type = 0x0B;
     listPacket->data().sequence = count;
     memset( listPacket->data().entries, 0, sizeof( listPacket->data().entries ) );
@@ -495,7 +495,7 @@ void Sapphire::Network::GameConnection::chatHandler( FrameworkPtr pFw,
 {
   auto pDebugCom = pFw->get< DebugCommandMgr >();
 
-  const auto packet = ZoneChannelPacket< Client::FFXIVIpcChatHandler >( inPacket );
+  const auto packet = WorldChannelPacket< Client::FFXIVIpcChatHandler >( inPacket );
 
   if( packet.data().message[ 0 ] == '!' )
   {
@@ -516,7 +516,7 @@ void Sapphire::Network::GameConnection::chatHandler( FrameworkPtr pFw,
       if( player.isActingAsGm() )
         chatPacket->data().chatType = ChatType::GMSay;
 
-      player.getCurrentZone()->queuePacketForRange( player, 50, chatPacket );
+      player.getCurrentTerritory()->queuePacketForRange( player, 50, chatPacket );
       break;
     }
     case ChatType::Yell:
@@ -524,7 +524,7 @@ void Sapphire::Network::GameConnection::chatHandler( FrameworkPtr pFw,
       if( player.isActingAsGm() )
         chatPacket->data().chatType = ChatType::GMYell;
 
-      player.getCurrentZone()->queuePacketForRange( player, 6000, chatPacket );
+      player.getCurrentTerritory()->queuePacketForRange( player, 6000, chatPacket );
       break;
     }
     case ChatType::Shout:
@@ -532,12 +532,12 @@ void Sapphire::Network::GameConnection::chatHandler( FrameworkPtr pFw,
       if( player.isActingAsGm() )
         chatPacket->data().chatType = ChatType::GMShout;
 
-      player.getCurrentZone()->queuePacketForRange( player, 6000, chatPacket );
+      player.getCurrentTerritory()->queuePacketForRange( player, 6000, chatPacket );
       break;
     }
     default:
     {
-      player.getCurrentZone()->queuePacketForRange( player, 50, chatPacket );
+      player.getCurrentTerritory()->queuePacketForRange( player, 50, chatPacket );
       break;
     }
   }
@@ -552,7 +552,7 @@ void Sapphire::Network::GameConnection::logoutHandler( FrameworkPtr pFw,
                                                        const Packets::FFXIVARR_PACKET_RAW& inPacket,
                                                        Entity::Player& player )
 {
-  auto logoutPacket = makeZonePacket< FFXIVIpcLogout >( player.getId() );
+  auto logoutPacket = makeWorldPacket< FFXIVIpcLogout >( player.getId() );
   logoutPacket->data().flags1 = 0x02;
   logoutPacket->data().flags2 = 0x2000;
   queueOutPacket( logoutPacket );
@@ -565,7 +565,7 @@ void Sapphire::Network::GameConnection::tellHandler( FrameworkPtr pFw,
                                                      const Packets::FFXIVARR_PACKET_RAW& inPacket,
                                                      Entity::Player& player )
 {
-  const auto packet = ZoneChannelPacket< Client::FFXIVIpcTellHandler >( inPacket );
+  const auto packet = WorldChannelPacket< Client::FFXIVIpcTellHandler >( inPacket );
 
   auto pZoneServer = pFw->get< World::ServerMgr >();
 
@@ -573,7 +573,7 @@ void Sapphire::Network::GameConnection::tellHandler( FrameworkPtr pFw,
 
   if( !pSession )
   {
-    auto tellErrPacket = makeZonePacket< FFXIVIpcTellErrNotFound >( player.getId() );
+    auto tellErrPacket = makeWorldPacket< FFXIVIpcTellErrNotFound >( player.getId() );
     strcpy( tellErrPacket->data().receipientName, packet.data().targetPCName );
     sendSinglePacket( tellErrPacket );
     return;
@@ -621,7 +621,7 @@ void Sapphire::Network::GameConnection::performNoteHandler( FrameworkPtr pFw,
                                                             const Packets::FFXIVARR_PACKET_RAW& inPacket,
                                                             Entity::Player& player )
 {
-  auto performPacket = makeZonePacket< FFXIVIpcPerformNote >( player.getId() );
+  auto performPacket = makeWorldPacket< FFXIVIpcPerformNote >( player.getId() );
   memcpy( &performPacket->data().data[ 0 ], &inPacket.data[ 0x10 ], 32 );
   player.sendToInRangeSet( performPacket );
 }
@@ -630,7 +630,7 @@ void Sapphire::Network::GameConnection::landRenameHandler( FrameworkPtr pFw,
                                                            const Packets::FFXIVARR_PACKET_RAW& inPacket,
                                                            Entity::Player& player )
 {
-  const auto packet = ZoneChannelPacket< Client::FFXIVIpcRenameLandHandler >( inPacket );
+  const auto packet = WorldChannelPacket< Client::FFXIVIpcRenameLandHandler >( inPacket );
 
   auto pHousingMgr = pFw->get< HousingMgr >();
 
@@ -653,7 +653,7 @@ void Sapphire::Network::GameConnection::landRenameHandler( FrameworkPtr pFw,
     pHouse->setHouseName( packet.data().houseName );
 
   // todo: this packet is weird, retail sends it with some unknown shit at the start but it doesn't seem to do anything
-  auto nameUpdatePacket = makeZonePacket< Server::FFXIVIpcLandUpdateHouseName >( player.getId() );
+  auto nameUpdatePacket = makeWorldPacket< Server::FFXIVIpcLandUpdateHouseName >( player.getId() );
   memcpy( &nameUpdatePacket->data().houseName, &packet.data().houseName, sizeof( packet.data().houseName ) );
 
   // todo: who does this get sent to? just the person who renamed it?
@@ -664,7 +664,7 @@ void Sapphire::Network::GameConnection::buildPresetHandler( FrameworkPtr pFw,
                                                             const Packets::FFXIVARR_PACKET_RAW& inPacket,
                                                             Entity::Player& player )
 {
-  const auto packet = ZoneChannelPacket< Client::FFXIVIpcBuildPresetHandler >( inPacket );
+  const auto packet = WorldChannelPacket< Client::FFXIVIpcBuildPresetHandler >( inPacket );
 
   auto pHousingMgr = pFw->get< HousingMgr >();
   pHousingMgr->buildPresetEstate( player, packet.data().plotNum, packet.data().itemId );
@@ -674,7 +674,7 @@ void Sapphire::Network::GameConnection::housingUpdateGreetingHandler( FrameworkP
                                                                       const Packets::FFXIVARR_PACKET_RAW& inPacket,
                                                                       Entity::Player& player )
 {
-  const auto packet = ZoneChannelPacket< Client::FFXIVIpcHousingUpdateHouseGreeting >( inPacket );
+  const auto packet = WorldChannelPacket< Client::FFXIVIpcHousingUpdateHouseGreeting >( inPacket );
 
   auto pHousingMgr = pFw->get< HousingMgr >();
 
@@ -686,7 +686,7 @@ void Sapphire::Network::GameConnection::reqPlaceHousingItem( FrameworkPtr pFw,
                                                              Entity::Player& player )
 {
   auto housingMgr = pFw->get< HousingMgr >();
-  const auto packet = ZoneChannelPacket< Client::FFXIVIpcReqPlaceHousingItem >( inPacket );
+  const auto packet = WorldChannelPacket< Client::FFXIVIpcReqPlaceHousingItem >( inPacket );
   const auto& data = packet.data();
 
   if( data.shouldPlaceItem == 1 )
@@ -705,7 +705,7 @@ void Sapphire::Network::GameConnection::reqMoveHousingItem( FrameworkPtr pFw,
 {
   auto housingMgr = pFw->get< HousingMgr >();
 
-  const auto packet = ZoneChannelPacket< Client::FFXIVIpcHousingUpdateObjectPosition >( inPacket );
+  const auto packet = WorldChannelPacket< Client::FFXIVIpcHousingUpdateObjectPosition >( inPacket );
   const auto& data = packet.data();
 
   housingMgr->reqMoveHousingItem( player, data.ident, data.slot, data.pos, data.rotation );
@@ -718,7 +718,7 @@ void Sapphire::Network::GameConnection::marketBoardSearch( FrameworkPtr pFw,
 {
   auto marketMgr = pFw->get< MarketMgr >();
 
-  const auto packet = ZoneChannelPacket< Client::FFXIVIpcMarketBoardSearch >( inPacket );
+  const auto packet = WorldChannelPacket< Client::FFXIVIpcMarketBoardSearch >( inPacket );
   const auto& data = packet.data();
 
   std::string_view searchStr( data.searchStr );
@@ -731,7 +731,7 @@ void Sapphire::Network::GameConnection::marketBoardRequestItemInfo( FrameworkPtr
                                                                     const Packets::FFXIVARR_PACKET_RAW& inPacket,
                                                                     Entity::Player& player )
 {
-  const auto packet = ZoneChannelPacket< Client::FFXIVIpcMarketBoardRequestItemListingInfo >( inPacket );
+  const auto packet = WorldChannelPacket< Client::FFXIVIpcMarketBoardRequestItemListingInfo >( inPacket );
 
   auto marketMgr = pFw->get< MarketMgr >();
 
@@ -742,7 +742,7 @@ void Sapphire::Network::GameConnection::marketBoardRequestItemListings( Framewor
                                                                         const Packets::FFXIVARR_PACKET_RAW& inPacket,
                                                                         Entity::Player& player )
 {
-  const auto packet = ZoneChannelPacket< Client::FFXIVIpcMarketBoardRequestItemListings >( inPacket );
+  const auto packet = WorldChannelPacket< Client::FFXIVIpcMarketBoardRequestItemListings >( inPacket );
 
   auto marketMgr = pFw->get< MarketMgr >();
 
diff --git a/src/world/Network/PacketWrappers/ActorControlPacket142.h b/src/world/Network/PacketWrappers/ActorControlPacket142.h
index 30f14598..3756c5bc 100644
--- a/src/world/Network/PacketWrappers/ActorControlPacket142.h
+++ b/src/world/Network/PacketWrappers/ActorControlPacket142.h
@@ -11,7 +11,7 @@ namespace Sapphire::Network::Packets::Server
   /**
   * @brief The Ping response packet.
   */
-  class ActorControlPacket142 : public ZoneChannelPacket< FFXIVIpcActorControl142 >
+  class ActorControlPacket142 : public WorldChannelPacket< FFXIVIpcActorControl142 >
   {
   public:
     ActorControlPacket142( uint32_t actorId,
@@ -21,7 +21,7 @@ namespace Sapphire::Network::Packets::Server
                            uint32_t param3 = 0,
                            uint32_t param4 = 0,
                            uint32_t padding1 = 0 ) :
-      ZoneChannelPacket< FFXIVIpcActorControl142 >( actorId, actorId )
+      WorldChannelPacket< FFXIVIpcActorControl142 >( actorId, actorId )
     {
       initialize( category, param1, param2, param3, param4 );
     };
diff --git a/src/world/Network/PacketWrappers/ActorControlPacket143.h b/src/world/Network/PacketWrappers/ActorControlPacket143.h
index c93b3db3..f56bc0c5 100644
--- a/src/world/Network/PacketWrappers/ActorControlPacket143.h
+++ b/src/world/Network/PacketWrappers/ActorControlPacket143.h
@@ -12,7 +12,7 @@ namespace Sapphire::Network::Packets::Server
   /**
   * @brief The Ping response packet.
   */
-  class ActorControlPacket143 : public ZoneChannelPacket< FFXIVIpcActorControl143 >
+  class ActorControlPacket143 : public WorldChannelPacket< FFXIVIpcActorControl143 >
   {
   public:
     ActorControlPacket143( uint32_t actorId,
@@ -23,7 +23,7 @@ namespace Sapphire::Network::Packets::Server
                            uint32_t param4 = 0,
                            uint32_t param5 = 0,
                            uint32_t padding1 = 0 ) :
-      ZoneChannelPacket< FFXIVIpcActorControl143 >( actorId, actorId )
+      WorldChannelPacket< FFXIVIpcActorControl143 >( actorId, actorId )
     {
       initialize( category, param1, param2, param3, param4, param5 );
     };
diff --git a/src/world/Network/PacketWrappers/ActorControlPacket144.h b/src/world/Network/PacketWrappers/ActorControlPacket144.h
index da645b1e..0c632a5d 100644
--- a/src/world/Network/PacketWrappers/ActorControlPacket144.h
+++ b/src/world/Network/PacketWrappers/ActorControlPacket144.h
@@ -10,7 +10,7 @@ namespace Sapphire::Network::Packets::Server
   /**
   * @brief The Ping response packet.
   */
-  class ActorControlPacket144 : public ZoneChannelPacket< FFXIVIpcActorControl144 >
+  class ActorControlPacket144 : public WorldChannelPacket< FFXIVIpcActorControl144 >
   {
   public:
     ActorControlPacket144( uint32_t actorId,
@@ -21,7 +21,7 @@ namespace Sapphire::Network::Packets::Server
                            uint32_t param4 = 0,
                            uint64_t targetId = 0,
                            uint32_t padding1 = 0 ) :
-      ZoneChannelPacket< FFXIVIpcActorControl144 >( actorId, actorId )
+      WorldChannelPacket< FFXIVIpcActorControl144 >( actorId, actorId )
     {
       initialize( category, param1, param2, param3, param4, targetId );
     };
diff --git a/src/world/Network/PacketWrappers/ChatPacket.h b/src/world/Network/PacketWrappers/ChatPacket.h
index 29e4aa26..41ce6a84 100644
--- a/src/world/Network/PacketWrappers/ChatPacket.h
+++ b/src/world/Network/PacketWrappers/ChatPacket.h
@@ -12,11 +12,11 @@ namespace Sapphire::Network::Packets::Server
   /**
   * @brief The Chat packet.
   */
-  class ChatPacket : public ZoneChannelPacket< FFXIVIpcChat >
+  class ChatPacket : public WorldChannelPacket< FFXIVIpcChat >
   {
   public:
     ChatPacket( Entity::Player& player, Common::ChatType chatType, const std::string& msg ) :
-      ZoneChannelPacket< FFXIVIpcChat >( player.getId(), player.getId() )
+      WorldChannelPacket< FFXIVIpcChat >( player.getId(), player.getId() )
     {
       initialize( player, chatType, msg );
     };
diff --git a/src/world/Network/PacketWrappers/DirectorPlayScenePacket.h b/src/world/Network/PacketWrappers/DirectorPlayScenePacket.h
index 6d432740..bfd33546 100644
--- a/src/world/Network/PacketWrappers/DirectorPlayScenePacket.h
+++ b/src/world/Network/PacketWrappers/DirectorPlayScenePacket.h
@@ -10,7 +10,7 @@ namespace Sapphire::Network::Packets::Server
   /**
   * @brief The packet sent to play an event.
   */
-  class DirectorPlayScenePacket : public ZoneChannelPacket< FFXIVIpcDirectorPlayScene >
+  class DirectorPlayScenePacket : public WorldChannelPacket< FFXIVIpcDirectorPlayScene >
   {
   public:
     DirectorPlayScenePacket( uint32_t playerId,
@@ -21,7 +21,7 @@ namespace Sapphire::Network::Packets::Server
                              uint8_t param3,
                              uint32_t param4 = 0,
                              uint32_t param5 = 0 ) :
-      ZoneChannelPacket< FFXIVIpcDirectorPlayScene >( playerId, playerId )
+      WorldChannelPacket< FFXIVIpcDirectorPlayScene >( playerId, playerId )
     {
       initialize( actorId, eventId, scene, flags, param3, param4, param5 );
     };
diff --git a/src/world/Network/PacketWrappers/EffectPacket.h b/src/world/Network/PacketWrappers/EffectPacket.h
index 7afa3950..7cc07757 100644
--- a/src/world/Network/PacketWrappers/EffectPacket.h
+++ b/src/world/Network/PacketWrappers/EffectPacket.h
@@ -11,11 +11,11 @@
 namespace Sapphire::Network::Packets::Server
 {
 
-  class EffectPacket : public ZoneChannelPacket< FFXIVIpcEffect >
+  class EffectPacket : public WorldChannelPacket< FFXIVIpcEffect >
   {
   public:
     EffectPacket( uint64_t sourceId, uint32_t targetId, uint32_t actionId ) :
-      ZoneChannelPacket< FFXIVIpcEffect >( static_cast< uint32_t >( sourceId ), targetId )
+      WorldChannelPacket< FFXIVIpcEffect >( static_cast< uint32_t >( sourceId ), targetId )
     {
       m_data.effectCount = 0;
       m_data.actionId = actionId;
diff --git a/src/world/Network/PacketWrappers/EventFinishPacket.h b/src/world/Network/PacketWrappers/EventFinishPacket.h
index cd0e5807..7484a31f 100644
--- a/src/world/Network/PacketWrappers/EventFinishPacket.h
+++ b/src/world/Network/PacketWrappers/EventFinishPacket.h
@@ -9,14 +9,14 @@ namespace Sapphire::Network::Packets::Server
   /**
   * @brief The packet sent to finish an event.
   */
-  class EventFinishPacket : public ZoneChannelPacket< FFXIVIpcEventFinish >
+  class EventFinishPacket : public WorldChannelPacket< FFXIVIpcEventFinish >
   {
   public:
     EventFinishPacket( uint32_t playerId,
                        uint32_t eventId,
                        uint8_t param1,
                        uint32_t param3 ) :
-      ZoneChannelPacket< FFXIVIpcEventFinish >( playerId, playerId )
+      WorldChannelPacket< FFXIVIpcEventFinish >( playerId, playerId )
     {
       initialize( eventId, param1, param3 );
     };
diff --git a/src/world/Network/PacketWrappers/EventPlayPacket.h b/src/world/Network/PacketWrappers/EventPlayPacket.h
index 0895f38e..d6cf83f2 100644
--- a/src/world/Network/PacketWrappers/EventPlayPacket.h
+++ b/src/world/Network/PacketWrappers/EventPlayPacket.h
@@ -10,7 +10,7 @@ namespace Sapphire::Network::Packets::Server
   /**
   * @brief The packet sent to play an event.
   */
-  class EventPlayPacket : public ZoneChannelPacket< FFXIVIpcEventPlay >
+  class EventPlayPacket : public WorldChannelPacket< FFXIVIpcEventPlay >
   {
   public:
     EventPlayPacket( uint32_t playerId,
@@ -21,7 +21,7 @@ namespace Sapphire::Network::Packets::Server
                      uint8_t param3,
                      uint32_t param4 = 0,
                      uint32_t param5 = 0 ) :
-      ZoneChannelPacket< FFXIVIpcEventPlay >( playerId, playerId )
+      WorldChannelPacket< FFXIVIpcEventPlay >( playerId, playerId )
     {
       initialize( actorId, eventId, scene, flags, param3, param4, param5 );
     };
diff --git a/src/world/Network/PacketWrappers/EventStartPacket.h b/src/world/Network/PacketWrappers/EventStartPacket.h
index 7655ce44..d70788c7 100644
--- a/src/world/Network/PacketWrappers/EventStartPacket.h
+++ b/src/world/Network/PacketWrappers/EventStartPacket.h
@@ -10,7 +10,7 @@ namespace Sapphire::Network::Packets::Server
   /**
   * @brief The packet sent to start an event.
   */
-  class EventStartPacket : public ZoneChannelPacket< FFXIVIpcEventStart >
+  class EventStartPacket : public WorldChannelPacket< FFXIVIpcEventStart >
   {
   public:
     EventStartPacket( uint32_t playerId,
@@ -19,7 +19,7 @@ namespace Sapphire::Network::Packets::Server
                       uint8_t param1 = 0,
                       uint8_t param2 = 0,
                       uint32_t param3 = 0 ) :
-      ZoneChannelPacket< FFXIVIpcEventStart >( playerId, playerId )
+      WorldChannelPacket< FFXIVIpcEventStart >( playerId, playerId )
     {
       initialize( actorId, eventId, param1, param2, param3 );
     };
diff --git a/src/world/Network/PacketWrappers/ExaminePacket.h b/src/world/Network/PacketWrappers/ExaminePacket.h
index 37baee37..3e1cd0e1 100644
--- a/src/world/Network/PacketWrappers/ExaminePacket.h
+++ b/src/world/Network/PacketWrappers/ExaminePacket.h
@@ -16,11 +16,11 @@ namespace Sapphire::Network::Packets::Server
   /**
   * @brief The Examine response packet.
   */
-  class ExaminePacket : public ZoneChannelPacket< FFXIVIpcExamine >
+  class ExaminePacket : public WorldChannelPacket< FFXIVIpcExamine >
   {
   public:
     ExaminePacket( Entity::Player& player, Entity::PlayerPtr pTarget ) :
-      ZoneChannelPacket< FFXIVIpcExamine >( pTarget->getId(), player.getId() )
+      WorldChannelPacket< FFXIVIpcExamine >( pTarget->getId(), player.getId() )
     {
       initialize( player, pTarget );
     };
diff --git a/src/world/Network/PacketWrappers/ModelEquipPacket.h b/src/world/Network/PacketWrappers/ModelEquipPacket.h
index 50cc7b5d..670cc855 100644
--- a/src/world/Network/PacketWrappers/ModelEquipPacket.h
+++ b/src/world/Network/PacketWrappers/ModelEquipPacket.h
@@ -11,11 +11,11 @@ namespace Sapphire::Network::Packets::Server
   /**
   * @brief The update model packet.
   */
-  class ModelEquipPacket : public ZoneChannelPacket< FFXIVIpcModelEquip >
+  class ModelEquipPacket : public WorldChannelPacket< FFXIVIpcModelEquip >
   {
   public:
     ModelEquipPacket( Entity::Player& player ) :
-      ZoneChannelPacket< FFXIVIpcModelEquip >( player.getId(), player.getId() )
+      WorldChannelPacket< FFXIVIpcModelEquip >( player.getId(), player.getId() )
     {
       initialize( player );
     };
diff --git a/src/world/Network/PacketWrappers/MoveActorPacket.h b/src/world/Network/PacketWrappers/MoveActorPacket.h
index 9cf724fc..fb093f05 100644
--- a/src/world/Network/PacketWrappers/MoveActorPacket.h
+++ b/src/world/Network/PacketWrappers/MoveActorPacket.h
@@ -15,11 +15,11 @@ namespace Sapphire::Network::Packets::Server
   * @brief The Client UI Initialization packet. This must be sent to the client
   * once upon connection to configure the UI.
   */
-  class MoveActorPacket : public ZoneChannelPacket< FFXIVIpcActorMove >
+  class MoveActorPacket : public WorldChannelPacket< FFXIVIpcActorMove >
   {
   public:
     MoveActorPacket( Entity::Chara& actor, uint8_t headRotation, uint8_t animationType, uint8_t state, uint16_t animationSpeed, uint8_t unknownRotation = 0 ) :
-      ZoneChannelPacket< FFXIVIpcActorMove >( actor.getId(), actor.getId() )
+      WorldChannelPacket< FFXIVIpcActorMove >( actor.getId(), actor.getId() )
     {
       initialize( actor, headRotation, animationType, state, animationSpeed, unknownRotation );
     };
diff --git a/src/world/Network/PacketWrappers/NpcSpawnPacket.h b/src/world/Network/PacketWrappers/NpcSpawnPacket.h
index 3cc99f89..76030d7c 100644
--- a/src/world/Network/PacketWrappers/NpcSpawnPacket.h
+++ b/src/world/Network/PacketWrappers/NpcSpawnPacket.h
@@ -17,11 +17,11 @@ namespace Sapphire::Network::Packets::Server
   /**
   * @brief The packet sent to spawn a player.
   */
-  class NpcSpawnPacket : public ZoneChannelPacket< FFXIVIpcNpcSpawn >
+  class NpcSpawnPacket : public WorldChannelPacket< FFXIVIpcNpcSpawn >
   {
   public:
     NpcSpawnPacket( Entity::BNpc& bnpc, Entity::Player& target ) :
-      ZoneChannelPacket< FFXIVIpcNpcSpawn >( bnpc.getId(), target.getId() )
+      WorldChannelPacket< FFXIVIpcNpcSpawn >( bnpc.getId(), target.getId() )
     {
       initialize( bnpc, target );
     };
diff --git a/src/world/Network/PacketWrappers/PingPacket.h b/src/world/Network/PacketWrappers/PingPacket.h
index df2241d5..252a91f0 100644
--- a/src/world/Network/PacketWrappers/PingPacket.h
+++ b/src/world/Network/PacketWrappers/PingPacket.h
@@ -11,11 +11,11 @@ namespace Sapphire::Network::Packets::Server
   /**
   * @brief The Ping response packet.
   */
-  class PingPacket : public ZoneChannelPacket< FFXIVIpcPing >
+  class PingPacket : public WorldChannelPacket< FFXIVIpcPing >
   {
   public:
     PingPacket( Entity::Player& player, int32_t inVal ) :
-      ZoneChannelPacket< FFXIVIpcPing >( player.getId(), player.getId() )
+      WorldChannelPacket< FFXIVIpcPing >( player.getId(), player.getId() )
     {
       initialize( player, inVal );
     };
diff --git a/src/world/Network/PacketWrappers/PlayerSetupPacket.h b/src/world/Network/PacketWrappers/PlayerSetupPacket.h
index 4cd52a8a..c133dd29 100644
--- a/src/world/Network/PacketWrappers/PlayerSetupPacket.h
+++ b/src/world/Network/PacketWrappers/PlayerSetupPacket.h
@@ -13,11 +13,11 @@ namespace Sapphire::Network::Packets::Server
   * @brief The Client Player Initialization packet. This must be sent to the client
   * once upon connection to configure the UI.
   */
-  class PlayerSetupPacket : public ZoneChannelPacket< FFXIVIpcPlayerSetup >
+  class PlayerSetupPacket : public WorldChannelPacket< FFXIVIpcPlayerSetup >
   {
   public:
     PlayerSetupPacket( Entity::Player& player ) :
-      ZoneChannelPacket< FFXIVIpcPlayerSetup >( player.getId(), player.getId() )
+      WorldChannelPacket< FFXIVIpcPlayerSetup >( player.getId(), player.getId() )
     {
       initialize( player );
     };
diff --git a/src/world/Network/PacketWrappers/PlayerSpawnPacket.h b/src/world/Network/PacketWrappers/PlayerSpawnPacket.h
index 4f384356..73346d95 100644
--- a/src/world/Network/PacketWrappers/PlayerSpawnPacket.h
+++ b/src/world/Network/PacketWrappers/PlayerSpawnPacket.h
@@ -15,11 +15,11 @@ namespace Sapphire::Network::Packets::Server
   /**
   * @brief The packet sent to spawn a player.
   */
-  class PlayerSpawnPacket : public ZoneChannelPacket< FFXIVIpcPlayerSpawn >
+  class PlayerSpawnPacket : public WorldChannelPacket< FFXIVIpcPlayerSpawn >
   {
   public:
     PlayerSpawnPacket( Entity::Player& player, Entity::Player& target ) :
-      ZoneChannelPacket< FFXIVIpcPlayerSpawn >( player.getId(), target.getId() )
+      WorldChannelPacket< FFXIVIpcPlayerSpawn >( player.getId(), target.getId() )
     {
       initialize( player, target );
     };
diff --git a/src/world/Network/PacketWrappers/PlayerStateFlagsPacket.h b/src/world/Network/PacketWrappers/PlayerStateFlagsPacket.h
index 12bffd28..5d319ac6 100644
--- a/src/world/Network/PacketWrappers/PlayerStateFlagsPacket.h
+++ b/src/world/Network/PacketWrappers/PlayerStateFlagsPacket.h
@@ -11,17 +11,17 @@ namespace Sapphire::Network::Packets::Server
   /**
   * @brief Packet sent to set a players state, this impacts which actions he can perform.
   */
-  class PlayerStateFlagsPacket : public ZoneChannelPacket< FFXIVIpcPlayerStateFlags >
+  class PlayerStateFlagsPacket : public WorldChannelPacket< FFXIVIpcPlayerStateFlags >
   {
   public:
     PlayerStateFlagsPacket( Entity::Player& player ) :
-      ZoneChannelPacket< FFXIVIpcPlayerStateFlags >( player.getId(), player.getId() )
+      WorldChannelPacket< FFXIVIpcPlayerStateFlags >( player.getId(), player.getId() )
     {
       initialize( player.getStateFlags() );
     }
 
     PlayerStateFlagsPacket( Entity::Player& player, std::vector< Common::PlayerStateFlag > flags ) :
-      ZoneChannelPacket< FFXIVIpcPlayerStateFlags >( player.getId(), player.getId() )
+      WorldChannelPacket< FFXIVIpcPlayerStateFlags >( player.getId(), player.getId() )
     {
       uint8_t newFlags[12];
       memset( newFlags, 0, 12 );
diff --git a/src/world/Network/PacketWrappers/QuestMessagePacket.h b/src/world/Network/PacketWrappers/QuestMessagePacket.h
index 930a9e9b..f50b7d7b 100644
--- a/src/world/Network/PacketWrappers/QuestMessagePacket.h
+++ b/src/world/Network/PacketWrappers/QuestMessagePacket.h
@@ -11,12 +11,12 @@ namespace Sapphire::Network::Packets::Server
   /**
   * @brief Packet to display a quest specific info message.
   */
-  class QuestMessagePacket : public ZoneChannelPacket< FFXIVIpcQuestMessage >
+  class QuestMessagePacket : public WorldChannelPacket< FFXIVIpcQuestMessage >
   {
   public:
     QuestMessagePacket( Entity::ActorPtr pActor, uint32_t questId, int8_t msgId,
                         uint8_t type = 0, uint32_t var1 = 0, uint32_t var2 = 0 ) :
-      ZoneChannelPacket< FFXIVIpcQuestMessage >( pActor->getId(), pActor->getId() )
+      WorldChannelPacket< FFXIVIpcQuestMessage >( pActor->getId(), pActor->getId() )
     {
       initialize( questId, msgId, type, var1, var2 );
     };
diff --git a/src/world/Network/PacketWrappers/ServerNoticePacket.h b/src/world/Network/PacketWrappers/ServerNoticePacket.h
index aeefe168..00e12b78 100644
--- a/src/world/Network/PacketWrappers/ServerNoticePacket.h
+++ b/src/world/Network/PacketWrappers/ServerNoticePacket.h
@@ -11,11 +11,11 @@ namespace Sapphire::Network::Packets::Server
   /**
   * @brief The Ping response packet.
   */
-  class ServerNoticePacket : public ZoneChannelPacket< FFXIVIpcServerNotice >
+  class ServerNoticePacket : public WorldChannelPacket< FFXIVIpcServerNotice >
   {
   public:
     ServerNoticePacket( uint32_t playerId, const std::string& message ) :
-      ZoneChannelPacket< FFXIVIpcServerNotice >( playerId, playerId )
+      WorldChannelPacket< FFXIVIpcServerNotice >( playerId, playerId )
     {
       initialize( message );
     };
diff --git a/src/world/Network/PacketWrappers/UpdateHpMpTpPacket.h b/src/world/Network/PacketWrappers/UpdateHpMpTpPacket.h
index cfc85756..2ae5a6a8 100644
--- a/src/world/Network/PacketWrappers/UpdateHpMpTpPacket.h
+++ b/src/world/Network/PacketWrappers/UpdateHpMpTpPacket.h
@@ -11,11 +11,11 @@ namespace Sapphire::Network::Packets::Server
   /**
   * @brief The Ping response packet.
   */
-  class UpdateHpMpTpPacket : public ZoneChannelPacket< FFXIVIpcUpdateHpMpTp >
+  class UpdateHpMpTpPacket : public WorldChannelPacket< FFXIVIpcUpdateHpMpTp >
   {
   public:
     UpdateHpMpTpPacket( Entity::Chara& actor ) :
-      ZoneChannelPacket< FFXIVIpcUpdateHpMpTp >( actor.getId(), actor.getId() )
+      WorldChannelPacket< FFXIVIpcUpdateHpMpTp >( actor.getId(), actor.getId() )
     {
       initialize( actor );
     };
diff --git a/src/world/Network/PacketWrappers/UpdateInventorySlotPacket.h b/src/world/Network/PacketWrappers/UpdateInventorySlotPacket.h
index 3c6e8c1c..1cfae0f3 100644
--- a/src/world/Network/PacketWrappers/UpdateInventorySlotPacket.h
+++ b/src/world/Network/PacketWrappers/UpdateInventorySlotPacket.h
@@ -12,11 +12,11 @@ namespace Sapphire::Network::Packets::Server
   /**
   * @brief The update inventory-slot packet.
   */
-  class UpdateInventorySlotPacket : public ZoneChannelPacket< FFXIVIpcUpdateInventorySlot >
+  class UpdateInventorySlotPacket : public WorldChannelPacket< FFXIVIpcUpdateInventorySlot >
   {
   public:
     UpdateInventorySlotPacket( uint32_t playerId, uint8_t slot, uint16_t storageId, const Item& item ) :
-      ZoneChannelPacket< FFXIVIpcUpdateInventorySlot >( playerId, playerId )
+      WorldChannelPacket< FFXIVIpcUpdateInventorySlot >( playerId, playerId )
     {
       initialize( slot, storageId, item );
     };
diff --git a/src/world/Script/ScriptMgr.cpp b/src/world/Script/ScriptMgr.cpp
index 47f3704b..6557b326 100644
--- a/src/world/Script/ScriptMgr.cpp
+++ b/src/world/Script/ScriptMgr.cpp
@@ -163,7 +163,7 @@ void Sapphire::Scripting::ScriptMgr::onPlayerFirstEnterWorld( Entity::Player& pl
 bool Sapphire::Scripting::ScriptMgr::onTalk( Entity::Player& player, uint64_t actorId, uint32_t eventId )
 {
   // check if the actor is an eobj and call its script if we have one
-  auto zone = player.getCurrentZone();
+  auto zone = player.getCurrentTerritory();
   if( auto eobj = zone->getEObj( actorId ) )
   {
     auto script = m_nativeScriptMgr->getScript< Sapphire::ScriptAPI::EventObjectScript >( eobj->getObjectId() );
diff --git a/src/world/ServerMgr.cpp b/src/world/ServerMgr.cpp
index feffd356..5fbd66e6 100644
--- a/src/world/ServerMgr.cpp
+++ b/src/world/ServerMgr.cpp
@@ -286,7 +286,7 @@ void Sapphire::World::ServerMgr::mainLoop()
 
         // if the player is in a zone, let the zone handler take care of his updates
         // else do it here.
-        if( !session->getPlayer()->getCurrentZone() )
+        if( !session->getPlayer()->getCurrentTerritory() )
           session->update();
 
       }
diff --git a/src/world/Session.cpp b/src/world/Session.cpp
index b1e2c615..28423336 100644
--- a/src/world/Session.cpp
+++ b/src/world/Session.cpp
@@ -76,7 +76,7 @@ void Sapphire::World::Session::close()
     // do one last update to db
     m_pPlayer->updateSql();
     // reset the zone, so the zone handler knows to remove the actor
-    m_pPlayer->setCurrentZone( nullptr );
+    m_pPlayer->setCurrentTerritory( nullptr );
   }
 }
 
diff --git a/src/world/Territory/Housing/HousingInteriorTerritory.cpp b/src/world/Territory/Housing/HousingInteriorTerritory.cpp
index 0b8985d4..855a2b9e 100644
--- a/src/world/Territory/Housing/HousingInteriorTerritory.cpp
+++ b/src/world/Territory/Housing/HousingInteriorTerritory.cpp
@@ -57,7 +57,7 @@ void Sapphire::World::Territory::Housing::HousingInteriorTerritory::onPlayerZone
   Logger::debug( "HousingInteriorTerritory::onPlayerZoneIn: Territory#{0}|{1}, Entity#{2}",
                   getGuId(), getTerritoryTypeId(), player.getId() );
 
-  auto indoorInitPacket = makeZonePacket< Server::FFXIVIpcHousingIndoorInitialize >( player.getId() );
+  auto indoorInitPacket = makeWorldPacket< Server::FFXIVIpcHousingIndoorInitialize >( player.getId() );
   indoorInitPacket->data().u1 = 0;
   indoorInitPacket->data().u2 = 0;
   indoorInitPacket->data().u3 = 0;
@@ -80,7 +80,7 @@ void Sapphire::World::Territory::Housing::HousingInteriorTerritory::onPlayerZone
   auto yardPacketTotal = static_cast< uint8_t >( 2 + pLand->getSize() );
   for( uint8_t yardPacketNum = 0; yardPacketNum < yardPacketTotal; yardPacketNum++ )
   {
-    auto objectInitPacket = makeZonePacket< Server::FFXIVIpcHousingObjectInitialize >( player.getId() );
+    auto objectInitPacket = makeWorldPacket< Server::FFXIVIpcHousingObjectInitialize >( player.getId() );
     memcpy( &objectInitPacket->data().landIdent, &m_landIdent, sizeof( Common::LandIdent ) );
 
     if( isFcHouse )
@@ -174,7 +174,7 @@ void Sapphire::World::Territory::Housing::HousingInteriorTerritory::spawnHousing
 
   for( const auto& player : m_playerMap )
   {
-    auto objectSpawnPkt = makeZonePacket< Server::FFXIVIpcHousingInternalObjectSpawn >( player.second->getId() );
+    auto objectSpawnPkt = makeWorldPacket< Server::FFXIVIpcHousingInternalObjectSpawn >( player.second->getId() );
 
     objectSpawnPkt->data().containerId = containerType;
     objectSpawnPkt->data().containerOffset = slot;
@@ -204,7 +204,7 @@ void Sapphire::World::Territory::Housing::HousingInteriorTerritory::updateHousin
     if( player.second->getId() == sourcePlayer.getId() )
       continue;
 
-    auto moveObjPkt = makeZonePacket< Server::FFXIVIpcHousingObjectMove >( player.second->getId() );
+    auto moveObjPkt = makeWorldPacket< Server::FFXIVIpcHousingObjectMove >( player.second->getId() );
 
     moveObjPkt->data().itemRotation = obj.rotation;
     moveObjPkt->data().pos = obj.pos;
diff --git a/src/world/Territory/HousingZone.cpp b/src/world/Territory/HousingZone.cpp
index c252b909..ed381398 100644
--- a/src/world/Territory/HousingZone.cpp
+++ b/src/world/Territory/HousingZone.cpp
@@ -167,7 +167,7 @@ void Sapphire::HousingZone::onPlayerZoneIn( Entity::Player& player )
 
   for( yardPacketNum = 0; yardPacketNum < yardPacketTotal; yardPacketNum++ )
   {
-    auto housingObjectInit = makeZonePacket< FFXIVIpcHousingObjectInitialize >( player.getId() );
+    auto housingObjectInit = makeWorldPacket< FFXIVIpcHousingObjectInitialize >( player.getId() );
     memset( &housingObjectInit->data().landIdent, 0xFF, sizeof( Common::LandIdent ) );
     housingObjectInit->data().u1 = 0xFF;
     housingObjectInit->data().packetNum = yardPacketNum;
@@ -182,7 +182,7 @@ void Sapphire::HousingZone::onPlayerZoneIn( Entity::Player& player )
     player.queuePacket( housingObjectInit );
   }
 
-  auto landSetMap = makeZonePacket< FFXIVIpcLandSetMap >( player.getId() );
+  auto landSetMap = makeWorldPacket< FFXIVIpcLandSetMap >( player.getId() );
   landSetMap->data().subdivision = isInSubdivision ? 1 : 2;
 
   uint8_t startIndex = isInSubdivision ? 30 : 0;
@@ -198,7 +198,7 @@ void Sapphire::HousingZone::onPlayerZoneIn( Entity::Player& player )
 
 void Sapphire::HousingZone::sendLandSet( Entity::Player& player )
 {
-  auto landsetInitializePacket = makeZonePacket< FFXIVIpcLandSetInitialize >( player.getId() );
+  auto landsetInitializePacket = makeWorldPacket< FFXIVIpcLandSetInitialize >( player.getId() );
 
   landsetInitializePacket->data().landIdent.wardNum = m_wardNum;
   //landsetInitializePacket->data().landIdent.landSetId = m_landSetId;
@@ -247,7 +247,7 @@ void Sapphire::HousingZone::sendLandUpdate( uint8_t landId )
   {
     auto pPlayer = playerIt.second;
 
-    auto landUpdatePacket = makeZonePacket< FFXIVIpcLandUpdate >( pPlayer->getId() );
+    auto landUpdatePacket = makeWorldPacket< FFXIVIpcLandUpdate >( pPlayer->getId() );
     landUpdatePacket->data().landIdent.landId = landId;
 
     auto& landData = landUpdatePacket->data().land;
@@ -362,7 +362,7 @@ void Sapphire::HousingZone::spawnYardObject( uint8_t landId, uint16_t slotId, In
   // spawn obj in zone
   for( const auto& player : m_playerMap )
   {
-    auto packet = makeZonePacket< Server::FFXIVIpcYardObjectSpawn >( player.second->getId() );
+    auto packet = makeWorldPacket< Server::FFXIVIpcYardObjectSpawn >( player.second->getId() );
 
     packet->data().landId = landId;
     packet->data().objectArray = static_cast< uint8_t >( slotId );
@@ -390,7 +390,7 @@ void Sapphire::HousingZone::updateYardObjectPos( Entity::Player& sourcePlayer, u
     if( player.second->getId() == sourcePlayer.getId() )
       continue;
 
-    auto packet = makeZonePacket< Server::FFXIVIpcHousingObjectMove >( player.second->getId() );
+    auto packet = makeWorldPacket< Server::FFXIVIpcHousingObjectMove >( player.second->getId() );
 
     packet->data().itemRotation = item.getRot();
     packet->data().pos = item.getPos();
diff --git a/src/world/Territory/Territory.cpp b/src/world/Territory/Territory.cpp
index ea1ce4d7..c725e9bd 100644
--- a/src/world/Territory/Territory.cpp
+++ b/src/world/Territory/Territory.cpp
@@ -509,7 +509,7 @@ void Sapphire::Territory::updateSessions( uint64_t tickCount, bool changedWeathe
     }
 
     // this session is not linked to this area anymore, remove it from zone session list
-    if( ( !pPlayer->getCurrentZone() ) || ( pPlayer->getCurrentZone() != shared_from_this() ) )
+    if( ( !pPlayer->getCurrentTerritory() ) || ( pPlayer->getCurrentTerritory() != shared_from_this() ) )
     {
       removeActor( pPlayer );
       return;
@@ -517,7 +517,7 @@ void Sapphire::Territory::updateSessions( uint64_t tickCount, bool changedWeathe
 
     if( changedWeather )
     {
-      auto weatherChangePacket = makeZonePacket< FFXIVIpcWeatherChange >( pPlayer->getId() );
+      auto weatherChangePacket = makeWorldPacket< FFXIVIpcWeatherChange >( pPlayer->getId() );
       weatherChangePacket->data().weatherId = static_cast< uint8_t >( m_currentWeather );
       weatherChangePacket->data().delay = 5.0f;
       pPlayer->queuePacket( weatherChangePacket );
@@ -527,7 +527,7 @@ void Sapphire::Territory::updateSessions( uint64_t tickCount, bool changedWeathe
     pPlayer->getSession()->update();
 
     // this session is not linked to this area anymore, remove it from zone session list
-    if( ( !pPlayer->getCurrentZone() ) || ( pPlayer->getCurrentZone() != shared_from_this() ) )
+    if( ( !pPlayer->getCurrentTerritory() ) || ( pPlayer->getCurrentTerritory() != shared_from_this() ) )
       return;
   }
 }
@@ -609,7 +609,7 @@ void Sapphire::Territory::updateCellActivity( uint32_t x, uint32_t y, int32_t ra
 void Sapphire::Territory::updateActorPosition( Entity::Actor& actor )
 {
 
-  if( actor.getCurrentZone() != shared_from_this() )
+  if( actor.getCurrentTerritory() != shared_from_this() )
     return;
 
   //actor.checkInRangeActors();

From 842eaa03fd05626c999b115c6cb797a49a4cd5ac Mon Sep 17 00:00:00 2001
From: NotAdam <adam@notadam.me>
Date: Mon, 22 Jul 2019 00:29:00 +1000
Subject: [PATCH 110/351] charinfo json field info

---
 src/api/PlayerMinimal.cpp | 35 +++++++++++++++++++++++++++--------
 src/api/PlayerMinimal.h   |  8 --------
 2 files changed, 27 insertions(+), 16 deletions(-)

diff --git a/src/api/PlayerMinimal.cpp b/src/api/PlayerMinimal.cpp
index c0a6ba34..2bda842b 100644
--- a/src/api/PlayerMinimal.cpp
+++ b/src/api/PlayerMinimal.cpp
@@ -84,6 +84,7 @@ std::string PlayerMinimal::getInfoJson()
   auto payload = nlohmann::json();
   auto& c = payload["content"];
 
+  // DisplayName
   c.push_back( getName() );
 
   // class levels
@@ -94,26 +95,33 @@ std::string PlayerMinimal::getInfoJson()
     levelsArray.push_back( std::to_string( m_classMap[ i ] ) );
   }
 
+  // ClassLv
   c.push_back( levelsArray );
 
-  // unknowns
+  // Race
   c.push_back( "0" );
+  // Tribe
   c.push_back( "0" );
+  // Sex
   c.push_back( "0" );
 
-  //
+  // BirthMonth
   c.push_back( std::to_string( getBirthMonth() ) );
+  // Birthday
   c.push_back( std::to_string( getBirthDay() ) );
+  // GuardianDeity
   c.push_back( std::to_string( getGuardianDeity() ) );
 
+  // Class
   c.push_back( std::to_string( m_class ) );
 
-  // unknown
+  // ZoneId
   c.push_back( "0" );
 
+  // TerritoryType
   c.push_back( std::to_string( getZoneId() ) );
 
-  // unknown
+  // ContentFinderCondition
   c.push_back( "0" );
 
   // look map
@@ -122,10 +130,12 @@ std::string PlayerMinimal::getInfoJson()
   {
     lookArray.push_back( std::to_string( it.second ) );
   }
+  // Customize
   c.push_back( lookArray );
 
-  // weapons
+  // ModelMainWeapon
   c.push_back( std::to_string( m_modelMainWeapon ) );
+  // ModelSubWeapon
   c.push_back( std::to_string( m_modelSubWeapon ) );
 
   // model
@@ -134,20 +144,29 @@ std::string PlayerMinimal::getInfoJson()
   {
     modelArray.push_back( std::to_string( i ) );
   }
+  // ModelEquip
   c.push_back( modelArray );
 
-  // unknowns
+  // MainWeapon
   c.push_back( "1" );
+  // SubWeapon
   c.push_back( "0" );
-  c.push_back( "0" );
+  // JobStone
   c.push_back( "0" );
 
+  // RemakeFlag
+  c.push_back( "0" );
+
+  // ConfigFlags
   c.push_back( std::to_string( m_equipDisplayFlags ) );
 
-  // unknowns
+  // Voice
   c.push_back( "0" );
+  // WorldName
   c.push_back( "" );
+  // LoginStatus
   c.push_back( "0" );
+  // IsOutTerritory
   c.push_back( "0" );
 
 
diff --git a/src/api/PlayerMinimal.h b/src/api/PlayerMinimal.h
index 39121928..d51251c2 100644
--- a/src/api/PlayerMinimal.h
+++ b/src/api/PlayerMinimal.h
@@ -23,16 +23,8 @@ namespace Sapphire::Api
 
     void saveAsNew();
 
-    std::string getLookString();
-
     std::string getInfoJson();
 
-    std::string getModelString();
-
-    std::string getClassString();
-
-    std::string getLevelsString();
-
     uint8_t getClassLevel();
 
     // return the id of the actor

From a5b9923b66c54b53f9ffadea21101002d59403e2 Mon Sep 17 00:00:00 2001
From: NotAdam <adam@notadam.me>
Date: Wed, 24 Jul 2019 21:58:48 +1000
Subject: [PATCH 111/351] minor zone -> territory refactoring

---
 src/world/Manager/TerritoryMgr.cpp | 16 ++++++++--------
 src/world/Manager/TerritoryMgr.h   |  2 +-
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/world/Manager/TerritoryMgr.cpp b/src/world/Manager/TerritoryMgr.cpp
index 0889d5f5..5160dd29 100644
--- a/src/world/Manager/TerritoryMgr.cpp
+++ b/src/world/Manager/TerritoryMgr.cpp
@@ -201,7 +201,7 @@ bool Sapphire::World::Manager::TerritoryMgr::createDefaultTerritories()
     instanceMap[ guid ] = pZone;
     m_guIdToTerritoryPtrMap[ guid ] = pZone;
     m_territoryTypeIdToInstanceGuidMap[ territoryTypeId ] = instanceMap;
-    m_zoneSet.insert( { pZone } );
+    m_territorySet.insert( { pZone } );
 
   }
 
@@ -248,7 +248,7 @@ bool Sapphire::World::Manager::TerritoryMgr::createHousingTerritories()
       m_guIdToTerritoryPtrMap[ guid ] = pHousingZone;
       m_territoryTypeIdToInstanceGuidMap[ territoryTypeId ][ guid ] = pHousingZone;
       m_landSetIdToTerritoryPtrMap[ pHousingZone->getLandSetId() ] = pHousingZone;
-      m_zoneSet.insert( { pHousingZone } );
+      m_territorySet.insert( { pHousingZone } );
     }
 
   }
@@ -279,7 +279,7 @@ Sapphire::TerritoryPtr Sapphire::World::Manager::TerritoryMgr::createTerritoryIn
 
   m_guIdToTerritoryPtrMap[ pZone->getGuId() ] = pZone;
   m_territoryTypeIdToInstanceGuidMap[ pZone->getTerritoryTypeId() ][ pZone->getGuId() ] = pZone;
-  m_zoneSet.insert( { pZone } );
+  m_territorySet.insert( { pZone } );
 
   return pZone;
 }
@@ -429,7 +429,7 @@ Sapphire::TerritoryPtr Sapphire::World::Manager::TerritoryMgr::findOrCreateHousi
 
   m_landIdentToTerritoryPtrMap[ ident ] = zone;
   m_guIdToTerritoryPtrMap[ zone->getGuId() ] = zone;
-  m_zoneSet.insert( { zone } );
+  m_territorySet.insert( { zone } );
 
   return zone;
 }
@@ -443,7 +443,7 @@ bool Sapphire::World::Manager::TerritoryMgr::removeTerritoryInstance( uint32_t g
   m_guIdToTerritoryPtrMap.erase( pZone->getGuId() );
 
   m_instanceZoneSet.erase( pZone );
-  m_zoneSet.erase( pZone );
+  m_territorySet.erase( pZone );
 
   if( isInstanceContentTerritory( pZone->getTerritoryTypeId() ) )
   {
@@ -516,7 +516,7 @@ Sapphire::TerritoryPtr Sapphire::World::Manager::TerritoryMgr::getZoneByLandSetI
 
 void Sapphire::World::Manager::TerritoryMgr::updateTerritoryInstances( uint64_t tickCount )
 {
-  for( auto& zone : m_zoneSet )
+  for( auto& zone : m_territorySet )
   {
     zone->update( tickCount );
   }
@@ -540,7 +540,7 @@ void Sapphire::World::Manager::TerritoryMgr::updateTerritoryInstances( uint64_t
       Logger::info( "Removing HousingInteriorTerritory#{0} - has been inactive for 60 seconds", zone->getGuId() );
 
       // remove zone from maps
-      m_zoneSet.erase( zone );
+      m_territorySet.erase( zone );
       it = m_landIdentToTerritoryPtrMap.erase( it );
     }
     else
@@ -661,7 +661,7 @@ void Sapphire::World::Manager::TerritoryMgr::setCurrentFestival( uint16_t festiv
 {
   m_currentFestival = { festivalId, additionalFestival };
 
-  for( const auto& zone : m_zoneSet )
+  for( const auto& zone : m_territorySet )
   {
     zone->setCurrentFestival( festivalId, additionalFestival );
   }
diff --git a/src/world/Manager/TerritoryMgr.h b/src/world/Manager/TerritoryMgr.h
index d3060656..62967378 100644
--- a/src/world/Manager/TerritoryMgr.h
+++ b/src/world/Manager/TerritoryMgr.h
@@ -205,7 +205,7 @@ namespace Sapphire::World::Manager
     uint32_t m_lastInstanceId;
 
     /*! set of TerritoryPtrs for quick iteration*/
-    std::set< TerritoryPtr > m_zoneSet;
+    std::set< TerritoryPtr > m_territorySet;
 
     /*! set of TerritoryPtrs for quick iteration*/
     std::set< TerritoryPtr > m_instanceZoneSet;

From 7e0108aea54121c0d7fac688e4d83daa711e1c33 Mon Sep 17 00:00:00 2001
From: NotAdam <adam@notadam.me>
Date: Thu, 25 Jul 2019 22:46:10 +1000
Subject: [PATCH 112/351] some effects/action wip crap

---
 src/world/Action/Action.cpp        | 71 +++++++++++++++++-------
 src/world/Action/Action.h          |  4 ++
 src/world/Action/EffectBuilder.cpp | 87 ++++++++++++++++++++++++++++++
 src/world/Action/EffectBuilder.h   | 47 ++++++++++++++++
 src/world/Action/EffectResult.cpp  | 55 +++++++++++++++++++
 src/world/Action/EffectResult.h    | 39 ++++++++++++++
 src/world/ForwardsZone.h           |  2 +
 7 files changed, 285 insertions(+), 20 deletions(-)
 create mode 100644 src/world/Action/EffectBuilder.cpp
 create mode 100644 src/world/Action/EffectBuilder.h
 create mode 100644 src/world/Action/EffectResult.cpp
 create mode 100644 src/world/Action/EffectResult.h

diff --git a/src/world/Action/Action.cpp b/src/world/Action/Action.cpp
index 2eb44e2b..8f9bfcab 100644
--- a/src/world/Action/Action.cpp
+++ b/src/world/Action/Action.cpp
@@ -1,5 +1,6 @@
 #include "Action.h"
 #include "ActionLut.h"
+#include "EffectBuilder.h"
 
 #include <Exd/ExdDataGenerated.h>
 #include <Util/Util.h>
@@ -17,8 +18,9 @@
 #include "Network/PacketWrappers/ActorControlPacket142.h"
 #include "Network/PacketWrappers/ActorControlPacket143.h"
 #include "Network/PacketWrappers/ActorControlPacket144.h"
-#include <Network/PacketWrappers/EffectPacket.h>
+
 #include <Logging/Logger.h>
+
 #include <Util/ActorFilter.h>
 
 using namespace Sapphire;
@@ -68,6 +70,8 @@ bool Action::Action::init()
     m_actionData = actionData;
   }
 
+  m_effectBuilder = make_EffectBuilder( m_pSource, getId() );
+
   m_castTimeMs = static_cast< uint32_t >( m_actionData->cast100ms * 100 );
   m_recastTimeMs = static_cast< uint32_t >( m_actionData->recast100ms * 100 );
   m_cooldownGroup = m_actionData->cooldownGroup;
@@ -326,30 +330,13 @@ void Action::Action::execute()
     player->sendDebug( "action combo success from action#{0}", player->getLastComboActionId() );
   }
 
-  if( !hasClientsideTarget() )
+  if( !hasClientsideTarget()  )
   {
-    snapshotAffectedActors( m_hitActors );
-
-    if( !m_hitActors.empty() )
-    {
-      // only call script if actors are hit
-      if( !pScriptMgr->onExecute( *this ) && ActionLut::validEntryExists( getId() ) )
-      {
-        auto lutEntry = ActionLut::getEntry( getId() );
-
-        // no script exists but we have a valid lut entry
-        if( auto player = getSourceChara()->getAsPlayer() )
-        {
-          player->sendDebug( "Hit target: pot: {} (f: {}, r: {}), heal pot: {}",
-                             lutEntry.potency, lutEntry.flankPotency, lutEntry.rearPotency, lutEntry.curePotency );
-        }
-      }
-    }
+    buildEffects();
   }
   else if( auto player = m_pSource->getAsPlayer() )
   {
     pScriptMgr->onEObjHit( *player, m_targetId, getId() );
-    return;
   }
 
   // set currently casted action as the combo action if it interrupts a combo
@@ -360,6 +347,50 @@ void Action::Action::execute()
   }
 }
 
+void Action::Action::buildEffects()
+{
+  snapshotAffectedActors( m_hitActors );
+
+  auto pScriptMgr = m_pFw->get< Scripting::ScriptMgr >();
+
+  if( !pScriptMgr->onExecute( *this ) && !ActionLut::validEntryExists( getId() ) )
+  {
+    if( auto player = m_pSource->getAsPlayer() )
+    {
+      player->sendUrgent( "missing lut entry for action#{}", getId() );
+    }
+
+    return;
+  }
+
+  if( m_hitActors.empty() )
+    return;
+
+  auto lutEntry = ActionLut::getEntry( getId() );
+
+  // no script exists but we have a valid lut entry
+  if( auto player = getSourceChara()->getAsPlayer() )
+  {
+    player->sendDebug( "Hit target: pot: {} (f: {}, r: {}), heal pot: {}",
+                       lutEntry.potency, lutEntry.flankPotency, lutEntry.rearPotency, lutEntry.curePotency );
+  }
+
+  for( auto& actor : m_hitActors )
+  {
+    // todo: this is shit
+    if( actor->getObjKind() == m_pSource->getObjKind() && lutEntry.curePotency > 0 )
+      m_effectBuilder->healTarget( actor, lutEntry.curePotency );
+
+    else if( lutEntry.potency > 0 )
+      m_effectBuilder->damageTarget( actor, lutEntry.potency );
+  }
+
+  m_effectBuilder->buildAndSendPackets();
+
+  // at this point we're done with it and no longer need it
+  m_effectBuilder.reset();
+}
+
 bool Action::Action::preCheck()
 {
   if( auto player = m_pSource->getAsPlayer() )
diff --git a/src/world/Action/Action.h b/src/world/Action/Action.h
index 6f3fccca..debaaea0 100644
--- a/src/world/Action/Action.h
+++ b/src/world/Action/Action.h
@@ -85,6 +85,8 @@ namespace Sapphire::World::Action
      */
     bool snapshotAffectedActors( std::vector< Entity::CharaPtr >& actors );
 
+    void buildEffects();
+
     /*!
      * @brief Adds an actor filter to this action.
      * @param filter The ptr to the ActorFilter to add
@@ -171,6 +173,8 @@ namespace Sapphire::World::Action
 
     Common::FFXIVARR_POSITION3 m_pos;
 
+    EffectBuilderPtr m_effectBuilder;
+
     std::vector< World::Util::ActorFilterPtr > m_actorFilters;
     std::vector< Entity::CharaPtr > m_hitActors;
   };
diff --git a/src/world/Action/EffectBuilder.cpp b/src/world/Action/EffectBuilder.cpp
new file mode 100644
index 00000000..6535604b
--- /dev/null
+++ b/src/world/Action/EffectBuilder.cpp
@@ -0,0 +1,87 @@
+#include "EffectBuilder.h"
+#include "EffectResult.h"
+
+#include <Actor/Chara.h>
+
+#include <Network/PacketWrappers/EffectPacket.h>
+
+#include <Territory/Territory.h>
+
+#include <Util/Util.h>
+#include <Util/UtilMath.h>
+
+#include <Logging/Logger.h>
+
+using namespace Sapphire;
+using namespace Sapphire::World::Action;
+using namespace Sapphire::Network::Packets;
+
+EffectBuilder::EffectBuilder( Entity::CharaPtr source, uint32_t actionId ) :
+  m_sourceChara( std::move( source ) ),
+  m_actionId( actionId )
+{
+
+}
+
+uint32_t EffectBuilder::getResultDelayMs()
+{
+  // todo: actually figure this retarded shit out
+
+  return Common::Util::getTimeMs() + 1000;
+}
+
+EffectResultPtr EffectBuilder::getResult( Entity::CharaPtr& chara )
+{
+  auto it = m_resolvedEffects.find( chara->getId() );
+  if( it == m_resolvedEffects.end() )
+  {
+    // create a new one and return it
+    // todo: this feels kinda dirty but makes for easy work
+    auto result = make_EffectResult( chara, getResultDelayMs() );
+
+    m_resolvedEffects[ chara->getId() ] = result;
+
+    return result;
+  }
+
+  return it->second;
+}
+
+void EffectBuilder::healTarget( Entity::CharaPtr& target, uint32_t amount, Common::ActionHitSeverityType severity )
+{
+  auto result = getResult( target );
+  assert( result );
+
+  result->heal( amount, severity );
+}
+
+void EffectBuilder::damageTarget( Entity::CharaPtr& target, uint32_t amount, Common::ActionHitSeverityType severity )
+{
+  auto result = getResult( target );
+  assert( result );
+
+  result->damage( amount, severity );
+}
+
+void EffectBuilder::buildAndSendPackets()
+{
+  Logger::info( "EffectBuilder result: " );
+  Logger::info( "Targets afflicted: {}", m_resolvedEffects.size() );
+
+  // test shit
+  for( auto& effect : m_resolvedEffects )
+  {
+    auto& result = effect.second;
+
+    auto effectPacket = std::make_shared< Server::EffectPacket >( m_sourceChara->getId(), result->getTarget()->getId(), m_actionId );
+    effectPacket->setRotation( Common::Util::floatToUInt16Rot( m_sourceChara->getRot() ) );
+
+    effectPacket->addEffect( result->buildEffectEntry() );
+
+    auto sequence = m_sourceChara->getCurrentTerritory()->getNextEffectSequence();
+    effectPacket->setSequence( sequence );
+
+    m_sourceChara->sendToInRangeSet( effectPacket, true );
+  }
+
+}
\ No newline at end of file
diff --git a/src/world/Action/EffectBuilder.h b/src/world/Action/EffectBuilder.h
new file mode 100644
index 00000000..386bf080
--- /dev/null
+++ b/src/world/Action/EffectBuilder.h
@@ -0,0 +1,47 @@
+#ifndef SAPPHIRE_EFFECTBUILDER_H
+#define SAPPHIRE_EFFECTBUILDER_H
+
+#include <ForwardsZone.h>
+#include <Common.h>
+
+namespace Sapphire::World::Action
+{
+  class EffectBuilder
+  {
+  public:
+    enum HitSeverity
+    {
+      Normal,
+      Critical,
+      DirectHit,
+      CriticalDirectHit
+    };
+
+    EffectBuilder( Entity::CharaPtr source, uint32_t actionId );
+
+
+    void healTarget( Entity::CharaPtr& target, uint32_t amount,
+                     Common::ActionHitSeverityType severity = Common::ActionHitSeverityType::NormalHeal );
+
+    void damageTarget( Entity::CharaPtr& target, uint32_t amount,
+                       Common::ActionHitSeverityType severity = Common::ActionHitSeverityType::NormalDamage );
+
+    void buildAndSendPackets();
+
+
+  private:
+    EffectResultPtr getResult( Entity::CharaPtr& chara );
+
+    uint32_t getResultDelayMs();
+
+
+    Entity::CharaPtr m_sourceChara;
+
+    uint32_t m_actionId;
+
+    std::unordered_map< uint32_t, EffectResultPtr > m_resolvedEffects;
+  };
+
+}
+
+#endif //SAPPHIRE_EFFECTBUILDER_H
diff --git a/src/world/Action/EffectResult.cpp b/src/world/Action/EffectResult.cpp
new file mode 100644
index 00000000..fd7cc0e1
--- /dev/null
+++ b/src/world/Action/EffectResult.cpp
@@ -0,0 +1,55 @@
+#include "EffectResult.h"
+
+#include <Util/Util.h>
+
+using namespace Sapphire;
+using namespace Sapphire::World::Action;
+
+
+EffectResult::EffectResult( Entity::CharaPtr target, uint32_t runAfter ) :
+  m_target( std::move( target ) ),
+  m_runAfter( runAfter ),
+  m_value( 0 ),
+  m_severity( Common::ActionHitSeverityType::NormalDamage )
+{
+
+}
+
+Entity::CharaPtr EffectResult::getTarget() const
+{
+  return m_target;
+}
+
+uint32_t EffectResult::getValue() const
+{
+  return m_value;
+}
+
+void EffectResult::damage( uint32_t amount, Common::ActionHitSeverityType severity )
+{
+  m_severity = severity;
+  m_value = amount;
+
+  m_type = Common::ActionEffectType::Damage;
+}
+
+void EffectResult::heal( uint32_t amount, Sapphire::Common::ActionHitSeverityType severity )
+{
+  m_severity = severity;
+  m_value = amount;
+
+  m_type = Common::ActionEffectType::Heal;
+}
+
+Common::EffectEntry EffectResult::buildEffectEntry() const
+{
+  Common::EffectEntry entry{};
+
+  // todo: that retarded shit so > u16 max numbers work
+  entry.value = getValue();
+  entry.hitSeverity = m_severity;
+  entry.effectType = m_type;
+
+
+  return entry;
+}
\ No newline at end of file
diff --git a/src/world/Action/EffectResult.h b/src/world/Action/EffectResult.h
new file mode 100644
index 00000000..65026802
--- /dev/null
+++ b/src/world/Action/EffectResult.h
@@ -0,0 +1,39 @@
+#ifndef SAPPHIRE_EFFECTRESULT_H
+#define SAPPHIRE_EFFECTRESULT_H
+
+#include <ForwardsZone.h>
+#include <Common.h>
+
+namespace Sapphire::World::Action
+{
+  /*!
+   * @brief A container for the computed result of an effect on a single actor. Used to apply damage/healing dealt
+   * at a later point in time.
+   */
+  class EffectResult
+  {
+  public:
+    explicit EffectResult( Entity::CharaPtr target, uint32_t delayMs );
+
+    void damage( uint32_t amount, Common::ActionHitSeverityType severity );
+    void heal( uint32_t amount, Common::ActionHitSeverityType severity );
+
+    Entity::CharaPtr getTarget() const;
+
+    uint32_t getValue() const;
+
+    Common::EffectEntry buildEffectEntry() const;
+
+  private:
+    uint64_t m_runAfter;
+
+    Entity::CharaPtr m_target;
+
+    Common::ActionHitSeverityType m_severity;
+    Common::ActionEffectType m_type;
+
+    uint32_t m_value;
+  };
+}
+
+#endif //SAPPHIRE_EFFECTRESULT_H
diff --git a/src/world/ForwardsZone.h b/src/world/ForwardsZone.h
index 95ac658f..4ff4af79 100644
--- a/src/world/ForwardsZone.h
+++ b/src/world/ForwardsZone.h
@@ -87,6 +87,8 @@ namespace World::Action
 TYPE_FORWARD( Action );
 TYPE_FORWARD( EventAction );
 TYPE_FORWARD( ItemAction );
+TYPE_FORWARD( EffectBuilder );
+TYPE_FORWARD( EffectResult );
 
 using ActionCallback = std::function< void( Entity::Player&, uint32_t, uint64_t ) >;
 }

From 35000002e9e95aaf8ae783901c3df9ce257f042f Mon Sep 17 00:00:00 2001
From: NotAdam <adam@notadam.me>
Date: Thu, 25 Jul 2019 23:21:42 +1000
Subject: [PATCH 113/351] fix playerstats packet

---
 .../Network/PacketDef/Zone/ServerZoneDef.h    | 40 ++++++-------------
 src/world/Action/EffectBuilder.cpp            |  6 ++-
 src/world/Actor/Player.cpp                    | 12 +++---
 3 files changed, 22 insertions(+), 36 deletions(-)

diff --git a/src/common/Network/PacketDef/Zone/ServerZoneDef.h b/src/common/Network/PacketDef/Zone/ServerZoneDef.h
index c4e4897f..b417a197 100644
--- a/src/common/Network/PacketDef/Zone/ServerZoneDef.h
+++ b/src/common/Network/PacketDef/Zone/ServerZoneDef.h
@@ -982,6 +982,7 @@ namespace Sapphire::Network::Packets::Server
   */
   struct FFXIVIpcPlayerStats : FFXIVIpcBasePacket< PlayerStats >
   {
+    // order comes from baseparam order column
     uint32_t strength;
     uint32_t dexterity;
     uint32_t vitality;
@@ -991,45 +992,30 @@ namespace Sapphire::Network::Packets::Server
     uint32_t hp;
     uint32_t mp;
     uint32_t tp;
-    uint32_t gp; // Set to 10000 as non-gatherer for some reason
+    uint32_t gp;
     uint32_t cp;
-    uint32_t unknown_2;
+    uint32_t delay;
     uint32_t tenacity;
-    uint32_t attack;
+    uint32_t attackPower;
     uint32_t defense;
-    uint32_t accuracy;
-    uint32_t spellSpeed;
+    uint32_t directHitRate;
+    uint32_t evasion;
     uint32_t magicDefense;
-    uint32_t criticalHitRate;
-    uint32_t resistanceSlashing;
-    uint32_t resistancePiercing;
-    uint32_t resistanceBlunt;
+    uint32_t criticalHit;
     uint32_t attackMagicPotency;
     uint32_t healingMagicPotency;
-    uint32_t fire;
-    uint32_t ice;
-    uint32_t wind;
-    uint32_t earth;
-    uint32_t lightning;
-    uint32_t water;
+    uint32_t elementalBonus;
     uint32_t determination;
     uint32_t skillSpeed;
-    uint32_t spellSpeed1;
-    uint32_t spellSpeedMod;
-    uint32_t unknown_6;
+    uint32_t spellSpeed;
+    uint32_t haste;
     uint32_t craftsmanship;
     uint32_t control;
     uint32_t gathering;
     uint32_t perception;
-    uint32_t resistanceSlow;
-    uint32_t resistanceSilence;
-    uint32_t resistanceBlind;
-    uint32_t resistancePoison;
-    uint32_t resistanceStun;
-    uint32_t resistanceSleep;
-    uint32_t resistanceBind;
-    uint32_t resistanceHeavy;
-    uint32_t unknown_7[9]; // possibly level sync stats.
+
+    // todo: what is here?
+    uint32_t unknown[26];
   };
 
   /**
diff --git a/src/world/Action/EffectBuilder.cpp b/src/world/Action/EffectBuilder.cpp
index 6535604b..ee0c04d2 100644
--- a/src/world/Action/EffectBuilder.cpp
+++ b/src/world/Action/EffectBuilder.cpp
@@ -65,14 +65,16 @@ void EffectBuilder::damageTarget( Entity::CharaPtr& target, uint32_t amount, Com
 
 void EffectBuilder::buildAndSendPackets()
 {
-  Logger::info( "EffectBuilder result: " );
-  Logger::info( "Targets afflicted: {}", m_resolvedEffects.size() );
+  Logger::debug( "EffectBuilder result: " );
+  Logger::debug( "Targets afflicted: {}", m_resolvedEffects.size() );
 
   // test shit
   for( auto& effect : m_resolvedEffects )
   {
     auto& result = effect.second;
 
+    Logger::debug( " - id: {}", result->getTarget()->getId() );
+
     auto effectPacket = std::make_shared< Server::EffectPacket >( m_sourceChara->getId(), result->getTarget()->getId(), m_actionId );
     effectPacket->setRotation( Common::Util::floatToUInt16Rot( m_sourceChara->getRot() ) );
 
diff --git a/src/world/Actor/Player.cpp b/src/world/Actor/Player.cpp
index 375374ef..0ab82688 100644
--- a/src/world/Actor/Player.cpp
+++ b/src/world/Actor/Player.cpp
@@ -311,8 +311,8 @@ bool Sapphire::Entity::Player::isAutoattackOn() const
 
 void Sapphire::Entity::Player::sendStats()
 {
-
   auto statPacket = makeWorldPacket< FFXIVIpcPlayerStats >( getId() );
+
   statPacket->data().strength = getStatValue( Common::BaseParam::Strength );
   statPacket->data().dexterity = getStatValue( Common::BaseParam::Dexterity );
   statPacket->data().vitality = getStatValue( Common::BaseParam::Vitality );
@@ -322,16 +322,14 @@ void Sapphire::Entity::Player::sendStats()
   statPacket->data().determination = getStatValue( Common::BaseParam::Determination );
   statPacket->data().hp = getStatValue( Common::BaseParam::HP );
   statPacket->data().mp = getStatValue( Common::BaseParam::MP );
-  statPacket->data().accuracy = m_baseStats.accuracy;
-  statPacket->data().attack = getStatValue( Common::BaseParam::AttackPower );
+  statPacket->data().directHitRate = getStatValue( Common::BaseParam::DirectHitRate );
+  statPacket->data().attackPower = getStatValue( Common::BaseParam::AttackPower );
   statPacket->data().attackMagicPotency = getStatValue( Common::BaseParam::AttackMagicPotency );
   statPacket->data().healingMagicPotency = getStatValue( Common::BaseParam::HealingMagicPotency );
   statPacket->data().skillSpeed = getStatValue( Common::BaseParam::SkillSpeed );
   statPacket->data().spellSpeed = getStatValue( Common::BaseParam::SpellSpeed );
-  statPacket->data().spellSpeed1 = getStatValue( Common::BaseParam::SpellSpeed );
-  statPacket->data().spellSpeedMod = 100;
-
-  statPacket->data().criticalHitRate = getStatValue( Common::BaseParam::CriticalHit );
+  statPacket->data().haste = 100;
+  statPacket->data().criticalHit = getStatValue( Common::BaseParam::CriticalHit );
   statPacket->data().defense = getStatValue( Common::BaseParam::Defense );
   statPacket->data().magicDefense = getStatValue( Common::BaseParam::MagicDefense );
   statPacket->data().tenacity = getStatValue( Common::BaseParam::Tenacity );

From 51f34b2172b7fc1323d6fc84a86e59c000a8c61a Mon Sep 17 00:00:00 2001
From: NotAdam <adam@notadam.me>
Date: Thu, 25 Jul 2019 23:33:06 +1000
Subject: [PATCH 114/351] fix action_parse not checking for the correct
 template file

---
 src/tools/action_parse/main.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/tools/action_parse/main.cpp b/src/tools/action_parse/main.cpp
index 3adce507..7987febe 100644
--- a/src/tools/action_parse/main.cpp
+++ b/src/tools/action_parse/main.cpp
@@ -74,7 +74,7 @@ int main()
 
   Logger::init( "action_parse" );
 
-  if( !fs::exists( "ActionLut.cpp.tmpl" ) )
+  if( !fs::exists( "ActionLutData.cpp.tmpl" ) )
     throw std::runtime_error( "ActionLut.cpp.tmpl is missing in working directory" );
 
   Logger::info( "Setting up EXD data" );

From 7f89d53bdce8d5090f91b24752e9f8f47515cc8b Mon Sep 17 00:00:00 2001
From: NotAdam <adam@notadam.me>
Date: Thu, 25 Jul 2019 23:42:06 +1000
Subject: [PATCH 115/351] update lut with new/removed actions

---
 src/world/Action/ActionLutData.cpp | 842 +++++++++++++++++++----------
 1 file changed, 564 insertions(+), 278 deletions(-)

diff --git a/src/world/Action/ActionLutData.cpp b/src/world/Action/ActionLutData.cpp
index 1e9c1f97..68d1c456 100644
--- a/src/world/Action/ActionLutData.cpp
+++ b/src/world/Action/ActionLutData.cpp
@@ -9,45 +9,31 @@ ActionLut::Lut ActionLut::m_actionLut =
   // Shot
   { 8, { 0, 0, 0, 0, 0 } },
   // Fast Blade
-  { 9, { 160, 0, 0, 0, 0 } },
-  // Savage Blade
-  { 11, { 100, 0, 0, 0, 0 } },
-  // Flash
-  { 14, { 0, 0, 0, 0, 0 } },
+  { 9, { 200, 0, 0, 0, 0 } },
   // Riot Blade
   { 15, { 100, 0, 0, 0, 0 } },
   // Shield Bash
   { 16, { 110, 0, 0, 0, 0 } },
   // Sentinel
   { 17, { 0, 0, 0, 0, 0 } },
-  // Tempered Will
-  { 19, { 0, 0, 0, 0, 0 } },
   // Fight or Flight
   { 20, { 0, 0, 0, 0, 0 } },
   // Rage of Halone
   { 21, { 100, 0, 0, 0, 0 } },
-  // Bulwark
-  { 22, { 0, 0, 0, 0, 0 } },
   // Circle of Scorn
-  { 23, { 100, 0, 0, 0, 0 } },
+  { 23, { 120, 0, 0, 0, 0 } },
   // Shield Lob
   { 24, { 120, 0, 0, 0, 0 } },
-  // Shield Swipe
-  { 25, { 100, 0, 0, 0, 0 } },
-  // Sword Oath
-  { 26, { 75, 0, 0, 0, 0 } },
   // Cover
   { 27, { 0, 0, 0, 0, 0 } },
-  // Shield Oath
+  // Iron Will
   { 28, { 0, 0, 0, 0, 0 } },
   // Spirits Within
-  { 29, { 300, 0, 0, 0, 0 } },
+  { 29, { 370, 0, 0, 0, 0 } },
   // Hallowed Ground
   { 30, { 0, 0, 0, 0, 0 } },
   // Heavy Swing
-  { 31, { 160, 0, 0, 0, 0 } },
-  // Skull Sunder
-  { 35, { 100, 0, 0, 0, 0 } },
+  { 31, { 200, 0, 0, 0, 0 } },
   // Maim
   { 37, { 100, 0, 0, 0, 0 } },
   // Berserk
@@ -57,7 +43,7 @@ ActionLut::Lut ActionLut::m_actionLut =
   // Overpower
   { 41, { 130, 0, 0, 0, 0 } },
   // Storm's Path
-  { 42, { 100, 0, 0, 0, 0 } },
+  { 42, { 100, 0, 0, 0, 250 } },
   // Holmgang
   { 43, { 0, 0, 0, 0, 0 } },
   // Vengeance
@@ -66,112 +52,92 @@ ActionLut::Lut ActionLut::m_actionLut =
   { 45, { 100, 0, 0, 0, 0 } },
   // Tomahawk
   { 46, { 140, 0, 0, 0, 0 } },
-  // Butcher's Block
-  { 47, { 100, 0, 0, 0, 0 } },
   // Defiance
   { 48, { 0, 0, 0, 0, 0 } },
   // Inner Beast
   { 49, { 350, 0, 0, 0, 0 } },
-  // Unchained
-  { 50, { 0, 0, 0, 0, 0 } },
   // Steel Cyclone
-  { 51, { 200, 0, 0, 0, 0 } },
+  { 51, { 220, 0, 0, 0, 0 } },
   // Infuriate
   { 52, { 0, 0, 0, 0, 0 } },
   // Bootshine
-  { 53, { 140, 0, 0, 0, 0 } },
+  { 53, { 150, 0, 0, 0, 0 } },
   // True Strike
-  { 54, { 160, 0, 0, 180, 0 } },
+  { 54, { 220, 0, 0, 240, 0 } },
   // Snap Punch
-  { 56, { 150, 170, 0, 0, 0 } },
-  // Internal Release
-  { 59, { 0, 0, 0, 0, 0 } },
+  { 56, { 210, 230, 0, 0, 0 } },
   // Fists of Earth
   { 60, { 0, 0, 0, 0, 0 } },
   // Twin Snakes
-  { 61, { 110, 130, 0, 0, 0 } },
+  { 61, { 150, 170, 0, 0, 0 } },
   // Arm of the Destroyer
-  { 62, { 50, 0, 0, 0, 0 } },
+  { 62, { 80, 0, 0, 0, 0 } },
   // Fists of Fire
   { 63, { 0, 0, 0, 0, 0 } },
-  // Steel Peak
-  { 64, { 150, 0, 0, 0, 0 } },
   // Mantra
   { 65, { 0, 0, 0, 0, 0 } },
   // Demolish
-  { 66, { 50, 0, 0, 70, 0 } },
-  // Howling Fist
-  { 67, { 210, 0, 0, 0, 0 } },
+  { 66, { 70, 0, 0, 90, 0 } },
   // Perfect Balance
   { 69, { 0, 0, 0, 0, 0 } },
   // Rockbreaker
-  { 70, { 130, 0, 0, 0, 0 } },
+  { 70, { 120, 0, 0, 0, 0 } },
   // Shoulder Tackle
   { 71, { 100, 0, 0, 0, 0 } },
-  // One Ilm Punch
-  { 72, { 120, 0, 0, 0, 0 } },
   // Fists of Wind
   { 73, { 0, 0, 0, 0, 0 } },
   // Dragon Kick
-  { 74, { 120, 140, 0, 0, 0 } },
+  { 74, { 180, 200, 0, 0, 0 } },
   // True Thrust
-  { 75, { 160, 0, 0, 0, 0 } },
+  { 75, { 0, 0, 0, 0, 0 } },
   // Vorpal Thrust
-  { 78, { 100, 0, 0, 0, 0 } },
-  // Heavy Thrust
-  { 79, { 150, 190, 0, 0, 0 } },
-  // Impulse Drive
-  { 81, { 200, 0, 0, 0, 0 } },
+  { 78, { 0, 0, 0, 0, 0 } },
   // Life Surge
   { 83, { 0, 0, 0, 0, 0 } },
   // Full Thrust
   { 84, { 100, 0, 0, 0, 0 } },
-  // Blood for Blood
+  // Lance Charge
   { 85, { 0, 0, 0, 0, 0 } },
   // Doom Spike
-  { 86, { 140, 0, 0, 0, 0 } },
+  { 86, { 170, 0, 0, 0, 0 } },
   // Disembowel
-  { 87, { 100, 0, 0, 0, 0 } },
+  { 87, { 0, 0, 0, 0, 0 } },
   // Chaos Thrust
   { 88, { 100, 0, 0, 140, 0 } },
   // Piercing Talon
-  { 90, { 120, 0, 0, 0, 0 } },
+  { 90, { 150, 0, 0, 0, 0 } },
   // Jump
-  { 92, { 260, 0, 0, 0, 0 } },
+  { 92, { 310, 0, 0, 0, 0 } },
   // Elusive Jump
   { 94, { 0, 0, 0, 0, 0 } },
   // Spineshatter Dive
-  { 95, { 210, 0, 0, 0, 0 } },
+  { 95, { 240, 0, 0, 0, 0 } },
   // Dragonfire Dive
-  { 96, { 320, 0, 0, 0, 0 } },
+  { 96, { 380, 0, 0, 0, 0 } },
   // Heavy Shot
-  { 97, { 150, 0, 0, 0, 0 } },
+  { 97, { 180, 0, 0, 0, 0 } },
   // Straight Shot
-  { 98, { 140, 0, 0, 0, 0 } },
+  { 98, { 200, 0, 0, 0, 0 } },
   // Venomous Bite
   { 100, { 100, 0, 0, 0, 0 } },
   // Raging Strikes
   { 101, { 0, 0, 0, 0, 0 } },
-  // Misery's End
-  { 103, { 190, 0, 0, 0, 0 } },
   // Quick Nock
-  { 106, { 110, 0, 0, 0, 0 } },
+  { 106, { 150, 0, 0, 0, 0 } },
   // Barrage
   { 107, { 0, 0, 0, 0, 0 } },
   // Bloodletter
-  { 110, { 130, 0, 0, 0, 0 } },
+  { 110, { 150, 0, 0, 0, 0 } },
   // Repelling Shot
   { 112, { 0, 0, 0, 0, 0 } },
   // Windbite
   { 113, { 60, 0, 0, 0, 0 } },
   // Mage's Ballad
   { 114, { 100, 0, 0, 0, 0 } },
-  // Foe Requiem
-  { 115, { 0, 0, 0, 0, 0 } },
   // Army's Paeon
   { 116, { 100, 0, 0, 0, 0 } },
   // Rain of Death
-  { 117, { 100, 0, 0, 0, 0 } },
+  { 117, { 130, 0, 0, 0, 0 } },
   // Battle Voice
   { 118, { 0, 0, 0, 0, 0 } },
   // Stone
@@ -186,12 +152,10 @@ ActionLut::Lut ActionLut::m_actionLut =
   { 125, { 0, 0, 0, 0, 0 } },
   // Stone II
   { 127, { 200, 0, 0, 0, 0 } },
-  // Repose
-  { 128, { 0, 0, 0, 0, 0 } },
   // Cure III
   { 131, { 0, 0, 0, 0, 550 } },
   // Aero II
-  { 132, { 50, 0, 0, 0, 0 } },
+  { 132, { 60, 0, 0, 0, 0 } },
   // Medica II
   { 133, { 0, 0, 0, 0, 200 } },
   // Fluid Aura
@@ -201,9 +165,9 @@ ActionLut::Lut ActionLut::m_actionLut =
   // Presence of Mind
   { 136, { 0, 0, 0, 0, 0 } },
   // Regen
-  { 137, { 0, 0, 0, 0, 150 } },
+  { 137, { 0, 0, 0, 0, 200 } },
   // Holy
-  { 139, { 200, 0, 0, 0, 0 } },
+  { 139, { 140, 0, 0, 0, 0 } },
   // Benediction
   { 140, { 0, 0, 0, 0, 0 } },
   // Fire
@@ -232,56 +196,44 @@ ActionLut::Lut ActionLut::m_actionLut =
   { 156, { 100, 0, 0, 0, 0 } },
   // Manaward
   { 157, { 0, 0, 0, 0, 0 } },
-  // Convert
+  // Manafont
   { 158, { 0, 0, 0, 0, 0 } },
   // Freeze
   { 159, { 100, 0, 0, 0, 0 } },
   // Flare
   { 162, { 260, 0, 0, 0, 0 } },
   // Ruin
-  { 163, { 100, 0, 0, 0, 0 } },
+  { 163, { 80, 0, 0, 0, 0 } },
   // Bio
   { 164, { 0, 0, 0, 0, 0 } },
   // Summon
   { 165, { 0, 0, 0, 0, 0 } },
   // Aetherflow
   { 166, { 0, 0, 0, 0, 0 } },
-  // Energy Drain
-  { 167, { 150, 0, 0, 0, 0 } },
   // Miasma
   { 168, { 20, 0, 0, 0, 0 } },
   // Summon II
   { 170, { 0, 0, 0, 0, 0 } },
-  // Sustain
-  { 171, { 0, 0, 0, 0, 0 } },
   // Ruin II
-  { 172, { 100, 0, 0, 0, 0 } },
+  { 172, { 80, 0, 0, 0, 0 } },
   // Resurrection
   { 173, { 0, 0, 0, 0, 0 } },
   // Bane
   { 174, { 0, 0, 0, 0, 0 } },
-  // Rouse
-  { 176, { 0, 0, 0, 0, 0 } },
-  // Miasma II
-  { 177, { 100, 0, 0, 0, 0 } },
   // Bio II
   { 178, { 0, 0, 0, 0, 0 } },
-  // Shadow Flare
-  { 179, { 50, 0, 0, 0, 0 } },
   // Summon III
   { 180, { 0, 0, 0, 0, 0 } },
   // Fester
-  { 181, { 150, 0, 0, 0, 0 } },
-  // Tri-bind
-  { 182, { 30, 0, 0, 0, 0 } },
+  { 181, { 100, 0, 0, 0, 0 } },
   // Enkindle
   { 184, { 0, 0, 0, 0, 0 } },
   // Adloquium
   { 185, { 0, 0, 0, 0, 300 } },
   // Succor
-  { 186, { 0, 0, 0, 0, 150 } },
+  { 186, { 0, 0, 0, 0, 180 } },
   // Sacred Soil
-  { 188, { 0, 0, 0, 0, 0 } },
+  { 188, { 0, 0, 0, 0, 100 } },
   // Lustrate
   { 189, { 0, 0, 0, 0, 600 } },
   // Physick
@@ -317,7 +269,7 @@ ActionLut::Lut ActionLut::m_actionLut =
   // attack
   { 1533, { 0, 0, 0, 0, 0 } },
   // Spinning Edge
-  { 2240, { 150, 0, 0, 0, 0 } },
+  { 2240, { 200, 0, 0, 0, 0 } },
   // Shade Shift
   { 2241, { 0, 0, 0, 0, 0 } },
   // Gust Slash
@@ -329,19 +281,15 @@ ActionLut::Lut ActionLut::m_actionLut =
   // Throwing Dagger
   { 2247, { 120, 0, 0, 0, 0 } },
   // Mug
-  { 2248, { 140, 0, 0, 0, 0 } },
-  // Hide
-  { 2253, { 0, 0, 0, 0, 0 } },
+  { 2248, { 150, 0, 0, 0, 0 } },
   // Death Blossom
-  { 2254, { 110, 0, 0, 0, 0 } },
+  { 2254, { 120, 0, 0, 0, 0 } },
   // Aeolian Edge
   { 2255, { 100, 0, 0, 160, 0 } },
-  // Jugulate
-  { 2256, { 80, 0, 0, 0, 0 } },
   // Shadow Fang
   { 2257, { 100, 0, 0, 0, 0 } },
   // Trick Attack
-  { 2258, { 240, 0, 0, 400, 0 } },
+  { 2258, { 340, 0, 0, 500, 0 } },
   // Ten
   { 2259, { 0, 0, 0, 0, 0 } },
   // Ninjutsu
@@ -355,11 +303,11 @@ ActionLut::Lut ActionLut::m_actionLut =
   // Kassatsu
   { 2264, { 0, 0, 0, 0, 0 } },
   // Fuma Shuriken
-  { 2265, { 240, 0, 0, 0, 0 } },
+  { 2265, { 280, 0, 0, 0, 0 } },
   // Katon
   { 2266, { 250, 0, 0, 0, 0 } },
   // Raiton
-  { 2267, { 360, 0, 0, 0, 0 } },
+  { 2267, { 400, 0, 0, 0, 0 } },
   // Hyoton
   { 2268, { 140, 0, 0, 0, 0 } },
   // Huton
@@ -367,55 +315,35 @@ ActionLut::Lut ActionLut::m_actionLut =
   // Doton
   { 2270, { 45, 0, 0, 0, 0 } },
   // Suiton
-  { 2271, { 180, 0, 0, 0, 0 } },
+  { 2271, { 130, 0, 0, 0, 0 } },
   // Rabbit Medium
   { 2272, { 0, 0, 0, 0, 0 } },
   // Rook Autoturret
   { 2864, { 80, 0, 0, 0, 0 } },
-  // Bishop Autoturret
-  { 2865, { 60, 0, 0, 0, 0 } },
   // Split Shot
   { 2866, { 160, 0, 0, 0, 0 } },
-  // Reload
-  { 2867, { 0, 0, 0, 0, 0 } },
   // Slug Shot
   { 2868, { 100, 0, 0, 0, 0 } },
   // Spread Shot
-  { 2870, { 80, 0, 0, 0, 0 } },
+  { 2870, { 180, 0, 0, 0, 0 } },
   // Hot Shot
-  { 2872, { 120, 0, 0, 0, 0 } },
+  { 2872, { 300, 0, 0, 0, 0 } },
   // Clean Shot
   { 2873, { 100, 0, 0, 0, 0 } },
   // Gauss Round
-  { 2874, { 210, 0, 0, 0, 0 } },
-  // Heartbreak
-  { 2875, { 240, 0, 0, 0, 0 } },
+  { 2874, { 150, 0, 0, 0, 0 } },
   // Reassemble
   { 2876, { 0, 0, 0, 0, 0 } },
   // Wildfire
   { 2878, { 0, 0, 0, 0, 0 } },
-  // Quick Reload
-  { 2879, { 0, 0, 0, 0, 0 } },
-  // Gauss Barrel
-  { 2880, { 0, 0, 0, 0, 0 } },
-  // Rapid Fire
-  { 2881, { 0, 0, 0, 0, 0 } },
-  // Hypercharge
-  { 2885, { 0, 0, 0, 0, 0 } },
-  // Dismantle
-  { 2887, { 0, 0, 0, 0, 0 } },
-  // Blank
-  { 2888, { 0, 0, 0, 0, 0 } },
   // Ricochet
-  { 2890, { 320, 0, 0, 0, 0 } },
+  { 2890, { 150, 0, 0, 0, 0 } },
   // Raiton
   { 3203, { 0, 0, 0, 0, 0 } },
   // Raiton
   { 3204, { 0, 0, 0, 0, 0 } },
   // Kanashibari
   { 3207, { 0, 0, 0, 0, 0 } },
-  // Turret Retrieval
-  { 3487, { 0, 0, 0, 0, 0 } },
   // Goring Blade
   { 3538, { 100, 0, 0, 0, 0 } },
   // Royal Authority
@@ -428,20 +356,16 @@ ActionLut::Lut ActionLut::m_actionLut =
   { 3542, { 0, 0, 0, 0, 0 } },
   // Tornado Kick
   { 3543, { 330, 0, 0, 0, 0 } },
-  // Purification
-  { 3544, { 0, 0, 0, 0, 0 } },
   // Elixir Field
-  { 3545, { 220, 0, 0, 0, 0 } },
+  { 3545, { 200, 0, 0, 0, 0 } },
   // Meditation
   { 3546, { 0, 0, 0, 0, 0 } },
   // the Forbidden Chakra
-  { 3547, { 250, 0, 0, 0, 0 } },
-  // Deliverance
-  { 3548, { 0, 0, 0, 0, 0 } },
+  { 3547, { 370, 0, 0, 0, 0 } },
   // Fell Cleave
-  { 3549, { 520, 0, 0, 0, 0 } },
+  { 3549, { 590, 0, 0, 0, 0 } },
   // Decimate
-  { 3550, { 280, 0, 0, 0, 0 } },
+  { 3550, { 250, 0, 0, 0, 0 } },
   // Raw Intuition
   { 3551, { 0, 0, 0, 0, 0 } },
   // Equilibrium
@@ -449,11 +373,11 @@ ActionLut::Lut ActionLut::m_actionLut =
   // Blood of the Dragon
   { 3553, { 0, 0, 0, 0, 0 } },
   // Fang and Claw
-  { 3554, { 260, 300, 0, 0, 0 } },
+  { 3554, { 320, 360, 0, 0, 0 } },
   // Geirskogul
-  { 3555, { 230, 0, 0, 0, 0 } },
+  { 3555, { 270, 0, 0, 0, 0 } },
   // Wheeling Thrust
-  { 3556, { 260, 0, 0, 300, 0 } },
+  { 3556, { 320, 0, 0, 360, 0 } },
   // Battle Litany
   { 3557, { 0, 0, 0, 0, 0 } },
   // Empyreal Arrow
@@ -468,24 +392,16 @@ ActionLut::Lut ActionLut::m_actionLut =
   { 3562, { 100, 0, 0, 0, 0 } },
   // Armor Crush
   { 3563, { 100, 160, 0, 0, 0 } },
-  // Shadewalker
-  { 3564, { 0, 0, 0, 0, 0 } },
-  // Smoke Screen
-  { 3565, { 0, 0, 0, 0, 0 } },
   // Dream Within a Dream
-  { 3566, { 150, 0, 0, 0, 0 } },
-  // Duality
-  { 3567, { 0, 0, 0, 0, 0 } },
+  { 3566, { 200, 0, 0, 0, 0 } },
   // Stone III
-  { 3568, { 210, 0, 0, 0, 0 } },
+  { 3568, { 240, 0, 0, 0, 0 } },
   // Asylum
   { 3569, { 0, 0, 0, 0, 100 } },
   // Tetragrammaton
   { 3570, { 0, 0, 0, 0, 700 } },
   // Assize
   { 3571, { 400, 0, 0, 0, 400 } },
-  // Aero III
-  { 3572, { 50, 0, 0, 0, 0 } },
   // Ley Lines
   { 3573, { 0, 0, 0, 0, 0 } },
   // Sharpcast
@@ -493,13 +409,13 @@ ActionLut::Lut ActionLut::m_actionLut =
   // Enochian
   { 3575, { 0, 0, 0, 0, 0 } },
   // Blizzard IV
-  { 3576, { 260, 0, 0, 0, 0 } },
+  { 3576, { 300, 0, 0, 0, 0 } },
   // Fire IV
   { 3577, { 300, 0, 0, 0, 0 } },
   // Painflare
-  { 3578, { 180, 0, 0, 0, 0 } },
+  { 3578, { 150, 0, 0, 0, 0 } },
   // Ruin III
-  { 3579, { 120, 0, 0, 0, 0 } },
+  { 3579, { 100, 0, 0, 0, 0 } },
   // Tri-disaster
   { 3580, { 0, 0, 0, 0, 0 } },
   // Dreadwyrm Trance
@@ -507,9 +423,9 @@ ActionLut::Lut ActionLut::m_actionLut =
   // Deathflare
   { 3582, { 400, 0, 0, 0, 0 } },
   // Indomitability
-  { 3583, { 0, 0, 0, 0, 500 } },
+  { 3583, { 0, 0, 0, 0, 400 } },
   // Broil
-  { 3584, { 190, 0, 0, 0, 0 } },
+  { 3584, { 240, 0, 0, 0, 0 } },
   // Deployment Tactics
   { 3585, { 0, 0, 0, 0, 0 } },
   // Emergency Tactics
@@ -518,10 +434,6 @@ ActionLut::Lut ActionLut::m_actionLut =
   { 3587, { 0, 0, 0, 0, 0 } },
   // Draw
   { 3590, { 0, 0, 0, 0, 0 } },
-  // Royal Road
-  { 3591, { 0, 0, 0, 0, 0 } },
-  // Spread
-  { 3592, { 0, 0, 0, 0, 0 } },
   // Redraw
   { 3593, { 0, 0, 0, 0, 0 } },
   // Benefic
@@ -531,13 +443,13 @@ ActionLut::Lut ActionLut::m_actionLut =
   // Malefic
   { 3596, { 150, 0, 0, 0, 0 } },
   // Malefic II
-  { 3598, { 180, 0, 0, 0, 0 } },
+  { 3598, { 170, 0, 0, 0, 0 } },
   // Combust
   { 3599, { 0, 0, 0, 0, 0 } },
   // Helios
-  { 3600, { 0, 0, 0, 0, 300 } },
+  { 3600, { 0, 0, 0, 0, 330 } },
   // Aspected Helios
-  { 3601, { 0, 0, 0, 0, 200 } },
+  { 3601, { 0, 0, 0, 0, 100 } },
   // Ascend
   { 3603, { 0, 0, 0, 0, 0 } },
   // Diurnal Sect
@@ -549,61 +461,43 @@ ActionLut::Lut ActionLut::m_actionLut =
   // Combust II
   { 3608, { 0, 0, 0, 0, 0 } },
   // Benefic II
-  { 3610, { 0, 0, 0, 0, 650 } },
-  // Time Dilation
-  { 3611, { 0, 0, 0, 0, 0 } },
+  { 3610, { 0, 0, 0, 0, 700 } },
   // Synastry
   { 3612, { 0, 0, 0, 0, 0 } },
   // Collective Unconscious
-  { 3613, { 0, 0, 0, 0, 150 } },
+  { 3613, { 0, 0, 0, 0, 50 } },
   // Essential Dignity
   { 3614, { 0, 0, 0, 0, 400 } },
   // Gravity
-  { 3615, { 200, 0, 0, 0, 0 } },
-  // Celestial Opposition
-  { 3616, { 0, 0, 0, 0, 0 } },
+  { 3615, { 130, 0, 0, 0, 0 } },
   // Hard Slash
-  { 3617, { 150, 0, 0, 0, 0 } },
-  // Spinning Slash
-  { 3619, { 100, 0, 0, 0, 0 } },
+  { 3617, { 200, 0, 0, 0, 0 } },
   // Unleash
-  { 3621, { 50, 0, 0, 0, 0 } },
+  { 3621, { 150, 0, 0, 0, 0 } },
   // Syphon Strike
   { 3623, { 100, 0, 0, 0, 0 } },
   // Unmend
   { 3624, { 150, 0, 0, 0, 0 } },
   // Blood Weapon
   { 3625, { 0, 0, 0, 0, 0 } },
-  // Power Slash
-  { 3627, { 100, 0, 0, 0, 0 } },
-  // Darkside
-  { 3628, { 0, 0, 0, 0, 0 } },
   // Grit
   { 3629, { 0, 0, 0, 0, 0 } },
-  // Blood Price
-  { 3631, { 0, 0, 0, 0, 0 } },
   // Souleater
-  { 3632, { 100, 0, 0, 0, 0 } },
-  // Dark Passenger
-  { 3633, { 140, 0, 0, 0, 0 } },
+  { 3632, { 100, 0, 0, 0, 300 } },
   // Dark Mind
   { 3634, { 0, 0, 0, 0, 0 } },
-  // Dark Arts
-  { 3635, { 0, 0, 0, 0, 0 } },
   // Shadow Wall
   { 3636, { 0, 0, 0, 0, 0 } },
   // Living Dead
   { 3638, { 0, 0, 0, 0, 0 } },
   // Salted Earth
-  { 3639, { 75, 0, 0, 0, 0 } },
+  { 3639, { 60, 0, 0, 0, 0 } },
   // Plunge
   { 3640, { 200, 0, 0, 0, 0 } },
   // Abyssal Drain
-  { 3641, { 120, 0, 0, 0, 0 } },
-  // Sole Survivor
-  { 3642, { 0, 0, 0, 0, 0 } },
+  { 3641, { 200, 0, 0, 0, 200 } },
   // Carve and Spit
-  { 3643, { 100, 0, 0, 0, 0 } },
+  { 3643, { 450, 0, 0, 0, 0 } },
   // Big Shot
   { 4238, { 0, 0, 0, 0, 0 } },
   // Desperado
@@ -632,56 +526,16 @@ ActionLut::Lut ActionLut::m_actionLut =
   { 4271, { 0, 0, 0, 0, 0 } },
   // the Balance
   { 4401, { 0, 0, 0, 0, 0 } },
-  // the Bole
-  { 4402, { 0, 0, 0, 0, 0 } },
   // the Arrow
-  { 4403, { 0, 0, 0, 0, 0 } },
+  { 4402, { 0, 0, 0, 0, 0 } },
   // the Spear
+  { 4403, { 0, 0, 0, 0, 0 } },
+  // the Bole
   { 4404, { 0, 0, 0, 0, 0 } },
   // the Ewer
   { 4405, { 0, 0, 0, 0, 0 } },
   // the Spire
   { 4406, { 0, 0, 0, 0, 0 } },
-  // the Balance
-  { 4407, { 0, 0, 0, 0, 0 } },
-  // the Bole
-  { 4408, { 0, 0, 0, 0, 0 } },
-  // the Arrow
-  { 4409, { 0, 0, 0, 0, 0 } },
-  // the Spear
-  { 4410, { 0, 0, 0, 0, 0 } },
-  // the Ewer
-  { 4411, { 0, 0, 0, 0, 0 } },
-  // the Spire
-  { 4412, { 0, 0, 0, 0, 0 } },
-  // the Balance
-  { 4413, { 0, 0, 0, 0, 0 } },
-  // the Bole
-  { 4414, { 0, 0, 0, 0, 0 } },
-  // the Arrow
-  { 4415, { 0, 0, 0, 0, 0 } },
-  // the Spear
-  { 4416, { 0, 0, 0, 0, 0 } },
-  // the Ewer
-  { 4417, { 0, 0, 0, 0, 0 } },
-  // the Spire
-  { 4418, { 0, 0, 0, 0, 0 } },
-  // the Balance
-  { 4419, { 0, 0, 0, 0, 0 } },
-  // the Bole
-  { 4420, { 0, 0, 0, 0, 0 } },
-  // the Arrow
-  { 4421, { 0, 0, 0, 0, 0 } },
-  // the Spear
-  { 4422, { 0, 0, 0, 0, 0 } },
-  // the Ewer
-  { 4423, { 0, 0, 0, 0, 0 } },
-  // the Spire
-  { 4424, { 0, 0, 0, 0, 0 } },
-  // Empty Road
-  { 4645, { 0, 0, 0, 0, 0 } },
-  // Undraw Spread
-  { 4646, { 0, 0, 0, 0, 0 } },
   // Raiton
   { 4977, { 0, 0, 0, 0, 0 } },
   // Raiton
@@ -695,19 +549,19 @@ ActionLut::Lut ActionLut::m_actionLut =
   // Void Fire II
   { 6274, { 0, 0, 0, 0, 0 } },
   // Total Eclipse
-  { 7381, { 110, 0, 0, 0, 0 } },
+  { 7381, { 120, 0, 0, 0, 0 } },
   // Intervention
   { 7382, { 0, 0, 0, 0, 0 } },
   // Requiescat
-  { 7383, { 350, 0, 0, 0, 0 } },
+  { 7383, { 550, 0, 0, 0, 0 } },
   // Holy Spirit
-  { 7384, { 380, 0, 0, 0, 0 } },
+  { 7384, { 350, 0, 0, 0, 0 } },
   // Passage of Arms
   { 7385, { 0, 0, 0, 0, 0 } },
   // Onslaught
   { 7386, { 100, 0, 0, 0, 0 } },
   // Upheaval
-  { 7387, { 300, 0, 0, 0, 0 } },
+  { 7387, { 450, 0, 0, 0, 0 } },
   // Shake It Off
   { 7388, { 0, 0, 0, 0, 0 } },
   // Inner Release
@@ -715,9 +569,9 @@ ActionLut::Lut ActionLut::m_actionLut =
   // Delirium
   { 7390, { 0, 0, 0, 0, 0 } },
   // Quietus
-  { 7391, { 160, 0, 0, 0, 0 } },
+  { 7391, { 210, 0, 0, 0, 0 } },
   // Bloodspiller
-  { 7392, { 400, 0, 0, 0, 0 } },
+  { 7392, { 600, 0, 0, 0, 0 } },
   // The Blackest Night
   { 7393, { 0, 0, 0, 0, 0 } },
   // Riddle of Earth
@@ -731,13 +585,13 @@ ActionLut::Lut ActionLut::m_actionLut =
   // Dragon Sight
   { 7398, { 0, 0, 0, 0, 0 } },
   // Mirage Dive
-  { 7399, { 210, 0, 0, 0, 0 } },
+  { 7399, { 250, 0, 0, 0, 0 } },
   // Nastrond
-  { 7400, { 330, 0, 0, 0, 0 } },
+  { 7400, { 400, 0, 0, 0, 0 } },
   // Hellfrog Medium
   { 7401, { 400, 0, 0, 0, 0 } },
   // Bhavacakra
-  { 7402, { 600, 0, 0, 0, 0 } },
+  { 7402, { 500, 0, 0, 0, 0 } },
   // Ten Chi Jin
   { 7403, { 0, 0, 0, 0, 0 } },
   // Pitch Perfect
@@ -745,17 +599,17 @@ ActionLut::Lut ActionLut::m_actionLut =
   // Troubadour
   { 7405, { 0, 0, 0, 0, 0 } },
   // Caustic Bite
-  { 7406, { 120, 0, 0, 0, 0 } },
+  { 7406, { 150, 0, 0, 0, 0 } },
   // Stormbite
-  { 7407, { 120, 0, 0, 0, 0 } },
+  { 7407, { 100, 0, 0, 0, 0 } },
   // Nature's Minne
   { 7408, { 0, 0, 0, 0, 0 } },
   // Refulgent Arrow
-  { 7409, { 300, 0, 0, 0, 0 } },
-  // Cooldown
-  { 7410, { 150, 0, 0, 0, 0 } },
+  { 7409, { 340, 0, 0, 0, 0 } },
+  // Heat Blast
+  { 7410, { 200, 0, 0, 0, 0 } },
   // Heated Split Shot
-  { 7411, { 190, 0, 0, 0, 0 } },
+  { 7411, { 200, 0, 0, 0, 0 } },
   // Heated Slug Shot
   { 7412, { 100, 0, 0, 0, 0 } },
   // Heated Clean Shot
@@ -779,9 +633,9 @@ ActionLut::Lut ActionLut::m_actionLut =
   // Bio III
   { 7424, { 0, 0, 0, 0, 0 } },
   // Miasma III
-  { 7425, { 50, 0, 0, 0, 0 } },
+  { 7425, { 40, 0, 0, 0, 0 } },
   // Ruin IV
-  { 7426, { 200, 0, 0, 0, 0 } },
+  { 7426, { 120, 0, 0, 0, 0 } },
   // Summon Bahamut
   { 7427, { 0, 0, 0, 0, 0 } },
   // Enkindle Bahamut
@@ -789,35 +643,35 @@ ActionLut::Lut ActionLut::m_actionLut =
   // Thin Air
   { 7430, { 0, 0, 0, 0, 0 } },
   // Stone IV
-  { 7431, { 250, 0, 0, 0, 0 } },
+  { 7431, { 280, 0, 0, 0, 0 } },
   // Divine Benison
   { 7432, { 0, 0, 0, 0, 0 } },
   // Plenary Indulgence
-  { 7433, { 0, 0, 0, 0, 0 } },
+  { 7433, { 0, 0, 0, 0, 200 } },
   // Excogitation
   { 7434, { 0, 0, 0, 0, 800 } },
   // Broil II
-  { 7435, { 230, 0, 0, 0, 0 } },
+  { 7435, { 260, 0, 0, 0, 0 } },
   // Chain Stratagem
   { 7436, { 0, 0, 0, 0, 0 } },
   // Aetherpact
   { 7437, { 0, 0, 0, 0, 0 } },
   // Earthly Star
-  { 7439, { 150, 0, 0, 0, 540 } },
+  { 7439, { 100, 0, 0, 0, 540 } },
   // Malefic III
-  { 7442, { 220, 0, 0, 0, 0 } },
+  { 7442, { 210, 0, 0, 0, 0 } },
   // Minor Arcana
   { 7443, { 0, 0, 0, 0, 0 } },
   // Lord of Crowns
-  { 7444, { 300, 0, 0, 0, 0 } },
+  { 7444, { 0, 0, 0, 0, 0 } },
   // Lady of Crowns
-  { 7445, { 0, 0, 0, 0, 500 } },
+  { 7445, { 0, 0, 0, 0, 0 } },
   // Thunder II
   { 7447, { 30, 0, 0, 0, 0 } },
   // Sleeve Draw
   { 7448, { 0, 0, 0, 0, 0 } },
   // Hakaze
-  { 7477, { 150, 0, 0, 0, 0 } },
+  { 7477, { 170, 0, 0, 0, 0 } },
   // Jinpu
   { 7478, { 100, 0, 0, 0, 0 } },
   // Shifu
@@ -837,13 +691,13 @@ ActionLut::Lut ActionLut::m_actionLut =
   // Enpi
   { 7486, { 100, 0, 0, 0, 0 } },
   // Midare Setsugekka
-  { 7487, { 720, 0, 0, 0, 0 } },
+  { 7487, { 800, 0, 0, 0, 0 } },
   // Tenka Goken
   { 7488, { 360, 0, 0, 0, 0 } },
   // Higanbana
-  { 7489, { 240, 0, 0, 0, 0 } },
+  { 7489, { 250, 0, 0, 0, 0 } },
   // Hissatsu: Shinten
-  { 7490, { 300, 0, 0, 0, 0 } },
+  { 7490, { 320, 0, 0, 0, 0 } },
   // Hissatsu: Kyuten
   { 7491, { 150, 0, 0, 0, 0 } },
   // Hissatsu: Gyoten
@@ -852,20 +706,16 @@ ActionLut::Lut ActionLut::m_actionLut =
   { 7493, { 100, 0, 0, 0, 0 } },
   // Hissatsu: Kaiten
   { 7494, { 0, 0, 0, 0, 0 } },
-  // Hagakure
-  { 7495, { 0, 0, 0, 0, 0 } },
   // Hissatsu: Guren
-  { 7496, { 800, 0, 0, 0, 0 } },
+  { 7496, { 850, 0, 0, 0, 0 } },
   // Meditate
   { 7497, { 0, 0, 0, 0, 0 } },
   // Third Eye
   { 7498, { 0, 0, 0, 0, 0 } },
   // Meikyo Shisui
   { 7499, { 0, 0, 0, 0, 0 } },
-  // Ageha
-  { 7500, { 250, 0, 0, 0, 0 } },
   // Hissatsu: Seigan
-  { 7501, { 200, 0, 0, 0, 0 } },
+  { 7501, { 220, 0, 0, 0, 0 } },
   // Merciful Eyes
   { 7502, { 0, 0, 0, 0, 200 } },
   // Jolt
@@ -878,10 +728,8 @@ ActionLut::Lut ActionLut::m_actionLut =
   { 7506, { 130, 0, 0, 0, 0 } },
   // Veraero
   { 7507, { 310, 0, 0, 0, 0 } },
-  // Tether
-  { 7508, { 0, 0, 0, 0, 0 } },
   // Scatter
-  { 7509, { 100, 0, 0, 0, 0 } },
+  { 7509, { 120, 0, 0, 0, 0 } },
   // Verfire
   { 7510, { 270, 0, 0, 0, 0 } },
   // Verstone
@@ -893,7 +741,7 @@ ActionLut::Lut ActionLut::m_actionLut =
   // Vercure
   { 7514, { 0, 0, 0, 0, 350 } },
   // Displacement
-  { 7515, { 130, 0, 0, 0, 0 } },
+  { 7515, { 0, 0, 0, 0, 0 } },
   // Redoublement
   { 7516, { 100, 0, 0, 0, 0 } },
   // Fleche
@@ -906,12 +754,10 @@ ActionLut::Lut ActionLut::m_actionLut =
   { 7520, { 0, 0, 0, 0, 0 } },
   // Manafication
   { 7521, { 0, 0, 0, 0, 0 } },
-  // Impact
-  { 7522, { 270, 0, 0, 0, 0 } },
   // Verraise
   { 7523, { 0, 0, 0, 0, 0 } },
   // Jolt II
-  { 7524, { 240, 0, 0, 0, 0 } },
+  { 7524, { 250, 0, 0, 0, 0 } },
   // Verflare
   { 7525, { 600, 0, 0, 0, 0 } },
   // Verholy
@@ -934,22 +780,14 @@ ActionLut::Lut ActionLut::m_actionLut =
   { 7622, { 0, 0, 0, 0, 0 } },
   // Doom of the Living
   { 7861, { 0, 0, 0, 0, 0 } },
-  // Vermillion Scourge
+  // Vermilion Scourge
   { 7862, { 0, 0, 0, 0, 0 } },
-  // Earth Tackle
-  { 7864, { 100, 0, 0, 0, 0 } },
-  // Wind Tackle
-  { 7865, { 65, 0, 0, 0, 0 } },
-  // Fire Tackle
-  { 7866, { 130, 0, 0, 0, 0 } },
   // Iaijutsu
   { 7867, { 0, 0, 0, 0, 0 } },
-  // Riddle of Wind
-  { 7868, { 65, 0, 0, 0, 0 } },
   // Dissolve Union
   { 7869, { 0, 0, 0, 0, 0 } },
   // Stellar Detonation
-  { 8324, { 150, 0, 0, 0, 540 } },
+  { 8324, { 100, 0, 0, 0, 540 } },
   // Broken Ridge
   { 8395, { 0, 0, 0, 0, 0 } },
   // Magitek Pulse
@@ -1096,11 +934,11 @@ ActionLut::Lut ActionLut::m_actionLut =
   { 11482, { 30, 0, 0, 0, 0 } },
   // attack
   { 11784, { 0, 0, 0, 0, 0 } },
-  // Stone of the Seventh Dawn
+  // Stone IV of the Seventh Dawn
   { 13423, { 140, 0, 0, 0, 0 } },
-  // Aero of the Seventh Dawn
+  // Aero II of the Seventh Dawn
   { 13424, { 50, 0, 0, 0, 0 } },
-  // Cure of the Seventh Dawn
+  // Cure II of the Seventh Dawn
   { 13425, { 0, 0, 0, 0, 700 } },
   // Aetherwell
   { 13426, { 0, 0, 0, 0, 0 } },
@@ -1116,5 +954,453 @@ ActionLut::Lut ActionLut::m_actionLut =
   { 14843, { 0, 0, 0, 0, 0 } },
   // Second Wind
   { 15375, { 0, 0, 0, 0, 500 } },
+  // Interject
+  { 15537, { 0, 0, 0, 0, 0 } },
+  // Fight or Flight
+  { 15870, { 0, 0, 0, 0, 0 } },
+  // Cascade
+  { 15989, { 200, 0, 0, 0, 0 } },
+  // Fountain
+  { 15990, { 100, 0, 0, 0, 0 } },
+  // Reverse Cascade
+  { 15991, { 300, 0, 0, 0, 0 } },
+  // Fountainfall
+  { 15992, { 350, 0, 0, 0, 0 } },
+  // Windmill
+  { 15993, { 150, 0, 0, 0, 0 } },
+  // Bladeshower
+  { 15994, { 100, 0, 0, 0, 0 } },
+  // Rising Windmill
+  { 15995, { 250, 0, 0, 0, 0 } },
+  // Bloodshower
+  { 15996, { 300, 0, 0, 0, 0 } },
+  // Standard Step
+  { 15997, { 0, 0, 0, 0, 0 } },
+  // Technical Step
+  { 15998, { 0, 0, 0, 0, 0 } },
+  // Emboite
+  { 15999, { 0, 0, 0, 0, 0 } },
+  // Entrechat
+  { 16000, { 0, 0, 0, 0, 0 } },
+  // Jete
+  { 16001, { 0, 0, 0, 0, 0 } },
+  // Pirouette
+  { 16002, { 0, 0, 0, 0, 0 } },
+  // Standard Finish
+  { 16003, { 0, 0, 0, 0, 0 } },
+  // Technical Finish
+  { 16004, { 0, 0, 0, 0, 0 } },
+  // Saber Dance
+  { 16005, { 600, 0, 0, 0, 0 } },
+  // Closed Position
+  { 16006, { 0, 0, 0, 0, 0 } },
+  // Fan Dance
+  { 16007, { 150, 0, 0, 0, 0 } },
+  // Fan Dance II
+  { 16008, { 100, 0, 0, 0, 0 } },
+  // Fan Dance III
+  { 16009, { 200, 0, 0, 0, 0 } },
+  // En Avant
+  { 16010, { 0, 0, 0, 0, 0 } },
+  // Devilment
+  { 16011, { 0, 0, 0, 0, 0 } },
+  // Shield Samba
+  { 16012, { 0, 0, 0, 0, 0 } },
+  // Flourish
+  { 16013, { 0, 0, 0, 0, 0 } },
+  // Improvisation
+  { 16014, { 0, 0, 0, 0, 0 } },
+  // Curing Waltz
+  { 16015, { 0, 0, 0, 0, 200 } },
+  // Keen Edge
+  { 16137, { 200, 0, 0, 0, 0 } },
+  // No Mercy
+  { 16138, { 0, 0, 0, 0, 0 } },
+  // Brutal Shell
+  { 16139, { 100, 0, 0, 0, 150 } },
+  // Camouflage
+  { 16140, { 0, 0, 0, 0, 0 } },
+  // Demon Slice
+  { 16141, { 150, 0, 0, 0, 0 } },
+  // Royal Guard
+  { 16142, { 0, 0, 0, 0, 0 } },
+  // Lightning Shot
+  { 16143, { 150, 0, 0, 0, 0 } },
+  // Danger Zone
+  { 16144, { 350, 0, 0, 0, 0 } },
+  // Solid Barrel
+  { 16145, { 100, 0, 0, 0, 0 } },
+  // Gnashing Fang
+  { 16146, { 450, 0, 0, 0, 0 } },
+  // Savage Claw
+  { 16147, { 550, 0, 0, 0, 0 } },
+  // Nebula
+  { 16148, { 0, 0, 0, 0, 0 } },
+  // Demon Slaughter
+  { 16149, { 100, 0, 0, 0, 0 } },
+  // Wicked Talon
+  { 16150, { 650, 0, 0, 0, 0 } },
+  // Aurora
+  { 16151, { 0, 0, 0, 0, 200 } },
+  // Superbolide
+  { 16152, { 0, 0, 0, 0, 0 } },
+  // Sonic Break
+  { 16153, { 300, 0, 0, 0, 0 } },
+  // Rough Divide
+  { 16154, { 200, 0, 0, 0, 0 } },
+  // Continuation
+  { 16155, { 0, 0, 0, 0, 0 } },
+  // Jugular Rip
+  { 16156, { 260, 0, 0, 0, 0 } },
+  // Abdomen Tear
+  { 16157, { 280, 0, 0, 0, 0 } },
+  // Eye Gouge
+  { 16158, { 300, 0, 0, 0, 0 } },
+  // Bow Shock
+  { 16159, { 200, 0, 0, 0, 0 } },
+  // Heart of Light
+  { 16160, { 0, 0, 0, 0, 0 } },
+  // Heart of Stone
+  { 16161, { 0, 0, 0, 0, 0 } },
+  // Burst Strike
+  { 16162, { 500, 0, 0, 0, 0 } },
+  // Fated Circle
+  { 16163, { 320, 0, 0, 0, 0 } },
+  // Bloodfest
+  { 16164, { 0, 0, 0, 0, 0 } },
+  // Blasting Zone
+  { 16165, { 800, 0, 0, 0, 0 } },
+  // Single Standard Finish
+  { 16191, { 0, 0, 0, 0, 0 } },
+  // Double Standard Finish
+  { 16192, { 0, 0, 0, 0, 0 } },
+  // Single Technical Finish
+  { 16193, { 0, 0, 0, 0, 0 } },
+  // Double Technical Finish
+  { 16194, { 0, 0, 0, 0, 0 } },
+  // Triple Technical Finish
+  { 16195, { 0, 0, 0, 0, 0 } },
+  // Quadruple Technical Finish
+  { 16196, { 0, 0, 0, 0, 0 } },
+  // Physick
+  { 16230, { 0, 0, 0, 0, 400 } },
+  // Rightful Sword
+  { 16269, { 0, 0, 0, 0, 0 } },
+  // Brutal Shell
+  { 16418, { 0, 0, 0, 0, 0 } },
+  // Keen Edge
+  { 16434, { 0, 0, 0, 0, 0 } },
+  // Solid Barrel
+  { 16435, { 0, 0, 0, 0, 0 } },
+  // Soothing Potion
+  { 16436, { 0, 0, 0, 0, 0 } },
+  // Shining Blade
+  { 16437, { 0, 0, 0, 0, 0 } },
+  // Perfect Deception
+  { 16438, { 0, 0, 0, 0, 0 } },
+  // Leap of Faith
+  { 16439, { 0, 0, 0, 0, 0 } },
+  // Prominence
+  { 16457, { 100, 0, 0, 0, 0 } },
+  // Holy Circle
+  { 16458, { 250, 0, 0, 0, 0 } },
+  // Confiteor
+  { 16459, { 800, 0, 0, 0, 0 } },
+  // Atonement
+  { 16460, { 550, 0, 0, 0, 0 } },
+  // Intervene
+  { 16461, { 200, 0, 0, 0, 0 } },
+  // Mythril Tempest
+  { 16462, { 100, 0, 0, 0, 0 } },
+  // Chaotic Cyclone
+  { 16463, { 400, 0, 0, 0, 0 } },
+  // Nascent Flash
+  { 16464, { 0, 0, 0, 0, 0 } },
+  // Inner Chaos
+  { 16465, { 920, 0, 0, 0, 0 } },
+  // Flood of Darkness
+  { 16466, { 250, 0, 0, 0, 0 } },
+  // Edge of Darkness
+  { 16467, { 350, 0, 0, 0, 0 } },
+  // Stalwart Soul
+  { 16468, { 100, 0, 0, 0, 0 } },
+  // Flood of Shadow
+  { 16469, { 300, 0, 0, 0, 0 } },
+  // Edge of Shadow
+  { 16470, { 500, 0, 0, 0, 0 } },
+  // Dark Missionary
+  { 16471, { 0, 0, 0, 0, 0 } },
+  // Living Shadow
+  { 16472, { 0, 0, 0, 0, 0 } },
+  // Four-point Fury
+  { 16473, { 120, 0, 0, 0, 0 } },
+  // Enlightenment
+  { 16474, { 220, 0, 0, 0, 0 } },
+  // Anatman
+  { 16475, { 0, 0, 0, 0, 0 } },
+  // Six-sided Star
+  { 16476, { 400, 0, 0, 0, 0 } },
+  // Coerthan Torment
+  { 16477, { 100, 0, 0, 0, 0 } },
+  // High Jump
+  { 16478, { 400, 0, 0, 0, 0 } },
+  // Raiden Thrust
+  { 16479, { 330, 0, 0, 0, 0 } },
+  // Stardiver
+  { 16480, { 550, 0, 0, 0, 0 } },
+  // Hissatsu: Senei
+  { 16481, { 1100, 0, 0, 0, 0 } },
+  // Ikishoten
+  { 16482, { 0, 0, 0, 0, 0 } },
+  // Tsubame-gaeshi
+  { 16483, { 0, 0, 0, 0, 0 } },
+  // Kaeshi: Higanbana
+  { 16484, { 375, 0, 0, 0, 0 } },
+  // Kaeshi: Goken
+  { 16485, { 540, 0, 0, 0, 0 } },
+  // Kaeshi: Setsugekka
+  { 16486, { 1200, 0, 0, 0, 0 } },
+  // Shoha
+  { 16487, { 0, 0, 0, 0, 0 } },
+  // Hakke Mujinsatsu
+  { 16488, { 100, 0, 0, 0, 0 } },
+  // Meisui
+  { 16489, { 0, 0, 0, 0, 0 } },
+  // Goka Mekkyaku
+  { 16491, { 400, 0, 0, 0, 0 } },
+  // Hyosho Ranryu
+  { 16492, { 600, 0, 0, 0, 0 } },
+  // Bunshin
+  { 16493, { 0, 0, 0, 0, 0 } },
+  // Shadowbite
+  { 16494, { 100, 0, 0, 0, 0 } },
+  // Burst Shot
+  { 16495, { 230, 0, 0, 0, 0 } },
+  // Apex Arrow
+  { 16496, { 500, 0, 0, 0, 0 } },
+  // Auto Crossbow
+  { 16497, { 180, 0, 0, 0, 0 } },
+  // Drill
+  { 16498, { 700, 0, 0, 0, 0 } },
+  // Bioblaster
+  { 16499, { 60, 0, 0, 0, 0 } },
+  // Air Anchor
+  { 16500, { 700, 0, 0, 0, 0 } },
+  // Automaton Queen
+  { 16501, { 0, 0, 0, 0, 0 } },
+  // Queen Overdrive
+  { 16502, { 0, 0, 0, 0, 0 } },
+  // Despair
+  { 16505, { 380, 0, 0, 0, 0 } },
+  // Umbral Soul
+  { 16506, { 0, 0, 0, 0, 0 } },
+  // Xenoglossy
+  { 16507, { 750, 0, 0, 0, 0 } },
+  // Energy Drain
+  { 16508, { 100, 0, 0, 0, 0 } },
+  // Egi Assault
+  { 16509, { 0, 0, 0, 0, 0 } },
+  // Energy Siphon
+  { 16510, { 40, 0, 0, 0, 0 } },
+  // Outburst
+  { 16511, { 70, 0, 0, 0, 0 } },
+  // Egi Assault II
+  { 16512, { 0, 0, 0, 0, 0 } },
+  // Firebird Trance
+  { 16513, { 0, 0, 0, 0, 0 } },
+  // Fountain of Fire
+  { 16514, { 250, 0, 0, 0, 0 } },
+  // Brand of Purgatory
+  { 16515, { 350, 0, 0, 0, 0 } },
+  // Enkindle Phoenix
+  { 16516, { 0, 0, 0, 0, 0 } },
+  // Verthunder II
+  { 16524, { 0, 0, 0, 0, 0 } },
+  // Veraero II
+  { 16525, { 0, 0, 0, 0, 0 } },
+  // Impact
+  { 16526, { 220, 0, 0, 0, 0 } },
+  // Engagement
+  { 16527, { 150, 0, 0, 0, 0 } },
+  // Enchanted Reprise
+  { 16528, { 220, 0, 0, 0, 0 } },
+  // Reprise
+  { 16529, { 100, 0, 0, 0, 0 } },
+  // Scorch
+  { 16530, { 700, 0, 0, 0, 0 } },
+  // Afflatus Solace
+  { 16531, { 0, 0, 0, 0, 700 } },
+  // Dia
+  { 16532, { 120, 0, 0, 0, 0 } },
+  // Glare
+  { 16533, { 300, 0, 0, 0, 0 } },
+  // Afflatus Rapture
+  { 16534, { 0, 0, 0, 0, 300 } },
+  // Afflatus Misery
+  { 16535, { 900, 0, 0, 0, 0 } },
+  // Temperance
+  { 16536, { 0, 0, 0, 0, 0 } },
+  // Whispering Dawn
+  { 16537, { 0, 0, 0, 0, 0 } },
+  // Fey Illumination
+  { 16538, { 0, 0, 0, 0, 0 } },
+  // Art of War
+  { 16539, { 150, 0, 0, 0, 0 } },
+  // Biolysis
+  { 16540, { 0, 0, 0, 0, 0 } },
+  // Broil III
+  { 16541, { 280, 0, 0, 0, 0 } },
+  // Recitation
+  { 16542, { 0, 0, 0, 0, 0 } },
+  // Fey Blessing
+  { 16543, { 0, 0, 0, 0, 0 } },
+  // Summon Seraph
+  { 16545, { 0, 0, 0, 0, 0 } },
+  // Consolation
+  { 16546, { 0, 0, 0, 0, 0 } },
+  // Firebird Trance
+  { 16549, { 0, 0, 0, 0, 0 } },
+  // Divination
+  { 16552, { 0, 0, 0, 0, 0 } },
+  // Celestial Opposition
+  { 16553, { 0, 0, 0, 0, 100 } },
+  // Combust III
+  { 16554, { 0, 0, 0, 0, 0 } },
+  // Malefic IV
+  { 16555, { 240, 0, 0, 0, 0 } },
+  // Celestial Intersection
+  { 16556, { 0, 0, 0, 0, 150 } },
+  // Horoscope
+  { 16557, { 0, 0, 0, 0, 100 } },
+  // Horoscope
+  { 16558, { 0, 0, 0, 0, 0 } },
+  // Neutral Sect
+  { 16559, { 0, 0, 0, 0, 0 } },
+  // Ronkan Fire III
+  { 16574, { 430, 0, 0, 0, 0 } },
+  // Ronkan Blizzard III
+  { 16575, { 240, 0, 0, 0, 0 } },
+  // Ronkan Thunder III
+  { 16576, { 200, 0, 0, 0, 0 } },
+  // Ronkan Flare
+  { 16577, { 460, 0, 0, 0, 0 } },
+  // Falling Star
+  { 16578, { 1500, 0, 0, 0, 0 } },
+  // Detonator
+  { 16766, { 0, 0, 0, 0, 0 } },
+  // Fast Blade
+  { 16788, { 0, 0, 0, 0, 0 } },
+  // Sunshadow
+  { 16789, { 0, 0, 0, 0, 0 } },
+  // Assault I: Glittering Topaz
+  { 16791, { 0, 0, 0, 0, 0 } },
+  // Assault II: Shining Topaz
+  { 16792, { 0, 0, 0, 0, 0 } },
+  // Assault I: Downburst
+  { 16793, { 0, 0, 0, 0, 0 } },
+  // Assault II: Glittering Emerald
+  { 16794, { 0, 0, 0, 0, 0 } },
+  // Assault I: Earthen Armor
+  { 16795, { 0, 0, 0, 0, 0 } },
+  // Assault II: Mountain Buster
+  { 16796, { 0, 0, 0, 0, 0 } },
+  // Assault I: Aerial Slash
+  { 16797, { 0, 0, 0, 0, 0 } },
+  // Assault II: Slipstream
+  { 16798, { 0, 0, 0, 0, 0 } },
+  // Assault I: Crimson Cyclone
+  { 16799, { 0, 0, 0, 0, 0 } },
+  // Assault II: Flaming Crush
+  { 16800, { 0, 0, 0, 0, 0 } },
+  // Enkindle: Earthen Fury
+  { 16801, { 0, 0, 0, 0, 0 } },
+  // Enkindle: Aerial Blast
+  { 16802, { 0, 0, 0, 0, 0 } },
+  // Enkindle: Inferno
+  { 16803, { 0, 0, 0, 0, 0 } },
+  // Rough Divide
+  { 16804, { 200, 0, 0, 0, 0 } },
+  // Tactician
+  { 16889, { 0, 0, 0, 0, 0 } },
+  // Swashbuckler
+  { 16984, { 0, 0, 0, 0, 0 } },
+  // Greatest Eclipse
+  { 16985, { 0, 0, 0, 0, 0 } },
+  // Ronkan Cure II
+  { 17000, { 0, 0, 0, 0, 1300 } },
+  // Ronkan Medica
+  { 17001, { 0, 0, 0, 0, 500 } },
+  // Ronkan Esuna
+  { 17002, { 0, 0, 0, 0, 0 } },
+  // Ronkan Stone II
+  { 17003, { 200, 0, 0, 0, 0 } },
+  // Ronkan Renew
+  { 17004, { 0, 0, 0, 0, 0 } },
+  // Play
+  { 17055, { 0, 0, 0, 0, 0 } },
+  // Gunmetal Soul
+  { 17105, { 0, 0, 0, 0, 0 } },
+  // Crimson Lotus
+  { 17106, { 0, 0, 0, 0, 0 } },
+  // Acidic Bite
+  { 17122, { 300, 0, 0, 0, 0 } },
+  // Heavy Shot
+  { 17123, { 550, 0, 0, 0, 0 } },
+  // Radiant Arrow
+  { 17124, { 1100, 0, 0, 0, 0 } },
+  // Dulling Arrow
+  { 17125, { 0, 0, 0, 0, 0 } },
+  // Aspected Benefic
+  { 17151, { 0, 0, 0, 0, 200 } },
+  // Aspected Helios
+  { 17152, { 0, 0, 0, 0, 100 } },
+  // Hypercharge
+  { 17209, { 0, 0, 0, 0, 0 } },
+  // Summon Eos
+  { 17215, { 0, 0, 0, 0, 0 } },
+  // Summon Selene
+  { 17216, { 0, 0, 0, 0, 0 } },
+  // attack
+  { 17222, { 0, 0, 0, 0, 0 } },
+  // Chivalrous Spirit
+  { 17236, { 0, 0, 0, 0, 1200 } },
+  // Souldeep Invisibility
+  { 17291, { 0, 0, 0, 0, 0 } },
+  // Spinning Edge
+  { 17413, { 0, 0, 0, 0, 0 } },
+  // Gust Slash
+  { 17414, { 0, 0, 0, 0, 0 } },
+  // Aeolian Edge
+  { 17415, { 0, 0, 0, 0, 0 } },
+  // Shadow Fang
+  { 17416, { 0, 0, 0, 0, 0 } },
+  // Armor Crush
+  { 17417, { 0, 0, 0, 0, 0 } },
+  // Throwing Dagger
+  { 17418, { 0, 0, 0, 0, 0 } },
+  // Death Blossom
+  { 17419, { 0, 0, 0, 0, 0 } },
+  // Hakke Mujinsatsu
+  { 17420, { 0, 0, 0, 0, 0 } },
+  // Hunter's Prudence
+  { 17596, { 0, 0, 0, 0, 1000 } },
+  // Nebula
+  { 17839, { 0, 0, 0, 0, 0 } },
+  // Bio
+  { 17864, { 0, 0, 0, 0, 0 } },
+  // Bio II
+  { 17865, { 0, 0, 0, 0, 0 } },
+  // Ruin
+  { 17869, { 160, 0, 0, 0, 0 } },
+  // Ruin II
+  { 17870, { 0, 0, 0, 0, 0 } },
+  // Smackdown
+  { 17901, { 0, 0, 0, 0, 0 } },
+  // 攻撃
+  { 18034, { 0, 0, 0, 0, 0 } },
+  // Ending
+  { 18073, { 0, 0, 0, 0, 0 } },
+  // Straight Shot
+  { 18190, { 0, 0, 0, 0, 0 } },
 
 };
\ No newline at end of file

From 443ea30b8d597d69d8cb14fb40ee614208d7f597 Mon Sep 17 00:00:00 2001
From: NotAdam <adam@notadam.me>
Date: Fri, 26 Jul 2019 00:21:47 +1000
Subject: [PATCH 116/351] fix action parser not writing combo potency and
 offsetting all values

---
 src/tools/action_parse/main.cpp    |    6 +-
 src/world/Action/Action.cpp        |    7 +-
 src/world/Action/ActionLutData.cpp | 1398 ++++++++++++++--------------
 3 files changed, 707 insertions(+), 704 deletions(-)

diff --git a/src/tools/action_parse/main.cpp b/src/tools/action_parse/main.cpp
index 7987febe..aa40bdd1 100644
--- a/src/tools/action_parse/main.cpp
+++ b/src/tools/action_parse/main.cpp
@@ -249,9 +249,11 @@ int main()
 //                  action.first, data.name, data.potency, data.flankPotency, data.frontPotency, data.rearPotency,
 //                  data.curePotency, data.restorePercentage );
 
-    auto out = fmt::format( "  // {}\n  {{ {}, {{ {}, {}, {}, {}, {} }} }},\n",
+    auto out = fmt::format( "  // {}\n  {{ {}, {{ {}, {}, {}, {}, {}, {} }} }},\n",
                             data.name, action.first,
-                            data.potency, data.flankPotency, data.frontPotency, data.rearPotency, data.curePotency );
+                            data.potency, data.comboPotency,
+                            data.flankPotency, data.frontPotency, data.rearPotency,
+                            data.curePotency );
 
     output += out;
 //    Logger::info( out );
diff --git a/src/world/Action/Action.cpp b/src/world/Action/Action.cpp
index 8f9bfcab..886cab4e 100644
--- a/src/world/Action/Action.cpp
+++ b/src/world/Action/Action.cpp
@@ -371,14 +371,15 @@ void Action::Action::buildEffects()
   // no script exists but we have a valid lut entry
   if( auto player = getSourceChara()->getAsPlayer() )
   {
-    player->sendDebug( "Hit target: pot: {} (f: {}, r: {}), heal pot: {}",
-                       lutEntry.potency, lutEntry.flankPotency, lutEntry.rearPotency, lutEntry.curePotency );
+    player->sendDebug( "Hit target: pot: {} (c: {}, f: {}, r: {}), heal pot: {}",
+                       lutEntry.potency, lutEntry.comboPotency, lutEntry.flankPotency, lutEntry.rearPotency,
+                       lutEntry.curePotency );
   }
 
   for( auto& actor : m_hitActors )
   {
     // todo: this is shit
-    if( actor->getObjKind() == m_pSource->getObjKind() && lutEntry.curePotency > 0 )
+    if( lutEntry.curePotency > 0 )
       m_effectBuilder->healTarget( actor, lutEntry.curePotency );
 
     else if( lutEntry.potency > 0 )
diff --git a/src/world/Action/ActionLutData.cpp b/src/world/Action/ActionLutData.cpp
index 68d1c456..76e352ae 100644
--- a/src/world/Action/ActionLutData.cpp
+++ b/src/world/Action/ActionLutData.cpp
@@ -5,1402 +5,1402 @@ using namespace Sapphire::World::Action;
 ActionLut::Lut ActionLut::m_actionLut =
 {
   // attack
-  { 7, { 0, 0, 0, 0, 0 } },
+  { 7, { 0, 0, 0, 0, 0, 0 } },
   // Shot
-  { 8, { 0, 0, 0, 0, 0 } },
+  { 8, { 0, 0, 0, 0, 0, 0 } },
   // Fast Blade
-  { 9, { 200, 0, 0, 0, 0 } },
+  { 9, { 200, 0, 0, 0, 0, 0 } },
   // Riot Blade
-  { 15, { 100, 0, 0, 0, 0 } },
+  { 15, { 100, 300, 0, 0, 0, 0 } },
   // Shield Bash
-  { 16, { 110, 0, 0, 0, 0 } },
+  { 16, { 110, 0, 0, 0, 0, 0 } },
   // Sentinel
-  { 17, { 0, 0, 0, 0, 0 } },
+  { 17, { 0, 0, 0, 0, 0, 0 } },
   // Fight or Flight
-  { 20, { 0, 0, 0, 0, 0 } },
+  { 20, { 0, 0, 0, 0, 0, 0 } },
   // Rage of Halone
-  { 21, { 100, 0, 0, 0, 0 } },
+  { 21, { 100, 350, 0, 0, 0, 0 } },
   // Circle of Scorn
-  { 23, { 120, 0, 0, 0, 0 } },
+  { 23, { 120, 0, 0, 0, 0, 0 } },
   // Shield Lob
-  { 24, { 120, 0, 0, 0, 0 } },
+  { 24, { 120, 0, 0, 0, 0, 0 } },
   // Cover
-  { 27, { 0, 0, 0, 0, 0 } },
+  { 27, { 0, 0, 0, 0, 0, 0 } },
   // Iron Will
-  { 28, { 0, 0, 0, 0, 0 } },
+  { 28, { 0, 0, 0, 0, 0, 0 } },
   // Spirits Within
-  { 29, { 370, 0, 0, 0, 0 } },
+  { 29, { 370, 0, 0, 0, 0, 0 } },
   // Hallowed Ground
-  { 30, { 0, 0, 0, 0, 0 } },
+  { 30, { 0, 0, 0, 0, 0, 0 } },
   // Heavy Swing
-  { 31, { 200, 0, 0, 0, 0 } },
+  { 31, { 200, 0, 0, 0, 0, 0 } },
   // Maim
-  { 37, { 100, 0, 0, 0, 0 } },
+  { 37, { 100, 300, 0, 0, 0, 0 } },
   // Berserk
-  { 38, { 0, 0, 0, 0, 0 } },
+  { 38, { 0, 0, 0, 0, 0, 0 } },
   // Thrill of Battle
-  { 40, { 0, 0, 0, 0, 0 } },
+  { 40, { 0, 0, 0, 0, 0, 0 } },
   // Overpower
-  { 41, { 130, 0, 0, 0, 0 } },
+  { 41, { 130, 0, 0, 0, 0, 0 } },
   // Storm's Path
-  { 42, { 100, 0, 0, 0, 250 } },
+  { 42, { 100, 380, 0, 0, 0, 250 } },
   // Holmgang
-  { 43, { 0, 0, 0, 0, 0 } },
+  { 43, { 0, 0, 0, 0, 0, 0 } },
   // Vengeance
-  { 44, { 55, 0, 0, 0, 0 } },
+  { 44, { 55, 0, 0, 0, 0, 0 } },
   // Storm's Eye
-  { 45, { 100, 0, 0, 0, 0 } },
+  { 45, { 100, 380, 0, 0, 0, 0 } },
   // Tomahawk
-  { 46, { 140, 0, 0, 0, 0 } },
+  { 46, { 140, 0, 0, 0, 0, 0 } },
   // Defiance
-  { 48, { 0, 0, 0, 0, 0 } },
+  { 48, { 0, 0, 0, 0, 0, 0 } },
   // Inner Beast
-  { 49, { 350, 0, 0, 0, 0 } },
+  { 49, { 350, 0, 0, 0, 0, 0 } },
   // Steel Cyclone
-  { 51, { 220, 0, 0, 0, 0 } },
+  { 51, { 220, 0, 0, 0, 0, 0 } },
   // Infuriate
-  { 52, { 0, 0, 0, 0, 0 } },
+  { 52, { 0, 0, 0, 0, 0, 0 } },
   // Bootshine
-  { 53, { 150, 0, 0, 0, 0 } },
+  { 53, { 150, 0, 0, 0, 0, 0 } },
   // True Strike
-  { 54, { 220, 0, 0, 240, 0 } },
+  { 54, { 220, 0, 0, 0, 240, 0 } },
   // Snap Punch
-  { 56, { 210, 230, 0, 0, 0 } },
+  { 56, { 210, 0, 230, 0, 0, 0 } },
   // Fists of Earth
-  { 60, { 0, 0, 0, 0, 0 } },
+  { 60, { 0, 0, 0, 0, 0, 0 } },
   // Twin Snakes
-  { 61, { 150, 170, 0, 0, 0 } },
+  { 61, { 150, 0, 170, 0, 0, 0 } },
   // Arm of the Destroyer
-  { 62, { 80, 0, 0, 0, 0 } },
+  { 62, { 80, 0, 0, 0, 0, 0 } },
   // Fists of Fire
-  { 63, { 0, 0, 0, 0, 0 } },
+  { 63, { 0, 0, 0, 0, 0, 0 } },
   // Mantra
-  { 65, { 0, 0, 0, 0, 0 } },
+  { 65, { 0, 0, 0, 0, 0, 0 } },
   // Demolish
-  { 66, { 70, 0, 0, 90, 0 } },
+  { 66, { 70, 0, 0, 0, 90, 0 } },
   // Perfect Balance
-  { 69, { 0, 0, 0, 0, 0 } },
+  { 69, { 0, 0, 0, 0, 0, 0 } },
   // Rockbreaker
-  { 70, { 120, 0, 0, 0, 0 } },
+  { 70, { 120, 0, 0, 0, 0, 0 } },
   // Shoulder Tackle
-  { 71, { 100, 0, 0, 0, 0 } },
+  { 71, { 100, 0, 0, 0, 0, 0 } },
   // Fists of Wind
-  { 73, { 0, 0, 0, 0, 0 } },
+  { 73, { 0, 0, 0, 0, 0, 0 } },
   // Dragon Kick
-  { 74, { 180, 200, 0, 0, 0 } },
+  { 74, { 180, 0, 200, 0, 0, 0 } },
   // True Thrust
-  { 75, { 0, 0, 0, 0, 0 } },
+  { 75, { 0, 0, 0, 0, 0, 0 } },
   // Vorpal Thrust
-  { 78, { 0, 0, 0, 0, 0 } },
+  { 78, { 0, 0, 0, 0, 0, 0 } },
   // Life Surge
-  { 83, { 0, 0, 0, 0, 0 } },
+  { 83, { 0, 0, 0, 0, 0, 0 } },
   // Full Thrust
-  { 84, { 100, 0, 0, 0, 0 } },
+  { 84, { 100, 530, 0, 0, 0, 0 } },
   // Lance Charge
-  { 85, { 0, 0, 0, 0, 0 } },
+  { 85, { 0, 0, 0, 0, 0, 0 } },
   // Doom Spike
-  { 86, { 170, 0, 0, 0, 0 } },
+  { 86, { 170, 0, 0, 0, 0, 0 } },
   // Disembowel
-  { 87, { 0, 0, 0, 0, 0 } },
+  { 87, { 0, 0, 0, 0, 0, 0 } },
   // Chaos Thrust
-  { 88, { 100, 0, 0, 140, 0 } },
+  { 88, { 100, 290, 0, 0, 140, 0 } },
   // Piercing Talon
-  { 90, { 150, 0, 0, 0, 0 } },
+  { 90, { 150, 0, 0, 0, 0, 0 } },
   // Jump
-  { 92, { 310, 0, 0, 0, 0 } },
+  { 92, { 310, 0, 0, 0, 0, 0 } },
   // Elusive Jump
-  { 94, { 0, 0, 0, 0, 0 } },
+  { 94, { 0, 0, 0, 0, 0, 0 } },
   // Spineshatter Dive
-  { 95, { 240, 0, 0, 0, 0 } },
+  { 95, { 240, 0, 0, 0, 0, 0 } },
   // Dragonfire Dive
-  { 96, { 380, 0, 0, 0, 0 } },
+  { 96, { 380, 0, 0, 0, 0, 0 } },
   // Heavy Shot
-  { 97, { 180, 0, 0, 0, 0 } },
+  { 97, { 180, 0, 0, 0, 0, 0 } },
   // Straight Shot
-  { 98, { 200, 0, 0, 0, 0 } },
+  { 98, { 200, 0, 0, 0, 0, 0 } },
   // Venomous Bite
-  { 100, { 100, 0, 0, 0, 0 } },
+  { 100, { 100, 0, 0, 0, 0, 0 } },
   // Raging Strikes
-  { 101, { 0, 0, 0, 0, 0 } },
+  { 101, { 0, 0, 0, 0, 0, 0 } },
   // Quick Nock
-  { 106, { 150, 0, 0, 0, 0 } },
+  { 106, { 150, 0, 0, 0, 0, 0 } },
   // Barrage
-  { 107, { 0, 0, 0, 0, 0 } },
+  { 107, { 0, 0, 0, 0, 0, 0 } },
   // Bloodletter
-  { 110, { 150, 0, 0, 0, 0 } },
+  { 110, { 150, 0, 0, 0, 0, 0 } },
   // Repelling Shot
-  { 112, { 0, 0, 0, 0, 0 } },
+  { 112, { 0, 0, 0, 0, 0, 0 } },
   // Windbite
-  { 113, { 60, 0, 0, 0, 0 } },
+  { 113, { 60, 0, 0, 0, 0, 0 } },
   // Mage's Ballad
-  { 114, { 100, 0, 0, 0, 0 } },
+  { 114, { 100, 0, 0, 0, 0, 0 } },
   // Army's Paeon
-  { 116, { 100, 0, 0, 0, 0 } },
+  { 116, { 100, 0, 0, 0, 0, 0 } },
   // Rain of Death
-  { 117, { 130, 0, 0, 0, 0 } },
+  { 117, { 130, 0, 0, 0, 0, 0 } },
   // Battle Voice
-  { 118, { 0, 0, 0, 0, 0 } },
+  { 118, { 0, 0, 0, 0, 0, 0 } },
   // Stone
-  { 119, { 140, 0, 0, 0, 0 } },
+  { 119, { 140, 0, 0, 0, 0, 0 } },
   // Cure
-  { 120, { 0, 0, 0, 0, 450 } },
+  { 120, { 0, 0, 0, 0, 0, 450 } },
   // Aero
-  { 121, { 50, 0, 0, 0, 0 } },
+  { 121, { 50, 0, 0, 0, 0, 0 } },
   // Medica
-  { 124, { 0, 0, 0, 0, 300 } },
+  { 124, { 0, 0, 0, 0, 0, 300 } },
   // Raise
-  { 125, { 0, 0, 0, 0, 0 } },
+  { 125, { 0, 0, 0, 0, 0, 0 } },
   // Stone II
-  { 127, { 200, 0, 0, 0, 0 } },
+  { 127, { 200, 0, 0, 0, 0, 0 } },
   // Cure III
-  { 131, { 0, 0, 0, 0, 550 } },
+  { 131, { 0, 0, 0, 0, 0, 550 } },
   // Aero II
-  { 132, { 60, 0, 0, 0, 0 } },
+  { 132, { 60, 0, 0, 0, 0, 0 } },
   // Medica II
-  { 133, { 0, 0, 0, 0, 200 } },
+  { 133, { 0, 0, 0, 0, 0, 200 } },
   // Fluid Aura
-  { 134, { 0, 0, 0, 0, 0 } },
+  { 134, { 0, 0, 0, 0, 0, 0 } },
   // Cure II
-  { 135, { 0, 0, 0, 0, 700 } },
+  { 135, { 0, 0, 0, 0, 0, 700 } },
   // Presence of Mind
-  { 136, { 0, 0, 0, 0, 0 } },
+  { 136, { 0, 0, 0, 0, 0, 0 } },
   // Regen
-  { 137, { 0, 0, 0, 0, 200 } },
+  { 137, { 0, 0, 0, 0, 0, 200 } },
   // Holy
-  { 139, { 140, 0, 0, 0, 0 } },
+  { 139, { 140, 0, 0, 0, 0, 0 } },
   // Benediction
-  { 140, { 0, 0, 0, 0, 0 } },
+  { 140, { 0, 0, 0, 0, 0, 0 } },
   // Fire
-  { 141, { 180, 0, 0, 0, 0 } },
+  { 141, { 180, 0, 0, 0, 0, 0 } },
   // Blizzard
-  { 142, { 180, 0, 0, 0, 0 } },
+  { 142, { 180, 0, 0, 0, 0, 0 } },
   // Thunder
-  { 144, { 30, 0, 0, 0, 0 } },
+  { 144, { 30, 0, 0, 0, 0, 0 } },
   // Sleep
-  { 145, { 0, 0, 0, 0, 0 } },
+  { 145, { 0, 0, 0, 0, 0, 0 } },
   // Blizzard II
-  { 146, { 50, 0, 0, 0, 0 } },
+  { 146, { 50, 0, 0, 0, 0, 0 } },
   // Fire II
-  { 147, { 80, 0, 0, 0, 0 } },
+  { 147, { 80, 0, 0, 0, 0, 0 } },
   // Transpose
-  { 149, { 0, 0, 0, 0, 0 } },
+  { 149, { 0, 0, 0, 0, 0, 0 } },
   // Fire III
-  { 152, { 240, 0, 0, 0, 0 } },
+  { 152, { 240, 0, 0, 0, 0, 0 } },
   // Thunder III
-  { 153, { 70, 0, 0, 0, 0 } },
+  { 153, { 70, 0, 0, 0, 0, 0 } },
   // Blizzard III
-  { 154, { 240, 0, 0, 0, 0 } },
+  { 154, { 240, 0, 0, 0, 0, 0 } },
   // Aetherial Manipulation
-  { 155, { 0, 0, 0, 0, 0 } },
+  { 155, { 0, 0, 0, 0, 0, 0 } },
   // Scathe
-  { 156, { 100, 0, 0, 0, 0 } },
+  { 156, { 100, 0, 0, 0, 0, 0 } },
   // Manaward
-  { 157, { 0, 0, 0, 0, 0 } },
+  { 157, { 0, 0, 0, 0, 0, 0 } },
   // Manafont
-  { 158, { 0, 0, 0, 0, 0 } },
+  { 158, { 0, 0, 0, 0, 0, 0 } },
   // Freeze
-  { 159, { 100, 0, 0, 0, 0 } },
+  { 159, { 100, 0, 0, 0, 0, 0 } },
   // Flare
-  { 162, { 260, 0, 0, 0, 0 } },
+  { 162, { 260, 0, 0, 0, 0, 0 } },
   // Ruin
-  { 163, { 80, 0, 0, 0, 0 } },
+  { 163, { 80, 0, 0, 0, 0, 0 } },
   // Bio
-  { 164, { 0, 0, 0, 0, 0 } },
+  { 164, { 0, 0, 0, 0, 0, 0 } },
   // Summon
-  { 165, { 0, 0, 0, 0, 0 } },
+  { 165, { 0, 0, 0, 0, 0, 0 } },
   // Aetherflow
-  { 166, { 0, 0, 0, 0, 0 } },
+  { 166, { 0, 0, 0, 0, 0, 0 } },
   // Miasma
-  { 168, { 20, 0, 0, 0, 0 } },
+  { 168, { 20, 0, 0, 0, 0, 0 } },
   // Summon II
-  { 170, { 0, 0, 0, 0, 0 } },
+  { 170, { 0, 0, 0, 0, 0, 0 } },
   // Ruin II
-  { 172, { 80, 0, 0, 0, 0 } },
+  { 172, { 80, 0, 0, 0, 0, 0 } },
   // Resurrection
-  { 173, { 0, 0, 0, 0, 0 } },
+  { 173, { 0, 0, 0, 0, 0, 0 } },
   // Bane
-  { 174, { 0, 0, 0, 0, 0 } },
+  { 174, { 0, 0, 0, 0, 0, 0 } },
   // Bio II
-  { 178, { 0, 0, 0, 0, 0 } },
+  { 178, { 0, 0, 0, 0, 0, 0 } },
   // Summon III
-  { 180, { 0, 0, 0, 0, 0 } },
+  { 180, { 0, 0, 0, 0, 0, 0 } },
   // Fester
-  { 181, { 100, 0, 0, 0, 0 } },
+  { 181, { 100, 0, 0, 0, 0, 0 } },
   // Enkindle
-  { 184, { 0, 0, 0, 0, 0 } },
+  { 184, { 0, 0, 0, 0, 0, 0 } },
   // Adloquium
-  { 185, { 0, 0, 0, 0, 300 } },
+  { 185, { 0, 0, 0, 0, 0, 300 } },
   // Succor
-  { 186, { 0, 0, 0, 0, 180 } },
+  { 186, { 0, 0, 0, 0, 0, 180 } },
   // Sacred Soil
-  { 188, { 0, 0, 0, 0, 100 } },
+  { 188, { 0, 0, 0, 0, 0, 100 } },
   // Lustrate
-  { 189, { 0, 0, 0, 0, 600 } },
+  { 189, { 0, 0, 0, 0, 0, 600 } },
   // Physick
-  { 190, { 0, 0, 0, 0, 400 } },
+  { 190, { 0, 0, 0, 0, 0, 400 } },
   // Shield Wall
-  { 197, { 0, 0, 0, 0, 0 } },
+  { 197, { 0, 0, 0, 0, 0, 0 } },
   // Stronghold
-  { 198, { 0, 0, 0, 0, 0 } },
+  { 198, { 0, 0, 0, 0, 0, 0 } },
   // Last Bastion
-  { 199, { 0, 0, 0, 0, 0 } },
+  { 199, { 0, 0, 0, 0, 0, 0 } },
   // Braver
-  { 200, { 2400, 0, 0, 0, 0 } },
+  { 200, { 2400, 0, 0, 0, 0, 0 } },
   // Bladedance
-  { 201, { 5250, 0, 0, 0, 0 } },
+  { 201, { 5250, 0, 0, 0, 0, 0 } },
   // Final Heaven
-  { 202, { 9000, 0, 0, 0, 0 } },
+  { 202, { 9000, 0, 0, 0, 0, 0 } },
   // Skyshard
-  { 203, { 1650, 0, 0, 0, 0 } },
+  { 203, { 1650, 0, 0, 0, 0, 0 } },
   // Starstorm
-  { 204, { 3600, 0, 0, 0, 0 } },
+  { 204, { 3600, 0, 0, 0, 0, 0 } },
   // Meteor
-  { 205, { 6150, 0, 0, 0, 0 } },
+  { 205, { 6150, 0, 0, 0, 0, 0 } },
   // Healing Wind
-  { 206, { 0, 0, 0, 0, 0 } },
+  { 206, { 0, 0, 0, 0, 0, 0 } },
   // Breath of the Earth
-  { 207, { 0, 0, 0, 0, 0 } },
+  { 207, { 0, 0, 0, 0, 0, 0 } },
   // Pulse of Life
-  { 208, { 0, 0, 0, 0, 0 } },
+  { 208, { 0, 0, 0, 0, 0, 0 } },
   // Magitek Cannon
-  { 1128, { 0, 0, 0, 0, 0 } },
+  { 1128, { 0, 0, 0, 0, 0, 0 } },
   // Photon Stream
-  { 1129, { 0, 0, 0, 0, 0 } },
+  { 1129, { 0, 0, 0, 0, 0, 0 } },
   // attack
-  { 1533, { 0, 0, 0, 0, 0 } },
+  { 1533, { 0, 0, 0, 0, 0, 0 } },
   // Spinning Edge
-  { 2240, { 200, 0, 0, 0, 0 } },
+  { 2240, { 200, 0, 0, 0, 0, 0 } },
   // Shade Shift
-  { 2241, { 0, 0, 0, 0, 0 } },
+  { 2241, { 0, 0, 0, 0, 0, 0 } },
   // Gust Slash
-  { 2242, { 100, 0, 0, 0, 0 } },
+  { 2242, { 100, 250, 0, 0, 0, 0 } },
   // Hide
-  { 2245, { 0, 0, 0, 0, 0 } },
+  { 2245, { 0, 0, 0, 0, 0, 0 } },
   // Assassinate
-  { 2246, { 200, 0, 0, 0, 0 } },
+  { 2246, { 200, 0, 0, 0, 0, 0 } },
   // Throwing Dagger
-  { 2247, { 120, 0, 0, 0, 0 } },
+  { 2247, { 120, 0, 0, 0, 0, 0 } },
   // Mug
-  { 2248, { 150, 0, 0, 0, 0 } },
+  { 2248, { 150, 0, 0, 0, 0, 0 } },
   // Death Blossom
-  { 2254, { 120, 0, 0, 0, 0 } },
+  { 2254, { 120, 0, 0, 0, 0, 0 } },
   // Aeolian Edge
-  { 2255, { 100, 0, 0, 160, 0 } },
+  { 2255, { 100, 360, 0, 0, 160, 0 } },
   // Shadow Fang
-  { 2257, { 100, 0, 0, 0, 0 } },
+  { 2257, { 100, 200, 0, 0, 0, 0 } },
   // Trick Attack
-  { 2258, { 340, 0, 0, 500, 0 } },
+  { 2258, { 340, 0, 0, 0, 500, 0 } },
   // Ten
-  { 2259, { 0, 0, 0, 0, 0 } },
+  { 2259, { 0, 0, 0, 0, 0, 0 } },
   // Ninjutsu
-  { 2260, { 0, 0, 0, 0, 0 } },
+  { 2260, { 0, 0, 0, 0, 0, 0 } },
   // Chi
-  { 2261, { 0, 0, 0, 0, 0 } },
+  { 2261, { 0, 0, 0, 0, 0, 0 } },
   // Shukuchi
-  { 2262, { 0, 0, 0, 0, 0 } },
+  { 2262, { 0, 0, 0, 0, 0, 0 } },
   // Jin
-  { 2263, { 0, 0, 0, 0, 0 } },
+  { 2263, { 0, 0, 0, 0, 0, 0 } },
   // Kassatsu
-  { 2264, { 0, 0, 0, 0, 0 } },
+  { 2264, { 0, 0, 0, 0, 0, 0 } },
   // Fuma Shuriken
-  { 2265, { 280, 0, 0, 0, 0 } },
+  { 2265, { 280, 0, 0, 0, 0, 0 } },
   // Katon
-  { 2266, { 250, 0, 0, 0, 0 } },
+  { 2266, { 250, 0, 0, 0, 0, 0 } },
   // Raiton
-  { 2267, { 400, 0, 0, 0, 0 } },
+  { 2267, { 400, 0, 0, 0, 0, 0 } },
   // Hyoton
-  { 2268, { 140, 0, 0, 0, 0 } },
+  { 2268, { 140, 0, 0, 0, 0, 0 } },
   // Huton
-  { 2269, { 0, 0, 0, 0, 0 } },
+  { 2269, { 0, 0, 0, 0, 0, 0 } },
   // Doton
-  { 2270, { 45, 0, 0, 0, 0 } },
+  { 2270, { 45, 0, 0, 0, 0, 0 } },
   // Suiton
-  { 2271, { 130, 0, 0, 0, 0 } },
+  { 2271, { 130, 0, 0, 0, 0, 0 } },
   // Rabbit Medium
-  { 2272, { 0, 0, 0, 0, 0 } },
+  { 2272, { 0, 0, 0, 0, 0, 0 } },
   // Rook Autoturret
-  { 2864, { 80, 0, 0, 0, 0 } },
+  { 2864, { 80, 0, 0, 0, 0, 0 } },
   // Split Shot
-  { 2866, { 160, 0, 0, 0, 0 } },
+  { 2866, { 160, 0, 0, 0, 0, 0 } },
   // Slug Shot
-  { 2868, { 100, 0, 0, 0, 0 } },
+  { 2868, { 100, 240, 0, 0, 0, 0 } },
   // Spread Shot
-  { 2870, { 180, 0, 0, 0, 0 } },
+  { 2870, { 180, 0, 0, 0, 0, 0 } },
   // Hot Shot
-  { 2872, { 300, 0, 0, 0, 0 } },
+  { 2872, { 300, 0, 0, 0, 0, 0 } },
   // Clean Shot
-  { 2873, { 100, 0, 0, 0, 0 } },
+  { 2873, { 100, 320, 0, 0, 0, 0 } },
   // Gauss Round
-  { 2874, { 150, 0, 0, 0, 0 } },
+  { 2874, { 150, 0, 0, 0, 0, 0 } },
   // Reassemble
-  { 2876, { 0, 0, 0, 0, 0 } },
+  { 2876, { 0, 0, 0, 0, 0, 0 } },
   // Wildfire
-  { 2878, { 0, 0, 0, 0, 0 } },
+  { 2878, { 0, 0, 0, 0, 0, 0 } },
   // Ricochet
-  { 2890, { 150, 0, 0, 0, 0 } },
+  { 2890, { 150, 0, 0, 0, 0, 0 } },
   // Raiton
-  { 3203, { 0, 0, 0, 0, 0 } },
+  { 3203, { 0, 0, 0, 0, 0, 0 } },
   // Raiton
-  { 3204, { 0, 0, 0, 0, 0 } },
+  { 3204, { 0, 0, 0, 0, 0, 0 } },
   // Kanashibari
-  { 3207, { 0, 0, 0, 0, 0 } },
+  { 3207, { 0, 0, 0, 0, 0, 0 } },
   // Goring Blade
-  { 3538, { 100, 0, 0, 0, 0 } },
+  { 3538, { 100, 390, 0, 0, 0, 0 } },
   // Royal Authority
-  { 3539, { 100, 0, 0, 0, 0 } },
+  { 3539, { 100, 550, 0, 0, 0, 0 } },
   // Divine Veil
-  { 3540, { 0, 0, 0, 0, 0 } },
+  { 3540, { 0, 0, 0, 0, 0, 0 } },
   // Clemency
-  { 3541, { 0, 0, 0, 0, 1200 } },
+  { 3541, { 0, 0, 0, 0, 0, 1200 } },
   // Sheltron
-  { 3542, { 0, 0, 0, 0, 0 } },
+  { 3542, { 0, 0, 0, 0, 0, 0 } },
   // Tornado Kick
-  { 3543, { 330, 0, 0, 0, 0 } },
+  { 3543, { 330, 0, 0, 0, 0, 0 } },
   // Elixir Field
-  { 3545, { 200, 0, 0, 0, 0 } },
+  { 3545, { 200, 0, 0, 0, 0, 0 } },
   // Meditation
-  { 3546, { 0, 0, 0, 0, 0 } },
+  { 3546, { 0, 0, 0, 0, 0, 0 } },
   // the Forbidden Chakra
-  { 3547, { 370, 0, 0, 0, 0 } },
+  { 3547, { 370, 0, 0, 0, 0, 0 } },
   // Fell Cleave
-  { 3549, { 590, 0, 0, 0, 0 } },
+  { 3549, { 590, 0, 0, 0, 0, 0 } },
   // Decimate
-  { 3550, { 250, 0, 0, 0, 0 } },
+  { 3550, { 250, 0, 0, 0, 0, 0 } },
   // Raw Intuition
-  { 3551, { 0, 0, 0, 0, 0 } },
+  { 3551, { 0, 0, 0, 0, 0, 0 } },
   // Equilibrium
-  { 3552, { 0, 0, 0, 0, 1200 } },
+  { 3552, { 0, 0, 0, 0, 0, 1200 } },
   // Blood of the Dragon
-  { 3553, { 0, 0, 0, 0, 0 } },
+  { 3553, { 0, 0, 0, 0, 0, 0 } },
   // Fang and Claw
-  { 3554, { 320, 360, 0, 0, 0 } },
+  { 3554, { 320, 0, 360, 0, 0, 0 } },
   // Geirskogul
-  { 3555, { 270, 0, 0, 0, 0 } },
+  { 3555, { 270, 0, 0, 0, 0, 0 } },
   // Wheeling Thrust
-  { 3556, { 320, 0, 0, 360, 0 } },
+  { 3556, { 320, 0, 0, 0, 360, 0 } },
   // Battle Litany
-  { 3557, { 0, 0, 0, 0, 0 } },
+  { 3557, { 0, 0, 0, 0, 0, 0 } },
   // Empyreal Arrow
-  { 3558, { 230, 0, 0, 0, 0 } },
+  { 3558, { 230, 0, 0, 0, 0, 0 } },
   // the Wanderer's Minuet
-  { 3559, { 100, 0, 0, 0, 0 } },
+  { 3559, { 100, 0, 0, 0, 0, 0 } },
   // Iron Jaws
-  { 3560, { 100, 0, 0, 0, 0 } },
+  { 3560, { 100, 0, 0, 0, 0, 0 } },
   // the Warden's Paean
-  { 3561, { 0, 0, 0, 0, 0 } },
+  { 3561, { 0, 0, 0, 0, 0, 0 } },
   // Sidewinder
-  { 3562, { 100, 0, 0, 0, 0 } },
+  { 3562, { 100, 0, 0, 0, 0, 0 } },
   // Armor Crush
-  { 3563, { 100, 160, 0, 0, 0 } },
+  { 3563, { 100, 330, 160, 0, 0, 0 } },
   // Dream Within a Dream
-  { 3566, { 200, 0, 0, 0, 0 } },
+  { 3566, { 200, 0, 0, 0, 0, 0 } },
   // Stone III
-  { 3568, { 240, 0, 0, 0, 0 } },
+  { 3568, { 240, 0, 0, 0, 0, 0 } },
   // Asylum
-  { 3569, { 0, 0, 0, 0, 100 } },
+  { 3569, { 0, 0, 0, 0, 0, 100 } },
   // Tetragrammaton
-  { 3570, { 0, 0, 0, 0, 700 } },
+  { 3570, { 0, 0, 0, 0, 0, 700 } },
   // Assize
-  { 3571, { 400, 0, 0, 0, 400 } },
+  { 3571, { 400, 0, 0, 0, 0, 400 } },
   // Ley Lines
-  { 3573, { 0, 0, 0, 0, 0 } },
+  { 3573, { 0, 0, 0, 0, 0, 0 } },
   // Sharpcast
-  { 3574, { 0, 0, 0, 0, 0 } },
+  { 3574, { 0, 0, 0, 0, 0, 0 } },
   // Enochian
-  { 3575, { 0, 0, 0, 0, 0 } },
+  { 3575, { 0, 0, 0, 0, 0, 0 } },
   // Blizzard IV
-  { 3576, { 300, 0, 0, 0, 0 } },
+  { 3576, { 300, 0, 0, 0, 0, 0 } },
   // Fire IV
-  { 3577, { 300, 0, 0, 0, 0 } },
+  { 3577, { 300, 0, 0, 0, 0, 0 } },
   // Painflare
-  { 3578, { 150, 0, 0, 0, 0 } },
+  { 3578, { 150, 0, 0, 0, 0, 0 } },
   // Ruin III
-  { 3579, { 100, 0, 0, 0, 0 } },
+  { 3579, { 100, 0, 0, 0, 0, 0 } },
   // Tri-disaster
-  { 3580, { 0, 0, 0, 0, 0 } },
+  { 3580, { 0, 0, 0, 0, 0, 0 } },
   // Dreadwyrm Trance
-  { 3581, { 0, 0, 0, 0, 0 } },
+  { 3581, { 0, 0, 0, 0, 0, 0 } },
   // Deathflare
-  { 3582, { 400, 0, 0, 0, 0 } },
+  { 3582, { 400, 0, 0, 0, 0, 0 } },
   // Indomitability
-  { 3583, { 0, 0, 0, 0, 400 } },
+  { 3583, { 0, 0, 0, 0, 0, 400 } },
   // Broil
-  { 3584, { 240, 0, 0, 0, 0 } },
+  { 3584, { 240, 0, 0, 0, 0, 0 } },
   // Deployment Tactics
-  { 3585, { 0, 0, 0, 0, 0 } },
+  { 3585, { 0, 0, 0, 0, 0, 0 } },
   // Emergency Tactics
-  { 3586, { 0, 0, 0, 0, 0 } },
+  { 3586, { 0, 0, 0, 0, 0, 0 } },
   // Dissipation
-  { 3587, { 0, 0, 0, 0, 0 } },
+  { 3587, { 0, 0, 0, 0, 0, 0 } },
   // Draw
-  { 3590, { 0, 0, 0, 0, 0 } },
+  { 3590, { 0, 0, 0, 0, 0, 0 } },
   // Redraw
-  { 3593, { 0, 0, 0, 0, 0 } },
+  { 3593, { 0, 0, 0, 0, 0, 0 } },
   // Benefic
-  { 3594, { 0, 0, 0, 0, 400 } },
+  { 3594, { 0, 0, 0, 0, 0, 400 } },
   // Aspected Benefic
-  { 3595, { 0, 0, 0, 0, 200 } },
+  { 3595, { 0, 0, 0, 0, 0, 200 } },
   // Malefic
-  { 3596, { 150, 0, 0, 0, 0 } },
+  { 3596, { 150, 0, 0, 0, 0, 0 } },
   // Malefic II
-  { 3598, { 170, 0, 0, 0, 0 } },
+  { 3598, { 170, 0, 0, 0, 0, 0 } },
   // Combust
-  { 3599, { 0, 0, 0, 0, 0 } },
+  { 3599, { 0, 0, 0, 0, 0, 0 } },
   // Helios
-  { 3600, { 0, 0, 0, 0, 330 } },
+  { 3600, { 0, 0, 0, 0, 0, 330 } },
   // Aspected Helios
-  { 3601, { 0, 0, 0, 0, 100 } },
+  { 3601, { 0, 0, 0, 0, 0, 100 } },
   // Ascend
-  { 3603, { 0, 0, 0, 0, 0 } },
+  { 3603, { 0, 0, 0, 0, 0, 0 } },
   // Diurnal Sect
-  { 3604, { 0, 0, 0, 0, 0 } },
+  { 3604, { 0, 0, 0, 0, 0, 0 } },
   // Nocturnal Sect
-  { 3605, { 0, 0, 0, 0, 0 } },
+  { 3605, { 0, 0, 0, 0, 0, 0 } },
   // Lightspeed
-  { 3606, { 0, 0, 0, 0, 0 } },
+  { 3606, { 0, 0, 0, 0, 0, 0 } },
   // Combust II
-  { 3608, { 0, 0, 0, 0, 0 } },
+  { 3608, { 0, 0, 0, 0, 0, 0 } },
   // Benefic II
-  { 3610, { 0, 0, 0, 0, 700 } },
+  { 3610, { 0, 0, 0, 0, 0, 700 } },
   // Synastry
-  { 3612, { 0, 0, 0, 0, 0 } },
+  { 3612, { 0, 0, 0, 0, 0, 0 } },
   // Collective Unconscious
-  { 3613, { 0, 0, 0, 0, 50 } },
+  { 3613, { 0, 0, 0, 0, 0, 50 } },
   // Essential Dignity
-  { 3614, { 0, 0, 0, 0, 400 } },
+  { 3614, { 0, 0, 0, 0, 0, 400 } },
   // Gravity
-  { 3615, { 130, 0, 0, 0, 0 } },
+  { 3615, { 130, 0, 0, 0, 0, 0 } },
   // Hard Slash
-  { 3617, { 200, 0, 0, 0, 0 } },
+  { 3617, { 200, 0, 0, 0, 0, 0 } },
   // Unleash
-  { 3621, { 150, 0, 0, 0, 0 } },
+  { 3621, { 150, 0, 0, 0, 0, 0 } },
   // Syphon Strike
-  { 3623, { 100, 0, 0, 0, 0 } },
+  { 3623, { 100, 300, 0, 0, 0, 0 } },
   // Unmend
-  { 3624, { 150, 0, 0, 0, 0 } },
+  { 3624, { 150, 0, 0, 0, 0, 0 } },
   // Blood Weapon
-  { 3625, { 0, 0, 0, 0, 0 } },
+  { 3625, { 0, 0, 0, 0, 0, 0 } },
   // Grit
-  { 3629, { 0, 0, 0, 0, 0 } },
+  { 3629, { 0, 0, 0, 0, 0, 0 } },
   // Souleater
-  { 3632, { 100, 0, 0, 0, 300 } },
+  { 3632, { 100, 400, 0, 0, 0, 300 } },
   // Dark Mind
-  { 3634, { 0, 0, 0, 0, 0 } },
+  { 3634, { 0, 0, 0, 0, 0, 0 } },
   // Shadow Wall
-  { 3636, { 0, 0, 0, 0, 0 } },
+  { 3636, { 0, 0, 0, 0, 0, 0 } },
   // Living Dead
-  { 3638, { 0, 0, 0, 0, 0 } },
+  { 3638, { 0, 0, 0, 0, 0, 0 } },
   // Salted Earth
-  { 3639, { 60, 0, 0, 0, 0 } },
+  { 3639, { 60, 0, 0, 0, 0, 0 } },
   // Plunge
-  { 3640, { 200, 0, 0, 0, 0 } },
+  { 3640, { 200, 0, 0, 0, 0, 0 } },
   // Abyssal Drain
-  { 3641, { 200, 0, 0, 0, 200 } },
+  { 3641, { 200, 0, 0, 0, 0, 200 } },
   // Carve and Spit
-  { 3643, { 450, 0, 0, 0, 0 } },
+  { 3643, { 450, 0, 0, 0, 0, 0 } },
   // Big Shot
-  { 4238, { 0, 0, 0, 0, 0 } },
+  { 4238, { 0, 0, 0, 0, 0, 0 } },
   // Desperado
-  { 4239, { 0, 0, 0, 0, 0 } },
+  { 4239, { 0, 0, 0, 0, 0, 0 } },
   // Land Waker
-  { 4240, { 0, 0, 0, 0, 0 } },
+  { 4240, { 0, 0, 0, 0, 0, 0 } },
   // Dark Force
-  { 4241, { 0, 0, 0, 0, 0 } },
+  { 4241, { 0, 0, 0, 0, 0, 0 } },
   // Dragonsong Dive
-  { 4242, { 0, 0, 0, 0, 0 } },
+  { 4242, { 0, 0, 0, 0, 0, 0 } },
   // Chimatsuri
-  { 4243, { 0, 0, 0, 0, 0 } },
+  { 4243, { 0, 0, 0, 0, 0, 0 } },
   // Sagittarius Arrow
-  { 4244, { 0, 0, 0, 0, 0 } },
+  { 4244, { 0, 0, 0, 0, 0, 0 } },
   // Satellite Beam
-  { 4245, { 0, 0, 0, 0, 0 } },
+  { 4245, { 0, 0, 0, 0, 0, 0 } },
   // Teraflare
-  { 4246, { 0, 0, 0, 0, 0 } },
+  { 4246, { 0, 0, 0, 0, 0, 0 } },
   // Angel Feathers
-  { 4247, { 0, 0, 0, 0, 0 } },
+  { 4247, { 0, 0, 0, 0, 0, 0 } },
   // Astral Stasis
-  { 4248, { 0, 0, 0, 0, 0 } },
+  { 4248, { 0, 0, 0, 0, 0, 0 } },
   // Form Shift
-  { 4262, { 0, 0, 0, 0, 0 } },
+  { 4262, { 0, 0, 0, 0, 0, 0 } },
   // Cannonfire
-  { 4271, { 0, 0, 0, 0, 0 } },
+  { 4271, { 0, 0, 0, 0, 0, 0 } },
   // the Balance
-  { 4401, { 0, 0, 0, 0, 0 } },
+  { 4401, { 0, 0, 0, 0, 0, 0 } },
   // the Arrow
-  { 4402, { 0, 0, 0, 0, 0 } },
+  { 4402, { 0, 0, 0, 0, 0, 0 } },
   // the Spear
-  { 4403, { 0, 0, 0, 0, 0 } },
+  { 4403, { 0, 0, 0, 0, 0, 0 } },
   // the Bole
-  { 4404, { 0, 0, 0, 0, 0 } },
+  { 4404, { 0, 0, 0, 0, 0, 0 } },
   // the Ewer
-  { 4405, { 0, 0, 0, 0, 0 } },
+  { 4405, { 0, 0, 0, 0, 0, 0 } },
   // the Spire
-  { 4406, { 0, 0, 0, 0, 0 } },
+  { 4406, { 0, 0, 0, 0, 0, 0 } },
   // Raiton
-  { 4977, { 0, 0, 0, 0, 0 } },
+  { 4977, { 0, 0, 0, 0, 0, 0 } },
   // Raiton
-  { 5069, { 0, 0, 0, 0, 0 } },
+  { 5069, { 0, 0, 0, 0, 0, 0 } },
   // attack
-  { 5199, { 0, 0, 0, 0, 0 } },
+  { 5199, { 0, 0, 0, 0, 0, 0 } },
   // attack
-  { 5846, { 0, 0, 0, 0, 0 } },
+  { 5846, { 0, 0, 0, 0, 0, 0 } },
   // Stickyloom
-  { 5874, { 0, 0, 0, 0, 0 } },
+  { 5874, { 0, 0, 0, 0, 0, 0 } },
   // Void Fire II
-  { 6274, { 0, 0, 0, 0, 0 } },
+  { 6274, { 0, 0, 0, 0, 0, 0 } },
   // Total Eclipse
-  { 7381, { 120, 0, 0, 0, 0 } },
+  { 7381, { 120, 0, 0, 0, 0, 0 } },
   // Intervention
-  { 7382, { 0, 0, 0, 0, 0 } },
+  { 7382, { 0, 0, 0, 0, 0, 0 } },
   // Requiescat
-  { 7383, { 550, 0, 0, 0, 0 } },
+  { 7383, { 550, 0, 0, 0, 0, 0 } },
   // Holy Spirit
-  { 7384, { 350, 0, 0, 0, 0 } },
+  { 7384, { 350, 0, 0, 0, 0, 0 } },
   // Passage of Arms
-  { 7385, { 0, 0, 0, 0, 0 } },
+  { 7385, { 0, 0, 0, 0, 0, 0 } },
   // Onslaught
-  { 7386, { 100, 0, 0, 0, 0 } },
+  { 7386, { 100, 0, 0, 0, 0, 0 } },
   // Upheaval
-  { 7387, { 450, 0, 0, 0, 0 } },
+  { 7387, { 450, 0, 0, 0, 0, 0 } },
   // Shake It Off
-  { 7388, { 0, 0, 0, 0, 0 } },
+  { 7388, { 0, 0, 0, 0, 0, 0 } },
   // Inner Release
-  { 7389, { 0, 0, 0, 0, 0 } },
+  { 7389, { 0, 0, 0, 0, 0, 0 } },
   // Delirium
-  { 7390, { 0, 0, 0, 0, 0 } },
+  { 7390, { 0, 0, 0, 0, 0, 0 } },
   // Quietus
-  { 7391, { 210, 0, 0, 0, 0 } },
+  { 7391, { 210, 0, 0, 0, 0, 0 } },
   // Bloodspiller
-  { 7392, { 600, 0, 0, 0, 0 } },
+  { 7392, { 600, 0, 0, 0, 0, 0 } },
   // The Blackest Night
-  { 7393, { 0, 0, 0, 0, 0 } },
+  { 7393, { 0, 0, 0, 0, 0, 0 } },
   // Riddle of Earth
-  { 7394, { 0, 0, 0, 0, 0 } },
+  { 7394, { 0, 0, 0, 0, 0, 0 } },
   // Riddle of Fire
-  { 7395, { 0, 0, 0, 0, 0 } },
+  { 7395, { 0, 0, 0, 0, 0, 0 } },
   // Brotherhood
-  { 7396, { 0, 0, 0, 0, 0 } },
+  { 7396, { 0, 0, 0, 0, 0, 0 } },
   // Sonic Thrust
-  { 7397, { 100, 0, 0, 0, 0 } },
+  { 7397, { 100, 200, 0, 0, 0, 0 } },
   // Dragon Sight
-  { 7398, { 0, 0, 0, 0, 0 } },
+  { 7398, { 0, 0, 0, 0, 0, 0 } },
   // Mirage Dive
-  { 7399, { 250, 0, 0, 0, 0 } },
+  { 7399, { 250, 0, 0, 0, 0, 0 } },
   // Nastrond
-  { 7400, { 400, 0, 0, 0, 0 } },
+  { 7400, { 400, 0, 0, 0, 0, 0 } },
   // Hellfrog Medium
-  { 7401, { 400, 0, 0, 0, 0 } },
+  { 7401, { 400, 0, 0, 0, 0, 0 } },
   // Bhavacakra
-  { 7402, { 500, 0, 0, 0, 0 } },
+  { 7402, { 500, 0, 0, 0, 0, 0 } },
   // Ten Chi Jin
-  { 7403, { 0, 0, 0, 0, 0 } },
+  { 7403, { 0, 0, 0, 0, 0, 0 } },
   // Pitch Perfect
-  { 7404, { 100, 0, 0, 0, 0 } },
+  { 7404, { 100, 0, 0, 0, 0, 0 } },
   // Troubadour
-  { 7405, { 0, 0, 0, 0, 0 } },
+  { 7405, { 0, 0, 0, 0, 0, 0 } },
   // Caustic Bite
-  { 7406, { 150, 0, 0, 0, 0 } },
+  { 7406, { 150, 0, 0, 0, 0, 0 } },
   // Stormbite
-  { 7407, { 100, 0, 0, 0, 0 } },
+  { 7407, { 100, 0, 0, 0, 0, 0 } },
   // Nature's Minne
-  { 7408, { 0, 0, 0, 0, 0 } },
+  { 7408, { 0, 0, 0, 0, 0, 0 } },
   // Refulgent Arrow
-  { 7409, { 340, 0, 0, 0, 0 } },
+  { 7409, { 340, 0, 0, 0, 0, 0 } },
   // Heat Blast
-  { 7410, { 200, 0, 0, 0, 0 } },
+  { 7410, { 200, 0, 0, 0, 0, 0 } },
   // Heated Split Shot
-  { 7411, { 200, 0, 0, 0, 0 } },
+  { 7411, { 200, 0, 0, 0, 0, 0 } },
   // Heated Slug Shot
-  { 7412, { 100, 0, 0, 0, 0 } },
+  { 7412, { 100, 300, 0, 0, 0, 0 } },
   // Heated Clean Shot
-  { 7413, { 100, 0, 0, 0, 0 } },
+  { 7413, { 100, 400, 0, 0, 0, 0 } },
   // Barrel Stabilizer
-  { 7414, { 0, 0, 0, 0, 0 } },
+  { 7414, { 0, 0, 0, 0, 0, 0 } },
   // Rook Overdrive
-  { 7415, { 0, 0, 0, 0, 0 } },
+  { 7415, { 0, 0, 0, 0, 0, 0 } },
   // Flamethrower
-  { 7418, { 0, 0, 0, 0, 0 } },
+  { 7418, { 0, 0, 0, 0, 0, 0 } },
   // Between the Lines
-  { 7419, { 0, 0, 0, 0, 0 } },
+  { 7419, { 0, 0, 0, 0, 0, 0 } },
   // Thunder IV
-  { 7420, { 50, 0, 0, 0, 0 } },
+  { 7420, { 50, 0, 0, 0, 0, 0 } },
   // Triplecast
-  { 7421, { 0, 0, 0, 0, 0 } },
+  { 7421, { 0, 0, 0, 0, 0, 0 } },
   // Foul
-  { 7422, { 650, 0, 0, 0, 0 } },
+  { 7422, { 650, 0, 0, 0, 0, 0 } },
   // Aetherpact
-  { 7423, { 0, 0, 0, 0, 0 } },
+  { 7423, { 0, 0, 0, 0, 0, 0 } },
   // Bio III
-  { 7424, { 0, 0, 0, 0, 0 } },
+  { 7424, { 0, 0, 0, 0, 0, 0 } },
   // Miasma III
-  { 7425, { 40, 0, 0, 0, 0 } },
+  { 7425, { 40, 0, 0, 0, 0, 0 } },
   // Ruin IV
-  { 7426, { 120, 0, 0, 0, 0 } },
+  { 7426, { 120, 0, 0, 0, 0, 0 } },
   // Summon Bahamut
-  { 7427, { 0, 0, 0, 0, 0 } },
+  { 7427, { 0, 0, 0, 0, 0, 0 } },
   // Enkindle Bahamut
-  { 7429, { 0, 0, 0, 0, 0 } },
+  { 7429, { 0, 0, 0, 0, 0, 0 } },
   // Thin Air
-  { 7430, { 0, 0, 0, 0, 0 } },
+  { 7430, { 0, 0, 0, 0, 0, 0 } },
   // Stone IV
-  { 7431, { 280, 0, 0, 0, 0 } },
+  { 7431, { 280, 0, 0, 0, 0, 0 } },
   // Divine Benison
-  { 7432, { 0, 0, 0, 0, 0 } },
+  { 7432, { 0, 0, 0, 0, 0, 0 } },
   // Plenary Indulgence
-  { 7433, { 0, 0, 0, 0, 200 } },
+  { 7433, { 0, 0, 0, 0, 0, 200 } },
   // Excogitation
-  { 7434, { 0, 0, 0, 0, 800 } },
+  { 7434, { 0, 0, 0, 0, 0, 800 } },
   // Broil II
-  { 7435, { 260, 0, 0, 0, 0 } },
+  { 7435, { 260, 0, 0, 0, 0, 0 } },
   // Chain Stratagem
-  { 7436, { 0, 0, 0, 0, 0 } },
+  { 7436, { 0, 0, 0, 0, 0, 0 } },
   // Aetherpact
-  { 7437, { 0, 0, 0, 0, 0 } },
+  { 7437, { 0, 0, 0, 0, 0, 0 } },
   // Earthly Star
-  { 7439, { 100, 0, 0, 0, 540 } },
+  { 7439, { 100, 0, 0, 0, 0, 540 } },
   // Malefic III
-  { 7442, { 210, 0, 0, 0, 0 } },
+  { 7442, { 210, 0, 0, 0, 0, 0 } },
   // Minor Arcana
-  { 7443, { 0, 0, 0, 0, 0 } },
+  { 7443, { 0, 0, 0, 0, 0, 0 } },
   // Lord of Crowns
-  { 7444, { 0, 0, 0, 0, 0 } },
+  { 7444, { 0, 0, 0, 0, 0, 0 } },
   // Lady of Crowns
-  { 7445, { 0, 0, 0, 0, 0 } },
+  { 7445, { 0, 0, 0, 0, 0, 0 } },
   // Thunder II
-  { 7447, { 30, 0, 0, 0, 0 } },
+  { 7447, { 30, 0, 0, 0, 0, 0 } },
   // Sleeve Draw
-  { 7448, { 0, 0, 0, 0, 0 } },
+  { 7448, { 0, 0, 0, 0, 0, 0 } },
   // Hakaze
-  { 7477, { 170, 0, 0, 0, 0 } },
+  { 7477, { 170, 0, 0, 0, 0, 0 } },
   // Jinpu
-  { 7478, { 100, 0, 0, 0, 0 } },
+  { 7478, { 100, 320, 0, 0, 0, 0 } },
   // Shifu
-  { 7479, { 100, 0, 0, 0, 0 } },
+  { 7479, { 100, 320, 0, 0, 0, 0 } },
   // Yukikaze
-  { 7480, { 100, 0, 0, 0, 0 } },
+  { 7480, { 100, 400, 0, 0, 0, 0 } },
   // Gekko
-  { 7481, { 100, 0, 0, 0, 0 } },
+  { 7481, { 100, 470, 0, 0, 0, 0 } },
   // Kasha
-  { 7482, { 100, 0, 0, 0, 0 } },
+  { 7482, { 100, 470, 0, 0, 0, 0 } },
   // Fuga
-  { 7483, { 100, 0, 0, 0, 0 } },
+  { 7483, { 100, 0, 0, 0, 0, 0 } },
   // Mangetsu
-  { 7484, { 100, 0, 0, 0, 0 } },
+  { 7484, { 100, 160, 0, 0, 0, 0 } },
   // Oka
-  { 7485, { 100, 0, 0, 0, 0 } },
+  { 7485, { 100, 160, 0, 0, 0, 0 } },
   // Enpi
-  { 7486, { 100, 0, 0, 0, 0 } },
+  { 7486, { 100, 0, 0, 0, 0, 0 } },
   // Midare Setsugekka
-  { 7487, { 800, 0, 0, 0, 0 } },
+  { 7487, { 800, 0, 0, 0, 0, 0 } },
   // Tenka Goken
-  { 7488, { 360, 0, 0, 0, 0 } },
+  { 7488, { 360, 0, 0, 0, 0, 0 } },
   // Higanbana
-  { 7489, { 250, 0, 0, 0, 0 } },
+  { 7489, { 250, 0, 0, 0, 0, 0 } },
   // Hissatsu: Shinten
-  { 7490, { 320, 0, 0, 0, 0 } },
+  { 7490, { 320, 0, 0, 0, 0, 0 } },
   // Hissatsu: Kyuten
-  { 7491, { 150, 0, 0, 0, 0 } },
+  { 7491, { 150, 0, 0, 0, 0, 0 } },
   // Hissatsu: Gyoten
-  { 7492, { 100, 0, 0, 0, 0 } },
+  { 7492, { 100, 0, 0, 0, 0, 0 } },
   // Hissatsu: Yaten
-  { 7493, { 100, 0, 0, 0, 0 } },
+  { 7493, { 100, 0, 0, 0, 0, 0 } },
   // Hissatsu: Kaiten
-  { 7494, { 0, 0, 0, 0, 0 } },
+  { 7494, { 0, 0, 0, 0, 0, 0 } },
   // Hissatsu: Guren
-  { 7496, { 850, 0, 0, 0, 0 } },
+  { 7496, { 850, 0, 0, 0, 0, 0 } },
   // Meditate
-  { 7497, { 0, 0, 0, 0, 0 } },
+  { 7497, { 0, 0, 0, 0, 0, 0 } },
   // Third Eye
-  { 7498, { 0, 0, 0, 0, 0 } },
+  { 7498, { 0, 0, 0, 0, 0, 0 } },
   // Meikyo Shisui
-  { 7499, { 0, 0, 0, 0, 0 } },
+  { 7499, { 0, 0, 0, 0, 0, 0 } },
   // Hissatsu: Seigan
-  { 7501, { 220, 0, 0, 0, 0 } },
+  { 7501, { 220, 0, 0, 0, 0, 0 } },
   // Merciful Eyes
-  { 7502, { 0, 0, 0, 0, 200 } },
+  { 7502, { 0, 0, 0, 0, 0, 200 } },
   // Jolt
-  { 7503, { 180, 0, 0, 0, 0 } },
+  { 7503, { 180, 0, 0, 0, 0, 0 } },
   // Riposte
-  { 7504, { 130, 0, 0, 0, 0 } },
+  { 7504, { 130, 0, 0, 0, 0, 0 } },
   // Verthunder
-  { 7505, { 310, 0, 0, 0, 0 } },
+  { 7505, { 310, 0, 0, 0, 0, 0 } },
   // Corps-a-corps
-  { 7506, { 130, 0, 0, 0, 0 } },
+  { 7506, { 130, 0, 0, 0, 0, 0 } },
   // Veraero
-  { 7507, { 310, 0, 0, 0, 0 } },
+  { 7507, { 310, 0, 0, 0, 0, 0 } },
   // Scatter
-  { 7509, { 120, 0, 0, 0, 0 } },
+  { 7509, { 120, 0, 0, 0, 0, 0 } },
   // Verfire
-  { 7510, { 270, 0, 0, 0, 0 } },
+  { 7510, { 270, 0, 0, 0, 0, 0 } },
   // Verstone
-  { 7511, { 270, 0, 0, 0, 0 } },
+  { 7511, { 270, 0, 0, 0, 0, 0 } },
   // Zwerchhau
-  { 7512, { 100, 0, 0, 0, 0 } },
+  { 7512, { 100, 150, 0, 0, 0, 0 } },
   // Moulinet
-  { 7513, { 60, 0, 0, 0, 0 } },
+  { 7513, { 60, 0, 0, 0, 0, 0 } },
   // Vercure
-  { 7514, { 0, 0, 0, 0, 350 } },
+  { 7514, { 0, 0, 0, 0, 0, 350 } },
   // Displacement
-  { 7515, { 0, 0, 0, 0, 0 } },
+  { 7515, { 0, 0, 0, 0, 0, 0 } },
   // Redoublement
-  { 7516, { 100, 0, 0, 0, 0 } },
+  { 7516, { 100, 230, 0, 0, 0, 0 } },
   // Fleche
-  { 7517, { 420, 0, 0, 0, 0 } },
+  { 7517, { 420, 0, 0, 0, 0, 0 } },
   // Acceleration
-  { 7518, { 0, 0, 0, 0, 0 } },
+  { 7518, { 0, 0, 0, 0, 0, 0 } },
   // Contre Sixte
-  { 7519, { 350, 0, 0, 0, 0 } },
+  { 7519, { 350, 0, 0, 0, 0, 0 } },
   // Embolden
-  { 7520, { 0, 0, 0, 0, 0 } },
+  { 7520, { 0, 0, 0, 0, 0, 0 } },
   // Manafication
-  { 7521, { 0, 0, 0, 0, 0 } },
+  { 7521, { 0, 0, 0, 0, 0, 0 } },
   // Verraise
-  { 7523, { 0, 0, 0, 0, 0 } },
+  { 7523, { 0, 0, 0, 0, 0, 0 } },
   // Jolt II
-  { 7524, { 250, 0, 0, 0, 0 } },
+  { 7524, { 250, 0, 0, 0, 0, 0 } },
   // Verflare
-  { 7525, { 600, 0, 0, 0, 0 } },
+  { 7525, { 600, 0, 0, 0, 0, 0 } },
   // Verholy
-  { 7526, { 600, 0, 0, 0, 0 } },
+  { 7526, { 600, 0, 0, 0, 0, 0 } },
   // Enchanted Riposte
-  { 7527, { 210, 0, 0, 0, 0 } },
+  { 7527, { 210, 0, 0, 0, 0, 0 } },
   // Enchanted Zwerchhau
-  { 7528, { 100, 0, 0, 0, 0 } },
+  { 7528, { 100, 290, 0, 0, 0, 0 } },
   // Enchanted Redoublement
-  { 7529, { 100, 0, 0, 0, 0 } },
+  { 7529, { 100, 470, 0, 0, 0, 0 } },
   // Enchanted Moulinet
-  { 7530, { 200, 0, 0, 0, 0 } },
+  { 7530, { 200, 0, 0, 0, 0, 0 } },
   // Magitek Cannon
-  { 7619, { 0, 0, 0, 0, 0 } },
+  { 7619, { 0, 0, 0, 0, 0, 0 } },
   // Photon Stream
-  { 7620, { 0, 0, 0, 0, 0 } },
+  { 7620, { 0, 0, 0, 0, 0, 0 } },
   // Diffractive Magitek Cannon
-  { 7621, { 0, 0, 0, 0, 0 } },
+  { 7621, { 0, 0, 0, 0, 0, 0 } },
   // High-powered Magitek Cannon
-  { 7622, { 0, 0, 0, 0, 0 } },
+  { 7622, { 0, 0, 0, 0, 0, 0 } },
   // Doom of the Living
-  { 7861, { 0, 0, 0, 0, 0 } },
+  { 7861, { 0, 0, 0, 0, 0, 0 } },
   // Vermilion Scourge
-  { 7862, { 0, 0, 0, 0, 0 } },
+  { 7862, { 0, 0, 0, 0, 0, 0 } },
   // Iaijutsu
-  { 7867, { 0, 0, 0, 0, 0 } },
+  { 7867, { 0, 0, 0, 0, 0, 0 } },
   // Dissolve Union
-  { 7869, { 0, 0, 0, 0, 0 } },
+  { 7869, { 0, 0, 0, 0, 0, 0 } },
   // Stellar Detonation
-  { 8324, { 100, 0, 0, 0, 540 } },
+  { 8324, { 100, 0, 0, 0, 0, 540 } },
   // Broken Ridge
-  { 8395, { 0, 0, 0, 0, 0 } },
+  { 8395, { 0, 0, 0, 0, 0, 0 } },
   // Magitek Pulse
-  { 8624, { 0, 0, 0, 0, 0 } },
+  { 8624, { 0, 0, 0, 0, 0, 0 } },
   // Magitek Thunder
-  { 8625, { 0, 0, 0, 0, 0 } },
+  { 8625, { 0, 0, 0, 0, 0, 0 } },
   // attack
-  { 8687, { 0, 0, 0, 0, 0 } },
+  { 8687, { 0, 0, 0, 0, 0, 0 } },
   // Katon
-  { 9012, { 0, 0, 0, 0, 0 } },
+  { 9012, { 0, 0, 0, 0, 0, 0 } },
   // Remove Barrel
-  { 9015, { 0, 0, 0, 0, 0 } },
+  { 9015, { 0, 0, 0, 0, 0, 0 } },
   // Tenka Goken
-  { 9143, { 0, 0, 0, 0, 0 } },
+  { 9143, { 0, 0, 0, 0, 0, 0 } },
   // Thunderous Force
-  { 9294, { 0, 0, 0, 0, 0 } },
+  { 9294, { 0, 0, 0, 0, 0, 0 } },
   // Raiton
-  { 9301, { 0, 0, 0, 0, 0 } },
+  { 9301, { 0, 0, 0, 0, 0, 0 } },
   // Raiton
-  { 9302, { 0, 0, 0, 0, 0 } },
+  { 9302, { 0, 0, 0, 0, 0, 0 } },
   // Bishop Overdrive
-  { 9372, { 0, 0, 0, 0, 0 } },
+  { 9372, { 0, 0, 0, 0, 0, 0 } },
   // Undraw
-  { 9629, { 0, 0, 0, 0, 0 } },
+  { 9629, { 0, 0, 0, 0, 0, 0 } },
   // Self-detonate
-  { 9775, { 0, 0, 0, 0, 0 } },
+  { 9775, { 0, 0, 0, 0, 0, 0 } },
   // Shatterstone
-  { 9823, { 0, 0, 0, 0, 0 } },
+  { 9823, { 0, 0, 0, 0, 0, 0 } },
   // attack
-  { 9996, { 0, 0, 0, 0, 0 } },
+  { 9996, { 0, 0, 0, 0, 0, 0 } },
   // Ungarmax
-  { 10001, { 0, 0, 0, 0, 0 } },
+  { 10001, { 0, 0, 0, 0, 0, 0 } },
   // Starstorm
-  { 10894, { 0, 0, 0, 0, 0 } },
+  { 10894, { 0, 0, 0, 0, 0, 0 } },
   // attack
-  { 10946, { 0, 0, 0, 0, 0 } },
+  { 10946, { 0, 0, 0, 0, 0, 0 } },
   // attack
-  { 10947, { 0, 0, 0, 0, 0 } },
+  { 10947, { 0, 0, 0, 0, 0, 0 } },
   // Ruin III
-  { 11191, { 200, 0, 0, 0, 0 } },
+  { 11191, { 200, 0, 0, 0, 0, 0 } },
   // Physick
-  { 11192, { 0, 0, 0, 0, 400 } },
+  { 11192, { 0, 0, 0, 0, 0, 400 } },
   // Starstorm
-  { 11193, { 3600, 0, 0, 0, 0 } },
+  { 11193, { 3600, 0, 0, 0, 0, 0 } },
   // Snort
-  { 11383, { 0, 0, 0, 0, 0 } },
+  { 11383, { 0, 0, 0, 0, 0, 0 } },
   // 4-tonze Weight
-  { 11384, { 110, 0, 0, 0, 0 } },
+  { 11384, { 110, 0, 0, 0, 0, 0 } },
   // Water Cannon
-  { 11385, { 120, 0, 0, 0, 0 } },
+  { 11385, { 120, 0, 0, 0, 0, 0 } },
   // Song of Torment
-  { 11386, { 50, 0, 0, 0, 0 } },
+  { 11386, { 50, 0, 0, 0, 0, 0 } },
   // High Voltage
-  { 11387, { 90, 0, 0, 0, 0 } },
+  { 11387, { 90, 0, 0, 0, 0, 0 } },
   // Bad Breath
-  { 11388, { 0, 0, 0, 0, 0 } },
+  { 11388, { 0, 0, 0, 0, 0, 0 } },
   // Flying Frenzy
-  { 11389, { 80, 0, 0, 0, 0 } },
+  { 11389, { 80, 0, 0, 0, 0, 0 } },
   // Aqua Breath
-  { 11390, { 90, 0, 0, 0, 0 } },
+  { 11390, { 90, 0, 0, 0, 0, 0 } },
   // Plaincracker
-  { 11391, { 130, 0, 0, 0, 0 } },
+  { 11391, { 130, 0, 0, 0, 0, 0 } },
   // Acorn Bomb
-  { 11392, { 0, 0, 0, 0, 0 } },
+  { 11392, { 0, 0, 0, 0, 0, 0 } },
   // Bristle
-  { 11393, { 0, 0, 0, 0, 0 } },
+  { 11393, { 0, 0, 0, 0, 0, 0 } },
   // Mind Blast
-  { 11394, { 100, 0, 0, 0, 0 } },
+  { 11394, { 100, 0, 0, 0, 0, 0 } },
   // Blood Drain
-  { 11395, { 20, 0, 0, 0, 0 } },
+  { 11395, { 20, 0, 0, 0, 0, 0 } },
   // Bomb Toss
-  { 11396, { 110, 0, 0, 0, 0 } },
+  { 11396, { 110, 0, 0, 0, 0, 0 } },
   // 1000 Needles
-  { 11397, { 0, 0, 0, 0, 0 } },
+  { 11397, { 0, 0, 0, 0, 0, 0 } },
   // Drill Cannons
-  { 11398, { 120, 0, 0, 0, 0 } },
+  { 11398, { 120, 0, 0, 0, 0, 0 } },
   // the Look
-  { 11399, { 130, 0, 0, 0, 0 } },
+  { 11399, { 130, 0, 0, 0, 0, 0 } },
   // Sharpened Knife
-  { 11400, { 120, 0, 0, 0, 0 } },
+  { 11400, { 120, 0, 0, 0, 0, 0 } },
   // Loom
-  { 11401, { 0, 0, 0, 0, 0 } },
+  { 11401, { 0, 0, 0, 0, 0, 0 } },
   // Flame Thrower
-  { 11402, { 130, 0, 0, 0, 0 } },
+  { 11402, { 130, 0, 0, 0, 0, 0 } },
   // Faze
-  { 11403, { 0, 0, 0, 0, 0 } },
+  { 11403, { 0, 0, 0, 0, 0, 0 } },
   // Glower
-  { 11404, { 130, 0, 0, 0, 0 } },
+  { 11404, { 130, 0, 0, 0, 0, 0 } },
   // Missile
-  { 11405, { 0, 0, 0, 0, 0 } },
+  { 11405, { 0, 0, 0, 0, 0, 0 } },
   // White Wind
-  { 11406, { 0, 0, 0, 0, 0 } },
+  { 11406, { 0, 0, 0, 0, 0, 0 } },
   // Final Sting
-  { 11407, { 1500, 0, 0, 0, 0 } },
+  { 11407, { 1500, 0, 0, 0, 0, 0 } },
   // Self-destruct
-  { 11408, { 900, 0, 0, 0, 0 } },
+  { 11408, { 900, 0, 0, 0, 0, 0 } },
   // Transfusion
-  { 11409, { 0, 0, 0, 0, 0 } },
+  { 11409, { 0, 0, 0, 0, 0, 0 } },
   // Toad Oil
-  { 11410, { 0, 0, 0, 0, 0 } },
+  { 11410, { 0, 0, 0, 0, 0, 0 } },
   // Off-guard
-  { 11411, { 0, 0, 0, 0, 0 } },
+  { 11411, { 0, 0, 0, 0, 0, 0 } },
   // Sticky Tongue
-  { 11412, { 0, 0, 0, 0, 0 } },
+  { 11412, { 0, 0, 0, 0, 0, 0 } },
   // Tail Screw
-  { 11413, { 0, 0, 0, 0, 0 } },
+  { 11413, { 0, 0, 0, 0, 0, 0 } },
   // Level 5 Petrify
-  { 11414, { 0, 0, 0, 0, 0 } },
+  { 11414, { 0, 0, 0, 0, 0, 0 } },
   // Moon Flute
-  { 11415, { 0, 0, 0, 0, 0 } },
+  { 11415, { 0, 0, 0, 0, 0, 0 } },
   // Doom
-  { 11416, { 0, 0, 0, 0, 0 } },
+  { 11416, { 0, 0, 0, 0, 0, 0 } },
   // Mighty Guard
-  { 11417, { 0, 0, 0, 0, 0 } },
+  { 11417, { 0, 0, 0, 0, 0, 0 } },
   // Ice Spikes
-  { 11418, { 0, 0, 0, 0, 0 } },
+  { 11418, { 0, 0, 0, 0, 0, 0 } },
   // the Ram's Voice
-  { 11419, { 130, 0, 0, 0, 0 } },
+  { 11419, { 130, 0, 0, 0, 0, 0 } },
   // the Dragon's Voice
-  { 11420, { 110, 0, 0, 0, 0 } },
+  { 11420, { 110, 0, 0, 0, 0, 0 } },
   // Peculiar Light
-  { 11421, { 0, 0, 0, 0, 0 } },
+  { 11421, { 0, 0, 0, 0, 0, 0 } },
   // Ink Jet
-  { 11422, { 120, 0, 0, 0, 0 } },
+  { 11422, { 120, 0, 0, 0, 0, 0 } },
   // Flying Sardine
-  { 11423, { 10, 0, 0, 0, 0 } },
+  { 11423, { 10, 0, 0, 0, 0, 0 } },
   // Diamondback
-  { 11424, { 0, 0, 0, 0, 0 } },
+  { 11424, { 0, 0, 0, 0, 0, 0 } },
   // Fire Angon
-  { 11425, { 100, 0, 0, 0, 0 } },
+  { 11425, { 100, 0, 0, 0, 0, 0 } },
   // Feather Rain
-  { 11426, { 180, 0, 0, 0, 0 } },
+  { 11426, { 180, 0, 0, 0, 0, 0 } },
   // Eruption
-  { 11427, { 220, 0, 0, 0, 0 } },
+  { 11427, { 220, 0, 0, 0, 0, 0 } },
   // Mountain Buster
-  { 11428, { 310, 0, 0, 0, 0 } },
+  { 11428, { 310, 0, 0, 0, 0, 0 } },
   // Shock Strike
-  { 11429, { 310, 0, 0, 0, 0 } },
+  { 11429, { 310, 0, 0, 0, 0, 0 } },
   // Glass Dance
-  { 11430, { 290, 0, 0, 0, 0 } },
+  { 11430, { 290, 0, 0, 0, 0, 0 } },
   // Veil of the Whorl
-  { 11431, { 0, 0, 0, 0, 0 } },
+  { 11431, { 0, 0, 0, 0, 0, 0 } },
   // Tri-shackle
-  { 11482, { 30, 0, 0, 0, 0 } },
+  { 11482, { 30, 0, 0, 0, 0, 0 } },
   // attack
-  { 11784, { 0, 0, 0, 0, 0 } },
+  { 11784, { 0, 0, 0, 0, 0, 0 } },
   // Stone IV of the Seventh Dawn
-  { 13423, { 140, 0, 0, 0, 0 } },
+  { 13423, { 140, 0, 0, 0, 0, 0 } },
   // Aero II of the Seventh Dawn
-  { 13424, { 50, 0, 0, 0, 0 } },
+  { 13424, { 50, 0, 0, 0, 0, 0 } },
   // Cure II of the Seventh Dawn
-  { 13425, { 0, 0, 0, 0, 700 } },
+  { 13425, { 0, 0, 0, 0, 0, 700 } },
   // Aetherwell
-  { 13426, { 0, 0, 0, 0, 0 } },
+  { 13426, { 0, 0, 0, 0, 0, 0 } },
   // Thunderous Force
-  { 14587, { 0, 0, 0, 0, 0 } },
+  { 14587, { 0, 0, 0, 0, 0, 0 } },
   // Kyokufu
-  { 14840, { 180, 0, 0, 0, 0 } },
+  { 14840, { 180, 0, 0, 0, 0, 0 } },
   // Ajisai
-  { 14841, { 100, 0, 0, 0, 0 } },
+  { 14841, { 100, 0, 0, 0, 0, 0 } },
   // Hissatsu: Gyoten
-  { 14842, { 100, 0, 0, 0, 0 } },
+  { 14842, { 100, 0, 0, 0, 0, 0 } },
   // 冥界恐叫打
-  { 14843, { 0, 0, 0, 0, 0 } },
+  { 14843, { 0, 0, 0, 0, 0, 0 } },
   // Second Wind
-  { 15375, { 0, 0, 0, 0, 500 } },
+  { 15375, { 0, 0, 0, 0, 0, 500 } },
   // Interject
-  { 15537, { 0, 0, 0, 0, 0 } },
+  { 15537, { 0, 0, 0, 0, 0, 0 } },
   // Fight or Flight
-  { 15870, { 0, 0, 0, 0, 0 } },
+  { 15870, { 0, 0, 0, 0, 0, 0 } },
   // Cascade
-  { 15989, { 200, 0, 0, 0, 0 } },
+  { 15989, { 200, 0, 0, 0, 0, 0 } },
   // Fountain
-  { 15990, { 100, 0, 0, 0, 0 } },
+  { 15990, { 100, 250, 0, 0, 0, 0 } },
   // Reverse Cascade
-  { 15991, { 300, 0, 0, 0, 0 } },
+  { 15991, { 300, 0, 0, 0, 0, 0 } },
   // Fountainfall
-  { 15992, { 350, 0, 0, 0, 0 } },
+  { 15992, { 350, 0, 0, 0, 0, 0 } },
   // Windmill
-  { 15993, { 150, 0, 0, 0, 0 } },
+  { 15993, { 150, 0, 0, 0, 0, 0 } },
   // Bladeshower
-  { 15994, { 100, 0, 0, 0, 0 } },
+  { 15994, { 100, 200, 0, 0, 0, 0 } },
   // Rising Windmill
-  { 15995, { 250, 0, 0, 0, 0 } },
+  { 15995, { 250, 0, 0, 0, 0, 0 } },
   // Bloodshower
-  { 15996, { 300, 0, 0, 0, 0 } },
+  { 15996, { 300, 0, 0, 0, 0, 0 } },
   // Standard Step
-  { 15997, { 0, 0, 0, 0, 0 } },
+  { 15997, { 0, 0, 0, 0, 0, 0 } },
   // Technical Step
-  { 15998, { 0, 0, 0, 0, 0 } },
+  { 15998, { 0, 0, 0, 0, 0, 0 } },
   // Emboite
-  { 15999, { 0, 0, 0, 0, 0 } },
+  { 15999, { 0, 0, 0, 0, 0, 0 } },
   // Entrechat
-  { 16000, { 0, 0, 0, 0, 0 } },
+  { 16000, { 0, 0, 0, 0, 0, 0 } },
   // Jete
-  { 16001, { 0, 0, 0, 0, 0 } },
+  { 16001, { 0, 0, 0, 0, 0, 0 } },
   // Pirouette
-  { 16002, { 0, 0, 0, 0, 0 } },
+  { 16002, { 0, 0, 0, 0, 0, 0 } },
   // Standard Finish
-  { 16003, { 0, 0, 0, 0, 0 } },
+  { 16003, { 0, 0, 0, 0, 0, 0 } },
   // Technical Finish
-  { 16004, { 0, 0, 0, 0, 0 } },
+  { 16004, { 0, 0, 0, 0, 0, 0 } },
   // Saber Dance
-  { 16005, { 600, 0, 0, 0, 0 } },
+  { 16005, { 600, 0, 0, 0, 0, 0 } },
   // Closed Position
-  { 16006, { 0, 0, 0, 0, 0 } },
+  { 16006, { 0, 0, 0, 0, 0, 0 } },
   // Fan Dance
-  { 16007, { 150, 0, 0, 0, 0 } },
+  { 16007, { 150, 0, 0, 0, 0, 0 } },
   // Fan Dance II
-  { 16008, { 100, 0, 0, 0, 0 } },
+  { 16008, { 100, 0, 0, 0, 0, 0 } },
   // Fan Dance III
-  { 16009, { 200, 0, 0, 0, 0 } },
+  { 16009, { 200, 0, 0, 0, 0, 0 } },
   // En Avant
-  { 16010, { 0, 0, 0, 0, 0 } },
+  { 16010, { 0, 0, 0, 0, 0, 0 } },
   // Devilment
-  { 16011, { 0, 0, 0, 0, 0 } },
+  { 16011, { 0, 0, 0, 0, 0, 0 } },
   // Shield Samba
-  { 16012, { 0, 0, 0, 0, 0 } },
+  { 16012, { 0, 0, 0, 0, 0, 0 } },
   // Flourish
-  { 16013, { 0, 0, 0, 0, 0 } },
+  { 16013, { 0, 0, 0, 0, 0, 0 } },
   // Improvisation
-  { 16014, { 0, 0, 0, 0, 0 } },
+  { 16014, { 0, 0, 0, 0, 0, 0 } },
   // Curing Waltz
-  { 16015, { 0, 0, 0, 0, 200 } },
+  { 16015, { 0, 0, 0, 0, 0, 200 } },
   // Keen Edge
-  { 16137, { 200, 0, 0, 0, 0 } },
+  { 16137, { 200, 0, 0, 0, 0, 0 } },
   // No Mercy
-  { 16138, { 0, 0, 0, 0, 0 } },
+  { 16138, { 0, 0, 0, 0, 0, 0 } },
   // Brutal Shell
-  { 16139, { 100, 0, 0, 0, 150 } },
+  { 16139, { 100, 300, 0, 0, 0, 150 } },
   // Camouflage
-  { 16140, { 0, 0, 0, 0, 0 } },
+  { 16140, { 0, 0, 0, 0, 0, 0 } },
   // Demon Slice
-  { 16141, { 150, 0, 0, 0, 0 } },
+  { 16141, { 150, 0, 0, 0, 0, 0 } },
   // Royal Guard
-  { 16142, { 0, 0, 0, 0, 0 } },
+  { 16142, { 0, 0, 0, 0, 0, 0 } },
   // Lightning Shot
-  { 16143, { 150, 0, 0, 0, 0 } },
+  { 16143, { 150, 0, 0, 0, 0, 0 } },
   // Danger Zone
-  { 16144, { 350, 0, 0, 0, 0 } },
+  { 16144, { 350, 0, 0, 0, 0, 0 } },
   // Solid Barrel
-  { 16145, { 100, 0, 0, 0, 0 } },
+  { 16145, { 100, 400, 0, 0, 0, 0 } },
   // Gnashing Fang
-  { 16146, { 450, 0, 0, 0, 0 } },
+  { 16146, { 450, 0, 0, 0, 0, 0 } },
   // Savage Claw
-  { 16147, { 550, 0, 0, 0, 0 } },
+  { 16147, { 550, 0, 0, 0, 0, 0 } },
   // Nebula
-  { 16148, { 0, 0, 0, 0, 0 } },
+  { 16148, { 0, 0, 0, 0, 0, 0 } },
   // Demon Slaughter
-  { 16149, { 100, 0, 0, 0, 0 } },
+  { 16149, { 100, 250, 0, 0, 0, 0 } },
   // Wicked Talon
-  { 16150, { 650, 0, 0, 0, 0 } },
+  { 16150, { 650, 0, 0, 0, 0, 0 } },
   // Aurora
-  { 16151, { 0, 0, 0, 0, 200 } },
+  { 16151, { 0, 0, 0, 0, 0, 200 } },
   // Superbolide
-  { 16152, { 0, 0, 0, 0, 0 } },
+  { 16152, { 0, 0, 0, 0, 0, 0 } },
   // Sonic Break
-  { 16153, { 300, 0, 0, 0, 0 } },
+  { 16153, { 300, 0, 0, 0, 0, 0 } },
   // Rough Divide
-  { 16154, { 200, 0, 0, 0, 0 } },
+  { 16154, { 200, 0, 0, 0, 0, 0 } },
   // Continuation
-  { 16155, { 0, 0, 0, 0, 0 } },
+  { 16155, { 0, 0, 0, 0, 0, 0 } },
   // Jugular Rip
-  { 16156, { 260, 0, 0, 0, 0 } },
+  { 16156, { 260, 0, 0, 0, 0, 0 } },
   // Abdomen Tear
-  { 16157, { 280, 0, 0, 0, 0 } },
+  { 16157, { 280, 0, 0, 0, 0, 0 } },
   // Eye Gouge
-  { 16158, { 300, 0, 0, 0, 0 } },
+  { 16158, { 300, 0, 0, 0, 0, 0 } },
   // Bow Shock
-  { 16159, { 200, 0, 0, 0, 0 } },
+  { 16159, { 200, 0, 0, 0, 0, 0 } },
   // Heart of Light
-  { 16160, { 0, 0, 0, 0, 0 } },
+  { 16160, { 0, 0, 0, 0, 0, 0 } },
   // Heart of Stone
-  { 16161, { 0, 0, 0, 0, 0 } },
+  { 16161, { 0, 0, 0, 0, 0, 0 } },
   // Burst Strike
-  { 16162, { 500, 0, 0, 0, 0 } },
+  { 16162, { 500, 0, 0, 0, 0, 0 } },
   // Fated Circle
-  { 16163, { 320, 0, 0, 0, 0 } },
+  { 16163, { 320, 0, 0, 0, 0, 0 } },
   // Bloodfest
-  { 16164, { 0, 0, 0, 0, 0 } },
+  { 16164, { 0, 0, 0, 0, 0, 0 } },
   // Blasting Zone
-  { 16165, { 800, 0, 0, 0, 0 } },
+  { 16165, { 800, 0, 0, 0, 0, 0 } },
   // Single Standard Finish
-  { 16191, { 0, 0, 0, 0, 0 } },
+  { 16191, { 0, 0, 0, 0, 0, 0 } },
   // Double Standard Finish
-  { 16192, { 0, 0, 0, 0, 0 } },
+  { 16192, { 0, 0, 0, 0, 0, 0 } },
   // Single Technical Finish
-  { 16193, { 0, 0, 0, 0, 0 } },
+  { 16193, { 0, 0, 0, 0, 0, 0 } },
   // Double Technical Finish
-  { 16194, { 0, 0, 0, 0, 0 } },
+  { 16194, { 0, 0, 0, 0, 0, 0 } },
   // Triple Technical Finish
-  { 16195, { 0, 0, 0, 0, 0 } },
+  { 16195, { 0, 0, 0, 0, 0, 0 } },
   // Quadruple Technical Finish
-  { 16196, { 0, 0, 0, 0, 0 } },
+  { 16196, { 0, 0, 0, 0, 0, 0 } },
   // Physick
-  { 16230, { 0, 0, 0, 0, 400 } },
+  { 16230, { 0, 0, 0, 0, 0, 400 } },
   // Rightful Sword
-  { 16269, { 0, 0, 0, 0, 0 } },
+  { 16269, { 0, 0, 0, 0, 0, 0 } },
   // Brutal Shell
-  { 16418, { 0, 0, 0, 0, 0 } },
+  { 16418, { 0, 0, 0, 0, 0, 0 } },
   // Keen Edge
-  { 16434, { 0, 0, 0, 0, 0 } },
+  { 16434, { 0, 0, 0, 0, 0, 0 } },
   // Solid Barrel
-  { 16435, { 0, 0, 0, 0, 0 } },
+  { 16435, { 0, 0, 0, 0, 0, 0 } },
   // Soothing Potion
-  { 16436, { 0, 0, 0, 0, 0 } },
+  { 16436, { 0, 0, 0, 0, 0, 0 } },
   // Shining Blade
-  { 16437, { 0, 0, 0, 0, 0 } },
+  { 16437, { 0, 0, 0, 0, 0, 0 } },
   // Perfect Deception
-  { 16438, { 0, 0, 0, 0, 0 } },
+  { 16438, { 0, 0, 0, 0, 0, 0 } },
   // Leap of Faith
-  { 16439, { 0, 0, 0, 0, 0 } },
+  { 16439, { 0, 0, 0, 0, 0, 0 } },
   // Prominence
-  { 16457, { 100, 0, 0, 0, 0 } },
+  { 16457, { 100, 220, 0, 0, 0, 0 } },
   // Holy Circle
-  { 16458, { 250, 0, 0, 0, 0 } },
+  { 16458, { 250, 0, 0, 0, 0, 0 } },
   // Confiteor
-  { 16459, { 800, 0, 0, 0, 0 } },
+  { 16459, { 800, 0, 0, 0, 0, 0 } },
   // Atonement
-  { 16460, { 550, 0, 0, 0, 0 } },
+  { 16460, { 550, 0, 0, 0, 0, 0 } },
   // Intervene
-  { 16461, { 200, 0, 0, 0, 0 } },
+  { 16461, { 200, 0, 0, 0, 0, 0 } },
   // Mythril Tempest
-  { 16462, { 100, 0, 0, 0, 0 } },
+  { 16462, { 100, 200, 0, 0, 0, 0 } },
   // Chaotic Cyclone
-  { 16463, { 400, 0, 0, 0, 0 } },
+  { 16463, { 400, 0, 0, 0, 0, 0 } },
   // Nascent Flash
-  { 16464, { 0, 0, 0, 0, 0 } },
+  { 16464, { 0, 0, 0, 0, 0, 0 } },
   // Inner Chaos
-  { 16465, { 920, 0, 0, 0, 0 } },
+  { 16465, { 920, 0, 0, 0, 0, 0 } },
   // Flood of Darkness
-  { 16466, { 250, 0, 0, 0, 0 } },
+  { 16466, { 250, 0, 0, 0, 0, 0 } },
   // Edge of Darkness
-  { 16467, { 350, 0, 0, 0, 0 } },
+  { 16467, { 350, 0, 0, 0, 0, 0 } },
   // Stalwart Soul
-  { 16468, { 100, 0, 0, 0, 0 } },
+  { 16468, { 100, 160, 0, 0, 0, 0 } },
   // Flood of Shadow
-  { 16469, { 300, 0, 0, 0, 0 } },
+  { 16469, { 300, 0, 0, 0, 0, 0 } },
   // Edge of Shadow
-  { 16470, { 500, 0, 0, 0, 0 } },
+  { 16470, { 500, 0, 0, 0, 0, 0 } },
   // Dark Missionary
-  { 16471, { 0, 0, 0, 0, 0 } },
+  { 16471, { 0, 0, 0, 0, 0, 0 } },
   // Living Shadow
-  { 16472, { 0, 0, 0, 0, 0 } },
+  { 16472, { 0, 0, 0, 0, 0, 0 } },
   // Four-point Fury
-  { 16473, { 120, 0, 0, 0, 0 } },
+  { 16473, { 120, 0, 0, 0, 0, 0 } },
   // Enlightenment
-  { 16474, { 220, 0, 0, 0, 0 } },
+  { 16474, { 220, 0, 0, 0, 0, 0 } },
   // Anatman
-  { 16475, { 0, 0, 0, 0, 0 } },
+  { 16475, { 0, 0, 0, 0, 0, 0 } },
   // Six-sided Star
-  { 16476, { 400, 0, 0, 0, 0 } },
+  { 16476, { 400, 0, 0, 0, 0, 0 } },
   // Coerthan Torment
-  { 16477, { 100, 0, 0, 0, 0 } },
+  { 16477, { 100, 230, 0, 0, 0, 0 } },
   // High Jump
-  { 16478, { 400, 0, 0, 0, 0 } },
+  { 16478, { 400, 0, 0, 0, 0, 0 } },
   // Raiden Thrust
-  { 16479, { 330, 0, 0, 0, 0 } },
+  { 16479, { 330, 0, 0, 0, 0, 0 } },
   // Stardiver
-  { 16480, { 550, 0, 0, 0, 0 } },
+  { 16480, { 550, 0, 0, 0, 0, 0 } },
   // Hissatsu: Senei
-  { 16481, { 1100, 0, 0, 0, 0 } },
+  { 16481, { 1100, 0, 0, 0, 0, 0 } },
   // Ikishoten
-  { 16482, { 0, 0, 0, 0, 0 } },
+  { 16482, { 0, 0, 0, 0, 0, 0 } },
   // Tsubame-gaeshi
-  { 16483, { 0, 0, 0, 0, 0 } },
+  { 16483, { 0, 0, 0, 0, 0, 0 } },
   // Kaeshi: Higanbana
-  { 16484, { 375, 0, 0, 0, 0 } },
+  { 16484, { 375, 0, 0, 0, 0, 0 } },
   // Kaeshi: Goken
-  { 16485, { 540, 0, 0, 0, 0 } },
+  { 16485, { 540, 0, 0, 0, 0, 0 } },
   // Kaeshi: Setsugekka
-  { 16486, { 1200, 0, 0, 0, 0 } },
+  { 16486, { 1200, 0, 0, 0, 0, 0 } },
   // Shoha
-  { 16487, { 0, 0, 0, 0, 0 } },
+  { 16487, { 0, 0, 0, 0, 0, 0 } },
   // Hakke Mujinsatsu
-  { 16488, { 100, 0, 0, 0, 0 } },
+  { 16488, { 100, 140, 0, 0, 0, 0 } },
   // Meisui
-  { 16489, { 0, 0, 0, 0, 0 } },
+  { 16489, { 0, 0, 0, 0, 0, 0 } },
   // Goka Mekkyaku
-  { 16491, { 400, 0, 0, 0, 0 } },
+  { 16491, { 400, 0, 0, 0, 0, 0 } },
   // Hyosho Ranryu
-  { 16492, { 600, 0, 0, 0, 0 } },
+  { 16492, { 600, 0, 0, 0, 0, 0 } },
   // Bunshin
-  { 16493, { 0, 0, 0, 0, 0 } },
+  { 16493, { 0, 0, 0, 0, 0, 0 } },
   // Shadowbite
-  { 16494, { 100, 0, 0, 0, 0 } },
+  { 16494, { 100, 0, 0, 0, 0, 0 } },
   // Burst Shot
-  { 16495, { 230, 0, 0, 0, 0 } },
+  { 16495, { 230, 0, 0, 0, 0, 0 } },
   // Apex Arrow
-  { 16496, { 500, 0, 0, 0, 0 } },
+  { 16496, { 500, 0, 0, 0, 0, 0 } },
   // Auto Crossbow
-  { 16497, { 180, 0, 0, 0, 0 } },
+  { 16497, { 180, 0, 0, 0, 0, 0 } },
   // Drill
-  { 16498, { 700, 0, 0, 0, 0 } },
+  { 16498, { 700, 0, 0, 0, 0, 0 } },
   // Bioblaster
-  { 16499, { 60, 0, 0, 0, 0 } },
+  { 16499, { 60, 0, 0, 0, 0, 0 } },
   // Air Anchor
-  { 16500, { 700, 0, 0, 0, 0 } },
+  { 16500, { 700, 0, 0, 0, 0, 0 } },
   // Automaton Queen
-  { 16501, { 0, 0, 0, 0, 0 } },
+  { 16501, { 0, 0, 0, 0, 0, 0 } },
   // Queen Overdrive
-  { 16502, { 0, 0, 0, 0, 0 } },
+  { 16502, { 0, 0, 0, 0, 0, 0 } },
   // Despair
-  { 16505, { 380, 0, 0, 0, 0 } },
+  { 16505, { 380, 0, 0, 0, 0, 0 } },
   // Umbral Soul
-  { 16506, { 0, 0, 0, 0, 0 } },
+  { 16506, { 0, 0, 0, 0, 0, 0 } },
   // Xenoglossy
-  { 16507, { 750, 0, 0, 0, 0 } },
+  { 16507, { 750, 0, 0, 0, 0, 0 } },
   // Energy Drain
-  { 16508, { 100, 0, 0, 0, 0 } },
+  { 16508, { 100, 0, 0, 0, 0, 0 } },
   // Egi Assault
-  { 16509, { 0, 0, 0, 0, 0 } },
+  { 16509, { 0, 0, 0, 0, 0, 0 } },
   // Energy Siphon
-  { 16510, { 40, 0, 0, 0, 0 } },
+  { 16510, { 40, 0, 0, 0, 0, 0 } },
   // Outburst
-  { 16511, { 70, 0, 0, 0, 0 } },
+  { 16511, { 70, 0, 0, 0, 0, 0 } },
   // Egi Assault II
-  { 16512, { 0, 0, 0, 0, 0 } },
+  { 16512, { 0, 0, 0, 0, 0, 0 } },
   // Firebird Trance
-  { 16513, { 0, 0, 0, 0, 0 } },
+  { 16513, { 0, 0, 0, 0, 0, 0 } },
   // Fountain of Fire
-  { 16514, { 250, 0, 0, 0, 0 } },
+  { 16514, { 250, 0, 0, 0, 0, 0 } },
   // Brand of Purgatory
-  { 16515, { 350, 0, 0, 0, 0 } },
+  { 16515, { 350, 0, 0, 0, 0, 0 } },
   // Enkindle Phoenix
-  { 16516, { 0, 0, 0, 0, 0 } },
+  { 16516, { 0, 0, 0, 0, 0, 0 } },
   // Verthunder II
-  { 16524, { 0, 0, 0, 0, 0 } },
+  { 16524, { 0, 0, 0, 0, 0, 0 } },
   // Veraero II
-  { 16525, { 0, 0, 0, 0, 0 } },
+  { 16525, { 0, 0, 0, 0, 0, 0 } },
   // Impact
-  { 16526, { 220, 0, 0, 0, 0 } },
+  { 16526, { 220, 0, 0, 0, 0, 0 } },
   // Engagement
-  { 16527, { 150, 0, 0, 0, 0 } },
+  { 16527, { 150, 0, 0, 0, 0, 0 } },
   // Enchanted Reprise
-  { 16528, { 220, 0, 0, 0, 0 } },
+  { 16528, { 220, 0, 0, 0, 0, 0 } },
   // Reprise
-  { 16529, { 100, 0, 0, 0, 0 } },
+  { 16529, { 100, 0, 0, 0, 0, 0 } },
   // Scorch
-  { 16530, { 700, 0, 0, 0, 0 } },
+  { 16530, { 700, 0, 0, 0, 0, 0 } },
   // Afflatus Solace
-  { 16531, { 0, 0, 0, 0, 700 } },
+  { 16531, { 0, 0, 0, 0, 0, 700 } },
   // Dia
-  { 16532, { 120, 0, 0, 0, 0 } },
+  { 16532, { 120, 0, 0, 0, 0, 0 } },
   // Glare
-  { 16533, { 300, 0, 0, 0, 0 } },
+  { 16533, { 300, 0, 0, 0, 0, 0 } },
   // Afflatus Rapture
-  { 16534, { 0, 0, 0, 0, 300 } },
+  { 16534, { 0, 0, 0, 0, 0, 300 } },
   // Afflatus Misery
-  { 16535, { 900, 0, 0, 0, 0 } },
+  { 16535, { 900, 0, 0, 0, 0, 0 } },
   // Temperance
-  { 16536, { 0, 0, 0, 0, 0 } },
+  { 16536, { 0, 0, 0, 0, 0, 0 } },
   // Whispering Dawn
-  { 16537, { 0, 0, 0, 0, 0 } },
+  { 16537, { 0, 0, 0, 0, 0, 0 } },
   // Fey Illumination
-  { 16538, { 0, 0, 0, 0, 0 } },
+  { 16538, { 0, 0, 0, 0, 0, 0 } },
   // Art of War
-  { 16539, { 150, 0, 0, 0, 0 } },
+  { 16539, { 150, 0, 0, 0, 0, 0 } },
   // Biolysis
-  { 16540, { 0, 0, 0, 0, 0 } },
+  { 16540, { 0, 0, 0, 0, 0, 0 } },
   // Broil III
-  { 16541, { 280, 0, 0, 0, 0 } },
+  { 16541, { 280, 0, 0, 0, 0, 0 } },
   // Recitation
-  { 16542, { 0, 0, 0, 0, 0 } },
+  { 16542, { 0, 0, 0, 0, 0, 0 } },
   // Fey Blessing
-  { 16543, { 0, 0, 0, 0, 0 } },
+  { 16543, { 0, 0, 0, 0, 0, 0 } },
   // Summon Seraph
-  { 16545, { 0, 0, 0, 0, 0 } },
+  { 16545, { 0, 0, 0, 0, 0, 0 } },
   // Consolation
-  { 16546, { 0, 0, 0, 0, 0 } },
+  { 16546, { 0, 0, 0, 0, 0, 0 } },
   // Firebird Trance
-  { 16549, { 0, 0, 0, 0, 0 } },
+  { 16549, { 0, 0, 0, 0, 0, 0 } },
   // Divination
-  { 16552, { 0, 0, 0, 0, 0 } },
+  { 16552, { 0, 0, 0, 0, 0, 0 } },
   // Celestial Opposition
-  { 16553, { 0, 0, 0, 0, 100 } },
+  { 16553, { 0, 0, 0, 0, 0, 100 } },
   // Combust III
-  { 16554, { 0, 0, 0, 0, 0 } },
+  { 16554, { 0, 0, 0, 0, 0, 0 } },
   // Malefic IV
-  { 16555, { 240, 0, 0, 0, 0 } },
+  { 16555, { 240, 0, 0, 0, 0, 0 } },
   // Celestial Intersection
-  { 16556, { 0, 0, 0, 0, 150 } },
+  { 16556, { 0, 0, 0, 0, 0, 150 } },
   // Horoscope
-  { 16557, { 0, 0, 0, 0, 100 } },
+  { 16557, { 0, 0, 0, 0, 0, 100 } },
   // Horoscope
-  { 16558, { 0, 0, 0, 0, 0 } },
+  { 16558, { 0, 0, 0, 0, 0, 0 } },
   // Neutral Sect
-  { 16559, { 0, 0, 0, 0, 0 } },
+  { 16559, { 0, 0, 0, 0, 0, 0 } },
   // Ronkan Fire III
-  { 16574, { 430, 0, 0, 0, 0 } },
+  { 16574, { 430, 0, 0, 0, 0, 0 } },
   // Ronkan Blizzard III
-  { 16575, { 240, 0, 0, 0, 0 } },
+  { 16575, { 240, 0, 0, 0, 0, 0 } },
   // Ronkan Thunder III
-  { 16576, { 200, 0, 0, 0, 0 } },
+  { 16576, { 200, 0, 0, 0, 0, 0 } },
   // Ronkan Flare
-  { 16577, { 460, 0, 0, 0, 0 } },
+  { 16577, { 460, 0, 0, 0, 0, 0 } },
   // Falling Star
-  { 16578, { 1500, 0, 0, 0, 0 } },
+  { 16578, { 1500, 0, 0, 0, 0, 0 } },
   // Detonator
-  { 16766, { 0, 0, 0, 0, 0 } },
+  { 16766, { 0, 0, 0, 0, 0, 0 } },
   // Fast Blade
-  { 16788, { 0, 0, 0, 0, 0 } },
+  { 16788, { 0, 0, 0, 0, 0, 0 } },
   // Sunshadow
-  { 16789, { 0, 0, 0, 0, 0 } },
+  { 16789, { 0, 0, 0, 0, 0, 0 } },
   // Assault I: Glittering Topaz
-  { 16791, { 0, 0, 0, 0, 0 } },
+  { 16791, { 0, 0, 0, 0, 0, 0 } },
   // Assault II: Shining Topaz
-  { 16792, { 0, 0, 0, 0, 0 } },
+  { 16792, { 0, 0, 0, 0, 0, 0 } },
   // Assault I: Downburst
-  { 16793, { 0, 0, 0, 0, 0 } },
+  { 16793, { 0, 0, 0, 0, 0, 0 } },
   // Assault II: Glittering Emerald
-  { 16794, { 0, 0, 0, 0, 0 } },
+  { 16794, { 0, 0, 0, 0, 0, 0 } },
   // Assault I: Earthen Armor
-  { 16795, { 0, 0, 0, 0, 0 } },
+  { 16795, { 0, 0, 0, 0, 0, 0 } },
   // Assault II: Mountain Buster
-  { 16796, { 0, 0, 0, 0, 0 } },
+  { 16796, { 0, 0, 0, 0, 0, 0 } },
   // Assault I: Aerial Slash
-  { 16797, { 0, 0, 0, 0, 0 } },
+  { 16797, { 0, 0, 0, 0, 0, 0 } },
   // Assault II: Slipstream
-  { 16798, { 0, 0, 0, 0, 0 } },
+  { 16798, { 0, 0, 0, 0, 0, 0 } },
   // Assault I: Crimson Cyclone
-  { 16799, { 0, 0, 0, 0, 0 } },
+  { 16799, { 0, 0, 0, 0, 0, 0 } },
   // Assault II: Flaming Crush
-  { 16800, { 0, 0, 0, 0, 0 } },
+  { 16800, { 0, 0, 0, 0, 0, 0 } },
   // Enkindle: Earthen Fury
-  { 16801, { 0, 0, 0, 0, 0 } },
+  { 16801, { 0, 0, 0, 0, 0, 0 } },
   // Enkindle: Aerial Blast
-  { 16802, { 0, 0, 0, 0, 0 } },
+  { 16802, { 0, 0, 0, 0, 0, 0 } },
   // Enkindle: Inferno
-  { 16803, { 0, 0, 0, 0, 0 } },
+  { 16803, { 0, 0, 0, 0, 0, 0 } },
   // Rough Divide
-  { 16804, { 200, 0, 0, 0, 0 } },
+  { 16804, { 200, 0, 0, 0, 0, 0 } },
   // Tactician
-  { 16889, { 0, 0, 0, 0, 0 } },
+  { 16889, { 0, 0, 0, 0, 0, 0 } },
   // Swashbuckler
-  { 16984, { 0, 0, 0, 0, 0 } },
+  { 16984, { 0, 0, 0, 0, 0, 0 } },
   // Greatest Eclipse
-  { 16985, { 0, 0, 0, 0, 0 } },
+  { 16985, { 0, 0, 0, 0, 0, 0 } },
   // Ronkan Cure II
-  { 17000, { 0, 0, 0, 0, 1300 } },
+  { 17000, { 0, 0, 0, 0, 0, 1300 } },
   // Ronkan Medica
-  { 17001, { 0, 0, 0, 0, 500 } },
+  { 17001, { 0, 0, 0, 0, 0, 500 } },
   // Ronkan Esuna
-  { 17002, { 0, 0, 0, 0, 0 } },
+  { 17002, { 0, 0, 0, 0, 0, 0 } },
   // Ronkan Stone II
-  { 17003, { 200, 0, 0, 0, 0 } },
+  { 17003, { 200, 0, 0, 0, 0, 0 } },
   // Ronkan Renew
-  { 17004, { 0, 0, 0, 0, 0 } },
+  { 17004, { 0, 0, 0, 0, 0, 0 } },
   // Play
-  { 17055, { 0, 0, 0, 0, 0 } },
+  { 17055, { 0, 0, 0, 0, 0, 0 } },
   // Gunmetal Soul
-  { 17105, { 0, 0, 0, 0, 0 } },
+  { 17105, { 0, 0, 0, 0, 0, 0 } },
   // Crimson Lotus
-  { 17106, { 0, 0, 0, 0, 0 } },
+  { 17106, { 0, 0, 0, 0, 0, 0 } },
   // Acidic Bite
-  { 17122, { 300, 0, 0, 0, 0 } },
+  { 17122, { 300, 0, 0, 0, 0, 0 } },
   // Heavy Shot
-  { 17123, { 550, 0, 0, 0, 0 } },
+  { 17123, { 550, 0, 0, 0, 0, 0 } },
   // Radiant Arrow
-  { 17124, { 1100, 0, 0, 0, 0 } },
+  { 17124, { 1100, 0, 0, 0, 0, 0 } },
   // Dulling Arrow
-  { 17125, { 0, 0, 0, 0, 0 } },
+  { 17125, { 0, 0, 0, 0, 0, 0 } },
   // Aspected Benefic
-  { 17151, { 0, 0, 0, 0, 200 } },
+  { 17151, { 0, 0, 0, 0, 0, 200 } },
   // Aspected Helios
-  { 17152, { 0, 0, 0, 0, 100 } },
+  { 17152, { 0, 0, 0, 0, 0, 100 } },
   // Hypercharge
-  { 17209, { 0, 0, 0, 0, 0 } },
+  { 17209, { 0, 0, 0, 0, 0, 0 } },
   // Summon Eos
-  { 17215, { 0, 0, 0, 0, 0 } },
+  { 17215, { 0, 0, 0, 0, 0, 0 } },
   // Summon Selene
-  { 17216, { 0, 0, 0, 0, 0 } },
+  { 17216, { 0, 0, 0, 0, 0, 0 } },
   // attack
-  { 17222, { 0, 0, 0, 0, 0 } },
+  { 17222, { 0, 0, 0, 0, 0, 0 } },
   // Chivalrous Spirit
-  { 17236, { 0, 0, 0, 0, 1200 } },
+  { 17236, { 0, 0, 0, 0, 0, 1200 } },
   // Souldeep Invisibility
-  { 17291, { 0, 0, 0, 0, 0 } },
+  { 17291, { 0, 0, 0, 0, 0, 0 } },
   // Spinning Edge
-  { 17413, { 0, 0, 0, 0, 0 } },
+  { 17413, { 0, 0, 0, 0, 0, 0 } },
   // Gust Slash
-  { 17414, { 0, 0, 0, 0, 0 } },
+  { 17414, { 0, 0, 0, 0, 0, 0 } },
   // Aeolian Edge
-  { 17415, { 0, 0, 0, 0, 0 } },
+  { 17415, { 0, 0, 0, 0, 0, 0 } },
   // Shadow Fang
-  { 17416, { 0, 0, 0, 0, 0 } },
+  { 17416, { 0, 0, 0, 0, 0, 0 } },
   // Armor Crush
-  { 17417, { 0, 0, 0, 0, 0 } },
+  { 17417, { 0, 0, 0, 0, 0, 0 } },
   // Throwing Dagger
-  { 17418, { 0, 0, 0, 0, 0 } },
+  { 17418, { 0, 0, 0, 0, 0, 0 } },
   // Death Blossom
-  { 17419, { 0, 0, 0, 0, 0 } },
+  { 17419, { 0, 0, 0, 0, 0, 0 } },
   // Hakke Mujinsatsu
-  { 17420, { 0, 0, 0, 0, 0 } },
+  { 17420, { 0, 0, 0, 0, 0, 0 } },
   // Hunter's Prudence
-  { 17596, { 0, 0, 0, 0, 1000 } },
+  { 17596, { 0, 0, 0, 0, 0, 1000 } },
   // Nebula
-  { 17839, { 0, 0, 0, 0, 0 } },
+  { 17839, { 0, 0, 0, 0, 0, 0 } },
   // Bio
-  { 17864, { 0, 0, 0, 0, 0 } },
+  { 17864, { 0, 0, 0, 0, 0, 0 } },
   // Bio II
-  { 17865, { 0, 0, 0, 0, 0 } },
+  { 17865, { 0, 0, 0, 0, 0, 0 } },
   // Ruin
-  { 17869, { 160, 0, 0, 0, 0 } },
+  { 17869, { 160, 0, 0, 0, 0, 0 } },
   // Ruin II
-  { 17870, { 0, 0, 0, 0, 0 } },
+  { 17870, { 0, 0, 0, 0, 0, 0 } },
   // Smackdown
-  { 17901, { 0, 0, 0, 0, 0 } },
+  { 17901, { 0, 0, 0, 0, 0, 0 } },
   // 攻撃
-  { 18034, { 0, 0, 0, 0, 0 } },
+  { 18034, { 0, 0, 0, 0, 0, 0 } },
   // Ending
-  { 18073, { 0, 0, 0, 0, 0 } },
+  { 18073, { 0, 0, 0, 0, 0, 0 } },
   // Straight Shot
-  { 18190, { 0, 0, 0, 0, 0 } },
+  { 18190, { 0, 0, 0, 0, 0, 0 } },
 
 };
\ No newline at end of file

From 78aade9cea3f5db996b00c107c1d057380edf806 Mon Sep 17 00:00:00 2001
From: NotAdam <adam@notadam.me>
Date: Fri, 26 Jul 2019 20:28:01 +1000
Subject: [PATCH 117/351] kinda working effect packets

---
 src/world/Action/Action.cpp                  | 12 ++++++----
 src/world/Action/Action.h                    |  6 +++--
 src/world/Action/EffectBuilder.cpp           | 25 +++++++++++++++-----
 src/world/Action/EffectBuilder.h             |  8 +++----
 src/world/Manager/ActionMgr.cpp              | 10 ++++----
 src/world/Manager/ActionMgr.h                |  4 ++--
 src/world/Network/Handlers/ActionHandler.cpp |  4 ++--
 7 files changed, 44 insertions(+), 25 deletions(-)

diff --git a/src/world/Action/Action.cpp b/src/world/Action/Action.cpp
index 886cab4e..40d8f73b 100644
--- a/src/world/Action/Action.cpp
+++ b/src/world/Action/Action.cpp
@@ -35,19 +35,21 @@ using namespace Sapphire::World;
 Action::Action::Action() = default;
 Action::Action::~Action() = default;
 
-Action::Action::Action( Entity::CharaPtr caster, uint32_t actionId, FrameworkPtr fw ) :
-  Action( std::move( caster ), actionId, nullptr, std::move( fw ) )
+Action::Action::Action( Entity::CharaPtr caster, uint32_t actionId, uint16_t sequence, FrameworkPtr fw ) :
+  Action( std::move( caster ), actionId, sequence, nullptr, std::move( fw ) )
 {
 }
 
-Action::Action::Action( Entity::CharaPtr caster, uint32_t actionId, Data::ActionPtr actionData, FrameworkPtr fw ) :
+Action::Action::Action( Entity::CharaPtr caster, uint32_t actionId, uint16_t sequence,
+                        Data::ActionPtr actionData, FrameworkPtr fw ) :
   m_pSource( std::move( caster ) ),
   m_pFw( std::move( fw ) ),
   m_actionData( std::move( actionData ) ),
   m_id( actionId ),
   m_targetId( 0 ),
   m_startTime( 0 ),
-  m_interruptType( Common::ActionInterruptType::None )
+  m_interruptType( Common::ActionInterruptType::None ),
+  m_sequence( sequence )
 {
 }
 
@@ -70,7 +72,7 @@ bool Action::Action::init()
     m_actionData = actionData;
   }
 
-  m_effectBuilder = make_EffectBuilder( m_pSource, getId() );
+  m_effectBuilder = make_EffectBuilder( m_pSource, getId(), m_sequence );
 
   m_castTimeMs = static_cast< uint32_t >( m_actionData->cast100ms * 100 );
   m_recastTimeMs = static_cast< uint32_t >( m_actionData->recast100ms * 100 );
diff --git a/src/world/Action/Action.h b/src/world/Action/Action.h
index debaaea0..d4308882 100644
--- a/src/world/Action/Action.h
+++ b/src/world/Action/Action.h
@@ -20,8 +20,8 @@ namespace Sapphire::World::Action
   public:
 
     Action();
-    Action( Entity::CharaPtr caster, uint32_t actionId, FrameworkPtr fw );
-    Action( Entity::CharaPtr caster, uint32_t actionId, Data::ActionPtr actionData, FrameworkPtr fw );
+    Action( Entity::CharaPtr caster, uint32_t actionId, uint16_t sequence, FrameworkPtr fw );
+    Action( Entity::CharaPtr caster, uint32_t actionId, uint16_t sequence, Data::ActionPtr actionData, FrameworkPtr fw );
 
     virtual ~Action();
 
@@ -141,6 +141,8 @@ namespace Sapphire::World::Action
 
     uint32_t m_id;
 
+    uint16_t m_sequence;
+
     Common::ActionPrimaryCostType m_primaryCostType;
     uint16_t m_primaryCost;
 
diff --git a/src/world/Action/EffectBuilder.cpp b/src/world/Action/EffectBuilder.cpp
index ee0c04d2..d6f206eb 100644
--- a/src/world/Action/EffectBuilder.cpp
+++ b/src/world/Action/EffectBuilder.cpp
@@ -1,7 +1,7 @@
 #include "EffectBuilder.h"
 #include "EffectResult.h"
 
-#include <Actor/Chara.h>
+#include <Actor/Player.h>
 
 #include <Network/PacketWrappers/EffectPacket.h>
 
@@ -16,9 +16,10 @@ using namespace Sapphire;
 using namespace Sapphire::World::Action;
 using namespace Sapphire::Network::Packets;
 
-EffectBuilder::EffectBuilder( Entity::CharaPtr source, uint32_t actionId ) :
+EffectBuilder::EffectBuilder( Entity::CharaPtr source, uint32_t actionId, uint16_t sequence ) :
   m_sourceChara( std::move( source ) ),
-  m_actionId( actionId )
+  m_actionId( actionId ),
+  m_sequence( sequence )
 {
 
 }
@@ -77,13 +78,25 @@ void EffectBuilder::buildAndSendPackets()
 
     auto effectPacket = std::make_shared< Server::EffectPacket >( m_sourceChara->getId(), result->getTarget()->getId(), m_actionId );
     effectPacket->setRotation( Common::Util::floatToUInt16Rot( m_sourceChara->getRot() ) );
+    effectPacket->setSequence( m_sequence );
 
     effectPacket->addEffect( result->buildEffectEntry() );
 
-    auto sequence = m_sourceChara->getCurrentTerritory()->getNextEffectSequence();
-    effectPacket->setSequence( sequence );
+    m_sourceChara->sendToInRangeSet( effectPacket, false );
 
-    m_sourceChara->sendToInRangeSet( effectPacket, true );
+    // send a dupe packet to the caster with hiddenAnimation field set
+    if( auto player = m_sourceChara->getAsPlayer() )
+    {
+      auto effectPacket2 = std::make_shared< Server::EffectPacket >( m_sourceChara->getId(), result->getTarget()->getId(), m_actionId );
+      effectPacket2->setRotation( Common::Util::floatToUInt16Rot( m_sourceChara->getRot() ) );
+      effectPacket2->setSequence( m_sequence );
+
+      effectPacket2->data().hiddenAnimation = m_sequence;
+
+      effectPacket2->addEffect( result->buildEffectEntry() );
+
+      player->queuePacket( effectPacket2 );
+    }
   }
 
 }
\ No newline at end of file
diff --git a/src/world/Action/EffectBuilder.h b/src/world/Action/EffectBuilder.h
index 386bf080..f8d3bb40 100644
--- a/src/world/Action/EffectBuilder.h
+++ b/src/world/Action/EffectBuilder.h
@@ -17,7 +17,7 @@ namespace Sapphire::World::Action
       CriticalDirectHit
     };
 
-    EffectBuilder( Entity::CharaPtr source, uint32_t actionId );
+    EffectBuilder( Entity::CharaPtr source, uint32_t actionId, uint16_t sequence );
 
 
     void healTarget( Entity::CharaPtr& target, uint32_t amount,
@@ -34,11 +34,11 @@ namespace Sapphire::World::Action
 
     uint32_t getResultDelayMs();
 
+  private:
+    uint32_t m_actionId;
+    uint16_t m_sequence;
 
     Entity::CharaPtr m_sourceChara;
-
-    uint32_t m_actionId;
-
     std::unordered_map< uint32_t, EffectResultPtr > m_resolvedEffects;
   };
 
diff --git a/src/world/Manager/ActionMgr.cpp b/src/world/Manager/ActionMgr.cpp
index feced875..43d14170 100644
--- a/src/world/Manager/ActionMgr.cpp
+++ b/src/world/Manager/ActionMgr.cpp
@@ -19,12 +19,13 @@ World::Manager::ActionMgr::ActionMgr( Sapphire::FrameworkPtr pFw ) :
 }
 
 void World::Manager::ActionMgr::handlePlacedPlayerAction( Entity::Player& player, uint32_t actionId,
-                                                          Data::ActionPtr actionData, Common::FFXIVARR_POSITION3 pos )
+                                                          Data::ActionPtr actionData, Common::FFXIVARR_POSITION3 pos,
+                                                          uint16_t sequence )
 {
   player.sendDebug( "got aoe act: {0}", actionData->name );
 
 
-  auto action = Action::make_Action( player.getAsPlayer(), actionId, actionData, framework() );
+  auto action = Action::make_Action( player.getAsPlayer(), actionId, sequence, actionData, framework() );
 
   if( !action->init() )
     return;
@@ -42,9 +43,10 @@ void World::Manager::ActionMgr::handlePlacedPlayerAction( Entity::Player& player
 }
 
 void World::Manager::ActionMgr::handleTargetedPlayerAction( Entity::Player& player, uint32_t actionId,
-                                                            Data::ActionPtr actionData, uint64_t targetId )
+                                                            Data::ActionPtr actionData, uint64_t targetId,
+                                                            uint16_t sequence )
 {
-  auto action = Action::make_Action( player.getAsPlayer(), actionId, actionData, framework() );
+  auto action = Action::make_Action( player.getAsPlayer(), actionId, sequence, actionData, framework() );
 
   action->setTargetId( targetId );
 
diff --git a/src/world/Manager/ActionMgr.h b/src/world/Manager/ActionMgr.h
index e3ab37d3..75e238e9 100644
--- a/src/world/Manager/ActionMgr.h
+++ b/src/world/Manager/ActionMgr.h
@@ -22,9 +22,9 @@ namespace Sapphire::World::Manager
     ~ActionMgr() = default;
 
     void handleTargetedPlayerAction( Entity::Player& player, uint32_t actionId,
-                                     Data::ActionPtr actionData, uint64_t targetId );
+                                     Data::ActionPtr actionData, uint64_t targetId, uint16_t sequence );
     void handlePlacedPlayerAction( Entity::Player& player, uint32_t actionId,
-                                   Data::ActionPtr actionData, Common::FFXIVARR_POSITION3 pos );
+                                   Data::ActionPtr actionData, Common::FFXIVARR_POSITION3 pos, uint16_t sequence );
 
     void handleItemAction( Entity::Player& player, uint32_t itemId, Data::ItemActionPtr itemActionData,
                            uint16_t itemSourceSlot, uint16_t itemSourceContainer );
diff --git a/src/world/Network/Handlers/ActionHandler.cpp b/src/world/Network/Handlers/ActionHandler.cpp
index 99137c62..92641c98 100644
--- a/src/world/Network/Handlers/ActionHandler.cpp
+++ b/src/world/Network/Handlers/ActionHandler.cpp
@@ -48,7 +48,7 @@ void Sapphire::Network::GameConnection::actionHandler( FrameworkPtr pFw,
       if( !action )
         return;
 
-      actionMgr->handleTargetedPlayerAction( player, actionId, action, targetId );
+      actionMgr->handleTargetedPlayerAction( player, actionId, action, targetId, sequence );
       break;
     }
 
@@ -112,5 +112,5 @@ void Sapphire::Network::GameConnection::placedActionHandler( FrameworkPtr pFw,
     return;
 
   auto actionMgr = pFw->get< World::Manager::ActionMgr >();
-  actionMgr->handlePlacedPlayerAction( player, actionId, action, pos );
+  actionMgr->handlePlacedPlayerAction( player, actionId, action, pos, sequence );
 }

From 431948f7f8439a69befb252056fda369a2ca3cef Mon Sep 17 00:00:00 2001
From: NotAdam <adam@notadam.me>
Date: Fri, 26 Jul 2019 21:58:13 +1000
Subject: [PATCH 118/351] proper sequencing now I think

---
 .../Network/PacketDef/Zone/ServerZoneDef.h    |  2 +-
 src/world/Action/EffectBuilder.cpp            | 20 ++++---------------
 .../Network/PacketWrappers/EffectPacket.h     |  3 ++-
 3 files changed, 7 insertions(+), 18 deletions(-)

diff --git a/src/common/Network/PacketDef/Zone/ServerZoneDef.h b/src/common/Network/PacketDef/Zone/ServerZoneDef.h
index b417a197..d0ad4b92 100644
--- a/src/common/Network/PacketDef/Zone/ServerZoneDef.h
+++ b/src/common/Network/PacketDef/Zone/ServerZoneDef.h
@@ -462,7 +462,7 @@ namespace Sapphire::Network::Packets::Server
     float animationLockTime; // maybe? doesn't seem to do anything
     uint32_t someTargetId; // always 00 00 00 E0, 0x0E000000 is the internal def for INVALID TARGET ID
 
-    uint16_t hiddenAnimation; // if 0, always shows animation, otherwise hides it. counts up by 1 for each animation skipped on a caster
+    uint16_t sourceSequence; // if 0, always shows animation, otherwise hides it. counts up by 1 for each animation skipped on a caster
     uint16_t rotation;
     uint16_t actionAnimationId; // the animation that is played by the casting character
     uint8_t variation; // variation in the animation
diff --git a/src/world/Action/EffectBuilder.cpp b/src/world/Action/EffectBuilder.cpp
index d6f206eb..7b070fc0 100644
--- a/src/world/Action/EffectBuilder.cpp
+++ b/src/world/Action/EffectBuilder.cpp
@@ -76,27 +76,15 @@ void EffectBuilder::buildAndSendPackets()
 
     Logger::debug( " - id: {}", result->getTarget()->getId() );
 
+    auto seq = m_sourceChara->getCurrentTerritory()->getNextEffectSequence();
+
     auto effectPacket = std::make_shared< Server::EffectPacket >( m_sourceChara->getId(), result->getTarget()->getId(), m_actionId );
     effectPacket->setRotation( Common::Util::floatToUInt16Rot( m_sourceChara->getRot() ) );
-    effectPacket->setSequence( m_sequence );
+    effectPacket->setSequence( seq, m_sequence );
 
     effectPacket->addEffect( result->buildEffectEntry() );
 
-    m_sourceChara->sendToInRangeSet( effectPacket, false );
-
-    // send a dupe packet to the caster with hiddenAnimation field set
-    if( auto player = m_sourceChara->getAsPlayer() )
-    {
-      auto effectPacket2 = std::make_shared< Server::EffectPacket >( m_sourceChara->getId(), result->getTarget()->getId(), m_actionId );
-      effectPacket2->setRotation( Common::Util::floatToUInt16Rot( m_sourceChara->getRot() ) );
-      effectPacket2->setSequence( m_sequence );
-
-      effectPacket2->data().hiddenAnimation = m_sequence;
-
-      effectPacket2->addEffect( result->buildEffectEntry() );
-
-      player->queuePacket( effectPacket2 );
-    }
+    m_sourceChara->sendToInRangeSet( effectPacket, true );
   }
 
 }
\ No newline at end of file
diff --git a/src/world/Network/PacketWrappers/EffectPacket.h b/src/world/Network/PacketWrappers/EffectPacket.h
index 7cc07757..ec91133a 100644
--- a/src/world/Network/PacketWrappers/EffectPacket.h
+++ b/src/world/Network/PacketWrappers/EffectPacket.h
@@ -64,9 +64,10 @@ namespace Sapphire::Network::Packets::Server
       FFXIVPacketBase::setTargetActor( targetId );
     }
 
-    void setSequence( uint32_t sequence )
+    void setSequence( uint32_t sequence, uint16_t sourceSequence = 0 )
     {
       m_data.sequence = sequence;
+      m_data.sourceSequence = sourceSequence;
     }
   };
 

From 9c27d51d1f1e96ac4efc029a61c6ce7528a1dd9e Mon Sep 17 00:00:00 2001
From: NotAdam <adam@notadam.me>
Date: Fri, 26 Jul 2019 23:18:17 +1000
Subject: [PATCH 119/351] update some more statcalc from tj, add threat back

---
 src/world/Math/CalcStats.cpp | 166 +++++++++++++++++------------------
 1 file changed, 83 insertions(+), 83 deletions(-)

diff --git a/src/world/Math/CalcStats.cpp b/src/world/Math/CalcStats.cpp
index f697c73d..a2cee7e8 100644
--- a/src/world/Math/CalcStats.cpp
+++ b/src/world/Math/CalcStats.cpp
@@ -15,93 +15,93 @@
 using namespace Sapphire::Math;
 using namespace Sapphire::Entity;
 
-const int levelTable[81][5] =
+const int levelTable[81][6] =
 { 
   // MAIN,SUB,DIV,HP,ELMT,THREAT
-  { 1, 1, 1, 1, 1 },
-  { 20, 56, 56, 0, 52 },
-  { 21, 57, 57, 0, 54 },
-  { 22, 60, 60, 0, 56 },
-  { 24, 62, 62, 0, 58 },
-  { 26, 65, 65, 0, 60 },
-  { 27, 68, 68, 0, 62 },
-  { 29, 70, 70, 0, 64 },
-  { 31, 73, 73, 0, 66 },
-  { 33, 76, 76, 0, 68 },
-  { 35, 78, 78, 0, 70 },
-  { 36, 82, 82, 0, 73 },
-  { 38, 85, 85, 0, 75 },
-  { 41, 89, 89, 0, 78 },
-  { 44, 93, 93, 0, 81 },
-  { 46, 96, 96, 0, 84 },
-  { 49, 100, 100, 0, 86 },
-  { 52, 104, 104, 0, 89 },
-  { 54, 109, 109, 0, 93 },
-  { 57, 113, 113, 0, 95 },
-  { 60, 116, 116, 0, 98 },
-  { 63, 122, 122, 0, 102 },
-  { 67, 127, 127, 0, 105 },
-  { 71, 133, 133, 0, 109 },
-  { 74, 138, 138, 0, 113 },
-  { 78, 144, 144, 0, 117 },
-  { 81, 150, 150, 0, 121 },
-  { 85, 155, 155, 0, 125 },
-  { 89, 162, 162, 0, 129 },
-  { 92, 168, 168, 0, 133 },
-  { 97, 173, 173, 0, 137 },
-  { 101, 181, 181, 0, 143 },
-  { 106, 188, 188, 0, 148 },
-  { 110, 194, 194, 0, 153 },
-  { 115, 202, 202, 0, 159 },
-  { 119, 209, 209, 0, 165 },
-  { 124, 215, 215, 0, 170 },
-  { 128, 223, 223, 0, 176 },
-  { 134, 229, 229, 0, 181 },
-  { 139, 236, 236, 0, 186 },
-  { 144, 244, 244, 0, 192 },
-  { 150, 253, 253, 0, 200 },
-  { 155, 263, 263, 0, 207 },
-  { 161, 272, 272, 0, 215 },
-  { 166, 283, 283, 0, 223 },
-  { 171, 292, 292, 0, 231 },
-  { 177, 302, 302, 0, 238 },
-  { 183, 311, 311, 0, 246 },
-  { 189, 322, 322, 0, 254 },
-  { 196, 331, 331, 0, 261 },
-  { 202, 341, 341, 1700, 269 },
-  { 204, 342, 393, 1774, 270 },
-  { 205, 344, 444, 1851, 271 },
-  { 207, 345, 496, 1931, 273 },
-  { 209, 346, 548, 2015, 274 },
-  { 210, 347, 600, 2102, 275 },
-  { 212, 349, 651, 2194, 276 },
-  { 214, 350, 703, 2289, 278 },
-  { 215, 351, 755, 2388, 279 },
-  { 217, 352, 806, 2492, 280 },
-  { 218, 354, 858, 2600, 282 },
-  { 224, 355, 941, 2700, 283 },
-  { 228, 356, 1032, 2800, 284 },
-  { 236, 357, 1133, 2900, 286 },
-  { 244, 358, 1243, 3000, 287 },
-  { 252, 359, 1364, 3100, 288 },
-  { 260, 360, 1497, 3200, 290 },
-  { 268, 361, 1643, 3300, 292 },
-  { 276, 362, 1802, 3400, 293 },
-  { 284, 363, 1978, 3500, 294 },
-  { 292, 364, 2170, 3600, 295 },
+  { 1, 1, 1, 1, 1, 1 },
+  { 20, 56, 56, 0, 52, 2 },
+  { 21, 57, 57, 0, 54, 2 },
+  { 22, 60, 60, 0, 56, 3 },
+  { 24, 62, 62, 0, 58, 3 },
+  { 26, 65, 65, 0, 60, 3 },
+  { 27, 68, 68, 0, 62, 3 },
+  { 29, 70, 70, 0, 64, 4 },
+  { 31, 73, 73, 0, 66, 4 },
+  { 33, 76, 76, 0, 68, 4 },
+  { 35, 78, 78, 0, 70, 5 },
+  { 36, 82, 82, 0, 73, 5 },
+  { 38, 85, 85, 0, 75, 5 },
+  { 41, 89, 89, 0, 78, 6 },
+  { 44, 93, 93, 0, 81, 6 },
+  { 46, 96, 96, 0, 84, 7 },
+  { 49, 100, 100, 0, 86, 7 },
+  { 52, 104, 104, 0, 89, 8 },
+  { 54, 109, 109, 0, 93, 9 },
+  { 57, 113, 113, 0, 95, 9 },
+  { 60, 116, 116, 0, 98, 10 },
+  { 63, 122, 122, 0, 102, 10 },
+  { 67, 127, 127, 0, 105, 11 },
+  { 71, 133, 133, 0, 109, 12 },
+  { 74, 138, 138, 0, 113, 13 },
+  { 78, 144, 144, 0, 117, 14 },
+  { 81, 150, 150, 0, 121, 15 },
+  { 85, 155, 155, 0, 125, 16 },
+  { 89, 162, 162, 0, 129, 17 },
+  { 92, 168, 168, 0, 133, 18 },
+  { 97, 173, 173, 0, 137, 19 },
+  { 101, 181, 181, 0, 143, 20 },
+  { 106, 188, 188, 0, 148, 22 },
+  { 110, 194, 194, 0, 153, 23 },
+  { 115, 202, 202, 0, 159, 25 },
+  { 119, 209, 209, 0, 165, 27 },
+  { 124, 215, 215, 0, 170, 29 },
+  { 128, 223, 223, 0, 176, 31 },
+  { 134, 229, 229, 0, 181, 33 },
+  { 139, 236, 236, 0, 186, 35 },
+  { 144, 244, 244, 0, 192, 38 },
+  { 150, 253, 253, 0, 200, 40 },
+  { 155, 263, 263, 0, 207, 43 },
+  { 161, 272, 272, 0, 215, 46 },
+  { 166, 283, 283, 0, 223, 49 },
+  { 171, 292, 292, 0, 231, 52 },
+  { 177, 302, 302, 0, 238, 55 },
+  { 183, 311, 311, 0, 246, 58 },
+  { 189, 322, 322, 0, 254, 62 },
+  { 196, 331, 331, 0, 261, 66 },
+  { 202, 341, 341, 1700, 269, 70 },
+  { 204, 342, 393, 1774, 270, 84 },
+  { 205, 344, 444, 1851, 271, 99 },
+  { 207, 345, 496, 1931, 273, 113 },
+  { 209, 346, 548, 2015, 274, 128 },
+  { 210, 347, 600, 2102, 275, 142 },
+  { 212, 349, 651, 2194, 276, 157 },
+  { 214, 350, 703, 2289, 278, 171 },
+  { 215, 351, 755, 2388, 279, 186 },
+  { 217, 352, 806, 2492, 280, 200 },
+  { 218, 354, 858, 2600, 282, 215 },
+  { 224, 355, 941, 2700, 283, 232 },
+  { 228, 356, 1032, 2800, 284, 250 },
+  { 236, 357, 1133, 2900, 286, 269 },
+  { 244, 358, 1243, 3000, 287, 290 },
+  { 252, 359, 1364, 3100, 288, 313 },
+  { 260, 360, 1497, 3200, 290, 337 },
+  { 268, 361, 1643, 3300, 292, 363 },
+  { 276, 362, 1802, 3400, 293, 392 },
+  { 284, 363, 1978, 3500, 294, 422 },
+  { 292, 364, 2170, 3600, 295, 455 },
 
-  // todo: add proper shbr values
+  // todo: add proper shbr values - hp/elmt/threat
   // sub/div added from http://theoryjerks.akhmorning.com/resources/levelmods/
-  { 292, 365, 2263, 3600, 295 },
-  { 292, 366, 2360, 3600, 295 },
-  { 292, 367, 2461, 3600, 295 },
-  { 292, 368, 2566, 3600, 295 },
-  { 292, 370, 2676, 3600, 295 },
-  { 292, 372, 2790, 3600, 295 },
-  { 292, 374, 2910, 3600, 295 },
-  { 292, 376, 3034, 3600, 295 },
-  { 292, 378, 3164, 3600, 295 },
-  { 292, 380, 3300, 3600, 295 },
+  { 296, 365, 2263, 3600, 466, 466 },
+  { 300, 366, 2360, 3600, 295, 466 },
+  { 305, 367, 2461, 3600, 295, 466 },
+  { 310, 368, 2566, 3600, 295, 466 },
+  { 315, 370, 2676, 3600, 295, 466 },
+  { 320, 372, 2790, 3600, 295, 466 },
+  { 325, 374, 2910, 3600, 295, 466 },
+  { 330, 376, 3034, 3600, 295, 466 },
+  { 335, 378, 3164, 3600, 295, 466 },
+  { 340, 380, 3300, 3600, 569, 569 },
 };
 
 /*

From 6c011baa0279cfc5a6c07bd5372a7ce4c8341301 Mon Sep 17 00:00:00 2001
From: NotAdam <adam@notadam.me>
Date: Fri, 26 Jul 2019 23:20:13 +1000
Subject: [PATCH 120/351] fix actorcast packet opcode, add new opcode

---
 src/common/Network/PacketDef/Ipcs.h |  4 +++-
 src/world/Action/Action.cpp         | 18 +++++++++++++-----
 2 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/src/common/Network/PacketDef/Ipcs.h b/src/common/Network/PacketDef/Ipcs.h
index 04ddf0cd..9435f143 100644
--- a/src/common/Network/PacketDef/Ipcs.h
+++ b/src/common/Network/PacketDef/Ipcs.h
@@ -136,7 +136,9 @@ namespace Sapphire::Network::Packets
 
     ActorSetPos = 0x0184, // updated 5.0
 
-    ActorCast = 0x0187, // updated 5.0
+    ActorCast = 0x0186, // updated 5.0
+
+    SomeCustomiseChangePacketProbably = 0x0187, // added 5.0
 
     PartyList = 0x0188, // updated 5.0
     HateRank = 0x0189, // updated 5.0
diff --git a/src/world/Action/Action.cpp b/src/world/Action/Action.cpp
index 40d8f73b..61d4c991 100644
--- a/src/world/Action/Action.cpp
+++ b/src/world/Action/Action.cpp
@@ -22,6 +22,7 @@
 #include <Logging/Logger.h>
 
 #include <Util/ActorFilter.h>
+#include <Util/UtilMath.h>
 
 using namespace Sapphire;
 using namespace Sapphire::Common;
@@ -223,13 +224,20 @@ void Action::Action::start()
   if( hasCastTime() )
   {
     auto castPacket = makeWorldPacket< Server::FFXIVIpcActorCast >( getId() );
+    auto& data = castPacket->data();
 
-    castPacket->data().action_id = static_cast< uint16_t >( m_id );
-    castPacket->data().skillType = Common::SkillType::Normal;
-    castPacket->data().unknown_1 = m_id;
+    data.action_id = static_cast< uint16_t >( m_id );
+    data.skillType = Common::SkillType::Normal;
+    data.unknown_1 = m_id;
     // This is used for the cast bar above the target bar of the caster.
-    castPacket->data().cast_time = m_castTimeMs / 1000.f;
-    castPacket->data().target_id = static_cast< uint32_t >( m_targetId );
+    data.cast_time = m_castTimeMs / 1000.f;
+    data.target_id = static_cast< uint32_t >( m_targetId );
+
+    auto pos = m_pSource->getPos();
+    data.posX = Common::Util::floatToUInt16( pos.x );
+    data.posY = Common::Util::floatToUInt16( pos.y );
+    data.posZ = Common::Util::floatToUInt16( pos.z );
+    data.rotation = m_pSource->getRot();
 
     m_pSource->sendToInRangeSet( castPacket, true );
 

From b1e6ad3141dd7dae0403d1158acfac1097f482f7 Mon Sep 17 00:00:00 2001
From: NotAdam <adam@notadam.me>
Date: Sat, 27 Jul 2019 00:37:40 +1000
Subject: [PATCH 121/351] some cleanup, kinda working battle dmg calc

---
 src/common/Common.h               | 12 ++++++
 src/world/Action/Action.cpp       | 36 +++++++++++++++++-
 src/world/Action/Action.h         |  4 ++
 src/world/Action/EffectResult.cpp |  7 +++-
 src/world/Action/EffectResult.h   |  3 ++
 src/world/Actor/BNpc.cpp          |  2 +-
 src/world/Actor/Chara.cpp         | 61 ++++++++++++++++++++++++++++++
 src/world/Actor/Chara.h           |  2 +
 src/world/Actor/Player.cpp        |  2 +-
 src/world/Math/CalcStats.cpp      | 62 +++++++++++++++++++++++++------
 src/world/Math/CalcStats.h        |  4 +-
 11 files changed, 178 insertions(+), 17 deletions(-)

diff --git a/src/common/Common.h b/src/common/Common.h
index a41095ca..14e279c8 100644
--- a/src/common/Common.h
+++ b/src/common/Common.h
@@ -990,6 +990,18 @@ namespace Sapphire::Common
     CircularAoEPlaced = 7
   };
 
+  enum class Role : uint8_t
+  {
+    None,
+    Tank,
+    Healer,
+    RangedPhysical,
+    RangedMagical,
+    Melee,
+    Crafter,
+    Gatherer
+  };
+
   using PlayerStateFlagList = std::vector< PlayerStateFlag >;
 
 }
diff --git a/src/world/Action/Action.cpp b/src/world/Action/Action.cpp
index 61d4c991..6d1b2662 100644
--- a/src/world/Action/Action.cpp
+++ b/src/world/Action/Action.cpp
@@ -2,6 +2,8 @@
 #include "ActionLut.h"
 #include "EffectBuilder.h"
 
+#include <Inventory/Item.h>
+
 #include <Exd/ExdDataGenerated.h>
 #include <Util/Util.h>
 #include "Framework.h"
@@ -357,6 +359,32 @@ void Action::Action::execute()
   }
 }
 
+std::pair< uint32_t, Common::ActionHitSeverityType > Action::Action::calcDamage( uint32_t potency )
+{
+  // todo: what do for npcs?
+  auto wepDmg = 1.f;
+
+  if( auto player = m_pSource->getAsPlayer() )
+  {
+    auto item = player->getEquippedWeapon();
+    assert( item );
+
+    auto role = player->getRole();
+    if( role == Common::Role::RangedMagical || role == Common::Role::Healer )
+    {
+      wepDmg = item->getMagicalDmg();
+    }
+    else
+    {
+      wepDmg = item->getPhysicalDmg();
+    }
+  }
+
+  auto dmg = Math::CalcStats::calcActionDamage( *m_pSource, potency, wepDmg );
+
+  return std::make_pair( dmg, Common::ActionHitSeverityType::NormalDamage );
+}
+
 void Action::Action::buildEffects()
 {
   snapshotAffectedActors( m_hitActors );
@@ -390,10 +418,16 @@ void Action::Action::buildEffects()
   {
     // todo: this is shit
     if( lutEntry.curePotency > 0 )
+    {
+
       m_effectBuilder->healTarget( actor, lutEntry.curePotency );
+    }
 
     else if( lutEntry.potency > 0 )
-      m_effectBuilder->damageTarget( actor, lutEntry.potency );
+    {
+      auto dmg = calcDamage( lutEntry.potency );
+      m_effectBuilder->damageTarget( actor, dmg.first, dmg.second );
+    }
   }
 
   m_effectBuilder->buildAndSendPackets();
diff --git a/src/world/Action/Action.h b/src/world/Action/Action.h
index d4308882..8288b90e 100644
--- a/src/world/Action/Action.h
+++ b/src/world/Action/Action.h
@@ -98,6 +98,10 @@ namespace Sapphire::World::Action
      */
     void addDefaultActorFilters();
 
+    std::pair< uint32_t, Common::ActionHitSeverityType > calcDamage( uint32_t potency );
+
+    std::pair< uint32_t, Common::ActionHitSeverityType > calcHealing( uint32_t potency );
+
 
     std::vector< Entity::CharaPtr >& getHitCharas();
 
diff --git a/src/world/Action/EffectResult.cpp b/src/world/Action/EffectResult.cpp
index fd7cc0e1..710c046d 100644
--- a/src/world/Action/EffectResult.cpp
+++ b/src/world/Action/EffectResult.cpp
@@ -25,6 +25,11 @@ uint32_t EffectResult::getValue() const
   return m_value;
 }
 
+void EffectResult::setParam( uint8_t param )
+{
+  m_param = param;
+}
+
 void EffectResult::damage( uint32_t amount, Common::ActionHitSeverityType severity )
 {
   m_severity = severity;
@@ -49,7 +54,7 @@ Common::EffectEntry EffectResult::buildEffectEntry() const
   entry.value = getValue();
   entry.hitSeverity = m_severity;
   entry.effectType = m_type;
-
+  entry.param = m_param;
 
   return entry;
 }
\ No newline at end of file
diff --git a/src/world/Action/EffectResult.h b/src/world/Action/EffectResult.h
index 65026802..083ab273 100644
--- a/src/world/Action/EffectResult.h
+++ b/src/world/Action/EffectResult.h
@@ -22,6 +22,8 @@ namespace Sapphire::World::Action
 
     uint32_t getValue() const;
 
+    void setParam( uint8_t param );
+
     Common::EffectEntry buildEffectEntry() const;
 
   private:
@@ -33,6 +35,7 @@ namespace Sapphire::World::Action
     Common::ActionEffectType m_type;
 
     uint32_t m_value;
+    uint8_t m_param;
   };
 }
 
diff --git a/src/world/Actor/BNpc.cpp b/src/world/Actor/BNpc.cpp
index e297c2fd..b2b7f439 100644
--- a/src/world/Actor/BNpc.cpp
+++ b/src/world/Actor/BNpc.cpp
@@ -692,7 +692,7 @@ void Sapphire::Entity::BNpc::autoAttack( CharaPtr pTarget )
     srand( static_cast< uint32_t >( tick ) );
 
     auto pRNGMgr = m_pFw->get< World::Manager::RNGMgr >();
-    auto damage = Math::CalcStats::calculateAutoAttackDamage( *this );
+    auto damage = Math::CalcStats::calcAutoAttackDamage( *this );
 
     auto effectPacket = std::make_shared< Server::EffectPacket >( getId(), pTarget->getId(), 7 );
     effectPacket->setRotation( Util::floatToUInt16Rot( getRot() ) );
diff --git a/src/world/Actor/Chara.cpp b/src/world/Actor/Chara.cpp
index 7a2b94cd..26ba4918 100644
--- a/src/world/Actor/Chara.cpp
+++ b/src/world/Actor/Chara.cpp
@@ -123,6 +123,67 @@ void Sapphire::Entity::Chara::setClass( Common::ClassJob classJob )
   m_class = classJob;
 }
 
+Sapphire::Common::Role Sapphire::Entity::Chara::getRole() const
+{
+  switch( getClass() )
+  {
+    case ClassJob::Gladiator:
+    case ClassJob::Marauder:
+    case ClassJob::Paladin:
+    case ClassJob::Warrior:
+    case ClassJob::Darkknight:
+    case ClassJob::Gunbreaker:
+      return Role::Tank;
+
+    case ClassJob::Pugilist:
+    case ClassJob::Lancer:
+    case ClassJob::Monk:
+    case ClassJob::Dragoon:
+    case ClassJob::Rogue:
+    case ClassJob::Ninja:
+    case ClassJob::Samurai:
+      return Role::Melee;
+
+    case ClassJob::Archer:
+    case ClassJob::Bard:
+    case ClassJob::Machinist:
+    case ClassJob::Dancer:
+      return Role::RangedPhysical;
+
+    case ClassJob::Conjurer:
+    case ClassJob::Whitemage:
+    case ClassJob::Scholar:
+    case ClassJob::Astrologian:
+      return Role::Healer;
+
+    case ClassJob::Thaumaturge:
+    case ClassJob::Blackmage:
+    case ClassJob::Arcanist:
+    case ClassJob::Summoner:
+    case ClassJob::Redmage:
+    case ClassJob::Bluemage:
+      return Role::RangedMagical;
+
+    case ClassJob::Carpenter:
+    case ClassJob::Blacksmith:
+    case ClassJob::Armorer:
+    case ClassJob::Goldsmith:
+    case ClassJob::Leatherworker:
+    case ClassJob::Weaver:
+    case ClassJob::Alchemist:
+    case ClassJob::Culinarian:
+      return Role::Crafter;
+
+    case ClassJob::Miner:
+    case ClassJob::Botanist:
+    case ClassJob::Fisher:
+      return Role::Gatherer;
+
+    default:
+      return Role::None;
+  }
+}
+
 /*! \param Id of the target to set */
 void Sapphire::Entity::Chara::setTargetId( uint64_t targetId )
 {
diff --git a/src/world/Actor/Chara.h b/src/world/Actor/Chara.h
index 83d14fb6..d9fea85b 100644
--- a/src/world/Actor/Chara.h
+++ b/src/world/Actor/Chara.h
@@ -209,6 +209,8 @@ namespace Sapphire::Entity
 
     void setClass( Common::ClassJob classJob );
 
+    Common::Role getRole() const;
+
     void setTargetId( uint64_t targetId );
 
     uint64_t getTargetId() const;
diff --git a/src/world/Actor/Player.cpp b/src/world/Actor/Player.cpp
index 0ab82688..9243a68c 100644
--- a/src/world/Actor/Player.cpp
+++ b/src/world/Actor/Player.cpp
@@ -1565,7 +1565,7 @@ void Sapphire::Entity::Player::autoAttack( CharaPtr pTarget )
   auto pRNGMgr = m_pFw->get< World::Manager::RNGMgr >();
   auto variation = static_cast< uint32_t >( pRNGMgr->getRandGenerator< float >( 0, 3 ).next() );
 
-  auto damage = Math::CalcStats::calculateAutoAttackDamage( *this );
+  auto damage = Math::CalcStats::calcAutoAttackDamage( *this );
 
   if( getClass() == ClassJob::Machinist || getClass() == ClassJob::Bard || getClass() == ClassJob::Archer )
   {
diff --git a/src/world/Math/CalcStats.cpp b/src/world/Math/CalcStats.cpp
index a2cee7e8..d6513a14 100644
--- a/src/world/Math/CalcStats.cpp
+++ b/src/world/Math/CalcStats.cpp
@@ -219,16 +219,9 @@ float CalcStats::autoAttackPotency( const Sapphire::Entity::Chara& chara )
 {
   uint32_t aaPotency = AUTO_ATTACK_POTENCY;
 
-  // check if ranged class
-  switch( chara.getClass() )
+  if( chara.getRole() == Common::Role::RangedPhysical )
   {
-    case Common::ClassJob::Machinist:
-    case Common::ClassJob::Bard:
-    case Common::ClassJob::Archer:
-      aaPotency = RANGED_AUTO_ATTACK_POTENCY;
-
-    default:
-      break;
+    aaPotency = RANGED_AUTO_ATTACK_POTENCY;
   }
 
   float autoAttackDelay = 2.5f;
@@ -442,7 +435,7 @@ float CalcStats::healingMagicPotency( const Sapphire::Entity::Chara& chara )
   return std::floor( 100.f * ( chara.getStatValue( Common::BaseParam::HealingMagicPotency ) - 292.f ) / 264.f + 100.f ) / 100.f;
 }
 
-float CalcStats::calculateAutoAttackDamage( const Sapphire::Entity::Chara& chara )
+float CalcStats::calcAutoAttackDamage( const Sapphire::Entity::Chara& chara )
 {
   // D = ⌊ f(ptc) × f(aa) × f(ap) × f(det) × f(tnc) × traits ⌋ × f(ss) ⌋ ×
   // f(chr) ⌋ × f(dhr) ⌋ × rand[ 0.95, 1.05 ] ⌋ × buff_1 ⌋ × buff... ⌋
@@ -451,12 +444,25 @@ float CalcStats::calculateAutoAttackDamage( const Sapphire::Entity::Chara& chara
   auto aa = autoAttack( chara );
   auto ap = getPrimaryAttackPower( chara );
   auto det = determination( chara );
-  auto ten = tenacity( chara );
 
-  Logger::debug( "auto attack: pot: {} aa: {} ap: {} det: {} ten: {}", pot, aa, ap, det, ten );
+  auto ten = 1.f;
+  if( chara.getRole() == Common::Role::Tank )
+    ten = tenacity( chara );
 
+  // todo: everything after tenacity
   auto factor = std::floor( pot * aa * ap * det * ten );
 
+  constexpr auto format = "auto attack: pot: {} aa: {} ap: {} det: {} ten: {} = {}";
+
+  if( auto player = const_cast< Entity::Chara& >( chara ).getAsPlayer() )
+  {
+    player->sendDebug( format, pot, aa, ap, det, ten, factor );
+  }
+  else
+  {
+    Logger::debug( format, pot, aa, ap, det, ten, factor );
+  }
+  
   // todo: traits
 
   factor = std::floor( factor * speed( chara ) );
@@ -472,6 +478,38 @@ float CalcStats::calculateAutoAttackDamage( const Sapphire::Entity::Chara& chara
   return factor;
 }
 
+float CalcStats::calcActionDamage( const Sapphire::Entity::Chara& chara, uint32_t ptc, float wepDmg )
+{
+  // D = ⌊ f(pot) × f(wd) × f(ap) × f(det) × f(tnc) × traits ⌋
+  // × f(chr) ⌋ × f(dhr) ⌋ × rand[ 0.95, 1.05 ] ⌋ buff_1 ⌋ × buff_1 ⌋ × buff... ⌋
+
+  auto pot = potency( ptc );
+  auto wd = weaponDamage( chara, wepDmg );
+  auto ap = getPrimaryAttackPower( chara );
+  auto det = determination( chara );
+
+  auto ten = 1.f;
+  if( chara.getRole() == Common::Role::Tank )
+    ten = tenacity( chara );
+
+  auto factor = std::floor( pot * wd * ap * det * ten );
+
+  constexpr auto format = "dmg: pot: {} wd: {} ap: {} det: {} ten: {} = {}";
+
+  if( auto player = const_cast< Entity::Chara& >( chara ).getAsPlayer() )
+  {
+    player->sendDebug( format, pot, wd, ap, det, ten, factor );
+  }
+  else
+  {
+    Logger::debug( format, pot, wd, ap, det, ten, factor );
+  }
+
+  // todo: the rest
+
+  return factor;
+}
+
 uint32_t CalcStats::primaryStatValue( const Sapphire::Entity::Chara& chara )
 {
   return chara.getStatValue( chara.getPrimaryStat() );
diff --git a/src/world/Math/CalcStats.h b/src/world/Math/CalcStats.h
index 8b8f7d36..1b22238a 100644
--- a/src/world/Math/CalcStats.h
+++ b/src/world/Math/CalcStats.h
@@ -128,7 +128,9 @@ namespace Sapphire::Math
 
     ////////////////////////////////////////////
 
-    static float calculateAutoAttackDamage( const Sapphire::Entity::Chara& chara );
+    static float calcAutoAttackDamage( const Sapphire::Entity::Chara& chara );
+
+    static float calcActionDamage( const Sapphire::Entity::Chara& chara, uint32_t ptc, float wepDmg );
 
     static uint32_t primaryStatValue( const Sapphire::Entity::Chara& chara );
   private:

From 72c88f80a68e5d67ec7285002d7315177e4c48a3 Mon Sep 17 00:00:00 2001
From: NotAdam <adam@notadam.me>
Date: Sat, 27 Jul 2019 13:59:35 +1000
Subject: [PATCH 122/351] somewhat basic but working effect result delay

---
 src/world/Action/EffectBuilder.cpp | 16 +++++++------
 src/world/Action/EffectBuilder.h   | 10 +--------
 src/world/Action/EffectResult.cpp  | 36 +++++++++++++++++++++++++++---
 src/world/Action/EffectResult.h    |  8 +++++--
 src/world/Math/CalcStats.cpp       |  8 +++----
 src/world/Territory/Territory.cpp  | 33 ++++++++++++++++++++++++---
 src/world/Territory/Territory.h    |  6 +++++
 7 files changed, 89 insertions(+), 28 deletions(-)

diff --git a/src/world/Action/EffectBuilder.cpp b/src/world/Action/EffectBuilder.cpp
index 7b070fc0..7068c01e 100644
--- a/src/world/Action/EffectBuilder.cpp
+++ b/src/world/Action/EffectBuilder.cpp
@@ -24,11 +24,11 @@ EffectBuilder::EffectBuilder( Entity::CharaPtr source, uint32_t actionId, uint16
 
 }
 
-uint32_t EffectBuilder::getResultDelayMs()
+uint64_t EffectBuilder::getResultDelayMs()
 {
   // todo: actually figure this retarded shit out
 
-  return Common::Util::getTimeMs() + 1000;
+  return Common::Util::getTimeMs() + 850;
 }
 
 EffectResultPtr EffectBuilder::getResult( Entity::CharaPtr& chara )
@@ -69,11 +69,9 @@ void EffectBuilder::buildAndSendPackets()
   Logger::debug( "EffectBuilder result: " );
   Logger::debug( "Targets afflicted: {}", m_resolvedEffects.size() );
 
-  // test shit
-  for( auto& effect : m_resolvedEffects )
+  for( auto it = m_resolvedEffects.begin(); it != m_resolvedEffects.end(); )
   {
-    auto& result = effect.second;
-
+    auto result = it->second;
     Logger::debug( " - id: {}", result->getTarget()->getId() );
 
     auto seq = m_sourceChara->getCurrentTerritory()->getNextEffectSequence();
@@ -85,6 +83,10 @@ void EffectBuilder::buildAndSendPackets()
     effectPacket->addEffect( result->buildEffectEntry() );
 
     m_sourceChara->sendToInRangeSet( effectPacket, true );
-  }
 
+    // add effect to territory
+    m_sourceChara->getCurrentTerritory()->addEffectResult( std::move( result ) );
+
+    it = m_resolvedEffects.erase( it );
+  }
 }
\ No newline at end of file
diff --git a/src/world/Action/EffectBuilder.h b/src/world/Action/EffectBuilder.h
index f8d3bb40..d58bebfe 100644
--- a/src/world/Action/EffectBuilder.h
+++ b/src/world/Action/EffectBuilder.h
@@ -9,14 +9,6 @@ namespace Sapphire::World::Action
   class EffectBuilder
   {
   public:
-    enum HitSeverity
-    {
-      Normal,
-      Critical,
-      DirectHit,
-      CriticalDirectHit
-    };
-
     EffectBuilder( Entity::CharaPtr source, uint32_t actionId, uint16_t sequence );
 
 
@@ -32,7 +24,7 @@ namespace Sapphire::World::Action
   private:
     EffectResultPtr getResult( Entity::CharaPtr& chara );
 
-    uint32_t getResultDelayMs();
+    uint64_t getResultDelayMs();
 
   private:
     uint32_t m_actionId;
diff --git a/src/world/Action/EffectResult.cpp b/src/world/Action/EffectResult.cpp
index 710c046d..daf32155 100644
--- a/src/world/Action/EffectResult.cpp
+++ b/src/world/Action/EffectResult.cpp
@@ -2,15 +2,19 @@
 
 #include <Util/Util.h>
 
+#include "Actor/Chara.h"
+
 using namespace Sapphire;
 using namespace Sapphire::World::Action;
 
 
-EffectResult::EffectResult( Entity::CharaPtr target, uint32_t runAfter ) :
+EffectResult::EffectResult( Entity::CharaPtr target, uint64_t runAfter ) :
   m_target( std::move( target ) ),
-  m_runAfter( runAfter ),
+  m_delayMs( runAfter ),
   m_value( 0 ),
-  m_severity( Common::ActionHitSeverityType::NormalDamage )
+  m_severity( Common::ActionHitSeverityType::NormalDamage ),
+  m_type( Common::ActionEffectType::Nothing ),
+  m_param( 0 )
 {
 
 }
@@ -25,6 +29,11 @@ uint32_t EffectResult::getValue() const
   return m_value;
 }
 
+uint64_t EffectResult::getDelay()
+{
+  return m_delayMs;
+}
+
 void EffectResult::setParam( uint8_t param )
 {
   m_param = param;
@@ -57,4 +66,25 @@ Common::EffectEntry EffectResult::buildEffectEntry() const
   entry.param = m_param;
 
   return entry;
+}
+
+void EffectResult::execute()
+{
+  switch( m_type )
+  {
+    case Common::ActionEffectType::Damage:
+    {
+      m_target->takeDamage( m_value );
+      break;
+    }
+
+    case Common::ActionEffectType::Heal:
+    {
+      m_target->heal( m_value );
+      break;
+    }
+
+    default:
+      break;
+  }
 }
\ No newline at end of file
diff --git a/src/world/Action/EffectResult.h b/src/world/Action/EffectResult.h
index 083ab273..f1dd8b9c 100644
--- a/src/world/Action/EffectResult.h
+++ b/src/world/Action/EffectResult.h
@@ -13,7 +13,7 @@ namespace Sapphire::World::Action
   class EffectResult
   {
   public:
-    explicit EffectResult( Entity::CharaPtr target, uint32_t delayMs );
+    explicit EffectResult( Entity::CharaPtr target, uint64_t delayMs );
 
     void damage( uint32_t amount, Common::ActionHitSeverityType severity );
     void heal( uint32_t amount, Common::ActionHitSeverityType severity );
@@ -22,12 +22,16 @@ namespace Sapphire::World::Action
 
     uint32_t getValue() const;
 
+    uint64_t getDelay();
+
     void setParam( uint8_t param );
 
     Common::EffectEntry buildEffectEntry() const;
 
+    void execute();
+
   private:
-    uint64_t m_runAfter;
+    uint64_t m_delayMs;
 
     Entity::CharaPtr m_target;
 
diff --git a/src/world/Math/CalcStats.cpp b/src/world/Math/CalcStats.cpp
index d6513a14..d9c6d143 100644
--- a/src/world/Math/CalcStats.cpp
+++ b/src/world/Math/CalcStats.cpp
@@ -462,7 +462,7 @@ float CalcStats::calcAutoAttackDamage( const Sapphire::Entity::Chara& chara )
   {
     Logger::debug( format, pot, aa, ap, det, ten, factor );
   }
-  
+
   // todo: traits
 
   factor = std::floor( factor * speed( chara ) );
@@ -494,15 +494,15 @@ float CalcStats::calcActionDamage( const Sapphire::Entity::Chara& chara, uint32_
 
   auto factor = std::floor( pot * wd * ap * det * ten );
 
-  constexpr auto format = "dmg: pot: {} wd: {} ap: {} det: {} ten: {} = {}";
+  constexpr auto format = "dmg: pot: {} ({}) wd: {} ({}) ap: {} det: {} ten: {} = {}";
 
   if( auto player = const_cast< Entity::Chara& >( chara ).getAsPlayer() )
   {
-    player->sendDebug( format, pot, wd, ap, det, ten, factor );
+    player->sendDebug( format, pot, ptc, wd, wepDmg, ap, det, ten, factor );
   }
   else
   {
-    Logger::debug( format, pot, wd, ap, det, ten, factor );
+    Logger::debug( format, pot, ptc, wd, wepDmg, ap, det, ten, factor );
   }
 
   // todo: the rest
diff --git a/src/world/Territory/Territory.cpp b/src/world/Territory/Territory.cpp
index c725e9bd..d8b1cf17 100644
--- a/src/world/Territory/Territory.cpp
+++ b/src/world/Territory/Territory.cpp
@@ -31,15 +31,15 @@
 #include "Actor/SpawnPoint.h"
 #include "Actor/BNpcTemplate.h"
 
+#include "Action/EffectResult.h"
+
 #include "Network/GameConnection.h"
 
 #include "Script/ScriptMgr.h"
 
-#include "Session.h"
 #include "ForwardsZone.h"
 #include "ServerMgr.h"
 #include "CellHandler.h"
-#include "Territory.h"
 #include "Framework.h"
 
 #include "Manager/RNGMgr.h"
@@ -486,6 +486,8 @@ bool Sapphire::Territory::update( uint64_t tickCount )
 
   updateSpawnPoints();
 
+  processEffectResults( tickCount );
+
   if( !m_playerMap.empty() )
     m_lastActivityTime = tickCount;
 
@@ -1006,7 +1008,7 @@ Sapphire::Entity::BNpcPtr
 
 Sapphire::Entity::BNpcPtr Sapphire::Territory::getActiveBNpcByLevelId( uint32_t levelId )
 {
-  for( auto bnpcIt : m_bNpcMap )
+  for( const auto& bnpcIt : m_bNpcMap )
   {
     if( bnpcIt.second->getLevelId() == levelId )
       return bnpcIt.second;
@@ -1018,3 +1020,28 @@ std::shared_ptr< Sapphire::World::Navi::NaviProvider > Sapphire::Territory::getN
 {
   return m_pNaviProvider;
 }
+
+void Sapphire::Territory::addEffectResult( Sapphire::World::Action::EffectResultPtr result )
+{
+  m_effectResults.emplace_back( std::move( result ) );
+}
+
+void Sapphire::Territory::processEffectResults( uint64_t tickCount )
+
+{
+  // todo: move this to generic territory/instance delay wrapper cause it might be useful scheduling other things
+  for( auto it = m_effectResults.begin(); it != m_effectResults.end(); )
+  {
+    auto effect = *it;
+
+    if( tickCount < effect->getDelay() )
+    {
+      ++it;
+      continue;
+    }
+
+    effect->execute();
+
+    it = m_effectResults.erase( it );
+  }
+}
\ No newline at end of file
diff --git a/src/world/Territory/Territory.h b/src/world/Territory/Territory.h
index a73e5e53..34258d29 100644
--- a/src/world/Territory/Territory.h
+++ b/src/world/Territory/Territory.h
@@ -65,6 +65,8 @@ namespace Sapphire
     uint32_t m_effectCounter;
     std::shared_ptr< World::Navi::NaviProvider > m_pNaviProvider;
 
+    std::vector< World::Action::EffectResultPtr > m_effectResults;
+
   public:
     Territory();
 
@@ -174,6 +176,10 @@ namespace Sapphire
     uint32_t getNextEffectSequence();
 
     std::shared_ptr< World::Navi::NaviProvider > getNaviProvider();
+
+    void addEffectResult( World::Action::EffectResultPtr result );
+
+    void processEffectResults( uint64_t tickCount );
   };
 
 }

From 467ce65a5d23c7c28d430518cd0a8bdc905a1256 Mon Sep 17 00:00:00 2001
From: NotAdam <adam@notadam.me>
Date: Mon, 29 Jul 2019 22:22:45 +1000
Subject: [PATCH 123/351] revert worldchannelpacket changes

---
 src/common/Network/GamePacket.h               |  6 +-
 src/world/Action/Action.cpp                   |  2 +-
 src/world/Actor/Actor.cpp                     | 18 +++---
 src/world/Actor/Actor.h                       |  4 +-
 src/world/Actor/BNpc.cpp                      | 24 +++----
 src/world/Actor/Chara.cpp                     |  4 +-
 src/world/Actor/EventObject.cpp               |  2 +-
 src/world/Actor/Player.cpp                    | 50 +++++++--------
 src/world/Actor/PlayerEvent.cpp               |  2 +-
 src/world/Actor/PlayerInventory.cpp           |  8 +--
 src/world/Actor/PlayerQuest.cpp               | 14 ++--
 src/world/Event/Director.cpp                  |  2 +-
 src/world/Manager/DebugCommandMgr.cpp         | 14 ++--
 src/world/Manager/HousingMgr.cpp              | 14 ++--
 src/world/Manager/InventoryMgr.cpp            |  6 +-
 src/world/Manager/MarketMgr.cpp               |  6 +-
 src/world/Manager/TerritoryMgr.cpp            |  2 +-
 src/world/Network/Handlers/ActionHandler.cpp  |  4 +-
 src/world/Network/Handlers/CFHandlers.cpp     |  8 +--
 .../Network/Handlers/ClientTriggerHandler.cpp |  4 +-
 src/world/Network/Handlers/EventHandlers.cpp  | 18 +++---
 .../Network/Handlers/GMCommandHandlers.cpp    |  8 +--
 .../Network/Handlers/InventoryHandler.cpp     |  4 +-
 src/world/Network/Handlers/PacketHandlers.cpp | 64 +++++++++----------
 .../PacketWrappers/ActorControlPacket142.h    |  4 +-
 .../PacketWrappers/ActorControlPacket143.h    |  4 +-
 .../PacketWrappers/ActorControlPacket144.h    |  4 +-
 src/world/Network/PacketWrappers/ChatPacket.h |  4 +-
 .../PacketWrappers/DirectorPlayScenePacket.h  |  4 +-
 .../Network/PacketWrappers/EffectPacket.h     |  4 +-
 .../PacketWrappers/EventFinishPacket.h        |  4 +-
 .../Network/PacketWrappers/EventPlayPacket.h  |  4 +-
 .../Network/PacketWrappers/EventStartPacket.h |  4 +-
 .../Network/PacketWrappers/ExaminePacket.h    |  4 +-
 .../Network/PacketWrappers/ModelEquipPacket.h |  4 +-
 .../Network/PacketWrappers/MoveActorPacket.h  |  4 +-
 .../Network/PacketWrappers/NpcSpawnPacket.h   |  4 +-
 src/world/Network/PacketWrappers/PingPacket.h |  4 +-
 .../PacketWrappers/PlayerSetupPacket.h        |  4 +-
 .../PacketWrappers/PlayerSpawnPacket.h        |  4 +-
 .../PacketWrappers/PlayerStateFlagsPacket.h   |  6 +-
 .../PacketWrappers/QuestMessagePacket.h       |  4 +-
 .../PacketWrappers/ServerNoticePacket.h       |  4 +-
 .../PacketWrappers/UpdateHpMpTpPacket.h       |  4 +-
 .../UpdateInventorySlotPacket.h               |  4 +-
 src/world/Session.cpp                         |  2 +-
 .../Housing/HousingInteriorTerritory.cpp      |  8 +--
 src/world/Territory/HousingZone.cpp           | 12 ++--
 src/world/Territory/Territory.cpp             |  2 +-
 49 files changed, 199 insertions(+), 199 deletions(-)

diff --git a/src/common/Network/GamePacket.h b/src/common/Network/GamePacket.h
index 0922c5d2..c1c06b76 100644
--- a/src/common/Network/GamePacket.h
+++ b/src/common/Network/GamePacket.h
@@ -23,7 +23,7 @@ namespace Sapphire::Network::Packets
   class FFXIVIpcPacket;
 
   template< class T >
-  using WorldChannelPacket = FFXIVIpcPacket< T, ServerZoneIpcType >;
+  using ZoneChannelPacket = FFXIVIpcPacket< T, ServerZoneIpcType >;
 
   template< class T >
   using ChatChannelPacket = FFXIVIpcPacket< T, ServerChatIpcType >;
@@ -33,9 +33,9 @@ namespace Sapphire::Network::Packets
 
 
   template< class T, typename... Args >
-  std::shared_ptr< WorldChannelPacket< T > > makeWorldPacket( Args... args )
+  std::shared_ptr< ZoneChannelPacket< T > > makeZonePacket( Args... args )
   {
-    return std::make_shared< WorldChannelPacket< T > >( args... );
+    return std::make_shared< ZoneChannelPacket< T > >( args... );
   }
 
   template< class T, typename... Args >
diff --git a/src/world/Action/Action.cpp b/src/world/Action/Action.cpp
index 6d1b2662..783a84ea 100644
--- a/src/world/Action/Action.cpp
+++ b/src/world/Action/Action.cpp
@@ -225,7 +225,7 @@ void Action::Action::start()
 
   if( hasCastTime() )
   {
-    auto castPacket = makeWorldPacket< Server::FFXIVIpcActorCast >( getId() );
+    auto castPacket = makeZonePacket< Server::FFXIVIpcActorCast >( getId() );
     auto& data = castPacket->data();
 
     data.action_id = static_cast< uint16_t >( m_id );
diff --git a/src/world/Actor/Actor.cpp b/src/world/Actor/Actor.cpp
index 24dd8171..efaf0e51 100644
--- a/src/world/Actor/Actor.cpp
+++ b/src/world/Actor/Actor.cpp
@@ -66,7 +66,7 @@ void Sapphire::Entity::Actor::setPos( float x, float y, float z, bool broadcastU
   m_pos.z = z;
 
   if( broadcastUpdate )
-    m_pCurrentZone->updateActorPosition( *this );
+    m_pCurrentTerritory->updateActorPosition( *this );
 }
 
 void Sapphire::Entity::Actor::setPos( const Sapphire::Common::FFXIVARR_POSITION3& pos, bool broadcastUpdate )
@@ -74,7 +74,7 @@ void Sapphire::Entity::Actor::setPos( const Sapphire::Common::FFXIVARR_POSITION3
   m_pos = pos;
 
   if( broadcastUpdate )
-    m_pCurrentZone->updateActorPosition( *this );
+    m_pCurrentTerritory->updateActorPosition( *this );
 }
 
 float Sapphire::Entity::Actor::getRot() const
@@ -333,20 +333,20 @@ std::set< Sapphire::Entity::ActorPtr > Sapphire::Entity::Actor::getInRangeActors
 /*! \return TerritoryPtr to the current zone, nullptr if not set */
 Sapphire::TerritoryPtr Sapphire::Entity::Actor::getCurrentTerritory() const
 {
-  return m_pCurrentZone;
+  return m_pCurrentTerritory;
 }
 
 /*! \param TerritoryPtr to the zone to be set as current */
-void Sapphire::Entity::Actor::setCurrentTerritory( TerritoryPtr currZone )
+void Sapphire::Entity::Actor::setCurrentZone( TerritoryPtr currZone )
 {
-  m_pCurrentZone = currZone;
+  m_pCurrentTerritory = currZone;
 }
 
 /*! \return InstanceContentPtr to the current instance, nullptr if not an instance or not set */
 Sapphire::InstanceContentPtr Sapphire::Entity::Actor::getCurrentInstance() const
 {
-  if( m_pCurrentZone )
-    return m_pCurrentZone->getAsInstanceContent();
+  if( m_pCurrentTerritory )
+    return m_pCurrentTerritory->getAsInstanceContent();
 
   return nullptr;
 }
@@ -354,8 +354,8 @@ Sapphire::InstanceContentPtr Sapphire::Entity::Actor::getCurrentInstance() const
 /*! \return QuestBattlePtr to the current instance, nullptr if not an instance or not set */
 Sapphire::QuestBattlePtr Sapphire::Entity::Actor::getCurrentQuestBattle() const
 {
-  if( m_pCurrentZone )
-    return m_pCurrentZone->getAsQuestBattle();
+  if( m_pCurrentTerritory )
+    return m_pCurrentTerritory->getAsQuestBattle();
 
   return nullptr;
 }
diff --git a/src/world/Actor/Actor.h b/src/world/Actor/Actor.h
index 40d2fb9d..80bd066e 100644
--- a/src/world/Actor/Actor.h
+++ b/src/world/Actor/Actor.h
@@ -32,7 +32,7 @@ namespace Sapphire::Entity
     /*! Id of the zone the actor currently is in */
     uint32_t m_territoryTypeId;
     /*! Ptr to the ZoneObj the actor belongs to */
-    TerritoryPtr m_pCurrentZone;
+    TerritoryPtr m_pCurrentTerritory;
 
     /*! list of various actors in range */
     std::set< ActorPtr > m_inRangeActor;
@@ -124,7 +124,7 @@ namespace Sapphire::Entity
 
     TerritoryPtr getCurrentTerritory() const;
 
-    void setCurrentTerritory( TerritoryPtr currZone );
+    void setCurrentZone( TerritoryPtr currZone );
 
     InstanceContentPtr getCurrentInstance() const;
 
diff --git a/src/world/Actor/BNpc.cpp b/src/world/Actor/BNpc.cpp
index b2b7f439..8276842d 100644
--- a/src/world/Actor/BNpc.cpp
+++ b/src/world/Actor/BNpc.cpp
@@ -78,7 +78,7 @@ Sapphire::Entity::BNpc::BNpc( uint32_t id, BNpcTemplatePtr pTemplate, float posX
 
   m_class = ClassJob::Adventurer;
 
-  m_pCurrentZone = std::move( pZone );
+  m_pCurrentTerritory = std::move( pZone );
 
   m_spawnPos = m_pos;
 
@@ -194,13 +194,13 @@ void Sapphire::Entity::BNpc::setState( BNpcState state )
 bool Sapphire::Entity::BNpc::moveTo( const FFXIVARR_POSITION3& pos )
 {
 
-  auto pNaviProvider = m_pCurrentZone->getNaviProvider();
+  auto pNaviProvider = m_pCurrentTerritory->getNaviProvider();
 
   if( !pNaviProvider )
   {
     Logger::error( "No NaviProvider for zone#{0} - {1}",
-                   m_pCurrentZone->getGuId(),
-                   m_pCurrentZone->getInternalName() );
+                   m_pCurrentTerritory->getGuId(),
+                   m_pCurrentTerritory->getInternalName() );
     return false;
   }
 
@@ -216,7 +216,7 @@ bool Sapphire::Entity::BNpc::moveTo( const FFXIVARR_POSITION3& pos )
     return true;
   }
 
-  m_pCurrentZone->updateActorPosition( *this );
+  m_pCurrentTerritory->updateActorPosition( *this );
   face( pos );
   setPos( pos1 );
   sendPositionUpdate();
@@ -226,13 +226,13 @@ bool Sapphire::Entity::BNpc::moveTo( const FFXIVARR_POSITION3& pos )
 bool Sapphire::Entity::BNpc::moveTo( const Entity::Chara& targetChara )
 {
 
-  auto pNaviProvider = m_pCurrentZone->getNaviProvider();
+  auto pNaviProvider = m_pCurrentTerritory->getNaviProvider();
 
   if( !pNaviProvider )
   {
     Logger::error( "No NaviProvider for zone#{0} - {1}",
-                   m_pCurrentZone->getGuId(),
-                   m_pCurrentZone->getInternalName() );
+                   m_pCurrentTerritory->getGuId(),
+                   m_pCurrentTerritory->getInternalName() );
     return false;
   }
 
@@ -248,7 +248,7 @@ bool Sapphire::Entity::BNpc::moveTo( const Entity::Chara& targetChara )
     return true;
   }
 
-  m_pCurrentZone->updateActorPosition( *this );
+  m_pCurrentTerritory->updateActorPosition( *this );
   face( targetChara.getPos() );
   setPos( pos1 );
   sendPositionUpdate();
@@ -407,7 +407,7 @@ void Sapphire::Entity::BNpc::update( uint64_t tickCount )
   const uint8_t maxDistanceToOrigin = 40;
   const uint32_t roamTick = 20;
 
-  auto pNaviProvider = m_pCurrentZone->getNaviProvider();
+  auto pNaviProvider = m_pCurrentTerritory->getNaviProvider();
 
   if( !pNaviProvider )
     return;
@@ -645,14 +645,14 @@ void Sapphire::Entity::BNpc::setOwner( Sapphire::Entity::CharaPtr m_pChara )
   m_pOwner = m_pChara;
   if( m_pChara != nullptr )
   {
-    auto setOwnerPacket = makeWorldPacket< FFXIVIpcActorOwner >( m_pChara->getId() );
+    auto setOwnerPacket = makeZonePacket< FFXIVIpcActorOwner >( m_pChara->getId() );
     setOwnerPacket->data().type = 0x01;
     setOwnerPacket->data().actorId = m_pChara->getId();
     sendToInRangeSet( setOwnerPacket );
   }
   else
   {
-    auto setOwnerPacket = makeWorldPacket< FFXIVIpcActorOwner >( getId() );
+    auto setOwnerPacket = makeZonePacket< FFXIVIpcActorOwner >( getId() );
     setOwnerPacket->data().type = 0x01;
     setOwnerPacket->data().actorId = INVALID_GAME_OBJECT_ID;
     sendToInRangeSet( setOwnerPacket );
diff --git a/src/world/Actor/Chara.cpp b/src/world/Actor/Chara.cpp
index 26ba4918..77f9004f 100644
--- a/src/world/Actor/Chara.cpp
+++ b/src/world/Actor/Chara.cpp
@@ -518,7 +518,7 @@ void Sapphire::Entity::Chara::addStatusEffect( StatusEffect::StatusEffectPtr pEf
   pEffect->applyStatus();
   m_statusEffectMap[ nextSlot ] = pEffect;
 
-  auto statusEffectAdd = makeWorldPacket< FFXIVIpcEffectResult >( getId() );
+  auto statusEffectAdd = makeZonePacket< FFXIVIpcEffectResult >( getId() );
 
   statusEffectAdd->data().actor_id = pEffect->getTargetActorId();
   statusEffectAdd->data().current_hp = getHp();
@@ -639,7 +639,7 @@ void Sapphire::Entity::Chara::sendStatusEffectUpdate()
   uint64_t currentTimeMs = Util::getTimeMs();
 
 
-  auto statusEffectList = makeWorldPacket< FFXIVIpcStatusEffectList >( getId() );
+  auto statusEffectList = makeZonePacket< FFXIVIpcStatusEffectList >( getId() );
   statusEffectList->data().classId = static_cast< uint8_t >( getClass() );
   statusEffectList->data().level = getLevel();
   statusEffectList->data().level1 = getLevel();
diff --git a/src/world/Actor/EventObject.cpp b/src/world/Actor/EventObject.cpp
index f6376615..cc34720e 100644
--- a/src/world/Actor/EventObject.cpp
+++ b/src/world/Actor/EventObject.cpp
@@ -120,7 +120,7 @@ void Sapphire::Entity::EventObject::spawn( Sapphire::Entity::PlayerPtr pTarget )
 
   Logger::debug( "Spawning EObj: id#{0} name={1}", getId(), getName() );
 
-  auto eobjStatePacket = makeWorldPacket< FFXIVIpcObjectSpawn >( getId(), pTarget->getId() );
+  auto eobjStatePacket = makeZonePacket< FFXIVIpcObjectSpawn >( getId(), pTarget->getId() );
   eobjStatePacket->data().spawnIndex = spawnIndex;
   eobjStatePacket->data().objKind = getObjKind();
   eobjStatePacket->data().state = getState();
diff --git a/src/world/Actor/Player.cpp b/src/world/Actor/Player.cpp
index 9243a68c..c7ddadee 100644
--- a/src/world/Actor/Player.cpp
+++ b/src/world/Actor/Player.cpp
@@ -236,7 +236,7 @@ uint64_t Sapphire::Entity::Player::getOnlineStatusMask() const
 
 void Sapphire::Entity::Player::prepareZoning( uint16_t targetZone, bool fadeOut, uint8_t fadeOutTime, uint16_t animation )
 {
-  auto preparePacket = makeWorldPacket< FFXIVIpcPrepareZoning >( getId() );
+  auto preparePacket = makeZonePacket< FFXIVIpcPrepareZoning >( getId() );
   preparePacket->data().targetZone = targetZone;
   preparePacket->data().fadeOutTime = fadeOutTime;
   preparePacket->data().animation = animation;
@@ -311,7 +311,7 @@ bool Sapphire::Entity::Player::isAutoattackOn() const
 
 void Sapphire::Entity::Player::sendStats()
 {
-  auto statPacket = makeWorldPacket< FFXIVIpcPlayerStats >( getId() );
+  auto statPacket = makeZonePacket< FFXIVIpcPlayerStats >( getId() );
 
   statPacket->data().strength = getStatValue( Common::BaseParam::Strength );
   statPacket->data().dexterity = getStatValue( Common::BaseParam::Dexterity );
@@ -731,7 +731,7 @@ void Sapphire::Entity::Player::gainLevel()
   m_hp = getMaxHp();
   m_mp = getMaxMp();
 
-  auto effectListPacket = makeWorldPacket< FFXIVIpcStatusEffectList >( getId() );
+  auto effectListPacket = makeZonePacket< FFXIVIpcStatusEffectList >( getId() );
   effectListPacket->data().classId = static_cast< uint8_t > ( getClass() );
   effectListPacket->data().level1 = getLevel();
   effectListPacket->data().level = getLevel();
@@ -745,7 +745,7 @@ void Sapphire::Entity::Player::gainLevel()
   sendToInRangeSet( makeActorControl142( getId(), LevelUpEffect, static_cast< uint8_t >( getClass() ),
                                          getLevel(), getLevel() - 1 ), true );
 
-  auto classInfoPacket = makeWorldPacket< FFXIVIpcUpdateClassInfo >( getId() );
+  auto classInfoPacket = makeZonePacket< FFXIVIpcUpdateClassInfo >( getId() );
   classInfoPacket->data().classId = static_cast< uint8_t > ( getClass() );
   classInfoPacket->data().level1 = getLevel();
   classInfoPacket->data().level = getLevel();
@@ -818,7 +818,7 @@ void Sapphire::Entity::Player::setClassJob( Common::ClassJob classJob )
 
   m_tp = 0;
 
-  auto classInfoPacket = makeWorldPacket< FFXIVIpcPlayerClassInfo >( getId() );
+  auto classInfoPacket = makeZonePacket< FFXIVIpcPlayerClassInfo >( getId() );
   classInfoPacket->data().classId = static_cast< uint8_t >( getClass() );
   classInfoPacket->data().classLevel = getLevel();
   classInfoPacket->data().syncedLevel = getLevel();
@@ -954,7 +954,7 @@ void Sapphire::Entity::Player::setGc( uint8_t gc )
 {
   m_gc = gc;
 
-  auto gcAffPacket = makeWorldPacket< FFXIVGCAffiliation >( getId() );
+  auto gcAffPacket = makeZonePacket< FFXIVGCAffiliation >( getId() );
   gcAffPacket->data().gcId = m_gc;
   gcAffPacket->data().gcRank[ 0 ] = m_gcRank[ 0 ];
   gcAffPacket->data().gcRank[ 1 ] = m_gcRank[ 1 ];
@@ -966,7 +966,7 @@ void Sapphire::Entity::Player::setGcRankAt( uint8_t index, uint8_t rank )
 {
   m_gcRank[ index ] = rank;
 
-  auto gcAffPacket = makeWorldPacket< FFXIVGCAffiliation >( getId() );
+  auto gcAffPacket = makeZonePacket< FFXIVGCAffiliation >( getId() );
   gcAffPacket->data().gcId = m_gc;
   gcAffPacket->data().gcRank[ 0 ] = m_gcRank[ 0 ];
   gcAffPacket->data().gcRank[ 1 ] = m_gcRank[ 1 ];
@@ -1069,7 +1069,7 @@ void Sapphire::Entity::Player::update( uint64_t tickCount )
     }
     else
     {
-      auto setActorPosPacket = makeWorldPacket< FFXIVIpcActorSetPos >( getId() );
+      auto setActorPosPacket = makeZonePacket< FFXIVIpcActorSetPos >( getId() );
       setActorPosPacket->data().r16 = Util::floatToUInt16Rot( m_queuedZoneing->m_targetRotation );
       setActorPosPacket->data().waitForLoad = 0x04;
       setActorPosPacket->data().x = targetPos.x;
@@ -1153,7 +1153,7 @@ void Sapphire::Entity::Player::freePlayerSpawnId( uint32_t actorId )
   if( spawnId == m_actorSpawnIndexAllocator.getAllocFailId() )
     return;
 
-  auto freeActorSpawnPacket = makeWorldPacket< FFXIVIpcActorFreeSpawn >( getId() );
+  auto freeActorSpawnPacket = makeZonePacket< FFXIVIpcActorFreeSpawn >( getId() );
   freeActorSpawnPacket->data().actorId = actorId;
   freeActorSpawnPacket->data().spawnId = spawnId;
   queuePacket( freeActorSpawnPacket );
@@ -1408,9 +1408,9 @@ bool Sapphire::Entity::Player::hateListHasEntry( BNpcPtr pBNpc )
 
 void Sapphire::Entity::Player::sendHateList()
 {
-  auto hateListPacket = makeWorldPacket< FFXIVIpcHateList >( getId() );
+  auto hateListPacket = makeZonePacket< FFXIVIpcHateList >( getId() );
   hateListPacket->data().numEntries = m_actorIdTohateSlotMap.size();
-  auto hateRankPacket = makeWorldPacket< FFXIVIpcHateRank >( getId() );
+  auto hateRankPacket = makeZonePacket< FFXIVIpcHateRank >( getId() );
   hateRankPacket->data().numEntries = m_actorIdTohateSlotMap.size();
   auto it = m_actorIdTohateSlotMap.begin();
   for( int32_t i = 0; it != m_actorIdTohateSlotMap.end(); ++it, i++ )
@@ -1490,7 +1490,7 @@ void Sapphire::Entity::Player::setTitle( uint16_t titleId )
 void Sapphire::Entity::Player::setEquipDisplayFlags( uint8_t state )
 {
   m_equipDisplayFlags = state;
-  auto paramPacket = makeWorldPacket< FFXIVIpcEquipDisplayFlags >( getId() );
+  auto paramPacket = makeZonePacket< FFXIVIpcEquipDisplayFlags >( getId() );
   paramPacket->data().bitmask = m_equipDisplayFlags;
   sendToInRangeSet( paramPacket, true );
 }
@@ -1507,7 +1507,7 @@ void Sapphire::Entity::Player::mount( uint32_t id )
                                          static_cast< uint8_t >( Common::ActorStatus::Mounted ) ), true );
   sendToInRangeSet( makeActorControl143( getId(), 0x39e, 12 ), true ); //?
 
-  auto mountPacket = makeWorldPacket< FFXIVIpcMount >( getId() );
+  auto mountPacket = makeZonePacket< FFXIVIpcMount >( getId() );
   mountPacket->data().id = id;
   sendToInRangeSet( mountPacket, true );
 }
@@ -1655,7 +1655,7 @@ uint16_t Sapphire::Entity::Player::getItemLevel() const
 void Sapphire::Entity::Player::setEorzeaTimeOffset( uint64_t timestamp )
 {
   // TODO: maybe change to persistent?
-  auto packet = makeWorldPacket< FFXIVIpcEorzeaTimeOffset >( getId() );
+  auto packet = makeZonePacket< FFXIVIpcEorzeaTimeOffset >( getId() );
   packet->data().timestamp = timestamp;
 
   // Send to single player
@@ -1683,7 +1683,7 @@ void Sapphire::Entity::Player::sendZonePackets()
 
   getCurrentTerritory()->onBeforePlayerZoneIn( *this );
 
-  auto initPacket = makeWorldPacket< FFXIVIpcInit >( getId() );
+  auto initPacket = makeZonePacket< FFXIVIpcInit >( getId() );
   initPacket->data().charId = getId();
   queuePacket( initPacket );
 
@@ -1706,7 +1706,7 @@ void Sapphire::Entity::Player::sendZonePackets()
   // only initialize the UI if the player in fact just logged in.
   if( isLogin() )
   {
-    auto contentFinderList = makeWorldPacket< FFXIVIpcCFAvailableContents >( getId() );
+    auto contentFinderList = makeZonePacket< FFXIVIpcCFAvailableContents >( getId() );
 
     for( auto i = 0; i < sizeof( contentFinderList->data().contents ); i++ )
     {
@@ -1717,7 +1717,7 @@ void Sapphire::Entity::Player::sendZonePackets()
 
     queuePacket( std::make_shared< PlayerSetupPacket >( *this ) );
 
-    auto classInfoPacket = makeWorldPacket< FFXIVIpcPlayerClassInfo >( getId() );
+    auto classInfoPacket = makeZonePacket< FFXIVIpcPlayerClassInfo >( getId() );
     classInfoPacket->data().classId = static_cast< uint8_t >( getClass() );
     classInfoPacket->data().unknown = 1;
     classInfoPacket->data().syncedLevel = getLevel();
@@ -1746,7 +1746,7 @@ void Sapphire::Entity::Player::sendZonePackets()
 
   sendLandFlags();
 
-  auto initZonePacket = makeWorldPacket< FFXIVIpcInitZone >( getId() );
+  auto initZonePacket = makeZonePacket< FFXIVIpcInitZone >( getId() );
   initZonePacket->data().zoneId = getCurrentTerritory()->getTerritoryTypeId();
   initZonePacket->data().weatherId = static_cast< uint8_t >( getCurrentTerritory()->getCurrentWeather() );
   initZonePacket->data().bitmask = 0x1;
@@ -1761,10 +1761,10 @@ void Sapphire::Entity::Player::sendZonePackets()
 
   if( isLogin() )
   {
-    auto unk322 = makeWorldPacket< FFXIVARR_IPC_UNK322 >( getId() );
+    auto unk322 = makeZonePacket< FFXIVARR_IPC_UNK322 >( getId() );
     queuePacket( unk322 );
 
-    auto unk320 = makeWorldPacket< FFXIVARR_IPC_UNK320 >( getId() );
+    auto unk320 = makeZonePacket< FFXIVARR_IPC_UNK320 >( getId() );
     queuePacket( unk320 );
   }
 
@@ -1786,7 +1786,7 @@ bool Sapphire::Entity::Player::isDirectorInitialized() const
 
 void Sapphire::Entity::Player::sendTitleList()
 {
-  auto titleListPacket = makeWorldPacket< FFXIVIpcPlayerTitleList >( getId() );
+  auto titleListPacket = makeZonePacket< FFXIVIpcPlayerTitleList >( getId() );
   memcpy( titleListPacket->data().titleList, getTitleList(), sizeof( titleListPacket->data().titleList ) );
 
   queuePacket( titleListPacket );
@@ -1930,7 +1930,7 @@ void Sapphire::Entity::Player::freeObjSpawnIndexForActorId( uint32_t actorId )
   if( spawnId == m_objSpawnIndexAllocator.getAllocFailId() )
     return;
 
-  auto freeObjectSpawnPacket = makeWorldPacket< FFXIVIpcObjectDespawn >( getId() );
+  auto freeObjectSpawnPacket = makeZonePacket< FFXIVIpcObjectDespawn >( getId() );
   freeObjectSpawnPacket->data().spawnIndex = spawnId;
   queuePacket( freeObjectSpawnPacket );
 }
@@ -1961,7 +1961,7 @@ void Sapphire::Entity::Player::setLandFlags( uint8_t flagSlot, uint32_t landFlag
 
 void Sapphire::Entity::Player::sendLandFlags()
 {
-  auto landFlags = makeWorldPacket< FFXIVIpcHousingLandFlags >( getId() );
+  auto landFlags = makeZonePacket< FFXIVIpcHousingLandFlags >( getId() );
 
   landFlags->data().freeCompanyHouse = m_landFlags[ Common::LandFlagsSlot::FreeCompany ];
   landFlags->data().privateHouse = m_landFlags[ Common::LandFlagsSlot::Private ];
@@ -1974,7 +1974,7 @@ void Sapphire::Entity::Player::sendLandFlags()
 
 void Sapphire::Entity::Player::sendLandFlagsSlot( Common::LandFlagsSlot slot )
 {
-  auto landFlags = makeWorldPacket< FFXIVIpcHousingUpdateLandFlagsSlot >( getId() );
+  auto landFlags = makeZonePacket< FFXIVIpcHousingUpdateLandFlagsSlot >( getId() );
 
   uint32_t type = 0;
 
@@ -2012,7 +2012,7 @@ void Sapphire::Entity::Player::sendHuntingLog()
   for( const auto& entry : m_huntingLogEntries )
   {
     uint64_t completionFlag = 0;
-    auto huntPacket = makeWorldPacket< FFXIVIpcHuntingLogEntry >( getId() );
+    auto huntPacket = makeZonePacket< FFXIVIpcHuntingLogEntry >( getId() );
 
     huntPacket->data().u0 = -1;
     huntPacket->data().rank = entry.rank;
diff --git a/src/world/Actor/PlayerEvent.cpp b/src/world/Actor/PlayerEvent.cpp
index 945b5c1f..7db09d0b 100644
--- a/src/world/Actor/PlayerEvent.cpp
+++ b/src/world/Actor/PlayerEvent.cpp
@@ -141,7 +141,7 @@ void Sapphire::Entity::Player::playGilShop( uint32_t eventId, uint32_t flags,
   pEvent->setEventReturnCallback( eventCallback );
   pEvent->setSceneChainCallback( nullptr );
 
-  auto openGilShopPacket = makeWorldPacket< Server::FFXIVIpcEventOpenGilShop >( getId() );
+  auto openGilShopPacket = makeZonePacket< Server::FFXIVIpcEventOpenGilShop >( getId() );
   openGilShopPacket->data().eventId = eventId;
   openGilShopPacket->data().sceneFlags = flags;
   openGilShopPacket->data().actorId = getId();
diff --git a/src/world/Actor/PlayerInventory.cpp b/src/world/Actor/PlayerInventory.cpp
index b2c4e1c3..720f2f2e 100644
--- a/src/world/Actor/PlayerInventory.cpp
+++ b/src/world/Actor/PlayerInventory.cpp
@@ -815,7 +815,7 @@ void Sapphire::Entity::Player::discardItem( uint16_t fromInventoryId, uint8_t fr
   m_storageMap[ fromInventoryId ]->removeItem( fromSlotId );
   updateContainer( fromInventoryId, fromSlotId, nullptr );
 
-  auto invTransPacket = makeWorldPacket< FFXIVIpcInventoryTransaction >( getId() );
+  auto invTransPacket = makeZonePacket< FFXIVIpcInventoryTransaction >( getId() );
   invTransPacket->data().sequence = sequence;
   invTransPacket->data().ownerId = getId();
   invTransPacket->data().storageId = fromInventoryId;
@@ -825,7 +825,7 @@ void Sapphire::Entity::Player::discardItem( uint16_t fromInventoryId, uint8_t fr
   invTransPacket->data().type = 7;
   queuePacket( invTransPacket );
 
-  auto invTransFinPacket = makeWorldPacket< FFXIVIpcInventoryTransactionFinish >( getId() );
+  auto invTransFinPacket = makeZonePacket< FFXIVIpcInventoryTransactionFinish >( getId() );
   invTransFinPacket->data().sequenceId = sequence;
   invTransFinPacket->data().sequenceId1 = sequence;
   queuePacket( invTransFinPacket );
@@ -930,7 +930,7 @@ Sapphire::ItemPtr Sapphire::Entity::Player::dropInventoryItem( Sapphire::Common:
   auto seq = getNextInventorySequence();
 
   // send inv update
-  auto invTransPacket = makeWorldPacket< FFXIVIpcInventoryTransaction >( getId() );
+  auto invTransPacket = makeZonePacket< FFXIVIpcInventoryTransaction >( getId() );
   invTransPacket->data().sequence = seq;
   invTransPacket->data().ownerId = getId();
   invTransPacket->data().storageId = type;
@@ -940,7 +940,7 @@ Sapphire::ItemPtr Sapphire::Entity::Player::dropInventoryItem( Sapphire::Common:
   invTransPacket->data().type = 7;
   queuePacket( invTransPacket );
 
-  auto invTransFinPacket = makeWorldPacket< FFXIVIpcInventoryTransactionFinish >( getId() );
+  auto invTransFinPacket = makeZonePacket< FFXIVIpcInventoryTransactionFinish >( getId() );
   invTransFinPacket->data().sequenceId = seq;
   invTransFinPacket->data().sequenceId1 = seq;
   queuePacket( invTransFinPacket );
diff --git a/src/world/Actor/PlayerQuest.cpp b/src/world/Actor/PlayerQuest.cpp
index be704ee8..e503a273 100644
--- a/src/world/Actor/PlayerQuest.cpp
+++ b/src/world/Actor/PlayerQuest.cpp
@@ -39,13 +39,13 @@ void Sapphire::Entity::Player::removeQuest( uint16_t questId )
   if( ( idx != -1 ) && ( m_activeQuests[ idx ] != nullptr ) )
   {
 
-    auto questUpdatePacket = makeWorldPacket< FFXIVIpcQuestUpdate >( getId() );
+    auto questUpdatePacket = makeZonePacket< FFXIVIpcQuestUpdate >( getId() );
     questUpdatePacket->data().slot = static_cast< uint8_t >( idx );
     questUpdatePacket->data().questInfo.c.questId = 0;
     questUpdatePacket->data().questInfo.c.sequence = 0xFF;
     queuePacket( questUpdatePacket );
 
-    auto questFinishPacket = makeWorldPacket< FFXIVIpcQuestFinish >( getId() );
+    auto questFinishPacket = makeZonePacket< FFXIVIpcQuestFinish >( getId() );
     questFinishPacket->data().questId = questId;
     questFinishPacket->data().flag1 = 1;
     questFinishPacket->data().flag2 = 1;
@@ -890,7 +890,7 @@ void Sapphire::Entity::Player::updateQuest( uint16_t questId, uint8_t sequence )
     uint8_t index = getQuestIndex( questId );
     auto pNewQuest = m_activeQuests[ index ];
 
-    auto questUpdatePacket = makeWorldPacket< FFXIVIpcQuestUpdate >( getId() );
+    auto questUpdatePacket = makeZonePacket< FFXIVIpcQuestUpdate >( getId() );
     pNewQuest->c.sequence = sequence;
     questUpdatePacket->data().slot = index;
     questUpdatePacket->data().questInfo = *pNewQuest;
@@ -920,7 +920,7 @@ void Sapphire::Entity::Player::updateQuest( uint16_t questId, uint8_t sequence )
     m_questIdToQuestIdx[ questId ] = idx;
     m_questIdxToQuestId[ idx ] = questId;
 
-    auto questUpdatePacket = makeWorldPacket< FFXIVIpcQuestUpdate >( getId() );
+    auto questUpdatePacket = makeZonePacket< FFXIVIpcQuestUpdate >( getId() );
     questUpdatePacket->data().slot = idx;
     questUpdatePacket->data().questInfo = *pNewQuest;
     queuePacket( questUpdatePacket );
@@ -942,7 +942,7 @@ void Sapphire::Entity::Player::updateQuest( uint16_t questId, uint8_t sequence )
 
 void Sapphire::Entity::Player::sendQuestTracker()
 {
-  auto trackerPacket = makeWorldPacket< FFXIVIpcQuestTracker >( getId() );
+  auto trackerPacket = makeZonePacket< FFXIVIpcQuestTracker >( getId() );
 
   for( int32_t ii = 0; ii < 5; ii++ )
   {
@@ -987,7 +987,7 @@ void Sapphire::Entity::Player::setQuestTracker( uint16_t index, int16_t flag )
 
 void Sapphire::Entity::Player::sendQuestInfo()
 {
-  auto activeQuestListPacket = makeWorldPacket< FFXIVIpcQuestActiveList >( getId() );
+  auto activeQuestListPacket = makeZonePacket< FFXIVIpcQuestActiveList >( getId() );
 
   for( int32_t i = 0; i < 30; i++ )
   {
@@ -1003,7 +1003,7 @@ void Sapphire::Entity::Player::sendQuestInfo()
 
   queuePacket( activeQuestListPacket );
 
-  auto completeQuestListPacket = makeWorldPacket< FFXIVIpcQuestCompleteList >( getId() );
+  auto completeQuestListPacket = makeZonePacket< FFXIVIpcQuestCompleteList >( getId() );
   memcpy( completeQuestListPacket->data().questCompleteMask, m_questCompleteFlags, sizeof( m_questCompleteFlags ) );
   queuePacket( completeQuestListPacket );
 
diff --git a/src/world/Event/Director.cpp b/src/world/Event/Director.cpp
index 4ae4a519..00710e77 100644
--- a/src/world/Event/Director.cpp
+++ b/src/world/Event/Director.cpp
@@ -49,7 +49,7 @@ void Sapphire::Event::Director::sendDirectorClear( Sapphire::Entity::Player& pla
 
 void Sapphire::Event::Director::sendDirectorVars( Sapphire::Entity::Player& player ) const
 {
-  auto varPacket = makeWorldPacket< FFXIVIpcDirectorVars >( player.getId() );
+  auto varPacket = makeZonePacket< FFXIVIpcDirectorVars >( player.getId() );
   varPacket->data().m_directorId = getDirectorId();
   varPacket->data().m_sequence = getSequence();
   varPacket->data().m_branch = 0;
diff --git a/src/world/Manager/DebugCommandMgr.cpp b/src/world/Manager/DebugCommandMgr.cpp
index c2a06c9a..2cad42bb 100644
--- a/src/world/Manager/DebugCommandMgr.cpp
+++ b/src/world/Manager/DebugCommandMgr.cpp
@@ -188,7 +188,7 @@ void Sapphire::World::Manager::DebugCommandMgr::set( char* data, Entity::Player&
                      player.getPos().y + static_cast< float >( posY ),
                      player.getPos().z + static_cast< float >( posZ ) );
 
-    auto setActorPosPacket = makeWorldPacket< FFXIVIpcActorSetPos >( player.getId() );
+    auto setActorPosPacket = makeZonePacket< FFXIVIpcActorSetPos >( player.getId() );
     setActorPosPacket->data().x = player.getPos().x;
     setActorPosPacket->data().y = player.getPos().y;
     setActorPosPacket->data().z = player.getPos().z;
@@ -208,7 +208,7 @@ void Sapphire::World::Manager::DebugCommandMgr::set( char* data, Entity::Player&
     int32_t discover_id;
     sscanf( params.c_str(), "%i %i", &map_id, &discover_id );
 
-    auto discoveryPacket = makeWorldPacket< FFXIVIpcDiscovery >( player.getId() );
+    auto discoveryPacket = makeZonePacket< FFXIVIpcDiscovery >( player.getId() );
     discoveryPacket->data().map_id = map_id;
     discoveryPacket->data().map_part_id = discover_id;
     player.queuePacket( discoveryPacket );
@@ -281,7 +281,7 @@ void Sapphire::World::Manager::DebugCommandMgr::set( char* data, Entity::Player&
     int32_t id;
     sscanf( params.c_str(), "%d", &id );
 
-    auto msqPacket = makeWorldPacket< FFXIVIpcMSQTrackerProgress >( player.getId() );
+    auto msqPacket = makeZonePacket< FFXIVIpcMSQTrackerProgress >( player.getId() );
     msqPacket->data().id = id;
     player.queuePacket( msqPacket );
 
@@ -292,7 +292,7 @@ void Sapphire::World::Manager::DebugCommandMgr::set( char* data, Entity::Player&
     int32_t id;
     sscanf( params.c_str(), "%d", &id );
 
-    auto msqPacket = makeWorldPacket< FFXIVIpcMSQTrackerComplete >( player.getId() );
+    auto msqPacket = makeZonePacket< FFXIVIpcMSQTrackerComplete >( player.getId() );
     msqPacket->data().id = id;
     player.queuePacket( msqPacket );
 
@@ -459,7 +459,7 @@ void Sapphire::World::Manager::DebugCommandMgr::add( char* data, Entity::Player&
 
 
 
-    //pBNpc->setCurrentTerritory( playerZone );
+    //pBNpc->setCurrentZone( playerZone );
     //pBNpc->setPos( player.getPos().x, player.getPos().y, player.getPos().z );
 
     playerZone->pushActor( pBNpc );
@@ -494,7 +494,7 @@ void Sapphire::World::Manager::DebugCommandMgr::add( char* data, Entity::Player&
 
     player.sendNotice( "Injecting ACTOR_CONTROL {0}", opcode );
 
-    auto actorControl = makeWorldPacket< FFXIVIpcActorControl143 >( playerId, player.getId() );
+    auto actorControl = makeZonePacket< FFXIVIpcActorControl143 >( playerId, player.getId() );
     actorControl->data().category = opcode;
     actorControl->data().param1 = param1;
     actorControl->data().param2 = param2;
@@ -703,7 +703,7 @@ void Sapphire::World::Manager::DebugCommandMgr::nudge( char* data, Entity::Playe
   }
   if( offset != 0 )
   {
-    auto setActorPosPacket = makeWorldPacket< FFXIVIpcActorSetPos >( player.getId() );
+    auto setActorPosPacket = makeZonePacket< FFXIVIpcActorSetPos >( player.getId() );
     setActorPosPacket->data().x = player.getPos().x;
     setActorPosPacket->data().y = player.getPos().y;
     setActorPosPacket->data().z = player.getPos().z;
diff --git a/src/world/Manager/HousingMgr.cpp b/src/world/Manager/HousingMgr.cpp
index 5c7962ba..5c773e9f 100644
--- a/src/world/Manager/HousingMgr.cpp
+++ b/src/world/Manager/HousingMgr.cpp
@@ -322,7 +322,7 @@ void Sapphire::World::Manager::HousingMgr::sendLandSignOwned( Entity::Player& pl
   if( !land )
     return;
 
-  auto landInfoSignPacket = makeWorldPacket< Server::FFXIVIpcLandInfoSign >( player.getId() );
+  auto landInfoSignPacket = makeZonePacket< Server::FFXIVIpcLandInfoSign >( player.getId() );
   landInfoSignPacket->data().houseSize = land->getSize();
   landInfoSignPacket->data().houseType = static_cast< uint8_t >( land->getLandType() );
   landInfoSignPacket->data().landIdent = ident;
@@ -354,7 +354,7 @@ void Sapphire::World::Manager::HousingMgr::sendLandSignFree( Entity::Player& pla
     return;
 
   auto land = hZone->getLand( ident.landId );
-  auto plotPricePacket = makeWorldPacket< Server::FFXIVIpcLandPriceUpdate >( player.getId() );
+  auto plotPricePacket = makeZonePacket< Server::FFXIVIpcLandPriceUpdate >( player.getId() );
   plotPricePacket->data().price = land->getCurrentPrice();
   plotPricePacket->data().timeLeft = land->getDevaluationTime();
   player.queuePacket( plotPricePacket );
@@ -469,7 +469,7 @@ void Sapphire::World::Manager::HousingMgr::sendWardLandInfo( Entity::Player& pla
   if( !hZone )
     return;
 
-  auto wardInfoPacket = makeWorldPacket< Server::FFXIVIpcHousingWardInfo >( player.getId() );
+  auto wardInfoPacket = makeZonePacket< Server::FFXIVIpcHousingWardInfo >( player.getId() );
   wardInfoPacket->data().landIdent.wardNum = wardId;
   wardInfoPacket->data().landIdent.territoryTypeId = territoryTypeId;
 
@@ -538,7 +538,7 @@ void Sapphire::World::Manager::HousingMgr::sendEstateGreeting( Entity::Player& p
   if( !house )
     return;
 
-  auto greetingPacket = makeWorldPacket< FFXIVIpcHousingEstateGreeting >( player.getId() );
+  auto greetingPacket = makeZonePacket< FFXIVIpcHousingEstateGreeting >( player.getId() );
 
   greetingPacket->data().landIdent = ident;
 
@@ -723,7 +723,7 @@ void Sapphire::World::Manager::HousingMgr::requestEstateRename( Entity::Player&
   if( !house )
     return;
 
-  auto landRenamePacket = makeWorldPacket< Server::FFXIVIpcLandRename >( player.getId() );
+  auto landRenamePacket = makeZonePacket< Server::FFXIVIpcLandRename >( player.getId() );
 
   landRenamePacket->data().landIdent = ident;
   memcpy( &landRenamePacket->data().houseName, house->getHouseName().c_str(), 20 );
@@ -747,7 +747,7 @@ void Sapphire::World::Manager::HousingMgr::requestEstateEditGreeting( Entity::Pl
   if( !house )
     return;
 
-  auto estateGreetingPacket = makeWorldPacket< Server::FFXIVIpcHousingEstateGreeting >( player.getId() );
+  auto estateGreetingPacket = makeZonePacket< Server::FFXIVIpcHousingEstateGreeting >( player.getId() );
 
   estateGreetingPacket->data().landIdent = ident;
   memcpy( &estateGreetingPacket->data().message, house->getHouseGreeting().c_str(), sizeof( estateGreetingPacket->data().message ) );
@@ -795,7 +795,7 @@ void Sapphire::World::Manager::HousingMgr::requestEstateEditGuestAccess( Entity:
   if( !hasPermission( player, *land, 0 ) )
     return;
 
-  auto packet = makeWorldPacket< Server::FFXIVIpcHousingShowEstateGuestAccess >( player.getId() );
+  auto packet = makeZonePacket< Server::FFXIVIpcHousingShowEstateGuestAccess >( player.getId() );
   packet->data().ident = ident;
 
   player.queuePacket( packet );
diff --git a/src/world/Manager/InventoryMgr.cpp b/src/world/Manager/InventoryMgr.cpp
index 2bed5713..6d8217c6 100644
--- a/src/world/Manager/InventoryMgr.cpp
+++ b/src/world/Manager/InventoryMgr.cpp
@@ -32,7 +32,7 @@ void Sapphire::World::Manager::InventoryMgr::sendInventoryContainer( Sapphire::E
 
     if( container->getId() == Common::InventoryType::Currency || container->getId() == Common::InventoryType::Crystal )
     {
-      auto currencyInfoPacket = makeWorldPacket< Server::FFXIVIpcCurrencyCrystalInfo >( player.getId() );
+      auto currencyInfoPacket = makeZonePacket< Server::FFXIVIpcCurrencyCrystalInfo >( player.getId() );
       currencyInfoPacket->data().containerSequence = sequence;
       currencyInfoPacket->data().catalogId = itM->second->getId();
       currencyInfoPacket->data().unknown = 1;
@@ -44,7 +44,7 @@ void Sapphire::World::Manager::InventoryMgr::sendInventoryContainer( Sapphire::E
     }
     else
     {
-      auto itemInfoPacket = makeWorldPacket< Server::FFXIVIpcItemInfo >( player.getId() );
+      auto itemInfoPacket = makeZonePacket< Server::FFXIVIpcItemInfo >( player.getId() );
       itemInfoPacket->data().containerSequence = sequence;
       itemInfoPacket->data().containerId = container->getId();
       itemInfoPacket->data().slot = itM->first;
@@ -60,7 +60,7 @@ void Sapphire::World::Manager::InventoryMgr::sendInventoryContainer( Sapphire::E
     }
   }
 
-  auto containerInfoPacket = makeWorldPacket< Server::FFXIVIpcContainerInfo >( player.getId() );
+  auto containerInfoPacket = makeZonePacket< Server::FFXIVIpcContainerInfo >( player.getId() );
   containerInfoPacket->data().containerSequence = sequence;
   containerInfoPacket->data().numItems = container->getEntryCount();
   containerInfoPacket->data().containerId = container->getId();
diff --git a/src/world/Manager/MarketMgr.cpp b/src/world/Manager/MarketMgr.cpp
index 8b13d2a7..1ad81cf9 100644
--- a/src/world/Manager/MarketMgr.cpp
+++ b/src/world/Manager/MarketMgr.cpp
@@ -64,14 +64,14 @@ bool Sapphire::World::Manager::MarketMgr::init()
 void Sapphire::World::Manager::MarketMgr::requestItemListingInfo( Sapphire::Entity::Player& player, uint32_t catalogId,
                                                                   uint32_t requestId )
 {
-  auto countPkt = makeWorldPacket< Server::FFFXIVIpcMarketBoardItemListingCount >( player.getId() );
+  auto countPkt = makeZonePacket< Server::FFFXIVIpcMarketBoardItemListingCount >( player.getId() );
   countPkt->data().quantity = 1 << 8;
   countPkt->data().itemCatalogId = catalogId;
   countPkt->data().requestId = requestId;
 
   player.queuePacket( countPkt );
 
-  auto historyPkt = makeWorldPacket< Server::FFXIVIpcMarketBoardItemListingHistory >( player.getId() );
+  auto historyPkt = makeZonePacket< Server::FFXIVIpcMarketBoardItemListingHistory >( player.getId() );
   historyPkt->data().itemCatalogId = catalogId;
   historyPkt->data().itemCatalogId2 = catalogId;
 
@@ -111,7 +111,7 @@ void Sapphire::World::Manager::MarketMgr::searchMarketboard( Entity::Player& pla
   auto endIdx = std::min< size_t >( startIdx + 20, numResults );
   auto size = endIdx - startIdx;
 
-  auto resultPkt = makeWorldPacket< Server::FFXIVIpcMarketBoardSearchResult >( player.getId() );
+  auto resultPkt = makeZonePacket< Server::FFXIVIpcMarketBoardSearchResult >( player.getId() );
   resultPkt->data().itemIndexStart = startIdx;
   resultPkt->data().requestId = requestId;
 
diff --git a/src/world/Manager/TerritoryMgr.cpp b/src/world/Manager/TerritoryMgr.cpp
index 5160dd29..83b833e8 100644
--- a/src/world/Manager/TerritoryMgr.cpp
+++ b/src/world/Manager/TerritoryMgr.cpp
@@ -631,7 +631,7 @@ bool Sapphire::World::Manager::TerritoryMgr::movePlayer( TerritoryPtr pZone, Sap
   if( pPlayer->getLastPing() != 0 && pPlayer->getCurrentTerritory() )
     pPlayer->getCurrentTerritory()->removeActor( pPlayer );
 
-  pPlayer->setCurrentTerritory( pZone );
+  pPlayer->setCurrentZone( pZone );
   pZone->pushActor( pPlayer );
 
   // map player to instanceId so it can be tracked.
diff --git a/src/world/Network/Handlers/ActionHandler.cpp b/src/world/Network/Handlers/ActionHandler.cpp
index 92641c98..dd365b9b 100644
--- a/src/world/Network/Handlers/ActionHandler.cpp
+++ b/src/world/Network/Handlers/ActionHandler.cpp
@@ -18,7 +18,7 @@ void Sapphire::Network::GameConnection::actionHandler( FrameworkPtr pFw,
                                                        const Packets::FFXIVARR_PACKET_RAW& inPacket,
                                                        Entity::Player& player )
 {
-  const auto packet = WorldChannelPacket< Client::FFXIVIpcSkillHandler >( inPacket );
+  const auto packet = ZoneChannelPacket< Client::FFXIVIpcSkillHandler >( inPacket );
 
   const auto type = packet.data().type;
   const auto actionId = packet.data().actionId;
@@ -85,7 +85,7 @@ void Sapphire::Network::GameConnection::placedActionHandler( FrameworkPtr pFw,
                                                              const Packets::FFXIVARR_PACKET_RAW& inPacket,
                                                              Entity::Player& player )
 {
-  const auto packet = WorldChannelPacket< Client::FFXIVIpcAoESkillHandler >( inPacket );
+  const auto packet = ZoneChannelPacket< Client::FFXIVIpcAoESkillHandler >( inPacket );
 
   const auto type = packet.data().type;
   const auto actionId = packet.data().actionId;
diff --git a/src/world/Network/Handlers/CFHandlers.cpp b/src/world/Network/Handlers/CFHandlers.cpp
index 2234b749..d51b6327 100644
--- a/src/world/Network/Handlers/CFHandlers.cpp
+++ b/src/world/Network/Handlers/CFHandlers.cpp
@@ -25,7 +25,7 @@ void Sapphire::Network::GameConnection::cfDutyInfoRequest( FrameworkPtr pFw,
                                                            const Packets::FFXIVARR_PACKET_RAW& inPacket,
                                                            Entity::Player& player )
 {
-  auto dutyInfoPacket = makeWorldPacket< FFXIVIpcCFDutyInfo >( player.getId() );
+  auto dutyInfoPacket = makeZonePacket< FFXIVIpcCFDutyInfo >( player.getId() );
   auto penaltyMinutes = player.getCFPenaltyMinutes();
   if( penaltyMinutes > 255 )
   {
@@ -35,7 +35,7 @@ void Sapphire::Network::GameConnection::cfDutyInfoRequest( FrameworkPtr pFw,
   dutyInfoPacket->data().penaltyTime = penaltyMinutes;
   queueOutPacket( dutyInfoPacket );
 
-  auto inNeedsPacket = makeWorldPacket< FFXIVIpcCFPlayerInNeed >( player.getId() );
+  auto inNeedsPacket = makeZonePacket< FFXIVIpcCFPlayerInNeed >( player.getId() );
   queueOutPacket( inNeedsPacket );
 
 }
@@ -68,7 +68,7 @@ void Sapphire::Network::GameConnection::cfRegisterDuty( FrameworkPtr pFw,
   player.sendDebug( "Duty register request for contentid#{0}", contentId );
 
   // let's cancel it because otherwise you can't register it again
-  auto cfCancelPacket = makeWorldPacket< FFXIVIpcCFNotify >( player.getId() );
+  auto cfCancelPacket = makeZonePacket< FFXIVIpcCFNotify >( player.getId() );
   cfCancelPacket->data().state1 = 3;
   cfCancelPacket->data().state2 = 1; // Your registration is withdrawn.
   queueOutPacket( cfCancelPacket );
@@ -93,7 +93,7 @@ void Sapphire::Network::GameConnection::cfRegisterRoulette( FrameworkPtr pFw,
                                                             const Packets::FFXIVARR_PACKET_RAW& inPacket,
                                                             Entity::Player& player )
 {
-  auto cfCancelPacket = makeWorldPacket< FFXIVIpcCFNotify >( player.getId() );
+  auto cfCancelPacket = makeZonePacket< FFXIVIpcCFNotify >( player.getId() );
   cfCancelPacket->data().state1 = 3;
   cfCancelPacket->data().state2 = 1; // Your registration is withdrawn.
   queueOutPacket( cfCancelPacket );
diff --git a/src/world/Network/Handlers/ClientTriggerHandler.cpp b/src/world/Network/Handlers/ClientTriggerHandler.cpp
index e46a91d5..b47ed892 100644
--- a/src/world/Network/Handlers/ClientTriggerHandler.cpp
+++ b/src/world/Network/Handlers/ClientTriggerHandler.cpp
@@ -67,7 +67,7 @@ void Sapphire::Network::GameConnection::clientTriggerHandler( FrameworkPtr pFw,
                                                               Entity::Player& player )
 {
 
-  const auto packet = WorldChannelPacket< Client::FFXIVIpcClientTrigger >( inPacket );
+  const auto packet = ZoneChannelPacket< Client::FFXIVIpcClientTrigger >( inPacket );
 
   const auto commandId = packet.data().commandId;
   const auto param1 = *reinterpret_cast< const uint64_t* >( &packet.data().param11 );
@@ -173,7 +173,7 @@ void Sapphire::Network::GameConnection::clientTriggerHandler( FrameworkPtr pFw,
       uint64_t targetContentId = param1;
       // todo: look up player by content id
       /*
-        auto packet = makeWorldPacket< FFXIVIpcCharaNameReq >( player.getId() );
+        auto packet = makeZonePacket< FFXIVIpcCharaNameReq >( player.getId() );
         packet->data().contentId = targetContentId;
 
         // lookup the name
diff --git a/src/world/Network/Handlers/EventHandlers.cpp b/src/world/Network/Handlers/EventHandlers.cpp
index 14e7c312..5c60ed7f 100644
--- a/src/world/Network/Handlers/EventHandlers.cpp
+++ b/src/world/Network/Handlers/EventHandlers.cpp
@@ -39,7 +39,7 @@ void Sapphire::Network::GameConnection::eventHandlerTalk( FrameworkPtr pFw,
   auto pExdData = pFw->get< Data::ExdDataGenerated >();
   auto pEventMgr = pFw->get< World::Manager::EventMgr >();
 
-  const auto packet = WorldChannelPacket< Client::FFXIVIpcEventHandlerTalk >( inPacket );
+  const auto packet = ZoneChannelPacket< Client::FFXIVIpcEventHandlerTalk >( inPacket );
 
   const auto actorId = packet.data().actorId;
   const auto eventId = packet.data().eventId;
@@ -81,7 +81,7 @@ void Sapphire::Network::GameConnection::eventHandlerEmote( FrameworkPtr pFw,
   auto pExdData = pFw->get< Data::ExdDataGenerated >();
   auto pEventMgr = pFw->get< World::Manager::EventMgr >();
 
-  const auto packet = WorldChannelPacket< Client::FFXIVIpcEventHandlerEmote >( inPacket );
+  const auto packet = ZoneChannelPacket< Client::FFXIVIpcEventHandlerEmote >( inPacket );
 
   const auto actorId = packet.data().actorId;
   const auto eventId = packet.data().eventId;
@@ -117,7 +117,7 @@ void Sapphire::Network::GameConnection::eventHandlerWithinRange( FrameworkPtr pF
   auto pScriptMgr = pFw->get< Scripting::ScriptMgr >();
   auto pEventMgr = pFw->get< World::Manager::EventMgr >();
 
-  const auto packet = WorldChannelPacket< Client::FFXIVIpcEventHandlerWithinRange >( inPacket );
+  const auto packet = ZoneChannelPacket< Client::FFXIVIpcEventHandlerWithinRange >( inPacket );
 
   const auto eventId = packet.data().eventId;
   const auto param1 = packet.data().param1;
@@ -141,7 +141,7 @@ void Sapphire::Network::GameConnection::eventHandlerOutsideRange( FrameworkPtr p
   auto pScriptMgr = pFw->get< Scripting::ScriptMgr >();
   auto pEventMgr = pFw->get< World::Manager::EventMgr >();
 
-  const auto packet = WorldChannelPacket< Client::FFXIVIpcEventHandlerOutsideRange >( inPacket );
+  const auto packet = ZoneChannelPacket< Client::FFXIVIpcEventHandlerOutsideRange >( inPacket );
   const auto eventId = packet.data().eventId;
   const auto param1 = packet.data().param1;
   const auto& pos = packet.data().position;
@@ -164,7 +164,7 @@ void Sapphire::Network::GameConnection::eventHandlerEnterTerritory( FrameworkPtr
   auto pScriptMgr = pFw->get< Scripting::ScriptMgr >();
   auto pEventMgr = pFw->get< World::Manager::EventMgr >();
 
-  const auto packet = WorldChannelPacket< Client::FFXIVIpcEnterTerritoryHandler >( inPacket );
+  const auto packet = ZoneChannelPacket< Client::FFXIVIpcEnterTerritoryHandler >( inPacket );
 
   const auto eventId = packet.data().eventId;
   const auto param1 = packet.data().param1;
@@ -201,7 +201,7 @@ void Sapphire::Network::GameConnection::eventHandlerReturn( FrameworkPtr pFw,
 {
   auto pEventMgr = pFw->get< World::Manager::EventMgr >();
 
-  const auto packet = WorldChannelPacket< Client::FFXIVIpcEventHandlerReturn >( inPacket );
+  const auto packet = ZoneChannelPacket< Client::FFXIVIpcEventHandlerReturn >( inPacket );
   const auto eventId = packet.data().eventId;
   const auto scene = packet.data().scene;
   const auto param1 = packet.data().param1;
@@ -246,9 +246,9 @@ void Sapphire::Network::GameConnection::eventHandlerLinkshell( FrameworkPtr pFw,
                                                                const Packets::FFXIVARR_PACKET_RAW& inPacket,
                                                                Entity::Player& player )
 {
-  const auto packet = WorldChannelPacket< Client::FFXIVIpcLinkshellEventHandler >( inPacket );
+  const auto packet = ZoneChannelPacket< Client::FFXIVIpcLinkshellEventHandler >( inPacket );
 
-  auto linkshellEvent = makeWorldPacket< Server::FFXIVIpcEventLinkshell >( player.getId() );
+  auto linkshellEvent = makeZonePacket< Server::FFXIVIpcEventLinkshell >( player.getId() );
   linkshellEvent->data().eventId = packet.data().eventId;
   linkshellEvent->data().scene = static_cast< uint8_t >( packet.data().scene );
   linkshellEvent->data().param3 = 1;
@@ -263,7 +263,7 @@ void Sapphire::Network::GameConnection::eventHandlerShop( FrameworkPtr pFw,
 {
   auto pEventMgr = pFw->get< World::Manager::EventMgr >();
 
-  const auto packet = WorldChannelPacket< Client::FFXIVIpcShopEventHandler >( inPacket );
+  const auto packet = ZoneChannelPacket< Client::FFXIVIpcShopEventHandler >( inPacket );
 
   auto pScriptMgr = pFw->get< Scripting::ScriptMgr >();
   auto pExdData = pFw->get< Data::ExdDataGenerated >();
diff --git a/src/world/Network/Handlers/GMCommandHandlers.cpp b/src/world/Network/Handlers/GMCommandHandlers.cpp
index de3bb8a7..7dd91a2e 100644
--- a/src/world/Network/Handlers/GMCommandHandlers.cpp
+++ b/src/world/Network/Handlers/GMCommandHandlers.cpp
@@ -93,7 +93,7 @@ void Sapphire::Network::GameConnection::gm1Handler( FrameworkPtr pFw,
   if( player.getGmRank() <= 0 )
     return;
 
-  const auto packet = WorldChannelPacket< Client::FFXIVIpcGmCommand1 >( inPacket );
+  const auto packet = ZoneChannelPacket< Client::FFXIVIpcGmCommand1 >( inPacket );
   const auto commandId = packet.data().commandId;
   const auto param1 = packet.data().param1;
   const auto param2 = packet.data().param2;
@@ -257,11 +257,11 @@ void Sapphire::Network::GameConnection::gm1Handler( FrameworkPtr pFw,
     {
       targetPlayer->setOnlineStatusMask( param1 );
 
-      auto statusPacket = makeWorldPacket< FFXIVIpcSetOnlineStatus >( player.getId() );
+      auto statusPacket = makeZonePacket< FFXIVIpcSetOnlineStatus >( player.getId() );
       statusPacket->data().onlineStatusFlags = param1;
       queueOutPacket( statusPacket );
 
-      auto searchInfoPacket = makeWorldPacket< FFXIVIpcSetSearchInfo >( player.getId() );
+      auto searchInfoPacket = makeZonePacket< FFXIVIpcSetSearchInfo >( player.getId() );
       searchInfoPacket->data().onlineStatusFlags = param1;
       searchInfoPacket->data().selectRegion = targetPlayer->getSearchSelectRegion();
       strcpy( searchInfoPacket->data().searchMessage, targetPlayer->getSearchMessage() );
@@ -596,7 +596,7 @@ void Sapphire::Network::GameConnection::gm2Handler( FrameworkPtr pFw,
 
   auto pServerZone = pFw->get< World::ServerMgr >();
 
-  const auto packet = WorldChannelPacket< Client::FFXIVIpcGmCommand2 >( inPacket );
+  const auto packet = ZoneChannelPacket< Client::FFXIVIpcGmCommand2 >( inPacket );
 
   const auto commandId = packet.data().commandId;
   const auto param1 = packet.data().param1;
diff --git a/src/world/Network/Handlers/InventoryHandler.cpp b/src/world/Network/Handlers/InventoryHandler.cpp
index 5a854794..8fc94bdd 100644
--- a/src/world/Network/Handlers/InventoryHandler.cpp
+++ b/src/world/Network/Handlers/InventoryHandler.cpp
@@ -27,7 +27,7 @@ void Sapphire::Network::GameConnection::inventoryModifyHandler( FrameworkPtr pFw
                                                                 const Packets::FFXIVARR_PACKET_RAW& inPacket,
                                                                 Entity::Player& player )
 {
-  const auto packet = WorldChannelPacket< Client::FFXIVIpcInventoryModifyHandler >( inPacket );
+  const auto packet = ZoneChannelPacket< Client::FFXIVIpcInventoryModifyHandler >( inPacket );
 
   const auto action = packet.data().action;
   const auto splitCount = packet.data().splitCount;
@@ -37,7 +37,7 @@ void Sapphire::Network::GameConnection::inventoryModifyHandler( FrameworkPtr pFw
   const auto toSlot = packet.data().toSlot;
   const auto toContainer = packet.data().toContainer;
 
-  auto ackPacket = makeWorldPacket< Server::FFXIVIpcInventoryActionAck >( player.getId() );
+  auto ackPacket = makeZonePacket< Server::FFXIVIpcInventoryActionAck >( player.getId() );
   ackPacket->data().sequence = packet.data().seq;
   ackPacket->data().type = 7;
   player.queuePacket( ackPacket );
diff --git a/src/world/Network/Handlers/PacketHandlers.cpp b/src/world/Network/Handlers/PacketHandlers.cpp
index f002f1af..c4166431 100644
--- a/src/world/Network/Handlers/PacketHandlers.cpp
+++ b/src/world/Network/Handlers/PacketHandlers.cpp
@@ -67,7 +67,7 @@ void Sapphire::Network::GameConnection::setSearchInfoHandler( FrameworkPtr pFw,
                                                               const Packets::FFXIVARR_PACKET_RAW& inPacket,
                                                               Entity::Player& player )
 {
-  const auto packet = WorldChannelPacket< Client::FFXIVIpcSetSearchInfo >( inPacket );
+  const auto packet = ZoneChannelPacket< Client::FFXIVIpcSetSearchInfo >( inPacket );
 
   const auto inval = packet.data().status1;
   const auto inval1 = packet.data().status2;
@@ -85,11 +85,11 @@ void Sapphire::Network::GameConnection::setSearchInfoHandler( FrameworkPtr pFw,
     // mark player as new adventurer
     player.setNewAdventurer( true );
 
-  auto statusPacket = makeWorldPacket< FFXIVIpcSetOnlineStatus >( player.getId() );
+  auto statusPacket = makeZonePacket< FFXIVIpcSetOnlineStatus >( player.getId() );
   statusPacket->data().onlineStatusFlags = status;
   queueOutPacket( statusPacket );
 
-  auto searchInfoPacket = makeWorldPacket< FFXIVIpcSetSearchInfo >( player.getId() );
+  auto searchInfoPacket = makeZonePacket< FFXIVIpcSetSearchInfo >( player.getId() );
   searchInfoPacket->data().onlineStatusFlags = status;
   searchInfoPacket->data().selectRegion = player.getSearchSelectRegion();
   strcpy( searchInfoPacket->data().searchMessage, player.getSearchMessage() );
@@ -103,7 +103,7 @@ void Sapphire::Network::GameConnection::reqSearchInfoHandler( FrameworkPtr pFw,
                                                               const Packets::FFXIVARR_PACKET_RAW& inPacket,
                                                               Entity::Player& player )
 {
-  auto searchInfoPacket = makeWorldPacket< FFXIVIpcInitSearchInfo >( player.getId() );
+  auto searchInfoPacket = makeZonePacket< FFXIVIpcInitSearchInfo >( player.getId() );
   searchInfoPacket->data().onlineStatusFlags = player.getOnlineStatusMask();
   searchInfoPacket->data().selectRegion = player.getSearchSelectRegion();
   strcpy( searchInfoPacket->data().searchMessage, player.getSearchMessage() );
@@ -130,7 +130,7 @@ void Sapphire::Network::GameConnection::reqExamineSearchCommentHandler( Framewor
         return;
 
       // retail sends the requester's id as both (isForSelf)
-      auto searchInfoPacket = makeWorldPacket< FFXIVIpcExamineSearchComment >( player.getId() );
+      auto searchInfoPacket = makeZonePacket< FFXIVIpcExamineSearchComment >( player.getId() );
       searchInfoPacket->data().charId = targetId;
       strcpy( searchInfoPacket->data().searchComment, pPlayer->getSearchMessage() );
       player.queuePacket( searchInfoPacket );
@@ -158,7 +158,7 @@ void Sapphire::Network::GameConnection::reqExamineFcInfo( FrameworkPtr pFw,
         return;
 
       // retail sends the requester's id as both (isForSelf)
-      auto examineFcInfoPacket = makeWorldPacket< FFXIVIpcExamineFreeCompanyInfo >( player.getId() );
+      auto examineFcInfoPacket = makeZonePacket< FFXIVIpcExamineFreeCompanyInfo >( player.getId() );
       examineFcInfoPacket->data().charId = targetId;
       // todo: populate with fc info
 
@@ -171,7 +171,7 @@ void Sapphire::Network::GameConnection::linkshellListHandler( FrameworkPtr pFw,
                                                               const Packets::FFXIVARR_PACKET_RAW& inPacket,
                                                               Entity::Player& player )
 {
-  auto linkshellListPacket = makeWorldPacket< FFXIVIpcLinkshellList >( player.getId() );
+  auto linkshellListPacket = makeZonePacket< FFXIVIpcLinkshellList >( player.getId() );
   queueOutPacket( linkshellListPacket );
 }
 
@@ -183,7 +183,7 @@ void Sapphire::Network::GameConnection::updatePositionHandler( FrameworkPtr pFw,
   if( player.isMarkedForZoning() )
     return;
 
-  const auto updatePositionPacket = WorldChannelPacket< Client::FFXIVIpcUpdatePosition >( inPacket );
+  const auto updatePositionPacket = ZoneChannelPacket< Client::FFXIVIpcUpdatePosition >( inPacket );
 
   bool bPosChanged = true;
   if( updatePositionPacket.data().position == player.getPos() )
@@ -276,7 +276,7 @@ void Sapphire::Network::GameConnection::zoneLineHandler( FrameworkPtr pFw,
 {
   auto pTeriMgr = pFw->get< TerritoryMgr >();
 
-  const auto packet = WorldChannelPacket< Client::FFXIVIpcZoneLineHandler >( inPacket );
+  const auto packet = ZoneChannelPacket< Client::FFXIVIpcZoneLineHandler >( inPacket );
   const auto zoneLineId = packet.data().zoneLineId;
 
   player.sendDebug( "Walking ZoneLine#{0}", zoneLineId );
@@ -296,7 +296,7 @@ void Sapphire::Network::GameConnection::zoneLineHandler( FrameworkPtr pFw,
     targetZone = pLine->getTargetZoneId();
     rotation = pLine->getTargetRotation();
 
-    auto preparePacket = makeWorldPacket< FFXIVIpcPrepareZoning >( player.getId() );
+    auto preparePacket = makeZonePacket< FFXIVIpcPrepareZoning >( player.getId() );
     preparePacket->data().targetZone = targetZone;
 
     //ActorControlPacket143 controlPacket( pPlayer, ActorControlType::DespawnZoneScreenMsg,
@@ -321,7 +321,7 @@ void Sapphire::Network::GameConnection::discoveryHandler( FrameworkPtr pFw,
                                                           const Packets::FFXIVARR_PACKET_RAW& inPacket,
                                                           Entity::Player& player )
 {
-  const auto packet = WorldChannelPacket< Client::FFXIVIpcDiscoveryHandler >( inPacket );
+  const auto packet = ZoneChannelPacket< Client::FFXIVIpcDiscoveryHandler >( inPacket );
   const auto positionRef = packet.data().positionRef;
 
   auto pDb = pFw->get< Db::DbWorkerPool< Db::ZoneDbConnection > >();
@@ -336,7 +336,7 @@ void Sapphire::Network::GameConnection::discoveryHandler( FrameworkPtr pFw,
     return;
   }
 
-  auto discoveryPacket = makeWorldPacket< FFXIVIpcDiscovery >( player.getId() );
+  auto discoveryPacket = makeZonePacket< FFXIVIpcDiscovery >( player.getId() );
   discoveryPacket->data().map_id = pQR->getUInt( 2 );
   discoveryPacket->data().map_part_id = pQR->getUInt( 3 );
 
@@ -352,7 +352,7 @@ void Sapphire::Network::GameConnection::playTimeHandler( FrameworkPtr pFw,
                                                          const Packets::FFXIVARR_PACKET_RAW& inPacket,
                                                          Entity::Player& player )
 {
-  auto playTimePacket = makeWorldPacket< FFXIVIpcPlayTime >( player.getId() );
+  auto playTimePacket = makeZonePacket< FFXIVIpcPlayTime >( player.getId() );
   playTimePacket->data().playTimeInMinutes = player.getPlayTime() / 60;
   player.queuePacket( playTimePacket );
 }
@@ -375,7 +375,7 @@ void Sapphire::Network::GameConnection::blackListHandler( FrameworkPtr pFw,
 {
   uint8_t count = inPacket.data[ 0x11 ];
 
-  auto blackListPacket = makeWorldPacket< FFXIVIpcBlackList >( player.getId() );
+  auto blackListPacket = makeZonePacket< FFXIVIpcBlackList >( player.getId() );
   blackListPacket->data().sequence = count;
   // TODO: Fill with actual blacklist data
   //blackListPacket.data().entry[0].contentId = 1;
@@ -389,7 +389,7 @@ void Sapphire::Network::GameConnection::pingHandler( FrameworkPtr pFw,
                                                      const Packets::FFXIVARR_PACKET_RAW& inPacket,
                                                      Entity::Player& player )
 {
-  const auto packet = WorldChannelPacket< Client::FFXIVIpcPingHandler >( inPacket );
+  const auto packet = ZoneChannelPacket< Client::FFXIVIpcPingHandler >( inPacket );
 
   queueOutPacket( std::make_shared< Server::PingPacket >( player, packet.data().timestamp ) );
 
@@ -404,7 +404,7 @@ void Sapphire::Network::GameConnection::finishLoadingHandler( FrameworkPtr pFw,
   player.sendQuestInfo();
 
   // TODO: load and save this data instead of hardcoding
-  auto gcPacket = makeWorldPacket< FFXIVGCAffiliation >( player.getId() );
+  auto gcPacket = makeZonePacket< FFXIVGCAffiliation >( player.getId() );
   gcPacket->data().gcId = player.getGc();
   gcPacket->data().gcRank[ 0 ] = player.getGcRankArray()[ 0 ];
   gcPacket->data().gcRank[ 1 ] = player.getGcRankArray()[ 1 ];
@@ -442,7 +442,7 @@ void Sapphire::Network::GameConnection::socialListHandler( FrameworkPtr pFw,
   if( type == 0x02 )
   { // party list
 
-    auto listPacket = makeWorldPacket< FFXIVIpcSocialList >( player.getId() );
+    auto listPacket = makeZonePacket< FFXIVIpcSocialList >( player.getId() );
 
     listPacket->data().type = 2;
     listPacket->data().sequence = count;
@@ -476,7 +476,7 @@ void Sapphire::Network::GameConnection::socialListHandler( FrameworkPtr pFw,
   }
   else if( type == 0x0b )
   { // friend list
-    auto listPacket = makeWorldPacket< FFXIVIpcSocialList >( player.getId() );
+    auto listPacket = makeZonePacket< FFXIVIpcSocialList >( player.getId() );
     listPacket->data().type = 0x0B;
     listPacket->data().sequence = count;
     memset( listPacket->data().entries, 0, sizeof( listPacket->data().entries ) );
@@ -495,7 +495,7 @@ void Sapphire::Network::GameConnection::chatHandler( FrameworkPtr pFw,
 {
   auto pDebugCom = pFw->get< DebugCommandMgr >();
 
-  const auto packet = WorldChannelPacket< Client::FFXIVIpcChatHandler >( inPacket );
+  const auto packet = ZoneChannelPacket< Client::FFXIVIpcChatHandler >( inPacket );
 
   if( packet.data().message[ 0 ] == '!' )
   {
@@ -552,7 +552,7 @@ void Sapphire::Network::GameConnection::logoutHandler( FrameworkPtr pFw,
                                                        const Packets::FFXIVARR_PACKET_RAW& inPacket,
                                                        Entity::Player& player )
 {
-  auto logoutPacket = makeWorldPacket< FFXIVIpcLogout >( player.getId() );
+  auto logoutPacket = makeZonePacket< FFXIVIpcLogout >( player.getId() );
   logoutPacket->data().flags1 = 0x02;
   logoutPacket->data().flags2 = 0x2000;
   queueOutPacket( logoutPacket );
@@ -565,7 +565,7 @@ void Sapphire::Network::GameConnection::tellHandler( FrameworkPtr pFw,
                                                      const Packets::FFXIVARR_PACKET_RAW& inPacket,
                                                      Entity::Player& player )
 {
-  const auto packet = WorldChannelPacket< Client::FFXIVIpcTellHandler >( inPacket );
+  const auto packet = ZoneChannelPacket< Client::FFXIVIpcTellHandler >( inPacket );
 
   auto pZoneServer = pFw->get< World::ServerMgr >();
 
@@ -573,7 +573,7 @@ void Sapphire::Network::GameConnection::tellHandler( FrameworkPtr pFw,
 
   if( !pSession )
   {
-    auto tellErrPacket = makeWorldPacket< FFXIVIpcTellErrNotFound >( player.getId() );
+    auto tellErrPacket = makeZonePacket< FFXIVIpcTellErrNotFound >( player.getId() );
     strcpy( tellErrPacket->data().receipientName, packet.data().targetPCName );
     sendSinglePacket( tellErrPacket );
     return;
@@ -621,7 +621,7 @@ void Sapphire::Network::GameConnection::performNoteHandler( FrameworkPtr pFw,
                                                             const Packets::FFXIVARR_PACKET_RAW& inPacket,
                                                             Entity::Player& player )
 {
-  auto performPacket = makeWorldPacket< FFXIVIpcPerformNote >( player.getId() );
+  auto performPacket = makeZonePacket< FFXIVIpcPerformNote >( player.getId() );
   memcpy( &performPacket->data().data[ 0 ], &inPacket.data[ 0x10 ], 32 );
   player.sendToInRangeSet( performPacket );
 }
@@ -630,7 +630,7 @@ void Sapphire::Network::GameConnection::landRenameHandler( FrameworkPtr pFw,
                                                            const Packets::FFXIVARR_PACKET_RAW& inPacket,
                                                            Entity::Player& player )
 {
-  const auto packet = WorldChannelPacket< Client::FFXIVIpcRenameLandHandler >( inPacket );
+  const auto packet = ZoneChannelPacket< Client::FFXIVIpcRenameLandHandler >( inPacket );
 
   auto pHousingMgr = pFw->get< HousingMgr >();
 
@@ -653,7 +653,7 @@ void Sapphire::Network::GameConnection::landRenameHandler( FrameworkPtr pFw,
     pHouse->setHouseName( packet.data().houseName );
 
   // todo: this packet is weird, retail sends it with some unknown shit at the start but it doesn't seem to do anything
-  auto nameUpdatePacket = makeWorldPacket< Server::FFXIVIpcLandUpdateHouseName >( player.getId() );
+  auto nameUpdatePacket = makeZonePacket< Server::FFXIVIpcLandUpdateHouseName >( player.getId() );
   memcpy( &nameUpdatePacket->data().houseName, &packet.data().houseName, sizeof( packet.data().houseName ) );
 
   // todo: who does this get sent to? just the person who renamed it?
@@ -664,7 +664,7 @@ void Sapphire::Network::GameConnection::buildPresetHandler( FrameworkPtr pFw,
                                                             const Packets::FFXIVARR_PACKET_RAW& inPacket,
                                                             Entity::Player& player )
 {
-  const auto packet = WorldChannelPacket< Client::FFXIVIpcBuildPresetHandler >( inPacket );
+  const auto packet = ZoneChannelPacket< Client::FFXIVIpcBuildPresetHandler >( inPacket );
 
   auto pHousingMgr = pFw->get< HousingMgr >();
   pHousingMgr->buildPresetEstate( player, packet.data().plotNum, packet.data().itemId );
@@ -674,7 +674,7 @@ void Sapphire::Network::GameConnection::housingUpdateGreetingHandler( FrameworkP
                                                                       const Packets::FFXIVARR_PACKET_RAW& inPacket,
                                                                       Entity::Player& player )
 {
-  const auto packet = WorldChannelPacket< Client::FFXIVIpcHousingUpdateHouseGreeting >( inPacket );
+  const auto packet = ZoneChannelPacket< Client::FFXIVIpcHousingUpdateHouseGreeting >( inPacket );
 
   auto pHousingMgr = pFw->get< HousingMgr >();
 
@@ -686,7 +686,7 @@ void Sapphire::Network::GameConnection::reqPlaceHousingItem( FrameworkPtr pFw,
                                                              Entity::Player& player )
 {
   auto housingMgr = pFw->get< HousingMgr >();
-  const auto packet = WorldChannelPacket< Client::FFXIVIpcReqPlaceHousingItem >( inPacket );
+  const auto packet = ZoneChannelPacket< Client::FFXIVIpcReqPlaceHousingItem >( inPacket );
   const auto& data = packet.data();
 
   if( data.shouldPlaceItem == 1 )
@@ -705,7 +705,7 @@ void Sapphire::Network::GameConnection::reqMoveHousingItem( FrameworkPtr pFw,
 {
   auto housingMgr = pFw->get< HousingMgr >();
 
-  const auto packet = WorldChannelPacket< Client::FFXIVIpcHousingUpdateObjectPosition >( inPacket );
+  const auto packet = ZoneChannelPacket< Client::FFXIVIpcHousingUpdateObjectPosition >( inPacket );
   const auto& data = packet.data();
 
   housingMgr->reqMoveHousingItem( player, data.ident, data.slot, data.pos, data.rotation );
@@ -718,7 +718,7 @@ void Sapphire::Network::GameConnection::marketBoardSearch( FrameworkPtr pFw,
 {
   auto marketMgr = pFw->get< MarketMgr >();
 
-  const auto packet = WorldChannelPacket< Client::FFXIVIpcMarketBoardSearch >( inPacket );
+  const auto packet = ZoneChannelPacket< Client::FFXIVIpcMarketBoardSearch >( inPacket );
   const auto& data = packet.data();
 
   std::string_view searchStr( data.searchStr );
@@ -731,7 +731,7 @@ void Sapphire::Network::GameConnection::marketBoardRequestItemInfo( FrameworkPtr
                                                                     const Packets::FFXIVARR_PACKET_RAW& inPacket,
                                                                     Entity::Player& player )
 {
-  const auto packet = WorldChannelPacket< Client::FFXIVIpcMarketBoardRequestItemListingInfo >( inPacket );
+  const auto packet = ZoneChannelPacket< Client::FFXIVIpcMarketBoardRequestItemListingInfo >( inPacket );
 
   auto marketMgr = pFw->get< MarketMgr >();
 
@@ -742,7 +742,7 @@ void Sapphire::Network::GameConnection::marketBoardRequestItemListings( Framewor
                                                                         const Packets::FFXIVARR_PACKET_RAW& inPacket,
                                                                         Entity::Player& player )
 {
-  const auto packet = WorldChannelPacket< Client::FFXIVIpcMarketBoardRequestItemListings >( inPacket );
+  const auto packet = ZoneChannelPacket< Client::FFXIVIpcMarketBoardRequestItemListings >( inPacket );
 
   auto marketMgr = pFw->get< MarketMgr >();
 
diff --git a/src/world/Network/PacketWrappers/ActorControlPacket142.h b/src/world/Network/PacketWrappers/ActorControlPacket142.h
index 3756c5bc..30f14598 100644
--- a/src/world/Network/PacketWrappers/ActorControlPacket142.h
+++ b/src/world/Network/PacketWrappers/ActorControlPacket142.h
@@ -11,7 +11,7 @@ namespace Sapphire::Network::Packets::Server
   /**
   * @brief The Ping response packet.
   */
-  class ActorControlPacket142 : public WorldChannelPacket< FFXIVIpcActorControl142 >
+  class ActorControlPacket142 : public ZoneChannelPacket< FFXIVIpcActorControl142 >
   {
   public:
     ActorControlPacket142( uint32_t actorId,
@@ -21,7 +21,7 @@ namespace Sapphire::Network::Packets::Server
                            uint32_t param3 = 0,
                            uint32_t param4 = 0,
                            uint32_t padding1 = 0 ) :
-      WorldChannelPacket< FFXIVIpcActorControl142 >( actorId, actorId )
+      ZoneChannelPacket< FFXIVIpcActorControl142 >( actorId, actorId )
     {
       initialize( category, param1, param2, param3, param4 );
     };
diff --git a/src/world/Network/PacketWrappers/ActorControlPacket143.h b/src/world/Network/PacketWrappers/ActorControlPacket143.h
index f56bc0c5..c93b3db3 100644
--- a/src/world/Network/PacketWrappers/ActorControlPacket143.h
+++ b/src/world/Network/PacketWrappers/ActorControlPacket143.h
@@ -12,7 +12,7 @@ namespace Sapphire::Network::Packets::Server
   /**
   * @brief The Ping response packet.
   */
-  class ActorControlPacket143 : public WorldChannelPacket< FFXIVIpcActorControl143 >
+  class ActorControlPacket143 : public ZoneChannelPacket< FFXIVIpcActorControl143 >
   {
   public:
     ActorControlPacket143( uint32_t actorId,
@@ -23,7 +23,7 @@ namespace Sapphire::Network::Packets::Server
                            uint32_t param4 = 0,
                            uint32_t param5 = 0,
                            uint32_t padding1 = 0 ) :
-      WorldChannelPacket< FFXIVIpcActorControl143 >( actorId, actorId )
+      ZoneChannelPacket< FFXIVIpcActorControl143 >( actorId, actorId )
     {
       initialize( category, param1, param2, param3, param4, param5 );
     };
diff --git a/src/world/Network/PacketWrappers/ActorControlPacket144.h b/src/world/Network/PacketWrappers/ActorControlPacket144.h
index 0c632a5d..da645b1e 100644
--- a/src/world/Network/PacketWrappers/ActorControlPacket144.h
+++ b/src/world/Network/PacketWrappers/ActorControlPacket144.h
@@ -10,7 +10,7 @@ namespace Sapphire::Network::Packets::Server
   /**
   * @brief The Ping response packet.
   */
-  class ActorControlPacket144 : public WorldChannelPacket< FFXIVIpcActorControl144 >
+  class ActorControlPacket144 : public ZoneChannelPacket< FFXIVIpcActorControl144 >
   {
   public:
     ActorControlPacket144( uint32_t actorId,
@@ -21,7 +21,7 @@ namespace Sapphire::Network::Packets::Server
                            uint32_t param4 = 0,
                            uint64_t targetId = 0,
                            uint32_t padding1 = 0 ) :
-      WorldChannelPacket< FFXIVIpcActorControl144 >( actorId, actorId )
+      ZoneChannelPacket< FFXIVIpcActorControl144 >( actorId, actorId )
     {
       initialize( category, param1, param2, param3, param4, targetId );
     };
diff --git a/src/world/Network/PacketWrappers/ChatPacket.h b/src/world/Network/PacketWrappers/ChatPacket.h
index 41ce6a84..29e4aa26 100644
--- a/src/world/Network/PacketWrappers/ChatPacket.h
+++ b/src/world/Network/PacketWrappers/ChatPacket.h
@@ -12,11 +12,11 @@ namespace Sapphire::Network::Packets::Server
   /**
   * @brief The Chat packet.
   */
-  class ChatPacket : public WorldChannelPacket< FFXIVIpcChat >
+  class ChatPacket : public ZoneChannelPacket< FFXIVIpcChat >
   {
   public:
     ChatPacket( Entity::Player& player, Common::ChatType chatType, const std::string& msg ) :
-      WorldChannelPacket< FFXIVIpcChat >( player.getId(), player.getId() )
+      ZoneChannelPacket< FFXIVIpcChat >( player.getId(), player.getId() )
     {
       initialize( player, chatType, msg );
     };
diff --git a/src/world/Network/PacketWrappers/DirectorPlayScenePacket.h b/src/world/Network/PacketWrappers/DirectorPlayScenePacket.h
index bfd33546..6d432740 100644
--- a/src/world/Network/PacketWrappers/DirectorPlayScenePacket.h
+++ b/src/world/Network/PacketWrappers/DirectorPlayScenePacket.h
@@ -10,7 +10,7 @@ namespace Sapphire::Network::Packets::Server
   /**
   * @brief The packet sent to play an event.
   */
-  class DirectorPlayScenePacket : public WorldChannelPacket< FFXIVIpcDirectorPlayScene >
+  class DirectorPlayScenePacket : public ZoneChannelPacket< FFXIVIpcDirectorPlayScene >
   {
   public:
     DirectorPlayScenePacket( uint32_t playerId,
@@ -21,7 +21,7 @@ namespace Sapphire::Network::Packets::Server
                              uint8_t param3,
                              uint32_t param4 = 0,
                              uint32_t param5 = 0 ) :
-      WorldChannelPacket< FFXIVIpcDirectorPlayScene >( playerId, playerId )
+      ZoneChannelPacket< FFXIVIpcDirectorPlayScene >( playerId, playerId )
     {
       initialize( actorId, eventId, scene, flags, param3, param4, param5 );
     };
diff --git a/src/world/Network/PacketWrappers/EffectPacket.h b/src/world/Network/PacketWrappers/EffectPacket.h
index ec91133a..46c8338b 100644
--- a/src/world/Network/PacketWrappers/EffectPacket.h
+++ b/src/world/Network/PacketWrappers/EffectPacket.h
@@ -11,11 +11,11 @@
 namespace Sapphire::Network::Packets::Server
 {
 
-  class EffectPacket : public WorldChannelPacket< FFXIVIpcEffect >
+  class EffectPacket : public ZoneChannelPacket< FFXIVIpcEffect >
   {
   public:
     EffectPacket( uint64_t sourceId, uint32_t targetId, uint32_t actionId ) :
-      WorldChannelPacket< FFXIVIpcEffect >( static_cast< uint32_t >( sourceId ), targetId )
+      ZoneChannelPacket< FFXIVIpcEffect >( static_cast< uint32_t >( sourceId ), targetId )
     {
       m_data.effectCount = 0;
       m_data.actionId = actionId;
diff --git a/src/world/Network/PacketWrappers/EventFinishPacket.h b/src/world/Network/PacketWrappers/EventFinishPacket.h
index 7484a31f..cd0e5807 100644
--- a/src/world/Network/PacketWrappers/EventFinishPacket.h
+++ b/src/world/Network/PacketWrappers/EventFinishPacket.h
@@ -9,14 +9,14 @@ namespace Sapphire::Network::Packets::Server
   /**
   * @brief The packet sent to finish an event.
   */
-  class EventFinishPacket : public WorldChannelPacket< FFXIVIpcEventFinish >
+  class EventFinishPacket : public ZoneChannelPacket< FFXIVIpcEventFinish >
   {
   public:
     EventFinishPacket( uint32_t playerId,
                        uint32_t eventId,
                        uint8_t param1,
                        uint32_t param3 ) :
-      WorldChannelPacket< FFXIVIpcEventFinish >( playerId, playerId )
+      ZoneChannelPacket< FFXIVIpcEventFinish >( playerId, playerId )
     {
       initialize( eventId, param1, param3 );
     };
diff --git a/src/world/Network/PacketWrappers/EventPlayPacket.h b/src/world/Network/PacketWrappers/EventPlayPacket.h
index d6cf83f2..0895f38e 100644
--- a/src/world/Network/PacketWrappers/EventPlayPacket.h
+++ b/src/world/Network/PacketWrappers/EventPlayPacket.h
@@ -10,7 +10,7 @@ namespace Sapphire::Network::Packets::Server
   /**
   * @brief The packet sent to play an event.
   */
-  class EventPlayPacket : public WorldChannelPacket< FFXIVIpcEventPlay >
+  class EventPlayPacket : public ZoneChannelPacket< FFXIVIpcEventPlay >
   {
   public:
     EventPlayPacket( uint32_t playerId,
@@ -21,7 +21,7 @@ namespace Sapphire::Network::Packets::Server
                      uint8_t param3,
                      uint32_t param4 = 0,
                      uint32_t param5 = 0 ) :
-      WorldChannelPacket< FFXIVIpcEventPlay >( playerId, playerId )
+      ZoneChannelPacket< FFXIVIpcEventPlay >( playerId, playerId )
     {
       initialize( actorId, eventId, scene, flags, param3, param4, param5 );
     };
diff --git a/src/world/Network/PacketWrappers/EventStartPacket.h b/src/world/Network/PacketWrappers/EventStartPacket.h
index d70788c7..7655ce44 100644
--- a/src/world/Network/PacketWrappers/EventStartPacket.h
+++ b/src/world/Network/PacketWrappers/EventStartPacket.h
@@ -10,7 +10,7 @@ namespace Sapphire::Network::Packets::Server
   /**
   * @brief The packet sent to start an event.
   */
-  class EventStartPacket : public WorldChannelPacket< FFXIVIpcEventStart >
+  class EventStartPacket : public ZoneChannelPacket< FFXIVIpcEventStart >
   {
   public:
     EventStartPacket( uint32_t playerId,
@@ -19,7 +19,7 @@ namespace Sapphire::Network::Packets::Server
                       uint8_t param1 = 0,
                       uint8_t param2 = 0,
                       uint32_t param3 = 0 ) :
-      WorldChannelPacket< FFXIVIpcEventStart >( playerId, playerId )
+      ZoneChannelPacket< FFXIVIpcEventStart >( playerId, playerId )
     {
       initialize( actorId, eventId, param1, param2, param3 );
     };
diff --git a/src/world/Network/PacketWrappers/ExaminePacket.h b/src/world/Network/PacketWrappers/ExaminePacket.h
index 3e1cd0e1..37baee37 100644
--- a/src/world/Network/PacketWrappers/ExaminePacket.h
+++ b/src/world/Network/PacketWrappers/ExaminePacket.h
@@ -16,11 +16,11 @@ namespace Sapphire::Network::Packets::Server
   /**
   * @brief The Examine response packet.
   */
-  class ExaminePacket : public WorldChannelPacket< FFXIVIpcExamine >
+  class ExaminePacket : public ZoneChannelPacket< FFXIVIpcExamine >
   {
   public:
     ExaminePacket( Entity::Player& player, Entity::PlayerPtr pTarget ) :
-      WorldChannelPacket< FFXIVIpcExamine >( pTarget->getId(), player.getId() )
+      ZoneChannelPacket< FFXIVIpcExamine >( pTarget->getId(), player.getId() )
     {
       initialize( player, pTarget );
     };
diff --git a/src/world/Network/PacketWrappers/ModelEquipPacket.h b/src/world/Network/PacketWrappers/ModelEquipPacket.h
index 670cc855..50cc7b5d 100644
--- a/src/world/Network/PacketWrappers/ModelEquipPacket.h
+++ b/src/world/Network/PacketWrappers/ModelEquipPacket.h
@@ -11,11 +11,11 @@ namespace Sapphire::Network::Packets::Server
   /**
   * @brief The update model packet.
   */
-  class ModelEquipPacket : public WorldChannelPacket< FFXIVIpcModelEquip >
+  class ModelEquipPacket : public ZoneChannelPacket< FFXIVIpcModelEquip >
   {
   public:
     ModelEquipPacket( Entity::Player& player ) :
-      WorldChannelPacket< FFXIVIpcModelEquip >( player.getId(), player.getId() )
+      ZoneChannelPacket< FFXIVIpcModelEquip >( player.getId(), player.getId() )
     {
       initialize( player );
     };
diff --git a/src/world/Network/PacketWrappers/MoveActorPacket.h b/src/world/Network/PacketWrappers/MoveActorPacket.h
index fb093f05..9cf724fc 100644
--- a/src/world/Network/PacketWrappers/MoveActorPacket.h
+++ b/src/world/Network/PacketWrappers/MoveActorPacket.h
@@ -15,11 +15,11 @@ namespace Sapphire::Network::Packets::Server
   * @brief The Client UI Initialization packet. This must be sent to the client
   * once upon connection to configure the UI.
   */
-  class MoveActorPacket : public WorldChannelPacket< FFXIVIpcActorMove >
+  class MoveActorPacket : public ZoneChannelPacket< FFXIVIpcActorMove >
   {
   public:
     MoveActorPacket( Entity::Chara& actor, uint8_t headRotation, uint8_t animationType, uint8_t state, uint16_t animationSpeed, uint8_t unknownRotation = 0 ) :
-      WorldChannelPacket< FFXIVIpcActorMove >( actor.getId(), actor.getId() )
+      ZoneChannelPacket< FFXIVIpcActorMove >( actor.getId(), actor.getId() )
     {
       initialize( actor, headRotation, animationType, state, animationSpeed, unknownRotation );
     };
diff --git a/src/world/Network/PacketWrappers/NpcSpawnPacket.h b/src/world/Network/PacketWrappers/NpcSpawnPacket.h
index 76030d7c..3cc99f89 100644
--- a/src/world/Network/PacketWrappers/NpcSpawnPacket.h
+++ b/src/world/Network/PacketWrappers/NpcSpawnPacket.h
@@ -17,11 +17,11 @@ namespace Sapphire::Network::Packets::Server
   /**
   * @brief The packet sent to spawn a player.
   */
-  class NpcSpawnPacket : public WorldChannelPacket< FFXIVIpcNpcSpawn >
+  class NpcSpawnPacket : public ZoneChannelPacket< FFXIVIpcNpcSpawn >
   {
   public:
     NpcSpawnPacket( Entity::BNpc& bnpc, Entity::Player& target ) :
-      WorldChannelPacket< FFXIVIpcNpcSpawn >( bnpc.getId(), target.getId() )
+      ZoneChannelPacket< FFXIVIpcNpcSpawn >( bnpc.getId(), target.getId() )
     {
       initialize( bnpc, target );
     };
diff --git a/src/world/Network/PacketWrappers/PingPacket.h b/src/world/Network/PacketWrappers/PingPacket.h
index 252a91f0..df2241d5 100644
--- a/src/world/Network/PacketWrappers/PingPacket.h
+++ b/src/world/Network/PacketWrappers/PingPacket.h
@@ -11,11 +11,11 @@ namespace Sapphire::Network::Packets::Server
   /**
   * @brief The Ping response packet.
   */
-  class PingPacket : public WorldChannelPacket< FFXIVIpcPing >
+  class PingPacket : public ZoneChannelPacket< FFXIVIpcPing >
   {
   public:
     PingPacket( Entity::Player& player, int32_t inVal ) :
-      WorldChannelPacket< FFXIVIpcPing >( player.getId(), player.getId() )
+      ZoneChannelPacket< FFXIVIpcPing >( player.getId(), player.getId() )
     {
       initialize( player, inVal );
     };
diff --git a/src/world/Network/PacketWrappers/PlayerSetupPacket.h b/src/world/Network/PacketWrappers/PlayerSetupPacket.h
index c133dd29..4cd52a8a 100644
--- a/src/world/Network/PacketWrappers/PlayerSetupPacket.h
+++ b/src/world/Network/PacketWrappers/PlayerSetupPacket.h
@@ -13,11 +13,11 @@ namespace Sapphire::Network::Packets::Server
   * @brief The Client Player Initialization packet. This must be sent to the client
   * once upon connection to configure the UI.
   */
-  class PlayerSetupPacket : public WorldChannelPacket< FFXIVIpcPlayerSetup >
+  class PlayerSetupPacket : public ZoneChannelPacket< FFXIVIpcPlayerSetup >
   {
   public:
     PlayerSetupPacket( Entity::Player& player ) :
-      WorldChannelPacket< FFXIVIpcPlayerSetup >( player.getId(), player.getId() )
+      ZoneChannelPacket< FFXIVIpcPlayerSetup >( player.getId(), player.getId() )
     {
       initialize( player );
     };
diff --git a/src/world/Network/PacketWrappers/PlayerSpawnPacket.h b/src/world/Network/PacketWrappers/PlayerSpawnPacket.h
index 73346d95..4f384356 100644
--- a/src/world/Network/PacketWrappers/PlayerSpawnPacket.h
+++ b/src/world/Network/PacketWrappers/PlayerSpawnPacket.h
@@ -15,11 +15,11 @@ namespace Sapphire::Network::Packets::Server
   /**
   * @brief The packet sent to spawn a player.
   */
-  class PlayerSpawnPacket : public WorldChannelPacket< FFXIVIpcPlayerSpawn >
+  class PlayerSpawnPacket : public ZoneChannelPacket< FFXIVIpcPlayerSpawn >
   {
   public:
     PlayerSpawnPacket( Entity::Player& player, Entity::Player& target ) :
-      WorldChannelPacket< FFXIVIpcPlayerSpawn >( player.getId(), target.getId() )
+      ZoneChannelPacket< FFXIVIpcPlayerSpawn >( player.getId(), target.getId() )
     {
       initialize( player, target );
     };
diff --git a/src/world/Network/PacketWrappers/PlayerStateFlagsPacket.h b/src/world/Network/PacketWrappers/PlayerStateFlagsPacket.h
index 5d319ac6..12bffd28 100644
--- a/src/world/Network/PacketWrappers/PlayerStateFlagsPacket.h
+++ b/src/world/Network/PacketWrappers/PlayerStateFlagsPacket.h
@@ -11,17 +11,17 @@ namespace Sapphire::Network::Packets::Server
   /**
   * @brief Packet sent to set a players state, this impacts which actions he can perform.
   */
-  class PlayerStateFlagsPacket : public WorldChannelPacket< FFXIVIpcPlayerStateFlags >
+  class PlayerStateFlagsPacket : public ZoneChannelPacket< FFXIVIpcPlayerStateFlags >
   {
   public:
     PlayerStateFlagsPacket( Entity::Player& player ) :
-      WorldChannelPacket< FFXIVIpcPlayerStateFlags >( player.getId(), player.getId() )
+      ZoneChannelPacket< FFXIVIpcPlayerStateFlags >( player.getId(), player.getId() )
     {
       initialize( player.getStateFlags() );
     }
 
     PlayerStateFlagsPacket( Entity::Player& player, std::vector< Common::PlayerStateFlag > flags ) :
-      WorldChannelPacket< FFXIVIpcPlayerStateFlags >( player.getId(), player.getId() )
+      ZoneChannelPacket< FFXIVIpcPlayerStateFlags >( player.getId(), player.getId() )
     {
       uint8_t newFlags[12];
       memset( newFlags, 0, 12 );
diff --git a/src/world/Network/PacketWrappers/QuestMessagePacket.h b/src/world/Network/PacketWrappers/QuestMessagePacket.h
index f50b7d7b..930a9e9b 100644
--- a/src/world/Network/PacketWrappers/QuestMessagePacket.h
+++ b/src/world/Network/PacketWrappers/QuestMessagePacket.h
@@ -11,12 +11,12 @@ namespace Sapphire::Network::Packets::Server
   /**
   * @brief Packet to display a quest specific info message.
   */
-  class QuestMessagePacket : public WorldChannelPacket< FFXIVIpcQuestMessage >
+  class QuestMessagePacket : public ZoneChannelPacket< FFXIVIpcQuestMessage >
   {
   public:
     QuestMessagePacket( Entity::ActorPtr pActor, uint32_t questId, int8_t msgId,
                         uint8_t type = 0, uint32_t var1 = 0, uint32_t var2 = 0 ) :
-      WorldChannelPacket< FFXIVIpcQuestMessage >( pActor->getId(), pActor->getId() )
+      ZoneChannelPacket< FFXIVIpcQuestMessage >( pActor->getId(), pActor->getId() )
     {
       initialize( questId, msgId, type, var1, var2 );
     };
diff --git a/src/world/Network/PacketWrappers/ServerNoticePacket.h b/src/world/Network/PacketWrappers/ServerNoticePacket.h
index 00e12b78..aeefe168 100644
--- a/src/world/Network/PacketWrappers/ServerNoticePacket.h
+++ b/src/world/Network/PacketWrappers/ServerNoticePacket.h
@@ -11,11 +11,11 @@ namespace Sapphire::Network::Packets::Server
   /**
   * @brief The Ping response packet.
   */
-  class ServerNoticePacket : public WorldChannelPacket< FFXIVIpcServerNotice >
+  class ServerNoticePacket : public ZoneChannelPacket< FFXIVIpcServerNotice >
   {
   public:
     ServerNoticePacket( uint32_t playerId, const std::string& message ) :
-      WorldChannelPacket< FFXIVIpcServerNotice >( playerId, playerId )
+      ZoneChannelPacket< FFXIVIpcServerNotice >( playerId, playerId )
     {
       initialize( message );
     };
diff --git a/src/world/Network/PacketWrappers/UpdateHpMpTpPacket.h b/src/world/Network/PacketWrappers/UpdateHpMpTpPacket.h
index 2ae5a6a8..cfc85756 100644
--- a/src/world/Network/PacketWrappers/UpdateHpMpTpPacket.h
+++ b/src/world/Network/PacketWrappers/UpdateHpMpTpPacket.h
@@ -11,11 +11,11 @@ namespace Sapphire::Network::Packets::Server
   /**
   * @brief The Ping response packet.
   */
-  class UpdateHpMpTpPacket : public WorldChannelPacket< FFXIVIpcUpdateHpMpTp >
+  class UpdateHpMpTpPacket : public ZoneChannelPacket< FFXIVIpcUpdateHpMpTp >
   {
   public:
     UpdateHpMpTpPacket( Entity::Chara& actor ) :
-      WorldChannelPacket< FFXIVIpcUpdateHpMpTp >( actor.getId(), actor.getId() )
+      ZoneChannelPacket< FFXIVIpcUpdateHpMpTp >( actor.getId(), actor.getId() )
     {
       initialize( actor );
     };
diff --git a/src/world/Network/PacketWrappers/UpdateInventorySlotPacket.h b/src/world/Network/PacketWrappers/UpdateInventorySlotPacket.h
index 1cfae0f3..3c6e8c1c 100644
--- a/src/world/Network/PacketWrappers/UpdateInventorySlotPacket.h
+++ b/src/world/Network/PacketWrappers/UpdateInventorySlotPacket.h
@@ -12,11 +12,11 @@ namespace Sapphire::Network::Packets::Server
   /**
   * @brief The update inventory-slot packet.
   */
-  class UpdateInventorySlotPacket : public WorldChannelPacket< FFXIVIpcUpdateInventorySlot >
+  class UpdateInventorySlotPacket : public ZoneChannelPacket< FFXIVIpcUpdateInventorySlot >
   {
   public:
     UpdateInventorySlotPacket( uint32_t playerId, uint8_t slot, uint16_t storageId, const Item& item ) :
-      WorldChannelPacket< FFXIVIpcUpdateInventorySlot >( playerId, playerId )
+      ZoneChannelPacket< FFXIVIpcUpdateInventorySlot >( playerId, playerId )
     {
       initialize( slot, storageId, item );
     };
diff --git a/src/world/Session.cpp b/src/world/Session.cpp
index 28423336..b1e2c615 100644
--- a/src/world/Session.cpp
+++ b/src/world/Session.cpp
@@ -76,7 +76,7 @@ void Sapphire::World::Session::close()
     // do one last update to db
     m_pPlayer->updateSql();
     // reset the zone, so the zone handler knows to remove the actor
-    m_pPlayer->setCurrentTerritory( nullptr );
+    m_pPlayer->setCurrentZone( nullptr );
   }
 }
 
diff --git a/src/world/Territory/Housing/HousingInteriorTerritory.cpp b/src/world/Territory/Housing/HousingInteriorTerritory.cpp
index 855a2b9e..0b8985d4 100644
--- a/src/world/Territory/Housing/HousingInteriorTerritory.cpp
+++ b/src/world/Territory/Housing/HousingInteriorTerritory.cpp
@@ -57,7 +57,7 @@ void Sapphire::World::Territory::Housing::HousingInteriorTerritory::onPlayerZone
   Logger::debug( "HousingInteriorTerritory::onPlayerZoneIn: Territory#{0}|{1}, Entity#{2}",
                   getGuId(), getTerritoryTypeId(), player.getId() );
 
-  auto indoorInitPacket = makeWorldPacket< Server::FFXIVIpcHousingIndoorInitialize >( player.getId() );
+  auto indoorInitPacket = makeZonePacket< Server::FFXIVIpcHousingIndoorInitialize >( player.getId() );
   indoorInitPacket->data().u1 = 0;
   indoorInitPacket->data().u2 = 0;
   indoorInitPacket->data().u3 = 0;
@@ -80,7 +80,7 @@ void Sapphire::World::Territory::Housing::HousingInteriorTerritory::onPlayerZone
   auto yardPacketTotal = static_cast< uint8_t >( 2 + pLand->getSize() );
   for( uint8_t yardPacketNum = 0; yardPacketNum < yardPacketTotal; yardPacketNum++ )
   {
-    auto objectInitPacket = makeWorldPacket< Server::FFXIVIpcHousingObjectInitialize >( player.getId() );
+    auto objectInitPacket = makeZonePacket< Server::FFXIVIpcHousingObjectInitialize >( player.getId() );
     memcpy( &objectInitPacket->data().landIdent, &m_landIdent, sizeof( Common::LandIdent ) );
 
     if( isFcHouse )
@@ -174,7 +174,7 @@ void Sapphire::World::Territory::Housing::HousingInteriorTerritory::spawnHousing
 
   for( const auto& player : m_playerMap )
   {
-    auto objectSpawnPkt = makeWorldPacket< Server::FFXIVIpcHousingInternalObjectSpawn >( player.second->getId() );
+    auto objectSpawnPkt = makeZonePacket< Server::FFXIVIpcHousingInternalObjectSpawn >( player.second->getId() );
 
     objectSpawnPkt->data().containerId = containerType;
     objectSpawnPkt->data().containerOffset = slot;
@@ -204,7 +204,7 @@ void Sapphire::World::Territory::Housing::HousingInteriorTerritory::updateHousin
     if( player.second->getId() == sourcePlayer.getId() )
       continue;
 
-    auto moveObjPkt = makeWorldPacket< Server::FFXIVIpcHousingObjectMove >( player.second->getId() );
+    auto moveObjPkt = makeZonePacket< Server::FFXIVIpcHousingObjectMove >( player.second->getId() );
 
     moveObjPkt->data().itemRotation = obj.rotation;
     moveObjPkt->data().pos = obj.pos;
diff --git a/src/world/Territory/HousingZone.cpp b/src/world/Territory/HousingZone.cpp
index ed381398..c252b909 100644
--- a/src/world/Territory/HousingZone.cpp
+++ b/src/world/Territory/HousingZone.cpp
@@ -167,7 +167,7 @@ void Sapphire::HousingZone::onPlayerZoneIn( Entity::Player& player )
 
   for( yardPacketNum = 0; yardPacketNum < yardPacketTotal; yardPacketNum++ )
   {
-    auto housingObjectInit = makeWorldPacket< FFXIVIpcHousingObjectInitialize >( player.getId() );
+    auto housingObjectInit = makeZonePacket< FFXIVIpcHousingObjectInitialize >( player.getId() );
     memset( &housingObjectInit->data().landIdent, 0xFF, sizeof( Common::LandIdent ) );
     housingObjectInit->data().u1 = 0xFF;
     housingObjectInit->data().packetNum = yardPacketNum;
@@ -182,7 +182,7 @@ void Sapphire::HousingZone::onPlayerZoneIn( Entity::Player& player )
     player.queuePacket( housingObjectInit );
   }
 
-  auto landSetMap = makeWorldPacket< FFXIVIpcLandSetMap >( player.getId() );
+  auto landSetMap = makeZonePacket< FFXIVIpcLandSetMap >( player.getId() );
   landSetMap->data().subdivision = isInSubdivision ? 1 : 2;
 
   uint8_t startIndex = isInSubdivision ? 30 : 0;
@@ -198,7 +198,7 @@ void Sapphire::HousingZone::onPlayerZoneIn( Entity::Player& player )
 
 void Sapphire::HousingZone::sendLandSet( Entity::Player& player )
 {
-  auto landsetInitializePacket = makeWorldPacket< FFXIVIpcLandSetInitialize >( player.getId() );
+  auto landsetInitializePacket = makeZonePacket< FFXIVIpcLandSetInitialize >( player.getId() );
 
   landsetInitializePacket->data().landIdent.wardNum = m_wardNum;
   //landsetInitializePacket->data().landIdent.landSetId = m_landSetId;
@@ -247,7 +247,7 @@ void Sapphire::HousingZone::sendLandUpdate( uint8_t landId )
   {
     auto pPlayer = playerIt.second;
 
-    auto landUpdatePacket = makeWorldPacket< FFXIVIpcLandUpdate >( pPlayer->getId() );
+    auto landUpdatePacket = makeZonePacket< FFXIVIpcLandUpdate >( pPlayer->getId() );
     landUpdatePacket->data().landIdent.landId = landId;
 
     auto& landData = landUpdatePacket->data().land;
@@ -362,7 +362,7 @@ void Sapphire::HousingZone::spawnYardObject( uint8_t landId, uint16_t slotId, In
   // spawn obj in zone
   for( const auto& player : m_playerMap )
   {
-    auto packet = makeWorldPacket< Server::FFXIVIpcYardObjectSpawn >( player.second->getId() );
+    auto packet = makeZonePacket< Server::FFXIVIpcYardObjectSpawn >( player.second->getId() );
 
     packet->data().landId = landId;
     packet->data().objectArray = static_cast< uint8_t >( slotId );
@@ -390,7 +390,7 @@ void Sapphire::HousingZone::updateYardObjectPos( Entity::Player& sourcePlayer, u
     if( player.second->getId() == sourcePlayer.getId() )
       continue;
 
-    auto packet = makeWorldPacket< Server::FFXIVIpcHousingObjectMove >( player.second->getId() );
+    auto packet = makeZonePacket< Server::FFXIVIpcHousingObjectMove >( player.second->getId() );
 
     packet->data().itemRotation = item.getRot();
     packet->data().pos = item.getPos();
diff --git a/src/world/Territory/Territory.cpp b/src/world/Territory/Territory.cpp
index d8b1cf17..dcfce47b 100644
--- a/src/world/Territory/Territory.cpp
+++ b/src/world/Territory/Territory.cpp
@@ -519,7 +519,7 @@ void Sapphire::Territory::updateSessions( uint64_t tickCount, bool changedWeathe
 
     if( changedWeather )
     {
-      auto weatherChangePacket = makeWorldPacket< FFXIVIpcWeatherChange >( pPlayer->getId() );
+      auto weatherChangePacket = makeZonePacket< FFXIVIpcWeatherChange >( pPlayer->getId() );
       weatherChangePacket->data().weatherId = static_cast< uint8_t >( m_currentWeather );
       weatherChangePacket->data().delay = 5.0f;
       pPlayer->queuePacket( weatherChangePacket );

From ef1487774f7e9d3ea338a57b4ed03f627b3cb2cf Mon Sep 17 00:00:00 2001
From: NotAdam <adam@notadam.me>
Date: Mon, 5 Aug 2019 15:20:25 +1000
Subject: [PATCH 124/351] some better effect ipc docs

---
 src/common/Network/PacketDef/Zone/ServerZoneDef.h | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/src/common/Network/PacketDef/Zone/ServerZoneDef.h b/src/common/Network/PacketDef/Zone/ServerZoneDef.h
index d0ad4b92..921f0cf4 100644
--- a/src/common/Network/PacketDef/Zone/ServerZoneDef.h
+++ b/src/common/Network/PacketDef/Zone/ServerZoneDef.h
@@ -457,12 +457,21 @@ namespace Sapphire::Network::Packets::Server
     uint64_t animationTargetId; // who the animation targets
 
     uint32_t actionId; // what the casting player casts, shown in battle log/ui
-    uint32_t sequence; // seems to only increment on retail?
+    /*!
+     * @brief Zone sequence for the effect. Used to link effects that are split across multiple packets as one
+     */
+    uint32_t sequence;
 
     float animationLockTime; // maybe? doesn't seem to do anything
-    uint32_t someTargetId; // always 00 00 00 E0, 0x0E000000 is the internal def for INVALID TARGET ID
+    uint32_t someTargetId; // always 0x0E000000?
 
-    uint16_t sourceSequence; // if 0, always shows animation, otherwise hides it. counts up by 1 for each animation skipped on a caster
+    /*!
+     * @brief The cast sequence from the originating player. Should only be sent to the source, 0 for every other player.
+     *
+     * This needs to match the sequence sent from the player in the action start packet otherwise you'll cancel the
+     * initial animation and start a new one once the packet arrives.
+     */
+    uint16_t sourceSequence;
     uint16_t rotation;
     uint16_t actionAnimationId; // the animation that is played by the casting character
     uint8_t variation; // variation in the animation

From 5ffe61099462190f1f7e40b47036f709370fb3e6 Mon Sep 17 00:00:00 2001
From: Biscuit <umu@owo.icu>
Date: Fri, 9 Aug 2019 20:45:06 +1000
Subject: [PATCH 125/351] Add DailyQuestSeed ActorControl

---
 src/common/Network/CommonActorControl.h | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/common/Network/CommonActorControl.h b/src/common/Network/CommonActorControl.h
index b3ecf167..e08bc79a 100644
--- a/src/common/Network/CommonActorControl.h
+++ b/src/common/Network/CommonActorControl.h
@@ -13,8 +13,8 @@
 namespace Sapphire::Network::ActorControl
 {
 
-enum ActorControlType : uint16_t
-{
+  enum ActorControlType : uint16_t
+  {
     /*! Toggles weapon status -> Sheathed/UnSheathed
         \param param1 status 0|1 */
     ToggleWeapon = 0x00,
@@ -98,6 +98,8 @@ enum ActorControlType : uint16_t
 
     FreeEventPos = 0x8A,
 
+    DailyQuestSeed = 0x90, // param1 = the daily quest seed
+
     SetBGM = 0xA1,
 
     UnlockAetherCurrentMsg = 0xA4,

From 51df8eb5424ed32041ad35351b4e36aba5da0d70 Mon Sep 17 00:00:00 2001
From: karashiiro <49822414+karashiiro@users.noreply.github.com>
Date: Fri, 9 Aug 2019 19:01:09 -0700
Subject: [PATCH 126/351] MarketBoardItemListing opcode/packet structure;
 organizational corrections

Corrected a typo, reordered market board packets and moved them up to their corresponding positions relative to their position in Ipcs.h
---
 src/common/Network/PacketDef/Ipcs.h           |   2 +-
 .../Network/PacketDef/Zone/ServerZoneDef.h    | 128 ++++++++++++------
 2 files changed, 84 insertions(+), 46 deletions(-)

diff --git a/src/common/Network/PacketDef/Ipcs.h b/src/common/Network/PacketDef/Ipcs.h
index b30f73ae..0b47938f 100644
--- a/src/common/Network/PacketDef/Ipcs.h
+++ b/src/common/Network/PacketDef/Ipcs.h
@@ -107,7 +107,7 @@ namespace Sapphire::Network::Packets
     MailLetterNotification = 0x013A, // updated 5.0
 
     MarketBoardItemListingCount = 0x0125, // updated 4.5
-    MarketBoardItemListing = 0x0126, // updated 4.5
+    MarketBoardItemListing = 0x013C, // updated 5.0
     MarketBoardItemListingHistory = 0x012A, // updated 4.5
     MarketBoardSearchResult = 0x0139, // updated 4.5
 
diff --git a/src/common/Network/PacketDef/Zone/ServerZoneDef.h b/src/common/Network/PacketDef/Zone/ServerZoneDef.h
index 6649feb8..5965bcf2 100644
--- a/src/common/Network/PacketDef/Zone/ServerZoneDef.h
+++ b/src/common/Network/PacketDef/Zone/ServerZoneDef.h
@@ -272,7 +272,7 @@ namespace Sapphire::Network::Packets::Server
   * Structural representation of the packet sent by the server
   * to show the mail delivery notification
   */
-  struct FFXIVIpcMailLetterNotificationt : FFXIVIpcBasePacket< MailLetterNotification >
+  struct FFXIVIpcMailLetterNotification : FFXIVIpcBasePacket< MailLetterNotification >
   {
     uint32_t sendbackCount; // The amount of letters sent back since you ran out of room (moogle dialog changes based on this)
     uint16_t friendLetters; // The amount of letters in the friends section of the letterbox
@@ -283,6 +283,88 @@ namespace Sapphire::Network::Packets::Server
     char unk2[0x4]; // This has probs something to do with the support desk (inquiry id?)
   };
 
+  struct FFFXIVIpcMarketBoardItemListingCount : FFXIVIpcBasePacket< MarketBoardItemListingCount >
+  {
+    uint32_t itemCatalogId;
+    uint32_t unknown1; // does some shit if nonzero
+    uint16_t requestId;
+    uint16_t quantity; // high/low u8s read separately?
+    uint32_t unknown3;
+  };
+
+  struct FFXIVIpcMarketBoardItemListing : FFXIVIpcBasePacket< MarketBoardItemListing >
+  {
+    struct itemListing // 152 bytes each
+    {
+      uint32_t unknown;
+      uint8_t padding;
+      uint16_t unknown1;
+      uint8_t padding1;
+      struct unknown2
+      {
+        uint32_t unknown3;
+        uint16_t unknown4;
+        uint16_t unknown5;
+      } unknown6[3];
+      uint32_t pricePerUnit;
+      uint32_t unknown7;
+      uint32_t itemQuantity;
+      uint32_t unknown8;
+      uint32_t unknown9;
+      uint32_t unknown10;
+      uint32_t unknown11;
+      char padding2[16];
+      char retainerName[64];
+      bool hq;
+      uint16_t padding3;
+      uint8_t unknown12;
+      uint64_t padding4;
+    } listing[10]; // Multiple packets are sent if there are more than 10 search results.
+    uint32_t unknown13;
+    char padding5[16];
+    uint8_t unknown14;
+    uint16_t padding6;
+    uint8_t unknown15;
+    uint64_t padding7;
+    uint32_t unknown16;
+    uint32_t padding8;
+  };
+
+  struct FFXIVIpcMarketBoardItemListingHistory : FFXIVIpcBasePacket< MarketBoardItemListingHistory >
+  {
+    uint32_t itemCatalogId;
+    uint32_t itemCatalogId2;
+
+    struct MarketListing
+    {
+      uint32_t salePrice;
+      uint32_t purchaseTime;
+      uint32_t quantity;
+      uint8_t isHq;
+      uint8_t padding;
+      uint8_t onMannequin;
+
+      char buyerName[33];
+
+      uint32_t itemCatalogId;
+    } listing[20];
+  };
+
+  struct FFXIVIpcMarketBoardSearchResult : FFXIVIpcBasePacket< MarketBoardSearchResult >
+  {
+    struct MarketBoardItem
+    {
+      uint32_t itemCatalogId;
+      uint16_t quantity;
+      uint16_t demand;
+    } items[20];
+
+    uint32_t itemIndexEnd;
+    uint32_t padding1;
+    uint32_t itemIndexStart;
+    uint32_t requestId;
+  };
+
   struct FFXIVIpcExamineFreeCompanyInfo : FFXIVIpcBasePacket< ExamineFreeCompanyInfo >
   {
     char unknown[0x20]; // likely fc allegiance/icon/housing info etc
@@ -1889,50 +1971,6 @@ namespace Sapphire::Network::Packets::Server
     char otherName[32];
   };
 
-  struct FFXIVIpcMarketBoardSearchResult : FFXIVIpcBasePacket< MarketBoardSearchResult >
-  {
-      struct MarketBoardItem
-      {
-          uint32_t itemCatalogId;
-          uint16_t quantity;
-          uint16_t demand;
-      } items[20];
-
-      uint32_t itemIndexEnd;
-      uint32_t padding1;
-      uint32_t itemIndexStart;
-      uint32_t requestId;
-  };
-
-  struct FFFXIVIpcMarketBoardItemListingCount : FFXIVIpcBasePacket< MarketBoardItemListingCount >
-  {
-    uint32_t itemCatalogId;
-    uint32_t unknown1; // does some shit if nonzero
-    uint16_t requestId;
-    uint16_t quantity; // high/low u8s read separately?
-    uint32_t unknown3;
-  };
-
-  struct FFXIVIpcMarketBoardItemListingHistory : FFXIVIpcBasePacket< MarketBoardItemListingHistory >
-  {
-      uint32_t itemCatalogId;
-      uint32_t itemCatalogId2;
-
-      struct MarketListing
-      {
-          uint32_t salePrice;
-          uint32_t purchaseTime;
-          uint32_t quantity;
-          uint8_t isHq;
-          uint8_t padding;
-          uint8_t onMannequin;
-
-          char buyerName[33];
-
-          uint32_t itemCatalogId;
-      } listing[20];
-  };
-
 }
 
 #endif /*_CORE_NETWORK_PACKETS_SERVER_IPC_H*/

From 04dbfc9e8f8047c6e688f2b94c4c378587b4f0e6 Mon Sep 17 00:00:00 2001
From: karashiiro <49822414+karashiiro@users.noreply.github.com>
Date: Wed, 14 Aug 2019 19:44:02 -0700
Subject: [PATCH 127/351] Got two more useful pieces of data, renamed padding12
 to unknown12

It seems to contain materia IDs as uint16_t values, with 6 bytes of padding somewhere?
---
 src/common/Network/PacketDef/Zone/ServerZoneDef.h | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/src/common/Network/PacketDef/Zone/ServerZoneDef.h b/src/common/Network/PacketDef/Zone/ServerZoneDef.h
index 5965bcf2..d4d29a2c 100644
--- a/src/common/Network/PacketDef/Zone/ServerZoneDef.h
+++ b/src/common/Network/PacketDef/Zone/ServerZoneDef.h
@@ -313,11 +313,20 @@ namespace Sapphire::Network::Packets::Server
       uint32_t unknown9;
       uint32_t unknown10;
       uint32_t unknown11;
-      char padding2[16];
+      char unknown12[16]; // Materia? Doesn't seem to match any IDs
       char retainerName[64];
       bool hq;
-      uint16_t padding3;
-      uint8_t unknown12;
+      uint8_t materiaCount;
+      uint8_t padding3;
+      uint8_t retainerCity;
+      /**
+       * 0x01 Limsa Lominsa
+       * 0x02 Gridania
+       * 0x03 Ul'dah
+       * 0x04 Ishgard
+       * 0x07 Kugane
+       * 0x0A Crystarium
+       */
       uint64_t padding4;
     } listing[10]; // Multiple packets are sent if there are more than 10 search results.
     uint32_t unknown13;

From 9d6bb566ef957964646246fd1a3e4bdc76d873e7 Mon Sep 17 00:00:00 2001
From: karashiiro <49822414+karashiiro@users.noreply.github.com>
Date: Fri, 16 Aug 2019 14:19:39 -0700
Subject: [PATCH 128/351] it's always 30000

added itemID, materiaValue[5]
---
 .../Network/PacketDef/Zone/ServerZoneDef.h    | 31 ++++++++++---------
 1 file changed, 17 insertions(+), 14 deletions(-)

diff --git a/src/common/Network/PacketDef/Zone/ServerZoneDef.h b/src/common/Network/PacketDef/Zone/ServerZoneDef.h
index d4d29a2c..44b9510e 100644
--- a/src/common/Network/PacketDef/Zone/ServerZoneDef.h
+++ b/src/common/Network/PacketDef/Zone/ServerZoneDef.h
@@ -296,7 +296,7 @@ namespace Sapphire::Network::Packets::Server
   {
     struct itemListing // 152 bytes each
     {
-      uint32_t unknown;
+      uint32_t unknown; // Changes if multiple packets are sent for a single item
       uint8_t padding;
       uint16_t unknown1;
       uint8_t padding1;
@@ -309,15 +309,18 @@ namespace Sapphire::Network::Packets::Server
       uint32_t pricePerUnit;
       uint32_t unknown7;
       uint32_t itemQuantity;
-      uint32_t unknown8;
-      uint32_t unknown9;
+      uint32_t itemID;
+      uint16_t unknown8;
+      uint16_t unknown9;
       uint32_t unknown10;
-      uint32_t unknown11;
-      char unknown12[16]; // Materia? Doesn't seem to match any IDs
+      uint16_t unknown11; // Always 30000
+      uint16_t padding3;
+      uint16_t materiaValue[5]; // Materia ID = (materiaValue & 0xFF0) >> 4
+      uint32_t padding4;
       char retainerName[64];
       bool hq;
       uint8_t materiaCount;
-      uint8_t padding3;
+      uint8_t padding5;
       uint8_t retainerCity;
       /**
        * 0x01 Limsa Lominsa
@@ -327,16 +330,16 @@ namespace Sapphire::Network::Packets::Server
        * 0x07 Kugane
        * 0x0A Crystarium
        */
-      uint64_t padding4;
+      uint64_t padding6;
     } listing[10]; // Multiple packets are sent if there are more than 10 search results.
-    uint32_t unknown13;
-    char padding5[16];
+    uint32_t unknown12;
+    char padding7[16];
+    uint8_t unknown13;
+    uint16_t padding8;
     uint8_t unknown14;
-    uint16_t padding6;
-    uint8_t unknown15;
-    uint64_t padding7;
-    uint32_t unknown16;
-    uint32_t padding8;
+    uint64_t padding9;
+    uint32_t unknown15;
+    uint32_t padding10;
   };
 
   struct FFXIVIpcMarketBoardItemListingHistory : FFXIVIpcBasePacket< MarketBoardItemListingHistory >

From 3523abdc818480c23d0cc22ab2c36d4bb0694c51 Mon Sep 17 00:00:00 2001
From: karashiiro <49822414+karashiiro@users.noreply.github.com>
Date: Fri, 16 Aug 2019 17:34:02 -0700
Subject: [PATCH 129/351] suggestion commits

---
 src/common/Network/PacketDef/Ipcs.h               |  2 +-
 src/common/Network/PacketDef/Zone/ServerZoneDef.h | 11 ++++++++---
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/src/common/Network/PacketDef/Ipcs.h b/src/common/Network/PacketDef/Ipcs.h
index 0b47938f..ab499c36 100644
--- a/src/common/Network/PacketDef/Ipcs.h
+++ b/src/common/Network/PacketDef/Ipcs.h
@@ -106,7 +106,7 @@ namespace Sapphire::Network::Packets
     ReqMoogleMailLetter = 0x0139, // updated 5.0
     MailLetterNotification = 0x013A, // updated 5.0
 
-    MarketBoardItemListingCount = 0x0125, // updated 4.5
+    MarketBoardItemListingCount = 0x013B, // updated 5.0
     MarketBoardItemListing = 0x013C, // updated 5.0
     MarketBoardItemListingHistory = 0x012A, // updated 4.5
     MarketBoardSearchResult = 0x0139, // updated 4.5
diff --git a/src/common/Network/PacketDef/Zone/ServerZoneDef.h b/src/common/Network/PacketDef/Zone/ServerZoneDef.h
index 44b9510e..efb57bb7 100644
--- a/src/common/Network/PacketDef/Zone/ServerZoneDef.h
+++ b/src/common/Network/PacketDef/Zone/ServerZoneDef.h
@@ -294,7 +294,7 @@ namespace Sapphire::Network::Packets::Server
 
   struct FFXIVIpcMarketBoardItemListing : FFXIVIpcBasePacket< MarketBoardItemListing >
   {
-    struct itemListing // 152 bytes each
+    struct ItemListing // 152 bytes each
     {
       uint32_t unknown; // Changes if multiple packets are sent for a single item
       uint8_t padding;
@@ -309,13 +309,18 @@ namespace Sapphire::Network::Packets::Server
       uint32_t pricePerUnit;
       uint32_t unknown7;
       uint32_t itemQuantity;
-      uint32_t itemID;
+      uint32_t itemId;
       uint16_t unknown8;
       uint16_t unknown9;
       uint32_t unknown10;
       uint16_t unknown11; // Always 30000
       uint16_t padding3;
-      uint16_t materiaValue[5]; // Materia ID = (materiaValue & 0xFF0) >> 4
+      uint16_t materiaValue[5];
+      /**
+       * auto materiaId = (i & 0xFF0) >> 4;
+       * auto index = i & 0xF;
+       * auto leftover = i >> 8;
+       */
       uint32_t padding4;
       char retainerName[64];
       bool hq;

From 03cdcb88fa88701e3271b4d86fa5fee1d077d85a Mon Sep 17 00:00:00 2001
From: karashiiro <49822414+karashiiro@users.noreply.github.com>
Date: Fri, 16 Aug 2019 17:35:15 -0700
Subject: [PATCH 130/351] oop

---
 src/common/Network/PacketDef/Zone/ServerZoneDef.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/common/Network/PacketDef/Zone/ServerZoneDef.h b/src/common/Network/PacketDef/Zone/ServerZoneDef.h
index efb57bb7..35551bb5 100644
--- a/src/common/Network/PacketDef/Zone/ServerZoneDef.h
+++ b/src/common/Network/PacketDef/Zone/ServerZoneDef.h
@@ -313,7 +313,7 @@ namespace Sapphire::Network::Packets::Server
       uint16_t unknown8;
       uint16_t unknown9;
       uint32_t unknown10;
-      uint16_t unknown11; // Always 30000
+      uint16_t durability;
       uint16_t padding3;
       uint16_t materiaValue[5];
       /**

From d4149e879ae6d40316838b564f1a9d624809505e Mon Sep 17 00:00:00 2001
From: karashiiro <49822414+karashiiro@users.noreply.github.com>
Date: Fri, 16 Aug 2019 17:38:27 -0700
Subject: [PATCH 131/351] Update ServerZoneDef.h

doc positioning fix
---
 src/common/Network/PacketDef/Zone/ServerZoneDef.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/common/Network/PacketDef/Zone/ServerZoneDef.h b/src/common/Network/PacketDef/Zone/ServerZoneDef.h
index 35551bb5..dade719c 100644
--- a/src/common/Network/PacketDef/Zone/ServerZoneDef.h
+++ b/src/common/Network/PacketDef/Zone/ServerZoneDef.h
@@ -315,18 +315,17 @@ namespace Sapphire::Network::Packets::Server
       uint32_t unknown10;
       uint16_t durability;
       uint16_t padding3;
-      uint16_t materiaValue[5];
       /**
        * auto materiaId = (i & 0xFF0) >> 4;
        * auto index = i & 0xF;
        * auto leftover = i >> 8;
        */
+      uint16_t materiaValue[5];
       uint32_t padding4;
       char retainerName[64];
       bool hq;
       uint8_t materiaCount;
       uint8_t padding5;
-      uint8_t retainerCity;
       /**
        * 0x01 Limsa Lominsa
        * 0x02 Gridania
@@ -335,6 +334,7 @@ namespace Sapphire::Network::Packets::Server
        * 0x07 Kugane
        * 0x0A Crystarium
        */
+      uint8_t retainerCity;
       uint64_t padding6;
     } listing[10]; // Multiple packets are sent if there are more than 10 search results.
     uint32_t unknown12;

From fa78ddc1bef4b718e1e7330801506cc60d493bf3 Mon Sep 17 00:00:00 2001
From: Asakusa Yakumo <9378097+LimiQS@users.noreply.github.com>
Date: Sat, 17 Aug 2019 17:44:00 +0800
Subject: [PATCH 132/351] Add more detail+info

---
 .../Network/PacketDef/Zone/ServerZoneDef.h    | 40 +++++++++----------
 1 file changed, 20 insertions(+), 20 deletions(-)

diff --git a/src/common/Network/PacketDef/Zone/ServerZoneDef.h b/src/common/Network/PacketDef/Zone/ServerZoneDef.h
index dade719c..592856c8 100644
--- a/src/common/Network/PacketDef/Zone/ServerZoneDef.h
+++ b/src/common/Network/PacketDef/Zone/ServerZoneDef.h
@@ -296,36 +296,32 @@ namespace Sapphire::Network::Packets::Server
   {
     struct ItemListing // 152 bytes each
     {
-      uint32_t unknown; // Changes if multiple packets are sent for a single item
-      uint8_t padding;
-      uint16_t unknown1;
-      uint8_t padding1;
-      struct unknown2
-      {
-        uint32_t unknown3;
-        uint16_t unknown4;
-        uint16_t unknown5;
-      } unknown6[3];
+      uint64_t listingId;
+      uint64_t retainerId;
+      uint64_t retainerOwnerId;
+      uint64_t artisanId;
       uint32_t pricePerUnit;
-      uint32_t unknown7;
+      uint32_t totalTax;
       uint32_t itemQuantity;
       uint32_t itemId;
-      uint16_t unknown8;
-      uint16_t unknown9;
-      uint32_t unknown10;
+      uint16_t lastReviewTime;
+      uint16_t containerId;
+      uint32_t slotId;
       uint16_t durability;
-      uint16_t padding3;
+      uint16_t spiritBond;
       /**
        * auto materiaId = (i & 0xFF0) >> 4;
        * auto index = i & 0xF;
        * auto leftover = i >> 8;
        */
       uint16_t materiaValue[5];
-      uint32_t padding4;
-      char retainerName[64];
+      uint16_t padding1;
+      uint32_t padding2;
+      char retainerName[32];
+      char playerName[32];
       bool hq;
       uint8_t materiaCount;
-      uint8_t padding5;
+      uint8_t onMannequin;
       /**
        * 0x01 Limsa Lominsa
        * 0x02 Gridania
@@ -335,9 +331,13 @@ namespace Sapphire::Network::Packets::Server
        * 0x0A Crystarium
        */
       uint8_t retainerCity;
-      uint64_t padding6;
+      uint16_t dyeId;
+      uint16_t padding3;
+      uint32_t padding4;
     } listing[10]; // Multiple packets are sent if there are more than 10 search results.
-    uint32_t unknown12;
+    uint8_t listingIndexEnd;
+    uint8_t listingIndexStart;
+    uint16_t requestId;
     char padding7[16];
     uint8_t unknown13;
     uint16_t padding8;

From 178abd94151d0a44d4a583f158277e3d78b1083c Mon Sep 17 00:00:00 2001
From: NotAdam <adam@notadam.me>
Date: Thu, 22 Aug 2019 18:02:07 +1000
Subject: [PATCH 133/351] fix playersetup packet some more

---
 src/common/Network/PacketDef/Zone/ServerZoneDef.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/common/Network/PacketDef/Zone/ServerZoneDef.h b/src/common/Network/PacketDef/Zone/ServerZoneDef.h
index 921f0cf4..40adc51d 100644
--- a/src/common/Network/PacketDef/Zone/ServerZoneDef.h
+++ b/src/common/Network/PacketDef/Zone/ServerZoneDef.h
@@ -877,10 +877,10 @@ namespace Sapphire::Network::Packets::Server
     unsigned char maxLevel;
     unsigned char expansion;
     unsigned char unknown76;
+    unsigned char unknown77;
     unsigned char race;
     unsigned char tribe;
     unsigned char gender;
-    unsigned char unknown7A;
     unsigned char currentJob;
     unsigned char currentClass;
     unsigned char deity;

From 3db411d907ef7dbf3f4fbadf35f2a4bf3e6e3994 Mon Sep 17 00:00:00 2001
From: Mordred Admin <gogs@fake.local>
Date: Fri, 30 Aug 2019 15:29:02 +0200
Subject: [PATCH 134/351] Fixing some CMake issues with mariadb

---
 cmake/FindMySQL.cmake                           | 5 ++++-
 src/tools/action_parse/CMakeLists.txt           | 2 +-
 src/tools/discovery_parser/CMakeLists.txt       | 2 +-
 src/tools/event_object_parser/CMakeLists.txt    | 2 +-
 src/tools/exd_common_gen/CMakeLists.txt         | 2 +-
 src/tools/exd_struct_gen/CMakeLists.txt         | 2 +-
 src/tools/exd_struct_test/CMakeLists.txt        | 2 +-
 src/tools/mob_parse/CMakeLists.txt              | 2 +-
 src/tools/nav_export/CMakeLists.txt             | 2 +-
 src/tools/pcb_reader/CMakeLists.txt             | 2 +-
 src/tools/quest_parser/CMakeLists.txt           | 2 +-
 src/tools/questbattle_bruteforce/CMakeLists.txt | 2 +-
 12 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/cmake/FindMySQL.cmake b/cmake/FindMySQL.cmake
index 42fb7833..034e94d7 100644
--- a/cmake/FindMySQL.cmake
+++ b/cmake/FindMySQL.cmake
@@ -60,6 +60,7 @@ if( UNIX )
   else( MYSQL_CONFIG )
     set(MYSQL_ADD_LIBRARIES "")
     list(APPEND MYSQL_ADD_LIBRARIES "mysqlclient_r")
+    list(APPEND MYSQL_ADD_LIBRARIES "mariadbclient")
   endif( MYSQL_CONFIG )
 endif( UNIX )
 
@@ -76,6 +77,7 @@ find_path(MYSQL_INCLUDE_DIR
   PATHS
     ${MYSQL_ADD_INCLUDE_PATH}
     /usr/include
+    /usr/include/mariadb
     /usr/include/mysql
     /usr/local/include
     /usr/local/include/mysql
@@ -97,7 +99,7 @@ if( UNIX )
   foreach(LIB ${MYSQL_ADD_LIBRARIES})
     find_library( MYSQL_LIBRARY
       NAMES
-        mysql libmysql ${LIB}
+        mysql libmysql libmariadb ${LIB}
       PATHS
         ${MYSQL_ADD_LIBRARIES_PATH}
         /usr/lib
@@ -105,6 +107,7 @@ if( UNIX )
         /usr/local/lib
         /usr/local/lib/mysql
         /usr/local/mysql/lib
+        /usr/lib/x86_64-linux-gnu
       DOC "Specify the location of the mysql library here."
     )
   endforeach(LIB ${MYSQL_ADD_LIBRARY})
diff --git a/src/tools/action_parse/CMakeLists.txt b/src/tools/action_parse/CMakeLists.txt
index 6ba0bc47..3b135e7e 100644
--- a/src/tools/action_parse/CMakeLists.txt
+++ b/src/tools/action_parse/CMakeLists.txt
@@ -8,7 +8,7 @@ file(GLOB SERVER_SOURCE_FILES "${CMAKE_CURRENT_SOURCE_DIR}*.c*")
 add_executable( action_parse ${SERVER_PUBLIC_INCLUDE_FILES} ${SERVER_SOURCE_FILES})
 
 if (UNIX)
-  target_link_libraries( action_parse common xivdat pthread mysqlclient dl z stdc++fs )
+  target_link_libraries( action_parse common xivdat pthread mysql dl z stdc++fs )
 else()
   target_link_libraries( action_parse common xivdat mysql zlib)
 endif()
diff --git a/src/tools/discovery_parser/CMakeLists.txt b/src/tools/discovery_parser/CMakeLists.txt
index d60766f3..e753a267 100644
--- a/src/tools/discovery_parser/CMakeLists.txt
+++ b/src/tools/discovery_parser/CMakeLists.txt
@@ -24,7 +24,7 @@ add_executable(discovery_parser ${SERVER_PUBLIC_INCLUDE_FILES} ${SERVER_SOURCE_F
 #)
 
 if (UNIX)
-    target_link_libraries (discovery_parser common xivdat pthread mysqlclient dl z stdc++fs)
+    target_link_libraries (discovery_parser common xivdat pthread mysql dl z stdc++fs)
 else()
     target_link_libraries (discovery_parser common xivdat mysql zlib)
 endif()
diff --git a/src/tools/event_object_parser/CMakeLists.txt b/src/tools/event_object_parser/CMakeLists.txt
index 2b18f34e..dafed30a 100644
--- a/src/tools/event_object_parser/CMakeLists.txt
+++ b/src/tools/event_object_parser/CMakeLists.txt
@@ -10,7 +10,7 @@ add_executable(event_object_parser ${SERVER_PUBLIC_INCLUDE_FILES} ${SERVER_SOURC
 
 
 if (UNIX)
-    target_link_libraries (event_object_parser common xivdat pthread mysqlclient dl z stdc++fs)
+    target_link_libraries (event_object_parser common xivdat pthread mysql dl z stdc++fs)
 else()
     target_link_libraries (event_object_parser common xivdat mysql zlib)
 endif()
diff --git a/src/tools/exd_common_gen/CMakeLists.txt b/src/tools/exd_common_gen/CMakeLists.txt
index 5ad726b2..3590162b 100644
--- a/src/tools/exd_common_gen/CMakeLists.txt
+++ b/src/tools/exd_common_gen/CMakeLists.txt
@@ -8,7 +8,7 @@ file(GLOB SERVER_SOURCE_FILES "${CMAKE_CURRENT_SOURCE_DIR}*.c*")
 add_executable(exd_common_gen ${SERVER_PUBLIC_INCLUDE_FILES} ${SERVER_SOURCE_FILES})
 
 if (UNIX)
-    target_link_libraries (exd_common_gen common xivdat pthread mysqlclient dl z stdc++fs)
+    target_link_libraries (exd_common_gen common xivdat pthread mysql dl z stdc++fs)
 else()
     target_link_libraries (exd_common_gen common xivdat mysql zlib)
 endif()
diff --git a/src/tools/exd_struct_gen/CMakeLists.txt b/src/tools/exd_struct_gen/CMakeLists.txt
index 348aa164..24fa972d 100644
--- a/src/tools/exd_struct_gen/CMakeLists.txt
+++ b/src/tools/exd_struct_gen/CMakeLists.txt
@@ -8,7 +8,7 @@ file(GLOB SERVER_SOURCE_FILES "${CMAKE_CURRENT_SOURCE_DIR}*.c*")
 add_executable(exd_struct_gen ${SERVER_PUBLIC_INCLUDE_FILES} ${SERVER_SOURCE_FILES})
 
 if (UNIX)
-  target_link_libraries (exd_struct_gen common xivdat pthread mysqlclient dl z stdc++fs)
+  target_link_libraries (exd_struct_gen common xivdat pthread mysql dl z stdc++fs)
 else()
   target_link_libraries (exd_struct_gen common xivdat mysql zlib)
 endif()
diff --git a/src/tools/exd_struct_test/CMakeLists.txt b/src/tools/exd_struct_test/CMakeLists.txt
index 8ebb7bba..70c259c3 100644
--- a/src/tools/exd_struct_test/CMakeLists.txt
+++ b/src/tools/exd_struct_test/CMakeLists.txt
@@ -8,7 +8,7 @@ file(GLOB SERVER_SOURCE_FILES "${CMAKE_CURRENT_SOURCE_DIR}*.c*")
 add_executable(exd_struct_test ${SERVER_PUBLIC_INCLUDE_FILES} ${SERVER_SOURCE_FILES})
 
 if (UNIX)
-  target_link_libraries (exd_struct_test common xivdat pthread mysqlclient dl z stdc++fs )
+  target_link_libraries (exd_struct_test common xivdat pthread mysql dl z stdc++fs )
 else()
   target_link_libraries (exd_struct_test common xivdat mysql zlib)
 endif()
diff --git a/src/tools/mob_parse/CMakeLists.txt b/src/tools/mob_parse/CMakeLists.txt
index cbae9ce3..502b19eb 100644
--- a/src/tools/mob_parse/CMakeLists.txt
+++ b/src/tools/mob_parse/CMakeLists.txt
@@ -8,7 +8,7 @@ file(GLOB SERVER_SOURCE_FILES "${CMAKE_CURRENT_SOURCE_DIR}*.c*")
 add_executable(mob_parse ${SERVER_PUBLIC_INCLUDE_FILES} ${SERVER_SOURCE_FILES})
 
 if (UNIX)
-    target_link_libraries (mob_parse common xivdat pthread mysqlclient dl z stdc++fs )
+    target_link_libraries (mob_parse common xivdat pthread mysql dl z stdc++fs )
 else()
     target_link_libraries (mob_parse common xivdat mysql zlib)
 endif()
diff --git a/src/tools/nav_export/CMakeLists.txt b/src/tools/nav_export/CMakeLists.txt
index 4aaaa4c7..61fa93a8 100644
--- a/src/tools/nav_export/CMakeLists.txt
+++ b/src/tools/nav_export/CMakeLists.txt
@@ -11,7 +11,7 @@ file(GLOB SERVER_SOURCE_FILES RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}
 add_executable( nav_export ${SERVER_PUBLIC_INCLUDE_FILES} ${SERVER_SOURCE_FILES})
 
 if (UNIX)
-    target_link_libraries( nav_export common xivdat pthread mysqlclient dl z stdc++fs Recast Detour DetourTileCache )
+    target_link_libraries( nav_export common xivdat pthread mysql dl z stdc++fs Recast Detour DetourTileCache )
 else()
     target_link_libraries( nav_export common xivdat mysql zlib Recast Detour DetourTileCache )
 endif()
diff --git a/src/tools/pcb_reader/CMakeLists.txt b/src/tools/pcb_reader/CMakeLists.txt
index d42aa873..a731a7da 100644
--- a/src/tools/pcb_reader/CMakeLists.txt
+++ b/src/tools/pcb_reader/CMakeLists.txt
@@ -11,7 +11,7 @@ file(GLOB SERVER_SOURCE_FILES RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}
 add_executable(pcb_reader2 ${SERVER_PUBLIC_INCLUDE_FILES} ${SERVER_SOURCE_FILES})
 
 if (UNIX)
-    target_link_libraries( pcb_reader2 common xivdat pthread mysqlclient dl z stdc++fs Recast Detour DetourTileCache )
+    target_link_libraries( pcb_reader2 common xivdat pthread mysql dl z stdc++fs Recast Detour DetourTileCache )
 else()
     target_link_libraries( pcb_reader2 common xivdat mysql zlib Recast Detour DetourTileCache )
 endif()
diff --git a/src/tools/quest_parser/CMakeLists.txt b/src/tools/quest_parser/CMakeLists.txt
index 252cee64..dbd5edf3 100644
--- a/src/tools/quest_parser/CMakeLists.txt
+++ b/src/tools/quest_parser/CMakeLists.txt
@@ -8,7 +8,7 @@ file(GLOB SERVER_SOURCE_FILES "${CMAKE_CURRENT_SOURCE_DIR}*.c*")
 add_executable(quest_parse ${SERVER_PUBLIC_INCLUDE_FILES} ${SERVER_SOURCE_FILES})
 
 if (UNIX)
-  target_link_libraries (quest_parse common xivdat pthread mysqlclient dl z stdc++fs)
+  target_link_libraries (quest_parse common xivdat pthread mysql dl z stdc++fs)
 else()
   target_link_libraries (quest_parse common xivdat mysql zlib)
 endif()
diff --git a/src/tools/questbattle_bruteforce/CMakeLists.txt b/src/tools/questbattle_bruteforce/CMakeLists.txt
index 9c974d15..b4bbb22d 100644
--- a/src/tools/questbattle_bruteforce/CMakeLists.txt
+++ b/src/tools/questbattle_bruteforce/CMakeLists.txt
@@ -8,7 +8,7 @@ file(GLOB SERVER_SOURCE_FILES "${CMAKE_CURRENT_SOURCE_DIR}*.c*")
 add_executable(questbattle_bruteforce ${SERVER_PUBLIC_INCLUDE_FILES} ${SERVER_SOURCE_FILES})
 
 if (UNIX)
-  target_link_libraries (questbattle_bruteforce common xivdat pthread mysqlclient dl z stdc++fs )
+  target_link_libraries (questbattle_bruteforce common xivdat pthread mysql dl z stdc++fs )
 else()
   target_link_libraries (questbattle_bruteforce common xivdat mysql zlib)
 endif()

From 26874034094e7cad303330a539f1cd6927b3dd5f Mon Sep 17 00:00:00 2001
From: Biscuit <umu@owo.icu>
Date: Fri, 6 Sep 2019 10:55:03 +1000
Subject: [PATCH 135/351] Add SetMountSpeed ActorControl

---
 src/common/Network/CommonActorControl.h | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/src/common/Network/CommonActorControl.h b/src/common/Network/CommonActorControl.h
index c29b2f2c..65c43812 100644
--- a/src/common/Network/CommonActorControl.h
+++ b/src/common/Network/CommonActorControl.h
@@ -225,6 +225,14 @@ namespace Sapphire::Network::ActorControl
     SetFestival = 0x386, // param1: festival.exd index
 
     ToggleOrchestrionUnlock = 0x396,
+
+    /*!
+    * param1 = mountSpeed
+    * Retail sends 12 for mount speed star 1 unlocked and 15 for mount speed star 2 unlocked
+    * This also has to be sent before mounting finishes for it to take effect
+    */
+    SetMountSpeed = 0x39F, // param1: mount speed
+
     Dismount = 0x3A1, // updated 4.5
 
     // Duty Recorder

From 64b37752ea1058042c42200fe37dbfd1e2e44dee Mon Sep 17 00:00:00 2001
From: Biscuit <umu@owo.icu>
Date: Fri, 6 Sep 2019 10:56:35 +1000
Subject: [PATCH 136/351] No idea why I did that

---
 src/common/Network/CommonActorControl.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/common/Network/CommonActorControl.h b/src/common/Network/CommonActorControl.h
index 65c43812..969b1a4a 100644
--- a/src/common/Network/CommonActorControl.h
+++ b/src/common/Network/CommonActorControl.h
@@ -231,7 +231,7 @@ namespace Sapphire::Network::ActorControl
     * Retail sends 12 for mount speed star 1 unlocked and 15 for mount speed star 2 unlocked
     * This also has to be sent before mounting finishes for it to take effect
     */
-    SetMountSpeed = 0x39F, // param1: mount speed
+    SetMountSpeed = 0x39F,
 
     Dismount = 0x3A1, // updated 4.5
 

From fedc6ff4e3f6801a72a8abe6238d29d8978cb060 Mon Sep 17 00:00:00 2001
From: Flavien Normand <contact@flavien-normand.fr>
Date: Thu, 19 Sep 2019 19:52:13 +0200
Subject: [PATCH 137/351] add saddlebag container ids

---
 src/common/Common.h | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/common/Common.h b/src/common/Common.h
index 96e41193..5f09f842 100644
--- a/src/common/Common.h
+++ b/src/common/Common.h
@@ -209,7 +209,7 @@ namespace Sapphire::Common
     Currency = 2000,
     Crystal = 2001,
     //UNKNOWN_0 = 2003,
-      KeyItem = 2004,
+    KeyItem = 2004,
     HandIn = 2005,
     DamagedGear = 2007,
     //UNKNOWN_1 = 2008,
@@ -228,6 +228,9 @@ namespace Sapphire::Common
 
     ArmorySoulCrystal = 3400,
     ArmoryMain = 3500,
+    
+    SaddleBag0 = 4000,
+    SaddleBag1 = 4001,
 
     RetainerBag0 = 10000,
     RetainerBag1 = 10001,

From 1ad13598f08fe916aa2c974a1dd29b47a3fe36a3 Mon Sep 17 00:00:00 2001
From: Supamiu <contact@flavien-normand.fr>
Date: Wed, 9 Oct 2019 09:30:49 +0200
Subject: [PATCH 138/351] Adding actor control 20F: DesynthResult

---
 src/common/Network/CommonActorControl.h | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/src/common/Network/CommonActorControl.h b/src/common/Network/CommonActorControl.h
index 969b1a4a..f620b381 100644
--- a/src/common/Network/CommonActorControl.h
+++ b/src/common/Network/CommonActorControl.h
@@ -206,6 +206,14 @@ namespace Sapphire::Network::ActorControl
     ChallengeEntryCompleteMsg = 0x20B,
     ChallengeEntryUnlockMsg = 0x20C,
 
+    /*!
+     * Sent when a player desynths an item, one packet per result type (one for consumed item, one for each obtained items, and one for exp if the player received exp)
+     * param1 = result type (4921 => Item consumed, 4922 => Item obtained, 4925 => Exp obtained)
+     * param3 = item id (used for result types 4921 & 4922)
+     * param5 = exp amount (x 100)
+     */
+    DesynthResult = 0x20F,
+
     GilTrailMsg = 0x211,
 
     HuntingLogRankUnlock = 0x21D,

From 9bfb9c74f0965a628edd0d580c416f244350c910 Mon Sep 17 00:00:00 2001
From: Mordred <ffxivsapphire@gmail.com>
Date: Wed, 9 Oct 2019 18:14:53 +0200
Subject: [PATCH 139/351] Renamed ActorControl packets and definitions
 according to usage

---
 src/common/Network/PacketDef/Ipcs.h           |  6 ++---
 .../Network/PacketDef/Zone/ServerZoneDef.h    |  6 ++---
 .../common/housing/CmnDefHousingSignboard.cpp |  2 +-
 src/world/Action/Action.cpp                   |  8 +++----
 src/world/Action/EventAction.cpp              |  4 ++--
 src/world/Actor/BNpc.cpp                      |  6 ++---
 src/world/Actor/Chara.cpp                     |  6 ++---
 src/world/Actor/EventObject.cpp               |  6 ++---
 src/world/Actor/Npc.cpp                       |  6 ++---
 src/world/Actor/Player.cpp                    |  6 ++---
 src/world/Actor/PlayerEvent.cpp               |  2 +-
 src/world/Actor/PlayerInventory.cpp           |  6 ++---
 src/world/Event/Director.cpp                  |  4 ++--
 src/world/Manager/DebugCommandMgr.cpp         |  8 +++----
 src/world/Manager/HousingMgr.cpp              |  4 ++--
 .../Network/Handlers/ClientTriggerHandler.cpp |  2 +-
 .../Network/Handlers/GMCommandHandlers.cpp    |  8 +++----
 src/world/Network/Handlers/PacketHandlers.cpp |  8 +++----
 ...ontrolPacket142.h => ActorControlPacket.h} | 22 ++++++++---------
 ...olPacket143.h => ActorControlSelfPacket.h} | 24 +++++++++----------
 ...Packet144.h => ActorControlTargetPacket.h} | 24 +++++++++----------
 .../Housing/HousingInteriorTerritory.cpp      |  2 +-
 src/world/Territory/HousingZone.cpp           |  2 +-
 src/world/Territory/InstanceContent.cpp       |  6 ++---
 src/world/Territory/QuestBattle.cpp           |  4 ++--
 src/world/Territory/Territory.cpp             |  2 +-
 26 files changed, 92 insertions(+), 92 deletions(-)
 rename src/world/Network/PacketWrappers/{ActorControlPacket142.h => ActorControlPacket.h} (53%)
 rename src/world/Network/PacketWrappers/{ActorControlPacket143.h => ActorControlSelfPacket.h} (53%)
 rename src/world/Network/PacketWrappers/{ActorControlPacket144.h => ActorControlTargetPacket.h} (52%)

diff --git a/src/common/Network/PacketDef/Ipcs.h b/src/common/Network/PacketDef/Ipcs.h
index 39a408a5..a26e11d7 100644
--- a/src/common/Network/PacketDef/Ipcs.h
+++ b/src/common/Network/PacketDef/Ipcs.h
@@ -52,9 +52,9 @@ namespace Sapphire::Network::Packets
     InitZone = 0x019A,
 
     EffectResult = 0x0141,
-    ActorControl142 = 0x0142,
-    ActorControl143 = 0x0143,
-    ActorControl144 = 0x0144,
+    ActorControl = 0x0142,
+    ActorControlSelf = 0x0143,
+    ActorControlTarget = 0x0144,
     UpdateHpMpTp = 0x0145,
 
     ///////////////////////////////////////////////////
diff --git a/src/common/Network/PacketDef/Zone/ServerZoneDef.h b/src/common/Network/PacketDef/Zone/ServerZoneDef.h
index 57ff4756..992b87a1 100644
--- a/src/common/Network/PacketDef/Zone/ServerZoneDef.h
+++ b/src/common/Network/PacketDef/Zone/ServerZoneDef.h
@@ -467,7 +467,7 @@ namespace Sapphire::Network::Packets::Server
   * Structural representation of the packet sent by the server
   * to update certain player details / status
   */
-  struct FFXIVIpcActorControl142 : FFXIVIpcBasePacket< ActorControl142 >
+  struct FFXIVIpcActorControl : FFXIVIpcBasePacket< ActorControl >
   {
     /* 0000 */ uint16_t category;
     /* 0002 */ uint16_t padding;
@@ -482,7 +482,7 @@ namespace Sapphire::Network::Packets::Server
   * Structural representation of the packet sent by the server
   * to update certain player details / status
   */
-  struct FFXIVIpcActorControl143 : FFXIVIpcBasePacket< ActorControl143 >
+  struct FFXIVIpcActorControlSelf : FFXIVIpcBasePacket< ActorControlSelf >
   {
     /* 0000 */ uint16_t category;
     /* 0002 */ uint16_t padding;
@@ -499,7 +499,7 @@ namespace Sapphire::Network::Packets::Server
   * Structural representation of the packet sent by the server
   * to update certain player details / status
   */
-  struct FFXIVIpcActorControl144 : FFXIVIpcBasePacket< ActorControl144 >
+  struct FFXIVIpcActorControlTarget : FFXIVIpcBasePacket< ActorControlTarget >
   {
     /* 0000 */ uint16_t category;
     /* 0002 */ uint16_t padding;
diff --git a/src/scripts/common/housing/CmnDefHousingSignboard.cpp b/src/scripts/common/housing/CmnDefHousingSignboard.cpp
index cf7ff4bf..a97356e8 100644
--- a/src/scripts/common/housing/CmnDefHousingSignboard.cpp
+++ b/src/scripts/common/housing/CmnDefHousingSignboard.cpp
@@ -2,7 +2,7 @@
 #include <Actor/Player.h>
 #include <Territory/HousingZone.h>
 #include <Manager/HousingMgr.h>
-#include <Network/PacketWrappers/ActorControlPacket143.h>
+#include <Network/PacketWrappers/ActorControlSelfPacket.h>
 #include <Network/CommonActorControl.h>
 #include <Exd/ExdDataGenerated.h>
 #include "Framework.h"
diff --git a/src/world/Action/Action.cpp b/src/world/Action/Action.cpp
index 783a84ea..0dd6e67b 100644
--- a/src/world/Action/Action.cpp
+++ b/src/world/Action/Action.cpp
@@ -17,9 +17,9 @@
 #include "Territory/Territory.h"
 
 #include <Network/CommonActorControl.h>
-#include "Network/PacketWrappers/ActorControlPacket142.h"
-#include "Network/PacketWrappers/ActorControlPacket143.h"
-#include "Network/PacketWrappers/ActorControlPacket144.h"
+#include "Network/PacketWrappers/ActorControlPacket.h"
+#include "Network/PacketWrappers/ActorControlSelfPacket.h"
+#include "Network/PacketWrappers/ActorControlTargetPacket.h"
 
 #include <Logging/Logger.h>
 
@@ -325,7 +325,7 @@ void Action::Action::execute()
   if( hasCastTime() )
   {
     // todo: what's this?
-    /*auto control = ActorControlPacket143( m_pTarget->getId(), ActorControlType::Unk7,
+    /*auto control = ActorControlSelfPacket( m_pTarget->getId(), ActorControlType::Unk7,
                                             0x219, m_id, m_id, m_id, m_id );
     m_pSource->sendToInRangeSet( control, true );*/
 
diff --git a/src/world/Action/EventAction.cpp b/src/world/Action/EventAction.cpp
index 4cf2cd2b..d5e196e5 100644
--- a/src/world/Action/EventAction.cpp
+++ b/src/world/Action/EventAction.cpp
@@ -3,8 +3,8 @@
 #include <Exd/ExdDataGenerated.h>
 #include <Network/CommonActorControl.h>
 
-#include "Network/PacketWrappers/ActorControlPacket142.h"
-#include "Network/PacketWrappers/ActorControlPacket143.h"
+#include "Network/PacketWrappers/ActorControlPacket.h"
+#include "Network/PacketWrappers/ActorControlSelfPacket.h"
 
 #include "Actor/Player.h"
 
diff --git a/src/world/Actor/BNpc.cpp b/src/world/Actor/BNpc.cpp
index 8276842d..340c8fdb 100644
--- a/src/world/Actor/BNpc.cpp
+++ b/src/world/Actor/BNpc.cpp
@@ -14,9 +14,9 @@
 #include "Territory/Territory.h"
 
 #include "Network/GameConnection.h"
-#include "Network/PacketWrappers/ActorControlPacket142.h"
-#include "Network/PacketWrappers/ActorControlPacket143.h"
-#include "Network/PacketWrappers/ActorControlPacket144.h"
+#include "Network/PacketWrappers/ActorControlPacket.h"
+#include "Network/PacketWrappers/ActorControlSelfPacket.h"
+#include "Network/PacketWrappers/ActorControlTargetPacket.h"
 #include "Network/PacketWrappers/UpdateHpMpTpPacket.h"
 #include "Network/PacketWrappers/NpcSpawnPacket.h"
 #include "Network/PacketWrappers/MoveActorPacket.h"
diff --git a/src/world/Actor/Chara.cpp b/src/world/Actor/Chara.cpp
index 77f9004f..4948eff6 100644
--- a/src/world/Actor/Chara.cpp
+++ b/src/world/Actor/Chara.cpp
@@ -11,9 +11,9 @@
 #include "Territory/Territory.h"
 
 #include "Network/GameConnection.h"
-#include "Network/PacketWrappers/ActorControlPacket142.h"
-#include "Network/PacketWrappers/ActorControlPacket143.h"
-#include "Network/PacketWrappers/ActorControlPacket144.h"
+#include "Network/PacketWrappers/ActorControlPacket.h"
+#include "Network/PacketWrappers/ActorControlSelfPacket.h"
+#include "Network/PacketWrappers/ActorControlTargetPacket.h"
 #include "Network/PacketWrappers/UpdateHpMpTpPacket.h"
 #include "Network/PacketWrappers/EffectPacket.h"
 
diff --git a/src/world/Actor/EventObject.cpp b/src/world/Actor/EventObject.cpp
index cc34720e..b95a1550 100644
--- a/src/world/Actor/EventObject.cpp
+++ b/src/world/Actor/EventObject.cpp
@@ -3,9 +3,9 @@
 #include "Territory/InstanceContent.h"
 #include "Actor/Player.h"
 
-#include "Network/PacketWrappers/ActorControlPacket142.h"
-#include "Network/PacketWrappers/ActorControlPacket143.h"
-#include "Network/PacketWrappers/ActorControlPacket144.h"
+#include "Network/PacketWrappers/ActorControlPacket.h"
+#include "Network/PacketWrappers/ActorControlSelfPacket.h"
+#include "Network/PacketWrappers/ActorControlTargetPacket.h"
 
 #include <Logging/Logger.h>
 #include <Network/PacketDef/Zone/ServerZoneDef.h>
diff --git a/src/world/Actor/Npc.cpp b/src/world/Actor/Npc.cpp
index 6dcf112f..d795aabb 100644
--- a/src/world/Actor/Npc.cpp
+++ b/src/world/Actor/Npc.cpp
@@ -12,9 +12,9 @@
 #include "Territory/Territory.h"
 
 #include "Network/GameConnection.h"
-#include "Network/PacketWrappers/ActorControlPacket142.h"
-#include "Network/PacketWrappers/ActorControlPacket143.h"
-#include "Network/PacketWrappers/ActorControlPacket144.h"
+#include "Network/PacketWrappers/ActorControlPacket.h"
+#include "Network/PacketWrappers/ActorControlSelfPacket.h"
+#include "Network/PacketWrappers/ActorControlTargetPacket.h"
 #include "Network/PacketWrappers/UpdateHpMpTpPacket.h"
 #include "Network/PacketWrappers/EffectPacket.h"
 
diff --git a/src/world/Actor/Player.cpp b/src/world/Actor/Player.cpp
index c7ddadee..4cebfab7 100644
--- a/src/world/Actor/Player.cpp
+++ b/src/world/Actor/Player.cpp
@@ -22,9 +22,9 @@
 #include "Territory/Land.h"
 
 #include "Network/GameConnection.h"
-#include "Network/PacketWrappers/ActorControlPacket142.h"
-#include "Network/PacketWrappers/ActorControlPacket143.h"
-#include "Network/PacketWrappers/ActorControlPacket144.h"
+#include "Network/PacketWrappers/ActorControlPacket.h"
+#include "Network/PacketWrappers/ActorControlSelfPacket.h"
+#include "Network/PacketWrappers/ActorControlTargetPacket.h"
 #include "Network/PacketWrappers/PlayerSetupPacket.h"
 #include "Network/PacketWrappers/ServerNoticePacket.h"
 #include "Network/PacketWrappers/ChatPacket.h"
diff --git a/src/world/Actor/PlayerEvent.cpp b/src/world/Actor/PlayerEvent.cpp
index 7db09d0b..b4fb05a1 100644
--- a/src/world/Actor/PlayerEvent.cpp
+++ b/src/world/Actor/PlayerEvent.cpp
@@ -3,7 +3,7 @@
 #include <Network/PacketContainer.h>
 
 #include "Network/GameConnection.h"
-#include "Network/PacketWrappers/ActorControlPacket142.h"
+#include "Network/PacketWrappers/ActorControlPacket.h"
 #include "Network/PacketWrappers/PlayerSetupPacket.h"
 #include "Network/PacketWrappers/ServerNoticePacket.h"
 #include "Network/PacketWrappers/EventStartPacket.h"
diff --git a/src/world/Actor/PlayerInventory.cpp b/src/world/Actor/PlayerInventory.cpp
index 720f2f2e..36459884 100644
--- a/src/world/Actor/PlayerInventory.cpp
+++ b/src/world/Actor/PlayerInventory.cpp
@@ -5,8 +5,8 @@
 
 #include "Territory/Territory.h"
 
-#include "Network/PacketWrappers/ActorControlPacket142.h"
-#include "Network/PacketWrappers/ActorControlPacket143.h"
+#include "Network/PacketWrappers/ActorControlPacket.h"
+#include "Network/PacketWrappers/ActorControlSelfPacket.h"
 #include "Network/PacketWrappers/UpdateInventorySlotPacket.h"
 
 #include "Inventory/Item.h"
@@ -25,7 +25,7 @@
 #include "Actor/Player.h"
 
 #include "Network/PacketWrappers/ServerNoticePacket.h"
-#include "Network/PacketWrappers/ActorControlPacket143.h"
+#include "Network/PacketWrappers/ActorControlSelfPacket.h"
 
 #include "Manager/InventoryMgr.h"
 #include "Manager/ItemMgr.h"
diff --git a/src/world/Event/Director.cpp b/src/world/Event/Director.cpp
index 00710e77..75fcae89 100644
--- a/src/world/Event/Director.cpp
+++ b/src/world/Event/Director.cpp
@@ -6,8 +6,8 @@
 
 #include "Actor/Player.h"
 
-#include "Network/PacketWrappers/ActorControlPacket142.h"
-#include "Network/PacketWrappers/ActorControlPacket143.h"
+#include "Network/PacketWrappers/ActorControlPacket.h"
+#include "Network/PacketWrappers/ActorControlSelfPacket.h"
 #include <Logging/Logger.h>
 
 
diff --git a/src/world/Manager/DebugCommandMgr.cpp b/src/world/Manager/DebugCommandMgr.cpp
index 2cad42bb..9fef637d 100644
--- a/src/world/Manager/DebugCommandMgr.cpp
+++ b/src/world/Manager/DebugCommandMgr.cpp
@@ -16,8 +16,8 @@
 #include "DebugCommandMgr.h"
 
 #include "Network/PacketWrappers/ServerNoticePacket.h"
-#include "Network/PacketWrappers/ActorControlPacket142.h"
-#include "Network/PacketWrappers/ActorControlPacket143.h"
+#include "Network/PacketWrappers/ActorControlPacket.h"
+#include "Network/PacketWrappers/ActorControlSelfPacket.h"
 #include "Network/PacketWrappers/PlayerSetupPacket.h"
 #include "Network/PacketWrappers/PlayerSpawnPacket.h"
 #include "Network/GameConnection.h"
@@ -494,7 +494,7 @@ void Sapphire::World::Manager::DebugCommandMgr::add( char* data, Entity::Player&
 
     player.sendNotice( "Injecting ACTOR_CONTROL {0}", opcode );
 
-    auto actorControl = makeZonePacket< FFXIVIpcActorControl143 >( playerId, player.getId() );
+    auto actorControl = makeZonePacket< FFXIVIpcActorControlSelf >( playerId, player.getId() );
     actorControl->data().category = opcode;
     actorControl->data().param1 = param1;
     actorControl->data().param2 = param2;
@@ -511,7 +511,7 @@ void Sapphire::World::Manager::DebugCommandMgr::add( char* data, Entity::Player&
 
     player.queuePacket( noticePacket );
 
-    Network::Packets::Server::ActorControlPacket143 controlPacket( player, opcode,
+    Network::Packets::Server::ActorControlSelfPacket controlPacket( player, opcode,
     param1, param2, param3, param4, param5, param6, playerId );
     player.queuePacket( controlPacket );*/
 
diff --git a/src/world/Manager/HousingMgr.cpp b/src/world/Manager/HousingMgr.cpp
index 5c773e9f..c9db8f72 100644
--- a/src/world/Manager/HousingMgr.cpp
+++ b/src/world/Manager/HousingMgr.cpp
@@ -4,8 +4,8 @@
 #include <Exd/ExdDataGenerated.h>
 #include <Network/PacketContainer.h>
 #include <Network/PacketDef/Zone/ServerZoneDef.h>
-#include <Network/PacketWrappers/ActorControlPacket142.h>
-#include <Network/PacketWrappers/ActorControlPacket143.h>
+#include <Network/PacketWrappers/ActorControlPacket.h>
+#include <Network/PacketWrappers/ActorControlSelfPacket.h>
 #include <Network/CommonActorControl.h>
 
 #include <unordered_map>
diff --git a/src/world/Network/Handlers/ClientTriggerHandler.cpp b/src/world/Network/Handlers/ClientTriggerHandler.cpp
index b47ed892..3286469f 100644
--- a/src/world/Network/Handlers/ClientTriggerHandler.cpp
+++ b/src/world/Network/Handlers/ClientTriggerHandler.cpp
@@ -20,7 +20,7 @@
 #include "Network/PacketWrappers/MoveActorPacket.h"
 #include "Network/PacketWrappers/ChatPacket.h"
 #include "Network/PacketWrappers/ServerNoticePacket.h"
-#include "Network/PacketWrappers/ActorControlPacket142.h"
+#include "Network/PacketWrappers/ActorControlPacket.h"
 
 #include "Manager/DebugCommandMgr.h"
 #include "Manager/EventMgr.h"
diff --git a/src/world/Network/Handlers/GMCommandHandlers.cpp b/src/world/Network/Handlers/GMCommandHandlers.cpp
index 7dd91a2e..b2f48567 100644
--- a/src/world/Network/Handlers/GMCommandHandlers.cpp
+++ b/src/world/Network/Handlers/GMCommandHandlers.cpp
@@ -22,9 +22,9 @@
 #include "Network/PacketWrappers/MoveActorPacket.h"
 #include "Network/PacketWrappers/ChatPacket.h"
 #include "Network/PacketWrappers/ServerNoticePacket.h"
-#include "Network/PacketWrappers/ActorControlPacket142.h"
-#include "Network/PacketWrappers/ActorControlPacket143.h"
-#include "Network/PacketWrappers/ActorControlPacket144.h"
+#include "Network/PacketWrappers/ActorControlPacket.h"
+#include "Network/PacketWrappers/ActorControlSelfPacket.h"
+#include "Network/PacketWrappers/ActorControlTargetPacket.h"
 #include "Network/PacketWrappers/EventStartPacket.h"
 #include "Network/PacketWrappers/EventFinishPacket.h"
 #include "Network/PacketWrappers/PlayerStateFlagsPacket.h"
@@ -458,7 +458,7 @@ void Sapphire::Network::GameConnection::gm1Handler( FrameworkPtr pFw,
     case GmCommand::Wireframe:
     {
       player.queuePacket(
-        std::make_shared< ActorControlPacket143 >( player.getId(), ActorControlType::ToggleWireframeRendering ) );
+        std::make_shared< ActorControlSelfPacket >( player.getId(), ActorControlType::ToggleWireframeRendering ) );
       player.sendNotice( "Wireframe Rendering for {0} was toggled", player.getName() );
       break;
     }
diff --git a/src/world/Network/Handlers/PacketHandlers.cpp b/src/world/Network/Handlers/PacketHandlers.cpp
index c4166431..8b51595d 100644
--- a/src/world/Network/Handlers/PacketHandlers.cpp
+++ b/src/world/Network/Handlers/PacketHandlers.cpp
@@ -26,9 +26,9 @@
 #include "Network/PacketWrappers/MoveActorPacket.h"
 #include "Network/PacketWrappers/ChatPacket.h"
 #include "Network/PacketWrappers/ServerNoticePacket.h"
-#include "Network/PacketWrappers/ActorControlPacket142.h"
-#include "Network/PacketWrappers/ActorControlPacket143.h"
-#include "Network/PacketWrappers/ActorControlPacket144.h"
+#include "Network/PacketWrappers/ActorControlPacket.h"
+#include "Network/PacketWrappers/ActorControlSelfPacket.h"
+#include "Network/PacketWrappers/ActorControlTargetPacket.h"
 #include "Network/PacketWrappers/EventStartPacket.h"
 #include "Network/PacketWrappers/EventFinishPacket.h"
 #include "Network/PacketWrappers/PlayerStateFlagsPacket.h"
@@ -299,7 +299,7 @@ void Sapphire::Network::GameConnection::zoneLineHandler( FrameworkPtr pFw,
     auto preparePacket = makeZonePacket< FFXIVIpcPrepareZoning >( player.getId() );
     preparePacket->data().targetZone = targetZone;
 
-    //ActorControlPacket143 controlPacket( pPlayer, ActorControlType::DespawnZoneScreenMsg,
+    //ActorControlSelfPacket controlPacket( pPlayer, ActorControlType::DespawnZoneScreenMsg,
     //                                     0x03, player.getId(), 0x01, targetZone );
     player.queuePacket( preparePacket );
   }
diff --git a/src/world/Network/PacketWrappers/ActorControlPacket142.h b/src/world/Network/PacketWrappers/ActorControlPacket.h
similarity index 53%
rename from src/world/Network/PacketWrappers/ActorControlPacket142.h
rename to src/world/Network/PacketWrappers/ActorControlPacket.h
index 30f14598..99a70b77 100644
--- a/src/world/Network/PacketWrappers/ActorControlPacket142.h
+++ b/src/world/Network/PacketWrappers/ActorControlPacket.h
@@ -11,17 +11,17 @@ namespace Sapphire::Network::Packets::Server
   /**
   * @brief The Ping response packet.
   */
-  class ActorControlPacket142 : public ZoneChannelPacket< FFXIVIpcActorControl142 >
+  class ActorControlPacket : public ZoneChannelPacket< FFXIVIpcActorControl >
   {
   public:
-    ActorControlPacket142( uint32_t actorId,
-                           uint16_t category,
-                           uint32_t param1 = 0,
-                           uint32_t param2 = 0,
-                           uint32_t param3 = 0,
-                           uint32_t param4 = 0,
-                           uint32_t padding1 = 0 ) :
-      ZoneChannelPacket< FFXIVIpcActorControl142 >( actorId, actorId )
+    ActorControlPacket( uint32_t actorId,
+                        uint16_t category,
+                        uint32_t param1 = 0,
+                        uint32_t param2 = 0,
+                        uint32_t param3 = 0,
+                        uint32_t param4 = 0,
+                        uint32_t padding1 = 0 ) :
+      ZoneChannelPacket< FFXIVIpcActorControl >( actorId, actorId )
     {
       initialize( category, param1, param2, param3, param4 );
     };
@@ -39,9 +39,9 @@ namespace Sapphire::Network::Packets::Server
   };
 
   template< typename... Args >
-  std::shared_ptr< ActorControlPacket142 > makeActorControl142( Args... args )
+  std::shared_ptr< ActorControlPacket > makeActorControl142( Args... args )
   {
-    return std::make_shared< ActorControlPacket142 >( args... );
+    return std::make_shared< ActorControlPacket >( args... );
   }
 
 }
diff --git a/src/world/Network/PacketWrappers/ActorControlPacket143.h b/src/world/Network/PacketWrappers/ActorControlSelfPacket.h
similarity index 53%
rename from src/world/Network/PacketWrappers/ActorControlPacket143.h
rename to src/world/Network/PacketWrappers/ActorControlSelfPacket.h
index c93b3db3..58f0e617 100644
--- a/src/world/Network/PacketWrappers/ActorControlPacket143.h
+++ b/src/world/Network/PacketWrappers/ActorControlSelfPacket.h
@@ -12,18 +12,18 @@ namespace Sapphire::Network::Packets::Server
   /**
   * @brief The Ping response packet.
   */
-  class ActorControlPacket143 : public ZoneChannelPacket< FFXIVIpcActorControl143 >
+  class ActorControlSelfPacket : public ZoneChannelPacket< FFXIVIpcActorControlSelf >
   {
   public:
-    ActorControlPacket143( uint32_t actorId,
-                           uint16_t category,
-                           uint32_t param1 = 0,
-                           uint32_t param2 = 0,
-                           uint32_t param3 = 0,
-                           uint32_t param4 = 0,
-                           uint32_t param5 = 0,
-                           uint32_t padding1 = 0 ) :
-      ZoneChannelPacket< FFXIVIpcActorControl143 >( actorId, actorId )
+    ActorControlSelfPacket( uint32_t actorId,
+                            uint16_t category,
+                            uint32_t param1 = 0,
+                            uint32_t param2 = 0,
+                            uint32_t param3 = 0,
+                            uint32_t param4 = 0,
+                            uint32_t param5 = 0,
+                            uint32_t padding1 = 0 ) :
+      ZoneChannelPacket< FFXIVIpcActorControlSelf >( actorId, actorId )
     {
       initialize( category, param1, param2, param3, param4, param5 );
     };
@@ -43,9 +43,9 @@ namespace Sapphire::Network::Packets::Server
   };
 
   template< typename... Args >
-  std::shared_ptr< ActorControlPacket143 > makeActorControl143( Args... args )
+  std::shared_ptr< ActorControlSelfPacket > makeActorControl143( Args... args )
   {
-    return std::make_shared< ActorControlPacket143 >( args... );
+    return std::make_shared< ActorControlSelfPacket >( args... );
   }
 
 }
diff --git a/src/world/Network/PacketWrappers/ActorControlPacket144.h b/src/world/Network/PacketWrappers/ActorControlTargetPacket.h
similarity index 52%
rename from src/world/Network/PacketWrappers/ActorControlPacket144.h
rename to src/world/Network/PacketWrappers/ActorControlTargetPacket.h
index da645b1e..f80046b7 100644
--- a/src/world/Network/PacketWrappers/ActorControlPacket144.h
+++ b/src/world/Network/PacketWrappers/ActorControlTargetPacket.h
@@ -10,18 +10,18 @@ namespace Sapphire::Network::Packets::Server
   /**
   * @brief The Ping response packet.
   */
-  class ActorControlPacket144 : public ZoneChannelPacket< FFXIVIpcActorControl144 >
+  class ActorControlTargetPacket : public ZoneChannelPacket< FFXIVIpcActorControlTarget >
   {
   public:
-    ActorControlPacket144( uint32_t actorId,
-                           uint16_t category,
-                           uint32_t param1 = 0,
-                           uint32_t param2 = 0,
-                           uint32_t param3 = 0,
-                           uint32_t param4 = 0,
-                           uint64_t targetId = 0,
-                           uint32_t padding1 = 0 ) :
-      ZoneChannelPacket< FFXIVIpcActorControl144 >( actorId, actorId )
+    ActorControlTargetPacket( uint32_t actorId,
+                              uint16_t category,
+                              uint32_t param1 = 0,
+                              uint32_t param2 = 0,
+                              uint32_t param3 = 0,
+                              uint32_t param4 = 0,
+                              uint64_t targetId = 0,
+                              uint32_t padding1 = 0 ) :
+      ZoneChannelPacket< FFXIVIpcActorControlTarget >( actorId, actorId )
     {
       initialize( category, param1, param2, param3, param4, targetId );
     };
@@ -41,9 +41,9 @@ namespace Sapphire::Network::Packets::Server
   };
 
   template< typename... Args >
-  std::shared_ptr< ActorControlPacket144 > makeActorControl144( Args... args )
+  std::shared_ptr< ActorControlTargetPacket > makeActorControl144( Args... args )
   {
-    return std::make_shared< ActorControlPacket144 >( args... );
+    return std::make_shared< ActorControlTargetPacket >( args... );
   }
 
 }
diff --git a/src/world/Territory/Housing/HousingInteriorTerritory.cpp b/src/world/Territory/Housing/HousingInteriorTerritory.cpp
index 0b8985d4..eff95302 100644
--- a/src/world/Territory/Housing/HousingInteriorTerritory.cpp
+++ b/src/world/Territory/Housing/HousingInteriorTerritory.cpp
@@ -6,7 +6,7 @@
 #include <Exd/ExdDataGenerated.h>
 #include <Network/GamePacket.h>
 #include <Network/PacketDef/Zone/ServerZoneDef.h>
-#include <Network/PacketWrappers/ActorControlPacket143.h>
+#include <Network/PacketWrappers/ActorControlSelfPacket.h>
 #include <Network/CommonActorControl.h>
 
 #include "Actor/Player.h"
diff --git a/src/world/Territory/HousingZone.cpp b/src/world/Territory/HousingZone.cpp
index c252b909..1473ff62 100644
--- a/src/world/Territory/HousingZone.cpp
+++ b/src/world/Territory/HousingZone.cpp
@@ -6,7 +6,7 @@
 #include <Exd/ExdDataGenerated.h>
 #include <Network/GamePacket.h>
 #include <Network/PacketDef/Zone/ServerZoneDef.h>
-#include <Network/PacketWrappers/ActorControlPacket143.h>
+#include <Network/PacketWrappers/ActorControlSelfPacket.h>
 #include <Network/CommonActorControl.h>
 
 #include "Actor/Player.h"
diff --git a/src/world/Territory/InstanceContent.cpp b/src/world/Territory/InstanceContent.cpp
index 267da084..c0467fc5 100644
--- a/src/world/Territory/InstanceContent.cpp
+++ b/src/world/Territory/InstanceContent.cpp
@@ -13,8 +13,8 @@
 #include "Actor/Player.h"
 #include "Actor/EventObject.h"
 
-#include "Network/PacketWrappers/ActorControlPacket142.h"
-#include "Network/PacketWrappers/ActorControlPacket143.h"
+#include "Network/PacketWrappers/ActorControlPacket.h"
+#include "Network/PacketWrappers/ActorControlSelfPacket.h"
 
 
 #include "Event/EventHandler.h"
@@ -410,7 +410,7 @@ void Sapphire::InstanceContent::setCurrentBGM( uint16_t bgmIndex )
     auto player = playerIt.second;
     // note: retail do send a BGM_MUTE(1) first before any BGM transition, but YOLO in this case.
     // also do note that this code can't control the bgm granularly. (i.e. per player for WoD submap.) oops.
-    // player->queuePacket( ActorControlPacket143( player->getId(), DirectorUpdate, getDirectorId(), 0x80000001, 1 ) );
+    // player->queuePacket( ActorControlSelfPacket( player->getId(), DirectorUpdate, getDirectorId(), 0x80000001, 1 ) );
     player->queuePacket(
       makeActorControl143( player->getId(), DirectorUpdate, getDirectorId(), 0x80000001, bgmIndex ) );
   }
diff --git a/src/world/Territory/QuestBattle.cpp b/src/world/Territory/QuestBattle.cpp
index 63e60b9b..8bcc518c 100644
--- a/src/world/Territory/QuestBattle.cpp
+++ b/src/world/Territory/QuestBattle.cpp
@@ -15,8 +15,8 @@
 #include "Actor/BNpc.h"
 #include "Actor/BNpcTemplate.h"
 
-#include "Network/PacketWrappers/ActorControlPacket142.h"
-#include "Network/PacketWrappers/ActorControlPacket143.h"
+#include "Network/PacketWrappers/ActorControlPacket.h"
+#include "Network/PacketWrappers/ActorControlSelfPacket.h"
 
 
 #include "Event/EventHandler.h"
diff --git a/src/world/Territory/Territory.cpp b/src/world/Territory/Territory.cpp
index dcfce47b..765d4b1f 100644
--- a/src/world/Territory/Territory.cpp
+++ b/src/world/Territory/Territory.cpp
@@ -13,7 +13,7 @@
 #include <Network/PacketContainer.h>
 #include <Network/CommonActorControl.h>
 #include <Database/DatabaseDef.h>
-#include <Network/PacketWrappers/ActorControlPacket143.h>
+#include <Network/PacketWrappers/ActorControlSelfPacket.h>
 
 #include "Territory.h"
 #include "InstanceContent.h"

From cfc4a997fe210037b854e8bd9eee36c10391a66e Mon Sep 17 00:00:00 2001
From: Mordred <ffxivsapphire@gmail.com>
Date: Wed, 9 Oct 2019 18:42:25 +0200
Subject: [PATCH 140/351] Changed makeActorControl calls aswell

---
 .../common/housing/CmnDefHousingSignboard.cpp |  2 +-
 src/world/Action/Action.cpp                   |  7 +-
 src/world/Action/EventAction.cpp              |  8 +-
 src/world/Actor/BNpc.cpp                      | 10 +--
 src/world/Actor/Chara.cpp                     | 18 ++---
 src/world/Actor/EventObject.cpp               |  4 +-
 src/world/Actor/Player.cpp                    | 75 +++++++++----------
 src/world/Actor/PlayerInventory.cpp           |  8 +-
 src/world/Event/Director.cpp                  |  4 +-
 src/world/Manager/HousingMgr.cpp              | 21 +++---
 .../Network/Handlers/ClientTriggerHandler.cpp | 23 +++---
 .../Network/Handlers/GMCommandHandlers.cpp    | 12 +--
 src/world/Network/Handlers/PacketHandlers.cpp |  4 +-
 .../PacketWrappers/ActorControlPacket.h       |  2 +-
 .../PacketWrappers/ActorControlSelfPacket.h   |  2 +-
 .../PacketWrappers/ActorControlTargetPacket.h |  2 +-
 .../Housing/HousingInteriorTerritory.cpp      |  6 +-
 src/world/Territory/HousingZone.cpp           |  3 +-
 src/world/Territory/InstanceContent.cpp       | 18 ++---
 src/world/Territory/QuestBattle.cpp           |  8 +-
 src/world/Territory/Territory.cpp             |  2 +-
 21 files changed, 121 insertions(+), 118 deletions(-)

diff --git a/src/scripts/common/housing/CmnDefHousingSignboard.cpp b/src/scripts/common/housing/CmnDefHousingSignboard.cpp
index a97356e8..21f13046 100644
--- a/src/scripts/common/housing/CmnDefHousingSignboard.cpp
+++ b/src/scripts/common/housing/CmnDefHousingSignboard.cpp
@@ -45,7 +45,7 @@ public:
         {
           case LandPurchaseResult::SUCCESS:
           {
-            auto screenMsgPkt = makeActorControl143( player.getId(), ActorControl::DutyQuestScreenMsg, m_id, 0x98 );
+            auto screenMsgPkt = makeActorControlSelf( player.getId(), ActorControl::DutyQuestScreenMsg, m_id, 0x98 );
             player.queuePacket( screenMsgPkt );
 
             player.sendLogMessage( 0x0D16, pTerritory->getTerritoryTypeInfo()->placeName, activeLand.ward + 1, activeLand.plot + 1 );
diff --git a/src/world/Action/Action.cpp b/src/world/Action/Action.cpp
index 0dd6e67b..2fb1fb4c 100644
--- a/src/world/Action/Action.cpp
+++ b/src/world/Action/Action.cpp
@@ -250,7 +250,8 @@ void Action::Action::start()
   }
 
   // todo: m_recastTimeMs needs to be adjusted for player sks/sps
-  auto actionStartPkt = makeActorControl143( m_pSource->getId(), ActorControlType::ActionStart, 1, getId(), m_recastTimeMs / 10 );
+  auto actionStartPkt = makeActorControlSelf( m_pSource->getId(), ActorControlType::ActionStart, 1, getId(),
+                                              m_recastTimeMs / 10 );
   player->queuePacket( actionStartPkt );
 
   auto pScriptMgr = m_pFw->get< Scripting::ScriptMgr >();
@@ -299,8 +300,8 @@ void Action::Action::interrupt()
 
     // Note: When cast interrupt from taking too much damage, set the last value to 1.
     // This enables the cast interrupt effect.
-    auto control = makeActorControl142( m_pSource->getId(), ActorControlType::CastInterrupt,
-                                        0x219, 1, m_id, interruptEffect );
+    auto control = makeActorControl( m_pSource->getId(), ActorControlType::CastInterrupt,
+                                     0x219, 1, m_id, interruptEffect );
 
     m_pSource->sendToInRangeSet( control, true );
   }
diff --git a/src/world/Action/EventAction.cpp b/src/world/Action/EventAction.cpp
index d5e196e5..8c742ded 100644
--- a/src/world/Action/EventAction.cpp
+++ b/src/world/Action/EventAction.cpp
@@ -44,7 +44,7 @@ void Action::EventAction::start()
 
   m_startTime = Common::Util::getTimeMs();
 
-  auto control = makeActorControl142( m_pSource->getId(), ActorControlType::CastStart, 1, m_id, 0x4000004E );
+  auto control = makeActorControl( m_pSource->getId(), ActorControlType::CastStart, 1, m_id, 0x4000004E );
 
   if( m_pSource->isPlayer() )
   {
@@ -70,7 +70,7 @@ void Action::EventAction::execute()
     if( m_onActionFinishClb )
       m_onActionFinishClb( *m_pSource->getAsPlayer(), m_eventId, m_additional );
 
-    auto control = makeActorControl142( m_pSource->getId(), ActorControlType::CastStart, 0, m_id );
+    auto control = makeActorControl( m_pSource->getId(), ActorControlType::CastStart, 0, m_id );
 
     if( !pEvent->hasPlayedScene() )
       m_pSource->getAsPlayer()->eventFinish( m_eventId, 1 );
@@ -100,11 +100,11 @@ void Action::EventAction::interrupt()
   try
   {
 
-    auto control = makeActorControl142( m_pSource->getId(), ActorControlType::CastInterrupt, 0x219, 0x04, m_id );
+    auto control = makeActorControl( m_pSource->getId(), ActorControlType::CastInterrupt, 0x219, 0x04, m_id );
 
     if( m_pSource->isPlayer() )
     {
-      auto control1 = makeActorControl143( m_pSource->getId(), ActorControlType::FreeEventPos, m_eventId );
+      auto control1 = makeActorControlSelf( m_pSource->getId(), ActorControlType::FreeEventPos, m_eventId );
 
       //m_pSource->getAsPlayer()->unsetStateFlag( PlayerStateFlag::NoCombat );
       //m_pSource->getAsPlayer()->unsetStateFlag( PlayerStateFlag::Occupied1 );
diff --git a/src/world/Actor/BNpc.cpp b/src/world/Actor/BNpc.cpp
index 340c8fdb..d133766e 100644
--- a/src/world/Actor/BNpc.cpp
+++ b/src/world/Actor/BNpc.cpp
@@ -178,7 +178,7 @@ void Sapphire::Entity::BNpc::spawn( PlayerPtr pTarget )
 void Sapphire::Entity::BNpc::despawn( PlayerPtr pTarget )
 {
   pTarget->freePlayerSpawnId( getId() );
-  pTarget->queuePacket( makeActorControl143( m_id, DespawnZoneScreenMsg, 0x04, getId(), 0x01 ) );
+  pTarget->queuePacket( makeActorControlSelf( m_id, DespawnZoneScreenMsg, 0x04, getId(), 0x01 ) );
 }
 
 Sapphire::Entity::BNpcState Sapphire::Entity::BNpc::getState() const
@@ -369,8 +369,8 @@ void Sapphire::Entity::BNpc::aggro( Sapphire::Entity::CharaPtr pChara )
   setStance( Stance::Active );
   m_state = BNpcState::Combat;
 
-  sendToInRangeSet( makeActorControl142( getId(), ActorControlType::ToggleWeapon, 1, 1, 0 ) );
-  sendToInRangeSet( makeActorControl142( getId(), ActorControlType::ToggleAggro, 1, 0, 0 ) );
+  sendToInRangeSet( makeActorControl( getId(), ActorControlType::ToggleWeapon, 1, 1, 0 ) );
+  sendToInRangeSet( makeActorControl( getId(), ActorControlType::ToggleAggro, 1, 0, 0 ) );
 
   if( pChara->isPlayer() )
   {
@@ -388,8 +388,8 @@ void Sapphire::Entity::BNpc::deaggro( Sapphire::Entity::CharaPtr pChara )
   if( pChara->isPlayer() )
   {
     PlayerPtr tmpPlayer = pChara->getAsPlayer();
-    sendToInRangeSet( makeActorControl142( getId(), ActorControlType::ToggleWeapon, 0, 1, 1 ) );
-    sendToInRangeSet( makeActorControl142( getId(), ActorControlType::ToggleAggro, 0, 0, 0 ) );
+    sendToInRangeSet( makeActorControl( getId(), ActorControlType::ToggleWeapon, 0, 1, 1 ) );
+    sendToInRangeSet( makeActorControl( getId(), ActorControlType::ToggleAggro, 0, 0, 0 ) );
     tmpPlayer->onMobDeaggro( getAsBNpc() );
   }
 }
diff --git a/src/world/Actor/Chara.cpp b/src/world/Actor/Chara.cpp
index 4948eff6..70656675 100644
--- a/src/world/Actor/Chara.cpp
+++ b/src/world/Actor/Chara.cpp
@@ -291,13 +291,13 @@ void Sapphire::Entity::Chara::die()
   // if the actor is a player, the update needs to be send to himself too
   bool selfNeedsUpdate = isPlayer();
 
-  FFXIVPacketBasePtr packet = makeActorControl142( m_id, SetStatus, static_cast< uint8_t >( ActorStatus::Dead ) );
+  FFXIVPacketBasePtr packet = makeActorControl( m_id, SetStatus, static_cast< uint8_t >( ActorStatus::Dead ) );
   sendToInRangeSet( packet, selfNeedsUpdate );
 
   // TODO: not all actor show the death animation when they die, some quest npcs might just despawn
   //       although that might be handled by setting the HP to 1 and doing some script magic
 
-  FFXIVPacketBasePtr packet1 = makeActorControl142( m_id, DeathAnimation, 0, 0, 0, 0x20 );
+  FFXIVPacketBasePtr packet1 = makeActorControl( m_id, DeathAnimation, 0, 0, 0, 0x20 );
   sendToInRangeSet( packet1, selfNeedsUpdate );
 
 }
@@ -329,7 +329,7 @@ void Sapphire::Entity::Chara::setStance( Stance stance )
 {
   m_currentStance = stance;
 
-  FFXIVPacketBasePtr packet = makeActorControl142( m_id, ToggleWeapon, stance, 0 );
+  FFXIVPacketBasePtr packet = makeActorControl( m_id, ToggleWeapon, stance, 0 );
   sendToInRangeSet( packet );
 }
 
@@ -372,7 +372,7 @@ Change the current target and propagate to in range players
 void Sapphire::Entity::Chara::changeTarget( uint64_t targetId )
 {
   setTargetId( targetId );
-  FFXIVPacketBasePtr packet = makeActorControl144( m_id, SetTarget, 0, 0, 0, 0, targetId );
+  FFXIVPacketBasePtr packet = makeActorControlTarget( m_id, SetTarget, 0, 0, 0, 0, targetId );
   sendToInRangeSet( packet );
 }
 
@@ -602,7 +602,7 @@ void Sapphire::Entity::Chara::removeStatusEffect( uint8_t effectSlotId )
   auto pEffect = pEffectIt->second;
   pEffect->removeStatus();
 
-  sendToInRangeSet( makeActorControl142( getId(), StatusEffectLose, pEffect->getId() ), isPlayer() );
+  sendToInRangeSet( makeActorControl( getId(), StatusEffectLose, pEffect->getId() ), isPlayer() );
 
   m_statusEffectMap.erase( effectSlotId );
 
@@ -718,15 +718,15 @@ void Sapphire::Entity::Chara::updateStatusEffects()
   if( thisTickDmg != 0 )
   {
     takeDamage( thisTickDmg );
-    sendToInRangeSet( makeActorControl142( getId(), HPFloatingText, 0,
-                                           static_cast< uint8_t >( ActionEffectType::Damage ), thisTickDmg ) );
+    sendToInRangeSet( makeActorControl( getId(), HPFloatingText, 0,
+                                        static_cast< uint8_t >( ActionEffectType::Damage ), thisTickDmg ) );
   }
 
   if( thisTickHeal != 0 )
   {
     heal( thisTickDmg );
-    sendToInRangeSet( makeActorControl142( getId(), HPFloatingText, 0,
-                                           static_cast< uint8_t >( ActionEffectType::Heal ), thisTickHeal ) );
+    sendToInRangeSet( makeActorControl( getId(), HPFloatingText, 0,
+                                        static_cast< uint8_t >( ActionEffectType::Heal ), thisTickHeal ) );
   }
 }
 
diff --git a/src/world/Actor/EventObject.cpp b/src/world/Actor/EventObject.cpp
index b95a1550..7287d01f 100644
--- a/src/world/Actor/EventObject.cpp
+++ b/src/world/Actor/EventObject.cpp
@@ -80,7 +80,7 @@ void Sapphire::Entity::EventObject::setState( uint8_t state )
 
   for( const auto& player : m_inRangePlayers )
   {
-    player->queuePacket( makeActorControl142( getId(), DirectorEObjMod, state ) );
+    player->queuePacket( makeActorControl( getId(), DirectorEObjMod, state ) );
   }
 }
 
@@ -88,7 +88,7 @@ void Sapphire::Entity::EventObject::setAnimationFlag( uint32_t flag, uint32_t an
 {
   for( const auto& player : m_inRangePlayers )
   {
-    player->queuePacket( makeActorControl142( getId(), EObjAnimation, flag, animationFlag ) );
+    player->queuePacket( makeActorControl( getId(), EObjAnimation, flag, animationFlag ) );
   }
 }
 
diff --git a/src/world/Actor/Player.cpp b/src/world/Actor/Player.cpp
index 4cebfab7..fde14915 100644
--- a/src/world/Actor/Player.cpp
+++ b/src/world/Actor/Player.cpp
@@ -373,19 +373,19 @@ void Sapphire::Entity::Player::teleport( uint16_t aetheryteId, uint8_t type )
   if( type == 1 ) // teleport
   {
     prepareZoning( data->territory, true, 1, 112 ); // TODO: Really?
-    sendToInRangeSet( makeActorControl142( getId(), ActorDespawnEffect, 0x04 ) );
+    sendToInRangeSet( makeActorControl( getId(), ActorDespawnEffect, 0x04 ) );
     setZoningType( Common::ZoneingType::Teleport );
   }
   else if( type == 2 ) // aethernet
   {
     prepareZoning( data->territory, true, 1, 112 );
-    sendToInRangeSet( makeActorControl142( getId(), ActorDespawnEffect, 0x04 ) );
+    sendToInRangeSet( makeActorControl( getId(), ActorDespawnEffect, 0x04 ) );
     setZoningType( Common::ZoneingType::Teleport );
   }
   else if( type == 3 ) // return
   {
     prepareZoning( data->territory, true, 1, 111 );
-    sendToInRangeSet( makeActorControl142( getId(), ActorDespawnEffect, 0x03 ) );
+    sendToInRangeSet( makeActorControl( getId(), ActorDespawnEffect, 0x03 ) );
     setZoningType( Common::ZoneingType::Return );
   }
 
@@ -565,7 +565,7 @@ void Sapphire::Entity::Player::registerAetheryte( uint8_t aetheryteId )
   Util::valueToFlagByteIndexValue( aetheryteId, value, index );
 
   m_aetheryte[ index ] |= value;
-  queuePacket( makeActorControl143( getId(), LearnTeleport, aetheryteId, 1 ) );
+  queuePacket( makeActorControlSelf( getId(), LearnTeleport, aetheryteId, 1 ) );
 }
 
 bool Sapphire::Entity::Player::isAetheryteRegistered( uint8_t aetheryteId ) const
@@ -656,7 +656,7 @@ void Sapphire::Entity::Player::learnAction( uint16_t actionId )
 
   m_unlocks[ index ] |= value;
 
-  queuePacket( makeActorControl143( getId(), ToggleActionUnlock, actionId, 1 ) );
+  queuePacket( makeActorControlSelf( getId(), ToggleActionUnlock, actionId, 1 ) );
 }
 
 void Sapphire::Entity::Player::learnSong( uint8_t songId, uint32_t itemId )
@@ -667,7 +667,7 @@ void Sapphire::Entity::Player::learnSong( uint8_t songId, uint32_t itemId )
 
   m_orchestrion[ index ] |= value;
 
-  queuePacket( makeActorControl143( getId(), ToggleOrchestrionUnlock, songId, 1, itemId ) );
+  queuePacket( makeActorControlSelf( getId(), ToggleOrchestrionUnlock, songId, 1, itemId ) );
 }
 
 bool Sapphire::Entity::Player::isActionLearned( uint8_t actionId ) const
@@ -691,11 +691,11 @@ void Sapphire::Entity::Player::gainExp( uint32_t amount )
 
   uint32_t neededExpToLevelplus1 = pExdData->get< Sapphire::Data::ParamGrow >( level + 1 )->expToNext;
 
-  queuePacket( makeActorControl143( getId(), GainExpMsg, static_cast< uint8_t >( getClass() ), amount ) );
+  queuePacket( makeActorControlSelf( getId(), GainExpMsg, static_cast< uint8_t >( getClass() ), amount ) );
 
   if( level >= Common::MAX_PLAYER_LEVEL ) // temporary fix for leveling over levelcap
   {
-    queuePacket( makeActorControl143( getId(), UpdateUiExp, static_cast< uint8_t >( getClass() ), amount ) );
+    queuePacket( makeActorControlSelf( getId(), UpdateUiExp, static_cast< uint8_t >( getClass() ), amount ) );
     return;
   }
 
@@ -707,13 +707,13 @@ void Sapphire::Entity::Player::gainExp( uint32_t amount )
              ( currentExp + amount - neededExpToLevel );
     setExp( amount );
     gainLevel();
-    queuePacket( makeActorControl143( getId(), UpdateUiExp, static_cast< uint8_t >( getClass() ), amount ) );
+    queuePacket( makeActorControlSelf( getId(), UpdateUiExp, static_cast< uint8_t >( getClass() ), amount ) );
 
   }
   else
   {
     queuePacket(
-      makeActorControl143( getId(), UpdateUiExp, static_cast< uint8_t >( getClass() ), currentExp + amount ) );
+      makeActorControlSelf( getId(), UpdateUiExp, static_cast< uint8_t >( getClass() ), currentExp + amount ) );
     setExp( currentExp + amount );
   }
 
@@ -742,8 +742,8 @@ void Sapphire::Entity::Player::gainLevel()
   effectListPacket->data().max_mp = getMaxMp();
   sendToInRangeSet( effectListPacket, true );
 
-  sendToInRangeSet( makeActorControl142( getId(), LevelUpEffect, static_cast< uint8_t >( getClass() ),
-                                         getLevel(), getLevel() - 1 ), true );
+  sendToInRangeSet( makeActorControl( getId(), LevelUpEffect, static_cast< uint8_t >( getClass() ),
+                                      getLevel(), getLevel() - 1 ), true );
 
   auto classInfoPacket = makeZonePacket< FFXIVIpcUpdateClassInfo >( getId() );
   classInfoPacket->data().classId = static_cast< uint8_t > ( getClass() );
@@ -824,7 +824,7 @@ void Sapphire::Entity::Player::setClassJob( Common::ClassJob classJob )
   classInfoPacket->data().syncedLevel = getLevel();
   queuePacket( classInfoPacket );
 
-  sendToInRangeSet( makeActorControl142( getId(), ClassJobChange, 0x04 ), true );
+  sendToInRangeSet( makeActorControl( getId(), ClassJobChange, 0x04 ), true );
 
   sendStatusUpdate();
 }
@@ -920,7 +920,7 @@ void Sapphire::Entity::Player::despawn( Entity::PlayerPtr pTarget )
 
   pPlayer->freePlayerSpawnId( getId() );
 
-  pPlayer->queuePacket( makeActorControl143( getId(), DespawnZoneScreenMsg, 0x04, getId(), 0x01 ) );
+  pPlayer->queuePacket( makeActorControlSelf( getId(), DespawnZoneScreenMsg, 0x04, getId(), 0x01 ) );
 }
 
 Sapphire::Entity::ActorPtr Sapphire::Entity::Player::lookupTargetById( uint64_t targetId )
@@ -1016,8 +1016,8 @@ void Sapphire::Entity::Player::setStateFlag( Common::PlayerStateFlag flag )
   auto newOnlineStatus = getOnlineStatus();
 
   if( prevOnlineStatus != newOnlineStatus )
-    sendToInRangeSet( makeActorControl142( getId(), SetStatusIcon,
-                                           static_cast< uint8_t >( getOnlineStatus() ) ), true );
+    sendToInRangeSet( makeActorControl( getId(), SetStatusIcon,
+                                        static_cast< uint8_t >( getOnlineStatus() ) ), true );
 
 }
 
@@ -1053,8 +1053,7 @@ void Sapphire::Entity::Player::unsetStateFlag( Common::PlayerStateFlag flag )
   auto newOnlineStatus = getOnlineStatus();
 
   if( prevOnlineStatus != newOnlineStatus )
-    sendToInRangeSet( makeActorControl142( getId(), SetStatusIcon, static_cast< uint8_t >( getOnlineStatus() ) ),
-                      true );
+    sendToInRangeSet( makeActorControl( getId(), SetStatusIcon, static_cast< uint8_t >( getOnlineStatus() ) ), true );
 }
 
 void Sapphire::Entity::Player::update( uint64_t tickCount )
@@ -1169,7 +1168,7 @@ void Sapphire::Entity::Player::setHomepoint( uint8_t aetheryteId )
 {
   m_homePoint = aetheryteId;
 
-  queuePacket( makeActorControl143( getId(), SetHomepoint, aetheryteId ) );
+  queuePacket( makeActorControlSelf( getId(), SetHomepoint, aetheryteId ) );
 }
 
 /*! get homepoint */
@@ -1347,7 +1346,7 @@ void Sapphire::Entity::Player::sendDebug( const std::string& message ) //Grey Te
 void Sapphire::Entity::Player::sendLogMessage( uint32_t messageId, uint32_t param2, uint32_t param3,
                                            uint32_t param4, uint32_t param5, uint32_t param6 )
 {
-  queuePacket( makeActorControl144( getId(), ActorControlType::LogMsg, messageId, param2, param3, param4, param5, param6 ) );
+  queuePacket( makeActorControlTarget( getId(), ActorControlType::LogMsg, messageId, param2, param3, param4, param5, param6 ) );
 }
 
 void Sapphire::Entity::Player::updateHowtosSeen( uint32_t howToId )
@@ -1429,14 +1428,14 @@ void Sapphire::Entity::Player::sendHateList()
 void Sapphire::Entity::Player::onMobAggro( BNpcPtr pBNpc )
 {
   hateListAdd( pBNpc );
-  queuePacket( makeActorControl142( getId(), ToggleAggro, 1 ) );
+  queuePacket( makeActorControl( getId(), ToggleAggro, 1 ) );
 }
 
 void Sapphire::Entity::Player::onMobDeaggro( BNpcPtr pBNpc )
 {
   hateListRemove( pBNpc );
   if( m_actorIdTohateSlotMap.empty() )
-    queuePacket( makeActorControl142( getId(), ToggleAggro ) );
+    queuePacket( makeActorControl( getId(), ToggleAggro ) );
 }
 
 bool Sapphire::Entity::Player::isLogin() const
@@ -1484,7 +1483,7 @@ void Sapphire::Entity::Player::setTitle( uint16_t titleId )
 
   m_activeTitle = titleId;
 
-  sendToInRangeSet( makeActorControl142( getId(), SetTitle, titleId ), true );
+  sendToInRangeSet( makeActorControl( getId(), SetTitle, titleId ), true );
 }
 
 void Sapphire::Entity::Player::setEquipDisplayFlags( uint8_t state )
@@ -1503,9 +1502,9 @@ uint8_t Sapphire::Entity::Player::getEquipDisplayFlags() const
 void Sapphire::Entity::Player::mount( uint32_t id )
 {
   m_mount = id;
-  sendToInRangeSet( makeActorControl142( getId(), ActorControlType::SetStatus,
+  sendToInRangeSet( makeActorControl( getId(), ActorControlType::SetStatus,
                                          static_cast< uint8_t >( Common::ActorStatus::Mounted ) ), true );
-  sendToInRangeSet( makeActorControl143( getId(), 0x39e, 12 ), true ); //?
+  sendToInRangeSet( makeActorControlSelf( getId(), 0x39e, 12 ), true ); //?
 
   auto mountPacket = makeZonePacket< FFXIVIpcMount >( getId() );
   mountPacket->data().id = id;
@@ -1514,9 +1513,9 @@ void Sapphire::Entity::Player::mount( uint32_t id )
 
 void Sapphire::Entity::Player::dismount()
 {
-  sendToInRangeSet( makeActorControl142( getId(), ActorControlType::SetStatus,
+  sendToInRangeSet( makeActorControl( getId(), ActorControlType::SetStatus,
                                          static_cast< uint8_t >( Common::ActorStatus::Idle ) ), true );
-  sendToInRangeSet( makeActorControl143( getId(), ActorControlType::Dismount, 1 ), true );
+  sendToInRangeSet( makeActorControlSelf( getId(), ActorControlType::Dismount, 1 ), true );
   m_mount = 0;
 }
 
@@ -1530,7 +1529,7 @@ void Sapphire::Entity::Player::spawnCompanion( uint16_t id )
     return;
 
   m_companionId = id;
-  sendToInRangeSet( makeActorControl142( getId(), ActorControlType::ToggleCompanion, id ), true );
+  sendToInRangeSet( makeActorControl( getId(), ActorControlType::ToggleCompanion, id ), true );
 }
 
 uint16_t Sapphire::Entity::Player::getCurrentCompanion() const
@@ -1691,7 +1690,7 @@ void Sapphire::Entity::Player::sendZonePackets()
 
   if( isLogin() )
   {
-    queuePacket( makeActorControl143( getId(), SetCharaGearParamUI, m_equipDisplayFlags, 1 ) );
+    queuePacket( makeActorControlSelf( getId(), SetCharaGearParamUI, m_equipDisplayFlags, 1 ) );
   }
 
   // set flags, will be reset automatically by zoning ( only on client side though )
@@ -1796,8 +1795,8 @@ void
 Sapphire::Entity::Player::sendZoneInPackets( uint32_t param1, uint32_t param2 = 0, uint32_t param3 = 0, uint32_t param4 = 0,
                                              bool shouldSetStatus = false )
 {
-  auto zoneInPacket = makeActorControl143( getId(), ZoneIn, param1, param2, param3, param4 );
-  auto SetStatusPacket = makeActorControl142( getId(), SetStatus, static_cast< uint8_t >( Common::ActorStatus::Idle ) );
+  auto zoneInPacket = makeActorControlSelf( getId(), ZoneIn, param1, param2, param3, param4 );
+  auto SetStatusPacket = makeActorControl( getId(), SetStatus, static_cast< uint8_t >( Common::ActorStatus::Idle ) );
 
   if( !getGmInvis() )
     sendToInRangeSet( zoneInPacket );
@@ -1845,13 +1844,13 @@ void Sapphire::Entity::Player::finishZoning()
 
 void Sapphire::Entity::Player::emote( uint32_t emoteId, uint64_t targetId, bool isSilent )
 {
-  sendToInRangeSet( makeActorControl144( getId(), ActorControlType::Emote,
+  sendToInRangeSet( makeActorControlTarget( getId(), ActorControlType::Emote,
                                          emoteId, 0, isSilent ? 1 : 0, 0, targetId ) );
 }
 
 void Sapphire::Entity::Player::emoteInterrupt()
 {
-  sendToInRangeSet( makeActorControl142( getId(), ActorControlType::EmoteInterrupt ) );
+  sendToInRangeSet( makeActorControl( getId(), ActorControlType::EmoteInterrupt ) );
 }
 
 void Sapphire::Entity::Player::teleportQuery( uint16_t aetheryteId )
@@ -1875,7 +1874,7 @@ void Sapphire::Entity::Player::teleportQuery( uint16_t aetheryteId )
 
     bool insufficientGil = getCurrency( Common::CurrencyType::Gil ) < cost;
     // TODO: figure out what param1 really does
-    queuePacket( makeActorControl143( getId(), TeleportStart, insufficientGil ? 2 : 0, aetheryteId ) );
+    queuePacket( makeActorControlSelf( getId(), TeleportStart, insufficientGil ? 2 : 0, aetheryteId ) );
 
     if( !insufficientGil )
     {
@@ -2083,7 +2082,7 @@ void Sapphire::Entity::Player::updateHuntingLog( uint16_t id )
       if( note1->bNpcName == id && logEntry.entries[ i - 1 ][ x ] < note->count[ x ] )
       {
         logEntry.entries[ i - 1 ][ x ]++;
-        queuePacket( makeActorControl143( getId(), HuntingLogEntryUpdate, monsterNoteId, x, logEntry.entries[ i - 1 ][ x ] ) );
+        queuePacket( makeActorControlSelf( getId(), HuntingLogEntryUpdate, monsterNoteId, x, logEntry.entries[ i - 1 ][ x ] ) );
         logChanged = true;
         sectionChanged = true;
       }
@@ -2092,7 +2091,7 @@ void Sapphire::Entity::Player::updateHuntingLog( uint16_t id )
     }
     if( logChanged && sectionComplete && sectionChanged )
     {
-      queuePacket( makeActorControl143( getId(), HuntingLogSectionFinish, monsterNoteId, i, 0 ) );
+      queuePacket( makeActorControlSelf( getId(), HuntingLogSectionFinish, monsterNoteId, i, 0 ) );
       gainExp( note->reward );
     }
     if( !sectionComplete )
@@ -2102,13 +2101,13 @@ void Sapphire::Entity::Player::updateHuntingLog( uint16_t id )
   }
   if( logChanged && allSectionsComplete )
   {
-    queuePacket( makeActorControl143( getId(), HuntingLogRankFinish, 4, 0, 0 ) );
+    queuePacket( makeActorControlSelf( getId(), HuntingLogRankFinish, 4, 0, 0 ) );
     gainExp( rankRewards[ logEntry.rank ] );
     if( logEntry.rank < 4 )
     {
       logEntry.rank++;
       memset( logEntry.entries, 0, 40 );
-      queuePacket( makeActorControl143( getId(), HuntingLogRankUnlock,
+      queuePacket( makeActorControlSelf( getId(), HuntingLogRankUnlock,
                                         static_cast< uint8_t >( getClass() ), logEntry.rank + 1, 0 ) );
     }
   }
diff --git a/src/world/Actor/PlayerInventory.cpp b/src/world/Actor/PlayerInventory.cpp
index 36459884..211d2f40 100644
--- a/src/world/Actor/PlayerInventory.cpp
+++ b/src/world/Actor/PlayerInventory.cpp
@@ -109,7 +109,7 @@ void Sapphire::Entity::Player::initInventory()
 
 void Sapphire::Entity::Player::sendItemLevel()
 {
-  queuePacket( makeActorControl142( getId(), SetItemLevel, getItemLevel(), 0 ) );
+  queuePacket( makeActorControl( getId(), SetItemLevel, getItemLevel(), 0 ) );
 }
 
 void Sapphire::Entity::Player::equipWeapon( ItemPtr pItem, bool updateClass )
@@ -379,7 +379,7 @@ void Sapphire::Entity::Player::addCrystal( Common::CrystalType type, uint32_t am
                                                                     Common::InventoryType::Crystal,
                                                                     *currItem );
   queuePacket( invUpdate );
-  queuePacket( makeActorControl143( getId(), ItemObtainIcon, static_cast< uint8_t >( type ) + 1, amount ) );
+  queuePacket( makeActorControlSelf( getId(), ItemObtainIcon, static_cast< uint8_t >( type ) + 1, amount ) );
 }
 
 void Sapphire::Entity::Player::removeCrystal( Common::CrystalType type, uint32_t amount )
@@ -603,7 +603,7 @@ Sapphire::ItemPtr Sapphire::Entity::Player::addItem( uint32_t catalogId, uint32_
         // return existing stack if we have no overflow - items fit into a preexisting stack
         if( quantity == 0 )
         {
-          queuePacket( makeActorControl143( getId(), ItemObtainIcon, catalogId, originalQuantity ) );
+          queuePacket( makeActorControlSelf( getId(), ItemObtainIcon, catalogId, originalQuantity ) );
 
           return item;
         }
@@ -635,7 +635,7 @@ Sapphire::ItemPtr Sapphire::Entity::Player::addItem( uint32_t catalogId, uint32_
                                                                       *item );
     queuePacket( invUpdate );
 
-    queuePacket( makeActorControl143( getId(), ItemObtainIcon, catalogId, originalQuantity ) );
+    queuePacket( makeActorControlSelf( getId(), ItemObtainIcon, catalogId, originalQuantity ) );
   }
 
   return item;
diff --git a/src/world/Event/Director.cpp b/src/world/Event/Director.cpp
index 75fcae89..864bf0e3 100644
--- a/src/world/Event/Director.cpp
+++ b/src/world/Event/Director.cpp
@@ -44,7 +44,7 @@ uint8_t Sapphire::Event::Director::getSequence() const
 
 void Sapphire::Event::Director::sendDirectorClear( Sapphire::Entity::Player& player ) const
 {
-  player.queuePacket( makeActorControl143( player.getId(), DirectorClear, m_directorId ) );
+  player.queuePacket( makeActorControlSelf( player.getId(), DirectorClear, m_directorId ) );
 }
 
 void Sapphire::Event::Director::sendDirectorVars( Sapphire::Entity::Player& player ) const
@@ -60,7 +60,7 @@ void Sapphire::Event::Director::sendDirectorVars( Sapphire::Entity::Player& play
 void Sapphire::Event::Director::sendDirectorInit( Sapphire::Entity::Player& player ) const
 {
   Logger::debug( "DirectorID#{}, QuestBattleID#{}", m_directorId, m_contentId );
-  player.queuePacket( makeActorControl143( player.getId(), DirectorInit, m_directorId, m_contentId ) );
+  player.queuePacket( makeActorControlSelf( player.getId(), DirectorInit, m_directorId, m_contentId ) );
 }
 
 Sapphire::Event::Director::DirectorType Sapphire::Event::Director::getType() const
diff --git a/src/world/Manager/HousingMgr.cpp b/src/world/Manager/HousingMgr.cpp
index c9db8f72..028d25cc 100644
--- a/src/world/Manager/HousingMgr.cpp
+++ b/src/world/Manager/HousingMgr.cpp
@@ -427,7 +427,7 @@ bool Sapphire::World::Manager::HousingMgr::relinquishLand( Entity::Player& playe
   // TODO: actually use permissions here for FC houses
   if( !hasPermission( player, *pLand, 0 ) )
   {
-    auto msgPkt = makeActorControl143( player.getId(), ActorControl::LogMsg, 3304, 0 );
+    auto msgPkt = makeActorControlSelf( player.getId(), ActorControl::LogMsg, 3304, 0 );
     player.queuePacket( msgPkt );
     return false;
   }
@@ -436,7 +436,7 @@ bool Sapphire::World::Manager::HousingMgr::relinquishLand( Entity::Player& playe
   // TODO: additionally check for yard items
   if( pLand->getHouse() )
   {
-    auto msgPkt = makeActorControl143( player.getId(), ActorControl::LogMsg, 3315, 0 );
+    auto msgPkt = makeActorControlSelf( player.getId(), ActorControl::LogMsg, 3315, 0 );
     player.queuePacket( msgPkt );
     return false;
   }
@@ -453,8 +453,8 @@ bool Sapphire::World::Manager::HousingMgr::relinquishLand( Entity::Player& playe
 
   player.sendLandFlagsSlot( LandFlagsSlot::Private );
 
-  auto screenMsgPkt2 = makeActorControl143( player.getId(), ActorControl::LogMsg, 3351, 0x1AA,
-                                            pLand->getLandIdent().wardNum + 1, plot + 1 );
+  auto screenMsgPkt2 = makeActorControlSelf( player.getId(), ActorControl::LogMsg, 3351, 0x1AA,
+                                             pLand->getLandIdent().wardNum + 1, plot + 1 );
   player.queuePacket( screenMsgPkt2 );
   pHousing->sendLandUpdate( plot );
 
@@ -692,7 +692,7 @@ void Sapphire::World::Manager::HousingMgr::buildPresetEstate( Entity::Player& pl
   pLand->setLandType( LandType::Private );
   hZone->sendLandUpdate( plotNum );
 
-  auto pSuccessBuildingPacket = makeActorControl142( player.getId(), ActorControl::BuildPresetResponse, plotNum );
+  auto pSuccessBuildingPacket = makeActorControl( player.getId(), ActorControl::BuildPresetResponse, plotNum );
 
   player.queuePacket( pSuccessBuildingPacket );
 
@@ -1034,7 +1034,7 @@ void Sapphire::World::Manager::HousingMgr::reqPlaceHousingItem( Sapphire::Entity
     status = placeInteriorItem( player, item );
 
   if( status )
-    player.queuePacket( Server::makeActorControl143( player.getId(), 0x3f3 ) );
+    player.queuePacket( Server::makeActorControlSelf( player.getId(), 0x3f3 ) );
   else
     player.sendUrgent( "An internal error occurred when placing the item." );
 }
@@ -1298,7 +1298,8 @@ bool Sapphire::World::Manager::HousingMgr::moveInternalItem( Entity::Player& pla
   // send confirmation to player
   uint32_t param1 = ( ident.landId << 16 ) | containerId;
 
-  player.queuePacket( Server::makeActorControl143( player.getId(), ActorControl::HousingItemMoveConfirm, param1, slotIdx ) );
+  player.queuePacket(
+    Server::makeActorControlSelf( player.getId(), ActorControl::HousingItemMoveConfirm, param1, slotIdx ) );
 
   return true;
 }
@@ -1333,7 +1334,7 @@ bool Sapphire::World::Manager::HousingMgr::moveExternalItem( Entity::Player& pla
   terri.updateYardObjectPos( player, slot, ident.landId, *item );
 
   uint32_t param1 = ( ident.landId << 16 ) | InventoryType::HousingExteriorPlacedItems;
-  player.queuePacket( Server::makeActorControl143( player.getId(), ActorControl::HousingItemMoveConfirm, param1, slot ) );
+  player.queuePacket( Server::makeActorControlSelf( player.getId(), ActorControl::HousingItemMoveConfirm, param1, slot ) );
 
 
   return true;
@@ -1567,7 +1568,7 @@ void Sapphire::World::Manager::HousingMgr::reqEstateExteriorRemodel( Sapphire::E
 
   invMgr->sendInventoryContainer( player, it->second );
 
-  auto pkt = Server::makeActorControl143( player.getId(), Network::ActorControl::ShowEstateExternalAppearanceUI, plot );
+  auto pkt = Server::makeActorControlSelf( player.getId(), Network::ActorControl::ShowEstateExternalAppearanceUI, plot );
   player.queuePacket( pkt );
 
 }
@@ -1597,7 +1598,7 @@ void Sapphire::World::Manager::HousingMgr::reqEstateInteriorRemodel( Sapphire::E
 
   invMgr->sendInventoryContainer( player, it->second );
 
-  auto pkt = Server::makeActorControl143( player.getId(), Network::ActorControl::ShowEstateInternalAppearanceUI );
+  auto pkt = Server::makeActorControlSelf( player.getId(), Network::ActorControl::ShowEstateInternalAppearanceUI );
   player.queuePacket( pkt );
 }
 
diff --git a/src/world/Network/Handlers/ClientTriggerHandler.cpp b/src/world/Network/Handlers/ClientTriggerHandler.cpp
index 3286469f..08d44118 100644
--- a/src/world/Network/Handlers/ClientTriggerHandler.cpp
+++ b/src/world/Network/Handlers/ClientTriggerHandler.cpp
@@ -52,7 +52,7 @@ void examineHandler( Sapphire::FrameworkPtr pFw, Sapphire::Entity::Player& playe
     {
       if( pTarget->isActingAsGm() || pTarget->getZoneId() != player.getZoneId() )
       {
-        player.queuePacket( makeActorControl142( player.getId(), ActorControlType::ExamineError ) );
+        player.queuePacket( makeActorControl( player.getId(), ActorControlType::ExamineError ) );
       }
       else
       {
@@ -95,7 +95,7 @@ void Sapphire::Network::GameConnection::clientTriggerHandler( FrameworkPtr pFw,
         player.setAutoattack( false );
       }
 
-      player.sendToInRangeSet( makeActorControl142( player.getId(), 0, param11, 1 ) );
+      player.sendToInRangeSet( makeActorControl( player.getId(), 0, param11, 1 ) );
 
       break;
     }
@@ -109,7 +109,7 @@ void Sapphire::Network::GameConnection::clientTriggerHandler( FrameworkPtr pFw,
       else
         player.setAutoattack( false );
 
-      player.sendToInRangeSet( makeActorControl142( player.getId(), 1, param11, 1 ) );
+      player.sendToInRangeSet( makeActorControl( player.getId(), 1, param11, 1 ) );
 
       break;
     }
@@ -207,9 +207,9 @@ void Sapphire::Network::GameConnection::clientTriggerHandler( FrameworkPtr pFw,
         player.setPersistentEmote( emoteData->emoteMode );
         player.setStatus( Common::ActorStatus::EmoteMode );
 
-        player.sendToInRangeSet( makeActorControl142( player.getId(), ActorControlType::SetStatus,
-                                                      static_cast< uint8_t >( Common::ActorStatus::EmoteMode ),
-                                                      emoteData->hasCancelEmote ? 1 : 0 ), true );
+        player.sendToInRangeSet( makeActorControl( player.getId(), ActorControlType::SetStatus,
+                                                            static_cast< uint8_t >( Common::ActorStatus::EmoteMode ),
+                                                            emoteData->hasCancelEmote ? 1 : 0 ), true );
       }
 
       if( emoteData->drawsWeapon )
@@ -229,8 +229,7 @@ void Sapphire::Network::GameConnection::clientTriggerHandler( FrameworkPtr pFw,
       player.setPersistentEmote( 0 );
       player.emoteInterrupt();
       player.setStatus( Common::ActorStatus::Idle );
-      auto pSetStatusPacket = makeActorControl142( player.getId(), SetStatus,
-                                                   static_cast< uint8_t >( Common::ActorStatus::Idle ) );
+      auto pSetStatusPacket = makeActorControl( player.getId(), SetStatus, static_cast< uint8_t >( Common::ActorStatus::Idle ) );
       player.sendToInRangeSet( pSetStatusPacket );
       break;
     }
@@ -238,14 +237,14 @@ void Sapphire::Network::GameConnection::clientTriggerHandler( FrameworkPtr pFw,
     case ClientTriggerType::PoseReapply: // reapply pose
     {
       player.setPose( param12 );
-      auto pSetStatusPacket = makeActorControl142( player.getId(), SetPose, param11, param12 );
+      auto pSetStatusPacket = makeActorControl( player.getId(), SetPose, param11, param12 );
       player.sendToInRangeSet( pSetStatusPacket, true );
       break;
     }
     case ClientTriggerType::PoseCancel: // cancel pose
     {
       player.setPose( param12 );
-      auto pSetStatusPacket = makeActorControl142( player.getId(), SetPose, param11, param12 );
+      auto pSetStatusPacket = makeActorControl( player.getId(), SetPose, param11, param12 );
       player.sendToInRangeSet( pSetStatusPacket, true );
       break;
     }
@@ -320,7 +319,7 @@ void Sapphire::Network::GameConnection::clientTriggerHandler( FrameworkPtr pFw,
 
       player.setActiveLand( param11, hZone->getWardNum() );
 
-      auto pShowBuildPresetUIPacket = makeActorControl142( player.getId(), ShowBuildPresetUI, param11 );
+      auto pShowBuildPresetUIPacket = makeActorControl( player.getId(), ShowBuildPresetUI, param11 );
       player.queuePacket( pShowBuildPresetUIPacket );
 
       break;
@@ -404,7 +403,7 @@ void Sapphire::Network::GameConnection::clientTriggerHandler( FrameworkPtr pFw,
 
       uint8_t ward = ( param12 >> 16 ) & 0xFF;
       uint8_t plot = ( param12 & 0xFF );
-      auto pShowHousingItemUIPacket = makeActorControl142( player.getId(), ShowHousingItemUI, 0, plot );
+      auto pShowHousingItemUIPacket = makeActorControl( player.getId(), ShowHousingItemUI, 0, plot );
 
       player.queuePacket( pShowHousingItemUIPacket );
 
diff --git a/src/world/Network/Handlers/GMCommandHandlers.cpp b/src/world/Network/Handlers/GMCommandHandlers.cpp
index b2f48567..252bb313 100644
--- a/src/world/Network/Handlers/GMCommandHandlers.cpp
+++ b/src/world/Network/Handlers/GMCommandHandlers.cpp
@@ -228,7 +228,7 @@ void Sapphire::Network::GameConnection::gm1Handler( FrameworkPtr pFw,
     }
     case GmCommand::Speed:
     {
-      targetPlayer->queuePacket( makeActorControl143( player.getId(), Flee, param1 ) );
+      targetPlayer->queuePacket( makeActorControlSelf( player.getId(), Flee, param1 ) );
       player.sendNotice( "Speed for {0} was set to {1}", targetPlayer->getName(), param1 );
       break;
     }
@@ -267,8 +267,8 @@ void Sapphire::Network::GameConnection::gm1Handler( FrameworkPtr pFw,
       strcpy( searchInfoPacket->data().searchMessage, targetPlayer->getSearchMessage() );
       targetPlayer->queuePacket( searchInfoPacket );
 
-      targetPlayer->sendToInRangeSet( makeActorControl142( player.getId(), SetStatusIcon,
-                                                           static_cast< uint8_t >( player.getOnlineStatus() ) ),
+      targetPlayer->sendToInRangeSet( makeActorControl( player.getId(), SetStatusIcon,
+                                                        static_cast< uint8_t >( player.getOnlineStatus() ) ),
                                       true );
       player.sendNotice( "Icon for {0} was set to {1}", targetPlayer->getName(), param1 );
       break;
@@ -643,9 +643,9 @@ void Sapphire::Network::GameConnection::gm2Handler( FrameworkPtr pFw,
       targetPlayer->sendZoneInPackets( 0x01, 0x01, 0, 113, true );
 
 
-      targetPlayer->sendToInRangeSet( makeActorControl143( player.getId(), ZoneIn, 0x01, 0x01, 0, 113 ), true );
-      targetPlayer->sendToInRangeSet( makeActorControl142( player.getId(), SetStatus,
-                                                           static_cast< uint8_t >( Common::ActorStatus::Idle ) ),
+      targetPlayer->sendToInRangeSet( makeActorControlSelf( player.getId(), ZoneIn, 0x01, 0x01, 0, 113 ), true );
+      targetPlayer->sendToInRangeSet( makeActorControl( player.getId(), SetStatus,
+                                                        static_cast< uint8_t >( Common::ActorStatus::Idle ) ),
                                       true );
       player.sendNotice( "Raised {0}", targetPlayer->getName() );
       break;
diff --git a/src/world/Network/Handlers/PacketHandlers.cpp b/src/world/Network/Handlers/PacketHandlers.cpp
index 8b51595d..4b3c83a4 100644
--- a/src/world/Network/Handlers/PacketHandlers.cpp
+++ b/src/world/Network/Handlers/PacketHandlers.cpp
@@ -95,8 +95,8 @@ void Sapphire::Network::GameConnection::setSearchInfoHandler( FrameworkPtr pFw,
   strcpy( searchInfoPacket->data().searchMessage, player.getSearchMessage() );
   queueOutPacket( searchInfoPacket );
 
-  player.sendToInRangeSet( makeActorControl142( player.getId(), SetStatusIcon,
-                                                static_cast< uint8_t >( player.getOnlineStatus() ) ), true );
+  player.sendToInRangeSet( makeActorControl( player.getId(), SetStatusIcon,
+                                             static_cast< uint8_t >( player.getOnlineStatus() ) ), true );
 }
 
 void Sapphire::Network::GameConnection::reqSearchInfoHandler( FrameworkPtr pFw,
diff --git a/src/world/Network/PacketWrappers/ActorControlPacket.h b/src/world/Network/PacketWrappers/ActorControlPacket.h
index 99a70b77..8566d7fe 100644
--- a/src/world/Network/PacketWrappers/ActorControlPacket.h
+++ b/src/world/Network/PacketWrappers/ActorControlPacket.h
@@ -39,7 +39,7 @@ namespace Sapphire::Network::Packets::Server
   };
 
   template< typename... Args >
-  std::shared_ptr< ActorControlPacket > makeActorControl142( Args... args )
+  std::shared_ptr< ActorControlPacket > makeActorControl( Args... args )
   {
     return std::make_shared< ActorControlPacket >( args... );
   }
diff --git a/src/world/Network/PacketWrappers/ActorControlSelfPacket.h b/src/world/Network/PacketWrappers/ActorControlSelfPacket.h
index 58f0e617..bfd343a5 100644
--- a/src/world/Network/PacketWrappers/ActorControlSelfPacket.h
+++ b/src/world/Network/PacketWrappers/ActorControlSelfPacket.h
@@ -43,7 +43,7 @@ namespace Sapphire::Network::Packets::Server
   };
 
   template< typename... Args >
-  std::shared_ptr< ActorControlSelfPacket > makeActorControl143( Args... args )
+  std::shared_ptr< ActorControlSelfPacket > makeActorControlSelf( Args... args )
   {
     return std::make_shared< ActorControlSelfPacket >( args... );
   }
diff --git a/src/world/Network/PacketWrappers/ActorControlTargetPacket.h b/src/world/Network/PacketWrappers/ActorControlTargetPacket.h
index f80046b7..7c99f95b 100644
--- a/src/world/Network/PacketWrappers/ActorControlTargetPacket.h
+++ b/src/world/Network/PacketWrappers/ActorControlTargetPacket.h
@@ -41,7 +41,7 @@ namespace Sapphire::Network::Packets::Server
   };
 
   template< typename... Args >
-  std::shared_ptr< ActorControlTargetPacket > makeActorControl144( Args... args )
+  std::shared_ptr< ActorControlTargetPacket > makeActorControlTarget( Args... args )
   {
     return std::make_shared< ActorControlTargetPacket >( args... );
   }
diff --git a/src/world/Territory/Housing/HousingInteriorTerritory.cpp b/src/world/Territory/Housing/HousingInteriorTerritory.cpp
index eff95302..a3ccf34e 100644
--- a/src/world/Territory/Housing/HousingInteriorTerritory.cpp
+++ b/src/world/Territory/Housing/HousingInteriorTerritory.cpp
@@ -99,7 +99,8 @@ void Sapphire::World::Territory::Housing::HousingInteriorTerritory::onPlayerZone
   }
 
   if( isFcHouse )
-    player.queuePacket( Server::makeActorControl143( player.getId(), Network::ActorControl::HideAdditionalChambersDoor ) );
+    player.queuePacket(
+      Server::makeActorControlSelf( player.getId(), Network::ActorControl::HideAdditionalChambersDoor ) );
 }
 
 void Sapphire::World::Territory::Housing::HousingInteriorTerritory::onUpdate( uint64_t tickCount )
@@ -223,7 +224,8 @@ void Sapphire::World::Territory::Housing::HousingInteriorTerritory::removeHousin
 
   for( const auto& player : m_playerMap )
   {
-    auto pkt = Server::makeActorControl143( player.second->getId(), Network::ActorControl::RemoveInteriorHousingItem, slot );
+    auto pkt = Server::makeActorControlSelf( player.second->getId(), Network::ActorControl::RemoveInteriorHousingItem,
+                                             slot );
 
     player.second->queuePacket( pkt );
   }
diff --git a/src/world/Territory/HousingZone.cpp b/src/world/Territory/HousingZone.cpp
index 1473ff62..99ab1a1d 100644
--- a/src/world/Territory/HousingZone.cpp
+++ b/src/world/Territory/HousingZone.cpp
@@ -413,7 +413,8 @@ void Sapphire::HousingZone::despawnYardObject( uint16_t landId, uint16_t slot )
   for( const auto& player : m_playerMap )
   {
     auto param = ( landId << 16 ) | slot;
-    auto pkt = Server::makeActorControl143( player.second->getId(), Network::ActorControl::RemoveExteriorHousingItem, param );
+    auto pkt = Server::makeActorControlSelf( player.second->getId(), Network::ActorControl::RemoveExteriorHousingItem,
+                                             param );
 
     player.second->queuePacket( pkt );
   }
diff --git a/src/world/Territory/InstanceContent.cpp b/src/world/Territory/InstanceContent.cpp
index c0467fc5..1f902685 100644
--- a/src/world/Territory/InstanceContent.cpp
+++ b/src/world/Territory/InstanceContent.cpp
@@ -130,9 +130,9 @@ void Sapphire::InstanceContent::onUpdate( uint64_t tickCount )
       for( const auto& playerIt : m_playerMap )
       {
         auto pPlayer = playerIt.second;
-        pPlayer->queuePacket( makeActorControl143( pPlayer->getId(), DirectorUpdate,
-                                                   getDirectorId(), 0x40000001,
-                                                   m_instanceConfiguration->timeLimitmin * 60u ) );
+        pPlayer->queuePacket( makeActorControlSelf( pPlayer->getId(), DirectorUpdate,
+                                                    getDirectorId(), 0x40000001,
+                                                    m_instanceConfiguration->timeLimitmin * 60u ) );
       }
 
       if( m_pEntranceEObj )
@@ -176,7 +176,7 @@ void Sapphire::InstanceContent::onInitDirector( Entity::Player& player )
 
 void Sapphire::InstanceContent::onDirectorSync( Entity::Player& player )
 {
-  player.queuePacket( makeActorControl143( player.getId(), DirectorUpdate, 0x00110001, 0x80000000, 1 ) );
+  player.queuePacket( makeActorControlSelf( player.getId(), DirectorUpdate, 0x00110001, 0x80000000, 1 ) );
 }
 
 
@@ -282,7 +282,7 @@ void Sapphire::InstanceContent::startQte()
   for( const auto& playerIt : m_playerMap )
   {
     auto player = playerIt.second;
-    player->queuePacket( makeActorControl143( player->getId(), DirectorUpdate, getDirectorId(), 0x8000000A ) );
+    player->queuePacket( makeActorControlSelf( player->getId(), DirectorUpdate, getDirectorId(), 0x8000000A ) );
   }
 }
 
@@ -292,7 +292,7 @@ void Sapphire::InstanceContent::startEventCutscene()
   for( const auto& playerIt : m_playerMap )
   {
     auto player = playerIt.second;
-    player->queuePacket( makeActorControl143( player->getId(), DirectorUpdate, getDirectorId(), 0x80000008 ) );
+    player->queuePacket( makeActorControlSelf( player->getId(), DirectorUpdate, getDirectorId(), 0x80000008 ) );
   }
 }
 
@@ -301,7 +301,7 @@ void Sapphire::InstanceContent::endEventCutscene()
   for( const auto& playerIt : m_playerMap )
   {
     auto player = playerIt.second;
-    player->queuePacket( makeActorControl143( player->getId(), DirectorUpdate, getDirectorId(), 0x80000009 ) );
+    player->queuePacket( makeActorControlSelf( player->getId(), DirectorUpdate, getDirectorId(), 0x80000009 ) );
   }
 }
 
@@ -412,13 +412,13 @@ void Sapphire::InstanceContent::setCurrentBGM( uint16_t bgmIndex )
     // also do note that this code can't control the bgm granularly. (i.e. per player for WoD submap.) oops.
     // player->queuePacket( ActorControlSelfPacket( player->getId(), DirectorUpdate, getDirectorId(), 0x80000001, 1 ) );
     player->queuePacket(
-      makeActorControl143( player->getId(), DirectorUpdate, getDirectorId(), 0x80000001, bgmIndex ) );
+      makeActorControlSelf( player->getId(), DirectorUpdate, getDirectorId(), 0x80000001, bgmIndex ) );
   }
 }
 
 void Sapphire::InstanceContent::setPlayerBGM( Sapphire::Entity::Player& player, uint16_t bgmId )
 {
-  player.queuePacket( makeActorControl143( player.getId(), DirectorUpdate, getDirectorId(), 0x80000001, bgmId ) );
+  player.queuePacket( makeActorControlSelf( player.getId(), DirectorUpdate, getDirectorId(), 0x80000001, bgmId ) );
 }
 
 uint16_t Sapphire::InstanceContent::getCurrentBGM() const
diff --git a/src/world/Territory/QuestBattle.cpp b/src/world/Territory/QuestBattle.cpp
index 8bcc518c..a5dd3a0a 100644
--- a/src/world/Territory/QuestBattle.cpp
+++ b/src/world/Territory/QuestBattle.cpp
@@ -177,7 +177,7 @@ void Sapphire::QuestBattle::onInitDirector( Entity::Player& player )
 
 void Sapphire::QuestBattle::onDirectorSync( Entity::Player& player )
 {
-  player.queuePacket( makeActorControl143( player.getId(), DirectorUpdate, 0x00110001, 0x80000000, 1 ) );
+  player.queuePacket( makeActorControlSelf( player.getId(), DirectorUpdate, 0x00110001, 0x80000000, 1 ) );
 }
 
 void Sapphire::QuestBattle::setVar( uint8_t index, uint8_t value )
@@ -267,17 +267,17 @@ void Sapphire::QuestBattle::setBranch( uint8_t value )
 
 void Sapphire::QuestBattle::startQte()
 {
-  m_pPlayer->queuePacket( makeActorControl143( m_pPlayer->getId(), DirectorUpdate, getDirectorId(), 0x8000000A ) );
+  m_pPlayer->queuePacket( makeActorControlSelf( m_pPlayer->getId(), DirectorUpdate, getDirectorId(), 0x8000000A ) );
 }
 
 void Sapphire::QuestBattle::startEventCutscene()
 {
-  m_pPlayer->queuePacket( makeActorControl143( m_pPlayer->getId(), DirectorUpdate, getDirectorId(), 0x80000008 ) );
+  m_pPlayer->queuePacket( makeActorControlSelf( m_pPlayer->getId(), DirectorUpdate, getDirectorId(), 0x80000008 ) );
 }
 
 void Sapphire::QuestBattle::endEventCutscene()
 {
-  m_pPlayer->queuePacket( makeActorControl143( m_pPlayer->getId(), DirectorUpdate, getDirectorId(), 0x80000009 ) );
+  m_pPlayer->queuePacket( makeActorControlSelf( m_pPlayer->getId(), DirectorUpdate, getDirectorId(), 0x80000009 ) );
 }
 
 void Sapphire::QuestBattle::onRegisterEObj( Entity::EventObjectPtr object )
diff --git a/src/world/Territory/Territory.cpp b/src/world/Territory/Territory.cpp
index 765d4b1f..910a7785 100644
--- a/src/world/Territory/Territory.cpp
+++ b/src/world/Territory/Territory.cpp
@@ -165,7 +165,7 @@ void Sapphire::Territory::setCurrentFestival( uint16_t festivalId, uint16_t addi
   {
     auto player = playerEntry.second;
 
-    auto enableFestival = makeActorControl143( player->getId(), SetFestival, festivalId, additionalFestivalId );
+    auto enableFestival = makeActorControlSelf( player->getId(), SetFestival, festivalId, additionalFestivalId );
     playerEntry.second->queuePacket( enableFestival );
   }
 }

From d41e3dbef0cfb488b1417933452fea644c45f29f Mon Sep 17 00:00:00 2001
From: Flavien Normand <contact@flavien-normand.fr>
Date: Thu, 10 Oct 2019 21:02:26 +0200
Subject: [PATCH 141/351] Update DesynthResult actorControl

---
 src/common/Network/CommonActorControl.h | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/src/common/Network/CommonActorControl.h b/src/common/Network/CommonActorControl.h
index f620b381..428431dd 100644
--- a/src/common/Network/CommonActorControl.h
+++ b/src/common/Network/CommonActorControl.h
@@ -208,11 +208,18 @@ namespace Sapphire::Network::ActorControl
 
     /*!
      * Sent when a player desynths an item, one packet per result type (one for consumed item, one for each obtained items, and one for exp if the player received exp)
-     * param1 = result type (4921 => Item consumed, 4922 => Item obtained, 4925 => Exp obtained)
-     * param3 = item id (used for result types 4921 & 4922)
+     * param1 = result type
+     *          4921 => Desynth item consumed
+     *          4922 => Desynth item obtained
+     *          4925 => Desynth exp obtained)
+     *          3553 => Reduction item used
+     *          3555 => Reduction item obtained
+     * param3 = u16 item id
+     *          u16 HQ item (when it's reduction, this one is Collectability score)
+     * param4 = item amount (used only for reduction it seems)
      * param5 = exp amount (x 100)
      */
-    DesynthResult = 0x20F,
+    DesynthOrReductionResult = 0x20F,
 
     GilTrailMsg = 0x211,
 

From eb75b35e7dd5cc142b37c9e1f534a3c11aef093e Mon Sep 17 00:00:00 2001
From: Mordred <ffxivsapphire@gmail.com>
Date: Thu, 10 Oct 2019 22:58:59 +0200
Subject: [PATCH 142/351] Some packet cleanup, long overdue

---
 src/common/Network/PacketDef/Ipcs.h               | 13 ++++---------
 src/common/Network/PacketDef/Zone/ServerZoneDef.h |  9 +++++----
 2 files changed, 9 insertions(+), 13 deletions(-)

diff --git a/src/common/Network/PacketDef/Ipcs.h b/src/common/Network/PacketDef/Ipcs.h
index a26e11d7..8ffe9347 100644
--- a/src/common/Network/PacketDef/Ipcs.h
+++ b/src/common/Network/PacketDef/Ipcs.h
@@ -55,7 +55,7 @@ namespace Sapphire::Network::Packets
     ActorControl = 0x0142,
     ActorControlSelf = 0x0143,
     ActorControlTarget = 0x0144,
-    UpdateHpMpTp = 0x0145,
+    UpdateHpMpTp = 0x0145, // used when resting
 
     ///////////////////////////////////////////////////
 
@@ -137,9 +137,7 @@ namespace Sapphire::Network::Packets
     ActorSetPos = 0x0184, // updated 5.0
 
     ActorCast = 0x0186, // updated 5.0
-
     SomeCustomiseChangePacketProbably = 0x0187, // added 5.0
-
     PartyList = 0x0188, // updated 5.0
     HateRank = 0x0189, // updated 5.0
     HateList = 0x018A, // updated 5.0
@@ -166,7 +164,6 @@ namespace Sapphire::Network::Packets
     ContainerInfo = 0x01A2, // updated 5.0
     InventoryTransactionFinish = 0x01A3, // updated 5.0
     InventoryTransaction = 0x01A4, // updated 5.0
-
     CurrencyCrystalInfo = 0x01A5, // updated 5.0
 
     InventoryActionAck = 0x01A7, // updated 5.0
@@ -244,11 +241,9 @@ namespace Sapphire::Network::Packets
     PrepareZoning = 0x02A4, // updated 5.0
     ActorGauge = 0x0292, // updated 4.3
 
-    // Unknown IPC types that still need to be sent
-    // TODO: figure all these out properly
-    // daily quest related, init seed and current quota probably
-    IPCTYPE_UNK_320 = 0x025E, // updated 5.0
-    IPCTYPE_UNK_322 = 0x0260, // updated 5.0
+    // daily quest info -> without them sent,  login will take longer...
+    DailyQuests = 0x025E, // updated 5.0
+    DailyQuestRepeatFlags = 0x0260, // updated 5.0
 
     /// Doman Mahjong //////////////////////////////////////
     MahjongOpenGui = 0x02A4, // only available in mahjong instance
diff --git a/src/common/Network/PacketDef/Zone/ServerZoneDef.h b/src/common/Network/PacketDef/Zone/ServerZoneDef.h
index 992b87a1..8812e17f 100644
--- a/src/common/Network/PacketDef/Zone/ServerZoneDef.h
+++ b/src/common/Network/PacketDef/Zone/ServerZoneDef.h
@@ -520,8 +520,9 @@ namespace Sapphire::Network::Packets::Server
     /* 0000 */ uint32_t hp;
     /* 0004 */ uint16_t mp;
     /* 0006 */ uint16_t tp;
-    /* 0008 */ uint32_t unknown_8;
-    /* 000C */ uint32_t unknown_12;
+    /* 0008 */ uint16_t gp;
+    /* 0010 */ uint16_t unknown_10;
+    /* 0012 */ uint32_t unknown_12;
   };
 
 
@@ -1557,7 +1558,7 @@ namespace Sapphire::Network::Packets::Server
   /**
   * UNKOWN TYPE
   */
-  struct FFXIVARR_IPC_UNK322 : FFXIVIpcBasePacket< IPCTYPE_UNK_322 >
+  struct FFXIVARR_IPC_UNK322 : FFXIVIpcBasePacket< DailyQuestRepeatFlags >
   {
     /* 0000 */ uint8_t unk[8];
   };
@@ -1565,7 +1566,7 @@ namespace Sapphire::Network::Packets::Server
   /**
   * UNKOWN TYPE
   */
-  struct FFXIVARR_IPC_UNK320 : FFXIVIpcBasePacket< IPCTYPE_UNK_320 >
+  struct FFXIVARR_IPC_UNK320 : FFXIVIpcBasePacket< DailyQuests >
   {
     /* 0000 */ uint8_t unk[0x38];
   };

From cbb00b9cb393e68255ec96fd348e38aae897c0fe Mon Sep 17 00:00:00 2001
From: karashiiro <49822414+karashiiro@users.noreply.github.com>
Date: Thu, 10 Oct 2019 14:47:35 -0700
Subject: [PATCH 143/351] MarketCity enum

---
 src/common/Common.h                               | 10 ++++++++++
 src/common/Network/PacketDef/Zone/ServerZoneDef.h | 10 +---------
 2 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/src/common/Common.h b/src/common/Common.h
index 7bb57000..21e6ba60 100644
--- a/src/common/Common.h
+++ b/src/common/Common.h
@@ -993,6 +993,16 @@ namespace Sapphire::Common
     CircularAoEPlaced = 7
   };
 
+  enum MarketCity : uint8_t
+  {
+    LimsaLominsa = 1,
+    Gridania = 2,
+    Uldah = 3,
+    Ishgard = 4,
+    Kugane = 7,
+    Crystarium = 10
+  }
+
   enum class Role : uint8_t
   {
     None,
diff --git a/src/common/Network/PacketDef/Zone/ServerZoneDef.h b/src/common/Network/PacketDef/Zone/ServerZoneDef.h
index 8812e17f..fe376702 100644
--- a/src/common/Network/PacketDef/Zone/ServerZoneDef.h
+++ b/src/common/Network/PacketDef/Zone/ServerZoneDef.h
@@ -322,15 +322,7 @@ namespace Sapphire::Network::Packets::Server
       bool hq;
       uint8_t materiaCount;
       uint8_t onMannequin;
-      /**
-       * 0x01 Limsa Lominsa
-       * 0x02 Gridania
-       * 0x03 Ul'dah
-       * 0x04 Ishgard
-       * 0x07 Kugane
-       * 0x0A Crystarium
-       */
-      uint8_t retainerCity;
+      Common::MarketCity marketCity;
       uint16_t dyeId;
       uint16_t padding3;
       uint32_t padding4;

From 734e550471313289f9fba8c10f28c7db9fed2538 Mon Sep 17 00:00:00 2001
From: Supamiu <contact@flavien-normand.fr>
Date: Fri, 11 Oct 2019 19:44:49 +0200
Subject: [PATCH 144/351] Fixes for DesynthOrReductionResult packet def

---
 src/common/Network/CommonActorControl.h | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/common/Network/CommonActorControl.h b/src/common/Network/CommonActorControl.h
index 428431dd..b69937a9 100644
--- a/src/common/Network/CommonActorControl.h
+++ b/src/common/Network/CommonActorControl.h
@@ -214,10 +214,11 @@ namespace Sapphire::Network::ActorControl
      *          4925 => Desynth exp obtained)
      *          3553 => Reduction item used
      *          3555 => Reduction item obtained
-     * param3 = u16 item id
-     *          u16 HQ item (when it's reduction, this one is Collectability score)
+     * param3 = u32 item id (+100 000 if item is HQ)
      * param4 = item amount (used only for reduction it seems)
      * param5 = exp amount (x 100)
+     * 
+     * Idk exactly how reduce's param3 is formatted, it seems like it's item id + 500 000 but it seems too... shady.
      */
     DesynthOrReductionResult = 0x20F,
 

From c21ef703daabff116bdb95d06f4f1ec64ef9b5cf Mon Sep 17 00:00:00 2001
From: Supamiu <contact@flavien-normand.fr>
Date: Fri, 11 Oct 2019 22:59:15 +0200
Subject: [PATCH 145/351] Add description for AetherReductionDlg ActorControl
 packet

---
 src/common/Network/CommonActorControl.h | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/src/common/Network/CommonActorControl.h b/src/common/Network/CommonActorControl.h
index f620b381..734b3d83 100644
--- a/src/common/Network/CommonActorControl.h
+++ b/src/common/Network/CommonActorControl.h
@@ -175,6 +175,14 @@ namespace Sapphire::Network::ActorControl
 
     RelicInfuseMsg = 0x179,
 
+    /*!
+     * Sent as result of an aetherial reduction.
+     * param1 = Reduced item ID + 500 000 (idk what this 500 000 is but it's always here no matter what)
+     * param2 = First result item id (+ 1 000 000 if HQ)
+     * param3 = First result item quantity
+     * param4 = (Optional) Second result item id (+ 1 000 000 if HQ)
+     * param5 = (Optional) Second result item quantity
+     */ 
     AetherReductionDlg = 0x17D,
 
     /*!

From 6746e51dcbbfc6e55c136979f8e7ea8a688477b8 Mon Sep 17 00:00:00 2001
From: Supamiu <contact@flavien-normand.fr>
Date: Fri, 11 Oct 2019 23:04:45 +0200
Subject: [PATCH 146/351] Add more details about CraftingUnk ActorControl
 packet

---
 src/common/Network/CommonActorControl.h | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/src/common/Network/CommonActorControl.h b/src/common/Network/CommonActorControl.h
index 734b3d83..36fb55a6 100644
--- a/src/common/Network/CommonActorControl.h
+++ b/src/common/Network/CommonActorControl.h
@@ -142,6 +142,15 @@ namespace Sapphire::Network::ActorControl
 
     SetPose = 0x127,
 
+    /*!
+     * This is used for general crafting events, I found some of them but some are missing:
+     * 
+     * param1 = event type, the rest of the struct depends on this param.
+     *  - 18 & 19: Quicksynth result, 19 means HQ result item, item ID is param2 and is + 1 000 000 when HQ. 
+     *             Quantity is param3 (possible quicksynth that gives more than one item in the future?)
+     * 
+     * All the other values have unkown behavior for now. 
+     */
     CraftingUnk = 0x12C,
 
     GatheringSenseMsg = 0x130,

From c9edbc8aac4af0de2ae6cee53bcd590cb61c2a3a Mon Sep 17 00:00:00 2001
From: karashiiro <49822414+karashiiro@users.noreply.github.com>
Date: Sat, 12 Oct 2019 23:50:41 -0700
Subject: [PATCH 147/351] This was marked todo

---
 src/common/Network/PacketDef/Zone/ClientZoneDef.h | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/common/Network/PacketDef/Zone/ClientZoneDef.h b/src/common/Network/PacketDef/Zone/ClientZoneDef.h
index 7b0d39ea..bc728cbe 100644
--- a/src/common/Network/PacketDef/Zone/ClientZoneDef.h
+++ b/src/common/Network/PacketDef/Zone/ClientZoneDef.h
@@ -40,9 +40,9 @@ struct FFXIVIpcClientTrigger :
   /* 0004 */ uint32_t param11;
   /* 0008 */ uint32_t param12;
   /* 000C */ uint32_t param2;
-  /* 0010 */ uint32_t param4; // todo: really?
-  /* 0014 */ uint32_t param5;
-  /* 0018 */ uint64_t param3;
+  /* 0010 */ uint32_t param3;
+  /* 0014 */ uint32_t param4;
+  /* 0018 */ uint64_t param5;
 };
 
 struct FFXIVIpcUpdatePosition :

From db37d9ea3c9cbd7a14e2b06bf69711824f3b2ab9 Mon Sep 17 00:00:00 2001
From: NotAdam <adam@notadam.me>
Date: Mon, 14 Oct 2019 18:41:16 +1100
Subject: [PATCH 148/351] vs2019 support & dropping
 std::experimental::filesystem

---
 .appveyor.yml                                 |  4 +--
 CMakeSettings.json                            | 25 +++++++++++++-----
 README.md                                     |  2 +-
 deps/datReader/Dat.cpp                        |  2 +-
 deps/datReader/Dat.h                          |  4 +--
 deps/datReader/DatCat.cpp                     |  4 +--
 deps/datReader/DatCat.h                       |  6 ++---
 deps/datReader/ExdCat.h                       |  2 +-
 deps/datReader/ExdData.h                      |  4 +--
 deps/datReader/File.cpp                       |  2 +-
 deps/datReader/File.h                         |  4 +--
 deps/datReader/GameData.cpp                   | 12 ++++-----
 deps/datReader/GameData.h                     |  6 ++---
 deps/datReader/Index.cpp                      |  2 +-
 deps/datReader/Index.h                        |  4 +--
 deps/datReader/SqPack.cpp                     |  2 +-
 deps/datReader/SqPack.h                       |  4 +--
 deps/watchdog/Watchdog.h                      |  6 ++---
 src/api/main.cpp                              |  4 +--
 src/common/Config/ConfigMgr.cpp               |  5 ++--
 src/common/Logging/Logger.cpp                 |  4 +--
 src/dbm/DbManager.cpp                         |  4 +--
 src/dbm/main.cpp                              | 12 ++++-----
 src/tools/action_parse/main.cpp               |  4 +--
 src/tools/event_object_parser/main.cpp        |  4 +--
 src/tools/exd_struct_gen/main.cpp             |  4 +--
 src/tools/exd_struct_test/main.cpp            |  4 +--
 src/tools/mob_parse/main.cpp                  | 26 +++++++++----------
 .../nav_export/nav/TiledNavmeshGenerator.cpp  |  4 +--
 src/tools/nav_export/navmesh_exporter.h       |  6 ++---
 src/tools/nav_export/obj_exporter.h           | 14 +++++-----
 .../pcb_reader/nav/TiledNavmeshGenerator.cpp  |  4 +--
 src/tools/pcb_reader/navmesh_exporter.h       |  8 +++---
 src/tools/pcb_reader/obj_exporter.h           | 14 +++++-----
 src/tools/quest_parser/main.cpp               |  4 +--
 src/tools/questbattle_bruteforce/main.cpp     |  4 +--
 src/world/Navi/NaviProvider.cpp               | 10 +++----
 src/world/Script/ScriptLoader.cpp             |  4 +--
 src/world/Script/ScriptMgr.cpp                |  2 +-
 src/world/Session.cpp                         |  4 +--
 .../Housing/HousingInteriorTerritory.h        |  2 +-
 41 files changed, 128 insertions(+), 118 deletions(-)

diff --git a/.appveyor.yml b/.appveyor.yml
index 70d4d921..6efb5007 100644
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@ -1,5 +1,5 @@
 os:
-  - Visual Studio 2017
+  - Visual Studio 2019
 
 configuration:
   - Debug
@@ -20,7 +20,7 @@ before_build:
   - git submodule update --init
   - mkdir build
   - cd build
-  - cmake .. -G "Visual Studio 15 2017 Win64" 
+  - cmake .. -G "Visual Studio 16 2019 Win64"
   - cmake --build . --target ALL_BUILD --config Release
 
 build_script:
diff --git a/CMakeSettings.json b/CMakeSettings.json
index 7a6006fe..cc894359 100644
--- a/CMakeSettings.json
+++ b/CMakeSettings.json
@@ -1,21 +1,32 @@
 {
   // See https://go.microsoft.com//fwlink//?linkid=834763 for more information about this file.
+  "environments": [
+    {
+      "BuildDir": "${env.USERPROFILE}\\CMakeBuilds\\${workspaceHash}\\build"
+    }
+  ],
   "configurations": [
     {
       "name": "x64-Debug",
-      "generator": "Visual Studio 15 2017 Win64",
+      "generator": "Visual Studio 16 2019 Win64",
       "configurationType": "Debug",
-      "buildRoot": "${env.USERPROFILE}\\CMakeBuild\\${workspaceHash}\\build\\${name}",
+      "buildRoot": "${env.BuildDir}\\${name}",
       "cmakeCommandArgs": "-DCMAKE_BUILD_TYPE=\"Debug\"",
-      "buildCommandArgs": "-m -v:minimal"
+      "buildCommandArgs": "-m -v:minimal",
+      "inheritEnvironments": [
+        "msvc_x64"
+      ]
     },
     {
       "name": "x64-Release",
-      "generator": "Visual Studio 15 2017 Win64",
+      "generator": "Visual Studio 16 2019 Win64",
       "configurationType": "Release",
-      "buildRoot": "${env.USERPROFILE}\\CMakeBuild\\${workspaceHash}\\build\\${name}",
-      "cmakeCommandArgs": "",
-      "buildCommandArgs": "-m -v:minimal"
+      "buildRoot": "${env.BuildDir}\\${name}",
+      "cmakeCommandArgs": "-DCMAKE_BUILD_TYPE=\"RelWithDebInfo\"",
+      "buildCommandArgs": "-m -v:minimal",
+      "inheritEnvironments": [
+        "msvc_x64"
+      ]
     }
   ]
 }
diff --git a/README.md b/README.md
index 582f4ebf..a133f5e0 100644
--- a/README.md
+++ b/README.md
@@ -18,7 +18,7 @@ Sapphire requires the following software:
 
 | *Name* | *Windows* | *Linux* |
 | ------ | --------- | ------- |
-| CMake 3.0.2+ and C++17 capable compiler | [Visual Studio 2017](https://www.visualstudio.com/) | `gcc 7` and `g++ 7` or newer |
+| CMake 3.0.2+ and C++17 capable compiler | [Visual Studio 2019](https://www.visualstudio.com/) | `gcc 8` and `g++ 8` or newer, alternatively, `clang 8` and `clang++ 8` or newer. |
 | MySQL Server 5.7 | [Official Site](https://dev.mysql.com/downloads/mysql/) | MySQL server from your distribution's package manager |
 
 Please check the [wiki](https://github.com/SapphireMordred/Sapphire/wiki) for detailed installation/build instructions for your OS.
diff --git a/deps/datReader/Dat.cpp b/deps/datReader/Dat.cpp
index 94812a09..5e12d5d1 100644
--- a/deps/datReader/Dat.cpp
+++ b/deps/datReader/Dat.cpp
@@ -140,7 +140,7 @@ namespace xiv
 namespace dat
 {
 
-Dat::Dat( const std::experimental::filesystem::path& i_path, uint32_t i_nb ) :
+Dat::Dat( const std::filesystem::path& i_path, uint32_t i_nb ) :
    SqPack( i_path ),
    m_num( i_nb )
 {
diff --git a/deps/datReader/Dat.h b/deps/datReader/Dat.h
index 5311ab48..10693b3c 100644
--- a/deps/datReader/Dat.h
+++ b/deps/datReader/Dat.h
@@ -5,7 +5,7 @@
 
 #include <mutex>
 
-#include <experimental/filesystem>
+#include <filesystem>
 
 namespace xiv
 {
@@ -18,7 +18,7 @@ class Dat : public SqPack
 {
 public:
    // Full path to the dat file
-   Dat( const std::experimental::filesystem::path& i_path, uint32_t i_nb );
+   Dat( const std::filesystem::path& i_path, uint32_t i_nb );
    virtual ~Dat();
 
    // Retrieves a file given the offset in the dat file
diff --git a/deps/datReader/DatCat.cpp b/deps/datReader/DatCat.cpp
index 117c2b9b..2ce9566f 100644
--- a/deps/datReader/DatCat.cpp
+++ b/deps/datReader/DatCat.cpp
@@ -10,7 +10,7 @@ namespace xiv
 namespace dat
 {
 
-Cat::Cat( const std::experimental::filesystem::path& basePath, uint32_t catNum, const std::string& name ) :
+Cat::Cat( const std::filesystem::path& basePath, uint32_t catNum, const std::string& name ) :
    m_name( name ),
    m_catNum( catNum ),
    m_chunk( -1 )
@@ -30,7 +30,7 @@ Cat::Cat( const std::experimental::filesystem::path& basePath, uint32_t catNum,
    }
 }
 
-Cat::Cat( const std::experimental::filesystem::path& basePath, uint32_t catNum, const std::string& name, uint32_t exNum, uint32_t chunk ) :
+Cat::Cat( const std::filesystem::path& basePath, uint32_t catNum, const std::string& name, uint32_t exNum, uint32_t chunk ) :
    m_name( name ),
    m_catNum( catNum ),
    m_chunk( chunk )
diff --git a/deps/datReader/DatCat.h b/deps/datReader/DatCat.h
index 1e1d0759..07878589 100644
--- a/deps/datReader/DatCat.h
+++ b/deps/datReader/DatCat.h
@@ -3,7 +3,7 @@
 
 #include <memory>
 #include <vector>
-#include <experimental/filesystem>
+#include <filesystem>
 
 namespace xiv {
 namespace dat {
@@ -19,14 +19,14 @@ public:
    // basePath: Path to the folder containingthe datfiles
    // catNum: The number of the category
    // name: The name of the category, empty if not known
-   Cat( const std::experimental::filesystem::path& basePath, uint32_t catNum, const std::string& name );
+   Cat( const std::filesystem::path& basePath, uint32_t catNum, const std::string& name );
 
    // basePath: Path to the folder containingthe datfiles
    // catNum: The number of the category
    // name: The name of the category, empty if not known
    // exNum: The number of the expansion to load from
    // chunk: The chunk to load from
-   Cat( const std::experimental::filesystem::path& basePath, uint32_t catNum, const std::string& name, uint32_t exNum, uint32_t chunk );
+   Cat( const std::filesystem::path& basePath, uint32_t catNum, const std::string& name, uint32_t exNum, uint32_t chunk );
    ~Cat();
 
    // Returns .index of the category
diff --git a/deps/datReader/ExdCat.h b/deps/datReader/ExdCat.h
index af1090d8..e22ec036 100644
--- a/deps/datReader/ExdCat.h
+++ b/deps/datReader/ExdCat.h
@@ -4,7 +4,7 @@
 #include <memory>
 #include <map>
 
-#include <experimental/filesystem>
+#include <filesystem>
 
 #include "bparse.h"
 #include "Exd.h"
diff --git a/deps/datReader/ExdData.h b/deps/datReader/ExdData.h
index c6ca6170..15092d6e 100644
--- a/deps/datReader/ExdData.h
+++ b/deps/datReader/ExdData.h
@@ -5,7 +5,7 @@
 #include <memory>
 #include <mutex>
 
-#include <experimental/filesystem>
+#include <filesystem>
 
 namespace xiv
 {
@@ -34,7 +34,7 @@ namespace xiv
           const Cat& get_category(const std::string& i_cat_name);
 
           // Export in csv in base flder i_ouput_path
-          void export_as_csvs(const std::experimental::filesystem::path& i_output_path);
+          void export_as_csvs(const std::filesystem::path& i_output_path);
 
       protected:
           // Lazy instantiation of category
diff --git a/deps/datReader/File.cpp b/deps/datReader/File.cpp
index 9559159d..c3413d5a 100644
--- a/deps/datReader/File.cpp
+++ b/deps/datReader/File.cpp
@@ -31,7 +31,7 @@ std::vector<std::vector<char>>& File::access_data_sections()
    return _data_sections;
 }
 
-void File::exportToFile(const std::experimental::filesystem::path& i_path) const
+void File::exportToFile(const std::filesystem::path& i_path) const
 {
    std::ofstream ofs( i_path.string(), std::ios_base::binary | std::ios_base::out );
    for( auto& data_section : _data_sections )
diff --git a/deps/datReader/File.h b/deps/datReader/File.h
index 1d09e78e..3ce77b4f 100644
--- a/deps/datReader/File.h
+++ b/deps/datReader/File.h
@@ -3,7 +3,7 @@
 
 #include <vector>
 
-#include <experimental/filesystem>
+#include <filesystem>
 #include <stdint.h>
 #include "bparse.h"
 
@@ -43,7 +43,7 @@ namespace xiv
          const std::vector<std::vector<char>>& get_data_sections() const;
          std::vector<std::vector<char>>& access_data_sections();
 
-         void exportToFile( const std::experimental::filesystem::path& i_path ) const;
+         void exportToFile( const std::filesystem::path& i_path ) const;
 
       protected:
          FileType _type;
diff --git a/deps/datReader/GameData.cpp b/deps/datReader/GameData.cpp
index 4b4a71e4..e3f36b6b 100644
--- a/deps/datReader/GameData.cpp
+++ b/deps/datReader/GameData.cpp
@@ -53,7 +53,7 @@ namespace xiv
 namespace dat
 {
 
-GameData::GameData(const std::experimental::filesystem::path& path) try :
+GameData::GameData(const std::filesystem::path& path) try :
     m_path(path)
 {
    int maxExLevel = 0;
@@ -62,18 +62,18 @@ GameData::GameData(const std::experimental::filesystem::path& path) try :
 #ifdef _WIN32
   static constexpr auto sep = "\\";
 #else
-  static constexpr auto sep = std::experimental::filesystem::path::preferred_separator;
+  static constexpr auto sep = std::filesystem::path::preferred_separator;
 #endif
   
    // Determine which expansions are available
-   while( std::experimental::filesystem::exists( std::experimental::filesystem::path( m_path.string() + sep + "ex" + std::to_string( maxExLevel + 1 ) + sep + "ex" + std::to_string( maxExLevel + 1 ) + ".ver" ) ) )
+   while( std::filesystem::exists( std::filesystem::path( m_path.string() + sep + "ex" + std::to_string( maxExLevel + 1 ) + sep + "ex" + std::to_string( maxExLevel + 1 ) + ".ver" ) ) )
    {
       maxExLevel++;
    }
    
 
    // Iterate over the files in path
-   for( auto it = std::experimental::filesystem::directory_iterator( m_path.string() + "//ffxiv" ); it != std::experimental::filesystem::directory_iterator(); ++it )
+   for( auto it = std::filesystem::directory_iterator( m_path.string() + "//ffxiv" ); it != std::filesystem::directory_iterator(); ++it )
    {
       // Get the filename of the current element
       auto filename = it->path().filename().string();
@@ -99,14 +99,14 @@ GameData::GameData(const std::experimental::filesystem::path& path) try :
          {
             const std::string path = m_path.string() + sep + buildDatStr( "ex" + std::to_string( exNum ), cat_nb, exNum, 0, "win32", "index" );
 
-            if( std::experimental::filesystem::exists( std::experimental::filesystem::path( path ) ) )
+            if( std::filesystem::exists( std::filesystem::path( path ) ) )
             {
 
                int chunkCount = 0;
 
                for(int chunkTest = 0; chunkTest < 256; chunkTest++ )
                {
-                  if( std::experimental::filesystem::exists( m_path.string() + sep + buildDatStr( "ex" + std::to_string( exNum ), cat_nb, exNum, chunkTest, "win32", "index" ) ) )
+                  if( std::filesystem::exists( m_path.string() + sep + buildDatStr( "ex" + std::to_string( exNum ), cat_nb, exNum, chunkTest, "win32", "index" ) ) )
                   {
                      m_exCats[cat_nb].exNumToChunkMap[exNum].chunkToCatMap[chunkTest] = std::unique_ptr<Cat>();
                      chunkCount++;
diff --git a/deps/datReader/GameData.h b/deps/datReader/GameData.h
index 2b64fafd..d44c9ac8 100644
--- a/deps/datReader/GameData.h
+++ b/deps/datReader/GameData.h
@@ -5,7 +5,7 @@
 #include <unordered_map>
 #include <mutex>
 
-#include <experimental/filesystem>
+#include <filesystem>
 
 namespace xiv
 {
@@ -21,7 +21,7 @@ class GameData
 {
 public:
    // This should be the path in which the .index/.datX files are located
-   GameData( const std::experimental::filesystem::path& path );
+   GameData( const std::filesystem::path& path );
    ~GameData();
 
    static const std::string buildDatStr( const std::string folder, const int cat, const int exNum, const int chunk, const std::string platform, const std::string type );
@@ -61,7 +61,7 @@ protected:
    void createExCategory( uint32_t catNum );
 
    // Path given to constructor, pointing to the folder with the .index/.datX files
-   const std::experimental::filesystem::path m_path;
+   const std::filesystem::path m_path;
 
    // Stored categories, indexed by their number, categories are instantiated and parsed individually when they are needed
    std::unordered_map<uint32_t, std::unique_ptr<Cat>> m_cats;
diff --git a/deps/datReader/Index.cpp b/deps/datReader/Index.cpp
index 92dfb5da..d1e11d89 100644
--- a/deps/datReader/Index.cpp
+++ b/deps/datReader/Index.cpp
@@ -56,7 +56,7 @@ namespace xiv
 namespace dat
 {
 
-Index::Index(const std::experimental::filesystem::path& path) :
+Index::Index(const std::filesystem::path& path) :
    SqPack( path )
 {
    if( !m_handle )
diff --git a/deps/datReader/Index.h b/deps/datReader/Index.h
index 0dc565b7..b7999ad5 100644
--- a/deps/datReader/Index.h
+++ b/deps/datReader/Index.h
@@ -5,7 +5,7 @@
 
 #include <unordered_map>
 
-#include <experimental/filesystem>
+#include <filesystem>
 
 namespace xiv {
 namespace dat {
@@ -16,7 +16,7 @@ class Index : public SqPack
 {
 public:
    // Full path to the index file
-   Index( const std::experimental::filesystem::path& i_path );
+   Index( const std::filesystem::path& i_path );
    virtual ~Index();
 
    // An entry in the hash table, representing a file in a given dat
diff --git a/deps/datReader/SqPack.cpp b/deps/datReader/SqPack.cpp
index ede929aa..ae2f0db0 100644
--- a/deps/datReader/SqPack.cpp
+++ b/deps/datReader/SqPack.cpp
@@ -51,7 +51,7 @@ namespace xiv
 namespace dat
 {
 
-   SqPack::SqPack( const std::experimental::filesystem::path& path ) :
+   SqPack::SqPack( const std::filesystem::path& path ) :
       // Open the file
       m_handle( path.string(), std::ios_base::in | std::ios_base::binary )
    {
diff --git a/deps/datReader/SqPack.h b/deps/datReader/SqPack.h
index cc7feab3..5fcb1c36 100644
--- a/deps/datReader/SqPack.h
+++ b/deps/datReader/SqPack.h
@@ -3,7 +3,7 @@
 
 #include <fstream>
 
-#include <experimental/filesystem>
+#include <filesystem>
 
 #include "bparse.h"
 
@@ -49,7 +49,7 @@ class SqPack
 
 public:
    // Full path to the sqpack file
-   SqPack( const std::experimental::filesystem::path& i_path );
+   SqPack( const std::filesystem::path& i_path );
    virtual ~SqPack();
 
 protected:
diff --git a/deps/watchdog/Watchdog.h b/deps/watchdog/Watchdog.h
index d9f7aa25..e64a21f0 100644
--- a/deps/watchdog/Watchdog.h
+++ b/deps/watchdog/Watchdog.h
@@ -31,8 +31,8 @@
 #include <mutex>
 
 #include <functional>
-#include <experimental/filesystem>
-namespace ci { namespace fs = std::experimental::filesystem; }
+#include <filesystem>
+namespace ci { namespace fs = std::filesystem; }
 
 //! Exception for when Watchdog can't locate a file or parse the wildcard
 class WatchedFileSystemExc : public std::exception {
@@ -319,7 +319,7 @@ protected:
       std::string                                                               mFilter;
       std::function<void(const ci::fs::path&)>                                  mCallback;
       std::function<void(const std::vector<ci::fs::path>&)>                     mListCallback;
-      std::map< std::string, std::experimental::filesystem::file_time_type >    mModificationTimes;
+      std::map< std::string, std::filesystem::file_time_type >    mModificationTimes;
    };
 
    std::mutex                      mMutex;
diff --git a/src/api/main.cpp b/src/api/main.cpp
index 004233ba..78d02861 100644
--- a/src/api/main.cpp
+++ b/src/api/main.cpp
@@ -22,7 +22,7 @@
 //Added for the default_resource example
 #include <fstream>
 #include <string>
-#include <experimental/filesystem>
+#include <filesystem>
 #include <vector>
 #include <algorithm>
 
@@ -39,7 +39,7 @@ Sapphire::Db::DbWorkerPool< Sapphire::Db::ZoneDbConnection > g_charaDb;
 Sapphire::Data::ExdDataGenerated g_exdDataGen;
 Sapphire::Api::SapphireApi g_sapphireAPI;
 
-namespace fs = std::experimental::filesystem;
+namespace fs = std::filesystem;
 
 using namespace std;
 using namespace Sapphire;
diff --git a/src/common/Config/ConfigMgr.cpp b/src/common/Config/ConfigMgr.cpp
index 8b8823f2..e581a37c 100644
--- a/src/common/Config/ConfigMgr.cpp
+++ b/src/common/Config/ConfigMgr.cpp
@@ -1,9 +1,8 @@
 #include "ConfigMgr.h"
 #include <iostream>
-#include <fstream>
-#include <experimental/filesystem>
+#include <filesystem>
 
-namespace fs = std::experimental::filesystem;
+namespace fs = std::filesystem;
 
 using namespace Sapphire;
 using namespace Sapphire::Common;
diff --git a/src/common/Logging/Logger.cpp b/src/common/Logging/Logger.cpp
index 221f9291..4b37aba9 100644
--- a/src/common/Logging/Logger.cpp
+++ b/src/common/Logging/Logger.cpp
@@ -8,9 +8,9 @@
 #include <spdlog/sinks/daily_file_sink.h>
 
 // #include <iostream>
-#include <experimental/filesystem> // or #include <filesystem>
+#include <filesystem> // or #include <filesystem>
 
-namespace fs = std::experimental::filesystem;
+namespace fs = std::filesystem;
 
 void Sapphire::Logger::init( const std::string& logPath )
 {
diff --git a/src/dbm/DbManager.cpp b/src/dbm/DbManager.cpp
index e39eedcd..4b7a7783 100644
--- a/src/dbm/DbManager.cpp
+++ b/src/dbm/DbManager.cpp
@@ -5,14 +5,14 @@
 #include <streambuf>
 #include <sstream>
 #include <Logging/Logger.h>
-#include <experimental/filesystem>
+#include <filesystem>
 
 #include <common/Util/Util.h>
 
 using namespace Sapphire;
 using namespace Sapphire::Common;
 
-namespace fs = std::experimental::filesystem;
+namespace fs = std::filesystem;
 
 DbManager::DbManager( const std::string& host, const std::string& database, const std::string& user, const std::string& pw, uint16_t port ) :
   m_host( host ),
diff --git a/src/dbm/main.cpp b/src/dbm/main.cpp
index 3eeebf2c..990f500d 100644
--- a/src/dbm/main.cpp
+++ b/src/dbm/main.cpp
@@ -3,14 +3,14 @@
 #include <cctype>
 #include <set>
 #include <common/Logging/Logger.h>
-#include <experimental/filesystem>
+#include <filesystem>
 #include <MySqlConnector.h>
 #include <common/Util/CrashHandler.h>
 #include <common/Config/ConfigMgr.h>
 
 Sapphire::Common::Util::CrashHandler crashHandler;
 
-namespace filesys = std::experimental::filesystem;
+namespace fs = std::filesystem;
 
 #include <fstream>
 #include <streambuf>
@@ -30,19 +30,19 @@ std::vector< std::string > getAllFilesInDir( const std::string& dirPath,
   try
   {
     // Check if given path exists and points to a directory
-    if( filesys::exists( dirPath ) && filesys::is_directory( dirPath ) )
+    if( fs::exists( dirPath ) && fs::is_directory( dirPath ) )
     {
       // Create a Recursive Directory Iterator object and points to the starting of directory
-      filesys::recursive_directory_iterator iter( dirPath );
+      fs::recursive_directory_iterator iter( dirPath );
 
       // Create a Recursive Directory Iterator object pointing to end.
-      filesys::recursive_directory_iterator end;
+      fs::recursive_directory_iterator end;
 
       // Iterate till end
       while( iter != end )
       {
         // Check if current entry is a directory and if exists in skip list
-        if( filesys::is_directory( iter->path() ) &&
+        if( fs::is_directory( iter->path() ) &&
             ( std::find( dirSkipList.begin(), dirSkipList.end(), iter->path().filename() ) != dirSkipList.end() ) )
         {
           // Skip the iteration of current directory pointed by iterator
diff --git a/src/tools/action_parse/main.cpp b/src/tools/action_parse/main.cpp
index aa40bdd1..8cbe3f6d 100644
--- a/src/tools/action_parse/main.cpp
+++ b/src/tools/action_parse/main.cpp
@@ -17,11 +17,11 @@
 #include <streambuf>
 #include <regex>
 
-#include <experimental/filesystem>
+#include <filesystem>
 
 Sapphire::Data::ExdDataGenerated g_exdData;
 
-namespace fs = std::experimental::filesystem;
+namespace fs = std::filesystem;
 
 using namespace Sapphire;
 
diff --git a/src/tools/event_object_parser/main.cpp b/src/tools/event_object_parser/main.cpp
index a4d451a9..a9a66919 100644
--- a/src/tools/event_object_parser/main.cpp
+++ b/src/tools/event_object_parser/main.cpp
@@ -26,14 +26,14 @@
 #include <ExdCat.h>
 #include <Exd.h>
 
-#include <experimental/filesystem>
+#include <filesystem>
 
 Sapphire::Common::Util::CrashHandler crashHandler;
 Sapphire::Data::ExdDataGenerated g_exdData;
 
 using namespace Sapphire;
 using namespace std::chrono_literals;
-namespace fs = std::experimental::filesystem;
+namespace fs = std::filesystem;
 
 // garbage to ignore models
 bool ignoreModels = false;
diff --git a/src/tools/exd_struct_gen/main.cpp b/src/tools/exd_struct_gen/main.cpp
index c418dd61..e0864520 100644
--- a/src/tools/exd_struct_gen/main.cpp
+++ b/src/tools/exd_struct_gen/main.cpp
@@ -11,7 +11,7 @@
 #include <set>
 #include <Exd/ExdDataGenerated.h>
 #include <Logging/Logger.h>
-#include <experimental/filesystem>
+#include <filesystem>
 
 #include <nlohmann/json.hpp>
 
@@ -22,7 +22,7 @@
 
 using namespace Sapphire;
 
-namespace fs = std::experimental::filesystem;
+namespace fs = std::filesystem;
 
 Sapphire::Data::ExdDataGenerated g_exdData;
 bool skipUnmapped = true;
diff --git a/src/tools/exd_struct_test/main.cpp b/src/tools/exd_struct_test/main.cpp
index 88ad0d46..e2beba0e 100644
--- a/src/tools/exd_struct_test/main.cpp
+++ b/src/tools/exd_struct_test/main.cpp
@@ -22,7 +22,7 @@
 
 #include <Util/CrashHandler.h>
 
-#include <experimental/filesystem>
+#include <filesystem>
 
 Sapphire::Common::Util::CrashHandler crashHandler;
 
@@ -31,7 +31,7 @@ xiv::dat::GameData* gameData = nullptr;
 
 using namespace Sapphire;
 
-namespace fs = std::experimental::filesystem;
+namespace fs = std::filesystem;
 
 //const std::string datLocation( "/opt/sapphire_3_15_0/bin/sqpack" );
 const std::string datLocation( "/mnt/c/Program Files (x86)/Steam/steamapps/common/FINAL FANTASY XIV Online/game/sqpack" );
diff --git a/src/tools/mob_parse/main.cpp b/src/tools/mob_parse/main.cpp
index e8598da0..7ed1966d 100644
--- a/src/tools/mob_parse/main.cpp
+++ b/src/tools/mob_parse/main.cpp
@@ -13,9 +13,9 @@
 #include <Logging/Logger.h>
 #include <Util/Util.h>
 
-#include <experimental/filesystem>
+#include <filesystem>
 
-namespace filesys = std::experimental::filesystem;
+namespace fs = std::filesystem;
 
 #include <fstream>
 #include <streambuf>
@@ -138,19 +138,19 @@ std::vector< std::string > getAllFilesInDir( const std::string& dirPath,
   try
   {
     // Check if given path exists and points to a directory
-    if( filesys::exists( dirPath ) && filesys::is_directory( dirPath ) )
+    if( fs::exists( dirPath ) && fs::is_directory( dirPath ) )
     {
       // Create a Recursive Directory Iterator object and points to the starting of directory
-      filesys::recursive_directory_iterator iter( dirPath );
+      fs::recursive_directory_iterator iter( dirPath );
 
       // Create a Recursive Directory Iterator object pointing to end.
-      filesys::recursive_directory_iterator end;
+      fs::recursive_directory_iterator end;
 
       // Iterate till end
       while( iter != end )
       {
         // Check if current entry is a directory and if exists in skip list
-        if( filesys::is_directory( iter->path() ) &&
+        if( fs::is_directory( iter->path() ) &&
             ( std::find( dirSkipList.begin(), dirSkipList.end(), iter->path().filename() ) != dirSkipList.end() ) )
         {
           // Skip the iteration of current directory pointed by iterator
@@ -212,17 +212,17 @@ int dumpSpawns()
 
   for( auto file : listOfFiles )
   {
-    if( !filesys::is_directory( file ) )
+    if( !fs::is_directory( file ) )
     {
       auto pos = file.find_last_of( "\\" );
       if( pos != std::string::npos )
       {
 
-        auto pos = file.find_last_of( filesys::path::preferred_separator );
+        auto pos = file.find_last_of( fs::path::preferred_separator );
         if( pos != std::string::npos )
         {
           auto str = file.substr( 0, pos );
-          pos = str.find_last_of( filesys::path::preferred_separator );
+          pos = str.find_last_of( fs::path::preferred_separator );
           auto zone = str.substr( pos + 1 );
           //Logger::info( zone );
 
@@ -399,17 +399,17 @@ int dumpTemplates()
 
   for( auto file : listOfFiles )
   {
-    if( !filesys::is_directory( file ) )
+    if( !fs::is_directory( file ) )
     {
       auto pos = file.find_last_of( "\\" );
       if( pos != std::string::npos )
       {
 
-        auto pos = file.find_last_of( filesys::path::preferred_separator );
+        auto pos = file.find_last_of( fs::path::preferred_separator );
         if( pos != std::string::npos )
         {
           auto str = file.substr( 0, pos );
-          pos = str.find_last_of( filesys::path::preferred_separator );
+          pos = str.find_last_of( fs::path::preferred_separator );
           auto zone = str.substr( pos + 1 );
           //Logger::info( zone );
 
@@ -434,7 +434,7 @@ int dumpTemplates()
 
     }
 
-    /*  if( filesys::is_directory( file ) )
+    /*  if( fs::is_directory( file ) )
       {
          auto pos = file.find_last_of( "\\" );
          if( pos != std::string::npos )
diff --git a/src/tools/nav_export/nav/TiledNavmeshGenerator.cpp b/src/tools/nav_export/nav/TiledNavmeshGenerator.cpp
index 0204910f..ad16bc21 100644
--- a/src/tools/nav_export/nav/TiledNavmeshGenerator.cpp
+++ b/src/tools/nav_export/nav/TiledNavmeshGenerator.cpp
@@ -1,11 +1,11 @@
 #include "TiledNavmeshGenerator.h"
 
-#include <experimental/filesystem>
+#include <filesystem>
 #include <cstring>
 
 #include <recastnavigation/Detour/Include/DetourNavMeshBuilder.h>
 
-namespace fs = std::experimental::filesystem;
+namespace fs = std::filesystem;
 
 
 inline unsigned int nextPow2( uint32_t v )
diff --git a/src/tools/nav_export/navmesh_exporter.h b/src/tools/nav_export/navmesh_exporter.h
index 6035b552..642c404b 100644
--- a/src/tools/nav_export/navmesh_exporter.h
+++ b/src/tools/nav_export/navmesh_exporter.h
@@ -12,9 +12,9 @@
 #include "obj_exporter.h"
 #include "nav/TiledNavmeshGenerator.h"
 
-#include <experimental/filesystem>
+#include <filesystem>
 
-namespace fs = std::experimental::filesystem;
+namespace fs = std::filesystem;
 
 class NavmeshExporter
 {
@@ -23,7 +23,7 @@ public:
   {
     auto start = std::chrono::high_resolution_clock::now();
 
-    static std::string currPath = std::experimental::filesystem::current_path().string();
+    static std::string currPath = std::filesystem::current_path().string();
 
     auto dir = fs::current_path().string() + "/pcb_export/" + zone.name + "/";
     auto fileName = dir + zone.name;
diff --git a/src/tools/nav_export/obj_exporter.h b/src/tools/nav_export/obj_exporter.h
index b01ad970..fc7ddc99 100644
--- a/src/tools/nav_export/obj_exporter.h
+++ b/src/tools/nav_export/obj_exporter.h
@@ -3,7 +3,7 @@
 
 #include <chrono>
 #include <cstdint>
-#include <experimental/filesystem>
+#include <filesystem>
 #include <fstream>
 #include <string>
 
@@ -16,7 +16,7 @@ class ObjExporter
 public:
   static std::string exportZone( const ExportedZone& zone )
   {
-    static std::string currPath = std::experimental::filesystem::current_path().string();
+    static std::string currPath = std::filesystem::current_path().string();
 
     auto start = std::chrono::high_resolution_clock::now();
 
@@ -25,9 +25,9 @@ public:
 
     std::error_code e;
 
-    if( !std::experimental::filesystem::exists( dir, e ) )
+    if( !std::filesystem::exists( dir, e ) )
     {
-      if( !std::experimental::filesystem::create_directories( dir, e ) )
+      if( !std::filesystem::create_directories( dir, e ) )
       {
         printf( "Unable to create directory '%s'", ( dir ).c_str() );
         return "";
@@ -59,7 +59,7 @@ public:
 
   static std::string exportGroup( const std::string& zoneName, const ExportedGroup& group )
   {
-    static std::string currPath = std::experimental::filesystem::current_path().string();
+    static std::string currPath = std::filesystem::current_path().string();
 
     auto start = std::chrono::high_resolution_clock::now();
 
@@ -67,9 +67,9 @@ public:
     auto fileName = dir + group.name + ".obj";
 
     std::error_code e;
-    if( !std::experimental::filesystem::exists( dir, e ) )
+    if( !std::filesystem::exists( dir, e ) )
     {
-      if( !std::experimental::filesystem::create_directories( dir, e ) )
+      if( !std::filesystem::create_directories( dir, e ) )
       {
         printf( "Unable to create directory '%s'", ( dir ).c_str() );
         return "";
diff --git a/src/tools/pcb_reader/nav/TiledNavmeshGenerator.cpp b/src/tools/pcb_reader/nav/TiledNavmeshGenerator.cpp
index c4423177..40b4ba62 100644
--- a/src/tools/pcb_reader/nav/TiledNavmeshGenerator.cpp
+++ b/src/tools/pcb_reader/nav/TiledNavmeshGenerator.cpp
@@ -1,11 +1,11 @@
 #include "TiledNavmeshGenerator.h"
 
-#include <experimental/filesystem>
+#include <filesystem>
 #include <cstring>
 
 #include <recastnavigation/Detour/Include/DetourNavMeshBuilder.h>
 
-namespace fs = std::experimental::filesystem;
+namespace fs = std::filesystem;
 
 
 inline unsigned int nextPow2( uint32_t v )
diff --git a/src/tools/pcb_reader/navmesh_exporter.h b/src/tools/pcb_reader/navmesh_exporter.h
index 29e4cecd..ba890727 100644
--- a/src/tools/pcb_reader/navmesh_exporter.h
+++ b/src/tools/pcb_reader/navmesh_exporter.h
@@ -12,9 +12,9 @@
 #include "obj_exporter.h"
 #include "nav/TiledNavmeshGenerator.h"
 
-#include <experimental/filesystem>
+#include <filesystem>
 
-namespace fs = std::experimental::filesystem;
+namespace fs = std::filesystem;
 
 class NavmeshExporter
 {
@@ -23,7 +23,7 @@ public:
   {
     auto start = std::chrono::high_resolution_clock::now();
 
-    static std::string currPath = std::experimental::filesystem::current_path().string();
+    static std::string currPath = std::filesystem::current_path().string();
 
     auto dir = fs::current_path().string() + "/pcb_export/" + zone.name + "/";
     auto fileName = dir + zone.name;
@@ -60,7 +60,7 @@ public:
   {
     auto start = std::chrono::high_resolution_clock::now();
 
-    static std::string currPath = std::experimental::filesystem::current_path().string();
+    static std::string currPath = std::filesystem::current_path().string();
 
 
     auto dir = fs::current_path().string() + "/pcb_export/" + zoneName + "/";
diff --git a/src/tools/pcb_reader/obj_exporter.h b/src/tools/pcb_reader/obj_exporter.h
index b01ad970..fc7ddc99 100644
--- a/src/tools/pcb_reader/obj_exporter.h
+++ b/src/tools/pcb_reader/obj_exporter.h
@@ -3,7 +3,7 @@
 
 #include <chrono>
 #include <cstdint>
-#include <experimental/filesystem>
+#include <filesystem>
 #include <fstream>
 #include <string>
 
@@ -16,7 +16,7 @@ class ObjExporter
 public:
   static std::string exportZone( const ExportedZone& zone )
   {
-    static std::string currPath = std::experimental::filesystem::current_path().string();
+    static std::string currPath = std::filesystem::current_path().string();
 
     auto start = std::chrono::high_resolution_clock::now();
 
@@ -25,9 +25,9 @@ public:
 
     std::error_code e;
 
-    if( !std::experimental::filesystem::exists( dir, e ) )
+    if( !std::filesystem::exists( dir, e ) )
     {
-      if( !std::experimental::filesystem::create_directories( dir, e ) )
+      if( !std::filesystem::create_directories( dir, e ) )
       {
         printf( "Unable to create directory '%s'", ( dir ).c_str() );
         return "";
@@ -59,7 +59,7 @@ public:
 
   static std::string exportGroup( const std::string& zoneName, const ExportedGroup& group )
   {
-    static std::string currPath = std::experimental::filesystem::current_path().string();
+    static std::string currPath = std::filesystem::current_path().string();
 
     auto start = std::chrono::high_resolution_clock::now();
 
@@ -67,9 +67,9 @@ public:
     auto fileName = dir + group.name + ".obj";
 
     std::error_code e;
-    if( !std::experimental::filesystem::exists( dir, e ) )
+    if( !std::filesystem::exists( dir, e ) )
     {
-      if( !std::experimental::filesystem::create_directories( dir, e ) )
+      if( !std::filesystem::create_directories( dir, e ) )
       {
         printf( "Unable to create directory '%s'", ( dir ).c_str() );
         return "";
diff --git a/src/tools/quest_parser/main.cpp b/src/tools/quest_parser/main.cpp
index 0fa1a6f2..06d48373 100644
--- a/src/tools/quest_parser/main.cpp
+++ b/src/tools/quest_parser/main.cpp
@@ -6,7 +6,7 @@
 #include <string>
 #include <cstring>
 
-#include <experimental/filesystem>
+#include <filesystem>
 
 #include <Exd.h>
 #include <ExdCat.h>
@@ -21,7 +21,7 @@
 #include <algorithm>
 
 Sapphire::Data::ExdDataGenerated g_exdDataGen;
-namespace fs = std::experimental::filesystem;
+namespace fs = std::filesystem;
 using namespace Sapphire;
 
 const std::string onTalkStr(
diff --git a/src/tools/questbattle_bruteforce/main.cpp b/src/tools/questbattle_bruteforce/main.cpp
index 37ecd51d..7aa34fbd 100644
--- a/src/tools/questbattle_bruteforce/main.cpp
+++ b/src/tools/questbattle_bruteforce/main.cpp
@@ -18,7 +18,7 @@
 
 #include <Util/CrashHandler.h>
 
-#include <experimental/filesystem>
+#include <filesystem>
 
 Sapphire::Common::Util::CrashHandler crashHandler;
 
@@ -27,7 +27,7 @@ xiv::dat::GameData* gameData = nullptr;
 
 using namespace Sapphire;
 
-namespace fs = std::experimental::filesystem;
+namespace fs = std::filesystem;
 
 //const std::string datLocation( "/opt/sapphire_3_15_0/bin/sqpack" );
 //const std::string datLocation( "/mnt/c/Program Files (x86)/Steam/steamapps/common/FINAL FANTASY XIV Online/game/sqpack" );
diff --git a/src/world/Navi/NaviProvider.cpp b/src/world/Navi/NaviProvider.cpp
index 433a2408..fc05f9bf 100644
--- a/src/world/Navi/NaviProvider.cpp
+++ b/src/world/Navi/NaviProvider.cpp
@@ -16,7 +16,7 @@
 #include <recastnavigation/Detour/Include/DetourNavMeshQuery.h>
 #include <DetourCommon.h>
 #include <recastnavigation/Recast/Include/Recast.h>
-#include <experimental/filesystem>
+#include <filesystem>
 
 Sapphire::World::Navi::NaviProvider::NaviProvider( const std::string& internalName, FrameworkPtr pFw ) :
   m_naviMesh( nullptr ),
@@ -34,12 +34,12 @@ bool Sapphire::World::Navi::NaviProvider::init()
 {
   auto& cfg = m_pFw->get< Sapphire::World::ServerMgr >()->getConfig();
 
-  auto meshesFolder = std::experimental::filesystem::path( cfg.navigation.meshPath );
-  auto meshFolder = meshesFolder / std::experimental::filesystem::path( m_internalName );
+  auto meshesFolder = std::filesystem::path( cfg.navigation.meshPath );
+  auto meshFolder = meshesFolder / std::filesystem::path( m_internalName );
 
-  if( std::experimental::filesystem::exists( meshFolder ) )
+  if( std::filesystem::exists( meshFolder ) )
   {
-    auto baseMesh = meshFolder / std::experimental::filesystem::path( m_internalName + ".nav" );
+    auto baseMesh = meshFolder / std::filesystem::path( m_internalName + ".nav" );
 
     if( !loadMesh( baseMesh.string() ) )
       return false;
diff --git a/src/world/Script/ScriptLoader.cpp b/src/world/Script/ScriptLoader.cpp
index ab72f61f..ace591a8 100644
--- a/src/world/Script/ScriptLoader.cpp
+++ b/src/world/Script/ScriptLoader.cpp
@@ -5,11 +5,11 @@
 #include <Util/Util.h>
 #include "ServerMgr.h"
 
-#include <experimental/filesystem>
+#include <filesystem>
 
 #include "Framework.h"
 
-namespace fs = std::experimental::filesystem;
+namespace fs = std::filesystem;
 
 const std::string Sapphire::Scripting::ScriptLoader::getModuleExtension()
 {
diff --git a/src/world/Script/ScriptMgr.cpp b/src/world/Script/ScriptMgr.cpp
index 6557b326..fc0a7736 100644
--- a/src/world/Script/ScriptMgr.cpp
+++ b/src/world/Script/ScriptMgr.cpp
@@ -27,7 +27,7 @@
 // enable the ambiguity fix for every platform to avoid #define nonsense
 #define WIN_AMBIGUITY_FIX
 
-namespace fs = std::experimental::filesystem;
+namespace fs = std::filesystem;
 
 Sapphire::Scripting::ScriptMgr::ScriptMgr( FrameworkPtr pFw ) :
   World::Manager::BaseManager( pFw ),
diff --git a/src/world/Session.cpp b/src/world/Session.cpp
index b1e2c615..273d20d0 100644
--- a/src/world/Session.cpp
+++ b/src/world/Session.cpp
@@ -1,4 +1,4 @@
-#include <experimental/filesystem>
+#include <filesystem>
 #include <time.h>
 
 #include <Util/Util.h>
@@ -10,7 +10,7 @@
 
 #include "Session.h"
 
-namespace fs = std::experimental::filesystem;
+namespace fs = std::filesystem;
 
 Sapphire::World::Session::Session( uint32_t sessionId, FrameworkPtr pFw ) :
   m_sessionId( sessionId ),
diff --git a/src/world/Territory/Housing/HousingInteriorTerritory.h b/src/world/Territory/Housing/HousingInteriorTerritory.h
index efc4860b..3ea97ae4 100644
--- a/src/world/Territory/Housing/HousingInteriorTerritory.h
+++ b/src/world/Territory/Housing/HousingInteriorTerritory.h
@@ -5,7 +5,7 @@
 
 namespace Sapphire::World::Territory::Housing
 {
-  class HousingInteriorTerritory : public Territory
+  class HousingInteriorTerritory : public Sapphire::Territory
   {
   public:
     HousingInteriorTerritory( Common::LandIdent ident, uint16_t territoryTypeId,

From 88bce0622e4a678cebca78e890f205b1cc061b2f Mon Sep 17 00:00:00 2001
From: NotAdam <adam@notadam.me>
Date: Mon, 14 Oct 2019 18:45:17 +1100
Subject: [PATCH 149/351] update travis config to use g++-8

---
 .travis.yml | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 375d4353..4c04e527 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -14,9 +14,10 @@ matrix:
           sources:
           - ubuntu-toolchain-r-test
           packages:
-          - g++-7
+          - g++-8
       env:
-      - MATRIX_EVAL="CC=gcc-7 && CXX=g++-7"
+      - MATRIX_EVAL="CC=gcc-8 && CXX=g++-8"
+      - CXX=g++-8
 
 # Setup cache
 cache:

From 3a3499e378ebb8e390084c49b3fe48929d3a4c25 Mon Sep 17 00:00:00 2001
From: NotAdam <adam@notadam.me>
Date: Mon, 14 Oct 2019 18:50:55 +1100
Subject: [PATCH 150/351] set arch flag correctly

---
 .appveyor.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.appveyor.yml b/.appveyor.yml
index 6efb5007..1413437f 100644
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@ -20,7 +20,7 @@ before_build:
   - git submodule update --init
   - mkdir build
   - cd build
-  - cmake .. -G "Visual Studio 16 2019 Win64"
+  - cmake .. -G "Visual Studio 16 2019" -A Win64
   - cmake --build . --target ALL_BUILD --config Release
 
 build_script:

From d1969452b11970980f3f1fe5ccb9ec1fcda36dd3 Mon Sep 17 00:00:00 2001
From: NotAdam <adam@notadam.me>
Date: Mon, 14 Oct 2019 18:57:31 +1100
Subject: [PATCH 151/351] actually gets past cmake now

---
 .appveyor.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.appveyor.yml b/.appveyor.yml
index 1413437f..ef08146f 100644
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@ -20,8 +20,8 @@ before_build:
   - git submodule update --init
   - mkdir build
   - cd build
-  - cmake .. -G "Visual Studio 16 2019" -A Win64
-  - cmake --build . --target ALL_BUILD --config Release
+  - cmake .. -G "Visual Studio 16 2019" -A x64
+  - cmake --build . --target ALL_BUILD --config RelWithDebInfo
 
 build_script:
   - cd bin  

From 99604a589c04c52a5d0af77d1717e48b59d721e2 Mon Sep 17 00:00:00 2001
From: NotAdam <adam@notadam.me>
Date: Mon, 14 Oct 2019 19:12:17 +1100
Subject: [PATCH 152/351] should actually build now... hopefully...

---
 deps/mysqlConnector/Connection.cpp | 4 ++++
 deps/mysqlConnector/Connection.h   | 2 ++
 src/api/PlayerMinimal.h            | 5 +++--
 src/common/Database/DbCommon.h     | 2 ++
 src/world/Linkshell/Linkshell.h    | 2 ++
 5 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/deps/mysqlConnector/Connection.cpp b/deps/mysqlConnector/Connection.cpp
index 9b317dc9..df6a28f0 100644
--- a/deps/mysqlConnector/Connection.cpp
+++ b/deps/mysqlConnector/Connection.cpp
@@ -4,6 +4,10 @@
 #include "PreparedStatement.h"
 #include <mysql.h>
 
+#ifdef _MSC_VER
+  // fixes compile error when compiling with vs2019
+  #include <stdexcept>
+#endif
 #include <vector>
 
 Mysql::Connection::Connection( std::shared_ptr< MySqlBase > pBase,
diff --git a/deps/mysqlConnector/Connection.h b/deps/mysqlConnector/Connection.h
index 1283ead5..43cc6e07 100644
--- a/deps/mysqlConnector/Connection.h
+++ b/deps/mysqlConnector/Connection.h
@@ -3,6 +3,8 @@
 
 #include <memory>
 #include <map>
+#include <string>
+
 #include "MysqlCommon.h"
 
 typedef struct st_mysql MYSQL;
diff --git a/src/api/PlayerMinimal.h b/src/api/PlayerMinimal.h
index d51251c2..a5e41b7b 100644
--- a/src/api/PlayerMinimal.h
+++ b/src/api/PlayerMinimal.h
@@ -2,8 +2,9 @@
 #define _PLAYERMINIMAL_H
 
 #include <map>
-#include <stdint.h>
-#include <string.h>
+#include <cstdint>
+#include <string>
+#include <cstring>
 
 namespace Sapphire::Api
 {
diff --git a/src/common/Database/DbCommon.h b/src/common/Database/DbCommon.h
index 89d537b6..d702ce72 100644
--- a/src/common/Database/DbCommon.h
+++ b/src/common/Database/DbCommon.h
@@ -1,6 +1,8 @@
 #ifndef SAPPHIRE_DBCOMMON_H
 #define SAPPHIRE_DBCOMMON_H
 
+#include <string>
+
 namespace Sapphire::Db
 {
   struct ConnectionInfo
diff --git a/src/world/Linkshell/Linkshell.h b/src/world/Linkshell/Linkshell.h
index 31d32717..b8b46079 100644
--- a/src/world/Linkshell/Linkshell.h
+++ b/src/world/Linkshell/Linkshell.h
@@ -3,6 +3,8 @@
 
 #include <Common.h>
 #include <set>
+#include <string>
+
 
 namespace Sapphire
 {

From b33c08fb9c032dcbb5ab7a398f816f48ef562c3b Mon Sep 17 00:00:00 2001
From: Supamiu <contact@flavien-normand.fr>
Date: Sat, 19 Oct 2019 14:12:07 +0200
Subject: [PATCH 153/351] Add premium saddlebag container ids

---
 src/common/Common.h | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/common/Common.h b/src/common/Common.h
index 7bb57000..564d6650 100644
--- a/src/common/Common.h
+++ b/src/common/Common.h
@@ -232,6 +232,9 @@ namespace Sapphire::Common
     
     SaddleBag0 = 4000,
     SaddleBag1 = 4001,
+    // These are the ones you get when paying for premium companion app
+    PremiumSaddleBag0 = 4100,
+    PremiumSaddleBag1 = 4101,
 
     RetainerBag0 = 10000,
     RetainerBag1 = 10001,

From b17af41e67322f8c4d3bf538a24a5c56a532bda7 Mon Sep 17 00:00:00 2001
From: Mordred <ffxivsapphire@gmail.com>
Date: Mon, 21 Oct 2019 23:24:26 +0200
Subject: [PATCH 154/351] Major rewrite of zonelines, aetherytes and
 discoveries

---
 deps/datReader/DatCategories/bg/LgbTypes.h    |  198 +
 deps/datReader/DatCategories/bg/lgb.h         |  243 +-
 deps/datReader/DatCategories/bg/sgb.h         |   12 +-
 deps/datReader/Index.cpp                      |    2 +-
 sql/schema/inserts.sql                        | 4377 -----------------
 sql/schema/schema.sql                         |    7 -
 src/common/Exd/ExdDataGenerated.h             |    5 +
 .../Network/PacketDef/Zone/ServerZoneDef.h    |    5 +-
 src/tools/discovery_parser/main.cpp           |  260 +-
 src/tools/event_object_parser/main.cpp        |   14 +-
 src/tools/exd_struct_gen/ExdData.h.tmpl       |    5 +
 src/tools/nav_export/lgb.h                    |   86 +-
 src/tools/nav_export/main.cpp                 |    2 +-
 src/tools/pcb_reader/lgb.h                    |   85 +-
 src/tools/pcb_reader/main.cpp                 |    2 +-
 src/world/Actor/Player.cpp                    |   21 +
 src/world/Manager/DebugCommandMgr.cpp         |   25 +-
 src/world/Network/Handlers/PacketHandlers.cpp |   80 +-
 src/world/ServerMgr.cpp                       |    6 +
 src/world/Territory/InstanceObjectCache.cpp   |  118 +
 src/world/Territory/InstanceObjectCache.h     |   84 +
 21 files changed, 738 insertions(+), 4899 deletions(-)
 create mode 100644 deps/datReader/DatCategories/bg/LgbTypes.h
 create mode 100644 src/world/Territory/InstanceObjectCache.cpp
 create mode 100644 src/world/Territory/InstanceObjectCache.h

diff --git a/deps/datReader/DatCategories/bg/LgbTypes.h b/deps/datReader/DatCategories/bg/LgbTypes.h
new file mode 100644
index 00000000..71c2319f
--- /dev/null
+++ b/deps/datReader/DatCategories/bg/LgbTypes.h
@@ -0,0 +1,198 @@
+#ifndef SAPPHIRE_LGBTYPES_H
+#define SAPPHIRE_LGBTYPES_H
+
+#include "vec3.h"
+
+enum class LgbEntryType : uint32_t
+{
+  BgParts = 1,
+  Attribute = 2,
+  Light = 3,
+  Vfx = 4,
+  PositionMarker = 5,
+  Gimmick = 6,
+  SharedGroup6 = 6,// secondary variable is set to 2
+  Sound = 7,
+  EventNpc = 8,
+  BattleNpc = 9,
+  RoutePath = 10,
+  Character = 11,
+  Aetheryte = 12,
+  EnvSpace = 13,
+  Gathering = 14,
+  SharedGroup15 = 15,// secondary variable is set to 13
+  Treasure = 16,
+  Player = 37,
+  Monster = 38,
+  Weapon = 39,
+  PopRange = 40,
+  ExitRange = 41,
+  LVB = 42,
+  MapRange = 43,
+  NaviMeshRange = 44,
+  EventObject = 45,
+  DemiHuman = 46,
+  EnvLocation = 47,
+  ControlPoint = 48,
+  EventRange = 49,
+  RestBonusRange = 50,
+  QuestMarker = 51,
+  TimeLine = 52,
+  ObjectBehaviorSet = 53,
+  Movie = 54,
+  ScenarioEXD = 55,
+  ScenarioText = 56,
+  CollisionBox = 57,
+  DoorRange = 58,
+  LineVfx = 59,
+  SoundEnvSet = 60,
+  CutActionTimeline = 61,
+  CharaScene = 62,
+  CutAction = 63,
+  EquipPreset = 64,
+  ClientPath = 65,
+  ServerPath = 66,
+  GimmickRange = 67,
+  TargetMarker = 68,
+  ChairMarker = 69,
+  ClickableRange = 70,
+  PrefetchRange = 71,
+  FateRange = 72,
+  PartyMember = 73,
+  KeepRange = 74,
+  SphereCastRange = 75,
+  IndoorObject = 76,
+  OutdoorObject = 77,
+  EditGroup = 78,
+  StableChocobo = 79
+};
+
+enum PopType : uint32_t
+{
+  PopTypePC = 0x1,
+  PopTypeNPC = 0x2,
+  PopTypeBNPC = 0x2,
+  PopTypeContent = 0x3,
+};
+
+struct Transformation
+{
+  vec3 translation;
+  vec3 rotation;
+  vec3 scale;
+};
+
+struct InstanceObject
+{
+  LgbEntryType type;
+  uint32_t instanceId;
+  uint32_t nameOffset;
+  Transformation transform;
+};
+
+struct BgPartsData : public InstanceObject
+{
+  uint32_t modelFileOffset;
+  uint32_t collisionFileOffset;
+  uint32_t unknown4;
+  uint32_t unknown5;
+  uint32_t unknown6;
+  uint32_t unknown7;
+  uint32_t unknown8;
+  uint32_t unknown9;
+};
+
+struct RelativePositions
+{
+  int32_t Pos;
+  int32_t PosCount;
+};
+
+struct PopRangeData : InstanceObject
+{
+  PopType popType;
+  RelativePositions relativePositions;
+  float innerRadiusRatio;
+  uint8_t index;
+  uint8_t padding00[3];
+  uint32_t reserved;
+};
+
+struct GimmickData : public InstanceObject
+{
+  uint32_t gimmickFileOffset;
+  char unknownBytes[100];
+};
+
+struct ENpcData : public InstanceObject
+{
+  uint32_t enpcId;
+  uint8_t unknown1[0x24];
+};
+
+struct EObjData : public InstanceObject
+{
+  uint32_t eobjId;
+  uint32_t levelHierachyId;
+  uint8_t unknown1[0xC];
+};
+
+enum TriggerBoxShape : uint32_t
+{
+  TriggerBoxShapeBox = 0x1,
+  TriggerBoxShapeSphere = 0x2,
+  TriggerBoxShapeCylinder = 0x3,
+  TriggerBoxShapeBoard = 0x4,
+  TriggerBoxShapeMesh = 0x5,
+  TriggerBoxShapeBoardBothSides = 0x6,
+};
+
+struct TriggerBoxInstanceObject
+{
+  TriggerBoxShape triggerBoxShape;
+  int16_t priority;
+  int8_t enabled;
+  uint8_t padding;
+  uint32_t reserved;
+};
+
+struct ExitRangeData : public InstanceObject
+{
+  TriggerBoxInstanceObject triggerBoxType;
+  uint32_t exitType;
+  uint16_t zoneId;
+  uint16_t destTerritoryType;
+  int index;
+  uint32_t destInstanceObjectId;
+  uint32_t returnInstanceObjectId;
+  float direction;
+  uint32_t reserved;
+};
+
+struct MapRangeData : public InstanceObject
+{
+  TriggerBoxInstanceObject triggerBoxType;
+  uint32_t mapId;
+  uint32_t placeNameBlock;
+  uint32_t placeNameSpot;
+  uint32_t bGM;
+  uint32_t weather;
+  uint32_t reserved;
+  uint32_t reserved2;
+  uint16_t reserved3;
+  uint8_t housingBlockId;
+  int8_t restBonusEffective;
+  uint8_t discoveryIndex;
+  int8_t mapEnabled;
+  int8_t placeNameEnabled;
+  int8_t discoveryEnabled;
+  int8_t bGMEnabled;
+  int8_t weatherEnabled;
+  int8_t restBonusEnabled;
+  int8_t bGMPlayZoneInOnly;
+  int8_t liftEnabled;
+  int8_t housingEnabled;
+  uint16_t padding;
+};
+
+#endif //SAPPHIRE_LGBTYPES_H
diff --git a/deps/datReader/DatCategories/bg/lgb.h b/deps/datReader/DatCategories/bg/lgb.h
index 50097735..00697184 100644
--- a/deps/datReader/DatCategories/bg/lgb.h
+++ b/deps/datReader/DatCategories/bg/lgb.h
@@ -12,87 +12,33 @@
 #include "matrix4.h"
 #include "vec3.h"
 #include "sgb.h"
+#include "LgbTypes.h"
 
-// garbage to skip model loading
-extern bool ignoreModels;
-
-// all credit to
-// https://github.com/ufx/SaintCoinach/blob/master/SaintCoinach/Graphics/Lgb/
-// this is simply their work ported to c++ since we dont c#
+// based on https://github.com/ufx/SaintCoinach/blob/master/SaintCoinach/Graphics/Lgb/
 struct LGB_FILE;
 struct LGB_FILE_HEADER;
 struct LGB_GROUP;
 struct LGB_GROUP_HEADER;
 
-enum class LgbEntryType :
-  uint32_t
-{
-  BgParts = 1,
-  Light = 3,
-  Vfx = 4,
-  PositionMarker = 5,
-  Gimmick = 6,
-  SharedGroup6 = 6,// secondary variable is set to 2
-  Sound = 7,
-  EventNpc = 8,
-  BattleNpc = 9,
-  Aetheryte = 12,
-  EnvSpace = 13,
-  Gathering = 14,
-  SharedGroup15 = 15,// secondary variable is set to 13
-  Treasure = 16,
-  Weapon = 39,
-  PopRange = 40,
-  ExitRange = 41,
-  MapRange = 43,
-  NaviMeshRange = 44,
-  EventObject = 45,
-  EnvLocation = 47,
-  EventRange = 49,
-  QuestMarker = 51,
-  CollisionBox = 57,
-  DoorRange = 58,
-  LineVfx = 59,
-  ClientPath = 65,
-  ServerPath = 66,
-  GimmickRange = 67,
-  TargetMarker = 68,
-  ChairMarker = 69,
-  ClickableRange = 70,
-  PrefetchRange = 71,
-  FateRange = 72,
-  SphereCastRange = 75,
-};
-
-struct LGB_ENTRY_HEADER
-{
-  LgbEntryType type;
-  uint32_t unknown;
-  uint32_t nameOffset;
-  vec3 translation;
-  vec3 rotation;
-  vec3 scale;
-};
-
-class LGB_ENTRY
+class LgbEntry
 {
 public:
   char* m_buf;
   uint32_t m_offset;
-  LGB_ENTRY_HEADER header;
+  InstanceObject header;
 
-  LGB_ENTRY()
+  LgbEntry()
   {
     m_buf = nullptr;
     m_offset = 0;
     memset( &header, 0, sizeof( header ) );
   };
 
-  LGB_ENTRY( char* buf, uint32_t offset )
+  LgbEntry( char* buf, uint32_t offset )
   {
     m_buf = buf;
     m_offset = offset;
-    header = *reinterpret_cast< LGB_ENTRY_HEADER* >( buf + offset );
+    header = *reinterpret_cast< InstanceObject* >( buf + offset );
   };
 
   const LgbEntryType getType() const
@@ -100,30 +46,16 @@ public:
     return header.type;
   };
 
-  virtual ~LGB_ENTRY()
+  virtual ~LgbEntry()
   {
   };
 };
 
 
-struct LGB_BGPARTS_HEADER :
-  public LGB_ENTRY_HEADER
-{
-  uint32_t modelFileOffset;
-  uint32_t collisionFileOffset;
-  uint32_t unknown4;
-  uint32_t unknown5;
-  uint32_t unknown6;
-  uint32_t unknown7;
-  uint32_t unknown8;
-  uint32_t unknown9;
-};
-
-class LGB_BGPARTS_ENTRY :
-  public LGB_ENTRY
+class LGB_BGPARTS_ENTRY : public LgbEntry
 {
 public:
-  LGB_BGPARTS_HEADER header;
+  BgPartsData header;
   std::string name;
   std::string modelFileName;
   std::string collisionFileName;
@@ -132,124 +64,95 @@ public:
   {
   };
 
-  LGB_BGPARTS_ENTRY( char* buf, uint32_t offset ) :
-    LGB_ENTRY( buf, offset )
+  LGB_BGPARTS_ENTRY( char* buf, uint32_t offset ) : LgbEntry( buf, offset )
   {
-    header = *reinterpret_cast<LGB_BGPARTS_HEADER*>( buf + offset );
+    header = *reinterpret_cast< BgPartsData* >( buf + offset );
     name = std::string( buf + offset + header.nameOffset );
     modelFileName = std::string( buf + offset + header.modelFileOffset );
     collisionFileName = std::string( buf + offset + header.collisionFileOffset );
   };
 };
 
-struct LGB_GIMMICK_HEADER :
-  public LGB_ENTRY_HEADER
-{
-  uint32_t gimmickFileOffset;
-  char unknownBytes[100];
-};
-
-class LGB_GIMMICK_ENTRY :
-  public LGB_ENTRY
+class LGB_GIMMICK_ENTRY : public LgbEntry
 {
 public:
-  LGB_GIMMICK_HEADER header;
+  GimmickData header;
   std::string name;
   std::string gimmickFileName;
 
-  LGB_GIMMICK_ENTRY( char* buf, uint32_t offset ) :
-    LGB_ENTRY( buf, offset )
+  LGB_GIMMICK_ENTRY( char* buf, uint32_t offset ) : LgbEntry( buf, offset )
   {
-    header = *reinterpret_cast<LGB_GIMMICK_HEADER*>( buf + offset );
+    header = *reinterpret_cast< GimmickData* >( buf + offset );
     name = std::string( buf + offset + header.nameOffset );
     gimmickFileName = std::string( buf + offset + header.gimmickFileOffset );
-    //std::cout << "\t " << gimmickFileName << " unknown: " << header.unknown << "\n";
   };
 };
 
-struct LGB_ENPC_HEADER :
-  public LGB_ENTRY_HEADER
-{
-  uint32_t enpcId;
-  uint8_t unknown1[0x24];
-};
-
-class LGB_ENPC_ENTRY :
-  public LGB_ENTRY
+class LGB_ENPC_ENTRY : public LgbEntry
 {
 public:
-  LGB_ENPC_HEADER header;
+  ENpcData header;
   std::string name;
 
   LGB_ENPC_ENTRY( char* buf, uint32_t offset ) :
-    LGB_ENTRY( buf, offset )
+    LgbEntry( buf, offset )
   {
-    header = *reinterpret_cast< LGB_ENPC_HEADER* >( buf + offset );
-    name = std::string( buf + offset + header.nameOffset );
-    //std::cout << "\t ENpc " << header.enpcId << " " << name << "\n";
-  };
-};
-
-struct LGB_EOBJ_HEADER :
-  public LGB_ENTRY_HEADER
-{
-  uint32_t eobjId;
-  uint32_t levelHierachyId;
-  uint8_t unknown1[0xC];
-};
-
-class LGB_EOBJ_ENTRY :
-  public LGB_ENTRY
-{
-public:
-  LGB_EOBJ_HEADER header;
-  std::string name;
-
-  LGB_EOBJ_ENTRY( char* buf, uint32_t offset ) :
-    LGB_ENTRY( buf, offset )
-  {
-    header = *reinterpret_cast< LGB_EOBJ_HEADER* >( buf + offset );
-    //std::cout << "\t " << header.eobjId << " " << name << " unknown: " << header.unknown << "\n";
+    header = *reinterpret_cast< ENpcData* >( buf + offset );
     name = std::string( buf + offset + header.nameOffset );
   };
 };
 
-struct LGB_MAPRANGE_HEADER :
-  public LGB_ENTRY_HEADER
-{
-  uint32_t type;
-  uint8_t unknown2;
-  uint8_t unknown2_1;
-  uint16_t unknown3;
-  uint32_t unknown5;
-  uint32_t mapId;
-  uint32_t offsetX;
-  uint32_t offsetY;
-  uint32_t unkInts[4];
-  uint16_t unkShort;
-  uint8_t unkFlag;
-  uint8_t unkFlag2;
-  uint8_t discoveryIndex;
-  uint8_t unkFlag3;
-  uint8_t unkFlag4;
-  uint8_t unknown4[0x09];
-};
-
-struct LGB_MAPRANGE_ENTRY :
-  public LGB_ENTRY
+class LGB_EOBJ_ENTRY : public LgbEntry
 {
 public:
-  LGB_MAPRANGE_HEADER header;
+  EObjData header;
   std::string name;
 
-  LGB_MAPRANGE_ENTRY( char* buf, uint32_t offset ) :
-    LGB_ENTRY( buf, offset )
+  LGB_EOBJ_ENTRY( char* buf, uint32_t offset ) : LgbEntry( buf, offset )
   {
-    header = *reinterpret_cast< LGB_MAPRANGE_HEADER* >( buf + offset );
+    header = *reinterpret_cast< EObjData* >( buf + offset );
     name = std::string( buf + offset + header.nameOffset );
   };
 };
 
+struct LGB_MAP_RANGE_ENTRY : public LgbEntry
+{
+public:
+  MapRangeData header;
+  std::string name;
+
+  LGB_MAP_RANGE_ENTRY( char* buf, uint32_t offset ) : LgbEntry( buf, offset )
+  {
+    header = *reinterpret_cast< MapRangeData* >( buf + offset );
+    name = std::string( buf + offset + header.nameOffset );
+  };
+};
+
+struct LGB_EXIT_RANGE_ENTRY : public LgbEntry
+{
+public:
+  ExitRangeData header;
+  std::string name;
+
+  LGB_EXIT_RANGE_ENTRY( char* buf, uint32_t offset ) : LgbEntry( buf, offset )
+  {
+    header = *reinterpret_cast< ExitRangeData* >( buf + offset );
+    name = std::string( buf + offset + header.nameOffset );
+
+  };
+};
+
+struct LGB_POP_RANGE_ENTRY : public LgbEntry
+{
+public:
+  PopRangeData header;
+
+  LGB_POP_RANGE_ENTRY( char* buf, uint32_t offset ) : LgbEntry( buf, offset )
+  {
+    header = *reinterpret_cast< PopRangeData* >( buf + offset );
+  };
+};
+
 struct LGB_GROUP_HEADER
 {
   uint32_t id;
@@ -272,15 +175,13 @@ struct LGB_GROUP
   LGB_FILE* parent;
   LGB_GROUP_HEADER header;
   std::string name;
-  std::vector< std::shared_ptr< LGB_ENTRY > > entries;
+  std::vector< std::shared_ptr< LgbEntry > > entries;
 
   LGB_GROUP( char* buf, LGB_FILE* parentStruct, uint32_t offset )
   {
     parent = parentStruct;
     header = *reinterpret_cast< LGB_GROUP_HEADER* >( buf + offset );
     name = std::string( buf + offset + header.groupNameOffset );
-    //entries.resize( header.entryCount );
-    //std::cout << name << "\n\t unknown: " << header.unknown << "\n";
     const auto entriesOffset = offset + header.entriesOffset;
     for( auto i = 0; i < header.entryCount; ++i )
     {
@@ -288,8 +189,7 @@ struct LGB_GROUP
 
       try
       {
-        const auto type = *reinterpret_cast<LgbEntryType*>( buf + entryOffset );
-        // garbage to skip model loading
+        const auto type = *reinterpret_cast< LgbEntryType* >( buf + entryOffset );
         if( type == LgbEntryType::BgParts )
         {
           entries.push_back( std::make_shared< LGB_BGPARTS_ENTRY >( buf, entryOffset ) );
@@ -306,16 +206,18 @@ struct LGB_GROUP
         {
           entries.push_back( std::make_shared< LGB_EOBJ_ENTRY >( buf, entryOffset ) );
         }
+        else if( type == LgbEntryType::ExitRange )
+        {
+          entries.push_back( std::make_shared< LGB_EXIT_RANGE_ENTRY >( buf, entryOffset ) );
+        }
         else if( type == LgbEntryType::MapRange )
         {
-          entries.push_back( std::make_shared< LGB_MAPRANGE_ENTRY >( buf, entryOffset ) );
+          entries.push_back( std::make_shared< LGB_MAP_RANGE_ENTRY >( buf, entryOffset ) );
         }
         else
         {
-           entries.push_back( std::make_shared< LGB_ENTRY >( buf, entryOffset ) );
+          entries.push_back( std::make_shared< LgbEntry >( buf, entryOffset ) );
         }
-
-
       }
       catch( std::exception& e )
       {
@@ -344,8 +246,7 @@ struct LGB_FILE
   std::vector< LGB_GROUP > groups;
   std::string m_name;
 
-  LGB_FILE( char* buf, const std::string& name ) :
-    LGB_FILE( buf )
+  LGB_FILE( char* buf, const std::string& name ) : LGB_FILE( buf )
   {
     m_name = name;
   }
@@ -356,8 +257,6 @@ struct LGB_FILE
     if( strncmp( &header.magic[ 0 ], "LGB1", 4 ) != 0 || strncmp( &header.magic2[ 0 ], "LGP1", 4 ) != 0 )
       throw std::runtime_error( "Invalid LGB file!" );
 
-    //groups.resize(header.groupCount);
-
     constexpr auto baseOffset = sizeof( header );
     for( auto i = 0; i < header.groupCount; ++i )
     {
diff --git a/deps/datReader/DatCategories/bg/sgb.h b/deps/datReader/DatCategories/bg/sgb.h
index fb384b69..fbf23f5a 100644
--- a/deps/datReader/DatCategories/bg/sgb.h
+++ b/deps/datReader/DatCategories/bg/sgb.h
@@ -22,15 +22,13 @@ struct SGB_GROUP;
 struct SGB_GROUP_HEADER;
 
 
-enum SgbDataType :
-  uint32_t
+enum SgbDataType : uint32_t
 {
   Unknown0008 = 0x0008,
   Group = 0x0100,
 };
 
-enum SgbGroupEntryType :
-  uint32_t
+enum SgbGroupEntryType : uint32_t
 {
   Model = 0x01,
   Gimmick = 0x06,
@@ -124,15 +122,13 @@ struct SGB_ENTRY_HEADER
   vec3 scale;
 };
 
-struct SGB_MODEL_HEADER :
-  public SGB_ENTRY_HEADER
+struct SGB_MODEL_HEADER : public SGB_ENTRY_HEADER
 {
   int32_t modelFileOffset;
   int32_t collisionFileOffset;
 };
 
-struct SGB_MODEL_ENTRY :
-  public SGB_GROUP_ENTRY
+struct SGB_MODEL_ENTRY : public SGB_GROUP_ENTRY
 {
   SGB_MODEL_HEADER header;
   SgbGroupEntryType type;
diff --git a/deps/datReader/Index.cpp b/deps/datReader/Index.cpp
index 92dfb5da..e7985396 100644
--- a/deps/datReader/Index.cpp
+++ b/deps/datReader/Index.cpp
@@ -84,7 +84,7 @@ Index::Index(const std::experimental::filesystem::path& path) :
       // The dat number is found in the offset, last four bits
       hashTableEntry.datNum = ( indexHashTableEntry.datOffset & 0xF ) / 0x2;
       // The offset in the dat file, needs to strip the dat number indicator
-      hashTableEntry.datOffset = ( indexHashTableEntry.datOffset & 0xFFFFFFF0 ) * 0x08;
+      hashTableEntry.datOffset = ( indexHashTableEntry.datOffset - ( indexHashTableEntry.datOffset & 0x000F ) ) * 0x08;
       hashTableEntry.dirHash = indexHashTableEntry.dirHash;
       hashTableEntry.filenameHash = indexHashTableEntry.filenameHash;
    }
diff --git a/sql/schema/inserts.sql b/sql/schema/inserts.sql
index bcecda18..cb94763b 100644
--- a/sql/schema/inserts.sql
+++ b/sql/schema/inserts.sql
@@ -424,4383 +424,6 @@ INSERT IGNORE INTO `bnpctemplate` ( `Name`, `bNPCBaseId`, `bNPCNameId`, `mainWea
 INSERT IGNORE INTO `bnpctemplate` ( `Name`, `bNPCBaseId`, `bNPCNameId`, `mainWeaponModel`, `secWeaponModel`, `aggressionMode`, `enemyType`, `pose`, `modelChara`, `displayFlags`, `Look`, `Models`) VALUES ( "servantofthesage_8754", 8754, 7205, 0, 0, 3, 4, 0, 2270, 262147, UNHEX( '0000000000000000000000000000000000000000000000000000'), UNHEX( '00000000000000000000000000000000000000000000000000000000000000000000000000000000') );
 INSERT IGNORE INTO `bnpctemplate` ( `Name`, `bNPCBaseId`, `bNPCNameId`, `mainWeaponModel`, `secWeaponModel`, `aggressionMode`, `enemyType`, `pose`, `modelChara`, `displayFlags`, `Look`, `Models`) VALUES ( "saitaisui_8780", 8780, 7206, 4295302988, 0, 1, 4, 0, 2218, 12, UNHEX( '0000000000000000000000000000000000000000000000000000'), UNHEX( '00000000000000000000000000000000000000000000000000000000000000000000000000000000') );
 
-INSERT INTO `discoveryinfo` (`id`, `map_id`, `discover_id`) VALUES
-(1367775, 4, 2),
-(1367776, 4, 2),
-(1367777, 4, 2),
-(1367778, 4, 1),
-(1367779, 4, 2),
-(1367780, 4, 3),
-(1367785, 4, 3),
-(1367793, 4, 2),
-(1367798, 4, 1),
-(1367800, 4, 2),
-(1367801, 4, 2),
-(1367823, 4, 2),
-(1420009, 4, 5),
-(1420010, 4, 5),
-(1420011, 4, 2),
-(1420012, 4, 5),
-(1420013, 4, 5),
-(1436587, 4, 2),
-(1436597, 4, 5),
-(1436598, 4, 5),
-(1436599, 4, 5),
-(1436600, 4, 2),
-(1436601, 4, 2),
-(1436602, 4, 2),
-(1436603, 4, 2),
-(1436604, 4, 2),
-(1436605, 4, 2),
-(1436606, 4, 2),
-(2052662, 4, 7),
-(2052668, 4, 8),
-(2052672, 4, 13),
-(2052682, 4, 9),
-(2052693, 4, 12),
-(2052695, 4, 12),
-(2052698, 4, 10),
-(2052699, 4, 10),
-(2052705, 4, 11),
-(2052706, 4, 11),
-(2052708, 4, 10),
-(2052710, 4, 6),
-(2052711, 4, 6),
-(2052714, 4, 5),
-(2052716, 4, 5),
-(2052721, 4, 5),
-(2052722, 4, 5),
-(2052724, 4, 5),
-(2065858, 9, 1),
-(2065859, 9, 6),
-(2065860, 9, 6),
-(2065861, 9, 3),
-(2065866, 9, 4),
-(2065867, 9, 4),
-(2065868, 9, 4),
-(2065869, 9, 4),
-(2065870, 9, 4),
-(2065871, 9, 2),
-(2065872, 9, 7),
-(2065873, 9, 9),
-(2065875, 9, 9),
-(2065877, 9, 5),
-(2065879, 9, 3),
-(2065880, 9, 5),
-(2065882, 9, 8),
-(2065883, 9, 8),
-(2065961, 5, 1),
-(2065962, 5, 1),
-(2065963, 5, 1),
-(2065970, 5, 2),
-(2065974, 5, 17),
-(2065975, 5, 13),
-(2065981, 5, 16),
-(2065986, 5, 4),
-(2065987, 5, 5),
-(2065988, 5, 5),
-(2065992, 5, 4),
-(2065994, 5, 4),
-(2065995, 5, 5),
-(2065996, 5, 4),
-(2065997, 5, 3),
-(2065998, 5, 3),
-(2065999, 5, 3),
-(2066000, 5, 3),
-(2066001, 5, 3),
-(2066002, 5, 6),
-(2066003, 5, 6),
-(2066004, 5, 7),
-(2066007, 5, 7),
-(2066011, 5, 7),
-(2066013, 5, 9),
-(2066018, 5, 10),
-(2066019, 5, 10),
-(2066021, 5, 10),
-(2066022, 5, 12),
-(2066023, 5, 12),
-(2066024, 5, 15),
-(2066027, 5, 11),
-(2066029, 5, 19),
-(2066030, 5, 18),
-(2112183, 9, 6),
-(2112184, 9, 6),
-(2112186, 9, 7),
-(2112188, 9, 5),
-(2112189, 9, 4),
-(2152921, 4, 3),
-(2152922, 4, 3),
-(2152923, 4, 4),
-(2152925, 4, 4),
-(2152926, 4, 1),
-(2152928, 4, 2),
-(2152930, 4, 5),
-(2152931, 4, 5),
-(2152933, 4, 5),
-(2152934, 4, 5),
-(2152935, 4, 5),
-(2152936, 4, 5),
-(2152937, 4, 5),
-(2152938, 4, 5),
-(2152939, 4, 8),
-(2152941, 4, 8),
-(2152942, 4, 8),
-(2152943, 4, 8),
-(2152944, 4, 7),
-(2152945, 4, 7),
-(2152946, 4, 7),
-(2152949, 4, 7),
-(2152950, 4, 7),
-(2152951, 4, 7),
-(2152952, 4, 7),
-(2152953, 4, 7),
-(2152954, 4, 7),
-(2152955, 4, 8),
-(2152956, 4, 9),
-(2152957, 4, 11),
-(2152963, 4, 11),
-(2152965, 4, 11),
-(2152966, 4, 13),
-(2152967, 4, 13),
-(2264614, 7, 1),
-(2264620, 7, 1),
-(2264625, 7, 1),
-(2264626, 7, 2),
-(2264633, 7, 3),
-(2264634, 7, 3),
-(2264636, 7, 3),
-(2264637, 7, 3),
-(2264640, 7, 10),
-(2264642, 7, 10),
-(2264643, 7, 10),
-(2264649, 7, 11),
-(2264653, 7, 12),
-(2264660, 7, 12),
-(2264662, 7, 13),
-(2264669, 7, 2),
-(2264671, 7, 14),
-(2264672, 7, 15),
-(2264673, 7, 16),
-(2264674, 7, 4),
-(2264675, 7, 5),
-(2264676, 7, 6),
-(2264682, 7, 8),
-(2264685, 7, 9),
-(2264705, 7, 1),
-(2264721, 7, 1),
-(2264728, 7, 1),
-(2264731, 7, 3),
-(2264736, 7, 8),
-(2264772, 7, 16),
-(2264773, 7, 7),
-(2264775, 7, 11),
-(2264791, 7, 15),
-(2264796, 7, 3),
-(2264798, 7, 16),
-(2264807, 7, 1),
-(2280307, 6, 1),
-(2280313, 6, 2),
-(2280316, 6, 3),
-(2280318, 6, 3),
-(2280320, 6, 4),
-(2280327, 6, 4),
-(2280330, 6, 4),
-(2280347, 6, 5),
-(2280351, 6, 5),
-(2280358, 6, 5),
-(2280362, 6, 6),
-(2280365, 6, 7),
-(2280369, 6, 7),
-(2280371, 6, 8),
-(2280375, 6, 15),
-(2280388, 6, 13),
-(2280391, 6, 14),
-(2280395, 6, 14),
-(2280400, 6, 9),
-(2280402, 6, 10),
-(2280403, 6, 10),
-(2280404, 6, 12),
-(2280406, 6, 11),
-(2280409, 6, 1),
-(2280410, 6, 2),
-(2280414, 6, 4),
-(2280425, 6, 3),
-(2280426, 6, 3),
-(2280428, 6, 2),
-(2280430, 6, 9),
-(2280432, 6, 9),
-(2280448, 6, 10),
-(2280451, 6, 12),
-(2280453, 6, 11),
-(2280455, 6, 7),
-(2280456, 6, 5),
-(2280458, 6, 8),
-(2280461, 6, 16),
-(2280464, 6, 6),
-(2299601, 6, 6),
-(2308332, 5, 1),
-(2308333, 5, 3),
-(2308340, 5, 3),
-(2308346, 5, 3),
-(2308354, 5, 5),
-(2308355, 5, 4),
-(2308361, 5, 8),
-(2308363, 5, 16),
-(2308364, 5, 13),
-(2308366, 5, 17),
-(2341847, 7, 4),
-(2341870, 7, 6),
-(2341892, 7, 10),
-(2349784, 4, 5),
-(2349791, 4, 2),
-(2349792, 4, 5),
-(2349794, 4, 5),
-(2349857, 4, 5),
-(2349858, 4, 5),
-(2349860, 4, 5),
-(2351856, 6, 4),
-(2351858, 6, 4),
-(2351870, 6, 4),
-(2381027, 6, 4),
-(2381028, 6, 4),
-(2381029, 6, 10),
-(2381030, 6, 8),
-(2381031, 6, 6),
-(2381032, 6, 7),
-(2381033, 6, 4),
-(2381034, 6, 4),
-(2381035, 6, 4),
-(2381036, 6, 4),
-(2381037, 6, 4),
-(2381038, 6, 4),
-(2381039, 6, 7),
-(2381040, 6, 13),
-(2381041, 6, 7),
-(2381044, 6, 4),
-(2422825, 6, 4),
-(2453661, 6, 4),
-(2453677, 7, 1),
-(2453678, 7, 13),
-(2453679, 7, 15),
-(2453681, 7, 13),
-(2453682, 7, 13),
-(2453685, 7, 5),
-(2453686, 7, 8),
-(2453687, 7, 8),
-(2453688, 7, 8),
-(2453689, 7, 8),
-(2453690, 7, 8),
-(2465005, 4, 4),
-(2465008, 4, 6),
-(2465009, 4, 6),
-(2465010, 4, 2),
-(2465013, 4, 2),
-(2465017, 4, 10),
-(2465018, 4, 13),
-(2465019, 4, 10),
-(2465025, 4, 9),
-(2465028, 4, 9),
-(2465029, 4, 9),
-(2465059, 5, 3),
-(2465060, 5, 19),
-(2465061, 5, 19),
-(2465064, 5, 12),
-(2465069, 5, 15),
-(2465072, 5, 17),
-(2496282, 4, 11),
-(2496289, 4, 5),
-(2496437, 4, 2),
-(2499345, 7, 1),
-(2563317, 5, 1),
-(2563790, 6, 5),
-(2563792, 6, 5),
-(2563798, 6, 4),
-(2563804, 6, 12),
-(2563859, 6, 9),
-(2563867, 6, 9),
-(2563868, 6, 9),
-(2563872, 6, 9),
-(2563875, 6, 9),
-(2563882, 7, 1),
-(2564149, 4, 11),
-(2564152, 4, 11),
-(2564171, 4, 11),
-(2622826, 4, 5),
-(2622881, 4, 11),
-(2622884, 4, 11),
-(2622886, 4, 11),
-(2652480, 4, 1),
-(2652490, 4, 1),
-(2763450, 6, 7),
-(2763451, 6, 7),
-(2763452, 6, 7),
-(2927639, 5, 6),
-(3643234, 16, 1),
-(3643236, 16, 1),
-(3643414, 16, 2),
-(3643415, 16, 2),
-(3643457, 16, 3),
-(3643485, 16, 3),
-(3643486, 16, 3),
-(3643487, 16, 3),
-(3643488, 16, 3),
-(3643489, 16, 4),
-(3643491, 16, 6),
-(3643495, 16, 7),
-(3643496, 16, 7),
-(3643498, 16, 7),
-(3643499, 16, 7),
-(3643500, 16, 10),
-(3643501, 16, 7),
-(3643502, 16, 10),
-(3643503, 16, 10),
-(3643504, 16, 10),
-(3643505, 16, 10),
-(3643506, 16, 9),
-(3643507, 16, 9),
-(3643509, 16, 8),
-(3643556, 16, 2),
-(3643588, 16, 2),
-(3643589, 16, 2),
-(3643590, 16, 1),
-(3643597, 16, 3),
-(3643598, 16, 4),
-(3643602, 16, 5),
-(3643604, 16, 9),
-(3643605, 16, 8),
-(3643606, 16, 10),
-(3643607, 16, 8),
-(3643649, 21, 1),
-(3643706, 21, 1),
-(3643707, 21, 3),
-(3643708, 21, 1),
-(3643709, 21, 2),
-(3643715, 21, 4),
-(3643728, 21, 4),
-(3643815, 21, 5),
-(3643825, 21, 5),
-(3643831, 21, 3),
-(3643841, 21, 6),
-(3643859, 21, 7),
-(3643862, 21, 5),
-(3643864, 21, 8),
-(3643865, 21, 5),
-(3643871, 21, 8),
-(3643879, 21, 6),
-(3645046, 21, 10),
-(3645058, 21, 10),
-(3645548, 21, 9),
-(3645576, 21, 9),
-(3645590, 21, 11),
-(3645591, 21, 9),
-(3645607, 21, 9),
-(3645675, 21, 11),
-(3645684, 21, 11),
-(3645746, 21, 12),
-(3645751, 21, 13),
-(3645793, 21, 12),
-(3645800, 21, 12),
-(3646818, 21, 1),
-(3646820, 21, 1),
-(3646848, 21, 3),
-(3646849, 21, 3),
-(3647060, 21, 4),
-(3647062, 21, 5),
-(3647073, 21, 6),
-(3647079, 21, 7),
-(3647131, 21, 8),
-(3647136, 21, 10),
-(3647138, 21, 6),
-(3647142, 21, 9),
-(3647308, 21, 12),
-(3649749, 21, 6),
-(3649760, 21, 6),
-(3692932, 16, 2),
-(3692933, 16, 1),
-(3692941, 16, 7),
-(3692942, 16, 2),
-(3692943, 16, 7),
-(3692944, 16, 7),
-(3692948, 16, 2),
-(3692961, 16, 3),
-(3692965, 16, 3),
-(3692973, 16, 4),
-(3692975, 16, 4),
-(3692976, 16, 4),
-(3692977, 16, 4),
-(3693075, 16, 4),
-(3693080, 16, 4),
-(3693104, 16, 6),
-(3693126, 16, 5),
-(3693128, 16, 5),
-(3693148, 16, 7),
-(3693159, 16, 7),
-(3693168, 16, 7),
-(3693169, 16, 7),
-(3693181, 16, 10),
-(3693182, 16, 7),
-(3693189, 16, 8),
-(3693190, 16, 8),
-(3746497, 9, 1),
-(3746504, 9, 10),
-(3746513, 9, 1),
-(3746515, 9, 11),
-(3746546, 9, 7),
-(3746643, 9, 8),
-(3746648, 9, 12),
-(3746649, 9, 13),
-(3746650, 9, 13),
-(3762950, 9, 2),
-(3784410, 9, 1),
-(3784508, 9, 2),
-(3784514, 9, 2),
-(3784517, 9, 2),
-(3784520, 9, 2),
-(3784522, 9, 2),
-(3784563, 9, 7),
-(3784565, 9, 7),
-(3861103, 16, 2),
-(3861106, 16, 2),
-(3861109, 16, 2),
-(3861111, 16, 2),
-(3861113, 16, 2),
-(3899968, 7, 15),
-(3907414, 4, 5),
-(3907879, 4, 1),
-(3907888, 4, 1),
-(3907897, 4, 2),
-(3907899, 4, 2),
-(3907901, 4, 2),
-(3907902, 4, 2),
-(3907903, 4, 2),
-(3907908, 4, 2),
-(3907909, 4, 2),
-(3908308, 4, 9),
-(3908312, 4, 9),
-(3908313, 4, 9),
-(3923782, 16, 3),
-(3923784, 16, 3),
-(3923785, 16, 3),
-(3923789, 16, 3),
-(3923790, 16, 3),
-(3925825, 4, 11),
-(3929402, 4, 1),
-(3975004, 15, 1),
-(3975007, 15, 2),
-(3975011, 15, 3),
-(3975015, 15, 6),
-(3975127, 15, 1),
-(3975132, 15, 1),
-(3975135, 15, 3),
-(3975138, 15, 2),
-(3975183, 15, 3),
-(3975188, 15, 3),
-(3975191, 15, 3),
-(3975192, 15, 3),
-(3975196, 15, 4),
-(3975198, 15, 4),
-(3975202, 15, 4),
-(3975204, 15, 4),
-(3975205, 15, 4),
-(3975208, 15, 4),
-(3975212, 15, 4),
-(3975215, 15, 3),
-(3975217, 15, 3),
-(3975223, 15, 3),
-(3975229, 15, 3),
-(3975232, 15, 3),
-(3975233, 15, 5),
-(3975242, 15, 5),
-(3975244, 15, 5),
-(3975251, 15, 6),
-(3975256, 15, 5),
-(3975261, 15, 7),
-(3975267, 15, 6),
-(3975272, 15, 6),
-(3975278, 15, 6),
-(3975282, 15, 6),
-(3975283, 15, 6),
-(3975285, 15, 6),
-(4091012, 31, 1),
-(4091018, 31, 2),
-(4091019, 31, 2),
-(4092388, 31, 1),
-(4092418, 31, 3),
-(4092425, 31, 4),
-(4092429, 31, 4),
-(4092430, 31, 7),
-(4092431, 31, 9),
-(4092432, 31, 8),
-(4092433, 31, 4),
-(4092435, 31, 7),
-(4092436, 31, 4),
-(4092437, 31, 4),
-(4092438, 31, 10),
-(4092439, 31, 10),
-(4092440, 31, 10),
-(4092444, 31, 11),
-(4092449, 31, 11),
-(4092471, 31, 3),
-(4092472, 31, 3),
-(4092534, 31, 1),
-(4092536, 31, 2),
-(4092537, 31, 2),
-(4092538, 31, 3),
-(4092539, 31, 3),
-(4092540, 31, 4),
-(4092541, 31, 4),
-(4092542, 31, 7),
-(4092543, 31, 7),
-(4092544, 31, 8),
-(4092545, 31, 4),
-(4092546, 31, 9),
-(4092547, 31, 10),
-(4092548, 31, 11),
-(4098244, 20, 1),
-(4098246, 20, 2),
-(4098252, 20, 2),
-(4098653, 20, 2),
-(4098655, 20, 3),
-(4098662, 20, 5),
-(4098665, 20, 6),
-(4098675, 20, 6),
-(4098680, 20, 7),
-(4098686, 20, 8),
-(4098719, 20, 10),
-(4098723, 20, 10),
-(4098733, 20, 12),
-(4098786, 20, 1),
-(4098790, 20, 1),
-(4098794, 20, 1),
-(4098812, 20, 1),
-(4098843, 20, 4),
-(4098858, 20, 2),
-(4098869, 20, 2),
-(4098978, 20, 5),
-(4098984, 20, 3),
-(4098990, 20, 3),
-(4098991, 20, 3),
-(4098996, 20, 4),
-(4099007, 20, 4),
-(4099014, 20, 7),
-(4099017, 20, 6),
-(4099024, 20, 6),
-(4099214, 20, 6),
-(4099220, 20, 6),
-(4099234, 20, 6),
-(4099313, 20, 8),
-(4099338, 20, 8),
-(4099357, 20, 8),
-(4099376, 20, 9),
-(4099424, 20, 10),
-(4099430, 20, 10),
-(4099464, 20, 12),
-(4101783, 24, 1),
-(4101846, 24, 2),
-(4101870, 24, 3),
-(4101889, 24, 4),
-(4101896, 24, 4),
-(4101900, 24, 5),
-(4101904, 24, 5),
-(4101907, 24, 6),
-(4101914, 24, 8),
-(4102354, 24, 1),
-(4102358, 24, 1),
-(4102359, 24, 1),
-(4102360, 24, 1),
-(4102361, 24, 2),
-(4102365, 24, 3),
-(4102371, 24, 3),
-(4102372, 24, 3),
-(4102373, 24, 3),
-(4102375, 24, 6),
-(4102377, 24, 4),
-(4102378, 24, 4),
-(4102379, 24, 4),
-(4102381, 24, 8),
-(4103415, 31, 4),
-(4107623, 41, 8),
-(4121883, 45, 1),
-(4121897, 45, 2),
-(4121909, 45, 3),
-(4121915, 45, 3),
-(4121922, 45, 4),
-(4123952, 45, 4),
-(4123953, 45, 5),
-(4125929, 45, 6),
-(4125941, 45, 7),
-(4125947, 45, 8),
-(4125950, 45, 8),
-(4125987, 45, 9),
-(4125993, 45, 10),
-(4126016, 45, 11),
-(4126017, 45, 8),
-(4126028, 45, 11),
-(4126039, 45, 12),
-(4126040, 45, 13),
-(4126043, 45, 13),
-(4126044, 45, 13),
-(4126049, 45, 14),
-(4126052, 45, 15),
-(4126375, 45, 2),
-(4126377, 45, 3),
-(4126378, 45, 7),
-(4126383, 45, 11),
-(4126384, 45, 11),
-(4126386, 45, 11),
-(4126394, 45, 15),
-(4127125, 45, 8),
-(4127126, 45, 8),
-(4127132, 45, 9),
-(4127137, 45, 12),
-(4127141, 45, 12),
-(4142953, 41, 10),
-(4142959, 41, 13),
-(4142960, 41, 9),
-(4143007, 41, 8),
-(4143009, 41, 9),
-(4143011, 41, 8),
-(4143012, 41, 11),
-(4143014, 41, 9),
-(4143143, 41, 13),
-(4143144, 41, 13),
-(4143146, 41, 13),
-(4143147, 41, 13),
-(4143154, 41, 13),
-(4161435, 15, 1),
-(4161439, 15, 3),
-(4161440, 15, 3),
-(4161442, 15, 3),
-(4161449, 15, 4),
-(4161453, 15, 4),
-(4161456, 15, 6),
-(4161457, 15, 6),
-(4161462, 15, 5),
-(4162133, 17, 1),
-(4162142, 17, 3),
-(4162143, 17, 4),
-(4162144, 17, 5),
-(4162145, 17, 6),
-(4162147, 17, 8),
-(4162148, 17, 9),
-(4162150, 17, 11),
-(4162153, 17, 12),
-(4162154, 17, 13),
-(4162155, 17, 13),
-(4162317, 17, 10),
-(4162319, 17, 7),
-(4162320, 17, 6),
-(4162321, 17, 6),
-(4162322, 17, 12),
-(4162323, 17, 4),
-(4162324, 17, 5),
-(4162325, 17, 2),
-(4162326, 17, 2),
-(4162328, 17, 2),
-(4162329, 17, 1),
-(4164611, 17, 12),
-(4164620, 17, 6),
-(4164648, 17, 8),
-(4164654, 17, 8),
-(4164656, 17, 8),
-(4164663, 17, 10),
-(4164693, 17, 6),
-(4164698, 17, 4),
-(4164699, 17, 4),
-(4164700, 17, 5),
-(4164701, 17, 5),
-(4164706, 17, 5),
-(4164707, 17, 5),
-(4164708, 17, 5),
-(4164715, 17, 2),
-(4164723, 17, 1),
-(4164725, 17, 2),
-(4164727, 17, 2),
-(4164728, 17, 2),
-(4164731, 17, 4),
-(4164732, 17, 4),
-(4164735, 17, 1),
-(4164739, 17, 3),
-(4164740, 17, 1),
-(4164742, 17, 1),
-(4164846, 18, 2),
-(4164858, 18, 1),
-(4164859, 18, 1),
-(4164861, 18, 1),
-(4164905, 18, 3),
-(4164912, 18, 4),
-(4164914, 18, 4),
-(4164917, 18, 5),
-(4164923, 18, 6),
-(4164924, 18, 7),
-(4164926, 18, 7),
-(4164929, 18, 7),
-(4164931, 18, 8),
-(4164934, 18, 6),
-(4164937, 18, 9),
-(4164938, 18, 9),
-(4164940, 18, 10),
-(4164942, 18, 11),
-(4164944, 18, 11),
-(4164947, 18, 13),
-(4164950, 18, 15),
-(4164952, 18, 16),
-(4164953, 18, 17),
-(4164955, 18, 18),
-(4164956, 18, 18),
-(4164957, 18, 18),
-(4164958, 18, 19),
-(4165006, 18, 1),
-(4165007, 18, 1),
-(4165009, 18, 1),
-(4165010, 18, 1),
-(4165044, 18, 3),
-(4165045, 18, 3),
-(4165048, 18, 2),
-(4165049, 18, 2),
-(4165050, 18, 2),
-(4165051, 18, 2),
-(4165052, 18, 2),
-(4165053, 18, 2),
-(4165054, 18, 2),
-(4165055, 18, 2),
-(4165056, 18, 1),
-(4165057, 18, 3),
-(4165058, 18, 3),
-(4165059, 18, 3),
-(4165061, 18, 4),
-(4165063, 18, 4),
-(4165064, 18, 4),
-(4165065, 18, 4),
-(4165066, 18, 4),
-(4165079, 18, 7),
-(4165089, 18, 7),
-(4165091, 18, 6),
-(4165095, 18, 7),
-(4165097, 18, 8),
-(4165098, 18, 8),
-(4165101, 18, 9),
-(4165132, 18, 10),
-(4165138, 18, 11),
-(4165141, 18, 13),
-(4165146, 18, 4),
-(4165147, 18, 14),
-(4165587, 18, 13),
-(4165761, 19, 1),
-(4165762, 19, 3),
-(4165763, 19, 4),
-(4165767, 19, 2),
-(4165768, 19, 1),
-(4165770, 19, 3),
-(4165774, 19, 1),
-(4165784, 19, 7),
-(4165786, 19, 6),
-(4165787, 19, 6),
-(4165788, 19, 7),
-(4165789, 19, 1),
-(4165790, 19, 4),
-(4165791, 19, 1),
-(4165792, 19, 3),
-(4165793, 19, 7),
-(4165795, 19, 7),
-(4165798, 19, 1),
-(4165826, 19, 2),
-(4165830, 30, 1),
-(4165834, 30, 3),
-(4165838, 30, 6),
-(4165843, 30, 1),
-(4165845, 30, 4),
-(4165862, 30, 3),
-(4165870, 30, 5),
-(4170242, 8, 1),
-(4170252, 8, 2),
-(4170268, 8, 2),
-(4170279, 8, 3),
-(4170285, 8, 4),
-(4170288, 8, 5),
-(4170294, 8, 6),
-(4170300, 8, 7),
-(4170349, 8, 8),
-(4170358, 8, 9),
-(4170364, 8, 10),
-(4170368, 8, 11),
-(4170389, 8, 11),
-(4170407, 8, 4),
-(4170413, 8, 6),
-(4170416, 8, 3),
-(4170420, 8, 5),
-(4170421, 8, 5),
-(4170429, 8, 9),
-(4170439, 8, 10),
-(4170443, 8, 11),
-(4170448, 8, 11),
-(4175720, 16, 7),
-(4191057, 6, 4),
-(4191058, 6, 5),
-(4191060, 6, 5),
-(4191062, 6, 4),
-(4191063, 6, 4),
-(4191065, 6, 4),
-(4191066, 6, 7),
-(4191069, 6, 7),
-(4191070, 6, 6),
-(4191075, 6, 5),
-(4191081, 6, 6),
-(4200506, 17, 4),
-(4200508, 17, 2),
-(4203968, 20, 5),
-(4203976, 20, 5),
-(4203984, 20, 5),
-(4204051, 21, 11),
-(4204061, 21, 3),
-(4204069, 21, 6),
-(4204078, 21, 12),
-(4204084, 21, 12),
-(4204092, 21, 6),
-(4218112, 20, 2),
-(4218256, 20, 6),
-(4218258, 20, 6),
-(4218268, 21, 6),
-(4230667, 32, 1),
-(4230669, 32, 2),
-(4230670, 32, 3),
-(4230673, 32, 6),
-(4230674, 32, 6),
-(4230675, 32, 6),
-(4230676, 32, 7),
-(4230677, 32, 9),
-(4230682, 32, 4),
-(4230684, 32, 6),
-(4230685, 32, 6),
-(4230686, 32, 6),
-(4230687, 32, 7),
-(4230689, 32, 9),
-(4230690, 32, 1),
-(4235276, 38, 2),
-(4235277, 38, 4),
-(4235282, 38, 6),
-(4235309, 38, 7),
-(4235312, 38, 10),
-(4236358, 15, 6),
-(4237484, 38, 3),
-(4237485, 38, 4),
-(4237487, 38, 8),
-(4237488, 38, 10),
-(4238993, 86, 6),
-(4238994, 86, 7),
-(4238996, 86, 7),
-(4239000, 86, 7),
-(4239001, 86, 7),
-(4239002, 86, 8),
-(4239003, 86, 9),
-(4239004, 86, 10),
-(4239005, 86, 10),
-(4239009, 86, 12),
-(4241594, 20, 1),
-(4241611, 21, 1),
-(4241612, 21, 2),
-(4241928, 45, 12),
-(4242048, 45, 7),
-(4242604, 15, 1),
-(4242605, 15, 1),
-(4242609, 15, 1),
-(4242610, 15, 1),
-(4247747, 53, 1),
-(4247847, 53, 1),
-(4247850, 53, 1),
-(4247852, 53, 1),
-(4247856, 53, 1),
-(4247877, 53, 2),
-(4247879, 53, 2),
-(4247884, 53, 3),
-(4247885, 53, 2),
-(4247888, 53, 3),
-(4247906, 53, 4),
-(4247927, 53, 4),
-(4248224, 53, 5),
-(4248230, 53, 5),
-(4248232, 53, 5),
-(4248236, 53, 5),
-(4248241, 53, 5),
-(4248262, 53, 6),
-(4248265, 53, 6),
-(4248272, 53, 7),
-(4248277, 53, 7),
-(4248291, 53, 8),
-(4248293, 53, 9),
-(4248308, 53, 9),
-(4248340, 53, 6),
-(4248346, 53, 10),
-(4248351, 53, 10),
-(4248359, 53, 11),
-(4248390, 53, 12),
-(4248398, 53, 12),
-(4248402, 53, 12),
-(4248430, 53, 12),
-(4248444, 53, 13),
-(4248486, 53, 13),
-(4248488, 53, 13),
-(4248490, 53, 14),
-(4248491, 53, 15),
-(4248517, 53, 16),
-(4248520, 53, 16),
-(4248523, 53, 16),
-(4248529, 53, 16),
-(4248537, 53, 16),
-(4248539, 53, 17),
-(4248613, 53, 16),
-(4248638, 53, 16),
-(4248684, 53, 16),
-(4248689, 53, 18),
-(4248796, 53, 19),
-(4248833, 53, 19),
-(4248837, 53, 19),
-(4248842, 53, 20),
-(4248886, 53, 21),
-(4248889, 53, 21),
-(4248890, 53, 21),
-(4248892, 53, 22),
-(4248922, 53, 1),
-(4248924, 53, 1),
-(4248926, 53, 1),
-(4248931, 53, 1),
-(4248933, 53, 1),
-(4248935, 53, 1),
-(4248936, 53, 1),
-(4248942, 53, 1),
-(4248943, 53, 1),
-(4248947, 53, 1),
-(4248950, 53, 1),
-(4248965, 53, 3),
-(4248968, 53, 3),
-(4248971, 53, 3),
-(4248972, 53, 4),
-(4248975, 53, 4),
-(4248976, 53, 4),
-(4248982, 53, 4),
-(4248988, 53, 4),
-(4249002, 53, 5),
-(4249008, 53, 5),
-(4249027, 53, 7),
-(4249037, 53, 9),
-(4249038, 53, 9),
-(4249041, 53, 9),
-(4249047, 53, 8),
-(4249060, 53, 19),
-(4249068, 53, 19),
-(4249070, 53, 18),
-(4249075, 53, 18),
-(4249078, 53, 16),
-(4249084, 53, 16),
-(4249089, 53, 16),
-(4249092, 53, 20),
-(4249093, 53, 1),
-(4249094, 53, 20),
-(4249565, 53, 10),
-(4249569, 53, 12),
-(4249570, 53, 12),
-(4249572, 53, 12),
-(4249573, 53, 12),
-(4249574, 53, 12),
-(4249577, 53, 12),
-(4249587, 53, 12),
-(4249589, 53, 12),
-(4249605, 53, 15),
-(4249617, 53, 14),
-(4249639, 53, 1),
-(4249643, 53, 1),
-(4251428, 53, 4),
-(4262477, 38, 6),
-(4262478, 38, 6),
-(4278339, 43, 2),
-(4278406, 43, 2),
-(4278410, 43, 2),
-(4278415, 43, 4),
-(4278417, 43, 5),
-(4278419, 43, 5),
-(4278420, 43, 5),
-(4278432, 43, 5),
-(4278438, 43, 4),
-(4278461, 43, 7),
-(4278472, 43, 8),
-(4278474, 43, 8),
-(4278494, 43, 8),
-(4279992, 43, 9),
-(4280840, 43, 10),
-(4282568, 43, 11),
-(4282573, 43, 12),
-(4282574, 43, 13),
-(4282585, 43, 14),
-(4282592, 43, 13),
-(4282598, 43, 16),
-(4283510, 43, 8),
-(4283661, 43, 10),
-(4284218, 43, 2),
-(4284220, 43, 8),
-(4284346, 43, 9),
-(4284350, 43, 10),
-(4284353, 43, 12),
-(4284354, 43, 13),
-(4284356, 43, 11),
-(4284479, 43, 14),
-(4284483, 43, 16),
-(4284485, 43, 8),
-(4284655, 71, 1),
-(4284668, 71, 7),
-(4284672, 71, 10),
-(4284679, 71, 3),
-(4287170, 86, 8),
-(4287171, 86, 8),
-(4287437, 71, 9),
-(4287440, 71, 12),
-(4303212, 71, 13),
-(4303238, 71, 2),
-(4303276, 71, 1),
-(4303280, 71, 2),
-(4303285, 71, 6),
-(4303288, 71, 10),
-(4310468, 19, 1),
-(4310490, 19, 4),
-(4310494, 19, 4),
-(4311173, 19, 3),
-(4311182, 19, 4),
-(4313896, 32, 4),
-(4313898, 32, 8),
-(4313956, 38, 3),
-(4313961, 38, 5),
-(4313968, 38, 7),
-(4313975, 103, 15),
-(4317154, 71, 4),
-(4317155, 71, 5),
-(4317176, 71, 3),
-(4317193, 71, 8),
-(4317200, 71, 11),
-(4322392, 47, 1),
-(4322393, 47, 2),
-(4322394, 47, 2),
-(4322395, 47, 2),
-(4322396, 47, 3),
-(4322398, 47, 2),
-(4322399, 47, 3),
-(4322400, 47, 3),
-(4322404, 47, 4),
-(4322408, 47, 4),
-(4322411, 47, 4),
-(4322417, 47, 6),
-(4322427, 47, 7),
-(4322428, 47, 7),
-(4322429, 47, 7),
-(4322431, 47, 8),
-(4322434, 47, 7),
-(4322439, 47, 5),
-(4322441, 47, 15),
-(4322442, 47, 10),
-(4322444, 47, 10),
-(4322445, 47, 10),
-(4322449, 47, 11),
-(4322453, 47, 11),
-(4322455, 47, 13),
-(4322458, 47, 12),
-(4322459, 47, 12),
-(4322841, 103, 12),
-(4322860, 37, 1),
-(4322861, 37, 1),
-(4322862, 37, 1),
-(4322864, 37, 1),
-(4322867, 37, 3),
-(4322868, 37, 3),
-(4322870, 37, 3),
-(4322871, 37, 4),
-(4322872, 37, 5),
-(4322969, 37, 5),
-(4322970, 37, 5),
-(4322971, 37, 6),
-(4322973, 37, 6),
-(4322974, 37, 7),
-(4322975, 37, 8),
-(4322976, 37, 8),
-(4322977, 37, 8),
-(4322978, 37, 8),
-(4322979, 37, 9),
-(4323354, 85, 11),
-(4323360, 85, 11),
-(4323383, 85, 8),
-(4323387, 85, 8),
-(4323412, 85, 8),
-(4323414, 85, 8),
-(4323419, 85, 9),
-(4323420, 85, 9),
-(4323427, 85, 10),
-(4323428, 85, 10),
-(4323429, 85, 10),
-(4323431, 85, 11),
-(4323432, 85, 8),
-(4328706, 103, 13),
-(4328707, 103, 12),
-(4328816, 103, 12),
-(4328833, 103, 12),
-(4328892, 103, 13),
-(4328894, 103, 13),
-(4328897, 103, 15),
-(4328902, 103, 15),
-(4332187, 21, 6),
-(4332188, 21, 6),
-(4332189, 21, 6),
-(4332518, 20, 6),
-(4332767, 53, 12),
-(4332770, 53, 12),
-(4333235, 20, 9),
-(4334276, 20, 4),
-(4334728, 16, 3),
-(4334730, 16, 7),
-(4334751, 30, 5),
-(4334881, 21, 7),
-(4334882, 21, 13),
-(4334885, 7, 7),
-(4335536, 5, 2),
-(4335666, 43, 2),
-(4335670, 43, 8),
-(4373250, 20, 10),
-(4373251, 20, 10),
-(4373252, 20, 10),
-(4373253, 20, 10),
-(4374258, 18, 15),
-(4374678, 16, 7),
-(4374738, 20, 8),
-(4374739, 20, 8),
-(4395364, 134, 12),
-(4404417, 134, 12),
-(4404426, 134, 12),
-(4404431, 134, 12),
-(4404435, 134, 12),
-(4404439, 134, 12),
-(4404440, 134, 12),
-(4404442, 134, 12),
-(4404445, 134, 12),
-(4404450, 134, 12),
-(4404451, 134, 12),
-(4404452, 134, 12),
-(4481391, 142, 12),
-(4481392, 142, 15),
-(4481393, 142, 11),
-(4481404, 142, 11),
-(4481407, 142, 13),
-(4481409, 142, 12),
-(4481412, 142, 15),
-(4481413, 142, 15),
-(4481414, 142, 15),
-(4481415, 142, 15),
-(4481416, 142, 15),
-(4481418, 142, 15),
-(4488408, 139, 12),
-(4488410, 139, 12),
-(4488411, 139, 12),
-(4488413, 139, 14),
-(4488416, 139, 13),
-(4488417, 139, 12),
-(4488419, 139, 11),
-(4488420, 139, 12),
-(4488421, 139, 13),
-(4488422, 139, 13),
-(4488423, 139, 14),
-(4488425, 139, 14),
-(4488427, 139, 13),
-(4488428, 139, 13),
-(4488429, 139, 12),
-(4488430, 139, 12),
-(4488431, 139, 12),
-(4488432, 139, 12),
-(4488433, 139, 14),
-(4488435, 139, 11),
-(4488438, 139, 12),
-(4489186, 71, 3),
-(4489187, 71, 3),
-(4489188, 71, 3),
-(4489189, 71, 3),
-(4489190, 71, 3),
-(4489192, 71, 3),
-(4489193, 71, 3),
-(4489194, 71, 3),
-(4489195, 71, 3),
-(4489236, 71, 1),
-(4489237, 71, 10),
-(4515268, 142, 11),
-(4515306, 142, 12),
-(4515308, 142, 12),
-(4515382, 142, 13),
-(4515386, 142, 15),
-(4515612, 139, 12),
-(4515623, 139, 13),
-(4515624, 139, 13),
-(4515625, 139, 13),
-(4515681, 139, 12),
-(4515697, 139, 12),
-(4515699, 139, 13),
-(4515701, 139, 14),
-(4515702, 139, 14),
-(4515703, 139, 13),
-(4515704, 139, 13),
-(4515705, 139, 13),
-(4515706, 139, 12),
-(4515707, 139, 12),
-(4515708, 139, 12),
-(4515709, 139, 12),
-(4515711, 139, 14),
-(4515713, 139, 11),
-(4516011, 139, 12),
-(4517194, 139, 12),
-(4559071, 157, 1),
-(4559075, 157, 3),
-(4559076, 157, 4),
-(4559077, 157, 4),
-(4559078, 157, 5),
-(4559085, 157, 6),
-(4559086, 157, 6),
-(4559087, 157, 7),
-(4559088, 157, 5),
-(4559091, 157, 8),
-(4559092, 157, 8),
-(4559093, 157, 10),
-(4559094, 157, 9),
-(4569450, 145, 1),
-(4569451, 145, 5),
-(4569461, 145, 3),
-(4569464, 145, 3),
-(4569465, 145, 4),
-(4569471, 145, 10),
-(4569472, 145, 11),
-(4569479, 145, 6),
-(4586009, 4, 7),
-(4627320, 145, 6),
-(4627322, 145, 7),
-(4627324, 145, 7),
-(4627332, 145, 9),
-(4630742, 145, 11),
-(4634055, 151, 4),
-(4634056, 151, 6),
-(4634059, 151, 1),
-(4634062, 151, 1),
-(4634065, 151, 2),
-(4634083, 151, 4),
-(4634094, 151, 5),
-(4634095, 151, 6),
-(4634104, 151, 7),
-(4634106, 151, 7),
-(4634712, 151, 6),
-(4634715, 151, 7),
-(4635476, 148, 1),
-(4635477, 148, 2),
-(4635478, 148, 3),
-(4635479, 148, 5),
-(4635480, 148, 6),
-(4639200, 151, 4),
-(4639204, 151, 8),
-(4639208, 151, 6),
-(4660176, 165, 1),
-(4660177, 165, 1),
-(4660178, 165, 2),
-(4660179, 165, 2),
-(4660180, 165, 3),
-(4660181, 165, 3),
-(4660182, 165, 4),
-(4660183, 165, 5),
-(4660184, 165, 6),
-(4660185, 165, 7),
-(4660186, 165, 8),
-(4660187, 165, 9),
-(4660189, 165, 11),
-(4660190, 165, 2),
-(4660194, 165, 3),
-(4660195, 165, 11),
-(4660197, 165, 12),
-(4660198, 165, 13),
-(4665752, 18, 11),
-(4665756, 18, 11),
-(4665759, 18, 11),
-(4665766, 18, 11),
-(4665773, 18, 11),
-(4665788, 30, 4),
-(4695119, 148, 5),
-(4721268, 157, 10),
-(4721270, 157, 11),
-(4721271, 157, 11),
-(4721272, 157, 12),
-(4721273, 157, 13),
-(4755366, 18, 18),
-(4755385, 165, 11),
-(4755389, 165, 12),
-(4755390, 165, 13),
-(4757557, 168, 4),
-(4757558, 168, 5),
-(4757560, 168, 5),
-(4757561, 168, 6),
-(4757563, 168, 8),
-(4757565, 168, 9),
-(4757566, 168, 10),
-(4757569, 168, 11),
-(4759603, 164, 12),
-(4759604, 164, 12),
-(4759652, 164, 13),
-(4759654, 164, 14),
-(4760563, 164, 12),
-(4760674, 164, 12),
-(4760676, 164, 12),
-(4760683, 164, 12),
-(4760685, 164, 12),
-(4760689, 164, 14),
-(4768065, 169, 1),
-(4768067, 169, 1),
-(4768073, 169, 7),
-(4768082, 169, 8),
-(4768083, 169, 8),
-(4768084, 169, 8),
-(4768085, 169, 9),
-(4768087, 169, 1),
-(4768094, 169, 7),
-(4768099, 169, 6),
-(4768100, 169, 8),
-(4768101, 169, 8),
-(4768102, 169, 9),
-(4768103, 169, 7),
-(4889986, 7, 10),
-(4889987, 7, 3),
-(4889991, 7, 3),
-(4889995, 7, 3),
-(4890336, 182, 1),
-(4890497, 182, 1),
-(4890506, 182, 3),
-(4890535, 182, 3),
-(4890651, 182, 3),
-(4890664, 182, 12),
-(4890679, 182, 9),
-(4890766, 182, 9),
-(4890770, 182, 10),
-(4890776, 182, 10),
-(4890780, 182, 11),
-(4890784, 182, 12),
-(4890786, 182, 13),
-(4890788, 182, 14),
-(4890791, 182, 15),
-(4902564, 190, 6),
-(4902565, 190, 6),
-(4902566, 190, 7),
-(4902567, 190, 8),
-(4902568, 190, 8),
-(4902569, 190, 8),
-(4902571, 190, 10),
-(4902572, 190, 11),
-(4902573, 190, 8),
-(4972550, 168, 1),
-(4972551, 168, 2),
-(4980983, 174, 1),
-(4980985, 174, 2),
-(4980993, 174, 2),
-(4980994, 174, 4),
-(4980995, 174, 4),
-(4980997, 174, 5),
-(4980998, 174, 5),
-(4980999, 174, 5),
-(4981002, 174, 6),
-(4981003, 174, 6),
-(4981004, 174, 7),
-(4981005, 174, 7),
-(4981006, 174, 7),
-(4981007, 174, 8),
-(4981009, 174, 9),
-(4981010, 174, 10),
-(4982004, 169, 2),
-(4982007, 169, 3),
-(4982009, 169, 3),
-(4982039, 169, 4),
-(4982041, 169, 5),
-(4982050, 169, 5),
-(4982051, 169, 6),
-(5018506, 169, 3),
-(5018517, 169, 4),
-(5018518, 169, 4),
-(5018519, 169, 5),
-(5018520, 169, 5),
-(5018524, 169, 7),
-(5018525, 169, 7),
-(5018526, 169, 9),
-(5018528, 169, 9),
-(5032226, 182, 3),
-(5034828, 182, 15),
-(5034833, 182, 15),
-(5034834, 182, 15),
-(5119555, 169, 3),
-(5119560, 169, 3),
-(5321547, 190, 11),
-(5321639, 190, 7),
-(5348496, 182, 10),
-(5476910, 182, 3),
-(5485941, 182, 9),
-(5579669, 203, 10),
-(5680661, 203, 10),
-(5681112, 203, 9),
-(5681115, 203, 11),
-(5681121, 203, 10),
-(5681124, 85, 11),
-(5681153, 203, 10),
-(5681166, 203, 11),
-(5759673, 243, 1),
-(5759683, 243, 5),
-(5759685, 243, 5),
-(5759692, 243, 6),
-(5759696, 243, 7),
-(5759698, 243, 9),
-(5759701, 243, 11),
-(5759705, 243, 12),
-(5759706, 243, 14),
-(5759708, 243, 14),
-(5762435, 243, 4),
-(5762437, 243, 8),
-(5762441, 243, 14),
-(5795788, 252, 3),
-(5795795, 252, 3),
-(5795796, 252, 3),
-(5840909, 252, 5),
-(5840914, 252, 6),
-(5840915, 252, 7),
-(5840920, 252, 10),
-(5840923, 252, 6),
-(5858542, 239, 5),
-(5864957, 230, 1),
-(5865261, 230, 2),
-(5865270, 230, 2),
-(5865275, 230, 5),
-(5865286, 230, 1),
-(5865289, 230, 2),
-(5868146, 243, 2),
-(5868148, 243, 3),
-(5868150, 243, 4),
-(5868156, 243, 8),
-(5868159, 243, 9),
-(5868162, 243, 13),
-(5868163, 243, 15),
-(5874028, 237, 3),
-(5874029, 237, 4),
-(5874030, 237, 1),
-(5874031, 237, 2),
-(5874032, 237, 3),
-(5878769, 248, 1),
-(5879221, 241, 1),
-(5896017, 211, 15),
-(5908552, 252, 12),
-(5908839, 248, 1),
-(5908841, 248, 2),
-(5908844, 248, 2),
-(5908846, 248, 3),
-(5908848, 248, 3),
-(5908851, 248, 5),
-(5908859, 248, 6),
-(5908863, 248, 6),
-(5908868, 248, 6),
-(5908869, 248, 6),
-(5909356, 248, 3),
-(5909364, 248, 1),
-(5909385, 248, 1),
-(5909746, 211, 15),
-(5909768, 211, 15),
-(5909769, 211, 15),
-(5909770, 211, 15),
-(5909773, 211, 15),
-(5909778, 211, 15),
-(5909929, 214, 13),
-(5909946, 214, 13),
-(5909947, 214, 13),
-(5909948, 214, 13),
-(5909950, 214, 13),
-(5909951, 214, 13),
-(5909952, 214, 13),
-(5909953, 214, 13),
-(5909980, 214, 13),
-(5910101, 216, 28),
-(5910102, 216, 28),
-(5910115, 216, 28),
-(5910122, 216, 28),
-(5910126, 216, 28),
-(5910127, 216, 28),
-(5910134, 216, 28),
-(5910141, 216, 28),
-(5910144, 216, 28),
-(5910157, 216, 28),
-(5910168, 216, 28),
-(5910298, 255, 3),
-(5910299, 255, 4),
-(5910301, 239, 3),
-(5910302, 239, 2),
-(5910303, 239, 3),
-(5910305, 239, 2),
-(5910306, 239, 2),
-(5910307, 239, 2),
-(5910308, 239, 2),
-(5911128, 241, 2),
-(5911129, 241, 2),
-(5911131, 241, 3),
-(5911132, 241, 3),
-(5911133, 241, 3),
-(5911136, 241, 4),
-(5911137, 241, 4),
-(5911139, 241, 4),
-(5911141, 241, 4),
-(5911142, 241, 5),
-(5911143, 241, 6),
-(5911144, 241, 6),
-(5911145, 241, 6),
-(5911146, 241, 6),
-(5911147, 241, 6),
-(5911148, 241, 7),
-(5911151, 241, 6),
-(5911154, 241, 8),
-(5911155, 241, 7),
-(5911158, 241, 8),
-(5911159, 241, 10),
-(5911164, 241, 11),
-(5911166, 241, 12),
-(5911167, 241, 12),
-(5911168, 241, 12),
-(5911169, 241, 12),
-(5911173, 241, 13),
-(5911174, 241, 13),
-(5911175, 241, 13),
-(5911176, 241, 13),
-(5911184, 241, 14),
-(5911193, 241, 12),
-(5911200, 241, 13),
-(5911204, 241, 12),
-(5911207, 241, 13),
-(5911208, 241, 15),
-(5913190, 213, 6),
-(5913193, 214, 13),
-(5913203, 216, 28),
-(5915489, 211, 15),
-(5915512, 211, 15),
-(5915513, 211, 15),
-(5915517, 211, 15),
-(5915539, 211, 15),
-(5915553, 211, 15),
-(5915580, 211, 15),
-(5915598, 211, 15),
-(5915620, 211, 15),
-(5915630, 211, 15),
-(5915631, 211, 15),
-(5915632, 211, 15),
-(5915635, 211, 15),
-(5915734, 211, 15),
-(5915736, 211, 15),
-(5915737, 211, 15),
-(5915739, 211, 15),
-(5915740, 211, 15),
-(5915742, 211, 15),
-(5917284, 211, 15),
-(5917285, 211, 15),
-(5917286, 211, 15),
-(5917287, 211, 15),
-(5917288, 211, 15),
-(5917289, 211, 15),
-(5917290, 211, 15),
-(5917292, 211, 15),
-(5917294, 211, 15),
-(5917313, 211, 15),
-(5917314, 211, 15),
-(5917315, 211, 15),
-(5917318, 211, 15),
-(5917319, 211, 15),
-(5917320, 211, 15),
-(5917322, 211, 15),
-(5917323, 211, 15),
-(5917330, 211, 15),
-(5917338, 211, 15),
-(5917350, 211, 15),
-(5917360, 211, 15),
-(5917362, 211, 15),
-(5917363, 211, 15),
-(5917364, 211, 15),
-(5919748, 213, 6),
-(5919753, 213, 6),
-(5919755, 213, 6),
-(5919756, 213, 6),
-(5919791, 213, 6),
-(5919812, 213, 6),
-(5919814, 213, 6),
-(5919815, 213, 6),
-(5919816, 213, 6),
-(5919818, 213, 6),
-(5919824, 213, 6),
-(5919826, 213, 6),
-(5919832, 213, 6),
-(5919835, 213, 6),
-(5919848, 213, 6),
-(5919851, 213, 6),
-(5919853, 213, 6),
-(5919854, 213, 6),
-(5919855, 213, 6),
-(5919859, 213, 6),
-(5919860, 213, 6),
-(5919868, 213, 6),
-(5919870, 213, 6),
-(5919908, 213, 6),
-(5919912, 213, 6),
-(5919927, 213, 6),
-(5919931, 213, 6),
-(5919973, 213, 6),
-(5920107, 213, 6),
-(5920109, 213, 6),
-(5920110, 213, 6),
-(5920131, 213, 6),
-(5920132, 213, 6),
-(5920134, 213, 6),
-(5920142, 213, 6),
-(5920147, 213, 6),
-(5921241, 214, 13),
-(5921242, 214, 13),
-(5921246, 214, 13),
-(5921247, 214, 13),
-(5921249, 214, 13),
-(5921250, 214, 13),
-(5921251, 214, 13),
-(5921252, 214, 13),
-(5921253, 214, 13),
-(5921254, 214, 13),
-(5921260, 214, 13),
-(5921262, 214, 13),
-(5921264, 214, 13),
-(5921265, 214, 13),
-(5921266, 214, 13),
-(5921267, 214, 13),
-(5921268, 214, 13),
-(5921273, 214, 13),
-(5921274, 214, 13),
-(5921275, 214, 13),
-(5921276, 214, 13),
-(5921277, 214, 13),
-(5921278, 214, 13),
-(5921279, 214, 13),
-(5921280, 214, 13),
-(5921281, 214, 13),
-(5921283, 214, 13),
-(5921287, 214, 13),
-(5921288, 214, 13),
-(5921290, 214, 13),
-(5921292, 214, 13),
-(5921858, 216, 28),
-(5921871, 216, 28),
-(5921880, 216, 28),
-(5921881, 216, 28),
-(5921882, 216, 28),
-(5921937, 216, 28),
-(5921940, 216, 28),
-(5921941, 216, 28),
-(5921942, 216, 28),
-(5921945, 216, 28),
-(5921953, 216, 28),
-(5921955, 216, 28),
-(5921956, 216, 28),
-(5921962, 216, 28),
-(5921966, 216, 28),
-(5921968, 216, 28),
-(5921969, 216, 28),
-(5921970, 216, 28),
-(5921980, 216, 28),
-(5921981, 216, 28),
-(5921982, 216, 28),
-(5921987, 216, 28),
-(5921988, 216, 28),
-(5921996, 216, 28),
-(5921998, 216, 28),
-(5921999, 216, 28),
-(5922000, 216, 28),
-(5922002, 216, 28),
-(5922004, 216, 28),
-(5922005, 216, 28),
-(5922006, 216, 28),
-(5922007, 216, 28),
-(5922008, 216, 28),
-(5922009, 216, 28),
-(5922010, 216, 28),
-(5922013, 216, 28),
-(5922559, 216, 28),
-(5922560, 216, 28),
-(5925606, 211, 15),
-(5925609, 211, 15),
-(5925610, 211, 15),
-(5925611, 211, 15),
-(5925612, 211, 15),
-(5925613, 211, 15),
-(5925616, 211, 15),
-(5925618, 211, 15),
-(5925619, 211, 15),
-(5925620, 211, 15),
-(5925622, 211, 15),
-(5925623, 211, 15),
-(5925808, 211, 15),
-(5925812, 211, 15),
-(5925813, 211, 15),
-(5925814, 211, 15),
-(5925815, 211, 15),
-(5925817, 211, 15),
-(5925819, 211, 15),
-(5925820, 211, 15),
-(5925821, 211, 15),
-(5925823, 211, 15),
-(5925825, 211, 15),
-(5925827, 211, 15),
-(5925830, 211, 15),
-(5925835, 211, 15),
-(5925836, 211, 15),
-(5925837, 211, 15),
-(5925838, 211, 15),
-(5925840, 211, 15),
-(5925841, 211, 15),
-(5925842, 211, 15),
-(5925844, 211, 15),
-(5925845, 211, 15),
-(5925848, 211, 15),
-(5925849, 211, 15),
-(5925850, 211, 15),
-(5925852, 211, 15),
-(5925854, 211, 15),
-(5925858, 211, 15),
-(5925860, 211, 15),
-(5926068, 211, 15),
-(5926069, 211, 15),
-(5926070, 211, 15),
-(5926071, 211, 15),
-(5926072, 211, 15),
-(5926073, 211, 15),
-(5926074, 211, 15),
-(5926075, 211, 15),
-(5926076, 211, 15),
-(5926078, 211, 15),
-(5926079, 211, 15),
-(5926080, 211, 15),
-(5926081, 211, 15),
-(5926082, 211, 15),
-(5926083, 211, 15),
-(5926085, 211, 15),
-(5926086, 211, 15),
-(5926088, 211, 15),
-(5926090, 211, 15),
-(5926091, 211, 15),
-(5926092, 211, 15),
-(5926093, 211, 15),
-(5926094, 211, 15),
-(5926095, 211, 15),
-(5926096, 211, 15),
-(5926097, 211, 15),
-(5926099, 211, 15),
-(5926100, 211, 15),
-(5926103, 211, 15),
-(5926104, 211, 15),
-(5926105, 211, 15),
-(5926106, 211, 15),
-(5926107, 211, 15),
-(5926109, 211, 15),
-(5926110, 211, 15),
-(5926111, 211, 15),
-(5926112, 211, 15),
-(5926113, 211, 15),
-(5926114, 211, 15),
-(5926115, 211, 15),
-(5926117, 211, 15),
-(5926118, 211, 15),
-(5926119, 211, 15),
-(5926128, 211, 15),
-(5926129, 211, 15),
-(5926130, 211, 15),
-(5926131, 211, 15),
-(5926132, 211, 15),
-(5926133, 211, 15),
-(5926134, 211, 15),
-(5926135, 211, 15),
-(5926136, 211, 15),
-(5926138, 211, 15),
-(5926139, 211, 15),
-(5926141, 211, 15),
-(5926142, 211, 15),
-(5926143, 211, 15),
-(5926144, 211, 15),
-(5926146, 211, 15),
-(5926157, 211, 15),
-(5926158, 211, 15),
-(5926160, 211, 15),
-(5926161, 211, 15),
-(5926162, 211, 15),
-(5926163, 211, 15),
-(5926164, 211, 15),
-(5926563, 211, 15),
-(5926566, 211, 15),
-(5926610, 211, 15),
-(5926611, 211, 15),
-(5926614, 211, 15),
-(5926615, 211, 15),
-(5926616, 211, 15),
-(5926619, 211, 15),
-(5926622, 211, 15),
-(5926623, 211, 15),
-(5926627, 211, 15),
-(5926630, 211, 15),
-(5926637, 211, 15),
-(5926639, 211, 15),
-(5926644, 211, 15),
-(5926651, 211, 15),
-(5926653, 211, 15),
-(5926654, 211, 15),
-(5926663, 211, 15),
-(5926665, 211, 15),
-(5926666, 211, 15),
-(5926667, 211, 15),
-(5926668, 211, 15),
-(5926670, 211, 15),
-(5926671, 211, 15),
-(5926672, 211, 15),
-(5926674, 211, 15),
-(5926676, 211, 15),
-(5926680, 211, 15),
-(5926681, 211, 15),
-(5926683, 211, 15),
-(5926685, 211, 15),
-(5926686, 211, 15),
-(5926687, 211, 15),
-(5926696, 211, 15),
-(5926702, 211, 15),
-(5926709, 211, 15),
-(5926710, 211, 15),
-(5926711, 211, 15),
-(5926713, 211, 15),
-(5926717, 211, 15),
-(5926718, 211, 15),
-(5926720, 211, 15),
-(5926723, 211, 15),
-(5926724, 211, 15),
-(5926727, 211, 15),
-(5926729, 211, 15),
-(5926734, 211, 15),
-(5926736, 211, 15),
-(5926737, 211, 15),
-(5926739, 211, 15),
-(5926740, 211, 15),
-(5926742, 211, 15),
-(5926744, 211, 15),
-(5926745, 211, 15),
-(5926753, 211, 15),
-(5926757, 211, 15),
-(5926758, 211, 15),
-(5926759, 211, 15),
-(5926760, 211, 15),
-(5927843, 248, 1),
-(5927869, 248, 5),
-(5927903, 248, 1),
-(5927964, 241, 1),
-(5927966, 241, 5),
-(5927968, 241, 6),
-(5927969, 241, 7),
-(5927970, 241, 8),
-(5927971, 241, 10),
-(5927972, 241, 14),
-(5927973, 241, 15),
-(5930418, 213, 6),
-(5930419, 213, 6),
-(5930420, 213, 6),
-(5930421, 213, 6),
-(5930422, 213, 6),
-(5930423, 213, 6),
-(5930424, 213, 6),
-(5930425, 213, 6),
-(5930426, 213, 6),
-(5930427, 213, 6),
-(5930428, 213, 6),
-(5930429, 213, 6),
-(5930430, 213, 6),
-(5930431, 213, 6),
-(5930432, 213, 6),
-(5930433, 213, 6),
-(5930434, 213, 6),
-(5930435, 213, 6),
-(5930436, 213, 6),
-(5930437, 213, 6),
-(5930438, 213, 6),
-(5930439, 213, 6),
-(5930440, 213, 6),
-(5930441, 213, 6),
-(5930442, 213, 6),
-(5930443, 213, 6),
-(5930444, 213, 6),
-(5930445, 213, 6),
-(5930446, 213, 6),
-(5930447, 213, 6),
-(5930448, 213, 6),
-(5930449, 213, 6),
-(5930450, 213, 6),
-(5930451, 213, 6),
-(5930452, 213, 6),
-(5930453, 213, 6),
-(5930454, 213, 6),
-(5930455, 213, 6),
-(5930456, 213, 6),
-(5930457, 213, 6),
-(5930458, 213, 6),
-(5930459, 213, 6),
-(5930460, 213, 6),
-(5930461, 213, 6),
-(5930462, 213, 6),
-(5930463, 213, 6),
-(5930464, 213, 6),
-(5930465, 213, 6),
-(5930466, 213, 6),
-(5930467, 213, 6),
-(5930468, 213, 6),
-(5930469, 213, 6),
-(5930470, 213, 6),
-(5930471, 213, 6),
-(5930472, 213, 6),
-(5930473, 213, 6),
-(5930474, 213, 6),
-(5930475, 213, 6),
-(5930476, 213, 6),
-(5930477, 213, 6),
-(5930478, 213, 6),
-(5930479, 213, 6),
-(5930480, 213, 6),
-(5930481, 213, 6),
-(5930482, 213, 6),
-(5930483, 213, 6),
-(5930484, 213, 6),
-(5930485, 213, 6),
-(5930486, 213, 6),
-(5930487, 213, 6),
-(5930488, 213, 6),
-(5930489, 213, 6),
-(5930490, 213, 6),
-(5930491, 213, 6),
-(5930492, 213, 6),
-(5930493, 213, 6),
-(5930494, 213, 6),
-(5930495, 213, 6),
-(5930496, 213, 6),
-(5930497, 213, 6),
-(5930498, 213, 6),
-(5930499, 213, 6),
-(5930500, 213, 6),
-(5933083, 216, 28),
-(5933084, 216, 28),
-(5933085, 216, 28),
-(5933086, 216, 28),
-(5933087, 216, 28),
-(5933088, 216, 28),
-(5933089, 216, 28),
-(5933090, 216, 28),
-(5933091, 216, 28),
-(5933092, 216, 28),
-(5933093, 216, 28),
-(5933094, 216, 28),
-(5933095, 216, 28),
-(5933096, 216, 28),
-(5933097, 216, 28),
-(5933098, 216, 28),
-(5933099, 216, 28),
-(5933100, 216, 28),
-(5933101, 216, 28),
-(5933102, 216, 28),
-(5933103, 216, 28),
-(5933104, 216, 28),
-(5933105, 216, 28),
-(5933106, 216, 28),
-(5933107, 216, 28),
-(5933108, 216, 28),
-(5933109, 216, 28),
-(5933110, 216, 28),
-(5933111, 216, 28),
-(5933112, 216, 28),
-(5933113, 216, 28),
-(5933114, 216, 28),
-(5933115, 216, 28),
-(5933116, 216, 28),
-(5933117, 216, 28),
-(5933118, 216, 28),
-(5933119, 216, 28),
-(5933120, 216, 28),
-(5933121, 216, 28),
-(5933122, 216, 28),
-(5933123, 216, 28),
-(5933124, 216, 28),
-(5933125, 216, 28),
-(5933126, 216, 28),
-(5933127, 216, 28),
-(5933128, 216, 28),
-(5933129, 216, 28),
-(5933130, 216, 28),
-(5933131, 216, 28),
-(5933132, 216, 28),
-(5933133, 216, 28),
-(5933134, 216, 28),
-(5933135, 216, 28),
-(5933136, 216, 28),
-(5933137, 216, 28),
-(5933138, 216, 28),
-(5933139, 216, 28),
-(5933140, 216, 28),
-(5933141, 216, 28),
-(5933142, 216, 28),
-(5933143, 216, 28),
-(5933144, 216, 28),
-(5933145, 216, 28),
-(5933146, 216, 28),
-(5933147, 216, 28),
-(5933148, 216, 28),
-(5933149, 216, 28),
-(5933150, 216, 28),
-(5933151, 216, 28),
-(5933152, 216, 28),
-(5933153, 216, 28),
-(5933154, 216, 28),
-(5933155, 216, 28),
-(5933156, 216, 28),
-(5933157, 216, 28),
-(5933158, 216, 28),
-(5933159, 216, 28),
-(5933160, 216, 28),
-(5933161, 216, 28),
-(5933162, 216, 28),
-(5933163, 216, 28),
-(5933164, 216, 28),
-(5933165, 216, 28),
-(5933166, 216, 28),
-(5933167, 216, 28),
-(5933168, 216, 28),
-(5933169, 216, 28),
-(5933170, 216, 28),
-(5933171, 216, 28),
-(5933172, 216, 28),
-(5933173, 216, 28),
-(5933174, 216, 28),
-(5933175, 216, 28),
-(5933176, 216, 28),
-(5933177, 216, 28),
-(5933178, 216, 28),
-(5933179, 216, 28),
-(5933180, 216, 28),
-(5933181, 216, 28),
-(5933182, 216, 28),
-(5933183, 216, 28),
-(5933184, 216, 28),
-(5933185, 216, 28),
-(5933186, 216, 28),
-(5933187, 216, 28),
-(5933188, 216, 28),
-(5933189, 216, 28),
-(5933190, 216, 28),
-(5933191, 216, 28),
-(5933192, 216, 28),
-(5933193, 216, 28),
-(5933194, 216, 28),
-(5933195, 216, 28),
-(5933196, 216, 28),
-(5933197, 216, 28),
-(5933198, 216, 28),
-(5933199, 216, 28),
-(5933200, 216, 28),
-(5933201, 216, 28),
-(5933202, 216, 28),
-(5933203, 216, 28),
-(5933204, 216, 28),
-(5933205, 216, 28),
-(5933206, 216, 28),
-(5933207, 216, 28),
-(5933208, 216, 28),
-(5933209, 216, 28),
-(5933210, 216, 28),
-(5933211, 216, 28),
-(5933212, 216, 28),
-(5933213, 216, 28),
-(5933214, 216, 28),
-(5933215, 216, 28),
-(5933216, 216, 28),
-(5933217, 216, 28),
-(5933218, 216, 28),
-(5933371, 214, 13),
-(5933372, 214, 13),
-(5933373, 214, 13),
-(5933374, 214, 13),
-(5933375, 214, 13),
-(5933376, 214, 13),
-(5933377, 214, 13),
-(5933378, 214, 13),
-(5933379, 214, 13),
-(5933380, 214, 13),
-(5933381, 214, 13),
-(5933382, 214, 13),
-(5933383, 214, 13),
-(5933384, 214, 13),
-(5933385, 214, 13),
-(5933386, 214, 13),
-(5933387, 214, 13),
-(5933388, 214, 13),
-(5933389, 214, 13),
-(5933390, 214, 13),
-(5933391, 214, 13),
-(5933392, 214, 13),
-(5933393, 214, 13),
-(5933394, 214, 13),
-(5933395, 214, 13),
-(5933396, 214, 13),
-(5933397, 214, 13),
-(5933398, 214, 13),
-(5933399, 214, 13),
-(5933400, 214, 13),
-(5933401, 214, 13),
-(5933402, 214, 13),
-(5933403, 214, 13),
-(5933404, 214, 13),
-(5933405, 214, 13),
-(5933406, 214, 13),
-(5933407, 214, 13),
-(5933408, 214, 13),
-(5933409, 214, 13),
-(5933410, 214, 13),
-(5933411, 214, 13),
-(5933412, 214, 13),
-(5933413, 214, 13),
-(5933414, 214, 13),
-(5933415, 214, 13),
-(5933416, 214, 13),
-(5933417, 214, 13),
-(5933418, 214, 13),
-(5933419, 214, 13),
-(5933420, 214, 13),
-(5933421, 214, 13),
-(5933422, 214, 13),
-(5933423, 214, 13),
-(5933424, 214, 13),
-(5933425, 214, 13),
-(5933426, 214, 13),
-(5933427, 214, 13),
-(5933428, 214, 13),
-(5933429, 214, 13),
-(5933430, 214, 13),
-(5933431, 214, 13),
-(5933432, 214, 13),
-(5933433, 214, 13),
-(5933434, 214, 13),
-(5933435, 214, 13),
-(5933436, 214, 13),
-(5933437, 214, 13),
-(5933438, 214, 13),
-(5933439, 214, 13),
-(5933440, 214, 13),
-(5933441, 214, 13),
-(5933442, 214, 13),
-(5933443, 214, 13),
-(5933444, 214, 13),
-(5933445, 214, 13),
-(5933446, 214, 13),
-(5933447, 214, 13),
-(5933448, 214, 13),
-(5933449, 214, 13),
-(5933450, 214, 13),
-(5933451, 214, 13),
-(5933452, 214, 13),
-(5933453, 214, 13),
-(5933454, 214, 13),
-(5933455, 214, 13),
-(5933456, 214, 13),
-(5933457, 214, 13),
-(5933458, 214, 13),
-(5933459, 214, 13),
-(5933460, 214, 13),
-(5933461, 214, 13),
-(5933462, 214, 13),
-(5933463, 214, 13),
-(5933464, 214, 13),
-(5933465, 214, 13),
-(5933466, 214, 13),
-(5933467, 214, 13),
-(5933468, 214, 13),
-(5933469, 214, 13),
-(5933470, 214, 13),
-(5933471, 214, 13),
-(5933472, 214, 13),
-(5933473, 214, 13),
-(5933474, 214, 13),
-(5933475, 214, 13),
-(5933476, 214, 13),
-(5933477, 214, 13),
-(5933478, 214, 13),
-(5933479, 214, 13),
-(5933480, 214, 13),
-(5933481, 214, 13),
-(5933482, 214, 13),
-(5933483, 214, 13),
-(5933484, 214, 13),
-(5933485, 214, 13),
-(5933486, 214, 13),
-(5933487, 214, 13),
-(5933488, 214, 13),
-(5933489, 214, 13),
-(5933490, 214, 13),
-(5933491, 214, 13),
-(5933492, 214, 13),
-(5933493, 214, 13),
-(5933494, 214, 13),
-(5933495, 214, 13),
-(5933496, 214, 13),
-(5933497, 214, 13),
-(5933498, 214, 13),
-(5933499, 214, 13),
-(5934961, 211, 15),
-(5934962, 211, 15),
-(5934964, 211, 15),
-(5934965, 211, 15),
-(5935045, 213, 6),
-(5935100, 214, 13),
-(5935104, 214, 13),
-(5935105, 214, 13),
-(5935119, 214, 13),
-(5935490, 216, 28),
-(5935520, 216, 28),
-(5935521, 216, 28),
-(5935525, 216, 28),
-(5936097, 216, 28),
-(5936102, 216, 28),
-(5936113, 216, 28),
-(5936125, 216, 28),
-(5936127, 216, 28),
-(5936562, 213, 6),
-(5937520, 252, 3),
-(5937536, 252, 10),
-(5937626, 211, 15),
-(5937643, 211, 15),
-(5937644, 211, 15),
-(5937659, 211, 15),
-(5937660, 211, 15),
-(5937661, 211, 15),
-(5937662, 211, 15),
-(5937663, 211, 15),
-(5937665, 211, 15),
-(5937666, 211, 15),
-(5937667, 211, 15),
-(5937668, 211, 15),
-(5937669, 211, 15),
-(5937670, 211, 15),
-(5937671, 211, 15),
-(5937672, 211, 15),
-(5937673, 211, 15),
-(5937674, 211, 15),
-(5937675, 211, 15),
-(5937676, 211, 15),
-(5937677, 211, 15),
-(5937678, 211, 15),
-(5937679, 211, 15),
-(5937680, 211, 15),
-(5937681, 211, 15),
-(5937682, 211, 15),
-(5937683, 211, 15),
-(5937684, 211, 15),
-(5937685, 211, 15),
-(5937686, 211, 15),
-(5937687, 211, 15),
-(5937688, 211, 15),
-(5937689, 211, 15),
-(5937690, 211, 15),
-(5937691, 211, 15),
-(5937692, 211, 15),
-(5937788, 213, 6),
-(5937789, 213, 6),
-(5937791, 213, 6),
-(5937798, 213, 6),
-(5937800, 213, 6),
-(5937801, 213, 6),
-(5937802, 213, 6),
-(5937803, 213, 6),
-(5937804, 213, 6),
-(5937805, 213, 6),
-(5938265, 213, 6),
-(5938270, 213, 6),
-(5938281, 213, 6),
-(5938291, 213, 6),
-(5938292, 213, 6),
-(5938293, 213, 6),
-(5938296, 213, 6),
-(5938298, 213, 6),
-(5938299, 213, 6),
-(5938300, 213, 6),
-(5938302, 213, 6),
-(5938305, 213, 6),
-(5938307, 213, 6),
-(5938308, 213, 6),
-(5938310, 213, 6),
-(5938311, 213, 6),
-(5938314, 213, 6),
-(5938315, 213, 6),
-(5938317, 213, 6),
-(5938318, 213, 6),
-(5938319, 213, 6),
-(5938321, 213, 6),
-(5938323, 213, 6),
-(5938344, 214, 13),
-(5938387, 214, 13),
-(5938388, 214, 13),
-(5938389, 214, 13),
-(5938390, 214, 13),
-(5938391, 214, 13),
-(5938392, 214, 13),
-(5938393, 214, 13),
-(5938394, 214, 13),
-(5938395, 214, 13),
-(5938396, 214, 13),
-(5938397, 214, 13),
-(5938398, 214, 13),
-(5938399, 214, 13),
-(5938400, 214, 13),
-(5938401, 214, 13),
-(5938402, 214, 13),
-(5938403, 214, 13),
-(5938404, 214, 13),
-(5938405, 214, 13),
-(5938406, 214, 13),
-(5938407, 214, 13),
-(5938408, 214, 13),
-(5938409, 214, 13),
-(5938410, 214, 13),
-(5938411, 214, 13),
-(5938412, 214, 13),
-(5938413, 214, 13),
-(5938414, 214, 13),
-(5938416, 214, 13),
-(5938417, 214, 13),
-(5938418, 214, 13),
-(5938419, 214, 13),
-(5938781, 216, 28),
-(5938782, 216, 28),
-(5938783, 216, 28),
-(5938784, 216, 28),
-(5938785, 216, 28),
-(5938786, 216, 28),
-(5938787, 216, 28),
-(5938788, 216, 28),
-(5938789, 216, 28),
-(5938790, 216, 28),
-(5938791, 216, 28),
-(5938792, 216, 28),
-(5938793, 216, 28),
-(5938794, 216, 28),
-(5938795, 216, 28),
-(5938796, 216, 28),
-(5938797, 216, 28),
-(5938798, 216, 28),
-(5938799, 216, 28),
-(5938800, 216, 28),
-(5938801, 216, 28),
-(5938802, 216, 28),
-(5938803, 216, 28),
-(5938804, 216, 28),
-(5938805, 216, 28),
-(5938806, 216, 28),
-(5938807, 216, 28),
-(5938808, 216, 28),
-(5938809, 216, 28),
-(5938810, 216, 28),
-(5938811, 216, 28),
-(5938812, 216, 28),
-(5938813, 216, 28),
-(5938814, 216, 28),
-(5938815, 216, 28),
-(5938816, 216, 28),
-(5953591, 248, 1),
-(5953592, 248, 3),
-(5960788, 216, 28),
-(5960797, 211, 15),
-(5960798, 211, 15),
-(5960799, 211, 15),
-(5960800, 211, 15),
-(5960801, 211, 15),
-(5960802, 211, 15),
-(5960803, 211, 15),
-(5960805, 211, 15),
-(5960806, 211, 15),
-(5960807, 211, 15),
-(5964409, 262, 1),
-(5964410, 262, 1),
-(5964418, 262, 1),
-(5964439, 262, 2),
-(5964441, 262, 1),
-(5964449, 262, 1),
-(5964457, 262, 1),
-(6032372, 262, 2),
-(6046582, 255, 3),
-(6070090, 273, 9),
-(6070269, 273, 9),
-(6070278, 273, 9),
-(6095410, 272, 13),
-(6098955, 272, 12),
-(6123737, 276, 12),
-(6123738, 276, 1),
-(6123739, 276, 1),
-(6123740, 276, 1),
-(6123741, 276, 1),
-(6123742, 276, 1),
-(6123743, 276, 1),
-(6123744, 276, 1),
-(6123745, 276, 1),
-(6123746, 276, 12),
-(6161036, 276, 12),
-(6161039, 276, 1),
-(6161040, 276, 1),
-(6161041, 276, 1),
-(6161042, 276, 1),
-(6161048, 276, 17),
-(6161083, 279, 12),
-(6163807, 276, 1),
-(6163808, 276, 19),
-(6163809, 276, 20),
-(6163810, 276, 21),
-(6163811, 276, 9),
-(6163812, 276, 8),
-(6163813, 276, 7),
-(6163814, 276, 6),
-(6163815, 276, 4),
-(6163816, 276, 16),
-(6163817, 276, 16),
-(6163818, 276, 16),
-(6170636, 276, 17),
-(6170637, 276, 2),
-(6170638, 276, 2),
-(6170639, 276, 3),
-(6170640, 276, 2),
-(6170641, 276, 3),
-(6170642, 276, 3),
-(6170643, 276, 3),
-(6170644, 276, 10),
-(6170645, 276, 10),
-(6170646, 276, 10),
-(6170647, 276, 11),
-(6170648, 276, 11),
-(6170649, 276, 2),
-(6170650, 276, 11),
-(6170651, 276, 1),
-(6170652, 276, 1),
-(6170653, 276, 4),
-(6170654, 276, 4),
-(6170655, 276, 6),
-(6170656, 276, 6),
-(6170657, 276, 5),
-(6170658, 276, 7),
-(6170659, 276, 7),
-(6170660, 276, 8),
-(6170661, 276, 8),
-(6170662, 276, 9),
-(6170663, 276, 12),
-(6170664, 276, 13),
-(6170665, 276, 14),
-(6170666, 276, 15),
-(6170667, 276, 16),
-(6170668, 276, 1),
-(6170669, 276, 19),
-(6170670, 276, 20),
-(6170671, 276, 21),
-(6170672, 276, 9),
-(6170673, 276, 8),
-(6170674, 276, 7),
-(6170675, 276, 6),
-(6170676, 276, 4),
-(6170677, 276, 1),
-(6171334, 276, 17),
-(6171335, 276, 12),
-(6171336, 276, 13),
-(6171337, 276, 12),
-(6171338, 276, 11),
-(6171339, 276, 8),
-(6171340, 276, 5),
-(6171341, 276, 1),
-(6171342, 276, 12),
-(6234179, 297, 1),
-(6234181, 297, 3),
-(6234182, 297, 4),
-(6234184, 297, 5),
-(6234185, 297, 6),
-(6234186, 297, 7),
-(6234187, 297, 8),
-(6234188, 297, 8),
-(6234189, 297, 9),
-(6234190, 297, 10),
-(6236450, 279, 13),
-(6236452, 279, 14),
-(6236476, 286, 3),
-(6236478, 286, 1),
-(6236479, 286, 2),
-(6236480, 286, 3),
-(6236481, 286, 4),
-(6236486, 286, 5),
-(6236497, 288, 5),
-(6236500, 288, 5),
-(6236501, 288, 6),
-(6236502, 288, 6),
-(6236519, 289, 2),
-(6238456, 213, 6),
-(6238457, 213, 6),
-(6238459, 213, 6),
-(6242634, 279, 12),
-(6242635, 279, 13),
-(6242683, 279, 14),
-(6268735, 303, 15),
-(6268736, 303, 15),
-(6271621, 303, 15),
-(6280057, 297, 2),
-(6280060, 297, 2),
-(6280251, 297, 12),
-(6280417, 297, 1),
-(6280446, 297, 4),
-(6280447, 297, 5),
-(6280449, 297, 7),
-(6280451, 297, 5),
-(6280453, 297, 12),
-(6288695, 303, 15),
-(6331526, 312, 12),
-(6402356, 313, 6),
-(6402704, 313, 11),
-(6407718, 214, 13),
-(6407719, 214, 13),
-(6407720, 214, 13),
-(6407721, 214, 13),
-(6407722, 214, 13),
-(6421882, 297, 8),
-(6515982, 313, 11),
-(6564487, 340, 12),
-(6599910, 356, 12),
-(6599911, 356, 1),
-(6599912, 356, 1),
-(6599913, 356, 1),
-(6599914, 356, 1),
-(6599915, 356, 1),
-(6599916, 356, 1),
-(6599917, 356, 1),
-(6599918, 356, 1),
-(6599919, 356, 12),
-(6599920, 356, 12),
-(6599922, 356, 1),
-(6599923, 356, 1),
-(6599924, 356, 1),
-(6599925, 356, 1),
-(6599926, 356, 17),
-(6599927, 356, 1),
-(6599928, 356, 19),
-(6599929, 356, 20),
-(6599930, 356, 21),
-(6599931, 356, 9),
-(6599932, 356, 8),
-(6599933, 356, 7),
-(6599934, 356, 6),
-(6599935, 356, 4),
-(6599936, 356, 16),
-(6599937, 356, 16),
-(6599938, 356, 16),
-(6599939, 356, 17),
-(6599940, 356, 2),
-(6599941, 356, 2),
-(6599942, 356, 3),
-(6599943, 356, 2),
-(6599944, 356, 3),
-(6599945, 356, 3),
-(6599946, 356, 3),
-(6599947, 356, 10),
-(6599948, 356, 10),
-(6599949, 356, 10),
-(6599950, 356, 11),
-(6599951, 356, 11),
-(6599952, 356, 2),
-(6599953, 356, 11),
-(6599954, 356, 1),
-(6599955, 356, 1),
-(6599956, 356, 4),
-(6599957, 356, 4),
-(6599958, 356, 6),
-(6599959, 356, 6),
-(6599960, 356, 5),
-(6599961, 356, 7),
-(6599962, 356, 7),
-(6599963, 356, 8),
-(6599964, 356, 8),
-(6599965, 356, 9),
-(6599966, 356, 12),
-(6599967, 356, 13),
-(6599968, 356, 14),
-(6599969, 356, 15),
-(6599970, 356, 16),
-(6599971, 356, 1),
-(6599972, 356, 19),
-(6599973, 356, 20),
-(6599974, 356, 21),
-(6599975, 356, 9),
-(6599976, 356, 8),
-(6599977, 356, 7),
-(6599978, 356, 6),
-(6599979, 356, 4),
-(6599980, 356, 1),
-(6599981, 356, 17),
-(6599982, 356, 12),
-(6599983, 356, 13),
-(6599984, 356, 12),
-(6599985, 356, 11),
-(6599986, 356, 8),
-(6599987, 356, 5),
-(6599988, 356, 1),
-(6599989, 356, 12),
-(6622965, 356, 17),
-(6627252, 345, 13),
-(6627266, 345, 13),
-(6740473, 345, 13),
-(6782060, 352, 12),
-(6784914, 356, 2),
-(6784915, 356, 2),
-(6787121, 356, 3),
-(6886431, 356, 2),
-(6890477, 389, 1),
-(6891617, 336, 1),
-(6891627, 336, 1),
-(6891637, 336, 2),
-(6891692, 336, 3),
-(6891694, 336, 5),
-(6893032, 336, 6),
-(6893241, 336, 7),
-(6893758, 336, 9),
-(6893761, 336, 11),
-(6893762, 336, 11),
-(6922034, 375, 1),
-(6942997, 371, 13),
-(6942999, 354, 10),
-(6943038, 372, 30),
-(6943043, 367, 8),
-(6943044, 368, 21),
-(6943045, 369, 17),
-(6950667, 359, 1),
-(6950676, 359, 2),
-(6950680, 359, 3),
-(6950685, 359, 4),
-(6950720, 359, 4),
-(6950723, 359, 5),
-(6950726, 359, 6),
-(6950727, 359, 7),
-(6950728, 359, 8),
-(6950731, 359, 8),
-(6950777, 359, 9),
-(6950784, 359, 9),
-(6950788, 359, 10),
-(6950798, 359, 11),
-(6950799, 359, 12),
-(6950811, 359, 14),
-(6950815, 359, 15),
-(6950824, 359, 15),
-(6950847, 359, 8),
-(6950853, 359, 8),
-(6951063, 361, 9),
-(6953721, 367, 2),
-(6953722, 367, 4),
-(6953723, 367, 3),
-(6953726, 367, 3),
-(6953738, 367, 5),
-(6953772, 367, 1),
-(6953773, 367, 1),
-(6953776, 367, 1),
-(6953780, 367, 6),
-(6953786, 367, 7),
-(6953788, 367, 8),
-(6953789, 367, 2),
-(6953790, 367, 10),
-(6953792, 367, 22),
-(6953800, 367, 23),
-(6953802, 367, 27),
-(6953804, 367, 19),
-(6953807, 367, 21),
-(6953811, 367, 24),
-(6953814, 367, 27),
-(6953815, 367, 27),
-(6953816, 367, 27),
-(6953817, 367, 27),
-(6953818, 367, 27),
-(6953819, 367, 27),
-(6953820, 367, 27),
-(6954096, 367, 1),
-(6954100, 367, 1),
-(6954246, 389, 3),
-(6954248, 389, 4),
-(6954278, 367, 1),
-(6954280, 367, 3),
-(6954281, 367, 3),
-(6954284, 367, 4),
-(6954287, 367, 5),
-(6954295, 367, 6),
-(6954296, 367, 6),
-(6954297, 367, 5),
-(6954298, 367, 6),
-(6954300, 367, 8),
-(6954302, 367, 8),
-(6954311, 367, 8),
-(6954328, 367, 11),
-(6954522, 367, 4),
-(6954780, 367, 11),
-(6954781, 367, 11),
-(6954784, 367, 11),
-(6954791, 367, 11),
-(6955593, 367, 15),
-(6955601, 367, 15),
-(6955610, 367, 18),
-(6955618, 367, 18),
-(6955619, 367, 18),
-(6955623, 367, 22),
-(6955625, 367, 22),
-(6955627, 367, 22),
-(6955631, 367, 22),
-(6955632, 367, 22),
-(6955633, 367, 22),
-(6955643, 367, 17),
-(6955645, 367, 17),
-(6955646, 367, 17),
-(6955647, 367, 17),
-(6955648, 367, 17),
-(6955649, 367, 17),
-(6955650, 367, 22),
-(6955651, 367, 28),
-(6955652, 367, 28),
-(6955653, 367, 28),
-(6955654, 367, 28),
-(6955655, 367, 28),
-(6955656, 367, 28),
-(6955657, 367, 28),
-(6955658, 367, 28),
-(6955659, 367, 28),
-(6955660, 367, 28),
-(6955661, 367, 28),
-(6955662, 367, 22),
-(6955663, 367, 28),
-(6955664, 367, 28),
-(6955666, 367, 28),
-(6955667, 367, 20),
-(6957295, 375, 1),
-(6957309, 375, 2),
-(6957314, 375, 2),
-(6957316, 375, 2),
-(6957345, 375, 4),
-(6957347, 375, 5),
-(6957348, 375, 5),
-(6957349, 375, 6),
-(6957357, 375, 6),
-(6957359, 375, 7),
-(6957361, 375, 8),
-(6957363, 375, 8),
-(6957364, 375, 10),
-(6957365, 375, 10),
-(6957366, 375, 11),
-(6957367, 375, 11),
-(6957368, 375, 12),
-(6957369, 375, 13),
-(6957370, 375, 13),
-(6958837, 368, 1),
-(6958838, 368, 16),
-(6958839, 368, 13),
-(6958840, 368, 13),
-(6958841, 368, 13),
-(6958842, 368, 17),
-(6958843, 368, 17),
-(6959180, 368, 18),
-(6959190, 368, 30),
-(6959196, 368, 29),
-(6959201, 368, 29),
-(6959202, 368, 29),
-(6959204, 368, 29),
-(6959205, 368, 29),
-(6959210, 368, 28),
-(6959270, 368, 20),
-(6959276, 368, 20),
-(6959284, 368, 20),
-(6959315, 368, 20),
-(6959321, 368, 20),
-(6959322, 368, 20),
-(6959332, 368, 20),
-(6959337, 368, 21),
-(6959418, 368, 9),
-(6959448, 368, 6),
-(6967602, 368, 22),
-(6967981, 368, 22),
-(6968551, 368, 22),
-(6969053, 368, 22),
-(6969094, 368, 8),
-(6969098, 368, 8),
-(6969100, 368, 8),
-(6969102, 368, 8),
-(6969105, 368, 8),
-(6969117, 368, 8),
-(6969118, 368, 8),
-(6969119, 368, 8),
-(6969120, 368, 8),
-(6969121, 368, 8),
-(6969122, 368, 8),
-(6969455, 396, 1),
-(6969457, 396, 2),
-(6969461, 396, 2),
-(6969463, 396, 3),
-(6969464, 396, 3),
-(6969467, 396, 3),
-(6969468, 396, 3),
-(6969470, 396, 5),
-(6969475, 396, 6),
-(6969478, 396, 6),
-(6969486, 396, 7),
-(6969492, 396, 7),
-(6969496, 396, 7),
-(6969507, 396, 7),
-(6969509, 396, 8),
-(6969513, 396, 7),
-(6969517, 396, 9),
-(6969520, 396, 10),
-(6969521, 396, 10),
-(6969607, 396, 11),
-(6969611, 396, 12),
-(6969612, 396, 13),
-(6969618, 368, 24),
-(6969620, 368, 22),
-(6969622, 368, 22),
-(6969626, 368, 26),
-(6969630, 368, 25),
-(6969632, 368, 25),
-(6969633, 368, 25),
-(6969635, 368, 25),
-(6970815, 369, 29),
-(6970818, 369, 30),
-(6970820, 369, 28),
-(6970822, 369, 28),
-(6970824, 369, 26),
-(6970826, 369, 28),
-(6970827, 369, 28),
-(6970858, 369, 30),
-(6970860, 369, 30),
-(6970861, 369, 21),
-(6970863, 369, 22),
-(6971003, 369, 15),
-(6971057, 369, 13),
-(6971058, 369, 15),
-(6971059, 369, 12),
-(6971060, 369, 13),
-(6971062, 369, 13),
-(6971063, 369, 1),
-(6971064, 369, 1),
-(6971065, 369, 2),
-(6971068, 369, 2),
-(6971069, 369, 2),
-(6971070, 369, 2),
-(6971072, 369, 2),
-(6971073, 369, 2),
-(6971075, 369, 13),
-(6971077, 369, 26),
-(6971084, 369, 17),
-(6971185, 369, 5),
-(6971191, 369, 5),
-(6971193, 369, 6),
-(6971194, 369, 6),
-(6971199, 369, 4),
-(6971201, 369, 4),
-(6971202, 369, 4),
-(6971218, 369, 7),
-(6971225, 369, 3),
-(6971339, 369, 3),
-(6971342, 369, 3),
-(6971343, 369, 4),
-(6971345, 369, 9),
-(6971346, 369, 9),
-(6971347, 369, 8),
-(6971349, 369, 8),
-(6971350, 369, 8),
-(6971351, 369, 9),
-(6971352, 369, 9),
-(6971353, 369, 9),
-(6971386, 369, 8),
-(6971395, 369, 8),
-(6971398, 369, 8),
-(6971399, 369, 8),
-(6971401, 369, 8),
-(6971402, 369, 8),
-(6971404, 369, 8),
-(6971406, 369, 8),
-(6971407, 369, 8),
-(6971412, 369, 19),
-(6971414, 369, 19),
-(6971416, 369, 19),
-(6971418, 369, 19),
-(6971424, 369, 20),
-(6971428, 369, 21),
-(6971432, 369, 21),
-(6971460, 369, 18),
-(6971461, 369, 16),
-(6971463, 369, 16),
-(6971464, 369, 1),
-(6971465, 369, 1),
-(6971466, 369, 1),
-(6971467, 369, 1),
-(6971468, 369, 1),
-(6971471, 369, 13),
-(6971479, 369, 27),
-(6971482, 369, 27),
-(6971969, 369, 27),
-(6971973, 369, 26),
-(6971977, 369, 25),
-(6971980, 369, 25),
-(6971982, 369, 25),
-(6971983, 369, 25),
-(6971984, 369, 25),
-(6971985, 369, 25),
-(6971986, 369, 25),
-(6971989, 369, 15),
-(6971991, 369, 13),
-(6971993, 369, 13),
-(6971994, 369, 15),
-(6971996, 369, 17),
-(6971998, 369, 17),
-(6972099, 371, 4),
-(6972116, 371, 4),
-(6972119, 371, 2),
-(6972120, 371, 2),
-(6972122, 371, 3),
-(6972123, 371, 2),
-(6972124, 371, 10),
-(6972127, 371, 1),
-(6972129, 371, 10),
-(6972130, 371, 1),
-(6972131, 371, 27),
-(6972132, 371, 7),
-(6972136, 371, 2),
-(6972138, 371, 1),
-(6972141, 371, 2);
-INSERT INTO `discoveryinfo` (`id`, `map_id`, `discover_id`) VALUES
-(6972145, 371, 2),
-(6972153, 371, 4),
-(6972155, 371, 3),
-(6972157, 371, 3),
-(6972158, 371, 3),
-(6972169, 371, 10),
-(6972171, 371, 12),
-(6972175, 371, 12),
-(6972176, 371, 12),
-(6972422, 371, 12),
-(6972423, 371, 12),
-(6972424, 371, 12),
-(6973154, 371, 12),
-(6973156, 371, 12),
-(6973157, 371, 11),
-(6973158, 371, 11),
-(6973160, 371, 11),
-(6973163, 371, 11),
-(6973166, 371, 11),
-(6973168, 371, 22),
-(6973172, 371, 21),
-(6973186, 371, 20),
-(6973189, 371, 23),
-(6973192, 371, 23),
-(6973193, 371, 24),
-(6973200, 371, 26),
-(6973201, 371, 23),
-(6973209, 371, 28),
-(6973213, 371, 30),
-(6973214, 371, 29),
-(6973215, 371, 23),
-(6973223, 371, 29),
-(6973224, 371, 29),
-(6973225, 371, 17),
-(6973231, 371, 17),
-(6973232, 371, 16),
-(6973233, 371, 15),
-(6973236, 371, 16),
-(6973237, 371, 16),
-(6973238, 371, 17),
-(6973241, 371, 17),
-(6973242, 371, 16),
-(6973243, 371, 17),
-(6973251, 371, 13),
-(6973906, 371, 8),
-(6973923, 371, 8),
-(6973969, 371, 7),
-(6973991, 371, 7),
-(6973998, 371, 7),
-(6974005, 371, 19),
-(6974006, 371, 19),
-(6974007, 371, 19),
-(6975746, 371, 12),
-(6976755, 354, 5),
-(6976758, 354, 3),
-(6976760, 354, 10),
-(6976762, 354, 9),
-(6976763, 354, 8),
-(6976765, 354, 28),
-(6976768, 354, 30),
-(6976773, 354, 21),
-(6976823, 354, 10),
-(6977088, 354, 23),
-(6977089, 354, 22),
-(6977100, 354, 24),
-(6977101, 354, 24),
-(6977102, 354, 25),
-(6977106, 354, 19),
-(6977145, 354, 18),
-(6977146, 354, 17),
-(6977148, 354, 1),
-(6977200, 354, 3),
-(6977202, 354, 6),
-(6977203, 354, 6),
-(6977204, 354, 6),
-(6977205, 354, 3),
-(6977208, 354, 6),
-(6977254, 354, 28),
-(6977257, 354, 30),
-(6977258, 354, 30),
-(6977260, 354, 30),
-(6977261, 354, 30),
-(6977262, 354, 30),
-(6977275, 354, 30),
-(6977280, 354, 30),
-(6977285, 354, 30),
-(6977286, 354, 30),
-(6977287, 354, 30),
-(6977290, 354, 30),
-(6977293, 354, 30),
-(6977335, 354, 30),
-(6977436, 354, 28),
-(6977459, 354, 26),
-(6977464, 354, 26),
-(6977465, 354, 26),
-(6977467, 354, 26),
-(6977470, 354, 26),
-(6977472, 354, 26),
-(6977478, 354, 25),
-(6977481, 354, 25),
-(6977488, 354, 25),
-(6977489, 354, 25),
-(6977495, 354, 24),
-(6977497, 354, 24),
-(6977499, 354, 22),
-(6977502, 354, 22),
-(6977509, 354, 22),
-(6977514, 354, 22),
-(6977518, 354, 22),
-(6977533, 354, 22),
-(6977552, 354, 22),
-(6977561, 354, 10),
-(6977566, 354, 16),
-(6977567, 354, 16),
-(6977570, 354, 19),
-(6977576, 354, 19),
-(6977579, 354, 19),
-(6977581, 354, 13),
-(6977586, 354, 12),
-(6977591, 354, 12),
-(6977592, 354, 12),
-(6977594, 354, 13),
-(6977649, 354, 19),
-(6977651, 354, 19),
-(6979969, 372, 3),
-(6979985, 372, 3),
-(6979987, 372, 3),
-(6980003, 372, 3),
-(6980011, 372, 5),
-(6980019, 372, 5),
-(6980024, 372, 8),
-(6980026, 372, 8),
-(6980073, 372, 5),
-(6980078, 372, 30),
-(6980079, 372, 30),
-(6980080, 372, 30),
-(6980082, 372, 30),
-(6980083, 372, 30),
-(6980084, 372, 30),
-(6980087, 372, 30),
-(6980090, 372, 30),
-(6980108, 372, 21),
-(6980117, 372, 20),
-(6980124, 372, 20),
-(6980126, 372, 20),
-(6980128, 372, 18),
-(6980134, 372, 17),
-(6980135, 372, 17),
-(6980136, 372, 17),
-(6980137, 372, 17),
-(6980138, 372, 16),
-(6980140, 372, 15),
-(6980142, 372, 16),
-(6980143, 372, 16),
-(6980145, 372, 15),
-(6980150, 372, 1),
-(6980155, 372, 2),
-(6980157, 372, 29),
-(6980160, 372, 29),
-(6980161, 372, 29),
-(6980187, 372, 22),
-(6980188, 372, 26),
-(6980190, 372, 7),
-(6980212, 372, 30),
-(6980214, 372, 9),
-(6980218, 372, 11),
-(6980223, 372, 7),
-(6980229, 372, 8),
-(6980250, 372, 8),
-(6980251, 372, 8),
-(6980252, 372, 3),
-(6980253, 372, 3),
-(6980256, 372, 3),
-(6980257, 372, 3),
-(6980258, 372, 3),
-(6980259, 372, 17),
-(6980260, 372, 19),
-(6980262, 372, 18),
-(6980263, 372, 18),
-(6980264, 372, 18),
-(6980265, 372, 18),
-(6980266, 372, 18),
-(6980267, 372, 18),
-(6980271, 372, 18),
-(6980273, 372, 18),
-(6980275, 372, 30),
-(6980277, 372, 22),
-(6980283, 372, 20),
-(6980284, 372, 23),
-(6980285, 372, 25),
-(6980311, 372, 26),
-(6980313, 372, 26),
-(6980323, 372, 25),
-(6980325, 372, 25),
-(6980333, 372, 24),
-(6980334, 372, 25),
-(6980336, 372, 25),
-(6980337, 372, 26),
-(6980347, 372, 27),
-(6980355, 372, 27),
-(6980357, 372, 27),
-(6980358, 372, 2),
-(6980359, 372, 2),
-(6980366, 372, 1),
-(6980368, 372, 2),
-(6980383, 372, 25),
-(6980387, 372, 26),
-(6983070, 336, 3),
-(6983076, 336, 7),
-(6987034, 367, 1),
-(6987035, 367, 1),
-(6987036, 367, 1),
-(6987037, 367, 2),
-(6987038, 367, 2),
-(6987039, 367, 2),
-(6987040, 367, 2),
-(6987041, 367, 3),
-(6987042, 367, 3),
-(6987043, 367, 3),
-(6987044, 367, 4),
-(6987045, 367, 4),
-(6987046, 367, 4),
-(6987047, 367, 5),
-(6987048, 367, 5),
-(6987049, 367, 5),
-(6987050, 367, 6),
-(6987051, 367, 6),
-(6987052, 367, 6),
-(6987053, 367, 7),
-(6987054, 367, 7),
-(6987055, 367, 7),
-(6987056, 367, 8),
-(6987057, 367, 8),
-(6987058, 367, 8),
-(6987059, 367, 2),
-(6987060, 367, 10),
-(6987061, 367, 11),
-(6987062, 367, 11),
-(6987063, 367, 11),
-(6987064, 367, 11),
-(6987065, 367, 11),
-(6987067, 367, 25),
-(6987068, 367, 25),
-(6987070, 367, 13),
-(6987071, 367, 13),
-(6987072, 367, 13),
-(6987073, 367, 12),
-(6987074, 367, 14),
-(6987075, 367, 14),
-(6987076, 367, 15),
-(6987077, 367, 15),
-(6987078, 367, 15),
-(6987079, 367, 24),
-(6987080, 367, 25),
-(6987081, 367, 25),
-(6987082, 367, 26),
-(6987083, 367, 27),
-(6987084, 367, 27),
-(6987085, 367, 27),
-(6987086, 367, 27),
-(6987087, 367, 28),
-(6987088, 367, 28),
-(6987089, 367, 28),
-(6987090, 367, 28),
-(6987091, 367, 28),
-(6987092, 367, 30),
-(6987093, 367, 30),
-(6987094, 367, 30),
-(6987095, 367, 29),
-(6987096, 367, 23),
-(6987097, 367, 23),
-(6987098, 367, 8),
-(6987099, 367, 16),
-(6987100, 367, 16),
-(6987101, 367, 17),
-(6987102, 367, 17),
-(6987103, 367, 22),
-(6987104, 367, 22),
-(6987105, 367, 22),
-(6987106, 367, 21),
-(6987107, 367, 21),
-(6987108, 367, 18),
-(6987109, 367, 18),
-(6987110, 367, 19),
-(6987111, 367, 20),
-(6987112, 367, 10),
-(6987113, 367, 10),
-(6989593, 368, 1),
-(6989594, 368, 1),
-(6989595, 368, 1),
-(6989596, 368, 1),
-(6989597, 368, 3),
-(6989598, 368, 3),
-(6989599, 368, 2),
-(6989600, 368, 1),
-(6989601, 368, 2),
-(6989602, 368, 2),
-(6989603, 368, 14),
-(6989604, 368, 14),
-(6989605, 368, 14),
-(6989606, 368, 15),
-(6989607, 368, 15),
-(6989608, 368, 15),
-(6989609, 368, 17),
-(6989610, 368, 17),
-(6989611, 368, 17),
-(6989612, 368, 16),
-(6989613, 368, 16),
-(6989614, 368, 16),
-(6989615, 368, 16),
-(6989616, 368, 16),
-(6989617, 368, 18),
-(6989618, 368, 18),
-(6989619, 368, 18),
-(6989620, 368, 18),
-(6989621, 368, 18),
-(6989622, 368, 30),
-(6989623, 368, 30),
-(6989624, 368, 30),
-(6989625, 368, 30),
-(6989626, 368, 30),
-(6989627, 368, 29),
-(6989628, 368, 29),
-(6989629, 368, 31),
-(6989630, 368, 28),
-(6989631, 368, 28),
-(6989632, 368, 19),
-(6989633, 368, 19),
-(6989634, 368, 20),
-(6989635, 368, 20),
-(6989636, 368, 19),
-(6989637, 368, 20),
-(6989638, 368, 27),
-(6989639, 368, 27),
-(6989640, 368, 27),
-(6989641, 368, 26),
-(6989642, 368, 26),
-(6989643, 368, 26),
-(6989644, 368, 24),
-(6989645, 368, 24),
-(6989646, 368, 25),
-(6989647, 368, 25),
-(6989648, 368, 25),
-(6989649, 368, 25),
-(6989650, 368, 25),
-(6989651, 368, 23),
-(6989652, 368, 21),
-(6989653, 368, 21),
-(6989654, 368, 21),
-(6989655, 368, 21),
-(6989656, 368, 11),
-(6989657, 368, 11),
-(6989658, 368, 11),
-(6989659, 368, 11),
-(6989660, 368, 11),
-(6989661, 368, 11),
-(6989662, 368, 11),
-(6989663, 368, 11),
-(6989664, 368, 13),
-(6989665, 368, 12),
-(6989666, 368, 4),
-(6989667, 368, 4),
-(6989668, 368, 4),
-(6989669, 368, 5),
-(6989670, 368, 5),
-(6989671, 368, 5),
-(6989672, 368, 10),
-(6989673, 368, 10),
-(6989674, 368, 10),
-(6989675, 368, 22),
-(6989676, 368, 22),
-(6989677, 368, 22),
-(6989678, 368, 22),
-(6989679, 368, 9),
-(6989680, 368, 9),
-(6989681, 368, 9),
-(6989682, 368, 8),
-(6989683, 368, 7),
-(6989685, 368, 6),
-(6994517, 375, 1),
-(6994518, 375, 2),
-(6994519, 375, 4),
-(6994521, 375, 8),
-(6994536, 375, 12),
-(6994537, 375, 13),
-(6994636, 396, 5),
-(6994637, 396, 9),
-(6994638, 396, 11),
-(6994639, 396, 13),
-(6997567, 389, 1),
-(6997901, 368, 17),
-(6997902, 368, 17),
-(6997903, 368, 15),
-(6997904, 368, 16),
-(6997905, 368, 16),
-(6997906, 368, 11),
-(6997907, 368, 2),
-(6997908, 368, 20),
-(6997909, 368, 16),
-(6997910, 368, 20),
-(6997911, 368, 28),
-(6997912, 368, 21),
-(6997913, 368, 21),
-(6997914, 368, 22),
-(6997915, 368, 22),
-(6997916, 368, 22),
-(6997917, 368, 9),
-(6997918, 368, 26),
-(6997919, 368, 20),
-(6998414, 372, 8),
-(6998415, 372, 8),
-(6998416, 372, 18),
-(6998468, 372, 3),
-(6998470, 369, 1),
-(6998471, 369, 1),
-(6998472, 369, 1),
-(6998474, 369, 1),
-(6998479, 369, 1),
-(6998483, 369, 2),
-(6998486, 369, 2),
-(6998487, 369, 2),
-(6998488, 369, 2),
-(6998490, 369, 2),
-(6998491, 369, 1),
-(6998492, 369, 3),
-(6998493, 369, 3),
-(6998494, 369, 3),
-(6998495, 369, 3),
-(6998496, 369, 3),
-(6998499, 369, 4),
-(6998502, 369, 4),
-(6998503, 369, 4),
-(6998504, 369, 4),
-(6998506, 369, 5),
-(6998507, 369, 5),
-(6998508, 369, 5),
-(6998509, 369, 5),
-(6998510, 369, 6),
-(6998512, 369, 6),
-(6998513, 369, 6),
-(6998514, 369, 6),
-(6998515, 369, 6),
-(6998523, 369, 6),
-(6998529, 369, 7),
-(6998530, 369, 7),
-(6998533, 369, 7),
-(6998535, 369, 20),
-(6998536, 369, 20),
-(6998537, 369, 20),
-(6998538, 369, 20),
-(6998541, 369, 19),
-(6998543, 369, 19),
-(6998545, 369, 19),
-(6998546, 369, 19),
-(6998547, 369, 19),
-(6998548, 369, 20),
-(6998551, 369, 19),
-(6998552, 369, 21),
-(6998553, 369, 21),
-(6998555, 369, 21),
-(6998556, 369, 21),
-(6998559, 369, 31),
-(6998561, 369, 31),
-(6998565, 369, 21),
-(6998569, 369, 30),
-(6998571, 369, 30),
-(6998573, 369, 29),
-(6998575, 369, 28),
-(6998576, 369, 28),
-(6998577, 369, 28),
-(6998579, 369, 28),
-(6998580, 369, 28),
-(6998581, 369, 28),
-(6998582, 369, 26),
-(6998583, 369, 28),
-(6998592, 369, 28),
-(6998593, 369, 28),
-(6998594, 369, 27),
-(6998595, 369, 27),
-(6998596, 369, 27),
-(6998598, 369, 26),
-(6998599, 369, 26),
-(6998600, 369, 26),
-(6998601, 369, 25),
-(6998603, 369, 25),
-(6998605, 369, 25),
-(6998607, 369, 14),
-(6998608, 369, 14),
-(6998609, 369, 14),
-(6998610, 369, 14),
-(6998611, 369, 14),
-(6998612, 369, 15),
-(6998613, 369, 15),
-(6998618, 369, 15),
-(6998620, 369, 25),
-(6998622, 369, 13),
-(6998623, 369, 13),
-(6998625, 369, 13),
-(6998627, 369, 12),
-(6998628, 369, 12),
-(6998637, 369, 12),
-(6998638, 369, 12),
-(6998639, 369, 12),
-(6998640, 369, 11),
-(6998641, 369, 3),
-(6998642, 369, 10),
-(6998643, 369, 10),
-(6998644, 369, 10),
-(6998646, 369, 10),
-(6998647, 369, 9),
-(6998648, 369, 9),
-(6998649, 369, 9),
-(6998653, 369, 8),
-(6998654, 369, 8),
-(6998655, 369, 8),
-(6998656, 369, 8),
-(6998657, 369, 22),
-(6998658, 369, 22),
-(6998659, 369, 22),
-(6998661, 369, 18),
-(6998666, 369, 17),
-(6998667, 369, 17),
-(6998668, 369, 17),
-(6998669, 369, 23),
-(6998670, 369, 24),
-(6998676, 369, 24),
-(6998682, 369, 16),
-(6998684, 369, 1),
-(6998685, 369, 1),
-(6998686, 369, 1),
-(6998687, 369, 1),
-(6998688, 369, 1),
-(6998689, 369, 2),
-(6998690, 369, 2),
-(6998691, 369, 2),
-(6998692, 369, 2),
-(6998693, 369, 2),
-(6998694, 369, 1),
-(6998695, 369, 3),
-(6998696, 369, 3),
-(6998697, 369, 3),
-(6998698, 369, 3),
-(6998699, 369, 3),
-(6998700, 369, 4),
-(6998701, 369, 4),
-(6998702, 369, 4),
-(6998703, 369, 4),
-(6998704, 369, 5),
-(6998705, 369, 5),
-(6998706, 369, 5),
-(6998707, 369, 5),
-(6998708, 369, 6),
-(6998709, 369, 6),
-(6998710, 369, 6),
-(6998711, 369, 6),
-(6998712, 369, 6),
-(6998713, 369, 6),
-(6998714, 369, 7),
-(6998715, 369, 7),
-(6998716, 369, 7),
-(6998717, 369, 20),
-(6998718, 369, 20),
-(6998719, 369, 20),
-(6998720, 369, 20),
-(6998722, 369, 19),
-(6998723, 369, 19),
-(6998724, 369, 19),
-(6998725, 369, 19),
-(6998726, 369, 19),
-(6998727, 369, 20),
-(6998728, 369, 19),
-(6998729, 369, 21),
-(6998730, 369, 21),
-(6998731, 369, 21),
-(6998732, 369, 21),
-(6998735, 369, 31),
-(6998736, 369, 31),
-(6998737, 369, 21),
-(6998738, 369, 30),
-(6998739, 369, 30),
-(6998740, 369, 29),
-(6998741, 369, 28),
-(6998742, 369, 28),
-(6998743, 369, 28),
-(6998744, 369, 28),
-(6998745, 369, 28),
-(6998746, 369, 28),
-(6998747, 369, 26),
-(6998748, 369, 28),
-(6998749, 369, 28),
-(6998750, 369, 28),
-(6998751, 369, 27),
-(6998752, 369, 27),
-(6998753, 369, 27),
-(6998754, 369, 26),
-(6998755, 369, 26),
-(6998756, 369, 26),
-(6998757, 369, 25),
-(6998758, 369, 25),
-(6998759, 369, 25),
-(6998760, 369, 14),
-(6998761, 369, 14),
-(6998762, 369, 14),
-(6998763, 369, 14),
-(6998764, 369, 14),
-(6998765, 369, 15),
-(6998766, 369, 15),
-(6998767, 369, 15),
-(6998768, 369, 25),
-(6998769, 369, 13),
-(6998770, 369, 13),
-(6998771, 369, 13),
-(6998772, 369, 12),
-(6998773, 369, 12),
-(6998774, 369, 12),
-(6998775, 369, 12),
-(6998776, 369, 12),
-(6998777, 369, 11),
-(6998778, 369, 3),
-(6998779, 369, 10),
-(6998780, 369, 10),
-(6998781, 369, 10),
-(6998782, 369, 10),
-(6998783, 369, 9),
-(6998784, 369, 9),
-(6998785, 369, 9),
-(6998786, 369, 8),
-(6998787, 369, 8),
-(6998788, 369, 8),
-(6998789, 369, 8),
-(6998790, 369, 22),
-(6998791, 369, 22),
-(6998792, 369, 22),
-(6998793, 369, 18),
-(6998794, 369, 17),
-(6998795, 369, 17),
-(6998796, 369, 17),
-(6998797, 369, 23),
-(6998798, 369, 24),
-(6998799, 369, 24),
-(6998800, 369, 16),
-(6998818, 371, 1),
-(6998896, 371, 1),
-(6998897, 371, 1),
-(6998898, 371, 1),
-(6998899, 371, 2),
-(6998900, 371, 2),
-(6998901, 371, 2),
-(6998902, 371, 2),
-(6998946, 371, 3),
-(6998947, 371, 3),
-(6998982, 371, 3),
-(6998983, 371, 3),
-(6998984, 371, 3),
-(6998986, 371, 4),
-(6998987, 371, 4),
-(6998988, 371, 4),
-(6998990, 371, 4),
-(6998991, 371, 4),
-(6999007, 371, 6),
-(6999008, 371, 6),
-(6999009, 371, 6),
-(6999010, 371, 6),
-(6999011, 371, 15),
-(6999012, 371, 15),
-(6999013, 371, 15),
-(6999014, 371, 5),
-(6999015, 371, 16),
-(6999016, 371, 16),
-(6999017, 371, 16),
-(6999020, 371, 17),
-(6999021, 371, 17),
-(6999022, 371, 17),
-(6999023, 371, 17),
-(6999024, 371, 17),
-(6999025, 371, 17),
-(6999026, 371, 29),
-(6999028, 371, 29),
-(6999029, 371, 30),
-(6999030, 371, 27),
-(6999032, 371, 27),
-(6999034, 371, 27),
-(6999147, 371, 28),
-(6999150, 371, 23),
-(6999152, 371, 23),
-(6999153, 371, 23),
-(6999154, 371, 23),
-(6999156, 371, 23),
-(6999157, 371, 23),
-(6999158, 371, 23),
-(6999159, 371, 23),
-(6999160, 371, 23),
-(6999163, 371, 23),
-(6999166, 371, 23),
-(6999169, 371, 24),
-(6999170, 371, 24),
-(6999171, 371, 24),
-(6999172, 371, 24),
-(6999173, 371, 26),
-(6999174, 371, 26),
-(6999175, 371, 23),
-(6999176, 371, 25),
-(6999177, 371, 21),
-(6999179, 371, 21),
-(6999180, 371, 21),
-(6999181, 371, 21),
-(6999182, 371, 21),
-(6999183, 371, 21),
-(6999184, 371, 22),
-(6999185, 371, 12),
-(6999186, 371, 12),
-(6999188, 371, 12),
-(6999189, 371, 12),
-(6999190, 371, 12),
-(6999191, 371, 12),
-(6999192, 371, 11),
-(6999193, 371, 11),
-(6999194, 371, 11),
-(6999195, 371, 10),
-(6999196, 371, 10),
-(6999197, 371, 10),
-(6999200, 371, 10),
-(6999201, 371, 10),
-(6999202, 371, 9),
-(6999203, 371, 9),
-(6999204, 371, 9),
-(6999206, 371, 8),
-(6999207, 371, 8),
-(6999209, 371, 8),
-(6999212, 371, 7),
-(6999213, 371, 7),
-(6999214, 371, 7),
-(6999216, 371, 14),
-(6999217, 371, 19),
-(6999218, 371, 19),
-(6999219, 371, 7),
-(6999220, 371, 19),
-(6999221, 371, 18),
-(6999222, 371, 20),
-(6999223, 371, 23),
-(6999224, 371, 13),
-(6999476, 371, 1),
-(6999477, 371, 1),
-(6999478, 371, 1),
-(6999479, 371, 1),
-(6999480, 371, 2),
-(6999481, 371, 2),
-(6999482, 371, 2),
-(6999483, 371, 2),
-(6999484, 371, 3),
-(6999485, 371, 3),
-(6999486, 371, 3),
-(6999487, 371, 3),
-(6999488, 371, 3),
-(6999489, 371, 4),
-(6999490, 371, 4),
-(6999491, 371, 4),
-(6999492, 371, 4),
-(6999493, 371, 4),
-(6999494, 371, 6),
-(6999495, 371, 6),
-(6999496, 371, 6),
-(6999497, 371, 6),
-(6999498, 371, 15),
-(6999499, 371, 15),
-(6999500, 371, 15),
-(6999501, 371, 5),
-(6999502, 371, 16),
-(6999503, 371, 16),
-(6999504, 371, 16),
-(6999505, 371, 17),
-(6999506, 371, 17),
-(6999507, 371, 17),
-(6999508, 371, 17),
-(6999509, 371, 17),
-(6999510, 371, 17),
-(6999511, 371, 29),
-(6999512, 371, 29),
-(6999513, 371, 30),
-(6999514, 371, 27),
-(6999515, 371, 27),
-(6999516, 371, 27),
-(6999517, 371, 28),
-(6999518, 371, 23),
-(6999519, 371, 23),
-(6999520, 371, 23),
-(6999521, 371, 23),
-(6999522, 371, 23),
-(6999523, 371, 23),
-(6999524, 371, 23),
-(6999525, 371, 23),
-(6999526, 371, 23),
-(6999527, 371, 23),
-(6999528, 371, 23),
-(6999529, 371, 24),
-(6999530, 371, 24),
-(6999531, 371, 24),
-(6999532, 371, 24),
-(6999533, 371, 26),
-(6999534, 371, 26),
-(6999535, 371, 23),
-(6999536, 371, 25),
-(6999537, 371, 21),
-(6999538, 371, 21),
-(6999539, 371, 21),
-(6999540, 371, 21),
-(6999541, 371, 21),
-(6999542, 371, 21),
-(6999543, 371, 22),
-(6999544, 371, 12),
-(6999545, 371, 12),
-(6999546, 371, 12),
-(6999547, 371, 12),
-(6999548, 371, 12),
-(6999549, 371, 12),
-(6999550, 371, 11),
-(6999551, 371, 11),
-(6999552, 371, 11),
-(6999553, 371, 10),
-(6999554, 371, 10),
-(6999555, 371, 10),
-(6999556, 371, 10),
-(6999557, 371, 10),
-(6999558, 371, 9),
-(6999559, 371, 9),
-(6999560, 371, 9),
-(6999561, 371, 8),
-(6999562, 371, 8),
-(6999563, 371, 8),
-(6999564, 371, 7),
-(6999565, 371, 7),
-(6999566, 371, 7),
-(6999567, 371, 14),
-(6999568, 371, 19),
-(6999569, 371, 19),
-(6999570, 371, 7),
-(6999571, 371, 19),
-(6999572, 371, 18),
-(6999573, 371, 20),
-(6999574, 371, 23),
-(6999575, 371, 13),
-(7001712, 354, 1),
-(7002280, 354, 1),
-(7002282, 354, 1),
-(7002283, 354, 1),
-(7002284, 354, 3),
-(7002286, 354, 3),
-(7002287, 354, 3),
-(7002289, 354, 3),
-(7002290, 354, 3),
-(7002292, 354, 3),
-(7002297, 354, 4),
-(7002298, 354, 4),
-(7002324, 354, 6),
-(7002325, 354, 6),
-(7002327, 354, 3),
-(7002328, 354, 2),
-(7002329, 354, 2),
-(7002333, 354, 8),
-(7002334, 354, 8),
-(7002335, 354, 8),
-(7002336, 354, 7),
-(7002337, 354, 30),
-(7002338, 354, 30),
-(7002339, 354, 30),
-(7002360, 354, 30),
-(7002361, 354, 29),
-(7002363, 354, 9),
-(7002364, 354, 9),
-(7002365, 354, 10),
-(7002366, 354, 10),
-(7002370, 354, 10),
-(7002371, 354, 10),
-(7002372, 354, 10),
-(7002373, 354, 9),
-(7002374, 354, 9),
-(7002376, 354, 28),
-(7002378, 354, 28),
-(7002382, 354, 28),
-(7002385, 354, 28),
-(7002387, 354, 27),
-(7002388, 354, 27),
-(7002390, 354, 26),
-(7002391, 354, 26),
-(7002392, 354, 25),
-(7002393, 354, 26),
-(7002394, 354, 25),
-(7002395, 354, 25),
-(7002396, 354, 25),
-(7002397, 354, 25),
-(7002398, 354, 24),
-(7002399, 354, 24),
-(7002401, 354, 24),
-(7002404, 354, 24),
-(7002410, 354, 23),
-(7002412, 354, 23),
-(7002413, 354, 23),
-(7002414, 354, 23),
-(7002415, 354, 23),
-(7002416, 354, 23),
-(7002417, 354, 23),
-(7002418, 354, 22),
-(7002419, 354, 19),
-(7002420, 354, 22),
-(7002422, 354, 21),
-(7002423, 354, 17),
-(7002424, 354, 17),
-(7002425, 354, 17),
-(7002426, 354, 16),
-(7002427, 354, 17),
-(7002428, 354, 16),
-(7002430, 354, 16),
-(7002431, 354, 16),
-(7002432, 354, 16),
-(7002434, 354, 15),
-(7002436, 354, 15),
-(7002437, 354, 15),
-(7002439, 354, 19),
-(7002694, 354, 19),
-(7002695, 354, 19),
-(7002696, 354, 19),
-(7002697, 354, 19),
-(7002698, 354, 18),
-(7002700, 354, 20),
-(7002701, 354, 20),
-(7002703, 354, 20),
-(7002705, 354, 11),
-(7002708, 354, 11),
-(7002710, 354, 14),
-(7002711, 354, 14),
-(7002712, 354, 14),
-(7002713, 354, 13),
-(7002714, 354, 12),
-(7002715, 354, 1),
-(7002716, 354, 1),
-(7002717, 354, 1),
-(7002718, 354, 1),
-(7002719, 354, 3),
-(7002720, 354, 3),
-(7002721, 354, 3),
-(7002722, 354, 3),
-(7002723, 354, 3),
-(7002725, 354, 3),
-(7002726, 354, 4),
-(7002727, 354, 4),
-(7002730, 354, 6),
-(7002731, 354, 6),
-(7002732, 354, 3),
-(7002733, 354, 2),
-(7002734, 354, 2),
-(7002735, 354, 8),
-(7002736, 354, 8),
-(7002737, 354, 8),
-(7002738, 354, 7),
-(7002739, 354, 30),
-(7002740, 354, 30),
-(7002741, 354, 30),
-(7002742, 354, 30),
-(7002743, 354, 29),
-(7002744, 354, 9),
-(7002745, 354, 9),
-(7002746, 354, 10),
-(7002747, 354, 10),
-(7002748, 354, 10),
-(7002749, 354, 10),
-(7002750, 354, 10),
-(7002751, 354, 9),
-(7002752, 354, 9),
-(7002753, 354, 28),
-(7002754, 354, 28),
-(7002755, 354, 28),
-(7002756, 354, 28),
-(7002757, 354, 27),
-(7002758, 354, 27),
-(7002759, 354, 26),
-(7002760, 354, 26),
-(7002761, 354, 25),
-(7002762, 354, 26),
-(7002763, 354, 25),
-(7002764, 354, 25),
-(7002765, 354, 25),
-(7002766, 354, 25),
-(7002767, 354, 24),
-(7002768, 354, 24),
-(7002769, 354, 24),
-(7002770, 354, 24),
-(7002771, 354, 23),
-(7002772, 354, 23),
-(7002773, 354, 23),
-(7002774, 354, 23),
-(7002775, 354, 23),
-(7002776, 354, 23),
-(7002777, 354, 23),
-(7002778, 354, 22),
-(7002779, 354, 19),
-(7002780, 354, 22),
-(7002781, 354, 21),
-(7002782, 354, 17),
-(7002783, 354, 17),
-(7002784, 354, 17),
-(7002785, 354, 16),
-(7002786, 354, 17),
-(7002787, 354, 16),
-(7002789, 354, 16),
-(7002790, 354, 16),
-(7002791, 354, 16),
-(7002793, 354, 15),
-(7002794, 354, 15),
-(7002795, 354, 15),
-(7002796, 354, 19),
-(7002797, 354, 19),
-(7002798, 354, 19),
-(7002799, 354, 19),
-(7002800, 354, 19),
-(7002801, 354, 18),
-(7002802, 354, 20),
-(7002803, 354, 20),
-(7002804, 354, 20),
-(7002805, 354, 11),
-(7002806, 354, 11),
-(7002807, 354, 14),
-(7002808, 354, 14),
-(7002809, 354, 14),
-(7002810, 354, 13),
-(7002811, 354, 12),
-(7005090, 372, 1),
-(7005094, 372, 1),
-(7005096, 372, 1),
-(7005098, 372, 1),
-(7005107, 372, 1),
-(7005115, 372, 5),
-(7005118, 372, 5),
-(7005165, 372, 5),
-(7005166, 372, 5),
-(7005167, 372, 5),
-(7005168, 372, 8),
-(7005169, 372, 8),
-(7005170, 372, 18),
-(7005171, 372, 8),
-(7005172, 372, 3),
-(7005173, 372, 3),
-(7005174, 372, 3),
-(7005175, 372, 3),
-(7005176, 372, 9),
-(7005177, 372, 9),
-(7005179, 372, 9),
-(7005180, 372, 9),
-(7005181, 372, 10),
-(7005183, 372, 15),
-(7005184, 372, 14),
-(7005186, 372, 14),
-(7005210, 372, 14),
-(7005211, 372, 14),
-(7005212, 372, 14),
-(7005213, 372, 14),
-(7005214, 372, 14),
-(7005215, 372, 11),
-(7005217, 372, 11),
-(7005240, 372, 7),
-(7005401, 372, 7),
-(7005404, 372, 7),
-(7005406, 372, 6),
-(7005408, 372, 12),
-(7005409, 372, 12),
-(7005410, 372, 12),
-(7005411, 372, 12),
-(7005412, 372, 13),
-(7005413, 372, 13),
-(7005414, 372, 13),
-(7005415, 372, 13),
-(7005417, 372, 15),
-(7005418, 372, 15),
-(7005419, 372, 15),
-(7005420, 372, 15),
-(7005422, 372, 18),
-(7005423, 372, 18),
-(7005424, 372, 18),
-(7005425, 372, 18),
-(7005426, 372, 16),
-(7005427, 372, 19),
-(7005429, 372, 19),
-(7005431, 372, 19),
-(7005432, 372, 19),
-(7005433, 372, 19),
-(7005434, 372, 19),
-(7005435, 372, 19),
-(7005436, 372, 19),
-(7005437, 372, 19),
-(7005438, 372, 17),
-(7005441, 372, 17),
-(7005442, 372, 17),
-(7005444, 372, 17),
-(7005445, 372, 20),
-(7005446, 372, 20),
-(7005447, 372, 20),
-(7005451, 372, 20),
-(7005452, 372, 21),
-(7005453, 372, 21),
-(7005454, 372, 21),
-(7005455, 372, 23),
-(7005456, 372, 23),
-(7005457, 372, 23),
-(7005458, 372, 23),
-(7005459, 372, 23),
-(7005460, 372, 23),
-(7005465, 372, 22),
-(7005468, 372, 22),
-(7005469, 372, 22),
-(7005470, 372, 22),
-(7005471, 372, 22),
-(7005472, 372, 22),
-(7005473, 372, 22),
-(7005474, 372, 22),
-(7005475, 372, 22),
-(7005477, 372, 24),
-(7005481, 372, 24),
-(7005482, 372, 24),
-(7005584, 372, 25),
-(7005585, 372, 25),
-(7005586, 372, 30),
-(7005587, 372, 30),
-(7005588, 372, 30),
-(7005589, 372, 4),
-(7005590, 372, 4),
-(7005591, 372, 4),
-(7005592, 372, 30),
-(7005593, 372, 2),
-(7005594, 372, 2),
-(7005595, 372, 2),
-(7005596, 372, 29),
-(7005598, 372, 29),
-(7005600, 372, 27),
-(7005601, 372, 27),
-(7005602, 372, 27),
-(7005606, 372, 28),
-(7005607, 372, 28),
-(7005608, 372, 26),
-(7005609, 372, 10),
-(7005610, 372, 14),
-(7007424, 372, 1),
-(7007425, 372, 1),
-(7007426, 372, 1),
-(7007427, 372, 1),
-(7007428, 372, 1),
-(7007429, 372, 5),
-(7007430, 372, 5),
-(7007431, 372, 5),
-(7007432, 372, 5),
-(7007433, 372, 5),
-(7007434, 372, 8),
-(7007435, 372, 8),
-(7007436, 372, 18),
-(7007437, 372, 8),
-(7007438, 372, 3),
-(7007439, 372, 3),
-(7007440, 372, 3),
-(7007441, 372, 3),
-(7007442, 372, 9),
-(7007443, 372, 9),
-(7007444, 372, 9),
-(7007445, 372, 9),
-(7007446, 372, 10),
-(7007447, 372, 15),
-(7007448, 372, 14),
-(7007449, 372, 14),
-(7007450, 372, 14),
-(7007451, 372, 14),
-(7007452, 372, 14),
-(7007453, 372, 14),
-(7007454, 372, 14),
-(7007455, 372, 11),
-(7007456, 372, 11),
-(7007457, 372, 7),
-(7007458, 372, 7),
-(7007459, 372, 7),
-(7007460, 372, 6),
-(7007461, 372, 12),
-(7007462, 372, 12),
-(7007463, 372, 12),
-(7007464, 372, 12),
-(7007465, 372, 13),
-(7007466, 372, 13),
-(7007467, 372, 13),
-(7007468, 372, 13),
-(7007469, 372, 15),
-(7007470, 372, 15),
-(7007471, 372, 15),
-(7007472, 372, 15),
-(7007473, 372, 18),
-(7007474, 372, 18),
-(7007475, 372, 18),
-(7007476, 372, 18),
-(7007477, 372, 16),
-(7007478, 372, 19),
-(7007479, 372, 19),
-(7007480, 372, 19),
-(7007481, 372, 19),
-(7007482, 372, 19),
-(7007483, 372, 19),
-(7007484, 372, 19),
-(7007485, 372, 19),
-(7007486, 372, 19),
-(7007487, 372, 17),
-(7007488, 372, 17),
-(7007489, 372, 17),
-(7007490, 372, 17),
-(7007491, 372, 20),
-(7007492, 372, 20),
-(7007493, 372, 20),
-(7007494, 372, 20),
-(7007495, 372, 21),
-(7007496, 372, 21),
-(7007497, 372, 21),
-(7007498, 372, 23),
-(7007499, 372, 23),
-(7007500, 372, 23),
-(7007501, 372, 23),
-(7007502, 372, 23),
-(7007503, 372, 23),
-(7007504, 372, 22),
-(7007505, 372, 22),
-(7007506, 372, 22),
-(7007507, 372, 22),
-(7007508, 372, 22),
-(7007509, 372, 22),
-(7007510, 372, 22),
-(7007511, 372, 22),
-(7007512, 372, 22),
-(7007513, 372, 24),
-(7007514, 372, 24),
-(7007515, 372, 24),
-(7007516, 372, 25),
-(7007517, 372, 25),
-(7007518, 372, 30),
-(7007519, 372, 30),
-(7007520, 372, 30),
-(7007521, 372, 4),
-(7007522, 372, 4),
-(7007523, 372, 4),
-(7007524, 372, 30),
-(7007525, 372, 2),
-(7007526, 372, 2),
-(7007527, 372, 2),
-(7007528, 372, 29),
-(7007529, 372, 29),
-(7007530, 372, 27),
-(7007531, 372, 27),
-(7007532, 372, 27),
-(7007533, 372, 28),
-(7007534, 372, 28),
-(7007535, 372, 26),
-(7007536, 372, 10),
-(7007537, 372, 14),
-(7008614, 368, 17),
-(7008615, 368, 17),
-(7008616, 368, 17),
-(7008617, 368, 17),
-(7008977, 372, 16),
-(7011528, 369, 23),
-(7011608, 368, 16),
-(7011609, 368, 16),
-(7011611, 368, 16),
-(7011612, 368, 16),
-(7011613, 368, 16),
-(7011909, 369, 23),
-(7011910, 369, 16),
-(7011911, 369, 16),
-(7011912, 369, 17),
-(7011913, 369, 18),
-(7011914, 369, 22),
-(7011915, 369, 24),
-(7011916, 369, 17),
-(7011917, 369, 24),
-(7011918, 369, 16),
-(7011919, 369, 24),
-(7011920, 369, 16),
-(7011921, 369, 18),
-(7011922, 369, 16),
-(7011923, 369, 10),
-(7015554, 371, 12),
-(7015555, 371, 12),
-(7015556, 371, 12),
-(7015557, 371, 12),
-(7015559, 371, 12),
-(7015560, 371, 12),
-(7015561, 371, 12),
-(7015562, 371, 12),
-(7015563, 371, 1),
-(7015564, 371, 1),
-(7015565, 371, 1),
-(7015639, 371, 1),
-(7015809, 371, 29),
-(7015810, 371, 29),
-(7015811, 371, 29),
-(7015831, 371, 29),
-(7017072, 368, 21),
-(7017073, 368, 21),
-(7017074, 368, 21),
-(7017821, 368, 21),
-(7017822, 368, 21),
-(7017823, 368, 21),
-(7017824, 368, 21),
-(7017825, 368, 21),
-(7018030, 372, 8),
-(7018032, 372, 8),
-(7021959, 354, 6),
-(7022000, 371, 8),
-(7022001, 371, 8),
-(7022002, 371, 8),
-(7022080, 369, 13),
-(7022081, 369, 13),
-(7022082, 369, 10),
-(7022083, 369, 10),
-(7022084, 369, 10),
-(7022085, 369, 10),
-(7022086, 369, 3),
-(7022088, 369, 3),
-(7022089, 369, 3),
-(7022221, 372, 1),
-(7022434, 371, 21),
-(7022435, 371, 7),
-(7022436, 371, 6),
-(7022437, 371, 15),
-(7022438, 371, 5),
-(7022439, 371, 5),
-(7022472, 369, 12),
-(7022480, 369, 12),
-(7022482, 369, 12),
-(7022484, 369, 12),
-(7031210, 369, 31),
-(7031211, 369, 31),
-(7031212, 369, 31),
-(7031213, 369, 31),
-(7031219, 369, 31),
-(7031225, 369, 31),
-(7031226, 369, 30),
-(7031228, 369, 31),
-(7031229, 369, 31),
-(7031230, 369, 31),
-(7031233, 369, 30),
-(7031341, 369, 31),
-(7031346, 369, 31),
-(7031381, 369, 31),
-(7031993, 369, 30),
-(7032050, 369, 21),
-(7032051, 369, 21),
-(7036942, 369, 30),
-(7082919, 415, 14),
-(7082925, 415, 14),
-(7082926, 415, 14),
-(7171388, 415, 15),
-(7171970, 439, 1),
-(7171972, 439, 2),
-(7171973, 439, 3),
-(7171974, 439, 4),
-(7171977, 439, 7),
-(7171981, 439, 11),
-(7171982, 439, 11),
-(7171983, 439, 6),
-(7171987, 439, 7),
-(7171988, 439, 7),
-(7171997, 439, 4),
-(7171998, 439, 9),
-(7171999, 439, 13),
-(7247207, 445, 1),
-(7257150, 414, 1),
-(7309598, 414, 1),
-(7309601, 414, 2),
-(7309602, 414, 2),
-(7309603, 414, 2),
-(7309608, 414, 2),
-(7309609, 414, 2),
-(7309615, 414, 13),
-(7309629, 414, 13),
-(7309632, 414, 12),
-(7309633, 414, 12),
-(7309634, 414, 12),
-(7309640, 414, 12),
-(7309641, 414, 11),
-(7309642, 414, 11),
-(7309679, 414, 8),
-(7309688, 414, 9),
-(7309690, 414, 9),
-(7309692, 414, 9),
-(7309694, 414, 9),
-(7309695, 414, 7),
-(7309697, 414, 7),
-(7309698, 414, 7),
-(7309699, 414, 7),
-(7310021, 414, 5),
-(7310031, 414, 5),
-(7310032, 414, 5),
-(7310046, 414, 10),
-(7310052, 414, 3),
-(7310119, 414, 7),
-(7310228, 414, 12),
-(7310233, 414, 11),
-(7310337, 414, 5),
-(7329610, 414, 10),
-(7329613, 414, 12),
-(7329615, 414, 12),
-(7329616, 414, 12),
-(7329617, 414, 13),
-(7329620, 414, 13),
-(7329621, 414, 13),
-(7329623, 414, 2),
-(7329624, 414, 2),
-(7329625, 414, 2),
-(7329626, 414, 2),
-(7329627, 414, 2),
-(7329629, 414, 2),
-(7329630, 414, 2),
-(7329631, 414, 2),
-(7329635, 414, 4),
-(7329639, 414, 5),
-(7329641, 414, 7),
-(7329643, 414, 7),
-(7329644, 414, 7),
-(7329645, 414, 7),
-(7329646, 414, 7),
-(7329648, 414, 7),
-(7329650, 414, 8),
-(7329651, 414, 8),
-(7329653, 414, 8),
-(7329654, 414, 2),
-(7329655, 414, 9),
-(7329656, 414, 9),
-(7329658, 414, 9);
-
-
 INSERT INTO `land` (`LandSetId`, `LandId`, `Type`, `Size`, `Status`, `LandPrice`, `UpdateTime`, `OwnerId`, `HouseId`, `UPDATE_DATE`) VALUES
 (22216704, 0, 0, 1, 1, 19000000, 0, 0, 0, '2018-12-02 23:28:14'),
 (22216704, 1, 0, 2, 1, 47500000, 0, 0, 0, '2018-12-02 23:28:14'),
diff --git a/sql/schema/schema.sql b/sql/schema/schema.sql
index e58df240..0017310c 100644
--- a/sql/schema/schema.sql
+++ b/sql/schema/schema.sql
@@ -400,13 +400,6 @@ CREATE TABLE `dbupdate` (
   PRIMARY KEY(`name`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8;
 
-CREATE TABLE `discoveryinfo` (
-  `id` int(10) NOT NULL,
-  `map_id` int(3) NOT NULL,
-  `discover_id` int(3) NOT NULL,
-  PRIMARY KEY(`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
-
 CREATE TABLE `house` (
   `HouseId` int(10) UNSIGNED NOT NULL AUTO_INCREMENT,
   `LandSetId` int(10) UNSIGNED DEFAULT NULL,
diff --git a/src/common/Exd/ExdDataGenerated.h b/src/common/Exd/ExdDataGenerated.h
index 725fb2a7..831412cc 100644
--- a/src/common/Exd/ExdDataGenerated.h
+++ b/src/common/Exd/ExdDataGenerated.h
@@ -5594,6 +5594,11 @@ struct ZoneSharedGroup
     std::shared_ptr< xiv::dat::GameData > m_data;
     std::shared_ptr< xiv::exd::ExdData > m_exd_data;
 
+    std::shared_ptr< xiv::dat::GameData > getGameData()
+    {
+      return m_data;
+    }
+
     template< class T >
     std::shared_ptr< T > get( uint32_t id )
     {
diff --git a/src/common/Network/PacketDef/Zone/ServerZoneDef.h b/src/common/Network/PacketDef/Zone/ServerZoneDef.h
index 8812e17f..49a5eea1 100644
--- a/src/common/Network/PacketDef/Zone/ServerZoneDef.h
+++ b/src/common/Network/PacketDef/Zone/ServerZoneDef.h
@@ -1550,11 +1550,10 @@ namespace Sapphire::Network::Packets::Server
   */
   struct FFXIVIpcDiscovery : FFXIVIpcBasePacket< Discovery >
   {
-    /* 0000 */ uint32_t map_part_id;
-    /* 0004 */ uint32_t map_id;
+    /* 0000 */ uint32_t mapPartId;
+    /* 0004 */ uint32_t mapId;
   };
 
-
   /**
   * UNKOWN TYPE
   */
diff --git a/src/tools/discovery_parser/main.cpp b/src/tools/discovery_parser/main.cpp
index 0ded1f58..0125222b 100644
--- a/src/tools/discovery_parser/main.cpp
+++ b/src/tools/discovery_parser/main.cpp
@@ -36,10 +36,11 @@ struct ZoneInfo
   uint16_t id;
   std::string name;
   std::string path;
+  uint16_t mapId;
 };
 
 // parsing shit
-std::string gamePath( "C:\\Program Files (x86)\\SquareEnix\\FINAL FANTASY XIV - A Realm Reborn\\game\\sqpack" );
+std::string gamePath( "C:\\SquareEnix\\FINAL FANTASY XIV - A Realm Reborn\\game\\sqpack" );
 std::unordered_map< uint32_t, std::string > eobjNameMap;
 std::unordered_map< uint16_t, ZoneInfo > zoneInfoMap;
 std::unordered_map< uint16_t, std::vector< std::pair< uint16_t, std::string > > > zoneInstanceMap;
@@ -60,8 +61,7 @@ struct vec2
   float x, y;
 };
 
-struct DiscoveryMap :
-  std::enable_shared_from_this< DiscoveryMap >
+struct DiscoveryMap : std::enable_shared_from_this< DiscoveryMap >
 {
   std::string path;
   Image img;
@@ -120,11 +120,11 @@ struct DiscoveryMap :
 std::map< uint16_t, std::map< uint16_t, std::map< uint16_t, std::shared_ptr< DiscoveryMap > > > > discoveryMaps;
 
 
-enum class TerritoryTypeExdIndexes :
-  size_t
+enum class TerritoryTypeExdIndexes : size_t
 {
   TerritoryType = 0,
-  Path = 1
+  Path = 1,
+  Map = 6
 };
 
 using namespace std::chrono_literals;
@@ -165,6 +165,8 @@ std::string zoneNameToPath( const std::string& name )
       info.id = row.first;
       info.path = teriPath;
       info.name = teriName;
+      info.mapId = std::get< uint16_t >(
+        fields.at( static_cast< size_t >( TerritoryTypeExdIndexes::Map ) ) );
       zoneInfoMap[ row.first ] = info;
 
       if( !found && ( Common::Util::toLowerCopy( name ) == Common::Util::toLowerCopy( teriName ) ) )
@@ -217,69 +219,31 @@ void loadEobjNames()
   }
 }
 
-void writeEobjEntry( std::ofstream& out, LGB_ENTRY* pObj )
+void writeMapRangeEntry( std::ofstream& out, LgbEntry* pObj )
 {
-  static std::string mapRangeStr( "\"MapRange\", " );
-  std::ofstream discoverySql( zoneName + "_poprange.txt", std::ios::app );
-  uint32_t id;
-  uint32_t unknown2 = 0, unknown2_1 = 0, unknown3 = 0;
-  std::string name;
-  std::string typeStr;
-  uint32_t eobjlevelHierachyId = 0;
-  static std::map< uint32_t, std::map< uint32_t, uint32_t > > exportedMapRange;
+  auto pMapRange = reinterpret_cast< LGB_MAP_RANGE_ENTRY* >( pObj );
+  if( !pMapRange->header.discoveryEnabled )
+    return;
 
-  auto pMapRange = reinterpret_cast< LGB_MAPRANGE_ENTRY* >( pObj );
-  id = pMapRange->header.unknown;
-  unknown2 = pMapRange->header.unknown2;
-  unknown2_1 = pMapRange->header.unknown2_1;
-  unknown3 = pMapRange->header.unknown3;
-  typeStr = mapRangeStr;
-
-  // discovery shit
-  vec2 pos{ 0 };
   auto subArea = 0;
   auto mapId = -1;
   auto discoveryIndex = pMapRange->header.discoveryIndex;
 
-  vec3 translation = pObj->header.translation;
+  vec3 translation = pObj->header.transform.translation;
 
-  bool found = false;
-  float scale = 100.f; //pMapRange->header.unknown2
-
-  std::string outStr( pMapRange->name + " " + std::to_string( pMapRange->header.unknown ) + " " +
-  std::to_string( pMapRange->header.translation.x ) + " " +
-  std::to_string( pMapRange->header.translation.y ) + " " +
-  std::to_string( pMapRange->header.translation.z ) + " " +
-  std::to_string( pMapRange->header.rotation.y ) + "\n"
+  std::string outStr( pMapRange->name + " " + std::to_string( pMapRange->header.instanceId ) + " " +
+                      std::to_string( pMapRange->header.transform.translation.x ) + " " +
+                      std::to_string( pMapRange->header.transform.translation.y ) + " " +
+                      std::to_string( pMapRange->header.transform.translation.z ) + " " +
+                      std::to_string( pMapRange->header.transform.rotation.y ) + " " +
+                      std::to_string( pMapRange->header.mapId ) + " " +
+                      std::to_string( pMapRange->header.discoveryIndex ) + "\n"
   );
 
-    //std::to_string( pObj->header.translation.x ) + ", " + std::to_string( pObj->header.translation.y ) + ", " + std::to_string( pObj->header.translation.z ) +
-    //", " + std::to_string( subArea ) + "" + "\n"
-  //);
-  discoverySql.write( outStr.c_str(), outStr.size() );
-  //out.write( outStr.c_str(), outStr.size() );
-}
+  out.write( outStr.c_str(), outStr.size() );
 
-void readFileToBuffer( const std::string& path, std::vector< char >& buf )
-{
-  auto inFile = std::ifstream( path, std::ios::binary );
-  if( inFile.good() )
-  {
-    inFile.seekg( 0, inFile.end );
-    int32_t fileSize = ( int32_t ) inFile.tellg();
-    buf.resize( fileSize );
-    inFile.seekg( 0, inFile.beg );
-    inFile.read( &buf[ 0 ], fileSize );
-    inFile.close();
-  }
-  else
-  {
-    throw std::runtime_error( "Unable to open " + path );
-  }
 }
 
-bool isEx = false;
-
 int main( int argc, char* argv[] )
 {
   auto startTime = std::chrono::system_clock::now();
@@ -288,10 +252,6 @@ int main( int argc, char* argv[] )
   std::vector< std::string > argVec( argv + 1, argv + argc );
   zoneName = "s1h1";
 
-  bool dumpAll = ignoreModels = std::remove_if( argVec.begin(), argVec.end(), []( auto arg )
-  { return arg == "--dump-all"; } ) != argVec.end();
-  dumpAll = true;
-  ignoreModels = true;
   if( argc > 1 )
   {
     zoneName = argv[ 1 ];
@@ -304,118 +264,42 @@ int main( int argc, char* argv[] )
   }
 
   initExd( gamePath );
-  std::ofstream discoverySql( zoneName + "_poprange.txt", std::ios::trunc );
-  discoverySql.close();
+  std::ofstream discoverySql( "maprange_export.txt", std::ios::trunc );
 
-  if( dumpAll )
+  zoneNameToPath( "f1f1" );
+  zoneDumpList.emplace( "f1f1" );
+  zoneDumpList.emplace( "f1f2" );
+
+  for( const auto& zoneName : zoneDumpList )
   {
-    zoneNameToPath( "s1h1" );
-
-    zoneDumpList.emplace( "s1h1" );
-    zoneDumpList.emplace( "f1h1" );
-    zoneDumpList.emplace( "w1h1" );
-    zoneDumpList.emplace( "e1h1" );
-  }
-  else
-  {
-    zoneDumpList.emplace( zoneName );
-  }
-
-  LABEL_DUMP:
-  entryStartTime = std::chrono::system_clock::now();
-  zoneName = *zoneDumpList.begin();
-  discoverySql.open( zoneName + "_poprange.txt", std::ios::trunc );
-  discoverySql.write( ( zoneName + "\n" ).c_str() , zoneName.size() + 1 );
-  try
-  {
-    const auto zonePath = zoneNameToPath( zoneName );
-
-    std::string listPcbPath( zonePath + "/collision/list.pcb" );
-    std::string bgLgbPath( zonePath + "/level/bg.lgb" );
-    std::string planmapLgbPath( zonePath + "/level/planmap.lgb" );
-    std::string collisionFilePath( zonePath + "/collision/" );
-
-    isEx = bgLgbPath.find( "ex1" ) != -1 || bgLgbPath.find( "ex2" ) != -1;
-    std::vector< char > section;
-    std::vector< char > section1;
-    std::vector< char > section2;
-
-    auto test_file = gameData->getFile( bgLgbPath );
-    section = test_file->access_data_sections().at( 0 );
-
-    auto planmap_file = gameData->getFile( planmapLgbPath );
-    section2 = planmap_file->access_data_sections().at( 0 );
-
-    auto test_file1 = gameData->getFile( listPcbPath );
-    section1 = test_file1->access_data_sections().at( 0 );
-
-    std::vector< std::string > stringList;
-
-    uint32_t offset1 = 0x20;
-
-    //loadEobjNames();
-    //getMapExdEntries( zoneId );
-
-    std::string eobjFileName( zoneName + "_eobj.csv" );
-    std::ofstream eobjOut( eobjFileName, std::ios::trunc );
-    if( !eobjOut.good() )
-      throw std::string( "Unable to create " + zoneName +
-                         "_eobj.csv for eobj entries. Run as admin or check there isnt already a handle on the file." ).c_str();
-
-    eobjOut.close();
-    eobjOut.open( eobjFileName, std::ios::app );
-
-    if( !eobjOut.good() )
-      throw std::string( "Unable to create " + zoneName +
-                         "_eobj.csv for eobj entries. Run as admin or check there isnt already a handle on the file." ).c_str();
-
-    if( 0 )
+    entryStartTime = std::chrono::system_clock::now();
+    discoverySql.write( ( zoneName + "\n" ).c_str(), zoneName.size() + 1 );
+    try
     {
-      for( ;; )
-      {
+      const auto zonePath = zoneNameToPath( zoneName );
 
-        uint16_t trId = *( uint16_t* ) &section1[ offset1 ];
+      std::string bgLgbPath( zonePath + "/level/bg.lgb" );
+      std::string planmapLgbPath( zonePath + "/level/planmap.lgb" );
+      std::vector< char > section;
+      std::vector< char > section2;
 
-        char someString[200];
-        sprintf( someString, "%str%04d.pcb", collisionFilePath.c_str(), trId );
-        stringList.push_back( std::string( someString ) );
-        //std::cout << someString << "\n";
-        offset1 += 0x20;
+      auto test_file = gameData->getFile( bgLgbPath );
+      section = test_file->access_data_sections().at( 0 );
 
-        if( offset1 >= section1.size() )
-        {
-          break;
-        }
-      }
-    }
-    LGB_FILE bgLgb( &section[ 0 ], "bg" );
-    LGB_FILE planmapLgb( &section2[ 0 ], "planmap" );
+      auto planmap_file = gameData->getFile( planmapLgbPath );
+      section2 = planmap_file->access_data_sections().at( 0 );
 
-    std::vector< LGB_FILE > lgbList{ bgLgb, planmapLgb };
-    uint32_t max_index = 0;
+      std::vector< std::string > stringList;
 
-    // dont bother if we cant write to a file
-    FILE* fp_out = nullptr;
-    //auto fp_out = ignoreModels ? ( FILE* )nullptr : fopen( ( zoneName + ".obj" ).c_str(), "w" );
-    if( fp_out )
-    {
-      fprintf( fp_out, "\n" );
-      fclose( fp_out );
-    }
-    else if( /*!ignoreModels*/ false )
-    {
-      std::string errorMessage( "Cannot create " + zoneName + ".obj\n" +
-                                " Check no programs have a handle to file and run as admin.\n" );
-      std::cout << errorMessage;
-      throw std::runtime_error( errorMessage.c_str() );
-      return 0;
-    }
+      uint32_t offset1 = 0x20;
 
+      LGB_FILE bgLgb( &section[ 0 ], "bg" );
+      LGB_FILE planmapLgb( &section2[ 0 ], "planmap" );
 
-    {
-      std::map< std::string, PCB_FILE > pcbFiles;
+      std::vector< LGB_FILE > lgbList{ bgLgb, planmapLgb };
+      uint32_t max_index = 0;
 
-      std::cout << "[Info] " << ( ignoreModels ? "Dumping MapRange and EObj" : "Writing obj file " ) << "\n";
+      std::cout << "[Info] " << "Dumping MapRange and EObj" << "\n";
       uint32_t totalGroups = 0;
       uint32_t totalGroupEntries = 0;
 
@@ -423,48 +307,46 @@ int main( int argc, char* argv[] )
       {
         for( const auto& group : lgb.groups )
         {
-          //std::cout << "\t" << group.name << " Size " << group.header.entryCount << "\n";
           totalGroups++;
           for( const auto& pEntry : group.entries )
           {
-            if( pEntry->getType() == LgbEntryType::PopRange )
+            if( pEntry->getType() == LgbEntryType::MapRange )
             {
               totalGroupEntries++;
-              writeEobjEntry( eobjOut, pEntry.get() );
+              writeMapRangeEntry( discoverySql, pEntry.get() );
+            }
+            else if( pEntry->getType() == LgbEntryType::ExitRange )
+            {
+              auto pExitRange = reinterpret_cast< LGB_EXIT_RANGE_ENTRY* >( pEntry.get() );
+
             }
           }
         }
       }
-      std::cout << "[Info] " << "Loaded " << pcbFiles.size() << " PCB Files \n";
       std::cout << "[Info] " << "Total Groups " << totalGroups << " Total entries " << totalGroupEntries << "\n";
+
+      std::cout << "[Success] " << "Exported " << zoneName << " in " <<
+                std::chrono::duration_cast< std::chrono::seconds >(
+                  std::chrono::system_clock::now() - entryStartTime ).count() << " seconds\n";
     }
-    std::cout << "[Success] " << "Exported " << zoneName << " in " <<
-              std::chrono::duration_cast< std::chrono::seconds >(
-                std::chrono::system_clock::now() - entryStartTime ).count() << " seconds\n";
+    catch( std::exception& e )
+    {
+      std::cout << "[Error] " << e.what() << std::endl;
+      std::cout << "[Error] "
+                << "Unable to extract collision data.\n\tIf using standalone ensure your working directory folder layout is \n\tbg/[ffxiv|ex1|ex2]/teri/type/zone/[level|collision]"
+                << std::endl;
+      std::cout << std::endl;
+      std::cout << "[Info] " << "Usage: pcb_reader2 territory \"path/to/game/sqpack/ffxiv\" " << std::endl;
+    }
+    std::cout << "\n";
+    if( discoverySql.good() )
+      discoverySql.flush();
   }
-  catch( std::exception& e )
-  {
-    std::cout << "[Error] " << e.what() << std::endl;
-    std::cout << "[Error] "
-              << "Unable to extract collision data.\n\tIf using standalone ensure your working directory folder layout is \n\tbg/[ffxiv|ex1|ex2]/teri/type/zone/[level|collision]"
-              << std::endl;
-    std::cout << std::endl;
-    std::cout << "[Info] " << "Usage: pcb_reader2 territory \"path/to/game/sqpack/ffxiv\" " << std::endl;
-  }
-  std::cout << "\n\n\n";
-  if( discoverySql.good() )
-    discoverySql.flush();
-
-  LABEL_NEXT_ZONE_ENTRY:
-  zoneDumpList.erase( zoneName );
-  if( !zoneDumpList.empty() )
-    goto LABEL_DUMP;
-
-
-  std::cout << "\n\n\n[Success] Finished all tasks in " <<
+  std::cout << "\n[Success] Finished all tasks in " <<
             std::chrono::duration_cast< std::chrono::seconds >( std::chrono::system_clock::now() - startTime ).count()
             << " seconds\n";
 
+  std::cout << "Press any key to exit...";
   getchar();
 
   if( eData )
diff --git a/src/tools/event_object_parser/main.cpp b/src/tools/event_object_parser/main.cpp
index a4d451a9..7615939a 100644
--- a/src/tools/event_object_parser/main.cpp
+++ b/src/tools/event_object_parser/main.cpp
@@ -285,7 +285,7 @@ int main( int argc, char* argv[] )
 
               auto pEobj = reinterpret_cast< LGB_EOBJ_ENTRY* >( pObj );
               id = pEobj->header.eobjId;
-              unknown = pEobj->header.unknown;
+              unknown = pEobj->header.instanceId;
 
               eobjlevelHierachyId = pEobj->header.levelHierachyId;
 
@@ -295,7 +295,7 @@ int main( int argc, char* argv[] )
               {
                 auto pGObj = pEntry1.get();
                 if( pGObj->getType() == LgbEntryType::Gimmick &&
-                    pGObj->header.unknown == pEobj->header.levelHierachyId )
+                    pGObj->header.instanceId == pEobj->header.levelHierachyId )
                 {
                   auto pGObjR = reinterpret_cast< LGB_GIMMICK_ENTRY* >( pGObj );
                   char* dataSection = nullptr;
@@ -361,13 +361,13 @@ int main( int argc, char* argv[] )
               eobjects += "    instance.registerEObj( \"" + name + "\", " + std::to_string( id ) +
                             ", " + std::to_string( eobjlevelHierachyId ) + ", " + std::to_string( state ) +
                             ", " +
-                            "{ " + std::to_string( pObj->header.translation.x ) + "f, "
-                            + std::to_string( pObj->header.translation.y ) + "f, "
-                            + std::to_string( pObj->header.translation.z ) + "f }, " +
-                            std::to_string( pObj->header.scale.x ) + "f, " +
+                            "{ " + std::to_string( pObj->header.transform.translation.x ) + "f, "
+                            + std::to_string( pObj->header.transform.translation.y ) + "f, "
+                            + std::to_string( pObj->header.transform.translation.z ) + "f }, " +
+                            std::to_string( pObj->header.transform.scale.x ) + "f, " +
 
                             // the rotation inside the sgbs is the inverse of what the game uses
-                            std::to_string( pObj->header.rotation.y * -1.f ) + "f ); \n" + states;
+                            std::to_string( pObj->header.transform.rotation.y * -1.f ) + "f ); \n" + states;
             }
           }
         }
diff --git a/src/tools/exd_struct_gen/ExdData.h.tmpl b/src/tools/exd_struct_gen/ExdData.h.tmpl
index 4b344f7b..d5612d74 100644
--- a/src/tools/exd_struct_gen/ExdData.h.tmpl
+++ b/src/tools/exd_struct_gen/ExdData.h.tmpl
@@ -43,6 +43,11 @@ STRUCTS
     std::shared_ptr< xiv::dat::GameData > m_data;
     std::shared_ptr< xiv::exd::ExdData > m_exd_data;
 
+    std::shared_ptr< xiv::dat::GameData > getGameData()
+    {
+      return m_data;
+    }
+
     template< class T >
     std::shared_ptr< T > get( uint32_t id )
     {
diff --git a/src/tools/nav_export/lgb.h b/src/tools/nav_export/lgb.h
index b363dcb3..937f2f77 100644
--- a/src/tools/nav_export/lgb.h
+++ b/src/tools/nav_export/lgb.h
@@ -68,7 +68,7 @@ enum class LgbEntryType :
   SphereCastRange = 75,
 };
 
-struct LGB_ENTRY_HEADER
+struct InstanceObject
 {
   LgbEntryType type;
   uint32_t unknown;
@@ -78,25 +78,25 @@ struct LGB_ENTRY_HEADER
   vec3 scale;
 };
 
-class LGB_ENTRY
+class LgbEntry
 {
 public:
   char* m_buf;
   uint32_t m_offset;
-  LGB_ENTRY_HEADER header;
+  InstanceObject header;
 
-  LGB_ENTRY()
+  LgbEntry()
   {
     m_buf = nullptr;
     m_offset = 0;
     memset( &header, 0, sizeof( header ) );
   };
 
-  LGB_ENTRY( char* buf, uint32_t offset )
+  LgbEntry( char* buf, uint32_t offset )
   {
     m_buf = buf;
     m_offset = offset;
-    header = *reinterpret_cast< LGB_ENTRY_HEADER* >( buf + offset );
+    header = *reinterpret_cast< InstanceObject* >( buf + offset );
   };
 
   const LgbEntryType getType() const
@@ -104,14 +104,14 @@ public:
     return header.type;
   };
 
-  virtual ~LGB_ENTRY()
+  virtual ~LgbEntry()
   {
   };
 };
 
 
-struct LGB_BGPARTS_HEADER :
-  public LGB_ENTRY_HEADER
+struct BgPartsData :
+  public InstanceObject
 {
   uint32_t modelFileOffset;
   uint32_t collisionFileOffset;
@@ -124,10 +124,10 @@ struct LGB_BGPARTS_HEADER :
 };
 
 class LGB_BGPARTS_ENTRY :
-  public LGB_ENTRY
+  public LgbEntry
 {
 public:
-  LGB_BGPARTS_HEADER header;
+  BgPartsData header;
   std::string name;
   std::string modelFileName;
   std::string collisionFileName;
@@ -137,65 +137,65 @@ public:
   };
 
   LGB_BGPARTS_ENTRY( char* buf, uint32_t offset ) :
-    LGB_ENTRY( buf, offset )
+          LgbEntry( buf, offset )
   {
-    header = *reinterpret_cast<LGB_BGPARTS_HEADER*>( buf + offset );
+    header = *reinterpret_cast<BgPartsData*>( buf + offset );
     name = std::string( buf + offset + header.nameOffset );
     modelFileName = std::string( buf + offset + header.modelFileOffset );
     collisionFileName = std::string( buf + offset + header.collisionFileOffset );
   };
 };
 
-struct LGB_GIMMICK_HEADER :
-  public LGB_ENTRY_HEADER
+struct GimmickData :
+  public InstanceObject
 {
   uint32_t gimmickFileOffset;
   char unknownBytes[100];
 };
 
 class LGB_GIMMICK_ENTRY :
-  public LGB_ENTRY
+  public LgbEntry
 {
 public:
-  LGB_GIMMICK_HEADER header;
+  GimmickData header;
   std::string name;
   std::string gimmickFileName;
 
   LGB_GIMMICK_ENTRY( char* buf, uint32_t offset ) :
-    LGB_ENTRY( buf, offset )
+          LgbEntry( buf, offset )
   {
-    header = *reinterpret_cast<LGB_GIMMICK_HEADER*>( buf + offset );
+    header = *reinterpret_cast<GimmickData*>( buf + offset );
     name = std::string( buf + offset + header.nameOffset );
     gimmickFileName = std::string( buf + offset + header.gimmickFileOffset );
     //std::cout << "\t " << gimmickFileName << " unknown: " << header.unknown << "\n";
   };
 };
 
-struct LGB_ENPC_HEADER :
-  public LGB_ENTRY_HEADER
+struct ENpcData :
+  public InstanceObject
 {
   uint32_t enpcId;
   uint8_t unknown1[0x24];
 };
 
 class LGB_ENPC_ENTRY :
-  public LGB_ENTRY
+  public LgbEntry
 {
 public:
-  LGB_ENPC_HEADER header;
+  ENpcData header;
   std::string name;
 
   LGB_ENPC_ENTRY( char* buf, uint32_t offset ) :
-    LGB_ENTRY( buf, offset )
+          LgbEntry( buf, offset )
   {
-    header = *reinterpret_cast< LGB_ENPC_HEADER* >( buf + offset );
+    header = *reinterpret_cast< ENpcData* >( buf + offset );
     name = std::string( buf + offset + header.nameOffset );
     //std::cout << "\t ENpc " << header.enpcId << " " << name << "\n";
   };
 };
 
-struct LGB_EOBJ_HEADER :
-  public LGB_ENTRY_HEADER
+struct EObjData :
+  public InstanceObject
 {
   uint32_t eobjId;
   uint32_t levelHierachyId;
@@ -203,23 +203,23 @@ struct LGB_EOBJ_HEADER :
 };
 
 class LGB_EOBJ_ENTRY :
-  public LGB_ENTRY
+  public LgbEntry
 {
 public:
-  LGB_EOBJ_HEADER header;
+  EObjData header;
   std::string name;
 
   LGB_EOBJ_ENTRY( char* buf, uint32_t offset ) :
-    LGB_ENTRY( buf, offset )
+          LgbEntry( buf, offset )
   {
-    header = *reinterpret_cast< LGB_EOBJ_HEADER* >( buf + offset );
+    header = *reinterpret_cast< EObjData* >( buf + offset );
     //std::cout << "\t " << header.eobjId << " " << name << " unknown: " << header.unknown << "\n";
     name = std::string( buf + offset + header.nameOffset );
   };
 };
 
-struct LGB_MAPRANGE_HEADER :
-  public LGB_ENTRY_HEADER
+struct MapRangeData :
+  public InstanceObject
 {
   uint32_t type;
   uint16_t unknown2;
@@ -227,35 +227,35 @@ struct LGB_MAPRANGE_HEADER :
   uint8_t unknown4[0x10];
 };
 
-struct LGB_MAPRANGE_ENTRY :
-  public LGB_ENTRY
+struct LGB_MAP_RANGE_ENTRY :
+  public LgbEntry
 {
 public:
-  LGB_MAPRANGE_HEADER header;
+  MapRangeData header;
   std::string name;
 
-  LGB_MAPRANGE_ENTRY( char* buf, uint32_t offset ) :
-    LGB_ENTRY( buf, offset )
+  LGB_MAP_RANGE_ENTRY( char* buf, uint32_t offset ) :
+          LgbEntry( buf, offset )
   {
-    header = *reinterpret_cast< LGB_MAPRANGE_HEADER* >( buf + offset );
+    header = *reinterpret_cast< MapRangeData* >( buf + offset );
     name = std::string( buf + offset + header.nameOffset );
   };
 };
 
 struct LGB_COLLISION_BOX_HEADER :
-  public LGB_ENTRY_HEADER
+  public InstanceObject
 {
   uint8_t unk[100];
 };
 
 struct LGB_COLLISION_BOX_ENTRY :
-  public LGB_ENTRY
+  public LgbEntry
 {
   LGB_COLLISION_BOX_HEADER header;
   std::string name;
 
   LGB_COLLISION_BOX_ENTRY( char* buf, uint32_t offset ) :
-    LGB_ENTRY( buf, offset )
+          LgbEntry( buf, offset )
   {
     header = *reinterpret_cast< LGB_COLLISION_BOX_HEADER* >( buf + offset );
     header.type = LgbEntryType::CollisionBox;
@@ -305,7 +305,7 @@ struct LGB_GROUP
   LGB_FILE* parent;
   LGB_GROUP_HEADER header;
   std::string name;
-  std::vector< std::shared_ptr< LGB_ENTRY > > entries;
+  std::vector< std::shared_ptr< LgbEntry > > entries;
 
   LGB_GROUP( char* buf, LGB_FILE* parentStruct, uint32_t offset )
   {
diff --git a/src/tools/nav_export/main.cpp b/src/tools/nav_export/main.cpp
index 12e1c840..c42f8c17 100644
--- a/src/tools/nav_export/main.cpp
+++ b/src/tools/nav_export/main.cpp
@@ -257,7 +257,7 @@ bool pcbTransformModel( const std::string& fileName, const vec3* scale, const ve
   return true;
 };
 
-void exportSgbModel( const std::string& sgbFilePath, LGB_ENTRY* pGimmick, ExportedGroup& exportgroup, bool isEobj = false  )
+void exportSgbModel( const std::string& sgbFilePath, LgbEntry* pGimmick, ExportedGroup& exportgroup, bool isEobj = false  )
 {
   if( auto pSgbFile = pCache->getSgbFile( sgbFilePath ) )
   {
diff --git a/src/tools/pcb_reader/lgb.h b/src/tools/pcb_reader/lgb.h
index b363dcb3..d87a2809 100644
--- a/src/tools/pcb_reader/lgb.h
+++ b/src/tools/pcb_reader/lgb.h
@@ -68,7 +68,7 @@ enum class LgbEntryType :
   SphereCastRange = 75,
 };
 
-struct LGB_ENTRY_HEADER
+struct InstanceObject
 {
   LgbEntryType type;
   uint32_t unknown;
@@ -78,25 +78,25 @@ struct LGB_ENTRY_HEADER
   vec3 scale;
 };
 
-class LGB_ENTRY
+class LgbEntry
 {
 public:
   char* m_buf;
   uint32_t m_offset;
-  LGB_ENTRY_HEADER header;
+  InstanceObject header;
 
-  LGB_ENTRY()
+  LgbEntry()
   {
     m_buf = nullptr;
     m_offset = 0;
     memset( &header, 0, sizeof( header ) );
   };
 
-  LGB_ENTRY( char* buf, uint32_t offset )
+  LgbEntry( char* buf, uint32_t offset )
   {
     m_buf = buf;
     m_offset = offset;
-    header = *reinterpret_cast< LGB_ENTRY_HEADER* >( buf + offset );
+    header = *reinterpret_cast< InstanceObject* >( buf + offset );
   };
 
   const LgbEntryType getType() const
@@ -104,14 +104,14 @@ public:
     return header.type;
   };
 
-  virtual ~LGB_ENTRY()
+  virtual ~LgbEntry()
   {
   };
 };
 
 
-struct LGB_BGPARTS_HEADER :
-  public LGB_ENTRY_HEADER
+struct BgPartsData :
+  public InstanceObject
 {
   uint32_t modelFileOffset;
   uint32_t collisionFileOffset;
@@ -124,10 +124,10 @@ struct LGB_BGPARTS_HEADER :
 };
 
 class LGB_BGPARTS_ENTRY :
-  public LGB_ENTRY
+  public LgbEntry
 {
 public:
-  LGB_BGPARTS_HEADER header;
+  BgPartsData header;
   std::string name;
   std::string modelFileName;
   std::string collisionFileName;
@@ -137,65 +137,65 @@ public:
   };
 
   LGB_BGPARTS_ENTRY( char* buf, uint32_t offset ) :
-    LGB_ENTRY( buf, offset )
+          LgbEntry( buf, offset )
   {
-    header = *reinterpret_cast<LGB_BGPARTS_HEADER*>( buf + offset );
+    header = *reinterpret_cast<BgPartsData*>( buf + offset );
     name = std::string( buf + offset + header.nameOffset );
     modelFileName = std::string( buf + offset + header.modelFileOffset );
     collisionFileName = std::string( buf + offset + header.collisionFileOffset );
   };
 };
 
-struct LGB_GIMMICK_HEADER :
-  public LGB_ENTRY_HEADER
+struct GimmickData :
+  public InstanceObject
 {
   uint32_t gimmickFileOffset;
   char unknownBytes[100];
 };
 
 class LGB_GIMMICK_ENTRY :
-  public LGB_ENTRY
+  public LgbEntry
 {
 public:
-  LGB_GIMMICK_HEADER header;
+  GimmickData header;
   std::string name;
   std::string gimmickFileName;
 
   LGB_GIMMICK_ENTRY( char* buf, uint32_t offset ) :
-    LGB_ENTRY( buf, offset )
+          LgbEntry( buf, offset )
   {
-    header = *reinterpret_cast<LGB_GIMMICK_HEADER*>( buf + offset );
+    header = *reinterpret_cast<GimmickData*>( buf + offset );
     name = std::string( buf + offset + header.nameOffset );
     gimmickFileName = std::string( buf + offset + header.gimmickFileOffset );
     //std::cout << "\t " << gimmickFileName << " unknown: " << header.unknown << "\n";
   };
 };
 
-struct LGB_ENPC_HEADER :
-  public LGB_ENTRY_HEADER
+struct ENpcData :
+  public InstanceObject
 {
   uint32_t enpcId;
   uint8_t unknown1[0x24];
 };
 
 class LGB_ENPC_ENTRY :
-  public LGB_ENTRY
+  public LgbEntry
 {
 public:
-  LGB_ENPC_HEADER header;
+  ENpcData header;
   std::string name;
 
   LGB_ENPC_ENTRY( char* buf, uint32_t offset ) :
-    LGB_ENTRY( buf, offset )
+          LgbEntry( buf, offset )
   {
-    header = *reinterpret_cast< LGB_ENPC_HEADER* >( buf + offset );
+    header = *reinterpret_cast< ENpcData* >( buf + offset );
     name = std::string( buf + offset + header.nameOffset );
     //std::cout << "\t ENpc " << header.enpcId << " " << name << "\n";
   };
 };
 
-struct LGB_EOBJ_HEADER :
-  public LGB_ENTRY_HEADER
+struct EObjData :
+  public InstanceObject
 {
   uint32_t eobjId;
   uint32_t levelHierachyId;
@@ -203,23 +203,23 @@ struct LGB_EOBJ_HEADER :
 };
 
 class LGB_EOBJ_ENTRY :
-  public LGB_ENTRY
+  public LgbEntry
 {
 public:
-  LGB_EOBJ_HEADER header;
+  EObjData header;
   std::string name;
 
   LGB_EOBJ_ENTRY( char* buf, uint32_t offset ) :
-    LGB_ENTRY( buf, offset )
+          LgbEntry( buf, offset )
   {
-    header = *reinterpret_cast< LGB_EOBJ_HEADER* >( buf + offset );
+    header = *reinterpret_cast< EObjData* >( buf + offset );
     //std::cout << "\t " << header.eobjId << " " << name << " unknown: " << header.unknown << "\n";
     name = std::string( buf + offset + header.nameOffset );
   };
 };
 
-struct LGB_MAPRANGE_HEADER :
-  public LGB_ENTRY_HEADER
+struct MapRangeData :
+  public InstanceObject
 {
   uint32_t type;
   uint16_t unknown2;
@@ -227,35 +227,34 @@ struct LGB_MAPRANGE_HEADER :
   uint8_t unknown4[0x10];
 };
 
-struct LGB_MAPRANGE_ENTRY :
-  public LGB_ENTRY
+struct LGB_MAP_RANGE_ENTRY : public LgbEntry
 {
 public:
-  LGB_MAPRANGE_HEADER header;
+  MapRangeData header;
   std::string name;
 
-  LGB_MAPRANGE_ENTRY( char* buf, uint32_t offset ) :
-    LGB_ENTRY( buf, offset )
+  LGB_MAP_RANGE_ENTRY( char* buf, uint32_t offset ) :
+          LgbEntry( buf, offset )
   {
-    header = *reinterpret_cast< LGB_MAPRANGE_HEADER* >( buf + offset );
+    header = *reinterpret_cast< MapRangeData* >( buf + offset );
     name = std::string( buf + offset + header.nameOffset );
   };
 };
 
 struct LGB_COLLISION_BOX_HEADER :
-  public LGB_ENTRY_HEADER
+  public InstanceObject
 {
   uint8_t unk[100];
 };
 
 struct LGB_COLLISION_BOX_ENTRY :
-  public LGB_ENTRY
+  public LgbEntry
 {
   LGB_COLLISION_BOX_HEADER header;
   std::string name;
 
   LGB_COLLISION_BOX_ENTRY( char* buf, uint32_t offset ) :
-    LGB_ENTRY( buf, offset )
+          LgbEntry( buf, offset )
   {
     header = *reinterpret_cast< LGB_COLLISION_BOX_HEADER* >( buf + offset );
     header.type = LgbEntryType::CollisionBox;
@@ -305,7 +304,7 @@ struct LGB_GROUP
   LGB_FILE* parent;
   LGB_GROUP_HEADER header;
   std::string name;
-  std::vector< std::shared_ptr< LGB_ENTRY > > entries;
+  std::vector< std::shared_ptr< LgbEntry > > entries;
 
   LGB_GROUP( char* buf, LGB_FILE* parentStruct, uint32_t offset )
   {
diff --git a/src/tools/pcb_reader/main.cpp b/src/tools/pcb_reader/main.cpp
index f4d29d2a..e34c33f6 100644
--- a/src/tools/pcb_reader/main.cpp
+++ b/src/tools/pcb_reader/main.cpp
@@ -429,7 +429,7 @@ int main( int argc, char* argv[] )
               }
               return true;
             };
-            auto exportSgbModel = [&]( const std::string& sgbFilePath, LGB_ENTRY* pGimmick, bool isEobj = false  )
+            auto exportSgbModel = [&]( const std::string& sgbFilePath, LgbEntry* pGimmick, bool isEobj = false  )
             {
               if( auto pSgbFile = pCache->getSgbFile( sgbFilePath ) )
               {
diff --git a/src/world/Actor/Player.cpp b/src/world/Actor/Player.cpp
index fde14915..11421e06 100644
--- a/src/world/Actor/Player.cpp
+++ b/src/world/Actor/Player.cpp
@@ -19,8 +19,10 @@
 #include "Territory/Territory.h"
 #include "Territory/ZonePosition.h"
 #include "Territory/InstanceContent.h"
+#include "Territory/InstanceObjectCache.h"
 #include "Territory/Land.h"
 
+
 #include "Network/GameConnection.h"
 #include "Network/PacketWrappers/ActorControlPacket.h"
 #include "Network/PacketWrappers/ActorControlSelfPacket.h"
@@ -350,8 +352,27 @@ void Sapphire::Entity::Player::teleport( uint16_t aetheryteId, uint8_t type )
   }
 
   setStateFlag( PlayerStateFlag::BetweenAreas );
+
+  auto pInstanceObjectCache = m_pFw->get< InstanceObjectCache >();
+
   auto targetPos = pTeriMgr->getTerritoryPosition( data->level.at( 0 ) );
 
+  auto pop = pInstanceObjectCache->getPopRange( data->territory, data->level[ 0 ] );
+  auto pop1 = pInstanceObjectCache->getPopRange( data->territory, data->level[ 1 ] );
+
+  if( pop )
+  {
+    sendDebug( "Teleport: popRange {0} found!", data->level.at( 0 ) );
+  }
+  else if( pop1 )
+  {
+    sendDebug( "Teleport: popRange {0} found!", data->level.at( 1 ) );
+  }
+  else
+  {
+    sendDebug( "Teleport: popRange not found!" );
+  }
+
   Common::FFXIVARR_POSITION3 pos;
   pos.x = 0;
   pos.y = 0;
diff --git a/src/world/Manager/DebugCommandMgr.cpp b/src/world/Manager/DebugCommandMgr.cpp
index 9fef637d..1fb97d66 100644
--- a/src/world/Manager/DebugCommandMgr.cpp
+++ b/src/world/Manager/DebugCommandMgr.cpp
@@ -209,31 +209,10 @@ void Sapphire::World::Manager::DebugCommandMgr::set( char* data, Entity::Player&
     sscanf( params.c_str(), "%i %i", &map_id, &discover_id );
 
     auto discoveryPacket = makeZonePacket< FFXIVIpcDiscovery >( player.getId() );
-    discoveryPacket->data().map_id = map_id;
-    discoveryPacket->data().map_part_id = discover_id;
+    discoveryPacket->data().mapId = map_id;
+    discoveryPacket->data().mapPartId = discover_id;
     player.queuePacket( discoveryPacket );
   }
-
-  else if( ( subCommand == "discovery_pos" ) && ( params != "" ) )
-  {
-    int32_t map_id;
-    int32_t discover_id;
-    int32_t pos_id;
-    sscanf( params.c_str(), "%i %i %i", &pos_id, &map_id, &discover_id );
-
-    std::string query2 = "UPDATE IGNORE `discoveryinfo` SET `discover_id` = '" + std::to_string( discover_id ) +
-                         "' WHERE `discoveryinfo`.`id` = " + std::to_string( pos_id ) + ";";
-
-    std::string query1 =
-      "INSERT IGNORE INTO `discoveryinfo` (`id`, `map_id`, `discover_id`) VALUES ('" + std::to_string( pos_id ) +
-      "', '" + std::to_string( map_id ) +
-      "', '" + std::to_string( discover_id ) + "')";
-
-    pDb->execute( query1 );
-    pDb->execute( query2 );
-
-  }
-
   else if( subCommand == "discovery_reset" )
   {
     player.resetDiscovery();
diff --git a/src/world/Network/Handlers/PacketHandlers.cpp b/src/world/Network/Handlers/PacketHandlers.cpp
index 4b3c83a4..e411456e 100644
--- a/src/world/Network/Handlers/PacketHandlers.cpp
+++ b/src/world/Network/Handlers/PacketHandlers.cpp
@@ -9,6 +9,9 @@
 #include <Database/DatabaseDef.h>
 #include <Util/Util.h>
 
+#include <datReader/DatCategories/bg/LgbTypes.h>
+#include <datReader/DatCategories/bg/Lgb.h>
+
 #include <unordered_map>
 #include <Network/PacketDef/Zone/ClientZoneDef.h>
 #include <Logging/Logger.h>
@@ -20,6 +23,7 @@
 #include "Territory/Land.h"
 #include "Territory/ZonePosition.h"
 #include "Territory/House.h"
+#include "Territory/InstanceObjectCache.h"
 
 #include "Network/PacketWrappers/PlayerSetupPacket.h"
 #include "Network/PacketWrappers/PingPacket.h"
@@ -274,22 +278,56 @@ void Sapphire::Network::GameConnection::zoneLineHandler( FrameworkPtr pFw,
                                                          const Packets::FFXIVARR_PACKET_RAW& inPacket,
                                                          Entity::Player& player )
 {
-  auto pTeriMgr = pFw->get< TerritoryMgr >();
 
   const auto packet = ZoneChannelPacket< Client::FFXIVIpcZoneLineHandler >( inPacket );
   const auto zoneLineId = packet.data().zoneLineId;
 
+  auto pTeriMgr = pFw->get< TerritoryMgr >();
+  auto pInstanceObjectCache = pFw->get< InstanceObjectCache >();
+  auto tInfo = player.getCurrentTerritory()->getTerritoryTypeInfo();
+
+  auto pExitRange = pInstanceObjectCache->getExitRange( player.getTerritoryTypeId(), zoneLineId );
+
+  Common::FFXIVARR_POSITION3 targetPos{};
+  uint32_t targetZone;
+  if( pExitRange )
+  {
+    player.sendDebug( "Found ExitRange#{0}", zoneLineId );
+    player.sendDebug( "destTerritoryType#{0}", pExitRange->header.destTerritoryType );
+    player.sendDebug( "destInstanceObjectId#{0}", pExitRange->header.destInstanceObjectId );
+
+    auto pPopRange = pInstanceObjectCache->getPopRange( pExitRange->header.destTerritoryType,
+                                                        pExitRange->header.destInstanceObjectId );
+    if( pPopRange )
+    {
+      targetZone = pExitRange->header.destTerritoryType;
+      player.sendDebug( "\tFound PopRange#{0}", pExitRange->header.destInstanceObjectId );
+      player.sendDebug( "\t{0}", pPopRange->header.transform.translation.x );
+      player.sendDebug( "\t{0}", pPopRange->header.transform.translation.y );
+      player.sendDebug( "\t{0}", pPopRange->header.transform.translation.z );
+      targetPos = Common::FFXIVARR_POSITION3 { pPopRange->header.transform.translation.x,
+                                               pPopRange->header.transform.translation.y,
+                                               pPopRange->header.transform.translation.z };
+
+      player.sendDebug( "ZoneLine #{0} found.", zoneLineId );
+
+      auto preparePacket = makeZonePacket< FFXIVIpcPrepareZoning >( player.getId() );
+      preparePacket->data().targetZone = pExitRange->header.destTerritoryType;
+
+      //ActorControlSelfPacket controlPacket( pPlayer, ActorControlType::DespawnZoneScreenMsg,
+      //                                     0x03, player.getId(), 0x01, targetZone );
+      player.queuePacket( preparePacket );
+
+    }
+  }
+
   player.sendDebug( "Walking ZoneLine#{0}", zoneLineId );
 
   auto pZone = player.getCurrentTerritory();
 
-  auto pLine = pTeriMgr->getTerritoryPosition( zoneLineId );
-
-  Common::FFXIVARR_POSITION3 targetPos{};
-  uint32_t targetZone;
   float rotation = 0.0f;
 
-  if( pLine != nullptr )
+/*  if( pLine != nullptr )
   {
     player.sendDebug( "ZoneLine #{0} found.", zoneLineId );
     targetPos = pLine->getTargetPosition();
@@ -311,7 +349,7 @@ void Sapphire::Network::GameConnection::zoneLineHandler( FrameworkPtr pFw,
     targetPos.y = 0;
     targetPos.z = 0;
     targetZone = pZone->getTerritoryTypeId();
-  }
+  }*/
 
   player.performZoning( targetZone, targetPos, rotation );
 }
@@ -321,29 +359,23 @@ void Sapphire::Network::GameConnection::discoveryHandler( FrameworkPtr pFw,
                                                           const Packets::FFXIVARR_PACKET_RAW& inPacket,
                                                           Entity::Player& player )
 {
+  auto pInstanceObjectCache = pFw->get< InstanceObjectCache >();
+  auto tInfo = player.getCurrentTerritory()->getTerritoryTypeInfo();
   const auto packet = ZoneChannelPacket< Client::FFXIVIpcDiscoveryHandler >( inPacket );
   const auto positionRef = packet.data().positionRef;
 
-  auto pDb = pFw->get< Db::DbWorkerPool< Db::ZoneDbConnection > >();
+  auto pRefInfo = pInstanceObjectCache->getMapRange( player.getTerritoryTypeId(), positionRef );
 
-  auto pQR = pDb->query( "SELECT id, map_id, discover_id "
-                         "FROM discoveryinfo "
-                         "WHERE id = " + std::to_string( positionRef ) + ";" );
-
-  if( !pQR->next() )
-  {
-    player.sendDebug( "Discovery ref pos id#{0} not found!", positionRef );
-    return;
-  }
-
-  auto discoveryPacket = makeZonePacket< FFXIVIpcDiscovery >( player.getId() );
-  discoveryPacket->data().map_id = pQR->getUInt( 2 );
-  discoveryPacket->data().map_part_id = pQR->getUInt( 3 );
-
-  player.queuePacket( discoveryPacket );
   player.sendDebug( "Discovery ref pos id#{0}", positionRef );
 
-  player.discover( pQR->getUInt16( 2 ), pQR->getUInt16( 3 ) );
+  if( pRefInfo )
+  {
+    auto discoveryPacket = makeZonePacket< FFXIVIpcDiscovery >( player.getId() );
+    discoveryPacket->data().mapId = tInfo->map;
+    discoveryPacket->data().mapPartId = pRefInfo->header.discoveryIndex;
+    player.queuePacket( discoveryPacket );
+    player.discover( tInfo->map, pRefInfo->header.discoveryIndex );
+  }
 
 }
 
diff --git a/src/world/ServerMgr.cpp b/src/world/ServerMgr.cpp
index 5fbd66e6..0186d396 100644
--- a/src/world/ServerMgr.cpp
+++ b/src/world/ServerMgr.cpp
@@ -44,6 +44,8 @@
 #include "Manager/NaviMgr.h"
 #include "Manager/ActionMgr.h"
 
+#include "Territory/InstanceObjectCache.h"
+
 using namespace Sapphire::World::Manager;
 
 Sapphire::World::ServerMgr::ServerMgr( const std::string& configName, FrameworkPtr pFw ) :
@@ -171,6 +173,10 @@ void Sapphire::World::ServerMgr::run( int32_t argc, char* argv[] )
   }
   framework()->set< Scripting::ScriptMgr >( pScript );
 
+  Logger::info( "Setting up InstanceObjectCache" );
+  auto pInstanceObjCache = std::make_shared< Sapphire::InstanceObjectCache >( framework() );
+  framework()->set< Sapphire::InstanceObjectCache >( pInstanceObjCache );
+
   auto pActionMgr = std::make_shared< Manager::ActionMgr >( framework() );
   framework()->set< Manager::ActionMgr >( pActionMgr );
 
diff --git a/src/world/Territory/InstanceObjectCache.cpp b/src/world/Territory/InstanceObjectCache.cpp
new file mode 100644
index 00000000..81363cab
--- /dev/null
+++ b/src/world/Territory/InstanceObjectCache.cpp
@@ -0,0 +1,118 @@
+#include "InstanceObjectCache.h"
+#include "Exd/ExdDataGenerated.h"
+#include <Framework.h>
+
+#include <datReader/DatCategories/bg/pcb.h>
+#include <datReader/DatCategories/bg/lgb.h>
+#include <datReader/DatCategories/bg/sgb.h>
+#include <GameData.h>
+#include <File.h>
+#include <DatCat.h>
+#include <ExdData.h>
+#include <ExdCat.h>
+#include <Exd.h>
+
+Sapphire::InstanceObjectCache::InstanceObjectCache( std::shared_ptr< Framework > pFramework ) :
+  m_pFramework( pFramework )
+{
+
+  auto pExd = pFramework->get< Sapphire::Data::ExdDataGenerated >();
+  auto idList = pExd->getTerritoryTypeIdList();
+
+  size_t count = 0;
+  for( const auto& id : idList )
+  {
+    // show some loading indication...
+    if( count++ % 10 == 0 )
+      std::cout << ".";
+
+    auto territoryType = pExd->get< Sapphire::Data::TerritoryType >( id );
+    if( !territoryType )
+      continue;
+
+    auto path = territoryType->bg;
+
+    if( path.empty() )
+      continue;
+
+    // TODO: Horrible workaround... Fails if expansion is not installed
+    if( path.find( "ex3" ) != std::string::npos )
+      continue;
+
+    path = std::string( "bg/" ) + path.substr( 0, path.find( "/level/" ) );
+
+    // TODO: it does feel like this needs to be streamlined into the datReader instead of being done here...
+    std::string bgLgbPath( path + "/level/bg.lgb" );
+    std::string planmapLgbPath( path + "/level/planmap.lgb" );
+    std::vector< char > bgSection;
+    std::vector< char > planmapSection;
+
+    auto test_file = pExd->getGameData()->getFile( bgLgbPath );
+    bgSection = test_file->access_data_sections().at( 0 );
+
+    auto planmap_file = pExd->getGameData()->getFile( planmapLgbPath );
+    planmapSection = planmap_file->access_data_sections().at( 0 );
+
+    std::vector< std::string > stringList;
+
+    uint32_t offset1 = 0x20;
+
+    LGB_FILE bgLgb( &bgSection[ 0 ], "bg" );
+    LGB_FILE planmapLgb( &planmapSection[ 0 ], "planmap" );
+
+    std::vector< LGB_FILE > lgbList{ bgLgb, planmapLgb };
+    uint32_t max_index = 0;
+
+    for( const auto& lgb : lgbList )
+    {
+      for( const auto& group : lgb.groups )
+      {
+        for( const auto& pEntry : group.entries )
+        {
+
+          if( pEntry->getType() == LgbEntryType::MapRange )
+          {
+            auto pMapRange = reinterpret_cast< LGB_MAP_RANGE_ENTRY* >( pEntry.get() );
+            m_mapRangeCache.insert( id, *pMapRange );
+          }
+          else if( pEntry->getType() == LgbEntryType::ExitRange )
+          {
+            auto pExitRange = reinterpret_cast< LGB_EXIT_RANGE_ENTRY* >( pEntry.get() );
+            m_exitRangeCache.insert( id, *pExitRange);
+          }
+          else if( pEntry->getType() == LgbEntryType::PopRange )
+          {
+            if( pEntry->header.instanceId == 1359242 )
+            {
+              std::cout << ">>>" << id << "__" << static_cast< uint32_t >( pEntry->getType() ) << ">>>\n";
+              //break;
+            }
+
+            auto pPopRange = reinterpret_cast< LGB_POP_RANGE_ENTRY* >( pEntry.get() );
+            m_popRangeCache.insert( id, *pPopRange );
+          }
+        }
+      }
+    }
+  }
+  std::cout << "\n";
+}
+
+
+Sapphire::InstanceObjectCache::MapRangePtr
+  Sapphire::InstanceObjectCache::getMapRange( uint16_t zoneId, uint32_t mapRangeId )
+{
+  return m_mapRangeCache.get( zoneId, mapRangeId );
+}
+
+Sapphire::InstanceObjectCache::ExitRangePtr
+  Sapphire::InstanceObjectCache::getExitRange( uint16_t zoneId, uint32_t exitRangeId )
+{
+  return m_exitRangeCache.get( zoneId, exitRangeId );
+}
+
+Sapphire::InstanceObjectCache::PopRangePtr
+  Sapphire::InstanceObjectCache::getPopRange( uint16_t zoneId, uint32_t popRangeId )
+{
+  return m_popRangeCache.get( zoneId, popRangeId );
+}
\ No newline at end of file
diff --git a/src/world/Territory/InstanceObjectCache.h b/src/world/Territory/InstanceObjectCache.h
new file mode 100644
index 00000000..83e9a6a3
--- /dev/null
+++ b/src/world/Territory/InstanceObjectCache.h
@@ -0,0 +1,84 @@
+#ifndef SAPPHIRE_INSTANCEOBJECTCACHE_H
+#define SAPPHIRE_INSTANCEOBJECTCACHE_H
+
+#include <memory>
+#include <unordered_map>
+
+struct LGB_MAP_RANGE_ENTRY;
+struct LGB_EXIT_RANGE_ENTRY;
+struct LGB_POP_RANGE_ENTRY;
+
+
+namespace Sapphire
+{
+  class Framework;
+
+  template< typename T >
+  class ObjectCache
+  {
+
+    using ObjectPtr = std::shared_ptr< T >;
+    using ObjectMap = std::unordered_map< uint32_t, ObjectPtr >;
+    using ZoneObjectCache = std::unordered_map< uint16_t, ObjectMap >;
+
+    ZoneObjectCache m_objectCache;
+
+  public:
+    ObjectPtr get( uint16_t zoneId, uint32_t id )
+    {
+      auto it = m_objectCache.find( zoneId );
+      if( it != m_objectCache.end() )
+      {
+        auto rangeIt = it->second.find( id );
+        if( rangeIt != it->second.end() )
+        {
+          return rangeIt->second;
+        }
+      }
+      return nullptr;
+    }
+
+    template< typename T >
+    void insert( uint16_t zoneId, T& entry )
+    {
+      auto pShared = std::make_shared< T >( entry );
+      if( m_objectCache.find( zoneId ) == m_objectCache.end() )
+      {
+        ObjectMap cache;
+        cache[ entry.header.instanceId ] = pShared;
+        m_objectCache[ zoneId ] = cache;
+      }
+      else
+      {
+        auto it = m_objectCache.find( zoneId );
+        it->second[ entry.header.instanceId ] = pShared;
+      }
+    }
+  };
+
+  class InstanceObjectCache
+  {
+  public:
+    using MapRangePtr = std::shared_ptr< LGB_MAP_RANGE_ENTRY >;
+    using ExitRangePtr = std::shared_ptr< LGB_EXIT_RANGE_ENTRY >;
+    using PopRangePtr = std::shared_ptr< LGB_POP_RANGE_ENTRY >;
+
+    InstanceObjectCache( std::shared_ptr< Framework > pFramework );
+    ~InstanceObjectCache() = default;
+
+    MapRangePtr getMapRange( uint16_t zoneId, uint32_t mapRangeId );
+    ExitRangePtr getExitRange( uint16_t zoneId, uint32_t exitRangeId );
+    PopRangePtr getPopRange( uint16_t zoneId, uint32_t popRangeId );
+
+  private:
+    ObjectCache< LGB_MAP_RANGE_ENTRY > m_mapRangeCache;
+    ObjectCache< LGB_EXIT_RANGE_ENTRY > m_exitRangeCache;
+    ObjectCache< LGB_POP_RANGE_ENTRY > m_popRangeCache;
+    std::shared_ptr< Framework > m_pFramework;
+
+  };
+
+}
+
+
+#endif //SAPPHIRE_INSTANCEOBJECTCACHE_H

From 79764da844f08562599461880da7ebba8210a88a Mon Sep 17 00:00:00 2001
From: Mordred <ffxivsapphire@gmail.com>
Date: Tue, 22 Oct 2019 22:34:34 +0200
Subject: [PATCH 155/351] Fixed popranges not being found

---
 deps/datReader/DatCategories/bg/LgbTypes.h    |  2 +-
 deps/datReader/DatCategories/bg/lgb.h         | 35 +++++++++----------
 src/tools/discovery_parser/main.cpp           |  8 ++---
 src/tools/event_object_parser/main.cpp        |  6 ++--
 src/world/Actor/Player.cpp                    |  2 +-
 src/world/Network/Handlers/PacketHandlers.cpp | 18 +++++-----
 src/world/Territory/InstanceObjectCache.cpp   |  7 ----
 7 files changed, 35 insertions(+), 43 deletions(-)

diff --git a/deps/datReader/DatCategories/bg/LgbTypes.h b/deps/datReader/DatCategories/bg/LgbTypes.h
index 71c2319f..8b9d5ad5 100644
--- a/deps/datReader/DatCategories/bg/LgbTypes.h
+++ b/deps/datReader/DatCategories/bg/LgbTypes.h
@@ -108,7 +108,7 @@ struct RelativePositions
   int32_t PosCount;
 };
 
-struct PopRangeData : InstanceObject
+struct PopRangeData : public InstanceObject
 {
   PopType popType;
   RelativePositions relativePositions;
diff --git a/deps/datReader/DatCategories/bg/lgb.h b/deps/datReader/DatCategories/bg/lgb.h
index 00697184..25bd5b6b 100644
--- a/deps/datReader/DatCategories/bg/lgb.h
+++ b/deps/datReader/DatCategories/bg/lgb.h
@@ -55,7 +55,7 @@ public:
 class LGB_BGPARTS_ENTRY : public LgbEntry
 {
 public:
-  BgPartsData header;
+  BgPartsData data;
   std::string name;
   std::string modelFileName;
   std::string collisionFileName;
@@ -66,38 +66,38 @@ public:
 
   LGB_BGPARTS_ENTRY( char* buf, uint32_t offset ) : LgbEntry( buf, offset )
   {
-    header = *reinterpret_cast< BgPartsData* >( buf + offset );
+    data = *reinterpret_cast< BgPartsData* >( buf + offset );
     name = std::string( buf + offset + header.nameOffset );
-    modelFileName = std::string( buf + offset + header.modelFileOffset );
-    collisionFileName = std::string( buf + offset + header.collisionFileOffset );
+    modelFileName = std::string( buf + offset + data.modelFileOffset );
+    collisionFileName = std::string( buf + offset + data.collisionFileOffset );
   };
 };
 
 class LGB_GIMMICK_ENTRY : public LgbEntry
 {
 public:
-  GimmickData header;
+  GimmickData data;
   std::string name;
   std::string gimmickFileName;
 
   LGB_GIMMICK_ENTRY( char* buf, uint32_t offset ) : LgbEntry( buf, offset )
   {
-    header = *reinterpret_cast< GimmickData* >( buf + offset );
+    data = *reinterpret_cast< GimmickData* >( buf + offset );
     name = std::string( buf + offset + header.nameOffset );
-    gimmickFileName = std::string( buf + offset + header.gimmickFileOffset );
+    gimmickFileName = std::string( buf + offset + data.gimmickFileOffset );
   };
 };
 
 class LGB_ENPC_ENTRY : public LgbEntry
 {
 public:
-  ENpcData header;
+  ENpcData data;
   std::string name;
 
   LGB_ENPC_ENTRY( char* buf, uint32_t offset ) :
     LgbEntry( buf, offset )
   {
-    header = *reinterpret_cast< ENpcData* >( buf + offset );
+    data = *reinterpret_cast< ENpcData* >( buf + offset );
     name = std::string( buf + offset + header.nameOffset );
   };
 };
@@ -105,12 +105,12 @@ public:
 class LGB_EOBJ_ENTRY : public LgbEntry
 {
 public:
-  EObjData header;
+  EObjData data;
   std::string name;
 
   LGB_EOBJ_ENTRY( char* buf, uint32_t offset ) : LgbEntry( buf, offset )
   {
-    header = *reinterpret_cast< EObjData* >( buf + offset );
+    data = *reinterpret_cast< EObjData* >( buf + offset );
     name = std::string( buf + offset + header.nameOffset );
   };
 };
@@ -118,12 +118,12 @@ public:
 struct LGB_MAP_RANGE_ENTRY : public LgbEntry
 {
 public:
-  MapRangeData header;
+  MapRangeData data;
   std::string name;
 
   LGB_MAP_RANGE_ENTRY( char* buf, uint32_t offset ) : LgbEntry( buf, offset )
   {
-    header = *reinterpret_cast< MapRangeData* >( buf + offset );
+    data = *reinterpret_cast< MapRangeData* >( buf + offset );
     name = std::string( buf + offset + header.nameOffset );
   };
 };
@@ -131,25 +131,24 @@ public:
 struct LGB_EXIT_RANGE_ENTRY : public LgbEntry
 {
 public:
-  ExitRangeData header;
+  ExitRangeData data;
   std::string name;
 
   LGB_EXIT_RANGE_ENTRY( char* buf, uint32_t offset ) : LgbEntry( buf, offset )
   {
-    header = *reinterpret_cast< ExitRangeData* >( buf + offset );
+    data = *reinterpret_cast< ExitRangeData* >( buf + offset );
     name = std::string( buf + offset + header.nameOffset );
-
   };
 };
 
 struct LGB_POP_RANGE_ENTRY : public LgbEntry
 {
 public:
-  PopRangeData header;
+  PopRangeData data;
 
   LGB_POP_RANGE_ENTRY( char* buf, uint32_t offset ) : LgbEntry( buf, offset )
   {
-    header = *reinterpret_cast< PopRangeData* >( buf + offset );
+    data = *reinterpret_cast< PopRangeData* >( buf + offset );
   };
 };
 
diff --git a/src/tools/discovery_parser/main.cpp b/src/tools/discovery_parser/main.cpp
index 0125222b..34a4b6d8 100644
--- a/src/tools/discovery_parser/main.cpp
+++ b/src/tools/discovery_parser/main.cpp
@@ -222,12 +222,12 @@ void loadEobjNames()
 void writeMapRangeEntry( std::ofstream& out, LgbEntry* pObj )
 {
   auto pMapRange = reinterpret_cast< LGB_MAP_RANGE_ENTRY* >( pObj );
-  if( !pMapRange->header.discoveryEnabled )
+  if( !pMapRange->data.discoveryEnabled )
     return;
 
   auto subArea = 0;
   auto mapId = -1;
-  auto discoveryIndex = pMapRange->header.discoveryIndex;
+  auto discoveryIndex = pMapRange->data.discoveryIndex;
 
   vec3 translation = pObj->header.transform.translation;
 
@@ -236,8 +236,8 @@ void writeMapRangeEntry( std::ofstream& out, LgbEntry* pObj )
                       std::to_string( pMapRange->header.transform.translation.y ) + " " +
                       std::to_string( pMapRange->header.transform.translation.z ) + " " +
                       std::to_string( pMapRange->header.transform.rotation.y ) + " " +
-                      std::to_string( pMapRange->header.mapId ) + " " +
-                      std::to_string( pMapRange->header.discoveryIndex ) + "\n"
+                      std::to_string( pMapRange->data.mapId ) + " " +
+                      std::to_string( pMapRange->data.discoveryIndex ) + "\n"
   );
 
   out.write( outStr.c_str(), outStr.size() );
diff --git a/src/tools/event_object_parser/main.cpp b/src/tools/event_object_parser/main.cpp
index 7615939a..89d7aaad 100644
--- a/src/tools/event_object_parser/main.cpp
+++ b/src/tools/event_object_parser/main.cpp
@@ -284,10 +284,10 @@ int main( int argc, char* argv[] )
               uint32_t eobjlevelHierachyId = 0;
 
               auto pEobj = reinterpret_cast< LGB_EOBJ_ENTRY* >( pObj );
-              id = pEobj->header.eobjId;
+              id = pEobj->data.eobjId;
               unknown = pEobj->header.instanceId;
 
-              eobjlevelHierachyId = pEobj->header.levelHierachyId;
+              eobjlevelHierachyId = pEobj->data.levelHierachyId;
 
               std::string states = "";
               std::string gimmickName = "";
@@ -295,7 +295,7 @@ int main( int argc, char* argv[] )
               {
                 auto pGObj = pEntry1.get();
                 if( pGObj->getType() == LgbEntryType::Gimmick &&
-                    pGObj->header.instanceId == pEobj->header.levelHierachyId )
+                    pGObj->header.instanceId == pEobj->data.levelHierachyId )
                 {
                   auto pGObjR = reinterpret_cast< LGB_GIMMICK_ENTRY* >( pGObj );
                   char* dataSection = nullptr;
diff --git a/src/world/Actor/Player.cpp b/src/world/Actor/Player.cpp
index 11421e06..0f2a0e1c 100644
--- a/src/world/Actor/Player.cpp
+++ b/src/world/Actor/Player.cpp
@@ -370,7 +370,7 @@ void Sapphire::Entity::Player::teleport( uint16_t aetheryteId, uint8_t type )
   }
   else
   {
-    sendDebug( "Teleport: popRange not found!" );
+    sendDebug( "Teleport: popRange {0} not found in {1}!", data->level[ 0 ], data->territory );
   }
 
   Common::FFXIVARR_POSITION3 pos;
diff --git a/src/world/Network/Handlers/PacketHandlers.cpp b/src/world/Network/Handlers/PacketHandlers.cpp
index e411456e..6f55cf4a 100644
--- a/src/world/Network/Handlers/PacketHandlers.cpp
+++ b/src/world/Network/Handlers/PacketHandlers.cpp
@@ -293,15 +293,15 @@ void Sapphire::Network::GameConnection::zoneLineHandler( FrameworkPtr pFw,
   if( pExitRange )
   {
     player.sendDebug( "Found ExitRange#{0}", zoneLineId );
-    player.sendDebug( "destTerritoryType#{0}", pExitRange->header.destTerritoryType );
-    player.sendDebug( "destInstanceObjectId#{0}", pExitRange->header.destInstanceObjectId );
+    player.sendDebug( "destTerritoryType#{0}", pExitRange->data.destTerritoryType );
+    player.sendDebug( "destInstanceObjectId#{0}", pExitRange->data.destInstanceObjectId );
 
-    auto pPopRange = pInstanceObjectCache->getPopRange( pExitRange->header.destTerritoryType,
-                                                        pExitRange->header.destInstanceObjectId );
+    auto pPopRange = pInstanceObjectCache->getPopRange( pExitRange->data.destTerritoryType,
+                                                        pExitRange->data.destInstanceObjectId );
     if( pPopRange )
     {
-      targetZone = pExitRange->header.destTerritoryType;
-      player.sendDebug( "\tFound PopRange#{0}", pExitRange->header.destInstanceObjectId );
+      targetZone = pExitRange->data.destTerritoryType;
+      player.sendDebug( "\tFound PopRange#{0}", pExitRange->data.destInstanceObjectId );
       player.sendDebug( "\t{0}", pPopRange->header.transform.translation.x );
       player.sendDebug( "\t{0}", pPopRange->header.transform.translation.y );
       player.sendDebug( "\t{0}", pPopRange->header.transform.translation.z );
@@ -312,7 +312,7 @@ void Sapphire::Network::GameConnection::zoneLineHandler( FrameworkPtr pFw,
       player.sendDebug( "ZoneLine #{0} found.", zoneLineId );
 
       auto preparePacket = makeZonePacket< FFXIVIpcPrepareZoning >( player.getId() );
-      preparePacket->data().targetZone = pExitRange->header.destTerritoryType;
+      preparePacket->data().targetZone = pExitRange->data.destTerritoryType;
 
       //ActorControlSelfPacket controlPacket( pPlayer, ActorControlType::DespawnZoneScreenMsg,
       //                                     0x03, player.getId(), 0x01, targetZone );
@@ -372,9 +372,9 @@ void Sapphire::Network::GameConnection::discoveryHandler( FrameworkPtr pFw,
   {
     auto discoveryPacket = makeZonePacket< FFXIVIpcDiscovery >( player.getId() );
     discoveryPacket->data().mapId = tInfo->map;
-    discoveryPacket->data().mapPartId = pRefInfo->header.discoveryIndex;
+    discoveryPacket->data().mapPartId = pRefInfo->data.discoveryIndex;
     player.queuePacket( discoveryPacket );
-    player.discover( tInfo->map, pRefInfo->header.discoveryIndex );
+    player.discover( tInfo->map, pRefInfo->data.discoveryIndex );
   }
 
 }
diff --git a/src/world/Territory/InstanceObjectCache.cpp b/src/world/Territory/InstanceObjectCache.cpp
index 81363cab..1d186fc6 100644
--- a/src/world/Territory/InstanceObjectCache.cpp
+++ b/src/world/Territory/InstanceObjectCache.cpp
@@ -69,7 +69,6 @@ Sapphire::InstanceObjectCache::InstanceObjectCache( std::shared_ptr< Framework >
       {
         for( const auto& pEntry : group.entries )
         {
-
           if( pEntry->getType() == LgbEntryType::MapRange )
           {
             auto pMapRange = reinterpret_cast< LGB_MAP_RANGE_ENTRY* >( pEntry.get() );
@@ -82,12 +81,6 @@ Sapphire::InstanceObjectCache::InstanceObjectCache( std::shared_ptr< Framework >
           }
           else if( pEntry->getType() == LgbEntryType::PopRange )
           {
-            if( pEntry->header.instanceId == 1359242 )
-            {
-              std::cout << ">>>" << id << "__" << static_cast< uint32_t >( pEntry->getType() ) << ">>>\n";
-              //break;
-            }
-
             auto pPopRange = reinterpret_cast< LGB_POP_RANGE_ENTRY* >( pEntry.get() );
             m_popRangeCache.insert( id, *pPopRange );
           }

From f87aa5d4880585514cf161576af9598e792a0a48 Mon Sep 17 00:00:00 2001
From: Mordred <ffxivsapphire@gmail.com>
Date: Sun, 27 Oct 2019 08:26:48 +0100
Subject: [PATCH 156/351] Apply rotation properly when using zoneline /
 aetheryte

---
 src/world/Actor/Player.cpp                    | 37 +++++++----------
 src/world/Network/Handlers/PacketHandlers.cpp | 41 ++-----------------
 2 files changed, 17 insertions(+), 61 deletions(-)

diff --git a/src/world/Actor/Player.cpp b/src/world/Actor/Player.cpp
index 0f2a0e1c..8f0b0a84 100644
--- a/src/world/Actor/Player.cpp
+++ b/src/world/Actor/Player.cpp
@@ -3,6 +3,9 @@
 #include <Util/UtilMath.h>
 #include <Logging/Logger.h>
 #include <Exd/ExdDataGenerated.h>
+#include <datReader/DatCategories/bg/LgbTypes.h>
+#include <datReader/DatCategories/bg/Lgb.h>
+
 #include <Network/PacketContainer.h>
 #include <Network/CommonActorControl.h>
 #include <Network/PacketWrappers/EffectPacket.h>
@@ -22,7 +25,6 @@
 #include "Territory/InstanceObjectCache.h"
 #include "Territory/Land.h"
 
-
 #include "Network/GameConnection.h"
 #include "Network/PacketWrappers/ActorControlPacket.h"
 #include "Network/PacketWrappers/ActorControlSelfPacket.h"
@@ -347,31 +349,12 @@ void Sapphire::Entity::Player::teleport( uint16_t aetheryteId, uint8_t type )
   auto data = pExdData->get< Sapphire::Data::Aetheryte >( aetheryteId );
 
   if( data == nullptr )
-  {
     return;
-  }
 
   setStateFlag( PlayerStateFlag::BetweenAreas );
 
   auto pInstanceObjectCache = m_pFw->get< InstanceObjectCache >();
-
-  auto targetPos = pTeriMgr->getTerritoryPosition( data->level.at( 0 ) );
-
   auto pop = pInstanceObjectCache->getPopRange( data->territory, data->level[ 0 ] );
-  auto pop1 = pInstanceObjectCache->getPopRange( data->territory, data->level[ 1 ] );
-
-  if( pop )
-  {
-    sendDebug( "Teleport: popRange {0} found!", data->level.at( 0 ) );
-  }
-  else if( pop1 )
-  {
-    sendDebug( "Teleport: popRange {0} found!", data->level.at( 1 ) );
-  }
-  else
-  {
-    sendDebug( "Teleport: popRange {0} not found in {1}!", data->level[ 0 ], data->territory );
-  }
 
   Common::FFXIVARR_POSITION3 pos;
   pos.x = 0;
@@ -379,10 +362,18 @@ void Sapphire::Entity::Player::teleport( uint16_t aetheryteId, uint8_t type )
   pos.z = 0;
   float rot = 0;
 
-  if( targetPos != nullptr )
+  if( pop )
   {
-    pos = targetPos->getTargetPosition();
-    rot = targetPos->getTargetRotation();
+    sendDebug( "Teleport: popRange {0} found!", data->level.at( 0 ) );
+
+    pos.x = pop->header.transform.translation.x;
+    pos.y = pop->header.transform.translation.y;
+    pos.z = pop->header.transform.translation.z;
+    rot = pop->header.transform.rotation.y * -1;
+  }
+  else
+  {
+    sendDebug( "Teleport: popRange {0} not found in {1}!", data->level[ 0 ], data->territory );
   }
 
   sendDebug( "Teleport: {0} {1} ({2})",
diff --git a/src/world/Network/Handlers/PacketHandlers.cpp b/src/world/Network/Handlers/PacketHandlers.cpp
index 6f55cf4a..2f6183dc 100644
--- a/src/world/Network/Handlers/PacketHandlers.cpp
+++ b/src/world/Network/Handlers/PacketHandlers.cpp
@@ -290,21 +290,16 @@ void Sapphire::Network::GameConnection::zoneLineHandler( FrameworkPtr pFw,
 
   Common::FFXIVARR_POSITION3 targetPos{};
   uint32_t targetZone;
+  float rotation = 0.0f;
+
   if( pExitRange )
   {
-    player.sendDebug( "Found ExitRange#{0}", zoneLineId );
-    player.sendDebug( "destTerritoryType#{0}", pExitRange->data.destTerritoryType );
-    player.sendDebug( "destInstanceObjectId#{0}", pExitRange->data.destInstanceObjectId );
-
     auto pPopRange = pInstanceObjectCache->getPopRange( pExitRange->data.destTerritoryType,
                                                         pExitRange->data.destInstanceObjectId );
     if( pPopRange )
     {
       targetZone = pExitRange->data.destTerritoryType;
-      player.sendDebug( "\tFound PopRange#{0}", pExitRange->data.destInstanceObjectId );
-      player.sendDebug( "\t{0}", pPopRange->header.transform.translation.x );
-      player.sendDebug( "\t{0}", pPopRange->header.transform.translation.y );
-      player.sendDebug( "\t{0}", pPopRange->header.transform.translation.z );
+      rotation = pPopRange->header.transform.rotation.y * -1.f;
       targetPos = Common::FFXIVARR_POSITION3 { pPopRange->header.transform.translation.x,
                                                pPopRange->header.transform.translation.y,
                                                pPopRange->header.transform.translation.z };
@@ -314,8 +309,6 @@ void Sapphire::Network::GameConnection::zoneLineHandler( FrameworkPtr pFw,
       auto preparePacket = makeZonePacket< FFXIVIpcPrepareZoning >( player.getId() );
       preparePacket->data().targetZone = pExitRange->data.destTerritoryType;
 
-      //ActorControlSelfPacket controlPacket( pPlayer, ActorControlType::DespawnZoneScreenMsg,
-      //                                     0x03, player.getId(), 0x01, targetZone );
       player.queuePacket( preparePacket );
 
     }
@@ -323,34 +316,6 @@ void Sapphire::Network::GameConnection::zoneLineHandler( FrameworkPtr pFw,
 
   player.sendDebug( "Walking ZoneLine#{0}", zoneLineId );
 
-  auto pZone = player.getCurrentTerritory();
-
-  float rotation = 0.0f;
-
-/*  if( pLine != nullptr )
-  {
-    player.sendDebug( "ZoneLine #{0} found.", zoneLineId );
-    targetPos = pLine->getTargetPosition();
-    targetZone = pLine->getTargetZoneId();
-    rotation = pLine->getTargetRotation();
-
-    auto preparePacket = makeZonePacket< FFXIVIpcPrepareZoning >( player.getId() );
-    preparePacket->data().targetZone = targetZone;
-
-    //ActorControlSelfPacket controlPacket( pPlayer, ActorControlType::DespawnZoneScreenMsg,
-    //                                     0x03, player.getId(), 0x01, targetZone );
-    player.queuePacket( preparePacket );
-  }
-  else
-  {
-    // No zoneline found, revert to last zone
-    player.sendUrgent( "ZoneLine {0} not found.", zoneLineId );
-    targetPos.x = 0;
-    targetPos.y = 0;
-    targetPos.z = 0;
-    targetZone = pZone->getTerritoryTypeId();
-  }*/
-
   player.performZoning( targetZone, targetPos, rotation );
 }
 

From 1c78f9835e77f83fe65d99125db1fe1aacc0e91e Mon Sep 17 00:00:00 2001
From: Mordred <ffxivsapphire@gmail.com>
Date: Mon, 28 Oct 2019 22:18:23 +0100
Subject: [PATCH 157/351] Fixed housing opcodes

---
 src/common/Exd/ExdDataGenerated.cpp           |  2 +-
 src/common/Exd/ExdDataGenerated.h             |  2 +-
 src/common/Network/PacketDef/Ipcs.h           |  4 ++--
 .../common/aethernet/HousingAethernet.cpp     |  2 +-
 src/scripts/common/warptaxi/WarpTaxi.cpp      | 19 +++++++++++++++++++
 src/world/Actor/Player.cpp                    |  2 +-
 src/world/Network/Handlers/PacketHandlers.cpp |  2 +-
 7 files changed, 26 insertions(+), 7 deletions(-)

diff --git a/src/common/Exd/ExdDataGenerated.cpp b/src/common/Exd/ExdDataGenerated.cpp
index 04c8fa1e..f5f038aa 100644
--- a/src/common/Exd/ExdDataGenerated.cpp
+++ b/src/common/Exd/ExdDataGenerated.cpp
@@ -6673,7 +6673,7 @@ Sapphire::Data::Warp::Warp( uint32_t row_id, Sapphire::Data::ExdDataGenerated* e
 {
   auto row = exdData->m_WarpDat.get_row( row_id );
   level = exdData->getField< uint32_t >( row, 0 );
-  placeName = exdData->getField< uint16_t >( row, 1 );
+  territoryType = exdData->getField< uint16_t >( row, 1 );
   conditionSuccessEvent = exdData->getField< uint32_t >( row, 2 );
   conditionFailEvent = exdData->getField< uint32_t >( row, 3 );
   confirmEvent = exdData->getField< uint32_t >( row, 4 );
diff --git a/src/common/Exd/ExdDataGenerated.h b/src/common/Exd/ExdDataGenerated.h
index 831412cc..5c93319f 100644
--- a/src/common/Exd/ExdDataGenerated.h
+++ b/src/common/Exd/ExdDataGenerated.h
@@ -5432,7 +5432,7 @@ struct VFX
 struct Warp
 {
   uint32_t level;
-  uint16_t placeName;
+  uint16_t territoryType;
   uint32_t conditionSuccessEvent;
   uint32_t conditionFailEvent;
   uint32_t confirmEvent;
diff --git a/src/common/Network/PacketDef/Ipcs.h b/src/common/Network/PacketDef/Ipcs.h
index 8ffe9347..e57dd020 100644
--- a/src/common/Network/PacketDef/Ipcs.h
+++ b/src/common/Network/PacketDef/Ipcs.h
@@ -330,14 +330,14 @@ namespace Sapphire::Network::Packets
     InventoryEquipRecommendedItems = 0x0149, // updated 5.0
 
     ReqPlaceHousingItem = 0x014B, // updated 5.0
-    BuildPresetHandler = 0x014F, // updated 5.0
+    BuildPresetHandler = 0x0150, // updated 5.0
 
     TalkEventHandler = 0x0151, // updated 5.0
     EmoteEventHandler = 0x0152, // updated 5.0
     WithinRangeEventHandler = 0x0153, // updated 5.0
     OutOfRangeEventHandler = 0x0154, // updated 5.0
     EnterTeriEventHandler = 0x0155, // updated 5.0
-    ShopEventHandler = 0x0156, // updated 5.0
+    ShopEventHandler = 0x0157, // updated 5.0
 
     ReturnEventHandler = 0x015A, // updated 5.0?
     TradeReturnEventHandler = 0x015B, // updated 5.0?
diff --git a/src/scripts/common/aethernet/HousingAethernet.cpp b/src/scripts/common/aethernet/HousingAethernet.cpp
index f89c6d4c..5fcbbd04 100644
--- a/src/scripts/common/aethernet/HousingAethernet.cpp
+++ b/src/scripts/common/aethernet/HousingAethernet.cpp
@@ -39,7 +39,7 @@ public:
         return;
 
       // todo: this needs to be done properly and used queued zoning + aethernet animation
-      // moving a player inside an event will crash the game so we end it hre
+      // moving a player inside an event will crash the game so we end it here
       player.eventFinish( eventId, 1 );
 
       auto playerMgr = framework()->get< Sapphire::World::Manager::PlayerMgr >();
diff --git a/src/scripts/common/warptaxi/WarpTaxi.cpp b/src/scripts/common/warptaxi/WarpTaxi.cpp
index e867cb12..e8a8de97 100644
--- a/src/scripts/common/warptaxi/WarpTaxi.cpp
+++ b/src/scripts/common/warptaxi/WarpTaxi.cpp
@@ -1,6 +1,11 @@
 #include <ScriptObject.h>
 #include <Actor/Player.h>
 
+#include <datReader/DatCategories/bg/LgbTypes.h>
+#include <datReader/DatCategories/bg/Lgb.h>
+
+#include "Territory/InstanceObjectCache.h"
+
 #include <Exd/ExdDataGenerated.h>
 #include <Framework.h>
 #include <Manager/PlayerMgr.h>
@@ -28,11 +33,25 @@ public:
       player.eventFinish( getId(), 1 );
 
       auto exdData = framework()->get< Sapphire::Data::ExdDataGenerated >();
+      auto pPopRange = framework()->get< Sapphire::InstanceObjectCache >();
+
       auto warp = exdData->get< Sapphire::Data::Warp >( getId() );
       if( !warp )
         return;
 
       auto playerMgr = framework()->get< Sapphire::World::Manager::PlayerMgr >();
+
+      auto pPop = pPopRange->getPopRange(  warp->level,  warp->level );
+
+      if( !pPop )
+      {
+        std::cout << "not found...";
+      }
+      else
+      {
+        std::cout << "found!!";
+      }
+
       playerMgr->movePlayerToLandDestination( player, warp->level, result.param3 );
     }
     else
diff --git a/src/world/Actor/Player.cpp b/src/world/Actor/Player.cpp
index 8f0b0a84..be04212b 100644
--- a/src/world/Actor/Player.cpp
+++ b/src/world/Actor/Player.cpp
@@ -369,7 +369,7 @@ void Sapphire::Entity::Player::teleport( uint16_t aetheryteId, uint8_t type )
     pos.x = pop->header.transform.translation.x;
     pos.y = pop->header.transform.translation.y;
     pos.z = pop->header.transform.translation.z;
-    rot = pop->header.transform.rotation.y * -1;
+    rot = pop->header.transform.rotation.y;
   }
   else
   {
diff --git a/src/world/Network/Handlers/PacketHandlers.cpp b/src/world/Network/Handlers/PacketHandlers.cpp
index 2f6183dc..f8ae1042 100644
--- a/src/world/Network/Handlers/PacketHandlers.cpp
+++ b/src/world/Network/Handlers/PacketHandlers.cpp
@@ -299,7 +299,7 @@ void Sapphire::Network::GameConnection::zoneLineHandler( FrameworkPtr pFw,
     if( pPopRange )
     {
       targetZone = pExitRange->data.destTerritoryType;
-      rotation = pPopRange->header.transform.rotation.y * -1.f;
+      rotation = pPopRange->header.transform.rotation.y;
       targetPos = Common::FFXIVARR_POSITION3 { pPopRange->header.transform.translation.x,
                                                pPopRange->header.transform.translation.y,
                                                pPopRange->header.transform.translation.z };

From 39fc43a27a477f48c13c17dc25e61623f262744a Mon Sep 17 00:00:00 2001
From: NotAdam <adam@notadam.me>
Date: Tue, 29 Oct 2019 18:39:40 +1100
Subject: [PATCH 158/351] fix builds on clang

---
 src/world/Territory/Housing/HousingInteriorTerritory.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/world/Territory/Housing/HousingInteriorTerritory.h b/src/world/Territory/Housing/HousingInteriorTerritory.h
index efc4860b..22c3b43c 100644
--- a/src/world/Territory/Housing/HousingInteriorTerritory.h
+++ b/src/world/Territory/Housing/HousingInteriorTerritory.h
@@ -5,7 +5,7 @@
 
 namespace Sapphire::World::Territory::Housing
 {
-  class HousingInteriorTerritory : public Territory
+class HousingInteriorTerritory : public Sapphire::Territory
   {
   public:
     HousingInteriorTerritory( Common::LandIdent ident, uint16_t territoryTypeId,

From 23aad092275a65827d786b8d85c87d63adec8f6c Mon Sep 17 00:00:00 2001
From: NotAdam <adam@notadam.me>
Date: Tue, 29 Oct 2019 18:49:27 +1100
Subject: [PATCH 159/351] handle bad json in exd_struct_gen

---
 src/tools/exd_struct_gen/main.cpp | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/src/tools/exd_struct_gen/main.cpp b/src/tools/exd_struct_gen/main.cpp
index c418dd61..1fbcb042 100644
--- a/src/tools/exd_struct_gen/main.cpp
+++ b/src/tools/exd_struct_gen/main.cpp
@@ -127,8 +127,17 @@ std::string generateStruct( const std::string& exd )
   }
 
   auto sheet = nlohmann::json();
-  std::ifstream defJson( path );
-  defJson >> sheet;
+
+  try
+  {
+    std::ifstream defJson( path );
+    defJson >> sheet;
+  }
+  catch( const std::exception& ex )
+  {
+    Logger::error( "Failed parsing json definition, err: {}  file: {}", ex.what(), path );
+    return "";
+  }
 
   for( auto& definition : sheet[ "definitions" ] )
   {

From 49b0fb801279d1d4e50b3f4f106230d241f79de4 Mon Sep 17 00:00:00 2001
From: NotAdam <adam@notadam.me>
Date: Tue, 29 Oct 2019 19:38:51 +1100
Subject: [PATCH 160/351] fix formatting

---
 src/world/Territory/Housing/HousingInteriorTerritory.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/world/Territory/Housing/HousingInteriorTerritory.h b/src/world/Territory/Housing/HousingInteriorTerritory.h
index 22c3b43c..3ea97ae4 100644
--- a/src/world/Territory/Housing/HousingInteriorTerritory.h
+++ b/src/world/Territory/Housing/HousingInteriorTerritory.h
@@ -5,7 +5,7 @@
 
 namespace Sapphire::World::Territory::Housing
 {
-class HousingInteriorTerritory : public Sapphire::Territory
+  class HousingInteriorTerritory : public Sapphire::Territory
   {
   public:
     HousingInteriorTerritory( Common::LandIdent ident, uint16_t territoryTypeId,

From 2a699081a5e2e6beef93ad20a1635c406cc068e9 Mon Sep 17 00:00:00 2001
From: NotAdam <adam@notadam.me>
Date: Tue, 29 Oct 2019 20:23:06 +1100
Subject: [PATCH 161/351] opcode updates

---
 src/common/Network/PacketDef/Ipcs.h | 26 +++++++++++++++-----------
 1 file changed, 15 insertions(+), 11 deletions(-)

diff --git a/src/common/Network/PacketDef/Ipcs.h b/src/common/Network/PacketDef/Ipcs.h
index 8ffe9347..f26c7248 100644
--- a/src/common/Network/PacketDef/Ipcs.h
+++ b/src/common/Network/PacketDef/Ipcs.h
@@ -48,20 +48,24 @@ namespace Sapphire::Network::Packets
     Ping = 0x0065,
     Init = 0x0066,
 
-    ActorFreeSpawn = 0x0191,
-    InitZone = 0x019A,
+    ActorFreeSpawn = 0x0097, // updated 5.1
+    InitZone = 0x019B, // updated 5.1
 
-    EffectResult = 0x0141,
-    ActorControl = 0x0142,
-    ActorControlSelf = 0x0143,
-    ActorControlTarget = 0x0144,
-    UpdateHpMpTp = 0x0145, // used when resting
+    EffectResult = 0x0153, // updated 5.1
+    ActorControl = 0x0264, // updated 5.1
+    ActorControlSelf = 0x0164, // updated 5.1
+    ActorControlTarget = 0x016C, // updated 5.1
+
+    /*!
+     * @brief Used when resting
+     */
+    UpdateHpMpTp = 0x032D, // updated 5.1
 
     ///////////////////////////////////////////////////
 
     ChatBanned = 0x006B,
-    Playtime = 0x0100, // updated 5.0
-    Logout = 0x0077, // updated 5.0
+    Playtime = 0x01DB, // updated 5.1
+    Logout = 0x011D, // updated 5.1
     CFNotify = 0x0078,
     CFMemberStatus = 0x0079,
     CFDutyInfo = 0x007A,
@@ -129,7 +133,7 @@ namespace Sapphire::Network::Packets
 
     GCAffiliation = 0x016F, // updated 5.0
 
-    PlayerSpawn = 0x017F, // updated 5.0
+    PlayerSpawn = 0x0386, // updated 5.1
     NpcSpawn = 0x0180, // updated 5.0
     NpcSpawn2 = 0x0181, // ( Bigger statuseffectlist? ) updated 5.0
     ActorMove = 0x0182, // updated 5.0
@@ -265,7 +269,7 @@ namespace Sapphire::Network::Packets
   {
 
     PingHandler = 0x0065, // unchanged 5.0
-    InitHandler = 0x0066, // unchanged 5.0
+    InitHandler = 0x03D2, // updated 5.1
 
     FinishLoadingHandler = 0x0069, // unchanged 5.0
 

From 505c19ae050310724210e4a9253e4eb705c21355 Mon Sep 17 00:00:00 2001
From: NotAdam <adam@notadam.me>
Date: Tue, 29 Oct 2019 20:35:32 +1100
Subject: [PATCH 162/351] more 5.1 opcodes

---
 src/common/Network/PacketDef/Ipcs.h | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/common/Network/PacketDef/Ipcs.h b/src/common/Network/PacketDef/Ipcs.h
index f26c7248..619056af 100644
--- a/src/common/Network/PacketDef/Ipcs.h
+++ b/src/common/Network/PacketDef/Ipcs.h
@@ -79,23 +79,23 @@ namespace Sapphire::Network::Packets
 
     LogMessage = 0x00D0,
 
-    Chat = 0x0104, // updated 5.0
+    Chat = 0x02DC, // updated 5.1
 
     WorldVisitList = 0x00FE, // added 4.5
 
-    SocialList = 0x010D, // updated 5.0
+    SocialList = 0x007A, // updated 5.1
 
-    ExamineSearchInfo = 0x010F, // added 5.0
-    UpdateSearchInfo = 0x0110, // updated 5.0
-    InitSearchInfo = 0x0111, // updated 5.0
+    ExamineSearchInfo = 0x03D7, // updated 5.1
+    UpdateSearchInfo = 0x0358, // updated 5.1
+    InitSearchInfo = 0x03A1, // updated 5.1
     ExamineSearchComment = 0x0102, // updated 4.1
 
     ServerNoticeShort = 0x0115, // updated 5.0
     ServerNotice = 0x0116, // updated 5.0
-    SetOnlineStatus = 0x0117, // updated 5.0
+    SetOnlineStatus = 0x015E, // updated 5.1
 
-    CountdownInitiate = 0x011E, // updated 5.0
-    CountdownCancel = 0x011F, // updated 5.0
+    CountdownInitiate = 0x01EE, // updated 5.1
+    CountdownCancel = 0x03C6, // updated 5.1
 
     PlayerAddedToBlacklist = 0x0120, // updated 5.0
     PlayerRemovedFromBlacklist = 0x0121, // updated 5.0

From cf47810ed033014a40cb7ed76fd7ac9d61f13c39 Mon Sep 17 00:00:00 2001
From: NotAdam <adam@notadam.me>
Date: Tue, 29 Oct 2019 21:14:44 +1100
Subject: [PATCH 163/351] =?UTF-8?q?more=20opcodes=20=F0=9F=92=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/common/Network/PacketDef/Ipcs.h | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/common/Network/PacketDef/Ipcs.h b/src/common/Network/PacketDef/Ipcs.h
index 619056af..e00e1a27 100644
--- a/src/common/Network/PacketDef/Ipcs.h
+++ b/src/common/Network/PacketDef/Ipcs.h
@@ -97,9 +97,9 @@ namespace Sapphire::Network::Packets
     CountdownInitiate = 0x01EE, // updated 5.1
     CountdownCancel = 0x03C6, // updated 5.1
 
-    PlayerAddedToBlacklist = 0x0120, // updated 5.0
-    PlayerRemovedFromBlacklist = 0x0121, // updated 5.0
-    BlackList = 0x0123, // updated 5.0
+    PlayerAddedToBlacklist = 0x033F, // updated 5.1
+    PlayerRemovedFromBlacklist = 0x0385, // updated 5.1
+    BlackList = 0x031F, // updated 5.1
 
     LinkshellList = 0x012A, // updated 5.0
 
@@ -124,7 +124,7 @@ namespace Sapphire::Network::Packets
 
     StatusEffectList = 0x015B, // updated 5.0
     EurekaStatusEffectList = 0x015C, // updated 5.0
-    Effect = 0x015E, // updated 5.0
+    Effect = 0x00A7, // updated 5.1
     AoeEffect8 = 0x0161, // updated 5.0
     AoeEffect16 = 0x0162, // updated 5.0
     AoeEffect24 = 0x0163, // updated 5.0
@@ -134,9 +134,9 @@ namespace Sapphire::Network::Packets
     GCAffiliation = 0x016F, // updated 5.0
 
     PlayerSpawn = 0x0386, // updated 5.1
-    NpcSpawn = 0x0180, // updated 5.0
-    NpcSpawn2 = 0x0181, // ( Bigger statuseffectlist? ) updated 5.0
-    ActorMove = 0x0182, // updated 5.0
+    NpcSpawn = 0x010A, // updated 5.1
+    NpcSpawn2 = 0x0115, // ( Bigger statuseffectlist? ) updated 5.1
+    ActorMove = 0x01BC, // updated 5.1
 
     ActorSetPos = 0x0184, // updated 5.0
 

From f7a729d61c2fa226d1f444ed1a9afd6bc45890df Mon Sep 17 00:00:00 2001
From: NotAdam <adam@notadam.me>
Date: Tue, 29 Oct 2019 21:28:55 +1100
Subject: [PATCH 164/351] object spawn, player setup, cast packet, set pos,
 modelequp opcodes

---
 src/common/Network/PacketDef/Ipcs.h | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/src/common/Network/PacketDef/Ipcs.h b/src/common/Network/PacketDef/Ipcs.h
index e00e1a27..96dadc8f 100644
--- a/src/common/Network/PacketDef/Ipcs.h
+++ b/src/common/Network/PacketDef/Ipcs.h
@@ -138,25 +138,25 @@ namespace Sapphire::Network::Packets
     NpcSpawn2 = 0x0115, // ( Bigger statuseffectlist? ) updated 5.1
     ActorMove = 0x01BC, // updated 5.1
 
-    ActorSetPos = 0x0184, // updated 5.0
+    ActorSetPos = 0x0311, // updated 5.1
 
-    ActorCast = 0x0186, // updated 5.0
+    ActorCast = 0x012C, // updated 5.1
     SomeCustomiseChangePacketProbably = 0x0187, // added 5.0
     PartyList = 0x0188, // updated 5.0
     HateRank = 0x0189, // updated 5.0
     HateList = 0x018A, // updated 5.0
-    ObjectSpawn = 0x018B, // updated 5.0
-    ObjectDespawn = 0x018C, // updated 5.0
+    ObjectSpawn = 0x0156, // updated 5.1
+    ObjectDespawn = 0x00A3, // updated 5.1
     UpdateClassInfo = 0x018D, // updated 5.0
     SilentSetClassJob = 0x018E, // updated 5.0 - seems to be the case, not sure if it's actually used for anything
-    PlayerSetup = 0x018F, // updated 5.0
-    PlayerStats = 0x0190, // updated 5.0
-    ActorOwner = 0x0192, // updated 5.0
-    PlayerStateFlags = 0x0193, // updated 5.0
-    PlayerClassInfo = 0x0194, // updated 5.0
+    PlayerSetup = 0x0110, // updated 5.1
+    PlayerStats = 0x00CF, // updated 5.1
+    ActorOwner = 0x01A5, // updated 5.1
+    PlayerStateFlags = 0x019F, // updated 5.1
+    PlayerClassInfo = 0x02D4, // updated 5.1
 
-    ModelEquip = 0x0196, // updated 5.0
-    Examine = 0x0197, // updated 5.0
+    ModelEquip = 0x025E, // updated 5.1
+    Examine = 0x00EA, // updated 5.1
     CharaNameReq = 0x0198, // updated 5.0
 
     // nb: see #565 on github

From fef9ce0b3e9f20a48ce962fc93051e79939ab2e6 Mon Sep 17 00:00:00 2001
From: NotAdam <adam@notadam.me>
Date: Tue, 29 Oct 2019 21:50:52 +1100
Subject: [PATCH 165/351] AoeEffect[8,16,24,32] opcodes, inventory, hatelist,
 party list

---
 src/common/Network/PacketDef/Ipcs.h | 30 ++++++++++++++---------------
 1 file changed, 15 insertions(+), 15 deletions(-)

diff --git a/src/common/Network/PacketDef/Ipcs.h b/src/common/Network/PacketDef/Ipcs.h
index 96dadc8f..464a6b34 100644
--- a/src/common/Network/PacketDef/Ipcs.h
+++ b/src/common/Network/PacketDef/Ipcs.h
@@ -125,10 +125,10 @@ namespace Sapphire::Network::Packets
     StatusEffectList = 0x015B, // updated 5.0
     EurekaStatusEffectList = 0x015C, // updated 5.0
     Effect = 0x00A7, // updated 5.1
-    AoeEffect8 = 0x0161, // updated 5.0
-    AoeEffect16 = 0x0162, // updated 5.0
-    AoeEffect24 = 0x0163, // updated 5.0
-    AoeEffect32 = 0x0164, // updated 5.0
+    AoeEffect8 = 0x00A9, // updated 5.1
+    AoeEffect16 = 0x015F, // updated 5.1
+    AoeEffect24 = 0x0292, // updated 5.1
+    AoeEffect32 = 0x0268, // updated 5.1
     PersistantEffect = 0x0165, // updated 5.0
 
     GCAffiliation = 0x016F, // updated 5.0
@@ -142,12 +142,12 @@ namespace Sapphire::Network::Packets
 
     ActorCast = 0x012C, // updated 5.1
     SomeCustomiseChangePacketProbably = 0x0187, // added 5.0
-    PartyList = 0x0188, // updated 5.0
-    HateRank = 0x0189, // updated 5.0
-    HateList = 0x018A, // updated 5.0
+    PartyList = 0x0231, // updated 5.1
+    HateRank = 0x0354, // updated 5.1
+    HateList = 0x00C7, // updated 5.1
     ObjectSpawn = 0x0156, // updated 5.1
     ObjectDespawn = 0x00A3, // updated 5.1
-    UpdateClassInfo = 0x018D, // updated 5.0
+    UpdateClassInfo = 0x0258, // updated 5.1
     SilentSetClassJob = 0x018E, // updated 5.0 - seems to be the case, not sure if it's actually used for anything
     PlayerSetup = 0x0110, // updated 5.1
     PlayerStats = 0x00CF, // updated 5.1
@@ -164,14 +164,14 @@ namespace Sapphire::Network::Packets
 
     SetLevelSync = 0x1186, // not updated for 4.4, not sure what it is anymore
 
-    ItemInfo = 0x01A1, // updated 5.0
-    ContainerInfo = 0x01A2, // updated 5.0
-    InventoryTransactionFinish = 0x01A3, // updated 5.0
-    InventoryTransaction = 0x01A4, // updated 5.0
-    CurrencyCrystalInfo = 0x01A5, // updated 5.0
+    ItemInfo = 0x0145, // updated 5.1
+    ContainerInfo = 0x0246, // updated 5.1
+    InventoryTransactionFinish = 0x01AB, // updated 5.1
+    InventoryTransaction = 0x023E, // updated 5.1
+    CurrencyCrystalInfo = 0x031E, // updated 5.1
 
-    InventoryActionAck = 0x01A7, // updated 5.0
-    UpdateInventorySlot = 0x01A8, // updated 5.0
+    InventoryActionAck = 0x0084, // updated 5.1
+    UpdateInventorySlot = 0x0072, // updated 5.1
 
     HuntingLogEntry = 0x01B3, // updated 5.0
 

From c16749c60064998b1cae2b1ba247bedd830c8601 Mon Sep 17 00:00:00 2001
From: karashiiro <49822414+karashiiro@users.noreply.github.com>
Date: Tue, 29 Oct 2019 11:02:01 -0700
Subject: [PATCH 166/351] MarketBoardItemListing and
 MarketBoardItemListingHistory opcodes

---
 src/common/Common.h                               | 4 ++--
 src/common/Network/CommonActorControl.h           | 9 +++++++++
 src/common/Network/PacketDef/Ipcs.h               | 4 ++--
 src/common/Network/PacketDef/Zone/ServerZoneDef.h | 2 +-
 4 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/src/common/Common.h b/src/common/Common.h
index 21e6ba60..2f912b29 100644
--- a/src/common/Common.h
+++ b/src/common/Common.h
@@ -993,7 +993,7 @@ namespace Sapphire::Common
     CircularAoEPlaced = 7
   };
 
-  enum MarketCity : uint8_t
+  enum City : uint8_t
   {
     LimsaLominsa = 1,
     Gridania = 2,
@@ -1001,7 +1001,7 @@ namespace Sapphire::Common
     Ishgard = 4,
     Kugane = 7,
     Crystarium = 10
-  }
+  };
 
   enum class Role : uint8_t
   {
diff --git a/src/common/Network/CommonActorControl.h b/src/common/Network/CommonActorControl.h
index f620b381..7c61f47b 100644
--- a/src/common/Network/CommonActorControl.h
+++ b/src/common/Network/CommonActorControl.h
@@ -24,6 +24,9 @@ namespace Sapphire::Network::ActorControl
     SetStatus = 0x02,
     CastStart = 0x03,
     ToggleAggro = 0x04,
+    /*!
+     * param1 = ClassJob ID
+     */
     ClassJobChange = 0x05,
     DefeatMsg = 0x06,
     GainExpMsg = 0x07,
@@ -347,6 +350,12 @@ namespace Sapphire::Network::ActorControl
     EmoteReq = 0x1F4,
     EmoteCancel = 0x1F6,
     PersistentEmoteCancel = 0x1F7,
+    /*!
+     * param2 = pose ID
+     *      0 = idle pose 0 (just standing)
+     *      1 = idle pose 1
+     *    2-4 = idle poses 2-4
+     */
     PoseChange = 0x1F9,
     PoseReapply = 0x1FA,
     PoseCancel = 0x1FB,
diff --git a/src/common/Network/PacketDef/Ipcs.h b/src/common/Network/PacketDef/Ipcs.h
index 8ffe9347..f524467e 100644
--- a/src/common/Network/PacketDef/Ipcs.h
+++ b/src/common/Network/PacketDef/Ipcs.h
@@ -107,8 +107,8 @@ namespace Sapphire::Network::Packets
     MailLetterNotification = 0x013A, // updated 5.0
 
     MarketBoardItemListingCount = 0x013B, // updated 5.0
-    MarketBoardItemListing = 0x013C, // updated 5.0
-    MarketBoardItemListingHistory = 0x012A, // updated 4.5
+    MarketBoardItemListing = 0x036A, // updated 5.1
+    MarketBoardItemListingHistory = 0x0194, // updated 5.1
     MarketBoardSearchResult = 0x0139, // updated 4.5
 
     CharaFreeCompanyTag = 0x013B, // updated 4.5
diff --git a/src/common/Network/PacketDef/Zone/ServerZoneDef.h b/src/common/Network/PacketDef/Zone/ServerZoneDef.h
index fe376702..d7dd9a04 100644
--- a/src/common/Network/PacketDef/Zone/ServerZoneDef.h
+++ b/src/common/Network/PacketDef/Zone/ServerZoneDef.h
@@ -322,7 +322,7 @@ namespace Sapphire::Network::Packets::Server
       bool hq;
       uint8_t materiaCount;
       uint8_t onMannequin;
-      Common::MarketCity marketCity;
+      Common::City marketCity;
       uint16_t dyeId;
       uint16_t padding3;
       uint32_t padding4;

From 3328bb347f332124b368b87fff7b4b7da630bc40 Mon Sep 17 00:00:00 2001
From: karashiiro <49822414+karashiiro@users.noreply.github.com>
Date: Tue, 29 Oct 2019 20:06:26 -0700
Subject: [PATCH 167/351] Commit review responses

---
 src/common/Common.h                               | 10 ----------
 src/common/Network/PacketDef/Zone/ClientZoneDef.h |  6 +++---
 src/common/Network/PacketDef/Zone/ServerZoneDef.h |  2 +-
 3 files changed, 4 insertions(+), 14 deletions(-)

diff --git a/src/common/Common.h b/src/common/Common.h
index 2f912b29..7bb57000 100644
--- a/src/common/Common.h
+++ b/src/common/Common.h
@@ -993,16 +993,6 @@ namespace Sapphire::Common
     CircularAoEPlaced = 7
   };
 
-  enum City : uint8_t
-  {
-    LimsaLominsa = 1,
-    Gridania = 2,
-    Uldah = 3,
-    Ishgard = 4,
-    Kugane = 7,
-    Crystarium = 10
-  };
-
   enum class Role : uint8_t
   {
     None,
diff --git a/src/common/Network/PacketDef/Zone/ClientZoneDef.h b/src/common/Network/PacketDef/Zone/ClientZoneDef.h
index bc728cbe..7b0d39ea 100644
--- a/src/common/Network/PacketDef/Zone/ClientZoneDef.h
+++ b/src/common/Network/PacketDef/Zone/ClientZoneDef.h
@@ -40,9 +40,9 @@ struct FFXIVIpcClientTrigger :
   /* 0004 */ uint32_t param11;
   /* 0008 */ uint32_t param12;
   /* 000C */ uint32_t param2;
-  /* 0010 */ uint32_t param3;
-  /* 0014 */ uint32_t param4;
-  /* 0018 */ uint64_t param5;
+  /* 0010 */ uint32_t param4; // todo: really?
+  /* 0014 */ uint32_t param5;
+  /* 0018 */ uint64_t param3;
 };
 
 struct FFXIVIpcUpdatePosition :
diff --git a/src/common/Network/PacketDef/Zone/ServerZoneDef.h b/src/common/Network/PacketDef/Zone/ServerZoneDef.h
index d7dd9a04..3b4de057 100644
--- a/src/common/Network/PacketDef/Zone/ServerZoneDef.h
+++ b/src/common/Network/PacketDef/Zone/ServerZoneDef.h
@@ -322,7 +322,7 @@ namespace Sapphire::Network::Packets::Server
       bool hq;
       uint8_t materiaCount;
       uint8_t onMannequin;
-      Common::City marketCity;
+      Common::Town marketCity;
       uint16_t dyeId;
       uint16_t padding3;
       uint32_t padding4;

From 5c0d967b6d4490ce585d491981bba4c6c4f85e59 Mon Sep 17 00:00:00 2001
From: NotAdam <adam@notadam.me>
Date: Wed, 30 Oct 2019 22:48:20 +1100
Subject: [PATCH 168/351] fix actorcontrol and actorcontrolself opcodes being
 switched

thanks to ravahn for noticing
---
 src/common/Network/PacketDef/Ipcs.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/common/Network/PacketDef/Ipcs.h b/src/common/Network/PacketDef/Ipcs.h
index 464a6b34..807b6e2a 100644
--- a/src/common/Network/PacketDef/Ipcs.h
+++ b/src/common/Network/PacketDef/Ipcs.h
@@ -52,8 +52,8 @@ namespace Sapphire::Network::Packets
     InitZone = 0x019B, // updated 5.1
 
     EffectResult = 0x0153, // updated 5.1
-    ActorControl = 0x0264, // updated 5.1
-    ActorControlSelf = 0x0164, // updated 5.1
+    ActorControl = 0x0164, // updated 5.1
+    ActorControlSelf = 0x0264, // updated 5.1
     ActorControlTarget = 0x016C, // updated 5.1
 
     /*!

From 8cde1617f9373c098bc06dd3502e51a6eae1939e Mon Sep 17 00:00:00 2001
From: NotAdam <adam@notadam.me>
Date: Thu, 31 Oct 2019 11:35:04 +1100
Subject: [PATCH 169/351] fix enough to actually login now

---
 src/common/Exd/ExdDataGenerated.cpp | 657 ++++++++++++++++++++-----
 src/common/Exd/ExdDataGenerated.h   | 717 ++++++++++++++++++++++++++--
 src/common/Network/PacketDef/Ipcs.h |  25 +-
 3 files changed, 1227 insertions(+), 172 deletions(-)

diff --git a/src/common/Exd/ExdDataGenerated.cpp b/src/common/Exd/ExdDataGenerated.cpp
index 04c8fa1e..a04c621e 100644
--- a/src/common/Exd/ExdDataGenerated.cpp
+++ b/src/common/Exd/ExdDataGenerated.cpp
@@ -22,7 +22,7 @@ Sapphire::Data::Achievement::Achievement( uint32_t row_id, Sapphire::Data::ExdDa
   data.push_back( exdData->getField< int32_t >( row, 16 ) );
   data.push_back( exdData->getField< int32_t >( row, 17 ) );
   order = exdData->getField< uint16_t >( row, 18 );
-  initialHide = exdData->getField< uint8_t >( row, 20 );
+  achievementHideCondition = exdData->getField< uint8_t >( row, 20 );
 }
 
 Sapphire::Data::AchievementCategory::AchievementCategory( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
@@ -33,6 +33,14 @@ Sapphire::Data::AchievementCategory::AchievementCategory( uint32_t row_id, Sapph
   hideCategory = exdData->getField< bool >( row, 3 );
 }
 
+Sapphire::Data::AchievementHideCondition::AchievementHideCondition( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
+{
+  auto row = exdData->m_AchievementHideConditionDat.get_row( row_id );
+  hideAchievement = exdData->getField< bool >( row, 0 );
+  hideName = exdData->getField< bool >( row, 1 );
+  hideConditions = exdData->getField< bool >( row, 2 );
+}
+
 Sapphire::Data::AchievementKind::AchievementKind( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
 {
   auto row = exdData->m_AchievementKindDat.get_row( row_id );
@@ -50,6 +58,7 @@ Sapphire::Data::Action::Action( uint32_t row_id, Sapphire::Data::ExdDataGenerate
   animationEnd = exdData->getField< int16_t >( row, 7 );
   actionTimelineHit = exdData->getField< uint16_t >( row, 8 );
   classJob = exdData->getField< int8_t >( row, 10 );
+  behaviourType = exdData->getField< uint8_t >( row, 11 );
   classJobLevel = exdData->getField< uint8_t >( row, 12 );
   isRoleAction = exdData->getField< bool >( row, 13 );
   range = exdData->getField< int8_t >( row, 14 );
@@ -71,6 +80,7 @@ Sapphire::Data::Action::Action( uint32_t row_id, Sapphire::Data::ExdDataGenerate
   cast100ms = exdData->getField< uint16_t >( row, 37 );
   recast100ms = exdData->getField< uint16_t >( row, 38 );
   cooldownGroup = exdData->getField< uint8_t >( row, 39 );
+  maxCharges = exdData->getField< uint8_t >( row, 41 );
   attackType = exdData->getField< int8_t >( row, 42 );
   aspect = exdData->getField< uint8_t >( row, 43 );
   actionProcStatus = exdData->getField< uint8_t >( row, 44 );
@@ -78,7 +88,7 @@ Sapphire::Data::Action::Action( uint32_t row_id, Sapphire::Data::ExdDataGenerate
   unlockLink = exdData->getField< uint32_t >( row, 47 );
   classJobCategory = exdData->getField< uint8_t >( row, 48 );
   affectsPosition = exdData->getField< bool >( row, 51 );
-  omen = exdData->getField< uint8_t >( row, 52 );
+  omen = exdData->getField< uint16_t >( row, 52 );
   isPvP = exdData->getField< bool >( row, 53 );
   isPlayerAction = exdData->getField< bool >( row, 65 );
 }
@@ -197,14 +207,6 @@ Sapphire::Data::Addon::Addon( uint32_t row_id, Sapphire::Data::ExdDataGenerated*
   text = exdData->getField< std::string >( row, 0 );
 }
 
-Sapphire::Data::AddonHud::AddonHud( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
-{
-  auto row = exdData->m_AddonHudDat.get_row( row_id );
-  _long = exdData->getField< std::string >( row, 0 );
-  _short = exdData->getField< std::string >( row, 1 );
-  function = exdData->getField< std::string >( row, 2 );
-}
-
 Sapphire::Data::Adventure::Adventure( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
 {
   auto row = exdData->m_AdventureDat.get_row( row_id );
@@ -284,11 +286,11 @@ Sapphire::Data::Aetheryte::Aetheryte( uint32_t row_id, Sapphire::Data::ExdDataGe
   level.push_back( exdData->getField< uint32_t >( row, 13 ) );
   level.push_back( exdData->getField< uint32_t >( row, 14 ) );
   isAetheryte = exdData->getField< bool >( row, 15 );
-  aethernetGroup = exdData->getField< uint8_t >( row, 16 );
-  requiredQuest = exdData->getField< uint32_t >( row, 18 );
-  map = exdData->getField< uint16_t >( row, 19 );
-  aetherstreamX = exdData->getField< int16_t >( row, 20 );
-  aetherstreamY = exdData->getField< int16_t >( row, 21 );
+  aethernetGroup = exdData->getField< uint8_t >( row, 17 );
+  requiredQuest = exdData->getField< uint32_t >( row, 19 );
+  map = exdData->getField< uint16_t >( row, 20 );
+  aetherstreamX = exdData->getField< int16_t >( row, 21 );
+  aetherstreamY = exdData->getField< int16_t >( row, 22 );
 }
 
 Sapphire::Data::AetheryteSystemDefine::AetheryteSystemDefine( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
@@ -674,6 +676,35 @@ Sapphire::Data::Behavior::Behavior( uint32_t row_id, uint32_t subRow, Sapphire::
   balloon = exdData->getField< uint16_t >( row, 7 );
 }
 
+Sapphire::Data::BenchmarkOverrideEquipment::BenchmarkOverrideEquipment( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
+{
+  auto row = exdData->m_BenchmarkOverrideEquipmentDat.get_row( row_id );
+  modelMainHand = exdData->getField< uint64_t >( row, 4 );
+  dyeMainHand = exdData->getField< uint8_t >( row, 5 );
+  modelOffHand = exdData->getField< uint64_t >( row, 6 );
+  dyeOffHand = exdData->getField< uint8_t >( row, 7 );
+  modelHead = exdData->getField< uint32_t >( row, 10 );
+  dyeHead = exdData->getField< uint8_t >( row, 11 );
+  modelBody = exdData->getField< uint32_t >( row, 12 );
+  dyeBody = exdData->getField< uint8_t >( row, 13 );
+  modelHands = exdData->getField< uint32_t >( row, 14 );
+  dyeHands = exdData->getField< uint8_t >( row, 15 );
+  modelLegs = exdData->getField< uint32_t >( row, 16 );
+  dyeLegs = exdData->getField< uint8_t >( row, 17 );
+  modelFeet = exdData->getField< uint32_t >( row, 18 );
+  dyeFeet = exdData->getField< uint8_t >( row, 19 );
+  modelEars = exdData->getField< uint32_t >( row, 20 );
+  dyeEars = exdData->getField< uint8_t >( row, 21 );
+  modelNeck = exdData->getField< uint32_t >( row, 22 );
+  dyeNeck = exdData->getField< uint8_t >( row, 23 );
+  modelWrists = exdData->getField< uint32_t >( row, 24 );
+  dyeWrists = exdData->getField< uint8_t >( row, 25 );
+  modelLeftRing = exdData->getField< uint32_t >( row, 26 );
+  dyeLeftRing = exdData->getField< uint8_t >( row, 27 );
+  modelRightRing = exdData->getField< uint32_t >( row, 28 );
+  dyeRightRing = exdData->getField< uint8_t >( row, 29 );
+}
+
 Sapphire::Data::BGM::BGM( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
 {
   auto row = exdData->m_BGMDat.get_row( row_id );
@@ -955,6 +986,7 @@ Sapphire::Data::Calendar::Calendar( uint32_t row_id, Sapphire::Data::ExdDataGene
 Sapphire::Data::CharaMakeCustomize::CharaMakeCustomize( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
 {
   auto row = exdData->m_CharaMakeCustomizeDat.get_row( row_id );
+  featureID = exdData->getField< uint8_t >( row, 0 );
   icon = exdData->getField< uint32_t >( row, 1 );
   data = exdData->getField< uint16_t >( row, 2 );
   isPurchasable = exdData->getField< bool >( row, 3 );
@@ -966,6 +998,8 @@ Sapphire::Data::CharaMakeType::CharaMakeType( uint32_t row_id, Sapphire::Data::E
   race = exdData->getField< int32_t >( row, 0 );
   tribe = exdData->getField< int32_t >( row, 1 );
   gender = exdData->getField< int8_t >( row, 2 );
+  facialFeatureIcon.push_back( exdData->getField< int32_t >( row, 3291 ) );
+  facialFeatureIcon.push_back( exdData->getField< int32_t >( row, 3292 ) );
   facialFeatureIcon.push_back( exdData->getField< int32_t >( row, 3293 ) );
   facialFeatureIcon.push_back( exdData->getField< int32_t >( row, 3294 ) );
   facialFeatureIcon.push_back( exdData->getField< int32_t >( row, 3295 ) );
@@ -1115,6 +1149,7 @@ Sapphire::Data::ClassJob::ClassJob( uint32_t row_id, Sapphire::Data::ExdDataGene
   abbreviation = exdData->getField< std::string >( row, 1 );
   classJobCategory = exdData->getField< uint8_t >( row, 3 );
   expArrayIndex = exdData->getField< int8_t >( row, 4 );
+  jobIndex = exdData->getField< uint8_t >( row, 7 );
   modifierHitPoints = exdData->getField< uint16_t >( row, 9 );
   modifierManaPoints = exdData->getField< uint16_t >( row, 10 );
   modifierStrength = exdData->getField< uint16_t >( row, 11 );
@@ -1132,6 +1167,7 @@ Sapphire::Data::ClassJob::ClassJob( uint32_t row_id, Sapphire::Data::ExdDataGene
   limitBreak1 = exdData->getField< uint16_t >( row, 34 );
   limitBreak2 = exdData->getField< uint16_t >( row, 35 );
   limitBreak3 = exdData->getField< uint16_t >( row, 36 );
+  uIPriority = exdData->getField< uint8_t >( row, 37 );
   itemSoulCrystal = exdData->getField< uint32_t >( row, 38 );
   unlockQuest = exdData->getField< uint32_t >( row, 39 );
   relicQuest = exdData->getField< uint32_t >( row, 40 );
@@ -1139,6 +1175,7 @@ Sapphire::Data::ClassJob::ClassJob( uint32_t row_id, Sapphire::Data::ExdDataGene
   startingLevel = exdData->getField< uint8_t >( row, 42 );
   partyBonus = exdData->getField< uint8_t >( row, 43 );
   isLimitedJob = exdData->getField< bool >( row, 44 );
+  canQueueForDuty = exdData->getField< bool >( row, 45 );
 }
 
 Sapphire::Data::ClassJobCategory::ClassJobCategory( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
@@ -1181,6 +1218,9 @@ Sapphire::Data::ClassJobCategory::ClassJobCategory( uint32_t row_id, Sapphire::D
   aST = exdData->getField< bool >( row, 34 );
   sAM = exdData->getField< bool >( row, 35 );
   rDM = exdData->getField< bool >( row, 36 );
+  bLU = exdData->getField< bool >( row, 37 );
+  gNB = exdData->getField< bool >( row, 38 );
+  dNC = exdData->getField< bool >( row, 39 );
 }
 
 Sapphire::Data::Companion::Companion( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
@@ -1383,6 +1423,7 @@ Sapphire::Data::ContentFinderCondition::ContentFinderCondition( uint32_t row_id,
   classJobLevelSync = exdData->getField< uint8_t >( row, 16 );
   itemLevelRequired = exdData->getField< uint16_t >( row, 17 );
   itemLevelSync = exdData->getField< uint16_t >( row, 18 );
+  allowUndersized = exdData->getField< bool >( row, 19 );
   allowReplacement = exdData->getField< bool >( row, 20 );
   highEndDuty = exdData->getField< bool >( row, 26 );
   dutyRecorderAllowed = exdData->getField< bool >( row, 30 );
@@ -1450,6 +1491,12 @@ Sapphire::Data::ContentNpcTalk::ContentNpcTalk( uint32_t row_id, Sapphire::Data:
   contentTalk.push_back( exdData->getField< uint32_t >( row, 8 ) );
 }
 
+Sapphire::Data::ContentRandomSelect::ContentRandomSelect( uint32_t row_id, uint32_t subRow, Sapphire::Data::ExdDataGenerated* exdData )
+{
+  auto row = exdData->m_ContentRandomSelectDat.get_row( row_id, subRow );
+  name = exdData->getField< uint16_t >( row, 0 );
+}
+
 Sapphire::Data::ContentRoulette::ContentRoulette( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
 {
   auto row = exdData->m_ContentRouletteDat.get_row( row_id );
@@ -1556,6 +1603,14 @@ Sapphire::Data::CraftLeve::CraftLeve( uint32_t row_id, Sapphire::Data::ExdDataGe
   repeats = exdData->getField< uint8_t >( row, 2 );
 }
 
+Sapphire::Data::CraftLevelDifference::CraftLevelDifference( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
+{
+  auto row = exdData->m_CraftLevelDifferenceDat.get_row( row_id );
+  difference = exdData->getField< int16_t >( row, 0 );
+  progressFactor = exdData->getField< int16_t >( row, 1 );
+  qualityFactor = exdData->getField< int16_t >( row, 2 );
+}
+
 Sapphire::Data::CraftType::CraftType( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
 {
   auto row = exdData->m_CraftTypeDat.get_row( row_id );
@@ -1710,6 +1765,43 @@ Sapphire::Data::DailySupplyItem::DailySupplyItem( uint32_t row_id, Sapphire::Dat
   auto row = exdData->m_DailySupplyItemDat.get_row( row_id );
 }
 
+Sapphire::Data::DawnContent::DawnContent( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
+{
+  auto row = exdData->m_DawnContentDat.get_row( row_id );
+  content = exdData->getField< uint32_t >( row, 0 );
+  exp = exdData->getField< uint32_t >( row, 1 );
+}
+
+Sapphire::Data::DawnGrowMember::DawnGrowMember( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
+{
+  auto row = exdData->m_DawnGrowMemberDat.get_row( row_id );
+  member = exdData->getField< uint32_t >( row, 0 );
+  imageName = exdData->getField< uint32_t >( row, 1 );
+  bigImageOld = exdData->getField< uint32_t >( row, 2 );
+  bigImageNew = exdData->getField< uint32_t >( row, 3 );
+  smallImageOld = exdData->getField< uint32_t >( row, 4 );
+  smallImageNew = exdData->getField< uint32_t >( row, 5 );
+  _class = exdData->getField< uint8_t >( row, 6 );
+}
+
+Sapphire::Data::DawnMemberUIParam::DawnMemberUIParam( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
+{
+  auto row = exdData->m_DawnMemberUIParamDat.get_row( row_id );
+  classSingular = exdData->getField< std::string >( row, 0 );
+  voiceLine = exdData->getField< uint32_t >( row, 1 );
+  classPlural = exdData->getField< std::string >( row, 2 );
+}
+
+Sapphire::Data::DawnQuestMember::DawnQuestMember( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
+{
+  auto row = exdData->m_DawnQuestMemberDat.get_row( row_id );
+  member = exdData->getField< uint32_t >( row, 0 );
+  imageName = exdData->getField< uint32_t >( row, 1 );
+  bigImageOld = exdData->getField< uint32_t >( row, 2 );
+  bigImageNew = exdData->getField< uint32_t >( row, 3 );
+  _class = exdData->getField< uint8_t >( row, 4 );
+}
+
 Sapphire::Data::DeepDungeon::DeepDungeon( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
 {
   auto row = exdData->m_DeepDungeonDat.get_row( row_id );
@@ -1846,23 +1938,23 @@ Sapphire::Data::DeliveryQuest::DeliveryQuest( uint32_t row_id, Sapphire::Data::E
 Sapphire::Data::DescriptionPage::DescriptionPage( uint32_t row_id, uint32_t subRow, Sapphire::Data::ExdDataGenerated* exdData )
 {
   auto row = exdData->m_DescriptionPageDat.get_row( row_id, subRow );
-  text1 = exdData->getField< uint32_t >( row, 1 );
+  text1 = exdData->getField< uint16_t >( row, 1 );
   image1 = exdData->getField< uint32_t >( row, 2 );
-  text2 = exdData->getField< uint32_t >( row, 3 );
+  text2 = exdData->getField< uint16_t >( row, 3 );
   image2 = exdData->getField< uint32_t >( row, 4 );
-  text3 = exdData->getField< uint32_t >( row, 5 );
+  text3 = exdData->getField< uint16_t >( row, 5 );
   image3 = exdData->getField< uint32_t >( row, 6 );
-  text4 = exdData->getField< uint32_t >( row, 7 );
+  text4 = exdData->getField< uint16_t >( row, 7 );
   image4 = exdData->getField< uint32_t >( row, 8 );
-  text5 = exdData->getField< uint32_t >( row, 9 );
+  text5 = exdData->getField< uint16_t >( row, 9 );
   image5 = exdData->getField< uint32_t >( row, 10 );
-  text6 = exdData->getField< uint32_t >( row, 11 );
+  text6 = exdData->getField< uint16_t >( row, 11 );
   image6 = exdData->getField< uint32_t >( row, 12 );
-  text7 = exdData->getField< uint32_t >( row, 13 );
+  text7 = exdData->getField< uint16_t >( row, 13 );
   image7 = exdData->getField< uint32_t >( row, 14 );
-  text8 = exdData->getField< uint32_t >( row, 15 );
+  text8 = exdData->getField< uint16_t >( row, 15 );
   image8 = exdData->getField< uint32_t >( row, 16 );
-  text9 = exdData->getField< uint32_t >( row, 17 );
+  text9 = exdData->getField< uint16_t >( row, 17 );
   image9 = exdData->getField< uint32_t >( row, 18 );
 }
 
@@ -2325,13 +2417,23 @@ Sapphire::Data::Fate::Fate( uint32_t row_id, Sapphire::Data::ExdDataGenerated* e
   iconMap = exdData->getField< uint32_t >( row, 10 );
   music = exdData->getField< int32_t >( row, 12 );
   hasWorldMapIcon = exdData->getField< bool >( row, 17 );
-  name = exdData->getField< std::string >( row, 25 );
-  description = exdData->getField< std::string >( row, 26 );
-  objective = exdData->getField< std::string >( row, 27 );
-  statusText.push_back( exdData->getField< std::string >( row, 28 ) );
+  name = exdData->getField< std::string >( row, 26 );
+  description = exdData->getField< std::string >( row, 27 );
+  objective = exdData->getField< std::string >( row, 28 );
   statusText.push_back( exdData->getField< std::string >( row, 29 ) );
   statusText.push_back( exdData->getField< std::string >( row, 30 ) );
-  arrayIndex = exdData->getField< uint32_t >( row, 31 );
+  statusText.push_back( exdData->getField< std::string >( row, 31 ) );
+  arrayIndex = exdData->getField< uint32_t >( row, 32 );
+}
+
+Sapphire::Data::FateProgressUI::FateProgressUI( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
+{
+  auto row = exdData->m_FateProgressUIDat.get_row( row_id );
+  location = exdData->getField< int32_t >( row, 0 );
+  achievement = exdData->getField< int32_t >( row, 1 );
+  reqFatesToRank2 = exdData->getField< uint8_t >( row, 2 );
+  reqFatesToRank3 = exdData->getField< uint8_t >( row, 3 );
+  displayOrder = exdData->getField< uint8_t >( row, 4 );
 }
 
 Sapphire::Data::FCActivity::FCActivity( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
@@ -2522,6 +2624,20 @@ Sapphire::Data::Frontline04::Frontline04( uint32_t row_id, Sapphire::Data::ExdDa
   unknownLevel.push_back( exdData->getField< int32_t >( row, 32 ) );
 }
 
+Sapphire::Data::FurnitureCatalogCategory::FurnitureCatalogCategory( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
+{
+  auto row = exdData->m_FurnitureCatalogCategoryDat.get_row( row_id );
+  category = exdData->getField< std::string >( row, 0 );
+}
+
+Sapphire::Data::FurnitureCatalogItemList::FurnitureCatalogItemList( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
+{
+  auto row = exdData->m_FurnitureCatalogItemListDat.get_row( row_id );
+  category = exdData->getField< uint16_t >( row, 0 );
+  item = exdData->getField< int32_t >( row, 1 );
+  patch = exdData->getField< uint16_t >( row, 2 );
+}
+
 Sapphire::Data::GardeningSeed::GardeningSeed( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
 {
   auto row = exdData->m_GardeningSeedDat.get_row( row_id );
@@ -2538,7 +2654,7 @@ Sapphire::Data::GatheringCondition::GatheringCondition( uint32_t row_id, Sapphir
 Sapphire::Data::GatheringExp::GatheringExp( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
 {
   auto row = exdData->m_GatheringExpDat.get_row( row_id );
-  exp = exdData->getField< uint16_t >( row, 0 );
+  exp = exdData->getField< int32_t >( row, 0 );
 }
 
 Sapphire::Data::GatheringItem::GatheringItem( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
@@ -3047,6 +3163,32 @@ Sapphire::Data::GuardianDeity::GuardianDeity( uint32_t row_id, Sapphire::Data::E
   icon = exdData->getField< uint16_t >( row, 2 );
 }
 
+Sapphire::Data::Guide::Guide( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
+{
+  auto row = exdData->m_GuideDat.get_row( row_id );
+  guideTitle = exdData->getField< uint16_t >( row, 0 );
+  guidePage = exdData->getField< uint16_t >( row, 1 );
+}
+
+Sapphire::Data::GuidePage::GuidePage( uint32_t row_id, uint32_t subRow, Sapphire::Data::ExdDataGenerated* exdData )
+{
+  auto row = exdData->m_GuidePageDat.get_row( row_id, subRow );
+  key = exdData->getField< uint8_t >( row, 0 );
+  output = exdData->getField< uint32_t >( row, 1 );
+}
+
+Sapphire::Data::GuidePageString::GuidePageString( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
+{
+  auto row = exdData->m_GuidePageStringDat.get_row( row_id );
+  string = exdData->getField< std::string >( row, 0 );
+}
+
+Sapphire::Data::GuideTitle::GuideTitle( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
+{
+  auto row = exdData->m_GuideTitleDat.get_row( row_id );
+  title = exdData->getField< std::string >( row, 0 );
+}
+
 Sapphire::Data::GuildleveAssignment::GuildleveAssignment( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
 {
   auto row = exdData->m_GuildleveAssignmentDat.get_row( row_id );
@@ -3447,6 +3589,60 @@ Sapphire::Data::HowToPage::HowToPage( uint32_t row_id, Sapphire::Data::ExdDataGe
   image = exdData->getField< int32_t >( row, 2 );
 }
 
+Sapphire::Data::HugeCraftworksNpc::HugeCraftworksNpc( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
+{
+  auto row = exdData->m_HugeCraftworksNpcDat.get_row( row_id );
+  eNpcResident = exdData->getField< uint32_t >( row, 0 );
+  classJobCategory = exdData->getField< uint16_t >( row, 1 );
+  itemRequested.push_back( exdData->getField< uint32_t >( row, 3 ) );
+  itemRequested.push_back( exdData->getField< uint32_t >( row, 4 ) );
+  itemRequested.push_back( exdData->getField< uint32_t >( row, 5 ) );
+  itemRequested.push_back( exdData->getField< uint32_t >( row, 6 ) );
+  qtyRequested.push_back( exdData->getField< uint8_t >( row, 9 ) );
+  qtyRequested.push_back( exdData->getField< uint8_t >( row, 10 ) );
+  qtyRequested.push_back( exdData->getField< uint8_t >( row, 11 ) );
+  qtyRequested.push_back( exdData->getField< uint8_t >( row, 12 ) );
+  itemReward.push_back( exdData->getField< uint32_t >( row, 52 ) );
+  itemReward.push_back( exdData->getField< uint32_t >( row, 53 ) );
+  itemReward.push_back( exdData->getField< uint32_t >( row, 54 ) );
+  itemReward.push_back( exdData->getField< uint32_t >( row, 55 ) );
+  qtyItemReward.push_back( exdData->getField< uint8_t >( row, 64 ) );
+  qtyItemReward.push_back( exdData->getField< uint8_t >( row, 65 ) );
+  qtyItemReward.push_back( exdData->getField< uint8_t >( row, 66 ) );
+  qtyItemReward.push_back( exdData->getField< uint8_t >( row, 67 ) );
+  itemUnkown.push_back( exdData->getField< uint32_t >( row, 70 ) );
+  itemUnkown.push_back( exdData->getField< uint32_t >( row, 71 ) );
+  itemUnkown.push_back( exdData->getField< uint32_t >( row, 72 ) );
+  itemUnkown.push_back( exdData->getField< uint32_t >( row, 73 ) );
+  qtyItemUnkown.push_back( exdData->getField< uint8_t >( row, 82 ) );
+  qtyItemUnkown.push_back( exdData->getField< uint8_t >( row, 83 ) );
+  qtyItemUnkown.push_back( exdData->getField< uint8_t >( row, 84 ) );
+  qtyItemUnkown.push_back( exdData->getField< uint8_t >( row, 85 ) );
+  transient = exdData->getField< std::string >( row, 86 );
+}
+
+Sapphire::Data::HugeCraftworksRank::HugeCraftworksRank( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
+{
+  auto row = exdData->m_HugeCraftworksRankDat.get_row( row_id );
+  crafterLevel = exdData->getField< uint8_t >( row, 0 );
+  expRewardPerItem = exdData->getField< uint32_t >( row, 1 );
+}
+
+Sapphire::Data::IndividualWeather::IndividualWeather( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
+{
+  auto row = exdData->m_IndividualWeatherDat.get_row( row_id );
+  weather.push_back( exdData->getField< uint8_t >( row, 0 ) );
+  weather.push_back( exdData->getField< uint8_t >( row, 1 ) );
+  weather.push_back( exdData->getField< uint8_t >( row, 2 ) );
+  weather.push_back( exdData->getField< uint8_t >( row, 3 ) );
+  weather.push_back( exdData->getField< uint8_t >( row, 4 ) );
+  quest.push_back( exdData->getField< uint32_t >( row, 10 ) );
+  quest.push_back( exdData->getField< uint32_t >( row, 11 ) );
+  quest.push_back( exdData->getField< uint32_t >( row, 12 ) );
+  quest.push_back( exdData->getField< uint32_t >( row, 13 ) );
+  quest.push_back( exdData->getField< uint32_t >( row, 14 ) );
+}
+
 Sapphire::Data::InstanceContent::InstanceContent( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
 {
   auto row = exdData->m_InstanceContentDat.get_row( row_id );
@@ -3541,35 +3737,35 @@ Sapphire::Data::Item::Item( uint32_t row_id, Sapphire::Data::ExdDataGenerated* e
   itemGlamour = exdData->getField< int32_t >( row, 34 );
   salvage = exdData->getField< uint16_t >( row, 35 );
   isCollectable = exdData->getField< bool >( row, 36 );
-  aetherialReduce = exdData->getField< uint16_t >( row, 37 );
-  levelEquip = exdData->getField< uint8_t >( row, 38 );
-  equipRestriction = exdData->getField< uint8_t >( row, 40 );
-  classJobCategory = exdData->getField< uint8_t >( row, 41 );
-  grandCompany = exdData->getField< uint8_t >( row, 42 );
-  itemSeries = exdData->getField< uint8_t >( row, 43 );
-  baseParamModifier = exdData->getField< uint8_t >( row, 44 );
-  modelMain = exdData->getField< uint64_t >( row, 45 );
-  modelSub = exdData->getField< uint64_t >( row, 46 );
-  classJobUse = exdData->getField< uint8_t >( row, 47 );
-  damagePhys = exdData->getField< uint16_t >( row, 49 );
-  damageMag = exdData->getField< uint16_t >( row, 50 );
-  delayms = exdData->getField< uint16_t >( row, 51 );
-  blockRate = exdData->getField< uint16_t >( row, 53 );
-  block = exdData->getField< uint16_t >( row, 54 );
-  defensePhys = exdData->getField< uint16_t >( row, 55 );
-  defenseMag = exdData->getField< uint16_t >( row, 56 );
-  itemSpecialBonus = exdData->getField< uint8_t >( row, 69 );
-  itemSpecialBonusParam = exdData->getField< uint8_t >( row, 70 );
-  materializeType = exdData->getField< uint8_t >( row, 83 );
-  materiaSlotCount = exdData->getField< uint8_t >( row, 84 );
-  isAdvancedMeldingPermitted = exdData->getField< bool >( row, 85 );
-  isPvP = exdData->getField< bool >( row, 86 );
-  isGlamourous = exdData->getField< bool >( row, 88 );
+  aetherialReduce = exdData->getField< uint16_t >( row, 38 );
+  levelEquip = exdData->getField< uint8_t >( row, 39 );
+  equipRestriction = exdData->getField< uint8_t >( row, 41 );
+  classJobCategory = exdData->getField< uint8_t >( row, 42 );
+  grandCompany = exdData->getField< uint8_t >( row, 43 );
+  itemSeries = exdData->getField< uint8_t >( row, 44 );
+  baseParamModifier = exdData->getField< uint8_t >( row, 45 );
+  modelMain = exdData->getField< uint64_t >( row, 46 );
+  modelSub = exdData->getField< uint64_t >( row, 47 );
+  classJobUse = exdData->getField< uint8_t >( row, 48 );
+  damagePhys = exdData->getField< uint16_t >( row, 50 );
+  damageMag = exdData->getField< uint16_t >( row, 51 );
+  delayms = exdData->getField< uint16_t >( row, 52 );
+  blockRate = exdData->getField< uint16_t >( row, 54 );
+  block = exdData->getField< uint16_t >( row, 55 );
+  defensePhys = exdData->getField< uint16_t >( row, 56 );
+  defenseMag = exdData->getField< uint16_t >( row, 57 );
+  itemSpecialBonus = exdData->getField< uint8_t >( row, 70 );
+  itemSpecialBonusParam = exdData->getField< uint8_t >( row, 71 );
+  materializeType = exdData->getField< uint8_t >( row, 84 );
+  materiaSlotCount = exdData->getField< uint8_t >( row, 85 );
+  isAdvancedMeldingPermitted = exdData->getField< bool >( row, 86 );
+  isPvP = exdData->getField< bool >( row, 87 );
+  isGlamourous = exdData->getField< bool >( row, 89 );
 
   for( int i = 0; i < 6; ++i )
   {
-    param[i].baseparam = exdData->getField< uint8_t >( row, 57 + i * 2 );
-    param[i].value = exdData->getField< int16_t >( row, 58 + i * 2 );
+    param[i].baseparam = exdData->getField< uint8_t >( row, 58 + i * 2 );
+    param[i].value = exdData->getField< int16_t >( row, 59 + i * 2 );
   }
 }
 
@@ -3712,6 +3908,21 @@ Sapphire::Data::ItemUICategory::ItemUICategory( uint32_t row_id, Sapphire::Data:
   orderMajor = exdData->getField< uint8_t >( row, 3 );
 }
 
+Sapphire::Data::JobHudManual::JobHudManual( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
+{
+  auto row = exdData->m_JobHudManualDat.get_row( row_id );
+  action = exdData->getField< uint32_t >( row, 2 );
+  guide = exdData->getField< uint16_t >( row, 5 );
+}
+
+Sapphire::Data::JobHudManualPriority::JobHudManualPriority( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
+{
+  auto row = exdData->m_JobHudManualPriorityDat.get_row( row_id );
+  jobHudManual.push_back( exdData->getField< uint8_t >( row, 0 ) );
+  jobHudManual.push_back( exdData->getField< uint8_t >( row, 1 ) );
+  jobHudManual.push_back( exdData->getField< uint8_t >( row, 2 ) );
+}
+
 Sapphire::Data::JournalCategory::JournalCategory( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
 {
   auto row = exdData->m_JournalCategoryDat.get_row( row_id );
@@ -3916,19 +4127,19 @@ Sapphire::Data::ManeuversArmor::ManeuversArmor( uint32_t row_id, Sapphire::Data:
 Sapphire::Data::Map::Map( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
 {
   auto row = exdData->m_MapDat.get_row( row_id );
-  mapIndex = exdData->getField< int8_t >( row, 2 );
-  hierarchy = exdData->getField< uint8_t >( row, 3 );
-  mapMarkerRange = exdData->getField< uint16_t >( row, 4 );
-  id = exdData->getField< std::string >( row, 5 );
-  sizeFactor = exdData->getField< uint16_t >( row, 6 );
-  offsetX = exdData->getField< int16_t >( row, 7 );
-  offsetY = exdData->getField< int16_t >( row, 8 );
-  placeNameRegion = exdData->getField< uint16_t >( row, 9 );
-  placeName = exdData->getField< uint16_t >( row, 10 );
-  placeNameSub = exdData->getField< uint16_t >( row, 11 );
-  discoveryIndex = exdData->getField< int16_t >( row, 12 );
-  territoryType = exdData->getField< uint16_t >( row, 14 );
-  discoveryArrayByte = exdData->getField< bool >( row, 15 );
+  mapIndex = exdData->getField< int8_t >( row, 3 );
+  hierarchy = exdData->getField< uint8_t >( row, 4 );
+  mapMarkerRange = exdData->getField< uint16_t >( row, 5 );
+  id = exdData->getField< std::string >( row, 6 );
+  sizeFactor = exdData->getField< uint16_t >( row, 7 );
+  offsetX = exdData->getField< int16_t >( row, 8 );
+  offsetY = exdData->getField< int16_t >( row, 9 );
+  placeNameRegion = exdData->getField< uint16_t >( row, 10 );
+  placeName = exdData->getField< uint16_t >( row, 11 );
+  placeNameSub = exdData->getField< uint16_t >( row, 12 );
+  discoveryIndex = exdData->getField< int16_t >( row, 13 );
+  territoryType = exdData->getField< uint16_t >( row, 15 );
+  discoveryArrayByte = exdData->getField< bool >( row, 16 );
 }
 
 Sapphire::Data::MapMarker::MapMarker( uint32_t row_id, uint32_t subRow, Sapphire::Data::ExdDataGenerated* exdData )
@@ -4008,6 +4219,32 @@ Sapphire::Data::Materia::Materia( uint32_t row_id, Sapphire::Data::ExdDataGenera
   value.push_back( exdData->getField< uint8_t >( row, 20 ) );
 }
 
+Sapphire::Data::MateriaJoinRate::MateriaJoinRate( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
+{
+  auto row = exdData->m_MateriaJoinRateDat.get_row( row_id );
+  NQOvermeldSlot.push_back( exdData->getField< float >( row, 0 ) );
+  NQOvermeldSlot.push_back( exdData->getField< float >( row, 1 ) );
+  NQOvermeldSlot.push_back( exdData->getField< float >( row, 2 ) );
+  NQOvermeldSlot.push_back( exdData->getField< float >( row, 3 ) );
+  HQOvermeldSlot.push_back( exdData->getField< float >( row, 4 ) );
+  HQOvermeldSlot.push_back( exdData->getField< float >( row, 5 ) );
+  HQOvermeldSlot.push_back( exdData->getField< float >( row, 6 ) );
+  HQOvermeldSlot.push_back( exdData->getField< float >( row, 7 ) );
+}
+
+Sapphire::Data::MateriaJoinRateGatherCraft::MateriaJoinRateGatherCraft( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
+{
+  auto row = exdData->m_MateriaJoinRateGatherCraftDat.get_row( row_id );
+  NQOvermeldSlot.push_back( exdData->getField< float >( row, 0 ) );
+  NQOvermeldSlot.push_back( exdData->getField< float >( row, 1 ) );
+  NQOvermeldSlot.push_back( exdData->getField< float >( row, 2 ) );
+  NQOvermeldSlot.push_back( exdData->getField< float >( row, 3 ) );
+  HQOvermeldSlot.push_back( exdData->getField< float >( row, 4 ) );
+  HQOvermeldSlot.push_back( exdData->getField< float >( row, 5 ) );
+  HQOvermeldSlot.push_back( exdData->getField< float >( row, 6 ) );
+  HQOvermeldSlot.push_back( exdData->getField< float >( row, 7 ) );
+}
+
 Sapphire::Data::MiniGameRA::MiniGameRA( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
 {
   auto row = exdData->m_MiniGameRADat.get_row( row_id );
@@ -4034,11 +4271,35 @@ Sapphire::Data::MinionSkillType::MinionSkillType( uint32_t row_id, Sapphire::Dat
   name = exdData->getField< std::string >( row, 0 );
 }
 
+Sapphire::Data::MobHuntOrder::MobHuntOrder( uint32_t row_id, uint32_t subRow, Sapphire::Data::ExdDataGenerated* exdData )
+{
+  auto row = exdData->m_MobHuntOrderDat.get_row( row_id, subRow );
+  target = exdData->getField< uint16_t >( row, 0 );
+  stars = exdData->getField< uint8_t >( row, 1 );
+  mobHuntReward = exdData->getField< uint8_t >( row, 4 );
+}
+
 Sapphire::Data::MobHuntOrderType::MobHuntOrderType( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
 {
   auto row = exdData->m_MobHuntOrderTypeDat.get_row( row_id );
   quest = exdData->getField< uint32_t >( row, 1 );
   eventItem = exdData->getField< uint32_t >( row, 2 );
+  orderStart = exdData->getField< uint16_t >( row, 3 );
+  orderAmount = exdData->getField< uint8_t >( row, 4 );
+}
+
+Sapphire::Data::MobHuntReward::MobHuntReward( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
+{
+  auto row = exdData->m_MobHuntRewardDat.get_row( row_id );
+  expReward = exdData->getField< uint32_t >( row, 0 );
+  gilReward = exdData->getField< uint16_t >( row, 1 );
+  currencyReward = exdData->getField< uint16_t >( row, 3 );
+}
+
+Sapphire::Data::MobHuntRewardCap::MobHuntRewardCap( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
+{
+  auto row = exdData->m_MobHuntRewardCapDat.get_row( row_id );
+  expCap = exdData->getField< uint32_t >( row, 0 );
 }
 
 Sapphire::Data::MobHuntTarget::MobHuntTarget( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
@@ -4132,18 +4393,38 @@ Sapphire::Data::MountAction::MountAction( uint32_t row_id, Sapphire::Data::ExdDa
 Sapphire::Data::MountCustomize::MountCustomize( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
 {
   auto row = exdData->m_MountCustomizeDat.get_row( row_id );
+  hyurMaleScale = exdData->getField< uint16_t >( row, 1 );
+  hyurFemaleScale = exdData->getField< uint16_t >( row, 2 );
+  elezenMaleScale = exdData->getField< uint16_t >( row, 3 );
+  elezenFemaleScale = exdData->getField< uint16_t >( row, 4 );
+  lalaMaleScale = exdData->getField< uint16_t >( row, 5 );
+  lalaFemaleScale = exdData->getField< uint16_t >( row, 6 );
+  miqoMaleScale = exdData->getField< uint16_t >( row, 7 );
+  miqoFemaleScale = exdData->getField< uint16_t >( row, 8 );
+  roeMaleScale = exdData->getField< uint16_t >( row, 9 );
+  roeFemaleScale = exdData->getField< uint16_t >( row, 10 );
+  auRaMaleScale = exdData->getField< uint16_t >( row, 11 );
+  auRaFemaleScale = exdData->getField< uint16_t >( row, 12 );
+  hrothgarMaleScale = exdData->getField< uint16_t >( row, 13 );
+  hrothgarFemaleScale = exdData->getField< uint16_t >( row, 14 );
+  vieraMaleScale = exdData->getField< uint16_t >( row, 15 );
+  vieraFemaleScale = exdData->getField< uint16_t >( row, 16 );
   hyurMaleCameraHeight = exdData->getField< uint8_t >( row, 17 );
   hyurFemaleCameraHeight = exdData->getField< uint8_t >( row, 18 );
-  elezenMaleCameraHeight = exdData->getField< uint8_t >( row, 21 );
-  elezenFemaleCameraHeight = exdData->getField< uint8_t >( row, 22 );
-  lalaMaleCameraHeight = exdData->getField< uint8_t >( row, 23 );
-  lalaFemaleCameraHeight = exdData->getField< uint8_t >( row, 24 );
-  miqoMaleCameraHeight = exdData->getField< uint8_t >( row, 25 );
-  miqoFemaleCameraHeight = exdData->getField< uint8_t >( row, 26 );
-  roeMaleCameraHeight = exdData->getField< uint8_t >( row, 27 );
-  roeFemaleCameraHeight = exdData->getField< uint8_t >( row, 28 );
-  auRaMaleCameraHeight = exdData->getField< uint8_t >( row, 29 );
-  auRaFemaleCameraHeight = exdData->getField< uint8_t >( row, 30 );
+  elezenMaleCameraHeight = exdData->getField< uint8_t >( row, 19 );
+  elezenFemaleCameraHeight = exdData->getField< uint8_t >( row, 20 );
+  lalaMaleCameraHeight = exdData->getField< uint8_t >( row, 21 );
+  lalaFemaleCameraHeight = exdData->getField< uint8_t >( row, 22 );
+  miqoMaleCameraHeight = exdData->getField< uint8_t >( row, 23 );
+  miqoFemaleCameraHeight = exdData->getField< uint8_t >( row, 24 );
+  roeMaleCameraHeight = exdData->getField< uint8_t >( row, 25 );
+  roeFemaleCameraHeight = exdData->getField< uint8_t >( row, 26 );
+  auRaMaleCameraHeight = exdData->getField< uint8_t >( row, 27 );
+  auRaFemaleCameraHeight = exdData->getField< uint8_t >( row, 28 );
+  hrothgarMaleCameraHeight = exdData->getField< uint8_t >( row, 29 );
+  hrothgarRoeFemaleCameraHeight = exdData->getField< uint8_t >( row, 30 );
+  vieraMaleCameraHeight = exdData->getField< uint8_t >( row, 31 );
+  vieraFemaleCameraHeight = exdData->getField< uint8_t >( row, 32 );
 }
 
 Sapphire::Data::MountFlyingCondition::MountFlyingCondition( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
@@ -4201,6 +4482,14 @@ Sapphire::Data::NotebookDivisionCategory::NotebookDivisionCategory( uint32_t row
   name = exdData->getField< std::string >( row, 0 );
 }
 
+Sapphire::Data::NotoriousMonster::NotoriousMonster( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
+{
+  auto row = exdData->m_NotoriousMonsterDat.get_row( row_id );
+  bNpcBase = exdData->getField< int32_t >( row, 0 );
+  rank = exdData->getField< uint8_t >( row, 1 );
+  bNpcName = exdData->getField< uint32_t >( row, 2 );
+}
+
 Sapphire::Data::NpcEquip::NpcEquip( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
 {
   auto row = exdData->m_NpcEquipDat.get_row( row_id );
@@ -4251,6 +4540,49 @@ Sapphire::Data::OnlineStatus::OnlineStatus( uint32_t row_id, Sapphire::Data::Exd
   icon = exdData->getField< uint32_t >( row, 4 );
 }
 
+Sapphire::Data::OpenContent::OpenContent( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
+{
+  auto row = exdData->m_OpenContentDat.get_row( row_id );
+  content.push_back( exdData->getField< uint16_t >( row, 0 ) );
+  content.push_back( exdData->getField< uint16_t >( row, 1 ) );
+  content.push_back( exdData->getField< uint16_t >( row, 2 ) );
+  content.push_back( exdData->getField< uint16_t >( row, 3 ) );
+  content.push_back( exdData->getField< uint16_t >( row, 4 ) );
+  content.push_back( exdData->getField< uint16_t >( row, 5 ) );
+  content.push_back( exdData->getField< uint16_t >( row, 6 ) );
+  content.push_back( exdData->getField< uint16_t >( row, 7 ) );
+  content.push_back( exdData->getField< uint16_t >( row, 8 ) );
+  content.push_back( exdData->getField< uint16_t >( row, 9 ) );
+  content.push_back( exdData->getField< uint16_t >( row, 10 ) );
+  content.push_back( exdData->getField< uint16_t >( row, 11 ) );
+  content.push_back( exdData->getField< uint16_t >( row, 12 ) );
+  content.push_back( exdData->getField< uint16_t >( row, 13 ) );
+  content.push_back( exdData->getField< uint16_t >( row, 14 ) );
+  content.push_back( exdData->getField< uint16_t >( row, 15 ) );
+  candidateName.push_back( exdData->getField< uint32_t >( row, 16 ) );
+  candidateName.push_back( exdData->getField< uint32_t >( row, 17 ) );
+  candidateName.push_back( exdData->getField< uint32_t >( row, 18 ) );
+  candidateName.push_back( exdData->getField< uint32_t >( row, 19 ) );
+  candidateName.push_back( exdData->getField< uint32_t >( row, 20 ) );
+  candidateName.push_back( exdData->getField< uint32_t >( row, 21 ) );
+  candidateName.push_back( exdData->getField< uint32_t >( row, 22 ) );
+  candidateName.push_back( exdData->getField< uint32_t >( row, 23 ) );
+  candidateName.push_back( exdData->getField< uint32_t >( row, 24 ) );
+  candidateName.push_back( exdData->getField< uint32_t >( row, 25 ) );
+  candidateName.push_back( exdData->getField< uint32_t >( row, 26 ) );
+  candidateName.push_back( exdData->getField< uint32_t >( row, 27 ) );
+  candidateName.push_back( exdData->getField< uint32_t >( row, 28 ) );
+  candidateName.push_back( exdData->getField< uint32_t >( row, 29 ) );
+  candidateName.push_back( exdData->getField< uint32_t >( row, 30 ) );
+  candidateName.push_back( exdData->getField< uint32_t >( row, 31 ) );
+}
+
+Sapphire::Data::OpenContentCandidateName::OpenContentCandidateName( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
+{
+  auto row = exdData->m_OpenContentCandidateNameDat.get_row( row_id );
+  name = exdData->getField< std::string >( row, 0 );
+}
+
 Sapphire::Data::Opening::Opening( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
 {
   auto row = exdData->m_OpeningDat.get_row( row_id );
@@ -4297,6 +4629,7 @@ Sapphire::Data::ParamGrow::ParamGrow( uint32_t row_id, Sapphire::Data::ExdDataGe
   hpModifier = exdData->getField< uint16_t >( row, 8 );
   huntingLogExpReward = exdData->getField< int32_t >( row, 9 );
   itemLevelSync = exdData->getField< uint16_t >( row, 11 );
+  craftingLevel = exdData->getField< uint16_t >( row, 14 );
 }
 
 Sapphire::Data::PartyContent::PartyContent( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
@@ -4492,15 +4825,14 @@ Sapphire::Data::Quest::Quest( uint32_t row_id, Sapphire::Data::ExdDataGenerated*
   isHouseRequired = exdData->getField< bool >( row, 37 );
   deliveryQuest = exdData->getField< uint8_t >( row, 38 );
   issuerStart = exdData->getField< uint32_t >( row, 39 );
-  behavior = exdData->getField< uint16_t >( row, 40 );
-  targetEnd = exdData->getField< uint32_t >( row, 41 );
-  isRepeatable = exdData->getField< bool >( row, 42 );
-  repeatIntervalType = exdData->getField< uint8_t >( row, 43 );
-  questRepeatFlag = exdData->getField< uint8_t >( row, 44 );
-  unlocksSystemContent = exdData->getField< bool >( row, 45 );
-  type = exdData->getField< uint8_t >( row, 47 );
-  questClassJobSupply = exdData->getField< uint16_t >( row, 48 );
-  scriptInstruction.push_back( exdData->getField< std::string >( row, 49 ) );
+  behavior = exdData->getField< uint32_t >( row, 40 );
+  targetEnd = exdData->getField< uint32_t >( row, 42 );
+  isRepeatable = exdData->getField< bool >( row, 43 );
+  repeatIntervalType = exdData->getField< uint8_t >( row, 44 );
+  questRepeatFlag = exdData->getField< uint8_t >( row, 45 );
+  unlocksSystemContent = exdData->getField< bool >( row, 46 );
+  type = exdData->getField< uint8_t >( row, 48 );
+  questClassJobSupply = exdData->getField< uint16_t >( row, 49 );
   scriptInstruction.push_back( exdData->getField< std::string >( row, 50 ) );
   scriptInstruction.push_back( exdData->getField< std::string >( row, 51 ) );
   scriptInstruction.push_back( exdData->getField< std::string >( row, 52 ) );
@@ -4550,7 +4882,7 @@ Sapphire::Data::Quest::Quest( uint32_t row_id, Sapphire::Data::ExdDataGenerated*
   scriptInstruction.push_back( exdData->getField< std::string >( row, 96 ) );
   scriptInstruction.push_back( exdData->getField< std::string >( row, 97 ) );
   scriptInstruction.push_back( exdData->getField< std::string >( row, 98 ) );
-  scriptArg.push_back( exdData->getField< uint32_t >( row, 99 ) );
+  scriptInstruction.push_back( exdData->getField< std::string >( row, 99 ) );
   scriptArg.push_back( exdData->getField< uint32_t >( row, 100 ) );
   scriptArg.push_back( exdData->getField< uint32_t >( row, 101 ) );
   scriptArg.push_back( exdData->getField< uint32_t >( row, 102 ) );
@@ -4600,7 +4932,7 @@ Sapphire::Data::Quest::Quest( uint32_t row_id, Sapphire::Data::ExdDataGenerated*
   scriptArg.push_back( exdData->getField< uint32_t >( row, 146 ) );
   scriptArg.push_back( exdData->getField< uint32_t >( row, 147 ) );
   scriptArg.push_back( exdData->getField< uint32_t >( row, 148 ) );
-  actorSpawnSeq.push_back( exdData->getField< uint8_t >( row, 149 ) );
+  scriptArg.push_back( exdData->getField< uint32_t >( row, 149 ) );
   actorSpawnSeq.push_back( exdData->getField< uint8_t >( row, 150 ) );
   actorSpawnSeq.push_back( exdData->getField< uint8_t >( row, 151 ) );
   actorSpawnSeq.push_back( exdData->getField< uint8_t >( row, 152 ) );
@@ -4664,7 +4996,7 @@ Sapphire::Data::Quest::Quest( uint32_t row_id, Sapphire::Data::ExdDataGenerated*
   actorSpawnSeq.push_back( exdData->getField< uint8_t >( row, 210 ) );
   actorSpawnSeq.push_back( exdData->getField< uint8_t >( row, 211 ) );
   actorSpawnSeq.push_back( exdData->getField< uint8_t >( row, 212 ) );
-  actorDespawnSeq.push_back( exdData->getField< uint8_t >( row, 213 ) );
+  actorSpawnSeq.push_back( exdData->getField< uint8_t >( row, 213 ) );
   actorDespawnSeq.push_back( exdData->getField< uint8_t >( row, 214 ) );
   actorDespawnSeq.push_back( exdData->getField< uint8_t >( row, 215 ) );
   actorDespawnSeq.push_back( exdData->getField< uint8_t >( row, 216 ) );
@@ -4728,7 +5060,7 @@ Sapphire::Data::Quest::Quest( uint32_t row_id, Sapphire::Data::ExdDataGenerated*
   actorDespawnSeq.push_back( exdData->getField< uint8_t >( row, 274 ) );
   actorDespawnSeq.push_back( exdData->getField< uint8_t >( row, 275 ) );
   actorDespawnSeq.push_back( exdData->getField< uint8_t >( row, 276 ) );
-  actorSpawn.push_back( exdData->getField< uint32_t >( row, 277 ) );
+  actorDespawnSeq.push_back( exdData->getField< uint8_t >( row, 277 ) );
   actorSpawn.push_back( exdData->getField< uint32_t >( row, 278 ) );
   actorSpawn.push_back( exdData->getField< uint32_t >( row, 279 ) );
   actorSpawn.push_back( exdData->getField< uint32_t >( row, 280 ) );
@@ -4792,7 +5124,7 @@ Sapphire::Data::Quest::Quest( uint32_t row_id, Sapphire::Data::ExdDataGenerated*
   actorSpawn.push_back( exdData->getField< uint32_t >( row, 338 ) );
   actorSpawn.push_back( exdData->getField< uint32_t >( row, 339 ) );
   actorSpawn.push_back( exdData->getField< uint32_t >( row, 340 ) );
-  questUInt8A.push_back( exdData->getField< uint8_t >( row, 341 ) );
+  actorSpawn.push_back( exdData->getField< uint32_t >( row, 341 ) );
   questUInt8A.push_back( exdData->getField< uint8_t >( row, 342 ) );
   questUInt8A.push_back( exdData->getField< uint8_t >( row, 343 ) );
   questUInt8A.push_back( exdData->getField< uint8_t >( row, 344 ) );
@@ -4824,7 +5156,7 @@ Sapphire::Data::Quest::Quest( uint32_t row_id, Sapphire::Data::ExdDataGenerated*
   questUInt8A.push_back( exdData->getField< uint8_t >( row, 370 ) );
   questUInt8A.push_back( exdData->getField< uint8_t >( row, 371 ) );
   questUInt8A.push_back( exdData->getField< uint8_t >( row, 372 ) );
-  questUInt8B.push_back( exdData->getField< uint8_t >( row, 373 ) );
+  questUInt8A.push_back( exdData->getField< uint8_t >( row, 373 ) );
   questUInt8B.push_back( exdData->getField< uint8_t >( row, 374 ) );
   questUInt8B.push_back( exdData->getField< uint8_t >( row, 375 ) );
   questUInt8B.push_back( exdData->getField< uint8_t >( row, 376 ) );
@@ -4856,7 +5188,7 @@ Sapphire::Data::Quest::Quest( uint32_t row_id, Sapphire::Data::ExdDataGenerated*
   questUInt8B.push_back( exdData->getField< uint8_t >( row, 402 ) );
   questUInt8B.push_back( exdData->getField< uint8_t >( row, 403 ) );
   questUInt8B.push_back( exdData->getField< uint8_t >( row, 404 ) );
-  toDoCompleteSeq.push_back( exdData->getField< uint8_t >( row, 1173 ) );
+  questUInt8B.push_back( exdData->getField< uint8_t >( row, 405 ) );
   toDoCompleteSeq.push_back( exdData->getField< uint8_t >( row, 1174 ) );
   toDoCompleteSeq.push_back( exdData->getField< uint8_t >( row, 1175 ) );
   toDoCompleteSeq.push_back( exdData->getField< uint8_t >( row, 1176 ) );
@@ -4880,7 +5212,7 @@ Sapphire::Data::Quest::Quest( uint32_t row_id, Sapphire::Data::ExdDataGenerated*
   toDoCompleteSeq.push_back( exdData->getField< uint8_t >( row, 1194 ) );
   toDoCompleteSeq.push_back( exdData->getField< uint8_t >( row, 1195 ) );
   toDoCompleteSeq.push_back( exdData->getField< uint8_t >( row, 1196 ) );
-  toDoQty.push_back( exdData->getField< uint8_t >( row, 1197 ) );
+  toDoCompleteSeq.push_back( exdData->getField< uint8_t >( row, 1197 ) );
   toDoQty.push_back( exdData->getField< uint8_t >( row, 1198 ) );
   toDoQty.push_back( exdData->getField< uint8_t >( row, 1199 ) );
   toDoQty.push_back( exdData->getField< uint8_t >( row, 1200 ) );
@@ -4904,7 +5236,7 @@ Sapphire::Data::Quest::Quest( uint32_t row_id, Sapphire::Data::ExdDataGenerated*
   toDoQty.push_back( exdData->getField< uint8_t >( row, 1218 ) );
   toDoQty.push_back( exdData->getField< uint8_t >( row, 1219 ) );
   toDoQty.push_back( exdData->getField< uint8_t >( row, 1220 ) );
-  toDoMainLocation.push_back( exdData->getField< uint32_t >( row, 1221 ) );
+  toDoQty.push_back( exdData->getField< uint8_t >( row, 1221 ) );
   toDoMainLocation.push_back( exdData->getField< uint32_t >( row, 1222 ) );
   toDoMainLocation.push_back( exdData->getField< uint32_t >( row, 1223 ) );
   toDoMainLocation.push_back( exdData->getField< uint32_t >( row, 1224 ) );
@@ -4928,76 +5260,78 @@ Sapphire::Data::Quest::Quest( uint32_t row_id, Sapphire::Data::ExdDataGenerated*
   toDoMainLocation.push_back( exdData->getField< uint32_t >( row, 1242 ) );
   toDoMainLocation.push_back( exdData->getField< uint32_t >( row, 1243 ) );
   toDoMainLocation.push_back( exdData->getField< uint32_t >( row, 1244 ) );
-  classJobRequired = exdData->getField< uint8_t >( row, 1438 );
-  expFactor = exdData->getField< uint16_t >( row, 1440 );
-  gilReward = exdData->getField< uint32_t >( row, 1441 );
-  gCSeals = exdData->getField< uint16_t >( row, 1443 );
-  itemCatalyst.push_back( exdData->getField< uint8_t >( row, 1444 ) );
+  toDoMainLocation.push_back( exdData->getField< uint32_t >( row, 1245 ) );
+  classJobRequired = exdData->getField< uint8_t >( row, 1439 );
+  expFactor = exdData->getField< uint16_t >( row, 1441 );
+  gilReward = exdData->getField< uint32_t >( row, 1442 );
+  gCSeals = exdData->getField< uint16_t >( row, 1444 );
   itemCatalyst.push_back( exdData->getField< uint8_t >( row, 1445 ) );
   itemCatalyst.push_back( exdData->getField< uint8_t >( row, 1446 ) );
-  itemCountCatalyst.push_back( exdData->getField< uint8_t >( row, 1447 ) );
+  itemCatalyst.push_back( exdData->getField< uint8_t >( row, 1447 ) );
   itemCountCatalyst.push_back( exdData->getField< uint8_t >( row, 1448 ) );
   itemCountCatalyst.push_back( exdData->getField< uint8_t >( row, 1449 ) );
-  itemRewardType = exdData->getField< uint8_t >( row, 1450 );
-  itemReward0.push_back( exdData->getField< uint32_t >( row, 1451 ) );
+  itemCountCatalyst.push_back( exdData->getField< uint8_t >( row, 1450 ) );
+  itemRewardType = exdData->getField< uint8_t >( row, 1451 );
   itemReward0.push_back( exdData->getField< uint32_t >( row, 1452 ) );
   itemReward0.push_back( exdData->getField< uint32_t >( row, 1453 ) );
   itemReward0.push_back( exdData->getField< uint32_t >( row, 1454 ) );
   itemReward0.push_back( exdData->getField< uint32_t >( row, 1455 ) );
   itemReward0.push_back( exdData->getField< uint32_t >( row, 1456 ) );
-  itemCountReward0.push_back( exdData->getField< uint8_t >( row, 1458 ) );
+  itemReward0.push_back( exdData->getField< uint32_t >( row, 1457 ) );
   itemCountReward0.push_back( exdData->getField< uint8_t >( row, 1459 ) );
   itemCountReward0.push_back( exdData->getField< uint8_t >( row, 1460 ) );
   itemCountReward0.push_back( exdData->getField< uint8_t >( row, 1461 ) );
   itemCountReward0.push_back( exdData->getField< uint8_t >( row, 1462 ) );
   itemCountReward0.push_back( exdData->getField< uint8_t >( row, 1463 ) );
-  stainReward0.push_back( exdData->getField< uint8_t >( row, 1465 ) );
+  itemCountReward0.push_back( exdData->getField< uint8_t >( row, 1464 ) );
   stainReward0.push_back( exdData->getField< uint8_t >( row, 1466 ) );
   stainReward0.push_back( exdData->getField< uint8_t >( row, 1467 ) );
   stainReward0.push_back( exdData->getField< uint8_t >( row, 1468 ) );
   stainReward0.push_back( exdData->getField< uint8_t >( row, 1469 ) );
   stainReward0.push_back( exdData->getField< uint8_t >( row, 1470 ) );
-  itemReward1.push_back( exdData->getField< uint32_t >( row, 1472 ) );
+  stainReward0.push_back( exdData->getField< uint8_t >( row, 1471 ) );
   itemReward1.push_back( exdData->getField< uint32_t >( row, 1473 ) );
   itemReward1.push_back( exdData->getField< uint32_t >( row, 1474 ) );
   itemReward1.push_back( exdData->getField< uint32_t >( row, 1475 ) );
   itemReward1.push_back( exdData->getField< uint32_t >( row, 1476 ) );
-  itemCountReward1.push_back( exdData->getField< uint8_t >( row, 1477 ) );
+  itemReward1.push_back( exdData->getField< uint32_t >( row, 1477 ) );
   itemCountReward1.push_back( exdData->getField< uint8_t >( row, 1478 ) );
   itemCountReward1.push_back( exdData->getField< uint8_t >( row, 1479 ) );
   itemCountReward1.push_back( exdData->getField< uint8_t >( row, 1480 ) );
   itemCountReward1.push_back( exdData->getField< uint8_t >( row, 1481 ) );
-  isHQReward1.push_back( exdData->getField< bool >( row, 1482 ) );
+  itemCountReward1.push_back( exdData->getField< uint8_t >( row, 1482 ) );
   isHQReward1.push_back( exdData->getField< bool >( row, 1483 ) );
   isHQReward1.push_back( exdData->getField< bool >( row, 1484 ) );
   isHQReward1.push_back( exdData->getField< bool >( row, 1485 ) );
   isHQReward1.push_back( exdData->getField< bool >( row, 1486 ) );
-  stainReward1.push_back( exdData->getField< uint8_t >( row, 1487 ) );
+  isHQReward1.push_back( exdData->getField< bool >( row, 1487 ) );
   stainReward1.push_back( exdData->getField< uint8_t >( row, 1488 ) );
   stainReward1.push_back( exdData->getField< uint8_t >( row, 1489 ) );
   stainReward1.push_back( exdData->getField< uint8_t >( row, 1490 ) );
   stainReward1.push_back( exdData->getField< uint8_t >( row, 1491 ) );
-  emoteReward = exdData->getField< uint8_t >( row, 1492 );
-  actionReward = exdData->getField< uint16_t >( row, 1493 );
-  generalActionReward.push_back( exdData->getField< uint8_t >( row, 1494 ) );
+  stainReward1.push_back( exdData->getField< uint8_t >( row, 1492 ) );
+  emoteReward = exdData->getField< uint8_t >( row, 1493 );
+  actionReward = exdData->getField< uint16_t >( row, 1494 );
   generalActionReward.push_back( exdData->getField< uint8_t >( row, 1495 ) );
-  otherReward = exdData->getField< uint8_t >( row, 1497 );
-  instanceContentUnlock = exdData->getField< uint32_t >( row, 1500 );
-  tomestoneReward = exdData->getField< uint8_t >( row, 1502 );
-  tomestoneCountReward = exdData->getField< uint8_t >( row, 1503 );
-  reputationReward = exdData->getField< uint8_t >( row, 1504 );
-  placeName = exdData->getField< uint16_t >( row, 1505 );
-  journalGenre = exdData->getField< uint8_t >( row, 1506 );
-  icon = exdData->getField< uint32_t >( row, 1508 );
-  iconSpecial = exdData->getField< uint32_t >( row, 1509 );
-  eventIconType = exdData->getField< uint8_t >( row, 1512 );
-  sortKey = exdData->getField< uint16_t >( row, 1514 );
+  generalActionReward.push_back( exdData->getField< uint8_t >( row, 1496 ) );
+  otherReward = exdData->getField< uint8_t >( row, 1498 );
+  instanceContentUnlock = exdData->getField< uint32_t >( row, 1501 );
+  tomestoneReward = exdData->getField< uint8_t >( row, 1503 );
+  tomestoneCountReward = exdData->getField< uint8_t >( row, 1504 );
+  reputationReward = exdData->getField< uint8_t >( row, 1505 );
+  placeName = exdData->getField< uint16_t >( row, 1506 );
+  journalGenre = exdData->getField< uint8_t >( row, 1507 );
+  icon = exdData->getField< uint32_t >( row, 1509 );
+  iconSpecial = exdData->getField< uint32_t >( row, 1510 );
+  eventIconType = exdData->getField< uint8_t >( row, 1513 );
+  sortKey = exdData->getField< uint16_t >( row, 1515 );
 }
 
 Sapphire::Data::QuestBattle::QuestBattle( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
 {
   auto row = exdData->m_QuestBattleDat.get_row( row_id );
   quest = exdData->getField< int32_t >( row, 0 );
+  questBattleScene = exdData->getField< uint8_t >( row, 1 );
   timeLimit = exdData->getField< uint16_t >( row, 2 );
   levelSync = exdData->getField< uint16_t >( row, 3 );
   scriptInstruction.push_back( exdData->getField< std::string >( row, 4 ) );
@@ -5536,6 +5870,7 @@ Sapphire::Data::Recipe::Recipe( uint32_t row_id, Sapphire::Data::ExdDataGenerate
   itemResult = exdData->getField< int32_t >( row, 3 );
   amountResult = exdData->getField< uint8_t >( row, 4 );
   isSecondary = exdData->getField< bool >( row, 26 );
+  materialQualityFactor = exdData->getField< uint8_t >( row, 27 );
   difficultyFactor = exdData->getField< uint16_t >( row, 28 );
   qualityFactor = exdData->getField< uint16_t >( row, 29 );
   durabilityFactor = exdData->getField< uint16_t >( row, 30 );
@@ -5559,6 +5894,7 @@ Sapphire::Data::RecipeLevelTable::RecipeLevelTable( uint32_t row_id, Sapphire::D
   classJobLevel = exdData->getField< uint8_t >( row, 0 );
   stars = exdData->getField< uint8_t >( row, 1 );
   suggestedCraftsmanship = exdData->getField< uint16_t >( row, 2 );
+  suggestedControl = exdData->getField< uint16_t >( row, 3 );
   difficulty = exdData->getField< uint16_t >( row, 4 );
   quality = exdData->getField< uint32_t >( row, 5 );
   durability = exdData->getField< uint16_t >( row, 6 );
@@ -5985,6 +6321,19 @@ Sapphire::Data::SkyIsland2RangeType::SkyIsland2RangeType( uint32_t row_id, Sapph
   type = exdData->getField< uint8_t >( row, 0 );
 }
 
+Sapphire::Data::SnipeTalk::SnipeTalk( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
+{
+  auto row = exdData->m_SnipeTalkDat.get_row( row_id );
+  name = exdData->getField< uint16_t >( row, 2 );
+  text = exdData->getField< std::string >( row, 3 );
+}
+
+Sapphire::Data::SnipeTalkName::SnipeTalkName( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
+{
+  auto row = exdData->m_SnipeTalkNameDat.get_row( row_id );
+  name = exdData->getField< std::string >( row, 0 );
+}
+
 Sapphire::Data::SpearfishingItem::SpearfishingItem( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
 {
   auto row = exdData->m_SpearfishingItemDat.get_row( row_id );
@@ -6336,6 +6685,13 @@ Sapphire::Data::SubmarineExploration::SubmarineExploration( uint32_t row_id, Sap
   expReward = exdData->getField< uint32_t >( row, 12 );
 }
 
+Sapphire::Data::SubmarineMap::SubmarineMap( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
+{
+  auto row = exdData->m_SubmarineMapDat.get_row( row_id );
+  name = exdData->getField< std::string >( row, 0 );
+  image = exdData->getField< uint32_t >( row, 1 );
+}
+
 Sapphire::Data::SubmarinePart::SubmarinePart( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
 {
   auto row = exdData->m_SubmarinePartDat.get_row( row_id );
@@ -6402,6 +6758,7 @@ Sapphire::Data::TerritoryType::TerritoryType( uint32_t row_id, Sapphire::Data::E
   placeNameZone = exdData->getField< uint16_t >( row, 4 );
   placeName = exdData->getField< uint16_t >( row, 5 );
   map = exdData->getField< uint16_t >( row, 6 );
+  loadingImage = exdData->getField< uint8_t >( row, 7 );
   territoryIntendedUse = exdData->getField< uint8_t >( row, 9 );
   weatherRate = exdData->getField< uint8_t >( row, 12 );
   placeNameRegionIcon = exdData->getField< int32_t >( row, 20 );
@@ -6673,7 +7030,7 @@ Sapphire::Data::Warp::Warp( uint32_t row_id, Sapphire::Data::ExdDataGenerated* e
 {
   auto row = exdData->m_WarpDat.get_row( row_id );
   level = exdData->getField< uint32_t >( row, 0 );
-  placeName = exdData->getField< uint16_t >( row, 1 );
+  territoryType = exdData->getField< uint16_t >( row, 1 );
   conditionSuccessEvent = exdData->getField< uint32_t >( row, 2 );
   conditionFailEvent = exdData->getField< uint32_t >( row, 3 );
   confirmEvent = exdData->getField< uint32_t >( row, 4 );
@@ -6816,6 +7173,20 @@ Sapphire::Data::WorldDCGroupType::WorldDCGroupType( uint32_t row_id, Sapphire::D
   region = exdData->getField< uint8_t >( row, 1 );
 }
 
+Sapphire::Data::YardCatalogCategory::YardCatalogCategory( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
+{
+  auto row = exdData->m_YardCatalogCategoryDat.get_row( row_id );
+  category = exdData->getField< std::string >( row, 0 );
+}
+
+Sapphire::Data::YardCatalogItemList::YardCatalogItemList( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
+{
+  auto row = exdData->m_YardCatalogItemListDat.get_row( row_id );
+  category = exdData->getField< uint16_t >( row, 0 );
+  item = exdData->getField< int32_t >( row, 1 );
+  patch = exdData->getField< uint16_t >( row, 2 );
+}
+
 Sapphire::Data::YKW::YKW( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
 {
   auto row = exdData->m_YKWDat.get_row( row_id );
@@ -6872,6 +7243,7 @@ bool Sapphire::Data::ExdDataGenerated::init( const std::string& path )
 
     m_AchievementDat = setupDatAccess( "Achievement", xiv::exd::Language::en );
     m_AchievementCategoryDat = setupDatAccess( "AchievementCategory", xiv::exd::Language::en );
+    m_AchievementHideConditionDat = setupDatAccess( "AchievementHideCondition", xiv::exd::Language::none );
     m_AchievementKindDat = setupDatAccess( "AchievementKind", xiv::exd::Language::en );
     m_ActionDat = setupDatAccess( "Action", xiv::exd::Language::en );
     m_ActionCastTimelineDat = setupDatAccess( "ActionCastTimeline", xiv::exd::Language::none );
@@ -6890,7 +7262,6 @@ bool Sapphire::Data::ExdDataGenerated::init( const std::string& path )
     m_ActivityFeedGroupCaptionsDat = setupDatAccess( "ActivityFeedGroupCaptions", xiv::exd::Language::none );
     m_ActivityFeedImagesDat = setupDatAccess( "ActivityFeedImages", xiv::exd::Language::none );
     m_AddonDat = setupDatAccess( "Addon", xiv::exd::Language::en );
-    m_AddonHudDat = setupDatAccess( "AddonHud", xiv::exd::Language::en );
     m_AdventureDat = setupDatAccess( "Adventure", xiv::exd::Language::en );
     m_AdventureExPhaseDat = setupDatAccess( "AdventureExPhase", xiv::exd::Language::none );
     m_AetherCurrentDat = setupDatAccess( "AetherCurrent", xiv::exd::Language::none );
@@ -6931,6 +7302,7 @@ bool Sapphire::Data::ExdDataGenerated::init( const std::string& path )
     m_BeastReputationRankDat = setupDatAccess( "BeastReputationRank", xiv::exd::Language::en );
     m_BeastTribeDat = setupDatAccess( "BeastTribe", xiv::exd::Language::en );
     m_BehaviorDat = setupDatAccess( "Behavior", xiv::exd::Language::none );
+    m_BenchmarkOverrideEquipmentDat = setupDatAccess( "BenchmarkOverrideEquipment", xiv::exd::Language::none );
     m_BGMDat = setupDatAccess( "BGM", xiv::exd::Language::none );
     m_BGMFadeDat = setupDatAccess( "BGMFade", xiv::exd::Language::none );
     m_BGMSituationDat = setupDatAccess( "BGMSituation", xiv::exd::Language::none );
@@ -6989,6 +7361,7 @@ bool Sapphire::Data::ExdDataGenerated::init( const std::string& path )
     m_ContentGaugeColorDat = setupDatAccess( "ContentGaugeColor", xiv::exd::Language::none );
     m_ContentMemberTypeDat = setupDatAccess( "ContentMemberType", xiv::exd::Language::none );
     m_ContentNpcTalkDat = setupDatAccess( "ContentNpcTalk", xiv::exd::Language::none );
+    m_ContentRandomSelectDat = setupDatAccess( "ContentRandomSelect", xiv::exd::Language::none );
     m_ContentRouletteDat = setupDatAccess( "ContentRoulette", xiv::exd::Language::en );
     m_ContentRouletteOpenRuleDat = setupDatAccess( "ContentRouletteOpenRule", xiv::exd::Language::none );
     m_ContentRouletteRoleBonusDat = setupDatAccess( "ContentRouletteRoleBonus", xiv::exd::Language::none );
@@ -6998,6 +7371,7 @@ bool Sapphire::Data::ExdDataGenerated::init( const std::string& path )
     m_ContentTypeDat = setupDatAccess( "ContentType", xiv::exd::Language::en );
     m_CraftActionDat = setupDatAccess( "CraftAction", xiv::exd::Language::en );
     m_CraftLeveDat = setupDatAccess( "CraftLeve", xiv::exd::Language::none );
+    m_CraftLevelDifferenceDat = setupDatAccess( "CraftLevelDifference", xiv::exd::Language::none );
     m_CraftTypeDat = setupDatAccess( "CraftType", xiv::exd::Language::en );
     m_CreditDat = setupDatAccess( "Credit", xiv::exd::Language::none );
     m_CreditBackImageDat = setupDatAccess( "CreditBackImage", xiv::exd::Language::none );
@@ -7011,6 +7385,10 @@ bool Sapphire::Data::ExdDataGenerated::init( const std::string& path )
     m_CutsceneDat = setupDatAccess( "Cutscene", xiv::exd::Language::none );
     m_CutScreenImageDat = setupDatAccess( "CutScreenImage", xiv::exd::Language::none );
     m_DailySupplyItemDat = setupDatAccess( "DailySupplyItem", xiv::exd::Language::none );
+    m_DawnContentDat = setupDatAccess( "DawnContent", xiv::exd::Language::none );
+    m_DawnGrowMemberDat = setupDatAccess( "DawnGrowMember", xiv::exd::Language::none );
+    m_DawnMemberUIParamDat = setupDatAccess( "DawnMemberUIParam", xiv::exd::Language::en );
+    m_DawnQuestMemberDat = setupDatAccess( "DawnQuestMember", xiv::exd::Language::none );
     m_DeepDungeonDat = setupDatAccess( "DeepDungeon", xiv::exd::Language::en );
     m_DeepDungeonBanDat = setupDatAccess( "DeepDungeonBan", xiv::exd::Language::none );
     m_DeepDungeonDangerDat = setupDatAccess( "DeepDungeonDanger", xiv::exd::Language::none );
@@ -7063,6 +7441,7 @@ bool Sapphire::Data::ExdDataGenerated::init( const std::string& path )
     m_ExportedSGDat = setupDatAccess( "ExportedSG", xiv::exd::Language::none );
     m_ExVersionDat = setupDatAccess( "ExVersion", xiv::exd::Language::en );
     m_FateDat = setupDatAccess( "Fate", xiv::exd::Language::en );
+    m_FateProgressUIDat = setupDatAccess( "FateProgressUI", xiv::exd::Language::none );
     m_FCActivityDat = setupDatAccess( "FCActivity", xiv::exd::Language::en );
     m_FCActivityCategoryDat = setupDatAccess( "FCActivityCategory", xiv::exd::Language::en );
     m_FCAuthorityDat = setupDatAccess( "FCAuthority", xiv::exd::Language::en );
@@ -7081,6 +7460,8 @@ bool Sapphire::Data::ExdDataGenerated::init( const std::string& path )
     m_FishParameterDat = setupDatAccess( "FishParameter", xiv::exd::Language::en );
     m_Frontline03Dat = setupDatAccess( "Frontline03", xiv::exd::Language::none );
     m_Frontline04Dat = setupDatAccess( "Frontline04", xiv::exd::Language::none );
+    m_FurnitureCatalogCategoryDat = setupDatAccess( "FurnitureCatalogCategory", xiv::exd::Language::en );
+    m_FurnitureCatalogItemListDat = setupDatAccess( "FurnitureCatalogItemList", xiv::exd::Language::none );
     m_GardeningSeedDat = setupDatAccess( "GardeningSeed", xiv::exd::Language::none );
     m_GatheringConditionDat = setupDatAccess( "GatheringCondition", xiv::exd::Language::en );
     m_GatheringExpDat = setupDatAccess( "GatheringExp", xiv::exd::Language::none );
@@ -7128,6 +7509,10 @@ bool Sapphire::Data::ExdDataGenerated::init( const std::string& path )
     m_GrandCompanyDat = setupDatAccess( "GrandCompany", xiv::exd::Language::en );
     m_GrandCompanyRankDat = setupDatAccess( "GrandCompanyRank", xiv::exd::Language::none );
     m_GuardianDeityDat = setupDatAccess( "GuardianDeity", xiv::exd::Language::en );
+    m_GuideDat = setupDatAccess( "Guide", xiv::exd::Language::none );
+    m_GuidePageDat = setupDatAccess( "GuidePage", xiv::exd::Language::none );
+    m_GuidePageStringDat = setupDatAccess( "GuidePageString", xiv::exd::Language::en );
+    m_GuideTitleDat = setupDatAccess( "GuideTitle", xiv::exd::Language::en );
     m_GuildleveAssignmentDat = setupDatAccess( "GuildleveAssignment", xiv::exd::Language::none );
     m_GuildleveAssignmentCategoryDat = setupDatAccess( "GuildleveAssignmentCategory", xiv::exd::Language::none );
     m_GuildOrderDat = setupDatAccess( "GuildOrder", xiv::exd::Language::en );
@@ -7151,6 +7536,9 @@ bool Sapphire::Data::ExdDataGenerated::init( const std::string& path )
     m_HowToDat = setupDatAccess( "HowTo", xiv::exd::Language::en );
     m_HowToCategoryDat = setupDatAccess( "HowToCategory", xiv::exd::Language::en );
     m_HowToPageDat = setupDatAccess( "HowToPage", xiv::exd::Language::en );
+    m_HugeCraftworksNpcDat = setupDatAccess( "HugeCraftworksNpc", xiv::exd::Language::en );
+    m_HugeCraftworksRankDat = setupDatAccess( "HugeCraftworksRank", xiv::exd::Language::none );
+    m_IndividualWeatherDat = setupDatAccess( "IndividualWeather", xiv::exd::Language::none );
     m_InstanceContentDat = setupDatAccess( "InstanceContent", xiv::exd::Language::en );
     m_InstanceContentBuffDat = setupDatAccess( "InstanceContentBuff", xiv::exd::Language::none );
     m_InstanceContentCSBonusDat = setupDatAccess( "InstanceContentCSBonus", xiv::exd::Language::none );
@@ -7164,6 +7552,8 @@ bool Sapphire::Data::ExdDataGenerated::init( const std::string& path )
     m_ItemSeriesDat = setupDatAccess( "ItemSeries", xiv::exd::Language::en );
     m_ItemSpecialBonusDat = setupDatAccess( "ItemSpecialBonus", xiv::exd::Language::en );
     m_ItemUICategoryDat = setupDatAccess( "ItemUICategory", xiv::exd::Language::en );
+    m_JobHudManualDat = setupDatAccess( "JobHudManual", xiv::exd::Language::none );
+    m_JobHudManualPriorityDat = setupDatAccess( "JobHudManualPriority", xiv::exd::Language::none );
     m_JournalCategoryDat = setupDatAccess( "JournalCategory", xiv::exd::Language::en );
     m_JournalGenreDat = setupDatAccess( "JournalGenre", xiv::exd::Language::en );
     m_JournalSectionDat = setupDatAccess( "JournalSection", xiv::exd::Language::en );
@@ -7192,11 +7582,16 @@ bool Sapphire::Data::ExdDataGenerated::init( const std::string& path )
     m_MasterpieceSupplyDutyDat = setupDatAccess( "MasterpieceSupplyDuty", xiv::exd::Language::none );
     m_MasterpieceSupplyMultiplierDat = setupDatAccess( "MasterpieceSupplyMultiplier", xiv::exd::Language::none );
     m_MateriaDat = setupDatAccess( "Materia", xiv::exd::Language::none );
+    m_MateriaJoinRateDat = setupDatAccess( "MateriaJoinRate", xiv::exd::Language::none );
+    m_MateriaJoinRateGatherCraftDat = setupDatAccess( "MateriaJoinRateGatherCraft", xiv::exd::Language::none );
     m_MiniGameRADat = setupDatAccess( "MiniGameRA", xiv::exd::Language::none );
     m_MinionRaceDat = setupDatAccess( "MinionRace", xiv::exd::Language::en );
     m_MinionRulesDat = setupDatAccess( "MinionRules", xiv::exd::Language::en );
     m_MinionSkillTypeDat = setupDatAccess( "MinionSkillType", xiv::exd::Language::en );
+    m_MobHuntOrderDat = setupDatAccess( "MobHuntOrder", xiv::exd::Language::none );
     m_MobHuntOrderTypeDat = setupDatAccess( "MobHuntOrderType", xiv::exd::Language::none );
+    m_MobHuntRewardDat = setupDatAccess( "MobHuntReward", xiv::exd::Language::none );
+    m_MobHuntRewardCapDat = setupDatAccess( "MobHuntRewardCap", xiv::exd::Language::none );
     m_MobHuntTargetDat = setupDatAccess( "MobHuntTarget", xiv::exd::Language::none );
     m_ModelCharaDat = setupDatAccess( "ModelChara", xiv::exd::Language::none );
     m_ModelSkeletonDat = setupDatAccess( "ModelSkeleton", xiv::exd::Language::none );
@@ -7213,10 +7608,13 @@ bool Sapphire::Data::ExdDataGenerated::init( const std::string& path )
     m_MoveVfxDat = setupDatAccess( "MoveVfx", xiv::exd::Language::none );
     m_NotebookDivisionDat = setupDatAccess( "NotebookDivision", xiv::exd::Language::en );
     m_NotebookDivisionCategoryDat = setupDatAccess( "NotebookDivisionCategory", xiv::exd::Language::en );
+    m_NotoriousMonsterDat = setupDatAccess( "NotoriousMonster", xiv::exd::Language::none );
     m_NpcEquipDat = setupDatAccess( "NpcEquip", xiv::exd::Language::none );
     m_NpcYellDat = setupDatAccess( "NpcYell", xiv::exd::Language::en );
     m_OmenDat = setupDatAccess( "Omen", xiv::exd::Language::none );
     m_OnlineStatusDat = setupDatAccess( "OnlineStatus", xiv::exd::Language::en );
+    m_OpenContentDat = setupDatAccess( "OpenContent", xiv::exd::Language::none );
+    m_OpenContentCandidateNameDat = setupDatAccess( "OpenContentCandidateName", xiv::exd::Language::en );
     m_OpeningDat = setupDatAccess( "Opening", xiv::exd::Language::none );
     m_OrchestrionDat = setupDatAccess( "Orchestrion", xiv::exd::Language::en );
     m_OrchestrionCategoryDat = setupDatAccess( "OrchestrionCategory", xiv::exd::Language::en );
@@ -7288,6 +7686,8 @@ bool Sapphire::Data::ExdDataGenerated::init( const std::string& path )
     m_SkyIsland2MissionDetailDat = setupDatAccess( "SkyIsland2MissionDetail", xiv::exd::Language::en );
     m_SkyIsland2MissionTypeDat = setupDatAccess( "SkyIsland2MissionType", xiv::exd::Language::none );
     m_SkyIsland2RangeTypeDat = setupDatAccess( "SkyIsland2RangeType", xiv::exd::Language::none );
+    m_SnipeTalkDat = setupDatAccess( "SnipeTalk", xiv::exd::Language::en );
+    m_SnipeTalkNameDat = setupDatAccess( "SnipeTalkName", xiv::exd::Language::en );
     m_SpearfishingItemDat = setupDatAccess( "SpearfishingItem", xiv::exd::Language::en );
     m_SpearfishingNotebookDat = setupDatAccess( "SpearfishingNotebook", xiv::exd::Language::none );
     m_SpearfishingRecordPageDat = setupDatAccess( "SpearfishingRecordPage", xiv::exd::Language::none );
@@ -7300,6 +7700,7 @@ bool Sapphire::Data::ExdDataGenerated::init( const std::string& path )
     m_StatusLoopVFXDat = setupDatAccess( "StatusLoopVFX", xiv::exd::Language::none );
     m_StoryDat = setupDatAccess( "Story", xiv::exd::Language::none );
     m_SubmarineExplorationDat = setupDatAccess( "SubmarineExploration", xiv::exd::Language::en );
+    m_SubmarineMapDat = setupDatAccess( "SubmarineMap", xiv::exd::Language::en );
     m_SubmarinePartDat = setupDatAccess( "SubmarinePart", xiv::exd::Language::none );
     m_SubmarineRankDat = setupDatAccess( "SubmarineRank", xiv::exd::Language::none );
     m_SwitchTalkDat = setupDatAccess( "SwitchTalk", xiv::exd::Language::none );
@@ -7346,6 +7747,8 @@ bool Sapphire::Data::ExdDataGenerated::init( const std::string& path )
     m_WeeklyLotBonusDat = setupDatAccess( "WeeklyLotBonus", xiv::exd::Language::none );
     m_WorldDat = setupDatAccess( "World", xiv::exd::Language::none );
     m_WorldDCGroupTypeDat = setupDatAccess( "WorldDCGroupType", xiv::exd::Language::none );
+    m_YardCatalogCategoryDat = setupDatAccess( "YardCatalogCategory", xiv::exd::Language::en );
+    m_YardCatalogItemListDat = setupDatAccess( "YardCatalogItemList", xiv::exd::Language::none );
     m_YKWDat = setupDatAccess( "YKW", xiv::exd::Language::en );
     m_ZoneSharedGroupDat = setupDatAccess( "ZoneSharedGroup", xiv::exd::Language::none );
 
diff --git a/src/common/Exd/ExdDataGenerated.h b/src/common/Exd/ExdDataGenerated.h
index 725fb2a7..4f837cac 100644
--- a/src/common/Exd/ExdDataGenerated.h
+++ b/src/common/Exd/ExdDataGenerated.h
@@ -20,6 +20,7 @@ class ExdDataGenerated;
 
 struct Achievement;
 struct AchievementCategory;
+struct AchievementHideCondition;
 struct AchievementKind;
 struct Action;
 struct ActionCastTimeline;
@@ -38,7 +39,6 @@ struct ActivityFeedCaptions;
 struct ActivityFeedGroupCaptions;
 struct ActivityFeedImages;
 struct Addon;
-struct AddonHud;
 struct Adventure;
 struct AdventureExPhase;
 struct AetherCurrent;
@@ -79,6 +79,7 @@ struct BeastRankBonus;
 struct BeastReputationRank;
 struct BeastTribe;
 struct Behavior;
+struct BenchmarkOverrideEquipment;
 struct BGM;
 struct BGMFade;
 struct BGMSituation;
@@ -137,6 +138,7 @@ struct ContentGauge;
 struct ContentGaugeColor;
 struct ContentMemberType;
 struct ContentNpcTalk;
+struct ContentRandomSelect;
 struct ContentRoulette;
 struct ContentRouletteOpenRule;
 struct ContentRouletteRoleBonus;
@@ -146,6 +148,7 @@ struct ContentTalkParam;
 struct ContentType;
 struct CraftAction;
 struct CraftLeve;
+struct CraftLevelDifference;
 struct CraftType;
 struct Credit;
 struct CreditBackImage;
@@ -159,6 +162,10 @@ struct CustomTalkNestHandlers;
 struct Cutscene;
 struct CutScreenImage;
 struct DailySupplyItem;
+struct DawnContent;
+struct DawnGrowMember;
+struct DawnMemberUIParam;
+struct DawnQuestMember;
 struct DeepDungeon;
 struct DeepDungeonBan;
 struct DeepDungeonDanger;
@@ -211,6 +218,7 @@ struct EventItemTimeline;
 struct ExportedSG;
 struct ExVersion;
 struct Fate;
+struct FateProgressUI;
 struct FCActivity;
 struct FCActivityCategory;
 struct FCAuthority;
@@ -229,6 +237,8 @@ struct FishingSpot;
 struct FishParameter;
 struct Frontline03;
 struct Frontline04;
+struct FurnitureCatalogCategory;
+struct FurnitureCatalogItemList;
 struct GardeningSeed;
 struct GatheringCondition;
 struct GatheringExp;
@@ -276,6 +286,10 @@ struct GoldSaucerTextData;
 struct GrandCompany;
 struct GrandCompanyRank;
 struct GuardianDeity;
+struct Guide;
+struct GuidePage;
+struct GuidePageString;
+struct GuideTitle;
 struct GuildleveAssignment;
 struct GuildleveAssignmentCategory;
 struct GuildOrder;
@@ -299,6 +313,9 @@ struct HousingYardObject;
 struct HowTo;
 struct HowToCategory;
 struct HowToPage;
+struct HugeCraftworksNpc;
+struct HugeCraftworksRank;
+struct IndividualWeather;
 struct InstanceContent;
 struct InstanceContentBuff;
 struct InstanceContentCSBonus;
@@ -312,6 +329,8 @@ struct ItemSearchCategory;
 struct ItemSeries;
 struct ItemSpecialBonus;
 struct ItemUICategory;
+struct JobHudManual;
+struct JobHudManualPriority;
 struct JournalCategory;
 struct JournalGenre;
 struct JournalSection;
@@ -340,11 +359,16 @@ struct Marker;
 struct MasterpieceSupplyDuty;
 struct MasterpieceSupplyMultiplier;
 struct Materia;
+struct MateriaJoinRate;
+struct MateriaJoinRateGatherCraft;
 struct MiniGameRA;
 struct MinionRace;
 struct MinionRules;
 struct MinionSkillType;
+struct MobHuntOrder;
 struct MobHuntOrderType;
+struct MobHuntReward;
+struct MobHuntRewardCap;
 struct MobHuntTarget;
 struct ModelChara;
 struct ModelSkeleton;
@@ -361,10 +385,13 @@ struct MoveTimeline;
 struct MoveVfx;
 struct NotebookDivision;
 struct NotebookDivisionCategory;
+struct NotoriousMonster;
 struct NpcEquip;
 struct NpcYell;
 struct Omen;
 struct OnlineStatus;
+struct OpenContent;
+struct OpenContentCandidateName;
 struct Opening;
 struct Orchestrion;
 struct OrchestrionCategory;
@@ -436,6 +463,8 @@ struct SkyIsland2Mission;
 struct SkyIsland2MissionDetail;
 struct SkyIsland2MissionType;
 struct SkyIsland2RangeType;
+struct SnipeTalk;
+struct SnipeTalkName;
 struct SpearfishingItem;
 struct SpearfishingNotebook;
 struct SpearfishingRecordPage;
@@ -448,6 +477,7 @@ struct StatusHitEffect;
 struct StatusLoopVFX;
 struct Story;
 struct SubmarineExploration;
+struct SubmarineMap;
 struct SubmarinePart;
 struct SubmarineRank;
 struct SwitchTalk;
@@ -494,6 +524,8 @@ struct WeeklyBingoText;
 struct WeeklyLotBonus;
 struct World;
 struct WorldDCGroupType;
+struct YardCatalogCategory;
+struct YardCatalogItemList;
 struct YKW;
 struct ZoneSharedGroup;
 
@@ -511,7 +543,7 @@ struct Achievement
   int32_t key;
   std::vector< int32_t > data;
   uint16_t order;
-  uint8_t initialHide;
+  uint8_t achievementHideCondition;
 
   Achievement( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
@@ -525,6 +557,15 @@ struct AchievementCategory
   AchievementCategory( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
 
+struct AchievementHideCondition
+{
+  bool hideAchievement;
+  bool hideName;
+  bool hideConditions;
+
+  AchievementHideCondition( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+};
+
 struct AchievementKind
 {
   std::string name;
@@ -542,6 +583,7 @@ struct Action
   int16_t animationEnd;
   uint16_t actionTimelineHit;
   int8_t classJob;
+  uint8_t behaviourType;
   uint8_t classJobLevel;
   bool isRoleAction;
   int8_t range;
@@ -563,6 +605,7 @@ struct Action
   uint16_t cast100ms;
   uint16_t recast100ms;
   uint8_t cooldownGroup;
+  uint8_t maxCharges;
   int8_t attackType;
   uint8_t aspect;
   uint8_t actionProcStatus;
@@ -570,7 +613,7 @@ struct Action
   uint32_t unlockLink;
   uint8_t classJobCategory;
   bool affectsPosition;
-  uint8_t omen;
+  uint16_t omen;
   bool isPvP;
   bool isPlayerAction;
 
@@ -704,15 +747,6 @@ struct Addon
   Addon( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
 
-struct AddonHud
-{
-  std::string _long;
-  std::string _short;
-  std::string function;
-
-  AddonHud( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
-};
-
 struct Adventure
 {
   int32_t level;
@@ -1131,6 +1165,36 @@ struct Behavior
   Behavior( uint32_t row_id, uint32_t subRow, Sapphire::Data::ExdDataGenerated* exdData );
 };
 
+struct BenchmarkOverrideEquipment
+{
+  uint64_t modelMainHand;
+  uint8_t dyeMainHand;
+  uint64_t modelOffHand;
+  uint8_t dyeOffHand;
+  uint32_t modelHead;
+  uint8_t dyeHead;
+  uint32_t modelBody;
+  uint8_t dyeBody;
+  uint32_t modelHands;
+  uint8_t dyeHands;
+  uint32_t modelLegs;
+  uint8_t dyeLegs;
+  uint32_t modelFeet;
+  uint8_t dyeFeet;
+  uint32_t modelEars;
+  uint8_t dyeEars;
+  uint32_t modelNeck;
+  uint8_t dyeNeck;
+  uint32_t modelWrists;
+  uint8_t dyeWrists;
+  uint32_t modelLeftRing;
+  uint8_t dyeLeftRing;
+  uint32_t modelRightRing;
+  uint8_t dyeRightRing;
+
+  BenchmarkOverrideEquipment( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+};
+
 struct BGM
 {
   std::string file;
@@ -1368,6 +1432,7 @@ struct Calendar
 
 struct CharaMakeCustomize
 {
+  uint8_t featureID;
   uint32_t icon;
   uint16_t data;
   bool isPurchasable;
@@ -1481,6 +1546,7 @@ struct ClassJob
   std::string abbreviation;
   uint8_t classJobCategory;
   int8_t expArrayIndex;
+  uint8_t jobIndex;
   uint16_t modifierHitPoints;
   uint16_t modifierManaPoints;
   uint16_t modifierStrength;
@@ -1498,6 +1564,7 @@ struct ClassJob
   uint16_t limitBreak1;
   uint16_t limitBreak2;
   uint16_t limitBreak3;
+  uint8_t uIPriority;
   uint32_t itemSoulCrystal;
   uint32_t unlockQuest;
   uint32_t relicQuest;
@@ -1505,6 +1572,7 @@ struct ClassJob
   uint8_t startingLevel;
   uint8_t partyBonus;
   bool isLimitedJob;
+  bool canQueueForDuty;
 
   ClassJob( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
@@ -1548,6 +1616,9 @@ struct ClassJobCategory
   bool aST;
   bool sAM;
   bool rDM;
+  bool bLU;
+  bool gNB;
+  bool dNC;
 
   ClassJobCategory( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
@@ -1737,6 +1808,7 @@ struct ContentFinderCondition
   uint8_t classJobLevelSync;
   uint16_t itemLevelRequired;
   uint16_t itemLevelSync;
+  bool allowUndersized;
   bool allowReplacement;
   bool highEndDuty;
   bool dutyRecorderAllowed;
@@ -1804,6 +1876,13 @@ struct ContentNpcTalk
   ContentNpcTalk( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
 
+struct ContentRandomSelect
+{
+  uint16_t name;
+
+  ContentRandomSelect( uint32_t row_id, uint32_t subRow, Sapphire::Data::ExdDataGenerated* exdData );
+};
+
 struct ContentRoulette
 {
   std::string name;
@@ -1919,6 +1998,15 @@ struct CraftLeve
   CraftLeve( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
 
+struct CraftLevelDifference
+{
+  int16_t difference;
+  int16_t progressFactor;
+  int16_t qualityFactor;
+
+  CraftLevelDifference( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+};
+
 struct CraftType
 {
   std::string name;
@@ -2028,6 +2116,47 @@ struct DailySupplyItem
   DailySupplyItem( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
 
+struct DawnContent
+{
+  uint32_t content;
+  uint32_t exp;
+
+  DawnContent( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+};
+
+struct DawnGrowMember
+{
+  uint32_t member;
+  uint32_t imageName;
+  uint32_t bigImageOld;
+  uint32_t bigImageNew;
+  uint32_t smallImageOld;
+  uint32_t smallImageNew;
+  uint8_t _class;
+
+  DawnGrowMember( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+};
+
+struct DawnMemberUIParam
+{
+  std::string classSingular;
+  uint32_t voiceLine;
+  std::string classPlural;
+
+  DawnMemberUIParam( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+};
+
+struct DawnQuestMember
+{
+  uint32_t member;
+  uint32_t imageName;
+  uint32_t bigImageOld;
+  uint32_t bigImageNew;
+  uint8_t _class;
+
+  DawnQuestMember( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+};
+
 struct DeepDungeon
 {
   std::string name;
@@ -2165,23 +2294,23 @@ struct DeliveryQuest
 
 struct DescriptionPage
 {
-  uint32_t text1;
+  uint16_t text1;
   uint32_t image1;
-  uint32_t text2;
+  uint16_t text2;
   uint32_t image2;
-  uint32_t text3;
+  uint16_t text3;
   uint32_t image3;
-  uint32_t text4;
+  uint16_t text4;
   uint32_t image4;
-  uint32_t text5;
+  uint16_t text5;
   uint32_t image5;
-  uint32_t text6;
+  uint16_t text6;
   uint32_t image6;
-  uint32_t text7;
+  uint16_t text7;
   uint32_t image7;
-  uint32_t text8;
+  uint16_t text8;
   uint32_t image8;
-  uint32_t text9;
+  uint16_t text9;
   uint32_t image9;
 
   DescriptionPage( uint32_t row_id, uint32_t subRow, Sapphire::Data::ExdDataGenerated* exdData );
@@ -2612,6 +2741,17 @@ struct Fate
   Fate( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
 
+struct FateProgressUI
+{
+  int32_t location;
+  int32_t achievement;
+  uint8_t reqFatesToRank2;
+  uint8_t reqFatesToRank3;
+  uint8_t displayOrder;
+
+  FateProgressUI( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+};
+
 struct FCActivity
 {
   std::string text;
@@ -2775,6 +2915,22 @@ struct Frontline04
   Frontline04( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
 
+struct FurnitureCatalogCategory
+{
+  std::string category;
+
+  FurnitureCatalogCategory( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+};
+
+struct FurnitureCatalogItemList
+{
+  uint16_t category;
+  int32_t item;
+  uint16_t patch;
+
+  FurnitureCatalogItemList( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+};
+
 struct GardeningSeed
 {
   uint32_t item;
@@ -2792,7 +2948,7 @@ struct GatheringCondition
 
 struct GatheringExp
 {
-  uint16_t exp;
+  int32_t exp;
 
   GatheringExp( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
@@ -3223,6 +3379,36 @@ struct GuardianDeity
   GuardianDeity( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
 
+struct Guide
+{
+  uint16_t guideTitle;
+  uint16_t guidePage;
+
+  Guide( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+};
+
+struct GuidePage
+{
+  uint8_t key;
+  uint32_t output;
+
+  GuidePage( uint32_t row_id, uint32_t subRow, Sapphire::Data::ExdDataGenerated* exdData );
+};
+
+struct GuidePageString
+{
+  std::string string;
+
+  GuidePageString( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+};
+
+struct GuideTitle
+{
+  std::string title;
+
+  GuideTitle( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+};
+
 struct GuildleveAssignment
 {
   uint32_t assignmentTalk;
@@ -3444,6 +3630,37 @@ struct HowToPage
   HowToPage( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
 
+struct HugeCraftworksNpc
+{
+  uint32_t eNpcResident;
+  uint16_t classJobCategory;
+  std::vector< uint32_t > itemRequested;
+  std::vector< uint8_t > qtyRequested;
+  std::vector< uint32_t > itemReward;
+  std::vector< uint8_t > qtyItemReward;
+  std::vector< uint32_t > itemUnkown;
+  std::vector< uint8_t > qtyItemUnkown;
+  std::string transient;
+
+  HugeCraftworksNpc( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+};
+
+struct HugeCraftworksRank
+{
+  uint8_t crafterLevel;
+  uint32_t expRewardPerItem;
+
+  HugeCraftworksRank( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+};
+
+struct IndividualWeather
+{
+  std::vector< uint8_t > weather;
+  std::vector< uint32_t > quest;
+
+  IndividualWeather( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+};
+
 struct InstanceContent
 {
   uint8_t instanceContentType;
@@ -3706,6 +3923,21 @@ struct ItemUICategory
   ItemUICategory( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
 
+struct JobHudManual
+{
+  uint32_t action;
+  uint16_t guide;
+
+  JobHudManual( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+};
+
+struct JobHudManualPriority
+{
+  std::vector< uint8_t > jobHudManual;
+
+  JobHudManualPriority( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+};
+
 struct JournalCategory
 {
   std::string name;
@@ -3975,6 +4207,22 @@ struct Materia
   Materia( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
 
+struct MateriaJoinRate
+{
+  std::vector< float > NQOvermeldSlot;
+  std::vector< float > HQOvermeldSlot;
+
+  MateriaJoinRate( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+};
+
+struct MateriaJoinRateGatherCraft
+{
+  std::vector< float > NQOvermeldSlot;
+  std::vector< float > HQOvermeldSlot;
+
+  MateriaJoinRateGatherCraft( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+};
+
 struct MiniGameRA
 {
   int32_t icon;
@@ -4005,14 +4253,41 @@ struct MinionSkillType
   MinionSkillType( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
 
+struct MobHuntOrder
+{
+  uint16_t target;
+  uint8_t stars;
+  uint8_t mobHuntReward;
+
+  MobHuntOrder( uint32_t row_id, uint32_t subRow, Sapphire::Data::ExdDataGenerated* exdData );
+};
+
 struct MobHuntOrderType
 {
   uint32_t quest;
   uint32_t eventItem;
+  uint16_t orderStart;
+  uint8_t orderAmount;
 
   MobHuntOrderType( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
 
+struct MobHuntReward
+{
+  uint32_t expReward;
+  uint16_t gilReward;
+  uint16_t currencyReward;
+
+  MobHuntReward( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+};
+
+struct MobHuntRewardCap
+{
+  uint32_t expCap;
+
+  MobHuntRewardCap( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+};
+
 struct MobHuntTarget
 {
   uint16_t name;
@@ -4100,6 +4375,22 @@ struct MountAction
 
 struct MountCustomize
 {
+  uint16_t hyurMaleScale;
+  uint16_t hyurFemaleScale;
+  uint16_t elezenMaleScale;
+  uint16_t elezenFemaleScale;
+  uint16_t lalaMaleScale;
+  uint16_t lalaFemaleScale;
+  uint16_t miqoMaleScale;
+  uint16_t miqoFemaleScale;
+  uint16_t roeMaleScale;
+  uint16_t roeFemaleScale;
+  uint16_t auRaMaleScale;
+  uint16_t auRaFemaleScale;
+  uint16_t hrothgarMaleScale;
+  uint16_t hrothgarFemaleScale;
+  uint16_t vieraMaleScale;
+  uint16_t vieraFemaleScale;
   uint8_t hyurMaleCameraHeight;
   uint8_t hyurFemaleCameraHeight;
   uint8_t elezenMaleCameraHeight;
@@ -4112,6 +4403,10 @@ struct MountCustomize
   uint8_t roeFemaleCameraHeight;
   uint8_t auRaMaleCameraHeight;
   uint8_t auRaFemaleCameraHeight;
+  uint8_t hrothgarMaleCameraHeight;
+  uint8_t hrothgarRoeFemaleCameraHeight;
+  uint8_t vieraMaleCameraHeight;
+  uint8_t vieraFemaleCameraHeight;
 
   MountCustomize( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
@@ -4178,6 +4473,15 @@ struct NotebookDivisionCategory
   NotebookDivisionCategory( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
 
+struct NotoriousMonster
+{
+  int32_t bNpcBase;
+  uint8_t rank;
+  uint32_t bNpcName;
+
+  NotoriousMonster( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+};
+
 struct NpcEquip
 {
   uint64_t modelMainHand;
@@ -4232,6 +4536,21 @@ struct OnlineStatus
   OnlineStatus( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
 
+struct OpenContent
+{
+  std::vector< uint16_t > content;
+  std::vector< uint32_t > candidateName;
+
+  OpenContent( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+};
+
+struct OpenContentCandidateName
+{
+  std::string name;
+
+  OpenContentCandidateName( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+};
+
 struct Opening
 {
   std::string name;
@@ -4282,6 +4601,7 @@ struct ParamGrow
   uint16_t hpModifier;
   int32_t huntingLogExpReward;
   uint16_t itemLevelSync;
+  uint16_t craftingLevel;
 
   ParamGrow( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
@@ -4486,7 +4806,7 @@ struct Quest
   bool isHouseRequired;
   uint8_t deliveryQuest;
   uint32_t issuerStart;
-  uint16_t behavior;
+  uint32_t behavior;
   uint32_t targetEnd;
   bool isRepeatable;
   uint8_t repeatIntervalType;
@@ -4539,6 +4859,7 @@ struct Quest
 struct QuestBattle
 {
   int32_t quest;
+  uint8_t questBattleScene;
   uint16_t timeLimit;
   uint16_t levelSync;
   std::vector< std::string > scriptInstruction;
@@ -4680,6 +5001,7 @@ struct Recipe
   int32_t itemResult;
   uint8_t amountResult;
   bool isSecondary;
+  uint8_t materialQualityFactor;
   uint16_t difficultyFactor;
   uint16_t qualityFactor;
   uint16_t durabilityFactor;
@@ -4704,6 +5026,7 @@ struct RecipeLevelTable
   uint8_t classJobLevel;
   uint8_t stars;
   uint16_t suggestedCraftsmanship;
+  uint16_t suggestedControl;
   uint16_t difficulty;
   uint32_t quality;
   uint16_t durability;
@@ -4985,6 +5308,21 @@ struct SkyIsland2RangeType
   SkyIsland2RangeType( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
 
+struct SnipeTalk
+{
+  uint16_t name;
+  std::string text;
+
+  SnipeTalk( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+};
+
+struct SnipeTalkName
+{
+  std::string name;
+
+  SnipeTalkName( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+};
+
 struct SpearfishingItem
 {
   std::string description;
@@ -5112,6 +5450,14 @@ struct SubmarineExploration
   SubmarineExploration( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
 
+struct SubmarineMap
+{
+  std::string name;
+  uint32_t image;
+
+  SubmarineMap( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+};
+
 struct SubmarinePart
 {
   uint8_t slot;
@@ -5151,6 +5497,7 @@ struct TerritoryType
   uint16_t placeNameZone;
   uint16_t placeName;
   uint16_t map;
+  uint8_t loadingImage;
   uint8_t territoryIntendedUse;
   uint8_t weatherRate;
   int32_t placeNameRegionIcon;
@@ -5432,7 +5779,7 @@ struct VFX
 struct Warp
 {
   uint32_t level;
-  uint16_t placeName;
+  uint16_t territoryType;
   uint32_t conditionSuccessEvent;
   uint32_t conditionFailEvent;
   uint32_t confirmEvent;
@@ -5551,6 +5898,22 @@ struct WorldDCGroupType
   WorldDCGroupType( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
 
+struct YardCatalogCategory
+{
+  std::string category;
+
+  YardCatalogCategory( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+};
+
+struct YardCatalogItemList
+{
+  uint16_t category;
+  int32_t item;
+  uint16_t patch;
+
+  YardCatalogItemList( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+};
+
 struct YKW
 {
   uint32_t item;
@@ -5626,6 +5989,7 @@ struct ZoneSharedGroup
 
      xiv::exd::Exd m_AchievementDat;
      xiv::exd::Exd m_AchievementCategoryDat;
+     xiv::exd::Exd m_AchievementHideConditionDat;
      xiv::exd::Exd m_AchievementKindDat;
      xiv::exd::Exd m_ActionDat;
      xiv::exd::Exd m_ActionCastTimelineDat;
@@ -5644,7 +6008,6 @@ struct ZoneSharedGroup
      xiv::exd::Exd m_ActivityFeedGroupCaptionsDat;
      xiv::exd::Exd m_ActivityFeedImagesDat;
      xiv::exd::Exd m_AddonDat;
-     xiv::exd::Exd m_AddonHudDat;
      xiv::exd::Exd m_AdventureDat;
      xiv::exd::Exd m_AdventureExPhaseDat;
      xiv::exd::Exd m_AetherCurrentDat;
@@ -5685,6 +6048,7 @@ struct ZoneSharedGroup
      xiv::exd::Exd m_BeastReputationRankDat;
      xiv::exd::Exd m_BeastTribeDat;
      xiv::exd::Exd m_BehaviorDat;
+     xiv::exd::Exd m_BenchmarkOverrideEquipmentDat;
      xiv::exd::Exd m_BGMDat;
      xiv::exd::Exd m_BGMFadeDat;
      xiv::exd::Exd m_BGMSituationDat;
@@ -5743,6 +6107,7 @@ struct ZoneSharedGroup
      xiv::exd::Exd m_ContentGaugeColorDat;
      xiv::exd::Exd m_ContentMemberTypeDat;
      xiv::exd::Exd m_ContentNpcTalkDat;
+     xiv::exd::Exd m_ContentRandomSelectDat;
      xiv::exd::Exd m_ContentRouletteDat;
      xiv::exd::Exd m_ContentRouletteOpenRuleDat;
      xiv::exd::Exd m_ContentRouletteRoleBonusDat;
@@ -5752,6 +6117,7 @@ struct ZoneSharedGroup
      xiv::exd::Exd m_ContentTypeDat;
      xiv::exd::Exd m_CraftActionDat;
      xiv::exd::Exd m_CraftLeveDat;
+     xiv::exd::Exd m_CraftLevelDifferenceDat;
      xiv::exd::Exd m_CraftTypeDat;
      xiv::exd::Exd m_CreditDat;
      xiv::exd::Exd m_CreditBackImageDat;
@@ -5765,6 +6131,10 @@ struct ZoneSharedGroup
      xiv::exd::Exd m_CutsceneDat;
      xiv::exd::Exd m_CutScreenImageDat;
      xiv::exd::Exd m_DailySupplyItemDat;
+     xiv::exd::Exd m_DawnContentDat;
+     xiv::exd::Exd m_DawnGrowMemberDat;
+     xiv::exd::Exd m_DawnMemberUIParamDat;
+     xiv::exd::Exd m_DawnQuestMemberDat;
      xiv::exd::Exd m_DeepDungeonDat;
      xiv::exd::Exd m_DeepDungeonBanDat;
      xiv::exd::Exd m_DeepDungeonDangerDat;
@@ -5817,6 +6187,7 @@ struct ZoneSharedGroup
      xiv::exd::Exd m_ExportedSGDat;
      xiv::exd::Exd m_ExVersionDat;
      xiv::exd::Exd m_FateDat;
+     xiv::exd::Exd m_FateProgressUIDat;
      xiv::exd::Exd m_FCActivityDat;
      xiv::exd::Exd m_FCActivityCategoryDat;
      xiv::exd::Exd m_FCAuthorityDat;
@@ -5835,6 +6206,8 @@ struct ZoneSharedGroup
      xiv::exd::Exd m_FishParameterDat;
      xiv::exd::Exd m_Frontline03Dat;
      xiv::exd::Exd m_Frontline04Dat;
+     xiv::exd::Exd m_FurnitureCatalogCategoryDat;
+     xiv::exd::Exd m_FurnitureCatalogItemListDat;
      xiv::exd::Exd m_GardeningSeedDat;
      xiv::exd::Exd m_GatheringConditionDat;
      xiv::exd::Exd m_GatheringExpDat;
@@ -5882,6 +6255,10 @@ struct ZoneSharedGroup
      xiv::exd::Exd m_GrandCompanyDat;
      xiv::exd::Exd m_GrandCompanyRankDat;
      xiv::exd::Exd m_GuardianDeityDat;
+     xiv::exd::Exd m_GuideDat;
+     xiv::exd::Exd m_GuidePageDat;
+     xiv::exd::Exd m_GuidePageStringDat;
+     xiv::exd::Exd m_GuideTitleDat;
      xiv::exd::Exd m_GuildleveAssignmentDat;
      xiv::exd::Exd m_GuildleveAssignmentCategoryDat;
      xiv::exd::Exd m_GuildOrderDat;
@@ -5905,6 +6282,9 @@ struct ZoneSharedGroup
      xiv::exd::Exd m_HowToDat;
      xiv::exd::Exd m_HowToCategoryDat;
      xiv::exd::Exd m_HowToPageDat;
+     xiv::exd::Exd m_HugeCraftworksNpcDat;
+     xiv::exd::Exd m_HugeCraftworksRankDat;
+     xiv::exd::Exd m_IndividualWeatherDat;
      xiv::exd::Exd m_InstanceContentDat;
      xiv::exd::Exd m_InstanceContentBuffDat;
      xiv::exd::Exd m_InstanceContentCSBonusDat;
@@ -5918,6 +6298,8 @@ struct ZoneSharedGroup
      xiv::exd::Exd m_ItemSeriesDat;
      xiv::exd::Exd m_ItemSpecialBonusDat;
      xiv::exd::Exd m_ItemUICategoryDat;
+     xiv::exd::Exd m_JobHudManualDat;
+     xiv::exd::Exd m_JobHudManualPriorityDat;
      xiv::exd::Exd m_JournalCategoryDat;
      xiv::exd::Exd m_JournalGenreDat;
      xiv::exd::Exd m_JournalSectionDat;
@@ -5946,11 +6328,16 @@ struct ZoneSharedGroup
      xiv::exd::Exd m_MasterpieceSupplyDutyDat;
      xiv::exd::Exd m_MasterpieceSupplyMultiplierDat;
      xiv::exd::Exd m_MateriaDat;
+     xiv::exd::Exd m_MateriaJoinRateDat;
+     xiv::exd::Exd m_MateriaJoinRateGatherCraftDat;
      xiv::exd::Exd m_MiniGameRADat;
      xiv::exd::Exd m_MinionRaceDat;
      xiv::exd::Exd m_MinionRulesDat;
      xiv::exd::Exd m_MinionSkillTypeDat;
+     xiv::exd::Exd m_MobHuntOrderDat;
      xiv::exd::Exd m_MobHuntOrderTypeDat;
+     xiv::exd::Exd m_MobHuntRewardDat;
+     xiv::exd::Exd m_MobHuntRewardCapDat;
      xiv::exd::Exd m_MobHuntTargetDat;
      xiv::exd::Exd m_ModelCharaDat;
      xiv::exd::Exd m_ModelSkeletonDat;
@@ -5967,10 +6354,13 @@ struct ZoneSharedGroup
      xiv::exd::Exd m_MoveVfxDat;
      xiv::exd::Exd m_NotebookDivisionDat;
      xiv::exd::Exd m_NotebookDivisionCategoryDat;
+     xiv::exd::Exd m_NotoriousMonsterDat;
      xiv::exd::Exd m_NpcEquipDat;
      xiv::exd::Exd m_NpcYellDat;
      xiv::exd::Exd m_OmenDat;
      xiv::exd::Exd m_OnlineStatusDat;
+     xiv::exd::Exd m_OpenContentDat;
+     xiv::exd::Exd m_OpenContentCandidateNameDat;
      xiv::exd::Exd m_OpeningDat;
      xiv::exd::Exd m_OrchestrionDat;
      xiv::exd::Exd m_OrchestrionCategoryDat;
@@ -6042,6 +6432,8 @@ struct ZoneSharedGroup
      xiv::exd::Exd m_SkyIsland2MissionDetailDat;
      xiv::exd::Exd m_SkyIsland2MissionTypeDat;
      xiv::exd::Exd m_SkyIsland2RangeTypeDat;
+     xiv::exd::Exd m_SnipeTalkDat;
+     xiv::exd::Exd m_SnipeTalkNameDat;
      xiv::exd::Exd m_SpearfishingItemDat;
      xiv::exd::Exd m_SpearfishingNotebookDat;
      xiv::exd::Exd m_SpearfishingRecordPageDat;
@@ -6054,6 +6446,7 @@ struct ZoneSharedGroup
      xiv::exd::Exd m_StatusLoopVFXDat;
      xiv::exd::Exd m_StoryDat;
      xiv::exd::Exd m_SubmarineExplorationDat;
+     xiv::exd::Exd m_SubmarineMapDat;
      xiv::exd::Exd m_SubmarinePartDat;
      xiv::exd::Exd m_SubmarineRankDat;
      xiv::exd::Exd m_SwitchTalkDat;
@@ -6100,12 +6493,15 @@ struct ZoneSharedGroup
      xiv::exd::Exd m_WeeklyLotBonusDat;
      xiv::exd::Exd m_WorldDat;
      xiv::exd::Exd m_WorldDCGroupTypeDat;
+     xiv::exd::Exd m_YardCatalogCategoryDat;
+     xiv::exd::Exd m_YardCatalogItemListDat;
      xiv::exd::Exd m_YKWDat;
      xiv::exd::Exd m_ZoneSharedGroupDat;
 
 
      using AchievementPtr = std::shared_ptr< Achievement >;
      using AchievementCategoryPtr = std::shared_ptr< AchievementCategory >;
+     using AchievementHideConditionPtr = std::shared_ptr< AchievementHideCondition >;
      using AchievementKindPtr = std::shared_ptr< AchievementKind >;
      using ActionPtr = std::shared_ptr< Action >;
      using ActionCastTimelinePtr = std::shared_ptr< ActionCastTimeline >;
@@ -6124,7 +6520,6 @@ struct ZoneSharedGroup
      using ActivityFeedGroupCaptionsPtr = std::shared_ptr< ActivityFeedGroupCaptions >;
      using ActivityFeedImagesPtr = std::shared_ptr< ActivityFeedImages >;
      using AddonPtr = std::shared_ptr< Addon >;
-     using AddonHudPtr = std::shared_ptr< AddonHud >;
      using AdventurePtr = std::shared_ptr< Adventure >;
      using AdventureExPhasePtr = std::shared_ptr< AdventureExPhase >;
      using AetherCurrentPtr = std::shared_ptr< AetherCurrent >;
@@ -6165,6 +6560,7 @@ struct ZoneSharedGroup
      using BeastReputationRankPtr = std::shared_ptr< BeastReputationRank >;
      using BeastTribePtr = std::shared_ptr< BeastTribe >;
      using BehaviorPtr = std::shared_ptr< Behavior >;
+     using BenchmarkOverrideEquipmentPtr = std::shared_ptr< BenchmarkOverrideEquipment >;
      using BGMPtr = std::shared_ptr< BGM >;
      using BGMFadePtr = std::shared_ptr< BGMFade >;
      using BGMSituationPtr = std::shared_ptr< BGMSituation >;
@@ -6223,6 +6619,7 @@ struct ZoneSharedGroup
      using ContentGaugeColorPtr = std::shared_ptr< ContentGaugeColor >;
      using ContentMemberTypePtr = std::shared_ptr< ContentMemberType >;
      using ContentNpcTalkPtr = std::shared_ptr< ContentNpcTalk >;
+     using ContentRandomSelectPtr = std::shared_ptr< ContentRandomSelect >;
      using ContentRoulettePtr = std::shared_ptr< ContentRoulette >;
      using ContentRouletteOpenRulePtr = std::shared_ptr< ContentRouletteOpenRule >;
      using ContentRouletteRoleBonusPtr = std::shared_ptr< ContentRouletteRoleBonus >;
@@ -6232,6 +6629,7 @@ struct ZoneSharedGroup
      using ContentTypePtr = std::shared_ptr< ContentType >;
      using CraftActionPtr = std::shared_ptr< CraftAction >;
      using CraftLevePtr = std::shared_ptr< CraftLeve >;
+     using CraftLevelDifferencePtr = std::shared_ptr< CraftLevelDifference >;
      using CraftTypePtr = std::shared_ptr< CraftType >;
      using CreditPtr = std::shared_ptr< Credit >;
      using CreditBackImagePtr = std::shared_ptr< CreditBackImage >;
@@ -6245,6 +6643,10 @@ struct ZoneSharedGroup
      using CutscenePtr = std::shared_ptr< Cutscene >;
      using CutScreenImagePtr = std::shared_ptr< CutScreenImage >;
      using DailySupplyItemPtr = std::shared_ptr< DailySupplyItem >;
+     using DawnContentPtr = std::shared_ptr< DawnContent >;
+     using DawnGrowMemberPtr = std::shared_ptr< DawnGrowMember >;
+     using DawnMemberUIParamPtr = std::shared_ptr< DawnMemberUIParam >;
+     using DawnQuestMemberPtr = std::shared_ptr< DawnQuestMember >;
      using DeepDungeonPtr = std::shared_ptr< DeepDungeon >;
      using DeepDungeonBanPtr = std::shared_ptr< DeepDungeonBan >;
      using DeepDungeonDangerPtr = std::shared_ptr< DeepDungeonDanger >;
@@ -6297,6 +6699,7 @@ struct ZoneSharedGroup
      using ExportedSGPtr = std::shared_ptr< ExportedSG >;
      using ExVersionPtr = std::shared_ptr< ExVersion >;
      using FatePtr = std::shared_ptr< Fate >;
+     using FateProgressUIPtr = std::shared_ptr< FateProgressUI >;
      using FCActivityPtr = std::shared_ptr< FCActivity >;
      using FCActivityCategoryPtr = std::shared_ptr< FCActivityCategory >;
      using FCAuthorityPtr = std::shared_ptr< FCAuthority >;
@@ -6315,6 +6718,8 @@ struct ZoneSharedGroup
      using FishParameterPtr = std::shared_ptr< FishParameter >;
      using Frontline03Ptr = std::shared_ptr< Frontline03 >;
      using Frontline04Ptr = std::shared_ptr< Frontline04 >;
+     using FurnitureCatalogCategoryPtr = std::shared_ptr< FurnitureCatalogCategory >;
+     using FurnitureCatalogItemListPtr = std::shared_ptr< FurnitureCatalogItemList >;
      using GardeningSeedPtr = std::shared_ptr< GardeningSeed >;
      using GatheringConditionPtr = std::shared_ptr< GatheringCondition >;
      using GatheringExpPtr = std::shared_ptr< GatheringExp >;
@@ -6362,6 +6767,10 @@ struct ZoneSharedGroup
      using GrandCompanyPtr = std::shared_ptr< GrandCompany >;
      using GrandCompanyRankPtr = std::shared_ptr< GrandCompanyRank >;
      using GuardianDeityPtr = std::shared_ptr< GuardianDeity >;
+     using GuidePtr = std::shared_ptr< Guide >;
+     using GuidePagePtr = std::shared_ptr< GuidePage >;
+     using GuidePageStringPtr = std::shared_ptr< GuidePageString >;
+     using GuideTitlePtr = std::shared_ptr< GuideTitle >;
      using GuildleveAssignmentPtr = std::shared_ptr< GuildleveAssignment >;
      using GuildleveAssignmentCategoryPtr = std::shared_ptr< GuildleveAssignmentCategory >;
      using GuildOrderPtr = std::shared_ptr< GuildOrder >;
@@ -6385,6 +6794,9 @@ struct ZoneSharedGroup
      using HowToPtr = std::shared_ptr< HowTo >;
      using HowToCategoryPtr = std::shared_ptr< HowToCategory >;
      using HowToPagePtr = std::shared_ptr< HowToPage >;
+     using HugeCraftworksNpcPtr = std::shared_ptr< HugeCraftworksNpc >;
+     using HugeCraftworksRankPtr = std::shared_ptr< HugeCraftworksRank >;
+     using IndividualWeatherPtr = std::shared_ptr< IndividualWeather >;
      using InstanceContentPtr = std::shared_ptr< InstanceContent >;
      using InstanceContentBuffPtr = std::shared_ptr< InstanceContentBuff >;
      using InstanceContentCSBonusPtr = std::shared_ptr< InstanceContentCSBonus >;
@@ -6398,6 +6810,8 @@ struct ZoneSharedGroup
      using ItemSeriesPtr = std::shared_ptr< ItemSeries >;
      using ItemSpecialBonusPtr = std::shared_ptr< ItemSpecialBonus >;
      using ItemUICategoryPtr = std::shared_ptr< ItemUICategory >;
+     using JobHudManualPtr = std::shared_ptr< JobHudManual >;
+     using JobHudManualPriorityPtr = std::shared_ptr< JobHudManualPriority >;
      using JournalCategoryPtr = std::shared_ptr< JournalCategory >;
      using JournalGenrePtr = std::shared_ptr< JournalGenre >;
      using JournalSectionPtr = std::shared_ptr< JournalSection >;
@@ -6426,11 +6840,16 @@ struct ZoneSharedGroup
      using MasterpieceSupplyDutyPtr = std::shared_ptr< MasterpieceSupplyDuty >;
      using MasterpieceSupplyMultiplierPtr = std::shared_ptr< MasterpieceSupplyMultiplier >;
      using MateriaPtr = std::shared_ptr< Materia >;
+     using MateriaJoinRatePtr = std::shared_ptr< MateriaJoinRate >;
+     using MateriaJoinRateGatherCraftPtr = std::shared_ptr< MateriaJoinRateGatherCraft >;
      using MiniGameRAPtr = std::shared_ptr< MiniGameRA >;
      using MinionRacePtr = std::shared_ptr< MinionRace >;
      using MinionRulesPtr = std::shared_ptr< MinionRules >;
      using MinionSkillTypePtr = std::shared_ptr< MinionSkillType >;
+     using MobHuntOrderPtr = std::shared_ptr< MobHuntOrder >;
      using MobHuntOrderTypePtr = std::shared_ptr< MobHuntOrderType >;
+     using MobHuntRewardPtr = std::shared_ptr< MobHuntReward >;
+     using MobHuntRewardCapPtr = std::shared_ptr< MobHuntRewardCap >;
      using MobHuntTargetPtr = std::shared_ptr< MobHuntTarget >;
      using ModelCharaPtr = std::shared_ptr< ModelChara >;
      using ModelSkeletonPtr = std::shared_ptr< ModelSkeleton >;
@@ -6447,10 +6866,13 @@ struct ZoneSharedGroup
      using MoveVfxPtr = std::shared_ptr< MoveVfx >;
      using NotebookDivisionPtr = std::shared_ptr< NotebookDivision >;
      using NotebookDivisionCategoryPtr = std::shared_ptr< NotebookDivisionCategory >;
+     using NotoriousMonsterPtr = std::shared_ptr< NotoriousMonster >;
      using NpcEquipPtr = std::shared_ptr< NpcEquip >;
      using NpcYellPtr = std::shared_ptr< NpcYell >;
      using OmenPtr = std::shared_ptr< Omen >;
      using OnlineStatusPtr = std::shared_ptr< OnlineStatus >;
+     using OpenContentPtr = std::shared_ptr< OpenContent >;
+     using OpenContentCandidateNamePtr = std::shared_ptr< OpenContentCandidateName >;
      using OpeningPtr = std::shared_ptr< Opening >;
      using OrchestrionPtr = std::shared_ptr< Orchestrion >;
      using OrchestrionCategoryPtr = std::shared_ptr< OrchestrionCategory >;
@@ -6522,6 +6944,8 @@ struct ZoneSharedGroup
      using SkyIsland2MissionDetailPtr = std::shared_ptr< SkyIsland2MissionDetail >;
      using SkyIsland2MissionTypePtr = std::shared_ptr< SkyIsland2MissionType >;
      using SkyIsland2RangeTypePtr = std::shared_ptr< SkyIsland2RangeType >;
+     using SnipeTalkPtr = std::shared_ptr< SnipeTalk >;
+     using SnipeTalkNamePtr = std::shared_ptr< SnipeTalkName >;
      using SpearfishingItemPtr = std::shared_ptr< SpearfishingItem >;
      using SpearfishingNotebookPtr = std::shared_ptr< SpearfishingNotebook >;
      using SpearfishingRecordPagePtr = std::shared_ptr< SpearfishingRecordPage >;
@@ -6534,6 +6958,7 @@ struct ZoneSharedGroup
      using StatusLoopVFXPtr = std::shared_ptr< StatusLoopVFX >;
      using StoryPtr = std::shared_ptr< Story >;
      using SubmarineExplorationPtr = std::shared_ptr< SubmarineExploration >;
+     using SubmarineMapPtr = std::shared_ptr< SubmarineMap >;
      using SubmarinePartPtr = std::shared_ptr< SubmarinePart >;
      using SubmarineRankPtr = std::shared_ptr< SubmarineRank >;
      using SwitchTalkPtr = std::shared_ptr< SwitchTalk >;
@@ -6580,12 +7005,15 @@ struct ZoneSharedGroup
      using WeeklyLotBonusPtr = std::shared_ptr< WeeklyLotBonus >;
      using WorldPtr = std::shared_ptr< World >;
      using WorldDCGroupTypePtr = std::shared_ptr< WorldDCGroupType >;
+     using YardCatalogCategoryPtr = std::shared_ptr< YardCatalogCategory >;
+     using YardCatalogItemListPtr = std::shared_ptr< YardCatalogItemList >;
      using YKWPtr = std::shared_ptr< YKW >;
      using ZoneSharedGroupPtr = std::shared_ptr< ZoneSharedGroup >;
 
 
      std::set< uint32_t > m_AchievementIdList;
      std::set< uint32_t > m_AchievementCategoryIdList;
+     std::set< uint32_t > m_AchievementHideConditionIdList;
      std::set< uint32_t > m_AchievementKindIdList;
      std::set< uint32_t > m_ActionIdList;
      std::set< uint32_t > m_ActionCastTimelineIdList;
@@ -6604,7 +7032,6 @@ struct ZoneSharedGroup
      std::set< uint32_t > m_ActivityFeedGroupCaptionsIdList;
      std::set< uint32_t > m_ActivityFeedImagesIdList;
      std::set< uint32_t > m_AddonIdList;
-     std::set< uint32_t > m_AddonHudIdList;
      std::set< uint32_t > m_AdventureIdList;
      std::set< uint32_t > m_AdventureExPhaseIdList;
      std::set< uint32_t > m_AetherCurrentIdList;
@@ -6645,6 +7072,7 @@ struct ZoneSharedGroup
      std::set< uint32_t > m_BeastReputationRankIdList;
      std::set< uint32_t > m_BeastTribeIdList;
      std::set< uint32_t > m_BehaviorIdList;
+     std::set< uint32_t > m_BenchmarkOverrideEquipmentIdList;
      std::set< uint32_t > m_BGMIdList;
      std::set< uint32_t > m_BGMFadeIdList;
      std::set< uint32_t > m_BGMSituationIdList;
@@ -6703,6 +7131,7 @@ struct ZoneSharedGroup
      std::set< uint32_t > m_ContentGaugeColorIdList;
      std::set< uint32_t > m_ContentMemberTypeIdList;
      std::set< uint32_t > m_ContentNpcTalkIdList;
+     std::set< uint32_t > m_ContentRandomSelectIdList;
      std::set< uint32_t > m_ContentRouletteIdList;
      std::set< uint32_t > m_ContentRouletteOpenRuleIdList;
      std::set< uint32_t > m_ContentRouletteRoleBonusIdList;
@@ -6712,6 +7141,7 @@ struct ZoneSharedGroup
      std::set< uint32_t > m_ContentTypeIdList;
      std::set< uint32_t > m_CraftActionIdList;
      std::set< uint32_t > m_CraftLeveIdList;
+     std::set< uint32_t > m_CraftLevelDifferenceIdList;
      std::set< uint32_t > m_CraftTypeIdList;
      std::set< uint32_t > m_CreditIdList;
      std::set< uint32_t > m_CreditBackImageIdList;
@@ -6725,6 +7155,10 @@ struct ZoneSharedGroup
      std::set< uint32_t > m_CutsceneIdList;
      std::set< uint32_t > m_CutScreenImageIdList;
      std::set< uint32_t > m_DailySupplyItemIdList;
+     std::set< uint32_t > m_DawnContentIdList;
+     std::set< uint32_t > m_DawnGrowMemberIdList;
+     std::set< uint32_t > m_DawnMemberUIParamIdList;
+     std::set< uint32_t > m_DawnQuestMemberIdList;
      std::set< uint32_t > m_DeepDungeonIdList;
      std::set< uint32_t > m_DeepDungeonBanIdList;
      std::set< uint32_t > m_DeepDungeonDangerIdList;
@@ -6777,6 +7211,7 @@ struct ZoneSharedGroup
      std::set< uint32_t > m_ExportedSGIdList;
      std::set< uint32_t > m_ExVersionIdList;
      std::set< uint32_t > m_FateIdList;
+     std::set< uint32_t > m_FateProgressUIIdList;
      std::set< uint32_t > m_FCActivityIdList;
      std::set< uint32_t > m_FCActivityCategoryIdList;
      std::set< uint32_t > m_FCAuthorityIdList;
@@ -6795,6 +7230,8 @@ struct ZoneSharedGroup
      std::set< uint32_t > m_FishParameterIdList;
      std::set< uint32_t > m_Frontline03IdList;
      std::set< uint32_t > m_Frontline04IdList;
+     std::set< uint32_t > m_FurnitureCatalogCategoryIdList;
+     std::set< uint32_t > m_FurnitureCatalogItemListIdList;
      std::set< uint32_t > m_GardeningSeedIdList;
      std::set< uint32_t > m_GatheringConditionIdList;
      std::set< uint32_t > m_GatheringExpIdList;
@@ -6842,6 +7279,10 @@ struct ZoneSharedGroup
      std::set< uint32_t > m_GrandCompanyIdList;
      std::set< uint32_t > m_GrandCompanyRankIdList;
      std::set< uint32_t > m_GuardianDeityIdList;
+     std::set< uint32_t > m_GuideIdList;
+     std::set< uint32_t > m_GuidePageIdList;
+     std::set< uint32_t > m_GuidePageStringIdList;
+     std::set< uint32_t > m_GuideTitleIdList;
      std::set< uint32_t > m_GuildleveAssignmentIdList;
      std::set< uint32_t > m_GuildleveAssignmentCategoryIdList;
      std::set< uint32_t > m_GuildOrderIdList;
@@ -6865,6 +7306,9 @@ struct ZoneSharedGroup
      std::set< uint32_t > m_HowToIdList;
      std::set< uint32_t > m_HowToCategoryIdList;
      std::set< uint32_t > m_HowToPageIdList;
+     std::set< uint32_t > m_HugeCraftworksNpcIdList;
+     std::set< uint32_t > m_HugeCraftworksRankIdList;
+     std::set< uint32_t > m_IndividualWeatherIdList;
      std::set< uint32_t > m_InstanceContentIdList;
      std::set< uint32_t > m_InstanceContentBuffIdList;
      std::set< uint32_t > m_InstanceContentCSBonusIdList;
@@ -6878,6 +7322,8 @@ struct ZoneSharedGroup
      std::set< uint32_t > m_ItemSeriesIdList;
      std::set< uint32_t > m_ItemSpecialBonusIdList;
      std::set< uint32_t > m_ItemUICategoryIdList;
+     std::set< uint32_t > m_JobHudManualIdList;
+     std::set< uint32_t > m_JobHudManualPriorityIdList;
      std::set< uint32_t > m_JournalCategoryIdList;
      std::set< uint32_t > m_JournalGenreIdList;
      std::set< uint32_t > m_JournalSectionIdList;
@@ -6906,11 +7352,16 @@ struct ZoneSharedGroup
      std::set< uint32_t > m_MasterpieceSupplyDutyIdList;
      std::set< uint32_t > m_MasterpieceSupplyMultiplierIdList;
      std::set< uint32_t > m_MateriaIdList;
+     std::set< uint32_t > m_MateriaJoinRateIdList;
+     std::set< uint32_t > m_MateriaJoinRateGatherCraftIdList;
      std::set< uint32_t > m_MiniGameRAIdList;
      std::set< uint32_t > m_MinionRaceIdList;
      std::set< uint32_t > m_MinionRulesIdList;
      std::set< uint32_t > m_MinionSkillTypeIdList;
+     std::set< uint32_t > m_MobHuntOrderIdList;
      std::set< uint32_t > m_MobHuntOrderTypeIdList;
+     std::set< uint32_t > m_MobHuntRewardIdList;
+     std::set< uint32_t > m_MobHuntRewardCapIdList;
      std::set< uint32_t > m_MobHuntTargetIdList;
      std::set< uint32_t > m_ModelCharaIdList;
      std::set< uint32_t > m_ModelSkeletonIdList;
@@ -6927,10 +7378,13 @@ struct ZoneSharedGroup
      std::set< uint32_t > m_MoveVfxIdList;
      std::set< uint32_t > m_NotebookDivisionIdList;
      std::set< uint32_t > m_NotebookDivisionCategoryIdList;
+     std::set< uint32_t > m_NotoriousMonsterIdList;
      std::set< uint32_t > m_NpcEquipIdList;
      std::set< uint32_t > m_NpcYellIdList;
      std::set< uint32_t > m_OmenIdList;
      std::set< uint32_t > m_OnlineStatusIdList;
+     std::set< uint32_t > m_OpenContentIdList;
+     std::set< uint32_t > m_OpenContentCandidateNameIdList;
      std::set< uint32_t > m_OpeningIdList;
      std::set< uint32_t > m_OrchestrionIdList;
      std::set< uint32_t > m_OrchestrionCategoryIdList;
@@ -7002,6 +7456,8 @@ struct ZoneSharedGroup
      std::set< uint32_t > m_SkyIsland2MissionDetailIdList;
      std::set< uint32_t > m_SkyIsland2MissionTypeIdList;
      std::set< uint32_t > m_SkyIsland2RangeTypeIdList;
+     std::set< uint32_t > m_SnipeTalkIdList;
+     std::set< uint32_t > m_SnipeTalkNameIdList;
      std::set< uint32_t > m_SpearfishingItemIdList;
      std::set< uint32_t > m_SpearfishingNotebookIdList;
      std::set< uint32_t > m_SpearfishingRecordPageIdList;
@@ -7014,6 +7470,7 @@ struct ZoneSharedGroup
      std::set< uint32_t > m_StatusLoopVFXIdList;
      std::set< uint32_t > m_StoryIdList;
      std::set< uint32_t > m_SubmarineExplorationIdList;
+     std::set< uint32_t > m_SubmarineMapIdList;
      std::set< uint32_t > m_SubmarinePartIdList;
      std::set< uint32_t > m_SubmarineRankIdList;
      std::set< uint32_t > m_SwitchTalkIdList;
@@ -7060,6 +7517,8 @@ struct ZoneSharedGroup
      std::set< uint32_t > m_WeeklyLotBonusIdList;
      std::set< uint32_t > m_WorldIdList;
      std::set< uint32_t > m_WorldDCGroupTypeIdList;
+     std::set< uint32_t > m_YardCatalogCategoryIdList;
+     std::set< uint32_t > m_YardCatalogItemListIdList;
      std::set< uint32_t > m_YKWIdList;
      std::set< uint32_t > m_ZoneSharedGroupIdList;
 
@@ -7076,6 +7535,12 @@ const std::set< uint32_t >& getAchievementCategoryIdList()
       loadIdList( m_AchievementCategoryDat, m_AchievementCategoryIdList );
    return m_AchievementCategoryIdList;
 }
+const std::set< uint32_t >& getAchievementHideConditionIdList()
+{
+   if( m_AchievementHideConditionIdList.size() == 0 )
+      loadIdList( m_AchievementHideConditionDat, m_AchievementHideConditionIdList );
+   return m_AchievementHideConditionIdList;
+}
 const std::set< uint32_t >& getAchievementKindIdList()
 {
    if( m_AchievementKindIdList.size() == 0 )
@@ -7184,12 +7649,6 @@ const std::set< uint32_t >& getAddonIdList()
       loadIdList( m_AddonDat, m_AddonIdList );
    return m_AddonIdList;
 }
-const std::set< uint32_t >& getAddonHudIdList()
-{
-   if( m_AddonHudIdList.size() == 0 )
-      loadIdList( m_AddonHudDat, m_AddonHudIdList );
-   return m_AddonHudIdList;
-}
 const std::set< uint32_t >& getAdventureIdList()
 {
    if( m_AdventureIdList.size() == 0 )
@@ -7430,6 +7889,12 @@ const std::set< uint32_t >& getBehaviorIdList()
       loadIdList( m_BehaviorDat, m_BehaviorIdList );
    return m_BehaviorIdList;
 }
+const std::set< uint32_t >& getBenchmarkOverrideEquipmentIdList()
+{
+   if( m_BenchmarkOverrideEquipmentIdList.size() == 0 )
+      loadIdList( m_BenchmarkOverrideEquipmentDat, m_BenchmarkOverrideEquipmentIdList );
+   return m_BenchmarkOverrideEquipmentIdList;
+}
 const std::set< uint32_t >& getBGMIdList()
 {
    if( m_BGMIdList.size() == 0 )
@@ -7778,6 +8243,12 @@ const std::set< uint32_t >& getContentNpcTalkIdList()
       loadIdList( m_ContentNpcTalkDat, m_ContentNpcTalkIdList );
    return m_ContentNpcTalkIdList;
 }
+const std::set< uint32_t >& getContentRandomSelectIdList()
+{
+   if( m_ContentRandomSelectIdList.size() == 0 )
+      loadIdList( m_ContentRandomSelectDat, m_ContentRandomSelectIdList );
+   return m_ContentRandomSelectIdList;
+}
 const std::set< uint32_t >& getContentRouletteIdList()
 {
    if( m_ContentRouletteIdList.size() == 0 )
@@ -7832,6 +8303,12 @@ const std::set< uint32_t >& getCraftLeveIdList()
       loadIdList( m_CraftLeveDat, m_CraftLeveIdList );
    return m_CraftLeveIdList;
 }
+const std::set< uint32_t >& getCraftLevelDifferenceIdList()
+{
+   if( m_CraftLevelDifferenceIdList.size() == 0 )
+      loadIdList( m_CraftLevelDifferenceDat, m_CraftLevelDifferenceIdList );
+   return m_CraftLevelDifferenceIdList;
+}
 const std::set< uint32_t >& getCraftTypeIdList()
 {
    if( m_CraftTypeIdList.size() == 0 )
@@ -7910,6 +8387,30 @@ const std::set< uint32_t >& getDailySupplyItemIdList()
       loadIdList( m_DailySupplyItemDat, m_DailySupplyItemIdList );
    return m_DailySupplyItemIdList;
 }
+const std::set< uint32_t >& getDawnContentIdList()
+{
+   if( m_DawnContentIdList.size() == 0 )
+      loadIdList( m_DawnContentDat, m_DawnContentIdList );
+   return m_DawnContentIdList;
+}
+const std::set< uint32_t >& getDawnGrowMemberIdList()
+{
+   if( m_DawnGrowMemberIdList.size() == 0 )
+      loadIdList( m_DawnGrowMemberDat, m_DawnGrowMemberIdList );
+   return m_DawnGrowMemberIdList;
+}
+const std::set< uint32_t >& getDawnMemberUIParamIdList()
+{
+   if( m_DawnMemberUIParamIdList.size() == 0 )
+      loadIdList( m_DawnMemberUIParamDat, m_DawnMemberUIParamIdList );
+   return m_DawnMemberUIParamIdList;
+}
+const std::set< uint32_t >& getDawnQuestMemberIdList()
+{
+   if( m_DawnQuestMemberIdList.size() == 0 )
+      loadIdList( m_DawnQuestMemberDat, m_DawnQuestMemberIdList );
+   return m_DawnQuestMemberIdList;
+}
 const std::set< uint32_t >& getDeepDungeonIdList()
 {
    if( m_DeepDungeonIdList.size() == 0 )
@@ -8222,6 +8723,12 @@ const std::set< uint32_t >& getFateIdList()
       loadIdList( m_FateDat, m_FateIdList );
    return m_FateIdList;
 }
+const std::set< uint32_t >& getFateProgressUIIdList()
+{
+   if( m_FateProgressUIIdList.size() == 0 )
+      loadIdList( m_FateProgressUIDat, m_FateProgressUIIdList );
+   return m_FateProgressUIIdList;
+}
 const std::set< uint32_t >& getFCActivityIdList()
 {
    if( m_FCActivityIdList.size() == 0 )
@@ -8330,6 +8837,18 @@ const std::set< uint32_t >& getFrontline04IdList()
       loadIdList( m_Frontline04Dat, m_Frontline04IdList );
    return m_Frontline04IdList;
 }
+const std::set< uint32_t >& getFurnitureCatalogCategoryIdList()
+{
+   if( m_FurnitureCatalogCategoryIdList.size() == 0 )
+      loadIdList( m_FurnitureCatalogCategoryDat, m_FurnitureCatalogCategoryIdList );
+   return m_FurnitureCatalogCategoryIdList;
+}
+const std::set< uint32_t >& getFurnitureCatalogItemListIdList()
+{
+   if( m_FurnitureCatalogItemListIdList.size() == 0 )
+      loadIdList( m_FurnitureCatalogItemListDat, m_FurnitureCatalogItemListIdList );
+   return m_FurnitureCatalogItemListIdList;
+}
 const std::set< uint32_t >& getGardeningSeedIdList()
 {
    if( m_GardeningSeedIdList.size() == 0 )
@@ -8612,6 +9131,30 @@ const std::set< uint32_t >& getGuardianDeityIdList()
       loadIdList( m_GuardianDeityDat, m_GuardianDeityIdList );
    return m_GuardianDeityIdList;
 }
+const std::set< uint32_t >& getGuideIdList()
+{
+   if( m_GuideIdList.size() == 0 )
+      loadIdList( m_GuideDat, m_GuideIdList );
+   return m_GuideIdList;
+}
+const std::set< uint32_t >& getGuidePageIdList()
+{
+   if( m_GuidePageIdList.size() == 0 )
+      loadIdList( m_GuidePageDat, m_GuidePageIdList );
+   return m_GuidePageIdList;
+}
+const std::set< uint32_t >& getGuidePageStringIdList()
+{
+   if( m_GuidePageStringIdList.size() == 0 )
+      loadIdList( m_GuidePageStringDat, m_GuidePageStringIdList );
+   return m_GuidePageStringIdList;
+}
+const std::set< uint32_t >& getGuideTitleIdList()
+{
+   if( m_GuideTitleIdList.size() == 0 )
+      loadIdList( m_GuideTitleDat, m_GuideTitleIdList );
+   return m_GuideTitleIdList;
+}
 const std::set< uint32_t >& getGuildleveAssignmentIdList()
 {
    if( m_GuildleveAssignmentIdList.size() == 0 )
@@ -8750,6 +9293,24 @@ const std::set< uint32_t >& getHowToPageIdList()
       loadIdList( m_HowToPageDat, m_HowToPageIdList );
    return m_HowToPageIdList;
 }
+const std::set< uint32_t >& getHugeCraftworksNpcIdList()
+{
+   if( m_HugeCraftworksNpcIdList.size() == 0 )
+      loadIdList( m_HugeCraftworksNpcDat, m_HugeCraftworksNpcIdList );
+   return m_HugeCraftworksNpcIdList;
+}
+const std::set< uint32_t >& getHugeCraftworksRankIdList()
+{
+   if( m_HugeCraftworksRankIdList.size() == 0 )
+      loadIdList( m_HugeCraftworksRankDat, m_HugeCraftworksRankIdList );
+   return m_HugeCraftworksRankIdList;
+}
+const std::set< uint32_t >& getIndividualWeatherIdList()
+{
+   if( m_IndividualWeatherIdList.size() == 0 )
+      loadIdList( m_IndividualWeatherDat, m_IndividualWeatherIdList );
+   return m_IndividualWeatherIdList;
+}
 const std::set< uint32_t >& getInstanceContentIdList()
 {
    if( m_InstanceContentIdList.size() == 0 )
@@ -8828,6 +9389,18 @@ const std::set< uint32_t >& getItemUICategoryIdList()
       loadIdList( m_ItemUICategoryDat, m_ItemUICategoryIdList );
    return m_ItemUICategoryIdList;
 }
+const std::set< uint32_t >& getJobHudManualIdList()
+{
+   if( m_JobHudManualIdList.size() == 0 )
+      loadIdList( m_JobHudManualDat, m_JobHudManualIdList );
+   return m_JobHudManualIdList;
+}
+const std::set< uint32_t >& getJobHudManualPriorityIdList()
+{
+   if( m_JobHudManualPriorityIdList.size() == 0 )
+      loadIdList( m_JobHudManualPriorityDat, m_JobHudManualPriorityIdList );
+   return m_JobHudManualPriorityIdList;
+}
 const std::set< uint32_t >& getJournalCategoryIdList()
 {
    if( m_JournalCategoryIdList.size() == 0 )
@@ -8996,6 +9569,18 @@ const std::set< uint32_t >& getMateriaIdList()
       loadIdList( m_MateriaDat, m_MateriaIdList );
    return m_MateriaIdList;
 }
+const std::set< uint32_t >& getMateriaJoinRateIdList()
+{
+   if( m_MateriaJoinRateIdList.size() == 0 )
+      loadIdList( m_MateriaJoinRateDat, m_MateriaJoinRateIdList );
+   return m_MateriaJoinRateIdList;
+}
+const std::set< uint32_t >& getMateriaJoinRateGatherCraftIdList()
+{
+   if( m_MateriaJoinRateGatherCraftIdList.size() == 0 )
+      loadIdList( m_MateriaJoinRateGatherCraftDat, m_MateriaJoinRateGatherCraftIdList );
+   return m_MateriaJoinRateGatherCraftIdList;
+}
 const std::set< uint32_t >& getMiniGameRAIdList()
 {
    if( m_MiniGameRAIdList.size() == 0 )
@@ -9020,12 +9605,30 @@ const std::set< uint32_t >& getMinionSkillTypeIdList()
       loadIdList( m_MinionSkillTypeDat, m_MinionSkillTypeIdList );
    return m_MinionSkillTypeIdList;
 }
+const std::set< uint32_t >& getMobHuntOrderIdList()
+{
+   if( m_MobHuntOrderIdList.size() == 0 )
+      loadIdList( m_MobHuntOrderDat, m_MobHuntOrderIdList );
+   return m_MobHuntOrderIdList;
+}
 const std::set< uint32_t >& getMobHuntOrderTypeIdList()
 {
    if( m_MobHuntOrderTypeIdList.size() == 0 )
       loadIdList( m_MobHuntOrderTypeDat, m_MobHuntOrderTypeIdList );
    return m_MobHuntOrderTypeIdList;
 }
+const std::set< uint32_t >& getMobHuntRewardIdList()
+{
+   if( m_MobHuntRewardIdList.size() == 0 )
+      loadIdList( m_MobHuntRewardDat, m_MobHuntRewardIdList );
+   return m_MobHuntRewardIdList;
+}
+const std::set< uint32_t >& getMobHuntRewardCapIdList()
+{
+   if( m_MobHuntRewardCapIdList.size() == 0 )
+      loadIdList( m_MobHuntRewardCapDat, m_MobHuntRewardCapIdList );
+   return m_MobHuntRewardCapIdList;
+}
 const std::set< uint32_t >& getMobHuntTargetIdList()
 {
    if( m_MobHuntTargetIdList.size() == 0 )
@@ -9122,6 +9725,12 @@ const std::set< uint32_t >& getNotebookDivisionCategoryIdList()
       loadIdList( m_NotebookDivisionCategoryDat, m_NotebookDivisionCategoryIdList );
    return m_NotebookDivisionCategoryIdList;
 }
+const std::set< uint32_t >& getNotoriousMonsterIdList()
+{
+   if( m_NotoriousMonsterIdList.size() == 0 )
+      loadIdList( m_NotoriousMonsterDat, m_NotoriousMonsterIdList );
+   return m_NotoriousMonsterIdList;
+}
 const std::set< uint32_t >& getNpcEquipIdList()
 {
    if( m_NpcEquipIdList.size() == 0 )
@@ -9146,6 +9755,18 @@ const std::set< uint32_t >& getOnlineStatusIdList()
       loadIdList( m_OnlineStatusDat, m_OnlineStatusIdList );
    return m_OnlineStatusIdList;
 }
+const std::set< uint32_t >& getOpenContentIdList()
+{
+   if( m_OpenContentIdList.size() == 0 )
+      loadIdList( m_OpenContentDat, m_OpenContentIdList );
+   return m_OpenContentIdList;
+}
+const std::set< uint32_t >& getOpenContentCandidateNameIdList()
+{
+   if( m_OpenContentCandidateNameIdList.size() == 0 )
+      loadIdList( m_OpenContentCandidateNameDat, m_OpenContentCandidateNameIdList );
+   return m_OpenContentCandidateNameIdList;
+}
 const std::set< uint32_t >& getOpeningIdList()
 {
    if( m_OpeningIdList.size() == 0 )
@@ -9572,6 +10193,18 @@ const std::set< uint32_t >& getSkyIsland2RangeTypeIdList()
       loadIdList( m_SkyIsland2RangeTypeDat, m_SkyIsland2RangeTypeIdList );
    return m_SkyIsland2RangeTypeIdList;
 }
+const std::set< uint32_t >& getSnipeTalkIdList()
+{
+   if( m_SnipeTalkIdList.size() == 0 )
+      loadIdList( m_SnipeTalkDat, m_SnipeTalkIdList );
+   return m_SnipeTalkIdList;
+}
+const std::set< uint32_t >& getSnipeTalkNameIdList()
+{
+   if( m_SnipeTalkNameIdList.size() == 0 )
+      loadIdList( m_SnipeTalkNameDat, m_SnipeTalkNameIdList );
+   return m_SnipeTalkNameIdList;
+}
 const std::set< uint32_t >& getSpearfishingItemIdList()
 {
    if( m_SpearfishingItemIdList.size() == 0 )
@@ -9644,6 +10277,12 @@ const std::set< uint32_t >& getSubmarineExplorationIdList()
       loadIdList( m_SubmarineExplorationDat, m_SubmarineExplorationIdList );
    return m_SubmarineExplorationIdList;
 }
+const std::set< uint32_t >& getSubmarineMapIdList()
+{
+   if( m_SubmarineMapIdList.size() == 0 )
+      loadIdList( m_SubmarineMapDat, m_SubmarineMapIdList );
+   return m_SubmarineMapIdList;
+}
 const std::set< uint32_t >& getSubmarinePartIdList()
 {
    if( m_SubmarinePartIdList.size() == 0 )
@@ -9920,6 +10559,18 @@ const std::set< uint32_t >& getWorldDCGroupTypeIdList()
       loadIdList( m_WorldDCGroupTypeDat, m_WorldDCGroupTypeIdList );
    return m_WorldDCGroupTypeIdList;
 }
+const std::set< uint32_t >& getYardCatalogCategoryIdList()
+{
+   if( m_YardCatalogCategoryIdList.size() == 0 )
+      loadIdList( m_YardCatalogCategoryDat, m_YardCatalogCategoryIdList );
+   return m_YardCatalogCategoryIdList;
+}
+const std::set< uint32_t >& getYardCatalogItemListIdList()
+{
+   if( m_YardCatalogItemListIdList.size() == 0 )
+      loadIdList( m_YardCatalogItemListDat, m_YardCatalogItemListIdList );
+   return m_YardCatalogItemListIdList;
+}
 const std::set< uint32_t >& getYKWIdList()
 {
    if( m_YKWIdList.size() == 0 )
diff --git a/src/common/Network/PacketDef/Ipcs.h b/src/common/Network/PacketDef/Ipcs.h
index 807b6e2a..da2c9056 100644
--- a/src/common/Network/PacketDef/Ipcs.h
+++ b/src/common/Network/PacketDef/Ipcs.h
@@ -122,8 +122,9 @@ namespace Sapphire::Network::Packets
 
     FreeCompanyUpdateShortMessage = 0x0157, // added 5.0
 
-    StatusEffectList = 0x015B, // updated 5.0
-    EurekaStatusEffectList = 0x015C, // updated 5.0
+    StatusEffectList = 0x023A, // updated 5.1
+    EurekaStatusEffectList = 0x0398, // updated 5.1
+    BossStatusEffectList = 0x00E6, // added 5.1
     Effect = 0x00A7, // updated 5.1
     AoeEffect8 = 0x00A9, // updated 5.1
     AoeEffect16 = 0x015F, // updated 5.1
@@ -164,11 +165,11 @@ namespace Sapphire::Network::Packets
 
     SetLevelSync = 0x1186, // not updated for 4.4, not sure what it is anymore
 
-    ItemInfo = 0x0145, // updated 5.1
-    ContainerInfo = 0x0246, // updated 5.1
+    ItemInfo = 0x031E, // updated 5.1
+    ContainerInfo = 0x0145, // updated 5.1
     InventoryTransactionFinish = 0x01AB, // updated 5.1
     InventoryTransaction = 0x023E, // updated 5.1
-    CurrencyCrystalInfo = 0x031E, // updated 5.1
+    CurrencyCrystalInfo = 0x0246, // updated 5.1
 
     InventoryActionAck = 0x0084, // updated 5.1
     UpdateInventorySlot = 0x0072, // updated 5.1
@@ -271,7 +272,7 @@ namespace Sapphire::Network::Packets
     PingHandler = 0x0065, // unchanged 5.0
     InitHandler = 0x03D2, // updated 5.1
 
-    FinishLoadingHandler = 0x0069, // unchanged 5.0
+    FinishLoadingHandler = 0x01DC, // updated 5.1
 
     CFCommenceHandler = 0x006F,
 
@@ -289,16 +290,16 @@ namespace Sapphire::Network::Packets
 
     ChatHandler = 0x00D9, // updated 5.0
 
-    SocialListHandler = 0x00E1, // updated 5.0
+    SocialListHandler = 0x01F6, // updated 5.1
     SetSearchInfoHandler = 0x00E4, // updated 5.0
-    ReqSearchInfoHandler = 0x00E6, // updated 5.0
+    ReqSearchInfoHandler = 0x024D, // updated 5.1
     ReqExamineSearchCommentHandler = 0x00E7, // updated 5.0
 
     ReqRemovePlayerFromBlacklist = 0x00F1, // updated 5.0
-    BlackListHandler = 0x00F2, // updated 5.0
+    BlackListHandler = 0x0167, // updated 5.1
     PlayerSearchHandler = 0x00F4, // updated 5.0
 
-    LinkshellListHandler = 0x00FA, // updated 5.0
+    LinkshellListHandler = 0x00D3, // updated 5.1
 
     MarketBoardRequestItemListingInfo = 0x0102, // updated 4.5
     MarketBoardRequestItemListings = 0x0103, // updated 4.5
@@ -318,7 +319,7 @@ namespace Sapphire::Network::Packets
     ReqCountdownCancel = 0x0136, // updated 5.0
 
     ZoneLineHandler = 0x0139, // updated 5.0
-    ClientTrigger = 0x013A, // updated 5.0
+    ClientTrigger = 0x00B1, // updated 5.1
     DiscoveryHandler = 0x013B, // updated 5.0
 
     PlaceFieldMarker = 0x013C, // updated 5.0
@@ -328,7 +329,7 @@ namespace Sapphire::Network::Packets
     GMCommand2 = 0x013F, // updated 5.0
     AoESkillHandler = 0x140, // updated 5.0
 
-    UpdatePositionHandler = 0x0141, // updated 5.0
+    UpdatePositionHandler = 0x01EC, // updated 5.1
 
     InventoryModifyHandler = 0x0148, // updated 5.0
     InventoryEquipRecommendedItems = 0x0149, // updated 5.0

From 777f1e4c37f9c65641f9633c06ed4b705bd2f7aa Mon Sep 17 00:00:00 2001
From: NotAdam <adam@notadam.me>
Date: Thu, 31 Oct 2019 12:04:50 +1100
Subject: [PATCH 170/351] some client opcode fixes

---
 src/common/Network/PacketDef/Ipcs.h | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/common/Network/PacketDef/Ipcs.h b/src/common/Network/PacketDef/Ipcs.h
index da2c9056..f9100ee7 100644
--- a/src/common/Network/PacketDef/Ipcs.h
+++ b/src/common/Network/PacketDef/Ipcs.h
@@ -279,16 +279,16 @@ namespace Sapphire::Network::Packets
 
     CFRegisterDuty = 0x0071,
     CFRegisterRoulette = 0x0072,
-    PlayTimeHandler = 0x0073, // unchanged 5.0
-    LogoutHandler = 0x0074, // unchanged 5.0
-    CancelLogout = 0x0075, // updated 5.0
+    PlayTimeHandler = 0x0276, // updated 5.1
+    LogoutHandler = 0x02D6, // updated 5.1
+    CancelLogout = 0x008F, // updated 5.1
 
     CFDutyInfoHandler = 0x0078, // updated 4.2
 
     SocialReqSendHandler = 0x00AE, // updated 4.1
     CreateCrossWorldLS = 0x00AF, // updated 4.3
 
-    ChatHandler = 0x00D9, // updated 5.0
+    ChatHandler = 0x02FF, // updated 5.1
 
     SocialListHandler = 0x01F6, // updated 5.1
     SetSearchInfoHandler = 0x00E4, // updated 5.0
@@ -325,7 +325,7 @@ namespace Sapphire::Network::Packets
     PlaceFieldMarker = 0x013C, // updated 5.0
 
     SkillHandler = 0x013D, // updated 5.0
-    GMCommand1 = 0x013E, // updated 5.0
+    GMCommand1 = 0x00A4, // updated 5.1
     GMCommand2 = 0x013F, // updated 5.0
     AoESkillHandler = 0x140, // updated 5.0
 
@@ -352,7 +352,7 @@ namespace Sapphire::Network::Packets
 
     ReqEquipDisplayFlagsChange = 0x0175, // updated 5.0
 
-    LandRenameHandler = 0x0177, // updated 5.0
+    LandRenameHandler = 0xF177, // updated 5.0
     HousingUpdateHouseGreeting = 0x0178, // updated 5.0
     HousingUpdateObjectPosition = 0x0179, // updated 5.0
 

From 0cb38494f422e8a86b82f452489ffbd97f0d297c Mon Sep 17 00:00:00 2001
From: NotAdam <adam@notadam.me>
Date: Thu, 31 Oct 2019 12:41:12 +1100
Subject: [PATCH 171/351] fix discovery and zoneline opcodes

---
 src/common/Network/PacketDef/Ipcs.h | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/common/Network/PacketDef/Ipcs.h b/src/common/Network/PacketDef/Ipcs.h
index f9100ee7..00547ada 100644
--- a/src/common/Network/PacketDef/Ipcs.h
+++ b/src/common/Network/PacketDef/Ipcs.h
@@ -204,13 +204,13 @@ namespace Sapphire::Network::Packets
 
     CFAvailableContents = 0xF1FD, // updated 4.2
 
-    WeatherChange = 0x0210, // updated 5.0
-    PlayerTitleList = 0x0211, // updated 5.0
-    Discovery = 0x0212, // updated 5.0
+    WeatherChange = 0x00B6, // updated 5.1
+    PlayerTitleList = 0x037D, // updated 5.1
+    Discovery = 0x0094, // updated 5.1
 
-    EorzeaTimeOffset = 0x0214, // updated 5.0
+    EorzeaTimeOffset = 0x03B8, // updated 5.1
 
-    EquipDisplayFlags = 0x0220, // updated 5.0
+    EquipDisplayFlags = 0x00F6, // updated 5.1
 
     /// Housing //////////////////////////////////////
 
@@ -318,9 +318,9 @@ namespace Sapphire::Network::Packets
     ReqCountdownInitiate = 0x0135, // updated 5.0
     ReqCountdownCancel = 0x0136, // updated 5.0
 
-    ZoneLineHandler = 0x0139, // updated 5.0
+    ZoneLineHandler = 0x02E0, // updated 5.1
     ClientTrigger = 0x00B1, // updated 5.1
-    DiscoveryHandler = 0x013B, // updated 5.0
+    DiscoveryHandler = 0x0177, // updated 5.1
 
     PlaceFieldMarker = 0x013C, // updated 5.0
 

From c0c4a04977a70f51fad7c653c128060444c9dda6 Mon Sep 17 00:00:00 2001
From: NotAdam <adam@notadam.me>
Date: Fri, 1 Nov 2019 18:12:33 +1100
Subject: [PATCH 172/351] fix daily quest packet opcodes

---
 src/common/Network/PacketDef/Ipcs.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/common/Network/PacketDef/Ipcs.h b/src/common/Network/PacketDef/Ipcs.h
index 00547ada..318fc410 100644
--- a/src/common/Network/PacketDef/Ipcs.h
+++ b/src/common/Network/PacketDef/Ipcs.h
@@ -247,8 +247,8 @@ namespace Sapphire::Network::Packets
     ActorGauge = 0x0292, // updated 4.3
 
     // daily quest info -> without them sent,  login will take longer...
-    DailyQuests = 0x025E, // updated 5.0
-    DailyQuestRepeatFlags = 0x0260, // updated 5.0
+    DailyQuests = 0x02B6, // updated 5.1
+    DailyQuestRepeatFlags = 0x0124, // updated 5.1
 
     /// Doman Mahjong //////////////////////////////////////
     MahjongOpenGui = 0x02A4, // only available in mahjong instance

From a865f7a50d39f015fbfdb72b99ed3070a9b2d01d Mon Sep 17 00:00:00 2001
From: karashiiro <49822414+karashiiro@users.noreply.github.com>
Date: Fri, 1 Nov 2019 09:22:43 -0700
Subject: [PATCH 173/351] MarketTaxRates packet opcode and structure

---
 src/common/Common.h                               | 2 ++
 src/common/Network/PacketDef/Ipcs.h               | 2 ++
 src/common/Network/PacketDef/Zone/ServerZoneDef.h | 8 ++++++++
 3 files changed, 12 insertions(+)

diff --git a/src/common/Common.h b/src/common/Common.h
index 7bb57000..95420945 100644
--- a/src/common/Common.h
+++ b/src/common/Common.h
@@ -27,6 +27,8 @@ namespace Sapphire::Common
   const uint8_t CLASSJOB_TOTAL = 38;
   const uint8_t CLASSJOB_SLOTS = 28;
 
+  const uint8_t TOWN_COUNT = 6;
+
   /*!
    * @brief The maximum length (in ms) of a combo before it is canceled/voided.
    *
diff --git a/src/common/Network/PacketDef/Ipcs.h b/src/common/Network/PacketDef/Ipcs.h
index f524467e..4225017b 100644
--- a/src/common/Network/PacketDef/Ipcs.h
+++ b/src/common/Network/PacketDef/Ipcs.h
@@ -106,6 +106,8 @@ namespace Sapphire::Network::Packets
     ReqMoogleMailLetter = 0x0139, // updated 5.0
     MailLetterNotification = 0x013A, // updated 5.0
 
+    MarketTaxRates = 0x0076, // added 5.1
+
     MarketBoardItemListingCount = 0x013B, // updated 5.0
     MarketBoardItemListing = 0x036A, // updated 5.1
     MarketBoardItemListingHistory = 0x0194, // updated 5.1
diff --git a/src/common/Network/PacketDef/Zone/ServerZoneDef.h b/src/common/Network/PacketDef/Zone/ServerZoneDef.h
index 3b4de057..f3935be0 100644
--- a/src/common/Network/PacketDef/Zone/ServerZoneDef.h
+++ b/src/common/Network/PacketDef/Zone/ServerZoneDef.h
@@ -283,6 +283,14 @@ namespace Sapphire::Network::Packets::Server
     char unk2[0x4]; // This has probs something to do with the support desk (inquiry id?)
   };
 
+  struct FFFXIVIpcMarketTaxRates : FFXIVIpcBasePacket< MarketTaxRates >
+  {
+    uint32_t unknown1;
+    uint16_t padding1;
+    uint32_t taxRate[Common::TOWN_COUNT]; // In the order of Common::Town
+    uint64_t unknown2;
+  };
+
   struct FFFXIVIpcMarketBoardItemListingCount : FFXIVIpcBasePacket< MarketBoardItemListingCount >
   {
     uint32_t itemCatalogId;

From e808619329b010a2453b5d61bdf992dca23685e5 Mon Sep 17 00:00:00 2001
From: karashiiro <49822414+karashiiro@users.noreply.github.com>
Date: Fri, 1 Nov 2019 09:25:35 -0700
Subject: [PATCH 174/351] Corrected MarketTaxRates packet structure

---
 src/common/Network/PacketDef/Zone/ServerZoneDef.h | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/common/Network/PacketDef/Zone/ServerZoneDef.h b/src/common/Network/PacketDef/Zone/ServerZoneDef.h
index f3935be0..9dc959b9 100644
--- a/src/common/Network/PacketDef/Zone/ServerZoneDef.h
+++ b/src/common/Network/PacketDef/Zone/ServerZoneDef.h
@@ -287,8 +287,9 @@ namespace Sapphire::Network::Packets::Server
   {
     uint32_t unknown1;
     uint16_t padding1;
+    uint16_t unknown2;
     uint32_t taxRate[Common::TOWN_COUNT]; // In the order of Common::Town
-    uint64_t unknown2;
+    uint64_t unknown3;
   };
 
   struct FFFXIVIpcMarketBoardItemListingCount : FFXIVIpcBasePacket< MarketBoardItemListingCount >

From 56b375ed9c643ff88587735950c2b4e76c801c2d Mon Sep 17 00:00:00 2001
From: Supamiu <contact@flavien-normand.fr>
Date: Sat, 2 Nov 2019 15:07:21 +0100
Subject: [PATCH 175/351] Added new InventoryType for Trade Inventory

---
 src/common/Common.h | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/common/Common.h b/src/common/Common.h
index ce25b64f..a78728e4 100644
--- a/src/common/Common.h
+++ b/src/common/Common.h
@@ -216,6 +216,8 @@ namespace Sapphire::Common
     HandIn = 2005,
     DamagedGear = 2007,
     //UNKNOWN_1 = 2008,
+    // Temporary inventory that is used for the "trade" window
+    TradeInventory = 2009,
 
     ArmoryOff = 3200,
     ArmoryHead = 3201,

From 9b981996f2bf680c43fadcba6a387b34ea463202 Mon Sep 17 00:00:00 2001
From: Supamiu <contact@flavien-normand.fr>
Date: Sat, 2 Nov 2019 15:08:10 +0100
Subject: [PATCH 176/351] Updated OpCode for InventoryModifyHandler

---
 src/common/Network/PacketDef/Ipcs.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/common/Network/PacketDef/Ipcs.h b/src/common/Network/PacketDef/Ipcs.h
index 116742c6..31cb114e 100644
--- a/src/common/Network/PacketDef/Ipcs.h
+++ b/src/common/Network/PacketDef/Ipcs.h
@@ -333,7 +333,7 @@ namespace Sapphire::Network::Packets
 
     UpdatePositionHandler = 0x01EC, // updated 5.1
 
-    InventoryModifyHandler = 0x0148, // updated 5.0
+    InventoryModifyHandler = 0x0372, // updated 5.1
     InventoryEquipRecommendedItems = 0x0149, // updated 5.0
 
     ReqPlaceHousingItem = 0x014B, // updated 5.0

From eedf2f50fdc2a21aa4b66166db4aab49746b05a6 Mon Sep 17 00:00:00 2001
From: karashiiro <49822414+karashiiro@users.noreply.github.com>
Date: Sat, 9 Nov 2019 22:15:00 -0800
Subject: [PATCH 177/351] marketBoardSearchResult opcode

---
 src/common/Network/PacketDef/Ipcs.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/common/Network/PacketDef/Ipcs.h b/src/common/Network/PacketDef/Ipcs.h
index 4225017b..a9e14e32 100644
--- a/src/common/Network/PacketDef/Ipcs.h
+++ b/src/common/Network/PacketDef/Ipcs.h
@@ -108,10 +108,10 @@ namespace Sapphire::Network::Packets
 
     MarketTaxRates = 0x0076, // added 5.1
 
-    MarketBoardItemListingCount = 0x013B, // updated 5.0
+    MarketBoardItemListingCount = 0x039D, // updated 5.1
     MarketBoardItemListing = 0x036A, // updated 5.1
     MarketBoardItemListingHistory = 0x0194, // updated 5.1
-    MarketBoardSearchResult = 0x0139, // updated 4.5
+    MarketBoardSearchResult = 0x0371, // updated 5.1
 
     CharaFreeCompanyTag = 0x013B, // updated 4.5
     FreeCompanyBoardMsg = 0x013C, // updated 4.5

From aa37fe081d7d48ee376c6263a0372b9ca34aa68e Mon Sep 17 00:00:00 2001
From: perize <perize@protonmail.com>
Date: Tue, 12 Nov 2019 18:27:42 +0900
Subject: [PATCH 178/351] Update opcodes for 5.11 (preliminary)

---
 src/common/Network/PacketDef/Ipcs.h | 60 ++++++++++++++---------------
 1 file changed, 30 insertions(+), 30 deletions(-)

diff --git a/src/common/Network/PacketDef/Ipcs.h b/src/common/Network/PacketDef/Ipcs.h
index 803a5a89..b45cfd72 100644
--- a/src/common/Network/PacketDef/Ipcs.h
+++ b/src/common/Network/PacketDef/Ipcs.h
@@ -48,18 +48,18 @@ namespace Sapphire::Network::Packets
     Ping = 0x0065,
     Init = 0x0066,
 
-    ActorFreeSpawn = 0x0097, // updated 5.1
-    InitZone = 0x019B, // updated 5.1
+    ActorFreeSpawn = 0x0249, // updated 5.11
+    InitZone = 0x01D8, // updated 5.11
 
-    EffectResult = 0x0153, // updated 5.1
-    ActorControl = 0x0164, // updated 5.1
-    ActorControlSelf = 0x0264, // updated 5.1
-    ActorControlTarget = 0x016C, // updated 5.1
+    EffectResult = 0x00B9, // updated 5.11
+    ActorControl = 0x008D, // updated 5.11
+    ActorControlSelf = 0x0240, // updated 5.111
+    ActorControlTarget = 0x01F5, // updated 5.11
 
     /*!
      * @brief Used when resting
      */
-    UpdateHpMpTp = 0x032D, // updated 5.1
+    UpdateHpMpTp = 0x012D, // updated 5.11
 
     ///////////////////////////////////////////////////
 
@@ -94,8 +94,8 @@ namespace Sapphire::Network::Packets
     ServerNotice = 0x0116, // updated 5.0
     SetOnlineStatus = 0x015E, // updated 5.1
 
-    CountdownInitiate = 0x01EE, // updated 5.1
-    CountdownCancel = 0x03C6, // updated 5.1
+    CountdownInitiate = 0x0309, // updated 5.11
+    CountdownCancel = 0x013C, // updated 5.11
 
     PlayerAddedToBlacklist = 0x033F, // updated 5.1
     PlayerRemovedFromBlacklist = 0x0385, // updated 5.1
@@ -124,41 +124,41 @@ namespace Sapphire::Network::Packets
 
     FreeCompanyUpdateShortMessage = 0x0157, // added 5.0
 
-    StatusEffectList = 0x023A, // updated 5.1
-    EurekaStatusEffectList = 0x0398, // updated 5.1
+    StatusEffectList = 0x0399, // updated 5.11
+    EurekaStatusEffectList = 0x01C2, // updated 5.11
     BossStatusEffectList = 0x00E6, // added 5.1
-    Effect = 0x00A7, // updated 5.1
-    AoeEffect8 = 0x00A9, // updated 5.1
-    AoeEffect16 = 0x015F, // updated 5.1
-    AoeEffect24 = 0x0292, // updated 5.1
-    AoeEffect32 = 0x0268, // updated 5.1
+    Effect = 0x0165, // updated 5.11
+    AoeEffect8 = 0x00E9, // updated 5.11
+    AoeEffect16 = 0x007F, // updated 5.11
+    AoeEffect24 = 0x0299, // updated 5.11
+    AoeEffect32 = 0x01DF, // updated 5.11
     PersistantEffect = 0x0165, // updated 5.0
 
     GCAffiliation = 0x016F, // updated 5.0
 
-    PlayerSpawn = 0x0386, // updated 5.1
-    NpcSpawn = 0x010A, // updated 5.1
+    PlayerSpawn = 0x0243, // updated 5.11
+    NpcSpawn = 0x021B, // updated 5.11
     NpcSpawn2 = 0x0115, // ( Bigger statuseffectlist? ) updated 5.1
-    ActorMove = 0x01BC, // updated 5.1
+    ActorMove = 0x00DD, // updated 5.11
 
-    ActorSetPos = 0x0311, // updated 5.1
+    ActorSetPos = 0x0092, // updated 5.11
 
-    ActorCast = 0x012C, // updated 5.1
+    ActorCast = 0x028E, // updated 5.11
     SomeCustomiseChangePacketProbably = 0x0187, // added 5.0
-    PartyList = 0x0231, // updated 5.1
-    HateRank = 0x0354, // updated 5.1
-    HateList = 0x00C7, // updated 5.1
-    ObjectSpawn = 0x0156, // updated 5.1
-    ObjectDespawn = 0x00A3, // updated 5.1
+    PartyList = 0x022B, // updated 5.11
+    HateRank = 0x00B8, // updated 5.11
+    HateList = 0x03C5, // updated 5.11
+    ObjectSpawn = 0x0105, // updated 5.111
+    ObjectDespawn = 0x036B, // updated 5.11
     UpdateClassInfo = 0x0258, // updated 5.1
     SilentSetClassJob = 0x018E, // updated 5.0 - seems to be the case, not sure if it's actually used for anything
     PlayerSetup = 0x0110, // updated 5.1
     PlayerStats = 0x00CF, // updated 5.1
-    ActorOwner = 0x01A5, // updated 5.1
+    ActorOwner = 0x0322, // updated 5.11
     PlayerStateFlags = 0x019F, // updated 5.1
     PlayerClassInfo = 0x02D4, // updated 5.1
 
-    ModelEquip = 0x025E, // updated 5.1
+    ModelEquip = 0x0170, // updated 5.11
     Examine = 0x00EA, // updated 5.1
     CharaNameReq = 0x0198, // updated 5.0
 
@@ -206,13 +206,13 @@ namespace Sapphire::Network::Packets
 
     CFAvailableContents = 0xF1FD, // updated 4.2
 
-    WeatherChange = 0x00B6, // updated 5.1
+    WeatherChange = 0x02FB, // updated 5.11
     PlayerTitleList = 0x037D, // updated 5.1
     Discovery = 0x0094, // updated 5.1
 
     EorzeaTimeOffset = 0x03B8, // updated 5.1
 
-    EquipDisplayFlags = 0x00F6, // updated 5.1
+    EquipDisplayFlags = 0x011D, // updated 5.11
 
     /// Housing //////////////////////////////////////
 

From eefdbf6c51b2ead05b0a820a1241e956001d1834 Mon Sep 17 00:00:00 2001
From: perize <perize@protonmail.com>
Date: Tue, 12 Nov 2019 18:35:56 +0900
Subject: [PATCH 179/351] Correct opcodes

---
 src/common/Network/PacketDef/Ipcs.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/common/Network/PacketDef/Ipcs.h b/src/common/Network/PacketDef/Ipcs.h
index b45cfd72..1ac2bdf6 100644
--- a/src/common/Network/PacketDef/Ipcs.h
+++ b/src/common/Network/PacketDef/Ipcs.h
@@ -53,7 +53,7 @@ namespace Sapphire::Network::Packets
 
     EffectResult = 0x00B9, // updated 5.11
     ActorControl = 0x008D, // updated 5.11
-    ActorControlSelf = 0x0240, // updated 5.111
+    ActorControlSelf = 0x00EB, // updated 5.11
     ActorControlTarget = 0x01F5, // updated 5.11
 
     /*!
@@ -148,7 +148,7 @@ namespace Sapphire::Network::Packets
     PartyList = 0x022B, // updated 5.11
     HateRank = 0x00B8, // updated 5.11
     HateList = 0x03C5, // updated 5.11
-    ObjectSpawn = 0x0105, // updated 5.111
+    ObjectSpawn = 0x02A0, // updated 5.11
     ObjectDespawn = 0x036B, // updated 5.11
     UpdateClassInfo = 0x0258, // updated 5.1
     SilentSetClassJob = 0x018E, // updated 5.0 - seems to be the case, not sure if it's actually used for anything

From f53cc66a55c4c96fcd13b55ae3cae6cee1fab27d Mon Sep 17 00:00:00 2001
From: perize <perize@protonmail.com>
Date: Tue, 12 Nov 2019 18:40:49 +0900
Subject: [PATCH 180/351] f

---
 src/common/Network/PacketDef/Ipcs.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/common/Network/PacketDef/Ipcs.h b/src/common/Network/PacketDef/Ipcs.h
index 1ac2bdf6..fcc36fcc 100644
--- a/src/common/Network/PacketDef/Ipcs.h
+++ b/src/common/Network/PacketDef/Ipcs.h
@@ -138,7 +138,7 @@ namespace Sapphire::Network::Packets
 
     PlayerSpawn = 0x0243, // updated 5.11
     NpcSpawn = 0x021B, // updated 5.11
-    NpcSpawn2 = 0x0115, // ( Bigger statuseffectlist? ) updated 5.1
+    NpcSpawn2 = 0x0137, // ( Bigger statuseffectlist? ) updated 5.11
     ActorMove = 0x00DD, // updated 5.11
 
     ActorSetPos = 0x0092, // updated 5.11

From 2bcf4f6b9b1ae89b15ca93f3f282153e333ce362 Mon Sep 17 00:00:00 2001
From: karashiiro <49822414+karashiiro@users.noreply.github.com>
Date: Tue, 12 Nov 2019 10:24:57 -0800
Subject: [PATCH 181/351] Market, inventory and player opcodes for 5.11,
 SetBait ActorControl

---
 src/common/Network/CommonActorControl.h |  2 ++
 src/common/Network/PacketDef/Ipcs.h     | 24 ++++++++++++------------
 2 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/src/common/Network/CommonActorControl.h b/src/common/Network/CommonActorControl.h
index bcdc67bf..6fe9f1d2 100644
--- a/src/common/Network/CommonActorControl.h
+++ b/src/common/Network/CommonActorControl.h
@@ -241,6 +241,8 @@ namespace Sapphire::Network::ActorControl
 
     GearSetEquipMsg = 0x321,
 
+    SetBait = 0x325, // param1: bait ID
+
     SetFestival = 0x386, // param1: festival.exd index
 
     ToggleOrchestrionUnlock = 0x396,
diff --git a/src/common/Network/PacketDef/Ipcs.h b/src/common/Network/PacketDef/Ipcs.h
index a9e14e32..0d453266 100644
--- a/src/common/Network/PacketDef/Ipcs.h
+++ b/src/common/Network/PacketDef/Ipcs.h
@@ -106,12 +106,12 @@ namespace Sapphire::Network::Packets
     ReqMoogleMailLetter = 0x0139, // updated 5.0
     MailLetterNotification = 0x013A, // updated 5.0
 
-    MarketTaxRates = 0x0076, // added 5.1
+    MarketTaxRates = 0x039F, // updated 5.11
 
-    MarketBoardItemListingCount = 0x039D, // updated 5.1
-    MarketBoardItemListing = 0x036A, // updated 5.1
-    MarketBoardItemListingHistory = 0x0194, // updated 5.1
-    MarketBoardSearchResult = 0x0371, // updated 5.1
+    MarketBoardItemListingCount = 0x00F2, // updated 5.11
+    MarketBoardItemListing = 0x01E2, // updated 5.11
+    MarketBoardItemListingHistory = 0x0123, // updated 5.11
+    MarketBoardSearchResult = 0x00B7, // updated 5.11
 
     CharaFreeCompanyTag = 0x013B, // updated 4.5
     FreeCompanyBoardMsg = 0x013C, // updated 4.5
@@ -145,10 +145,10 @@ namespace Sapphire::Network::Packets
     HateList = 0x018A, // updated 5.0
     ObjectSpawn = 0x018B, // updated 5.0
     ObjectDespawn = 0x018C, // updated 5.0
-    UpdateClassInfo = 0x018D, // updated 5.0
+    UpdateClassInfo = 0x0399, // updated 5.11
     SilentSetClassJob = 0x018E, // updated 5.0 - seems to be the case, not sure if it's actually used for anything
-    PlayerSetup = 0x018F, // updated 5.0
-    PlayerStats = 0x0190, // updated 5.0
+    PlayerSetup = 0x01A1, // updated 5.11
+    PlayerStats = 0x0324, // updated 5.11
     ActorOwner = 0x0192, // updated 5.0
     PlayerStateFlags = 0x0193, // updated 5.0
     PlayerClassInfo = 0x0194, // updated 5.0
@@ -162,14 +162,14 @@ namespace Sapphire::Network::Packets
 
     SetLevelSync = 0x1186, // not updated for 4.4, not sure what it is anymore
 
-    ItemInfo = 0x01A1, // updated 5.0
+    ItemInfo = 0x01D4, // updated 5.11
     ContainerInfo = 0x01A2, // updated 5.0
     InventoryTransactionFinish = 0x01A3, // updated 5.0
     InventoryTransaction = 0x01A4, // updated 5.0
-    CurrencyCrystalInfo = 0x01A5, // updated 5.0
+    CurrencyCrystalInfo = 0x02CA, // updated 5.11
 
     InventoryActionAck = 0x01A7, // updated 5.0
-    UpdateInventorySlot = 0x01A8, // updated 5.0
+    UpdateInventorySlot = 0x0112, // updated 5.11
 
     HuntingLogEntry = 0x01B3, // updated 5.0
 
@@ -328,7 +328,7 @@ namespace Sapphire::Network::Packets
 
     UpdatePositionHandler = 0x0141, // updated 5.0
 
-    InventoryModifyHandler = 0x0148, // updated 5.0
+    InventoryModifyHandler = 0x029B, // updated 5.11
     InventoryEquipRecommendedItems = 0x0149, // updated 5.0
 
     ReqPlaceHousingItem = 0x014B, // updated 5.0

From a87b6e2f52e01c5cc81ece383809dac33f45b611 Mon Sep 17 00:00:00 2001
From: karashiiro <49822414+karashiiro@users.noreply.github.com>
Date: Tue, 12 Nov 2019 14:05:48 -0800
Subject: [PATCH 182/351] UpdateClassInfo correction

---
 src/common/Network/PacketDef/Ipcs.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/common/Network/PacketDef/Ipcs.h b/src/common/Network/PacketDef/Ipcs.h
index 0d453266..2eb56c18 100644
--- a/src/common/Network/PacketDef/Ipcs.h
+++ b/src/common/Network/PacketDef/Ipcs.h
@@ -145,7 +145,7 @@ namespace Sapphire::Network::Packets
     HateList = 0x018A, // updated 5.0
     ObjectSpawn = 0x018B, // updated 5.0
     ObjectDespawn = 0x018C, // updated 5.0
-    UpdateClassInfo = 0x0399, // updated 5.11
+    UpdateClassInfo = 0x00FC, // updated 5.11
     SilentSetClassJob = 0x018E, // updated 5.0 - seems to be the case, not sure if it's actually used for anything
     PlayerSetup = 0x01A1, // updated 5.11
     PlayerStats = 0x0324, // updated 5.11

From 204866dba26fc07dcda326e07ef3360fa39013a5 Mon Sep 17 00:00:00 2001
From: Supamiu <contact@flavien-normand.fr>
Date: Sun, 17 Nov 2019 14:00:12 +0100
Subject: [PATCH 183/351] Event packets update for 5.11

---
 src/common/Network/PacketDef/Ipcs.h | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/common/Network/PacketDef/Ipcs.h b/src/common/Network/PacketDef/Ipcs.h
index 803a5a89..ada56434 100644
--- a/src/common/Network/PacketDef/Ipcs.h
+++ b/src/common/Network/PacketDef/Ipcs.h
@@ -178,12 +178,12 @@ namespace Sapphire::Network::Packets
 
     HuntingLogEntry = 0x01B3, // updated 5.0
 
-    EventPlay = 0x01B5, // updated 5.0
+    EventPlay = 0x0386, // updated 5.11
     DirectorPlayScene = 0x01B9, // updated 5.0
     EventOpenGilShop = 0x01BC, // updated 5.0
 
-    EventStart = 0x01BE, // updated 5.0
-    EventFinish = 0x01BF, // updated 5.0
+    EventStart = 0x00C9, // updated 5.11
+    EventFinish = 0x0387, // updated 5.11
 
     EventLinkshell = 0x1169,
 
@@ -341,7 +341,7 @@ namespace Sapphire::Network::Packets
 
     TalkEventHandler = 0x0151, // updated 5.0
     EmoteEventHandler = 0x0152, // updated 5.0
-    WithinRangeEventHandler = 0x0153, // updated 5.0
+    WithinRangeEventHandler = 0x0165, // updated 5.11
     OutOfRangeEventHandler = 0x0154, // updated 5.0
     EnterTeriEventHandler = 0x0155, // updated 5.0
     ShopEventHandler = 0x0156, // updated 5.0

From f990bda78c6b145812b19565b9e515c58ff0b4dd Mon Sep 17 00:00:00 2001
From: Cara <caraxian040@gmail.com>
Date: Tue, 19 Nov 2019 05:22:38 +1030
Subject: [PATCH 184/351] Update ClientTrigger OpCode

---
 src/common/Network/PacketDef/Ipcs.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/common/Network/PacketDef/Ipcs.h b/src/common/Network/PacketDef/Ipcs.h
index ada56434..95612767 100644
--- a/src/common/Network/PacketDef/Ipcs.h
+++ b/src/common/Network/PacketDef/Ipcs.h
@@ -321,7 +321,7 @@ namespace Sapphire::Network::Packets
     ReqCountdownCancel = 0x0136, // updated 5.0
 
     ZoneLineHandler = 0x02E0, // updated 5.1
-    ClientTrigger = 0x00B1, // updated 5.1
+    ClientTrigger = 0x01F2, // updated 5.11
     DiscoveryHandler = 0x0177, // updated 5.1
 
     PlaceFieldMarker = 0x013C, // updated 5.0

From f16be26e4cf89bd63adc3be3cf93c38b84613700 Mon Sep 17 00:00:00 2001
From: liam <lmcintyre995@gmail.com>
Date: Sat, 23 Nov 2019 02:57:29 -0500
Subject: [PATCH 185/351] minor instance script fixes, eobj parser should work
 as well as produce usable scripts now

---
 src/tools/event_object_parser/instance.tmpl    | 2 +-
 src/tools/event_object_parser/main.cpp         | 2 +-
 src/tools/event_object_parser/questbattle.tmpl | 2 +-
 src/world/Manager/TerritoryMgr.cpp             | 4 ++--
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/tools/event_object_parser/instance.tmpl b/src/tools/event_object_parser/instance.tmpl
index 18073304..c8188474 100644
--- a/src/tools/event_object_parser/instance.tmpl
+++ b/src/tools/event_object_parser/instance.tmpl
@@ -14,7 +14,7 @@ public:
 EOBJ_INIT
   }
 
-  void onUpdate( InstanceContent& instance, uint32_t currTime ) override
+  void onUpdate( InstanceContent& instance, uint64_t tickCount ) override
   {
 
   }
diff --git a/src/tools/event_object_parser/main.cpp b/src/tools/event_object_parser/main.cpp
index a4d451a9..d531797d 100644
--- a/src/tools/event_object_parser/main.cpp
+++ b/src/tools/event_object_parser/main.cpp
@@ -137,7 +137,7 @@ void loadAllInstanceContentEntries()
       if( !ic )
         continue;
       type = ic->instanceContentType;
-      name = ic->name;
+      name = cfc->name;
     }
     else if( cfc->contentLinkType == 5 )
     { 
diff --git a/src/tools/event_object_parser/questbattle.tmpl b/src/tools/event_object_parser/questbattle.tmpl
index cc161d97..9e7d968c 100644
--- a/src/tools/event_object_parser/questbattle.tmpl
+++ b/src/tools/event_object_parser/questbattle.tmpl
@@ -16,7 +16,7 @@ public:
 EOBJ_INIT
   }
 
-  void onUpdate( QuestBattle& instance, uint32_t currTime ) override
+  void onUpdate( QuestBattle& instance, uint64_t tickCount ) override
   {
 
   }
diff --git a/src/world/Manager/TerritoryMgr.cpp b/src/world/Manager/TerritoryMgr.cpp
index 83b833e8..c649964e 100644
--- a/src/world/Manager/TerritoryMgr.cpp
+++ b/src/world/Manager/TerritoryMgr.cpp
@@ -345,13 +345,13 @@ Sapphire::TerritoryPtr Sapphire::World::Manager::TerritoryMgr::createInstanceCon
 
   auto pTeri = getTerritoryDetail( pContentFinderCondition->territoryType );
 
-  if( !pTeri || pInstanceContent->name.empty() )
+  if( !pTeri || pContentFinderCondition->name.empty() )
     return nullptr;
 
   Logger::debug( "Starting instance for InstanceContent id: {0} ({1})", instanceContentId, pInstanceContent->name );
 
   auto pZone = make_InstanceContent( pInstanceContent, pContentFinderCondition->territoryType, getNextInstanceId(),
-                                     pTeri->name, pInstanceContent->name, instanceContentId, framework() );
+                                       pTeri->name, pContentFinderCondition->name, instanceContentId, framework() );
   pZone->init();
 
   m_instanceContentIdToInstanceMap[ instanceContentId ][ pZone->getGuId() ] = pZone;

From 1b0441a20fb8c9f5b9a415236655723b6d662b35 Mon Sep 17 00:00:00 2001
From: Tahir Akhlaq <xdemolish@hotmail.com>
Date: Sat, 23 Nov 2019 09:22:42 +0000
Subject: [PATCH 186/351] fix vs2019 build

---
 deps/mysqlConnector/Connection.cpp | 1 +
 deps/mysqlConnector/Connection.h   | 1 +
 src/api/PlayerMinimal.h            | 3 ++-
 src/common/Database/DbCommon.h     | 2 ++
 src/world/Linkshell/Linkshell.h    | 1 +
 5 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/deps/mysqlConnector/Connection.cpp b/deps/mysqlConnector/Connection.cpp
index 9b317dc9..a1c2a58e 100644
--- a/deps/mysqlConnector/Connection.cpp
+++ b/deps/mysqlConnector/Connection.cpp
@@ -4,6 +4,7 @@
 #include "PreparedStatement.h"
 #include <mysql.h>
 
+#include <stdexcept>
 #include <vector>
 
 Mysql::Connection::Connection( std::shared_ptr< MySqlBase > pBase,
diff --git a/deps/mysqlConnector/Connection.h b/deps/mysqlConnector/Connection.h
index 1283ead5..e09bda69 100644
--- a/deps/mysqlConnector/Connection.h
+++ b/deps/mysqlConnector/Connection.h
@@ -3,6 +3,7 @@
 
 #include <memory>
 #include <map>
+#include <string>
 #include "MysqlCommon.h"
 
 typedef struct st_mysql MYSQL;
diff --git a/src/api/PlayerMinimal.h b/src/api/PlayerMinimal.h
index d51251c2..47b902b3 100644
--- a/src/api/PlayerMinimal.h
+++ b/src/api/PlayerMinimal.h
@@ -3,7 +3,8 @@
 
 #include <map>
 #include <stdint.h>
-#include <string.h>
+#include <string.h> // ?
+#include <string>
 
 namespace Sapphire::Api
 {
diff --git a/src/common/Database/DbCommon.h b/src/common/Database/DbCommon.h
index 89d537b6..d702ce72 100644
--- a/src/common/Database/DbCommon.h
+++ b/src/common/Database/DbCommon.h
@@ -1,6 +1,8 @@
 #ifndef SAPPHIRE_DBCOMMON_H
 #define SAPPHIRE_DBCOMMON_H
 
+#include <string>
+
 namespace Sapphire::Db
 {
   struct ConnectionInfo
diff --git a/src/world/Linkshell/Linkshell.h b/src/world/Linkshell/Linkshell.h
index 31d32717..7fe91864 100644
--- a/src/world/Linkshell/Linkshell.h
+++ b/src/world/Linkshell/Linkshell.h
@@ -3,6 +3,7 @@
 
 #include <Common.h>
 #include <set>
+#include <string>
 
 namespace Sapphire
 {

From aefc7965ea442caa27c774fbf41fd03270272be0 Mon Sep 17 00:00:00 2001
From: Cara <caraxian040@gmail.com>
Date: Sun, 24 Nov 2019 12:29:24 +1030
Subject: [PATCH 187/351] UpdatePositionHandler 5.11

---
 src/common/Network/PacketDef/Ipcs.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/common/Network/PacketDef/Ipcs.h b/src/common/Network/PacketDef/Ipcs.h
index 63463fb0..a9dd41ef 100644
--- a/src/common/Network/PacketDef/Ipcs.h
+++ b/src/common/Network/PacketDef/Ipcs.h
@@ -332,7 +332,7 @@ namespace Sapphire::Network::Packets
     GMCommand2 = 0x013F, // updated 5.0
     AoESkillHandler = 0x140, // updated 5.0
 
-    UpdatePositionHandler = 0x01EC, // updated 5.1
+    UpdatePositionHandler = 0x01BF, // updated 5.11
 
     InventoryModifyHandler = 0x029B, // updated 5.11
     

From 44a542d603926dc1fc5c8a9d41302c15e20f8e98 Mon Sep 17 00:00:00 2001
From: karashiiro <49822414+karashiiro@users.noreply.github.com>
Date: Sun, 24 Nov 2019 19:05:27 -0800
Subject: [PATCH 188/351] CharaNameReq opcode update

---
 src/common/Network/PacketDef/Ipcs.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/common/Network/PacketDef/Ipcs.h b/src/common/Network/PacketDef/Ipcs.h
index b2c2bbd1..a952281f 100644
--- a/src/common/Network/PacketDef/Ipcs.h
+++ b/src/common/Network/PacketDef/Ipcs.h
@@ -161,7 +161,7 @@ namespace Sapphire::Network::Packets
 
     ModelEquip = 0x025E, // updated 5.1
     Examine = 0x00EA, // updated 5.1
-    CharaNameReq = 0x0198, // updated 5.0
+    CharaNameReq = 0x006C, // updated 5.11
 
     // nb: see #565 on github
     UpdateRetainerItemSalePrice = 0x019F, // updated 5.0

From 03f89dfbee374f8181f158ea1aa6f537c64157b6 Mon Sep 17 00:00:00 2001
From: karashiiro <49822414+karashiiro@users.noreply.github.com>
Date: Sat, 21 Dec 2019 16:17:46 -0800
Subject: [PATCH 189/351] Identify elementalLevel and element in PlayerSpawn
 packet

---
 src/common/Network/PacketDef/Zone/ServerZoneDef.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/common/Network/PacketDef/Zone/ServerZoneDef.h b/src/common/Network/PacketDef/Zone/ServerZoneDef.h
index 9dc959b9..e4fc231b 100644
--- a/src/common/Network/PacketDef/Zone/ServerZoneDef.h
+++ b/src/common/Network/PacketDef/Zone/ServerZoneDef.h
@@ -694,8 +694,8 @@ namespace Sapphire::Network::Packets::Server
     uint8_t mountFeet;
     uint8_t mountColor;
     uint8_t scale;
-    uint32_t u29b;
-    uint32_t u30b;
+    uint32_t elementalLevel;
+    uint32_t element;
     Common::StatusEffect effect[30];
     Common::FFXIVARR_POSITION3 pos;
     uint32_t models[10];

From 4c4fff58ce81c9e41b9ac9e49a60e6759ceb442a Mon Sep 17 00:00:00 2001
From: kbasikhin <kirrilius@gmail.com>
Date: Thu, 26 Dec 2019 11:09:15 +0300
Subject: [PATCH 190/351] using static and reinterpret casts instead of old
 style casts

---
 src/world/Action/Action.cpp                   |  12 +-
 src/world/Actor/BNpc.cpp                      |  28 ++--
 src/world/Actor/Chara.cpp                     |  24 ++--
 src/world/Manager/DebugCommandMgr.cpp         |  34 ++---
 src/world/Manager/HousingMgr.cpp              | 134 +++++++++---------
 src/world/Math/CalcStats.cpp                  |   4 +-
 src/world/Network/GameConnection.cpp          |  22 +--
 src/world/Network/Handlers/CFHandlers.cpp     |   4 +-
 .../Network/Handlers/ClientTriggerHandler.cpp |  16 +--
 .../Network/Handlers/GMCommandHandlers.cpp    |  32 ++---
 src/world/Territory/Cell.cpp                  |   4 +-
 src/world/Territory/House.cpp                 |   4 +-
 .../Housing/HousingInteriorTerritory.cpp      |  12 +-
 13 files changed, 165 insertions(+), 165 deletions(-)

diff --git a/src/world/Action/Action.cpp b/src/world/Action/Action.cpp
index 2fb1fb4c..550a7be3 100644
--- a/src/world/Action/Action.cpp
+++ b/src/world/Action/Action.cpp
@@ -206,7 +206,7 @@ bool Action::Action::update()
 
   uint64_t tickCount = Common::Util::getTimeMs();
 
-  if( !hasCastTime() || std::difftime( tickCount, m_startTime ) > m_castTimeMs )
+  if( !hasCastTime() || std::difftime( static_cast< time_t >( tickCount ), static_cast< time_t >( m_startTime ) ) > m_castTimeMs )
   {
     execute();
     return true;
@@ -257,7 +257,7 @@ void Action::Action::start()
   auto pScriptMgr = m_pFw->get< Scripting::ScriptMgr >();
 
   // check the lut too and see if we have something usable, otherwise cancel the cast
-  if( !pScriptMgr->onStart( *this ) && !ActionLut::validEntryExists( getId() ) )
+  if( !pScriptMgr->onStart( *this ) && !ActionLut::validEntryExists( static_cast< uint16_t >( getId() ) ) )
   {
     // script not implemented and insufficient lut data (no potencies)
     interrupt();
@@ -392,7 +392,7 @@ void Action::Action::buildEffects()
 
   auto pScriptMgr = m_pFw->get< Scripting::ScriptMgr >();
 
-  if( !pScriptMgr->onExecute( *this ) && !ActionLut::validEntryExists( getId() ) )
+  if( !pScriptMgr->onExecute( *this ) && !ActionLut::validEntryExists( static_cast< uint16_t >( getId() ) ) )
   {
     if( auto player = m_pSource->getAsPlayer() )
     {
@@ -405,7 +405,7 @@ void Action::Action::buildEffects()
   if( m_hitActors.empty() )
     return;
 
-  auto lutEntry = ActionLut::getEntry( getId() );
+  auto lutEntry = ActionLut::getEntry( static_cast< uint16_t >( getId() ) );
 
   // no script exists but we have a valid lut entry
   if( auto player = getSourceChara()->getAsPlayer() )
@@ -545,11 +545,11 @@ bool Action::Action::primaryCostCheck( bool subtractCosts )
 
       auto cost = m_primaryCost * 100;
 
-      if( curMp < cost )
+      if( curMp < static_cast< uint32_t >( cost ) )
         return false;
 
       if( subtractCosts )
-        m_pSource->setMp( curMp - cost );
+        m_pSource->setMp( curMp - static_cast< uint32_t >( cost ) );
 
       return true;
     }
diff --git a/src/world/Actor/BNpc.cpp b/src/world/Actor/BNpc.cpp
index d133766e..7dafc83c 100644
--- a/src/world/Actor/BNpc.cpp
+++ b/src/world/Actor/BNpc.cpp
@@ -301,7 +301,7 @@ Sapphire::Entity::CharaPtr Sapphire::Entity::BNpc::hateListGetHighest()
 void Sapphire::Entity::BNpc::hateListAdd( Sapphire::Entity::CharaPtr pChara, int32_t hateAmount )
 {
   auto hateEntry = std::make_shared< HateListEntry >();
-  hateEntry->m_hateAmount = hateAmount;
+  hateEntry->m_hateAmount = static_cast< uint32_t >( hateAmount );
   hateEntry->m_pChara = pChara;
 
   m_hateList.insert( hateEntry );
@@ -318,13 +318,13 @@ void Sapphire::Entity::BNpc::hateListUpdate( Sapphire::Entity::CharaPtr pChara,
   {
     if( listEntry->m_pChara == pChara )
     {
-      listEntry->m_hateAmount += hateAmount;
+      listEntry->m_hateAmount += static_cast< uint32_t >( hateAmount );
       return;
     }
   }
 
   auto hateEntry = std::make_shared< HateListEntry >();
-  hateEntry->m_hateAmount = hateAmount;
+  hateEntry->m_hateAmount = static_cast< uint32_t >( hateAmount );
   hateEntry->m_pChara = pChara;
   m_hateList.insert( hateEntry );
 }
@@ -590,7 +590,7 @@ void Sapphire::Entity::BNpc::onDeath()
     // TODO: handle drops 
     auto pPlayer = pHateEntry->m_pChara->getAsPlayer();
     if( pPlayer )
-      pPlayer->onMobKill( m_bNpcNameId );
+      pPlayer->onMobKill( static_cast< uint16_t >( m_bNpcNameId ) );
   }
   hateListClear();
 }
@@ -654,7 +654,7 @@ void Sapphire::Entity::BNpc::setOwner( Sapphire::Entity::CharaPtr m_pChara )
   {
     auto setOwnerPacket = makeZonePacket< FFXIVIpcActorOwner >( getId() );
     setOwnerPacket->data().type = 0x01;
-    setOwnerPacket->data().actorId = INVALID_GAME_OBJECT_ID;
+    setOwnerPacket->data().actorId = static_cast< uint32_t >( INVALID_GAME_OBJECT_ID );
     sendToInRangeSet( setOwnerPacket );
   }
 }
@@ -697,7 +697,7 @@ void Sapphire::Entity::BNpc::autoAttack( CharaPtr pTarget )
     auto effectPacket = std::make_shared< Server::EffectPacket >( getId(), pTarget->getId(), 7 );
     effectPacket->setRotation( Util::floatToUInt16Rot( getRot() ) );
     Common::EffectEntry effectEntry{};
-    effectEntry.value = damage;
+    effectEntry.value = static_cast< int16_t >( damage );
     effectEntry.effectType = ActionEffectType::Damage;
     effectEntry.hitSeverity = ActionHitSeverityType::NormalDamage;
     effectEntry.param = 0x71;
@@ -705,7 +705,7 @@ void Sapphire::Entity::BNpc::autoAttack( CharaPtr pTarget )
 
     sendToInRangeSet( effectPacket );
 
-    pTarget->takeDamage( damage );
+    pTarget->takeDamage( static_cast< uint16_t >( damage ) );
 
   }
 }
@@ -731,13 +731,13 @@ void Sapphire::Entity::BNpc::calculateStats()
 
   m_baseStats.determination = static_cast< uint32_t >( base );
   m_baseStats.pie = static_cast< uint32_t >( base );
-  m_baseStats.skillSpeed = paramGrowthInfo->baseSpeed;
-  m_baseStats.spellSpeed = paramGrowthInfo->baseSpeed;
-  m_baseStats.accuracy = paramGrowthInfo->baseSpeed;
-  m_baseStats.critHitRate = paramGrowthInfo->baseSpeed;
-  m_baseStats.attackPotMagic = paramGrowthInfo->baseSpeed;
-  m_baseStats.healingPotMagic = paramGrowthInfo->baseSpeed;
-  m_baseStats.tenacity = paramGrowthInfo->baseSpeed;
+  m_baseStats.skillSpeed = static_cast< uint32_t >( paramGrowthInfo->baseSpeed );
+  m_baseStats.spellSpeed = static_cast< uint32_t >( paramGrowthInfo->baseSpeed );
+  m_baseStats.accuracy = static_cast< uint32_t >( paramGrowthInfo->baseSpeed );
+  m_baseStats.critHitRate = static_cast< uint32_t >( paramGrowthInfo->baseSpeed );
+  m_baseStats.attackPotMagic = static_cast< uint32_t >( paramGrowthInfo->baseSpeed );
+  m_baseStats.healingPotMagic = static_cast< uint32_t >( paramGrowthInfo->baseSpeed );
+  m_baseStats.tenacity = static_cast< uint32_t >( paramGrowthInfo->baseSpeed );
 
   m_baseStats.attack = m_baseStats.str;
   m_baseStats.attackPotMagic = m_baseStats.inte;
diff --git a/src/world/Actor/Chara.cpp b/src/world/Actor/Chara.cpp
index 70656675..c8cef7b1 100644
--- a/src/world/Actor/Chara.cpp
+++ b/src/world/Actor/Chara.cpp
@@ -245,14 +245,14 @@ void Sapphire::Entity::Chara::setMp( uint32_t mp )
 /*! \param gp amount to set*/
 void Sapphire::Entity::Chara::setGp( uint32_t gp )
 {
-  m_gp = gp;
+  m_gp = static_cast< uint16_t >( gp );
   sendStatusUpdate();
 }
 
 /*! \param tp amount to set*/
 void Sapphire::Entity::Chara::setTp( uint32_t tp )
 {
-  m_tp = tp;
+  m_tp = static_cast< uint16_t >( tp );
   sendStatusUpdate();
 }
 
@@ -354,14 +354,14 @@ bool Sapphire::Entity::Chara::checkAction()
 
 void Sapphire::Entity::Chara::update( uint64_t tickCount )
 {
-  if( std::difftime( tickCount, m_lastTickTime ) > 3000 )
+  if( std::difftime( static_cast< time_t >( tickCount ), m_lastTickTime ) > 3000 )
   {
     onTick();
 
-    m_lastTickTime = tickCount;
+    m_lastTickTime = static_cast< time_t >( tickCount );
   }
 
-  m_lastUpdate = tickCount;
+  m_lastUpdate = static_cast< time_t >( tickCount );
 }
 
 /*!
@@ -494,7 +494,7 @@ void Sapphire::Entity::Chara::autoAttack( CharaPtr pTarget )
     auto effectPacket = std::make_shared< Server::EffectPacket >( getId(), pTarget->getId(), 7 );
     effectPacket->setRotation( Util::floatToUInt16Rot( getRot() ) );
     Common::EffectEntry effectEntry{};
-    effectEntry.value = damage;
+    effectEntry.value = static_cast< int16_t >( damage );
     effectEntry.effectType = ActionEffectType::Damage;
     effectEntry.hitSeverity = ActionHitSeverityType::NormalDamage;
     effectEntry.param = 0x71;
@@ -522,10 +522,10 @@ void Sapphire::Entity::Chara::addStatusEffect( StatusEffect::StatusEffectPtr pEf
 
   statusEffectAdd->data().actor_id = pEffect->getTargetActorId();
   statusEffectAdd->data().current_hp = getHp();
-  statusEffectAdd->data().current_mp = getMp();
+  statusEffectAdd->data().current_mp = static_cast< uint16_t >( getMp() );
   statusEffectAdd->data().current_tp = getTp();
   statusEffectAdd->data().max_hp = getMaxHp();
-  statusEffectAdd->data().max_mp = getMaxMp();
+  statusEffectAdd->data().max_mp = static_cast< uint16_t >( getMaxMp() );
   statusEffectAdd->data().max_something = 1;
   //statusEffectAdd->data().unknown2 = 28;
 
@@ -533,8 +533,8 @@ void Sapphire::Entity::Chara::addStatusEffect( StatusEffect::StatusEffectPtr pEf
 
   status.sourceActorId = pEffect->getSrcActorId();
   status.duration = static_cast< float >( pEffect->getDuration() ) / 1000;
-  status.id = pEffect->getId();
-  status.index = nextSlot;
+  status.id = static_cast< uint16_t >( pEffect->getId() );
+  status.index = static_cast< uint8_t >( nextSlot );
   status.param = pEffect->getParam();
 
   sendToInRangeSet( statusEffectAdd, isPlayer() );
@@ -568,7 +568,7 @@ int8_t Sapphire::Entity::Chara::getStatusEffectFreeSlot()
   if( m_statusEffectFreeSlotQueue.empty() )
     return freeEffectSlot;
 
-  freeEffectSlot = m_statusEffectFreeSlotQueue.front();
+  freeEffectSlot = static_cast< int8_t >( m_statusEffectFreeSlotQueue.front() );
   m_statusEffectFreeSlotQueue.pop();
 
   return freeEffectSlot;
@@ -929,4 +929,4 @@ uint32_t Sapphire::Entity::Chara::getStatValue( Sapphire::Common::BaseParam base
   }
 
   return value + getBonusStat( baseParam );
-}
\ No newline at end of file
+}
diff --git a/src/world/Manager/DebugCommandMgr.cpp b/src/world/Manager/DebugCommandMgr.cpp
index 9fef637d..a434446d 100644
--- a/src/world/Manager/DebugCommandMgr.cpp
+++ b/src/world/Manager/DebugCommandMgr.cpp
@@ -200,7 +200,7 @@ void Sapphire::World::Manager::DebugCommandMgr::set( char* data, Entity::Player&
     int32_t aetheryteId;
     sscanf( params.c_str(), "%i", &aetheryteId );
 
-    player.teleport( aetheryteId );
+    player.teleport( static_cast< uint16_t >( aetheryteId ) );
   }
   else if( ( subCommand == "discovery" ) && ( params != "" ) )
   {
@@ -209,8 +209,8 @@ void Sapphire::World::Manager::DebugCommandMgr::set( char* data, Entity::Player&
     sscanf( params.c_str(), "%i %i", &map_id, &discover_id );
 
     auto discoveryPacket = makeZonePacket< FFXIVIpcDiscovery >( player.getId() );
-    discoveryPacket->data().map_id = map_id;
-    discoveryPacket->data().map_part_id = discover_id;
+    discoveryPacket->data().map_id = static_cast< uint32_t >( map_id );
+    discoveryPacket->data().map_part_id = static_cast< uint32_t >( discover_id );
     player.queuePacket( discoveryPacket );
   }
 
@@ -258,7 +258,7 @@ void Sapphire::World::Manager::DebugCommandMgr::set( char* data, Entity::Player&
     int32_t minutes;
     sscanf( params.c_str(), "%d", &minutes );
 
-    player.setCFPenaltyMinutes( minutes );
+    player.setCFPenaltyMinutes( static_cast< uint32_t >( minutes ) );
   }
   else if( subCommand == "eorzeatime" )
   {
@@ -274,7 +274,7 @@ void Sapphire::World::Manager::DebugCommandMgr::set( char* data, Entity::Player&
     sscanf( params.c_str(), "%d", &id );
 
     player.dismount();
-    player.mount( id );
+    player.mount( static_cast< uint32_t >( id ) );
   }
   else if( subCommand == "msqguide" )
   {
@@ -282,7 +282,7 @@ void Sapphire::World::Manager::DebugCommandMgr::set( char* data, Entity::Player&
     sscanf( params.c_str(), "%d", &id );
 
     auto msqPacket = makeZonePacket< FFXIVIpcMSQTrackerProgress >( player.getId() );
-    msqPacket->data().id = id;
+    msqPacket->data().id = static_cast< uint32_t >( id );
     player.queuePacket( msqPacket );
 
     player.sendDebug( "MSQ Guide updated " );
@@ -293,7 +293,7 @@ void Sapphire::World::Manager::DebugCommandMgr::set( char* data, Entity::Player&
     sscanf( params.c_str(), "%d", &id );
 
     auto msqPacket = makeZonePacket< FFXIVIpcMSQTrackerComplete >( player.getId() );
-    msqPacket->data().id = id;
+    msqPacket->data().id = static_cast< uint32_t >( id );
     player.queuePacket( msqPacket );
 
     player.sendDebug( "MSQ Guide updated " );
@@ -434,7 +434,7 @@ void Sapphire::World::Manager::DebugCommandMgr::add( char* data, Entity::Player&
     uint32_t titleId;
     sscanf( params.c_str(), "%u", &titleId );
 
-    player.addTitle( titleId );
+    player.addTitle( static_cast< uint16_t >( titleId ) );
     player.sendNotice( "Added title (id#{0})", titleId );
   }
   else if( subCommand == "bnpc" )
@@ -495,13 +495,13 @@ void Sapphire::World::Manager::DebugCommandMgr::add( char* data, Entity::Player&
     player.sendNotice( "Injecting ACTOR_CONTROL {0}", opcode );
 
     auto actorControl = makeZonePacket< FFXIVIpcActorControlSelf >( playerId, player.getId() );
-    actorControl->data().category = opcode;
-    actorControl->data().param1 = param1;
-    actorControl->data().param2 = param2;
-    actorControl->data().param3 = param3;
-    actorControl->data().param4 = param4;
-    actorControl->data().param5 = param5;
-    actorControl->data().param6 = param6;
+    actorControl->data().category = static_cast< uint16_t >( opcode );
+    actorControl->data().param1 = static_cast< uint16_t >( param1 );
+    actorControl->data().param2 = static_cast< uint16_t >( param2 );
+    actorControl->data().param3 = static_cast< uint16_t >( param3 );
+    actorControl->data().param4 = static_cast< uint16_t >( param4 );
+    actorControl->data().param5 = static_cast< uint16_t >( param5 );
+    actorControl->data().param6 = static_cast< uint16_t >( param6 );
     player.queuePacket( actorControl );
 
 
@@ -521,7 +521,7 @@ void Sapphire::World::Manager::DebugCommandMgr::add( char* data, Entity::Player&
     uint32_t id;
 
     sscanf( params.c_str(), "%d", &id );
-    player.learnAction( id );
+    player.learnAction( static_cast< uint16_t >( id ) );
   }
   else if ( subCommand == "effect")
   {
@@ -532,7 +532,7 @@ void Sapphire::World::Manager::DebugCommandMgr::add( char* data, Entity::Player&
     effectPacket->setRotation( Common::Util::floatToUInt16Rot( player.getRot() ) );
 
     Common::EffectEntry entry{};
-    entry.value = param1;
+    entry.value = static_cast< int16_t >( param1 );
     entry.effectType = Common::ActionEffectType::Damage;
     entry.hitSeverity = Common::ActionHitSeverityType::NormalDamage;
 
diff --git a/src/world/Manager/HousingMgr.cpp b/src/world/Manager/HousingMgr.cpp
index 028d25cc..43d697ee 100644
--- a/src/world/Manager/HousingMgr.cpp
+++ b/src/world/Manager/HousingMgr.cpp
@@ -159,7 +159,7 @@ bool Sapphire::World::Manager::HousingMgr::loadEstateInventories()
       continue;
     }
 
-    container->second->setItem( slot, item );
+    container->second->setItem( static_cast< uint8_t >( slot ), item );
 
     itemCount++;
   }
@@ -182,7 +182,7 @@ void Sapphire::World::Manager::HousingMgr::initLandCache()
 
     // land stuff
     entry.m_landSetId = res->getUInt64( "LandSetId" );
-    entry.m_landId = res->getUInt( "LandId" );
+    entry.m_landId = static_cast< uint16_t >( res->getUInt( "LandId" ) );
 
     entry.m_type = static_cast< Common::LandType >( res->getUInt( "Type" ) );
     entry.m_size = static_cast< Common::HouseSize >( res->getUInt8( "Size" ) );
@@ -233,9 +233,9 @@ void Sapphire::World::Manager::HousingMgr::initLandCache()
     // setup containers
     // todo: this is pretty garbage
     Common::LandIdent ident;
-    ident.territoryTypeId = entry.m_landSetId >> 16;
-    ident.wardNum = entry.m_landSetId & 0xFFFF;
-    ident.landId = entry.m_landId;
+    ident.territoryTypeId = static_cast< int16_t >( entry.m_landSetId >> 16 );
+    ident.wardNum = static_cast< int16_t >( entry.m_landSetId & 0xFFFF );
+    ident.landId = static_cast< int16_t >( entry.m_landId );
     ident.worldId = 67;
 
     auto& containers = getEstateInventory( ident );
@@ -305,20 +305,20 @@ Sapphire::LandPtr Sapphire::World::Manager::HousingMgr::getLandByOwnerId( uint32
   if( !hZone )
     return nullptr;
 
-  return hZone->getLand( res->getUInt( 2 ) );
+  return hZone->getLand( static_cast< uint8_t >( res->getUInt( 2 ) ) );
 }
 
 void Sapphire::World::Manager::HousingMgr::sendLandSignOwned( Entity::Player& player, const Common::LandIdent ident )
 {
-  player.setActiveLand( ident.landId, ident.wardNum );
+  player.setActiveLand( static_cast< uint8_t >( ident.landId ), static_cast< uint8_t >( ident.wardNum ) );
 
-  auto landSetId = toLandSetId( ident.territoryTypeId, ident.wardNum );
+  auto landSetId = toLandSetId( static_cast< uint16_t >( ident.territoryTypeId ), static_cast< uint8_t >( ident.wardNum ) );
   auto hZone = getHousingZoneByLandSetId( landSetId );
 
   if( !hZone )
     return;
 
-  auto land = hZone->getLand( ident.landId );
+  auto land = hZone->getLand( static_cast< uint8_t >( ident.landId ) );
   if( !land )
     return;
 
@@ -335,7 +335,7 @@ void Sapphire::World::Manager::HousingMgr::sendLandSignOwned( Entity::Player& pl
     std::strcpy( landInfoSignPacket->data().estateGreeting, house->getHouseGreeting().c_str() );
   }
 
-  uint32_t playerId = land->getOwnerId();
+  uint32_t playerId = static_cast< uint32_t >( land->getOwnerId() );
   std::string playerName = framework()->get< World::ServerMgr >()->getPlayerNameFromDb( playerId );
 
   memcpy( &landInfoSignPacket->data().ownerName, playerName.c_str(), playerName.size() );
@@ -345,15 +345,15 @@ void Sapphire::World::Manager::HousingMgr::sendLandSignOwned( Entity::Player& pl
 
 void Sapphire::World::Manager::HousingMgr::sendLandSignFree( Entity::Player& player, const Common::LandIdent ident )
 {
-  player.setActiveLand( ident.landId, ident.wardNum );
+  player.setActiveLand( static_cast< uint8_t >( ident.landId ), static_cast< uint8_t >( ident.wardNum ) );
 
-  auto landSetId = toLandSetId( ident.territoryTypeId, ident.wardNum );
+  auto landSetId = toLandSetId( static_cast< uint16_t >( ident.territoryTypeId ), static_cast< uint8_t >( ident.wardNum ) );
   auto hZone = getHousingZoneByLandSetId( landSetId );
 
   if( !hZone )
     return;
 
-  auto land = hZone->getLand( ident.landId );
+  auto land = hZone->getLand( static_cast< uint8_t >( ident.landId ) );
   auto plotPricePacket = makeZonePacket< Server::FFXIVIpcLandPriceUpdate >( player.getId() );
   plotPricePacket->data().price = land->getCurrentPrice();
   plotPricePacket->data().timeLeft = land->getDevaluationTime();
@@ -471,7 +471,7 @@ void Sapphire::World::Manager::HousingMgr::sendWardLandInfo( Entity::Player& pla
 
   auto wardInfoPacket = makeZonePacket< Server::FFXIVIpcHousingWardInfo >( player.getId() );
   wardInfoPacket->data().landIdent.wardNum = wardId;
-  wardInfoPacket->data().landIdent.territoryTypeId = territoryTypeId;
+  wardInfoPacket->data().landIdent.territoryTypeId = static_cast< int16_t >( territoryTypeId );
 
   // todo: properly get worldId
   wardInfoPacket->data().landIdent.worldId = 67;
@@ -509,7 +509,7 @@ void Sapphire::World::Manager::HousingMgr::sendWardLandInfo( Entity::Player& pla
         entry.infoFlags |= Common::WardlandFlags::IsEstateOwned;
 
         auto owner = land->getOwnerId();
-        auto playerName = framework()->get< World::ServerMgr >()->getPlayerNameFromDb( owner );
+        auto playerName = framework()->get< World::ServerMgr >()->getPlayerNameFromDb( static_cast< uint32_t >( owner ) );
         memcpy( &entry.estateOwnerName, playerName.c_str(), playerName.size() );
 
         break;
@@ -524,13 +524,13 @@ void Sapphire::World::Manager::HousingMgr::sendWardLandInfo( Entity::Player& pla
 
 void Sapphire::World::Manager::HousingMgr::sendEstateGreeting( Entity::Player& player, const Common::LandIdent ident )
 {
-  auto landSetId = toLandSetId( ident.territoryTypeId, ident.wardNum );
+  auto landSetId = toLandSetId( static_cast< uint16_t >( ident.territoryTypeId ), static_cast< uint8_t >( ident.wardNum ) );
   auto hZone = getHousingZoneByLandSetId( landSetId );
 
   if( !hZone )
     return;
 
-  auto land = hZone->getLand( ident.landId );
+  auto land = hZone->getLand( static_cast< uint8_t >( ident.landId ) );
   if( !land )
     return;
 
@@ -630,9 +630,9 @@ bool Sapphire::World::Manager::HousingMgr::initHouseModels( Entity::Player& play
       if( item.second == 0 )
         continue;
 
-      auto pItem = invMgr->createItem( player, item.second );
+      auto pItem = invMgr->createItem( player, static_cast< uint32_t >( item.second ) );
 
-      container->setItem( item.first, pItem );
+      container->setItem( static_cast< uint8_t >( item.first ), pItem );
     }
 
     invMgr->saveHousingContainer( land->getLandIdent(), container );
@@ -701,7 +701,7 @@ void Sapphire::World::Manager::HousingMgr::buildPresetEstate( Entity::Player& pl
   // start house built event
   // CmnDefHousingBuildHouse_00149
   player.eventStart( player.getId(), 0x000B0095, Event::EventHandler::EventType::Housing, 1, 1 );
-  player.playScene( 0x000B0095, 0, SET_BASE | HIDE_HOTBAR , 0, 1, plotNum, nullptr );
+  player.playScene( 0x000B0095, 0, static_cast< uint32_t >( SET_BASE | HIDE_HOTBAR ) , 0, 1, plotNum, nullptr );
 
   player.setLandFlags( LandFlagsSlot::Private, EstateBuilt, ident );
   player.sendLandFlagsSlot( LandFlagsSlot::Private );
@@ -711,13 +711,13 @@ void Sapphire::World::Manager::HousingMgr::buildPresetEstate( Entity::Player& pl
 
 void Sapphire::World::Manager::HousingMgr::requestEstateRename( Entity::Player& player, const Common::LandIdent ident )
 {
-  auto landSetId = toLandSetId( ident.territoryTypeId, ident.wardNum );
+  auto landSetId = toLandSetId( static_cast< uint16_t >( ident.territoryTypeId ), static_cast< uint8_t >( ident.wardNum ) );
   auto hZone = getHousingZoneByLandSetId( landSetId );
 
   if( !hZone )
     return;
 
-  auto land = hZone->getLand( ident.landId );
+  auto land = hZone->getLand( static_cast< uint8_t >( ident.landId ) );
 
   auto house = land->getHouse();
   if( !house )
@@ -733,13 +733,13 @@ void Sapphire::World::Manager::HousingMgr::requestEstateRename( Entity::Player&
 
 void Sapphire::World::Manager::HousingMgr::requestEstateEditGreeting( Entity::Player& player, const Common::LandIdent ident )
 {
-  auto landSetId = toLandSetId( ident.territoryTypeId, ident.wardNum );
+  auto landSetId = toLandSetId( static_cast< uint16_t >( ident.territoryTypeId ), static_cast< uint8_t >( ident.wardNum ) );
   auto hZone = getHousingZoneByLandSetId( landSetId );
 
   if( !hZone )
     return;
 
-  auto land = hZone->getLand( ident.landId );
+  auto land = hZone->getLand( static_cast< uint8_t >( ident.landId ) );
   if( !land )
     return;
 
@@ -757,13 +757,13 @@ void Sapphire::World::Manager::HousingMgr::requestEstateEditGreeting( Entity::Pl
 
 void Sapphire::World::Manager::HousingMgr::updateEstateGreeting( Entity::Player& player, const Common::LandIdent ident, const std::string& greeting )
 {
-  auto landSetId = toLandSetId( ident.territoryTypeId, ident.wardNum );
+  auto landSetId = toLandSetId( static_cast< uint16_t >( ident.territoryTypeId ), static_cast< uint8_t >( ident.wardNum ) );
   auto zone = getHousingZoneByLandSetId( landSetId );
 
   if( !zone )
     return;
 
-  auto land = zone->getLand( ident.landId );
+  auto land = zone->getLand( static_cast< uint8_t >( ident.landId ) );
   if( !land )
     return;
 
@@ -782,7 +782,7 @@ void Sapphire::World::Manager::HousingMgr::updateEstateGreeting( Entity::Player&
 
 void Sapphire::World::Manager::HousingMgr::requestEstateEditGuestAccess( Entity::Player& player, const Common::LandIdent ident )
 {
-  auto landSetId = toLandSetId( ident.territoryTypeId, ident.wardNum );
+  auto landSetId = toLandSetId( static_cast< uint16_t >( ident.territoryTypeId ), static_cast< uint8_t >( ident.wardNum ) );
   auto hZone = getHousingZoneByLandSetId( landSetId );
 
   if( !hZone )
@@ -804,13 +804,13 @@ void Sapphire::World::Manager::HousingMgr::requestEstateEditGuestAccess( Entity:
 Sapphire::Common::LandIdent Sapphire::World::Manager::HousingMgr::clientTriggerParamsToLandIdent( uint32_t param11, uint32_t param12, bool use16bits ) const
 {
   Common::LandIdent ident;
-  ident.worldId = param11 >> 16;
-  ident.territoryTypeId = param11 & 0xFFFF;
+  ident.worldId = static_cast< int16_t >( param11 >> 16 );
+  ident.territoryTypeId = static_cast< int16_t >( param11 & 0xFFFF );
 
   if( use16bits )
   {
-    ident.wardNum = param12 >> 16;
-    ident.landId = param12 & 0xFFFF;
+    ident.wardNum = static_cast< int16_t >( param12 >> 16 );
+    ident.landId = static_cast< int16_t >( param12 & 0xFFFF );
   }
   else
   {
@@ -837,13 +837,13 @@ void Sapphire::World::Manager::HousingMgr::sendEstateInventory( Entity::Player&
 
     auto ident = internalZone->getLandIdent();
 
-    auto landSetId = toLandSetId( ident.territoryTypeId, ident.wardNum );
+    auto landSetId = toLandSetId( static_cast< uint16_t >( ident.territoryTypeId ), static_cast< uint8_t >( ident.wardNum ) );
     auto exteriorZone = getHousingZoneByLandSetId( landSetId );
 
     if( !exteriorZone )
       return;
 
-    targetLand = exteriorZone->getLand( ident.landId );
+    targetLand = exteriorZone->getLand( static_cast< uint8_t >( ident.landId ) );
   }
   else
   {
@@ -974,7 +974,7 @@ void Sapphire::World::Manager::HousingMgr::reqPlaceHousingItem( Sapphire::Entity
   // inside housing territory
   if( auto zone = std::dynamic_pointer_cast< HousingZone >( player.getCurrentTerritory() ) )
   {
-    land = zone->getLand( landId );
+    land = zone->getLand( static_cast< uint8_t >( landId ) );
 
     isOutside = true;
   }
@@ -985,9 +985,9 @@ void Sapphire::World::Manager::HousingMgr::reqPlaceHousingItem( Sapphire::Entity
     // todo: this whole process is retarded and needs to be fixed
     // perhaps maintain a list of estates by ident inside housingmgr?
     auto ident = zone->getLandIdent();
-    auto landSet = toLandSetId( ident.territoryTypeId, ident.wardNum );
+    auto landSet = toLandSetId( static_cast< uint16_t >( ident.territoryTypeId ), static_cast< uint8_t >( ident.wardNum ) );
 
-    land = getHousingZoneByLandSetId( landSet )->getLand( ident.landId );
+    land = getHousingZoneByLandSetId( landSet )->getLand( static_cast< uint8_t >( ident.landId ) );
   }
   // wtf?
   else
@@ -1047,7 +1047,7 @@ void Sapphire::World::Manager::HousingMgr::reqPlaceItemInStore( Sapphire::Entity
 
   if( auto zone = std::dynamic_pointer_cast< HousingZone >( player.getCurrentTerritory() ) )
   {
-    land = zone->getLand( landId );
+    land = zone->getLand( static_cast< uint8_t >( landId ) );
     isOutside = true;
   }
   else if( auto zone = std::dynamic_pointer_cast< Territory::Housing::HousingInteriorTerritory >(
@@ -1056,9 +1056,9 @@ void Sapphire::World::Manager::HousingMgr::reqPlaceItemInStore( Sapphire::Entity
     // todo: this whole process is retarded and needs to be fixed
     // perhaps maintain a list of estates by ident inside housingmgr?
     auto ident = zone->getLandIdent();
-    auto landSet = toLandSetId( ident.territoryTypeId, ident.wardNum );
+    auto landSet = toLandSetId( static_cast< uint16_t >( ident.territoryTypeId ), static_cast< uint8_t >( ident.wardNum ) );
 
-    land = getHousingZoneByLandSetId( landSet )->getLand( ident.landId );
+    land = getHousingZoneByLandSetId( landSet )->getLand( static_cast< uint8_t >( ident.landId ) );
   }
 
   if( !hasPermission( player, *land, 0 ) )
@@ -1080,7 +1080,7 @@ void Sapphire::World::Manager::HousingMgr::reqPlaceItemInStore( Sapphire::Entity
     if( !item )
       return;
 
-    container->setItem( freeSlot, item );
+    container->setItem( static_cast< uint8_t >( freeSlot ), item );
     invMgr->sendInventoryContainer( player, container );
     invMgr->saveHousingContainer( ident, container );
   }
@@ -1103,7 +1103,7 @@ void Sapphire::World::Manager::HousingMgr::reqPlaceItemInStore( Sapphire::Entity
       if( !item )
         return;
 
-      container->setItem( freeSlot, item );
+      container->setItem( static_cast< uint8_t >( freeSlot ), item );
       invMgr->sendInventoryContainer( player, container );
       invMgr->saveHousingContainer( ident, container );
     }
@@ -1125,7 +1125,7 @@ bool Sapphire::World::Manager::HousingMgr::placeExternalItem( Entity::Player& pl
     return false;
 
   // add item to inv
-  container->setItem( freeSlot, item );
+  container->setItem( static_cast< uint8_t >( freeSlot ), item );
 
   // we need to save the item again as removing it from the container on the player will remove it from charaglobalitem
   // todo: this needs to be handled a bit better as it might be possible to overwrite another item that is created in the meantime
@@ -1139,7 +1139,7 @@ bool Sapphire::World::Manager::HousingMgr::placeExternalItem( Entity::Player& pl
   auto zone = std::dynamic_pointer_cast< HousingZone >( player.getCurrentTerritory() );
   assert( zone );
 
-  zone->spawnYardObject( ident.landId, freeSlot, *item );
+  zone->spawnYardObject( static_cast< uint8_t >( ident.landId ), static_cast< uint16_t >( freeSlot ), *item );
 
   return true;
 }
@@ -1173,7 +1173,7 @@ bool Sapphire::World::Manager::HousingMgr::placeInteriorItem( Entity::Player& pl
     }
 
     // have a free slot
-    container->setItem( freeSlot, item );
+    container->setItem( static_cast< uint8_t >( freeSlot ), item );
 
     // resend container
     invMgr->sendInventoryContainer( player, container );
@@ -1183,7 +1183,7 @@ bool Sapphire::World::Manager::HousingMgr::placeInteriorItem( Entity::Player& pl
     auto zone = std::dynamic_pointer_cast< Territory::Housing::HousingInteriorTerritory >( player.getCurrentTerritory() );
     assert( zone );
 
-    zone->spawnHousingObject( containerIdx, freeSlot, containerId, item );
+    zone->spawnHousingObject( containerIdx, static_cast< uint16_t >( freeSlot ), containerId, item );
 
     return true;
   }
@@ -1235,8 +1235,8 @@ void Sapphire::World::Manager::HousingMgr::reqMoveHousingItem( Entity::Player& p
                                                                Common::LandIdent ident, uint8_t slot,
                                                                Common::FFXIVARR_POSITION3 pos, float rot )
 {
-  auto landSet = toLandSetId( ident.territoryTypeId, ident.wardNum );
-  auto land = getHousingZoneByLandSetId( landSet )->getLand( ident.landId );
+  auto landSet = toLandSetId( static_cast< uint16_t >( ident.territoryTypeId ), static_cast< uint8_t >( ident.wardNum ) );
+  auto land = getHousingZoneByLandSetId( landSet )->getLand( static_cast< uint8_t >( ident.landId ) );
 
   if( !land )
     return;
@@ -1282,7 +1282,7 @@ bool Sapphire::World::Manager::HousingMgr::moveInternalItem( Entity::Player& pla
 
   auto container = it->second;
 
-  auto item = std::dynamic_pointer_cast< Inventory::HousingItem >( container->getItem( slotIdx ) );
+  auto item = std::dynamic_pointer_cast< Inventory::HousingItem >( container->getItem( static_cast< uint8_t >( slotIdx ) ) );
   if( !item )
     return false;
 
@@ -1293,10 +1293,10 @@ bool Sapphire::World::Manager::HousingMgr::moveInternalItem( Entity::Player& pla
   auto invMgr = framework()->get< InventoryMgr >();
   invMgr->updateHousingItemPosition( item );
 
-  terri.updateHousingObjectPosition( player, slot, item->getPos(), item->getRot() );
+  terri.updateHousingObjectPosition( player, slot, item->getPos(), static_cast< uint16_t >( item->getRot() ) );
 
   // send confirmation to player
-  uint32_t param1 = ( ident.landId << 16 ) | containerId;
+  uint32_t param1 = static_cast< uint32_t >( ( ident.landId << 16 ) | containerId );
 
   player.queuePacket(
     Server::makeActorControlSelf( player.getId(), ActorControl::HousingItemMoveConfirm, param1, slotIdx ) );
@@ -1309,7 +1309,7 @@ bool Sapphire::World::Manager::HousingMgr::moveExternalItem( Entity::Player& pla
                                                              Sapphire::HousingZone& terri, Common::FFXIVARR_POSITION3 pos,
                                                              float rot )
 {
-  auto land = terri.getLand( ident.landId );
+  auto land = terri.getLand( static_cast< uint8_t >( ident.landId ) );
 
   if( !hasPermission( player, *land, 0 ) )
     return false;
@@ -1331,9 +1331,9 @@ bool Sapphire::World::Manager::HousingMgr::moveExternalItem( Entity::Player& pla
   auto invMgr = framework()->get< InventoryMgr >();
   invMgr->updateHousingItemPosition( item );
 
-  terri.updateYardObjectPos( player, slot, ident.landId, *item );
+  terri.updateYardObjectPos( player, slot, static_cast< uint16_t >( ident.landId ), *item );
 
-  uint32_t param1 = ( ident.landId << 16 ) | InventoryType::HousingExteriorPlacedItems;
+  uint32_t param1 = static_cast< uint32_t >( ( ident.landId << 16 ) | InventoryType::HousingExteriorPlacedItems );
   player.queuePacket( Server::makeActorControlSelf( player.getId(), ActorControl::HousingItemMoveConfirm, param1, slot ) );
 
 
@@ -1348,8 +1348,8 @@ void Sapphire::World::Manager::HousingMgr::reqRemoveHousingItem( Sapphire::Entit
     player.getCurrentTerritory() ) )
   {
     auto ident = terri->getLandIdent();
-    auto landSet = toLandSetId( ident.territoryTypeId, ident.wardNum );
-    auto land = getHousingZoneByLandSetId( landSet )->getLand( ident.landId );
+    auto landSet = toLandSetId( static_cast< uint16_t >( ident.territoryTypeId ), static_cast< uint8_t >( ident.wardNum ) );
+    auto land = getHousingZoneByLandSetId( landSet )->getLand( static_cast< uint8_t >( ident.landId ) );
 
     if( !land )
       return;
@@ -1361,7 +1361,7 @@ void Sapphire::World::Manager::HousingMgr::reqRemoveHousingItem( Sapphire::Entit
   }
   else if( auto terri = std::dynamic_pointer_cast< HousingZone >( player.getCurrentTerritory() ) )
   {
-    auto land = terri->getLand( plot );
+    auto land = terri->getLand( static_cast< uint8_t >( plot ) );
     if( !land )
       return;
 
@@ -1406,7 +1406,7 @@ bool Sapphire::World::Manager::HousingMgr::removeInternalItem( Entity::Player& p
 
   auto container = it->second;
 
-  auto item = std::dynamic_pointer_cast< Inventory::HousingItem >( container->getItem( slotId ) );
+  auto item = std::dynamic_pointer_cast< Inventory::HousingItem >( container->getItem( static_cast< uint8_t >( slotId ) ) );
   if( !item )
     return false;
 
@@ -1420,7 +1420,7 @@ bool Sapphire::World::Manager::HousingMgr::removeInternalItem( Entity::Player& p
     auto invMgr = framework()->get< InventoryMgr >();
 
     // remove it from housing inventory
-    container->removeItem( slotId );
+    container->removeItem( static_cast< uint8_t >( slotId ) );
     invMgr->sendInventoryContainer( player, container );
     invMgr->removeHousingItemPosition( *item );
     invMgr->removeItemFromHousingContainer( terri.getLandIdent(), containerId, slotId );
@@ -1441,12 +1441,12 @@ bool Sapphire::World::Manager::HousingMgr::removeInternalItem( Entity::Player& p
 
     auto invMgr = framework()->get< InventoryMgr >();
 
-    container->removeItem( slotId );
+    container->removeItem( static_cast< uint8_t >( slotId ) );
     invMgr->sendInventoryContainer( player, container );
     invMgr->removeHousingItemPosition( *item );
     invMgr->removeItemFromHousingContainer( terri.getLandIdent(), containerId, slotId );
 
-    freeContainer->setItem( slotId, item );
+    freeContainer->setItem( static_cast< uint8_t >( slotId ), item );
     invMgr->sendInventoryContainer( player, freeContainer );
     invMgr->saveHousingContainer( terri.getLandIdent(), freeContainer );
   }
@@ -1455,7 +1455,7 @@ bool Sapphire::World::Manager::HousingMgr::removeInternalItem( Entity::Player& p
   if( containerIdx != -1 )
   {
     auto arraySlot = ( containerIdx * 50 ) + slotId;
-    terri.removeHousingObject( arraySlot );
+    terri.removeHousingObject( static_cast< uint16_t >( arraySlot ) );
   }
 
   return true;
@@ -1494,7 +1494,7 @@ bool Sapphire::World::Manager::HousingMgr::removeExternalItem( Entity::Player& p
     invMgr->removeItemFromHousingContainer( land.getLandIdent(), sourceContainer->getId(), slotId );
     invMgr->removeHousingItemPosition( *item );
 
-    storeroomContainer->setItem( freeSlot, item );
+    storeroomContainer->setItem( static_cast< uint8_t >( freeSlot ), item );
     invMgr->sendInventoryContainer( player, storeroomContainer );
     invMgr->saveHousingContainer( land.getLandIdent(), storeroomContainer );
   }
@@ -1515,7 +1515,7 @@ bool Sapphire::World::Manager::HousingMgr::removeExternalItem( Entity::Player& p
   }
 
   if( shouldDespawnItem )
-    terri.despawnYardObject( land.getLandIdent().landId, slotId );
+    terri.despawnYardObject( static_cast< uint16_t >( land.getLandIdent().landId ), slotId );
 
   return true;
 }
@@ -1552,7 +1552,7 @@ void Sapphire::World::Manager::HousingMgr::reqEstateExteriorRemodel( Sapphire::E
   if( !terri )
     return;
 
-  auto land = terri->getLand( plot );
+  auto land = terri->getLand( static_cast< uint8_t >( plot ) );
   if( !land )
     return;
 
@@ -1580,8 +1580,8 @@ void Sapphire::World::Manager::HousingMgr::reqEstateInteriorRemodel( Sapphire::E
     return;
 
   auto ident = terri->getLandIdent();
-  auto landSet = toLandSetId( ident.territoryTypeId, ident.wardNum );
-  auto land = getHousingZoneByLandSetId( landSet )->getLand( ident.landId );
+  auto landSet = toLandSetId( static_cast< uint16_t >( ident.territoryTypeId ), static_cast< uint8_t >( ident.wardNum ) );
+  auto land = getHousingZoneByLandSetId( landSet )->getLand( static_cast< uint8_t >( ident.landId ) );
 
   if( !land )
     return;
@@ -1622,4 +1622,4 @@ Sapphire::Inventory::HousingItemPtr Sapphire::World::Manager::HousingMgr::getHou
     return nullptr;
 
   return Inventory::make_HousingItem( tmpItem->getUId(), tmpItem->getId(), framework() );
-}
\ No newline at end of file
+}
diff --git a/src/world/Math/CalcStats.cpp b/src/world/Math/CalcStats.cpp
index d9c6d143..72d45fff 100644
--- a/src/world/Math/CalcStats.cpp
+++ b/src/world/Math/CalcStats.cpp
@@ -154,7 +154,7 @@ uint32_t CalcStats::calculateMaxHp( PlayerPtr pPlayer, Sapphire::FrameworkPtr pF
 
   auto vitMod = pPlayer->getBonusStat( Common::BaseParam::Vitality );
   float baseStat = calculateBaseStat( *pPlayer );
-  uint16_t vitStat = pPlayer->getStats().vit + static_cast< uint16_t >( vitMod );
+  uint16_t vitStat = static_cast< uint16_t >( pPlayer->getStats().vit ) + static_cast< uint16_t >( vitMod );
   uint16_t hpMod = paramGrowthInfo->hpModifier;
   uint16_t jobModHp = classInfo->modifierHitPoints;
   float approxBaseHp = 0.0f; // Read above
@@ -483,7 +483,7 @@ float CalcStats::calcActionDamage( const Sapphire::Entity::Chara& chara, uint32_
   // D = ⌊ f(pot) × f(wd) × f(ap) × f(det) × f(tnc) × traits ⌋
   // × f(chr) ⌋ × f(dhr) ⌋ × rand[ 0.95, 1.05 ] ⌋ buff_1 ⌋ × buff_1 ⌋ × buff... ⌋
 
-  auto pot = potency( ptc );
+  auto pot = potency( static_cast< uint16_t >( ptc ) );
   auto wd = weaponDamage( chara, wepDmg );
   auto ap = getPrimaryAttackPower( chara );
   auto det = determination( chara );
diff --git a/src/world/Network/GameConnection.cpp b/src/world/Network/GameConnection.cpp
index 12489297..fd8fa095 100644
--- a/src/world/Network/GameConnection.cpp
+++ b/src/world/Network/GameConnection.cpp
@@ -224,7 +224,7 @@ void Sapphire::Network::GameConnection::handleZonePacket( Sapphire::Network::Pac
     Logger::debug( "[{0}] Undefined World IPC : Unknown ( {1:04X} )", m_pSession->getId(), opcode );
 
     Logger::debug( "Dump:\n{0}", Util::binaryToHexDump( const_cast< uint8_t* >( &pPacket.data[ 0 ] ),
-                                                       pPacket.segHdr.size ) );
+                                                       static_cast< uint16_t >( pPacket.segHdr.size) ) );
   }
 }
 
@@ -392,7 +392,7 @@ void Sapphire::Network::GameConnection::handlePackets( const Sapphire::Network::
     {
       case SEGMENTTYPE_SESSIONINIT:
       {
-        char* id = ( char* ) &( inPacket.data[ 4 ] );
+        char* id = reinterpret_cast< char* >( &( inPacket.data[ 4 ] ) );
         uint32_t playerId = std::stoul( id );
         auto pCon = std::static_pointer_cast< GameConnection, Connection >( shared_from_this() );
 
@@ -423,15 +423,15 @@ void Sapphire::Network::GameConnection::handlePackets( const Sapphire::Network::
           m_pSession = session;
 
         auto pe = std::make_shared< FFXIVRawPacket >( 0x07, 0x18, 0, 0 );
-        *( unsigned int* ) ( &pe->data()[ 0 ] ) = 0xE0037603;
-        *( unsigned int* ) ( &pe->data()[ 4 ] ) = Common::Util::getTimeSeconds();
+        *reinterpret_cast< unsigned int* >( &pe->data()[ 0 ] ) = 0xE0037603;
+        *reinterpret_cast< unsigned int* >( &pe->data()[ 4 ] ) = Common::Util::getTimeSeconds();
         sendSinglePacket( pe );
 
         // main connection, assinging it to the session
         if( ipcHeader.connectionType == ConnectionType::Zone )
         {
           auto pe1 = std::make_shared< FFXIVRawPacket >( 0x02, 0x38, 0, 0 );
-          *( unsigned int* ) ( &pe1->data()[ 0 ] ) = playerId;
+          *reinterpret_cast< unsigned int* >( &pe1->data()[ 0 ] ) = playerId;
           sendSinglePacket( pe1 );
           Logger::info( "[{0}] Setting session for world connection", id );
           session->setZoneConnection( pCon );
@@ -440,11 +440,11 @@ void Sapphire::Network::GameConnection::handlePackets( const Sapphire::Network::
         else if( ipcHeader.connectionType == ConnectionType::Chat )
         {
           auto pe2 = std::make_shared< FFXIVRawPacket >( 0x02, 0x38, 0, 0 );
-          *( unsigned int* ) ( &pe2->data()[ 0 ] ) = playerId;
+          *reinterpret_cast< unsigned int* >( &pe2->data()[ 0 ] ) = playerId;
           sendSinglePacket( pe2 );
 
           auto pe3 = std::make_shared< FFXIVRawPacket >( 0x03, 0x28, playerId, playerId );
-          *( unsigned short* ) ( &pe3->data()[ 2 ] ) = 0x02;
+          *reinterpret_cast< unsigned short* >( &pe3->data()[ 2 ] ) = 0x02;
           sendSinglePacket( pe3 );
 
           Logger::info( "[{0}] Setting session for chat connection", id );
@@ -461,12 +461,12 @@ void Sapphire::Network::GameConnection::handlePackets( const Sapphire::Network::
       }
       case SEGMENTTYPE_KEEPALIVE: // keep alive
       {
-        uint32_t id = *( uint32_t* ) &inPacket.data[ 0 ];
-        uint32_t timeStamp = *( uint32_t* ) &inPacket.data[ 4 ];
+        uint32_t id = *reinterpret_cast< uint32_t* >( &inPacket.data[ 0 ] );
+        uint32_t timeStamp = *reinterpret_cast< uint32_t* >( &inPacket.data[ 4 ] );
 
         auto pe4 = std::make_shared< FFXIVRawPacket >( 0x08, 0x18, 0, 0 );
-        *( unsigned int* ) ( &pe4->data()[ 0 ] ) = id;
-        *( unsigned int* ) ( &pe4->data()[ 4 ] ) = timeStamp;
+        *reinterpret_cast< unsigned int* >( &pe4->data()[ 0 ] ) = id;
+        *reinterpret_cast< unsigned int* >( &pe4->data()[ 4 ] ) = timeStamp;
         sendSinglePacket( pe4 );
 
         break;
diff --git a/src/world/Network/Handlers/CFHandlers.cpp b/src/world/Network/Handlers/CFHandlers.cpp
index d51b6327..9f3660fb 100644
--- a/src/world/Network/Handlers/CFHandlers.cpp
+++ b/src/world/Network/Handlers/CFHandlers.cpp
@@ -32,7 +32,7 @@ void Sapphire::Network::GameConnection::cfDutyInfoRequest( FrameworkPtr pFw,
     // cap it since it's uint8_t in packets
     penaltyMinutes = 255;
   }
-  dutyInfoPacket->data().penaltyTime = penaltyMinutes;
+  dutyInfoPacket->data().penaltyTime = static_cast< uint8_t >( penaltyMinutes );
   queueOutPacket( dutyInfoPacket );
 
   auto inNeedsPacket = makeZonePacket< FFXIVIpcCFPlayerInNeed >( player.getId() );
@@ -62,7 +62,7 @@ void Sapphire::Network::GameConnection::cfRegisterDuty( FrameworkPtr pFw,
   }
 
   // todo: rand bias problem, will do for now tho
-  auto index = std::rand() % selectedContent.size();
+  auto index = static_cast< uint32_t >( std::rand() ) % selectedContent.size();
   auto contentId = selectedContent.at( index );
 
   player.sendDebug( "Duty register request for contentid#{0}", contentId );
diff --git a/src/world/Network/Handlers/ClientTriggerHandler.cpp b/src/world/Network/Handlers/ClientTriggerHandler.cpp
index 08d44118..d75ed879 100644
--- a/src/world/Network/Handlers/ClientTriggerHandler.cpp
+++ b/src/world/Network/Handlers/ClientTriggerHandler.cpp
@@ -127,7 +127,7 @@ void Sapphire::Network::GameConnection::clientTriggerHandler( FrameworkPtr pFw,
     }
     case ClientTriggerType::SpawnCompanionReq:
     {
-      player.spawnCompanion( param1 );
+      player.spawnCompanion( static_cast< uint16_t >( param1 ) );
       break;
     }
     case ClientTriggerType::RemoveStatusEffect: // Remove status (clicking it off)
@@ -236,14 +236,14 @@ void Sapphire::Network::GameConnection::clientTriggerHandler( FrameworkPtr pFw,
     case ClientTriggerType::PoseChange: // change pose
     case ClientTriggerType::PoseReapply: // reapply pose
     {
-      player.setPose( param12 );
+      player.setPose( static_cast< uint8_t >( param12 ) );
       auto pSetStatusPacket = makeActorControl( player.getId(), SetPose, param11, param12 );
       player.sendToInRangeSet( pSetStatusPacket, true );
       break;
     }
     case ClientTriggerType::PoseCancel: // cancel pose
     {
-      player.setPose( param12 );
+      player.setPose( static_cast< uint8_t >( param12 ) );
       auto pSetStatusPacket = makeActorControl( player.getId(), SetPose, param11, param12 );
       player.sendToInRangeSet( pSetStatusPacket, true );
       break;
@@ -273,7 +273,7 @@ void Sapphire::Network::GameConnection::clientTriggerHandler( FrameworkPtr pFw,
     case ClientTriggerType::Teleport: // Teleport
     {
 
-      player.teleportQuery( param11 );
+      player.teleportQuery( static_cast< uint16_t >( param11 ) );
       break;
     }
     case ClientTriggerType::DyeItem: // Dye item
@@ -317,7 +317,7 @@ void Sapphire::Network::GameConnection::clientTriggerHandler( FrameworkPtr pFw,
       if (!hZone)
         return;
 
-      player.setActiveLand( param11, hZone->getWardNum() );
+      player.setActiveLand( static_cast< uint8_t >( param11 ), hZone->getWardNum() );
 
       auto pShowBuildPresetUIPacket = makeActorControl( player.getId(), ShowBuildPresetUI, param11 );
       player.queuePacket( pShowBuildPresetUIPacket );
@@ -348,7 +348,7 @@ void Sapphire::Network::GameConnection::clientTriggerHandler( FrameworkPtr pFw,
       if( !pHousingMgr )
         break;
 
-      pHousingMgr->sendWardLandInfo( player, param12, param11 );
+      pHousingMgr->sendWardLandInfo( player, static_cast< uint8_t >( param12 ), static_cast< uint8_t >( param11 ) );
 
       break;
     }
@@ -462,7 +462,7 @@ void Sapphire::Network::GameConnection::clientTriggerHandler( FrameworkPtr pFw,
       auto sendToStoreroom = ( param4 >> 16 ) != 0;
 
       //player, plot, containerId, slot, sendToStoreroom
-      housingMgr->reqRemoveHousingItem( player, param12, param2, slot, sendToStoreroom );
+      housingMgr->reqRemoveHousingItem( player, static_cast< uint16_t >( param12 ), static_cast< uint16_t >( param2 ), static_cast< uint8_t >( slot ), sendToStoreroom );
 
       break;
     }
@@ -470,7 +470,7 @@ void Sapphire::Network::GameConnection::clientTriggerHandler( FrameworkPtr pFw,
     {
       auto housingMgr = m_pFw->get< HousingMgr >();
 
-      housingMgr->reqEstateExteriorRemodel( player, param11 );
+      housingMgr->reqEstateExteriorRemodel( player, static_cast< uint16_t >( param11 ) );
 
       break;
     }
diff --git a/src/world/Network/Handlers/GMCommandHandlers.cpp b/src/world/Network/Handlers/GMCommandHandlers.cpp
index 252bb313..77bd4380 100644
--- a/src/world/Network/Handlers/GMCommandHandlers.cpp
+++ b/src/world/Network/Handlers/GMCommandHandlers.cpp
@@ -130,13 +130,13 @@ void Sapphire::Network::GameConnection::gm1Handler( FrameworkPtr pFw,
   {
     case GmCommand::Lv:
     {
-      targetPlayer->setLevel( param1 );
+      targetPlayer->setLevel( static_cast< uint8_t >( param1 ) );
       player.sendNotice( "Level for {0} was set to {1}", targetPlayer->getName(), param1 );
       break;
     }
     case GmCommand::Race:
     {
-      targetPlayer->setLookAt( CharaLook::Race, param1 );
+      targetPlayer->setLookAt( CharaLook::Race, static_cast< uint8_t >( param1 ) );
       player.sendNotice( "Race for {0} was set to {1}", targetPlayer->getName(), param1 );
       targetPlayer->spawn( targetPlayer );
       auto inRange = targetPlayer->getInRangeActors();
@@ -152,7 +152,7 @@ void Sapphire::Network::GameConnection::gm1Handler( FrameworkPtr pFw,
     }
     case GmCommand::Tribe:
     {
-      targetPlayer->setLookAt( CharaLook::Tribe, param1 );
+      targetPlayer->setLookAt( CharaLook::Tribe, static_cast< uint8_t >( param1 ) );
       player.sendNotice( "Tribe for {0} was set to ", targetPlayer->getName(), param1 );
       targetPlayer->spawn( targetPlayer );
       auto inRange = targetPlayer->getInRangeActors();
@@ -168,7 +168,7 @@ void Sapphire::Network::GameConnection::gm1Handler( FrameworkPtr pFw,
     }
     case GmCommand::Sex:
     {
-      targetPlayer->setLookAt( CharaLook::Gender, param1 );
+      targetPlayer->setLookAt( CharaLook::Gender, static_cast< uint8_t >( param1 ) );
       player.sendNotice( "Sex for {0} was set to ", targetPlayer->getName(), param1 );
       targetPlayer->spawn( targetPlayer );
       auto inRange = targetActor->getInRangeActors();
@@ -325,7 +325,7 @@ void Sapphire::Network::GameConnection::gm1Handler( FrameworkPtr pFw,
         }
         else
         {
-          targetActor->getAsPlayer()->learnSong( param2, 0 );
+          targetActor->getAsPlayer()->learnSong( static_cast< uint8_t >( param2 ), 0 );
           player.sendNotice( "Song {0} for {1} was turned on.", param2, targetPlayer->getName() );
         }
       }
@@ -374,27 +374,27 @@ void Sapphire::Network::GameConnection::gm1Handler( FrameworkPtr pFw,
     }
     case GmCommand::QuestAccept:
     {
-      targetPlayer->updateQuest( param1, 1 );
+      targetPlayer->updateQuest( static_cast< uint16_t >( param1 ), 1 );
       break;
     }
     case GmCommand::QuestCancel:
     {
-      targetPlayer->removeQuest( param1 );
+      targetPlayer->removeQuest( static_cast< uint16_t >( param1 ) );
       break;
     }
     case GmCommand::QuestComplete:
     {
-      targetPlayer->finishQuest( param1 );
+      targetPlayer->finishQuest( static_cast< uint16_t >( param1 ) );
       break;
     }
     case GmCommand::QuestIncomplete:
     {
-      targetPlayer->unfinishQuest( param1 );
+      targetPlayer->unfinishQuest( static_cast< uint16_t >( param1 ) );
       break;
     }
     case GmCommand::QuestSequence:
     {
-      targetPlayer->updateQuest( param1, param2 );
+      targetPlayer->updateQuest( static_cast< uint16_t >( param1 ), static_cast< uint8_t >( param2 ) );
       break;
     }
     case GmCommand::GC:
@@ -405,7 +405,7 @@ void Sapphire::Network::GameConnection::gm1Handler( FrameworkPtr pFw,
         return;
       }
 
-      targetPlayer->setGc( param1 );
+      targetPlayer->setGc( static_cast< uint8_t >( param1 ) );
 
       // if we're changing them to a GC, check if they have a rank and if not, set it to the lowest rank
       if( param1 > 0 )
@@ -413,7 +413,7 @@ void Sapphire::Network::GameConnection::gm1Handler( FrameworkPtr pFw,
         auto gcRankIdx = static_cast< uint8_t >( param1 ) - 1;
         if( targetPlayer->getGcRankArray()[ gcRankIdx ] == 0 )
         {
-          player.setGcRankAt( gcRankIdx, 1 );
+          player.setGcRankAt( static_cast< uint8_t >( gcRankIdx ), 1 );
         }
       }
 
@@ -430,7 +430,7 @@ void Sapphire::Network::GameConnection::gm1Handler( FrameworkPtr pFw,
         return;
       }
 
-      targetPlayer->setGcRankAt( gcId, param1 );
+      targetPlayer->setGcRankAt( static_cast< uint8_t >( gcId ), static_cast< uint8_t >( param1 ) );
       player.sendNotice( "GC Rank for {0} for GC {1} was set to {2}", targetPlayer->getName(), targetPlayer->getGc(),
                          targetPlayer->getGcRankArray()[ targetPlayer->getGc() - 1 ] );
       break;
@@ -448,7 +448,7 @@ void Sapphire::Network::GameConnection::gm1Handler( FrameworkPtr pFw,
         }
         else
         {
-          targetActor->getAsPlayer()->registerAetheryte( param2 );
+          targetActor->getAsPlayer()->registerAetheryte( static_cast< uint8_t >( param2 ) );
           player.sendNotice( "Aetheryte {0} for {1} was turned on.", param2, targetPlayer->getName() );
         }
       }
@@ -521,7 +521,7 @@ void Sapphire::Network::GameConnection::gm1Handler( FrameworkPtr pFw,
             if( data->isAetheryte )
             {
               doTeleport = true;
-              teleport = i;
+              teleport = static_cast< uint16_t >( i );
               break;
             }
           }
@@ -533,7 +533,7 @@ void Sapphire::Network::GameConnection::gm1Handler( FrameworkPtr pFw,
         else
         {
           targetPlayer->setPos( targetPlayer->getPos() );
-          targetPlayer->performZoning( param1, targetPlayer->getPos(), 0 );
+          targetPlayer->performZoning( static_cast< uint16_t >( param1 ), targetPlayer->getPos(), 0 );
         }
 
         player.sendNotice( "{0} was warped to zone {1}", targetPlayer->getName(), param1, pZone->getName() );
diff --git a/src/world/Territory/Cell.cpp b/src/world/Territory/Cell.cpp
index ff495c90..bbcfdd79 100644
--- a/src/world/Territory/Cell.cpp
+++ b/src/world/Territory/Cell.cpp
@@ -25,8 +25,8 @@ Sapphire::Cell::~Cell()
 void Sapphire::Cell::init( uint32_t x, uint32_t y, TerritoryPtr pZone )
 {
   m_pZone = pZone;
-  m_posX = x;
-  m_posY = y;
+  m_posX = static_cast< uint16_t >( x );
+  m_posY = static_cast< uint16_t >( y );
 
   m_actors.clear();
 }
diff --git a/src/world/Territory/House.cpp b/src/world/Territory/House.cpp
index def91bc6..4d4544ff 100644
--- a/src/world/Territory/House.cpp
+++ b/src/world/Territory/House.cpp
@@ -34,7 +34,7 @@ void Sapphire::House::updateHouseDb()
   auto stmt = pDB->getPreparedStatement( Db::HOUSING_HOUSE_UP );
   stmt->setUInt( 6, m_houseId );
 
-  stmt->setInt64( 1, m_buildTime );
+  stmt->setInt64( 1, static_cast< int64_t >( m_buildTime ) );
   stmt->setBool( 2, m_hasAetheryte );
 
   stmt->setString( 3, m_estateComment );
@@ -117,4 +117,4 @@ bool Sapphire::House::getHasAetheryte() const
 void Sapphire::House::setHasAetheryte( bool hasAetheryte )
 {
   m_hasAetheryte = hasAetheryte;
-}
\ No newline at end of file
+}
diff --git a/src/world/Territory/Housing/HousingInteriorTerritory.cpp b/src/world/Territory/Housing/HousingInteriorTerritory.cpp
index a3ccf34e..ade7acfc 100644
--- a/src/world/Territory/Housing/HousingInteriorTerritory.cpp
+++ b/src/world/Territory/Housing/HousingInteriorTerritory.cpp
@@ -63,8 +63,8 @@ void Sapphire::World::Territory::Housing::HousingInteriorTerritory::onPlayerZone
   indoorInitPacket->data().u3 = 0;
   indoorInitPacket->data().u4 = 0;
 
-  auto landSetId = pHousingMgr->toLandSetId( m_landIdent.territoryTypeId, m_landIdent.wardNum );
-  auto pLand = pHousingMgr->getHousingZoneByLandSetId( landSetId )->getLand( m_landIdent.landId );
+  auto landSetId = pHousingMgr->toLandSetId( static_cast< uint16_t >( m_landIdent.territoryTypeId ), static_cast< uint8_t >( m_landIdent.wardNum ) );
+  auto pLand = pHousingMgr->getHousingZoneByLandSetId( landSetId )->getLand( static_cast< uint8_t >( m_landIdent.landId ) );
   auto pHouse = pLand->getHouse();
 
   for( auto i = 0; i < 10; i++ )
@@ -154,7 +154,7 @@ void Sapphire::World::Territory::Housing::HousingInteriorTerritory::updateHousin
 
       auto obj = housingMgr->getYardObjectForItem( housingItem );
 
-      m_housingObjects[ offset ] = obj;
+      m_housingObjects[static_cast< size_t >( offset ) ] = obj;
     }
 
     containerIdx++;
@@ -171,14 +171,14 @@ void Sapphire::World::Territory::Housing::HousingInteriorTerritory::spawnHousing
   auto offset = ( containerIdx * 50 ) + slot;
   auto obj = housingMgr->getYardObjectForItem( item );
 
-  m_housingObjects[ offset ] = obj;
+  m_housingObjects[ static_cast< size_t >( offset ) ] = obj;
 
   for( const auto& player : m_playerMap )
   {
     auto objectSpawnPkt = makeZonePacket< Server::FFXIVIpcHousingInternalObjectSpawn >( player.second->getId() );
 
     objectSpawnPkt->data().containerId = containerType;
-    objectSpawnPkt->data().containerOffset = slot;
+    objectSpawnPkt->data().containerOffset = static_cast< uint8_t >( slot );
 
     objectSpawnPkt->data().object.itemId = item->getAdditionalData() & 0xFFFF;
     objectSpawnPkt->data().object.rotation = item->getRot();
@@ -207,7 +207,7 @@ void Sapphire::World::Territory::Housing::HousingInteriorTerritory::updateHousin
 
     auto moveObjPkt = makeZonePacket< Server::FFXIVIpcHousingObjectMove >( player.second->getId() );
 
-    moveObjPkt->data().itemRotation = obj.rotation;
+    moveObjPkt->data().itemRotation = static_cast< uint16_t >( obj.rotation );
     moveObjPkt->data().pos = obj.pos;
 
     // todo: how does this work when an item is in a slot >50 or u8 max? my guess is landid is the container index, but not sure...

From a98a7eccc87e3785a1b5b8b3b9b24497b5405460 Mon Sep 17 00:00:00 2001
From: kbasikhin <kirrilius@gmail.com>
Date: Mon, 30 Dec 2019 13:59:57 +0300
Subject: [PATCH 191/351] comparing floating point with "==" or "!=" is not
 correct (Chara.cpp)

---
 src/world/Actor/Chara.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/world/Actor/Chara.cpp b/src/world/Actor/Chara.cpp
index c8cef7b1..98915ab8 100644
--- a/src/world/Actor/Chara.cpp
+++ b/src/world/Actor/Chara.cpp
@@ -316,7 +316,7 @@ bool Sapphire::Entity::Chara::face( const Common::FFXIVARR_POSITION3& p )
 
   setRot( newRot );
 
-  return oldRot != newRot;
+  return ( fabs( oldRot - newRot ) <= std::numeric_limits< float >::epsilon() * fmax( fabs( oldRot ), fabs( newRot ) ) );
 }
 
 /*!

From b93dbbbaca6b858aadb18b3fa82c4723824cde5d Mon Sep 17 00:00:00 2001
From: collett <collett0301@gmail.com>
Date: Wed, 1 Jan 2020 22:05:49 +0900
Subject: [PATCH 192/351] Update 5.18 opcodes and packets.

---
 src/common/Network/PacketDef/Ipcs.h           | 202 +++++++++---------
 .../Network/PacketDef/Zone/ServerZoneDef.h    |  32 ++-
 src/world/Actor/Chara.cpp                     |   6 +-
 3 files changed, 128 insertions(+), 112 deletions(-)

diff --git a/src/common/Network/PacketDef/Ipcs.h b/src/common/Network/PacketDef/Ipcs.h
index c49b0a5a..57de2993 100644
--- a/src/common/Network/PacketDef/Ipcs.h
+++ b/src/common/Network/PacketDef/Ipcs.h
@@ -45,27 +45,27 @@ namespace Sapphire::Network::Packets
   {
 
     // static opcode ( the ones that rarely, if ever, change )
-    Ping = 0x0065,
-    Init = 0x0066,
+    Ping = 0x0200, // updated 5.18
+    Init = 0x018E,
 
-    ActorFreeSpawn = 0x0249, // updated 5.11
-    InitZone = 0x01D8, // updated 5.11
+    ActorFreeSpawn = 0x009B, // updated 5.18
+    InitZone = 0x007C, // updated 5.18
 
-    EffectResult = 0x00B9, // updated 5.11
-    ActorControl = 0x008D, // updated 5.11
-    ActorControlSelf = 0x00EB, // updated 5.11
-    ActorControlTarget = 0x01F5, // updated 5.11
+    EffectResult = 0x0267, // updated 5.18
+    ActorControl = 0x03BE, // updated 5.18
+    ActorControlSelf = 0x00E3, // updated 5.18
+    ActorControlTarget = 0x24d, // updated 5.18
 
     /*!
      * @brief Used when resting
      */
-    UpdateHpMpTp = 0x012D, // updated 5.11
+    UpdateHpMpTp = 0x0125, // updated 5.18
 
     ///////////////////////////////////////////////////
 
     ChatBanned = 0x006B,
-    Playtime = 0x01DB, // updated 5.1
-    Logout = 0x011D, // updated 5.1
+    Playtime = 0x00E7, // updated 5.18
+    Logout = 0x142, // updated 5.18
     CFNotify = 0x0078,
     CFMemberStatus = 0x0079,
     CFDutyInfo = 0x007A,
@@ -79,29 +79,29 @@ namespace Sapphire::Network::Packets
 
     LogMessage = 0x00D0,
 
-    Chat = 0x02DC, // updated 5.1
+    Chat = 0x02A3, // updated 5.18
 
     WorldVisitList = 0x00FE, // added 4.5
 
-    SocialList = 0x007A, // updated 5.1
+    SocialList = 0x01F1, // updated 5.18
 
-    ExamineSearchInfo = 0x03D7, // updated 5.1
-    UpdateSearchInfo = 0x0358, // updated 5.1
-    InitSearchInfo = 0x03A1, // updated 5.1
+    ExamineSearchInfo = 0x012B, // updated 5.18
+    UpdateSearchInfo = 0x01E5, // updated 5.18
+    InitSearchInfo = 0x01D0, // updated 5.18
     ExamineSearchComment = 0x0102, // updated 4.1
 
     ServerNoticeShort = 0x0115, // updated 5.0
-    ServerNotice = 0x0116, // updated 5.0
+    ServerNotice = 0x0088, // updated 5.18
     SetOnlineStatus = 0x015E, // updated 5.1
 
     CountdownInitiate = 0x0309, // updated 5.11
-    CountdownCancel = 0x013C, // updated 5.11
+    CountdownCancel = 0x00D9, // updated 5.18
 
     PlayerAddedToBlacklist = 0x033F, // updated 5.1
     PlayerRemovedFromBlacklist = 0x0385, // updated 5.1
-    BlackList = 0x031F, // updated 5.1
+    BlackList = 0x0253, // updated 5.18
 
-    LinkshellList = 0x012A, // updated 5.0
+    LinkshellList = 0x00AC, // updated 5.18
 
     MailDeleteRequest = 0x012B, // updated 5.0
 
@@ -110,12 +110,12 @@ namespace Sapphire::Network::Packets
     ReqMoogleMailLetter = 0x0139, // updated 5.0
     MailLetterNotification = 0x013A, // updated 5.0
 
-    MarketTaxRates = 0x039F, // updated 5.11
+    MarketTaxRates = 0x025E, // updated 5.18
 
-    MarketBoardItemListingCount = 0x00F2, // updated 5.11
-    MarketBoardItemListing = 0x01E2, // updated 5.11
-    MarketBoardItemListingHistory = 0x0123, // updated 5.11
-    MarketBoardSearchResult = 0x00B7, // updated 5.11
+    MarketBoardItemListingCount = 0x0328, // updated 5.18
+    MarketBoardItemListing = 0x015F, // updated 5.18
+    MarketBoardItemListingHistory = 0x0113, // updated 5.18
+    MarketBoardSearchResult = 0x01EA, // updated 5.18
 
     CharaFreeCompanyTag = 0x013B, // updated 4.5
     FreeCompanyBoardMsg = 0x013C, // updated 4.5
@@ -124,83 +124,86 @@ namespace Sapphire::Network::Packets
 
     FreeCompanyUpdateShortMessage = 0x0157, // added 5.0
 
-    StatusEffectList = 0x0399, // updated 5.11
-    EurekaStatusEffectList = 0x01C2, // updated 5.11
-    BossStatusEffectList = 0x00E6, // added 5.1
-    Effect = 0x0165, // updated 5.11
-    AoeEffect8 = 0x00E9, // updated 5.11
-    AoeEffect16 = 0x007F, // updated 5.11
-    AoeEffect24 = 0x0299, // updated 5.11
-    AoeEffect32 = 0x01DF, // updated 5.11
-    PersistantEffect = 0x0165, // updated 5.0
+    StatusEffectList = 0x0183, // updated 5.18
+    EurekaStatusEffectList = 0x0167, // updated 5.18
+    BossStatusEffectList = 0x0312, // added 5.1
+    Effect = 0x026B, // updated 5.18
+    AoeEffect8 = 0x033E, // updated 5.18
+    AoeEffect16 = 0x0305, // updated 5.18
+    AoeEffect24 = 0x023F, // updated 5.18
+    AoeEffect32 = 0x0352, // updated 5.18
+    PersistantEffect = 0x019C, // updated 5.18
 
     GCAffiliation = 0x016F, // updated 5.0
 
-    PlayerSpawn = 0x0243, // updated 5.11
-    NpcSpawn = 0x021B, // updated 5.11
-    NpcSpawn2 = 0x0137, // ( Bigger statuseffectlist? ) updated 5.11
-    ActorMove = 0x00DD, // updated 5.11
+    PlayerSpawn = 0x0262, // updated 5.18
+    NpcSpawn = 0x0186, // updated 5.18
+    NpcSpawn2 = 0x010C, // ( Bigger statuseffectlist? ) updated 5.18
+    ActorMove = 0x021B, // updated 5.18
 
-    ActorSetPos = 0x0092, // updated 5.11
+    ActorSetPos = 0x0068, // updated 5.18
 
-    ActorCast = 0x028E, // updated 5.11
-    SomeCustomiseChangePacketProbably = 0x0187, // added 5.0
+    ActorCast = 0x03B1, // updated 5.18
+    SomeCustomiseChangePacketProbably = 0x00CD, // added 5.18
 
-    PartyList = 0x022B, // updated 5.11
-    HateRank = 0x00B8, // updated 5.11
-    HateList = 0x03C5, // updated 5.11
-    ObjectSpawn = 0x02A0, // updated 5.11
-    ObjectDespawn = 0x036B, // updated 5.11
-    UpdateClassInfo = 0x00FC, // updated 5.11
+    PartyList = 0x0287, // updated 5.18
+    HateRank = 0x0226, // updated 5.18
+    HateList = 0x0361, // updated 5.18
+    ObjectSpawn = 0x027F, // updated 5.18
+    ObjectDespawn = 0x034B, // updated 5.18
+    UpdateClassInfo = 0x0362, // updated 5.18
     SilentSetClassJob = 0x018E, // updated 5.0 - seems to be the case, not sure if it's actually used for anything
-    PlayerSetup = 0x01A1, // updated 5.11
-    PlayerStats = 0x0324, // updated 5.11
+    PlayerSetup = 0x0295, // updated 5.18
+    PlayerStats = 0x017A, // updated 5.18
     ActorOwner = 0x0322, // updated 5.11
-    PlayerStateFlags = 0x019F, // updated 5.1
-    PlayerClassInfo = 0x02D4, // updated 5.1
+    PlayerStateFlags = 0x02C6, // updated 5.18
+    PlayerClassInfo = 0x01B0, // updated 5.18
 
     ModelEquip = 0x0170, // updated 5.11
-    Examine = 0x00EA, // updated 5.1
-    CharaNameReq = 0x006C, // updated 5.11
+    Examine = 0x0366, // updated 5.18
+    CharaNameReq = 0x0116, // updated 5.18
 
     // nb: see #565 on github
     UpdateRetainerItemSalePrice = 0x019F, // updated 5.0
 
     SetLevelSync = 0x1186, // not updated for 4.4, not sure what it is anymore
 
-    ItemInfo = 0x01D4, // updated 5.11
-    ContainerInfo = 0x0145, // updated 5.1
+    ItemInfo = 0x00F2, // updated 5.18
+    ContainerInfo = 0x01F2, // updated 5.18
     InventoryTransactionFinish = 0x01AB, // updated 5.1
     InventoryTransaction = 0x023E, // updated 5.1
-    CurrencyCrystalInfo = 0x02CA, // updated 5.11
+    CurrencyCrystalInfo = 0x02BF, // updated 5.18
 
     InventoryActionAck = 0x0084, // updated 5.1
-    UpdateInventorySlot = 0x0112, // updated 5.11
+    UpdateInventorySlot = 0x0370, // updated 5.18
 
     HuntingLogEntry = 0x01B3, // updated 5.0
 
-    EventPlay = 0x0386, // updated 5.11
+    EventPlay = 0x0279, // updated 5.18
     DirectorPlayScene = 0x01B9, // updated 5.0
-    EventOpenGilShop = 0x01BC, // updated 5.0
+    EventOpenGilShop = 0x01B1, // updated 5.18
 
-    EventStart = 0x00C9, // updated 5.11
-    EventFinish = 0x0387, // updated 5.11
+    EventStart = 0x0230, // updated 5.18
+    EventFinish = 0x01E4, // updated 5.18
+    EventUnk0 = 0x02F7, // updated 5.18
+    EventUnk1 = 0x0100, // updated 5.18
+    UseMooch = 0x0233, // updated 5.18
 
     EventLinkshell = 0x1169,
 
-    QuestActiveList = 0x01D2, // updated 5.0
-    QuestUpdate = 0x01D3, // updated 5.0
-    QuestCompleteList = 0x01D4, // updated 5.0
+    QuestActiveList = 0x031E, // updated 5.18
+    QuestUpdate = 0x0066, // updated 5.18
+    QuestCompleteList = 0x025D, // updated 5.18
 
-    QuestFinish = 0x01D5, // updated 5.0
+    QuestFinish = 0x013A, // updated 5.18
     MSQTrackerComplete = 0x01D6, // updated 5.0
     MSQTrackerProgress = 0xF1CD, // updated 4.5 ? this actually looks like the two opcodes have been combined, see #474
 
-    QuestMessage = 0x01DE, // updated 5.0
+    QuestMessage = 0x00BF, // updated 5.18
 
-    QuestTracker = 0x01E3, // updated 5.0
+    QuestTracker = 0x0289, // updated 5.18
 
-    Mount = 0x01F3, // updated 5.0
+    Mount = 0x02F0, // updated 5.18
 
     DirectorVars = 0x01F5, // updated 5.0
     DirectorPopUp = 0x0200, // updated 5.0 - display dialogue pop-ups in duties and FATEs, for example, Teraflare's countdown
@@ -209,11 +212,11 @@ namespace Sapphire::Network::Packets
 
     WeatherChange = 0x02FB, // updated 5.11
     PlayerTitleList = 0x037D, // updated 5.1
-    Discovery = 0x0094, // updated 5.1
+    Discovery = 0x02E7, // updated 5.18
 
     EorzeaTimeOffset = 0x03B8, // updated 5.1
 
-    EquipDisplayFlags = 0x011D, // updated 5.11
+    EquipDisplayFlags = 0x00FF, // updated 5.18
 
     /// Housing //////////////////////////////////////
 
@@ -226,7 +229,7 @@ namespace Sapphire::Network::Packets
     LandRename = 0x023A, // updated 5.0
     HousingEstateGreeting = 0x023B, // updated 5.0
     HousingUpdateLandFlagsSlot = 0x023C, // updated 5.0
-    HousingLandFlags = 0x023D, // updated 5.0
+    HousingLandFlags = 0x01F3, // updated 5.18
     HousingShowEstateGuestAccess = 0x023E, // updated 5.0
 
     HousingObjectInitialize = 0x0240, // updated 5.0
@@ -247,11 +250,11 @@ namespace Sapphire::Network::Packets
     PerformNote = 0x0286, // updated 4.3
 
     PrepareZoning = 0x02A4, // updated 5.0
-    ActorGauge = 0x0292, // updated 4.3
+    ActorGauge = 0x016D, // updated 5.18
 
     // daily quest info -> without them sent,  login will take longer...
-    DailyQuests = 0x02B6, // updated 5.1
-    DailyQuestRepeatFlags = 0x0124, // updated 5.1
+    DailyQuests = 0x02D8, // updated 5.18
+    DailyQuestRepeatFlags = 0x03A3, // updated 5.18
 
     /// Doman Mahjong //////////////////////////////////////
     MahjongOpenGui = 0x02A4, // only available in mahjong instance
@@ -272,10 +275,10 @@ namespace Sapphire::Network::Packets
   enum ClientZoneIpcType : uint16_t
   {
 
-    PingHandler = 0x0065, // unchanged 5.0
-    InitHandler = 0x03D2, // updated 5.1
+    PingHandler = 0x0200, // updated 5.18
+    InitHandler = 0x018E, // updated 5.18
 
-    FinishLoadingHandler = 0x01DC, // updated 5.1
+    FinishLoadingHandler = 0x01F5, // updated 5.18
 
     CFCommenceHandler = 0x006F,
 
@@ -283,7 +286,7 @@ namespace Sapphire::Network::Packets
     CFRegisterDuty = 0x0071,
     CFRegisterRoulette = 0x0072,
     PlayTimeHandler = 0x0276, // updated 5.1
-    LogoutHandler = 0x02D6, // updated 5.1
+    LogoutHandler = 0x015D, // updated 5.18
     CancelLogout = 0x008F, // updated 5.1
 
     CFDutyInfoHandler = 0x0078, // updated 4.2
@@ -291,18 +294,18 @@ namespace Sapphire::Network::Packets
     SocialReqSendHandler = 0x00AE, // updated 4.1
     CreateCrossWorldLS = 0x00AF, // updated 4.3
 
-    ChatHandler = 0x02FF, // updated 5.1
+    ChatHandler = 0x0130, // updated 5.18
 
-    SocialListHandler = 0x01F6, // updated 5.1
-    SetSearchInfoHandler = 0x00E4, // updated 5.0
-    ReqSearchInfoHandler = 0x024D, // updated 5.1
+    SocialListHandler = 0x0090, // updated 5.18
+    SetSearchInfoHandler = 0x0320, // updated 5.18
+    ReqSearchInfoHandler = 0x0374, // updated 5.18
     ReqExamineSearchCommentHandler = 0x00E7, // updated 5.0
 
     ReqRemovePlayerFromBlacklist = 0x00F1, // updated 5.0
-    BlackListHandler = 0x0167, // updated 5.1
+    BlackListHandler = 0x01EB, // updated 5.18
     PlayerSearchHandler = 0x00F4, // updated 5.0
 
-    LinkshellListHandler = 0x00D3, // updated 5.1
+    LinkshellListHandler = 0x014A, // updated 5.18
 
     MarketBoardRequestItemListingInfo = 0x0102, // updated 4.5
     MarketBoardRequestItemListings = 0x0103, // updated 4.5
@@ -321,40 +324,39 @@ namespace Sapphire::Network::Packets
     ReqCountdownInitiate = 0x0135, // updated 5.0
     ReqCountdownCancel = 0x0136, // updated 5.0
 
-    ZoneLineHandler = 0x02E0, // updated 5.1
-    ClientTrigger = 0x01F2, // updated 5.11
-    DiscoveryHandler = 0x0177, // updated 5.1
+    ZoneLineHandler = 0x0174, // updated 5.18
+    ClientTrigger = 0x03C0, // updated 5.18
+    DiscoveryHandler = 0x017B, // updated 5.18
 
     PlaceFieldMarker = 0x013C, // updated 5.0
-
-    SkillHandler = 0x013D, // updated 5.0
+    SkillHandler = 0x01BE, // updated 5.18
     GMCommand1 = 0x00A4, // updated 5.1
     GMCommand2 = 0x013F, // updated 5.0
     AoESkillHandler = 0x140, // updated 5.0
 
-    UpdatePositionHandler = 0x01BF, // updated 5.11
+    UpdatePositionHandler = 0x0318, // updated 5.18
 
-    InventoryModifyHandler = 0x029B, // updated 5.11
+    InventoryModifyHandler = 0x03C5, // updated 5.18
     
     InventoryEquipRecommendedItems = 0x0149, // updated 5.0
 
     ReqPlaceHousingItem = 0x014B, // updated 5.0
     BuildPresetHandler = 0x014F, // updated 5.0
 
-    TalkEventHandler = 0x0151, // updated 5.0
-    EmoteEventHandler = 0x0152, // updated 5.0
-    WithinRangeEventHandler = 0x0165, // updated 5.11
-    OutOfRangeEventHandler = 0x0154, // updated 5.0
-    EnterTeriEventHandler = 0x0155, // updated 5.0
+    TalkEventHandler = 0x02FD, // updated 5.18
+    EmoteEventHandler = 0x0183, // updated 5.18
+    WithinRangeEventHandler = 0x0167, // updated 5.18
+    OutOfRangeEventHandler = 0x02B5, // updated 5.18
+    EnterTeriEventHandler = 0x0267, // updated 5.18
     ShopEventHandler = 0x0156, // updated 5.0
 
-    ReturnEventHandler = 0x015A, // updated 5.0?
-    TradeReturnEventHandler = 0x015B, // updated 5.0?
+    ReturnEventHandler = 0x026B, // updated 5.18
+    TradeReturnEventHandler = 0x02DD, // updated 5.18
 
     LinkshellEventHandler = 0x016B, // updated 4.5
     LinkshellEventHandler1 = 0x016C, // updated 4.5
 
-    ReqEquipDisplayFlagsChange = 0x0175, // updated 5.0
+    ReqEquipDisplayFlagsChange = 0x01FE, // updated 5.18
 
     LandRenameHandler = 0xF177, // updated 5.0
     HousingUpdateHouseGreeting = 0x0178, // updated 5.0
@@ -366,8 +368,6 @@ namespace Sapphire::Network::Packets
 
     PerformNoteHandler = 0x029B, // updated 4.3
 
-
-
   };
 
   ////////////////////////////////////////////////////////////////////////////////
diff --git a/src/common/Network/PacketDef/Zone/ServerZoneDef.h b/src/common/Network/PacketDef/Zone/ServerZoneDef.h
index 9dc959b9..33915278 100644
--- a/src/common/Network/PacketDef/Zone/ServerZoneDef.h
+++ b/src/common/Network/PacketDef/Zone/ServerZoneDef.h
@@ -244,6 +244,7 @@ namespace Sapphire::Network::Packets::Server
       uint8_t rank;
       uint16_t padding;
       uint8_t lsName[20];
+      uint8_t unk[16];
     } entry[8];
   };
 
@@ -440,15 +441,25 @@ namespace Sapphire::Network::Packets::Server
   {
     uint32_t unknown;
     uint32_t actor_id;
-    uint8_t unknown1;
-    uint8_t unknown2;
-    uint16_t padding1;
+    //uint8_t unknown1;
+    //uint8_t unknown2;
+    //uint16_t padding1;
+    //uint32_t current_hp;
+    //uint16_t current_mp;
+    //uint16_t current_tp;
+    //uint32_t max_hp;
+    //uint16_t max_mp;
+    //uint16_t max_something;
     uint32_t current_hp;
-    uint16_t current_mp;
-    uint16_t current_tp;
     uint32_t max_hp;
+    uint16_t current_mp;
+    uint16_t unknown1;
     uint16_t max_mp;
-    uint16_t max_something;
+    uint8_t unknown2;
+    uint8_t classId;
+    uint8_t unknown4;
+    uint8_t unkFlag;
+    uint16_t unknown6;
 
     struct StatusEntry
     {
@@ -461,7 +472,7 @@ namespace Sapphire::Network::Packets::Server
       uint32_t sourceActorId;
     } statusEntries[4];
 
-    uint32_t unknown4;
+    uint32_t unknown7;
   };
 
   /**
@@ -930,8 +941,10 @@ namespace Sapphire::Network::Packets::Server
     uint32_t unknown10;
     uint32_t unknown11;
     uint32_t unknown12[4];
+    uint32_t unknown13[3];
     Common::FFXIVARR_POSITION3 pos;
-    uint32_t unknown13;
+    uint32_t unknown14[3];
+    uint32_t unknown15;
   };
 
 
@@ -1028,6 +1041,7 @@ namespace Sapphire::Network::Packets::Server
     unsigned char companionHealRank;
     unsigned char u19[2];
     unsigned char mountGuideMask[19];
+    uint8_t unk1[9];
     char name[32];
     unsigned char unknownOword[16];
     unsigned char unknownOw;
@@ -1496,7 +1510,7 @@ namespace Sapphire::Network::Packets::Server
   struct FFXIVIpcQuestCompleteList : FFXIVIpcBasePacket< QuestCompleteList >
   {
     uint8_t questCompleteMask[480];
-    uint8_t unknownCompleteMask[32];
+    uint8_t unknownCompleteMask[80];
   };
 
   /**
diff --git a/src/world/Actor/Chara.cpp b/src/world/Actor/Chara.cpp
index 70656675..7cbc3dde 100644
--- a/src/world/Actor/Chara.cpp
+++ b/src/world/Actor/Chara.cpp
@@ -523,11 +523,13 @@ void Sapphire::Entity::Chara::addStatusEffect( StatusEffect::StatusEffectPtr pEf
   statusEffectAdd->data().actor_id = pEffect->getTargetActorId();
   statusEffectAdd->data().current_hp = getHp();
   statusEffectAdd->data().current_mp = getMp();
-  statusEffectAdd->data().current_tp = getTp();
+  //statusEffectAdd->data().current_tp = getTp();
   statusEffectAdd->data().max_hp = getMaxHp();
   statusEffectAdd->data().max_mp = getMaxMp();
-  statusEffectAdd->data().max_something = 1;
+  //statusEffectAdd->data().max_something = 1;
   //statusEffectAdd->data().unknown2 = 28;
+  statusEffectAdd->data().classId = static_cast< uint8_t >(getClass());
+  statusEffectAdd->data().unkFlag = 1;
 
   auto& status = statusEffectAdd->data().statusEntries[0];
 

From ba74f988d698e530d92496bdbac392c4954f58b8 Mon Sep 17 00:00:00 2001
From: NotAdam <adam@notadam.me>
Date: Thu, 2 Jan 2020 14:22:36 +1100
Subject: [PATCH 193/351] fix build error

---
 src/world/Territory/Housing/HousingInteriorTerritory.h | 2 +-
 src/world/Territory/InstanceObjectCache.h              | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/world/Territory/Housing/HousingInteriorTerritory.h b/src/world/Territory/Housing/HousingInteriorTerritory.h
index efc4860b..3ea97ae4 100644
--- a/src/world/Territory/Housing/HousingInteriorTerritory.h
+++ b/src/world/Territory/Housing/HousingInteriorTerritory.h
@@ -5,7 +5,7 @@
 
 namespace Sapphire::World::Territory::Housing
 {
-  class HousingInteriorTerritory : public Territory
+  class HousingInteriorTerritory : public Sapphire::Territory
   {
   public:
     HousingInteriorTerritory( Common::LandIdent ident, uint16_t territoryTypeId,
diff --git a/src/world/Territory/InstanceObjectCache.h b/src/world/Territory/InstanceObjectCache.h
index 83e9a6a3..cab04b55 100644
--- a/src/world/Territory/InstanceObjectCache.h
+++ b/src/world/Territory/InstanceObjectCache.h
@@ -38,7 +38,6 @@ namespace Sapphire
       return nullptr;
     }
 
-    template< typename T >
     void insert( uint16_t zoneId, T& entry )
     {
       auto pShared = std::make_shared< T >( entry );

From 0d3e73e53138664458f4d5dcf9316419be376a5e Mon Sep 17 00:00:00 2001
From: NotAdam <adam@notadam.me>
Date: Thu, 2 Jan 2020 14:42:58 +1100
Subject: [PATCH 194/351] fix eventplay opcodes/names

---
 src/common/Network/PacketDef/Ipcs.h           |  9 +++++--
 .../Network/PacketDef/Zone/ServerZoneDef.h    | 26 ++++++++++++-------
 src/world/Actor/PlayerEvent.cpp               |  2 +-
 3 files changed, 25 insertions(+), 12 deletions(-)

diff --git a/src/common/Network/PacketDef/Ipcs.h b/src/common/Network/PacketDef/Ipcs.h
index 57de2993..25bfd914 100644
--- a/src/common/Network/PacketDef/Ipcs.h
+++ b/src/common/Network/PacketDef/Ipcs.h
@@ -180,8 +180,13 @@ namespace Sapphire::Network::Packets
     HuntingLogEntry = 0x01B3, // updated 5.0
 
     EventPlay = 0x0279, // updated 5.18
-    DirectorPlayScene = 0x01B9, // updated 5.0
-    EventOpenGilShop = 0x01B1, // updated 5.18
+    EventPlay4 = 0x02F7, // updated 5.18
+    EventPlay8 = 0x0119, // updated 5.18
+    EventPlay16 = 0x01FB, // updated 5.18
+    EventPlay32 = 0x0364, // updated 5.18
+    EventPlay64 = 0x00E5, // updated 5.18
+    EventPlay128 = 0x02BE, // updated 5.18
+    EventPlay255 = 0x01B1, // updated 5.18
 
     EventStart = 0x0230, // updated 5.18
     EventFinish = 0x01E4, // updated 5.18
diff --git a/src/common/Network/PacketDef/Zone/ServerZoneDef.h b/src/common/Network/PacketDef/Zone/ServerZoneDef.h
index 33915278..f2075f74 100644
--- a/src/common/Network/PacketDef/Zone/ServerZoneDef.h
+++ b/src/common/Network/PacketDef/Zone/ServerZoneDef.h
@@ -1421,11 +1421,24 @@ namespace Sapphire::Network::Packets::Server
     uint8_t unknown[8];
   };
 
+  template< int ArgCount >
+  struct FFXIVIpcEventPlayN
+  {
+    uint64_t actorId;
+    uint32_t eventId;
+    uint16_t scene;
+    uint16_t padding;
+    uint32_t sceneFlags;
+    uint8_t paramCount;
+    uint8_t padding2[3];
+    uint32_t params[ArgCount];
+  };
+
   /**
   * Structural representation of the packet sent by the server
   * to play an event
   */
-  struct FFXIVIpcDirectorPlayScene : FFXIVIpcBasePacket< DirectorPlayScene >
+  struct FFXIVIpcDirectorPlayScene : FFXIVIpcBasePacket< EventPlay32 >
   {
     uint64_t actorId;
     uint32_t eventId;
@@ -1454,15 +1467,10 @@ namespace Sapphire::Network::Packets::Server
     /* 000C */ uint32_t padding1;
   };
 
-  struct FFXIVIpcEventOpenGilShop : FFXIVIpcBasePacket< EventOpenGilShop >
+  struct FFXIVIpcEventPlay255 :
+    FFXIVIpcBasePacket< EventPlay255 >,
+    FFXIVIpcEventPlayN< 255 >
   {
-    uint64_t actorId;
-    uint32_t eventId;
-    uint16_t scene;
-    uint16_t padding;
-    uint32_t sceneFlags;
-
-    uint32_t unknown_wtf[0x101];
   };
 
 
diff --git a/src/world/Actor/PlayerEvent.cpp b/src/world/Actor/PlayerEvent.cpp
index b4fb05a1..15c84470 100644
--- a/src/world/Actor/PlayerEvent.cpp
+++ b/src/world/Actor/PlayerEvent.cpp
@@ -141,7 +141,7 @@ void Sapphire::Entity::Player::playGilShop( uint32_t eventId, uint32_t flags,
   pEvent->setEventReturnCallback( eventCallback );
   pEvent->setSceneChainCallback( nullptr );
 
-  auto openGilShopPacket = makeZonePacket< Server::FFXIVIpcEventOpenGilShop >( getId() );
+  auto openGilShopPacket = makeZonePacket< Server::FFXIVIpcEventPlay255 >( getId() );
   openGilShopPacket->data().eventId = eventId;
   openGilShopPacket->data().sceneFlags = flags;
   openGilShopPacket->data().actorId = getId();

From 7deae36146ed9ba732ae154da1ae05483afa6812 Mon Sep 17 00:00:00 2001
From: NotAdam <adam@notadam.me>
Date: Thu, 2 Jan 2020 15:10:04 +1100
Subject: [PATCH 195/351] more 5.18 opcodes

---
 src/common/Network/PacketDef/Ipcs.h | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/src/common/Network/PacketDef/Ipcs.h b/src/common/Network/PacketDef/Ipcs.h
index 25bfd914..88e219b6 100644
--- a/src/common/Network/PacketDef/Ipcs.h
+++ b/src/common/Network/PacketDef/Ipcs.h
@@ -190,8 +190,6 @@ namespace Sapphire::Network::Packets
 
     EventStart = 0x0230, // updated 5.18
     EventFinish = 0x01E4, // updated 5.18
-    EventUnk0 = 0x02F7, // updated 5.18
-    EventUnk1 = 0x0100, // updated 5.18
     UseMooch = 0x0233, // updated 5.18
 
     EventLinkshell = 0x1169,
@@ -210,8 +208,15 @@ namespace Sapphire::Network::Packets
 
     Mount = 0x02F0, // updated 5.18
 
-    DirectorVars = 0x01F5, // updated 5.0
-    DirectorPopUp = 0x0200, // updated 5.0 - display dialogue pop-ups in duties and FATEs, for example, Teraflare's countdown
+    DirectorVars = 0x00E6, // updated 5.18
+    SomeDirectorUnk1 = 0x0084, // updated 5.18
+    SomeDirectorUnk2 = 0x00C1, // updated 5.18
+    SomeDirectorUnk4 = 0x0100, // updated 5.18
+    SomeDirectorUnk8 = 0x028A, // updated 5.18
+    SomeDirectorUnk16 = 0x028C, // updated 5.18
+    DirectorPopUp = 0x0162, // updated 5.18 - display dialogue pop-ups in duties and FATEs, for example, Teraflare's countdown
+    DirectorPopUp4 = 0x0214, // updated 5.18
+    DirectorPopUp8 = 0x00F8, // updated 5.18
 
     CFAvailableContents = 0xF1FD, // updated 4.2
 

From 1ff69bcce0e4e5520f3e60165829f0428217558c Mon Sep 17 00:00:00 2001
From: collett <collett0301@gmail.com>
Date: Thu, 2 Jan 2020 01:52:20 +0900
Subject: [PATCH 196/351] Fix non-existing lut entry being executed.

---
 src/world/Action/Action.cpp | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/world/Action/Action.cpp b/src/world/Action/Action.cpp
index 550a7be3..871473e6 100644
--- a/src/world/Action/Action.cpp
+++ b/src/world/Action/Action.cpp
@@ -391,8 +391,9 @@ void Action::Action::buildEffects()
   snapshotAffectedActors( m_hitActors );
 
   auto pScriptMgr = m_pFw->get< Scripting::ScriptMgr >();
+  auto hasLutEntry = ActionLut::validEntryExists( static_cast< uint16_t >( getId() ) );
 
-  if( !pScriptMgr->onExecute( *this ) && !ActionLut::validEntryExists( static_cast< uint16_t >( getId() ) ) )
+  if( !pScriptMgr->onExecute( *this ) && !hasLutEntry )
   {
     if( auto player = m_pSource->getAsPlayer() )
     {
@@ -402,7 +403,7 @@ void Action::Action::buildEffects()
     return;
   }
 
-  if( m_hitActors.empty() )
+  if( !hasLutEntry || m_hitActors.empty() )
     return;
 
   auto lutEntry = ActionLut::getEntry( static_cast< uint16_t >( getId() ) );

From e8ebabe025c8009f3e0b556dec027da5972e5972 Mon Sep 17 00:00:00 2001
From: collett <collett0301@gmail.com>
Date: Fri, 3 Jan 2020 01:07:42 +0900
Subject: [PATCH 197/351] Fix item being added more than once when there is
 already a stack of the same item.

---
 src/world/Actor/PlayerInventory.cpp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/world/Actor/PlayerInventory.cpp b/src/world/Actor/PlayerInventory.cpp
index 211d2f40..fe680fc5 100644
--- a/src/world/Actor/PlayerInventory.cpp
+++ b/src/world/Actor/PlayerInventory.cpp
@@ -593,6 +593,8 @@ Sapphire::ItemPtr Sapphire::Entity::Player::addItem( uint32_t catalogId, uint32_
           quantity = newStackSize - maxStack;
           newStackSize = maxStack;
         }
+        else
+          quantity = 0;
 
         item->setStackSize( newStackSize );
         writeItem( item );

From bd1b23c8347a5c325e25183a99c00923e120bc39 Mon Sep 17 00:00:00 2001
From: collett <collett0301@gmail.com>
Date: Fri, 3 Jan 2020 05:07:55 +0900
Subject: [PATCH 198/351] Fix social list.

---
 src/world/Network/Handlers/PacketHandlers.cpp | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/src/world/Network/Handlers/PacketHandlers.cpp b/src/world/Network/Handlers/PacketHandlers.cpp
index 4b3c83a4..6b6ca785 100644
--- a/src/world/Network/Handlers/PacketHandlers.cpp
+++ b/src/world/Network/Handlers/PacketHandlers.cpp
@@ -439,12 +439,12 @@ void Sapphire::Network::GameConnection::socialListHandler( FrameworkPtr pFw,
   uint8_t type = inPacket.data[ 0x1A ];
   uint8_t count = inPacket.data[ 0x1B ];
 
-  if( type == 0x02 )
+  if( type == 1 )
   { // party list
 
     auto listPacket = makeZonePacket< FFXIVIpcSocialList >( player.getId() );
 
-    listPacket->data().type = 2;
+    listPacket->data().type = 1;
     listPacket->data().sequence = count;
 
     int32_t entrysizes = sizeof( listPacket->data().entries );
@@ -465,19 +465,21 @@ void Sapphire::Network::GameConnection::socialListHandler( FrameworkPtr pFw,
 
     memcpy( listPacket->data().entries[ 0 ].name, player.getName().c_str(), strlen( player.getName().c_str() ) );
 
-    // TODO: actually store and read language from somewhere
-    listPacket->data().entries[ 0 ].bytes1[ 0 ] = 0x01;//flags (lang)
-    // TODO: these flags need to be figured out
-    //listPacket.data().entries[0].bytes1[1] = 0x00;//flags
+    // GC icon
+    listPacket->data().entries[ 0 ].bytes1[ 0 ] = 2;
+    // client language J = 0, E = 1, D = 2, F = 3
+    listPacket->data().entries[ 0 ].bytes1[ 1 ] = 1;
+    // user language settings flag J = 1, E = 2, D = 4, F = 8
+    listPacket->data().entries[ 0 ].bytes1[ 2 ] = 1 + 2; 
     listPacket->data().entries[ 0 ].onlineStatusMask = player.getOnlineStatusMask();
 
     queueOutPacket( listPacket );
 
   }
-  else if( type == 0x0b )
+  else if( type == 2 )
   { // friend list
     auto listPacket = makeZonePacket< FFXIVIpcSocialList >( player.getId() );
-    listPacket->data().type = 0x0B;
+    listPacket->data().type = 2;
     listPacket->data().sequence = count;
     memset( listPacket->data().entries, 0, sizeof( listPacket->data().entries ) );
 

From bca39ac17af8306d8c39c562c19aa94728b70a80 Mon Sep 17 00:00:00 2001
From: karashiiro <49822414+karashiiro@users.noreply.github.com>
Date: Thu, 2 Jan 2020 16:15:05 -0800
Subject: [PATCH 199/351] CFNotifyPop and CFPreferredRole

---
 src/common/Network/PacketDef/Ipcs.h | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/common/Network/PacketDef/Ipcs.h b/src/common/Network/PacketDef/Ipcs.h
index c49b0a5a..c2cb3892 100644
--- a/src/common/Network/PacketDef/Ipcs.h
+++ b/src/common/Network/PacketDef/Ipcs.h
@@ -67,9 +67,11 @@ namespace Sapphire::Network::Packets
     Playtime = 0x01DB, // updated 5.1
     Logout = 0x011D, // updated 5.1
     CFNotify = 0x0078,
+    CFNotifyPop = 0x01F8, // added 5.18
     CFMemberStatus = 0x0079,
     CFDutyInfo = 0x007A,
     CFPlayerInNeed = 0x007F,
+    CFPreferredRole = 0x032A, // added 5.18
 
     SocialRequestError = 0x00AD,
 

From 61ac094b2bde15a0e4349ba5e061cf39bd7b4252 Mon Sep 17 00:00:00 2001
From: karashiiro <49822414+karashiiro@users.noreply.github.com>
Date: Thu, 2 Jan 2020 18:38:53 -0800
Subject: [PATCH 200/351] merge duplicate keys

---
 src/common/Network/PacketDef/Ipcs.h | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/common/Network/PacketDef/Ipcs.h b/src/common/Network/PacketDef/Ipcs.h
index 38d4ce1d..b046be2f 100644
--- a/src/common/Network/PacketDef/Ipcs.h
+++ b/src/common/Network/PacketDef/Ipcs.h
@@ -66,8 +66,7 @@ namespace Sapphire::Network::Packets
     ChatBanned = 0x006B,
     Playtime = 0x00E7, // updated 5.18
     Logout = 0x142, // updated 5.18
-    CFNotify = 0x0078,
-    CFNotifyPop = 0x01F8, // added 5.18
+    CFNotify = 0x01F8, // updated 5.18
     CFMemberStatus = 0x0079,
     CFDutyInfo = 0x007A,
     CFPlayerInNeed = 0x007F,

From badfb2f0a92d8e97a00a91d56a0d7470cefcb41b Mon Sep 17 00:00:00 2001
From: collett <collett0301@gmail.com>
Date: Fri, 3 Jan 2020 22:31:55 +0900
Subject: [PATCH 201/351] Fix aetheryte.

---
 src/common/Network/PacketDef/Ipcs.h        | 2 +-
 src/scripts/common/aethernet/Aetheryte.cpp | 3 ++-
 src/world/Actor/Player.cpp                 | 2 +-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/common/Network/PacketDef/Ipcs.h b/src/common/Network/PacketDef/Ipcs.h
index b046be2f..2e4e2ae3 100644
--- a/src/common/Network/PacketDef/Ipcs.h
+++ b/src/common/Network/PacketDef/Ipcs.h
@@ -260,7 +260,7 @@ namespace Sapphire::Network::Packets
     DuelChallenge = 0x0277, // 4.2; this is responsible for opening the ui
     PerformNote = 0x0286, // updated 4.3
 
-    PrepareZoning = 0x02A4, // updated 5.0
+    PrepareZoning = 0x035C, // updated 5.18
     ActorGauge = 0x016D, // updated 5.18
 
     // daily quest info -> without them sent,  login will take longer...
diff --git a/src/scripts/common/aethernet/Aetheryte.cpp b/src/scripts/common/aethernet/Aetheryte.cpp
index 2ba4f14a..cc5afb92 100644
--- a/src/scripts/common/aethernet/Aetheryte.cpp
+++ b/src/scripts/common/aethernet/Aetheryte.cpp
@@ -59,7 +59,8 @@ public:
   {
     if( player.isAetheryteRegistered( eventId & 0xFFFF ) )
     {
-      player.playScene( eventId, 0, 1, [this]( Entity::Player& player, const Event::SceneResult& result )
+      // eventParam4 (or params[1] if using EventPlay8, which is actually used on retail) anything bigger than 1 will show select instance menu item
+      player.playScene( eventId, 0, 1, 0, 1, 2, [this]( Entity::Player& player, const Event::SceneResult& result )
       {
         if( result.param1 == 256 ) // set homepoint
         {
diff --git a/src/world/Actor/Player.cpp b/src/world/Actor/Player.cpp
index fde14915..4ebe604d 100644
--- a/src/world/Actor/Player.cpp
+++ b/src/world/Actor/Player.cpp
@@ -372,7 +372,7 @@ void Sapphire::Entity::Player::teleport( uint16_t aetheryteId, uint8_t type )
   // TODO: this should be simplified and a type created in server_common/common.h.
   if( type == 1 ) // teleport
   {
-    prepareZoning( data->territory, true, 1, 112 ); // TODO: Really?
+    prepareZoning( data->territory, true, 1, 0 ); // TODO: Really?
     sendToInRangeSet( makeActorControl( getId(), ActorDespawnEffect, 0x04 ) );
     setZoningType( Common::ZoneingType::Teleport );
   }

From 352a0ac8231bd37de5af2998e55a2528a6da0e41 Mon Sep 17 00:00:00 2001
From: collett <collett0301@gmail.com>
Date: Fri, 3 Jan 2020 22:47:01 +0900
Subject: [PATCH 202/351] Fix event battle.

---
 src/common/Network/CommonActorControl.h             | 4 ++++
 src/world/Network/Handlers/ClientTriggerHandler.cpp | 9 +++++++++
 2 files changed, 13 insertions(+)

diff --git a/src/common/Network/CommonActorControl.h b/src/common/Network/CommonActorControl.h
index 6046fecf..c5a32413 100644
--- a/src/common/Network/CommonActorControl.h
+++ b/src/common/Network/CommonActorControl.h
@@ -264,6 +264,8 @@ namespace Sapphire::Network::ActorControl
 
     ToggleOrchestrionUnlock = 0x396,
 
+    EventBattleDialog = 0x39C,
+
     /*!
     * param1 = mountSpeed
     * Retail sends 12 for mount speed star 1 unlocked and 15 for mount speed star 2 unlocked
@@ -391,6 +393,8 @@ namespace Sapphire::Network::ActorControl
     AchievementComp = 0x203,
     AchievementCatChat = 0x206,
 
+    RequestEventBattle = 0x232C,
+
     QuestJournalUpdateQuestVisibility = 0x2BE,
     QuestJournalClosed = 0x2BF,
 
diff --git a/src/world/Network/Handlers/ClientTriggerHandler.cpp b/src/world/Network/Handlers/ClientTriggerHandler.cpp
index d75ed879..b6decf1b 100644
--- a/src/world/Network/Handlers/ClientTriggerHandler.cpp
+++ b/src/world/Network/Handlers/ClientTriggerHandler.cpp
@@ -21,6 +21,7 @@
 #include "Network/PacketWrappers/ChatPacket.h"
 #include "Network/PacketWrappers/ServerNoticePacket.h"
 #include "Network/PacketWrappers/ActorControlPacket.h"
+#include "Network/PacketWrappers/ActorControlSelfPacket.h"
 
 #include "Manager/DebugCommandMgr.h"
 #include "Manager/EventMgr.h"
@@ -493,6 +494,14 @@ void Sapphire::Network::GameConnection::clientTriggerHandler( FrameworkPtr pFw,
                         canTeleport, unk1, privateEstateAccess, unk );
       break;
     }
+    case ClientTriggerType::RequestEventBattle:
+    {
+      auto packet = makeActorControlSelf( player.getId(), ActorControl::EventBattleDialog, 0, param12, param2 );
+      player.queuePacket( packet );
+
+      player.sendDebug( "event battle level sync: {0}, ilevel sync?: {1}", param12, param2 );
+      break;
+    }
 
     default:
     {

From 20f854b36f7966052317e62a986b0891ad13da9b Mon Sep 17 00:00:00 2001
From: collett <collett0301@gmail.com>
Date: Sun, 5 Jan 2020 05:14:38 +0900
Subject: [PATCH 203/351] Move quest finish packet to where it belongs to so we
 can abandon quests.

---
 src/world/Actor/PlayerQuest.cpp | 20 ++++++++------------
 1 file changed, 8 insertions(+), 12 deletions(-)

diff --git a/src/world/Actor/PlayerQuest.cpp b/src/world/Actor/PlayerQuest.cpp
index e503a273..48b9fbc0 100644
--- a/src/world/Actor/PlayerQuest.cpp
+++ b/src/world/Actor/PlayerQuest.cpp
@@ -15,14 +15,19 @@ using namespace Sapphire::Network::Packets::Server;
 
 void Sapphire::Entity::Player::finishQuest( uint16_t questId )
 {
-
   int8_t idx = getQuestIndex( questId );
 
   removeQuest( questId );
+
+  auto questFinishPacket = makeZonePacket< FFXIVIpcQuestFinish >( getId() );
+  questFinishPacket->data().questId = questId;
+  questFinishPacket->data().flag1 = 1;
+  questFinishPacket->data().flag2 = 1;
+  queuePacket( questFinishPacket );
+
   updateQuestsCompleted( questId );
 
-  sendQuestTracker();
-
+  //sendQuestTracker(); already sent in removeQuest()
 }
 
 void Sapphire::Entity::Player::unfinishQuest( uint16_t questId )
@@ -33,24 +38,16 @@ void Sapphire::Entity::Player::unfinishQuest( uint16_t questId )
 
 void Sapphire::Entity::Player::removeQuest( uint16_t questId )
 {
-
   int8_t idx = getQuestIndex( questId );
 
   if( ( idx != -1 ) && ( m_activeQuests[ idx ] != nullptr ) )
   {
-
     auto questUpdatePacket = makeZonePacket< FFXIVIpcQuestUpdate >( getId() );
     questUpdatePacket->data().slot = static_cast< uint8_t >( idx );
     questUpdatePacket->data().questInfo.c.questId = 0;
     questUpdatePacket->data().questInfo.c.sequence = 0xFF;
     queuePacket( questUpdatePacket );
 
-    auto questFinishPacket = makeZonePacket< FFXIVIpcQuestFinish >( getId() );
-    questFinishPacket->data().questId = questId;
-    questFinishPacket->data().flag1 = 1;
-    questFinishPacket->data().flag2 = 1;
-    queuePacket( questFinishPacket );
-
     for( int32_t ii = 0; ii < 5; ii++ )
     {
       if( m_questTracking[ ii ] == idx )
@@ -67,7 +64,6 @@ void Sapphire::Entity::Player::removeQuest( uint16_t questId )
   }
 
   sendQuestTracker();
-
 }
 
 bool Sapphire::Entity::Player::hasQuest( uint32_t questId )

From 159aafadf63c5b7634297d54c3cf9c9e352af5b0 Mon Sep 17 00:00:00 2001
From: collett <collett0301@gmail.com>
Date: Fri, 3 Jan 2020 01:10:42 +0900
Subject: [PATCH 204/351] Fix quest reward choice. Quest scripts need to call
 player.giveQuestRewards( getId(), result.param3 ) for it to work.

---
 src/world/Actor/PlayerQuest.cpp | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/src/world/Actor/PlayerQuest.cpp b/src/world/Actor/PlayerQuest.cpp
index e503a273..0710244f 100644
--- a/src/world/Actor/PlayerQuest.cpp
+++ b/src/world/Actor/PlayerQuest.cpp
@@ -1067,7 +1067,7 @@ bool Sapphire::Entity::Player::giveQuestRewards( uint32_t questId, uint32_t opti
 
   if( rewardItemCount > 0 )
   {
-    for( uint32_t i = 0; i < questInfo->itemReward0.size(); i++ )
+    for( uint32_t i = 0; i < rewardItemCount; i++ )
     {
       addItem( questInfo->itemReward0.at( i ), questInfo->itemCountReward0.at( i ) );
     }
@@ -1075,8 +1075,15 @@ bool Sapphire::Entity::Player::giveQuestRewards( uint32_t questId, uint32_t opti
 
   if( optionalItemCount > 0 )
   {
-    auto itemId = questInfo->itemReward1.at( optionalChoice );
-    addItem( itemId, questInfo->itemCountReward1.at( optionalChoice ) );
+    for( uint32_t i = 0; i < optionalItemCount; i++ )
+    {
+      auto itemId = questInfo->itemReward1.at( i );
+      if( itemId == optionalChoice )
+      {
+        addItem( itemId, questInfo->itemCountReward1.at( i ) );
+        break;
+      }
+    }
   }
 
   if( gilReward > 0 )

From c63e9d15176de41b48174d404f7b793c7831de31 Mon Sep 17 00:00:00 2001
From: collett <collett0301@gmail.com>
Date: Sun, 5 Jan 2020 06:20:50 +0900
Subject: [PATCH 205/351] Inventory fixes.

---
 src/common/Network/PacketDef/Ipcs.h |  6 +++---
 src/world/Actor/PlayerInventory.cpp | 10 ++++++++++
 2 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/src/common/Network/PacketDef/Ipcs.h b/src/common/Network/PacketDef/Ipcs.h
index 2e4e2ae3..689e9bd7 100644
--- a/src/common/Network/PacketDef/Ipcs.h
+++ b/src/common/Network/PacketDef/Ipcs.h
@@ -171,11 +171,11 @@ namespace Sapphire::Network::Packets
 
     ItemInfo = 0x00F2, // updated 5.18
     ContainerInfo = 0x01F2, // updated 5.18
-    InventoryTransactionFinish = 0x01AB, // updated 5.1
-    InventoryTransaction = 0x023E, // updated 5.1
+    InventoryTransactionFinish = 0x00D2, // updated 5.18
+    InventoryTransaction = 0x0233, // updated 5.18
     CurrencyCrystalInfo = 0x02BF, // updated 5.18
 
-    InventoryActionAck = 0x0084, // updated 5.1
+    InventoryActionAck = 0x02FA, // updated 5.18
     UpdateInventorySlot = 0x0370, // updated 5.18
 
     HuntingLogEntry = 0x01B3, // updated 5.0
diff --git a/src/world/Actor/PlayerInventory.cpp b/src/world/Actor/PlayerInventory.cpp
index fe680fc5..4b219668 100644
--- a/src/world/Actor/PlayerInventory.cpp
+++ b/src/world/Actor/PlayerInventory.cpp
@@ -607,6 +607,11 @@ Sapphire::ItemPtr Sapphire::Entity::Player::addItem( uint32_t catalogId, uint32_
         {
           queuePacket( makeActorControlSelf( getId(), ItemObtainIcon, catalogId, originalQuantity ) );
 
+          auto soundEffectPacket = makeZonePacket< FFXIVIpcInventoryActionAck >( getId() );
+          soundEffectPacket->data().sequence = 0xFFFFFFFF;
+          soundEffectPacket->data().type = 6;
+          queuePacket( soundEffectPacket );
+
           return item;
         }
 
@@ -638,6 +643,11 @@ Sapphire::ItemPtr Sapphire::Entity::Player::addItem( uint32_t catalogId, uint32_
     queuePacket( invUpdate );
 
     queuePacket( makeActorControlSelf( getId(), ItemObtainIcon, catalogId, originalQuantity ) );
+
+    auto soundEffectPacket = makeZonePacket< FFXIVIpcInventoryActionAck >( getId() );
+    soundEffectPacket->data().sequence = 0xFFFFFFFF;
+    soundEffectPacket->data().type = 6;
+    queuePacket( soundEffectPacket );
   }
 
   return item;

From e8dcef63ba3e17f9dfa583812ada703ce2ce908e Mon Sep 17 00:00:00 2001
From: collett <collett0301@gmail.com>
Date: Sun, 5 Jan 2020 17:09:27 +0900
Subject: [PATCH 206/351] Action system updates.

---
 src/common/Common.h                           |    1 +
 src/common/Network/PacketDef/Ipcs.h           |    6 +-
 .../Network/PacketDef/Zone/ServerZoneDef.h    |   59 +-
 src/tools/action_parse/main.cpp               |    4 +-
 src/world/Action/Action.cpp                   |  147 +-
 src/world/Action/Action.h                     |    8 +
 src/world/Action/ActionLut.h                  |    2 +-
 src/world/Action/ActionLutData.cpp            | 2703 +++++++++--------
 src/world/Action/EffectBuilder.cpp            |  205 +-
 src/world/Action/EffectBuilder.h              |   15 +-
 src/world/Action/EffectResult.cpp             |   34 +-
 src/world/Action/EffectResult.h               |    6 +-
 src/world/Actor/Chara.cpp                     |   12 +
 src/world/Actor/Chara.h                       |    2 +
 src/world/Actor/Player.cpp                    |   43 +-
 src/world/Actor/Player.h                      |    7 +
 src/world/Manager/ActionMgr.cpp               |   24 +-
 .../Network/PacketWrappers/EffectPacket.h     |    3 +-
 18 files changed, 1896 insertions(+), 1385 deletions(-)

diff --git a/src/common/Common.h b/src/common/Common.h
index a78728e4..46ce75e4 100644
--- a/src/common/Common.h
+++ b/src/common/Common.h
@@ -629,6 +629,7 @@ namespace Sapphire::Common
      * @param value The actionid that starts/continues the combo. eg, 3617 will start a spinning slash and/or syphon strike combo
      */
     StartActionCombo = 28,
+    ComboVisualEffect = 29,
     Knockback = 33,
     Mount = 38,
     VFX = 59, // links to VFX sheet
diff --git a/src/common/Network/PacketDef/Ipcs.h b/src/common/Network/PacketDef/Ipcs.h
index 689e9bd7..7a8b0947 100644
--- a/src/common/Network/PacketDef/Ipcs.h
+++ b/src/common/Network/PacketDef/Ipcs.h
@@ -156,7 +156,7 @@ namespace Sapphire::Network::Packets
     SilentSetClassJob = 0x018E, // updated 5.0 - seems to be the case, not sure if it's actually used for anything
     PlayerSetup = 0x0295, // updated 5.18
     PlayerStats = 0x017A, // updated 5.18
-    ActorOwner = 0x0322, // updated 5.11
+    ActorOwner = 0x03BB, // updated 5.18
     PlayerStateFlags = 0x02C6, // updated 5.18
     PlayerClassInfo = 0x01B0, // updated 5.18
 
@@ -341,8 +341,8 @@ namespace Sapphire::Network::Packets
 
     PlaceFieldMarker = 0x013C, // updated 5.0
     SkillHandler = 0x01BE, // updated 5.18
-    GMCommand1 = 0x00A4, // updated 5.1
-    GMCommand2 = 0x013F, // updated 5.0
+    GMCommand1 = 0x014D, // updated 5.18
+    GMCommand2 = 0x032C, // updated 5.18
     AoESkillHandler = 0x140, // updated 5.0
 
     UpdatePositionHandler = 0x0318, // updated 5.18
diff --git a/src/common/Network/PacketDef/Zone/ServerZoneDef.h b/src/common/Network/PacketDef/Zone/ServerZoneDef.h
index 310251b3..2cb79a26 100644
--- a/src/common/Network/PacketDef/Zone/ServerZoneDef.h
+++ b/src/common/Network/PacketDef/Zone/ServerZoneDef.h
@@ -537,33 +537,6 @@ namespace Sapphire::Network::Packets::Server
     /* 0012 */ uint32_t unknown_12;
   };
 
-
-  /**
-  * Structural representation of the packet sent by the server
-  * for battle actions
-  */
-  struct EffectHeader
-  {
-    uint64_t animationTargetId; // who the animation targets
-
-    uint32_t actionId; // what the casting player casts, shown in battle log/ui
-    uint32_t globalEffectCounter; // seems to only increment on retail?
-
-    float animationLockTime; // maybe? doesn't seem to do anything
-    uint32_t someTargetId; // always 00 00 00 E0, 0x0E000000 is the internal def for INVALID TARGET ID
-
-    uint16_t hiddenAnimation; // if 0, always shows animation, otherwise hides it. counts up by 1 for each animation skipped on a caster
-    uint16_t rotation;
-    uint16_t actionAnimationId; // the animation that is played by the casting character
-    uint8_t variation; // variation in the animation
-    Common::ActionEffectDisplayType effectDisplayType;
-
-    uint8_t unknown20; // is read by handler, runs code which gets the LODWORD of animationLockTime (wtf?)
-    uint8_t effectCount; // ignores effects if 0, otherwise parses all of them
-    uint16_t padding_21;
-
-  };
-
   struct FFXIVIpcEffect : FFXIVIpcBasePacket< Effect >
   {
     uint64_t animationTargetId; // who the animation targets
@@ -608,17 +581,35 @@ namespace Sapphire::Network::Packets::Server
   template< int size >
   struct FFXIVIpcAoeEffect
   {
-    EffectHeader header;
+    uint64_t animationTargetId; // who the animation targets
 
-    Common::EffectEntry effects[size];
+    uint32_t actionId; // what the casting player casts, shown in battle log/ui
+    uint32_t globalSequence; // seems to only increment on retail?
+
+    float animationLockTime; // maybe? doesn't seem to do anything
+    uint32_t someTargetId; // always 00 00 00 E0, 0x0E000000 is the internal def for INVALID TARGET ID
+
+    uint16_t sourceSequence; // if 0, always shows animation, otherwise hides it. counts up by 1 for each animation skipped on a caster
+    uint16_t rotation;
+    uint16_t actionAnimationId; // the animation that is played by the casting character
+    uint8_t variation; // variation in the animation
+    Common::ActionEffectDisplayType effectDisplayType;
+
+    uint8_t unknown20; // is read by handler, runs code which gets the LODWORD of animationLockTime (wtf?)
+    uint8_t effectCount; // ignores effects if 0, otherwise parses all of them
+    uint16_t padding_21[3];
+    uint16_t padding;
+
+    struct
+    {
+      Common::EffectEntry entries[8];
+    } effects[size];
 
     uint16_t padding_6A[3];
 
-    uint32_t effectTargetId[size];
-    Common::FFXIVARR_POSITION3 position;
-    uint32_t effectFlags;
-
-    uint32_t padding_78;
+    uint64_t effectTargetId[size];
+    uint16_t unkFlag[3]; // all 0x7FFF
+    uint16_t unk[3];
   };
 
   struct FFXIVIpcAoeEffect8 :
diff --git a/src/tools/action_parse/main.cpp b/src/tools/action_parse/main.cpp
index aa40bdd1..ff750cf6 100644
--- a/src/tools/action_parse/main.cpp
+++ b/src/tools/action_parse/main.cpp
@@ -249,11 +249,11 @@ int main()
 //                  action.first, data.name, data.potency, data.flankPotency, data.frontPotency, data.rearPotency,
 //                  data.curePotency, data.restorePercentage );
 
-    auto out = fmt::format( "  // {}\n  {{ {}, {{ {}, {}, {}, {}, {}, {} }} }},\n",
+    auto out = fmt::format( "  // {}\n  {{ {}, {{ {}, {}, {}, {}, {}, {}, {} }} }},\n",
                             data.name, action.first,
                             data.potency, data.comboPotency,
                             data.flankPotency, data.frontPotency, data.rearPotency,
-                            data.curePotency );
+                            data.curePotency, 0 );
 
     output += out;
 //    Logger::info( out );
diff --git a/src/world/Action/Action.cpp b/src/world/Action/Action.cpp
index 871473e6..1c2f10aa 100644
--- a/src/world/Action/Action.cpp
+++ b/src/world/Action/Action.cpp
@@ -1,5 +1,4 @@
 #include "Action.h"
-#include "ActionLut.h"
 #include "EffectBuilder.h"
 
 #include <Inventory/Item.h>
@@ -127,6 +126,15 @@ bool Action::Action::init()
 
   // todo: add missing rows for secondaryCostType/secondaryCostType and rename the current rows to primaryCostX
 
+  if( ActionLut::validEntryExists( static_cast< uint16_t >( getId() ) ) )
+  {
+    m_lutEntry = ActionLut::getEntry( static_cast< uint16_t >( getId() ) );
+  }
+  else
+  {
+    std::memset( &m_lutEntry, 0, sizeof( ActionEntry ) );
+  }
+
   addDefaultActorFilters();
 
   return true;
@@ -162,6 +170,11 @@ bool Action::Action::isInterrupted() const
   return m_interruptType != Common::ActionInterruptType::None;
 }
 
+Common::ActionInterruptType Action::Action::getInterruptType() const
+{
+  return m_interruptType;
+}
+
 void Action::Action::setInterrupted( Common::ActionInterruptType type )
 {
   m_interruptType = type;
@@ -212,6 +225,30 @@ bool Action::Action::update()
     return true;
   }
 
+  if( m_pTarget == nullptr && m_targetId != 0 )
+  {
+    // try to search for the target actor
+    for( auto actor : m_pSource->getInRangeActors( true ) )
+    {
+      if( actor->getId() == m_targetId )
+      {
+        m_pTarget = actor->getAsChara();
+        break;
+      }
+    }
+  }
+
+  if( m_pTarget != nullptr )
+  {
+    if( !m_pTarget->isAlive() )
+    {
+      // interrupt the cast if target died
+      setInterrupted( Common::ActionInterruptType::RegularInterrupt );
+      interrupt();
+      return true;
+    }
+  }
+
   return false;
 }
 
@@ -336,7 +373,7 @@ void Action::Action::execute()
     }
   }
 
-  if( isComboAction() )
+  if( isCorrectCombo() )
   {
     auto player = m_pSource->getAsPlayer();
 
@@ -356,7 +393,15 @@ void Action::Action::execute()
   // ignore it otherwise (ogcds, etc.)
   if( !m_actionData->preservesCombo )
   {
-    m_pSource->setLastComboActionId( getId() );
+    // potential combo starter or correct combo from last action
+    if( ( !isComboAction() || isCorrectCombo() ) )
+    {
+      m_pSource->setLastComboActionId( getId() );
+    }
+    else // clear last combo action if the combo breaks
+    {
+      m_pSource->setLastComboActionId( 0 );
+    }
   }
 }
 
@@ -391,7 +436,7 @@ void Action::Action::buildEffects()
   snapshotAffectedActors( m_hitActors );
 
   auto pScriptMgr = m_pFw->get< Scripting::ScriptMgr >();
-  auto hasLutEntry = ActionLut::validEntryExists( static_cast< uint16_t >( getId() ) );
+  auto hasLutEntry = hasValidLutEntry();
 
   if( !pScriptMgr->onExecute( *this ) && !hasLutEntry )
   {
@@ -406,29 +451,69 @@ void Action::Action::buildEffects()
   if( !hasLutEntry || m_hitActors.empty() )
     return;
 
-  auto lutEntry = ActionLut::getEntry( static_cast< uint16_t >( getId() ) );
-
   // no script exists but we have a valid lut entry
   if( auto player = getSourceChara()->getAsPlayer() )
   {
-    player->sendDebug( "Hit target: pot: {} (c: {}, f: {}, r: {}), heal pot: {}",
-                       lutEntry.potency, lutEntry.comboPotency, lutEntry.flankPotency, lutEntry.rearPotency,
-                       lutEntry.curePotency );
+    player->sendDebug( "Hit target: pot: {} (c: {}, f: {}, r: {}), heal pot: {}, mpp: {}",
+                       m_lutEntry.potency, m_lutEntry.comboPotency, m_lutEntry.flankPotency, m_lutEntry.rearPotency,
+                       m_lutEntry.curePotency, m_lutEntry.restoreMPPercentage );
   }
 
+  // when aoe, these effects are in the target whatever is hit first
+  bool shouldRestoreMP = true;
+  bool shouldShowComboEffect = true;
+
   for( auto& actor : m_hitActors )
   {
-    // todo: this is shit
-    if( lutEntry.curePotency > 0 )
+    if( m_lutEntry.potency > 0 )
     {
-
-      m_effectBuilder->healTarget( actor, lutEntry.curePotency );
-    }
-
-    else if( lutEntry.potency > 0 )
-    {
-      auto dmg = calcDamage( lutEntry.potency );
+      auto dmg = calcDamage( isCorrectCombo() ? m_lutEntry.comboPotency : m_lutEntry.potency );
       m_effectBuilder->damageTarget( actor, dmg.first, dmg.second );
+
+      if( dmg.first > 0 )
+        actor->onActionHostile( m_pSource );
+
+      if( isCorrectCombo() && shouldShowComboEffect )
+      {
+        m_effectBuilder->comboVisualEffect( actor );
+        shouldShowComboEffect = false;
+      }
+
+      if( !isComboAction() || isCorrectCombo() )
+      {
+        if( m_lutEntry.curePotency > 0 ) // actions with self heal
+        {
+          m_effectBuilder->selfHeal( actor, m_pSource, m_lutEntry.curePotency );
+        }
+
+        if( m_lutEntry.restoreMPPercentage > 0 && shouldRestoreMP )
+        {
+          m_effectBuilder->restoreMP( actor, m_pSource, m_pSource->getMaxMp() * m_lutEntry.restoreMPPercentage / 100 );
+          shouldRestoreMP = false;
+        }
+
+        if ( !m_actionData->preservesCombo ) // we need something like m_actionData->hasNextComboAction
+        {
+          m_effectBuilder->startCombo( actor, getId() ); // this is on all targets hit
+        }
+      }
+    }
+    else if( m_lutEntry.curePotency > 0 )
+    {
+      // todo: calcHealing()
+      m_effectBuilder->healTarget( actor, m_lutEntry.curePotency );
+
+      if( m_lutEntry.restoreMPPercentage > 0 && shouldRestoreMP )
+      {
+        // always restore caster mp I don't think there are any actions that can restore target MP post 5.0
+        m_effectBuilder->restoreMP( actor, m_pSource, m_pSource->getMaxMp() * m_lutEntry.restoreMPPercentage / 100 );
+        shouldRestoreMP = false;
+      }
+    }
+    else if( m_lutEntry.restoreMPPercentage > 0 && shouldRestoreMP )
+    {
+      m_effectBuilder->restoreMP( actor, m_pSource, m_pSource->getMaxMp() * m_lutEntry.restoreMPPercentage / 100 );
+      shouldRestoreMP = false;
     }
   }
 
@@ -511,7 +596,7 @@ void Action::Action::setAdditionalData( uint32_t data )
   m_additionalData = data;
 }
 
-bool Action::Action::isComboAction() const
+bool Action::Action::isCorrectCombo() const
 {
   auto lastActionId = m_pSource->getLastComboActionId();
 
@@ -523,6 +608,11 @@ bool Action::Action::isComboAction() const
   return m_actionData->actionCombo == lastActionId;
 }
 
+bool Action::Action::isComboAction() const
+{
+  return m_actionData->actionCombo != 0;
+}
+
 bool Action::Action::primaryCostCheck( bool subtractCosts )
 {
   switch( m_primaryCostType )
@@ -657,11 +747,24 @@ void Action::Action::addDefaultActorFilters()
 bool Action::Action::preFilterActor( Sapphire::Entity::Actor& actor ) const
 {
   auto kind = actor.getObjKind();
+  auto chara = actor.getAsChara();
 
   // todo: are there any server side eobjs that players can hit?
   if( kind != ObjKind::BattleNpc && kind != ObjKind::Player )
     return false;
 
+  if( m_lutEntry.potency > 0 && chara == m_pSource )
+  {
+    // damage action shouldn't hit self
+    return false;
+  }
+
+  if( ( m_lutEntry.potency > 0 || m_lutEntry.curePotency > 0 ) && !chara->isAlive() )
+  {
+    // can't deal damage or heal a dead entity
+    return false;
+  }
+
   // todo: handle things such based on canTargetX
 
   return true;
@@ -680,4 +783,10 @@ Sapphire::Entity::CharaPtr Action::Action::getHitChara()
   }
 
   return nullptr;
+}
+
+bool Action::Action::hasValidLutEntry() const
+{
+  return m_lutEntry.potency != 0 || m_lutEntry.comboPotency != 0 || m_lutEntry.flankPotency != 0 || m_lutEntry.frontPotency != 0 ||
+    m_lutEntry.rearPotency != 0 || m_lutEntry.curePotency != 0 || m_lutEntry.restoreMPPercentage != 0;
 }
\ No newline at end of file
diff --git a/src/world/Action/Action.h b/src/world/Action/Action.h
index 8288b90e..b85f5f03 100644
--- a/src/world/Action/Action.h
+++ b/src/world/Action/Action.h
@@ -2,6 +2,7 @@
 #define _ACTION_H_
 
 #include <Common.h>
+#include "ActionLut.h"
 #include "Util/ActorFilter.h"
 #include "ForwardsZone.h"
 
@@ -37,6 +38,7 @@ namespace Sapphire::World::Action
     Entity::CharaPtr getSourceChara() const;
 
     bool isInterrupted() const;
+    Common::ActionInterruptType getInterruptType() const;
     void setInterrupted( Common::ActionInterruptType type );
 
     uint32_t getCastTime() const;
@@ -45,6 +47,8 @@ namespace Sapphire::World::Action
     uint32_t getAdditionalData() const;
     void setAdditionalData( uint32_t data );
 
+    bool isCorrectCombo() const;
+
     bool isComboAction() const;
 
     /*!
@@ -143,6 +147,8 @@ namespace Sapphire::World::Action
 
     bool preFilterActor( Entity::Actor& actor ) const;
 
+    bool hasValidLutEntry() const;
+
     uint32_t m_id;
 
     uint16_t m_sequence;
@@ -183,6 +189,8 @@ namespace Sapphire::World::Action
 
     std::vector< World::Util::ActorFilterPtr > m_actorFilters;
     std::vector< Entity::CharaPtr > m_hitActors;
+
+    ActionEntry m_lutEntry;
   };
 }
 
diff --git a/src/world/Action/ActionLut.h b/src/world/Action/ActionLut.h
index f8eeafa8..f19b8c84 100644
--- a/src/world/Action/ActionLut.h
+++ b/src/world/Action/ActionLut.h
@@ -13,7 +13,7 @@ namespace Sapphire::World::Action
     uint16_t frontPotency;
     uint16_t rearPotency;
     uint16_t curePotency;
-//    uint16_t restorePercentage;
+    uint16_t restoreMPPercentage;
   };
 
   class ActionLut
diff --git a/src/world/Action/ActionLutData.cpp b/src/world/Action/ActionLutData.cpp
index 76e352ae..88b8a71a 100644
--- a/src/world/Action/ActionLutData.cpp
+++ b/src/world/Action/ActionLutData.cpp
@@ -5,1402 +5,1523 @@ using namespace Sapphire::World::Action;
 ActionLut::Lut ActionLut::m_actionLut =
 {
   // attack
-  { 7, { 0, 0, 0, 0, 0, 0 } },
+  { 7, { 0, 0, 0, 0, 0, 0, 0 } },
   // Shot
-  { 8, { 0, 0, 0, 0, 0, 0 } },
+  { 8, { 0, 0, 0, 0, 0, 0, 0 } },
   // Fast Blade
-  { 9, { 200, 0, 0, 0, 0, 0 } },
+  { 9, { 200, 0, 0, 0, 0, 0, 0 } },
   // Riot Blade
-  { 15, { 100, 300, 0, 0, 0, 0 } },
+  { 15, { 100, 300, 0, 0, 0, 0, 10 } },
   // Shield Bash
-  { 16, { 110, 0, 0, 0, 0, 0 } },
+  { 16, { 110, 0, 0, 0, 0, 0, 0 } },
   // Sentinel
-  { 17, { 0, 0, 0, 0, 0, 0 } },
+  { 17, { 0, 0, 0, 0, 0, 0, 0 } },
   // Fight or Flight
-  { 20, { 0, 0, 0, 0, 0, 0 } },
+  { 20, { 0, 0, 0, 0, 0, 0, 0 } },
   // Rage of Halone
-  { 21, { 100, 350, 0, 0, 0, 0 } },
+  { 21, { 100, 350, 0, 0, 0, 0, 0 } },
   // Circle of Scorn
-  { 23, { 120, 0, 0, 0, 0, 0 } },
+  { 23, { 120, 0, 0, 0, 0, 0, 0 } },
   // Shield Lob
-  { 24, { 120, 0, 0, 0, 0, 0 } },
+  { 24, { 120, 0, 0, 0, 0, 0, 0 } },
   // Cover
-  { 27, { 0, 0, 0, 0, 0, 0 } },
+  { 27, { 0, 0, 0, 0, 0, 0, 0 } },
   // Iron Will
-  { 28, { 0, 0, 0, 0, 0, 0 } },
+  { 28, { 0, 0, 0, 0, 0, 0, 0 } },
   // Spirits Within
-  { 29, { 370, 0, 0, 0, 0, 0 } },
+  { 29, { 100, 0, 0, 0, 0, 0, 5 } },
   // Hallowed Ground
-  { 30, { 0, 0, 0, 0, 0, 0 } },
+  { 30, { 0, 0, 0, 0, 0, 0, 0 } },
   // Heavy Swing
-  { 31, { 200, 0, 0, 0, 0, 0 } },
+  { 31, { 200, 0, 0, 0, 0, 0, 0 } },
   // Maim
-  { 37, { 100, 300, 0, 0, 0, 0 } },
+  { 37, { 100, 300, 0, 0, 0, 0, 0 } },
   // Berserk
-  { 38, { 0, 0, 0, 0, 0, 0 } },
+  { 38, { 0, 0, 0, 0, 0, 0, 0 } },
   // Thrill of Battle
-  { 40, { 0, 0, 0, 0, 0, 0 } },
+  { 40, { 0, 0, 0, 0, 0, 0, 0 } },
   // Overpower
-  { 41, { 130, 0, 0, 0, 0, 0 } },
+  { 41, { 130, 0, 0, 0, 0, 0, 0 } },
   // Storm's Path
-  { 42, { 100, 380, 0, 0, 0, 250 } },
+  { 42, { 100, 380, 0, 0, 0, 250, 0 } },
   // Holmgang
-  { 43, { 0, 0, 0, 0, 0, 0 } },
+  { 43, { 0, 0, 0, 0, 0, 0, 0 } },
   // Vengeance
-  { 44, { 55, 0, 0, 0, 0, 0 } },
+  { 44, { 55, 0, 0, 0, 0, 0, 0 } },
   // Storm's Eye
-  { 45, { 100, 380, 0, 0, 0, 0 } },
+  { 45, { 100, 380, 0, 0, 0, 0, 0 } },
   // Tomahawk
-  { 46, { 140, 0, 0, 0, 0, 0 } },
+  { 46, { 140, 0, 0, 0, 0, 0, 0 } },
   // Defiance
-  { 48, { 0, 0, 0, 0, 0, 0 } },
+  { 48, { 0, 0, 0, 0, 0, 0, 0 } },
   // Inner Beast
-  { 49, { 350, 0, 0, 0, 0, 0 } },
+  { 49, { 350, 0, 0, 0, 0, 0, 0 } },
   // Steel Cyclone
-  { 51, { 220, 0, 0, 0, 0, 0 } },
+  { 51, { 220, 0, 0, 0, 0, 0, 0 } },
   // Infuriate
-  { 52, { 0, 0, 0, 0, 0, 0 } },
+  { 52, { 0, 0, 0, 0, 0, 0, 0 } },
   // Bootshine
-  { 53, { 150, 0, 0, 0, 0, 0 } },
+  { 53, { 150, 0, 0, 0, 0, 0, 0 } },
   // True Strike
-  { 54, { 220, 0, 0, 0, 240, 0 } },
+  { 54, { 220, 0, 0, 0, 240, 0, 0 } },
   // Snap Punch
-  { 56, { 210, 0, 230, 0, 0, 0 } },
+  { 56, { 210, 0, 230, 0, 0, 0, 0 } },
   // Fists of Earth
-  { 60, { 0, 0, 0, 0, 0, 0 } },
+  { 60, { 0, 0, 0, 0, 0, 0, 0 } },
   // Twin Snakes
-  { 61, { 150, 0, 170, 0, 0, 0 } },
+  { 61, { 150, 0, 170, 0, 0, 0, 0 } },
   // Arm of the Destroyer
-  { 62, { 80, 0, 0, 0, 0, 0 } },
+  { 62, { 80, 0, 0, 0, 0, 0, 0 } },
   // Fists of Fire
-  { 63, { 0, 0, 0, 0, 0, 0 } },
+  { 63, { 0, 0, 0, 0, 0, 0, 0 } },
   // Mantra
-  { 65, { 0, 0, 0, 0, 0, 0 } },
+  { 65, { 0, 0, 0, 0, 0, 0, 0 } },
   // Demolish
-  { 66, { 70, 0, 0, 0, 90, 0 } },
+  { 66, { 70, 0, 0, 0, 90, 0, 0 } },
   // Perfect Balance
-  { 69, { 0, 0, 0, 0, 0, 0 } },
+  { 69, { 0, 0, 0, 0, 0, 0, 0 } },
   // Rockbreaker
-  { 70, { 120, 0, 0, 0, 0, 0 } },
+  { 70, { 120, 0, 0, 0, 0, 0, 0 } },
   // Shoulder Tackle
-  { 71, { 100, 0, 0, 0, 0, 0 } },
+  { 71, { 100, 0, 0, 0, 0, 0, 0 } },
   // Fists of Wind
-  { 73, { 0, 0, 0, 0, 0, 0 } },
+  { 73, { 0, 0, 0, 0, 0, 0, 0 } },
   // Dragon Kick
-  { 74, { 180, 0, 200, 0, 0, 0 } },
+  { 74, { 180, 0, 200, 0, 0, 0, 0 } },
   // True Thrust
-  { 75, { 0, 0, 0, 0, 0, 0 } },
+  { 75, { 0, 0, 0, 0, 0, 0, 0 } },
   // Vorpal Thrust
-  { 78, { 0, 0, 0, 0, 0, 0 } },
+  { 78, { 0, 0, 0, 0, 0, 0, 0 } },
   // Life Surge
-  { 83, { 0, 0, 0, 0, 0, 0 } },
+  { 83, { 0, 0, 0, 0, 0, 0, 0 } },
   // Full Thrust
-  { 84, { 100, 530, 0, 0, 0, 0 } },
+  { 84, { 100, 530, 0, 0, 0, 0, 0 } },
   // Lance Charge
-  { 85, { 0, 0, 0, 0, 0, 0 } },
+  { 85, { 0, 0, 0, 0, 0, 0, 0 } },
   // Doom Spike
-  { 86, { 170, 0, 0, 0, 0, 0 } },
+  { 86, { 170, 0, 0, 0, 0, 0, 0 } },
   // Disembowel
-  { 87, { 0, 0, 0, 0, 0, 0 } },
+  { 87, { 0, 0, 0, 0, 0, 0, 0 } },
   // Chaos Thrust
-  { 88, { 100, 290, 0, 0, 140, 0 } },
+  { 88, { 100, 290, 0, 0, 140, 0, 0 } },
   // Piercing Talon
-  { 90, { 150, 0, 0, 0, 0, 0 } },
+  { 90, { 150, 0, 0, 0, 0, 0, 0 } },
   // Jump
-  { 92, { 310, 0, 0, 0, 0, 0 } },
+  { 92, { 310, 0, 0, 0, 0, 0, 0 } },
   // Elusive Jump
-  { 94, { 0, 0, 0, 0, 0, 0 } },
+  { 94, { 0, 0, 0, 0, 0, 0, 0 } },
   // Spineshatter Dive
-  { 95, { 240, 0, 0, 0, 0, 0 } },
+  { 95, { 240, 0, 0, 0, 0, 0, 0 } },
   // Dragonfire Dive
-  { 96, { 380, 0, 0, 0, 0, 0 } },
+  { 96, { 380, 0, 0, 0, 0, 0, 0 } },
   // Heavy Shot
-  { 97, { 180, 0, 0, 0, 0, 0 } },
+  { 97, { 180, 0, 0, 0, 0, 0, 0 } },
   // Straight Shot
-  { 98, { 200, 0, 0, 0, 0, 0 } },
+  { 98, { 200, 0, 0, 0, 0, 0, 0 } },
   // Venomous Bite
-  { 100, { 100, 0, 0, 0, 0, 0 } },
+  { 100, { 100, 0, 0, 0, 0, 0, 0 } },
   // Raging Strikes
-  { 101, { 0, 0, 0, 0, 0, 0 } },
+  { 101, { 0, 0, 0, 0, 0, 0, 0 } },
   // Quick Nock
-  { 106, { 150, 0, 0, 0, 0, 0 } },
+  { 106, { 150, 0, 0, 0, 0, 0, 0 } },
   // Barrage
-  { 107, { 0, 0, 0, 0, 0, 0 } },
+  { 107, { 0, 0, 0, 0, 0, 0, 0 } },
   // Bloodletter
-  { 110, { 150, 0, 0, 0, 0, 0 } },
+  { 110, { 150, 0, 0, 0, 0, 0, 0 } },
   // Repelling Shot
-  { 112, { 0, 0, 0, 0, 0, 0 } },
+  { 112, { 0, 0, 0, 0, 0, 0, 0 } },
   // Windbite
-  { 113, { 60, 0, 0, 0, 0, 0 } },
+  { 113, { 60, 0, 0, 0, 0, 0, 0 } },
   // Mage's Ballad
-  { 114, { 100, 0, 0, 0, 0, 0 } },
+  { 114, { 100, 0, 0, 0, 0, 0, 0 } },
   // Army's Paeon
-  { 116, { 100, 0, 0, 0, 0, 0 } },
+  { 116, { 100, 0, 0, 0, 0, 0, 0 } },
   // Rain of Death
-  { 117, { 130, 0, 0, 0, 0, 0 } },
+  { 117, { 130, 0, 0, 0, 0, 0, 0 } },
   // Battle Voice
-  { 118, { 0, 0, 0, 0, 0, 0 } },
+  { 118, { 0, 0, 0, 0, 0, 0, 0 } },
   // Stone
-  { 119, { 140, 0, 0, 0, 0, 0 } },
+  { 119, { 140, 0, 0, 0, 0, 0, 0 } },
   // Cure
-  { 120, { 0, 0, 0, 0, 0, 450 } },
+  { 120, { 0, 0, 0, 0, 0, 450, 0 } },
   // Aero
-  { 121, { 50, 0, 0, 0, 0, 0 } },
+  { 121, { 50, 0, 0, 0, 0, 0, 0 } },
   // Medica
-  { 124, { 0, 0, 0, 0, 0, 300 } },
+  { 124, { 0, 0, 0, 0, 0, 300, 0 } },
   // Raise
-  { 125, { 0, 0, 0, 0, 0, 0 } },
+  { 125, { 0, 0, 0, 0, 0, 0, 0 } },
   // Stone II
-  { 127, { 200, 0, 0, 0, 0, 0 } },
+  { 127, { 200, 0, 0, 0, 0, 0, 0 } },
   // Cure III
-  { 131, { 0, 0, 0, 0, 0, 550 } },
+  { 131, { 0, 0, 0, 0, 0, 550, 0 } },
   // Aero II
-  { 132, { 60, 0, 0, 0, 0, 0 } },
+  { 132, { 60, 0, 0, 0, 0, 0, 0 } },
   // Medica II
-  { 133, { 0, 0, 0, 0, 0, 200 } },
+  { 133, { 0, 0, 0, 0, 0, 200, 0 } },
   // Fluid Aura
-  { 134, { 0, 0, 0, 0, 0, 0 } },
+  { 134, { 0, 0, 0, 0, 0, 0, 0 } },
   // Cure II
-  { 135, { 0, 0, 0, 0, 0, 700 } },
+  { 135, { 0, 0, 0, 0, 0, 700, 0 } },
   // Presence of Mind
-  { 136, { 0, 0, 0, 0, 0, 0 } },
+  { 136, { 0, 0, 0, 0, 0, 0, 0 } },
   // Regen
-  { 137, { 0, 0, 0, 0, 0, 200 } },
+  { 137, { 0, 0, 0, 0, 0, 200, 0 } },
   // Holy
-  { 139, { 140, 0, 0, 0, 0, 0 } },
+  { 139, { 140, 0, 0, 0, 0, 0, 0 } },
   // Benediction
-  { 140, { 0, 0, 0, 0, 0, 0 } },
+  { 140, { 0, 0, 0, 0, 0, 0, 0 } },
   // Fire
-  { 141, { 180, 0, 0, 0, 0, 0 } },
+  { 141, { 180, 0, 0, 0, 0, 0, 0 } },
   // Blizzard
-  { 142, { 180, 0, 0, 0, 0, 0 } },
+  { 142, { 180, 0, 0, 0, 0, 0, 0 } },
   // Thunder
-  { 144, { 30, 0, 0, 0, 0, 0 } },
+  { 144, { 30, 0, 0, 0, 0, 0, 0 } },
   // Sleep
-  { 145, { 0, 0, 0, 0, 0, 0 } },
+  { 145, { 0, 0, 0, 0, 0, 0, 0 } },
   // Blizzard II
-  { 146, { 50, 0, 0, 0, 0, 0 } },
+  { 146, { 50, 0, 0, 0, 0, 0, 0 } },
   // Fire II
-  { 147, { 80, 0, 0, 0, 0, 0 } },
+  { 147, { 80, 0, 0, 0, 0, 0, 0 } },
   // Transpose
-  { 149, { 0, 0, 0, 0, 0, 0 } },
+  { 149, { 0, 0, 0, 0, 0, 0, 0 } },
   // Fire III
-  { 152, { 240, 0, 0, 0, 0, 0 } },
+  { 152, { 240, 0, 0, 0, 0, 0, 0 } },
   // Thunder III
-  { 153, { 70, 0, 0, 0, 0, 0 } },
+  { 153, { 70, 0, 0, 0, 0, 0, 0 } },
   // Blizzard III
-  { 154, { 240, 0, 0, 0, 0, 0 } },
+  { 154, { 240, 0, 0, 0, 0, 0, 0 } },
   // Aetherial Manipulation
-  { 155, { 0, 0, 0, 0, 0, 0 } },
+  { 155, { 0, 0, 0, 0, 0, 0, 0 } },
   // Scathe
-  { 156, { 100, 0, 0, 0, 0, 0 } },
+  { 156, { 100, 0, 0, 0, 0, 0, 0 } },
   // Manaward
-  { 157, { 0, 0, 0, 0, 0, 0 } },
+  { 157, { 0, 0, 0, 0, 0, 0, 0 } },
   // Manafont
-  { 158, { 0, 0, 0, 0, 0, 0 } },
+  { 158, { 0, 0, 0, 0, 0, 0, 30 } },
   // Freeze
-  { 159, { 100, 0, 0, 0, 0, 0 } },
+  { 159, { 100, 0, 0, 0, 0, 0, 0 } },
   // Flare
-  { 162, { 260, 0, 0, 0, 0, 0 } },
+  { 162, { 260, 0, 0, 0, 0, 0, 0 } },
   // Ruin
-  { 163, { 80, 0, 0, 0, 0, 0 } },
+  { 163, { 180, 0, 0, 0, 0, 0, 0 } },
   // Bio
-  { 164, { 0, 0, 0, 0, 0, 0 } },
+  { 164, { 0, 0, 0, 0, 0, 0, 0 } },
   // Summon
-  { 165, { 0, 0, 0, 0, 0, 0 } },
+  { 165, { 0, 0, 0, 0, 0, 0, 0 } },
   // Aetherflow
-  { 166, { 0, 0, 0, 0, 0, 0 } },
-  // Miasma
-  { 168, { 20, 0, 0, 0, 0, 0 } },
-  // Summon II
-  { 170, { 0, 0, 0, 0, 0, 0 } },
-  // Ruin II
-  { 172, { 80, 0, 0, 0, 0, 0 } },
-  // Resurrection
-  { 173, { 0, 0, 0, 0, 0, 0 } },
-  // Bane
-  { 174, { 0, 0, 0, 0, 0, 0 } },
-  // Bio II
-  { 178, { 0, 0, 0, 0, 0, 0 } },
-  // Summon III
-  { 180, { 0, 0, 0, 0, 0, 0 } },
-  // Fester
-  { 181, { 100, 0, 0, 0, 0, 0 } },
-  // Enkindle
-  { 184, { 0, 0, 0, 0, 0, 0 } },
-  // Adloquium
-  { 185, { 0, 0, 0, 0, 0, 300 } },
-  // Succor
-  { 186, { 0, 0, 0, 0, 0, 180 } },
-  // Sacred Soil
-  { 188, { 0, 0, 0, 0, 0, 100 } },
-  // Lustrate
-  { 189, { 0, 0, 0, 0, 0, 600 } },
-  // Physick
-  { 190, { 0, 0, 0, 0, 0, 400 } },
-  // Shield Wall
-  { 197, { 0, 0, 0, 0, 0, 0 } },
-  // Stronghold
-  { 198, { 0, 0, 0, 0, 0, 0 } },
-  // Last Bastion
-  { 199, { 0, 0, 0, 0, 0, 0 } },
-  // Braver
-  { 200, { 2400, 0, 0, 0, 0, 0 } },
-  // Bladedance
-  { 201, { 5250, 0, 0, 0, 0, 0 } },
-  // Final Heaven
-  { 202, { 9000, 0, 0, 0, 0, 0 } },
-  // Skyshard
-  { 203, { 1650, 0, 0, 0, 0, 0 } },
-  // Starstorm
-  { 204, { 3600, 0, 0, 0, 0, 0 } },
-  // Meteor
-  { 205, { 6150, 0, 0, 0, 0, 0 } },
-  // Healing Wind
-  { 206, { 0, 0, 0, 0, 0, 0 } },
-  // Breath of the Earth
-  { 207, { 0, 0, 0, 0, 0, 0 } },
-  // Pulse of Life
-  { 208, { 0, 0, 0, 0, 0, 0 } },
-  // Magitek Cannon
-  { 1128, { 0, 0, 0, 0, 0, 0 } },
-  // Photon Stream
-  { 1129, { 0, 0, 0, 0, 0, 0 } },
-  // attack
-  { 1533, { 0, 0, 0, 0, 0, 0 } },
-  // Spinning Edge
-  { 2240, { 200, 0, 0, 0, 0, 0 } },
-  // Shade Shift
-  { 2241, { 0, 0, 0, 0, 0, 0 } },
-  // Gust Slash
-  { 2242, { 100, 250, 0, 0, 0, 0 } },
-  // Hide
-  { 2245, { 0, 0, 0, 0, 0, 0 } },
-  // Assassinate
-  { 2246, { 200, 0, 0, 0, 0, 0 } },
-  // Throwing Dagger
-  { 2247, { 120, 0, 0, 0, 0, 0 } },
-  // Mug
-  { 2248, { 150, 0, 0, 0, 0, 0 } },
-  // Death Blossom
-  { 2254, { 120, 0, 0, 0, 0, 0 } },
-  // Aeolian Edge
-  { 2255, { 100, 360, 0, 0, 160, 0 } },
-  // Shadow Fang
-  { 2257, { 100, 200, 0, 0, 0, 0 } },
-  // Trick Attack
-  { 2258, { 340, 0, 0, 0, 500, 0 } },
-  // Ten
-  { 2259, { 0, 0, 0, 0, 0, 0 } },
-  // Ninjutsu
-  { 2260, { 0, 0, 0, 0, 0, 0 } },
-  // Chi
-  { 2261, { 0, 0, 0, 0, 0, 0 } },
-  // Shukuchi
-  { 2262, { 0, 0, 0, 0, 0, 0 } },
-  // Jin
-  { 2263, { 0, 0, 0, 0, 0, 0 } },
-  // Kassatsu
-  { 2264, { 0, 0, 0, 0, 0, 0 } },
-  // Fuma Shuriken
-  { 2265, { 280, 0, 0, 0, 0, 0 } },
-  // Katon
-  { 2266, { 250, 0, 0, 0, 0, 0 } },
-  // Raiton
-  { 2267, { 400, 0, 0, 0, 0, 0 } },
-  // Hyoton
-  { 2268, { 140, 0, 0, 0, 0, 0 } },
-  // Huton
-  { 2269, { 0, 0, 0, 0, 0, 0 } },
-  // Doton
-  { 2270, { 45, 0, 0, 0, 0, 0 } },
-  // Suiton
-  { 2271, { 130, 0, 0, 0, 0, 0 } },
-  // Rabbit Medium
-  { 2272, { 0, 0, 0, 0, 0, 0 } },
-  // Rook Autoturret
-  { 2864, { 80, 0, 0, 0, 0, 0 } },
-  // Split Shot
-  { 2866, { 160, 0, 0, 0, 0, 0 } },
-  // Slug Shot
-  { 2868, { 100, 240, 0, 0, 0, 0 } },
-  // Spread Shot
-  { 2870, { 180, 0, 0, 0, 0, 0 } },
-  // Hot Shot
-  { 2872, { 300, 0, 0, 0, 0, 0 } },
-  // Clean Shot
-  { 2873, { 100, 320, 0, 0, 0, 0 } },
-  // Gauss Round
-  { 2874, { 150, 0, 0, 0, 0, 0 } },
-  // Reassemble
-  { 2876, { 0, 0, 0, 0, 0, 0 } },
-  // Wildfire
-  { 2878, { 0, 0, 0, 0, 0, 0 } },
-  // Ricochet
-  { 2890, { 150, 0, 0, 0, 0, 0 } },
-  // Raiton
-  { 3203, { 0, 0, 0, 0, 0, 0 } },
-  // Raiton
-  { 3204, { 0, 0, 0, 0, 0, 0 } },
-  // Kanashibari
-  { 3207, { 0, 0, 0, 0, 0, 0 } },
-  // Goring Blade
-  { 3538, { 100, 390, 0, 0, 0, 0 } },
-  // Royal Authority
-  { 3539, { 100, 550, 0, 0, 0, 0 } },
-  // Divine Veil
-  { 3540, { 0, 0, 0, 0, 0, 0 } },
-  // Clemency
-  { 3541, { 0, 0, 0, 0, 0, 1200 } },
-  // Sheltron
-  { 3542, { 0, 0, 0, 0, 0, 0 } },
-  // Tornado Kick
-  { 3543, { 330, 0, 0, 0, 0, 0 } },
-  // Elixir Field
-  { 3545, { 200, 0, 0, 0, 0, 0 } },
-  // Meditation
-  { 3546, { 0, 0, 0, 0, 0, 0 } },
-  // the Forbidden Chakra
-  { 3547, { 370, 0, 0, 0, 0, 0 } },
-  // Fell Cleave
-  { 3549, { 590, 0, 0, 0, 0, 0 } },
-  // Decimate
-  { 3550, { 250, 0, 0, 0, 0, 0 } },
-  // Raw Intuition
-  { 3551, { 0, 0, 0, 0, 0, 0 } },
-  // Equilibrium
-  { 3552, { 0, 0, 0, 0, 0, 1200 } },
-  // Blood of the Dragon
-  { 3553, { 0, 0, 0, 0, 0, 0 } },
-  // Fang and Claw
-  { 3554, { 320, 0, 360, 0, 0, 0 } },
-  // Geirskogul
-  { 3555, { 270, 0, 0, 0, 0, 0 } },
-  // Wheeling Thrust
-  { 3556, { 320, 0, 0, 0, 360, 0 } },
-  // Battle Litany
-  { 3557, { 0, 0, 0, 0, 0, 0 } },
-  // Empyreal Arrow
-  { 3558, { 230, 0, 0, 0, 0, 0 } },
-  // the Wanderer's Minuet
-  { 3559, { 100, 0, 0, 0, 0, 0 } },
-  // Iron Jaws
-  { 3560, { 100, 0, 0, 0, 0, 0 } },
-  // the Warden's Paean
-  { 3561, { 0, 0, 0, 0, 0, 0 } },
-  // Sidewinder
-  { 3562, { 100, 0, 0, 0, 0, 0 } },
-  // Armor Crush
-  { 3563, { 100, 330, 160, 0, 0, 0 } },
-  // Dream Within a Dream
-  { 3566, { 200, 0, 0, 0, 0, 0 } },
-  // Stone III
-  { 3568, { 240, 0, 0, 0, 0, 0 } },
-  // Asylum
-  { 3569, { 0, 0, 0, 0, 0, 100 } },
-  // Tetragrammaton
-  { 3570, { 0, 0, 0, 0, 0, 700 } },
-  // Assize
-  { 3571, { 400, 0, 0, 0, 0, 400 } },
-  // Ley Lines
-  { 3573, { 0, 0, 0, 0, 0, 0 } },
-  // Sharpcast
-  { 3574, { 0, 0, 0, 0, 0, 0 } },
-  // Enochian
-  { 3575, { 0, 0, 0, 0, 0, 0 } },
-  // Blizzard IV
-  { 3576, { 300, 0, 0, 0, 0, 0 } },
-  // Fire IV
-  { 3577, { 300, 0, 0, 0, 0, 0 } },
-  // Painflare
-  { 3578, { 150, 0, 0, 0, 0, 0 } },
-  // Ruin III
-  { 3579, { 100, 0, 0, 0, 0, 0 } },
-  // Tri-disaster
-  { 3580, { 0, 0, 0, 0, 0, 0 } },
-  // Dreadwyrm Trance
-  { 3581, { 0, 0, 0, 0, 0, 0 } },
-  // Deathflare
-  { 3582, { 400, 0, 0, 0, 0, 0 } },
-  // Indomitability
-  { 3583, { 0, 0, 0, 0, 0, 400 } },
-  // Broil
-  { 3584, { 240, 0, 0, 0, 0, 0 } },
-  // Deployment Tactics
-  { 3585, { 0, 0, 0, 0, 0, 0 } },
-  // Emergency Tactics
-  { 3586, { 0, 0, 0, 0, 0, 0 } },
-  // Dissipation
-  { 3587, { 0, 0, 0, 0, 0, 0 } },
-  // Draw
-  { 3590, { 0, 0, 0, 0, 0, 0 } },
-  // Redraw
-  { 3593, { 0, 0, 0, 0, 0, 0 } },
-  // Benefic
-  { 3594, { 0, 0, 0, 0, 0, 400 } },
-  // Aspected Benefic
-  { 3595, { 0, 0, 0, 0, 0, 200 } },
-  // Malefic
-  { 3596, { 150, 0, 0, 0, 0, 0 } },
-  // Malefic II
-  { 3598, { 170, 0, 0, 0, 0, 0 } },
-  // Combust
-  { 3599, { 0, 0, 0, 0, 0, 0 } },
-  // Helios
-  { 3600, { 0, 0, 0, 0, 0, 330 } },
-  // Aspected Helios
-  { 3601, { 0, 0, 0, 0, 0, 100 } },
-  // Ascend
-  { 3603, { 0, 0, 0, 0, 0, 0 } },
-  // Diurnal Sect
-  { 3604, { 0, 0, 0, 0, 0, 0 } },
-  // Nocturnal Sect
-  { 3605, { 0, 0, 0, 0, 0, 0 } },
-  // Lightspeed
-  { 3606, { 0, 0, 0, 0, 0, 0 } },
-  // Combust II
-  { 3608, { 0, 0, 0, 0, 0, 0 } },
-  // Benefic II
-  { 3610, { 0, 0, 0, 0, 0, 700 } },
-  // Synastry
-  { 3612, { 0, 0, 0, 0, 0, 0 } },
-  // Collective Unconscious
-  { 3613, { 0, 0, 0, 0, 0, 50 } },
-  // Essential Dignity
-  { 3614, { 0, 0, 0, 0, 0, 400 } },
-  // Gravity
-  { 3615, { 130, 0, 0, 0, 0, 0 } },
-  // Hard Slash
-  { 3617, { 200, 0, 0, 0, 0, 0 } },
-  // Unleash
-  { 3621, { 150, 0, 0, 0, 0, 0 } },
-  // Syphon Strike
-  { 3623, { 100, 300, 0, 0, 0, 0 } },
-  // Unmend
-  { 3624, { 150, 0, 0, 0, 0, 0 } },
-  // Blood Weapon
-  { 3625, { 0, 0, 0, 0, 0, 0 } },
-  // Grit
-  { 3629, { 0, 0, 0, 0, 0, 0 } },
-  // Souleater
-  { 3632, { 100, 400, 0, 0, 0, 300 } },
-  // Dark Mind
-  { 3634, { 0, 0, 0, 0, 0, 0 } },
-  // Shadow Wall
-  { 3636, { 0, 0, 0, 0, 0, 0 } },
-  // Living Dead
-  { 3638, { 0, 0, 0, 0, 0, 0 } },
-  // Salted Earth
-  { 3639, { 60, 0, 0, 0, 0, 0 } },
-  // Plunge
-  { 3640, { 200, 0, 0, 0, 0, 0 } },
-  // Abyssal Drain
-  { 3641, { 200, 0, 0, 0, 0, 200 } },
-  // Carve and Spit
-  { 3643, { 450, 0, 0, 0, 0, 0 } },
-  // Big Shot
-  { 4238, { 0, 0, 0, 0, 0, 0 } },
-  // Desperado
-  { 4239, { 0, 0, 0, 0, 0, 0 } },
-  // Land Waker
-  { 4240, { 0, 0, 0, 0, 0, 0 } },
-  // Dark Force
-  { 4241, { 0, 0, 0, 0, 0, 0 } },
-  // Dragonsong Dive
-  { 4242, { 0, 0, 0, 0, 0, 0 } },
-  // Chimatsuri
-  { 4243, { 0, 0, 0, 0, 0, 0 } },
-  // Sagittarius Arrow
-  { 4244, { 0, 0, 0, 0, 0, 0 } },
-  // Satellite Beam
-  { 4245, { 0, 0, 0, 0, 0, 0 } },
-  // Teraflare
-  { 4246, { 0, 0, 0, 0, 0, 0 } },
-  // Angel Feathers
-  { 4247, { 0, 0, 0, 0, 0, 0 } },
-  // Astral Stasis
-  { 4248, { 0, 0, 0, 0, 0, 0 } },
-  // Form Shift
-  { 4262, { 0, 0, 0, 0, 0, 0 } },
-  // Cannonfire
-  { 4271, { 0, 0, 0, 0, 0, 0 } },
-  // the Balance
-  { 4401, { 0, 0, 0, 0, 0, 0 } },
-  // the Arrow
-  { 4402, { 0, 0, 0, 0, 0, 0 } },
-  // the Spear
-  { 4403, { 0, 0, 0, 0, 0, 0 } },
-  // the Bole
-  { 4404, { 0, 0, 0, 0, 0, 0 } },
-  // the Ewer
-  { 4405, { 0, 0, 0, 0, 0, 0 } },
-  // the Spire
-  { 4406, { 0, 0, 0, 0, 0, 0 } },
-  // Raiton
-  { 4977, { 0, 0, 0, 0, 0, 0 } },
-  // Raiton
-  { 5069, { 0, 0, 0, 0, 0, 0 } },
-  // attack
-  { 5199, { 0, 0, 0, 0, 0, 0 } },
-  // attack
-  { 5846, { 0, 0, 0, 0, 0, 0 } },
-  // Stickyloom
-  { 5874, { 0, 0, 0, 0, 0, 0 } },
-  // Void Fire II
-  { 6274, { 0, 0, 0, 0, 0, 0 } },
-  // Total Eclipse
-  { 7381, { 120, 0, 0, 0, 0, 0 } },
-  // Intervention
-  { 7382, { 0, 0, 0, 0, 0, 0 } },
-  // Requiescat
-  { 7383, { 550, 0, 0, 0, 0, 0 } },
-  // Holy Spirit
-  { 7384, { 350, 0, 0, 0, 0, 0 } },
-  // Passage of Arms
-  { 7385, { 0, 0, 0, 0, 0, 0 } },
-  // Onslaught
-  { 7386, { 100, 0, 0, 0, 0, 0 } },
-  // Upheaval
-  { 7387, { 450, 0, 0, 0, 0, 0 } },
-  // Shake It Off
-  { 7388, { 0, 0, 0, 0, 0, 0 } },
-  // Inner Release
-  { 7389, { 0, 0, 0, 0, 0, 0 } },
-  // Delirium
-  { 7390, { 0, 0, 0, 0, 0, 0 } },
-  // Quietus
-  { 7391, { 210, 0, 0, 0, 0, 0 } },
-  // Bloodspiller
-  { 7392, { 600, 0, 0, 0, 0, 0 } },
-  // The Blackest Night
-  { 7393, { 0, 0, 0, 0, 0, 0 } },
-  // Riddle of Earth
-  { 7394, { 0, 0, 0, 0, 0, 0 } },
-  // Riddle of Fire
-  { 7395, { 0, 0, 0, 0, 0, 0 } },
-  // Brotherhood
-  { 7396, { 0, 0, 0, 0, 0, 0 } },
-  // Sonic Thrust
-  { 7397, { 100, 200, 0, 0, 0, 0 } },
-  // Dragon Sight
-  { 7398, { 0, 0, 0, 0, 0, 0 } },
-  // Mirage Dive
-  { 7399, { 250, 0, 0, 0, 0, 0 } },
-  // Nastrond
-  { 7400, { 400, 0, 0, 0, 0, 0 } },
-  // Hellfrog Medium
-  { 7401, { 400, 0, 0, 0, 0, 0 } },
-  // Bhavacakra
-  { 7402, { 500, 0, 0, 0, 0, 0 } },
-  // Ten Chi Jin
-  { 7403, { 0, 0, 0, 0, 0, 0 } },
-  // Pitch Perfect
-  { 7404, { 100, 0, 0, 0, 0, 0 } },
-  // Troubadour
-  { 7405, { 0, 0, 0, 0, 0, 0 } },
-  // Caustic Bite
-  { 7406, { 150, 0, 0, 0, 0, 0 } },
-  // Stormbite
-  { 7407, { 100, 0, 0, 0, 0, 0 } },
-  // Nature's Minne
-  { 7408, { 0, 0, 0, 0, 0, 0 } },
-  // Refulgent Arrow
-  { 7409, { 340, 0, 0, 0, 0, 0 } },
-  // Heat Blast
-  { 7410, { 200, 0, 0, 0, 0, 0 } },
-  // Heated Split Shot
-  { 7411, { 200, 0, 0, 0, 0, 0 } },
-  // Heated Slug Shot
-  { 7412, { 100, 300, 0, 0, 0, 0 } },
-  // Heated Clean Shot
-  { 7413, { 100, 400, 0, 0, 0, 0 } },
-  // Barrel Stabilizer
-  { 7414, { 0, 0, 0, 0, 0, 0 } },
-  // Rook Overdrive
-  { 7415, { 0, 0, 0, 0, 0, 0 } },
-  // Flamethrower
-  { 7418, { 0, 0, 0, 0, 0, 0 } },
-  // Between the Lines
-  { 7419, { 0, 0, 0, 0, 0, 0 } },
-  // Thunder IV
-  { 7420, { 50, 0, 0, 0, 0, 0 } },
-  // Triplecast
-  { 7421, { 0, 0, 0, 0, 0, 0 } },
-  // Foul
-  { 7422, { 650, 0, 0, 0, 0, 0 } },
-  // Aetherpact
-  { 7423, { 0, 0, 0, 0, 0, 0 } },
-  // Bio III
-  { 7424, { 0, 0, 0, 0, 0, 0 } },
-  // Miasma III
-  { 7425, { 40, 0, 0, 0, 0, 0 } },
-  // Ruin IV
-  { 7426, { 120, 0, 0, 0, 0, 0 } },
-  // Summon Bahamut
-  { 7427, { 0, 0, 0, 0, 0, 0 } },
-  // Enkindle Bahamut
-  { 7429, { 0, 0, 0, 0, 0, 0 } },
-  // Thin Air
-  { 7430, { 0, 0, 0, 0, 0, 0 } },
-  // Stone IV
-  { 7431, { 280, 0, 0, 0, 0, 0 } },
-  // Divine Benison
-  { 7432, { 0, 0, 0, 0, 0, 0 } },
-  // Plenary Indulgence
-  { 7433, { 0, 0, 0, 0, 0, 200 } },
-  // Excogitation
-  { 7434, { 0, 0, 0, 0, 0, 800 } },
-  // Broil II
-  { 7435, { 260, 0, 0, 0, 0, 0 } },
-  // Chain Stratagem
-  { 7436, { 0, 0, 0, 0, 0, 0 } },
-  // Aetherpact
-  { 7437, { 0, 0, 0, 0, 0, 0 } },
-  // Earthly Star
-  { 7439, { 100, 0, 0, 0, 0, 540 } },
-  // Malefic III
-  { 7442, { 210, 0, 0, 0, 0, 0 } },
-  // Minor Arcana
-  { 7443, { 0, 0, 0, 0, 0, 0 } },
-  // Lord of Crowns
-  { 7444, { 0, 0, 0, 0, 0, 0 } },
-  // Lady of Crowns
-  { 7445, { 0, 0, 0, 0, 0, 0 } },
-  // Thunder II
-  { 7447, { 30, 0, 0, 0, 0, 0 } },
-  // Sleeve Draw
-  { 7448, { 0, 0, 0, 0, 0, 0 } },
-  // Hakaze
-  { 7477, { 170, 0, 0, 0, 0, 0 } },
-  // Jinpu
-  { 7478, { 100, 320, 0, 0, 0, 0 } },
-  // Shifu
-  { 7479, { 100, 320, 0, 0, 0, 0 } },
-  // Yukikaze
-  { 7480, { 100, 400, 0, 0, 0, 0 } },
-  // Gekko
-  { 7481, { 100, 470, 0, 0, 0, 0 } },
-  // Kasha
-  { 7482, { 100, 470, 0, 0, 0, 0 } },
-  // Fuga
-  { 7483, { 100, 0, 0, 0, 0, 0 } },
-  // Mangetsu
-  { 7484, { 100, 160, 0, 0, 0, 0 } },
-  // Oka
-  { 7485, { 100, 160, 0, 0, 0, 0 } },
-  // Enpi
-  { 7486, { 100, 0, 0, 0, 0, 0 } },
-  // Midare Setsugekka
-  { 7487, { 800, 0, 0, 0, 0, 0 } },
-  // Tenka Goken
-  { 7488, { 360, 0, 0, 0, 0, 0 } },
-  // Higanbana
-  { 7489, { 250, 0, 0, 0, 0, 0 } },
-  // Hissatsu: Shinten
-  { 7490, { 320, 0, 0, 0, 0, 0 } },
-  // Hissatsu: Kyuten
-  { 7491, { 150, 0, 0, 0, 0, 0 } },
-  // Hissatsu: Gyoten
-  { 7492, { 100, 0, 0, 0, 0, 0 } },
-  // Hissatsu: Yaten
-  { 7493, { 100, 0, 0, 0, 0, 0 } },
-  // Hissatsu: Kaiten
-  { 7494, { 0, 0, 0, 0, 0, 0 } },
-  // Hissatsu: Guren
-  { 7496, { 850, 0, 0, 0, 0, 0 } },
-  // Meditate
-  { 7497, { 0, 0, 0, 0, 0, 0 } },
-  // Third Eye
-  { 7498, { 0, 0, 0, 0, 0, 0 } },
-  // Meikyo Shisui
-  { 7499, { 0, 0, 0, 0, 0, 0 } },
-  // Hissatsu: Seigan
-  { 7501, { 220, 0, 0, 0, 0, 0 } },
-  // Merciful Eyes
-  { 7502, { 0, 0, 0, 0, 0, 200 } },
-  // Jolt
-  { 7503, { 180, 0, 0, 0, 0, 0 } },
-  // Riposte
-  { 7504, { 130, 0, 0, 0, 0, 0 } },
-  // Verthunder
-  { 7505, { 310, 0, 0, 0, 0, 0 } },
-  // Corps-a-corps
-  { 7506, { 130, 0, 0, 0, 0, 0 } },
-  // Veraero
-  { 7507, { 310, 0, 0, 0, 0, 0 } },
-  // Scatter
-  { 7509, { 120, 0, 0, 0, 0, 0 } },
-  // Verfire
-  { 7510, { 270, 0, 0, 0, 0, 0 } },
-  // Verstone
-  { 7511, { 270, 0, 0, 0, 0, 0 } },
-  // Zwerchhau
-  { 7512, { 100, 150, 0, 0, 0, 0 } },
-  // Moulinet
-  { 7513, { 60, 0, 0, 0, 0, 0 } },
-  // Vercure
-  { 7514, { 0, 0, 0, 0, 0, 350 } },
-  // Displacement
-  { 7515, { 0, 0, 0, 0, 0, 0 } },
-  // Redoublement
-  { 7516, { 100, 230, 0, 0, 0, 0 } },
-  // Fleche
-  { 7517, { 420, 0, 0, 0, 0, 0 } },
-  // Acceleration
-  { 7518, { 0, 0, 0, 0, 0, 0 } },
-  // Contre Sixte
-  { 7519, { 350, 0, 0, 0, 0, 0 } },
-  // Embolden
-  { 7520, { 0, 0, 0, 0, 0, 0 } },
-  // Manafication
-  { 7521, { 0, 0, 0, 0, 0, 0 } },
-  // Verraise
-  { 7523, { 0, 0, 0, 0, 0, 0 } },
-  // Jolt II
-  { 7524, { 250, 0, 0, 0, 0, 0 } },
-  // Verflare
-  { 7525, { 600, 0, 0, 0, 0, 0 } },
-  // Verholy
-  { 7526, { 600, 0, 0, 0, 0, 0 } },
-  // Enchanted Riposte
-  { 7527, { 210, 0, 0, 0, 0, 0 } },
-  // Enchanted Zwerchhau
-  { 7528, { 100, 290, 0, 0, 0, 0 } },
-  // Enchanted Redoublement
-  { 7529, { 100, 470, 0, 0, 0, 0 } },
-  // Enchanted Moulinet
-  { 7530, { 200, 0, 0, 0, 0, 0 } },
-  // Magitek Cannon
-  { 7619, { 0, 0, 0, 0, 0, 0 } },
-  // Photon Stream
-  { 7620, { 0, 0, 0, 0, 0, 0 } },
-  // Diffractive Magitek Cannon
-  { 7621, { 0, 0, 0, 0, 0, 0 } },
-  // High-powered Magitek Cannon
-  { 7622, { 0, 0, 0, 0, 0, 0 } },
-  // Doom of the Living
-  { 7861, { 0, 0, 0, 0, 0, 0 } },
-  // Vermilion Scourge
-  { 7862, { 0, 0, 0, 0, 0, 0 } },
-  // Iaijutsu
-  { 7867, { 0, 0, 0, 0, 0, 0 } },
-  // Dissolve Union
-  { 7869, { 0, 0, 0, 0, 0, 0 } },
-  // Stellar Detonation
-  { 8324, { 100, 0, 0, 0, 0, 540 } },
-  // Broken Ridge
-  { 8395, { 0, 0, 0, 0, 0, 0 } },
-  // Magitek Pulse
-  { 8624, { 0, 0, 0, 0, 0, 0 } },
-  // Magitek Thunder
-  { 8625, { 0, 0, 0, 0, 0, 0 } },
-  // attack
-  { 8687, { 0, 0, 0, 0, 0, 0 } },
-  // Katon
-  { 9012, { 0, 0, 0, 0, 0, 0 } },
-  // Remove Barrel
-  { 9015, { 0, 0, 0, 0, 0, 0 } },
-  // Tenka Goken
-  { 9143, { 0, 0, 0, 0, 0, 0 } },
-  // Thunderous Force
-  { 9294, { 0, 0, 0, 0, 0, 0 } },
-  // Raiton
-  { 9301, { 0, 0, 0, 0, 0, 0 } },
-  // Raiton
-  { 9302, { 0, 0, 0, 0, 0, 0 } },
-  // Bishop Overdrive
-  { 9372, { 0, 0, 0, 0, 0, 0 } },
-  // Undraw
-  { 9629, { 0, 0, 0, 0, 0, 0 } },
-  // Self-detonate
-  { 9775, { 0, 0, 0, 0, 0, 0 } },
-  // Shatterstone
-  { 9823, { 0, 0, 0, 0, 0, 0 } },
-  // attack
-  { 9996, { 0, 0, 0, 0, 0, 0 } },
-  // Ungarmax
-  { 10001, { 0, 0, 0, 0, 0, 0 } },
-  // Starstorm
-  { 10894, { 0, 0, 0, 0, 0, 0 } },
-  // attack
-  { 10946, { 0, 0, 0, 0, 0, 0 } },
-  // attack
-  { 10947, { 0, 0, 0, 0, 0, 0 } },
-  // Ruin III
-  { 11191, { 200, 0, 0, 0, 0, 0 } },
-  // Physick
-  { 11192, { 0, 0, 0, 0, 0, 400 } },
-  // Starstorm
-  { 11193, { 3600, 0, 0, 0, 0, 0 } },
-  // Snort
-  { 11383, { 0, 0, 0, 0, 0, 0 } },
-  // 4-tonze Weight
-  { 11384, { 110, 0, 0, 0, 0, 0 } },
-  // Water Cannon
-  { 11385, { 120, 0, 0, 0, 0, 0 } },
-  // Song of Torment
-  { 11386, { 50, 0, 0, 0, 0, 0 } },
-  // High Voltage
-  { 11387, { 90, 0, 0, 0, 0, 0 } },
-  // Bad Breath
-  { 11388, { 0, 0, 0, 0, 0, 0 } },
-  // Flying Frenzy
-  { 11389, { 80, 0, 0, 0, 0, 0 } },
-  // Aqua Breath
-  { 11390, { 90, 0, 0, 0, 0, 0 } },
-  // Plaincracker
-  { 11391, { 130, 0, 0, 0, 0, 0 } },
-  // Acorn Bomb
-  { 11392, { 0, 0, 0, 0, 0, 0 } },
-  // Bristle
-  { 11393, { 0, 0, 0, 0, 0, 0 } },
-  // Mind Blast
-  { 11394, { 100, 0, 0, 0, 0, 0 } },
-  // Blood Drain
-  { 11395, { 20, 0, 0, 0, 0, 0 } },
-  // Bomb Toss
-  { 11396, { 110, 0, 0, 0, 0, 0 } },
-  // 1000 Needles
-  { 11397, { 0, 0, 0, 0, 0, 0 } },
-  // Drill Cannons
-  { 11398, { 120, 0, 0, 0, 0, 0 } },
-  // the Look
-  { 11399, { 130, 0, 0, 0, 0, 0 } },
-  // Sharpened Knife
-  { 11400, { 120, 0, 0, 0, 0, 0 } },
-  // Loom
-  { 11401, { 0, 0, 0, 0, 0, 0 } },
-  // Flame Thrower
-  { 11402, { 130, 0, 0, 0, 0, 0 } },
-  // Faze
-  { 11403, { 0, 0, 0, 0, 0, 0 } },
-  // Glower
-  { 11404, { 130, 0, 0, 0, 0, 0 } },
-  // Missile
-  { 11405, { 0, 0, 0, 0, 0, 0 } },
-  // White Wind
-  { 11406, { 0, 0, 0, 0, 0, 0 } },
-  // Final Sting
-  { 11407, { 1500, 0, 0, 0, 0, 0 } },
-  // Self-destruct
-  { 11408, { 900, 0, 0, 0, 0, 0 } },
-  // Transfusion
-  { 11409, { 0, 0, 0, 0, 0, 0 } },
-  // Toad Oil
-  { 11410, { 0, 0, 0, 0, 0, 0 } },
-  // Off-guard
-  { 11411, { 0, 0, 0, 0, 0, 0 } },
-  // Sticky Tongue
-  { 11412, { 0, 0, 0, 0, 0, 0 } },
-  // Tail Screw
-  { 11413, { 0, 0, 0, 0, 0, 0 } },
-  // Level 5 Petrify
-  { 11414, { 0, 0, 0, 0, 0, 0 } },
-  // Moon Flute
-  { 11415, { 0, 0, 0, 0, 0, 0 } },
-  // Doom
-  { 11416, { 0, 0, 0, 0, 0, 0 } },
-  // Mighty Guard
-  { 11417, { 0, 0, 0, 0, 0, 0 } },
-  // Ice Spikes
-  { 11418, { 0, 0, 0, 0, 0, 0 } },
-  // the Ram's Voice
-  { 11419, { 130, 0, 0, 0, 0, 0 } },
-  // the Dragon's Voice
-  { 11420, { 110, 0, 0, 0, 0, 0 } },
-  // Peculiar Light
-  { 11421, { 0, 0, 0, 0, 0, 0 } },
-  // Ink Jet
-  { 11422, { 120, 0, 0, 0, 0, 0 } },
-  // Flying Sardine
-  { 11423, { 10, 0, 0, 0, 0, 0 } },
-  // Diamondback
-  { 11424, { 0, 0, 0, 0, 0, 0 } },
-  // Fire Angon
-  { 11425, { 100, 0, 0, 0, 0, 0 } },
-  // Feather Rain
-  { 11426, { 180, 0, 0, 0, 0, 0 } },
-  // Eruption
-  { 11427, { 220, 0, 0, 0, 0, 0 } },
-  // Mountain Buster
-  { 11428, { 310, 0, 0, 0, 0, 0 } },
-  // Shock Strike
-  { 11429, { 310, 0, 0, 0, 0, 0 } },
-  // Glass Dance
-  { 11430, { 290, 0, 0, 0, 0, 0 } },
-  // Veil of the Whorl
-  { 11431, { 0, 0, 0, 0, 0, 0 } },
-  // Tri-shackle
-  { 11482, { 30, 0, 0, 0, 0, 0 } },
-  // attack
-  { 11784, { 0, 0, 0, 0, 0, 0 } },
-  // Stone IV of the Seventh Dawn
-  { 13423, { 140, 0, 0, 0, 0, 0 } },
-  // Aero II of the Seventh Dawn
-  { 13424, { 50, 0, 0, 0, 0, 0 } },
-  // Cure II of the Seventh Dawn
-  { 13425, { 0, 0, 0, 0, 0, 700 } },
-  // Aetherwell
-  { 13426, { 0, 0, 0, 0, 0, 0 } },
-  // Thunderous Force
-  { 14587, { 0, 0, 0, 0, 0, 0 } },
-  // Kyokufu
-  { 14840, { 180, 0, 0, 0, 0, 0 } },
-  // Ajisai
-  { 14841, { 100, 0, 0, 0, 0, 0 } },
-  // Hissatsu: Gyoten
-  { 14842, { 100, 0, 0, 0, 0, 0 } },
-  // 冥界恐叫打
-  { 14843, { 0, 0, 0, 0, 0, 0 } },
-  // Second Wind
-  { 15375, { 0, 0, 0, 0, 0, 500 } },
-  // Interject
-  { 15537, { 0, 0, 0, 0, 0, 0 } },
-  // Fight or Flight
-  { 15870, { 0, 0, 0, 0, 0, 0 } },
-  // Cascade
-  { 15989, { 200, 0, 0, 0, 0, 0 } },
-  // Fountain
-  { 15990, { 100, 250, 0, 0, 0, 0 } },
-  // Reverse Cascade
-  { 15991, { 300, 0, 0, 0, 0, 0 } },
-  // Fountainfall
-  { 15992, { 350, 0, 0, 0, 0, 0 } },
-  // Windmill
-  { 15993, { 150, 0, 0, 0, 0, 0 } },
-  // Bladeshower
-  { 15994, { 100, 200, 0, 0, 0, 0 } },
-  // Rising Windmill
-  { 15995, { 250, 0, 0, 0, 0, 0 } },
-  // Bloodshower
-  { 15996, { 300, 0, 0, 0, 0, 0 } },
-  // Standard Step
-  { 15997, { 0, 0, 0, 0, 0, 0 } },
-  // Technical Step
-  { 15998, { 0, 0, 0, 0, 0, 0 } },
-  // Emboite
-  { 15999, { 0, 0, 0, 0, 0, 0 } },
-  // Entrechat
-  { 16000, { 0, 0, 0, 0, 0, 0 } },
-  // Jete
-  { 16001, { 0, 0, 0, 0, 0, 0 } },
-  // Pirouette
-  { 16002, { 0, 0, 0, 0, 0, 0 } },
-  // Standard Finish
-  { 16003, { 0, 0, 0, 0, 0, 0 } },
-  // Technical Finish
-  { 16004, { 0, 0, 0, 0, 0, 0 } },
-  // Saber Dance
-  { 16005, { 600, 0, 0, 0, 0, 0 } },
-  // Closed Position
-  { 16006, { 0, 0, 0, 0, 0, 0 } },
-  // Fan Dance
-  { 16007, { 150, 0, 0, 0, 0, 0 } },
-  // Fan Dance II
-  { 16008, { 100, 0, 0, 0, 0, 0 } },
-  // Fan Dance III
-  { 16009, { 200, 0, 0, 0, 0, 0 } },
-  // En Avant
-  { 16010, { 0, 0, 0, 0, 0, 0 } },
-  // Devilment
-  { 16011, { 0, 0, 0, 0, 0, 0 } },
-  // Shield Samba
-  { 16012, { 0, 0, 0, 0, 0, 0 } },
-  // Flourish
-  { 16013, { 0, 0, 0, 0, 0, 0 } },
-  // Improvisation
-  { 16014, { 0, 0, 0, 0, 0, 0 } },
-  // Curing Waltz
-  { 16015, { 0, 0, 0, 0, 0, 200 } },
-  // Keen Edge
-  { 16137, { 200, 0, 0, 0, 0, 0 } },
-  // No Mercy
-  { 16138, { 0, 0, 0, 0, 0, 0 } },
-  // Brutal Shell
-  { 16139, { 100, 300, 0, 0, 0, 150 } },
-  // Camouflage
-  { 16140, { 0, 0, 0, 0, 0, 0 } },
-  // Demon Slice
-  { 16141, { 150, 0, 0, 0, 0, 0 } },
-  // Royal Guard
-  { 16142, { 0, 0, 0, 0, 0, 0 } },
-  // Lightning Shot
-  { 16143, { 150, 0, 0, 0, 0, 0 } },
-  // Danger Zone
-  { 16144, { 350, 0, 0, 0, 0, 0 } },
-  // Solid Barrel
-  { 16145, { 100, 400, 0, 0, 0, 0 } },
-  // Gnashing Fang
-  { 16146, { 450, 0, 0, 0, 0, 0 } },
-  // Savage Claw
-  { 16147, { 550, 0, 0, 0, 0, 0 } },
-  // Nebula
-  { 16148, { 0, 0, 0, 0, 0, 0 } },
-  // Demon Slaughter
-  { 16149, { 100, 250, 0, 0, 0, 0 } },
-  // Wicked Talon
-  { 16150, { 650, 0, 0, 0, 0, 0 } },
-  // Aurora
-  { 16151, { 0, 0, 0, 0, 0, 200 } },
-  // Superbolide
-  { 16152, { 0, 0, 0, 0, 0, 0 } },
-  // Sonic Break
-  { 16153, { 300, 0, 0, 0, 0, 0 } },
-  // Rough Divide
-  { 16154, { 200, 0, 0, 0, 0, 0 } },
-  // Continuation
-  { 16155, { 0, 0, 0, 0, 0, 0 } },
-  // Jugular Rip
-  { 16156, { 260, 0, 0, 0, 0, 0 } },
-  // Abdomen Tear
-  { 16157, { 280, 0, 0, 0, 0, 0 } },
-  // Eye Gouge
-  { 16158, { 300, 0, 0, 0, 0, 0 } },
-  // Bow Shock
-  { 16159, { 200, 0, 0, 0, 0, 0 } },
-  // Heart of Light
-  { 16160, { 0, 0, 0, 0, 0, 0 } },
-  // Heart of Stone
-  { 16161, { 0, 0, 0, 0, 0, 0 } },
-  // Burst Strike
-  { 16162, { 500, 0, 0, 0, 0, 0 } },
-  // Fated Circle
-  { 16163, { 320, 0, 0, 0, 0, 0 } },
-  // Bloodfest
-  { 16164, { 0, 0, 0, 0, 0, 0 } },
-  // Blasting Zone
-  { 16165, { 800, 0, 0, 0, 0, 0 } },
-  // Single Standard Finish
-  { 16191, { 0, 0, 0, 0, 0, 0 } },
-  // Double Standard Finish
-  { 16192, { 0, 0, 0, 0, 0, 0 } },
-  // Single Technical Finish
-  { 16193, { 0, 0, 0, 0, 0, 0 } },
-  // Double Technical Finish
-  { 16194, { 0, 0, 0, 0, 0, 0 } },
-  // Triple Technical Finish
-  { 16195, { 0, 0, 0, 0, 0, 0 } },
-  // Quadruple Technical Finish
-  { 16196, { 0, 0, 0, 0, 0, 0 } },
-  // Physick
-  { 16230, { 0, 0, 0, 0, 0, 400 } },
-  // Rightful Sword
-  { 16269, { 0, 0, 0, 0, 0, 0 } },
-  // Brutal Shell
-  { 16418, { 0, 0, 0, 0, 0, 0 } },
-  // Keen Edge
-  { 16434, { 0, 0, 0, 0, 0, 0 } },
-  // Solid Barrel
-  { 16435, { 0, 0, 0, 0, 0, 0 } },
-  // Soothing Potion
-  { 16436, { 0, 0, 0, 0, 0, 0 } },
-  // Shining Blade
-  { 16437, { 0, 0, 0, 0, 0, 0 } },
-  // Perfect Deception
-  { 16438, { 0, 0, 0, 0, 0, 0 } },
-  // Leap of Faith
-  { 16439, { 0, 0, 0, 0, 0, 0 } },
-  // Prominence
-  { 16457, { 100, 220, 0, 0, 0, 0 } },
-  // Holy Circle
-  { 16458, { 250, 0, 0, 0, 0, 0 } },
-  // Confiteor
-  { 16459, { 800, 0, 0, 0, 0, 0 } },
-  // Atonement
-  { 16460, { 550, 0, 0, 0, 0, 0 } },
-  // Intervene
-  { 16461, { 200, 0, 0, 0, 0, 0 } },
-  // Mythril Tempest
-  { 16462, { 100, 200, 0, 0, 0, 0 } },
-  // Chaotic Cyclone
-  { 16463, { 400, 0, 0, 0, 0, 0 } },
-  // Nascent Flash
-  { 16464, { 0, 0, 0, 0, 0, 0 } },
-  // Inner Chaos
-  { 16465, { 920, 0, 0, 0, 0, 0 } },
-  // Flood of Darkness
-  { 16466, { 250, 0, 0, 0, 0, 0 } },
-  // Edge of Darkness
-  { 16467, { 350, 0, 0, 0, 0, 0 } },
-  // Stalwart Soul
-  { 16468, { 100, 160, 0, 0, 0, 0 } },
-  // Flood of Shadow
-  { 16469, { 300, 0, 0, 0, 0, 0 } },
-  // Edge of Shadow
-  { 16470, { 500, 0, 0, 0, 0, 0 } },
-  // Dark Missionary
-  { 16471, { 0, 0, 0, 0, 0, 0 } },
-  // Living Shadow
-  { 16472, { 0, 0, 0, 0, 0, 0 } },
-  // Four-point Fury
-  { 16473, { 120, 0, 0, 0, 0, 0 } },
-  // Enlightenment
-  { 16474, { 220, 0, 0, 0, 0, 0 } },
-  // Anatman
-  { 16475, { 0, 0, 0, 0, 0, 0 } },
-  // Six-sided Star
-  { 16476, { 400, 0, 0, 0, 0, 0 } },
-  // Coerthan Torment
-  { 16477, { 100, 230, 0, 0, 0, 0 } },
-  // High Jump
-  { 16478, { 400, 0, 0, 0, 0, 0 } },
-  // Raiden Thrust
-  { 16479, { 330, 0, 0, 0, 0, 0 } },
-  // Stardiver
-  { 16480, { 550, 0, 0, 0, 0, 0 } },
-  // Hissatsu: Senei
-  { 16481, { 1100, 0, 0, 0, 0, 0 } },
-  // Ikishoten
-  { 16482, { 0, 0, 0, 0, 0, 0 } },
-  // Tsubame-gaeshi
-  { 16483, { 0, 0, 0, 0, 0, 0 } },
-  // Kaeshi: Higanbana
-  { 16484, { 375, 0, 0, 0, 0, 0 } },
-  // Kaeshi: Goken
-  { 16485, { 540, 0, 0, 0, 0, 0 } },
-  // Kaeshi: Setsugekka
-  { 16486, { 1200, 0, 0, 0, 0, 0 } },
-  // Shoha
-  { 16487, { 0, 0, 0, 0, 0, 0 } },
-  // Hakke Mujinsatsu
-  { 16488, { 100, 140, 0, 0, 0, 0 } },
-  // Meisui
-  { 16489, { 0, 0, 0, 0, 0, 0 } },
-  // Goka Mekkyaku
-  { 16491, { 400, 0, 0, 0, 0, 0 } },
-  // Hyosho Ranryu
-  { 16492, { 600, 0, 0, 0, 0, 0 } },
-  // Bunshin
-  { 16493, { 0, 0, 0, 0, 0, 0 } },
-  // Shadowbite
-  { 16494, { 100, 0, 0, 0, 0, 0 } },
-  // Burst Shot
-  { 16495, { 230, 0, 0, 0, 0, 0 } },
-  // Apex Arrow
-  { 16496, { 500, 0, 0, 0, 0, 0 } },
-  // Auto Crossbow
-  { 16497, { 180, 0, 0, 0, 0, 0 } },
-  // Drill
-  { 16498, { 700, 0, 0, 0, 0, 0 } },
-  // Bioblaster
-  { 16499, { 60, 0, 0, 0, 0, 0 } },
-  // Air Anchor
-  { 16500, { 700, 0, 0, 0, 0, 0 } },
-  // Automaton Queen
-  { 16501, { 0, 0, 0, 0, 0, 0 } },
-  // Queen Overdrive
-  { 16502, { 0, 0, 0, 0, 0, 0 } },
-  // Despair
-  { 16505, { 380, 0, 0, 0, 0, 0 } },
-  // Umbral Soul
-  { 16506, { 0, 0, 0, 0, 0, 0 } },
-  // Xenoglossy
-  { 16507, { 750, 0, 0, 0, 0, 0 } },
+  { 166, { 0, 0, 0, 0, 0, 0, 10 } },
   // Energy Drain
-  { 16508, { 100, 0, 0, 0, 0, 0 } },
-  // Egi Assault
-  { 16509, { 0, 0, 0, 0, 0, 0 } },
-  // Energy Siphon
-  { 16510, { 40, 0, 0, 0, 0, 0 } },
-  // Outburst
-  { 16511, { 70, 0, 0, 0, 0, 0 } },
-  // Egi Assault II
-  { 16512, { 0, 0, 0, 0, 0, 0 } },
-  // Firebird Trance
-  { 16513, { 0, 0, 0, 0, 0, 0 } },
-  // Fountain of Fire
-  { 16514, { 250, 0, 0, 0, 0, 0 } },
-  // Brand of Purgatory
-  { 16515, { 350, 0, 0, 0, 0, 0 } },
-  // Enkindle Phoenix
-  { 16516, { 0, 0, 0, 0, 0, 0 } },
-  // Verthunder II
-  { 16524, { 0, 0, 0, 0, 0, 0 } },
-  // Veraero II
-  { 16525, { 0, 0, 0, 0, 0, 0 } },
-  // Impact
-  { 16526, { 220, 0, 0, 0, 0, 0 } },
-  // Engagement
-  { 16527, { 150, 0, 0, 0, 0, 0 } },
-  // Enchanted Reprise
-  { 16528, { 220, 0, 0, 0, 0, 0 } },
-  // Reprise
-  { 16529, { 100, 0, 0, 0, 0, 0 } },
-  // Scorch
-  { 16530, { 700, 0, 0, 0, 0, 0 } },
-  // Afflatus Solace
-  { 16531, { 0, 0, 0, 0, 0, 700 } },
-  // Dia
-  { 16532, { 120, 0, 0, 0, 0, 0 } },
-  // Glare
-  { 16533, { 300, 0, 0, 0, 0, 0 } },
-  // Afflatus Rapture
-  { 16534, { 0, 0, 0, 0, 0, 300 } },
-  // Afflatus Misery
-  { 16535, { 900, 0, 0, 0, 0, 0 } },
-  // Temperance
-  { 16536, { 0, 0, 0, 0, 0, 0 } },
-  // Whispering Dawn
-  { 16537, { 0, 0, 0, 0, 0, 0 } },
-  // Fey Illumination
-  { 16538, { 0, 0, 0, 0, 0, 0 } },
-  // Art of War
-  { 16539, { 150, 0, 0, 0, 0, 0 } },
-  // Biolysis
-  { 16540, { 0, 0, 0, 0, 0, 0 } },
-  // Broil III
-  { 16541, { 280, 0, 0, 0, 0, 0 } },
-  // Recitation
-  { 16542, { 0, 0, 0, 0, 0, 0 } },
-  // Fey Blessing
-  { 16543, { 0, 0, 0, 0, 0, 0 } },
-  // Summon Seraph
-  { 16545, { 0, 0, 0, 0, 0, 0 } },
-  // Consolation
-  { 16546, { 0, 0, 0, 0, 0, 0 } },
-  // Firebird Trance
-  { 16549, { 0, 0, 0, 0, 0, 0 } },
-  // Divination
-  { 16552, { 0, 0, 0, 0, 0, 0 } },
-  // Celestial Opposition
-  { 16553, { 0, 0, 0, 0, 0, 100 } },
-  // Combust III
-  { 16554, { 0, 0, 0, 0, 0, 0 } },
-  // Malefic IV
-  { 16555, { 240, 0, 0, 0, 0, 0 } },
-  // Celestial Intersection
-  { 16556, { 0, 0, 0, 0, 0, 150 } },
-  // Horoscope
-  { 16557, { 0, 0, 0, 0, 0, 100 } },
-  // Horoscope
-  { 16558, { 0, 0, 0, 0, 0, 0 } },
-  // Neutral Sect
-  { 16559, { 0, 0, 0, 0, 0, 0 } },
-  // Ronkan Fire III
-  { 16574, { 430, 0, 0, 0, 0, 0 } },
-  // Ronkan Blizzard III
-  { 16575, { 240, 0, 0, 0, 0, 0 } },
-  // Ronkan Thunder III
-  { 16576, { 200, 0, 0, 0, 0, 0 } },
-  // Ronkan Flare
-  { 16577, { 460, 0, 0, 0, 0, 0 } },
-  // Falling Star
-  { 16578, { 1500, 0, 0, 0, 0, 0 } },
-  // Detonator
-  { 16766, { 0, 0, 0, 0, 0, 0 } },
-  // Fast Blade
-  { 16788, { 0, 0, 0, 0, 0, 0 } },
-  // Sunshadow
-  { 16789, { 0, 0, 0, 0, 0, 0 } },
-  // Assault I: Glittering Topaz
-  { 16791, { 0, 0, 0, 0, 0, 0 } },
-  // Assault II: Shining Topaz
-  { 16792, { 0, 0, 0, 0, 0, 0 } },
-  // Assault I: Downburst
-  { 16793, { 0, 0, 0, 0, 0, 0 } },
-  // Assault II: Glittering Emerald
-  { 16794, { 0, 0, 0, 0, 0, 0 } },
-  // Assault I: Earthen Armor
-  { 16795, { 0, 0, 0, 0, 0, 0 } },
-  // Assault II: Mountain Buster
-  { 16796, { 0, 0, 0, 0, 0, 0 } },
-  // Assault I: Aerial Slash
-  { 16797, { 0, 0, 0, 0, 0, 0 } },
-  // Assault II: Slipstream
-  { 16798, { 0, 0, 0, 0, 0, 0 } },
-  // Assault I: Crimson Cyclone
-  { 16799, { 0, 0, 0, 0, 0, 0 } },
-  // Assault II: Flaming Crush
-  { 16800, { 0, 0, 0, 0, 0, 0 } },
-  // Enkindle: Earthen Fury
-  { 16801, { 0, 0, 0, 0, 0, 0 } },
-  // Enkindle: Aerial Blast
-  { 16802, { 0, 0, 0, 0, 0, 0 } },
-  // Enkindle: Inferno
-  { 16803, { 0, 0, 0, 0, 0, 0 } },
-  // Rough Divide
-  { 16804, { 200, 0, 0, 0, 0, 0 } },
-  // Tactician
-  { 16889, { 0, 0, 0, 0, 0, 0 } },
-  // Swashbuckler
-  { 16984, { 0, 0, 0, 0, 0, 0 } },
-  // Greatest Eclipse
-  { 16985, { 0, 0, 0, 0, 0, 0 } },
-  // Ronkan Cure II
-  { 17000, { 0, 0, 0, 0, 0, 1300 } },
-  // Ronkan Medica
-  { 17001, { 0, 0, 0, 0, 0, 500 } },
-  // Ronkan Esuna
-  { 17002, { 0, 0, 0, 0, 0, 0 } },
-  // Ronkan Stone II
-  { 17003, { 200, 0, 0, 0, 0, 0 } },
-  // Ronkan Renew
-  { 17004, { 0, 0, 0, 0, 0, 0 } },
-  // Play
-  { 17055, { 0, 0, 0, 0, 0, 0 } },
-  // Gunmetal Soul
-  { 17105, { 0, 0, 0, 0, 0, 0 } },
-  // Crimson Lotus
-  { 17106, { 0, 0, 0, 0, 0, 0 } },
-  // Acidic Bite
-  { 17122, { 300, 0, 0, 0, 0, 0 } },
-  // Heavy Shot
-  { 17123, { 550, 0, 0, 0, 0, 0 } },
-  // Radiant Arrow
-  { 17124, { 1100, 0, 0, 0, 0, 0 } },
-  // Dulling Arrow
-  { 17125, { 0, 0, 0, 0, 0, 0 } },
-  // Aspected Benefic
-  { 17151, { 0, 0, 0, 0, 0, 200 } },
-  // Aspected Helios
-  { 17152, { 0, 0, 0, 0, 0, 100 } },
-  // Hypercharge
-  { 17209, { 0, 0, 0, 0, 0, 0 } },
-  // Summon Eos
-  { 17215, { 0, 0, 0, 0, 0, 0 } },
-  // Summon Selene
-  { 17216, { 0, 0, 0, 0, 0, 0 } },
-  // attack
-  { 17222, { 0, 0, 0, 0, 0, 0 } },
-  // Chivalrous Spirit
-  { 17236, { 0, 0, 0, 0, 0, 1200 } },
-  // Souldeep Invisibility
-  { 17291, { 0, 0, 0, 0, 0, 0 } },
-  // Spinning Edge
-  { 17413, { 0, 0, 0, 0, 0, 0 } },
-  // Gust Slash
-  { 17414, { 0, 0, 0, 0, 0, 0 } },
-  // Aeolian Edge
-  { 17415, { 0, 0, 0, 0, 0, 0 } },
-  // Shadow Fang
-  { 17416, { 0, 0, 0, 0, 0, 0 } },
-  // Armor Crush
-  { 17417, { 0, 0, 0, 0, 0, 0 } },
-  // Throwing Dagger
-  { 17418, { 0, 0, 0, 0, 0, 0 } },
-  // Death Blossom
-  { 17419, { 0, 0, 0, 0, 0, 0 } },
-  // Hakke Mujinsatsu
-  { 17420, { 0, 0, 0, 0, 0, 0 } },
-  // Hunter's Prudence
-  { 17596, { 0, 0, 0, 0, 0, 1000 } },
-  // Nebula
-  { 17839, { 0, 0, 0, 0, 0, 0 } },
-  // Bio
-  { 17864, { 0, 0, 0, 0, 0, 0 } },
-  // Bio II
-  { 17865, { 0, 0, 0, 0, 0, 0 } },
-  // Ruin
-  { 17869, { 160, 0, 0, 0, 0, 0 } },
+  { 167, { 150, 0, 0, 0, 0, 0, 5 } },
+  // Miasma
+  { 168, { 20, 0, 0, 0, 0, 0, 0 } },
+  // Summon II
+  { 170, { 0, 0, 0, 0, 0, 0, 0 } },
   // Ruin II
-  { 17870, { 0, 0, 0, 0, 0, 0 } },
+  { 172, { 160, 0, 0, 0, 0, 0, 0 } },
+  // Resurrection
+  { 173, { 0, 0, 0, 0, 0, 0, 0 } },
+  // Bane
+  { 174, { 0, 0, 0, 0, 0, 0, 0 } },
+  // Bio II
+  { 178, { 0, 0, 0, 0, 0, 0, 0 } },
+  // Summon III
+  { 180, { 0, 0, 0, 0, 0, 0, 0 } },
+  // Fester
+  { 181, { 100, 0, 0, 0, 0, 0, 0 } },
+  // Enkindle
+  { 184, { 0, 0, 0, 0, 0, 0, 0 } },
+  // Adloquium
+  { 185, { 0, 0, 0, 0, 0, 300, 0 } },
+  // Succor
+  { 186, { 0, 0, 0, 0, 0, 180, 0 } },
+  // Sacred Soil
+  { 188, { 0, 0, 0, 0, 0, 100, 0 } },
+  // Lustrate
+  { 189, { 0, 0, 0, 0, 0, 600, 0 } },
+  // Physick
+  { 190, { 0, 0, 0, 0, 0, 400, 0 } },
+  // Shield Wall
+  { 197, { 0, 0, 0, 0, 0, 0, 0 } },
+  // Stronghold
+  { 198, { 0, 0, 0, 0, 0, 0, 0 } },
+  // Last Bastion
+  { 199, { 0, 0, 0, 0, 0, 0, 0 } },
+  // Braver
+  { 200, { 2400, 0, 0, 0, 0, 0, 0 } },
+  // Bladedance
+  { 201, { 5250, 0, 0, 0, 0, 0, 0 } },
+  // Final Heaven
+  { 202, { 9000, 0, 0, 0, 0, 0, 0 } },
+  // Skyshard
+  { 203, { 1650, 0, 0, 0, 0, 0, 0 } },
+  // Starstorm
+  { 204, { 3600, 0, 0, 0, 0, 0, 0 } },
+  // Meteor
+  { 205, { 6150, 0, 0, 0, 0, 0, 0 } },
+  // Healing Wind
+  { 206, { 0, 0, 0, 0, 0, 0, 0 } },
+  // Breath of the Earth
+  { 207, { 0, 0, 0, 0, 0, 0, 0 } },
+  // Pulse of Life
+  { 208, { 0, 0, 0, 0, 0, 0, 0 } },
+  // Magitek Cannon
+  { 1128, { 0, 0, 0, 0, 0, 0, 0 } },
+  // Photon Stream
+  { 1129, { 0, 0, 0, 0, 0, 0, 0 } },
+  // attack
+  { 1533, { 0, 0, 0, 0, 0, 0, 0 } },
+  // Spinning Edge
+  { 2240, { 220, 0, 0, 0, 0, 0, 0 } },
+  // Shade Shift
+  { 2241, { 0, 0, 0, 0, 0, 0, 0 } },
+  // Gust Slash
+  { 2242, { 100, 330, 0, 0, 0, 0, 0 } },
+  // Hide
+  { 2245, { 0, 0, 0, 0, 0, 0, 0 } },
+  // Assassinate
+  { 2246, { 200, 0, 0, 0, 0, 0, 0 } },
+  // Throwing Dagger
+  { 2247, { 120, 0, 0, 0, 0, 0, 0 } },
+  // Mug
+  { 2248, { 150, 0, 0, 0, 0, 0, 0 } },
+  // Death Blossom
+  { 2254, { 120, 0, 0, 0, 0, 0, 0 } },
+  // Aeolian Edge
+  { 2255, { 100, 420, 0, 0, 160, 0, 0 } },
+  // Shadow Fang
+  { 2257, { 200, 0, 0, 0, 0, 0, 0 } },
+  // Trick Attack
+  { 2258, { 350, 0, 0, 0, 500, 0, 0 } },
+  // Ten
+  { 2259, { 0, 0, 0, 0, 0, 0, 0 } },
+  // Ninjutsu
+  { 2260, { 0, 0, 0, 0, 0, 0, 0 } },
+  // Chi
+  { 2261, { 0, 0, 0, 0, 0, 0, 0 } },
+  // Shukuchi
+  { 2262, { 0, 0, 0, 0, 0, 0, 0 } },
+  // Jin
+  { 2263, { 0, 0, 0, 0, 0, 0, 0 } },
+  // Kassatsu
+  { 2264, { 0, 0, 0, 0, 0, 0, 0 } },
+  // Fuma Shuriken
+  { 2265, { 500, 0, 0, 0, 0, 0, 0 } },
+  // Katon
+  { 2266, { 500, 0, 0, 0, 0, 0, 0 } },
+  // Raiton
+  { 2267, { 800, 0, 0, 0, 0, 0, 0 } },
+  // Hyoton
+  { 2268, { 400, 0, 0, 0, 0, 0, 0 } },
+  // Huton
+  { 2269, { 0, 0, 0, 0, 0, 0, 0 } },
+  // Doton
+  { 2270, { 100, 0, 0, 0, 0, 0, 0 } },
+  // Suiton
+  { 2271, { 600, 0, 0, 0, 0, 0, 0 } },
+  // Rabbit Medium
+  { 2272, { 0, 0, 0, 0, 0, 0, 0 } },
+  // Rook Autoturret
+  { 2864, { 80, 0, 0, 0, 0, 0, 0 } },
+  // Split Shot
+  { 2866, { 180, 0, 0, 0, 0, 0, 0 } },
+  // Slug Shot
+  { 2868, { 100, 260, 0, 0, 0, 0, 0 } },
+  // Spread Shot
+  { 2870, { 180, 0, 0, 0, 0, 0, 0 } },
+  // Hot Shot
+  { 2872, { 300, 0, 0, 0, 0, 0, 0 } },
+  // Clean Shot
+  { 2873, { 100, 340, 0, 0, 0, 0, 0 } },
+  // Gauss Round
+  { 2874, { 150, 0, 0, 0, 0, 0, 0 } },
+  // Reassemble
+  { 2876, { 0, 0, 0, 0, 0, 0, 0 } },
+  // Wildfire
+  { 2878, { 0, 0, 0, 0, 0, 0, 0 } },
+  // Ricochet
+  { 2890, { 150, 0, 0, 0, 0, 0, 0 } },
+  // Raiton
+  { 3203, { 0, 0, 0, 0, 0, 0, 0 } },
+  // Raiton
+  { 3204, { 0, 0, 0, 0, 0, 0, 0 } },
+  // Kanashibari
+  { 3207, { 0, 0, 0, 0, 0, 0, 0 } },
+  // Goring Blade
+  { 3538, { 100, 390, 0, 0, 0, 0, 0 } },
+  // Royal Authority
+  { 3539, { 100, 550, 0, 0, 0, 0, 0 } },
+  // Divine Veil
+  { 3540, { 0, 0, 0, 0, 0, 0, 0 } },
+  // Clemency
+  { 3541, { 0, 0, 0, 0, 0, 1200, 0 } },
+  // Sheltron
+  { 3542, { 0, 0, 0, 0, 0, 0, 0 } },
+  // Tornado Kick
+  { 3543, { 430, 0, 0, 0, 0, 0, 0 } },
+  // Elixir Field
+  { 3545, { 200, 0, 0, 0, 0, 0, 0 } },
+  // Meditation
+  { 3546, { 0, 0, 0, 0, 0, 0, 0 } },
+  // the Forbidden Chakra
+  { 3547, { 370, 0, 0, 0, 0, 0, 0 } },
+  // Fell Cleave
+  { 3549, { 590, 0, 0, 0, 0, 0, 0 } },
+  // Decimate
+  { 3550, { 250, 0, 0, 0, 0, 0, 0 } },
+  // Raw Intuition
+  { 3551, { 0, 0, 0, 0, 0, 0, 0 } },
+  // Equilibrium
+  { 3552, { 0, 0, 0, 0, 0, 1200, 0 } },
+  // Blood of the Dragon
+  { 3553, { 0, 0, 0, 0, 0, 0, 0 } },
+  // Fang and Claw
+  { 3554, { 320, 0, 360, 0, 0, 0, 0 } },
+  // Geirskogul
+  { 3555, { 300, 0, 0, 0, 0, 0, 0 } },
+  // Wheeling Thrust
+  { 3556, { 320, 0, 0, 0, 360, 0, 0 } },
+  // Battle Litany
+  { 3557, { 0, 0, 0, 0, 0, 0, 0 } },
+  // Empyreal Arrow
+  { 3558, { 230, 0, 0, 0, 0, 0, 0 } },
+  // the Wanderer's Minuet
+  { 3559, { 100, 0, 0, 0, 0, 0, 0 } },
+  // Iron Jaws
+  { 3560, { 100, 0, 0, 0, 0, 0, 0 } },
+  // the Warden's Paean
+  { 3561, { 0, 0, 0, 0, 0, 0, 0 } },
+  // Sidewinder
+  { 3562, { 100, 0, 0, 0, 0, 0, 0 } },
+  // Armor Crush
+  { 3563, { 100, 400, 160, 0, 0, 0, 0 } },
+  // Dream Within a Dream
+  { 3566, { 200, 0, 0, 0, 0, 0, 0 } },
+  // Stone III
+  { 3568, { 240, 0, 0, 0, 0, 0, 0 } },
+  // Asylum
+  { 3569, { 0, 0, 0, 0, 0, 100, 0 } },
+  // Tetragrammaton
+  { 3570, { 0, 0, 0, 0, 0, 700, 0 } },
+  // Assize
+  { 3571, { 400, 0, 0, 0, 0, 400, 5 } },
+  // Ley Lines
+  { 3573, { 0, 0, 0, 0, 0, 0, 0 } },
+  // Sharpcast
+  { 3574, { 0, 0, 0, 0, 0, 0, 0 } },
+  // Enochian
+  { 3575, { 0, 0, 0, 0, 0, 0, 0 } },
+  // Blizzard IV
+  { 3576, { 300, 0, 0, 0, 0, 0, 0 } },
+  // Fire IV
+  { 3577, { 300, 0, 0, 0, 0, 0, 0 } },
+  // Painflare
+  { 3578, { 130, 0, 0, 0, 0, 0, 0 } },
+  // Ruin III
+  { 3579, { 200, 0, 0, 0, 0, 0, 0 } },
+  // Tri-disaster
+  { 3580, { 300, 0, 0, 0, 0, 0, 0 } },
+  // Dreadwyrm Trance
+  { 3581, { 0, 0, 0, 0, 0, 0, 0 } },
+  // Deathflare
+  { 3582, { 400, 0, 0, 0, 0, 0, 0 } },
+  // Indomitability
+  { 3583, { 0, 0, 0, 0, 0, 400, 0 } },
+  // Broil
+  { 3584, { 240, 0, 0, 0, 0, 0, 0 } },
+  // Deployment Tactics
+  { 3585, { 0, 0, 0, 0, 0, 0, 0 } },
+  // Emergency Tactics
+  { 3586, { 0, 0, 0, 0, 0, 0, 0 } },
+  // Dissipation
+  { 3587, { 0, 0, 0, 0, 0, 0, 0 } },
+  // Draw
+  { 3590, { 0, 0, 0, 0, 0, 0, 0 } },
+  // Redraw
+  { 3593, { 0, 0, 0, 0, 0, 0, 0 } },
+  // Benefic
+  { 3594, { 0, 0, 0, 0, 0, 400, 0 } },
+  // Aspected Benefic
+  { 3595, { 0, 0, 0, 0, 0, 200, 0 } },
+  // Malefic
+  { 3596, { 150, 0, 0, 0, 0, 0, 0 } },
+  // Malefic II
+  { 3598, { 170, 0, 0, 0, 0, 0, 0 } },
+  // Combust
+  { 3599, { 0, 0, 0, 0, 0, 0, 0 } },
+  // Helios
+  { 3600, { 0, 0, 0, 0, 0, 330, 0 } },
+  // Aspected Helios
+  { 3601, { 0, 0, 0, 0, 0, 200, 0 } },
+  // Ascend
+  { 3603, { 0, 0, 0, 0, 0, 0, 0 } },
+  // Diurnal Sect
+  { 3604, { 0, 0, 0, 0, 0, 0, 0 } },
+  // Nocturnal Sect
+  { 3605, { 0, 0, 0, 0, 0, 0, 0 } },
+  // Lightspeed
+  { 3606, { 0, 0, 0, 0, 0, 0, 0 } },
+  // Combust II
+  { 3608, { 0, 0, 0, 0, 0, 0, 0 } },
+  // Benefic II
+  { 3610, { 0, 0, 0, 0, 0, 700, 0 } },
+  // Synastry
+  { 3612, { 0, 0, 0, 0, 0, 0, 0 } },
+  // Collective Unconscious
+  { 3613, { 0, 0, 0, 0, 0, 100, 0 } },
+  // Essential Dignity
+  { 3614, { 0, 0, 0, 0, 0, 400, 0 } },
+  // Gravity
+  { 3615, { 140, 0, 0, 0, 0, 0, 0 } },
+  // Hard Slash
+  { 3617, { 200, 0, 0, 0, 0, 0, 0 } },
+  // Unleash
+  { 3621, { 150, 0, 0, 0, 0, 0, 0 } },
+  // Syphon Strike
+  { 3623, { 100, 300, 0, 0, 0, 0, 6 } },
+  // Unmend
+  { 3624, { 150, 0, 0, 0, 0, 0, 0 } },
+  // Blood Weapon
+  { 3625, { 0, 0, 0, 0, 0, 0, 0 } },
+  // Grit
+  { 3629, { 0, 0, 0, 0, 0, 0, 0 } },
+  // Souleater
+  { 3632, { 100, 400, 0, 0, 0, 300, 0 } },
+  // Dark Mind
+  { 3634, { 0, 0, 0, 0, 0, 0, 0 } },
+  // Shadow Wall
+  { 3636, { 0, 0, 0, 0, 0, 0, 0 } },
+  // Living Dead
+  { 3638, { 0, 0, 0, 0, 0, 0, 0 } },
+  // Salted Earth
+  { 3639, { 60, 0, 0, 0, 0, 0, 0 } },
+  // Plunge
+  { 3640, { 200, 0, 0, 0, 0, 0, 0 } },
+  // Abyssal Drain
+  { 3641, { 200, 0, 0, 0, 0, 200, 0 } },
+  // Carve and Spit
+  { 3643, { 450, 0, 0, 0, 0, 0, 6 } },
+  // Big Shot
+  { 4238, { 0, 0, 0, 0, 0, 0, 0 } },
+  // Desperado
+  { 4239, { 0, 0, 0, 0, 0, 0, 0 } },
+  // Land Waker
+  { 4240, { 0, 0, 0, 0, 0, 0, 0 } },
+  // Dark Force
+  { 4241, { 0, 0, 0, 0, 0, 0, 0 } },
+  // Dragonsong Dive
+  { 4242, { 0, 0, 0, 0, 0, 0, 0 } },
+  // Chimatsuri
+  { 4243, { 0, 0, 0, 0, 0, 0, 0 } },
+  // Sagittarius Arrow
+  { 4244, { 0, 0, 0, 0, 0, 0, 0 } },
+  // Satellite Beam
+  { 4245, { 0, 0, 0, 0, 0, 0, 0 } },
+  // Teraflare
+  { 4246, { 0, 0, 0, 0, 0, 0, 0 } },
+  // Angel Feathers
+  { 4247, { 0, 0, 0, 0, 0, 0, 0 } },
+  // Astral Stasis
+  { 4248, { 0, 0, 0, 0, 0, 0, 0 } },
+  // Form Shift
+  { 4262, { 0, 0, 0, 0, 0, 0, 0 } },
+  // Cannonfire
+  { 4271, { 0, 0, 0, 0, 0, 0, 0 } },
+  // the Balance
+  { 4401, { 0, 0, 0, 0, 0, 0, 0 } },
+  // the Arrow
+  { 4402, { 0, 0, 0, 0, 0, 0, 0 } },
+  // the Spear
+  { 4403, { 0, 0, 0, 0, 0, 0, 0 } },
+  // the Bole
+  { 4404, { 0, 0, 0, 0, 0, 0, 0 } },
+  // the Ewer
+  { 4405, { 0, 0, 0, 0, 0, 0, 0 } },
+  // the Spire
+  { 4406, { 0, 0, 0, 0, 0, 0, 0 } },
+  // Raiton
+  { 4977, { 0, 0, 0, 0, 0, 0, 0 } },
+  // Raiton
+  { 5069, { 0, 0, 0, 0, 0, 0, 0 } },
+  // attack
+  { 5199, { 0, 0, 0, 0, 0, 0, 0 } },
+  // attack
+  { 5846, { 0, 0, 0, 0, 0, 0, 0 } },
+  // Stickyloom
+  { 5874, { 0, 0, 0, 0, 0, 0, 0 } },
+  // Void Fire II
+  { 6274, { 0, 0, 0, 0, 0, 0, 0 } },
+  // Total Eclipse
+  { 7381, { 120, 0, 0, 0, 0, 0, 0 } },
+  // Intervention
+  { 7382, { 0, 0, 0, 0, 0, 0, 0 } },
+  // Requiescat
+  { 7383, { 150, 0, 0, 0, 0, 0, 0 } },
+  // Holy Spirit
+  { 7384, { 350, 0, 0, 0, 0, 0, 0 } },
+  // Passage of Arms
+  { 7385, { 0, 0, 0, 0, 0, 0, 0 } },
+  // Onslaught
+  { 7386, { 100, 0, 0, 0, 0, 0, 0 } },
+  // Upheaval
+  { 7387, { 450, 0, 0, 0, 0, 0, 0 } },
+  // Shake It Off
+  { 7388, { 0, 0, 0, 0, 0, 0, 0 } },
+  // Inner Release
+  { 7389, { 0, 0, 0, 0, 0, 0, 0 } },
+  // Delirium
+  { 7390, { 0, 0, 0, 0, 0, 0, 0 } },
+  // Quietus
+  { 7391, { 210, 0, 0, 0, 0, 0, 6 } },
+  // Bloodspiller
+  { 7392, { 600, 0, 0, 0, 0, 0, 0 } },
+  // The Blackest Night
+  { 7393, { 0, 0, 0, 0, 0, 0, 0 } },
+  // Riddle of Earth
+  { 7394, { 0, 0, 0, 0, 0, 0, 0 } },
+  // Riddle of Fire
+  { 7395, { 0, 0, 0, 0, 0, 0, 0 } },
+  // Brotherhood
+  { 7396, { 0, 0, 0, 0, 0, 0, 0 } },
+  // Sonic Thrust
+  { 7397, { 100, 200, 0, 0, 0, 0, 0 } },
+  // Dragon Sight
+  { 7398, { 0, 0, 0, 0, 0, 0, 0 } },
+  // Mirage Dive
+  { 7399, { 300, 0, 0, 0, 0, 0, 0 } },
+  // Nastrond
+  { 7400, { 400, 0, 0, 0, 0, 0, 0 } },
+  // Hellfrog Medium
+  { 7401, { 200, 0, 0, 0, 0, 0, 0 } },
+  // Bhavacakra
+  { 7402, { 300, 0, 0, 0, 0, 0, 0 } },
+  // Ten Chi Jin
+  { 7403, { 0, 0, 0, 0, 0, 0, 0 } },
+  // Pitch Perfect
+  { 7404, { 100, 0, 0, 0, 0, 0, 0 } },
+  // Troubadour
+  { 7405, { 0, 0, 0, 0, 0, 0, 0 } },
+  // Caustic Bite
+  { 7406, { 150, 0, 0, 0, 0, 0, 0 } },
+  // Stormbite
+  { 7407, { 100, 0, 0, 0, 0, 0, 0 } },
+  // Nature's Minne
+  { 7408, { 0, 0, 0, 0, 0, 0, 0 } },
+  // Refulgent Arrow
+  { 7409, { 330, 0, 0, 0, 0, 0, 0 } },
+  // Heat Blast
+  { 7410, { 220, 0, 0, 0, 0, 0, 0 } },
+  // Heated Split Shot
+  { 7411, { 220, 0, 0, 0, 0, 0, 0 } },
+  // Heated Slug Shot
+  { 7412, { 100, 330, 0, 0, 0, 0, 0 } },
+  // Heated Clean Shot
+  { 7413, { 100, 440, 0, 0, 0, 0, 0 } },
+  // Barrel Stabilizer
+  { 7414, { 0, 0, 0, 0, 0, 0, 0 } },
+  // Rook Overdrive
+  { 7415, { 0, 0, 0, 0, 0, 0, 0 } },
+  // Flamethrower
+  { 7418, { 0, 0, 0, 0, 0, 0, 0 } },
+  // Between the Lines
+  { 7419, { 0, 0, 0, 0, 0, 0, 0 } },
+  // Thunder IV
+  { 7420, { 50, 0, 0, 0, 0, 0, 0 } },
+  // Triplecast
+  { 7421, { 0, 0, 0, 0, 0, 0, 0 } },
+  // Foul
+  { 7422, { 650, 0, 0, 0, 0, 0, 0 } },
+  // Aetherpact
+  { 7423, { 0, 0, 0, 0, 0, 0, 0 } },
+  // Bio III
+  { 7424, { 0, 0, 0, 0, 0, 0, 0 } },
+  // Miasma III
+  { 7425, { 50, 0, 0, 0, 0, 0, 0 } },
+  // Ruin IV
+  { 7426, { 300, 0, 0, 0, 0, 0, 0 } },
+  // Summon Bahamut
+  { 7427, { 0, 0, 0, 0, 0, 0, 0 } },
+  // Enkindle Bahamut
+  { 7429, { 650, 0, 0, 0, 0, 0, 0 } },
+  // Thin Air
+  { 7430, { 0, 0, 0, 0, 0, 0, 0 } },
+  // Stone IV
+  { 7431, { 280, 0, 0, 0, 0, 0, 0 } },
+  // Divine Benison
+  { 7432, { 0, 0, 0, 0, 0, 0, 0 } },
+  // Plenary Indulgence
+  { 7433, { 0, 0, 0, 0, 0, 200, 0 } },
+  // Excogitation
+  { 7434, { 0, 0, 0, 0, 0, 800, 0 } },
+  // Broil II
+  { 7435, { 260, 0, 0, 0, 0, 0, 0 } },
+  // Chain Stratagem
+  { 7436, { 0, 0, 0, 0, 0, 0, 0 } },
+  // Aetherpact
+  { 7437, { 0, 0, 0, 0, 0, 0, 0 } },
+  // Earthly Star
+  { 7439, { 100, 0, 0, 0, 0, 540, 0 } },
+  // Malefic III
+  { 7442, { 210, 0, 0, 0, 0, 0, 0 } },
+  // Minor Arcana
+  { 7443, { 0, 0, 0, 0, 0, 0, 0 } },
+  // Lord of Crowns
+  { 7444, { 0, 0, 0, 0, 0, 0, 0 } },
+  // Lady of Crowns
+  { 7445, { 0, 0, 0, 0, 0, 0, 0 } },
+  // Thunder II
+  { 7447, { 30, 0, 0, 0, 0, 0, 0 } },
+  // Sleeve Draw
+  { 7448, { 0, 0, 0, 0, 0, 0, 0 } },
+  // Hakaze
+  { 7477, { 200, 0, 0, 0, 0, 0, 0 } },
+  // Jinpu
+  { 7478, { 100, 320, 0, 0, 0, 0, 0 } },
+  // Shifu
+  { 7479, { 100, 320, 0, 0, 0, 0, 0 } },
+  // Yukikaze
+  { 7480, { 100, 360, 0, 0, 0, 0, 0 } },
+  // Gekko
+  { 7481, { 100, 480, 0, 0, 0, 0, 0 } },
+  // Kasha
+  { 7482, { 100, 480, 0, 0, 0, 0, 0 } },
+  // Fuga
+  { 7483, { 100, 0, 0, 0, 0, 0, 0 } },
+  // Mangetsu
+  { 7484, { 100, 160, 0, 0, 0, 0, 0 } },
+  // Oka
+  { 7485, { 100, 160, 0, 0, 0, 0, 0 } },
+  // Enpi
+  { 7486, { 100, 0, 0, 0, 0, 0, 0 } },
+  // Midare Setsugekka
+  { 7487, { 800, 0, 0, 0, 0, 0, 0 } },
+  // Tenka Goken
+  { 7488, { 360, 0, 0, 0, 0, 0, 0 } },
+  // Higanbana
+  { 7489, { 250, 0, 0, 0, 0, 0, 0 } },
+  // Hissatsu: Shinten
+  { 7490, { 320, 0, 0, 0, 0, 0, 0 } },
+  // Hissatsu: Kyuten
+  { 7491, { 150, 0, 0, 0, 0, 0, 0 } },
+  // Hissatsu: Gyoten
+  { 7492, { 100, 0, 0, 0, 0, 0, 0 } },
+  // Hissatsu: Yaten
+  { 7493, { 100, 0, 0, 0, 0, 0, 0 } },
+  // Hissatsu: Kaiten
+  { 7494, { 0, 0, 0, 0, 0, 0, 0 } },
+  // Hagakure
+  { 7495, { 0, 0, 0, 0, 0, 0, 0 } },
+  // Hissatsu: Guren
+  { 7496, { 850, 0, 0, 0, 0, 0, 0 } },
+  // Meditate
+  { 7497, { 0, 0, 0, 0, 0, 0, 0 } },
+  // Third Eye
+  { 7498, { 0, 0, 0, 0, 0, 0, 0 } },
+  // Meikyo Shisui
+  { 7499, { 0, 0, 0, 0, 0, 0, 0 } },
+  // Hissatsu: Seigan
+  { 7501, { 220, 0, 0, 0, 0, 0, 0 } },
+  // Merciful Eyes
+  { 7502, { 0, 0, 0, 0, 0, 200, 0 } },
+  // Jolt
+  { 7503, { 180, 0, 0, 0, 0, 0, 0 } },
+  // Riposte
+  { 7504, { 130, 0, 0, 0, 0, 0, 0 } },
+  // Verthunder
+  { 7505, { 0, 0, 0, 0, 0, 0, 0 } },
+  // Corps-a-corps
+  { 7506, { 130, 0, 0, 0, 0, 0, 0 } },
+  // Veraero
+  { 7507, { 0, 0, 0, 0, 0, 0, 0 } },
+  // Scatter
+  { 7509, { 120, 0, 0, 0, 0, 0, 0 } },
+  // Verfire
+  { 7510, { 0, 0, 0, 0, 0, 0, 0 } },
+  // Verstone
+  { 7511, { 0, 0, 0, 0, 0, 0, 0 } },
+  // Zwerchhau
+  { 7512, { 100, 150, 0, 0, 0, 0, 0 } },
+  // Moulinet
+  { 7513, { 60, 0, 0, 0, 0, 0, 0 } },
+  // Vercure
+  { 7514, { 0, 0, 0, 0, 0, 350, 0 } },
+  // Displacement
+  { 7515, { 0, 0, 0, 0, 0, 0, 0 } },
+  // Redoublement
+  { 7516, { 100, 230, 0, 0, 0, 0, 0 } },
+  // Fleche
+  { 7517, { 420, 0, 0, 0, 0, 0, 0 } },
+  // Acceleration
+  { 7518, { 0, 0, 0, 0, 0, 0, 0 } },
+  // Contre Sixte
+  { 7519, { 380, 0, 0, 0, 0, 0, 0 } },
+  // Embolden
+  { 7520, { 0, 0, 0, 0, 0, 0, 0 } },
+  // Manafication
+  { 7521, { 0, 0, 0, 0, 0, 0, 0 } },
+  // Verraise
+  { 7523, { 0, 0, 0, 0, 0, 0, 0 } },
+  // Jolt II
+  { 7524, { 280, 0, 0, 0, 0, 0, 0 } },
+  // Verflare
+  { 7525, { 600, 0, 0, 0, 0, 0, 0 } },
+  // Verholy
+  { 7526, { 600, 0, 0, 0, 0, 0, 0 } },
+  // Enchanted Riposte
+  { 7527, { 210, 0, 0, 0, 0, 0, 0 } },
+  // Enchanted Zwerchhau
+  { 7528, { 100, 290, 0, 0, 0, 0, 0 } },
+  // Enchanted Redoublement
+  { 7529, { 100, 470, 0, 0, 0, 0, 0 } },
+  // Enchanted Moulinet
+  { 7530, { 200, 0, 0, 0, 0, 0, 0 } },
+  // Magitek Cannon
+  { 7619, { 0, 0, 0, 0, 0, 0, 0 } },
+  // Photon Stream
+  { 7620, { 0, 0, 0, 0, 0, 0, 0 } },
+  // Diffractive Magitek Cannon
+  { 7621, { 0, 0, 0, 0, 0, 0, 0 } },
+  // High-powered Magitek Cannon
+  { 7622, { 0, 0, 0, 0, 0, 0, 0 } },
+  // Doom of the Living
+  { 7861, { 0, 0, 0, 0, 0, 0, 0 } },
+  // Vermilion Scourge
+  { 7862, { 0, 0, 0, 0, 0, 0, 0 } },
+  // Iaijutsu
+  { 7867, { 0, 0, 0, 0, 0, 0, 0 } },
+  // Dissolve Union
+  { 7869, { 0, 0, 0, 0, 0, 0, 0 } },
+  // Stellar Detonation
+  { 8324, { 100, 0, 0, 0, 0, 540, 0 } },
+  // Broken Ridge
+  { 8395, { 0, 0, 0, 0, 0, 0, 0 } },
+  // Magitek Pulse
+  { 8624, { 0, 0, 0, 0, 0, 0, 0 } },
+  // Magitek Thunder
+  { 8625, { 0, 0, 0, 0, 0, 0, 0 } },
+  // attack
+  { 8687, { 0, 0, 0, 0, 0, 0, 0 } },
+  // Katon
+  { 9012, { 0, 0, 0, 0, 0, 0, 0 } },
+  // Remove Barrel
+  { 9015, { 0, 0, 0, 0, 0, 0, 0 } },
+  // Tenka Goken
+  { 9143, { 0, 0, 0, 0, 0, 0, 0 } },
+  // Thunderous Force
+  { 9294, { 0, 0, 0, 0, 0, 0, 0 } },
+  // Raiton
+  { 9301, { 0, 0, 0, 0, 0, 0, 0 } },
+  // Raiton
+  { 9302, { 0, 0, 0, 0, 0, 0, 0 } },
+  // Bishop Overdrive
+  { 9372, { 0, 0, 0, 0, 0, 0, 0 } },
+  // Undraw
+  { 9629, { 0, 0, 0, 0, 0, 0, 0 } },
+  // Self-detonate
+  { 9775, { 0, 0, 0, 0, 0, 0, 0 } },
+  // Shatterstone
+  { 9823, { 0, 0, 0, 0, 0, 0, 0 } },
+  // attack
+  { 9996, { 0, 0, 0, 0, 0, 0, 0 } },
+  // Ungarmax
+  { 10001, { 0, 0, 0, 0, 0, 0, 0 } },
+  // Starstorm
+  { 10894, { 0, 0, 0, 0, 0, 0, 0 } },
+  // attack
+  { 10946, { 0, 0, 0, 0, 0, 0, 0 } },
+  // attack
+  { 10947, { 0, 0, 0, 0, 0, 0, 0 } },
+  // Ruin III
+  { 11191, { 200, 0, 0, 0, 0, 0, 0 } },
+  // Physick
+  { 11192, { 0, 0, 0, 0, 0, 400, 0 } },
+  // Starstorm
+  { 11193, { 3600, 0, 0, 0, 0, 0, 0 } },
+  // Snort
+  { 11383, { 0, 0, 0, 0, 0, 0, 0 } },
+  // 4-tonze Weight
+  { 11384, { 200, 0, 0, 0, 0, 0, 0 } },
+  // Water Cannon
+  { 11385, { 200, 0, 0, 0, 0, 0, 0 } },
+  // Song of Torment
+  { 11386, { 50, 0, 0, 0, 0, 0, 0 } },
+  // High Voltage
+  { 11387, { 180, 0, 0, 0, 0, 0, 0 } },
+  // Bad Breath
+  { 11388, { 0, 0, 0, 0, 0, 0, 0 } },
+  // Flying Frenzy
+  { 11389, { 150, 0, 0, 0, 0, 0, 0 } },
+  // Aqua Breath
+  { 11390, { 140, 0, 0, 0, 0, 0, 0 } },
+  // Plaincracker
+  { 11391, { 220, 0, 0, 0, 0, 0, 0 } },
+  // Acorn Bomb
+  { 11392, { 0, 0, 0, 0, 0, 0, 0 } },
+  // Bristle
+  { 11393, { 0, 0, 0, 0, 0, 0, 0 } },
+  // Mind Blast
+  { 11394, { 200, 0, 0, 0, 0, 0, 0 } },
+  // Blood Drain
+  { 11395, { 50, 0, 0, 0, 0, 0, 0 } },
+  // Bomb Toss
+  { 11396, { 200, 0, 0, 0, 0, 0, 0 } },
+  // 1000 Needles
+  { 11397, { 0, 0, 0, 0, 0, 0, 0 } },
+  // Drill Cannons
+  { 11398, { 200, 0, 0, 0, 0, 0, 0 } },
+  // the Look
+  { 11399, { 220, 0, 0, 0, 0, 0, 0 } },
+  // Sharpened Knife
+  { 11400, { 220, 0, 0, 0, 0, 0, 0 } },
+  // Loom
+  { 11401, { 0, 0, 0, 0, 0, 0, 0 } },
+  // Flame Thrower
+  { 11402, { 220, 0, 0, 0, 0, 0, 0 } },
+  // Faze
+  { 11403, { 0, 0, 0, 0, 0, 0, 0 } },
+  // Glower
+  { 11404, { 220, 0, 0, 0, 0, 0, 0 } },
+  // Missile
+  { 11405, { 0, 0, 0, 0, 0, 0, 0 } },
+  // White Wind
+  { 11406, { 0, 0, 0, 0, 0, 0, 0 } },
+  // Final Sting
+  { 11407, { 2000, 0, 0, 0, 0, 0, 0 } },
+  // Self-destruct
+  { 11408, { 1500, 0, 0, 0, 0, 0, 0 } },
+  // Transfusion
+  { 11409, { 0, 0, 0, 0, 0, 0, 0 } },
+  // Toad Oil
+  { 11410, { 0, 0, 0, 0, 0, 0, 0 } },
+  // Off-guard
+  { 11411, { 0, 0, 0, 0, 0, 0, 0 } },
+  // Sticky Tongue
+  { 11412, { 0, 0, 0, 0, 0, 0, 0 } },
+  // Tail Screw
+  { 11413, { 0, 0, 0, 0, 0, 0, 0 } },
+  // Level 5 Petrify
+  { 11414, { 0, 0, 0, 0, 0, 0, 0 } },
+  // Moon Flute
+  { 11415, { 0, 0, 0, 0, 0, 0, 0 } },
+  // Doom
+  { 11416, { 0, 0, 0, 0, 0, 0, 0 } },
+  // Mighty Guard
+  { 11417, { 0, 0, 0, 0, 0, 0, 0 } },
+  // Ice Spikes
+  { 11418, { 0, 0, 0, 0, 0, 0, 0 } },
+  // the Ram's Voice
+  { 11419, { 220, 0, 0, 0, 0, 0, 0 } },
+  // the Dragon's Voice
+  { 11420, { 200, 0, 0, 0, 0, 0, 0 } },
+  // Peculiar Light
+  { 11421, { 0, 0, 0, 0, 0, 0, 0 } },
+  // Ink Jet
+  { 11422, { 200, 0, 0, 0, 0, 0, 0 } },
+  // Flying Sardine
+  { 11423, { 10, 0, 0, 0, 0, 0, 0 } },
+  // Diamondback
+  { 11424, { 0, 0, 0, 0, 0, 0, 0 } },
+  // Fire Angon
+  { 11425, { 200, 0, 0, 0, 0, 0, 0 } },
+  // Feather Rain
+  { 11426, { 220, 0, 0, 0, 0, 0, 0 } },
+  // Eruption
+  { 11427, { 300, 0, 0, 0, 0, 0, 0 } },
+  // Mountain Buster
+  { 11428, { 400, 0, 0, 0, 0, 0, 0 } },
+  // Shock Strike
+  { 11429, { 400, 0, 0, 0, 0, 0, 0 } },
+  // Glass Dance
+  { 11430, { 350, 0, 0, 0, 0, 0, 0 } },
+  // Veil of the Whorl
+  { 11431, { 0, 0, 0, 0, 0, 0, 0 } },
+  // Tri-shackle
+  { 11482, { 30, 0, 0, 0, 0, 0, 0 } },
+  // attack
+  { 11784, { 0, 0, 0, 0, 0, 0, 0 } },
+  // Stone IV of the Seventh Dawn
+  { 13423, { 140, 0, 0, 0, 0, 0, 0 } },
+  // Aero II of the Seventh Dawn
+  { 13424, { 50, 0, 0, 0, 0, 0, 0 } },
+  // Cure II of the Seventh Dawn
+  { 13425, { 0, 0, 0, 0, 0, 700, 0 } },
+  // Aetherwell
+  { 13426, { 0, 0, 0, 0, 0, 0, 0 } },
+  // Thunderous Force
+  { 14587, { 0, 0, 0, 0, 0, 0, 0 } },
+  // Kyokufu
+  { 14840, { 180, 0, 0, 0, 0, 0, 0 } },
+  // Ajisai
+  { 14841, { 100, 0, 0, 0, 0, 0, 0 } },
+  // Hissatsu: Gyoten
+  { 14842, { 100, 0, 0, 0, 0, 0, 0 } },
+  // 冥界恐叫打
+  { 14843, { 0, 0, 0, 0, 0, 0, 0 } },
+  // Second Wind
+  { 15375, { 0, 0, 0, 0, 0, 500, 0 } },
+  // Interject
+  { 15537, { 0, 0, 0, 0, 0, 0, 0 } },
+  // Fight or Flight
+  { 15870, { 0, 0, 0, 0, 0, 0, 0 } },
+  // Cascade
+  { 15989, { 250, 0, 0, 0, 0, 0, 0 } },
+  // Fountain
+  { 15990, { 100, 300, 0, 0, 0, 0, 0 } },
+  // Reverse Cascade
+  { 15991, { 300, 0, 0, 0, 0, 0, 0 } },
+  // Fountainfall
+  { 15992, { 350, 0, 0, 0, 0, 0, 0 } },
+  // Windmill
+  { 15993, { 150, 0, 0, 0, 0, 0, 0 } },
+  // Bladeshower
+  { 15994, { 100, 200, 0, 0, 0, 0, 0 } },
+  // Rising Windmill
+  { 15995, { 300, 0, 0, 0, 0, 0, 0 } },
+  // Bloodshower
+  { 15996, { 350, 0, 0, 0, 0, 0, 0 } },
+  // Standard Step
+  { 15997, { 0, 0, 0, 0, 0, 0, 0 } },
+  // Technical Step
+  { 15998, { 0, 0, 0, 0, 0, 0, 0 } },
+  // Emboite
+  { 15999, { 0, 0, 0, 0, 0, 0, 0 } },
+  // Entrechat
+  { 16000, { 0, 0, 0, 0, 0, 0, 0 } },
+  // Jete
+  { 16001, { 0, 0, 0, 0, 0, 0, 0 } },
+  // Pirouette
+  { 16002, { 0, 0, 0, 0, 0, 0, 0 } },
+  // Standard Finish
+  { 16003, { 0, 0, 0, 0, 0, 0, 0 } },
+  // Technical Finish
+  { 16004, { 0, 0, 0, 0, 0, 0, 0 } },
+  // Saber Dance
+  { 16005, { 600, 0, 0, 0, 0, 0, 0 } },
+  // Closed Position
+  { 16006, { 0, 0, 0, 0, 0, 0, 0 } },
+  // Fan Dance
+  { 16007, { 150, 0, 0, 0, 0, 0, 0 } },
+  // Fan Dance II
+  { 16008, { 100, 0, 0, 0, 0, 0, 0 } },
+  // Fan Dance III
+  { 16009, { 200, 0, 0, 0, 0, 0, 0 } },
+  // En Avant
+  { 16010, { 0, 0, 0, 0, 0, 0, 0 } },
+  // Devilment
+  { 16011, { 0, 0, 0, 0, 0, 0, 0 } },
+  // Shield Samba
+  { 16012, { 0, 0, 0, 0, 0, 0, 0 } },
+  // Flourish
+  { 16013, { 0, 0, 0, 0, 0, 0, 0 } },
+  // Improvisation
+  { 16014, { 0, 0, 0, 0, 0, 0, 0 } },
+  // Curing Waltz
+  { 16015, { 0, 0, 0, 0, 0, 300, 0 } },
+  // Keen Edge
+  { 16137, { 200, 0, 0, 0, 0, 0, 0 } },
+  // No Mercy
+  { 16138, { 0, 0, 0, 0, 0, 0, 0 } },
+  // Brutal Shell
+  { 16139, { 100, 300, 0, 0, 0, 150, 0 } },
+  // Camouflage
+  { 16140, { 0, 0, 0, 0, 0, 0, 0 } },
+  // Demon Slice
+  { 16141, { 150, 0, 0, 0, 0, 0, 0 } },
+  // Royal Guard
+  { 16142, { 0, 0, 0, 0, 0, 0, 0 } },
+  // Lightning Shot
+  { 16143, { 150, 0, 0, 0, 0, 0, 0 } },
+  // Danger Zone
+  { 16144, { 350, 0, 0, 0, 0, 0, 0 } },
+  // Solid Barrel
+  { 16145, { 100, 400, 0, 0, 0, 0, 0 } },
+  // Gnashing Fang
+  { 16146, { 450, 0, 0, 0, 0, 0, 0 } },
+  // Savage Claw
+  { 16147, { 550, 0, 0, 0, 0, 0, 0 } },
+  // Nebula
+  { 16148, { 0, 0, 0, 0, 0, 0, 0 } },
+  // Demon Slaughter
+  { 16149, { 100, 250, 0, 0, 0, 0, 0 } },
+  // Wicked Talon
+  { 16150, { 650, 0, 0, 0, 0, 0, 0 } },
+  // Aurora
+  { 16151, { 0, 0, 0, 0, 0, 200, 0 } },
+  // Superbolide
+  { 16152, { 0, 0, 0, 0, 0, 0, 0 } },
+  // Sonic Break
+  { 16153, { 300, 0, 0, 0, 0, 0, 0 } },
+  // Rough Divide
+  { 16154, { 200, 0, 0, 0, 0, 0, 0 } },
+  // Continuation
+  { 16155, { 0, 0, 0, 0, 0, 0, 0 } },
+  // Jugular Rip
+  { 16156, { 260, 0, 0, 0, 0, 0, 0 } },
+  // Abdomen Tear
+  { 16157, { 280, 0, 0, 0, 0, 0, 0 } },
+  // Eye Gouge
+  { 16158, { 300, 0, 0, 0, 0, 0, 0 } },
+  // Bow Shock
+  { 16159, { 200, 0, 0, 0, 0, 0, 0 } },
+  // Heart of Light
+  { 16160, { 0, 0, 0, 0, 0, 0, 0 } },
+  // Heart of Stone
+  { 16161, { 0, 0, 0, 0, 0, 0, 0 } },
+  // Burst Strike
+  { 16162, { 500, 0, 0, 0, 0, 0, 0 } },
+  // Fated Circle
+  { 16163, { 320, 0, 0, 0, 0, 0, 0 } },
+  // Bloodfest
+  { 16164, { 0, 0, 0, 0, 0, 0, 0 } },
+  // Blasting Zone
+  { 16165, { 800, 0, 0, 0, 0, 0, 0 } },
+  // Single Standard Finish
+  { 16191, { 0, 0, 0, 0, 0, 0, 0 } },
+  // Double Standard Finish
+  { 16192, { 0, 0, 0, 0, 0, 0, 0 } },
+  // Single Technical Finish
+  { 16193, { 0, 0, 0, 0, 0, 0, 0 } },
+  // Double Technical Finish
+  { 16194, { 0, 0, 0, 0, 0, 0, 0 } },
+  // Triple Technical Finish
+  { 16195, { 0, 0, 0, 0, 0, 0, 0 } },
+  // Quadruple Technical Finish
+  { 16196, { 0, 0, 0, 0, 0, 0, 0 } },
+  // Physick
+  { 16230, { 0, 0, 0, 0, 0, 400, 0 } },
+  // Rightful Sword
+  { 16269, { 0, 0, 0, 0, 0, 0, 0 } },
+  // Brutal Shell
+  { 16418, { 0, 0, 0, 0, 0, 0, 0 } },
+  // Keen Edge
+  { 16434, { 0, 0, 0, 0, 0, 0, 0 } },
+  // Solid Barrel
+  { 16435, { 0, 0, 0, 0, 0, 0, 0 } },
+  // Soothing Potion
+  { 16436, { 0, 0, 0, 0, 0, 0, 0 } },
+  // Shining Blade
+  { 16437, { 0, 0, 0, 0, 0, 0, 0 } },
+  // Perfect Deception
+  { 16438, { 0, 0, 0, 0, 0, 0, 0 } },
+  // Leap of Faith
+  { 16439, { 0, 0, 0, 0, 0, 0, 0 } },
+  // Prominence
+  { 16457, { 100, 220, 0, 0, 0, 0, 5 } },
+  // Holy Circle
+  { 16458, { 250, 0, 0, 0, 0, 0, 0 } },
+  // Confiteor
+  { 16459, { 800, 0, 0, 0, 0, 0, 0 } },
+  // Atonement
+  { 16460, { 550, 0, 0, 0, 0, 0, 0 } },
+  // Intervene
+  { 16461, { 200, 0, 0, 0, 0, 0, 0 } },
+  // Mythril Tempest
+  { 16462, { 100, 200, 0, 0, 0, 0, 0 } },
+  // Chaotic Cyclone
+  { 16463, { 400, 0, 0, 0, 0, 0, 0 } },
+  // Nascent Flash
+  { 16464, { 0, 0, 0, 0, 0, 0, 0 } },
+  // Inner Chaos
+  { 16465, { 920, 0, 0, 0, 0, 0, 0 } },
+  // Flood of Darkness
+  { 16466, { 250, 0, 0, 0, 0, 0, 0 } },
+  // Edge of Darkness
+  { 16467, { 350, 0, 0, 0, 0, 0, 0 } },
+  // Stalwart Soul
+  { 16468, { 100, 160, 0, 0, 0, 0, 6 } },
+  // Flood of Shadow
+  { 16469, { 300, 0, 0, 0, 0, 0, 0 } },
+  // Edge of Shadow
+  { 16470, { 500, 0, 0, 0, 0, 0, 0 } },
+  // Dark Missionary
+  { 16471, { 0, 0, 0, 0, 0, 0, 0 } },
+  // Living Shadow
+  { 16472, { 0, 0, 0, 0, 0, 0, 0 } },
+  // Four-point Fury
+  { 16473, { 120, 0, 0, 0, 0, 0, 0 } },
+  // Enlightenment
+  { 16474, { 220, 0, 0, 0, 0, 0, 0 } },
+  // Anatman
+  { 16475, { 0, 0, 0, 0, 0, 0, 0 } },
+  // Six-sided Star
+  { 16476, { 400, 0, 0, 0, 0, 0, 0 } },
+  // Coerthan Torment
+  { 16477, { 100, 230, 0, 0, 0, 0, 0 } },
+  // High Jump
+  { 16478, { 400, 0, 0, 0, 0, 0, 0 } },
+  // Raiden Thrust
+  { 16479, { 330, 0, 0, 0, 0, 0, 0 } },
+  // Stardiver
+  { 16480, { 600, 0, 0, 0, 0, 0, 0 } },
+  // Hissatsu: Senei
+  { 16481, { 1100, 0, 0, 0, 0, 0, 0 } },
+  // Ikishoten
+  { 16482, { 0, 0, 0, 0, 0, 0, 0 } },
+  // Tsubame-gaeshi
+  { 16483, { 0, 0, 0, 0, 0, 0, 0 } },
+  // Kaeshi: Higanbana
+  { 16484, { 375, 0, 0, 0, 0, 0, 0 } },
+  // Kaeshi: Goken
+  { 16485, { 540, 0, 0, 0, 0, 0, 0 } },
+  // Kaeshi: Setsugekka
+  { 16486, { 1200, 0, 0, 0, 0, 0, 0 } },
+  // Shoha
+  { 16487, { 400, 0, 0, 0, 0, 0, 0 } },
+  // Hakke Mujinsatsu
+  { 16488, { 100, 140, 0, 0, 0, 0, 0 } },
+  // Meisui
+  { 16489, { 0, 0, 0, 0, 0, 0, 0 } },
+  // Goka Mekkyaku
+  { 16491, { 750, 0, 0, 0, 0, 0, 0 } },
+  // Hyosho Ranryu
+  { 16492, { 1200, 0, 0, 0, 0, 0, 0 } },
+  // Bunshin
+  { 16493, { 0, 0, 0, 0, 0, 0, 0 } },
+  // Shadowbite
+  { 16494, { 100, 0, 0, 0, 0, 0, 0 } },
+  // Burst Shot
+  { 16495, { 230, 0, 0, 0, 0, 0, 0 } },
+  // Apex Arrow
+  { 16496, { 120, 0, 0, 0, 0, 0, 0 } },
+  // Auto Crossbow
+  { 16497, { 180, 0, 0, 0, 0, 0, 0 } },
+  // Drill
+  { 16498, { 700, 0, 0, 0, 0, 0, 0 } },
+  // Bioblaster
+  { 16499, { 60, 0, 0, 0, 0, 0, 0 } },
+  // Air Anchor
+  { 16500, { 700, 0, 0, 0, 0, 0, 0 } },
+  // Automaton Queen
+  { 16501, { 0, 0, 0, 0, 0, 0, 0 } },
+  // Queen Overdrive
+  { 16502, { 0, 0, 0, 0, 0, 0, 0 } },
+  // Despair
+  { 16505, { 380, 0, 0, 0, 0, 0, 0 } },
+  // Umbral Soul
+  { 16506, { 0, 0, 0, 0, 0, 0, 0 } },
+  // Xenoglossy
+  { 16507, { 750, 0, 0, 0, 0, 0, 0 } },
+  // Energy Drain
+  { 16508, { 100, 0, 0, 0, 0, 0, 0 } },
+  // Egi Assault
+  { 16509, { 0, 0, 0, 0, 0, 0, 0 } },
+  // Energy Siphon
+  { 16510, { 40, 0, 0, 0, 0, 0, 0 } },
+  // Outburst
+  { 16511, { 0, 0, 0, 0, 0, 0, 0 } },
+  // Egi Assault II
+  { 16512, { 0, 0, 0, 0, 0, 0, 0 } },
+  // Firebird Trance
+  { 16513, { 0, 0, 0, 0, 0, 0, 0 } },
+  // Fountain of Fire
+  { 16514, { 250, 0, 0, 0, 0, 0, 0 } },
+  // Brand of Purgatory
+  { 16515, { 350, 0, 0, 0, 0, 0, 0 } },
+  // Enkindle Phoenix
+  { 16516, { 650, 0, 0, 0, 0, 0, 0 } },
+  // Verthunder II
+  { 16524, { 0, 0, 0, 0, 0, 0, 0 } },
+  // Veraero II
+  { 16525, { 0, 0, 0, 0, 0, 0, 0 } },
+  // Impact
+  { 16526, { 220, 0, 0, 0, 0, 0, 0 } },
+  // Engagement
+  { 16527, { 150, 0, 0, 0, 0, 0, 0 } },
+  // Enchanted Reprise
+  { 16528, { 300, 0, 0, 0, 0, 0, 0 } },
+  // Reprise
+  { 16529, { 100, 0, 0, 0, 0, 0, 0 } },
+  // Scorch
+  { 16530, { 700, 0, 0, 0, 0, 0, 0 } },
+  // Afflatus Solace
+  { 16531, { 0, 0, 0, 0, 0, 700, 0 } },
+  // Dia
+  { 16532, { 120, 0, 0, 0, 0, 0, 0 } },
+  // Glare
+  { 16533, { 300, 0, 0, 0, 0, 0, 0 } },
+  // Afflatus Rapture
+  { 16534, { 0, 0, 0, 0, 0, 300, 0 } },
+  // Afflatus Misery
+  { 16535, { 900, 0, 0, 0, 0, 0, 0 } },
+  // Temperance
+  { 16536, { 0, 0, 0, 0, 0, 0, 0 } },
+  // Whispering Dawn
+  { 16537, { 0, 0, 0, 0, 0, 120, 0 } },
+  // Fey Illumination
+  { 16538, { 0, 0, 0, 0, 0, 0, 0 } },
+  // Art of War
+  { 16539, { 0, 0, 0, 0, 0, 0, 0 } },
+  // Biolysis
+  { 16540, { 0, 0, 0, 0, 0, 0, 0 } },
+  // Broil III
+  { 16541, { 280, 0, 0, 0, 0, 0, 0 } },
+  // Recitation
+  { 16542, { 0, 0, 0, 0, 0, 0, 0 } },
+  // Fey Blessing
+  { 16543, { 0, 0, 0, 0, 0, 350, 0 } },
+  // Summon Seraph
+  { 16545, { 0, 0, 0, 0, 0, 0, 0 } },
+  // Consolation
+  { 16546, { 0, 0, 0, 0, 0, 300, 0 } },
+  // Firebird Trance
+  { 16549, { 0, 0, 0, 0, 0, 0, 0 } },
+  // Divination
+  { 16552, { 0, 0, 0, 0, 0, 0, 0 } },
+  // Celestial Opposition
+  { 16553, { 0, 0, 0, 0, 0, 200, 0 } },
+  // Combust III
+  { 16554, { 0, 0, 0, 0, 0, 0, 0 } },
+  // Malefic IV
+  { 16555, { 250, 0, 0, 0, 0, 0, 0 } },
+  // Celestial Intersection
+  { 16556, { 0, 0, 0, 0, 0, 200, 0 } },
+  // Horoscope
+  { 16557, { 0, 0, 0, 0, 0, 200, 0 } },
+  // Horoscope
+  { 16558, { 0, 0, 0, 0, 0, 0, 0 } },
+  // Neutral Sect
+  { 16559, { 0, 0, 0, 0, 0, 0, 0 } },
+  // Ronkan Fire III
+  { 16574, { 430, 0, 0, 0, 0, 0, 0 } },
+  // Ronkan Blizzard III
+  { 16575, { 240, 0, 0, 0, 0, 0, 0 } },
+  // Ronkan Thunder III
+  { 16576, { 200, 0, 0, 0, 0, 0, 0 } },
+  // Ronkan Flare
+  { 16577, { 460, 0, 0, 0, 0, 0, 0 } },
+  // Falling Star
+  { 16578, { 1500, 0, 0, 0, 0, 0, 0 } },
+  // Detonator
+  { 16766, { 0, 0, 0, 0, 0, 0, 0 } },
+  // Fast Blade
+  { 16788, { 0, 0, 0, 0, 0, 0, 0 } },
+  // Sunshadow
+  { 16789, { 0, 0, 0, 0, 0, 0, 0 } },
+  // Assault I: Glittering Topaz
+  { 16791, { 0, 0, 0, 0, 0, 0, 0 } },
+  // Assault II: Shining Topaz
+  { 16792, { 200, 0, 0, 0, 0, 0, 0 } },
+  // Assault I: Downburst
+  { 16793, { 100, 0, 0, 0, 0, 0, 0 } },
+  // Assault II: Glittering Emerald
+  { 16794, { 30, 0, 0, 0, 0, 0, 0 } },
+  // Assault I: Earthen Armor
+  { 16795, { 0, 0, 0, 0, 0, 0, 0 } },
+  // Assault II: Mountain Buster
+  { 16796, { 250, 0, 0, 0, 0, 0, 0 } },
+  // Assault I: Aerial Slash
+  { 16797, { 150, 0, 0, 0, 0, 0, 0 } },
+  // Assault II: Slipstream
+  { 16798, { 50, 0, 0, 0, 0, 0, 0 } },
+  // Assault I: Crimson Cyclone
+  { 16799, { 250, 0, 0, 0, 0, 0, 0 } },
+  // Assault II: Flaming Crush
+  { 16800, { 250, 0, 0, 0, 0, 0, 0 } },
+  // Enkindle: Earthen Fury
+  { 16801, { 300, 0, 0, 0, 0, 0, 0 } },
+  // Enkindle: Aerial Blast
+  { 16802, { 350, 0, 0, 0, 0, 0, 0 } },
+  // Enkindle: Inferno
+  { 16803, { 300, 0, 0, 0, 0, 0, 0 } },
+  // Rough Divide
+  { 16804, { 200, 0, 0, 0, 0, 0, 0 } },
+  // Tactician
+  { 16889, { 0, 0, 0, 0, 0, 0, 0 } },
+  // Swashbuckler
+  { 16984, { 0, 0, 0, 0, 0, 0, 0 } },
+  // Greatest Eclipse
+  { 16985, { 0, 0, 0, 0, 0, 0, 0 } },
+  // Ronkan Cure II
+  { 17000, { 0, 0, 0, 0, 0, 1300, 0 } },
+  // Ronkan Medica
+  { 17001, { 0, 0, 0, 0, 0, 500, 0 } },
+  // Ronkan Esuna
+  { 17002, { 0, 0, 0, 0, 0, 0, 0 } },
+  // Ronkan Stone II
+  { 17003, { 200, 0, 0, 0, 0, 0, 0 } },
+  // Ronkan Renew
+  { 17004, { 0, 0, 0, 0, 0, 0, 0 } },
+  // Play
+  { 17055, { 0, 0, 0, 0, 0, 0, 0 } },
+  // Gunmetal Soul
+  { 17105, { 0, 0, 0, 0, 0, 0, 0 } },
+  // Crimson Lotus
+  { 17106, { 0, 0, 0, 0, 0, 0, 0 } },
+  // Acidic Bite
+  { 17122, { 300, 0, 0, 0, 0, 0, 0 } },
+  // Heavy Shot
+  { 17123, { 550, 0, 0, 0, 0, 0, 0 } },
+  // Radiant Arrow
+  { 17124, { 1100, 0, 0, 0, 0, 0, 0 } },
+  // Dulling Arrow
+  { 17125, { 0, 0, 0, 0, 0, 0, 0 } },
+  // Aspected Benefic
+  { 17151, { 0, 0, 0, 0, 0, 200, 0 } },
+  // Aspected Helios
+  { 17152, { 0, 0, 0, 0, 0, 200, 0 } },
+  // Hypercharge
+  { 17209, { 0, 0, 0, 0, 0, 0, 0 } },
+  // Summon Eos
+  { 17215, { 0, 0, 0, 0, 0, 0, 0 } },
+  // Summon Selene
+  { 17216, { 0, 0, 0, 0, 0, 0, 0 } },
+  // attack
+  { 17222, { 0, 0, 0, 0, 0, 0, 0 } },
+  // Chivalrous Spirit
+  { 17236, { 0, 0, 0, 0, 0, 1200, 0 } },
+  // Souldeep Invisibility
+  { 17291, { 0, 0, 0, 0, 0, 0, 0 } },
+  // Spinning Edge
+  { 17413, { 0, 0, 0, 0, 0, 0, 0 } },
+  // Gust Slash
+  { 17414, { 0, 0, 0, 0, 0, 0, 0 } },
+  // Aeolian Edge
+  { 17415, { 0, 0, 0, 0, 0, 0, 0 } },
+  // Shadow Fang
+  { 17416, { 0, 0, 0, 0, 0, 0, 0 } },
+  // Armor Crush
+  { 17417, { 0, 0, 0, 0, 0, 0, 0 } },
+  // Throwing Dagger
+  { 17418, { 0, 0, 0, 0, 0, 0, 0 } },
+  // Death Blossom
+  { 17419, { 0, 0, 0, 0, 0, 0, 0 } },
+  // Hakke Mujinsatsu
+  { 17420, { 0, 0, 0, 0, 0, 0, 0 } },
+  // Hunter's Prudence
+  { 17596, { 0, 0, 0, 0, 0, 1000, 0 } },
+  // Nebula
+  { 17839, { 0, 0, 0, 0, 0, 0, 0 } },
+  // Bio
+  { 17864, { 0, 0, 0, 0, 0, 0, 0 } },
+  // Bio II
+  { 17865, { 0, 0, 0, 0, 0, 0, 0 } },
+  // Ruin
+  { 17869, { 160, 0, 0, 0, 0, 0, 0 } },
+  // Ruin II
+  { 17870, { 0, 0, 0, 0, 0, 0, 0 } },
   // Smackdown
-  { 17901, { 0, 0, 0, 0, 0, 0 } },
+  { 17901, { 0, 0, 0, 0, 0, 0, 0 } },
   // 攻撃
-  { 18034, { 0, 0, 0, 0, 0, 0 } },
+  { 18034, { 0, 0, 0, 0, 0, 0, 0 } },
   // Ending
-  { 18073, { 0, 0, 0, 0, 0, 0 } },
-  // Straight Shot
-  { 18190, { 0, 0, 0, 0, 0, 0 } },
-
+  { 18073, { 0, 0, 0, 0, 0, 0, 0 } },
+  // Alpine Draft
+  { 18295, { 220, 0, 0, 0, 0, 0, 0 } },
+  // Protean Wave
+  { 18296, { 220, 0, 0, 0, 0, 0, 0 } },
+  // Northerlies
+  { 18297, { 220, 0, 0, 0, 0, 0, 0 } },
+  // Electrogenesis
+  { 18298, { 220, 0, 0, 0, 0, 0, 0 } },
+  // Kaltstrahl
+  { 18299, { 220, 0, 0, 0, 0, 0, 0 } },
+  // Abyssal Transfixion
+  { 18300, { 220, 0, 0, 0, 0, 0, 0 } },
+  // Chirp
+  { 18301, { 0, 0, 0, 0, 0, 0, 0 } },
+  // Eerie Soundwave
+  { 18302, { 0, 0, 0, 0, 0, 0, 0 } },
+  // Pom Cure
+  { 18303, { 0, 0, 0, 0, 0, 100, 0 } },
+  // Gobskin
+  { 18304, { 0, 0, 0, 0, 0, 0, 0 } },
+  // Magic Hammer
+  { 18305, { 250, 0, 0, 0, 0, 0, 0 } },
+  // Avail
+  { 18306, { 0, 0, 0, 0, 0, 0, 0 } },
+  // Frog Legs
+  { 18307, { 0, 0, 0, 0, 0, 0, 0 } },
+  // Sonic Boom
+  { 18308, { 210, 0, 0, 0, 0, 0, 0 } },
+  // Whistle
+  { 18309, { 0, 0, 0, 0, 0, 0, 0 } },
+  // White Knight's Tour
+  { 18310, { 200, 0, 0, 0, 0, 0, 0 } },
+  // Black Knight's Tour
+  { 18311, { 200, 0, 0, 0, 0, 0, 0 } },
+  // Level 5 Death
+  { 18312, { 0, 0, 0, 0, 0, 0, 0 } },
+  // Launcher
+  { 18313, { 0, 0, 0, 0, 0, 0, 0 } },
+  // Perpetual Ray
+  { 18314, { 220, 0, 0, 0, 0, 0, 0 } },
+  // Cactguard
+  { 18315, { 0, 0, 0, 0, 0, 0, 0 } },
+  // Revenge Blast
+  { 18316, { 50, 0, 0, 0, 0, 0, 0 } },
+  // Angel Whisper
+  { 18317, { 0, 0, 0, 0, 0, 0, 0 } },
+  // Exuviation
+  { 18318, { 0, 0, 0, 0, 0, 50, 0 } },
+  // Reflux
+  { 18319, { 220, 0, 0, 0, 0, 0, 0 } },
+  // Devour
+  { 18320, { 250, 0, 0, 0, 0, 0, 0 } },
+  // Condensed Libra
+  { 18321, { 0, 0, 0, 0, 0, 0, 0 } },
+  // Aetherial Mimicry
+  { 18322, { 0, 0, 0, 0, 0, 0, 0 } },
+  // Surpanakha
+  { 18323, { 200, 0, 0, 0, 0, 0, 0 } },
+  // Quasar
+  { 18324, { 300, 0, 0, 0, 0, 0, 0 } },
+  // J Kick
+  { 18325, { 300, 0, 0, 0, 0, 0, 0 } },
+  // Doom Spike
+  { 18772, { 0, 0, 0, 0, 0, 0, 0 } },
+  // Sonic Thrust
+  { 18773, { 0, 0, 0, 0, 0, 0, 0 } },
+  // Coerthan Torment
+  { 18774, { 0, 0, 0, 0, 0, 0, 0 } },
+  // Skydragon Dive
+  { 18775, { 800, 0, 0, 0, 0, 0, 0 } },
+  // Ala Morn
+  { 18776, { 3000, 0, 0, 0, 0, 0, 0 } },
+  // Drachenlance
+  { 18777, { 500, 0, 0, 0, 0, 0, 0 } },
+  // Horrid Roar
+  { 18778, { 600, 0, 0, 0, 0, 0, 0 } },
+  // Stardiver
+  { 18780, { 1500, 0, 0, 0, 0, 0, 0 } },
+  // Dragonshadow Dive
+  { 18781, { 0, 0, 0, 0, 0, 0, 0 } },
+  // Dragonshadow Dive
+  { 18782, { 0, 0, 0, 0, 0, 0, 0 } },
+  // Ten
+  { 18805, { 0, 0, 0, 0, 0, 0, 0 } },
+  // Chi
+  { 18806, { 0, 0, 0, 0, 0, 0, 0 } },
+  // Jin
+  { 18807, { 0, 0, 0, 0, 0, 0, 0 } },
+  // Fuma Shuriken
+  { 18873, { 500, 0, 0, 0, 0, 0, 0 } },
+  // Fuma Shuriken
+  { 18874, { 500, 0, 0, 0, 0, 0, 0 } },
+  // Fuma Shuriken
+  { 18875, { 500, 0, 0, 0, 0, 0, 0 } },
+  // Katon
+  { 18876, { 500, 0, 0, 0, 0, 0, 0 } },
+  // Raiton
+  { 18877, { 800, 0, 0, 0, 0, 0, 0 } },
+  // Hyoton
+  { 18878, { 400, 0, 0, 0, 0, 0, 0 } },
+  // Huton
+  { 18879, { 0, 0, 0, 0, 0, 0, 0 } },
+  // Doton
+  { 18880, { 100, 0, 0, 0, 0, 0, 0 } },
+  // Suiton
+  { 18881, { 600, 0, 0, 0, 0, 0, 0 } },
+  // Gofu
+  { 19046, { 0, 0, 0, 0, 0, 0, 0 } },
+  // Yagetsu
+  { 19047, { 0, 0, 0, 0, 0, 0, 0 } },
+  // Aqua Vitae
+  { 19218, { 0, 0, 0, 0, 0, 0, 0 } },
+  // attack
+  { 19221, { 0, 0, 0, 0, 0, 0, 0 } },
+  // Aetherial Mimicry
+  { 19238, { 0, 0, 0, 0, 0, 0, 0 } },
+  // Aetherial Mimicry
+  { 19239, { 0, 0, 0, 0, 0, 0, 0 } },
+  // Aetherial Mimicry
+  { 19240, { 0, 0, 0, 0, 0, 0, 0 } },
 };
\ No newline at end of file
diff --git a/src/world/Action/EffectBuilder.cpp b/src/world/Action/EffectBuilder.cpp
index 7068c01e..138b511e 100644
--- a/src/world/Action/EffectBuilder.cpp
+++ b/src/world/Action/EffectBuilder.cpp
@@ -31,18 +31,17 @@ uint64_t EffectBuilder::getResultDelayMs()
   return Common::Util::getTimeMs() + 850;
 }
 
-EffectResultPtr EffectBuilder::getResult( Entity::CharaPtr& chara )
+std::shared_ptr< std::vector< EffectResultPtr > > EffectBuilder::getResultList( Entity::CharaPtr& chara )
 {
   auto it = m_resolvedEffects.find( chara->getId() );
   if( it == m_resolvedEffects.end() )
   {
     // create a new one and return it
-    // todo: this feels kinda dirty but makes for easy work
-    auto result = make_EffectResult( chara, getResultDelayMs() );
+    auto resultList = std::make_shared< std::vector< EffectResultPtr > >();
 
-    m_resolvedEffects[ chara->getId() ] = result;
+    m_resolvedEffects[ chara->getId() ] = resultList;
 
-    return result;
+    return resultList;
   }
 
   return it->second;
@@ -50,43 +49,207 @@ EffectResultPtr EffectBuilder::getResult( Entity::CharaPtr& chara )
 
 void EffectBuilder::healTarget( Entity::CharaPtr& target, uint32_t amount, Common::ActionHitSeverityType severity )
 {
-  auto result = getResult( target );
-  assert( result );
+  auto resultList = getResultList( target );
+  assert( resultList );
 
-  result->heal( amount, severity );
+  EffectResultPtr nextResult = make_EffectResult( target, getResultDelayMs() );
+  nextResult->heal( amount, severity, false );
+  resultList->push_back( std::move( nextResult ) );
+}
+
+void EffectBuilder::selfHeal( Entity::CharaPtr& target, Entity::CharaPtr& source, uint32_t amount, Common::ActionHitSeverityType severity )
+{
+  auto resultList = getResultList( target );
+  assert( resultList );
+
+  EffectResultPtr nextResult = make_EffectResult( source, getResultDelayMs() ); // heal the source actor
+  nextResult->heal( amount, severity, true );
+  resultList->push_back( std::move( nextResult ) );
+}
+
+void EffectBuilder::restoreMP( Entity::CharaPtr& target, Entity::CharaPtr& source, uint32_t amount )
+{
+  auto resultList = getResultList( target );
+  assert( resultList );
+
+  EffectResultPtr nextResult = make_EffectResult( source, getResultDelayMs() ); // restore mp source actor
+  nextResult->restoreMP( amount );
+  resultList->push_back( std::move( nextResult ) );
 }
 
 void EffectBuilder::damageTarget( Entity::CharaPtr& target, uint32_t amount, Common::ActionHitSeverityType severity )
 {
-  auto result = getResult( target );
-  assert( result );
+  auto resultList = getResultList( target );
+  assert( resultList );
 
-  result->damage( amount, severity );
+  EffectResultPtr nextResult = make_EffectResult( target, getResultDelayMs() );
+  nextResult->damage( amount, severity );
+  resultList->push_back( std::move( nextResult ) );
+}
+
+void EffectBuilder::startCombo( Entity::CharaPtr& target, uint16_t actionId )
+{
+  auto resultList = getResultList( target );
+  assert( resultList  );
+
+  EffectResultPtr nextResult = make_EffectResult( target, 0 );
+  nextResult->startCombo( actionId );
+  resultList->push_back( std::move( nextResult ) );
+}
+
+void EffectBuilder::comboVisualEffect( Entity::CharaPtr& target )
+{
+  auto resultList = getResultList( target );
+  assert( resultList  );
+
+  EffectResultPtr nextResult = make_EffectResult( target, 0 );
+  nextResult->comboVisualEffect();
+  resultList->push_back( std::move( nextResult ) );
 }
 
 void EffectBuilder::buildAndSendPackets()
 {
+  auto targetCount = m_resolvedEffects.size();
   Logger::debug( "EffectBuilder result: " );
-  Logger::debug( "Targets afflicted: {}", m_resolvedEffects.size() );
+  Logger::debug( "Targets afflicted: {}", targetCount );
 
-  for( auto it = m_resolvedEffects.begin(); it != m_resolvedEffects.end(); )
+  auto globalSequence = m_sourceChara->getCurrentTerritory()->getNextEffectSequence();
+
+  while( m_resolvedEffects.size() > 0 )
   {
-    auto result = it->second;
-    Logger::debug( " - id: {}", result->getTarget()->getId() );
+    auto packet = buildNextEffectPacket( globalSequence );
+    m_sourceChara->sendToInRangeSet( packet, true );
+  }
+}
+
+std::shared_ptr< FFXIVPacketBase > EffectBuilder::buildNextEffectPacket( uint32_t globalSequence )
+{
+  auto remainingTargetCount = m_resolvedEffects.size();
+
+  if( remainingTargetCount > 1 ) // use AoeEffect packets
+  {
+    int packetSize = remainingTargetCount <= 8 ? 8 :
+                   ( remainingTargetCount <= 16 ? 16 :
+                   ( remainingTargetCount <= 24 ? 24 : 32 ) );
+
+    using EffectHeader = Server::FFXIVIpcAoeEffect< 8 >; // dummy type to access header part of the packet
+
+    FFXIVPacketBasePtr effectPacket = nullptr;
+    EffectHeader* pHeader;
+    Common::EffectEntry* pEntry;
+    uint64_t* pEffectTargetId;
+    uint16_t* pFlag;
+    switch( packetSize )
+    {
+      case 8:
+      {
+        auto p = makeZonePacket< Server::FFXIVIpcAoeEffect8 >( m_sourceChara->getId() );
+        pHeader = ( EffectHeader* )( &( p->data() ) );
+        pEntry = ( Common::EffectEntry* )( &( p->data().effects ) );
+        pEffectTargetId = ( uint64_t* )( &( p->data().effectTargetId ) );
+        pFlag = ( uint16_t* )( &( p->data().unkFlag ) );
+        effectPacket = std::move( p );
+        break;
+      }
+      case 16:
+      {
+        auto p = makeZonePacket< Server::FFXIVIpcAoeEffect16 >( m_sourceChara->getId() );
+        pHeader = ( EffectHeader* )( &( p->data() ) );
+        pEntry = ( Common::EffectEntry* )( &( p->data().effects ) );
+        pEffectTargetId = ( uint64_t* )( &( p->data().effectTargetId ) );
+        pFlag = ( uint16_t* )( &( p->data().unkFlag ) );
+        effectPacket = std::move( p );
+        break;
+      }
+      case 24:
+      {
+        auto p = makeZonePacket< Server::FFXIVIpcAoeEffect24 >( m_sourceChara->getId() );
+        pHeader = ( EffectHeader* )( &( p->data() ) );
+        pEntry = ( Common::EffectEntry* )( &( p->data().effects ) );
+        pEffectTargetId = ( uint64_t* )( &( p->data().effectTargetId ) );
+        pFlag = ( uint16_t* )( &( p->data().unkFlag ) );
+        effectPacket = std::move( p );
+        break;
+      }
+      case 32:
+      {
+        auto p = makeZonePacket< Server::FFXIVIpcAoeEffect32 >( m_sourceChara->getId() );
+        pHeader = ( EffectHeader* )( &( p->data() ) );
+        pEntry = ( Common::EffectEntry* )( &( p->data().effects ) );
+        pEffectTargetId = ( uint64_t* )( &( p->data().effectTargetId ) );
+        pFlag = ( uint16_t* )( &( p->data().unkFlag ) );
+        effectPacket = std::move( p );
+        break;
+      }
+    }
+    assert( effectPacket != nullptr );
+
+    pHeader->actionAnimationId = m_sourceChara->getId();
+    pHeader->actionId = m_actionId;
+    pHeader->actionAnimationId = static_cast< uint16_t >( m_actionId );
+    pHeader->animationTargetId = m_sourceChara->getId();
+    pHeader->someTargetId = 0xE0000000;
+    pHeader->rotation = Common::Util::floatToUInt16Rot( m_sourceChara->getRot() );
+    pHeader->effectDisplayType = Common::ActionEffectDisplayType::ShowActionName;
+    pHeader->effectCount = static_cast< uint8_t >( remainingTargetCount > packetSize ? packetSize : remainingTargetCount );
+    pHeader->sourceSequence = m_sequence;
+    pHeader->globalSequence = globalSequence;
+
+    uint8_t targetIndex = 0;
+    for( auto it = m_resolvedEffects.begin(); it != m_resolvedEffects.end(); )
+    {
+      auto resultList = it->second;
+      assert( resultList->size() > 0 );
+      auto firstResult = resultList->data()[ 0 ];
+      pEffectTargetId[ targetIndex ] = firstResult->getTarget()->getId();
+      Logger::debug( " - id: {}", pEffectTargetId[ targetIndex ] );
+
+      for( auto i = 0; i < resultList->size(); i++ )
+      {
+        auto result = resultList->data()[ i ];
+        pEntry[ targetIndex * 8 + i ] = result->buildEffectEntry();
+        m_sourceChara->getCurrentTerritory()->addEffectResult( std::move( result ) );
+      }
+      resultList->clear();
+
+      it = m_resolvedEffects.erase( it );
+
+      targetIndex++;
+
+      if( targetIndex == packetSize )
+        break;
+    }
+
+    pFlag[0] = 0x7FFF;
+    pFlag[1] = 0x7FFF;
+    pFlag[2] = 0x7FFF;
+
+    return effectPacket;
+  }
+  else
+  {
+    auto resultList = m_resolvedEffects.begin()->second;
+    assert( resultList->size() > 0 );
+    auto firstResult = resultList->data()[ 0 ];
+    Logger::debug( " - id: {}", firstResult->getTarget()->getId() );
 
     auto seq = m_sourceChara->getCurrentTerritory()->getNextEffectSequence();
 
-    auto effectPacket = std::make_shared< Server::EffectPacket >( m_sourceChara->getId(), result->getTarget()->getId(), m_actionId );
+    auto effectPacket = std::make_shared< Server::EffectPacket >( m_sourceChara->getId(), firstResult->getTarget()->getId(), m_actionId );
     effectPacket->setRotation( Common::Util::floatToUInt16Rot( m_sourceChara->getRot() ) );
     effectPacket->setSequence( seq, m_sequence );
 
-    effectPacket->addEffect( result->buildEffectEntry() );
+    for( int i = 0; i < resultList->size(); i++ )
+    {
+      auto result = resultList->data()[ i ];
+      effectPacket->addEffect( result->buildEffectEntry() );
+      m_sourceChara->getCurrentTerritory()->addEffectResult( std::move( result ) );
+    }
 
-    m_sourceChara->sendToInRangeSet( effectPacket, true );
+    resultList->clear();
 
-    // add effect to territory
-    m_sourceChara->getCurrentTerritory()->addEffectResult( std::move( result ) );
+    m_resolvedEffects.clear();
 
-    it = m_resolvedEffects.erase( it );
+    return effectPacket;
   }
 }
\ No newline at end of file
diff --git a/src/world/Action/EffectBuilder.h b/src/world/Action/EffectBuilder.h
index d58bebfe..a4699bb6 100644
--- a/src/world/Action/EffectBuilder.h
+++ b/src/world/Action/EffectBuilder.h
@@ -15,23 +15,34 @@ namespace Sapphire::World::Action
     void healTarget( Entity::CharaPtr& target, uint32_t amount,
                      Common::ActionHitSeverityType severity = Common::ActionHitSeverityType::NormalHeal );
 
+    void selfHeal( Entity::CharaPtr& target, Entity::CharaPtr& source, uint32_t amount,
+                     Common::ActionHitSeverityType severity = Common::ActionHitSeverityType::NormalHeal );
+
+    void restoreMP( Entity::CharaPtr& target, Entity::CharaPtr& source, uint32_t amount );
+
     void damageTarget( Entity::CharaPtr& target, uint32_t amount,
                        Common::ActionHitSeverityType severity = Common::ActionHitSeverityType::NormalDamage );
 
+    void startCombo( Entity::CharaPtr& target, uint16_t actionId );
+
+    void comboVisualEffect( Entity::CharaPtr& target );
+
     void buildAndSendPackets();
 
 
   private:
-    EffectResultPtr getResult( Entity::CharaPtr& chara );
+    std::shared_ptr< std::vector< EffectResultPtr > > getResultList( Entity::CharaPtr& chara );
 
     uint64_t getResultDelayMs();
 
+    std::shared_ptr< Sapphire::Network::Packets::FFXIVPacketBase > buildNextEffectPacket( uint32_t globalSequence );
+
   private:
     uint32_t m_actionId;
     uint16_t m_sequence;
 
     Entity::CharaPtr m_sourceChara;
-    std::unordered_map< uint32_t, EffectResultPtr > m_resolvedEffects;
+    std::unordered_map< uint32_t, std::shared_ptr< std::vector< EffectResultPtr > > > m_resolvedEffects;
   };
 
 }
diff --git a/src/world/Action/EffectResult.cpp b/src/world/Action/EffectResult.cpp
index daf32155..8f5782ce 100644
--- a/src/world/Action/EffectResult.cpp
+++ b/src/world/Action/EffectResult.cpp
@@ -14,7 +14,8 @@ EffectResult::EffectResult( Entity::CharaPtr target, uint64_t runAfter ) :
   m_value( 0 ),
   m_severity( Common::ActionHitSeverityType::NormalDamage ),
   m_type( Common::ActionEffectType::Nothing ),
-  m_param( 0 )
+  m_param( 0 ),
+  m_flag( 0 )
 {
 
 }
@@ -47,14 +48,36 @@ void EffectResult::damage( uint32_t amount, Common::ActionHitSeverityType severi
   m_type = Common::ActionEffectType::Damage;
 }
 
-void EffectResult::heal( uint32_t amount, Sapphire::Common::ActionHitSeverityType severity )
+void EffectResult::heal( uint32_t amount, Sapphire::Common::ActionHitSeverityType severity, bool isSelfHeal )
 {
   m_severity = severity;
   m_value = amount;
+  m_flag = isSelfHeal ? 0x80 : 0; // flag == 0x80 displays healing text at source actor
 
   m_type = Common::ActionEffectType::Heal;
 }
 
+void EffectResult::restoreMP( uint32_t amount )
+{
+  m_value = amount;
+  m_flag = 0x80;
+
+  m_type = Common::ActionEffectType::MpGain;
+}
+
+void EffectResult::startCombo( uint16_t actionId )
+{
+  m_value = actionId;
+  m_flag = 0x80;
+
+  m_type = Common::ActionEffectType::StartActionCombo;
+}
+
+void EffectResult::comboVisualEffect()
+{
+  m_type = Common::ActionEffectType::ComboVisualEffect;
+}
+
 Common::EffectEntry EffectResult::buildEffectEntry() const
 {
   Common::EffectEntry entry{};
@@ -64,6 +87,7 @@ Common::EffectEntry EffectResult::buildEffectEntry() const
   entry.hitSeverity = m_severity;
   entry.effectType = m_type;
   entry.param = m_param;
+  entry.flags = m_flag;
 
   return entry;
 }
@@ -84,6 +108,12 @@ void EffectResult::execute()
       break;
     }
 
+    case Common::ActionEffectType::MpGain:
+    {
+      m_target->restoreMP( m_value );
+      break;
+    }
+
     default:
       break;
   }
diff --git a/src/world/Action/EffectResult.h b/src/world/Action/EffectResult.h
index f1dd8b9c..3a93d13b 100644
--- a/src/world/Action/EffectResult.h
+++ b/src/world/Action/EffectResult.h
@@ -16,7 +16,10 @@ namespace Sapphire::World::Action
     explicit EffectResult( Entity::CharaPtr target, uint64_t delayMs );
 
     void damage( uint32_t amount, Common::ActionHitSeverityType severity );
-    void heal( uint32_t amount, Common::ActionHitSeverityType severity );
+    void heal( uint32_t amount, Common::ActionHitSeverityType severity, bool isSelfHeal );
+    void restoreMP( uint32_t amount );
+    void startCombo( uint16_t actionId );
+    void comboVisualEffect();
 
     Entity::CharaPtr getTarget() const;
 
@@ -40,6 +43,7 @@ namespace Sapphire::World::Action
 
     uint32_t m_value;
     uint8_t m_param;
+    uint8_t m_flag;
   };
 }
 
diff --git a/src/world/Actor/Chara.cpp b/src/world/Actor/Chara.cpp
index cd187840..6adcfcc9 100644
--- a/src/world/Actor/Chara.cpp
+++ b/src/world/Actor/Chara.cpp
@@ -438,6 +438,18 @@ void Sapphire::Entity::Chara::heal( uint32_t amount )
   sendStatusUpdate();
 }
 
+void Sapphire::Entity::Chara::restoreMP( uint32_t amount )
+{
+  if( ( m_mp + amount ) > getMaxMp() )
+  {
+    m_mp = getMaxMp();
+  }
+  else
+    m_mp += amount;
+
+  sendStatusUpdate();
+}
+
 /*!
 Send an HpMpTp update to players in range ( and potentially to self )
 TODO: poor naming, should be changed. Status is not HP. Also should be virtual
diff --git a/src/world/Actor/Chara.h b/src/world/Actor/Chara.h
index d9fea85b..697f5a6e 100644
--- a/src/world/Actor/Chara.h
+++ b/src/world/Actor/Chara.h
@@ -263,6 +263,8 @@ namespace Sapphire::Entity
 
     virtual void heal( uint32_t amount );
 
+    virtual void restoreMP( uint32_t amount );
+
     virtual bool checkAction();
 
     virtual void update( uint64_t tickCount );
diff --git a/src/world/Actor/Player.cpp b/src/world/Actor/Player.cpp
index 4ebe604d..4a6ab8d8 100644
--- a/src/world/Actor/Player.cpp
+++ b/src/world/Actor/Player.cpp
@@ -76,7 +76,8 @@ Sapphire::Entity::Player::Player( FrameworkPtr pFw ) :
   m_emoteMode( 0 ),
   m_directorInitialized( false ),
   m_onEnterEventDone( false ),
-  m_falling( false )
+  m_falling( false ),
+  m_pQueuedAction( nullptr )
 {
   m_id = 0;
   m_currentStance = Stance::Passive;
@@ -2131,3 +2132,43 @@ Sapphire::Common::ActiveLand Sapphire::Entity::Player::getActiveLand() const
 {
   return m_activeLand;
 }
+
+bool Sapphire::Entity::Player::hasQueuedAction() const
+{
+  return m_pQueuedAction != nullptr;
+}
+
+void Sapphire::Entity::Player::setQueuedAction( Sapphire::World::Action::ActionPtr pAction )
+{
+  m_pQueuedAction = nullptr; // overwrite whatever is already there
+  m_pQueuedAction = std::move( pAction );
+}
+
+bool Sapphire::Entity::Player::checkAction()
+{
+  if( m_pCurrentAction == nullptr )
+    return false;
+
+  if( m_pCurrentAction->update() )
+  {
+    if( m_pCurrentAction->isInterrupted() && m_pCurrentAction->getInterruptType() != Common::ActionInterruptType::DamageInterrupt )
+    {
+      // we moved (or whatever not damage interrupt) so we don't want to execute queued cast
+      m_pQueuedAction = nullptr;
+    }
+    m_pCurrentAction = nullptr;
+
+    if( hasQueuedAction() )
+    {
+      sendDebug( "Queued skill start: {0}", m_pQueuedAction->getId() );
+      if( m_pQueuedAction->hasCastTime() )
+      {
+        setCurrentAction( m_pQueuedAction );
+      }
+      m_pQueuedAction->start();
+      m_pQueuedAction = nullptr;
+    }
+  }
+
+  return true;
+}
\ No newline at end of file
diff --git a/src/world/Actor/Player.h b/src/world/Actor/Player.h
index efaf1f7d..9f40168c 100644
--- a/src/world/Actor/Player.h
+++ b/src/world/Actor/Player.h
@@ -643,6 +643,11 @@ namespace Sapphire::Entity
     /*! return a const pointer to the mount guide bitmask array */
     const uint8_t* getMountGuideBitmask() const;
 
+    bool checkAction() override;
+
+    bool hasQueuedAction() const;
+
+    void setQueuedAction( World::Action::ActionPtr pAction );
 
     // Spawn handling
     //////////////////////////////////////////////////////////////////////////////////////////////////////
@@ -1002,6 +1007,8 @@ namespace Sapphire::Entity
 
     uint32_t m_inventorySequence;
 
+    World::Action::ActionPtr m_pQueuedAction;
+
   private:
     using InventoryMap = std::map< uint16_t, Sapphire::ItemContainerPtr >;
 
diff --git a/src/world/Manager/ActionMgr.cpp b/src/world/Manager/ActionMgr.cpp
index 43d14170..2356d7b3 100644
--- a/src/world/Manager/ActionMgr.cpp
+++ b/src/world/Manager/ActionMgr.cpp
@@ -27,6 +27,8 @@ void World::Manager::ActionMgr::handlePlacedPlayerAction( Entity::Player& player
 
   auto action = Action::make_Action( player.getAsPlayer(), actionId, sequence, actionData, framework() );
 
+  action->setPos( pos );
+
   if( !action->init() )
     return;
 
@@ -37,8 +39,6 @@ void World::Manager::ActionMgr::handlePlacedPlayerAction( Entity::Player& player
     return;
   }
 
-  action->setPos( pos );
-
   bootstrapAction( player, action, *actionData );
 }
 
@@ -50,6 +50,8 @@ void World::Manager::ActionMgr::handleTargetedPlayerAction( Entity::Player& play
 
   action->setTargetId( targetId );
 
+  action->setPos( player.getPos() );
+
   if( !action->init() )
     return;
 
@@ -87,12 +89,20 @@ void World::Manager::ActionMgr::bootstrapAction( Entity::Player& player,
     return;
   }
 
-  // if we have a cast time we want to associate the action with the player so update is called
-  if( currentAction->hasCastTime() )
+  if( player.getCurrentAction() )
   {
-    player.setCurrentAction( currentAction );
+    player.sendDebug( "Skill queued: {0}", currentAction->getId() );
+    player.setQueuedAction( currentAction );
   }
+  else
+  {
+    // if we have a cast time we want to associate the action with the player so update is called
+    if( currentAction->hasCastTime() )
+    {
+      player.setCurrentAction( currentAction );
+    }
 
-  // todo: what do in cases of swiftcast/etc? script callback?
-  currentAction->start();
+    // todo: what do in cases of swiftcast/etc? script callback?
+    currentAction->start();
+  }
 }
\ No newline at end of file
diff --git a/src/world/Network/PacketWrappers/EffectPacket.h b/src/world/Network/PacketWrappers/EffectPacket.h
index 46c8338b..2306b066 100644
--- a/src/world/Network/PacketWrappers/EffectPacket.h
+++ b/src/world/Network/PacketWrappers/EffectPacket.h
@@ -25,13 +25,14 @@ namespace Sapphire::Network::Packets::Server
       m_data.effectTargetId = targetId;
 
       m_data.effectDisplayType = Common::ActionEffectDisplayType::ShowActionName;
+
+      std::memset( m_data.effects, 0, sizeof(Common::EffectEntry) * 8 );
     }
 
     void addEffect( const Common::EffectEntry& effect )
     {
       assert( m_data.effectCount <= 8 );
 
-      std::memset( m_data.effects, 0, sizeof( Common::EffectEntry ) * 8 );
       std::memcpy( &m_data.effects[ m_data.effectCount * 8 ], &effect, sizeof( Common::EffectEntry ) );
       m_data.effectCount++;
     }

From eafb6f45b710142a2c37f0072bc8b2e4df0d56fd Mon Sep 17 00:00:00 2001
From: collett <collett0301@gmail.com>
Date: Sun, 5 Jan 2020 17:26:49 +0900
Subject: [PATCH 207/351] oops

---
 src/world/Action/EffectBuilder.cpp | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/world/Action/EffectBuilder.cpp b/src/world/Action/EffectBuilder.cpp
index 138b511e..b02a5df4 100644
--- a/src/world/Action/EffectBuilder.cpp
+++ b/src/world/Action/EffectBuilder.cpp
@@ -184,7 +184,6 @@ std::shared_ptr< FFXIVPacketBase > EffectBuilder::buildNextEffectPacket( uint32_
     }
     assert( effectPacket != nullptr );
 
-    pHeader->actionAnimationId = m_sourceChara->getId();
     pHeader->actionId = m_actionId;
     pHeader->actionAnimationId = static_cast< uint16_t >( m_actionId );
     pHeader->animationTargetId = m_sourceChara->getId();

From 3c811f6feec17aad18dc35cd52cb928c1f499f6e Mon Sep 17 00:00:00 2001
From: collett <collett0301@gmail.com>
Date: Sun, 5 Jan 2020 17:41:38 +0900
Subject: [PATCH 208/351] Fix base stats calc. Better max hp.

---
 src/world/Actor/BNpc.cpp            |   2 +-
 src/world/Actor/Player.cpp          |   4 +-
 src/world/Actor/PlayerInventory.cpp |   8 ++-
 src/world/Actor/PlayerSql.cpp       |   8 +--
 src/world/Math/CalcStats.cpp        | 107 ++++++++++++++--------------
 5 files changed, 69 insertions(+), 60 deletions(-)

diff --git a/src/world/Actor/BNpc.cpp b/src/world/Actor/BNpc.cpp
index 7dafc83c..38d9a15c 100644
--- a/src/world/Actor/BNpc.cpp
+++ b/src/world/Actor/BNpc.cpp
@@ -727,7 +727,7 @@ void Sapphire::Entity::BNpc::calculateStats()
   m_baseStats.vit = static_cast< uint32_t >( base * ( static_cast< float >( classInfo->modifierVitality ) / 100 ) );
   m_baseStats.inte = static_cast< uint32_t >( base * ( static_cast< float >( classInfo->modifierIntelligence ) / 100 ) );
   m_baseStats.mnd = static_cast< uint32_t >( base * ( static_cast< float >( classInfo->modifierMind ) / 100 ) );
-  m_baseStats.pie = static_cast< uint32_t >( base * ( static_cast< float >( classInfo->modifierPiety ) / 100 ) );
+  //m_baseStats.pie = static_cast< uint32_t >( base * ( static_cast< float >( classInfo->modifierPiety ) / 100 ) );
 
   m_baseStats.determination = static_cast< uint32_t >( base );
   m_baseStats.pie = static_cast< uint32_t >( base );
diff --git a/src/world/Actor/Player.cpp b/src/world/Actor/Player.cpp
index 4ebe604d..d31937c7 100644
--- a/src/world/Actor/Player.cpp
+++ b/src/world/Actor/Player.cpp
@@ -268,8 +268,8 @@ void Sapphire::Entity::Player::calculateStats()
                                               tribeInfo->iNT );
   m_baseStats.mnd = static_cast< uint32_t >( base * ( static_cast< float >( classInfo->modifierMind ) / 100 ) +
                                              tribeInfo->mND );
-  m_baseStats.pie = static_cast< uint32_t >( base * ( static_cast< float >( classInfo->modifierPiety ) / 100 ) +
-                                             tribeInfo->pIE );
+  /*m_baseStats.pie = static_cast< uint32_t >( base * ( static_cast< float >( classInfo->modifierPiety ) / 100 ) +
+                                             tribeInfo->pIE );*/
 
   m_baseStats.determination = static_cast< uint32_t >( base );
   m_baseStats.pie = static_cast< uint32_t >( base );
diff --git a/src/world/Actor/PlayerInventory.cpp b/src/world/Actor/PlayerInventory.cpp
index 4b219668..fe89ca81 100644
--- a/src/world/Actor/PlayerInventory.cpp
+++ b/src/world/Actor/PlayerInventory.cpp
@@ -678,7 +678,9 @@ Sapphire::Entity::Player::moveItem( uint16_t fromInventoryId, uint8_t fromSlotId
   if( static_cast< InventoryType >( fromInventoryId ) == GearSet0 )
     unequipItem( static_cast< GearSetSlot >( fromSlotId ), tmpItem, true );
 
-
+  if( static_cast< InventoryType >( toInventoryId ) == GearSet0 ||
+      static_cast< InventoryType >( fromInventoryId ) == GearSet0 )
+    sendStatusEffectUpdate(); // send if any equip is changed
 }
 
 bool Sapphire::Entity::Player::updateContainer( uint16_t storageId, uint8_t slotId, ItemPtr pItem )
@@ -813,6 +815,10 @@ void Sapphire::Entity::Player::swapItem( uint16_t fromInventoryId, uint8_t fromS
 
   updateContainer( toInventoryId, toSlot, fromItem );
   updateContainer( fromInventoryId, fromSlotId, toItem );
+
+  if( static_cast< InventoryType >( toInventoryId ) == GearSet0 ||
+    static_cast< InventoryType >( fromInventoryId ) == GearSet0 )
+    sendStatusEffectUpdate(); // send if any equip is changed
 }
 
 void Sapphire::Entity::Player::discardItem( uint16_t fromInventoryId, uint8_t fromSlotId )
diff --git a/src/world/Actor/PlayerSql.cpp b/src/world/Actor/PlayerSql.cpp
index 61bac0a7..5a8edafb 100644
--- a/src/world/Actor/PlayerSql.cpp
+++ b/src/world/Actor/PlayerSql.cpp
@@ -217,6 +217,10 @@ bool Sapphire::Entity::Player::load( uint32_t charId, World::SessionPtr pSession
   m_modelSubWeapon = 0;
   m_lastTickTime = 0;
 
+  //m_pInventory->load();
+
+  initInventory(); // moved up so we don't lose hp every login
+
   calculateStats();
 
   // first login, run the script event
@@ -242,10 +246,6 @@ bool Sapphire::Entity::Player::load( uint32_t charId, World::SessionPtr pSession
 
   setStateFlag( PlayerStateFlag::BetweenAreas );
 
-  //m_pInventory->load();
-
-  initInventory();
-
   initHateSlotQueue();
 
   initSpawnIdQueue();
diff --git a/src/world/Math/CalcStats.cpp b/src/world/Math/CalcStats.cpp
index 72d45fff..06834e1d 100644
--- a/src/world/Math/CalcStats.cpp
+++ b/src/world/Math/CalcStats.cpp
@@ -19,55 +19,55 @@ const int levelTable[81][6] =
 { 
   // MAIN,SUB,DIV,HP,ELMT,THREAT
   { 1, 1, 1, 1, 1, 1 },
-  { 20, 56, 56, 0, 52, 2 },
-  { 21, 57, 57, 0, 54, 2 },
-  { 22, 60, 60, 0, 56, 3 },
-  { 24, 62, 62, 0, 58, 3 },
-  { 26, 65, 65, 0, 60, 3 },
-  { 27, 68, 68, 0, 62, 3 },
-  { 29, 70, 70, 0, 64, 4 },
-  { 31, 73, 73, 0, 66, 4 },
-  { 33, 76, 76, 0, 68, 4 },
-  { 35, 78, 78, 0, 70, 5 },
-  { 36, 82, 82, 0, 73, 5 },
-  { 38, 85, 85, 0, 75, 5 },
-  { 41, 89, 89, 0, 78, 6 },
-  { 44, 93, 93, 0, 81, 6 },
-  { 46, 96, 96, 0, 84, 7 },
-  { 49, 100, 100, 0, 86, 7 },
-  { 52, 104, 104, 0, 89, 8 },
-  { 54, 109, 109, 0, 93, 9 },
-  { 57, 113, 113, 0, 95, 9 },
-  { 60, 116, 116, 0, 98, 10 },
-  { 63, 122, 122, 0, 102, 10 },
-  { 67, 127, 127, 0, 105, 11 },
-  { 71, 133, 133, 0, 109, 12 },
-  { 74, 138, 138, 0, 113, 13 },
-  { 78, 144, 144, 0, 117, 14 },
-  { 81, 150, 150, 0, 121, 15 },
-  { 85, 155, 155, 0, 125, 16 },
-  { 89, 162, 162, 0, 129, 17 },
-  { 92, 168, 168, 0, 133, 18 },
-  { 97, 173, 173, 0, 137, 19 },
-  { 101, 181, 181, 0, 143, 20 },
-  { 106, 188, 188, 0, 148, 22 },
-  { 110, 194, 194, 0, 153, 23 },
-  { 115, 202, 202, 0, 159, 25 },
-  { 119, 209, 209, 0, 165, 27 },
-  { 124, 215, 215, 0, 170, 29 },
-  { 128, 223, 223, 0, 176, 31 },
-  { 134, 229, 229, 0, 181, 33 },
-  { 139, 236, 236, 0, 186, 35 },
-  { 144, 244, 244, 0, 192, 38 },
-  { 150, 253, 253, 0, 200, 40 },
-  { 155, 263, 263, 0, 207, 43 },
-  { 161, 272, 272, 0, 215, 46 },
-  { 166, 283, 283, 0, 223, 49 },
-  { 171, 292, 292, 0, 231, 52 },
-  { 177, 302, 302, 0, 238, 55 },
-  { 183, 311, 311, 0, 246, 58 },
-  { 189, 322, 322, 0, 254, 62 },
-  { 196, 331, 331, 0, 261, 66 },
+  { 20, 56, 56, 86, 52, 2 },
+  { 21, 57, 57, 101, 54, 2 },
+  { 22, 60, 60, 109, 56, 3 },
+  { 24, 62, 62, 116, 58, 3 },
+  { 26, 65, 65, 123, 60, 3 },
+  { 27, 68, 68, 131, 62, 3 },
+  { 29, 70, 70, 138, 64, 4 },
+  { 31, 73, 73, 145, 66, 4 },
+  { 33, 76, 76, 153, 68, 4 },
+  { 35, 78, 78, 160, 70, 5 },
+  { 36, 82, 82, 174, 73, 5 },
+  { 38, 85, 85, 188, 75, 5 },
+  { 41, 89, 89, 202, 78, 6 },
+  { 44, 93, 93, 216, 81, 6 },
+  { 46, 96, 96, 230, 84, 7 },
+  { 49, 100, 100, 244, 86, 7 },
+  { 52, 104, 104, 258, 89, 8 },
+  { 54, 109, 109, 272, 93, 9 },
+  { 57, 113, 113, 286, 95, 9 },
+  { 60, 116, 116, 300, 98, 10 },
+  { 63, 122, 122, 333, 102, 10 },
+  { 67, 127, 127, 366, 105, 11 },
+  { 71, 133, 133, 399, 109, 12 },
+  { 74, 138, 138, 432, 113, 13 },
+  { 78, 144, 144, 465, 117, 14 },
+  { 81, 150, 150, 498, 121, 15 },
+  { 85, 155, 155, 531, 125, 16 },
+  { 89, 162, 162, 564, 129, 17 },
+  { 92, 168, 168, 597, 133, 18 },
+  { 97, 173, 173, 630, 137, 19 },
+  { 101, 181, 181, 669, 143, 20 },
+  { 106, 188, 188, 708, 148, 22 },
+  { 110, 194, 194, 747, 153, 23 },
+  { 115, 202, 202, 786, 159, 25 },
+  { 119, 209, 209, 825, 165, 27 },
+  { 124, 215, 215, 864, 170, 29 },
+  { 128, 223, 223, 903, 176, 31 },
+  { 134, 229, 229, 942, 181, 33 },
+  { 139, 236, 236, 981, 186, 35 },
+  { 144, 244, 244, 1020, 192, 38 },
+  { 150, 253, 253, 1088, 200, 40 },
+  { 155, 263, 263, 1156, 207, 43 },
+  { 161, 272, 272, 1224, 215, 46 },
+  { 166, 283, 283, 1292, 223, 49 },
+  { 171, 292, 292, 1360, 231, 52 },
+  { 177, 302, 302, 1428, 238, 55 },
+  { 183, 311, 311, 1496, 246, 58 },
+  { 189, 322, 322, 1564, 254, 62 },
+  { 196, 331, 331, 1632, 261, 66 },
   { 202, 341, 341, 1700, 269, 70 },
   { 204, 342, 393, 1774, 270, 84 },
   { 205, 344, 444, 1851, 271, 99 },
@@ -92,7 +92,7 @@ const int levelTable[81][6] =
 
   // todo: add proper shbr values - hp/elmt/threat
   // sub/div added from http://theoryjerks.akhmorning.com/resources/levelmods/
-  { 296, 365, 2263, 3600, 466, 466 },
+  { 296, 365, 2263, 3600, 295, 466 },
   { 300, 366, 2360, 3600, 295, 466 },
   { 305, 367, 2461, 3600, 295, 466 },
   { 310, 368, 2566, 3600, 295, 466 },
@@ -131,7 +131,7 @@ float CalcStats::calculateBaseStat( const Chara& chara )
   if( level > Common::MAX_PLAYER_LEVEL )
     level = Common::MAX_PLAYER_LEVEL;
 
-  return static_cast< float >( levelTable[level][2] );
+  return static_cast< float >( levelTable[ level ][ Common::LevelTableEntry::MAIN ] );
 }
 
 // Leggerless' HP Formula
@@ -160,13 +160,16 @@ uint32_t CalcStats::calculateMaxHp( PlayerPtr pPlayer, Sapphire::FrameworkPtr pF
   float approxBaseHp = 0.0f; // Read above
 
   // These values are not precise.
-
+  /*
   if( level >= 60 )
     approxBaseHp = static_cast< float >( 2600 + ( level - 60 ) * 100 );
   else if( level >= 50 )
     approxBaseHp = 1700 + ( ( level - 50 ) * ( 1700 * 1.04325f ) );
   else
     approxBaseHp = paramGrowthInfo->mpModifier * 0.7667f;
+  */
+  // just use the table at least better than what it was
+  approxBaseHp = static_cast< float >( levelTable[ level ][ Common::LevelTableEntry::HP ] );
 
   uint16_t result = static_cast< uint16_t >( floor( jobModHp * ( approxBaseHp / 100.0f ) ) +
                                              floor( hpMod / 100.0f * ( vitStat - baseStat ) ) );

From 45ba202ac2195a802f28f872e0984482bdd9a6d0 Mon Sep 17 00:00:00 2001
From: NotAdam <adam@notadam.me>
Date: Sun, 5 Jan 2020 20:36:52 +1100
Subject: [PATCH 209/351] fix InstanceObjectCache crashing if expansion is not
 installed

---
 src/world/Territory/InstanceObjectCache.cpp | 28 +++++++++++++++------
 src/world/Territory/InstanceObjectCache.h   |  5 ++++
 2 files changed, 26 insertions(+), 7 deletions(-)

diff --git a/src/world/Territory/InstanceObjectCache.cpp b/src/world/Territory/InstanceObjectCache.cpp
index 1d186fc6..92b16aa4 100644
--- a/src/world/Territory/InstanceObjectCache.cpp
+++ b/src/world/Territory/InstanceObjectCache.cpp
@@ -12,6 +12,8 @@
 #include <ExdCat.h>
 #include <Exd.h>
 
+#include <Logging/Logger.h>
+
 Sapphire::InstanceObjectCache::InstanceObjectCache( std::shared_ptr< Framework > pFramework ) :
   m_pFramework( pFramework )
 {
@@ -35,10 +37,6 @@ Sapphire::InstanceObjectCache::InstanceObjectCache( std::shared_ptr< Framework >
     if( path.empty() )
       continue;
 
-    // TODO: Horrible workaround... Fails if expansion is not installed
-    if( path.find( "ex3" ) != std::string::npos )
-      continue;
-
     path = std::string( "bg/" ) + path.substr( 0, path.find( "/level/" ) );
 
     // TODO: it does feel like this needs to be streamlined into the datReader instead of being done here...
@@ -47,10 +45,21 @@ Sapphire::InstanceObjectCache::InstanceObjectCache( std::shared_ptr< Framework >
     std::vector< char > bgSection;
     std::vector< char > planmapSection;
 
-    auto test_file = pExd->getGameData()->getFile( bgLgbPath );
-    bgSection = test_file->access_data_sections().at( 0 );
+    std::unique_ptr< xiv::dat::File > bgFile;
+    std::unique_ptr< xiv::dat::File > planmap_file;
 
-    auto planmap_file = pExd->getGameData()->getFile( planmapLgbPath );
+    try
+    {
+      bgFile = pExd->getGameData()->getFile( bgLgbPath );
+      planmap_file = pExd->getGameData()->getFile( planmapLgbPath );
+    }
+    catch( std::runtime_error& )
+    {
+      // ignore files that aren't found
+      continue;
+    }
+
+    bgSection = bgFile->access_data_sections().at( 0 );
     planmapSection = planmap_file->access_data_sections().at( 0 );
 
     std::vector< std::string > stringList;
@@ -89,6 +98,11 @@ Sapphire::InstanceObjectCache::InstanceObjectCache( std::shared_ptr< Framework >
     }
   }
   std::cout << "\n";
+
+  Logger::debug(
+    "InstanceObjectCache Cached: MapRange: {} ExitRange: {} PopRange: {}",
+    m_mapRangeCache.size(), m_exitRangeCache.size(), m_popRangeCache.size()
+  );
 }
 
 
diff --git a/src/world/Territory/InstanceObjectCache.h b/src/world/Territory/InstanceObjectCache.h
index cab04b55..74171d7f 100644
--- a/src/world/Territory/InstanceObjectCache.h
+++ b/src/world/Territory/InstanceObjectCache.h
@@ -53,6 +53,11 @@ namespace Sapphire
         it->second[ entry.header.instanceId ] = pShared;
       }
     }
+
+    uint32_t size() const
+    {
+      return m_objectCache.size();
+    }
   };
 
   class InstanceObjectCache

From bbf3188d92e84f1332b93139d99e61508ce4862f Mon Sep 17 00:00:00 2001
From: NotAdam <adam@notadam.me>
Date: Sun, 5 Jan 2020 20:52:51 +1100
Subject: [PATCH 210/351] opcode fixes

---
 src/common/Network/PacketDef/Ipcs.h | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/common/Network/PacketDef/Ipcs.h b/src/common/Network/PacketDef/Ipcs.h
index 689e9bd7..a0983de3 100644
--- a/src/common/Network/PacketDef/Ipcs.h
+++ b/src/common/Network/PacketDef/Ipcs.h
@@ -295,7 +295,7 @@ namespace Sapphire::Network::Packets
 
 
     CFRegisterDuty = 0x0071,
-    CFRegisterRoulette = 0x0072,
+    CFRegisterRoulette = 0xFF72,
     PlayTimeHandler = 0x0276, // updated 5.1
     LogoutHandler = 0x015D, // updated 5.18
     CancelLogout = 0x008F, // updated 5.1
@@ -341,9 +341,9 @@ namespace Sapphire::Network::Packets
 
     PlaceFieldMarker = 0x013C, // updated 5.0
     SkillHandler = 0x01BE, // updated 5.18
-    GMCommand1 = 0x00A4, // updated 5.1
-    GMCommand2 = 0x013F, // updated 5.0
-    AoESkillHandler = 0x140, // updated 5.0
+    GMCommand1 = 0x014D, // updated 5.18
+    GMCommand2 = 0x03C2, // updated 5.18
+    AoESkillHandler = 0x0072, // updated 5.18
 
     UpdatePositionHandler = 0x0318, // updated 5.18
 

From bf247276b55020fd12e1fca828f99a44eb502efa Mon Sep 17 00:00:00 2001
From: collett <collett0301@gmail.com>
Date: Sun, 5 Jan 2020 20:49:50 +0900
Subject: [PATCH 211/351] Minor tweaks and code clean up.

---
 src/common/Common.h                           |  8 ++-
 src/world/Action/Action.cpp                   | 17 +++--
 src/world/Action/EffectBuilder.cpp            | 70 ++++++++-----------
 src/world/Action/EffectBuilder.h              | 19 +++--
 src/world/Action/EffectResult.cpp             | 22 +++---
 src/world/Action/EffectResult.h               | 10 +--
 src/world/Actor/Player.cpp                    |  3 +-
 .../Network/PacketWrappers/EffectPacket.h     |  2 +-
 8 files changed, 73 insertions(+), 78 deletions(-)

diff --git a/src/common/Common.h b/src/common/Common.h
index 46ce75e4..529284a2 100644
--- a/src/common/Common.h
+++ b/src/common/Common.h
@@ -629,7 +629,7 @@ namespace Sapphire::Common
      * @param value The actionid that starts/continues the combo. eg, 3617 will start a spinning slash and/or syphon strike combo
      */
     StartActionCombo = 28,
-    ComboVisualEffect = 29,
+    ComboSucceed = 29,
     Knockback = 33,
     Mount = 38,
     VFX = 59, // links to VFX sheet
@@ -645,6 +645,12 @@ namespace Sapphire::Common
     CritDirectHitDamage = 3
   };
 
+  enum class ActionEffectResultFlag : uint8_t
+  {
+    None = 0,
+    EffectOnSource = 0x80,
+  };
+
   enum ItemActionType : uint16_t
   {
     ItemActionVFX = 852,
diff --git a/src/world/Action/Action.cpp b/src/world/Action/Action.cpp
index 1c2f10aa..60900a53 100644
--- a/src/world/Action/Action.cpp
+++ b/src/world/Action/Action.cpp
@@ -468,14 +468,14 @@ void Action::Action::buildEffects()
     if( m_lutEntry.potency > 0 )
     {
       auto dmg = calcDamage( isCorrectCombo() ? m_lutEntry.comboPotency : m_lutEntry.potency );
-      m_effectBuilder->damageTarget( actor, dmg.first, dmg.second );
+      m_effectBuilder->damage( actor, actor, dmg.first, dmg.second );
 
       if( dmg.first > 0 )
         actor->onActionHostile( m_pSource );
 
       if( isCorrectCombo() && shouldShowComboEffect )
       {
-        m_effectBuilder->comboVisualEffect( actor );
+        m_effectBuilder->comboSucceed( actor );
         shouldShowComboEffect = false;
       }
 
@@ -483,12 +483,12 @@ void Action::Action::buildEffects()
       {
         if( m_lutEntry.curePotency > 0 ) // actions with self heal
         {
-          m_effectBuilder->selfHeal( actor, m_pSource, m_lutEntry.curePotency );
+          m_effectBuilder->heal( actor, m_pSource, m_lutEntry.curePotency, Common::ActionHitSeverityType::NormalHeal, Common::ActionEffectResultFlag::EffectOnSource );
         }
 
         if( m_lutEntry.restoreMPPercentage > 0 && shouldRestoreMP )
         {
-          m_effectBuilder->restoreMP( actor, m_pSource, m_pSource->getMaxMp() * m_lutEntry.restoreMPPercentage / 100 );
+          m_effectBuilder->restoreMP( actor, m_pSource, m_pSource->getMaxMp() * m_lutEntry.restoreMPPercentage / 100, Common::ActionEffectResultFlag::EffectOnSource );
           shouldRestoreMP = false;
         }
 
@@ -501,18 +501,17 @@ void Action::Action::buildEffects()
     else if( m_lutEntry.curePotency > 0 )
     {
       // todo: calcHealing()
-      m_effectBuilder->healTarget( actor, m_lutEntry.curePotency );
+      m_effectBuilder->heal( actor, actor, m_lutEntry.curePotency );
 
       if( m_lutEntry.restoreMPPercentage > 0 && shouldRestoreMP )
       {
-        // always restore caster mp I don't think there are any actions that can restore target MP post 5.0
-        m_effectBuilder->restoreMP( actor, m_pSource, m_pSource->getMaxMp() * m_lutEntry.restoreMPPercentage / 100 );
+        m_effectBuilder->restoreMP( actor, m_pSource, m_pSource->getMaxMp() * m_lutEntry.restoreMPPercentage / 100, Common::ActionEffectResultFlag::EffectOnSource );
         shouldRestoreMP = false;
       }
     }
     else if( m_lutEntry.restoreMPPercentage > 0 && shouldRestoreMP )
     {
-      m_effectBuilder->restoreMP( actor, m_pSource, m_pSource->getMaxMp() * m_lutEntry.restoreMPPercentage / 100 );
+      m_effectBuilder->restoreMP( actor, m_pSource, m_pSource->getMaxMp() * m_lutEntry.restoreMPPercentage / 100, Common::ActionEffectResultFlag::EffectOnSource );
       shouldRestoreMP = false;
     }
   }
@@ -753,7 +752,7 @@ bool Action::Action::preFilterActor( Sapphire::Entity::Actor& actor ) const
   if( kind != ObjKind::BattleNpc && kind != ObjKind::Player )
     return false;
 
-  if( m_lutEntry.potency > 0 && chara == m_pSource )
+  if( m_lutEntry.potency > 0 && chara->getId() == m_pSource->getId() )
   {
     // damage action shouldn't hit self
     return false;
diff --git a/src/world/Action/EffectBuilder.cpp b/src/world/Action/EffectBuilder.cpp
index b02a5df4..c7c231f0 100644
--- a/src/world/Action/EffectBuilder.cpp
+++ b/src/world/Action/EffectBuilder.cpp
@@ -47,43 +47,33 @@ std::shared_ptr< std::vector< EffectResultPtr > > EffectBuilder::getResultList(
   return it->second;
 }
 
-void EffectBuilder::healTarget( Entity::CharaPtr& target, uint32_t amount, Common::ActionHitSeverityType severity )
+void EffectBuilder::heal( Entity::CharaPtr& effectTarget, Entity::CharaPtr& healingTarget, uint32_t amount, Common::ActionHitSeverityType severity, Common::ActionEffectResultFlag flag )
 {
-  auto resultList = getResultList( target );
+  auto resultList = getResultList( effectTarget );
   assert( resultList );
 
-  EffectResultPtr nextResult = make_EffectResult( target, getResultDelayMs() );
-  nextResult->heal( amount, severity, false );
+  EffectResultPtr nextResult = make_EffectResult( healingTarget, getResultDelayMs() );
+  nextResult->heal( amount, severity, flag );
   resultList->push_back( std::move( nextResult ) );
 }
 
-void EffectBuilder::selfHeal( Entity::CharaPtr& target, Entity::CharaPtr& source, uint32_t amount, Common::ActionHitSeverityType severity )
+void EffectBuilder::restoreMP( Entity::CharaPtr& target, Entity::CharaPtr& restoringTarget, uint32_t amount, Common::ActionEffectResultFlag flag )
 {
   auto resultList = getResultList( target );
   assert( resultList );
 
-  EffectResultPtr nextResult = make_EffectResult( source, getResultDelayMs() ); // heal the source actor
-  nextResult->heal( amount, severity, true );
+  EffectResultPtr nextResult = make_EffectResult( restoringTarget, getResultDelayMs() ); // restore mp source actor
+  nextResult->restoreMP( amount, flag );
   resultList->push_back( std::move( nextResult ) );
 }
 
-void EffectBuilder::restoreMP( Entity::CharaPtr& target, Entity::CharaPtr& source, uint32_t amount )
+void EffectBuilder::damage( Entity::CharaPtr& effectTarget, Entity::CharaPtr& damagingTarget, uint32_t amount, Common::ActionHitSeverityType severity, Common::ActionEffectResultFlag flag )
 {
-  auto resultList = getResultList( target );
+  auto resultList = getResultList( effectTarget );
   assert( resultList );
 
-  EffectResultPtr nextResult = make_EffectResult( source, getResultDelayMs() ); // restore mp source actor
-  nextResult->restoreMP( amount );
-  resultList->push_back( std::move( nextResult ) );
-}
-
-void EffectBuilder::damageTarget( Entity::CharaPtr& target, uint32_t amount, Common::ActionHitSeverityType severity )
-{
-  auto resultList = getResultList( target );
-  assert( resultList );
-
-  EffectResultPtr nextResult = make_EffectResult( target, getResultDelayMs() );
-  nextResult->damage( amount, severity );
+  EffectResultPtr nextResult = make_EffectResult( damagingTarget, getResultDelayMs() );
+  nextResult->damage( amount, severity, flag );
   resultList->push_back( std::move( nextResult ) );
 }
 
@@ -97,13 +87,13 @@ void EffectBuilder::startCombo( Entity::CharaPtr& target, uint16_t actionId )
   resultList->push_back( std::move( nextResult ) );
 }
 
-void EffectBuilder::comboVisualEffect( Entity::CharaPtr& target )
+void EffectBuilder::comboSucceed( Entity::CharaPtr& target )
 {
   auto resultList = getResultList( target );
   assert( resultList  );
 
   EffectResultPtr nextResult = make_EffectResult( target, 0 );
-  nextResult->comboVisualEffect();
+  nextResult->comboSucceed();
   resultList->push_back( std::move( nextResult ) );
 }
 
@@ -144,40 +134,40 @@ std::shared_ptr< FFXIVPacketBase > EffectBuilder::buildNextEffectPacket( uint32_
       case 8:
       {
         auto p = makeZonePacket< Server::FFXIVIpcAoeEffect8 >( m_sourceChara->getId() );
-        pHeader = ( EffectHeader* )( &( p->data() ) );
-        pEntry = ( Common::EffectEntry* )( &( p->data().effects ) );
-        pEffectTargetId = ( uint64_t* )( &( p->data().effectTargetId ) );
-        pFlag = ( uint16_t* )( &( p->data().unkFlag ) );
+        pHeader = reinterpret_cast< EffectHeader* >( &p->data() );
+        pEntry = reinterpret_cast< Common::EffectEntry* >( &p->data().effects );
+        pEffectTargetId = reinterpret_cast< uint64_t* >( &p->data().effectTargetId );
+        pFlag = reinterpret_cast< uint16_t* >( &p->data().unkFlag );
         effectPacket = std::move( p );
         break;
       }
       case 16:
       {
         auto p = makeZonePacket< Server::FFXIVIpcAoeEffect16 >( m_sourceChara->getId() );
-        pHeader = ( EffectHeader* )( &( p->data() ) );
-        pEntry = ( Common::EffectEntry* )( &( p->data().effects ) );
-        pEffectTargetId = ( uint64_t* )( &( p->data().effectTargetId ) );
-        pFlag = ( uint16_t* )( &( p->data().unkFlag ) );
+        pHeader = reinterpret_cast< EffectHeader* >( &p->data() );
+        pEntry = reinterpret_cast< Common::EffectEntry* >( &p->data().effects );
+        pEffectTargetId = reinterpret_cast< uint64_t* >( &p->data().effectTargetId );
+        pFlag = reinterpret_cast< uint16_t* >( &p->data().unkFlag );
         effectPacket = std::move( p );
         break;
       }
       case 24:
       {
         auto p = makeZonePacket< Server::FFXIVIpcAoeEffect24 >( m_sourceChara->getId() );
-        pHeader = ( EffectHeader* )( &( p->data() ) );
-        pEntry = ( Common::EffectEntry* )( &( p->data().effects ) );
-        pEffectTargetId = ( uint64_t* )( &( p->data().effectTargetId ) );
-        pFlag = ( uint16_t* )( &( p->data().unkFlag ) );
+        pHeader = reinterpret_cast< EffectHeader* >( &p->data() );
+        pEntry = reinterpret_cast< Common::EffectEntry* >( &p->data().effects );
+        pEffectTargetId = reinterpret_cast< uint64_t* >( &p->data().effectTargetId );
+        pFlag = reinterpret_cast< uint16_t* >( &p->data().unkFlag );
         effectPacket = std::move( p );
         break;
       }
       case 32:
       {
         auto p = makeZonePacket< Server::FFXIVIpcAoeEffect32 >( m_sourceChara->getId() );
-        pHeader = ( EffectHeader* )( &( p->data() ) );
-        pEntry = ( Common::EffectEntry* )( &( p->data().effects ) );
-        pEffectTargetId = ( uint64_t* )( &( p->data().effectTargetId ) );
-        pFlag = ( uint16_t* )( &( p->data().unkFlag ) );
+        pHeader = reinterpret_cast< EffectHeader* >( &p->data() );
+        pEntry = reinterpret_cast< Common::EffectEntry* >( &p->data().effects );
+        pEffectTargetId = reinterpret_cast< uint64_t* >( &p->data().effectTargetId );
+        pFlag = reinterpret_cast< uint16_t* >( &p->data().unkFlag );
         effectPacket = std::move( p );
         break;
       }
@@ -228,7 +218,7 @@ std::shared_ptr< FFXIVPacketBase > EffectBuilder::buildNextEffectPacket( uint32_
   else
   {
     auto resultList = m_resolvedEffects.begin()->second;
-    assert( resultList->size() > 0 );
+    assert( !resultList->empty() );
     auto firstResult = resultList->data()[ 0 ];
     Logger::debug( " - id: {}", firstResult->getTarget()->getId() );
 
diff --git a/src/world/Action/EffectBuilder.h b/src/world/Action/EffectBuilder.h
index a4699bb6..b2a76221 100644
--- a/src/world/Action/EffectBuilder.h
+++ b/src/world/Action/EffectBuilder.h
@@ -11,21 +11,20 @@ namespace Sapphire::World::Action
   public:
     EffectBuilder( Entity::CharaPtr source, uint32_t actionId, uint16_t sequence );
 
+    void heal( Entity::CharaPtr& effectTarget, Entity::CharaPtr& healingTarget, uint32_t amount,
+               Common::ActionHitSeverityType severity = Common::ActionHitSeverityType::NormalHeal,
+               Common::ActionEffectResultFlag flag = Common::ActionEffectResultFlag::None);
 
-    void healTarget( Entity::CharaPtr& target, uint32_t amount,
-                     Common::ActionHitSeverityType severity = Common::ActionHitSeverityType::NormalHeal );
+    void restoreMP( Entity::CharaPtr& effectTarget, Entity::CharaPtr& restoringTarget, uint32_t amount,
+                    Common::ActionEffectResultFlag flag = Common::ActionEffectResultFlag::None);
 
-    void selfHeal( Entity::CharaPtr& target, Entity::CharaPtr& source, uint32_t amount,
-                     Common::ActionHitSeverityType severity = Common::ActionHitSeverityType::NormalHeal );
-
-    void restoreMP( Entity::CharaPtr& target, Entity::CharaPtr& source, uint32_t amount );
-
-    void damageTarget( Entity::CharaPtr& target, uint32_t amount,
-                       Common::ActionHitSeverityType severity = Common::ActionHitSeverityType::NormalDamage );
+    void damage( Entity::CharaPtr& effectTarget, Entity::CharaPtr& damagingTarget, uint32_t amount,
+                 Common::ActionHitSeverityType severity = Common::ActionHitSeverityType::NormalDamage,
+                 Common::ActionEffectResultFlag flag = Common::ActionEffectResultFlag::None);
 
     void startCombo( Entity::CharaPtr& target, uint16_t actionId );
 
-    void comboVisualEffect( Entity::CharaPtr& target );
+    void comboSucceed( Entity::CharaPtr& target );
 
     void buildAndSendPackets();
 
diff --git a/src/world/Action/EffectResult.cpp b/src/world/Action/EffectResult.cpp
index 8f5782ce..85684496 100644
--- a/src/world/Action/EffectResult.cpp
+++ b/src/world/Action/EffectResult.cpp
@@ -15,7 +15,7 @@ EffectResult::EffectResult( Entity::CharaPtr target, uint64_t runAfter ) :
   m_severity( Common::ActionHitSeverityType::NormalDamage ),
   m_type( Common::ActionEffectType::Nothing ),
   m_param( 0 ),
-  m_flag( 0 )
+  m_flag( Common::ActionEffectResultFlag::None )
 {
 
 }
@@ -40,27 +40,28 @@ void EffectResult::setParam( uint8_t param )
   m_param = param;
 }
 
-void EffectResult::damage( uint32_t amount, Common::ActionHitSeverityType severity )
+void EffectResult::damage( uint32_t amount, Common::ActionHitSeverityType severity, Common::ActionEffectResultFlag flag )
 {
   m_severity = severity;
   m_value = amount;
+  m_flag = flag;
 
   m_type = Common::ActionEffectType::Damage;
 }
 
-void EffectResult::heal( uint32_t amount, Sapphire::Common::ActionHitSeverityType severity, bool isSelfHeal )
+void EffectResult::heal( uint32_t amount, Common::ActionHitSeverityType severity, Common::ActionEffectResultFlag flag )
 {
   m_severity = severity;
   m_value = amount;
-  m_flag = isSelfHeal ? 0x80 : 0; // flag == 0x80 displays healing text at source actor
+  m_flag = flag;
 
   m_type = Common::ActionEffectType::Heal;
 }
 
-void EffectResult::restoreMP( uint32_t amount )
+void EffectResult::restoreMP( uint32_t amount, Common::ActionEffectResultFlag flag )
 {
   m_value = amount;
-  m_flag = 0x80;
+  m_flag = flag;
 
   m_type = Common::ActionEffectType::MpGain;
 }
@@ -68,14 +69,15 @@ void EffectResult::restoreMP( uint32_t amount )
 void EffectResult::startCombo( uint16_t actionId )
 {
   m_value = actionId;
-  m_flag = 0x80;
+  m_flag = Common::ActionEffectResultFlag::EffectOnSource;
 
   m_type = Common::ActionEffectType::StartActionCombo;
 }
 
-void EffectResult::comboVisualEffect()
+void EffectResult::comboSucceed()
 {
-  m_type = Common::ActionEffectType::ComboVisualEffect;
+  // no EffectOnSource flag on this
+  m_type = Common::ActionEffectType::ComboSucceed;
 }
 
 Common::EffectEntry EffectResult::buildEffectEntry() const
@@ -87,7 +89,7 @@ Common::EffectEntry EffectResult::buildEffectEntry() const
   entry.hitSeverity = m_severity;
   entry.effectType = m_type;
   entry.param = m_param;
-  entry.flags = m_flag;
+  entry.flags = static_cast< uint8_t >( m_flag );
 
   return entry;
 }
diff --git a/src/world/Action/EffectResult.h b/src/world/Action/EffectResult.h
index 3a93d13b..c3f642b3 100644
--- a/src/world/Action/EffectResult.h
+++ b/src/world/Action/EffectResult.h
@@ -15,11 +15,11 @@ namespace Sapphire::World::Action
   public:
     explicit EffectResult( Entity::CharaPtr target, uint64_t delayMs );
 
-    void damage( uint32_t amount, Common::ActionHitSeverityType severity );
-    void heal( uint32_t amount, Common::ActionHitSeverityType severity, bool isSelfHeal );
-    void restoreMP( uint32_t amount );
+    void damage( uint32_t amount, Common::ActionHitSeverityType severity, Common::ActionEffectResultFlag flag = Common::ActionEffectResultFlag::None );
+    void heal( uint32_t amount, Common::ActionHitSeverityType severity, Common::ActionEffectResultFlag flag = Common::ActionEffectResultFlag::None );
+    void restoreMP( uint32_t amount, Common::ActionEffectResultFlag flag = Common::ActionEffectResultFlag::None );
     void startCombo( uint16_t actionId );
-    void comboVisualEffect();
+    void comboSucceed();
 
     Entity::CharaPtr getTarget() const;
 
@@ -43,7 +43,7 @@ namespace Sapphire::World::Action
 
     uint32_t m_value;
     uint8_t m_param;
-    uint8_t m_flag;
+    Common::ActionEffectResultFlag m_flag;
   };
 }
 
diff --git a/src/world/Actor/Player.cpp b/src/world/Actor/Player.cpp
index 4a6ab8d8..a6856127 100644
--- a/src/world/Actor/Player.cpp
+++ b/src/world/Actor/Player.cpp
@@ -2140,8 +2140,7 @@ bool Sapphire::Entity::Player::hasQueuedAction() const
 
 void Sapphire::Entity::Player::setQueuedAction( Sapphire::World::Action::ActionPtr pAction )
 {
-  m_pQueuedAction = nullptr; // overwrite whatever is already there
-  m_pQueuedAction = std::move( pAction );
+  m_pQueuedAction = std::move( pAction ); // overwrite previous queued action if any
 }
 
 bool Sapphire::Entity::Player::checkAction()
diff --git a/src/world/Network/PacketWrappers/EffectPacket.h b/src/world/Network/PacketWrappers/EffectPacket.h
index 2306b066..cb062f3f 100644
--- a/src/world/Network/PacketWrappers/EffectPacket.h
+++ b/src/world/Network/PacketWrappers/EffectPacket.h
@@ -26,7 +26,7 @@ namespace Sapphire::Network::Packets::Server
 
       m_data.effectDisplayType = Common::ActionEffectDisplayType::ShowActionName;
 
-      std::memset( m_data.effects, 0, sizeof(Common::EffectEntry) * 8 );
+      std::memset( m_data.effects, 0, sizeof( Common::EffectEntry ) * 8 );
     }
 
     void addEffect( const Common::EffectEntry& effect )

From 5cbff4f12b9452a05643bcfcf99694145959756e Mon Sep 17 00:00:00 2001
From: collett <collett0301@gmail.com>
Date: Sun, 5 Jan 2020 20:54:49 +0900
Subject: [PATCH 212/351] more clean up

---
 src/world/Action/EffectBuilder.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/world/Action/EffectBuilder.cpp b/src/world/Action/EffectBuilder.cpp
index c7c231f0..3ab3e0dd 100644
--- a/src/world/Action/EffectBuilder.cpp
+++ b/src/world/Action/EffectBuilder.cpp
@@ -105,7 +105,7 @@ void EffectBuilder::buildAndSendPackets()
 
   auto globalSequence = m_sourceChara->getCurrentTerritory()->getNextEffectSequence();
 
-  while( m_resolvedEffects.size() > 0 )
+  while( !m_resolvedEffects.empty() )
   {
     auto packet = buildNextEffectPacket( globalSequence );
     m_sourceChara->sendToInRangeSet( packet, true );
@@ -188,7 +188,7 @@ std::shared_ptr< FFXIVPacketBase > EffectBuilder::buildNextEffectPacket( uint32_
     for( auto it = m_resolvedEffects.begin(); it != m_resolvedEffects.end(); )
     {
       auto resultList = it->second;
-      assert( resultList->size() > 0 );
+      assert( !resultList->empty() );
       auto firstResult = resultList->data()[ 0 ];
       pEffectTargetId[ targetIndex ] = firstResult->getTarget()->getId();
       Logger::debug( " - id: {}", pEffectTargetId[ targetIndex ] );

From 4b89c457906b53a68dc006532fc96cb67d953195 Mon Sep 17 00:00:00 2001
From: collett <collett0301@gmail.com>
Date: Sun, 5 Jan 2020 21:31:54 +0900
Subject: [PATCH 213/351] local var rename

---
 src/world/Action/Action.cpp        | 6 +++---
 src/world/Action/EffectBuilder.cpp | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/world/Action/Action.cpp b/src/world/Action/Action.cpp
index 60900a53..20ce9ab8 100644
--- a/src/world/Action/Action.cpp
+++ b/src/world/Action/Action.cpp
@@ -461,7 +461,7 @@ void Action::Action::buildEffects()
 
   // when aoe, these effects are in the target whatever is hit first
   bool shouldRestoreMP = true;
-  bool shouldShowComboEffect = true;
+  bool shouldApplyComboSucceedEffect = true;
 
   for( auto& actor : m_hitActors )
   {
@@ -473,10 +473,10 @@ void Action::Action::buildEffects()
       if( dmg.first > 0 )
         actor->onActionHostile( m_pSource );
 
-      if( isCorrectCombo() && shouldShowComboEffect )
+      if( isCorrectCombo() && shouldApplyComboSucceedEffect )
       {
         m_effectBuilder->comboSucceed( actor );
-        shouldShowComboEffect = false;
+        shouldApplyComboSucceedEffect = false;
       }
 
       if( !isComboAction() || isCorrectCombo() )
diff --git a/src/world/Action/EffectBuilder.cpp b/src/world/Action/EffectBuilder.cpp
index 3ab3e0dd..761af0e3 100644
--- a/src/world/Action/EffectBuilder.cpp
+++ b/src/world/Action/EffectBuilder.cpp
@@ -172,7 +172,7 @@ std::shared_ptr< FFXIVPacketBase > EffectBuilder::buildNextEffectPacket( uint32_
         break;
       }
     }
-    assert( effectPacket != nullptr );
+    assert( effectPacket );
 
     pHeader->actionId = m_actionId;
     pHeader->actionAnimationId = static_cast< uint16_t >( m_actionId );

From c319cb012c59b71f3633a9eb7e2e900ee22a81d2 Mon Sep 17 00:00:00 2001
From: collett <collett0301@gmail.com>
Date: Mon, 6 Jan 2020 00:25:42 +0900
Subject: [PATCH 214/351] combo fix

---
 src/world/Action/Action.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/world/Action/Action.cpp b/src/world/Action/Action.cpp
index 20ce9ab8..6c13d8cb 100644
--- a/src/world/Action/Action.cpp
+++ b/src/world/Action/Action.cpp
@@ -393,8 +393,8 @@ void Action::Action::execute()
   // ignore it otherwise (ogcds, etc.)
   if( !m_actionData->preservesCombo )
   {
-    // potential combo starter or correct combo from last action
-    if( ( !isComboAction() || isCorrectCombo() ) )
+    // potential combo starter or correct combo from last action, must hit something to progress combo
+    if( !m_hitActors.empty() && ( !isComboAction() || isCorrectCombo() ) )
     {
       m_pSource->setLastComboActionId( getId() );
     }

From e6c3e327f7cf4d6d0c8cb2b3c54b6c6de717c85a Mon Sep 17 00:00:00 2001
From: collett <collett0301@gmail.com>
Date: Mon, 6 Jan 2020 04:29:45 +0900
Subject: [PATCH 215/351] Fix skill animation for other players.

---
 src/world/Action/Action.cpp        | 20 +++++++++-----------
 src/world/Action/EffectBuilder.cpp | 25 ++++++++++++++++++++-----
 2 files changed, 29 insertions(+), 16 deletions(-)

diff --git a/src/world/Action/Action.cpp b/src/world/Action/Action.cpp
index 6c13d8cb..4e456c5d 100644
--- a/src/world/Action/Action.cpp
+++ b/src/world/Action/Action.cpp
@@ -751,20 +751,18 @@ bool Action::Action::preFilterActor( Sapphire::Entity::Actor& actor ) const
   // todo: are there any server side eobjs that players can hit?
   if( kind != ObjKind::BattleNpc && kind != ObjKind::Player )
     return false;
-
-  if( m_lutEntry.potency > 0 && chara->getId() == m_pSource->getId() )
-  {
-    // damage action shouldn't hit self
+  
+  if( !m_canTargetSelf && chara->getId() == m_pSource->getId() )
     return false;
-  }
-
-  if( ( m_lutEntry.potency > 0 || m_lutEntry.curePotency > 0 ) && !chara->isAlive() )
-  {
-    // can't deal damage or heal a dead entity
+  
+  if( ( m_lutEntry.potency > 0 || m_lutEntry.curePotency > 0 ) && !chara->isAlive() ) // !m_canTargetDead not working for aoe
     return false;
-  }
 
-  // todo: handle things such based on canTargetX
+  if( m_lutEntry.potency > 0 && m_pSource->getObjKind() == chara->getObjKind() ) // !m_canTargetFriendly not working for aoe
+    return false;
+
+  if( ( m_lutEntry.potency == 0 && m_lutEntry.curePotency > 0 ) && m_pSource->getObjKind() != chara->getObjKind() ) // !m_canTargetHostile not working for aoe
+    return false;
 
   return true;
 }
diff --git a/src/world/Action/EffectBuilder.cpp b/src/world/Action/EffectBuilder.cpp
index 761af0e3..a27ec2e6 100644
--- a/src/world/Action/EffectBuilder.cpp
+++ b/src/world/Action/EffectBuilder.cpp
@@ -105,11 +105,12 @@ void EffectBuilder::buildAndSendPackets()
 
   auto globalSequence = m_sourceChara->getCurrentTerritory()->getNextEffectSequence();
 
-  while( !m_resolvedEffects.empty() )
+  do // we want to send at least one packet even nothing is hit so other players can see
   {
     auto packet = buildNextEffectPacket( globalSequence );
     m_sourceChara->sendToInRangeSet( packet, true );
   }
+  while( !m_resolvedEffects.empty() );
 }
 
 std::shared_ptr< FFXIVPacketBase > EffectBuilder::buildNextEffectPacket( uint32_t globalSequence )
@@ -118,9 +119,7 @@ std::shared_ptr< FFXIVPacketBase > EffectBuilder::buildNextEffectPacket( uint32_
 
   if( remainingTargetCount > 1 ) // use AoeEffect packets
   {
-    int packetSize = remainingTargetCount <= 8 ? 8 :
-                   ( remainingTargetCount <= 16 ? 16 :
-                   ( remainingTargetCount <= 24 ? 24 : 32 ) );
+    int packetSize = remainingTargetCount <= 8 ? 8 : ( remainingTargetCount <= 16 ? 16 : ( remainingTargetCount <= 24 ? 24 : 32 ) );
 
     using EffectHeader = Server::FFXIVIpcAoeEffect< 8 >; // dummy type to access header part of the packet
 
@@ -215,7 +214,7 @@ std::shared_ptr< FFXIVPacketBase > EffectBuilder::buildNextEffectPacket( uint32_
 
     return effectPacket;
   }
-  else
+  else if ( remainingTargetCount == 1 ) // use Effect for single target
   {
     auto resultList = m_resolvedEffects.begin()->second;
     assert( !resultList->empty() );
@@ -239,6 +238,22 @@ std::shared_ptr< FFXIVPacketBase > EffectBuilder::buildNextEffectPacket( uint32_
 
     m_resolvedEffects.clear();
 
+    return effectPacket;
+  }
+  else // nothing is hit, this only happens when using aoe and AoeEffect8 is used on retail
+  {
+    auto effectPacket = makeZonePacket< Server::FFXIVIpcAoeEffect8 >( m_sourceChara->getId() );
+
+    effectPacket->data().actionId = m_actionId;
+    effectPacket->data().actionAnimationId = static_cast< uint16_t >( m_actionId );
+    effectPacket->data().animationTargetId = m_sourceChara->getId();
+    effectPacket->data().someTargetId = 0xE0000000;
+    effectPacket->data().rotation = Common::Util::floatToUInt16Rot( m_sourceChara->getRot() );
+    effectPacket->data().effectDisplayType = Common::ActionEffectDisplayType::HideActionName;
+    effectPacket->data().effectCount = 0;
+    effectPacket->data().sourceSequence = m_sequence;
+    effectPacket->data().globalSequence = globalSequence;
+
     return effectPacket;
   }
 }
\ No newline at end of file

From 26f23a1147b15da756ecdaccb699352e9dc4ed11 Mon Sep 17 00:00:00 2001
From: collett <collett0301@gmail.com>
Date: Mon, 6 Jan 2020 17:52:45 +0900
Subject: [PATCH 216/351] no need to return the list

---
 src/world/Action/EffectBuilder.cpp | 35 ++++++++++--------------------
 src/world/Action/EffectBuilder.h   |  2 +-
 2 files changed, 12 insertions(+), 25 deletions(-)

diff --git a/src/world/Action/EffectBuilder.cpp b/src/world/Action/EffectBuilder.cpp
index a27ec2e6..23765c27 100644
--- a/src/world/Action/EffectBuilder.cpp
+++ b/src/world/Action/EffectBuilder.cpp
@@ -31,70 +31,57 @@ uint64_t EffectBuilder::getResultDelayMs()
   return Common::Util::getTimeMs() + 850;
 }
 
-std::shared_ptr< std::vector< EffectResultPtr > > EffectBuilder::getResultList( Entity::CharaPtr& chara )
+void EffectBuilder::moveToResultList( Entity::CharaPtr& chara, EffectResultPtr result )
 {
   auto it = m_resolvedEffects.find( chara->getId() );
   if( it == m_resolvedEffects.end() )
   {
-    // create a new one and return it
+    // create a new one
     auto resultList = std::make_shared< std::vector< EffectResultPtr > >();
 
     m_resolvedEffects[ chara->getId() ] = resultList;
 
-    return resultList;
+    resultList->push_back( std::move( result ) );
+
+    return;
   }
 
-  return it->second;
+  it->second->push_back( std::move( result ) );
 }
 
 void EffectBuilder::heal( Entity::CharaPtr& effectTarget, Entity::CharaPtr& healingTarget, uint32_t amount, Common::ActionHitSeverityType severity, Common::ActionEffectResultFlag flag )
 {
-  auto resultList = getResultList( effectTarget );
-  assert( resultList );
-
   EffectResultPtr nextResult = make_EffectResult( healingTarget, getResultDelayMs() );
   nextResult->heal( amount, severity, flag );
-  resultList->push_back( std::move( nextResult ) );
+  moveToResultList( effectTarget, nextResult );
 }
 
 void EffectBuilder::restoreMP( Entity::CharaPtr& target, Entity::CharaPtr& restoringTarget, uint32_t amount, Common::ActionEffectResultFlag flag )
 {
-  auto resultList = getResultList( target );
-  assert( resultList );
-
   EffectResultPtr nextResult = make_EffectResult( restoringTarget, getResultDelayMs() ); // restore mp source actor
   nextResult->restoreMP( amount, flag );
-  resultList->push_back( std::move( nextResult ) );
+  moveToResultList( target, nextResult );
 }
 
 void EffectBuilder::damage( Entity::CharaPtr& effectTarget, Entity::CharaPtr& damagingTarget, uint32_t amount, Common::ActionHitSeverityType severity, Common::ActionEffectResultFlag flag )
 {
-  auto resultList = getResultList( effectTarget );
-  assert( resultList );
-
   EffectResultPtr nextResult = make_EffectResult( damagingTarget, getResultDelayMs() );
   nextResult->damage( amount, severity, flag );
-  resultList->push_back( std::move( nextResult ) );
+  moveToResultList( effectTarget, nextResult );
 }
 
 void EffectBuilder::startCombo( Entity::CharaPtr& target, uint16_t actionId )
 {
-  auto resultList = getResultList( target );
-  assert( resultList  );
-
   EffectResultPtr nextResult = make_EffectResult( target, 0 );
   nextResult->startCombo( actionId );
-  resultList->push_back( std::move( nextResult ) );
+  moveToResultList( target, nextResult );
 }
 
 void EffectBuilder::comboSucceed( Entity::CharaPtr& target )
 {
-  auto resultList = getResultList( target );
-  assert( resultList  );
-
   EffectResultPtr nextResult = make_EffectResult( target, 0 );
   nextResult->comboSucceed();
-  resultList->push_back( std::move( nextResult ) );
+  moveToResultList( target, nextResult );
 }
 
 void EffectBuilder::buildAndSendPackets()
diff --git a/src/world/Action/EffectBuilder.h b/src/world/Action/EffectBuilder.h
index b2a76221..dda471e2 100644
--- a/src/world/Action/EffectBuilder.h
+++ b/src/world/Action/EffectBuilder.h
@@ -30,7 +30,7 @@ namespace Sapphire::World::Action
 
 
   private:
-    std::shared_ptr< std::vector< EffectResultPtr > > getResultList( Entity::CharaPtr& chara );
+    void moveToResultList( Entity::CharaPtr& chara, EffectResultPtr result );
 
     uint64_t getResultDelayMs();
 

From 53ce882ce881cbd8c8d00b4fc71aaa2c7a79abbc Mon Sep 17 00:00:00 2001
From: NotAdam <adam@notadam.me>
Date: Mon, 6 Jan 2020 20:04:10 +1100
Subject: [PATCH 217/351] action_parse can take an exd path as a launch arg now

---
 src/tools/action_parse/main.cpp | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/tools/action_parse/main.cpp b/src/tools/action_parse/main.cpp
index ff750cf6..5f7afc07 100644
--- a/src/tools/action_parse/main.cpp
+++ b/src/tools/action_parse/main.cpp
@@ -25,7 +25,7 @@ namespace fs = std::experimental::filesystem;
 
 using namespace Sapphire;
 
-const std::string datLocation( "/home/mordred/sqpack" );
+std::string datLocation( "/home/mordred/sqpack" );
 //const std::string datLocation( "/mnt/c/Program Files (x86)/Steam/steamapps/common/FINAL FANTASY XIV Online/game/sqpack" );
 
 struct ActionEntry
@@ -69,7 +69,7 @@ uint32_t stripNonNumerics( std::string& str )
   return std::atoi( str.c_str() );
 }
 
-int main()
+int main( int argc, char* argv[] )
 {
 
   Logger::init( "action_parse" );
@@ -77,6 +77,11 @@ int main()
   if( !fs::exists( "ActionLutData.cpp.tmpl" ) )
     throw std::runtime_error( "ActionLut.cpp.tmpl is missing in working directory" );
 
+  if( argc == 2 )
+  {
+    datLocation = std::string( argv[ 1 ] );
+  }
+
   Logger::info( "Setting up EXD data" );
   if( !g_exdData.init( datLocation ) )
   {

From 2cf93ce861677717deeb01795f292b46160001ae Mon Sep 17 00:00:00 2001
From: NotAdam <adam@notadam.me>
Date: Mon, 6 Jan 2020 20:19:42 +1100
Subject: [PATCH 218/351] fix linux build

---
 src/scripts/common/warptaxi/WarpTaxi.cpp      | 2 +-
 src/world/Actor/Player.cpp                    | 2 +-
 src/world/Network/Handlers/PacketHandlers.cpp | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/scripts/common/warptaxi/WarpTaxi.cpp b/src/scripts/common/warptaxi/WarpTaxi.cpp
index e8a8de97..fe442249 100644
--- a/src/scripts/common/warptaxi/WarpTaxi.cpp
+++ b/src/scripts/common/warptaxi/WarpTaxi.cpp
@@ -2,7 +2,7 @@
 #include <Actor/Player.h>
 
 #include <datReader/DatCategories/bg/LgbTypes.h>
-#include <datReader/DatCategories/bg/Lgb.h>
+#include <datReader/DatCategories/bg/lgb.h>
 
 #include "Territory/InstanceObjectCache.h"
 
diff --git a/src/world/Actor/Player.cpp b/src/world/Actor/Player.cpp
index 4eae61b9..5bca5e76 100644
--- a/src/world/Actor/Player.cpp
+++ b/src/world/Actor/Player.cpp
@@ -4,7 +4,7 @@
 #include <Logging/Logger.h>
 #include <Exd/ExdDataGenerated.h>
 #include <datReader/DatCategories/bg/LgbTypes.h>
-#include <datReader/DatCategories/bg/Lgb.h>
+#include <datReader/DatCategories/bg/lgb.h>
 
 #include <Network/PacketContainer.h>
 #include <Network/CommonActorControl.h>
diff --git a/src/world/Network/Handlers/PacketHandlers.cpp b/src/world/Network/Handlers/PacketHandlers.cpp
index d6682408..5e23045d 100644
--- a/src/world/Network/Handlers/PacketHandlers.cpp
+++ b/src/world/Network/Handlers/PacketHandlers.cpp
@@ -10,7 +10,7 @@
 #include <Util/Util.h>
 
 #include <datReader/DatCategories/bg/LgbTypes.h>
-#include <datReader/DatCategories/bg/Lgb.h>
+#include <datReader/DatCategories/bg/lgb.h>
 
 #include <unordered_map>
 #include <Network/PacketDef/Zone/ClientZoneDef.h>

From 4bed2f4c306e1df10b282520a658e9052e1a0d2a Mon Sep 17 00:00:00 2001
From: collett <collett0301@gmail.com>
Date: Mon, 6 Jan 2020 19:25:01 +0900
Subject: [PATCH 219/351] Allow action scripts to add effect.

---
 src/common/Common.h                         |  5 +++--
 src/scripts/action/common/ActionSprint3.cpp |  2 ++
 src/world/Action/Action.cpp                 | 10 +++++++++-
 src/world/Action/Action.h                   |  3 +++
 src/world/Action/EffectBuilder.cpp          |  7 +++++++
 src/world/Action/EffectBuilder.h            |  2 ++
 src/world/Action/EffectResult.cpp           | 13 ++++++++-----
 src/world/Action/EffectResult.h             |  3 +--
 8 files changed, 35 insertions(+), 10 deletions(-)

diff --git a/src/common/Common.h b/src/common/Common.h
index 529284a2..ed59e820 100644
--- a/src/common/Common.h
+++ b/src/common/Common.h
@@ -622,6 +622,7 @@ namespace Sapphire::Common
     TpLoss = 12,
     TpGain = 13,
     GpGain = 14,
+    ApplyStatusEffect = 15,
     /*!
      * @brief Tells the client that it should show combo indicators on actions.
      *
@@ -668,13 +669,13 @@ namespace Sapphire::Common
   {
     Common::ActionEffectType effectType;
     Common::ActionHitSeverityType hitSeverity;
-    uint8_t param;
+    uint8_t unk;
     /*!
      * @brief Shows an additional percentage in the battle log
      *
      * Has no effect on what is shown and stored in value
      */
-    int8_t bonusPercent;
+    uint8_t param; // this one is the real param
     uint8_t valueMultiplier;      // This multiplies whatever value is in the 'value' param by 10. Possibly a workaround for big numbers
     uint8_t flags;
     int16_t value;
diff --git a/src/scripts/action/common/ActionSprint3.cpp b/src/scripts/action/common/ActionSprint3.cpp
index 133cbb2e..4a442ad7 100644
--- a/src/scripts/action/common/ActionSprint3.cpp
+++ b/src/scripts/action/common/ActionSprint3.cpp
@@ -18,6 +18,8 @@ public:
     if( !sourceChara->isPlayer() )
       return;
 
+    action.getEffectbuilder()->applyStatusEffect( sourceChara, 50, 30 );
+
     sourceChara->getAsPlayer()->addStatusEffectByIdIfNotExist( 50, 20000, *sourceChara, 30 );
   }
 };
diff --git a/src/world/Action/Action.cpp b/src/world/Action/Action.cpp
index 4e456c5d..2718465d 100644
--- a/src/world/Action/Action.cpp
+++ b/src/world/Action/Action.cpp
@@ -1,5 +1,4 @@
 #include "Action.h"
-#include "EffectBuilder.h"
 
 #include <Inventory/Item.h>
 
@@ -449,7 +448,11 @@ void Action::Action::buildEffects()
   }
 
   if( !hasLutEntry || m_hitActors.empty() )
+  {
+    // send any effect packet added by script or an empty one just to play animation for other players
+    m_effectBuilder->buildAndSendPackets(); 
     return;
+  }
 
   // no script exists but we have a valid lut entry
   if( auto player = getSourceChara()->getAsPlayer() )
@@ -786,4 +789,9 @@ bool Action::Action::hasValidLutEntry() const
 {
   return m_lutEntry.potency != 0 || m_lutEntry.comboPotency != 0 || m_lutEntry.flankPotency != 0 || m_lutEntry.frontPotency != 0 ||
     m_lutEntry.rearPotency != 0 || m_lutEntry.curePotency != 0 || m_lutEntry.restoreMPPercentage != 0;
+}
+
+Action::EffectBuilderPtr Action::Action::getEffectbuilder()
+{
+  return m_effectBuilder;
 }
\ No newline at end of file
diff --git a/src/world/Action/Action.h b/src/world/Action/Action.h
index b85f5f03..355514b5 100644
--- a/src/world/Action/Action.h
+++ b/src/world/Action/Action.h
@@ -5,6 +5,7 @@
 #include "ActionLut.h"
 #include "Util/ActorFilter.h"
 #include "ForwardsZone.h"
+#include "EffectBuilder.h"
 
 namespace Sapphire::Data
 {
@@ -89,6 +90,8 @@ namespace Sapphire::World::Action
      */
     bool snapshotAffectedActors( std::vector< Entity::CharaPtr >& actors );
 
+    EffectBuilderPtr getEffectbuilder();
+
     void buildEffects();
 
     /*!
diff --git a/src/world/Action/EffectBuilder.cpp b/src/world/Action/EffectBuilder.cpp
index 23765c27..64af6932 100644
--- a/src/world/Action/EffectBuilder.cpp
+++ b/src/world/Action/EffectBuilder.cpp
@@ -84,6 +84,13 @@ void EffectBuilder::comboSucceed( Entity::CharaPtr& target )
   moveToResultList( target, nextResult );
 }
 
+void EffectBuilder::applyStatusEffect( Entity::CharaPtr& target, uint16_t statusId, uint8_t param )
+{
+  EffectResultPtr nextResult = make_EffectResult( target, 0 );
+  nextResult->applyStatusEffect( statusId, param );
+  moveToResultList( target, nextResult );
+}
+
 void EffectBuilder::buildAndSendPackets()
 {
   auto targetCount = m_resolvedEffects.size();
diff --git a/src/world/Action/EffectBuilder.h b/src/world/Action/EffectBuilder.h
index dda471e2..6a4aa240 100644
--- a/src/world/Action/EffectBuilder.h
+++ b/src/world/Action/EffectBuilder.h
@@ -26,6 +26,8 @@ namespace Sapphire::World::Action
 
     void comboSucceed( Entity::CharaPtr& target );
 
+    void applyStatusEffect( Entity::CharaPtr& target, uint16_t statusId, uint8_t param );
+
     void buildAndSendPackets();
 
 
diff --git a/src/world/Action/EffectResult.cpp b/src/world/Action/EffectResult.cpp
index 85684496..9525a361 100644
--- a/src/world/Action/EffectResult.cpp
+++ b/src/world/Action/EffectResult.cpp
@@ -35,11 +35,6 @@ uint64_t EffectResult::getDelay()
   return m_delayMs;
 }
 
-void EffectResult::setParam( uint8_t param )
-{
-  m_param = param;
-}
-
 void EffectResult::damage( uint32_t amount, Common::ActionHitSeverityType severity, Common::ActionEffectResultFlag flag )
 {
   m_severity = severity;
@@ -80,6 +75,14 @@ void EffectResult::comboSucceed()
   m_type = Common::ActionEffectType::ComboSucceed;
 }
 
+void EffectResult::applyStatusEffect( uint16_t statusId, uint8_t param )
+{
+  m_value = statusId;
+  m_param = param;
+
+  m_type = Common::ActionEffectType::ApplyStatusEffect;
+}
+
 Common::EffectEntry EffectResult::buildEffectEntry() const
 {
   Common::EffectEntry entry{};
diff --git a/src/world/Action/EffectResult.h b/src/world/Action/EffectResult.h
index c3f642b3..ebb617c2 100644
--- a/src/world/Action/EffectResult.h
+++ b/src/world/Action/EffectResult.h
@@ -20,6 +20,7 @@ namespace Sapphire::World::Action
     void restoreMP( uint32_t amount, Common::ActionEffectResultFlag flag = Common::ActionEffectResultFlag::None );
     void startCombo( uint16_t actionId );
     void comboSucceed();
+    void applyStatusEffect( uint16_t statusId, uint8_t param );
 
     Entity::CharaPtr getTarget() const;
 
@@ -27,8 +28,6 @@ namespace Sapphire::World::Action
 
     uint64_t getDelay();
 
-    void setParam( uint8_t param );
-
     Common::EffectEntry buildEffectEntry() const;
 
     void execute();

From 08704ffe8882a5f78bee355b4c9ab428ef367b58 Mon Sep 17 00:00:00 2001
From: collett <collett0301@gmail.com>
Date: Fri, 3 Jan 2020 04:06:25 +0900
Subject: [PATCH 220/351] Play the sound effect when buying items from shop.
 When selling the sound effect is also played (and shop switch to buy back tab
 as well) but the selling logic code is not there so...

---
 src/scripts/common/GilShop.cpp  | 4 ++--
 src/world/Actor/Player.h        | 2 +-
 src/world/Actor/PlayerEvent.cpp | 4 +++-
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/scripts/common/GilShop.cpp b/src/scripts/common/GilShop.cpp
index a57a1ecd..d15f1d4d 100644
--- a/src/scripts/common/GilShop.cpp
+++ b/src/scripts/common/GilShop.cpp
@@ -43,7 +43,7 @@ private:
 
       }
 
-      player.playGilShop( result.eventId, SCENE_FLAGS, std::bind( &GilShop::shopInteractionCallback, this, std::placeholders::_1, std::placeholders::_2 ) );
+      player.playGilShop( result.eventId, SCENE_FLAGS, result.param2 == 1 ? 3 : 2, std::bind( &GilShop::shopInteractionCallback, this, std::placeholders::_1, std::placeholders::_2 ) );
       return;
     }
 
@@ -53,7 +53,7 @@ private:
 
   void shopCallback( Entity::Player& player, const Event::SceneResult& result )
   {
-    player.playGilShop( result.eventId, SCENE_FLAGS, std::bind( &GilShop::shopInteractionCallback, this, std::placeholders::_1, std::placeholders::_2 ) );
+    player.playGilShop( result.eventId, SCENE_FLAGS, 0, std::bind( &GilShop::shopInteractionCallback, this, std::placeholders::_1, std::placeholders::_2 ) );
   }
 };
 
diff --git a/src/world/Actor/Player.h b/src/world/Actor/Player.h
index 9f40168c..fc2020e4 100644
--- a/src/world/Actor/Player.h
+++ b/src/world/Actor/Player.h
@@ -67,7 +67,7 @@ namespace Sapphire::Entity
     /*! play a subevent */
     void playScene( uint32_t eventId, uint32_t scene, uint32_t flags, uint32_t eventParam2, uint32_t eventParam3 );
 
-    void playGilShop( uint32_t eventId, uint32_t flags,
+    void playGilShop( uint32_t eventId, uint32_t flags, uint32_t param1,
                       Event::EventHandler::SceneReturnCallback eventCallback );
 
     void directorPlayScene( uint32_t eventId, uint32_t scene, uint32_t flags, uint32_t eventParam3,
diff --git a/src/world/Actor/PlayerEvent.cpp b/src/world/Actor/PlayerEvent.cpp
index 15c84470..8bb7d830 100644
--- a/src/world/Actor/PlayerEvent.cpp
+++ b/src/world/Actor/PlayerEvent.cpp
@@ -130,7 +130,7 @@ void Sapphire::Entity::Player::playScene( uint32_t eventId, uint32_t scene,
   playScene( eventId, scene, flags, eventParam2, eventParam3, 0, eventCallback );
 }
 
-void Sapphire::Entity::Player::playGilShop( uint32_t eventId, uint32_t flags,
+void Sapphire::Entity::Player::playGilShop( uint32_t eventId, uint32_t flags, uint32_t param,
                                             Event::EventHandler::SceneReturnCallback eventCallback )
 {
   auto pEvent = bootstrapSceneEvent( eventId, flags );
@@ -145,6 +145,8 @@ void Sapphire::Entity::Player::playGilShop( uint32_t eventId, uint32_t flags,
   openGilShopPacket->data().eventId = eventId;
   openGilShopPacket->data().sceneFlags = flags;
   openGilShopPacket->data().actorId = getId();
+  openGilShopPacket->data().params[ 0 ] = 1;
+  openGilShopPacket->data().params[ 1 ] = param;
 
   openGilShopPacket->data().scene = 10;
 

From ff2ffa379b6ebc2ac5f3596a975e55418aa056cb Mon Sep 17 00:00:00 2001
From: collett <collett0301@gmail.com>
Date: Tue, 7 Jan 2020 19:08:13 +0900
Subject: [PATCH 221/351] crit & dh

---
 src/common/Common.h               |  6 +--
 src/world/Action/Action.cpp       | 32 ++++++++++--
 src/world/Action/EffectResult.cpp | 10 ++--
 src/world/Action/EffectResult.h   |  3 +-
 src/world/Actor/BNpc.cpp          |  6 +--
 src/world/Actor/Player.cpp        | 10 ++--
 src/world/Math/CalcStats.cpp      | 83 ++++++++++++++++++++++++-------
 src/world/Math/CalcStats.h        | 11 ++--
 8 files changed, 120 insertions(+), 41 deletions(-)

diff --git a/src/common/Common.h b/src/common/Common.h
index ed59e820..95ca262e 100644
--- a/src/common/Common.h
+++ b/src/common/Common.h
@@ -639,9 +639,9 @@ namespace Sapphire::Common
   enum class ActionHitSeverityType : uint8_t
   {
     NormalDamage = 0,
-    CritHeal = 0,
+    NormalHeal = 0,
     CritDamage = 1,
-    NormalHeal = 1,
+    CritHeal = 1,
     DirectHitDamage = 2,
     CritDirectHitDamage = 3
   };
@@ -669,7 +669,7 @@ namespace Sapphire::Common
   {
     Common::ActionEffectType effectType;
     Common::ActionHitSeverityType hitSeverity;
-    uint8_t unk;
+    Common::ActionHitSeverityType healSeverity;
     /*!
      * @brief Shows an additional percentage in the battle log
      *
diff --git a/src/world/Action/Action.cpp b/src/world/Action/Action.cpp
index 2718465d..1f3de39a 100644
--- a/src/world/Action/Action.cpp
+++ b/src/world/Action/Action.cpp
@@ -425,9 +425,30 @@ std::pair< uint32_t, Common::ActionHitSeverityType > Action::Action::calcDamage(
     }
   }
 
-  auto dmg = Math::CalcStats::calcActionDamage( *m_pSource, potency, wepDmg );
+  return Math::CalcStats::calcActionDamage( *m_pSource, potency, wepDmg );
+}
 
-  return std::make_pair( dmg, Common::ActionHitSeverityType::NormalDamage );
+std::pair< uint32_t, Common::ActionHitSeverityType > Action::Action::calcHealing( uint32_t potency )
+{
+  auto wepDmg = 1.f;
+
+  if( auto player = m_pSource->getAsPlayer() )
+  {
+    auto item = player->getEquippedWeapon();
+    assert( item );
+
+    auto role = player->getRole();
+    if( role == Common::Role::RangedMagical || role == Common::Role::Healer )
+    {
+      wepDmg = item->getMagicalDmg();
+    }
+    else
+    {
+      wepDmg = item->getPhysicalDmg();
+    }
+  }
+
+  return Math::CalcStats::calcActionHealing( *m_pSource, potency, wepDmg );
 }
 
 void Action::Action::buildEffects()
@@ -486,7 +507,8 @@ void Action::Action::buildEffects()
       {
         if( m_lutEntry.curePotency > 0 ) // actions with self heal
         {
-          m_effectBuilder->heal( actor, m_pSource, m_lutEntry.curePotency, Common::ActionHitSeverityType::NormalHeal, Common::ActionEffectResultFlag::EffectOnSource );
+          auto heal = calcHealing( m_lutEntry.curePotency );
+          m_effectBuilder->heal( actor, m_pSource, heal.first, heal.second, Common::ActionEffectResultFlag::EffectOnSource );
         }
 
         if( m_lutEntry.restoreMPPercentage > 0 && shouldRestoreMP )
@@ -503,8 +525,8 @@ void Action::Action::buildEffects()
     }
     else if( m_lutEntry.curePotency > 0 )
     {
-      // todo: calcHealing()
-      m_effectBuilder->heal( actor, actor, m_lutEntry.curePotency );
+      auto heal = calcHealing( m_lutEntry.curePotency );
+      m_effectBuilder->heal( actor, actor, heal.first, heal.second );
 
       if( m_lutEntry.restoreMPPercentage > 0 && shouldRestoreMP )
       {
diff --git a/src/world/Action/EffectResult.cpp b/src/world/Action/EffectResult.cpp
index 9525a361..f52839a0 100644
--- a/src/world/Action/EffectResult.cpp
+++ b/src/world/Action/EffectResult.cpp
@@ -12,7 +12,8 @@ EffectResult::EffectResult( Entity::CharaPtr target, uint64_t runAfter ) :
   m_target( std::move( target ) ),
   m_delayMs( runAfter ),
   m_value( 0 ),
-  m_severity( Common::ActionHitSeverityType::NormalDamage ),
+  m_hitSeverity( Common::ActionHitSeverityType::NormalDamage ),
+  m_healSeverity( Common::ActionHitSeverityType::NormalHeal ),
   m_type( Common::ActionEffectType::Nothing ),
   m_param( 0 ),
   m_flag( Common::ActionEffectResultFlag::None )
@@ -37,7 +38,7 @@ uint64_t EffectResult::getDelay()
 
 void EffectResult::damage( uint32_t amount, Common::ActionHitSeverityType severity, Common::ActionEffectResultFlag flag )
 {
-  m_severity = severity;
+  m_hitSeverity = severity;
   m_value = amount;
   m_flag = flag;
 
@@ -46,7 +47,7 @@ void EffectResult::damage( uint32_t amount, Common::ActionHitSeverityType severi
 
 void EffectResult::heal( uint32_t amount, Common::ActionHitSeverityType severity, Common::ActionEffectResultFlag flag )
 {
-  m_severity = severity;
+  m_healSeverity = severity;
   m_value = amount;
   m_flag = flag;
 
@@ -89,7 +90,8 @@ Common::EffectEntry EffectResult::buildEffectEntry() const
 
   // todo: that retarded shit so > u16 max numbers work
   entry.value = getValue();
-  entry.hitSeverity = m_severity;
+  entry.hitSeverity = m_hitSeverity;
+  entry.healSeverity = m_healSeverity;
   entry.effectType = m_type;
   entry.param = m_param;
   entry.flags = static_cast< uint8_t >( m_flag );
diff --git a/src/world/Action/EffectResult.h b/src/world/Action/EffectResult.h
index ebb617c2..ae9ae1aa 100644
--- a/src/world/Action/EffectResult.h
+++ b/src/world/Action/EffectResult.h
@@ -37,7 +37,8 @@ namespace Sapphire::World::Action
 
     Entity::CharaPtr m_target;
 
-    Common::ActionHitSeverityType m_severity;
+    Common::ActionHitSeverityType m_hitSeverity;
+    Common::ActionHitSeverityType m_healSeverity;
     Common::ActionEffectType m_type;
 
     uint32_t m_value;
diff --git a/src/world/Actor/BNpc.cpp b/src/world/Actor/BNpc.cpp
index 38d9a15c..36c07766 100644
--- a/src/world/Actor/BNpc.cpp
+++ b/src/world/Actor/BNpc.cpp
@@ -697,15 +697,15 @@ void Sapphire::Entity::BNpc::autoAttack( CharaPtr pTarget )
     auto effectPacket = std::make_shared< Server::EffectPacket >( getId(), pTarget->getId(), 7 );
     effectPacket->setRotation( Util::floatToUInt16Rot( getRot() ) );
     Common::EffectEntry effectEntry{};
-    effectEntry.value = static_cast< int16_t >( damage );
+    effectEntry.value = static_cast< int16_t >( damage.first );
     effectEntry.effectType = ActionEffectType::Damage;
-    effectEntry.hitSeverity = ActionHitSeverityType::NormalDamage;
+    effectEntry.hitSeverity = damage.second;
     effectEntry.param = 0x71;
     effectPacket->addEffect( effectEntry );
 
     sendToInRangeSet( effectPacket );
 
-    pTarget->takeDamage( static_cast< uint16_t >( damage ) );
+    pTarget->takeDamage( static_cast< uint16_t >( damage.first ) );
 
   }
 }
diff --git a/src/world/Actor/Player.cpp b/src/world/Actor/Player.cpp
index 5bca5e76..d23172bc 100644
--- a/src/world/Actor/Player.cpp
+++ b/src/world/Actor/Player.cpp
@@ -1585,9 +1585,9 @@ void Sapphire::Entity::Player::autoAttack( CharaPtr pTarget )
     effectPacket->setRotation( Util::floatToUInt16Rot( getRot() ) );
 
     Common::EffectEntry entry{};
-    entry.value = damage;
+    entry.value = damage.first;
     entry.effectType = Common::ActionEffectType::Damage;
-    entry.hitSeverity = Common::ActionHitSeverityType::NormalDamage;
+    entry.hitSeverity = damage.second;
     entry.param = 0x72;
 
     effectPacket->addEffect( entry );
@@ -1600,9 +1600,9 @@ void Sapphire::Entity::Player::autoAttack( CharaPtr pTarget )
     effectPacket->setRotation( Util::floatToUInt16Rot( getRot() ) );
 
     Common::EffectEntry entry{};
-    entry.value = damage;
+    entry.value = damage.first;
     entry.effectType = Common::ActionEffectType::Damage;
-    entry.hitSeverity = Common::ActionHitSeverityType::NormalDamage;
+    entry.hitSeverity = damage.second;
     entry.param = 0x73;
 
     effectPacket->addEffect( entry );
@@ -1611,7 +1611,7 @@ void Sapphire::Entity::Player::autoAttack( CharaPtr pTarget )
 
   }
 
-  pTarget->takeDamage( damage );
+  pTarget->takeDamage( damage.first );
 
 }
 
diff --git a/src/world/Math/CalcStats.cpp b/src/world/Math/CalcStats.cpp
index 06834e1d..166b9815 100644
--- a/src/world/Math/CalcStats.cpp
+++ b/src/world/Math/CalcStats.cpp
@@ -104,6 +104,10 @@ const int levelTable[81][6] =
   { 340, 380, 3300, 3600, 569, 569 },
 };
 
+std::random_device CalcStats::dev;
+std::mt19937 CalcStats::rng( dev() );
+std::uniform_int_distribution< std::mt19937::result_type > CalcStats::range100( 0, 99 );
+
 /*
    Class used for battle-related formulas and calculations.
    Big thanks to the Theoryjerks group!
@@ -438,7 +442,7 @@ float CalcStats::healingMagicPotency( const Sapphire::Entity::Chara& chara )
   return std::floor( 100.f * ( chara.getStatValue( Common::BaseParam::HealingMagicPotency ) - 292.f ) / 264.f + 100.f ) / 100.f;
 }
 
-float CalcStats::calcAutoAttackDamage( const Sapphire::Entity::Chara& chara )
+std::pair< float, Sapphire::Common::ActionHitSeverityType > CalcStats::calcAutoAttackDamage( const Sapphire::Entity::Chara& chara )
 {
   // D = ⌊ f(ptc) × f(aa) × f(ap) × f(det) × f(tnc) × traits ⌋ × f(ss) ⌋ ×
   // f(chr) ⌋ × f(dhr) ⌋ × rand[ 0.95, 1.05 ] ⌋ × buff_1 ⌋ × buff... ⌋
@@ -454,6 +458,29 @@ float CalcStats::calcAutoAttackDamage( const Sapphire::Entity::Chara& chara )
 
   // todo: everything after tenacity
   auto factor = std::floor( pot * aa * ap * det * ten );
+  Sapphire::Common::ActionHitSeverityType hitType = Sapphire::Common::ActionHitSeverityType::NormalDamage;
+
+  // todo: traits
+
+  factor = std::floor( factor * speed( chara ) );
+
+  if( criticalHitProbability( chara ) > range100( rng ) )
+  {
+    factor *= criticalHitBonus( chara );
+    hitType = Sapphire::Common::ActionHitSeverityType::CritDamage;
+  }
+
+  if( directHitProbability( chara ) > range100( rng ) )
+  {
+    factor *= 1.25f;
+    hitType = hitType == Sapphire::Common::ActionHitSeverityType::CritDamage ?
+                         Sapphire::Common::ActionHitSeverityType::CritDirectHitDamage :
+                         Sapphire::Common::ActionHitSeverityType::DirectHitDamage;
+  }
+
+  factor *= 1.0f + ( ( range100( rng ) - 50.0f ) / 1000.0f );
+
+  // todo: buffs
 
   constexpr auto format = "auto attack: pot: {} aa: {} ap: {} det: {} ten: {} = {}";
 
@@ -466,22 +493,10 @@ float CalcStats::calcAutoAttackDamage( const Sapphire::Entity::Chara& chara )
     Logger::debug( format, pot, aa, ap, det, ten, factor );
   }
 
-  // todo: traits
-
-  factor = std::floor( factor * speed( chara ) );
-
-  // todo: surely this aint right?
-  //factor = std::floor( factor * criticalHitProbability( chara ) );
-  //factor = std::floor( factor * directHitProbability( chara ) );
-
-  // todo: random 0.95 - 1.05 factor
-
-  // todo: buffs
-
-  return factor;
+  return std::pair( factor, hitType );
 }
 
-float CalcStats::calcActionDamage( const Sapphire::Entity::Chara& chara, uint32_t ptc, float wepDmg )
+std::pair< float, Sapphire::Common::ActionHitSeverityType > CalcStats::calcActionDamage( const Sapphire::Entity::Chara& chara, uint32_t ptc, float wepDmg )
 {
   // D = ⌊ f(pot) × f(wd) × f(ap) × f(det) × f(tnc) × traits ⌋
   // × f(chr) ⌋ × f(dhr) ⌋ × rand[ 0.95, 1.05 ] ⌋ buff_1 ⌋ × buff_1 ⌋ × buff... ⌋
@@ -496,6 +511,25 @@ float CalcStats::calcActionDamage( const Sapphire::Entity::Chara& chara, uint32_
     ten = tenacity( chara );
 
   auto factor = std::floor( pot * wd * ap * det * ten );
+  Sapphire::Common::ActionHitSeverityType hitType = Sapphire::Common::ActionHitSeverityType::NormalDamage;
+
+  if( criticalHitProbability( chara ) > range100( rng ) )
+  {
+    factor *= criticalHitBonus( chara );
+    hitType = Sapphire::Common::ActionHitSeverityType::CritDamage;
+  }
+
+  if( directHitProbability( chara ) > range100( rng ) )
+  {
+    factor *= 1.25f;
+    hitType = hitType == Sapphire::Common::ActionHitSeverityType::CritDamage ?
+                         Sapphire::Common::ActionHitSeverityType::CritDirectHitDamage :
+                         Sapphire::Common::ActionHitSeverityType::DirectHitDamage;
+  }
+
+  factor *= 1.0f + ( ( range100( rng ) - 50.0f ) / 1000.0f );
+
+  // todo: buffs
 
   constexpr auto format = "dmg: pot: {} ({}) wd: {} ({}) ap: {} det: {} ten: {} = {}";
 
@@ -508,9 +542,24 @@ float CalcStats::calcActionDamage( const Sapphire::Entity::Chara& chara, uint32_
     Logger::debug( format, pot, ptc, wd, wepDmg, ap, det, ten, factor );
   }
 
-  // todo: the rest
+  return std::pair( factor, hitType );
+}
 
-  return factor;
+std::pair< float, Sapphire::Common::ActionHitSeverityType > CalcStats::calcActionHealing( const Sapphire::Entity::Chara& chara, uint32_t ptc, float wepDmg )
+{
+  // lol just for testing
+  auto factor = std::floor( ptc * chara.getLevel() / 4.0f );
+  Sapphire::Common::ActionHitSeverityType hitType = Sapphire::Common::ActionHitSeverityType::NormalHeal;
+
+  if( criticalHitProbability( chara ) > range100( rng ) )
+  {
+    factor *= criticalHitBonus( chara );
+    hitType = Sapphire::Common::ActionHitSeverityType::CritHeal;
+  }
+
+  factor *= 1.0f + ( ( range100( rng ) - 50.0f ) / 1000.0f );
+
+  return std::pair( factor, hitType );
 }
 
 uint32_t CalcStats::primaryStatValue( const Sapphire::Entity::Chara& chara )
diff --git a/src/world/Math/CalcStats.h b/src/world/Math/CalcStats.h
index 1b22238a..ce095b53 100644
--- a/src/world/Math/CalcStats.h
+++ b/src/world/Math/CalcStats.h
@@ -1,6 +1,7 @@
 #ifndef _CALCSTATS_H
 #define _CALCSTATS_H
 
+#include <random>
 #include <Common.h>
 #include "Forwards.h"
 
@@ -128,9 +129,11 @@ namespace Sapphire::Math
 
     ////////////////////////////////////////////
 
-    static float calcAutoAttackDamage( const Sapphire::Entity::Chara& chara );
+    static std::pair< float, Common::ActionHitSeverityType > calcAutoAttackDamage( const Sapphire::Entity::Chara& chara );
 
-    static float calcActionDamage( const Sapphire::Entity::Chara& chara, uint32_t ptc, float wepDmg );
+    static std::pair< float, Common::ActionHitSeverityType > calcActionDamage( const Sapphire::Entity::Chara& chara, uint32_t ptc, float wepDmg );
+
+    static std::pair< float, Common::ActionHitSeverityType > calcActionHealing( const Sapphire::Entity::Chara& chara, uint32_t ptc, float wepDmg );
 
     static uint32_t primaryStatValue( const Sapphire::Entity::Chara& chara );
   private:
@@ -142,7 +145,9 @@ namespace Sapphire::Math
      */
     static float calcAttackPower( const Sapphire::Entity::Chara& chara, uint32_t attackPower );
 
-
+    static std::random_device dev;
+    static std::mt19937 rng;
+    static std::uniform_int_distribution< std::mt19937::result_type > range100;
   };
 
 }

From 1893cb951fe0ba9bc60d8d2add4d8978d5111d7a Mon Sep 17 00:00:00 2001
From: collett <collett0301@gmail.com>
Date: Tue, 7 Jan 2020 19:46:07 +0900
Subject: [PATCH 222/351] less op test value

---
 src/world/Math/CalcStats.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/world/Math/CalcStats.cpp b/src/world/Math/CalcStats.cpp
index 166b9815..7544fb9a 100644
--- a/src/world/Math/CalcStats.cpp
+++ b/src/world/Math/CalcStats.cpp
@@ -548,7 +548,7 @@ std::pair< float, Sapphire::Common::ActionHitSeverityType > CalcStats::calcActio
 std::pair< float, Sapphire::Common::ActionHitSeverityType > CalcStats::calcActionHealing( const Sapphire::Entity::Chara& chara, uint32_t ptc, float wepDmg )
 {
   // lol just for testing
-  auto factor = std::floor( ptc * chara.getLevel() / 4.0f );
+  auto factor = std::floor( ptc * ( wepDmg / 10.0f ) + ptc );
   Sapphire::Common::ActionHitSeverityType hitType = Sapphire::Common::ActionHitSeverityType::NormalHeal;
 
   if( criticalHitProbability( chara ) > range100( rng ) )

From ccc81ed90a3ea023b7c432625adee69221e27e77 Mon Sep 17 00:00:00 2001
From: collett <collett0301@gmail.com>
Date: Wed, 8 Jan 2020 17:21:01 +0900
Subject: [PATCH 223/351] effect entry field rename

---
 src/common/Common.h               |  6 +++---
 src/world/Action/EffectResult.cpp | 18 +++++++++---------
 src/world/Action/EffectResult.h   |  7 ++++---
 3 files changed, 16 insertions(+), 15 deletions(-)

diff --git a/src/common/Common.h b/src/common/Common.h
index 95ca262e..3777085c 100644
--- a/src/common/Common.h
+++ b/src/common/Common.h
@@ -668,14 +668,14 @@ namespace Sapphire::Common
   struct EffectEntry
   {
     Common::ActionEffectType effectType;
-    Common::ActionHitSeverityType hitSeverity;
-    Common::ActionHitSeverityType healSeverity;
+    uint8_t param0;
+    uint8_t param1;
     /*!
      * @brief Shows an additional percentage in the battle log
      *
      * Has no effect on what is shown and stored in value
      */
-    uint8_t param; // this one is the real param
+    uint8_t param2;
     uint8_t valueMultiplier;      // This multiplies whatever value is in the 'value' param by 10. Possibly a workaround for big numbers
     uint8_t flags;
     int16_t value;
diff --git a/src/world/Action/EffectResult.cpp b/src/world/Action/EffectResult.cpp
index f52839a0..f8feeafb 100644
--- a/src/world/Action/EffectResult.cpp
+++ b/src/world/Action/EffectResult.cpp
@@ -12,10 +12,10 @@ EffectResult::EffectResult( Entity::CharaPtr target, uint64_t runAfter ) :
   m_target( std::move( target ) ),
   m_delayMs( runAfter ),
   m_value( 0 ),
-  m_hitSeverity( Common::ActionHitSeverityType::NormalDamage ),
-  m_healSeverity( Common::ActionHitSeverityType::NormalHeal ),
+  m_param0( 0 ),
+  m_param1( 0 ),
   m_type( Common::ActionEffectType::Nothing ),
-  m_param( 0 ),
+  m_param2( 0 ),
   m_flag( Common::ActionEffectResultFlag::None )
 {
 
@@ -38,7 +38,7 @@ uint64_t EffectResult::getDelay()
 
 void EffectResult::damage( uint32_t amount, Common::ActionHitSeverityType severity, Common::ActionEffectResultFlag flag )
 {
-  m_hitSeverity = severity;
+  m_param0 = static_cast< uint8_t >( severity );
   m_value = amount;
   m_flag = flag;
 
@@ -47,7 +47,7 @@ void EffectResult::damage( uint32_t amount, Common::ActionHitSeverityType severi
 
 void EffectResult::heal( uint32_t amount, Common::ActionHitSeverityType severity, Common::ActionEffectResultFlag flag )
 {
-  m_healSeverity = severity;
+  m_param1 = static_cast< uint8_t >( severity );
   m_value = amount;
   m_flag = flag;
 
@@ -79,7 +79,7 @@ void EffectResult::comboSucceed()
 void EffectResult::applyStatusEffect( uint16_t statusId, uint8_t param )
 {
   m_value = statusId;
-  m_param = param;
+  m_param2 = param;
 
   m_type = Common::ActionEffectType::ApplyStatusEffect;
 }
@@ -90,10 +90,10 @@ Common::EffectEntry EffectResult::buildEffectEntry() const
 
   // todo: that retarded shit so > u16 max numbers work
   entry.value = getValue();
-  entry.hitSeverity = m_hitSeverity;
-  entry.healSeverity = m_healSeverity;
+  entry.param0 = m_param0;
+  entry.param1 = m_param1;
   entry.effectType = m_type;
-  entry.param = m_param;
+  entry.param2 = m_param2;
   entry.flags = static_cast< uint8_t >( m_flag );
 
   return entry;
diff --git a/src/world/Action/EffectResult.h b/src/world/Action/EffectResult.h
index ae9ae1aa..ad69f205 100644
--- a/src/world/Action/EffectResult.h
+++ b/src/world/Action/EffectResult.h
@@ -37,12 +37,13 @@ namespace Sapphire::World::Action
 
     Entity::CharaPtr m_target;
 
-    Common::ActionHitSeverityType m_hitSeverity;
-    Common::ActionHitSeverityType m_healSeverity;
     Common::ActionEffectType m_type;
 
+    uint8_t m_param0;
+    uint8_t m_param1;
+    uint8_t m_param2;
+
     uint32_t m_value;
-    uint8_t m_param;
     Common::ActionEffectResultFlag m_flag;
   };
 }

From e72d5d224dc098ec3526ecdf2462c50453ee7f89 Mon Sep 17 00:00:00 2001
From: collett <collett0301@gmail.com>
Date: Wed, 8 Jan 2020 17:32:15 +0900
Subject: [PATCH 224/351] oops

---
 src/world/Actor/BNpc.cpp   | 4 ++--
 src/world/Actor/Player.cpp | 8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/world/Actor/BNpc.cpp b/src/world/Actor/BNpc.cpp
index 36c07766..ddb3f54b 100644
--- a/src/world/Actor/BNpc.cpp
+++ b/src/world/Actor/BNpc.cpp
@@ -699,8 +699,8 @@ void Sapphire::Entity::BNpc::autoAttack( CharaPtr pTarget )
     Common::EffectEntry effectEntry{};
     effectEntry.value = static_cast< int16_t >( damage.first );
     effectEntry.effectType = ActionEffectType::Damage;
-    effectEntry.hitSeverity = damage.second;
-    effectEntry.param = 0x71;
+    effectEntry.param0 = static_cast< uint8_t >( damage.second );
+    effectEntry.param2 = 0x71;
     effectPacket->addEffect( effectEntry );
 
     sendToInRangeSet( effectPacket );
diff --git a/src/world/Actor/Player.cpp b/src/world/Actor/Player.cpp
index d23172bc..39e64585 100644
--- a/src/world/Actor/Player.cpp
+++ b/src/world/Actor/Player.cpp
@@ -1587,8 +1587,8 @@ void Sapphire::Entity::Player::autoAttack( CharaPtr pTarget )
     Common::EffectEntry entry{};
     entry.value = damage.first;
     entry.effectType = Common::ActionEffectType::Damage;
-    entry.hitSeverity = damage.second;
-    entry.param = 0x72;
+    entry.param0 = static_cast< uint8_t >( damage.second );
+    entry.param2 = 0x72;
 
     effectPacket->addEffect( entry );
 
@@ -1602,8 +1602,8 @@ void Sapphire::Entity::Player::autoAttack( CharaPtr pTarget )
     Common::EffectEntry entry{};
     entry.value = damage.first;
     entry.effectType = Common::ActionEffectType::Damage;
-    entry.hitSeverity = damage.second;
-    entry.param = 0x73;
+    entry.param0 = static_cast< uint8_t >( damage.second );
+    entry.param2 = 0x73;
 
     effectPacket->addEffect( entry );
 

From 47d6d285ffa0d8dc9e9b401eacbe30299a2c6732 Mon Sep 17 00:00:00 2001
From: collett <collett0301@gmail.com>
Date: Wed, 8 Jan 2020 17:59:02 +0900
Subject: [PATCH 225/351] rip vs2019 right click rename

---
 src/world/Actor/Chara.cpp             | 4 ++--
 src/world/Manager/DebugCommandMgr.cpp | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/world/Actor/Chara.cpp b/src/world/Actor/Chara.cpp
index 6adcfcc9..97712dd8 100644
--- a/src/world/Actor/Chara.cpp
+++ b/src/world/Actor/Chara.cpp
@@ -508,8 +508,8 @@ void Sapphire::Entity::Chara::autoAttack( CharaPtr pTarget )
     Common::EffectEntry effectEntry{};
     effectEntry.value = static_cast< int16_t >( damage );
     effectEntry.effectType = ActionEffectType::Damage;
-    effectEntry.hitSeverity = ActionHitSeverityType::NormalDamage;
-    effectEntry.param = 0x71;
+    effectEntry.param0 = static_cast< uint8_t >( ActionHitSeverityType::NormalDamage );
+    effectEntry.param2 = 0x71;
     effectPacket->addEffect( effectEntry );
 
     sendToInRangeSet( effectPacket );
diff --git a/src/world/Manager/DebugCommandMgr.cpp b/src/world/Manager/DebugCommandMgr.cpp
index af8fe6c7..bba8c523 100644
--- a/src/world/Manager/DebugCommandMgr.cpp
+++ b/src/world/Manager/DebugCommandMgr.cpp
@@ -513,7 +513,7 @@ void Sapphire::World::Manager::DebugCommandMgr::add( char* data, Entity::Player&
     Common::EffectEntry entry{};
     entry.value = static_cast< int16_t >( param1 );
     entry.effectType = Common::ActionEffectType::Damage;
-    entry.hitSeverity = Common::ActionHitSeverityType::NormalDamage;
+    entry.param0 = static_cast< uint8_t >( Common::ActionHitSeverityType::NormalDamage );
 
     effectPacket->addEffect( entry );
 

From 6e4f861234f7e9691a326fda83be9a60faf516fd Mon Sep 17 00:00:00 2001
From: collett <collett0301@gmail.com>
Date: Wed, 8 Jan 2020 18:21:30 +0900
Subject: [PATCH 226/351] Fix shop packet.

---
 src/scripts/common/GilShop.cpp  |  2 +-
 src/world/Actor/PlayerEvent.cpp | 18 ++++++++++++++++--
 2 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/src/scripts/common/GilShop.cpp b/src/scripts/common/GilShop.cpp
index d15f1d4d..8e7afe0e 100644
--- a/src/scripts/common/GilShop.cpp
+++ b/src/scripts/common/GilShop.cpp
@@ -43,7 +43,7 @@ private:
 
       }
 
-      player.playGilShop( result.eventId, SCENE_FLAGS, result.param2 == 1 ? 3 : 2, std::bind( &GilShop::shopInteractionCallback, this, std::placeholders::_1, std::placeholders::_2 ) );
+      player.playGilShop( result.eventId, SCENE_FLAGS, result.param2, std::bind( &GilShop::shopInteractionCallback, this, std::placeholders::_1, std::placeholders::_2 ) );
       return;
     }
 
diff --git a/src/world/Actor/PlayerEvent.cpp b/src/world/Actor/PlayerEvent.cpp
index 8bb7d830..a3d2393f 100644
--- a/src/world/Actor/PlayerEvent.cpp
+++ b/src/world/Actor/PlayerEvent.cpp
@@ -145,8 +145,22 @@ void Sapphire::Entity::Player::playGilShop( uint32_t eventId, uint32_t flags, ui
   openGilShopPacket->data().eventId = eventId;
   openGilShopPacket->data().sceneFlags = flags;
   openGilShopPacket->data().actorId = getId();
-  openGilShopPacket->data().params[ 0 ] = 1;
-  openGilShopPacket->data().params[ 1 ] = param;
+  switch( param )
+  {
+    case 1:
+    {
+      openGilShopPacket->data().params[ 0 ] = 0x02;
+      openGilShopPacket->data().params[ 1 ] = 1;
+      openGilShopPacket->data().params[ 2 ] = 0x64;
+      break;
+    }
+    case 2:
+    {
+      openGilShopPacket->data().params[ 0 ] = 0xA2;
+      openGilShopPacket->data().params[ 1 ] = 2;
+      break;
+    }
+  }
 
   openGilShopPacket->data().scene = 10;
 

From 54ecc63fb8c47535af5bdc5215486db8133c6e4c Mon Sep 17 00:00:00 2001
From: collett <collett0301@gmail.com>
Date: Wed, 8 Jan 2020 18:28:19 +0900
Subject: [PATCH 227/351] rename

---
 src/world/Actor/PlayerEvent.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/world/Actor/PlayerEvent.cpp b/src/world/Actor/PlayerEvent.cpp
index a3d2393f..0303b4fb 100644
--- a/src/world/Actor/PlayerEvent.cpp
+++ b/src/world/Actor/PlayerEvent.cpp
@@ -130,7 +130,7 @@ void Sapphire::Entity::Player::playScene( uint32_t eventId, uint32_t scene,
   playScene( eventId, scene, flags, eventParam2, eventParam3, 0, eventCallback );
 }
 
-void Sapphire::Entity::Player::playGilShop( uint32_t eventId, uint32_t flags, uint32_t param,
+void Sapphire::Entity::Player::playGilShop( uint32_t eventId, uint32_t flags, uint32_t param1,
                                             Event::EventHandler::SceneReturnCallback eventCallback )
 {
   auto pEvent = bootstrapSceneEvent( eventId, flags );
@@ -145,7 +145,7 @@ void Sapphire::Entity::Player::playGilShop( uint32_t eventId, uint32_t flags, ui
   openGilShopPacket->data().eventId = eventId;
   openGilShopPacket->data().sceneFlags = flags;
   openGilShopPacket->data().actorId = getId();
-  switch( param )
+  switch( param1 )
   {
     case 1:
     {

From a70f381e68d7e62adc5072996968b5ee6400a171 Mon Sep 17 00:00:00 2001
From: NotAdam <adam@notadam.me>
Date: Sat, 11 Jan 2020 18:20:06 +1100
Subject: [PATCH 228/351] fix some warnings & world shouldn't crash when
 warming up object cache

---
 .../instances/questbattles/ChasingShadows.cpp        |  2 +-
 src/scripts/quest/subquest/gridania/SubFst034.cpp    |  2 +-
 src/world/Territory/InstanceObjectCache.cpp          | 12 ++++++------
 src/world/Territory/InstanceObjectCache.h            |  9 ++++-----
 4 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/src/scripts/instances/questbattles/ChasingShadows.cpp b/src/scripts/instances/questbattles/ChasingShadows.cpp
index 336cd0d6..8963ff11 100644
--- a/src/scripts/instances/questbattles/ChasingShadows.cpp
+++ b/src/scripts/instances/questbattles/ChasingShadows.cpp
@@ -38,7 +38,7 @@ private:
 public:
   ChasingShadows() : Sapphire::ScriptAPI::QuestBattleScript( 11 ) {}
 
-  void onPlayerSetup( Sapphire::QuestBattle& instance, Entity::Player& player )
+  void onPlayerSetup( Sapphire::QuestBattle& instance, Entity::Player& player ) override
   {
     player.setRot( 3.f );
     player.setPos( { 323.f, -1.28f, -320.f } );
diff --git a/src/scripts/quest/subquest/gridania/SubFst034.cpp b/src/scripts/quest/subquest/gridania/SubFst034.cpp
index bde01858..a2604bf4 100644
--- a/src/scripts/quest/subquest/gridania/SubFst034.cpp
+++ b/src/scripts/quest/subquest/gridania/SubFst034.cpp
@@ -72,7 +72,7 @@ class SubFst034 : public Sapphire::ScriptAPI::EventScript
 
   }
 
-  void onBNpcKill( uint32_t npcId, Entity::Player& player )
+  void onBNpcKill( uint32_t npcId, Entity::Player& player ) override
   {
     switch( npcId )
     {
diff --git a/src/world/Territory/InstanceObjectCache.cpp b/src/world/Territory/InstanceObjectCache.cpp
index 92b16aa4..e4e18815 100644
--- a/src/world/Territory/InstanceObjectCache.cpp
+++ b/src/world/Territory/InstanceObjectCache.cpp
@@ -80,18 +80,18 @@ Sapphire::InstanceObjectCache::InstanceObjectCache( std::shared_ptr< Framework >
         {
           if( pEntry->getType() == LgbEntryType::MapRange )
           {
-            auto pMapRange = reinterpret_cast< LGB_MAP_RANGE_ENTRY* >( pEntry.get() );
-            m_mapRangeCache.insert( id, *pMapRange );
+            auto pMapRange = std::reinterpret_pointer_cast< LGB_MAP_RANGE_ENTRY >( pEntry );
+            m_mapRangeCache.insert( id, pMapRange );
           }
           else if( pEntry->getType() == LgbEntryType::ExitRange )
           {
-            auto pExitRange = reinterpret_cast< LGB_EXIT_RANGE_ENTRY* >( pEntry.get() );
-            m_exitRangeCache.insert( id, *pExitRange);
+            auto pExitRange = std::reinterpret_pointer_cast< LGB_EXIT_RANGE_ENTRY >( pEntry );
+            m_exitRangeCache.insert( id, pExitRange );
           }
           else if( pEntry->getType() == LgbEntryType::PopRange )
           {
-            auto pPopRange = reinterpret_cast< LGB_POP_RANGE_ENTRY* >( pEntry.get() );
-            m_popRangeCache.insert( id, *pPopRange );
+            auto pPopRange = std::reinterpret_pointer_cast< LGB_POP_RANGE_ENTRY >( pEntry );
+            m_popRangeCache.insert( id, pPopRange );
           }
         }
       }
diff --git a/src/world/Territory/InstanceObjectCache.h b/src/world/Territory/InstanceObjectCache.h
index 74171d7f..0476adb6 100644
--- a/src/world/Territory/InstanceObjectCache.h
+++ b/src/world/Territory/InstanceObjectCache.h
@@ -38,19 +38,18 @@ namespace Sapphire
       return nullptr;
     }
 
-    void insert( uint16_t zoneId, T& entry )
+    void insert( uint16_t zoneId, std::shared_ptr< T > entry )
     {
-      auto pShared = std::make_shared< T >( entry );
       if( m_objectCache.find( zoneId ) == m_objectCache.end() )
       {
         ObjectMap cache;
-        cache[ entry.header.instanceId ] = pShared;
+        cache[ entry->header.instanceId ] = std::move( entry );
         m_objectCache[ zoneId ] = cache;
       }
       else
       {
         auto it = m_objectCache.find( zoneId );
-        it->second[ entry.header.instanceId ] = pShared;
+        it->second[ entry->header.instanceId ] = std::move( entry );
       }
     }
 
@@ -67,7 +66,7 @@ namespace Sapphire
     using ExitRangePtr = std::shared_ptr< LGB_EXIT_RANGE_ENTRY >;
     using PopRangePtr = std::shared_ptr< LGB_POP_RANGE_ENTRY >;
 
-    InstanceObjectCache( std::shared_ptr< Framework > pFramework );
+    explicit InstanceObjectCache( std::shared_ptr< Framework > pFramework );
     ~InstanceObjectCache() = default;
 
     MapRangePtr getMapRange( uint16_t zoneId, uint32_t mapRangeId );

From e3b39214b42a3d1b7edef881b4f54948b35f401b Mon Sep 17 00:00:00 2001
From: NotAdam <adam@notadam.me>
Date: Wed, 15 Jan 2020 20:05:29 +1100
Subject: [PATCH 229/351] add mariadb 10.4 and 10.5 (alpha) to mysql lib
 discovery

---
 cmake/FindMySQL.cmake | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/cmake/FindMySQL.cmake b/cmake/FindMySQL.cmake
index 034e94d7..0042d308 100644
--- a/cmake/FindMySQL.cmake
+++ b/cmake/FindMySQL.cmake
@@ -85,6 +85,8 @@ find_path(MYSQL_INCLUDE_DIR
     "${PROGRAM_FILES_64}/MySQL/MySQL Server 5.7/include"
     "${PROGRAM_FILES_64}/MySQL/include"
     "${PROGRAM_FILES_64}/MariaDB 10.3/include/mysql"
+    "${PROGRAM_FILES_64}/MariaDB 10.4/include/mysql"
+    "${PROGRAM_FILES_64}/MariaDB 10.5/include/mysql"
     "C:/MySQL/include"
     "[HKEY_LOCAL_MACHINE\\SOFTWARE\\MySQL AB\\MySQL Server 5.7;Location]/include"
     "$ENV{ProgramFiles}/MySQL/MySQL Server 5.7/include"
@@ -124,6 +126,8 @@ if( WIN32 )
       "${PROGRAM_FILES_64}/MySQL/MySQL Server 5.7/lib/opt"
       "${PROGRAM_FILES_64}/MySQL/lib"
       "${PROGRAM_FILES_64}/MariaDB 10.3/lib"
+      "${PROGRAM_FILES_64}/MariaDB 10.4/lib"
+      "${PROGRAM_FILES_64}/MariaDB 10.5/lib"
       "C:/MySQL/lib/debug"
       "[HKEY_LOCAL_MACHINE\\SOFTWARE\\MySQL AB\\MySQL Server 5.7;Location]/lib"
       "[HKEY_LOCAL_MACHINE\\SOFTWARE\\MySQL AB\\MySQL Server 5.7;Location]/lib/opt"
@@ -177,6 +181,8 @@ if( WIN32 )
         "${PROGRAM_FILES_64}/MySQL/MySQL Server 5.7/bin/opt"
         "${PROGRAM_FILES_64}/MySQL/bin"
         "${PROGRAM_FILES_64}/MariaDB 10.3/bin"
+        "${PROGRAM_FILES_64}/MariaDB 10.4/bin"
+        "${PROGRAM_FILES_64}/MariaDB 10.5/bin"
         "C:/MySQL/bin/debug"
         "[HKEY_LOCAL_MACHINE\\SOFTWARE\\MySQL AB\\MySQL Server 5.7;Location]/bin"
         "[HKEY_LOCAL_MACHINE\\SOFTWARE\\MySQL AB\\MySQL Server 5.7;Location]/bin/opt"

From 3fb6657d7d181d25622a94d600b1b9343a597faa Mon Sep 17 00:00:00 2001
From: NotAdam <adam@notadam.me>
Date: Sat, 18 Jan 2020 12:32:17 +1100
Subject: [PATCH 230/351] fix lobby error message reading from packet
 incorrectly

---
 src/lobby/GameConnection.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/lobby/GameConnection.cpp b/src/lobby/GameConnection.cpp
index 16c4d4da..b3d85ddb 100644
--- a/src/lobby/GameConnection.cpp
+++ b/src/lobby/GameConnection.cpp
@@ -267,7 +267,7 @@ bool Lobby::GameConnection::sendServiceAccountList( FFXIVARR_PACKET_RAW& packet,
   }
   else
   {
-    Logger::info( "Could not retrieve session: {0}", std::string( ( char* ) &packet.data[ 0 ] + 0x20 ) );
+    Logger::info( "Could not retrieve session: {0}", std::string( ( char* ) &packet.data[ 0 ] + 0x22 ) );
     sendError( 1, 5006, 13001, tmpId );
 
     return true;

From 60e701dbdd252d3e8f8464c54cbe2420dfbc11ba Mon Sep 17 00:00:00 2001
From: collett <collett0301@gmail.com>
Date: Sun, 19 Jan 2020 21:20:01 +0900
Subject: [PATCH 231/351] enum/struct/packet updates, fix dot/hot tick, remove
 incorrect initial delay for player autoattacks.

---
 src/common/Common.h                           | 11 ++-
 src/common/Network/PacketDef/Ipcs.h           |  2 +-
 .../Network/PacketDef/Zone/ServerZoneDef.h    | 28 +++---
 src/world/Action/Action.cpp                   |  4 +-
 src/world/Actor/BNpc.cpp                      |  1 +
 src/world/Actor/Chara.cpp                     | 90 ++++++++++---------
 src/world/Actor/Chara.h                       |  2 +-
 src/world/Actor/Player.cpp                    |  3 -
 src/world/Actor/PlayerEvent.cpp               |  2 +-
 .../Network/PacketWrappers/NpcSpawnPacket.h   |  2 +-
 .../PacketWrappers/PlayerSpawnPacket.h        |  2 +-
 11 files changed, 73 insertions(+), 74 deletions(-)

diff --git a/src/common/Common.h b/src/common/Common.h
index 3777085c..543d5cd1 100644
--- a/src/common/Common.h
+++ b/src/common/Common.h
@@ -412,7 +412,7 @@ namespace Sapphire::Common
   struct StatusEffect
   {
     uint16_t effect_id;
-    uint16_t unknown1;
+    uint16_t param;
     float duration;
     uint32_t sourceActorId;
   };
@@ -591,9 +591,10 @@ namespace Sapphire::Common
 //    DRGGauge3Eyes = 76,
   };
 
-  enum class ActionType : int8_t
+  enum class AttackType : int8_t
   {
-    WeaponOverride = -1, // Needs more investigation (takes the damage type of the equipped weapon)?
+    //WeaponOverride = -1, // Needs more investigation (takes the damage type of the equipped weapon)?
+    Physical = -1, // seems to be the case
     Unknown_0 = 0,
     Slashing = 1,
     Piercing = 2,
@@ -623,6 +624,8 @@ namespace Sapphire::Common
     TpGain = 13,
     GpGain = 14,
     ApplyStatusEffect = 15,
+    //ApplyStatusEffect2 = 16, // thin air uses this one but works fine with 15 wtf?
+    StatusNoEffect = 21,
     /*!
      * @brief Tells the client that it should show combo indicators on actions.
      *
@@ -649,7 +652,9 @@ namespace Sapphire::Common
   enum class ActionEffectResultFlag : uint8_t
   {
     None = 0,
+    Absorbed = 0x04,
     EffectOnSource = 0x80,
+    Reflected = 0xA0,
   };
 
   enum ItemActionType : uint16_t
diff --git a/src/common/Network/PacketDef/Ipcs.h b/src/common/Network/PacketDef/Ipcs.h
index 7bced52d..97dba6ba 100644
--- a/src/common/Network/PacketDef/Ipcs.h
+++ b/src/common/Network/PacketDef/Ipcs.h
@@ -160,7 +160,7 @@ namespace Sapphire::Network::Packets
     PlayerStateFlags = 0x02C6, // updated 5.18
     PlayerClassInfo = 0x01B0, // updated 5.18
 
-    ModelEquip = 0x0170, // updated 5.11
+    ModelEquip = 0x02E6, // updated 5.18
     Examine = 0x0366, // updated 5.18
     CharaNameReq = 0x0116, // updated 5.18
 
diff --git a/src/common/Network/PacketDef/Zone/ServerZoneDef.h b/src/common/Network/PacketDef/Zone/ServerZoneDef.h
index 74bd02b2..8a06167b 100644
--- a/src/common/Network/PacketDef/Zone/ServerZoneDef.h
+++ b/src/common/Network/PacketDef/Zone/ServerZoneDef.h
@@ -422,7 +422,8 @@ namespace Sapphire::Network::Packets::Server
     uint16_t current_mp;
     uint16_t max_mp;
     uint16_t currentTp;
-    uint16_t unknown1;
+    uint8_t shieldPercentage;
+    uint8_t unknown1;
     Common::StatusEffect effect[30];
     uint32_t padding;
   };
@@ -439,27 +440,18 @@ namespace Sapphire::Network::Packets::Server
   */
   struct FFXIVIpcEffectResult : FFXIVIpcBasePacket< EffectResult >
   {
-    uint32_t unknown;
+    uint32_t globalSequence;
     uint32_t actor_id;
-    //uint8_t unknown1;
-    //uint8_t unknown2;
-    //uint16_t padding1;
-    //uint32_t current_hp;
-    //uint16_t current_mp;
-    //uint16_t current_tp;
-    //uint32_t max_hp;
-    //uint16_t max_mp;
-    //uint16_t max_something;
     uint32_t current_hp;
     uint32_t max_hp;
     uint16_t current_mp;
-    uint16_t unknown1;
+    uint16_t current_tp;
     uint16_t max_mp;
-    uint8_t unknown2;
+    uint8_t unknown1;
     uint8_t classId;
-    uint8_t unknown4;
-    uint8_t unkFlag;
-    uint16_t unknown6;
+    uint8_t shieldPercentage;
+    uint8_t entryCount;
+    uint16_t unknown2;
 
     struct StatusEntry
     {
@@ -467,12 +459,12 @@ namespace Sapphire::Network::Packets::Server
       uint8_t unknown3;
       uint16_t id;
       uint16_t param;
-      uint16_t unknown5;    // Sort this out (old right half of power/param property)
+      uint16_t unknown4;    // Sort this out (old right half of power/param property)
       float duration;
       uint32_t sourceActorId;
     } statusEntries[4];
 
-    uint32_t unknown7;
+    uint32_t unknown5;
   };
 
   /**
diff --git a/src/world/Action/Action.cpp b/src/world/Action/Action.cpp
index 1f3de39a..9a89c249 100644
--- a/src/world/Action/Action.cpp
+++ b/src/world/Action/Action.cpp
@@ -565,7 +565,7 @@ bool Action::Action::playerPreCheck( Entity::Player& player )
     return false;
 
   // npc actions/non player actions
-  if( m_actionData->classJob == -1 )
+  if( m_actionData->classJob == -1 && !m_actionData->isRoleAction )
     return false;
 
   if( player.getLevel() < m_actionData->classJobLevel )
@@ -574,7 +574,7 @@ bool Action::Action::playerPreCheck( Entity::Player& player )
   auto currentClass = player.getClass();
   auto actionClass = static_cast< Common::ClassJob >( m_actionData->classJob );
 
-  if( actionClass != Common::ClassJob::Adventurer && currentClass != actionClass )
+  if( actionClass != Common::ClassJob::Adventurer && currentClass != actionClass && !m_actionData->isRoleAction )
   {
     // check if not a base class action
     auto exdData = m_pFw->get< Data::ExdDataGenerated >();
diff --git a/src/world/Actor/BNpc.cpp b/src/world/Actor/BNpc.cpp
index ddb3f54b..b24d1053 100644
--- a/src/world/Actor/BNpc.cpp
+++ b/src/world/Actor/BNpc.cpp
@@ -396,6 +396,7 @@ void Sapphire::Entity::BNpc::deaggro( Sapphire::Entity::CharaPtr pChara )
 
 void Sapphire::Entity::BNpc::onTick()
 {
+  Chara::onTick();
   if( m_state == BNpcState::Retreat )
   {
     regainHp();
diff --git a/src/world/Actor/Chara.cpp b/src/world/Actor/Chara.cpp
index 97712dd8..6ecec118 100644
--- a/src/world/Actor/Chara.cpp
+++ b/src/world/Actor/Chara.cpp
@@ -44,6 +44,7 @@ Sapphire::Entity::Chara::Chara( ObjKind type, FrameworkPtr pFw ) :
 
   m_lastTickTime = 0;
   m_lastUpdate = 0;
+  m_lastAttack = Util::getTimeMs();
 
   m_bonusStats.fill( 0 );
 
@@ -354,6 +355,8 @@ bool Sapphire::Entity::Chara::checkAction()
 
 void Sapphire::Entity::Chara::update( uint64_t tickCount )
 {
+  updateStatusEffects();
+
   if( std::difftime( static_cast< time_t >( tickCount ), m_lastTickTime ) > 3000 )
   {
     onTick();
@@ -532,16 +535,15 @@ void Sapphire::Entity::Chara::addStatusEffect( StatusEffect::StatusEffectPtr pEf
 
   auto statusEffectAdd = makeZonePacket< FFXIVIpcEffectResult >( getId() );
 
+  statusEffectAdd->data().globalSequence = getCurrentTerritory()->getNextEffectSequence();
   statusEffectAdd->data().actor_id = pEffect->getTargetActorId();
   statusEffectAdd->data().current_hp = getHp();
   statusEffectAdd->data().current_mp = static_cast< uint16_t >( getMp() );
-  //statusEffectAdd->data().current_tp = getTp();
+  statusEffectAdd->data().current_tp = getTp();
   statusEffectAdd->data().max_hp = getMaxHp();
   statusEffectAdd->data().max_mp = static_cast< uint16_t >( getMaxMp() );
-  //statusEffectAdd->data().max_something = 1;
-  //statusEffectAdd->data().unknown2 = 28;
-  statusEffectAdd->data().classId = static_cast< uint8_t >(getClass());
-  statusEffectAdd->data().unkFlag = 1;
+  statusEffectAdd->data().classId = static_cast< uint8_t >( getClass() );
+  statusEffectAdd->data().entryCount = 1;
 
   auto& status = statusEffectAdd->data().statusEntries[0];
 
@@ -681,9 +683,6 @@ void Sapphire::Entity::Chara::updateStatusEffects()
 {
   uint64_t currentTimeMs = Util::getTimeMs();
 
-  uint32_t thisTickDmg = 0;
-  uint32_t thisTickHeal = 0;
-
   for( auto effectIt : m_statusEffectMap )
   {
     uint8_t effectIndex = effectIt.first;
@@ -694,7 +693,7 @@ void Sapphire::Entity::Chara::updateStatusEffects()
     uint32_t duration = effect->getDuration();
     uint32_t tickRate = effect->getTickRate();
 
-    if( ( currentTimeMs - startTime ) > duration )
+    if( duration > 0 && ( currentTimeMs - startTime ) > duration )
     {
       // remove status effect
       removeStatusEffect( effectIndex );
@@ -706,41 +705,7 @@ void Sapphire::Entity::Chara::updateStatusEffects()
     {
       effect->setLastTick( currentTimeMs );
       effect->onTick();
-
-      auto thisEffect = effect->getTickEffect();
-
-      switch( thisEffect.first )
-      {
-
-        case 1:
-        {
-          thisTickDmg += thisEffect.second;
-          break;
-        }
-
-        case 2:
-        {
-          thisTickHeal += thisEffect.second;
-          break;
-        }
-
-      }
     }
-
-  }
-
-  if( thisTickDmg != 0 )
-  {
-    takeDamage( thisTickDmg );
-    sendToInRangeSet( makeActorControl( getId(), HPFloatingText, 0,
-                                        static_cast< uint8_t >( ActionEffectType::Damage ), thisTickDmg ) );
-  }
-
-  if( thisTickHeal != 0 )
-  {
-    heal( thisTickDmg );
-    sendToInRangeSet( makeActorControl( getId(), HPFloatingText, 0,
-                                        static_cast< uint8_t >( ActionEffectType::Heal ), thisTickHeal ) );
   }
 }
 
@@ -944,3 +909,42 @@ uint32_t Sapphire::Entity::Chara::getStatValue( Sapphire::Common::BaseParam base
 
   return value + getBonusStat( baseParam );
 }
+
+void Sapphire::Entity::Chara::onTick()
+{
+  uint32_t thisTickDmg = 0;
+  uint32_t thisTickHeal = 0;
+
+  for( auto effectIt : m_statusEffectMap )
+  {
+    auto thisEffect = effectIt.second->getTickEffect();
+    switch( thisEffect.first )
+    {
+      case 1:
+      {
+        thisTickDmg += thisEffect.second;
+        break;
+      }
+
+      case 2:
+      {
+        thisTickHeal += thisEffect.second;
+        break;
+      }
+    }
+  }
+
+  if( thisTickDmg != 0 )
+  {
+    takeDamage( thisTickDmg );
+    sendToInRangeSet( makeActorControl( getId(), HPFloatingText, 0,
+                                        static_cast< uint8_t >( ActionEffectType::Damage ), thisTickDmg ), true );
+  }
+
+  if( thisTickHeal != 0 )
+  {
+    heal( thisTickHeal );
+    sendToInRangeSet( makeActorControl( getId(), HPFloatingText, 0,
+                                        static_cast< uint8_t >( ActionEffectType::Heal ), thisTickHeal ), true );
+  }
+}
\ No newline at end of file
diff --git a/src/world/Actor/Chara.h b/src/world/Actor/Chara.h
index 697f5a6e..f423507e 100644
--- a/src/world/Actor/Chara.h
+++ b/src/world/Actor/Chara.h
@@ -251,7 +251,7 @@ namespace Sapphire::Entity
 
     virtual void onActionFriendly( Chara& pSource ) {};
 
-    virtual void onTick() {};
+    virtual void onTick();
 
     virtual void changeTarget( uint64_t targetId );
 
diff --git a/src/world/Actor/Player.cpp b/src/world/Actor/Player.cpp
index 39e64585..dc616600 100644
--- a/src/world/Actor/Player.cpp
+++ b/src/world/Actor/Player.cpp
@@ -306,7 +306,6 @@ void Sapphire::Entity::Player::calculateStats()
 void Sapphire::Entity::Player::setAutoattack( bool mode )
 {
   m_bAutoattack = mode;
-  m_lastAttack = Util::getTimeMs();
 }
 
 bool Sapphire::Entity::Player::isAutoattackOn() const
@@ -1100,8 +1099,6 @@ void Sapphire::Entity::Player::update( uint64_t tickCount )
   if( !isAlive() )
     return;
 
-  updateStatusEffects();
-
   m_lastUpdate = tickCount;
 
   if( !checkAction() )
diff --git a/src/world/Actor/PlayerEvent.cpp b/src/world/Actor/PlayerEvent.cpp
index 0303b4fb..08f830e4 100644
--- a/src/world/Actor/PlayerEvent.cpp
+++ b/src/world/Actor/PlayerEvent.cpp
@@ -370,7 +370,7 @@ void Sapphire::Entity::Player::onDeath()
 // TODO: slightly ugly here and way too static. Needs too be done properly
 void Sapphire::Entity::Player::onTick()
 {
-
+  Chara::onTick();
   // add 3 seconds to total play time
   m_playTime += 3;
 
diff --git a/src/world/Network/PacketWrappers/NpcSpawnPacket.h b/src/world/Network/PacketWrappers/NpcSpawnPacket.h
index 3cc99f89..0b9ab630 100644
--- a/src/world/Network/PacketWrappers/NpcSpawnPacket.h
+++ b/src/world/Network/PacketWrappers/NpcSpawnPacket.h
@@ -96,7 +96,7 @@ namespace Sapphire::Network::Packets::Server
                                                                        ( currentTimeMs -
                                                                          effect.second->getStartTimeMs() ) ) / 1000;
         m_data.effect[ effect.first ].sourceActorId = effect.second->getSrcActorId();
-        m_data.effect[ effect.first ].unknown1 = effect.second->getParam();
+        m_data.effect[ effect.first ].param = effect.second->getParam();
       }
 
     };
diff --git a/src/world/Network/PacketWrappers/PlayerSpawnPacket.h b/src/world/Network/PacketWrappers/PlayerSpawnPacket.h
index 4f384356..f20fdd7e 100644
--- a/src/world/Network/PacketWrappers/PlayerSpawnPacket.h
+++ b/src/world/Network/PacketWrappers/PlayerSpawnPacket.h
@@ -142,7 +142,7 @@ namespace Sapphire::Network::Packets::Server
                                                                        ( currentTimeMs -
                                                                          effect.second->getStartTimeMs() ) ) / 1000;
         m_data.effect[ effect.first ].sourceActorId = effect.second->getSrcActorId();
-        m_data.effect[ effect.first ].unknown1 = effect.second->getParam();
+        m_data.effect[ effect.first ].param = effect.second->getParam();
       }
 
     };

From 8b6f8aef8d96e30e62f91a5a3362c7a321319e46 Mon Sep 17 00:00:00 2001
From: collett <collett0301@gmail.com>
Date: Wed, 22 Jan 2020 17:55:40 +0900
Subject: [PATCH 232/351] Fix update position packet.

---
 src/common/Network/PacketDef/Zone/ClientZoneDef.h | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/common/Network/PacketDef/Zone/ClientZoneDef.h b/src/common/Network/PacketDef/Zone/ClientZoneDef.h
index 7b0d39ea..9c8d0fc0 100644
--- a/src/common/Network/PacketDef/Zone/ClientZoneDef.h
+++ b/src/common/Network/PacketDef/Zone/ClientZoneDef.h
@@ -49,15 +49,15 @@ struct FFXIVIpcUpdatePosition :
   FFXIVIpcBasePacket< UpdatePositionHandler >
 {
   /* 0000 */ float rotation;
-  /* 0004 */ uint8_t unk_1[ 3 ];
+  /* 0004 */ uint8_t animationType;
+  /* 0005 */ uint8_t animationState;
+  /* 0006 */ uint8_t clientAnimationType;
   /* 0007 */ uint8_t headPosition;
   /* 0008 */ Common::FFXIVARR_POSITION3 position;
-  /* 000C */ uint8_t animationType;
-  /* 000D */ uint8_t animationState;
-  /* 000E */ uint8_t clientAnimationType;
-  /* 000F */ uint8_t unk_2;
+  /* 000C */ uint8_t unk[ 4 ]; // padding?
 };
 
+
 struct FFXIVIpcSkillHandler :
   FFXIVIpcBasePacket< SkillHandler >
 {

From d4afee03a6208593582e3e2e9a5bc0babd892500 Mon Sep 17 00:00:00 2001
From: collett <collett0301@gmail.com>
Date: Thu, 23 Jan 2020 22:36:01 +0900
Subject: [PATCH 233/351] Implement mount action.

---
 src/common/Common.h                           |  5 +-
 src/common/Network/PacketDef/Ipcs.h           |  2 +-
 .../Network/PacketDef/Zone/ServerZoneDef.h    |  5 +-
 src/world/Action/Action.cpp                   |  3 +-
 src/world/Action/Action.h                     |  2 +-
 src/world/Action/EffectBuilder.cpp            |  7 ++
 src/world/Action/EffectBuilder.h              |  2 +
 src/world/Action/EffectResult.cpp             | 16 +++++
 src/world/Action/EffectResult.h               |  1 +
 src/world/Action/MountAction.cpp              | 68 +++++++++++++++++++
 src/world/Action/MountAction.h                | 25 +++++++
 src/world/ForwardsZone.h                      |  1 +
 src/world/Manager/ActionMgr.cpp               | 17 +++++
 src/world/Manager/ActionMgr.h                 |  3 +
 src/world/Network/Handlers/ActionHandler.cpp  |  4 +-
 15 files changed, 153 insertions(+), 8 deletions(-)
 create mode 100644 src/world/Action/MountAction.cpp
 create mode 100644 src/world/Action/MountAction.h

diff --git a/src/common/Common.h b/src/common/Common.h
index 543d5cd1..15b98084 100644
--- a/src/common/Common.h
+++ b/src/common/Common.h
@@ -632,10 +632,10 @@ namespace Sapphire::Common
      * @param flags Required to be 128, doesn't show combo rings on hotbars otherwise
      * @param value The actionid that starts/continues the combo. eg, 3617 will start a spinning slash and/or syphon strike combo
      */
-    StartActionCombo = 28,
+    StartActionCombo = 28, // actually this is more likely "ActionComplete" or something like that
     ComboSucceed = 29,
     Knockback = 33,
-    Mount = 38,
+    Mount = 39,
     VFX = 59, // links to VFX sheet
   };
 
@@ -1009,6 +1009,7 @@ namespace Sapphire::Common
   {
     SingleTarget = 1,
     CircularAOE = 2,
+    Type3 = 3, // another single target? no idea how to call it
     RectangularAOE = 4,
     CircularAoEPlaced = 7
   };
diff --git a/src/common/Network/PacketDef/Ipcs.h b/src/common/Network/PacketDef/Ipcs.h
index 97dba6ba..19651f7b 100644
--- a/src/common/Network/PacketDef/Ipcs.h
+++ b/src/common/Network/PacketDef/Ipcs.h
@@ -207,7 +207,7 @@ namespace Sapphire::Network::Packets
 
     QuestTracker = 0x0289, // updated 5.18
 
-    Mount = 0x02F0, // updated 5.18
+    Mount = 0x038F, // updated 5.18
 
     DirectorVars = 0x00E6, // updated 5.18
     SomeDirectorUnk1 = 0x0084, // updated 5.18
diff --git a/src/common/Network/PacketDef/Zone/ServerZoneDef.h b/src/common/Network/PacketDef/Zone/ServerZoneDef.h
index 8a06167b..b2f844c7 100644
--- a/src/common/Network/PacketDef/Zone/ServerZoneDef.h
+++ b/src/common/Network/PacketDef/Zone/ServerZoneDef.h
@@ -835,10 +835,11 @@ namespace Sapphire::Network::Packets::Server
     uint16_t action_id;
     Common::SkillType skillType;
     uint8_t unknown;
-    uint32_t unknown_1; // Also action id
+    uint32_t unknown_1; // action id or mount id
     float cast_time;
     uint32_t target_id;
-    float rotation; // In radians
+    uint16_t rotation;
+    uint16_t flag; // 1 = interruptible blinking cast bar
     uint32_t unknown_2;
     uint16_t posX;
     uint16_t posY;
diff --git a/src/world/Action/Action.cpp b/src/world/Action/Action.cpp
index 9a89c249..aa9a3b28 100644
--- a/src/world/Action/Action.cpp
+++ b/src/world/Action/Action.cpp
@@ -275,7 +275,7 @@ void Action::Action::start()
     data.posX = Common::Util::floatToUInt16( pos.x );
     data.posY = Common::Util::floatToUInt16( pos.y );
     data.posZ = Common::Util::floatToUInt16( pos.z );
-    data.rotation = m_pSource->getRot();
+    data.rotation = Common::Util::floatToUInt16Rot( m_pSource->getRot() );
 
     m_pSource->sendToInRangeSet( castPacket, true );
 
@@ -736,6 +736,7 @@ void Action::Action::addDefaultActorFilters()
   switch( m_castType )
   {
     case Common::CastType::SingleTarget:
+    case Common::CastType::Type3:
     {
       auto filter = std::make_shared< World::Util::ActorFilterSingleTarget >( static_cast< uint32_t >( m_targetId ) );
 
diff --git a/src/world/Action/Action.h b/src/world/Action/Action.h
index 355514b5..04142f3b 100644
--- a/src/world/Action/Action.h
+++ b/src/world/Action/Action.h
@@ -80,7 +80,7 @@ namespace Sapphire::World::Action
      * @brief Tests if an action is castable by the current source chara
      * @return true if castable, false if the caster doesn't meet the requirements
      */
-    bool preCheck();
+    virtual bool preCheck();
 
     /*!
      * @brief Snapshots characters affected by a cast.
diff --git a/src/world/Action/EffectBuilder.cpp b/src/world/Action/EffectBuilder.cpp
index 64af6932..447ef48b 100644
--- a/src/world/Action/EffectBuilder.cpp
+++ b/src/world/Action/EffectBuilder.cpp
@@ -91,6 +91,13 @@ void EffectBuilder::applyStatusEffect( Entity::CharaPtr& target, uint16_t status
   moveToResultList( target, nextResult );
 }
 
+void EffectBuilder::mount( Entity::CharaPtr& target, uint16_t mountId )
+{
+  EffectResultPtr nextResult = make_EffectResult( target, getResultDelayMs() );
+  nextResult->mount( mountId );
+  moveToResultList( target, nextResult );
+}
+
 void EffectBuilder::buildAndSendPackets()
 {
   auto targetCount = m_resolvedEffects.size();
diff --git a/src/world/Action/EffectBuilder.h b/src/world/Action/EffectBuilder.h
index 6a4aa240..3ed70dfc 100644
--- a/src/world/Action/EffectBuilder.h
+++ b/src/world/Action/EffectBuilder.h
@@ -28,6 +28,8 @@ namespace Sapphire::World::Action
 
     void applyStatusEffect( Entity::CharaPtr& target, uint16_t statusId, uint8_t param );
 
+    void mount( Entity::CharaPtr& target, uint16_t mountId );
+
     void buildAndSendPackets();
 
 
diff --git a/src/world/Action/EffectResult.cpp b/src/world/Action/EffectResult.cpp
index f8feeafb..6497985b 100644
--- a/src/world/Action/EffectResult.cpp
+++ b/src/world/Action/EffectResult.cpp
@@ -3,6 +3,7 @@
 #include <Util/Util.h>
 
 #include "Actor/Chara.h"
+#include "Actor/Player.h"
 
 using namespace Sapphire;
 using namespace Sapphire::World::Action;
@@ -84,6 +85,14 @@ void EffectResult::applyStatusEffect( uint16_t statusId, uint8_t param )
   m_type = Common::ActionEffectType::ApplyStatusEffect;
 }
 
+void EffectResult::mount( uint16_t moundId )
+{
+  m_value = moundId;
+  m_param0 = 1;
+
+  m_type = Common::ActionEffectType::Mount;
+}
+
 Common::EffectEntry EffectResult::buildEffectEntry() const
 {
   Common::EffectEntry entry{};
@@ -121,6 +130,13 @@ void EffectResult::execute()
       break;
     }
 
+    case Common::ActionEffectType::Mount:
+    {
+      auto pPlayer = m_target->getAsPlayer();
+      pPlayer->mount( m_value );
+      break;
+    }
+
     default:
       break;
   }
diff --git a/src/world/Action/EffectResult.h b/src/world/Action/EffectResult.h
index ad69f205..b61cb039 100644
--- a/src/world/Action/EffectResult.h
+++ b/src/world/Action/EffectResult.h
@@ -21,6 +21,7 @@ namespace Sapphire::World::Action
     void startCombo( uint16_t actionId );
     void comboSucceed();
     void applyStatusEffect( uint16_t statusId, uint8_t param );
+    void mount( uint16_t moundId );
 
     Entity::CharaPtr getTarget() const;
 
diff --git a/src/world/Action/MountAction.cpp b/src/world/Action/MountAction.cpp
new file mode 100644
index 00000000..94d13202
--- /dev/null
+++ b/src/world/Action/MountAction.cpp
@@ -0,0 +1,68 @@
+#include "MountAction.h"
+
+#include <Exd/ExdDataGenerated.h>
+
+#include "Actor/Player.h"
+
+#include <Network/CommonActorControl.h>
+#include "Network/PacketWrappers/ActorControlSelfPacket.h"
+
+#include <Util/UtilMath.h>
+
+using namespace Sapphire;
+using namespace Sapphire::Network::Packets;
+using namespace Sapphire::Network::Packets::Server;
+using namespace Sapphire::Network::ActorControl;
+using namespace Sapphire::World::Action;
+
+MountAction::MountAction( Sapphire::Entity::CharaPtr source, uint32_t mountId, uint16_t sequence, Data::ActionPtr actionData, Sapphire::FrameworkPtr fw ) :
+  Action::Action( source, 4, sequence, actionData, fw ),
+  m_mountId( mountId )
+{
+}
+
+bool MountAction::preCheck()
+{
+  // todo: check if mount is unlocked
+  return m_pSource->isPlayer();
+}
+
+void MountAction::start()
+{
+  assert( m_pSource );
+
+  m_startTime = Common::Util::getTimeMs();
+
+  auto player = m_pSource->getAsPlayer();
+
+  auto castPacket = makeZonePacket< Server::FFXIVIpcActorCast >( getId() );
+  auto& data = castPacket->data();
+
+  data.action_id = static_cast< uint16_t >( m_id );
+  data.skillType = Common::SkillType::MountSkill;
+  data.unknown_1 = m_mountId;
+  data.cast_time = m_castTimeMs / 1000.f;
+  data.target_id = static_cast< uint32_t >( m_targetId );
+  data.unknown_2 = 0xE0000000;
+
+  auto pos = m_pSource->getPos();
+  data.posX = Common::Util::floatToUInt16( pos.x );
+  data.posY = Common::Util::floatToUInt16( pos.y );
+  data.posZ = Common::Util::floatToUInt16( pos.z );
+  data.rotation = Common::Util::floatToUInt16Rot( m_pSource->getRot() );
+
+  m_pSource->sendToInRangeSet( castPacket, true );
+
+  player->setStateFlag( Common::PlayerStateFlag::Casting );
+
+  auto actionStartPkt = makeActorControlSelf( m_pSource->getId(), ActorControlType::ActionStart, 1, getId(), m_recastTimeMs / 10 );
+  player->queuePacket( actionStartPkt );
+}
+
+void MountAction::execute()
+{
+  assert( m_pSource );
+
+  m_effectBuilder->mount( m_pSource, m_mountId );
+  m_effectBuilder->buildAndSendPackets();
+}
\ No newline at end of file
diff --git a/src/world/Action/MountAction.h b/src/world/Action/MountAction.h
new file mode 100644
index 00000000..37c0595a
--- /dev/null
+++ b/src/world/Action/MountAction.h
@@ -0,0 +1,25 @@
+#ifndef SAPPHIRE_MOUNTACTION_H
+#define SAPPHIRE_MOUNTACTION_H
+
+#include "Action.h"
+
+namespace Sapphire::World::Action
+{
+  class MountAction : public Action
+  {
+  public:
+    MountAction( Entity::CharaPtr source, uint32_t mountId, uint16_t sequence, Data::ActionPtr actionData, FrameworkPtr fw );
+    virtual ~MountAction() = default;
+
+    bool preCheck() override;
+
+    void start() override;
+
+    void execute() override;
+
+  private:
+    uint32_t m_mountId;
+  };
+}
+
+#endif //SAPPHIRE_MOUNTACTION_H
diff --git a/src/world/ForwardsZone.h b/src/world/ForwardsZone.h
index 4ff4af79..db366d35 100644
--- a/src/world/ForwardsZone.h
+++ b/src/world/ForwardsZone.h
@@ -87,6 +87,7 @@ namespace World::Action
 TYPE_FORWARD( Action );
 TYPE_FORWARD( EventAction );
 TYPE_FORWARD( ItemAction );
+TYPE_FORWARD( MountAction );
 TYPE_FORWARD( EffectBuilder );
 TYPE_FORWARD( EffectResult );
 
diff --git a/src/world/Manager/ActionMgr.cpp b/src/world/Manager/ActionMgr.cpp
index 2356d7b3..f9859170 100644
--- a/src/world/Manager/ActionMgr.cpp
+++ b/src/world/Manager/ActionMgr.cpp
@@ -2,6 +2,7 @@
 
 #include "Action/Action.h"
 #include "Action/ItemAction.h"
+#include "Action/MountAction.h"
 #include "Script/ScriptMgr.h"
 #include "Actor/Player.h"
 
@@ -78,6 +79,22 @@ void World::Manager::ActionMgr::handleItemAction( Sapphire::Entity::Player& play
   action->start();
 }
 
+void World::Manager::ActionMgr::handleMountAction( Entity::Player& player, uint32_t mountId,
+                                                   Data::ActionPtr actionData, uint64_t targetId,
+                                                   uint16_t sequence )
+{
+  player.sendDebug( "mount: {0}", mountId );
+
+  auto action = Action::make_MountAction( player.getAsPlayer(), mountId, sequence, actionData, framework() );
+
+  action->setTargetId( targetId );
+
+  if( !action->init() )
+    return;
+
+  bootstrapAction( player, action, *actionData );
+}
+
 void World::Manager::ActionMgr::bootstrapAction( Entity::Player& player,
                                                  Action::ActionPtr currentAction,
                                                  Data::Action& actionData )
diff --git a/src/world/Manager/ActionMgr.h b/src/world/Manager/ActionMgr.h
index 75e238e9..a8cf49df 100644
--- a/src/world/Manager/ActionMgr.h
+++ b/src/world/Manager/ActionMgr.h
@@ -29,6 +29,9 @@ namespace Sapphire::World::Manager
     void handleItemAction( Entity::Player& player, uint32_t itemId, Data::ItemActionPtr itemActionData,
                            uint16_t itemSourceSlot, uint16_t itemSourceContainer );
 
+    void handleMountAction( Entity::Player& player, uint32_t mountId,
+                            Data::ActionPtr actionData, uint64_t targetId, uint16_t sequence );
+
   private:
     void bootstrapAction( Entity::Player& player, Action::ActionPtr currentAction, Data::Action& actionData );
 
diff --git a/src/world/Network/Handlers/ActionHandler.cpp b/src/world/Network/Handlers/ActionHandler.cpp
index dd365b9b..78bf55d8 100644
--- a/src/world/Network/Handlers/ActionHandler.cpp
+++ b/src/world/Network/Handlers/ActionHandler.cpp
@@ -72,7 +72,9 @@ void Sapphire::Network::GameConnection::actionHandler( FrameworkPtr pFw,
 
     case Common::SkillType::MountSkill:
     {
-
+      auto action = exdData->get< Data::Action >( 4 );
+      assert( action );
+      actionMgr->handleMountAction( player, actionId, action, targetId, sequence );
       break;
     }
   }

From 29da401de77cf4a1734a2a90f1dcb071a0f12eef Mon Sep 17 00:00:00 2001
From: collett <collett0301@gmail.com>
Date: Thu, 23 Jan 2020 22:43:16 +0900
Subject: [PATCH 234/351] Fix moundId type.

---
 src/world/Action/MountAction.cpp             | 2 +-
 src/world/Action/MountAction.h               | 4 ++--
 src/world/Manager/ActionMgr.cpp              | 2 +-
 src/world/Manager/ActionMgr.h                | 2 +-
 src/world/Network/Handlers/ActionHandler.cpp | 2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/world/Action/MountAction.cpp b/src/world/Action/MountAction.cpp
index 94d13202..1c0170b7 100644
--- a/src/world/Action/MountAction.cpp
+++ b/src/world/Action/MountAction.cpp
@@ -15,7 +15,7 @@ using namespace Sapphire::Network::Packets::Server;
 using namespace Sapphire::Network::ActorControl;
 using namespace Sapphire::World::Action;
 
-MountAction::MountAction( Sapphire::Entity::CharaPtr source, uint32_t mountId, uint16_t sequence, Data::ActionPtr actionData, Sapphire::FrameworkPtr fw ) :
+MountAction::MountAction( Sapphire::Entity::CharaPtr source, uint16_t mountId, uint16_t sequence, Data::ActionPtr actionData, Sapphire::FrameworkPtr fw ) :
   Action::Action( source, 4, sequence, actionData, fw ),
   m_mountId( mountId )
 {
diff --git a/src/world/Action/MountAction.h b/src/world/Action/MountAction.h
index 37c0595a..1b095b47 100644
--- a/src/world/Action/MountAction.h
+++ b/src/world/Action/MountAction.h
@@ -8,7 +8,7 @@ namespace Sapphire::World::Action
   class MountAction : public Action
   {
   public:
-    MountAction( Entity::CharaPtr source, uint32_t mountId, uint16_t sequence, Data::ActionPtr actionData, FrameworkPtr fw );
+    MountAction( Entity::CharaPtr source, uint16_t mountId, uint16_t sequence, Data::ActionPtr actionData, FrameworkPtr fw );
     virtual ~MountAction() = default;
 
     bool preCheck() override;
@@ -18,7 +18,7 @@ namespace Sapphire::World::Action
     void execute() override;
 
   private:
-    uint32_t m_mountId;
+    uint16_t m_mountId;
   };
 }
 
diff --git a/src/world/Manager/ActionMgr.cpp b/src/world/Manager/ActionMgr.cpp
index f9859170..aaa723c9 100644
--- a/src/world/Manager/ActionMgr.cpp
+++ b/src/world/Manager/ActionMgr.cpp
@@ -79,7 +79,7 @@ void World::Manager::ActionMgr::handleItemAction( Sapphire::Entity::Player& play
   action->start();
 }
 
-void World::Manager::ActionMgr::handleMountAction( Entity::Player& player, uint32_t mountId,
+void World::Manager::ActionMgr::handleMountAction( Entity::Player& player, uint16_t mountId,
                                                    Data::ActionPtr actionData, uint64_t targetId,
                                                    uint16_t sequence )
 {
diff --git a/src/world/Manager/ActionMgr.h b/src/world/Manager/ActionMgr.h
index a8cf49df..dd1d5f40 100644
--- a/src/world/Manager/ActionMgr.h
+++ b/src/world/Manager/ActionMgr.h
@@ -29,7 +29,7 @@ namespace Sapphire::World::Manager
     void handleItemAction( Entity::Player& player, uint32_t itemId, Data::ItemActionPtr itemActionData,
                            uint16_t itemSourceSlot, uint16_t itemSourceContainer );
 
-    void handleMountAction( Entity::Player& player, uint32_t mountId,
+    void handleMountAction( Entity::Player& player, uint16_t mountId,
                             Data::ActionPtr actionData, uint64_t targetId, uint16_t sequence );
 
   private:
diff --git a/src/world/Network/Handlers/ActionHandler.cpp b/src/world/Network/Handlers/ActionHandler.cpp
index 78bf55d8..2b9f81dd 100644
--- a/src/world/Network/Handlers/ActionHandler.cpp
+++ b/src/world/Network/Handlers/ActionHandler.cpp
@@ -74,7 +74,7 @@ void Sapphire::Network::GameConnection::actionHandler( FrameworkPtr pFw,
     {
       auto action = exdData->get< Data::Action >( 4 );
       assert( action );
-      actionMgr->handleMountAction( player, actionId, action, targetId, sequence );
+      actionMgr->handleMountAction( player, static_cast< uint16_t >( actionId ), action, targetId, sequence );
       break;
     }
   }

From 66a2021e95e3181a6c142299df941aa9106f37a7 Mon Sep 17 00:00:00 2001
From: collett <collett0301@gmail.com>
Date: Thu, 23 Jan 2020 23:23:13 +0900
Subject: [PATCH 235/351] these bytes are mounts as well.

---
 src/common/Network/PacketDef/Zone/ServerZoneDef.h | 3 +--
 src/world/Actor/Player.h                          | 2 +-
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/common/Network/PacketDef/Zone/ServerZoneDef.h b/src/common/Network/PacketDef/Zone/ServerZoneDef.h
index b2f844c7..6b7883f3 100644
--- a/src/common/Network/PacketDef/Zone/ServerZoneDef.h
+++ b/src/common/Network/PacketDef/Zone/ServerZoneDef.h
@@ -1024,8 +1024,7 @@ namespace Sapphire::Network::Packets::Server
     unsigned char companionAttRank;
     unsigned char companionHealRank;
     unsigned char u19[2];
-    unsigned char mountGuideMask[19];
-    uint8_t unk1[9];
+    unsigned char mountGuideMask[28];
     char name[32];
     unsigned char unknownOword[16];
     unsigned char unknownOw;
diff --git a/src/world/Actor/Player.h b/src/world/Actor/Player.h
index fc2020e4..422e5bff 100644
--- a/src/world/Actor/Player.h
+++ b/src/world/Actor/Player.h
@@ -1045,7 +1045,7 @@ namespace Sapphire::Entity
     uint8_t m_titleList[48];
     uint8_t m_howTo[34];
     uint8_t m_minions[40];
-    uint8_t m_mountGuide[19];
+    uint8_t m_mountGuide[28];
     uint8_t m_homePoint;
     uint8_t m_startTown;
     uint16_t m_townWarpFstFlags;

From 264f4bd459dc24e4914901a70c00de4fb76bdd9c Mon Sep 17 00:00:00 2001
From: collett <collett0301@gmail.com>
Date: Fri, 24 Jan 2020 08:08:51 +0900
Subject: [PATCH 236/351] fix derp

---
 src/common/Network/PacketDef/Zone/ServerZoneDef.h | 4 ++--
 src/world/Actor/Player.h                          | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/common/Network/PacketDef/Zone/ServerZoneDef.h b/src/common/Network/PacketDef/Zone/ServerZoneDef.h
index 6b7883f3..6e715282 100644
--- a/src/common/Network/PacketDef/Zone/ServerZoneDef.h
+++ b/src/common/Network/PacketDef/Zone/ServerZoneDef.h
@@ -1023,8 +1023,8 @@ namespace Sapphire::Network::Packets::Server
     unsigned char companionDefRank;
     unsigned char companionAttRank;
     unsigned char companionHealRank;
-    unsigned char u19[2];
-    unsigned char mountGuideMask[28];
+    unsigned char u19[8];
+    unsigned char mountGuideMask[22];
     char name[32];
     unsigned char unknownOword[16];
     unsigned char unknownOw;
diff --git a/src/world/Actor/Player.h b/src/world/Actor/Player.h
index 422e5bff..26984e17 100644
--- a/src/world/Actor/Player.h
+++ b/src/world/Actor/Player.h
@@ -1045,7 +1045,7 @@ namespace Sapphire::Entity
     uint8_t m_titleList[48];
     uint8_t m_howTo[34];
     uint8_t m_minions[40];
-    uint8_t m_mountGuide[28];
+    uint8_t m_mountGuide[22];
     uint8_t m_homePoint;
     uint8_t m_startTown;
     uint16_t m_townWarpFstFlags;

From 0dbcda72294fa0380a1f86150fa9dc5d693e2f73 Mon Sep 17 00:00:00 2001
From: NotAdam <adam@notadam.me>
Date: Sun, 26 Jan 2020 21:16:41 +1100
Subject: [PATCH 237/351] fix typo

---
 src/world/Action/EffectResult.cpp | 4 ++--
 src/world/Action/EffectResult.h   | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/world/Action/EffectResult.cpp b/src/world/Action/EffectResult.cpp
index 6497985b..725279bb 100644
--- a/src/world/Action/EffectResult.cpp
+++ b/src/world/Action/EffectResult.cpp
@@ -85,9 +85,9 @@ void EffectResult::applyStatusEffect( uint16_t statusId, uint8_t param )
   m_type = Common::ActionEffectType::ApplyStatusEffect;
 }
 
-void EffectResult::mount( uint16_t moundId )
+void EffectResult::mount( uint16_t mountId )
 {
-  m_value = moundId;
+  m_value = mountId;
   m_param0 = 1;
 
   m_type = Common::ActionEffectType::Mount;
diff --git a/src/world/Action/EffectResult.h b/src/world/Action/EffectResult.h
index b61cb039..14c432a3 100644
--- a/src/world/Action/EffectResult.h
+++ b/src/world/Action/EffectResult.h
@@ -21,7 +21,7 @@ namespace Sapphire::World::Action
     void startCombo( uint16_t actionId );
     void comboSucceed();
     void applyStatusEffect( uint16_t statusId, uint8_t param );
-    void mount( uint16_t moundId );
+    void mount( uint16_t mountId );
 
     Entity::CharaPtr getTarget() const;
 

From 5b843c66dd41ca3c09adfb70d43db24e0b375954 Mon Sep 17 00:00:00 2001
From: NotAdam <adam@notadam.me>
Date: Sun, 26 Jan 2020 21:24:38 +1100
Subject: [PATCH 238/351] add actions submodule

---
 .gitmodules    | 3 +++
 CMakeLists.txt | 4 +++-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/.gitmodules b/.gitmodules
index a7b40f34..f8ad1744 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -7,3 +7,6 @@
 [submodule "deps/recastnavigation"]
 	path = deps/recastnavigation
 	url = https://github.com/SapphireServer/recastnavigation
+[submodule "deps/ffxiv-actions"]
+	path = deps/ffxiv-actions
+	url = https://github.com/SapphireServer/ffxiv-actions.git
diff --git a/CMakeLists.txt b/CMakeLists.txt
index f6a3419f..76160f3d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -13,7 +13,9 @@ add_custom_target( copy_runtime_files ALL
                      COMMAND ${CMAKE_COMMAND} -E copy_directory ${CMAKE_SOURCE_DIR}/config ${CMAKE_BINARY_DIR}/bin/config
                      COMMAND ${CMAKE_COMMAND} -E copy_directory ${CMAKE_SOURCE_DIR}/sql ${CMAKE_BINARY_DIR}/bin/sql
                      COMMAND ${CMAKE_COMMAND} -E copy_directory ${CMAKE_SOURCE_DIR}/web ${CMAKE_BINARY_DIR}/bin/web
-                     COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_SOURCE_DIR}/sql_import.sh ${CMAKE_BINARY_DIR}/bin/sql_import.sh )
+                     COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_SOURCE_DIR}/sql_import.sh ${CMAKE_BINARY_DIR}/bin/sql_import.sh
+                     COMMAND ${CMAKE_COMMAND} -E remove_directory ${CMAKE_BINARY_DIR}/bin/data/actions
+                     COMMAND ${CMAKE_COMMAND} -E copy_directory ${CMAKE_SOURCE_DIR}/deps/ffxiv-actions/actions ${CMAKE_BINARY_DIR}/bin/data/actions )
 
 ######################################
 # Dependencies and compiler settings #

From 39aa49f092cf8d02900a07f194dfa24aac513d39 Mon Sep 17 00:00:00 2001
From: NotAdam <adam@notadam.me>
Date: Sun, 2 Feb 2020 17:14:59 +1100
Subject: [PATCH 239/351] bit of cleanup and sqpack fix

---
 deps/datReader/SqPack.cpp | 122 +++++++++++++++++++-------------------
 1 file changed, 62 insertions(+), 60 deletions(-)

diff --git a/deps/datReader/SqPack.cpp b/deps/datReader/SqPack.cpp
index ede929aa..bdcfe2fb 100644
--- a/deps/datReader/SqPack.cpp
+++ b/deps/datReader/SqPack.cpp
@@ -1,76 +1,78 @@
 #include "SqPack.h"
 
-namespace xiv {
-namespace dat {
-   struct SqPackHeader
-   {
-      char magic[0x8];
-      uint32_t zero;
-      uint32_t size;
-      uint32_t version;
-      uint32_t type;
-   };
+namespace xiv::dat {
+  enum PlatformId :
+    uint8_t
+  {
+    Win32,
+    PS3,
+    PS4
+  };
 
-   struct SqPackIndexHeader
-   {
-      uint32_t size;
-      uint32_t type;
-   };
-}
-}
-namespace xiv {
-namespace utils {
-namespace bparse {
-   template <>
-   inline void reorder<xiv::dat::SqPackHeader>(xiv::dat::SqPackHeader& i_struct)
-   {
-      for (int32_t i = 0; i < 0x8; ++i)
-      {
-         xiv::utils::bparse::reorder(i_struct.magic[i]);
-      }
-      xiv::utils::bparse::reorder(i_struct.zero);
-      xiv::utils::bparse::reorder(i_struct.size);
-      xiv::utils::bparse::reorder(i_struct.version);
-      xiv::utils::bparse::reorder(i_struct.type);
-   }
+  struct SqPackHeader
+  {
+    char magic[0x8];
+    PlatformId platformId;
+    uint8_t padding0[3];
+    uint32_t size;
+    uint32_t version;
+    uint32_t type;
+  };
 
-   template <>
-   inline void reorder<xiv::dat::SqPackIndexHeader>(xiv::dat::SqPackIndexHeader& i_struct)
-   {
-      xiv::utils::bparse::reorder(i_struct.size);
-      xiv::utils::bparse::reorder(i_struct.type);
-   }
+  struct SqPackIndexHeader
+  {
+    uint32_t size;
+    uint32_t type;
+  };
 }
+
+namespace xiv::utils:: bparse
+{
+  template<>
+  inline void reorder< xiv::dat::SqPackHeader >( xiv::dat::SqPackHeader& i_struct )
+  {
+    for( int32_t i = 0; i < 0x8; ++i )
+    {
+      xiv::utils::bparse::reorder( i_struct.magic[ i ] );
+    }
+    xiv::utils::bparse::reorder( i_struct.platformId );
+    xiv::utils::bparse::reorder( i_struct.size );
+    xiv::utils::bparse::reorder( i_struct.version );
+    xiv::utils::bparse::reorder( i_struct.type );
+  }
+
+  template<>
+  inline void reorder< xiv::dat::SqPackIndexHeader >( xiv::dat::SqPackIndexHeader& i_struct )
+  {
+    xiv::utils::bparse::reorder( i_struct.size );
+    xiv::utils::bparse::reorder( i_struct.type );
+  }
 }
-};
 
 using xiv::utils::bparse::extract;
 
-namespace xiv
-{
-namespace dat
+namespace xiv::dat
 {
 
-   SqPack::SqPack( const std::experimental::filesystem::path& path ) :
-      // Open the file
-      m_handle( path.string(), std::ios_base::in | std::ios_base::binary )
-   {
-      // Extract the header
-      extract<SqPackHeader>( m_handle );
+  // Open the file
+  SqPack::SqPack( const std::experimental::filesystem::path& path ) :
+    m_handle( path.string(), std::ios_base::in | std::ios_base::binary )
+  {
+    // Extract the header
+    extract< SqPackHeader >( m_handle );
 
-      // Skip until the IndexHeader the extract it
-      m_handle.seekg( 0x400 );
-      extract<SqPackIndexHeader>( m_handle );
-   }
+    // Skip until the IndexHeader the extract it
+    m_handle.seekg( 0x400 );
+    extract< SqPackIndexHeader >( m_handle );
+  }
 
-   SqPack::~SqPack()
-   {
-   }
+  SqPack::~SqPack()
+  {
+  }
 
-   void SqPack::isBlockValid( uint32_t i_offset, uint32_t i_size, const SqPackBlockHash& i_block_hash )
-   {
-      // TODO
-   }
+  void SqPack::isBlockValid( uint32_t i_offset, uint32_t i_size, const SqPackBlockHash& i_block_hash )
+  {
+    // TODO
+  }
 
 }
-}

From 333650c3d58f389d48751696539e123018016556 Mon Sep 17 00:00:00 2001
From: collett <collett0301@gmail.com>
Date: Sat, 8 Feb 2020 00:43:49 +0900
Subject: [PATCH 240/351] Fix #632.

---
 src/scripts/common/aethernet/Aetheryte.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/scripts/common/aethernet/Aetheryte.cpp b/src/scripts/common/aethernet/Aetheryte.cpp
index cc5afb92..d7267d20 100644
--- a/src/scripts/common/aethernet/Aetheryte.cpp
+++ b/src/scripts/common/aethernet/Aetheryte.cpp
@@ -33,7 +33,7 @@ public:
     {
       player.playScene( eventId, 2, 0, [this]( Entity::Player& player, const Event::SceneResult& result )
       {
-        if( result.param1 == 256 )
+        if( result.param1 == 256 && result.param2 != 0 )
         {
           player.teleport( result.param2, 2 );
         }
@@ -69,7 +69,7 @@ public:
         }
         else if( result.param1 == 512 ) // aethernet access
         {
-          if( result.param2 == 4 )
+          if( result.param2 == 4 && result.param3 != 0 )
           {
             player.teleport( result.param3, 2 );
           }

From ee12f4f75ba32ea54f1b15637c5a6b9d0f9b62e4 Mon Sep 17 00:00:00 2001
From: NotAdam <adam@notadam.me>
Date: Sat, 8 Feb 2020 10:15:14 +1100
Subject: [PATCH 241/351] create data directory

---
 cmake/paths.cmake | 1 +
 1 file changed, 1 insertion(+)

diff --git a/cmake/paths.cmake b/cmake/paths.cmake
index ab4ae84d..1df097aa 100644
--- a/cmake/paths.cmake
+++ b/cmake/paths.cmake
@@ -13,3 +13,4 @@ endif()
 # Create log folder
 file( MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/bin/log )
 file( MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/bin/navi )
+file( MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/bin/data )

From f7036ef1e3d737c4ff698cca7c963f3c724b6883 Mon Sep 17 00:00:00 2001
From: NotAdam <adam@notadam.me>
Date: Sat, 8 Feb 2020 10:22:03 +1100
Subject: [PATCH 242/351] fix faulty actions submodule

---
 deps/ffxiv-actions | 1 +
 1 file changed, 1 insertion(+)
 create mode 160000 deps/ffxiv-actions

diff --git a/deps/ffxiv-actions b/deps/ffxiv-actions
new file mode 160000
index 00000000..dde9b5bb
--- /dev/null
+++ b/deps/ffxiv-actions
@@ -0,0 +1 @@
+Subproject commit dde9b5bbfc7c0197de0b0b49b982a0ee9fe761ab

From 7ccc29a6ce9b9b0f2255eaa684c5953e3581db86 Mon Sep 17 00:00:00 2001
From: NotAdam <adam@notadam.me>
Date: Mon, 10 Feb 2020 13:38:53 +1100
Subject: [PATCH 243/351] fix a strange issue where some stl implementations
 would produce an invalid path where 2 or more / are present sequentially in a
 path

---
 deps/datReader/DatCat.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/deps/datReader/DatCat.cpp b/deps/datReader/DatCat.cpp
index 2ce9566f..8bd8e79e 100644
--- a/deps/datReader/DatCat.cpp
+++ b/deps/datReader/DatCat.cpp
@@ -21,12 +21,12 @@ Cat::Cat( const std::filesystem::path& basePath, uint32_t catNum, const std::str
    std::string prefix = ss.str() + "0000.win32";
 
    // Creates the index: XX0000.win32.index
-   m_index = std::unique_ptr<Index>( new Index( basePath / "//ffxiv" / ( prefix + ".index" ) ) );
+   m_index = std::unique_ptr<Index>( new Index( basePath / "ffxiv" / ( prefix + ".index" ) ) );
 
    // For all dat files linked to this index, create it: XX0000.win32.datX
    for( uint32_t i = 0; i < getIndex().getDatCount(); ++i )
    {
-      m_dats.emplace_back( std::unique_ptr<Dat>( new Dat( basePath / "//ffxiv" / ( prefix + ".dat" + std::to_string( i ) ), i ) ) );
+      m_dats.emplace_back( std::unique_ptr<Dat>( new Dat( basePath / "ffxiv" / ( prefix + ".dat" + std::to_string( i ) ), i ) ) );
    }
 }
 

From b7ddb054f46a911d08cb79e4d4e90127c02b5c0c Mon Sep 17 00:00:00 2001
From: NotAdam <adam@notadam.me>
Date: Mon, 10 Feb 2020 13:42:22 +1100
Subject: [PATCH 244/351] make readme more lazy

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index a133f5e0..324a54a1 100644
--- a/README.md
+++ b/README.md
@@ -18,7 +18,7 @@ Sapphire requires the following software:
 
 | *Name* | *Windows* | *Linux* |
 | ------ | --------- | ------- |
-| CMake 3.0.2+ and C++17 capable compiler | [Visual Studio 2019](https://www.visualstudio.com/) | `gcc 8` and `g++ 8` or newer, alternatively, `clang 8` and `clang++ 8` or newer. |
+| CMake 3.0.2+ and C++17 capable compiler | [Visual Studio 2019](https://www.visualstudio.com/) | `gcc 8` and `g++ 8` or newer, or equivalent `clang` version. |
 | MySQL Server 5.7 | [Official Site](https://dev.mysql.com/downloads/mysql/) | MySQL server from your distribution's package manager |
 
 Please check the [wiki](https://github.com/SapphireMordred/Sapphire/wiki) for detailed installation/build instructions for your OS.

From 5f18c43dd6f134fae0e1b835761c287f86630792 Mon Sep 17 00:00:00 2001
From: NotAdam <adam@notadam.me>
Date: Mon, 10 Feb 2020 14:05:04 +1100
Subject: [PATCH 245/351] loads of datreader cleanup/consistency fixes

---
 deps/datReader/Dat.cpp      | 509 +++++++++++++------------
 deps/datReader/Dat.h        |  45 +--
 deps/datReader/DatCat.cpp   |   6 +-
 deps/datReader/DatCat.h     |  86 +++--
 deps/datReader/Exd.cpp      | 737 ++++++++++++++++++------------------
 deps/datReader/Exd.h        |  56 +--
 deps/datReader/ExdCat.cpp   | 113 +++---
 deps/datReader/ExdData.cpp  | 126 +++---
 deps/datReader/Exh.cpp      |  74 ++--
 deps/datReader/Exh.h        | 190 ++++++----
 deps/datReader/File.cpp     |  59 ++-
 deps/datReader/File.h       |  62 ++-
 deps/datReader/GameData.cpp | 453 +++++++++++-----------
 deps/datReader/GameData.h   | 114 +++---
 deps/datReader/Index.cpp    | 228 ++++++-----
 deps/datReader/Index.h      |  72 ++--
 deps/datReader/SqPack.cpp   |  12 +-
 deps/datReader/SqPack.h     |  78 ++--
 deps/datReader/bparse.h     | 152 ++++----
 deps/datReader/conv.cpp     |   8 +-
 deps/datReader/conv.h       |   8 +-
 deps/datReader/crc32.cpp    | 169 ++++-----
 deps/datReader/crc32.h      |  11 +-
 deps/datReader/stream.cpp   |   8 +-
 deps/datReader/stream.h     |  24 +-
 deps/datReader/zlib.cpp     |  48 +--
 deps/datReader/zlib.h       |  13 +-
 27 files changed, 1727 insertions(+), 1734 deletions(-)

diff --git a/deps/datReader/Dat.cpp b/deps/datReader/Dat.cpp
index 5e12d5d1..943e12fd 100644
--- a/deps/datReader/Dat.cpp
+++ b/deps/datReader/Dat.cpp
@@ -4,308 +4,319 @@
 
 #include "File.h"
 
-namespace
-{
-   const uint32_t model_section_count = 0xB;
+namespace {
+  const uint32_t model_section_count = 0xB;
 }
 
-namespace xiv 
+namespace xiv::dat
 {
-namespace dat
-{
-   struct DatFileHeader
-   {
-      uint32_t size;
-      FileType entry_type;
-      uint32_t total_uncompressed_size;
-      uint32_t unknown[0x2];
-   };
+  struct DatFileHeader
+  {
+    uint32_t size;
+    FileType entry_type;
+    uint32_t total_uncompressed_size;
+    uint32_t unknown[0x2];
+  };
 
-   struct DatBlockRecord
-   {
-      uint32_t offset;
-      uint32_t size;
-      uint32_t unknown[0x4];
-      SqPackBlockHash block_hash;
-   };
+  struct DatBlockRecord
+  {
+    uint32_t offset;
+    uint32_t size;
+    uint32_t unknown[0x4];
+    SqPackBlockHash block_hash;
+  };
 
-   struct DatBlockHeader
-   {
-      uint32_t size;
-      uint32_t unknown1;
-      uint32_t compressed_size;
-      uint32_t uncompressed_size;
-   };
+  struct DatBlockHeader
+  {
+    uint32_t size;
+    uint32_t unknown1;
+    uint32_t compressed_size;
+    uint32_t uncompressed_size;
+  };
 
-   struct DatStdFileBlockInfos
-   {
-      uint32_t offset;
-      uint16_t size;
-      uint16_t uncompressed_size;
-   };
+  struct DatStdFileBlockInfos
+  {
+    uint32_t offset;
+    uint16_t size;
+    uint16_t uncompressed_size;
+  };
 
-   struct DatMdlFileBlockInfos
-   {
-      uint32_t unknown1;
-      uint32_t uncompressed_sizes[::model_section_count];
-      uint32_t compressed_sizes[::model_section_count];
-      uint32_t offsets[::model_section_count];
-      uint16_t block_ids[::model_section_count];
-      uint16_t block_counts[::model_section_count];
-      uint32_t unknown2[0x2];
-   };
+  struct DatMdlFileBlockInfos
+  {
+    uint32_t unknown1;
+    uint32_t uncompressed_sizes[::model_section_count];
+    uint32_t compressed_sizes[::model_section_count];
+    uint32_t offsets[::model_section_count];
+    uint16_t block_ids[::model_section_count];
+    uint16_t block_counts[::model_section_count];
+    uint32_t unknown2[0x2];
+  };
 
-   struct DatTexFileBlockInfos
-   {
-      uint32_t offset;
-      uint32_t size;
-      uint32_t uncompressed_size;
-      uint32_t block_id;
-      uint32_t block_count;
-   };
-   
+  struct DatTexFileBlockInfos
+  {
+    uint32_t offset;
+    uint32_t size;
+    uint32_t uncompressed_size;
+    uint32_t block_id;
+    uint32_t block_count;
+  };
 }
-}   
 
-namespace xiv
+namespace xiv::utils::bparse
 {
-namespace utils
-{
-namespace bparse
-{
-   template <>
-   inline void reorder<xiv::dat::DatFileHeader>(xiv::dat::DatFileHeader& i_struct)
-   {
-      xiv::utils::bparse::reorder(i_struct.size);
-      xiv::utils::bparse::reorder(i_struct.entry_type);
-      xiv::utils::bparse::reorder(i_struct.total_uncompressed_size);
-      for (int32_t i = 0; i < 0x2; ++i) { xiv::utils::bparse::reorder(i_struct.unknown[i]); }
-   }
+  template<>
+  inline void reorder< xiv::dat::DatFileHeader >( xiv::dat::DatFileHeader& i_struct )
+  {
+    xiv::utils::bparse::reorder( i_struct.size );
+    xiv::utils::bparse::reorder( i_struct.entry_type );
+    xiv::utils::bparse::reorder( i_struct.total_uncompressed_size );
+    for( int32_t i = 0; i < 0x2; ++i )
+    {
+      xiv::utils::bparse::reorder( i_struct.unknown[ i ] );
+    }
+  }
 
-   template <>
-   inline void reorder<xiv::dat::DatBlockRecord>(xiv::dat::DatBlockRecord& i_struct)
-   {
-      xiv::utils::bparse::reorder(i_struct.offset);
-      xiv::utils::bparse::reorder(i_struct.size);
-      for (int32_t i = 0; i < 0x4; ++i) { xiv::utils::bparse::reorder(i_struct.unknown[i]); }
-      xiv::utils::bparse::reorder(i_struct.block_hash);
-   }
+  template<>
+  inline void reorder< xiv::dat::DatBlockRecord >( xiv::dat::DatBlockRecord& i_struct )
+  {
+    xiv::utils::bparse::reorder( i_struct.offset );
+    xiv::utils::bparse::reorder( i_struct.size );
+    for( int32_t i = 0; i < 0x4; ++i )
+    {
+      xiv::utils::bparse::reorder( i_struct.unknown[ i ] );
+    }
+    xiv::utils::bparse::reorder( i_struct.block_hash );
+  }
 
-   template <>
-   inline void reorder<xiv::dat::DatBlockHeader>(xiv::dat::DatBlockHeader& i_struct)
-   {
-      xiv::utils::bparse::reorder(i_struct.size);
-      xiv::utils::bparse::reorder(i_struct.unknown1);
-      xiv::utils::bparse::reorder(i_struct.compressed_size);
-      xiv::utils::bparse::reorder(i_struct.uncompressed_size);
-   }
+  template<>
+  inline void reorder< xiv::dat::DatBlockHeader >( xiv::dat::DatBlockHeader& i_struct )
+  {
+    xiv::utils::bparse::reorder( i_struct.size );
+    xiv::utils::bparse::reorder( i_struct.unknown1 );
+    xiv::utils::bparse::reorder( i_struct.compressed_size );
+    xiv::utils::bparse::reorder( i_struct.uncompressed_size );
+  }
 
-   template <>
-   inline void reorder<xiv::dat::DatStdFileBlockInfos>(xiv::dat::DatStdFileBlockInfos& i_struct)
-   {
-      xiv::utils::bparse::reorder(i_struct.offset);
-      xiv::utils::bparse::reorder(i_struct.size);
-      xiv::utils::bparse::reorder(i_struct.uncompressed_size);
-   }
+  template<>
+  inline void reorder< xiv::dat::DatStdFileBlockInfos >( xiv::dat::DatStdFileBlockInfos& i_struct )
+  {
+    xiv::utils::bparse::reorder( i_struct.offset );
+    xiv::utils::bparse::reorder( i_struct.size );
+    xiv::utils::bparse::reorder( i_struct.uncompressed_size );
+  }
 
-   template <>
-   inline void reorder<xiv::dat::DatMdlFileBlockInfos>(xiv::dat::DatMdlFileBlockInfos& i_struct)
-   {
-      xiv::utils::bparse::reorder(i_struct.unknown1);
-      for (auto i = 0; i < ::model_section_count; ++i) { xiv::utils::bparse::reorder(i_struct.uncompressed_sizes[i]); }
-      for (auto i = 0; i < ::model_section_count; ++i) { xiv::utils::bparse::reorder(i_struct.compressed_sizes[i]); }
-      for (auto i = 0; i < ::model_section_count; ++i) { xiv::utils::bparse::reorder(i_struct.offsets[i]); }
-      for (auto i = 0; i < ::model_section_count; ++i) { xiv::utils::bparse::reorder(i_struct.block_ids[i]); }
-      for (auto i = 0; i < ::model_section_count; ++i) { xiv::utils::bparse::reorder(i_struct.block_counts[i]); }
-      for (auto i = 0; i < 0x2; ++i) { xiv::utils::bparse::reorder(i_struct.unknown2[i]); }
-   }
+  template<>
+  inline void reorder< xiv::dat::DatMdlFileBlockInfos >( xiv::dat::DatMdlFileBlockInfos& i_struct )
+  {
+    xiv::utils::bparse::reorder( i_struct.unknown1 );
+    for( auto i = 0; i < ::model_section_count; ++i )
+    {
+      xiv::utils::bparse::reorder( i_struct.uncompressed_sizes[ i ] );
+    }
+    for( auto i = 0; i < ::model_section_count; ++i )
+    {
+      xiv::utils::bparse::reorder( i_struct.compressed_sizes[ i ] );
+    }
+    for( auto i = 0; i < ::model_section_count; ++i )
+    {
+      xiv::utils::bparse::reorder( i_struct.offsets[ i ] );
+    }
+    for( auto i = 0; i < ::model_section_count; ++i )
+    {
+      xiv::utils::bparse::reorder( i_struct.block_ids[ i ] );
+    }
+    for( auto i = 0; i < ::model_section_count; ++i )
+    {
+      xiv::utils::bparse::reorder( i_struct.block_counts[ i ] );
+    }
+    for( auto i = 0; i < 0x2; ++i )
+    {
+      xiv::utils::bparse::reorder( i_struct.unknown2[ i ] );
+    }
+  }
 
-   template <>
-   inline void reorder<xiv::dat::DatTexFileBlockInfos>(xiv::dat::DatTexFileBlockInfos& i_struct)
-   {
-      xiv::utils::bparse::reorder(i_struct.offset);
-      xiv::utils::bparse::reorder(i_struct.size);
-      xiv::utils::bparse::reorder(i_struct.uncompressed_size);
-      xiv::utils::bparse::reorder(i_struct.block_id);
-      xiv::utils::bparse::reorder(i_struct.block_count);
-   }
+  template<>
+  inline void reorder< xiv::dat::DatTexFileBlockInfos >( xiv::dat::DatTexFileBlockInfos& i_struct )
+  {
+    xiv::utils::bparse::reorder( i_struct.offset );
+    xiv::utils::bparse::reorder( i_struct.size );
+    xiv::utils::bparse::reorder( i_struct.uncompressed_size );
+    xiv::utils::bparse::reorder( i_struct.block_id );
+    xiv::utils::bparse::reorder( i_struct.block_count );
+  }
 }
-}
-};
 
 using xiv::utils::bparse::extract;
 
-namespace xiv
-{
-namespace dat
+namespace xiv::dat
 {
 
-Dat::Dat( const std::filesystem::path& i_path, uint32_t i_nb ) :
-   SqPack( i_path ),
-   m_num( i_nb )
-{
-   auto block_record = extract<DatBlockRecord>(m_handle);
-   block_record.offset *= 0x80;
-   isBlockValid(block_record.offset, block_record.size, block_record.block_hash);
-}
+  Dat::Dat( const std::filesystem::path& i_path, uint32_t i_nb ) :
+    SqPack( i_path ),
+    m_num( i_nb )
+  {
+    auto block_record = extract< DatBlockRecord >( m_handle );
+    block_record.offset *= 0x80;
+    isBlockValid( block_record.offset, block_record.size, block_record.block_hash );
+  }
 
-Dat::~Dat()
-{
-}
+  Dat::~Dat()
+  {
+  }
 
-std::unique_ptr<File> Dat::getFile( uint32_t i_offset )
-{
-   std::unique_ptr<File> outputFile(new File());
-   {
+  std::unique_ptr< File > Dat::getFile( uint32_t i_offset )
+  {
+    std::unique_ptr< File > outputFile( new File() );
+    {
       // Lock in this scope
-      std::lock_guard<std::mutex> lock(m_fileMutex);
+      std::lock_guard< std::mutex > lock( m_fileMutex );
 
       // Seek to the start of the header of the file record and extract it
-      m_handle.seekg(i_offset);
-      auto file_header = extract<DatFileHeader>(m_handle);
+      m_handle.seekg( i_offset );
+      auto file_header = extract< DatFileHeader >( m_handle );
 
-      switch (file_header.entry_type)
+      switch( file_header.entry_type )
       {
-      case FileType::empty:
-         throw std::runtime_error("File is empty");
+        case FileType::empty:
+          throw std::runtime_error( "File is empty" );
 
-      case FileType::standard:
-         {
-            outputFile->_type = FileType::standard;
+        case FileType::standard:
+        {
+          outputFile->_type = FileType::standard;
 
-            uint32_t number_of_blocks = extract<uint32_t>(m_handle, "number_of_blocks");
+          uint32_t number_of_blocks = extract< uint32_t >( m_handle, "number_of_blocks" );
 
-            // Just extract offset infos for the blocks to extract
-            std::vector<DatStdFileBlockInfos> std_file_block_infos;
-            extract<DatStdFileBlockInfos>( m_handle, number_of_blocks, std_file_block_infos );
+          // Just extract offset infos for the blocks to extract
+          std::vector< DatStdFileBlockInfos > std_file_block_infos;
+          extract< DatStdFileBlockInfos >( m_handle, number_of_blocks, std_file_block_infos );
 
-            // Pre allocate data vector for the whole file
-            outputFile->_data_sections.resize(1);
-            auto& data_section = outputFile->_data_sections.front();
+          // Pre allocate data vector for the whole file
+          outputFile->_data_sections.resize( 1 );
+          auto& data_section = outputFile->_data_sections.front();
 
-            data_section.reserve(file_header.total_uncompressed_size);
-            // Extract each block
-            for (auto& file_block_info : std_file_block_infos)
+          data_section.reserve( file_header.total_uncompressed_size );
+          // Extract each block
+          for( auto& file_block_info : std_file_block_infos )
+          {
+            extractBlock( i_offset + file_header.size + file_block_info.offset, data_section );
+          }
+        }
+          break;
+
+        case FileType::model:
+        {
+          outputFile->_type = FileType::model;
+
+          DatMdlFileBlockInfos mdlBlockInfo = extract< DatMdlFileBlockInfos >( m_handle );
+
+          // Getting the block number and read their sizes
+          const uint32_t block_count = mdlBlockInfo.block_ids[ ::model_section_count - 1 ] +
+                                       mdlBlockInfo.block_counts[ ::model_section_count - 1 ];
+          std::vector< uint16_t > block_sizes;
+          extract< uint16_t >( m_handle, "block_size", block_count, block_sizes );
+
+          // Preallocate sufficient space
+          outputFile->_data_sections.resize( ::model_section_count );
+
+          for( uint32_t i = 0; i < ::model_section_count; ++i )
+          {
+            // Preallocating for section
+            auto& data_section = outputFile->_data_sections[ i ];
+            data_section.reserve( mdlBlockInfo.uncompressed_sizes[ i ] );
+
+            uint32_t current_offset = i_offset + file_header.size + mdlBlockInfo.offsets[ i ];
+            for( uint32_t j = 0; j < mdlBlockInfo.block_counts[ i ]; ++j )
             {
-               extractBlock(i_offset + file_header.size + file_block_info.offset, data_section);
+              extractBlock( current_offset, data_section );
+              current_offset += block_sizes[ mdlBlockInfo.block_ids[ i ] + j ];
             }
-         }
-         break;
+          }
+        }
+          break;
 
-      case FileType::model:
-         {
-            outputFile->_type = FileType::model;
+        case FileType::texture:
+        {
+          outputFile->_type = FileType::texture;
 
-            DatMdlFileBlockInfos mdlBlockInfo = extract<DatMdlFileBlockInfos>(m_handle);
+          // Extracts mipmap entries and the block sizes
+          uint32_t sectionCount = extract< uint32_t >( m_handle, "sections_count" );
 
-            // Getting the block number and read their sizes
-            const uint32_t block_count = mdlBlockInfo.block_ids[::model_section_count - 1] +
-               mdlBlockInfo.block_counts[::model_section_count - 1];
-            std::vector<uint16_t> block_sizes;
-            extract<uint16_t>(m_handle, "block_size", block_count, block_sizes);
+          std::vector< DatTexFileBlockInfos > texBlockInfo;
+          extract< DatTexFileBlockInfos >( m_handle, sectionCount, texBlockInfo );
 
-            // Preallocate sufficient space
-            outputFile->_data_sections.resize(::model_section_count);
+          // Extracting block sizes
+          uint32_t block_count = texBlockInfo.back().block_id + texBlockInfo.back().block_count;
+          std::vector< uint16_t > block_sizes;
+          extract< uint16_t >( m_handle, "block_size", block_count, block_sizes );
 
-            for (uint32_t i = 0; i < ::model_section_count; ++i)
+          outputFile->_data_sections.resize( sectionCount + 1 );
+
+          // Extracting header in section 0
+          const uint32_t header_size = texBlockInfo.front().offset;
+          auto& header_section = outputFile->_data_sections[ 0 ];
+          header_section.resize( header_size );
+
+          m_handle.seekg( i_offset + file_header.size );
+          m_handle.read( header_section.data(), header_size );
+
+          // Extracting other sections
+          for( uint32_t i = 0; i < sectionCount; ++i )
+          {
+            auto& data_section = outputFile->_data_sections[ i + 1 ];
+            auto& section_infos = texBlockInfo[ i ];
+            data_section.reserve( section_infos.uncompressed_size );
+
+            uint32_t current_offset = i_offset + file_header.size + section_infos.offset;
+            for( uint32_t j = 0; j < section_infos.block_count; ++j )
             {
-               // Preallocating for section
-               auto& data_section = outputFile->_data_sections[i];
-               data_section.reserve(mdlBlockInfo.uncompressed_sizes[i]);
-
-               uint32_t current_offset = i_offset + file_header.size + mdlBlockInfo.offsets[i];
-               for (uint32_t j = 0; j < mdlBlockInfo.block_counts[i]; ++j)
-               {
-                  extractBlock(current_offset, data_section);
-                  current_offset += block_sizes[mdlBlockInfo.block_ids[i] + j];
-               }
+              extractBlock( current_offset, data_section );
+              current_offset += block_sizes[ section_infos.block_id + j ];
             }
-         }
-         break;
+          }
+        }
+          break;
 
-      case FileType::texture:
-         {
-            outputFile->_type = FileType::texture;
-
-            // Extracts mipmap entries and the block sizes
-            uint32_t sectionCount = extract<uint32_t>(m_handle, "sections_count");
-
-            std::vector<DatTexFileBlockInfos> texBlockInfo;
-            extract<DatTexFileBlockInfos>(m_handle, sectionCount, texBlockInfo);
-
-            // Extracting block sizes
-            uint32_t block_count = texBlockInfo.back().block_id + texBlockInfo.back().block_count;
-            std::vector<uint16_t> block_sizes;
-            extract<uint16_t>(m_handle, "block_size", block_count, block_sizes);
-
-            outputFile->_data_sections.resize(sectionCount + 1);
-
-            // Extracting header in section 0
-            const uint32_t header_size = texBlockInfo.front().offset;
-            auto& header_section = outputFile->_data_sections[0];
-            header_section.resize(header_size);
-
-            m_handle.seekg(i_offset + file_header.size);
-            m_handle.read(header_section.data(), header_size);
-
-            // Extracting other sections
-            for (uint32_t i = 0; i < sectionCount; ++i)
-            {
-               auto& data_section = outputFile->_data_sections[i + 1];
-               auto& section_infos = texBlockInfo[i];
-               data_section.reserve(section_infos.uncompressed_size);
-
-               uint32_t current_offset = i_offset + file_header.size + section_infos.offset;
-               for (uint32_t j = 0; j < section_infos.block_count; ++j)
-               {
-                  extractBlock(current_offset, data_section);
-                  current_offset += block_sizes[section_infos.block_id + j];
-               }
-            }
-         }
-         break;
-
-      default:
-         throw std::runtime_error("Invalid entry_type: " + std::to_string(static_cast<uint32_t>(file_header.entry_type)));
+        default:
+          throw std::runtime_error(
+            "Invalid entry_type: " + std::to_string( static_cast<uint32_t>(file_header.entry_type) ) );
       }
-   }
+    }
 
-   return outputFile;
-}
+    return outputFile;
+  }
 
-void Dat::extractBlock( uint32_t i_offset, std::vector<char>& o_data )
-{
-   m_handle.seekg(i_offset);
+  void Dat::extractBlock( uint32_t i_offset, std::vector< char >& o_data )
+  {
+    m_handle.seekg( i_offset );
 
-   DatBlockHeader block_header = extract<DatBlockHeader>(m_handle);
+    DatBlockHeader block_header = extract< DatBlockHeader >( m_handle );
 
-   // Resizing the vector to write directly into it
-   const uint32_t data_size = o_data.size();
-   o_data.resize(data_size + block_header.uncompressed_size);
+    // Resizing the vector to write directly into it
+    const uint32_t data_size = o_data.size();
+    o_data.resize( data_size + block_header.uncompressed_size );
 
-   // 32000 in compressed_size means it is not compressed so take uncompressed_size
-   if (block_header.compressed_size == 32000)
-   {
-      m_handle.read(o_data.data() + data_size, block_header.uncompressed_size);
-   }
-   else
-   {
+    // 32000 in compressed_size means it is not compressed so take uncompressed_size
+    if( block_header.compressed_size == 32000 )
+    {
+      m_handle.read( o_data.data() + data_size, block_header.uncompressed_size );
+    }
+    else
+    {
       // If it is compressed use zlib
       // Read the data to be decompressed
-      std::vector<char> temp_buffer(block_header.compressed_size);
-      m_handle.read(temp_buffer.data(), block_header.compressed_size);
+      std::vector< char > temp_buffer( block_header.compressed_size );
+      m_handle.read( temp_buffer.data(), block_header.compressed_size );
 
-      utils::zlib::no_header_decompress(reinterpret_cast<uint8_t*>(temp_buffer.data()),
-                                        temp_buffer.size(),
-                                        reinterpret_cast<uint8_t*>(o_data.data() + data_size),
-                                        block_header.uncompressed_size);
-   }
-}
+      utils::zlib::no_header_decompress( reinterpret_cast<uint8_t*>(temp_buffer.data()),
+                                         temp_buffer.size(),
+                                         reinterpret_cast<uint8_t*>(o_data.data() + data_size),
+                                         block_header.uncompressed_size );
+    }
+  }
 
-uint32_t Dat::getNum() const
-{
-   return m_num;
-}
+  uint32_t Dat::getNum() const
+  {
+    return m_num;
+  }
 
 }
-}
diff --git a/deps/datReader/Dat.h b/deps/datReader/Dat.h
index 10693b3c..f1827782 100644
--- a/deps/datReader/Dat.h
+++ b/deps/datReader/Dat.h
@@ -7,39 +7,36 @@
 
 #include <filesystem>
 
-namespace xiv
-{
-namespace dat
+namespace xiv::dat
 {
 
-class File;
+  class File;
 
-class Dat : public SqPack
-{
-public:
-   // Full path to the dat file
-   Dat( const std::filesystem::path& i_path, uint32_t i_nb );
-   virtual ~Dat();
+  class Dat : public SqPack
+  {
+  public:
+     // Full path to the dat file
+     Dat( const std::filesystem::path& i_path, uint32_t i_nb );
+     virtual ~Dat();
 
-   // Retrieves a file given the offset in the dat file
-   std::unique_ptr<File> getFile( uint32_t i_offset );
+     // Retrieves a file given the offset in the dat file
+     std::unique_ptr<File> getFile( uint32_t i_offset );
 
-   // Appends to the vector the data of this block, it is assumed to be preallocated
-   // Is it also assumed that the m_fileMutex is currently locked by this thread before the call
-   void extractBlock( uint32_t i_offset, std::vector<char>& o_data );
+     // Appends to the vector the data of this block, it is assumed to be preallocated
+     // Is it also assumed that the m_fileMutex is currently locked by this thread before the call
+     void extractBlock( uint32_t i_offset, std::vector<char>& o_data );
 
-   // Returns the dat number
-   uint32_t getNum() const;
+     // Returns the dat number
+     uint32_t getNum() const;
 
-protected:
-   // File reading mutex to have only one thread reading the file at a time
-   std::mutex m_fileMutex;
+  protected:
+     // File reading mutex to have only one thread reading the file at a time
+     std::mutex m_fileMutex;
 
-   // Dat nb
-   uint32_t m_num;
-};
+     // Dat nb
+     uint32_t m_num;
+  };
 
-}
 }
 
 #endif // XIV_DAT_DAT_H
diff --git a/deps/datReader/DatCat.cpp b/deps/datReader/DatCat.cpp
index 8bd8e79e..ccf3d6a0 100644
--- a/deps/datReader/DatCat.cpp
+++ b/deps/datReader/DatCat.cpp
@@ -26,7 +26,7 @@ Cat::Cat( const std::filesystem::path& basePath, uint32_t catNum, const std::str
    // For all dat files linked to this index, create it: XX0000.win32.datX
    for( uint32_t i = 0; i < getIndex().getDatCount(); ++i )
    {
-      m_dats.emplace_back( std::unique_ptr<Dat>( new Dat( basePath / "ffxiv" / ( prefix + ".dat" + std::to_string( i ) ), i ) ) );
+      m_dats.emplace_back( std::make_unique< Dat >(basePath / "ffxiv" / ( prefix + ".dat" + std::to_string( i ) ), i ) );
    }
 }
 
@@ -36,12 +36,12 @@ Cat::Cat( const std::filesystem::path& basePath, uint32_t catNum, const std::str
    m_chunk( chunk )
 {
    // Creates the index: XX0000.win32.index
-   m_index = std::unique_ptr<Index>( new Index( basePath / GameData::buildDatStr( "ex" + std::to_string( exNum ), catNum, exNum, chunk, "win32", "index" ) ) );
+   m_index = std::make_unique< Index >( basePath / GameData::buildDatStr( "ex" + std::to_string( exNum ), catNum, exNum, chunk, "win32", "index" ) );
 
    // For all dat files linked to this index, create it: XX0000.win32.datX
    for( uint32_t i = 0; i < getIndex().getDatCount(); ++i )
    {
-      m_dats.emplace_back( std::unique_ptr<Dat>( new Dat( basePath / GameData::buildDatStr( "ex" + std::to_string( exNum ), catNum, exNum, chunk, "win32", "dat" + std::to_string( i ) ), i ) ) );
+      m_dats.emplace_back( std::make_unique< Dat >( basePath / GameData::buildDatStr( "ex" + std::to_string( exNum ), catNum, exNum, chunk, "win32", "dat" + std::to_string( i ) ), i ) );
    }
 }
 
diff --git a/deps/datReader/DatCat.h b/deps/datReader/DatCat.h
index 07878589..43d842a1 100644
--- a/deps/datReader/DatCat.h
+++ b/deps/datReader/DatCat.h
@@ -5,60 +5,64 @@
 #include <vector>
 #include <filesystem>
 
-namespace xiv {
-namespace dat {
-
-class Index;
-class Dat;
-class File;
-
-// A category represents an .index and its associated .datX
-class Cat
+namespace xiv::dat
 {
-public:
-   // basePath: Path to the folder containingthe datfiles
-   // catNum: The number of the category
-   // name: The name of the category, empty if not known
-   Cat( const std::filesystem::path& basePath, uint32_t catNum, const std::string& name );
 
-   // basePath: Path to the folder containingthe datfiles
-   // catNum: The number of the category
-   // name: The name of the category, empty if not known
-   // exNum: The number of the expansion to load from
-   // chunk: The chunk to load from
-   Cat( const std::filesystem::path& basePath, uint32_t catNum, const std::string& name, uint32_t exNum, uint32_t chunk );
-   ~Cat();
+  class Index;
 
-   // Returns .index of the category
-   const Index& getIndex() const;
+  class Dat;
 
-   // Retrieve a file from the category given its hashes
-   std::unique_ptr<File> getFile( uint32_t dir_hash, uint32_t filename_hash ) const;
+  class File;
+
+  // A category represents an .index and its associated .datX
+  class Cat
+  {
+  public:
+    // basePath: Path to the folder containingthe datfiles
+    // catNum: The number of the category
+    // name: The name of the category, empty if not known
+    Cat( const std::filesystem::path& basePath, uint32_t catNum, const std::string& name );
+
+    // basePath: Path to the folder containingthe datfiles
+    // catNum: The number of the category
+    // name: The name of the category, empty if not known
+    // exNum: The number of the expansion to load from
+    // chunk: The chunk to load from
+    Cat( const std::filesystem::path& basePath, uint32_t catNum, const std::string& name, uint32_t exNum,
+         uint32_t chunk );
+
+    ~Cat();
+
+    // Returns .index of the category
+    const Index& getIndex() const;
+
+    // Retrieve a file from the category given its hashes
+    std::unique_ptr< File > getFile( uint32_t dir_hash, uint32_t filename_hash ) const;
 
 
-   bool doesFileExist( uint32_t dir_hash, uint32_t filename_hash ) const;
-   bool doesDirExist( uint32_t dir_hash ) const;
+    bool doesFileExist( uint32_t dir_hash, uint32_t filename_hash ) const;
+
+    bool doesDirExist( uint32_t dir_hash ) const;
 
 
-   // Returns thename of the category
-   const std::string& getName() const;
+    // Returns thename of the category
+    const std::string& getName() const;
 
-   // Returns the number of the category
-   uint32_t getCatNum() const;
+    // Returns the number of the category
+    uint32_t getCatNum() const;
 
-protected:
-   const std::string m_name;
-   const uint32_t m_catNum;
-   const uint32_t m_chunk;
+  protected:
+    const std::string m_name;
+    const uint32_t m_catNum;
+    const uint32_t m_chunk;
 
-   // The .index
-   std::unique_ptr<Index> m_index;
+    // The .index
+    std::unique_ptr< Index > m_index;
 
-   // The .datXs such as dat nb X => m_dats[X]
-   std::vector<std::unique_ptr<Dat>> m_dats;
-};
+    // The .datXs such as dat nb X => m_dats[X]
+    std::vector< std::unique_ptr< Dat>> m_dats;
+  };
     
-}
 }
 
 #endif // XIV_DAT_CAT_H
diff --git a/deps/datReader/Exd.cpp b/deps/datReader/Exd.cpp
index e82fcc96..79de150b 100644
--- a/deps/datReader/Exd.cpp
+++ b/deps/datReader/Exd.cpp
@@ -8,373 +8,378 @@
 using xiv::utils::bparse::extract;
 
 
-namespace xiv 
+namespace xiv::exd
 {
-   namespace exd 
-   {
+  struct ExdHeader
+  {
+    char magic[0x4];
+    uint16_t unknown;
+    uint16_t unknown2;
+    uint32_t index_size;
+  };
+
+  struct ExdRecordIndex
+  {
+    uint32_t id;
+    uint32_t offset;
+  };
+}
+
+namespace xiv::utils::bparse {
+template<>
+  inline void reorder< xiv::exd::ExdHeader >( xiv::exd::ExdHeader& i_struct )
+  {
+    for( int32_t i = 0; i < 0x4; ++i )
+    {
+      xiv::utils::bparse::reorder( i_struct.magic[ i ] );
+    }
+    i_struct.unknown = xiv::utils::bparse::byteswap( i_struct.unknown );
+    xiv::utils::bparse::reorder( i_struct.unknown );
+    i_struct.unknown2 = xiv::utils::bparse::byteswap( i_struct.unknown2 );
+    xiv::utils::bparse::reorder( i_struct.unknown2 );
+    i_struct.index_size = xiv::utils::bparse::byteswap( i_struct.index_size );
+    xiv::utils::bparse::reorder( i_struct.index_size );
+  }
+
+  template<>
+  inline void reorder< xiv::exd::ExdRecordIndex >( xiv::exd::ExdRecordIndex& i_struct )
+  {
+    i_struct.id = xiv::utils::bparse::byteswap( i_struct.id );
+    xiv::utils::bparse::reorder( i_struct.id );
+    i_struct.offset = xiv::utils::bparse::byteswap( i_struct.offset );
+    xiv::utils::bparse::reorder( i_struct.offset );
+  }
+};
+
+namespace xiv::exd
+{
+  Exd::Exd( std::shared_ptr< Exh > i_exh, const std::vector< std::shared_ptr< dat::File>>& i_files )
+  {
+    _exh = i_exh;
+    _files = i_files;
+
+
+    // Iterates over all the files
+    const uint32_t member_count = _exh->get_members().size();
+    for( auto& file_ptr : _files )
+    {
+      // Get a stream
+      std::vector< char > dataCpy = file_ptr->get_data_sections().front();
+      std::istringstream iss( std::string( dataCpy.begin(), dataCpy.end() ) );
+
+      // Extract the header and skip to the record indices
+      auto exd_header = extract< ExdHeader >( iss );
+      iss.seekg( 0x20 );
+
+      // Preallocate and extract the record_indices
+      const uint32_t record_count = exd_header.index_size / sizeof( ExdRecordIndex );
+      std::vector< ExdRecordIndex > record_indices;
+      record_indices.reserve( record_count );
+      for( uint32_t i = 0; i < record_count; ++i )
+      {
+        auto recordIndex = extract< ExdRecordIndex >( iss );
+        _idCache[ recordIndex.id ] = ExdCacheEntry{ file_ptr, recordIndex.offset };
+      }
+    }
+  }
+
+  Exd::~Exd()
+  {
+  }
+
+  const std::vector< Field > Exd::get_row( uint32_t id, uint32_t subRow )
+  {
+
+    auto cacheEntryIt = _idCache.find( id );
+    if( cacheEntryIt == _idCache.end() )
+      throw std::runtime_error( "Id not found: " + std::to_string( id ) );
+
+    // Iterates over all the files
+    const uint32_t member_count = _exh->get_members().size();
+    auto& file_ptr = cacheEntryIt->second.file;
+
+    std::vector< char > dataCpy = file_ptr->get_data_sections().front();
+    std::istringstream iss( std::string( dataCpy.begin(), dataCpy.end() ) );
+
+    // Get the vector fields for the given record and preallocate it
+    auto fields = _data[ id ];
+    fields.reserve( member_count );
+    iss.seekg( cacheEntryIt->second.offset + 6 );
+
+    uint8_t subRows = *reinterpret_cast< uint8_t* >( &dataCpy[ cacheEntryIt->second.offset + 5 ] );
+
+    if( subRow >= subRows )
+      throw std::runtime_error( "Out of bounds sub-row!" );
+
+    int offset = cacheEntryIt->second.offset + 6 + ( subRow * _exh->get_header().data_offset + 2 * ( subRow + 1 ) );
+
+    for( auto& member_entry : _exh->get_exh_members() )
+    {
+      // Seek to the position of the member to extract.
+      // 6 is because we have uint32_t/uint16_t at the start of each record
+      iss.seekg( offset + member_entry.offset );
+
+      // Switch depending on the type to extract
+      switch( member_entry.type )
+      {
+        case DataType::string:
+          // Extract the offset to the actual string
+          // Seek to it then extract the actual string
+        {
+          throw std::runtime_error( "String not implemented for variant 2!" );
+          //auto string_offset = extract<uint32_t>( iss, "string_offset", false );
+          //iss.seekg( cacheEntryIt->second.offset + 6 + _exh->get_header().data_offset + string_offset );
+          //fields.emplace_back( utils::bparse::extract_cstring( iss, "string" ) );
+        }
+          break;
+
+        case DataType::boolean:
+          fields.emplace_back( extract< bool >( iss, "bool" ) );
+          break;
+
+        case DataType::int8:
+          fields.emplace_back( extract< int8_t >( iss, "int8_t" ) );
+          break;
+
+        case DataType::uint8:
+          fields.emplace_back( extract< uint8_t >( iss, "uint8_t" ) );
+          break;
+
+        case DataType::int16:
+          fields.emplace_back( extract< int16_t >( iss, "int16_t", false ) );
+          break;
+
+        case DataType::uint16:
+          fields.emplace_back( extract< uint16_t >( iss, "uint16_t", false ) );
+          break;
+
+        case DataType::int32:
+          fields.emplace_back( extract< int32_t >( iss, "int32_t", false ) );
+          break;
+
+        case DataType::uint32:
+          fields.emplace_back( extract< uint32_t >( iss, "uint32_t", false ) );
+          break;
+
+        case DataType::float32:
+          fields.emplace_back( extract< float >( iss, "float", false ) );
+          break;
+
+        case DataType::uint64:
+          fields.emplace_back( extract< uint64_t >( iss, "uint64_t", false ) );
+          break;
+
+        default:
+          auto type = static_cast< uint16_t >( member_entry.type );
+          if( type < 0x19 || type > 0x20 )
+            throw std::runtime_error( "Unknown DataType: " + std::to_string( type ) );
+          uint64_t val = extract< uint64_t >( iss, "bool" );
+          int32_t shift = type - 0x19;
+          int32_t i = 1 << shift;
+          val &= i;
+          fields.emplace_back( ( val & i ) == i );
+          break;
+      }
+    }
+    return fields;
+
+  }
+
+
+  const std::vector< Field > Exd::get_row( uint32_t id )
+  {
+
+    auto cacheEntryIt = _idCache.find( id );
+    if( cacheEntryIt == _idCache.end() )
+      throw std::runtime_error( "Id not found: " + std::to_string( id ) );
+
+    // Iterates over all the files
+    const uint32_t member_count = _exh->get_members().size();
+    auto& file_ptr = cacheEntryIt->second.file;
+
+    std::vector< char > dataCpy = file_ptr->get_data_sections().front();
+    std::istringstream iss( std::string( dataCpy.begin(), dataCpy.end() ) );
+
+    // Get the vector fields for the given record and preallocate it
+    auto fields = _data[ id ];
+    fields.reserve( member_count );
+    iss.seekg( cacheEntryIt->second.offset + 6 );
+
+    uint8_t subRows = *reinterpret_cast< uint8_t* >( &dataCpy[ cacheEntryIt->second.offset + 5 ] );
+
+    for( auto& member_entry : _exh->get_exh_members() )
+    {
+      // Seek to the position of the member to extract.
+      // 6 is because we have uint32_t/uint16_t at the start of each record
+      iss.seekg( cacheEntryIt->second.offset + 6 + member_entry.offset );
+
+      // Switch depending on the type to extract
+      switch( member_entry.type )
+      {
+        case DataType::string:
+          // Extract the offset to the actual string
+          // Seek to it then extract the actual string
+        {
+          auto string_offset = extract< uint32_t >( iss, "string_offset", false );
+          iss.seekg( cacheEntryIt->second.offset + 6 + _exh->get_header().data_offset + string_offset );
+          fields.emplace_back( utils::bparse::extract_cstring( iss, "string" ) );
+        }
+          break;
+
+        case DataType::boolean:
+          fields.emplace_back( extract< bool >( iss, "bool" ) );
+          break;
+
+        case DataType::int8:
+          fields.emplace_back( extract< int8_t >( iss, "int8_t" ) );
+          break;
+
+        case DataType::uint8:
+          fields.emplace_back( extract< uint8_t >( iss, "uint8_t" ) );
+          break;
+
+        case DataType::int16:
+          fields.emplace_back( extract< int16_t >( iss, "int16_t", false ) );
+          break;
+
+        case DataType::uint16:
+          fields.emplace_back( extract< uint16_t >( iss, "uint16_t", false ) );
+          break;
+
+        case DataType::int32:
+          fields.emplace_back( extract< int32_t >( iss, "int32_t", false ) );
+          break;
+
+        case DataType::uint32:
+          fields.emplace_back( extract< uint32_t >( iss, "uint32_t", false ) );
+          break;
+
+        case DataType::float32:
+          fields.emplace_back( extract< float >( iss, "float", false ) );
+          break;
+
+        case DataType::uint64:
+          fields.emplace_back( extract< uint64_t >( iss, "uint64_t", false ) );
+          break;
+
+        default:
+          auto type = static_cast< uint16_t >( member_entry.type );
+          if( type < 0x19 || type > 0x20 )
+            throw std::runtime_error( "Unknown DataType: " + std::to_string( type ) );
+          uint64_t val = extract< uint64_t >( iss, "bool" );
+          int32_t shift = type - 0x19;
+          int32_t i = 1 << shift;
+          val &= i;
+          fields.emplace_back( ( val & i ) == i );
+          break;
+      }
+    }
+    return fields;
+
+  }
+
+  // Get all rows
+  const std::map< uint32_t, std::vector< Field>>& Exd::get_rows()
+  {
+    // Iterates over all the files
+    const uint32_t member_count = _exh->get_members().size();
+    for( auto& file_ptr : _files )
+    {
+      // Get a stream
+      std::vector< char > dataCpy = file_ptr->get_data_sections().front();
+      std::istringstream iss( std::string( dataCpy.begin(), dataCpy.end() ) );
+
+      // Extract the header and skip to the record indices
+      auto exd_header = extract< ExdHeader >( iss );
+      iss.seekg( 0x20 );
+
+      // Preallocate and extract the record_indices
+      const uint32_t record_count = exd_header.index_size / sizeof( ExdRecordIndex );
+      std::vector< ExdRecordIndex > record_indices;
+      record_indices.reserve( record_count );
+      for( uint32_t i = 0; i < record_count; ++i )
+      {
+        record_indices.emplace_back( extract< ExdRecordIndex >( iss ) );
+      }
+
+      for( auto& record_index : record_indices )
+      {
+        // Get the vector fields for the given record and preallocate it
+        auto& fields = _data[ record_index.id ];
+        fields.reserve( member_count );
+
+        for( auto& member_entry : _exh->get_exh_members() )
+          //for( auto& member_entry : _exh->get_members() )
+        {
+          // Seek to the position of the member to extract.
+          // 6 is because we have uint32_t/uint16_t at the start of each record
+          iss.seekg( record_index.offset + 6 + member_entry.offset );
+
+          // Switch depending on the type to extract
+          switch( member_entry.type )
+          {
+            case DataType::string:
+              // Extract the offset to the actual string
+              // Seek to it then extract the actual string
+            {
+              auto string_offset = extract< uint32_t >( iss, "string_offset", false );
+              iss.seekg( record_index.offset + 6 + _exh->get_header().data_offset + string_offset );
+              fields.emplace_back( utils::bparse::extract_cstring( iss, "string" ) );
+            }
+              break;
+
+            case DataType::boolean:
+              fields.emplace_back( extract< bool >( iss, "bool" ) );
+              break;
+
+            case DataType::int8:
+              fields.emplace_back( extract< int8_t >( iss, "int8_t" ) );
+              break;
+
+            case DataType::uint8:
+              fields.emplace_back( extract< uint8_t >( iss, "uint8_t" ) );
+              break;
+
+            case DataType::int16:
+              fields.emplace_back( extract< int16_t >( iss, "int16_t", false ) );
+              break;
+
+            case DataType::uint16:
+              fields.emplace_back( extract< uint16_t >( iss, "uint16_t", false ) );
+              break;
+
+            case DataType::int32:
+              fields.emplace_back( extract< int32_t >( iss, "int32_t", false ) );
+              break;
+
+            case DataType::uint32:
+              fields.emplace_back( extract< uint32_t >( iss, "uint32_t", false ) );
+              break;
+
+            case DataType::float32:
+              fields.emplace_back( extract< float >( iss, "float", false ) );
+              break;
+
+            case DataType::uint64:
+              fields.emplace_back( extract< uint64_t >( iss, "uint64_t", false ) );
+              break;
+
+            default:
+              auto type = static_cast< uint16_t >( member_entry.type );
+              if( type < 0x19 || type > 0x20 )
+                throw std::runtime_error( "Unknown DataType: " + std::to_string( type ) );
+              uint64_t val = extract< uint64_t >( iss, "bool" );
+              int32_t shift = type - 0x19;
+              int32_t i = 1 << shift;
+              val &= i;
+              fields.emplace_back( ( val & i ) == i );
+              break;
+          }
+        }
+      }
+    }
+    return _data;
+  }
 
-      struct ExdHeader
-      {
-         char magic[0x4];
-         uint16_t unknown;
-         uint16_t unknown2;
-         uint32_t index_size;
-      };
-
-      struct ExdRecordIndex
-      {
-         uint32_t id;  
-         uint32_t offset;
-      };
-  
-   }
-}   
-
-namespace xiv
-{
-   namespace utils
-   {
-      namespace bparse
-      {
-         template <> inline void reorder<xiv::exd::ExdHeader>( xiv::exd::ExdHeader& i_struct ) { for( int32_t i = 0; i < 0x4; ++i ) { xiv::utils::bparse::reorder( i_struct.magic[i] ); }  i_struct.unknown = xiv::utils::bparse::byteswap( i_struct.unknown ); xiv::utils::bparse::reorder( i_struct.unknown );  i_struct.unknown2 = xiv::utils::bparse::byteswap( i_struct.unknown2 ); xiv::utils::bparse::reorder( i_struct.unknown2 );  i_struct.index_size = xiv::utils::bparse::byteswap( i_struct.index_size ); xiv::utils::bparse::reorder( i_struct.index_size ); }
-         template <> inline void reorder<xiv::exd::ExdRecordIndex>( xiv::exd::ExdRecordIndex& i_struct ) { i_struct.id = xiv::utils::bparse::byteswap( i_struct.id ); xiv::utils::bparse::reorder( i_struct.id );  i_struct.offset = xiv::utils::bparse::byteswap( i_struct.offset ); xiv::utils::bparse::reorder( i_struct.offset ); }
-      }
-   }
-};
-
-namespace xiv
-{
-   namespace exd
-   {
-
-      Exd::Exd( std::shared_ptr<Exh> i_exh, const std::vector<std::shared_ptr<dat::File>>& i_files )
-      {
-         _exh = i_exh;
-         _files = i_files;
-
-
-         // Iterates over all the files
-         const uint32_t member_count = _exh->get_members().size();
-         for ( auto &file_ptr : _files )
-         {
-            // Get a stream
-            std::vector< char > dataCpy = file_ptr->get_data_sections().front();
-            std::istringstream iss( std::string( dataCpy.begin(), dataCpy.end() ) );
-
-            // Extract the header and skip to the record indices
-            auto exd_header = extract< ExdHeader >( iss );
-            iss.seekg( 0x20 );
-
-            // Preallocate and extract the record_indices
-            const uint32_t record_count = exd_header.index_size / sizeof( ExdRecordIndex );
-            std::vector< ExdRecordIndex > record_indices;
-            record_indices.reserve( record_count );
-            for ( uint32_t i = 0; i < record_count; ++i )
-            {
-                auto recordIndex = extract< ExdRecordIndex >( iss );
-               _idCache[recordIndex.id] = ExdCacheEntry{file_ptr, recordIndex.offset};
-            }
-         }
-      }
-
-      Exd::~Exd()
-      {
-      }
-
-      const std::vector<Field> Exd::get_row( uint32_t id, uint32_t subRow )
-      {
-  
-         auto cacheEntryIt = _idCache.find( id );
-         if( cacheEntryIt == _idCache.end() )
-            throw std::runtime_error( "Id not found: " + std::to_string( id ) );
-  
-         // Iterates over all the files
-         const uint32_t member_count = _exh->get_members().size();
-         auto& file_ptr = cacheEntryIt->second.file;
-  
-         std::vector< char > dataCpy = file_ptr->get_data_sections().front();
-         std::istringstream iss( std::string( dataCpy.begin(), dataCpy.end() ) );
-  
-         // Get the vector fields for the given record and preallocate it
-         auto fields = _data[id];
-         fields.reserve( member_count );
-         iss.seekg( cacheEntryIt->second.offset + 6 );
-  
-         uint8_t subRows = *reinterpret_cast< uint8_t* >( &dataCpy[ cacheEntryIt->second.offset + 5 ] );
-
-         if( subRow >= subRows )
-           throw std::runtime_error( "Out of bounds sub-row!" );
-
-         int offset = cacheEntryIt->second.offset + 6 + ( subRow * _exh->get_header().data_offset + 2 * ( subRow + 1 ) );
-
-         for( auto& member_entry : _exh->get_exh_members() )
-         {
-            // Seek to the position of the member to extract.
-            // 6 is because we have uint32_t/uint16_t at the start of each record
-            iss.seekg( offset + member_entry.offset );
-  
-            // Switch depending on the type to extract
-            switch( member_entry.type )
-            {
-            case DataType::string:
-               // Extract the offset to the actual string
-               // Seek to it then extract the actual string
-            {
-               throw std::runtime_error( "String not implemented for variant 2!" );
-               //auto string_offset = extract<uint32_t>( iss, "string_offset", false );
-               //iss.seekg( cacheEntryIt->second.offset + 6 + _exh->get_header().data_offset + string_offset );
-               //fields.emplace_back( utils::bparse::extract_cstring( iss, "string" ) );
-            }
-            break;
-  
-            case DataType::boolean:
-               fields.emplace_back( extract<bool>( iss, "bool" ) );
-               break;
-  
-            case DataType::int8:
-               fields.emplace_back( extract<int8_t>( iss, "int8_t" ) );
-               break;
-
-            case DataType::uint8:
-               fields.emplace_back( extract<uint8_t>( iss, "uint8_t" ) );
-               break;
-
-            case DataType::int16:
-               fields.emplace_back( extract<int16_t>( iss, "int16_t", false ) );
-               break;
-
-            case DataType::uint16:
-               fields.emplace_back( extract<uint16_t>( iss, "uint16_t", false ) );
-               break;
-
-            case DataType::int32:
-               fields.emplace_back( extract<int32_t>( iss, "int32_t", false ) );
-               break;
-  
-            case DataType::uint32:
-               fields.emplace_back( extract<uint32_t>( iss, "uint32_t", false ) );
-               break;
-
-            case DataType::float32:
-               fields.emplace_back( extract<float>( iss, "float", false ) );
-               break;
-
-            case DataType::uint64:
-               fields.emplace_back( extract<uint64_t>( iss, "uint64_t", false ) );
-               break;
-
-            default:
-               auto type = static_cast< uint16_t >( member_entry.type );
-               if( type < 0x19 || type > 0x20 )
-                  throw std::runtime_error("Unknown DataType: " + std::to_string( type ));
-               uint64_t val = extract< uint64_t >( iss, "bool" );
-               int32_t shift = type - 0x19;
-               int32_t i = 1 << shift;
-               val &= i;
-               fields.emplace_back( ( val & i ) == i );
-               break;
-            }
-         }
-         return fields;
-
-      }
-
-
-      const std::vector<Field> Exd::get_row( uint32_t id )
-      {
-
-         auto cacheEntryIt = _idCache.find( id );
-         if( cacheEntryIt == _idCache.end() )
-            throw std::runtime_error( "Id not found: " + std::to_string( id ) );
-
-         // Iterates over all the files
-         const uint32_t member_count = _exh->get_members().size();
-         auto& file_ptr = cacheEntryIt->second.file;
-
-         std::vector< char > dataCpy = file_ptr->get_data_sections().front();
-         std::istringstream iss( std::string( dataCpy.begin(), dataCpy.end() ) );
-
-         // Get the vector fields for the given record and preallocate it
-         auto fields = _data[id];
-         fields.reserve( member_count );
-         iss.seekg( cacheEntryIt->second.offset + 6 );
-
-         uint8_t subRows = *reinterpret_cast< uint8_t* >( &dataCpy[ cacheEntryIt->second.offset + 5 ] );
-
-         for( auto& member_entry : _exh->get_exh_members() )
-         {
-            // Seek to the position of the member to extract.
-            // 6 is because we have uint32_t/uint16_t at the start of each record
-            iss.seekg( cacheEntryIt->second.offset + 6 + member_entry.offset );
-
-            // Switch depending on the type to extract
-            switch( member_entry.type )
-            {
-            case DataType::string:
-               // Extract the offset to the actual string
-               // Seek to it then extract the actual string
-            {
-               auto string_offset = extract<uint32_t>( iss, "string_offset", false );
-               iss.seekg( cacheEntryIt->second.offset + 6 + _exh->get_header().data_offset + string_offset );
-               fields.emplace_back( utils::bparse::extract_cstring( iss, "string" ) );
-            }
-            break;
-
-            case DataType::boolean:
-               fields.emplace_back( extract<bool>( iss, "bool" ) );
-               break;
-
-            case DataType::int8:
-               fields.emplace_back( extract<int8_t>( iss, "int8_t" ) );
-               break;
-
-            case DataType::uint8:
-               fields.emplace_back( extract<uint8_t>( iss, "uint8_t" ) );
-               break;
-
-            case DataType::int16:
-               fields.emplace_back( extract<int16_t>( iss, "int16_t", false ) );
-               break;
-
-            case DataType::uint16:
-               fields.emplace_back( extract<uint16_t>( iss, "uint16_t", false ) );
-               break;
-
-            case DataType::int32:
-               fields.emplace_back( extract<int32_t>( iss, "int32_t", false ) );
-               break;
-
-            case DataType::uint32:
-               fields.emplace_back( extract<uint32_t>( iss, "uint32_t", false ) );
-               break;
-
-            case DataType::float32:
-               fields.emplace_back( extract<float>( iss, "float", false ) );
-               break;
-
-            case DataType::uint64:
-               fields.emplace_back( extract<uint64_t>( iss, "uint64_t", false ) );
-               break;
-
-            default:
-               auto type = static_cast< uint16_t >( member_entry.type );
-               if( type < 0x19 || type > 0x20 )
-                  throw std::runtime_error("Unknown DataType: " + std::to_string( type ));
-               uint64_t val = extract< uint64_t >( iss, "bool" );
-               int32_t shift = type - 0x19;
-               int32_t i = 1 << shift;
-               val &= i;
-               fields.emplace_back( ( val & i ) == i );
-               break;
-            }
-         }
-         return fields;
-
-      }
-
-      // Get all rows
-      const std::map<uint32_t, std::vector<Field>>& Exd::get_rows()
-      {
-         // Iterates over all the files
-         const uint32_t member_count = _exh->get_members().size();
-         for( auto& file_ptr : _files )
-         {
-            // Get a stream
-            std::vector< char > dataCpy = file_ptr->get_data_sections().front();
-            std::istringstream iss( std::string( dataCpy.begin(), dataCpy.end() ) );
-
-            // Extract the header and skip to the record indices
-            auto exd_header = extract<ExdHeader>( iss );
-            iss.seekg( 0x20 );
-
-            // Preallocate and extract the record_indices
-            const uint32_t record_count = exd_header.index_size / sizeof( ExdRecordIndex );
-            std::vector<ExdRecordIndex> record_indices;
-            record_indices.reserve( record_count );
-            for( uint32_t i = 0; i < record_count; ++i )
-            {
-               record_indices.emplace_back( extract<ExdRecordIndex>( iss ) );
-            }
-
-            for( auto& record_index : record_indices )
-            {
-               // Get the vector fields for the given record and preallocate it
-               auto& fields = _data[record_index.id];
-               fields.reserve( member_count );
-
-               for( auto& member_entry : _exh->get_exh_members() )
-               //for( auto& member_entry : _exh->get_members() )
-               {
-                  // Seek to the position of the member to extract.
-                  // 6 is because we have uint32_t/uint16_t at the start of each record
-                  iss.seekg( record_index.offset + 6 + member_entry.offset );
-
-                  // Switch depending on the type to extract
-                  switch( member_entry.type )
-                  {
-                  case DataType::string:
-                     // Extract the offset to the actual string
-                     // Seek to it then extract the actual string
-                  {
-                     auto string_offset = extract<uint32_t>( iss, "string_offset", false );
-                     iss.seekg( record_index.offset + 6 + _exh->get_header().data_offset + string_offset );
-                     fields.emplace_back( utils::bparse::extract_cstring( iss, "string" ) );
-                  }
-                  break;
-
-                  case DataType::boolean:
-                     fields.emplace_back( extract<bool>( iss, "bool" ) );
-                     break;
-
-                  case DataType::int8:
-                     fields.emplace_back( extract<int8_t>( iss, "int8_t" ) );
-                     break;
-
-                  case DataType::uint8:
-                     fields.emplace_back( extract<uint8_t>( iss, "uint8_t" ) );
-                     break;
-
-                  case DataType::int16:
-                     fields.emplace_back( extract<int16_t>( iss, "int16_t", false ) );
-                     break;
-
-                  case DataType::uint16:
-                     fields.emplace_back( extract<uint16_t>( iss, "uint16_t", false ) );
-                     break;
-
-                  case DataType::int32:
-                     fields.emplace_back( extract<int32_t>( iss, "int32_t", false ) );
-                     break;
-
-                  case DataType::uint32:
-                     fields.emplace_back( extract<uint32_t>( iss, "uint32_t", false ) );
-                     break;
-
-                  case DataType::float32:
-                     fields.emplace_back( extract<float>( iss, "float", false ) );
-                     break;
-
-                  case DataType::uint64:
-                     fields.emplace_back( extract<uint64_t>( iss, "uint64_t", false ) );
-                     break;
-
-                  default:
-                     auto type = static_cast< uint16_t >( member_entry.type );
-                     if( type < 0x19 || type > 0x20 )
-                        throw std::runtime_error("Unknown DataType: " + std::to_string( type ));
-                     uint64_t val = extract< uint64_t >( iss, "bool" );
-                     int32_t shift = type - 0x19;
-                     int32_t i = 1 << shift;
-                     val &= i;
-                     fields.emplace_back( ( val & i ) == i );
-                     break;
-                  }
-               }
-            }
-         }
-         return _data;
-      }
-
-   }
 }
 
diff --git a/deps/datReader/Exd.h b/deps/datReader/Exd.h
index c504176b..a16c135b 100644
--- a/deps/datReader/Exd.h
+++ b/deps/datReader/Exd.h
@@ -8,15 +8,13 @@
 
 #include "File.h"
 
-namespace xiv
-{
-namespace exd
+namespace xiv::exd
 {
 
-class Exh;
+  class Exh;
 
-// Field type containing all the possible types in the data files
-using Field = std::variant<
+  // Field type containing all the possible types in the data files
+  using Field = std::variant<
     std::string,
     bool,
     int8_t,
@@ -27,40 +25,44 @@ using Field = std::variant<
     uint32_t,
     float,
     uint64_t >;
-  
-struct ExdCacheEntry
-{
-   std::shared_ptr<dat::File> file;
-   uint32_t offset;
-};
 
-// Data for a given language
-class Exd
-{
-public:
+  struct ExdCacheEntry
+  {
+    std::shared_ptr< dat::File > file;
+    uint32_t offset;
+  };
+
+  // Data for a given language
+  class Exd
+  {
+  public:
     // i_exh: the header
     // i_files: the multiple exd files
-    Exd() {}
-    Exd(std::shared_ptr<Exh> i_exh, const std::vector<std::shared_ptr<dat::File>>& i_files);
+    Exd()
+    {
+    }
+
+    Exd( std::shared_ptr< Exh > i_exh, const std::vector< std::shared_ptr< dat::File>>& i_files );
+
     ~Exd();
 
     // Get a row by its id
-    const std::vector<Field> get_row(uint32_t id);
+    const std::vector< Field > get_row( uint32_t id );
 
     // Get a row by its id and sub-row
-    const std::vector<Field> get_row(uint32_t id, uint32_t subRow);
+    const std::vector< Field > get_row( uint32_t id, uint32_t subRow );
+
     // Get all rows
-    const std::map<uint32_t, std::vector<Field>>& get_rows();
+    const std::map< uint32_t, std::vector< Field>>& get_rows();
 
-protected:
+  protected:
     // Data indexed by the ID of the row, the vector is field with the same order as exh.members
-    std::map<uint32_t, std::vector<Field>> _data;
-    std::vector<std::shared_ptr<dat::File>> _files;
-    std::shared_ptr<Exh> _exh;
+    std::map< uint32_t, std::vector< Field>> _data;
+    std::vector< std::shared_ptr< dat::File>> _files;
+    std::shared_ptr< Exh > _exh;
     std::map< uint32_t, ExdCacheEntry > _idCache;
-};
+  };
 
-}
 }
 
 #endif // XIV_EXD_EXD_H
diff --git a/deps/datReader/ExdCat.cpp b/deps/datReader/ExdCat.cpp
index ddab260e..ebf75ec7 100644
--- a/deps/datReader/ExdCat.cpp
+++ b/deps/datReader/ExdCat.cpp
@@ -9,74 +9,73 @@
 
 namespace
 {
-   // Suffix of the filenames given a language
-   std::map<xiv::exd::Language, std::string> language_map = 
-   {{xiv::exd::Language::none, ""},
-      {xiv::exd::Language::ja, "_ja"},
-      {xiv::exd::Language::en, "_en"},
-      {xiv::exd::Language::de, "_de"},
-      {xiv::exd::Language::fr, "_fr"},
-      {xiv::exd::Language::chs, "_chs"}};
+  // Suffix of the filenames given a language
+  std::map<xiv::exd::Language, std::string> language_map =
+  {
+    {xiv::exd::Language::none, ""},
+    {xiv::exd::Language::ja, "_ja"},
+    {xiv::exd::Language::en, "_en"},
+    {xiv::exd::Language::de, "_de"},
+    {xiv::exd::Language::fr, "_fr"},
+    {xiv::exd::Language::chs, "_chs"}
+  };
 }
 
-namespace xiv
+namespace xiv::exd
 {
-   namespace exd
-   {
+  Cat::Cat( dat::GameData& i_game_data, const std::string& i_name ) :
+    _name( i_name )
+  {
+    //XIV_INFO(xiv_exd_logger, "Initializing Cat with name: " << i_name);
+    // creates the header .exh
+    {
+      auto header_file = i_game_data.getFile( "exd/" + i_name + ".exh" );
+      _header = std::shared_ptr< Exh >( new Exh( *header_file ) );
 
-      Cat::Cat(dat::GameData& i_game_data, const std::string& i_name) :
-         _name(i_name)
+    }
+
+    for( auto language: _header->get_languages() )
+    {
+      // chs not yet in data files
+      if( language == Language::en || language == Language::none )
       {
-         //XIV_INFO(xiv_exd_logger, "Initializing Cat with name: " << i_name);
-         // creates the header .exh
-         {
-            auto header_file = i_game_data.getFile("exd/" + i_name + ".exh");
-            _header = std::shared_ptr< Exh >( new Exh( *header_file ) );
-
-         }
-
-         for(auto language: _header->get_languages())
-         {
-            // chs not yet in data files
-            if (language == Language::en || language == Language::none)
-            {
-               // Get all the files for a given category/language, in case of multiple range of IDs in separate files (like Quest)
-               std::vector<std::shared_ptr<dat::File>> files;
-               for(auto& exd_def: _header->get_exd_defs())
-               {
-                  files.emplace_back( i_game_data.getFile("exd/" + i_name + "_" + std::to_string(exd_def.start_id) + language_map.at(language) + ".exd") );
-               }
-               // Instantiate the data for this language
-               _data[language] = std::unique_ptr<Exd>(new Exd(_header, files));
-            }
-         }
+        // Get all the files for a given category/language, in case of multiple range of IDs in separate files (like Quest)
+        std::vector< std::shared_ptr< dat::File>> files;
+        for( auto& exd_def: _header->get_exd_defs() )
+        {
+          files.emplace_back( i_game_data.getFile(
+            "exd/" + i_name + "_" + std::to_string( exd_def.start_id ) + language_map.at( language ) + ".exd" ) );
+        }
+        // Instantiate the data for this language
+        _data[ language ] = std::make_unique< Exd >( _header, files );
       }
+    }
+  }
 
-      Cat::~Cat()
-      {
+  Cat::~Cat()
+  {
 
-      }
+  }
 
-      const std::string& Cat::get_name() const
-      {
-         return _name;
-      }
+  const std::string& Cat::get_name() const
+  {
+    return _name;
+  }
 
-      const Exh& Cat::get_header() const
-      {
-         return *_header;
-      }
+  const Exh& Cat::get_header() const
+  {
+    return *_header;
+  }
 
-      const Exd& Cat::get_data_ln(Language i_language) const
-      {
-         auto ln_it = _data.find(i_language);
-         if (ln_it == _data.end())
-         {
-            throw std::runtime_error("No data for language: " + std::to_string(uint16_t(i_language)));
-         }
+  const Exd& Cat::get_data_ln( Language i_language ) const
+  {
+    auto ln_it = _data.find( i_language );
+    if( ln_it == _data.end() )
+    {
+      throw std::runtime_error( "No data for language: " + std::to_string( uint16_t( i_language ) ) );
+    }
 
-         return *(ln_it->second);
-      }
+    return *( ln_it->second );
+  }
 
-   }
 }
diff --git a/deps/datReader/ExdData.cpp b/deps/datReader/ExdData.cpp
index 3c4af47a..5307f5de 100644
--- a/deps/datReader/ExdData.cpp
+++ b/deps/datReader/ExdData.cpp
@@ -7,50 +7,47 @@
 
 #include "ExdCat.h"
 
-namespace xiv
-{
-namespace exd
+namespace xiv::exd {
+
+ExdData::ExdData( dat::GameData& i_game_data ) try :
+  _game_data( i_game_data )
 {
+  //XIV_INFO(xiv_exd_logger, "Initializing ExdData");
 
-ExdData::ExdData(dat::GameData& i_game_data) try :
-    _game_data(i_game_data)
-{
-    //XIV_INFO(xiv_exd_logger, "Initializing ExdData");
+  // Fetch the root.exl and get a stream from it
+  auto root_exl = i_game_data.getFile( "exd/root.exl" );
+  std::vector< char > dataCpy = root_exl->get_data_sections().front();
+  xiv::utils::stream::vectorwrapbuf< char > databuf( dataCpy );
+  std::istream stream( &databuf );
 
-    // Fetch the root.exl and get a stream from it
-    auto root_exl = i_game_data.getFile("exd/root.exl");
-    std::vector< char > dataCpy = root_exl->get_data_sections().front();
-    xiv::utils::stream::vectorwrapbuf<char> databuf(dataCpy);
-    std::istream stream(&databuf);
+  // Iterates over the lines while skipping the first one
+  std::string line;
+  std::getline( stream, line ); // extract first line EXLT,2
+  std::getline( stream, line );
 
-    // Iterates over the lines while skipping the first one
-    std::string line;
-    std::getline(stream, line); // extract first line EXLT,2
-    std::getline(stream, line);
+  // Until the EOF
+  while( !line.empty() )
+  {
+    // Format is cat_name,XX
+    // XX being an internal identifier
+    // Get only the cat_name
+    auto sep = line.find( ',' );
+    auto category = line.substr( 0, sep );
 
-    // Until the EOF
-    while (!line.empty())
-    {
-        // Format is cat_name,XX 
-        // XX being an internal identifier
-        // Get only the cat_name
-        auto sep = line.find(',');
-        auto category = line.substr(0, sep);
+    // Add to the list of category name
+    // creates the empty category in the cats map
+    // instantiate the creation mutex for this category
+    _cat_names.push_back( category );
+    _cats[ category ] = std::unique_ptr< Cat >();
+    _cat_creation_mutexes[ category ] = std::make_unique< std::mutex >();
 
-        // Add to the list of category name
-        // creates the empty category in the cats map
-        // instantiate the creation mutex for this category
-        _cat_names.push_back(category);
-        _cats[category] = std::unique_ptr<Cat>();
-        _cat_creation_mutexes[category] = std::unique_ptr<std::mutex>(new std::mutex());
-
-        std::getline(stream, line);
-    }
+    std::getline( stream, line );
+  }
 }
-catch(std::exception& e)
+catch( std::exception& e )
 {
-    // In case of failure here, client is supposed to catch the exception because it is not recoverable on our side
-   throw std::runtime_error( "ExdData initialization failed: " + std::string( e.what() ) );
+  // In case of failure here, client is supposed to catch the exception because it is not recoverable on our side
+  throw std::runtime_error( "ExdData initialization failed: " + std::string( e.what() ) );
 }
 
 ExdData::~ExdData()
@@ -58,43 +55,42 @@ ExdData::~ExdData()
 
 }
 
-const std::vector<std::string>& ExdData::get_cat_names() const
+const std::vector< std::string >& ExdData::get_cat_names() const
 {
-    return _cat_names;
+  return _cat_names;
 }
 
-const Cat& ExdData::get_category(const std::string& i_cat_name)
+const Cat& ExdData::get_category( const std::string& i_cat_name )
 {
-    // Get the category from its name
-    auto cat_it = _cats.find(i_cat_name);
-    if (cat_it == _cats.end())
-    {
-        throw std::runtime_error("Category not found: " + i_cat_name);
-    }
+  // Get the category from its name
+  auto cat_it = _cats.find( i_cat_name );
+  if( cat_it == _cats.end() )
+  {
+    throw std::runtime_error( "Category not found: " + i_cat_name );
+  }
 
-    if (cat_it->second)
-    {
-        // If valid return it
-        return *(cat_it->second);
-    }
-    else
-    {
-        // If not, create it and return it
-        create_category(i_cat_name);
-        return *(_cats[i_cat_name]);
-    }
+  if( cat_it->second )
+  {
+    // If valid return it
+    return *( cat_it->second );
+  }
+  else
+  {
+    // If not, create it and return it
+    create_category( i_cat_name );
+    return *( _cats[ i_cat_name ] );
+  }
 }
 
-void ExdData::create_category(const std::string& i_cat_name)
+void ExdData::create_category( const std::string& i_cat_name )
 {
-    // Lock mutex in this scope
-    std::lock_guard<std::mutex> lock(*(_cat_creation_mutexes[i_cat_name]));
-    // Maybe after unlocking it has already been created, so check (most likely if it blocked)
-    if (!_cats[i_cat_name])
-    {
-        _cats[i_cat_name] = std::unique_ptr<Cat>(new Cat(_game_data, i_cat_name));
-    }
+  // Lock mutex in this scope
+  std::lock_guard< std::mutex > lock( *( _cat_creation_mutexes[ i_cat_name ] ) );
+  // Maybe after unlocking it has already been created, so check (most likely if it blocked)
+  if( !_cats[ i_cat_name ] )
+  {
+    _cats[ i_cat_name ] = std::make_unique< Cat >( _game_data, i_cat_name );
+  }
 }
 
 }
-}
diff --git a/deps/datReader/Exh.cpp b/deps/datReader/Exh.cpp
index 0a829bec..a8c300b8 100644
--- a/deps/datReader/Exh.cpp
+++ b/deps/datReader/Exh.cpp
@@ -7,71 +7,69 @@
 
 using xiv::utils::bparse::extract;
 
-namespace xiv
-{
-namespace exd
-{
-Exh::Exh(const dat::File& i_file)
+namespace xiv::exd
 {
+
+  Exh::Exh( const dat::File& i_file )
+  {
     // Get a stream from the file
     std::vector< char > dataCpy = i_file.get_data_sections().front();
     std::istringstream iss( std::string( dataCpy.begin(), dataCpy.end() ) );
 
     // Extract header and skip to member definitions
-    _header = extract<ExhHeader>(iss);
-    iss.seekg(0x20);
+    _header = extract< ExhHeader >( iss );
+    iss.seekg( 0x20 );
 
     // Extract all the members and feed the _members map
-    for (auto i = 0; i < _header.field_count; ++i)
+    for( auto i = 0; i < _header.field_count; ++i )
     {
-        auto member = extract<ExhMember>(iss);
-        _members[member.offset] = member;
-        _exh_defs.push_back( member );
+      auto member = extract< ExhMember >( iss );
+      _members[ member.offset ] = member;
+      _exh_defs.push_back( member );
     }
 
     // Extract all the exd_defs
-    _exd_defs.reserve(_header.exd_count);
-    for (auto i = 0; i < _header.exd_count; ++i)
+    _exd_defs.reserve( _header.exd_count );
+    for( auto i = 0; i < _header.exd_count; ++i )
     {
-        _exd_defs.emplace_back(extract<ExhExdDef>(iss));
+      _exd_defs.emplace_back( extract< ExhExdDef >( iss ) );
     }
 
     // Extract all the languages
-    _languages.reserve(_header.language_count);
-    for (auto i = 0; i < _header.language_count; ++i)
+    _languages.reserve( _header.language_count );
+    for( auto i = 0; i < _header.language_count; ++i )
     {
-        _languages.emplace_back(Language(extract<uint16_t>(iss, "language")));
+      _languages.emplace_back( Language( extract< uint16_t >( iss, "language" ) ) );
     }
-}
+  }
 
-Exh::~Exh()
-{
-}
+  Exh::~Exh()
+  {
+  }
 
-const ExhHeader& Exh::get_header() const
-{
+  const ExhHeader& Exh::get_header() const
+  {
     return _header;
-}
+  }
 
-const std::vector<ExhExdDef>& Exh::get_exd_defs() const
-{
+  const std::vector< ExhExdDef >& Exh::get_exd_defs() const
+  {
     return _exd_defs;
-}
+  }
 
-const std::vector<Language>& Exh::get_languages() const
-{
+  const std::vector< Language >& Exh::get_languages() const
+  {
     return _languages;
-}
+  }
 
-const std::map<uint32_t, ExhMember>& Exh::get_members() const
-{
+  const std::map< uint32_t, ExhMember >& Exh::get_members() const
+  {
     return _members;
-}
+  }
 
-const std::vector<ExhMember>& Exh::get_exh_members() const
-{
-   return _exh_defs;
-}
+  const std::vector< ExhMember >& Exh::get_exh_members() const
+  {
+    return _exh_defs;
+  }
 
 }
-}
diff --git a/deps/datReader/Exh.h b/deps/datReader/Exh.h
index be273185..37301d0b 100644
--- a/deps/datReader/Exh.h
+++ b/deps/datReader/Exh.h
@@ -5,99 +5,131 @@
 
 #include "bparse.h"
 
-namespace xiv
+namespace xiv::exd
 {
-   namespace exd
-   {
-      enum class DataType : uint16_t
-      {
-         string = 0,
-         boolean = 1,
-         int8 = 2,
-         uint8 = 3,
-         int16 = 4,
-         uint16 = 5,
-         int32 = 6,
-         uint32 = 7,
-         float32 = 9,
-         uint64 = 11,
-      }; 
+  enum class DataType :
+    uint16_t
+  {
+    string = 0,
+    boolean = 1,
+    int8 = 2,
+    uint8 = 3,
+    int16 = 4,
+    uint16 = 5,
+    int32 = 6,
+    uint32 = 7,
+    float32 = 9,
+    uint64 = 11,
+  };
 
-      struct ExhHeader
-      {
-         char magic[0x4];
-         uint16_t unknown;
-         uint16_t data_offset;
-         uint16_t field_count;
-         uint16_t exd_count;
-         uint16_t language_count;
-         uint16_t unknown1;
-         uint8_t u2;
-         uint8_t variant;
-      };
+  struct ExhHeader
+  {
+    char magic[0x4];
+    uint16_t unknown;
+    uint16_t data_offset;
+    uint16_t field_count;
+    uint16_t exd_count;
+    uint16_t language_count;
+    uint16_t unknown1;
+    uint8_t u2;
+    uint8_t variant;
+  };
 
-      struct ExhMember
-      {
-         DataType type;
-         uint16_t offset;
-      };
+  struct ExhMember
+  {
+    DataType type;
+    uint16_t offset;
+  };
 
-      struct ExhExdDef
-      {
-         uint32_t start_id;
-         uint32_t count_id;
-      };
-   }
+  struct ExhExdDef
+  {
+    uint32_t start_id;
+    uint32_t count_id;
+  };
+};
+
+namespace xiv::utils::bparse {
+template<>
+inline void reorder< xiv::exd::ExhHeader >( xiv::exd::ExhHeader& i_struct )
+{
+  for( int32_t i = 0; i < 0x4; ++i )
+  {
+    xiv::utils::bparse::reorder( i_struct.magic[ i ] );
+  }
+  i_struct.unknown = xiv::utils::bparse::byteswap( i_struct.unknown );
+  xiv::utils::bparse::reorder( i_struct.unknown );
+  i_struct.data_offset = xiv::utils::bparse::byteswap( i_struct.data_offset );
+  xiv::utils::bparse::reorder( i_struct.data_offset );
+  i_struct.field_count = xiv::utils::bparse::byteswap( i_struct.field_count );
+  xiv::utils::bparse::reorder( i_struct.field_count );
+  i_struct.exd_count = xiv::utils::bparse::byteswap( i_struct.exd_count );
+  xiv::utils::bparse::reorder( i_struct.exd_count );
+  i_struct.language_count = xiv::utils::bparse::byteswap( i_struct.language_count );
+  xiv::utils::bparse::reorder( i_struct.language_count );
+}
+
+template<>
+inline void reorder< xiv::exd::ExhMember >( xiv::exd::ExhMember& i_struct )
+{
+  i_struct.type = xiv::utils::bparse::byteswap( i_struct.type );
+  xiv::utils::bparse::reorder( i_struct.type );
+  i_struct.offset = xiv::utils::bparse::byteswap( i_struct.offset );
+  xiv::utils::bparse::reorder( i_struct.offset );
+}
+
+template<>
+inline void reorder< xiv::exd::ExhExdDef >( xiv::exd::ExhExdDef& i_struct )
+{
+  i_struct.start_id = xiv::utils::bparse::byteswap( i_struct.start_id );
+  xiv::utils::bparse::reorder( i_struct.start_id );
+  i_struct.count_id = xiv::utils::bparse::byteswap( i_struct.count_id );
+  xiv::utils::bparse::reorder( i_struct.count_id );
+}
 };
 
 namespace xiv
 {
-   namespace utils
-   {
-      namespace bparse
-      {
-         template <> inline void reorder<xiv::exd::ExhHeader>( xiv::exd::ExhHeader& i_struct ) { for( int32_t i = 0; i < 0x4; ++i ) { xiv::utils::bparse::reorder( i_struct.magic[i] ); }  i_struct.unknown = xiv::utils::bparse::byteswap( i_struct.unknown ); xiv::utils::bparse::reorder( i_struct.unknown );  i_struct.data_offset = xiv::utils::bparse::byteswap( i_struct.data_offset ); xiv::utils::bparse::reorder( i_struct.data_offset );  i_struct.field_count = xiv::utils::bparse::byteswap( i_struct.field_count ); xiv::utils::bparse::reorder( i_struct.field_count );  i_struct.exd_count = xiv::utils::bparse::byteswap( i_struct.exd_count ); xiv::utils::bparse::reorder( i_struct.exd_count );  i_struct.language_count = xiv::utils::bparse::byteswap( i_struct.language_count ); xiv::utils::bparse::reorder( i_struct.language_count ); }
-         template <> inline void reorder<xiv::exd::ExhMember>( xiv::exd::ExhMember& i_struct ) { i_struct.type = xiv::utils::bparse::byteswap( i_struct.type ); xiv::utils::bparse::reorder( i_struct.type );  i_struct.offset = xiv::utils::bparse::byteswap( i_struct.offset ); xiv::utils::bparse::reorder( i_struct.offset ); }
-         template <> inline void reorder<xiv::exd::ExhExdDef>( xiv::exd::ExhExdDef& i_struct ) { i_struct.start_id = xiv::utils::bparse::byteswap( i_struct.start_id ); xiv::utils::bparse::reorder( i_struct.start_id );  i_struct.count_id = xiv::utils::bparse::byteswap( i_struct.count_id ); xiv::utils::bparse::reorder( i_struct.count_id ); }
-      }
-   }
-};
 
-namespace xiv
-{
-   namespace dat
-   {
-      class File;
-   }
-   namespace exd
-   {
+  namespace dat
+  {
+    class File;
+  }
 
-      enum Language : uint16_t;
+  namespace exd
+  {
 
-      // Header file for exd data
-      class Exh
-      {
-      public:
-         // The header file
-         Exh( const dat::File& i_file );
-         ~Exh();
+    enum Language :
+      uint16_t;
 
-         const ExhHeader& get_header() const;
-         const std::vector<ExhExdDef>& get_exd_defs() const;
-         const std::vector<Language>& get_languages() const;
-         const std::map<uint32_t, ExhMember>& get_members() const;
-         const std::vector<ExhMember>& get_exh_members() const;
+    // Header file for exd data
+    class Exh
+    {
+    public:
+      // The header file
+      Exh( const dat::File& i_file );
 
-      protected:
-         ExhHeader _header;
-         // Members of the datastruct ordered(indexed) by offset
-         std::map<uint32_t, ExhMember> _members;
-         std::vector<ExhMember> _exh_defs;
-         std::vector<ExhExdDef> _exd_defs;
-         std::vector<Language> _languages;
-      };
+      ~Exh();
 
-   }
+      const ExhHeader& get_header() const;
+
+      const std::vector< ExhExdDef >& get_exd_defs() const;
+
+      const std::vector< Language >& get_languages() const;
+
+      const std::map< uint32_t, ExhMember >& get_members() const;
+
+      const std::vector< ExhMember >& get_exh_members() const;
+
+    protected:
+      ExhHeader _header;
+      // Members of the datastruct ordered(indexed) by offset
+      std::map< uint32_t, ExhMember > _members;
+      std::vector< ExhMember > _exh_defs;
+      std::vector< ExhExdDef > _exd_defs;
+      std::vector< Language > _languages;
+    };
+
+  }
 }
 
 #endif // XIV_EXD_EXH_H
diff --git a/deps/datReader/File.cpp b/deps/datReader/File.cpp
index c3413d5a..e83659c1 100644
--- a/deps/datReader/File.cpp
+++ b/deps/datReader/File.cpp
@@ -2,44 +2,41 @@
 
 #include <fstream>
 
-namespace xiv
-{
-namespace dat
+namespace xiv::dat
 {
 
-File::File() :
-    _type(FileType::empty)
-{
-}
+  File::File() :
+    _type( FileType::empty )
+  {
+  }
 
-File::~File()
-{
-}
+  File::~File()
+  {
+  }
 
-FileType File::get_type() const
-{
-   return _type;
-}
+  FileType File::get_type() const
+  {
+    return _type;
+  }
 
-const std::vector<std::vector<char>>& File::get_data_sections() const
-{
-   return _data_sections;
-}
+  const std::vector< std::vector< char>>& File::get_data_sections() const
+  {
+    return _data_sections;
+  }
 
-std::vector<std::vector<char>>& File::access_data_sections()
-{
-   return _data_sections;
-}
+  std::vector< std::vector< char>>& File::access_data_sections()
+  {
+    return _data_sections;
+  }
 
-void File::exportToFile(const std::filesystem::path& i_path) const
-{
-   std::ofstream ofs( i_path.string(), std::ios_base::binary | std::ios_base::out );
-   for( auto& data_section : _data_sections )
-   {
+  void File::exportToFile( const std::filesystem::path& i_path ) const
+  {
+    std::ofstream ofs( i_path.string(), std::ios_base::binary | std::ios_base::out );
+    for( auto& data_section : _data_sections )
+    {
       ofs.write( data_section.data(), data_section.size() );
-   }
-   ofs.close();
-}
+    }
+    ofs.close();
+  }
 
 }
-}
diff --git a/deps/datReader/File.h b/deps/datReader/File.h
index 3ce77b4f..31c12fbe 100644
--- a/deps/datReader/File.h
+++ b/deps/datReader/File.h
@@ -7,50 +7,42 @@
 #include <stdint.h>
 #include "bparse.h"
 
-
-namespace xiv 
+namespace xiv::dat
 {
-   namespace dat
-   {
-      enum class FileType : uint32_t
-      {
-         empty = 1, 
-         standard = 2, 
-         model = 3, 
-         texture = 4,
-      };
-   }
-};
+  enum class FileType :
+    uint32_t
+  {
+    empty = 1,
+    standard = 2,
+    model = 3,
+    texture = 4,
+  };
 
-namespace xiv
-{
-   namespace dat
-   {
+  class Dat;
 
-      class Dat;
+  // Basic file from the dats
+  class File
+  {
+    friend class Dat;
 
-      // Basic file from the dats
-      class File
-      {
-         friend class Dat;
-      public:
-         File();
-         ~File();
+  public:
+    File();
 
-         FileType get_type() const;
+    ~File();
 
-         // Getters functions for the data in the file
-         const std::vector<std::vector<char>>& get_data_sections() const;
-         std::vector<std::vector<char>>& access_data_sections();
+    FileType get_type() const;
 
-         void exportToFile( const std::filesystem::path& i_path ) const;
+    // Getters functions for the data in the file
+    const std::vector< std::vector< char>>& get_data_sections() const;
 
-      protected:
-         FileType _type;
-         std::vector<std::vector<char>> _data_sections;
-      };
+    std::vector< std::vector< char>>& access_data_sections();
 
-   }
+    void exportToFile( const std::filesystem::path& i_path ) const;
+
+  protected:
+    FileType _type;
+    std::vector< std::vector< char>> _data_sections;
+  };
 }
 
 #endif // XIV_DAT_FILE_H
diff --git a/deps/datReader/GameData.cpp b/deps/datReader/GameData.cpp
index e3f36b6b..f3e56537 100644
--- a/deps/datReader/GameData.cpp
+++ b/deps/datReader/GameData.cpp
@@ -11,312 +11,315 @@
 #include "DatCat.h"
 #include "File.h"
 
-namespace
-{
-    // Relation between category number and category name
-    // These names are taken straight from the exe, it helps resolve dispatching when getting files by path
+namespace {
+// Relation between category number and category name
+// These names are taken straight from the exe, it helps resolve dispatching when getting files by path
 
-    std::unordered_map< std::string, uint32_t > categoryNameToIdMap = 
-       {{"common",          0x00},
-        {"bgcommon",        0x01},
-        {"bg",              0x02},
-        {"cut",             0x03},
-        {"chara",           0x04},
-        {"shader",          0x05},
-        {"ui",              0x06},
-        {"sound",           0x07},
-        {"vfx",             0x08},
-        {"ui_script",       0x09},
-        {"exd",             0x0A},
-        {"game_script",     0x0B},
-        {"music",           0x0C}
-   };
+std::unordered_map< std::string, uint32_t > categoryNameToIdMap =
+  { { "common",      0x00 },
+    { "bgcommon",    0x01 },
+    { "bg",          0x02 },
+    { "cut",         0x03 },
+    { "chara",       0x04 },
+    { "shader",      0x05 },
+    { "ui",          0x06 },
+    { "sound",       0x07 },
+    { "vfx",         0x08 },
+    { "ui_script",   0x09 },
+    { "exd",         0x0A },
+    { "game_script", 0x0B },
+    { "music",       0x0C }
+  };
 
-    std::unordered_map< uint32_t, std::string > categoryIdToNameMap = 
-       {{0x00,              "common"},
-        {0x01,              "bgcommon"},
-        {0x02,              "bg"},
-        {0x03,              "cut"},
-        {0x04,              "chara"},
-        {0x05,              "shader"},
-        {0x06,              "ui"},
-        {0x07,              "sound"},
-        {0x08,              "vfx"},
-        {0x09,              "ui_script"},
-        {0x0A,              "exd"},
-        {0x0B,              "game_script"},
-        {0x0C,              "music"}};
+std::unordered_map< uint32_t, std::string > categoryIdToNameMap =
+  { { 0x00, "common" },
+    { 0x01, "bgcommon" },
+    { 0x02, "bg" },
+    { 0x03, "cut" },
+    { 0x04, "chara" },
+    { 0x05, "shader" },
+    { 0x06, "ui" },
+    { 0x07, "sound" },
+    { 0x08, "vfx" },
+    { 0x09, "ui_script" },
+    { 0x0A, "exd" },
+    { 0x0B, "game_script" },
+    { 0x0C, "music" } };
 }
 
-namespace xiv
-{
-namespace dat
+namespace xiv::dat
 {
+  GameData::GameData( const std::filesystem::path& path ) try :
+    m_path( path )
+  {
+    int maxExLevel = 0;
 
-GameData::GameData(const std::filesystem::path& path) try :
-    m_path(path)
-{
-   int maxExLevel = 0;
+    // msvc has retarded stdlib implementation
+  #ifdef _WIN32
+    static constexpr auto sep = "\\";
+  #else
+    static constexpr auto sep = std::filesystem::path::preferred_separator;
+  #endif
 
-   // msvc has retarded stdlib implementation
-#ifdef _WIN32
-  static constexpr auto sep = "\\";
-#else
-  static constexpr auto sep = std::filesystem::path::preferred_separator;
-#endif
-  
-   // Determine which expansions are available
-   while( std::filesystem::exists( std::filesystem::path( m_path.string() + sep + "ex" + std::to_string( maxExLevel + 1 ) + sep + "ex" + std::to_string( maxExLevel + 1 ) + ".ver" ) ) )
-   {
+    // Determine which expansions are available
+    while( std::filesystem::exists( std::filesystem::path(
+      m_path.string() + sep + "ex" + std::to_string( maxExLevel + 1 ) + sep + "ex" + std::to_string( maxExLevel + 1 ) +
+      ".ver" ) ) )
+    {
       maxExLevel++;
-   }
-   
+    }
 
-   // Iterate over the files in path
-   for( auto it = std::filesystem::directory_iterator( m_path.string() + "//ffxiv" ); it != std::filesystem::directory_iterator(); ++it )
-   {
+
+    // Iterate over the files in path
+    for( auto it = std::filesystem::directory_iterator( m_path.string() + "//ffxiv" );
+         it != std::filesystem::directory_iterator(); ++it )
+    {
       // Get the filename of the current element
       auto filename = it->path().filename().string();
 
       // If it contains ".win32.index" this is most likely a hit for a category
-      if( filename.find( ".win32.index" ) != std::string::npos &&  filename.find( ".win32.index2" ) == std::string::npos )
+      if( filename.find( ".win32.index" ) != std::string::npos && filename.find( ".win32.index2" ) == std::string::npos )
       {
-         // Format of indexes is XX0000.win32.index, so fetch the hex number for category number
-         std::istringstream iss( filename.substr( 0, 2 ) );
-         uint32_t cat_nb;
-         iss >> std::hex >> cat_nb;
+        // Format of indexes is XX0000.win32.index, so fetch the hex number for category number
+        std::istringstream iss( filename.substr( 0, 2 ) );
+        uint32_t cat_nb;
+        iss >> std::hex >> cat_nb;
 
 
-         // Add to the list of category number
-         // creates the empty category in the cats map
-         // instantiate the creation mutex for this category
-         m_catNums.push_back( cat_nb );
-         m_cats[cat_nb] = std::unique_ptr<Cat>();
-         m_catCreationMutexes[cat_nb] = std::unique_ptr<std::mutex>( new std::mutex() );
+        // Add to the list of category number
+        // creates the empty category in the cats map
+        // instantiate the creation mutex for this category
+        m_catNums.push_back( cat_nb );
+        m_cats[ cat_nb ] = std::unique_ptr< Cat >();
+        m_catCreationMutexes[ cat_nb ] = std::make_unique< std::mutex >();
 
-         // Check for expansion
-         for( int exNum = 1; exNum <= maxExLevel; exNum++ )
-         {
-            const std::string path = m_path.string() + sep + buildDatStr( "ex" + std::to_string( exNum ), cat_nb, exNum, 0, "win32", "index" );
+        // Check for expansion
+        for( int exNum = 1; exNum <= maxExLevel; exNum++ )
+        {
+          const std::string path =
+            m_path.string() + sep + buildDatStr( "ex" + std::to_string( exNum ), cat_nb, exNum, 0, "win32", "index" );
 
-            if( std::filesystem::exists( std::filesystem::path( path ) ) )
+          if( std::filesystem::exists( std::filesystem::path( path ) ) )
+          {
+
+            int chunkCount = 0;
+
+            for( int chunkTest = 0; chunkTest < 256; chunkTest++ )
             {
-
-               int chunkCount = 0;
-
-               for(int chunkTest = 0; chunkTest < 256; chunkTest++ )
-               {
-                  if( std::filesystem::exists( m_path.string() + sep + buildDatStr( "ex" + std::to_string( exNum ), cat_nb, exNum, chunkTest, "win32", "index" ) ) )
-                  {
-                     m_exCats[cat_nb].exNumToChunkMap[exNum].chunkToCatMap[chunkTest] = std::unique_ptr<Cat>();
-                     chunkCount++;
-                  }
-               }      
-
+              if( std::filesystem::exists( m_path.string() + sep +
+                                           buildDatStr( "ex" + std::to_string( exNum ), cat_nb, exNum, chunkTest, "win32",
+                                                        "index" ) ) )
+              {
+                m_exCats[ cat_nb ].exNumToChunkMap[ exNum ].chunkToCatMap[ chunkTest ] = std::unique_ptr< Cat >();
+                chunkCount++;
+              }
             }
-         }
+
+          }
+        }
       }
-   }
+    }
 
-}
-catch( std::exception& e )
-{
-   // In case of failure here, client is supposed to catch the exception because it is not recoverable on our side
-   throw std::runtime_error( "GameData initialization failed: " + std::string( e.what() ) );
-}
+  }
+  catch( std::exception& e )
+  {
+    // In case of failure here, client is supposed to catch the exception because it is not recoverable on our side
+    throw std::runtime_error( "GameData initialization failed: " + std::string( e.what() ) );
+  }
 
-GameData::~GameData()
-{
+  GameData::~GameData()
+  {
 
-}
+  }
 
-const std::string GameData::buildDatStr( const std::string folder, const int cat, const int exNum, const int chunk, const std::string platform, const std::string type )
-{
-   char dat[1024];
-   sprintf( dat, "%s/%02x%02x%02x.%s.%s", folder.c_str(), cat, exNum, chunk, platform.c_str(), type.c_str() );
-   return std::string( dat );
-}
+  const std::string GameData::buildDatStr( const std::string folder, const int cat, const int exNum, const int chunk,
+                                           const std::string platform, const std::string type )
+  {
+    char dat[1024];
+    sprintf( dat, "%s/%02x%02x%02x.%s.%s", folder.c_str(), cat, exNum, chunk, platform.c_str(), type.c_str() );
+    return std::string( dat );
+  }
 
-const std::vector<uint32_t>& GameData::getCatNumbers() const
-{
+  const std::vector< uint32_t >& GameData::getCatNumbers() const
+  {
     return m_catNums;
-}
+  }
 
-std::unique_ptr<File> GameData::getFile(const std::string& path)
-{
-   // Get the hashes, the category from the path then call the getFile of the category
-   uint32_t dirHash;
-   uint32_t filenameHash;
-   getHashes( path, dirHash, filenameHash );
+  std::unique_ptr< File > GameData::getFile( const std::string& path )
+  {
+    // Get the hashes, the category from the path then call the getFile of the category
+    uint32_t dirHash;
+    uint32_t filenameHash;
+    getHashes( path, dirHash, filenameHash );
 
-   return getCategoryFromPath( path ).getFile( dirHash, filenameHash );
-}
+    return getCategoryFromPath( path ).getFile( dirHash, filenameHash );
+  }
 
-bool GameData::doesFileExist(const std::string& path)
-{
-   uint32_t dirHash;
-   uint32_t filenameHash;
-   getHashes( path, dirHash, filenameHash );
+  bool GameData::doesFileExist( const std::string& path )
+  {
+    uint32_t dirHash;
+    uint32_t filenameHash;
+    getHashes( path, dirHash, filenameHash );
 
-   return getCategoryFromPath( path ).doesFileExist( dirHash, filenameHash );
-}
+    return getCategoryFromPath( path ).doesFileExist( dirHash, filenameHash );
+  }
 
-bool GameData::doesDirExist(const std::string& i_path)
-{
-   uint32_t dirHash;
-   uint32_t filenameHash;
-   getHashes( i_path, dirHash, filenameHash );
+  bool GameData::doesDirExist( const std::string& i_path )
+  {
+    uint32_t dirHash;
+    uint32_t filenameHash;
+    getHashes( i_path, dirHash, filenameHash );
 
-   return getCategoryFromPath( i_path ).doesDirExist( dirHash );
-}
+    return getCategoryFromPath( i_path ).doesDirExist( dirHash );
+  }
 
-const Cat& GameData::getCategory(uint32_t catNum)
-{
-   // Check that the category number exists
-   auto catIt = m_cats.find( catNum );
-   if( catIt == m_cats.end() )
-   {
+  const Cat& GameData::getCategory( uint32_t catNum )
+  {
+    // Check that the category number exists
+    auto catIt = m_cats.find( catNum );
+    if( catIt == m_cats.end() )
+    {
       throw std::runtime_error( "Category not found: " + std::to_string( catNum ) );
-   }
+    }
 
-   // If it exists and already instantiated return it
-   if( catIt->second )
-   {
+    // If it exists and already instantiated return it
+    if( catIt->second )
+    {
       return *( catIt->second );
-   }
-   else
-   {
+    }
+    else
+    {
       // Else create it and return it
       createCategory( catNum );
-      return *( m_cats[catNum] );
-   }
-}
+      return *( m_cats[ catNum ] );
+    }
+  }
 
-const Cat& GameData::getCategory(const std::string& catName)
-{
-   // Find the category number from the name
-   auto categoryNameToIdMapIt = ::categoryNameToIdMap.find( catName );
-   if( categoryNameToIdMapIt == ::categoryNameToIdMap.end() )
-   {
+  const Cat& GameData::getCategory( const std::string& catName )
+  {
+    // Find the category number from the name
+    auto categoryNameToIdMapIt = ::categoryNameToIdMap.find( catName );
+    if( categoryNameToIdMapIt == ::categoryNameToIdMap.end() )
+    {
       throw std::runtime_error( "Category not found: " + catName );
-   }
+    }
 
-   // From the category number return the category
-   return getCategory( categoryNameToIdMapIt->second );
-}
+    // From the category number return the category
+    return getCategory( categoryNameToIdMapIt->second );
+  }
 
-const Cat& GameData::getExCategory( const std::string& catName, uint32_t exNum, const std::string& path )
-{
-   // Find the category number from the name
-   auto categoryMapIt = ::categoryNameToIdMap.find( catName );
-   if( categoryMapIt == ::categoryNameToIdMap.end() )
-   {
+  const Cat& GameData::getExCategory( const std::string& catName, uint32_t exNum, const std::string& path )
+  {
+    // Find the category number from the name
+    auto categoryMapIt = ::categoryNameToIdMap.find( catName );
+    if( categoryMapIt == ::categoryNameToIdMap.end() )
+    {
       throw std::runtime_error( "Category not found: " + catName );
-   }
+    }
 
-   uint32_t dirHash;
-   uint32_t filenameHash;
-   getHashes( path, dirHash, filenameHash );
+    uint32_t dirHash;
+    uint32_t filenameHash;
+    getHashes( path, dirHash, filenameHash );
 
-   for( auto const& chunk : m_exCats[categoryMapIt->second].exNumToChunkMap[exNum].chunkToCatMap )
-   {
+    for( auto const& chunk : m_exCats[ categoryMapIt->second ].exNumToChunkMap[ exNum ].chunkToCatMap )
+    {
       if( !chunk.second )
-         createExCategory( categoryMapIt->second );
+        createExCategory( categoryMapIt->second );
 
       if( chunk.second->doesFileExist( dirHash, filenameHash ) )
       {
-         return *( chunk.second );
+        return *( chunk.second );
       }
-   }
+    }
 
-   throw std::runtime_error( "Chunk not found for path: " + path );
-}
+    throw std::runtime_error( "Chunk not found for path: " + path );
+  }
 
-const Cat& GameData::getCategoryFromPath(const std::string& path)
-{
-   // Find the first / in the string, paths are in the format CAT_NAME/..../.../../....
-   auto firstSlashPos = path.find( '/' );
-   if( firstSlashPos == std::string::npos )
-   {
+  const Cat& GameData::getCategoryFromPath( const std::string& path )
+  {
+    // Find the first / in the string, paths are in the format CAT_NAME/..../.../../....
+    auto firstSlashPos = path.find( '/' );
+    if( firstSlashPos == std::string::npos )
+    {
       throw std::runtime_error( "Path does not have a / char: " + path );
-   }
+    }
 
-   if( path.substr( firstSlashPos + 1, 2) == "ex" )
-   {
+    if( path.substr( firstSlashPos + 1, 2 ) == "ex" )
+    {
       return getExCategory( path.substr( 0, firstSlashPos ), std::stoi( path.substr( firstSlashPos + 3, 1 ) ), path );
-   }
-   else
-   {
+    }
+    else
+    {
       // From the sub string found beforethe first / get the category
       return getCategory( path.substr( 0, firstSlashPos ) );
-   }
-}
+    }
+  }
 
-void GameData::getHashes(const std::string& path, uint32_t& dirHash, uint32_t& filenameHash) const
-{
-   // Convert the path to lowercase before getting the hashes
-   std::string pathLower;
-   pathLower.resize( path.size() );
-   std::transform( path.begin(), path.end(), pathLower.begin(), ::tolower );
+  void GameData::getHashes( const std::string& path, uint32_t& dirHash, uint32_t& filenameHash ) const
+  {
+    // Convert the path to lowercase before getting the hashes
+    std::string pathLower;
+    pathLower.resize( path.size() );
+    std::transform( path.begin(), path.end(), pathLower.begin(), ::tolower );
 
-   // Find last / to separate dir from filename
-   auto lastSlashPos = pathLower.rfind( '/' );
-   if( lastSlashPos == std::string::npos )
-   {
+    // Find last / to separate dir from filename
+    auto lastSlashPos = pathLower.rfind( '/' );
+    if( lastSlashPos == std::string::npos )
+    {
       throw std::runtime_error( "Path does not have a / char: " + path );
-   }
+    }
 
-   std::string dirPart = pathLower.substr( 0, lastSlashPos );
-   std::string filenamePart = pathLower.substr( lastSlashPos + 1 );
+    std::string dirPart = pathLower.substr( 0, lastSlashPos );
+    std::string filenamePart = pathLower.substr( lastSlashPos + 1 );
 
-   // Get the crc32 values from zlib, to compensate the final XOR 0xFFFFFFFF that isnot done in the exe we just reXOR
-   dirHash = crc32( 0, reinterpret_cast<const uint8_t*>( dirPart.data() ), dirPart.size() ) ^ 0xFFFFFFFF;
-   filenameHash = crc32( 0, reinterpret_cast<const uint8_t*>( filenamePart.data() ), filenamePart.size() ) ^ 0xFFFFFFFF;
-}
+    // Get the crc32 values from zlib, to compensate the final XOR 0xFFFFFFFF that isnot done in the exe we just reXOR
+    dirHash = crc32( 0, reinterpret_cast<const uint8_t*>( dirPart.data() ), dirPart.size() ) ^ 0xFFFFFFFF;
+    filenameHash = crc32( 0, reinterpret_cast<const uint8_t*>( filenamePart.data() ), filenamePart.size() ) ^ 0xFFFFFFFF;
+  }
 
-void GameData::createCategory(uint32_t catNum)
-{
-   // Lock mutex in this scope
-   std::lock_guard<std::mutex> lock( *( m_catCreationMutexes[catNum] ) );
-   // Maybe after unlocking it has already been created, so check (most likely if it blocked)
-   if( !m_cats[catNum] )
-   {
+  void GameData::createCategory( uint32_t catNum )
+  {
+    // Lock mutex in this scope
+    std::lock_guard< std::mutex > lock( *( m_catCreationMutexes[ catNum ] ) );
+    // Maybe after unlocking it has already been created, so check (most likely if it blocked)
+    if( !m_cats[ catNum ] )
+    {
       // Get the category name if we have it
       std::string catName;
       auto categoryMapIt = ::categoryIdToNameMap.find( catNum );
       if( categoryMapIt != ::categoryIdToNameMap.end() )
       {
-         catName = categoryMapIt->second;
+        catName = categoryMapIt->second;
       }
 
       // Actually creates the category
-      m_cats[catNum] = std::unique_ptr<Cat>( new Cat( m_path, catNum, catName ) );
-   }
-}
+      m_cats[ catNum ] = std::make_unique< Cat >( m_path, catNum, catName );
+    }
+  }
 
-void GameData::createExCategory( uint32_t catNum )
-{
-   // Maybe after unlocking it has already been created, so check (most likely if it blocked)
-   if( !m_exCats[catNum].exNumToChunkMap[1].chunkToCatMap[0] )
-   {
+  void GameData::createExCategory( uint32_t catNum )
+  {
+    // Maybe after unlocking it has already been created, so check (most likely if it blocked)
+    if( !m_exCats[ catNum ].exNumToChunkMap[ 1 ].chunkToCatMap[ 0 ] )
+    {
       // Get the category name if we have it
       std::string catName;
       auto categoryMapIt = ::categoryIdToNameMap.find( catNum );
       if( categoryMapIt != ::categoryIdToNameMap.end() )
       {
-         catName = categoryMapIt->second;
+        catName = categoryMapIt->second;
       }
 
-      for( auto const& ex : m_exCats[catNum].exNumToChunkMap )
+      for( auto const& ex : m_exCats[ catNum ].exNumToChunkMap )
       {
-         for( auto const& chunk : m_exCats[catNum].exNumToChunkMap[ex.first].chunkToCatMap )
-         {
-            // Actually creates the category
-            m_exCats[catNum].exNumToChunkMap[ex.first].chunkToCatMap[chunk.first] = std::unique_ptr<Cat>( new Cat( m_path, catNum, catName, ex.first, chunk.first ) );
-         }
+        for( auto const& chunk : m_exCats[ catNum ].exNumToChunkMap[ ex.first ].chunkToCatMap )
+        {
+          // Actually creates the category
+          m_exCats[ catNum ].exNumToChunkMap[ ex.first ].chunkToCatMap[ chunk.first ] = std::unique_ptr< Cat >(
+            new Cat( m_path, catNum, catName, ex.first, chunk.first ) );
+        }
       }
-   }
-}
+    }
+  }
 
 }
-}
diff --git a/deps/datReader/GameData.h b/deps/datReader/GameData.h
index d44c9ac8..53b7f021 100644
--- a/deps/datReader/GameData.h
+++ b/deps/datReader/GameData.h
@@ -7,78 +7,86 @@
 
 #include <filesystem>
 
-namespace xiv
-{
-namespace dat
+namespace xiv::dat
 {
 
-class Cat;
-class File;
+  class Cat;
 
-// Interface to all the datfiles - Main entry point
-// All the paths to files/dirs inside the dats are case-insensitive
-class GameData
-{
-public:
-   // This should be the path in which the .index/.datX files are located
-   GameData( const std::filesystem::path& path );
-   ~GameData();
+  class File;
 
-   static const std::string buildDatStr( const std::string folder, const int cat, const int exNum, const int chunk, const std::string platform, const std::string type );
+  // Interface to all the datfiles - Main entry point
+  // All the paths to files/dirs inside the dats are case-insensitive
+  class GameData
+  {
+  public:
+    // This should be the path in which the .index/.datX files are located
+    GameData( const std::filesystem::path& path );
 
-   // Returns all the scanned category number available in the path
-   const std::vector<uint32_t>& getCatNumbers() const;
+    ~GameData();
 
-   // Return a specific category by its number (see getCatNumbers() for loops)
-   const Cat& getCategory( uint32_t catNum );
-   // Return a specific category by it's name (e.g.: "exd"/"game_script"/ etc...)
-   const Cat& getCategory( const std::string& catName );
+    static const std::string
+    buildDatStr( const std::string folder, const int cat, const int exNum, const int chunk, const std::string platform,
+                 const std::string type );
 
-   const Cat& getExCategory( const std::string& catName, uint32_t exNum, const std::string& path );
+    // Returns all the scanned category number available in the path
+    const std::vector< uint32_t >& getCatNumbers() const;
 
-   // Retrieve a file from the dats given its filename
-   std::unique_ptr<File> getFile( const std::string& path );
+    // Return a specific category by its number (see getCatNumbers() for loops)
+    const Cat& getCategory( uint32_t catNum );
 
-   // Checks that a file exists
-   bool doesFileExist( const std::string& path );
+    // Return a specific category by it's name (e.g.: "exd"/"game_script"/ etc...)
+    const Cat& getCategory( const std::string& catName );
 
-   // Checks that a dir exists, there must be a trailing / in the path
-   // Note that it won't work for dirs that don't contain any file
-   // e.g.:  - "ui/icon/" will return False
-   //        - "ui/icon/000000/" will return True
-   bool doesDirExist( const std::string& path );
+    const Cat& getExCategory( const std::string& catName, uint32_t exNum, const std::string& path );
 
-protected:
-   // Return a specific category given a path (calls const Cat& getCategory(const std::string& catName))
-   const Cat& getCategoryFromPath( const std::string& path );
+    // Retrieve a file from the dats given its filename
+    std::unique_ptr< File > getFile( const std::string& path );
 
-   // From a full path, returns the dirHash and the filenameHash
-   void getHashes( const std::string& path, uint32_t& dirHash, uint32_t& filenameHash ) const;
+    // Checks that a file exists
+    bool doesFileExist( const std::string& path );
 
-   // Lazy instantiation of category
-   void createCategory( uint32_t catNum );
+    // Checks that a dir exists, there must be a trailing / in the path
+    // Note that it won't work for dirs that don't contain any file
+    // e.g.:  - "ui/icon/" will return False
+    //        - "ui/icon/000000/" will return True
+    bool doesDirExist( const std::string& path );
 
-   void createExCategory( uint32_t catNum );
+  protected:
+    // Return a specific category given a path (calls const Cat& getCategory(const std::string& catName))
+    const Cat& getCategoryFromPath( const std::string& path );
 
-   // Path given to constructor, pointing to the folder with the .index/.datX files
-   const std::filesystem::path m_path;
+    // From a full path, returns the dirHash and the filenameHash
+    void getHashes( const std::string& path, uint32_t& dirHash, uint32_t& filenameHash ) const;
 
-   // Stored categories, indexed by their number, categories are instantiated and parsed individually when they are needed
-   std::unordered_map<uint32_t, std::unique_ptr<Cat>> m_cats;
+    // Lazy instantiation of category
+    void createCategory( uint32_t catNum );
 
-   // List of all the categories numbers, is equal to m_cats.keys()
-   std::vector<uint32_t> m_catNums;
+    void createExCategory( uint32_t catNum );
 
-   // Map of all EX categories and their chunks, "CatNum - (ExNum - (ChunkNum - Cat))"
-   // Map of all EX categories and their chunks, "CatNum - (ExNum - (ChunkNum - Cat))"
-   using ChunkToCatMap = struct { std::unordered_map< uint32_t, std::unique_ptr< Cat > > chunkToCatMap; };
-   using ExNumToChunkMap = struct { std::unordered_map< uint32_t, ChunkToCatMap > exNumToChunkMap; };
-   using CatNumToExNumMap = std::unordered_map< uint32_t, ExNumToChunkMap >;
-   CatNumToExNumMap m_exCats;
-   std::unordered_map<uint32_t, std::unique_ptr<std::mutex>> m_catCreationMutexes;
-};
+    // Path given to constructor, pointing to the folder with the .index/.datX files
+    const std::filesystem::path m_path;
+
+    // Stored categories, indexed by their number, categories are instantiated and parsed individually when they are needed
+    std::unordered_map< uint32_t, std::unique_ptr< Cat>> m_cats;
+
+    // List of all the categories numbers, is equal to m_cats.keys()
+    std::vector< uint32_t > m_catNums;
+
+    // Map of all EX categories and their chunks, "CatNum - (ExNum - (ChunkNum - Cat))"
+    // Map of all EX categories and their chunks, "CatNum - (ExNum - (ChunkNum - Cat))"
+    using ChunkToCatMap = struct
+    {
+      std::unordered_map< uint32_t, std::unique_ptr< Cat > > chunkToCatMap;
+    };
+    using ExNumToChunkMap = struct
+    {
+      std::unordered_map< uint32_t, ChunkToCatMap > exNumToChunkMap;
+    };
+    using CatNumToExNumMap = std::unordered_map< uint32_t, ExNumToChunkMap >;
+    CatNumToExNumMap m_exCats;
+    std::unordered_map< uint32_t, std::unique_ptr< std::mutex>> m_catCreationMutexes;
+  };
 
-}
 }
 
 #endif // XIV_DAT_GAMEDATA_H
diff --git a/deps/datReader/Index.cpp b/deps/datReader/Index.cpp
index 3ff7d365..d46b20c6 100644
--- a/deps/datReader/Index.cpp
+++ b/deps/datReader/Index.cpp
@@ -2,166 +2,154 @@
 
 #include "bparse.h"
 
-namespace xiv 
+namespace xiv::dat
 {
-namespace dat 
-{
-   struct IndexBlockRecord
-   {
-      uint32_t offset;
-      uint32_t size;
-      SqPackBlockHash blockHash;
-   };
+  struct IndexBlockRecord
+  {
+    uint32_t offset;
+    uint32_t size;
+    SqPackBlockHash blockHash;
+  };
 
-   struct IndexHashTableEntry
-   {
-      uint32_t filenameHash;
-      uint32_t dirHash;
-      uint32_t datOffset;
-      uint32_t padding;
-   };
-}
+  struct IndexHashTableEntry
+  {
+    uint32_t filenameHash;
+    uint32_t dirHash;
+    uint32_t datOffset;
+    uint32_t padding;
+  };
 }
 
-namespace xiv 
+namespace xiv::utils::bparse
 {
-namespace utils
-{
-namespace bparse
-{
-   template <>
-   inline void reorder<xiv::dat::IndexBlockRecord>(xiv::dat::IndexBlockRecord& i_struct)
-   {
-      xiv::utils::bparse::reorder(i_struct.offset);
-      xiv::utils::bparse::reorder(i_struct.size);
-      xiv::utils::bparse::reorder(i_struct.blockHash);
-   }
+  template<>
+  inline void reorder< xiv::dat::IndexBlockRecord >( xiv::dat::IndexBlockRecord& i_struct )
+  {
+    xiv::utils::bparse::reorder( i_struct.offset );
+    xiv::utils::bparse::reorder( i_struct.size );
+    xiv::utils::bparse::reorder( i_struct.blockHash );
+  }
 
-   template <>
-   inline void reorder<xiv::dat::IndexHashTableEntry>(xiv::dat::IndexHashTableEntry& i_struct)
-   {
-      xiv::utils::bparse::reorder(i_struct.filenameHash);
-      xiv::utils::bparse::reorder(i_struct.dirHash);
-      xiv::utils::bparse::reorder(i_struct.datOffset);
-      xiv::utils::bparse::reorder(i_struct.padding);
-   }
+  template<>
+  inline void reorder< xiv::dat::IndexHashTableEntry >( xiv::dat::IndexHashTableEntry& i_struct )
+  {
+    xiv::utils::bparse::reorder( i_struct.filenameHash );
+    xiv::utils::bparse::reorder( i_struct.dirHash );
+    xiv::utils::bparse::reorder( i_struct.datOffset );
+    xiv::utils::bparse::reorder( i_struct.padding );
+  }
 }
-}
-};
 
 using xiv::utils::bparse::extract;
 
-namespace xiv
-{
-namespace dat
+namespace xiv::dat
 {
 
-Index::Index(const std::filesystem::path& path) :
-   SqPack( path )
-{
-   if( !m_handle )
+  Index::Index( const std::filesystem::path& path ) :
+    SqPack( path )
+  {
+    if( !m_handle )
       throw new std::runtime_error( "Failed to load Index at " + path.string() );
 
-   // Hash Table record
-   auto hashTableBlockRecord = extract<IndexBlockRecord>( m_handle );
-   isIndexBlockValid( hashTableBlockRecord );
+    // Hash Table record
+    auto hashTableBlockRecord = extract< IndexBlockRecord >( m_handle );
+    isIndexBlockValid( hashTableBlockRecord );
 
-   // Save the posin the stream to go back to it later on
-   auto pos = m_handle.tellg();
+    // Save the posin the stream to go back to it later on
+    auto pos = m_handle.tellg();
 
-   // Seek to the pos of the hash table in the file
-   m_handle.seekg( hashTableBlockRecord.offset );
+    // Seek to the pos of the hash table in the file
+    m_handle.seekg( hashTableBlockRecord.offset );
 
-   // Preallocate and extract the index_hash_table_entries
-   std::vector<IndexHashTableEntry> indexHashTableEntries;
-   extract<IndexHashTableEntry>( m_handle, hashTableBlockRecord.size / sizeof( IndexHashTableEntry ),
-                                 indexHashTableEntries );
+    // Preallocate and extract the index_hash_table_entries
+    std::vector< IndexHashTableEntry > indexHashTableEntries;
+    extract< IndexHashTableEntry >( m_handle, hashTableBlockRecord.size / sizeof( IndexHashTableEntry ),
+                                    indexHashTableEntries );
 
-   // Feed the correct entry in the HashTable for each index_hash_table_entry
-   for( auto& indexHashTableEntry : indexHashTableEntries )
-   {
-      auto& hashTableEntry = m_hashTable[indexHashTableEntry.dirHash][indexHashTableEntry.filenameHash];
+    // Feed the correct entry in the HashTable for each index_hash_table_entry
+    for( auto& indexHashTableEntry : indexHashTableEntries )
+    {
+      auto& hashTableEntry = m_hashTable[ indexHashTableEntry.dirHash ][ indexHashTableEntry.filenameHash ];
       // The dat number is found in the offset, last four bits
       hashTableEntry.datNum = ( indexHashTableEntry.datOffset & 0xF ) / 0x2;
       // The offset in the dat file, needs to strip the dat number indicator
       hashTableEntry.datOffset = ( indexHashTableEntry.datOffset - ( indexHashTableEntry.datOffset & 0x000F ) ) * 0x08;
       hashTableEntry.dirHash = indexHashTableEntry.dirHash;
       hashTableEntry.filenameHash = indexHashTableEntry.filenameHash;
-   }
+    }
 
-   // Come back to where we were before reading the HashTable
-   m_handle.seekg( pos );
+    // Come back to where we were before reading the HashTable
+    m_handle.seekg( pos );
 
-   // Dat Count
-   m_datCount = extract<uint32_t>( m_handle, "dat_count" );
+    // Dat Count
+    m_datCount = extract< uint32_t >( m_handle, "dat_count" );
 
-   // Free List
-   isIndexBlockValid( extract<IndexBlockRecord>( m_handle ) );
+    // Free List
+    isIndexBlockValid( extract< IndexBlockRecord >( m_handle ) );
 
-   // Dir Hash Table
-   isIndexBlockValid( extract<IndexBlockRecord>( m_handle ) );
-}
+    // Dir Hash Table
+    isIndexBlockValid( extract< IndexBlockRecord >( m_handle ) );
+  }
 
-Index::~Index()
-{
-}
+  Index::~Index()
+  {
+  }
 
-uint32_t Index::getDatCount() const
-{
-   return m_datCount;
-}
+  uint32_t Index::getDatCount() const
+  {
+    return m_datCount;
+  }
 
-const Index::HashTable& Index::getHashTable() const
-{
-   return m_hashTable;
-}
+  const Index::HashTable& Index::getHashTable() const
+  {
+    return m_hashTable;
+  }
 
-bool Index::doesFileExist( uint32_t dir_hash, uint32_t filename_hash ) const
-{
-   auto dir_it = getHashTable().find( dir_hash );
-   if( dir_it != getHashTable().end() )
-   {
+  bool Index::doesFileExist( uint32_t dir_hash, uint32_t filename_hash ) const
+  {
+    auto dir_it = getHashTable().find( dir_hash );
+    if( dir_it != getHashTable().end() )
+    {
       return ( dir_it->second.find( filename_hash ) != dir_it->second.end() );
-   }
-   return false;
-}
+    }
+    return false;
+  }
 
-bool Index::doesDirExist( uint32_t dir_hash ) const
-{
-   return ( getHashTable().find( dir_hash ) != getHashTable().end() );
-}
+  bool Index::doesDirExist( uint32_t dir_hash ) const
+  {
+    return ( getHashTable().find( dir_hash ) != getHashTable().end() );
+  }
 
-const Index::DirHashTable& Index::getDirHashTable( uint32_t dir_hash ) const
-{
-   auto dir_it = getHashTable().find( dir_hash );
-   if( dir_it == getHashTable().end() )
-   {
+  const Index::DirHashTable& Index::getDirHashTable( uint32_t dir_hash ) const
+  {
+    auto dir_it = getHashTable().find( dir_hash );
+    if( dir_it == getHashTable().end() )
+    {
       throw std::runtime_error( "dirHash not found" );
-   }
-   else
-   {
+    }
+    else
+    {
       return dir_it->second;
-   }
-}
+    }
+  }
 
-const Index::HashTableEntry& Index::getHashTableEntry( uint32_t dir_hash, uint32_t filename_hash ) const
-{
-   auto& dirHashTable = getDirHashTable( dir_hash );
-   auto file_it = dirHashTable.find( filename_hash );
-   if( file_it == dirHashTable.end() )
-   {
+  const Index::HashTableEntry& Index::getHashTableEntry( uint32_t dir_hash, uint32_t filename_hash ) const
+  {
+    auto& dirHashTable = getDirHashTable( dir_hash );
+    auto file_it = dirHashTable.find( filename_hash );
+    if( file_it == dirHashTable.end() )
+    {
       throw std::runtime_error( "filenameHash not found" );
-   }
-   else
-   {
+    }
+    else
+    {
       return file_it->second;
-   }
-}
+    }
+  }
 
-void Index::isIndexBlockValid( const IndexBlockRecord& i_index_block_record )
-{
-   isBlockValid( i_index_block_record.offset, i_index_block_record.size, i_index_block_record.blockHash );
-}
+  void Index::isIndexBlockValid( const IndexBlockRecord& i_index_block_record )
+  {
+    isBlockValid( i_index_block_record.offset, i_index_block_record.size, i_index_block_record.blockHash );
+  }
 
 }
-}
diff --git a/deps/datReader/Index.h b/deps/datReader/Index.h
index b7999ad5..d98b96a6 100644
--- a/deps/datReader/Index.h
+++ b/deps/datReader/Index.h
@@ -7,53 +7,57 @@
 
 #include <filesystem>
 
-namespace xiv {
-namespace dat {
-
-struct IndexBlockRecord;
-
-class Index : public SqPack
+namespace xiv::dat
 {
-public:
-   // Full path to the index file
-   Index( const std::filesystem::path& i_path );
-   virtual ~Index();
 
-   // An entry in the hash table, representing a file in a given dat
-   struct HashTableEntry
-   {
+  struct IndexBlockRecord;
+
+  class Index :
+    public SqPack
+  {
+  public:
+    // Full path to the index file
+    Index( const std::filesystem::path& i_path );
+
+    virtual ~Index();
+
+    // An entry in the hash table, representing a file in a given dat
+    struct HashTableEntry
+    {
       uint32_t datNum;
       uint32_t dirHash;
       uint32_t filenameHash;
       uint32_t datOffset;
-   };
+    };
 
-   // HashTable has dir hashes -> filename hashes -> HashTableEntry
-   using DirHashTable = std::unordered_map< uint32_t, HashTableEntry >;
-   using HashTable = std::unordered_map< uint32_t, DirHashTable >;
+    // HashTable has dir hashes -> filename hashes -> HashTableEntry
+    using DirHashTable = std::unordered_map< uint32_t, HashTableEntry >;
+    using HashTable = std::unordered_map< uint32_t, DirHashTable >;
 
-   // Get the number of dat files the index is linked to
-   uint32_t getDatCount() const;
+    // Get the number of dat files the index is linked to
+    uint32_t getDatCount() const;
 
-   bool doesFileExist( uint32_t dir_hash, uint32_t filename_hash ) const;
-   bool doesDirExist( uint32_t dir_hash ) const;
+    bool doesFileExist( uint32_t dir_hash, uint32_t filename_hash ) const;
 
-   // Returns the whole HashTable
-   const HashTable& getHashTable() const;
-   // Returns the hash table for a specific dir
-   const DirHashTable& getDirHashTable( uint32_t dir_hash ) const;
-   // Returns the HashTableEntry for a given file given its hashes
-   const HashTableEntry& getHashTableEntry( uint32_t dir_hash, uint32_t filename_hash ) const;
+    bool doesDirExist( uint32_t dir_hash ) const;
 
-protected:
-   // Checks that the block is valid with regards to its hash
-   void isIndexBlockValid( const IndexBlockRecord& i_index_block_record );
+    // Returns the whole HashTable
+    const HashTable& getHashTable() const;
 
-   uint32_t m_datCount;
-   HashTable m_hashTable;
-};
+    // Returns the hash table for a specific dir
+    const DirHashTable& getDirHashTable( uint32_t dir_hash ) const;
+
+    // Returns the HashTableEntry for a given file given its hashes
+    const HashTableEntry& getHashTableEntry( uint32_t dir_hash, uint32_t filename_hash ) const;
+
+  protected:
+    // Checks that the block is valid with regards to its hash
+    void isIndexBlockValid( const IndexBlockRecord& i_index_block_record );
+
+    uint32_t m_datCount;
+    HashTable m_hashTable;
+  };
     
-}
 }
 
 #endif // XIV_DAT_INDEX_H
diff --git a/deps/datReader/SqPack.cpp b/deps/datReader/SqPack.cpp
index 4885cdf1..fb8c244a 100644
--- a/deps/datReader/SqPack.cpp
+++ b/deps/datReader/SqPack.cpp
@@ -54,12 +54,12 @@ using xiv::utils::bparse::extract;
 namespace xiv::dat
 {
 
-   // Open the file
-   SqPack::SqPack( const std::filesystem::path& path ) :
-      m_handle( path.string(), std::ios_base::in | std::ios_base::binary )
-   {
-      // Extract the header
-      extract<SqPackHeader>( m_handle );
+  // Open the file
+  SqPack::SqPack( const std::filesystem::path& path ) :
+    m_handle( path.string(), std::ios_base::in | std::ios_base::binary )
+  {
+    // Extract the header
+    extract< SqPackHeader >( m_handle );
 
     // Skip until the IndexHeader the extract it
     m_handle.seekg( 0x400 );
diff --git a/deps/datReader/SqPack.h b/deps/datReader/SqPack.h
index 5fcb1c36..4c6e34c4 100644
--- a/deps/datReader/SqPack.h
+++ b/deps/datReader/SqPack.h
@@ -8,59 +8,51 @@
 #include "bparse.h"
 
 
-namespace xiv 
+namespace xiv::dat
 {
-   namespace dat 
-   {
-
-      struct SqPackBlockHash 
-      {
-         uint8_t hash[0x14];
-         uint32_t padding[0xB];
-      };
-
-   }
+  struct SqPackBlockHash
+  {
+    uint8_t hash[0x14];
+    uint32_t padding[0xB];
+  };
 }
-namespace xiv {
-   namespace utils {
-      namespace bparse {
-         template <> inline void reorder<xiv::dat::SqPackBlockHash>( xiv::dat::SqPackBlockHash& i_struct )
-         {
-            for( auto i = 0; i < 0x14; ++i )
-            {
-               xiv::utils::bparse::reorder( i_struct.hash[i] );
-            }   
-            for( auto i = 0; i < 0xB; ++i )
-            {
-               xiv::utils::bparse::reorder( i_struct.padding[i] );
-            }
-         }
-      }
-   }
+
+namespace xiv::utils::bparse
+{
+  template<>
+  inline void reorder< xiv::dat::SqPackBlockHash >( xiv::dat::SqPackBlockHash& i_struct )
+  {
+    for( auto i = 0; i < 0x14; ++i )
+    {
+      xiv::utils::bparse::reorder( i_struct.hash[ i ] );
+    }
+    for( auto i = 0; i < 0xB; ++i )
+    {
+      xiv::utils::bparse::reorder( i_struct.padding[ i ] );
+    }
+  }
 };
 
-namespace xiv
-{
-namespace dat
+namespace xiv::dat
 {
 
-class SqPack
-{
+  class SqPack
+  {
 
-public:
-   // Full path to the sqpack file
-   SqPack( const std::filesystem::path& i_path );
-   virtual ~SqPack();
+  public:
+    // Full path to the sqpack file
+    SqPack( const std::filesystem::path& i_path );
 
-protected:
-   // Checks that a given block is valid iven its hash
-   void isBlockValid( uint32_t i_offset, uint32_t i_size, const SqPackBlockHash& i_block_hash );
+    virtual ~SqPack();
 
-   // File handle
-   std::ifstream m_handle;
-   };
+  protected:
+    // Checks that a given block is valid iven its hash
+    void isBlockValid( uint32_t i_offset, uint32_t i_size, const SqPackBlockHash& i_block_hash );
+
+    // File handle
+    std::ifstream m_handle;
+  };
 
-}
 }
 
 #endif // XIV_DAT_SQPACK_H
diff --git a/deps/datReader/bparse.h b/deps/datReader/bparse.h
index f26d2faa..e3fd13f6 100644
--- a/deps/datReader/bparse.h
+++ b/deps/datReader/bparse.h
@@ -6,98 +6,96 @@
 #include <sstream>
 #include <vector>
 
-namespace xiv
-{
-namespace utils
-{
-namespace bparse
+namespace xiv::utils::bparse
 {
 
-// Internal macro for byteswapping
-template <int N>
-void byteswap_impl(char (&bytes)[N])
-{
-   for( auto p = std::begin( bytes ), end = std::end( bytes ) - 1; p < end; ++p, --end )
-   {
+  // Internal macro for byteswapping
+  template< int N >
+  void byteswap_impl( char (& bytes)[N] )
+  {
+    for( auto p = std::begin( bytes ), end = std::end( bytes ) - 1; p < end; ++p, --end )
+    {
       std::swap( *p, *end );
-   }
-}
+    }
+  }
 
-// byteswapping any type (no pointers to array)
-template <typename T>
-T byteswap(T value)
-{
-    byteswap_impl(*reinterpret_cast<char (*)[sizeof(T)]>(&value));
+  // byteswapping any type (no pointers to array)
+  template< typename T >
+  T byteswap( T value )
+  {
+    byteswap_impl( *reinterpret_cast<char ( * )[sizeof( T )]>(&value) );
     return value;
-}
+  }
 
-// Read a struct from a stream
-template <typename StructType>
-void read(std::istream& i_stream, StructType& i_struct)
-{
-   static_assert( std::is_pod<StructType>::value, "StructType must be a POD to be able to use read." );
-   i_stream.read( reinterpret_cast<char*>( &i_struct ), sizeof( StructType ) );
-}
+  // Read a struct from a stream
+  template< typename StructType >
+  void read( std::istream& i_stream, StructType& i_struct )
+  {
+    static_assert( std::is_pod< StructType >::value, "StructType must be a POD to be able to use read." );
+    i_stream.read( reinterpret_cast<char*>( &i_struct ), sizeof( StructType ) );
+  }
 
-// By default a type does not need reordering
-template <typename StructType> void reorder(StructType& i_struct) {}
+  // By default a type does not need reordering
+  template< typename StructType >
+  void reorder( StructType& i_struct )
+  {
+  }
 
-// "Overload" for passed struct as arg
-template <typename StructType>
-void extract(std::istream& i_stream, StructType& o_struct)
-{
-   read( i_stream, o_struct );
-   reorder( o_struct );
-}
+  // "Overload" for passed struct as arg
+  template< typename StructType >
+  void extract( std::istream& i_stream, StructType& o_struct )
+  {
+    read( i_stream, o_struct );
+    reorder( o_struct );
+  }
 
-// This should not copy because of RVO
-// Extract a struct from a stream and log it
-template <typename StructType>
-StructType extract( std::istream& i_stream )
-{
-   StructType temp_struct;
-   extract<StructType>( i_stream, temp_struct );
-   return temp_struct;
-}
+  // This should not copy because of RVO
+  // Extract a struct from a stream and log it
+  template< typename StructType >
+  StructType extract( std::istream& i_stream )
+  {
+    StructType temp_struct;
+    extract< StructType >( i_stream, temp_struct );
+    return temp_struct;
+  }
 
-template <typename StructType>
-void extract(std::istream& i_stream, uint32_t i_size, std::vector<StructType>& o_structs )
-{
-   o_structs.reserve( i_size );
-   for( uint32_t i = 0; i < i_size; ++i )
-   {
-      o_structs.emplace_back( extract<StructType>( i_stream ) );
-   }
-}
+  template< typename StructType >
+  void extract( std::istream& i_stream, uint32_t i_size, std::vector< StructType >& o_structs )
+  {
+    o_structs.reserve( i_size );
+    for( uint32_t i = 0; i < i_size; ++i )
+    {
+      o_structs.emplace_back( extract< StructType >( i_stream ) );
+    }
+  }
 
-// For simple (integral) types just provide name and endianness directly
-template <typename StructType>
-StructType extract(std::istream& i_stream, const std::string& i_name, bool i_is_le = true)
-{
-   StructType temp_struct;
-   read( i_stream, temp_struct );
-   if( !i_is_le )
-   {
+  // For simple (integral) types just provide name and endianness directly
+  template< typename StructType >
+  StructType extract( std::istream& i_stream, const std::string& i_name, bool i_is_le = true )
+  {
+    StructType temp_struct;
+    read( i_stream, temp_struct );
+    if( !i_is_le )
+    {
       temp_struct = byteswap( temp_struct );
-   }
-   return temp_struct;
-}
+    }
+    return temp_struct;
+  }
 
-template <typename StructType>
-void extract(std::istream& i_stream, const std::string& i_name, uint32_t i_size, std::vector<StructType>& o_structs, bool i_is_le = true)
-{
-   o_structs.reserve( i_size );
-   for( uint32_t i = 0; i < i_size; ++i )
-   {
-      o_structs.emplace_back( extract<StructType>( i_stream, i_name ) );
-   }
-}
+  template< typename StructType >
+  void extract( std::istream& i_stream, const std::string& i_name, uint32_t i_size, std::vector< StructType >& o_structs,
+                bool i_is_le = true )
+  {
+    o_structs.reserve( i_size );
+    for( uint32_t i = 0; i < i_size; ++i )
+    {
+      o_structs.emplace_back( extract< StructType >( i_stream, i_name ) );
+    }
+  }
 
-// For cstrings
-std::string extract_cstring( std::istream& i_stream, const std::string& i_name );
+  // For cstrings
+  std::string extract_cstring( std::istream& i_stream, const std::string& i_name );
 
-}
-}
 }
 
 #endif // XIV_UTILS_BPARSE_H
diff --git a/deps/datReader/conv.cpp b/deps/datReader/conv.cpp
index 40b94080..b591045b 100644
--- a/deps/datReader/conv.cpp
+++ b/deps/datReader/conv.cpp
@@ -1,8 +1,8 @@
 #include "conv.h"
 
-namespace xiv {
-namespace utils {
-namespace conv {
+namespace xiv::utils::conv
+{
+
   float half2float( const uint16_t i_value )
   {
     uint32_t t1;
@@ -30,6 +30,4 @@ namespace conv {
   }
 
 }
-}
-}
 
diff --git a/deps/datReader/conv.h b/deps/datReader/conv.h
index c0a4529b..b8f3326f 100644
--- a/deps/datReader/conv.h
+++ b/deps/datReader/conv.h
@@ -5,13 +5,11 @@
 #include <vector>
 #include <ostream>
 
-namespace xiv {
-namespace utils {
-namespace conv {
+namespace xiv::utils::conv
+{
   float half2float( const uint16_t i_value );
+
   float ubyte2float( const uint8_t i_value );
 }
-}
-}
 
 #endif // XIV_UTILS_CONV_H
diff --git a/deps/datReader/crc32.cpp b/deps/datReader/crc32.cpp
index 7b9490d9..c861cebc 100644
--- a/deps/datReader/crc32.cpp
+++ b/deps/datReader/crc32.cpp
@@ -65,116 +65,111 @@ namespace internal
     }
 }
 
-namespace xiv
-{
-namespace utils
-{
-namespace crc32
+namespace xiv::utils::crc32
 {
 
-uint32_t compute(const std::string& i_input, uint32_t init_crc)
-{
+  uint32_t compute( const std::string& i_input, uint32_t init_crc )
+  {
     // Classical crc stuff
-	auto& crc_table = internal::get_crc_table();
+    auto& crc_table = internal::get_crc_table();
     auto crc = init_crc;
-    for(std::size_t i = 0; i < i_input.size(); ++i)
+    for( std::size_t i = 0; i < i_input.size(); ++i )
     {
-        crc = crc_table[(crc ^ i_input[i]) & 0xFF] ^ (crc >> 8);
+      crc = crc_table[ ( crc ^ i_input[ i ] ) & 0xFF ] ^ ( crc >> 8 );
     }
     return crc;
-}
+  }
 
-uint32_t rev_compute(const std::string& i_input, uint32_t init_crc)
-{
-	auto& rev_crc_table = internal::get_rev_crc_table();
+  uint32_t rev_compute( const std::string& i_input, uint32_t init_crc )
+  {
+    auto& rev_crc_table = internal::get_rev_crc_table();
     auto crc = init_crc;
     const auto input_size = i_input.size();
     // Reverse crc
-    for(auto i = input_size; i > 0; --i)
+    for( auto i = input_size; i > 0; --i )
     {
-       crc = rev_crc_table[crc >> 24] ^ ((crc << 8) & 0xFFFFFF00) ^ i_input[input_size - i - 1];
+      crc = rev_crc_table[ crc >> 24 ] ^ ( ( crc << 8 ) & 0xFFFFFF00 ) ^ i_input[ input_size - i - 1 ];
     }
     // Compute the 4 bytes needed for this init_crc
-    for (auto i = 0; i < 4; ++i)
+    for( auto i = 0; i < 4; ++i )
     {
-        crc = rev_crc_table[crc >> 24] ^ ((crc << 8) & 0xFFFFFF00);
+      crc = rev_crc_table[ crc >> 24 ] ^ ( ( crc << 8 ) & 0xFFFFFF00 );
     }
     return crc;
-}
+  }
 
-void generate_hashes_1(std::string& i_format, const uint32_t i_first_index, std::vector<uint32_t>& o_hashes)
-{
-	char* str = const_cast<char*>(i_format.data());
-	const uint32_t str_size = i_format.size();
+  void generate_hashes_1( std::string& i_format, const uint32_t i_first_index, std::vector< uint32_t >& o_hashes )
+  {
+    char* str = const_cast<char*>(i_format.data());
+    const uint32_t str_size = i_format.size();
 
-	o_hashes.resize(10000);
+    o_hashes.resize( 10000 );
 
-	uint32_t i = 0;
-	for (char a = '0'; a <= '9'; ++a)
-	{
-		str[i_first_index] = a;
-		for (char b = '0'; b <= '9'; ++b)
-		{
-			str[i_first_index + 1] = b;
-			for (char c = '0'; c <= '9'; ++c)
-			{
-				str[i_first_index + 2] = c;
-				for (char d = '0'; d <= '9'; ++d)
-				{
-					str[i_first_index + 3] = d;
-					o_hashes[i] = ::crc32(0, reinterpret_cast<uint8_t*>(&(str[0])), str_size) ^ 0xFFFFFFFF;
-					++i;
-				}
-			}
-		}
-	}
-}
+    uint32_t i = 0;
+    for( char a = '0'; a <= '9'; ++a )
+    {
+      str[ i_first_index ] = a;
+      for( char b = '0'; b <= '9'; ++b )
+      {
+        str[ i_first_index + 1 ] = b;
+        for( char c = '0'; c <= '9'; ++c )
+        {
+          str[ i_first_index + 2 ] = c;
+          for( char d = '0'; d <= '9'; ++d )
+          {
+            str[ i_first_index + 3 ] = d;
+            o_hashes[ i ] = ::crc32( 0, reinterpret_cast<uint8_t*>(&( str[ 0 ] )), str_size ) ^ 0xFFFFFFFF;
+            ++i;
+          }
+        }
+      }
+    }
+  }
 
-void generate_hashes_2(std::string& i_format, const uint32_t i_first_index, const uint32_t i_second_index, std::vector<uint32_t>& o_hashes)
-{
-	char* str = const_cast<char*>(i_format.data());
-	const uint32_t str_size = i_format.size();
+  void generate_hashes_2( std::string& i_format, const uint32_t i_first_index, const uint32_t i_second_index,
+                          std::vector< uint32_t >& o_hashes )
+  {
+    char* str = const_cast<char*>(i_format.data());
+    const uint32_t str_size = i_format.size();
 
-	o_hashes.resize(100000000);
+    o_hashes.resize( 100000000 );
 
-	uint32_t i = 0;
-	for (char a = '0'; a <= '9'; ++a)
-	{
-		str[i_first_index] = a;
-		for (char b = '0'; b <= '9'; ++b)
-		{
-			str[i_first_index + 1] = b;
-			for (char c = '0'; c <= '9'; ++c)
-			{
-				str[i_first_index + 2] = c;
-				for (char d = '0'; d <= '9'; ++d)
-				{
-					str[i_first_index + 3] = d;
-					for (char e = '0'; e <= '9'; ++e)
-					{
-						str[i_second_index] = e;
-						for (char f = '0'; f <= '9'; ++f)
-						{
-							str[i_second_index + 1] = f;
-							for (char g = '0'; g <= '9'; ++g)
-							{
-								str[i_second_index + 2] = g;
-								for (char h = '0'; h <= '9'; ++h)
-								{
-									str[i_second_index + 3] = h;
-									o_hashes[i] = ::crc32(0, reinterpret_cast<uint8_t*>(&(str[0])), str_size) ^ 0xFFFFFFFF;
-									++i;
-								}
-							}
-						}
-					}
-				}
-			}
-		}
-	}
-}
+    uint32_t i = 0;
+    for( char a = '0'; a <= '9'; ++a )
+    {
+      str[ i_first_index ] = a;
+      for( char b = '0'; b <= '9'; ++b )
+      {
+        str[ i_first_index + 1 ] = b;
+        for( char c = '0'; c <= '9'; ++c )
+        {
+          str[ i_first_index + 2 ] = c;
+          for( char d = '0'; d <= '9'; ++d )
+          {
+            str[ i_first_index + 3 ] = d;
+            for( char e = '0'; e <= '9'; ++e )
+            {
+              str[ i_second_index ] = e;
+              for( char f = '0'; f <= '9'; ++f )
+              {
+                str[ i_second_index + 1 ] = f;
+                for( char g = '0'; g <= '9'; ++g )
+                {
+                  str[ i_second_index + 2 ] = g;
+                  for( char h = '0'; h <= '9'; ++h )
+                  {
+                    str[ i_second_index + 3 ] = h;
+                    o_hashes[ i ] = ::crc32( 0, reinterpret_cast<uint8_t*>(&( str[ 0 ] )), str_size ) ^ 0xFFFFFFFF;
+                    ++i;
+                  }
+                }
+              }
+            }
+          }
+        }
+      }
+    }
+  }
 
 
 }
-}
-}
diff --git a/deps/datReader/crc32.h b/deps/datReader/crc32.h
index e8c59286..7d4894b7 100644
--- a/deps/datReader/crc32.h
+++ b/deps/datReader/crc32.h
@@ -5,9 +5,8 @@
 #include <vector>
 #include <string>
 
-namespace xiv {
-namespace utils {
-namespace crc32 {
+namespace xiv::utils::crc32
+{
 
   // Normal crc32 computation from a given intial crc value, use zlib.crc32 instead, the final XOR 0xFFFFFFFF is not done
   uint32_t compute( const std::string& i_input, uint32_t init_crc = 0xFFFFFFFF );
@@ -17,10 +16,10 @@ namespace crc32 {
   uint32_t rev_compute( const std::string& i_input, uint32_t init_crc = 0 );
 
   void generate_hashes_1( std::string& i_format, const uint32_t i_first_index, std::vector< uint32_t >& o_hashes );
-  void generate_hashes_2( std::string& i_format, const uint32_t i_first_index, const uint32_t i_second_index, std::vector< uint32_t >& o_hashes );
 
-}
-}
+  void generate_hashes_2( std::string& i_format, const uint32_t i_first_index, const uint32_t i_second_index,
+                          std::vector< uint32_t >& o_hashes );
+
 }
 
 #endif // XIV_UTILS_CRC32_H
diff --git a/deps/datReader/stream.cpp b/deps/datReader/stream.cpp
index 0a38fbfc..b9019a6a 100644
--- a/deps/datReader/stream.cpp
+++ b/deps/datReader/stream.cpp
@@ -4,13 +4,7 @@
 #include <sstream>
 #include <streambuf>
 
-namespace xiv
-{
-namespace utils
-{
-namespace stream
+namespace xiv::utils::stream
 {
 
 }
-}    
-}
diff --git a/deps/datReader/stream.h b/deps/datReader/stream.h
index c0b98074..37b9f28e 100644
--- a/deps/datReader/stream.h
+++ b/deps/datReader/stream.h
@@ -5,23 +5,17 @@
 #include <iostream>
 #include <vector>
 
-namespace xiv
+namespace xiv::utils::stream
 {
-namespace utils
-{
-namespace stream
-{
-template<typename CharT, typename TraitsT = std::char_traits<CharT> >
-class vectorwrapbuf : public std::basic_streambuf<CharT, TraitsT> 
-{
-public:
-    vectorwrapbuf(std::vector<CharT> &vec) 
+  template< typename CharT, typename TraitsT = std::char_traits< CharT > >
+  class vectorwrapbuf :
+    public std::basic_streambuf< CharT, TraitsT >
+  {
+  public:
+    vectorwrapbuf( std::vector< CharT >& vec )
     {
-        this->setg(vec.data(), vec.data(), vec.data() + vec.size());
+      this->setg( vec.data(), vec.data(), vec.data() + vec.size() );
     }
-};
+  };
 }
-}    
-}
-
 #endif // XIV_UTILS_STREAM_H
diff --git a/deps/datReader/zlib.cpp b/deps/datReader/zlib.cpp
index 9f75d929..29396b99 100644
--- a/deps/datReader/zlib.cpp
+++ b/deps/datReader/zlib.cpp
@@ -4,32 +4,28 @@
 #include <zlib/zlib.h>
 #include <vector>
 
-namespace xiv
-{
-namespace utils
-{
-namespace zlib
+namespace xiv::utils::zlib
 {
 
-void compress(const std::vector<char>& in, std::vector<char>& out)
-{
+  void compress( const std::vector< char >& in, std::vector< char >& out )
+  {
     // Fetching upper bound for out size
-    auto out_size = compressBound(in.size());
-    out.resize(out_size);
+    auto out_size = compressBound( in.size() );
+    out.resize( out_size );
 
-    auto ret = compress2(reinterpret_cast<uint8_t*>(out.data()), &out_size,
-                          reinterpret_cast<const uint8_t*>(in.data()), in.size(), Z_BEST_COMPRESSION);
+    auto ret = compress2( reinterpret_cast<uint8_t*>(out.data()), &out_size,
+                          reinterpret_cast<const uint8_t*>(in.data()), in.size(), Z_BEST_COMPRESSION );
 
-    if (ret != Z_OK)
+    if( ret != Z_OK )
     {
-        throw std::runtime_error("Error at zlib uncompress: " + std::to_string(ret));
+      throw std::runtime_error( "Error at zlib uncompress: " + std::to_string( ret ) );
     }
 
-    out.resize(out_size);
-}
+    out.resize( out_size );
+  }
 
-void no_header_decompress(uint8_t* in, uint32_t in_size, uint8_t* out, uint32_t out_size)
-{
+  void no_header_decompress( uint8_t* in, uint32_t in_size, uint8_t* out, uint32_t out_size )
+  {
     z_stream strm;
     strm.zalloc = Z_NULL;
     strm.zfree = Z_NULL;
@@ -38,10 +34,10 @@ void no_header_decompress(uint8_t* in, uint32_t in_size, uint8_t* out, uint32_t
     strm.next_in = Z_NULL;
 
     // Init with -15 because we do not have header in this compressed data
-    auto ret = inflateInit2(&strm, -15);
-    if (ret != Z_OK)
+    auto ret = inflateInit2( &strm, -15 );
+    if( ret != Z_OK )
     {
-        throw std::runtime_error("Error at zlib init: " + std::to_string(ret));
+      throw std::runtime_error( "Error at zlib init: " + std::to_string( ret ) );
     }
 
     // Set pointers to the right addresses
@@ -50,16 +46,14 @@ void no_header_decompress(uint8_t* in, uint32_t in_size, uint8_t* out, uint32_t
     strm.next_out = out;
 
     // Effectively decompress data
-    ret = inflate(&strm, Z_NO_FLUSH);
-    if (ret != Z_STREAM_END)
+    ret = inflate( &strm, Z_NO_FLUSH );
+    if( ret != Z_STREAM_END )
     {
-        throw std::runtime_error("Error at zlib inflate: " + std::to_string(ret));
+      throw std::runtime_error( "Error at zlib inflate: " + std::to_string( ret ) );
     }
 
     // Clean up
-    inflateEnd(&strm);
-}
+    inflateEnd( &strm );
+  }
 
 }
-}
-}
diff --git a/deps/datReader/zlib.h b/deps/datReader/zlib.h
index 942efaf9..7c93a5a3 100644
--- a/deps/datReader/zlib.h
+++ b/deps/datReader/zlib.h
@@ -4,18 +4,13 @@
 #include <cstdint>
 #include <vector>
 
-namespace xiv
-{
-namespace utils
-{
-namespace zlib
+namespace xiv::utils::zlib
 {
 
-void compress(const std::vector<char>& in, std::vector<char>& out);
-void no_header_decompress(uint8_t* in, uint32_t in_size, uint8_t* out, uint32_t out_size);
+  void compress( const std::vector< char >& in, std::vector< char >& out );
+
+  void no_header_decompress( uint8_t* in, uint32_t in_size, uint8_t* out, uint32_t out_size );
 
-}
-}
 }
 
 #endif // XIV_UTILS_ZLIB_H

From 1a186dba25fe47c62f2a6d2dd82a79384323850b Mon Sep 17 00:00:00 2001
From: collett <collett0301@gmail.com>
Date: Thu, 13 Feb 2020 01:35:24 +0900
Subject: [PATCH 246/351] Missing casting flag clear after mount action.

---
 src/world/Action/MountAction.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/world/Action/MountAction.cpp b/src/world/Action/MountAction.cpp
index 1c0170b7..7b01f870 100644
--- a/src/world/Action/MountAction.cpp
+++ b/src/world/Action/MountAction.cpp
@@ -63,6 +63,7 @@ void MountAction::execute()
 {
   assert( m_pSource );
 
+  m_pSource->getAsPlayer()->unsetStateFlag( Common::PlayerStateFlag::Casting );
   m_effectBuilder->mount( m_pSource, m_mountId );
   m_effectBuilder->buildAndSendPackets();
 }
\ No newline at end of file

From 0306b68f8813ce1fac39b1bc810293a3e803eaaa Mon Sep 17 00:00:00 2001
From: NotAdam <adam@notadam.me>
Date: Mon, 17 Feb 2020 15:45:27 +1100
Subject: [PATCH 247/351] fix an issue where some versions of std::fs would
 handle path generation differently this changes the builtin http server to
 generate more reliable paths when parsing request bodies, fixes #635

---
 src/api/main.cpp        | 5 +++--
 src/api/server_http.hpp | 6 ++++++
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/src/api/main.cpp b/src/api/main.cpp
index 78d02861..3874ae1d 100644
--- a/src/api/main.cpp
+++ b/src/api/main.cpp
@@ -671,8 +671,9 @@ void defaultGet( shared_ptr< HttpServer::Response > response, shared_ptr< HttpSe
   print_request_info( request );
   try
   {
-    auto web_root_path = fs::canonical( "web" );
-    auto path = fs::canonical( web_root_path / request->path );
+    auto web_root_path = fs::current_path() / "web";
+    auto path = web_root_path / request->path;
+
     //Check if path is within web_root_path
     if( distance( web_root_path.begin(), web_root_path.end() ) > distance( path.begin(), path.end() ) ||
         !std::equal( web_root_path.begin(), web_root_path.end(), path.begin() ) )
diff --git a/src/api/server_http.hpp b/src/api/server_http.hpp
index 8a6d2226..8ceb5810 100644
--- a/src/api/server_http.hpp
+++ b/src/api/server_http.hpp
@@ -306,6 +306,12 @@ namespace SimpleWeb {
                     request->method=line.substr(0, method_end);
                     request->path=line.substr(method_end+1, path_end-method_end-1);
 
+                    // strip first / from path if it exists
+                    if( request->path[ 0 ] == '/' )
+                    {
+                      request->path = request->path.substr( 1 );
+                    }
+
                     size_t protocol_end;
                     if((protocol_end=line.find('/', path_end+1))!=std::string::npos) {
                         if(line.compare(path_end+1, protocol_end-path_end-1, "HTTP")!=0)

From d8451621908a613855c0902f0ca8d4dcc8eec6bd Mon Sep 17 00:00:00 2001
From: NotAdam <adam@notadam.me>
Date: Mon, 17 Feb 2020 15:57:44 +1100
Subject: [PATCH 248/351] fix api routing, bit nicer code for fixing urls

---
 src/api/main.cpp        | 26 +++++++++++++-------------
 src/api/server_http.hpp |  8 +-------
 2 files changed, 14 insertions(+), 20 deletions(-)

diff --git a/src/api/main.cpp b/src/api/main.cpp
index 3874ae1d..32d4b794 100644
--- a/src/api/main.cpp
+++ b/src/api/main.cpp
@@ -719,19 +719,19 @@ int main( int argc, char* argv[] )
 
   Logger::setLogLevel( m_config.global.general.logLevel );
 
-  server.resource[ "^/ZoneName/([0-9]+)$" ][ "GET" ] = &getZoneName;
-  server.resource[ "^/sapphire-api/lobby/createAccount" ][ "POST" ] = &createAccount;
-  server.resource[ "^/sapphire-api/lobby/login" ][ "POST" ] = &login;
-  server.resource[ "^/sapphire-api/lobby/deleteCharacter" ][ "POST" ] = &deleteCharacter;
-  server.resource[ "^/sapphire-api/lobby/createCharacter" ][ "POST" ] = &createCharacter;
-  server.resource[ "^/sapphire-api/lobby/insertSession" ][ "POST" ] = &insertSession;
-  server.resource[ "^/sapphire-api/lobby/checkNameTaken" ][ "POST" ] = &checkNameTaken;
-  server.resource[ "^/sapphire-api/lobby/checkSession" ][ "POST" ] = &checkSession;
-  server.resource[ "^/sapphire-api/lobby/getNextCharId" ][ "POST" ] = &getNextCharId;
-  server.resource[ "^/sapphire-api/lobby/getNextContentId" ][ "POST" ] = &getNextContentId;
-  server.resource[ "^/sapphire-api/lobby/getCharacterList" ][ "POST" ] = &getCharacterList;
-  server.resource[ "^(/frontier-api/ffxivsupport/view/get_init)(.*)" ][ "GET" ] = &get_init;
-  server.resource[ "^(/frontier-api/ffxivsupport/information/get_headline_all)(.*)" ][ "GET" ] = &get_headline_all;
+  server.resource[ "^ZoneName/([0-9]+)$" ][ "GET" ] = &getZoneName;
+  server.resource[ "^sapphire-api/lobby/createAccount" ][ "POST" ] = &createAccount;
+  server.resource[ "^sapphire-api/lobby/login" ][ "POST" ] = &login;
+  server.resource[ "^sapphire-api/lobby/deleteCharacter" ][ "POST" ] = &deleteCharacter;
+  server.resource[ "^sapphire-api/lobby/createCharacter" ][ "POST" ] = &createCharacter;
+  server.resource[ "^sapphire-api/lobby/insertSession" ][ "POST" ] = &insertSession;
+  server.resource[ "^sapphire-api/lobby/checkNameTaken" ][ "POST" ] = &checkNameTaken;
+  server.resource[ "^sapphire-api/lobby/checkSession" ][ "POST" ] = &checkSession;
+  server.resource[ "^sapphire-api/lobby/getNextCharId" ][ "POST" ] = &getNextCharId;
+  server.resource[ "^sapphire-api/lobby/getNextContentId" ][ "POST" ] = &getNextContentId;
+  server.resource[ "^sapphire-api/lobby/getCharacterList" ][ "POST" ] = &getCharacterList;
+  server.resource[ "^(frontier-api/ffxivsupport/view/get_init)(.*)" ][ "GET" ] = &get_init;
+  server.resource[ "^(frontier-api/ffxivsupport/information/get_headline_all)(.*)" ][ "GET" ] = &get_headline_all;
 
   server.default_resource[ "GET" ] = &defaultGet;
 
diff --git a/src/api/server_http.hpp b/src/api/server_http.hpp
index 8ceb5810..b9166c57 100644
--- a/src/api/server_http.hpp
+++ b/src/api/server_http.hpp
@@ -304,13 +304,7 @@ namespace SimpleWeb {
                 size_t path_end;
                 if((path_end=line.find(' ', method_end+1))!=std::string::npos) {
                     request->method=line.substr(0, method_end);
-                    request->path=line.substr(method_end+1, path_end-method_end-1);
-
-                    // strip first / from path if it exists
-                    if( request->path[ 0 ] == '/' )
-                    {
-                      request->path = request->path.substr( 1 );
-                    }
+                    request->path=line.substr(method_end+2, path_end-method_end-2);
 
                     size_t protocol_end;
                     if((protocol_end=line.find('/', path_end+1))!=std::string::npos) {

From c98594f6c5b66b1423603883b5c02da224818a7c Mon Sep 17 00:00:00 2001
From: collett <collett0301@gmail.com>
Date: Tue, 18 Feb 2020 23:05:24 +0900
Subject: [PATCH 249/351] 5.2 packet update.

---
 src/common/Network/PacketDef/Ipcs.h           | 137 +++++++++---------
 .../Network/PacketDef/Zone/ServerZoneDef.h    |  17 +--
 src/world/Actor/Chara.cpp                     |   3 -
 .../PacketWrappers/PlayerSpawnPacket.h        |   2 -
 4 files changed, 75 insertions(+), 84 deletions(-)

diff --git a/src/common/Network/PacketDef/Ipcs.h b/src/common/Network/PacketDef/Ipcs.h
index 19651f7b..6435db07 100644
--- a/src/common/Network/PacketDef/Ipcs.h
+++ b/src/common/Network/PacketDef/Ipcs.h
@@ -43,29 +43,27 @@ namespace Sapphire::Network::Packets
   */
   enum ServerZoneIpcType : uint16_t
   {
-
-    // static opcode ( the ones that rarely, if ever, change )
-    Ping = 0x0200, // updated 5.18
-    Init = 0x018E,
+    Ping = 0x0106, // updated 5.2
+    Init = 0x0307, // updated 5.2
 
     ActorFreeSpawn = 0x009B, // updated 5.18
-    InitZone = 0x007C, // updated 5.18
+    InitZone = 0x033A, // updated 5.2
 
-    EffectResult = 0x0267, // updated 5.18
-    ActorControl = 0x03BE, // updated 5.18
-    ActorControlSelf = 0x00E3, // updated 5.18
-    ActorControlTarget = 0x24d, // updated 5.18
+    EffectResult = 0x0340, // updated 5.2
+    ActorControl = 0x01E1, // updated 5.2
+    ActorControlSelf = 0x010E, // updated 5.2
+    ActorControlTarget = 0x00AE, // updated 5.2
 
     /*!
      * @brief Used when resting
      */
-    UpdateHpMpTp = 0x0125, // updated 5.18
+    UpdateHpMpTp = 0x00C1, // updated 5.2
 
     ///////////////////////////////////////////////////
 
     ChatBanned = 0x006B,
     Playtime = 0x00E7, // updated 5.18
-    Logout = 0x142, // updated 5.18
+    Logout = 0x0A1, // updated 5.2
     CFNotify = 0x01F8, // updated 5.18
     CFMemberStatus = 0x0079,
     CFDutyInfo = 0x007A,
@@ -84,25 +82,25 @@ namespace Sapphire::Network::Packets
 
     WorldVisitList = 0x00FE, // added 4.5
 
-    SocialList = 0x01F1, // updated 5.18
+    SocialList = 0x033E, // updated 5.2
 
     ExamineSearchInfo = 0x012B, // updated 5.18
     UpdateSearchInfo = 0x01E5, // updated 5.18
-    InitSearchInfo = 0x01D0, // updated 5.18
+    InitSearchInfo = 0x021C, // updated 5.2
     ExamineSearchComment = 0x0102, // updated 4.1
 
     ServerNoticeShort = 0x0115, // updated 5.0
-    ServerNotice = 0x0088, // updated 5.18
-    SetOnlineStatus = 0x015E, // updated 5.1
+    ServerNotice = 0x0308, // updated 5.2
+    SetOnlineStatus = 0x0185, // updated 5.2
 
     CountdownInitiate = 0x0309, // updated 5.11
     CountdownCancel = 0x00D9, // updated 5.18
 
     PlayerAddedToBlacklist = 0x033F, // updated 5.1
     PlayerRemovedFromBlacklist = 0x0385, // updated 5.1
-    BlackList = 0x0253, // updated 5.18
+    BlackList = 0x01A2, // updated 5.2
 
-    LinkshellList = 0x00AC, // updated 5.18
+    LinkshellList = 0x028C, // updated 5.2
 
     MailDeleteRequest = 0x012B, // updated 5.0
 
@@ -125,24 +123,24 @@ namespace Sapphire::Network::Packets
 
     FreeCompanyUpdateShortMessage = 0x0157, // added 5.0
 
-    StatusEffectList = 0x0183, // updated 5.18
+    StatusEffectList = 0x0374, // updated 5.2
     EurekaStatusEffectList = 0x0167, // updated 5.18
     BossStatusEffectList = 0x0312, // added 5.1
-    Effect = 0x026B, // updated 5.18
+    Effect = 0x028A, // updated 5.2
     AoeEffect8 = 0x033E, // updated 5.18
     AoeEffect16 = 0x0305, // updated 5.18
     AoeEffect24 = 0x023F, // updated 5.18
     AoeEffect32 = 0x0352, // updated 5.18
-    PersistantEffect = 0x019C, // updated 5.18
+    PersistantEffect = 0x00CE, // updated 5.2
 
     GCAffiliation = 0x016F, // updated 5.0
 
-    PlayerSpawn = 0x0262, // updated 5.18
-    NpcSpawn = 0x0186, // updated 5.18
+    PlayerSpawn = 0x027D, // updated 5.2
+    NpcSpawn = 0x034B, // updated 5.2
     NpcSpawn2 = 0x010C, // ( Bigger statuseffectlist? ) updated 5.18
-    ActorMove = 0x021B, // updated 5.18
+    ActorMove = 0x0130, // updated 5.2
 
-    ActorSetPos = 0x0068, // updated 5.18
+    ActorSetPos = 0x00CF, // updated 5.2
 
     ActorCast = 0x03B1, // updated 5.18
     SomeCustomiseChangePacketProbably = 0x00CD, // added 5.18
@@ -150,15 +148,15 @@ namespace Sapphire::Network::Packets
     PartyList = 0x0287, // updated 5.18
     HateRank = 0x0226, // updated 5.18
     HateList = 0x0361, // updated 5.18
-    ObjectSpawn = 0x027F, // updated 5.18
+    ObjectSpawn = 0x01B3, // updated 5.2
     ObjectDespawn = 0x034B, // updated 5.18
-    UpdateClassInfo = 0x0362, // updated 5.18
+    UpdateClassInfo = 0x0131, // updated 5.2
     SilentSetClassJob = 0x018E, // updated 5.0 - seems to be the case, not sure if it's actually used for anything
-    PlayerSetup = 0x0295, // updated 5.18
-    PlayerStats = 0x017A, // updated 5.18
+    PlayerSetup = 0x0278, // updated 5.2
+    PlayerStats = 0x03C8, // updated 5.2
     ActorOwner = 0x03BB, // updated 5.18
-    PlayerStateFlags = 0x02C6, // updated 5.18
-    PlayerClassInfo = 0x01B0, // updated 5.18
+    PlayerStateFlags = 0x032B, // updated 5.2
+    PlayerClassInfo = 0x039A, // updated 5.2
 
     ModelEquip = 0x02E6, // updated 5.18
     Examine = 0x0366, // updated 5.18
@@ -169,35 +167,35 @@ namespace Sapphire::Network::Packets
 
     SetLevelSync = 0x1186, // not updated for 4.4, not sure what it is anymore
 
-    ItemInfo = 0x00F2, // updated 5.18
-    ContainerInfo = 0x01F2, // updated 5.18
-    InventoryTransactionFinish = 0x00D2, // updated 5.18
-    InventoryTransaction = 0x0233, // updated 5.18
-    CurrencyCrystalInfo = 0x02BF, // updated 5.18
+    ItemInfo = 0x03D4, // updated 5.2
+    ContainerInfo = 0x01A5, // updated 5.2
+    InventoryTransactionFinish = 0x02D7, // updated 5.2
+    InventoryTransaction = 0x01D8, // updated 5.2
+    CurrencyCrystalInfo = 0x0277, // updated 5.2
 
-    InventoryActionAck = 0x02FA, // updated 5.18
-    UpdateInventorySlot = 0x0370, // updated 5.18
+    InventoryActionAck = 0x0094, // updated 5.2
+    UpdateInventorySlot = 0x02E9, // updated 5.2
 
     HuntingLogEntry = 0x01B3, // updated 5.0
 
-    EventPlay = 0x0279, // updated 5.18
+    EventPlay = 0x01F3, // updated 5.2
     EventPlay4 = 0x02F7, // updated 5.18
     EventPlay8 = 0x0119, // updated 5.18
     EventPlay16 = 0x01FB, // updated 5.18
     EventPlay32 = 0x0364, // updated 5.18
     EventPlay64 = 0x00E5, // updated 5.18
     EventPlay128 = 0x02BE, // updated 5.18
-    EventPlay255 = 0x01B1, // updated 5.18
+    EventPlay255 = 0x03B0, // updated 5.2
 
-    EventStart = 0x0230, // updated 5.18
-    EventFinish = 0x01E4, // updated 5.18
+    EventStart = 0x023D, // updated 5.2
+    EventFinish = 0x0318, // updated 5.2
     UseMooch = 0x0233, // updated 5.18
 
     EventLinkshell = 0x1169,
 
-    QuestActiveList = 0x031E, // updated 5.18
+    QuestActiveList = 0x017B, // updated 5.2
     QuestUpdate = 0x0066, // updated 5.18
-    QuestCompleteList = 0x025D, // updated 5.18
+    QuestCompleteList = 0x0255, // updated 5.2
 
     QuestFinish = 0x013A, // updated 5.18
     MSQTrackerComplete = 0x01D6, // updated 5.0
@@ -205,7 +203,7 @@ namespace Sapphire::Network::Packets
 
     QuestMessage = 0x00BF, // updated 5.18
 
-    QuestTracker = 0x0289, // updated 5.18
+    QuestTracker = 0x0306, // updated 5.2
 
     Mount = 0x038F, // updated 5.18
 
@@ -227,7 +225,7 @@ namespace Sapphire::Network::Packets
 
     EorzeaTimeOffset = 0x03B8, // updated 5.1
 
-    EquipDisplayFlags = 0x00FF, // updated 5.18
+    EquipDisplayFlags = 0x0173, // updated 5.2
 
     /// Housing //////////////////////////////////////
 
@@ -240,7 +238,7 @@ namespace Sapphire::Network::Packets
     LandRename = 0x023A, // updated 5.0
     HousingEstateGreeting = 0x023B, // updated 5.0
     HousingUpdateLandFlagsSlot = 0x023C, // updated 5.0
-    HousingLandFlags = 0x01F3, // updated 5.18
+    HousingLandFlags = 0x00FE, // updated 5.2
     HousingShowEstateGuestAccess = 0x023E, // updated 5.0
 
     HousingObjectInitialize = 0x0240, // updated 5.0
@@ -260,12 +258,12 @@ namespace Sapphire::Network::Packets
     DuelChallenge = 0x0277, // 4.2; this is responsible for opening the ui
     PerformNote = 0x0286, // updated 4.3
 
-    PrepareZoning = 0x035C, // updated 5.18
-    ActorGauge = 0x016D, // updated 5.18
+    PrepareZoning = 0x0208, // updated 5.2
+    ActorGauge = 0x0162, // updated 5.2
 
     // daily quest info -> without them sent,  login will take longer...
-    DailyQuests = 0x02D8, // updated 5.18
-    DailyQuestRepeatFlags = 0x03A3, // updated 5.18
+    DailyQuests = 0x00A2, // updated 5.2
+    DailyQuestRepeatFlags = 0x013D, // updated 5.2
 
     /// Doman Mahjong //////////////////////////////////////
     MahjongOpenGui = 0x02A4, // only available in mahjong instance
@@ -285,11 +283,10 @@ namespace Sapphire::Network::Packets
   */
   enum ClientZoneIpcType : uint16_t
   {
+    PingHandler = 0x0106, // updated 5.2
+    InitHandler = 0x0307, // updated 5.2
 
-    PingHandler = 0x0200, // updated 5.18
-    InitHandler = 0x018E, // updated 5.18
-
-    FinishLoadingHandler = 0x01F5, // updated 5.18
+    FinishLoadingHandler = 0x012B, // updated 5.2
 
     CFCommenceHandler = 0x006F,
 
@@ -297,7 +294,7 @@ namespace Sapphire::Network::Packets
     CFRegisterDuty = 0x0071,
     CFRegisterRoulette = 0xFF72,
     PlayTimeHandler = 0x0276, // updated 5.1
-    LogoutHandler = 0x015D, // updated 5.18
+    LogoutHandler = 0x029C, // updated 5.2
     CancelLogout = 0x008F, // updated 5.1
 
     CFDutyInfoHandler = 0x0078, // updated 4.2
@@ -305,18 +302,18 @@ namespace Sapphire::Network::Packets
     SocialReqSendHandler = 0x00AE, // updated 4.1
     CreateCrossWorldLS = 0x00AF, // updated 4.3
 
-    ChatHandler = 0x0130, // updated 5.18
+    ChatHandler = 0x013A, // updated 5.2
 
-    SocialListHandler = 0x0090, // updated 5.18
-    SetSearchInfoHandler = 0x0320, // updated 5.18
-    ReqSearchInfoHandler = 0x0374, // updated 5.18
+    SocialListHandler = 0x03E7, // updated 5.2
+    SetSearchInfoHandler = 0x00A8, // updated 5.2
+    ReqSearchInfoHandler = 0x007B, // updated 5.2
     ReqExamineSearchCommentHandler = 0x00E7, // updated 5.0
 
     ReqRemovePlayerFromBlacklist = 0x00F1, // updated 5.0
-    BlackListHandler = 0x01EB, // updated 5.18
+    BlackListHandler = 0x0329, // updated 5.2
     PlayerSearchHandler = 0x00F4, // updated 5.0
 
-    LinkshellListHandler = 0x014A, // updated 5.18
+    LinkshellListHandler = 0x00A7, // updated 5.2
 
     MarketBoardRequestItemListingInfo = 0x0102, // updated 4.5
     MarketBoardRequestItemListings = 0x0103, // updated 4.5
@@ -335,39 +332,39 @@ namespace Sapphire::Network::Packets
     ReqCountdownInitiate = 0x0135, // updated 5.0
     ReqCountdownCancel = 0x0136, // updated 5.0
 
-    ZoneLineHandler = 0x0174, // updated 5.18
-    ClientTrigger = 0x03C0, // updated 5.18
+    ZoneLineHandler = 0x00B9, // updated 5.2
+    ClientTrigger = 0x017C, // updated 5.2
     DiscoveryHandler = 0x017B, // updated 5.18
 
     PlaceFieldMarker = 0x013C, // updated 5.0
-    SkillHandler = 0x01BE, // updated 5.18
+    SkillHandler = 0x0225, // updated 5.2
     GMCommand1 = 0x014D, // updated 5.18
     GMCommand2 = 0x03C2, // updated 5.18
     AoESkillHandler = 0x0072, // updated 5.18
 
-    UpdatePositionHandler = 0x0318, // updated 5.18
+    UpdatePositionHandler = 0x0270, // updated 5.2
 
-    InventoryModifyHandler = 0x03C5, // updated 5.18
+    InventoryModifyHandler = 0x02E4, // updated 5.2
     
     InventoryEquipRecommendedItems = 0x0149, // updated 5.0
 
     ReqPlaceHousingItem = 0x014B, // updated 5.0
     BuildPresetHandler = 0x0150, // updated 5.0
 
-    TalkEventHandler = 0x02FD, // updated 5.18
+    TalkEventHandler = 0x0340, // updated 5.2
     EmoteEventHandler = 0x0183, // updated 5.18
     WithinRangeEventHandler = 0x0167, // updated 5.18
     OutOfRangeEventHandler = 0x02B5, // updated 5.18
     EnterTeriEventHandler = 0x0267, // updated 5.18
     ShopEventHandler = 0x0156, // updated 5.0
 
-    ReturnEventHandler = 0x026B, // updated 5.18
-    TradeReturnEventHandler = 0x02DD, // updated 5.18
+    ReturnEventHandler = 0x027F, // updated 5.2
+    TradeReturnEventHandler = 0x02DB, // updated 5.2
 
     LinkshellEventHandler = 0x016B, // updated 4.5
     LinkshellEventHandler1 = 0x016C, // updated 4.5
 
-    ReqEquipDisplayFlagsChange = 0x01FE, // updated 5.18
+    ReqEquipDisplayFlagsChange = 0x02E2, // updated 5.2
 
     LandRenameHandler = 0xF177, // updated 5.0
     HousingUpdateHouseGreeting = 0x0178, // updated 5.0
diff --git a/src/common/Network/PacketDef/Zone/ServerZoneDef.h b/src/common/Network/PacketDef/Zone/ServerZoneDef.h
index 6e715282..75d10bfb 100644
--- a/src/common/Network/PacketDef/Zone/ServerZoneDef.h
+++ b/src/common/Network/PacketDef/Zone/ServerZoneDef.h
@@ -421,9 +421,9 @@ namespace Sapphire::Network::Packets::Server
     uint32_t max_hp;
     uint16_t current_mp;
     uint16_t max_mp;
-    uint16_t currentTp;
     uint8_t shieldPercentage;
     uint8_t unknown1;
+    uint16_t unknown2;
     Common::StatusEffect effect[30];
     uint32_t padding;
   };
@@ -445,8 +445,6 @@ namespace Sapphire::Network::Packets::Server
     uint32_t current_hp;
     uint32_t max_hp;
     uint16_t current_mp;
-    uint16_t current_tp;
-    uint16_t max_mp;
     uint8_t unknown1;
     uint8_t classId;
     uint8_t shieldPercentage;
@@ -464,7 +462,6 @@ namespace Sapphire::Network::Packets::Server
       uint32_t sourceActorId;
     } statusEntries[4];
 
-    uint32_t unknown5;
   };
 
   /**
@@ -664,9 +661,8 @@ namespace Sapphire::Network::Packets::Server
     uint32_t displayFlags;
     uint16_t fateID;
     uint16_t mPCurr;
-    uint16_t tPCurr;
     uint16_t mPMax;
-    uint16_t tPMax;
+    uint16_t unk; // == 0
     uint16_t modelChara;
     uint16_t rotation;
     uint16_t activeMinion;
@@ -688,8 +684,11 @@ namespace Sapphire::Network::Packets::Server
     uint8_t mountFeet;
     uint8_t mountColor;
     uint8_t scale;
-    uint32_t elementalLevel;
-    uint32_t element;
+
+    //uint32_t elementalLevel; one of these two field changed to 16bit
+    //uint32_t element;
+    uint8_t elementData[6];
+
     Common::StatusEffect effect[30];
     Common::FFXIVARR_POSITION3 pos;
     uint32_t models[10];
@@ -1023,7 +1022,7 @@ namespace Sapphire::Network::Packets::Server
     unsigned char companionDefRank;
     unsigned char companionAttRank;
     unsigned char companionHealRank;
-    unsigned char u19[8];
+    unsigned char u19[13];
     unsigned char mountGuideMask[22];
     char name[32];
     unsigned char unknownOword[16];
diff --git a/src/world/Actor/Chara.cpp b/src/world/Actor/Chara.cpp
index 6ecec118..35e1155e 100644
--- a/src/world/Actor/Chara.cpp
+++ b/src/world/Actor/Chara.cpp
@@ -539,9 +539,7 @@ void Sapphire::Entity::Chara::addStatusEffect( StatusEffect::StatusEffectPtr pEf
   statusEffectAdd->data().actor_id = pEffect->getTargetActorId();
   statusEffectAdd->data().current_hp = getHp();
   statusEffectAdd->data().current_mp = static_cast< uint16_t >( getMp() );
-  statusEffectAdd->data().current_tp = getTp();
   statusEffectAdd->data().max_hp = getMaxHp();
-  statusEffectAdd->data().max_mp = static_cast< uint16_t >( getMaxMp() );
   statusEffectAdd->data().classId = static_cast< uint8_t >( getClass() );
   statusEffectAdd->data().entryCount = 1;
 
@@ -661,7 +659,6 @@ void Sapphire::Entity::Chara::sendStatusEffectUpdate()
   statusEffectList->data().level1 = getLevel();
   statusEffectList->data().current_hp = getHp();
   statusEffectList->data().current_mp = getMp();
-  statusEffectList->data().currentTp = getTp();
   statusEffectList->data().max_hp = getMaxHp();
   statusEffectList->data().max_mp = getMaxMp();
   uint8_t slot = 0;
diff --git a/src/world/Network/PacketWrappers/PlayerSpawnPacket.h b/src/world/Network/PacketWrappers/PlayerSpawnPacket.h
index f20fdd7e..7ddbe23d 100644
--- a/src/world/Network/PacketWrappers/PlayerSpawnPacket.h
+++ b/src/world/Network/PacketWrappers/PlayerSpawnPacket.h
@@ -37,11 +37,9 @@ namespace Sapphire::Network::Packets::Server
 
       m_data.hPCurr = player.getHp();
       m_data.mPCurr = player.getMp();
-      m_data.tPCurr = player.getTp();
       m_data.hPMax = player.getMaxHp();
       m_data.mPMax = player.getMaxMp();
 
-      //m_data.tPMax = 3000;
       m_data.level = player.getLevel();
       m_data.gmRank = player.getGmRank();
       m_data.pose = player.getPose();

From 39cc5af97bcda4c6baaa0b06ce37a248f27d03e7 Mon Sep 17 00:00:00 2001
From: collett <collett0301@gmail.com>
Date: Wed, 19 Feb 2020 16:51:31 +0900
Subject: [PATCH 250/351] fix build

---
 src/world/Actor/Player.cpp | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/world/Actor/Player.cpp b/src/world/Actor/Player.cpp
index dc616600..2e18b010 100644
--- a/src/world/Actor/Player.cpp
+++ b/src/world/Actor/Player.cpp
@@ -749,7 +749,6 @@ void Sapphire::Entity::Player::gainLevel()
   effectListPacket->data().level = getLevel();
   effectListPacket->data().current_hp = getMaxHp();
   effectListPacket->data().current_mp = getMaxMp();
-  effectListPacket->data().currentTp = 1000;
   effectListPacket->data().max_hp = getMaxHp();
   effectListPacket->data().max_mp = getMaxMp();
   sendToInRangeSet( effectListPacket, true );

From d8ae481ced9e10b7a7f63423b820c08ae6feb6a1 Mon Sep 17 00:00:00 2001
From: collett <collett0301@gmail.com>
Date: Wed, 19 Feb 2020 16:46:00 +0900
Subject: [PATCH 251/351] more opcode picked up

---
 src/common/Network/PacketDef/Ipcs.h | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/common/Network/PacketDef/Ipcs.h b/src/common/Network/PacketDef/Ipcs.h
index 6435db07..60543539 100644
--- a/src/common/Network/PacketDef/Ipcs.h
+++ b/src/common/Network/PacketDef/Ipcs.h
@@ -68,7 +68,7 @@ namespace Sapphire::Network::Packets
     CFMemberStatus = 0x0079,
     CFDutyInfo = 0x007A,
     CFPlayerInNeed = 0x007F,
-    CFPreferredRole = 0x032A, // added 5.18
+    CFPreferredRole = 0x031F, // added 5.2
 
     SocialRequestError = 0x00AD,
 
@@ -84,8 +84,8 @@ namespace Sapphire::Network::Packets
 
     SocialList = 0x033E, // updated 5.2
 
-    ExamineSearchInfo = 0x012B, // updated 5.18
-    UpdateSearchInfo = 0x01E5, // updated 5.18
+    ExamineSearchInfo = 0x0186, // updated 5.2
+    UpdateSearchInfo = 0x017D, // updated 5.2
     InitSearchInfo = 0x021C, // updated 5.2
     ExamineSearchComment = 0x0102, // updated 4.1
 
@@ -109,12 +109,12 @@ namespace Sapphire::Network::Packets
     ReqMoogleMailLetter = 0x0139, // updated 5.0
     MailLetterNotification = 0x013A, // updated 5.0
 
-    MarketTaxRates = 0x025E, // updated 5.18
+    MarketTaxRates = 0x02CD, // updated 5.2
 
-    MarketBoardItemListingCount = 0x0328, // updated 5.18
-    MarketBoardItemListing = 0x015F, // updated 5.18
-    MarketBoardItemListingHistory = 0x0113, // updated 5.18
-    MarketBoardSearchResult = 0x01EA, // updated 5.18
+    MarketBoardItemListingCount = 0x030A, // updated 5.2
+    MarketBoardItemListing = 0x023E, // updated 5.2
+    MarketBoardItemListingHistory = 0x03C0, // updated 5.2
+    MarketBoardSearchResult = 0x03D2, // updated 5.2
 
     CharaFreeCompanyTag = 0x013B, // updated 4.5
     FreeCompanyBoardMsg = 0x013C, // updated 4.5
@@ -159,7 +159,7 @@ namespace Sapphire::Network::Packets
     PlayerClassInfo = 0x039A, // updated 5.2
 
     ModelEquip = 0x02E6, // updated 5.18
-    Examine = 0x0366, // updated 5.18
+    Examine = 0x038B, // updated 5.2
     CharaNameReq = 0x0116, // updated 5.18
 
     // nb: see #565 on github

From 0816ba2002ea09b56189bbbff5d450c2c24a320b Mon Sep 17 00:00:00 2001
From: collett <collett0301@gmail.com>
Date: Wed, 19 Feb 2020 18:56:48 +0900
Subject: [PATCH 252/351] fix npcspawn

---
 src/common/Network/PacketDef/Zone/ServerZoneDef.h | 6 ++----
 src/world/Network/PacketWrappers/NpcSpawnPacket.h | 2 --
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/src/common/Network/PacketDef/Zone/ServerZoneDef.h b/src/common/Network/PacketDef/Zone/ServerZoneDef.h
index 75d10bfb..d0c53886 100644
--- a/src/common/Network/PacketDef/Zone/ServerZoneDef.h
+++ b/src/common/Network/PacketDef/Zone/ServerZoneDef.h
@@ -738,9 +738,8 @@ namespace Sapphire::Network::Packets::Server
     uint32_t displayFlags;
     uint16_t fateID;
     uint16_t mPCurr;
-    uint16_t tPCurr;
-    uint16_t mPMax;
-    uint16_t tPMax;
+    uint16_t unknown1; // 0
+    uint16_t unknown2; // 0 or pretty big numbers > 30000
     uint16_t modelChara;
     uint16_t rotation;
     uint16_t activeMinion;
@@ -764,7 +763,6 @@ namespace Sapphire::Network::Packets::Server
     uint8_t scale;
     uint16_t elementalLevel; // Eureka
     uint16_t element; // Eureka
-    uint32_t u30b;
     Common::StatusEffect effect[30];
     Common::FFXIVARR_POSITION3 pos;
     uint32_t models[10];
diff --git a/src/world/Network/PacketWrappers/NpcSpawnPacket.h b/src/world/Network/PacketWrappers/NpcSpawnPacket.h
index 0b9ab630..0b14d53d 100644
--- a/src/world/Network/PacketWrappers/NpcSpawnPacket.h
+++ b/src/world/Network/PacketWrappers/NpcSpawnPacket.h
@@ -35,9 +35,7 @@ namespace Sapphire::Network::Packets::Server
 
       m_data.hPCurr = bnpc.getHp();
       m_data.mPCurr = bnpc.getMp();
-      m_data.tPCurr = bnpc.getTp();
       m_data.hPMax = bnpc.getMaxHp();
-      m_data.mPMax = bnpc.getMaxMp();
       m_data.subtype = 5;
 
       m_data.level = bnpc.getLevel();

From c7a61352ba6cff23d1299bb8dc143ee8c14d53df Mon Sep 17 00:00:00 2001
From: collett <collett0301@gmail.com>
Date: Wed, 19 Feb 2020 19:04:20 +0900
Subject: [PATCH 253/351] chat opcode

---
 src/common/Network/PacketDef/Ipcs.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/common/Network/PacketDef/Ipcs.h b/src/common/Network/PacketDef/Ipcs.h
index 60543539..d4edc822 100644
--- a/src/common/Network/PacketDef/Ipcs.h
+++ b/src/common/Network/PacketDef/Ipcs.h
@@ -78,7 +78,7 @@ namespace Sapphire::Network::Packets
 
     LogMessage = 0x00D0,
 
-    Chat = 0x02A3, // updated 5.18
+    Chat = 0x0154, // updated 5.2
 
     WorldVisitList = 0x00FE, // added 4.5
 

From 243943eac9ff09462516067612a0380a9e21dc25 Mon Sep 17 00:00:00 2001
From: collett <collett0301@gmail.com>
Date: Thu, 20 Feb 2020 18:31:05 +0900
Subject: [PATCH 254/351] Fix combo indicator and more opcode updates.

---
 src/common/Common.h                 |  4 ++--
 src/common/Network/PacketDef/Ipcs.h | 10 +++++-----
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/common/Common.h b/src/common/Common.h
index 15b98084..40225fdc 100644
--- a/src/common/Common.h
+++ b/src/common/Common.h
@@ -632,8 +632,8 @@ namespace Sapphire::Common
      * @param flags Required to be 128, doesn't show combo rings on hotbars otherwise
      * @param value The actionid that starts/continues the combo. eg, 3617 will start a spinning slash and/or syphon strike combo
      */
-    StartActionCombo = 28, // actually this is more likely "ActionComplete" or something like that
-    ComboSucceed = 29,
+    StartActionCombo = 27, // why this is changed lol
+    ComboSucceed = 29, // this is gone on retail and not working anymore
     Knockback = 33,
     Mount = 39,
     VFX = 59, // links to VFX sheet
diff --git a/src/common/Network/PacketDef/Ipcs.h b/src/common/Network/PacketDef/Ipcs.h
index d4edc822..ba845a20 100644
--- a/src/common/Network/PacketDef/Ipcs.h
+++ b/src/common/Network/PacketDef/Ipcs.h
@@ -46,7 +46,7 @@ namespace Sapphire::Network::Packets
     Ping = 0x0106, // updated 5.2
     Init = 0x0307, // updated 5.2
 
-    ActorFreeSpawn = 0x009B, // updated 5.18
+    ActorFreeSpawn = 0x01D1, // updated 5.2
     InitZone = 0x033A, // updated 5.2
 
     EffectResult = 0x0340, // updated 5.2
@@ -127,7 +127,7 @@ namespace Sapphire::Network::Packets
     EurekaStatusEffectList = 0x0167, // updated 5.18
     BossStatusEffectList = 0x0312, // added 5.1
     Effect = 0x028A, // updated 5.2
-    AoeEffect8 = 0x033E, // updated 5.18
+    AoeEffect8 = 0x01F5, // updated 5.2
     AoeEffect16 = 0x0305, // updated 5.18
     AoeEffect24 = 0x023F, // updated 5.18
     AoeEffect32 = 0x0352, // updated 5.18
@@ -146,15 +146,15 @@ namespace Sapphire::Network::Packets
     SomeCustomiseChangePacketProbably = 0x00CD, // added 5.18
 
     PartyList = 0x0287, // updated 5.18
-    HateRank = 0x0226, // updated 5.18
-    HateList = 0x0361, // updated 5.18
+    HateRank = 0x03AC, // updated 5.2
+    HateList = 0x00C8, // updated 5.2
     ObjectSpawn = 0x01B3, // updated 5.2
     ObjectDespawn = 0x034B, // updated 5.18
     UpdateClassInfo = 0x0131, // updated 5.2
     SilentSetClassJob = 0x018E, // updated 5.0 - seems to be the case, not sure if it's actually used for anything
     PlayerSetup = 0x0278, // updated 5.2
     PlayerStats = 0x03C8, // updated 5.2
-    ActorOwner = 0x03BB, // updated 5.18
+    ActorOwner = 0x0290, // updated 5.2
     PlayerStateFlags = 0x032B, // updated 5.2
     PlayerClassInfo = 0x039A, // updated 5.2
 

From c22f5244359a545255dd526faacdb65b1b3a5952 Mon Sep 17 00:00:00 2001
From: collett <collett0301@gmail.com>
Date: Mon, 24 Feb 2020 18:23:43 +0900
Subject: [PATCH 255/351] Inventory fix and more opcode update.

---
 src/common/Common.h                               | 12 ++++++------
 src/common/Network/PacketDef/Ipcs.h               | 10 +++++-----
 src/common/Network/PacketDef/Zone/ClientZoneDef.h |  2 +-
 src/common/Network/PacketDef/Zone/ServerZoneDef.h |  3 +--
 src/world/Actor/Player.h                          |  2 +-
 src/world/Actor/PlayerInventory.cpp               | 11 +++++++----
 6 files changed, 21 insertions(+), 19 deletions(-)

diff --git a/src/common/Common.h b/src/common/Common.h
index 40225fdc..2e49c81e 100644
--- a/src/common/Common.h
+++ b/src/common/Common.h
@@ -49,13 +49,13 @@ namespace Sapphire::Common
     uint8_t plot;
   };
 
-  enum InventoryOperation : uint8_t
+  enum InventoryOperation : uint16_t
   {
-    Discard = 0x07,
-    Move = 0x08,
-    Swap = 0x09,
-    Merge = 0x0C,
-    Split = 0x0A
+    Discard = 0x2EB,
+    Move = 0x2EC,
+    Swap = 0x2ED,
+    Merge = 0x2F0,
+    Split = 0x2EE
   };
 
   enum ClientLanguage : uint8_t
diff --git a/src/common/Network/PacketDef/Ipcs.h b/src/common/Network/PacketDef/Ipcs.h
index ba845a20..3c77f710 100644
--- a/src/common/Network/PacketDef/Ipcs.h
+++ b/src/common/Network/PacketDef/Ipcs.h
@@ -194,10 +194,10 @@ namespace Sapphire::Network::Packets
     EventLinkshell = 0x1169,
 
     QuestActiveList = 0x017B, // updated 5.2
-    QuestUpdate = 0x0066, // updated 5.18
+    QuestUpdate = 0x02CE, // updated 5.2
     QuestCompleteList = 0x0255, // updated 5.2
 
-    QuestFinish = 0x013A, // updated 5.18
+    QuestFinish = 0x006F, // updated 5.2
     MSQTrackerComplete = 0x01D6, // updated 5.0
     MSQTrackerProgress = 0xF1CD, // updated 4.5 ? this actually looks like the two opcodes have been combined, see #474
 
@@ -353,9 +353,9 @@ namespace Sapphire::Network::Packets
 
     TalkEventHandler = 0x0340, // updated 5.2
     EmoteEventHandler = 0x0183, // updated 5.18
-    WithinRangeEventHandler = 0x0167, // updated 5.18
-    OutOfRangeEventHandler = 0x02B5, // updated 5.18
-    EnterTeriEventHandler = 0x0267, // updated 5.18
+    WithinRangeEventHandler = 0x010E, // updated 5.2
+    OutOfRangeEventHandler = 0x00AE, // updated 5.2
+    EnterTeriEventHandler = 0x00C1, // updated 5.2
     ShopEventHandler = 0x0156, // updated 5.0
 
     ReturnEventHandler = 0x027F, // updated 5.2
diff --git a/src/common/Network/PacketDef/Zone/ClientZoneDef.h b/src/common/Network/PacketDef/Zone/ClientZoneDef.h
index 9c8d0fc0..5b9739b2 100644
--- a/src/common/Network/PacketDef/Zone/ClientZoneDef.h
+++ b/src/common/Network/PacketDef/Zone/ClientZoneDef.h
@@ -217,7 +217,7 @@ struct FFXIVIpcInventoryModifyHandler :
 {
   /* 0000 */ uint32_t seq;
   /* 0004 */ Common::InventoryOperation action;
-  /* 0005 */ uint8_t pad_0005[7];
+  /* 0005 */ uint8_t pad_0005[6];
   /* 000C */ uint16_t fromContainer;
   /* 000E */ uint8_t pad_000E[2];
   /* 0010 */ uint8_t fromSlot;
diff --git a/src/common/Network/PacketDef/Zone/ServerZoneDef.h b/src/common/Network/PacketDef/Zone/ServerZoneDef.h
index d0c53886..d8b90a7c 100644
--- a/src/common/Network/PacketDef/Zone/ServerZoneDef.h
+++ b/src/common/Network/PacketDef/Zone/ServerZoneDef.h
@@ -1295,8 +1295,7 @@ namespace Sapphire::Network::Packets::Server
   struct FFXIVIpcInventoryTransaction : FFXIVIpcBasePacket< InventoryTransaction >
   {
     uint32_t sequence;
-    uint8_t type;
-    uint8_t padding;
+    uint16_t type;
     uint16_t padding1;
     uint32_t ownerId;
     uint32_t storageId;
diff --git a/src/world/Actor/Player.h b/src/world/Actor/Player.h
index 26984e17..7dd294db 100644
--- a/src/world/Actor/Player.h
+++ b/src/world/Actor/Player.h
@@ -918,7 +918,7 @@ namespace Sapphire::Entity
 
     InvSlotPair getFreeBagSlot();
 
-    Sapphire::ItemPtr addItem( uint32_t catalogId, uint32_t quantity = 1, bool isHq = false, bool slient = false );
+    Sapphire::ItemPtr addItem( uint32_t catalogId, uint32_t quantity = 1, bool isHq = false, bool slient = false, bool canMerge = true );
 
     void moveItem( uint16_t fromInventoryId, uint8_t fromSlotId, uint16_t toInventoryId, uint8_t toSlot );
 
diff --git a/src/world/Actor/PlayerInventory.cpp b/src/world/Actor/PlayerInventory.cpp
index fe89ca81..963830ae 100644
--- a/src/world/Actor/PlayerInventory.cpp
+++ b/src/world/Actor/PlayerInventory.cpp
@@ -534,7 +534,7 @@ bool Sapphire::Entity::Player::isObtainable( uint32_t catalogId, uint8_t quantit
 }
 
 
-Sapphire::ItemPtr Sapphire::Entity::Player::addItem( uint32_t catalogId, uint32_t quantity, bool isHq, bool silent )
+Sapphire::ItemPtr Sapphire::Entity::Player::addItem( uint32_t catalogId, uint32_t quantity, bool isHq, bool silent, bool canMerge )
 {
   auto pDb = m_pFw->get< Db::DbWorkerPool< Db::ZoneDbConnection > >();
   auto pExdData = m_pFw->get< Data::ExdDataGenerated >();
@@ -570,10 +570,13 @@ Sapphire::ItemPtr Sapphire::Entity::Player::addItem( uint32_t catalogId, uint32_
 
     for( uint8_t slot = 0; slot < storage->getMaxSize(); slot++ )
     {
+      if( !canMerge && foundFreeSlot )
+        break;
+
       auto item = storage->getItem( slot );
 
       // add any items that are stackable
-      if( item && !itemInfo->isEquippable && item->getId() == catalogId )
+      if( canMerge && item && !itemInfo->isEquippable && item->getId() == catalogId )
       {
         uint32_t count = item->getStackSize();
         uint32_t maxStack = item->getMaxStackSize();
@@ -742,7 +745,7 @@ void Sapphire::Entity::Player::splitItem( uint16_t fromInventoryId, uint8_t from
     // todo: correct invalid move? again, not sure what retail does here
     return;
 
-  auto newItem = addItem( fromItem->getId(), itemCount, fromItem->isHq(), true );
+  auto newItem = addItem( fromItem->getId(), itemCount, fromItem->isHq(), true, false );
   if( !newItem )
     return;
 
@@ -840,7 +843,7 @@ void Sapphire::Entity::Player::discardItem( uint16_t fromInventoryId, uint8_t fr
   invTransPacket->data().catalogId = fromItem->getId();
   invTransPacket->data().stackSize = fromItem->getStackSize();
   invTransPacket->data().slotId = fromSlotId;
-  invTransPacket->data().type = 7;
+  invTransPacket->data().type = Common::InventoryOperation::Discard;
   queuePacket( invTransPacket );
 
   auto invTransFinPacket = makeZonePacket< FFXIVIpcInventoryTransactionFinish >( getId() );

From af36a3e9b59416ed52ba14a25f4d308eca5e3ec3 Mon Sep 17 00:00:00 2001
From: collett <collett0301@gmail.com>
Date: Mon, 24 Feb 2020 18:31:15 +0900
Subject: [PATCH 256/351] fix offset comment

---
 src/common/Network/PacketDef/Zone/ClientZoneDef.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/common/Network/PacketDef/Zone/ClientZoneDef.h b/src/common/Network/PacketDef/Zone/ClientZoneDef.h
index 5b9739b2..d486ee42 100644
--- a/src/common/Network/PacketDef/Zone/ClientZoneDef.h
+++ b/src/common/Network/PacketDef/Zone/ClientZoneDef.h
@@ -217,7 +217,7 @@ struct FFXIVIpcInventoryModifyHandler :
 {
   /* 0000 */ uint32_t seq;
   /* 0004 */ Common::InventoryOperation action;
-  /* 0005 */ uint8_t pad_0005[6];
+  /* 0006 */ uint8_t pad_0006[6];
   /* 000C */ uint16_t fromContainer;
   /* 000E */ uint8_t pad_000E[2];
   /* 0010 */ uint8_t fromSlot;

From b3b5d917cb30614cca323cb032656bdc2bb176e5 Mon Sep 17 00:00:00 2001
From: collett <collett0301@gmail.com>
Date: Mon, 24 Feb 2020 18:56:39 +0900
Subject: [PATCH 257/351] model equip

---
 src/common/Network/PacketDef/Ipcs.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/common/Network/PacketDef/Ipcs.h b/src/common/Network/PacketDef/Ipcs.h
index 3c77f710..c5a9db0f 100644
--- a/src/common/Network/PacketDef/Ipcs.h
+++ b/src/common/Network/PacketDef/Ipcs.h
@@ -158,7 +158,7 @@ namespace Sapphire::Network::Packets
     PlayerStateFlags = 0x032B, // updated 5.2
     PlayerClassInfo = 0x039A, // updated 5.2
 
-    ModelEquip = 0x02E6, // updated 5.18
+    ModelEquip = 0x03C9, // updated 5.2
     Examine = 0x038B, // updated 5.2
     CharaNameReq = 0x0116, // updated 5.18
 

From 2f2d43b939c7943b2156c3d150561768421da929 Mon Sep 17 00:00:00 2001
From: collett <collett0301@gmail.com>
Date: Mon, 24 Feb 2020 19:24:29 +0900
Subject: [PATCH 258/351] More fixes on action related enums.

---
 src/common/Common.h               | 15 ++++++++-------
 src/world/Action/EffectResult.cpp |  2 +-
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/src/common/Common.h b/src/common/Common.h
index 2e49c81e..5d61a408 100644
--- a/src/common/Common.h
+++ b/src/common/Common.h
@@ -581,11 +581,12 @@ namespace Sapphire::Common
     None = 0, // ?
     MagicPoints = 3,
     TacticsPoints = 5,
-//    WARGauge = 22,
+    StatusEffect = 10,
+    WARGauge = 22,
 //    DRKGauge = 25,
 //    AetherflowStack = 30,
 //    Status = 32,
-//    PLDGauge = 41,
+    PLDGauge = 41,
 //    RDMGaugeBoth = 74,
 ////  RDMGaugeBlack = 75, // not right?
 //    DRGGauge3Eyes = 76,
@@ -623,17 +624,17 @@ namespace Sapphire::Common
     TpLoss = 12,
     TpGain = 13,
     GpGain = 14,
-    ApplyStatusEffect = 15,
-    //ApplyStatusEffect2 = 16, // thin air uses this one but works fine with 15 wtf?
-    StatusNoEffect = 21,
+    ApplyStatusEffectTarget = 15,
+    ApplyStatusEffectSource = 16, // effect entry on target but buff applies to source, like storm's eye
+    StatusNoEffect = 20, // shifted one up from 5.18
     /*!
      * @brief Tells the client that it should show combo indicators on actions.
      *
      * @param flags Required to be 128, doesn't show combo rings on hotbars otherwise
      * @param value The actionid that starts/continues the combo. eg, 3617 will start a spinning slash and/or syphon strike combo
      */
-    StartActionCombo = 27, // why this is changed lol
-    ComboSucceed = 29, // this is gone on retail and not working anymore
+    StartActionCombo = 27, // shifted one up from 5.18
+    ComboSucceed = 28, // shifted one up from 5.18, on retail this is not seen anymore, still working though.
     Knockback = 33,
     Mount = 39,
     VFX = 59, // links to VFX sheet
diff --git a/src/world/Action/EffectResult.cpp b/src/world/Action/EffectResult.cpp
index 725279bb..2860210f 100644
--- a/src/world/Action/EffectResult.cpp
+++ b/src/world/Action/EffectResult.cpp
@@ -82,7 +82,7 @@ void EffectResult::applyStatusEffect( uint16_t statusId, uint8_t param )
   m_value = statusId;
   m_param2 = param;
 
-  m_type = Common::ActionEffectType::ApplyStatusEffect;
+  m_type = Common::ActionEffectType::ApplyStatusEffectTarget;
 }
 
 void EffectResult::mount( uint16_t mountId )

From b6344cfe23d8e633f39bbeafa4f70b6292c36be0 Mon Sep 17 00:00:00 2001
From: NotAdam <adam@notadam.me>
Date: Mon, 24 Feb 2020 23:04:25 +1100
Subject: [PATCH 259/351] fix excel structures, been a while

---
 src/common/Exd/ExdDataGenerated.cpp      | 1991 +++++++++++++++++++---
 src/common/Exd/ExdDataGenerated.h        | 1858 +++++++++++++++++++-
 src/scripts/common/warptaxi/WarpTaxi.cpp |    4 +-
 src/world/Actor/BNpc.cpp                 |    2 +-
 src/world/Manager/EventMgr.cpp           |    8 +-
 src/world/Manager/TerritoryMgr.cpp       |    4 +-
 6 files changed, 3530 insertions(+), 337 deletions(-)

diff --git a/src/common/Exd/ExdDataGenerated.cpp b/src/common/Exd/ExdDataGenerated.cpp
index a04c621e..67a01ec8 100644
--- a/src/common/Exd/ExdDataGenerated.cpp
+++ b/src/common/Exd/ExdDataGenerated.cpp
@@ -22,6 +22,7 @@ Sapphire::Data::Achievement::Achievement( uint32_t row_id, Sapphire::Data::ExdDa
   data.push_back( exdData->getField< int32_t >( row, 16 ) );
   data.push_back( exdData->getField< int32_t >( row, 17 ) );
   order = exdData->getField< uint16_t >( row, 18 );
+  padding = exdData->getField< uint8_t >( row, 19 );
   achievementHideCondition = exdData->getField< uint8_t >( row, 20 );
 }
 
@@ -30,6 +31,7 @@ Sapphire::Data::AchievementCategory::AchievementCategory( uint32_t row_id, Sapph
   auto row = exdData->m_AchievementCategoryDat.get_row( row_id );
   name = exdData->getField< std::string >( row, 0 );
   achievementKind = exdData->getField< uint8_t >( row, 1 );
+  showComplete = exdData->getField< bool >( row, 2 );
   hideCategory = exdData->getField< bool >( row, 3 );
 }
 
@@ -143,7 +145,22 @@ Sapphire::Data::ActionProcStatus::ActionProcStatus( uint32_t row_id, Sapphire::D
 Sapphire::Data::ActionTimeline::ActionTimeline( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
 {
   auto row = exdData->m_ActionTimelineDat.get_row( row_id );
+  type = exdData->getField< uint8_t >( row, 0 );
+  priority = exdData->getField< uint8_t >( row, 1 );
+  pause = exdData->getField< bool >( row, 2 );
+  stance = exdData->getField< uint8_t >( row, 3 );
+  slot = exdData->getField< uint8_t >( row, 4 );
+  lookAtMode = exdData->getField< uint8_t >( row, 5 );
   key = exdData->getField< std::string >( row, 6 );
+  actionTimelineIDMode = exdData->getField< uint8_t >( row, 7 );
+  weaponTimeline = exdData->getField< uint8_t >( row, 8 );
+  loadType = exdData->getField< uint8_t >( row, 9 );
+  startAttach = exdData->getField< uint8_t >( row, 10 );
+  residentPap = exdData->getField< uint8_t >( row, 11 );
+  resident = exdData->getField< bool >( row, 12 );
+  killUpper = exdData->getField< uint16_t >( row, 13 );
+  isMotionCanceledByMoving = exdData->getField< bool >( row, 14 );
+  isLoop = exdData->getField< uint8_t >( row, 16 );
 }
 
 Sapphire::Data::ActionTimelineMove::ActionTimelineMove( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
@@ -211,6 +228,8 @@ Sapphire::Data::Adventure::Adventure( uint32_t row_id, Sapphire::Data::ExdDataGe
 {
   auto row = exdData->m_AdventureDat.get_row( row_id );
   level = exdData->getField< int32_t >( row, 0 );
+  minLevel = exdData->getField< int32_t >( row, 1 );
+  maxLevel = exdData->getField< uint8_t >( row, 2 );
   emote = exdData->getField< uint16_t >( row, 3 );
   minTime = exdData->getField< uint16_t >( row, 4 );
   maxTime = exdData->getField< uint16_t >( row, 5 );
@@ -297,6 +316,7 @@ Sapphire::Data::AetheryteSystemDefine::AetheryteSystemDefine( uint32_t row_id, S
 {
   auto row = exdData->m_AetheryteSystemDefineDat.get_row( row_id );
   text = exdData->getField< std::string >( row, 0 );
+  defineValue = exdData->getField< uint32_t >( row, 1 );
 }
 
 Sapphire::Data::AirshipExplorationLevel::AirshipExplorationLevel( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
@@ -342,6 +362,22 @@ Sapphire::Data::AirshipExplorationPoint::AirshipExplorationPoint( uint32_t row_i
   expReward = exdData->getField< uint32_t >( row, 13 );
 }
 
+Sapphire::Data::AnimationLOD::AnimationLOD( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
+{
+  auto row = exdData->m_AnimationLODDat.get_row( row_id );
+  cameraDistance = exdData->getField< float >( row, 0 );
+  sampleInterval = exdData->getField< float >( row, 1 );
+  boneLOD = exdData->getField< int8_t >( row, 2 );
+  animationEnable.push_back( exdData->getField< bool >( row, 3 ) );
+  animationEnable.push_back( exdData->getField< bool >( row, 4 ) );
+  animationEnable.push_back( exdData->getField< bool >( row, 5 ) );
+  animationEnable.push_back( exdData->getField< bool >( row, 6 ) );
+  animationEnable.push_back( exdData->getField< bool >( row, 7 ) );
+  animationEnable.push_back( exdData->getField< bool >( row, 8 ) );
+  animationEnable.push_back( exdData->getField< bool >( row, 9 ) );
+  animationEnable.push_back( exdData->getField< bool >( row, 10 ) );
+}
+
 Sapphire::Data::AnimaWeapon5::AnimaWeapon5( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
 {
   auto row = exdData->m_AnimaWeapon5Dat.get_row( row_id );
@@ -439,6 +475,7 @@ Sapphire::Data::AozAction::AozAction( uint32_t row_id, Sapphire::Data::ExdDataGe
 Sapphire::Data::AozActionTransient::AozActionTransient( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
 {
   auto row = exdData->m_AozActionTransientDat.get_row( row_id );
+  number = exdData->getField< uint8_t >( row, 0 );
   icon = exdData->getField< uint32_t >( row, 1 );
   stats = exdData->getField< std::string >( row, 2 );
   description = exdData->getField< std::string >( row, 3 );
@@ -509,6 +546,13 @@ Sapphire::Data::AOZContentBriefingBNpc::AOZContentBriefingBNpc( uint32_t row_id,
   instaDeathResistance = exdData->getField< bool >( row, 24 );
 }
 
+Sapphire::Data::AOZReport::AOZReport( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
+{
+  auto row = exdData->m_AOZReportDat.get_row( row_id );
+  reward = exdData->getField< uint8_t >( row, 1 );
+  order = exdData->getField< int8_t >( row, 2 );
+}
+
 Sapphire::Data::AquariumFish::AquariumFish( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
 {
   auto row = exdData->m_AquariumFishDat.get_row( row_id );
@@ -556,18 +600,34 @@ Sapphire::Data::BacklightColor::BacklightColor( uint32_t row_id, Sapphire::Data:
   color = exdData->getField< uint32_t >( row, 0 );
 }
 
+Sapphire::Data::Ballista::Ballista( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
+{
+  auto row = exdData->m_BallistaDat.get_row( row_id );
+  bNPC = exdData->getField< uint16_t >( row, 0 );
+  near = exdData->getField< int8_t >( row, 1 );
+  far = exdData->getField< int8_t >( row, 2 );
+  angle = exdData->getField< uint16_t >( row, 3 );
+  bullet = exdData->getField< uint8_t >( row, 4 );
+  action0 = exdData->getField< uint16_t >( row, 7 );
+  action1 = exdData->getField< uint16_t >( row, 8 );
+  action2 = exdData->getField< uint16_t >( row, 9 );
+  action3 = exdData->getField< uint16_t >( row, 10 );
+}
+
 Sapphire::Data::Balloon::Balloon( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
 {
   auto row = exdData->m_BalloonDat.get_row( row_id );
+  slowly = exdData->getField< bool >( row, 0 );
   dialogue = exdData->getField< std::string >( row, 1 );
 }
 
 Sapphire::Data::BaseParam::BaseParam( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
 {
   auto row = exdData->m_BaseParamDat.get_row( row_id );
-  order = exdData->getField< int8_t >( row, 0 );
+  packetIndex = exdData->getField< int8_t >( row, 0 );
   name = exdData->getField< std::string >( row, 1 );
   description = exdData->getField< std::string >( row, 2 );
+  orderPriority = exdData->getField< uint8_t >( row, 3 );
   oneHWpn = exdData->getField< uint8_t >( row, 4 );
   oH = exdData->getField< uint8_t >( row, 5 );
   head = exdData->getField< uint8_t >( row, 6 );
@@ -581,17 +641,47 @@ Sapphire::Data::BaseParam::BaseParam( uint32_t row_id, Sapphire::Data::ExdDataGe
   bracelet = exdData->getField< uint8_t >( row, 14 );
   ring = exdData->getField< uint8_t >( row, 15 );
   twoHWpn = exdData->getField< uint8_t >( row, 16 );
+  underArmor = exdData->getField< uint8_t >( row, 17 );
   chestHead = exdData->getField< uint8_t >( row, 18 );
   chestHeadLegsFeet = exdData->getField< uint8_t >( row, 19 );
   legsFeet = exdData->getField< uint8_t >( row, 21 );
   headChestHandsLegsFeet = exdData->getField< uint8_t >( row, 22 );
   chestLegsGloves = exdData->getField< uint8_t >( row, 23 );
   chestLegsFeet = exdData->getField< uint8_t >( row, 24 );
+  meldParam.push_back( exdData->getField< uint8_t >( row, 25 ) );
+  meldParam.push_back( exdData->getField< uint8_t >( row, 26 ) );
+  meldParam.push_back( exdData->getField< uint8_t >( row, 27 ) );
+  meldParam.push_back( exdData->getField< uint8_t >( row, 28 ) );
+  meldParam.push_back( exdData->getField< uint8_t >( row, 29 ) );
+  meldParam.push_back( exdData->getField< uint8_t >( row, 30 ) );
+  meldParam.push_back( exdData->getField< uint8_t >( row, 31 ) );
+  meldParam.push_back( exdData->getField< uint8_t >( row, 32 ) );
+  meldParam.push_back( exdData->getField< uint8_t >( row, 33 ) );
+  meldParam.push_back( exdData->getField< uint8_t >( row, 34 ) );
+  meldParam.push_back( exdData->getField< uint8_t >( row, 35 ) );
+  meldParam.push_back( exdData->getField< uint8_t >( row, 36 ) );
+  meldParam.push_back( exdData->getField< uint8_t >( row, 37 ) );
 }
 
 Sapphire::Data::BattleLeve::BattleLeve( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
 {
   auto row = exdData->m_BattleLeveDat.get_row( row_id );
+  time.push_back( exdData->getField< uint16_t >( row, 0 ) );
+  time.push_back( exdData->getField< uint16_t >( row, 1 ) );
+  time.push_back( exdData->getField< uint16_t >( row, 2 ) );
+  time.push_back( exdData->getField< uint16_t >( row, 3 ) );
+  time.push_back( exdData->getField< uint16_t >( row, 4 ) );
+  time.push_back( exdData->getField< uint16_t >( row, 5 ) );
+  time.push_back( exdData->getField< uint16_t >( row, 6 ) );
+  time.push_back( exdData->getField< uint16_t >( row, 7 ) );
+  baseID.push_back( exdData->getField< int32_t >( row, 8 ) );
+  baseID.push_back( exdData->getField< int32_t >( row, 9 ) );
+  baseID.push_back( exdData->getField< int32_t >( row, 10 ) );
+  baseID.push_back( exdData->getField< int32_t >( row, 11 ) );
+  baseID.push_back( exdData->getField< int32_t >( row, 12 ) );
+  baseID.push_back( exdData->getField< int32_t >( row, 13 ) );
+  baseID.push_back( exdData->getField< int32_t >( row, 14 ) );
+  baseID.push_back( exdData->getField< int32_t >( row, 15 ) );
   enemyLevel.push_back( exdData->getField< uint16_t >( row, 16 ) );
   enemyLevel.push_back( exdData->getField< uint16_t >( row, 17 ) );
   enemyLevel.push_back( exdData->getField< uint16_t >( row, 18 ) );
@@ -632,6 +722,32 @@ Sapphire::Data::BattleLeve::BattleLeve( uint32_t row_id, Sapphire::Data::ExdData
   itemDropRate.push_back( exdData->getField< uint8_t >( row, 53 ) );
   itemDropRate.push_back( exdData->getField< uint8_t >( row, 54 ) );
   itemDropRate.push_back( exdData->getField< uint8_t >( row, 55 ) );
+  toDoNumberInvolved.push_back( exdData->getField< uint32_t >( row, 56 ) );
+  toDoNumberInvolved.push_back( exdData->getField< uint32_t >( row, 57 ) );
+  toDoNumberInvolved.push_back( exdData->getField< uint32_t >( row, 58 ) );
+  toDoNumberInvolved.push_back( exdData->getField< uint32_t >( row, 59 ) );
+  toDoNumberInvolved.push_back( exdData->getField< uint32_t >( row, 60 ) );
+  toDoNumberInvolved.push_back( exdData->getField< uint32_t >( row, 61 ) );
+  toDoNumberInvolved.push_back( exdData->getField< uint32_t >( row, 62 ) );
+  toDoNumberInvolved.push_back( exdData->getField< uint32_t >( row, 63 ) );
+  toDoParam.push_back( exdData->getField< uint32_t >( row, 64 ) );
+  toDoParam.push_back( exdData->getField< uint32_t >( row, 65 ) );
+  toDoParam.push_back( exdData->getField< uint32_t >( row, 66 ) );
+  toDoParam.push_back( exdData->getField< uint32_t >( row, 67 ) );
+  toDoParam.push_back( exdData->getField< uint32_t >( row, 68 ) );
+  toDoParam.push_back( exdData->getField< uint32_t >( row, 69 ) );
+  toDoParam.push_back( exdData->getField< uint32_t >( row, 70 ) );
+  toDoParam.push_back( exdData->getField< uint32_t >( row, 71 ) );
+  rule = exdData->getField< int32_t >( row, 176 );
+  varient = exdData->getField< uint8_t >( row, 177 );
+  objective0 = exdData->getField< uint16_t >( row, 178 );
+  objective1 = exdData->getField< uint16_t >( row, 179 );
+}
+
+Sapphire::Data::BattleLeveRule::BattleLeveRule( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
+{
+  auto row = exdData->m_BattleLeveRuleDat.get_row( row_id );
+  rule = exdData->getField< std::string >( row, 0 );
 }
 
 Sapphire::Data::BeastRankBonus::BeastRankBonus( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
@@ -673,7 +789,17 @@ Sapphire::Data::BeastTribe::BeastTribe( uint32_t row_id, Sapphire::Data::ExdData
 Sapphire::Data::Behavior::Behavior( uint32_t row_id, uint32_t subRow, Sapphire::Data::ExdDataGenerated* exdData )
 {
   auto row = exdData->m_BehaviorDat.get_row( row_id, subRow );
-  balloon = exdData->getField< uint16_t >( row, 7 );
+  balloon = exdData->getField< int32_t >( row, 4 );
+}
+
+Sapphire::Data::BehaviorPath::BehaviorPath( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
+{
+  auto row = exdData->m_BehaviorPathDat.get_row( row_id );
+  isTurnTransition = exdData->getField< bool >( row, 0 );
+  isFadeOut = exdData->getField< bool >( row, 1 );
+  isFadeIn = exdData->getField< bool >( row, 2 );
+  isWalking = exdData->getField< bool >( row, 3 );
+  speed = exdData->getField< float >( row, 5 );
 }
 
 Sapphire::Data::BenchmarkOverrideEquipment::BenchmarkOverrideEquipment( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
@@ -709,21 +835,49 @@ Sapphire::Data::BGM::BGM( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exd
 {
   auto row = exdData->m_BGMDat.get_row( row_id );
   file = exdData->getField< std::string >( row, 0 );
+  priority = exdData->getField< uint8_t >( row, 1 );
+  disableRestartTimeOut = exdData->getField< bool >( row, 2 );
+  disableRestart = exdData->getField< bool >( row, 3 );
+  passEnd = exdData->getField< bool >( row, 4 );
+  disableRestartResetTime = exdData->getField< float >( row, 5 );
+  specialMode = exdData->getField< uint8_t >( row, 6 );
 }
 
 Sapphire::Data::BGMFade::BGMFade( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
 {
   auto row = exdData->m_BGMFadeDat.get_row( row_id );
+  sceneOut = exdData->getField< int32_t >( row, 0 );
+  sceneIn = exdData->getField< int32_t >( row, 1 );
   bGMFadeType = exdData->getField< int32_t >( row, 2 );
 }
 
+Sapphire::Data::BGMFadeType::BGMFadeType( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
+{
+  auto row = exdData->m_BGMFadeTypeDat.get_row( row_id );
+  fadeOutTime = exdData->getField< float >( row, 0 );
+  fadeInTime = exdData->getField< float >( row, 1 );
+  fadeInStartTime = exdData->getField< float >( row, 2 );
+  resumeFadeInTime = exdData->getField< float >( row, 3 );
+}
+
+Sapphire::Data::BGMScene::BGMScene( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
+{
+  auto row = exdData->m_BGMSceneDat.get_row( row_id );
+  enableDisableRestart = exdData->getField< bool >( row, 0 );
+  resume = exdData->getField< bool >( row, 1 );
+  enablePassEnd = exdData->getField< bool >( row, 2 );
+  forceAutoReset = exdData->getField< bool >( row, 3 );
+  ignoreBattle = exdData->getField< bool >( row, 4 );
+}
+
 Sapphire::Data::BGMSituation::BGMSituation( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
 {
   auto row = exdData->m_BGMSituationDat.get_row( row_id );
-  bGMDay = exdData->getField< uint16_t >( row, 0 );
-  bGMNight = exdData->getField< uint16_t >( row, 1 );
-  bGMBattle = exdData->getField< uint16_t >( row, 2 );
-  bGMField = exdData->getField< uint16_t >( row, 3 );
+  daytimeID = exdData->getField< uint16_t >( row, 0 );
+  nightID = exdData->getField< uint16_t >( row, 1 );
+  battleID = exdData->getField< uint16_t >( row, 2 );
+  daybreakID = exdData->getField< uint16_t >( row, 3 );
+  twilightID = exdData->getField< uint16_t >( row, 4 );
 }
 
 Sapphire::Data::BGMSwitch::BGMSwitch( uint32_t row_id, uint32_t subRow, Sapphire::Data::ExdDataGenerated* exdData )
@@ -749,13 +903,19 @@ Sapphire::Data::BNpcBase::BNpcBase( uint32_t row_id, Sapphire::Data::ExdDataGene
 {
   auto row = exdData->m_BNpcBaseDat.get_row( row_id );
   behavior = exdData->getField< uint16_t >( row, 0 );
-  actionTimelineMove = exdData->getField< uint8_t >( row, 1 );
+  battalion = exdData->getField< uint8_t >( row, 1 );
+  linkRace = exdData->getField< uint8_t >( row, 2 );
+  rank = exdData->getField< uint8_t >( row, 3 );
   scale = exdData->getField< float >( row, 4 );
   modelChara = exdData->getField< uint16_t >( row, 5 );
   bNpcCustomize = exdData->getField< uint16_t >( row, 6 );
   npcEquip = exdData->getField< uint16_t >( row, 7 );
+  special = exdData->getField< uint16_t >( row, 8 );
+  sEPack = exdData->getField< uint8_t >( row, 9 );
   arrayEventHandler = exdData->getField< int32_t >( row, 11 );
   bNpcParts = exdData->getField< uint8_t >( row, 12 );
+  isTargetLine = exdData->getField< bool >( row, 14 );
+  isDisplayLevel = exdData->getField< bool >( row, 15 );
 }
 
 Sapphire::Data::BNpcCustomize::BNpcCustomize( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
@@ -836,11 +996,29 @@ Sapphire::Data::BNpcParts::BNpcParts( uint32_t row_id, Sapphire::Data::ExdDataGe
   scale5 = exdData->getField< float >( row, 54 );
 }
 
+Sapphire::Data::BNpcState::BNpcState( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
+{
+  auto row = exdData->m_BNpcStateDat.get_row( row_id );
+  slot = exdData->getField< uint8_t >( row, 0 );
+  overRay = exdData->getField< int8_t >( row, 1 );
+  idle = exdData->getField< uint16_t >( row, 4 );
+  attribute0 = exdData->getField< uint8_t >( row, 5 );
+  attributeFlag0 = exdData->getField< bool >( row, 6 );
+  attribute1 = exdData->getField< uint8_t >( row, 7 );
+  attributeFlag1 = exdData->getField< bool >( row, 8 );
+  attribute2 = exdData->getField< uint8_t >( row, 9 );
+  attributeFlag2 = exdData->getField< bool >( row, 10 );
+  scale = exdData->getField< float >( row, 11 );
+  loopTimeline = exdData->getField< int32_t >( row, 13 );
+}
+
 Sapphire::Data::Buddy::Buddy( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
 {
   auto row = exdData->m_BuddyDat.get_row( row_id );
+  base = exdData->getField< uint8_t >( row, 0 );
   questRequirement2 = exdData->getField< int32_t >( row, 1 );
   questRequirement1 = exdData->getField< int32_t >( row, 2 );
+  baseEquip = exdData->getField< int32_t >( row, 3 );
   soundEffect4 = exdData->getField< std::string >( row, 4 );
   soundEffect3 = exdData->getField< std::string >( row, 5 );
   soundEffect2 = exdData->getField< std::string >( row, 6 );
@@ -854,6 +1032,8 @@ Sapphire::Data::BuddyAction::BuddyAction( uint32_t row_id, Sapphire::Data::ExdDa
   description = exdData->getField< std::string >( row, 1 );
   icon = exdData->getField< int32_t >( row, 2 );
   iconStatus = exdData->getField< int32_t >( row, 3 );
+  reward = exdData->getField< uint16_t >( row, 4 );
+  sort = exdData->getField< uint8_t >( row, 5 );
 }
 
 Sapphire::Data::BuddyEquip::BuddyEquip( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
@@ -880,6 +1060,9 @@ Sapphire::Data::BuddyItem::BuddyItem( uint32_t row_id, Sapphire::Data::ExdDataGe
 {
   auto row = exdData->m_BuddyItemDat.get_row( row_id );
   item = exdData->getField< uint16_t >( row, 0 );
+  useField = exdData->getField< bool >( row, 1 );
+  useTraining = exdData->getField< bool >( row, 2 );
+  status = exdData->getField< uint8_t >( row, 4 );
 }
 
 Sapphire::Data::BuddyRank::BuddyRank( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
@@ -983,6 +1166,33 @@ Sapphire::Data::Calendar::Calendar( uint32_t row_id, Sapphire::Data::ExdDataGene
   day.push_back( exdData->getField< uint8_t >( row, 63 ) );
 }
 
+Sapphire::Data::Carry::Carry( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
+{
+  auto row = exdData->m_CarryDat.get_row( row_id );
+  model = exdData->getField< uint64_t >( row, 0 );
+  timeline = exdData->getField< uint8_t >( row, 1 );
+}
+
+Sapphire::Data::Channeling::Channeling( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
+{
+  auto row = exdData->m_ChannelingDat.get_row( row_id );
+  file = exdData->getField< std::string >( row, 0 );
+  widthScale = exdData->getField< uint8_t >( row, 1 );
+}
+
+Sapphire::Data::CharaMakeClassEquip::CharaMakeClassEquip( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
+{
+  auto row = exdData->m_CharaMakeClassEquipDat.get_row( row_id );
+  helmet = exdData->getField< uint64_t >( row, 0 );
+  top = exdData->getField< uint64_t >( row, 1 );
+  glove = exdData->getField< uint64_t >( row, 2 );
+  down = exdData->getField< uint64_t >( row, 3 );
+  shoes = exdData->getField< uint64_t >( row, 4 );
+  weapon = exdData->getField< uint64_t >( row, 5 );
+  subWeapon = exdData->getField< uint64_t >( row, 6 );
+  _class = exdData->getField< int32_t >( row, 7 );
+}
+
 Sapphire::Data::CharaMakeCustomize::CharaMakeCustomize( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
 {
   auto row = exdData->m_CharaMakeCustomizeDat.get_row( row_id );
@@ -990,6 +1200,8 @@ Sapphire::Data::CharaMakeCustomize::CharaMakeCustomize( uint32_t row_id, Sapphir
   icon = exdData->getField< uint32_t >( row, 1 );
   data = exdData->getField< uint16_t >( row, 2 );
   isPurchasable = exdData->getField< bool >( row, 3 );
+  hint = exdData->getField< uint32_t >( row, 4 );
+  hintItem = exdData->getField< uint32_t >( row, 5 );
 }
 
 Sapphire::Data::CharaMakeType::CharaMakeType( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
@@ -998,62 +1210,270 @@ Sapphire::Data::CharaMakeType::CharaMakeType( uint32_t row_id, Sapphire::Data::E
   race = exdData->getField< int32_t >( row, 0 );
   tribe = exdData->getField< int32_t >( row, 1 );
   gender = exdData->getField< int8_t >( row, 2 );
-  facialFeatureIcon.push_back( exdData->getField< int32_t >( row, 3291 ) );
-  facialFeatureIcon.push_back( exdData->getField< int32_t >( row, 3292 ) );
-  facialFeatureIcon.push_back( exdData->getField< int32_t >( row, 3293 ) );
-  facialFeatureIcon.push_back( exdData->getField< int32_t >( row, 3294 ) );
-  facialFeatureIcon.push_back( exdData->getField< int32_t >( row, 3295 ) );
-  facialFeatureIcon.push_back( exdData->getField< int32_t >( row, 3296 ) );
-  facialFeatureIcon.push_back( exdData->getField< int32_t >( row, 3297 ) );
-  facialFeatureIcon.push_back( exdData->getField< int32_t >( row, 3298 ) );
-  facialFeatureIcon.push_back( exdData->getField< int32_t >( row, 3299 ) );
-  facialFeatureIcon.push_back( exdData->getField< int32_t >( row, 3300 ) );
-  facialFeatureIcon.push_back( exdData->getField< int32_t >( row, 3301 ) );
-  facialFeatureIcon.push_back( exdData->getField< int32_t >( row, 3302 ) );
-  facialFeatureIcon.push_back( exdData->getField< int32_t >( row, 3303 ) );
-  facialFeatureIcon.push_back( exdData->getField< int32_t >( row, 3304 ) );
-  facialFeatureIcon.push_back( exdData->getField< int32_t >( row, 3305 ) );
-  facialFeatureIcon.push_back( exdData->getField< int32_t >( row, 3306 ) );
-  facialFeatureIcon.push_back( exdData->getField< int32_t >( row, 3307 ) );
-  facialFeatureIcon.push_back( exdData->getField< int32_t >( row, 3308 ) );
-  facialFeatureIcon.push_back( exdData->getField< int32_t >( row, 3309 ) );
-  facialFeatureIcon.push_back( exdData->getField< int32_t >( row, 3310 ) );
-  facialFeatureIcon.push_back( exdData->getField< int32_t >( row, 3311 ) );
-  facialFeatureIcon.push_back( exdData->getField< int32_t >( row, 3312 ) );
-  facialFeatureIcon.push_back( exdData->getField< int32_t >( row, 3313 ) );
-  facialFeatureIcon.push_back( exdData->getField< int32_t >( row, 3314 ) );
-  facialFeatureIcon.push_back( exdData->getField< int32_t >( row, 3315 ) );
-  facialFeatureIcon.push_back( exdData->getField< int32_t >( row, 3316 ) );
-  facialFeatureIcon.push_back( exdData->getField< int32_t >( row, 3317 ) );
-  facialFeatureIcon.push_back( exdData->getField< int32_t >( row, 3318 ) );
-  facialFeatureIcon.push_back( exdData->getField< int32_t >( row, 3319 ) );
-  facialFeatureIcon.push_back( exdData->getField< int32_t >( row, 3320 ) );
-  facialFeatureIcon.push_back( exdData->getField< int32_t >( row, 3321 ) );
-  facialFeatureIcon.push_back( exdData->getField< int32_t >( row, 3322 ) );
-  facialFeatureIcon.push_back( exdData->getField< int32_t >( row, 3323 ) );
-  facialFeatureIcon.push_back( exdData->getField< int32_t >( row, 3324 ) );
-  facialFeatureIcon.push_back( exdData->getField< int32_t >( row, 3325 ) );
-  facialFeatureIcon.push_back( exdData->getField< int32_t >( row, 3326 ) );
-  facialFeatureIcon.push_back( exdData->getField< int32_t >( row, 3327 ) );
-  facialFeatureIcon.push_back( exdData->getField< int32_t >( row, 3328 ) );
-  facialFeatureIcon.push_back( exdData->getField< int32_t >( row, 3329 ) );
-  facialFeatureIcon.push_back( exdData->getField< int32_t >( row, 3330 ) );
-  facialFeatureIcon.push_back( exdData->getField< int32_t >( row, 3331 ) );
-  facialFeatureIcon.push_back( exdData->getField< int32_t >( row, 3332 ) );
-  facialFeatureIcon.push_back( exdData->getField< int32_t >( row, 3333 ) );
-  facialFeatureIcon.push_back( exdData->getField< int32_t >( row, 3334 ) );
-  facialFeatureIcon.push_back( exdData->getField< int32_t >( row, 3335 ) );
-  facialFeatureIcon.push_back( exdData->getField< int32_t >( row, 3336 ) );
-  facialFeatureIcon.push_back( exdData->getField< int32_t >( row, 3337 ) );
-  facialFeatureIcon.push_back( exdData->getField< int32_t >( row, 3338 ) );
-  facialFeatureIcon.push_back( exdData->getField< int32_t >( row, 3339 ) );
-  facialFeatureIcon.push_back( exdData->getField< int32_t >( row, 3340 ) );
-  facialFeatureIcon.push_back( exdData->getField< int32_t >( row, 3341 ) );
-  facialFeatureIcon.push_back( exdData->getField< int32_t >( row, 3342 ) );
-  facialFeatureIcon.push_back( exdData->getField< int32_t >( row, 3343 ) );
-  facialFeatureIcon.push_back( exdData->getField< int32_t >( row, 3344 ) );
-  facialFeatureIcon.push_back( exdData->getField< int32_t >( row, 3345 ) );
-  facialFeatureIcon.push_back( exdData->getField< int32_t >( row, 3346 ) );
+  menu.push_back( exdData->getField< uint32_t >( row, 3 ) );
+  menu.push_back( exdData->getField< uint32_t >( row, 4 ) );
+  menu.push_back( exdData->getField< uint32_t >( row, 5 ) );
+  menu.push_back( exdData->getField< uint32_t >( row, 6 ) );
+  menu.push_back( exdData->getField< uint32_t >( row, 7 ) );
+  menu.push_back( exdData->getField< uint32_t >( row, 8 ) );
+  menu.push_back( exdData->getField< uint32_t >( row, 9 ) );
+  menu.push_back( exdData->getField< uint32_t >( row, 10 ) );
+  menu.push_back( exdData->getField< uint32_t >( row, 11 ) );
+  menu.push_back( exdData->getField< uint32_t >( row, 12 ) );
+  menu.push_back( exdData->getField< uint32_t >( row, 13 ) );
+  menu.push_back( exdData->getField< uint32_t >( row, 14 ) );
+  menu.push_back( exdData->getField< uint32_t >( row, 15 ) );
+  menu.push_back( exdData->getField< uint32_t >( row, 16 ) );
+  menu.push_back( exdData->getField< uint32_t >( row, 17 ) );
+  menu.push_back( exdData->getField< uint32_t >( row, 18 ) );
+  menu.push_back( exdData->getField< uint32_t >( row, 19 ) );
+  menu.push_back( exdData->getField< uint32_t >( row, 20 ) );
+  menu.push_back( exdData->getField< uint32_t >( row, 21 ) );
+  menu.push_back( exdData->getField< uint32_t >( row, 22 ) );
+  menu.push_back( exdData->getField< uint32_t >( row, 23 ) );
+  menu.push_back( exdData->getField< uint32_t >( row, 24 ) );
+  menu.push_back( exdData->getField< uint32_t >( row, 25 ) );
+  menu.push_back( exdData->getField< uint32_t >( row, 26 ) );
+  menu.push_back( exdData->getField< uint32_t >( row, 27 ) );
+  menu.push_back( exdData->getField< uint32_t >( row, 28 ) );
+  menu.push_back( exdData->getField< uint32_t >( row, 29 ) );
+  menu.push_back( exdData->getField< uint32_t >( row, 30 ) );
+  initVal.push_back( exdData->getField< uint8_t >( row, 31 ) );
+  initVal.push_back( exdData->getField< uint8_t >( row, 32 ) );
+  initVal.push_back( exdData->getField< uint8_t >( row, 33 ) );
+  initVal.push_back( exdData->getField< uint8_t >( row, 34 ) );
+  initVal.push_back( exdData->getField< uint8_t >( row, 35 ) );
+  initVal.push_back( exdData->getField< uint8_t >( row, 36 ) );
+  initVal.push_back( exdData->getField< uint8_t >( row, 37 ) );
+  initVal.push_back( exdData->getField< uint8_t >( row, 38 ) );
+  initVal.push_back( exdData->getField< uint8_t >( row, 39 ) );
+  initVal.push_back( exdData->getField< uint8_t >( row, 40 ) );
+  initVal.push_back( exdData->getField< uint8_t >( row, 41 ) );
+  initVal.push_back( exdData->getField< uint8_t >( row, 42 ) );
+  initVal.push_back( exdData->getField< uint8_t >( row, 43 ) );
+  initVal.push_back( exdData->getField< uint8_t >( row, 44 ) );
+  initVal.push_back( exdData->getField< uint8_t >( row, 45 ) );
+  initVal.push_back( exdData->getField< uint8_t >( row, 46 ) );
+  initVal.push_back( exdData->getField< uint8_t >( row, 47 ) );
+  initVal.push_back( exdData->getField< uint8_t >( row, 48 ) );
+  initVal.push_back( exdData->getField< uint8_t >( row, 49 ) );
+  initVal.push_back( exdData->getField< uint8_t >( row, 50 ) );
+  initVal.push_back( exdData->getField< uint8_t >( row, 51 ) );
+  initVal.push_back( exdData->getField< uint8_t >( row, 52 ) );
+  initVal.push_back( exdData->getField< uint8_t >( row, 53 ) );
+  initVal.push_back( exdData->getField< uint8_t >( row, 54 ) );
+  initVal.push_back( exdData->getField< uint8_t >( row, 55 ) );
+  initVal.push_back( exdData->getField< uint8_t >( row, 56 ) );
+  initVal.push_back( exdData->getField< uint8_t >( row, 57 ) );
+  initVal.push_back( exdData->getField< uint8_t >( row, 58 ) );
+  subMenuType.push_back( exdData->getField< uint8_t >( row, 59 ) );
+  subMenuType.push_back( exdData->getField< uint8_t >( row, 60 ) );
+  subMenuType.push_back( exdData->getField< uint8_t >( row, 61 ) );
+  subMenuType.push_back( exdData->getField< uint8_t >( row, 62 ) );
+  subMenuType.push_back( exdData->getField< uint8_t >( row, 63 ) );
+  subMenuType.push_back( exdData->getField< uint8_t >( row, 64 ) );
+  subMenuType.push_back( exdData->getField< uint8_t >( row, 65 ) );
+  subMenuType.push_back( exdData->getField< uint8_t >( row, 66 ) );
+  subMenuType.push_back( exdData->getField< uint8_t >( row, 67 ) );
+  subMenuType.push_back( exdData->getField< uint8_t >( row, 68 ) );
+  subMenuType.push_back( exdData->getField< uint8_t >( row, 69 ) );
+  subMenuType.push_back( exdData->getField< uint8_t >( row, 70 ) );
+  subMenuType.push_back( exdData->getField< uint8_t >( row, 71 ) );
+  subMenuType.push_back( exdData->getField< uint8_t >( row, 72 ) );
+  subMenuType.push_back( exdData->getField< uint8_t >( row, 73 ) );
+  subMenuType.push_back( exdData->getField< uint8_t >( row, 74 ) );
+  subMenuType.push_back( exdData->getField< uint8_t >( row, 75 ) );
+  subMenuType.push_back( exdData->getField< uint8_t >( row, 76 ) );
+  subMenuType.push_back( exdData->getField< uint8_t >( row, 77 ) );
+  subMenuType.push_back( exdData->getField< uint8_t >( row, 78 ) );
+  subMenuType.push_back( exdData->getField< uint8_t >( row, 79 ) );
+  subMenuType.push_back( exdData->getField< uint8_t >( row, 80 ) );
+  subMenuType.push_back( exdData->getField< uint8_t >( row, 81 ) );
+  subMenuType.push_back( exdData->getField< uint8_t >( row, 82 ) );
+  subMenuType.push_back( exdData->getField< uint8_t >( row, 83 ) );
+  subMenuType.push_back( exdData->getField< uint8_t >( row, 84 ) );
+  subMenuType.push_back( exdData->getField< uint8_t >( row, 85 ) );
+  subMenuType.push_back( exdData->getField< uint8_t >( row, 86 ) );
+  subMenuNum.push_back( exdData->getField< uint8_t >( row, 87 ) );
+  subMenuNum.push_back( exdData->getField< uint8_t >( row, 88 ) );
+  subMenuNum.push_back( exdData->getField< uint8_t >( row, 89 ) );
+  subMenuNum.push_back( exdData->getField< uint8_t >( row, 90 ) );
+  subMenuNum.push_back( exdData->getField< uint8_t >( row, 91 ) );
+  subMenuNum.push_back( exdData->getField< uint8_t >( row, 92 ) );
+  subMenuNum.push_back( exdData->getField< uint8_t >( row, 93 ) );
+  subMenuNum.push_back( exdData->getField< uint8_t >( row, 94 ) );
+  subMenuNum.push_back( exdData->getField< uint8_t >( row, 95 ) );
+  subMenuNum.push_back( exdData->getField< uint8_t >( row, 96 ) );
+  subMenuNum.push_back( exdData->getField< uint8_t >( row, 97 ) );
+  subMenuNum.push_back( exdData->getField< uint8_t >( row, 98 ) );
+  subMenuNum.push_back( exdData->getField< uint8_t >( row, 99 ) );
+  subMenuNum.push_back( exdData->getField< uint8_t >( row, 100 ) );
+  subMenuNum.push_back( exdData->getField< uint8_t >( row, 101 ) );
+  subMenuNum.push_back( exdData->getField< uint8_t >( row, 102 ) );
+  subMenuNum.push_back( exdData->getField< uint8_t >( row, 103 ) );
+  subMenuNum.push_back( exdData->getField< uint8_t >( row, 104 ) );
+  subMenuNum.push_back( exdData->getField< uint8_t >( row, 105 ) );
+  subMenuNum.push_back( exdData->getField< uint8_t >( row, 106 ) );
+  subMenuNum.push_back( exdData->getField< uint8_t >( row, 107 ) );
+  subMenuNum.push_back( exdData->getField< uint8_t >( row, 108 ) );
+  subMenuNum.push_back( exdData->getField< uint8_t >( row, 109 ) );
+  subMenuNum.push_back( exdData->getField< uint8_t >( row, 110 ) );
+  subMenuNum.push_back( exdData->getField< uint8_t >( row, 111 ) );
+  subMenuNum.push_back( exdData->getField< uint8_t >( row, 112 ) );
+  subMenuNum.push_back( exdData->getField< uint8_t >( row, 113 ) );
+  subMenuNum.push_back( exdData->getField< uint8_t >( row, 114 ) );
+  lookAt.push_back( exdData->getField< uint8_t >( row, 115 ) );
+  lookAt.push_back( exdData->getField< uint8_t >( row, 116 ) );
+  lookAt.push_back( exdData->getField< uint8_t >( row, 117 ) );
+  lookAt.push_back( exdData->getField< uint8_t >( row, 118 ) );
+  lookAt.push_back( exdData->getField< uint8_t >( row, 119 ) );
+  lookAt.push_back( exdData->getField< uint8_t >( row, 120 ) );
+  lookAt.push_back( exdData->getField< uint8_t >( row, 121 ) );
+  lookAt.push_back( exdData->getField< uint8_t >( row, 122 ) );
+  lookAt.push_back( exdData->getField< uint8_t >( row, 123 ) );
+  lookAt.push_back( exdData->getField< uint8_t >( row, 124 ) );
+  lookAt.push_back( exdData->getField< uint8_t >( row, 125 ) );
+  lookAt.push_back( exdData->getField< uint8_t >( row, 126 ) );
+  lookAt.push_back( exdData->getField< uint8_t >( row, 127 ) );
+  lookAt.push_back( exdData->getField< uint8_t >( row, 128 ) );
+  lookAt.push_back( exdData->getField< uint8_t >( row, 129 ) );
+  lookAt.push_back( exdData->getField< uint8_t >( row, 130 ) );
+  lookAt.push_back( exdData->getField< uint8_t >( row, 131 ) );
+  lookAt.push_back( exdData->getField< uint8_t >( row, 132 ) );
+  lookAt.push_back( exdData->getField< uint8_t >( row, 133 ) );
+  lookAt.push_back( exdData->getField< uint8_t >( row, 134 ) );
+  lookAt.push_back( exdData->getField< uint8_t >( row, 135 ) );
+  lookAt.push_back( exdData->getField< uint8_t >( row, 136 ) );
+  lookAt.push_back( exdData->getField< uint8_t >( row, 137 ) );
+  lookAt.push_back( exdData->getField< uint8_t >( row, 138 ) );
+  lookAt.push_back( exdData->getField< uint8_t >( row, 139 ) );
+  lookAt.push_back( exdData->getField< uint8_t >( row, 140 ) );
+  lookAt.push_back( exdData->getField< uint8_t >( row, 141 ) );
+  lookAt.push_back( exdData->getField< uint8_t >( row, 142 ) );
+  subMenuMask.push_back( exdData->getField< uint32_t >( row, 143 ) );
+  subMenuMask.push_back( exdData->getField< uint32_t >( row, 144 ) );
+  subMenuMask.push_back( exdData->getField< uint32_t >( row, 145 ) );
+  subMenuMask.push_back( exdData->getField< uint32_t >( row, 146 ) );
+  subMenuMask.push_back( exdData->getField< uint32_t >( row, 147 ) );
+  subMenuMask.push_back( exdData->getField< uint32_t >( row, 148 ) );
+  subMenuMask.push_back( exdData->getField< uint32_t >( row, 149 ) );
+  subMenuMask.push_back( exdData->getField< uint32_t >( row, 150 ) );
+  subMenuMask.push_back( exdData->getField< uint32_t >( row, 151 ) );
+  subMenuMask.push_back( exdData->getField< uint32_t >( row, 152 ) );
+  subMenuMask.push_back( exdData->getField< uint32_t >( row, 153 ) );
+  subMenuMask.push_back( exdData->getField< uint32_t >( row, 154 ) );
+  subMenuMask.push_back( exdData->getField< uint32_t >( row, 155 ) );
+  subMenuMask.push_back( exdData->getField< uint32_t >( row, 156 ) );
+  subMenuMask.push_back( exdData->getField< uint32_t >( row, 157 ) );
+  subMenuMask.push_back( exdData->getField< uint32_t >( row, 158 ) );
+  subMenuMask.push_back( exdData->getField< uint32_t >( row, 159 ) );
+  subMenuMask.push_back( exdData->getField< uint32_t >( row, 160 ) );
+  subMenuMask.push_back( exdData->getField< uint32_t >( row, 161 ) );
+  subMenuMask.push_back( exdData->getField< uint32_t >( row, 162 ) );
+  subMenuMask.push_back( exdData->getField< uint32_t >( row, 163 ) );
+  subMenuMask.push_back( exdData->getField< uint32_t >( row, 164 ) );
+  subMenuMask.push_back( exdData->getField< uint32_t >( row, 165 ) );
+  subMenuMask.push_back( exdData->getField< uint32_t >( row, 166 ) );
+  subMenuMask.push_back( exdData->getField< uint32_t >( row, 167 ) );
+  subMenuMask.push_back( exdData->getField< uint32_t >( row, 168 ) );
+  subMenuMask.push_back( exdData->getField< uint32_t >( row, 169 ) );
+  subMenuMask.push_back( exdData->getField< uint32_t >( row, 170 ) );
+  customize.push_back( exdData->getField< uint32_t >( row, 171 ) );
+  customize.push_back( exdData->getField< uint32_t >( row, 172 ) );
+  customize.push_back( exdData->getField< uint32_t >( row, 173 ) );
+  customize.push_back( exdData->getField< uint32_t >( row, 174 ) );
+  customize.push_back( exdData->getField< uint32_t >( row, 175 ) );
+  customize.push_back( exdData->getField< uint32_t >( row, 176 ) );
+  customize.push_back( exdData->getField< uint32_t >( row, 177 ) );
+  customize.push_back( exdData->getField< uint32_t >( row, 178 ) );
+  customize.push_back( exdData->getField< uint32_t >( row, 179 ) );
+  customize.push_back( exdData->getField< uint32_t >( row, 180 ) );
+  customize.push_back( exdData->getField< uint32_t >( row, 181 ) );
+  customize.push_back( exdData->getField< uint32_t >( row, 182 ) );
+  customize.push_back( exdData->getField< uint32_t >( row, 183 ) );
+  customize.push_back( exdData->getField< uint32_t >( row, 184 ) );
+  customize.push_back( exdData->getField< uint32_t >( row, 185 ) );
+  customize.push_back( exdData->getField< uint32_t >( row, 186 ) );
+  customize.push_back( exdData->getField< uint32_t >( row, 187 ) );
+  customize.push_back( exdData->getField< uint32_t >( row, 188 ) );
+  customize.push_back( exdData->getField< uint32_t >( row, 189 ) );
+  customize.push_back( exdData->getField< uint32_t >( row, 190 ) );
+  customize.push_back( exdData->getField< uint32_t >( row, 191 ) );
+  customize.push_back( exdData->getField< uint32_t >( row, 192 ) );
+  customize.push_back( exdData->getField< uint32_t >( row, 193 ) );
+  customize.push_back( exdData->getField< uint32_t >( row, 194 ) );
+  customize.push_back( exdData->getField< uint32_t >( row, 195 ) );
+  customize.push_back( exdData->getField< uint32_t >( row, 196 ) );
+  customize.push_back( exdData->getField< uint32_t >( row, 197 ) );
+  customize.push_back( exdData->getField< uint32_t >( row, 198 ) );
+  voiceStruct.push_back( exdData->getField< uint8_t >( row, 3279 ) );
+  voiceStruct.push_back( exdData->getField< uint8_t >( row, 3280 ) );
+  voiceStruct.push_back( exdData->getField< uint8_t >( row, 3281 ) );
+  voiceStruct.push_back( exdData->getField< uint8_t >( row, 3282 ) );
+  voiceStruct.push_back( exdData->getField< uint8_t >( row, 3283 ) );
+  voiceStruct.push_back( exdData->getField< uint8_t >( row, 3284 ) );
+  voiceStruct.push_back( exdData->getField< uint8_t >( row, 3285 ) );
+  voiceStruct.push_back( exdData->getField< uint8_t >( row, 3286 ) );
+  voiceStruct.push_back( exdData->getField< uint8_t >( row, 3287 ) );
+  voiceStruct.push_back( exdData->getField< uint8_t >( row, 3288 ) );
+  voiceStruct.push_back( exdData->getField< uint8_t >( row, 3289 ) );
+  voiceStruct.push_back( exdData->getField< uint8_t >( row, 3290 ) );
+  facialFeatureOption.push_back( exdData->getField< int32_t >( row, 3291 ) );
+  facialFeatureOption.push_back( exdData->getField< int32_t >( row, 3292 ) );
+  facialFeatureOption.push_back( exdData->getField< int32_t >( row, 3293 ) );
+  facialFeatureOption.push_back( exdData->getField< int32_t >( row, 3294 ) );
+  facialFeatureOption.push_back( exdData->getField< int32_t >( row, 3295 ) );
+  facialFeatureOption.push_back( exdData->getField< int32_t >( row, 3296 ) );
+  facialFeatureOption.push_back( exdData->getField< int32_t >( row, 3297 ) );
+  facialFeatureOption.push_back( exdData->getField< int32_t >( row, 3298 ) );
+  facialFeatureOption.push_back( exdData->getField< int32_t >( row, 3299 ) );
+  facialFeatureOption.push_back( exdData->getField< int32_t >( row, 3300 ) );
+  facialFeatureOption.push_back( exdData->getField< int32_t >( row, 3301 ) );
+  facialFeatureOption.push_back( exdData->getField< int32_t >( row, 3302 ) );
+  facialFeatureOption.push_back( exdData->getField< int32_t >( row, 3303 ) );
+  facialFeatureOption.push_back( exdData->getField< int32_t >( row, 3304 ) );
+  facialFeatureOption.push_back( exdData->getField< int32_t >( row, 3305 ) );
+  facialFeatureOption.push_back( exdData->getField< int32_t >( row, 3306 ) );
+  facialFeatureOption.push_back( exdData->getField< int32_t >( row, 3307 ) );
+  facialFeatureOption.push_back( exdData->getField< int32_t >( row, 3308 ) );
+  facialFeatureOption.push_back( exdData->getField< int32_t >( row, 3309 ) );
+  facialFeatureOption.push_back( exdData->getField< int32_t >( row, 3310 ) );
+  facialFeatureOption.push_back( exdData->getField< int32_t >( row, 3311 ) );
+  facialFeatureOption.push_back( exdData->getField< int32_t >( row, 3312 ) );
+  facialFeatureOption.push_back( exdData->getField< int32_t >( row, 3313 ) );
+  facialFeatureOption.push_back( exdData->getField< int32_t >( row, 3314 ) );
+  facialFeatureOption.push_back( exdData->getField< int32_t >( row, 3315 ) );
+  facialFeatureOption.push_back( exdData->getField< int32_t >( row, 3316 ) );
+  facialFeatureOption.push_back( exdData->getField< int32_t >( row, 3317 ) );
+  facialFeatureOption.push_back( exdData->getField< int32_t >( row, 3318 ) );
+  facialFeatureOption.push_back( exdData->getField< int32_t >( row, 3319 ) );
+  facialFeatureOption.push_back( exdData->getField< int32_t >( row, 3320 ) );
+  facialFeatureOption.push_back( exdData->getField< int32_t >( row, 3321 ) );
+  facialFeatureOption.push_back( exdData->getField< int32_t >( row, 3322 ) );
+  facialFeatureOption.push_back( exdData->getField< int32_t >( row, 3323 ) );
+  facialFeatureOption.push_back( exdData->getField< int32_t >( row, 3324 ) );
+  facialFeatureOption.push_back( exdData->getField< int32_t >( row, 3325 ) );
+  facialFeatureOption.push_back( exdData->getField< int32_t >( row, 3326 ) );
+  facialFeatureOption.push_back( exdData->getField< int32_t >( row, 3327 ) );
+  facialFeatureOption.push_back( exdData->getField< int32_t >( row, 3328 ) );
+  facialFeatureOption.push_back( exdData->getField< int32_t >( row, 3329 ) );
+  facialFeatureOption.push_back( exdData->getField< int32_t >( row, 3330 ) );
+  facialFeatureOption.push_back( exdData->getField< int32_t >( row, 3331 ) );
+  facialFeatureOption.push_back( exdData->getField< int32_t >( row, 3332 ) );
+  facialFeatureOption.push_back( exdData->getField< int32_t >( row, 3333 ) );
+  facialFeatureOption.push_back( exdData->getField< int32_t >( row, 3334 ) );
+  facialFeatureOption.push_back( exdData->getField< int32_t >( row, 3335 ) );
+  facialFeatureOption.push_back( exdData->getField< int32_t >( row, 3336 ) );
+  facialFeatureOption.push_back( exdData->getField< int32_t >( row, 3337 ) );
+  facialFeatureOption.push_back( exdData->getField< int32_t >( row, 3338 ) );
+  facialFeatureOption.push_back( exdData->getField< int32_t >( row, 3339 ) );
+  facialFeatureOption.push_back( exdData->getField< int32_t >( row, 3340 ) );
+  facialFeatureOption.push_back( exdData->getField< int32_t >( row, 3341 ) );
+  facialFeatureOption.push_back( exdData->getField< int32_t >( row, 3342 ) );
+  facialFeatureOption.push_back( exdData->getField< int32_t >( row, 3343 ) );
+  facialFeatureOption.push_back( exdData->getField< int32_t >( row, 3344 ) );
+  facialFeatureOption.push_back( exdData->getField< int32_t >( row, 3345 ) );
+  facialFeatureOption.push_back( exdData->getField< int32_t >( row, 3346 ) );
 }
 
 Sapphire::Data::ChocoboRace::ChocoboRace( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
@@ -1134,6 +1554,8 @@ Sapphire::Data::ChocoboTaxi::ChocoboTaxi( uint32_t row_id, Sapphire::Data::ExdDa
 {
   auto row = exdData->m_ChocoboTaxiDat.get_row( row_id );
   location = exdData->getField< uint32_t >( row, 0 );
+  fare = exdData->getField< uint8_t >( row, 1 );
+  timeRequired = exdData->getField< uint16_t >( row, 2 );
 }
 
 Sapphire::Data::ChocoboTaxiStand::ChocoboTaxiStand( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
@@ -1142,6 +1564,14 @@ Sapphire::Data::ChocoboTaxiStand::ChocoboTaxiStand( uint32_t row_id, Sapphire::D
   placeName = exdData->getField< std::string >( row, 8 );
 }
 
+Sapphire::Data::CircleActivity::CircleActivity( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
+{
+  auto row = exdData->m_CircleActivityDat.get_row( row_id );
+  name = exdData->getField< std::string >( row, 0 );
+  icon = exdData->getField< int32_t >( row, 1 );
+  order = exdData->getField< uint16_t >( row, 2 );
+}
+
 Sapphire::Data::ClassJob::ClassJob( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
 {
   auto row = exdData->m_ClassJobDat.get_row( row_id );
@@ -1149,6 +1579,7 @@ Sapphire::Data::ClassJob::ClassJob( uint32_t row_id, Sapphire::Data::ExdDataGene
   abbreviation = exdData->getField< std::string >( row, 1 );
   classJobCategory = exdData->getField< uint8_t >( row, 3 );
   expArrayIndex = exdData->getField< int8_t >( row, 4 );
+  battleClassIndex = exdData->getField< int8_t >( row, 5 );
   jobIndex = exdData->getField< uint8_t >( row, 7 );
   modifierHitPoints = exdData->getField< uint16_t >( row, 9 );
   modifierManaPoints = exdData->getField< uint16_t >( row, 10 );
@@ -1163,6 +1594,7 @@ Sapphire::Data::ClassJob::ClassJob( uint32_t row_id, Sapphire::Data::ExdDataGene
   itemStartingWeapon = exdData->getField< int32_t >( row, 28 );
   role = exdData->getField< uint8_t >( row, 30 );
   startingTown = exdData->getField< uint8_t >( row, 31 );
+  monsterNote = exdData->getField< int8_t >( row, 32 );
   primaryStat = exdData->getField< uint8_t >( row, 33 );
   limitBreak1 = exdData->getField< uint16_t >( row, 34 );
   limitBreak2 = exdData->getField< uint16_t >( row, 35 );
@@ -1234,7 +1666,22 @@ Sapphire::Data::Companion::Companion( uint32_t row_id, Sapphire::Data::ExdDataGe
   pronoun = exdData->getField< int8_t >( row, 6 );
   article = exdData->getField< int8_t >( row, 7 );
   model = exdData->getField< uint16_t >( row, 8 );
+  scale = exdData->getField< uint8_t >( row, 9 );
+  inactiveIdle0 = exdData->getField< uint8_t >( row, 10 );
+  inactiveIdle1 = exdData->getField< uint8_t >( row, 11 );
+  inactiveBattle = exdData->getField< uint8_t >( row, 12 );
+  inactiveWandering = exdData->getField< uint8_t >( row, 13 );
   behavior = exdData->getField< uint8_t >( row, 14 );
+  special = exdData->getField< uint8_t >( row, 15 );
+  wanderingWait = exdData->getField< uint8_t >( row, 16 );
+  priority = exdData->getField< uint16_t >( row, 17 );
+  roulette = exdData->getField< bool >( row, 18 );
+  battle = exdData->getField< bool >( row, 20 );
+  lookAt = exdData->getField< bool >( row, 21 );
+  poke = exdData->getField< bool >( row, 22 );
+  enemy = exdData->getField< uint16_t >( row, 23 );
+  stroke = exdData->getField< bool >( row, 24 );
+  clapping = exdData->getField< bool >( row, 25 );
   icon = exdData->getField< uint16_t >( row, 26 );
   order = exdData->getField< uint16_t >( row, 27 );
   cost = exdData->getField< uint8_t >( row, 30 );
@@ -1347,15 +1794,88 @@ Sapphire::Data::CompanyCraftType::CompanyCraftType( uint32_t row_id, Sapphire::D
 Sapphire::Data::CompanyLeve::CompanyLeve( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
 {
   auto row = exdData->m_CompanyLeveDat.get_row( row_id );
-  eventItem = exdData->getField< int32_t >( row, 32 );
-  eventItemAmount = exdData->getField< uint8_t >( row, 40 );
-  companyLeveRule = exdData->getField< int32_t >( row, 176 );
+  time.push_back( exdData->getField< uint16_t >( row, 0 ) );
+  time.push_back( exdData->getField< uint16_t >( row, 1 ) );
+  time.push_back( exdData->getField< uint16_t >( row, 2 ) );
+  time.push_back( exdData->getField< uint16_t >( row, 3 ) );
+  time.push_back( exdData->getField< uint16_t >( row, 4 ) );
+  time.push_back( exdData->getField< uint16_t >( row, 5 ) );
+  time.push_back( exdData->getField< uint16_t >( row, 6 ) );
+  time.push_back( exdData->getField< uint16_t >( row, 7 ) );
+  baseID.push_back( exdData->getField< int32_t >( row, 8 ) );
+  baseID.push_back( exdData->getField< int32_t >( row, 9 ) );
+  baseID.push_back( exdData->getField< int32_t >( row, 10 ) );
+  baseID.push_back( exdData->getField< int32_t >( row, 11 ) );
+  baseID.push_back( exdData->getField< int32_t >( row, 12 ) );
+  baseID.push_back( exdData->getField< int32_t >( row, 13 ) );
+  baseID.push_back( exdData->getField< int32_t >( row, 14 ) );
+  baseID.push_back( exdData->getField< int32_t >( row, 15 ) );
+  enemyLevel.push_back( exdData->getField< uint16_t >( row, 16 ) );
+  enemyLevel.push_back( exdData->getField< uint16_t >( row, 17 ) );
+  enemyLevel.push_back( exdData->getField< uint16_t >( row, 18 ) );
+  enemyLevel.push_back( exdData->getField< uint16_t >( row, 19 ) );
+  enemyLevel.push_back( exdData->getField< uint16_t >( row, 20 ) );
+  enemyLevel.push_back( exdData->getField< uint16_t >( row, 21 ) );
+  enemyLevel.push_back( exdData->getField< uint16_t >( row, 22 ) );
+  enemyLevel.push_back( exdData->getField< uint16_t >( row, 23 ) );
+  bNpcName.push_back( exdData->getField< uint32_t >( row, 24 ) );
+  bNpcName.push_back( exdData->getField< uint32_t >( row, 25 ) );
+  bNpcName.push_back( exdData->getField< uint32_t >( row, 26 ) );
+  bNpcName.push_back( exdData->getField< uint32_t >( row, 27 ) );
+  bNpcName.push_back( exdData->getField< uint32_t >( row, 28 ) );
+  bNpcName.push_back( exdData->getField< uint32_t >( row, 29 ) );
+  bNpcName.push_back( exdData->getField< uint32_t >( row, 30 ) );
+  bNpcName.push_back( exdData->getField< uint32_t >( row, 31 ) );
+  itemsInvolved.push_back( exdData->getField< int32_t >( row, 32 ) );
+  itemsInvolved.push_back( exdData->getField< int32_t >( row, 33 ) );
+  itemsInvolved.push_back( exdData->getField< int32_t >( row, 34 ) );
+  itemsInvolved.push_back( exdData->getField< int32_t >( row, 35 ) );
+  itemsInvolved.push_back( exdData->getField< int32_t >( row, 36 ) );
+  itemsInvolved.push_back( exdData->getField< int32_t >( row, 37 ) );
+  itemsInvolved.push_back( exdData->getField< int32_t >( row, 38 ) );
+  itemsInvolved.push_back( exdData->getField< int32_t >( row, 39 ) );
+  itemsInvolvedQty.push_back( exdData->getField< uint8_t >( row, 40 ) );
+  itemsInvolvedQty.push_back( exdData->getField< uint8_t >( row, 41 ) );
+  itemsInvolvedQty.push_back( exdData->getField< uint8_t >( row, 42 ) );
+  itemsInvolvedQty.push_back( exdData->getField< uint8_t >( row, 43 ) );
+  itemsInvolvedQty.push_back( exdData->getField< uint8_t >( row, 44 ) );
+  itemsInvolvedQty.push_back( exdData->getField< uint8_t >( row, 45 ) );
+  itemsInvolvedQty.push_back( exdData->getField< uint8_t >( row, 46 ) );
+  itemsInvolvedQty.push_back( exdData->getField< uint8_t >( row, 47 ) );
+  itemDropRate.push_back( exdData->getField< uint8_t >( row, 48 ) );
+  itemDropRate.push_back( exdData->getField< uint8_t >( row, 49 ) );
+  itemDropRate.push_back( exdData->getField< uint8_t >( row, 50 ) );
+  itemDropRate.push_back( exdData->getField< uint8_t >( row, 51 ) );
+  itemDropRate.push_back( exdData->getField< uint8_t >( row, 52 ) );
+  itemDropRate.push_back( exdData->getField< uint8_t >( row, 53 ) );
+  itemDropRate.push_back( exdData->getField< uint8_t >( row, 54 ) );
+  itemDropRate.push_back( exdData->getField< uint8_t >( row, 55 ) );
+  toDoNumberInvolved.push_back( exdData->getField< uint32_t >( row, 56 ) );
+  toDoNumberInvolved.push_back( exdData->getField< uint32_t >( row, 57 ) );
+  toDoNumberInvolved.push_back( exdData->getField< uint32_t >( row, 58 ) );
+  toDoNumberInvolved.push_back( exdData->getField< uint32_t >( row, 59 ) );
+  toDoNumberInvolved.push_back( exdData->getField< uint32_t >( row, 60 ) );
+  toDoNumberInvolved.push_back( exdData->getField< uint32_t >( row, 61 ) );
+  toDoNumberInvolved.push_back( exdData->getField< uint32_t >( row, 62 ) );
+  toDoNumberInvolved.push_back( exdData->getField< uint32_t >( row, 63 ) );
+  toDoParam.push_back( exdData->getField< uint32_t >( row, 64 ) );
+  toDoParam.push_back( exdData->getField< uint32_t >( row, 65 ) );
+  toDoParam.push_back( exdData->getField< uint32_t >( row, 66 ) );
+  toDoParam.push_back( exdData->getField< uint32_t >( row, 67 ) );
+  toDoParam.push_back( exdData->getField< uint32_t >( row, 68 ) );
+  toDoParam.push_back( exdData->getField< uint32_t >( row, 69 ) );
+  toDoParam.push_back( exdData->getField< uint32_t >( row, 70 ) );
+  toDoParam.push_back( exdData->getField< uint32_t >( row, 71 ) );
+  rule = exdData->getField< int32_t >( row, 176 );
+  ruleParam = exdData->getField< uint8_t >( row, 177 );
 }
 
 Sapphire::Data::CompanyLeveRule::CompanyLeveRule( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
 {
   auto row = exdData->m_CompanyLeveRuleDat.get_row( row_id );
   type = exdData->getField< std::string >( row, 0 );
+  objective = exdData->getField< uint16_t >( row, 1 );
+  help = exdData->getField< uint16_t >( row, 2 );
 }
 
 Sapphire::Data::CompleteJournal::CompleteJournal( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
@@ -1397,6 +1917,17 @@ Sapphire::Data::CompleteJournalCategory::CompleteJournalCategory( uint32_t row_i
   lastQuest = exdData->getField< uint32_t >( row, 1 );
 }
 
+Sapphire::Data::ConfigKey::ConfigKey( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
+{
+  auto row = exdData->m_ConfigKeyDat.get_row( row_id );
+  label = exdData->getField< std::string >( row, 0 );
+  param = exdData->getField< uint8_t >( row, 1 );
+  platform = exdData->getField< uint8_t >( row, 2 );
+  required = exdData->getField< bool >( row, 3 );
+  category = exdData->getField< uint8_t >( row, 4 );
+  text = exdData->getField< std::string >( row, 7 );
+}
+
 Sapphire::Data::ContentCloseCycle::ContentCloseCycle( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
 {
   auto row = exdData->m_ContentCloseCycleDat.get_row( row_id );
@@ -1414,9 +1945,12 @@ Sapphire::Data::ContentExAction::ContentExAction( uint32_t row_id, Sapphire::Dat
 Sapphire::Data::ContentFinderCondition::ContentFinderCondition( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
 {
   auto row = exdData->m_ContentFinderConditionDat.get_row( row_id );
+  shortCode = exdData->getField< std::string >( row, 0 );
   territoryType = exdData->getField< uint16_t >( row, 1 );
   contentLinkType = exdData->getField< uint8_t >( row, 2 );
   content = exdData->getField< uint16_t >( row, 3 );
+  pvP = exdData->getField< bool >( row, 4 );
+  acceptClassJobCategory = exdData->getField< uint8_t >( row, 8 );
   contentMemberType = exdData->getField< uint8_t >( row, 9 );
   unlockQuest = exdData->getField< uint32_t >( row, 13 );
   classJobLevelRequired = exdData->getField< uint8_t >( row, 15 );
@@ -1427,24 +1961,24 @@ Sapphire::Data::ContentFinderCondition::ContentFinderCondition( uint32_t row_id,
   allowReplacement = exdData->getField< bool >( row, 20 );
   highEndDuty = exdData->getField< bool >( row, 26 );
   dutyRecorderAllowed = exdData->getField< bool >( row, 30 );
-  name = exdData->getField< std::string >( row, 34 );
-  contentType = exdData->getField< uint8_t >( row, 35 );
-  transientKey = exdData->getField< uint8_t >( row, 36 );
-  transient = exdData->getField< uint32_t >( row, 37 );
-  sortKey = exdData->getField< uint16_t >( row, 38 );
-  image = exdData->getField< uint32_t >( row, 39 );
-  icon = exdData->getField< uint32_t >( row, 40 );
-  levelingRoulette = exdData->getField< bool >( row, 42 );
-  level5060Roulette = exdData->getField< bool >( row, 43 );
-  mSQRoulette = exdData->getField< bool >( row, 44 );
-  guildHestRoulette = exdData->getField< bool >( row, 45 );
-  expertRoulette = exdData->getField< bool >( row, 46 );
-  trialRoulette = exdData->getField< bool >( row, 47 );
-  dailyFrontlineChallenge = exdData->getField< bool >( row, 48 );
-  level70Roulette = exdData->getField< bool >( row, 49 );
-  mentorRoulette = exdData->getField< bool >( row, 50 );
-  allianceRoulette = exdData->getField< bool >( row, 56 );
-  normalRaidRoulette = exdData->getField< bool >( row, 58 );
+  name = exdData->getField< std::string >( row, 35 );
+  contentType = exdData->getField< uint8_t >( row, 36 );
+  transientKey = exdData->getField< uint8_t >( row, 37 );
+  transient = exdData->getField< uint32_t >( row, 38 );
+  sortKey = exdData->getField< uint16_t >( row, 39 );
+  image = exdData->getField< uint32_t >( row, 40 );
+  icon = exdData->getField< uint32_t >( row, 41 );
+  levelingRoulette = exdData->getField< bool >( row, 43 );
+  level5060Roulette = exdData->getField< bool >( row, 44 );
+  mSQRoulette = exdData->getField< bool >( row, 45 );
+  guildHestRoulette = exdData->getField< bool >( row, 46 );
+  expertRoulette = exdData->getField< bool >( row, 47 );
+  trialRoulette = exdData->getField< bool >( row, 48 );
+  dailyFrontlineChallenge = exdData->getField< bool >( row, 49 );
+  level70Roulette = exdData->getField< bool >( row, 50 );
+  mentorRoulette = exdData->getField< bool >( row, 51 );
+  allianceRoulette = exdData->getField< bool >( row, 57 );
+  normalRaidRoulette = exdData->getField< bool >( row, 59 );
 }
 
 Sapphire::Data::ContentFinderConditionTransient::ContentFinderConditionTransient( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
@@ -1481,6 +2015,7 @@ Sapphire::Data::ContentMemberType::ContentMemberType( uint32_t row_id, Sapphire:
 Sapphire::Data::ContentNpcTalk::ContentNpcTalk( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
 {
   auto row = exdData->m_ContentNpcTalkDat.get_row( row_id );
+  type = exdData->getField< int32_t >( row, 0 );
   contentTalk.push_back( exdData->getField< uint32_t >( row, 1 ) );
   contentTalk.push_back( exdData->getField< uint32_t >( row, 2 ) );
   contentTalk.push_back( exdData->getField< uint32_t >( row, 3 ) );
@@ -1504,19 +2039,19 @@ Sapphire::Data::ContentRoulette::ContentRoulette( uint32_t row_id, Sapphire::Dat
   description = exdData->getField< std::string >( row, 2 );
   dutyType = exdData->getField< std::string >( row, 3 );
   isInDutyFinder = exdData->getField< bool >( row, 6 );
-  openRule = exdData->getField< uint8_t >( row, 7 );
-  requiredLevel = exdData->getField< uint8_t >( row, 9 );
-  itemLevelRequired = exdData->getField< uint16_t >( row, 11 );
-  icon = exdData->getField< uint32_t >( row, 13 );
-  contentRouletteRoleBonus = exdData->getField< uint8_t >( row, 14 );
-  rewardTomeA = exdData->getField< uint16_t >( row, 15 );
+  openRule = exdData->getField< bool >( row, 7 );
+  requiredLevel = exdData->getField< bool >( row, 9 );
+  itemLevelRequired = exdData->getField< uint8_t >( row, 11 );
+  icon = exdData->getField< uint16_t >( row, 13 );
+  contentRouletteRoleBonus = exdData->getField< uint32_t >( row, 14 );
+  rewardTomeA = exdData->getField< uint8_t >( row, 15 );
   rewardTomeB = exdData->getField< uint16_t >( row, 16 );
   rewardTomeC = exdData->getField< uint16_t >( row, 17 );
-  sortKey = exdData->getField< uint8_t >( row, 20 );
+  sortKey = exdData->getField< uint16_t >( row, 20 );
   contentMemberType = exdData->getField< uint8_t >( row, 22 );
   requireAllDuties = exdData->getField< bool >( row, 32 );
-  contentRouletteOpenRule = exdData->getField< uint8_t >( row, 34 );
-  instanceContent = exdData->getField< uint16_t >( row, 35 );
+  contentRouletteOpenRule = exdData->getField< bool >( row, 34 );
+  instanceContent = exdData->getField< uint8_t >( row, 35 );
 }
 
 Sapphire::Data::ContentRouletteOpenRule::ContentRouletteOpenRule( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
@@ -1539,7 +2074,9 @@ Sapphire::Data::ContentsNote::ContentsNote( uint32_t row_id, Sapphire::Data::Exd
   icon = exdData->getField< int32_t >( row, 1 );
   menuOrder = exdData->getField< uint8_t >( row, 2 );
   requiredAmount = exdData->getField< int32_t >( row, 3 );
+  reward0 = exdData->getField< uint8_t >( row, 4 );
   expMultiplier = exdData->getField< int32_t >( row, 5 );
+  reward1 = exdData->getField< uint8_t >( row, 6 );
   gilRward = exdData->getField< int32_t >( row, 7 );
   levelUnlock = exdData->getField< uint16_t >( row, 8 );
   howTo = exdData->getField< uint16_t >( row, 9 );
@@ -1614,6 +2151,8 @@ Sapphire::Data::CraftLevelDifference::CraftLevelDifference( uint32_t row_id, Sap
 Sapphire::Data::CraftType::CraftType( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
 {
   auto row = exdData->m_CraftTypeDat.get_row( row_id );
+  mainPhysical = exdData->getField< uint8_t >( row, 0 );
+  subPhysical = exdData->getField< uint8_t >( row, 1 );
   name = exdData->getField< std::string >( row, 2 );
 }
 
@@ -1754,12 +2293,42 @@ Sapphire::Data::Cutscene::Cutscene( uint32_t row_id, Sapphire::Data::ExdDataGene
   path = exdData->getField< std::string >( row, 0 );
 }
 
+Sapphire::Data::CutsceneMotion::CutsceneMotion( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
+{
+  auto row = exdData->m_CutsceneMotionDat.get_row( row_id );
+  wALK_LOOP_SPEED = exdData->getField< float >( row, 0 );
+  rUN_LOOP_SPEED = exdData->getField< float >( row, 1 );
+  sLOWWALK_LOOP_SPEED = exdData->getField< float >( row, 2 );
+  sLOWRUN_LOOP_SPEED = exdData->getField< float >( row, 3 );
+  bATTLEWALK_LOOP_SPEED = exdData->getField< float >( row, 4 );
+  bATTLERUN_LOOP_SPEED = exdData->getField< float >( row, 5 );
+  dASH_LOOP_SPEED = exdData->getField< float >( row, 6 );
+  tURN_CW90_FRAME = exdData->getField< uint8_t >( row, 7 );
+  tURN_CCW90_FRAME = exdData->getField< uint8_t >( row, 8 );
+  tURN_CW180_FRAME = exdData->getField< uint8_t >( row, 9 );
+  tURN_CCW180_FRAME = exdData->getField< uint8_t >( row, 10 );
+}
+
+Sapphire::Data::CutsceneWorkIndex::CutsceneWorkIndex( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
+{
+  auto row = exdData->m_CutsceneWorkIndexDat.get_row( row_id );
+  workIndex = exdData->getField< uint16_t >( row, 0 );
+}
+
 Sapphire::Data::CutScreenImage::CutScreenImage( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
 {
   auto row = exdData->m_CutScreenImageDat.get_row( row_id );
+  type = exdData->getField< int16_t >( row, 0 );
   image = exdData->getField< int32_t >( row, 1 );
 }
 
+Sapphire::Data::CycleTime::CycleTime( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
+{
+  auto row = exdData->m_CycleTimeDat.get_row( row_id );
+  firstCycle = exdData->getField< uint32_t >( row, 0 );
+  cycle = exdData->getField< uint32_t >( row, 1 );
+}
+
 Sapphire::Data::DailySupplyItem::DailySupplyItem( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
 {
   auto row = exdData->m_DailySupplyItemDat.get_row( row_id );
@@ -1792,6 +2361,19 @@ Sapphire::Data::DawnMemberUIParam::DawnMemberUIParam( uint32_t row_id, Sapphire:
   classPlural = exdData->getField< std::string >( row, 2 );
 }
 
+Sapphire::Data::DawnQuestAnnounce::DawnQuestAnnounce( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
+{
+  auto row = exdData->m_DawnQuestAnnounceDat.get_row( row_id );
+  quest = exdData->getField< uint32_t >( row, 0 );
+  content = exdData->getField< uint8_t >( row, 1 );
+  eNPC.push_back( exdData->getField< uint32_t >( row, 2 ) );
+  eNPC.push_back( exdData->getField< uint32_t >( row, 3 ) );
+  eNPC.push_back( exdData->getField< uint32_t >( row, 4 ) );
+  eNPC.push_back( exdData->getField< uint32_t >( row, 5 ) );
+  eNPC.push_back( exdData->getField< uint32_t >( row, 6 ) );
+  eNPC.push_back( exdData->getField< uint32_t >( row, 7 ) );
+}
+
 Sapphire::Data::DawnQuestMember::DawnQuestMember( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
 {
   auto row = exdData->m_DawnQuestMemberDat.get_row( row_id );
@@ -1805,7 +2387,30 @@ Sapphire::Data::DawnQuestMember::DawnQuestMember( uint32_t row_id, Sapphire::Dat
 Sapphire::Data::DeepDungeon::DeepDungeon( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
 {
   auto row = exdData->m_DeepDungeonDat.get_row( row_id );
+  aetherpoolArm = exdData->getField< uint8_t >( row, 0 );
+  aetherpoolArmor = exdData->getField< uint8_t >( row, 1 );
+  pomanderSlot.push_back( exdData->getField< uint8_t >( row, 2 ) );
+  pomanderSlot.push_back( exdData->getField< uint8_t >( row, 3 ) );
+  pomanderSlot.push_back( exdData->getField< uint8_t >( row, 4 ) );
+  pomanderSlot.push_back( exdData->getField< uint8_t >( row, 5 ) );
+  pomanderSlot.push_back( exdData->getField< uint8_t >( row, 6 ) );
+  pomanderSlot.push_back( exdData->getField< uint8_t >( row, 7 ) );
+  pomanderSlot.push_back( exdData->getField< uint8_t >( row, 8 ) );
+  pomanderSlot.push_back( exdData->getField< uint8_t >( row, 9 ) );
+  pomanderSlot.push_back( exdData->getField< uint8_t >( row, 10 ) );
+  pomanderSlot.push_back( exdData->getField< uint8_t >( row, 11 ) );
+  pomanderSlot.push_back( exdData->getField< uint8_t >( row, 12 ) );
+  pomanderSlot.push_back( exdData->getField< uint8_t >( row, 13 ) );
+  pomanderSlot.push_back( exdData->getField< uint8_t >( row, 14 ) );
+  pomanderSlot.push_back( exdData->getField< uint8_t >( row, 15 ) );
+  pomanderSlot.push_back( exdData->getField< uint8_t >( row, 16 ) );
+  pomanderSlot.push_back( exdData->getField< uint8_t >( row, 17 ) );
+  magiciteSlot.push_back( exdData->getField< uint8_t >( row, 18 ) );
+  magiciteSlot.push_back( exdData->getField< uint8_t >( row, 19 ) );
+  magiciteSlot.push_back( exdData->getField< uint8_t >( row, 20 ) );
+  magiciteSlot.push_back( exdData->getField< uint8_t >( row, 21 ) );
   name = exdData->getField< std::string >( row, 22 );
+  contentFinderConditionStart = exdData->getField< uint16_t >( row, 23 );
 }
 
 Sapphire::Data::DeepDungeonBan::DeepDungeonBan( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
@@ -1935,9 +2540,20 @@ Sapphire::Data::DeliveryQuest::DeliveryQuest( uint32_t row_id, Sapphire::Data::E
   quest = exdData->getField< int32_t >( row, 0 );
 }
 
+Sapphire::Data::Description::Description( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
+{
+  auto row = exdData->m_DescriptionDat.get_row( row_id );
+  quest = exdData->getField< uint32_t >( row, 0 );
+  textLong = exdData->getField< std::string >( row, 1 );
+  textShort = exdData->getField< std::string >( row, 2 );
+  textCommentary = exdData->getField< std::string >( row, 3 );
+  section = exdData->getField< uint32_t >( row, 5 );
+}
+
 Sapphire::Data::DescriptionPage::DescriptionPage( uint32_t row_id, uint32_t subRow, Sapphire::Data::ExdDataGenerated* exdData )
 {
   auto row = exdData->m_DescriptionPageDat.get_row( row_id, subRow );
+  quest = exdData->getField< uint32_t >( row, 0 );
   text1 = exdData->getField< uint16_t >( row, 1 );
   image1 = exdData->getField< uint32_t >( row, 2 );
   text2 = exdData->getField< uint16_t >( row, 3 );
@@ -1958,6 +2574,13 @@ Sapphire::Data::DescriptionPage::DescriptionPage( uint32_t row_id, uint32_t subR
   image9 = exdData->getField< uint32_t >( row, 18 );
 }
 
+Sapphire::Data::DescriptionSection::DescriptionSection( uint32_t row_id, uint32_t subRow, Sapphire::Data::ExdDataGenerated* exdData )
+{
+  auto row = exdData->m_DescriptionSectionDat.get_row( row_id, subRow );
+  string = exdData->getField< uint16_t >( row, 0 );
+  page = exdData->getField< uint16_t >( row, 1 );
+}
+
 Sapphire::Data::DescriptionString::DescriptionString( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
 {
   auto row = exdData->m_DescriptionStringDat.get_row( row_id );
@@ -2072,9 +2695,23 @@ Sapphire::Data::EmoteCategory::EmoteCategory( uint32_t row_id, Sapphire::Data::E
   name = exdData->getField< std::string >( row, 0 );
 }
 
+Sapphire::Data::EmoteMode::EmoteMode( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
+{
+  auto row = exdData->m_EmoteModeDat.get_row( row_id );
+  startEmote = exdData->getField< uint16_t >( row, 0 );
+  endEmote = exdData->getField< uint16_t >( row, 1 );
+  move = exdData->getField< bool >( row, 2 );
+  camera = exdData->getField< bool >( row, 3 );
+  endOnRotate = exdData->getField< bool >( row, 4 );
+  endOnEmote = exdData->getField< bool >( row, 5 );
+  conditionMode = exdData->getField< uint8_t >( row, 6 );
+}
+
 Sapphire::Data::ENpcBase::ENpcBase( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
 {
   auto row = exdData->m_ENpcBaseDat.get_row( row_id );
+  eventHandler = exdData->getField< uint16_t >( row, 0 );
+  important = exdData->getField< bool >( row, 1 );
   eNpcData.push_back( exdData->getField< uint32_t >( row, 2 ) );
   eNpcData.push_back( exdData->getField< uint32_t >( row, 3 ) );
   eNpcData.push_back( exdData->getField< uint32_t >( row, 4 ) );
@@ -2162,7 +2799,10 @@ Sapphire::Data::ENpcBase::ENpcBase( uint32_t row_id, Sapphire::Data::ExdDataGene
   dyeLeftRing = exdData->getField< uint8_t >( row, 87 );
   modelRightRing = exdData->getField< uint32_t >( row, 88 );
   dyeRightRing = exdData->getField< uint8_t >( row, 89 );
+  invisibility = exdData->getField< uint8_t >( row, 90 );
   balloon = exdData->getField< uint16_t >( row, 91 );
+  notRewriteHeight = exdData->getField< bool >( row, 92 );
+  defaultBalloon = exdData->getField< uint8_t >( row, 93 );
 }
 
 Sapphire::Data::ENpcDressUp::ENpcDressUp( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
@@ -2209,8 +2849,14 @@ Sapphire::Data::ENpcResident::ENpcResident( uint32_t row_id, Sapphire::Data::Exd
 Sapphire::Data::EObj::EObj( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
 {
   auto row = exdData->m_EObjDat.get_row( row_id );
+  popType = exdData->getField< uint8_t >( row, 8 );
   data = exdData->getField< uint32_t >( row, 9 );
+  invisibility = exdData->getField< uint8_t >( row, 10 );
   sgbPath = exdData->getField< uint16_t >( row, 11 );
+  eyeCollision = exdData->getField< bool >( row, 12 );
+  directorControl = exdData->getField< bool >( row, 13 );
+  target = exdData->getField< bool >( row, 14 );
+  eventHighAddition = exdData->getField< uint8_t >( row, 15 );
 }
 
 Sapphire::Data::EObjName::EObjName( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
@@ -2345,6 +2991,9 @@ Sapphire::Data::EventIconPriority::EventIconPriority( uint32_t row_id, Sapphire:
   icon.push_back( exdData->getField< uint32_t >( row, 13 ) );
   icon.push_back( exdData->getField< uint32_t >( row, 14 ) );
   icon.push_back( exdData->getField< uint32_t >( row, 15 ) );
+  icon.push_back( exdData->getField< uint32_t >( row, 16 ) );
+  icon.push_back( exdData->getField< uint32_t >( row, 17 ) );
+  icon.push_back( exdData->getField< uint32_t >( row, 18 ) );
 }
 
 Sapphire::Data::EventIconType::EventIconType( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
@@ -2373,6 +3022,8 @@ Sapphire::Data::EventItem::EventItem( uint32_t row_id, Sapphire::Data::ExdDataGe
   stackSize = exdData->getField< uint8_t >( row, 12 );
   quest = exdData->getField< uint32_t >( row, 14 );
   castTime = exdData->getField< uint8_t >( row, 15 );
+  castTimeline = exdData->getField< uint8_t >( row, 16 );
+  timeline = exdData->getField< uint8_t >( row, 17 );
 }
 
 Sapphire::Data::EventItemCastTimeline::EventItemCastTimeline( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
@@ -2393,6 +3044,13 @@ Sapphire::Data::EventItemTimeline::EventItemTimeline( uint32_t row_id, Sapphire:
   actionTimeline = exdData->getField< uint32_t >( row, 0 );
 }
 
+Sapphire::Data::EventSystemDefine::EventSystemDefine( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
+{
+  auto row = exdData->m_EventSystemDefineDat.get_row( row_id );
+  text = exdData->getField< std::string >( row, 0 );
+  defineValue = exdData->getField< uint32_t >( row, 1 );
+}
+
 Sapphire::Data::ExportedSG::ExportedSG( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
 {
   auto row = exdData->m_ExportedSGDat.get_row( row_id );
@@ -2409,21 +3067,100 @@ Sapphire::Data::Fate::Fate( uint32_t row_id, Sapphire::Data::ExdDataGenerated* e
 {
   auto row = exdData->m_FateDat.get_row( row_id );
   eurekaFate = exdData->getField< uint8_t >( row, 0 );
-  location = exdData->getField< uint32_t >( row, 2 );
-  classJobLevel = exdData->getField< uint8_t >( row, 3 );
-  classJobLevelMax = exdData->getField< uint8_t >( row, 4 );
-  eventItem = exdData->getField< uint32_t >( row, 5 );
-  iconObjective = exdData->getField< uint32_t >( row, 9 );
-  iconMap = exdData->getField< uint32_t >( row, 10 );
-  music = exdData->getField< int32_t >( row, 12 );
-  hasWorldMapIcon = exdData->getField< bool >( row, 17 );
-  name = exdData->getField< std::string >( row, 26 );
-  description = exdData->getField< std::string >( row, 27 );
-  objective = exdData->getField< std::string >( row, 28 );
-  statusText.push_back( exdData->getField< std::string >( row, 29 ) );
-  statusText.push_back( exdData->getField< std::string >( row, 30 ) );
-  statusText.push_back( exdData->getField< std::string >( row, 31 ) );
-  arrayIndex = exdData->getField< uint32_t >( row, 32 );
+  rule = exdData->getField< uint8_t >( row, 1 );
+  location = exdData->getField< uint32_t >( row, 3 );
+  classJobLevel = exdData->getField< uint8_t >( row, 4 );
+  classJobLevelMax = exdData->getField< uint8_t >( row, 5 );
+  eventItem = exdData->getField< uint32_t >( row, 6 );
+  typeToDoValue.push_back( exdData->getField< uint8_t >( row, 7 ) );
+  typeToDoValue.push_back( exdData->getField< uint8_t >( row, 8 ) );
+  typeToDoValue.push_back( exdData->getField< uint8_t >( row, 9 ) );
+  iconObjective = exdData->getField< uint32_t >( row, 10 );
+  iconMap = exdData->getField< uint32_t >( row, 11 );
+  iconInactiveMap = exdData->getField< uint32_t >( row, 12 );
+  music = exdData->getField< int32_t >( row, 13 );
+  lGBGuardNPCLocation = exdData->getField< uint32_t >( row, 14 );
+  screenImageAccept = exdData->getField< uint16_t >( row, 15 );
+  screenImageComplete = exdData->getField< uint16_t >( row, 16 );
+  screenImageFailed = exdData->getField< uint16_t >( row, 17 );
+  hasWorldMapIcon = exdData->getField< bool >( row, 18 );
+  isQuest = exdData->getField< bool >( row, 19 );
+  name = exdData->getField< std::string >( row, 29 );
+  description = exdData->getField< std::string >( row, 30 );
+  objective = exdData->getField< std::string >( row, 31 );
+  statusText.push_back( exdData->getField< std::string >( row, 32 ) );
+  statusText.push_back( exdData->getField< std::string >( row, 33 ) );
+  statusText.push_back( exdData->getField< std::string >( row, 34 ) );
+  arrayIndex = exdData->getField< uint32_t >( row, 35 );
+}
+
+Sapphire::Data::FateEvent::FateEvent( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
+{
+  auto row = exdData->m_FateEventDat.get_row( row_id );
+  turn.push_back( exdData->getField< uint8_t >( row, 0 ) );
+  turn.push_back( exdData->getField< uint8_t >( row, 1 ) );
+  turn.push_back( exdData->getField< uint8_t >( row, 2 ) );
+  turn.push_back( exdData->getField< uint8_t >( row, 3 ) );
+  turn.push_back( exdData->getField< uint8_t >( row, 4 ) );
+  turn.push_back( exdData->getField< uint8_t >( row, 5 ) );
+  turn.push_back( exdData->getField< uint8_t >( row, 6 ) );
+  turn.push_back( exdData->getField< uint8_t >( row, 7 ) );
+  gesture.push_back( exdData->getField< uint32_t >( row, 8 ) );
+  gesture.push_back( exdData->getField< uint32_t >( row, 9 ) );
+  gesture.push_back( exdData->getField< uint32_t >( row, 10 ) );
+  gesture.push_back( exdData->getField< uint32_t >( row, 11 ) );
+  gesture.push_back( exdData->getField< uint32_t >( row, 12 ) );
+  gesture.push_back( exdData->getField< uint32_t >( row, 13 ) );
+  gesture.push_back( exdData->getField< uint32_t >( row, 14 ) );
+  gesture.push_back( exdData->getField< uint32_t >( row, 15 ) );
+  lipSync.push_back( exdData->getField< int32_t >( row, 16 ) );
+  lipSync.push_back( exdData->getField< int32_t >( row, 17 ) );
+  lipSync.push_back( exdData->getField< int32_t >( row, 18 ) );
+  lipSync.push_back( exdData->getField< int32_t >( row, 19 ) );
+  lipSync.push_back( exdData->getField< int32_t >( row, 20 ) );
+  lipSync.push_back( exdData->getField< int32_t >( row, 21 ) );
+  lipSync.push_back( exdData->getField< int32_t >( row, 22 ) );
+  lipSync.push_back( exdData->getField< int32_t >( row, 23 ) );
+  facial.push_back( exdData->getField< int32_t >( row, 24 ) );
+  facial.push_back( exdData->getField< int32_t >( row, 25 ) );
+  facial.push_back( exdData->getField< int32_t >( row, 26 ) );
+  facial.push_back( exdData->getField< int32_t >( row, 27 ) );
+  facial.push_back( exdData->getField< int32_t >( row, 28 ) );
+  facial.push_back( exdData->getField< int32_t >( row, 29 ) );
+  facial.push_back( exdData->getField< int32_t >( row, 30 ) );
+  facial.push_back( exdData->getField< int32_t >( row, 31 ) );
+  shape.push_back( exdData->getField< int32_t >( row, 32 ) );
+  shape.push_back( exdData->getField< int32_t >( row, 33 ) );
+  shape.push_back( exdData->getField< int32_t >( row, 34 ) );
+  shape.push_back( exdData->getField< int32_t >( row, 35 ) );
+  shape.push_back( exdData->getField< int32_t >( row, 36 ) );
+  shape.push_back( exdData->getField< int32_t >( row, 37 ) );
+  shape.push_back( exdData->getField< int32_t >( row, 38 ) );
+  shape.push_back( exdData->getField< int32_t >( row, 39 ) );
+  isAutoShake.push_back( exdData->getField< bool >( row, 40 ) );
+  isAutoShake.push_back( exdData->getField< bool >( row, 41 ) );
+  isAutoShake.push_back( exdData->getField< bool >( row, 42 ) );
+  isAutoShake.push_back( exdData->getField< bool >( row, 43 ) );
+  isAutoShake.push_back( exdData->getField< bool >( row, 44 ) );
+  isAutoShake.push_back( exdData->getField< bool >( row, 45 ) );
+  isAutoShake.push_back( exdData->getField< bool >( row, 46 ) );
+  isAutoShake.push_back( exdData->getField< bool >( row, 47 ) );
+  widgetType.push_back( exdData->getField< uint8_t >( row, 48 ) );
+  widgetType.push_back( exdData->getField< uint8_t >( row, 49 ) );
+  widgetType.push_back( exdData->getField< uint8_t >( row, 50 ) );
+  widgetType.push_back( exdData->getField< uint8_t >( row, 51 ) );
+  widgetType.push_back( exdData->getField< uint8_t >( row, 52 ) );
+  widgetType.push_back( exdData->getField< uint8_t >( row, 53 ) );
+  widgetType.push_back( exdData->getField< uint8_t >( row, 54 ) );
+  widgetType.push_back( exdData->getField< uint8_t >( row, 55 ) );
+  text.push_back( exdData->getField< std::string >( row, 56 ) );
+  text.push_back( exdData->getField< std::string >( row, 57 ) );
+  text.push_back( exdData->getField< std::string >( row, 58 ) );
+  text.push_back( exdData->getField< std::string >( row, 59 ) );
+  text.push_back( exdData->getField< std::string >( row, 60 ) );
+  text.push_back( exdData->getField< std::string >( row, 61 ) );
+  text.push_back( exdData->getField< std::string >( row, 62 ) );
+  text.push_back( exdData->getField< std::string >( row, 63 ) );
 }
 
 Sapphire::Data::FateProgressUI::FateProgressUI( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
@@ -2436,16 +3173,27 @@ Sapphire::Data::FateProgressUI::FateProgressUI( uint32_t row_id, Sapphire::Data:
   displayOrder = exdData->getField< uint8_t >( row, 4 );
 }
 
+Sapphire::Data::FateTokenType::FateTokenType( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
+{
+  auto row = exdData->m_FateTokenTypeDat.get_row( row_id );
+  currency = exdData->getField< uint32_t >( row, 0 );
+}
+
 Sapphire::Data::FCActivity::FCActivity( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
 {
   auto row = exdData->m_FCActivityDat.get_row( row_id );
   text = exdData->getField< std::string >( row, 0 );
+  selfKind = exdData->getField< uint8_t >( row, 1 );
+  targetKind = exdData->getField< uint8_t >( row, 2 );
+  numParam = exdData->getField< uint8_t >( row, 3 );
   fCActivityCategory = exdData->getField< uint8_t >( row, 4 );
+  iconType = exdData->getField< int8_t >( row, 5 );
 }
 
 Sapphire::Data::FCActivityCategory::FCActivityCategory( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
 {
   auto row = exdData->m_FCActivityCategoryDat.get_row( row_id );
+  priority = exdData->getField< uint8_t >( row, 0 );
   name = exdData->getField< std::string >( row, 1 );
 }
 
@@ -2468,6 +3216,13 @@ Sapphire::Data::FCChestName::FCChestName( uint32_t row_id, Sapphire::Data::ExdDa
   name = exdData->getField< std::string >( row, 0 );
 }
 
+Sapphire::Data::FCCrestSymbol::FCCrestSymbol( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
+{
+  auto row = exdData->m_FCCrestSymbolDat.get_row( row_id );
+  colorNum = exdData->getField< uint8_t >( row, 0 );
+  fCRight = exdData->getField< uint8_t >( row, 1 );
+}
+
 Sapphire::Data::FccShop::FccShop( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
 {
   auto row = exdData->m_FccShopDat.get_row( row_id );
@@ -2483,14 +3238,27 @@ Sapphire::Data::FCHierarchy::FCHierarchy( uint32_t row_id, Sapphire::Data::ExdDa
 Sapphire::Data::FCProfile::FCProfile( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
 {
   auto row = exdData->m_FCProfileDat.get_row( row_id );
+  priority = exdData->getField< uint8_t >( row, 0 );
   name = exdData->getField< std::string >( row, 1 );
 }
 
+Sapphire::Data::FCRank::FCRank( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
+{
+  auto row = exdData->m_FCRankDat.get_row( row_id );
+  nextPoint = exdData->getField< uint32_t >( row, 0 );
+  currentPoint = exdData->getField< uint32_t >( row, 1 );
+  rights = exdData->getField< uint16_t >( row, 2 );
+  fCActionActiveNum = exdData->getField< uint8_t >( row, 5 );
+  fCActionStockNum = exdData->getField< uint8_t >( row, 6 );
+}
+
 Sapphire::Data::FCReputation::FCReputation( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
 {
   auto row = exdData->m_FCReputationDat.get_row( row_id );
   pointsToNext = exdData->getField< uint32_t >( row, 0 );
   requiredPoints = exdData->getField< uint32_t >( row, 1 );
+  discountRate = exdData->getField< uint8_t >( row, 2 );
+  color = exdData->getField< uint32_t >( row, 3 );
   name = exdData->getField< std::string >( row, 4 );
 }
 
@@ -2539,12 +3307,13 @@ Sapphire::Data::FishingSpot::FishingSpot( uint32_t row_id, Sapphire::Data::ExdDa
   bigFishOnReach = exdData->getField< std::string >( row, 1 );
   bigFishOnEnd = exdData->getField< std::string >( row, 2 );
   fishingSpotCategory = exdData->getField< uint8_t >( row, 3 );
+  rare = exdData->getField< bool >( row, 4 );
   territoryType = exdData->getField< uint16_t >( row, 5 );
-  x = exdData->getField< int16_t >( row, 6 );
-  z = exdData->getField< int16_t >( row, 7 );
-  radius = exdData->getField< uint16_t >( row, 8 );
-  item.push_back( exdData->getField< int32_t >( row, 10 ) );
-  item.push_back( exdData->getField< int32_t >( row, 11 ) );
+  placeNameMain = exdData->getField< uint16_t >( row, 6 );
+  placeNameSub = exdData->getField< uint16_t >( row, 7 );
+  x = exdData->getField< int16_t >( row, 8 );
+  z = exdData->getField< int16_t >( row, 9 );
+  radius = exdData->getField< uint16_t >( row, 10 );
   item.push_back( exdData->getField< int32_t >( row, 12 ) );
   item.push_back( exdData->getField< int32_t >( row, 13 ) );
   item.push_back( exdData->getField< int32_t >( row, 14 ) );
@@ -2553,8 +3322,10 @@ Sapphire::Data::FishingSpot::FishingSpot( uint32_t row_id, Sapphire::Data::ExdDa
   item.push_back( exdData->getField< int32_t >( row, 17 ) );
   item.push_back( exdData->getField< int32_t >( row, 18 ) );
   item.push_back( exdData->getField< int32_t >( row, 19 ) );
-  placeName = exdData->getField< uint16_t >( row, 20 );
-  order = exdData->getField< uint8_t >( row, 21 );
+  item.push_back( exdData->getField< int32_t >( row, 20 ) );
+  item.push_back( exdData->getField< int32_t >( row, 21 ) );
+  placeName = exdData->getField< uint16_t >( row, 22 );
+  order = exdData->getField< uint8_t >( row, 23 );
 }
 
 Sapphire::Data::FishParameter::FishParameter( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
@@ -2563,13 +3334,13 @@ Sapphire::Data::FishParameter::FishParameter( uint32_t row_id, Sapphire::Data::E
   text = exdData->getField< std::string >( row, 0 );
   item = exdData->getField< int32_t >( row, 1 );
   gatheringItemLevel = exdData->getField< uint16_t >( row, 2 );
-  isHidden = exdData->getField< bool >( row, 3 );
-  fishingRecordType = exdData->getField< uint8_t >( row, 5 );
-  territoryType = exdData->getField< int32_t >( row, 6 );
-  gatheringSubCategory = exdData->getField< uint16_t >( row, 7 );
-  isInLog = exdData->getField< bool >( row, 8 );
-  timeRestricted = exdData->getField< bool >( row, 9 );
-  weatherRestricted = exdData->getField< bool >( row, 10 );
+  isHidden = exdData->getField< bool >( row, 4 );
+  fishingRecordType = exdData->getField< uint8_t >( row, 6 );
+  territoryType = exdData->getField< int32_t >( row, 7 );
+  gatheringSubCategory = exdData->getField< uint16_t >( row, 8 );
+  isInLog = exdData->getField< bool >( row, 9 );
+  timeRestricted = exdData->getField< bool >( row, 10 );
+  weatherRestricted = exdData->getField< bool >( row, 11 );
 }
 
 Sapphire::Data::Frontline03::Frontline03( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
@@ -2642,7 +3413,9 @@ Sapphire::Data::GardeningSeed::GardeningSeed( uint32_t row_id, Sapphire::Data::E
 {
   auto row = exdData->m_GardeningSeedDat.get_row( row_id );
   item = exdData->getField< uint32_t >( row, 0 );
+  modelID = exdData->getField< uint16_t >( row, 1 );
   icon = exdData->getField< uint32_t >( row, 2 );
+  sE = exdData->getField< bool >( row, 3 );
 }
 
 Sapphire::Data::GatheringCondition::GatheringCondition( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
@@ -2662,7 +3435,7 @@ Sapphire::Data::GatheringItem::GatheringItem( uint32_t row_id, Sapphire::Data::E
   auto row = exdData->m_GatheringItemDat.get_row( row_id );
   item = exdData->getField< int32_t >( row, 0 );
   gatheringItemLevel = exdData->getField< uint16_t >( row, 1 );
-  isHidden = exdData->getField< bool >( row, 3 );
+  isHidden = exdData->getField< uint32_t >( row, 3 );
 }
 
 Sapphire::Data::GatheringItemLevelConvertTable::GatheringItemLevelConvertTable( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
@@ -2681,9 +3454,25 @@ Sapphire::Data::GatheringItemPoint::GatheringItemPoint( uint32_t row_id, uint32_
 Sapphire::Data::GatheringLeve::GatheringLeve( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
 {
   auto row = exdData->m_GatheringLeveDat.get_row( row_id );
-  requiredItem1 = exdData->getField< int32_t >( row, 4 );
-  leveLevel = exdData->getField< uint8_t >( row, 5 );
-  requiredItem2 = exdData->getField< int32_t >( row, 6 );
+  route.push_back( exdData->getField< int32_t >( row, 0 ) );
+  route.push_back( exdData->getField< int32_t >( row, 1 ) );
+  route.push_back( exdData->getField< int32_t >( row, 2 ) );
+  route.push_back( exdData->getField< int32_t >( row, 3 ) );
+  requiredItem0 = exdData->getField< int32_t >( row, 4 );
+  requiredItemQty0 = exdData->getField< uint8_t >( row, 5 );
+  requiredItem1 = exdData->getField< int32_t >( row, 6 );
+  requiredItemQty1 = exdData->getField< uint8_t >( row, 7 );
+  requiredItem2 = exdData->getField< int32_t >( row, 8 );
+  requiredItemQty2 = exdData->getField< uint8_t >( row, 9 );
+  requiredItem3 = exdData->getField< int32_t >( row, 10 );
+  requiredItemQty3 = exdData->getField< uint8_t >( row, 11 );
+  itemNumber = exdData->getField< uint8_t >( row, 12 );
+  rule = exdData->getField< int32_t >( row, 13 );
+  varient = exdData->getField< uint8_t >( row, 14 );
+  objective0 = exdData->getField< uint16_t >( row, 15 );
+  objective1 = exdData->getField< uint16_t >( row, 16 );
+  bNpcEntry = exdData->getField< int32_t >( row, 17 );
+  useSecondaryTool = exdData->getField< bool >( row, 18 );
 }
 
 Sapphire::Data::GatheringLeveRoute::GatheringLeveRoute( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
@@ -2691,6 +3480,12 @@ Sapphire::Data::GatheringLeveRoute::GatheringLeveRoute( uint32_t row_id, Sapphir
   auto row = exdData->m_GatheringLeveRouteDat.get_row( row_id );
 }
 
+Sapphire::Data::GatheringLeveRule::GatheringLeveRule( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
+{
+  auto row = exdData->m_GatheringLeveRuleDat.get_row( row_id );
+  rule = exdData->getField< std::string >( row, 0 );
+}
+
 Sapphire::Data::GatheringNotebookList::GatheringNotebookList( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
 {
   auto row = exdData->m_GatheringNotebookListDat.get_row( row_id );
@@ -2799,7 +3594,9 @@ Sapphire::Data::GatheringNotebookList::GatheringNotebookList( uint32_t row_id, S
 Sapphire::Data::GatheringPoint::GatheringPoint( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
 {
   auto row = exdData->m_GatheringPointDat.get_row( row_id );
+  type = exdData->getField< uint8_t >( row, 0 );
   gatheringPointBase = exdData->getField< int32_t >( row, 1 );
+  count = exdData->getField< uint8_t >( row, 2 );
   gatheringPointBonus.push_back( exdData->getField< uint16_t >( row, 3 ) );
   gatheringPointBonus.push_back( exdData->getField< uint16_t >( row, 4 ) );
   territoryType = exdData->getField< uint16_t >( row, 5 );
@@ -2853,6 +3650,9 @@ Sapphire::Data::GatheringPointName::GatheringPointName( uint32_t row_id, Sapphir
 Sapphire::Data::GatheringSubCategory::GatheringSubCategory( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
 {
   auto row = exdData->m_GatheringSubCategoryDat.get_row( row_id );
+  gatheringType = exdData->getField< uint8_t >( row, 0 );
+  classJob = exdData->getField< uint8_t >( row, 1 );
+  division = exdData->getField< uint16_t >( row, 3 );
   item = exdData->getField< int32_t >( row, 4 );
   folkloreBook = exdData->getField< std::string >( row, 5 );
 }
@@ -3050,6 +3850,8 @@ Sapphire::Data::GeneralAction::GeneralAction( uint32_t row_id, Sapphire::Data::E
   description = exdData->getField< std::string >( row, 1 );
   action = exdData->getField< uint16_t >( row, 3 );
   unlockLink = exdData->getField< uint16_t >( row, 4 );
+  recast = exdData->getField< uint8_t >( row, 5 );
+  uIPriority = exdData->getField< uint8_t >( row, 6 );
   icon = exdData->getField< int32_t >( row, 7 );
 }
 
@@ -3103,6 +3905,7 @@ Sapphire::Data::GilShop::GilShop( uint32_t row_id, Sapphire::Data::ExdDataGenera
   auto row = exdData->m_GilShopDat.get_row( row_id );
   name = exdData->getField< std::string >( row, 0 );
   icon = exdData->getField< uint32_t >( row, 1 );
+  quest = exdData->getField< uint32_t >( row, 2 );
   acceptTalk = exdData->getField< int32_t >( row, 3 );
   failTalk = exdData->getField< int32_t >( row, 4 );
 }
@@ -3118,6 +3921,35 @@ Sapphire::Data::GilShopItem::GilShopItem( uint32_t row_id, uint32_t subRow, Sapp
   patch = exdData->getField< uint16_t >( row, 8 );
 }
 
+Sapphire::Data::GimmickAccessor::GimmickAccessor( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
+{
+  auto row = exdData->m_GimmickAccessorDat.get_row( row_id );
+  param0 = exdData->getField< int32_t >( row, 0 );
+  param1 = exdData->getField< uint32_t >( row, 1 );
+  param2 = exdData->getField< uint32_t >( row, 2 );
+  type = exdData->getField< uint32_t >( row, 3 );
+}
+
+Sapphire::Data::GimmickJump::GimmickJump( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
+{
+  auto row = exdData->m_GimmickJumpDat.get_row( row_id );
+  fallDamage = exdData->getField< uint16_t >( row, 0 );
+  height = exdData->getField< int8_t >( row, 1 );
+  loopMotion = exdData->getField< uint32_t >( row, 2 );
+  endMotion = exdData->getField< uint32_t >( row, 3 );
+  startClient = exdData->getField< bool >( row, 4 );
+}
+
+Sapphire::Data::GimmickRect::GimmickRect( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
+{
+  auto row = exdData->m_GimmickRectDat.get_row( row_id );
+  layoutID = exdData->getField< uint32_t >( row, 0 );
+  triggerIn = exdData->getField< uint8_t >( row, 1 );
+  param0 = exdData->getField< uint32_t >( row, 2 );
+  triggerOut = exdData->getField< uint8_t >( row, 6 );
+  param1 = exdData->getField< uint32_t >( row, 7 );
+}
+
 Sapphire::Data::GoldSaucerArcadeMachine::GoldSaucerArcadeMachine( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
 {
   auto row = exdData->m_GoldSaucerArcadeMachineDat.get_row( row_id );
@@ -3155,6 +3987,14 @@ Sapphire::Data::GrandCompanyRank::GrandCompanyRank( uint32_t row_id, Sapphire::D
   questFlames = exdData->getField< int32_t >( row, 9 );
 }
 
+Sapphire::Data::GroupPoseFrame::GroupPoseFrame( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
+{
+  auto row = exdData->m_GroupPoseFrameDat.get_row( row_id );
+  image = exdData->getField< int32_t >( row, 1 );
+  gridText = exdData->getField< std::string >( row, 2 );
+  text = exdData->getField< std::string >( row, 6 );
+}
+
 Sapphire::Data::GuardianDeity::GuardianDeity( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
 {
   auto row = exdData->m_GuardianDeityDat.get_row( row_id );
@@ -3628,6 +4468,171 @@ Sapphire::Data::HugeCraftworksRank::HugeCraftworksRank( uint32_t row_id, Sapphir
   expRewardPerItem = exdData->getField< uint32_t >( row, 1 );
 }
 
+Sapphire::Data::HWDAnnounce::HWDAnnounce( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
+{
+  auto row = exdData->m_HWDAnnounceDat.get_row( row_id );
+  name = exdData->getField< std::string >( row, 0 );
+  eNPC = exdData->getField< uint32_t >( row, 1 );
+}
+
+Sapphire::Data::HWDCrafterSupply::HWDCrafterSupply( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
+{
+  auto row = exdData->m_HWDCrafterSupplyDat.get_row( row_id );
+  itemTradeIn.push_back( exdData->getField< uint32_t >( row, 0 ) );
+  itemTradeIn.push_back( exdData->getField< uint32_t >( row, 1 ) );
+  itemTradeIn.push_back( exdData->getField< uint32_t >( row, 2 ) );
+  itemTradeIn.push_back( exdData->getField< uint32_t >( row, 3 ) );
+  itemTradeIn.push_back( exdData->getField< uint32_t >( row, 4 ) );
+  level.push_back( exdData->getField< uint8_t >( row, 16 ) );
+  level.push_back( exdData->getField< uint8_t >( row, 17 ) );
+  level.push_back( exdData->getField< uint8_t >( row, 18 ) );
+  level.push_back( exdData->getField< uint8_t >( row, 19 ) );
+  level.push_back( exdData->getField< uint8_t >( row, 20 ) );
+  baseCollectableRating.push_back( exdData->getField< uint8_t >( row, 48 ) );
+  baseCollectableRating.push_back( exdData->getField< uint8_t >( row, 49 ) );
+  baseCollectableRating.push_back( exdData->getField< uint8_t >( row, 50 ) );
+  baseCollectableRating.push_back( exdData->getField< uint8_t >( row, 51 ) );
+  baseCollectableRating.push_back( exdData->getField< uint8_t >( row, 52 ) );
+  midBaseCollectableRating.push_back( exdData->getField< uint16_t >( row, 64 ) );
+  midBaseCollectableRating.push_back( exdData->getField< uint16_t >( row, 65 ) );
+  midBaseCollectableRating.push_back( exdData->getField< uint16_t >( row, 66 ) );
+  midBaseCollectableRating.push_back( exdData->getField< uint16_t >( row, 67 ) );
+  midBaseCollectableRating.push_back( exdData->getField< uint16_t >( row, 68 ) );
+  highBaseCollectableRating.push_back( exdData->getField< uint16_t >( row, 80 ) );
+  highBaseCollectableRating.push_back( exdData->getField< uint16_t >( row, 81 ) );
+  highBaseCollectableRating.push_back( exdData->getField< uint16_t >( row, 82 ) );
+  highBaseCollectableRating.push_back( exdData->getField< uint16_t >( row, 83 ) );
+  highBaseCollectableRating.push_back( exdData->getField< uint16_t >( row, 84 ) );
+  baseCollectableReward.push_back( exdData->getField< uint16_t >( row, 96 ) );
+  baseCollectableReward.push_back( exdData->getField< uint16_t >( row, 97 ) );
+  baseCollectableReward.push_back( exdData->getField< uint16_t >( row, 98 ) );
+  baseCollectableReward.push_back( exdData->getField< uint16_t >( row, 99 ) );
+  baseCollectableReward.push_back( exdData->getField< uint16_t >( row, 100 ) );
+  midCollectableReward.push_back( exdData->getField< uint16_t >( row, 112 ) );
+  midCollectableReward.push_back( exdData->getField< uint16_t >( row, 113 ) );
+  midCollectableReward.push_back( exdData->getField< uint16_t >( row, 114 ) );
+  midCollectableReward.push_back( exdData->getField< uint16_t >( row, 115 ) );
+  midCollectableReward.push_back( exdData->getField< uint16_t >( row, 116 ) );
+  highCollectableReward.push_back( exdData->getField< uint16_t >( row, 128 ) );
+  highCollectableReward.push_back( exdData->getField< uint16_t >( row, 129 ) );
+  highCollectableReward.push_back( exdData->getField< uint16_t >( row, 130 ) );
+  highCollectableReward.push_back( exdData->getField< uint16_t >( row, 131 ) );
+  highCollectableReward.push_back( exdData->getField< uint16_t >( row, 132 ) );
+}
+
+Sapphire::Data::HWDCrafterSupplyReward::HWDCrafterSupplyReward( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
+{
+  auto row = exdData->m_HWDCrafterSupplyRewardDat.get_row( row_id );
+  scriptRewardAmount = exdData->getField< uint16_t >( row, 0 );
+  expReward = exdData->getField< uint32_t >( row, 1 );
+}
+
+Sapphire::Data::HWDDevLayerControl::HWDDevLayerControl( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
+{
+  auto row = exdData->m_HWDDevLayerControlDat.get_row( row_id );
+}
+
+Sapphire::Data::HWDDevLevelUI::HWDDevLevelUI( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
+{
+  auto row = exdData->m_HWDDevLevelUIDat.get_row( row_id );
+}
+
+Sapphire::Data::HWDDevLively::HWDDevLively( uint32_t row_id, uint32_t subRow, Sapphire::Data::ExdDataGenerated* exdData )
+{
+  auto row = exdData->m_HWDDevLivelyDat.get_row( row_id, subRow );
+  eNPC = exdData->getField< uint32_t >( row, 0 );
+}
+
+Sapphire::Data::HWDDevProgress::HWDDevProgress( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
+{
+  auto row = exdData->m_HWDDevProgressDat.get_row( row_id );
+  canGoNext = exdData->getField< bool >( row, 0 );
+}
+
+Sapphire::Data::HWDInfoBoardArticle::HWDInfoBoardArticle( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
+{
+  auto row = exdData->m_HWDInfoBoardArticleDat.get_row( row_id );
+  type = exdData->getField< uint8_t >( row, 0 );
+  text = exdData->getField< std::string >( row, 4 );
+}
+
+Sapphire::Data::HWDInfoBoardArticleTransient::HWDInfoBoardArticleTransient( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
+{
+  auto row = exdData->m_HWDInfoBoardArticleTransientDat.get_row( row_id );
+  image = exdData->getField< uint32_t >( row, 0 );
+  text = exdData->getField< std::string >( row, 1 );
+  npcName = exdData->getField< std::string >( row, 2 );
+}
+
+Sapphire::Data::HWDInfoBoardArticleType::HWDInfoBoardArticleType( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
+{
+  auto row = exdData->m_HWDInfoBoardArticleTypeDat.get_row( row_id );
+  type = exdData->getField< std::string >( row, 0 );
+}
+
+Sapphire::Data::HWDLevelChangeDeception::HWDLevelChangeDeception( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
+{
+  auto row = exdData->m_HWDLevelChangeDeceptionDat.get_row( row_id );
+  image = exdData->getField< int32_t >( row, 0 );
+}
+
+Sapphire::Data::HWDSharedGroup::HWDSharedGroup( uint32_t row_id, uint32_t subRow, Sapphire::Data::ExdDataGenerated* exdData )
+{
+  auto row = exdData->m_HWDSharedGroupDat.get_row( row_id, subRow );
+  lGB = exdData->getField< uint32_t >( row, 0 );
+  param = exdData->getField< uint8_t >( row, 1 );
+}
+
+Sapphire::Data::HWDSharedGroupControlParam::HWDSharedGroupControlParam( uint32_t row_id, uint32_t subRow, Sapphire::Data::ExdDataGenerated* exdData )
+{
+  auto row = exdData->m_HWDSharedGroupControlParamDat.get_row( row_id, subRow );
+  paramValue = exdData->getField< uint8_t >( row, 1 );
+}
+
+Sapphire::Data::IKDContentBonus::IKDContentBonus( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
+{
+  auto row = exdData->m_IKDContentBonusDat.get_row( row_id );
+  objective = exdData->getField< std::string >( row, 0 );
+  requirement = exdData->getField< std::string >( row, 1 );
+  image = exdData->getField< uint32_t >( row, 3 );
+  order = exdData->getField< uint8_t >( row, 4 );
+}
+
+Sapphire::Data::IKDFishParam::IKDFishParam( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
+{
+  auto row = exdData->m_IKDFishParamDat.get_row( row_id );
+  fish = exdData->getField< uint32_t >( row, 0 );
+  iKDContentBonus = exdData->getField< uint8_t >( row, 1 );
+}
+
+Sapphire::Data::IKDRoute::IKDRoute( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
+{
+  auto row = exdData->m_IKDRouteDat.get_row( row_id );
+  spot.push_back( exdData->getField< uint32_t >( row, 0 ) );
+  spot.push_back( exdData->getField< uint32_t >( row, 1 ) );
+  spot.push_back( exdData->getField< uint32_t >( row, 2 ) );
+  spot.push_back( exdData->getField< uint32_t >( row, 3 ) );
+  spot.push_back( exdData->getField< uint32_t >( row, 4 ) );
+  timeDefine = exdData->getField< uint8_t >( row, 5 );
+  image = exdData->getField< uint32_t >( row, 6 );
+  territoryType = exdData->getField< uint32_t >( row, 7 );
+  name = exdData->getField< std::string >( row, 8 );
+}
+
+Sapphire::Data::IKDRouteTable::IKDRouteTable( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
+{
+  auto row = exdData->m_IKDRouteTableDat.get_row( row_id );
+  route = exdData->getField< uint32_t >( row, 0 );
+}
+
+Sapphire::Data::IKDSpot::IKDSpot( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
+{
+  auto row = exdData->m_IKDSpotDat.get_row( row_id );
+  spotMain = exdData->getField< uint32_t >( row, 0 );
+  spotSub = exdData->getField< uint32_t >( row, 1 );
+  placeName = exdData->getField< uint32_t >( row, 2 );
+}
+
 Sapphire::Data::IndividualWeather::IndividualWeather( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
 {
   auto row = exdData->m_IndividualWeatherDat.get_row( row_id );
@@ -3649,28 +4654,28 @@ Sapphire::Data::InstanceContent::InstanceContent( uint32_t row_id, Sapphire::Dat
   instanceContentType = exdData->getField< uint8_t >( row, 0 );
   weekRestriction = exdData->getField< uint8_t >( row, 1 );
   timeLimitmin = exdData->getField< uint16_t >( row, 2 );
-  name = exdData->getField< std::string >( row, 3 );
   bGM = exdData->getField< uint16_t >( row, 5 );
-  winBGM = exdData->getField< uint16_t >( row, 6 );
+  winBGM = exdData->getField< uint32_t >( row, 6 );
   cutscene = exdData->getField< uint32_t >( row, 7 );
-  order = exdData->getField< uint16_t >( row, 9 );
+  order = exdData->getField< uint8_t >( row, 9 );
+  colosseum = exdData->getField< bool >( row, 10 );
   instanceContentTextDataBossStart = exdData->getField< uint32_t >( row, 12 );
   instanceContentTextDataBossEnd = exdData->getField< uint32_t >( row, 13 );
   bNpcBaseBoss = exdData->getField< uint32_t >( row, 14 );
   instanceContentTextDataObjectiveStart = exdData->getField< uint32_t >( row, 15 );
-  instanceContentTextDataObjectiveEnd = exdData->getField< uint32_t >( row, 16 );
-  sortKey = exdData->getField< uint16_t >( row, 17 );
+  instanceContentTextDataObjectiveEnd = exdData->getField< uint16_t >( row, 16 );
+  sortKey = exdData->getField< uint32_t >( row, 17 );
   instanceClearExp = exdData->getField< uint32_t >( row, 18 );
   newPlayerBonusA = exdData->getField< uint16_t >( row, 20 );
-  finalBossCurrencyC = exdData->getField< uint16_t >( row, 21 );
+  finalBossCurrencyC = exdData->getField< uint32_t >( row, 21 );
   finalBossCurrencyA = exdData->getField< uint16_t >( row, 23 );
   finalBossCurrencyB = exdData->getField< uint16_t >( row, 24 );
-  newPlayerBonusB = exdData->getField< uint16_t >( row, 25 );
+  newPlayerBonusB = exdData->getField< uint32_t >( row, 25 );
   instanceClearGil = exdData->getField< uint32_t >( row, 47 );
-  instanceContentRewardItem = exdData->getField< uint32_t >( row, 48 );
-  finalBossExp = exdData->getField< uint32_t >( row, 50 );
-  instanceContentBuff = exdData->getField< int32_t >( row, 51 );
-  reqInstance = exdData->getField< uint32_t >( row, 52 );
+  instanceContentRewardItem = exdData->getField< uint8_t >( row, 48 );
+  finalBossExp = exdData->getField< int32_t >( row, 50 );
+  instanceContentBuff = exdData->getField< uint32_t >( row, 51 );
+  reqInstance = exdData->getField< int16_t >( row, 52 );
   partyCondition = exdData->getField< uint8_t >( row, 54 );
 }
 
@@ -3736,42 +4741,47 @@ Sapphire::Data::Item::Item( uint32_t row_id, Sapphire::Data::ExdDataGenerated* e
   itemRepair = exdData->getField< int32_t >( row, 33 );
   itemGlamour = exdData->getField< int32_t >( row, 34 );
   salvage = exdData->getField< uint16_t >( row, 35 );
-  isCollectable = exdData->getField< bool >( row, 36 );
-  aetherialReduce = exdData->getField< uint16_t >( row, 38 );
-  levelEquip = exdData->getField< uint8_t >( row, 39 );
-  equipRestriction = exdData->getField< uint8_t >( row, 41 );
-  classJobCategory = exdData->getField< uint8_t >( row, 42 );
-  grandCompany = exdData->getField< uint8_t >( row, 43 );
-  itemSeries = exdData->getField< uint8_t >( row, 44 );
-  baseParamModifier = exdData->getField< uint8_t >( row, 45 );
-  modelMain = exdData->getField< uint64_t >( row, 46 );
-  modelSub = exdData->getField< uint64_t >( row, 47 );
-  classJobUse = exdData->getField< uint8_t >( row, 48 );
-  damagePhys = exdData->getField< uint16_t >( row, 50 );
-  damageMag = exdData->getField< uint16_t >( row, 51 );
-  delayms = exdData->getField< uint16_t >( row, 52 );
-  blockRate = exdData->getField< uint16_t >( row, 54 );
-  block = exdData->getField< uint16_t >( row, 55 );
-  defensePhys = exdData->getField< uint16_t >( row, 56 );
-  defenseMag = exdData->getField< uint16_t >( row, 57 );
-  itemSpecialBonus = exdData->getField< uint8_t >( row, 70 );
-  itemSpecialBonusParam = exdData->getField< uint8_t >( row, 71 );
-  materializeType = exdData->getField< uint8_t >( row, 84 );
-  materiaSlotCount = exdData->getField< uint8_t >( row, 85 );
-  isAdvancedMeldingPermitted = exdData->getField< bool >( row, 86 );
-  isPvP = exdData->getField< bool >( row, 87 );
-  isGlamourous = exdData->getField< bool >( row, 89 );
+  isCollectable = exdData->getField< bool >( row, 37 );
+  alwaysCollectable = exdData->getField< bool >( row, 38 );
+  aetherialReduce = exdData->getField< uint16_t >( row, 39 );
+  levelEquip = exdData->getField< uint8_t >( row, 40 );
+  equipRestriction = exdData->getField< uint8_t >( row, 42 );
+  classJobCategory = exdData->getField< uint8_t >( row, 43 );
+  grandCompany = exdData->getField< uint8_t >( row, 44 );
+  itemSeries = exdData->getField< uint8_t >( row, 45 );
+  baseParamModifier = exdData->getField< uint8_t >( row, 46 );
+  modelMain = exdData->getField< uint64_t >( row, 47 );
+  modelSub = exdData->getField< uint64_t >( row, 48 );
+  classJobUse = exdData->getField< uint8_t >( row, 49 );
+  damagePhys = exdData->getField< uint16_t >( row, 51 );
+  damageMag = exdData->getField< uint16_t >( row, 52 );
+  delayms = exdData->getField< uint16_t >( row, 53 );
+  blockRate = exdData->getField< uint16_t >( row, 55 );
+  block = exdData->getField< uint16_t >( row, 56 );
+  defensePhys = exdData->getField< uint16_t >( row, 57 );
+  defenseMag = exdData->getField< uint16_t >( row, 58 );
+  itemSpecialBonus = exdData->getField< uint8_t >( row, 71 );
+  itemSpecialBonusParam = exdData->getField< uint8_t >( row, 72 );
+  materializeType = exdData->getField< uint8_t >( row, 85 );
+  materiaSlotCount = exdData->getField< uint8_t >( row, 86 );
+  isAdvancedMeldingPermitted = exdData->getField< bool >( row, 87 );
+  isPvP = exdData->getField< bool >( row, 88 );
+  isGlamourous = exdData->getField< bool >( row, 90 );
 
   for( int i = 0; i < 6; ++i )
   {
-    param[i].baseparam = exdData->getField< uint8_t >( row, 58 + i * 2 );
-    param[i].value = exdData->getField< int16_t >( row, 59 + i * 2 );
+    param[i].baseparam = exdData->getField< uint8_t >( row, 59 + i * 2 );
+    param[i].value = exdData->getField< int16_t >( row, 60 + i * 2 );
   }
 }
 
 Sapphire::Data::ItemAction::ItemAction( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
 {
   auto row = exdData->m_ItemActionDat.get_row( row_id );
+  condLv = exdData->getField< uint8_t >( row, 0 );
+  condBattle = exdData->getField< bool >( row, 1 );
+  condPVP = exdData->getField< bool >( row, 2 );
+  condPVPOnly = exdData->getField< bool >( row, 3 );
   type = exdData->getField< uint16_t >( row, 4 );
   data.push_back( exdData->getField< uint16_t >( row, 5 ) );
   data.push_back( exdData->getField< uint16_t >( row, 6 ) );
@@ -3927,6 +4937,8 @@ Sapphire::Data::JournalCategory::JournalCategory( uint32_t row_id, Sapphire::Dat
 {
   auto row = exdData->m_JournalCategoryDat.get_row( row_id );
   name = exdData->getField< std::string >( row, 0 );
+  separateType = exdData->getField< uint8_t >( row, 1 );
+  dataType = exdData->getField< uint8_t >( row, 2 );
   journalSection = exdData->getField< uint8_t >( row, 3 );
 }
 
@@ -3944,6 +4956,28 @@ Sapphire::Data::JournalSection::JournalSection( uint32_t row_id, Sapphire::Data:
   name = exdData->getField< std::string >( row, 0 );
 }
 
+Sapphire::Data::Knockback::Knockback( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
+{
+  auto row = exdData->m_KnockbackDat.get_row( row_id );
+  distance = exdData->getField< uint8_t >( row, 0 );
+  speed = exdData->getField< uint8_t >( row, 1 );
+  motion = exdData->getField< bool >( row, 2 );
+  nearDistance = exdData->getField< uint8_t >( row, 3 );
+  direction = exdData->getField< uint8_t >( row, 4 );
+  directionArg = exdData->getField< uint8_t >( row, 5 );
+  cancelMove = exdData->getField< bool >( row, 6 );
+}
+
+Sapphire::Data::LegacyQuest::LegacyQuest( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
+{
+  auto row = exdData->m_LegacyQuestDat.get_row( row_id );
+  legacyQuestID = exdData->getField< uint16_t >( row, 0 );
+  text = exdData->getField< std::string >( row, 1 );
+  string = exdData->getField< std::string >( row, 2 );
+  sortKey = exdData->getField< uint16_t >( row, 3 );
+  genre = exdData->getField< uint8_t >( row, 4 );
+}
+
 Sapphire::Data::Leve::Leve( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
 {
   auto row = exdData->m_LeveDat.get_row( row_id );
@@ -3951,8 +4985,11 @@ Sapphire::Data::Leve::Leve( uint32_t row_id, Sapphire::Data::ExdDataGenerated* e
   description = exdData->getField< std::string >( row, 1 );
   leveClient = exdData->getField< int32_t >( row, 2 );
   leveAssignmentType = exdData->getField< int32_t >( row, 3 );
+  town = exdData->getField< int32_t >( row, 4 );
   classJobLevel = exdData->getField< uint16_t >( row, 5 );
+  timeLimit = exdData->getField< uint8_t >( row, 6 );
   allowanceCost = exdData->getField< uint8_t >( row, 7 );
+  evaluation = exdData->getField< int32_t >( row, 8 );
   placeNameStart = exdData->getField< int32_t >( row, 9 );
   placeNameIssued = exdData->getField< int32_t >( row, 10 );
   classJobCategory = exdData->getField< uint8_t >( row, 12 );
@@ -3960,6 +4997,9 @@ Sapphire::Data::Leve::Leve( uint32_t row_id, Sapphire::Data::ExdDataGenerated* e
   placeNameStartZone = exdData->getField< int32_t >( row, 15 );
   iconCityState = exdData->getField< int32_t >( row, 16 );
   dataId = exdData->getField< int32_t >( row, 17 );
+  canCancel = exdData->getField< bool >( row, 18 );
+  maxDifficulty = exdData->getField< uint8_t >( row, 19 );
+  expFactor = exdData->getField< float >( row, 20 );
   expReward = exdData->getField< uint32_t >( row, 21 );
   gilReward = exdData->getField< uint32_t >( row, 22 );
   leveRewardItem = exdData->getField< uint16_t >( row, 23 );
@@ -3967,6 +5007,7 @@ Sapphire::Data::Leve::Leve( uint32_t row_id, Sapphire::Data::ExdDataGenerated* e
   leveVfxFrame = exdData->getField< uint8_t >( row, 25 );
   levelLevemete = exdData->getField< uint32_t >( row, 26 );
   iconIssuer = exdData->getField< int32_t >( row, 27 );
+  lockedLeve = exdData->getField< bool >( row, 28 );
   levelStart = exdData->getField< uint32_t >( row, 29 );
   bGM = exdData->getField< uint16_t >( row, 30 );
 }
@@ -4010,6 +5051,12 @@ Sapphire::Data::LeveRewardItemGroup::LeveRewardItemGroup( uint32_t row_id, Sapph
   auto row = exdData->m_LeveRewardItemGroupDat.get_row( row_id );
 }
 
+Sapphire::Data::LeveString::LeveString( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
+{
+  auto row = exdData->m_LeveStringDat.get_row( row_id );
+  objective = exdData->getField< std::string >( row, 0 );
+}
+
 Sapphire::Data::LeveVfx::LeveVfx( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
 {
   auto row = exdData->m_LeveVfxDat.get_row( row_id );
@@ -4017,10 +5064,24 @@ Sapphire::Data::LeveVfx::LeveVfx( uint32_t row_id, Sapphire::Data::ExdDataGenera
   icon = exdData->getField< int32_t >( row, 1 );
 }
 
+Sapphire::Data::Lobby::Lobby( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
+{
+  auto row = exdData->m_LobbyDat.get_row( row_id );
+  tYPE = exdData->getField< uint32_t >( row, 0 );
+  pARAM = exdData->getField< uint32_t >( row, 1 );
+  lINK = exdData->getField< uint32_t >( row, 2 );
+  text = exdData->getField< std::string >( row, 3 );
+}
+
 Sapphire::Data::LogFilter::LogFilter( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
 {
   auto row = exdData->m_LogFilterDat.get_row( row_id );
   logKind = exdData->getField< uint8_t >( row, 0 );
+  caster = exdData->getField< uint16_t >( row, 1 );
+  target = exdData->getField< uint16_t >( row, 2 );
+  category = exdData->getField< uint8_t >( row, 3 );
+  displayOrder = exdData->getField< uint8_t >( row, 4 );
+  preset = exdData->getField< uint8_t >( row, 5 );
   name = exdData->getField< std::string >( row, 6 );
   example = exdData->getField< std::string >( row, 7 );
 }
@@ -4029,15 +5090,6 @@ Sapphire::Data::LogKind::LogKind( uint32_t row_id, Sapphire::Data::ExdDataGenera
 {
   auto row = exdData->m_LogKindDat.get_row( row_id );
   format = exdData->getField< std::string >( row, 1 );
-  name = exdData->getField< std::string >( row, 2 );
-  example = exdData->getField< std::string >( row, 3 );
-  logKindCategoryText = exdData->getField< uint8_t >( row, 4 );
-}
-
-Sapphire::Data::LogKindCategoryText::LogKindCategoryText( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
-{
-  auto row = exdData->m_LogKindCategoryTextDat.get_row( row_id );
-  text = exdData->getField< std::string >( row, 0 );
 }
 
 Sapphire::Data::LogMessage::LogMessage( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
@@ -4101,7 +5153,9 @@ Sapphire::Data::MainCommand::MainCommand( uint32_t row_id, Sapphire::Data::ExdDa
 {
   auto row = exdData->m_MainCommandDat.get_row( row_id );
   icon = exdData->getField< int32_t >( row, 0 );
+  category = exdData->getField< uint8_t >( row, 1 );
   mainCommandCategory = exdData->getField< uint8_t >( row, 2 );
+  sortID = exdData->getField< int8_t >( row, 3 );
   name = exdData->getField< std::string >( row, 4 );
   description = exdData->getField< std::string >( row, 5 );
 }
@@ -4127,6 +5181,9 @@ Sapphire::Data::ManeuversArmor::ManeuversArmor( uint32_t row_id, Sapphire::Data:
 Sapphire::Data::Map::Map( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
 {
   auto row = exdData->m_MapDat.get_row( row_id );
+  mapCondition = exdData->getField< uint8_t >( row, 0 );
+  priorityCategoryUI = exdData->getField< uint8_t >( row, 1 );
+  priorityUI = exdData->getField< uint8_t >( row, 2 );
   mapIndex = exdData->getField< int8_t >( row, 3 );
   hierarchy = exdData->getField< uint8_t >( row, 4 );
   mapMarkerRange = exdData->getField< uint16_t >( row, 5 );
@@ -4138,8 +5195,10 @@ Sapphire::Data::Map::Map( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exd
   placeName = exdData->getField< uint16_t >( row, 11 );
   placeNameSub = exdData->getField< uint16_t >( row, 12 );
   discoveryIndex = exdData->getField< int16_t >( row, 13 );
+  discoveryFlag = exdData->getField< uint32_t >( row, 14 );
   territoryType = exdData->getField< uint16_t >( row, 15 );
   discoveryArrayByte = exdData->getField< bool >( row, 16 );
+  isEvent = exdData->getField< bool >( row, 17 );
 }
 
 Sapphire::Data::MapMarker::MapMarker( uint32_t row_id, uint32_t subRow, Sapphire::Data::ExdDataGenerated* exdData )
@@ -4167,6 +5226,7 @@ Sapphire::Data::MapSymbol::MapSymbol( uint32_t row_id, Sapphire::Data::ExdDataGe
   auto row = exdData->m_MapSymbolDat.get_row( row_id );
   icon = exdData->getField< int32_t >( row, 0 );
   placeName = exdData->getField< int32_t >( row, 1 );
+  displayNavi = exdData->getField< bool >( row, 2 );
 }
 
 Sapphire::Data::Marker::Marker( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
@@ -4245,6 +5305,12 @@ Sapphire::Data::MateriaJoinRateGatherCraft::MateriaJoinRateGatherCraft( uint32_t
   HQOvermeldSlot.push_back( exdData->getField< float >( row, 7 ) );
 }
 
+Sapphire::Data::MateriaTomestoneRate::MateriaTomestoneRate( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
+{
+  auto row = exdData->m_MateriaTomestoneRateDat.get_row( row_id );
+  rate = exdData->getField< uint32_t >( row, 0 );
+}
+
 Sapphire::Data::MiniGameRA::MiniGameRA( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
 {
   auto row = exdData->m_MiniGameRADat.get_row( row_id );
@@ -4275,13 +5341,16 @@ Sapphire::Data::MobHuntOrder::MobHuntOrder( uint32_t row_id, uint32_t subRow, Sa
 {
   auto row = exdData->m_MobHuntOrderDat.get_row( row_id, subRow );
   target = exdData->getField< uint16_t >( row, 0 );
-  stars = exdData->getField< uint8_t >( row, 1 );
+  neededKills = exdData->getField< uint8_t >( row, 1 );
+  type = exdData->getField< uint8_t >( row, 2 );
+  rank = exdData->getField< uint8_t >( row, 3 );
   mobHuntReward = exdData->getField< uint8_t >( row, 4 );
 }
 
 Sapphire::Data::MobHuntOrderType::MobHuntOrderType( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
 {
   auto row = exdData->m_MobHuntOrderTypeDat.get_row( row_id );
+  type = exdData->getField< uint8_t >( row, 0 );
   quest = exdData->getField< uint32_t >( row, 1 );
   eventItem = exdData->getField< uint32_t >( row, 2 );
   orderStart = exdData->getField< uint16_t >( row, 3 );
@@ -4293,6 +5362,7 @@ Sapphire::Data::MobHuntReward::MobHuntReward( uint32_t row_id, Sapphire::Data::E
   auto row = exdData->m_MobHuntRewardDat.get_row( row_id );
   expReward = exdData->getField< uint32_t >( row, 0 );
   gilReward = exdData->getField< uint16_t >( row, 1 );
+  expansion = exdData->getField< uint8_t >( row, 2 );
   currencyReward = exdData->getField< uint16_t >( row, 3 );
 }
 
@@ -4319,12 +5389,21 @@ Sapphire::Data::ModelChara::ModelChara( uint32_t row_id, Sapphire::Data::ExdData
   model = exdData->getField< uint16_t >( row, 1 );
   base = exdData->getField< uint8_t >( row, 2 );
   variant = exdData->getField< uint8_t >( row, 3 );
+  sEPack = exdData->getField< uint16_t >( row, 4 );
+  papVariation = exdData->getField< bool >( row, 7 );
 }
 
 Sapphire::Data::ModelSkeleton::ModelSkeleton( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
 {
   auto row = exdData->m_ModelSkeletonDat.get_row( row_id );
-  scaleFactor = exdData->getField< float >( row, 0 );
+  radius = exdData->getField< float >( row, 0 );
+  height = exdData->getField< float >( row, 1 );
+  vFXScale = exdData->getField< float >( row, 2 );
+  floatHeight = exdData->getField< float >( row, 11 );
+  floatDown = exdData->getField< float >( row, 12 );
+  floatUp = exdData->getField< uint16_t >( row, 13 );
+  motionBlendType = exdData->getField< bool >( row, 15 );
+  loopFlySE = exdData->getField< uint8_t >( row, 16 );
 }
 
 Sapphire::Data::ModelState::ModelState( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
@@ -4353,6 +5432,28 @@ Sapphire::Data::MonsterNoteTarget::MonsterNoteTarget( uint32_t row_id, Sapphire:
   auto row = exdData->m_MonsterNoteTargetDat.get_row( row_id );
   bNpcName = exdData->getField< uint16_t >( row, 0 );
   icon = exdData->getField< int32_t >( row, 1 );
+  town = exdData->getField< uint8_t >( row, 2 );
+}
+
+Sapphire::Data::MotionTimeline::MotionTimeline( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
+{
+  auto row = exdData->m_MotionTimelineDat.get_row( row_id );
+  filename = exdData->getField< std::string >( row, 0 );
+  blendGroup = exdData->getField< uint8_t >( row, 1 );
+  isLoop = exdData->getField< bool >( row, 2 );
+  isBlinkEnable = exdData->getField< bool >( row, 3 );
+  isLipEnable = exdData->getField< bool >( row, 4 );
+}
+
+Sapphire::Data::MotionTimelineBlendTable::MotionTimelineBlendTable( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
+{
+  auto row = exdData->m_MotionTimelineBlendTableDat.get_row( row_id );
+  destBlendGroup = exdData->getField< uint8_t >( row, 0 );
+  srcBlendGroup = exdData->getField< uint8_t >( row, 1 );
+  blendFrame_PC = exdData->getField< uint8_t >( row, 2 );
+  blendFram_TypeA = exdData->getField< uint8_t >( row, 3 );
+  blendFram_TypeB = exdData->getField< uint8_t >( row, 4 );
+  blendFram_TypeC = exdData->getField< uint8_t >( row, 5 );
 }
 
 Sapphire::Data::Mount::Mount( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
@@ -4370,11 +5471,23 @@ Sapphire::Data::Mount::Mount( uint32_t row_id, Sapphire::Data::ExdDataGenerated*
   isFlying = exdData->getField< uint8_t >( row, 14 );
   mountCustomize = exdData->getField< uint8_t >( row, 16 );
   rideBGM = exdData->getField< uint16_t >( row, 17 );
+  exitMoveDist = exdData->getField< uint8_t >( row, 21 );
+  exitMoveSpeed = exdData->getField< uint8_t >( row, 22 );
+  isEmote = exdData->getField< bool >( row, 24 );
+  equipHead = exdData->getField< int32_t >( row, 25 );
+  equipBody = exdData->getField< int32_t >( row, 26 );
+  equipLeg = exdData->getField< int32_t >( row, 27 );
+  equipFoot = exdData->getField< int32_t >( row, 28 );
   order = exdData->getField< int16_t >( row, 29 );
   icon = exdData->getField< uint16_t >( row, 30 );
+  uIPriority = exdData->getField< uint8_t >( row, 31 );
+  radiusRate = exdData->getField< uint8_t >( row, 32 );
+  baseMotionSpeed_Run = exdData->getField< uint8_t >( row, 33 );
+  baseMotionSpeed_Walk = exdData->getField< uint8_t >( row, 34 );
   extraSeats = exdData->getField< uint8_t >( row, 36 );
   mountAction = exdData->getField< uint16_t >( row, 37 );
   isAirborne = exdData->getField< bool >( row, 38 );
+  exHotbarEnableConfig = exdData->getField< bool >( row, 39 );
   useEP = exdData->getField< bool >( row, 40 );
   isImmobile = exdData->getField< bool >( row, 42 );
 }
@@ -4469,11 +5582,43 @@ Sapphire::Data::MoveVfx::MoveVfx( uint32_t row_id, Sapphire::Data::ExdDataGenera
   vFXWalking = exdData->getField< uint16_t >( row, 1 );
 }
 
+Sapphire::Data::MovieSubtitle::MovieSubtitle( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
+{
+  auto row = exdData->m_MovieSubtitleDat.get_row( row_id );
+  startTime = exdData->getField< float >( row, 0 );
+  endTime = exdData->getField< float >( row, 1 );
+}
+
+Sapphire::Data::MovieSubtitle500::MovieSubtitle500( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
+{
+  auto row = exdData->m_MovieSubtitle500Dat.get_row( row_id );
+  startTime = exdData->getField< float >( row, 0 );
+  endTime = exdData->getField< float >( row, 1 );
+}
+
+Sapphire::Data::MovieSubtitleVoyage::MovieSubtitleVoyage( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
+{
+  auto row = exdData->m_MovieSubtitleVoyageDat.get_row( row_id );
+  startTime = exdData->getField< float >( row, 0 );
+  endTime = exdData->getField< float >( row, 1 );
+}
+
 Sapphire::Data::NotebookDivision::NotebookDivision( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
 {
   auto row = exdData->m_NotebookDivisionDat.get_row( row_id );
   name = exdData->getField< std::string >( row, 0 );
   notebookDivisionCategory = exdData->getField< uint8_t >( row, 1 );
+  craftOpeningLevel = exdData->getField< uint8_t >( row, 2 );
+  gatheringOpeningLevel = exdData->getField< uint8_t >( row, 3 );
+  questUnlock = exdData->getField< uint32_t >( row, 4 );
+  cRPCraft = exdData->getField< bool >( row, 7 );
+  bSMCraft = exdData->getField< bool >( row, 8 );
+  aRMCraft = exdData->getField< bool >( row, 9 );
+  gSMCraft = exdData->getField< bool >( row, 10 );
+  lTWCraft = exdData->getField< bool >( row, 11 );
+  wVRCraft = exdData->getField< bool >( row, 12 );
+  aLCCraft = exdData->getField< bool >( row, 13 );
+  cULCraft = exdData->getField< bool >( row, 14 );
 }
 
 Sapphire::Data::NotebookDivisionCategory::NotebookDivisionCategory( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
@@ -4523,18 +5668,27 @@ Sapphire::Data::NpcEquip::NpcEquip( uint32_t row_id, Sapphire::Data::ExdDataGene
 Sapphire::Data::NpcYell::NpcYell( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
 {
   auto row = exdData->m_NpcYellDat.get_row( row_id );
-  text = exdData->getField< std::string >( row, 9 );
+  outputType = exdData->getField< uint8_t >( row, 5 );
+  balloonTime = exdData->getField< float >( row, 6 );
+  isBalloonSlow = exdData->getField< bool >( row, 7 );
+  battleTalkTime = exdData->getField< bool >( row, 8 );
+  text = exdData->getField< float >( row, 9 );
 }
 
 Sapphire::Data::Omen::Omen( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
 {
   auto row = exdData->m_OmenDat.get_row( row_id );
-  fileName = exdData->getField< std::string >( row, 0 );
+  path = exdData->getField< std::string >( row, 0 );
+  pathAlly = exdData->getField< std::string >( row, 1 );
+  type = exdData->getField< uint8_t >( row, 2 );
+  restrictYScale = exdData->getField< bool >( row, 3 );
+  largeScale = exdData->getField< bool >( row, 4 );
 }
 
 Sapphire::Data::OnlineStatus::OnlineStatus( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
 {
   auto row = exdData->m_OnlineStatusDat.get_row( row_id );
+  list = exdData->getField< bool >( row, 0 );
   priority = exdData->getField< uint8_t >( row, 2 );
   name = exdData->getField< std::string >( row, 3 );
   icon = exdData->getField< uint32_t >( row, 4 );
@@ -4621,6 +5775,7 @@ Sapphire::Data::ParamGrow::ParamGrow( uint32_t row_id, Sapphire::Data::ExdDataGe
   auto row = exdData->m_ParamGrowDat.get_row( row_id );
   expToNext = exdData->getField< int32_t >( row, 0 );
   additionalActions = exdData->getField< uint8_t >( row, 1 );
+  applyAction = exdData->getField< uint8_t >( row, 2 );
   scaledQuestXP = exdData->getField< uint16_t >( row, 3 );
   mpModifier = exdData->getField< int32_t >( row, 4 );
   baseSpeed = exdData->getField< int32_t >( row, 5 );
@@ -4628,7 +5783,10 @@ Sapphire::Data::ParamGrow::ParamGrow( uint32_t row_id, Sapphire::Data::ExdDataGe
   questExpModifier = exdData->getField< uint8_t >( row, 7 );
   hpModifier = exdData->getField< uint16_t >( row, 8 );
   huntingLogExpReward = exdData->getField< int32_t >( row, 9 );
+  monsterNoteSeals = exdData->getField< int32_t >( row, 10 );
   itemLevelSync = exdData->getField< uint16_t >( row, 11 );
+  properDungeon = exdData->getField< uint16_t >( row, 12 );
+  properGuildOrder = exdData->getField< uint16_t >( row, 13 );
   craftingLevel = exdData->getField< uint16_t >( row, 14 );
 }
 
@@ -4637,7 +5795,7 @@ Sapphire::Data::PartyContent::PartyContent( uint32_t row_id, Sapphire::Data::Exd
   auto row = exdData->m_PartyContentDat.get_row( row_id );
   key = exdData->getField< uint8_t >( row, 0 );
   timeLimit = exdData->getField< uint16_t >( row, 1 );
-  name = exdData->getField< std::string >( row, 2 );
+  name = exdData->getField< bool >( row, 2 );
   textDataStart = exdData->getField< uint32_t >( row, 3 );
   textDataEnd = exdData->getField< uint32_t >( row, 4 );
   contentFinderCondition = exdData->getField< uint16_t >( row, 33 );
@@ -4656,6 +5814,16 @@ Sapphire::Data::PartyContentTextData::PartyContentTextData( uint32_t row_id, Sap
   data = exdData->getField< std::string >( row, 0 );
 }
 
+Sapphire::Data::PatchMark::PatchMark( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
+{
+  auto row = exdData->m_PatchMarkDat.get_row( row_id );
+  category = exdData->getField< int8_t >( row, 0 );
+  subCategoryType = exdData->getField< uint8_t >( row, 1 );
+  subCategory = exdData->getField< uint16_t >( row, 2 );
+  markID = exdData->getField< uint32_t >( row, 5 );
+  version = exdData->getField< uint8_t >( row, 6 );
+}
+
 Sapphire::Data::Perform::Perform( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
 {
   auto row = exdData->m_PerformDat.get_row( row_id );
@@ -4691,6 +5859,43 @@ Sapphire::Data::PetAction::PetAction( uint32_t row_id, Sapphire::Data::ExdDataGe
   icon = exdData->getField< int32_t >( row, 2 );
   action = exdData->getField< uint16_t >( row, 3 );
   pet = exdData->getField< uint8_t >( row, 4 );
+  masterOrder = exdData->getField< bool >( row, 5 );
+  disableOrder = exdData->getField< bool >( row, 6 );
+}
+
+Sapphire::Data::PhysicsGroup::PhysicsGroup( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
+{
+  auto row = exdData->m_PhysicsGroupDat.get_row( row_id );
+  simulationTime.push_back( exdData->getField< float >( row, 0 ) );
+  simulationTime.push_back( exdData->getField< float >( row, 1 ) );
+  simulationTime.push_back( exdData->getField< float >( row, 2 ) );
+  simulationTime.push_back( exdData->getField< float >( row, 3 ) );
+  simulationTime.push_back( exdData->getField< float >( row, 4 ) );
+  simulationTime.push_back( exdData->getField< float >( row, 5 ) );
+  pS3SimulationTime.push_back( exdData->getField< float >( row, 6 ) );
+  pS3SimulationTime.push_back( exdData->getField< float >( row, 7 ) );
+  pS3SimulationTime.push_back( exdData->getField< float >( row, 8 ) );
+  pS3SimulationTime.push_back( exdData->getField< float >( row, 9 ) );
+  pS3SimulationTime.push_back( exdData->getField< float >( row, 10 ) );
+  pS3SimulationTime.push_back( exdData->getField< float >( row, 11 ) );
+  resetByLookAt = exdData->getField< bool >( row, 12 );
+  rootFollowingGame = exdData->getField< float >( row, 13 );
+  rootFollowingCutScene = exdData->getField< float >( row, 14 );
+  configSwitch.push_back( exdData->getField< int8_t >( row, 15 ) );
+  configSwitch.push_back( exdData->getField< int8_t >( row, 16 ) );
+  configSwitch.push_back( exdData->getField< int8_t >( row, 17 ) );
+  forceAttractByPhysicsOff = exdData->getField< bool >( row, 18 );
+}
+
+Sapphire::Data::PhysicsWind::PhysicsWind( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
+{
+  auto row = exdData->m_PhysicsWindDat.get_row( row_id );
+  threshold = exdData->getField< float >( row, 0 );
+  amplitude = exdData->getField< float >( row, 1 );
+  amplitudeFrequency = exdData->getField< float >( row, 2 );
+  powerMin = exdData->getField< float >( row, 3 );
+  powerMax = exdData->getField< float >( row, 4 );
+  powerFrequency = exdData->getField< float >( row, 5 );
 }
 
 Sapphire::Data::Picture::Picture( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
@@ -4698,7 +5903,6 @@ Sapphire::Data::Picture::Picture( uint32_t row_id, Sapphire::Data::ExdDataGenera
   auto row = exdData->m_PictureDat.get_row( row_id );
   item = exdData->getField< int32_t >( row, 0 );
   image = exdData->getField< int32_t >( row, 1 );
-  signature = exdData->getField< int32_t >( row, 2 );
 }
 
 Sapphire::Data::PlaceName::PlaceName( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
@@ -4729,6 +5933,47 @@ Sapphire::Data::PreHandler::PreHandler( uint32_t row_id, Sapphire::Data::ExdData
   actionTimeline = exdData->getField< uint16_t >( row, 2 );
 }
 
+Sapphire::Data::PresetCamera::PresetCamera( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
+{
+  auto row = exdData->m_PresetCameraDat.get_row( row_id );
+  eID = exdData->getField< uint16_t >( row, 0 );
+  posX = exdData->getField< float >( row, 1 );
+  posY = exdData->getField< float >( row, 2 );
+  posZ = exdData->getField< float >( row, 3 );
+  elezen = exdData->getField< float >( row, 4 );
+  lalafell = exdData->getField< float >( row, 5 );
+  miqote = exdData->getField< float >( row, 6 );
+  roe = exdData->getField< float >( row, 7 );
+  hrothgar = exdData->getField< float >( row, 8 );
+  viera = exdData->getField< float >( row, 9 );
+  hyur_F = exdData->getField< float >( row, 10 );
+  elezen_F = exdData->getField< float >( row, 11 );
+  lalafell_F = exdData->getField< float >( row, 12 );
+  miqote_F = exdData->getField< float >( row, 13 );
+  roe_F = exdData->getField< float >( row, 14 );
+  hrothgar_F = exdData->getField< float >( row, 15 );
+  viera_F = exdData->getField< float >( row, 16 );
+}
+
+Sapphire::Data::PresetCameraAdjust::PresetCameraAdjust( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
+{
+  auto row = exdData->m_PresetCameraAdjustDat.get_row( row_id );
+  hyur_M = exdData->getField< float >( row, 0 );
+  hyur_F = exdData->getField< float >( row, 1 );
+  elezen_M = exdData->getField< float >( row, 2 );
+  elezen_F = exdData->getField< float >( row, 3 );
+  lalafell_M = exdData->getField< float >( row, 4 );
+  lalafell_F = exdData->getField< float >( row, 5 );
+  miqote_M = exdData->getField< float >( row, 6 );
+  miqote_F = exdData->getField< float >( row, 7 );
+  roe_M = exdData->getField< float >( row, 8 );
+  roe_F = exdData->getField< float >( row, 9 );
+  hrothgar_M = exdData->getField< float >( row, 10 );
+  hrothgar_F = exdData->getField< float >( row, 11 );
+  viera_M = exdData->getField< float >( row, 12 );
+  viera_F = exdData->getField< float >( row, 13 );
+}
+
 Sapphire::Data::PublicContent::PublicContent( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
 {
   auto row = exdData->m_PublicContentDat.get_row( row_id );
@@ -4755,10 +6000,20 @@ Sapphire::Data::PublicContentTextData::PublicContentTextData( uint32_t row_id, S
   textData = exdData->getField< std::string >( row, 0 );
 }
 
+Sapphire::Data::Purify::Purify( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
+{
+  auto row = exdData->m_PurifyDat.get_row( row_id );
+  _class = exdData->getField< uint8_t >( row, 0 );
+  level = exdData->getField< uint8_t >( row, 1 );
+}
+
 Sapphire::Data::PvPAction::PvPAction( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
 {
   auto row = exdData->m_PvPActionDat.get_row( row_id );
   action = exdData->getField< uint16_t >( row, 0 );
+  grandCompany.push_back( exdData->getField< bool >( row, 5 ) );
+  grandCompany.push_back( exdData->getField< bool >( row, 6 ) );
+  grandCompany.push_back( exdData->getField< bool >( row, 7 ) );
 }
 
 Sapphire::Data::PvPActionSort::PvPActionSort( uint32_t row_id, uint32_t subRow, Sapphire::Data::ExdDataGenerated* exdData )
@@ -5736,6 +6991,13 @@ Sapphire::Data::QuestBattle::QuestBattle( uint32_t row_id, Sapphire::Data::ExdDa
   scriptValue.push_back( exdData->getField< uint32_t >( row, 403 ) );
 }
 
+Sapphire::Data::QuestChapter::QuestChapter( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
+{
+  auto row = exdData->m_QuestChapterDat.get_row( row_id );
+  quest = exdData->getField< uint32_t >( row, 0 );
+  redo = exdData->getField< uint16_t >( row, 1 );
+}
+
 Sapphire::Data::QuestClassJobReward::QuestClassJobReward( uint32_t row_id, uint32_t subRow, Sapphire::Data::ExdDataGenerated* exdData )
 {
   auto row = exdData->m_QuestClassJobRewardDat.get_row( row_id, subRow );
@@ -5766,6 +7028,84 @@ Sapphire::Data::QuestClassJobSupply::QuestClassJobSupply( uint32_t row_id, uint3
   item = exdData->getField< uint32_t >( row, 3 );
 }
 
+Sapphire::Data::QuestDerivedClass::QuestDerivedClass( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
+{
+  auto row = exdData->m_QuestDerivedClassDat.get_row( row_id );
+  quest = exdData->getField< uint32_t >( row, 0 );
+}
+
+Sapphire::Data::QuestRedo::QuestRedo( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
+{
+  auto row = exdData->m_QuestRedoDat.get_row( row_id );
+  finalQuest = exdData->getField< uint32_t >( row, 0 );
+  chapter = exdData->getField< uint16_t >( row, 2 );
+  quest.push_back( exdData->getField< uint32_t >( row, 3 ) );
+  quest.push_back( exdData->getField< uint32_t >( row, 4 ) );
+  quest.push_back( exdData->getField< uint32_t >( row, 5 ) );
+  quest.push_back( exdData->getField< uint32_t >( row, 6 ) );
+  quest.push_back( exdData->getField< uint32_t >( row, 7 ) );
+  quest.push_back( exdData->getField< uint32_t >( row, 8 ) );
+  quest.push_back( exdData->getField< uint32_t >( row, 9 ) );
+  quest.push_back( exdData->getField< uint32_t >( row, 10 ) );
+  quest.push_back( exdData->getField< uint32_t >( row, 11 ) );
+  quest.push_back( exdData->getField< uint32_t >( row, 12 ) );
+  quest.push_back( exdData->getField< uint32_t >( row, 13 ) );
+  quest.push_back( exdData->getField< uint32_t >( row, 14 ) );
+  quest.push_back( exdData->getField< uint32_t >( row, 15 ) );
+  quest.push_back( exdData->getField< uint32_t >( row, 16 ) );
+  quest.push_back( exdData->getField< uint32_t >( row, 17 ) );
+  quest.push_back( exdData->getField< uint32_t >( row, 18 ) );
+  quest.push_back( exdData->getField< uint32_t >( row, 19 ) );
+  quest.push_back( exdData->getField< uint32_t >( row, 20 ) );
+  quest.push_back( exdData->getField< uint32_t >( row, 21 ) );
+  quest.push_back( exdData->getField< uint32_t >( row, 22 ) );
+  quest.push_back( exdData->getField< uint32_t >( row, 23 ) );
+  quest.push_back( exdData->getField< uint32_t >( row, 24 ) );
+  quest.push_back( exdData->getField< uint32_t >( row, 25 ) );
+  quest.push_back( exdData->getField< uint32_t >( row, 26 ) );
+  quest.push_back( exdData->getField< uint32_t >( row, 27 ) );
+  quest.push_back( exdData->getField< uint32_t >( row, 28 ) );
+  quest.push_back( exdData->getField< uint32_t >( row, 29 ) );
+  quest.push_back( exdData->getField< uint32_t >( row, 30 ) );
+  quest.push_back( exdData->getField< uint32_t >( row, 31 ) );
+  quest.push_back( exdData->getField< uint32_t >( row, 32 ) );
+  quest.push_back( exdData->getField< uint32_t >( row, 33 ) );
+  quest.push_back( exdData->getField< uint32_t >( row, 34 ) );
+}
+
+Sapphire::Data::QuestRedoChapterUI::QuestRedoChapterUI( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
+{
+  auto row = exdData->m_QuestRedoChapterUIDat.get_row( row_id );
+  quest = exdData->getField< uint32_t >( row, 0 );
+  category = exdData->getField< uint8_t >( row, 2 );
+  questRedoUISmall = exdData->getField< uint32_t >( row, 4 );
+  questRedoUILarge = exdData->getField< uint32_t >( row, 5 );
+  questRedoUIWide = exdData->getField< uint32_t >( row, 6 );
+  chapterName = exdData->getField< std::string >( row, 7 );
+  chapterPart = exdData->getField< std::string >( row, 8 );
+  transient = exdData->getField< std::string >( row, 9 );
+}
+
+Sapphire::Data::QuestRedoChapterUICategory::QuestRedoChapterUICategory( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
+{
+  auto row = exdData->m_QuestRedoChapterUICategoryDat.get_row( row_id );
+  expac = exdData->getField< std::string >( row, 1 );
+}
+
+Sapphire::Data::QuestRedoChapterUITab::QuestRedoChapterUITab( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
+{
+  auto row = exdData->m_QuestRedoChapterUITabDat.get_row( row_id );
+  icon1 = exdData->getField< uint32_t >( row, 1 );
+  icon2 = exdData->getField< uint32_t >( row, 2 );
+  text = exdData->getField< std::string >( row, 3 );
+}
+
+Sapphire::Data::QuestRedoIncompChapter::QuestRedoIncompChapter( uint32_t row_id, uint32_t subRow, Sapphire::Data::ExdDataGenerated* exdData )
+{
+  auto row = exdData->m_QuestRedoIncompChapterDat.get_row( row_id, subRow );
+  chapter = exdData->getField< uint16_t >( row, 0 );
+}
+
 Sapphire::Data::QuestRepeatFlag::QuestRepeatFlag( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
 {
   auto row = exdData->m_QuestRepeatFlagDat.get_row( row_id );
@@ -5865,6 +7205,7 @@ Sapphire::Data::RecastNavimesh::RecastNavimesh( uint32_t row_id, Sapphire::Data:
 Sapphire::Data::Recipe::Recipe( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
 {
   auto row = exdData->m_RecipeDat.get_row( row_id );
+  number = exdData->getField< int32_t >( row, 0 );
   craftType = exdData->getField< int32_t >( row, 1 );
   recipeLevelTable = exdData->getField< uint16_t >( row, 2 );
   itemResult = exdData->getField< int32_t >( row, 3 );
@@ -6069,6 +7410,9 @@ Sapphire::Data::RecommendContents::RecommendContents( uint32_t row_id, Sapphire:
 {
   auto row = exdData->m_RecommendContentsDat.get_row( row_id );
   level = exdData->getField< int32_t >( row, 0 );
+  classJob = exdData->getField< uint8_t >( row, 1 );
+  minLevel = exdData->getField< uint8_t >( row, 2 );
+  maxLevel = exdData->getField< uint8_t >( row, 3 );
 }
 
 Sapphire::Data::Relic::Relic( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
@@ -6077,6 +7421,19 @@ Sapphire::Data::Relic::Relic( uint32_t row_id, Sapphire::Data::ExdDataGenerated*
   itemAtma = exdData->getField< uint32_t >( row, 0 );
   itemAnimus = exdData->getField< uint32_t >( row, 1 );
   icon = exdData->getField< int32_t >( row, 2 );
+  materia0 = exdData->getField< uint16_t >( row, 3 );
+  noteMain0 = exdData->getField< uint8_t >( row, 4 );
+  noteSub0 = exdData->getField< uint8_t >( row, 5 );
+  noteSelection10 = exdData->getField< uint8_t >( row, 6 );
+  materia1 = exdData->getField< uint16_t >( row, 7 );
+  noteMain1 = exdData->getField< uint8_t >( row, 8 );
+  noteSub1 = exdData->getField< uint8_t >( row, 9 );
+  noteSelection1 = exdData->getField< uint8_t >( row, 10 );
+  materia2 = exdData->getField< uint16_t >( row, 11 );
+  noteMain2 = exdData->getField< uint8_t >( row, 12 );
+  noteSub2 = exdData->getField< uint8_t >( row, 13 );
+  materia3 = exdData->getField< uint16_t >( row, 14 );
+  noteSelection3 = exdData->getField< uint8_t >( row, 15 );
 }
 
 Sapphire::Data::Relic3::Relic3( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
@@ -6200,6 +7557,7 @@ Sapphire::Data::SatisfactionNpc::SatisfactionNpc( uint32_t row_id, Sapphire::Dat
   auto row = exdData->m_SatisfactionNpcDat.get_row( row_id );
   npc = exdData->getField< int32_t >( row, 0 );
   questRequired = exdData->getField< int32_t >( row, 1 );
+  levelUnlock = exdData->getField< uint8_t >( row, 2 );
   deliveriesPerWeek = exdData->getField< uint8_t >( row, 3 );
   supplyIndex.push_back( exdData->getField< int32_t >( row, 4 ) );
   supplyIndex.push_back( exdData->getField< int32_t >( row, 5 ) );
@@ -6278,6 +7636,9 @@ Sapphire::Data::ScreenImage::ScreenImage( uint32_t row_id, Sapphire::Data::ExdDa
 {
   auto row = exdData->m_ScreenImageDat.get_row( row_id );
   image = exdData->getField< uint32_t >( row, 0 );
+  jingle = exdData->getField< int16_t >( row, 1 );
+  type = exdData->getField< int8_t >( row, 2 );
+  lang = exdData->getField< bool >( row, 3 );
 }
 
 Sapphire::Data::SecretRecipeBook::SecretRecipeBook( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
@@ -6340,6 +7701,7 @@ Sapphire::Data::SpearfishingItem::SpearfishingItem( uint32_t row_id, Sapphire::D
   description = exdData->getField< std::string >( row, 0 );
   item = exdData->getField< int32_t >( row, 1 );
   gatheringItemLevel = exdData->getField< uint16_t >( row, 2 );
+  fishingRecordType = exdData->getField< uint8_t >( row, 3 );
   territoryType = exdData->getField< uint16_t >( row, 4 );
   isVisible = exdData->getField< bool >( row, 5 );
 }
@@ -6547,69 +7909,70 @@ Sapphire::Data::SpecialShop::SpecialShop( uint32_t row_id, Sapphire::Data::ExdDa
   achievementUnlock.push_back( exdData->getField< int32_t >( row, 1378 ) );
   achievementUnlock.push_back( exdData->getField< int32_t >( row, 1379 ) );
   achievementUnlock.push_back( exdData->getField< int32_t >( row, 1380 ) );
-  patchNumber.push_back( exdData->getField< uint16_t >( row, 1801 ) );
-  patchNumber.push_back( exdData->getField< uint16_t >( row, 1802 ) );
-  patchNumber.push_back( exdData->getField< uint16_t >( row, 1803 ) );
-  patchNumber.push_back( exdData->getField< uint16_t >( row, 1804 ) );
-  patchNumber.push_back( exdData->getField< uint16_t >( row, 1805 ) );
-  patchNumber.push_back( exdData->getField< uint16_t >( row, 1806 ) );
-  patchNumber.push_back( exdData->getField< uint16_t >( row, 1807 ) );
-  patchNumber.push_back( exdData->getField< uint16_t >( row, 1808 ) );
-  patchNumber.push_back( exdData->getField< uint16_t >( row, 1809 ) );
-  patchNumber.push_back( exdData->getField< uint16_t >( row, 1810 ) );
-  patchNumber.push_back( exdData->getField< uint16_t >( row, 1811 ) );
-  patchNumber.push_back( exdData->getField< uint16_t >( row, 1812 ) );
-  patchNumber.push_back( exdData->getField< uint16_t >( row, 1813 ) );
-  patchNumber.push_back( exdData->getField< uint16_t >( row, 1814 ) );
-  patchNumber.push_back( exdData->getField< uint16_t >( row, 1815 ) );
-  patchNumber.push_back( exdData->getField< uint16_t >( row, 1816 ) );
-  patchNumber.push_back( exdData->getField< uint16_t >( row, 1817 ) );
-  patchNumber.push_back( exdData->getField< uint16_t >( row, 1818 ) );
-  patchNumber.push_back( exdData->getField< uint16_t >( row, 1819 ) );
-  patchNumber.push_back( exdData->getField< uint16_t >( row, 1820 ) );
-  patchNumber.push_back( exdData->getField< uint16_t >( row, 1821 ) );
-  patchNumber.push_back( exdData->getField< uint16_t >( row, 1822 ) );
-  patchNumber.push_back( exdData->getField< uint16_t >( row, 1823 ) );
-  patchNumber.push_back( exdData->getField< uint16_t >( row, 1824 ) );
-  patchNumber.push_back( exdData->getField< uint16_t >( row, 1825 ) );
-  patchNumber.push_back( exdData->getField< uint16_t >( row, 1826 ) );
-  patchNumber.push_back( exdData->getField< uint16_t >( row, 1827 ) );
-  patchNumber.push_back( exdData->getField< uint16_t >( row, 1828 ) );
-  patchNumber.push_back( exdData->getField< uint16_t >( row, 1829 ) );
-  patchNumber.push_back( exdData->getField< uint16_t >( row, 1830 ) );
-  patchNumber.push_back( exdData->getField< uint16_t >( row, 1831 ) );
-  patchNumber.push_back( exdData->getField< uint16_t >( row, 1832 ) );
-  patchNumber.push_back( exdData->getField< uint16_t >( row, 1833 ) );
-  patchNumber.push_back( exdData->getField< uint16_t >( row, 1834 ) );
-  patchNumber.push_back( exdData->getField< uint16_t >( row, 1835 ) );
-  patchNumber.push_back( exdData->getField< uint16_t >( row, 1836 ) );
-  patchNumber.push_back( exdData->getField< uint16_t >( row, 1837 ) );
-  patchNumber.push_back( exdData->getField< uint16_t >( row, 1838 ) );
-  patchNumber.push_back( exdData->getField< uint16_t >( row, 1839 ) );
-  patchNumber.push_back( exdData->getField< uint16_t >( row, 1840 ) );
-  patchNumber.push_back( exdData->getField< uint16_t >( row, 1841 ) );
-  patchNumber.push_back( exdData->getField< uint16_t >( row, 1842 ) );
-  patchNumber.push_back( exdData->getField< uint16_t >( row, 1843 ) );
-  patchNumber.push_back( exdData->getField< uint16_t >( row, 1844 ) );
-  patchNumber.push_back( exdData->getField< uint16_t >( row, 1845 ) );
-  patchNumber.push_back( exdData->getField< uint16_t >( row, 1846 ) );
-  patchNumber.push_back( exdData->getField< uint16_t >( row, 1847 ) );
-  patchNumber.push_back( exdData->getField< uint16_t >( row, 1848 ) );
-  patchNumber.push_back( exdData->getField< uint16_t >( row, 1849 ) );
-  patchNumber.push_back( exdData->getField< uint16_t >( row, 1850 ) );
-  patchNumber.push_back( exdData->getField< uint16_t >( row, 1851 ) );
-  patchNumber.push_back( exdData->getField< uint16_t >( row, 1852 ) );
-  patchNumber.push_back( exdData->getField< uint16_t >( row, 1853 ) );
-  patchNumber.push_back( exdData->getField< uint16_t >( row, 1854 ) );
-  patchNumber.push_back( exdData->getField< uint16_t >( row, 1855 ) );
-  patchNumber.push_back( exdData->getField< uint16_t >( row, 1856 ) );
-  patchNumber.push_back( exdData->getField< uint16_t >( row, 1857 ) );
-  patchNumber.push_back( exdData->getField< uint16_t >( row, 1858 ) );
-  patchNumber.push_back( exdData->getField< uint16_t >( row, 1859 ) );
-  patchNumber.push_back( exdData->getField< uint16_t >( row, 1860 ) );
-  questUnlock = exdData->getField< uint32_t >( row, 1862 );
-  notCompleteText = exdData->getField< int32_t >( row, 1863 );
-  completeText = exdData->getField< int32_t >( row, 1864 );
+  patchNumber.push_back( exdData->getField< uint8_t >( row, 1801 ) );
+  patchNumber.push_back( exdData->getField< uint8_t >( row, 1802 ) );
+  patchNumber.push_back( exdData->getField< uint8_t >( row, 1803 ) );
+  patchNumber.push_back( exdData->getField< uint8_t >( row, 1804 ) );
+  patchNumber.push_back( exdData->getField< uint8_t >( row, 1805 ) );
+  patchNumber.push_back( exdData->getField< uint8_t >( row, 1806 ) );
+  patchNumber.push_back( exdData->getField< uint8_t >( row, 1807 ) );
+  patchNumber.push_back( exdData->getField< uint8_t >( row, 1808 ) );
+  patchNumber.push_back( exdData->getField< uint8_t >( row, 1809 ) );
+  patchNumber.push_back( exdData->getField< uint8_t >( row, 1810 ) );
+  patchNumber.push_back( exdData->getField< uint8_t >( row, 1811 ) );
+  patchNumber.push_back( exdData->getField< uint8_t >( row, 1812 ) );
+  patchNumber.push_back( exdData->getField< uint8_t >( row, 1813 ) );
+  patchNumber.push_back( exdData->getField< uint8_t >( row, 1814 ) );
+  patchNumber.push_back( exdData->getField< uint8_t >( row, 1815 ) );
+  patchNumber.push_back( exdData->getField< uint8_t >( row, 1816 ) );
+  patchNumber.push_back( exdData->getField< uint8_t >( row, 1817 ) );
+  patchNumber.push_back( exdData->getField< uint8_t >( row, 1818 ) );
+  patchNumber.push_back( exdData->getField< uint8_t >( row, 1819 ) );
+  patchNumber.push_back( exdData->getField< uint8_t >( row, 1820 ) );
+  patchNumber.push_back( exdData->getField< uint8_t >( row, 1821 ) );
+  patchNumber.push_back( exdData->getField< uint8_t >( row, 1822 ) );
+  patchNumber.push_back( exdData->getField< uint8_t >( row, 1823 ) );
+  patchNumber.push_back( exdData->getField< uint8_t >( row, 1824 ) );
+  patchNumber.push_back( exdData->getField< uint8_t >( row, 1825 ) );
+  patchNumber.push_back( exdData->getField< uint8_t >( row, 1826 ) );
+  patchNumber.push_back( exdData->getField< uint8_t >( row, 1827 ) );
+  patchNumber.push_back( exdData->getField< uint8_t >( row, 1828 ) );
+  patchNumber.push_back( exdData->getField< uint8_t >( row, 1829 ) );
+  patchNumber.push_back( exdData->getField< uint8_t >( row, 1830 ) );
+  patchNumber.push_back( exdData->getField< uint8_t >( row, 1831 ) );
+  patchNumber.push_back( exdData->getField< uint8_t >( row, 1832 ) );
+  patchNumber.push_back( exdData->getField< uint8_t >( row, 1833 ) );
+  patchNumber.push_back( exdData->getField< uint8_t >( row, 1834 ) );
+  patchNumber.push_back( exdData->getField< uint8_t >( row, 1835 ) );
+  patchNumber.push_back( exdData->getField< uint8_t >( row, 1836 ) );
+  patchNumber.push_back( exdData->getField< uint8_t >( row, 1837 ) );
+  patchNumber.push_back( exdData->getField< uint8_t >( row, 1838 ) );
+  patchNumber.push_back( exdData->getField< uint8_t >( row, 1839 ) );
+  patchNumber.push_back( exdData->getField< uint8_t >( row, 1840 ) );
+  patchNumber.push_back( exdData->getField< uint8_t >( row, 1841 ) );
+  patchNumber.push_back( exdData->getField< uint8_t >( row, 1842 ) );
+  patchNumber.push_back( exdData->getField< uint8_t >( row, 1843 ) );
+  patchNumber.push_back( exdData->getField< uint8_t >( row, 1844 ) );
+  patchNumber.push_back( exdData->getField< uint8_t >( row, 1845 ) );
+  patchNumber.push_back( exdData->getField< uint8_t >( row, 1846 ) );
+  patchNumber.push_back( exdData->getField< uint8_t >( row, 1847 ) );
+  patchNumber.push_back( exdData->getField< uint8_t >( row, 1848 ) );
+  patchNumber.push_back( exdData->getField< uint8_t >( row, 1849 ) );
+  patchNumber.push_back( exdData->getField< uint8_t >( row, 1850 ) );
+  patchNumber.push_back( exdData->getField< uint8_t >( row, 1851 ) );
+  patchNumber.push_back( exdData->getField< uint8_t >( row, 1852 ) );
+  patchNumber.push_back( exdData->getField< uint8_t >( row, 1853 ) );
+  patchNumber.push_back( exdData->getField< uint8_t >( row, 1854 ) );
+  patchNumber.push_back( exdData->getField< uint8_t >( row, 1855 ) );
+  patchNumber.push_back( exdData->getField< uint8_t >( row, 1856 ) );
+  patchNumber.push_back( exdData->getField< uint8_t >( row, 1857 ) );
+  patchNumber.push_back( exdData->getField< uint8_t >( row, 1858 ) );
+  patchNumber.push_back( exdData->getField< uint8_t >( row, 1859 ) );
+  patchNumber.push_back( exdData->getField< uint8_t >( row, 1860 ) );
+  useCurrencyType = exdData->getField< uint16_t >( row, 1861 );
+  questUnlock = exdData->getField< uint16_t >( row, 1862 );
+  completeText = exdData->getField< uint16_t >( row, 1863 );
+  notCompleteText = exdData->getField< uint16_t >( row, 1864 );
 }
 
 Sapphire::Data::SpecialShopItemCategory::SpecialShopItemCategory( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
@@ -6623,7 +7986,7 @@ Sapphire::Data::Stain::Stain( uint32_t row_id, Sapphire::Data::ExdDataGenerated*
   auto row = exdData->m_StainDat.get_row( row_id );
   color = exdData->getField< uint32_t >( row, 0 );
   shade = exdData->getField< uint8_t >( row, 1 );
-  name = exdData->getField< std::string >( row, 2 );
+  name = exdData->getField< std::string >( row, 3 );
 }
 
 Sapphire::Data::StainTransient::StainTransient( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
@@ -6650,6 +8013,8 @@ Sapphire::Data::Status::Status( uint32_t row_id, Sapphire::Data::ExdDataGenerate
   canDispel = exdData->getField< bool >( row, 14 );
   inflictedByActor = exdData->getField< bool >( row, 15 );
   isPermanent = exdData->getField< bool >( row, 16 );
+  partyListPriority = exdData->getField< uint8_t >( row, 17 );
+  log = exdData->getField< uint16_t >( row, 23 );
   isFcBuff = exdData->getField< bool >( row, 24 );
   invisibility = exdData->getField< bool >( row, 25 );
 }
@@ -6754,18 +8119,27 @@ Sapphire::Data::TerritoryType::TerritoryType( uint32_t row_id, Sapphire::Data::E
   auto row = exdData->m_TerritoryTypeDat.get_row( row_id );
   name = exdData->getField< std::string >( row, 0 );
   bg = exdData->getField< std::string >( row, 1 );
+  battalionMode = exdData->getField< uint8_t >( row, 2 );
   placeNameRegion = exdData->getField< uint16_t >( row, 3 );
   placeNameZone = exdData->getField< uint16_t >( row, 4 );
   placeName = exdData->getField< uint16_t >( row, 5 );
   map = exdData->getField< uint16_t >( row, 6 );
   loadingImage = exdData->getField< uint8_t >( row, 7 );
+  exclusiveType = exdData->getField< uint8_t >( row, 8 );
   territoryIntendedUse = exdData->getField< uint8_t >( row, 9 );
   weatherRate = exdData->getField< uint8_t >( row, 12 );
+  pCSearch = exdData->getField< bool >( row, 15 );
+  stealth = exdData->getField< bool >( row, 16 );
+  mount = exdData->getField< bool >( row, 17 );
+  bGM = exdData->getField< uint16_t >( row, 19 );
   placeNameRegionIcon = exdData->getField< int32_t >( row, 20 );
   placeNameIcon = exdData->getField< int32_t >( row, 21 );
   arrayEventHandler = exdData->getField< uint32_t >( row, 22 );
   questBattle = exdData->getField< uint16_t >( row, 23 );
   aetheryte = exdData->getField< int32_t >( row, 24 );
+  fixedTime = exdData->getField< int32_t >( row, 25 );
+  resident = exdData->getField< uint16_t >( row, 26 );
+  achievementIndex = exdData->getField< int8_t >( row, 27 );
   isPvpZone = exdData->getField< bool >( row, 28 );
 }
 
@@ -6847,20 +8221,21 @@ Sapphire::Data::Transformation::Transformation( uint32_t row_id, Sapphire::Data:
   bNpcName = exdData->getField< uint16_t >( row, 2 );
   bNpcCustomize = exdData->getField< int32_t >( row, 3 );
   npcEquip = exdData->getField< int32_t >( row, 4 );
-  action.push_back( exdData->getField< uint16_t >( row, 10 ) );
-  action.push_back( exdData->getField< uint16_t >( row, 11 ) );
-  action.push_back( exdData->getField< uint16_t >( row, 12 ) );
-  action.push_back( exdData->getField< uint16_t >( row, 13 ) );
-  action.push_back( exdData->getField< uint16_t >( row, 14 ) );
-  action.push_back( exdData->getField< uint16_t >( row, 15 ) );
+  exHotbarEnableConfig = exdData->getField< bool >( row, 5 );
+  action0 = exdData->getField< uint16_t >( row, 6 );
+  action1 = exdData->getField< uint16_t >( row, 8 );
+  action2 = exdData->getField< uint16_t >( row, 10 );
+  action3 = exdData->getField< uint16_t >( row, 12 );
+  action4 = exdData->getField< uint16_t >( row, 14 );
+  action5 = exdData->getField< uint16_t >( row, 15 );
   rPParameter = exdData->getField< uint8_t >( row, 18 );
   speed = exdData->getField< float >( row, 19 );
   scale = exdData->getField< float >( row, 20 );
   isPvP = exdData->getField< bool >( row, 21 );
   isEvent = exdData->getField< bool >( row, 22 );
   playerCamera = exdData->getField< bool >( row, 23 );
-  startVFX = exdData->getField< uint16_t >( row, 24 );
-  endVFX = exdData->getField< uint16_t >( row, 25 );
+  startVFX = exdData->getField< bool >( row, 24 );
+  endVFX = exdData->getField< bool >( row, 25 );
 }
 
 Sapphire::Data::Treasure::Treasure( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
@@ -6880,10 +8255,18 @@ Sapphire::Data::TreasureHuntRank::TreasureHuntRank( uint32_t row_id, Sapphire::D
   minPartySize = exdData->getField< uint8_t >( row, 6 );
 }
 
+Sapphire::Data::TreasureModel::TreasureModel( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
+{
+  auto row = exdData->m_TreasureModelDat.get_row( row_id );
+  path = exdData->getField< std::string >( row, 0 );
+}
+
 Sapphire::Data::TreasureSpot::TreasureSpot( uint32_t row_id, uint32_t subRow, Sapphire::Data::ExdDataGenerated* exdData )
 {
   auto row = exdData->m_TreasureSpotDat.get_row( row_id, subRow );
   location = exdData->getField< int32_t >( row, 0 );
+  mapOffsetX = exdData->getField< float >( row, 1 );
+  mapOffsetY = exdData->getField< float >( row, 2 );
 }
 
 Sapphire::Data::Tribe::Tribe( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
@@ -6891,9 +8274,11 @@ Sapphire::Data::Tribe::Tribe( uint32_t row_id, Sapphire::Data::ExdDataGenerated*
   auto row = exdData->m_TribeDat.get_row( row_id );
   masculine = exdData->getField< std::string >( row, 0 );
   feminine = exdData->getField< std::string >( row, 1 );
+  hp = exdData->getField< int8_t >( row, 2 );
+  mp = exdData->getField< int8_t >( row, 3 );
   sTR = exdData->getField< int8_t >( row, 4 );
-  dEX = exdData->getField< int8_t >( row, 5 );
-  vIT = exdData->getField< int8_t >( row, 6 );
+  vIT = exdData->getField< int8_t >( row, 5 );
+  dEX = exdData->getField< int8_t >( row, 6 );
   iNT = exdData->getField< int8_t >( row, 7 );
   mND = exdData->getField< int8_t >( row, 8 );
   pIE = exdData->getField< int8_t >( row, 9 );
@@ -7029,28 +8414,38 @@ Sapphire::Data::VFX::VFX( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exd
 Sapphire::Data::Warp::Warp( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
 {
   auto row = exdData->m_WarpDat.get_row( row_id );
-  level = exdData->getField< uint32_t >( row, 0 );
+  popRange = exdData->getField< uint32_t >( row, 0 );
   territoryType = exdData->getField< uint16_t >( row, 1 );
   conditionSuccessEvent = exdData->getField< uint32_t >( row, 2 );
   conditionFailEvent = exdData->getField< uint32_t >( row, 3 );
   confirmEvent = exdData->getField< uint32_t >( row, 4 );
   warpCondition = exdData->getField< uint16_t >( row, 5 );
   warpLogic = exdData->getField< uint16_t >( row, 6 );
+  startCutscene = exdData->getField< uint16_t >( row, 7 );
+  endCutscene = exdData->getField< uint16_t >( row, 8 );
+  canSkipCutscene = exdData->getField< bool >( row, 9 );
+  name = exdData->getField< std::string >( row, 10 );
+  question = exdData->getField< std::string >( row, 11 );
 }
 
 Sapphire::Data::WarpCondition::WarpCondition( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
 {
   auto row = exdData->m_WarpConditionDat.get_row( row_id );
+  gil = exdData->getField< uint16_t >( row, 0 );
+  completeParam = exdData->getField< uint8_t >( row, 1 );
   requiredQuest1 = exdData->getField< uint32_t >( row, 2 );
   requiredQuest2 = exdData->getField< uint32_t >( row, 3 );
   dRequiredQuest3 = exdData->getField< uint32_t >( row, 4 );
   requiredQuest4 = exdData->getField< uint32_t >( row, 5 );
+  questReward = exdData->getField< uint16_t >( row, 6 );
+  classLevel = exdData->getField< uint16_t >( row, 7 );
 }
 
 Sapphire::Data::WarpLogic::WarpLogic( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
 {
   auto row = exdData->m_WarpLogicDat.get_row( row_id );
   warpName = exdData->getField< std::string >( row, 1 );
+  canSkipCutscene = exdData->getField< bool >( row, 2 );
   function.push_back( exdData->getField< std::string >( row, 3 ) );
   function.push_back( exdData->getField< std::string >( row, 4 ) );
   function.push_back( exdData->getField< std::string >( row, 5 ) );
@@ -7066,6 +8461,13 @@ Sapphire::Data::WarpLogic::WarpLogic( uint32_t row_id, Sapphire::Data::ExdDataGe
   responseNo = exdData->getField< std::string >( row, 25 );
 }
 
+Sapphire::Data::WeaponTimeline::WeaponTimeline( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
+{
+  auto row = exdData->m_WeaponTimelineDat.get_row( row_id );
+  file = exdData->getField< std::string >( row, 0 );
+  nextWeaponTimeline = exdData->getField< int16_t >( row, 1 );
+}
+
 Sapphire::Data::Weather::Weather( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
 {
   auto row = exdData->m_WeatherDat.get_row( row_id );
@@ -7162,6 +8564,7 @@ Sapphire::Data::World::World( uint32_t row_id, Sapphire::Data::ExdDataGenerated*
 {
   auto row = exdData->m_WorldDat.get_row( row_id );
   name = exdData->getField< std::string >( row, 0 );
+  userType = exdData->getField< uint8_t >( row, 1 );
   dataCenter = exdData->getField< uint8_t >( row, 2 );
   isPublic = exdData->getField< bool >( row, 3 );
 }
@@ -7274,6 +8677,7 @@ bool Sapphire::Data::ExdDataGenerated::init( const std::string& path )
     m_AirshipExplorationParamTypeDat = setupDatAccess( "AirshipExplorationParamType", xiv::exd::Language::en );
     m_AirshipExplorationPartDat = setupDatAccess( "AirshipExplorationPart", xiv::exd::Language::none );
     m_AirshipExplorationPointDat = setupDatAccess( "AirshipExplorationPoint", xiv::exd::Language::en );
+    m_AnimationLODDat = setupDatAccess( "AnimationLOD", xiv::exd::Language::none );
     m_AnimaWeapon5Dat = setupDatAccess( "AnimaWeapon5", xiv::exd::Language::none );
     m_AnimaWeapon5ParamDat = setupDatAccess( "AnimaWeapon5Param", xiv::exd::Language::en );
     m_AnimaWeapon5PatternGroupDat = setupDatAccess( "AnimaWeapon5PatternGroup", xiv::exd::Language::en );
@@ -7290,21 +8694,27 @@ bool Sapphire::Data::ExdDataGenerated::init( const std::string& path )
     m_AOZBossDat = setupDatAccess( "AOZBoss", xiv::exd::Language::none );
     m_AOZContentDat = setupDatAccess( "AOZContent", xiv::exd::Language::none );
     m_AOZContentBriefingBNpcDat = setupDatAccess( "AOZContentBriefingBNpc", xiv::exd::Language::none );
+    m_AOZReportDat = setupDatAccess( "AOZReport", xiv::exd::Language::none );
     m_AquariumFishDat = setupDatAccess( "AquariumFish", xiv::exd::Language::none );
     m_AquariumWaterDat = setupDatAccess( "AquariumWater", xiv::exd::Language::en );
     m_ArrayEventHandlerDat = setupDatAccess( "ArrayEventHandler", xiv::exd::Language::none );
     m_AttackTypeDat = setupDatAccess( "AttackType", xiv::exd::Language::en );
     m_BacklightColorDat = setupDatAccess( "BacklightColor", xiv::exd::Language::none );
+    m_BallistaDat = setupDatAccess( "Ballista", xiv::exd::Language::none );
     m_BalloonDat = setupDatAccess( "Balloon", xiv::exd::Language::en );
     m_BaseParamDat = setupDatAccess( "BaseParam", xiv::exd::Language::en );
     m_BattleLeveDat = setupDatAccess( "BattleLeve", xiv::exd::Language::none );
+    m_BattleLeveRuleDat = setupDatAccess( "BattleLeveRule", xiv::exd::Language::none );
     m_BeastRankBonusDat = setupDatAccess( "BeastRankBonus", xiv::exd::Language::none );
     m_BeastReputationRankDat = setupDatAccess( "BeastReputationRank", xiv::exd::Language::en );
     m_BeastTribeDat = setupDatAccess( "BeastTribe", xiv::exd::Language::en );
     m_BehaviorDat = setupDatAccess( "Behavior", xiv::exd::Language::none );
+    m_BehaviorPathDat = setupDatAccess( "BehaviorPath", xiv::exd::Language::none );
     m_BenchmarkOverrideEquipmentDat = setupDatAccess( "BenchmarkOverrideEquipment", xiv::exd::Language::none );
     m_BGMDat = setupDatAccess( "BGM", xiv::exd::Language::none );
     m_BGMFadeDat = setupDatAccess( "BGMFade", xiv::exd::Language::none );
+    m_BGMFadeTypeDat = setupDatAccess( "BGMFadeType", xiv::exd::Language::none );
+    m_BGMSceneDat = setupDatAccess( "BGMScene", xiv::exd::Language::none );
     m_BGMSituationDat = setupDatAccess( "BGMSituation", xiv::exd::Language::none );
     m_BGMSwitchDat = setupDatAccess( "BGMSwitch", xiv::exd::Language::none );
     m_BGMSystemDefineDat = setupDatAccess( "BGMSystemDefine", xiv::exd::Language::none );
@@ -7313,6 +8723,7 @@ bool Sapphire::Data::ExdDataGenerated::init( const std::string& path )
     m_BNpcCustomizeDat = setupDatAccess( "BNpcCustomize", xiv::exd::Language::none );
     m_BNpcNameDat = setupDatAccess( "BNpcName", xiv::exd::Language::en );
     m_BNpcPartsDat = setupDatAccess( "BNpcParts", xiv::exd::Language::none );
+    m_BNpcStateDat = setupDatAccess( "BNpcState", xiv::exd::Language::none );
     m_BuddyDat = setupDatAccess( "Buddy", xiv::exd::Language::none );
     m_BuddyActionDat = setupDatAccess( "BuddyAction", xiv::exd::Language::en );
     m_BuddyEquipDat = setupDatAccess( "BuddyEquip", xiv::exd::Language::en );
@@ -7322,6 +8733,9 @@ bool Sapphire::Data::ExdDataGenerated::init( const std::string& path )
     m_CabinetDat = setupDatAccess( "Cabinet", xiv::exd::Language::none );
     m_CabinetCategoryDat = setupDatAccess( "CabinetCategory", xiv::exd::Language::none );
     m_CalendarDat = setupDatAccess( "Calendar", xiv::exd::Language::none );
+    m_CarryDat = setupDatAccess( "Carry", xiv::exd::Language::none );
+    m_ChannelingDat = setupDatAccess( "Channeling", xiv::exd::Language::none );
+    m_CharaMakeClassEquipDat = setupDatAccess( "CharaMakeClassEquip", xiv::exd::Language::none );
     m_CharaMakeCustomizeDat = setupDatAccess( "CharaMakeCustomize", xiv::exd::Language::none );
     m_CharaMakeTypeDat = setupDatAccess( "CharaMakeType", xiv::exd::Language::en );
     m_ChocoboRaceDat = setupDatAccess( "ChocoboRace", xiv::exd::Language::none );
@@ -7335,6 +8749,7 @@ bool Sapphire::Data::ExdDataGenerated::init( const std::string& path )
     m_ChocoboRaceWeatherDat = setupDatAccess( "ChocoboRaceWeather", xiv::exd::Language::none );
     m_ChocoboTaxiDat = setupDatAccess( "ChocoboTaxi", xiv::exd::Language::none );
     m_ChocoboTaxiStandDat = setupDatAccess( "ChocoboTaxiStand", xiv::exd::Language::en );
+    m_CircleActivityDat = setupDatAccess( "CircleActivity", xiv::exd::Language::en );
     m_ClassJobDat = setupDatAccess( "ClassJob", xiv::exd::Language::en );
     m_ClassJobCategoryDat = setupDatAccess( "ClassJobCategory", xiv::exd::Language::en );
     m_CompanionDat = setupDatAccess( "Companion", xiv::exd::Language::en );
@@ -7353,6 +8768,7 @@ bool Sapphire::Data::ExdDataGenerated::init( const std::string& path )
     m_CompanyLeveRuleDat = setupDatAccess( "CompanyLeveRule", xiv::exd::Language::none );
     m_CompleteJournalDat = setupDatAccess( "CompleteJournal", xiv::exd::Language::en );
     m_CompleteJournalCategoryDat = setupDatAccess( "CompleteJournalCategory", xiv::exd::Language::none );
+    m_ConfigKeyDat = setupDatAccess( "ConfigKey", xiv::exd::Language::en );
     m_ContentCloseCycleDat = setupDatAccess( "ContentCloseCycle", xiv::exd::Language::none );
     m_ContentExActionDat = setupDatAccess( "ContentExAction", xiv::exd::Language::none );
     m_ContentFinderConditionDat = setupDatAccess( "ContentFinderCondition", xiv::exd::Language::en );
@@ -7383,11 +8799,15 @@ bool Sapphire::Data::ExdDataGenerated::init( const std::string& path )
     m_CustomTalkDynamicIconDat = setupDatAccess( "CustomTalkDynamicIcon", xiv::exd::Language::none );
     m_CustomTalkNestHandlersDat = setupDatAccess( "CustomTalkNestHandlers", xiv::exd::Language::none );
     m_CutsceneDat = setupDatAccess( "Cutscene", xiv::exd::Language::none );
+    m_CutsceneMotionDat = setupDatAccess( "CutsceneMotion", xiv::exd::Language::none );
+    m_CutsceneWorkIndexDat = setupDatAccess( "CutsceneWorkIndex", xiv::exd::Language::none );
     m_CutScreenImageDat = setupDatAccess( "CutScreenImage", xiv::exd::Language::none );
+    m_CycleTimeDat = setupDatAccess( "CycleTime", xiv::exd::Language::none );
     m_DailySupplyItemDat = setupDatAccess( "DailySupplyItem", xiv::exd::Language::none );
     m_DawnContentDat = setupDatAccess( "DawnContent", xiv::exd::Language::none );
     m_DawnGrowMemberDat = setupDatAccess( "DawnGrowMember", xiv::exd::Language::none );
     m_DawnMemberUIParamDat = setupDatAccess( "DawnMemberUIParam", xiv::exd::Language::en );
+    m_DawnQuestAnnounceDat = setupDatAccess( "DawnQuestAnnounce", xiv::exd::Language::none );
     m_DawnQuestMemberDat = setupDatAccess( "DawnQuestMember", xiv::exd::Language::none );
     m_DeepDungeonDat = setupDatAccess( "DeepDungeon", xiv::exd::Language::en );
     m_DeepDungeonBanDat = setupDatAccess( "DeepDungeonBan", xiv::exd::Language::none );
@@ -7403,7 +8823,9 @@ bool Sapphire::Data::ExdDataGenerated::init( const std::string& path )
     m_DefaultTalkDat = setupDatAccess( "DefaultTalk", xiv::exd::Language::en );
     m_DefaultTalkLipSyncTypeDat = setupDatAccess( "DefaultTalkLipSyncType", xiv::exd::Language::none );
     m_DeliveryQuestDat = setupDatAccess( "DeliveryQuest", xiv::exd::Language::none );
+    m_DescriptionDat = setupDatAccess( "Description", xiv::exd::Language::en );
     m_DescriptionPageDat = setupDatAccess( "DescriptionPage", xiv::exd::Language::none );
+    m_DescriptionSectionDat = setupDatAccess( "DescriptionSection", xiv::exd::Language::none );
     m_DescriptionStringDat = setupDatAccess( "DescriptionString", xiv::exd::Language::en );
     m_DisposalShopDat = setupDatAccess( "DisposalShop", xiv::exd::Language::en );
     m_DisposalShopFilterTypeDat = setupDatAccess( "DisposalShopFilterType", xiv::exd::Language::en );
@@ -7415,6 +8837,7 @@ bool Sapphire::Data::ExdDataGenerated::init( const std::string& path )
     m_EmjDaniDat = setupDatAccess( "EmjDani", xiv::exd::Language::none );
     m_EmoteDat = setupDatAccess( "Emote", xiv::exd::Language::en );
     m_EmoteCategoryDat = setupDatAccess( "EmoteCategory", xiv::exd::Language::en );
+    m_EmoteModeDat = setupDatAccess( "EmoteMode", xiv::exd::Language::none );
     m_ENpcBaseDat = setupDatAccess( "ENpcBase", xiv::exd::Language::none );
     m_ENpcDressUpDat = setupDatAccess( "ENpcDressUp", xiv::exd::Language::none );
     m_ENpcDressUpDressDat = setupDatAccess( "ENpcDressUpDress", xiv::exd::Language::none );
@@ -7438,18 +8861,23 @@ bool Sapphire::Data::ExdDataGenerated::init( const std::string& path )
     m_EventItemCastTimelineDat = setupDatAccess( "EventItemCastTimeline", xiv::exd::Language::none );
     m_EventItemHelpDat = setupDatAccess( "EventItemHelp", xiv::exd::Language::en );
     m_EventItemTimelineDat = setupDatAccess( "EventItemTimeline", xiv::exd::Language::none );
+    m_EventSystemDefineDat = setupDatAccess( "EventSystemDefine", xiv::exd::Language::none );
     m_ExportedSGDat = setupDatAccess( "ExportedSG", xiv::exd::Language::none );
     m_ExVersionDat = setupDatAccess( "ExVersion", xiv::exd::Language::en );
     m_FateDat = setupDatAccess( "Fate", xiv::exd::Language::en );
+    m_FateEventDat = setupDatAccess( "FateEvent", xiv::exd::Language::en );
     m_FateProgressUIDat = setupDatAccess( "FateProgressUI", xiv::exd::Language::none );
+    m_FateTokenTypeDat = setupDatAccess( "FateTokenType", xiv::exd::Language::none );
     m_FCActivityDat = setupDatAccess( "FCActivity", xiv::exd::Language::en );
     m_FCActivityCategoryDat = setupDatAccess( "FCActivityCategory", xiv::exd::Language::en );
     m_FCAuthorityDat = setupDatAccess( "FCAuthority", xiv::exd::Language::en );
     m_FCAuthorityCategoryDat = setupDatAccess( "FCAuthorityCategory", xiv::exd::Language::en );
     m_FCChestNameDat = setupDatAccess( "FCChestName", xiv::exd::Language::en );
+    m_FCCrestSymbolDat = setupDatAccess( "FCCrestSymbol", xiv::exd::Language::none );
     m_FccShopDat = setupDatAccess( "FccShop", xiv::exd::Language::en );
     m_FCHierarchyDat = setupDatAccess( "FCHierarchy", xiv::exd::Language::en );
     m_FCProfileDat = setupDatAccess( "FCProfile", xiv::exd::Language::en );
+    m_FCRankDat = setupDatAccess( "FCRank", xiv::exd::Language::none );
     m_FCReputationDat = setupDatAccess( "FCReputation", xiv::exd::Language::en );
     m_FCRightsDat = setupDatAccess( "FCRights", xiv::exd::Language::en );
     m_FestivalDat = setupDatAccess( "Festival", xiv::exd::Language::none );
@@ -7470,6 +8898,7 @@ bool Sapphire::Data::ExdDataGenerated::init( const std::string& path )
     m_GatheringItemPointDat = setupDatAccess( "GatheringItemPoint", xiv::exd::Language::none );
     m_GatheringLeveDat = setupDatAccess( "GatheringLeve", xiv::exd::Language::none );
     m_GatheringLeveRouteDat = setupDatAccess( "GatheringLeveRoute", xiv::exd::Language::none );
+    m_GatheringLeveRuleDat = setupDatAccess( "GatheringLeveRule", xiv::exd::Language::none );
     m_GatheringNotebookListDat = setupDatAccess( "GatheringNotebookList", xiv::exd::Language::none );
     m_GatheringPointDat = setupDatAccess( "GatheringPoint", xiv::exd::Language::none );
     m_GatheringPointBaseDat = setupDatAccess( "GatheringPointBase", xiv::exd::Language::none );
@@ -7504,16 +8933,20 @@ bool Sapphire::Data::ExdDataGenerated::init( const std::string& path )
     m_GFateRideShootingDat = setupDatAccess( "GFateRideShooting", xiv::exd::Language::none );
     m_GilShopDat = setupDatAccess( "GilShop", xiv::exd::Language::en );
     m_GilShopItemDat = setupDatAccess( "GilShopItem", xiv::exd::Language::none );
+    m_GimmickAccessorDat = setupDatAccess( "GimmickAccessor", xiv::exd::Language::none );
+    m_GimmickJumpDat = setupDatAccess( "GimmickJump", xiv::exd::Language::none );
+    m_GimmickRectDat = setupDatAccess( "GimmickRect", xiv::exd::Language::none );
     m_GoldSaucerArcadeMachineDat = setupDatAccess( "GoldSaucerArcadeMachine", xiv::exd::Language::en );
     m_GoldSaucerTextDataDat = setupDatAccess( "GoldSaucerTextData", xiv::exd::Language::en );
     m_GrandCompanyDat = setupDatAccess( "GrandCompany", xiv::exd::Language::en );
     m_GrandCompanyRankDat = setupDatAccess( "GrandCompanyRank", xiv::exd::Language::none );
+    m_GroupPoseFrameDat = setupDatAccess( "GroupPoseFrame", xiv::exd::Language::en );
     m_GuardianDeityDat = setupDatAccess( "GuardianDeity", xiv::exd::Language::en );
     m_GuideDat = setupDatAccess( "Guide", xiv::exd::Language::none );
     m_GuidePageDat = setupDatAccess( "GuidePage", xiv::exd::Language::none );
     m_GuidePageStringDat = setupDatAccess( "GuidePageString", xiv::exd::Language::en );
     m_GuideTitleDat = setupDatAccess( "GuideTitle", xiv::exd::Language::en );
-    m_GuildleveAssignmentDat = setupDatAccess( "GuildleveAssignment", xiv::exd::Language::none );
+    m_GuildleveAssignmentDat = setupDatAccess( "GuildleveAssignment", xiv::exd::Language::en );
     m_GuildleveAssignmentCategoryDat = setupDatAccess( "GuildleveAssignmentCategory", xiv::exd::Language::none );
     m_GuildOrderDat = setupDatAccess( "GuildOrder", xiv::exd::Language::en );
     m_GuildOrderGuideDat = setupDatAccess( "GuildOrderGuide", xiv::exd::Language::none );
@@ -7538,8 +8971,26 @@ bool Sapphire::Data::ExdDataGenerated::init( const std::string& path )
     m_HowToPageDat = setupDatAccess( "HowToPage", xiv::exd::Language::en );
     m_HugeCraftworksNpcDat = setupDatAccess( "HugeCraftworksNpc", xiv::exd::Language::en );
     m_HugeCraftworksRankDat = setupDatAccess( "HugeCraftworksRank", xiv::exd::Language::none );
+    m_HWDAnnounceDat = setupDatAccess( "HWDAnnounce", xiv::exd::Language::en );
+    m_HWDCrafterSupplyDat = setupDatAccess( "HWDCrafterSupply", xiv::exd::Language::none );
+    m_HWDCrafterSupplyRewardDat = setupDatAccess( "HWDCrafterSupplyReward", xiv::exd::Language::none );
+    m_HWDDevLayerControlDat = setupDatAccess( "HWDDevLayerControl", xiv::exd::Language::none );
+    m_HWDDevLevelUIDat = setupDatAccess( "HWDDevLevelUI", xiv::exd::Language::none );
+    m_HWDDevLivelyDat = setupDatAccess( "HWDDevLively", xiv::exd::Language::none );
+    m_HWDDevProgressDat = setupDatAccess( "HWDDevProgress", xiv::exd::Language::none );
+    m_HWDInfoBoardArticleDat = setupDatAccess( "HWDInfoBoardArticle", xiv::exd::Language::en );
+    m_HWDInfoBoardArticleTransientDat = setupDatAccess( "HWDInfoBoardArticleTransient", xiv::exd::Language::en );
+    m_HWDInfoBoardArticleTypeDat = setupDatAccess( "HWDInfoBoardArticleType", xiv::exd::Language::en );
+    m_HWDLevelChangeDeceptionDat = setupDatAccess( "HWDLevelChangeDeception", xiv::exd::Language::none );
+    m_HWDSharedGroupDat = setupDatAccess( "HWDSharedGroup", xiv::exd::Language::none );
+    m_HWDSharedGroupControlParamDat = setupDatAccess( "HWDSharedGroupControlParam", xiv::exd::Language::none );
+    m_IKDContentBonusDat = setupDatAccess( "IKDContentBonus", xiv::exd::Language::en );
+    m_IKDFishParamDat = setupDatAccess( "IKDFishParam", xiv::exd::Language::none );
+    m_IKDRouteDat = setupDatAccess( "IKDRoute", xiv::exd::Language::en );
+    m_IKDRouteTableDat = setupDatAccess( "IKDRouteTable", xiv::exd::Language::none );
+    m_IKDSpotDat = setupDatAccess( "IKDSpot", xiv::exd::Language::none );
     m_IndividualWeatherDat = setupDatAccess( "IndividualWeather", xiv::exd::Language::none );
-    m_InstanceContentDat = setupDatAccess( "InstanceContent", xiv::exd::Language::en );
+    m_InstanceContentDat = setupDatAccess( "InstanceContent", xiv::exd::Language::none );
     m_InstanceContentBuffDat = setupDatAccess( "InstanceContentBuff", xiv::exd::Language::none );
     m_InstanceContentCSBonusDat = setupDatAccess( "InstanceContentCSBonus", xiv::exd::Language::none );
     m_InstanceContentGuideDat = setupDatAccess( "InstanceContentGuide", xiv::exd::Language::none );
@@ -7557,16 +9008,19 @@ bool Sapphire::Data::ExdDataGenerated::init( const std::string& path )
     m_JournalCategoryDat = setupDatAccess( "JournalCategory", xiv::exd::Language::en );
     m_JournalGenreDat = setupDatAccess( "JournalGenre", xiv::exd::Language::en );
     m_JournalSectionDat = setupDatAccess( "JournalSection", xiv::exd::Language::en );
+    m_KnockbackDat = setupDatAccess( "Knockback", xiv::exd::Language::none );
+    m_LegacyQuestDat = setupDatAccess( "LegacyQuest", xiv::exd::Language::en );
     m_LeveDat = setupDatAccess( "Leve", xiv::exd::Language::en );
     m_LeveAssignmentTypeDat = setupDatAccess( "LeveAssignmentType", xiv::exd::Language::en );
     m_LeveClientDat = setupDatAccess( "LeveClient", xiv::exd::Language::en );
     m_LevelDat = setupDatAccess( "Level", xiv::exd::Language::none );
     m_LeveRewardItemDat = setupDatAccess( "LeveRewardItem", xiv::exd::Language::none );
     m_LeveRewardItemGroupDat = setupDatAccess( "LeveRewardItemGroup", xiv::exd::Language::none );
+    m_LeveStringDat = setupDatAccess( "LeveString", xiv::exd::Language::en );
     m_LeveVfxDat = setupDatAccess( "LeveVfx", xiv::exd::Language::none );
+    m_LobbyDat = setupDatAccess( "Lobby", xiv::exd::Language::en );
     m_LogFilterDat = setupDatAccess( "LogFilter", xiv::exd::Language::en );
     m_LogKindDat = setupDatAccess( "LogKind", xiv::exd::Language::en );
-    m_LogKindCategoryTextDat = setupDatAccess( "LogKindCategoryText", xiv::exd::Language::en );
     m_LogMessageDat = setupDatAccess( "LogMessage", xiv::exd::Language::en );
     m_LotteryExchangeShopDat = setupDatAccess( "LotteryExchangeShop", xiv::exd::Language::en );
     m_MacroIconDat = setupDatAccess( "MacroIcon", xiv::exd::Language::none );
@@ -7584,6 +9038,7 @@ bool Sapphire::Data::ExdDataGenerated::init( const std::string& path )
     m_MateriaDat = setupDatAccess( "Materia", xiv::exd::Language::none );
     m_MateriaJoinRateDat = setupDatAccess( "MateriaJoinRate", xiv::exd::Language::none );
     m_MateriaJoinRateGatherCraftDat = setupDatAccess( "MateriaJoinRateGatherCraft", xiv::exd::Language::none );
+    m_MateriaTomestoneRateDat = setupDatAccess( "MateriaTomestoneRate", xiv::exd::Language::none );
     m_MiniGameRADat = setupDatAccess( "MiniGameRA", xiv::exd::Language::none );
     m_MinionRaceDat = setupDatAccess( "MinionRace", xiv::exd::Language::en );
     m_MinionRulesDat = setupDatAccess( "MinionRules", xiv::exd::Language::en );
@@ -7598,6 +9053,8 @@ bool Sapphire::Data::ExdDataGenerated::init( const std::string& path )
     m_ModelStateDat = setupDatAccess( "ModelState", xiv::exd::Language::none );
     m_MonsterNoteDat = setupDatAccess( "MonsterNote", xiv::exd::Language::en );
     m_MonsterNoteTargetDat = setupDatAccess( "MonsterNoteTarget", xiv::exd::Language::none );
+    m_MotionTimelineDat = setupDatAccess( "MotionTimeline", xiv::exd::Language::none );
+    m_MotionTimelineBlendTableDat = setupDatAccess( "MotionTimelineBlendTable", xiv::exd::Language::none );
     m_MountDat = setupDatAccess( "Mount", xiv::exd::Language::en );
     m_MountActionDat = setupDatAccess( "MountAction", xiv::exd::Language::none );
     m_MountCustomizeDat = setupDatAccess( "MountCustomize", xiv::exd::Language::none );
@@ -7606,6 +9063,9 @@ bool Sapphire::Data::ExdDataGenerated::init( const std::string& path )
     m_MountTransientDat = setupDatAccess( "MountTransient", xiv::exd::Language::en );
     m_MoveTimelineDat = setupDatAccess( "MoveTimeline", xiv::exd::Language::none );
     m_MoveVfxDat = setupDatAccess( "MoveVfx", xiv::exd::Language::none );
+    m_MovieSubtitleDat = setupDatAccess( "MovieSubtitle", xiv::exd::Language::en );
+    m_MovieSubtitle500Dat = setupDatAccess( "MovieSubtitle500", xiv::exd::Language::en );
+    m_MovieSubtitleVoyageDat = setupDatAccess( "MovieSubtitleVoyage", xiv::exd::Language::en );
     m_NotebookDivisionDat = setupDatAccess( "NotebookDivision", xiv::exd::Language::en );
     m_NotebookDivisionCategoryDat = setupDatAccess( "NotebookDivisionCategory", xiv::exd::Language::en );
     m_NotoriousMonsterDat = setupDatAccess( "NotoriousMonster", xiv::exd::Language::none );
@@ -7621,20 +9081,26 @@ bool Sapphire::Data::ExdDataGenerated::init( const std::string& path )
     m_OrchestrionPathDat = setupDatAccess( "OrchestrionPath", xiv::exd::Language::none );
     m_OrchestrionUiparamDat = setupDatAccess( "OrchestrionUiparam", xiv::exd::Language::none );
     m_ParamGrowDat = setupDatAccess( "ParamGrow", xiv::exd::Language::none );
-    m_PartyContentDat = setupDatAccess( "PartyContent", xiv::exd::Language::en );
+    m_PartyContentDat = setupDatAccess( "PartyContent", xiv::exd::Language::none );
     m_PartyContentCutsceneDat = setupDatAccess( "PartyContentCutscene", xiv::exd::Language::none );
     m_PartyContentTextDataDat = setupDatAccess( "PartyContentTextData", xiv::exd::Language::en );
+    m_PatchMarkDat = setupDatAccess( "PatchMark", xiv::exd::Language::none );
     m_PerformDat = setupDatAccess( "Perform", xiv::exd::Language::en );
     m_PerformTransientDat = setupDatAccess( "PerformTransient", xiv::exd::Language::en );
     m_PetDat = setupDatAccess( "Pet", xiv::exd::Language::en );
     m_PetActionDat = setupDatAccess( "PetAction", xiv::exd::Language::en );
+    m_PhysicsGroupDat = setupDatAccess( "PhysicsGroup", xiv::exd::Language::none );
+    m_PhysicsWindDat = setupDatAccess( "PhysicsWind", xiv::exd::Language::none );
     m_PictureDat = setupDatAccess( "Picture", xiv::exd::Language::none );
     m_PlaceNameDat = setupDatAccess( "PlaceName", xiv::exd::Language::en );
     m_PlantPotFlowerSeedDat = setupDatAccess( "PlantPotFlowerSeed", xiv::exd::Language::none );
     m_PreHandlerDat = setupDatAccess( "PreHandler", xiv::exd::Language::none );
+    m_PresetCameraDat = setupDatAccess( "PresetCamera", xiv::exd::Language::none );
+    m_PresetCameraAdjustDat = setupDatAccess( "PresetCameraAdjust", xiv::exd::Language::none );
     m_PublicContentDat = setupDatAccess( "PublicContent", xiv::exd::Language::en );
     m_PublicContentCutsceneDat = setupDatAccess( "PublicContentCutscene", xiv::exd::Language::none );
     m_PublicContentTextDataDat = setupDatAccess( "PublicContentTextData", xiv::exd::Language::en );
+    m_PurifyDat = setupDatAccess( "Purify", xiv::exd::Language::none );
     m_PvPActionDat = setupDatAccess( "PvPAction", xiv::exd::Language::none );
     m_PvPActionSortDat = setupDatAccess( "PvPActionSort", xiv::exd::Language::none );
     m_PvPRankDat = setupDatAccess( "PvPRank", xiv::exd::Language::none );
@@ -7642,8 +9108,15 @@ bool Sapphire::Data::ExdDataGenerated::init( const std::string& path )
     m_PvPTraitDat = setupDatAccess( "PvPTrait", xiv::exd::Language::none );
     m_QuestDat = setupDatAccess( "Quest", xiv::exd::Language::en );
     m_QuestBattleDat = setupDatAccess( "QuestBattle", xiv::exd::Language::none );
+    m_QuestChapterDat = setupDatAccess( "QuestChapter", xiv::exd::Language::none );
     m_QuestClassJobRewardDat = setupDatAccess( "QuestClassJobReward", xiv::exd::Language::none );
     m_QuestClassJobSupplyDat = setupDatAccess( "QuestClassJobSupply", xiv::exd::Language::none );
+    m_QuestDerivedClassDat = setupDatAccess( "QuestDerivedClass", xiv::exd::Language::none );
+    m_QuestRedoDat = setupDatAccess( "QuestRedo", xiv::exd::Language::none );
+    m_QuestRedoChapterUIDat = setupDatAccess( "QuestRedoChapterUI", xiv::exd::Language::en );
+    m_QuestRedoChapterUICategoryDat = setupDatAccess( "QuestRedoChapterUICategory", xiv::exd::Language::en );
+    m_QuestRedoChapterUITabDat = setupDatAccess( "QuestRedoChapterUITab", xiv::exd::Language::en );
+    m_QuestRedoIncompChapterDat = setupDatAccess( "QuestRedoIncompChapter", xiv::exd::Language::none );
     m_QuestRepeatFlagDat = setupDatAccess( "QuestRepeatFlag", xiv::exd::Language::none );
     m_QuestRewardOtherDat = setupDatAccess( "QuestRewardOther", xiv::exd::Language::en );
     m_QuickChatDat = setupDatAccess( "QuickChat", xiv::exd::Language::en );
@@ -7717,6 +9190,7 @@ bool Sapphire::Data::ExdDataGenerated::init( const std::string& path )
     m_TransformationDat = setupDatAccess( "Transformation", xiv::exd::Language::none );
     m_TreasureDat = setupDatAccess( "Treasure", xiv::exd::Language::en );
     m_TreasureHuntRankDat = setupDatAccess( "TreasureHuntRank", xiv::exd::Language::none );
+    m_TreasureModelDat = setupDatAccess( "TreasureModel", xiv::exd::Language::none );
     m_TreasureSpotDat = setupDatAccess( "TreasureSpot", xiv::exd::Language::none );
     m_TribeDat = setupDatAccess( "Tribe", xiv::exd::Language::en );
     m_TripleTriadDat = setupDatAccess( "TripleTriad", xiv::exd::Language::none );
@@ -7736,6 +9210,7 @@ bool Sapphire::Data::ExdDataGenerated::init( const std::string& path )
     m_WarpDat = setupDatAccess( "Warp", xiv::exd::Language::en );
     m_WarpConditionDat = setupDatAccess( "WarpCondition", xiv::exd::Language::none );
     m_WarpLogicDat = setupDatAccess( "WarpLogic", xiv::exd::Language::en );
+    m_WeaponTimelineDat = setupDatAccess( "WeaponTimeline", xiv::exd::Language::none );
     m_WeatherDat = setupDatAccess( "Weather", xiv::exd::Language::en );
     m_WeatherGroupDat = setupDatAccess( "WeatherGroup", xiv::exd::Language::none );
     m_WeatherRateDat = setupDatAccess( "WeatherRate", xiv::exd::Language::none );
diff --git a/src/common/Exd/ExdDataGenerated.h b/src/common/Exd/ExdDataGenerated.h
index c116c729..ef3f443b 100644
--- a/src/common/Exd/ExdDataGenerated.h
+++ b/src/common/Exd/ExdDataGenerated.h
@@ -51,6 +51,7 @@ struct AirshipExplorationLog;
 struct AirshipExplorationParamType;
 struct AirshipExplorationPart;
 struct AirshipExplorationPoint;
+struct AnimationLOD;
 struct AnimaWeapon5;
 struct AnimaWeapon5Param;
 struct AnimaWeapon5PatternGroup;
@@ -67,21 +68,27 @@ struct AOZArrangement;
 struct AOZBoss;
 struct AOZContent;
 struct AOZContentBriefingBNpc;
+struct AOZReport;
 struct AquariumFish;
 struct AquariumWater;
 struct ArrayEventHandler;
 struct AttackType;
 struct BacklightColor;
+struct Ballista;
 struct Balloon;
 struct BaseParam;
 struct BattleLeve;
+struct BattleLeveRule;
 struct BeastRankBonus;
 struct BeastReputationRank;
 struct BeastTribe;
 struct Behavior;
+struct BehaviorPath;
 struct BenchmarkOverrideEquipment;
 struct BGM;
 struct BGMFade;
+struct BGMFadeType;
+struct BGMScene;
 struct BGMSituation;
 struct BGMSwitch;
 struct BGMSystemDefine;
@@ -90,6 +97,7 @@ struct BNpcBase;
 struct BNpcCustomize;
 struct BNpcName;
 struct BNpcParts;
+struct BNpcState;
 struct Buddy;
 struct BuddyAction;
 struct BuddyEquip;
@@ -99,6 +107,9 @@ struct BuddySkill;
 struct Cabinet;
 struct CabinetCategory;
 struct Calendar;
+struct Carry;
+struct Channeling;
+struct CharaMakeClassEquip;
 struct CharaMakeCustomize;
 struct CharaMakeType;
 struct ChocoboRace;
@@ -112,6 +123,7 @@ struct ChocoboRaceTutorial;
 struct ChocoboRaceWeather;
 struct ChocoboTaxi;
 struct ChocoboTaxiStand;
+struct CircleActivity;
 struct ClassJob;
 struct ClassJobCategory;
 struct Companion;
@@ -130,6 +142,7 @@ struct CompanyLeve;
 struct CompanyLeveRule;
 struct CompleteJournal;
 struct CompleteJournalCategory;
+struct ConfigKey;
 struct ContentCloseCycle;
 struct ContentExAction;
 struct ContentFinderCondition;
@@ -160,11 +173,15 @@ struct CustomTalk;
 struct CustomTalkDynamicIcon;
 struct CustomTalkNestHandlers;
 struct Cutscene;
+struct CutsceneMotion;
+struct CutsceneWorkIndex;
 struct CutScreenImage;
+struct CycleTime;
 struct DailySupplyItem;
 struct DawnContent;
 struct DawnGrowMember;
 struct DawnMemberUIParam;
+struct DawnQuestAnnounce;
 struct DawnQuestMember;
 struct DeepDungeon;
 struct DeepDungeonBan;
@@ -180,7 +197,9 @@ struct DeepDungeonStatus;
 struct DefaultTalk;
 struct DefaultTalkLipSyncType;
 struct DeliveryQuest;
+struct Description;
 struct DescriptionPage;
+struct DescriptionSection;
 struct DescriptionString;
 struct DisposalShop;
 struct DisposalShopFilterType;
@@ -192,6 +211,7 @@ struct EmjAddon;
 struct EmjDani;
 struct Emote;
 struct EmoteCategory;
+struct EmoteMode;
 struct ENpcBase;
 struct ENpcDressUp;
 struct ENpcDressUpDress;
@@ -215,18 +235,23 @@ struct EventItem;
 struct EventItemCastTimeline;
 struct EventItemHelp;
 struct EventItemTimeline;
+struct EventSystemDefine;
 struct ExportedSG;
 struct ExVersion;
 struct Fate;
+struct FateEvent;
 struct FateProgressUI;
+struct FateTokenType;
 struct FCActivity;
 struct FCActivityCategory;
 struct FCAuthority;
 struct FCAuthorityCategory;
 struct FCChestName;
+struct FCCrestSymbol;
 struct FccShop;
 struct FCHierarchy;
 struct FCProfile;
+struct FCRank;
 struct FCReputation;
 struct FCRights;
 struct Festival;
@@ -247,6 +272,7 @@ struct GatheringItemLevelConvertTable;
 struct GatheringItemPoint;
 struct GatheringLeve;
 struct GatheringLeveRoute;
+struct GatheringLeveRule;
 struct GatheringNotebookList;
 struct GatheringPoint;
 struct GatheringPointBase;
@@ -281,10 +307,14 @@ struct GFateClimbing2TotemType;
 struct GFateRideShooting;
 struct GilShop;
 struct GilShopItem;
+struct GimmickAccessor;
+struct GimmickJump;
+struct GimmickRect;
 struct GoldSaucerArcadeMachine;
 struct GoldSaucerTextData;
 struct GrandCompany;
 struct GrandCompanyRank;
+struct GroupPoseFrame;
 struct GuardianDeity;
 struct Guide;
 struct GuidePage;
@@ -315,6 +345,24 @@ struct HowToCategory;
 struct HowToPage;
 struct HugeCraftworksNpc;
 struct HugeCraftworksRank;
+struct HWDAnnounce;
+struct HWDCrafterSupply;
+struct HWDCrafterSupplyReward;
+struct HWDDevLayerControl;
+struct HWDDevLevelUI;
+struct HWDDevLively;
+struct HWDDevProgress;
+struct HWDInfoBoardArticle;
+struct HWDInfoBoardArticleTransient;
+struct HWDInfoBoardArticleType;
+struct HWDLevelChangeDeception;
+struct HWDSharedGroup;
+struct HWDSharedGroupControlParam;
+struct IKDContentBonus;
+struct IKDFishParam;
+struct IKDRoute;
+struct IKDRouteTable;
+struct IKDSpot;
 struct IndividualWeather;
 struct InstanceContent;
 struct InstanceContentBuff;
@@ -334,16 +382,19 @@ struct JobHudManualPriority;
 struct JournalCategory;
 struct JournalGenre;
 struct JournalSection;
+struct Knockback;
+struct LegacyQuest;
 struct Leve;
 struct LeveAssignmentType;
 struct LeveClient;
 struct Level;
 struct LeveRewardItem;
 struct LeveRewardItemGroup;
+struct LeveString;
 struct LeveVfx;
+struct Lobby;
 struct LogFilter;
 struct LogKind;
-struct LogKindCategoryText;
 struct LogMessage;
 struct LotteryExchangeShop;
 struct MacroIcon;
@@ -361,6 +412,7 @@ struct MasterpieceSupplyMultiplier;
 struct Materia;
 struct MateriaJoinRate;
 struct MateriaJoinRateGatherCraft;
+struct MateriaTomestoneRate;
 struct MiniGameRA;
 struct MinionRace;
 struct MinionRules;
@@ -375,6 +427,8 @@ struct ModelSkeleton;
 struct ModelState;
 struct MonsterNote;
 struct MonsterNoteTarget;
+struct MotionTimeline;
+struct MotionTimelineBlendTable;
 struct Mount;
 struct MountAction;
 struct MountCustomize;
@@ -383,6 +437,9 @@ struct MountSpeed;
 struct MountTransient;
 struct MoveTimeline;
 struct MoveVfx;
+struct MovieSubtitle;
+struct MovieSubtitle500;
+struct MovieSubtitleVoyage;
 struct NotebookDivision;
 struct NotebookDivisionCategory;
 struct NotoriousMonster;
@@ -401,17 +458,23 @@ struct ParamGrow;
 struct PartyContent;
 struct PartyContentCutscene;
 struct PartyContentTextData;
+struct PatchMark;
 struct Perform;
 struct PerformTransient;
 struct Pet;
 struct PetAction;
+struct PhysicsGroup;
+struct PhysicsWind;
 struct Picture;
 struct PlaceName;
 struct PlantPotFlowerSeed;
 struct PreHandler;
+struct PresetCamera;
+struct PresetCameraAdjust;
 struct PublicContent;
 struct PublicContentCutscene;
 struct PublicContentTextData;
+struct Purify;
 struct PvPAction;
 struct PvPActionSort;
 struct PvPRank;
@@ -419,8 +482,15 @@ struct PvPSelectTrait;
 struct PvPTrait;
 struct Quest;
 struct QuestBattle;
+struct QuestChapter;
 struct QuestClassJobReward;
 struct QuestClassJobSupply;
+struct QuestDerivedClass;
+struct QuestRedo;
+struct QuestRedoChapterUI;
+struct QuestRedoChapterUICategory;
+struct QuestRedoChapterUITab;
+struct QuestRedoIncompChapter;
 struct QuestRepeatFlag;
 struct QuestRewardOther;
 struct QuickChat;
@@ -494,6 +564,7 @@ struct TraitTransient;
 struct Transformation;
 struct Treasure;
 struct TreasureHuntRank;
+struct TreasureModel;
 struct TreasureSpot;
 struct Tribe;
 struct TripleTriad;
@@ -513,6 +584,7 @@ struct VFX;
 struct Warp;
 struct WarpCondition;
 struct WarpLogic;
+struct WeaponTimeline;
 struct Weather;
 struct WeatherGroup;
 struct WeatherRate;
@@ -543,6 +615,7 @@ struct Achievement
   int32_t key;
   std::vector< int32_t > data;
   uint16_t order;
+  uint8_t padding;
   uint8_t achievementHideCondition;
 
   Achievement( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
@@ -552,6 +625,7 @@ struct AchievementCategory
 {
   std::string name;
   uint8_t achievementKind;
+  bool showComplete;
   bool hideCategory;
 
   AchievementCategory( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
@@ -673,7 +747,22 @@ struct ActionProcStatus
 
 struct ActionTimeline
 {
+  uint8_t type;
+  uint8_t priority;
+  bool pause;
+  uint8_t stance;
+  uint8_t slot;
+  uint8_t lookAtMode;
   std::string key;
+  uint8_t actionTimelineIDMode;
+  uint8_t weaponTimeline;
+  uint8_t loadType;
+  uint8_t startAttach;
+  uint8_t residentPap;
+  bool resident;
+  uint16_t killUpper;
+  bool isMotionCanceledByMoving;
+  uint8_t isLoop;
 
   ActionTimeline( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
@@ -750,6 +839,8 @@ struct Addon
 struct Adventure
 {
   int32_t level;
+  int32_t minLevel;
+  uint8_t maxLevel;
   uint16_t emote;
   uint16_t minTime;
   uint16_t maxTime;
@@ -825,6 +916,7 @@ struct Aetheryte
 struct AetheryteSystemDefine
 {
   std::string text;
+  uint32_t defineValue;
 
   AetheryteSystemDefine( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
@@ -877,6 +969,16 @@ struct AirshipExplorationPoint
   AirshipExplorationPoint( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
 
+struct AnimationLOD
+{
+  float cameraDistance;
+  float sampleInterval;
+  int8_t boneLOD;
+  std::vector< bool > animationEnable;
+
+  AnimationLOD( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+};
+
 struct AnimaWeapon5
 {
   int32_t item;
@@ -967,6 +1069,7 @@ struct AozAction
 
 struct AozActionTransient
 {
+  uint8_t number;
   uint32_t icon;
   std::string stats;
   std::string description;
@@ -1043,6 +1146,14 @@ struct AOZContentBriefingBNpc
   AOZContentBriefingBNpc( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
 
+struct AOZReport
+{
+  uint8_t reward;
+  int8_t order;
+
+  AOZReport( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+};
+
 struct AquariumFish
 {
   uint8_t aquariumWater;
@@ -1080,8 +1191,24 @@ struct BacklightColor
   BacklightColor( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
 
+struct Ballista
+{
+  uint16_t bNPC;
+  int8_t near;
+  int8_t far;
+  uint16_t angle;
+  uint8_t bullet;
+  uint16_t action0;
+  uint16_t action1;
+  uint16_t action2;
+  uint16_t action3;
+
+  Ballista( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+};
+
 struct Balloon
 {
+  bool slowly;
   std::string dialogue;
 
   Balloon( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
@@ -1089,9 +1216,10 @@ struct Balloon
 
 struct BaseParam
 {
-  int8_t order;
+  int8_t packetIndex;
   std::string name;
   std::string description;
+  uint8_t orderPriority;
   uint8_t oneHWpn;
   uint8_t oH;
   uint8_t head;
@@ -1105,27 +1233,44 @@ struct BaseParam
   uint8_t bracelet;
   uint8_t ring;
   uint8_t twoHWpn;
+  uint8_t underArmor;
   uint8_t chestHead;
   uint8_t chestHeadLegsFeet;
   uint8_t legsFeet;
   uint8_t headChestHandsLegsFeet;
   uint8_t chestLegsGloves;
   uint8_t chestLegsFeet;
+  std::vector< uint8_t > meldParam;
 
   BaseParam( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
 
 struct BattleLeve
 {
+  std::vector< uint16_t > time;
+  std::vector< int32_t > baseID;
   std::vector< uint16_t > enemyLevel;
   std::vector< uint32_t > bNpcName;
   std::vector< int32_t > itemsInvolved;
   std::vector< uint8_t > itemsInvolvedQty;
   std::vector< uint8_t > itemDropRate;
+  std::vector< uint32_t > toDoNumberInvolved;
+  std::vector< uint32_t > toDoParam;
+  int32_t rule;
+  uint8_t varient;
+  uint16_t objective0;
+  uint16_t objective1;
 
   BattleLeve( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
 
+struct BattleLeveRule
+{
+  std::string rule;
+
+  BattleLeveRule( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+};
+
 struct BeastRankBonus
 {
   uint32_t item;
@@ -1160,11 +1305,22 @@ struct BeastTribe
 
 struct Behavior
 {
-  uint16_t balloon;
+  int32_t balloon;
 
   Behavior( uint32_t row_id, uint32_t subRow, Sapphire::Data::ExdDataGenerated* exdData );
 };
 
+struct BehaviorPath
+{
+  bool isTurnTransition;
+  bool isFadeOut;
+  bool isFadeIn;
+  bool isWalking;
+  float speed;
+
+  BehaviorPath( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+};
+
 struct BenchmarkOverrideEquipment
 {
   uint64_t modelMainHand;
@@ -1198,23 +1354,53 @@ struct BenchmarkOverrideEquipment
 struct BGM
 {
   std::string file;
+  uint8_t priority;
+  bool disableRestartTimeOut;
+  bool disableRestart;
+  bool passEnd;
+  float disableRestartResetTime;
+  uint8_t specialMode;
 
   BGM( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
 
 struct BGMFade
 {
+  int32_t sceneOut;
+  int32_t sceneIn;
   int32_t bGMFadeType;
 
   BGMFade( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
 
+struct BGMFadeType
+{
+  float fadeOutTime;
+  float fadeInTime;
+  float fadeInStartTime;
+  float resumeFadeInTime;
+
+  BGMFadeType( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+};
+
+struct BGMScene
+{
+  bool enableDisableRestart;
+  bool resume;
+  bool enablePassEnd;
+  bool forceAutoReset;
+  bool ignoreBattle;
+
+  BGMScene( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+};
+
 struct BGMSituation
 {
-  uint16_t bGMDay;
-  uint16_t bGMNight;
-  uint16_t bGMBattle;
-  uint16_t bGMField;
+  uint16_t daytimeID;
+  uint16_t nightID;
+  uint16_t battleID;
+  uint16_t daybreakID;
+  uint16_t twilightID;
 
   BGMSituation( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
@@ -1244,13 +1430,19 @@ struct BNpcAnnounceIcon
 struct BNpcBase
 {
   uint16_t behavior;
-  uint8_t actionTimelineMove;
+  uint8_t battalion;
+  uint8_t linkRace;
+  uint8_t rank;
   float scale;
   uint16_t modelChara;
   uint16_t bNpcCustomize;
   uint16_t npcEquip;
+  uint16_t special;
+  uint8_t sEPack;
   int32_t arrayEventHandler;
   uint8_t bNpcParts;
+  bool isTargetLine;
+  bool isDisplayLevel;
 
   BNpcBase( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
@@ -1336,10 +1528,29 @@ struct BNpcParts
   BNpcParts( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
 
+struct BNpcState
+{
+  uint8_t slot;
+  int8_t overRay;
+  uint16_t idle;
+  uint8_t attribute0;
+  bool attributeFlag0;
+  uint8_t attribute1;
+  bool attributeFlag1;
+  uint8_t attribute2;
+  bool attributeFlag2;
+  float scale;
+  int32_t loopTimeline;
+
+  BNpcState( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+};
+
 struct Buddy
 {
+  uint8_t base;
   int32_t questRequirement2;
   int32_t questRequirement1;
+  int32_t baseEquip;
   std::string soundEffect4;
   std::string soundEffect3;
   std::string soundEffect2;
@@ -1354,6 +1565,8 @@ struct BuddyAction
   std::string description;
   int32_t icon;
   int32_t iconStatus;
+  uint16_t reward;
+  uint8_t sort;
 
   BuddyAction( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
@@ -1382,6 +1595,9 @@ struct BuddyEquip
 struct BuddyItem
 {
   uint16_t item;
+  bool useField;
+  bool useTraining;
+  uint8_t status;
 
   BuddyItem( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
@@ -1430,12 +1646,44 @@ struct Calendar
   Calendar( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
 
+struct Carry
+{
+  uint64_t model;
+  uint8_t timeline;
+
+  Carry( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+};
+
+struct Channeling
+{
+  std::string file;
+  uint8_t widthScale;
+
+  Channeling( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+};
+
+struct CharaMakeClassEquip
+{
+  uint64_t helmet;
+  uint64_t top;
+  uint64_t glove;
+  uint64_t down;
+  uint64_t shoes;
+  uint64_t weapon;
+  uint64_t subWeapon;
+  int32_t _class;
+
+  CharaMakeClassEquip( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+};
+
 struct CharaMakeCustomize
 {
   uint8_t featureID;
   uint32_t icon;
   uint16_t data;
   bool isPurchasable;
+  uint32_t hint;
+  uint32_t hintItem;
 
   CharaMakeCustomize( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
@@ -1445,7 +1693,15 @@ struct CharaMakeType
   int32_t race;
   int32_t tribe;
   int8_t gender;
-  std::vector< int32_t > facialFeatureIcon;
+  std::vector< uint32_t > menu;
+  std::vector< uint8_t > initVal;
+  std::vector< uint8_t > subMenuType;
+  std::vector< uint8_t > subMenuNum;
+  std::vector< uint8_t > lookAt;
+  std::vector< uint32_t > subMenuMask;
+  std::vector< uint32_t > customize;
+  std::vector< uint8_t > voiceStruct;
+  std::vector< int32_t > facialFeatureOption;
 
   CharaMakeType( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
@@ -1529,6 +1785,8 @@ struct ChocoboRaceWeather
 struct ChocoboTaxi
 {
   uint32_t location;
+  uint8_t fare;
+  uint16_t timeRequired;
 
   ChocoboTaxi( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
@@ -1540,12 +1798,22 @@ struct ChocoboTaxiStand
   ChocoboTaxiStand( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
 
+struct CircleActivity
+{
+  std::string name;
+  int32_t icon;
+  uint16_t order;
+
+  CircleActivity( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+};
+
 struct ClassJob
 {
   std::string name;
   std::string abbreviation;
   uint8_t classJobCategory;
   int8_t expArrayIndex;
+  int8_t battleClassIndex;
   uint8_t jobIndex;
   uint16_t modifierHitPoints;
   uint16_t modifierManaPoints;
@@ -1560,6 +1828,7 @@ struct ClassJob
   int32_t itemStartingWeapon;
   uint8_t role;
   uint8_t startingTown;
+  int8_t monsterNote;
   uint8_t primaryStat;
   uint16_t limitBreak1;
   uint16_t limitBreak2;
@@ -1633,7 +1902,22 @@ struct Companion
   int8_t pronoun;
   int8_t article;
   uint16_t model;
+  uint8_t scale;
+  uint8_t inactiveIdle0;
+  uint8_t inactiveIdle1;
+  uint8_t inactiveBattle;
+  uint8_t inactiveWandering;
   uint8_t behavior;
+  uint8_t special;
+  uint8_t wanderingWait;
+  uint16_t priority;
+  bool roulette;
+  bool battle;
+  bool lookAt;
+  bool poke;
+  uint16_t enemy;
+  bool stroke;
+  bool clapping;
   uint16_t icon;
   uint16_t order;
   uint8_t cost;
@@ -1749,9 +2033,17 @@ struct CompanyCraftType
 
 struct CompanyLeve
 {
-  int32_t eventItem;
-  uint8_t eventItemAmount;
-  int32_t companyLeveRule;
+  std::vector< uint16_t > time;
+  std::vector< int32_t > baseID;
+  std::vector< uint16_t > enemyLevel;
+  std::vector< uint32_t > bNpcName;
+  std::vector< int32_t > itemsInvolved;
+  std::vector< uint8_t > itemsInvolvedQty;
+  std::vector< uint8_t > itemDropRate;
+  std::vector< uint32_t > toDoNumberInvolved;
+  std::vector< uint32_t > toDoParam;
+  int32_t rule;
+  uint8_t ruleParam;
 
   CompanyLeve( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
@@ -1759,6 +2051,8 @@ struct CompanyLeve
 struct CompanyLeveRule
 {
   std::string type;
+  uint16_t objective;
+  uint16_t help;
 
   CompanyLeveRule( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
@@ -1781,6 +2075,18 @@ struct CompleteJournalCategory
   CompleteJournalCategory( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
 
+struct ConfigKey
+{
+  std::string label;
+  uint8_t param;
+  uint8_t platform;
+  bool required;
+  uint8_t category;
+  std::string text;
+
+  ConfigKey( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+};
+
 struct ContentCloseCycle
 {
   uint32_t unixtime;
@@ -1799,9 +2105,12 @@ struct ContentExAction
 
 struct ContentFinderCondition
 {
+  std::string shortCode;
   uint16_t territoryType;
   uint8_t contentLinkType;
   uint16_t content;
+  bool pvP;
+  uint8_t acceptClassJobCategory;
   uint8_t contentMemberType;
   uint32_t unlockQuest;
   uint8_t classJobLevelRequired;
@@ -1871,6 +2180,7 @@ struct ContentMemberType
 
 struct ContentNpcTalk
 {
+  int32_t type;
   std::vector< uint32_t > contentTalk;
 
   ContentNpcTalk( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
@@ -1889,19 +2199,19 @@ struct ContentRoulette
   std::string description;
   std::string dutyType;
   bool isInDutyFinder;
-  uint8_t openRule;
-  uint8_t requiredLevel;
-  uint16_t itemLevelRequired;
-  uint32_t icon;
-  uint8_t contentRouletteRoleBonus;
-  uint16_t rewardTomeA;
+  bool openRule;
+  bool requiredLevel;
+  uint8_t itemLevelRequired;
+  uint16_t icon;
+  uint32_t contentRouletteRoleBonus;
+  uint8_t rewardTomeA;
   uint16_t rewardTomeB;
   uint16_t rewardTomeC;
-  uint8_t sortKey;
+  uint16_t sortKey;
   uint8_t contentMemberType;
   bool requireAllDuties;
-  uint8_t contentRouletteOpenRule;
-  uint16_t instanceContent;
+  bool contentRouletteOpenRule;
+  uint8_t instanceContent;
 
   ContentRoulette( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
@@ -1927,7 +2237,9 @@ struct ContentsNote
   int32_t icon;
   uint8_t menuOrder;
   int32_t requiredAmount;
+  uint8_t reward0;
   int32_t expMultiplier;
+  uint8_t reward1;
   int32_t gilRward;
   uint16_t levelUnlock;
   uint16_t howTo;
@@ -2009,6 +2321,8 @@ struct CraftLevelDifference
 
 struct CraftType
 {
+  uint8_t mainPhysical;
+  uint8_t subPhysical;
   std::string name;
 
   CraftType( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
@@ -2103,13 +2417,46 @@ struct Cutscene
   Cutscene( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
 
+struct CutsceneMotion
+{
+  float wALK_LOOP_SPEED;
+  float rUN_LOOP_SPEED;
+  float sLOWWALK_LOOP_SPEED;
+  float sLOWRUN_LOOP_SPEED;
+  float bATTLEWALK_LOOP_SPEED;
+  float bATTLERUN_LOOP_SPEED;
+  float dASH_LOOP_SPEED;
+  uint8_t tURN_CW90_FRAME;
+  uint8_t tURN_CCW90_FRAME;
+  uint8_t tURN_CW180_FRAME;
+  uint8_t tURN_CCW180_FRAME;
+
+  CutsceneMotion( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+};
+
+struct CutsceneWorkIndex
+{
+  uint16_t workIndex;
+
+  CutsceneWorkIndex( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+};
+
 struct CutScreenImage
 {
+  int16_t type;
   int32_t image;
 
   CutScreenImage( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
 
+struct CycleTime
+{
+  uint32_t firstCycle;
+  uint32_t cycle;
+
+  CycleTime( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+};
+
 struct DailySupplyItem
 {
 
@@ -2146,6 +2493,15 @@ struct DawnMemberUIParam
   DawnMemberUIParam( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
 
+struct DawnQuestAnnounce
+{
+  uint32_t quest;
+  uint8_t content;
+  std::vector< uint32_t > eNPC;
+
+  DawnQuestAnnounce( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+};
+
 struct DawnQuestMember
 {
   uint32_t member;
@@ -2159,7 +2515,12 @@ struct DawnQuestMember
 
 struct DeepDungeon
 {
+  uint8_t aetherpoolArm;
+  uint8_t aetherpoolArmor;
+  std::vector< uint8_t > pomanderSlot;
+  std::vector< uint8_t > magiciteSlot;
   std::string name;
+  uint16_t contentFinderConditionStart;
 
   DeepDungeon( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
@@ -2292,8 +2653,20 @@ struct DeliveryQuest
   DeliveryQuest( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
 
+struct Description
+{
+  uint32_t quest;
+  std::string textLong;
+  std::string textShort;
+  std::string textCommentary;
+  uint32_t section;
+
+  Description( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+};
+
 struct DescriptionPage
 {
+  uint32_t quest;
   uint16_t text1;
   uint32_t image1;
   uint16_t text2;
@@ -2316,6 +2689,14 @@ struct DescriptionPage
   DescriptionPage( uint32_t row_id, uint32_t subRow, Sapphire::Data::ExdDataGenerated* exdData );
 };
 
+struct DescriptionSection
+{
+  uint16_t string;
+  uint16_t page;
+
+  DescriptionSection( uint32_t row_id, uint32_t subRow, Sapphire::Data::ExdDataGenerated* exdData );
+};
+
 struct DescriptionString
 {
   std::string text;
@@ -2411,8 +2792,23 @@ struct EmoteCategory
   EmoteCategory( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
 
+struct EmoteMode
+{
+  uint16_t startEmote;
+  uint16_t endEmote;
+  bool move;
+  bool camera;
+  bool endOnRotate;
+  bool endOnEmote;
+  uint8_t conditionMode;
+
+  EmoteMode( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+};
+
 struct ENpcBase
 {
+  uint16_t eventHandler;
+  bool important;
   std::vector< uint32_t > eNpcData;
   float scale;
   uint16_t modelChara;
@@ -2469,7 +2865,10 @@ struct ENpcBase
   uint8_t dyeLeftRing;
   uint32_t modelRightRing;
   uint8_t dyeRightRing;
+  uint8_t invisibility;
   uint16_t balloon;
+  bool notRewriteHeight;
+  uint8_t defaultBalloon;
 
   ENpcBase( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
@@ -2520,8 +2919,14 @@ struct ENpcResident
 
 struct EObj
 {
+  uint8_t popType;
   uint32_t data;
+  uint8_t invisibility;
   uint16_t sgbPath;
+  bool eyeCollision;
+  bool directorControl;
+  bool target;
+  uint8_t eventHighAddition;
 
   EObj( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
@@ -2682,6 +3087,8 @@ struct EventItem
   uint8_t stackSize;
   uint32_t quest;
   uint8_t castTime;
+  uint8_t castTimeline;
+  uint8_t timeline;
 
   EventItem( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
@@ -2707,6 +3114,14 @@ struct EventItemTimeline
   EventItemTimeline( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
 
+struct EventSystemDefine
+{
+  std::string text;
+  uint32_t defineValue;
+
+  EventSystemDefine( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+};
+
 struct ExportedSG
 {
   std::string sgbPath;
@@ -2724,14 +3139,22 @@ struct ExVersion
 struct Fate
 {
   uint8_t eurekaFate;
+  uint8_t rule;
   uint32_t location;
   uint8_t classJobLevel;
   uint8_t classJobLevelMax;
   uint32_t eventItem;
+  std::vector< uint8_t > typeToDoValue;
   uint32_t iconObjective;
   uint32_t iconMap;
+  uint32_t iconInactiveMap;
   int32_t music;
+  uint32_t lGBGuardNPCLocation;
+  uint16_t screenImageAccept;
+  uint16_t screenImageComplete;
+  uint16_t screenImageFailed;
   bool hasWorldMapIcon;
+  bool isQuest;
   std::string name;
   std::string description;
   std::string objective;
@@ -2741,6 +3164,20 @@ struct Fate
   Fate( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
 
+struct FateEvent
+{
+  std::vector< uint8_t > turn;
+  std::vector< uint32_t > gesture;
+  std::vector< int32_t > lipSync;
+  std::vector< int32_t > facial;
+  std::vector< int32_t > shape;
+  std::vector< bool > isAutoShake;
+  std::vector< uint8_t > widgetType;
+  std::vector< std::string > text;
+
+  FateEvent( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+};
+
 struct FateProgressUI
 {
   int32_t location;
@@ -2752,16 +3189,28 @@ struct FateProgressUI
   FateProgressUI( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
 
+struct FateTokenType
+{
+  uint32_t currency;
+
+  FateTokenType( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+};
+
 struct FCActivity
 {
   std::string text;
+  uint8_t selfKind;
+  uint8_t targetKind;
+  uint8_t numParam;
   uint8_t fCActivityCategory;
+  int8_t iconType;
 
   FCActivity( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
 
 struct FCActivityCategory
 {
+  uint8_t priority;
   std::string name;
 
   FCActivityCategory( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
@@ -2789,6 +3238,14 @@ struct FCChestName
   FCChestName( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
 
+struct FCCrestSymbol
+{
+  uint8_t colorNum;
+  uint8_t fCRight;
+
+  FCCrestSymbol( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+};
+
 struct FccShop
 {
   std::string name;
@@ -2805,15 +3262,29 @@ struct FCHierarchy
 
 struct FCProfile
 {
+  uint8_t priority;
   std::string name;
 
   FCProfile( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
 
+struct FCRank
+{
+  uint32_t nextPoint;
+  uint32_t currentPoint;
+  uint16_t rights;
+  uint8_t fCActionActiveNum;
+  uint8_t fCActionStockNum;
+
+  FCRank( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+};
+
 struct FCReputation
 {
   uint32_t pointsToNext;
   uint32_t requiredPoints;
+  uint8_t discountRate;
+  uint32_t color;
   std::string name;
 
   FCReputation( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
@@ -2868,7 +3339,10 @@ struct FishingSpot
   std::string bigFishOnReach;
   std::string bigFishOnEnd;
   uint8_t fishingSpotCategory;
+  bool rare;
   uint16_t territoryType;
+  uint16_t placeNameMain;
+  uint16_t placeNameSub;
   int16_t x;
   int16_t z;
   uint16_t radius;
@@ -2934,7 +3408,9 @@ struct FurnitureCatalogItemList
 struct GardeningSeed
 {
   uint32_t item;
+  uint16_t modelID;
   uint32_t icon;
+  bool sE;
 
   GardeningSeed( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
@@ -2957,7 +3433,7 @@ struct GatheringItem
 {
   int32_t item;
   uint16_t gatheringItemLevel;
-  bool isHidden;
+  uint32_t isHidden;
 
   GatheringItem( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
@@ -2979,9 +3455,22 @@ struct GatheringItemPoint
 
 struct GatheringLeve
 {
+  std::vector< int32_t > route;
+  int32_t requiredItem0;
+  uint8_t requiredItemQty0;
   int32_t requiredItem1;
-  uint8_t leveLevel;
+  uint8_t requiredItemQty1;
   int32_t requiredItem2;
+  uint8_t requiredItemQty2;
+  int32_t requiredItem3;
+  uint8_t requiredItemQty3;
+  uint8_t itemNumber;
+  int32_t rule;
+  uint8_t varient;
+  uint16_t objective0;
+  uint16_t objective1;
+  int32_t bNpcEntry;
+  bool useSecondaryTool;
 
   GatheringLeve( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
@@ -2992,6 +3481,13 @@ struct GatheringLeveRoute
   GatheringLeveRoute( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
 
+struct GatheringLeveRule
+{
+  std::string rule;
+
+  GatheringLeveRule( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+};
+
 struct GatheringNotebookList
 {
   std::vector< int32_t > gatheringItem;
@@ -3001,7 +3497,9 @@ struct GatheringNotebookList
 
 struct GatheringPoint
 {
+  uint8_t type;
   int32_t gatheringPointBase;
+  uint8_t count;
   std::vector< uint16_t > gatheringPointBonus;
   uint16_t territoryType;
   uint16_t placeName;
@@ -3052,6 +3550,9 @@ struct GatheringPointName
 
 struct GatheringSubCategory
 {
+  uint8_t gatheringType;
+  uint8_t classJob;
+  uint16_t division;
   int32_t item;
   std::string folkloreBook;
 
@@ -3269,6 +3770,8 @@ struct GeneralAction
   std::string description;
   uint16_t action;
   uint16_t unlockLink;
+  uint8_t recast;
+  uint8_t uIPriority;
   int32_t icon;
 
   GeneralAction( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
@@ -3313,6 +3816,7 @@ struct GilShop
 {
   std::string name;
   uint32_t icon;
+  uint32_t quest;
   int32_t acceptTalk;
   int32_t failTalk;
 
@@ -3329,6 +3833,38 @@ struct GilShopItem
   GilShopItem( uint32_t row_id, uint32_t subRow, Sapphire::Data::ExdDataGenerated* exdData );
 };
 
+struct GimmickAccessor
+{
+  int32_t param0;
+  uint32_t param1;
+  uint32_t param2;
+  uint32_t type;
+
+  GimmickAccessor( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+};
+
+struct GimmickJump
+{
+  uint16_t fallDamage;
+  int8_t height;
+  uint32_t loopMotion;
+  uint32_t endMotion;
+  bool startClient;
+
+  GimmickJump( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+};
+
+struct GimmickRect
+{
+  uint32_t layoutID;
+  uint8_t triggerIn;
+  uint32_t param0;
+  uint8_t triggerOut;
+  uint32_t param1;
+
+  GimmickRect( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+};
+
 struct GoldSaucerArcadeMachine
 {
   uint32_t failImage;
@@ -3370,6 +3906,15 @@ struct GrandCompanyRank
   GrandCompanyRank( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
 
+struct GroupPoseFrame
+{
+  int32_t image;
+  std::string gridText;
+  std::string text;
+
+  GroupPoseFrame( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+};
+
 struct GuardianDeity
 {
   std::string name;
@@ -3653,6 +4198,153 @@ struct HugeCraftworksRank
   HugeCraftworksRank( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
 
+struct HWDAnnounce
+{
+  std::string name;
+  uint32_t eNPC;
+
+  HWDAnnounce( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+};
+
+struct HWDCrafterSupply
+{
+  std::vector< uint32_t > itemTradeIn;
+  std::vector< uint8_t > level;
+  std::vector< uint8_t > baseCollectableRating;
+  std::vector< uint16_t > midBaseCollectableRating;
+  std::vector< uint16_t > highBaseCollectableRating;
+  std::vector< uint16_t > baseCollectableReward;
+  std::vector< uint16_t > midCollectableReward;
+  std::vector< uint16_t > highCollectableReward;
+
+  HWDCrafterSupply( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+};
+
+struct HWDCrafterSupplyReward
+{
+  uint16_t scriptRewardAmount;
+  uint32_t expReward;
+
+  HWDCrafterSupplyReward( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+};
+
+struct HWDDevLayerControl
+{
+
+  HWDDevLayerControl( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+};
+
+struct HWDDevLevelUI
+{
+
+  HWDDevLevelUI( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+};
+
+struct HWDDevLively
+{
+  uint32_t eNPC;
+
+  HWDDevLively( uint32_t row_id, uint32_t subRow, Sapphire::Data::ExdDataGenerated* exdData );
+};
+
+struct HWDDevProgress
+{
+  bool canGoNext;
+
+  HWDDevProgress( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+};
+
+struct HWDInfoBoardArticle
+{
+  uint8_t type;
+  std::string text;
+
+  HWDInfoBoardArticle( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+};
+
+struct HWDInfoBoardArticleTransient
+{
+  uint32_t image;
+  std::string text;
+  std::string npcName;
+
+  HWDInfoBoardArticleTransient( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+};
+
+struct HWDInfoBoardArticleType
+{
+  std::string type;
+
+  HWDInfoBoardArticleType( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+};
+
+struct HWDLevelChangeDeception
+{
+  int32_t image;
+
+  HWDLevelChangeDeception( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+};
+
+struct HWDSharedGroup
+{
+  uint32_t lGB;
+  uint8_t param;
+
+  HWDSharedGroup( uint32_t row_id, uint32_t subRow, Sapphire::Data::ExdDataGenerated* exdData );
+};
+
+struct HWDSharedGroupControlParam
+{
+  uint8_t paramValue;
+
+  HWDSharedGroupControlParam( uint32_t row_id, uint32_t subRow, Sapphire::Data::ExdDataGenerated* exdData );
+};
+
+struct IKDContentBonus
+{
+  std::string objective;
+  std::string requirement;
+  uint32_t image;
+  uint8_t order;
+
+  IKDContentBonus( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+};
+
+struct IKDFishParam
+{
+  uint32_t fish;
+  uint8_t iKDContentBonus;
+
+  IKDFishParam( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+};
+
+struct IKDRoute
+{
+  std::vector< uint32_t > spot;
+  uint8_t timeDefine;
+  uint32_t image;
+  uint32_t territoryType;
+  std::string name;
+
+  IKDRoute( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+};
+
+struct IKDRouteTable
+{
+  uint32_t route;
+
+  IKDRouteTable( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+};
+
+struct IKDSpot
+{
+  uint32_t spotMain;
+  uint32_t spotSub;
+  uint32_t placeName;
+
+  IKDSpot( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+};
+
 struct IndividualWeather
 {
   std::vector< uint8_t > weather;
@@ -3666,28 +4358,28 @@ struct InstanceContent
   uint8_t instanceContentType;
   uint8_t weekRestriction;
   uint16_t timeLimitmin;
-  std::string name;
   uint16_t bGM;
-  uint16_t winBGM;
+  uint32_t winBGM;
   uint32_t cutscene;
-  uint16_t order;
+  uint8_t order;
+  bool colosseum;
   uint32_t instanceContentTextDataBossStart;
   uint32_t instanceContentTextDataBossEnd;
   uint32_t bNpcBaseBoss;
   uint32_t instanceContentTextDataObjectiveStart;
-  uint32_t instanceContentTextDataObjectiveEnd;
-  uint16_t sortKey;
+  uint16_t instanceContentTextDataObjectiveEnd;
+  uint32_t sortKey;
   uint32_t instanceClearExp;
   uint16_t newPlayerBonusA;
-  uint16_t finalBossCurrencyC;
+  uint32_t finalBossCurrencyC;
   uint16_t finalBossCurrencyA;
   uint16_t finalBossCurrencyB;
-  uint16_t newPlayerBonusB;
+  uint32_t newPlayerBonusB;
   uint32_t instanceClearGil;
-  uint32_t instanceContentRewardItem;
-  uint32_t finalBossExp;
-  int32_t instanceContentBuff;
-  uint32_t reqInstance;
+  uint8_t instanceContentRewardItem;
+  int32_t finalBossExp;
+  uint32_t instanceContentBuff;
+  int16_t reqInstance;
   uint8_t partyCondition;
 
   InstanceContent( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
@@ -3759,6 +4451,7 @@ struct Item
   int32_t itemGlamour;
   uint16_t salvage;
   bool isCollectable;
+  bool alwaysCollectable;
   uint16_t aetherialReduce;
   uint8_t levelEquip;
   uint8_t equipRestriction;
@@ -3795,6 +4488,10 @@ struct Item
 
 struct ItemAction
 {
+  uint8_t condLv;
+  bool condBattle;
+  bool condPVP;
+  bool condPVPOnly;
   uint16_t type;
   std::vector< uint16_t > data;
   std::vector< uint16_t > dataHQ;
@@ -3941,6 +4638,8 @@ struct JobHudManualPriority
 struct JournalCategory
 {
   std::string name;
+  uint8_t separateType;
+  uint8_t dataType;
   uint8_t journalSection;
 
   JournalCategory( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
@@ -3962,14 +4661,41 @@ struct JournalSection
   JournalSection( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
 
+struct Knockback
+{
+  uint8_t distance;
+  uint8_t speed;
+  bool motion;
+  uint8_t nearDistance;
+  uint8_t direction;
+  uint8_t directionArg;
+  bool cancelMove;
+
+  Knockback( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+};
+
+struct LegacyQuest
+{
+  uint16_t legacyQuestID;
+  std::string text;
+  std::string string;
+  uint16_t sortKey;
+  uint8_t genre;
+
+  LegacyQuest( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+};
+
 struct Leve
 {
   std::string name;
   std::string description;
   int32_t leveClient;
   int32_t leveAssignmentType;
+  int32_t town;
   uint16_t classJobLevel;
+  uint8_t timeLimit;
   uint8_t allowanceCost;
+  int32_t evaluation;
   int32_t placeNameStart;
   int32_t placeNameIssued;
   uint8_t classJobCategory;
@@ -3977,6 +4703,9 @@ struct Leve
   int32_t placeNameStartZone;
   int32_t iconCityState;
   int32_t dataId;
+  bool canCancel;
+  uint8_t maxDifficulty;
+  float expFactor;
   uint32_t expReward;
   uint32_t gilReward;
   uint16_t leveRewardItem;
@@ -3984,6 +4713,7 @@ struct Leve
   uint8_t leveVfxFrame;
   uint32_t levelLevemete;
   int32_t iconIssuer;
+  bool lockedLeve;
   uint32_t levelStart;
   uint16_t bGM;
 
@@ -4034,6 +4764,13 @@ struct LeveRewardItemGroup
   LeveRewardItemGroup( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
 
+struct LeveString
+{
+  std::string objective;
+
+  LeveString( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+};
+
 struct LeveVfx
 {
   std::string effect;
@@ -4042,9 +4779,24 @@ struct LeveVfx
   LeveVfx( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
 
+struct Lobby
+{
+  uint32_t tYPE;
+  uint32_t pARAM;
+  uint32_t lINK;
+  std::string text;
+
+  Lobby( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+};
+
 struct LogFilter
 {
   uint8_t logKind;
+  uint16_t caster;
+  uint16_t target;
+  uint8_t category;
+  uint8_t displayOrder;
+  uint8_t preset;
   std::string name;
   std::string example;
 
@@ -4054,20 +4806,10 @@ struct LogFilter
 struct LogKind
 {
   std::string format;
-  std::string name;
-  std::string example;
-  uint8_t logKindCategoryText;
 
   LogKind( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
 
-struct LogKindCategoryText
-{
-  std::string text;
-
-  LogKindCategoryText( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
-};
-
 struct LogMessage
 {
   uint16_t logKind;
@@ -4102,7 +4844,9 @@ struct MacroIconRedirectOld
 struct MainCommand
 {
   int32_t icon;
+  uint8_t category;
   uint8_t mainCommandCategory;
+  int8_t sortID;
   std::string name;
   std::string description;
 
@@ -4126,6 +4870,9 @@ struct ManeuversArmor
 
 struct Map
 {
+  uint8_t mapCondition;
+  uint8_t priorityCategoryUI;
+  uint8_t priorityUI;
   int8_t mapIndex;
   uint8_t hierarchy;
   uint16_t mapMarkerRange;
@@ -4137,8 +4884,10 @@ struct Map
   uint16_t placeName;
   uint16_t placeNameSub;
   int16_t discoveryIndex;
+  uint32_t discoveryFlag;
   uint16_t territoryType;
   bool discoveryArrayByte;
+  bool isEvent;
 
   Map( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
@@ -4169,6 +4918,7 @@ struct MapSymbol
 {
   int32_t icon;
   int32_t placeName;
+  bool displayNavi;
 
   MapSymbol( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
@@ -4223,6 +4973,13 @@ struct MateriaJoinRateGatherCraft
   MateriaJoinRateGatherCraft( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
 
+struct MateriaTomestoneRate
+{
+  uint32_t rate;
+
+  MateriaTomestoneRate( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+};
+
 struct MiniGameRA
 {
   int32_t icon;
@@ -4256,7 +5013,9 @@ struct MinionSkillType
 struct MobHuntOrder
 {
   uint16_t target;
-  uint8_t stars;
+  uint8_t neededKills;
+  uint8_t type;
+  uint8_t rank;
   uint8_t mobHuntReward;
 
   MobHuntOrder( uint32_t row_id, uint32_t subRow, Sapphire::Data::ExdDataGenerated* exdData );
@@ -4264,6 +5023,7 @@ struct MobHuntOrder
 
 struct MobHuntOrderType
 {
+  uint8_t type;
   uint32_t quest;
   uint32_t eventItem;
   uint16_t orderStart;
@@ -4276,6 +5036,7 @@ struct MobHuntReward
 {
   uint32_t expReward;
   uint16_t gilReward;
+  uint8_t expansion;
   uint16_t currencyReward;
 
   MobHuntReward( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
@@ -4305,13 +5066,22 @@ struct ModelChara
   uint16_t model;
   uint8_t base;
   uint8_t variant;
+  uint16_t sEPack;
+  bool papVariation;
 
   ModelChara( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
 
 struct ModelSkeleton
 {
-  float scaleFactor;
+  float radius;
+  float height;
+  float vFXScale;
+  float floatHeight;
+  float floatDown;
+  uint16_t floatUp;
+  bool motionBlendType;
+  uint8_t loopFlySE;
 
   ModelSkeleton( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
@@ -4337,10 +5107,34 @@ struct MonsterNoteTarget
 {
   uint16_t bNpcName;
   int32_t icon;
+  uint8_t town;
 
   MonsterNoteTarget( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
 
+struct MotionTimeline
+{
+  std::string filename;
+  uint8_t blendGroup;
+  bool isLoop;
+  bool isBlinkEnable;
+  bool isLipEnable;
+
+  MotionTimeline( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+};
+
+struct MotionTimelineBlendTable
+{
+  uint8_t destBlendGroup;
+  uint8_t srcBlendGroup;
+  uint8_t blendFrame_PC;
+  uint8_t blendFram_TypeA;
+  uint8_t blendFram_TypeB;
+  uint8_t blendFram_TypeC;
+
+  MotionTimelineBlendTable( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+};
+
 struct Mount
 {
   std::string singular;
@@ -4355,11 +5149,23 @@ struct Mount
   uint8_t isFlying;
   uint8_t mountCustomize;
   uint16_t rideBGM;
+  uint8_t exitMoveDist;
+  uint8_t exitMoveSpeed;
+  bool isEmote;
+  int32_t equipHead;
+  int32_t equipBody;
+  int32_t equipLeg;
+  int32_t equipFoot;
   int16_t order;
   uint16_t icon;
+  uint8_t uIPriority;
+  uint8_t radiusRate;
+  uint8_t baseMotionSpeed_Run;
+  uint8_t baseMotionSpeed_Walk;
   uint8_t extraSeats;
   uint16_t mountAction;
   bool isAirborne;
+  bool exHotbarEnableConfig;
   bool useEP;
   bool isImmobile;
 
@@ -4458,10 +5264,45 @@ struct MoveVfx
   MoveVfx( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
 
+struct MovieSubtitle
+{
+  float startTime;
+  float endTime;
+
+  MovieSubtitle( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+};
+
+struct MovieSubtitle500
+{
+  float startTime;
+  float endTime;
+
+  MovieSubtitle500( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+};
+
+struct MovieSubtitleVoyage
+{
+  float startTime;
+  float endTime;
+
+  MovieSubtitleVoyage( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+};
+
 struct NotebookDivision
 {
   std::string name;
   uint8_t notebookDivisionCategory;
+  uint8_t craftOpeningLevel;
+  uint8_t gatheringOpeningLevel;
+  uint32_t questUnlock;
+  bool cRPCraft;
+  bool bSMCraft;
+  bool aRMCraft;
+  bool gSMCraft;
+  bool lTWCraft;
+  bool wVRCraft;
+  bool aLCCraft;
+  bool cULCraft;
 
   NotebookDivision( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
@@ -4515,20 +5356,29 @@ struct NpcEquip
 
 struct NpcYell
 {
-  std::string text;
+  uint8_t outputType;
+  float balloonTime;
+  bool isBalloonSlow;
+  bool battleTalkTime;
+  float text;
 
   NpcYell( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
 
 struct Omen
 {
-  std::string fileName;
+  std::string path;
+  std::string pathAlly;
+  uint8_t type;
+  bool restrictYScale;
+  bool largeScale;
 
   Omen( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
 
 struct OnlineStatus
 {
+  bool list;
   uint8_t priority;
   std::string name;
   uint32_t icon;
@@ -4593,6 +5443,7 @@ struct ParamGrow
 {
   int32_t expToNext;
   uint8_t additionalActions;
+  uint8_t applyAction;
   uint16_t scaledQuestXP;
   int32_t mpModifier;
   int32_t baseSpeed;
@@ -4600,7 +5451,10 @@ struct ParamGrow
   uint8_t questExpModifier;
   uint16_t hpModifier;
   int32_t huntingLogExpReward;
+  int32_t monsterNoteSeals;
   uint16_t itemLevelSync;
+  uint16_t properDungeon;
+  uint16_t properGuildOrder;
   uint16_t craftingLevel;
 
   ParamGrow( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
@@ -4610,7 +5464,7 @@ struct PartyContent
 {
   uint8_t key;
   uint16_t timeLimit;
-  std::string name;
+  bool name;
   uint32_t textDataStart;
   uint32_t textDataEnd;
   uint16_t contentFinderCondition;
@@ -4633,6 +5487,17 @@ struct PartyContentTextData
   PartyContentTextData( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
 
+struct PatchMark
+{
+  int8_t category;
+  uint8_t subCategoryType;
+  uint16_t subCategory;
+  uint32_t markID;
+  uint8_t version;
+
+  PatchMark( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+};
+
 struct Perform
 {
   std::string name;
@@ -4670,15 +5535,41 @@ struct PetAction
   int32_t icon;
   uint16_t action;
   uint8_t pet;
+  bool masterOrder;
+  bool disableOrder;
 
   PetAction( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
 
+struct PhysicsGroup
+{
+  std::vector< float > simulationTime;
+  std::vector< float > pS3SimulationTime;
+  bool resetByLookAt;
+  float rootFollowingGame;
+  float rootFollowingCutScene;
+  std::vector< int8_t > configSwitch;
+  bool forceAttractByPhysicsOff;
+
+  PhysicsGroup( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+};
+
+struct PhysicsWind
+{
+  float threshold;
+  float amplitude;
+  float amplitudeFrequency;
+  float powerMin;
+  float powerMax;
+  float powerFrequency;
+
+  PhysicsWind( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+};
+
 struct Picture
 {
   int32_t item;
   int32_t image;
-  int32_t signature;
 
   Picture( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
@@ -4706,6 +5597,49 @@ struct PreHandler
   PreHandler( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
 
+struct PresetCamera
+{
+  uint16_t eID;
+  float posX;
+  float posY;
+  float posZ;
+  float elezen;
+  float lalafell;
+  float miqote;
+  float roe;
+  float hrothgar;
+  float viera;
+  float hyur_F;
+  float elezen_F;
+  float lalafell_F;
+  float miqote_F;
+  float roe_F;
+  float hrothgar_F;
+  float viera_F;
+
+  PresetCamera( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+};
+
+struct PresetCameraAdjust
+{
+  float hyur_M;
+  float hyur_F;
+  float elezen_M;
+  float elezen_F;
+  float lalafell_M;
+  float lalafell_F;
+  float miqote_M;
+  float miqote_F;
+  float roe_M;
+  float roe_F;
+  float hrothgar_M;
+  float hrothgar_F;
+  float viera_M;
+  float viera_F;
+
+  PresetCameraAdjust( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+};
+
 struct PublicContent
 {
   uint8_t type;
@@ -4735,9 +5669,18 @@ struct PublicContentTextData
   PublicContentTextData( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
 
+struct Purify
+{
+  uint8_t _class;
+  uint8_t level;
+
+  Purify( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+};
+
 struct PvPAction
 {
   uint16_t action;
+  std::vector< bool > grandCompany;
 
   PvPAction( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
@@ -4868,6 +5811,14 @@ struct QuestBattle
   QuestBattle( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
 
+struct QuestChapter
+{
+  uint32_t quest;
+  uint16_t redo;
+
+  QuestChapter( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+};
+
 struct QuestClassJobReward
 {
   uint8_t classJobCategory;
@@ -4888,6 +5839,59 @@ struct QuestClassJobSupply
   QuestClassJobSupply( uint32_t row_id, uint32_t subRow, Sapphire::Data::ExdDataGenerated* exdData );
 };
 
+struct QuestDerivedClass
+{
+  uint32_t quest;
+
+  QuestDerivedClass( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+};
+
+struct QuestRedo
+{
+  uint32_t finalQuest;
+  uint16_t chapter;
+  std::vector< uint32_t > quest;
+
+  QuestRedo( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+};
+
+struct QuestRedoChapterUI
+{
+  uint32_t quest;
+  uint8_t category;
+  uint32_t questRedoUISmall;
+  uint32_t questRedoUILarge;
+  uint32_t questRedoUIWide;
+  std::string chapterName;
+  std::string chapterPart;
+  std::string transient;
+
+  QuestRedoChapterUI( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+};
+
+struct QuestRedoChapterUICategory
+{
+  std::string expac;
+
+  QuestRedoChapterUICategory( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+};
+
+struct QuestRedoChapterUITab
+{
+  uint32_t icon1;
+  uint32_t icon2;
+  std::string text;
+
+  QuestRedoChapterUITab( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+};
+
+struct QuestRedoIncompChapter
+{
+  uint16_t chapter;
+
+  QuestRedoIncompChapter( uint32_t row_id, uint32_t subRow, Sapphire::Data::ExdDataGenerated* exdData );
+};
+
 struct QuestRepeatFlag
 {
   uint32_t quest;
@@ -4996,6 +6000,7 @@ struct RecastNavimesh
 
 struct Recipe
 {
+  int32_t number;
   int32_t craftType;
   uint16_t recipeLevelTable;
   int32_t itemResult;
@@ -5044,6 +6049,9 @@ struct RecipeNotebookList
 struct RecommendContents
 {
   int32_t level;
+  uint8_t classJob;
+  uint8_t minLevel;
+  uint8_t maxLevel;
 
   RecommendContents( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
@@ -5053,6 +6061,19 @@ struct Relic
   uint32_t itemAtma;
   uint32_t itemAnimus;
   int32_t icon;
+  uint16_t materia0;
+  uint8_t noteMain0;
+  uint8_t noteSub0;
+  uint8_t noteSelection10;
+  uint16_t materia1;
+  uint8_t noteMain1;
+  uint8_t noteSub1;
+  uint8_t noteSelection1;
+  uint16_t materia2;
+  uint8_t noteMain2;
+  uint8_t noteSub2;
+  uint16_t materia3;
+  uint8_t noteSelection3;
 
   Relic( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
@@ -5182,6 +6203,7 @@ struct SatisfactionNpc
 {
   int32_t npc;
   int32_t questRequired;
+  uint8_t levelUnlock;
   uint8_t deliveriesPerWeek;
   std::vector< int32_t > supplyIndex;
   std::vector< uint16_t > satisfactionRequired;
@@ -5258,6 +6280,9 @@ struct ScenarioType
 struct ScreenImage
 {
   uint32_t image;
+  int16_t jingle;
+  int8_t type;
+  bool lang;
 
   ScreenImage( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
@@ -5328,6 +6353,7 @@ struct SpearfishingItem
   std::string description;
   int32_t item;
   uint16_t gatheringItemLevel;
+  uint8_t fishingRecordType;
   uint16_t territoryType;
   bool isVisible;
 
@@ -5361,10 +6387,11 @@ struct SpecialShop
   std::vector< int32_t > questItem;
   std::vector< int32_t > unknown;
   std::vector< int32_t > achievementUnlock;
-  std::vector< uint16_t > patchNumber;
-  uint32_t questUnlock;
-  int32_t notCompleteText;
-  int32_t completeText;
+  std::vector< uint8_t > patchNumber;
+  uint16_t useCurrencyType;
+  uint16_t questUnlock;
+  uint16_t completeText;
+  uint16_t notCompleteText;
 
   SpecialShop( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
@@ -5409,6 +6436,8 @@ struct Status
   bool canDispel;
   bool inflictedByActor;
   bool isPermanent;
+  uint8_t partyListPriority;
+  uint16_t log;
   bool isFcBuff;
   bool invisibility;
 
@@ -5493,18 +6522,27 @@ struct TerritoryType
 {
   std::string name;
   std::string bg;
+  uint8_t battalionMode;
   uint16_t placeNameRegion;
   uint16_t placeNameZone;
   uint16_t placeName;
   uint16_t map;
   uint8_t loadingImage;
+  uint8_t exclusiveType;
   uint8_t territoryIntendedUse;
   uint8_t weatherRate;
+  bool pCSearch;
+  bool stealth;
+  bool mount;
+  uint16_t bGM;
   int32_t placeNameRegionIcon;
   int32_t placeNameIcon;
   uint32_t arrayEventHandler;
   uint16_t questBattle;
   int32_t aetheryte;
+  int32_t fixedTime;
+  uint16_t resident;
+  int8_t achievementIndex;
   bool isPvpZone;
 
   TerritoryType( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
@@ -5596,15 +6634,21 @@ struct Transformation
   uint16_t bNpcName;
   int32_t bNpcCustomize;
   int32_t npcEquip;
-  std::vector< uint16_t > action;
+  bool exHotbarEnableConfig;
+  uint16_t action0;
+  uint16_t action1;
+  uint16_t action2;
+  uint16_t action3;
+  uint16_t action4;
+  uint16_t action5;
   uint8_t rPParameter;
   float speed;
   float scale;
   bool isPvP;
   bool isEvent;
   bool playerCamera;
-  uint16_t startVFX;
-  uint16_t endVFX;
+  bool startVFX;
+  bool endVFX;
 
   Transformation( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
@@ -5628,9 +6672,18 @@ struct TreasureHuntRank
   TreasureHuntRank( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
 
+struct TreasureModel
+{
+  std::string path;
+
+  TreasureModel( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+};
+
 struct TreasureSpot
 {
   int32_t location;
+  float mapOffsetX;
+  float mapOffsetY;
 
   TreasureSpot( uint32_t row_id, uint32_t subRow, Sapphire::Data::ExdDataGenerated* exdData );
 };
@@ -5639,9 +6692,11 @@ struct Tribe
 {
   std::string masculine;
   std::string feminine;
+  int8_t hp;
+  int8_t mp;
   int8_t sTR;
-  int8_t dEX;
   int8_t vIT;
+  int8_t dEX;
   int8_t iNT;
   int8_t mND;
   int8_t pIE;
@@ -5778,23 +6833,32 @@ struct VFX
 
 struct Warp
 {
-  uint32_t level;
+  uint32_t popRange;
   uint16_t territoryType;
   uint32_t conditionSuccessEvent;
   uint32_t conditionFailEvent;
   uint32_t confirmEvent;
   uint16_t warpCondition;
   uint16_t warpLogic;
+  uint16_t startCutscene;
+  uint16_t endCutscene;
+  bool canSkipCutscene;
+  std::string name;
+  std::string question;
 
   Warp( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
 
 struct WarpCondition
 {
+  uint16_t gil;
+  uint8_t completeParam;
   uint32_t requiredQuest1;
   uint32_t requiredQuest2;
   uint32_t dRequiredQuest3;
   uint32_t requiredQuest4;
+  uint16_t questReward;
+  uint16_t classLevel;
 
   WarpCondition( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
@@ -5802,6 +6866,7 @@ struct WarpCondition
 struct WarpLogic
 {
   std::string warpName;
+  bool canSkipCutscene;
   std::vector< std::string > function;
   std::string question;
   std::string responseYes;
@@ -5810,6 +6875,14 @@ struct WarpLogic
   WarpLogic( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
 
+struct WeaponTimeline
+{
+  std::string file;
+  int16_t nextWeaponTimeline;
+
+  WeaponTimeline( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+};
+
 struct Weather
 {
   int32_t icon;
@@ -5884,6 +6957,7 @@ struct WeeklyLotBonus
 struct World
 {
   std::string name;
+  uint8_t userType;
   uint8_t dataCenter;
   bool isPublic;
 
@@ -6025,6 +7099,7 @@ struct ZoneSharedGroup
      xiv::exd::Exd m_AirshipExplorationParamTypeDat;
      xiv::exd::Exd m_AirshipExplorationPartDat;
      xiv::exd::Exd m_AirshipExplorationPointDat;
+     xiv::exd::Exd m_AnimationLODDat;
      xiv::exd::Exd m_AnimaWeapon5Dat;
      xiv::exd::Exd m_AnimaWeapon5ParamDat;
      xiv::exd::Exd m_AnimaWeapon5PatternGroupDat;
@@ -6041,21 +7116,27 @@ struct ZoneSharedGroup
      xiv::exd::Exd m_AOZBossDat;
      xiv::exd::Exd m_AOZContentDat;
      xiv::exd::Exd m_AOZContentBriefingBNpcDat;
+     xiv::exd::Exd m_AOZReportDat;
      xiv::exd::Exd m_AquariumFishDat;
      xiv::exd::Exd m_AquariumWaterDat;
      xiv::exd::Exd m_ArrayEventHandlerDat;
      xiv::exd::Exd m_AttackTypeDat;
      xiv::exd::Exd m_BacklightColorDat;
+     xiv::exd::Exd m_BallistaDat;
      xiv::exd::Exd m_BalloonDat;
      xiv::exd::Exd m_BaseParamDat;
      xiv::exd::Exd m_BattleLeveDat;
+     xiv::exd::Exd m_BattleLeveRuleDat;
      xiv::exd::Exd m_BeastRankBonusDat;
      xiv::exd::Exd m_BeastReputationRankDat;
      xiv::exd::Exd m_BeastTribeDat;
      xiv::exd::Exd m_BehaviorDat;
+     xiv::exd::Exd m_BehaviorPathDat;
      xiv::exd::Exd m_BenchmarkOverrideEquipmentDat;
      xiv::exd::Exd m_BGMDat;
      xiv::exd::Exd m_BGMFadeDat;
+     xiv::exd::Exd m_BGMFadeTypeDat;
+     xiv::exd::Exd m_BGMSceneDat;
      xiv::exd::Exd m_BGMSituationDat;
      xiv::exd::Exd m_BGMSwitchDat;
      xiv::exd::Exd m_BGMSystemDefineDat;
@@ -6064,6 +7145,7 @@ struct ZoneSharedGroup
      xiv::exd::Exd m_BNpcCustomizeDat;
      xiv::exd::Exd m_BNpcNameDat;
      xiv::exd::Exd m_BNpcPartsDat;
+     xiv::exd::Exd m_BNpcStateDat;
      xiv::exd::Exd m_BuddyDat;
      xiv::exd::Exd m_BuddyActionDat;
      xiv::exd::Exd m_BuddyEquipDat;
@@ -6073,6 +7155,9 @@ struct ZoneSharedGroup
      xiv::exd::Exd m_CabinetDat;
      xiv::exd::Exd m_CabinetCategoryDat;
      xiv::exd::Exd m_CalendarDat;
+     xiv::exd::Exd m_CarryDat;
+     xiv::exd::Exd m_ChannelingDat;
+     xiv::exd::Exd m_CharaMakeClassEquipDat;
      xiv::exd::Exd m_CharaMakeCustomizeDat;
      xiv::exd::Exd m_CharaMakeTypeDat;
      xiv::exd::Exd m_ChocoboRaceDat;
@@ -6086,6 +7171,7 @@ struct ZoneSharedGroup
      xiv::exd::Exd m_ChocoboRaceWeatherDat;
      xiv::exd::Exd m_ChocoboTaxiDat;
      xiv::exd::Exd m_ChocoboTaxiStandDat;
+     xiv::exd::Exd m_CircleActivityDat;
      xiv::exd::Exd m_ClassJobDat;
      xiv::exd::Exd m_ClassJobCategoryDat;
      xiv::exd::Exd m_CompanionDat;
@@ -6104,6 +7190,7 @@ struct ZoneSharedGroup
      xiv::exd::Exd m_CompanyLeveRuleDat;
      xiv::exd::Exd m_CompleteJournalDat;
      xiv::exd::Exd m_CompleteJournalCategoryDat;
+     xiv::exd::Exd m_ConfigKeyDat;
      xiv::exd::Exd m_ContentCloseCycleDat;
      xiv::exd::Exd m_ContentExActionDat;
      xiv::exd::Exd m_ContentFinderConditionDat;
@@ -6134,11 +7221,15 @@ struct ZoneSharedGroup
      xiv::exd::Exd m_CustomTalkDynamicIconDat;
      xiv::exd::Exd m_CustomTalkNestHandlersDat;
      xiv::exd::Exd m_CutsceneDat;
+     xiv::exd::Exd m_CutsceneMotionDat;
+     xiv::exd::Exd m_CutsceneWorkIndexDat;
      xiv::exd::Exd m_CutScreenImageDat;
+     xiv::exd::Exd m_CycleTimeDat;
      xiv::exd::Exd m_DailySupplyItemDat;
      xiv::exd::Exd m_DawnContentDat;
      xiv::exd::Exd m_DawnGrowMemberDat;
      xiv::exd::Exd m_DawnMemberUIParamDat;
+     xiv::exd::Exd m_DawnQuestAnnounceDat;
      xiv::exd::Exd m_DawnQuestMemberDat;
      xiv::exd::Exd m_DeepDungeonDat;
      xiv::exd::Exd m_DeepDungeonBanDat;
@@ -6154,7 +7245,9 @@ struct ZoneSharedGroup
      xiv::exd::Exd m_DefaultTalkDat;
      xiv::exd::Exd m_DefaultTalkLipSyncTypeDat;
      xiv::exd::Exd m_DeliveryQuestDat;
+     xiv::exd::Exd m_DescriptionDat;
      xiv::exd::Exd m_DescriptionPageDat;
+     xiv::exd::Exd m_DescriptionSectionDat;
      xiv::exd::Exd m_DescriptionStringDat;
      xiv::exd::Exd m_DisposalShopDat;
      xiv::exd::Exd m_DisposalShopFilterTypeDat;
@@ -6166,6 +7259,7 @@ struct ZoneSharedGroup
      xiv::exd::Exd m_EmjDaniDat;
      xiv::exd::Exd m_EmoteDat;
      xiv::exd::Exd m_EmoteCategoryDat;
+     xiv::exd::Exd m_EmoteModeDat;
      xiv::exd::Exd m_ENpcBaseDat;
      xiv::exd::Exd m_ENpcDressUpDat;
      xiv::exd::Exd m_ENpcDressUpDressDat;
@@ -6189,18 +7283,23 @@ struct ZoneSharedGroup
      xiv::exd::Exd m_EventItemCastTimelineDat;
      xiv::exd::Exd m_EventItemHelpDat;
      xiv::exd::Exd m_EventItemTimelineDat;
+     xiv::exd::Exd m_EventSystemDefineDat;
      xiv::exd::Exd m_ExportedSGDat;
      xiv::exd::Exd m_ExVersionDat;
      xiv::exd::Exd m_FateDat;
+     xiv::exd::Exd m_FateEventDat;
      xiv::exd::Exd m_FateProgressUIDat;
+     xiv::exd::Exd m_FateTokenTypeDat;
      xiv::exd::Exd m_FCActivityDat;
      xiv::exd::Exd m_FCActivityCategoryDat;
      xiv::exd::Exd m_FCAuthorityDat;
      xiv::exd::Exd m_FCAuthorityCategoryDat;
      xiv::exd::Exd m_FCChestNameDat;
+     xiv::exd::Exd m_FCCrestSymbolDat;
      xiv::exd::Exd m_FccShopDat;
      xiv::exd::Exd m_FCHierarchyDat;
      xiv::exd::Exd m_FCProfileDat;
+     xiv::exd::Exd m_FCRankDat;
      xiv::exd::Exd m_FCReputationDat;
      xiv::exd::Exd m_FCRightsDat;
      xiv::exd::Exd m_FestivalDat;
@@ -6221,6 +7320,7 @@ struct ZoneSharedGroup
      xiv::exd::Exd m_GatheringItemPointDat;
      xiv::exd::Exd m_GatheringLeveDat;
      xiv::exd::Exd m_GatheringLeveRouteDat;
+     xiv::exd::Exd m_GatheringLeveRuleDat;
      xiv::exd::Exd m_GatheringNotebookListDat;
      xiv::exd::Exd m_GatheringPointDat;
      xiv::exd::Exd m_GatheringPointBaseDat;
@@ -6255,10 +7355,14 @@ struct ZoneSharedGroup
      xiv::exd::Exd m_GFateRideShootingDat;
      xiv::exd::Exd m_GilShopDat;
      xiv::exd::Exd m_GilShopItemDat;
+     xiv::exd::Exd m_GimmickAccessorDat;
+     xiv::exd::Exd m_GimmickJumpDat;
+     xiv::exd::Exd m_GimmickRectDat;
      xiv::exd::Exd m_GoldSaucerArcadeMachineDat;
      xiv::exd::Exd m_GoldSaucerTextDataDat;
      xiv::exd::Exd m_GrandCompanyDat;
      xiv::exd::Exd m_GrandCompanyRankDat;
+     xiv::exd::Exd m_GroupPoseFrameDat;
      xiv::exd::Exd m_GuardianDeityDat;
      xiv::exd::Exd m_GuideDat;
      xiv::exd::Exd m_GuidePageDat;
@@ -6289,6 +7393,24 @@ struct ZoneSharedGroup
      xiv::exd::Exd m_HowToPageDat;
      xiv::exd::Exd m_HugeCraftworksNpcDat;
      xiv::exd::Exd m_HugeCraftworksRankDat;
+     xiv::exd::Exd m_HWDAnnounceDat;
+     xiv::exd::Exd m_HWDCrafterSupplyDat;
+     xiv::exd::Exd m_HWDCrafterSupplyRewardDat;
+     xiv::exd::Exd m_HWDDevLayerControlDat;
+     xiv::exd::Exd m_HWDDevLevelUIDat;
+     xiv::exd::Exd m_HWDDevLivelyDat;
+     xiv::exd::Exd m_HWDDevProgressDat;
+     xiv::exd::Exd m_HWDInfoBoardArticleDat;
+     xiv::exd::Exd m_HWDInfoBoardArticleTransientDat;
+     xiv::exd::Exd m_HWDInfoBoardArticleTypeDat;
+     xiv::exd::Exd m_HWDLevelChangeDeceptionDat;
+     xiv::exd::Exd m_HWDSharedGroupDat;
+     xiv::exd::Exd m_HWDSharedGroupControlParamDat;
+     xiv::exd::Exd m_IKDContentBonusDat;
+     xiv::exd::Exd m_IKDFishParamDat;
+     xiv::exd::Exd m_IKDRouteDat;
+     xiv::exd::Exd m_IKDRouteTableDat;
+     xiv::exd::Exd m_IKDSpotDat;
      xiv::exd::Exd m_IndividualWeatherDat;
      xiv::exd::Exd m_InstanceContentDat;
      xiv::exd::Exd m_InstanceContentBuffDat;
@@ -6308,16 +7430,19 @@ struct ZoneSharedGroup
      xiv::exd::Exd m_JournalCategoryDat;
      xiv::exd::Exd m_JournalGenreDat;
      xiv::exd::Exd m_JournalSectionDat;
+     xiv::exd::Exd m_KnockbackDat;
+     xiv::exd::Exd m_LegacyQuestDat;
      xiv::exd::Exd m_LeveDat;
      xiv::exd::Exd m_LeveAssignmentTypeDat;
      xiv::exd::Exd m_LeveClientDat;
      xiv::exd::Exd m_LevelDat;
      xiv::exd::Exd m_LeveRewardItemDat;
      xiv::exd::Exd m_LeveRewardItemGroupDat;
+     xiv::exd::Exd m_LeveStringDat;
      xiv::exd::Exd m_LeveVfxDat;
+     xiv::exd::Exd m_LobbyDat;
      xiv::exd::Exd m_LogFilterDat;
      xiv::exd::Exd m_LogKindDat;
-     xiv::exd::Exd m_LogKindCategoryTextDat;
      xiv::exd::Exd m_LogMessageDat;
      xiv::exd::Exd m_LotteryExchangeShopDat;
      xiv::exd::Exd m_MacroIconDat;
@@ -6335,6 +7460,7 @@ struct ZoneSharedGroup
      xiv::exd::Exd m_MateriaDat;
      xiv::exd::Exd m_MateriaJoinRateDat;
      xiv::exd::Exd m_MateriaJoinRateGatherCraftDat;
+     xiv::exd::Exd m_MateriaTomestoneRateDat;
      xiv::exd::Exd m_MiniGameRADat;
      xiv::exd::Exd m_MinionRaceDat;
      xiv::exd::Exd m_MinionRulesDat;
@@ -6349,6 +7475,8 @@ struct ZoneSharedGroup
      xiv::exd::Exd m_ModelStateDat;
      xiv::exd::Exd m_MonsterNoteDat;
      xiv::exd::Exd m_MonsterNoteTargetDat;
+     xiv::exd::Exd m_MotionTimelineDat;
+     xiv::exd::Exd m_MotionTimelineBlendTableDat;
      xiv::exd::Exd m_MountDat;
      xiv::exd::Exd m_MountActionDat;
      xiv::exd::Exd m_MountCustomizeDat;
@@ -6357,6 +7485,9 @@ struct ZoneSharedGroup
      xiv::exd::Exd m_MountTransientDat;
      xiv::exd::Exd m_MoveTimelineDat;
      xiv::exd::Exd m_MoveVfxDat;
+     xiv::exd::Exd m_MovieSubtitleDat;
+     xiv::exd::Exd m_MovieSubtitle500Dat;
+     xiv::exd::Exd m_MovieSubtitleVoyageDat;
      xiv::exd::Exd m_NotebookDivisionDat;
      xiv::exd::Exd m_NotebookDivisionCategoryDat;
      xiv::exd::Exd m_NotoriousMonsterDat;
@@ -6375,17 +7506,23 @@ struct ZoneSharedGroup
      xiv::exd::Exd m_PartyContentDat;
      xiv::exd::Exd m_PartyContentCutsceneDat;
      xiv::exd::Exd m_PartyContentTextDataDat;
+     xiv::exd::Exd m_PatchMarkDat;
      xiv::exd::Exd m_PerformDat;
      xiv::exd::Exd m_PerformTransientDat;
      xiv::exd::Exd m_PetDat;
      xiv::exd::Exd m_PetActionDat;
+     xiv::exd::Exd m_PhysicsGroupDat;
+     xiv::exd::Exd m_PhysicsWindDat;
      xiv::exd::Exd m_PictureDat;
      xiv::exd::Exd m_PlaceNameDat;
      xiv::exd::Exd m_PlantPotFlowerSeedDat;
      xiv::exd::Exd m_PreHandlerDat;
+     xiv::exd::Exd m_PresetCameraDat;
+     xiv::exd::Exd m_PresetCameraAdjustDat;
      xiv::exd::Exd m_PublicContentDat;
      xiv::exd::Exd m_PublicContentCutsceneDat;
      xiv::exd::Exd m_PublicContentTextDataDat;
+     xiv::exd::Exd m_PurifyDat;
      xiv::exd::Exd m_PvPActionDat;
      xiv::exd::Exd m_PvPActionSortDat;
      xiv::exd::Exd m_PvPRankDat;
@@ -6393,8 +7530,15 @@ struct ZoneSharedGroup
      xiv::exd::Exd m_PvPTraitDat;
      xiv::exd::Exd m_QuestDat;
      xiv::exd::Exd m_QuestBattleDat;
+     xiv::exd::Exd m_QuestChapterDat;
      xiv::exd::Exd m_QuestClassJobRewardDat;
      xiv::exd::Exd m_QuestClassJobSupplyDat;
+     xiv::exd::Exd m_QuestDerivedClassDat;
+     xiv::exd::Exd m_QuestRedoDat;
+     xiv::exd::Exd m_QuestRedoChapterUIDat;
+     xiv::exd::Exd m_QuestRedoChapterUICategoryDat;
+     xiv::exd::Exd m_QuestRedoChapterUITabDat;
+     xiv::exd::Exd m_QuestRedoIncompChapterDat;
      xiv::exd::Exd m_QuestRepeatFlagDat;
      xiv::exd::Exd m_QuestRewardOtherDat;
      xiv::exd::Exd m_QuickChatDat;
@@ -6468,6 +7612,7 @@ struct ZoneSharedGroup
      xiv::exd::Exd m_TransformationDat;
      xiv::exd::Exd m_TreasureDat;
      xiv::exd::Exd m_TreasureHuntRankDat;
+     xiv::exd::Exd m_TreasureModelDat;
      xiv::exd::Exd m_TreasureSpotDat;
      xiv::exd::Exd m_TribeDat;
      xiv::exd::Exd m_TripleTriadDat;
@@ -6487,6 +7632,7 @@ struct ZoneSharedGroup
      xiv::exd::Exd m_WarpDat;
      xiv::exd::Exd m_WarpConditionDat;
      xiv::exd::Exd m_WarpLogicDat;
+     xiv::exd::Exd m_WeaponTimelineDat;
      xiv::exd::Exd m_WeatherDat;
      xiv::exd::Exd m_WeatherGroupDat;
      xiv::exd::Exd m_WeatherRateDat;
@@ -6537,6 +7683,7 @@ struct ZoneSharedGroup
      using AirshipExplorationParamTypePtr = std::shared_ptr< AirshipExplorationParamType >;
      using AirshipExplorationPartPtr = std::shared_ptr< AirshipExplorationPart >;
      using AirshipExplorationPointPtr = std::shared_ptr< AirshipExplorationPoint >;
+     using AnimationLODPtr = std::shared_ptr< AnimationLOD >;
      using AnimaWeapon5Ptr = std::shared_ptr< AnimaWeapon5 >;
      using AnimaWeapon5ParamPtr = std::shared_ptr< AnimaWeapon5Param >;
      using AnimaWeapon5PatternGroupPtr = std::shared_ptr< AnimaWeapon5PatternGroup >;
@@ -6553,21 +7700,27 @@ struct ZoneSharedGroup
      using AOZBossPtr = std::shared_ptr< AOZBoss >;
      using AOZContentPtr = std::shared_ptr< AOZContent >;
      using AOZContentBriefingBNpcPtr = std::shared_ptr< AOZContentBriefingBNpc >;
+     using AOZReportPtr = std::shared_ptr< AOZReport >;
      using AquariumFishPtr = std::shared_ptr< AquariumFish >;
      using AquariumWaterPtr = std::shared_ptr< AquariumWater >;
      using ArrayEventHandlerPtr = std::shared_ptr< ArrayEventHandler >;
      using AttackTypePtr = std::shared_ptr< AttackType >;
      using BacklightColorPtr = std::shared_ptr< BacklightColor >;
+     using BallistaPtr = std::shared_ptr< Ballista >;
      using BalloonPtr = std::shared_ptr< Balloon >;
      using BaseParamPtr = std::shared_ptr< BaseParam >;
      using BattleLevePtr = std::shared_ptr< BattleLeve >;
+     using BattleLeveRulePtr = std::shared_ptr< BattleLeveRule >;
      using BeastRankBonusPtr = std::shared_ptr< BeastRankBonus >;
      using BeastReputationRankPtr = std::shared_ptr< BeastReputationRank >;
      using BeastTribePtr = std::shared_ptr< BeastTribe >;
      using BehaviorPtr = std::shared_ptr< Behavior >;
+     using BehaviorPathPtr = std::shared_ptr< BehaviorPath >;
      using BenchmarkOverrideEquipmentPtr = std::shared_ptr< BenchmarkOverrideEquipment >;
      using BGMPtr = std::shared_ptr< BGM >;
      using BGMFadePtr = std::shared_ptr< BGMFade >;
+     using BGMFadeTypePtr = std::shared_ptr< BGMFadeType >;
+     using BGMScenePtr = std::shared_ptr< BGMScene >;
      using BGMSituationPtr = std::shared_ptr< BGMSituation >;
      using BGMSwitchPtr = std::shared_ptr< BGMSwitch >;
      using BGMSystemDefinePtr = std::shared_ptr< BGMSystemDefine >;
@@ -6576,6 +7729,7 @@ struct ZoneSharedGroup
      using BNpcCustomizePtr = std::shared_ptr< BNpcCustomize >;
      using BNpcNamePtr = std::shared_ptr< BNpcName >;
      using BNpcPartsPtr = std::shared_ptr< BNpcParts >;
+     using BNpcStatePtr = std::shared_ptr< BNpcState >;
      using BuddyPtr = std::shared_ptr< Buddy >;
      using BuddyActionPtr = std::shared_ptr< BuddyAction >;
      using BuddyEquipPtr = std::shared_ptr< BuddyEquip >;
@@ -6585,6 +7739,9 @@ struct ZoneSharedGroup
      using CabinetPtr = std::shared_ptr< Cabinet >;
      using CabinetCategoryPtr = std::shared_ptr< CabinetCategory >;
      using CalendarPtr = std::shared_ptr< Calendar >;
+     using CarryPtr = std::shared_ptr< Carry >;
+     using ChannelingPtr = std::shared_ptr< Channeling >;
+     using CharaMakeClassEquipPtr = std::shared_ptr< CharaMakeClassEquip >;
      using CharaMakeCustomizePtr = std::shared_ptr< CharaMakeCustomize >;
      using CharaMakeTypePtr = std::shared_ptr< CharaMakeType >;
      using ChocoboRacePtr = std::shared_ptr< ChocoboRace >;
@@ -6598,6 +7755,7 @@ struct ZoneSharedGroup
      using ChocoboRaceWeatherPtr = std::shared_ptr< ChocoboRaceWeather >;
      using ChocoboTaxiPtr = std::shared_ptr< ChocoboTaxi >;
      using ChocoboTaxiStandPtr = std::shared_ptr< ChocoboTaxiStand >;
+     using CircleActivityPtr = std::shared_ptr< CircleActivity >;
      using ClassJobPtr = std::shared_ptr< ClassJob >;
      using ClassJobCategoryPtr = std::shared_ptr< ClassJobCategory >;
      using CompanionPtr = std::shared_ptr< Companion >;
@@ -6616,6 +7774,7 @@ struct ZoneSharedGroup
      using CompanyLeveRulePtr = std::shared_ptr< CompanyLeveRule >;
      using CompleteJournalPtr = std::shared_ptr< CompleteJournal >;
      using CompleteJournalCategoryPtr = std::shared_ptr< CompleteJournalCategory >;
+     using ConfigKeyPtr = std::shared_ptr< ConfigKey >;
      using ContentCloseCyclePtr = std::shared_ptr< ContentCloseCycle >;
      using ContentExActionPtr = std::shared_ptr< ContentExAction >;
      using ContentFinderConditionPtr = std::shared_ptr< ContentFinderCondition >;
@@ -6646,11 +7805,15 @@ struct ZoneSharedGroup
      using CustomTalkDynamicIconPtr = std::shared_ptr< CustomTalkDynamicIcon >;
      using CustomTalkNestHandlersPtr = std::shared_ptr< CustomTalkNestHandlers >;
      using CutscenePtr = std::shared_ptr< Cutscene >;
+     using CutsceneMotionPtr = std::shared_ptr< CutsceneMotion >;
+     using CutsceneWorkIndexPtr = std::shared_ptr< CutsceneWorkIndex >;
      using CutScreenImagePtr = std::shared_ptr< CutScreenImage >;
+     using CycleTimePtr = std::shared_ptr< CycleTime >;
      using DailySupplyItemPtr = std::shared_ptr< DailySupplyItem >;
      using DawnContentPtr = std::shared_ptr< DawnContent >;
      using DawnGrowMemberPtr = std::shared_ptr< DawnGrowMember >;
      using DawnMemberUIParamPtr = std::shared_ptr< DawnMemberUIParam >;
+     using DawnQuestAnnouncePtr = std::shared_ptr< DawnQuestAnnounce >;
      using DawnQuestMemberPtr = std::shared_ptr< DawnQuestMember >;
      using DeepDungeonPtr = std::shared_ptr< DeepDungeon >;
      using DeepDungeonBanPtr = std::shared_ptr< DeepDungeonBan >;
@@ -6666,7 +7829,9 @@ struct ZoneSharedGroup
      using DefaultTalkPtr = std::shared_ptr< DefaultTalk >;
      using DefaultTalkLipSyncTypePtr = std::shared_ptr< DefaultTalkLipSyncType >;
      using DeliveryQuestPtr = std::shared_ptr< DeliveryQuest >;
+     using DescriptionPtr = std::shared_ptr< Description >;
      using DescriptionPagePtr = std::shared_ptr< DescriptionPage >;
+     using DescriptionSectionPtr = std::shared_ptr< DescriptionSection >;
      using DescriptionStringPtr = std::shared_ptr< DescriptionString >;
      using DisposalShopPtr = std::shared_ptr< DisposalShop >;
      using DisposalShopFilterTypePtr = std::shared_ptr< DisposalShopFilterType >;
@@ -6678,6 +7843,7 @@ struct ZoneSharedGroup
      using EmjDaniPtr = std::shared_ptr< EmjDani >;
      using EmotePtr = std::shared_ptr< Emote >;
      using EmoteCategoryPtr = std::shared_ptr< EmoteCategory >;
+     using EmoteModePtr = std::shared_ptr< EmoteMode >;
      using ENpcBasePtr = std::shared_ptr< ENpcBase >;
      using ENpcDressUpPtr = std::shared_ptr< ENpcDressUp >;
      using ENpcDressUpDressPtr = std::shared_ptr< ENpcDressUpDress >;
@@ -6701,18 +7867,23 @@ struct ZoneSharedGroup
      using EventItemCastTimelinePtr = std::shared_ptr< EventItemCastTimeline >;
      using EventItemHelpPtr = std::shared_ptr< EventItemHelp >;
      using EventItemTimelinePtr = std::shared_ptr< EventItemTimeline >;
+     using EventSystemDefinePtr = std::shared_ptr< EventSystemDefine >;
      using ExportedSGPtr = std::shared_ptr< ExportedSG >;
      using ExVersionPtr = std::shared_ptr< ExVersion >;
      using FatePtr = std::shared_ptr< Fate >;
+     using FateEventPtr = std::shared_ptr< FateEvent >;
      using FateProgressUIPtr = std::shared_ptr< FateProgressUI >;
+     using FateTokenTypePtr = std::shared_ptr< FateTokenType >;
      using FCActivityPtr = std::shared_ptr< FCActivity >;
      using FCActivityCategoryPtr = std::shared_ptr< FCActivityCategory >;
      using FCAuthorityPtr = std::shared_ptr< FCAuthority >;
      using FCAuthorityCategoryPtr = std::shared_ptr< FCAuthorityCategory >;
      using FCChestNamePtr = std::shared_ptr< FCChestName >;
+     using FCCrestSymbolPtr = std::shared_ptr< FCCrestSymbol >;
      using FccShopPtr = std::shared_ptr< FccShop >;
      using FCHierarchyPtr = std::shared_ptr< FCHierarchy >;
      using FCProfilePtr = std::shared_ptr< FCProfile >;
+     using FCRankPtr = std::shared_ptr< FCRank >;
      using FCReputationPtr = std::shared_ptr< FCReputation >;
      using FCRightsPtr = std::shared_ptr< FCRights >;
      using FestivalPtr = std::shared_ptr< Festival >;
@@ -6733,6 +7904,7 @@ struct ZoneSharedGroup
      using GatheringItemPointPtr = std::shared_ptr< GatheringItemPoint >;
      using GatheringLevePtr = std::shared_ptr< GatheringLeve >;
      using GatheringLeveRoutePtr = std::shared_ptr< GatheringLeveRoute >;
+     using GatheringLeveRulePtr = std::shared_ptr< GatheringLeveRule >;
      using GatheringNotebookListPtr = std::shared_ptr< GatheringNotebookList >;
      using GatheringPointPtr = std::shared_ptr< GatheringPoint >;
      using GatheringPointBasePtr = std::shared_ptr< GatheringPointBase >;
@@ -6767,10 +7939,14 @@ struct ZoneSharedGroup
      using GFateRideShootingPtr = std::shared_ptr< GFateRideShooting >;
      using GilShopPtr = std::shared_ptr< GilShop >;
      using GilShopItemPtr = std::shared_ptr< GilShopItem >;
+     using GimmickAccessorPtr = std::shared_ptr< GimmickAccessor >;
+     using GimmickJumpPtr = std::shared_ptr< GimmickJump >;
+     using GimmickRectPtr = std::shared_ptr< GimmickRect >;
      using GoldSaucerArcadeMachinePtr = std::shared_ptr< GoldSaucerArcadeMachine >;
      using GoldSaucerTextDataPtr = std::shared_ptr< GoldSaucerTextData >;
      using GrandCompanyPtr = std::shared_ptr< GrandCompany >;
      using GrandCompanyRankPtr = std::shared_ptr< GrandCompanyRank >;
+     using GroupPoseFramePtr = std::shared_ptr< GroupPoseFrame >;
      using GuardianDeityPtr = std::shared_ptr< GuardianDeity >;
      using GuidePtr = std::shared_ptr< Guide >;
      using GuidePagePtr = std::shared_ptr< GuidePage >;
@@ -6801,6 +7977,24 @@ struct ZoneSharedGroup
      using HowToPagePtr = std::shared_ptr< HowToPage >;
      using HugeCraftworksNpcPtr = std::shared_ptr< HugeCraftworksNpc >;
      using HugeCraftworksRankPtr = std::shared_ptr< HugeCraftworksRank >;
+     using HWDAnnouncePtr = std::shared_ptr< HWDAnnounce >;
+     using HWDCrafterSupplyPtr = std::shared_ptr< HWDCrafterSupply >;
+     using HWDCrafterSupplyRewardPtr = std::shared_ptr< HWDCrafterSupplyReward >;
+     using HWDDevLayerControlPtr = std::shared_ptr< HWDDevLayerControl >;
+     using HWDDevLevelUIPtr = std::shared_ptr< HWDDevLevelUI >;
+     using HWDDevLivelyPtr = std::shared_ptr< HWDDevLively >;
+     using HWDDevProgressPtr = std::shared_ptr< HWDDevProgress >;
+     using HWDInfoBoardArticlePtr = std::shared_ptr< HWDInfoBoardArticle >;
+     using HWDInfoBoardArticleTransientPtr = std::shared_ptr< HWDInfoBoardArticleTransient >;
+     using HWDInfoBoardArticleTypePtr = std::shared_ptr< HWDInfoBoardArticleType >;
+     using HWDLevelChangeDeceptionPtr = std::shared_ptr< HWDLevelChangeDeception >;
+     using HWDSharedGroupPtr = std::shared_ptr< HWDSharedGroup >;
+     using HWDSharedGroupControlParamPtr = std::shared_ptr< HWDSharedGroupControlParam >;
+     using IKDContentBonusPtr = std::shared_ptr< IKDContentBonus >;
+     using IKDFishParamPtr = std::shared_ptr< IKDFishParam >;
+     using IKDRoutePtr = std::shared_ptr< IKDRoute >;
+     using IKDRouteTablePtr = std::shared_ptr< IKDRouteTable >;
+     using IKDSpotPtr = std::shared_ptr< IKDSpot >;
      using IndividualWeatherPtr = std::shared_ptr< IndividualWeather >;
      using InstanceContentPtr = std::shared_ptr< InstanceContent >;
      using InstanceContentBuffPtr = std::shared_ptr< InstanceContentBuff >;
@@ -6820,16 +8014,19 @@ struct ZoneSharedGroup
      using JournalCategoryPtr = std::shared_ptr< JournalCategory >;
      using JournalGenrePtr = std::shared_ptr< JournalGenre >;
      using JournalSectionPtr = std::shared_ptr< JournalSection >;
+     using KnockbackPtr = std::shared_ptr< Knockback >;
+     using LegacyQuestPtr = std::shared_ptr< LegacyQuest >;
      using LevePtr = std::shared_ptr< Leve >;
      using LeveAssignmentTypePtr = std::shared_ptr< LeveAssignmentType >;
      using LeveClientPtr = std::shared_ptr< LeveClient >;
      using LevelPtr = std::shared_ptr< Level >;
      using LeveRewardItemPtr = std::shared_ptr< LeveRewardItem >;
      using LeveRewardItemGroupPtr = std::shared_ptr< LeveRewardItemGroup >;
+     using LeveStringPtr = std::shared_ptr< LeveString >;
      using LeveVfxPtr = std::shared_ptr< LeveVfx >;
+     using LobbyPtr = std::shared_ptr< Lobby >;
      using LogFilterPtr = std::shared_ptr< LogFilter >;
      using LogKindPtr = std::shared_ptr< LogKind >;
-     using LogKindCategoryTextPtr = std::shared_ptr< LogKindCategoryText >;
      using LogMessagePtr = std::shared_ptr< LogMessage >;
      using LotteryExchangeShopPtr = std::shared_ptr< LotteryExchangeShop >;
      using MacroIconPtr = std::shared_ptr< MacroIcon >;
@@ -6847,6 +8044,7 @@ struct ZoneSharedGroup
      using MateriaPtr = std::shared_ptr< Materia >;
      using MateriaJoinRatePtr = std::shared_ptr< MateriaJoinRate >;
      using MateriaJoinRateGatherCraftPtr = std::shared_ptr< MateriaJoinRateGatherCraft >;
+     using MateriaTomestoneRatePtr = std::shared_ptr< MateriaTomestoneRate >;
      using MiniGameRAPtr = std::shared_ptr< MiniGameRA >;
      using MinionRacePtr = std::shared_ptr< MinionRace >;
      using MinionRulesPtr = std::shared_ptr< MinionRules >;
@@ -6861,6 +8059,8 @@ struct ZoneSharedGroup
      using ModelStatePtr = std::shared_ptr< ModelState >;
      using MonsterNotePtr = std::shared_ptr< MonsterNote >;
      using MonsterNoteTargetPtr = std::shared_ptr< MonsterNoteTarget >;
+     using MotionTimelinePtr = std::shared_ptr< MotionTimeline >;
+     using MotionTimelineBlendTablePtr = std::shared_ptr< MotionTimelineBlendTable >;
      using MountPtr = std::shared_ptr< Mount >;
      using MountActionPtr = std::shared_ptr< MountAction >;
      using MountCustomizePtr = std::shared_ptr< MountCustomize >;
@@ -6869,6 +8069,9 @@ struct ZoneSharedGroup
      using MountTransientPtr = std::shared_ptr< MountTransient >;
      using MoveTimelinePtr = std::shared_ptr< MoveTimeline >;
      using MoveVfxPtr = std::shared_ptr< MoveVfx >;
+     using MovieSubtitlePtr = std::shared_ptr< MovieSubtitle >;
+     using MovieSubtitle500Ptr = std::shared_ptr< MovieSubtitle500 >;
+     using MovieSubtitleVoyagePtr = std::shared_ptr< MovieSubtitleVoyage >;
      using NotebookDivisionPtr = std::shared_ptr< NotebookDivision >;
      using NotebookDivisionCategoryPtr = std::shared_ptr< NotebookDivisionCategory >;
      using NotoriousMonsterPtr = std::shared_ptr< NotoriousMonster >;
@@ -6887,17 +8090,23 @@ struct ZoneSharedGroup
      using PartyContentPtr = std::shared_ptr< PartyContent >;
      using PartyContentCutscenePtr = std::shared_ptr< PartyContentCutscene >;
      using PartyContentTextDataPtr = std::shared_ptr< PartyContentTextData >;
+     using PatchMarkPtr = std::shared_ptr< PatchMark >;
      using PerformPtr = std::shared_ptr< Perform >;
      using PerformTransientPtr = std::shared_ptr< PerformTransient >;
      using PetPtr = std::shared_ptr< Pet >;
      using PetActionPtr = std::shared_ptr< PetAction >;
+     using PhysicsGroupPtr = std::shared_ptr< PhysicsGroup >;
+     using PhysicsWindPtr = std::shared_ptr< PhysicsWind >;
      using PicturePtr = std::shared_ptr< Picture >;
      using PlaceNamePtr = std::shared_ptr< PlaceName >;
      using PlantPotFlowerSeedPtr = std::shared_ptr< PlantPotFlowerSeed >;
      using PreHandlerPtr = std::shared_ptr< PreHandler >;
+     using PresetCameraPtr = std::shared_ptr< PresetCamera >;
+     using PresetCameraAdjustPtr = std::shared_ptr< PresetCameraAdjust >;
      using PublicContentPtr = std::shared_ptr< PublicContent >;
      using PublicContentCutscenePtr = std::shared_ptr< PublicContentCutscene >;
      using PublicContentTextDataPtr = std::shared_ptr< PublicContentTextData >;
+     using PurifyPtr = std::shared_ptr< Purify >;
      using PvPActionPtr = std::shared_ptr< PvPAction >;
      using PvPActionSortPtr = std::shared_ptr< PvPActionSort >;
      using PvPRankPtr = std::shared_ptr< PvPRank >;
@@ -6905,8 +8114,15 @@ struct ZoneSharedGroup
      using PvPTraitPtr = std::shared_ptr< PvPTrait >;
      using QuestPtr = std::shared_ptr< Quest >;
      using QuestBattlePtr = std::shared_ptr< QuestBattle >;
+     using QuestChapterPtr = std::shared_ptr< QuestChapter >;
      using QuestClassJobRewardPtr = std::shared_ptr< QuestClassJobReward >;
      using QuestClassJobSupplyPtr = std::shared_ptr< QuestClassJobSupply >;
+     using QuestDerivedClassPtr = std::shared_ptr< QuestDerivedClass >;
+     using QuestRedoPtr = std::shared_ptr< QuestRedo >;
+     using QuestRedoChapterUIPtr = std::shared_ptr< QuestRedoChapterUI >;
+     using QuestRedoChapterUICategoryPtr = std::shared_ptr< QuestRedoChapterUICategory >;
+     using QuestRedoChapterUITabPtr = std::shared_ptr< QuestRedoChapterUITab >;
+     using QuestRedoIncompChapterPtr = std::shared_ptr< QuestRedoIncompChapter >;
      using QuestRepeatFlagPtr = std::shared_ptr< QuestRepeatFlag >;
      using QuestRewardOtherPtr = std::shared_ptr< QuestRewardOther >;
      using QuickChatPtr = std::shared_ptr< QuickChat >;
@@ -6980,6 +8196,7 @@ struct ZoneSharedGroup
      using TransformationPtr = std::shared_ptr< Transformation >;
      using TreasurePtr = std::shared_ptr< Treasure >;
      using TreasureHuntRankPtr = std::shared_ptr< TreasureHuntRank >;
+     using TreasureModelPtr = std::shared_ptr< TreasureModel >;
      using TreasureSpotPtr = std::shared_ptr< TreasureSpot >;
      using TribePtr = std::shared_ptr< Tribe >;
      using TripleTriadPtr = std::shared_ptr< TripleTriad >;
@@ -6999,6 +8216,7 @@ struct ZoneSharedGroup
      using WarpPtr = std::shared_ptr< Warp >;
      using WarpConditionPtr = std::shared_ptr< WarpCondition >;
      using WarpLogicPtr = std::shared_ptr< WarpLogic >;
+     using WeaponTimelinePtr = std::shared_ptr< WeaponTimeline >;
      using WeatherPtr = std::shared_ptr< Weather >;
      using WeatherGroupPtr = std::shared_ptr< WeatherGroup >;
      using WeatherRatePtr = std::shared_ptr< WeatherRate >;
@@ -7049,6 +8267,7 @@ struct ZoneSharedGroup
      std::set< uint32_t > m_AirshipExplorationParamTypeIdList;
      std::set< uint32_t > m_AirshipExplorationPartIdList;
      std::set< uint32_t > m_AirshipExplorationPointIdList;
+     std::set< uint32_t > m_AnimationLODIdList;
      std::set< uint32_t > m_AnimaWeapon5IdList;
      std::set< uint32_t > m_AnimaWeapon5ParamIdList;
      std::set< uint32_t > m_AnimaWeapon5PatternGroupIdList;
@@ -7065,21 +8284,27 @@ struct ZoneSharedGroup
      std::set< uint32_t > m_AOZBossIdList;
      std::set< uint32_t > m_AOZContentIdList;
      std::set< uint32_t > m_AOZContentBriefingBNpcIdList;
+     std::set< uint32_t > m_AOZReportIdList;
      std::set< uint32_t > m_AquariumFishIdList;
      std::set< uint32_t > m_AquariumWaterIdList;
      std::set< uint32_t > m_ArrayEventHandlerIdList;
      std::set< uint32_t > m_AttackTypeIdList;
      std::set< uint32_t > m_BacklightColorIdList;
+     std::set< uint32_t > m_BallistaIdList;
      std::set< uint32_t > m_BalloonIdList;
      std::set< uint32_t > m_BaseParamIdList;
      std::set< uint32_t > m_BattleLeveIdList;
+     std::set< uint32_t > m_BattleLeveRuleIdList;
      std::set< uint32_t > m_BeastRankBonusIdList;
      std::set< uint32_t > m_BeastReputationRankIdList;
      std::set< uint32_t > m_BeastTribeIdList;
      std::set< uint32_t > m_BehaviorIdList;
+     std::set< uint32_t > m_BehaviorPathIdList;
      std::set< uint32_t > m_BenchmarkOverrideEquipmentIdList;
      std::set< uint32_t > m_BGMIdList;
      std::set< uint32_t > m_BGMFadeIdList;
+     std::set< uint32_t > m_BGMFadeTypeIdList;
+     std::set< uint32_t > m_BGMSceneIdList;
      std::set< uint32_t > m_BGMSituationIdList;
      std::set< uint32_t > m_BGMSwitchIdList;
      std::set< uint32_t > m_BGMSystemDefineIdList;
@@ -7088,6 +8313,7 @@ struct ZoneSharedGroup
      std::set< uint32_t > m_BNpcCustomizeIdList;
      std::set< uint32_t > m_BNpcNameIdList;
      std::set< uint32_t > m_BNpcPartsIdList;
+     std::set< uint32_t > m_BNpcStateIdList;
      std::set< uint32_t > m_BuddyIdList;
      std::set< uint32_t > m_BuddyActionIdList;
      std::set< uint32_t > m_BuddyEquipIdList;
@@ -7097,6 +8323,9 @@ struct ZoneSharedGroup
      std::set< uint32_t > m_CabinetIdList;
      std::set< uint32_t > m_CabinetCategoryIdList;
      std::set< uint32_t > m_CalendarIdList;
+     std::set< uint32_t > m_CarryIdList;
+     std::set< uint32_t > m_ChannelingIdList;
+     std::set< uint32_t > m_CharaMakeClassEquipIdList;
      std::set< uint32_t > m_CharaMakeCustomizeIdList;
      std::set< uint32_t > m_CharaMakeTypeIdList;
      std::set< uint32_t > m_ChocoboRaceIdList;
@@ -7110,6 +8339,7 @@ struct ZoneSharedGroup
      std::set< uint32_t > m_ChocoboRaceWeatherIdList;
      std::set< uint32_t > m_ChocoboTaxiIdList;
      std::set< uint32_t > m_ChocoboTaxiStandIdList;
+     std::set< uint32_t > m_CircleActivityIdList;
      std::set< uint32_t > m_ClassJobIdList;
      std::set< uint32_t > m_ClassJobCategoryIdList;
      std::set< uint32_t > m_CompanionIdList;
@@ -7128,6 +8358,7 @@ struct ZoneSharedGroup
      std::set< uint32_t > m_CompanyLeveRuleIdList;
      std::set< uint32_t > m_CompleteJournalIdList;
      std::set< uint32_t > m_CompleteJournalCategoryIdList;
+     std::set< uint32_t > m_ConfigKeyIdList;
      std::set< uint32_t > m_ContentCloseCycleIdList;
      std::set< uint32_t > m_ContentExActionIdList;
      std::set< uint32_t > m_ContentFinderConditionIdList;
@@ -7158,11 +8389,15 @@ struct ZoneSharedGroup
      std::set< uint32_t > m_CustomTalkDynamicIconIdList;
      std::set< uint32_t > m_CustomTalkNestHandlersIdList;
      std::set< uint32_t > m_CutsceneIdList;
+     std::set< uint32_t > m_CutsceneMotionIdList;
+     std::set< uint32_t > m_CutsceneWorkIndexIdList;
      std::set< uint32_t > m_CutScreenImageIdList;
+     std::set< uint32_t > m_CycleTimeIdList;
      std::set< uint32_t > m_DailySupplyItemIdList;
      std::set< uint32_t > m_DawnContentIdList;
      std::set< uint32_t > m_DawnGrowMemberIdList;
      std::set< uint32_t > m_DawnMemberUIParamIdList;
+     std::set< uint32_t > m_DawnQuestAnnounceIdList;
      std::set< uint32_t > m_DawnQuestMemberIdList;
      std::set< uint32_t > m_DeepDungeonIdList;
      std::set< uint32_t > m_DeepDungeonBanIdList;
@@ -7178,7 +8413,9 @@ struct ZoneSharedGroup
      std::set< uint32_t > m_DefaultTalkIdList;
      std::set< uint32_t > m_DefaultTalkLipSyncTypeIdList;
      std::set< uint32_t > m_DeliveryQuestIdList;
+     std::set< uint32_t > m_DescriptionIdList;
      std::set< uint32_t > m_DescriptionPageIdList;
+     std::set< uint32_t > m_DescriptionSectionIdList;
      std::set< uint32_t > m_DescriptionStringIdList;
      std::set< uint32_t > m_DisposalShopIdList;
      std::set< uint32_t > m_DisposalShopFilterTypeIdList;
@@ -7190,6 +8427,7 @@ struct ZoneSharedGroup
      std::set< uint32_t > m_EmjDaniIdList;
      std::set< uint32_t > m_EmoteIdList;
      std::set< uint32_t > m_EmoteCategoryIdList;
+     std::set< uint32_t > m_EmoteModeIdList;
      std::set< uint32_t > m_ENpcBaseIdList;
      std::set< uint32_t > m_ENpcDressUpIdList;
      std::set< uint32_t > m_ENpcDressUpDressIdList;
@@ -7213,18 +8451,23 @@ struct ZoneSharedGroup
      std::set< uint32_t > m_EventItemCastTimelineIdList;
      std::set< uint32_t > m_EventItemHelpIdList;
      std::set< uint32_t > m_EventItemTimelineIdList;
+     std::set< uint32_t > m_EventSystemDefineIdList;
      std::set< uint32_t > m_ExportedSGIdList;
      std::set< uint32_t > m_ExVersionIdList;
      std::set< uint32_t > m_FateIdList;
+     std::set< uint32_t > m_FateEventIdList;
      std::set< uint32_t > m_FateProgressUIIdList;
+     std::set< uint32_t > m_FateTokenTypeIdList;
      std::set< uint32_t > m_FCActivityIdList;
      std::set< uint32_t > m_FCActivityCategoryIdList;
      std::set< uint32_t > m_FCAuthorityIdList;
      std::set< uint32_t > m_FCAuthorityCategoryIdList;
      std::set< uint32_t > m_FCChestNameIdList;
+     std::set< uint32_t > m_FCCrestSymbolIdList;
      std::set< uint32_t > m_FccShopIdList;
      std::set< uint32_t > m_FCHierarchyIdList;
      std::set< uint32_t > m_FCProfileIdList;
+     std::set< uint32_t > m_FCRankIdList;
      std::set< uint32_t > m_FCReputationIdList;
      std::set< uint32_t > m_FCRightsIdList;
      std::set< uint32_t > m_FestivalIdList;
@@ -7245,6 +8488,7 @@ struct ZoneSharedGroup
      std::set< uint32_t > m_GatheringItemPointIdList;
      std::set< uint32_t > m_GatheringLeveIdList;
      std::set< uint32_t > m_GatheringLeveRouteIdList;
+     std::set< uint32_t > m_GatheringLeveRuleIdList;
      std::set< uint32_t > m_GatheringNotebookListIdList;
      std::set< uint32_t > m_GatheringPointIdList;
      std::set< uint32_t > m_GatheringPointBaseIdList;
@@ -7279,10 +8523,14 @@ struct ZoneSharedGroup
      std::set< uint32_t > m_GFateRideShootingIdList;
      std::set< uint32_t > m_GilShopIdList;
      std::set< uint32_t > m_GilShopItemIdList;
+     std::set< uint32_t > m_GimmickAccessorIdList;
+     std::set< uint32_t > m_GimmickJumpIdList;
+     std::set< uint32_t > m_GimmickRectIdList;
      std::set< uint32_t > m_GoldSaucerArcadeMachineIdList;
      std::set< uint32_t > m_GoldSaucerTextDataIdList;
      std::set< uint32_t > m_GrandCompanyIdList;
      std::set< uint32_t > m_GrandCompanyRankIdList;
+     std::set< uint32_t > m_GroupPoseFrameIdList;
      std::set< uint32_t > m_GuardianDeityIdList;
      std::set< uint32_t > m_GuideIdList;
      std::set< uint32_t > m_GuidePageIdList;
@@ -7313,6 +8561,24 @@ struct ZoneSharedGroup
      std::set< uint32_t > m_HowToPageIdList;
      std::set< uint32_t > m_HugeCraftworksNpcIdList;
      std::set< uint32_t > m_HugeCraftworksRankIdList;
+     std::set< uint32_t > m_HWDAnnounceIdList;
+     std::set< uint32_t > m_HWDCrafterSupplyIdList;
+     std::set< uint32_t > m_HWDCrafterSupplyRewardIdList;
+     std::set< uint32_t > m_HWDDevLayerControlIdList;
+     std::set< uint32_t > m_HWDDevLevelUIIdList;
+     std::set< uint32_t > m_HWDDevLivelyIdList;
+     std::set< uint32_t > m_HWDDevProgressIdList;
+     std::set< uint32_t > m_HWDInfoBoardArticleIdList;
+     std::set< uint32_t > m_HWDInfoBoardArticleTransientIdList;
+     std::set< uint32_t > m_HWDInfoBoardArticleTypeIdList;
+     std::set< uint32_t > m_HWDLevelChangeDeceptionIdList;
+     std::set< uint32_t > m_HWDSharedGroupIdList;
+     std::set< uint32_t > m_HWDSharedGroupControlParamIdList;
+     std::set< uint32_t > m_IKDContentBonusIdList;
+     std::set< uint32_t > m_IKDFishParamIdList;
+     std::set< uint32_t > m_IKDRouteIdList;
+     std::set< uint32_t > m_IKDRouteTableIdList;
+     std::set< uint32_t > m_IKDSpotIdList;
      std::set< uint32_t > m_IndividualWeatherIdList;
      std::set< uint32_t > m_InstanceContentIdList;
      std::set< uint32_t > m_InstanceContentBuffIdList;
@@ -7332,16 +8598,19 @@ struct ZoneSharedGroup
      std::set< uint32_t > m_JournalCategoryIdList;
      std::set< uint32_t > m_JournalGenreIdList;
      std::set< uint32_t > m_JournalSectionIdList;
+     std::set< uint32_t > m_KnockbackIdList;
+     std::set< uint32_t > m_LegacyQuestIdList;
      std::set< uint32_t > m_LeveIdList;
      std::set< uint32_t > m_LeveAssignmentTypeIdList;
      std::set< uint32_t > m_LeveClientIdList;
      std::set< uint32_t > m_LevelIdList;
      std::set< uint32_t > m_LeveRewardItemIdList;
      std::set< uint32_t > m_LeveRewardItemGroupIdList;
+     std::set< uint32_t > m_LeveStringIdList;
      std::set< uint32_t > m_LeveVfxIdList;
+     std::set< uint32_t > m_LobbyIdList;
      std::set< uint32_t > m_LogFilterIdList;
      std::set< uint32_t > m_LogKindIdList;
-     std::set< uint32_t > m_LogKindCategoryTextIdList;
      std::set< uint32_t > m_LogMessageIdList;
      std::set< uint32_t > m_LotteryExchangeShopIdList;
      std::set< uint32_t > m_MacroIconIdList;
@@ -7359,6 +8628,7 @@ struct ZoneSharedGroup
      std::set< uint32_t > m_MateriaIdList;
      std::set< uint32_t > m_MateriaJoinRateIdList;
      std::set< uint32_t > m_MateriaJoinRateGatherCraftIdList;
+     std::set< uint32_t > m_MateriaTomestoneRateIdList;
      std::set< uint32_t > m_MiniGameRAIdList;
      std::set< uint32_t > m_MinionRaceIdList;
      std::set< uint32_t > m_MinionRulesIdList;
@@ -7373,6 +8643,8 @@ struct ZoneSharedGroup
      std::set< uint32_t > m_ModelStateIdList;
      std::set< uint32_t > m_MonsterNoteIdList;
      std::set< uint32_t > m_MonsterNoteTargetIdList;
+     std::set< uint32_t > m_MotionTimelineIdList;
+     std::set< uint32_t > m_MotionTimelineBlendTableIdList;
      std::set< uint32_t > m_MountIdList;
      std::set< uint32_t > m_MountActionIdList;
      std::set< uint32_t > m_MountCustomizeIdList;
@@ -7381,6 +8653,9 @@ struct ZoneSharedGroup
      std::set< uint32_t > m_MountTransientIdList;
      std::set< uint32_t > m_MoveTimelineIdList;
      std::set< uint32_t > m_MoveVfxIdList;
+     std::set< uint32_t > m_MovieSubtitleIdList;
+     std::set< uint32_t > m_MovieSubtitle500IdList;
+     std::set< uint32_t > m_MovieSubtitleVoyageIdList;
      std::set< uint32_t > m_NotebookDivisionIdList;
      std::set< uint32_t > m_NotebookDivisionCategoryIdList;
      std::set< uint32_t > m_NotoriousMonsterIdList;
@@ -7399,17 +8674,23 @@ struct ZoneSharedGroup
      std::set< uint32_t > m_PartyContentIdList;
      std::set< uint32_t > m_PartyContentCutsceneIdList;
      std::set< uint32_t > m_PartyContentTextDataIdList;
+     std::set< uint32_t > m_PatchMarkIdList;
      std::set< uint32_t > m_PerformIdList;
      std::set< uint32_t > m_PerformTransientIdList;
      std::set< uint32_t > m_PetIdList;
      std::set< uint32_t > m_PetActionIdList;
+     std::set< uint32_t > m_PhysicsGroupIdList;
+     std::set< uint32_t > m_PhysicsWindIdList;
      std::set< uint32_t > m_PictureIdList;
      std::set< uint32_t > m_PlaceNameIdList;
      std::set< uint32_t > m_PlantPotFlowerSeedIdList;
      std::set< uint32_t > m_PreHandlerIdList;
+     std::set< uint32_t > m_PresetCameraIdList;
+     std::set< uint32_t > m_PresetCameraAdjustIdList;
      std::set< uint32_t > m_PublicContentIdList;
      std::set< uint32_t > m_PublicContentCutsceneIdList;
      std::set< uint32_t > m_PublicContentTextDataIdList;
+     std::set< uint32_t > m_PurifyIdList;
      std::set< uint32_t > m_PvPActionIdList;
      std::set< uint32_t > m_PvPActionSortIdList;
      std::set< uint32_t > m_PvPRankIdList;
@@ -7417,8 +8698,15 @@ struct ZoneSharedGroup
      std::set< uint32_t > m_PvPTraitIdList;
      std::set< uint32_t > m_QuestIdList;
      std::set< uint32_t > m_QuestBattleIdList;
+     std::set< uint32_t > m_QuestChapterIdList;
      std::set< uint32_t > m_QuestClassJobRewardIdList;
      std::set< uint32_t > m_QuestClassJobSupplyIdList;
+     std::set< uint32_t > m_QuestDerivedClassIdList;
+     std::set< uint32_t > m_QuestRedoIdList;
+     std::set< uint32_t > m_QuestRedoChapterUIIdList;
+     std::set< uint32_t > m_QuestRedoChapterUICategoryIdList;
+     std::set< uint32_t > m_QuestRedoChapterUITabIdList;
+     std::set< uint32_t > m_QuestRedoIncompChapterIdList;
      std::set< uint32_t > m_QuestRepeatFlagIdList;
      std::set< uint32_t > m_QuestRewardOtherIdList;
      std::set< uint32_t > m_QuickChatIdList;
@@ -7492,6 +8780,7 @@ struct ZoneSharedGroup
      std::set< uint32_t > m_TransformationIdList;
      std::set< uint32_t > m_TreasureIdList;
      std::set< uint32_t > m_TreasureHuntRankIdList;
+     std::set< uint32_t > m_TreasureModelIdList;
      std::set< uint32_t > m_TreasureSpotIdList;
      std::set< uint32_t > m_TribeIdList;
      std::set< uint32_t > m_TripleTriadIdList;
@@ -7511,6 +8800,7 @@ struct ZoneSharedGroup
      std::set< uint32_t > m_WarpIdList;
      std::set< uint32_t > m_WarpConditionIdList;
      std::set< uint32_t > m_WarpLogicIdList;
+     std::set< uint32_t > m_WeaponTimelineIdList;
      std::set< uint32_t > m_WeatherIdList;
      std::set< uint32_t > m_WeatherGroupIdList;
      std::set< uint32_t > m_WeatherRateIdList;
@@ -7726,6 +9016,12 @@ const std::set< uint32_t >& getAirshipExplorationPointIdList()
       loadIdList( m_AirshipExplorationPointDat, m_AirshipExplorationPointIdList );
    return m_AirshipExplorationPointIdList;
 }
+const std::set< uint32_t >& getAnimationLODIdList()
+{
+   if( m_AnimationLODIdList.size() == 0 )
+      loadIdList( m_AnimationLODDat, m_AnimationLODIdList );
+   return m_AnimationLODIdList;
+}
 const std::set< uint32_t >& getAnimaWeapon5IdList()
 {
    if( m_AnimaWeapon5IdList.size() == 0 )
@@ -7822,6 +9118,12 @@ const std::set< uint32_t >& getAOZContentBriefingBNpcIdList()
       loadIdList( m_AOZContentBriefingBNpcDat, m_AOZContentBriefingBNpcIdList );
    return m_AOZContentBriefingBNpcIdList;
 }
+const std::set< uint32_t >& getAOZReportIdList()
+{
+   if( m_AOZReportIdList.size() == 0 )
+      loadIdList( m_AOZReportDat, m_AOZReportIdList );
+   return m_AOZReportIdList;
+}
 const std::set< uint32_t >& getAquariumFishIdList()
 {
    if( m_AquariumFishIdList.size() == 0 )
@@ -7852,6 +9154,12 @@ const std::set< uint32_t >& getBacklightColorIdList()
       loadIdList( m_BacklightColorDat, m_BacklightColorIdList );
    return m_BacklightColorIdList;
 }
+const std::set< uint32_t >& getBallistaIdList()
+{
+   if( m_BallistaIdList.size() == 0 )
+      loadIdList( m_BallistaDat, m_BallistaIdList );
+   return m_BallistaIdList;
+}
 const std::set< uint32_t >& getBalloonIdList()
 {
    if( m_BalloonIdList.size() == 0 )
@@ -7870,6 +9178,12 @@ const std::set< uint32_t >& getBattleLeveIdList()
       loadIdList( m_BattleLeveDat, m_BattleLeveIdList );
    return m_BattleLeveIdList;
 }
+const std::set< uint32_t >& getBattleLeveRuleIdList()
+{
+   if( m_BattleLeveRuleIdList.size() == 0 )
+      loadIdList( m_BattleLeveRuleDat, m_BattleLeveRuleIdList );
+   return m_BattleLeveRuleIdList;
+}
 const std::set< uint32_t >& getBeastRankBonusIdList()
 {
    if( m_BeastRankBonusIdList.size() == 0 )
@@ -7894,6 +9208,12 @@ const std::set< uint32_t >& getBehaviorIdList()
       loadIdList( m_BehaviorDat, m_BehaviorIdList );
    return m_BehaviorIdList;
 }
+const std::set< uint32_t >& getBehaviorPathIdList()
+{
+   if( m_BehaviorPathIdList.size() == 0 )
+      loadIdList( m_BehaviorPathDat, m_BehaviorPathIdList );
+   return m_BehaviorPathIdList;
+}
 const std::set< uint32_t >& getBenchmarkOverrideEquipmentIdList()
 {
    if( m_BenchmarkOverrideEquipmentIdList.size() == 0 )
@@ -7912,6 +9232,18 @@ const std::set< uint32_t >& getBGMFadeIdList()
       loadIdList( m_BGMFadeDat, m_BGMFadeIdList );
    return m_BGMFadeIdList;
 }
+const std::set< uint32_t >& getBGMFadeTypeIdList()
+{
+   if( m_BGMFadeTypeIdList.size() == 0 )
+      loadIdList( m_BGMFadeTypeDat, m_BGMFadeTypeIdList );
+   return m_BGMFadeTypeIdList;
+}
+const std::set< uint32_t >& getBGMSceneIdList()
+{
+   if( m_BGMSceneIdList.size() == 0 )
+      loadIdList( m_BGMSceneDat, m_BGMSceneIdList );
+   return m_BGMSceneIdList;
+}
 const std::set< uint32_t >& getBGMSituationIdList()
 {
    if( m_BGMSituationIdList.size() == 0 )
@@ -7960,6 +9292,12 @@ const std::set< uint32_t >& getBNpcPartsIdList()
       loadIdList( m_BNpcPartsDat, m_BNpcPartsIdList );
    return m_BNpcPartsIdList;
 }
+const std::set< uint32_t >& getBNpcStateIdList()
+{
+   if( m_BNpcStateIdList.size() == 0 )
+      loadIdList( m_BNpcStateDat, m_BNpcStateIdList );
+   return m_BNpcStateIdList;
+}
 const std::set< uint32_t >& getBuddyIdList()
 {
    if( m_BuddyIdList.size() == 0 )
@@ -8014,6 +9352,24 @@ const std::set< uint32_t >& getCalendarIdList()
       loadIdList( m_CalendarDat, m_CalendarIdList );
    return m_CalendarIdList;
 }
+const std::set< uint32_t >& getCarryIdList()
+{
+   if( m_CarryIdList.size() == 0 )
+      loadIdList( m_CarryDat, m_CarryIdList );
+   return m_CarryIdList;
+}
+const std::set< uint32_t >& getChannelingIdList()
+{
+   if( m_ChannelingIdList.size() == 0 )
+      loadIdList( m_ChannelingDat, m_ChannelingIdList );
+   return m_ChannelingIdList;
+}
+const std::set< uint32_t >& getCharaMakeClassEquipIdList()
+{
+   if( m_CharaMakeClassEquipIdList.size() == 0 )
+      loadIdList( m_CharaMakeClassEquipDat, m_CharaMakeClassEquipIdList );
+   return m_CharaMakeClassEquipIdList;
+}
 const std::set< uint32_t >& getCharaMakeCustomizeIdList()
 {
    if( m_CharaMakeCustomizeIdList.size() == 0 )
@@ -8092,6 +9448,12 @@ const std::set< uint32_t >& getChocoboTaxiStandIdList()
       loadIdList( m_ChocoboTaxiStandDat, m_ChocoboTaxiStandIdList );
    return m_ChocoboTaxiStandIdList;
 }
+const std::set< uint32_t >& getCircleActivityIdList()
+{
+   if( m_CircleActivityIdList.size() == 0 )
+      loadIdList( m_CircleActivityDat, m_CircleActivityIdList );
+   return m_CircleActivityIdList;
+}
 const std::set< uint32_t >& getClassJobIdList()
 {
    if( m_ClassJobIdList.size() == 0 )
@@ -8200,6 +9562,12 @@ const std::set< uint32_t >& getCompleteJournalCategoryIdList()
       loadIdList( m_CompleteJournalCategoryDat, m_CompleteJournalCategoryIdList );
    return m_CompleteJournalCategoryIdList;
 }
+const std::set< uint32_t >& getConfigKeyIdList()
+{
+   if( m_ConfigKeyIdList.size() == 0 )
+      loadIdList( m_ConfigKeyDat, m_ConfigKeyIdList );
+   return m_ConfigKeyIdList;
+}
 const std::set< uint32_t >& getContentCloseCycleIdList()
 {
    if( m_ContentCloseCycleIdList.size() == 0 )
@@ -8380,12 +9748,30 @@ const std::set< uint32_t >& getCutsceneIdList()
       loadIdList( m_CutsceneDat, m_CutsceneIdList );
    return m_CutsceneIdList;
 }
+const std::set< uint32_t >& getCutsceneMotionIdList()
+{
+   if( m_CutsceneMotionIdList.size() == 0 )
+      loadIdList( m_CutsceneMotionDat, m_CutsceneMotionIdList );
+   return m_CutsceneMotionIdList;
+}
+const std::set< uint32_t >& getCutsceneWorkIndexIdList()
+{
+   if( m_CutsceneWorkIndexIdList.size() == 0 )
+      loadIdList( m_CutsceneWorkIndexDat, m_CutsceneWorkIndexIdList );
+   return m_CutsceneWorkIndexIdList;
+}
 const std::set< uint32_t >& getCutScreenImageIdList()
 {
    if( m_CutScreenImageIdList.size() == 0 )
       loadIdList( m_CutScreenImageDat, m_CutScreenImageIdList );
    return m_CutScreenImageIdList;
 }
+const std::set< uint32_t >& getCycleTimeIdList()
+{
+   if( m_CycleTimeIdList.size() == 0 )
+      loadIdList( m_CycleTimeDat, m_CycleTimeIdList );
+   return m_CycleTimeIdList;
+}
 const std::set< uint32_t >& getDailySupplyItemIdList()
 {
    if( m_DailySupplyItemIdList.size() == 0 )
@@ -8410,6 +9796,12 @@ const std::set< uint32_t >& getDawnMemberUIParamIdList()
       loadIdList( m_DawnMemberUIParamDat, m_DawnMemberUIParamIdList );
    return m_DawnMemberUIParamIdList;
 }
+const std::set< uint32_t >& getDawnQuestAnnounceIdList()
+{
+   if( m_DawnQuestAnnounceIdList.size() == 0 )
+      loadIdList( m_DawnQuestAnnounceDat, m_DawnQuestAnnounceIdList );
+   return m_DawnQuestAnnounceIdList;
+}
 const std::set< uint32_t >& getDawnQuestMemberIdList()
 {
    if( m_DawnQuestMemberIdList.size() == 0 )
@@ -8500,12 +9892,24 @@ const std::set< uint32_t >& getDeliveryQuestIdList()
       loadIdList( m_DeliveryQuestDat, m_DeliveryQuestIdList );
    return m_DeliveryQuestIdList;
 }
+const std::set< uint32_t >& getDescriptionIdList()
+{
+   if( m_DescriptionIdList.size() == 0 )
+      loadIdList( m_DescriptionDat, m_DescriptionIdList );
+   return m_DescriptionIdList;
+}
 const std::set< uint32_t >& getDescriptionPageIdList()
 {
    if( m_DescriptionPageIdList.size() == 0 )
       loadIdList( m_DescriptionPageDat, m_DescriptionPageIdList );
    return m_DescriptionPageIdList;
 }
+const std::set< uint32_t >& getDescriptionSectionIdList()
+{
+   if( m_DescriptionSectionIdList.size() == 0 )
+      loadIdList( m_DescriptionSectionDat, m_DescriptionSectionIdList );
+   return m_DescriptionSectionIdList;
+}
 const std::set< uint32_t >& getDescriptionStringIdList()
 {
    if( m_DescriptionStringIdList.size() == 0 )
@@ -8572,6 +9976,12 @@ const std::set< uint32_t >& getEmoteCategoryIdList()
       loadIdList( m_EmoteCategoryDat, m_EmoteCategoryIdList );
    return m_EmoteCategoryIdList;
 }
+const std::set< uint32_t >& getEmoteModeIdList()
+{
+   if( m_EmoteModeIdList.size() == 0 )
+      loadIdList( m_EmoteModeDat, m_EmoteModeIdList );
+   return m_EmoteModeIdList;
+}
 const std::set< uint32_t >& getENpcBaseIdList()
 {
    if( m_ENpcBaseIdList.size() == 0 )
@@ -8710,6 +10120,12 @@ const std::set< uint32_t >& getEventItemTimelineIdList()
       loadIdList( m_EventItemTimelineDat, m_EventItemTimelineIdList );
    return m_EventItemTimelineIdList;
 }
+const std::set< uint32_t >& getEventSystemDefineIdList()
+{
+   if( m_EventSystemDefineIdList.size() == 0 )
+      loadIdList( m_EventSystemDefineDat, m_EventSystemDefineIdList );
+   return m_EventSystemDefineIdList;
+}
 const std::set< uint32_t >& getExportedSGIdList()
 {
    if( m_ExportedSGIdList.size() == 0 )
@@ -8728,12 +10144,24 @@ const std::set< uint32_t >& getFateIdList()
       loadIdList( m_FateDat, m_FateIdList );
    return m_FateIdList;
 }
+const std::set< uint32_t >& getFateEventIdList()
+{
+   if( m_FateEventIdList.size() == 0 )
+      loadIdList( m_FateEventDat, m_FateEventIdList );
+   return m_FateEventIdList;
+}
 const std::set< uint32_t >& getFateProgressUIIdList()
 {
    if( m_FateProgressUIIdList.size() == 0 )
       loadIdList( m_FateProgressUIDat, m_FateProgressUIIdList );
    return m_FateProgressUIIdList;
 }
+const std::set< uint32_t >& getFateTokenTypeIdList()
+{
+   if( m_FateTokenTypeIdList.size() == 0 )
+      loadIdList( m_FateTokenTypeDat, m_FateTokenTypeIdList );
+   return m_FateTokenTypeIdList;
+}
 const std::set< uint32_t >& getFCActivityIdList()
 {
    if( m_FCActivityIdList.size() == 0 )
@@ -8764,6 +10192,12 @@ const std::set< uint32_t >& getFCChestNameIdList()
       loadIdList( m_FCChestNameDat, m_FCChestNameIdList );
    return m_FCChestNameIdList;
 }
+const std::set< uint32_t >& getFCCrestSymbolIdList()
+{
+   if( m_FCCrestSymbolIdList.size() == 0 )
+      loadIdList( m_FCCrestSymbolDat, m_FCCrestSymbolIdList );
+   return m_FCCrestSymbolIdList;
+}
 const std::set< uint32_t >& getFccShopIdList()
 {
    if( m_FccShopIdList.size() == 0 )
@@ -8782,6 +10216,12 @@ const std::set< uint32_t >& getFCProfileIdList()
       loadIdList( m_FCProfileDat, m_FCProfileIdList );
    return m_FCProfileIdList;
 }
+const std::set< uint32_t >& getFCRankIdList()
+{
+   if( m_FCRankIdList.size() == 0 )
+      loadIdList( m_FCRankDat, m_FCRankIdList );
+   return m_FCRankIdList;
+}
 const std::set< uint32_t >& getFCReputationIdList()
 {
    if( m_FCReputationIdList.size() == 0 )
@@ -8902,6 +10342,12 @@ const std::set< uint32_t >& getGatheringLeveRouteIdList()
       loadIdList( m_GatheringLeveRouteDat, m_GatheringLeveRouteIdList );
    return m_GatheringLeveRouteIdList;
 }
+const std::set< uint32_t >& getGatheringLeveRuleIdList()
+{
+   if( m_GatheringLeveRuleIdList.size() == 0 )
+      loadIdList( m_GatheringLeveRuleDat, m_GatheringLeveRuleIdList );
+   return m_GatheringLeveRuleIdList;
+}
 const std::set< uint32_t >& getGatheringNotebookListIdList()
 {
    if( m_GatheringNotebookListIdList.size() == 0 )
@@ -9106,6 +10552,24 @@ const std::set< uint32_t >& getGilShopItemIdList()
       loadIdList( m_GilShopItemDat, m_GilShopItemIdList );
    return m_GilShopItemIdList;
 }
+const std::set< uint32_t >& getGimmickAccessorIdList()
+{
+   if( m_GimmickAccessorIdList.size() == 0 )
+      loadIdList( m_GimmickAccessorDat, m_GimmickAccessorIdList );
+   return m_GimmickAccessorIdList;
+}
+const std::set< uint32_t >& getGimmickJumpIdList()
+{
+   if( m_GimmickJumpIdList.size() == 0 )
+      loadIdList( m_GimmickJumpDat, m_GimmickJumpIdList );
+   return m_GimmickJumpIdList;
+}
+const std::set< uint32_t >& getGimmickRectIdList()
+{
+   if( m_GimmickRectIdList.size() == 0 )
+      loadIdList( m_GimmickRectDat, m_GimmickRectIdList );
+   return m_GimmickRectIdList;
+}
 const std::set< uint32_t >& getGoldSaucerArcadeMachineIdList()
 {
    if( m_GoldSaucerArcadeMachineIdList.size() == 0 )
@@ -9130,6 +10594,12 @@ const std::set< uint32_t >& getGrandCompanyRankIdList()
       loadIdList( m_GrandCompanyRankDat, m_GrandCompanyRankIdList );
    return m_GrandCompanyRankIdList;
 }
+const std::set< uint32_t >& getGroupPoseFrameIdList()
+{
+   if( m_GroupPoseFrameIdList.size() == 0 )
+      loadIdList( m_GroupPoseFrameDat, m_GroupPoseFrameIdList );
+   return m_GroupPoseFrameIdList;
+}
 const std::set< uint32_t >& getGuardianDeityIdList()
 {
    if( m_GuardianDeityIdList.size() == 0 )
@@ -9310,6 +10780,114 @@ const std::set< uint32_t >& getHugeCraftworksRankIdList()
       loadIdList( m_HugeCraftworksRankDat, m_HugeCraftworksRankIdList );
    return m_HugeCraftworksRankIdList;
 }
+const std::set< uint32_t >& getHWDAnnounceIdList()
+{
+   if( m_HWDAnnounceIdList.size() == 0 )
+      loadIdList( m_HWDAnnounceDat, m_HWDAnnounceIdList );
+   return m_HWDAnnounceIdList;
+}
+const std::set< uint32_t >& getHWDCrafterSupplyIdList()
+{
+   if( m_HWDCrafterSupplyIdList.size() == 0 )
+      loadIdList( m_HWDCrafterSupplyDat, m_HWDCrafterSupplyIdList );
+   return m_HWDCrafterSupplyIdList;
+}
+const std::set< uint32_t >& getHWDCrafterSupplyRewardIdList()
+{
+   if( m_HWDCrafterSupplyRewardIdList.size() == 0 )
+      loadIdList( m_HWDCrafterSupplyRewardDat, m_HWDCrafterSupplyRewardIdList );
+   return m_HWDCrafterSupplyRewardIdList;
+}
+const std::set< uint32_t >& getHWDDevLayerControlIdList()
+{
+   if( m_HWDDevLayerControlIdList.size() == 0 )
+      loadIdList( m_HWDDevLayerControlDat, m_HWDDevLayerControlIdList );
+   return m_HWDDevLayerControlIdList;
+}
+const std::set< uint32_t >& getHWDDevLevelUIIdList()
+{
+   if( m_HWDDevLevelUIIdList.size() == 0 )
+      loadIdList( m_HWDDevLevelUIDat, m_HWDDevLevelUIIdList );
+   return m_HWDDevLevelUIIdList;
+}
+const std::set< uint32_t >& getHWDDevLivelyIdList()
+{
+   if( m_HWDDevLivelyIdList.size() == 0 )
+      loadIdList( m_HWDDevLivelyDat, m_HWDDevLivelyIdList );
+   return m_HWDDevLivelyIdList;
+}
+const std::set< uint32_t >& getHWDDevProgressIdList()
+{
+   if( m_HWDDevProgressIdList.size() == 0 )
+      loadIdList( m_HWDDevProgressDat, m_HWDDevProgressIdList );
+   return m_HWDDevProgressIdList;
+}
+const std::set< uint32_t >& getHWDInfoBoardArticleIdList()
+{
+   if( m_HWDInfoBoardArticleIdList.size() == 0 )
+      loadIdList( m_HWDInfoBoardArticleDat, m_HWDInfoBoardArticleIdList );
+   return m_HWDInfoBoardArticleIdList;
+}
+const std::set< uint32_t >& getHWDInfoBoardArticleTransientIdList()
+{
+   if( m_HWDInfoBoardArticleTransientIdList.size() == 0 )
+      loadIdList( m_HWDInfoBoardArticleTransientDat, m_HWDInfoBoardArticleTransientIdList );
+   return m_HWDInfoBoardArticleTransientIdList;
+}
+const std::set< uint32_t >& getHWDInfoBoardArticleTypeIdList()
+{
+   if( m_HWDInfoBoardArticleTypeIdList.size() == 0 )
+      loadIdList( m_HWDInfoBoardArticleTypeDat, m_HWDInfoBoardArticleTypeIdList );
+   return m_HWDInfoBoardArticleTypeIdList;
+}
+const std::set< uint32_t >& getHWDLevelChangeDeceptionIdList()
+{
+   if( m_HWDLevelChangeDeceptionIdList.size() == 0 )
+      loadIdList( m_HWDLevelChangeDeceptionDat, m_HWDLevelChangeDeceptionIdList );
+   return m_HWDLevelChangeDeceptionIdList;
+}
+const std::set< uint32_t >& getHWDSharedGroupIdList()
+{
+   if( m_HWDSharedGroupIdList.size() == 0 )
+      loadIdList( m_HWDSharedGroupDat, m_HWDSharedGroupIdList );
+   return m_HWDSharedGroupIdList;
+}
+const std::set< uint32_t >& getHWDSharedGroupControlParamIdList()
+{
+   if( m_HWDSharedGroupControlParamIdList.size() == 0 )
+      loadIdList( m_HWDSharedGroupControlParamDat, m_HWDSharedGroupControlParamIdList );
+   return m_HWDSharedGroupControlParamIdList;
+}
+const std::set< uint32_t >& getIKDContentBonusIdList()
+{
+   if( m_IKDContentBonusIdList.size() == 0 )
+      loadIdList( m_IKDContentBonusDat, m_IKDContentBonusIdList );
+   return m_IKDContentBonusIdList;
+}
+const std::set< uint32_t >& getIKDFishParamIdList()
+{
+   if( m_IKDFishParamIdList.size() == 0 )
+      loadIdList( m_IKDFishParamDat, m_IKDFishParamIdList );
+   return m_IKDFishParamIdList;
+}
+const std::set< uint32_t >& getIKDRouteIdList()
+{
+   if( m_IKDRouteIdList.size() == 0 )
+      loadIdList( m_IKDRouteDat, m_IKDRouteIdList );
+   return m_IKDRouteIdList;
+}
+const std::set< uint32_t >& getIKDRouteTableIdList()
+{
+   if( m_IKDRouteTableIdList.size() == 0 )
+      loadIdList( m_IKDRouteTableDat, m_IKDRouteTableIdList );
+   return m_IKDRouteTableIdList;
+}
+const std::set< uint32_t >& getIKDSpotIdList()
+{
+   if( m_IKDSpotIdList.size() == 0 )
+      loadIdList( m_IKDSpotDat, m_IKDSpotIdList );
+   return m_IKDSpotIdList;
+}
 const std::set< uint32_t >& getIndividualWeatherIdList()
 {
    if( m_IndividualWeatherIdList.size() == 0 )
@@ -9424,6 +11002,18 @@ const std::set< uint32_t >& getJournalSectionIdList()
       loadIdList( m_JournalSectionDat, m_JournalSectionIdList );
    return m_JournalSectionIdList;
 }
+const std::set< uint32_t >& getKnockbackIdList()
+{
+   if( m_KnockbackIdList.size() == 0 )
+      loadIdList( m_KnockbackDat, m_KnockbackIdList );
+   return m_KnockbackIdList;
+}
+const std::set< uint32_t >& getLegacyQuestIdList()
+{
+   if( m_LegacyQuestIdList.size() == 0 )
+      loadIdList( m_LegacyQuestDat, m_LegacyQuestIdList );
+   return m_LegacyQuestIdList;
+}
 const std::set< uint32_t >& getLeveIdList()
 {
    if( m_LeveIdList.size() == 0 )
@@ -9460,12 +11050,24 @@ const std::set< uint32_t >& getLeveRewardItemGroupIdList()
       loadIdList( m_LeveRewardItemGroupDat, m_LeveRewardItemGroupIdList );
    return m_LeveRewardItemGroupIdList;
 }
+const std::set< uint32_t >& getLeveStringIdList()
+{
+   if( m_LeveStringIdList.size() == 0 )
+      loadIdList( m_LeveStringDat, m_LeveStringIdList );
+   return m_LeveStringIdList;
+}
 const std::set< uint32_t >& getLeveVfxIdList()
 {
    if( m_LeveVfxIdList.size() == 0 )
       loadIdList( m_LeveVfxDat, m_LeveVfxIdList );
    return m_LeveVfxIdList;
 }
+const std::set< uint32_t >& getLobbyIdList()
+{
+   if( m_LobbyIdList.size() == 0 )
+      loadIdList( m_LobbyDat, m_LobbyIdList );
+   return m_LobbyIdList;
+}
 const std::set< uint32_t >& getLogFilterIdList()
 {
    if( m_LogFilterIdList.size() == 0 )
@@ -9478,12 +11080,6 @@ const std::set< uint32_t >& getLogKindIdList()
       loadIdList( m_LogKindDat, m_LogKindIdList );
    return m_LogKindIdList;
 }
-const std::set< uint32_t >& getLogKindCategoryTextIdList()
-{
-   if( m_LogKindCategoryTextIdList.size() == 0 )
-      loadIdList( m_LogKindCategoryTextDat, m_LogKindCategoryTextIdList );
-   return m_LogKindCategoryTextIdList;
-}
 const std::set< uint32_t >& getLogMessageIdList()
 {
    if( m_LogMessageIdList.size() == 0 )
@@ -9586,6 +11182,12 @@ const std::set< uint32_t >& getMateriaJoinRateGatherCraftIdList()
       loadIdList( m_MateriaJoinRateGatherCraftDat, m_MateriaJoinRateGatherCraftIdList );
    return m_MateriaJoinRateGatherCraftIdList;
 }
+const std::set< uint32_t >& getMateriaTomestoneRateIdList()
+{
+   if( m_MateriaTomestoneRateIdList.size() == 0 )
+      loadIdList( m_MateriaTomestoneRateDat, m_MateriaTomestoneRateIdList );
+   return m_MateriaTomestoneRateIdList;
+}
 const std::set< uint32_t >& getMiniGameRAIdList()
 {
    if( m_MiniGameRAIdList.size() == 0 )
@@ -9670,6 +11272,18 @@ const std::set< uint32_t >& getMonsterNoteTargetIdList()
       loadIdList( m_MonsterNoteTargetDat, m_MonsterNoteTargetIdList );
    return m_MonsterNoteTargetIdList;
 }
+const std::set< uint32_t >& getMotionTimelineIdList()
+{
+   if( m_MotionTimelineIdList.size() == 0 )
+      loadIdList( m_MotionTimelineDat, m_MotionTimelineIdList );
+   return m_MotionTimelineIdList;
+}
+const std::set< uint32_t >& getMotionTimelineBlendTableIdList()
+{
+   if( m_MotionTimelineBlendTableIdList.size() == 0 )
+      loadIdList( m_MotionTimelineBlendTableDat, m_MotionTimelineBlendTableIdList );
+   return m_MotionTimelineBlendTableIdList;
+}
 const std::set< uint32_t >& getMountIdList()
 {
    if( m_MountIdList.size() == 0 )
@@ -9718,6 +11332,24 @@ const std::set< uint32_t >& getMoveVfxIdList()
       loadIdList( m_MoveVfxDat, m_MoveVfxIdList );
    return m_MoveVfxIdList;
 }
+const std::set< uint32_t >& getMovieSubtitleIdList()
+{
+   if( m_MovieSubtitleIdList.size() == 0 )
+      loadIdList( m_MovieSubtitleDat, m_MovieSubtitleIdList );
+   return m_MovieSubtitleIdList;
+}
+const std::set< uint32_t >& getMovieSubtitle500IdList()
+{
+   if( m_MovieSubtitle500IdList.size() == 0 )
+      loadIdList( m_MovieSubtitle500Dat, m_MovieSubtitle500IdList );
+   return m_MovieSubtitle500IdList;
+}
+const std::set< uint32_t >& getMovieSubtitleVoyageIdList()
+{
+   if( m_MovieSubtitleVoyageIdList.size() == 0 )
+      loadIdList( m_MovieSubtitleVoyageDat, m_MovieSubtitleVoyageIdList );
+   return m_MovieSubtitleVoyageIdList;
+}
 const std::set< uint32_t >& getNotebookDivisionIdList()
 {
    if( m_NotebookDivisionIdList.size() == 0 )
@@ -9826,6 +11458,12 @@ const std::set< uint32_t >& getPartyContentTextDataIdList()
       loadIdList( m_PartyContentTextDataDat, m_PartyContentTextDataIdList );
    return m_PartyContentTextDataIdList;
 }
+const std::set< uint32_t >& getPatchMarkIdList()
+{
+   if( m_PatchMarkIdList.size() == 0 )
+      loadIdList( m_PatchMarkDat, m_PatchMarkIdList );
+   return m_PatchMarkIdList;
+}
 const std::set< uint32_t >& getPerformIdList()
 {
    if( m_PerformIdList.size() == 0 )
@@ -9850,6 +11488,18 @@ const std::set< uint32_t >& getPetActionIdList()
       loadIdList( m_PetActionDat, m_PetActionIdList );
    return m_PetActionIdList;
 }
+const std::set< uint32_t >& getPhysicsGroupIdList()
+{
+   if( m_PhysicsGroupIdList.size() == 0 )
+      loadIdList( m_PhysicsGroupDat, m_PhysicsGroupIdList );
+   return m_PhysicsGroupIdList;
+}
+const std::set< uint32_t >& getPhysicsWindIdList()
+{
+   if( m_PhysicsWindIdList.size() == 0 )
+      loadIdList( m_PhysicsWindDat, m_PhysicsWindIdList );
+   return m_PhysicsWindIdList;
+}
 const std::set< uint32_t >& getPictureIdList()
 {
    if( m_PictureIdList.size() == 0 )
@@ -9874,6 +11524,18 @@ const std::set< uint32_t >& getPreHandlerIdList()
       loadIdList( m_PreHandlerDat, m_PreHandlerIdList );
    return m_PreHandlerIdList;
 }
+const std::set< uint32_t >& getPresetCameraIdList()
+{
+   if( m_PresetCameraIdList.size() == 0 )
+      loadIdList( m_PresetCameraDat, m_PresetCameraIdList );
+   return m_PresetCameraIdList;
+}
+const std::set< uint32_t >& getPresetCameraAdjustIdList()
+{
+   if( m_PresetCameraAdjustIdList.size() == 0 )
+      loadIdList( m_PresetCameraAdjustDat, m_PresetCameraAdjustIdList );
+   return m_PresetCameraAdjustIdList;
+}
 const std::set< uint32_t >& getPublicContentIdList()
 {
    if( m_PublicContentIdList.size() == 0 )
@@ -9892,6 +11554,12 @@ const std::set< uint32_t >& getPublicContentTextDataIdList()
       loadIdList( m_PublicContentTextDataDat, m_PublicContentTextDataIdList );
    return m_PublicContentTextDataIdList;
 }
+const std::set< uint32_t >& getPurifyIdList()
+{
+   if( m_PurifyIdList.size() == 0 )
+      loadIdList( m_PurifyDat, m_PurifyIdList );
+   return m_PurifyIdList;
+}
 const std::set< uint32_t >& getPvPActionIdList()
 {
    if( m_PvPActionIdList.size() == 0 )
@@ -9934,6 +11602,12 @@ const std::set< uint32_t >& getQuestBattleIdList()
       loadIdList( m_QuestBattleDat, m_QuestBattleIdList );
    return m_QuestBattleIdList;
 }
+const std::set< uint32_t >& getQuestChapterIdList()
+{
+   if( m_QuestChapterIdList.size() == 0 )
+      loadIdList( m_QuestChapterDat, m_QuestChapterIdList );
+   return m_QuestChapterIdList;
+}
 const std::set< uint32_t >& getQuestClassJobRewardIdList()
 {
    if( m_QuestClassJobRewardIdList.size() == 0 )
@@ -9946,6 +11620,42 @@ const std::set< uint32_t >& getQuestClassJobSupplyIdList()
       loadIdList( m_QuestClassJobSupplyDat, m_QuestClassJobSupplyIdList );
    return m_QuestClassJobSupplyIdList;
 }
+const std::set< uint32_t >& getQuestDerivedClassIdList()
+{
+   if( m_QuestDerivedClassIdList.size() == 0 )
+      loadIdList( m_QuestDerivedClassDat, m_QuestDerivedClassIdList );
+   return m_QuestDerivedClassIdList;
+}
+const std::set< uint32_t >& getQuestRedoIdList()
+{
+   if( m_QuestRedoIdList.size() == 0 )
+      loadIdList( m_QuestRedoDat, m_QuestRedoIdList );
+   return m_QuestRedoIdList;
+}
+const std::set< uint32_t >& getQuestRedoChapterUIIdList()
+{
+   if( m_QuestRedoChapterUIIdList.size() == 0 )
+      loadIdList( m_QuestRedoChapterUIDat, m_QuestRedoChapterUIIdList );
+   return m_QuestRedoChapterUIIdList;
+}
+const std::set< uint32_t >& getQuestRedoChapterUICategoryIdList()
+{
+   if( m_QuestRedoChapterUICategoryIdList.size() == 0 )
+      loadIdList( m_QuestRedoChapterUICategoryDat, m_QuestRedoChapterUICategoryIdList );
+   return m_QuestRedoChapterUICategoryIdList;
+}
+const std::set< uint32_t >& getQuestRedoChapterUITabIdList()
+{
+   if( m_QuestRedoChapterUITabIdList.size() == 0 )
+      loadIdList( m_QuestRedoChapterUITabDat, m_QuestRedoChapterUITabIdList );
+   return m_QuestRedoChapterUITabIdList;
+}
+const std::set< uint32_t >& getQuestRedoIncompChapterIdList()
+{
+   if( m_QuestRedoIncompChapterIdList.size() == 0 )
+      loadIdList( m_QuestRedoIncompChapterDat, m_QuestRedoIncompChapterIdList );
+   return m_QuestRedoIncompChapterIdList;
+}
 const std::set< uint32_t >& getQuestRepeatFlagIdList()
 {
    if( m_QuestRepeatFlagIdList.size() == 0 )
@@ -10384,6 +12094,12 @@ const std::set< uint32_t >& getTreasureHuntRankIdList()
       loadIdList( m_TreasureHuntRankDat, m_TreasureHuntRankIdList );
    return m_TreasureHuntRankIdList;
 }
+const std::set< uint32_t >& getTreasureModelIdList()
+{
+   if( m_TreasureModelIdList.size() == 0 )
+      loadIdList( m_TreasureModelDat, m_TreasureModelIdList );
+   return m_TreasureModelIdList;
+}
 const std::set< uint32_t >& getTreasureSpotIdList()
 {
    if( m_TreasureSpotIdList.size() == 0 )
@@ -10498,6 +12214,12 @@ const std::set< uint32_t >& getWarpLogicIdList()
       loadIdList( m_WarpLogicDat, m_WarpLogicIdList );
    return m_WarpLogicIdList;
 }
+const std::set< uint32_t >& getWeaponTimelineIdList()
+{
+   if( m_WeaponTimelineIdList.size() == 0 )
+      loadIdList( m_WeaponTimelineDat, m_WeaponTimelineIdList );
+   return m_WeaponTimelineIdList;
+}
 const std::set< uint32_t >& getWeatherIdList()
 {
    if( m_WeatherIdList.size() == 0 )
diff --git a/src/scripts/common/warptaxi/WarpTaxi.cpp b/src/scripts/common/warptaxi/WarpTaxi.cpp
index fe442249..dbf3b58d 100644
--- a/src/scripts/common/warptaxi/WarpTaxi.cpp
+++ b/src/scripts/common/warptaxi/WarpTaxi.cpp
@@ -41,7 +41,7 @@ public:
 
       auto playerMgr = framework()->get< Sapphire::World::Manager::PlayerMgr >();
 
-      auto pPop = pPopRange->getPopRange(  warp->level,  warp->level );
+      auto pPop = pPopRange->getPopRange( warp->territoryType, warp->popRange );
 
       if( !pPop )
       {
@@ -52,7 +52,7 @@ public:
         std::cout << "found!!";
       }
 
-      playerMgr->movePlayerToLandDestination( player, warp->level, result.param3 );
+      playerMgr->movePlayerToLandDestination( player, warp->popRange, result.param3 );
     }
     else
     {
diff --git a/src/world/Actor/BNpc.cpp b/src/world/Actor/BNpc.cpp
index b24d1053..ca7e9a80 100644
--- a/src/world/Actor/BNpc.cpp
+++ b/src/world/Actor/BNpc.cpp
@@ -112,7 +112,7 @@ Sapphire::Entity::BNpc::BNpc( uint32_t id, BNpcTemplatePtr pTemplate, float posX
   {
     auto modelSkeleton = exdData->get< Data::ModelSkeleton >( modelChara->model );
     if( modelSkeleton )
-      m_radius *= modelSkeleton->scaleFactor;
+      m_radius *= modelSkeleton->radius;
   }
 
   // todo: is this actually good?
diff --git a/src/world/Manager/EventMgr.cpp b/src/world/Manager/EventMgr.cpp
index 58c6f909..6794325b 100644
--- a/src/world/Manager/EventMgr.cpp
+++ b/src/world/Manager/EventMgr.cpp
@@ -61,12 +61,8 @@ std::string Sapphire::World::Manager::EventMgr::getEventName( uint32_t eventId )
     }
     case Event::EventHandler::EventHandlerType::ICDirector:
     {
-      auto contentInfo = pExdData->get< Sapphire::Data::InstanceContent >( eventId & 0xFFFF );
-      std::string name = contentInfo->name;
-      std::string remove( ",★_ '()[]-\x1a\x1\x2\x1f\x1\x3.:" );
-      Util::eraseAllIn( name, remove );
-      name[ 0 ] = toupper( name[ 0 ] );
-      return name;
+      // auto contentInfo = pExdData->get< Sapphire::Data::InstanceContent >( eventId & 0xFFFF );
+      return "InstanceContentDirector#" + std::to_string( eventId & 0xFFFF );
     }
     case Event::EventHandler::EventHandlerType::QuestBattleDirector:
     {
diff --git a/src/world/Manager/TerritoryMgr.cpp b/src/world/Manager/TerritoryMgr.cpp
index c649964e..916f94a6 100644
--- a/src/world/Manager/TerritoryMgr.cpp
+++ b/src/world/Manager/TerritoryMgr.cpp
@@ -348,10 +348,10 @@ Sapphire::TerritoryPtr Sapphire::World::Manager::TerritoryMgr::createInstanceCon
   if( !pTeri || pContentFinderCondition->name.empty() )
     return nullptr;
 
-  Logger::debug( "Starting instance for InstanceContent id: {0} ({1})", instanceContentId, pInstanceContent->name );
+  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, framework() );
+                                     pTeri->name, pContentFinderCondition->name, instanceContentId, framework() );
   pZone->init();
 
   m_instanceContentIdToInstanceMap[ instanceContentId ][ pZone->getGuId() ] = pZone;

From c3eb0484208455c7804f5d6ee2090abb8a424511 Mon Sep 17 00:00:00 2001
From: Sophie Hamilton <git-commits@theblob.org>
Date: Mon, 24 Feb 2020 16:15:59 +0000
Subject: [PATCH 260/351] Update deleteCharacter, remove charainfofriendlist

Not all data was deleted when deleting a character, making it impossible
to play a new character with the same name. Add in delete commands for
the additional tables and remove the reference to the (non-existent)
charainfofriendlist table.
---
 src/api/SapphireApi.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/api/SapphireApi.cpp b/src/api/SapphireApi.cpp
index f12da082..e31e37c1 100644
--- a/src/api/SapphireApi.cpp
+++ b/src/api/SapphireApi.cpp
@@ -192,13 +192,15 @@ void SapphireApi::deleteCharacter( std::string name, const uint32_t accountId )
   g_charaDb.execute( "DELETE FROM characlass WHERE CharacterId LIKE '" + std::to_string( id ) + "';" );
   g_charaDb.execute( "DELETE FROM charaglobalitem WHERE CharacterId LIKE '" + std::to_string( id ) + "';" );
   g_charaDb.execute( "DELETE FROM charainfoblacklist WHERE CharacterId LIKE '" + std::to_string( id ) + "';" );
-  g_charaDb.execute( "DELETE FROM charainfofriendlist WHERE CharacterId LIKE '" + std::to_string( id ) + "';" );
   g_charaDb.execute( "DELETE FROM charainfolinkshell WHERE CharacterId LIKE '" + std::to_string( id ) + "';" );
   g_charaDb.execute( "DELETE FROM charainfosearch WHERE CharacterId LIKE '" + std::to_string( id ) + "';" );
   g_charaDb.execute( "DELETE FROM charaitemcrystal WHERE CharacterId LIKE '" + std::to_string( id ) + "';" );
+  g_charaDb.execute( "DELETE FROM charaitemcurrency WHERE CharacterId LIKE '" + std::to_string( id ) + "';" );
   g_charaDb.execute( "DELETE FROM charaiteminventory WHERE CharacterId LIKE '" + std::to_string( id ) + "';" );
   g_charaDb.execute( "DELETE FROM charaitemgearset WHERE CharacterId LIKE '" + std::to_string( id ) + "';" );
+  g_charaDb.execute( "DELETE FROM charamonsternote WHERE CharacterId LIKE '" + std::to_string( id ) + "';" );
   g_charaDb.execute( "DELETE FROM charaquest WHERE CharacterId LIKE '" + std::to_string( id ) + "';" );
+  g_charaDb.execute( "DELETE FROM charastatus WHERE CharacterId LIKE '" + std::to_string( id ) + "';" );
 }
 
 std::vector< PlayerMinimal > SapphireApi::getCharList( uint32_t accountId )

From 5106fc30436c116900e2cd55a4ef96a00925ac8d Mon Sep 17 00:00:00 2001
From: collett <collett0301@gmail.com>
Date: Tue, 25 Feb 2020 02:12:32 +0900
Subject: [PATCH 261/351] fix mount

---
 src/common/Common.h                 | 2 +-
 src/common/Network/PacketDef/Ipcs.h | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/common/Common.h b/src/common/Common.h
index 5d61a408..bc8fc621 100644
--- a/src/common/Common.h
+++ b/src/common/Common.h
@@ -636,7 +636,7 @@ namespace Sapphire::Common
     StartActionCombo = 27, // shifted one up from 5.18
     ComboSucceed = 28, // shifted one up from 5.18, on retail this is not seen anymore, still working though.
     Knockback = 33,
-    Mount = 39,
+    Mount = 40, // shifted one down from 5.18
     VFX = 59, // links to VFX sheet
   };
 
diff --git a/src/common/Network/PacketDef/Ipcs.h b/src/common/Network/PacketDef/Ipcs.h
index c5a9db0f..96084de7 100644
--- a/src/common/Network/PacketDef/Ipcs.h
+++ b/src/common/Network/PacketDef/Ipcs.h
@@ -142,7 +142,7 @@ namespace Sapphire::Network::Packets
 
     ActorSetPos = 0x00CF, // updated 5.2
 
-    ActorCast = 0x03B1, // updated 5.18
+    ActorCast = 0x00F6, // updated 5.2
     SomeCustomiseChangePacketProbably = 0x00CD, // added 5.18
 
     PartyList = 0x0287, // updated 5.18
@@ -205,7 +205,7 @@ namespace Sapphire::Network::Packets
 
     QuestTracker = 0x0306, // updated 5.2
 
-    Mount = 0x038F, // updated 5.18
+    Mount = 0x023C, // updated 5.2
 
     DirectorVars = 0x00E6, // updated 5.18
     SomeDirectorUnk1 = 0x0084, // updated 5.18

From 94258f74c05c99613b2ac93566cd0ff16101dfcd Mon Sep 17 00:00:00 2001
From: collett <collett0301@gmail.com>
Date: Mon, 24 Feb 2020 20:40:46 +0900
Subject: [PATCH 262/351] opcode

---
 src/common/Network/PacketDef/Ipcs.h | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/common/Network/PacketDef/Ipcs.h b/src/common/Network/PacketDef/Ipcs.h
index 96084de7..958427ad 100644
--- a/src/common/Network/PacketDef/Ipcs.h
+++ b/src/common/Network/PacketDef/Ipcs.h
@@ -338,8 +338,8 @@ namespace Sapphire::Network::Packets
 
     PlaceFieldMarker = 0x013C, // updated 5.0
     SkillHandler = 0x0225, // updated 5.2
-    GMCommand1 = 0x014D, // updated 5.18
-    GMCommand2 = 0x03C2, // updated 5.18
+    GMCommand1 = 0x0393, // updated 5.2
+    GMCommand2 = 0x020B, // updated 5.2
     AoESkillHandler = 0x0072, // updated 5.18
 
     UpdatePositionHandler = 0x0270, // updated 5.2
@@ -352,7 +352,7 @@ namespace Sapphire::Network::Packets
     BuildPresetHandler = 0x0150, // updated 5.0
 
     TalkEventHandler = 0x0340, // updated 5.2
-    EmoteEventHandler = 0x0183, // updated 5.18
+    EmoteEventHandler = 0x01E1, // updated 5.2
     WithinRangeEventHandler = 0x010E, // updated 5.2
     OutOfRangeEventHandler = 0x00AE, // updated 5.2
     EnterTeriEventHandler = 0x00C1, // updated 5.2

From b79a422330a03f818bcc7bc808a38d563614f78c Mon Sep 17 00:00:00 2001
From: NotAdam <adam@notadam.me>
Date: Tue, 25 Feb 2020 15:55:01 +1100
Subject: [PATCH 263/351] fix windows build

---
 src/common/Exd/ExdDataGenerated.h       | 5 +++++
 src/tools/exd_struct_gen/ExdData.h.tmpl | 9 ++++++---
 src/world/ServerMgr.cpp                 | 2 --
 3 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/src/common/Exd/ExdDataGenerated.h b/src/common/Exd/ExdDataGenerated.h
index ef3f443b..d5bedc63 100644
--- a/src/common/Exd/ExdDataGenerated.h
+++ b/src/common/Exd/ExdDataGenerated.h
@@ -13,6 +13,11 @@
 #include <set>
 #include <variant>
 
+#if _WIN32
+#undef near
+#undef far
+#endif
+
 namespace Sapphire {
 namespace Data {
 
diff --git a/src/tools/exd_struct_gen/ExdData.h.tmpl b/src/tools/exd_struct_gen/ExdData.h.tmpl
index d5612d74..4b15822a 100644
--- a/src/tools/exd_struct_gen/ExdData.h.tmpl
+++ b/src/tools/exd_struct_gen/ExdData.h.tmpl
@@ -13,8 +13,12 @@
 #include <set>
 #include <variant>
 
-namespace Sapphire {
-namespace Data {
+#if _WIN32
+#undef near
+#undef far
+#endif
+
+namespace Sapphire::Data {
 
 class ExdDataGenerated;
 
@@ -89,7 +93,6 @@ IDLISTGETTERS
   };
 
 }
-}
 
 #endif
 
diff --git a/src/world/ServerMgr.cpp b/src/world/ServerMgr.cpp
index 0186d396..460b8c98 100644
--- a/src/world/ServerMgr.cpp
+++ b/src/world/ServerMgr.cpp
@@ -26,8 +26,6 @@
 
 #include "Script/ScriptMgr.h"
 
-#include <Exd/ExdDataGenerated.h>
-
 #include <Database/ZoneDbConnection.h>
 #include <Database/DbWorkerPool.h>
 #include "Manager/LinkshellMgr.h"

From 99595e66773b3d85417c64b5937149b340f5f166 Mon Sep 17 00:00:00 2001
From: collett <collett0301@gmail.com>
Date: Wed, 26 Feb 2020 08:10:42 +0900
Subject: [PATCH 264/351] Solve the mystery of second quest now showing in
 gridania or limsa.

---
 src/common/Network/PacketDef/Zone/ServerZoneDef.h | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/common/Network/PacketDef/Zone/ServerZoneDef.h b/src/common/Network/PacketDef/Zone/ServerZoneDef.h
index d8b90a7c..daf50c8a 100644
--- a/src/common/Network/PacketDef/Zone/ServerZoneDef.h
+++ b/src/common/Network/PacketDef/Zone/ServerZoneDef.h
@@ -973,6 +973,7 @@ namespace Sapphire::Network::Packets::Server
     unsigned char expansion;
     unsigned char unknown76;
     unsigned char unknown77;
+    unsigned char very_unknown;
     unsigned char race;
     unsigned char tribe;
     unsigned char gender;
@@ -999,7 +1000,7 @@ namespace Sapphire::Network::Packets::Server
     unsigned char craftingMasterMask;
     unsigned char unknown95[9];
     unsigned char unknown9F[2];
-    unsigned char unknownA1[3];
+    unsigned char unknownA1[6];
     unsigned int exp[Common::CLASSJOB_SLOTS];
     unsigned int unknown108;
     unsigned int pvpTotalExp;
@@ -1020,7 +1021,7 @@ namespace Sapphire::Network::Packets::Server
     unsigned char companionDefRank;
     unsigned char companionAttRank;
     unsigned char companionHealRank;
-    unsigned char u19[13];
+    unsigned char u19[9];
     unsigned char mountGuideMask[22];
     char name[32];
     unsigned char unknownOword[16];

From 793c6120a6088316da3bf0b47ac47f56237ab84e Mon Sep 17 00:00:00 2001
From: collett <collett0301@gmail.com>
Date: Thu, 27 Feb 2020 00:59:28 +0900
Subject: [PATCH 265/351] Should not gain any exp past max level.

---
 src/world/Actor/Player.cpp | 20 ++++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

diff --git a/src/world/Actor/Player.cpp b/src/world/Actor/Player.cpp
index 2e18b010..8677d001 100644
--- a/src/world/Actor/Player.cpp
+++ b/src/world/Actor/Player.cpp
@@ -693,30 +693,34 @@ bool Sapphire::Entity::Player::isActionLearned( uint8_t actionId ) const
 
 void Sapphire::Entity::Player::gainExp( uint32_t amount )
 {
-  auto pExdData = m_pFw->get< Data::ExdDataGenerated >();
-
   uint32_t currentExp = getExp();
 
   uint16_t level = getLevel();
 
+  if( level >= Common::MAX_PLAYER_LEVEL )
+  {
+    setExp( 0 );
+    if( currentExp != 0 )
+      queuePacket( makeActorControlSelf( getId(), UpdateUiExp, static_cast< uint8_t >( getClass() ), 0 ) );
+    return;
+  }
+
+  auto pExdData = m_pFw->get< Data::ExdDataGenerated >();
+
   uint32_t neededExpToLevel = pExdData->get< Sapphire::Data::ParamGrow >( level )->expToNext;
 
   uint32_t neededExpToLevelplus1 = pExdData->get< Sapphire::Data::ParamGrow >( level + 1 )->expToNext;
 
   queuePacket( makeActorControlSelf( getId(), GainExpMsg, static_cast< uint8_t >( getClass() ), amount ) );
 
-  if( level >= Common::MAX_PLAYER_LEVEL ) // temporary fix for leveling over levelcap
-  {
-    queuePacket( makeActorControlSelf( getId(), UpdateUiExp, static_cast< uint8_t >( getClass() ), amount ) );
-    return;
-  }
-
   if( ( currentExp + amount ) >= neededExpToLevel )
   {
     // levelup
     amount = ( currentExp + amount - neededExpToLevel ) > neededExpToLevelplus1 ?
              neededExpToLevelplus1 - 1 :
              ( currentExp + amount - neededExpToLevel );
+    if( level + 1 >= Common::MAX_PLAYER_LEVEL )
+      amount = 0;
     setExp( amount );
     gainLevel();
     queuePacket( makeActorControlSelf( getId(), UpdateUiExp, static_cast< uint8_t >( getClass() ), amount ) );

From 71f4e5b8bbb65cb88901106eeaeaab8fff3d9198 Mon Sep 17 00:00:00 2001
From: Sophie Hamilton <git-commits@theblob.org>
Date: Sat, 29 Feb 2020 10:30:25 +0000
Subject: [PATCH 266/351] quest_parser template update

Use correct method of determining actor, use callback variables instead
of inline functions within scenes, and use the correct namespace.
---
 src/tools/quest_parser/main.cpp | 24 ++++++++++++++++--------
 1 file changed, 16 insertions(+), 8 deletions(-)

diff --git a/src/tools/quest_parser/main.cpp b/src/tools/quest_parser/main.cpp
index 06d48373..1f47b0a1 100644
--- a/src/tools/quest_parser/main.cpp
+++ b/src/tools/quest_parser/main.cpp
@@ -27,7 +27,8 @@ using namespace Sapphire;
 const std::string onTalkStr(
   "  void onTalk( uint32_t eventId, Entity::Player& player, uint64_t actorId ) override\n"
   "  {\n"
-  "    auto actor = Event::mapEventActorToRealActor( actorId );\n"
+  "    auto pEventMgr = m_framework->get< World::Manager::EventMgr >();\n"
+  "    auto actor = pEventMgr->mapEventActorToRealActor( static_cast< uint32_t >( actorId ) );\n"
   "  }\n\n"
 );
 
@@ -40,6 +41,8 @@ const std::string onWithinRangeStr(
 const std::string onEmoteStr(
   "  void onEmote( uint32_t eventId, Entity::Player& player, uint64_t actorId, uint32_t emoteId ) override\n"
   "  {\n"
+  "    auto pEventMgr = m_framework->get< World::Manager::EventMgr >();\n"
+  "    auto actor = pEventMgr->mapEventActorToRealActor( static_cast< uint32_t >( actorId ) );\n"
   "  }\n\n"
 );
 
@@ -101,12 +104,15 @@ createScript( std::shared_ptr< Sapphire::Data::Quest >& pQuestData, std::set< st
         sceneName +
         "( Entity::Player& player )\n"
         "  {\n"
+        "    auto callback = [ & ]( Entity::Player& player, const Event::SceneResult& result )\n"
+        "    {\n"
+        "    };\n"
+        "\n"
         "    player.playScene( getId(), " +
-        sceneId +
-        ", 0,\n"
-        "      [ & ]( Entity::Player& player, const Event::SceneResult& result )\n"
-        "      {\n"
-        "      });\n"
+        sceneId + ", "
+        "NONE, "
+        "callback"
+        " );\n"
         "  }\n\n"
       );
     }
@@ -204,6 +210,8 @@ createScript( std::shared_ptr< Sapphire::Data::Quest >& pQuestData, std::set< st
   additional += "// Start NPC: " + std::to_string( pQuestData->issuerStart ) + "\n";
   additional += "// End NPC: " + std::to_string( pQuestData->targetEnd ) + "\n\n";
 
+  additional += "using namespace Sapphire;\n\n";
+
   std::string actionEntry;
   std::string scriptEntry;
   scriptEntry.reserve( 0xFFFF );
@@ -224,7 +232,7 @@ createScript( std::shared_ptr< Sapphire::Data::Quest >& pQuestData, std::set< st
 
   if( !enemy_ids.empty() )
     scriptEntry += std::string(
-      "  void onBNpcKill( uint32_t npcId, Entity::Player& player )\n"
+      "  void onBNpcKill( uint32_t npcId, Entity::Player& player ) override\n"
       "  {\n" 
       "    switch( npcId )\n"
       "    {\n" );
@@ -240,7 +248,7 @@ createScript( std::shared_ptr< Sapphire::Data::Quest >& pQuestData, std::set< st
 
   if( !action_ids.empty() )
     actionEntry += std::string(
-      "  void onEObjHit( uint32_t npcId, Entity::Player& player, uin32_t actionId )\n"
+      "  void onEObjHit( uint32_t npcId, Entity::Player& player, uin32_t actionId ) override\n"
       "  {\n" 
       "    switch( actionId )\n"
       "    {\n" );

From 8981955ddda026bf9804b9f1220ef647d00040f7 Mon Sep 17 00:00:00 2001
From: Sophie Hamilton <git-commits@theblob.org>
Date: Sat, 29 Feb 2020 17:33:55 +0000
Subject: [PATCH 267/351] quest_parser: Fix case for constants

The generated onBNpcKill and onEObjHit functions were using the wrong
case for the constants they used. Ensure that they use the same case as
the declared constants, and reduce duplicate code.

Also, fix a typo in the onEObjHit function prototype which was causing
generated scripts to not compile properly, and revert the incorrect
addition (by me in an earlier commit) of "override".
---
 src/tools/quest_parser/main.cpp | 31 ++++++++++++++++---------------
 1 file changed, 16 insertions(+), 15 deletions(-)

diff --git a/src/tools/quest_parser/main.cpp b/src/tools/quest_parser/main.cpp
index 1f47b0a1..9efc2cba 100644
--- a/src/tools/quest_parser/main.cpp
+++ b/src/tools/quest_parser/main.cpp
@@ -64,6 +64,17 @@ std::string titleCase( const std::string& str )
   return retStr;
 }
 
+std::string titleCaseNoUnderscores( const std::string& str )
+{
+  std::string result = titleCase( str );
+
+  result.erase( std::remove_if( result.begin(), result.end(), []( const char c ) {
+    return c == '_';
+  }), result.end());
+
+  return result;
+}
+
 void
 createScript( std::shared_ptr< Sapphire::Data::Quest >& pQuestData, std::set< std::string >& additionalList, int questId )
 {
@@ -132,12 +143,7 @@ createScript( std::shared_ptr< Sapphire::Data::Quest >& pQuestData, std::set< st
       }
       else
       {
-        std::string seqName = titleCase( entry );
-
-        seqName.erase( std::remove_if( seqName.begin(), seqName.end(), []( const char c ) {
-          return c == '_';
-        }), seqName.end());
-
+        std::string seqName = titleCaseNoUnderscores( entry );
         std::string seqId = entry.substr( 4 );
         seqStr += "      " + seqName + " = " + seqId + ",\n";
       }
@@ -195,12 +201,7 @@ createScript( std::shared_ptr< Sapphire::Data::Quest >& pQuestData, std::set< st
   std::sort( script_entities.begin(), script_entities.end() );
   for( auto& entity : script_entities )
   {
-    auto name = titleCase( entity );
-
-    name.erase( std::remove_if( name.begin(), name.end(), []( const char c ) {
-      return c == '_';
-    }), name.end());
-
+    auto name = titleCaseNoUnderscores( entity );
     sentities += "    static constexpr auto " + name + ";\n";
   }
 
@@ -239,7 +240,7 @@ createScript( std::shared_ptr< Sapphire::Data::Quest >& pQuestData, std::set< st
 
   for( auto enemy : enemy_strings )
   { 
-    scriptEntry += "      case " + enemy + ": { break; }\n"; 
+    scriptEntry += "      case " + titleCaseNoUnderscores( enemy ) + ": { break; }\n";
   }
 
   if( !enemy_ids.empty() )
@@ -248,14 +249,14 @@ createScript( std::shared_ptr< Sapphire::Data::Quest >& pQuestData, std::set< st
 
   if( !action_ids.empty() )
     actionEntry += std::string(
-      "  void onEObjHit( uint32_t npcId, Entity::Player& player, uin32_t actionId ) override\n"
+      "  void onEObjHit( uint32_t npcId, Entity::Player& player, uint32_t actionId )\n"
       "  {\n" 
       "    switch( actionId )\n"
       "    {\n" );
 
   for( auto action : action_names )
   { 
-    actionEntry += "      case " + action + ": { break; }\n"; 
+    actionEntry += "      case " + titleCaseNoUnderscores( action ) + ": { break; }\n";
   }
 
   if( !action_ids.empty() )

From 3a2272594e7665f2ce2ded03fceb24fb1464491e Mon Sep 17 00:00:00 2001
From: NotAdam <adam@notadam.me>
Date: Sat, 29 Feb 2020 22:30:10 +1100
Subject: [PATCH 268/351] start of new service locator impl

---
 src/api/main.cpp                              |   2 +-
 src/common/Service.h                          | 114 ++++++++++++++++++
 src/dbm/main.cpp                              |   2 +-
 src/lobby/mainLobbyServer.cpp                 |   2 +-
 src/tools/event_object_parser/main.cpp        |   2 +-
 src/tools/exd_struct_test/main.cpp            |   2 +-
 src/tools/questbattle_bruteforce/main.cpp     |   2 +-
 src/world/Actor/Player.cpp                    |  17 +--
 src/world/Actor/PlayerEvent.cpp               |   6 +-
 src/world/Manager/DebugCommandMgr.cpp         |  31 +++--
 src/world/Manager/HousingMgr.cpp              |  10 +-
 src/world/Manager/TerritoryMgr.cpp            |   4 +-
 src/world/Navi/NaviProvider.cpp               |   4 +-
 src/world/Network/GameConnection.cpp          |   9 +-
 .../Network/Handlers/ClientTriggerHandler.cpp |   4 +-
 .../Network/Handlers/GMCommandHandlers.cpp    |   5 +-
 src/world/Network/Handlers/PacketHandlers.cpp |  12 +-
 src/world/Script/NativeScriptMgr.cpp          |   6 +-
 src/world/Script/ScriptMgr.cpp                |  11 +-
 src/world/ServerMgr.cpp                       |  29 ++---
 src/world/Territory/Territory.cpp             |  16 +--
 src/world/mainGameServer.cpp                  |   6 +-
 22 files changed, 223 insertions(+), 73 deletions(-)
 create mode 100644 src/common/Service.h

diff --git a/src/api/main.cpp b/src/api/main.cpp
index 32d4b794..011fb509 100644
--- a/src/api/main.cpp
+++ b/src/api/main.cpp
@@ -33,7 +33,7 @@
 
 #include <Util/CrashHandler.h>
 
-Sapphire::Common::Util::CrashHandler crashHandler;
+[[maybe_unused]] Sapphire::Common::Util::CrashHandler crashHandler;
 
 Sapphire::Db::DbWorkerPool< Sapphire::Db::ZoneDbConnection > g_charaDb;
 Sapphire::Data::ExdDataGenerated g_exdDataGen;
diff --git a/src/common/Service.h b/src/common/Service.h
new file mode 100644
index 00000000..bcf3dc2f
--- /dev/null
+++ b/src/common/Service.h
@@ -0,0 +1,114 @@
+#ifndef SAPPHIRE_SERVICE_H
+#define SAPPHIRE_SERVICE_H
+
+#include <memory>
+#include <utility>
+
+// stolen from: https://github.com/skypjack/entt/blob/master/src/entt/locator/locator.hpp
+
+namespace Sapphire::Common
+{
+  /**
+   * @brief Service locator, nothing more.
+   *
+   * A service locator can be used to do what it promises: locate services.<br/>
+   * Usually service locators are tightly bound to the services they expose and
+   * thus it's hard to define a general purpose class to do that. This template
+   * based implementation tries to fill the gap and to get rid of the burden of
+   * defining a different specific locator for each application.
+   *
+   * @tparam SvcType Type of service managed by the locator.
+   */
+  template< typename SvcType >
+  struct Service
+  {
+    /*! @brief Type of service offered. */
+    using ServiceType = SvcType;
+
+    /*! @brief Default constructor, deleted on purpose. */
+    Service() = delete;
+
+    /*! @brief Default destructor, deleted on purpose. */
+    ~Service() = delete;
+
+    /**
+     * @brief Tests if a valid service implementation is set.
+     * @return True if the service is set, false otherwise.
+     */
+    static bool empty() noexcept
+    {
+      return !static_cast< bool >( service );
+    }
+
+    /**
+     * @brief Returns a weak pointer to a service implementation, if any.
+     *
+     * Clients of a service shouldn't retain references to it. The recommended
+     * way is to retrieve the service implementation currently set each and
+     * every time the need of using it arises. Otherwise users can incur in
+     * unexpected behaviors.
+     *
+     * @return A reference to the service implementation currently set, if any.
+     */
+    static std::weak_ptr< SvcType > get() noexcept
+    {
+      return service;
+    }
+
+    /**
+     * @brief Returns a weak reference to a service implementation, if any.
+     *
+     * Clients of a service shouldn't retain references to it. The recommended
+     * way is to retrieve the service implementation currently set each and
+     * every time the need of using it arises. Otherwise users can incur in
+     * unexpected behaviors.
+     *
+     * @warning
+     * In case no service implementation has been set, a call to this function
+     * results in undefined behavior.
+     *
+     * @return A reference to the service implementation currently set, if any.
+     */
+    static SvcType& ref() noexcept
+    {
+      return *service;
+    }
+
+    /**
+     * @brief Sets or replaces a service.
+     * @tparam Impl Type of the new service to use.
+     * @tparam Args Types of arguments to use to construct the service.
+     * @param args Parameters to use to construct the service.
+     */
+    template< typename Impl = SvcType, typename... Args >
+    static void set( Args&& ... args )
+    {
+      service = std::make_shared< Impl >( std::forward< Args >( args )... );
+    }
+
+    /**
+     * @brief Sets or replaces a service.
+     * @param ptr Service to use to replace the current one.
+     */
+    static void set( std::shared_ptr< SvcType > ptr )
+    {
+      assert( static_cast< bool >( ptr ) );
+      service = std::move( ptr );
+    }
+
+    /**
+     * @brief Resets a service.
+     *
+     * The service is no longer valid after a reset.
+     */
+    static void reset()
+    {
+      service.reset();
+    }
+
+  private:
+    inline static std::shared_ptr< SvcType > service = nullptr;
+  };
+}
+
+#endif //SAPPHIRE_SERVICE_H
diff --git a/src/dbm/main.cpp b/src/dbm/main.cpp
index 990f500d..ed6c09d4 100644
--- a/src/dbm/main.cpp
+++ b/src/dbm/main.cpp
@@ -8,7 +8,7 @@
 #include <common/Util/CrashHandler.h>
 #include <common/Config/ConfigMgr.h>
 
-Sapphire::Common::Util::CrashHandler crashHandler;
+[[maybe_unused]] Sapphire::Common::Util::CrashHandler crashHandler;
 
 namespace fs = std::filesystem;
 
diff --git a/src/lobby/mainLobbyServer.cpp b/src/lobby/mainLobbyServer.cpp
index eb3c7653..0b16ff26 100644
--- a/src/lobby/mainLobbyServer.cpp
+++ b/src/lobby/mainLobbyServer.cpp
@@ -2,7 +2,7 @@
 
 #include <Util/CrashHandler.h>
 
-Sapphire::Common::Util::CrashHandler crashHandler;
+[[maybe_unused]] Sapphire::Common::Util::CrashHandler crashHandler;
 
 Sapphire::Lobby::ServerLobby g_serverLobby( "lobby.ini" );
 
diff --git a/src/tools/event_object_parser/main.cpp b/src/tools/event_object_parser/main.cpp
index 8d86dbb7..f1529fcb 100644
--- a/src/tools/event_object_parser/main.cpp
+++ b/src/tools/event_object_parser/main.cpp
@@ -28,7 +28,7 @@
 
 #include <filesystem>
 
-Sapphire::Common::Util::CrashHandler crashHandler;
+[[maybe_unused]] Sapphire::Common::Util::CrashHandler crashHandler;
 Sapphire::Data::ExdDataGenerated g_exdData;
 
 using namespace Sapphire;
diff --git a/src/tools/exd_struct_test/main.cpp b/src/tools/exd_struct_test/main.cpp
index e2beba0e..cb997b6f 100644
--- a/src/tools/exd_struct_test/main.cpp
+++ b/src/tools/exd_struct_test/main.cpp
@@ -24,7 +24,7 @@
 
 #include <filesystem>
 
-Sapphire::Common::Util::CrashHandler crashHandler;
+[[maybe_unused]] Sapphire::Common::Util::CrashHandler crashHandler;
 
 Sapphire::Data::ExdDataGenerated g_exdData;
 xiv::dat::GameData* gameData = nullptr;
diff --git a/src/tools/questbattle_bruteforce/main.cpp b/src/tools/questbattle_bruteforce/main.cpp
index 7aa34fbd..d8c1c6d4 100644
--- a/src/tools/questbattle_bruteforce/main.cpp
+++ b/src/tools/questbattle_bruteforce/main.cpp
@@ -20,7 +20,7 @@
 
 #include <filesystem>
 
-Sapphire::Common::Util::CrashHandler crashHandler;
+[[maybe_unused]] Sapphire::Common::Util::CrashHandler crashHandler;
 
 Sapphire::Data::ExdDataGenerated g_exdData;
 xiv::dat::GameData* gameData = nullptr;
diff --git a/src/world/Actor/Player.cpp b/src/world/Actor/Player.cpp
index 8677d001..8565e7a4 100644
--- a/src/world/Actor/Player.cpp
+++ b/src/world/Actor/Player.cpp
@@ -10,6 +10,7 @@
 #include <Network/CommonActorControl.h>
 #include <Network/PacketWrappers/EffectPacket.h>
 #include <cmath>
+#include <Service.h>
 
 #include "Session.h"
 #include "Player.h"
@@ -114,8 +115,8 @@ Sapphire::Entity::Player::~Player()
 
 void Sapphire::Entity::Player::injectPacket( const std::string& path )
 {
-  auto pServerZone = m_pFw->get< World::ServerMgr >();
-  auto session = pServerZone->getSession( getId() );
+  auto& serverMgr = Common::Service< World::ServerMgr >::ref();
+  auto session = serverMgr.getSession( getId() );
   if( session )
     session->getZoneConnection()->injectPacket( path, *this );
 }
@@ -1257,8 +1258,8 @@ const uint8_t* Sapphire::Entity::Player::getGcRankArray() const
 
 void Sapphire::Entity::Player::queuePacket( Network::Packets::FFXIVPacketBasePtr pPacket )
 {
-  auto pServerZone = m_pFw->get< World::ServerMgr >();
-  auto pSession = pServerZone->getSession( m_id );
+  auto& serverMgr = Common::Service< World::ServerMgr >::ref();
+  auto pSession = serverMgr.getSession( m_id );
 
   if( !pSession )
     return;
@@ -1272,8 +1273,8 @@ void Sapphire::Entity::Player::queuePacket( Network::Packets::FFXIVPacketBasePtr
 
 void Sapphire::Entity::Player::queueChatPacket( Network::Packets::FFXIVPacketBasePtr pPacket )
 {
-  auto pServerZone = m_pFw->get< World::ServerMgr >();
-  auto pSession = pServerZone->getSession( m_id );
+  auto& serverMgr = Common::Service< World::ServerMgr >::ref();
+  auto pSession = serverMgr.getSession( m_id );
 
   if( !pSession )
     return;
@@ -1689,8 +1690,8 @@ void Sapphire::Entity::Player::sendZonePackets()
   if( isLogin() )
   {
     //Update player map in servermgr - in case player name has been changed
-    auto pServerMgr = m_pFw->get< World::ServerMgr >();
-    pServerMgr->updatePlayerName( getId(), getName() );
+    auto& serverMgr = Common::Service< World::ServerMgr >::ref();
+    serverMgr.updatePlayerName( getId(), getName() );
   }
 
   getCurrentTerritory()->onBeforePlayerZoneIn( *this );
diff --git a/src/world/Actor/PlayerEvent.cpp b/src/world/Actor/PlayerEvent.cpp
index 08f830e4..e8d79f5a 100644
--- a/src/world/Actor/PlayerEvent.cpp
+++ b/src/world/Actor/PlayerEvent.cpp
@@ -1,6 +1,7 @@
 #include <Common.h>
 #include <Logging/Logger.h>
 #include <Network/PacketContainer.h>
+#include <Service.h>
 
 #include "Network/GameConnection.h"
 #include "Network/PacketWrappers/ActorControlPacket.h"
@@ -341,8 +342,9 @@ void Sapphire::Entity::Player::eventItemActionStart( uint32_t eventId,
 
 void Sapphire::Entity::Player::onLogin()
 {
-  auto pServerMgr = m_pFw->get< Sapphire::World::ServerMgr >();
-  auto motd = pServerMgr->getConfig().motd;
+  auto& serverMgr = Common::Service< World::ServerMgr >::ref();
+
+  auto motd = serverMgr.getConfig().motd;
 
   std::istringstream ss( motd );
   std::string msg;
diff --git a/src/world/Manager/DebugCommandMgr.cpp b/src/world/Manager/DebugCommandMgr.cpp
index bba8c523..98a7480e 100644
--- a/src/world/Manager/DebugCommandMgr.cpp
+++ b/src/world/Manager/DebugCommandMgr.cpp
@@ -11,6 +11,7 @@
 #include <Database/DatabaseDef.h>
 #include <cmath>
 #include <Network/PacketWrappers/EffectPacket.h>
+#include <Service.h>
 
 #include "DebugCommand/DebugCommand.h"
 #include "DebugCommandMgr.h"
@@ -372,6 +373,8 @@ void Sapphire::World::Manager::DebugCommandMgr::set( char* data, Entity::Player&
 void Sapphire::World::Manager::DebugCommandMgr::add( char* data, Entity::Player& player,
                                                      std::shared_ptr< DebugCommand > command )
 {
+  auto& serverMgr = Common::Service< World::ServerMgr >::ref();
+
   std::string subCommand;
   std::string params = "";
 
@@ -418,9 +421,7 @@ void Sapphire::World::Manager::DebugCommandMgr::add( char* data, Entity::Player&
   }
   else if( subCommand == "bnpc" )
   {
-    auto serverZone = framework()->get< World::ServerMgr >();
-
-    auto bNpcTemplate = serverZone->getBNpcTemplate( params );
+    auto bNpcTemplate = serverMgr.getBNpcTemplate( params );
 
     if( !bNpcTemplate )
     {
@@ -577,8 +578,9 @@ void
 Sapphire::World::Manager::DebugCommandMgr::injectPacket( char* data, Entity::Player& player,
                                                          std::shared_ptr< DebugCommand > command )
 {
-  auto pServerZone = framework()->get< World::ServerMgr >();
-  auto pSession = pServerZone->getSession( player.getId() );
+  auto& serverMgr = Common::Service< World::ServerMgr >::ref();
+
+  auto pSession = serverMgr.getSession( player.getId() );
   if( pSession )
     pSession->getZoneConnection()->injectPacket( data + 7, player );
 }
@@ -586,8 +588,9 @@ Sapphire::World::Manager::DebugCommandMgr::injectPacket( char* data, Entity::Pla
 void Sapphire::World::Manager::DebugCommandMgr::injectChatPacket( char* data, Entity::Player& player,
                                                                   std::shared_ptr< DebugCommand > command )
 {
-  auto pServerZone = framework()->get< World::ServerMgr >();
-  auto pSession = pServerZone->getSession( player.getId() );
+  auto& serverMgr = Common::Service< World::ServerMgr >::ref();
+
+  auto pSession = serverMgr.getSession( player.getId() );
   if( pSession )
     pSession->getChatConnection()->injectPacket( data + 8, player );
 }
@@ -595,7 +598,8 @@ void Sapphire::World::Manager::DebugCommandMgr::injectChatPacket( char* data, En
 void Sapphire::World::Manager::DebugCommandMgr::replay( char* data, Entity::Player& player,
                                                         std::shared_ptr< DebugCommand > command )
 {
-  auto pServerZone = framework()->get< World::ServerMgr >();
+  auto& serverMgr = Common::Service< World::ServerMgr >::ref();
+
   std::string subCommand;
   std::string params = "";
 
@@ -620,19 +624,19 @@ void Sapphire::World::Manager::DebugCommandMgr::replay( char* data, Entity::Play
 
   if( subCommand == "start" )
   {
-    auto pSession = pServerZone->getSession( player.getId() );
+    auto pSession = serverMgr.getSession( player.getId() );
     if( pSession )
       pSession->startReplay( params );
   }
   else if( subCommand == "stop" )
   {
-    auto pSession = pServerZone->getSession( player.getId() );
+    auto pSession = serverMgr.getSession( player.getId() );
     if( pSession )
       pSession->stopReplay();
   }
   else if( subCommand == "info" )
   {
-    auto pSession = pServerZone->getSession( player.getId() );
+    auto pSession = serverMgr.getSession( player.getId() );
     if( pSession )
       pSession->sendReplayInfo();
   }
@@ -695,10 +699,11 @@ void
 Sapphire::World::Manager::DebugCommandMgr::serverInfo( char* data, Entity::Player& player,
                                                        std::shared_ptr< DebugCommand > command )
 {
-  auto pServerZone = framework()->get< World::ServerMgr >();
+  auto& serverMgr = Common::Service< World::ServerMgr >::ref();
+
   player.sendDebug( "SapphireZone {0} \nRev: {1}", Version::VERSION, Version::GIT_HASH );
   player.sendDebug( "Compiled: " __DATE__ " " __TIME__ );
-  player.sendDebug( "Sessions: {0}", pServerZone->getSessionCount() );
+  player.sendDebug( "Sessions: {0}", serverMgr.getSessionCount() );
 }
 
 void Sapphire::World::Manager::DebugCommandMgr::script( char* data, Entity::Player& player,
diff --git a/src/world/Manager/HousingMgr.cpp b/src/world/Manager/HousingMgr.cpp
index 43d697ee..ff3e0b39 100644
--- a/src/world/Manager/HousingMgr.cpp
+++ b/src/world/Manager/HousingMgr.cpp
@@ -10,6 +10,7 @@
 
 #include <unordered_map>
 #include <cstring>
+#include <Service.h>
 
 #include "Actor/Player.h"
 #include "Actor/EventObject.h"
@@ -310,6 +311,8 @@ Sapphire::LandPtr Sapphire::World::Manager::HousingMgr::getLandByOwnerId( uint32
 
 void Sapphire::World::Manager::HousingMgr::sendLandSignOwned( Entity::Player& player, const Common::LandIdent ident )
 {
+  auto& serverMgr = Common::Service< World::ServerMgr >::ref();
+
   player.setActiveLand( static_cast< uint8_t >( ident.landId ), static_cast< uint8_t >( ident.wardNum ) );
 
   auto landSetId = toLandSetId( static_cast< uint16_t >( ident.territoryTypeId ), static_cast< uint8_t >( ident.wardNum ) );
@@ -336,7 +339,8 @@ void Sapphire::World::Manager::HousingMgr::sendLandSignOwned( Entity::Player& pl
   }
 
   uint32_t playerId = static_cast< uint32_t >( land->getOwnerId() );
-  std::string playerName = framework()->get< World::ServerMgr >()->getPlayerNameFromDb( playerId );
+
+  std::string playerName = serverMgr.getPlayerNameFromDb( playerId );
 
   memcpy( &landInfoSignPacket->data().ownerName, playerName.c_str(), playerName.size() );
 
@@ -463,6 +467,8 @@ bool Sapphire::World::Manager::HousingMgr::relinquishLand( Entity::Player& playe
 
 void Sapphire::World::Manager::HousingMgr::sendWardLandInfo( Entity::Player& player, uint8_t wardId, uint16_t territoryTypeId )
 {
+  auto& serverMgr = Common::Service< World::ServerMgr >::ref();
+
   auto landSetId = toLandSetId( territoryTypeId, wardId );
   auto hZone = getHousingZoneByLandSetId( landSetId );
 
@@ -509,7 +515,7 @@ void Sapphire::World::Manager::HousingMgr::sendWardLandInfo( Entity::Player& pla
         entry.infoFlags |= Common::WardlandFlags::IsEstateOwned;
 
         auto owner = land->getOwnerId();
-        auto playerName = framework()->get< World::ServerMgr >()->getPlayerNameFromDb( static_cast< uint32_t >( owner ) );
+        auto playerName = serverMgr.getPlayerNameFromDb( static_cast< uint32_t >( owner ) );
         memcpy( &entry.estateOwnerName, playerName.c_str(), playerName.size() );
 
         break;
diff --git a/src/world/Manager/TerritoryMgr.cpp b/src/world/Manager/TerritoryMgr.cpp
index 916f94a6..25d7458b 100644
--- a/src/world/Manager/TerritoryMgr.cpp
+++ b/src/world/Manager/TerritoryMgr.cpp
@@ -5,6 +5,7 @@
 #include "ServerMgr.h"
 
 #include <unordered_map>
+#include <Service.h>
 
 #include "Actor/Player.h"
 
@@ -72,7 +73,8 @@ bool Sapphire::World::Manager::TerritoryMgr::init()
     return false;
   }
 
-  auto& cfg = framework()->get< World::ServerMgr >()->getConfig();
+  auto& serverMgr = Common::Service< World::ServerMgr >::ref();
+  auto& cfg = serverMgr.getConfig();
 
   m_inRangeDistance = cfg.network.inRangeDistance;
 
diff --git a/src/world/Navi/NaviProvider.cpp b/src/world/Navi/NaviProvider.cpp
index fc05f9bf..15569ba0 100644
--- a/src/world/Navi/NaviProvider.cpp
+++ b/src/world/Navi/NaviProvider.cpp
@@ -17,6 +17,7 @@
 #include <DetourCommon.h>
 #include <recastnavigation/Recast/Include/Recast.h>
 #include <filesystem>
+#include <Service.h>
 
 Sapphire::World::Navi::NaviProvider::NaviProvider( const std::string& internalName, FrameworkPtr pFw ) :
   m_naviMesh( nullptr ),
@@ -32,7 +33,8 @@ Sapphire::World::Navi::NaviProvider::NaviProvider( const std::string& internalNa
 
 bool Sapphire::World::Navi::NaviProvider::init()
 {
-  auto& cfg = m_pFw->get< Sapphire::World::ServerMgr >()->getConfig();
+  auto& serverMgr = Common::Service< World::ServerMgr >::ref();
+  auto& cfg = serverMgr.getConfig();
 
   auto meshesFolder = std::filesystem::path( cfg.navigation.meshPath );
   auto meshFolder = meshesFolder / std::filesystem::path( m_internalName );
diff --git a/src/world/Network/GameConnection.cpp b/src/world/Network/GameConnection.cpp
index fd8fa095..68ca997a 100644
--- a/src/world/Network/GameConnection.cpp
+++ b/src/world/Network/GameConnection.cpp
@@ -7,6 +7,7 @@
 #include <Network/Acceptor.h>
 #include <Network/PacketContainer.h>
 #include <Network/GamePacketParser.h>
+#include <Service.h>
 
 #include "Territory/Territory.h"
 
@@ -380,7 +381,7 @@ void Sapphire::Network::GameConnection::injectPacket( const std::string& packetp
 void Sapphire::Network::GameConnection::handlePackets( const Sapphire::Network::Packets::FFXIVARR_PACKET_HEADER& ipcHeader,
                                                        const std::vector< Sapphire::Network::Packets::FFXIVARR_PACKET_RAW >& packetData )
 {
-  auto pServerZone = m_pFw->get< World::ServerMgr >();
+  auto& serverMgr = Common::Service< World::ServerMgr >::ref();
 
   // if a session is set, update the last time it recieved a game packet
   if( m_pSession )
@@ -397,18 +398,18 @@ void Sapphire::Network::GameConnection::handlePackets( const Sapphire::Network::
         auto pCon = std::static_pointer_cast< GameConnection, Connection >( shared_from_this() );
 
         // try to retrieve the session for this id
-        auto session = pServerZone->getSession( playerId );
+        auto session = serverMgr.getSession( playerId );
 
         if( !session )
         {
           Logger::info( "[{0}] Session not registered, creating", id );
           // return;
-          if( !pServerZone->createSession( playerId ) )
+          if( !serverMgr.createSession( playerId ) )
           {
             disconnect();
             return;
           }
-          session = pServerZone->getSession( playerId );
+          session = serverMgr.getSession( playerId );
         }
           //TODO: Catch more things in lobby and send real errors
         else if( !session->isValid() || ( session->getPlayer() && session->getPlayer()->getLastPing() != 0 ) )
diff --git a/src/world/Network/Handlers/ClientTriggerHandler.cpp b/src/world/Network/Handlers/ClientTriggerHandler.cpp
index b6decf1b..374a5bf3 100644
--- a/src/world/Network/Handlers/ClientTriggerHandler.cpp
+++ b/src/world/Network/Handlers/ClientTriggerHandler.cpp
@@ -34,6 +34,7 @@
 #include "Forwards.h"
 #include "Framework.h"
 #include <Network/PacketDef/Lobby/ServerLobbyDef.h>
+#include <Service.h>
 
 using namespace Sapphire::Common;
 using namespace Sapphire::Network::Packets;
@@ -45,7 +46,8 @@ void examineHandler( Sapphire::FrameworkPtr pFw, Sapphire::Entity::Player& playe
 {
   using namespace Sapphire;
 
-  auto pSession = pFw->get< World::ServerMgr >()->getSession( targetId );
+  auto& serverMgr = Common::Service< World::ServerMgr >::ref();
+  auto pSession = serverMgr.getSession( targetId );
   if( pSession )
   {
     auto pTarget = pSession->getPlayer();
diff --git a/src/world/Network/Handlers/GMCommandHandlers.cpp b/src/world/Network/Handlers/GMCommandHandlers.cpp
index 77bd4380..d01e3a0e 100644
--- a/src/world/Network/Handlers/GMCommandHandlers.cpp
+++ b/src/world/Network/Handlers/GMCommandHandlers.cpp
@@ -8,6 +8,7 @@
 #include <Exd/ExdDataGenerated.h>
 
 #include <unordered_map>
+#include <Service.h>
 
 #include "Network/GameConnection.h"
 
@@ -594,7 +595,7 @@ void Sapphire::Network::GameConnection::gm2Handler( FrameworkPtr pFw,
   if( player.getGmRank() <= 0 )
     return;
 
-  auto pServerZone = pFw->get< World::ServerMgr >();
+  auto& serverMgr = Common::Service< World::ServerMgr >::ref();
 
   const auto packet = ZoneChannelPacket< Client::FFXIVIpcGmCommand2 >( inPacket );
 
@@ -608,7 +609,7 @@ void Sapphire::Network::GameConnection::gm2Handler( FrameworkPtr pFw,
   Logger::debug( "{0} used GM2 commandId: {1}, params: {2}, {3}, {4}, {5}, target: {6}",
                  player.getName(), commandId, param1, param2, param3, param4, target );
 
-  auto targetSession = pServerZone->getSession( target );
+  auto targetSession = serverMgr.getSession( target );
   Sapphire::Entity::CharaPtr targetActor;
 
   if( targetSession != nullptr )
diff --git a/src/world/Network/Handlers/PacketHandlers.cpp b/src/world/Network/Handlers/PacketHandlers.cpp
index 5e23045d..c2373960 100644
--- a/src/world/Network/Handlers/PacketHandlers.cpp
+++ b/src/world/Network/Handlers/PacketHandlers.cpp
@@ -15,6 +15,7 @@
 #include <unordered_map>
 #include <Network/PacketDef/Zone/ClientZoneDef.h>
 #include <Logging/Logger.h>
+#include <Service.h>
 
 #include "Network/GameConnection.h"
 
@@ -120,7 +121,8 @@ void Sapphire::Network::GameConnection::reqExamineSearchCommentHandler( Framewor
 {
 
   auto targetId = *reinterpret_cast< const uint32_t* >( &inPacket.data[ 0x10 ] );
-  auto pSession = pFw->get< World::ServerMgr >()->getSession( targetId );
+  auto& serverMgr = Common::Service< World::ServerMgr >::ref();
+  auto pSession = serverMgr.getSession( targetId );
 
   Logger::debug( "reqExamineSearchCommentHandler: {0}", targetId );
 
@@ -148,7 +150,9 @@ void Sapphire::Network::GameConnection::reqExamineFcInfo( FrameworkPtr pFw,
 {
 
   auto targetId = *reinterpret_cast< const uint32_t* >( &inPacket.data[ 0x18 ] );
-  auto pSession = pFw->get< World::ServerMgr >()->getSession( targetId );
+
+  auto& serverMgr = Common::Service< World::ServerMgr >::ref();
+  auto pSession = serverMgr.getSession( targetId );
 
   Logger::debug( "reqExamineFcInfo: {0}", targetId );
 
@@ -566,9 +570,9 @@ void Sapphire::Network::GameConnection::tellHandler( FrameworkPtr pFw,
 {
   const auto packet = ZoneChannelPacket< Client::FFXIVIpcTellHandler >( inPacket );
 
-  auto pZoneServer = pFw->get< World::ServerMgr >();
+  auto& serverMgr = Common::Service< World::ServerMgr >::ref();
 
-  auto pSession = pZoneServer->getSession( packet.data().targetPCName );
+  auto pSession = serverMgr.getSession( packet.data().targetPCName );
 
   if( !pSession )
   {
diff --git a/src/world/Script/NativeScriptMgr.cpp b/src/world/Script/NativeScriptMgr.cpp
index 2cf8fa37..b8392351 100644
--- a/src/world/Script/NativeScriptMgr.cpp
+++ b/src/world/Script/NativeScriptMgr.cpp
@@ -1,6 +1,7 @@
 #include "NativeScriptMgr.h"
 
 #include <Crypt/md5.h>
+#include <Service.h>
 #include "ServerMgr.h"
 
 #include "Framework.h"
@@ -124,8 +125,9 @@ namespace Sapphire::Scripting
   NativeScriptMgr::NativeScriptMgr( FrameworkPtr pFw  ) :
     World::Manager::BaseManager( pFw )
   {
-    auto pServerMgr = framework()->get< Sapphire::World::ServerMgr >();
-    m_loader.setCachePath( pServerMgr->getConfig().scripts.cachePath );
+    auto& serverMgr = Common::Service< Sapphire::World::ServerMgr >::ref();
+
+    m_loader.setCachePath( serverMgr.getConfig().scripts.cachePath );
   }
 
 
diff --git a/src/world/Script/ScriptMgr.cpp b/src/world/Script/ScriptMgr.cpp
index fc0a7736..0593cda1 100644
--- a/src/world/Script/ScriptMgr.cpp
+++ b/src/world/Script/ScriptMgr.cpp
@@ -2,6 +2,7 @@
 #include <Exd/ExdDataGenerated.h>
 
 #include <watchdog/Watchdog.h>
+#include <Service.h>
 
 #include "Territory/Territory.h"
 #include "Territory/InstanceContent.h"
@@ -49,9 +50,9 @@ void Sapphire::Scripting::ScriptMgr::update()
 bool Sapphire::Scripting::ScriptMgr::init()
 {
   std::set< std::string > files;
-  auto pServerMgr = framework()->get< World::ServerMgr >();
+  auto& serverMgr = Common::Service< World::ServerMgr >::ref();
 
-  auto status = loadDir( pServerMgr->getConfig().scripts.path, files, m_nativeScriptMgr->getModuleExtension() );
+  auto status = loadDir( serverMgr.getConfig().scripts.path, files, m_nativeScriptMgr->getModuleExtension() );
 
   if( !status )
   {
@@ -81,12 +82,12 @@ bool Sapphire::Scripting::ScriptMgr::init()
 
 void Sapphire::Scripting::ScriptMgr::watchDirectories()
 {
-  auto pServerMgr = framework()->get< World::ServerMgr >();
-  auto shouldWatch = pServerMgr->getConfig().scripts.hotSwap;
+  auto& serverMgr = Common::Service< World::ServerMgr >::ref();
+  auto shouldWatch = serverMgr.getConfig().scripts.hotSwap;
   if( !shouldWatch )
     return;
 
-  Watchdog::watchMany( pServerMgr->getConfig().scripts.path + "*" +
+  Watchdog::watchMany( serverMgr.getConfig().scripts.path + "*" +
                        m_nativeScriptMgr->getModuleExtension(),
                        [ this ]( const std::vector< ci::fs::path >& paths )
                        {
diff --git a/src/world/ServerMgr.cpp b/src/world/ServerMgr.cpp
index 460b8c98..5b7159ee 100644
--- a/src/world/ServerMgr.cpp
+++ b/src/world/ServerMgr.cpp
@@ -28,6 +28,7 @@
 
 #include <Database/ZoneDbConnection.h>
 #include <Database/DbWorkerPool.h>
+#include <Service.h>
 #include "Manager/LinkshellMgr.h"
 #include "Manager/TerritoryMgr.h"
 #include "Manager/HousingMgr.h"
@@ -66,20 +67,20 @@ size_t Sapphire::World::ServerMgr::getSessionCount() const
 
 bool Sapphire::World::ServerMgr::loadSettings( int32_t argc, char* argv[] )
 {
-  auto pConfig = framework()->get< Common::ConfigMgr >();
+  auto& configMgr = Common::Service< Common::ConfigMgr >::ref();
 
   Logger::info( "Loading config {0}", m_configName );
 
   bool failedLoad = false;
 
   // load global cfg first
-  if( !pConfig->loadGlobalConfig( m_config.global ) )
+  if( !configMgr.loadGlobalConfig( m_config.global ) )
   {
     Logger::fatal( "Error loading config global.ini, copying default..." );
     failedLoad = true;
   }
 
-  if( !pConfig->loadConfig( m_configName ) )
+  if( !configMgr.loadConfig( m_configName ) )
   {
     Logger::fatal( "Error loading config {0}", m_configName );
     failedLoad = true;
@@ -93,20 +94,20 @@ bool Sapphire::World::ServerMgr::loadSettings( int32_t argc, char* argv[] )
   }
 
   // load world specific config
-  m_config.scripts.hotSwap = pConfig->getValue( "Scripts", "HotSwap", true );
-  m_config.scripts.path = pConfig->getValue< std::string >( "Scripts", "Path", "./compiledscripts/" );
-  m_config.scripts.cachePath = pConfig->getValue< std::string >( "Scripts", "CachePath", "./cache/" );
+  m_config.scripts.hotSwap = configMgr.getValue( "Scripts", "HotSwap", true );
+  m_config.scripts.path = configMgr.getValue< std::string >( "Scripts", "Path", "./compiledscripts/" );
+  m_config.scripts.cachePath = configMgr.getValue< std::string >( "Scripts", "CachePath", "./cache/" );
 
-  m_config.navigation.meshPath = pConfig->getValue< std::string >( "Navigation", "MeshPath", "navi" );
+  m_config.navigation.meshPath = configMgr.getValue< std::string >( "Navigation", "MeshPath", "navi" );
 
-  m_config.network.disconnectTimeout = pConfig->getValue< uint16_t >( "Network", "DisconnectTimeout", 20 );
-  m_config.network.listenIp = pConfig->getValue< std::string >( "Network", "ListenIp", "0.0.0.0" );
-  m_config.network.listenPort = pConfig->getValue< uint16_t >( "Network", "ListenPort", 54992 );
-  m_config.network.inRangeDistance = pConfig->getValue< float >( "Network", "InRangeDistance", 80.f );
+  m_config.network.disconnectTimeout = configMgr.getValue< uint16_t >( "Network", "DisconnectTimeout", 20 );
+  m_config.network.listenIp = configMgr.getValue< std::string >( "Network", "ListenIp", "0.0.0.0" );
+  m_config.network.listenPort = configMgr.getValue< uint16_t >( "Network", "ListenPort", 54992 );
+  m_config.network.inRangeDistance = configMgr.getValue< float >( "Network", "InRangeDistance", 80.f );
 
-  m_config.motd = pConfig->getValue< std::string >( "General", "MotD", "" );
+  m_config.motd = configMgr.getValue< std::string >( "General", "MotD", "" );
 
-  m_config.housing.defaultEstateName = pConfig->getValue< std::string >( "Housing", "DefaultEstateName", "Estate #{}" );
+  m_config.housing.defaultEstateName = configMgr.getValue< std::string >( "Housing", "DefaultEstateName", "Estate #{}" );
 
   m_port = m_config.network.listenPort;
   m_ip = m_config.network.listenIp;
@@ -124,7 +125,7 @@ void Sapphire::World::ServerMgr::run( int32_t argc, char* argv[] )
   printBanner();
 
   auto pConfig = std::make_shared< Common::ConfigMgr >();
-  framework()->set< Common::ConfigMgr >( pConfig );
+  Common::Service< Common::ConfigMgr >::set( pConfig );
   if( !loadSettings( argc, argv ) )
   {
     Logger::fatal( "Unable to load settings!" );
diff --git a/src/world/Territory/Territory.cpp b/src/world/Territory/Territory.cpp
index 910a7785..07a6269f 100644
--- a/src/world/Territory/Territory.cpp
+++ b/src/world/Territory/Territory.cpp
@@ -14,6 +14,7 @@
 #include <Network/CommonActorControl.h>
 #include <Database/DatabaseDef.h>
 #include <Network/PacketWrappers/ActorControlSelfPacket.h>
+#include <Service.h>
 
 #include "Territory.h"
 #include "InstanceContent.h"
@@ -251,7 +252,6 @@ void Sapphire::Territory::pushActor( Entity::ActorPtr pActor )
       agentId = m_pNaviProvider->addAgent( *pPlayer );
     pPlayer->setAgentId( agentId );
 
-    auto pServerZone = m_pFw->get< World::ServerMgr >();
     m_playerMap[ pPlayer->getId() ] = pPlayer;
     updateCellActivity( cx, cy, 2 );
   }
@@ -319,7 +319,8 @@ void Sapphire::Territory::queuePacketForRange( Entity::Player& sourcePlayer, uin
   if( pTeriMgr->isPrivateTerritory( getTerritoryTypeId() ) )
     return;
 
-  auto pServerZone = m_pFw->get< World::ServerMgr >();
+  auto& serverMgr = Common::Service< World::ServerMgr >::ref();
+
   for( auto entry : m_playerMap )
   {
     auto player = entry.second;
@@ -329,7 +330,7 @@ void Sapphire::Territory::queuePacketForRange( Entity::Player& sourcePlayer, uin
     if( ( distance < range ) && sourcePlayer.getId() != player->getId() )
     {
 
-      auto pSession = pServerZone->getSession( player->getId() );
+      auto pSession = serverMgr.getSession( player->getId() );
       //pPacketEntry->setValAt< uint32_t >( 0x08, player->getId() );
       if( pSession )
         pSession->getZoneConnection()->queueOutPacket( pPacketEntry );
@@ -345,14 +346,15 @@ void Sapphire::Territory::queuePacketForZone( Entity::Player& sourcePlayer,
   if( pTeriMgr->isPrivateTerritory( getTerritoryTypeId() ) )
     return;
 
-  auto pServerZone = m_pFw->get< World::ServerMgr >();
+  auto& serverMgr = Common::Service< World::ServerMgr >::ref();
+
   for( auto entry : m_playerMap )
   {
     auto player = entry.second;
     if( ( sourcePlayer.getId() != player->getId() ) ||
         ( ( sourcePlayer.getId() == player->getId() ) && forSelf ) )
     {
-      auto pSession = pServerZone->getSession( player->getId() );
+      auto pSession = serverMgr.getSession( player->getId() );
       if( pSession )
         pSession->getZoneConnection()->queueOutPacket( pPacketEntry );
     }
@@ -874,9 +876,9 @@ void Sapphire::Territory::updateSpawnPoints()
     {
       if( !point->getLinkedBNpc() && ( Util::getTimeSeconds() - point->getTimeOfDeath() ) > 60 )
       {
-        auto serverZone = m_pFw->get< World::ServerMgr >();
+        auto& serverMgr = Common::Service< World::ServerMgr >::ref();
 
-        auto bNpcTemplate = serverZone->getBNpcTemplate( group.getTemplateId() );
+        auto bNpcTemplate = serverMgr.getBNpcTemplate( group.getTemplateId() );
 
         if( !bNpcTemplate )
         {
diff --git a/src/world/mainGameServer.cpp b/src/world/mainGameServer.cpp
index 2c77ea66..93f3d139 100644
--- a/src/world/mainGameServer.cpp
+++ b/src/world/mainGameServer.cpp
@@ -4,17 +4,21 @@
 #include <Framework.h>
 
 #include <Util/CrashHandler.h>
+#include <Service.h>
 
 using namespace Sapphire;
 using namespace Sapphire::World;
 
+[[maybe_unused]]
 Common::Util::CrashHandler crashHandler;
 
 int main( int32_t argc, char* argv[] )
 {
   auto pFramework = make_Framework();
   auto pServer = std::make_shared< ServerMgr >( "world.ini", pFramework );
-  pFramework->set< ServerMgr >( pServer );
+
+  Common::Service< ServerMgr >::set( pServer );
+
   pServer->run( argc, argv );
   return 0;
 }

From ca102697f45867af016ad61f1b3d945012d6c9be Mon Sep 17 00:00:00 2001
From: NotAdam <adam@notadam.me>
Date: Sun, 1 Mar 2020 01:00:57 +1100
Subject: [PATCH 269/351] move to new service locator

---
 src/api/main.cpp                              |   1 -
 src/common/Database/DbConnection.cpp          |   1 -
 src/common/Database/DbWorkerPool.cpp          |   1 -
 src/common/Framework.cpp                      |   2 -
 src/common/Framework.h                        |  37 -----
 src/common/Network/Connection.cpp             |   6 +-
 src/common/Network/Connection.h               |   7 +-
 src/lobby/ServerLobby.cpp                     |   1 -
 src/scripts/common/GilShop.cpp                |   7 +-
 src/scripts/common/aethernet/Aetheryte.cpp    |   9 +-
 .../common/aethernet/HousingAethernet.cpp     |  12 +-
 .../common/eobj/HousingEstateEntrance.cpp     |   9 +-
 .../common/housing/CmnDefHousingSignboard.cpp |   9 +-
 src/scripts/common/warptaxi/WarpTaxi.cpp      |  20 ++-
 src/scripts/quest/ManFst001.cpp               |   6 +-
 src/scripts/quest/ManFst002.cpp               |   6 +-
 src/scripts/quest/ManFst003.cpp               |   6 +-
 src/scripts/quest/ManFst004.cpp               |   6 +-
 src/scripts/quest/ManFst005.cpp               |  13 +-
 src/scripts/quest/ManSea001.cpp               |   6 +-
 src/scripts/quest/ManSea002.cpp               |   6 +-
 src/scripts/quest/ManSea003.cpp               |   6 +-
 src/scripts/quest/ManWil001.cpp               |   6 +-
 src/scripts/quest/ManWil002.cpp               |   6 +-
 src/scripts/quest/ManWil003.cpp               |   6 +-
 src/scripts/quest/ManWil004.cpp               |   6 +-
 src/scripts/quest/classquest/ClsLnc000.cpp    |   6 +-
 .../quest/subquest/gridania/SubFst001.cpp     |   6 +-
 .../quest/subquest/gridania/SubFst002.cpp     |   6 +-
 .../quest/subquest/gridania/SubFst003.cpp     |   6 +-
 .../quest/subquest/gridania/SubFst004.cpp     |   6 +-
 .../quest/subquest/gridania/SubFst005.cpp     |   6 +-
 .../quest/subquest/gridania/SubFst008.cpp     |   6 +-
 .../quest/subquest/gridania/SubFst009.cpp     |   6 +-
 .../quest/subquest/gridania/SubFst010.cpp     |   6 +-
 .../quest/subquest/gridania/SubFst011.cpp     |   6 +-
 .../quest/subquest/gridania/SubFst013.cpp     |  10 +-
 .../quest/subquest/gridania/SubFst014.cpp     |   6 +-
 .../quest/subquest/gridania/SubFst015.cpp     |   6 +-
 .../quest/subquest/gridania/SubFst019.cpp     |   6 +-
 .../quest/subquest/gridania/SubFst026.cpp     |   6 +-
 .../quest/subquest/gridania/SubFst029.cpp     |   6 +-
 .../quest/subquest/gridania/SubFst030.cpp     |   6 +-
 .../quest/subquest/gridania/SubFst034.cpp     |   6 +-
 .../quest/subquest/gridania/SubFst039.cpp     |   6 +-
 .../quest/subquest/gridania/SubFst041.cpp     |   6 +-
 .../quest/subquest/gridania/SubFst045.cpp     |   6 +-
 .../quest/subquest/limsa/SubSea001.cpp        |   6 +-
 .../quest/subquest/limsa/SubSea012.cpp        |   6 +-
 .../quest/subquest/uldah/SubWil000.cpp        |   6 +-
 .../quest/subquest/uldah/SubWil001.cpp        |   6 +-
 .../quest/subquest/uldah/SubWil002.cpp        |   6 +-
 .../quest/subquest/uldah/SubWil004.cpp        |   6 +-
 .../quest/subquest/uldah/SubWil006.cpp        |   6 +-
 .../quest/subquest/uldah/SubWil007.cpp        |  10 +-
 .../quest/subquest/uldah/SubWil018.cpp        |   6 +-
 .../quest/subquest/uldah/SubWil019.cpp        |   6 +-
 .../quest/subquest/uldah/SubWil020.cpp        |   6 +-
 .../quest/subquest/uldah/SubWil021.cpp        |   6 +-
 .../quest/subquest/uldah/SubWil022.cpp        |   6 +-
 .../quest/subquest/uldah/SubWil027.cpp        |   6 +-
 .../quest/subquest/uldah/SubWil028.cpp        |   6 +-
 .../quest/subquest/uldah/SubWil029.cpp        |   6 +-
 src/tools/quest_parser/main.cpp               |   2 +-
 src/world/Action/Action.cpp                   |  35 ++--
 src/world/Action/Action.h                     |   5 +-
 src/world/Action/EventAction.cpp              |  10 +-
 src/world/Action/EventAction.h                |   2 +-
 src/world/Action/ItemAction.cpp               |   3 +-
 src/world/Action/ItemAction.h                 |   2 +-
 src/world/Action/MountAction.cpp              |   4 +-
 src/world/Action/MountAction.h                |   2 +-
 src/world/Actor/BNpc.cpp                      |  30 ++--
 src/world/Actor/BNpc.h                        |   4 +-
 src/world/Actor/Chara.cpp                     |  14 +-
 src/world/Actor/Chara.h                       |   3 +-
 src/world/Actor/Npc.cpp                       |   5 +-
 src/world/Actor/Npc.h                         |   2 +-
 src/world/Actor/Player.cpp                    | 140 ++++++++--------
 src/world/Actor/Player.h                      |   2 +-
 src/world/Actor/PlayerEvent.cpp               |   3 +-
 src/world/Actor/PlayerInventory.cpp           |  51 +++---
 src/world/Actor/PlayerQuest.cpp               |   8 +-
 src/world/Actor/PlayerSql.cpp                 | 149 ++++++++---------
 src/world/Inventory/HousingItem.cpp           |   4 +-
 src/world/Inventory/HousingItem.h             |   2 +-
 src/world/Inventory/Item.cpp                  |  11 +-
 src/world/Inventory/Item.h                    |   3 +-
 src/world/Inventory/ItemContainer.cpp         |   9 +-
 src/world/Inventory/ItemContainer.h           |   3 +-
 src/world/Manager/ActionMgr.cpp               |  15 +-
 src/world/Manager/ActionMgr.h                 |   5 +-
 src/world/Manager/BaseManager.h               |  27 ----
 src/world/Manager/DebugCommandMgr.cpp         |  54 +++----
 src/world/Manager/DebugCommandMgr.h           |   5 +-
 src/world/Manager/EventMgr.cpp                |  30 ++--
 src/world/Manager/EventMgr.h                  |   5 +-
 src/world/Manager/HousingMgr.cpp              | 150 +++++++++---------
 src/world/Manager/HousingMgr.h                |   5 +-
 src/world/Manager/InventoryMgr.cpp            |  46 +++---
 src/world/Manager/InventoryMgr.h              |   5 +-
 src/world/Manager/ItemMgr.cpp                 |  24 ++-
 src/world/Manager/ItemMgr.h                   |   5 +-
 src/world/Manager/LinkshellMgr.cpp            |  12 +-
 src/world/Manager/LinkshellMgr.h              |   5 +-
 src/world/Manager/MarketMgr.cpp               |  13 +-
 src/world/Manager/MarketMgr.h                 |   5 +-
 src/world/Manager/NaviMgr.cpp                 |   8 +-
 src/world/Manager/NaviMgr.h                   |   9 +-
 src/world/Manager/PlayerMgr.cpp               |  28 ++--
 src/world/Manager/PlayerMgr.h                 |   5 +-
 src/world/Manager/RNGMgr.cpp                  |   3 +-
 src/world/Manager/RNGMgr.h                    |   8 +-
 src/world/Manager/ShopMgr.cpp                 |  16 +-
 src/world/Manager/ShopMgr.h                   |   5 +-
 src/world/Manager/TerritoryMgr.cpp            |  61 ++++---
 src/world/Manager/TerritoryMgr.h              |   5 +-
 src/world/Math/CalcBattle.cpp                 |   8 +-
 src/world/Math/CalcStats.cpp                  |  10 +-
 src/world/Math/CalcStats.h                    |   2 +-
 src/world/Navi/NaviProvider.cpp               |  10 +-
 src/world/Navi/NaviProvider.h                 |   3 +-
 src/world/Network/GameConnection.cpp          |  12 +-
 src/world/Network/GameConnection.h            |   7 +-
 src/world/Network/Handlers/ActionHandler.cpp  |  37 ++---
 src/world/Network/Handlers/CFHandlers.cpp     |  22 ++-
 .../Network/Handlers/ClientTriggerHandler.cpp |  94 +++++------
 src/world/Network/Handlers/EventHandlers.cpp  |  92 +++++------
 .../Network/Handlers/GMCommandHandlers.cpp    |  23 ++-
 .../Network/Handlers/InventoryHandler.cpp     |   5 +-
 src/world/Network/Handlers/PacketHandlers.cpp | 140 +++++++---------
 src/world/Script/NativeScriptApi.cpp          |  11 --
 src/world/Script/NativeScriptApi.h            |  16 --
 src/world/Script/NativeScriptMgr.cpp          |  11 +-
 src/world/Script/NativeScriptMgr.h            |   7 +-
 src/world/Script/ScriptLoader.cpp             |   2 -
 src/world/Script/ScriptMgr.cpp                |  18 +--
 src/world/Script/ScriptMgr.h                  |   5 +-
 src/world/ServerMgr.cpp                       | 100 ++++++------
 src/world/ServerMgr.h                         |   7 +-
 src/world/Session.cpp                         |   5 +-
 src/world/Session.h                           |   4 +-
 src/world/StatusEffect/StatusEffect.cpp       |  24 +--
 src/world/StatusEffect/StatusEffect.h         |   3 +-
 src/world/Territory/House.cpp                 |  13 +-
 src/world/Territory/House.h                   |   3 +-
 .../Housing/HousingInteriorTerritory.cpp      |  23 ++-
 .../Housing/HousingInteriorTerritory.h        |   3 +-
 src/world/Territory/HousingZone.cpp           |  36 ++---
 src/world/Territory/HousingZone.h             |   4 +-
 src/world/Territory/InstanceContent.cpp       |  23 ++-
 src/world/Territory/InstanceContent.h         |   3 +-
 src/world/Territory/InstanceObjectCache.cpp   |  15 +-
 src/world/Territory/InstanceObjectCache.h     |   2 +-
 src/world/Territory/Land.cpp                  |  27 ++--
 src/world/Territory/Land.h                    |   4 +-
 src/world/Territory/QuestBattle.cpp           |  39 ++---
 src/world/Territory/QuestBattle.h             |   3 +-
 src/world/Territory/Territory.cpp             |  67 ++++----
 src/world/Territory/Territory.h               |   3 +-
 src/world/mainGameServer.cpp                  |   4 +-
 161 files changed, 1053 insertions(+), 1395 deletions(-)
 delete mode 100644 src/common/Framework.cpp
 delete mode 100644 src/common/Framework.h
 delete mode 100644 src/world/Manager/BaseManager.h

diff --git a/src/api/main.cpp b/src/api/main.cpp
index 011fb509..edced26a 100644
--- a/src/api/main.cpp
+++ b/src/api/main.cpp
@@ -26,7 +26,6 @@
 #include <vector>
 #include <algorithm>
 
-#include <Framework.h>
 #include <Logging/Logger.h>
 
 #include "SapphireApi.h"
diff --git a/src/common/Database/DbConnection.cpp b/src/common/Database/DbConnection.cpp
index f03b7f9e..7013d626 100644
--- a/src/common/Database/DbConnection.cpp
+++ b/src/common/Database/DbConnection.cpp
@@ -4,7 +4,6 @@
 #include "Logging/Logger.h"
 
 #include "PreparedStatement.h"
-#include "Framework.h"
 
 Sapphire::Db::DbConnection::DbConnection( ConnectionInfo& connInfo ) :
   m_reconnecting( false ),
diff --git a/src/common/Database/DbWorkerPool.cpp b/src/common/Database/DbWorkerPool.cpp
index 81b9d96d..09a24bfb 100644
--- a/src/common/Database/DbWorkerPool.cpp
+++ b/src/common/Database/DbWorkerPool.cpp
@@ -5,7 +5,6 @@
 #include "StatementTask.h"
 #include "Operation.h"
 #include "ZoneDbConnection.h"
-#include "Framework.h"
 
 #include "Logging/Logger.h"
 #include <mysql.h>
diff --git a/src/common/Framework.cpp b/src/common/Framework.cpp
deleted file mode 100644
index 7243f69b..00000000
--- a/src/common/Framework.cpp
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "Framework.h"
-#include "Logging/Logger.h"
diff --git a/src/common/Framework.h b/src/common/Framework.h
deleted file mode 100644
index 5714bdb3..00000000
--- a/src/common/Framework.h
+++ /dev/null
@@ -1,37 +0,0 @@
-#ifndef _CORE_FRAMEWORK_H
-#define _CORE_FRAMEWORK_H
-
-#include <map>
-#include <typeindex>
-#include <typeinfo>
-#include <memory>
-#include <cassert>
-
-namespace Sapphire
-{
-
-  class Framework
-  {
-    using TypenameToObject = std::map< std::type_index, std::shared_ptr< void > >;
-    TypenameToObject ObjectMap;
-
-  public:
-    template< typename T >
-    std::shared_ptr< T > get()
-    {
-      auto iType = ObjectMap.find( typeid( T ) );
-      assert( !( iType == ObjectMap.end() ) );
-      return std::static_pointer_cast< T >( iType->second );
-    }
-
-    template< typename T >
-    void set( std::shared_ptr< T > value )
-    {
-      assert( value ); // why would anyone store nullptrs....
-      ObjectMap[ typeid( T ) ] = value;
-    }
-  };
-
-}
-
-#endif // _CORE_FRAMEWORK_H
diff --git a/src/common/Network/Connection.cpp b/src/common/Network/Connection.cpp
index 1bc9054a..a2e71f38 100644
--- a/src/common/Network/Connection.cpp
+++ b/src/common/Network/Connection.cpp
@@ -1,17 +1,15 @@
 #include "Connection.h"
 #include "Hive.h"
 #include <functional>
-#include "Framework.h"
 
 using namespace Sapphire;
 
-Network::Connection::Connection( HivePtr hive, FrameworkPtr pFw ) :
+Network::Connection::Connection( HivePtr hive ) :
   m_hive( hive ),
   m_socket( hive->getService() ),
   m_io_strand( hive->getService() ),
   m_receive_buffer_size( 32000 ),
-  m_error_state( 0 ),
-  m_pFw( pFw )
+  m_error_state( 0 )
 {
 }
 
diff --git a/src/common/Network/Connection.h b/src/common/Network/Connection.h
index ef5c4070..91f86aea 100644
--- a/src/common/Network/Connection.h
+++ b/src/common/Network/Connection.h
@@ -35,9 +35,8 @@ namespace Sapphire::Network
     std::list< std::vector< uint8_t > > m_pending_sends;
     int32_t m_receive_buffer_size;
     std::atomic< uint32_t > m_error_state;
-    FrameworkPtr m_pFw;
 
-    Connection( HivePtr hive, FrameworkPtr pFw );
+    Connection( HivePtr hive );
 
     virtual ~Connection();
 
@@ -141,13 +140,13 @@ namespace Sapphire::Network
   //-----------------------------------------------------------------------------
 
   template< class T >
-  std::shared_ptr< T > addServerToHive( const std::string& listenIp, uint32_t port, HivePtr pHive, FrameworkPtr pFw )
+  std::shared_ptr< T > addServerToHive( const std::string& listenIp, uint32_t port, HivePtr pHive )
   {
     try
     {
       AcceptorPtr acceptor( new Acceptor( pHive ) );
       acceptor->listen( listenIp, port );
-      std::shared_ptr< T > connection( new T( pHive, acceptor, pFw ) );
+      std::shared_ptr< T > connection( new T( pHive, acceptor ) );
       acceptor->accept( connection );
       return connection;
     }
diff --git a/src/lobby/ServerLobby.cpp b/src/lobby/ServerLobby.cpp
index b85380c9..1ad5e068 100644
--- a/src/lobby/ServerLobby.cpp
+++ b/src/lobby/ServerLobby.cpp
@@ -10,7 +10,6 @@
 #include <Logging/Logger.h>
 #include <Config/ConfigMgr.h>
 
-#include "Framework.h"
 
 #include "ServerLobby.h"
 
diff --git a/src/scripts/common/GilShop.cpp b/src/scripts/common/GilShop.cpp
index 8e7afe0e..93b93d9f 100644
--- a/src/scripts/common/GilShop.cpp
+++ b/src/scripts/common/GilShop.cpp
@@ -1,8 +1,8 @@
 #include <ScriptObject.h>
 #include <Actor/Player.h>
 
-#include <Framework.h>
 #include <Manager/ShopMgr.h>
+#include <Service.h>
 
 using namespace Sapphire;
 
@@ -31,9 +31,10 @@ private:
       // buy
       if( result.param2 == 1 )
       {
-        auto shopMgr = framework()->get< Sapphire::World::Manager::ShopMgr >();
+        auto& shopMgr = Common::Service< Sapphire::World::Manager::ShopMgr >::ref();
 
-        shopMgr->purchaseGilShopItem( player, result.eventId, result.param3, result.param4 );
+
+        shopMgr.purchaseGilShopItem( player, result.eventId, result.param3, result.param4 );
       }
 
       // sell
diff --git a/src/scripts/common/aethernet/Aetheryte.cpp b/src/scripts/common/aethernet/Aetheryte.cpp
index d7267d20..d4c1c68c 100644
--- a/src/scripts/common/aethernet/Aetheryte.cpp
+++ b/src/scripts/common/aethernet/Aetheryte.cpp
@@ -1,9 +1,8 @@
 #include <ScriptObject.h>
 #include <Actor/Player.h>
 
-#include <Framework.h>
 #include <Exd/ExdDataGenerated.h>
-
+#include <Service.h>
 
 
 using namespace Sapphire;
@@ -109,11 +108,9 @@ public:
 
   void onTalk( uint32_t eventId, Entity::Player& player, uint64_t actorId ) override
   {
-    auto pExdData = framework()->get< Sapphire::Data::ExdDataGenerated >();
-    if( !pExdData )
-      return;
+    auto exdData = Common::Service< Sapphire::Data::ExdDataGenerated >::ref();
 
-    auto aetherInfo = pExdData->get< Sapphire::Data::Aetheryte >( eventId & 0xFFFF );
+    auto aetherInfo = exdData.get< Sapphire::Data::Aetheryte >( eventId & 0xFFFF );
     if( !aetherInfo )
       return;
 
diff --git a/src/scripts/common/aethernet/HousingAethernet.cpp b/src/scripts/common/aethernet/HousingAethernet.cpp
index 5fcbbd04..1af780ad 100644
--- a/src/scripts/common/aethernet/HousingAethernet.cpp
+++ b/src/scripts/common/aethernet/HousingAethernet.cpp
@@ -1,10 +1,10 @@
 #include <ScriptObject.h>
 #include <Actor/Player.h>
 
-#include <Framework.h>
 #include <Exd/ExdDataGenerated.h>
 #include <Territory/HousingZone.h>
 #include <Manager/PlayerMgr.h>
+#include <Service.h>
 
 using namespace Sapphire;
 
@@ -21,16 +21,14 @@ public:
   {
     player.playScene( eventId, 0, HIDE_HOTBAR | NO_DEFAULT_CAMERA, [this, eventId]( Entity::Player& player, const Event::SceneResult& result )
     {
-      auto pExdData = framework()->get< Sapphire::Data::ExdDataGenerated >();
-      if( !pExdData )
-        return;
+      auto& exdData = Common::Service< Sapphire::Data::ExdDataGenerated >::ref();
 
       auto housingZone = std::dynamic_pointer_cast< HousingZone >( player.getCurrentTerritory() );
       if( !housingZone )
         return;
 
       // param2 is the index starting from 0 inside housingaethernet.exd, but the ID column starts at 0x001E0000........ wtf
-      auto pHousingAethernet = pExdData->get< Sapphire::Data::HousingAethernet >( getId() + result.param2 );
+      auto pHousingAethernet = exdData.get< Sapphire::Data::HousingAethernet >( getId() + result.param2 );
       if( !pHousingAethernet )
         return;
 
@@ -42,8 +40,8 @@ public:
       // moving a player inside an event will crash the game so we end it here
       player.eventFinish( eventId, 1 );
 
-      auto playerMgr = framework()->get< Sapphire::World::Manager::PlayerMgr >();
-      playerMgr->movePlayerToLandDestination( player, pHousingAethernet->level, housingZone->getWardNum() );
+      auto& playerMgr = Common::Service< Sapphire::World::Manager::PlayerMgr >::ref();
+      playerMgr.movePlayerToLandDestination( player, pHousingAethernet->level, housingZone->getWardNum() );
     } );
   }
 };
diff --git a/src/scripts/common/eobj/HousingEstateEntrance.cpp b/src/scripts/common/eobj/HousingEstateEntrance.cpp
index e0447f31..2abc371b 100644
--- a/src/scripts/common/eobj/HousingEstateEntrance.cpp
+++ b/src/scripts/common/eobj/HousingEstateEntrance.cpp
@@ -1,11 +1,11 @@
 #include <ScriptObject.h>
 #include <Actor/Player.h>
+#include <Service.h>
 
 #include "Actor/EventObject.h"
 #include "Territory/HousingZone.h"
 #include "Manager/TerritoryMgr.h"
 #include "Territory/Land.h"
-#include "Framework.h"
 
 using namespace Sapphire;
 
@@ -26,9 +26,7 @@ public:
       if( result.param2 != 1 )
         return;
 
-      auto terriMgr = framework()->get< Sapphire::World::Manager::TerritoryMgr >();
-      if( !terriMgr )
-        return;
+      auto& terriMgr = Common::Service< Sapphire::World::Manager::TerritoryMgr >::ref();
 
       auto zone = std::dynamic_pointer_cast< HousingZone >( player.getCurrentTerritory() );
       if( !zone )
@@ -40,7 +38,7 @@ public:
       ident.wardNum = zone->getWardNum();
       ident.worldId = 67;
 
-      auto internalZone = terriMgr->findOrCreateHousingInterior( ident );
+      auto internalZone = terriMgr.findOrCreateHousingInterior( ident );
       if( !internalZone )
       {
         // an error occurred during event movement
@@ -60,6 +58,7 @@ public:
 
       switch( land->getSize() )
       {
+        // todo: think there's actually a poprange for this? double czech
         case 0:
         {
           pos = { 0.1321167f, 0.f, 2.746273f };
diff --git a/src/scripts/common/housing/CmnDefHousingSignboard.cpp b/src/scripts/common/housing/CmnDefHousingSignboard.cpp
index 21f13046..3de38035 100644
--- a/src/scripts/common/housing/CmnDefHousingSignboard.cpp
+++ b/src/scripts/common/housing/CmnDefHousingSignboard.cpp
@@ -5,7 +5,7 @@
 #include <Network/PacketWrappers/ActorControlSelfPacket.h>
 #include <Network/CommonActorControl.h>
 #include <Exd/ExdDataGenerated.h>
-#include "Framework.h"
+#include <Service.h>
 
 
 using namespace Sapphire;
@@ -25,9 +25,6 @@ public:
   {
     auto callback = [ this ]( Entity::Player& player, const Event::SceneResult& result )
     {
-      auto pFw = framework();
-      if( !pFw )
-        return LandPurchaseResult::ERR_INTERNAL;
       // Purchase Land
       if( result.param2 == 2 )
       {
@@ -36,9 +33,9 @@ public:
 
         auto pTerritory = player.getCurrentTerritory();
         auto pHousing = std::dynamic_pointer_cast< HousingZone >( pTerritory );
-        auto pHouMgr = pFw->get< HousingMgr >();
+        auto& pHouMgr = Common::Service< HousingMgr >::ref();
 
-        LandPurchaseResult res = pHouMgr->purchaseLand( player, activeLand.plot,
+        LandPurchaseResult res = pHouMgr.purchaseLand( player, activeLand.plot,
                                                         static_cast< uint8_t >( result.param2 ) );
 
         switch( res )
diff --git a/src/scripts/common/warptaxi/WarpTaxi.cpp b/src/scripts/common/warptaxi/WarpTaxi.cpp
index dbf3b58d..c4eb8907 100644
--- a/src/scripts/common/warptaxi/WarpTaxi.cpp
+++ b/src/scripts/common/warptaxi/WarpTaxi.cpp
@@ -7,8 +7,8 @@
 #include "Territory/InstanceObjectCache.h"
 
 #include <Exd/ExdDataGenerated.h>
-#include <Framework.h>
 #include <Manager/PlayerMgr.h>
+#include <Service.h>
 
 using namespace Sapphire;
 
@@ -32,16 +32,16 @@ public:
       player.eventFinish( 1310721, 0 );
       player.eventFinish( getId(), 1 );
 
-      auto exdData = framework()->get< Sapphire::Data::ExdDataGenerated >();
-      auto pPopRange = framework()->get< Sapphire::InstanceObjectCache >();
+      auto& exdData = Common::Service< Data::ExdDataGenerated >::ref();
+      auto& popRange = Common::Service< Sapphire::InstanceObjectCache >::ref();
 
-      auto warp = exdData->get< Sapphire::Data::Warp >( getId() );
+      auto warp = exdData.get< Sapphire::Data::Warp >( getId() );
       if( !warp )
         return;
 
-      auto playerMgr = framework()->get< Sapphire::World::Manager::PlayerMgr >();
+      auto& playerMgr = Common::Service< Sapphire::World::Manager::PlayerMgr >::ref();
 
-      auto pPop = pPopRange->getPopRange( warp->territoryType, warp->popRange );
+      auto pPop = popRange.getPopRange( warp->territoryType, warp->popRange );
 
       if( !pPop )
       {
@@ -52,7 +52,7 @@ public:
         std::cout << "found!!";
       }
 
-      playerMgr->movePlayerToLandDestination( player, warp->popRange, result.param3 );
+      playerMgr.movePlayerToLandDestination( player, warp->popRange, result.param3 );
     }
     else
     {
@@ -75,11 +75,9 @@ public:
 
   void onTalk( uint32_t eventId, Entity::Player& player, uint64_t actorId ) override
   {
-    auto exdData = framework()->get< Sapphire::Data::ExdDataGenerated >();
-    if( !exdData )
-      return;
+    auto exdData = Common::Service< Sapphire::Data::ExdDataGenerated >::ref();
 
-    auto warp = exdData->get< Sapphire::Data::Warp >( eventId );
+    auto warp = exdData.get< Sapphire::Data::Warp >( eventId );
     if( !warp )
       return;
 
diff --git a/src/scripts/quest/ManFst001.cpp b/src/scripts/quest/ManFst001.cpp
index 1411a0d9..d21feff1 100644
--- a/src/scripts/quest/ManFst001.cpp
+++ b/src/scripts/quest/ManFst001.cpp
@@ -2,7 +2,7 @@
 #include <ScriptObject.h>
 #include "Manager/EventMgr.h"
 #include "Event/EventHandler.h"
-#include "Framework.h"
+#include <Service.h>
 
 // Quest Script: ManFst001_00039
 // Quest Name: Coming to Gridania
@@ -96,8 +96,8 @@ public:
 
   void onTalk( uint32_t eventId, Entity::Player& player, uint64_t actorId ) override
   {
-    auto pEventMgr = m_framework->get< World::Manager::EventMgr >();
-    auto actor = pEventMgr->mapEventActorToRealActor( static_cast< uint32_t >( actorId ) );
+    auto pEventMgr = Common::Service< World::Manager::EventMgr >::ref();
+    auto actor = pEventMgr.mapEventActorToRealActor( static_cast< uint32_t >( actorId ) );
 
     if( actor == ACTOR0 )
       Scene00000( player );
diff --git a/src/scripts/quest/ManFst002.cpp b/src/scripts/quest/ManFst002.cpp
index e7a2b364..a12c0929 100644
--- a/src/scripts/quest/ManFst002.cpp
+++ b/src/scripts/quest/ManFst002.cpp
@@ -2,7 +2,7 @@
 #include <ScriptObject.h>
 #include "Event/EventHandler.h"
 #include "Manager/EventMgr.h"
-#include "Framework.h"
+#include <Service.h>
 
 // Quest Script: ManFst002_00124
 // Quest Name: Close to Home
@@ -193,8 +193,8 @@ public:
 
   void onTalk( uint32_t eventId, Entity::Player& player, uint64_t actorId ) override
   {
-    auto pEventMgr = m_framework->get< World::Manager::EventMgr >();
-    auto actor = pEventMgr->mapEventActorToRealActor( static_cast< uint32_t >( actorId ) );
+    auto pEventMgr = Common::Service< World::Manager::EventMgr >::ref();
+    auto actor = pEventMgr.mapEventActorToRealActor( static_cast< uint32_t >( actorId ) );
 
     if( actor == ACTOR0 )
       Scene00000( player );
diff --git a/src/scripts/quest/ManFst003.cpp b/src/scripts/quest/ManFst003.cpp
index f9725a64..5cb09efc 100644
--- a/src/scripts/quest/ManFst003.cpp
+++ b/src/scripts/quest/ManFst003.cpp
@@ -1,7 +1,7 @@
 #include <Actor/Player.h>
 #include "Manager/EventMgr.h"
 #include <ScriptObject.h>
-#include "Framework.h"
+#include <Service.h>
 
 // Quest Script: ManFst003_00123
 // Quest Name: Close to Home
@@ -82,8 +82,8 @@ public:
 
   void onTalk( uint32_t eventId, Entity::Player& player, uint64_t actorId ) override
   {
-    auto pEventMgr = m_framework->get< World::Manager::EventMgr >();
-    auto actor = pEventMgr->mapEventActorToRealActor( static_cast< uint32_t >( actorId ) );
+    auto pEventMgr = Common::Service< World::Manager::EventMgr >::ref();
+    auto actor = pEventMgr.mapEventActorToRealActor( static_cast< uint32_t >( actorId ) );
 
     if( actor == Actor0 )
     {
diff --git a/src/scripts/quest/ManFst004.cpp b/src/scripts/quest/ManFst004.cpp
index 6ec0b56a..cbb04d36 100644
--- a/src/scripts/quest/ManFst004.cpp
+++ b/src/scripts/quest/ManFst004.cpp
@@ -1,7 +1,7 @@
 #include <Actor/Player.h>
 #include "Manager/EventMgr.h"
 #include <ScriptObject.h>
-#include "Framework.h"
+#include <Service.h>
 
 // Quest Script: ManFst004_00124
 // Quest Name: Close to Home
@@ -80,8 +80,8 @@ public:
 
   void onTalk( uint32_t eventId, Entity::Player& player, uint64_t actorId ) override
   {
-    auto pEventMgr = m_framework->get< World::Manager::EventMgr >();
-    auto actor = pEventMgr->mapEventActorToRealActor( static_cast< uint32_t >( actorId ) );
+    auto pEventMgr = Common::Service< World::Manager::EventMgr >::ref();
+    auto actor = pEventMgr.mapEventActorToRealActor( static_cast< uint32_t >( actorId ) );
 
     if( actor == ManFst004::Actor0 )
     {
diff --git a/src/scripts/quest/ManFst005.cpp b/src/scripts/quest/ManFst005.cpp
index 1089248b..d98391ce 100644
--- a/src/scripts/quest/ManFst005.cpp
+++ b/src/scripts/quest/ManFst005.cpp
@@ -2,7 +2,7 @@
 #include "Manager/EventMgr.h"
 #include "Manager/TerritoryMgr.h"
 #include <ScriptObject.h>
-#include "Framework.h"
+#include <Service.h>
 
 // Quest Script: ManFst005_00445
 // Quest Name: Chasing Shadows
@@ -61,8 +61,8 @@ class ManFst005 : public Sapphire::ScriptAPI::EventScript
    // Event Handlers
    void onTalk( uint32_t eventId, Entity::Player& player, uint64_t actorId ) override
    {
-     auto pEventMgr = m_framework->get< World::Manager::EventMgr >();
-     auto actor = pEventMgr->mapEventActorToRealActor( static_cast< uint32_t >( actorId ) );
+     auto pEventMgr = Common::Service< World::Manager::EventMgr >::ref();
+     auto actor = pEventMgr.mapEventActorToRealActor( static_cast< uint32_t >( actorId ) );
 
      if( actor == Actor0 )
      {
@@ -142,11 +142,10 @@ class ManFst005 : public Sapphire::ScriptAPI::EventScript
                        {
                          if( result.param2 == 1 )
                          {
-                           auto pTeriMgr = framework()->get< Sapphire::World::Manager::TerritoryMgr >();
-                           if( !pTeriMgr )
-                             return;
+                           auto& pTeriMgr = Common::Service< Sapphire::World::Manager::TerritoryMgr >::ref();
+
                            player.eventFinish( result.eventId, 0 );
-                           pTeriMgr->createAndJoinQuestBattle( player, Questbattle0 );
+                           pTeriMgr.createAndJoinQuestBattle( player, Questbattle0 );
                          }
                        } );
    }
diff --git a/src/scripts/quest/ManSea001.cpp b/src/scripts/quest/ManSea001.cpp
index 0c54a0e7..b86751cb 100644
--- a/src/scripts/quest/ManSea001.cpp
+++ b/src/scripts/quest/ManSea001.cpp
@@ -1,7 +1,7 @@
 #include <Actor/Player.h>
 #include "Manager/EventMgr.h"
 #include <ScriptObject.h>
-#include "Framework.h"
+#include <Service.h>
 
 // Quest Script: ManSea001_00107
 // Quest Name: Coming to Limsa Lominsa
@@ -142,8 +142,8 @@ public:
 
   void onTalk( uint32_t eventId, Entity::Player& player, uint64_t actorId ) override
   {
-    auto pEventMgr = m_framework->get< World::Manager::EventMgr >();
-    auto actor = pEventMgr->mapEventActorToRealActor( static_cast< uint32_t >( actorId ) );
+    auto pEventMgr = Common::Service< World::Manager::EventMgr >::ref();
+    auto actor = pEventMgr.mapEventActorToRealActor( static_cast< uint32_t >( actorId ) );
 
     if( actor == ACTOR0 )
       Scene00000( player );
diff --git a/src/scripts/quest/ManSea002.cpp b/src/scripts/quest/ManSea002.cpp
index e6153df2..02e1be2e 100644
--- a/src/scripts/quest/ManSea002.cpp
+++ b/src/scripts/quest/ManSea002.cpp
@@ -1,7 +1,7 @@
 #include <Actor/Player.h>
 #include "Manager/EventMgr.h"
 #include <ScriptObject.h>
-#include "Framework.h"
+#include <Service.h>
 
 // Quest Script: ManSea002_00108
 // Quest Name: Close to Home
@@ -48,8 +48,8 @@ public:
 
   void onTalk( uint32_t eventId, Entity::Player& player, uint64_t actorId ) override
   {
-    auto pEventMgr = m_framework->get< World::Manager::EventMgr >();
-    auto actor = pEventMgr->mapEventActorToRealActor( static_cast< uint32_t >( actorId ) );
+    auto pEventMgr = Common::Service< World::Manager::EventMgr >::ref();
+    auto actor = pEventMgr.mapEventActorToRealActor( static_cast< uint32_t >( actorId ) );
 
     if( actor == ACTOR0 )
     {
diff --git a/src/scripts/quest/ManSea003.cpp b/src/scripts/quest/ManSea003.cpp
index 2c9d712a..4b65a1a9 100644
--- a/src/scripts/quest/ManSea003.cpp
+++ b/src/scripts/quest/ManSea003.cpp
@@ -1,7 +1,7 @@
 #include <Actor/Player.h>
 #include "Manager/EventMgr.h"
 #include <ScriptObject.h>
-#include "Framework.h"
+#include <Service.h>
 
 // Quest Script: ManSea003_00109
 // Quest Name: Close to Home
@@ -64,8 +64,8 @@ public:
 
   void onTalk( uint32_t eventId, Entity::Player& player, uint64_t actorId ) override
   {
-    auto pEventMgr = m_framework->get< World::Manager::EventMgr >();
-    auto actor = pEventMgr->mapEventActorToRealActor( static_cast< uint32_t >( actorId ) );
+    auto pEventMgr = Common::Service< World::Manager::EventMgr >::ref();
+    auto actor = pEventMgr.mapEventActorToRealActor( static_cast< uint32_t >( actorId ) );
 
     if( actor == Actor0 )
     {
diff --git a/src/scripts/quest/ManWil001.cpp b/src/scripts/quest/ManWil001.cpp
index 55fa454e..db4e804b 100644
--- a/src/scripts/quest/ManWil001.cpp
+++ b/src/scripts/quest/ManWil001.cpp
@@ -1,7 +1,7 @@
 #include <Actor/Player.h>
 #include "Manager/EventMgr.h"
 #include <ScriptObject.h>
-#include "Framework.h"
+#include <Service.h>
 
 // Quest Script: ManWil001_00594
 // Quest Name: Coming to Ul'dah
@@ -174,8 +174,8 @@ public:
 
   void onTalk( uint32_t eventId, Entity::Player& player, uint64_t actorId ) override
   {
-    auto pEventMgr = m_framework->get< World::Manager::EventMgr >();
-    auto actor = pEventMgr->mapEventActorToRealActor( static_cast< uint32_t >( actorId ) );
+    auto pEventMgr = Common::Service< World::Manager::EventMgr >::ref();
+    auto actor = pEventMgr.mapEventActorToRealActor( static_cast< uint32_t >( actorId ) );
 
     if( actor == ACTOR0 )
     {
diff --git a/src/scripts/quest/ManWil002.cpp b/src/scripts/quest/ManWil002.cpp
index 3c9a24bc..bb8cdae2 100644
--- a/src/scripts/quest/ManWil002.cpp
+++ b/src/scripts/quest/ManWil002.cpp
@@ -1,7 +1,7 @@
 #include <Actor/Player.h>
 #include <Manager/EventMgr.h>
 #include <ScriptObject.h>
-#include "Framework.h"
+#include <Service.h>
 
 // Quest Script: ManWil002_00568
 // Quest Name: Close to Home
@@ -70,8 +70,8 @@ public:
 
   void onTalk( uint32_t eventId, Entity::Player& player, uint64_t actorId ) override
   {
-    auto pEventMgr = m_framework->get< World::Manager::EventMgr >();
-    auto actor = pEventMgr->mapEventActorToRealActor( static_cast< uint32_t >( actorId ) );
+    auto pEventMgr = Common::Service< World::Manager::EventMgr >::ref();
+    auto actor = pEventMgr.mapEventActorToRealActor( static_cast< uint32_t >( actorId ) );
 
     if( actor == Actor0 )
     {
diff --git a/src/scripts/quest/ManWil003.cpp b/src/scripts/quest/ManWil003.cpp
index 1380b9c0..3b577cdd 100644
--- a/src/scripts/quest/ManWil003.cpp
+++ b/src/scripts/quest/ManWil003.cpp
@@ -1,7 +1,7 @@
 #include <Actor/Player.h>
 #include <Manager/EventMgr.h>
 #include <ScriptObject.h>
-#include "Framework.h"
+#include <Service.h>
 
 // Quest Script: ManWil003_00569
 // Quest Name: Close to Home
@@ -70,8 +70,8 @@ public:
 
   void onTalk( uint32_t eventId, Entity::Player& player, uint64_t actorId ) override
   {
-    auto pEventMgr = m_framework->get< World::Manager::EventMgr >();
-    auto actor = pEventMgr->mapEventActorToRealActor( static_cast< uint32_t >( actorId ) );
+    auto pEventMgr = Common::Service< World::Manager::EventMgr >::ref();
+    auto actor = pEventMgr.mapEventActorToRealActor( static_cast< uint32_t >( actorId ) );
 
     if( actor == Actor0 )
     {
diff --git a/src/scripts/quest/ManWil004.cpp b/src/scripts/quest/ManWil004.cpp
index aaa3b757..4d3e006f 100644
--- a/src/scripts/quest/ManWil004.cpp
+++ b/src/scripts/quest/ManWil004.cpp
@@ -1,7 +1,7 @@
 #include <Actor/Player.h>
 #include <Manager/EventMgr.h>
 #include <ScriptObject.h>
-#include "Framework.h"
+#include <Service.h>
 
 // Quest Script: ManWil004_00570
 // Quest Name: Close to Home
@@ -70,8 +70,8 @@ public:
 
   void onTalk( uint32_t eventId, Entity::Player& player, uint64_t actorId ) override
   {
-    auto pEventMgr = m_framework->get< World::Manager::EventMgr >();
-    auto actor = pEventMgr->mapEventActorToRealActor( static_cast< uint32_t >( actorId ) );
+    auto pEventMgr = Common::Service< World::Manager::EventMgr >::ref();
+    auto actor = pEventMgr.mapEventActorToRealActor( static_cast< uint32_t >( actorId ) );
 
     if( actor == Actor0 )
     {
diff --git a/src/scripts/quest/classquest/ClsLnc000.cpp b/src/scripts/quest/classquest/ClsLnc000.cpp
index 9cddc7a6..a73330a5 100644
--- a/src/scripts/quest/classquest/ClsLnc000.cpp
+++ b/src/scripts/quest/classquest/ClsLnc000.cpp
@@ -1,7 +1,7 @@
 #include <Actor/Player.h>
 #include "Manager/EventMgr.h"
 #include <ScriptObject.h>
-#include "Framework.h"
+#include <Service.h>
 
 using namespace Sapphire;
 
@@ -57,8 +57,8 @@ class ClsLnc000 : public Sapphire::ScriptAPI::EventScript
   // Event Handlers
   void onTalk( uint32_t eventId, Entity::Player& player, uint64_t actorId ) override
   {
-    auto pEventMgr = framework()->get< World::Manager::EventMgr >();
-    auto actor = pEventMgr->mapEventActorToRealActor( static_cast< uint32_t >( actorId ) );
+    auto pEventMgr = Common::Service< World::Manager::EventMgr >::ref();
+    auto actor = pEventMgr.mapEventActorToRealActor( static_cast< uint32_t >( actorId ) );
 
     if( actor == Actor0 )
     {
diff --git a/src/scripts/quest/subquest/gridania/SubFst001.cpp b/src/scripts/quest/subquest/gridania/SubFst001.cpp
index aa7ffdef..5dc93336 100644
--- a/src/scripts/quest/subquest/gridania/SubFst001.cpp
+++ b/src/scripts/quest/subquest/gridania/SubFst001.cpp
@@ -1,7 +1,7 @@
 #include <Actor/Player.h>
 #include "Manager/EventMgr.h"
 #include <ScriptObject.h>
-#include "Framework.h"
+#include <Service.h>
 
 using namespace Sapphire;
 
@@ -73,8 +73,8 @@ public:
 
   void onTalk( uint32_t eventId, Entity::Player& player, uint64_t actorId ) override
   {
-    auto pEventMgr = m_framework->get< World::Manager::EventMgr >();
-    auto actor = pEventMgr->mapEventActorToRealActor( static_cast< uint32_t >( actorId ) );
+    auto pEventMgr = Common::Service< World::Manager::EventMgr >::ref();
+    auto actor = pEventMgr.mapEventActorToRealActor( static_cast< uint32_t >( actorId ) );
 
     if( actor == ACTOR0 )
     {
diff --git a/src/scripts/quest/subquest/gridania/SubFst002.cpp b/src/scripts/quest/subquest/gridania/SubFst002.cpp
index e3d0661c..630f2c31 100644
--- a/src/scripts/quest/subquest/gridania/SubFst002.cpp
+++ b/src/scripts/quest/subquest/gridania/SubFst002.cpp
@@ -1,7 +1,7 @@
 #include <Actor/Player.h>
 #include "Manager/EventMgr.h"
 #include <ScriptObject.h>
-#include "Framework.h"
+#include <Service.h>
 
 using namespace Sapphire;
 
@@ -59,8 +59,8 @@ public:
 
   void onTalk( uint32_t eventId, Entity::Player& player, uint64_t actorId ) override
   {
-    auto pEventMgr = m_framework->get< World::Manager::EventMgr >();
-    auto actor = pEventMgr->mapEventActorToRealActor( static_cast< uint32_t >( actorId ) );
+    auto pEventMgr = Common::Service< World::Manager::EventMgr >::ref();
+    auto actor = pEventMgr.mapEventActorToRealActor( static_cast< uint32_t >( actorId ) );
 
     if( actor == ACTOR0 && !player.hasQuest( getId() ) )
       Scene00000( player );
diff --git a/src/scripts/quest/subquest/gridania/SubFst003.cpp b/src/scripts/quest/subquest/gridania/SubFst003.cpp
index 84bc9655..87d4ff4e 100644
--- a/src/scripts/quest/subquest/gridania/SubFst003.cpp
+++ b/src/scripts/quest/subquest/gridania/SubFst003.cpp
@@ -1,7 +1,7 @@
 #include <Actor/Player.h>
 #include <Manager/EventMgr.h>
 #include <ScriptObject.h>
-#include "Framework.h"
+#include <Service.h>
 
 using namespace Sapphire;
 
@@ -52,8 +52,8 @@ public:
 
   void onTalk( uint32_t eventId, Entity::Player& player, uint64_t actorId ) override
   {
-    auto pEventMgr = m_framework->get< World::Manager::EventMgr >();
-    auto actor = pEventMgr->mapEventActorToRealActor( static_cast< uint32_t >( actorId ) );
+    auto pEventMgr = Common::Service< World::Manager::EventMgr >::ref();
+    auto actor = pEventMgr.mapEventActorToRealActor( static_cast< uint32_t >( actorId ) );
 
     if( actor == Actor0 )
     {
diff --git a/src/scripts/quest/subquest/gridania/SubFst004.cpp b/src/scripts/quest/subquest/gridania/SubFst004.cpp
index aa6b65f4..ce559431 100644
--- a/src/scripts/quest/subquest/gridania/SubFst004.cpp
+++ b/src/scripts/quest/subquest/gridania/SubFst004.cpp
@@ -1,7 +1,7 @@
 #include <Actor/Player.h>
 #include <Manager/EventMgr.h>
 #include <ScriptObject.h>
-#include "Framework.h"
+#include <Service.h>
 
 using namespace Sapphire;
 
@@ -56,8 +56,8 @@ public:
 
   void onTalk( uint32_t eventId, Entity::Player& player, uint64_t actorId ) override
   {
-    auto pEventMgr = m_framework->get< World::Manager::EventMgr >();
-    auto actor = pEventMgr->mapEventActorToRealActor( static_cast< uint32_t >( actorId ) );
+    auto pEventMgr = Common::Service< World::Manager::EventMgr >::ref();
+    auto actor = pEventMgr.mapEventActorToRealActor( static_cast< uint32_t >( actorId ) );
 
     if( actor == Actor0 )
     {
diff --git a/src/scripts/quest/subquest/gridania/SubFst005.cpp b/src/scripts/quest/subquest/gridania/SubFst005.cpp
index b401f66b..4846a063 100644
--- a/src/scripts/quest/subquest/gridania/SubFst005.cpp
+++ b/src/scripts/quest/subquest/gridania/SubFst005.cpp
@@ -1,7 +1,7 @@
 #include <Actor/Player.h>
 #include <Manager/EventMgr.h>
 #include <ScriptObject.h>
-#include "Framework.h"
+#include <Service.h>
 
 using namespace Sapphire;
 
@@ -48,8 +48,8 @@ public:
 
   void onTalk( uint32_t eventId, Entity::Player& player, uint64_t actorId ) override
   {
-    auto pEventMgr = m_framework->get< World::Manager::EventMgr >();
-    auto actor = pEventMgr->mapEventActorToRealActor( static_cast<uint32_t>( actorId ) );
+    auto pEventMgr = Common::Service< World::Manager::EventMgr >::ref();
+    auto actor = pEventMgr.mapEventActorToRealActor( static_cast< uint32_t >( actorId ) );
 
     if ( actor == Actor0 )
     {
diff --git a/src/scripts/quest/subquest/gridania/SubFst008.cpp b/src/scripts/quest/subquest/gridania/SubFst008.cpp
index 94613bbb..93bc374a 100644
--- a/src/scripts/quest/subquest/gridania/SubFst008.cpp
+++ b/src/scripts/quest/subquest/gridania/SubFst008.cpp
@@ -1,7 +1,7 @@
 #include <Actor/Player.h>
 #include <Manager/EventMgr.h>
 #include <ScriptObject.h>
-#include "Framework.h"
+#include <Service.h>
 
 using namespace Sapphire;
 
@@ -56,8 +56,8 @@ public:
 
   void onTalk( uint32_t eventId, Entity::Player& player, uint64_t actorId ) override
   {
-    auto pEventMgr = m_framework->get< World::Manager::EventMgr >();
-    auto actor = pEventMgr->mapEventActorToRealActor( static_cast< uint32_t >( actorId ) );
+    auto pEventMgr = Common::Service< World::Manager::EventMgr >::ref();
+    auto actor = pEventMgr.mapEventActorToRealActor( static_cast< uint32_t >( actorId ) );
 
     if( actor == Actor0 )
     {
diff --git a/src/scripts/quest/subquest/gridania/SubFst009.cpp b/src/scripts/quest/subquest/gridania/SubFst009.cpp
index 5ff64741..baaf7420 100644
--- a/src/scripts/quest/subquest/gridania/SubFst009.cpp
+++ b/src/scripts/quest/subquest/gridania/SubFst009.cpp
@@ -1,7 +1,7 @@
 #include <Actor/Player.h>
 #include <Manager/EventMgr.h>
 #include <ScriptObject.h>
-#include "Framework.h"
+#include <Service.h>
 
 using namespace Sapphire;
 
@@ -52,8 +52,8 @@ public:
 
   void onTalk( uint32_t eventId, Entity::Player& player, uint64_t actorId ) override
   {
-    auto pEventMgr = m_framework->get< World::Manager::EventMgr >();
-    auto actor = pEventMgr->mapEventActorToRealActor( static_cast< uint32_t >( actorId ) );
+    auto pEventMgr = Common::Service< World::Manager::EventMgr >::ref();
+    auto actor = pEventMgr.mapEventActorToRealActor( static_cast< uint32_t >( actorId ) );
 
     if( actor == Actor0 )
     {
diff --git a/src/scripts/quest/subquest/gridania/SubFst010.cpp b/src/scripts/quest/subquest/gridania/SubFst010.cpp
index ea07711e..395095f4 100644
--- a/src/scripts/quest/subquest/gridania/SubFst010.cpp
+++ b/src/scripts/quest/subquest/gridania/SubFst010.cpp
@@ -1,7 +1,7 @@
 #include <Actor/Player.h>
 #include "Manager/EventMgr.h"
 #include <ScriptObject.h>
-#include "Framework.h"
+#include <Service.h>
 
 using namespace Sapphire;
 
@@ -55,8 +55,8 @@ public:
 
   void onTalk( uint32_t eventId, Entity::Player& player, uint64_t actorId ) override
   {
-    auto pEventMgr = m_framework->get< World::Manager::EventMgr >();
-    auto actor = pEventMgr->mapEventActorToRealActor( static_cast< uint32_t >( actorId ) );
+    auto pEventMgr = Common::Service< World::Manager::EventMgr >::ref();
+    auto actor = pEventMgr.mapEventActorToRealActor( static_cast< uint32_t >( actorId ) );
 
     if( actor == ACTOR0 )
       Scene00000( player );
diff --git a/src/scripts/quest/subquest/gridania/SubFst011.cpp b/src/scripts/quest/subquest/gridania/SubFst011.cpp
index 029e996e..42bb9db7 100644
--- a/src/scripts/quest/subquest/gridania/SubFst011.cpp
+++ b/src/scripts/quest/subquest/gridania/SubFst011.cpp
@@ -1,7 +1,7 @@
 #include <Actor/Player.h>
 #include <Manager/EventMgr.h>
 #include <ScriptObject.h>
-#include "Framework.h"
+#include <Service.h>
 
 using namespace Sapphire;
 
@@ -49,8 +49,8 @@ public:
 
   void onTalk( uint32_t eventId, Entity::Player& player, uint64_t actorId ) override
   {
-    auto pEventMgr = m_framework->get< World::Manager::EventMgr >();
-    auto actor = pEventMgr->mapEventActorToRealActor( static_cast< uint32_t >( actorId ) );
+    auto pEventMgr = Common::Service< World::Manager::EventMgr >::ref();
+    auto actor = pEventMgr.mapEventActorToRealActor( static_cast< uint32_t >( actorId ) );
 
     if( actor == Actor0 && !player.hasQuest( getId() ) )
     {
diff --git a/src/scripts/quest/subquest/gridania/SubFst013.cpp b/src/scripts/quest/subquest/gridania/SubFst013.cpp
index bca98f07..febe937a 100644
--- a/src/scripts/quest/subquest/gridania/SubFst013.cpp
+++ b/src/scripts/quest/subquest/gridania/SubFst013.cpp
@@ -1,7 +1,7 @@
 #include <ScriptObject.h>
 #include <Actor/Player.h>
 #include "Manager/EventMgr.h"
-#include "Framework.h"
+#include <Service.h>
 
 using namespace Sapphire;
 
@@ -161,8 +161,8 @@ public:
 
   void onTalk( uint32_t eventId, Entity::Player& player, uint64_t actorId ) override
   {
-    auto pEventMgr = m_framework->get< World::Manager::EventMgr >();
-    auto actor = pEventMgr->mapEventActorToRealActor( static_cast< uint32_t >( actorId ) );
+    auto pEventMgr = Common::Service< World::Manager::EventMgr >::ref();
+    auto actor = pEventMgr.mapEventActorToRealActor( static_cast< uint32_t >( actorId ) );
 
     if( !player.hasQuest( getId() ) )
     {
@@ -182,8 +182,8 @@ public:
 
   void onEmote( uint64_t actorId, uint32_t eventId, uint32_t emoteId, Entity::Player& player ) override
   {
-    auto pEventMgr = m_framework->get< World::Manager::EventMgr >();
-    auto actor = pEventMgr->mapEventActorToRealActor( static_cast< uint32_t >( actorId ) );
+    auto pEventMgr = Common::Service< World::Manager::EventMgr >::ref();
+    auto actor = pEventMgr.mapEventActorToRealActor( static_cast< uint32_t >( actorId ) );
 
     if( actor == ACTOR1 && emoteId == 5 && player.getQuestSeq( getId() ) == SEQ_1 )
       Scene00100( player );
diff --git a/src/scripts/quest/subquest/gridania/SubFst014.cpp b/src/scripts/quest/subquest/gridania/SubFst014.cpp
index 45fc19c9..28f77dce 100644
--- a/src/scripts/quest/subquest/gridania/SubFst014.cpp
+++ b/src/scripts/quest/subquest/gridania/SubFst014.cpp
@@ -1,7 +1,7 @@
 #include <Actor/Player.h>
 #include <Manager/EventMgr.h>
 #include <ScriptObject.h>
-#include "Framework.h"
+#include <Service.h>
 
 using namespace Sapphire;
 
@@ -56,8 +56,8 @@ public:
 
   void onTalk( uint32_t eventId, Entity::Player& player, uint64_t actorId ) override
   {
-    auto pEventMgr = m_framework->get< World::Manager::EventMgr >();
-    auto actor = pEventMgr->mapEventActorToRealActor( static_cast< uint32_t >( actorId ) );
+    auto pEventMgr = Common::Service< World::Manager::EventMgr >::ref();
+    auto actor = pEventMgr.mapEventActorToRealActor( static_cast< uint32_t >( actorId ) );
 
     if( actor == Actor0 && !player.hasQuest( getId() ) )
     {
diff --git a/src/scripts/quest/subquest/gridania/SubFst015.cpp b/src/scripts/quest/subquest/gridania/SubFst015.cpp
index 5690e82e..d7e8040b 100644
--- a/src/scripts/quest/subquest/gridania/SubFst015.cpp
+++ b/src/scripts/quest/subquest/gridania/SubFst015.cpp
@@ -1,7 +1,7 @@
 #include <Actor/Player.h>
 #include <Manager/EventMgr.h>
 #include <ScriptObject.h>
-#include "Framework.h"
+#include <Service.h>
 
 using namespace Sapphire;
 
@@ -54,8 +54,8 @@ public:
 
   void onTalk( uint32_t eventId, Entity::Player& player, uint64_t actorId ) override
   {
-    auto pEventMgr = m_framework->get< World::Manager::EventMgr >();
-    auto actor = pEventMgr->mapEventActorToRealActor( static_cast< uint32_t >( actorId ) );
+    auto pEventMgr = Common::Service< World::Manager::EventMgr >::ref();
+    auto actor = pEventMgr.mapEventActorToRealActor( static_cast< uint32_t >( actorId ) );
 
     if( actor == Actor0 && !player.hasQuest( getId() ) )
     {
diff --git a/src/scripts/quest/subquest/gridania/SubFst019.cpp b/src/scripts/quest/subquest/gridania/SubFst019.cpp
index d5a2338c..954e7376 100644
--- a/src/scripts/quest/subquest/gridania/SubFst019.cpp
+++ b/src/scripts/quest/subquest/gridania/SubFst019.cpp
@@ -1,7 +1,7 @@
 #include <Actor/Player.h>
 #include <Manager/EventMgr.h>
 #include <ScriptObject.h>
-#include "Framework.h"
+#include <Service.h>
 
 using namespace Sapphire;
 
@@ -49,8 +49,8 @@ public:
 
   void onTalk( uint32_t eventId, Entity::Player& player, uint64_t actorId ) override
   {
-    auto pEventMgr = m_framework->get< World::Manager::EventMgr >();
-    auto actor = pEventMgr->mapEventActorToRealActor( static_cast< uint32_t >( actorId ) );
+    auto pEventMgr = Common::Service< World::Manager::EventMgr >::ref();
+    auto actor = pEventMgr.mapEventActorToRealActor( static_cast< uint32_t >( actorId ) );
 
     if( actor == Actor0 )
     {
diff --git a/src/scripts/quest/subquest/gridania/SubFst026.cpp b/src/scripts/quest/subquest/gridania/SubFst026.cpp
index 05486014..8351ea51 100644
--- a/src/scripts/quest/subquest/gridania/SubFst026.cpp
+++ b/src/scripts/quest/subquest/gridania/SubFst026.cpp
@@ -1,7 +1,7 @@
 #include <Actor/Player.h>
 #include <Manager/EventMgr.h>
 #include <ScriptObject.h>
-#include "Framework.h"
+#include <Service.h>
 
 using namespace Sapphire;
 
@@ -51,8 +51,8 @@ public:
 
   void onTalk( uint32_t eventId, Entity::Player& player, uint64_t actorId ) override
   {
-    auto pEventMgr = m_framework->get< World::Manager::EventMgr >();
-    auto actor = pEventMgr->mapEventActorToRealActor( static_cast< uint32_t >( actorId ) );
+    auto pEventMgr = Common::Service< World::Manager::EventMgr >::ref();
+    auto actor = pEventMgr.mapEventActorToRealActor( static_cast< uint32_t >( actorId ) );
 
     if( actor == Actor0 && !player.hasQuest( getId() ) )
     {
diff --git a/src/scripts/quest/subquest/gridania/SubFst029.cpp b/src/scripts/quest/subquest/gridania/SubFst029.cpp
index e14918e3..74044a7b 100644
--- a/src/scripts/quest/subquest/gridania/SubFst029.cpp
+++ b/src/scripts/quest/subquest/gridania/SubFst029.cpp
@@ -1,7 +1,7 @@
 #include <Actor/Player.h>
 #include <Manager/EventMgr.h>
 #include <ScriptObject.h>
-#include "Framework.h"
+#include <Service.h>
 
 using namespace Sapphire;
 
@@ -47,8 +47,8 @@ public:
 
   void onTalk( uint32_t eventId, Entity::Player& player, uint64_t actorId ) override
   {
-    auto pEventMgr = m_framework->get< World::Manager::EventMgr >();
-    auto actor = pEventMgr->mapEventActorToRealActor( static_cast< uint32_t >( actorId ) );
+    auto pEventMgr = Common::Service< World::Manager::EventMgr >::ref();
+    auto actor = pEventMgr.mapEventActorToRealActor( static_cast< uint32_t >( actorId ) );
 
     if( actor == SubFst029::Actor0 && !player.hasQuest( getId() ) )
     {
diff --git a/src/scripts/quest/subquest/gridania/SubFst030.cpp b/src/scripts/quest/subquest/gridania/SubFst030.cpp
index c32245fa..cb542930 100644
--- a/src/scripts/quest/subquest/gridania/SubFst030.cpp
+++ b/src/scripts/quest/subquest/gridania/SubFst030.cpp
@@ -2,7 +2,7 @@
 #include <Actor/Player.h>
 #include "Manager/EventMgr.h"
 #include <ScriptObject.h>
-#include "Framework.h"
+#include <Service.h>
 
 using namespace Sapphire;
 
@@ -65,8 +65,8 @@ public:
 
   void onTalk( uint32_t eventId, Entity::Player& player, uint64_t actorId ) override
   {
-    auto pEventMgr = m_framework->get< World::Manager::EventMgr >();
-    auto actor = pEventMgr->mapEventActorToRealActor( static_cast< uint32_t >( actorId ) );
+    auto pEventMgr = Common::Service< World::Manager::EventMgr >::ref();
+    auto actor = pEventMgr.mapEventActorToRealActor( static_cast< uint32_t >( actorId ) );
 
     if( actor == Actor0 && !player.hasQuest( getId() ) )
     {
diff --git a/src/scripts/quest/subquest/gridania/SubFst034.cpp b/src/scripts/quest/subquest/gridania/SubFst034.cpp
index a2604bf4..2c52e661 100644
--- a/src/scripts/quest/subquest/gridania/SubFst034.cpp
+++ b/src/scripts/quest/subquest/gridania/SubFst034.cpp
@@ -2,7 +2,7 @@
 #include <Actor/Player.h>
 #include "Manager/EventMgr.h"
 #include <ScriptObject.h>
-#include "Framework.h"
+#include <Service.h>
 
 using namespace Sapphire;
 
@@ -56,8 +56,8 @@ class SubFst034 : public Sapphire::ScriptAPI::EventScript
   // Event Handlers
   void onTalk( uint32_t eventId, Entity::Player& player, uint64_t actorId ) override
   {
-    auto pEventMgr = m_framework->get< World::Manager::EventMgr >();
-    auto actor = pEventMgr->mapEventActorToRealActor( static_cast< uint32_t >( actorId ) );
+    auto pEventMgr = Common::Service< World::Manager::EventMgr >::ref();
+    auto actor = pEventMgr.mapEventActorToRealActor( static_cast< uint32_t >( actorId ) );
 
     if( actor == Actor0 && !player.hasQuest( getId() ) )
     {
diff --git a/src/scripts/quest/subquest/gridania/SubFst039.cpp b/src/scripts/quest/subquest/gridania/SubFst039.cpp
index c5fac2c9..1159c434 100644
--- a/src/scripts/quest/subquest/gridania/SubFst039.cpp
+++ b/src/scripts/quest/subquest/gridania/SubFst039.cpp
@@ -2,7 +2,7 @@
 #include <Actor/Player.h>
 #include "Manager/EventMgr.h"
 #include <ScriptObject.h>
-#include "Framework.h"
+#include <Service.h>
 
 using namespace Sapphire;
 
@@ -42,8 +42,8 @@ class SubFst039 : public Sapphire::ScriptAPI::EventScript
    // Event Handlers
    void onTalk( uint32_t eventId, Entity::Player& player, uint64_t actorId ) override
    {
-     auto pEventMgr = m_framework->get< World::Manager::EventMgr >();
-     auto actor = pEventMgr->mapEventActorToRealActor( static_cast< uint32_t >( actorId ) );
+     auto pEventMgr = Common::Service< World::Manager::EventMgr >::ref();
+     auto actor = pEventMgr.mapEventActorToRealActor( static_cast< uint32_t >( actorId ) );
 
      if( actor == Actor0 && !player.hasQuest( getId() ) )
      {
diff --git a/src/scripts/quest/subquest/gridania/SubFst041.cpp b/src/scripts/quest/subquest/gridania/SubFst041.cpp
index 6a983731..8c3512e4 100644
--- a/src/scripts/quest/subquest/gridania/SubFst041.cpp
+++ b/src/scripts/quest/subquest/gridania/SubFst041.cpp
@@ -1,7 +1,7 @@
 #include <Actor/Player.h>
 #include <Manager/EventMgr.h>
 #include <ScriptObject.h>
-#include "Framework.h"
+#include <Service.h>
 
 using namespace Sapphire;
 
@@ -57,8 +57,8 @@ public:
 
   void onTalk( uint32_t eventId, Entity::Player& player, uint64_t actorId ) override
   {
-    auto pEventMgr = m_framework->get< World::Manager::EventMgr >();
-    auto actor = pEventMgr->mapEventActorToRealActor( static_cast< uint32_t >( actorId ) );
+    auto pEventMgr = Common::Service< World::Manager::EventMgr >::ref();
+    auto actor = pEventMgr.mapEventActorToRealActor( static_cast< uint32_t >( actorId ) );
 
     if( actor == Actor0 )
     {
diff --git a/src/scripts/quest/subquest/gridania/SubFst045.cpp b/src/scripts/quest/subquest/gridania/SubFst045.cpp
index 095a485f..a8fbb691 100644
--- a/src/scripts/quest/subquest/gridania/SubFst045.cpp
+++ b/src/scripts/quest/subquest/gridania/SubFst045.cpp
@@ -1,7 +1,7 @@
 #include <Actor/Player.h>
 #include <Manager/EventMgr.h>
 #include <ScriptObject.h>
-#include "Framework.h"
+#include <Service.h>
 
 using namespace Sapphire;
 
@@ -47,8 +47,8 @@ public:
 
   void onTalk( uint32_t eventId, Entity::Player& player, uint64_t actorId ) override
   {
-    auto pEventMgr = m_framework->get< World::Manager::EventMgr >();
-    auto actor = pEventMgr->mapEventActorToRealActor( static_cast<uint32_t>( actorId ) );
+    auto pEventMgr = Common::Service< World::Manager::EventMgr >::ref();
+    auto actor = pEventMgr.mapEventActorToRealActor( static_cast< uint32_t >( actorId ) );
 
     if ( actor == Actor0 )
     {
diff --git a/src/scripts/quest/subquest/limsa/SubSea001.cpp b/src/scripts/quest/subquest/limsa/SubSea001.cpp
index 65169946..24c141a9 100644
--- a/src/scripts/quest/subquest/limsa/SubSea001.cpp
+++ b/src/scripts/quest/subquest/limsa/SubSea001.cpp
@@ -2,7 +2,7 @@
 #include <Actor/Player.h>
 #include "Manager/EventMgr.h"
 #include <ScriptObject.h>
-#include "Framework.h"
+#include <Service.h>
 
 using namespace Sapphire;
 
@@ -65,8 +65,8 @@ public:
 
   void onTalk( uint32_t eventId, Entity::Player& player, uint64_t actorId ) override
   {
-    auto pEventMgr = m_framework->get< World::Manager::EventMgr >();
-    auto actor = pEventMgr->mapEventActorToRealActor( static_cast< uint32_t >( actorId ) );
+    auto pEventMgr = Common::Service< World::Manager::EventMgr >::ref();
+    auto actor = pEventMgr.mapEventActorToRealActor( static_cast< uint32_t >( actorId ) );
 
     if( actor == Actor0 )
     {
diff --git a/src/scripts/quest/subquest/limsa/SubSea012.cpp b/src/scripts/quest/subquest/limsa/SubSea012.cpp
index 33855690..d65979bb 100644
--- a/src/scripts/quest/subquest/limsa/SubSea012.cpp
+++ b/src/scripts/quest/subquest/limsa/SubSea012.cpp
@@ -1,7 +1,7 @@
 #include <Actor/Player.h>
 #include "Manager/EventMgr.h"
 #include <ScriptObject.h>
-#include "Framework.h"
+#include <Service.h>
 
 using namespace Sapphire;
 
@@ -48,8 +48,8 @@ public:
 
   void onTalk( uint32_t eventId, Entity::Player& player, uint64_t actorId ) override
   {
-    auto pEventMgr = m_framework->get< World::Manager::EventMgr >();
-    auto actor = pEventMgr->mapEventActorToRealActor( static_cast< uint32_t >( actorId ) );
+    auto pEventMgr = Common::Service< World::Manager::EventMgr >::ref();
+    auto actor = pEventMgr.mapEventActorToRealActor( static_cast< uint32_t >( actorId ) );
 
     if( actor == Actor0 )
     {
diff --git a/src/scripts/quest/subquest/uldah/SubWil000.cpp b/src/scripts/quest/subquest/uldah/SubWil000.cpp
index 60ea8a7b..5516b841 100644
--- a/src/scripts/quest/subquest/uldah/SubWil000.cpp
+++ b/src/scripts/quest/subquest/uldah/SubWil000.cpp
@@ -1,7 +1,7 @@
 #include <Actor/Player.h>
 #include <Manager/EventMgr.h>
 #include <ScriptObject.h>
-#include "Framework.h"
+#include <Service.h>
 
 using namespace Sapphire;
 
@@ -48,8 +48,8 @@ public:
 
   void onTalk( uint32_t eventId, Entity::Player& player, uint64_t actorId ) override
   {
-    auto pEventMgr = m_framework->get< World::Manager::EventMgr >();
-    auto actor = pEventMgr->mapEventActorToRealActor( static_cast< uint32_t >( actorId ) );
+    auto pEventMgr = Common::Service< World::Manager::EventMgr >::ref();
+    auto actor = pEventMgr.mapEventActorToRealActor( static_cast< uint32_t >( actorId ) );
 
     if( actor == Actor0 )
     {
diff --git a/src/scripts/quest/subquest/uldah/SubWil001.cpp b/src/scripts/quest/subquest/uldah/SubWil001.cpp
index 45f60668..d6197905 100644
--- a/src/scripts/quest/subquest/uldah/SubWil001.cpp
+++ b/src/scripts/quest/subquest/uldah/SubWil001.cpp
@@ -1,7 +1,7 @@
 #include <Actor/Player.h>
 #include <Manager/EventMgr.h>
 #include <ScriptObject.h>
-#include "Framework.h"
+#include <Service.h>
 
 using namespace Sapphire;
 
@@ -49,8 +49,8 @@ public:
 
   void onTalk( uint32_t eventId, Entity::Player& player, uint64_t actorId ) override
   {
-    auto pEventMgr = m_framework->get< World::Manager::EventMgr >();
-    auto actor = pEventMgr->mapEventActorToRealActor( static_cast< uint32_t >( actorId ) );
+    auto pEventMgr = Common::Service< World::Manager::EventMgr >::ref();
+    auto actor = pEventMgr.mapEventActorToRealActor( static_cast< uint32_t >( actorId ) );
 
     if( actor == Actor0 )
     {
diff --git a/src/scripts/quest/subquest/uldah/SubWil002.cpp b/src/scripts/quest/subquest/uldah/SubWil002.cpp
index b0d110ae..ba22f96b 100644
--- a/src/scripts/quest/subquest/uldah/SubWil002.cpp
+++ b/src/scripts/quest/subquest/uldah/SubWil002.cpp
@@ -1,7 +1,7 @@
 #include <Actor/Player.h>
 #include <Manager/EventMgr.h>
 #include <ScriptObject.h>
-#include "Framework.h"
+#include <Service.h>
 
 using namespace Sapphire;
 
@@ -53,8 +53,8 @@ public:
 
   void onTalk( uint32_t eventId, Entity::Player& player, uint64_t actorId ) override
   {
-    auto pEventMgr = m_framework->get< World::Manager::EventMgr >();
-    auto actor = pEventMgr->mapEventActorToRealActor( static_cast< uint32_t >( actorId ) );
+    auto pEventMgr = Common::Service< World::Manager::EventMgr >::ref();
+    auto actor = pEventMgr.mapEventActorToRealActor( static_cast< uint32_t >( actorId ) );
 
     if( actor == Actor0 )
     {
diff --git a/src/scripts/quest/subquest/uldah/SubWil004.cpp b/src/scripts/quest/subquest/uldah/SubWil004.cpp
index 86ce8440..dfabd64f 100644
--- a/src/scripts/quest/subquest/uldah/SubWil004.cpp
+++ b/src/scripts/quest/subquest/uldah/SubWil004.cpp
@@ -1,7 +1,7 @@
 #include <Actor/Player.h>
 #include <Manager/EventMgr.h>
 #include <ScriptObject.h>
-#include "Framework.h"
+#include <Service.h>
 
 using namespace Sapphire;
 
@@ -58,8 +58,8 @@ public:
 
   void onTalk( uint32_t eventId, Entity::Player& player, uint64_t actorId ) override
   {
-    auto pEventMgr = m_framework->get< World::Manager::EventMgr >();
-    auto actor = pEventMgr->mapEventActorToRealActor( static_cast< uint32_t >( actorId ) );
+    auto pEventMgr = Common::Service< World::Manager::EventMgr >::ref();
+    auto actor = pEventMgr.mapEventActorToRealActor( static_cast< uint32_t >( actorId ) );
 
     if( actor == Actor0 )
     {
diff --git a/src/scripts/quest/subquest/uldah/SubWil006.cpp b/src/scripts/quest/subquest/uldah/SubWil006.cpp
index 5b0dc867..9125a3db 100644
--- a/src/scripts/quest/subquest/uldah/SubWil006.cpp
+++ b/src/scripts/quest/subquest/uldah/SubWil006.cpp
@@ -1,7 +1,7 @@
 #include <Actor/Player.h>
 #include <Manager/EventMgr.h>
 #include <ScriptObject.h>
-#include "Framework.h"
+#include <Service.h>
 
 using namespace Sapphire;
 
@@ -51,8 +51,8 @@ public:
 
   void onTalk( uint32_t eventId, Entity::Player& player, uint64_t actorId ) override
   {
-    auto pEventMgr = m_framework->get< World::Manager::EventMgr >();
-    auto actor = pEventMgr->mapEventActorToRealActor( static_cast< uint32_t >( actorId ) );
+    auto pEventMgr = Common::Service< World::Manager::EventMgr >::ref();
+    auto actor = pEventMgr.mapEventActorToRealActor( static_cast< uint32_t >( actorId ) );
 
     if( actor == Actor0 )
     {
diff --git a/src/scripts/quest/subquest/uldah/SubWil007.cpp b/src/scripts/quest/subquest/uldah/SubWil007.cpp
index 9c65c4b1..46ff82c8 100644
--- a/src/scripts/quest/subquest/uldah/SubWil007.cpp
+++ b/src/scripts/quest/subquest/uldah/SubWil007.cpp
@@ -2,7 +2,7 @@
 #include <Manager/EventMgr.h>
 #include <ScriptObject.h>
 #include <ctime>
-#include "Framework.h"
+#include <Service.h>
 
 using namespace Sapphire;
 
@@ -55,8 +55,8 @@ public:
 
   void onTalk( uint32_t eventId, Entity::Player& player, uint64_t actorId ) override
   {
-    auto pEventMgr = m_framework->get< World::Manager::EventMgr >();
-    auto actor = pEventMgr->mapEventActorToRealActor( static_cast< uint32_t >( actorId ) );
+    auto pEventMgr = Common::Service< World::Manager::EventMgr >::ref();
+    auto actor = pEventMgr.mapEventActorToRealActor( static_cast< uint32_t >( actorId ) );
 
     if( actor == Actor0 && !player.hasQuest( getId() ) )
     {
@@ -90,8 +90,8 @@ public:
 
   void onEmote( uint64_t actorId, uint32_t eventId, uint32_t emoteId, Entity::Player& player ) override
   {
-    auto pEventMgr = m_framework->get< World::Manager::EventMgr >();
-    auto actor = pEventMgr->mapEventActorToRealActor( static_cast< uint32_t >( actorId ) );
+    auto pEventMgr = Common::Service< World::Manager::EventMgr >::ref();
+    auto actor = pEventMgr.mapEventActorToRealActor( static_cast< uint32_t >( actorId ) );
 
     if( actor == Actor0 && emoteId == 41 && player.getQuestSeq( getId() ) == Seq1 )
     {
diff --git a/src/scripts/quest/subquest/uldah/SubWil018.cpp b/src/scripts/quest/subquest/uldah/SubWil018.cpp
index d29e33b7..7618fd2f 100644
--- a/src/scripts/quest/subquest/uldah/SubWil018.cpp
+++ b/src/scripts/quest/subquest/uldah/SubWil018.cpp
@@ -1,7 +1,7 @@
 #include <Actor/Player.h>
 #include <Manager/EventMgr.h>
 #include <ScriptObject.h>
-#include "Framework.h"
+#include <Service.h>
 
 using namespace Sapphire;
 
@@ -55,8 +55,8 @@ public:
 
   void onTalk( uint32_t eventId, Entity::Player& player, uint64_t actorId ) override
   {
-    auto pEventMgr = m_framework->get< World::Manager::EventMgr >();
-    auto actor = pEventMgr->mapEventActorToRealActor( static_cast< uint32_t >( actorId ) );
+    auto pEventMgr = Common::Service< World::Manager::EventMgr >::ref();
+    auto actor = pEventMgr.mapEventActorToRealActor( static_cast< uint32_t >( actorId ) );
 
     if( actor == Actor0 && !player.hasQuest( getId() ) )
     {
diff --git a/src/scripts/quest/subquest/uldah/SubWil019.cpp b/src/scripts/quest/subquest/uldah/SubWil019.cpp
index 77a54877..c04ff9a2 100644
--- a/src/scripts/quest/subquest/uldah/SubWil019.cpp
+++ b/src/scripts/quest/subquest/uldah/SubWil019.cpp
@@ -1,7 +1,7 @@
 #include <Actor/Player.h>
 #include <Manager/EventMgr.h>
 #include <ScriptObject.h>
-#include "Framework.h"
+#include <Service.h>
 
 using namespace Sapphire;
 
@@ -47,8 +47,8 @@ public:
 
   void onTalk( uint32_t eventId, Entity::Player& player, uint64_t actorId ) override
   {
-    auto pEventMgr = m_framework->get< World::Manager::EventMgr >();
-    auto actor = pEventMgr->mapEventActorToRealActor( static_cast< uint32_t >( actorId ) );
+    auto pEventMgr = Common::Service< World::Manager::EventMgr >::ref();
+    auto actor = pEventMgr.mapEventActorToRealActor( static_cast< uint32_t >( actorId ) );
 
     if( actor == Actor0 )
     {
diff --git a/src/scripts/quest/subquest/uldah/SubWil020.cpp b/src/scripts/quest/subquest/uldah/SubWil020.cpp
index e29f8d05..7ea1a93f 100644
--- a/src/scripts/quest/subquest/uldah/SubWil020.cpp
+++ b/src/scripts/quest/subquest/uldah/SubWil020.cpp
@@ -2,7 +2,7 @@
 #include <Manager/EventMgr.h>
 #include <ScriptObject.h>
 #include <ctime>
-#include "Framework.h"
+#include <Service.h>
 
 using namespace Sapphire;
 
@@ -63,8 +63,8 @@ class SubWil020 : public Sapphire::ScriptAPI::EventScript
    // Event Handlers
    void onTalk( uint32_t eventId, Entity::Player& player, uint64_t actorId ) override
    {
-     auto pEventMgr = m_framework->get< World::Manager::EventMgr >();
-     auto actor = pEventMgr->mapEventActorToRealActor( static_cast< uint32_t >( actorId ) );
+     auto pEventMgr = Common::Service< World::Manager::EventMgr >::ref();
+     auto actor = pEventMgr.mapEventActorToRealActor( static_cast< uint32_t >( actorId ) );
 
      /*player.setQuestUI8BH( getId(), 0 );
      player.setQuestUI8AL( getId(), 0 );
diff --git a/src/scripts/quest/subquest/uldah/SubWil021.cpp b/src/scripts/quest/subquest/uldah/SubWil021.cpp
index 4de1484d..8e17059d 100644
--- a/src/scripts/quest/subquest/uldah/SubWil021.cpp
+++ b/src/scripts/quest/subquest/uldah/SubWil021.cpp
@@ -1,7 +1,7 @@
 #include <Actor/Player.h>
 #include <Manager/EventMgr.h>
 #include <ScriptObject.h>
-#include "Framework.h"
+#include <Service.h>
 
 using namespace Sapphire;
 
@@ -52,8 +52,8 @@ public:
 
   void onTalk( uint32_t eventId, Entity::Player& player, uint64_t actorId ) override
   {
-    auto pEventMgr = m_framework->get< World::Manager::EventMgr >();
-    auto actor = pEventMgr->mapEventActorToRealActor( static_cast< uint32_t >( actorId ) );
+    auto pEventMgr = Common::Service< World::Manager::EventMgr >::ref();
+    auto actor = pEventMgr.mapEventActorToRealActor( static_cast< uint32_t >( actorId ) );
 
     if( actor == Actor0 )
     {
diff --git a/src/scripts/quest/subquest/uldah/SubWil022.cpp b/src/scripts/quest/subquest/uldah/SubWil022.cpp
index da169d97..4d274987 100644
--- a/src/scripts/quest/subquest/uldah/SubWil022.cpp
+++ b/src/scripts/quest/subquest/uldah/SubWil022.cpp
@@ -1,7 +1,7 @@
 #include <Actor/Player.h>
 #include <Manager/EventMgr.h>
 #include <ScriptObject.h>
-#include "Framework.h"
+#include <Service.h>
 
 using namespace Sapphire;
 
@@ -52,8 +52,8 @@ public:
 
   void onTalk( uint32_t eventId, Entity::Player& player, uint64_t actorId ) override
   {
-    auto pEventMgr = m_framework->get< World::Manager::EventMgr >();
-    auto actor = pEventMgr->mapEventActorToRealActor( static_cast< uint32_t >( actorId ) );
+    auto pEventMgr = Common::Service< World::Manager::EventMgr >::ref();
+    auto actor = pEventMgr.mapEventActorToRealActor( static_cast< uint32_t >( actorId ) );
 
     if( actor == Actor0 )
     {
diff --git a/src/scripts/quest/subquest/uldah/SubWil027.cpp b/src/scripts/quest/subquest/uldah/SubWil027.cpp
index 2dee104f..66dc4843 100644
--- a/src/scripts/quest/subquest/uldah/SubWil027.cpp
+++ b/src/scripts/quest/subquest/uldah/SubWil027.cpp
@@ -1,7 +1,7 @@
 #include <Actor/Player.h>
 #include <Manager/EventMgr.h>
 #include <ScriptObject.h>
-#include "Framework.h"
+#include <Service.h>
 
 using namespace Sapphire;
 
@@ -46,8 +46,8 @@ public:
 
   void onTalk( uint32_t eventId, Entity::Player& player, uint64_t actorId ) override
   {
-    auto pEventMgr = m_framework->get< World::Manager::EventMgr >();
-    auto actor = pEventMgr->mapEventActorToRealActor( static_cast< uint32_t >( actorId ) );
+    auto pEventMgr = Common::Service< World::Manager::EventMgr >::ref();
+    auto actor = pEventMgr.mapEventActorToRealActor( static_cast< uint32_t >( actorId ) );
 
     if( actor == Actor0 )
     {
diff --git a/src/scripts/quest/subquest/uldah/SubWil028.cpp b/src/scripts/quest/subquest/uldah/SubWil028.cpp
index 45bb3fc2..57222790 100644
--- a/src/scripts/quest/subquest/uldah/SubWil028.cpp
+++ b/src/scripts/quest/subquest/uldah/SubWil028.cpp
@@ -1,7 +1,7 @@
 #include <Actor/Player.h>
 #include <Manager/EventMgr.h>
 #include <ScriptObject.h>
-#include "Framework.h"
+#include <Service.h>
 
 using namespace Sapphire;
 
@@ -48,8 +48,8 @@ public:
 
   void onTalk( uint32_t eventId, Entity::Player& player, uint64_t actorId ) override
   {
-    auto pEventMgr = m_framework->get< World::Manager::EventMgr >();
-    auto actor = pEventMgr->mapEventActorToRealActor( static_cast< uint32_t >( actorId ) );
+    auto pEventMgr = Common::Service< World::Manager::EventMgr >::ref();
+    auto actor = pEventMgr.mapEventActorToRealActor( static_cast< uint32_t >( actorId ) );
 
     if( actor == Actor0 )
     {
diff --git a/src/scripts/quest/subquest/uldah/SubWil029.cpp b/src/scripts/quest/subquest/uldah/SubWil029.cpp
index 77fab777..ec09773a 100644
--- a/src/scripts/quest/subquest/uldah/SubWil029.cpp
+++ b/src/scripts/quest/subquest/uldah/SubWil029.cpp
@@ -1,7 +1,7 @@
 #include <Actor/Player.h>
 #include <Manager/EventMgr.h>
 #include <ScriptObject.h>
-#include "Framework.h"
+#include <Service.h>
 
 using namespace Sapphire;
 
@@ -51,8 +51,8 @@ public:
 
   void onTalk( uint32_t eventId, Entity::Player& player, uint64_t actorId ) override
   {
-    auto pEventMgr = m_framework->get< World::Manager::EventMgr >();
-    auto actor = pEventMgr->mapEventActorToRealActor( static_cast< uint32_t >( actorId ) );
+    auto pEventMgr = Common::Service< World::Manager::EventMgr >::ref();
+    auto actor = pEventMgr.mapEventActorToRealActor( static_cast< uint32_t >( actorId ) );
 
     if( actor == Actor0 )
     {
diff --git a/src/tools/quest_parser/main.cpp b/src/tools/quest_parser/main.cpp
index 9efc2cba..069e213e 100644
--- a/src/tools/quest_parser/main.cpp
+++ b/src/tools/quest_parser/main.cpp
@@ -86,7 +86,7 @@ createScript( std::shared_ptr< Sapphire::Data::Quest >& pQuestData, std::set< st
     "#include <Actor/Player.h>\n"
     "#include \"Manager/EventMgr.h\"\n"
     "#include <ScriptObject.h>\n"
-    "#include \"Framework.h\"\n\n"
+    "#include <Service.h>\n\n"
   );
 
   std::size_t splitPos( pQuestData->id.find( "_" ) );
diff --git a/src/world/Action/Action.cpp b/src/world/Action/Action.cpp
index aa9a3b28..fbf08757 100644
--- a/src/world/Action/Action.cpp
+++ b/src/world/Action/Action.cpp
@@ -4,7 +4,6 @@
 
 #include <Exd/ExdDataGenerated.h>
 #include <Util/Util.h>
-#include "Framework.h"
 #include "Script/ScriptMgr.h"
 
 #include <Math/CalcStats.h>
@@ -23,6 +22,7 @@
 
 #include <Util/ActorFilter.h>
 #include <Util/UtilMath.h>
+#include <Service.h>
 
 using namespace Sapphire;
 using namespace Sapphire::Common;
@@ -36,15 +36,14 @@ using namespace Sapphire::World;
 Action::Action::Action() = default;
 Action::Action::~Action() = default;
 
-Action::Action::Action( Entity::CharaPtr caster, uint32_t actionId, uint16_t sequence, FrameworkPtr fw ) :
-  Action( std::move( caster ), actionId, sequence, nullptr, std::move( fw ) )
+Action::Action::Action( Entity::CharaPtr caster, uint32_t actionId, uint16_t sequence) :
+  Action( std::move( caster ), actionId, sequence, nullptr )
 {
 }
 
 Action::Action::Action( Entity::CharaPtr caster, uint32_t actionId, uint16_t sequence,
-                        Data::ActionPtr actionData, FrameworkPtr fw ) :
+                        Data::ActionPtr actionData ) :
   m_pSource( std::move( caster ) ),
-  m_pFw( std::move( fw ) ),
   m_actionData( std::move( actionData ) ),
   m_id( actionId ),
   m_targetId( 0 ),
@@ -64,10 +63,9 @@ bool Action::Action::init()
   if( !m_actionData )
   {
     // need to get actionData
-    auto exdData = m_pFw->get< Data::ExdDataGenerated >();
-    assert( exdData );
+    auto& exdData = Common::Service< Data::ExdDataGenerated >::ref();
 
-    auto actionData = exdData->get< Data::Action >( m_id );
+    auto actionData = exdData.get< Data::Action >( m_id );
     assert( actionData );
 
     m_actionData = actionData;
@@ -290,10 +288,10 @@ void Action::Action::start()
                                               m_recastTimeMs / 10 );
   player->queuePacket( actionStartPkt );
 
-  auto pScriptMgr = m_pFw->get< Scripting::ScriptMgr >();
+  auto& scriptMgr = Common::Service< Scripting::ScriptMgr >::ref();
 
   // check the lut too and see if we have something usable, otherwise cancel the cast
-  if( !pScriptMgr->onStart( *this ) && !ActionLut::validEntryExists( static_cast< uint16_t >( getId() ) ) )
+  if( !scriptMgr.onStart( *this ) && !ActionLut::validEntryExists( static_cast< uint16_t >( getId() ) ) )
   {
     // script not implemented and insufficient lut data (no potencies)
     interrupt();
@@ -342,8 +340,8 @@ void Action::Action::interrupt()
     m_pSource->sendToInRangeSet( control, true );
   }
 
-  auto pScriptMgr = m_pFw->get< Scripting::ScriptMgr >();
-  pScriptMgr->onInterrupt( *this );
+  auto& scriptMgr = Common::Service< Scripting::ScriptMgr >::ref();
+  scriptMgr.onInterrupt( *this );
 }
 
 void Action::Action::execute()
@@ -357,7 +355,7 @@ void Action::Action::execute()
     return;
   }
 
-  auto pScriptMgr = m_pFw->get< Scripting::ScriptMgr >();
+  auto& scriptMgr = Common::Service< Scripting::ScriptMgr >::ref();
 
   if( hasCastTime() )
   {
@@ -385,7 +383,7 @@ void Action::Action::execute()
   }
   else if( auto player = m_pSource->getAsPlayer() )
   {
-    pScriptMgr->onEObjHit( *player, m_targetId, getId() );
+    scriptMgr.onEObjHit( *player, m_targetId, getId() );
   }
 
   // set currently casted action as the combo action if it interrupts a combo
@@ -455,10 +453,10 @@ void Action::Action::buildEffects()
 {
   snapshotAffectedActors( m_hitActors );
 
-  auto pScriptMgr = m_pFw->get< Scripting::ScriptMgr >();
+  auto& scriptMgr = Common::Service< Scripting::ScriptMgr >::ref();
   auto hasLutEntry = hasValidLutEntry();
 
-  if( !pScriptMgr->onExecute( *this ) && !hasLutEntry )
+  if( !scriptMgr.onExecute( *this ) && !hasLutEntry )
   {
     if( auto player = m_pSource->getAsPlayer() )
     {
@@ -577,10 +575,9 @@ bool Action::Action::playerPreCheck( Entity::Player& player )
   if( actionClass != Common::ClassJob::Adventurer && currentClass != actionClass && !m_actionData->isRoleAction )
   {
     // check if not a base class action
-    auto exdData = m_pFw->get< Data::ExdDataGenerated >();
-    assert( exdData );
+    auto& exdData = Common::Service< Data::ExdDataGenerated >::ref();
 
-    auto classJob = exdData->get< Data::ClassJob >( static_cast< uint8_t >( currentClass ) );
+    auto classJob = exdData.get< Data::ClassJob >( static_cast< uint8_t >( currentClass ) );
     if( !classJob )
       return false;
 
diff --git a/src/world/Action/Action.h b/src/world/Action/Action.h
index 04142f3b..0b62f856 100644
--- a/src/world/Action/Action.h
+++ b/src/world/Action/Action.h
@@ -22,8 +22,8 @@ namespace Sapphire::World::Action
   public:
 
     Action();
-    Action( Entity::CharaPtr caster, uint32_t actionId, uint16_t sequence, FrameworkPtr fw );
-    Action( Entity::CharaPtr caster, uint32_t actionId, uint16_t sequence, Data::ActionPtr actionData, FrameworkPtr fw );
+    Action( Entity::CharaPtr caster, uint32_t actionId, uint16_t sequence );
+    Action( Entity::CharaPtr caster, uint32_t actionId, uint16_t sequence, Data::ActionPtr actionData );
 
     virtual ~Action();
 
@@ -183,7 +183,6 @@ namespace Sapphire::World::Action
 
     Common::ActionInterruptType m_interruptType;
 
-    FrameworkPtr m_pFw;
     Data::ActionPtr m_actionData;
 
     Common::FFXIVARR_POSITION3 m_pos;
diff --git a/src/world/Action/EventAction.cpp b/src/world/Action/EventAction.cpp
index 8c742ded..f524f33e 100644
--- a/src/world/Action/EventAction.cpp
+++ b/src/world/Action/EventAction.cpp
@@ -2,6 +2,7 @@
 #include <Logging/Logger.h>
 #include <Exd/ExdDataGenerated.h>
 #include <Network/CommonActorControl.h>
+#include <Service.h>
 
 #include "Network/PacketWrappers/ActorControlPacket.h"
 #include "Network/PacketWrappers/ActorControlSelfPacket.h"
@@ -9,7 +10,6 @@
 #include "Actor/Player.h"
 
 #include "EventAction.h"
-#include "Framework.h"
 
 using namespace Sapphire;
 using namespace Sapphire::World;
@@ -20,15 +20,13 @@ using namespace Sapphire::Network::Packets::Server;
 using namespace Sapphire::Network::ActorControl;
 
 Action::EventAction::EventAction( Entity::CharaPtr pActor, uint32_t eventId, uint16_t action,
-                                  ActionCallback finishRef, ActionCallback interruptRef, uint64_t additional,
-                                  FrameworkPtr pFw )
+                                  ActionCallback finishRef, ActionCallback interruptRef, uint64_t additional )
 {
   m_additional = additional;
   m_eventId = eventId;
   m_id = action;
-  m_pFw = pFw;
-  auto pExdData = pFw->get< Data::ExdDataGenerated >();
-  m_castTimeMs = pExdData->get< Sapphire::Data::EventAction >( action )->castTime * 1000; // TODO: Add security checks.
+  auto& exdData = Common::Service< Data::ExdDataGenerated >::ref();
+  m_castTimeMs = exdData.get< Sapphire::Data::EventAction >( action )->castTime * 1000; // TODO: Add security checks.
   m_onActionFinishClb = std::move( finishRef );
   m_onActionInterruptClb = std::move( interruptRef );
   m_pSource = std::move( pActor );
diff --git a/src/world/Action/EventAction.h b/src/world/Action/EventAction.h
index 4a9bb50a..b4c00085 100644
--- a/src/world/Action/EventAction.h
+++ b/src/world/Action/EventAction.h
@@ -16,7 +16,7 @@ public:
   virtual ~EventAction();
 
   EventAction( Entity::CharaPtr pActor, uint32_t eventId, uint16_t action,
-               ActionCallback finishRef, ActionCallback interruptRef, uint64_t additional, FrameworkPtr pFw );
+               ActionCallback finishRef, ActionCallback interruptRef, uint64_t additional );
 
   void start() override;
 
diff --git a/src/world/Action/ItemAction.cpp b/src/world/Action/ItemAction.cpp
index efbef2f4..96971e8b 100644
--- a/src/world/Action/ItemAction.cpp
+++ b/src/world/Action/ItemAction.cpp
@@ -10,14 +10,13 @@ using namespace Sapphire::World::Action;
 
 ItemAction::ItemAction( Sapphire::Entity::CharaPtr source, uint32_t itemId,
                         Sapphire::Data::ItemActionPtr itemActionData, uint16_t itemSourceSlot,
-                        uint16_t itemSourceContainer, Sapphire::FrameworkPtr fw ) :
+                        uint16_t itemSourceContainer ) :
   m_itemAction( std::move( itemActionData ) ),
   m_itemSourceSlot( itemSourceSlot ),
   m_itemSourceContainer( itemSourceContainer )
 {
   m_id = itemId;
   m_pSource = std::move( source );
-  m_pFw = std::move( fw );
 }
 
 void ItemAction::start()
diff --git a/src/world/Action/ItemAction.h b/src/world/Action/ItemAction.h
index f0f7c24f..4d60d8ff 100644
--- a/src/world/Action/ItemAction.h
+++ b/src/world/Action/ItemAction.h
@@ -15,7 +15,7 @@ namespace Sapphire::World::Action
   {
   public:
     ItemAction( Entity::CharaPtr source, uint32_t itemId, Data::ItemActionPtr itemActionData,
-                uint16_t itemSourceSlot, uint16_t itemSourceContainer, FrameworkPtr fw );
+                uint16_t itemSourceSlot, uint16_t itemSourceContainer );
     virtual ~ItemAction() = default;
 
     void start() override;
diff --git a/src/world/Action/MountAction.cpp b/src/world/Action/MountAction.cpp
index 7b01f870..39b928d3 100644
--- a/src/world/Action/MountAction.cpp
+++ b/src/world/Action/MountAction.cpp
@@ -15,8 +15,8 @@ using namespace Sapphire::Network::Packets::Server;
 using namespace Sapphire::Network::ActorControl;
 using namespace Sapphire::World::Action;
 
-MountAction::MountAction( Sapphire::Entity::CharaPtr source, uint16_t mountId, uint16_t sequence, Data::ActionPtr actionData, Sapphire::FrameworkPtr fw ) :
-  Action::Action( source, 4, sequence, actionData, fw ),
+MountAction::MountAction( Sapphire::Entity::CharaPtr source, uint16_t mountId, uint16_t sequence, Data::ActionPtr actionData ) :
+  Action::Action( source, 4, sequence, actionData ),
   m_mountId( mountId )
 {
 }
diff --git a/src/world/Action/MountAction.h b/src/world/Action/MountAction.h
index 1b095b47..6b79113d 100644
--- a/src/world/Action/MountAction.h
+++ b/src/world/Action/MountAction.h
@@ -8,7 +8,7 @@ namespace Sapphire::World::Action
   class MountAction : public Action
   {
   public:
-    MountAction( Entity::CharaPtr source, uint16_t mountId, uint16_t sequence, Data::ActionPtr actionData, FrameworkPtr fw );
+    MountAction( Entity::CharaPtr source, uint16_t mountId, uint16_t sequence, Data::ActionPtr actionData );
     virtual ~MountAction() = default;
 
     bool preCheck() override;
diff --git a/src/world/Actor/BNpc.cpp b/src/world/Actor/BNpc.cpp
index ca7e9a80..09b96793 100644
--- a/src/world/Actor/BNpc.cpp
+++ b/src/world/Actor/BNpc.cpp
@@ -35,26 +35,26 @@
 #include "BNpcTemplate.h"
 
 #include "Common.h"
-#include "Framework.h"
 
 #include <Manager/TerritoryMgr.h>
 #include <Manager/NaviMgr.h>
 #include <Manager/TerritoryMgr.h>
 #include <Manager/RNGMgr.h>
+#include <Service.h>
 
 using namespace Sapphire::Common;
 using namespace Sapphire::Network::Packets;
 using namespace Sapphire::Network::Packets::Server;
 using namespace Sapphire::Network::ActorControl;
 
-Sapphire::Entity::BNpc::BNpc( FrameworkPtr pFw ) :
-  Npc( ObjKind::BattleNpc, pFw )
+Sapphire::Entity::BNpc::BNpc() :
+  Npc( ObjKind::BattleNpc )
 {
 }
 
 Sapphire::Entity::BNpc::BNpc( uint32_t id, BNpcTemplatePtr pTemplate, float posX, float posY, float posZ, float rot,
-                              uint8_t level, uint32_t maxHp, TerritoryPtr pZone, FrameworkPtr pFw ) :
-  Npc( ObjKind::BattleNpc, pFw )
+                              uint8_t level, uint32_t maxHp, TerritoryPtr pZone ) :
+  Npc( ObjKind::BattleNpc )
 {
   m_id = id;
   m_modelChara = pTemplate->getModelChara();
@@ -99,18 +99,17 @@ Sapphire::Entity::BNpc::BNpc( uint32_t id, BNpcTemplatePtr pTemplate, float posX
   memcpy( m_customize, pTemplate->getCustomize(), sizeof( m_customize ) );
   memcpy( m_modelEquip, pTemplate->getModelEquip(), sizeof( m_modelEquip ) );
 
-  auto exdData = m_pFw->get< Data::ExdDataGenerated >();
-  assert( exdData );
+  auto& exdData = Common::Service< Data::ExdDataGenerated >::ref();
 
-  auto bNpcBaseData = exdData->get< Data::BNpcBase >( m_bNpcBaseId );
+  auto bNpcBaseData = exdData.get< Data::BNpcBase >( m_bNpcBaseId );
   assert( bNpcBaseData );
 
   m_radius = bNpcBaseData->scale;
 
-  auto modelChara = exdData->get< Data::ModelChara >( bNpcBaseData->modelChara );
+  auto modelChara = exdData.get< Data::ModelChara >( bNpcBaseData->modelChara );
   if( modelChara )
   {
-    auto modelSkeleton = exdData->get< Data::ModelSkeleton >( modelChara->model );
+    auto modelSkeleton = exdData.get< Data::ModelSkeleton >( modelChara->model );
     if( modelSkeleton )
       m_radius *= modelSkeleton->radius;
   }
@@ -359,8 +358,8 @@ bool Sapphire::Entity::BNpc::hateListHasActor( Sapphire::Entity::CharaPtr pChara
 
 void Sapphire::Entity::BNpc::aggro( Sapphire::Entity::CharaPtr pChara )
 {
-  auto pRNGMgr = m_pFw->get< World::Manager::RNGMgr >();
-  auto variation = static_cast< uint32_t >( pRNGMgr->getRandGenerator< float >( 500, 1000 ).next() );
+  auto& pRNGMgr = Common::Service< World::Manager::RNGMgr >::ref();
+  auto variation = static_cast< uint32_t >( pRNGMgr.getRandGenerator< float >( 500, 1000 ).next() );
 
   m_lastAttack = Util::getTimeMs() + variation;
   hateListUpdate( pChara, 1 );
@@ -692,7 +691,6 @@ void Sapphire::Entity::BNpc::autoAttack( CharaPtr pTarget )
     m_lastAttack = tick;
     srand( static_cast< uint32_t >( tick ) );
 
-    auto pRNGMgr = m_pFw->get< World::Manager::RNGMgr >();
     auto damage = Math::CalcStats::calcAutoAttackDamage( *this );
 
     auto effectPacket = std::make_shared< Server::EffectPacket >( getId(), pTarget->getId(), 7 );
@@ -716,10 +714,10 @@ void Sapphire::Entity::BNpc::calculateStats()
   uint8_t level = getLevel();
   uint8_t job = static_cast< uint8_t >( getClass() );
 
-  auto pExdData = m_pFw->get< Data::ExdDataGenerated >();
+  auto& exdData = Common::Service< Data::ExdDataGenerated >::ref();
 
-  auto classInfo = pExdData->get< Sapphire::Data::ClassJob >( job );
-  auto paramGrowthInfo = pExdData->get< Sapphire::Data::ParamGrow >( level );
+  auto classInfo = exdData.get< Sapphire::Data::ClassJob >( job );
+  auto paramGrowthInfo = exdData.get< Sapphire::Data::ParamGrow >( level );
 
   float base = Math::CalcStats::calculateBaseStat( *this );
 
diff --git a/src/world/Actor/BNpc.h b/src/world/Actor/BNpc.h
index c76f8e99..aea42d48 100644
--- a/src/world/Actor/BNpc.h
+++ b/src/world/Actor/BNpc.h
@@ -49,9 +49,9 @@ namespace Sapphire::Entity
   {
 
   public:
-    BNpc( FrameworkPtr pFw );
+    BNpc();
     BNpc( uint32_t id, BNpcTemplatePtr pTemplate, float posX, float posY, float posZ, float rot,
-          uint8_t level, uint32_t maxHp, TerritoryPtr pZone,FrameworkPtr pFw );
+          uint8_t level, uint32_t maxHp, TerritoryPtr pZone );
 
     virtual ~BNpc() override;
 
diff --git a/src/world/Actor/Chara.cpp b/src/world/Actor/Chara.cpp
index 35e1155e..c62c268c 100644
--- a/src/world/Actor/Chara.cpp
+++ b/src/world/Actor/Chara.cpp
@@ -4,6 +4,7 @@
 #include <Exd/ExdDataGenerated.h>
 #include <utility>
 #include <Network/CommonActorControl.h>
+#include <Service.h>
 
 
 #include "Forwards.h"
@@ -25,7 +26,6 @@
 #include "Chara.h"
 #include "Player.h"
 #include "Manager/TerritoryMgr.h"
-#include "Framework.h"
 #include "Common.h"
 
 using namespace Sapphire::Common;
@@ -33,11 +33,10 @@ using namespace Sapphire::Network::Packets;
 using namespace Sapphire::Network::Packets::Server;
 using namespace Sapphire::Network::ActorControl;
 
-Sapphire::Entity::Chara::Chara( ObjKind type, FrameworkPtr pFw ) :
+Sapphire::Entity::Chara::Chara( ObjKind type ) :
   Actor( type ),
   m_pose( 0 ),
   m_targetId( INVALID_GAME_OBJECT_ID64 ),
-  m_pFw( std::move( std::move( pFw ) ) ),
   m_directorId( 0 ),
   m_radius( 1.f )
 {
@@ -557,7 +556,7 @@ void Sapphire::Entity::Chara::addStatusEffect( StatusEffect::StatusEffectPtr pEf
 /*! \param StatusEffectPtr to be applied to the actor */
 void Sapphire::Entity::Chara::addStatusEffectById( uint32_t id, int32_t duration, Entity::Chara& source, uint16_t param )
 {
-  auto effect = StatusEffect::make_StatusEffect( id, source.getAsChara(), getAsChara(), duration, 3000, m_pFw );
+  auto effect = StatusEffect::make_StatusEffect( id, source.getAsChara(), getAsChara(), duration, 3000 );
   effect->setParam( param );
   addStatusEffect( effect );
 }
@@ -569,7 +568,7 @@ void Sapphire::Entity::Chara::addStatusEffectByIdIfNotExist( uint32_t id, int32_
   if( hasStatusEffect( id ) )
     return;
 
-  auto effect = StatusEffect::make_StatusEffect( id, source.getAsChara(), getAsChara(), duration, 3000, m_pFw );
+  auto effect = StatusEffect::make_StatusEffect( id, source.getAsChara(), getAsChara(), duration, 3000 );
   effect->setParam( param );
   addStatusEffect( effect );
 
@@ -763,10 +762,9 @@ float Sapphire::Entity::Chara::getRadius() const
 
 Sapphire::Common::BaseParam Sapphire::Entity::Chara::getPrimaryStat() const
 {
-  auto exdData = m_pFw->get< Data::ExdDataGenerated >();
-  assert( exdData );
+  auto& exdData = Common::Service< Data::ExdDataGenerated >::ref();
 
-  auto classJob = exdData->get< Data::ClassJob >( static_cast< uint16_t >( getClass() ) );
+  auto classJob = exdData.get< Data::ClassJob >( static_cast< uint16_t >( getClass() ) );
   assert( classJob );
 
   return static_cast< Sapphire::Common::BaseParam >( classJob->primaryStat );
diff --git a/src/world/Actor/Chara.h b/src/world/Actor/Chara.h
index f423507e..aab58dec 100644
--- a/src/world/Actor/Chara.h
+++ b/src/world/Actor/Chara.h
@@ -126,7 +126,6 @@ namespace Sapphire::Entity
     std::queue< uint8_t > m_statusEffectFreeSlotQueue;
     std::vector< std::pair< uint8_t, uint32_t > > m_statusEffectList;
     std::map< uint8_t, StatusEffect::StatusEffectPtr > m_statusEffectMap;
-    FrameworkPtr m_pFw;
 
     /*! Detour Crowd AgentId */
     uint32_t m_agentId;
@@ -135,7 +134,7 @@ namespace Sapphire::Entity
     float m_radius;
 
   public:
-    Chara( Common::ObjKind type, FrameworkPtr pFw );
+    Chara( Common::ObjKind type );
 
     virtual ~Chara() override;
 
diff --git a/src/world/Actor/Npc.cpp b/src/world/Actor/Npc.cpp
index d795aabb..e5427b6d 100644
--- a/src/world/Actor/Npc.cpp
+++ b/src/world/Actor/Npc.cpp
@@ -25,7 +25,6 @@
 #include "Player.h"
 #include "Npc.h"
 #include "Manager/TerritoryMgr.h"
-#include "Framework.h"
 #include "Common.h"
 
 using namespace Sapphire::Common;
@@ -33,8 +32,8 @@ using namespace Sapphire::Network::Packets;
 using namespace Sapphire::Network::Packets::Server;
 using namespace Sapphire::Network::ActorControl;
 
-Sapphire::Entity::Npc::Npc( ObjKind type, FrameworkPtr pFw ) :
-  Chara( type, pFw )
+Sapphire::Entity::Npc::Npc( ObjKind type ) :
+  Chara( type )
 {
 
 }
diff --git a/src/world/Actor/Npc.h b/src/world/Actor/Npc.h
index d7505364..bf7cb4f2 100644
--- a/src/world/Actor/Npc.h
+++ b/src/world/Actor/Npc.h
@@ -21,7 +21,7 @@ namespace Sapphire::Entity
   {
 
   public:
-    Npc( Common::ObjKind type, FrameworkPtr pFw );
+    Npc( Common::ObjKind type );
 
     virtual ~Npc() override;
 
diff --git a/src/world/Actor/Player.cpp b/src/world/Actor/Player.cpp
index 8565e7a4..e949afab 100644
--- a/src/world/Actor/Player.cpp
+++ b/src/world/Actor/Player.cpp
@@ -46,7 +46,6 @@
 #include "Math/CalcBattle.h"
 
 #include "ServerMgr.h"
-#include "Framework.h"
 
 using namespace Sapphire::Common;
 using namespace Sapphire::Network::Packets;
@@ -59,8 +58,8 @@ using InvSlotPair = std::pair< uint16_t, int8_t >;
 using InvSlotPairVec = std::vector< InvSlotPair >;
 
 // player constructor
-Sapphire::Entity::Player::Player( FrameworkPtr pFw ) :
-  Chara( ObjKind::Player, pFw ),
+Sapphire::Entity::Player::Player() :
+  Chara( ObjKind::Player ),
   m_lastWrite( 0 ),
   m_lastPing( 0 ),
   m_bIsLogin( false ),
@@ -201,9 +200,7 @@ bool Sapphire::Entity::Player::isMarkedForRemoval() const
 
 Sapphire::Common::OnlineStatus Sapphire::Entity::Player::getOnlineStatus() const
 {
-  auto pExdData = m_pFw->get< Data::ExdDataGenerated >();
-  if( !pExdData )
-    return OnlineStatus::Online;
+  auto& exdData = Common::Service< Data::ExdDataGenerated >::ref();
 
   uint32_t statusDisplayOrder = 0xFF14;
   uint32_t applicableStatus = static_cast< uint32_t >( OnlineStatus::Online );
@@ -215,7 +212,7 @@ Sapphire::Common::OnlineStatus Sapphire::Entity::Player::getOnlineStatus() const
     if( !bit )
       continue;
 
-    auto pOnlineStatus = pExdData->get< Data::OnlineStatus >( i );
+    auto pOnlineStatus = exdData.get< Data::OnlineStatus >( i );
     if( !pOnlineStatus )
       continue;
 
@@ -256,11 +253,11 @@ void Sapphire::Entity::Player::calculateStats()
   uint8_t level = getLevel();
   uint8_t job = static_cast< uint8_t >( getClass() );
 
-  auto pExdData = m_pFw->get< Data::ExdDataGenerated >();
+  auto& exdData = Common::Service< Data::ExdDataGenerated >::ref();
 
-  auto classInfo = pExdData->get< Sapphire::Data::ClassJob >( job );
-  auto tribeInfo = pExdData->get< Sapphire::Data::Tribe >( tribe );
-  auto paramGrowthInfo = pExdData->get< Sapphire::Data::ParamGrow >( level );
+  auto classInfo = exdData.get< Sapphire::Data::ClassJob >( job );
+  auto tribeInfo = exdData.get< Sapphire::Data::Tribe >( tribe );
+  auto paramGrowthInfo = exdData.get< Sapphire::Data::ParamGrow >( level );
 
   float base = Math::CalcStats::calculateBaseStat( *this );
 
@@ -293,7 +290,7 @@ void Sapphire::Entity::Player::calculateStats()
 
   m_baseStats.max_mp = 10000;
 
-  m_baseStats.max_hp = Math::CalcStats::calculateMaxHp( getAsPlayer(), m_pFw );
+  m_baseStats.max_hp = Math::CalcStats::calculateMaxHp( getAsPlayer() );
 
   if( m_mp > m_baseStats.max_mp )
     m_mp = m_baseStats.max_mp;
@@ -344,18 +341,18 @@ void Sapphire::Entity::Player::sendStats()
 
 void Sapphire::Entity::Player::teleport( uint16_t aetheryteId, uint8_t type )
 {
-  auto pExdData = m_pFw->get< Data::ExdDataGenerated >();
-  auto pTeriMgr = m_pFw->get< TerritoryMgr >();
+  auto& exdData = Common::Service< Data::ExdDataGenerated >::ref();
+  auto& terriMgr = Common::Service< TerritoryMgr >::ref();
 
-  auto data = pExdData->get< Sapphire::Data::Aetheryte >( aetheryteId );
+  auto data = exdData.get< Sapphire::Data::Aetheryte >( aetheryteId );
 
   if( data == nullptr )
     return;
 
   setStateFlag( PlayerStateFlag::BetweenAreas );
 
-  auto pInstanceObjectCache = m_pFw->get< InstanceObjectCache >();
-  auto pop = pInstanceObjectCache->getPopRange( data->territory, data->level[ 0 ] );
+  auto& instanceObjectCache = Common::Service< InstanceObjectCache >::ref();
+  auto pop = instanceObjectCache.getPopRange( data->territory, data->level[ 0 ] );
 
   Common::FFXIVARR_POSITION3 pos;
   pos.x = 0;
@@ -378,8 +375,8 @@ void Sapphire::Entity::Player::teleport( uint16_t aetheryteId, uint8_t type )
   }
 
   sendDebug( "Teleport: {0} {1} ({2})",
-             pExdData->get< Sapphire::Data::PlaceName >( data->placeName )->name,
-             pExdData->get< Sapphire::Data::PlaceName >( data->aethernetName )->name,
+             exdData.get< Sapphire::Data::PlaceName >( data->placeName )->name,
+             exdData.get< Sapphire::Data::PlaceName >( data->aethernetName )->name,
              data->territory );
 
   // TODO: this should be simplified and a type created in server_common/common.h.
@@ -421,16 +418,16 @@ void Sapphire::Entity::Player::returnToHomepoint()
 
 void Sapphire::Entity::Player::setZone( uint32_t zoneId )
 {
-  auto pTeriMgr = m_pFw->get< TerritoryMgr >();
+  auto& teriMgr = Common::Service< TerritoryMgr >::ref();
   m_onEnterEventDone = false;
-  if( !pTeriMgr->movePlayer( zoneId, getAsPlayer() ) )
+  if( !teriMgr.movePlayer( zoneId, getAsPlayer() ) )
   {
     // todo: this will require proper handling, for now just return the player to their previous area
     m_pos = m_prevPos;
     m_rot = m_prevRot;
     m_territoryTypeId = m_prevTerritoryTypeId;
 
-    if( !pTeriMgr->movePlayer( m_territoryTypeId, getAsPlayer() ) )
+    if( !teriMgr.movePlayer( m_territoryTypeId, getAsPlayer() ) )
       return;
   }
 
@@ -439,9 +436,9 @@ void Sapphire::Entity::Player::setZone( uint32_t zoneId )
 bool Sapphire::Entity::Player::setInstance( uint32_t instanceContentId )
 {
   m_onEnterEventDone = false;
-  auto pTeriMgr = m_pFw->get< TerritoryMgr >();
+  auto& teriMgr = Common::Service< TerritoryMgr >::ref();
 
-  auto instance = pTeriMgr->getTerritoryByGuId( instanceContentId );
+  auto instance = teriMgr.getTerritoryByGuId( instanceContentId );
   if( !instance )
     return false;
 
@@ -454,7 +451,7 @@ bool Sapphire::Entity::Player::setInstance( TerritoryPtr instance )
   if( !instance )
     return false;
 
-  auto pTeriMgr = m_pFw->get< TerritoryMgr >();
+  auto& teriMgr = Common::Service< TerritoryMgr >::ref();
   auto currentZone = getCurrentTerritory();
 
   // zoning within the same zone won't cause the prev data to be overwritten
@@ -466,7 +463,7 @@ bool Sapphire::Entity::Player::setInstance( TerritoryPtr instance )
     m_prevTerritoryId = getTerritoryId();
   }
 
-  return pTeriMgr->movePlayer( instance, getAsPlayer() );
+  return teriMgr.movePlayer( instance, getAsPlayer() );
 }
 
 bool Sapphire::Entity::Player::setInstance( TerritoryPtr instance, Common::FFXIVARR_POSITION3 pos )
@@ -475,7 +472,7 @@ bool Sapphire::Entity::Player::setInstance( TerritoryPtr instance, Common::FFXIV
   if( !instance )
     return false;
 
-  auto pTeriMgr = m_pFw->get< TerritoryMgr >();
+  auto& teriMgr = Common::Service< TerritoryMgr >::ref();
   auto currentZone = getCurrentTerritory();
 
   // zoning within the same zone won't cause the prev data to be overwritten
@@ -487,7 +484,7 @@ bool Sapphire::Entity::Player::setInstance( TerritoryPtr instance, Common::FFXIV
     m_prevTerritoryId = getTerritoryId();
   }
 
-  if( pTeriMgr->movePlayer( instance, getAsPlayer() ) )
+  if( teriMgr.movePlayer( instance, getAsPlayer() ) )
   {
     m_pos = pos;
     return true;
@@ -498,7 +495,7 @@ bool Sapphire::Entity::Player::setInstance( TerritoryPtr instance, Common::FFXIV
 
 bool Sapphire::Entity::Player::exitInstance()
 {
-  auto pTeriMgr = m_pFw->get< TerritoryMgr >();
+  auto& teriMgr = Common::Service< TerritoryMgr >::ref();
 
   auto pZone = getCurrentTerritory();
   auto pInstance = pZone->getAsInstanceContent();
@@ -507,14 +504,14 @@ bool Sapphire::Entity::Player::exitInstance()
   resetMp();
 
   // check if housing zone
-  if( pTeriMgr->isHousingTerritory( m_prevTerritoryTypeId ) )
+  if( teriMgr.isHousingTerritory( m_prevTerritoryTypeId ) )
   {
-    if( !pTeriMgr->movePlayer( pTeriMgr->getZoneByLandSetId( m_prevTerritoryId ), getAsPlayer() ) )
+    if( !teriMgr.movePlayer( teriMgr.getZoneByLandSetId( m_prevTerritoryId ), getAsPlayer() ) )
       return false;
   }
   else
   {
-    if( !pTeriMgr->movePlayer( m_prevTerritoryTypeId, getAsPlayer() ) )
+    if( !teriMgr.movePlayer( m_prevTerritoryTypeId, getAsPlayer() ) )
       return false;
   }
 
@@ -602,12 +599,12 @@ void Sapphire::Entity::Player::discover( int16_t map_id, int16_t sub_id )
 
   // section to starts at 320 - 4 bytes long
 
-  auto pExdData = m_pFw->get< Data::ExdDataGenerated >();
+  auto& exdData = Common::Service< Data::ExdDataGenerated >::ref();
 
   int32_t offset = 4;
 
-  auto info = pExdData->get< Sapphire::Data::Map >(
-    pExdData->get< Sapphire::Data::TerritoryType >( getCurrentTerritory()->getTerritoryTypeId() )->map );
+  auto info = exdData.get< Sapphire::Data::Map >(
+    exdData.get< Sapphire::Data::TerritoryType >( getCurrentTerritory()->getTerritoryTypeId() )->map );
   if( info->discoveryArrayByte )
     offset = 5 + 2 * info->discoveryIndex;
   else
@@ -622,7 +619,7 @@ void Sapphire::Entity::Player::discover( int16_t map_id, int16_t sub_id )
 
   uint16_t level = getLevel();
 
-  uint32_t exp = ( pExdData->get< Sapphire::Data::ParamGrow >( level )->expToNext * 5 / 100 );
+  uint32_t exp = ( exdData.get< Sapphire::Data::ParamGrow >( level )->expToNext * 5 / 100 );
 
   gainExp( exp );
 
@@ -706,11 +703,11 @@ void Sapphire::Entity::Player::gainExp( uint32_t amount )
     return;
   }
 
-  auto pExdData = m_pFw->get< Data::ExdDataGenerated >();
+  auto& exdData = Common::Service< Data::ExdDataGenerated >::ref();
 
-  uint32_t neededExpToLevel = pExdData->get< Sapphire::Data::ParamGrow >( level )->expToNext;
+  uint32_t neededExpToLevel = exdData.get< Sapphire::Data::ParamGrow >( level )->expToNext;
 
-  uint32_t neededExpToLevelplus1 = pExdData->get< Sapphire::Data::ParamGrow >( level + 1 )->expToNext;
+  uint32_t neededExpToLevelplus1 = exdData.get< Sapphire::Data::ParamGrow >( level + 1 )->expToNext;
 
   queuePacket( makeActorControlSelf( getId(), GainExpMsg, static_cast< uint8_t >( getClass() ), amount ) );
 
@@ -778,15 +775,15 @@ void Sapphire::Entity::Player::sendStatusUpdate()
 
 uint8_t Sapphire::Entity::Player::getLevel() const
 {
-  auto pExdData = m_pFw->get< Data::ExdDataGenerated >();
-  uint8_t classJobIndex = pExdData->get< Sapphire::Data::ClassJob >( static_cast< uint8_t >( getClass() ) )->expArrayIndex;
+  auto& exdData = Common::Service< Data::ExdDataGenerated >::ref();
+  uint8_t classJobIndex = exdData.get< Sapphire::Data::ClassJob >( static_cast< uint8_t >( getClass() ) )->expArrayIndex;
   return static_cast< uint8_t >( m_classArray[ classJobIndex ] );
 }
 
 uint8_t Sapphire::Entity::Player::getLevelForClass( Common::ClassJob pClass ) const
 {
-  auto pExdData = m_pFw->get< Data::ExdDataGenerated >();
-  uint8_t classJobIndex = pExdData->get< Sapphire::Data::ClassJob >( static_cast< uint8_t >( pClass ) )->expArrayIndex;
+  auto& exdData = Common::Service< Data::ExdDataGenerated >::ref();
+  uint8_t classJobIndex = exdData.get< Sapphire::Data::ClassJob >( static_cast< uint8_t >( pClass ) )->expArrayIndex;
   return static_cast< uint8_t >( m_classArray[ classJobIndex ] );
 }
 
@@ -798,15 +795,15 @@ bool Sapphire::Entity::Player::isClassJobUnlocked( Common::ClassJob classJob ) c
 
 uint32_t Sapphire::Entity::Player::getExp() const
 {
-  auto pExdData = m_pFw->get< Data::ExdDataGenerated >();
-  uint8_t classJobIndex = pExdData->get< Sapphire::Data::ClassJob >( static_cast< uint8_t >( getClass() ) )->expArrayIndex;
+  auto& exdData = Common::Service< Data::ExdDataGenerated >::ref();
+  uint8_t classJobIndex = exdData.get< Sapphire::Data::ClassJob >( static_cast< uint8_t >( getClass() ) )->expArrayIndex;
   return m_expArray[ classJobIndex ];
 }
 
 void Sapphire::Entity::Player::setExp( uint32_t amount )
 {
-  auto pExdData = m_pFw->get< Data::ExdDataGenerated >();
-  uint8_t classJobIndex = pExdData->get< Sapphire::Data::ClassJob >( static_cast< uint8_t >( getClass() ) )->expArrayIndex;
+  auto exdData = Common::Service< Data::ExdDataGenerated >::ref();
+  uint8_t classJobIndex = exdData.get< Sapphire::Data::ClassJob >( static_cast< uint8_t >( getClass() ) )->expArrayIndex;
   m_expArray[ classJobIndex ] = amount;
 }
 
@@ -847,15 +844,15 @@ void Sapphire::Entity::Player::setClassJob( Common::ClassJob classJob )
 
 void Sapphire::Entity::Player::setLevel( uint8_t level )
 {
-  auto pExdData = m_pFw->get< Data::ExdDataGenerated >();
-  uint8_t classJobIndex = pExdData->get< Sapphire::Data::ClassJob >( static_cast< uint8_t >( getClass() ) )->expArrayIndex;
+  auto& exdData = Common::Service< Data::ExdDataGenerated >::ref();
+  uint8_t classJobIndex = exdData.get< Sapphire::Data::ClassJob >( static_cast< uint8_t >( getClass() ) )->expArrayIndex;
   m_classArray[ classJobIndex ] = level;
 }
 
 void Sapphire::Entity::Player::setLevelForClass( uint8_t level, Common::ClassJob classjob )
 {
-  auto pExdData = m_pFw->get< Data::ExdDataGenerated >();
-  uint8_t classJobIndex = pExdData->get< Sapphire::Data::ClassJob >( static_cast< uint8_t >( classjob ) )->expArrayIndex;
+  auto& exdData = Common::Service< Data::ExdDataGenerated >::ref();
+  uint8_t classJobIndex = exdData.get< Sapphire::Data::ClassJob >( static_cast< uint8_t >( classjob ) )->expArrayIndex;
 
   if( m_classArray[ classJobIndex ] == 0 )
     insertDbClass( classJobIndex );
@@ -997,8 +994,8 @@ const uint8_t* Sapphire::Entity::Player::getStateFlags() const
 
 bool Sapphire::Entity::Player::actionHasCastTime( uint32_t actionId ) //TODO: Add logic for special cases
 {
-  auto pExdData = m_pFw->get< Data::ExdDataGenerated >();
-  auto actionInfoPtr = pExdData->get< Sapphire::Data::Action >( actionId );
+  auto& exdData = Common::Service< Data::ExdDataGenerated >::ref();
+  auto actionInfoPtr = exdData.get< Sapphire::Data::Action >( actionId );
   if( actionInfoPtr->preservesCombo )
     return false;
 
@@ -1149,8 +1146,8 @@ void Sapphire::Entity::Player::update( uint64_t tickCount )
 
 void Sapphire::Entity::Player::onMobKill( uint16_t nameId )
 {
-  auto pScriptMgr = m_pFw->get< Scripting::ScriptMgr >();
-  pScriptMgr->onBNpcKill( *getAsPlayer(), nameId );
+  auto& scriptMgr = Common::Service< Scripting::ScriptMgr >::ref();
+  scriptMgr.onBNpcKill( *getAsPlayer(), nameId );
 
   if( isActionLearned( static_cast< uint8_t >( Common::UnlockEntry::HuntingLog ) ) )
   {
@@ -1535,10 +1532,9 @@ void Sapphire::Entity::Player::dismount()
 
 void Sapphire::Entity::Player::spawnCompanion( uint16_t id )
 {
-  auto exdData = m_pFw->get< Data::ExdDataGenerated >();
-  assert( exdData );
+  auto& exdData = Common::Service< Data::ExdDataGenerated >::ref();
 
-  auto companion = exdData->get< Data::Companion >( id );
+  auto companion = exdData.get< Data::Companion >( id );
   if( !id )
     return;
 
@@ -1575,8 +1571,8 @@ void Sapphire::Entity::Player::autoAttack( CharaPtr pTarget )
   //uint64_t tick = Util::getTimeMs();
   //srand(static_cast< uint32_t >(tick));
 
-  auto pRNGMgr = m_pFw->get< World::Manager::RNGMgr >();
-  auto variation = static_cast< uint32_t >( pRNGMgr->getRandGenerator< float >( 0, 3 ).next() );
+  auto& RNGMgr = Common::Service< World::Manager::RNGMgr >::ref();
+  auto variation = static_cast< uint32_t >( RNGMgr.getRandGenerator< float >( 0, 3 ).next() );
 
   auto damage = Math::CalcStats::calcAutoAttackDamage( *this );
 
@@ -1741,8 +1737,8 @@ void Sapphire::Entity::Player::sendZonePackets()
     sendItemLevel();
   }
 
-  auto pHousingMgr = m_pFw->get< HousingMgr >();
-  if( Sapphire::LandPtr pLand = pHousingMgr->getLandByOwnerId( getId() ) )
+  auto& housingMgr = Common::Service< HousingMgr >::ref();
+  if( Sapphire::LandPtr pLand = housingMgr.getLandByOwnerId( getId() ) )
   {
     uint32_t state = 0;
 
@@ -1869,14 +1865,14 @@ void Sapphire::Entity::Player::emoteInterrupt()
 
 void Sapphire::Entity::Player::teleportQuery( uint16_t aetheryteId )
 {
-  auto pExdData = m_pFw->get< Data::ExdDataGenerated >();
+  auto& exdData = Common::Service< Data::ExdDataGenerated >::ref();
   // TODO: only register this action if enough gil is in possession
-  auto targetAetheryte = pExdData->get< Sapphire::Data::Aetheryte >( aetheryteId );
+  auto targetAetheryte = exdData.get< Sapphire::Data::Aetheryte >( aetheryteId );
 
   if( targetAetheryte )
   {
-    auto fromAetheryte = pExdData->get< Sapphire::Data::Aetheryte >(
-      pExdData->get< Sapphire::Data::TerritoryType >( getZoneId() )->aetheryte );
+    auto fromAetheryte = exdData.get< Sapphire::Data::Aetheryte >(
+      exdData.get< Sapphire::Data::TerritoryType >( getZoneId() )->aetheryte );
 
     // calculate cost - does not apply for favorite points or homepoints neither checks for aether tickets
     auto cost = static_cast< uint16_t > (
@@ -2020,7 +2016,7 @@ Sapphire::Common::HuntingLogEntry& Sapphire::Entity::Player::getHuntingLogEntry(
 
 void Sapphire::Entity::Player::sendHuntingLog()
 {
-  auto pExdData = m_pFw->get< Data::ExdDataGenerated >();
+  auto& exdData = Common::Service< Data::ExdDataGenerated >::ref();
   uint8_t count = 0;
   for( const auto& entry : m_huntingLogEntries )
   {
@@ -2037,7 +2033,7 @@ void Sapphire::Entity::Player::sendHuntingLog()
       bool allComplete = true;
       auto monsterNoteId = ( count + 1 ) * 10000 + entry.rank * 10 + i;
 
-      auto monsterNote = pExdData->get< Data::MonsterNote >( monsterNoteId );
+      auto monsterNote = exdData.get< Data::MonsterNote >( monsterNoteId );
       if( !monsterNote )
         continue;
 
@@ -2066,7 +2062,7 @@ void Sapphire::Entity::Player::updateHuntingLog( uint16_t id )
 {
   std::vector< uint32_t > rankRewards{ 2500, 10000, 20000, 30000, 40000 };
   const auto maxRank = 4;
-  auto pExdData = m_pFw->get< Data::ExdDataGenerated >();
+  auto& pExdData = Common::Service< Data::ExdDataGenerated >::ref();
 
   auto& logEntry = m_huntingLogEntries[ static_cast< uint8_t >( getClass() ) - 1 ];
 
@@ -2074,7 +2070,7 @@ void Sapphire::Entity::Player::updateHuntingLog( uint16_t id )
 
   // make sure we get the matching base-class if a job is being used
   auto currentClass = static_cast< uint8_t >( getClass() );
-  auto classJobInfo = pExdData->get< Sapphire::Data::ClassJob >( currentClass );
+  auto classJobInfo = pExdData.get< Sapphire::Data::ClassJob >( currentClass );
   if( !classJobInfo )
     return;
 
@@ -2084,7 +2080,7 @@ void Sapphire::Entity::Player::updateHuntingLog( uint16_t id )
     bool sectionComplete = true;
     bool sectionChanged = false;
     uint32_t monsterNoteId = static_cast< uint32_t >( classJobInfo->classJobParent * 10000 + logEntry.rank * 10 + i );
-    auto note = pExdData->get< Sapphire::Data::MonsterNote >( monsterNoteId );
+    auto note = pExdData.get< Sapphire::Data::MonsterNote >( monsterNoteId );
 
     // for classes that don't have entries, if the first fails the rest will fail
     if( !note )
@@ -2092,7 +2088,7 @@ void Sapphire::Entity::Player::updateHuntingLog( uint16_t id )
 
     for( auto x = 0; x < 4; ++x )
     {
-      auto note1 = pExdData->get< Sapphire::Data::MonsterNoteTarget >( note->monsterNoteTarget[ x ] );
+      auto note1 = pExdData.get< Sapphire::Data::MonsterNoteTarget >( note->monsterNoteTarget[ x ] );
       if( note1->bNpcName == id && logEntry.entries[ i - 1 ][ x ] < note->count[ x ] )
       {
         logEntry.entries[ i - 1 ][ x ]++;
diff --git a/src/world/Actor/Player.h b/src/world/Actor/Player.h
index 7dd294db..003c85d0 100644
--- a/src/world/Actor/Player.h
+++ b/src/world/Actor/Player.h
@@ -41,7 +41,7 @@ namespace Sapphire::Entity
   {
   public:
     /*! Contructor */
-    Player( FrameworkPtr pFw );
+    Player();
 
     /*! Destructor */
     ~Player();
diff --git a/src/world/Actor/PlayerEvent.cpp b/src/world/Actor/PlayerEvent.cpp
index e8d79f5a..a0189b8b 100644
--- a/src/world/Actor/PlayerEvent.cpp
+++ b/src/world/Actor/PlayerEvent.cpp
@@ -14,7 +14,6 @@
 
 #include "Territory/Territory.h"
 #include "ServerMgr.h"
-#include "Framework.h"
 
 #include "Action/EventAction.h"
 
@@ -300,7 +299,7 @@ void Sapphire::Entity::Player::eventActionStart( uint32_t eventId,
                                                  uint64_t additional )
 {
   auto pEventAction = World::Action::make_EventAction( getAsChara(), eventId, action,
-                                                finishCallback, interruptCallback, additional, m_pFw );
+                                                finishCallback, interruptCallback, additional );
 
   auto pEvent = getEvent( eventId );
 
diff --git a/src/world/Actor/PlayerInventory.cpp b/src/world/Actor/PlayerInventory.cpp
index 963830ae..e6406c5f 100644
--- a/src/world/Actor/PlayerInventory.cpp
+++ b/src/world/Actor/PlayerInventory.cpp
@@ -14,7 +14,6 @@
 
 
 #include "Player.h"
-#include "Framework.h"
 
 #include <Network/PacketDef/Zone/ServerZoneDef.h>
 
@@ -30,8 +29,7 @@
 #include "Manager/InventoryMgr.h"
 #include "Manager/ItemMgr.h"
 
-#include "Framework.h"
-#include <Network/CommonActorControl.h>
+#include <Service.h>
 
 using namespace Sapphire::Common;
 using namespace Sapphire::Network::Packets;
@@ -43,7 +41,7 @@ void Sapphire::Entity::Player::initInventory()
 {
   auto setupContainer = [ this ]( InventoryType type, uint8_t maxSize, const std::string& tableName,
                                   bool isMultiStorage, bool isPersistentStorage = true )
-  { m_storageMap[ type ] = make_ItemContainer( type, maxSize, tableName, isMultiStorage, m_pFw, isPersistentStorage ); };
+  { m_storageMap[ type ] = make_ItemContainer( type, maxSize, tableName, isMultiStorage, isPersistentStorage ); };
 
   // main bags
   setupContainer( Bag0, 34, "charaiteminventory", true );
@@ -114,13 +112,11 @@ void Sapphire::Entity::Player::sendItemLevel()
 
 void Sapphire::Entity::Player::equipWeapon( ItemPtr pItem, bool updateClass )
 {
-  auto exdData = m_pFw->get< Sapphire::Data::ExdDataGenerated >();
-  if( !exdData )
-    return;
+  auto& exdData = Common::Service< Sapphire::Data::ExdDataGenerated >::ref();
 
-  auto itemInfo = exdData->get< Sapphire::Data::Item >( pItem->getId() );
+  auto itemInfo = exdData.get< Sapphire::Data::Item >( pItem->getId() );
   auto itemClassJob = itemInfo->classJobUse;
-  auto classJobInfo = exdData->get< Sapphire::Data::ClassJob >( static_cast< uint32_t >( getClass() ) );
+  auto classJobInfo = exdData.get< Sapphire::Data::ClassJob >( static_cast< uint32_t >( getClass() ) );
   auto currentParentClass = static_cast< ClassJob >( classJobInfo->classJobParent );
   auto newClassJob = static_cast< ClassJob >( itemClassJob );
 
@@ -135,11 +131,9 @@ void Sapphire::Entity::Player::equipWeapon( ItemPtr pItem, bool updateClass )
 
 void Sapphire::Entity::Player::equipSoulCrystal( ItemPtr pItem, bool updateJob )
 {
-  auto exdData = m_pFw->get< Sapphire::Data::ExdDataGenerated >();
-  if ( !exdData )
-    return;
+  auto exdData = Common::Service< Sapphire::Data::ExdDataGenerated >::ref();
 
-  auto itemInfo = exdData->get< Sapphire::Data::Item >( pItem->getId() );
+  auto itemInfo = exdData.get< Sapphire::Data::Item >( pItem->getId() );
   auto itemClassJob = itemInfo->classJobUse;
   auto newClassJob = static_cast< ClassJob >( itemClassJob );
 
@@ -296,11 +290,9 @@ void Sapphire::Entity::Player::unequipItem( Common::GearSetSlot equipSlotId, Ite
 
 void Sapphire::Entity::Player::unequipSoulCrystal( ItemPtr pItem )
 {
-  auto exdData = m_pFw->get< Sapphire::Data::ExdDataGenerated >();
-  if ( !exdData )
-    return;
+  auto& exdData = Common::Service< Sapphire::Data::ExdDataGenerated >::ref();
 
-  auto currentClassJob = exdData->get< Sapphire::Data::ClassJob >( static_cast< uint32_t >( getClass() ) );
+  auto currentClassJob = exdData.get< Sapphire::Data::ClassJob >( static_cast< uint32_t >( getClass() ) );
   auto parentClass = static_cast< ClassJob >( currentClassJob->classJobParent );
   setClassJob( parentClass );
 }
@@ -406,11 +398,11 @@ void Sapphire::Entity::Player::removeCrystal( Common::CrystalType type, uint32_t
 
 void Sapphire::Entity::Player::sendInventory()
 {
-  auto pInvMgr = m_pFw->get< World::Manager::InventoryMgr >();
+  auto& invMgr = Common::Service< World::Manager::InventoryMgr >::ref();
 
   for( auto it = m_storageMap.begin(); it != m_storageMap.end(); ++it )
   {
-    pInvMgr->sendInventoryContainer( *this, it->second );
+    invMgr.sendInventoryContainer( *this, it->second );
   }
 }
 
@@ -474,7 +466,7 @@ uint32_t Sapphire::Entity::Player::getCrystal( CrystalType type )
 
 void Sapphire::Entity::Player::writeInventory( InventoryType type )
 {
-  auto pDb = m_pFw->get< Db::DbWorkerPool< Db::ZoneDbConnection > >();
+  auto& db = Common::Service< Db::DbWorkerPool< Db::ZoneDbConnection > >::ref();
 
   auto storage = m_storageMap[ type ];
 
@@ -498,13 +490,13 @@ void Sapphire::Entity::Player::writeInventory( InventoryType type )
   if( storage->isMultiStorage() )
     query += " AND storageId = " + std::to_string( static_cast< uint16_t >( type ) );
 
-  pDb->execute( query );
+  db.execute( query );
 }
 
 void Sapphire::Entity::Player::writeItem( Sapphire::ItemPtr pItem ) const
 {
-  auto pDb = m_pFw->get< Db::DbWorkerPool< Db::ZoneDbConnection > >();
-  auto stmt = pDb->getPreparedStatement( Db::CHARA_ITEMGLOBAL_UP );
+  auto& db = Common::Service< Db::DbWorkerPool< Db::ZoneDbConnection > >::ref();
+  auto stmt = db.getPreparedStatement( Db::CHARA_ITEMGLOBAL_UP );
 
   // todo: add more fields
   stmt->setInt( 1, pItem->getStackSize() );
@@ -513,17 +505,17 @@ void Sapphire::Entity::Player::writeItem( Sapphire::ItemPtr pItem ) const
 
   stmt->setInt64( 4, pItem->getUId() );
 
-  pDb->directExecute( stmt );
+  db.directExecute( stmt );
 }
 
 void Sapphire::Entity::Player::deleteItemDb( Sapphire::ItemPtr item ) const
 {
-  auto pDb = m_pFw->get< Db::DbWorkerPool< Db::ZoneDbConnection > >();
-  auto stmt = pDb->getPreparedStatement( Db::CHARA_ITEMGLOBAL_DELETE );
+  auto& db = Common::Service< Db::DbWorkerPool< Db::ZoneDbConnection > >::ref();
+  auto stmt = db.getPreparedStatement( Db::CHARA_ITEMGLOBAL_DELETE );
 
   stmt->setInt64( 1, item->getUId() );
 
-  pDb->directExecute( stmt );
+  db.directExecute( stmt );
 }
 
 
@@ -536,9 +528,8 @@ bool Sapphire::Entity::Player::isObtainable( uint32_t catalogId, uint8_t quantit
 
 Sapphire::ItemPtr Sapphire::Entity::Player::addItem( uint32_t catalogId, uint32_t quantity, bool isHq, bool silent, bool canMerge )
 {
-  auto pDb = m_pFw->get< Db::DbWorkerPool< Db::ZoneDbConnection > >();
-  auto pExdData = m_pFw->get< Data::ExdDataGenerated >();
-  auto itemInfo = pExdData->get< Sapphire::Data::Item >( catalogId );
+  auto& exdData = Common::Service< Data::ExdDataGenerated >::ref();
+  auto itemInfo = exdData.get< Sapphire::Data::Item >( catalogId );
 
   // if item data doesn't exist or it's a blank field
   if( !itemInfo || itemInfo->levelItem == 0 )
diff --git a/src/world/Actor/PlayerQuest.cpp b/src/world/Actor/PlayerQuest.cpp
index 444569b0..854cdc13 100644
--- a/src/world/Actor/PlayerQuest.cpp
+++ b/src/world/Actor/PlayerQuest.cpp
@@ -2,12 +2,12 @@
 #include <Network/PacketDef/Zone/ServerZoneDef.h>
 #include <Exd/ExdDataGenerated.h>
 #include <Network/PacketContainer.h>
+#include <Service.h>
 
 #include "Network/GameConnection.h"
 #include "Network/PacketWrappers/QuestMessagePacket.h"
 
 #include "Session.h"
-#include "Framework.h"
 
 using namespace Sapphire::Common;
 using namespace Sapphire::Network::Packets;
@@ -1036,15 +1036,15 @@ void Sapphire::Entity::Player::removeQuestsCompleted( uint32_t questId )
 
 bool Sapphire::Entity::Player::giveQuestRewards( uint32_t questId, uint32_t optionalChoice )
 {
-  auto pExdData = m_pFw->get< Data::ExdDataGenerated >();
+  auto& exdData = Common::Service< Data::ExdDataGenerated >::ref();
   uint32_t playerLevel = getLevel();
-  auto questInfo = pExdData->get< Sapphire::Data::Quest >( questId );
+  auto questInfo = exdData.get< Sapphire::Data::Quest >( questId );
 
 
   if( !questInfo )
     return false;
 
-  auto paramGrowth = pExdData->get< Sapphire::Data::ParamGrow >( questInfo->classJobLevel0 );
+  auto paramGrowth = exdData.get< Sapphire::Data::ParamGrow >( questInfo->classJobLevel0 );
 
   // TODO: use the correct formula, this one is wrong
   uint32_t exp =
diff --git a/src/world/Actor/PlayerSql.cpp b/src/world/Actor/PlayerSql.cpp
index 5a8edafb..1547e744 100644
--- a/src/world/Actor/PlayerSql.cpp
+++ b/src/world/Actor/PlayerSql.cpp
@@ -8,6 +8,7 @@
 #include <Network/PacketContainer.h>
 #include <Common.h>
 #include <Database/DatabaseDef.h>
+#include <Service.h>
 
 #include "Network/GameConnection.h"
 #include "Network/PacketWrappers/PlayerSetupPacket.h"
@@ -19,7 +20,6 @@
 #include "Manager/ItemMgr.h"
 
 #include "ServerMgr.h"
-#include "Framework.h"
 
 using namespace Sapphire::Common;
 using namespace Sapphire::Network::Packets;
@@ -29,16 +29,16 @@ using namespace Sapphire::World::Manager;
 // load player from the db
 bool Sapphire::Entity::Player::load( uint32_t charId, World::SessionPtr pSession )
 {
-  auto pDb = m_pFw->get< Db::DbWorkerPool< Db::ZoneDbConnection > >();
-  auto pTeriMgr = m_pFw->get< TerritoryMgr >();
+  auto& db = Common::Service< Db::DbWorkerPool< Db::ZoneDbConnection > >::ref();
+  auto& teriMgr = Common::Service< TerritoryMgr >::ref();
   m_pSession = pSession;
 
   const std::string char_id_str = std::to_string( charId );
 
-  auto stmt = pDb->getPreparedStatement( Db::ZoneDbStatements::CHARA_SEL );
+  auto stmt = db.getPreparedStatement( Db::ZoneDbStatements::CHARA_SEL );
 
   stmt->setUInt( 1, charId );
-  auto res = pDb->query( stmt );
+  auto res = db.query( stmt );
 
   if( !res->next() )
     return false;
@@ -67,10 +67,10 @@ bool Sapphire::Entity::Player::load( uint32_t charId, World::SessionPtr pSession
   TerritoryPtr pCurrZone = nullptr;
 
   // if the zone is an instanceContent zone, we need to actually find the instance
-  if( pTeriMgr->isInstanceContentTerritory( zoneId ) )
+  if( teriMgr.isInstanceContentTerritory( zoneId ) )
   {
     // try to find an instance actually linked to this player
-    pCurrZone = pTeriMgr->getLinkedInstance( m_id );
+    pCurrZone = teriMgr.getLinkedInstance( m_id );
     // if none found, revert to previous zone and position
     if( !pCurrZone )
     {
@@ -79,13 +79,13 @@ bool Sapphire::Entity::Player::load( uint32_t charId, World::SessionPtr pSession
       m_pos.y = m_prevPos.y;
       m_pos.z = m_prevPos.z;
       setRot( m_prevRot );
-      pCurrZone = pTeriMgr->getZoneByTerritoryTypeId( zoneId );
+      pCurrZone = teriMgr.getZoneByTerritoryTypeId( zoneId );
     }
   }
-  else if( pTeriMgr->isInternalEstateTerritory( zoneId ) )
+  else if( teriMgr.isInternalEstateTerritory( zoneId ) )
   {
     // todo: this needs to go to the area just outside of the plot door
-    pCurrZone = pTeriMgr->getZoneByLandSetId( m_prevTerritoryId );
+    pCurrZone = teriMgr.getZoneByLandSetId( m_prevTerritoryId );
 
     zoneId = m_prevTerritoryTypeId;
     m_pos.x = m_prevPos.x;
@@ -93,13 +93,13 @@ bool Sapphire::Entity::Player::load( uint32_t charId, World::SessionPtr pSession
     m_pos.z = m_prevPos.z;
     setRot( m_prevRot );
   }
-  else if( pTeriMgr->isHousingTerritory( zoneId ) )
+  else if( teriMgr.isHousingTerritory( zoneId ) )
   {
-    pCurrZone = pTeriMgr->getZoneByLandSetId( m_territoryId );
+    pCurrZone = teriMgr.getZoneByLandSetId( m_territoryId );
   }
   else
   {
-    pCurrZone = pTeriMgr->getZoneByTerritoryTypeId( zoneId );
+    pCurrZone = teriMgr.getZoneByTerritoryTypeId( zoneId );
   }
 
   m_territoryTypeId = zoneId;
@@ -113,7 +113,7 @@ bool Sapphire::Entity::Player::load( uint32_t charId, World::SessionPtr pSession
 
     // default to new gridania
     // TODO: should probably just abort and mark character as corrupt
-    pCurrZone = pTeriMgr->getZoneByTerritoryTypeId( 132 );
+    pCurrZone = teriMgr.getZoneByTerritoryTypeId( 132 );
 
     m_pos.x = 0.0f;
     m_pos.y = 0.0f;
@@ -250,7 +250,7 @@ bool Sapphire::Entity::Player::load( uint32_t charId, World::SessionPtr pSession
 
   initSpawnIdQueue();
 
-  if( !pTeriMgr->movePlayer( pCurrZone, getAsPlayer() ) )
+  if( !teriMgr.movePlayer( pCurrZone, getAsPlayer() ) )
     return false;
 
   return true;
@@ -258,11 +258,11 @@ bool Sapphire::Entity::Player::load( uint32_t charId, World::SessionPtr pSession
 
 bool Sapphire::Entity::Player::loadActiveQuests()
 {
-  auto pDb = m_pFw->get< Db::DbWorkerPool< Db::ZoneDbConnection > >();
-  auto stmt = pDb->getPreparedStatement( Db::ZoneDbStatements::CHARA_SEL_QUEST );
+  auto& db = Common::Service< Db::DbWorkerPool< Db::ZoneDbConnection > >::ref();
+  auto stmt = db.getPreparedStatement( Db::ZoneDbStatements::CHARA_SEL_QUEST );
 
   stmt->setUInt( 1, m_id );
-  auto res = pDb->query( stmt );
+  auto res = db.query( stmt );
 
   while( res->next() )
   {
@@ -294,11 +294,11 @@ bool Sapphire::Entity::Player::loadActiveQuests()
 
 bool Sapphire::Entity::Player::loadClassData()
 {
-  auto pDb = m_pFw->get< Db::DbWorkerPool< Db::ZoneDbConnection > >();
+  auto& db = Common::Service< Db::DbWorkerPool< Db::ZoneDbConnection > >::ref();
   // ClassIdx, Exp, Lvl
-  auto stmt = pDb->getPreparedStatement( Db::ZoneDbStatements::CHARA_CLASS_SEL );
+  auto stmt = db.getPreparedStatement( Db::ZoneDbStatements::CHARA_CLASS_SEL );
   stmt->setUInt( 1, m_id );
-  auto res = pDb->query( stmt );
+  auto res = db.query( stmt );
 
   while( res->next() )
   {
@@ -315,10 +315,10 @@ bool Sapphire::Entity::Player::loadClassData()
 
 bool Sapphire::Entity::Player::loadSearchInfo()
 {
-  auto pDb = m_pFw->get< Db::DbWorkerPool< Db::ZoneDbConnection > >();
-  auto stmt = pDb->getPreparedStatement( Db::ZoneDbStatements::CHARA_SEL_SEARCHINFO );
+  auto& db = Common::Service< Db::DbWorkerPool< Db::ZoneDbConnection > >::ref();
+  auto stmt = db.getPreparedStatement( Db::ZoneDbStatements::CHARA_SEL_SEARCHINFO );
   stmt->setUInt( 1, m_id );
-  auto res = pDb->query( stmt );
+  auto res = db.query( stmt );
 
   if( !res->next() )
   {
@@ -340,10 +340,10 @@ bool Sapphire::Entity::Player::loadSearchInfo()
 
 bool Sapphire::Entity::Player::loadHuntingLog()
 {
-  auto pDb = m_pFw->get< Db::DbWorkerPool< Db::ZoneDbConnection > >();
-  auto stmt = pDb->getPreparedStatement( Db::ZoneDbStatements::CHARA_MONSTERNOTE_SEL );
+  auto& db = Common::Service< Db::DbWorkerPool< Db::ZoneDbConnection > >::ref();
+  auto stmt = db.getPreparedStatement( Db::ZoneDbStatements::CHARA_MONSTERNOTE_SEL );
   stmt->setUInt( 1, m_id );
-  auto res = pDb->query( stmt );
+  auto res = db.query( stmt );
 
   if( !res->next() )
   {
@@ -363,7 +363,7 @@ bool Sapphire::Entity::Player::loadHuntingLog()
 
 void Sapphire::Entity::Player::updateSql()
 {
-  auto pDb = m_pFw->get< Db::DbWorkerPool< Db::ZoneDbConnection > >();
+  auto& db = Common::Service< Db::DbWorkerPool< Db::ZoneDbConnection > >::ref();
   /*"Hp 1, Mp 2, Tp 3, Gp 4, Mode 5, Mount 6, InvincibleGM 7, Voice 8, "
   "Customize 9, ModelMainWeapon 10, ModelSubWeapon 11, ModelSystemWeapon 12, "
   "ModelEquip 13, EmoteModeType 14, Language 15, IsNewGame 16, IsNewAdventurer 17, "
@@ -377,7 +377,7 @@ void Sapphire::Entity::Player::updateSql()
 
 
 
-  auto stmt = pDb->getPreparedStatement( Db::ZoneDbStatements::CHARA_UP );
+  auto stmt = db.getPreparedStatement( Db::ZoneDbStatements::CHARA_UP );
 
   stmt->setInt( 1, getHp() );
   stmt->setInt( 2, getMp() );
@@ -490,7 +490,7 @@ void Sapphire::Entity::Player::updateSql()
 
   stmt->setInt( 57, m_id );
 
-  pDb->execute( stmt );
+  db.execute( stmt );
 
   ////// Searchinfo
   updateDbSearchInfo();
@@ -508,24 +508,24 @@ void Sapphire::Entity::Player::updateSql()
 
 void Sapphire::Entity::Player::updateDbClass() const
 {
-  auto pDb = m_pFw->get< Db::DbWorkerPool< Db::ZoneDbConnection > >();
-  auto pExdData = m_pFw->get< Data::ExdDataGenerated >();
-  uint8_t classJobIndex = pExdData->get< Sapphire::Data::ClassJob >( static_cast<uint8_t>( getClass() ) )->expArrayIndex;
+  auto& db = Common::Service< Db::DbWorkerPool< Db::ZoneDbConnection > >::ref();
+  auto& exdData = Common::Service< Data::ExdDataGenerated >::ref();
+  uint8_t classJobIndex = exdData.get< Sapphire::Data::ClassJob >( static_cast<uint8_t>( getClass() ) )->expArrayIndex;
 
   //Exp = ?, Lvl = ? WHERE CharacterId = ? AND ClassIdx = ?
-  auto stmtS = pDb->getPreparedStatement( Db::CHARA_CLASS_UP );
+  auto stmtS = db.getPreparedStatement( Db::CHARA_CLASS_UP );
   stmtS->setInt( 1, getExp() );
   stmtS->setInt( 2, getLevel() );
   stmtS->setInt( 3, m_id );
   stmtS->setInt( 4, classJobIndex );
-  pDb->execute( stmtS );
+  db.execute( stmtS );
 }
 
 void Sapphire::Entity::Player::updateDbMonsterNote()
 {
-  auto pDb = m_pFw->get< Db::DbWorkerPool< Db::ZoneDbConnection > >();
+  auto& db = Common::Service< Db::DbWorkerPool< Db::ZoneDbConnection > >::ref();
   // Category_0-11
-  auto stmt = pDb->getPreparedStatement( Db::CHARA_MONSTERNOTE_UP );
+  auto stmt = db.getPreparedStatement( Db::CHARA_MONSTERNOTE_UP );
   //std::array< std::vector< uint8_t >, 12 > vectors;
   std::vector< uint8_t > vector( 41 );
   for( std::size_t i = 0; i < m_huntingLogEntries.size(); ++i )
@@ -538,48 +538,48 @@ void Sapphire::Entity::Player::updateDbMonsterNote()
     stmt->setBinary( i + 1, vector );
   }
   stmt->setInt( 13, m_id );
-  pDb->execute( stmt );
+  db.execute( stmt );
 }
 
 void Sapphire::Entity::Player::insertDbClass( const uint8_t classJobIndex ) const
 {
-  auto pDb = m_pFw->get< Db::DbWorkerPool< Db::ZoneDbConnection > >();
-  auto stmtClass = pDb->getPreparedStatement( Db::CHARA_CLASS_INS );
+  auto& db = Common::Service< Db::DbWorkerPool< Db::ZoneDbConnection > >::ref();
+  auto stmtClass = db.getPreparedStatement( Db::CHARA_CLASS_INS );
   stmtClass->setInt( 1, getId() );
   stmtClass->setInt( 2, classJobIndex );
   stmtClass->setInt( 3, 0 );
   stmtClass->setInt( 4, 1 );
-  pDb->directExecute( stmtClass );
+  db.directExecute( stmtClass );
 }
 
 void Sapphire::Entity::Player::updateDbSearchInfo() const
 {
-  auto pDb = m_pFw->get< Db::DbWorkerPool< Db::ZoneDbConnection > >();
-  auto stmtS = pDb->getPreparedStatement( Db::CHARA_SEARCHINFO_UP_SELECTCLASS );
+  auto& db = Common::Service< Db::DbWorkerPool< Db::ZoneDbConnection > >::ref();
+  auto stmtS = db.getPreparedStatement( Db::CHARA_SEARCHINFO_UP_SELECTCLASS );
   stmtS->setInt( 1, m_searchSelectClass );
   stmtS->setInt( 2, m_id );
-  pDb->execute( stmtS );
+  db.execute( stmtS );
 
-  auto stmtS1 = pDb->getPreparedStatement( Db::CHARA_SEARCHINFO_UP_SELECTREGION );
+  auto stmtS1 = db.getPreparedStatement( Db::CHARA_SEARCHINFO_UP_SELECTREGION );
   stmtS1->setInt( 1, m_searchSelectRegion );
   stmtS1->setInt( 2, m_id );
-  pDb->execute( stmtS1 );
+  db.execute( stmtS1 );
 
-  auto stmtS2 = pDb->getPreparedStatement( Db::CHARA_SEARCHINFO_UP_SEARCHCOMMENT );
+  auto stmtS2 = db.getPreparedStatement( Db::CHARA_SEARCHINFO_UP_SEARCHCOMMENT );
   stmtS2->setString( 1, std::string( m_searchMessage ) );
   stmtS2->setInt( 2, m_id );
-  pDb->execute( stmtS2 );
+  db.execute( stmtS2 );
 }
 
 void Sapphire::Entity::Player::updateDbAllQuests() const
 {
-  auto pDb = m_pFw->get< Db::DbWorkerPool< Db::ZoneDbConnection > >();
+  auto& db = Common::Service< Db::DbWorkerPool< Db::ZoneDbConnection > >::ref();
   for( int32_t i = 0; i < 30; i++ )
   {
     if( !m_activeQuests[ i ] )
       continue;
 
-    auto stmtS3 = pDb->getPreparedStatement( Db::CHARA_QUEST_UP );
+    auto stmtS3 = db.getPreparedStatement( Db::CHARA_QUEST_UP );
     stmtS3->setInt( 1, m_activeQuests[ i ]->c.sequence );
     stmtS3->setInt( 2, m_activeQuests[ i ]->c.flags );
     stmtS3->setInt( 3, m_activeQuests[ i ]->c.UI8A );
@@ -591,24 +591,24 @@ void Sapphire::Entity::Player::updateDbAllQuests() const
     stmtS3->setInt( 9, m_activeQuests[ i ]->c.padding1 );
     stmtS3->setInt( 10, m_id );
     stmtS3->setInt( 11, m_activeQuests[ i ]->c.questId );
-    pDb->execute( stmtS3 );
+    db.execute( stmtS3 );
 
   }
 }
 
 void Sapphire::Entity::Player::deleteQuest( uint16_t questId ) const
 {
-  auto pDb = m_pFw->get< Db::DbWorkerPool< Db::ZoneDbConnection > >();
-  auto stmt = pDb->getPreparedStatement( Db::CHARA_QUEST_DEL );
+  auto& db = Common::Service< Db::DbWorkerPool< Db::ZoneDbConnection > >::ref();
+  auto stmt = db.getPreparedStatement( Db::CHARA_QUEST_DEL );
   stmt->setInt( 1, m_id );
   stmt->setInt( 2, questId );
-  pDb->execute( stmt );
+  db.execute( stmt );
 }
 
 void Sapphire::Entity::Player::insertQuest( uint16_t questId, uint8_t index, uint8_t seq ) const
 {
-  auto pDb = m_pFw->get< Db::DbWorkerPool< Db::ZoneDbConnection > >();
-  auto stmt = pDb->getPreparedStatement( Db::CHARA_QUEST_INS );
+  auto& db = Common::Service< Db::DbWorkerPool< Db::ZoneDbConnection > >::ref();
+  auto stmt = db.getPreparedStatement( Db::CHARA_QUEST_INS );
   stmt->setInt( 1, m_id );
   stmt->setInt( 2, index );
   stmt->setInt( 3, questId );
@@ -621,15 +621,16 @@ void Sapphire::Entity::Player::insertQuest( uint16_t questId, uint8_t index, uin
   stmt->setInt( 10, 0 );
   stmt->setInt( 11, 0 );
   stmt->setInt( 12, 0 );
-  pDb->execute( stmt );
+  db.execute( stmt );
 }
 
 Sapphire::ItemPtr Sapphire::Entity::Player::createItem( uint32_t catalogId, uint32_t quantity )
 {
-  auto pExdData = m_pFw->get< Data::ExdDataGenerated >();
-  auto pDb = m_pFw->get< Db::DbWorkerPool< Db::ZoneDbConnection > >();
-  auto itemInfo = pExdData->get< Sapphire::Data::Item >( catalogId );
-  auto itemMgr = m_pFw->get< World::Manager::ItemMgr >();
+  auto& exdData = Common::Service< Data::ExdDataGenerated >::ref();
+  auto& db = Common::Service< Db::DbWorkerPool< Db::ZoneDbConnection > >::ref();
+  auto& itemMgr = Common::Service< World::Manager::ItemMgr >::ref();
+
+  auto itemInfo = exdData.get< Sapphire::Data::Item >( catalogId );
 
   if( !itemInfo )
     return nullptr;
@@ -639,27 +640,27 @@ Sapphire::ItemPtr Sapphire::Entity::Player::createItem( uint32_t catalogId, uint
 
   uint8_t flags = 0;
 
-  ItemPtr pItem = make_Item( itemMgr->getNextUId(), catalogId, m_pFw );
+  ItemPtr pItem = make_Item( itemMgr.getNextUId(), catalogId );
 
   pItem->setStackSize( quantity );
 
-  pDb->execute( "INSERT INTO charaglobalitem ( CharacterId, itemId, catalogId, stack, flags ) VALUES ( " +
-                std::to_string( getId() ) + ", " +
-                std::to_string( pItem->getUId() ) + ", " +
-                std::to_string( pItem->getId() ) + ", " +
-                std::to_string( quantity ) + ", " +
-                std::to_string( flags ) + ");" );
+  db.execute( "INSERT INTO charaglobalitem ( CharacterId, itemId, catalogId, stack, flags ) VALUES ( " +
+               std::to_string( getId() ) + ", " +
+               std::to_string( pItem->getUId() ) + ", " +
+               std::to_string( pItem->getId() ) + ", " +
+               std::to_string( quantity ) + ", " +
+               std::to_string( flags ) + ");" );
 
   return pItem;
 }
 
 bool Sapphire::Entity::Player::loadInventory()
 {
-  auto itemMgr = m_pFw->get< World::Manager::ItemMgr >();
-  auto pDb = m_pFw->get< Db::DbWorkerPool< Db::ZoneDbConnection > >();
+  auto& itemMgr = Common::Service< World::Manager::ItemMgr >::ref();
+  auto& db = Common::Service< Db::DbWorkerPool< Db::ZoneDbConnection > >::ref();
   //////////////////////////////////////////////////////////////////////////////////////////////////////
   // load active gearset
-  auto res = pDb->query( "SELECT storageId, container_0, container_1, container_2, container_3, "
+  auto res = db.query( "SELECT storageId, container_0, container_1, container_2, container_3, "
                          "container_4, container_5, container_6, container_7, "
                          "container_8, container_9, container_10, container_11, "
                          "container_12, container_13 "
@@ -677,7 +678,7 @@ bool Sapphire::Entity::Player::loadInventory()
       if( uItemId == 0 )
         continue;
 
-      ItemPtr pItem = itemMgr->loadItem( uItemId );
+      ItemPtr pItem = itemMgr.loadItem( uItemId );
 
       if( pItem == nullptr )
         continue;
@@ -689,7 +690,7 @@ bool Sapphire::Entity::Player::loadInventory()
 
   ///////////////////////////////////////////////////////////////////////////////////////////////////////
   // Load everything
-  auto bagRes = pDb->query( "SELECT storageId, "
+  auto bagRes = db.query( "SELECT storageId, "
                             "container_0, container_1, container_2, container_3, container_4, "
                             "container_5, container_6, container_7, container_8, container_9, "
                             "container_10, container_11, container_12, container_13, container_14, "
@@ -710,7 +711,7 @@ bool Sapphire::Entity::Player::loadInventory()
       if( uItemId == 0 )
         continue;
 
-      ItemPtr pItem = itemMgr->loadItem( uItemId );
+      ItemPtr pItem = itemMgr.loadItem( uItemId );
 
       if( pItem == nullptr )
         continue;
diff --git a/src/world/Inventory/HousingItem.cpp b/src/world/Inventory/HousingItem.cpp
index f4fe35da..954c9053 100644
--- a/src/world/Inventory/HousingItem.cpp
+++ b/src/world/Inventory/HousingItem.cpp
@@ -1,7 +1,7 @@
 #include "HousingItem.h"
 
-Sapphire::Inventory::HousingItem::HousingItem( uint64_t uId, uint32_t catalogId, FrameworkPtr pFw ) :
-  Sapphire::Item( uId, catalogId, pFw, false )
+Sapphire::Inventory::HousingItem::HousingItem( uint64_t uId, uint32_t catalogId ) :
+  Sapphire::Item( uId, catalogId, false )
 {
   m_stackSize = 1;
   m_spiritBond = 1;
diff --git a/src/world/Inventory/HousingItem.h b/src/world/Inventory/HousingItem.h
index ba208ddc..279a7910 100644
--- a/src/world/Inventory/HousingItem.h
+++ b/src/world/Inventory/HousingItem.h
@@ -8,7 +8,7 @@ namespace Sapphire::Inventory
   class HousingItem : public Item
   {
   public:
-    HousingItem( uint64_t uId, uint32_t catalogId, FrameworkPtr pFw );
+    HousingItem( uint64_t uId, uint32_t catalogId );
     virtual ~HousingItem() = default;
 
     void setRot( float rot );
diff --git a/src/world/Inventory/Item.cpp b/src/world/Inventory/Item.cpp
index 1b75fcaf..ac41926c 100644
--- a/src/world/Inventory/Item.cpp
+++ b/src/world/Inventory/Item.cpp
@@ -1,22 +1,21 @@
 #include <Common.h>
 #include <Exd/ExdDataGenerated.h>
 #include <CommonGen.h>
+#include <Service.h>
 
-#include "Framework.h"
 #include "Item.h"
 
-Sapphire::Item::Item( uint64_t uId, uint32_t catalogId, FrameworkPtr pFw, bool isHq ) :
+Sapphire::Item::Item( uint64_t uId, uint32_t catalogId, bool isHq ) :
   m_id( catalogId ),
   m_uId( uId ),
   m_isHq( isHq ),
   m_stain( 0 ),
   m_durability( 30000 ),
   m_spiritBond( 0 ),
-  m_reservedFlag( 0 ),
-  m_pFw( pFw )
+  m_reservedFlag( 0 )
 {
-  auto pExdData = m_pFw->get< Data::ExdDataGenerated >();
-  auto itemInfo = pExdData->get< Sapphire::Data::Item >( catalogId );
+  auto& exdData = Common::Service< Data::ExdDataGenerated >::ref();
+  auto itemInfo = exdData.get< Sapphire::Data::Item >( catalogId );
 
   m_delayMs = itemInfo->delayms;
   m_physicalDmg = itemInfo->damagePhys;
diff --git a/src/world/Inventory/Item.h b/src/world/Inventory/Item.h
index 35c11286..dff845cc 100644
--- a/src/world/Inventory/Item.h
+++ b/src/world/Inventory/Item.h
@@ -18,7 +18,7 @@ namespace Sapphire
       int16_t value;
     };
 
-    Item( uint64_t uId, uint32_t catalogId, FrameworkPtr pFw, bool isHq = false );
+    Item( uint64_t uId, uint32_t catalogId, bool isHq = false );
 
     virtual ~Item() = default;
 
@@ -116,7 +116,6 @@ namespace Sapphire
     uint32_t m_defense;
     uint32_t m_defenseMag;
 
-    FrameworkPtr m_pFw;
     uint32_t m_additionalData;
 
     BaseParamStruct m_baseParam[6];
diff --git a/src/world/Inventory/ItemContainer.cpp b/src/world/Inventory/ItemContainer.cpp
index 6afb81a1..46bedfb5 100644
--- a/src/world/Inventory/ItemContainer.cpp
+++ b/src/world/Inventory/ItemContainer.cpp
@@ -1,21 +1,20 @@
 #include <Common.h>
 #include <Logging/Logger.h>
 #include <Database/DatabaseDef.h>
+#include <Service.h>
 
 #include "Actor/Player.h"
 
 #include "Item.h"
-#include "Framework.h"
 #include "Forwards.h"
 #include "ItemContainer.h"
 
 Sapphire::ItemContainer::ItemContainer( uint16_t storageId, uint8_t maxSize, const std::string& tableName,
-                                        bool isMultiStorage, FrameworkPtr pFw, bool isPersistentStorage ) :
+                                        bool isMultiStorage, bool isPersistentStorage ) :
   m_id( storageId ),
   m_size( maxSize ),
   m_tableName( tableName ),
   m_bMultiStorage( isMultiStorage ),
-  m_pFw( pFw ),
   m_isPersistentStorage( isPersistentStorage )
 {
 
@@ -38,13 +37,13 @@ uint8_t Sapphire::ItemContainer::getEntryCount() const
 
 void Sapphire::ItemContainer::removeItem( uint8_t slotId, bool removeFromDb )
 {
-  auto pDb = m_pFw->get< Db::DbWorkerPool< Db::ZoneDbConnection > >();
+  auto& db = Common::Service< Db::DbWorkerPool< Db::ZoneDbConnection > >::ref();
   auto it = m_itemMap.find( slotId );
 
   if( it != m_itemMap.end() )
   {
     if( m_isPersistentStorage && removeFromDb )
-      pDb->execute( "DELETE FROM charaglobalitem WHERE itemId = " + std::to_string( it->second->getUId() ) );
+      db.execute( "DELETE FROM charaglobalitem WHERE itemId = " + std::to_string( it->second->getUId() ) );
 
     m_itemMap.erase( it );
 
diff --git a/src/world/Inventory/ItemContainer.h b/src/world/Inventory/ItemContainer.h
index 140393ae..5e830335 100644
--- a/src/world/Inventory/ItemContainer.h
+++ b/src/world/Inventory/ItemContainer.h
@@ -15,7 +15,7 @@ namespace Sapphire
 
   public:
     ItemContainer( uint16_t storageId, uint8_t maxSize, const std::string& tableName, bool isMultiStorage,
-                   FrameworkPtr pFw, bool isPersistentStorage = true );
+                   bool isPersistentStorage = true );
 
     ~ItemContainer();
 
@@ -48,7 +48,6 @@ namespace Sapphire
     uint8_t m_size;
     std::string m_tableName;
     bool m_bMultiStorage;
-    FrameworkPtr m_pFw;
     bool m_isPersistentStorage;
     ItemMap m_itemMap;
     Entity::PlayerPtr m_pOwner;
diff --git a/src/world/Manager/ActionMgr.cpp b/src/world/Manager/ActionMgr.cpp
index aaa723c9..22280a1a 100644
--- a/src/world/Manager/ActionMgr.cpp
+++ b/src/world/Manager/ActionMgr.cpp
@@ -7,18 +7,11 @@
 #include "Actor/Player.h"
 
 #include <Exd/ExdDataGenerated.h>
-#include "Framework.h"
 
 #include <Network/PacketWrappers/EffectPacket.h>
 
 using namespace Sapphire;
 
-World::Manager::ActionMgr::ActionMgr( Sapphire::FrameworkPtr pFw ) :
-  BaseManager( pFw )
-{
-
-}
-
 void World::Manager::ActionMgr::handlePlacedPlayerAction( Entity::Player& player, uint32_t actionId,
                                                           Data::ActionPtr actionData, Common::FFXIVARR_POSITION3 pos,
                                                           uint16_t sequence )
@@ -26,7 +19,7 @@ void World::Manager::ActionMgr::handlePlacedPlayerAction( Entity::Player& player
   player.sendDebug( "got aoe act: {0}", actionData->name );
 
 
-  auto action = Action::make_Action( player.getAsPlayer(), actionId, sequence, actionData, framework() );
+  auto action = Action::make_Action( player.getAsPlayer(), actionId, sequence, actionData );
 
   action->setPos( pos );
 
@@ -47,7 +40,7 @@ void World::Manager::ActionMgr::handleTargetedPlayerAction( Entity::Player& play
                                                             Data::ActionPtr actionData, uint64_t targetId,
                                                             uint16_t sequence )
 {
-  auto action = Action::make_Action( player.getAsPlayer(), actionId, sequence, actionData, framework() );
+  auto action = Action::make_Action( player.getAsPlayer(), actionId, sequence, actionData );
 
   action->setTargetId( targetId );
 
@@ -73,7 +66,7 @@ void World::Manager::ActionMgr::handleItemAction( Sapphire::Entity::Player& play
   player.sendDebug( "got item act: {0}, slot: {1}, container: {2}", itemId, itemSourceSlot, itemSourceContainer );
 
   auto action = Action::make_ItemAction( player.getAsChara(), itemId, itemActionData,
-                                         itemSourceSlot, itemSourceContainer, framework() );
+                                         itemSourceSlot, itemSourceContainer );
 
   // todo: item actions don't have cast times? if so we can just start it and we're good
   action->start();
@@ -85,7 +78,7 @@ void World::Manager::ActionMgr::handleMountAction( Entity::Player& player, uint1
 {
   player.sendDebug( "mount: {0}", mountId );
 
-  auto action = Action::make_MountAction( player.getAsPlayer(), mountId, sequence, actionData, framework() );
+  auto action = Action::make_MountAction( player.getAsPlayer(), mountId, sequence, actionData );
 
   action->setTargetId( targetId );
 
diff --git a/src/world/Manager/ActionMgr.h b/src/world/Manager/ActionMgr.h
index dd1d5f40..af58dc1d 100644
--- a/src/world/Manager/ActionMgr.h
+++ b/src/world/Manager/ActionMgr.h
@@ -1,7 +1,6 @@
 #ifndef SAPPHIRE_ACTIONMGR_H
 #define SAPPHIRE_ACTIONMGR_H
 
-#include "BaseManager.h"
 #include "ForwardsZone.h"
 
 namespace Sapphire::Data
@@ -15,10 +14,10 @@ namespace Sapphire::Data
 
 namespace Sapphire::World::Manager
 {
-  class ActionMgr : public Manager::BaseManager
+  class ActionMgr
   {
   public:
-    explicit ActionMgr( FrameworkPtr pFw );
+    ActionMgr() = default;
     ~ActionMgr() = default;
 
     void handleTargetedPlayerAction( Entity::Player& player, uint32_t actionId,
diff --git a/src/world/Manager/BaseManager.h b/src/world/Manager/BaseManager.h
deleted file mode 100644
index 4cd87a03..00000000
--- a/src/world/Manager/BaseManager.h
+++ /dev/null
@@ -1,27 +0,0 @@
-#ifndef SAPPHIRE_MANAGER_H
-#define SAPPHIRE_MANAGER_H
-
-#include "ForwardsZone.h"
-
-namespace Sapphire::World::Manager
-{
-
-  class BaseManager
-  {
-  public:
-    explicit BaseManager( FrameworkPtr pFw ) : m_pFw( std::move( pFw ) ) {};
-    virtual ~BaseManager() = default;
-
-    FrameworkPtr framework() const
-    { return m_pFw; }
-    void setFw( FrameworkPtr pFw )
-    { m_pFw = pFw; }
-
-  private:
-    FrameworkPtr m_pFw;
-  };
-
-}
-
-
-#endif //SAPPHIRE_MANAGER_H
diff --git a/src/world/Manager/DebugCommandMgr.cpp b/src/world/Manager/DebugCommandMgr.cpp
index 98a7480e..515bf228 100644
--- a/src/world/Manager/DebugCommandMgr.cpp
+++ b/src/world/Manager/DebugCommandMgr.cpp
@@ -38,7 +38,6 @@
 #include "ServerMgr.h"
 
 #include "Session.h"
-#include "Framework.h"
 
 using namespace Sapphire::Network;
 using namespace Sapphire::Network::Packets;
@@ -46,8 +45,7 @@ using namespace Sapphire::Network::Packets::Server;
 using namespace Sapphire::World::Manager;
 
 // instanciate and initialize commands
-Sapphire::World::Manager::DebugCommandMgr::DebugCommandMgr( FrameworkPtr pFw ) :
-  BaseManager( pFw )
+Sapphire::World::Manager::DebugCommandMgr::DebugCommandMgr()
 {
   // Push all commands onto the register map ( command name - function - description - required GM level )
   registerCommand( "set", &DebugCommandMgr::set, "Executes SET commands.", 1 );
@@ -144,8 +142,8 @@ void Sapphire::World::Manager::DebugCommandMgr::help( char* data, Entity::Player
 void Sapphire::World::Manager::DebugCommandMgr::set( char* data, Entity::Player& player,
                                                      std::shared_ptr< DebugCommand > command )
 {
-  auto pTerriMgr = framework()->get< TerritoryMgr >();
-  auto pDb = framework()->get< Db::DbWorkerPool< Db::ZoneDbConnection > >();
+  auto& terriMgr = Common::Service< TerritoryMgr >::ref();
+  auto& db = Common::Service< Db::DbWorkerPool< Db::ZoneDbConnection > >::ref();
   std::string subCommand = "";
   std::string params = "";
 
@@ -293,11 +291,11 @@ void Sapphire::World::Manager::DebugCommandMgr::set( char* data, Entity::Player&
 
     sscanf( params.c_str(), "%hu %hu", &festivalId, &additionalId );
 
-    pTerriMgr->setCurrentFestival( festivalId, additionalId );
+    terriMgr.setCurrentFestival( festivalId, additionalId );
   }
   else if( subCommand == "festivaldisable" )
   {
-    pTerriMgr->disableCurrentFestival();
+    terriMgr.disableCurrentFestival();
   }
   else if( subCommand == "BitFlag" )
   {
@@ -406,7 +404,7 @@ void Sapphire::World::Manager::DebugCommandMgr::add( char* data, Entity::Player&
     sscanf( params.c_str(), "%d %d %hu", &id, &duration, &param );
 
     auto effect = StatusEffect::make_StatusEffect( id, player.getAsPlayer(), player.getAsPlayer(),
-                                                   duration, 3000, framework() );
+                                                   duration, 3000 );
     effect->setParam( param );
 
     player.addStatusEffect( effect );
@@ -435,7 +433,7 @@ void Sapphire::World::Manager::DebugCommandMgr::add( char* data, Entity::Player&
                                                    player.getPos().y,
                                                    player.getPos().z,
                                                    player.getRot(),
-                                                   1, 1000, playerZone, framework() );
+                                                   1, 1000, playerZone );
 
 
 
@@ -537,7 +535,7 @@ void Sapphire::World::Manager::DebugCommandMgr::add( char* data, Entity::Player&
 void Sapphire::World::Manager::DebugCommandMgr::get( char* data, Entity::Player& player,
                                                      std::shared_ptr< DebugCommand > command )
 {
-  auto pExdData = framework()->get< Data::ExdDataGenerated >();
+  auto exdData = Common::Service< Data::ExdDataGenerated >::ref();
   std::string subCommand;
   std::string params = "";
 
@@ -561,7 +559,7 @@ void Sapphire::World::Manager::DebugCommandMgr::get( char* data, Entity::Player&
   if( ( subCommand == "pos" ) )
   {
 
-    int16_t map_id = pExdData->get< Sapphire::Data::TerritoryType >( player.getCurrentTerritory()->getTerritoryTypeId() )->map;
+    int16_t map_id = exdData.get< Sapphire::Data::TerritoryType >( player.getCurrentTerritory()->getTerritoryTypeId() )->map;
 
     player.sendNotice( "Pos:\n {0}\n {1}\n {2}\n {3}\n MapId: {4}\n ZoneId:{5}",
                        player.getPos().x, player.getPos().y, player.getPos().z,
@@ -709,7 +707,7 @@ Sapphire::World::Manager::DebugCommandMgr::serverInfo( char* data, Entity::Playe
 void Sapphire::World::Manager::DebugCommandMgr::script( char* data, Entity::Player& player,
                                                         std::shared_ptr< DebugCommand > command )
 {
-  auto pScriptMgr = framework()->get< Scripting::ScriptMgr >();
+  auto& scriptMgr = Common::Service< Scripting::ScriptMgr >::ref();
   std::string subCommand;
   std::string params = "";
 
@@ -735,7 +733,7 @@ void Sapphire::World::Manager::DebugCommandMgr::script( char* data, Entity::Play
   {
     if( subCommand == params )
       player.sendDebug( "Command failed: requires name of script" );
-    else if( pScriptMgr->getNativeScriptHandler().unloadScript( params ) )
+    else if( scriptMgr.getNativeScriptHandler().unloadScript( params ) )
       player.sendDebug( "Unloaded script successfully." );
     else
       player.sendDebug( "Failed to unload script: {0}", params );
@@ -747,7 +745,7 @@ void Sapphire::World::Manager::DebugCommandMgr::script( char* data, Entity::Play
     else
     {
       std::set< Sapphire::Scripting::ScriptInfo* > scripts;
-      pScriptMgr->getNativeScriptHandler().findScripts( scripts, params );
+      scriptMgr.getNativeScriptHandler().findScripts( scripts, params );
 
       if( !scripts.empty() )
       {
@@ -769,7 +767,7 @@ void Sapphire::World::Manager::DebugCommandMgr::script( char* data, Entity::Play
       player.sendDebug( "Command failed: requires relative path to script" );
     else
     {
-      if( pScriptMgr->getNativeScriptHandler().loadScript( params ) )
+      if( scriptMgr.getNativeScriptHandler().loadScript( params ) )
         player.sendDebug( "Loaded '{0}' successfully", params );
       else
         player.sendDebug( "Failed to load '{0}'", params );
@@ -782,7 +780,7 @@ void Sapphire::World::Manager::DebugCommandMgr::script( char* data, Entity::Play
       player.sendDebug( "Command failed: requires name of script to reload" );
     else
     {
-      pScriptMgr->getNativeScriptHandler().queueScriptReload( params );
+      scriptMgr.getNativeScriptHandler().queueScriptReload( params );
       player.sendDebug( "Queued script reload for script: {0}", params );
     }
   }
@@ -795,7 +793,7 @@ void Sapphire::World::Manager::DebugCommandMgr::script( char* data, Entity::Play
 void Sapphire::World::Manager::DebugCommandMgr::instance( char* data, Entity::Player& player,
                                                           std::shared_ptr< DebugCommand > command )
 {
-  auto pTeriMgr = framework()->get< TerritoryMgr >();
+  auto& terriMgr = Common::Service< TerritoryMgr >::ref();
   std::string cmd( data ), params, subCommand;
   auto cmdPos = cmd.find_first_of( ' ' );
 
@@ -819,7 +817,7 @@ void Sapphire::World::Manager::DebugCommandMgr::instance( char* data, Entity::Pl
     uint32_t contentFinderConditionId;
     sscanf( params.c_str(), "%d", &contentFinderConditionId );
 
-    auto instance = pTeriMgr->createInstanceContent( contentFinderConditionId );
+    auto instance = terriMgr.createInstanceContent( contentFinderConditionId );
     if( instance )
       player.sendDebug( "Created instance with id#{0} -> {1}", instance->getGuId(), instance->getName() );
     else
@@ -830,7 +828,7 @@ void Sapphire::World::Manager::DebugCommandMgr::instance( char* data, Entity::Pl
     uint32_t instanceId;
     sscanf( params.c_str(), "%d", &instanceId );
 
-    auto terri = pTeriMgr->getTerritoryByGuId( instanceId );
+    auto terri = terriMgr.getTerritoryByGuId( instanceId );
     if( terri )
     {
       auto pInstanceContent = terri->getAsInstanceContent();
@@ -853,7 +851,7 @@ void Sapphire::World::Manager::DebugCommandMgr::instance( char* data, Entity::Pl
     uint32_t instanceId;
     sscanf( params.c_str(), "%d", &instanceId );
 
-    auto instance = pTeriMgr->getTerritoryByGuId( instanceId );
+    auto instance = terriMgr.getTerritoryByGuId( instanceId );
     if( !instance )
     {
       player.sendDebug( "Unknown instance with id#{0} ", instanceId );
@@ -875,7 +873,7 @@ void Sapphire::World::Manager::DebugCommandMgr::instance( char* data, Entity::Pl
     uint32_t zoneId;
     sscanf( params.c_str(), "%d", &zoneId );
 
-    auto instance = pTeriMgr->createTerritoryInstance( zoneId );
+    auto instance = terriMgr.createTerritoryInstance( zoneId );
     if( instance )
       player.sendDebug(
         "Created instance with id: " + std::to_string( instance->getGuId() ) + " -> " + instance->getName() );
@@ -887,7 +885,7 @@ void Sapphire::World::Manager::DebugCommandMgr::instance( char* data, Entity::Pl
     uint32_t terriId;
     sscanf( params.c_str(), "%d", &terriId );
 
-    if( pTeriMgr->removeTerritoryInstance( terriId ) )
+    if( terriMgr.removeTerritoryInstance( terriId ) )
       player.sendDebug( "Removed instance with id#{0}", terriId );
     else
       player.sendDebug( "Failed to remove instance with id#{0}", terriId );
@@ -1015,7 +1013,7 @@ void Sapphire::World::Manager::DebugCommandMgr::instance( char* data, Entity::Pl
 void Sapphire::World::Manager::DebugCommandMgr::questBattle( char* data, Entity::Player& player,
                                                              std::shared_ptr< DebugCommand > command )
 {
-  auto pTeriMgr = framework()->get< TerritoryMgr >();
+  auto& terriMgr = Common::Service< TerritoryMgr >::ref();
   std::string cmd( data ), params, subCommand;
   auto cmdPos = cmd.find_first_of( ' ' );
 
@@ -1039,7 +1037,7 @@ void Sapphire::World::Manager::DebugCommandMgr::questBattle( char* data, Entity:
     uint32_t contentFinderConditionId;
     sscanf( params.c_str(), "%d", &contentFinderConditionId );
 
-    auto instance = pTeriMgr->createQuestBattle( contentFinderConditionId );
+    auto instance = terriMgr.createQuestBattle( contentFinderConditionId );
     if( instance )
       player.sendDebug( "Created instance with id#{0} -> {1}", instance->getGuId(), instance->getName() );
     else
@@ -1070,7 +1068,7 @@ void Sapphire::World::Manager::DebugCommandMgr::questBattle( char* data, Entity:
     uint32_t zoneId;
     sscanf( params.c_str(), "%d", &zoneId );
 
-    auto instance = pTeriMgr->createTerritoryInstance( zoneId );
+    auto instance = terriMgr.createTerritoryInstance( zoneId );
     if( instance )
       player.sendDebug(
         "Created instance with id: " + std::to_string( instance->getGuId() ) + " -> " + instance->getName() );
@@ -1082,7 +1080,7 @@ void Sapphire::World::Manager::DebugCommandMgr::questBattle( char* data, Entity:
     uint32_t terriId;
     sscanf( params.c_str(), "%d", &terriId );
 
-    if( pTeriMgr->removeTerritoryInstance( terriId ) )
+    if( terriMgr.removeTerritoryInstance( terriId ) )
       player.sendDebug( "Removed instance with id#{0}", terriId );
     else
       player.sendDebug( "Failed to remove instance with id#{0}", terriId );
@@ -1210,7 +1208,7 @@ void Sapphire::World::Manager::DebugCommandMgr::questBattle( char* data, Entity:
 void Sapphire::World::Manager::DebugCommandMgr::housing( char* data, Entity::Player& player,
                                                          std::shared_ptr< DebugCommand > command )
 {
-  auto pTeriMgr = framework()->get< TerritoryMgr >();
+  auto& terriMgr = Common::Service< TerritoryMgr >::ref();
   std::string cmd( data ), params, subCommand;
   auto cmdPos = cmd.find_first_of( ' ' );
 
@@ -1237,7 +1235,7 @@ void Sapphire::World::Manager::DebugCommandMgr::housing( char* data, Entity::Pla
 //    if ( permissionSet < 5 )
 //    {
 //      auto pZone = player.getCurrentTerritory();
-//      if( pTeriMgr->isHousingTerritory( pZone->getTerritoryTypeId() ) )
+//      if( terriMgr.isHousingTerritory( pZone->getTerritoryTypeId() ) )
 //      {
 //        auto pHousing = std::dynamic_pointer_cast< HousingZone >( pZone );
 //        if( pHousing )
diff --git a/src/world/Manager/DebugCommandMgr.h b/src/world/Manager/DebugCommandMgr.h
index 160d7380..25921312 100644
--- a/src/world/Manager/DebugCommandMgr.h
+++ b/src/world/Manager/DebugCommandMgr.h
@@ -6,20 +6,19 @@
 
 #include "DebugCommand/DebugCommand.h"
 #include "ForwardsZone.h"
-#include "BaseManager.h"
 
 namespace Sapphire::World::Manager
 {
 
   // handler for in game commands
-  class DebugCommandMgr : public Manager::BaseManager
+  class DebugCommandMgr
   {
   private:
     // container mapping command string to command object
     std::map< std::string, std::shared_ptr< DebugCommand > > m_commandMap;
 
   public:
-    DebugCommandMgr( FrameworkPtr pFw );
+    DebugCommandMgr();
 
     ~DebugCommandMgr();
 
diff --git a/src/world/Manager/EventMgr.cpp b/src/world/Manager/EventMgr.cpp
index 6794325b..007a2003 100644
--- a/src/world/Manager/EventMgr.cpp
+++ b/src/world/Manager/EventMgr.cpp
@@ -1,22 +1,16 @@
 #include <Common.h>
 #include <Exd/ExdDataGenerated.h>
 #include <Util/Util.h>
+#include <Service.h>
 
-#include "Framework.h"
 #include "EventMgr.h"
 #include "Event/EventHandler.h"
 
 using namespace Sapphire::Common;
 
-Sapphire::World::Manager::EventMgr::EventMgr( Sapphire::FrameworkPtr pFw ) :
-  BaseManager( pFw )
-{
-
-}
-
 std::string Sapphire::World::Manager::EventMgr::getEventName( uint32_t eventId )
 {
-  auto pExdData = framework()->get< Data::ExdDataGenerated >();
+  auto& exdData = Common::Service< Data::ExdDataGenerated >::ref();
   uint16_t eventType = eventId >> 16;
 
   auto unknown = std::string{ "unknown" };
@@ -25,7 +19,7 @@ std::string Sapphire::World::Manager::EventMgr::getEventName( uint32_t eventId )
   {
     case Event::EventHandler::EventHandlerType::Quest:
     {
-      auto questInfo = pExdData->get< Sapphire::Data::Quest >( eventId );
+      auto questInfo = exdData.get< Sapphire::Data::Quest >( eventId );
       if( !questInfo )
         return unknown + "Quest";
 
@@ -36,7 +30,7 @@ std::string Sapphire::World::Manager::EventMgr::getEventName( uint32_t eventId )
     }
     case Event::EventHandler::EventHandlerType::CustomTalk:
     {
-      auto customTalkInfo = pExdData->get< Sapphire::Data::CustomTalk >( eventId );
+      auto customTalkInfo = exdData.get< Sapphire::Data::CustomTalk >( eventId );
       if( !customTalkInfo )
         return unknown + "CustomTalk";
 
@@ -47,14 +41,14 @@ std::string Sapphire::World::Manager::EventMgr::getEventName( uint32_t eventId )
     }
     case Event::EventHandler::EventHandlerType::Opening:
     {
-      auto openingInfo = pExdData->get< Sapphire::Data::Opening >( eventId );
+      auto openingInfo = exdData.get< Sapphire::Data::Opening >( eventId );
       if( openingInfo )
         return openingInfo->name;
       return unknown + "Opening";
     }
     case Event::EventHandler::EventHandlerType::Aetheryte:
     {
-      auto aetherInfo = pExdData->get< Sapphire::Data::Aetheryte >( eventId & 0xFFFF );
+      auto aetherInfo = exdData.get< Sapphire::Data::Aetheryte >( eventId & 0xFFFF );
       if( aetherInfo->isAetheryte )
         return "Aetheryte";
       return "Aethernet";
@@ -67,10 +61,10 @@ std::string Sapphire::World::Manager::EventMgr::getEventName( uint32_t eventId )
     case Event::EventHandler::EventHandlerType::QuestBattleDirector:
     {
 
-      auto qbInfo = pExdData->get< Sapphire::Data::QuestBattle >( eventId & 0xFFFF );
+      auto qbInfo = exdData.get< Sapphire::Data::QuestBattle >( eventId & 0xFFFF );
       if( !qbInfo )
         return "unknown";
-      auto questInfo = pExdData->get< Sapphire::Data::Quest >( qbInfo->quest );
+      auto questInfo = exdData.get< Sapphire::Data::Quest >( qbInfo->quest );
       if( !questInfo )
         return "unknown";
 
@@ -84,7 +78,7 @@ std::string Sapphire::World::Manager::EventMgr::getEventName( uint32_t eventId )
 
     case Event::EventHandler::EventHandlerType::Warp:
     {
-      auto warpInfo = pExdData->get< Sapphire::Data::Warp >( eventId );
+      auto warpInfo = exdData.get< Sapphire::Data::Warp >( eventId );
       if( warpInfo )
         return "WarpTaxi";
       return unknown + "ChocoboWarp"; //who know
@@ -92,7 +86,7 @@ std::string Sapphire::World::Manager::EventMgr::getEventName( uint32_t eventId )
 
     case Event::EventHandler::EventHandlerType::Shop:
     {
-      auto shopInfo = pExdData->get< Sapphire::Data::GilShop >( eventId );
+      auto shopInfo = exdData.get< Sapphire::Data::GilShop >( eventId );
 
       return "GilShop" + std::to_string( eventId );
       /*if( shopInfo )
@@ -112,8 +106,8 @@ std::string Sapphire::World::Manager::EventMgr::getEventName( uint32_t eventId )
 
 uint32_t Sapphire::World::Manager::EventMgr::mapEventActorToRealActor( uint32_t eventActorId )
 {
-  auto pExdData = framework()->get< Data::ExdDataGenerated >();
-  auto levelInfo = pExdData->get< Sapphire::Data::Level >( eventActorId );
+  auto& exdData = Common::Service< Data::ExdDataGenerated >::ref();
+  auto levelInfo = exdData.get< Sapphire::Data::Level >( eventActorId );
   if( levelInfo )
     return levelInfo->object;
 
diff --git a/src/world/Manager/EventMgr.h b/src/world/Manager/EventMgr.h
index 1a69ac02..a8bb036d 100644
--- a/src/world/Manager/EventMgr.h
+++ b/src/world/Manager/EventMgr.h
@@ -3,15 +3,14 @@
 
 #include <cstdint>
 #include <string>
-#include "Manager/BaseManager.h"
 
 namespace Sapphire::World::Manager
 {
 
-  class EventMgr : public BaseManager
+  class EventMgr
   {
   public:
-    EventMgr( FrameworkPtr pFw );
+    EventMgr() = default;
 
     std::string getEventName( uint32_t eventId );
 
diff --git a/src/world/Manager/HousingMgr.cpp b/src/world/Manager/HousingMgr.cpp
index ff3e0b39..f2a559b5 100644
--- a/src/world/Manager/HousingMgr.cpp
+++ b/src/world/Manager/HousingMgr.cpp
@@ -22,7 +22,6 @@
 #include "Territory/Housing/HousingInteriorTerritory.h"
 #include "HousingMgr.h"
 #include "Territory/Land.h"
-#include "Framework.h"
 #include "ServerMgr.h"
 #include "Territory/House.h"
 #include "InventoryMgr.h"
@@ -35,8 +34,7 @@ using namespace Sapphire::Network;
 using namespace Sapphire::Network::Packets;
 using namespace Sapphire::Network::Packets::Server;
 
-Sapphire::World::Manager::HousingMgr::HousingMgr( FrameworkPtr pFw ) :
-  BaseManager( pFw )
+Sapphire::World::Manager::HousingMgr::HousingMgr()
 {
   m_containerMap[ 0 ] = std::make_pair( InventoryType::HousingInteriorPlacedItems1, InventoryType::HousingInteriorStoreroom1 );
   m_containerMap[ 1 ] = std::make_pair( InventoryType::HousingInteriorPlacedItems2, InventoryType::HousingInteriorStoreroom2 );
@@ -114,10 +112,10 @@ bool Sapphire::World::Manager::HousingMgr::loadEstateInventories()
 {
   Logger::info( "HousingMgr: Loading inventories for estates" );
 
-  auto pDb = framework()->get< Db::DbWorkerPool< Db::ZoneDbConnection > >();
+  auto& db = Common::Service< Db::DbWorkerPool< Db::ZoneDbConnection > >::ref();
 
-  auto stmt = pDb->getPreparedStatement( Db::LAND_INV_SEL_ALL );
-  auto res = pDb->query( stmt );
+  auto stmt = db.getPreparedStatement( Db::LAND_INV_SEL_ALL );
+  auto res = db.query( stmt );
 
   uint32_t itemCount = 0;
   while( res->next() )
@@ -131,7 +129,7 @@ bool Sapphire::World::Manager::HousingMgr::loadEstateInventories()
     auto stain = res->getUInt8( "stain" );
     auto characterId = res->getUInt64( "CharacterId" );
 
-    auto item = Inventory::make_HousingItem( itemId, catalogId, framework() );
+    auto item = Inventory::make_HousingItem( itemId, catalogId );
     item->setStain( stain );
     item->setStackSize( 1 );
     // todo: need to set the owner character id on the item
@@ -172,10 +170,10 @@ bool Sapphire::World::Manager::HousingMgr::loadEstateInventories()
 
 void Sapphire::World::Manager::HousingMgr::initLandCache()
 {
-  auto pDb = framework()->get< Db::DbWorkerPool< Db::ZoneDbConnection > >();
+  auto& db = Common::Service< Db::DbWorkerPool< Db::ZoneDbConnection > >::ref();
 
-  auto stmt = pDb->getPreparedStatement( Db::LAND_SEL_ALL );
-  auto res = pDb->query( stmt );
+  auto stmt = db.getPreparedStatement( Db::LAND_SEL_ALL );
+  auto res = db.query( stmt );
 
   while( res->next() )
   {
@@ -243,7 +241,7 @@ void Sapphire::World::Manager::HousingMgr::initLandCache()
 
     auto makeContainer = [ &containers, this ]( Common::InventoryType type, uint16_t size )
     {
-      containers[ type ] = make_ItemContainer( type, size, "houseiteminventory", false, framework(), false );
+      containers[ type ] = make_ItemContainer( type, size, "houseiteminventory", false, false );
     };
 
     uint16_t count = 0;
@@ -273,8 +271,8 @@ void Sapphire::World::Manager::HousingMgr::initLandCache()
 
 uint64_t Sapphire::World::Manager::HousingMgr::getNextHouseId()
 {
-  auto pDb = framework()->get< Db::DbWorkerPool< Db::ZoneDbConnection > >();
-  auto pQR = pDb->query( "SELECT MAX( HouseId ) FROM house" );
+  auto& db = Common::Service< Db::DbWorkerPool< Db::ZoneDbConnection > >::ref();
+  auto pQR = db.query( "SELECT MAX( HouseId ) FROM house" );
 
   if( !pQR->next() )
     return 0;
@@ -289,14 +287,14 @@ uint32_t Sapphire::World::Manager::HousingMgr::toLandSetId( uint16_t territoryTy
 
 Sapphire::Data::HousingZonePtr Sapphire::World::Manager::HousingMgr::getHousingZoneByLandSetId( uint32_t id )
 {
-  auto pTeriMgr = framework()->get< TerritoryMgr >();
-  return std::dynamic_pointer_cast< HousingZone >( pTeriMgr->getZoneByLandSetId( id ) );
+  auto& terriMgr = Common::Service< TerritoryMgr >::ref();
+  return std::dynamic_pointer_cast< HousingZone >( terriMgr.getZoneByLandSetId( id ) );
 }
 
 Sapphire::LandPtr Sapphire::World::Manager::HousingMgr::getLandByOwnerId( uint32_t id )
 {
-  auto pDb = framework()->get< Db::DbWorkerPool< Db::ZoneDbConnection > >();
-  auto res = pDb->query( "SELECT LandSetId, LandId FROM land WHERE OwnerId = " + std::to_string( id ) );
+  auto& db = Common::Service< Db::DbWorkerPool< Db::ZoneDbConnection > >::ref();
+  auto res = db.query( "SELECT LandSetId, LandId FROM land WHERE OwnerId = " + std::to_string( id ) );
 
   if( !res->next() )
     return nullptr;
@@ -562,16 +560,16 @@ bool Sapphire::World::Manager::HousingMgr::initHouseModels( Entity::Player& play
   auto itemMax = land->getInventoryItemMax();
 
   // type, maxSize, tableName, isMultiStorage
-  auto intContainer = make_ItemContainer( InventoryType::HousingInteriorAppearance, itemMax.second, "houseiteminventory", true, framework() );
-  auto extContainer = make_ItemContainer( InventoryType::HousingExteriorAppearance, itemMax.first, "houseiteminventory", true, framework() );
+  auto intContainer = make_ItemContainer( InventoryType::HousingInteriorAppearance, itemMax.second, "houseiteminventory", true );
+  auto extContainer = make_ItemContainer( InventoryType::HousingExteriorAppearance, itemMax.first, "houseiteminventory", true );
 
   // add containers to inv collection
   auto& houseInventory = getEstateInventory( house->getLandIdent() );
   houseInventory[ InventoryType::HousingInteriorAppearance ] = intContainer;
   houseInventory[ InventoryType::HousingExteriorAppearance ] = extContainer;
 
-  auto exdData = framework()->get< Sapphire::Data::ExdDataGenerated >();
-  auto preset = exdData->get< Sapphire::Data::HousingPreset >( getItemAdditionalData( presetCatalogId ) );
+  auto& exdData = Common::Service< Sapphire::Data::ExdDataGenerated >::ref();
+  auto preset = exdData.get< Sapphire::Data::HousingPreset >( getItemAdditionalData( presetCatalogId ) );
   if( !preset )
     return false;
 
@@ -623,7 +621,7 @@ bool Sapphire::World::Manager::HousingMgr::initHouseModels( Entity::Player& play
     }
   };
 
-  auto invMgr = framework()->get< InventoryMgr >();
+  auto& invMgr = Service< InventoryMgr >::ref();
 
   // create and link items
   for( auto& destContainer : invMap )
@@ -636,12 +634,12 @@ bool Sapphire::World::Manager::HousingMgr::initHouseModels( Entity::Player& play
       if( item.second == 0 )
         continue;
 
-      auto pItem = invMgr->createItem( player, static_cast< uint32_t >( item.second ) );
+      auto pItem = invMgr.createItem( player, static_cast< uint32_t >( item.second ) );
 
       container->setItem( static_cast< uint8_t >( item.first ), pItem );
     }
 
-    invMgr->saveHousingContainer( land->getLandIdent(), container );
+    invMgr.saveHousingContainer( land->getLandIdent(), container );
   }
 
   // lift off
@@ -652,16 +650,16 @@ bool Sapphire::World::Manager::HousingMgr::initHouseModels( Entity::Player& play
 
 void Sapphire::World::Manager::HousingMgr::createHouse( Sapphire::HousePtr house ) const
 {
-  auto pDb = framework()->get< Db::DbWorkerPool< Db::ZoneDbConnection > >();
+  auto& db = Service< Db::DbWorkerPool< Db::ZoneDbConnection > >::ref();
 
-  auto stmt = pDb->getPreparedStatement( Db::HOUSING_HOUSE_INS );
+  auto stmt = db.getPreparedStatement( Db::HOUSING_HOUSE_INS );
   // LandSetId, HouseId, HouseName
 
   stmt->setUInt( 1, house->getLandSetId() );
   stmt->setUInt( 2, house->getId() );
   stmt->setString( 3, house->getHouseName() );
 
-  pDb->execute( stmt );
+  db.execute( stmt );
 }
 
 void Sapphire::World::Manager::HousingMgr::buildPresetEstate( Entity::Player& player, uint8_t plotNum, uint32_t presetCatalogId )
@@ -681,7 +679,7 @@ void Sapphire::World::Manager::HousingMgr::buildPresetEstate( Entity::Player& pl
   // create house
   auto ident = pLand->getLandIdent();
   auto house = make_House( getNextHouseId(), pLand->getLandSetId(), ident,
-                           "Estate #" + std::to_string( ident.landId + 1 ), "", framework() );
+                           "Estate #" + std::to_string( ident.landId + 1 ), "" );
 
   pLand->setHouse( house );
 
@@ -871,8 +869,8 @@ void Sapphire::World::Manager::HousingMgr::sendEstateInventory( Entity::Player&
   if( it == containers.end() )
     return;
 
-  auto invMgr = framework()->get< Manager::InventoryMgr >();
-  invMgr->sendInventoryContainer( player, it->second );
+  auto invMgr = Common::Service< Manager::InventoryMgr >::ref();
+  invMgr.sendInventoryContainer( player, it->second );
 }
 
 const Sapphire::World::Manager::HousingMgr::LandSetLandCacheMap&
@@ -946,8 +944,8 @@ void Sapphire::World::Manager::HousingMgr::updateHouseModels( Sapphire::HousePtr
 
 uint32_t Sapphire::World::Manager::HousingMgr::getItemAdditionalData( uint32_t catalogId )
 {
-  auto pExdData = framework()->get< Data::ExdDataGenerated >();
-  auto info = pExdData->get< Sapphire::Data::Item >( catalogId );
+  auto& pExdData = Common::Service< Data::ExdDataGenerated >::ref();
+  auto info = pExdData.get< Sapphire::Data::Item >( catalogId );
   return info->additionalData;
 }
 
@@ -1070,7 +1068,7 @@ void Sapphire::World::Manager::HousingMgr::reqPlaceItemInStore( Sapphire::Entity
   if( !hasPermission( player, *land, 0 ) )
     return;
 
-  auto invMgr = framework()->get< InventoryMgr >();
+  auto& invMgr = Common::Service< InventoryMgr >::ref();
   auto ident = land->getLandIdent();
   auto& containers = getEstateInventory( ident );
 
@@ -1087,8 +1085,8 @@ void Sapphire::World::Manager::HousingMgr::reqPlaceItemInStore( Sapphire::Entity
       return;
 
     container->setItem( static_cast< uint8_t >( freeSlot ), item );
-    invMgr->sendInventoryContainer( player, container );
-    invMgr->saveHousingContainer( ident, container );
+    invMgr.sendInventoryContainer( player, container );
+    invMgr.saveHousingContainer( ident, container );
   }
   else
   {
@@ -1110,8 +1108,8 @@ void Sapphire::World::Manager::HousingMgr::reqPlaceItemInStore( Sapphire::Entity
         return;
 
       container->setItem( static_cast< uint8_t >( freeSlot ), item );
-      invMgr->sendInventoryContainer( player, container );
-      invMgr->saveHousingContainer( ident, container );
+      invMgr.sendInventoryContainer( player, container );
+      invMgr.saveHousingContainer( ident, container );
     }
   }
 }
@@ -1120,7 +1118,7 @@ bool Sapphire::World::Manager::HousingMgr::placeExternalItem( Entity::Player& pl
                                                               Inventory::HousingItemPtr item,
                                                               Common::LandIdent ident )
 {
-  auto invMgr = framework()->get< InventoryMgr >();
+  auto& invMgr = Service< InventoryMgr >::ref();
 
   auto& container = getEstateInventory( ident )[ InventoryType::HousingExteriorPlacedItems ];
 
@@ -1135,11 +1133,11 @@ bool Sapphire::World::Manager::HousingMgr::placeExternalItem( Entity::Player& pl
 
   // we need to save the item again as removing it from the container on the player will remove it from charaglobalitem
   // todo: this needs to be handled a bit better as it might be possible to overwrite another item that is created in the meantime
-  invMgr->saveItem( player, item );
+  invMgr.saveItem( player, item );
 
-  invMgr->sendInventoryContainer( player, container );
-  invMgr->saveHousingContainer( ident, container );
-  invMgr->updateHousingItemPosition( item );
+  invMgr.sendInventoryContainer( player, container );
+  invMgr.saveHousingContainer( ident, container );
+  invMgr.updateHousingItemPosition( item );
 
   // add to zone and spawn
   auto zone = std::dynamic_pointer_cast< HousingZone >( player.getCurrentTerritory() );
@@ -1153,7 +1151,7 @@ bool Sapphire::World::Manager::HousingMgr::placeExternalItem( Entity::Player& pl
 bool Sapphire::World::Manager::HousingMgr::placeInteriorItem( Entity::Player& player,
                                                               Inventory::HousingItemPtr item )
 {
-  auto invMgr = framework()->get< InventoryMgr >();
+  auto& invMgr = Service< InventoryMgr >::ref();
 
   auto zone = std::dynamic_pointer_cast< Territory::Housing::HousingInteriorTerritory >( player.getCurrentTerritory() );
   assert( zone );
@@ -1182,9 +1180,9 @@ bool Sapphire::World::Manager::HousingMgr::placeInteriorItem( Entity::Player& pl
     container->setItem( static_cast< uint8_t >( freeSlot ), item );
 
     // resend container
-    invMgr->sendInventoryContainer( player, container );
-    invMgr->saveHousingContainer( ident, container );
-    invMgr->updateHousingItemPosition( item );
+    invMgr.sendInventoryContainer( player, container );
+    invMgr.saveHousingContainer( ident, container );
+    invMgr.updateHousingItemPosition( item );
 
     auto zone = std::dynamic_pointer_cast< Territory::Housing::HousingInteriorTerritory >( player.getCurrentTerritory() );
     assert( zone );
@@ -1224,7 +1222,7 @@ void Sapphire::World::Manager::HousingMgr::sendInternalEstateInventoryBatch( Sap
   else
     containerIds = m_internalPlacedItemContainers;
 
-  auto invMgr = framework()->get< Manager::InventoryMgr >();
+  auto& invMgr = Service< InventoryMgr >::ref();
   auto& containers = getEstateInventory( zone->getLandIdent() );
 
   for( auto containerId : containerIds )
@@ -1233,7 +1231,7 @@ void Sapphire::World::Manager::HousingMgr::sendInternalEstateInventoryBatch( Sap
     if( container == containers.end() )
       break;
 
-    invMgr->sendInventoryContainer( player, container->second );
+    invMgr.sendInventoryContainer( player, container->second );
   }
 }
 
@@ -1296,8 +1294,8 @@ bool Sapphire::World::Manager::HousingMgr::moveInternalItem( Entity::Player& pla
   item->setRot( rot );
 
   // save
-  auto invMgr = framework()->get< InventoryMgr >();
-  invMgr->updateHousingItemPosition( item );
+  auto& invMgr = Service< InventoryMgr >::ref();
+  invMgr.updateHousingItemPosition( item );
 
   terri.updateHousingObjectPosition( player, slot, item->getPos(), static_cast< uint16_t >( item->getRot() ) );
 
@@ -1334,8 +1332,8 @@ bool Sapphire::World::Manager::HousingMgr::moveExternalItem( Entity::Player& pla
   item->setPos( pos );
   item->setRot( rot );
 
-  auto invMgr = framework()->get< InventoryMgr >();
-  invMgr->updateHousingItemPosition( item );
+  auto& invMgr = Service< InventoryMgr >::ref();
+  invMgr.updateHousingItemPosition( item );
 
   terri.updateYardObjectPos( player, slot, static_cast< uint16_t >( ident.landId ), *item );
 
@@ -1423,13 +1421,13 @@ bool Sapphire::World::Manager::HousingMgr::removeInternalItem( Entity::Player& p
     if( !player.getFreeInventoryContainerSlot( containerPair ) )
       return false;
 
-    auto invMgr = framework()->get< InventoryMgr >();
+    auto& invMgr = Service< InventoryMgr >::ref();
 
     // remove it from housing inventory
     container->removeItem( static_cast< uint8_t >( slotId ) );
-    invMgr->sendInventoryContainer( player, container );
-    invMgr->removeHousingItemPosition( *item );
-    invMgr->removeItemFromHousingContainer( terri.getLandIdent(), containerId, slotId );
+    invMgr.sendInventoryContainer( player, container );
+    invMgr.removeHousingItemPosition( *item );
+    invMgr.removeItemFromHousingContainer( terri.getLandIdent(), containerId, slotId );
 
     // add to player inv
     player.insertInventoryItem( containerPair.first, containerPair.second, item );
@@ -1445,16 +1443,16 @@ bool Sapphire::World::Manager::HousingMgr::removeInternalItem( Entity::Player& p
     if( !freeContainer )
       return false;
 
-    auto invMgr = framework()->get< InventoryMgr >();
+    auto& invMgr = Service< InventoryMgr >::ref();
 
     container->removeItem( static_cast< uint8_t >( slotId ) );
-    invMgr->sendInventoryContainer( player, container );
-    invMgr->removeHousingItemPosition( *item );
-    invMgr->removeItemFromHousingContainer( terri.getLandIdent(), containerId, slotId );
+    invMgr.sendInventoryContainer( player, container );
+    invMgr.removeHousingItemPosition( *item );
+    invMgr.removeItemFromHousingContainer( terri.getLandIdent(), containerId, slotId );
 
     freeContainer->setItem( static_cast< uint8_t >( slotId ), item );
-    invMgr->sendInventoryContainer( player, freeContainer );
-    invMgr->saveHousingContainer( terri.getLandIdent(), freeContainer );
+    invMgr.sendInventoryContainer( player, freeContainer );
+    invMgr.saveHousingContainer( terri.getLandIdent(), freeContainer );
   }
 
   // despawn
@@ -1485,7 +1483,7 @@ bool Sapphire::World::Manager::HousingMgr::removeExternalItem( Entity::Player& p
 
   bool shouldDespawnItem = containerType != InventoryType::HousingExteriorStoreroom;
 
-  auto invMgr = framework()->get< InventoryMgr >();
+  auto& invMgr = Service< InventoryMgr >::ref();
 
   if( sendToStoreroom )
   {
@@ -1496,13 +1494,13 @@ bool Sapphire::World::Manager::HousingMgr::removeExternalItem( Entity::Player& p
       return false;
 
     sourceContainer->removeItem( slotId );
-    invMgr->sendInventoryContainer( player, sourceContainer );
-    invMgr->removeItemFromHousingContainer( land.getLandIdent(), sourceContainer->getId(), slotId );
-    invMgr->removeHousingItemPosition( *item );
+    invMgr.sendInventoryContainer( player, sourceContainer );
+    invMgr.removeItemFromHousingContainer( land.getLandIdent(), sourceContainer->getId(), slotId );
+    invMgr.removeHousingItemPosition( *item );
 
     storeroomContainer->setItem( static_cast< uint8_t >( freeSlot ), item );
-    invMgr->sendInventoryContainer( player, storeroomContainer );
-    invMgr->saveHousingContainer( land.getLandIdent(), storeroomContainer );
+    invMgr.sendInventoryContainer( player, storeroomContainer );
+    invMgr.saveHousingContainer( land.getLandIdent(), storeroomContainer );
   }
   else
   {
@@ -1512,9 +1510,9 @@ bool Sapphire::World::Manager::HousingMgr::removeExternalItem( Entity::Player& p
 
     // remove from housing inv
     sourceContainer->removeItem( slotId );
-    invMgr->sendInventoryContainer( player, sourceContainer );
-    invMgr->removeHousingItemPosition( *item );
-    invMgr->removeItemFromHousingContainer( land.getLandIdent(), sourceContainer->getId(), slotId );
+    invMgr.sendInventoryContainer( player, sourceContainer );
+    invMgr.removeHousingItemPosition( *item );
+    invMgr.removeItemFromHousingContainer( land.getLandIdent(), sourceContainer->getId(), slotId );
 
     // add to player inv
     player.insertInventoryItem( containerPair.first, containerPair.second, item );
@@ -1570,9 +1568,9 @@ void Sapphire::World::Manager::HousingMgr::reqEstateExteriorRemodel( Sapphire::E
   if( it == inv.end() )
     return;
 
-  auto invMgr = framework()->get< InventoryMgr >();
+  auto& invMgr = Service< InventoryMgr >::ref();
 
-  invMgr->sendInventoryContainer( player, it->second );
+  invMgr.sendInventoryContainer( player, it->second );
 
   auto pkt = Server::makeActorControlSelf( player.getId(), Network::ActorControl::ShowEstateExternalAppearanceUI, plot );
   player.queuePacket( pkt );
@@ -1600,9 +1598,9 @@ void Sapphire::World::Manager::HousingMgr::reqEstateInteriorRemodel( Sapphire::E
   if( it == inv.end() )
     return;
 
-  auto invMgr = framework()->get< InventoryMgr >();
+  auto& invMgr = Service< InventoryMgr >::ref();
 
-  invMgr->sendInventoryContainer( player, it->second );
+  invMgr.sendInventoryContainer( player, it->second );
 
   auto pkt = Server::makeActorControlSelf( player.getId(), Network::ActorControl::ShowEstateInternalAppearanceUI );
   player.queuePacket( pkt );
@@ -1627,5 +1625,5 @@ Sapphire::Inventory::HousingItemPtr Sapphire::World::Manager::HousingMgr::getHou
   if( !tmpItem )
     return nullptr;
 
-  return Inventory::make_HousingItem( tmpItem->getUId(), tmpItem->getId(), framework() );
+  return Inventory::make_HousingItem( tmpItem->getUId(), tmpItem->getId() );
 }
diff --git a/src/world/Manager/HousingMgr.h b/src/world/Manager/HousingMgr.h
index cd81255e..b810354f 100644
--- a/src/world/Manager/HousingMgr.h
+++ b/src/world/Manager/HousingMgr.h
@@ -2,7 +2,6 @@
 #define SAPPHIRE_HOUSINGMGR_H
 
 #include "Forwards.h"
-#include "BaseManager.h"
 #include "Territory/HousingZone.h"
 #include <set>
 #include <unordered_map>
@@ -15,7 +14,7 @@ namespace Sapphire::Data
 
 namespace Sapphire::World::Manager
 {
-  class HousingMgr : public BaseManager
+  class HousingMgr
   {
 
   public:
@@ -69,7 +68,7 @@ namespace Sapphire::World::Manager
      */
     using LandIdentToInventoryContainerMap = std::unordered_map< uint64_t, ContainerIdToContainerMap >;
 
-    HousingMgr( FrameworkPtr pFw );
+    HousingMgr();
     virtual ~HousingMgr();
 
     bool init();
diff --git a/src/world/Manager/InventoryMgr.cpp b/src/world/Manager/InventoryMgr.cpp
index 6d8217c6..b4c3759e 100644
--- a/src/world/Manager/InventoryMgr.cpp
+++ b/src/world/Manager/InventoryMgr.cpp
@@ -10,15 +10,10 @@
 
 #include <Database/DatabaseDef.h>
 #include <Exd/ExdDataGenerated.h>
-
-#include "Framework.h"
+#include <Service.h>
 
 using namespace Sapphire::Network::Packets;
 
-Sapphire::World::Manager::InventoryMgr::InventoryMgr( Sapphire::FrameworkPtr pFw ) :
-  BaseManager( pFw )
-{ }
-
 void Sapphire::World::Manager::InventoryMgr::sendInventoryContainer( Sapphire::Entity::Player& player,
                                                                      Sapphire::ItemContainerPtr container )
 {
@@ -71,15 +66,14 @@ void Sapphire::World::Manager::InventoryMgr::sendInventoryContainer( Sapphire::E
 Sapphire::ItemPtr Sapphire::World::Manager::InventoryMgr::createItem( Entity::Player& player,
                                                                       uint32_t catalogId, uint32_t quantity )
 {
-  auto pExdData = framework()->get< Data::ExdDataGenerated >();
-  auto pDb = framework()->get< Db::DbWorkerPool< Db::ZoneDbConnection > >();
-  auto itemMgr = framework()->get< Manager::ItemMgr >();
-  auto itemInfo = pExdData->get< Sapphire::Data::Item >( catalogId );
+  auto& pExdData = Common::Service< Data::ExdDataGenerated >::ref();
+  auto& itemMgr = Common::Service< Manager::ItemMgr >::ref();
+  auto itemInfo = pExdData.get< Sapphire::Data::Item >( catalogId );
 
   if( !itemInfo )
     return nullptr;
 
-  auto item = make_Item( itemMgr->getNextUId(), catalogId, framework() );
+  auto item = make_Item( itemMgr.getNextUId(), catalogId );
 
   item->setStackSize( std::max< uint32_t >( 1, quantity ) );
 
@@ -103,9 +97,9 @@ void Sapphire::World::Manager::InventoryMgr::removeItemFromHousingContainer( Sap
                                                                              uint16_t containerId,
                                                                              uint16_t slotId )
 {
-  auto pDb = framework()->get< Db::DbWorkerPool< Db::ZoneDbConnection > >();
+  auto& db = Common::Service< Db::DbWorkerPool< Db::ZoneDbConnection > >::ref();
 
-  auto stmt = pDb->getPreparedStatement( Db::LAND_INV_DEL );
+  auto stmt = db.getPreparedStatement( Db::LAND_INV_DEL );
 
   auto u64ident = *reinterpret_cast< uint64_t* >( &ident );
 
@@ -113,16 +107,16 @@ void Sapphire::World::Manager::InventoryMgr::removeItemFromHousingContainer( Sap
   stmt->setUInt( 2, containerId );
   stmt->setUInt( 3, slotId );
 
-  pDb->directExecute( stmt );
+  db.directExecute( stmt );
 }
 
 void Sapphire::World::Manager::InventoryMgr::saveHousingContainerItem( uint64_t ident,
                                                                        uint16_t containerId, uint16_t slotId,
                                                                        uint64_t itemId )
 {
-  auto pDb = framework()->get< Db::DbWorkerPool< Db::ZoneDbConnection > >();
+  auto& db = Common::Service< Db::DbWorkerPool< Db::ZoneDbConnection > >::ref();
 
-  auto stmt = pDb->getPreparedStatement( Db::LAND_INV_UP );
+  auto stmt = db.getPreparedStatement( Db::LAND_INV_UP );
   // LandIdent, ContainerId, SlotId, ItemId, ItemId
 
   stmt->setUInt64( 1, ident );
@@ -134,14 +128,14 @@ void Sapphire::World::Manager::InventoryMgr::saveHousingContainerItem( uint64_t
   // the second time is for the ON DUPLICATE KEY UPDATE condition
   stmt->setUInt64( 5, itemId );
 
-  pDb->directExecute( stmt );
+  db.directExecute( stmt );
 }
 
 void Sapphire::World::Manager::InventoryMgr::updateHousingItemPosition( Sapphire::Inventory::HousingItemPtr item )
 {
-  auto pDb = framework()->get< Db::DbWorkerPool< Db::ZoneDbConnection > >();
+  auto& db = Common::Service< Db::DbWorkerPool< Db::ZoneDbConnection > >::ref();
 
-  auto stmt = pDb->getPreparedStatement( Db::LAND_INV_UP_ITEMPOS );
+  auto stmt = db.getPreparedStatement( Db::LAND_INV_UP_ITEMPOS );
   // ItemId, PosX, PosY, PosZ, Rotation, PosX, PosY, PosZ, Rotation
 
   auto pos = item->getPos();
@@ -159,29 +153,29 @@ void Sapphire::World::Manager::InventoryMgr::updateHousingItemPosition( Sapphire
   stmt->setUInt( 8, pos.z );
   stmt->setInt( 9, rot );
 
-  pDb->execute( stmt );
+  db.execute( stmt );
 }
 
 void Sapphire::World::Manager::InventoryMgr::removeHousingItemPosition( Sapphire::Inventory::HousingItem& item )
 {
-  auto pDb = framework()->get< Db::DbWorkerPool< Db::ZoneDbConnection > >();
+  auto& db = Common::Service< Db::DbWorkerPool< Db::ZoneDbConnection > >::ref();
 
-  auto stmt = pDb->getPreparedStatement( Db::LAND_INV_DEL_ITEMPOS );
+  auto stmt = db.getPreparedStatement( Db::LAND_INV_DEL_ITEMPOS );
 
   stmt->setUInt64( 1, item.getUId() );
 
-  pDb->directExecute( stmt );
+  db.directExecute( stmt );
 }
 
 void Sapphire::World::Manager::InventoryMgr::saveItem( Sapphire::Entity::Player& player, Sapphire::ItemPtr item )
 {
-  auto pDb = framework()->get< Db::DbWorkerPool< Db::ZoneDbConnection > >();
-  auto stmt = pDb->getPreparedStatement( Db::CHARA_ITEMGLOBAL_INS );
+  auto& db = Common::Service< Db::DbWorkerPool< Db::ZoneDbConnection > >::ref();
+  auto stmt = db.getPreparedStatement( Db::CHARA_ITEMGLOBAL_INS );
 
   stmt->setUInt( 1, player.getId() );
   stmt->setUInt64( 2, item->getUId() );
   stmt->setUInt( 3, item->getId() );
   stmt->setUInt( 4, item->getStackSize() );
 
-  pDb->directExecute( stmt );
+  db.directExecute( stmt );
 }
diff --git a/src/world/Manager/InventoryMgr.h b/src/world/Manager/InventoryMgr.h
index 4bb154ea..5803450a 100644
--- a/src/world/Manager/InventoryMgr.h
+++ b/src/world/Manager/InventoryMgr.h
@@ -2,15 +2,14 @@
 #define SAPPHIRE_INVENTORYMGR_H
 
 #include "ForwardsZone.h"
-#include "BaseManager.h"
 
 namespace Sapphire::World::Manager
 {
 
-  class InventoryMgr : public Sapphire::World::Manager::BaseManager
+  class InventoryMgr
   {
   public:
-    explicit InventoryMgr( Sapphire::FrameworkPtr pFw );
+    InventoryMgr() = default;
 
     /*!
      * @brief Sends an item container to a player
diff --git a/src/world/Manager/ItemMgr.cpp b/src/world/Manager/ItemMgr.cpp
index ed119610..a28cec61 100644
--- a/src/world/Manager/ItemMgr.cpp
+++ b/src/world/Manager/ItemMgr.cpp
@@ -2,18 +2,12 @@
 
 #include "Inventory/ItemContainer.h"
 #include "Inventory/Item.h"
-#include "Framework.h"
 #include <Network/CommonActorControl.h>
 
 #include <Exd/ExdDataGenerated.h>
 #include <Logging/Logger.h>
 #include <Database/DatabaseDef.h>
-
-Sapphire::World::Manager::ItemMgr::ItemMgr( Sapphire::FrameworkPtr pFw ) :
-  BaseManager( pFw )
-{
-
-}
+#include <Service.h>
 
 bool Sapphire::World::Manager::ItemMgr::isArmory( uint16_t containerId )
 {
@@ -122,27 +116,26 @@ bool Sapphire::World::Manager::ItemMgr::isOneHandedWeapon( Common::ItemUICategor
 
 Sapphire::ItemPtr Sapphire::World::Manager::ItemMgr::loadItem( uint64_t uId )
 {
-  auto pExdData = framework()->get< Data::ExdDataGenerated >();
-  auto pDb = framework()->get< Db::DbWorkerPool< Db::ZoneDbConnection > >();
+  auto& exdData = Common::Service< Data::ExdDataGenerated >::ref();
+  auto& db = Common::Service< Db::DbWorkerPool< Db::ZoneDbConnection > >::ref();
 
   //  1 catalogId, 2 stack, 3 reservedFlag, 4 signatureId, 5 flags, 6 durability, 7 refine, 8 materia_0, 9 materia_1,
   //  10 materia_2, 11 materia_3, 12 materia_4, 13 stain, 14 pattern, 15 buffer_0, 16 buffer_1, 17 buffer_2,
   //  18 buffer_3, 19 buffer_4
-  auto query = pDb->getPreparedStatement( Db::CHARA_ITEMGLOBAL_SELECT );
+  auto query = db.getPreparedStatement( Db::CHARA_ITEMGLOBAL_SELECT );
   query->setUInt64( 1, uId );
 
-  auto itemRes = pDb->query( query );
+  auto itemRes = db.query( query );
   if( !itemRes->next() )
     return nullptr;
 
   try
   {
-    auto itemInfo = pExdData->get< Sapphire::Data::Item >( itemRes->getUInt( 1 ) );
+    auto itemInfo = exdData.get< Sapphire::Data::Item >( itemRes->getUInt( 1 ) );
     bool isHq = itemRes->getUInt( 3 ) == 1;
 
     ItemPtr pItem = make_Item( uId,
                                itemRes->getUInt( 1 ),
-                               framework(),
                                isHq );
 
     pItem->setStackSize( itemRes->getUInt( 2 ) );
@@ -185,8 +178,9 @@ Sapphire::Common::ContainerType Sapphire::World::Manager::ItemMgr::getContainerT
 uint32_t Sapphire::World::Manager::ItemMgr::getNextUId()
 {
   uint32_t charId = 0;
-  auto pDb = framework()->get< Db::DbWorkerPool< Db::ZoneDbConnection > >();
-  auto pQR = pDb->query( "SELECT MAX(ItemId) FROM charaglobalitem" );
+
+  auto& db = Common::Service< Db::DbWorkerPool< Db::ZoneDbConnection > >::ref();
+  auto pQR = db.query( "SELECT MAX(ItemId) FROM charaglobalitem" );
 
   if( !pQR->next() )
     return 0x00500001;
diff --git a/src/world/Manager/ItemMgr.h b/src/world/Manager/ItemMgr.h
index 795f7c2b..b24c56e9 100644
--- a/src/world/Manager/ItemMgr.h
+++ b/src/world/Manager/ItemMgr.h
@@ -3,15 +3,14 @@
 
 #include <Common.h>
 #include "ForwardsZone.h"
-#include "BaseManager.h"
 
 namespace Sapphire::World::Manager
 {
 
-  class ItemMgr : public BaseManager
+  class ItemMgr
   {
   public:
-    ItemMgr( FrameworkPtr pFw );
+    ItemMgr() = default;
 
     ItemPtr loadItem( uint64_t uId );
 
diff --git a/src/world/Manager/LinkshellMgr.cpp b/src/world/Manager/LinkshellMgr.cpp
index 11d56859..fdbb8cb9 100644
--- a/src/world/Manager/LinkshellMgr.cpp
+++ b/src/world/Manager/LinkshellMgr.cpp
@@ -1,19 +1,15 @@
 #include <Logging/Logger.h>
 #include <Database/DatabaseDef.h>
+#include <Service.h>
 
 #include "Linkshell/Linkshell.h"
-#include "Framework.h"
 #include "LinkshellMgr.h"
 
-Sapphire::World::Manager::LinkshellMgr::LinkshellMgr( FrameworkPtr pFw ) :
-  BaseManager( pFw )
-{
-}
-
 bool Sapphire::World::Manager::LinkshellMgr::loadLinkshells()
 {
-  auto pDb = framework()->get< Db::DbWorkerPool< Db::ZoneDbConnection > >();
-  auto res = pDb->query( "SELECT LinkshellId, MasterCharacterId, CharacterIdList, "
+  auto& db = Common::Service< Db::DbWorkerPool< Db::ZoneDbConnection > >::ref();
+
+  auto res = db.query( "SELECT LinkshellId, MasterCharacterId, CharacterIdList, "
                          "LinkshellName, LeaderIdList, InviteIdList "
                          "FROM infolinkshell "
                          "ORDER BY LinkshellId ASC;" );
diff --git a/src/world/Manager/LinkshellMgr.h b/src/world/Manager/LinkshellMgr.h
index 034f7884..5e97c351 100644
--- a/src/world/Manager/LinkshellMgr.h
+++ b/src/world/Manager/LinkshellMgr.h
@@ -4,12 +4,11 @@
 #include <memory>
 #include <map>
 #include "ForwardsZone.h"
-#include "BaseManager.h"
 
 namespace Sapphire::World::Manager
 {
 
-  class LinkshellMgr : public Manager::BaseManager
+  class LinkshellMgr
   {
   private:
     std::map< uint64_t, LinkshellPtr > m_linkshellIdMap;
@@ -20,7 +19,7 @@ namespace Sapphire::World::Manager
     LinkshellPtr getLinkshellById( uint64_t lsId );
 
   public:
-    LinkshellMgr( FrameworkPtr pFw );
+    LinkshellMgr() = default;
 
     bool loadLinkshells();
   };
diff --git a/src/world/Manager/MarketMgr.cpp b/src/world/Manager/MarketMgr.cpp
index 1ad81cf9..54f9fe65 100644
--- a/src/world/Manager/MarketMgr.cpp
+++ b/src/world/Manager/MarketMgr.cpp
@@ -1,7 +1,6 @@
 #include "MarketMgr.h"
 
 #include <Exd/ExdDataGenerated.h>
-#include <Framework.h>
 #include <Logging/Logger.h>
 
 #include <Network/CommonNetwork.h>
@@ -14,26 +13,20 @@
 
 using namespace Sapphire::Network::Packets;
 
-Sapphire::World::Manager::MarketMgr::MarketMgr( Sapphire::FrameworkPtr pFw ) :
-  BaseManager( pFw )
-{
-
-}
-
 bool Sapphire::World::Manager::MarketMgr::init()
 {
 //  Logger::info( "MarketMgr: warming up marketable item cache..." );
 //
 //  // build item cache
-//  auto exdData = framework()->get< Sapphire::Data::ExdDataGenerated >();
-//  auto idList = exdData->getItemIdList();
+//  auto& exdData = Common::Service< Sapphire::Data::ExdDataGenerated >::ref();
+//  auto idList = exdData.getItemIdList();
 //
 //  for( auto id : idList )
 //  {
 //    if( id > 10000 )
 //      break;
 //
-//    auto item = exdData->get< Sapphire::Data::Item >( id );
+//    auto item = exdData.get< Sapphire::Data::Item >( id );
 //    if( !item )
 //      continue;
 //
diff --git a/src/world/Manager/MarketMgr.h b/src/world/Manager/MarketMgr.h
index 328c9c12..a9a69529 100644
--- a/src/world/Manager/MarketMgr.h
+++ b/src/world/Manager/MarketMgr.h
@@ -2,16 +2,15 @@
 #define SAPPHIRE_MARKETMGR_H
 
 #include "ForwardsZone.h"
-#include "BaseManager.h"
 
 #include <vector>
 
 namespace Sapphire::World::Manager
 {
-  class MarketMgr : public Manager::BaseManager
+  class MarketMgr
   {
   public:
-    explicit MarketMgr( FrameworkPtr pFw );
+    MarketMgr() = default;
 
     bool init();
 
diff --git a/src/world/Manager/NaviMgr.cpp b/src/world/Manager/NaviMgr.cpp
index 62877ace..4bebd7d4 100644
--- a/src/world/Manager/NaviMgr.cpp
+++ b/src/world/Manager/NaviMgr.cpp
@@ -2,12 +2,6 @@
 #include "Navi/NaviProvider.h"
 #include <Logging/Logger.h>
 
-Sapphire::World::Manager::NaviMgr::NaviMgr( FrameworkPtr pFw ) :
-  BaseManager( pFw ),
-  m_pFw( pFw )
-{
-}
-
 bool Sapphire::World::Manager::NaviMgr::setupTerritory( const std::string& bgPath )
 {
   std::string bg = getBgName( bgPath );
@@ -16,7 +10,7 @@ bool Sapphire::World::Manager::NaviMgr::setupTerritory( const std::string& bgPat
   if( m_naviProviderTerritoryMap.find( bg ) != m_naviProviderTerritoryMap.end() )
     return true;
 
-  auto provider = Navi::make_NaviProvider( bg, m_pFw );
+  auto provider = Navi::make_NaviProvider( bg );
 
   if( provider->init() )
   {
diff --git a/src/world/Manager/NaviMgr.h b/src/world/Manager/NaviMgr.h
index 6aeac713..3c08d886 100644
--- a/src/world/Manager/NaviMgr.h
+++ b/src/world/Manager/NaviMgr.h
@@ -2,26 +2,21 @@
 #define SAPPHIRE_NAVIMGR_H
 
 #include "ForwardsZone.h"
-#include "BaseManager.h"
 
 #include <array>
 
 namespace Sapphire::World::Manager
 {
-  class NaviMgr : public BaseManager
+  class NaviMgr
   {
-
   public:
-
-    NaviMgr( FrameworkPtr pFw );
+    NaviMgr() = default;
     virtual ~NaviMgr() = default;
 
     bool setupTerritory( const std::string& bgPath );
     Navi::NaviProviderPtr getNaviProvider( const std::string& bgPath );
 
   private:
-    FrameworkPtr m_pFw;
-
     std::string getBgName( const std::string& bgPath );
 
     std::unordered_map< std::string, Navi::NaviProviderPtr > m_naviProviderTerritoryMap;
diff --git a/src/world/Manager/PlayerMgr.cpp b/src/world/Manager/PlayerMgr.cpp
index 1f0f60a1..79062f2e 100644
--- a/src/world/Manager/PlayerMgr.cpp
+++ b/src/world/Manager/PlayerMgr.cpp
@@ -1,6 +1,5 @@
 #include "PlayerMgr.h"
 
-#include <Framework.h>
 #include <Exd/ExdDataGenerated.h>
 
 #include <Manager/TerritoryMgr.h>
@@ -10,41 +9,34 @@
 #include <Manager/HousingMgr.h>
 
 #include <Actor/Player.h>
+#include <Service.h>
 
 using namespace Sapphire::World::Manager;
 
-Sapphire::World::Manager::PlayerMgr::PlayerMgr( Sapphire::FrameworkPtr pFw ) :
-  BaseManager( std::move( pFw ) )
-{
-
-}
-
 void Sapphire::World::Manager::PlayerMgr::movePlayerToLandDestination( Sapphire::Entity::Player& player, uint32_t landId, uint16_t param )
 {
   // check if we have one in the db first
-  auto terriMgr = framework()->get< TerritoryMgr >();
-  if( !terriMgr )
-    return;
+  auto& terriMgr = Common::Service< TerritoryMgr >::ref();
 
   Sapphire::TerritoryPtr destinationZone;
 
-  auto terriPos = terriMgr->getTerritoryPosition( landId );
+  auto terriPos = terriMgr.getTerritoryPosition( landId );
   if( terriPos )
   {
     // check if its a housing zone, zoning is different here
-    if( terriMgr->isHousingTerritory( terriPos->getTargetZoneId() ) )
+    if( terriMgr.isHousingTerritory( terriPos->getTargetZoneId() ) )
     {
-      auto housingMgr = framework()->get< HousingMgr >();
-      auto landSetId = housingMgr->toLandSetId( terriPos->getTargetZoneId(), param );
+      auto& housingMgr = Common::Service< HousingMgr >::ref();
+      auto landSetId = housingMgr.toLandSetId( terriPos->getTargetZoneId(), param );
 
-      auto housingZone = housingMgr->getHousingZoneByLandSetId( landSetId );
+      auto housingZone = housingMgr.getHousingZoneByLandSetId( landSetId );
 
       if( !housingZone )
         return;
 
       destinationZone = housingZone;
     }
-    else if( terriMgr->isInstanceContentTerritory( terriPos->getTargetZoneId() ) )
+    else if( terriMgr.isInstanceContentTerritory( terriPos->getTargetZoneId() ) )
     {
       // todo: instance dungeon handling
       // will need to use setInstance so old pos gets set
@@ -53,7 +45,7 @@ void Sapphire::World::Manager::PlayerMgr::movePlayerToLandDestination( Sapphire:
     else
     {
       // normal zones
-      destinationZone = terriMgr->getZoneByTerritoryTypeId( terriPos->getTargetZoneId() );
+      destinationZone = terriMgr.getZoneByTerritoryTypeId( terriPos->getTargetZoneId() );
     }
   }
   else
@@ -73,5 +65,5 @@ void Sapphire::World::Manager::PlayerMgr::movePlayerToLandDestination( Sapphire:
   player.setPos( terriPos->getTargetPosition() );
   player.setRot( terriPos->getTargetRotation() );
 
-  terriMgr->movePlayer( destinationZone, player.getAsPlayer() );
+  terriMgr.movePlayer( destinationZone, player.getAsPlayer() );
 }
diff --git a/src/world/Manager/PlayerMgr.h b/src/world/Manager/PlayerMgr.h
index f7d08488..a0046fe3 100644
--- a/src/world/Manager/PlayerMgr.h
+++ b/src/world/Manager/PlayerMgr.h
@@ -2,14 +2,13 @@
 #define SAPPHIRE_PLAYERMGR_H
 
 #include "ForwardsZone.h"
-#include "BaseManager.h"
 
 namespace Sapphire::World::Manager
 {
-class PlayerMgr : public Manager::BaseManager
+class PlayerMgr
   {
   public:
-    PlayerMgr( FrameworkPtr pFw );
+    PlayerMgr() = default;
 
     void movePlayerToLandDestination( Sapphire::Entity::Player& player, uint32_t landId, uint16_t param = 0 );
   };
diff --git a/src/world/Manager/RNGMgr.cpp b/src/world/Manager/RNGMgr.cpp
index 69c21185..b6fac08d 100644
--- a/src/world/Manager/RNGMgr.cpp
+++ b/src/world/Manager/RNGMgr.cpp
@@ -1,8 +1,7 @@
 #include "RNGMgr.h"
 #include <Logging/Logger.h>
 
-Sapphire::World::Manager::RNGMgr::RNGMgr( FrameworkPtr pFw ) :
-  BaseManager( pFw ),
+Sapphire::World::Manager::RNGMgr::RNGMgr() :
   m_engine( *engineSeed< std::mt19937::state_size >() )
 {
 
diff --git a/src/world/Manager/RNGMgr.h b/src/world/Manager/RNGMgr.h
index a91325f2..1d6e08e2 100644
--- a/src/world/Manager/RNGMgr.h
+++ b/src/world/Manager/RNGMgr.h
@@ -2,7 +2,6 @@
 #define SAPPHIRE_RNGMGR_H
 
 #include "Forwards.h"
-#include "BaseManager.h"
 
 #include <array>
 #include <algorithm>
@@ -47,13 +46,10 @@ namespace Sapphire::World::Manager
     std::mt19937 m_engine;
   };
 
-  class RNGMgr : public BaseManager
+  class RNGMgr
   {
-
   public:
-
-
-    RNGMgr( FrameworkPtr pFw );
+    RNGMgr();
     virtual ~RNGMgr() = default;
 
     RNGMgr( const RNGMgr& pRNGMgr ) = delete;
diff --git a/src/world/Manager/ShopMgr.cpp b/src/world/Manager/ShopMgr.cpp
index 30470fa2..80df3a04 100644
--- a/src/world/Manager/ShopMgr.cpp
+++ b/src/world/Manager/ShopMgr.cpp
@@ -1,29 +1,21 @@
 #include "ShopMgr.h"
 
-#include <Framework.h>
 #include <Exd/ExdDataGenerated.h>
 #include <Actor/Player.h>
 #include <Common.h>
+#include <Service.h>
 
 using namespace Sapphire;
 
-Sapphire::World::Manager::ShopMgr::ShopMgr( FrameworkPtr pFw ) :
-  BaseManager( pFw )
-{
-
-}
-
 bool Sapphire::World::Manager::ShopMgr::purchaseGilShopItem( Entity::Player& player, uint32_t shopId, uint16_t itemId, uint32_t quantity )
 {
-  auto exdData = framework()->get< Data::ExdDataGenerated >();
-  if( !exdData )
-    return false;
+  auto& exdData = Common::Service< Data::ExdDataGenerated >::ref();
 
-  auto gilShopItem = exdData->get< Data::GilShopItem >( shopId, itemId );
+  auto gilShopItem = exdData.get< Data::GilShopItem >( shopId, itemId );
   if( !gilShopItem )
     return false;
 
-  auto item = exdData->get< Data::Item >( gilShopItem->item );
+  auto item = exdData.get< Data::Item >( gilShopItem->item );
   if( !item )
     return false;
 
diff --git a/src/world/Manager/ShopMgr.h b/src/world/Manager/ShopMgr.h
index 6464d026..5e40ae1d 100644
--- a/src/world/Manager/ShopMgr.h
+++ b/src/world/Manager/ShopMgr.h
@@ -1,12 +1,11 @@
 #include "ForwardsZone.h"
-#include "BaseManager.h"
 
 namespace Sapphire::World::Manager
 {
-  class ShopMgr : public Manager::BaseManager
+  class ShopMgr
   {
   public:
-    ShopMgr( FrameworkPtr pFw );
+    ShopMgr() = default;
     bool purchaseGilShopItem( Sapphire::Entity::Player& player, uint32_t shopId, uint16_t itemId, uint32_t quantity );
   };
 }
\ No newline at end of file
diff --git a/src/world/Manager/TerritoryMgr.cpp b/src/world/Manager/TerritoryMgr.cpp
index 25d7458b..7997cdc4 100644
--- a/src/world/Manager/TerritoryMgr.cpp
+++ b/src/world/Manager/TerritoryMgr.cpp
@@ -15,15 +15,13 @@
 #include "Territory/QuestBattle.h"
 #include "TerritoryMgr.h"
 #include "HousingMgr.h"
-#include "Framework.h"
 
 #include "Territory/Land.h"
 #include "Territory/House.h"
 #include "Territory/Housing/HousingInteriorTerritory.h"
 #include "NaviMgr.h"
 
-Sapphire::World::Manager::TerritoryMgr::TerritoryMgr( Sapphire::FrameworkPtr pFw ) :
-  BaseManager( pFw ),
+Sapphire::World::Manager::TerritoryMgr::TerritoryMgr() :
   m_lastInstanceId( 10000 )
 {
 
@@ -31,20 +29,20 @@ Sapphire::World::Manager::TerritoryMgr::TerritoryMgr( Sapphire::FrameworkPtr pFw
 
 void Sapphire::World::Manager::TerritoryMgr::loadTerritoryTypeDetailCache()
 {
-  auto pExdData = framework()->get< Data::ExdDataGenerated >();
-  auto idList = pExdData->getTerritoryTypeIdList();
+  auto& exdData = Common::Service< Data::ExdDataGenerated >::ref();
+  auto idList = exdData.getTerritoryTypeIdList();
 
   for( auto id : idList )
   {
-    auto teri1 = pExdData->get< Sapphire::Data::TerritoryType >( id );
+    auto teri1 = exdData.get< Sapphire::Data::TerritoryType >( id );
 
     if( !teri1->name.empty() )
       m_territoryTypeDetailCacheMap[ id ] = teri1;
   }
 
-  for( auto id : pExdData->getContentFinderConditionIdList() )
+  for( auto id : exdData.getContentFinderConditionIdList() )
   {
-    auto cfc = pExdData->get< Sapphire::Data::ContentFinderCondition >( id );
+    auto cfc = exdData.get< Sapphire::Data::ContentFinderCondition >( id );
     if( !cfc || cfc->contentLinkType != 5 )
       continue;
 
@@ -165,7 +163,7 @@ bool Sapphire::World::Manager::TerritoryMgr::isHousingTerritory( uint32_t territ
 
 bool Sapphire::World::Manager::TerritoryMgr::createDefaultTerritories()
 {
-  auto pExdData = framework()->get< Data::ExdDataGenerated >();
+  auto& exdData = Common::Service< Data::ExdDataGenerated >::ref();
   // for each entry in territoryTypeExd, check if it is a normal and if so, add the zone object
   for( const auto& territory : m_territoryTypeDetailCacheMap )
   {
@@ -176,14 +174,14 @@ bool Sapphire::World::Manager::TerritoryMgr::createDefaultTerritories()
     if( territoryInfo->name.empty() )
       continue;
 
-    auto pPlaceName = pExdData->get< Sapphire::Data::PlaceName >( territoryInfo->placeName );
+    auto pPlaceName = exdData.get< Sapphire::Data::PlaceName >( territoryInfo->placeName );
 
     if( !pPlaceName || pPlaceName->name.empty() || !isDefaultTerritory( territoryTypeId ) )
       continue;
 
     uint32_t guid = getNextInstanceId();
 
-    auto pZone = make_Territory( territoryTypeId, guid, territoryInfo->name, pPlaceName->name, framework() );
+    auto pZone = make_Territory( territoryTypeId, guid, territoryInfo->name, pPlaceName->name );
     pZone->init();
 
     std::string bgPath = territoryInfo->bg;
@@ -213,7 +211,7 @@ bool Sapphire::World::Manager::TerritoryMgr::createDefaultTerritories()
 bool Sapphire::World::Manager::TerritoryMgr::createHousingTerritories()
 {
   //separate housing zones from default
-  auto pExdData = framework()->get< Data::ExdDataGenerated >();
+  auto& exdData = Common::Service< Data::ExdDataGenerated >::ref();
   for( const auto& territory : m_territoryTypeDetailCacheMap )
   {
     auto territoryTypeId = territory.first;
@@ -224,7 +222,7 @@ bool Sapphire::World::Manager::TerritoryMgr::createHousingTerritories()
     if( territoryInfo->name.empty() )
       continue;
 
-    auto pPlaceName = pExdData->get< Sapphire::Data::PlaceName >( territoryInfo->placeName );
+    auto pPlaceName = exdData.get< Sapphire::Data::PlaceName >( territoryInfo->placeName );
 
     if( !pPlaceName || pPlaceName->name.empty() || !isHousingTerritory( territoryTypeId ) )
       continue;
@@ -241,8 +239,7 @@ bool Sapphire::World::Manager::TerritoryMgr::createHousingTerritories()
                     pPlaceName->name,
                     wardNum );
 
-      auto pHousingZone = make_HousingZone( wardNum, territoryTypeId, guid, territoryInfo->name,
-                                            pPlaceName->name, framework() );
+      auto pHousingZone = make_HousingZone( wardNum, territoryTypeId, guid, territoryInfo->name, pPlaceName->name );
       pHousingZone->init();
 
       InstanceIdToTerritoryPtrMap instanceMap;
@@ -267,16 +264,16 @@ Sapphire::TerritoryPtr Sapphire::World::Manager::TerritoryMgr::createTerritoryIn
 //  if( isInstanceContentTerritory( territoryTypeId ) )
 //    return nullptr;
 
-  auto pExdData = framework()->get< Data::ExdDataGenerated >();
+  auto& exdData = Common::Service< Data::ExdDataGenerated >::ref();
   auto pTeri = getTerritoryDetail( territoryTypeId );
-  auto pPlaceName = pExdData->get< Sapphire::Data::PlaceName >( pTeri->placeName );
+  auto pPlaceName = exdData.get< Sapphire::Data::PlaceName >( pTeri->placeName );
 
   if( !pTeri || !pPlaceName )
     return nullptr;
 
   Logger::debug( "Starting instance for territory: {0} ({1})", territoryTypeId, pPlaceName->name );
 
-  auto pZone = make_Territory( territoryTypeId, getNextInstanceId(), pTeri->name, pPlaceName->name, framework() );
+  auto pZone = make_Territory( territoryTypeId, getNextInstanceId(), pTeri->name, pPlaceName->name );
   pZone->init();
 
   m_guIdToTerritoryPtrMap[ pZone->getGuId() ] = pZone;
@@ -295,16 +292,16 @@ Sapphire::TerritoryPtr Sapphire::World::Manager::TerritoryMgr::createQuestBattle
 
   auto contentFinderConditionId = it->second;
 
-  auto pExdData = framework()->get< Data::ExdDataGenerated >();
-  auto pContentFinderCondition = pExdData->get< Sapphire::Data::ContentFinderCondition >( contentFinderConditionId );
+  auto& exdData = Common::Service< Data::ExdDataGenerated >::ref();
+  auto pContentFinderCondition = exdData.get< Sapphire::Data::ContentFinderCondition >( contentFinderConditionId );
   if( !pContentFinderCondition )
     return nullptr;
 
-  auto pQuestBattleInfo = pExdData->get< Sapphire::Data::QuestBattle >( questBattleId );
+  auto pQuestBattleInfo = exdData.get< Sapphire::Data::QuestBattle >( questBattleId );
   if( !pQuestBattleInfo )
     return nullptr;
 
-  auto pQuestInfo = pExdData->get< Sapphire::Data::Quest >( pQuestBattleInfo->quest );
+  auto pQuestInfo = exdData.get< Sapphire::Data::Quest >( pQuestBattleInfo->quest );
   if( !pQuestInfo )
     return nullptr;
 
@@ -319,7 +316,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, framework() );
+                                 pTeri->name, pQuestInfo->name, questBattleId );
   pZone->init();
 
   m_questBattleIdToInstanceMap[ questBattleId ][ pZone->getGuId() ] = pZone;
@@ -331,14 +328,14 @@ Sapphire::TerritoryPtr Sapphire::World::Manager::TerritoryMgr::createQuestBattle
 
 Sapphire::TerritoryPtr Sapphire::World::Manager::TerritoryMgr::createInstanceContent( uint32_t contentFinderConditionId )
 {
+  auto& exdData = Common::Service< Data::ExdDataGenerated >::ref();
 
-  auto pExdData = framework()->get< Data::ExdDataGenerated >();
-  auto pContentFinderCondition = pExdData->get< Sapphire::Data::ContentFinderCondition >( contentFinderConditionId );
+  auto pContentFinderCondition = exdData.get< Sapphire::Data::ContentFinderCondition >( contentFinderConditionId );
   if( !pContentFinderCondition )
     return nullptr;
   auto instanceContentId = pContentFinderCondition->content;
 
-  auto pInstanceContent = pExdData->get< Sapphire::Data::InstanceContent >( instanceContentId );
+  auto pInstanceContent = exdData.get< Sapphire::Data::InstanceContent >( instanceContentId );
   if( !pInstanceContent )
     return nullptr;
 
@@ -353,7 +350,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, framework() );
+                                     pTeri->name, pContentFinderCondition->name, instanceContentId );
   pZone->init();
 
   m_instanceContentIdToInstanceMap[ instanceContentId ][ pZone->getGuId() ] = pZone;
@@ -375,10 +372,10 @@ Sapphire::TerritoryPtr Sapphire::World::Manager::TerritoryMgr::findOrCreateHousi
   }
 
   // otherwise, create it
-  auto housingMgr = framework()->get< Manager::HousingMgr >();
+  auto& housingMgr = Common::Service< Manager::HousingMgr >::ref();
 
   auto parentZone = std::dynamic_pointer_cast< HousingZone >(
-    getZoneByLandSetId( housingMgr->toLandSetId( static_cast< uint16_t >( landIdent.territoryTypeId ),
+    getZoneByLandSetId( housingMgr.toLandSetId( static_cast< uint16_t >( landIdent.territoryTypeId ),
                                                  static_cast< uint8_t >( landIdent.wardNum ) ) ) );
 
   if( !parentZone )
@@ -425,7 +422,7 @@ Sapphire::TerritoryPtr Sapphire::World::Manager::TerritoryMgr::findOrCreateHousi
 
   auto zone = World::Territory::Housing::make_HousingInteriorTerritory( landIdent, territoryTypeId,
                                                                         getNextInstanceId(), terriInfo->name,
-                                                                        house->getHouseName(), framework() );
+                                                                        house->getHouseName() );
 
   zone->init();
 
@@ -469,8 +466,8 @@ Sapphire::TerritoryPtr Sapphire::World::Manager::TerritoryMgr::getTerritoryByGuI
 
 void Sapphire::World::Manager::TerritoryMgr::loadTerritoryPositionMap()
 {
-  auto pDb = framework()->get< Db::DbWorkerPool< Db::ZoneDbConnection > >();
-  auto pQR = pDb->query( "SELECT id, target_zone_id, pos_x, pos_y, pos_z, pos_o, radius FROM zonepositions;" );
+  auto& db = Common::Service< Db::DbWorkerPool< Db::ZoneDbConnection > >::ref();
+  auto pQR = db.query( "SELECT id, target_zone_id, pos_x, pos_y, pos_z, pos_o, radius FROM zonepositions;" );
 
   while( pQR->next() )
   {
diff --git a/src/world/Manager/TerritoryMgr.h b/src/world/Manager/TerritoryMgr.h
index 62967378..88935a5f 100644
--- a/src/world/Manager/TerritoryMgr.h
+++ b/src/world/Manager/TerritoryMgr.h
@@ -2,7 +2,6 @@
 #define SAPPHIRE_TERRITORYMGR_H
 
 #include "ForwardsZone.h"
-#include "BaseManager.h"
 #include <set>
 #include <unordered_map>
 
@@ -27,7 +26,7 @@ namespace Sapphire::World::Manager
      This class manages persistent and temporary instances alike.
 
   */
-  class TerritoryMgr : public Manager::BaseManager
+  class TerritoryMgr
   {
 
   public:
@@ -60,7 +59,7 @@ namespace Sapphire::World::Manager
       //Eureka = 41, // wat
     };
 
-    TerritoryMgr( FrameworkPtr pFw );
+    TerritoryMgr();
 
     /*! initializes the territoryMgr */
     bool init();
diff --git a/src/world/Math/CalcBattle.cpp b/src/world/Math/CalcBattle.cpp
index 50be9dee..167bc762 100644
--- a/src/world/Math/CalcBattle.cpp
+++ b/src/world/Math/CalcBattle.cpp
@@ -2,13 +2,13 @@
 
 #include <Exd/ExdDataGenerated.h>
 #include <Common.h>
+#include <Service.h>
 
 #include "Actor/Chara.h"
 
 #include "Actor/Player.h"
 
 #include "CalcBattle.h"
-#include "Framework.h"
 
 using namespace Sapphire::Math;
 using namespace Sapphire::Entity;
@@ -31,9 +31,9 @@ using namespace Sapphire::Entity;
 
 uint32_t CalcBattle::calculateHealValue( PlayerPtr pPlayer, uint32_t potency, Sapphire::FrameworkPtr pFw )
 {
-  auto pExdData = pFw->get< Data::ExdDataGenerated >();
-  auto classInfo = pExdData->get< Sapphire::Data::ClassJob >( static_cast< uint8_t >( pPlayer->getClass() ) );
-  auto paramGrowthInfo = pExdData->get< Sapphire::Data::ParamGrow >( pPlayer->getLevel() );
+  auto& exdData = Common::Service< Data::ExdDataGenerated >::ref();
+  auto classInfo = exdData.get< Sapphire::Data::ClassJob >( static_cast< uint8_t >( pPlayer->getClass() ) );
+  auto paramGrowthInfo = exdData.get< Sapphire::Data::ParamGrow >( pPlayer->getLevel() );
 
   if( !classInfo || !paramGrowthInfo )
     return 0;
diff --git a/src/world/Math/CalcStats.cpp b/src/world/Math/CalcStats.cpp
index 7544fb9a..4601816f 100644
--- a/src/world/Math/CalcStats.cpp
+++ b/src/world/Math/CalcStats.cpp
@@ -3,6 +3,7 @@
 #include <Exd/ExdDataGenerated.h>
 #include <Common.h>
 #include <Logging/Logger.h>
+#include <Service.h>
 
 #include "Actor/Chara.h"
 #include "Actor/Player.h"
@@ -10,7 +11,6 @@
 #include "Inventory/Item.h"
 
 #include "CalcStats.h"
-#include "Framework.h"
 
 using namespace Sapphire::Math;
 using namespace Sapphire::Entity;
@@ -141,15 +141,15 @@ float CalcStats::calculateBaseStat( const Chara& chara )
 // Leggerless' HP Formula
 // ROUNDDOWN(JobModHP * (BaseHP / 100)) + ROUNDDOWN(VitHPMod / 100 * (VIT - BaseDET))
 
-uint32_t CalcStats::calculateMaxHp( PlayerPtr pPlayer, Sapphire::FrameworkPtr pFw )
+uint32_t CalcStats::calculateMaxHp( PlayerPtr pPlayer )
 {
-  auto pExdData = pFw->get< Data::ExdDataGenerated >();
+  auto& exdData = Common::Service< Data::ExdDataGenerated >::ref();
   // TODO: Replace ApproxBaseHP with something that can get us an accurate BaseHP.
   // Is there any way to pull reliable BaseHP without having to manually use a pet for every level, and using the values from a table?
   // More info here: https://docs.google.com/spreadsheets/d/1de06KGT0cNRUvyiXNmjNgcNvzBCCQku7jte5QxEQRbs/edit?usp=sharing
 
-  auto classInfo = pExdData->get< Sapphire::Data::ClassJob >( static_cast< uint8_t >( pPlayer->getClass() ) );
-  auto paramGrowthInfo = pExdData->get< Sapphire::Data::ParamGrow >( pPlayer->getLevel() );
+  auto classInfo = exdData.get< Sapphire::Data::ClassJob >( static_cast< uint8_t >( pPlayer->getClass() ) );
+  auto paramGrowthInfo = exdData.get< Sapphire::Data::ParamGrow >( pPlayer->getLevel() );
 
   if( !classInfo || !paramGrowthInfo )
     return 0;
diff --git a/src/world/Math/CalcStats.h b/src/world/Math/CalcStats.h
index ce095b53..e277299e 100644
--- a/src/world/Math/CalcStats.h
+++ b/src/world/Math/CalcStats.h
@@ -16,7 +16,7 @@ namespace Sapphire::Math
 
     static float calculateBaseStat( const Entity::Chara& chara );
 
-    static uint32_t calculateMaxHp( Sapphire::Entity::PlayerPtr pPlayer, FrameworkPtr pFw  );
+    static uint32_t calculateMaxHp( Sapphire::Entity::PlayerPtr pPlayer );
 
     /*!
      * @brief Calculates the probability of a block happening
diff --git a/src/world/Navi/NaviProvider.cpp b/src/world/Navi/NaviProvider.cpp
index 15569ba0..e118734b 100644
--- a/src/world/Navi/NaviProvider.cpp
+++ b/src/world/Navi/NaviProvider.cpp
@@ -1,5 +1,4 @@
 #include <Common.h>
-#include <Framework.h>
 #include <Territory/Territory.h>
 #include <Logging/Logger.h>
 #include <ServerMgr.h>
@@ -19,11 +18,10 @@
 #include <filesystem>
 #include <Service.h>
 
-Sapphire::World::Navi::NaviProvider::NaviProvider( const std::string& internalName, FrameworkPtr pFw ) :
+Sapphire::World::Navi::NaviProvider::NaviProvider( const std::string& internalName ) :
   m_naviMesh( nullptr ),
   m_naviMeshQuery( nullptr ),
-  m_internalName( internalName ),
-  m_pFw( pFw )
+  m_internalName( internalName )
 {
   // Set defaults
   m_polyFindRange[ 0 ] = 10;
@@ -299,8 +297,8 @@ Sapphire::Common::FFXIVARR_POSITION3
     return {};
   }
 
-  auto pRNGMgr = m_pFw->get< World::Manager::RNGMgr >();
-  auto rng = pRNGMgr->getRandGenerator< float >( 0.f, 1.f );
+  auto& RNGMgr = Common::Service< World::Manager::RNGMgr >::ref();
+  auto rng = RNGMgr.getRandGenerator< float >( 0.f, 1.f );
   status = m_naviMeshQuery->findRandomPointAroundCircle( startRef, spos, maxRadius, &filter, frand,
              &randomRef, randomPt );
 
diff --git a/src/world/Navi/NaviProvider.h b/src/world/Navi/NaviProvider.h
index 047abf17..33cd7cd6 100644
--- a/src/world/Navi/NaviProvider.h
+++ b/src/world/Navi/NaviProvider.h
@@ -32,7 +32,7 @@ namespace Sapphire::World::Navi
     };
 
   public:
-    explicit NaviProvider( const std::string& internalName, FrameworkPtr pFw );
+    explicit NaviProvider( const std::string& internalName );
 
     bool init();
     bool loadMesh( const std::string& path );
@@ -94,7 +94,6 @@ namespace Sapphire::World::Navi
 
 
 
-    FrameworkPtr m_pFw;
   };
 
 }
diff --git a/src/world/Network/GameConnection.cpp b/src/world/Network/GameConnection.cpp
index 68ca997a..b3ccb223 100644
--- a/src/world/Network/GameConnection.cpp
+++ b/src/world/Network/GameConnection.cpp
@@ -18,7 +18,6 @@
 #include "GameConnection.h"
 #include "ServerMgr.h"
 #include "Session.h"
-#include "Framework.h"
 #include "Forwards.h"
 
 using namespace Sapphire::Common;
@@ -26,9 +25,8 @@ using namespace Sapphire::Network::Packets;
 using namespace Sapphire::Network::Packets::Server;
 
 Sapphire::Network::GameConnection::GameConnection( Sapphire::Network::HivePtr pHive,
-                                                   Sapphire::Network::AcceptorPtr pAcceptor,
-                                                   FrameworkPtr pFw ) :
-  Connection( pHive, pFw ),
+                                                   Sapphire::Network::AcceptorPtr pAcceptor ) :
+  Connection( pHive ),
   m_pAcceptor( pAcceptor ),
   m_conType( ConnectionType::None )
 {
@@ -141,7 +139,7 @@ Sapphire::Network::GameConnection::~GameConnection() = default;
 // overwrite the parents onConnect for our game socket needs
 void Sapphire::Network::GameConnection::onAccept( const std::string& host, uint16_t port )
 {
-  GameConnectionPtr connection( new GameConnection( m_hive, m_pAcceptor, m_pFw ) );
+  GameConnectionPtr connection( new GameConnection( m_hive, m_pAcceptor ) );
   m_pAcceptor->accept( connection );
   Logger::info( "Connect from {0}", m_socket.remote_endpoint().address().to_string() );
 }
@@ -218,7 +216,7 @@ void Sapphire::Network::GameConnection::handleZonePacket( Sapphire::Network::Pac
     if( opcode != PingHandler && opcode != UpdatePositionHandler )
       Logger::debug( "[{0}] Handling World IPC : {1} ( {2:04X} )", m_pSession->getId(), name, opcode );
 
-    ( this->*( it->second ) )( m_pFw, pPacket, *m_pSession->getPlayer() );
+    ( this->*( it->second ) )( pPacket, *m_pSession->getPlayer() );
   }
   else
   {
@@ -242,7 +240,7 @@ void Sapphire::Network::GameConnection::handleChatPacket( Sapphire::Network::Pac
 
     Logger::debug( "[{0}] Handling Chat IPC : {1} ( {2:04X} )", m_pSession->getId(), name, opcode );
 
-    ( this->*( it->second ) )( m_pFw, pPacket, *m_pSession->getPlayer() );
+    ( this->*( it->second ) )( pPacket, *m_pSession->getPlayer() );
   }
   else
   {
diff --git a/src/world/Network/GameConnection.h b/src/world/Network/GameConnection.h
index 07962fd9..37a680e0 100644
--- a/src/world/Network/GameConnection.h
+++ b/src/world/Network/GameConnection.h
@@ -9,7 +9,7 @@
 
 #include "ForwardsZone.h"
 
-#define DECLARE_HANDLER( x ) void x( FrameworkPtr pFw, const Sapphire::Network::Packets::FFXIVARR_PACKET_RAW& inPacket, Entity::Player& player )
+#define DECLARE_HANDLER( x ) void x( const Sapphire::Network::Packets::FFXIVARR_PACKET_RAW& inPacket, Entity::Player& player )
 
 namespace Sapphire::Network::Packets
 {
@@ -32,8 +32,7 @@ namespace Sapphire::Network
   {
 
   private:
-    typedef void ( GameConnection::* Handler )( FrameworkPtr pFw,
-                                                const Network::Packets::FFXIVARR_PACKET_RAW& inPacket,
+    typedef void ( GameConnection::* Handler )( const Network::Packets::FFXIVARR_PACKET_RAW& inPacket,
                                                 Entity::Player& player );
 
     using HandlerMap = std::map< uint16_t, Handler >;
@@ -58,7 +57,7 @@ namespace Sapphire::Network
   public:
     ConnectionType m_conType;
 
-    GameConnection( HivePtr pHive, AcceptorPtr pAcceptor, FrameworkPtr pFw );
+    GameConnection( HivePtr pHive, AcceptorPtr pAcceptor );
 
     ~GameConnection();
 
diff --git a/src/world/Network/Handlers/ActionHandler.cpp b/src/world/Network/Handlers/ActionHandler.cpp
index 2b9f81dd..cbb412b0 100644
--- a/src/world/Network/Handlers/ActionHandler.cpp
+++ b/src/world/Network/Handlers/ActionHandler.cpp
@@ -5,17 +5,16 @@
 #include <Logging/Logger.h>
 
 #include <Actor/Player.h>
+#include <Service.h>
 
 #include "Network/GameConnection.h"
-#include "Framework.h"
 
 #include "Manager/ActionMgr.h"
 
 using namespace Sapphire::Common;
 using namespace Sapphire::Network::Packets;
 
-void Sapphire::Network::GameConnection::actionHandler( FrameworkPtr pFw,
-                                                       const Packets::FFXIVARR_PACKET_RAW& inPacket,
+void Sapphire::Network::GameConnection::actionHandler( const Packets::FFXIVARR_PACKET_RAW& inPacket,
                                                        Entity::Player& player )
 {
   const auto packet = ZoneChannelPacket< Client::FFXIVIpcSkillHandler >( inPacket );
@@ -29,10 +28,8 @@ void Sapphire::Network::GameConnection::actionHandler( FrameworkPtr pFw,
 
   player.sendDebug( "Skill type: {0}, sequence: {1}, actionId: {2}, targetId: {3}", type, sequence, actionId, targetId );
 
-  auto exdData = m_pFw->get< Data::ExdDataGenerated >();
-  assert( exdData );
-
-  auto actionMgr = pFw->get< World::Manager::ActionMgr >();
+  auto& exdData = Common::Service< Data::ExdDataGenerated >::ref();
+  auto& actionMgr = Common::Service< World::Manager::ActionMgr >::ref();
 
   switch( type )
   {
@@ -42,39 +39,39 @@ void Sapphire::Network::GameConnection::actionHandler( FrameworkPtr pFw,
     }
     case Common::SkillType::Normal:
     {
-      auto action = exdData->get< Data::Action >( actionId );
+      auto action = exdData.get< Data::Action >( actionId );
 
       // ignore invalid actions
       if( !action )
         return;
 
-      actionMgr->handleTargetedPlayerAction( player, actionId, action, targetId, sequence );
+      actionMgr.handleTargetedPlayerAction( player, actionId, action, targetId, sequence );
       break;
     }
 
     case Common::SkillType::ItemAction:
     {
-      auto item = exdData->get< Data::Item >( actionId );
+      auto item = exdData.get< Data::Item >( actionId );
       if( !item )
         return;
 
       if( item->itemAction == 0 )
         return;
 
-      auto itemAction = exdData->get< Data::ItemAction >( item->itemAction );
+      auto itemAction = exdData.get< Data::ItemAction >( item->itemAction );
       if( !itemAction )
         return;
 
-      actionMgr->handleItemAction( player, actionId, itemAction, itemSourceSlot, itemSourceContainer );
+      actionMgr.handleItemAction( player, actionId, itemAction, itemSourceSlot, itemSourceContainer );
 
       break;
     }
 
     case Common::SkillType::MountSkill:
     {
-      auto action = exdData->get< Data::Action >( 4 );
+      auto action = exdData.get< Data::Action >( 4 );
       assert( action );
-      actionMgr->handleMountAction( player, static_cast< uint16_t >( actionId ), action, targetId, sequence );
+      actionMgr.handleMountAction( player, static_cast< uint16_t >( actionId ), action, targetId, sequence );
       break;
     }
   }
@@ -83,8 +80,7 @@ void Sapphire::Network::GameConnection::actionHandler( FrameworkPtr pFw,
 
 }
 
-void Sapphire::Network::GameConnection::placedActionHandler( FrameworkPtr pFw,
-                                                             const Packets::FFXIVARR_PACKET_RAW& inPacket,
+void Sapphire::Network::GameConnection::placedActionHandler( const Packets::FFXIVARR_PACKET_RAW& inPacket,
                                                              Entity::Player& player )
 {
   const auto packet = ZoneChannelPacket< Client::FFXIVIpcAoESkillHandler >( inPacket );
@@ -104,15 +100,14 @@ void Sapphire::Network::GameConnection::placedActionHandler( FrameworkPtr pFw,
   player.sendDebug( "Skill type: {0}, sequence: {1}, actionId: {2}, x:{3}, y:{4}, z:{5}",
                     type, sequence, actionId, pos.x, pos.y, pos.z );
 
-  auto exdData = m_pFw->get< Data::ExdDataGenerated >();
-  assert( exdData );
+  auto& exdData = Common::Service< Data::ExdDataGenerated >::ref();
 
-  auto action = exdData->get< Data::Action >( actionId );
+  auto action = exdData.get< Data::Action >( actionId );
 
   // ignore invalid actions
   if( !action )
     return;
 
-  auto actionMgr = pFw->get< World::Manager::ActionMgr >();
-  actionMgr->handlePlacedPlayerAction( player, actionId, action, pos, sequence );
+  auto& actionMgr = Common::Service< World::Manager::ActionMgr >::ref();
+  actionMgr.handlePlacedPlayerAction( player, actionId, action, pos, sequence );
 }
diff --git a/src/world/Network/Handlers/CFHandlers.cpp b/src/world/Network/Handlers/CFHandlers.cpp
index 9f3660fb..6361d901 100644
--- a/src/world/Network/Handlers/CFHandlers.cpp
+++ b/src/world/Network/Handlers/CFHandlers.cpp
@@ -4,6 +4,7 @@
 #include <Logging/Logger.h>
 #include <Network/PacketContainer.h>
 #include <Exd/ExdDataGenerated.h>
+#include <Service.h>
 
 #include "Manager/TerritoryMgr.h"
 #include "Territory/InstanceContent.h"
@@ -12,7 +13,6 @@
 #include "Network/PacketWrappers/ServerNoticePacket.h"
 #include "Network/PacketWrappers/PlayerStateFlagsPacket.h"
 
-#include "Framework.h"
 #include "Session.h"
 
 using namespace Sapphire::Common;
@@ -21,8 +21,7 @@ using namespace Sapphire::Network::Packets::Server;
 using namespace Sapphire::World::Manager;
 
 
-void Sapphire::Network::GameConnection::cfDutyInfoRequest( FrameworkPtr pFw,
-                                                           const Packets::FFXIVARR_PACKET_RAW& inPacket,
+void Sapphire::Network::GameConnection::cfDutyInfoRequest( const Packets::FFXIVARR_PACKET_RAW& inPacket,
                                                            Entity::Player& player )
 {
   auto dutyInfoPacket = makeZonePacket< FFXIVIpcCFDutyInfo >( player.getId() );
@@ -40,13 +39,12 @@ void Sapphire::Network::GameConnection::cfDutyInfoRequest( FrameworkPtr pFw,
 
 }
 
-void Sapphire::Network::GameConnection::cfRegisterDuty( FrameworkPtr pFw,
-                                                        const Packets::FFXIVARR_PACKET_RAW& inPacket,
+void Sapphire::Network::GameConnection::cfRegisterDuty( const Packets::FFXIVARR_PACKET_RAW& inPacket,
                                                         Entity::Player& player )
 {
   Packets::FFXIVARR_PACKET_RAW copy = inPacket;
-  auto pTeriMgr = pFw->get< TerritoryMgr >();
-  auto pExdData = pFw->get< Data::ExdDataGenerated >();
+  auto& teriMgr = Common::Service< TerritoryMgr >::ref();
+  auto& exdData = Common::Service< Data::ExdDataGenerated >::ref();
 
   std::vector< uint16_t > selectedContent;
 
@@ -73,11 +71,11 @@ void Sapphire::Network::GameConnection::cfRegisterDuty( FrameworkPtr pFw,
   cfCancelPacket->data().state2 = 1; // Your registration is withdrawn.
   queueOutPacket( cfCancelPacket );
 
-  auto cfCondition = pExdData->get< Sapphire::Data::ContentFinderCondition >( contentId );
+  auto cfCondition = exdData.get< Sapphire::Data::ContentFinderCondition >( contentId );
   if( !cfCondition )
     return;
 
-  auto instance = pTeriMgr->createInstanceContent( cfCondition->content );
+  auto instance = teriMgr.createInstanceContent( cfCondition->content );
   if( !instance )
     return;
 
@@ -89,8 +87,7 @@ void Sapphire::Network::GameConnection::cfRegisterDuty( FrameworkPtr pFw,
   player.setInstance( instance );
 }
 
-void Sapphire::Network::GameConnection::cfRegisterRoulette( FrameworkPtr pFw,
-                                                            const Packets::FFXIVARR_PACKET_RAW& inPacket,
+void Sapphire::Network::GameConnection::cfRegisterRoulette( const Packets::FFXIVARR_PACKET_RAW& inPacket,
                                                             Entity::Player& player )
 {
   auto cfCancelPacket = makeZonePacket< FFXIVIpcCFNotify >( player.getId() );
@@ -101,8 +98,7 @@ void Sapphire::Network::GameConnection::cfRegisterRoulette( FrameworkPtr pFw,
   player.sendDebug( "Roulette register" );
 }
 
-void Sapphire::Network::GameConnection::cfDutyAccepted( FrameworkPtr pFw,
-                                                        const Packets::FFXIVARR_PACKET_RAW& inPacket,
+void Sapphire::Network::GameConnection::cfDutyAccepted( const Packets::FFXIVARR_PACKET_RAW& inPacket,
                                                         Entity::Player& player )
 {
   player.sendDebug( "TODO: Duty accept" );
diff --git a/src/world/Network/Handlers/ClientTriggerHandler.cpp b/src/world/Network/Handlers/ClientTriggerHandler.cpp
index 374a5bf3..7af8215e 100644
--- a/src/world/Network/Handlers/ClientTriggerHandler.cpp
+++ b/src/world/Network/Handlers/ClientTriggerHandler.cpp
@@ -32,8 +32,6 @@
 #include "Session.h"
 #include "ServerMgr.h"
 #include "Forwards.h"
-#include "Framework.h"
-#include <Network/PacketDef/Lobby/ServerLobbyDef.h>
 #include <Service.h>
 
 using namespace Sapphire::Common;
@@ -42,7 +40,7 @@ using namespace Sapphire::Network::Packets::Server;
 using namespace Sapphire::Network::ActorControl;
 using namespace Sapphire::World::Manager;
 
-void examineHandler( Sapphire::FrameworkPtr pFw, Sapphire::Entity::Player& player, uint32_t targetId )
+void examineHandler( Sapphire::Entity::Player& player, uint32_t targetId )
 {
   using namespace Sapphire;
 
@@ -65,8 +63,7 @@ void examineHandler( Sapphire::FrameworkPtr pFw, Sapphire::Entity::Player& playe
   }
 }
 
-void Sapphire::Network::GameConnection::clientTriggerHandler( FrameworkPtr pFw,
-                                                              const Packets::FFXIVARR_PACKET_RAW& inPacket,
+void Sapphire::Network::GameConnection::clientTriggerHandler( const Packets::FFXIVARR_PACKET_RAW& inPacket,
                                                               Entity::Player& player )
 {
 
@@ -148,7 +145,7 @@ void Sapphire::Network::GameConnection::clientTriggerHandler( FrameworkPtr pFw,
     case ClientTriggerType::Examine:
     {
       uint32_t targetId = param11;
-      examineHandler( pFw, player, targetId );
+      examineHandler( player, targetId );
       break;
     }
     case ClientTriggerType::MarkPlayer: // Mark player
@@ -193,8 +190,8 @@ void Sapphire::Network::GameConnection::clientTriggerHandler( FrameworkPtr pFw,
       uint32_t emoteId = param11;
       bool isSilent = param2 == 1;
 
-      auto pExdData = pFw->get< Data::ExdDataGenerated >();
-      auto emoteData = pExdData->get< Data::Emote >( emoteId );
+      auto exdData = Common::Service< Data::ExdDataGenerated >::ref();
+      auto emoteData = exdData.get< Data::Emote >( emoteId );
 
       if( !emoteData )
         return;
@@ -329,70 +326,63 @@ void Sapphire::Network::GameConnection::clientTriggerHandler( FrameworkPtr pFw,
     }
     case ClientTriggerType::RequestLandSignFree:
     {
-      auto pHousingMgr = pFw->get< HousingMgr >();
+      auto& housingMgr = Common::Service< HousingMgr >::ref();
 
-      auto ident = pHousingMgr->clientTriggerParamsToLandIdent( param11, param12 );
-      pHousingMgr->sendLandSignFree( player, ident );
+      auto ident = housingMgr.clientTriggerParamsToLandIdent( param11, param12 );
+      housingMgr.sendLandSignFree( player, ident );
 
       break;
     }
     case ClientTriggerType::RequestLandSignOwned:
     {
-      auto pHousingMgr = pFw->get< HousingMgr >();
+      auto& housingMgr = Common::Service< HousingMgr >::ref();
 
-      auto ident = pHousingMgr->clientTriggerParamsToLandIdent( param11, param12, false );
-      pHousingMgr->sendLandSignOwned( player, ident );
+      auto ident = housingMgr.clientTriggerParamsToLandIdent( param11, param12, false );
+      housingMgr.sendLandSignOwned( player, ident );
 
       break;
     }
     case ClientTriggerType::RequestWardLandInfo:
     {
-      auto pHousingMgr = pFw->get< HousingMgr >();
-      if( !pHousingMgr )
-        break;
+      auto& housingMgr = Common::Service< HousingMgr >::ref();
 
-      pHousingMgr->sendWardLandInfo( player, static_cast< uint8_t >( param12 ), static_cast< uint8_t >( param11 ) );
+      housingMgr.sendWardLandInfo( player, static_cast< uint8_t >( param12 ), static_cast< uint8_t >( param11 ) );
 
       break;
     }
     case ClientTriggerType::RequestLandRelinquish:
     {
+      auto& housingMgr = Common::Service< HousingMgr >::ref();
+
       auto plot = static_cast< uint8_t >( param12 & 0xFF );
-      auto pHousingMgr = pFw->get< HousingMgr >();
-      pHousingMgr->relinquishLand( player, plot );
+      housingMgr.relinquishLand( player, plot );
 
       break;
     }
     case ClientTriggerType::RequestEstateRename:
     {
-      auto pHousingMgr = pFw->get< HousingMgr >();
-      if( !pHousingMgr )
-        break;
+      auto& housingMgr = Common::Service< HousingMgr >::ref();
 
-      auto ident = pHousingMgr->clientTriggerParamsToLandIdent( param11, param12 );
-      pHousingMgr->requestEstateRename( player, ident );
+      auto ident = housingMgr.clientTriggerParamsToLandIdent( param11, param12 );
+      housingMgr.requestEstateRename( player, ident );
 
       break;
     }
     case ClientTriggerType::RequestEstateEditGreeting:
     {
-      auto pHousingMgr = pFw->get< HousingMgr >();
-      if( !pHousingMgr )
-        break;
+      auto& housingMgr = Common::Service< HousingMgr >::ref();
 
-      auto ident = pHousingMgr->clientTriggerParamsToLandIdent( param11, param12 );
-      pHousingMgr->requestEstateEditGreeting( player, ident );
+      auto ident = housingMgr.clientTriggerParamsToLandIdent( param11, param12 );
+      housingMgr.requestEstateEditGreeting( player, ident );
 
       break;
     }
     case ClientTriggerType::RequestEstateEditGuestAccessSettings:
     {
-      auto pHousingMgr = pFw->get< HousingMgr >();
-      if( !pHousingMgr )
-        break;
+      auto& housingMgr = Common::Service< HousingMgr >::ref();
 
-      auto ident = pHousingMgr->clientTriggerParamsToLandIdent( param11, param12 );
-      pHousingMgr->requestEstateEditGuestAccess( player, ident );
+      auto ident = housingMgr.clientTriggerParamsToLandIdent( param11, param12 );
+      housingMgr.requestEstateEditGuestAccess( player, ident );
 
       break;
     }
@@ -416,12 +406,10 @@ void Sapphire::Network::GameConnection::clientTriggerHandler( FrameworkPtr pFw,
     }
     case ClientTriggerType::RequestEstateGreeting:
     {
-      auto housingMgr = pFw->get< HousingMgr >();
-      if( !housingMgr )
-        break;
+      auto& housingMgr = Common::Service< HousingMgr >::ref();
 
-      auto ident = housingMgr->clientTriggerParamsToLandIdent( param11, param12 );
-      housingMgr->sendEstateGreeting( player, ident );
+      auto ident = housingMgr.clientTriggerParamsToLandIdent( param11, param12 );
+      housingMgr.sendEstateGreeting( player, ident );
 
       break;
     }
@@ -429,59 +417,55 @@ void Sapphire::Network::GameConnection::clientTriggerHandler( FrameworkPtr pFw,
     {
       uint8_t plot = ( param12 & 0xFF );
 
-      auto housingMgr = pFw->get< HousingMgr >();
-      if( !housingMgr )
-        break;
+      auto& housingMgr = Common::Service< HousingMgr >::ref();
 
       uint16_t inventoryType = Common::InventoryType::HousingExteriorPlacedItems;
       if( param2 == 1 )
         inventoryType = Common::InventoryType::HousingExteriorStoreroom;
 
-      housingMgr->sendEstateInventory( player, inventoryType, plot );
+      housingMgr.sendEstateInventory( player, inventoryType, plot );
 
       break;
     }
     case ClientTriggerType::RequestEstateInventory:
     {
-      auto housingMgr = pFw->get< HousingMgr >();
-      if( !housingMgr )
-        break;
+      auto& housingMgr = Common::Service< HousingMgr >::ref();
 
       // param1 = 1 - storeroom
       // param1 = 0 - placed items
 
       if( param1 == 1 )
-        housingMgr->sendInternalEstateInventoryBatch( player, true );
+        housingMgr.sendInternalEstateInventoryBatch( player, true );
       else
-        housingMgr->sendInternalEstateInventoryBatch( player );
+        housingMgr.sendInternalEstateInventoryBatch( player );
 
       break;
     }
     case ClientTriggerType::RequestHousingItemRemove:
     {
-      auto housingMgr = m_pFw->get< HousingMgr >();
+      auto& housingMgr = Common::Service< HousingMgr >::ref();
 
       auto slot = param4 & 0xFF;
       auto sendToStoreroom = ( param4 >> 16 ) != 0;
 
       //player, plot, containerId, slot, sendToStoreroom
-      housingMgr->reqRemoveHousingItem( player, static_cast< uint16_t >( param12 ), static_cast< uint16_t >( param2 ), static_cast< uint8_t >( slot ), sendToStoreroom );
+      housingMgr.reqRemoveHousingItem( player, static_cast< uint16_t >( param12 ), static_cast< uint16_t >( param2 ), static_cast< uint8_t >( slot ), sendToStoreroom );
 
       break;
     }
     case ClientTriggerType::RequestEstateExteriorRemodel:
     {
-      auto housingMgr = m_pFw->get< HousingMgr >();
+      auto& housingMgr = Common::Service< HousingMgr >::ref();
 
-      housingMgr->reqEstateExteriorRemodel( player, static_cast< uint16_t >( param11 ) );
+      housingMgr.reqEstateExteriorRemodel( player, static_cast< uint16_t >( param11 ) );
 
       break;
     }
     case ClientTriggerType::RequestEstateInteriorRemodel:
     {
-      auto housingMgr = m_pFw->get< HousingMgr >();
+      auto& housingMgr = Common::Service< HousingMgr >::ref();
 
-      housingMgr->reqEstateInteriorRemodel( player );
+      housingMgr.reqEstateInteriorRemodel( player );
 
       break;
     }
diff --git a/src/world/Network/Handlers/EventHandlers.cpp b/src/world/Network/Handlers/EventHandlers.cpp
index 5c60ed7f..33fe1641 100644
--- a/src/world/Network/Handlers/EventHandlers.cpp
+++ b/src/world/Network/Handlers/EventHandlers.cpp
@@ -16,6 +16,7 @@
 #include "Script/ScriptMgr.h"
 
 #include <Util/Util.h>
+#include <Service.h>
 
 #include "Event/EventHandler.h"
 #include "Manager/EventMgr.h"
@@ -25,19 +26,16 @@
 
 #include "Session.h"
 
-#include "Framework.h"
-
 using namespace Sapphire::Common;
 using namespace Sapphire::Network::Packets;
 using namespace Sapphire::Network::Packets::Server;
 
-void Sapphire::Network::GameConnection::eventHandlerTalk( FrameworkPtr pFw,
-                                                          const Packets::FFXIVARR_PACKET_RAW& inPacket,
+void Sapphire::Network::GameConnection::eventHandlerTalk( const Packets::FFXIVARR_PACKET_RAW& inPacket,
                                                           Entity::Player& player )
 {
-  auto pScriptMgr = pFw->get< Scripting::ScriptMgr >();
-  auto pExdData = pFw->get< Data::ExdDataGenerated >();
-  auto pEventMgr = pFw->get< World::Manager::EventMgr >();
+  auto& scriptMgr = Common::Service< Scripting::ScriptMgr >::ref();
+  auto& exdData = Common::Service< Data::ExdDataGenerated >::ref();
+  auto& eventMgr = Common::Service< World::Manager::EventMgr >::ref();
 
   const auto packet = ZoneChannelPacket< Client::FFXIVIpcEventHandlerTalk >( inPacket );
 
@@ -47,10 +45,10 @@ void Sapphire::Network::GameConnection::eventHandlerTalk( FrameworkPtr pFw,
   auto eventType = static_cast< uint16_t >( eventId >> 16 );
 
   std::string eventName = "onTalk";
-  std::string objName = pEventMgr->getEventName( eventId );
+  std::string objName = eventMgr.getEventName( eventId );
 
   player.sendDebug( "Chara: {0} -> {1} \neventId: {2} ({3:08X})",
-                    actorId, pEventMgr->mapEventActorToRealActor( static_cast< uint32_t >( actorId ) ),
+                    actorId, eventMgr.mapEventActorToRealActor( static_cast< uint32_t >( actorId ) ),
                     eventId, eventId );
 
 
@@ -61,10 +59,10 @@ void Sapphire::Network::GameConnection::eventHandlerTalk( FrameworkPtr pFw,
   {
     instance->onTalk( player, eventId, actorId );
   }
-  else if( !pScriptMgr->onTalk( player, actorId, eventId ) &&
+  else if( !scriptMgr.onTalk( player, actorId, eventId ) &&
            eventType == Event::EventHandler::EventHandlerType::Quest )
   {
-    auto questInfo = pExdData->get< Sapphire::Data::Quest >( eventId );
+    auto questInfo = exdData.get< Sapphire::Data::Quest >( eventId );
     if( questInfo )
       player.sendUrgent( "Quest not implemented: {0} ({1})", questInfo->name, questInfo->id );
   }
@@ -73,13 +71,12 @@ void Sapphire::Network::GameConnection::eventHandlerTalk( FrameworkPtr pFw,
 
 }
 
-void Sapphire::Network::GameConnection::eventHandlerEmote( FrameworkPtr pFw,
-                                                           const Packets::FFXIVARR_PACKET_RAW& inPacket,
+void Sapphire::Network::GameConnection::eventHandlerEmote( const Packets::FFXIVARR_PACKET_RAW& inPacket,
                                                            Entity::Player& player )
 {
-  auto pScriptMgr = pFw->get< Scripting::ScriptMgr >();
-  auto pExdData = pFw->get< Data::ExdDataGenerated >();
-  auto pEventMgr = pFw->get< World::Manager::EventMgr >();
+  auto& scriptMgr = Common::Service< Scripting::ScriptMgr >::ref();
+  auto& exdData = Common::Service< Data::ExdDataGenerated >::ref();
+  auto& eventMgr = Common::Service< World::Manager::EventMgr >::ref();
 
   const auto packet = ZoneChannelPacket< Client::FFXIVIpcEventHandlerEmote >( inPacket );
 
@@ -89,20 +86,20 @@ void Sapphire::Network::GameConnection::eventHandlerEmote( FrameworkPtr pFw,
   const auto eventType = static_cast< uint16_t >( eventId >> 16 );
 
   std::string eventName = "onEmote";
-  std::string objName = pEventMgr->getEventName( eventId );
+  std::string objName = eventMgr.getEventName( eventId );
 
   player.sendDebug( "Chara: {0} -> {1} \neventId: {2} ({3:08X})",
-                    actorId, pEventMgr->mapEventActorToRealActor( static_cast< uint32_t >( actorId ) ),
+                    actorId, eventMgr.mapEventActorToRealActor( static_cast< uint32_t >( actorId ) ),
                     eventId, eventId );
 
   player.sendDebug( "Calling: {0}.{1}", objName, eventName );
 
   player.eventStart( actorId, eventId, Event::EventHandler::Emote, 0, emoteId );
 
-  if( !pScriptMgr->onEmote( player, actorId, eventId, static_cast< uint8_t >( emoteId ) ) &&
+  if( !scriptMgr.onEmote( player, actorId, eventId, static_cast< uint8_t >( emoteId ) ) &&
       eventType == Event::EventHandler::EventHandlerType::Quest )
   {
-    auto questInfo = pExdData->get< Sapphire::Data::Quest >( eventId );
+    auto questInfo = exdData.get< Sapphire::Data::Quest >( eventId );
     if( questInfo )
       player.sendUrgent( "Quest not implemented: {0}", questInfo->name );
   }
@@ -110,12 +107,11 @@ void Sapphire::Network::GameConnection::eventHandlerEmote( FrameworkPtr pFw,
   player.checkEvent( eventId );
 }
 
-void Sapphire::Network::GameConnection::eventHandlerWithinRange( FrameworkPtr pFw,
-                                                                 const Packets::FFXIVARR_PACKET_RAW& inPacket,
+void Sapphire::Network::GameConnection::eventHandlerWithinRange( const Packets::FFXIVARR_PACKET_RAW& inPacket,
                                                                  Entity::Player& player )
 {
-  auto pScriptMgr = pFw->get< Scripting::ScriptMgr >();
-  auto pEventMgr = pFw->get< World::Manager::EventMgr >();
+  auto& scriptMgr = Common::Service< Scripting::ScriptMgr >::ref();
+  auto& eventMgr = Common::Service< World::Manager::EventMgr >::ref();
 
   const auto packet = ZoneChannelPacket< Client::FFXIVIpcEventHandlerWithinRange >( inPacket );
 
@@ -124,22 +120,21 @@ void Sapphire::Network::GameConnection::eventHandlerWithinRange( FrameworkPtr pF
   const auto& pos = packet.data().position;
 
   std::string eventName = "onWithinRange";
-  std::string objName = pEventMgr->getEventName( eventId );
+  std::string objName = eventMgr.getEventName( eventId );
   player.sendDebug( "Calling: {0}.{1} - {2} p1: {3}", objName, eventName, eventId, param1 );
 
   player.eventStart( player.getId(), eventId, Event::EventHandler::WithinRange, 1, param1 );
 
-  pScriptMgr->onWithinRange( player, eventId, param1, pos.x, pos.y, pos.z );
+  scriptMgr.onWithinRange( player, eventId, param1, pos.x, pos.y, pos.z );
 
   player.checkEvent( eventId );
 }
 
-void Sapphire::Network::GameConnection::eventHandlerOutsideRange( FrameworkPtr pFw,
-                                                                  const Packets::FFXIVARR_PACKET_RAW& inPacket,
+void Sapphire::Network::GameConnection::eventHandlerOutsideRange( const Packets::FFXIVARR_PACKET_RAW& inPacket,
                                                                   Entity::Player& player )
 {
-  auto pScriptMgr = pFw->get< Scripting::ScriptMgr >();
-  auto pEventMgr = pFw->get< World::Manager::EventMgr >();
+  auto& scriptMgr = Common::Service< Scripting::ScriptMgr >::ref();
+  auto& eventMgr = Common::Service< World::Manager::EventMgr >::ref();
 
   const auto packet = ZoneChannelPacket< Client::FFXIVIpcEventHandlerOutsideRange >( inPacket );
   const auto eventId = packet.data().eventId;
@@ -147,22 +142,21 @@ void Sapphire::Network::GameConnection::eventHandlerOutsideRange( FrameworkPtr p
   const auto& pos = packet.data().position;
 
   std::string eventName = "onOutsideRange";
-  std::string objName = pEventMgr->getEventName( eventId );
+  std::string objName = eventMgr.getEventName( eventId );
   player.sendDebug( "Calling: {0}.{1} - {2} p1: {3}", objName, eventName, eventId, param1 );
 
   player.eventStart( player.getId(), eventId, Event::EventHandler::WithinRange, 1, param1 );
 
-  pScriptMgr->onOutsideRange( player, eventId, param1, pos.x, pos.y, pos.z );
+  scriptMgr.onOutsideRange( player, eventId, param1, pos.x, pos.y, pos.z );
 
   player.checkEvent( eventId );
 }
 
-void Sapphire::Network::GameConnection::eventHandlerEnterTerritory( FrameworkPtr pFw,
-                                                                    const Packets::FFXIVARR_PACKET_RAW& inPacket,
+void Sapphire::Network::GameConnection::eventHandlerEnterTerritory( const Packets::FFXIVARR_PACKET_RAW& inPacket,
                                                                     Entity::Player& player )
 {
-  auto pScriptMgr = pFw->get< Scripting::ScriptMgr >();
-  auto pEventMgr = pFw->get< World::Manager::EventMgr >();
+  auto& scriptMgr = Common::Service< Scripting::ScriptMgr >::ref();
+  auto& eventMgr = Common::Service< World::Manager::EventMgr >::ref();
 
   const auto packet = ZoneChannelPacket< Client::FFXIVIpcEnterTerritoryHandler >( inPacket );
 
@@ -172,7 +166,7 @@ void Sapphire::Network::GameConnection::eventHandlerEnterTerritory( FrameworkPtr
 
   std::string eventName = "onEnterTerritory";
 
-  std::string objName = pEventMgr->getEventName( eventId );
+  std::string objName = eventMgr.getEventName( eventId );
 
   player.sendDebug( "Calling: {0}.{1} - {2}", objName, eventName, eventId & 0xFFFF );
 
@@ -189,17 +183,16 @@ void Sapphire::Network::GameConnection::eventHandlerEnterTerritory( FrameworkPtr
   else
   {
     player.eventStart( player.getId(), eventId, Event::EventHandler::EnterTerritory, 0, player.getZoneId() );
-    pScriptMgr->onEnterTerritory( player, eventId, param1, param2 );
+    scriptMgr.onEnterTerritory( player, eventId, param1, param2 );
   }
 
   player.checkEvent( eventId );
 }
 
-void Sapphire::Network::GameConnection::eventHandlerReturn( FrameworkPtr pFw,
-                                                            const Packets::FFXIVARR_PACKET_RAW& inPacket,
+void Sapphire::Network::GameConnection::eventHandlerReturn( const Packets::FFXIVARR_PACKET_RAW& inPacket,
                                                             Entity::Player& player )
 {
-  auto pEventMgr = pFw->get< World::Manager::EventMgr >();
+  auto& eventMgr = Common::Service< World::Manager::EventMgr >::ref();
 
   const auto packet = ZoneChannelPacket< Client::FFXIVIpcEventHandlerReturn >( inPacket );
   const auto eventId = packet.data().eventId;
@@ -209,7 +202,7 @@ void Sapphire::Network::GameConnection::eventHandlerReturn( FrameworkPtr pFw,
   const auto param3 = packet.data().param3;
   const auto param4 = packet.data().param4;
 
-  std::string eventName = pEventMgr->getEventName( eventId );
+  std::string eventName = eventMgr.getEventName( eventId );
 
   player.sendDebug( "eventId: {0} ({0:08X}) scene: {1}, p1: {2}, p2: {3}, p3: {4}",
                     eventId, scene, param1, param2, param3 );
@@ -242,8 +235,7 @@ void Sapphire::Network::GameConnection::eventHandlerReturn( FrameworkPtr pFw,
 
 }
 
-void Sapphire::Network::GameConnection::eventHandlerLinkshell( FrameworkPtr pFw,
-                                                               const Packets::FFXIVARR_PACKET_RAW& inPacket,
+void Sapphire::Network::GameConnection::eventHandlerLinkshell( const Packets::FFXIVARR_PACKET_RAW& inPacket,
                                                                Entity::Player& player )
 {
   const auto packet = ZoneChannelPacket< Client::FFXIVIpcLinkshellEventHandler >( inPacket );
@@ -257,30 +249,28 @@ void Sapphire::Network::GameConnection::eventHandlerLinkshell( FrameworkPtr pFw,
 
 }
 
-void Sapphire::Network::GameConnection::eventHandlerShop( FrameworkPtr pFw,
-                                                          const Packets::FFXIVARR_PACKET_RAW& inPacket,
+void Sapphire::Network::GameConnection::eventHandlerShop( const Packets::FFXIVARR_PACKET_RAW& inPacket,
                                                           Entity::Player& player )
 {
-  auto pEventMgr = pFw->get< World::Manager::EventMgr >();
+  auto& eventMgr = Common::Service< World::Manager::EventMgr >::ref();
+  auto& scriptMgr = Common::Service< Scripting::ScriptMgr >::ref();
 
   const auto packet = ZoneChannelPacket< Client::FFXIVIpcShopEventHandler >( inPacket );
 
-  auto pScriptMgr = pFw->get< Scripting::ScriptMgr >();
-  auto pExdData = pFw->get< Data::ExdDataGenerated >();
 
   const auto eventId = packet.data().eventId;
 
   auto eventType = static_cast< uint16_t >( eventId >> 16 );
 
   std::string eventName = "onOpen";
-  std::string objName = pEventMgr->getEventName( eventId );
+  std::string objName = eventMgr.getEventName( eventId );
 
   player.sendDebug( "EventId: {0} ({0:08X})", eventId );
 
   player.sendDebug( "Calling: {0}.{1}", objName, eventName );
   player.eventStart( player.getId(), eventId, Event::EventHandler::UI, 0, packet.data().param );
 
-  pScriptMgr->onTalk( player, player.getId(), eventId );
+  scriptMgr.onTalk( player, player.getId(), eventId );
 }
 
 
diff --git a/src/world/Network/Handlers/GMCommandHandlers.cpp b/src/world/Network/Handlers/GMCommandHandlers.cpp
index d01e3a0e..175c2ab9 100644
--- a/src/world/Network/Handlers/GMCommandHandlers.cpp
+++ b/src/world/Network/Handlers/GMCommandHandlers.cpp
@@ -31,7 +31,6 @@
 #include "Network/PacketWrappers/PlayerStateFlagsPacket.h"
 
 #include "ServerMgr.h"
-#include "Framework.h"
 
 using namespace Sapphire::Common;
 using namespace Sapphire::Network::Packets;
@@ -87,8 +86,7 @@ enum GmCommand
   JumpNpc = 0x025F,
 };
 
-void Sapphire::Network::GameConnection::gm1Handler( FrameworkPtr pFw,
-                                                    const Packets::FFXIVARR_PACKET_RAW& inPacket,
+void Sapphire::Network::GameConnection::gm1Handler( const Packets::FFXIVARR_PACKET_RAW& inPacket,
                                                     Entity::Player& player )
 {
   if( player.getGmRank() <= 0 )
@@ -465,8 +463,8 @@ void Sapphire::Network::GameConnection::gm1Handler( FrameworkPtr pFw,
     }
     case GmCommand::Teri:
     {
-      auto pTeriMgr = pFw->get< TerritoryMgr >();
-      if( auto instance = pTeriMgr->getTerritoryByGuId( param1 ) )
+      auto& teriMgr = Common::Service< TerritoryMgr >::ref();
+      if( auto instance = teriMgr.getTerritoryByGuId( param1 ) )
       {
         player.sendDebug( "Found instance: {0}, id#{1}", instance->getName(), param1 );
 
@@ -483,20 +481,20 @@ void Sapphire::Network::GameConnection::gm1Handler( FrameworkPtr pFw,
 
         player.setInstance( instance );
       }
-      else if( !pTeriMgr->isValidTerritory( param1 ) )
+      else if( !teriMgr.isValidTerritory( param1 ) )
       {
         player.sendUrgent( "Invalid zone {0}", param1 );
       }
       else
       {
-        auto pZone = pTeriMgr->getZoneByTerritoryTypeId( param1 );
+        auto pZone = teriMgr.getZoneByTerritoryTypeId( param1 );
         if( !pZone )
         {
           player.sendUrgent( "No zone instance found for {0}", param1 );
           break;
         }
 
-        if( !pTeriMgr->isDefaultTerritory( param1 ) )
+        if( !teriMgr.isDefaultTerritory( param1 ) )
         {
           player.sendUrgent( "{0} is an instanced area - instance ID required to zone in.", pZone->getName() );
           break;
@@ -505,12 +503,12 @@ void Sapphire::Network::GameConnection::gm1Handler( FrameworkPtr pFw,
         bool doTeleport = false;
         uint16_t teleport;
 
-        auto pExdData = pFw->get< Data::ExdDataGenerated >();
-        auto idList = pExdData->getAetheryteIdList();
+        auto& exdData = Common::Service< Data::ExdDataGenerated >::ref();
+        auto idList = exdData.getAetheryteIdList();
 
         for( auto i : idList )
         {
-          auto data = pExdData->get< Sapphire::Data::Aetheryte >( i );
+          auto data = exdData.get< Sapphire::Data::Aetheryte >( i );
 
           if( !data )
           {
@@ -588,8 +586,7 @@ void Sapphire::Network::GameConnection::gm1Handler( FrameworkPtr pFw,
 
 }
 
-void Sapphire::Network::GameConnection::gm2Handler( FrameworkPtr pFw,
-                                                    const Packets::FFXIVARR_PACKET_RAW& inPacket,
+void Sapphire::Network::GameConnection::gm2Handler( const Packets::FFXIVARR_PACKET_RAW& inPacket,
                                                     Entity::Player& player )
 {
   if( player.getGmRank() <= 0 )
diff --git a/src/world/Network/Handlers/InventoryHandler.cpp b/src/world/Network/Handlers/InventoryHandler.cpp
index 8fc94bdd..cbc7be02 100644
--- a/src/world/Network/Handlers/InventoryHandler.cpp
+++ b/src/world/Network/Handlers/InventoryHandler.cpp
@@ -17,14 +17,11 @@
 #include "Session.h"
 #include "ServerMgr.h"
 
-#include "Framework.h"
-
 using namespace Sapphire::Common;
 using namespace Sapphire::Network::Packets;
 using namespace Sapphire::Network::Packets::Server;
 
-void Sapphire::Network::GameConnection::inventoryModifyHandler( FrameworkPtr pFw,
-                                                                const Packets::FFXIVARR_PACKET_RAW& inPacket,
+void Sapphire::Network::GameConnection::inventoryModifyHandler( const Packets::FFXIVARR_PACKET_RAW& inPacket,
                                                                 Entity::Player& player )
 {
   const auto packet = ZoneChannelPacket< Client::FFXIVIpcInventoryModifyHandler >( inPacket );
diff --git a/src/world/Network/Handlers/PacketHandlers.cpp b/src/world/Network/Handlers/PacketHandlers.cpp
index c2373960..9346eb21 100644
--- a/src/world/Network/Handlers/PacketHandlers.cpp
+++ b/src/world/Network/Handlers/PacketHandlers.cpp
@@ -50,7 +50,6 @@
 #include "Session.h"
 #include "ServerMgr.h"
 #include "Forwards.h"
-#include "Framework.h"
 
 using namespace Sapphire::Common;
 using namespace Sapphire::Network::Packets;
@@ -58,8 +57,7 @@ using namespace Sapphire::Network::Packets::Server;
 using namespace Sapphire::Network::ActorControl;
 using namespace Sapphire::World::Manager;
 
-void Sapphire::Network::GameConnection::fcInfoReqHandler( FrameworkPtr pFw,
-                                                          const Sapphire::Network::Packets::FFXIVARR_PACKET_RAW& inPacket,
+void Sapphire::Network::GameConnection::fcInfoReqHandler( const Sapphire::Network::Packets::FFXIVARR_PACKET_RAW& inPacket,
                                                           Entity::Player& player )
 {
   // TODO: use new packet struct for this
@@ -68,8 +66,7 @@ void Sapphire::Network::GameConnection::fcInfoReqHandler( FrameworkPtr pFw,
   //queueOutPacket( pPe );
 }
 
-void Sapphire::Network::GameConnection::setSearchInfoHandler( FrameworkPtr pFw,
-                                                              const Packets::FFXIVARR_PACKET_RAW& inPacket,
+void Sapphire::Network::GameConnection::setSearchInfoHandler( const Packets::FFXIVARR_PACKET_RAW& inPacket,
                                                               Entity::Player& player )
 {
   const auto packet = ZoneChannelPacket< Client::FFXIVIpcSetSearchInfo >( inPacket );
@@ -104,8 +101,7 @@ void Sapphire::Network::GameConnection::setSearchInfoHandler( FrameworkPtr pFw,
                                              static_cast< uint8_t >( player.getOnlineStatus() ) ), true );
 }
 
-void Sapphire::Network::GameConnection::reqSearchInfoHandler( FrameworkPtr pFw,
-                                                              const Packets::FFXIVARR_PACKET_RAW& inPacket,
+void Sapphire::Network::GameConnection::reqSearchInfoHandler( const Packets::FFXIVARR_PACKET_RAW& inPacket,
                                                               Entity::Player& player )
 {
   auto searchInfoPacket = makeZonePacket< FFXIVIpcInitSearchInfo >( player.getId() );
@@ -115,8 +111,7 @@ void Sapphire::Network::GameConnection::reqSearchInfoHandler( FrameworkPtr pFw,
   queueOutPacket( searchInfoPacket );
 }
 
-void Sapphire::Network::GameConnection::reqExamineSearchCommentHandler( FrameworkPtr pFw,
-                                                                        const Packets::FFXIVARR_PACKET_RAW& inPacket,
+void Sapphire::Network::GameConnection::reqExamineSearchCommentHandler( const Packets::FFXIVARR_PACKET_RAW& inPacket,
                                                                         Entity::Player& player )
 {
 
@@ -144,8 +139,7 @@ void Sapphire::Network::GameConnection::reqExamineSearchCommentHandler( Framewor
   }
 }
 
-void Sapphire::Network::GameConnection::reqExamineFcInfo( FrameworkPtr pFw,
-                                                          const Packets::FFXIVARR_PACKET_RAW& inPacket,
+void Sapphire::Network::GameConnection::reqExamineFcInfo( const Packets::FFXIVARR_PACKET_RAW& inPacket,
                                                           Entity::Player& player )
 {
 
@@ -175,16 +169,14 @@ void Sapphire::Network::GameConnection::reqExamineFcInfo( FrameworkPtr pFw,
   }
 }
 
-void Sapphire::Network::GameConnection::linkshellListHandler( FrameworkPtr pFw,
-                                                              const Packets::FFXIVARR_PACKET_RAW& inPacket,
+void Sapphire::Network::GameConnection::linkshellListHandler( const Packets::FFXIVARR_PACKET_RAW& inPacket,
                                                               Entity::Player& player )
 {
   auto linkshellListPacket = makeZonePacket< FFXIVIpcLinkshellList >( player.getId() );
   queueOutPacket( linkshellListPacket );
 }
 
-void Sapphire::Network::GameConnection::updatePositionHandler( FrameworkPtr pFw,
-                                                               const Packets::FFXIVARR_PACKET_RAW& inPacket,
+void Sapphire::Network::GameConnection::updatePositionHandler( const Packets::FFXIVARR_PACKET_RAW& inPacket,
                                                                Entity::Player& player )
 {
   // if the player is marked for zoning we no longer want to update his pos
@@ -269,8 +261,7 @@ void Sapphire::Network::GameConnection::updatePositionHandler( FrameworkPtr pFw,
 }
 
 void
-Sapphire::Network::GameConnection::reqEquipDisplayFlagsHandler( FrameworkPtr pFw,
-                                                                const Packets::FFXIVARR_PACKET_RAW& inPacket,
+Sapphire::Network::GameConnection::reqEquipDisplayFlagsHandler( const Packets::FFXIVARR_PACKET_RAW& inPacket,
                                                                 Entity::Player& player )
 {
   player.setEquipDisplayFlags( inPacket.data[ 0x10 ] );
@@ -278,19 +269,18 @@ Sapphire::Network::GameConnection::reqEquipDisplayFlagsHandler( FrameworkPtr pFw
   player.sendDebug( "EquipDisplayFlag CHANGE: {0}", player.getEquipDisplayFlags() );
 }
 
-void Sapphire::Network::GameConnection::zoneLineHandler( FrameworkPtr pFw,
-                                                         const Packets::FFXIVARR_PACKET_RAW& inPacket,
+void Sapphire::Network::GameConnection::zoneLineHandler( const Packets::FFXIVARR_PACKET_RAW& inPacket,
                                                          Entity::Player& player )
 {
 
   const auto packet = ZoneChannelPacket< Client::FFXIVIpcZoneLineHandler >( inPacket );
   const auto zoneLineId = packet.data().zoneLineId;
 
-  auto pTeriMgr = pFw->get< TerritoryMgr >();
-  auto pInstanceObjectCache = pFw->get< InstanceObjectCache >();
+  auto& teriMgr = Common::Service< TerritoryMgr >::ref();
+  auto& instanceObjectCache = Common::Service< InstanceObjectCache >::ref();
   auto tInfo = player.getCurrentTerritory()->getTerritoryTypeInfo();
 
-  auto pExitRange = pInstanceObjectCache->getExitRange( player.getTerritoryTypeId(), zoneLineId );
+  auto pExitRange = instanceObjectCache.getExitRange( player.getTerritoryTypeId(), zoneLineId );
 
   Common::FFXIVARR_POSITION3 targetPos{};
   uint32_t targetZone;
@@ -298,8 +288,8 @@ void Sapphire::Network::GameConnection::zoneLineHandler( FrameworkPtr pFw,
 
   if( pExitRange )
   {
-    auto pPopRange = pInstanceObjectCache->getPopRange( pExitRange->data.destTerritoryType,
-                                                        pExitRange->data.destInstanceObjectId );
+    auto pPopRange = instanceObjectCache.getPopRange( pExitRange->data.destTerritoryType,
+                                                       pExitRange->data.destInstanceObjectId );
     if( pPopRange )
     {
       targetZone = pExitRange->data.destTerritoryType;
@@ -324,16 +314,15 @@ void Sapphire::Network::GameConnection::zoneLineHandler( FrameworkPtr pFw,
 }
 
 
-void Sapphire::Network::GameConnection::discoveryHandler( FrameworkPtr pFw,
-                                                          const Packets::FFXIVARR_PACKET_RAW& inPacket,
+void Sapphire::Network::GameConnection::discoveryHandler( const Packets::FFXIVARR_PACKET_RAW& inPacket,
                                                           Entity::Player& player )
 {
-  auto pInstanceObjectCache = pFw->get< InstanceObjectCache >();
+  auto& instanceObjectCache = Common::Service< InstanceObjectCache >::ref();
   auto tInfo = player.getCurrentTerritory()->getTerritoryTypeInfo();
   const auto packet = ZoneChannelPacket< Client::FFXIVIpcDiscoveryHandler >( inPacket );
   const auto positionRef = packet.data().positionRef;
 
-  auto pRefInfo = pInstanceObjectCache->getMapRange( player.getTerritoryTypeId(), positionRef );
+  auto pRefInfo = instanceObjectCache.getMapRange( player.getTerritoryTypeId(), positionRef );
 
   player.sendDebug( "Discovery ref pos id#{0}", positionRef );
 
@@ -349,8 +338,7 @@ void Sapphire::Network::GameConnection::discoveryHandler( FrameworkPtr pFw,
 }
 
 
-void Sapphire::Network::GameConnection::playTimeHandler( FrameworkPtr pFw,
-                                                         const Packets::FFXIVARR_PACKET_RAW& inPacket,
+void Sapphire::Network::GameConnection::playTimeHandler( const Packets::FFXIVARR_PACKET_RAW& inPacket,
                                                          Entity::Player& player )
 {
   auto playTimePacket = makeZonePacket< FFXIVIpcPlayTime >( player.getId() );
@@ -359,8 +347,7 @@ void Sapphire::Network::GameConnection::playTimeHandler( FrameworkPtr pFw,
 }
 
 
-void Sapphire::Network::GameConnection::initHandler( FrameworkPtr pFw,
-                                                     const Packets::FFXIVARR_PACKET_RAW& inPacket,
+void Sapphire::Network::GameConnection::initHandler( const Packets::FFXIVARR_PACKET_RAW& inPacket,
                                                      Entity::Player& player )
 {
   // init handler means this is a login procedure
@@ -370,8 +357,7 @@ void Sapphire::Network::GameConnection::initHandler( FrameworkPtr pFw,
 }
 
 
-void Sapphire::Network::GameConnection::blackListHandler( FrameworkPtr pFw,
-                                                          const Packets::FFXIVARR_PACKET_RAW& inPacket,
+void Sapphire::Network::GameConnection::blackListHandler( const Packets::FFXIVARR_PACKET_RAW& inPacket,
                                                           Entity::Player& player )
 {
   uint8_t count = inPacket.data[ 0x11 ];
@@ -386,8 +372,7 @@ void Sapphire::Network::GameConnection::blackListHandler( FrameworkPtr pFw,
 }
 
 
-void Sapphire::Network::GameConnection::pingHandler( FrameworkPtr pFw,
-                                                     const Packets::FFXIVARR_PACKET_RAW& inPacket,
+void Sapphire::Network::GameConnection::pingHandler( const Packets::FFXIVARR_PACKET_RAW& inPacket,
                                                      Entity::Player& player )
 {
   const auto packet = ZoneChannelPacket< Client::FFXIVIpcPingHandler >( inPacket );
@@ -398,8 +383,7 @@ void Sapphire::Network::GameConnection::pingHandler( FrameworkPtr pFw,
 }
 
 
-void Sapphire::Network::GameConnection::finishLoadingHandler( FrameworkPtr pFw,
-                                                              const Packets::FFXIVARR_PACKET_RAW& inPacket,
+void Sapphire::Network::GameConnection::finishLoadingHandler( const Packets::FFXIVARR_PACKET_RAW& inPacket,
                                                               Entity::Player& player )
 {
   player.sendQuestInfo();
@@ -432,8 +416,7 @@ void Sapphire::Network::GameConnection::finishLoadingHandler( FrameworkPtr pFw,
   player.getCurrentTerritory()->updateActorPosition( player );
 }
 
-void Sapphire::Network::GameConnection::socialListHandler( FrameworkPtr pFw,
-                                                           const Packets::FFXIVARR_PACKET_RAW& inPacket,
+void Sapphire::Network::GameConnection::socialListHandler( const Packets::FFXIVARR_PACKET_RAW& inPacket,
                                                            Entity::Player& player )
 {
 
@@ -492,18 +475,17 @@ void Sapphire::Network::GameConnection::socialListHandler( FrameworkPtr pFw,
 
 }
 
-void Sapphire::Network::GameConnection::chatHandler( FrameworkPtr pFw,
-                                                     const Packets::FFXIVARR_PACKET_RAW& inPacket,
+void Sapphire::Network::GameConnection::chatHandler( const Packets::FFXIVARR_PACKET_RAW& inPacket,
                                                      Entity::Player& player )
 {
-  auto pDebugCom = pFw->get< DebugCommandMgr >();
+  auto& debugCommandMgr = Common::Service< DebugCommandMgr >::ref();
 
   const auto packet = ZoneChannelPacket< Client::FFXIVIpcChatHandler >( inPacket );
 
   if( packet.data().message[ 0 ] == '!' )
   {
     // execute game console command
-    pDebugCom->execCommand( const_cast< char* >( packet.data().message ) + 1, player );
+    debugCommandMgr.execCommand( const_cast< char* >( packet.data().message ) + 1, player );
     return;
   }
 
@@ -551,8 +533,7 @@ void Sapphire::Network::GameConnection::chatHandler( FrameworkPtr pFw,
 // currently we wait for the session to just time out after logout, this can be a problem is the user tries to
 // log right back in.
 // Also the packet needs to be converted to an ipc structure
-void Sapphire::Network::GameConnection::logoutHandler( FrameworkPtr pFw,
-                                                       const Packets::FFXIVARR_PACKET_RAW& inPacket,
+void Sapphire::Network::GameConnection::logoutHandler( const Packets::FFXIVARR_PACKET_RAW& inPacket,
                                                        Entity::Player& player )
 {
   auto logoutPacket = makeZonePacket< FFXIVIpcLogout >( player.getId() );
@@ -564,8 +545,7 @@ void Sapphire::Network::GameConnection::logoutHandler( FrameworkPtr pFw,
 }
 
 
-void Sapphire::Network::GameConnection::tellHandler( FrameworkPtr pFw,
-                                                     const Packets::FFXIVARR_PACKET_RAW& inPacket,
+void Sapphire::Network::GameConnection::tellHandler( const Packets::FFXIVARR_PACKET_RAW& inPacket,
                                                      Entity::Player& player )
 {
   const auto packet = ZoneChannelPacket< Client::FFXIVIpcTellHandler >( inPacket );
@@ -620,8 +600,7 @@ void Sapphire::Network::GameConnection::tellHandler( FrameworkPtr pFw,
   pTargetPlayer->queueChatPacket( tellPacket );
 }
 
-void Sapphire::Network::GameConnection::performNoteHandler( FrameworkPtr pFw,
-                                                            const Packets::FFXIVARR_PACKET_RAW& inPacket,
+void Sapphire::Network::GameConnection::performNoteHandler( const Packets::FFXIVARR_PACKET_RAW& inPacket,
                                                             Entity::Player& player )
 {
   auto performPacket = makeZonePacket< FFXIVIpcPerformNote >( player.getId() );
@@ -629,17 +608,16 @@ void Sapphire::Network::GameConnection::performNoteHandler( FrameworkPtr pFw,
   player.sendToInRangeSet( performPacket );
 }
 
-void Sapphire::Network::GameConnection::landRenameHandler( FrameworkPtr pFw,
-                                                           const Packets::FFXIVARR_PACKET_RAW& inPacket,
+void Sapphire::Network::GameConnection::landRenameHandler( const Packets::FFXIVARR_PACKET_RAW& inPacket,
                                                            Entity::Player& player )
 {
   const auto packet = ZoneChannelPacket< Client::FFXIVIpcRenameLandHandler >( inPacket );
 
-  auto pHousingMgr = pFw->get< HousingMgr >();
+  auto& housingMgr = Common::Service< HousingMgr >::ref();
 
-  auto landSetId = pHousingMgr->toLandSetId( packet.data().ident.territoryTypeId, packet.data().ident.wardNum );
+  auto landSetId = housingMgr.toLandSetId( packet.data().ident.territoryTypeId, packet.data().ident.wardNum );
 
-  auto pZone = pHousingMgr->getHousingZoneByLandSetId( landSetId );
+  auto pZone = housingMgr.getHousingZoneByLandSetId( landSetId );
   if( !pZone )
     return;
 
@@ -663,91 +641,83 @@ void Sapphire::Network::GameConnection::landRenameHandler( FrameworkPtr pFw,
   player.queuePacket( nameUpdatePacket );
 }
 
-void Sapphire::Network::GameConnection::buildPresetHandler( FrameworkPtr pFw,
-                                                            const Packets::FFXIVARR_PACKET_RAW& inPacket,
+void Sapphire::Network::GameConnection::buildPresetHandler( const Packets::FFXIVARR_PACKET_RAW& inPacket,
                                                             Entity::Player& player )
 {
   const auto packet = ZoneChannelPacket< Client::FFXIVIpcBuildPresetHandler >( inPacket );
 
-  auto pHousingMgr = pFw->get< HousingMgr >();
-  pHousingMgr->buildPresetEstate( player, packet.data().plotNum, packet.data().itemId );
+  auto& housingMgr = Common::Service< HousingMgr >::ref();
+  housingMgr.buildPresetEstate( player, packet.data().plotNum, packet.data().itemId );
 }
 
-void Sapphire::Network::GameConnection::housingUpdateGreetingHandler( FrameworkPtr pFw,
-                                                                      const Packets::FFXIVARR_PACKET_RAW& inPacket,
+void Sapphire::Network::GameConnection::housingUpdateGreetingHandler( const Packets::FFXIVARR_PACKET_RAW& inPacket,
                                                                       Entity::Player& player )
 {
   const auto packet = ZoneChannelPacket< Client::FFXIVIpcHousingUpdateHouseGreeting >( inPacket );
 
-  auto pHousingMgr = pFw->get< HousingMgr >();
+  auto& housingMgr = Common::Service< HousingMgr >::ref();
 
-  pHousingMgr->updateEstateGreeting( player, packet.data().ident, std::string( packet.data().greeting ) );
+  housingMgr.updateEstateGreeting( player, packet.data().ident, std::string( packet.data().greeting ) );
 }
 
-void Sapphire::Network::GameConnection::reqPlaceHousingItem( FrameworkPtr pFw,
-                                                             const Packets::FFXIVARR_PACKET_RAW& inPacket,
+void Sapphire::Network::GameConnection::reqPlaceHousingItem( const Packets::FFXIVARR_PACKET_RAW& inPacket,
                                                              Entity::Player& player )
 {
-  auto housingMgr = pFw->get< HousingMgr >();
+  auto& housingMgr = Common::Service< HousingMgr >::ref();
   const auto packet = ZoneChannelPacket< Client::FFXIVIpcReqPlaceHousingItem >( inPacket );
   const auto& data = packet.data();
 
   if( data.shouldPlaceItem == 1 )
   {
-    housingMgr->reqPlaceHousingItem( player, data.landId, data.sourceInvContainerId, data.sourceInvSlotId,
+    housingMgr.reqPlaceHousingItem( player, data.landId, data.sourceInvContainerId, data.sourceInvSlotId,
                                      data.position, data.rotation );
   }
   else
-    housingMgr->reqPlaceItemInStore( player, data.landId, data.sourceInvContainerId, data.sourceInvSlotId );
+    housingMgr.reqPlaceItemInStore( player, data.landId, data.sourceInvContainerId, data.sourceInvSlotId );
 
 }
 
-void Sapphire::Network::GameConnection::reqMoveHousingItem( FrameworkPtr pFw,
-                                                            const Packets::FFXIVARR_PACKET_RAW& inPacket,
+void Sapphire::Network::GameConnection::reqMoveHousingItem( const Packets::FFXIVARR_PACKET_RAW& inPacket,
                                                             Entity::Player& player )
 {
-  auto housingMgr = pFw->get< HousingMgr >();
+  auto& housingMgr = Common::Service< HousingMgr >::ref();
 
   const auto packet = ZoneChannelPacket< Client::FFXIVIpcHousingUpdateObjectPosition >( inPacket );
   const auto& data = packet.data();
 
-  housingMgr->reqMoveHousingItem( player, data.ident, data.slot, data.pos, data.rotation );
-
+  housingMgr.reqMoveHousingItem( player, data.ident, data.slot, data.pos, data.rotation );
 }
 
-void Sapphire::Network::GameConnection::marketBoardSearch( FrameworkPtr pFw,
-                                                           const Packets::FFXIVARR_PACKET_RAW& inPacket,
+void Sapphire::Network::GameConnection::marketBoardSearch( const Packets::FFXIVARR_PACKET_RAW& inPacket,
                                                            Entity::Player& player )
 {
-  auto marketMgr = pFw->get< MarketMgr >();
+  auto& marketMgr = Common::Service< MarketMgr >::ref();
 
   const auto packet = ZoneChannelPacket< Client::FFXIVIpcMarketBoardSearch >( inPacket );
   const auto& data = packet.data();
 
   std::string_view searchStr( data.searchStr );
 
-  marketMgr->searchMarketboard( player, data.itemSearchCategory, data.maxEquipLevel, data.classJobId, data.searchStr,
+  marketMgr.searchMarketboard( player, data.itemSearchCategory, data.maxEquipLevel, data.classJobId, data.searchStr,
                                 data.requestId, data.startIdx );
 }
 
-void Sapphire::Network::GameConnection::marketBoardRequestItemInfo( FrameworkPtr pFw,
-                                                                    const Packets::FFXIVARR_PACKET_RAW& inPacket,
+void Sapphire::Network::GameConnection::marketBoardRequestItemInfo( const Packets::FFXIVARR_PACKET_RAW& inPacket,
                                                                     Entity::Player& player )
 {
   const auto packet = ZoneChannelPacket< Client::FFXIVIpcMarketBoardRequestItemListingInfo >( inPacket );
 
-  auto marketMgr = pFw->get< MarketMgr >();
+  auto& marketMgr = Common::Service< MarketMgr >::ref();
 
-  marketMgr->requestItemListingInfo( player, packet.data().catalogId, packet.data().requestId );
+  marketMgr.requestItemListingInfo( player, packet.data().catalogId, packet.data().requestId );
 }
 
-void Sapphire::Network::GameConnection::marketBoardRequestItemListings( FrameworkPtr pFw,
-                                                                        const Packets::FFXIVARR_PACKET_RAW& inPacket,
+void Sapphire::Network::GameConnection::marketBoardRequestItemListings( const Packets::FFXIVARR_PACKET_RAW& inPacket,
                                                                         Entity::Player& player )
 {
   const auto packet = ZoneChannelPacket< Client::FFXIVIpcMarketBoardRequestItemListings >( inPacket );
 
-  auto marketMgr = pFw->get< MarketMgr >();
+  auto& marketMgr = Common::Service< MarketMgr >::ref();
 
-  marketMgr->requestItemListings( player, packet.data().itemCatalogId );
+  marketMgr.requestItemListings( player, packet.data().itemCatalogId );
 }
diff --git a/src/world/Script/NativeScriptApi.cpp b/src/world/Script/NativeScriptApi.cpp
index d6dce0f6..b8945223 100644
--- a/src/world/Script/NativeScriptApi.cpp
+++ b/src/world/Script/NativeScriptApi.cpp
@@ -31,17 +31,6 @@ namespace Sapphire::ScriptAPI
     return m_type;
   }
 
-  void ScriptObject::setFramework( Sapphire::Framework* fw )
-  {
-    assert( fw );
-    m_framework = fw;
-  }
-
-  Sapphire::Framework* ScriptObject::framework() const
-  {
-    return m_framework;
-  }
-
   ///////////////////////////////////////////////////////////////////
 
   StatusEffectScript::StatusEffectScript( uint32_t effectId ) :
diff --git a/src/world/Script/NativeScriptApi.h b/src/world/Script/NativeScriptApi.h
index d7b33d00..aad02c5a 100644
--- a/src/world/Script/NativeScriptApi.h
+++ b/src/world/Script/NativeScriptApi.h
@@ -26,8 +26,6 @@ namespace Sapphire::ScriptAPI
     uint32_t m_id;
     std::size_t m_type;
 
-    Sapphire::Framework* m_framework;
-
   public:
     /*!
     * @param id an ID which uniquely identifies this script in relation to it's type
@@ -48,20 +46,6 @@ namespace Sapphire::ScriptAPI
     * @return The hash_code of the script
     */
     virtual std::size_t getType() const;
-
-    /*!
-    * @brief Sets the ptr to the framework for use inside scripts
-    *
-    * @param fw The ptr to a Framework
-    */
-    virtual void setFramework( Sapphire::Framework* fw );
-
-    /*!
-    * @brief Returns the current ptr to framework set for the current script
-    *
-    * @return A pointer to Core::Framework
-    */
-    virtual Sapphire::Framework* framework() const;
   };
 
 
diff --git a/src/world/Script/NativeScriptMgr.cpp b/src/world/Script/NativeScriptMgr.cpp
index b8392351..6db51a39 100644
--- a/src/world/Script/NativeScriptMgr.cpp
+++ b/src/world/Script/NativeScriptMgr.cpp
@@ -4,8 +4,6 @@
 #include <Service.h>
 #include "ServerMgr.h"
 
-#include "Framework.h"
-
 namespace Sapphire::Scripting
 {
 
@@ -33,8 +31,6 @@ namespace Sapphire::Scripting
       auto script = scripts[ i ];
       module->scripts.push_back( script );
 
-      script->setFramework( framework().get() );
-
       m_scripts[ script->getType() ][ script->getId() ] = script;
 
       success = true;
@@ -122,8 +118,7 @@ namespace Sapphire::Scripting
     return m_loader.isModuleLoaded( name );
   }
 
-  NativeScriptMgr::NativeScriptMgr( FrameworkPtr pFw  ) :
-    World::Manager::BaseManager( pFw )
+  NativeScriptMgr::NativeScriptMgr()
   {
     auto& serverMgr = Common::Service< Sapphire::World::ServerMgr >::ref();
 
@@ -131,9 +126,9 @@ namespace Sapphire::Scripting
   }
 
 
-  std::shared_ptr< NativeScriptMgr > createNativeScriptMgr( FrameworkPtr pFw )
+  std::shared_ptr< NativeScriptMgr > createNativeScriptMgr()
   {
-    return std::make_shared< NativeScriptMgr >( pFw );
+    return std::make_shared< NativeScriptMgr >();
   }
 }
 
diff --git a/src/world/Script/NativeScriptMgr.h b/src/world/Script/NativeScriptMgr.h
index 8547c975..668408a0 100644
--- a/src/world/Script/NativeScriptMgr.h
+++ b/src/world/Script/NativeScriptMgr.h
@@ -4,7 +4,6 @@
 #include <unordered_map>
 #include <set>
 #include <queue>
-#include "Manager/BaseManager.h"
 
 #include "ScriptLoader.h"
 
@@ -14,7 +13,7 @@ namespace Sapphire::Scripting
   /*!
    * @brief Contains all the functionality for easily loading, unloading, reloading and generally accessing scripts.
    */
-  class NativeScriptMgr : public World::Manager::BaseManager
+  class NativeScriptMgr
   {
   protected:
     /*!
@@ -41,7 +40,7 @@ namespace Sapphire::Scripting
     bool unloadScript( ScriptInfo* info );
 
   public:
-    NativeScriptMgr( FrameworkPtr pFw );
+    NativeScriptMgr();
 
     /*!
      * @brief Loads a script from a path
@@ -125,7 +124,7 @@ namespace Sapphire::Scripting
    *
    * @return a std::shared_ptr to NativeScriptMgr
    */
-  std::shared_ptr< NativeScriptMgr > createNativeScriptMgr( FrameworkPtr pFw );
+  std::shared_ptr< NativeScriptMgr > createNativeScriptMgr();
 }
 
 #endif
diff --git a/src/world/Script/ScriptLoader.cpp b/src/world/Script/ScriptLoader.cpp
index ace591a8..93759aa3 100644
--- a/src/world/Script/ScriptLoader.cpp
+++ b/src/world/Script/ScriptLoader.cpp
@@ -7,8 +7,6 @@
 
 #include <filesystem>
 
-#include "Framework.h"
-
 namespace fs = std::filesystem;
 
 const std::string Sapphire::Scripting::ScriptLoader::getModuleExtension()
diff --git a/src/world/Script/ScriptMgr.cpp b/src/world/Script/ScriptMgr.cpp
index 0593cda1..b7e082bd 100644
--- a/src/world/Script/ScriptMgr.cpp
+++ b/src/world/Script/ScriptMgr.cpp
@@ -23,18 +23,16 @@
 
 #include "NativeScriptMgr.h"
 #include "ServerMgr.h"
-#include "Framework.h"
 
 // enable the ambiguity fix for every platform to avoid #define nonsense
 #define WIN_AMBIGUITY_FIX
 
 namespace fs = std::filesystem;
 
-Sapphire::Scripting::ScriptMgr::ScriptMgr( FrameworkPtr pFw ) :
-  World::Manager::BaseManager( pFw ),
+Sapphire::Scripting::ScriptMgr::ScriptMgr() :
   m_firstScriptChangeNotificiation( false )
 {
-  m_nativeScriptMgr = createNativeScriptMgr( pFw );
+  m_nativeScriptMgr = createNativeScriptMgr();
 }
 
 Sapphire::Scripting::ScriptMgr::~ScriptMgr()
@@ -257,10 +255,10 @@ bool Sapphire::Scripting::ScriptMgr::onEventHandlerTradeReturn( Entity::Player&
 bool Sapphire::Scripting::ScriptMgr::onEventItem( Entity::Player& player, uint32_t eventItemId,
                                                   uint32_t eventId, uint32_t castTime, uint64_t targetId )
 {
-  auto pEventMgr = framework()->get< World::Manager::EventMgr >();
+  auto& eventMgr = Common::Service< World::Manager::EventMgr >::ref();
 
   std::string eventName = "onEventItem";
-  std::string objName = pEventMgr->getEventName( eventId );
+  std::string objName = eventMgr.getEventName( eventId );
   player.sendDebug( "Calling: {0}.{1} - {2}", objName, eventName, eventId );
 
   auto script = m_nativeScriptMgr->getScript< Sapphire::ScriptAPI::EventScript >( eventId );
@@ -277,7 +275,7 @@ bool Sapphire::Scripting::ScriptMgr::onEventItem( Entity::Player& player, uint32
 
 bool Sapphire::Scripting::ScriptMgr::onBNpcKill( Entity::Player& player, uint16_t nameId )
 {
-  auto pEventMgr = framework()->get< World::Manager::EventMgr >();
+  auto& eventMgr = Common::Service< World::Manager::EventMgr >::ref();
 
   // loop through all active quests and try to call available onBNpcKill callbacks
   for( size_t i = 0; i < 30; i++ )
@@ -291,7 +289,7 @@ bool Sapphire::Scripting::ScriptMgr::onBNpcKill( Entity::Player& player, uint16_
     auto script = m_nativeScriptMgr->getScript< Sapphire::ScriptAPI::EventScript >( questId );
     if( script )
     {
-      std::string objName = pEventMgr->getEventName( questId );
+      std::string objName = eventMgr.getEventName( questId );
 
       player.sendDebug( "Calling: {0}.onBnpcKill nameId#{1}", objName, nameId );
 
@@ -304,7 +302,7 @@ bool Sapphire::Scripting::ScriptMgr::onBNpcKill( Entity::Player& player, uint16_
 
 bool Sapphire::Scripting::ScriptMgr::onEObjHit( Sapphire::Entity::Player& player, uint64_t actorId, uint32_t actionId )
 {
-  auto pEventMgr = framework()->get< World::Manager::EventMgr >();
+  auto& eventMgr = Common::Service< World::Manager::EventMgr >::ref();
   bool didCallScript = false;
 
   for( size_t i = 0; i < 30; i++ )
@@ -319,7 +317,7 @@ bool Sapphire::Scripting::ScriptMgr::onEObjHit( Sapphire::Entity::Player& player
     if( script )
     {
       didCallScript = true;
-      std::string objName = pEventMgr->getEventName( questId );
+      std::string objName = eventMgr.getEventName( questId );
 
       player.sendDebug( "Calling: {0}.onEObjHit actorId#{1}", objName, actorId );
 
diff --git a/src/world/Script/ScriptMgr.h b/src/world/Script/ScriptMgr.h
index c68a0482..ea9b5d80 100644
--- a/src/world/Script/ScriptMgr.h
+++ b/src/world/Script/ScriptMgr.h
@@ -7,12 +7,11 @@
 
 #include <Common.h>
 #include "Forwards.h"
-#include "Manager/BaseManager.h"
 
 namespace Sapphire::Scripting
 {
 
-  class ScriptMgr : public World::Manager::BaseManager
+  class ScriptMgr
   {
   private:
     /*!
@@ -29,7 +28,7 @@ namespace Sapphire::Scripting
     bool m_firstScriptChangeNotificiation;
 
   public:
-    ScriptMgr( FrameworkPtr pFw );
+    ScriptMgr();
 
     ~ScriptMgr();
 
diff --git a/src/world/ServerMgr.cpp b/src/world/ServerMgr.cpp
index 5b7159ee..4d539b59 100644
--- a/src/world/ServerMgr.cpp
+++ b/src/world/ServerMgr.cpp
@@ -6,7 +6,6 @@
 
 #include "Network/GameConnection.h"
 #include "ServerMgr.h"
-#include "Framework.h"
 
 #include <Version.h>
 #include <Logging/Logger.h>
@@ -47,8 +46,7 @@
 
 using namespace Sapphire::World::Manager;
 
-Sapphire::World::ServerMgr::ServerMgr( const std::string& configName, FrameworkPtr pFw ) :
-  Manager::BaseManager( pFw ),
+Sapphire::World::ServerMgr::ServerMgr( const std::string& configName ) :
   m_configName( configName ),
   m_bRunning( true ),
   m_lastDBPingTime( 0 ),
@@ -124,8 +122,7 @@ void Sapphire::World::ServerMgr::run( int32_t argc, char* argv[] )
 
   printBanner();
 
-  auto pConfig = std::make_shared< Common::ConfigMgr >();
-  Common::Service< Common::ConfigMgr >::set( pConfig );
+  Common::Service< Common::ConfigMgr >::set();
   if( !loadSettings( argc, argv ) )
   {
     Logger::fatal( "Unable to load settings!" );
@@ -143,7 +140,7 @@ void Sapphire::World::ServerMgr::run( int32_t argc, char* argv[] )
     Logger::fatal( "DataPath: {0}", dataPath );
     return;
   }
-  framework()->set< Data::ExdDataGenerated >( pExdData );
+  Common::Service< Data::ExdDataGenerated >::set( pExdData );
 
   auto pDb = std::make_shared< Db::DbWorkerPool< Db::ZoneDbConnection > >();
   Sapphire::Db::DbLoader loader;
@@ -153,56 +150,56 @@ void Sapphire::World::ServerMgr::run( int32_t argc, char* argv[] )
     Logger::fatal( "Database not initialized properly!" );
     return;
   }
-  framework()->set< Db::DbWorkerPool< Db::ZoneDbConnection > >( pDb );
+  Common::Service< Db::DbWorkerPool< Db::ZoneDbConnection > >::set( pDb );
 
   Logger::info( "LinkshellMgr: Caching linkshells" );
-  auto pLsMgr = std::make_shared< Manager::LinkshellMgr >( framework() );
+  auto pLsMgr = std::make_shared< Manager::LinkshellMgr >();
   if( !pLsMgr->loadLinkshells() )
   {
     Logger::fatal( "Unable to load linkshells!" );
     return;
   }
-  framework()->set< Manager::LinkshellMgr >( pLsMgr );
+  Common::Service< Manager::LinkshellMgr >::set( pLsMgr );
 
-  auto pScript = std::make_shared< Scripting::ScriptMgr >( framework() );
+  auto pScript = std::make_shared< Scripting::ScriptMgr >();
   if( !pScript->init() )
   {
     Logger::fatal( "Failed to setup scripts!" );
     return;
   }
-  framework()->set< Scripting::ScriptMgr >( pScript );
+  Common::Service< Scripting::ScriptMgr >::set( pScript );
 
   Logger::info( "Setting up InstanceObjectCache" );
-  auto pInstanceObjCache = std::make_shared< Sapphire::InstanceObjectCache >( framework() );
-  framework()->set< Sapphire::InstanceObjectCache >( pInstanceObjCache );
+  auto pInstanceObjCache = std::make_shared< Sapphire::InstanceObjectCache >();
+  Common::Service< Sapphire::InstanceObjectCache >::set( pInstanceObjCache );
 
-  auto pActionMgr = std::make_shared< Manager::ActionMgr >( framework() );
-  framework()->set< Manager::ActionMgr >( pActionMgr );
+  auto pActionMgr = std::make_shared< Manager::ActionMgr >();
+  Common::Service< Manager::ActionMgr >::set( pActionMgr );
 
   loadBNpcTemplates();
 
-  auto pNaviMgr = std::make_shared< Manager::NaviMgr >( framework() );
-  framework()->set< Manager::NaviMgr >( pNaviMgr );
+  auto pNaviMgr = std::make_shared< Manager::NaviMgr >();
+  Common::Service< Manager::NaviMgr >::set( pNaviMgr );
 
   Logger::info( "TerritoryMgr: Setting up zones" );
-  auto pTeriMgr = std::make_shared< Manager::TerritoryMgr >( framework() );
-  auto pHousingMgr = std::make_shared< Manager::HousingMgr >( framework() );
-  framework()->set< Manager::HousingMgr >( pHousingMgr );
-  framework()->set< Manager::TerritoryMgr >( pTeriMgr );
+  auto pTeriMgr = std::make_shared< Manager::TerritoryMgr >();
+  auto pHousingMgr = std::make_shared< Manager::HousingMgr >();
+  Common::Service< Manager::HousingMgr >::set( pHousingMgr );
+  Common::Service< Manager::TerritoryMgr >::set( pTeriMgr );
+
   if( !pHousingMgr->init() )
   {
     Logger::fatal( "Failed to setup housing!" );
     return;
   }
-
   if( !pTeriMgr->init() )
   {
     Logger::fatal( "Failed to setup zones!" );
     return;
   }
 
-  auto pMarketMgr = std::make_shared< Manager::MarketMgr >( framework() );
-  framework()->set< Manager::MarketMgr >( pMarketMgr );
+  auto pMarketMgr = std::make_shared< Manager::MarketMgr >();
+  Common::Service< Manager::MarketMgr >::set( pMarketMgr );
 
   if( !pMarketMgr->init() )
   {
@@ -213,26 +210,26 @@ void Sapphire::World::ServerMgr::run( int32_t argc, char* argv[] )
 
 
   Network::HivePtr hive( new Network::Hive() );
-  Network::addServerToHive< Network::GameConnection >( m_ip, m_port, hive, framework() );
+  Network::addServerToHive< Network::GameConnection >( m_ip, m_port, hive );
 
   std::vector< std::thread > thread_list;
   thread_list.emplace_back( std::thread( std::bind( &Network::Hive::run, hive.get() ) ) );
 
-  auto pDebugCom = std::make_shared< DebugCommandMgr >( framework() );
-  auto pPlayerMgr = std::make_shared< Manager::PlayerMgr >( framework() );
-  auto pShopMgr = std::make_shared< Manager::ShopMgr >( framework() );
-  auto pInventoryMgr = std::make_shared< Manager::InventoryMgr >( framework() );
-  auto pEventMgr = std::make_shared< Manager::EventMgr >( framework() );
-  auto pItemMgr = std::make_shared< Manager::ItemMgr >( framework() );
-  auto pRNGMgr = std::make_shared< Manager::RNGMgr >( framework() );
+  auto pDebugCom = std::make_shared< DebugCommandMgr >();
+  auto pPlayerMgr = std::make_shared< Manager::PlayerMgr >();
+  auto pShopMgr = std::make_shared< Manager::ShopMgr >();
+  auto pInventoryMgr = std::make_shared< Manager::InventoryMgr >();
+  auto pEventMgr = std::make_shared< Manager::EventMgr >();
+  auto pItemMgr = std::make_shared< Manager::ItemMgr >();
+  auto pRNGMgr = std::make_shared< Manager::RNGMgr >();
 
-  framework()->set< DebugCommandMgr >( pDebugCom );
-  framework()->set< Manager::PlayerMgr >( pPlayerMgr );
-  framework()->set< Manager::ShopMgr >( pShopMgr );
-  framework()->set< Manager::InventoryMgr >( pInventoryMgr );
-  framework()->set< Manager::EventMgr >( pEventMgr );
-  framework()->set< Manager::ItemMgr >( pItemMgr );
-  framework()->set< Manager::RNGMgr >( pRNGMgr );
+  Common::Service< DebugCommandMgr >::set( pDebugCom );
+  Common::Service< Manager::PlayerMgr >::set( pPlayerMgr );
+  Common::Service< Manager::ShopMgr >::set( pShopMgr );
+  Common::Service< Manager::InventoryMgr >::set( pInventoryMgr );
+  Common::Service< Manager::EventMgr >::set( pEventMgr );
+  Common::Service< Manager::ItemMgr >::set( pItemMgr );
+  Common::Service< Manager::RNGMgr >::set( pRNGMgr );
 
   Logger::info( "World server running on {0}:{1}", m_ip, m_port );
 
@@ -267,9 +264,9 @@ void Sapphire::World::ServerMgr::printBanner() const
 
 void Sapphire::World::ServerMgr::mainLoop()
 {
-  auto pTeriMgr = framework()->get< TerritoryMgr >();
-  auto pScriptMgr = framework()->get< Scripting::ScriptMgr >();
-  auto pDb = framework()->get< Db::DbWorkerPool< Db::ZoneDbConnection > >();
+  auto& terriMgr = Common::Service< TerritoryMgr >::ref();
+  auto& scriptMgr = Common::Service< Scripting::ScriptMgr >::ref();
+  auto& db = Common::Service< Db::DbWorkerPool< Db::ZoneDbConnection > >::ref();
 
   while( isRunning() )
   {
@@ -278,9 +275,9 @@ void Sapphire::World::ServerMgr::mainLoop()
     auto currTime = Common::Util::getTimeSeconds();
     auto tickCount = Common::Util::getTimeMs();
 
-    pTeriMgr->updateTerritoryInstances( tickCount );
+    terriMgr.updateTerritoryInstances( tickCount );
 
-    pScriptMgr->update();
+    scriptMgr.update();
 
     std::lock_guard< std::mutex > lock( m_sessionMutex );
     for( auto sessionIt : m_sessionMapById )
@@ -299,7 +296,7 @@ void Sapphire::World::ServerMgr::mainLoop()
 
     if( currTime - m_lastDBPingTime > 3 )
     {
-      pDb->keepAlive();
+      db.keepAlive();
       m_lastDBPingTime = currTime;
     }
 
@@ -361,7 +358,7 @@ bool Sapphire::World::ServerMgr::createSession( uint32_t sessionId )
 
   Logger::info( "[{0}] Creating new session", session_id_str );
 
-  std::shared_ptr< Session > newSession( new Session( sessionId, framework() ) );
+  std::shared_ptr< Session > newSession( new Session( sessionId ) );
   m_sessionMapById[ sessionId ] = newSession;
 
   if( !newSession->loadPlayer() )
@@ -425,8 +422,8 @@ std::string Sapphire::World::ServerMgr::getPlayerNameFromDb( uint32_t playerId,
       return ( it->second );
   }
 
-  auto pDb = framework()->get< Db::DbWorkerPool< Db::ZoneDbConnection > >();
-  auto res = pDb->query( "SELECT name FROM charainfo WHERE characterid = " + std::to_string( playerId ) );
+  auto& db = Common::Service< Db::DbWorkerPool< Db::ZoneDbConnection > >::ref();
+  auto res = db.query( "SELECT name FROM charainfo WHERE characterid = " + std::to_string( playerId ) );
 
   if( !res->next() )
     return "Unknown";
@@ -444,11 +441,10 @@ void Sapphire::World::ServerMgr::updatePlayerName( uint32_t playerId, const std:
 
 void Sapphire::World::ServerMgr::loadBNpcTemplates()
 {
-  auto pDb = framework()->get< Db::DbWorkerPool< Db::ZoneDbConnection > >();
+  auto& db = Common::Service< Db::DbWorkerPool< Db::ZoneDbConnection > >::ref();
 
-  auto stmt = pDb->getPreparedStatement( Db::ZoneDbStatements::ZONE_SEL_BNPCTEMPLATES );
-
-  auto res = pDb->query( stmt );
+  auto stmt = db.getPreparedStatement( Db::ZoneDbStatements::ZONE_SEL_BNPCTEMPLATES );
+  auto res = db.query( stmt );
 
   while( res->next() )
   {
diff --git a/src/world/ServerMgr.h b/src/world/ServerMgr.h
index fa3cf5ea..1add030a 100644
--- a/src/world/ServerMgr.h
+++ b/src/world/ServerMgr.h
@@ -6,18 +6,17 @@
 #include <mutex>
 #include <map>
 #include "ForwardsZone.h"
-#include "Manager/BaseManager.h"
 #include <Config/ConfigDef.h>
 
 namespace Sapphire::World
 {
 
-  class ServerMgr : public Manager::BaseManager
+  class ServerMgr
   {
   public:
-    ServerMgr( const std::string& configName, FrameworkPtr pFw );
+    ServerMgr( const std::string& configName );
 
-    ~ServerMgr() override;
+    ~ServerMgr();
 
     using WorldConfigPtr = std::shared_ptr< Sapphire::Common::Config::WorldConfig >;
 
diff --git a/src/world/Session.cpp b/src/world/Session.cpp
index 273d20d0..56bcc888 100644
--- a/src/world/Session.cpp
+++ b/src/world/Session.cpp
@@ -12,12 +12,11 @@
 
 namespace fs = std::filesystem;
 
-Sapphire::World::Session::Session( uint32_t sessionId, FrameworkPtr pFw ) :
+Sapphire::World::Session::Session( uint32_t sessionId ) :
   m_sessionId( sessionId ),
   m_lastDataTime( Common::Util::getTimeSeconds() ),
   m_lastSqlTime( Common::Util::getTimeSeconds() ),
   m_isValid( false ),
-  m_pFw( std::move( pFw ) ),
   m_isReplaying( false )
 {
 }
@@ -48,7 +47,7 @@ Sapphire::Network::GameConnectionPtr Sapphire::World::Session::getChatConnection
 bool Sapphire::World::Session::loadPlayer()
 {
 
-  m_pPlayer = Entity::make_Player( m_pFw );
+  m_pPlayer = Entity::make_Player();
 
   if( !m_pPlayer->load( m_sessionId, shared_from_this() ) )
   {
diff --git a/src/world/Session.h b/src/world/Session.h
index dcbd78cb..2f20ecbe 100644
--- a/src/world/Session.h
+++ b/src/world/Session.h
@@ -11,7 +11,7 @@ namespace Sapphire::World
   class Session : public std::enable_shared_from_this< Session >
   {
   public:
-    Session( uint32_t sessionId, FrameworkPtr pFw );
+    Session( uint32_t sessionId );
 
     ~Session() = default;
 
@@ -67,8 +67,6 @@ namespace Sapphire::World
     Network::GameConnectionPtr m_pZoneConnection;
     Network::GameConnectionPtr m_pChatConnection;
 
-    FrameworkPtr m_pFw;
-
   };
 
 }
diff --git a/src/world/StatusEffect/StatusEffect.cpp b/src/world/StatusEffect/StatusEffect.cpp
index 4dcfd556..f63b79cc 100644
--- a/src/world/StatusEffect/StatusEffect.cpp
+++ b/src/world/StatusEffect/StatusEffect.cpp
@@ -4,6 +4,7 @@
 #include <Logging/Logger.h>
 
 #include <algorithm>
+#include <Service.h>
 
 #include "Actor/Chara.h"
 #include "Actor/Actor.h"
@@ -11,25 +12,23 @@
 #include "Script/ScriptMgr.h"
 
 #include "StatusEffect.h"
-#include "Framework.h"
 
 using namespace Sapphire::Common;
 using namespace Sapphire::Network::Packets;
 using namespace Sapphire::Network::Packets::Server;
 
 Sapphire::StatusEffect::StatusEffect::StatusEffect( uint32_t id, Entity::CharaPtr sourceActor, Entity::CharaPtr targetActor,
-                                                    uint32_t duration, uint32_t tickRate, FrameworkPtr pFw ) :
+                                                    uint32_t duration, uint32_t tickRate ) :
   m_id( id ),
   m_sourceActor( sourceActor ),
   m_targetActor( targetActor ),
   m_duration( duration ),
   m_startTime( 0 ),
   m_tickRate( tickRate ),
-  m_lastTick( 0 ),
-  m_pFw( pFw )
+  m_lastTick( 0 )
 {
-  auto pExdData = m_pFw->get< Data::ExdDataGenerated >();
-  auto entry = pExdData->get< Sapphire::Data::Status >( id );
+  auto& exdData = Common::Service< Data::ExdDataGenerated >::ref();
+  auto entry = exdData.get< Sapphire::Data::Status >( id );
   m_name = entry->name;
 
   std::replace( m_name.begin(), m_name.end(), ' ', '_' );
@@ -62,9 +61,10 @@ std::pair< uint8_t, uint32_t > Sapphire::StatusEffect::StatusEffect::getTickEffe
 
 void Sapphire::StatusEffect::StatusEffect::onTick()
 {
-  auto pScriptMgr = m_pFw->get< Scripting::ScriptMgr >();
   m_lastTick = Util::getTimeMs();
-  pScriptMgr->onStatusTick( m_targetActor, *this );
+
+  auto& scriptMgr = Common::Service< Scripting::ScriptMgr >::ref();
+  scriptMgr.onStatusTick( m_targetActor, *this );
 }
 
 uint32_t Sapphire::StatusEffect::StatusEffect::getSrcActorId() const
@@ -85,7 +85,7 @@ uint16_t Sapphire::StatusEffect::StatusEffect::getParam() const
 void Sapphire::StatusEffect::StatusEffect::applyStatus()
 {
   m_startTime = Util::getTimeMs();
-  auto pScriptMgr = m_pFw->get< Scripting::ScriptMgr >();
+  auto& scriptMgr = Common::Service< Scripting::ScriptMgr >::ref();
 
   // this is only right when an action is being used by the player
   // else you probably need to use an actorcontrol
@@ -105,13 +105,13 @@ void Sapphire::StatusEffect::StatusEffect::applyStatus()
   //effectPacket.data().effects[4].unknown_5 = 0x80;
   //m_sourceActor->sendToInRangeSet( effectPacket, true );
 
-  pScriptMgr->onStatusReceive( m_targetActor, m_id );
+  scriptMgr.onStatusReceive( m_targetActor, m_id );
 }
 
 void Sapphire::StatusEffect::StatusEffect::removeStatus()
 {
-  auto pScriptMgr = m_pFw->get< Scripting::ScriptMgr >();
-  pScriptMgr->onStatusTimeOut( m_targetActor, m_id );
+  auto& scriptMgr = Common::Service< Scripting::ScriptMgr >::ref();
+  scriptMgr.onStatusTimeOut( m_targetActor, m_id );
 }
 
 uint32_t Sapphire::StatusEffect::StatusEffect::getId() const
diff --git a/src/world/StatusEffect/StatusEffect.h b/src/world/StatusEffect/StatusEffect.h
index d9f933e1..e6bb1c8e 100644
--- a/src/world/StatusEffect/StatusEffect.h
+++ b/src/world/StatusEffect/StatusEffect.h
@@ -11,7 +11,7 @@ class StatusEffect
 {
 public:
   StatusEffect( uint32_t id, Entity::CharaPtr sourceActor, Entity::CharaPtr targetActor,
-                uint32_t duration, uint32_t tickRate, FrameworkPtr pFw );
+                uint32_t duration, uint32_t tickRate );
 
   ~StatusEffect();
 
@@ -58,7 +58,6 @@ private:
   uint16_t m_param;
   std::string m_name;
   std::pair< uint8_t, uint32_t > m_currTickEffect;
-  FrameworkPtr m_pFw;
 
 };
 
diff --git a/src/world/Territory/House.cpp b/src/world/Territory/House.cpp
index 4d4544ff..c5f44bc6 100644
--- a/src/world/Territory/House.cpp
+++ b/src/world/Territory/House.cpp
@@ -9,16 +9,15 @@
 #include "House.h"
 
 #include <unordered_map>
-#include "Framework.h"
+#include <Service.h>
 
 Sapphire::House::House( uint32_t houseId, uint32_t landSetId, Common::LandIdent ident, const std::string& estateName,
-                        const std::string& estateComment, FrameworkPtr pFw ) :
+                        const std::string& estateComment ) :
   m_houseId( houseId ),
   m_landSetId( landSetId ),
   m_landIdent( ident ),
   m_estateName( estateName ),
-  m_estateComment( estateComment ),
-  m_pFw( pFw )
+  m_estateComment( estateComment )
 {
   m_interiorModelCache.fill( 0 );
   m_exteriorModelCache.fill( std::make_pair( 0, 0 ) );
@@ -28,10 +27,10 @@ Sapphire::House::~House() = default;
 
 void Sapphire::House::updateHouseDb()
 {
-  auto pDB = m_pFw->get< Db::DbWorkerPool< Db::ZoneDbConnection > >();
+  auto& db = Common::Service< Db::DbWorkerPool< Db::ZoneDbConnection > >::ref();
 
   // BuildTime = 1, Aetheryte = 2, Comment = 3, HouseName = 4, Endorsements = 5, HouseId = 6
-  auto stmt = pDB->getPreparedStatement( Db::HOUSING_HOUSE_UP );
+  auto stmt = db.getPreparedStatement( Db::HOUSING_HOUSE_UP );
   stmt->setUInt( 6, m_houseId );
 
   stmt->setInt64( 1, static_cast< int64_t >( m_buildTime ) );
@@ -42,7 +41,7 @@ void Sapphire::House::updateHouseDb()
 
   stmt->setUInt64( 5, 0 );
 
-  pDB->execute( stmt );
+  db.execute( stmt );
 }
 
 uint32_t Sapphire::House::getLandSetId() const
diff --git a/src/world/Territory/House.h b/src/world/Territory/House.h
index 1fa0ca43..9a3a3da0 100644
--- a/src/world/Territory/House.h
+++ b/src/world/Territory/House.h
@@ -14,7 +14,7 @@ namespace Sapphire
   {
   public:
     House( uint32_t houseId, uint32_t landSetId, Common::LandIdent ident, const std::string& estateName,
-           const std::string& estateComment, FrameworkPtr pFw );
+           const std::string& estateComment );
     virtual ~House();
 
     using HousePart = std::pair< uint32_t, uint16_t >;
@@ -59,7 +59,6 @@ namespace Sapphire
 
     std::string m_estateComment;
     std::string m_estateName;
-    FrameworkPtr m_pFw;
   };
 
 }
diff --git a/src/world/Territory/Housing/HousingInteriorTerritory.cpp b/src/world/Territory/Housing/HousingInteriorTerritory.cpp
index ade7acfc..bef2e7d6 100644
--- a/src/world/Territory/Housing/HousingInteriorTerritory.cpp
+++ b/src/world/Territory/Housing/HousingInteriorTerritory.cpp
@@ -8,6 +8,7 @@
 #include <Network/PacketDef/Zone/ServerZoneDef.h>
 #include <Network/PacketWrappers/ActorControlSelfPacket.h>
 #include <Network/CommonActorControl.h>
+#include <Service.h>
 
 #include "Actor/Player.h"
 #include "Actor/Actor.h"
@@ -20,7 +21,6 @@
 
 #include "Forwards.h"
 #include "HousingInteriorTerritory.h"
-#include "Framework.h"
 
 using namespace Sapphire::Common;
 using namespace Sapphire::Network::Packets;
@@ -34,9 +34,8 @@ Sapphire::World::Territory::Housing::HousingInteriorTerritory::HousingInteriorTe
                                                                                          uint16_t territoryTypeId,
                                                                                          uint32_t guId,
                                                                                          const std::string& internalName,
-                                                                                         const std::string& contentName,
-                                                                                         FrameworkPtr pFw ) :
-  Territory( territoryTypeId, guId, internalName, contentName, pFw ),
+                                                                                         const std::string& contentName ) :
+  Territory( territoryTypeId, guId, internalName, contentName ),
   m_landIdent( ident )
 {
 }
@@ -52,7 +51,7 @@ bool Sapphire::World::Territory::Housing::HousingInteriorTerritory::init()
 
 void Sapphire::World::Territory::Housing::HousingInteriorTerritory::onPlayerZoneIn( Entity::Player& player )
 {
-  auto pHousingMgr = m_pFw->get< HousingMgr >();
+  auto& housingMgr = Common::Service< HousingMgr >::ref();
 
   Logger::debug( "HousingInteriorTerritory::onPlayerZoneIn: Territory#{0}|{1}, Entity#{2}",
                   getGuId(), getTerritoryTypeId(), player.getId() );
@@ -63,8 +62,8 @@ void Sapphire::World::Territory::Housing::HousingInteriorTerritory::onPlayerZone
   indoorInitPacket->data().u3 = 0;
   indoorInitPacket->data().u4 = 0;
 
-  auto landSetId = pHousingMgr->toLandSetId( static_cast< uint16_t >( m_landIdent.territoryTypeId ), static_cast< uint8_t >( m_landIdent.wardNum ) );
-  auto pLand = pHousingMgr->getHousingZoneByLandSetId( landSetId )->getLand( static_cast< uint8_t >( m_landIdent.landId ) );
+  auto landSetId = housingMgr.toLandSetId( static_cast< uint16_t >( m_landIdent.territoryTypeId ), static_cast< uint8_t >( m_landIdent.wardNum ) );
+  auto pLand = housingMgr.getHousingZoneByLandSetId( landSetId )->getLand( static_cast< uint8_t >( m_landIdent.landId ) );
   auto pHouse = pLand->getHouse();
 
   for( auto i = 0; i < 10; i++ )
@@ -115,7 +114,7 @@ const Common::LandIdent Sapphire::World::Territory::Housing::HousingInteriorTerr
 
 void Sapphire::World::Territory::Housing::HousingInteriorTerritory::updateHousingObjects()
 {
-  auto housingMgr = m_pFw->get< Manager::HousingMgr >();
+  auto& housingMgr = Common::Service< Manager::HousingMgr >::ref();
 
   auto containerIds = {
     InventoryType::HousingInteriorPlacedItems1,
@@ -135,7 +134,7 @@ void Sapphire::World::Territory::Housing::HousingInteriorTerritory::updateHousin
   memset( &obj, 0x0, sizeof( Common::HousingObject ) );
   m_housingObjects.fill( obj );
 
-  auto containers = housingMgr->getEstateInventory( getLandIdent() );
+  auto containers = housingMgr.getEstateInventory( getLandIdent() );
 
   uint8_t containerIdx = 0;
   for( auto containerId : containerIds )
@@ -152,7 +151,7 @@ void Sapphire::World::Territory::Housing::HousingInteriorTerritory::updateHousin
 
       auto offset = item.first + ( containerIdx * 50 );
 
-      auto obj = housingMgr->getYardObjectForItem( housingItem );
+      auto obj = housingMgr.getYardObjectForItem( housingItem );
 
       m_housingObjects[static_cast< size_t >( offset ) ] = obj;
     }
@@ -166,10 +165,10 @@ void Sapphire::World::Territory::Housing::HousingInteriorTerritory::spawnHousing
                                                                                         uint16_t containerType,
                                                                                         Inventory::HousingItemPtr item )
 {
-  auto housingMgr = m_pFw->get< Manager::HousingMgr >();
+  auto& housingMgr = Common::Service< Manager::HousingMgr >::ref();
 
   auto offset = ( containerIdx * 50 ) + slot;
-  auto obj = housingMgr->getYardObjectForItem( item );
+  auto obj = housingMgr.getYardObjectForItem( item );
 
   m_housingObjects[ static_cast< size_t >( offset ) ] = obj;
 
diff --git a/src/world/Territory/Housing/HousingInteriorTerritory.h b/src/world/Territory/Housing/HousingInteriorTerritory.h
index 3ea97ae4..49bc0f9e 100644
--- a/src/world/Territory/Housing/HousingInteriorTerritory.h
+++ b/src/world/Territory/Housing/HousingInteriorTerritory.h
@@ -11,8 +11,7 @@ namespace Sapphire::World::Territory::Housing
     HousingInteriorTerritory( Common::LandIdent ident, uint16_t territoryTypeId,
                               uint32_t guId,
                               const std::string& internalName,
-                              const std::string& contentName,
-                              FrameworkPtr pFw );
+                              const std::string& contentName );
 
     virtual ~HousingInteriorTerritory();
 
diff --git a/src/world/Territory/HousingZone.cpp b/src/world/Territory/HousingZone.cpp
index 99ab1a1d..e2ee9cf6 100644
--- a/src/world/Territory/HousingZone.cpp
+++ b/src/world/Territory/HousingZone.cpp
@@ -8,6 +8,7 @@
 #include <Network/PacketDef/Zone/ServerZoneDef.h>
 #include <Network/PacketWrappers/ActorControlSelfPacket.h>
 #include <Network/CommonActorControl.h>
+#include <Service.h>
 
 #include "Actor/Player.h"
 #include "Actor/Actor.h"
@@ -20,7 +21,6 @@
 #include "Forwards.h"
 #include "HousingZone.h"
 #include "Manager/HousingMgr.h"
-#include "Framework.h"
 
 using namespace Sapphire::Common;
 using namespace Sapphire::Network::Packets;
@@ -31,13 +31,11 @@ Sapphire::HousingZone::HousingZone( uint8_t wardNum,
                                     uint16_t territoryTypeId,
                                     uint32_t guId,
                                     const std::string& internalName,
-                                    const std::string& contentName,
-                                    FrameworkPtr pFw ) :
-  Territory( territoryTypeId, guId, internalName, contentName, pFw ),
+                                    const std::string& contentName ) :
+  Territory( territoryTypeId, guId, internalName, contentName ),
   m_wardNum( wardNum ),
   m_territoryTypeId( territoryTypeId ),
-  m_landSetId( ( static_cast< uint32_t >( territoryTypeId ) << 16 ) | wardNum ),
-  m_pFw( pFw )
+  m_landSetId( ( static_cast< uint32_t >( territoryTypeId ) << 16 ) | wardNum )
 {
 
 }
@@ -45,12 +43,12 @@ Sapphire::HousingZone::HousingZone( uint8_t wardNum,
 bool Sapphire::HousingZone::init()
 {
 
-  auto pDb = m_pFw->get< Db::DbWorkerPool< Db::ZoneDbConnection > >();
+  auto& db = Common::Service< Db::DbWorkerPool< Db::ZoneDbConnection > >::ref();
   {
-    auto res = pDb->query( "SELECT * FROM landset WHERE landsetid = " + std::to_string( m_landSetId ) );
+    auto res = db.query( "SELECT * FROM landset WHERE landsetid = " + std::to_string( m_landSetId ) );
     if( !res->next() )
     {
-      pDb->directExecute( "INSERT INTO landset ( landsetid ) VALUES ( " + std::to_string( m_landSetId ) + " );" );
+      db.directExecute( "INSERT INTO landset ( landsetid ) VALUES ( " + std::to_string( m_landSetId ) + " );" );
     }
   }
 
@@ -65,8 +63,8 @@ bool Sapphire::HousingZone::init()
   else if( m_territoryTypeId == 641 )
     housingIndex = 3;
 
-  auto pExdData = m_pFw->get< Data::ExdDataGenerated >();
-  auto info = pExdData->get< Sapphire::Data::HousingLandSet >( housingIndex );
+  auto exdData = Common::Service< Data::ExdDataGenerated >::ref();
+  auto info = exdData.get< Sapphire::Data::HousingLandSet >( housingIndex );
 
   // build yard objects array indices
   int16_t cursor = -1;
@@ -114,8 +112,8 @@ bool Sapphire::HousingZone::init()
     arr.fill( obj );
   }
 
-  auto housingMgr = m_pFw->get< World::Manager::HousingMgr >();
-  auto landCache = housingMgr->getLandCacheMap();
+  auto& housingMgr = Common::Service< World::Manager::HousingMgr >::ref();
+  auto landCache = housingMgr.getLandCacheMap();
 
   // make sure the landset exists
   auto landSetCache = landCache.find( m_landSetId );
@@ -128,15 +126,15 @@ bool Sapphire::HousingZone::init()
   // init the lands
   for( HousingMgr::LandCacheEntry& entry : landSetCache->second )
   {
-    auto land = make_Land( m_territoryTypeId, getWardNum(), entry.m_landId, m_landSetId, info, m_pFw );
+    auto land = make_Land( m_territoryTypeId, getWardNum(), entry.m_landId, m_landSetId, info );
 
     // setup house
     if( entry.m_houseId )
     {
       auto house = make_House( entry.m_houseId, m_landSetId, land->getLandIdent(), entry.m_estateName,
-                               entry.m_estateComment, m_pFw );
+                               entry.m_estateComment );
 
-      housingMgr->updateHouseModels( house );
+      housingMgr.updateHouseModels( house );
       land->setHouse( house );
     }
 
@@ -325,8 +323,8 @@ Sapphire::Entity::EventObjectPtr Sapphire::HousingZone::registerEstateEntranceEO
 
 void Sapphire::HousingZone::updateYardObjects( Sapphire::Common::LandIdent ident )
 {
-  auto housingMgr = m_pFw->get< World::Manager::HousingMgr >();
-  auto& landStorage = housingMgr->getEstateInventory( ident );
+  auto& housingMgr = Common::Service< World::Manager::HousingMgr >::ref();
+  auto& landStorage = housingMgr.getEstateInventory( ident );
 
   auto yardContainer = landStorage[ InventoryType::HousingExteriorPlacedItems ];
 
@@ -339,7 +337,7 @@ void Sapphire::HousingZone::updateYardObjects( Sapphire::Common::LandIdent ident
     assert( housingItem );
 
     auto idx = item.first + arrayBounds.first;
-    m_yardObjects[ yardMapIndex ][ idx ] = housingMgr->getYardObjectForItem( housingItem );
+    m_yardObjects[ yardMapIndex ][ idx ] = housingMgr.getYardObjectForItem( housingItem );
   }
 }
 
diff --git a/src/world/Territory/HousingZone.h b/src/world/Territory/HousingZone.h
index 804624ed..112a452a 100644
--- a/src/world/Territory/HousingZone.h
+++ b/src/world/Territory/HousingZone.h
@@ -31,8 +31,7 @@ namespace Sapphire
                  uint16_t territoryTypeId,
                  uint32_t guId,
                  const std::string& internalName,
-                 const std::string& contentName,
-                 FrameworkPtr pFw );
+                 const std::string& contentName );
 
     virtual ~HousingZone() = default;
 
@@ -87,7 +86,6 @@ namespace Sapphire
 
     YardObjectSubdivisionArray m_yardObjects;
     YardObjectArrayBoundsArray m_yardObjectArrayBounds;
-    FrameworkPtr m_pFw;
   };
 
 }
diff --git a/src/world/Territory/InstanceContent.cpp b/src/world/Territory/InstanceContent.cpp
index 1f902685..2bdd3bf8 100644
--- a/src/world/Territory/InstanceContent.cpp
+++ b/src/world/Territory/InstanceContent.cpp
@@ -5,6 +5,7 @@
 #include <Util/UtilMath.h>
 #include <Exd/ExdDataGenerated.h>
 #include <Network/CommonActorControl.h>
+#include <Service.h>
 
 #include "Event/Director.h"
 #include "Event/EventDefs.h"
@@ -20,7 +21,6 @@
 #include "Event/EventHandler.h"
 
 #include "InstanceContent.h"
-#include "Framework.h"
 
 using namespace Sapphire::Common;
 using namespace Sapphire::Network::Packets;
@@ -32,9 +32,8 @@ Sapphire::InstanceContent::InstanceContent( std::shared_ptr< Sapphire::Data::Ins
                                             uint32_t guId,
                                             const std::string& internalName,
                                             const std::string& contentName,
-                                            uint32_t instanceContentId,
-                                            FrameworkPtr pFw ) :
-  Territory( static_cast< uint16_t >( territoryType ), guId, internalName, contentName, pFw ),
+                                            uint32_t instanceContentId ) :
+  Territory( static_cast< uint16_t >( territoryType ), guId, internalName, contentName ),
   Director( Event::Director::InstanceContent, instanceContentId ),
   m_instanceConfiguration( pInstanceConfiguration ),
   m_instanceContentId( instanceContentId ),
@@ -51,8 +50,8 @@ bool Sapphire::InstanceContent::init()
   if( !Territory::init() )
     return false;
 
-  auto pScriptMgr = m_pFw->get< Scripting::ScriptMgr >();
-  pScriptMgr->onInstanceInit( getAsInstanceContent() );
+  auto& scriptMgr = Common::Service< Scripting::ScriptMgr >::ref();
+  scriptMgr.onInstanceInit( getAsInstanceContent() );
 
   return true;
 }
@@ -157,8 +156,8 @@ void Sapphire::InstanceContent::onUpdate( uint64_t tickCount )
       break;
   }
 
-  auto pScriptMgr = m_pFw->get< Scripting::ScriptMgr >();
-  pScriptMgr->onInstanceUpdate( getAsInstanceContent(), tickCount );
+  auto& scriptMgr = Common::Service< Scripting::ScriptMgr >::ref();
+  scriptMgr.onInstanceUpdate( getAsInstanceContent(), tickCount );
 
   m_lastUpdate = tickCount;
 }
@@ -312,8 +311,8 @@ void Sapphire::InstanceContent::onRegisterEObj( Entity::EventObjectPtr object )
   if( object->getObjectId() == 2000182 ) // start
     m_pEntranceEObj = object;
 
-  auto pExdData = m_pFw->get< Data::ExdDataGenerated >();
-  auto objData = pExdData->get< Sapphire::Data::EObj >( object->getObjectId() );
+  auto& exdData = Common::Service< Data::ExdDataGenerated >::ref();
+  auto objData = exdData.get< Sapphire::Data::EObj >( object->getObjectId() );
   if( objData )
     // todo: data should be renamed to eventId
     m_eventIdToObjectMap[ objData->data ] = object;
@@ -385,8 +384,8 @@ void Sapphire::InstanceContent::onTalk( Sapphire::Entity::Player& player, uint32
 void
 Sapphire::InstanceContent::onEnterTerritory( Entity::Player& player, uint32_t eventId, uint16_t param1, uint16_t param2 )
 {
-  auto pScriptMgr = m_pFw->get< Scripting::ScriptMgr >();
-  pScriptMgr->onInstanceEnterTerritory( getAsInstanceContent(), player, eventId, param1, param2 );
+  auto& scriptMgr = Common::Service< Scripting::ScriptMgr >::ref();
+  scriptMgr.onInstanceEnterTerritory( getAsInstanceContent(), player, eventId, param1, param2 );
 
   if( !hasPlayerPreviouslySpawned( player ) )
   {
diff --git a/src/world/Territory/InstanceContent.h b/src/world/Territory/InstanceContent.h
index a34ac2fb..37af2446 100644
--- a/src/world/Territory/InstanceContent.h
+++ b/src/world/Territory/InstanceContent.h
@@ -28,8 +28,7 @@ namespace Sapphire
                      uint32_t guId,
                      const std::string& internalName,
                      const std::string& contentName,
-                     uint32_t instanceContentId,
-                     FrameworkPtr pFw );
+                     uint32_t instanceContentId );
 
     virtual ~InstanceContent();
 
diff --git a/src/world/Territory/InstanceObjectCache.cpp b/src/world/Territory/InstanceObjectCache.cpp
index e4e18815..202d6010 100644
--- a/src/world/Territory/InstanceObjectCache.cpp
+++ b/src/world/Territory/InstanceObjectCache.cpp
@@ -1,6 +1,5 @@
 #include "InstanceObjectCache.h"
 #include "Exd/ExdDataGenerated.h"
-#include <Framework.h>
 
 #include <datReader/DatCategories/bg/pcb.h>
 #include <datReader/DatCategories/bg/lgb.h>
@@ -13,13 +12,13 @@
 #include <Exd.h>
 
 #include <Logging/Logger.h>
+#include <Service.h>
 
-Sapphire::InstanceObjectCache::InstanceObjectCache( std::shared_ptr< Framework > pFramework ) :
-  m_pFramework( pFramework )
+Sapphire::InstanceObjectCache::InstanceObjectCache()
 {
 
-  auto pExd = pFramework->get< Sapphire::Data::ExdDataGenerated >();
-  auto idList = pExd->getTerritoryTypeIdList();
+  auto& exdData = Common::Service< Sapphire::Data::ExdDataGenerated >::ref();
+  auto idList = exdData.getTerritoryTypeIdList();
 
   size_t count = 0;
   for( const auto& id : idList )
@@ -28,7 +27,7 @@ Sapphire::InstanceObjectCache::InstanceObjectCache( std::shared_ptr< Framework >
     if( count++ % 10 == 0 )
       std::cout << ".";
 
-    auto territoryType = pExd->get< Sapphire::Data::TerritoryType >( id );
+    auto territoryType = exdData.get< Sapphire::Data::TerritoryType >( id );
     if( !territoryType )
       continue;
 
@@ -50,8 +49,8 @@ Sapphire::InstanceObjectCache::InstanceObjectCache( std::shared_ptr< Framework >
 
     try
     {
-      bgFile = pExd->getGameData()->getFile( bgLgbPath );
-      planmap_file = pExd->getGameData()->getFile( planmapLgbPath );
+      bgFile = exdData.getGameData()->getFile( bgLgbPath );
+      planmap_file = exdData.getGameData()->getFile( planmapLgbPath );
     }
     catch( std::runtime_error& )
     {
diff --git a/src/world/Territory/InstanceObjectCache.h b/src/world/Territory/InstanceObjectCache.h
index 0476adb6..efb448c4 100644
--- a/src/world/Territory/InstanceObjectCache.h
+++ b/src/world/Territory/InstanceObjectCache.h
@@ -66,7 +66,7 @@ namespace Sapphire
     using ExitRangePtr = std::shared_ptr< LGB_EXIT_RANGE_ENTRY >;
     using PopRangePtr = std::shared_ptr< LGB_POP_RANGE_ENTRY >;
 
-    explicit InstanceObjectCache( std::shared_ptr< Framework > pFramework );
+    InstanceObjectCache();
     ~InstanceObjectCache() = default;
 
     MapRangePtr getMapRange( uint16_t zoneId, uint32_t mapRangeId );
diff --git a/src/world/Territory/Land.cpp b/src/world/Territory/Land.cpp
index bb11a578..fe7f8771 100644
--- a/src/world/Territory/Land.cpp
+++ b/src/world/Territory/Land.cpp
@@ -12,6 +12,7 @@
 
 #include <Network/GamePacket.h>
 #include <Network/PacketDef/Zone/ServerZoneDef.h>
+#include <Service.h>
 
 #include "Actor/Player.h"
 #include "Inventory/ItemContainer.h"
@@ -21,13 +22,12 @@
 
 #include "Forwards.h"
 #include "Land.h"
-#include "Framework.h"
 #include "House.h"
 
 using namespace Sapphire::Common;
 
 Sapphire::Land::Land( uint16_t territoryTypeId, uint8_t wardNum, uint8_t landId, uint32_t landSetId,
-                      Sapphire::Data::HousingLandSetPtr info, FrameworkPtr pFw ) :
+                      Sapphire::Data::HousingLandSetPtr info ) :
   m_currentPrice( 0 ),
   m_minPrice( 0 ),
   m_nextDrop( Util::getTimeSeconds() + 21600 ),
@@ -38,8 +38,7 @@ Sapphire::Land::Land( uint16_t territoryTypeId, uint8_t wardNum, uint8_t landId,
   m_fcIcon( 0 ),
   m_fcIconColor( 0 ),
   m_fcId( 0 ),
-  m_iconAddIcon( 0 ),
-  m_pFw( pFw )
+  m_iconAddIcon( 0 )
 {
   memset( &m_tag, 0x00, 3 );
 
@@ -63,8 +62,8 @@ void Sapphire::Land::init( Common::LandType type, Common::HouseSize size, Common
   m_currentPrice = currentPrice;
   m_ownerId = ownerId;
 
-  auto pExdData = m_pFw->get< Data::ExdDataGenerated >();
-  auto info = pExdData->get< Sapphire::Data::HousingMapMarkerInfo >( m_landIdent.territoryTypeId, m_landIdent.landId );
+  auto& exdData = Common::Service< Data::ExdDataGenerated >::ref();
+  auto info = exdData.get< Sapphire::Data::HousingMapMarkerInfo >( m_landIdent.territoryTypeId, m_landIdent.landId );
   if( info )
   {
     m_mapMarkerPosition.x = info->x;
@@ -211,15 +210,15 @@ void Sapphire::Land::updateLandDb()
     houseId = getHouse()->getId();
 
   // todo: change to prepared statement
-  auto pDb = m_pFw->get< Db::DbWorkerPool< Db::ZoneDbConnection > >();
-  pDb->directExecute( "UPDATE land SET status = " + std::to_string( m_state )
-                      + ", LandPrice = " + std::to_string( getCurrentPrice() )
-                      + ", UpdateTime = " + std::to_string( getDevaluationTime() )
-                      + ", OwnerId = " + std::to_string( getOwnerId() )
-                      + ", HouseId = " + std::to_string( houseId )
-                      + ", Type = " + std::to_string( static_cast< uint32_t >( m_type ) ) //TODO: add house id
+  auto& db = Common::Service< Db::DbWorkerPool< Db::ZoneDbConnection > >::ref();
+  db.directExecute( "UPDATE land SET status = " + std::to_string( m_state )
+                     + ", LandPrice = " + std::to_string( getCurrentPrice() )
+                     + ", UpdateTime = " + std::to_string( getDevaluationTime() )
+                     + ", OwnerId = " + std::to_string( getOwnerId() )
+                     + ", HouseId = " + std::to_string( houseId )
+                     + ", Type = " + std::to_string( static_cast< uint32_t >( m_type ) ) //TODO: add house id
                       + " WHERE LandSetId = " + std::to_string( m_landSetId )
-                      + " AND LandId = " + std::to_string( m_landIdent.landId ) + ";" );
+                     + " AND LandId = " + std::to_string( m_landIdent.landId ) + ";" );
 
   if( auto house = getHouse() )
     house->updateHouseDb();
diff --git a/src/world/Territory/Land.h b/src/world/Territory/Land.h
index 213cfe3c..48f696e2 100644
--- a/src/world/Territory/Land.h
+++ b/src/world/Territory/Land.h
@@ -16,7 +16,7 @@ namespace Sapphire
   public:
 
     Land( uint16_t zoneId, uint8_t wardNum, uint8_t landId, uint32_t landSetId,
-          Sapphire::Data::HousingLandSetPtr info, FrameworkPtr pFw );
+          Sapphire::Data::HousingLandSetPtr info );
     virtual ~Land();
     void init( Common::LandType type, Common::HouseSize size, Common::HouseStatus state, uint32_t currentPrice, uint64_t ownerId, uint64_t houseId );
 
@@ -100,8 +100,6 @@ namespace Sapphire
     //information
     char fcTag[7];
     uint8_t m_tag[3];
-
-    FrameworkPtr m_pFw;
   };
 
 }
diff --git a/src/world/Territory/QuestBattle.cpp b/src/world/Territory/QuestBattle.cpp
index a5dd3a0a..7db97014 100644
--- a/src/world/Territory/QuestBattle.cpp
+++ b/src/world/Territory/QuestBattle.cpp
@@ -5,6 +5,7 @@
 #include <Util/UtilMath.h>
 #include <Exd/ExdDataGenerated.h>
 #include <Network/CommonActorControl.h>
+#include <Service.h>
 
 #include "Event/Director.h"
 #include "Event/EventDefs.h"
@@ -22,7 +23,6 @@
 #include "Event/EventHandler.h"
 
 #include "QuestBattle.h"
-#include "Framework.h"
 
 using namespace Sapphire::Common;
 using namespace Sapphire::Network::Packets;
@@ -34,9 +34,8 @@ Sapphire::QuestBattle::QuestBattle( std::shared_ptr< Sapphire::Data::QuestBattle
                                     uint32_t guId,
                                     const std::string& internalName,
                                     const std::string& contentName,
-                                    uint32_t questBattleId,
-                                    FrameworkPtr pFw ) :
-  Territory( static_cast< uint16_t >( territoryType ), guId, internalName, contentName, pFw ),
+                                    uint32_t questBattleId ) :
+  Territory( static_cast< uint16_t >( territoryType ), guId, internalName, contentName ),
   Director( Event::Director::QuestBattle, questBattleId ),
   m_pBattleDetails( pBattleDetails ),
   m_questBattleId( questBattleId ),
@@ -51,8 +50,8 @@ bool Sapphire::QuestBattle::init()
   if( !Territory::init() )
     return false;
 
-  auto pScriptMgr = m_pFw->get< Scripting::ScriptMgr >();
-  pScriptMgr->onInstanceInit( getAsQuestBattle() );
+  auto& scriptMgr = Common::Service< Scripting::ScriptMgr >::ref();
+  scriptMgr.onInstanceInit( getAsQuestBattle() );
 
   return true;
 }
@@ -101,6 +100,8 @@ void Sapphire::QuestBattle::onUpdate( uint64_t tickCount )
   if( !m_pPlayer )
     return;
 
+  auto& scriptMgr = Common::Service< Scripting::ScriptMgr >::ref();
+
   switch( m_state )
   {
     case Created:
@@ -122,8 +123,8 @@ void Sapphire::QuestBattle::onUpdate( uint64_t tickCount )
         return;
 
       onEnterSceneFinish( *m_pPlayer );
-      auto pScriptMgr = m_pFw->get< Scripting::ScriptMgr >();
-      pScriptMgr->onDutyCommence( *this, *m_pPlayer );
+
+      scriptMgr.onDutyCommence( *this, *m_pPlayer );
 
       m_state = DutyInProgress;
       m_instanceExpireTime = Util::getTimeSeconds() + ( m_pBattleDetails->timeLimit * 60u );
@@ -157,8 +158,7 @@ void Sapphire::QuestBattle::onUpdate( uint64_t tickCount )
     }
   }
 
-  auto pScriptMgr = m_pFw->get< Scripting::ScriptMgr >();
-  pScriptMgr->onInstanceUpdate( getAsQuestBattle(), tickCount );
+  scriptMgr.onInstanceUpdate( getAsQuestBattle(), tickCount );
 
   m_lastUpdate = tickCount;
 }
@@ -285,8 +285,8 @@ void Sapphire::QuestBattle::onRegisterEObj( Entity::EventObjectPtr object )
   if( object->getName() != "none" )
     m_eventObjectMap[ object->getName() ] = object;
 
-  auto pExdData = m_pFw->get< Data::ExdDataGenerated >();
-  auto objData = pExdData->get< Sapphire::Data::EObj >( object->getObjectId() );
+  auto& exdData = Common::Service< Data::ExdDataGenerated >::ref();
+  auto objData = exdData.get< Sapphire::Data::EObj >( object->getObjectId() );
   if( objData )
     // todo: data should be renamed to eventId
     m_eventIdToObjectMap[ objData->data ] = object;
@@ -305,8 +305,9 @@ void Sapphire::QuestBattle::onBeforePlayerZoneIn( Sapphire::Entity::Player& play
 {
   player.setRot( PI );
   player.setPos( { 0.f, 0.f, 0.f } );
-  auto pScriptMgr = m_pFw->get< Scripting::ScriptMgr >();
-  pScriptMgr->onPlayerSetup( *this, player );
+
+  auto& scriptMgr = Common::Service< Scripting::ScriptMgr >::ref();
+  scriptMgr.onPlayerSetup( *this, player );
 
   player.resetObjSpawnIndex();
 }
@@ -338,8 +339,8 @@ void Sapphire::QuestBattle::onTalk( Sapphire::Entity::Player& player, uint32_t e
 void
 Sapphire::QuestBattle::onEnterTerritory( Entity::Player& player, uint32_t eventId, uint16_t param1, uint16_t param2 )
 {
-  auto pScriptMgr = m_pFw->get< Scripting::ScriptMgr >();
-  pScriptMgr->onInstanceEnterTerritory( getAsQuestBattle(), player, eventId, param1, param2 );
+  auto& scriptMgr = Common::Service< Scripting::ScriptMgr >::ref();
+  scriptMgr.onInstanceEnterTerritory( getAsQuestBattle(), player, eventId, param1, param2 );
 }
 
 void Sapphire::QuestBattle::clearDirector( Entity::Player& player )
@@ -364,8 +365,10 @@ void Sapphire::QuestBattle::success()
                         [ & ]( Entity::Player& player, const Event::SceneResult& result )
                         {
                           player.eventFinish( getDirectorId(), 1 );
-                          auto pScriptMgr = m_pFw->get< Scripting::ScriptMgr >();
-                          pScriptMgr->onDutyComplete( getAsQuestBattle(), *m_pPlayer );
+
+                          auto& scriptMgr = Common::Service< Scripting::ScriptMgr >::ref();
+                          scriptMgr.onDutyComplete( getAsQuestBattle(), *m_pPlayer );
+
                           player.exitInstance();
                         } );
 
diff --git a/src/world/Territory/QuestBattle.h b/src/world/Territory/QuestBattle.h
index 4553fe06..899a6c6a 100644
--- a/src/world/Territory/QuestBattle.h
+++ b/src/world/Territory/QuestBattle.h
@@ -20,8 +20,7 @@ namespace Sapphire
                  uint32_t guId,
                  const std::string& internalName,
                  const std::string& contentName,
-                 uint32_t questBattleId,
-                 FrameworkPtr pFw );
+                 uint32_t questBattleId );
 
     virtual ~QuestBattle() = default;
 
diff --git a/src/world/Territory/Territory.cpp b/src/world/Territory/Territory.cpp
index 07a6269f..a2e71d4d 100644
--- a/src/world/Territory/Territory.cpp
+++ b/src/world/Territory/Territory.cpp
@@ -41,7 +41,6 @@
 #include "ForwardsZone.h"
 #include "ServerMgr.h"
 #include "CellHandler.h"
-#include "Framework.h"
 
 #include "Manager/RNGMgr.h"
 #include "Manager/NaviMgr.h"
@@ -67,16 +66,14 @@ Sapphire::Territory::Territory() :
 }
 
 Sapphire::Territory::Territory( uint16_t territoryTypeId, uint32_t guId,
-                                const std::string& internalName, const std::string& placeName,
-                                FrameworkPtr pFw ) :
+                                const std::string& internalName, const std::string& placeName ) :
   m_currentWeather( Weather::FairSkies ),
   m_nextEObjId( 0x400D0000 ),
   m_nextActorId( 0x500D0000 ),
-  m_pFw( pFw ),
   m_lastUpdate( 0 ),
   m_lastActivityTime( Util::getTimeMs() )
 {
-  auto pExdData = m_pFw->get< Data::ExdDataGenerated >();
+  auto& exdData = Common::Service< Data::ExdDataGenerated >::ref();
   m_guId = guId;
 
   m_territoryTypeId = territoryTypeId;
@@ -85,7 +82,7 @@ Sapphire::Territory::Territory( uint16_t territoryTypeId, uint32_t guId,
   m_lastMobUpdate = 0;
 
   m_weatherOverride = Weather::None;
-  m_territoryTypeInfo = pExdData->get< Sapphire::Data::TerritoryType >( territoryTypeId );
+  m_territoryTypeInfo = exdData.get< Sapphire::Data::TerritoryType >( territoryTypeId );
   m_bgPath = m_territoryTypeInfo->bg;
 
   loadWeatherRates();
@@ -99,13 +96,13 @@ void Sapphire::Territory::loadWeatherRates()
   if( !m_territoryTypeInfo )
     return;
 
-  auto pExdData = m_pFw->get< Data::ExdDataGenerated >();
+  auto& exdData = Common::Service< Data::ExdDataGenerated >::ref();
 
-  uint8_t weatherRateId = m_territoryTypeInfo->weatherRate > pExdData->getWeatherRateIdList().size() ?
+  uint8_t weatherRateId = m_territoryTypeInfo->weatherRate > exdData.getWeatherRateIdList().size() ?
                           uint8_t{ 0 } : m_territoryTypeInfo->weatherRate;
 
   uint8_t sumPc = 0;
-  auto weatherRateFields = pExdData->m_WeatherRateDat.get_row( weatherRateId );
+  auto weatherRateFields = exdData.m_WeatherRateDat.get_row( weatherRateId );
   for( size_t i = 0; i < 16; )
   {
     int32_t weatherId = std::get< int32_t >( weatherRateFields[ i ] );
@@ -123,17 +120,17 @@ Sapphire::Territory::~Territory() = default;
 
 bool Sapphire::Territory::init()
 {
-  auto pScriptMgr = m_pFw->get< Scripting::ScriptMgr >();
+  auto& scriptMgr = Common::Service< Scripting::ScriptMgr >::ref();
 
-  if( pScriptMgr->onZoneInit( shared_from_this() ) )
+  if( scriptMgr.onZoneInit( shared_from_this() ) )
   {
     // all good
   }
 
-  auto pNaviMgr = m_pFw->get< World::Manager::NaviMgr >();
-  pNaviMgr->setupTerritory( m_territoryTypeInfo->bg );
+  auto& naviMgr = Common::Service< World::Manager::NaviMgr >::ref();
+  naviMgr.setupTerritory( m_territoryTypeInfo->bg );
 
-  m_pNaviProvider = pNaviMgr->getNaviProvider( m_territoryTypeInfo->bg );
+  m_pNaviProvider = naviMgr.getNaviProvider( m_territoryTypeInfo->bg );
 
   if( !m_pNaviProvider )
   {
@@ -315,8 +312,8 @@ void Sapphire::Territory::removeActor( Entity::ActorPtr pActor )
 void Sapphire::Territory::queuePacketForRange( Entity::Player& sourcePlayer, uint32_t range,
                                           Network::Packets::FFXIVPacketBasePtr pPacketEntry )
 {
-  auto pTeriMgr = m_pFw->get< TerritoryMgr >();
-  if( pTeriMgr->isPrivateTerritory( getTerritoryTypeId() ) )
+  auto& teriMgr = Common::Service< TerritoryMgr >::ref();
+  if( teriMgr.isPrivateTerritory( getTerritoryTypeId() ) )
     return;
 
   auto& serverMgr = Common::Service< World::ServerMgr >::ref();
@@ -342,8 +339,8 @@ void Sapphire::Territory::queuePacketForZone( Entity::Player& sourcePlayer,
                                          Network::Packets::FFXIVPacketBasePtr pPacketEntry,
                                          bool forSelf )
 {
-  auto pTeriMgr = m_pFw->get< TerritoryMgr >();
-  if( pTeriMgr->isPrivateTerritory( getTerritoryTypeId() ) )
+  auto& teriMgr = Common::Service< TerritoryMgr >::ref();
+  if( teriMgr.isPrivateTerritory( getTerritoryTypeId() ) )
     return;
 
   auto& serverMgr = Common::Service< World::ServerMgr >::ref();
@@ -686,14 +683,14 @@ void Sapphire::Territory::updateInRangeSet( Entity::ActorPtr pActor, Cell* pCell
   if( pCell == nullptr )
     return;
 
-  auto pTeriMgr = m_pFw->get< TerritoryMgr >();
+  auto& teriMgr = Common::Service< TerritoryMgr >::ref();
   // TODO: make sure gms can overwrite this. Potentially temporary solution
-  if( pTeriMgr->isPrivateTerritory( getTerritoryTypeId() ) )
+  if( teriMgr.isPrivateTerritory( getTerritoryTypeId() ) )
     return;
 
   auto iter = pCell->m_actors.begin();
 
-  float fRange = pTeriMgr->getInRangeDistance();
+  float fRange = teriMgr.getInRangeDistance();
   int32_t count = 0;
   while( iter != pCell->m_actors.end() )
   {
@@ -822,10 +819,10 @@ Sapphire::Data::TerritoryTypePtr Sapphire::Territory::getTerritoryTypeInfo() con
 
 bool Sapphire::Territory::loadSpawnGroups()
 {
-  auto pDb = m_pFw->get< Db::DbWorkerPool< Db::ZoneDbConnection > >();
-  auto stmt = pDb->getPreparedStatement( Db::ZoneDbStatements::ZONE_SEL_SPAWNGROUPS );
+  auto& db = Common::Service< Db::DbWorkerPool< Db::ZoneDbConnection > >::ref();
+  auto stmt = db.getPreparedStatement( Db::ZoneDbStatements::ZONE_SEL_SPAWNGROUPS );
   stmt->setUInt( 1, getTerritoryTypeId() );
-  auto res = pDb->query( stmt );
+  auto res = db.query( stmt );
 
   while( res->next() )
   {
@@ -842,11 +839,11 @@ bool Sapphire::Territory::loadSpawnGroups()
   res.reset();
   stmt.reset();
 
-  stmt = pDb->getPreparedStatement( Db::ZoneDbStatements::ZONE_SEL_SPAWNPOINTS );
+  stmt = db.getPreparedStatement( Db::ZoneDbStatements::ZONE_SEL_SPAWNPOINTS );
   for( auto& group : m_spawnGroups )
   {
     stmt->setUInt( 1, group.getId() );
-    auto res = pDb->query( stmt );
+    auto res = db.query( stmt );
 
     while( res->next() )
     {
@@ -867,8 +864,8 @@ bool Sapphire::Territory::loadSpawnGroups()
 
 void Sapphire::Territory::updateSpawnPoints()
 {
-  auto pRNGMgr = m_pFw->get< World::Manager::RNGMgr >();
-  auto rng = pRNGMgr->getRandGenerator< float >( 0.f, PI * 2 );
+  auto& RNGMgr = Common::Service< World::Manager::RNGMgr >::ref();
+  auto rng = RNGMgr.getRandGenerator< float >( 0.f, PI * 2 );
 
   for( auto& group : m_spawnGroups )
   {
@@ -893,7 +890,7 @@ void Sapphire::Territory::updateSpawnPoints()
                                                        point->getPosZ(),
                                                        rng.next(),
                                                        group.getLevel(),
-                                                       group.getMaxHp(), shared_from_this(), m_pFw );
+                                                       group.getMaxHp(), shared_from_this() );
         point->setLinkedBNpc( pBNpc );
 
         pushActor( pBNpc );
@@ -918,8 +915,8 @@ Sapphire::Entity::BNpcPtr
                                             uint32_t hp, uint16_t nameId, uint32_t directorId,
                                             uint8_t bnpcType )
 {
-  auto pExdData = m_pFw->get< Data::ExdDataGenerated >();
-  auto levelData = pExdData->get< Sapphire::Data::Level >( levelId );
+  auto& exdData = Common::Service< Data::ExdDataGenerated >::ref();
+  auto levelData = exdData.get< Sapphire::Data::Level >( levelId );
   if( !levelData )
     return nullptr;
 
@@ -928,7 +925,7 @@ Sapphire::Entity::BNpcPtr
 
   auto bnpcBaseId = levelData->object;
 
-  auto bnpcBaseData = pExdData->get< Sapphire::Data::BNpcBase >( bnpcBaseId );
+  auto bnpcBaseData = exdData.get< Sapphire::Data::BNpcBase >( bnpcBaseId );
   if( !bnpcBaseData )
     return nullptr;
 
@@ -940,7 +937,7 @@ Sapphire::Entity::BNpcPtr
   std::vector< uint8_t > customize( 26 );
   if( bnpcBaseData->bNpcCustomize != 0 )
   {
-    auto bnpcCustomizeData = pExdData->get< Sapphire::Data::BNpcCustomize >( bnpcBaseData->bNpcCustomize );
+    auto bnpcCustomizeData = exdData.get< Sapphire::Data::BNpcCustomize >( bnpcBaseData->bNpcCustomize );
     if( bnpcCustomizeData )
     {
       customize[0] = bnpcCustomizeData->race;
@@ -977,7 +974,7 @@ Sapphire::Entity::BNpcPtr
   uint64_t modeloff = 0;
   if( bnpcBaseData->npcEquip != 0 )
   {
-    auto npcEquipData = pExdData->get< Sapphire::Data::NpcEquip >( bnpcBaseData->npcEquip );
+    auto npcEquipData = exdData.get< Sapphire::Data::NpcEquip >( bnpcBaseData->npcEquip );
     if( npcEquipData )
     {
       modelMain = npcEquipData->modelMainHand;
@@ -1000,7 +997,7 @@ Sapphire::Entity::BNpcPtr
                                                        bnpcBaseData->modelChara, 0, &models[0], &customize[0] );
 
   auto bnpc = std::make_shared< Entity::BNpc >( getNextActorId(), tmp, levelData->x, levelData->y, levelData->z,
-                                                levelData->yaw, level, hp, shared_from_this(), m_pFw );
+                                                levelData->yaw, level, hp, shared_from_this() );
 
   bnpc->setDirectorId( directorId );
   bnpc->setLevelId( levelId );
diff --git a/src/world/Territory/Territory.h b/src/world/Territory/Territory.h
index 34258d29..47aa51ae 100644
--- a/src/world/Territory/Territory.h
+++ b/src/world/Territory/Territory.h
@@ -58,7 +58,6 @@ namespace Sapphire
 
     uint32_t m_nextEObjId;
     uint32_t m_nextActorId;
-    FrameworkPtr m_pFw;
 
     std::vector< Entity::SpawnGroup > m_spawnGroups;
 
@@ -71,7 +70,7 @@ namespace Sapphire
     Territory();
 
     Territory( uint16_t territoryTypeId, uint32_t guId, const std::string& internalName,
-               const std::string& placeName, FrameworkPtr pFw );
+               const std::string& placeName );
 
     virtual ~Territory();
 
diff --git a/src/world/mainGameServer.cpp b/src/world/mainGameServer.cpp
index 93f3d139..a8f29f3d 100644
--- a/src/world/mainGameServer.cpp
+++ b/src/world/mainGameServer.cpp
@@ -1,7 +1,6 @@
 #include <iostream>
 
 #include "ServerMgr.h"
-#include <Framework.h>
 
 #include <Util/CrashHandler.h>
 #include <Service.h>
@@ -14,8 +13,7 @@ Common::Util::CrashHandler crashHandler;
 
 int main( int32_t argc, char* argv[] )
 {
-  auto pFramework = make_Framework();
-  auto pServer = std::make_shared< ServerMgr >( "world.ini", pFramework );
+  auto pServer = std::make_shared< ServerMgr >( "world.ini" );
 
   Common::Service< ServerMgr >::set( pServer );
 

From f10d7938d71f01ab09966d82d437b87eaeaa2549 Mon Sep 17 00:00:00 2001
From: NotAdam <adam@notadam.me>
Date: Sun, 1 Mar 2020 01:09:33 +1100
Subject: [PATCH 270/351] fix lobby gameconnection

---
 src/lobby/Forwards.h         | 5 -----
 src/lobby/GameConnection.cpp | 7 +++----
 src/lobby/GameConnection.h   | 2 +-
 src/lobby/ServerLobby.cpp    | 3 +--
 src/world/ForwardsZone.h     | 1 -
 5 files changed, 5 insertions(+), 13 deletions(-)

diff --git a/src/lobby/Forwards.h b/src/lobby/Forwards.h
index 1f54bcc7..2e2d4e36 100644
--- a/src/lobby/Forwards.h
+++ b/src/lobby/Forwards.h
@@ -12,11 +12,6 @@ x ## Ptr make_ ## x( Args &&...args ) { \
 return std::make_shared< x >( std::forward< Args >( args ) ... ); }\
 typedef std::vector< x > x ## PtrList;
 
-namespace Sapphire
-{
-  TYPE_FORWARD( Framework );
-}
-
 namespace Sapphire::Lobby
 {
   TYPE_FORWARD( LobbySession );
diff --git a/src/lobby/GameConnection.cpp b/src/lobby/GameConnection.cpp
index b3d85ddb..6bc2e174 100644
--- a/src/lobby/GameConnection.cpp
+++ b/src/lobby/GameConnection.cpp
@@ -25,9 +25,8 @@ extern Lobby::ServerLobby g_serverLobby;
 extern Lobby::RestConnector g_restConnector;
 
 Lobby::GameConnection::GameConnection( Sapphire::Network::HivePtr pHive,
-                                                Sapphire::Network::AcceptorPtr pAcceptor,
-                                                FrameworkPtr pFw ) :
-  Sapphire::Network::Connection( pHive, pFw ),
+                                                Sapphire::Network::AcceptorPtr pAcceptor ) :
+  Sapphire::Network::Connection( pHive ),
   m_pAcceptor( pAcceptor ),
   m_bEncryptionInitialized( false )
 {
@@ -42,7 +41,7 @@ Lobby::GameConnection::~GameConnection()
 // overwrite the parents onConnect for our game socket needs
 void Lobby::GameConnection::onAccept( const std::string& host, uint16_t port )
 {
-  auto connection = make_GameConnection( m_hive, m_pAcceptor, m_pFw );
+  auto connection = make_GameConnection( m_hive, m_pAcceptor );
   m_pAcceptor->accept( connection );
 
   Logger::info( "Connect from {0}", m_socket.remote_endpoint().address().to_string() );
diff --git a/src/lobby/GameConnection.h b/src/lobby/GameConnection.h
index fbed9386..a98c01c5 100644
--- a/src/lobby/GameConnection.h
+++ b/src/lobby/GameConnection.h
@@ -41,7 +41,7 @@ namespace Sapphire::Lobby
     std::vector< uint8_t > m_packets;
 
   public:
-    GameConnection( Network::HivePtr pHive, Network::AcceptorPtr pAcceptor, FrameworkPtr pFw );
+    GameConnection( Network::HivePtr pHive, Network::AcceptorPtr pAcceptor );
 
     ~GameConnection();
 
diff --git a/src/lobby/ServerLobby.cpp b/src/lobby/ServerLobby.cpp
index 1ad5e068..97a252fa 100644
--- a/src/lobby/ServerLobby.cpp
+++ b/src/lobby/ServerLobby.cpp
@@ -64,9 +64,8 @@ namespace Sapphire::Lobby
 
     Logger::setLogLevel( m_config.global.general.logLevel );
 
-    auto pFw = make_Framework();
     auto hive = Network::make_Hive();
-    Network::addServerToHive< GameConnection >( m_ip, m_port, hive, pFw );
+    Network::addServerToHive< GameConnection >( m_ip, m_port, hive );
 
     Logger::info( "Lobby server running on {0}:{1}", m_ip, m_port );
 
diff --git a/src/world/ForwardsZone.h b/src/world/ForwardsZone.h
index db366d35..13b6b489 100644
--- a/src/world/ForwardsZone.h
+++ b/src/world/ForwardsZone.h
@@ -29,7 +29,6 @@ TYPE_FORWARD( ItemContainer );
 TYPE_FORWARD( ZonePosition );
 TYPE_FORWARD( Land );
 TYPE_FORWARD( Linkshell );
-TYPE_FORWARD( Framework );
 
 namespace World
 {

From 894c1016afa36f41e51ed36028372363f5f1e12c Mon Sep 17 00:00:00 2001
From: NotAdam <adam@notadam.me>
Date: Sun, 1 Mar 2020 11:57:41 +1100
Subject: [PATCH 271/351] fix quest_parser to use new service locator

---
 src/scripts/common/aethernet/Aetheryte.cpp          | 2 +-
 src/scripts/common/warptaxi/WarpTaxi.cpp            | 2 +-
 src/scripts/quest/ManFst001.cpp                     | 2 +-
 src/scripts/quest/ManFst002.cpp                     | 2 +-
 src/scripts/quest/ManFst003.cpp                     | 2 +-
 src/scripts/quest/ManFst004.cpp                     | 2 +-
 src/scripts/quest/ManFst005.cpp                     | 2 +-
 src/scripts/quest/ManSea001.cpp                     | 2 +-
 src/scripts/quest/ManSea002.cpp                     | 2 +-
 src/scripts/quest/ManSea003.cpp                     | 2 +-
 src/scripts/quest/ManWil001.cpp                     | 2 +-
 src/scripts/quest/ManWil002.cpp                     | 2 +-
 src/scripts/quest/ManWil003.cpp                     | 2 +-
 src/scripts/quest/ManWil004.cpp                     | 2 +-
 src/scripts/quest/subquest/gridania/SubFst002.cpp   | 2 +-
 src/scripts/quest/subquest/gridania/SubFst004.cpp   | 2 +-
 src/scripts/quest/subquest/gridania/SubFst009.cpp   | 2 +-
 src/scripts/quest/subquest/gridania/SubFst010.cpp   | 2 +-
 src/scripts/quest/subquest/gridania/SubFst013.cpp   | 4 ++--
 src/scripts/quest/subquest/gridania/SubFst014.cpp   | 2 +-
 src/scripts/quest/subquest/gridania/SubFst019.cpp   | 2 +-
 src/scripts/quest/subquest/gridania/SubFst029.cpp   | 2 +-
 src/scripts/quest/subquest/gridania/SubFst039.cpp   | 2 +-
 src/scripts/quest/subquest/limsa/SubSea001.cpp      | 2 +-
 src/scripts/quest/subquest/limsa/SubSea012.cpp      | 2 +-
 src/scripts/quest/subquest/uldah/SubWil000.cpp      | 2 +-
 src/scripts/quest/subquest/uldah/SubWil001.cpp      | 2 +-
 src/scripts/quest/subquest/uldah/SubWil002.cpp      | 2 +-
 src/scripts/quest/subquest/uldah/SubWil004.cpp      | 2 +-
 src/scripts/quest/subquest/uldah/SubWil006.cpp      | 2 +-
 src/scripts/quest/subquest/uldah/SubWil007.cpp      | 4 ++--
 src/scripts/quest/subquest/uldah/SubWil018.cpp      | 2 +-
 src/scripts/quest/subquest/uldah/SubWil019.cpp      | 2 +-
 src/scripts/quest/subquest/uldah/SubWil020.cpp      | 2 +-
 src/scripts/quest/subquest/uldah/SubWil021.cpp      | 2 +-
 src/scripts/quest/subquest/uldah/SubWil022.cpp      | 2 +-
 src/scripts/quest/subquest/uldah/SubWil027.cpp      | 2 +-
 src/scripts/quest/subquest/uldah/SubWil028.cpp      | 2 +-
 src/scripts/quest/subquest/uldah/SubWil029.cpp      | 2 +-
 src/tools/quest_parser/main.cpp                     | 8 ++++----
 src/world/Actor/PlayerInventory.cpp                 | 2 +-
 src/world/Manager/DebugCommandMgr.cpp               | 2 +-
 src/world/Manager/HousingMgr.cpp                    | 2 +-
 src/world/Network/Handlers/ClientTriggerHandler.cpp | 2 +-
 src/world/Territory/HousingZone.cpp                 | 2 +-
 45 files changed, 50 insertions(+), 50 deletions(-)

diff --git a/src/scripts/common/aethernet/Aetheryte.cpp b/src/scripts/common/aethernet/Aetheryte.cpp
index d4c1c68c..64acd0c5 100644
--- a/src/scripts/common/aethernet/Aetheryte.cpp
+++ b/src/scripts/common/aethernet/Aetheryte.cpp
@@ -108,7 +108,7 @@ public:
 
   void onTalk( uint32_t eventId, Entity::Player& player, uint64_t actorId ) override
   {
-    auto exdData = Common::Service< Sapphire::Data::ExdDataGenerated >::ref();
+    auto& exdData = Common::Service< Sapphire::Data::ExdDataGenerated >::ref();
 
     auto aetherInfo = exdData.get< Sapphire::Data::Aetheryte >( eventId & 0xFFFF );
     if( !aetherInfo )
diff --git a/src/scripts/common/warptaxi/WarpTaxi.cpp b/src/scripts/common/warptaxi/WarpTaxi.cpp
index c4eb8907..8d88f6f4 100644
--- a/src/scripts/common/warptaxi/WarpTaxi.cpp
+++ b/src/scripts/common/warptaxi/WarpTaxi.cpp
@@ -75,7 +75,7 @@ public:
 
   void onTalk( uint32_t eventId, Entity::Player& player, uint64_t actorId ) override
   {
-    auto exdData = Common::Service< Sapphire::Data::ExdDataGenerated >::ref();
+    auto& exdData = Common::Service< Sapphire::Data::ExdDataGenerated >::ref();
 
     auto warp = exdData.get< Sapphire::Data::Warp >( eventId );
     if( !warp )
diff --git a/src/scripts/quest/ManFst001.cpp b/src/scripts/quest/ManFst001.cpp
index d21feff1..684b77f8 100644
--- a/src/scripts/quest/ManFst001.cpp
+++ b/src/scripts/quest/ManFst001.cpp
@@ -96,7 +96,7 @@ public:
 
   void onTalk( uint32_t eventId, Entity::Player& player, uint64_t actorId ) override
   {
-    auto pEventMgr = Common::Service< World::Manager::EventMgr >::ref();
+    auto& pEventMgr = Common::Service< World::Manager::EventMgr >::ref();
     auto actor = pEventMgr.mapEventActorToRealActor( static_cast< uint32_t >( actorId ) );
 
     if( actor == ACTOR0 )
diff --git a/src/scripts/quest/ManFst002.cpp b/src/scripts/quest/ManFst002.cpp
index a12c0929..0d0a114a 100644
--- a/src/scripts/quest/ManFst002.cpp
+++ b/src/scripts/quest/ManFst002.cpp
@@ -193,7 +193,7 @@ public:
 
   void onTalk( uint32_t eventId, Entity::Player& player, uint64_t actorId ) override
   {
-    auto pEventMgr = Common::Service< World::Manager::EventMgr >::ref();
+    auto& pEventMgr = Common::Service< World::Manager::EventMgr >::ref();
     auto actor = pEventMgr.mapEventActorToRealActor( static_cast< uint32_t >( actorId ) );
 
     if( actor == ACTOR0 )
diff --git a/src/scripts/quest/ManFst003.cpp b/src/scripts/quest/ManFst003.cpp
index 5cb09efc..e3bc085e 100644
--- a/src/scripts/quest/ManFst003.cpp
+++ b/src/scripts/quest/ManFst003.cpp
@@ -82,7 +82,7 @@ public:
 
   void onTalk( uint32_t eventId, Entity::Player& player, uint64_t actorId ) override
   {
-    auto pEventMgr = Common::Service< World::Manager::EventMgr >::ref();
+    auto& pEventMgr = Common::Service< World::Manager::EventMgr >::ref();
     auto actor = pEventMgr.mapEventActorToRealActor( static_cast< uint32_t >( actorId ) );
 
     if( actor == Actor0 )
diff --git a/src/scripts/quest/ManFst004.cpp b/src/scripts/quest/ManFst004.cpp
index cbb04d36..79168cb3 100644
--- a/src/scripts/quest/ManFst004.cpp
+++ b/src/scripts/quest/ManFst004.cpp
@@ -80,7 +80,7 @@ public:
 
   void onTalk( uint32_t eventId, Entity::Player& player, uint64_t actorId ) override
   {
-    auto pEventMgr = Common::Service< World::Manager::EventMgr >::ref();
+    auto& pEventMgr = Common::Service< World::Manager::EventMgr >::ref();
     auto actor = pEventMgr.mapEventActorToRealActor( static_cast< uint32_t >( actorId ) );
 
     if( actor == ManFst004::Actor0 )
diff --git a/src/scripts/quest/ManFst005.cpp b/src/scripts/quest/ManFst005.cpp
index d98391ce..f9177bf8 100644
--- a/src/scripts/quest/ManFst005.cpp
+++ b/src/scripts/quest/ManFst005.cpp
@@ -61,7 +61,7 @@ class ManFst005 : public Sapphire::ScriptAPI::EventScript
    // Event Handlers
    void onTalk( uint32_t eventId, Entity::Player& player, uint64_t actorId ) override
    {
-     auto pEventMgr = Common::Service< World::Manager::EventMgr >::ref();
+     auto& pEventMgr = Common::Service< World::Manager::EventMgr >::ref();
      auto actor = pEventMgr.mapEventActorToRealActor( static_cast< uint32_t >( actorId ) );
 
      if( actor == Actor0 )
diff --git a/src/scripts/quest/ManSea001.cpp b/src/scripts/quest/ManSea001.cpp
index b86751cb..ddad3d00 100644
--- a/src/scripts/quest/ManSea001.cpp
+++ b/src/scripts/quest/ManSea001.cpp
@@ -142,7 +142,7 @@ public:
 
   void onTalk( uint32_t eventId, Entity::Player& player, uint64_t actorId ) override
   {
-    auto pEventMgr = Common::Service< World::Manager::EventMgr >::ref();
+    auto& pEventMgr = Common::Service< World::Manager::EventMgr >::ref();
     auto actor = pEventMgr.mapEventActorToRealActor( static_cast< uint32_t >( actorId ) );
 
     if( actor == ACTOR0 )
diff --git a/src/scripts/quest/ManSea002.cpp b/src/scripts/quest/ManSea002.cpp
index 02e1be2e..a072b62f 100644
--- a/src/scripts/quest/ManSea002.cpp
+++ b/src/scripts/quest/ManSea002.cpp
@@ -48,7 +48,7 @@ public:
 
   void onTalk( uint32_t eventId, Entity::Player& player, uint64_t actorId ) override
   {
-    auto pEventMgr = Common::Service< World::Manager::EventMgr >::ref();
+    auto& pEventMgr = Common::Service< World::Manager::EventMgr >::ref();
     auto actor = pEventMgr.mapEventActorToRealActor( static_cast< uint32_t >( actorId ) );
 
     if( actor == ACTOR0 )
diff --git a/src/scripts/quest/ManSea003.cpp b/src/scripts/quest/ManSea003.cpp
index 4b65a1a9..2032d990 100644
--- a/src/scripts/quest/ManSea003.cpp
+++ b/src/scripts/quest/ManSea003.cpp
@@ -64,7 +64,7 @@ public:
 
   void onTalk( uint32_t eventId, Entity::Player& player, uint64_t actorId ) override
   {
-    auto pEventMgr = Common::Service< World::Manager::EventMgr >::ref();
+    auto& pEventMgr = Common::Service< World::Manager::EventMgr >::ref();
     auto actor = pEventMgr.mapEventActorToRealActor( static_cast< uint32_t >( actorId ) );
 
     if( actor == Actor0 )
diff --git a/src/scripts/quest/ManWil001.cpp b/src/scripts/quest/ManWil001.cpp
index db4e804b..20735575 100644
--- a/src/scripts/quest/ManWil001.cpp
+++ b/src/scripts/quest/ManWil001.cpp
@@ -174,7 +174,7 @@ public:
 
   void onTalk( uint32_t eventId, Entity::Player& player, uint64_t actorId ) override
   {
-    auto pEventMgr = Common::Service< World::Manager::EventMgr >::ref();
+    auto& pEventMgr = Common::Service< World::Manager::EventMgr >::ref();
     auto actor = pEventMgr.mapEventActorToRealActor( static_cast< uint32_t >( actorId ) );
 
     if( actor == ACTOR0 )
diff --git a/src/scripts/quest/ManWil002.cpp b/src/scripts/quest/ManWil002.cpp
index bb8cdae2..d340329c 100644
--- a/src/scripts/quest/ManWil002.cpp
+++ b/src/scripts/quest/ManWil002.cpp
@@ -70,7 +70,7 @@ public:
 
   void onTalk( uint32_t eventId, Entity::Player& player, uint64_t actorId ) override
   {
-    auto pEventMgr = Common::Service< World::Manager::EventMgr >::ref();
+    auto& pEventMgr = Common::Service< World::Manager::EventMgr >::ref();
     auto actor = pEventMgr.mapEventActorToRealActor( static_cast< uint32_t >( actorId ) );
 
     if( actor == Actor0 )
diff --git a/src/scripts/quest/ManWil003.cpp b/src/scripts/quest/ManWil003.cpp
index 3b577cdd..c32b2d7a 100644
--- a/src/scripts/quest/ManWil003.cpp
+++ b/src/scripts/quest/ManWil003.cpp
@@ -70,7 +70,7 @@ public:
 
   void onTalk( uint32_t eventId, Entity::Player& player, uint64_t actorId ) override
   {
-    auto pEventMgr = Common::Service< World::Manager::EventMgr >::ref();
+    auto& pEventMgr = Common::Service< World::Manager::EventMgr >::ref();
     auto actor = pEventMgr.mapEventActorToRealActor( static_cast< uint32_t >( actorId ) );
 
     if( actor == Actor0 )
diff --git a/src/scripts/quest/ManWil004.cpp b/src/scripts/quest/ManWil004.cpp
index 4d3e006f..acbb5a53 100644
--- a/src/scripts/quest/ManWil004.cpp
+++ b/src/scripts/quest/ManWil004.cpp
@@ -70,7 +70,7 @@ public:
 
   void onTalk( uint32_t eventId, Entity::Player& player, uint64_t actorId ) override
   {
-    auto pEventMgr = Common::Service< World::Manager::EventMgr >::ref();
+    auto& pEventMgr = Common::Service< World::Manager::EventMgr >::ref();
     auto actor = pEventMgr.mapEventActorToRealActor( static_cast< uint32_t >( actorId ) );
 
     if( actor == Actor0 )
diff --git a/src/scripts/quest/subquest/gridania/SubFst002.cpp b/src/scripts/quest/subquest/gridania/SubFst002.cpp
index 630f2c31..1ed0fc15 100644
--- a/src/scripts/quest/subquest/gridania/SubFst002.cpp
+++ b/src/scripts/quest/subquest/gridania/SubFst002.cpp
@@ -59,7 +59,7 @@ public:
 
   void onTalk( uint32_t eventId, Entity::Player& player, uint64_t actorId ) override
   {
-    auto pEventMgr = Common::Service< World::Manager::EventMgr >::ref();
+    auto& pEventMgr = Common::Service< World::Manager::EventMgr >::ref();
     auto actor = pEventMgr.mapEventActorToRealActor( static_cast< uint32_t >( actorId ) );
 
     if( actor == ACTOR0 && !player.hasQuest( getId() ) )
diff --git a/src/scripts/quest/subquest/gridania/SubFst004.cpp b/src/scripts/quest/subquest/gridania/SubFst004.cpp
index ce559431..506b7cf9 100644
--- a/src/scripts/quest/subquest/gridania/SubFst004.cpp
+++ b/src/scripts/quest/subquest/gridania/SubFst004.cpp
@@ -56,7 +56,7 @@ public:
 
   void onTalk( uint32_t eventId, Entity::Player& player, uint64_t actorId ) override
   {
-    auto pEventMgr = Common::Service< World::Manager::EventMgr >::ref();
+    auto& pEventMgr = Common::Service< World::Manager::EventMgr >::ref();
     auto actor = pEventMgr.mapEventActorToRealActor( static_cast< uint32_t >( actorId ) );
 
     if( actor == Actor0 )
diff --git a/src/scripts/quest/subquest/gridania/SubFst009.cpp b/src/scripts/quest/subquest/gridania/SubFst009.cpp
index baaf7420..424d4151 100644
--- a/src/scripts/quest/subquest/gridania/SubFst009.cpp
+++ b/src/scripts/quest/subquest/gridania/SubFst009.cpp
@@ -52,7 +52,7 @@ public:
 
   void onTalk( uint32_t eventId, Entity::Player& player, uint64_t actorId ) override
   {
-    auto pEventMgr = Common::Service< World::Manager::EventMgr >::ref();
+    auto& pEventMgr = Common::Service< World::Manager::EventMgr >::ref();
     auto actor = pEventMgr.mapEventActorToRealActor( static_cast< uint32_t >( actorId ) );
 
     if( actor == Actor0 )
diff --git a/src/scripts/quest/subquest/gridania/SubFst010.cpp b/src/scripts/quest/subquest/gridania/SubFst010.cpp
index 395095f4..9af037f8 100644
--- a/src/scripts/quest/subquest/gridania/SubFst010.cpp
+++ b/src/scripts/quest/subquest/gridania/SubFst010.cpp
@@ -55,7 +55,7 @@ public:
 
   void onTalk( uint32_t eventId, Entity::Player& player, uint64_t actorId ) override
   {
-    auto pEventMgr = Common::Service< World::Manager::EventMgr >::ref();
+    auto& pEventMgr = Common::Service< World::Manager::EventMgr >::ref();
     auto actor = pEventMgr.mapEventActorToRealActor( static_cast< uint32_t >( actorId ) );
 
     if( actor == ACTOR0 )
diff --git a/src/scripts/quest/subquest/gridania/SubFst013.cpp b/src/scripts/quest/subquest/gridania/SubFst013.cpp
index febe937a..f373eb69 100644
--- a/src/scripts/quest/subquest/gridania/SubFst013.cpp
+++ b/src/scripts/quest/subquest/gridania/SubFst013.cpp
@@ -161,7 +161,7 @@ public:
 
   void onTalk( uint32_t eventId, Entity::Player& player, uint64_t actorId ) override
   {
-    auto pEventMgr = Common::Service< World::Manager::EventMgr >::ref();
+    auto& pEventMgr = Common::Service< World::Manager::EventMgr >::ref();
     auto actor = pEventMgr.mapEventActorToRealActor( static_cast< uint32_t >( actorId ) );
 
     if( !player.hasQuest( getId() ) )
@@ -182,7 +182,7 @@ public:
 
   void onEmote( uint64_t actorId, uint32_t eventId, uint32_t emoteId, Entity::Player& player ) override
   {
-    auto pEventMgr = Common::Service< World::Manager::EventMgr >::ref();
+    auto& pEventMgr = Common::Service< World::Manager::EventMgr >::ref();
     auto actor = pEventMgr.mapEventActorToRealActor( static_cast< uint32_t >( actorId ) );
 
     if( actor == ACTOR1 && emoteId == 5 && player.getQuestSeq( getId() ) == SEQ_1 )
diff --git a/src/scripts/quest/subquest/gridania/SubFst014.cpp b/src/scripts/quest/subquest/gridania/SubFst014.cpp
index 28f77dce..02908da6 100644
--- a/src/scripts/quest/subquest/gridania/SubFst014.cpp
+++ b/src/scripts/quest/subquest/gridania/SubFst014.cpp
@@ -56,7 +56,7 @@ public:
 
   void onTalk( uint32_t eventId, Entity::Player& player, uint64_t actorId ) override
   {
-    auto pEventMgr = Common::Service< World::Manager::EventMgr >::ref();
+    auto& pEventMgr = Common::Service< World::Manager::EventMgr >::ref();
     auto actor = pEventMgr.mapEventActorToRealActor( static_cast< uint32_t >( actorId ) );
 
     if( actor == Actor0 && !player.hasQuest( getId() ) )
diff --git a/src/scripts/quest/subquest/gridania/SubFst019.cpp b/src/scripts/quest/subquest/gridania/SubFst019.cpp
index 954e7376..5dd015a5 100644
--- a/src/scripts/quest/subquest/gridania/SubFst019.cpp
+++ b/src/scripts/quest/subquest/gridania/SubFst019.cpp
@@ -49,7 +49,7 @@ public:
 
   void onTalk( uint32_t eventId, Entity::Player& player, uint64_t actorId ) override
   {
-    auto pEventMgr = Common::Service< World::Manager::EventMgr >::ref();
+    auto& pEventMgr = Common::Service< World::Manager::EventMgr >::ref();
     auto actor = pEventMgr.mapEventActorToRealActor( static_cast< uint32_t >( actorId ) );
 
     if( actor == Actor0 )
diff --git a/src/scripts/quest/subquest/gridania/SubFst029.cpp b/src/scripts/quest/subquest/gridania/SubFst029.cpp
index 74044a7b..b22ee88a 100644
--- a/src/scripts/quest/subquest/gridania/SubFst029.cpp
+++ b/src/scripts/quest/subquest/gridania/SubFst029.cpp
@@ -47,7 +47,7 @@ public:
 
   void onTalk( uint32_t eventId, Entity::Player& player, uint64_t actorId ) override
   {
-    auto pEventMgr = Common::Service< World::Manager::EventMgr >::ref();
+    auto& pEventMgr = Common::Service< World::Manager::EventMgr >::ref();
     auto actor = pEventMgr.mapEventActorToRealActor( static_cast< uint32_t >( actorId ) );
 
     if( actor == SubFst029::Actor0 && !player.hasQuest( getId() ) )
diff --git a/src/scripts/quest/subquest/gridania/SubFst039.cpp b/src/scripts/quest/subquest/gridania/SubFst039.cpp
index 1159c434..f7ca9a56 100644
--- a/src/scripts/quest/subquest/gridania/SubFst039.cpp
+++ b/src/scripts/quest/subquest/gridania/SubFst039.cpp
@@ -42,7 +42,7 @@ class SubFst039 : public Sapphire::ScriptAPI::EventScript
    // Event Handlers
    void onTalk( uint32_t eventId, Entity::Player& player, uint64_t actorId ) override
    {
-     auto pEventMgr = Common::Service< World::Manager::EventMgr >::ref();
+     auto& pEventMgr = Common::Service< World::Manager::EventMgr >::ref();
      auto actor = pEventMgr.mapEventActorToRealActor( static_cast< uint32_t >( actorId ) );
 
      if( actor == Actor0 && !player.hasQuest( getId() ) )
diff --git a/src/scripts/quest/subquest/limsa/SubSea001.cpp b/src/scripts/quest/subquest/limsa/SubSea001.cpp
index 24c141a9..8f198f34 100644
--- a/src/scripts/quest/subquest/limsa/SubSea001.cpp
+++ b/src/scripts/quest/subquest/limsa/SubSea001.cpp
@@ -65,7 +65,7 @@ public:
 
   void onTalk( uint32_t eventId, Entity::Player& player, uint64_t actorId ) override
   {
-    auto pEventMgr = Common::Service< World::Manager::EventMgr >::ref();
+    auto& pEventMgr = Common::Service< World::Manager::EventMgr >::ref();
     auto actor = pEventMgr.mapEventActorToRealActor( static_cast< uint32_t >( actorId ) );
 
     if( actor == Actor0 )
diff --git a/src/scripts/quest/subquest/limsa/SubSea012.cpp b/src/scripts/quest/subquest/limsa/SubSea012.cpp
index d65979bb..4dad6132 100644
--- a/src/scripts/quest/subquest/limsa/SubSea012.cpp
+++ b/src/scripts/quest/subquest/limsa/SubSea012.cpp
@@ -48,7 +48,7 @@ public:
 
   void onTalk( uint32_t eventId, Entity::Player& player, uint64_t actorId ) override
   {
-    auto pEventMgr = Common::Service< World::Manager::EventMgr >::ref();
+    auto& pEventMgr = Common::Service< World::Manager::EventMgr >::ref();
     auto actor = pEventMgr.mapEventActorToRealActor( static_cast< uint32_t >( actorId ) );
 
     if( actor == Actor0 )
diff --git a/src/scripts/quest/subquest/uldah/SubWil000.cpp b/src/scripts/quest/subquest/uldah/SubWil000.cpp
index 5516b841..37f1adbc 100644
--- a/src/scripts/quest/subquest/uldah/SubWil000.cpp
+++ b/src/scripts/quest/subquest/uldah/SubWil000.cpp
@@ -48,7 +48,7 @@ public:
 
   void onTalk( uint32_t eventId, Entity::Player& player, uint64_t actorId ) override
   {
-    auto pEventMgr = Common::Service< World::Manager::EventMgr >::ref();
+    auto& pEventMgr = Common::Service< World::Manager::EventMgr >::ref();
     auto actor = pEventMgr.mapEventActorToRealActor( static_cast< uint32_t >( actorId ) );
 
     if( actor == Actor0 )
diff --git a/src/scripts/quest/subquest/uldah/SubWil001.cpp b/src/scripts/quest/subquest/uldah/SubWil001.cpp
index d6197905..e34a38e1 100644
--- a/src/scripts/quest/subquest/uldah/SubWil001.cpp
+++ b/src/scripts/quest/subquest/uldah/SubWil001.cpp
@@ -49,7 +49,7 @@ public:
 
   void onTalk( uint32_t eventId, Entity::Player& player, uint64_t actorId ) override
   {
-    auto pEventMgr = Common::Service< World::Manager::EventMgr >::ref();
+    auto& pEventMgr = Common::Service< World::Manager::EventMgr >::ref();
     auto actor = pEventMgr.mapEventActorToRealActor( static_cast< uint32_t >( actorId ) );
 
     if( actor == Actor0 )
diff --git a/src/scripts/quest/subquest/uldah/SubWil002.cpp b/src/scripts/quest/subquest/uldah/SubWil002.cpp
index ba22f96b..d59112ef 100644
--- a/src/scripts/quest/subquest/uldah/SubWil002.cpp
+++ b/src/scripts/quest/subquest/uldah/SubWil002.cpp
@@ -53,7 +53,7 @@ public:
 
   void onTalk( uint32_t eventId, Entity::Player& player, uint64_t actorId ) override
   {
-    auto pEventMgr = Common::Service< World::Manager::EventMgr >::ref();
+    auto& pEventMgr = Common::Service< World::Manager::EventMgr >::ref();
     auto actor = pEventMgr.mapEventActorToRealActor( static_cast< uint32_t >( actorId ) );
 
     if( actor == Actor0 )
diff --git a/src/scripts/quest/subquest/uldah/SubWil004.cpp b/src/scripts/quest/subquest/uldah/SubWil004.cpp
index dfabd64f..abd78646 100644
--- a/src/scripts/quest/subquest/uldah/SubWil004.cpp
+++ b/src/scripts/quest/subquest/uldah/SubWil004.cpp
@@ -58,7 +58,7 @@ public:
 
   void onTalk( uint32_t eventId, Entity::Player& player, uint64_t actorId ) override
   {
-    auto pEventMgr = Common::Service< World::Manager::EventMgr >::ref();
+    auto& pEventMgr = Common::Service< World::Manager::EventMgr >::ref();
     auto actor = pEventMgr.mapEventActorToRealActor( static_cast< uint32_t >( actorId ) );
 
     if( actor == Actor0 )
diff --git a/src/scripts/quest/subquest/uldah/SubWil006.cpp b/src/scripts/quest/subquest/uldah/SubWil006.cpp
index 9125a3db..1ce3fa26 100644
--- a/src/scripts/quest/subquest/uldah/SubWil006.cpp
+++ b/src/scripts/quest/subquest/uldah/SubWil006.cpp
@@ -51,7 +51,7 @@ public:
 
   void onTalk( uint32_t eventId, Entity::Player& player, uint64_t actorId ) override
   {
-    auto pEventMgr = Common::Service< World::Manager::EventMgr >::ref();
+    auto& pEventMgr = Common::Service< World::Manager::EventMgr >::ref();
     auto actor = pEventMgr.mapEventActorToRealActor( static_cast< uint32_t >( actorId ) );
 
     if( actor == Actor0 )
diff --git a/src/scripts/quest/subquest/uldah/SubWil007.cpp b/src/scripts/quest/subquest/uldah/SubWil007.cpp
index 46ff82c8..c11572c5 100644
--- a/src/scripts/quest/subquest/uldah/SubWil007.cpp
+++ b/src/scripts/quest/subquest/uldah/SubWil007.cpp
@@ -55,7 +55,7 @@ public:
 
   void onTalk( uint32_t eventId, Entity::Player& player, uint64_t actorId ) override
   {
-    auto pEventMgr = Common::Service< World::Manager::EventMgr >::ref();
+    auto& pEventMgr = Common::Service< World::Manager::EventMgr >::ref();
     auto actor = pEventMgr.mapEventActorToRealActor( static_cast< uint32_t >( actorId ) );
 
     if( actor == Actor0 && !player.hasQuest( getId() ) )
@@ -90,7 +90,7 @@ public:
 
   void onEmote( uint64_t actorId, uint32_t eventId, uint32_t emoteId, Entity::Player& player ) override
   {
-    auto pEventMgr = Common::Service< World::Manager::EventMgr >::ref();
+    auto& pEventMgr = Common::Service< World::Manager::EventMgr >::ref();
     auto actor = pEventMgr.mapEventActorToRealActor( static_cast< uint32_t >( actorId ) );
 
     if( actor == Actor0 && emoteId == 41 && player.getQuestSeq( getId() ) == Seq1 )
diff --git a/src/scripts/quest/subquest/uldah/SubWil018.cpp b/src/scripts/quest/subquest/uldah/SubWil018.cpp
index 7618fd2f..f237a068 100644
--- a/src/scripts/quest/subquest/uldah/SubWil018.cpp
+++ b/src/scripts/quest/subquest/uldah/SubWil018.cpp
@@ -55,7 +55,7 @@ public:
 
   void onTalk( uint32_t eventId, Entity::Player& player, uint64_t actorId ) override
   {
-    auto pEventMgr = Common::Service< World::Manager::EventMgr >::ref();
+    auto& pEventMgr = Common::Service< World::Manager::EventMgr >::ref();
     auto actor = pEventMgr.mapEventActorToRealActor( static_cast< uint32_t >( actorId ) );
 
     if( actor == Actor0 && !player.hasQuest( getId() ) )
diff --git a/src/scripts/quest/subquest/uldah/SubWil019.cpp b/src/scripts/quest/subquest/uldah/SubWil019.cpp
index c04ff9a2..257ca62d 100644
--- a/src/scripts/quest/subquest/uldah/SubWil019.cpp
+++ b/src/scripts/quest/subquest/uldah/SubWil019.cpp
@@ -47,7 +47,7 @@ public:
 
   void onTalk( uint32_t eventId, Entity::Player& player, uint64_t actorId ) override
   {
-    auto pEventMgr = Common::Service< World::Manager::EventMgr >::ref();
+    auto& pEventMgr = Common::Service< World::Manager::EventMgr >::ref();
     auto actor = pEventMgr.mapEventActorToRealActor( static_cast< uint32_t >( actorId ) );
 
     if( actor == Actor0 )
diff --git a/src/scripts/quest/subquest/uldah/SubWil020.cpp b/src/scripts/quest/subquest/uldah/SubWil020.cpp
index 7ea1a93f..588dfefe 100644
--- a/src/scripts/quest/subquest/uldah/SubWil020.cpp
+++ b/src/scripts/quest/subquest/uldah/SubWil020.cpp
@@ -63,7 +63,7 @@ class SubWil020 : public Sapphire::ScriptAPI::EventScript
    // Event Handlers
    void onTalk( uint32_t eventId, Entity::Player& player, uint64_t actorId ) override
    {
-     auto pEventMgr = Common::Service< World::Manager::EventMgr >::ref();
+     auto& pEventMgr = Common::Service< World::Manager::EventMgr >::ref();
      auto actor = pEventMgr.mapEventActorToRealActor( static_cast< uint32_t >( actorId ) );
 
      /*player.setQuestUI8BH( getId(), 0 );
diff --git a/src/scripts/quest/subquest/uldah/SubWil021.cpp b/src/scripts/quest/subquest/uldah/SubWil021.cpp
index 8e17059d..f4c73c11 100644
--- a/src/scripts/quest/subquest/uldah/SubWil021.cpp
+++ b/src/scripts/quest/subquest/uldah/SubWil021.cpp
@@ -52,7 +52,7 @@ public:
 
   void onTalk( uint32_t eventId, Entity::Player& player, uint64_t actorId ) override
   {
-    auto pEventMgr = Common::Service< World::Manager::EventMgr >::ref();
+    auto& pEventMgr = Common::Service< World::Manager::EventMgr >::ref();
     auto actor = pEventMgr.mapEventActorToRealActor( static_cast< uint32_t >( actorId ) );
 
     if( actor == Actor0 )
diff --git a/src/scripts/quest/subquest/uldah/SubWil022.cpp b/src/scripts/quest/subquest/uldah/SubWil022.cpp
index 4d274987..a852601d 100644
--- a/src/scripts/quest/subquest/uldah/SubWil022.cpp
+++ b/src/scripts/quest/subquest/uldah/SubWil022.cpp
@@ -52,7 +52,7 @@ public:
 
   void onTalk( uint32_t eventId, Entity::Player& player, uint64_t actorId ) override
   {
-    auto pEventMgr = Common::Service< World::Manager::EventMgr >::ref();
+    auto& pEventMgr = Common::Service< World::Manager::EventMgr >::ref();
     auto actor = pEventMgr.mapEventActorToRealActor( static_cast< uint32_t >( actorId ) );
 
     if( actor == Actor0 )
diff --git a/src/scripts/quest/subquest/uldah/SubWil027.cpp b/src/scripts/quest/subquest/uldah/SubWil027.cpp
index 66dc4843..a19f7c2c 100644
--- a/src/scripts/quest/subquest/uldah/SubWil027.cpp
+++ b/src/scripts/quest/subquest/uldah/SubWil027.cpp
@@ -46,7 +46,7 @@ public:
 
   void onTalk( uint32_t eventId, Entity::Player& player, uint64_t actorId ) override
   {
-    auto pEventMgr = Common::Service< World::Manager::EventMgr >::ref();
+    auto& pEventMgr = Common::Service< World::Manager::EventMgr >::ref();
     auto actor = pEventMgr.mapEventActorToRealActor( static_cast< uint32_t >( actorId ) );
 
     if( actor == Actor0 )
diff --git a/src/scripts/quest/subquest/uldah/SubWil028.cpp b/src/scripts/quest/subquest/uldah/SubWil028.cpp
index 57222790..f52a9e63 100644
--- a/src/scripts/quest/subquest/uldah/SubWil028.cpp
+++ b/src/scripts/quest/subquest/uldah/SubWil028.cpp
@@ -48,7 +48,7 @@ public:
 
   void onTalk( uint32_t eventId, Entity::Player& player, uint64_t actorId ) override
   {
-    auto pEventMgr = Common::Service< World::Manager::EventMgr >::ref();
+    auto& pEventMgr = Common::Service< World::Manager::EventMgr >::ref();
     auto actor = pEventMgr.mapEventActorToRealActor( static_cast< uint32_t >( actorId ) );
 
     if( actor == Actor0 )
diff --git a/src/scripts/quest/subquest/uldah/SubWil029.cpp b/src/scripts/quest/subquest/uldah/SubWil029.cpp
index ec09773a..f5734318 100644
--- a/src/scripts/quest/subquest/uldah/SubWil029.cpp
+++ b/src/scripts/quest/subquest/uldah/SubWil029.cpp
@@ -51,7 +51,7 @@ public:
 
   void onTalk( uint32_t eventId, Entity::Player& player, uint64_t actorId ) override
   {
-    auto pEventMgr = Common::Service< World::Manager::EventMgr >::ref();
+    auto& pEventMgr = Common::Service< World::Manager::EventMgr >::ref();
     auto actor = pEventMgr.mapEventActorToRealActor( static_cast< uint32_t >( actorId ) );
 
     if( actor == Actor0 )
diff --git a/src/tools/quest_parser/main.cpp b/src/tools/quest_parser/main.cpp
index 069e213e..44d60f05 100644
--- a/src/tools/quest_parser/main.cpp
+++ b/src/tools/quest_parser/main.cpp
@@ -27,8 +27,8 @@ using namespace Sapphire;
 const std::string onTalkStr(
   "  void onTalk( uint32_t eventId, Entity::Player& player, uint64_t actorId ) override\n"
   "  {\n"
-  "    auto pEventMgr = m_framework->get< World::Manager::EventMgr >();\n"
-  "    auto actor = pEventMgr->mapEventActorToRealActor( static_cast< uint32_t >( actorId ) );\n"
+  "    auto& eventMgr = Common::Service< World::Manager::EventMgr >::ref();\n"
+  "    auto actor = eventMgr.mapEventActorToRealActor( static_cast< uint32_t >( actorId ) );\n"
   "  }\n\n"
 );
 
@@ -41,8 +41,8 @@ const std::string onWithinRangeStr(
 const std::string onEmoteStr(
   "  void onEmote( uint32_t eventId, Entity::Player& player, uint64_t actorId, uint32_t emoteId ) override\n"
   "  {\n"
-  "    auto pEventMgr = m_framework->get< World::Manager::EventMgr >();\n"
-  "    auto actor = pEventMgr->mapEventActorToRealActor( static_cast< uint32_t >( actorId ) );\n"
+  "    auto& eventMgr = Common::Service< World::Manager::EventMgr >::ref();\n"
+  "    auto actor = eventMgr.mapEventActorToRealActor( static_cast< uint32_t >( actorId ) );\n"
   "  }\n\n"
 );
 
diff --git a/src/world/Actor/PlayerInventory.cpp b/src/world/Actor/PlayerInventory.cpp
index e6406c5f..d10c7c66 100644
--- a/src/world/Actor/PlayerInventory.cpp
+++ b/src/world/Actor/PlayerInventory.cpp
@@ -131,7 +131,7 @@ void Sapphire::Entity::Player::equipWeapon( ItemPtr pItem, bool updateClass )
 
 void Sapphire::Entity::Player::equipSoulCrystal( ItemPtr pItem, bool updateJob )
 {
-  auto exdData = Common::Service< Sapphire::Data::ExdDataGenerated >::ref();
+  auto& exdData = Common::Service< Sapphire::Data::ExdDataGenerated >::ref();
 
   auto itemInfo = exdData.get< Sapphire::Data::Item >( pItem->getId() );
   auto itemClassJob = itemInfo->classJobUse;
diff --git a/src/world/Manager/DebugCommandMgr.cpp b/src/world/Manager/DebugCommandMgr.cpp
index 515bf228..54be2fdb 100644
--- a/src/world/Manager/DebugCommandMgr.cpp
+++ b/src/world/Manager/DebugCommandMgr.cpp
@@ -535,7 +535,7 @@ void Sapphire::World::Manager::DebugCommandMgr::add( char* data, Entity::Player&
 void Sapphire::World::Manager::DebugCommandMgr::get( char* data, Entity::Player& player,
                                                      std::shared_ptr< DebugCommand > command )
 {
-  auto exdData = Common::Service< Data::ExdDataGenerated >::ref();
+  auto& exdData = Common::Service< Data::ExdDataGenerated >::ref();
   std::string subCommand;
   std::string params = "";
 
diff --git a/src/world/Manager/HousingMgr.cpp b/src/world/Manager/HousingMgr.cpp
index f2a559b5..9cd612bb 100644
--- a/src/world/Manager/HousingMgr.cpp
+++ b/src/world/Manager/HousingMgr.cpp
@@ -869,7 +869,7 @@ void Sapphire::World::Manager::HousingMgr::sendEstateInventory( Entity::Player&
   if( it == containers.end() )
     return;
 
-  auto invMgr = Common::Service< Manager::InventoryMgr >::ref();
+  auto& invMgr = Common::Service< Manager::InventoryMgr >::ref();
   invMgr.sendInventoryContainer( player, it->second );
 }
 
diff --git a/src/world/Network/Handlers/ClientTriggerHandler.cpp b/src/world/Network/Handlers/ClientTriggerHandler.cpp
index 7af8215e..e8ca0481 100644
--- a/src/world/Network/Handlers/ClientTriggerHandler.cpp
+++ b/src/world/Network/Handlers/ClientTriggerHandler.cpp
@@ -190,7 +190,7 @@ void Sapphire::Network::GameConnection::clientTriggerHandler( const Packets::FFX
       uint32_t emoteId = param11;
       bool isSilent = param2 == 1;
 
-      auto exdData = Common::Service< Data::ExdDataGenerated >::ref();
+      auto& exdData = Common::Service< Data::ExdDataGenerated >::ref();
       auto emoteData = exdData.get< Data::Emote >( emoteId );
 
       if( !emoteData )
diff --git a/src/world/Territory/HousingZone.cpp b/src/world/Territory/HousingZone.cpp
index e2ee9cf6..8443da8e 100644
--- a/src/world/Territory/HousingZone.cpp
+++ b/src/world/Territory/HousingZone.cpp
@@ -63,7 +63,7 @@ bool Sapphire::HousingZone::init()
   else if( m_territoryTypeId == 641 )
     housingIndex = 3;
 
-  auto exdData = Common::Service< Data::ExdDataGenerated >::ref();
+  auto& exdData = Common::Service< Data::ExdDataGenerated >::ref();
   auto info = exdData.get< Sapphire::Data::HousingLandSet >( housingIndex );
 
   // build yard objects array indices

From aa838d272c15b2c2c31ef19e2ad74610fbb40fdd Mon Sep 17 00:00:00 2001
From: NotAdam <adam@notadam.me>
Date: Sun, 1 Mar 2020 12:11:40 +1100
Subject: [PATCH 272/351] fix windows build

---
 src/common/Service.h | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/common/Service.h b/src/common/Service.h
index bcf3dc2f..8cbb43a1 100644
--- a/src/common/Service.h
+++ b/src/common/Service.h
@@ -3,6 +3,7 @@
 
 #include <memory>
 #include <utility>
+#include <cassert>
 
 // stolen from: https://github.com/skypjack/entt/blob/master/src/entt/locator/locator.hpp
 

From 579972278b0f31de4e52dc3652d00a4c897c4863 Mon Sep 17 00:00:00 2001
From: Sophie Hamilton <git-commits@theblob.org>
Date: Mon, 2 Mar 2020 03:48:28 +0000
Subject: [PATCH 273/351] Make Player::discover() honour passed map_id

The Sapphire::Entity::Player::discover() method never actually honoured
the passed map_id, instead always using the ID of the map the player was
currently in.
---
 src/world/Actor/Player.cpp | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/world/Actor/Player.cpp b/src/world/Actor/Player.cpp
index e949afab..cd8d6c79 100644
--- a/src/world/Actor/Player.cpp
+++ b/src/world/Actor/Player.cpp
@@ -603,8 +603,7 @@ void Sapphire::Entity::Player::discover( int16_t map_id, int16_t sub_id )
 
   int32_t offset = 4;
 
-  auto info = exdData.get< Sapphire::Data::Map >(
-    exdData.get< Sapphire::Data::TerritoryType >( getCurrentTerritory()->getTerritoryTypeId() )->map );
+  auto info = exdData.get< Sapphire::Data::Map >( map_id );
   if( info->discoveryArrayByte )
     offset = 5 + 2 * info->discoveryIndex;
   else

From f8236147a66a9887cc352ea1bbb36b5cf0e2d922 Mon Sep 17 00:00:00 2001
From: Sophie Hamilton <git-commits@theblob.org>
Date: Mon, 2 Mar 2020 08:52:28 +0000
Subject: [PATCH 274/351] Additional EXP bonus on full map completion

When the map is fully completed, gain an additional EXP bonus equal to
10 times the regular amount.
---
 src/world/Actor/Player.cpp | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/src/world/Actor/Player.cpp b/src/world/Actor/Player.cpp
index cd8d6c79..89ead563 100644
--- a/src/world/Actor/Player.cpp
+++ b/src/world/Actor/Player.cpp
@@ -622,7 +622,28 @@ void Sapphire::Entity::Player::discover( int16_t map_id, int16_t sub_id )
 
   gainExp( exp );
 
+  // gain 10x additional EXP if entire map is completed
+  uint32_t mask = info->discoveryFlag;
+  uint32_t discoveredAreas;
+  if( info->discoveryArrayByte )
+  {
+    discoveredAreas = ( m_discovery[ offset + 1 ] << 8 ) |
+                        m_discovery[ offset ];
+  }
+  else
+  {
+    discoveredAreas = ( m_discovery[ offset + 3 ] << 24 ) |
+                      ( m_discovery[ offset + 2 ] << 16 ) |
+                      ( m_discovery[ offset + 1 ] << 8  ) |
+                        m_discovery[ offset ];
+  }
 
+  bool allDiscovered = ( ( discoveredAreas & mask ) == mask );
+
+  if( allDiscovered )
+  {
+    gainExp( exp * 10 );
+  }
 }
 
 bool Sapphire::Entity::Player::isNewAdventurer() const

From 1fc067a3e60558d25d816f18aaf04ab63cb06e57 Mon Sep 17 00:00:00 2001
From: Sophie Hamilton <git-commits@theblob.org>
Date: Mon, 2 Mar 2020 09:01:00 +0000
Subject: [PATCH 275/351] New Discovery/DiscoveryHandler opcodes

Add in the new opcodes for Discovery and DiscoveryHandler found by
@collett8192.
---
 src/common/Network/PacketDef/Ipcs.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/common/Network/PacketDef/Ipcs.h b/src/common/Network/PacketDef/Ipcs.h
index 958427ad..2b3cb211 100644
--- a/src/common/Network/PacketDef/Ipcs.h
+++ b/src/common/Network/PacketDef/Ipcs.h
@@ -221,7 +221,7 @@ namespace Sapphire::Network::Packets
 
     WeatherChange = 0x02FB, // updated 5.11
     PlayerTitleList = 0x037D, // updated 5.1
-    Discovery = 0x02E7, // updated 5.18
+    Discovery = 0x0091, // updated 5.2
 
     EorzeaTimeOffset = 0x03B8, // updated 5.1
 
@@ -334,7 +334,7 @@ namespace Sapphire::Network::Packets
 
     ZoneLineHandler = 0x00B9, // updated 5.2
     ClientTrigger = 0x017C, // updated 5.2
-    DiscoveryHandler = 0x017B, // updated 5.18
+    DiscoveryHandler = 0x019A, // updated 5.2
 
     PlaceFieldMarker = 0x013C, // updated 5.0
     SkillHandler = 0x0225, // updated 5.2

From 8f62c23a8b902df0d78b000a8a7925c3585b86b7 Mon Sep 17 00:00:00 2001
From: Sophie Hamilton <git-commits@theblob.org>
Date: Tue, 3 Mar 2020 08:37:19 +0000
Subject: [PATCH 276/351] Check for nullptr before using returned map data

It's best to not crash the server if we can help it.
---
 src/world/Actor/Player.cpp | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/world/Actor/Player.cpp b/src/world/Actor/Player.cpp
index 89ead563..73f420f5 100644
--- a/src/world/Actor/Player.cpp
+++ b/src/world/Actor/Player.cpp
@@ -604,6 +604,12 @@ void Sapphire::Entity::Player::discover( int16_t map_id, int16_t sub_id )
   int32_t offset = 4;
 
   auto info = exdData.get< Sapphire::Data::Map >( map_id );
+  if ( !info )
+  {
+    sendDebug( "discover(): Could not obtain map data for map_id == {0}", map_id );
+    return;
+  }
+
   if( info->discoveryArrayByte )
     offset = 5 + 2 * info->discoveryIndex;
   else
@@ -2199,4 +2205,4 @@ bool Sapphire::Entity::Player::checkAction()
   }
 
   return true;
-}
\ No newline at end of file
+}

From b2c92340f7f3e941c2ab8c58756fc540b648009c Mon Sep 17 00:00:00 2001
From: collett <collett0301@gmail.com>
Date: Tue, 10 Mar 2020 20:16:38 +0900
Subject: [PATCH 277/351] 5.21

---
 src/common/Network/PacketDef/Ipcs.h | 134 ++++++++++++++--------------
 src/world/Actor/Player.cpp          |   9 ++
 2 files changed, 76 insertions(+), 67 deletions(-)

diff --git a/src/common/Network/PacketDef/Ipcs.h b/src/common/Network/PacketDef/Ipcs.h
index 2b3cb211..9f02925d 100644
--- a/src/common/Network/PacketDef/Ipcs.h
+++ b/src/common/Network/PacketDef/Ipcs.h
@@ -44,20 +44,20 @@ namespace Sapphire::Network::Packets
   enum ServerZoneIpcType : uint16_t
   {
     Ping = 0x0106, // updated 5.2
-    Init = 0x0307, // updated 5.2
+    Init = 0x00F2, // updated 5.21
 
-    ActorFreeSpawn = 0x01D1, // updated 5.2
-    InitZone = 0x033A, // updated 5.2
+    ActorFreeSpawn = 0x034F, // updated 5.21
+    InitZone = 0x019C, // updated 5.21
 
-    EffectResult = 0x0340, // updated 5.2
-    ActorControl = 0x01E1, // updated 5.2
-    ActorControlSelf = 0x010E, // updated 5.2
-    ActorControlTarget = 0x00AE, // updated 5.2
+    EffectResult = 0x02CF, // updated 5.21
+    ActorControl = 0x0246, // updated 5.21
+    ActorControlSelf = 0x02D1, // updated 5.21
+    ActorControlTarget = 0x02FB, // updated 5.21
 
     /*!
      * @brief Used when resting
      */
-    UpdateHpMpTp = 0x00C1, // updated 5.2
+    UpdateHpMpTp = 0x0284, // updated 5.21
 
     ///////////////////////////////////////////////////
 
@@ -82,25 +82,25 @@ namespace Sapphire::Network::Packets
 
     WorldVisitList = 0x00FE, // added 4.5
 
-    SocialList = 0x033E, // updated 5.2
+    SocialList = 0x00CE, // updated 5.21
 
     ExamineSearchInfo = 0x0186, // updated 5.2
     UpdateSearchInfo = 0x017D, // updated 5.2
-    InitSearchInfo = 0x021C, // updated 5.2
+    InitSearchInfo = 0x0143, // updated 5.21
     ExamineSearchComment = 0x0102, // updated 4.1
 
     ServerNoticeShort = 0x0115, // updated 5.0
-    ServerNotice = 0x0308, // updated 5.2
-    SetOnlineStatus = 0x0185, // updated 5.2
+    ServerNotice = 0x016F, // updated 5.21
+    SetOnlineStatus = 0x01EA, // updated 5.21
 
     CountdownInitiate = 0x0309, // updated 5.11
     CountdownCancel = 0x00D9, // updated 5.18
 
     PlayerAddedToBlacklist = 0x033F, // updated 5.1
     PlayerRemovedFromBlacklist = 0x0385, // updated 5.1
-    BlackList = 0x01A2, // updated 5.2
+    BlackList = 0x01DE, // updated 5.21
 
-    LinkshellList = 0x028C, // updated 5.2
+    LinkshellList = 0x01EB, // updated 5.21
 
     MailDeleteRequest = 0x012B, // updated 5.0
 
@@ -123,42 +123,42 @@ namespace Sapphire::Network::Packets
 
     FreeCompanyUpdateShortMessage = 0x0157, // added 5.0
 
-    StatusEffectList = 0x0374, // updated 5.2
+    StatusEffectList = 0x01B8, // updated 5.21
     EurekaStatusEffectList = 0x0167, // updated 5.18
     BossStatusEffectList = 0x0312, // added 5.1
-    Effect = 0x028A, // updated 5.2
-    AoeEffect8 = 0x01F5, // updated 5.2
+    Effect = 0x0371, // updated 5.21
+    AoeEffect8 = 0x02DA, // updated 5.21
     AoeEffect16 = 0x0305, // updated 5.18
     AoeEffect24 = 0x023F, // updated 5.18
     AoeEffect32 = 0x0352, // updated 5.18
-    PersistantEffect = 0x00CE, // updated 5.2
+    PersistantEffect = 0x03E7, // updated 5.21
 
     GCAffiliation = 0x016F, // updated 5.0
 
-    PlayerSpawn = 0x027D, // updated 5.2
-    NpcSpawn = 0x034B, // updated 5.2
+    PlayerSpawn = 0x018E, // updated 5.21
+    NpcSpawn = 0x023A, // updated 5.21
     NpcSpawn2 = 0x010C, // ( Bigger statuseffectlist? ) updated 5.18
-    ActorMove = 0x0130, // updated 5.2
+    ActorMove = 0x0213, // updated 5.21
 
     ActorSetPos = 0x00CF, // updated 5.2
 
-    ActorCast = 0x00F6, // updated 5.2
+    ActorCast = 0x0262, // updated 5.21
     SomeCustomiseChangePacketProbably = 0x00CD, // added 5.18
 
     PartyList = 0x0287, // updated 5.18
-    HateRank = 0x03AC, // updated 5.2
-    HateList = 0x00C8, // updated 5.2
+    HateRank = 0x008F, // updated 5.21
+    HateList = 0x01C5, // updated 5.21
     ObjectSpawn = 0x01B3, // updated 5.2
     ObjectDespawn = 0x034B, // updated 5.18
-    UpdateClassInfo = 0x0131, // updated 5.2
+    UpdateClassInfo = 0x0145, // updated 5.21
     SilentSetClassJob = 0x018E, // updated 5.0 - seems to be the case, not sure if it's actually used for anything
-    PlayerSetup = 0x0278, // updated 5.2
-    PlayerStats = 0x03C8, // updated 5.2
-    ActorOwner = 0x0290, // updated 5.2
-    PlayerStateFlags = 0x032B, // updated 5.2
-    PlayerClassInfo = 0x039A, // updated 5.2
+    PlayerSetup = 0x028A, // updated 5.21
+    PlayerStats = 0x0112, // updated 5.21
+    ActorOwner = 0x0385, // updated 5.21
+    PlayerStateFlags = 0x02E1, // updated 5.21
+    PlayerClassInfo = 0x016B, // updated 5.21
 
-    ModelEquip = 0x03C9, // updated 5.2
+    ModelEquip = 0x0292, // updated 5.21
     Examine = 0x038B, // updated 5.2
     CharaNameReq = 0x0116, // updated 5.18
 
@@ -167,35 +167,35 @@ namespace Sapphire::Network::Packets
 
     SetLevelSync = 0x1186, // not updated for 4.4, not sure what it is anymore
 
-    ItemInfo = 0x03D4, // updated 5.2
-    ContainerInfo = 0x01A5, // updated 5.2
-    InventoryTransactionFinish = 0x02D7, // updated 5.2
-    InventoryTransaction = 0x01D8, // updated 5.2
-    CurrencyCrystalInfo = 0x0277, // updated 5.2
+    ItemInfo = 0x009E, // updated 5.21
+    ContainerInfo = 0x0315, // updated 5.21
+    InventoryTransactionFinish = 0x030E, // updated 5.21
+    InventoryTransaction = 0x006E, // updated 5.21
+    CurrencyCrystalInfo = 0x00E9, // updated 5.21
 
-    InventoryActionAck = 0x0094, // updated 5.2
-    UpdateInventorySlot = 0x02E9, // updated 5.2
+    InventoryActionAck = 0x01F8, // updated 5.21
+    UpdateInventorySlot = 0x006F, // updated 5.21
 
     HuntingLogEntry = 0x01B3, // updated 5.0
 
-    EventPlay = 0x01F3, // updated 5.2
+    EventPlay = 0x0167, // updated 5.21
     EventPlay4 = 0x02F7, // updated 5.18
     EventPlay8 = 0x0119, // updated 5.18
     EventPlay16 = 0x01FB, // updated 5.18
     EventPlay32 = 0x0364, // updated 5.18
     EventPlay64 = 0x00E5, // updated 5.18
     EventPlay128 = 0x02BE, // updated 5.18
-    EventPlay255 = 0x03B0, // updated 5.2
+    EventPlay255 = 0x0249, // updated 5.21
 
-    EventStart = 0x023D, // updated 5.2
-    EventFinish = 0x0318, // updated 5.2
+    EventStart = 0x0392, // updated 5.21
+    EventFinish = 0x00EF, // updated 5.21
     UseMooch = 0x0233, // updated 5.18
 
     EventLinkshell = 0x1169,
 
-    QuestActiveList = 0x017B, // updated 5.2
+    QuestActiveList = 0x01FA, // updated 5.21
     QuestUpdate = 0x02CE, // updated 5.2
-    QuestCompleteList = 0x0255, // updated 5.2
+    QuestCompleteList = 0x0093, // updated 5.21
 
     QuestFinish = 0x006F, // updated 5.2
     MSQTrackerComplete = 0x01D6, // updated 5.0
@@ -203,9 +203,9 @@ namespace Sapphire::Network::Packets
 
     QuestMessage = 0x00BF, // updated 5.18
 
-    QuestTracker = 0x0306, // updated 5.2
+    QuestTracker = 0x00B0, // updated 5.21
 
-    Mount = 0x023C, // updated 5.2
+    Mount = 0x036C, // updated 5.21
 
     DirectorVars = 0x00E6, // updated 5.18
     SomeDirectorUnk1 = 0x0084, // updated 5.18
@@ -225,7 +225,7 @@ namespace Sapphire::Network::Packets
 
     EorzeaTimeOffset = 0x03B8, // updated 5.1
 
-    EquipDisplayFlags = 0x0173, // updated 5.2
+    EquipDisplayFlags = 0x012F, // updated 5.21
 
     /// Housing //////////////////////////////////////
 
@@ -238,7 +238,7 @@ namespace Sapphire::Network::Packets
     LandRename = 0x023A, // updated 5.0
     HousingEstateGreeting = 0x023B, // updated 5.0
     HousingUpdateLandFlagsSlot = 0x023C, // updated 5.0
-    HousingLandFlags = 0x00FE, // updated 5.2
+    HousingLandFlags = 0x0291, // updated 5.21
     HousingShowEstateGuestAccess = 0x023E, // updated 5.0
 
     HousingObjectInitialize = 0x0240, // updated 5.0
@@ -258,12 +258,12 @@ namespace Sapphire::Network::Packets
     DuelChallenge = 0x0277, // 4.2; this is responsible for opening the ui
     PerformNote = 0x0286, // updated 4.3
 
-    PrepareZoning = 0x0208, // updated 5.2
-    ActorGauge = 0x0162, // updated 5.2
+    PrepareZoning = 0x01BE, // updated 5.21
+    ActorGauge = 0x03BB, // updated 5.21
 
     // daily quest info -> without them sent,  login will take longer...
-    DailyQuests = 0x00A2, // updated 5.2
-    DailyQuestRepeatFlags = 0x013D, // updated 5.2
+    DailyQuests = 0x00E4, // updated 5.21
+    DailyQuestRepeatFlags = 0x0068, // updated 5.21
 
     /// Doman Mahjong //////////////////////////////////////
     MahjongOpenGui = 0x02A4, // only available in mahjong instance
@@ -284,9 +284,9 @@ namespace Sapphire::Network::Packets
   enum ClientZoneIpcType : uint16_t
   {
     PingHandler = 0x0106, // updated 5.2
-    InitHandler = 0x0307, // updated 5.2
+    InitHandler = 0x00F2, // updated 5.21
 
-    FinishLoadingHandler = 0x012B, // updated 5.2
+    FinishLoadingHandler = 0x007D, // updated 5.21
 
     CFCommenceHandler = 0x006F,
 
@@ -304,16 +304,16 @@ namespace Sapphire::Network::Packets
 
     ChatHandler = 0x013A, // updated 5.2
 
-    SocialListHandler = 0x03E7, // updated 5.2
+    SocialListHandler = 0x0123, // updated 5.21
     SetSearchInfoHandler = 0x00A8, // updated 5.2
-    ReqSearchInfoHandler = 0x007B, // updated 5.2
+    ReqSearchInfoHandler = 0x01CD, // updated 5.21
     ReqExamineSearchCommentHandler = 0x00E7, // updated 5.0
 
     ReqRemovePlayerFromBlacklist = 0x00F1, // updated 5.0
-    BlackListHandler = 0x0329, // updated 5.2
+    BlackListHandler = 0x0358, // updated 5.21
     PlayerSearchHandler = 0x00F4, // updated 5.0
 
-    LinkshellListHandler = 0x00A7, // updated 5.2
+    LinkshellListHandler = 0x01CF, // updated 5.21
 
     MarketBoardRequestItemListingInfo = 0x0102, // updated 4.5
     MarketBoardRequestItemListings = 0x0103, // updated 4.5
@@ -332,39 +332,39 @@ namespace Sapphire::Network::Packets
     ReqCountdownInitiate = 0x0135, // updated 5.0
     ReqCountdownCancel = 0x0136, // updated 5.0
 
-    ZoneLineHandler = 0x00B9, // updated 5.2
-    ClientTrigger = 0x017C, // updated 5.2
+    ZoneLineHandler = 0x0163, // updated 5.21
+    ClientTrigger = 0x01A0, // updated 5.21
     DiscoveryHandler = 0x019A, // updated 5.2
 
     PlaceFieldMarker = 0x013C, // updated 5.0
-    SkillHandler = 0x0225, // updated 5.2
+    SkillHandler = 0x0372, // updated 5.21
     GMCommand1 = 0x0393, // updated 5.2
     GMCommand2 = 0x020B, // updated 5.2
     AoESkillHandler = 0x0072, // updated 5.18
 
-    UpdatePositionHandler = 0x0270, // updated 5.2
+    UpdatePositionHandler = 0x031A, // updated 5.21
 
-    InventoryModifyHandler = 0x02E4, // updated 5.2
+    InventoryModifyHandler = 0x0073, // updated 5.21
     
     InventoryEquipRecommendedItems = 0x0149, // updated 5.0
 
     ReqPlaceHousingItem = 0x014B, // updated 5.0
     BuildPresetHandler = 0x0150, // updated 5.0
 
-    TalkEventHandler = 0x0340, // updated 5.2
+    TalkEventHandler = 0x02CF, // updated 5.21
     EmoteEventHandler = 0x01E1, // updated 5.2
     WithinRangeEventHandler = 0x010E, // updated 5.2
     OutOfRangeEventHandler = 0x00AE, // updated 5.2
     EnterTeriEventHandler = 0x00C1, // updated 5.2
     ShopEventHandler = 0x0156, // updated 5.0
 
-    ReturnEventHandler = 0x027F, // updated 5.2
-    TradeReturnEventHandler = 0x02DB, // updated 5.2
+    ReturnEventHandler = 0x012E, // updated 5.21
+    TradeReturnEventHandler = 0x0089, // updated 5.21
 
     LinkshellEventHandler = 0x016B, // updated 4.5
     LinkshellEventHandler1 = 0x016C, // updated 4.5
 
-    ReqEquipDisplayFlagsChange = 0x02E2, // updated 5.2
+    ReqEquipDisplayFlagsChange = 0x0083, // updated 5.21
 
     LandRenameHandler = 0xF177, // updated 5.0
     HousingUpdateHouseGreeting = 0x0178, // updated 5.0
diff --git a/src/world/Actor/Player.cpp b/src/world/Actor/Player.cpp
index 73f420f5..8559955a 100644
--- a/src/world/Actor/Player.cpp
+++ b/src/world/Actor/Player.cpp
@@ -1803,6 +1803,15 @@ void Sapphire::Entity::Player::sendZonePackets()
     queuePacket( unk320 );
   }
 
+  //this is needed from 5.21, after InitZone and before FinishLoadingHandler
+  auto classInfoPacket = makeZonePacket< FFXIVIpcUpdateClassInfo >( getId() );
+  classInfoPacket->data().classId = static_cast< uint8_t > ( getClass() );
+  classInfoPacket->data().level1 = getLevel();
+  classInfoPacket->data().level = getLevel();
+  classInfoPacket->data().nextLevelIndex = getLevel();
+  classInfoPacket->data().currentExp = getExp();
+  queuePacket( classInfoPacket );
+
 //  if( getLastPing() == 0 )
 //    sendQuestInfo();
 

From 1a62cdcfa6a22420c69b34a4fc279d86862756be Mon Sep 17 00:00:00 2001
From: collett <collett0301@gmail.com>
Date: Tue, 10 Mar 2020 20:19:17 +0900
Subject: [PATCH 278/351] opcode pickup

---
 src/common/Network/PacketDef/Ipcs.h | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/common/Network/PacketDef/Ipcs.h b/src/common/Network/PacketDef/Ipcs.h
index 9f02925d..29084545 100644
--- a/src/common/Network/PacketDef/Ipcs.h
+++ b/src/common/Network/PacketDef/Ipcs.h
@@ -128,9 +128,9 @@ namespace Sapphire::Network::Packets
     BossStatusEffectList = 0x0312, // added 5.1
     Effect = 0x0371, // updated 5.21
     AoeEffect8 = 0x02DA, // updated 5.21
-    AoeEffect16 = 0x0305, // updated 5.18
-    AoeEffect24 = 0x023F, // updated 5.18
-    AoeEffect32 = 0x0352, // updated 5.18
+    AoeEffect16 = 0x012E, // updated 5.21
+    AoeEffect24 = 0x0089, // updated 5.21
+    AoeEffect32 = 0x01A9, // updated 5.21
     PersistantEffect = 0x03E7, // updated 5.21
 
     GCAffiliation = 0x016F, // updated 5.0
@@ -140,7 +140,7 @@ namespace Sapphire::Network::Packets
     NpcSpawn2 = 0x010C, // ( Bigger statuseffectlist? ) updated 5.18
     ActorMove = 0x0213, // updated 5.21
 
-    ActorSetPos = 0x00CF, // updated 5.2
+    ActorSetPos = 0x00CC, // updated 5.21
 
     ActorCast = 0x0262, // updated 5.21
     SomeCustomiseChangePacketProbably = 0x00CD, // added 5.18
@@ -179,10 +179,10 @@ namespace Sapphire::Network::Packets
     HuntingLogEntry = 0x01B3, // updated 5.0
 
     EventPlay = 0x0167, // updated 5.21
-    EventPlay4 = 0x02F7, // updated 5.18
+    EventPlay4 = 0x0313, // updated 5.21
     EventPlay8 = 0x0119, // updated 5.18
     EventPlay16 = 0x01FB, // updated 5.18
-    EventPlay32 = 0x0364, // updated 5.18
+    EventPlay32 = 0x017D, // updated 5.21
     EventPlay64 = 0x00E5, // updated 5.18
     EventPlay128 = 0x02BE, // updated 5.18
     EventPlay255 = 0x0249, // updated 5.21
@@ -219,7 +219,7 @@ namespace Sapphire::Network::Packets
 
     CFAvailableContents = 0xF1FD, // updated 4.2
 
-    WeatherChange = 0x02FB, // updated 5.11
+    WeatherChange = 0x024A, // updated 5.21
     PlayerTitleList = 0x037D, // updated 5.1
     Discovery = 0x0091, // updated 5.2
 

From f6354d3fc460efea8304abeb82dc7df2d1bff34b Mon Sep 17 00:00:00 2001
From: collett <collett0301@gmail.com>
Date: Tue, 10 Mar 2020 21:08:07 +0900
Subject: [PATCH 279/351] more 5.21 stuff

---
 src/common/Common.h                 | 10 +++++-----
 src/common/Network/PacketDef/Ipcs.h | 20 ++++++++++----------
 2 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/src/common/Common.h b/src/common/Common.h
index bc8fc621..d539ea38 100644
--- a/src/common/Common.h
+++ b/src/common/Common.h
@@ -51,11 +51,11 @@ namespace Sapphire::Common
 
   enum InventoryOperation : uint16_t
   {
-    Discard = 0x2EB,
-    Move = 0x2EC,
-    Swap = 0x2ED,
-    Merge = 0x2F0,
-    Split = 0x2EE
+    Discard = 0x07A,
+    Move = 0x007B,
+    Swap = 0x007C,
+    Split = 0x007D,
+    Merge = 0x007F,
   };
 
   enum ClientLanguage : uint8_t
diff --git a/src/common/Network/PacketDef/Ipcs.h b/src/common/Network/PacketDef/Ipcs.h
index 29084545..abaf22c9 100644
--- a/src/common/Network/PacketDef/Ipcs.h
+++ b/src/common/Network/PacketDef/Ipcs.h
@@ -63,7 +63,7 @@ namespace Sapphire::Network::Packets
 
     ChatBanned = 0x006B,
     Playtime = 0x00E7, // updated 5.18
-    Logout = 0x0A1, // updated 5.2
+    Logout = 0x01D4, // updated 5.21
     CFNotify = 0x01F8, // updated 5.18
     CFMemberStatus = 0x0079,
     CFDutyInfo = 0x007A,
@@ -194,10 +194,10 @@ namespace Sapphire::Network::Packets
     EventLinkshell = 0x1169,
 
     QuestActiveList = 0x01FA, // updated 5.21
-    QuestUpdate = 0x02CE, // updated 5.2
+    QuestUpdate = 0x00B1, // updated 5.21
     QuestCompleteList = 0x0093, // updated 5.21
 
-    QuestFinish = 0x006F, // updated 5.2
+    QuestFinish = 0x00AA, // updated 5.21
     MSQTrackerComplete = 0x01D6, // updated 5.0
     MSQTrackerProgress = 0xF1CD, // updated 4.5 ? this actually looks like the two opcodes have been combined, see #474
 
@@ -294,7 +294,7 @@ namespace Sapphire::Network::Packets
     CFRegisterDuty = 0x0071,
     CFRegisterRoulette = 0xFF72,
     PlayTimeHandler = 0x0276, // updated 5.1
-    LogoutHandler = 0x029C, // updated 5.2
+    LogoutHandler = 0x0365, // updated 5.21
     CancelLogout = 0x008F, // updated 5.1
 
     CFDutyInfoHandler = 0x0078, // updated 4.2
@@ -338,8 +338,8 @@ namespace Sapphire::Network::Packets
 
     PlaceFieldMarker = 0x013C, // updated 5.0
     SkillHandler = 0x0372, // updated 5.21
-    GMCommand1 = 0x0393, // updated 5.2
-    GMCommand2 = 0x020B, // updated 5.2
+    GMCommand1 = 0x029A, // updated 5.21
+    GMCommand2 = 0x0182, // updated 5.21
     AoESkillHandler = 0x0072, // updated 5.18
 
     UpdatePositionHandler = 0x031A, // updated 5.21
@@ -352,10 +352,10 @@ namespace Sapphire::Network::Packets
     BuildPresetHandler = 0x0150, // updated 5.0
 
     TalkEventHandler = 0x02CF, // updated 5.21
-    EmoteEventHandler = 0x01E1, // updated 5.2
-    WithinRangeEventHandler = 0x010E, // updated 5.2
-    OutOfRangeEventHandler = 0x00AE, // updated 5.2
-    EnterTeriEventHandler = 0x00C1, // updated 5.2
+    EmoteEventHandler = 0x0246, // updated 5.21
+    WithinRangeEventHandler = 0x02D1, // updated 5.21
+    OutOfRangeEventHandler = 0x02FB, // updated 5.21
+    EnterTeriEventHandler = 0x0284, // updated 5.21
     ShopEventHandler = 0x0156, // updated 5.0
 
     ReturnEventHandler = 0x012E, // updated 5.21

From eb4a6d5c73b73aea90bbd9b6d66088d5b0c2398e Mon Sep 17 00:00:00 2001
From: collett <collett0301@gmail.com>
Date: Tue, 10 Mar 2020 23:37:39 +0900
Subject: [PATCH 280/351] opcode

---
 src/common/Network/PacketDef/Ipcs.h | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/common/Network/PacketDef/Ipcs.h b/src/common/Network/PacketDef/Ipcs.h
index abaf22c9..2d2e6568 100644
--- a/src/common/Network/PacketDef/Ipcs.h
+++ b/src/common/Network/PacketDef/Ipcs.h
@@ -64,7 +64,7 @@ namespace Sapphire::Network::Packets
     ChatBanned = 0x006B,
     Playtime = 0x00E7, // updated 5.18
     Logout = 0x01D4, // updated 5.21
-    CFNotify = 0x01F8, // updated 5.18
+    CFNotify = 0x0000,//0x01F8, // updated 5.18
     CFMemberStatus = 0x0079,
     CFDutyInfo = 0x007A,
     CFPlayerInNeed = 0x007F,
@@ -78,7 +78,7 @@ namespace Sapphire::Network::Packets
 
     LogMessage = 0x00D0,
 
-    Chat = 0x0154, // updated 5.2
+    Chat = 0x022F, // updated 5.21
 
     WorldVisitList = 0x00FE, // added 4.5
 
@@ -201,7 +201,7 @@ namespace Sapphire::Network::Packets
     MSQTrackerComplete = 0x01D6, // updated 5.0
     MSQTrackerProgress = 0xF1CD, // updated 4.5 ? this actually looks like the two opcodes have been combined, see #474
 
-    QuestMessage = 0x00BF, // updated 5.18
+    QuestMessage = 0x0379, // updated 5.21
 
     QuestTracker = 0x00B0, // updated 5.21
 
@@ -302,7 +302,7 @@ namespace Sapphire::Network::Packets
     SocialReqSendHandler = 0x00AE, // updated 4.1
     CreateCrossWorldLS = 0x00AF, // updated 4.3
 
-    ChatHandler = 0x013A, // updated 5.2
+    ChatHandler = 0x034C, // updated 5.21
 
     SocialListHandler = 0x0123, // updated 5.21
     SetSearchInfoHandler = 0x00A8, // updated 5.2

From f1d06452ef6d37186771f2aa2971f8233f9493ed Mon Sep 17 00:00:00 2001
From: collett <collett0301@gmail.com>
Date: Wed, 11 Mar 2020 05:11:58 +0900
Subject: [PATCH 281/351] more opcode

---
 src/common/Network/PacketDef/Ipcs.h | 28 ++++++++++++++--------------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/src/common/Network/PacketDef/Ipcs.h b/src/common/Network/PacketDef/Ipcs.h
index 2d2e6568..bc6c29d2 100644
--- a/src/common/Network/PacketDef/Ipcs.h
+++ b/src/common/Network/PacketDef/Ipcs.h
@@ -43,7 +43,7 @@ namespace Sapphire::Network::Packets
   */
   enum ServerZoneIpcType : uint16_t
   {
-    Ping = 0x0106, // updated 5.2
+    Ping = 0x03E4, // updated 5.21
     Init = 0x00F2, // updated 5.21
 
     ActorFreeSpawn = 0x034F, // updated 5.21
@@ -62,13 +62,13 @@ namespace Sapphire::Network::Packets
     ///////////////////////////////////////////////////
 
     ChatBanned = 0x006B,
-    Playtime = 0x00E7, // updated 5.18
+    Playtime = 0x0284, // updated 5.21
     Logout = 0x01D4, // updated 5.21
-    CFNotify = 0x0000,//0x01F8, // updated 5.18
+    CFNotify = 0x0241, // updated 5.21
     CFMemberStatus = 0x0079,
     CFDutyInfo = 0x007A,
     CFPlayerInNeed = 0x007F,
-    CFPreferredRole = 0x031F, // added 5.2
+    CFPreferredRole = 0x00D4, // added 5.21
 
     SocialRequestError = 0x00AD,
 
@@ -84,8 +84,8 @@ namespace Sapphire::Network::Packets
 
     SocialList = 0x00CE, // updated 5.21
 
-    ExamineSearchInfo = 0x0186, // updated 5.2
-    UpdateSearchInfo = 0x017D, // updated 5.2
+    ExamineSearchInfo = 0x014B, // updated 5.21
+    UpdateSearchInfo = 0x00EA, // updated 5.21
     InitSearchInfo = 0x0143, // updated 5.21
     ExamineSearchComment = 0x0102, // updated 4.1
 
@@ -109,12 +109,12 @@ namespace Sapphire::Network::Packets
     ReqMoogleMailLetter = 0x0139, // updated 5.0
     MailLetterNotification = 0x013A, // updated 5.0
 
-    MarketTaxRates = 0x02CD, // updated 5.2
+    MarketTaxRates = 0x01D7, // updated 5.21
 
     MarketBoardItemListingCount = 0x030A, // updated 5.2
     MarketBoardItemListing = 0x023E, // updated 5.2
     MarketBoardItemListingHistory = 0x03C0, // updated 5.2
-    MarketBoardSearchResult = 0x03D2, // updated 5.2
+    MarketBoardSearchResult = 0x01DD, // updated 5.21
 
     CharaFreeCompanyTag = 0x013B, // updated 4.5
     FreeCompanyBoardMsg = 0x013C, // updated 4.5
@@ -159,8 +159,8 @@ namespace Sapphire::Network::Packets
     PlayerClassInfo = 0x016B, // updated 5.21
 
     ModelEquip = 0x0292, // updated 5.21
-    Examine = 0x038B, // updated 5.2
-    CharaNameReq = 0x0116, // updated 5.18
+    Examine = 0x0210, // updated 5.21
+    CharaNameReq = 0x03A6, // updated 5.21
 
     // nb: see #565 on github
     UpdateRetainerItemSalePrice = 0x019F, // updated 5.0
@@ -189,7 +189,7 @@ namespace Sapphire::Network::Packets
 
     EventStart = 0x0392, // updated 5.21
     EventFinish = 0x00EF, // updated 5.21
-    UseMooch = 0x0233, // updated 5.18
+    UseMooch = 0x006E, // updated 5.21
 
     EventLinkshell = 0x1169,
 
@@ -210,7 +210,7 @@ namespace Sapphire::Network::Packets
     DirectorVars = 0x00E6, // updated 5.18
     SomeDirectorUnk1 = 0x0084, // updated 5.18
     SomeDirectorUnk2 = 0x00C1, // updated 5.18
-    SomeDirectorUnk4 = 0x0100, // updated 5.18
+    SomeDirectorUnk4 = 0x014A, // updated 5.21
     SomeDirectorUnk8 = 0x028A, // updated 5.18
     SomeDirectorUnk16 = 0x028C, // updated 5.18
     DirectorPopUp = 0x0162, // updated 5.18 - display dialogue pop-ups in duties and FATEs, for example, Teraflare's countdown
@@ -283,7 +283,7 @@ namespace Sapphire::Network::Packets
   */
   enum ClientZoneIpcType : uint16_t
   {
-    PingHandler = 0x0106, // updated 5.2
+    PingHandler = 0x03E4, // updated 5.21
     InitHandler = 0x00F2, // updated 5.21
 
     FinishLoadingHandler = 0x007D, // updated 5.21
@@ -305,7 +305,7 @@ namespace Sapphire::Network::Packets
     ChatHandler = 0x034C, // updated 5.21
 
     SocialListHandler = 0x0123, // updated 5.21
-    SetSearchInfoHandler = 0x00A8, // updated 5.2
+    SetSearchInfoHandler = 0x039B, // updated 5.21
     ReqSearchInfoHandler = 0x01CD, // updated 5.21
     ReqExamineSearchCommentHandler = 0x00E7, // updated 5.0
 

From ca651e26cadb26e99c04c8e82110a7858ea6abd0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E3=82=B3=E3=83=AC=E3=83=83=E3=83=88?=
 <59412435+collett8192@users.noreply.github.com>
Date: Thu, 12 Mar 2020 10:28:48 +0900
Subject: [PATCH 282/351] Fix nav_export memory leak. (#650)

* Fix nav_export memory leak.

* space
---
 src/tools/nav_export/nav/TiledNavmeshGenerator.cpp | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/src/tools/nav_export/nav/TiledNavmeshGenerator.cpp b/src/tools/nav_export/nav/TiledNavmeshGenerator.cpp
index ad16bc21..f5e6f00d 100644
--- a/src/tools/nav_export/nav/TiledNavmeshGenerator.cpp
+++ b/src/tools/nav_export/nav/TiledNavmeshGenerator.cpp
@@ -317,7 +317,13 @@ unsigned char* TiledNavmeshGenerator::buildTileMesh( const int tx, const int ty,
   const int ncid = rcGetChunksOverlappingRect( m_chunkyMesh, tbmin, tbmax, cid, 512 );
 
   if( !ncid )
+  {
+    rcFreeHeightField( m_solid );
+    m_solid = nullptr;
+    delete[] m_triareas;
+    m_triareas = nullptr;
     return nullptr;
+  }
 
   m_tileTriCount = 0;
 
@@ -452,6 +458,10 @@ unsigned char* TiledNavmeshGenerator::buildTileMesh( const int tx, const int ty,
 
   if( m_cset->nconts == 0 )
   {
+    rcFreeCompactHeightfield( m_chf );
+    rcFreeContourSet( m_cset );
+    m_chf = nullptr;
+    m_cset = nullptr;
     return nullptr;
   }
 

From bf65499e615215c86d6126750a27bce7ec92bc84 Mon Sep 17 00:00:00 2001
From: Arazati <35294320+Arazati@users.noreply.github.com>
Date: Fri, 13 Mar 2020 01:59:50 -0700
Subject: [PATCH 283/351] updated opcodes -collette

Was sending the player to a solo duty when trying to Examine
---
 src/common/Network/PacketDef/Ipcs.h | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/common/Network/PacketDef/Ipcs.h b/src/common/Network/PacketDef/Ipcs.h
index 19651f7b..d56cc38e 100644
--- a/src/common/Network/PacketDef/Ipcs.h
+++ b/src/common/Network/PacketDef/Ipcs.h
@@ -291,11 +291,11 @@ namespace Sapphire::Network::Packets
 
     FinishLoadingHandler = 0x01F5, // updated 5.18
 
-    CFCommenceHandler = 0x006F,
+    CFCommenceHandler = 0x0201, // updated 5.21
 
 
-    CFRegisterDuty = 0x0071,
-    CFRegisterRoulette = 0xFF72,
+    CFRegisterDuty = 0x00C4, // updated 5.21
+    CFRegisterRoulette = 0x030F, // updated 5.21
     PlayTimeHandler = 0x0276, // updated 5.1
     LogoutHandler = 0x015D, // updated 5.18
     CancelLogout = 0x008F, // updated 5.1

From 4c75f1fd3252cac2f3564dfed4bdb34f64b5afa6 Mon Sep 17 00:00:00 2001
From: Arazati <35294320+Arazati@users.noreply.github.com>
Date: Sat, 14 Mar 2020 00:31:14 -0700
Subject: [PATCH 284/351] implement dyeing items + show dyes in examine

---
 src/common/Network/CommonActorControl.h       |  2 +-
 .../Network/PacketDef/Zone/ServerZoneDef.h    |  3 +-
 src/scripts/action/common/ActionDye2472.cpp   | 27 +++++++++++++++++
 src/world/Actor/Player.cpp                    | 30 +++++++++++++++++++
 src/world/Actor/Player.h                      | 11 +++++++
 .../Network/Handlers/ClientTriggerHandler.cpp |  5 +---
 .../Network/PacketWrappers/ExaminePacket.h    |  1 +
 .../UpdateInventorySlotPacket.h               |  2 +-
 8 files changed, 74 insertions(+), 7 deletions(-)
 create mode 100644 src/scripts/action/common/ActionDye2472.cpp

diff --git a/src/common/Network/CommonActorControl.h b/src/common/Network/CommonActorControl.h
index c5a32413..d144e83c 100644
--- a/src/common/Network/CommonActorControl.h
+++ b/src/common/Network/CommonActorControl.h
@@ -372,7 +372,7 @@ namespace Sapphire::Network::ActorControl
 
     Timers = 0x1AB,
 
-    DyeItem = 0x1B5,
+    DyeItem = 0x1B0, // updated 5.21
 
     RequestChocoboInventory = 0x1C4,
 
diff --git a/src/common/Network/PacketDef/Zone/ServerZoneDef.h b/src/common/Network/PacketDef/Zone/ServerZoneDef.h
index 6e715282..e04cb1fe 100644
--- a/src/common/Network/PacketDef/Zone/ServerZoneDef.h
+++ b/src/common/Network/PacketDef/Zone/ServerZoneDef.h
@@ -1203,7 +1203,8 @@ namespace Sapphire::Network::Packets::Server
       uint32_t appearanceCatalogId;
       uint64_t crafterId;
       uint8_t quality;
-      uint8_t unknown[3];
+      uint8_t stain;
+      uint8_t unknown[2];
       struct Materia
       {
         uint16_t materiaId;
diff --git a/src/scripts/action/common/ActionDye2472.cpp b/src/scripts/action/common/ActionDye2472.cpp
new file mode 100644
index 00000000..b1049a8d
--- /dev/null
+++ b/src/scripts/action/common/ActionDye2472.cpp
@@ -0,0 +1,27 @@
+#include <ScriptObject.h>
+#include <Actor/Player.h>
+#include <Action/Action.h>
+#include <Inventory/Item.h>
+
+class ActionDye2472 :
+  public Sapphire::ScriptAPI::ActionScript
+{
+public:
+  ActionDye2472() :
+    Sapphire::ScriptAPI::ActionScript( 2472 )
+  {
+  }
+
+  void onExecute( Sapphire::World::Action::Action& action ) override
+  {
+    auto sourceChara = action.getSourceChara();
+
+    if( !sourceChara->isPlayer() )
+      return;
+
+    //TODO: Effect
+    sourceChara->getAsPlayer()->dyeItemFromDyeingInfo();
+  }
+};
+
+EXPOSE_SCRIPT(ActionDye2472);
\ No newline at end of file
diff --git a/src/world/Actor/Player.cpp b/src/world/Actor/Player.cpp
index dc616600..5eee8372 100644
--- a/src/world/Actor/Player.cpp
+++ b/src/world/Actor/Player.cpp
@@ -1926,6 +1926,36 @@ uint8_t Sapphire::Entity::Player::getNextObjSpawnIndexForActorId( uint32_t actor
   return index;
 }
 
+void Sapphire::Entity::Player::setDyeingInfo( uint32_t itemToDyeContainer, uint32_t itemToDyeSlot, uint32_t dyeBagContainer, uint32_t dyeBagSlot)
+{
+  m_dyeingInfo.itemToDyeContainer = itemToDyeContainer;
+  m_dyeingInfo.itemToDyeSlot = itemToDyeSlot;
+  m_dyeingInfo.dyeBagContainer = dyeBagContainer;
+  m_dyeingInfo.dyeBagSlot = dyeBagSlot;
+}
+
+void Sapphire::Entity::Player::dyeItemFromDyeingInfo()
+{
+  uint32_t itemToDyeContainer = m_dyeingInfo.itemToDyeContainer;
+  uint32_t itemToDyeSlot = m_dyeingInfo.itemToDyeSlot;
+  uint32_t dyeBagContainer = m_dyeingInfo.dyeBagContainer;
+  uint32_t dyeBagSlot = m_dyeingInfo.dyeBagSlot;
+
+  sendStateFlags(); // Retail sends all 0s to unlock player after a dye? Possibly not setting a flag when the action is started in the backend..?
+  auto itemToDye = getItemAt(itemToDyeContainer, itemToDyeSlot);
+  auto dyeToUse = getItemAt(dyeBagContainer, dyeBagSlot);
+
+  if (!itemToDye || !dyeToUse) return;
+
+  uint32_t stainColorID = dyeToUse->getAdditionalData();
+  itemToDye->setStain(stainColorID);
+
+  //TODO: subtract/remove dye used
+
+  insertInventoryItem((Sapphire::Common::InventoryType)itemToDyeContainer, (uint16_t)itemToDyeSlot, itemToDye);
+  writeItem(itemToDye);
+}
+
 void Sapphire::Entity::Player::resetObjSpawnIndex()
 {
   m_objSpawnIndexAllocator.freeAllSpawnIndexes();
diff --git a/src/world/Actor/Player.h b/src/world/Actor/Player.h
index 26984e17..65cd334f 100644
--- a/src/world/Actor/Player.h
+++ b/src/world/Actor/Player.h
@@ -536,6 +536,9 @@ namespace Sapphire::Entity
 
     void clearTeleportQuery();
 
+    void setDyeingInfo(uint32_t itemToDyeContainer, uint32_t itemToDyeSlot, uint32_t dyeBagContainer, uint32_t dyeBagSlot);
+    void dyeItemFromDyeingInfo();
+
     /*! prepares zoning / fades out the screen */
     void prepareZoning( uint16_t targetZone, bool fadeOut, uint8_t fadeOutTime = 0, uint16_t animation = 0 );
 
@@ -1114,6 +1117,14 @@ namespace Sapphire::Entity
 
     Common::PlayerTeleportQuery m_teleportQuery;
 
+    struct PlayerDyeingInfo
+    {
+      uint32_t itemToDyeContainer;
+      uint32_t itemToDyeSlot;
+      uint32_t dyeBagContainer;
+      uint32_t dyeBagSlot;
+    }; PlayerDyeingInfo m_dyeingInfo;
+
     Common::Util::SpawnIndexAllocator< uint8_t > m_objSpawnIndexAllocator;
     Common::Util::SpawnIndexAllocator< uint8_t > m_actorSpawnIndexAllocator;
 
diff --git a/src/world/Network/Handlers/ClientTriggerHandler.cpp b/src/world/Network/Handlers/ClientTriggerHandler.cpp
index b6decf1b..e87be3c4 100644
--- a/src/world/Network/Handlers/ClientTriggerHandler.cpp
+++ b/src/world/Network/Handlers/ClientTriggerHandler.cpp
@@ -279,10 +279,7 @@ void Sapphire::Network::GameConnection::clientTriggerHandler( FrameworkPtr pFw,
     }
     case ClientTriggerType::DyeItem: // Dye item
     {
-      // param11 = item to dye container
-      // param12 = item to dye slot
-      // param2 = dye bag container
-      // param4 = dye bag slot
+      player.setDyeingInfo(param11, param12, param2, param4);
       break;
     }
     case ClientTriggerType::DirectorInitFinish: // Director init finish
diff --git a/src/world/Network/PacketWrappers/ExaminePacket.h b/src/world/Network/PacketWrappers/ExaminePacket.h
index 37baee37..a42b11ea 100644
--- a/src/world/Network/PacketWrappers/ExaminePacket.h
+++ b/src/world/Network/PacketWrappers/ExaminePacket.h
@@ -74,6 +74,7 @@ namespace Sapphire::Network::Packets::Server
             auto& entry = m_data.entries[i];
             entry.catalogId = pItem->getId();
             entry.quality = pItem->isHq();
+            entry.stain = (uint8_t)pItem->getStain(); //NOTE: More of this packet may be dye info?
             //entry.appearanceCatalogId = pItem->getGlamourId()
             // todo: glamour/materia etc.
           }
diff --git a/src/world/Network/PacketWrappers/UpdateInventorySlotPacket.h b/src/world/Network/PacketWrappers/UpdateInventorySlotPacket.h
index 3c6e8c1c..c16042d2 100644
--- a/src/world/Network/PacketWrappers/UpdateInventorySlotPacket.h
+++ b/src/world/Network/PacketWrappers/UpdateInventorySlotPacket.h
@@ -34,7 +34,7 @@ namespace Sapphire::Network::Packets::Server
       m_data.hqFlag = item.isHq() ? 1 : 0;
       m_data.condition = 60000; // 200%
       m_data.spiritBond = item.getSpiritbond();
-      m_data.color = 0;
+      m_data.color = item.getStain();
       m_data.glamourCatalogId = 0;
       m_data.materia1 = 0;
       m_data.materia2 = 0;

From cb2211a8f8e6afaf8c60df227fe7b4379ed593c8 Mon Sep 17 00:00:00 2001
From: collett <collett0301@gmail.com>
Date: Sun, 15 Mar 2020 22:12:55 +0900
Subject: [PATCH 285/351] add new packet

---
 src/common/Network/PacketDef/Ipcs.h               | 1 +
 src/common/Network/PacketDef/Zone/ServerZoneDef.h | 6 ++++++
 src/world/Manager/DebugCommandMgr.cpp             | 8 ++++++++
 3 files changed, 15 insertions(+)

diff --git a/src/common/Network/PacketDef/Ipcs.h b/src/common/Network/PacketDef/Ipcs.h
index bc6c29d2..8e9c9879 100644
--- a/src/common/Network/PacketDef/Ipcs.h
+++ b/src/common/Network/PacketDef/Ipcs.h
@@ -157,6 +157,7 @@ namespace Sapphire::Network::Packets
     ActorOwner = 0x0385, // updated 5.21
     PlayerStateFlags = 0x02E1, // updated 5.21
     PlayerClassInfo = 0x016B, // updated 5.21
+    CharaVisualEffect = 0x00AB, // updated 5.21
 
     ModelEquip = 0x0292, // updated 5.21
     Examine = 0x0210, // updated 5.21
diff --git a/src/common/Network/PacketDef/Zone/ServerZoneDef.h b/src/common/Network/PacketDef/Zone/ServerZoneDef.h
index daf50c8a..5e4c2db2 100644
--- a/src/common/Network/PacketDef/Zone/ServerZoneDef.h
+++ b/src/common/Network/PacketDef/Zone/ServerZoneDef.h
@@ -1991,6 +1991,12 @@ namespace Sapphire::Network::Packets::Server
     char otherName[32];
   };
 
+  struct FFXIVIpcCharaVisualEffect : FFXIVIpcBasePacket< CharaVisualEffect >
+  {
+    uint32_t id;
+    uint32_t padding;
+  };
+
 }
 
 #endif /*_CORE_NETWORK_PACKETS_SERVER_IPC_H*/
diff --git a/src/world/Manager/DebugCommandMgr.cpp b/src/world/Manager/DebugCommandMgr.cpp
index 54be2fdb..142c838c 100644
--- a/src/world/Manager/DebugCommandMgr.cpp
+++ b/src/world/Manager/DebugCommandMgr.cpp
@@ -361,6 +361,14 @@ void Sapphire::World::Manager::DebugCommandMgr::set( char* data, Entity::Player&
       }
     }
   }
+  else if( subCommand == "visual" )
+  {
+    int32_t id;
+    sscanf( params.c_str(), "%d", &id );
+    auto pPacket = makeZonePacket< FFXIVIpcCharaVisualEffect >( player.getId() );
+    pPacket->data().id = id;
+    player.queuePacket( pPacket );
+  }
   else
   {
     player.sendUrgent( "{0} is not a valid SET command.", subCommand );

From 02f1bd71c5525f12a0c00babffb7d590a61a5b8f Mon Sep 17 00:00:00 2001
From: Arazati <35294320+Arazati@users.noreply.github.com>
Date: Mon, 16 Mar 2020 01:35:49 -0700
Subject: [PATCH 286/351] style + cast changes

---
 src/world/Actor/Player.cpp                       | 16 ++++++++--------
 src/world/Actor/Player.h                         |  4 ++--
 .../Network/Handlers/ClientTriggerHandler.cpp    |  6 +++++-
 src/world/Network/PacketWrappers/ExaminePacket.h |  2 +-
 4 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/src/world/Actor/Player.cpp b/src/world/Actor/Player.cpp
index 5eee8372..e98f8008 100644
--- a/src/world/Actor/Player.cpp
+++ b/src/world/Actor/Player.cpp
@@ -1926,7 +1926,7 @@ uint8_t Sapphire::Entity::Player::getNextObjSpawnIndexForActorId( uint32_t actor
   return index;
 }
 
-void Sapphire::Entity::Player::setDyeingInfo( uint32_t itemToDyeContainer, uint32_t itemToDyeSlot, uint32_t dyeBagContainer, uint32_t dyeBagSlot)
+void Sapphire::Entity::Player::setDyeingInfo( uint32_t itemToDyeContainer, uint32_t itemToDyeSlot, uint32_t dyeBagContainer, uint32_t dyeBagSlot )
 {
   m_dyeingInfo.itemToDyeContainer = itemToDyeContainer;
   m_dyeingInfo.itemToDyeSlot = itemToDyeSlot;
@@ -1942,18 +1942,18 @@ void Sapphire::Entity::Player::dyeItemFromDyeingInfo()
   uint32_t dyeBagSlot = m_dyeingInfo.dyeBagSlot;
 
   sendStateFlags(); // Retail sends all 0s to unlock player after a dye? Possibly not setting a flag when the action is started in the backend..?
-  auto itemToDye = getItemAt(itemToDyeContainer, itemToDyeSlot);
-  auto dyeToUse = getItemAt(dyeBagContainer, dyeBagSlot);
+  auto itemToDye = getItemAt( itemToDyeContainer, itemToDyeSlot );
+  auto dyeToUse = getItemAt( dyeBagContainer, dyeBagSlot );
 
-  if (!itemToDye || !dyeToUse) return;
+  if ( !itemToDye || !dyeToUse ) return;
 
   uint32_t stainColorID = dyeToUse->getAdditionalData();
-  itemToDye->setStain(stainColorID);
+  itemToDye->setStain( stainColorID );
 
-  //TODO: subtract/remove dye used
+  // TODO: subtract/remove dye used
 
-  insertInventoryItem((Sapphire::Common::InventoryType)itemToDyeContainer, (uint16_t)itemToDyeSlot, itemToDye);
-  writeItem(itemToDye);
+  insertInventoryItem( static_cast < Sapphire::Common::InventoryType > ( itemToDyeContainer ), static_cast < uint16_t > ( itemToDyeSlot ), itemToDye );
+  writeItem( itemToDye );
 }
 
 void Sapphire::Entity::Player::resetObjSpawnIndex()
diff --git a/src/world/Actor/Player.h b/src/world/Actor/Player.h
index 65cd334f..f74f864b 100644
--- a/src/world/Actor/Player.h
+++ b/src/world/Actor/Player.h
@@ -536,7 +536,7 @@ namespace Sapphire::Entity
 
     void clearTeleportQuery();
 
-    void setDyeingInfo(uint32_t itemToDyeContainer, uint32_t itemToDyeSlot, uint32_t dyeBagContainer, uint32_t dyeBagSlot);
+    void setDyeingInfo( uint32_t itemToDyeContainer, uint32_t itemToDyeSlot, uint32_t dyeBagContainer, uint32_t dyeBagSlot );
     void dyeItemFromDyeingInfo();
 
     /*! prepares zoning / fades out the screen */
@@ -1123,7 +1123,7 @@ namespace Sapphire::Entity
       uint32_t itemToDyeSlot;
       uint32_t dyeBagContainer;
       uint32_t dyeBagSlot;
-    }; PlayerDyeingInfo m_dyeingInfo;
+    } m_dyeingInfo;
 
     Common::Util::SpawnIndexAllocator< uint8_t > m_objSpawnIndexAllocator;
     Common::Util::SpawnIndexAllocator< uint8_t > m_actorSpawnIndexAllocator;
diff --git a/src/world/Network/Handlers/ClientTriggerHandler.cpp b/src/world/Network/Handlers/ClientTriggerHandler.cpp
index e87be3c4..d0d56ccc 100644
--- a/src/world/Network/Handlers/ClientTriggerHandler.cpp
+++ b/src/world/Network/Handlers/ClientTriggerHandler.cpp
@@ -279,7 +279,11 @@ void Sapphire::Network::GameConnection::clientTriggerHandler( FrameworkPtr pFw,
     }
     case ClientTriggerType::DyeItem: // Dye item
     {
-      player.setDyeingInfo(param11, param12, param2, param4);
+      // param11 = item to dye container
+      // param12 = item to dye slot
+      // param2 = dye bag container
+      // param4 = dye bag slot
+      player.setDyeingInfo( param11, param12, param2, param4 );
       break;
     }
     case ClientTriggerType::DirectorInitFinish: // Director init finish
diff --git a/src/world/Network/PacketWrappers/ExaminePacket.h b/src/world/Network/PacketWrappers/ExaminePacket.h
index a42b11ea..13f54726 100644
--- a/src/world/Network/PacketWrappers/ExaminePacket.h
+++ b/src/world/Network/PacketWrappers/ExaminePacket.h
@@ -74,7 +74,7 @@ namespace Sapphire::Network::Packets::Server
             auto& entry = m_data.entries[i];
             entry.catalogId = pItem->getId();
             entry.quality = pItem->isHq();
-            entry.stain = (uint8_t)pItem->getStain(); //NOTE: More of this packet may be dye info?
+            entry.stain = static_cast < uint8_t > ( pItem->getStain() );
             //entry.appearanceCatalogId = pItem->getGlamourId()
             // todo: glamour/materia etc.
           }

From 1496999358814042c568b5cdf153f7453a94656b Mon Sep 17 00:00:00 2001
From: Arazati <35294320+Arazati@users.noreply.github.com>
Date: Mon, 16 Mar 2020 02:08:35 -0700
Subject: [PATCH 287/351] more style changes

---
 src/world/Actor/Player.cpp                       | 2 +-
 src/world/Network/PacketWrappers/ExaminePacket.h | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/world/Actor/Player.cpp b/src/world/Actor/Player.cpp
index e98f8008..274f336f 100644
--- a/src/world/Actor/Player.cpp
+++ b/src/world/Actor/Player.cpp
@@ -1952,7 +1952,7 @@ void Sapphire::Entity::Player::dyeItemFromDyeingInfo()
 
   // TODO: subtract/remove dye used
 
-  insertInventoryItem( static_cast < Sapphire::Common::InventoryType > ( itemToDyeContainer ), static_cast < uint16_t > ( itemToDyeSlot ), itemToDye );
+  insertInventoryItem( static_cast< Sapphire::Common::InventoryType >( itemToDyeContainer ), static_cast< uint16_t >( itemToDyeSlot ), itemToDye );
   writeItem( itemToDye );
 }
 
diff --git a/src/world/Network/PacketWrappers/ExaminePacket.h b/src/world/Network/PacketWrappers/ExaminePacket.h
index 13f54726..55b16c56 100644
--- a/src/world/Network/PacketWrappers/ExaminePacket.h
+++ b/src/world/Network/PacketWrappers/ExaminePacket.h
@@ -74,7 +74,7 @@ namespace Sapphire::Network::Packets::Server
             auto& entry = m_data.entries[i];
             entry.catalogId = pItem->getId();
             entry.quality = pItem->isHq();
-            entry.stain = static_cast < uint8_t > ( pItem->getStain() );
+            entry.stain = static_cast< uint8_t >( pItem->getStain() );
             //entry.appearanceCatalogId = pItem->getGlamourId()
             // todo: glamour/materia etc.
           }

From baad397507eede36308e63f0226ea0fde0ea3791 Mon Sep 17 00:00:00 2001
From: collett <collett0301@gmail.com>
Date: Tue, 17 Mar 2020 22:23:26 +0900
Subject: [PATCH 288/351] update 5.21 hotfix, load player stats after
 inventory.

---
 src/common/Common.h                 |  10 +-
 src/common/Network/PacketDef/Ipcs.h | 154 ++++++++++++++--------------
 src/world/Actor/PlayerSql.cpp       |  20 ++--
 3 files changed, 89 insertions(+), 95 deletions(-)

diff --git a/src/common/Common.h b/src/common/Common.h
index d539ea38..f663ed7a 100644
--- a/src/common/Common.h
+++ b/src/common/Common.h
@@ -51,11 +51,11 @@ namespace Sapphire::Common
 
   enum InventoryOperation : uint16_t
   {
-    Discard = 0x07A,
-    Move = 0x007B,
-    Swap = 0x007C,
-    Split = 0x007D,
-    Merge = 0x007F,
+    Discard = 0x06E,
+    Move = 0x006F,
+    Swap = 0x0070,
+    Split = 0x0071,
+    Merge = 0x0073,
   };
 
   enum ClientLanguage : uint8_t
diff --git a/src/common/Network/PacketDef/Ipcs.h b/src/common/Network/PacketDef/Ipcs.h
index 06b9e40a..72f88446 100644
--- a/src/common/Network/PacketDef/Ipcs.h
+++ b/src/common/Network/PacketDef/Ipcs.h
@@ -43,31 +43,31 @@ namespace Sapphire::Network::Packets
   */
   enum ServerZoneIpcType : uint16_t
   {
-    Ping = 0x03E4, // updated 5.21
-    Init = 0x00F2, // updated 5.21
+    Ping = 0x012C, // updated 5.21 hotfix
+    Init = 0x010D, // updated 5.21 hotfix
 
-    ActorFreeSpawn = 0x034F, // updated 5.21
-    InitZone = 0x019C, // updated 5.21
+    ActorFreeSpawn = 0x006C, // updated 5.21 hotfix
+    InitZone = 0x037B, // updated 5.21 hotfix
 
     EffectResult = 0x02CF, // updated 5.21
-    ActorControl = 0x0246, // updated 5.21
-    ActorControlSelf = 0x02D1, // updated 5.21
-    ActorControlTarget = 0x02FB, // updated 5.21
+    ActorControl = 0x0380, // updated 5.21 hotfix
+    ActorControlSelf = 0x0253, // updated 5.21 hotfix
+    ActorControlTarget = 0x0206, // updated 5.21 hotfix
 
     /*!
      * @brief Used when resting
      */
-    UpdateHpMpTp = 0x0284, // updated 5.21
+    UpdateHpMpTp = 0x01B8, // updated 5.21 hotfix
 
     ///////////////////////////////////////////////////
 
     ChatBanned = 0x006B,
     Playtime = 0x0284, // updated 5.21
-    Logout = 0x01D4, // updated 5.21
+    Logout = 0x02A8, // updated 5.21 hotfix
     CFNotify = 0x0241, // updated 5.21
     CFMemberStatus = 0x0079,
     CFDutyInfo = 0x007A,
-    CFPlayerInNeed = 0x007F,
+    CFPlayerInNeed = 0xF07F,
     CFPreferredRole = 0x00D4, // added 5.21
 
     SocialRequestError = 0x00AD,
@@ -78,29 +78,29 @@ namespace Sapphire::Network::Packets
 
     LogMessage = 0x00D0,
 
-    Chat = 0x022F, // updated 5.21
+    Chat = 0x012B, // updated 5.21 hotfix
 
     WorldVisitList = 0x00FE, // added 4.5
 
-    SocialList = 0x00CE, // updated 5.21
+    SocialList = 0x0172, // updated 5.21 hotfix
 
     ExamineSearchInfo = 0x014B, // updated 5.21
     UpdateSearchInfo = 0x00EA, // updated 5.21
-    InitSearchInfo = 0x0143, // updated 5.21
+    InitSearchInfo = 0x00D1, // updated 5.21 hotfix
     ExamineSearchComment = 0x0102, // updated 4.1
 
     ServerNoticeShort = 0x0115, // updated 5.0
-    ServerNotice = 0x016F, // updated 5.21
-    SetOnlineStatus = 0x01EA, // updated 5.21
+    ServerNotice = 0x0192, // updated 5.21 hotfix
+    SetOnlineStatus = 0x0109, // updated 5.21 hotfix
 
     CountdownInitiate = 0x0309, // updated 5.11
     CountdownCancel = 0x00D9, // updated 5.18
 
     PlayerAddedToBlacklist = 0x033F, // updated 5.1
     PlayerRemovedFromBlacklist = 0x0385, // updated 5.1
-    BlackList = 0x01DE, // updated 5.21
+    BlackList = 0x0224, // updated 5.21 hotfix
 
-    LinkshellList = 0x01EB, // updated 5.21
+    LinkshellList = 0x0395, // updated 5.21 hotfix
 
     MailDeleteRequest = 0x012B, // updated 5.0
 
@@ -123,22 +123,22 @@ namespace Sapphire::Network::Packets
 
     FreeCompanyUpdateShortMessage = 0x0157, // added 5.0
 
-    StatusEffectList = 0x01B8, // updated 5.21
+    StatusEffectList = 0x0327, // updated 5.21 hotfix
     EurekaStatusEffectList = 0x0167, // updated 5.18
     BossStatusEffectList = 0x0312, // added 5.1
-    Effect = 0x0371, // updated 5.21
-    AoeEffect8 = 0x02DA, // updated 5.21
+    Effect = 0x0252, // updated 5.21 hotfix
+    AoeEffect8 = 0x0140, // updated 5.21 hotfix
     AoeEffect16 = 0x012E, // updated 5.21
     AoeEffect24 = 0x0089, // updated 5.21
     AoeEffect32 = 0x01A9, // updated 5.21
-    PersistantEffect = 0x03E7, // updated 5.21
+    PersistantEffect = 0x0110, // updated 5.21 hotfix
 
     GCAffiliation = 0x016F, // updated 5.0
 
-    PlayerSpawn = 0x018E, // updated 5.21
-    NpcSpawn = 0x023A, // updated 5.21
+    PlayerSpawn = 0x033D, // updated 5.21 hotfix
+    NpcSpawn = 0x00B3, // updated 5.21 hotfix
     NpcSpawn2 = 0x010C, // ( Bigger statuseffectlist? ) updated 5.18
-    ActorMove = 0x0213, // updated 5.21
+    ActorMove = 0x0080, // updated 5.21 hotfix
 
     ActorSetPos = 0x00CC, // updated 5.21
 
@@ -146,20 +146,20 @@ namespace Sapphire::Network::Packets
     SomeCustomiseChangePacketProbably = 0x00CD, // added 5.18
 
     PartyList = 0x0287, // updated 5.18
-    HateRank = 0x008F, // updated 5.21
-    HateList = 0x01C5, // updated 5.21
+    HateRank = 0x0381, // updated 5.21 hotfix
+    HateList = 0x01F0, // updated 5.21 hotfix
     ObjectSpawn = 0x01B3, // updated 5.2
     ObjectDespawn = 0x034B, // updated 5.18
-    UpdateClassInfo = 0x0145, // updated 5.21
+    UpdateClassInfo = 0x0235, // updated 5.21 hotfix
     SilentSetClassJob = 0x018E, // updated 5.0 - seems to be the case, not sure if it's actually used for anything
-    PlayerSetup = 0x028A, // updated 5.21
-    PlayerStats = 0x0112, // updated 5.21
-    ActorOwner = 0x0385, // updated 5.21
-    PlayerStateFlags = 0x02E1, // updated 5.21
+    PlayerSetup = 0x0316, // updated 5.21 hotfix
+    PlayerStats = 0x03E1, // updated 5.21 hotfix
+    ActorOwner = 0x03C8, // updated 5.21 hotfix
+    PlayerStateFlags = 0x00AA, // updated 5.21 hotfix
     PlayerClassInfo = 0x016B, // updated 5.21
-    CharaVisualEffect = 0x00AB, // updated 5.21
+    CharaVisualEffect = 0x030C, // updated 5.21 hotfix
 
-    ModelEquip = 0x0292, // updated 5.21
+    ModelEquip = 0x03A2, // updated 5.21 hotfix
     Examine = 0x0210, // updated 5.21
     CharaNameReq = 0x03A6, // updated 5.21
 
@@ -168,45 +168,45 @@ namespace Sapphire::Network::Packets
 
     SetLevelSync = 0x1186, // not updated for 4.4, not sure what it is anymore
 
-    ItemInfo = 0x009E, // updated 5.21
-    ContainerInfo = 0x0315, // updated 5.21
-    InventoryTransactionFinish = 0x030E, // updated 5.21
-    InventoryTransaction = 0x006E, // updated 5.21
-    CurrencyCrystalInfo = 0x00E9, // updated 5.21
+    ItemInfo = 0x0244, // updated 5.21 hotfix
+    ContainerInfo = 0x03BB, // updated 5.21 hotfix
+    InventoryTransactionFinish = 0x0274, // updated 5.21 hotfix
+    InventoryTransaction = 0x00202, // updated 5.21 hotfix
+    CurrencyCrystalInfo = 0x017F, // updated 5.21 hotfix
 
-    InventoryActionAck = 0x01F8, // updated 5.21
-    UpdateInventorySlot = 0x006F, // updated 5.21
+    InventoryActionAck = 0x01B2, // updated 5.21 hotfix
+    UpdateInventorySlot = 0x0213, // updated 5.21 hotfix
 
     HuntingLogEntry = 0x01B3, // updated 5.0
 
-    EventPlay = 0x0167, // updated 5.21
+    EventPlay = 0x007F, // updated 5.21 hotfix
     EventPlay4 = 0x0313, // updated 5.21
     EventPlay8 = 0x0119, // updated 5.18
     EventPlay16 = 0x01FB, // updated 5.18
     EventPlay32 = 0x017D, // updated 5.21
     EventPlay64 = 0x00E5, // updated 5.18
     EventPlay128 = 0x02BE, // updated 5.18
-    EventPlay255 = 0x0249, // updated 5.21
+    EventPlay255 = 0x00D9, // updated 5.21 hotfix
 
-    EventStart = 0x0392, // updated 5.21
-    EventFinish = 0x00EF, // updated 5.21
+    EventStart = 0x03E4, // updated 5.21 hotfix
+    EventFinish = 0x0197, // updated 5.21 hotfix
     UseMooch = 0x006E, // updated 5.21
 
     EventLinkshell = 0x1169,
 
-    QuestActiveList = 0x01FA, // updated 5.21
-    QuestUpdate = 0x00B1, // updated 5.21
-    QuestCompleteList = 0x0093, // updated 5.21
+    QuestActiveList = 0x03D7, // updated 5.21 hotfix
+    QuestUpdate = 0x01F8, // updated 5.21 hotfix
+    QuestCompleteList = 0x0084, // updated 5.21 hotfix
 
-    QuestFinish = 0x00AA, // updated 5.21
+    QuestFinish = 0x01FE, // updated 5.21 hotfix
     MSQTrackerComplete = 0x01D6, // updated 5.0
     MSQTrackerProgress = 0xF1CD, // updated 4.5 ? this actually looks like the two opcodes have been combined, see #474
 
-    QuestMessage = 0x0379, // updated 5.21
+    QuestMessage = 0x0324, // updated 5.21 hotfix
 
-    QuestTracker = 0x00B0, // updated 5.21
+    QuestTracker = 0x02CA, // updated 5.21 hotfix
 
-    Mount = 0x036C, // updated 5.21
+    Mount = 0x02F1, // updated 5.21 hotfix
 
     DirectorVars = 0x00E6, // updated 5.18
     SomeDirectorUnk1 = 0x0084, // updated 5.18
@@ -226,7 +226,7 @@ namespace Sapphire::Network::Packets
 
     EorzeaTimeOffset = 0x03B8, // updated 5.1
 
-    EquipDisplayFlags = 0x012F, // updated 5.21
+    EquipDisplayFlags = 0x006E, // updated 5.21 hotfix
 
     /// Housing //////////////////////////////////////
 
@@ -239,7 +239,7 @@ namespace Sapphire::Network::Packets
     LandRename = 0x023A, // updated 5.0
     HousingEstateGreeting = 0x023B, // updated 5.0
     HousingUpdateLandFlagsSlot = 0x023C, // updated 5.0
-    HousingLandFlags = 0x0291, // updated 5.21
+    HousingLandFlags = 0x02D8, // updated 5.21 hotfix
     HousingShowEstateGuestAccess = 0x023E, // updated 5.0
 
     HousingObjectInitialize = 0x0240, // updated 5.0
@@ -259,12 +259,12 @@ namespace Sapphire::Network::Packets
     DuelChallenge = 0x0277, // 4.2; this is responsible for opening the ui
     PerformNote = 0x0286, // updated 4.3
 
-    PrepareZoning = 0x01BE, // updated 5.21
-    ActorGauge = 0x03BB, // updated 5.21
+    PrepareZoning = 0x00B6, // updated 5.21 hotfix
+    ActorGauge = 0x00C7, // updated 5.21 hotfix
 
     // daily quest info -> without them sent,  login will take longer...
-    DailyQuests = 0x00E4, // updated 5.21
-    DailyQuestRepeatFlags = 0x0068, // updated 5.21
+    DailyQuests = 0x0130, // updated 5.21 hotfix
+    DailyQuestRepeatFlags = 0x02BA, // updated 5.21 hotfix
 
     /// Doman Mahjong //////////////////////////////////////
     MahjongOpenGui = 0x02A4, // only available in mahjong instance
@@ -284,10 +284,10 @@ namespace Sapphire::Network::Packets
   */
   enum ClientZoneIpcType : uint16_t
   {
-    PingHandler = 0x03E4, // updated 5.21
-    InitHandler = 0x00F2, // updated 5.21
+    PingHandler = 0x012C, // updated 5.21 hotfix
+    InitHandler = 0x010D, // updated 5.21 hotfix
 
-    FinishLoadingHandler = 0x007D, // updated 5.21
+    FinishLoadingHandler = 0x0158, // updated 5.21 hotfix
 
     CFCommenceHandler = 0x0201, // updated 5.21
 
@@ -295,7 +295,7 @@ namespace Sapphire::Network::Packets
     CFRegisterDuty = 0x00C4, // updated 5.21
     CFRegisterRoulette = 0x030F, // updated 5.21
     PlayTimeHandler = 0x0276, // updated 5.1
-    LogoutHandler = 0x0365, // updated 5.21
+    LogoutHandler = 0x0139, // updated 5.21 hotfix
     CancelLogout = 0x008F, // updated 5.1
 
     CFDutyInfoHandler = 0x0078, // updated 4.2
@@ -303,18 +303,18 @@ namespace Sapphire::Network::Packets
     SocialReqSendHandler = 0x00AE, // updated 4.1
     CreateCrossWorldLS = 0x00AF, // updated 4.3
 
-    ChatHandler = 0x034C, // updated 5.21
+    ChatHandler = 0x03AB, // updated 5.21 hotfix
 
-    SocialListHandler = 0x0123, // updated 5.21
+    SocialListHandler = 0x02B9, // updated 5.21 hotfix
     SetSearchInfoHandler = 0x039B, // updated 5.21
-    ReqSearchInfoHandler = 0x01CD, // updated 5.21
+    ReqSearchInfoHandler = 0x026F, // updated 5.21 hotfix
     ReqExamineSearchCommentHandler = 0x00E7, // updated 5.0
 
     ReqRemovePlayerFromBlacklist = 0x00F1, // updated 5.0
-    BlackListHandler = 0x0358, // updated 5.21
+    BlackListHandler = 0x0157, // updated 5.21 hotfix
     PlayerSearchHandler = 0x00F4, // updated 5.0
 
-    LinkshellListHandler = 0x01CF, // updated 5.21
+    LinkshellListHandler = 0x01DE, // updated 5.21 hotfix
 
     MarketBoardRequestItemListingInfo = 0x0102, // updated 4.5
     MarketBoardRequestItemListings = 0x0103, // updated 4.5
@@ -333,39 +333,39 @@ namespace Sapphire::Network::Packets
     ReqCountdownInitiate = 0x0135, // updated 5.0
     ReqCountdownCancel = 0x0136, // updated 5.0
 
-    ZoneLineHandler = 0x0163, // updated 5.21
-    ClientTrigger = 0x01A0, // updated 5.21
+    ZoneLineHandler = 0x025E, // updated 5.21 hotfix
+    ClientTrigger = 0x017E, // updated 5.21 hotfix
     DiscoveryHandler = 0x019A, // updated 5.2
 
     PlaceFieldMarker = 0x013C, // updated 5.0
-    SkillHandler = 0x0372, // updated 5.21
-    GMCommand1 = 0x029A, // updated 5.21
-    GMCommand2 = 0x0182, // updated 5.21
+    SkillHandler = 0x0073, // updated 5.21 hotfix
+    GMCommand1 = 0x0302, // updated 5.21 hotfix
+    GMCommand2 = 0x01E5, // updated 5.21 hotfix
     AoESkillHandler = 0x0072, // updated 5.18
 
-    UpdatePositionHandler = 0x031A, // updated 5.21
+    UpdatePositionHandler = 0x01B1, // updated 5.21 hotfix
 
-    InventoryModifyHandler = 0x0073, // updated 5.21
+    InventoryModifyHandler = 0x0067, // updated 5.21 hotfix
     
     InventoryEquipRecommendedItems = 0x0149, // updated 5.0
 
     ReqPlaceHousingItem = 0x014B, // updated 5.0
     BuildPresetHandler = 0x0150, // updated 5.0
 
-    TalkEventHandler = 0x02CF, // updated 5.21
+    TalkEventHandler = 0x0281, // updated 5.21 hotfix
     EmoteEventHandler = 0x0246, // updated 5.21
     WithinRangeEventHandler = 0x02D1, // updated 5.21
     OutOfRangeEventHandler = 0x02FB, // updated 5.21
     EnterTeriEventHandler = 0x0284, // updated 5.21
     ShopEventHandler = 0x0156, // updated 5.0
 
-    ReturnEventHandler = 0x012E, // updated 5.21
-    TradeReturnEventHandler = 0x0089, // updated 5.21
+    ReturnEventHandler = 0x02A2, // updated 5.21 hotfix
+    TradeReturnEventHandler = 0x01FD, // updated 5.21 hotfix
 
     LinkshellEventHandler = 0x016B, // updated 4.5
     LinkshellEventHandler1 = 0x016C, // updated 4.5
 
-    ReqEquipDisplayFlagsChange = 0x0083, // updated 5.21
+    ReqEquipDisplayFlagsChange = 0x00B5, // updated 5.21 hotfix
 
     LandRenameHandler = 0xF177, // updated 5.0
     HousingUpdateHouseGreeting = 0x0178, // updated 5.0
diff --git a/src/world/Actor/PlayerSql.cpp b/src/world/Actor/PlayerSql.cpp
index 1547e744..69df7a54 100644
--- a/src/world/Actor/PlayerSql.cpp
+++ b/src/world/Actor/PlayerSql.cpp
@@ -121,13 +121,6 @@ bool Sapphire::Entity::Player::load( uint32_t charId, World::SessionPtr pSession
     setRot( 0.0f );
   }
 
-  // Stats
-
-  m_hp = res->getUInt( "Hp" );
-  m_mp = res->getUInt( "Mp" );
-  m_tp = 0;
-
-
   // Model
   auto custom = res->getBlobVector( "Customize" );
   memcpy( reinterpret_cast< char* >( m_customize ), custom.data(), custom.size() );
@@ -209,6 +202,13 @@ bool Sapphire::Entity::Player::load( uint32_t charId, World::SessionPtr pSession
   if( !loadActiveQuests() || !loadClassData() || !loadSearchInfo() || !loadHuntingLog() )
     Logger::error( "Player #{0}  data corrupt!", char_id_str );
 
+  initInventory();
+  calculateStats();
+
+  // Stats
+  m_hp = res->getUInt( "Hp" );
+  m_mp = res->getUInt( "Mp" );
+  m_tp = 0;
   m_maxHp = getMaxHp();
   m_maxMp = getMaxMp();
 
@@ -217,12 +217,6 @@ bool Sapphire::Entity::Player::load( uint32_t charId, World::SessionPtr pSession
   m_modelSubWeapon = 0;
   m_lastTickTime = 0;
 
-  //m_pInventory->load();
-
-  initInventory(); // moved up so we don't lose hp every login
-
-  calculateStats();
-
   // first login, run the script event
   if( m_bNewGame )
   {

From 14b966fdfa3bd2b9d541a643d248d4c7da5aa522 Mon Sep 17 00:00:00 2001
From: collett <collett0301@gmail.com>
Date: Wed, 18 Mar 2020 00:58:07 +0900
Subject: [PATCH 289/351] opcode

---
 src/common/Network/PacketDef/Ipcs.h | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/src/common/Network/PacketDef/Ipcs.h b/src/common/Network/PacketDef/Ipcs.h
index 72f88446..36d41356 100644
--- a/src/common/Network/PacketDef/Ipcs.h
+++ b/src/common/Network/PacketDef/Ipcs.h
@@ -84,8 +84,8 @@ namespace Sapphire::Network::Packets
 
     SocialList = 0x0172, // updated 5.21 hotfix
 
-    ExamineSearchInfo = 0x014B, // updated 5.21
-    UpdateSearchInfo = 0x00EA, // updated 5.21
+    ExamineSearchInfo = 0x032B, // updated 5.21 hotfix
+    UpdateSearchInfo = 0x0379, // updated 5.21 hotfix
     InitSearchInfo = 0x00D1, // updated 5.21 hotfix
     ExamineSearchComment = 0x0102, // updated 4.1
 
@@ -109,7 +109,7 @@ namespace Sapphire::Network::Packets
     ReqMoogleMailLetter = 0x0139, // updated 5.0
     MailLetterNotification = 0x013A, // updated 5.0
 
-    MarketTaxRates = 0x01D7, // updated 5.21
+    MarketTaxRates = 0x034C, // updated 5.21 hotfix
 
     MarketBoardItemListingCount = 0x030A, // updated 5.2
     MarketBoardItemListing = 0x023E, // updated 5.2
@@ -128,9 +128,9 @@ namespace Sapphire::Network::Packets
     BossStatusEffectList = 0x0312, // added 5.1
     Effect = 0x0252, // updated 5.21 hotfix
     AoeEffect8 = 0x0140, // updated 5.21 hotfix
-    AoeEffect16 = 0x012E, // updated 5.21
-    AoeEffect24 = 0x0089, // updated 5.21
-    AoeEffect32 = 0x01A9, // updated 5.21
+    AoeEffect16 = 0x02A2, // updated 5.21 hotfix
+    AoeEffect24 = 0x01FD, // updated 5.21 hotfix
+    AoeEffect32 = 0x0376, // updated 5.21 hotfix
     PersistantEffect = 0x0110, // updated 5.21 hotfix
 
     GCAffiliation = 0x016F, // updated 5.0
@@ -140,7 +140,7 @@ namespace Sapphire::Network::Packets
     NpcSpawn2 = 0x010C, // ( Bigger statuseffectlist? ) updated 5.18
     ActorMove = 0x0080, // updated 5.21 hotfix
 
-    ActorSetPos = 0x00CC, // updated 5.21
+    ActorSetPos = 0x0295, // updated 5.21 hotfix
 
     ActorCast = 0x0262, // updated 5.21
     SomeCustomiseChangePacketProbably = 0x00CD, // added 5.18
@@ -160,7 +160,7 @@ namespace Sapphire::Network::Packets
     CharaVisualEffect = 0x030C, // updated 5.21 hotfix
 
     ModelEquip = 0x03A2, // updated 5.21 hotfix
-    Examine = 0x0210, // updated 5.21
+    Examine = 0x036E, // updated 5.21 hotfix
     CharaNameReq = 0x03A6, // updated 5.21
 
     // nb: see #565 on github
@@ -180,7 +180,7 @@ namespace Sapphire::Network::Packets
     HuntingLogEntry = 0x01B3, // updated 5.0
 
     EventPlay = 0x007F, // updated 5.21 hotfix
-    EventPlay4 = 0x0313, // updated 5.21
+    EventPlay4 = 0x03BD, // updated 5.21 hotfix
     EventPlay8 = 0x0119, // updated 5.18
     EventPlay16 = 0x01FB, // updated 5.18
     EventPlay32 = 0x017D, // updated 5.21
@@ -211,7 +211,7 @@ namespace Sapphire::Network::Packets
     DirectorVars = 0x00E6, // updated 5.18
     SomeDirectorUnk1 = 0x0084, // updated 5.18
     SomeDirectorUnk2 = 0x00C1, // updated 5.18
-    SomeDirectorUnk4 = 0x014A, // updated 5.21
+    SomeDirectorUnk4 = 0x01F3, // updated 5.21 hotfix
     SomeDirectorUnk8 = 0x028A, // updated 5.18
     SomeDirectorUnk16 = 0x028C, // updated 5.18
     DirectorPopUp = 0x0162, // updated 5.18 - display dialogue pop-ups in duties and FATEs, for example, Teraflare's countdown
@@ -306,7 +306,7 @@ namespace Sapphire::Network::Packets
     ChatHandler = 0x03AB, // updated 5.21 hotfix
 
     SocialListHandler = 0x02B9, // updated 5.21 hotfix
-    SetSearchInfoHandler = 0x039B, // updated 5.21
+    SetSearchInfoHandler = 0x025C, // updated 5.21 hotfix
     ReqSearchInfoHandler = 0x026F, // updated 5.21 hotfix
     ReqExamineSearchCommentHandler = 0x00E7, // updated 5.0
 
@@ -341,7 +341,7 @@ namespace Sapphire::Network::Packets
     SkillHandler = 0x0073, // updated 5.21 hotfix
     GMCommand1 = 0x0302, // updated 5.21 hotfix
     GMCommand2 = 0x01E5, // updated 5.21 hotfix
-    AoESkillHandler = 0x0072, // updated 5.18
+    AoESkillHandler = 0x0364, // updated 5.21 hotfix
 
     UpdatePositionHandler = 0x01B1, // updated 5.21 hotfix
 

From b8f14b4c0520633db6053e9c6e5c71a0803e919d Mon Sep 17 00:00:00 2001
From: collett <collett0301@gmail.com>
Date: Wed, 18 Mar 2020 04:52:09 +0900
Subject: [PATCH 290/351] opcode

---
 src/common/Network/PacketDef/Ipcs.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/common/Network/PacketDef/Ipcs.h b/src/common/Network/PacketDef/Ipcs.h
index 36d41356..9d16b9c2 100644
--- a/src/common/Network/PacketDef/Ipcs.h
+++ b/src/common/Network/PacketDef/Ipcs.h
@@ -49,7 +49,7 @@ namespace Sapphire::Network::Packets
     ActorFreeSpawn = 0x006C, // updated 5.21 hotfix
     InitZone = 0x037B, // updated 5.21 hotfix
 
-    EffectResult = 0x02CF, // updated 5.21
+    EffectResult = 0x0281, // updated 5.21 hotfix
     ActorControl = 0x0380, // updated 5.21 hotfix
     ActorControlSelf = 0x0253, // updated 5.21 hotfix
     ActorControlTarget = 0x0206, // updated 5.21 hotfix
@@ -142,7 +142,7 @@ namespace Sapphire::Network::Packets
 
     ActorSetPos = 0x0295, // updated 5.21 hotfix
 
-    ActorCast = 0x0262, // updated 5.21
+    ActorCast = 0x02C3, // updated 5.21 hotfix
     SomeCustomiseChangePacketProbably = 0x00CD, // added 5.18
 
     PartyList = 0x0287, // updated 5.18

From 5725b4dab88db8ecf9b2899350bbecc5888221a4 Mon Sep 17 00:00:00 2001
From: collett <collett0301@gmail.com>
Date: Wed, 18 Mar 2020 04:55:16 +0900
Subject: [PATCH 291/351] duplicated InventoryTransaction

---
 src/common/Network/PacketDef/Ipcs.h | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/common/Network/PacketDef/Ipcs.h b/src/common/Network/PacketDef/Ipcs.h
index 9d16b9c2..45a0777a 100644
--- a/src/common/Network/PacketDef/Ipcs.h
+++ b/src/common/Network/PacketDef/Ipcs.h
@@ -190,7 +190,6 @@ namespace Sapphire::Network::Packets
 
     EventStart = 0x03E4, // updated 5.21 hotfix
     EventFinish = 0x0197, // updated 5.21 hotfix
-    UseMooch = 0x006E, // updated 5.21
 
     EventLinkshell = 0x1169,
 

From 7e36ed54f0a6d318d8ca3bdc6cafc1eb28256460 Mon Sep 17 00:00:00 2001
From: collett <collett0301@gmail.com>
Date: Fri, 20 Mar 2020 17:37:31 +0900
Subject: [PATCH 292/351] more opcode update

---
 src/common/Network/PacketDef/Ipcs.h | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/common/Network/PacketDef/Ipcs.h b/src/common/Network/PacketDef/Ipcs.h
index 45a0777a..56029998 100644
--- a/src/common/Network/PacketDef/Ipcs.h
+++ b/src/common/Network/PacketDef/Ipcs.h
@@ -148,7 +148,7 @@ namespace Sapphire::Network::Packets
     PartyList = 0x0287, // updated 5.18
     HateRank = 0x0381, // updated 5.21 hotfix
     HateList = 0x01F0, // updated 5.21 hotfix
-    ObjectSpawn = 0x01B3, // updated 5.2
+    ObjectSpawn = 0x0342, // updated 5.21 hotfix
     ObjectDespawn = 0x034B, // updated 5.18
     UpdateClassInfo = 0x0235, // updated 5.21 hotfix
     SilentSetClassJob = 0x018E, // updated 5.0 - seems to be the case, not sure if it's actually used for anything
@@ -156,12 +156,12 @@ namespace Sapphire::Network::Packets
     PlayerStats = 0x03E1, // updated 5.21 hotfix
     ActorOwner = 0x03C8, // updated 5.21 hotfix
     PlayerStateFlags = 0x00AA, // updated 5.21 hotfix
-    PlayerClassInfo = 0x016B, // updated 5.21
+    PlayerClassInfo = 0x0169, // updated 5.21 hotfix
     CharaVisualEffect = 0x030C, // updated 5.21 hotfix
 
     ModelEquip = 0x03A2, // updated 5.21 hotfix
     Examine = 0x036E, // updated 5.21 hotfix
-    CharaNameReq = 0x03A6, // updated 5.21
+    CharaNameReq = 0x02E4, // updated 5.21 hotfix
 
     // nb: see #565 on github
     UpdateRetainerItemSalePrice = 0x019F, // updated 5.0
@@ -288,11 +288,11 @@ namespace Sapphire::Network::Packets
 
     FinishLoadingHandler = 0x0158, // updated 5.21 hotfix
 
-    CFCommenceHandler = 0x0201, // updated 5.21
+    CFCommenceHandler = 0x0078, // updated 5.21 hotfix
 
 
-    CFRegisterDuty = 0x00C4, // updated 5.21
-    CFRegisterRoulette = 0x030F, // updated 5.21
+    CFRegisterDuty = 0x0118, // updated 5.21 hotfix
+    CFRegisterRoulette = 0x037A, // updated 5.21 hotfix
     PlayTimeHandler = 0x0276, // updated 5.1
     LogoutHandler = 0x0139, // updated 5.21 hotfix
     CancelLogout = 0x008F, // updated 5.1
@@ -352,10 +352,10 @@ namespace Sapphire::Network::Packets
     BuildPresetHandler = 0x0150, // updated 5.0
 
     TalkEventHandler = 0x0281, // updated 5.21 hotfix
-    EmoteEventHandler = 0x0246, // updated 5.21
-    WithinRangeEventHandler = 0x02D1, // updated 5.21
-    OutOfRangeEventHandler = 0x02FB, // updated 5.21
-    EnterTeriEventHandler = 0x0284, // updated 5.21
+    EmoteEventHandler = 0x0380, // updated 5.21 hotfix
+    WithinRangeEventHandler = 0x0253, // updated 5.21 hotfix
+    OutOfRangeEventHandler = 0x0206, // updated 5.21 hotfix
+    EnterTeriEventHandler = 0x01B8, // updated 5.21 hotfix
     ShopEventHandler = 0x0156, // updated 5.0
 
     ReturnEventHandler = 0x02A2, // updated 5.21 hotfix

From f5cbf5870611f5a8032dcecf56e49c9ec19aa0c8 Mon Sep 17 00:00:00 2001
From: collett <collett0301@gmail.com>
Date: Fri, 20 Mar 2020 17:39:39 +0900
Subject: [PATCH 293/351] remove wrong packet. it was PlayerClassInfo.

---
 src/world/Actor/Player.cpp | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/src/world/Actor/Player.cpp b/src/world/Actor/Player.cpp
index b88873b5..6c5b0b88 100644
--- a/src/world/Actor/Player.cpp
+++ b/src/world/Actor/Player.cpp
@@ -1803,15 +1803,6 @@ void Sapphire::Entity::Player::sendZonePackets()
     queuePacket( unk320 );
   }
 
-  //this is needed from 5.21, after InitZone and before FinishLoadingHandler
-  auto classInfoPacket = makeZonePacket< FFXIVIpcUpdateClassInfo >( getId() );
-  classInfoPacket->data().classId = static_cast< uint8_t > ( getClass() );
-  classInfoPacket->data().level1 = getLevel();
-  classInfoPacket->data().level = getLevel();
-  classInfoPacket->data().nextLevelIndex = getLevel();
-  classInfoPacket->data().currentExp = getExp();
-  queuePacket( classInfoPacket );
-
 //  if( getLastPing() == 0 )
 //    sendQuestInfo();
 

From 9bc8fbeaa83e7e0c9b51200d3e704de21f30b657 Mon Sep 17 00:00:00 2001
From: collett <collett0301@gmail.com>
Date: Fri, 20 Mar 2020 23:08:06 +0900
Subject: [PATCH 294/351] WeatherChange

---
 src/common/Network/PacketDef/Ipcs.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/common/Network/PacketDef/Ipcs.h b/src/common/Network/PacketDef/Ipcs.h
index 56029998..3e4cc778 100644
--- a/src/common/Network/PacketDef/Ipcs.h
+++ b/src/common/Network/PacketDef/Ipcs.h
@@ -219,7 +219,7 @@ namespace Sapphire::Network::Packets
 
     CFAvailableContents = 0xF1FD, // updated 4.2
 
-    WeatherChange = 0x024A, // updated 5.21
+    WeatherChange = 0x032A, // updated 5.21 hotfix
     PlayerTitleList = 0x037D, // updated 5.1
     Discovery = 0x0091, // updated 5.2
 

From d4bb5a3174f8dd433cbdd4bedf05925e352c7337 Mon Sep 17 00:00:00 2001
From: Flavien Normand <contact@flavien-normand.fr>
Date: Thu, 26 Mar 2020 14:21:05 +0100
Subject: [PATCH 295/351] Fix UpdatePositionInstance opcode

---
 src/common/Network/PacketDef/Ipcs.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/common/Network/PacketDef/Ipcs.h b/src/common/Network/PacketDef/Ipcs.h
index 3e4cc778..7f690567 100644
--- a/src/common/Network/PacketDef/Ipcs.h
+++ b/src/common/Network/PacketDef/Ipcs.h
@@ -372,7 +372,7 @@ namespace Sapphire::Network::Packets
 
     SetSharedEstateSettings = 0x017B, // updated 5.0
 
-    UpdatePositionInstance = 0x0180, // updated 5.0
+    UpdatePositionInstance = 0x0080, // updated 5.21 hotfix
 
     PerformNoteHandler = 0x029B, // updated 4.3
 

From e38658feff7d23ccbecdecfd981bac3cf0203e7c Mon Sep 17 00:00:00 2001
From: Flavien Normand <contact@flavien-normand.fr>
Date: Sat, 28 Mar 2020 14:24:31 +0100
Subject: [PATCH 296/351] Add struct for UpdatePositionInstance

---
 src/common/Network/PacketDef/Zone/ClientZoneDef.h | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/src/common/Network/PacketDef/Zone/ClientZoneDef.h b/src/common/Network/PacketDef/Zone/ClientZoneDef.h
index d486ee42..bf698237 100644
--- a/src/common/Network/PacketDef/Zone/ClientZoneDef.h
+++ b/src/common/Network/PacketDef/Zone/ClientZoneDef.h
@@ -56,6 +56,17 @@ struct FFXIVIpcUpdatePosition :
   /* 0008 */ Common::FFXIVARR_POSITION3 position;
   /* 000C */ uint8_t unk[ 4 ]; // padding?
 };
+  
+  struct FFXIVIpcUpdatePositionInstance :
+  FFXIVIpcBasePacket< UpdatePositionInstance >
+{
+  /* 0000 */ float rotation;
+  /* 0004 */ float interpolateRotation;
+  /* 0008 */ uint32_t flags;
+  /* 000C */ Common::FFXIVARR_POSITION3 position;
+  /* 0018 */ Common::FFXIVARR_POSITION3 interpolatePosition;
+  /* 0024 */ uint32_t unknown;
+};
 
 
 struct FFXIVIpcSkillHandler :

From f7856bacce9c2e8f968b854e51a6fa4b4e23a80a Mon Sep 17 00:00:00 2001
From: collett <collett0301@gmail.com>
Date: Tue, 7 Apr 2020 20:53:12 +0900
Subject: [PATCH 297/351] 5.25 opcode

---
 src/common/Common.h                 |  10 +-
 src/common/Network/PacketDef/Ipcs.h | 174 ++++++++++++++--------------
 2 files changed, 92 insertions(+), 92 deletions(-)

diff --git a/src/common/Common.h b/src/common/Common.h
index f663ed7a..3e25a2dd 100644
--- a/src/common/Common.h
+++ b/src/common/Common.h
@@ -51,11 +51,11 @@ namespace Sapphire::Common
 
   enum InventoryOperation : uint16_t
   {
-    Discard = 0x06E,
-    Move = 0x006F,
-    Swap = 0x0070,
-    Split = 0x0071,
-    Merge = 0x0073,
+    Discard = 0x0180,
+    Move = 0x0181,
+    Swap = 0x0182,
+    Split = 0x0183,
+    Merge = 0x0185,
   };
 
   enum ClientLanguage : uint8_t
diff --git a/src/common/Network/PacketDef/Ipcs.h b/src/common/Network/PacketDef/Ipcs.h
index 7f690567..b4519378 100644
--- a/src/common/Network/PacketDef/Ipcs.h
+++ b/src/common/Network/PacketDef/Ipcs.h
@@ -43,27 +43,27 @@ namespace Sapphire::Network::Packets
   */
   enum ServerZoneIpcType : uint16_t
   {
-    Ping = 0x012C, // updated 5.21 hotfix
-    Init = 0x010D, // updated 5.21 hotfix
+    Ping = 0x017A, // updated 5.25
+    Init = 0x03B9, // updated 5.25
 
-    ActorFreeSpawn = 0x006C, // updated 5.21 hotfix
-    InitZone = 0x037B, // updated 5.21 hotfix
+    ActorFreeSpawn = 0x0194, // updated 5.25
+    InitZone = 0x01CD, // updated 5.25
 
-    EffectResult = 0x0281, // updated 5.21 hotfix
-    ActorControl = 0x0380, // updated 5.21 hotfix
-    ActorControlSelf = 0x0253, // updated 5.21 hotfix
-    ActorControlTarget = 0x0206, // updated 5.21 hotfix
+    EffectResult = 0x030F, // updated 5.25
+    ActorControl = 0x01DD, // updated 5.25
+    ActorControlSelf = 0x0165, // updated 5.25
+    ActorControlTarget = 0x01EB, // updated 5.25
 
     /*!
      * @brief Used when resting
      */
-    UpdateHpMpTp = 0x01B8, // updated 5.21 hotfix
+    UpdateHpMpTp = 0x00F8, // updated 5.25
 
     ///////////////////////////////////////////////////
 
     ChatBanned = 0x006B,
     Playtime = 0x0284, // updated 5.21
-    Logout = 0x02A8, // updated 5.21 hotfix
+    Logout = 0x00CD, // updated 5.25
     CFNotify = 0x0241, // updated 5.21
     CFMemberStatus = 0x0079,
     CFDutyInfo = 0x007A,
@@ -82,25 +82,25 @@ namespace Sapphire::Network::Packets
 
     WorldVisitList = 0x00FE, // added 4.5
 
-    SocialList = 0x0172, // updated 5.21 hotfix
+    SocialList = 0x0269, // updated 5.25
 
     ExamineSearchInfo = 0x032B, // updated 5.21 hotfix
     UpdateSearchInfo = 0x0379, // updated 5.21 hotfix
-    InitSearchInfo = 0x00D1, // updated 5.21 hotfix
+    InitSearchInfo = 0x0347, // updated 5.25
     ExamineSearchComment = 0x0102, // updated 4.1
 
     ServerNoticeShort = 0x0115, // updated 5.0
-    ServerNotice = 0x0192, // updated 5.21 hotfix
-    SetOnlineStatus = 0x0109, // updated 5.21 hotfix
+    ServerNotice = 0x00E9, // updated 5.25
+    SetOnlineStatus = 0x0381, // updated 5.25
 
     CountdownInitiate = 0x0309, // updated 5.11
     CountdownCancel = 0x00D9, // updated 5.18
 
     PlayerAddedToBlacklist = 0x033F, // updated 5.1
     PlayerRemovedFromBlacklist = 0x0385, // updated 5.1
-    BlackList = 0x0224, // updated 5.21 hotfix
+    BlackList = 0x027A, // updated 5.25
 
-    LinkshellList = 0x0395, // updated 5.21 hotfix
+    LinkshellList = 0x00A9, // updated 5.25
 
     MailDeleteRequest = 0x012B, // updated 5.0
 
@@ -123,43 +123,43 @@ namespace Sapphire::Network::Packets
 
     FreeCompanyUpdateShortMessage = 0x0157, // added 5.0
 
-    StatusEffectList = 0x0327, // updated 5.21 hotfix
+    StatusEffectList = 0x01D7, // updated 5.25
     EurekaStatusEffectList = 0x0167, // updated 5.18
     BossStatusEffectList = 0x0312, // added 5.1
-    Effect = 0x0252, // updated 5.21 hotfix
-    AoeEffect8 = 0x0140, // updated 5.21 hotfix
+    Effect = 0x0087, // updated 5.25
+    AoeEffect8 = 0x01A6, // updated 5.25
     AoeEffect16 = 0x02A2, // updated 5.21 hotfix
     AoeEffect24 = 0x01FD, // updated 5.21 hotfix
     AoeEffect32 = 0x0376, // updated 5.21 hotfix
-    PersistantEffect = 0x0110, // updated 5.21 hotfix
+    PersistantEffect = 0x032E, // updated 5.25
 
     GCAffiliation = 0x016F, // updated 5.0
 
-    PlayerSpawn = 0x033D, // updated 5.21 hotfix
-    NpcSpawn = 0x00B3, // updated 5.21 hotfix
+    PlayerSpawn = 0x00B9, // updated 5.25
+    NpcSpawn = 0x038D, // updated 5.25
     NpcSpawn2 = 0x010C, // ( Bigger statuseffectlist? ) updated 5.18
-    ActorMove = 0x0080, // updated 5.21 hotfix
+    ActorMove = 0x0290, // updated 5.25
 
-    ActorSetPos = 0x0295, // updated 5.21 hotfix
+    ActorSetPos = 0x028E, // updated 5.25
 
-    ActorCast = 0x02C3, // updated 5.21 hotfix
+    ActorCast = 0x00C4, // updated 5.25
     SomeCustomiseChangePacketProbably = 0x00CD, // added 5.18
 
     PartyList = 0x0287, // updated 5.18
-    HateRank = 0x0381, // updated 5.21 hotfix
-    HateList = 0x01F0, // updated 5.21 hotfix
-    ObjectSpawn = 0x0342, // updated 5.21 hotfix
+    HateRank = 0x012E, // updated 5.25
+    HateList = 0x02C4, // updated 5.25
+    ObjectSpawn = 0x00D2, // updated 5.25
     ObjectDespawn = 0x034B, // updated 5.18
-    UpdateClassInfo = 0x0235, // updated 5.21 hotfix
+    UpdateClassInfo = 0x00DC, // updated 5.25
     SilentSetClassJob = 0x018E, // updated 5.0 - seems to be the case, not sure if it's actually used for anything
-    PlayerSetup = 0x0316, // updated 5.21 hotfix
-    PlayerStats = 0x03E1, // updated 5.21 hotfix
-    ActorOwner = 0x03C8, // updated 5.21 hotfix
-    PlayerStateFlags = 0x00AA, // updated 5.21 hotfix
-    PlayerClassInfo = 0x0169, // updated 5.21 hotfix
-    CharaVisualEffect = 0x030C, // updated 5.21 hotfix
+    PlayerSetup = 0x0071, // updated 5.25
+    PlayerStats = 0x007C, // updated 5.25
+    ActorOwner = 0x0149, // updated 5.25
+    PlayerStateFlags = 0x0125, // updated 5.25
+    PlayerClassInfo = 0x034F, // updated 5.25
+    CharaVisualEffect = 0x0258, // updated 5.25
 
-    ModelEquip = 0x03A2, // updated 5.21 hotfix
+    ModelEquip = 0x01E5, // updated 5.25
     Examine = 0x036E, // updated 5.21 hotfix
     CharaNameReq = 0x02E4, // updated 5.21 hotfix
 
@@ -168,44 +168,44 @@ namespace Sapphire::Network::Packets
 
     SetLevelSync = 0x1186, // not updated for 4.4, not sure what it is anymore
 
-    ItemInfo = 0x0244, // updated 5.21 hotfix
-    ContainerInfo = 0x03BB, // updated 5.21 hotfix
-    InventoryTransactionFinish = 0x0274, // updated 5.21 hotfix
-    InventoryTransaction = 0x00202, // updated 5.21 hotfix
-    CurrencyCrystalInfo = 0x017F, // updated 5.21 hotfix
+    ItemInfo = 0x02AA, // updated 5.25
+    ContainerInfo = 0x02A8, // updated 5.25
+    InventoryTransactionFinish = 0x0193, // updated 5.25
+    InventoryTransaction = 0x0119, // updated 5.25
+    CurrencyCrystalInfo = 0x018A, // updated 5.25
 
-    InventoryActionAck = 0x01B2, // updated 5.21 hotfix
-    UpdateInventorySlot = 0x0213, // updated 5.21 hotfix
+    InventoryActionAck = 0x01AE, // updated 5.25
+    UpdateInventorySlot = 0x0151, // updated 5.25
 
     HuntingLogEntry = 0x01B3, // updated 5.0
 
-    EventPlay = 0x007F, // updated 5.21 hotfix
-    EventPlay4 = 0x03BD, // updated 5.21 hotfix
+    EventPlay = 0x02C3, // updated 5.25
+    EventPlay4 = 0x029A, // updated 5.25
     EventPlay8 = 0x0119, // updated 5.18
     EventPlay16 = 0x01FB, // updated 5.18
     EventPlay32 = 0x017D, // updated 5.21
     EventPlay64 = 0x00E5, // updated 5.18
     EventPlay128 = 0x02BE, // updated 5.18
-    EventPlay255 = 0x00D9, // updated 5.21 hotfix
+    EventPlay255 = 0x01AC, // updated 5.25
 
-    EventStart = 0x03E4, // updated 5.21 hotfix
-    EventFinish = 0x0197, // updated 5.21 hotfix
+    EventStart = 0x0360, // updated 5.25
+    EventFinish = 0x0239, // updated 5.25
 
     EventLinkshell = 0x1169,
 
-    QuestActiveList = 0x03D7, // updated 5.21 hotfix
-    QuestUpdate = 0x01F8, // updated 5.21 hotfix
-    QuestCompleteList = 0x0084, // updated 5.21 hotfix
+    QuestActiveList = 0x0391, // updated 5.25
+    QuestUpdate = 0x0352, // updated 5.25
+    QuestCompleteList = 0x0231, // updated 5.25
 
-    QuestFinish = 0x01FE, // updated 5.21 hotfix
+    QuestFinish = 0x02B6, // updated 5.25
     MSQTrackerComplete = 0x01D6, // updated 5.0
     MSQTrackerProgress = 0xF1CD, // updated 4.5 ? this actually looks like the two opcodes have been combined, see #474
 
-    QuestMessage = 0x0324, // updated 5.21 hotfix
+    QuestMessage = 0x0093, // updated 5.25
 
-    QuestTracker = 0x02CA, // updated 5.21 hotfix
+    QuestTracker = 0x00AD, // updated 5.25
 
-    Mount = 0x02F1, // updated 5.21 hotfix
+    Mount = 0x02BE, // updated 5.25
 
     DirectorVars = 0x00E6, // updated 5.18
     SomeDirectorUnk1 = 0x0084, // updated 5.18
@@ -219,13 +219,13 @@ namespace Sapphire::Network::Packets
 
     CFAvailableContents = 0xF1FD, // updated 4.2
 
-    WeatherChange = 0x032A, // updated 5.21 hotfix
+    WeatherChange = 0x0157, // updated 5.25
     PlayerTitleList = 0x037D, // updated 5.1
     Discovery = 0x0091, // updated 5.2
 
     EorzeaTimeOffset = 0x03B8, // updated 5.1
 
-    EquipDisplayFlags = 0x006E, // updated 5.21 hotfix
+    EquipDisplayFlags = 0x010D, // updated 5.25
 
     /// Housing //////////////////////////////////////
 
@@ -238,7 +238,7 @@ namespace Sapphire::Network::Packets
     LandRename = 0x023A, // updated 5.0
     HousingEstateGreeting = 0x023B, // updated 5.0
     HousingUpdateLandFlagsSlot = 0x023C, // updated 5.0
-    HousingLandFlags = 0x02D8, // updated 5.21 hotfix
+    HousingLandFlags = 0x0177, // updated 5.25
     HousingShowEstateGuestAccess = 0x023E, // updated 5.0
 
     HousingObjectInitialize = 0x0240, // updated 5.0
@@ -258,12 +258,12 @@ namespace Sapphire::Network::Packets
     DuelChallenge = 0x0277, // 4.2; this is responsible for opening the ui
     PerformNote = 0x0286, // updated 4.3
 
-    PrepareZoning = 0x00B6, // updated 5.21 hotfix
-    ActorGauge = 0x00C7, // updated 5.21 hotfix
+    PrepareZoning = 0x03B3, // updated 5.25
+    ActorGauge = 0x007D, // updated 5.25
 
     // daily quest info -> without them sent,  login will take longer...
-    DailyQuests = 0x0130, // updated 5.21 hotfix
-    DailyQuestRepeatFlags = 0x02BA, // updated 5.21 hotfix
+    DailyQuests = 0x031E, // updated 5.25
+    DailyQuestRepeatFlags = 0x00A7, // updated 5.25
 
     /// Doman Mahjong //////////////////////////////////////
     MahjongOpenGui = 0x02A4, // only available in mahjong instance
@@ -283,10 +283,10 @@ namespace Sapphire::Network::Packets
   */
   enum ClientZoneIpcType : uint16_t
   {
-    PingHandler = 0x012C, // updated 5.21 hotfix
-    InitHandler = 0x010D, // updated 5.21 hotfix
+    PingHandler = 0x017A, // updated 5.25
+    InitHandler = 0x03B9, // updated 5.25
 
-    FinishLoadingHandler = 0x0158, // updated 5.21 hotfix
+    FinishLoadingHandler = 0x008A, // updated 5.25
 
     CFCommenceHandler = 0x0078, // updated 5.21 hotfix
 
@@ -294,7 +294,7 @@ namespace Sapphire::Network::Packets
     CFRegisterDuty = 0x0118, // updated 5.21 hotfix
     CFRegisterRoulette = 0x037A, // updated 5.21 hotfix
     PlayTimeHandler = 0x0276, // updated 5.1
-    LogoutHandler = 0x0139, // updated 5.21 hotfix
+    LogoutHandler = 0x00B7, // updated 5.25
     CancelLogout = 0x008F, // updated 5.1
 
     CFDutyInfoHandler = 0x0078, // updated 4.2
@@ -302,18 +302,18 @@ namespace Sapphire::Network::Packets
     SocialReqSendHandler = 0x00AE, // updated 4.1
     CreateCrossWorldLS = 0x00AF, // updated 4.3
 
-    ChatHandler = 0x03AB, // updated 5.21 hotfix
+    ChatHandler = 0x0189, // updated 5.25
 
-    SocialListHandler = 0x02B9, // updated 5.21 hotfix
+    SocialListHandler = 0x0371, // updated 5.25
     SetSearchInfoHandler = 0x025C, // updated 5.21 hotfix
-    ReqSearchInfoHandler = 0x026F, // updated 5.21 hotfix
+    ReqSearchInfoHandler = 0x0366, // updated 5.25
     ReqExamineSearchCommentHandler = 0x00E7, // updated 5.0
 
     ReqRemovePlayerFromBlacklist = 0x00F1, // updated 5.0
-    BlackListHandler = 0x0157, // updated 5.21 hotfix
+    BlackListHandler = 0x0354, // updated 5.25
     PlayerSearchHandler = 0x00F4, // updated 5.0
 
-    LinkshellListHandler = 0x01DE, // updated 5.21 hotfix
+    LinkshellListHandler = 0x01D4, // updated 5.25
 
     MarketBoardRequestItemListingInfo = 0x0102, // updated 4.5
     MarketBoardRequestItemListings = 0x0103, // updated 4.5
@@ -332,43 +332,43 @@ namespace Sapphire::Network::Packets
     ReqCountdownInitiate = 0x0135, // updated 5.0
     ReqCountdownCancel = 0x0136, // updated 5.0
 
-    ZoneLineHandler = 0x025E, // updated 5.21 hotfix
-    ClientTrigger = 0x017E, // updated 5.21 hotfix
+    ZoneLineHandler = 0x0214, // updated 5.25
+    ClientTrigger = 0x017D, // updated 5.25
     DiscoveryHandler = 0x019A, // updated 5.2
 
     PlaceFieldMarker = 0x013C, // updated 5.0
-    SkillHandler = 0x0073, // updated 5.21 hotfix
-    GMCommand1 = 0x0302, // updated 5.21 hotfix
-    GMCommand2 = 0x01E5, // updated 5.21 hotfix
+    SkillHandler = 0x0241, // updated 5.25
+    GMCommand1 = 0x01EC, // updated 5.25
+    GMCommand2 = 0x0368, // updated 5.25
     AoESkillHandler = 0x0364, // updated 5.21 hotfix
 
-    UpdatePositionHandler = 0x01B1, // updated 5.21 hotfix
+    UpdatePositionHandler = 0x014D, // updated 5.25
 
-    InventoryModifyHandler = 0x0067, // updated 5.21 hotfix
+    InventoryModifyHandler = 0x0179, // updated 5.25
     
     InventoryEquipRecommendedItems = 0x0149, // updated 5.0
 
     ReqPlaceHousingItem = 0x014B, // updated 5.0
     BuildPresetHandler = 0x0150, // updated 5.0
 
-    TalkEventHandler = 0x0281, // updated 5.21 hotfix
-    EmoteEventHandler = 0x0380, // updated 5.21 hotfix
-    WithinRangeEventHandler = 0x0253, // updated 5.21 hotfix
-    OutOfRangeEventHandler = 0x0206, // updated 5.21 hotfix
-    EnterTeriEventHandler = 0x01B8, // updated 5.21 hotfix
+    TalkEventHandler = 0x030F, // updated 5.25
+    EmoteEventHandler = 0x01DD, // updated 5.25
+    WithinRangeEventHandler = 0x0165, // updated 5.25
+    OutOfRangeEventHandler = 0x01EB, // updated 5.25
+    EnterTeriEventHandler = 0x00F8, // updated 5.25
     ShopEventHandler = 0x0156, // updated 5.0
 
-    ReturnEventHandler = 0x02A2, // updated 5.21 hotfix
-    TradeReturnEventHandler = 0x01FD, // updated 5.21 hotfix
+    ReturnEventHandler = 0x00BB, // updated 5.25
+    TradeReturnEventHandler = 0x03B6, // updated 5.25
 
     LinkshellEventHandler = 0x016B, // updated 4.5
     LinkshellEventHandler1 = 0x016C, // updated 4.5
 
-    ReqEquipDisplayFlagsChange = 0x00B5, // updated 5.21 hotfix
+    ReqEquipDisplayFlagsChange = 0x0202, // updated 5.25
 
     LandRenameHandler = 0xF177, // updated 5.0
     HousingUpdateHouseGreeting = 0x0178, // updated 5.0
-    HousingUpdateObjectPosition = 0x0179, // updated 5.0
+    HousingUpdateObjectPosition = 0xF179, // updated 5.0
 
     SetSharedEstateSettings = 0x017B, // updated 5.0
 

From 852842c0cfcc21b4a3846b8f26a01062cd10b63f Mon Sep 17 00:00:00 2001
From: collett <collett0301@gmail.com>
Date: Tue, 14 Apr 2020 21:14:23 +0900
Subject: [PATCH 298/351] more opcode, fix mount list shift

---
 src/common/Network/PacketDef/Ipcs.h            | 18 +++++++++---------
 .../Network/PacketDef/Zone/ServerZoneDef.h     |  3 ++-
 2 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/src/common/Network/PacketDef/Ipcs.h b/src/common/Network/PacketDef/Ipcs.h
index b4519378..d23ab2f4 100644
--- a/src/common/Network/PacketDef/Ipcs.h
+++ b/src/common/Network/PacketDef/Ipcs.h
@@ -62,13 +62,13 @@ namespace Sapphire::Network::Packets
     ///////////////////////////////////////////////////
 
     ChatBanned = 0x006B,
-    Playtime = 0x0284, // updated 5.21
+    Playtime = 0x0286, // updated 5.25
     Logout = 0x00CD, // updated 5.25
-    CFNotify = 0x0241, // updated 5.21
+    CFNotify = 0x0145, // updated 5.25
     CFMemberStatus = 0x0079,
     CFDutyInfo = 0x007A,
     CFPlayerInNeed = 0xF07F,
-    CFPreferredRole = 0x00D4, // added 5.21
+    CFPreferredRole = 0x0186, // added 5.25
 
     SocialRequestError = 0x00AD,
 
@@ -78,14 +78,14 @@ namespace Sapphire::Network::Packets
 
     LogMessage = 0x00D0,
 
-    Chat = 0x012B, // updated 5.21 hotfix
+    Chat = 0x0161, // updated 5.25
 
     WorldVisitList = 0x00FE, // added 4.5
 
     SocialList = 0x0269, // updated 5.25
 
     ExamineSearchInfo = 0x032B, // updated 5.21 hotfix
-    UpdateSearchInfo = 0x0379, // updated 5.21 hotfix
+    UpdateSearchInfo = 0x00B3, // updated 5.25
     InitSearchInfo = 0x0347, // updated 5.25
     ExamineSearchComment = 0x0102, // updated 4.1
 
@@ -161,7 +161,7 @@ namespace Sapphire::Network::Packets
 
     ModelEquip = 0x01E5, // updated 5.25
     Examine = 0x036E, // updated 5.21 hotfix
-    CharaNameReq = 0x02E4, // updated 5.21 hotfix
+    CharaNameReq = 0x0145, // updated 5.25
 
     // nb: see #565 on github
     UpdateRetainerItemSalePrice = 0x019F, // updated 5.0
@@ -221,7 +221,7 @@ namespace Sapphire::Network::Packets
 
     WeatherChange = 0x0157, // updated 5.25
     PlayerTitleList = 0x037D, // updated 5.1
-    Discovery = 0x0091, // updated 5.2
+    Discovery = 0x0173, // updated 5.25
 
     EorzeaTimeOffset = 0x03B8, // updated 5.1
 
@@ -305,7 +305,7 @@ namespace Sapphire::Network::Packets
     ChatHandler = 0x0189, // updated 5.25
 
     SocialListHandler = 0x0371, // updated 5.25
-    SetSearchInfoHandler = 0x025C, // updated 5.21 hotfix
+    SetSearchInfoHandler = 0x00FA, // updated 5.25
     ReqSearchInfoHandler = 0x0366, // updated 5.25
     ReqExamineSearchCommentHandler = 0x00E7, // updated 5.0
 
@@ -334,7 +334,7 @@ namespace Sapphire::Network::Packets
 
     ZoneLineHandler = 0x0214, // updated 5.25
     ClientTrigger = 0x017D, // updated 5.25
-    DiscoveryHandler = 0x019A, // updated 5.2
+    DiscoveryHandler = 0x02C8, // updated 5.25
 
     PlaceFieldMarker = 0x013C, // updated 5.0
     SkillHandler = 0x0241, // updated 5.25
diff --git a/src/common/Network/PacketDef/Zone/ServerZoneDef.h b/src/common/Network/PacketDef/Zone/ServerZoneDef.h
index 5ac08ff6..00957763 100644
--- a/src/common/Network/PacketDef/Zone/ServerZoneDef.h
+++ b/src/common/Network/PacketDef/Zone/ServerZoneDef.h
@@ -1021,8 +1021,9 @@ namespace Sapphire::Network::Packets::Server
     unsigned char companionDefRank;
     unsigned char companionAttRank;
     unsigned char companionHealRank;
-    unsigned char u19[9];
+    unsigned char u19[8];
     unsigned char mountGuideMask[22];
+    unsigned char u19_2;
     char name[32];
     unsigned char unknownOword[16];
     unsigned char unknownOw;

From 7122826c0d30beb761fbd306a78618c4baa8aa6a Mon Sep 17 00:00:00 2001
From: collett <collett0301@gmail.com>
Date: Fri, 24 Apr 2020 17:00:48 +0900
Subject: [PATCH 299/351] disable wrong opcodes to prevent problems

---
 src/common/Network/PacketDef/Ipcs.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/common/Network/PacketDef/Ipcs.h b/src/common/Network/PacketDef/Ipcs.h
index d23ab2f4..ebe3c413 100644
--- a/src/common/Network/PacketDef/Ipcs.h
+++ b/src/common/Network/PacketDef/Ipcs.h
@@ -70,7 +70,7 @@ namespace Sapphire::Network::Packets
     CFPlayerInNeed = 0xF07F,
     CFPreferredRole = 0x0186, // added 5.25
 
-    SocialRequestError = 0x00AD,
+    SocialRequestError = 0xF0AD,
 
     CFRegistered = 0x00B8, // updated 4.1
     SocialRequestResponse = 0x00BB, // updated 4.1
@@ -133,7 +133,7 @@ namespace Sapphire::Network::Packets
     AoeEffect32 = 0x0376, // updated 5.21 hotfix
     PersistantEffect = 0x032E, // updated 5.25
 
-    GCAffiliation = 0x016F, // updated 5.0
+    GCAffiliation = 0xF16F, // updated 5.0
 
     PlayerSpawn = 0x00B9, // updated 5.25
     NpcSpawn = 0x038D, // updated 5.25

From 484657f10299fa7c977bbd64d3ee1214db7e38f0 Mon Sep 17 00:00:00 2001
From: collett <collett0301@gmail.com>
Date: Fri, 24 Apr 2020 19:24:04 +0900
Subject: [PATCH 300/351] JobGauge definition

---
 src/common/Common.h                           | 212 +++++++++++++++++-
 src/world/Actor/Player.cpp                    |  25 +++
 src/world/Actor/Player.h                      |   8 +
 src/world/Manager/DebugCommandMgr.cpp         |  10 +
 src/world/Network/Handlers/PacketHandlers.cpp |   3 +
 5 files changed, 252 insertions(+), 6 deletions(-)

diff --git a/src/common/Common.h b/src/common/Common.h
index 3e25a2dd..927b4f01 100644
--- a/src/common/Common.h
+++ b/src/common/Common.h
@@ -583,13 +583,19 @@ namespace Sapphire::Common
     TacticsPoints = 5,
     StatusEffect = 10,
     WARGauge = 22,
-//    DRKGauge = 25,
-//    AetherflowStack = 30,
-//    Status = 32,
+    DRKGauge = 25,
+    //    AetherflowStack = 30,
+    //    Status = 32,
+    SAMKenki = 39,
+    SAMSen = 40,
     PLDGauge = 41,
-//    RDMGaugeBoth = 74,
-////  RDMGaugeBlack = 75, // not right?
-//    DRGGauge3Eyes = 76,
+    GNBAmmo = 55,
+    WHMBloodLily = 56,
+    WHMLily = 57,
+    SAMMeditation = 63,
+    //    RDMGaugeBoth = 74,
+    ////  RDMGaugeBlack = 75, // not right?
+    //    DRGGauge3Eyes = 76,
   };
 
   enum class AttackType : int8_t
@@ -1027,6 +1033,200 @@ namespace Sapphire::Common
     Gatherer
   };
 
+  enum class AstCardType : uint8_t
+  {
+    None = 0,
+    Balance = 1,
+    Bole = 2,
+    Arrow = 3,
+    Spear = 4,
+    Ewer = 5,
+    Spire = 6,
+    Lord = 0x70,
+    Lady = 0x80,
+  };
+
+  enum class AstSealType : uint8_t
+  {
+    None = 0,
+    Sun = 1,
+    Moon = 2,
+    Celestrial = 3,
+  };
+
+  enum class DrgState : uint8_t
+  {
+    None = 0,
+    BloodOfTheDragon = 1,
+    LifeOfTheDragon = 2,
+  };
+
+  enum class SamSen : uint8_t
+  {
+    None = 0,
+    Setsu = 1,
+    Getsu = 2,
+    Ka = 4,
+  };
+
+  enum class SchDismissedFairy : uint8_t
+  {
+    None = 0,
+    Eos = 6,
+    Selene = 7,
+  };
+
+  enum class SmnPet : uint8_t
+  {
+    None = 0,
+    Ifrit = 3,
+    Titan = 4,
+    Garuda = 5,
+  };
+
+  enum class SmnPetGlam : uint8_t
+  {
+    None = 0,
+    Emerald = 1,
+    Topaz = 2,
+    Ruby = 3,
+  };
+
+  enum class BrdSong : uint8_t
+  {
+    Mage = 5,
+    Army = 0x0A,
+    Wanderer = 0x0F,
+  };
+
+  union JobGauge
+  {
+    struct
+    {
+      uint8_t gauge_data[15];
+    } _raw;
+
+    struct
+    {
+      uint32_t unused;
+      AstCardType card;
+      AstSealType seals[3];
+    } ast;
+    struct
+    {
+      uint16_t timeUntilNextPolyglot;
+      uint16_t elementTimer;
+      uint8_t elementStance;
+      uint8_t umbralhearts;
+      uint8_t polyglotStacks;
+      uint8_t enochainState;
+    } blm;
+    struct
+    {
+      uint16_t songTimer;
+      uint8_t songStacks;
+      uint8_t unused;
+      BrdSong song;
+    } brd;
+    struct
+    {
+      uint8_t feathers;
+      uint8_t esprit;
+      uint8_t stepOrder[4];
+      uint8_t completeSteps;
+    } dnc;
+    struct
+    {
+      uint16_t dragonTimer;
+      DrgState dragonState;
+      uint8_t eyes;
+    } drg;
+    struct
+    {
+      uint8_t blood;
+      uint8_t unused;
+      uint16_t darksideTimer;
+      uint8_t darkArts;
+      uint8_t unused2;
+      uint16_t shadowTimer;
+    } drk;
+    struct
+    {
+      uint8_t ammo;
+      uint8_t unused;
+      uint16_t maxTimerDuration;
+      uint8_t ammoComboStep;
+    } gnb;
+    struct
+    {
+      uint16_t overheatTimer;
+      uint16_t robotTimer;
+      uint8_t heat;
+      uint8_t battery;
+      uint8_t lastRobotBatteryPower;
+      uint8_t activeTimerFlag;
+    } mch;
+    struct
+    {
+      uint8_t greasedLightningTimer;
+      uint8_t unused;
+      uint8_t greasedLightningStacks;
+      uint8_t chakra;
+      uint8_t greasedLightningTimerFreezed;
+    } mnk;
+    struct
+    {
+      uint32_t hutonTimer;
+      uint8_t tenChiJinMudrasUsed;
+      uint8_t ninki;
+      uint8_t hutonManualCasts;
+    } nin;
+    struct
+    {
+      uint8_t oathGauge;
+    } pld;
+    struct
+    {
+      uint8_t whiteGauge;
+      uint8_t blackGauge;
+    } rdm;
+    struct
+    {
+      uint16_t unused;
+      uint8_t unused2;
+      uint8_t kenki;
+      uint8_t meditationStacks;
+      SamSen sen;
+    } sam;
+    struct
+    {
+      uint16_t unused;
+      uint8_t aetherflowStacks;
+      uint8_t fairyGauge;
+      uint16_t seraphTimer;
+      SchDismissedFairy dismissedFairy;
+    } sch;
+    struct
+    {
+      uint16_t timer;
+      SmnPet returnSummon;
+      SmnPetGlam petGlam;
+      uint8_t stacks;
+    } smn;
+
+    struct
+    {
+      uint8_t beastGauge;
+    } war;
+    struct
+    {
+      uint16_t unused;
+      uint16_t lilyTimer;
+      uint8_t lilies;
+      uint8_t bloodLilies;
+    } whm;
+  };
+
   using PlayerStateFlagList = std::vector< PlayerStateFlag >;
 
 }
diff --git a/src/world/Actor/Player.cpp b/src/world/Actor/Player.cpp
index 6c5b0b88..07b12743 100644
--- a/src/world/Actor/Player.cpp
+++ b/src/world/Actor/Player.cpp
@@ -106,6 +106,8 @@ Sapphire::Entity::Player::Player() :
 
   m_objSpawnIndexAllocator.init( MAX_DISPLAYED_EOBJS );
   m_actorSpawnIndexAllocator.init( MAX_DISPLAYED_ACTORS, true );
+
+  gaugeClear();
 }
 
 Sapphire::Entity::Player::~Player()
@@ -866,6 +868,9 @@ void Sapphire::Entity::Player::setClassJob( Common::ClassJob classJob )
   sendToInRangeSet( makeActorControl( getId(), ClassJobChange, 0x04 ), true );
 
   sendStatusUpdate();
+
+  gaugeClear();
+  sendActorGauge();
 }
 
 void Sapphire::Entity::Player::setLevel( uint8_t level )
@@ -2236,3 +2241,23 @@ bool Sapphire::Entity::Player::checkAction()
 
   return true;
 }
+
+void Sapphire::Entity::Player::gaugeClear()
+{
+  std::memset( &m_gauge, 0, sizeof( m_gauge ) );
+}
+
+void Sapphire::Entity::Player::sendActorGauge()
+{
+  auto pPacket = makeZonePacket< FFXIVIpcActorGauge >( getId() );
+  pPacket->data().classJobId = static_cast< uint8_t >( getClass() );
+  std::memcpy( pPacket->data().data, &m_gauge, 15 );
+
+  queuePacket( pPacket );
+}
+
+void Sapphire::Entity::Player::gaugeSetRaw( uint8_t* pData )
+{
+  std::memcpy( &m_gauge, pData, 15 );
+  sendActorGauge();
+}
\ No newline at end of file
diff --git a/src/world/Actor/Player.h b/src/world/Actor/Player.h
index cd8fb307..72325649 100644
--- a/src/world/Actor/Player.h
+++ b/src/world/Actor/Player.h
@@ -974,6 +974,12 @@ namespace Sapphire::Entity
 
     Sapphire::ItemPtr dropInventoryItem( Common::InventoryType type, uint16_t slotId );
 
+    // Job UI
+    //////////////////////////////////////////////////////////////////////////////////////////////////////
+    void gaugeClear();
+    void sendActorGauge();
+    void gaugeSetRaw( uint8_t* pData );
+
     //////////////////////////////////////////////////////////////////////////////////////////////////////
 
     Common::HuntingLogEntry& getHuntingLogEntry( uint8_t index );
@@ -1086,6 +1092,8 @@ namespace Sapphire::Entity
     bool m_bLoadingComplete;
     bool m_bAutoattack;
 
+    Common::JobGauge m_gauge;
+
     Common::ZoneingType m_zoningType;
     uint32_t m_territoryId;
 
diff --git a/src/world/Manager/DebugCommandMgr.cpp b/src/world/Manager/DebugCommandMgr.cpp
index 142c838c..612ab4f9 100644
--- a/src/world/Manager/DebugCommandMgr.cpp
+++ b/src/world/Manager/DebugCommandMgr.cpp
@@ -361,6 +361,16 @@ void Sapphire::World::Manager::DebugCommandMgr::set( char* data, Entity::Player&
       }
     }
   }
+  else if( subCommand == "gauge" )
+  {
+    uint8_t values[15];
+    std::memset( values, 0, sizeof( values ) );
+    sscanf( params.c_str(), "%d %d %d %d %d %d %d %d %d %d %d %d %d %d %d",
+            &values[ 0 ], &values[ 1 ], &values[ 2 ], &values[ 3 ], &values[ 4 ],
+            &values[ 5 ], &values[ 6 ], &values[ 7 ], &values[ 8 ], &values[ 9 ],
+            &values[ 10 ], &values[ 11 ], &values[ 12 ], &values[ 13 ], &values[ 14 ] );
+    player.gaugeSetRaw( values );
+  }
   else if( subCommand == "visual" )
   {
     int32_t id;
diff --git a/src/world/Network/Handlers/PacketHandlers.cpp b/src/world/Network/Handlers/PacketHandlers.cpp
index 9346eb21..53584fd8 100644
--- a/src/world/Network/Handlers/PacketHandlers.cpp
+++ b/src/world/Network/Handlers/PacketHandlers.cpp
@@ -412,6 +412,9 @@ void Sapphire::Network::GameConnection::finishLoadingHandler( const Packets::FFX
   // spawn the player for himself
   player.spawn( player.getAsPlayer() );
 
+  player.gaugeClear();
+  player.sendActorGauge();
+
   // notify the zone of a change in position to force an "inRangeActor" update
   player.getCurrentTerritory()->updateActorPosition( player );
 }

From 01555ee8da9f52098f6f2dafca91b78183a0a33e Mon Sep 17 00:00:00 2001
From: collett <collett0301@gmail.com>
Date: Fri, 1 May 2020 20:19:10 +0900
Subject: [PATCH 301/351] Fix CFCancel, more opcode update.

---
 src/common/Network/PacketDef/Ipcs.h           | 44 +++++++++----------
 .../Network/PacketDef/Zone/ServerZoneDef.h    |  6 +++
 src/world/Network/GameConnection.cpp          |  1 +
 src/world/Network/GameConnection.h            |  2 +
 src/world/Network/Handlers/CFHandlers.cpp     | 18 ++++++++
 5 files changed, 49 insertions(+), 22 deletions(-)

diff --git a/src/common/Network/PacketDef/Ipcs.h b/src/common/Network/PacketDef/Ipcs.h
index ebe3c413..8bbd0a01 100644
--- a/src/common/Network/PacketDef/Ipcs.h
+++ b/src/common/Network/PacketDef/Ipcs.h
@@ -61,7 +61,7 @@ namespace Sapphire::Network::Packets
 
     ///////////////////////////////////////////////////
 
-    ChatBanned = 0x006B,
+    ChatBanned = 0xF06B,
     Playtime = 0x0286, // updated 5.25
     Logout = 0x00CD, // updated 5.25
     CFNotify = 0x0145, // updated 5.25
@@ -69,7 +69,7 @@ namespace Sapphire::Network::Packets
     CFDutyInfo = 0x007A,
     CFPlayerInNeed = 0xF07F,
     CFPreferredRole = 0x0186, // added 5.25
-
+    CFCancel = 0x00B7, // updated 5.25
     SocialRequestError = 0xF0AD,
 
     CFRegistered = 0x00B8, // updated 4.1
@@ -80,7 +80,7 @@ namespace Sapphire::Network::Packets
 
     Chat = 0x0161, // updated 5.25
 
-    WorldVisitList = 0x00FE, // added 4.5
+    WorldVisitList = 0xF0FE, // added 4.5
 
     SocialList = 0x0269, // updated 5.25
 
@@ -93,7 +93,7 @@ namespace Sapphire::Network::Packets
     ServerNotice = 0x00E9, // updated 5.25
     SetOnlineStatus = 0x0381, // updated 5.25
 
-    CountdownInitiate = 0x0309, // updated 5.11
+    CountdownInitiate = 0x0237, // updated 5.25
     CountdownCancel = 0x00D9, // updated 5.18
 
     PlayerAddedToBlacklist = 0x033F, // updated 5.1
@@ -102,7 +102,7 @@ namespace Sapphire::Network::Packets
 
     LinkshellList = 0x00A9, // updated 5.25
 
-    MailDeleteRequest = 0x012B, // updated 5.0
+    MailDeleteRequest = 0xF12B, // updated 5.0
 
     // 12D - 137 - constant gap between 4.5x -> 5.0
     ReqMoogleMailList = 0x0138, // updated 5.0
@@ -118,10 +118,10 @@ namespace Sapphire::Network::Packets
 
     CharaFreeCompanyTag = 0x013B, // updated 4.5
     FreeCompanyBoardMsg = 0x013C, // updated 4.5
-    FreeCompanyInfo = 0x013D, // updated 4.5
-    ExamineFreeCompanyInfo = 0x013E, // updated 4.5
+    FreeCompanyInfo = 0xF13D, // updated 4.5
+    ExamineFreeCompanyInfo = 0xF13E, // updated 4.5
 
-    FreeCompanyUpdateShortMessage = 0x0157, // added 5.0
+    FreeCompanyUpdateShortMessage = 0xF157, // added 5.0
 
     StatusEffectList = 0x01D7, // updated 5.25
     EurekaStatusEffectList = 0x0167, // updated 5.18
@@ -177,13 +177,13 @@ namespace Sapphire::Network::Packets
     InventoryActionAck = 0x01AE, // updated 5.25
     UpdateInventorySlot = 0x0151, // updated 5.25
 
-    HuntingLogEntry = 0x01B3, // updated 5.0
+    HuntingLogEntry = 0xF1B3, // updated 5.0
 
     EventPlay = 0x02C3, // updated 5.25
     EventPlay4 = 0x029A, // updated 5.25
     EventPlay8 = 0x0119, // updated 5.18
     EventPlay16 = 0x01FB, // updated 5.18
-    EventPlay32 = 0x017D, // updated 5.21
+    EventPlay32 = 0x02D9, // updated 5.25
     EventPlay64 = 0x00E5, // updated 5.18
     EventPlay128 = 0x02BE, // updated 5.18
     EventPlay255 = 0x01AC, // updated 5.25
@@ -213,7 +213,7 @@ namespace Sapphire::Network::Packets
     SomeDirectorUnk4 = 0x01F3, // updated 5.21 hotfix
     SomeDirectorUnk8 = 0x028A, // updated 5.18
     SomeDirectorUnk16 = 0x028C, // updated 5.18
-    DirectorPopUp = 0x0162, // updated 5.18 - display dialogue pop-ups in duties and FATEs, for example, Teraflare's countdown
+    DirectorPopUp = 0xF162, // updated 5.18 - display dialogue pop-ups in duties and FATEs, for example, Teraflare's countdown
     DirectorPopUp4 = 0x0214, // updated 5.18
     DirectorPopUp8 = 0x00F8, // updated 5.18
 
@@ -234,17 +234,17 @@ namespace Sapphire::Network::Packets
     YardObjectSpawn = 0x0236, // updated 5.0
     HousingIndoorInitialize = 0x0237, // updated 5.0
     LandPriceUpdate = 0x0238, // updated 5.0
-    LandInfoSign = 0x0239, // updated 5.0
+    LandInfoSign = 0x037F, // updated 5.25
     LandRename = 0x023A, // updated 5.0
     HousingEstateGreeting = 0x023B, // updated 5.0
     HousingUpdateLandFlagsSlot = 0x023C, // updated 5.0
     HousingLandFlags = 0x0177, // updated 5.25
     HousingShowEstateGuestAccess = 0x023E, // updated 5.0
 
-    HousingObjectInitialize = 0x0240, // updated 5.0
+    HousingObjectInitialize = 0x0333, // updated 5.25
     HousingInternalObjectSpawn = 0x241, // updated 5.0
 
-    HousingWardInfo = 0x0243, // updated 5.0
+    HousingWardInfo = 0x01D1, // updated 5.25
     HousingObjectMove = 0x0244, // updated 5.0
 
     SharedEstateSettingsResponse = 0x0245, // updated 4.5
@@ -288,12 +288,12 @@ namespace Sapphire::Network::Packets
 
     FinishLoadingHandler = 0x008A, // updated 5.25
 
-    CFCommenceHandler = 0x0078, // updated 5.21 hotfix
+    CFCommenceHandler = 0x0228, // updated 5.25
 
-
-    CFRegisterDuty = 0x0118, // updated 5.21 hotfix
-    CFRegisterRoulette = 0x037A, // updated 5.21 hotfix
-    PlayTimeHandler = 0x0276, // updated 5.1
+    CFCancelHandler = 0x013E, // updated 5.25
+    CFRegisterDuty = 0x0180, // updated 5.25
+    CFRegisterRoulette = 0x0395, // updated 5.25
+    PlayTimeHandler = 0x02FE, // updated 5.25
     LogoutHandler = 0x00B7, // updated 5.25
     CancelLogout = 0x008F, // updated 5.1
 
@@ -329,8 +329,8 @@ namespace Sapphire::Network::Packets
 
     ReqJoinNoviceNetwork = 0x0129, // updated 4.2
 
-    ReqCountdownInitiate = 0x0135, // updated 5.0
-    ReqCountdownCancel = 0x0136, // updated 5.0
+    ReqCountdownInitiate = 0x009A, // updated 5.25
+    ReqCountdownCancel = 0x0244, // updated 5.25
 
     ZoneLineHandler = 0x0214, // updated 5.25
     ClientTrigger = 0x017D, // updated 5.25
@@ -368,7 +368,7 @@ namespace Sapphire::Network::Packets
 
     LandRenameHandler = 0xF177, // updated 5.0
     HousingUpdateHouseGreeting = 0x0178, // updated 5.0
-    HousingUpdateObjectPosition = 0xF179, // updated 5.0
+    HousingUpdateObjectPosition = 0x0159, // updated 5.25
 
     SetSharedEstateSettings = 0x017B, // updated 5.0
 
diff --git a/src/common/Network/PacketDef/Zone/ServerZoneDef.h b/src/common/Network/PacketDef/Zone/ServerZoneDef.h
index 00957763..ee87644c 100644
--- a/src/common/Network/PacketDef/Zone/ServerZoneDef.h
+++ b/src/common/Network/PacketDef/Zone/ServerZoneDef.h
@@ -1999,6 +1999,12 @@ namespace Sapphire::Network::Packets::Server
     uint32_t padding;
   };
 
+  struct FFXIVIpcCFCancel : FFXIVIpcBasePacket< CFCancel >
+  {
+    uint32_t cancelReason;
+    uint32_t unknown2;
+  };
+
 }
 
 #endif /*_CORE_NETWORK_PACKETS_SERVER_IPC_H*/
diff --git a/src/world/Network/GameConnection.cpp b/src/world/Network/GameConnection.cpp
index b3ccb223..7fda9109 100644
--- a/src/world/Network/GameConnection.cpp
+++ b/src/world/Network/GameConnection.cpp
@@ -117,6 +117,7 @@ Sapphire::Network::GameConnection::GameConnection( Sapphire::Network::HivePtr pH
   setZoneHandler( ClientZoneIpcType::CFRegisterDuty, "CFRegisterDuty", &GameConnection::cfRegisterDuty );
   setZoneHandler( ClientZoneIpcType::CFRegisterRoulette, "CFRegisterRoulette", &GameConnection::cfRegisterRoulette );
   setZoneHandler( ClientZoneIpcType::CFCommenceHandler, "CFDutyAccepted", &GameConnection::cfDutyAccepted );
+  setZoneHandler( ClientZoneIpcType::CFCancelHandler, "CFCancel", &GameConnection::cfCancel );
 
   setZoneHandler( ClientZoneIpcType::ReqEquipDisplayFlagsChange, "ReqEquipDisplayFlagsChange",
                   &GameConnection::reqEquipDisplayFlagsHandler );
diff --git a/src/world/Network/GameConnection.h b/src/world/Network/GameConnection.h
index 37a680e0..94fa4f02 100644
--- a/src/world/Network/GameConnection.h
+++ b/src/world/Network/GameConnection.h
@@ -155,6 +155,8 @@ namespace Sapphire::Network
 
     DECLARE_HANDLER( cfDutyAccepted );
 
+    DECLARE_HANDLER( cfCancel );
+
     DECLARE_HANDLER( actionHandler );
 
     DECLARE_HANDLER( placedActionHandler );
diff --git a/src/world/Network/Handlers/CFHandlers.cpp b/src/world/Network/Handlers/CFHandlers.cpp
index 6361d901..0cc3a39f 100644
--- a/src/world/Network/Handlers/CFHandlers.cpp
+++ b/src/world/Network/Handlers/CFHandlers.cpp
@@ -66,10 +66,15 @@ void Sapphire::Network::GameConnection::cfRegisterDuty( const Packets::FFXIVARR_
   player.sendDebug( "Duty register request for contentid#{0}", contentId );
 
   // let's cancel it because otherwise you can't register it again
+  /*
   auto cfCancelPacket = makeZonePacket< FFXIVIpcCFNotify >( player.getId() );
   cfCancelPacket->data().state1 = 3;
   cfCancelPacket->data().state2 = 1; // Your registration is withdrawn.
   queueOutPacket( cfCancelPacket );
+  */
+  auto packet = makeZonePacket< FFXIVIpcCFCancel >( player.getId() );
+  packet->data().cancelReason = 890;
+  queueOutPacket( packet );
 
   auto cfCondition = exdData.get< Sapphire::Data::ContentFinderCondition >( contentId );
   if( !cfCondition )
@@ -90,10 +95,15 @@ void Sapphire::Network::GameConnection::cfRegisterDuty( const Packets::FFXIVARR_
 void Sapphire::Network::GameConnection::cfRegisterRoulette( const Packets::FFXIVARR_PACKET_RAW& inPacket,
                                                             Entity::Player& player )
 {
+  /*
   auto cfCancelPacket = makeZonePacket< FFXIVIpcCFNotify >( player.getId() );
   cfCancelPacket->data().state1 = 3;
   cfCancelPacket->data().state2 = 1; // Your registration is withdrawn.
   queueOutPacket( cfCancelPacket );
+  */
+  auto packet = makeZonePacket< FFXIVIpcCFCancel >( player.getId() );
+  packet->data().cancelReason = 890;
+  queueOutPacket( packet );
 
   player.sendDebug( "Roulette register" );
 }
@@ -103,3 +113,11 @@ void Sapphire::Network::GameConnection::cfDutyAccepted( const Packets::FFXIVARR_
 {
   player.sendDebug( "TODO: Duty accept" );
 }
+
+void Sapphire::Network::GameConnection::cfCancel( const Packets::FFXIVARR_PACKET_RAW& inPacket,
+  Entity::Player& player )
+{
+  auto packet = makeZonePacket< FFXIVIpcCFCancel >( player.getId() );
+  packet->data().cancelReason = 890;
+  queueOutPacket( packet );
+}
\ No newline at end of file

From 97b2c2a8675d4ff6f590a673edf59a1971c2683e Mon Sep 17 00:00:00 2001
From: collett <collett0301@gmail.com>
Date: Thu, 7 May 2020 23:57:16 +0900
Subject: [PATCH 302/351] Handle minion despawn.

---
 src/common/Network/CommonActorControl.h             |  1 +
 src/world/Actor/Player.cpp                          | 11 +++++++----
 src/world/Network/Handlers/ClientTriggerHandler.cpp |  5 +++++
 3 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/src/common/Network/CommonActorControl.h b/src/common/Network/CommonActorControl.h
index d144e83c..2a74cba4 100644
--- a/src/common/Network/CommonActorControl.h
+++ b/src/common/Network/CommonActorControl.h
@@ -350,6 +350,7 @@ namespace Sapphire::Network::ActorControl
 
     DismountReq = 0x65,
     SpawnCompanionReq = 0x66,
+    DespawnCompanionReq = 0x67,
     RemoveStatusEffect = 0x68,
     CastCancel = 0x69,
 
diff --git a/src/world/Actor/Player.cpp b/src/world/Actor/Player.cpp
index 07b12743..691d90a3 100644
--- a/src/world/Actor/Player.cpp
+++ b/src/world/Actor/Player.cpp
@@ -1563,11 +1563,14 @@ void Sapphire::Entity::Player::dismount()
 
 void Sapphire::Entity::Player::spawnCompanion( uint16_t id )
 {
-  auto& exdData = Common::Service< Data::ExdDataGenerated >::ref();
+  if( id > 0 )
+  {
+    auto& exdData = Common::Service< Data::ExdDataGenerated >::ref();
 
-  auto companion = exdData.get< Data::Companion >( id );
-  if( !id )
-    return;
+    auto companion = exdData.get< Data::Companion >( id );
+    if( !companion )
+      return;
+  }
 
   m_companionId = id;
   sendToInRangeSet( makeActorControl( getId(), ActorControlType::ToggleCompanion, id ), true );
diff --git a/src/world/Network/Handlers/ClientTriggerHandler.cpp b/src/world/Network/Handlers/ClientTriggerHandler.cpp
index a1dd3815..6ca7a7b4 100644
--- a/src/world/Network/Handlers/ClientTriggerHandler.cpp
+++ b/src/world/Network/Handlers/ClientTriggerHandler.cpp
@@ -130,6 +130,11 @@ void Sapphire::Network::GameConnection::clientTriggerHandler( const Packets::FFX
       player.spawnCompanion( static_cast< uint16_t >( param1 ) );
       break;
     }
+    case ClientTriggerType::DespawnCompanionReq:
+    {
+      player.spawnCompanion( 0 );
+      break;
+    }
     case ClientTriggerType::RemoveStatusEffect: // Remove status (clicking it off)
     {
       // todo: check if status can be removed by client from exd

From 2c7d74e72c706414cc9f117db518047a74f67194 Mon Sep 17 00:00:00 2001
From: Flavien Normand <contact@flavien-normand.fr>
Date: Sun, 10 May 2020 20:45:18 +0200
Subject: [PATCH 303/351] Add Fishing and Craft event types

---
 src/world/Event/EventHandler.h | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/world/Event/EventHandler.h b/src/world/Event/EventHandler.h
index 11b36c27..285cc59d 100644
--- a/src/world/Event/EventHandler.h
+++ b/src/world/Event/EventHandler.h
@@ -54,6 +54,7 @@ namespace Sapphire::Event
       Aetheryte = 0x0005,
       GuildLeveAssignment = 0x0006,
       DefaultTalk = 0x0009,
+      Craft = 0x000A,
       CustomTalk = 0x000B,
       CompanyLeveOfficer = 0x000C,
       CraftLeve = 0x000E,
@@ -63,6 +64,7 @@ namespace Sapphire::Event
       ChocoboTaxiStand = 0x0012,
       Opening = 0x0013,
       ExitRange = 0x0014,
+      Fishing = 0x0015,
       GCShop = 0x0016,
       GuildOrderGuide = 0x0017,
       GuildOrderOfficer = 0x0018,

From b70435413e15075822b3a08c40685ffab821057b Mon Sep 17 00:00:00 2001
From: collett <collett0301@gmail.com>
Date: Mon, 11 May 2020 06:25:25 +0900
Subject: [PATCH 304/351] Selling items and buying back from shop, show
 corresponding messages in chat.

---
 src/common/Network/PacketDef/Ipcs.h           |  4 +-
 .../Network/PacketDef/Zone/ServerZoneDef.h    | 15 +++-
 src/scripts/common/GilShop.cpp                | 16 ++--
 src/world/Actor/Player.cpp                    | 17 ++++
 src/world/Actor/Player.h                      | 18 +++-
 src/world/Actor/PlayerEvent.cpp               | 41 +++++++--
 src/world/Actor/PlayerInventory.cpp           | 52 ++++++-----
 src/world/Manager/ShopMgr.cpp                 | 88 +++++++++++++++++++
 src/world/Manager/ShopMgr.h                   |  2 +
 src/world/Network/Handlers/EventHandlers.cpp  |  4 +-
 .../UpdateInventorySlotPacket.h               | 15 ++++
 11 files changed, 232 insertions(+), 40 deletions(-)

diff --git a/src/common/Network/PacketDef/Ipcs.h b/src/common/Network/PacketDef/Ipcs.h
index 8bbd0a01..286cb736 100644
--- a/src/common/Network/PacketDef/Ipcs.h
+++ b/src/common/Network/PacketDef/Ipcs.h
@@ -209,7 +209,7 @@ namespace Sapphire::Network::Packets
 
     DirectorVars = 0x00E6, // updated 5.18
     SomeDirectorUnk1 = 0x0084, // updated 5.18
-    SomeDirectorUnk2 = 0x00C1, // updated 5.18
+    SomeDirectorUnk2 = 0xF0C1, // updated 5.18
     SomeDirectorUnk4 = 0x01F3, // updated 5.21 hotfix
     SomeDirectorUnk8 = 0x028A, // updated 5.18
     SomeDirectorUnk16 = 0x028C, // updated 5.18
@@ -376,6 +376,8 @@ namespace Sapphire::Network::Packets
 
     PerformNoteHandler = 0x029B, // updated 4.3
 
+
+    ShopMessage = 0x00C1, // updated 5.25
   };
 
   ////////////////////////////////////////////////////////////////////////////////
diff --git a/src/common/Network/PacketDef/Zone/ServerZoneDef.h b/src/common/Network/PacketDef/Zone/ServerZoneDef.h
index ee87644c..d1c8edbd 100644
--- a/src/common/Network/PacketDef/Zone/ServerZoneDef.h
+++ b/src/common/Network/PacketDef/Zone/ServerZoneDef.h
@@ -1411,7 +1411,8 @@ namespace Sapphire::Network::Packets::Server
     uint16_t scene;
     uint16_t padding;
     uint32_t sceneFlags;
-    uint8_t paramCount;
+    uint32_t unknown;
+    uint8_t paramSize;
     uint8_t padding2[3];
     uint32_t params[ArgCount];
   };
@@ -2005,6 +2006,18 @@ namespace Sapphire::Network::Packets::Server
     uint32_t unknown2;
   };
 
+  struct FFXIVIpcShopMessage : FFXIVIpcBasePacket< ShopMessage >
+  {
+    uint32_t shopId;
+    uint32_t msgType;
+    uint32_t unknown2;
+    uint32_t itemId;
+    uint32_t amount;
+    uint32_t price;
+    uint32_t unknown6;
+    uint32_t unknown7;
+  };
+
 }
 
 #endif /*_CORE_NETWORK_PACKETS_SERVER_IPC_H*/
diff --git a/src/scripts/common/GilShop.cpp b/src/scripts/common/GilShop.cpp
index 93b93d9f..d18047c2 100644
--- a/src/scripts/common/GilShop.cpp
+++ b/src/scripts/common/GilShop.cpp
@@ -25,23 +25,27 @@ public:
 private:
   void shopInteractionCallback( Entity::Player& player, const Event::SceneResult& result )
   {
-    // item purchase
-    if( result.param1 == 768 )
+    // buy, sell, buy back
+    if( result.param1 == 768 || result.param1 == 512 )
     {
       // buy
       if( result.param2 == 1 )
       {
         auto& shopMgr = Common::Service< Sapphire::World::Manager::ShopMgr >::ref();
-
-
         shopMgr.purchaseGilShopItem( player, result.eventId, result.param3, result.param4 );
       }
-
       // sell
       // can't sell if the vendor is yourself (eg, housing permit shop)
       else if( result.param2 == 2 && result.actorId != player.getId() )
       {
-
+        auto& shopMgr = Common::Service< Sapphire::World::Manager::ShopMgr >::ref();
+        shopMgr.shopSellItem( player, result.eventId, result.param3, result.param4 );
+      }
+      //buy back
+      else if( result.param2 == 3 && result.actorId != player.getId() )
+      {
+        auto& shopMgr = Common::Service< Sapphire::World::Manager::ShopMgr >::ref();
+        shopMgr.shopBuyBack( player, result.eventId, result.param3 );
       }
 
       player.playGilShop( result.eventId, SCENE_FLAGS, result.param2, std::bind( &GilShop::shopInteractionCallback, this, std::placeholders::_1, std::placeholders::_2 ) );
diff --git a/src/world/Actor/Player.cpp b/src/world/Actor/Player.cpp
index 691d90a3..15c30e93 100644
--- a/src/world/Actor/Player.cpp
+++ b/src/world/Actor/Player.cpp
@@ -1330,6 +1330,7 @@ void Sapphire::Entity::Player::performZoning( uint16_t zoneId, const Common::FFX
   m_bMarkedForZoning = true;
   setRot( rotation );
   setZone( zoneId );
+  clearBuyBackMap();
 }
 
 bool Sapphire::Entity::Player::isMarkedForZoning() const
@@ -2245,6 +2246,22 @@ bool Sapphire::Entity::Player::checkAction()
   return true;
 }
 
+std::vector< Sapphire::Entity::ShopBuyBackEntry >& Sapphire::Entity::Player::getBuyBackListForShop( uint32_t shopId )
+{
+  return m_shopBuyBackMap[ shopId ];
+}
+
+void Sapphire::Entity::Player::addBuyBackItemForShop( uint32_t shopId, const Sapphire::Entity::ShopBuyBackEntry& entry )
+{
+  auto& list = m_shopBuyBackMap[ shopId ];
+  list.insert( list.begin(), entry );
+}
+
+void Sapphire::Entity::Player::clearBuyBackMap()
+{
+  m_shopBuyBackMap.clear();
+}
+
 void Sapphire::Entity::Player::gaugeClear()
 {
   std::memset( &m_gauge, 0, sizeof( m_gauge ) );
diff --git a/src/world/Actor/Player.h b/src/world/Actor/Player.h
index 72325649..35f602a0 100644
--- a/src/world/Actor/Player.h
+++ b/src/world/Actor/Player.h
@@ -33,6 +33,13 @@ namespace Sapphire::Entity
     }
   };
 
+  struct ShopBuyBackEntry
+  {
+    ItemPtr item;
+    uint32_t amount;
+    uint32_t value;
+  };
+
   /** Class representing the Player
   *  Inheriting from Actor
   *
@@ -921,7 +928,8 @@ namespace Sapphire::Entity
 
     InvSlotPair getFreeBagSlot();
 
-    Sapphire::ItemPtr addItem( uint32_t catalogId, uint32_t quantity = 1, bool isHq = false, bool slient = false, bool canMerge = true );
+    ItemPtr addItem( uint32_t catalogId, uint32_t quantity = 1, bool isHq = false, bool slient = false, bool canMerge = true );
+    ItemPtr addItem( ItemPtr itemToAdd, bool slient = false, bool canMerge = true );
 
     void moveItem( uint16_t fromInventoryId, uint8_t fromSlotId, uint16_t toInventoryId, uint8_t toSlot );
 
@@ -972,7 +980,7 @@ namespace Sapphire::Entity
     void setActiveLand( uint8_t land, uint8_t ward );
     Common::ActiveLand getActiveLand() const;
 
-    Sapphire::ItemPtr dropInventoryItem( Common::InventoryType type, uint16_t slotId );
+    Sapphire::ItemPtr dropInventoryItem( Common::InventoryType type, uint16_t slotId, bool slient = false );
 
     // Job UI
     //////////////////////////////////////////////////////////////////////////////////////////////////////
@@ -996,6 +1004,10 @@ namespace Sapphire::Entity
     uint8_t m_lastMoveflag;
     bool m_falling;
 
+    std::vector< ShopBuyBackEntry >& getBuyBackListForShop( uint32_t shopId );
+    void addBuyBackItemForShop( uint32_t shopId, const ShopBuyBackEntry& entry );
+    void clearBuyBackMap();
+
   private:
     uint32_t m_lastWrite;
     uint32_t m_lastPing;
@@ -1137,7 +1149,7 @@ namespace Sapphire::Entity
     Common::Util::SpawnIndexAllocator< uint8_t > m_actorSpawnIndexAllocator;
 
     std::array< Common::HuntingLogEntry, 12 > m_huntingLogEntries;
-
+    std::unordered_map< uint32_t, std::vector< ShopBuyBackEntry > > m_shopBuyBackMap;
   };
 
 }
diff --git a/src/world/Actor/PlayerEvent.cpp b/src/world/Actor/PlayerEvent.cpp
index a0189b8b..7c7c888b 100644
--- a/src/world/Actor/PlayerEvent.cpp
+++ b/src/world/Actor/PlayerEvent.cpp
@@ -12,6 +12,7 @@
 #include "Network/PacketWrappers/EventFinishPacket.h"
 #include "Network/PacketWrappers/DirectorPlayScenePacket.h"
 
+#include "Inventory/Item.h"
 #include "Territory/Territory.h"
 #include "ServerMgr.h"
 
@@ -147,19 +148,49 @@ void Sapphire::Entity::Player::playGilShop( uint32_t eventId, uint32_t flags, ui
   openGilShopPacket->data().actorId = getId();
   switch( param1 )
   {
+    case 0:
+    {
+      openGilShopPacket->data().paramSize = 0xA1;
+      break;
+    }
     case 1:
     {
-      openGilShopPacket->data().params[ 0 ] = 0x02;
-      openGilShopPacket->data().params[ 1 ] = 1;
-      openGilShopPacket->data().params[ 2 ] = 0x64;
+      openGilShopPacket->data().paramSize = 0x02;
+      openGilShopPacket->data().params[ 0 ] = 1;
+      openGilShopPacket->data().params[ 1 ] = 0x64;
       break;
     }
     case 2:
     {
-      openGilShopPacket->data().params[ 0 ] = 0xA2;
-      openGilShopPacket->data().params[ 1 ] = 2;
+      openGilShopPacket->data().paramSize = 0xA2;
+      openGilShopPacket->data().params[ 0 ] = 2;
       break;
     }
+    case 3:
+    {
+      openGilShopPacket->data().paramSize = 0xA2;
+      openGilShopPacket->data().params[ 0 ] = 3;
+      openGilShopPacket->data().params[ 1 ] = 0x64;
+      break;
+    }
+  }
+
+  auto& buyBackList = getBuyBackListForShop( eventId );
+  int index = param1 == 0 ? 1 : 2;
+  for( auto& entry : buyBackList )
+  {
+    if( index >= openGilShopPacket->data().paramSize )
+      break;
+    openGilShopPacket->data().params[ index++ ] = entry.item->getId();
+    openGilShopPacket->data().params[ index++ ] = entry.amount;
+    openGilShopPacket->data().params[ index++ ] = entry.value;
+    index += 2;
+    openGilShopPacket->data().params[ index++ ] = eventId;
+    index += 2;
+    openGilShopPacket->data().params[ index++ ] = ( ( entry.item->getDurability() << 16 ) + static_cast< uint16_t >( entry.item->isHq() ? 1 : 0 ) );
+    openGilShopPacket->data().params[ index++ ] = ( ( entry.item->getStain() << 16 ) + entry.item->getSpiritbond() );
+    openGilShopPacket->data().params[ index++ ] = 0; // glamour
+    index += 5;
   }
 
   openGilShopPacket->data().scene = 10;
diff --git a/src/world/Actor/PlayerInventory.cpp b/src/world/Actor/PlayerInventory.cpp
index d10c7c66..5f597444 100644
--- a/src/world/Actor/PlayerInventory.cpp
+++ b/src/world/Actor/PlayerInventory.cpp
@@ -521,15 +521,13 @@ void Sapphire::Entity::Player::deleteItemDb( Sapphire::ItemPtr item ) const
 
 bool Sapphire::Entity::Player::isObtainable( uint32_t catalogId, uint8_t quantity )
 {
-
   return true;
 }
 
-
-Sapphire::ItemPtr Sapphire::Entity::Player::addItem( uint32_t catalogId, uint32_t quantity, bool isHq, bool silent, bool canMerge )
+Sapphire::ItemPtr Sapphire::Entity::Player::addItem( ItemPtr itemToAdd, bool silent, bool canMerge )
 {
   auto& exdData = Common::Service< Data::ExdDataGenerated >::ref();
-  auto itemInfo = exdData.get< Sapphire::Data::Item >( catalogId );
+  auto itemInfo = exdData.get< Sapphire::Data::Item >( itemToAdd->getId() );
 
   // if item data doesn't exist or it's a blank field
   if( !itemInfo || itemInfo->levelItem == 0 )
@@ -537,10 +535,10 @@ Sapphire::ItemPtr Sapphire::Entity::Player::addItem( uint32_t catalogId, uint32_
     return nullptr;
   }
 
-  quantity = std::min< uint32_t >( quantity, itemInfo->stackSize );
+  itemToAdd->setStackSize( std::min< uint32_t >( itemToAdd->getStackSize(), itemInfo->stackSize ) );
 
   // used for item obtain notification
-  uint32_t originalQuantity = quantity;
+  uint32_t originalQuantity = itemToAdd->getStackSize();
 
   std::pair< uint16_t, uint8_t > freeBagSlot;
   bool foundFreeSlot = false;
@@ -567,7 +565,7 @@ Sapphire::ItemPtr Sapphire::Entity::Player::addItem( uint32_t catalogId, uint32_
       auto item = storage->getItem( slot );
 
       // add any items that are stackable
-      if( canMerge && item && !itemInfo->isEquippable && item->getId() == catalogId )
+      if( canMerge && item && !itemInfo->isEquippable && item->getId() == itemToAdd->getId() )
       {
         uint32_t count = item->getStackSize();
         uint32_t maxStack = item->getMaxStackSize();
@@ -577,18 +575,18 @@ Sapphire::ItemPtr Sapphire::Entity::Player::addItem( uint32_t catalogId, uint32_
           continue;
 
         // check slot is same quality
-        if( item->isHq() != isHq )
+        if( item->isHq() != itemToAdd->isHq() )
           continue;
 
         // update stack
-        uint32_t newStackSize = count + quantity;
+        uint32_t newStackSize = count + itemToAdd->getStackSize();
         if( newStackSize > maxStack )
         {
-          quantity = newStackSize - maxStack;
+          itemToAdd->setStackSize( newStackSize - maxStack );
           newStackSize = maxStack;
         }
         else
-          quantity = 0;
+          itemToAdd->setStackSize( 0 );
 
         item->setStackSize( newStackSize );
         writeItem( item );
@@ -597,9 +595,9 @@ Sapphire::ItemPtr Sapphire::Entity::Player::addItem( uint32_t catalogId, uint32_
         queuePacket( slotUpdate );
 
         // return existing stack if we have no overflow - items fit into a preexisting stack
-        if( quantity == 0 )
+        if( itemToAdd->getStackSize() == 0 )
         {
-          queuePacket( makeActorControlSelf( getId(), ItemObtainIcon, catalogId, originalQuantity ) );
+          queuePacket( makeActorControlSelf( getId(), ItemObtainIcon, itemToAdd->getId(), originalQuantity ) );
 
           auto soundEffectPacket = makeZonePacket< FFXIVIpcInventoryActionAck >( getId() );
           soundEffectPacket->data().sequence = 0xFFFFFFFF;
@@ -622,21 +620,17 @@ Sapphire::ItemPtr Sapphire::Entity::Player::addItem( uint32_t catalogId, uint32_
   if( !foundFreeSlot )
     return nullptr;
 
-  auto item = createItem( catalogId, quantity );
-  item->setHq( isHq );
-
   auto storage = m_storageMap[ freeBagSlot.first ];
-  storage->setItem( freeBagSlot.second, item );
+  storage->setItem( freeBagSlot.second, itemToAdd );
 
   writeInventory( static_cast< InventoryType >( freeBagSlot.first ) );
 
   if( !silent )
   {
-    auto invUpdate = std::make_shared< UpdateInventorySlotPacket >( getId(), freeBagSlot.second, freeBagSlot.first,
-                                                                      *item );
+    auto invUpdate = std::make_shared< UpdateInventorySlotPacket >( getId(), freeBagSlot.second, freeBagSlot.first, *itemToAdd );
     queuePacket( invUpdate );
 
-    queuePacket( makeActorControlSelf( getId(), ItemObtainIcon, catalogId, originalQuantity ) );
+    queuePacket( makeActorControlSelf( getId(), ItemObtainIcon, itemToAdd->getId(), originalQuantity ) );
 
     auto soundEffectPacket = makeZonePacket< FFXIVIpcInventoryActionAck >( getId() );
     soundEffectPacket->data().sequence = 0xFFFFFFFF;
@@ -644,7 +638,15 @@ Sapphire::ItemPtr Sapphire::Entity::Player::addItem( uint32_t catalogId, uint32_
     queuePacket( soundEffectPacket );
   }
 
-  return item;
+  return itemToAdd;
+}
+
+
+Sapphire::ItemPtr Sapphire::Entity::Player::addItem( uint32_t catalogId, uint32_t quantity, bool isHq, bool silent, bool canMerge )
+{
+  auto item = createItem( catalogId, quantity );
+  item->setHq( isHq );
+  return addItem( item, silent, canMerge );
 }
 
 void
@@ -927,7 +929,7 @@ uint32_t Sapphire::Entity::Player::getNextInventorySequence()
   return m_inventorySequence++;
 }
 
-Sapphire::ItemPtr Sapphire::Entity::Player::dropInventoryItem( Sapphire::Common::InventoryType type, uint16_t slotId )
+Sapphire::ItemPtr Sapphire::Entity::Player::dropInventoryItem( Sapphire::Common::InventoryType type, uint16_t slotId, bool slient )
 {
   auto& container = m_storageMap[ type ];
 
@@ -939,6 +941,12 @@ Sapphire::ItemPtr Sapphire::Entity::Player::dropInventoryItem( Sapphire::Common:
   container->removeItem( slotId, false );
   updateContainer( type, slotId, nullptr );
 
+  if( !slient )
+  {
+    auto invUpdate = std::make_shared< UpdateInventorySlotPacket >( getId(), slotId, static_cast< uint16_t >( type ) );
+    queuePacket( invUpdate );
+  }
+
   auto seq = getNextInventorySequence();
 
   // send inv update
diff --git a/src/world/Manager/ShopMgr.cpp b/src/world/Manager/ShopMgr.cpp
index 80df3a04..3e3ad10a 100644
--- a/src/world/Manager/ShopMgr.cpp
+++ b/src/world/Manager/ShopMgr.cpp
@@ -4,8 +4,15 @@
 #include <Actor/Player.h>
 #include <Common.h>
 #include <Service.h>
+#include <Network/GamePacket.h>
+#include <Network/PacketDef/Zone/ServerZoneDef.h>
+
+#include "Inventory/Item.h"
+#include "Inventory/ItemContainer.h"
 
 using namespace Sapphire;
+using namespace Sapphire::Network::Packets;
+using namespace Sapphire::Network::Packets::Server;
 
 bool Sapphire::World::Manager::ShopMgr::purchaseGilShopItem( Entity::Player& player, uint32_t shopId, uint16_t itemId, uint32_t quantity )
 {
@@ -29,5 +36,86 @@ bool Sapphire::World::Manager::ShopMgr::purchaseGilShopItem( Entity::Player& pla
 
   player.removeCurrency( Common::CurrencyType::Gil, price );
 
+  auto packet = makeZonePacket< FFXIVIpcShopMessage >( player.getId() );
+  packet->data().shopId = shopId;
+  packet->data().msgType = 1687;
+  packet->data().unknown2 = 3;
+  packet->data().itemId = gilShopItem->item;
+  packet->data().amount = quantity;
+  packet->data().price = price;
+  packet->data().unknown6 = 0;
+  packet->data().unknown7 = 0;
+  player.queuePacket( packet );
+
   return true;
 }
+
+bool Sapphire::World::Manager::ShopMgr::shopSellItem( Sapphire::Entity::Player& player, uint32_t shopId, uint16_t containerId, uint16_t slotId )
+{
+  auto item = player.getItemAt( containerId, slotId );
+  if( item )
+  {
+    auto& exdData = Common::Service< Data::ExdDataGenerated >::ref();
+    auto itemData = exdData.get< Data::Item >( item->getId() );
+    if( itemData && !itemData->isIndisposable )
+    {
+      auto value = itemData->priceLow * item->getStackSize();
+      player.dropInventoryItem( static_cast< Common::InventoryType >( containerId ), slotId );
+      player.addCurrency( Common::CurrencyType::Gil, value );
+      Entity::ShopBuyBackEntry entry =
+      {
+        item,
+        item->getStackSize(),
+        itemData->priceLow
+      };
+      player.addBuyBackItemForShop( shopId, entry );
+      auto packet = makeZonePacket< FFXIVIpcShopMessage >( player.getId() );
+      packet->data().shopId = shopId;
+      packet->data().msgType = 1688;
+      packet->data().unknown2 = 3;
+      packet->data().itemId = item->getId();
+      packet->data().amount = item->getStackSize();
+      packet->data().price = value;
+      packet->data().unknown6 = 0;
+      packet->data().unknown7 = 0;
+      player.queuePacket( packet );
+
+      return true;
+    }
+  }
+  return false;
+}
+
+bool Sapphire::World::Manager::ShopMgr::shopBuyBack( Sapphire::Entity::Player& player, uint32_t shopId, uint16_t index )
+{
+  auto& buyBackList = player.getBuyBackListForShop( shopId );
+  if( buyBackList.size() > index )
+  {
+    auto& entry = buyBackList[ index ];
+    if( player.getCurrency( Common::CurrencyType::Gil ) < entry.value )
+      return false;
+
+    auto originalStack = entry.item->getStackSize();
+
+    if( !player.addItem( entry.item ) )
+      return false;
+
+    player.removeCurrency( Common::CurrencyType::Gil, entry.value );
+
+    buyBackList.erase( buyBackList.begin() + index );
+
+    auto packet = makeZonePacket< FFXIVIpcShopMessage >( player.getId() );
+    packet->data().shopId = shopId;
+    packet->data().msgType = 1689;
+    packet->data().unknown2 = 3;
+    packet->data().itemId = entry.item->getId();
+    packet->data().amount = originalStack;
+    packet->data().price = entry.value * originalStack;
+    packet->data().unknown6 = 0;
+    packet->data().unknown7 = 0;
+    player.queuePacket( packet );
+
+    return true;
+  }
+  return false;
+}
diff --git a/src/world/Manager/ShopMgr.h b/src/world/Manager/ShopMgr.h
index 5e40ae1d..fcda6e32 100644
--- a/src/world/Manager/ShopMgr.h
+++ b/src/world/Manager/ShopMgr.h
@@ -7,5 +7,7 @@ namespace Sapphire::World::Manager
   public:
     ShopMgr() = default;
     bool purchaseGilShopItem( Sapphire::Entity::Player& player, uint32_t shopId, uint16_t itemId, uint32_t quantity );
+    bool shopSellItem( Sapphire::Entity::Player& player, uint32_t shopId, uint16_t containerId, uint16_t slotId );
+    bool shopBuyBack( Sapphire::Entity::Player& player, uint32_t shopId, uint16_t index );
   };
 }
\ No newline at end of file
diff --git a/src/world/Network/Handlers/EventHandlers.cpp b/src/world/Network/Handlers/EventHandlers.cpp
index 33fe1641..ae2ccb87 100644
--- a/src/world/Network/Handlers/EventHandlers.cpp
+++ b/src/world/Network/Handlers/EventHandlers.cpp
@@ -204,8 +204,8 @@ void Sapphire::Network::GameConnection::eventHandlerReturn( const Packets::FFXIV
 
   std::string eventName = eventMgr.getEventName( eventId );
 
-  player.sendDebug( "eventId: {0} ({0:08X}) scene: {1}, p1: {2}, p2: {3}, p3: {4}",
-                    eventId, scene, param1, param2, param3 );
+  player.sendDebug( "eventId: {0} ({0:08X}) scene: {1}, p1: {2}, p2: {3}, p3: {4}, p4: {5}",
+                    eventId, scene, param1, param2, param3, param4 );
 
   auto pEvent = player.getEvent( eventId );
   if( pEvent )
diff --git a/src/world/Network/PacketWrappers/UpdateInventorySlotPacket.h b/src/world/Network/PacketWrappers/UpdateInventorySlotPacket.h
index c16042d2..5e46f9b9 100644
--- a/src/world/Network/PacketWrappers/UpdateInventorySlotPacket.h
+++ b/src/world/Network/PacketWrappers/UpdateInventorySlotPacket.h
@@ -21,6 +21,12 @@ namespace Sapphire::Network::Packets::Server
       initialize( slot, storageId, item );
     };
 
+    UpdateInventorySlotPacket( uint32_t playerId, uint8_t slot, uint16_t storageId ) :
+      ZoneChannelPacket< FFXIVIpcUpdateInventorySlot >( playerId, playerId )
+    {
+      initialize( slot, storageId );
+    };
+
   private:
     void initialize( uint8_t slot, uint16_t storageId, const Item& item )
     {
@@ -47,6 +53,15 @@ namespace Sapphire::Network::Packets::Server
       //uint8_t buffer4;
       //uint8_t buffer5;
     };
+
+    void initialize( uint8_t slot, uint16_t storageId )
+    {
+      m_data.sequence = 0;
+      m_data.containerId = storageId;
+      m_data.slot = slot;
+      m_data.quantity = 0;
+      m_data.catalogId = 0;
+    };
   };
 
 }

From 15e5d60b0b85ab624963b18784989b19eb7e1c6a Mon Sep 17 00:00:00 2001
From: collett <collett0301@gmail.com>
Date: Mon, 11 May 2020 06:43:07 +0900
Subject: [PATCH 305/351] fix build

---
 src/world/Event/EventHandler.h               | 2 +-
 src/world/Network/Handlers/EventHandlers.cpp | 4 ++--
 src/world/Script/ScriptMgr.cpp               | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/world/Event/EventHandler.h b/src/world/Event/EventHandler.h
index 285cc59d..8b6016c6 100644
--- a/src/world/Event/EventHandler.h
+++ b/src/world/Event/EventHandler.h
@@ -45,7 +45,7 @@ namespace Sapphire::Event
       TableGame = 24,
     };
 
-    enum EventHandlerType : uint16_t
+    enum class EventHandlerType : uint16_t
     {
       Quest = 0x0001,
       Warp = 0x0002,
diff --git a/src/world/Network/Handlers/EventHandlers.cpp b/src/world/Network/Handlers/EventHandlers.cpp
index ae2ccb87..929bc90b 100644
--- a/src/world/Network/Handlers/EventHandlers.cpp
+++ b/src/world/Network/Handlers/EventHandlers.cpp
@@ -42,7 +42,7 @@ void Sapphire::Network::GameConnection::eventHandlerTalk( const Packets::FFXIVAR
   const auto actorId = packet.data().actorId;
   const auto eventId = packet.data().eventId;
 
-  auto eventType = static_cast< uint16_t >( eventId >> 16 );
+  auto eventType = static_cast< Event::EventHandler::EventHandlerType >( eventId >> 16 );
 
   std::string eventName = "onTalk";
   std::string objName = eventMgr.getEventName( eventId );
@@ -83,7 +83,7 @@ void Sapphire::Network::GameConnection::eventHandlerEmote( const Packets::FFXIVA
   const auto actorId = packet.data().actorId;
   const auto eventId = packet.data().eventId;
   const auto emoteId = packet.data().emoteId;
-  const auto eventType = static_cast< uint16_t >( eventId >> 16 );
+  const auto eventType = static_cast< Event::EventHandler::EventHandlerType >( eventId >> 16 );
 
   std::string eventName = "onEmote";
   std::string objName = eventMgr.getEventName( eventId );
diff --git a/src/world/Script/ScriptMgr.cpp b/src/world/Script/ScriptMgr.cpp
index b7e082bd..e9f9a2a5 100644
--- a/src/world/Script/ScriptMgr.cpp
+++ b/src/world/Script/ScriptMgr.cpp
@@ -284,7 +284,7 @@ bool Sapphire::Scripting::ScriptMgr::onBNpcKill( Entity::Player& player, uint16_
     if( !activeQuests )
       continue;
 
-    uint32_t questId = activeQuests->c.questId | Event::EventHandler::EventHandlerType::Quest << 16;
+    uint32_t questId = activeQuests->c.questId | static_cast< uint16_t >( Event::EventHandler::EventHandlerType::Quest ) << 16;
 
     auto script = m_nativeScriptMgr->getScript< Sapphire::ScriptAPI::EventScript >( questId );
     if( script )
@@ -311,7 +311,7 @@ bool Sapphire::Scripting::ScriptMgr::onEObjHit( Sapphire::Entity::Player& player
     if( !activeQuests )
       continue;
 
-    uint32_t questId = activeQuests->c.questId | Event::EventHandler::EventHandlerType::Quest << 16;
+    uint32_t questId = activeQuests->c.questId | static_cast< uint16_t >( Event::EventHandler::EventHandlerType::Quest ) << 16;
 
     auto script = m_nativeScriptMgr->getScript< Sapphire::ScriptAPI::EventScript >( questId );
     if( script )

From 1e53333c9e323741b766993963dfe4a32b12683c Mon Sep 17 00:00:00 2001
From: collett <collett0301@gmail.com>
Date: Mon, 11 May 2020 19:03:52 +0900
Subject: [PATCH 306/351] Fix buy back price.

---
 src/world/Actor/Player.h        |  2 +-
 src/world/Actor/PlayerEvent.cpp |  2 +-
 src/world/Manager/ShopMgr.cpp   | 10 +++++-----
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/world/Actor/Player.h b/src/world/Actor/Player.h
index 35f602a0..6a26da75 100644
--- a/src/world/Actor/Player.h
+++ b/src/world/Actor/Player.h
@@ -37,7 +37,7 @@ namespace Sapphire::Entity
   {
     ItemPtr item;
     uint32_t amount;
-    uint32_t value;
+    uint32_t pricePerItem;
   };
 
   /** Class representing the Player
diff --git a/src/world/Actor/PlayerEvent.cpp b/src/world/Actor/PlayerEvent.cpp
index 7c7c888b..12f8c626 100644
--- a/src/world/Actor/PlayerEvent.cpp
+++ b/src/world/Actor/PlayerEvent.cpp
@@ -183,7 +183,7 @@ void Sapphire::Entity::Player::playGilShop( uint32_t eventId, uint32_t flags, ui
       break;
     openGilShopPacket->data().params[ index++ ] = entry.item->getId();
     openGilShopPacket->data().params[ index++ ] = entry.amount;
-    openGilShopPacket->data().params[ index++ ] = entry.value;
+    openGilShopPacket->data().params[ index++ ] = entry.pricePerItem;
     index += 2;
     openGilShopPacket->data().params[ index++ ] = eventId;
     index += 2;
diff --git a/src/world/Manager/ShopMgr.cpp b/src/world/Manager/ShopMgr.cpp
index 3e3ad10a..8ad8d2d5 100644
--- a/src/world/Manager/ShopMgr.cpp
+++ b/src/world/Manager/ShopMgr.cpp
@@ -92,15 +92,15 @@ bool Sapphire::World::Manager::ShopMgr::shopBuyBack( Sapphire::Entity::Player& p
   if( buyBackList.size() > index )
   {
     auto& entry = buyBackList[ index ];
-    if( player.getCurrency( Common::CurrencyType::Gil ) < entry.value )
-      return false;
-
     auto originalStack = entry.item->getStackSize();
+    auto price = entry.pricePerItem * originalStack;
+    if( player.getCurrency( Common::CurrencyType::Gil ) < price )
+      return false;
 
     if( !player.addItem( entry.item ) )
       return false;
 
-    player.removeCurrency( Common::CurrencyType::Gil, entry.value );
+    player.removeCurrency( Common::CurrencyType::Gil, price );
 
     buyBackList.erase( buyBackList.begin() + index );
 
@@ -110,7 +110,7 @@ bool Sapphire::World::Manager::ShopMgr::shopBuyBack( Sapphire::Entity::Player& p
     packet->data().unknown2 = 3;
     packet->data().itemId = entry.item->getId();
     packet->data().amount = originalStack;
-    packet->data().price = entry.value * originalStack;
+    packet->data().price = price;
     packet->data().unknown6 = 0;
     packet->data().unknown7 = 0;
     player.queuePacket( packet );

From 37fbb35c0a8a61d55e371ef4cdcae181e8da6376 Mon Sep 17 00:00:00 2001
From: collett <collett0301@gmail.com>
Date: Tue, 12 May 2020 00:18:45 +0900
Subject: [PATCH 307/351] Fix armory.

---
 src/common/Common.h                 | 58 +++++++++++++++--------------
 src/world/Actor/PlayerInventory.cpp |  4 +-
 src/world/Manager/ItemMgr.cpp       | 46 +++++++++++------------
 src/world/Manager/ItemMgr.h         |  2 +-
 4 files changed, 56 insertions(+), 54 deletions(-)

diff --git a/src/common/Common.h b/src/common/Common.h
index 927b4f01..1d7c5fe2 100644
--- a/src/common/Common.h
+++ b/src/common/Common.h
@@ -159,44 +159,46 @@ namespace Sapphire::Common
     ModelRing2 = 9
   };
 
-  enum EquipSlotCategory : uint8_t
+  enum class EquipSlotCategory : uint8_t
   {
-    Unequippable = 0,
-
     // main slots
 
-    CharaMainHand = 1,
-    CharaOffHand = 2,
-    CharaHead = 3,
-    CharaBody = 4,
-    CharaHands = 5,
-    CharaWaist = 6,
-    CharaLegs = 7,
-    CharaFeet = 8,
-    CharaEars = 9,
-    CharaNeck = 10,
-    CharaWrist = 11,
-    CharaRing = 12,
-    CharaSoulCrystal = 17,
-
-    // specials
+    CharaMainHand = 0,
+    CharaOffHand = 1,
+    CharaHead = 2,
+    CharaBody = 3,
+    CharaHands = 4,
+    CharaWaist = 5,
+    CharaLegs = 6,
+    CharaFeet = 7,
+    CharaEars = 8,
+    CharaNeck = 9,
+    CharaWrist = 10,
+    CharaRing = 11,
+    CharaSoulCrystal = 12,
 
+    /* following slots not seem to exist any more.
+       when multi-slot gear is moved into equipment slot, normal slot listed above is used.
+       client will move any incompatible gears into armory but no InventoryModifiyHandler is sent.
+       server need to move those silently in order to sync with client.
+    */
+    
     /*! Cannot equip gear to offhand slot */
-      MainTwoHandedWeapon = 13,
+      //MainTwoHandedWeapon = 13,
     /*! Can be equipped in either main or offhand slot */
-      MainOrOffHand = 14, // unused
+      //MainOrOffHand = 14, // unused
     /*! Cannot equip gear to head */
-      BodyDisallowHead = 15,
+      //BodyDisallowHead = 15,
     /*! Cannot equip gear to hands, legs and feet slots */
-      BodyDisallowHandsLegsFeet = 16,
+      //BodyDisallowHandsLegsFeet = 16,
     /*! Cannot equip gear to feet slot */
-      LegsDisallowFeet = 18,
+      //LegsDisallowFeet = 18,
     /*! Cannot equp gear to head, hands, legs, feet slots */
-      BodyDisallowAll = 19,
+      //BodyDisallowAll = 19,
     /*! Cannot equip gear to hands slot */
-      BodyDisallowHands = 20,
+      //BodyDisallowHands = 20,
     /*! Cannot equip gear to legs & feet slots */
-      BodyDisallowLegsFeet = 21,
+      //BodyDisallowLegsFeet = 21,
   };
 
   enum InventoryType : uint16_t
@@ -226,8 +228,8 @@ namespace Sapphire::Common
     ArmoryWaist = 3204,
     ArmoryLegs = 3205,
     ArmoryFeet = 3206,
-    ArmoryNeck = 3207,
-    ArmoryEar = 3208,
+    ArmoryEar = 3207,
+    ArmoryNeck = 3208,
     ArmoryWrist = 3209,
     ArmoryRing = 3300,
 
diff --git a/src/world/Actor/PlayerInventory.cpp b/src/world/Actor/PlayerInventory.cpp
index 5f597444..06ea2cfb 100644
--- a/src/world/Actor/PlayerInventory.cpp
+++ b/src/world/Actor/PlayerInventory.cpp
@@ -548,7 +548,7 @@ Sapphire::ItemPtr Sapphire::Entity::Player::addItem( ItemPtr itemToAdd, bool sil
   // add the related armoury bag to the applicable bags and try and fill a free slot there before falling back to regular inventory
   if( itemInfo->isEquippable && getEquipDisplayFlags() & StoreNewItemsInArmouryChest )
   {
-    auto bag = World::Manager::ItemMgr::getCharaEquipSlotCategoryToArmoryId( itemInfo->equipSlotCategory );
+    auto bag = World::Manager::ItemMgr::getCharaEquipSlotCategoryToArmoryId( static_cast< Common::EquipSlotCategory >( itemInfo->equipSlotCategory ) );
 
     bags.insert( bags.begin(), bag );
   }
@@ -802,7 +802,7 @@ void Sapphire::Entity::Player::swapItem( uint16_t fromInventoryId, uint8_t fromS
       && !World::Manager::ItemMgr::isArmory( fromInventoryId ) )
   {
     updateContainer( fromInventoryId, fromSlotId, nullptr );
-    fromInventoryId = World::Manager::ItemMgr::getCharaEquipSlotCategoryToArmoryId( toSlot );
+    fromInventoryId = World::Manager::ItemMgr::getCharaEquipSlotCategoryToArmoryId( static_cast< Common::EquipSlotCategory >( toSlot ) );
     fromSlotId = static_cast < uint8_t >( m_storageMap[ fromInventoryId ]->getFreeSlot() );
   }
 
diff --git a/src/world/Manager/ItemMgr.cpp b/src/world/Manager/ItemMgr.cpp
index a28cec61..3c08d82d 100644
--- a/src/world/Manager/ItemMgr.cpp
+++ b/src/world/Manager/ItemMgr.cpp
@@ -27,56 +27,56 @@ bool Sapphire::World::Manager::ItemMgr::isArmory( uint16_t containerId )
 }
 
 
-uint16_t Sapphire::World::Manager::ItemMgr::getCharaEquipSlotCategoryToArmoryId( uint8_t slotId )
+uint16_t Sapphire::World::Manager::ItemMgr::getCharaEquipSlotCategoryToArmoryId( Common::EquipSlotCategory slot )
 {
 
-  switch( slotId )
+  switch( slot )
   {
-    case Common::CharaHead:
+    case Common::EquipSlotCategory::CharaHead:
       return Common::ArmoryHead;
 
-    case Common::CharaBody:
-    case Common::BodyDisallowHead:
-    case Common::BodyDisallowHandsLegsFeet:
-    case Common::BodyDisallowAll:
-    case Common::BodyDisallowHands:
-    case Common::BodyDisallowLegsFeet:
+    case Common::EquipSlotCategory::CharaBody:
+    //case Common::EquipSlotCategory::BodyDisallowHead:
+    //case Common::EquipSlotCategory::BodyDisallowHandsLegsFeet:
+    //case Common::EquipSlotCategory::BodyDisallowAll:
+    //case Common::EquipSlotCategory::BodyDisallowHands:
+    //case Common::EquipSlotCategory::BodyDisallowLegsFeet:
       return Common::ArmoryBody;
 
-    case Common::CharaEars:
+    case Common::EquipSlotCategory::CharaEars:
       return Common::ArmoryEar;
 
-    case Common::CharaFeet:
+    case Common::EquipSlotCategory::CharaFeet:
       return Common::ArmoryFeet;
 
-    case Common::CharaHands:
+    case Common::EquipSlotCategory::CharaHands:
       return Common::ArmoryHand;
 
-    case Common::CharaLegs:
-    case Common::LegsDisallowFeet:
+    case Common::EquipSlotCategory::CharaLegs:
+    //case Common::EquipSlotCategory::LegsDisallowFeet:
       return Common::ArmoryLegs;
 
-    case Common::CharaMainHand:
-    case Common::MainTwoHandedWeapon:
-    case Common::MainOrOffHand:
+    case Common::EquipSlotCategory::CharaMainHand:
+    //case Common::EquipSlotCategory::MainTwoHandedWeapon:
+    //case Common::EquipSlotCategory::MainOrOffHand:
       return Common::ArmoryMain;
 
-    case Common::CharaOffHand:
+    case Common::EquipSlotCategory::CharaOffHand:
       return Common::ArmoryOff;
 
-    case Common::CharaRing:
+    case Common::EquipSlotCategory::CharaRing:
       return Common::ArmoryRing;
 
-    case Common::CharaWaist:
+    case Common::EquipSlotCategory::CharaWaist:
       return Common::ArmoryWaist;
 
-    case Common::CharaWrist:
+    case Common::EquipSlotCategory::CharaWrist:
       return Common::ArmoryWrist;
 
-    case Common::CharaNeck:
+    case Common::EquipSlotCategory::CharaNeck:
       return Common::ArmoryNeck;
 
-    case Common::CharaSoulCrystal:
+    case Common::EquipSlotCategory::CharaSoulCrystal:
       return Common::ArmorySoulCrystal;
 
     default:
diff --git a/src/world/Manager/ItemMgr.h b/src/world/Manager/ItemMgr.h
index b24c56e9..6208cf94 100644
--- a/src/world/Manager/ItemMgr.h
+++ b/src/world/Manager/ItemMgr.h
@@ -20,7 +20,7 @@ namespace Sapphire::World::Manager
     static bool isOneHandedWeapon( Common::ItemUICategory weaponCategory );
     static bool isArmory( uint16_t containerId );
     static bool isEquipment( uint16_t containerId );
-    static uint16_t getCharaEquipSlotCategoryToArmoryId( uint8_t slotId );
+    static uint16_t getCharaEquipSlotCategoryToArmoryId( Common::EquipSlotCategory slot );
     static Common::ContainerType getContainerType( uint32_t containerId );
   };
 

From cc95097fbe1580b32ff71cf2afa9cf30fe2633bc Mon Sep 17 00:00:00 2001
From: collett <collett0301@gmail.com>
Date: Tue, 12 May 2020 02:30:21 +0900
Subject: [PATCH 308/351] Add LootMessage packet to fix old ItemObtainIcon.

---
 src/common/Common.h                           | 10 +++
 src/common/Network/PacketDef/Ipcs.h           |  2 +-
 .../Network/PacketDef/Zone/ServerZoneDef.h    | 13 +++
 src/world/Actor/Player.h                      | 10 +--
 src/world/Actor/PlayerInventory.cpp           | 85 +++++++++++++++----
 src/world/Actor/PlayerQuest.cpp               |  6 +-
 .../Network/Handlers/GMCommandHandlers.cpp    | 17 +++-
 7 files changed, 112 insertions(+), 31 deletions(-)

diff --git a/src/common/Common.h b/src/common/Common.h
index 1d7c5fe2..efb6335b 100644
--- a/src/common/Common.h
+++ b/src/common/Common.h
@@ -1229,6 +1229,16 @@ namespace Sapphire::Common
     } whm;
   };
 
+  enum class LootMessageType : uint8_t
+  {
+    GetItem1 = 1, // p1: actorId, p4: itemId (HQ: itemId + 1,000,000 lol), p5: amount
+    GetItem2 = 3, // p1: actorId, p2: itemId, p3: amount, seems like same thing as GetItem1 but different param position.
+    FailedToGetLootNoFreeInventorySlot = 5, // p1: actorId
+    LootRolled = 7, // p1: actorId, p2: itemId, p3: amount
+    GetGil = 9, // p1: gil
+    EmptyCoffer = 11, // seems like no param
+  };
+
   using PlayerStateFlagList = std::vector< PlayerStateFlag >;
 
 }
diff --git a/src/common/Network/PacketDef/Ipcs.h b/src/common/Network/PacketDef/Ipcs.h
index 286cb736..8e1a83ff 100644
--- a/src/common/Network/PacketDef/Ipcs.h
+++ b/src/common/Network/PacketDef/Ipcs.h
@@ -376,8 +376,8 @@ namespace Sapphire::Network::Packets
 
     PerformNoteHandler = 0x029B, // updated 4.3
 
-
     ShopMessage = 0x00C1, // updated 5.25
+    LootMessage = 0x00B1, // updated 5.25
   };
 
   ////////////////////////////////////////////////////////////////////////////////
diff --git a/src/common/Network/PacketDef/Zone/ServerZoneDef.h b/src/common/Network/PacketDef/Zone/ServerZoneDef.h
index d1c8edbd..08d485cc 100644
--- a/src/common/Network/PacketDef/Zone/ServerZoneDef.h
+++ b/src/common/Network/PacketDef/Zone/ServerZoneDef.h
@@ -2018,6 +2018,19 @@ namespace Sapphire::Network::Packets::Server
     uint32_t unknown7;
   };
 
+  struct FFXIVIpcLootMessage : FFXIVIpcBasePacket< LootMessage >
+  {
+    Common::LootMessageType msgType;
+    uint8_t padding[3];
+    uint32_t param1;
+    uint32_t param2;
+    uint32_t param3;
+    uint32_t param4;
+    uint32_t param5;
+    uint32_t param6;
+    uint32_t param7;
+  };
+
 }
 
 #endif /*_CORE_NETWORK_PACKETS_SERVER_IPC_H*/
diff --git a/src/world/Actor/Player.h b/src/world/Actor/Player.h
index 6a26da75..926c995c 100644
--- a/src/world/Actor/Player.h
+++ b/src/world/Actor/Player.h
@@ -360,7 +360,7 @@ namespace Sapphire::Entity
     uint32_t getModelForSlot( Common::GearModelSlot slot );
 
     /*! add amount to the currency of type */
-    void addCurrency( Common::CurrencyType type, uint32_t amount );
+    void addCurrency( Common::CurrencyType type, uint32_t amount, bool sendLootMessage = false );
 
     /*! remove amount from the currency of type */
     void removeCurrency( Common::CurrencyType type, uint32_t amount );
@@ -928,8 +928,8 @@ namespace Sapphire::Entity
 
     InvSlotPair getFreeBagSlot();
 
-    ItemPtr addItem( uint32_t catalogId, uint32_t quantity = 1, bool isHq = false, bool slient = false, bool canMerge = true );
-    ItemPtr addItem( ItemPtr itemToAdd, bool slient = false, bool canMerge = true );
+    ItemPtr addItem( uint32_t catalogId, uint32_t quantity = 1, bool isHq = false, bool silent = false, bool canMerge = true, bool sendLootMessage = false );
+    ItemPtr addItem( ItemPtr itemToAdd, bool silent = false, bool canMerge = true, bool sendLootMessage = false );
 
     void moveItem( uint16_t fromInventoryId, uint8_t fromSlotId, uint16_t toInventoryId, uint8_t toSlot );
 
@@ -964,7 +964,7 @@ namespace Sapphire::Entity
     uint32_t getCrystal( Common::CrystalType type );
 
     /*! add amount to the crystal of type */
-    void addCrystal( Common::CrystalType type, uint32_t amount );
+    void addCrystal( Common::CrystalType type, uint32_t amount, bool sendLootMessage = false );
 
     /*! remove amount from the crystals of type */
     void removeCrystal( Common::CrystalType type, uint32_t amount );
@@ -980,7 +980,7 @@ namespace Sapphire::Entity
     void setActiveLand( uint8_t land, uint8_t ward );
     Common::ActiveLand getActiveLand() const;
 
-    Sapphire::ItemPtr dropInventoryItem( Common::InventoryType type, uint16_t slotId, bool slient = false );
+    Sapphire::ItemPtr dropInventoryItem( Common::InventoryType type, uint16_t slotId, bool silent = false );
 
     // Job UI
     //////////////////////////////////////////////////////////////////////////////////////////////////////
diff --git a/src/world/Actor/PlayerInventory.cpp b/src/world/Actor/PlayerInventory.cpp
index 06ea2cfb..ff316229 100644
--- a/src/world/Actor/PlayerInventory.cpp
+++ b/src/world/Actor/PlayerInventory.cpp
@@ -298,7 +298,7 @@ void Sapphire::Entity::Player::unequipSoulCrystal( ItemPtr pItem )
 }
 
 // TODO: these next functions are so similar that they could likely be simplified
-void Sapphire::Entity::Player::addCurrency( CurrencyType type, uint32_t amount )
+void Sapphire::Entity::Player::addCurrency( CurrencyType type, uint32_t amount, bool sendLootMessage )
 {
   auto slot = static_cast< uint8_t >( static_cast< uint8_t >( type ) - 1 );
   auto currItem = m_storageMap[ Currency ]->getItem( slot );
@@ -321,6 +321,22 @@ void Sapphire::Entity::Player::addCurrency( CurrencyType type, uint32_t amount )
                                                                     Common::InventoryType::Currency,
                                                                     *currItem );
   queuePacket( invUpdate );
+
+
+  if( sendLootMessage )
+  {
+    switch( type )
+    {
+      case CurrencyType::Gil:
+      {
+        auto lootMsg = makeZonePacket< FFXIVIpcLootMessage >( getId() );
+        lootMsg->data().msgType = Common::LootMessageType::GetGil;
+        lootMsg->data().param1 = amount;
+        queuePacket( lootMsg );
+        break;
+      }
+    }
+  }
 }
 
 void Sapphire::Entity::Player::removeCurrency( Common::CurrencyType type, uint32_t amount )
@@ -346,7 +362,7 @@ void Sapphire::Entity::Player::removeCurrency( Common::CurrencyType type, uint32
 }
 
 
-void Sapphire::Entity::Player::addCrystal( Common::CrystalType type, uint32_t amount )
+void Sapphire::Entity::Player::addCrystal( Common::CrystalType type, uint32_t amount, bool sendLootMessage )
 {
   auto currItem = m_storageMap[ Crystal ]->getItem( static_cast< uint8_t >( type ) - 1 );
 
@@ -371,7 +387,21 @@ void Sapphire::Entity::Player::addCrystal( Common::CrystalType type, uint32_t am
                                                                     Common::InventoryType::Crystal,
                                                                     *currItem );
   queuePacket( invUpdate );
-  queuePacket( makeActorControlSelf( getId(), ItemObtainIcon, static_cast< uint8_t >( type ) + 1, amount ) );
+
+  if( sendLootMessage )
+  {
+    auto lootMsg = makeZonePacket< FFXIVIpcLootMessage >( getId() );
+    lootMsg->data().msgType = Common::LootMessageType::GetItem2;
+    lootMsg->data().param1 = getId();
+    lootMsg->data().param2 = currItem->getId();
+    lootMsg->data().param3 = amount;
+    queuePacket( lootMsg );
+  }
+
+  auto soundEffectPacket = makeZonePacket< FFXIVIpcInventoryActionAck >( getId() );
+  soundEffectPacket->data().sequence = 0xFFFFFFFF;
+  soundEffectPacket->data().type = 6;
+  queuePacket( soundEffectPacket );
 }
 
 void Sapphire::Entity::Player::removeCrystal( Common::CrystalType type, uint32_t amount )
@@ -524,7 +554,7 @@ bool Sapphire::Entity::Player::isObtainable( uint32_t catalogId, uint8_t quantit
   return true;
 }
 
-Sapphire::ItemPtr Sapphire::Entity::Player::addItem( ItemPtr itemToAdd, bool silent, bool canMerge )
+Sapphire::ItemPtr Sapphire::Entity::Player::addItem( ItemPtr itemToAdd, bool silent, bool canMerge, bool sendLootMessage )
 {
   auto& exdData = Common::Service< Data::ExdDataGenerated >::ref();
   auto itemInfo = exdData.get< Sapphire::Data::Item >( itemToAdd->getId() );
@@ -591,13 +621,24 @@ Sapphire::ItemPtr Sapphire::Entity::Player::addItem( ItemPtr itemToAdd, bool sil
         item->setStackSize( newStackSize );
         writeItem( item );
 
-        auto slotUpdate = std::make_shared< UpdateInventorySlotPacket >( getId(), slot, bag, *item );
-        queuePacket( slotUpdate );
+        if( !silent )
+        {
+          auto slotUpdate = std::make_shared< UpdateInventorySlotPacket >( getId(), slot, bag, *item );
+          queuePacket( slotUpdate );
+        }
 
         // return existing stack if we have no overflow - items fit into a preexisting stack
         if( itemToAdd->getStackSize() == 0 )
         {
-          queuePacket( makeActorControlSelf( getId(), ItemObtainIcon, itemToAdd->getId(), originalQuantity ) );
+          if( sendLootMessage )
+          {
+            auto lootMsg = makeZonePacket< FFXIVIpcLootMessage >( getId() );
+            lootMsg->data().msgType = Common::LootMessageType::GetItem2;
+            lootMsg->data().param1 = getId();
+            lootMsg->data().param2 = itemToAdd->isHq() ? itemToAdd->getId() + 1000000 : itemToAdd->getId();
+            lootMsg->data().param3 = originalQuantity;
+            queuePacket( lootMsg );
+          }
 
           auto soundEffectPacket = makeZonePacket< FFXIVIpcInventoryActionAck >( getId() );
           soundEffectPacket->data().sequence = 0xFFFFFFFF;
@@ -629,24 +670,32 @@ Sapphire::ItemPtr Sapphire::Entity::Player::addItem( ItemPtr itemToAdd, bool sil
   {
     auto invUpdate = std::make_shared< UpdateInventorySlotPacket >( getId(), freeBagSlot.second, freeBagSlot.first, *itemToAdd );
     queuePacket( invUpdate );
-
-    queuePacket( makeActorControlSelf( getId(), ItemObtainIcon, itemToAdd->getId(), originalQuantity ) );
-
-    auto soundEffectPacket = makeZonePacket< FFXIVIpcInventoryActionAck >( getId() );
-    soundEffectPacket->data().sequence = 0xFFFFFFFF;
-    soundEffectPacket->data().type = 6;
-    queuePacket( soundEffectPacket );
   }
 
+  if( sendLootMessage )
+  {
+    auto lootMsg = makeZonePacket< FFXIVIpcLootMessage >( getId() );
+    lootMsg->data().msgType = Common::LootMessageType::GetItem2;
+    lootMsg->data().param1 = getId();
+    lootMsg->data().param2 = itemToAdd->isHq() ? itemToAdd->getId() + 1000000 : itemToAdd->getId();
+    lootMsg->data().param3 = originalQuantity;
+    queuePacket( lootMsg );
+  }
+
+  auto soundEffectPacket = makeZonePacket< FFXIVIpcInventoryActionAck >( getId() );
+  soundEffectPacket->data().sequence = 0xFFFFFFFF;
+  soundEffectPacket->data().type = 6;
+  queuePacket( soundEffectPacket );
+
   return itemToAdd;
 }
 
 
-Sapphire::ItemPtr Sapphire::Entity::Player::addItem( uint32_t catalogId, uint32_t quantity, bool isHq, bool silent, bool canMerge )
+Sapphire::ItemPtr Sapphire::Entity::Player::addItem( uint32_t catalogId, uint32_t quantity, bool isHq, bool silent, bool canMerge, bool sendLootMessage )
 {
   auto item = createItem( catalogId, quantity );
   item->setHq( isHq );
-  return addItem( item, silent, canMerge );
+  return addItem( item, silent, canMerge, sendLootMessage );
 }
 
 void
@@ -929,7 +978,7 @@ uint32_t Sapphire::Entity::Player::getNextInventorySequence()
   return m_inventorySequence++;
 }
 
-Sapphire::ItemPtr Sapphire::Entity::Player::dropInventoryItem( Sapphire::Common::InventoryType type, uint16_t slotId, bool slient )
+Sapphire::ItemPtr Sapphire::Entity::Player::dropInventoryItem( Sapphire::Common::InventoryType type, uint16_t slotId, bool silent )
 {
   auto& container = m_storageMap[ type ];
 
@@ -941,7 +990,7 @@ Sapphire::ItemPtr Sapphire::Entity::Player::dropInventoryItem( Sapphire::Common:
   container->removeItem( slotId, false );
   updateContainer( type, slotId, nullptr );
 
-  if( !slient )
+  if( !silent )
   {
     auto invUpdate = std::make_shared< UpdateInventorySlotPacket >( getId(), slotId, static_cast< uint16_t >( type ) );
     queuePacket( invUpdate );
diff --git a/src/world/Actor/PlayerQuest.cpp b/src/world/Actor/PlayerQuest.cpp
index 854cdc13..f3b29c16 100644
--- a/src/world/Actor/PlayerQuest.cpp
+++ b/src/world/Actor/PlayerQuest.cpp
@@ -1065,7 +1065,7 @@ bool Sapphire::Entity::Player::giveQuestRewards( uint32_t questId, uint32_t opti
   {
     for( uint32_t i = 0; i < rewardItemCount; i++ )
     {
-      addItem( questInfo->itemReward0.at( i ), questInfo->itemCountReward0.at( i ) );
+      addItem( questInfo->itemReward0.at( i ), questInfo->itemCountReward0.at( i ), false, false, true, true );
     }
   }
 
@@ -1076,14 +1076,14 @@ bool Sapphire::Entity::Player::giveQuestRewards( uint32_t questId, uint32_t opti
       auto itemId = questInfo->itemReward1.at( i );
       if( itemId == optionalChoice )
       {
-        addItem( itemId, questInfo->itemCountReward1.at( i ) );
+        addItem( itemId, questInfo->itemCountReward1.at( i ), false, false, true, true );
         break;
       }
     }
   }
 
   if( gilReward > 0 )
-    addCurrency( CurrencyType::Gil, gilReward );
+    addCurrency( CurrencyType::Gil, gilReward, true );
 
   return true;
 }
diff --git a/src/world/Network/Handlers/GMCommandHandlers.cpp b/src/world/Network/Handlers/GMCommandHandlers.cpp
index 175c2ab9..2b5e5965 100644
--- a/src/world/Network/Handlers/GMCommandHandlers.cpp
+++ b/src/world/Network/Handlers/GMCommandHandlers.cpp
@@ -345,14 +345,23 @@ void Sapphire::Network::GameConnection::gm1Handler( const Packets::FFXIVARR_PACK
         player.sendUrgent( "Syntaxerror." );
         return;
       }
+      if( param1 <= 0x12 ) // crystal
+      {
+        targetPlayer->addCrystal( static_cast< Common::CrystalType >( param1 ), quantity, true );
+      }
+      else // item
+      {
+        // decode using the epic SE style HQ item id
+        bool isHq = param1 > 1000000;
 
-      if( !targetPlayer->addItem( param1, quantity ) )
-        player.sendUrgent( "Item #{0} could not be added to inventory.", param1 );
-      break;
+        if( !targetPlayer->addItem( isHq ? param1 - 1000000 : param1, quantity, isHq, false, true, true ) )
+          player.sendUrgent( "Item #{0} could not be added to inventory.", isHq ? param1 - 1000000 : param1 );
+        break;
+      }
     }
     case GmCommand::Gil:
     {
-      targetPlayer->addCurrency( CurrencyType::Gil, param1 );
+      targetPlayer->addCurrency( CurrencyType::Gil, param1, true );
       player.sendNotice( "Added {0} Gil for {1}", param1, targetPlayer->getName() );
       break;
     }

From 0273931e4ca5e0009c688199deadaa13de0a51d1 Mon Sep 17 00:00:00 2001
From: collett <collett0301@gmail.com>
Date: Tue, 12 May 2020 02:57:13 +0900
Subject: [PATCH 309/351] delete sold item from db

---
 src/world/Actor/Player.cpp | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/src/world/Actor/Player.cpp b/src/world/Actor/Player.cpp
index 15c30e93..2027633c 100644
--- a/src/world/Actor/Player.cpp
+++ b/src/world/Actor/Player.cpp
@@ -2259,6 +2259,13 @@ void Sapphire::Entity::Player::addBuyBackItemForShop( uint32_t shopId, const Sap
 
 void Sapphire::Entity::Player::clearBuyBackMap()
 {
+  for( auto& list : m_shopBuyBackMap )
+  {
+    for( auto& entry : list.second )
+    {
+      deleteItemDb( entry.item );
+    }
+  }
   m_shopBuyBackMap.clear();
 }
 

From 302d06c038692fd2690b55345fadcddb40478057 Mon Sep 17 00:00:00 2001
From: collett <collett0301@gmail.com>
Date: Tue, 12 May 2020 03:06:04 +0900
Subject: [PATCH 310/351] also when logout

---
 src/world/Session.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/world/Session.cpp b/src/world/Session.cpp
index 56bcc888..b446f293 100644
--- a/src/world/Session.cpp
+++ b/src/world/Session.cpp
@@ -72,6 +72,7 @@ void Sapphire::World::Session::close()
   // remove the session from the player
   if( m_pPlayer )
   {
+    m_pPlayer->clearBuyBackMap();
     // do one last update to db
     m_pPlayer->updateSql();
     // reset the zone, so the zone handler knows to remove the actor

From 5f4d87cd7bb9708f9f20d3848cd9de3736c02abf Mon Sep 17 00:00:00 2001
From: Flawed <33593723+ff14wed@users.noreply.github.com>
Date: Mon, 11 May 2020 12:12:12 -0700
Subject: [PATCH 311/351] Fill in other known EventHandlerTypes

---
 src/world/Event/EventHandler.h | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/world/Event/EventHandler.h b/src/world/Event/EventHandler.h
index 8b6016c6..9bec90a4 100644
--- a/src/world/Event/EventHandler.h
+++ b/src/world/Event/EventHandler.h
@@ -57,6 +57,7 @@ namespace Sapphire::Event
       Craft = 0x000A,
       CustomTalk = 0x000B,
       CompanyLeveOfficer = 0x000C,
+      Array = 0x000D,
       CraftLeve = 0x000E,
       GimmickAccessor = 0x000F,
       GimmickBill = 0x0010,
@@ -72,8 +73,11 @@ namespace Sapphire::Event
       Story = 0x001A,
       SpecialShop = 0x001B,
       BahamutGuide = 0x001C,
+      InstanceContentGuide = 0x001D,
       HousingAethernet = 0x001E,
       FcTalk = 0x001F,
+      Adventure = 0x0021,
+      DailyQuestSupply = 0x0022,
       ICDirector = 0x8003,
       QuestBattleDirector = 0x8006,
     };

From 228f9b0ef48083a6cbf790cb418b3257c65b1df8 Mon Sep 17 00:00:00 2001
From: collett <collett0301@gmail.com>
Date: Tue, 12 May 2020 04:15:52 +0900
Subject: [PATCH 312/351] should silent the sound effect as well

---
 src/world/Actor/PlayerInventory.cpp | 23 ++++++++++++-----------
 1 file changed, 12 insertions(+), 11 deletions(-)

diff --git a/src/world/Actor/PlayerInventory.cpp b/src/world/Actor/PlayerInventory.cpp
index ff316229..fbff6d66 100644
--- a/src/world/Actor/PlayerInventory.cpp
+++ b/src/world/Actor/PlayerInventory.cpp
@@ -639,12 +639,13 @@ Sapphire::ItemPtr Sapphire::Entity::Player::addItem( ItemPtr itemToAdd, bool sil
             lootMsg->data().param3 = originalQuantity;
             queuePacket( lootMsg );
           }
-
-          auto soundEffectPacket = makeZonePacket< FFXIVIpcInventoryActionAck >( getId() );
-          soundEffectPacket->data().sequence = 0xFFFFFFFF;
-          soundEffectPacket->data().type = 6;
-          queuePacket( soundEffectPacket );
-
+          if( !silent )
+          {
+            auto soundEffectPacket = makeZonePacket< FFXIVIpcInventoryActionAck >( getId() );
+            soundEffectPacket->data().sequence = 0xFFFFFFFF;
+            soundEffectPacket->data().type = 6;
+            queuePacket( soundEffectPacket );
+          }
           return item;
         }
 
@@ -670,6 +671,11 @@ Sapphire::ItemPtr Sapphire::Entity::Player::addItem( ItemPtr itemToAdd, bool sil
   {
     auto invUpdate = std::make_shared< UpdateInventorySlotPacket >( getId(), freeBagSlot.second, freeBagSlot.first, *itemToAdd );
     queuePacket( invUpdate );
+
+    auto soundEffectPacket = makeZonePacket< FFXIVIpcInventoryActionAck >( getId() );
+    soundEffectPacket->data().sequence = 0xFFFFFFFF;
+    soundEffectPacket->data().type = 6;
+    queuePacket( soundEffectPacket );
   }
 
   if( sendLootMessage )
@@ -682,11 +688,6 @@ Sapphire::ItemPtr Sapphire::Entity::Player::addItem( ItemPtr itemToAdd, bool sil
     queuePacket( lootMsg );
   }
 
-  auto soundEffectPacket = makeZonePacket< FFXIVIpcInventoryActionAck >( getId() );
-  soundEffectPacket->data().sequence = 0xFFFFFFFF;
-  soundEffectPacket->data().type = 6;
-  queuePacket( soundEffectPacket );
-
   return itemToAdd;
 }
 

From d5677b2a5ad669961404ae75801ad23202deeb2c Mon Sep 17 00:00:00 2001
From: collett <collett0301@gmail.com>
Date: Sat, 16 May 2020 02:46:51 +0900
Subject: [PATCH 313/351] greater than 65535 effect entry value.

---
 src/common/Common.h               |  3 ++-
 src/world/Action/EffectResult.cpp | 17 ++++++++++++-----
 2 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/src/common/Common.h b/src/common/Common.h
index efb6335b..854f9d6f 100644
--- a/src/common/Common.h
+++ b/src/common/Common.h
@@ -662,6 +662,7 @@ namespace Sapphire::Common
   {
     None = 0,
     Absorbed = 0x04,
+    ExtendedValue = 0x40,
     EffectOnSource = 0x80,
     Reflected = 0xA0,
   };
@@ -690,7 +691,7 @@ namespace Sapphire::Common
      * Has no effect on what is shown and stored in value
      */
     uint8_t param2;
-    uint8_t valueMultiplier;      // This multiplies whatever value is in the 'value' param by 10. Possibly a workaround for big numbers
+    uint8_t extendedValueHighestByte;
     uint8_t flags;
     int16_t value;
   };
diff --git a/src/world/Action/EffectResult.cpp b/src/world/Action/EffectResult.cpp
index 2860210f..55c76f55 100644
--- a/src/world/Action/EffectResult.cpp
+++ b/src/world/Action/EffectResult.cpp
@@ -96,14 +96,21 @@ void EffectResult::mount( uint16_t mountId )
 Common::EffectEntry EffectResult::buildEffectEntry() const
 {
   Common::EffectEntry entry{};
-
-  // todo: that retarded shit so > u16 max numbers work
-  entry.value = getValue();
+  entry.effectType = m_type;
+  if( m_value > 0x0000FFFF )
+  {
+    entry.value = static_cast< uint16_t >( m_value & 0x0000FFFF );
+    entry.extendedValueHighestByte = static_cast< uint8_t >( m_value >> 16 );
+    entry.flags = static_cast< uint8_t >( m_flag ) + static_cast< uint8_t >( Common::ActionEffectResultFlag::ExtendedValue );
+  }
+  else
+  {
+    entry.value = static_cast< uint16_t >( m_value );
+    entry.flags = static_cast< uint8_t >( m_flag );
+  }
   entry.param0 = m_param0;
   entry.param1 = m_param1;
-  entry.effectType = m_type;
   entry.param2 = m_param2;
-  entry.flags = static_cast< uint8_t >( m_flag );
 
   return entry;
 }

From 3ae54d3db0749364d56036841a184921d6330f5c Mon Sep 17 00:00:00 2001
From: collett <collett0301@gmail.com>
Date: Sat, 16 May 2020 06:13:07 +0900
Subject: [PATCH 314/351] fix build

---
 src/world/Manager/EventMgr.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/world/Manager/EventMgr.cpp b/src/world/Manager/EventMgr.cpp
index 007a2003..00505a41 100644
--- a/src/world/Manager/EventMgr.cpp
+++ b/src/world/Manager/EventMgr.cpp
@@ -11,7 +11,7 @@ using namespace Sapphire::Common;
 std::string Sapphire::World::Manager::EventMgr::getEventName( uint32_t eventId )
 {
   auto& exdData = Common::Service< Data::ExdDataGenerated >::ref();
-  uint16_t eventType = eventId >> 16;
+  auto eventType = static_cast< Event::EventHandler::EventHandlerType >( eventId >> 16 );
 
   auto unknown = std::string{ "unknown" };
 

From bb00bd9dcaf672121f9b66fce63f9a79f55536a1 Mon Sep 17 00:00:00 2001
From: collett <collett0301@gmail.com>
Date: Fri, 22 May 2020 14:07:05 +0900
Subject: [PATCH 315/351] Add WorldInteractionHandler.

---
 src/common/Network/PacketDef/Ipcs.h               |  1 +
 src/common/Network/PacketDef/Zone/ClientZoneDef.h | 10 ++++++++++
 2 files changed, 11 insertions(+)

diff --git a/src/common/Network/PacketDef/Ipcs.h b/src/common/Network/PacketDef/Ipcs.h
index 8e1a83ff..ca042e79 100644
--- a/src/common/Network/PacketDef/Ipcs.h
+++ b/src/common/Network/PacketDef/Ipcs.h
@@ -376,6 +376,7 @@ namespace Sapphire::Network::Packets
 
     PerformNoteHandler = 0x029B, // updated 4.3
 
+    WorldInteractionHandler = 0x0285, // updated 5.25
     ShopMessage = 0x00C1, // updated 5.25
     LootMessage = 0x00B1, // updated 5.25
   };
diff --git a/src/common/Network/PacketDef/Zone/ClientZoneDef.h b/src/common/Network/PacketDef/Zone/ClientZoneDef.h
index bf698237..42d48775 100644
--- a/src/common/Network/PacketDef/Zone/ClientZoneDef.h
+++ b/src/common/Network/PacketDef/Zone/ClientZoneDef.h
@@ -344,6 +344,16 @@ struct FFXIVIpcFreeCompanyUpdateShortMessageHandler :
   uint16_t unknown2;
 };
 
+struct FFXIVIpcWorldInteractionHandler :
+  FFXIVIpcBasePacket< WorldInteractionHandler >
+{
+  uint32_t action;
+  uint32_t unknown2;
+  uint64_t unknown3;
+  uint32_t unknown4;
+  Common::FFXIVARR_POSITION3 position;
+};
+
 }
 
 #endif //_CORE_NETWORK_PACKETS_ZONE_CLIENT_IPC_H

From 0902d31980ff70087138e25fad57e2fa7038f488 Mon Sep 17 00:00:00 2001
From: Sophie Hamilton <git-commits@theblob.org>
Date: Thu, 28 May 2020 05:22:49 +0100
Subject: [PATCH 316/351] Fix quest completion for questId > 2047 (67583)

It's currently impossible to permanently store quest completion flags
for quests beyond questId 2047 (67583) due to the code using a type
that's too small. This manifests in the correct quest completion packet
being sent, but as soon as you move to another zone the quest disappears
from the journal (and is probably replaced by another quest you didn't
ask for).

This fixes the issue by using an appropriately-sized index variable, and
also increases the flag storage so that all currently-available quests
can be stored.
---
 src/world/Actor/Player.h        | 2 +-
 src/world/Actor/PlayerQuest.cpp | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/world/Actor/Player.h b/src/world/Actor/Player.h
index 926c995c..32660358 100644
--- a/src/world/Actor/Player.h
+++ b/src/world/Actor/Player.h
@@ -1070,7 +1070,7 @@ namespace Sapphire::Entity
     uint8_t m_homePoint;
     uint8_t m_startTown;
     uint16_t m_townWarpFstFlags;
-    uint8_t m_questCompleteFlags[476];
+    uint8_t m_questCompleteFlags[487];
     uint8_t m_discovery[445];
     uint32_t m_playTime;
 
diff --git a/src/world/Actor/PlayerQuest.cpp b/src/world/Actor/PlayerQuest.cpp
index f3b29c16..fc1ff9ac 100644
--- a/src/world/Actor/PlayerQuest.cpp
+++ b/src/world/Actor/PlayerQuest.cpp
@@ -1015,7 +1015,7 @@ Sapphire::Entity::Player::sendQuestMessage( uint32_t questId, int8_t msgId, uint
 
 void Sapphire::Entity::Player::updateQuestsCompleted( uint32_t questId )
 {
-  uint8_t index = questId / 8;
+  uint16_t index = questId / 8;
   uint8_t bitIndex = ( questId ) % 8;
 
   uint8_t value = 0x80 >> bitIndex;
@@ -1025,7 +1025,7 @@ void Sapphire::Entity::Player::updateQuestsCompleted( uint32_t questId )
 
 void Sapphire::Entity::Player::removeQuestsCompleted( uint32_t questId )
 {
-  uint8_t index = questId / 8;
+  uint16_t index = questId / 8;
   uint8_t bitIndex = ( questId ) % 8;
 
   uint8_t value = 0x80 >> bitIndex;

From 986a6cebf19a4002164adcd3a448076b24a6935e Mon Sep 17 00:00:00 2001
From: collett <collett0301@gmail.com>
Date: Thu, 28 May 2020 16:58:28 +0900
Subject: [PATCH 317/351] adjust QuestCompleteList

---
 src/common/Network/PacketDef/Zone/ServerZoneDef.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/common/Network/PacketDef/Zone/ServerZoneDef.h b/src/common/Network/PacketDef/Zone/ServerZoneDef.h
index 08d485cc..d3eee984 100644
--- a/src/common/Network/PacketDef/Zone/ServerZoneDef.h
+++ b/src/common/Network/PacketDef/Zone/ServerZoneDef.h
@@ -1500,8 +1500,8 @@ namespace Sapphire::Network::Packets::Server
   */
   struct FFXIVIpcQuestCompleteList : FFXIVIpcBasePacket< QuestCompleteList >
   {
-    uint8_t questCompleteMask[480];
-    uint8_t unknownCompleteMask[80];
+    uint8_t questCompleteMask[487];
+    uint8_t unknownCompleteMask[73];
   };
 
   /**

From 104f554a40c7dcbb00450f4bf1b4e745ecbd95c2 Mon Sep 17 00:00:00 2001
From: collett <collett0301@gmail.com>
Date: Sun, 14 Jun 2020 23:32:56 +0900
Subject: [PATCH 318/351] fix adding crystal also adds gil.

---
 src/world/Network/Handlers/GMCommandHandlers.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/world/Network/Handlers/GMCommandHandlers.cpp b/src/world/Network/Handlers/GMCommandHandlers.cpp
index 2b5e5965..c68fab97 100644
--- a/src/world/Network/Handlers/GMCommandHandlers.cpp
+++ b/src/world/Network/Handlers/GMCommandHandlers.cpp
@@ -356,8 +356,8 @@ void Sapphire::Network::GameConnection::gm1Handler( const Packets::FFXIVARR_PACK
 
         if( !targetPlayer->addItem( isHq ? param1 - 1000000 : param1, quantity, isHq, false, true, true ) )
           player.sendUrgent( "Item #{0} could not be added to inventory.", isHq ? param1 - 1000000 : param1 );
-        break;
       }
+      break;
     }
     case GmCommand::Gil:
     {

From ecd8adf21b5b2e074e80851d546b879720068cbb Mon Sep 17 00:00:00 2001
From: collett <collett0301@gmail.com>
Date: Mon, 15 Jun 2020 08:34:10 +0900
Subject: [PATCH 319/351] implement "/sit" on world obj

---
 .../Network/PacketDef/Zone/ClientZoneDef.h    |  7 +-
 src/world/Network/GameConnection.cpp          |  2 +
 src/world/Network/GameConnection.h            |  2 +
 src/world/Network/Handlers/PacketHandlers.cpp | 69 +++++++++++++++++++
 4 files changed, 77 insertions(+), 3 deletions(-)

diff --git a/src/common/Network/PacketDef/Zone/ClientZoneDef.h b/src/common/Network/PacketDef/Zone/ClientZoneDef.h
index 42d48775..7df75c0e 100644
--- a/src/common/Network/PacketDef/Zone/ClientZoneDef.h
+++ b/src/common/Network/PacketDef/Zone/ClientZoneDef.h
@@ -348,9 +348,10 @@ struct FFXIVIpcWorldInteractionHandler :
   FFXIVIpcBasePacket< WorldInteractionHandler >
 {
   uint32_t action;
-  uint32_t unknown2;
-  uint64_t unknown3;
-  uint32_t unknown4;
+  uint32_t param1;
+  uint32_t param2;
+  uint32_t param3;
+  uint32_t param4;
   Common::FFXIVARR_POSITION3 position;
 };
 
diff --git a/src/world/Network/GameConnection.cpp b/src/world/Network/GameConnection.cpp
index 7fda9109..0ea137f6 100644
--- a/src/world/Network/GameConnection.cpp
+++ b/src/world/Network/GameConnection.cpp
@@ -130,6 +130,8 @@ Sapphire::Network::GameConnection::GameConnection( Sapphire::Network::HivePtr pH
   setZoneHandler( ClientZoneIpcType::MarketBoardRequestItemListings, "MarketBoardRequestItemListings",
                   &GameConnection::marketBoardRequestItemListings );
 
+  setZoneHandler( ClientZoneIpcType::WorldInteractionHandler, "WorldInteractionHandler", &GameConnection::worldInteractionhandler );
+
   setChatHandler( ClientChatIpcType::TellReq, "TellReq", &GameConnection::tellHandler );
 
 }
diff --git a/src/world/Network/GameConnection.h b/src/world/Network/GameConnection.h
index 94fa4f02..8f343dbc 100644
--- a/src/world/Network/GameConnection.h
+++ b/src/world/Network/GameConnection.h
@@ -187,6 +187,8 @@ namespace Sapphire::Network
 
     DECLARE_HANDLER( marketBoardRequestItemListings );
 
+    DECLARE_HANDLER( worldInteractionhandler );
+
   };
 
 }
diff --git a/src/world/Network/Handlers/PacketHandlers.cpp b/src/world/Network/Handlers/PacketHandlers.cpp
index 53584fd8..f42cb25a 100644
--- a/src/world/Network/Handlers/PacketHandlers.cpp
+++ b/src/world/Network/Handlers/PacketHandlers.cpp
@@ -724,3 +724,72 @@ void Sapphire::Network::GameConnection::marketBoardRequestItemListings( const Pa
 
   marketMgr.requestItemListings( player, packet.data().itemCatalogId );
 }
+
+void Sapphire::Network::GameConnection::worldInteractionhandler( const Packets::FFXIVARR_PACKET_RAW& inPacket,
+  Entity::Player& player )
+{
+  const auto packet = ZoneChannelPacket< Client::FFXIVIpcWorldInteractionHandler >( inPacket );
+  auto action = packet.data().action;
+  player.sendDebug( "WorldInteraction {}", action );
+  if( action == 0x1F5 )
+  {
+    auto emote = packet.data().param1;
+    if( emote == 0x32 || emote == 0x33 ) // "/sit"
+    {
+      auto param4 = packet.data().param4;
+      auto& exdData = Common::Service< Data::ExdDataGenerated >::ref();
+      auto emoteData = exdData.get< Data::Emote >( emote );
+
+      if( !emoteData )
+        return;
+
+      player.setPos( packet.data().position );
+      if( emote == 0x32 && player.hasInRangeActor() )
+      {
+        auto setpos = makeZonePacket< FFXIVIpcActorSetPos >( player.getId() );
+        setpos->data().r16 = param4;
+        setpos->data().waitForLoad = 18;
+        setpos->data().unknown1 = emote == 0x32 ? 1 : 2;
+        setpos->data().x = packet.data().position.x;
+        setpos->data().y = packet.data().position.y;
+        setpos->data().z = packet.data().position.z;
+        player.sendToInRangeSet( setpos, false );
+      }
+      player.sendToInRangeSet( makeActorControlTarget( player.getId(), ActorControl::ActorControlType::Emote, emote, 0, 0, param4, 0xE0000000 ), true );
+
+      if( emote == 0x32 && emoteData->emoteMode != 0 )
+      {
+        player.setStance( Common::Stance::Passive );
+        player.setAutoattack( false );
+        player.setPersistentEmote( emoteData->emoteMode );
+        player.setStatus( Common::ActorStatus::EmoteMode );
+      }
+    }
+  }
+  else if( action == 0x1F8 )
+  {
+    if( player.getPersistentEmote() > 0 )
+    {
+      auto param2 = packet.data().param2;
+
+      player.setPos( packet.data().position );
+      if( player.hasInRangeActor() )
+      {
+        auto setpos = makeZonePacket< FFXIVIpcActorSetPos >( player.getId() );
+        setpos->data().r16 = param2;
+        setpos->data().waitForLoad = 18;
+        setpos->data().unknown1 = 2;
+        setpos->data().x = packet.data().position.x;
+        setpos->data().y = packet.data().position.y;
+        setpos->data().z = packet.data().position.z;
+        player.sendToInRangeSet( setpos, false );
+      }
+
+      player.setPersistentEmote( 0 );
+      player.emoteInterrupt();
+      player.setStatus( Common::ActorStatus::Idle );
+      auto pSetStatusPacket = makeActorControl( player.getId(), SetStatus, static_cast< uint8_t >( Common::ActorStatus::Idle ) );
+      player.sendToInRangeSet( pSetStatusPacket );
+    }
+  }
+}
\ No newline at end of file

From e97165eaac8fe346f0dd4275ac7780188bb8d8ee Mon Sep 17 00:00:00 2001
From: collett <collett0301@gmail.com>
Date: Mon, 15 Jun 2020 08:40:55 +0900
Subject: [PATCH 320/351] clean up

---
 src/world/Network/Handlers/PacketHandlers.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/world/Network/Handlers/PacketHandlers.cpp b/src/world/Network/Handlers/PacketHandlers.cpp
index f42cb25a..ed917a69 100644
--- a/src/world/Network/Handlers/PacketHandlers.cpp
+++ b/src/world/Network/Handlers/PacketHandlers.cpp
@@ -749,7 +749,7 @@ void Sapphire::Network::GameConnection::worldInteractionhandler( const Packets::
         auto setpos = makeZonePacket< FFXIVIpcActorSetPos >( player.getId() );
         setpos->data().r16 = param4;
         setpos->data().waitForLoad = 18;
-        setpos->data().unknown1 = emote == 0x32 ? 1 : 2;
+        setpos->data().unknown1 = 1;
         setpos->data().x = packet.data().position.x;
         setpos->data().y = packet.data().position.y;
         setpos->data().z = packet.data().position.z;

From b43893d560d3a07e8ff85eaff740dfd6690d1761 Mon Sep 17 00:00:00 2001
From: collett <collett0301@gmail.com>
Date: Wed, 17 Jun 2020 02:19:34 +0900
Subject: [PATCH 321/351] prevent empty quest reward slot (id == 0) being added
 as items

---
 src/world/Actor/PlayerQuest.cpp | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/world/Actor/PlayerQuest.cpp b/src/world/Actor/PlayerQuest.cpp
index fc1ff9ac..6eaafc91 100644
--- a/src/world/Actor/PlayerQuest.cpp
+++ b/src/world/Actor/PlayerQuest.cpp
@@ -1065,7 +1065,11 @@ bool Sapphire::Entity::Player::giveQuestRewards( uint32_t questId, uint32_t opti
   {
     for( uint32_t i = 0; i < rewardItemCount; i++ )
     {
-      addItem( questInfo->itemReward0.at( i ), questInfo->itemCountReward0.at( i ), false, false, true, true );
+      auto itemId = questInfo->itemReward0.at( i );
+      if( itemId > 0 )
+      {
+        addItem( itemId, questInfo->itemCountReward0.at( i ), false, false, true, true );
+      }
     }
   }
 
@@ -1074,7 +1078,7 @@ bool Sapphire::Entity::Player::giveQuestRewards( uint32_t questId, uint32_t opti
     for( uint32_t i = 0; i < optionalItemCount; i++ )
     {
       auto itemId = questInfo->itemReward1.at( i );
-      if( itemId == optionalChoice )
+      if( itemId > 0 && itemId == optionalChoice )
       {
         addItem( itemId, questInfo->itemCountReward1.at( i ), false, false, true, true );
         break;

From 031d354bbd492d2ec646bb0cf54b4f66e1a1093c Mon Sep 17 00:00:00 2001
From: collett <collett0301@gmail.com>
Date: Wed, 17 Jun 2020 02:28:39 +0900
Subject: [PATCH 322/351] add id check in addItem as well

---
 src/world/Actor/PlayerInventory.cpp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/world/Actor/PlayerInventory.cpp b/src/world/Actor/PlayerInventory.cpp
index fbff6d66..ccb4847b 100644
--- a/src/world/Actor/PlayerInventory.cpp
+++ b/src/world/Actor/PlayerInventory.cpp
@@ -694,6 +694,8 @@ Sapphire::ItemPtr Sapphire::Entity::Player::addItem( ItemPtr itemToAdd, bool sil
 
 Sapphire::ItemPtr Sapphire::Entity::Player::addItem( uint32_t catalogId, uint32_t quantity, bool isHq, bool silent, bool canMerge, bool sendLootMessage )
 {
+  if( catalogId == 0 )
+    return false;
   auto item = createItem( catalogId, quantity );
   item->setHq( isHq );
   return addItem( item, silent, canMerge, sendLootMessage );

From 00f0adf620a5fa84ee25af0db69dcd8ad5575e24 Mon Sep 17 00:00:00 2001
From: collett <collett0301@gmail.com>
Date: Wed, 17 Jun 2020 02:30:44 +0900
Subject: [PATCH 323/351] typo

---
 src/world/Actor/PlayerInventory.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/world/Actor/PlayerInventory.cpp b/src/world/Actor/PlayerInventory.cpp
index ccb4847b..9d5c3656 100644
--- a/src/world/Actor/PlayerInventory.cpp
+++ b/src/world/Actor/PlayerInventory.cpp
@@ -695,7 +695,7 @@ Sapphire::ItemPtr Sapphire::Entity::Player::addItem( ItemPtr itemToAdd, bool sil
 Sapphire::ItemPtr Sapphire::Entity::Player::addItem( uint32_t catalogId, uint32_t quantity, bool isHq, bool silent, bool canMerge, bool sendLootMessage )
 {
   if( catalogId == 0 )
-    return false;
+    return nullptr;
   auto item = createItem( catalogId, quantity );
   item->setHq( isHq );
   return addItem( item, silent, canMerge, sendLootMessage );

From 928e029480658c0ec83c22c613de61a69f66b1f5 Mon Sep 17 00:00:00 2001
From: DantestyleXD <null-fox@hotmail.it>
Date: Sat, 20 Jun 2020 02:11:20 +0200
Subject: [PATCH 324/351] [ Class Quest ] ClsArc000 fixed

---
 .../quest/classquest/ARC/ClsArc000.cpp        | 190 ++++++++++++++++++
 1 file changed, 190 insertions(+)
 create mode 100644 src/scripts/quest/classquest/ARC/ClsArc000.cpp

diff --git a/src/scripts/quest/classquest/ARC/ClsArc000.cpp b/src/scripts/quest/classquest/ARC/ClsArc000.cpp
new file mode 100644
index 00000000..533b12e3
--- /dev/null
+++ b/src/scripts/quest/classquest/ARC/ClsArc000.cpp
@@ -0,0 +1,190 @@
+#include <Actor/Player.h>
+#include "Manager/EventMgr.h"
+#include <ScriptObject.h>
+#include <Service.h>
+
+using namespace Sapphire;
+
+// Quest Script: ClsArc000_00021
+// Quest Name: Way of the Archer
+// Quest ID: 65557
+// Start NPC: 1000197
+// End NPC: 1000200
+
+class ClsArc000 : public Sapphire::ScriptAPI::EventScript
+{
+   private:
+      // Basic quest information 
+      // Quest vars / flags used
+      // GetQuestUI8AL
+      // GetQuestUI8BH
+      // GetQuestUI8BL
+
+    // Steps in this quest ( 0 is before accepting,
+    // 1 is first, 255 means ready for turning it in
+      enum Sequence : uint8_t
+      {
+         Seq0 = 0,
+         Seq1 = 1,
+         Seq2 = 2,
+         SeqFinish = 255,
+      };
+
+      // Quest rewards 
+      static constexpr auto RewardExpFactor = 100;
+      static constexpr auto RewardItem = 4657;
+      static constexpr auto RewardItemCount = 5;
+
+      // Entities found in the script data of the quest
+      static constexpr auto Actor0 = 1000197;
+      static constexpr auto Actor1 = 1000200;
+      static constexpr auto Enemy0 = 37;
+      static constexpr auto Enemy1 = 49;
+      static constexpr auto Enemy2 = 47;
+      static constexpr auto LocFace0 = 604;
+      static constexpr auto LocFace1 = 605;
+      static constexpr auto LogmessageMonsterNotePageUnlock = 1008;
+      static constexpr auto Seq0Actor0 = 0;
+      static constexpr auto Seq1Actor1 = 1;
+      static constexpr auto Seq3Actor1 = 2;
+      static constexpr auto UnlockImageMonsterNote = 32;
+
+   public:
+      ClsArc000() : Sapphire::ScriptAPI::EventScript( 65557 ){}; 
+      ~ClsArc000(){}; 
+
+  //////////////////////////////////////////////////////////////////////
+  // Event Handlers
+   void onTalk( uint32_t eventId, Entity::Player& player, uint64_t actorId ) override
+   {
+      auto pEventMgr = Common::Service< World::Manager::EventMgr >::ref();
+      auto actor = pEventMgr.mapEventActorToRealActor( static_cast< uint32_t >( actorId ) );
+
+      if( actor == Actor0 )
+         Scene00000( player );
+      if( actor == Actor1 && player.getQuestSeq( getId() ) == Seq1 )
+         Scene00001( player );
+      if( actor == Actor1 && player.getQuestSeq( getId() ) == SeqFinish )
+         Scene00002( player );
+   }
+
+   void onBNpcKill( uint32_t npcId, Entity::Player& player ) override
+   {
+      if( npcId != Enemy0 && npcId != Enemy1 && npcId != Enemy2 )
+         return;
+
+      if ( npcId == Enemy0 )
+      {
+        auto currentKC37 = player.getQuestUI8AL( getId() );
+
+        if ( currentKC37 + 1 >= 3 )
+        {
+          checkQuestCompletion( player, 1 );
+          player.setQuestUI8AL( getId(), currentKC37 + 1 );
+        }
+        else
+        {
+          player.setQuestUI8AL( getId(), currentKC37 + 1 );
+          player.sendQuestMessage( getId(), 1, 2, currentKC37 + 1, 3 );
+        }
+      }
+
+      if ( npcId == Enemy1 )
+      {
+        auto currentKC49 = player.getQuestUI8BH( getId() );
+
+        if ( currentKC49 + 1 >= 3 )
+        {
+          checkQuestCompletion( player, 2 );
+          player.setQuestUI8BH( getId(), currentKC49 + 1 );
+        }
+        else
+        {
+          player.setQuestUI8BH( getId(), currentKC49 + 1 );
+          player.sendQuestMessage( getId(), 2, 2, currentKC49 + 1, 3 );
+        }
+      }
+
+      if ( npcId == Enemy2 )
+      {
+        auto currentKC47 = player.getQuestUI8BL( getId() );
+
+        if ( currentKC47 + 1 >= 3 )
+        {
+          checkQuestCompletion( player, 3 );
+          player.setQuestUI8BL( getId(), currentKC47 + 1 );
+        }
+        else
+        {
+          player.setQuestUI8BL( getId(), currentKC47 + 1 );
+          player.sendQuestMessage( getId(), 3, 2, currentKC47 + 1, 3 );
+        }
+      }
+   }
+
+   private:
+
+   void checkQuestCompletion( Entity::Player& player, uint32_t varIdx )
+   {
+      if( varIdx == 1 )
+         player.sendQuestMessage( getId(), 1, 0, 0, 0 );
+      else if( varIdx == 2 )
+         player.sendQuestMessage( getId(), 2, 0, 0, 0 );
+      else
+         player.sendQuestMessage( getId(), 3, 0, 0, 0 );
+
+      auto questId = getId();
+
+      auto QUEST_ONKILL_37 = player.getQuestUI8AL( questId );
+      auto QUEST_ONKILL_49 = player.getQuestUI8BH( questId );
+      auto QUEST_ONKILL_47 = player.getQuestUI8BL( questId );
+
+      if( QUEST_ONKILL_37 >= 3 && QUEST_ONKILL_49 >= 3 && QUEST_ONKILL_47 >= 3 )
+      {
+         player.updateQuest( questId, SeqFinish );
+      }
+   }
+
+   void Scene00000( Entity::Player& player )
+   {
+      player.playScene( getId(), 0, HIDE_HOTBAR,
+                        [ & ]( Entity::Player& player, const Event::SceneResult& result )
+                        {
+                          if( result.param2 == 1 )
+                          {
+                              player.updateQuest( getId(), Seq1 );
+                          }
+                        } );
+   }
+
+   void Scene00001( Entity::Player& player )
+   {
+      player.playScene( getId(), 1, SET_EOBJ_BASE | HIDE_HOTBAR | INVIS_EOBJ,
+                        [ & ]( Entity::Player& player, const Event::SceneResult& result )
+                        {
+                          if( result.param2 == 1 )
+                          {
+                              player.sendQuestMessage( getId(), 0, 0, 0, 0 );
+                              player.updateQuest( getId(), Seq2 );
+                          }
+                        } );
+   }
+
+   void Scene00002( Entity::Player& player )
+   {
+      player.playScene( getId(), 2, HIDE_HOTBAR,
+                        [ & ]( Entity::Player& player, const Event::SceneResult& result )
+                        {
+                          if( result.param2 == 1 )
+                          {
+                              if( player.giveQuestRewards( getId(), 0 ) )
+                              {
+                                player.learnAction( 21 );
+                                player.finishQuest( getId() );
+                              }
+                          }
+                        } );
+   }
+};
+
+EXPOSE_SCRIPT( ClsArc000 );
\ No newline at end of file

From 92e0935ff29fbb1f52bf3cfffb80878355b6ab24 Mon Sep 17 00:00:00 2001
From: DantestyleXD <null-fox@hotmail.it>
Date: Sat, 20 Jun 2020 02:13:09 +0200
Subject: [PATCH 325/351] [ Class Quest ] ClsArc001 fixed

---
 .../quest/classquest/ARC/ClsArc001.cpp        | 456 ++++++++++++++++++
 1 file changed, 456 insertions(+)
 create mode 100644 src/scripts/quest/classquest/ARC/ClsArc001.cpp

diff --git a/src/scripts/quest/classquest/ARC/ClsArc001.cpp b/src/scripts/quest/classquest/ARC/ClsArc001.cpp
new file mode 100644
index 00000000..8f3b86c5
--- /dev/null
+++ b/src/scripts/quest/classquest/ARC/ClsArc001.cpp
@@ -0,0 +1,456 @@
+#include <Actor/Player.h>
+#include "Manager/EventMgr.h"
+#include <ScriptObject.h>
+#include <Service.h>
+
+using namespace Sapphire;
+
+// Quest Script: ClsArc001_00046
+// Quest Name: A Matter of Perspective
+// Quest ID: 65582
+// Start NPC: 1000200
+// End NPC: 1000200
+
+class ClsArc001 : public Sapphire::ScriptAPI::EventScript
+{
+   private:
+      // Basic quest information 
+      // Quest vars / flags used
+      // GetQuestBitFlag8
+      // GetQuestUI8AL
+      // GetQuestUI8BH
+
+      enum Sequence : uint8_t
+      {
+         Seq0 = 0,
+         Seq1 = 1,
+         Seq2 = 2,
+         Seq3 = 3,
+         SeqFinish = 255,
+      };
+
+      // Quest rewards 
+      static constexpr auto RewardExpFactor = 100;
+      static constexpr auto RewardItem = 1891;
+      static constexpr auto RewardItemCount = 1;
+      uint16_t RewardItemOptional[5] = { 3003, 2653, 3530, 4305, 5823 };
+      uint16_t RewardItemOptionalCount[5] = { 1, 1, 1, 1, 5 };
+
+      // Entities found in the script data of the quest
+      static constexpr auto Action0 = 97;
+      static constexpr auto Actor0 = 1000200;
+      static constexpr auto CutScene01 = 10;
+      static constexpr auto Enemy0 = 5;
+      static constexpr auto Enemy1 = 32;
+      static constexpr auto Eobject0 = 2000925;
+      static constexpr auto Eobject1 = 2000926;
+      static constexpr auto Eobject2 = 2000927;
+      static constexpr auto Eobject3 = 2000928;
+      static constexpr auto Eobject4 = 2000929;
+      static constexpr auto Eobject5 = 2000930;
+      static constexpr auto Eobject6 = 2000931;
+      static constexpr auto Eobject7 = 2000934;
+
+   public:
+      ClsArc001() : Sapphire::ScriptAPI::EventScript( 65582 ){}; 
+      ~ClsArc001(){}; 
+
+  //////////////////////////////////////////////////////////////////////
+  // Event Handlers
+   void onTalk( uint32_t eventId, Entity::Player& player, uint64_t actorId ) override
+   {
+      auto pEventMgr = Common::Service< World::Manager::EventMgr >::ref();
+      auto actor = pEventMgr.mapEventActorToRealActor( static_cast<uint32_t>( actorId ) );
+
+      if( actor == Actor0 && !player.hasQuest( getId() ) )
+         Scene00000( player );
+      if( actor == Actor0 && player.getQuestSeq( getId() ) == Seq2 )
+         Scene00025( player );
+      if( actor == Actor0 && player.getQuestSeq( getId() ) == SeqFinish )
+         Scene00028( player );
+   }
+
+   void onEObjHit( Entity::Player& player, uint64_t actorId, uint32_t actionId )
+   {
+     auto pEventMgr = Common::Service< World::Manager::EventMgr >::ref();
+     auto actor = pEventMgr.mapEventActorToRealActor( static_cast<uint32_t>( actorId ) );
+
+     //Eobjects
+     // eventActionStart let crash world.exe
+     // eventStart is hardcode fix
+      if ( actor == Eobject0 )
+      {
+        player.eventStart( actor, getId(), Event::EventHandler::Nest, 0, 0 );
+        Scene00001( player );
+      }
+      else if (actor == Eobject1)
+      {
+        player.eventStart( actor, getId(), Event::EventHandler::Nest, 0, 0 );
+        Scene00002( player );
+      }
+      else if ( actor == Eobject2 )
+      {
+        player.eventStart( actor, getId(), Event::EventHandler::Nest, 0, 0 );
+        Scene00003( player );
+      }
+      else if ( actor == Eobject3 )
+      {
+        player.eventStart( actor, getId(), Event::EventHandler::Nest, 0, 0 );
+        Scene00004( player );
+      }
+      else if ( actor == Eobject4 )
+      {
+        player.eventStart( actor, getId(), Event::EventHandler::Nest, 0, 0 );
+        Scene00005( player );
+      }
+      else if ( actor == Eobject5 )
+      {
+        player.eventStart( actor, getId(), Event::EventHandler::Nest, 0, 0 );
+        Scene00006( player );
+      }
+      else if ( actor == Eobject6 )
+      {
+        player.eventStart( actor, getId(), Event::EventHandler::Nest, 0, 0 );
+        Scene00007( player );
+      }
+      else if ( actor == Eobject7 )
+      {
+        player.eventStart( actor, getId(), Event::EventHandler::Nest, 0, 0 );
+        Scene00008( player );
+      }
+   }
+
+   void onBNpcKill( uint32_t npcId, Entity::Player& player )
+   {
+      if( npcId != Enemy0 && npcId != Enemy1 )
+         return;
+      // PALESEMENTE SBAGLIATO
+      auto currentKC5 = player.getQuestUI8AL( getId() ) + 1;
+      auto currentKC32 = player.getQuestUI8BH( getId() ) + 1;
+
+      if ( npcId == Enemy0 )
+      {
+        if ( currentKC5 >= 8 )
+        {
+          player.setQuestUI8AL( getId(), currentKC5 );
+          checkQuestCompletion( player, 2 );
+          player.sendQuestMessage( getId(), 2, 2, currentKC5, 8 );
+        }
+        else if ( currentKC5 < 8 )
+        {
+          player.setQuestUI8AL( getId(), currentKC5 );
+          player.sendQuestMessage( getId(), 2, 2, currentKC5, 8 );
+        }
+      }
+      if ( npcId == Enemy1 )
+      {
+        if ( currentKC32 >= 8 )
+        {
+          player.setQuestUI8BH( getId(), currentKC32 );
+          checkQuestCompletion( player, 2 );
+          player.sendQuestMessage( getId(), 3, 2, currentKC32, 8 );
+        }
+        else if ( currentKC32 < 8 )
+        {
+          player.setQuestUI8BH( getId(), currentKC32 );
+          player.sendQuestMessage( getId(), 3, 2, currentKC32, 8 );
+        }
+      }      
+   }
+
+   private:
+
+   void checkQuestCompletion( Entity::Player& player, uint32_t varIdx )
+   {
+      if( varIdx == 1 )
+      {
+         auto currentCC = player.getQuestUI8AL( getId() );
+
+         player.sendQuestMessage( getId(), 0, 2, currentCC + 1, 6 );
+         player.setQuestUI8AL( getId(), currentCC + 1 );
+
+         if( currentCC + 1 >= 6 )
+         {
+            player.updateQuest( getId(), Seq2 );
+            player.setQuestUI8AL( getId(), 0 );
+         }
+         else
+         {
+            player.setQuestUI8AL( getId(), currentCC + 1 );
+         }
+      }
+      else if(varIdx == 2)
+      {
+         auto QUEST_ONKILL_5 = player.getQuestUI8AL( getId() );
+         auto QUEST_ONKILL_32 = player.getQuestUI8BH( getId() );
+
+         if( QUEST_ONKILL_5 == 8 && QUEST_ONKILL_32 == 8 )
+         {
+            player.updateQuest( getId(), SeqFinish );
+         }
+      }
+   }
+
+   void Scene00000( Entity::Player& player )
+   {
+      player.playScene( getId(), 0, HIDE_HOTBAR,
+                        [ & ]( Entity::Player& player, const Event::SceneResult& result )
+                        {
+                          if( result.param2 == 1 )
+                          {
+                              player.updateQuest( getId(), Seq1 );
+                          }
+                        } );
+   }
+
+   void Scene00001( Entity::Player& player )
+   {
+      player.playScene( getId(), 1, HIDE_HOTBAR,
+                        [ & ]( Entity::Player& player, const Event::SceneResult& result )
+                        {
+                          checkQuestCompletion( player, 1 );
+                          player.setQuestBitFlag8( getId(), 1, true );
+                        } );
+   }
+
+   void Scene00002( Entity::Player& player )
+   {
+      player.playScene( getId(), 2, HIDE_HOTBAR,
+                        [ & ]( Entity::Player& player, const Event::SceneResult& result )
+                        {
+                          checkQuestCompletion( player, 1 );
+                          player.setQuestBitFlag8( getId(), 2, true );
+                        } );
+   }
+
+   void Scene00003( Entity::Player& player )
+   {
+      player.playScene( getId(), 3, HIDE_HOTBAR,
+                        [ & ]( Entity::Player& player, const Event::SceneResult& result )
+                        {
+                          checkQuestCompletion( player, 1 );
+                          player.setQuestBitFlag8( getId(), 3, true );
+                        } );
+   }
+
+   void Scene00004( Entity::Player& player )
+   {
+      player.playScene( getId(), 4, HIDE_HOTBAR,
+                        [ & ]( Entity::Player& player, const Event::SceneResult& result )
+                        {
+                          checkQuestCompletion( player, 1 );
+                          player.setQuestBitFlag8( getId(), 4, true );
+                        } );
+   }
+
+   void Scene00005( Entity::Player& player )
+   {
+      player.playScene( getId(), 5, HIDE_HOTBAR,
+                        [ & ]( Entity::Player& player, const Event::SceneResult& result )
+                        {
+                          checkQuestCompletion( player, 1 );
+                          player.setQuestBitFlag8( getId(), 5, true );
+                        } );
+   }
+
+   void Scene00006( Entity::Player& player )
+   {
+      player.playScene( getId(), 6, HIDE_HOTBAR,
+                        [ & ]( Entity::Player& player, const Event::SceneResult& result )
+                        {
+                          checkQuestCompletion( player, 1 );
+                          player.setQuestBitFlag8( getId(), 6, true );
+                        } );
+   }
+
+   void Scene00007( Entity::Player& player )
+   {
+      player.playScene( getId(), 7, HIDE_HOTBAR,
+                        [ & ]( Entity::Player& player, const Event::SceneResult& result )
+                        {
+                          checkQuestCompletion( player, 1 );
+                          player.setQuestBitFlag8( getId(), 7, true );
+                        } );
+   }
+
+   void Scene00008( Entity::Player& player )
+   {
+      player.playScene( getId(), 8, HIDE_HOTBAR,
+                        [ & ]( Entity::Player& player, const Event::SceneResult& result )
+                        {
+                          checkQuestCompletion( player, 1 );
+                          player.setQuestBitFlag8( getId(), 8, true );
+                        } );
+   }
+
+   void Scene00009( Entity::Player& player )
+   {
+      player.playScene( getId(), 9, HIDE_HOTBAR,
+                        [ & ]( Entity::Player& player, const Event::SceneResult& result )
+                        {
+                        } );
+   }
+
+   void Scene00010( Entity::Player& player )
+   {
+      player.playScene( getId(), 10, HIDE_HOTBAR,
+                        [ & ]( Entity::Player& player, const Event::SceneResult& result )
+                        {
+                        } );
+   }
+
+   void Scene00011( Entity::Player& player )
+   {
+      player.playScene( getId(), 11, HIDE_HOTBAR,
+                        [ & ]( Entity::Player& player, const Event::SceneResult& result )
+                        {
+                        } );
+   }
+
+   void Scene00012( Entity::Player& player )
+   {
+      player.playScene( getId(), 12, HIDE_HOTBAR,
+                        [ & ]( Entity::Player& player, const Event::SceneResult& result )
+                        {
+                        } );
+   }
+
+   void Scene00013( Entity::Player& player )
+   {
+      player.playScene( getId(), 13, HIDE_HOTBAR,
+                        [ & ]( Entity::Player& player, const Event::SceneResult& result )
+                        {
+                        } );
+   }
+
+   void Scene00014( Entity::Player& player )
+   {
+      player.playScene( getId(), 14, HIDE_HOTBAR,
+                        [ & ]( Entity::Player& player, const Event::SceneResult& result )
+                        {
+                        } );
+   }
+
+   void Scene00015( Entity::Player& player )
+   {
+      player.playScene( getId(), 15, HIDE_HOTBAR,
+                        [ & ]( Entity::Player& player, const Event::SceneResult& result )
+                        {
+                        } );
+   }
+
+   void Scene00016( Entity::Player& player )
+   {
+      player.playScene( getId(), 16, HIDE_HOTBAR,
+                        [ & ]( Entity::Player& player, const Event::SceneResult& result )
+                        {
+                        } );
+   }
+
+   void Scene00017( Entity::Player& player )
+   {
+      player.playScene( getId(), 17, HIDE_HOTBAR,
+                        [ & ]( Entity::Player& player, const Event::SceneResult& result )
+                        {
+                        } );
+   }
+
+   void Scene00018( Entity::Player& player )
+   {
+      player.playScene( getId(), 18, HIDE_HOTBAR,
+                        [ & ]( Entity::Player& player, const Event::SceneResult& result )
+                        {
+                        } );
+   }
+
+   void Scene00019( Entity::Player& player )
+   {
+      player.playScene( getId(), 19, HIDE_HOTBAR,
+                        [ & ]( Entity::Player& player, const Event::SceneResult& result )
+                        {
+                        } );
+   }
+
+   void Scene00020( Entity::Player& player )
+   {
+      player.playScene( getId(), 20, HIDE_HOTBAR,
+                        [ & ]( Entity::Player& player, const Event::SceneResult& result )
+                        {
+                        } );
+   }
+
+   void Scene00021( Entity::Player& player )
+   {
+      player.playScene( getId(), 21, HIDE_HOTBAR,
+                        [ & ]( Entity::Player& player, const Event::SceneResult& result )
+                        {
+                        } );
+   }
+
+   void Scene00022( Entity::Player& player )
+   {
+      player.playScene( getId(), 22, HIDE_HOTBAR,
+                        [ & ]( Entity::Player& player, const Event::SceneResult& result )
+                        {
+                        } );
+   }
+
+   void Scene00023( Entity::Player& player )
+   {
+      player.playScene( getId(), 23, HIDE_HOTBAR,
+                        [ & ]( Entity::Player& player, const Event::SceneResult& result )
+                        {
+                        } );
+   }
+
+   void Scene00024( Entity::Player& player )
+   {
+      player.playScene( getId(), 24, HIDE_HOTBAR,
+                        [ & ]( Entity::Player& player, const Event::SceneResult& result )
+                        {
+                        } );
+   }
+
+   void Scene00025( Entity::Player& player )
+   {
+      player.playScene( getId(), 25, HIDE_HOTBAR,
+                        [ & ]( Entity::Player& player, const Event::SceneResult& result )
+                        {
+                          player.sendQuestMessage( getId(), 1, 2, 0, 0 );
+                          player.updateQuest( getId(), Seq3 );
+                        } );
+   }
+
+   void Scene00026( Entity::Player& player )
+   {
+      player.playScene( getId(), 26, HIDE_HOTBAR,
+                        [ & ]( Entity::Player& player, const Event::SceneResult& result )
+                        {
+                        } );
+   }
+
+   void Scene00027( Entity::Player& player )
+   {
+      player.playScene( getId(), 27, HIDE_HOTBAR,
+                        [ & ]( Entity::Player& player, const Event::SceneResult& result )
+                        {
+                        } );
+   }
+
+   void Scene00028( Entity::Player& player )
+   {
+      player.playScene( getId(), 28, SET_EOBJ_BASE | HIDE_HOTBAR | INVIS_EOBJ,
+                        [ & ]( Entity::Player& player, const Event::SceneResult& result )
+                        {
+                          if( result.param2 == 1 )
+                          {
+                              if( player.giveQuestRewards( getId(), result.param3 ) )
+                              {
+                                player.finishQuest( getId() );
+                              }
+                          }
+                        } );
+   }
+};
+
+EXPOSE_SCRIPT(ClsArc001);
\ No newline at end of file

From a12e8e9656569e515f58704bfa96adef1106bca3 Mon Sep 17 00:00:00 2001
From: DantestyleXD <null-fox@hotmail.it>
Date: Sat, 20 Jun 2020 02:20:22 +0200
Subject: [PATCH 326/351] [ Class Quest ] ClsArc002 is Fixed

---
 .../quest/classquest/ARC/ClsArc002.cpp        | 488 ++++++++++++++++++
 1 file changed, 488 insertions(+)
 create mode 100644 src/scripts/quest/classquest/ARC/ClsArc002.cpp

diff --git a/src/scripts/quest/classquest/ARC/ClsArc002.cpp b/src/scripts/quest/classquest/ARC/ClsArc002.cpp
new file mode 100644
index 00000000..075e2a5d
--- /dev/null
+++ b/src/scripts/quest/classquest/ARC/ClsArc002.cpp
@@ -0,0 +1,488 @@
+#include <Actor/Player.h>
+#include "Manager/EventMgr.h"
+#include <ScriptObject.h>
+#include <Service.h>
+
+using namespace Sapphire;
+
+// Quest Script: ClsArc002_00067
+// Quest Name: School of Hard Nocks
+// Quest ID: 65603
+// Start NPC: 1000200
+// End NPC: 1000200
+
+class ClsArc002 : public Sapphire::ScriptAPI::EventScript
+{
+   private:
+      // Basic quest information 
+      // Quest vars / flags used
+      // GetQuestBitFlag8
+      // GetQuestUI8AL
+      // GetQuestUI8BH
+
+      enum Sequence : uint8_t
+      {
+         Seq0 = 0,
+         Seq1 = 1,
+         Seq2 = 2,
+         Seq3 = 3,
+         Seq4 = 4,
+         Seq5 = 5,
+         SeqFinish = 255,
+      };
+
+      // Quest rewards 
+      static constexpr auto RewardExpFactor = 100;
+      static constexpr auto RewardItem = 1893;
+      static constexpr auto RewardItemCount = 1;
+      uint16_t RewardItemOptional[5] = { 3016, 2662, 3539, 3772, 5824 };
+      uint16_t RewardItemOptionalCount[5] = { 1, 1, 1, 1, 2 };
+
+      // Entities found in the script data of the quest
+      static constexpr auto Action0 = 97;
+      static constexpr auto Actor0 = 1000200;
+      static constexpr auto Actor1 = 1000199;
+      static constexpr auto Actor2 = 1000204;
+      static constexpr auto Enemy0 = 39;
+      static constexpr auto Enemy1 = 12;
+      static constexpr auto Eobject0 = 2000936;
+      static constexpr auto Eobject1 = 2000937;
+      static constexpr auto Eobject2 = 2000938;
+      static constexpr auto Eobject3 = 2000939;
+      static constexpr auto Eobject4 = 2000940;
+      static constexpr auto Eobject5 = 2001171;
+      static constexpr auto Eobject6 = 2001173;
+      static constexpr auto Eobject7 = 2001174;
+      static constexpr auto UnlockCheckClassStart = 6;
+      static constexpr auto UnlockImageClassCange = 22;
+      static constexpr auto UnlockImageGearSet = 29;
+
+   public:
+      ClsArc002() : Sapphire::ScriptAPI::EventScript( 65603 ){}; 
+      ~ClsArc002(){}; 
+
+   void onTalk( uint32_t eventId, Entity::Player& player, uint64_t actorId ) override
+   {
+      auto pEventMgr = Common::Service< World::Manager::EventMgr >::ref();
+      auto actor = pEventMgr.mapEventActorToRealActor(static_cast<uint32_t>(actorId));
+
+      if( actor == Actor0 && !player.hasQuest( getId() ) )
+         Scene00000( player );
+      if( actor == Actor1 && player.getQuestSeq( getId() ) == Seq1 )
+         Scene00001( player );
+      if( actor == Actor1 && player.getQuestSeq( getId() ) == Seq3 )
+         Scene00026( player );
+      if( actor == Actor1 && player.getQuestSeq( getId() ) == Seq5 )
+         Scene00029( player );
+      if( actor == Actor0 && player.getQuestSeq( getId() ) == SeqFinish )
+         Scene00030( player );
+   }
+
+   void onEObjHit( Entity::Player& player, uint64_t actorId, uint32_t actionId )
+   {
+     auto pEventMgr = Common::Service< World::Manager::EventMgr >::ref();
+     auto actor = pEventMgr.mapEventActorToRealActor( static_cast<uint32_t>( actorId ) );
+
+     //Eobjects
+     // eventActionStart let crash world.exe
+     // eventStart is hardcode fix
+     if ( actor == Eobject0 )
+     {
+       player.eventStart( actor, getId(), Event::EventHandler::Nest, 0, 0 );
+       Scene00002( player );
+     }
+     else if ( actor == Eobject1 )
+     {
+       player.eventStart( actor, getId(), Event::EventHandler::Nest, 0, 0 );
+       Scene00003( player );
+     }
+     else if ( actor == Eobject2 )
+     {
+       player.eventStart( actor, getId(), Event::EventHandler::Nest, 0, 0 );
+       Scene00004( player );
+     }
+     else if ( actor == Eobject3 )
+     {
+       player.eventStart( actor, getId(), Event::EventHandler::Nest, 0, 0 );
+       Scene00005( player );
+     }
+     else if ( actor == Eobject4 )
+     {
+       player.eventStart( actor, getId(), Event::EventHandler::Nest, 0, 0 );
+       Scene00006( player );
+     }
+     else if ( actor == Eobject5 )
+     {
+       player.eventStart( actor, getId(), Event::EventHandler::Nest, 0, 0 );
+       Scene00007( player );
+     }
+     else if ( actor == Eobject6 )
+     {
+       player.eventStart( actor, getId(), Event::EventHandler::Nest, 0, 0 );
+       Scene00008( player );
+     }
+     else if ( actor == Eobject7 )
+     {
+       player.eventStart( actor, getId(), Event::EventHandler::Nest, 0, 0 );
+       Scene00009( player );
+     }
+   }
+
+   void onBNpcKill( uint32_t npcId, Entity::Player& player ) override
+   {
+      if( npcId != Enemy0 && npcId != Enemy1 )
+         return;
+
+      auto currentKC39 = player.getQuestUI8AL( getId() ) + 1;
+      auto currentKC12 = player.getQuestUI8BH( getId() ) + 1;
+
+      if ( npcId == Enemy0 )
+      {
+        if ( currentKC39 >= 8 )
+        {
+          player.setQuestUI8AL( getId(), currentKC39 );
+          checkQuestCompletion( player, 2 );
+          player.sendQuestMessage( getId(), 3, 2, currentKC39, 8 );
+        }
+        else if ( currentKC39 < 8 )
+        {
+          player.setQuestUI8AL( getId(), currentKC39 );
+          player.sendQuestMessage( getId(), 3, 2, currentKC39, 8 );
+        }
+      }
+
+      if( npcId == Enemy1 )
+      {
+        if ( currentKC12 >= 8 )
+        {
+          player.setQuestUI8BH( getId(), currentKC12 );
+          checkQuestCompletion( player, 2 );
+          player.sendQuestMessage( getId(), 4, 2, currentKC12, 8 );
+        }
+        else if ( currentKC12 < 8 )
+        {
+          player.setQuestUI8BH( getId(), currentKC12 );
+          player.sendQuestMessage( getId(), 4, 2, currentKC12, 8 );
+        }
+      }
+   }
+
+   private:
+
+   void checkQuestCompletion( Entity::Player& player, uint32_t varIdx )
+   {
+      if( varIdx == 1 )
+      {
+         auto currentCC = player.getQuestUI8AL( getId() );
+
+         player.sendQuestMessage( getId(), 1, 2, currentCC + 1, 6 );
+
+         if( currentCC + 1 >= 6 )
+         {
+            player.updateQuest( getId(), Seq3 );
+            player.setQuestUI8AL( getId(), 0 );
+            player.setQuestUI8BH( getId(), 0 );
+         }
+         else
+         {
+            player.setQuestUI8AL( getId(), currentCC + 1 );
+         }
+      }
+      else if( varIdx == 2 )
+      {
+         auto QUEST_ONKILL_39 = player.getQuestUI8AL( getId() );
+         auto QUEST_ONKILL_12 = player.getQuestUI8BH( getId() );
+
+         if( QUEST_ONKILL_39 == 8 && QUEST_ONKILL_12 == 8 )
+         {
+            player.setQuestUI8AL( getId(), 0 );
+            player.setQuestUI8BH( getId(), 0 );
+            player.updateQuest( getId(), Seq5 );
+         }
+      }
+   }
+
+   void Scene00000( Entity::Player& player )
+   {
+      player.playScene( getId(), 0, HIDE_HOTBAR,
+                        [ & ]( Entity::Player& player, const Event::SceneResult& result )
+                        {
+                          if( result.param2 == 1 )
+                          {
+                              player.updateQuest( getId(), Seq1 );
+                          }
+                        } );
+   }
+
+   void Scene00001( Entity::Player& player )
+   {
+      player.playScene( getId(), 1, HIDE_HOTBAR,
+                        [ & ]( Entity::Player& player, const Event::SceneResult& result )
+                        {
+                          player.updateQuest( getId(), Seq2 );
+                          player.sendQuestMessage( getId(), 0, 2, 0, 0 );
+                        } );
+   }
+
+   void Scene00002( Entity::Player& player )
+   {
+      player.playScene( getId(), 2, HIDE_HOTBAR,
+                        [ & ]( Entity::Player& player, const Event::SceneResult& result )
+                        {
+                          checkQuestCompletion( player, 1 );
+                          player.setQuestBitFlag8( getId(), 1, true );
+                        } );
+   }
+
+   void Scene00003( Entity::Player& player )
+   {
+      player.playScene( getId(), 3, HIDE_HOTBAR,
+                        [ & ]( Entity::Player& player, const Event::SceneResult& result )
+                        {
+                          checkQuestCompletion( player, 1 );
+                          player.setQuestBitFlag8( getId(), 2, true );
+                        } );
+   }
+
+   void Scene00004( Entity::Player& player )
+   {
+      player.playScene( getId(), 4, HIDE_HOTBAR,
+                        [ & ]( Entity::Player& player, const Event::SceneResult& result )
+                        {
+                          checkQuestCompletion( player, 1 );
+                          player.setQuestBitFlag8( getId(), 3, true );
+                        } );
+   }
+
+   void Scene00005( Entity::Player& player )
+   {
+      player.playScene( getId(), 5, HIDE_HOTBAR,
+                        [ & ]( Entity::Player& player, const Event::SceneResult& result )
+                        {
+                          checkQuestCompletion( player, 1 );
+                          player.setQuestBitFlag8( getId(), 4, true );
+                        } );
+   }
+
+   void Scene00006( Entity::Player& player )
+   {
+      player.playScene( getId(), 6, HIDE_HOTBAR,
+                        [ & ]( Entity::Player& player, const Event::SceneResult& result )
+                        {
+                          checkQuestCompletion( player, 1 );
+                          player.setQuestBitFlag8( getId(), 5, true );
+                        } );
+   }
+
+   void Scene00007( Entity::Player& player )
+   {
+      player.playScene( getId(), 7, HIDE_HOTBAR,
+                        [ & ]( Entity::Player& player, const Event::SceneResult& result )
+                        {
+                          checkQuestCompletion( player, 1 );
+                          player.setQuestBitFlag8( getId(), 6, true );
+                        } );
+   }
+
+   void Scene00008( Entity::Player& player )
+   {
+      player.playScene( getId(), 8, HIDE_HOTBAR,
+                        [ & ]( Entity::Player& player, const Event::SceneResult& result )
+                        {
+                          checkQuestCompletion( player, 1 );
+                          player.setQuestBitFlag8( getId(), 7, true );
+                        } );
+   }
+
+   void Scene00009( Entity::Player& player )
+   {
+      player.playScene( getId(), 9, HIDE_HOTBAR,
+                        [ & ]( Entity::Player& player, const Event::SceneResult& result )
+                        {
+                          checkQuestCompletion( player, 1 );
+                          player.setQuestBitFlag8( getId(), 8, true );
+                        } );
+   }
+
+   void Scene00010( Entity::Player& player )
+   {
+      player.playScene( getId(), 10, HIDE_HOTBAR,
+                        [ & ]( Entity::Player& player, const Event::SceneResult& result )
+                        {
+                        } );
+   }
+
+   void Scene00011( Entity::Player& player )
+   {
+      player.playScene( getId(), 11, HIDE_HOTBAR,
+                        [ & ]( Entity::Player& player, const Event::SceneResult& result )
+                        {
+                        } );
+   }
+
+   void Scene00012( Entity::Player& player )
+   {
+      player.playScene( getId(), 12, HIDE_HOTBAR,
+                        [ & ]( Entity::Player& player, const Event::SceneResult& result )
+                        {
+                        } );
+   }
+
+   void Scene00013( Entity::Player& player )
+   {
+      player.playScene( getId(), 13, HIDE_HOTBAR,
+                        [ & ]( Entity::Player& player, const Event::SceneResult& result )
+                        {
+                        } );
+   }
+
+   void Scene00014( Entity::Player& player )
+   {
+      player.playScene( getId(), 14, HIDE_HOTBAR,
+                        [ & ]( Entity::Player& player, const Event::SceneResult& result )
+                        {
+                        } );
+   }
+
+   void Scene00015( Entity::Player& player )
+   {
+      player.playScene( getId(), 15, HIDE_HOTBAR,
+                        [ & ]( Entity::Player& player, const Event::SceneResult& result )
+                        {
+                        } );
+   }
+
+   void Scene00016( Entity::Player& player )
+   {
+      player.playScene( getId(), 16, HIDE_HOTBAR,
+                        [ & ]( Entity::Player& player, const Event::SceneResult& result )
+                        {
+                        } );
+   }
+
+   void Scene00017( Entity::Player& player )
+   {
+      player.playScene( getId(), 17, HIDE_HOTBAR,
+                        [ & ]( Entity::Player& player, const Event::SceneResult& result )
+                        {
+                        } );
+   }
+
+   void Scene00018( Entity::Player& player )
+   {
+      player.playScene( getId(), 18, HIDE_HOTBAR,
+                        [ & ]( Entity::Player& player, const Event::SceneResult& result )
+                        {
+                        } );
+   }
+
+   void Scene00019( Entity::Player& player )
+   {
+      player.playScene( getId(), 19, HIDE_HOTBAR,
+                        [ & ]( Entity::Player& player, const Event::SceneResult& result )
+                        {
+                        } );
+   }
+
+   void Scene00020( Entity::Player& player )
+   {
+      player.playScene( getId(), 20, HIDE_HOTBAR,
+                        [ & ]( Entity::Player& player, const Event::SceneResult& result )
+                        {
+                        } );
+   }
+
+   void Scene00021( Entity::Player& player )
+   {
+      player.playScene( getId(), 21, HIDE_HOTBAR,
+                        [ & ]( Entity::Player& player, const Event::SceneResult& result )
+                        {
+                        } );
+   }
+
+   void Scene00022( Entity::Player& player )
+   {
+      player.playScene( getId(), 22, HIDE_HOTBAR,
+                        [ & ]( Entity::Player& player, const Event::SceneResult& result )
+                        {
+                        } );
+   }
+
+   void Scene00023( Entity::Player& player )
+   {
+      player.playScene( getId(), 23, HIDE_HOTBAR,
+                        [ & ]( Entity::Player& player, const Event::SceneResult& result )
+                        {
+                        } );
+   }
+
+   void Scene00024( Entity::Player& player )
+   {
+      player.playScene( getId(), 24, HIDE_HOTBAR,
+                        [ & ]( Entity::Player& player, const Event::SceneResult& result )
+                        {
+                        } );
+   }
+
+   void Scene00025( Entity::Player& player )
+   {
+      player.playScene( getId(), 25, HIDE_HOTBAR,
+                        [ & ]( Entity::Player& player, const Event::SceneResult& result )
+                        {
+                        } );
+   }
+
+   void Scene00026( Entity::Player& player )
+   {
+      player.playScene( getId(), 26, HIDE_HOTBAR,
+                        [ & ]( Entity::Player& player, const Event::SceneResult& result )
+                        {
+                          player.sendQuestMessage( getId(), 2, 2, 0, 0 );
+                          player.updateQuest( getId(), Seq4 );
+                        } );
+   }
+
+   void Scene00027( Entity::Player& player )
+   {
+      player.playScene( getId(), 27, HIDE_HOTBAR,
+                        [ & ]( Entity::Player& player, const Event::SceneResult& result )
+                        {
+                        } );
+   }
+
+   void Scene00028( Entity::Player& player )
+   {
+      player.playScene( getId(), 28, HIDE_HOTBAR,
+                        [ & ]( Entity::Player& player, const Event::SceneResult& result )
+                        {
+                        } );
+   }
+
+   void Scene00029( Entity::Player& player )
+   {
+      player.playScene( getId(), 29, HIDE_HOTBAR,
+                        [ & ]( Entity::Player& player, const Event::SceneResult& result )
+                        {
+                          player.sendQuestMessage( getId(), 5, 2, 0, 0 );
+                          player.updateQuest( getId(), SeqFinish );
+                        } );
+   }
+
+   void Scene00030( Entity::Player& player )
+   {
+      player.playScene( getId(), 30, SET_EOBJ_BASE | HIDE_HOTBAR | INVIS_EOBJ,
+                        [ & ]( Entity::Player& player, const Event::SceneResult& result )
+                        {
+                          if ( result.param2 == 1 )
+                          {
+                            if ( player.giveQuestRewards( getId(), result.param3 ) )
+                            {
+                              player.finishQuest( getId() );
+                            }
+                          }
+                          else return;
+                        } );
+   }
+};
+
+EXPOSE_SCRIPT( ClsArc002 );
\ No newline at end of file

From 8b038147b48553ecc67b547e76f31df27dad7d4b Mon Sep 17 00:00:00 2001
From: DantestyleXD <null-fox@hotmail.it>
Date: Sat, 20 Jun 2020 03:23:48 +0200
Subject: [PATCH 327/351] [ Class Quest ] ClsArc003 is Fixed (Will need a
 revision)

---
 .../quest/classquest/ARC/ClsArc003.cpp        | 460 ++++++++++++++++++
 1 file changed, 460 insertions(+)
 create mode 100644 src/scripts/quest/classquest/ARC/ClsArc003.cpp

diff --git a/src/scripts/quest/classquest/ARC/ClsArc003.cpp b/src/scripts/quest/classquest/ARC/ClsArc003.cpp
new file mode 100644
index 00000000..86c5050d
--- /dev/null
+++ b/src/scripts/quest/classquest/ARC/ClsArc003.cpp
@@ -0,0 +1,460 @@
+#include <Actor/Player.h>
+#include "Manager/EventMgr.h"
+#include "Manager/TerritoryMgr.h"
+#include <ScriptObject.h>
+#include <Service.h>
+
+using namespace Sapphire;
+
+// Quest Script: ClsArc003_00068
+// Quest Name: Violators Will Be Shot
+// Quest ID: 65604
+// Start NPC: 1000200
+// End NPC: 1000200
+
+class ClsArc003 : public Sapphire::ScriptAPI::EventScript
+{
+   private:
+      // Basic quest information 
+      // Quest vars / flags used
+      // GetQuestBitFlag8
+      // GetQuestUI8AL
+
+      enum Sequence : uint8_t
+      {
+         Seq0 = 0,
+         Seq1 = 1,
+         Seq2 = 2,
+         Seq3 = 3,
+         Seq4 = 4,
+         Seq5 = 5,
+         SeqFinish = 255,
+      };
+
+      // Quest rewards 
+      static constexpr auto RewardExpFactor = 100;
+      static constexpr auto RewardAction = 112;
+      static constexpr auto RewardItem = 1895;
+      static constexpr auto RewardItemCount = 1;
+      uint16_t RewardItemOptional[5] = { 3028, 2677, 3546, 3780, 5824 };
+      uint16_t RewardItemOptionalCount[5] = { 1, 1, 1, 1, 3 };
+
+      // Entities found in the script data of the quest
+      static constexpr auto Action0 = 97;
+      static constexpr auto Actor0 = 1000200;
+      static constexpr auto Actor1 = 1000204;
+      static constexpr auto Actor2 = 1000199;
+      static constexpr auto Eobject0 = 2000941;
+      static constexpr auto Eobject1 = 2000942;
+      static constexpr auto Eobject2 = 2000943;
+      static constexpr auto Eobject3 = 2000944;
+      static constexpr auto Eobject4 = 2000945;
+      static constexpr auto Eobject5 = 2000946;
+      static constexpr auto Eobject6 = 2001179;
+      static constexpr auto Eobject7 = 2001180;
+      static constexpr auto Eobject8 = 2000962;
+      static constexpr auto EventActionWaiting2Middle = 12;
+      static constexpr auto EventMotZephyr = 366;
+      static constexpr auto LocAction0 = 995;
+      static constexpr auto LocVfx = 241;
+      static constexpr auto LocWs = 112;
+      static constexpr auto Questbattle0 = 6;
+      static constexpr auto Territorytype0 = 228;
+
+   public:
+      ClsArc003() : Sapphire::ScriptAPI::EventScript( 65604 ){}; 
+      ~ClsArc003(){}; 
+
+   void onTalk( uint32_t eventId, Entity::Player& player, uint64_t actorId ) override
+   {
+      auto pEventMgr = Common::Service< World::Manager::EventMgr >::ref();
+      auto actor = pEventMgr.mapEventActorToRealActor( static_cast<uint32_t>( actorId ) );
+
+      if( actor == Actor0 && !player.hasQuest( getId() ) )
+         Scene00000( player );
+      if( actor == Actor1 && player.getQuestSeq( getId() ) == Seq1 )
+         Scene00001( player );
+      if( actor == Actor1 && player.getQuestSeq( getId() ) == Seq3 )
+         Scene00026( player );
+      if( actor == Actor1 && player.getQuestSeq( getId() ) == Seq5 )
+         Scene00030( player );
+      if( actor == Actor0 && player.getQuestSeq( getId() ) == SeqFinish )
+         Scene00031( player );
+   }
+
+   void onEObjHit( Entity::Player& player, uint64_t actorId, uint32_t actionId )
+   {
+     auto pEventMgr = Common::Service< World::Manager::EventMgr >::ref();
+     auto actor = pEventMgr.mapEventActorToRealActor( static_cast<uint32_t>( actorId ) );
+
+     //Eobjects
+     // eventActionStart let crash world.exe
+     // eventStart is hardcode fix
+     if ( actor == Eobject0 )
+     {
+       player.eventStart( actor, getId(), Event::EventHandler::Nest, 0, 0 );
+       Scene00002( player );
+     }
+     else if ( actor == Eobject1 )
+     {
+       player.eventStart( actor, getId(), Event::EventHandler::Nest, 0, 0 );
+       Scene00003( player );
+     }
+     else if ( actor == Eobject2 )
+     {
+       player.eventStart( actor, getId(), Event::EventHandler::Nest, 0, 0 );
+       Scene00004( player );
+     }
+     else if ( actor == Eobject3 )
+     {
+       player.eventStart( actor, getId(), Event::EventHandler::Nest, 0, 0 );
+       Scene00005( player );
+     }
+     else if ( actor == Eobject4 )
+     {
+       player.eventStart( actor, getId(), Event::EventHandler::Nest, 0, 0 );
+       Scene00006( player );
+     }
+     else if ( actor == Eobject5 )
+     {
+       player.eventStart( actor, getId(), Event::EventHandler::Nest, 0, 0 );
+       Scene00007( player );
+     }
+     else if ( actor == Eobject6 )
+     {
+       player.eventStart( actor, getId(), Event::EventHandler::Nest, 0, 0 );
+       Scene00008( player );
+     }
+     else if ( actor == Eobject7 )
+     {
+       player.eventStart( actor, getId(), Event::EventHandler::Nest, 0, 0 );
+       Scene00009( player );
+     }
+     else if ( actor == Eobject8 )
+     {
+       player.eventStart( actor, getId(), Event::EventHandler::Nest, 0, 0 );
+       Scene00027( player );
+     }
+   }
+
+   private:
+
+   void checkQuestCompletion( Entity::Player& player )
+   {
+      auto currentCC = player.getQuestUI8AL( getId() );
+
+      player.sendQuestMessage( getId(), 1, 2, currentCC + 1, 6 );
+
+      if( currentCC + 1 >= 6 )
+      {
+        player.setQuestUI8AL( getId(), 0 );
+        player.updateQuest( getId(), Seq3 );
+      }
+      else
+      {
+        player.setQuestUI8AL( getId(), currentCC + 1 );
+      }
+   }
+
+   void Scene00000( Entity::Player& player )
+   {
+      player.playScene( getId(), 0, HIDE_HOTBAR,
+                        [ & ]( Entity::Player& player, const Event::SceneResult& result )
+                        {
+                          if( result.param2 == 1 )
+                          {
+                              player.updateQuest( getId(), Seq1 );
+                          }
+                        } );
+   }
+
+   void Scene00001( Entity::Player& player )
+   {
+      player.playScene( getId(), 1, HIDE_HOTBAR,
+                        [ & ]( Entity::Player& player, const Event::SceneResult& result )
+                        {
+                          player.sendQuestMessage( getId(), 0, 2, 0, 0 );
+                          player.updateQuest( getId(), Seq2 );
+                        } );
+   }
+
+   void Scene00002( Entity::Player& player )
+   {
+      player.playScene( getId(), 2, HIDE_HOTBAR,
+                        [ & ]( Entity::Player& player, const Event::SceneResult& result )
+                        {
+                            checkQuestCompletion( player );
+                            player.setQuestBitFlag8( getId(), 1, true );
+                        } );
+   }
+
+   void Scene00003( Entity::Player& player )
+   {
+      player.playScene( getId(), 3, HIDE_HOTBAR,
+                        [ & ]( Entity::Player& player, const Event::SceneResult& result )
+                        {
+                            checkQuestCompletion( player );
+                            player.setQuestBitFlag8( getId(), 2, true );
+                        } );
+   }
+
+   void Scene00004( Entity::Player& player )
+   {
+      player.playScene( getId(), 4, HIDE_HOTBAR,
+                        [ & ]( Entity::Player& player, const Event::SceneResult& result )
+                        {
+                            checkQuestCompletion( player );
+                            player.setQuestBitFlag8( getId(), 3, true );
+                        } );
+   }
+
+   void Scene00005( Entity::Player& player )
+   {
+      player.playScene( getId(), 5, HIDE_HOTBAR,
+                        [ & ]( Entity::Player& player, const Event::SceneResult& result )
+                        {
+                           checkQuestCompletion( player );
+                           player.setQuestBitFlag8( getId(), 4, true );
+                        } );
+   }
+
+   void Scene00006( Entity::Player& player )
+   {
+      player.playScene( getId(), 6, HIDE_HOTBAR,
+                        [ & ]( Entity::Player& player, const Event::SceneResult& result )
+                        {
+                           checkQuestCompletion( player );
+                           player.setQuestBitFlag8( getId(), 5, true );
+                        } );
+   }
+
+   void Scene00007( Entity::Player& player )
+   {
+      player.playScene( getId(), 7, HIDE_HOTBAR,
+                        [ & ]( Entity::Player& player, const Event::SceneResult& result )
+                        {
+                           checkQuestCompletion( player );
+                           player.setQuestBitFlag8( getId(), 6, true );
+                        } );
+   }
+
+   void Scene00008( Entity::Player& player )
+   {
+      player.playScene( getId(), 8, HIDE_HOTBAR,
+                        [ & ]( Entity::Player& player, const Event::SceneResult& result )
+                        {
+                           checkQuestCompletion( player );
+                           player.setQuestBitFlag8( getId(), 7, true );
+                        } );
+   }
+
+   void Scene00009( Entity::Player& player )
+   {
+      player.playScene( getId(), 9, HIDE_HOTBAR,
+                        [ & ]( Entity::Player& player, const Event::SceneResult& result )
+                        {
+                            checkQuestCompletion( player );
+                            player.setQuestBitFlag8( getId(), 8, true );
+                        } );
+   }
+
+   void Scene00010( Entity::Player& player )
+   {
+      player.playScene( getId(), 10, HIDE_HOTBAR,
+                        [ & ]( Entity::Player& player, const Event::SceneResult& result )
+                        {
+                        } );
+   }
+
+   void Scene00011( Entity::Player& player )
+   {
+      player.playScene( getId(), 11, HIDE_HOTBAR,
+                        [ & ]( Entity::Player& player, const Event::SceneResult& result )
+                        {
+                        } );
+   }
+
+   void Scene00012( Entity::Player& player )
+   {
+      player.playScene( getId(), 12, HIDE_HOTBAR,
+                        [ & ]( Entity::Player& player, const Event::SceneResult& result )
+                        {
+                        } );
+   }
+
+   void Scene00013( Entity::Player& player )
+   {
+      player.playScene( getId(), 13, HIDE_HOTBAR,
+                        [ & ]( Entity::Player& player, const Event::SceneResult& result )
+                        {
+                        } );
+   }
+
+   void Scene00014( Entity::Player& player )
+   {
+      player.playScene( getId(), 14, HIDE_HOTBAR,
+                        [ & ]( Entity::Player& player, const Event::SceneResult& result )
+                        {
+                        } );
+   }
+
+   void Scene00015( Entity::Player& player )
+   {
+      player.playScene( getId(), 15, HIDE_HOTBAR,
+                        [ & ]( Entity::Player& player, const Event::SceneResult& result )
+                        {
+                        } );
+   }
+
+   void Scene00016( Entity::Player& player )
+   {
+      player.playScene( getId(), 16, HIDE_HOTBAR,
+                        [ & ]( Entity::Player& player, const Event::SceneResult& result )
+                        {
+                        } );
+   }
+
+   void Scene00017( Entity::Player& player )
+   {
+      player.playScene( getId(), 17, HIDE_HOTBAR,
+                        [ & ]( Entity::Player& player, const Event::SceneResult& result )
+                        {
+                        } );
+   }
+
+   void Scene00018( Entity::Player& player )
+   {
+      player.playScene( getId(), 18, HIDE_HOTBAR,
+                        [ & ]( Entity::Player& player, const Event::SceneResult& result )
+                        {
+                        } );
+   }
+
+   void Scene00019( Entity::Player& player )
+   {
+      player.playScene( getId(), 19, HIDE_HOTBAR,
+                        [ & ]( Entity::Player& player, const Event::SceneResult& result )
+                        {
+                        } );
+   }
+
+   void Scene00020( Entity::Player& player )
+   {
+      player.playScene( getId(), 20, HIDE_HOTBAR,
+                        [ & ]( Entity::Player& player, const Event::SceneResult& result )
+                        {
+                        } );
+   }
+
+   void Scene00021( Entity::Player& player )
+   {
+      player.playScene( getId(), 21, HIDE_HOTBAR,
+                        [ & ]( Entity::Player& player, const Event::SceneResult& result )
+                        {
+                        } );
+   }
+
+   void Scene00022( Entity::Player& player )
+   {
+      player.playScene( getId(), 22, HIDE_HOTBAR,
+                        [ & ]( Entity::Player& player, const Event::SceneResult& result )
+                        {
+                        } );
+   }
+
+   void Scene00023( Entity::Player& player )
+   {
+      player.playScene( getId(), 23, HIDE_HOTBAR,
+                        [ & ]( Entity::Player& player, const Event::SceneResult& result )
+                        {
+                        } );
+   }
+
+   void Scene00024( Entity::Player& player )
+   {
+      player.playScene( getId(), 24, HIDE_HOTBAR,
+                        [ & ]( Entity::Player& player, const Event::SceneResult& result )
+                        {
+                        } );
+   }
+
+   void Scene00025( Entity::Player& player )
+   {
+      player.playScene( getId(), 25, HIDE_HOTBAR,
+                        [ & ]( Entity::Player& player, const Event::SceneResult& result )
+                        {
+                        } );
+   }
+
+   void Scene00026( Entity::Player& player )
+   {
+      player.playScene( getId(), 26, HIDE_HOTBAR,
+                        [ & ]( Entity::Player& player, const Event::SceneResult& result )
+                        {
+                          player.setQuestUI8AL( getId(), 0 );
+                          player.sendQuestMessage( getId(), 2, 2, 0, 0 );
+                          player.updateQuest( getId(), Seq4 );
+                        } );
+   }
+
+   void Scene00027( Entity::Player& player )
+   {
+      player.playScene( getId(), 27, HIDE_HOTBAR,
+                        [ & ]( Entity::Player& player, const Event::SceneResult& result )
+                        {
+                          Scene00028( player );
+                        } );
+   }
+
+   void Scene00028( Entity::Player& player )
+   {
+      player.playScene( getId(), 28, HIDE_HOTBAR,
+                        [ & ]( Entity::Player& player, const Event::SceneResult& result )
+                        {
+                          if( result.param2 == 1 )
+                          {
+                              player.updateQuest( getId(), Seq5 );
+                              // QuestBattle doesn't work
+                              /*auto& pTeriMgr = Common::Service< Sapphire::World::Manager::TerritoryMgr >::ref();
+
+                              player.eventFinish( result.eventId, 0 );
+                              pTeriMgr.createAndJoinQuestBattle( player, Questbattle0 );*/
+                          }
+                        } );
+   }
+
+   void Scene00029( Entity::Player& player )
+   {
+      player.playScene( getId(), 29, HIDE_HOTBAR,
+                        [ & ]( Entity::Player& player, const Event::SceneResult& result )
+                        {
+                        } );
+   }
+
+   void Scene00030( Entity::Player& player )
+   {
+      player.playScene( getId(), 30, HIDE_HOTBAR,
+                        [ & ]( Entity::Player& player, const Event::SceneResult& result )
+                        {
+                          player.sendQuestMessage( getId(), 4, 2, 0, 0 );
+                          player.updateQuest( getId(), SeqFinish );
+                        } );
+   }
+
+   void Scene00031( Entity::Player& player )
+   {
+      player.playScene( getId(), 31, SET_EOBJ_BASE | HIDE_HOTBAR | INVIS_EOBJ,
+                        [ & ]( Entity::Player& player, const Event::SceneResult& result )
+                        {
+                          if( result.param2 == 1 )
+                          {
+                              if( player.giveQuestRewards( getId(), result.param3 ) )
+                              {
+                                player.finishQuest( getId() );
+                              }
+                          }
+                        } );
+   }
+};
+
+EXPOSE_SCRIPT(ClsArc003);
\ No newline at end of file

From 16bf0f822c327e81bd8bf9149e522f345727f192 Mon Sep 17 00:00:00 2001
From: DantestyleXD <null-fox@hotmail.it>
Date: Sat, 20 Jun 2020 03:24:20 +0200
Subject: [PATCH 328/351] [ Class Quest ] ClsArc004 is Fixed ( Will need a
 revision )

---
 .../quest/classquest/ARC/ClsArc004.cpp        | 349 ++++++++++++++++++
 1 file changed, 349 insertions(+)
 create mode 100644 src/scripts/quest/classquest/ARC/ClsArc004.cpp

diff --git a/src/scripts/quest/classquest/ARC/ClsArc004.cpp b/src/scripts/quest/classquest/ARC/ClsArc004.cpp
new file mode 100644
index 00000000..12cab011
--- /dev/null
+++ b/src/scripts/quest/classquest/ARC/ClsArc004.cpp
@@ -0,0 +1,349 @@
+#include <Actor/Player.h>
+#include "Manager/EventMgr.h"
+#include <ScriptObject.h>
+#include <Service.h>
+
+using namespace Sapphire;
+
+// Quest Script: ClsArc004_00070
+// Quest Name: To Catch a Poacher
+// Quest ID: 65606
+// Start NPC: 1000200
+// End NPC: 1000200
+
+class ClsArc004 : public Sapphire::ScriptAPI::EventScript
+{
+   private:
+      // Basic quest information 
+      // Quest vars / flags used
+      // GetQuestBitFlag8
+      // GetQuestUI8AL
+
+      enum Sequence : uint8_t
+      {
+         Seq0 = 0,
+         Seq1 = 1,
+         Seq2 = 2,
+         Seq3 = 3,
+         Seq4 = 4,
+         Seq5 = 5,
+         SeqFinish = 255,
+      };
+
+      // Quest rewards 
+      static constexpr auto RewardExpFactor = 100;
+      static constexpr auto RewardItem = 1899;
+      static constexpr auto RewardItemCount = 1;
+      uint16_t RewardItemOptional[5] = { 3043, 2708, 3559, 3791, 5824 };
+      uint16_t RewardItemOptionalCount[5] = { 1, 1, 1, 1, 5 };
+
+      // Entities found in the script data of the quest
+      static constexpr auto Actor0 = 1000200;
+      static constexpr auto Actor1 = 1000590;
+      static constexpr auto Actor2 = 1000731;
+      static constexpr auto Actor3 = 1000732;
+      static constexpr auto Actor4 = 1000199;
+      static constexpr auto Actor5 = 1000204;
+      static constexpr auto Eobject0 = 2000947;
+      static constexpr auto Eobject1 = 2000948;
+      static constexpr auto Eobject2 = 2000949;
+      static constexpr auto Eobject3 = 2001105;
+      static constexpr auto Eobject4 = 2000136;
+      static constexpr auto EventActionGatherMiddle = 7;
+      static constexpr auto EventActionSearch = 1;
+      static constexpr auto EventActionWaiting = 10;
+      static constexpr auto LocPosActor5 = 3875531;
+      static constexpr auto Questbattle0 = 5;
+      static constexpr auto Seq0Actor0Lq = 90;
+      static constexpr auto Territorytype0 = 229;
+
+   public:
+      ClsArc004() : Sapphire::ScriptAPI::EventScript( 65606 ){}; 
+      ~ClsArc004(){}; 
+
+   void onTalk( uint32_t eventId, Entity::Player& player, uint64_t actorId ) override
+   {
+      auto pEventMgr = Common::Service< World::Manager::EventMgr >::ref();
+      auto actor = pEventMgr.mapEventActorToRealActor( static_cast<uint32_t>( actorId ) );
+
+      if( actor == Actor0 && !player.hasQuest( getId() ) )
+         Scene00000( player );
+      if( actor == Actor1 && player.getQuestSeq( getId() ) == Seq1 )
+         Scene00002( player );
+      if( actor == Actor1 && player.getQuestSeq( getId() ) == Seq5 ) // <- Player can't talk with NPC... idk
+         Scene00018( player );
+      if( actor == Actor3 && player.getQuestSeq( getId() ) == Seq5 )
+         Scene00019( player );
+      if( actor == Actor2 && player.getQuestSeq( getId() ) == Seq5 )
+         Scene00020( player );
+      if( actor == Actor0 && player.getQuestSeq( getId() ) == SeqFinish )
+         Scene00021( player );
+      //Eobjects
+      else if( actor == Eobject0 )
+         player.eventActionStart( getId(), 0x07,
+            [ & ]( Entity::Player& player, uint32_t eventId, uint64_t additional )
+            {
+               Scene00003( player );
+            },
+            nullptr, eventId );
+      else if( actor == Eobject1 )
+         player.eventActionStart( getId(), 0x07,
+            [ & ]( Entity::Player& player, uint32_t eventId, uint64_t additional )
+            {
+               Scene00004( player );
+            },
+            nullptr, eventId );
+      else if( actor == Eobject2 )
+         player.eventActionStart( getId(), 0x07,
+            [ & ]( Entity::Player& player, uint32_t eventId, uint64_t additional )
+            {
+               Scene00005( player );
+            },
+            nullptr, eventId );
+      else if( actor == Eobject3 )
+         player.eventActionStart( getId(), 0x0A,
+            [ & ]( Entity::Player& player, uint32_t eventId, uint64_t additional )
+            {
+               Scene00013( player );
+               player.sendQuestMessage( getId(), 2, 2, 0, 0 );
+            },
+            nullptr, eventId );
+      else if( actor == Eobject4 )
+         player.eventActionStart( getId(), 0x01,
+            [ & ]( Entity::Player& player, uint32_t eventId, uint64_t additional )
+            {
+               Scene00015( player );
+            },
+            nullptr, eventId );
+   }
+
+   private:
+
+   void checkQuestCompletion( Entity::Player& player )
+   {
+      auto currentCC = player.getQuestUI8AL( getId() );
+
+      player.sendQuestMessage( getId(), 1, 2, currentCC + 1, 3 );
+
+      if( currentCC + 1 >= 3 )
+      {
+         player.updateQuest( getId(), Seq3 );
+         player.setQuestUI8AL( getId(), 0 );
+      }
+      else
+      {
+         player.setQuestUI8AL( getId(), currentCC + 1 );
+      }
+   }
+
+   void Scene00000( Entity::Player& player )
+   {
+      player.playScene( getId(), 0, HIDE_HOTBAR,
+                        [ & ]( Entity::Player& player, const Event::SceneResult& result )
+                        {
+                          if( result.param2 == 1 )
+                          {
+                              Scene00001( player );
+                          }
+                        } );
+   }
+
+   void Scene00001( Entity::Player& player )
+   {
+      player.playScene( getId(), 1, SET_EOBJ_BASE | HIDE_HOTBAR | INVIS_EOBJ,
+                        [ & ]( Entity::Player& player, const Event::SceneResult& result )
+                        {
+                          player.updateQuest( getId(), Seq1 );
+                        } );
+   }
+
+   void Scene00002( Entity::Player& player )
+   {
+      player.playScene( getId(), 2, SET_EOBJ_BASE | HIDE_HOTBAR | INVIS_EOBJ,
+                        [ & ]( Entity::Player& player, const Event::SceneResult& result )
+                        {
+                          player.sendQuestMessage( getId(), 0, 2, 0, 0 );
+                          player.updateQuest( getId(), Seq2 );
+                        } );
+   }
+
+   void Scene00003( Entity::Player& player )
+   {
+      player.playScene( getId(), 3, HIDE_HOTBAR,
+                        [ & ]( Entity::Player& player, const Event::SceneResult& result )
+                        {
+                          player.setQuestBitFlag8( getId(), 1, true );
+                          checkQuestCompletion( player );
+                        } );
+   }
+
+   void Scene00004( Entity::Player& player )
+   {
+      player.playScene( getId(), 4, HIDE_HOTBAR,
+                        [ & ]( Entity::Player& player, const Event::SceneResult& result )
+                        {
+                          player.setQuestBitFlag8(getId(), 2, true);
+                          checkQuestCompletion( player );
+                        } );
+   }
+
+   void Scene00005( Entity::Player& player )
+   {
+      player.playScene( getId(), 5, HIDE_HOTBAR,
+                        [ & ]( Entity::Player& player, const Event::SceneResult& result )
+                        {
+                          player.setQuestBitFlag8(getId(), 3, true);
+                          checkQuestCompletion( player );
+                        } );
+   }
+
+   void Scene00006( Entity::Player& player )
+   {
+      player.playScene( getId(), 6, HIDE_HOTBAR,
+                        [ & ]( Entity::Player& player, const Event::SceneResult& result )
+                        {
+                        } );
+   }
+
+   void Scene00007( Entity::Player& player )
+   {
+      player.playScene( getId(), 7, HIDE_HOTBAR,
+                        [ & ]( Entity::Player& player, const Event::SceneResult& result )
+                        {
+                        } );
+   }
+
+   void Scene00008( Entity::Player& player )
+   {
+      player.playScene( getId(), 8, HIDE_HOTBAR,
+                        [ & ]( Entity::Player& player, const Event::SceneResult& result )
+                        {
+                        } );
+   }
+
+   void Scene00009( Entity::Player& player )
+   {
+      player.playScene( getId(), 9, HIDE_HOTBAR,
+                        [ & ]( Entity::Player& player, const Event::SceneResult& result )
+                        {
+                        } );
+   }
+
+   void Scene00010( Entity::Player& player )
+   {
+      player.playScene( getId(), 10, HIDE_HOTBAR,
+                        [ & ]( Entity::Player& player, const Event::SceneResult& result )
+                        {
+                        } );
+   }
+
+   void Scene00011( Entity::Player& player )
+   {
+      player.playScene( getId(), 11, HIDE_HOTBAR,
+                        [ & ]( Entity::Player& player, const Event::SceneResult& result )
+                        {
+                        } );
+   }
+
+   void Scene00012( Entity::Player& player )
+   {
+      player.playScene( getId(), 12, HIDE_HOTBAR,
+                        [ & ]( Entity::Player& player, const Event::SceneResult& result )
+                        {
+                        } );
+   }
+
+   void Scene00013( Entity::Player& player )
+   {
+      player.playScene( getId(), 13, SET_EOBJ_BASE | HIDE_HOTBAR | INVIS_EOBJ,
+                        [ & ]( Entity::Player& player, const Event::SceneResult& result )
+                        {
+                          player.updateQuest( getId(), Seq4 );
+                        } );
+   }
+
+   void Scene00014( Entity::Player& player )
+   {
+      player.playScene( getId(), 14, HIDE_HOTBAR,
+                        [ & ]( Entity::Player& player, const Event::SceneResult& result )
+                        {
+                        } );
+   }
+
+   void Scene00015( Entity::Player& player )
+   {
+      player.playScene( getId(), 15, HIDE_HOTBAR,
+                        [ & ]( Entity::Player& player, const Event::SceneResult& result )
+                        {
+                          Scene00016( player );
+                        } );
+   }
+
+   void Scene00016( Entity::Player& player )
+   {
+      player.playScene( getId(), 16, HIDE_HOTBAR,
+                        [ & ]( Entity::Player& player, const Event::SceneResult& result )
+                        {
+                          if( result.param2 == 1 )
+                          {
+                              player.updateQuest( getId(), Seq5 );
+                              // QuestBattle doesn't work
+                              /*auto& pTeriMgr = Common::Service< Sapphire::World::Manager::TerritoryMgr >::ref();
+
+                              player.eventFinish(result.eventId, 0);
+                              pTeriMgr.createAndJoinQuestBattle(player, Questbattle0);*/
+                          }
+                        } );
+   }
+
+   void Scene00017( Entity::Player& player )
+   {
+      player.playScene( getId(), 17, HIDE_HOTBAR,
+                        [ & ]( Entity::Player& player, const Event::SceneResult& result )
+                        {
+                        } );
+   }
+
+   void Scene00018( Entity::Player& player )
+   {
+      player.playScene( getId(), 18, HIDE_HOTBAR,
+                        [ & ]( Entity::Player& player, const Event::SceneResult& result )
+                        {
+                          player.sendQuestMessage( getId(), 4, 2, 0, 0 );
+                          player.updateQuest( getId(), SeqFinish );
+                        } );
+   }
+
+   void Scene00019( Entity::Player& player )
+   {
+      player.playScene( getId(), 19, HIDE_HOTBAR,
+                        [ & ]( Entity::Player& player, const Event::SceneResult& result )
+                        {
+                        } );
+   }
+
+   void Scene00020( Entity::Player& player )
+   {
+      player.playScene( getId(), 20, HIDE_HOTBAR,
+                        [ & ]( Entity::Player& player, const Event::SceneResult& result )
+                        {
+                        } );
+   }
+
+   void Scene00021( Entity::Player& player )
+   {
+      player.playScene( getId(), 21, HIDE_HOTBAR,
+                        [ & ]( Entity::Player& player, const Event::SceneResult& result )
+                        {
+                          if( result.param2 == 1 )
+                          {
+                              if( player.giveQuestRewards( getId(), result.param3 ) )
+                              {
+                                player.finishQuest( getId() );
+                              }
+                          }
+                        } );
+   }
+};
+
+EXPOSE_SCRIPT(ClsArc004);
\ No newline at end of file

From 7c00f1ae7f93f3b4659d23af6388618a6352bde4 Mon Sep 17 00:00:00 2001
From: DantestyleXD <null-fox@hotmail.it>
Date: Sat, 20 Jun 2020 03:24:54 +0200
Subject: [PATCH 329/351] [ Class Quest ] ClsArc005 is Fixed ( Will need a
 revision )

---
 .../quest/classquest/ARC/ClsArc005.cpp        | 206 ++++++++++++++++++
 1 file changed, 206 insertions(+)
 create mode 100644 src/scripts/quest/classquest/ARC/ClsArc005.cpp

diff --git a/src/scripts/quest/classquest/ARC/ClsArc005.cpp b/src/scripts/quest/classquest/ARC/ClsArc005.cpp
new file mode 100644
index 00000000..c24a77e0
--- /dev/null
+++ b/src/scripts/quest/classquest/ARC/ClsArc005.cpp
@@ -0,0 +1,206 @@
+#include <Actor/Player.h>
+#include "Manager/EventMgr.h"
+#include <ScriptObject.h>
+#include <Service.h>
+
+using namespace Sapphire;
+
+// Quest Script: ClsArc005_00071
+// Quest Name: Homecoming
+// Quest ID: 65607
+// Start NPC: 1000200
+// End NPC: 1000200
+
+class ClsArc005 : public Sapphire::ScriptAPI::EventScript
+{
+   private:
+      // Basic quest information 
+      // Quest vars / flags used
+      // GetQuestBitFlag8
+      // GetQuestUI8AL
+
+      enum Sequence : uint8_t
+      {
+         Seq0 = 0,
+         Seq1 = 1,
+         Seq2 = 2,
+         Seq3 = 3,
+         Seq4 = 4,
+         SeqFinish = 255,
+      };
+
+      // Quest rewards 
+      static constexpr auto RewardExpFactor = 100;
+      static constexpr auto RewardItem = 1905;
+      static constexpr auto RewardItemCount = 1;
+      uint16_t RewardItemOptional[5] = { 3066, 2729, 3576, 3808, 5825 };
+      uint16_t RewardItemOptionalCount[5] = { 1, 1, 1, 1, 2 };
+
+      // Entities found in the script data of the quest
+      static constexpr auto Actor0 = 1000200;
+      static constexpr auto Actor1 = 1000204;
+      static constexpr auto Actor2 = 1000199;
+      static constexpr auto Actor3 = 1000534;
+      static constexpr auto Actor4 = 1001284;
+      static constexpr auto Actor5 = 1003025;
+      static constexpr auto Actor6 = 1003026;
+      static constexpr auto Eobject0 = 2000951;
+      static constexpr auto Eobject1 = 2001840;
+      static constexpr auto EventActionSearch = 1;
+      static constexpr auto EventActionWaiting = 10;
+      static constexpr auto LocActor5Action1 = 834;
+      static constexpr auto LocPosActor5 = 3877820;
+      static constexpr auto LocPosPc = 3877813;
+      static constexpr auto Questbattle0 = 4;
+      static constexpr auto Territorytype0 = 230;
+
+   public:
+      ClsArc005() : Sapphire::ScriptAPI::EventScript( 65607 ){}; 
+      ~ClsArc005(){}; 
+
+   void onTalk( uint32_t eventId, Entity::Player& player, uint64_t actorId ) override
+   {
+      auto pEventMgr = Common::Service< World::Manager::EventMgr >::ref();
+      auto actor = pEventMgr.mapEventActorToRealActor( static_cast<uint32_t>( actorId ) );
+
+      if( actor == Actor0 && !player.hasQuest( getId() ) )
+         Scene00000( player );
+      if( actor == Actor1 && player.getQuestSeq( getId() ) == Seq1 )
+         Scene00002( player );
+      if( actor == Actor2 && player.getQuestSeq( getId() ) == Seq2 )
+         Scene00003( player );
+      if( actor == Actor3 && player.getQuestSeq( getId() ) == Seq4 )
+         Scene00006( player );
+      if( actor == Actor0 && player.getQuestSeq( getId() ) == SeqFinish )
+         Scene00010( player );
+      //EOBJECTS
+      else if( actor == Eobject0 )
+         player.eventActionStart( getId(), 0x0A,
+                                  [ & ]( Entity::Player& player, uint32_t eventId, uint64_t additional )
+                                  {
+                                     Scene00004( player );
+                                     player.sendQuestMessage( getId(), 2, 2, 0, 0 );
+                                  },
+                                  nullptr, eventId );
+   }
+
+   private:
+
+   void Scene00000( Entity::Player& player )
+   {
+      player.playScene( getId(), 0, HIDE_HOTBAR,
+                        [ & ]( Entity::Player& player, const Event::SceneResult& result )
+                        {
+                          if( result.param2 == 1 )
+                          {
+                              Scene00001( player );
+                          }
+                        } );
+   }
+
+   void Scene00001( Entity::Player& player )
+   {
+      player.playScene( getId(), 1, HIDE_HOTBAR,
+                        [ & ]( Entity::Player& player, const Event::SceneResult& result )
+                        {
+                          player.updateQuest( getId(), Seq1 );
+                        } );
+   }
+
+   void Scene00002( Entity::Player& player )
+   {
+      player.playScene( getId(), 2, HIDE_HOTBAR,
+                        [ & ]( Entity::Player& player, const Event::SceneResult& result )
+                        {
+                          player.sendQuestMessage( getId(), 0, 2, 0, 0 );
+                          player.updateQuest( getId(), Seq2 );
+                        } );
+   }
+
+   void Scene00003( Entity::Player& player )
+   {
+      player.playScene( getId(), 3, HIDE_HOTBAR,
+                        [ & ]( Entity::Player& player, const Event::SceneResult& result )
+                        {
+                          player.sendQuestMessage( getId(), 1, 2, 0, 0 );
+                          player.updateQuest( getId(), Seq3 );
+                        } );
+   }
+
+   void Scene00004( Entity::Player& player )
+   {
+      player.playScene( getId(), 4, HIDE_HOTBAR,
+                        [ & ]( Entity::Player& player, const Event::SceneResult& result )
+                        {
+                          Scene00005( player );
+                        } );
+   }
+
+   void Scene00005( Entity::Player& player )
+   {
+      player.playScene( getId(), 5, SET_EOBJ_BASE | HIDE_HOTBAR | INVIS_EOBJ,
+                        [ & ]( Entity::Player& player, const Event::SceneResult& result )
+                        {
+                          player.updateQuest( getId(), Seq4 );
+                        } );
+   }
+
+   void Scene00006( Entity::Player& player )
+   {
+      player.playScene( getId(), 6, HIDE_HOTBAR,
+                        [ & ]( Entity::Player& player, const Event::SceneResult& result )
+                        {
+                          Scene00007( player );
+                        } );
+   }
+
+   void Scene00007( Entity::Player& player )
+   {
+      player.playScene( getId(), 7, HIDE_HOTBAR,
+                        [ & ]( Entity::Player& player, const Event::SceneResult& result )
+                        {
+                          if( result.param2 == 1 )
+                          {
+                              player.updateQuest( getId(), SeqFinish );
+                              // QuestBattle doesn't work
+                              /*auto& pTeriMgr = Common::Service< Sapphire::World::Manager::TerritoryMgr >::ref();
+
+                              player.eventFinish(result.eventId, 0);
+                              pTeriMgr.createAndJoinQuestBattle(player, Questbattle0);*/
+                          }
+                        } );
+   }
+
+   void Scene00008( Entity::Player& player )
+   {
+      player.playScene( getId(), 8, HIDE_HOTBAR,
+                        [ & ]( Entity::Player& player, const Event::SceneResult& result )
+                        {
+                        } );
+   }
+
+   void Scene00009( Entity::Player& player )
+   {
+      player.playScene( getId(), 9, HIDE_HOTBAR,
+                        [ & ]( Entity::Player& player, const Event::SceneResult& result )
+                        {
+                        } );
+   }
+
+   void Scene00010( Entity::Player& player )
+   {
+      player.playScene( getId(), 10, HIDE_HOTBAR,
+                        [ & ]( Entity::Player& player, const Event::SceneResult& result )
+                        {
+                          if( result.param2 == 1 )
+                          {
+                              if( player.giveQuestRewards( getId(), result.param3 ) )
+                              {
+                                player.finishQuest( getId() );
+                              }
+                          }
+                        } );
+   }
+};
+
+EXPOSE_SCRIPT(ClsArc005);
\ No newline at end of file

From 9aaa58dadad3e71b5a37e5db85c6efbe47305f77 Mon Sep 17 00:00:00 2001
From: DantestyleXD <null-fox@hotmail.it>
Date: Sat, 20 Jun 2020 03:25:22 +0200
Subject: [PATCH 330/351] [ Class Quest ] ClsArc006 is Fixed ( Will need a
 revision )

---
 .../quest/classquest/ARC/ClsArc006.cpp        | 265 ++++++++++++++++++
 1 file changed, 265 insertions(+)
 create mode 100644 src/scripts/quest/classquest/ARC/ClsArc006.cpp

diff --git a/src/scripts/quest/classquest/ARC/ClsArc006.cpp b/src/scripts/quest/classquest/ARC/ClsArc006.cpp
new file mode 100644
index 00000000..da055533
--- /dev/null
+++ b/src/scripts/quest/classquest/ARC/ClsArc006.cpp
@@ -0,0 +1,265 @@
+#include <Actor/Player.h>
+#include "Manager/EventMgr.h"
+#include <ScriptObject.h>
+#include <Service.h>
+
+using namespace Sapphire;
+
+// Quest Script: ClsArc006_00076
+// Quest Name: The One That Got Away
+// Quest ID: 65612
+// Start NPC: 1000200
+// End NPC: 1000200
+
+class ClsArc006 : public Sapphire::ScriptAPI::EventScript
+{
+   private:
+      // Basic quest information 
+      // Quest vars / flags used
+      // GetQuestBitFlag8
+      // GetQuestUI8AL
+
+      enum Sequence : uint8_t
+      {
+         Seq0 = 0,
+         Seq1 = 1,
+         Seq2 = 2,
+         SeqFinish = 255,
+      };
+
+      // Quest rewards 
+      static constexpr auto RewardExpFactor = 100;
+      static constexpr auto RewardAction = 113;
+      static constexpr auto RewardItem = 1915;
+      static constexpr auto RewardItemCount = 1;
+      uint16_t RewardItemOptional[5] = { 3100, 2753, 3597, 3827, 5825 };
+      uint16_t RewardItemOptionalCount[5] = { 1, 1, 1, 1, 3 };
+
+      // Entities found in the script data of the quest
+      static constexpr auto Actor0 = 1000200;
+      static constexpr auto Actor1 = 1000795;
+      static constexpr auto Actor2 = 1000796;
+      static constexpr auto Actor3 = 1000797;
+      static constexpr auto Actor4 = 1000798;
+      static constexpr auto Actor5 = 1000799;
+      static constexpr auto Actor6 = 1000800;
+      static constexpr auto Actor7 = 1003066; // silver
+      static constexpr auto Actor8 = 1003067; // lea
+      static constexpr auto Actor9 = 1003068; // pawah
+      static constexpr auto Eobject0 = 2001841;
+      static constexpr auto Eobject1 = 2000709;
+      static constexpr auto EventAction = 27;
+      static constexpr auto EventActionSearch = 1;
+      static constexpr auto EventMotZephyr = 366;
+      static constexpr auto LocAction0 = 995;
+      static constexpr auto LocActor0 = 1000199;
+      static constexpr auto LocActor1 = 1000204;
+      static constexpr auto LocVfx = 241;
+      static constexpr auto LocWs = 113;
+      static constexpr auto Questbattle0 = 2;
+      static constexpr auto Questbattle1 = 3;
+      static constexpr auto Seq0Actor0Lq = 98;
+      static constexpr auto Territorytype0 = 231;
+      static constexpr auto Territorytype1 = 236;
+
+   public:
+      ClsArc006() : Sapphire::ScriptAPI::EventScript( 65612 ){}; 
+      ~ClsArc006(){}; 
+
+   void onTalk( uint32_t eventId, Entity::Player& player, uint64_t actorId ) override
+   {
+      auto pEventMgr = Common::Service< World::Manager::EventMgr >::ref();
+      auto actor = pEventMgr.mapEventActorToRealActor( static_cast<uint32_t>( actorId ) );
+
+      if( actor == Actor0 && !player.hasQuest( getId() ) )
+         Scene00000( player );
+      if( actor == Actor1 && player.getQuestSeq( getId() ) == Seq1 )
+         Scene00002( player );
+      if( actor == Actor0 && player.getQuestSeq( getId() ) == SeqFinish )
+         Scene00013( player );
+      if( actor == Actor7 && player.getQuestSeq( getId() ) == SeqFinish )
+         Scene00014( player );
+      if( actor == Actor8 && player.getQuestSeq( getId() ) == SeqFinish )
+         Scene00015( player );
+      if( actor == Actor9 && player.getQuestSeq( getId() ) == SeqFinish )
+         Scene00016( player );
+      //EOBJECTS
+      else if( actor == Eobject1 )
+         player.eventActionStart( getId(), 0x1B,
+                                  [ & ]( Entity::Player& player, uint32_t eventId, uint64_t additional )
+                                  {
+                                     Scene00011( player );
+                                  },
+                                  nullptr, eventId );
+   }
+
+   private:
+
+   void Scene00000( Entity::Player& player )
+   {
+      player.playScene( getId(), 0, HIDE_HOTBAR,
+                        [ & ]( Entity::Player& player, const Event::SceneResult& result )
+                        {
+                          if( result.param2 == 1 )
+                          {
+                              Scene00001( player );
+                          }
+                        } );
+   }
+
+   void Scene00001( Entity::Player& player )
+   {
+      player.playScene( getId(), 1, SET_EOBJ_BASE | HIDE_HOTBAR | INVIS_EOBJ,
+                        [ & ]( Entity::Player& player, const Event::SceneResult& result )
+                        {
+                          player.updateQuest( getId(), Seq1 );
+                        } );
+   }
+
+   void Scene00002( Entity::Player& player )
+   {
+      player.playScene( getId(), 2, HIDE_HOTBAR,
+                        [ & ]( Entity::Player& player, const Event::SceneResult& result )
+                        {
+                          if( result.param2 == 1 )
+                          {
+                              player.updateQuest( getId(), Seq2 );
+                              // QuestBattle doesn't work
+                              /*auto& pTeriMgr = Common::Service< Sapphire::World::Manager::TerritoryMgr >::ref();
+
+                              player.eventFinish(result.eventId, 0);
+                              pTeriMgr.createAndJoinQuestBattle(player, Questbattle0);*/
+                          }
+                        } );
+   }
+
+   void Scene00003( Entity::Player& player )
+   {
+      player.playScene( getId(), 3, HIDE_HOTBAR,
+                        [ & ]( Entity::Player& player, const Event::SceneResult& result )
+                        {
+                        } );
+   }
+
+   void Scene00004( Entity::Player& player )
+   {
+      player.playScene( getId(), 4, HIDE_HOTBAR,
+                        [ & ]( Entity::Player& player, const Event::SceneResult& result )
+                        {
+                        } );
+   }
+
+   void Scene00005( Entity::Player& player )
+   {
+      player.playScene( getId(), 5, HIDE_HOTBAR,
+                        [ & ]( Entity::Player& player, const Event::SceneResult& result )
+                        {
+                        } );
+   }
+
+   void Scene00006( Entity::Player& player )
+   {
+      player.playScene( getId(), 6, HIDE_HOTBAR,
+                        [ & ]( Entity::Player& player, const Event::SceneResult& result )
+                        {
+                        } );
+   }
+
+   void Scene00007( Entity::Player& player )
+   {
+      player.playScene( getId(), 7, HIDE_HOTBAR,
+                        [ & ]( Entity::Player& player, const Event::SceneResult& result )
+                        {
+                        } );
+   }
+
+   void Scene00008( Entity::Player& player )
+   {
+      player.playScene( getId(), 8, HIDE_HOTBAR,
+                        [ & ]( Entity::Player& player, const Event::SceneResult& result )
+                        {
+                        } );
+   }
+
+   void Scene00009( Entity::Player& player )
+   {
+      player.playScene( getId(), 9, HIDE_HOTBAR,
+                        [ & ]( Entity::Player& player, const Event::SceneResult& result )
+                        {
+                        } );
+   }
+
+   void Scene00010( Entity::Player& player )
+   {
+      player.playScene( getId(), 10, HIDE_HOTBAR,
+                        [ & ]( Entity::Player& player, const Event::SceneResult& result )
+                        {
+                        } );
+   }
+
+   void Scene00011( Entity::Player& player )
+   {
+      player.playScene( getId(), 11, HIDE_HOTBAR,
+                        [ & ]( Entity::Player& player, const Event::SceneResult& result )
+                        {
+                          if( result.param2 == 1 )
+                          {
+                              player.updateQuest( getId(), SeqFinish );
+                              // QuestBattle doesn't work
+                              /*auto& pTeriMgr = Common::Service< Sapphire::World::Manager::TerritoryMgr >::ref();
+
+                              player.eventFinish(result.eventId, 0);
+                              pTeriMgr.createAndJoinQuestBattle(player, Questbattle1);*/
+                          }
+                        } );
+   }
+
+   void Scene00012( Entity::Player& player )
+   {
+      player.playScene( getId(), 12, HIDE_HOTBAR,
+                        [ & ]( Entity::Player& player, const Event::SceneResult& result )
+                        {
+                        } );
+   }
+
+   void Scene00013( Entity::Player& player )
+   {
+      player.playScene( getId(), 13, SET_EOBJ_BASE | HIDE_HOTBAR | INVIS_EOBJ,
+                        [ & ]( Entity::Player& player, const Event::SceneResult& result )
+                        {
+                          if( result.param2 == 1 )
+                          {
+                              if( player.giveQuestRewards( getId(), result.param3 ) )
+                              {
+                                player.finishQuest( getId() );
+                              }
+                          }
+                        } );
+   }
+
+   void Scene00014( Entity::Player& player )
+   {
+      player.playScene( getId(), 14, HIDE_HOTBAR,
+                        [ & ]( Entity::Player& player, const Event::SceneResult& result )
+                        {
+                        } );
+   }
+
+   void Scene00015( Entity::Player& player )
+   {
+      player.playScene( getId(), 15, HIDE_HOTBAR,
+                        [ & ]( Entity::Player& player, const Event::SceneResult& result )
+                        {
+                        } );
+   }
+
+   void Scene00016( Entity::Player& player )
+   {
+      player.playScene( getId(), 16, HIDE_HOTBAR,
+                        [ & ]( Entity::Player& player, const Event::SceneResult& result )
+                        {
+                        } );
+   }
+};
+
+EXPOSE_SCRIPT(ClsArc006);
\ No newline at end of file

From 7c396b90b5da45effc3e45f033337e23d2b88a4e Mon Sep 17 00:00:00 2001
From: pmgr <26606291+pmgr@users.noreply.github.com>
Date: Sun, 21 Jun 2020 00:13:27 +0100
Subject: [PATCH 331/351] Add PlaceFieldMarkerPreset ServerZoneIpc and struct

---
 src/common/Network/PacketDef/Ipcs.h           |  1 +
 .../Network/PacketDef/Zone/ServerZoneDef.h    | 25 +++++++++++++++++++
 2 files changed, 26 insertions(+)

diff --git a/src/common/Network/PacketDef/Ipcs.h b/src/common/Network/PacketDef/Ipcs.h
index ca042e79..f6dba912 100644
--- a/src/common/Network/PacketDef/Ipcs.h
+++ b/src/common/Network/PacketDef/Ipcs.h
@@ -336,6 +336,7 @@ namespace Sapphire::Network::Packets
     ClientTrigger = 0x017D, // updated 5.25
     DiscoveryHandler = 0x02C8, // updated 5.25
 
+    PlaceFieldMarkerPreset = 0x23F, // updated 5.25
     PlaceFieldMarker = 0x013C, // updated 5.0
     SkillHandler = 0x0241, // updated 5.25
     GMCommand1 = 0x01EC, // updated 5.25
diff --git a/src/common/Network/PacketDef/Zone/ServerZoneDef.h b/src/common/Network/PacketDef/Zone/ServerZoneDef.h
index d3eee984..cf00709c 100644
--- a/src/common/Network/PacketDef/Zone/ServerZoneDef.h
+++ b/src/common/Network/PacketDef/Zone/ServerZoneDef.h
@@ -1681,6 +1681,31 @@ namespace Sapphire::Network::Packets::Server
     uint8_t bitmask;
   };
 
+  /**
+   * Structural representation of the packet sent by the server
+   * to place/remove field marker presets
+   */
+  struct FFXIVIpcPlaceFieldMarkerPreset : FFXIVIpcBasePacket< PlaceFieldMarkerPreset >
+  {
+    enum FieldMarkerStatus
+    {
+      A = 0x1,
+      B = 0x2,
+      C = 0x4,
+      D = 0x8,
+      One = 0x10,
+      Two = 0x20,
+      Three = 0x40,
+      Four = 0x80
+    };
+    /*! which fieldmarks to show */
+    enum FieldMarkerStatus status;
+    /*! A coordinates would be (float)Xints[0]/1000.0, (float)Yints[0]/1000.0, (float)Zints[0]/1000.0 */
+    uint32_t Xints[8];
+    uint32_t Yints[8];
+    uint32_t Zints[8];
+  };
+
   /**
   * Structural representation of the packet sent by the server
   * to mount a player

From d9777084c55ac686f8027eaa09c7ad93f8c94f88 Mon Sep 17 00:00:00 2001
From: pmgr <26606291+pmgr@users.noreply.github.com>
Date: Sun, 21 Jun 2020 01:09:19 +0100
Subject: [PATCH 332/351] At demo's recommendation, stuffed FieldMarkerStatus
 in Common.h; also added the PlaceFieldMarker struct

---
 src/common/Common.h                           | 12 +++++++++
 src/common/Network/PacketDef/Ipcs.h           |  4 +--
 .../Network/PacketDef/Zone/ServerZoneDef.h    | 27 ++++++++++---------
 3 files changed, 29 insertions(+), 14 deletions(-)

diff --git a/src/common/Common.h b/src/common/Common.h
index 854f9d6f..14be767a 100644
--- a/src/common/Common.h
+++ b/src/common/Common.h
@@ -566,6 +566,18 @@ namespace Sapphire::Common
 
   };
 
+  enum FieldMarkerStatus : uint32_t
+  {
+    A = 0x1,
+    B = 0x2,
+    C = 0x4,
+    D = 0x8,
+    One = 0x10,
+    Two = 0x20,
+    Three = 0x40,
+    Four = 0x80
+  };
+
   enum struct ActionAspect : uint8_t
   {
     None = 0,   // Doesn't imply unaspected
diff --git a/src/common/Network/PacketDef/Ipcs.h b/src/common/Network/PacketDef/Ipcs.h
index f6dba912..9187be45 100644
--- a/src/common/Network/PacketDef/Ipcs.h
+++ b/src/common/Network/PacketDef/Ipcs.h
@@ -336,8 +336,8 @@ namespace Sapphire::Network::Packets
     ClientTrigger = 0x017D, // updated 5.25
     DiscoveryHandler = 0x02C8, // updated 5.25
 
-    PlaceFieldMarkerPreset = 0x23F, // updated 5.25
-    PlaceFieldMarker = 0x013C, // updated 5.0
+    PlaceFieldMarkerPreset = 0x023F, // updated 5.25
+    PlaceFieldMarker = 0x01BA, // updated 5.25
     SkillHandler = 0x0241, // updated 5.25
     GMCommand1 = 0x01EC, // updated 5.25
     GMCommand2 = 0x0368, // updated 5.25
diff --git a/src/common/Network/PacketDef/Zone/ServerZoneDef.h b/src/common/Network/PacketDef/Zone/ServerZoneDef.h
index cf00709c..6da042a6 100644
--- a/src/common/Network/PacketDef/Zone/ServerZoneDef.h
+++ b/src/common/Network/PacketDef/Zone/ServerZoneDef.h
@@ -1687,25 +1687,28 @@ namespace Sapphire::Network::Packets::Server
    */
   struct FFXIVIpcPlaceFieldMarkerPreset : FFXIVIpcBasePacket< PlaceFieldMarkerPreset >
   {
-    enum FieldMarkerStatus
-    {
-      A = 0x1,
-      B = 0x2,
-      C = 0x4,
-      D = 0x8,
-      One = 0x10,
-      Two = 0x20,
-      Three = 0x40,
-      Four = 0x80
-    };
     /*! which fieldmarks to show */
-    enum FieldMarkerStatus status;
+    Common::FieldMarkerStatus status;
     /*! A coordinates would be (float)Xints[0]/1000.0, (float)Yints[0]/1000.0, (float)Zints[0]/1000.0 */
     uint32_t Xints[8];
     uint32_t Yints[8];
     uint32_t Zints[8];
   };
 
+  /**
+   * Structural representation of the packet sent by the server
+   * to place/remove a field marker
+   */
+  struct FFXIVIpcPlaceFieldMarker : FFXIVIpcBasePacket< PlaceFieldMarker >
+  {
+    uint8_t markerId;
+    uint8_t status;
+    uint8_t pad[2];
+    uint32_t Xint;
+    uint32_t Yint;
+    uint32_t Zint;
+  };
+
   /**
   * Structural representation of the packet sent by the server
   * to mount a player

From 4ae5d6120dc35a25a5b3848473f3c1fbc0d6ed9a Mon Sep 17 00:00:00 2001
From: pmgr <26606291+pmgr@users.noreply.github.com>
Date: Sun, 21 Jun 2020 01:26:54 +0100
Subject: [PATCH 333/351] Convert markerId in FFXIVIpcPlaceFieldMarker into an
 enum

---
 src/common/Common.h                               | 12 ++++++++++++
 src/common/Network/PacketDef/Zone/ServerZoneDef.h |  2 +-
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/src/common/Common.h b/src/common/Common.h
index 14be767a..9c3b9bd3 100644
--- a/src/common/Common.h
+++ b/src/common/Common.h
@@ -577,6 +577,18 @@ namespace Sapphire::Common
     Three = 0x40,
     Four = 0x80
   };
+  // TODO: consolidate these two into one since FieldMarkerStatus == 1 << FieldMarkerId?
+  enum class FieldMarkerId : uint8_t
+  {
+    A,
+    B,
+    C,
+    D,
+    One,
+    Two,
+    Three,
+    Four
+  };
 
   enum struct ActionAspect : uint8_t
   {
diff --git a/src/common/Network/PacketDef/Zone/ServerZoneDef.h b/src/common/Network/PacketDef/Zone/ServerZoneDef.h
index 6da042a6..a60dad20 100644
--- a/src/common/Network/PacketDef/Zone/ServerZoneDef.h
+++ b/src/common/Network/PacketDef/Zone/ServerZoneDef.h
@@ -1701,7 +1701,7 @@ namespace Sapphire::Network::Packets::Server
    */
   struct FFXIVIpcPlaceFieldMarker : FFXIVIpcBasePacket< PlaceFieldMarker >
   {
-    uint8_t markerId;
+    Common::FieldMarkerId markerId;
     uint8_t status;
     uint8_t pad[2];
     uint32_t Xint;

From 570eb19b18d76b7ce9722bd1750a8cadc417f6e2 Mon Sep 17 00:00:00 2001
From: collett <collett0301@gmail.com>
Date: Sun, 21 Jun 2020 19:49:52 +0900
Subject: [PATCH 334/351] Add TradeMultipleReturnEventHander, seen in quests
 where the player trade more than 1 item to an npc.

---
 src/common/Network/PacketDef/Ipcs.h  | 1 +
 src/world/Network/GameConnection.cpp | 1 +
 2 files changed, 2 insertions(+)

diff --git a/src/common/Network/PacketDef/Ipcs.h b/src/common/Network/PacketDef/Ipcs.h
index 9187be45..254186fc 100644
--- a/src/common/Network/PacketDef/Ipcs.h
+++ b/src/common/Network/PacketDef/Ipcs.h
@@ -361,6 +361,7 @@ namespace Sapphire::Network::Packets
 
     ReturnEventHandler = 0x00BB, // updated 5.25
     TradeReturnEventHandler = 0x03B6, // updated 5.25
+    TradeMultipleReturnEventHander = 0x02B0, // updated 5.25
 
     LinkshellEventHandler = 0x016B, // updated 4.5
     LinkshellEventHandler1 = 0x016C, // updated 4.5
diff --git a/src/world/Network/GameConnection.cpp b/src/world/Network/GameConnection.cpp
index 0ea137f6..f8603f17 100644
--- a/src/world/Network/GameConnection.cpp
+++ b/src/world/Network/GameConnection.cpp
@@ -103,6 +103,7 @@ Sapphire::Network::GameConnection::GameConnection( Sapphire::Network::HivePtr pH
   setZoneHandler( ClientZoneIpcType::ReturnEventHandler, "EventHandlerReturn", &GameConnection::eventHandlerReturn );
   setZoneHandler( ClientZoneIpcType::TradeReturnEventHandler, "EventHandlerReturn",
                   &GameConnection::eventHandlerReturn );
+  setZoneHandler( ClientZoneIpcType::TradeMultipleReturnEventHander, "EventHandlerReturn", &GameConnection::eventHandlerReturn );
 
   setZoneHandler( ClientZoneIpcType::ShopEventHandler, "ShopEventHandler",
                   &GameConnection::eventHandlerShop );

From a95de16c4e416610300ef2d84add957aa1cd81d7 Mon Sep 17 00:00:00 2001
From: Caraxi <git@caraxian.com>
Date: Sat, 27 Jun 2020 18:41:59 +0930
Subject: [PATCH 335/351] Add RetainerInformation packet definition

---
 src/common/Network/PacketDef/Ipcs.h           |  1 +
 .../Network/PacketDef/Zone/ServerZoneDef.h    | 20 +++++++++++++++++++
 2 files changed, 21 insertions(+)

diff --git a/src/common/Network/PacketDef/Ipcs.h b/src/common/Network/PacketDef/Ipcs.h
index 254186fc..b212d056 100644
--- a/src/common/Network/PacketDef/Ipcs.h
+++ b/src/common/Network/PacketDef/Ipcs.h
@@ -165,6 +165,7 @@ namespace Sapphire::Network::Packets
 
     // nb: see #565 on github
     UpdateRetainerItemSalePrice = 0x019F, // updated 5.0
+    RetainerInformation = 0x0169, // updated 5.25
 
     SetLevelSync = 0x1186, // not updated for 4.4, not sure what it is anymore
 
diff --git a/src/common/Network/PacketDef/Zone/ServerZoneDef.h b/src/common/Network/PacketDef/Zone/ServerZoneDef.h
index a60dad20..d2b89684 100644
--- a/src/common/Network/PacketDef/Zone/ServerZoneDef.h
+++ b/src/common/Network/PacketDef/Zone/ServerZoneDef.h
@@ -2021,6 +2021,26 @@ namespace Sapphire::Network::Packets::Server
 
     char otherName[32];
   };
+  
+  struct FFXIVIpcRetainerInformation : FFXIVIpcBasePacket< RetainerInformation >
+  {
+    uint8_t unknown0[8];
+    uint32_t retainerId;
+    uint8_t unknown2[4];
+    uint8_t hireOrder;
+    uint8_t itemCount;
+    uint8_t unknown5[2];
+    uint32_t gil;
+    uint8_t sellingCount;
+    uint8_t cityId;
+    uint8_t classJob;
+    uint8_t level;
+    uint8_t unknown11[4];
+    uint32_t retainerTask;
+    uint32_t retainerTaskComplete;
+    uint8_t unknown14;
+    char retainerName[20];
+  };
 
   struct FFXIVIpcCharaVisualEffect : FFXIVIpcBasePacket< CharaVisualEffect >
   {

From ba046002f13724e4d48f51a4ad5ae49d0b7cafd1 Mon Sep 17 00:00:00 2001
From: Caraxi <git@caraxian.com>
Date: Sat, 27 Jun 2020 18:52:52 +0930
Subject: [PATCH 336/351] Wow that was stupid

---
 src/common/Network/PacketDef/Zone/ServerZoneDef.h | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/common/Network/PacketDef/Zone/ServerZoneDef.h b/src/common/Network/PacketDef/Zone/ServerZoneDef.h
index d2b89684..f941f744 100644
--- a/src/common/Network/PacketDef/Zone/ServerZoneDef.h
+++ b/src/common/Network/PacketDef/Zone/ServerZoneDef.h
@@ -2025,8 +2025,7 @@ namespace Sapphire::Network::Packets::Server
   struct FFXIVIpcRetainerInformation : FFXIVIpcBasePacket< RetainerInformation >
   {
     uint8_t unknown0[8];
-    uint32_t retainerId;
-    uint8_t unknown2[4];
+    uint64_t retainerId;
     uint8_t hireOrder;
     uint8_t itemCount;
     uint8_t unknown5[2];

From 5f99c481d1a8dea83502360cf168cecf7eedd5e5 Mon Sep 17 00:00:00 2001
From: DantestyleXD <null-fox@hotmail.it>
Date: Sun, 28 Jun 2020 01:33:19 +0200
Subject: [PATCH 337/351] move to a better folder

---
 src/scripts/quest/classquest/{ => LNC}/ClsLnc000.cpp | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename src/scripts/quest/classquest/{ => LNC}/ClsLnc000.cpp (100%)

diff --git a/src/scripts/quest/classquest/ClsLnc000.cpp b/src/scripts/quest/classquest/LNC/ClsLnc000.cpp
similarity index 100%
rename from src/scripts/quest/classquest/ClsLnc000.cpp
rename to src/scripts/quest/classquest/LNC/ClsLnc000.cpp

From d887ecdebe72cf04a879fa12985def4e026089f8 Mon Sep 17 00:00:00 2001
From: collett <collett0301@gmail.com>
Date: Sun, 28 Jun 2020 09:27:00 +0900
Subject: [PATCH 338/351] inventory fix

---
 src/world/Actor/Player.cpp          |  2 +-
 src/world/Actor/Player.h            |  8 ++++---
 src/world/Actor/PlayerInventory.cpp | 34 ++++++++++++++++++-----------
 src/world/Actor/PlayerSql.cpp       | 34 ++++++++++++++++++-----------
 4 files changed, 48 insertions(+), 30 deletions(-)

diff --git a/src/world/Actor/Player.cpp b/src/world/Actor/Player.cpp
index 2027633c..f64f6afc 100644
--- a/src/world/Actor/Player.cpp
+++ b/src/world/Actor/Player.cpp
@@ -1988,7 +1988,7 @@ void Sapphire::Entity::Player::dyeItemFromDyeingInfo()
   // TODO: subtract/remove dye used
 
   insertInventoryItem( static_cast< Sapphire::Common::InventoryType >( itemToDyeContainer ), static_cast< uint16_t >( itemToDyeSlot ), itemToDye );
-  writeItem( itemToDye );
+  updateItemDb( itemToDye );
 }
 
 void Sapphire::Entity::Player::resetObjSpawnIndex()
diff --git a/src/world/Actor/Player.h b/src/world/Actor/Player.h
index 32660358..41565b32 100644
--- a/src/world/Actor/Player.h
+++ b/src/world/Actor/Player.h
@@ -920,8 +920,6 @@ namespace Sapphire::Entity
     using InvSlotPair = std::pair< uint16_t, int8_t >;
     using InvSlotPairVec = std::vector< InvSlotPair >;
 
-    ItemPtr createItem( uint32_t catalogId, uint32_t quantity = 1 );
-
     bool loadInventory();
 
     InvSlotPairVec getSlotsOfItemsInInventory( uint32_t catalogId );
@@ -956,7 +954,11 @@ namespace Sapphire::Entity
 
     void writeInventory( Common::InventoryType type );
 
-    void writeItem( ItemPtr pItem ) const;
+    ItemPtr createTempItem( uint32_t catalogId, uint32_t quantity = 1 );
+
+    void updateItemDb( ItemPtr pItem ) const;
+
+    void writeItemDb( ItemPtr pItem ) const;
 
     void deleteItemDb( ItemPtr pItem ) const;
 
diff --git a/src/world/Actor/PlayerInventory.cpp b/src/world/Actor/PlayerInventory.cpp
index 9d5c3656..f94d0237 100644
--- a/src/world/Actor/PlayerInventory.cpp
+++ b/src/world/Actor/PlayerInventory.cpp
@@ -306,13 +306,13 @@ void Sapphire::Entity::Player::addCurrency( CurrencyType type, uint32_t amount,
   if( !currItem )
   {
     // TODO: map currency type to itemid
-    currItem = createItem( 1 );
+    currItem = createTempItem( 1 );
     m_storageMap[ Currency ]->setItem( slot, currItem );
   }
 
   uint32_t currentAmount = currItem->getStackSize();
   currItem->setStackSize( currentAmount + amount );
-  writeItem( currItem );
+  updateItemDb( currItem );
 
   updateContainer( Currency, slot, currItem );
 
@@ -352,7 +352,7 @@ void Sapphire::Entity::Player::removeCurrency( Common::CurrencyType type, uint32
     currItem->setStackSize( 0 );
   else
     currItem->setStackSize( currentAmount - amount );
-  writeItem( currItem );
+  updateItemDb( currItem );
 
   auto invUpdate = std::make_shared< UpdateInventorySlotPacket >( getId(),
                                                                     static_cast< uint8_t >( type ) - 1,
@@ -369,7 +369,7 @@ void Sapphire::Entity::Player::addCrystal( Common::CrystalType type, uint32_t am
   if( !currItem )
   {
     // TODO: map currency type to itemid
-    currItem = createItem( static_cast< uint8_t >( type ) + 1 );
+    currItem = createTempItem( static_cast< uint8_t >( type ) + 1 );
     m_storageMap[ Crystal ]->setItem( static_cast< uint8_t >( type ) - 1, currItem );
   }
 
@@ -377,7 +377,7 @@ void Sapphire::Entity::Player::addCrystal( Common::CrystalType type, uint32_t am
 
   currItem->setStackSize( currentAmount + amount );
 
-  writeItem( currItem );
+  updateItemDb( currItem );
 
   writeInventory( Crystal );
 
@@ -417,7 +417,7 @@ void Sapphire::Entity::Player::removeCrystal( Common::CrystalType type, uint32_t
   else
     currItem->setStackSize( currentAmount - amount );
 
-  writeItem( currItem );
+  updateItemDb( currItem );
 
   auto invUpdate = std::make_shared< UpdateInventorySlotPacket >( getId(),
                                                                     static_cast< uint8_t >( type ) - 1,
@@ -523,8 +523,11 @@ void Sapphire::Entity::Player::writeInventory( InventoryType type )
   db.execute( query );
 }
 
-void Sapphire::Entity::Player::writeItem( Sapphire::ItemPtr pItem ) const
+void Sapphire::Entity::Player::updateItemDb( Sapphire::ItemPtr pItem ) const
 {
+  if( pItem->getUId() == 0 )
+    writeItemDb( pItem );
+
   auto& db = Common::Service< Db::DbWorkerPool< Db::ZoneDbConnection > >::ref();
   auto stmt = db.getPreparedStatement( Db::CHARA_ITEMGLOBAL_UP );
 
@@ -540,6 +543,9 @@ void Sapphire::Entity::Player::writeItem( Sapphire::ItemPtr pItem ) const
 
 void Sapphire::Entity::Player::deleteItemDb( Sapphire::ItemPtr item ) const
 {
+  if( item->getUId() == 0 )
+    return;
+
   auto& db = Common::Service< Db::DbWorkerPool< Db::ZoneDbConnection > >::ref();
   auto stmt = db.getPreparedStatement( Db::CHARA_ITEMGLOBAL_DELETE );
 
@@ -619,7 +625,7 @@ Sapphire::ItemPtr Sapphire::Entity::Player::addItem( ItemPtr itemToAdd, bool sil
           itemToAdd->setStackSize( 0 );
 
         item->setStackSize( newStackSize );
-        writeItem( item );
+        updateItemDb( item );
 
         if( !silent )
         {
@@ -662,6 +668,8 @@ Sapphire::ItemPtr Sapphire::Entity::Player::addItem( ItemPtr itemToAdd, bool sil
   if( !foundFreeSlot )
     return nullptr;
 
+  writeItemDb( itemToAdd );
+
   auto storage = m_storageMap[ freeBagSlot.first ];
   storage->setItem( freeBagSlot.second, itemToAdd );
 
@@ -696,7 +704,7 @@ Sapphire::ItemPtr Sapphire::Entity::Player::addItem( uint32_t catalogId, uint32_
 {
   if( catalogId == 0 )
     return nullptr;
-  auto item = createItem( catalogId, quantity );
+  auto item = createTempItem( catalogId, quantity );
   item->setHq( isHq );
   return addItem( item, silent, canMerge, sendLootMessage );
 }
@@ -799,7 +807,7 @@ void Sapphire::Entity::Player::splitItem( uint16_t fromInventoryId, uint8_t from
   updateContainer( fromInventoryId, fromSlotId, fromItem );
   updateContainer( toInventoryId, toSlot, newItem );
 
-  writeItem( fromItem );
+  updateItemDb( fromItem );
 }
 
 void Sapphire::Entity::Player::mergeItem( uint16_t fromInventoryId, uint8_t fromSlotId,
@@ -826,14 +834,14 @@ void Sapphire::Entity::Player::mergeItem( uint16_t fromInventoryId, uint8_t from
   else
   {
     fromItem->setStackSize( stackOverflow );
-    writeItem( fromItem );
+    updateItemDb( fromItem );
+    updateContainer( fromInventoryId, fromSlotId, fromItem );
   }
 
 
   toItem->setStackSize( stackSize );
-  writeItem( toItem );
+  updateItemDb( toItem );
 
-  updateContainer( fromInventoryId, fromSlotId, fromItem );
   updateContainer( toInventoryId, toSlot, toItem );
 }
 
diff --git a/src/world/Actor/PlayerSql.cpp b/src/world/Actor/PlayerSql.cpp
index 69df7a54..b1f056f1 100644
--- a/src/world/Actor/PlayerSql.cpp
+++ b/src/world/Actor/PlayerSql.cpp
@@ -618,11 +618,9 @@ void Sapphire::Entity::Player::insertQuest( uint16_t questId, uint8_t index, uin
   db.execute( stmt );
 }
 
-Sapphire::ItemPtr Sapphire::Entity::Player::createItem( uint32_t catalogId, uint32_t quantity )
+Sapphire::ItemPtr Sapphire::Entity::Player::createTempItem( uint32_t catalogId, uint32_t quantity )
 {
   auto& exdData = Common::Service< Data::ExdDataGenerated >::ref();
-  auto& db = Common::Service< Db::DbWorkerPool< Db::ZoneDbConnection > >::ref();
-  auto& itemMgr = Common::Service< World::Manager::ItemMgr >::ref();
 
   auto itemInfo = exdData.get< Sapphire::Data::Item >( catalogId );
 
@@ -632,22 +630,32 @@ Sapphire::ItemPtr Sapphire::Entity::Player::createItem( uint32_t catalogId, uint
   if( !itemInfo )
     return nullptr;
 
-  uint8_t flags = 0;
-
-  ItemPtr pItem = make_Item( itemMgr.getNextUId(), catalogId );
+  ItemPtr pItem = make_Item( 0, catalogId );
 
   pItem->setStackSize( quantity );
 
-  db.execute( "INSERT INTO charaglobalitem ( CharacterId, itemId, catalogId, stack, flags ) VALUES ( " +
-               std::to_string( getId() ) + ", " +
-               std::to_string( pItem->getUId() ) + ", " +
-               std::to_string( pItem->getId() ) + ", " +
-               std::to_string( quantity ) + ", " +
-               std::to_string( flags ) + ");" );
-
   return pItem;
 }
 
+void Sapphire::Entity::Player::writeItemDb( Sapphire::ItemPtr pItem ) const
+{
+  if( pItem->getUId() == 0 )
+  {
+    auto& db = Common::Service< Db::DbWorkerPool< Db::ZoneDbConnection > >::ref();
+    auto& itemMgr = Common::Service< World::Manager::ItemMgr >::ref();
+
+    uint8_t flags = 0;
+    pItem->setUId( itemMgr.getNextUId() );
+    std::string sql = "INSERT INTO charaglobalitem ( CharacterId, itemId, catalogId, stack, flags ) VALUES ( " +
+                      std::to_string( getId() ) + ", " +
+                      std::to_string( pItem->getUId() ) + ", " +
+                      std::to_string( pItem->getId() ) + ", " +
+                      std::to_string( pItem->getStackSize() ) + ", " +
+                      std::to_string( flags ) + ");";
+    db.directExecute( sql );
+  }
+}
+
 bool Sapphire::Entity::Player::loadInventory()
 {
   auto& itemMgr = Common::Service< World::Manager::ItemMgr >::ref();

From acc2c18c95656a09b6b3985deff29eef08c18df5 Mon Sep 17 00:00:00 2001
From: DantestyleXD <null-fox@hotmail.it>
Date: Sun, 28 Jun 2020 03:19:22 +0200
Subject: [PATCH 339/351] [ Subquests ] SubFst002, SubFst008, SubFst011,
 SubFst014 adjust - SubFst008 and SubFst021 add

---
 .../quest/subquest/gridania/SubFst002.cpp     |   2 +-
 .../quest/subquest/gridania/SubFst007.cpp     | 134 ++++++++++++++++++
 .../quest/subquest/gridania/SubFst008.cpp     |  12 +-
 .../quest/subquest/gridania/SubFst011.cpp     |  15 +-
 .../quest/subquest/gridania/SubFst014.cpp     |  25 +---
 .../quest/subquest/gridania/SubFst021.cpp     | 112 +++++++++++++++
 6 files changed, 262 insertions(+), 38 deletions(-)
 create mode 100644 src/scripts/quest/subquest/gridania/SubFst007.cpp
 create mode 100644 src/scripts/quest/subquest/gridania/SubFst021.cpp

diff --git a/src/scripts/quest/subquest/gridania/SubFst002.cpp b/src/scripts/quest/subquest/gridania/SubFst002.cpp
index 1ed0fc15..7713deff 100644
--- a/src/scripts/quest/subquest/gridania/SubFst002.cpp
+++ b/src/scripts/quest/subquest/gridania/SubFst002.cpp
@@ -43,7 +43,7 @@ private:
     {
       if( result.param2 == 1 ) // finish quest
       {
-        if( player.giveQuestRewards( getId(), 0 ) )
+        if( player.giveQuestRewards( getId(), result.param3 ) )
           player.finishQuest( getId() );
       }
     };
diff --git a/src/scripts/quest/subquest/gridania/SubFst007.cpp b/src/scripts/quest/subquest/gridania/SubFst007.cpp
new file mode 100644
index 00000000..533e5d73
--- /dev/null
+++ b/src/scripts/quest/subquest/gridania/SubFst007.cpp
@@ -0,0 +1,134 @@
+#include <Actor/Player.h>
+#include "Manager/EventMgr.h"
+#include <ScriptObject.h>
+#include <Service.h>
+
+using namespace Sapphire;
+
+// Quest Script: SubFst007_00031
+// Quest Name: Essential Oil
+// Quest ID: 65567
+// Start NPC: 1000705
+// End NPC: 1000705
+
+class SubFst007 : public Sapphire::ScriptAPI::EventScript
+{
+   private:
+      // Basic quest information 
+      // Quest vars / flags used
+      // GetQuestUI8AL
+      // GetQuestUI8BH
+
+      // Steps in this quest ( 0 is before accepting, 
+      // 1 is first, 255 means ready for turning it in
+      enum Sequence : uint8_t
+      {
+         Seq0 = 0,
+         Seq1 = 1,
+         SeqFinish = 255,
+      };
+
+      // Quest rewards 
+      static constexpr auto RewardExpFactor = 100;
+      uint32_t RewardItemOptional[3] = { 3530, 3531, 5823 };
+      uint32_t RewardItemOptionalCount[3] = { 1, 1, 3 };
+
+      // Entities found in the script data of the quest
+      static constexpr auto Actor0 = 1000705;
+      static constexpr auto Enemy0 = 49;
+      static constexpr auto Item0 = 2000098;
+      static constexpr auto Seq0Actor0 = 0;
+      static constexpr auto Seq2Actor0 = 1;
+      static constexpr auto Seq2Actor0Npctradeno = 99;
+      static constexpr auto Seq2Actor0Npctradeok = 100;
+
+   public:
+      SubFst007() : Sapphire::ScriptAPI::EventScript( 65567 ){};
+      ~SubFst007(){}; 
+
+   //////////////////////////////////////////////////////////////////////
+   // Event Handlers
+   void onTalk( uint32_t eventId, Entity::Player& player, uint64_t actorId ) override
+   {
+     auto pEventMgr = Common::Service< World::Manager::EventMgr >::ref();
+     auto actor = pEventMgr.mapEventActorToRealActor( static_cast<uint32_t>( actorId ) );
+
+     if ( actor == Actor0 && !player.hasQuest( getId() ) )
+     {
+       Scene00000( player );
+     }
+     if ( actor == Actor0 && player.getQuestSeq( getId() ) == SeqFinish )
+     {
+       Scene00001( player );
+     }
+   }
+
+   void onBNpcKill( uint32_t npcId, Entity::Player& player )
+   {
+     if ( npcId != Enemy0 )
+       return;
+
+     auto currentKC = player.getQuestUI8AL( getId() );
+
+     if ( currentKC + 1 >= 6 )
+     {
+       player.setQuestUI8AL( getId(), currentKC + 1 );
+       player.setQuestUI8BH( getId(), currentKC + 1 );
+       player.sendQuestMessage( getId(), 0, 2, currentKC + 1, 6 );
+       player.updateQuest( getId(), SeqFinish );
+     }
+     else
+     {
+        player.sendQuestMessage( getId(), 0, 2, currentKC + 1, 6 );
+        player.setQuestUI8AL( getId(), currentKC + 1 );
+        player.setQuestUI8BH( getId(), currentKC + 1 );
+     }
+   }
+
+   private:
+   //////////////////////////////////////////////////////////////////////
+   // Available Scenes in this quest, not necessarly all are used
+   void Scene00000( Entity::Player& player )
+   {
+      player.playScene( getId(), 0, HIDE_HOTBAR,
+                        [&]( Entity::Player& player, const Event::SceneResult& result )
+                        {
+                          if( result.param2 == 1 )
+                            player.updateQuest( getId(), Seq1 );
+                        } );
+   }
+
+   void Scene00001( Entity::Player& player )
+   {
+      player.playScene( getId(), 1, HIDE_HOTBAR,
+                        [&]( Entity::Player& player, const Event::SceneResult& result )
+                        {
+                          result.param2 == 1 ? Scene00100( player ) : Scene00099( player );
+                        } );
+   }
+
+   void Scene00099( Entity::Player& player )
+   {
+      player.playScene( getId(), 99, HIDE_HOTBAR,
+                        [&]( Entity::Player& player, const Event::SceneResult& result )
+                        {
+                        } );
+   }
+
+   void Scene00100( Entity::Player& player )
+   {
+      player.playScene( getId(), 100, HIDE_HOTBAR,
+                        [&]( Entity::Player& player, const Event::SceneResult& result )
+                        {
+                          if ( result.param2 == 1 )
+                          {
+                            if ( player.giveQuestRewards( getId(), result.param3 ) )
+                            {
+                              player.finishQuest( getId() );
+                            }
+                          }
+                        } );
+   }
+};
+
+EXPOSE_SCRIPT(SubFst007);
\ No newline at end of file
diff --git a/src/scripts/quest/subquest/gridania/SubFst008.cpp b/src/scripts/quest/subquest/gridania/SubFst008.cpp
index 93bc374a..ad00c64c 100644
--- a/src/scripts/quest/subquest/gridania/SubFst008.cpp
+++ b/src/scripts/quest/subquest/gridania/SubFst008.cpp
@@ -93,6 +93,7 @@ private:
                       [ & ]( Entity::Player& player, const Event::SceneResult& result )
                       {
                         player.setQuestUI8BH( getId(), 1 );
+                        player.sendQuestMessage( getId(), 0, 0, 0, 0 );
                         player.updateQuest( getId(), SeqFinish );
                       } );
   }
@@ -102,14 +103,7 @@ private:
     player.playScene( getId(), 2, HIDE_HOTBAR,
                       [ & ]( Entity::Player& player, const Event::SceneResult& result )
                       {
-                        if( result.param2 == 1 )
-                        {
-                          Scene00100( player );
-                        }
-                        else
-                        {
-                          Scene00099( player );
-                        }
+                        result.param2 == 1 ? Scene00100( player ) :  Scene00099( player );
                       } );
   }
 
@@ -131,7 +125,7 @@ private:
                         {
                           if( player.giveQuestRewards( getId(), 0 ) )
                           {
-                            player.setQuestUI8BH( getId(), 0 );
+                            player.setQuestUI8BH( getId(), result.param3 );
                             player.finishQuest( getId() );
                           }
                         }
diff --git a/src/scripts/quest/subquest/gridania/SubFst011.cpp b/src/scripts/quest/subquest/gridania/SubFst011.cpp
index 42bb9db7..63c37934 100644
--- a/src/scripts/quest/subquest/gridania/SubFst011.cpp
+++ b/src/scripts/quest/subquest/gridania/SubFst011.cpp
@@ -11,8 +11,6 @@ using namespace Sapphire;
 // Start NPC: 1000195
 // End NPC: 1000195
 
-//NEED TEST KILLCREDIT
-
 class SubFst011 :
   public Sapphire::ScriptAPI::EventScript
 {
@@ -67,15 +65,12 @@ public:
     if( npcId != Enemy0 )
       return;
 
-    auto currentKC = player.getQuestUI8AL( getId() ) + 1;
+    auto currentKC = player.getQuestUI8AL( getId() );
+    player.setQuestUI8AL( getId(), currentKC + 1 );
+    player.sendQuestMessage( getId(), 0, 2, currentKC + 1, 6 );
 
-    if( currentKC >= 6 )
+    if( currentKC + 1 >= 6 )
       player.updateQuest( getId(), SeqFinish );
-    else
-    {
-      player.setQuestUI8AL( getId(), currentKC );
-      player.sendQuestMessage( getId(), 0, 2, currentKC, 6 );
-    }
   }
 
 private:
@@ -99,7 +94,7 @@ private:
                       {
                         if( result.param2 == 1 )
                         {
-                          if( player.giveQuestRewards( getId(), 0 ) )
+                          if( player.giveQuestRewards( getId(), result.param3 ) )
                           {
                             player.finishQuest( getId() );
                           }
diff --git a/src/scripts/quest/subquest/gridania/SubFst014.cpp b/src/scripts/quest/subquest/gridania/SubFst014.cpp
index 02908da6..8eff7725 100644
--- a/src/scripts/quest/subquest/gridania/SubFst014.cpp
+++ b/src/scripts/quest/subquest/gridania/SubFst014.cpp
@@ -63,7 +63,7 @@ public:
     {
       Scene00000( player );
     }
-    else if( actor == Actor0 )
+    else if( actor == Actor0 && player.getQuestSeq( getId() ) == SeqFinish ) 
     {
       Scene00007( player );
     }
@@ -131,15 +131,13 @@ private:
     auto currentCC = player.getQuestUI8AL( getId() );
 
     player.sendQuestMessage( getId(), 0, 2, currentCC + 1, 6 );
+    player.setQuestUI8AL( getId(), currentCC + 1 );
+    player.setQuestUI8BH( getId(), currentCC + 1 );
 
-    if( currentCC + 1 >= 6 )
+    if ( currentCC + 1 >= 6 )
     {
       player.updateQuest( getId(), SeqFinish );
     }
-    else
-    {
-      player.setQuestUI8AL( getId(), currentCC + 1 );
-    }
   }
 
   void Scene00000( Entity::Player& player )
@@ -211,14 +209,10 @@ private:
     player.playScene( getId(), 7, HIDE_HOTBAR,
                       [ & ]( Entity::Player& player, const Event::SceneResult& result )
                       {
-                        if( result.param2 == 1 )
+                        if ( result.param2 == 1 )
                         {
                           Scene00088( player );
                         }
-                        else
-                        {
-                          Scene00087( player );
-                        }
                       } );
   }
 
@@ -227,7 +221,6 @@ private:
     player.playScene( getId(), 87, HIDE_HOTBAR,
                       [ & ]( Entity::Player& player, const Event::SceneResult& result )
                       {
-                        player.playScene( getId(), 87, 0, 0, 0 );
                       } );
   }
 
@@ -236,13 +229,9 @@ private:
     player.playScene( getId(), 88, HIDE_HOTBAR,
                       [ & ]( Entity::Player& player, const Event::SceneResult& result )
                       {
-                        if( result.param2 == 1 )
+                        if ( player.giveQuestRewards( getId(), 0 ) )
                         {
-                          if( player.giveQuestRewards( getId(), 0 ) )
-                          {
-                            player.setQuestUI8AL( getId(), 0 );
-                            player.finishQuest( getId() );
-                          }
+                          player.finishQuest( getId() );
                         }
                       } );
   }
diff --git a/src/scripts/quest/subquest/gridania/SubFst021.cpp b/src/scripts/quest/subquest/gridania/SubFst021.cpp
new file mode 100644
index 00000000..eac5b435
--- /dev/null
+++ b/src/scripts/quest/subquest/gridania/SubFst021.cpp
@@ -0,0 +1,112 @@
+// This is an automatically generated C++ script template
+// Content needs to be added by hand to make it function
+// In order for this script to be loaded, move it to the correct folder in <root>/scripts/
+
+#include <Actor/Player.h>
+#include "Manager/EventMgr.h"
+#include <ScriptObject.h>
+#include <Service.h>
+
+// Quest Script: SubFst021_00095
+// Quest Name: Hematophagic Harassment
+// Quest ID: 65631
+// Start NPC: 1000640
+// End NPC: 1000640
+
+using namespace Sapphire;
+
+class SubFst021 : public Sapphire::ScriptAPI::EventScript
+{
+  private:
+    // Basic quest information 
+    // Quest vars / flags used
+    // GetQuestUI8AL
+
+    // Steps in this quest ( 0 is before accepting, 
+    // 1 is first, 255 means ready for turning it in
+    enum Sequence : uint8_t
+    {
+      Seq0 = 0,
+      Seq1 = 1,
+      SeqFinish = 255,
+    };
+
+    // Entities found in the script data of the quest
+    static constexpr auto Actor0 = 1000640;
+    static constexpr auto Enemy0 = 118; //136; <- WRONG INFO 
+
+  public:
+    SubFst021() : Sapphire::ScriptAPI::EventScript( 65631 ){}; 
+    ~SubFst021(){};
+
+  //////////////////////////////////////////////////////////////////////
+  // Event Handlers
+  void onTalk( uint32_t eventId, Entity::Player& player, uint64_t actorId ) override
+  {
+    auto& eventMgr = Common::Service< World::Manager::EventMgr >::ref();
+    auto actor = eventMgr.mapEventActorToRealActor( static_cast< uint32_t >( actorId ) );
+
+    if ( actor == Actor0 && !player.hasQuest( getId() ) )
+      Scene00000( player );
+    if ( actor == Actor0 && player.getQuestSeq( getId() ) == SeqFinish )
+      Scene00002( player );
+  }
+
+  void onBNpcKill( uint32_t npcId, Entity::Player& player ) override
+  {
+    if ( npcId != Enemy0 )
+      return;
+
+    auto credit = player.getQuestUI8AL( getId() );
+    if ( credit + 1 >= 6 )
+    {
+      player.setQuestUI8AL( getId(), credit + 1 );
+      player.sendQuestMessage( getId(), 0, 2, credit + 1, 6 );
+      player.updateQuest( getId(), SeqFinish );
+    }
+    else
+    {
+      player.setQuestUI8AL( getId(), credit + 1 );
+      player.sendQuestMessage( getId(), 0, 2, credit + 1, 6 );
+    }
+  }
+
+  private:
+  //////////////////////////////////////////////////////////////////////
+  // Available Scenes in this quest, not necessarly all are used
+  void Scene00000( Entity::Player& player )
+  {
+    player.playScene( getId(), 0, HIDE_HOTBAR,
+                      [&]( Entity::Player& player, const Event::SceneResult& result )
+                      {
+                        if ( result.param2 == 1 )
+                        {
+                          Scene00001( player );
+                        }
+                      } );
+  }
+
+  void Scene00001( Entity::Player& player )
+  {
+    player.playScene( getId(), 1, HIDE_HOTBAR,
+                      [&]( Entity::Player& player, const Event::SceneResult& result )
+                      {
+                        player.updateQuest( getId(), Seq1 );
+                      } );
+  }
+
+  void Scene00002( Entity::Player& player )
+  {
+    player.playScene( getId(), 2, HIDE_HOTBAR,
+                      [&]( Entity::Player& player, const Event::SceneResult& result )
+                      {
+                        if ( result.param2 == 1 )
+                          if ( player.giveQuestRewards( getId(), result.param3 ) )
+                          {
+                            player.finishQuest( getId() );
+                          }
+                      } );
+  }
+};
+
+EXPOSE_SCRIPT( SubFst021 );
\ No newline at end of file

From 535b9f55b7cc09074507292951c729fc2d1dfd33 Mon Sep 17 00:00:00 2001
From: DantestyleXD <null-fox@hotmail.it>
Date: Sun, 28 Jun 2020 03:23:22 +0200
Subject: [PATCH 340/351] [ Subquests ] SubFst026 and SubFst041 adjust

---
 .../quest/subquest/gridania/SubFst026.cpp     | 19 +++++++--------
 .../quest/subquest/gridania/SubFst041.cpp     | 24 +++++++++----------
 2 files changed, 20 insertions(+), 23 deletions(-)

diff --git a/src/scripts/quest/subquest/gridania/SubFst026.cpp b/src/scripts/quest/subquest/gridania/SubFst026.cpp
index 8351ea51..13a835e4 100644
--- a/src/scripts/quest/subquest/gridania/SubFst026.cpp
+++ b/src/scripts/quest/subquest/gridania/SubFst026.cpp
@@ -11,8 +11,6 @@ using namespace Sapphire;
 // Start NPC: 1000629
 // End NPC: 1000629
 
-//NEED TEST KILLCREDIT
-
 class SubFst026 :
   public Sapphire::ScriptAPI::EventScript
 {
@@ -55,28 +53,27 @@ public:
     auto actor = pEventMgr.mapEventActorToRealActor( static_cast< uint32_t >( actorId ) );
 
     if( actor == Actor0 && !player.hasQuest( getId() ) )
-    {
       Scene00000( player );
-    }
     else if( actor == Actor0 && player.getQuestSeq( getId() ) == SeqFinish )
-    {
       Scene00001( player );
-    }
   }
 
-  void onMobKill( Entity::Player& player, uint64_t npcId )
+  void onBNpcKill( uint32_t npcId, Entity::Player& player ) override
   {
     if( npcId != Enemy0 )
       return;
 
-    auto currentKC = player.getQuestUI8AL( getId() ) + 1;
+    auto currentKC = player.getQuestUI8AL( getId() );
 
-    if( currentKC >= 6 )
+    if ( currentKC + 1 >= 6 )
+    {
+      player.sendQuestMessage( getId(), 0, 2, currentKC + 1, 6 );
       player.updateQuest( getId(), SeqFinish );
+    }
     else
     {
-      player.setQuestUI8AL( getId(), currentKC );
-      player.sendQuestMessage( getId(), 0, 2, currentKC, 6 );
+      player.setQuestUI8AL( getId(), currentKC + 1 );
+      player.sendQuestMessage( getId(), 0, 2, currentKC + 1, 6 );
     }
   }
 
diff --git a/src/scripts/quest/subquest/gridania/SubFst041.cpp b/src/scripts/quest/subquest/gridania/SubFst041.cpp
index 8c3512e4..4cede8e6 100644
--- a/src/scripts/quest/subquest/gridania/SubFst041.cpp
+++ b/src/scripts/quest/subquest/gridania/SubFst041.cpp
@@ -11,8 +11,6 @@ using namespace Sapphire;
 // Start NPC: 1000432
 // End NPC: 1000411
 
-//NEED TEST KILLCREDIT
-
 class SubFst041 :
   public Sapphire::ScriptAPI::EventScript
 {
@@ -38,7 +36,7 @@ private:
   // Entities found in the script data of the quest
   static constexpr auto Actor0 = 1000432;
   static constexpr auto Actor1 = 1000411;
-  static constexpr auto Enemy0 = 159;
+  static constexpr auto Enemy0 = 197;  //159; WRONG INFO
   static constexpr auto Item0 = 2000142;
   static constexpr auto Seq0Actor0 = 0;
   static constexpr auto Seq2Actor1 = 1;
@@ -61,28 +59,30 @@ public:
     auto actor = pEventMgr.mapEventActorToRealActor( static_cast< uint32_t >( actorId ) );
 
     if( actor == Actor0 )
-    {
       Scene00000( player );
-    }
     if( actor == Actor1 )
-    {
       Scene00001( player );
-    }
   }
 
-  void onMobKill( Entity::Player& player, uint64_t npcId )
+  void onBNpcKill( uint32_t npcId, Entity::Player& player ) override
   {
     if( npcId != Enemy0 )
       return;
 
-    auto currentKC = player.getQuestUI8BH( getId() ) + 1;
+    auto currentKC = player.getQuestUI8BH( getId() );
 
-    if( currentKC >= 6 )
+    if ( currentKC + 1 >= 4 )
+    {
+      player.setQuestUI8AL( getId(), currentKC + 1 );
+      player.setQuestUI8BH( getId(), currentKC + 1 );
+      player.sendQuestMessage( getId(), 1, 0, 0, 0 );
       player.updateQuest( getId(), SeqFinish );
+    }
     else
     {
-      player.setQuestUI8BH( getId(), currentKC );
-      player.sendQuestMessage( getId(), 0, 2, currentKC, 6 );
+      player.setQuestUI8AL( getId(), currentKC + 1 );
+      player.setQuestUI8BH( getId(), currentKC + 1 );
+      player.sendQuestMessage( getId(), 0, 2, currentKC + 1, 4 );
     }
   }
 

From 7f7e2fa00503d9ac5e3005394bf8fa9ca6685767 Mon Sep 17 00:00:00 2001
From: DantestyleXD <null-fox@hotmail.it>
Date: Sun, 28 Jun 2020 03:52:45 +0200
Subject: [PATCH 341/351] [ Subquests ] SubFst025, SubFst037, SubFst042,
 SubFst043, SubFst046, SubFst048 added

---
 .../quest/subquest/gridania/SubFst025.cpp     | 134 +++++++++++++
 .../quest/subquest/gridania/SubFst037.cpp     | 146 ++++++++++++++
 .../quest/subquest/gridania/SubFst042.cpp     | 100 ++++++++++
 .../quest/subquest/gridania/SubFst043.cpp     | 184 ++++++++++++++++++
 .../quest/subquest/gridania/SubFst046.cpp     | 150 ++++++++++++++
 .../quest/subquest/gridania/SubFst048.cpp     | 144 ++++++++++++++
 6 files changed, 858 insertions(+)
 create mode 100644 src/scripts/quest/subquest/gridania/SubFst025.cpp
 create mode 100644 src/scripts/quest/subquest/gridania/SubFst037.cpp
 create mode 100644 src/scripts/quest/subquest/gridania/SubFst042.cpp
 create mode 100644 src/scripts/quest/subquest/gridania/SubFst043.cpp
 create mode 100644 src/scripts/quest/subquest/gridania/SubFst046.cpp
 create mode 100644 src/scripts/quest/subquest/gridania/SubFst048.cpp

diff --git a/src/scripts/quest/subquest/gridania/SubFst025.cpp b/src/scripts/quest/subquest/gridania/SubFst025.cpp
new file mode 100644
index 00000000..9c4176c9
--- /dev/null
+++ b/src/scripts/quest/subquest/gridania/SubFst025.cpp
@@ -0,0 +1,134 @@
+// This is an automatically generated C++ script template
+// Content needs to be added by hand to make it function
+// In order for this script to be loaded, move it to the correct folder in <root>/scripts/
+
+#include <Actor/Player.h>
+#include "Manager/EventMgr.h"
+#include <ScriptObject.h>
+#include <Service.h>
+
+// Quest Script: SubFst025_00103
+// Quest Name: Death to the Bean Thieves
+// Quest ID: 65639
+// Start NPC: 1000627
+// End NPC: 1000656
+
+using namespace Sapphire;
+
+class SubFst025 : public Sapphire::ScriptAPI::EventScript
+{
+  private:
+    // Basic quest information 
+    // Quest vars / flags used
+    // GetQuestUI8AL
+    // GetQuestUI8BH
+
+    // Steps in this quest ( 0 is before accepting, 
+    // 1 is first, 255 means ready for turning it in
+    enum Sequence : uint8_t
+    {
+      Seq0 = 0,
+      Seq1 = 1,
+      SeqFinish = 255,
+    };
+
+    // Entities found in the script data of the quest
+    static constexpr auto Actor0 = 1000627;
+    static constexpr auto Actor1 = 1000656;
+    static constexpr auto Enemy0 = 5;
+    static constexpr auto Item0 = 2000075;
+
+  public:
+    SubFst025() : Sapphire::ScriptAPI::EventScript( 65639 ){}; 
+    ~SubFst025() {};
+
+  //////////////////////////////////////////////////////////////////////
+  // Event Handlers
+  void onTalk( uint32_t eventId, Entity::Player& player, uint64_t actorId ) override
+  {
+    auto& eventMgr = Common::Service< World::Manager::EventMgr >::ref();
+    auto actor = eventMgr.mapEventActorToRealActor( static_cast< uint32_t >( actorId ) );
+
+    if ( actor == Actor0 && !player.hasQuest( getId() ) )
+      Scene00000( player );
+    if ( actor == Actor1 && player.getQuestSeq( getId() ) == SeqFinish )
+      Scene00002( player );
+  }
+
+  void onBNpcKill( uint32_t npcId, Entity::Player& player ) override
+  {
+    if ( npcId != Enemy0 )
+      return;
+
+    auto credit = player.getQuestUI8AL( getId() );
+    
+    if ( credit + 1 >= 6 )
+    {
+      player.sendQuestMessage( getId(), 0, 2, credit + 1, 6 );
+      player.setQuestUI8BH( getId(), credit + 1 );
+      player.updateQuest( getId(), SeqFinish );
+    }
+    else
+    {
+      player.setQuestUI8AL( getId(), credit + 1 );
+      player.setQuestUI8BH( getId(), credit + 1 );
+      player.sendQuestMessage( getId(), 0, 2, credit + 1, 6 );
+    }
+
+  }
+
+  private:
+  //////////////////////////////////////////////////////////////////////
+  // Available Scenes in this quest, not necessarly all are used
+  void Scene00000( Entity::Player& player )
+  {
+    player.playScene( getId(), 0, HIDE_HOTBAR,
+                      [&]( Entity::Player& player, const Event::SceneResult& result )
+                      {
+                        if ( result.param2 == 1 )
+                          Scene00001( player );
+                      } );
+  }
+
+  void Scene00001( Entity::Player& player )
+  {
+    player.playScene( getId(), 1, HIDE_HOTBAR,
+                      [&]( Entity::Player& player, const Event::SceneResult& result )
+                      {
+                        player.updateQuest( getId(), Seq1 );
+                      } );
+  }
+
+  void Scene00002( Entity::Player& player )
+  {
+    player.playScene( getId(), 2, HIDE_HOTBAR,
+                      [&]( Entity::Player& player, const Event::SceneResult& result )
+                      {
+                        if ( result.param2 == 1 )
+                          Scene00003( player );
+                      } );
+  }
+
+  void Scene00003( Entity::Player& player )
+  {
+    player.playScene( getId(), 3, HIDE_HOTBAR,
+                      [&]( Entity::Player& player, const Event::SceneResult& result )
+                      {
+                        if ( result.param2 == 1 )
+                          if ( player.giveQuestRewards( getId(), result.param3 ) )
+                          {
+                            player.finishQuest( getId() );
+                          }
+                      } );
+  }
+
+  void Scene00004( Entity::Player& player )
+  {
+    player.playScene( getId(), 4, HIDE_HOTBAR,
+                      [&]( Entity::Player& player, const Event::SceneResult& result )
+                      {
+                      } );
+  }
+};
+
+EXPOSE_SCRIPT( SubFst025 );
\ No newline at end of file
diff --git a/src/scripts/quest/subquest/gridania/SubFst037.cpp b/src/scripts/quest/subquest/gridania/SubFst037.cpp
new file mode 100644
index 00000000..73ca87cb
--- /dev/null
+++ b/src/scripts/quest/subquest/gridania/SubFst037.cpp
@@ -0,0 +1,146 @@
+// This is an automatically generated C++ script template
+// Content needs to be added by hand to make it function
+// In order for this script to be loaded, move it to the correct folder in <root>/scripts/
+
+#include <Actor/Player.h>
+#include "Manager/EventMgr.h"
+#include <ScriptObject.h>
+#include <Service.h>
+
+// Quest Script: SubFst037_00174
+// Quest Name: No Quarter Given
+// Quest ID: 65710
+// Start NPC: 1000612
+// End NPC: 1000612
+
+using namespace Sapphire;
+
+class SubFst037 : public Sapphire::ScriptAPI::EventScript
+{
+  private:
+    // Basic quest information 
+    // Quest vars / flags used
+    // GetQuestUI8AL
+    // GetQuestUI8BH
+    // GetQuestUI8BL
+
+    // Steps in this quest ( 0 is before accepting, 
+    // 1 is first, 255 means ready for turning it in
+    enum Sequence : uint8_t
+    {
+      Seq0 = 0,
+      Seq1 = 1,
+      SeqFinish = 255,
+    };
+
+    // Entities found in the script data of the quest
+    static constexpr auto Actor0 = 1000612;
+    static constexpr auto Enemy0 = 192;   //743; <- WRONG INFO
+    static constexpr auto Enemy1 = 193;   //744; <- WRONG INFO
+    static constexpr auto Enemy2 = 194;   //745; <- WRONG INFO
+
+  public:
+    SubFst037() : Sapphire::ScriptAPI::EventScript( 65710 ){}; 
+    ~SubFst037() {};
+
+  //////////////////////////////////////////////////////////////////////
+  // Event Handlers
+  void onTalk( uint32_t eventId, Entity::Player& player, uint64_t actorId ) override
+  {
+    auto& eventMgr = Common::Service< World::Manager::EventMgr >::ref();
+    auto actor = eventMgr.mapEventActorToRealActor( static_cast< uint32_t >( actorId ) );
+
+    if ( actor == Actor0 && !player.hasQuest( getId() ) )
+      Scene00000( player );
+    if ( actor == Actor0 && player.getQuestSeq( getId() ) == SeqFinish )
+      Scene00002( player );
+  }
+
+  void onBNpcKill( uint32_t npcId, Entity::Player& player ) override
+  {
+    auto credit = 0;
+
+    switch( npcId )
+    {
+      case Enemy0:
+      {
+        credit = player.getQuestUI8AL( getId() );
+
+        player.setQuestUI8AL( getId() , credit + 1 );
+        if( credit + 1 <= 2 )
+          player.sendQuestMessage( getId() , 0, 2, credit + 1, 2 );
+
+        break;
+      }
+      case Enemy1:
+      {
+        credit = player.getQuestUI8BH( getId() );
+
+        player.setQuestUI8BH( getId() , credit + 1 );
+        if ( credit + 1 <= 2 )
+          player.sendQuestMessage( getId() , 1, 2, credit + 1, 2 );
+
+        break;
+      }
+      case Enemy2:
+      {
+        credit = player.getQuestUI8BL( getId() );
+
+        player.setQuestUI8BL( getId() , credit + 1 );
+        if ( credit + 1 <= 2 )
+          player.sendQuestMessage( getId() , 2, 2, credit + 1, 2 );
+
+        break;
+      }
+    }
+
+    checkQuestCompletion( player );
+  }
+
+  void checkQuestCompletion( Entity::Player& player )
+  {
+    auto credit192 = player.getQuestUI8AL( getId() );
+    auto credit193 = player.getQuestUI8BH( getId() );
+    auto credit194 = player.getQuestUI8BL( getId() );
+
+    if ( credit192 >= 2 && credit193 >= 2 && credit194 >= 2 )
+      player.updateQuest( getId() , SeqFinish );
+  }
+
+  private:
+  //////////////////////////////////////////////////////////////////////
+  // Available Scenes in this quest, not necessarly all are used
+  void Scene00000( Entity::Player& player )
+  {
+    player.playScene( getId(), 0, HIDE_HOTBAR,
+                      [&]( Entity::Player& player, const Event::SceneResult& result )
+                      {
+                        if ( result.param2 == 1 )
+                          Scene00001( player );
+                      } );
+  }
+
+  void Scene00001( Entity::Player& player )
+  {
+    player.playScene( getId(), 1, HIDE_HOTBAR,
+                      [&]( Entity::Player& player, const Event::SceneResult& result )
+                      {
+                        player.updateQuest( getId() , Seq1 );
+                      } );
+  }
+
+  void Scene00002( Entity::Player& player )
+  {
+    player.playScene( getId(), 2, HIDE_HOTBAR,
+                      [&]( Entity::Player& player, const Event::SceneResult& result )
+                      {
+                        if( result.param2 == 1 )
+                          if ( player.giveQuestRewards( getId() , result.param3 ) )
+                          {
+                            player.finishQuest( getId() );
+                          }
+                      } );
+  }
+};
+
+EXPOSE_SCRIPT( SubFst037 );
\ No newline at end of file
diff --git a/src/scripts/quest/subquest/gridania/SubFst042.cpp b/src/scripts/quest/subquest/gridania/SubFst042.cpp
new file mode 100644
index 00000000..d8883f36
--- /dev/null
+++ b/src/scripts/quest/subquest/gridania/SubFst042.cpp
@@ -0,0 +1,100 @@
+#include <Actor/Player.h>
+#include <Manager/EventMgr.h>
+#include <ScriptObject.h>
+#include <Service.h>
+
+using namespace Sapphire;
+
+// Quest Script: SubFst042_00198
+// Quest Name: Butcher of Greentear
+// Quest ID: 65734
+// Start NPC: 1000685
+// End NPC: 1000685
+
+class SubFst042 : public Sapphire::ScriptAPI::EventScript
+{
+private:
+  // Basic quest information 
+  // Quest vars / flags used
+  // GetQuestUI8AL
+
+  enum Sequence : uint8_t
+  {
+    Seq0 = 0,
+    Seq1 = 1,
+    SeqFinish = 255,
+  };
+
+  // Quest rewards 
+  static constexpr auto RewardExpFactor = 200;
+  uint32_t RewardItemOptional[3] = { 4092, 4091, 5824 };
+  uint32_t RewardItemOptionalCount[3] = { 1, 1, 1 };
+
+  // Entities found in the script data of the quest
+  static constexpr auto Actor0 = 1000685;
+  static constexpr auto Enemy0 = 14;
+  static constexpr auto Seq0Actor0 = 0;
+  static constexpr auto Seq2Actor0 = 1;
+
+public:
+  SubFst042() : Sapphire::ScriptAPI::EventScript( 65734 ){};
+  ~SubFst042(){};
+
+  void onTalk( uint32_t eventId, Entity::Player& player, uint64_t actorId ) override
+  {
+    auto& pEventMgr = Common::Service< World::Manager::EventMgr >::ref();
+    auto actor = pEventMgr.mapEventActorToRealActor( static_cast<uint32_t>( actorId ) );
+
+    if ( actor == Actor0 && !player.hasQuest( getId() ) )
+    {
+      Scene00000( player );
+    }
+    else if ( actor == Actor0 && player.getQuestSeq( getId() ) == SeqFinish )
+    {
+      Scene00001( player );
+    }
+  }
+
+  void onBNpcKill( uint32_t npcId, Entity::Player& player ) override
+  {
+    if ( npcId != Enemy0 )
+      return;
+
+    auto currentKC = player.getQuestUI8AL( getId() ) + 1;
+
+    if ( currentKC >= 6 )
+      player.updateQuest( getId(), SeqFinish );
+    else
+    {
+      player.setQuestUI8AL( getId(), currentKC );
+      player.sendQuestMessage( getId(), 0, 2, currentKC, 6 );
+    }
+  }
+
+private:
+
+  void Scene00000( Entity::Player& player )
+  {
+    player.playScene( getId(), 0, HIDE_HOTBAR,
+                      [&]( Entity::Player& player, const Event::SceneResult& result )
+                      {
+                        if ( result.param2 == 1 )
+                          player.updateQuest( getId(), 1 );
+                      } );
+  }
+
+  void Scene00001( Entity::Player& player )
+  {
+    player.playScene( getId(), 0, HIDE_HOTBAR,
+                      [&]( Entity::Player& player, const Event::SceneResult& result )
+                      {
+                        if ( result.param2 == 1 )
+                        {
+                          if ( player.giveQuestRewards( getId(), 0 ) )
+                            player.finishQuest( getId() );
+                        }
+                      } );
+  }
+};
+
+EXPOSE_SCRIPT( SubFst042 );
\ No newline at end of file
diff --git a/src/scripts/quest/subquest/gridania/SubFst043.cpp b/src/scripts/quest/subquest/gridania/SubFst043.cpp
new file mode 100644
index 00000000..c48c0736
--- /dev/null
+++ b/src/scripts/quest/subquest/gridania/SubFst043.cpp
@@ -0,0 +1,184 @@
+// This is an automatically generated C++ script template
+// Content needs to be added by hand to make it function
+// In order for this script to be loaded, move it to the correct folder in <root>/scripts/
+
+#include <Actor/Player.h>
+#include "Manager/EventMgr.h"
+#include <ScriptObject.h>
+#include <Service.h>
+
+// Quest Script: SubFst043_00199
+// Quest Name: A Clear Sign
+// Quest ID: 65735
+// Start NPC: 1000172
+// End NPC: 1000627
+
+using namespace Sapphire;
+
+class SubFst043 : public Sapphire::ScriptAPI::EventScript
+{
+  private:
+    // Basic quest information 
+    // Quest vars / flags used
+    // GetQuestBitFlag8
+    // GetQuestUI8AL
+
+    // Steps in this quest ( 0 is before accepting, 
+    // 1 is first, 255 means ready for turning it in
+    enum Sequence : uint8_t
+    {
+      Seq0 = 0,
+      Seq1 = 1,
+      SeqFinish = 255,
+    };
+
+    // Entities found in the script data of the quest
+    static constexpr auto Actor0 = 1000172;
+    static constexpr auto Actor1 = 1000627;
+    static constexpr auto Eobject0 = 2000143;
+    static constexpr auto Eobject1 = 2000144;
+    static constexpr auto EventActionProcessMiddle = 16;
+    static constexpr auto Seq0Actor0 = 0;
+    static constexpr auto Seq1Eobject0 = 1;
+    static constexpr auto Seq1Eobject0Eventactionno = 99;
+    static constexpr auto Seq1Eobject0Eventactionok = 100;
+    static constexpr auto Seq1Eobject1 = 2;
+    static constexpr auto Seq1Eobject1Eventactionno = 97;
+    static constexpr auto Seq1Eobject1Eventactionok = 98;
+    static constexpr auto Seq2Actor1 = 3;
+
+  public:
+    SubFst043() : Sapphire::ScriptAPI::EventScript( 65735 ){}; 
+    ~SubFst043() {};
+
+  //////////////////////////////////////////////////////////////////////
+  // Event Handlers
+  void onTalk( uint32_t eventId, Entity::Player& player, uint64_t actorId ) override
+  {
+    auto& eventMgr = Common::Service< World::Manager::EventMgr >::ref();
+    auto actor = eventMgr.mapEventActorToRealActor( static_cast< uint32_t >( actorId ) );
+
+    if ( actor == Actor0 )
+      Scene00000( player );
+    else if (actor == Actor1 && player.getQuestSeq( getId() ) == SeqFinish )
+      Scene00003( player );
+    else if ( actor == Eobject0 )
+      player.eventActionStart( getId(), EventActionProcessMiddle,
+                               [&]( Entity::Player& player, uint32_t eventId, uint64_t additional )
+                               {
+                                 Scene00001( player );
+                               },
+                                   nullptr, eventId );
+    else if ( actor == Eobject1 )
+      player.eventActionStart( getId(), EventActionProcessMiddle,
+                               [&]( Entity::Player& player, uint32_t eventId, uint64_t additional )
+                               {
+                                 Scene00002( player );
+                               },
+                                   nullptr, eventId );
+  }
+
+  void checkQuestCompletion( Entity::Player& player )
+  {
+    auto credit = player.getQuestUI8AL( getId() );
+
+    if ( credit + 1 >= 2 )
+    {
+      player.setQuestUI8AL( getId(), credit + 1 );
+      player.sendQuestMessage( getId(), 0, 2, credit + 1, 2 );
+      player.updateQuest( getId(), SeqFinish );
+    }
+    else
+    {
+      player.setQuestUI8AL( getId(), credit + 1 );
+      player.sendQuestMessage( getId(), 0, 2, credit + 1, 2 );
+    }
+  }
+
+  private:
+  //////////////////////////////////////////////////////////////////////
+  // Available Scenes in this quest, not necessarly all are used
+  void Scene00000( Entity::Player& player )
+  {
+    player.playScene( getId(), 0, HIDE_HOTBAR,
+                      [&]( Entity::Player& player, const Event::SceneResult& result )
+                      {
+                        if ( result.param2 == 1 )
+                        {
+                          player.updateQuest( getId(), Seq1 );
+                        }
+                      } );
+  }
+
+  void Scene00001( Entity::Player& player )
+  {
+    player.playScene( getId(), 1, HIDE_HOTBAR,
+                      [&]( Entity::Player& player, const Event::SceneResult& result )
+                      {
+                        Scene00100( player );
+                      } );
+  }
+
+  void Scene00002( Entity::Player& player )
+  {
+    player.playScene( getId(), 2, HIDE_HOTBAR,
+                      [&]( Entity::Player& player, const Event::SceneResult& result )
+                      {
+                        Scene00098( player );
+                      } );
+  }
+
+  void Scene00003( Entity::Player& player )
+  {
+    player.playScene( getId(), 3, HIDE_HOTBAR,
+                      [&]( Entity::Player& player, const Event::SceneResult& result )
+                      {
+                        if ( result.param2 == 1 )
+                        {
+                          if ( player.giveQuestRewards( getId(), 0 ) )
+                          {
+                            player.setQuestUI8BH( getId(), 0 );
+                            player.finishQuest( getId() );
+                          }
+                        }
+                      });
+  }
+
+  void Scene00097( Entity::Player& player )
+  {
+    player.playScene( getId(), 97, HIDE_HOTBAR,
+                      [&]( Entity::Player& player, const Event::SceneResult& result )
+                      {
+                      } );
+  }
+
+  void Scene00098( Entity::Player& player )
+  {
+    player.playScene( getId(), 98, HIDE_HOTBAR,
+                      [&]( Entity::Player& player, const Event::SceneResult& result )
+                      {
+                        checkQuestCompletion( player );
+                        player.setQuestBitFlag8( getId(), 2, true );
+                      } );
+  }
+
+  void Scene00099( Entity::Player& player )
+  {
+    player.playScene( getId(), 99, HIDE_HOTBAR,
+                      [&]( Entity::Player& player, const Event::SceneResult& result )
+                      {
+                      } );
+  }
+
+  void Scene00100( Entity::Player& player )
+  {
+    player.playScene( getId(), 100, HIDE_HOTBAR,
+                      [&]( Entity::Player& player, const Event::SceneResult& result )
+                      {
+                        checkQuestCompletion( player );
+                        player.setQuestBitFlag8( getId(), 1, true );
+                      } );
+  }
+};
+
+EXPOSE_SCRIPT( SubFst043 );
\ No newline at end of file
diff --git a/src/scripts/quest/subquest/gridania/SubFst046.cpp b/src/scripts/quest/subquest/gridania/SubFst046.cpp
new file mode 100644
index 00000000..69ce3802
--- /dev/null
+++ b/src/scripts/quest/subquest/gridania/SubFst046.cpp
@@ -0,0 +1,150 @@
+// This is an automatically generated C++ script template
+// Content needs to be added by hand to make it function
+// In order for this script to be loaded, move it to the correct folder in <root>/scripts/
+
+#include <Actor/Player.h>
+#include "Manager/EventMgr.h"
+#include <ScriptObject.h>
+#include <Service.h>
+
+// Quest Script: SubFst046_00210
+// Quest Name: Idle Initiatives
+// Quest ID: 65746
+// Start NPC: 1000408
+// End NPC: 1000408
+
+using namespace Sapphire;
+
+class SubFst046 :
+  public Sapphire::ScriptAPI::EventScript
+{
+  private:
+    // Basic quest information 
+    // Quest vars / flags used
+    // GetQuestBitFlag8
+    // GetQuestUI8AL
+
+    // Steps in this quest ( 0 is before accepting, 
+    // 1 is first, 255 means ready for turning it in
+    enum Sequence : uint8_t
+    {
+      Seq0 = 0,
+      Seq1 = 1,
+      SeqFinish = 255,
+    };
+
+    // Entities found in the script data of the quest
+    static constexpr auto ActionTimelineEventBaseIdle = 783;
+    static constexpr auto Actor0 = 1000408;
+    static constexpr auto Actor1 = 1000792;
+    static constexpr auto Actor2 = 1000793;
+    static constexpr auto Actor3 = 1000794;
+    static constexpr auto Seq0Actor0 = 0;
+    static constexpr auto Seq1Actor1 = 1;
+    static constexpr auto Seq1Actor2 = 2;
+    static constexpr auto Seq1Actor3 = 3;
+    static constexpr auto Seq2Actor0 = 4;
+
+  public:
+    SubFst046() : Sapphire::ScriptAPI::EventScript( 65746 ){}; 
+    ~SubFst046() {};
+
+  //////////////////////////////////////////////////////////////////////
+  // Event Handlers
+  void onTalk( uint32_t eventId, Entity::Player& player, uint64_t actorId ) override
+  {
+    auto& eventMgr = Common::Service< World::Manager::EventMgr >::ref();
+    auto actor = eventMgr.mapEventActorToRealActor( static_cast< uint32_t >( actorId ) );
+
+    if ( actor == Actor0 && !player.hasQuest( getId() ) )
+      Scene00000( player );
+    if ( actor == Actor1 )
+      Scene00001( player );
+    if ( actor == Actor2 )
+      Scene00002( player );
+    if ( actor == Actor3 )
+      Scene00003( player );
+    if ( actor == Actor0 && player.getQuestSeq( getId() ) == SeqFinish )
+      Scene00004( player );
+  }
+
+  void checkQuestCompletion( Entity::Player& player )
+  {
+    auto credit = player.getQuestUI8AL( getId() );
+
+    if ( credit + 1 >= 3 )
+    {
+      player.setQuestUI8AL( getId(), credit + 1 );
+      player.sendQuestMessage( getId(), 0, 0, credit + 1, 3 );
+      player.updateQuest( getId(), SeqFinish );
+    }
+    else
+    {
+      player.setQuestUI8AL( getId(), credit + 1 );
+      player.sendQuestMessage( getId(), 0, 0, credit + 1, 3 );
+    }
+  }
+
+  private:
+  //////////////////////////////////////////////////////////////////////
+  // Available Scenes in this quest, not necessarly all are used
+  void Scene00000( Entity::Player& player )
+  {
+    player.playScene( getId(), 0, HIDE_HOTBAR,
+                      [ & ]( Entity::Player& player, const Event::SceneResult& result )
+                      {
+                        if ( result.param2 == 1 )
+                        {
+                          player.updateQuest( getId(), Seq1 );
+                        }
+                      } );
+  }
+
+  void Scene00001( Entity::Player& player )
+  {
+    player.playScene( getId(), 1, HIDE_HOTBAR,
+                      [ & ]( Entity::Player& player, const Event::SceneResult& result )
+                      {
+                        checkQuestCompletion( player );
+                        player.setQuestBitFlag8( getId(), 1, true );
+                      } );
+  }
+
+  void Scene00002( Entity::Player& player )
+  {
+    player.playScene( getId(), 2, HIDE_HOTBAR,
+                      [ & ]( Entity::Player& player, const Event::SceneResult& result )
+                      {
+                        checkQuestCompletion( player );
+                        player.setQuestBitFlag8( getId(), 2, true );
+                      } );
+  }
+
+  void Scene00003( Entity::Player& player )
+  {
+    player.playScene( getId(), 3, HIDE_HOTBAR,
+                      [ & ]( Entity::Player& player, const Event::SceneResult& result )
+                      {
+                        checkQuestCompletion( player );
+                        player.setQuestBitFlag8( getId(), 3, true );
+                      } );
+  }
+
+  void Scene00004( Entity::Player& player )
+  {
+    player.playScene( getId(), 4, HIDE_HOTBAR,
+                      [ & ]( Entity::Player& player, const Event::SceneResult& result )
+                      {
+                        if ( result.param2 == 1 )
+                        {
+                          if ( player.giveQuestRewards( getId(), 0 ) )
+                          {
+                            player.setQuestUI8BH( getId(), 0 );
+                            player.finishQuest( getId() );
+                          }
+                        }
+                      } );
+  }
+};
+
+EXPOSE_SCRIPT( SubFst046 );
\ No newline at end of file
diff --git a/src/scripts/quest/subquest/gridania/SubFst048.cpp b/src/scripts/quest/subquest/gridania/SubFst048.cpp
new file mode 100644
index 00000000..1dc1c172
--- /dev/null
+++ b/src/scripts/quest/subquest/gridania/SubFst048.cpp
@@ -0,0 +1,144 @@
+// This is an automatically generated C++ script template
+// Content needs to be added by hand to make it function
+// In order for this script to be loaded, move it to the correct folder in <root>/scripts/
+
+#include <Actor/Player.h>
+#include "Manager/EventMgr.h"
+#include <ScriptObject.h>
+#include <Service.h>
+
+// Quest Script: SubFst048_00375
+// Quest Name: Not a Material Girl
+// Quest ID: 65911
+// Start NPC: 1000742
+// End NPC: 1000742
+
+using namespace Sapphire;
+
+class SubFst048 : public Sapphire::ScriptAPI::EventScript
+{
+  private:
+    // Basic quest information 
+    // Quest vars / flags used
+    // GetQuestBitFlag8
+    // GetQuestUI8AL
+
+    // Steps in this quest ( 0 is before accepting, 
+    // 1 is first, 255 means ready for turning it in
+    enum Sequence : uint8_t
+    {
+      Seq0 = 0,
+      Seq1 = 1,
+      SeqFinish = 255,
+    };
+
+    // Entities found in the script data of the quest
+    static constexpr auto Actor0 = 1000742;
+    static constexpr auto Actor1 = 1000474;
+    static constexpr auto Actor2 = 1000476;
+    static constexpr auto Actor3 = 1000483;
+    static constexpr auto Seq0Actor0 = 0;
+    static constexpr auto Seq1Actor1 = 1;
+    static constexpr auto Seq1Actor2 = 2;
+    static constexpr auto Seq1Actor3 = 3;
+    static constexpr auto Seq2Actor0 = 4;
+
+  public:
+    SubFst048() : Sapphire::ScriptAPI::EventScript( 65911 ){}; 
+    ~SubFst048() {};
+
+  //////////////////////////////////////////////////////////////////////
+  // Event Handlers
+  void onTalk( uint32_t eventId, Entity::Player& player, uint64_t actorId ) override
+  {
+    auto& eventMgr = Common::Service< World::Manager::EventMgr >::ref();
+    auto actor = eventMgr.mapEventActorToRealActor( static_cast< uint32_t >( actorId ) );
+
+    if ( actor == Actor0 && !player.hasQuest( getId() ) )
+      Scene00000( player );
+    if ( actor == Actor0 && player.getQuestSeq( getId() ) == SeqFinish )
+      Scene00004( player );
+    if ( actor == Actor1 )
+      Scene00001( player );
+    if ( actor == Actor2 )
+      Scene00002( player );
+    if ( actor == Actor3 )
+      Scene00003( player );
+  }
+
+  void checkQuestCompletion( Entity::Player& player )
+  {
+    auto credit = player.getQuestUI8AL( getId() );
+
+    if ( credit + 1 >= 3 )
+    {
+      player.setQuestUI8AL( getId(), credit + 1 );
+      player.sendQuestMessage( getId(), 0, 2, credit + 1, 3 );
+      player.updateQuest( getId(), SeqFinish );
+    }
+    else
+    {
+      player.setQuestUI8AL( getId(), credit + 1 );
+      player.sendQuestMessage( getId(), 0, 2, credit + 1, 3 );
+    }
+  }
+
+
+  private:
+  //////////////////////////////////////////////////////////////////////
+  // Available Scenes in this quest, not necessarly all are used
+  void Scene00000( Entity::Player& player )
+  {
+    player.playScene( getId(), 0, HIDE_HOTBAR,
+                      [&]( Entity::Player& player, const Event::SceneResult& result )
+                      {
+                        if ( result.param2 == 1 )
+                          player.updateQuest( getId(), Seq1 );
+                      } );
+  }
+
+  void Scene00001( Entity::Player& player )
+  {
+    player.playScene( getId(), 1, HIDE_HOTBAR,
+                      [&]( Entity::Player& player, const Event::SceneResult& result )
+                      {
+                        checkQuestCompletion( player );
+                        player.setQuestBitFlag8( getId(), 1, true );
+                      } );
+  }
+
+  void Scene00002( Entity::Player& player )
+  {
+    player.playScene( getId(), 2, HIDE_HOTBAR,
+                      [&]( Entity::Player& player, const Event::SceneResult& result )
+                      {
+                        checkQuestCompletion( player );
+                        player.setQuestBitFlag8( getId(), 2, true );
+                      } );
+  }
+
+  void Scene00003( Entity::Player& player )
+  {
+    player.playScene( getId(), 3, HIDE_HOTBAR,
+                      [&]( Entity::Player& player, const Event::SceneResult& result )
+                      {
+                        checkQuestCompletion( player );
+                        player.setQuestBitFlag8( getId(), 3, true );
+                      } );
+  }
+
+  void Scene00004( Entity::Player& player )
+  {
+    player.playScene( getId(), 4, HIDE_HOTBAR,
+                      [&]( Entity::Player& player, const Event::SceneResult& result )
+                      {
+                        if( result.param2 == 1 )
+                          if ( player.giveQuestRewards( getId(), result.param3 ) )
+                          {
+                            player.finishQuest( getId() );
+                          }
+                      } );
+  }
+};
+
+EXPOSE_SCRIPT( SubFst048 );
\ No newline at end of file

From ff5bc7823fe5a13d7ad150ea74093381bdc8eb3d Mon Sep 17 00:00:00 2001
From: karashiiro <49822414+karashiiro@users.noreply.github.com>
Date: Wed, 12 Aug 2020 11:37:34 -0700
Subject: [PATCH 342/351] 5.3 bulk update of opcodes

---
 src/common/Network/PacketDef/Ipcs.h | 119 ++++++++++++++--------------
 1 file changed, 61 insertions(+), 58 deletions(-)

diff --git a/src/common/Network/PacketDef/Ipcs.h b/src/common/Network/PacketDef/Ipcs.h
index b212d056..1a9878df 100644
--- a/src/common/Network/PacketDef/Ipcs.h
+++ b/src/common/Network/PacketDef/Ipcs.h
@@ -46,12 +46,12 @@ namespace Sapphire::Network::Packets
     Ping = 0x017A, // updated 5.25
     Init = 0x03B9, // updated 5.25
 
-    ActorFreeSpawn = 0x0194, // updated 5.25
-    InitZone = 0x01CD, // updated 5.25
+    ActorFreeSpawn = 0x022F, // updated 5.3
+    InitZone = 0x0388, // updated 5.3
 
-    EffectResult = 0x030F, // updated 5.25
-    ActorControl = 0x01DD, // updated 5.25
-    ActorControlSelf = 0x0165, // updated 5.25
+    EffectResult = 0x0346, // updated 5.3
+    ActorControl = 0x0344, // updated 5.3
+    ActorControlSelf = 0x0212, // updated 5.3
     ActorControlTarget = 0x01EB, // updated 5.25
 
     /*!
@@ -62,13 +62,13 @@ namespace Sapphire::Network::Packets
     ///////////////////////////////////////////////////
 
     ChatBanned = 0xF06B,
-    Playtime = 0x0286, // updated 5.25
+    Playtime = 0x0207, // updated 5.3
     Logout = 0x00CD, // updated 5.25
-    CFNotify = 0x0145, // updated 5.25
+    CFNotify = 0x00FD, // updated 5.3
     CFMemberStatus = 0x0079,
     CFDutyInfo = 0x007A,
     CFPlayerInNeed = 0xF07F,
-    CFPreferredRole = 0x0186, // added 5.25
+    CFPreferredRole = 0x013C, // updated 5.3
     CFCancel = 0x00B7, // updated 5.25
     SocialRequestError = 0xF0AD,
 
@@ -84,8 +84,8 @@ namespace Sapphire::Network::Packets
 
     SocialList = 0x0269, // updated 5.25
 
-    ExamineSearchInfo = 0x032B, // updated 5.21 hotfix
-    UpdateSearchInfo = 0x00B3, // updated 5.25
+    ExamineSearchInfo = 0x03A1, // updated 5.3
+    UpdateSearchInfo = 0x009E, // updated 5.3
     InitSearchInfo = 0x0347, // updated 5.25
     ExamineSearchComment = 0x0102, // updated 4.1
 
@@ -109,13 +109,13 @@ namespace Sapphire::Network::Packets
     ReqMoogleMailLetter = 0x0139, // updated 5.0
     MailLetterNotification = 0x013A, // updated 5.0
 
-    MarketTaxRates = 0x034C, // updated 5.21 hotfix
-
-    MarketBoardItemListingCount = 0x030A, // updated 5.2
-    MarketBoardItemListing = 0x023E, // updated 5.2
-    MarketBoardItemListingHistory = 0x03C0, // updated 5.2
-    MarketBoardSearchResult = 0x01DD, // updated 5.21
+    MarketTaxRates = 0x00C6, // updated 5.3
 
+    MarketBoardSearchResult = 0x00C0, // updated 5.3
+    MarketBoardItemListingCount = 0x016C, // updated 5.3
+    MarketBoardItemListingHistory = 0x03BB, // updated 5.3
+    MarketBoardItemListing = 0x0233, // updated 5.3
+    
     CharaFreeCompanyTag = 0x013B, // updated 4.5
     FreeCompanyBoardMsg = 0x013C, // updated 4.5
     FreeCompanyInfo = 0xF13D, // updated 4.5
@@ -123,74 +123,77 @@ namespace Sapphire::Network::Packets
 
     FreeCompanyUpdateShortMessage = 0xF157, // added 5.0
 
-    StatusEffectList = 0x01D7, // updated 5.25
+    StatusEffectList = 0x0172, // updated 5.3
     EurekaStatusEffectList = 0x0167, // updated 5.18
     BossStatusEffectList = 0x0312, // added 5.1
-    Effect = 0x0087, // updated 5.25
-    AoeEffect8 = 0x01A6, // updated 5.25
-    AoeEffect16 = 0x02A2, // updated 5.21 hotfix
-    AoeEffect24 = 0x01FD, // updated 5.21 hotfix
-    AoeEffect32 = 0x0376, // updated 5.21 hotfix
+    Effect = 0x00F4, // updated 5.3
+    AoeEffect8 = 0x00C9, // updated 5.3
+    AoeEffect16 = 0x03BF, // updated 5.3
+    AoeEffect24 = 0x027E, // updated 5.3
+    AoeEffect32 = 0x017E, // updated 5.3
     PersistantEffect = 0x032E, // updated 5.25
 
     GCAffiliation = 0xF16F, // updated 5.0
 
-    PlayerSpawn = 0x00B9, // updated 5.25
-    NpcSpawn = 0x038D, // updated 5.25
-    NpcSpawn2 = 0x010C, // ( Bigger statuseffectlist? ) updated 5.18
-    ActorMove = 0x0290, // updated 5.25
+    PlayerSpawn = 0x038E, // updated 5.3
+    NpcSpawn = 0x0083, // updated 5.3
+    NpcSpawn2 = 0x01CB, // ( Bigger statuseffectlist? ) updated 5.3
+    ActorMove = 0x0352, // updated 5.3
 
-    ActorSetPos = 0x028E, // updated 5.25
+    ActorSetPos = 0x02A5, // updated 5.3
 
-    ActorCast = 0x00C4, // updated 5.25
+    ActorCast = 0x00E7, // updated 5.3
     SomeCustomiseChangePacketProbably = 0x00CD, // added 5.18
 
     PartyList = 0x0287, // updated 5.18
     HateRank = 0x012E, // updated 5.25
     HateList = 0x02C4, // updated 5.25
-    ObjectSpawn = 0x00D2, // updated 5.25
+    ObjectSpawn = 0x01A0, // updated 5.3
     ObjectDespawn = 0x034B, // updated 5.18
-    UpdateClassInfo = 0x00DC, // updated 5.25
+    UpdateClassInfo = 0x039A, // updated 5.3
     SilentSetClassJob = 0x018E, // updated 5.0 - seems to be the case, not sure if it's actually used for anything
-    PlayerSetup = 0x0071, // updated 5.25
-    PlayerStats = 0x007C, // updated 5.25
+    PlayerSetup = 0x00D4, // updated 5.3
+    PlayerStats = 0x3D8, // updated 5.3
     ActorOwner = 0x0149, // updated 5.25
     PlayerStateFlags = 0x0125, // updated 5.25
     PlayerClassInfo = 0x034F, // updated 5.25
     CharaVisualEffect = 0x0258, // updated 5.25
 
     ModelEquip = 0x01E5, // updated 5.25
-    Examine = 0x036E, // updated 5.21 hotfix
-    CharaNameReq = 0x0145, // updated 5.25
+    Examine = 0x03C4, // updated 5.3
+    CharaNameReq = 0x0127, // updated 5.3
 
     // nb: see #565 on github
     UpdateRetainerItemSalePrice = 0x019F, // updated 5.0
-    RetainerInformation = 0x0169, // updated 5.25
+    RetainerSaleHistory = 0x020E, // updated 5.21 hotfix
+    RetainerInformation = 0x02B0, // updated 5.3
 
     SetLevelSync = 0x1186, // not updated for 4.4, not sure what it is anymore
 
-    ItemInfo = 0x02AA, // updated 5.25
+    ItemInfo = 0x02A4, // updated 5.3
     ContainerInfo = 0x02A8, // updated 5.25
     InventoryTransactionFinish = 0x0193, // updated 5.25
-    InventoryTransaction = 0x0119, // updated 5.25
-    CurrencyCrystalInfo = 0x018A, // updated 5.25
+    InventoryTransaction = 0x00C5, // updated 5.3
+    CurrencyCrystalInfo = 0x00D7, // updated 5.3
 
     InventoryActionAck = 0x01AE, // updated 5.25
-    UpdateInventorySlot = 0x0151, // updated 5.25
+    UpdateInventorySlot = 0x036A, // updated 5.3
 
     HuntingLogEntry = 0xF1B3, // updated 5.0
 
-    EventPlay = 0x02C3, // updated 5.25
-    EventPlay4 = 0x029A, // updated 5.25
-    EventPlay8 = 0x0119, // updated 5.18
-    EventPlay16 = 0x01FB, // updated 5.18
-    EventPlay32 = 0x02D9, // updated 5.25
-    EventPlay64 = 0x00E5, // updated 5.18
-    EventPlay128 = 0x02BE, // updated 5.18
+    EventPlay = 0x0379, // updated 5.3
+    EventPlay4 = 0x030B, // updated 5.3
+    EventPlay8 = 0x014C,   // updated 5.25
+    EventPlay16 = 0x0074,   // updated 5.25
+    EventPlay32 = 0x02D9,  // updated 5.25
+    EventPlay64 = 0x0388,  // updated 5.25
+    EventPlay128 = 0x03A4, // updated 5.25
     EventPlay255 = 0x01AC, // updated 5.25
 
-    EventStart = 0x0360, // updated 5.25
-    EventFinish = 0x0239, // updated 5.25
+    EventStart = 0x020D, // updated 5.3
+    EventFinish = 0x00DF, // updated 5.3
+    
+    UseMooch = 0x00C5, // updated 5.3
 
     EventLinkshell = 0x1169,
 
@@ -211,7 +214,7 @@ namespace Sapphire::Network::Packets
     DirectorVars = 0x00E6, // updated 5.18
     SomeDirectorUnk1 = 0x0084, // updated 5.18
     SomeDirectorUnk2 = 0xF0C1, // updated 5.18
-    SomeDirectorUnk4 = 0x01F3, // updated 5.21 hotfix
+    SomeDirectorUnk4 = 0x01DF, // updated 5.3
     SomeDirectorUnk8 = 0x028A, // updated 5.18
     SomeDirectorUnk16 = 0x028C, // updated 5.18
     DirectorPopUp = 0xF162, // updated 5.18 - display dialogue pop-ups in duties and FATEs, for example, Teraflare's countdown
@@ -220,7 +223,7 @@ namespace Sapphire::Network::Packets
 
     CFAvailableContents = 0xF1FD, // updated 4.2
 
-    WeatherChange = 0x0157, // updated 5.25
+    WeatherChange = 0x03D6, // updated 5.3
     PlayerTitleList = 0x037D, // updated 5.1
     Discovery = 0x0173, // updated 5.25
 
@@ -259,8 +262,8 @@ namespace Sapphire::Network::Packets
     DuelChallenge = 0x0277, // 4.2; this is responsible for opening the ui
     PerformNote = 0x0286, // updated 4.3
 
-    PrepareZoning = 0x03B3, // updated 5.25
-    ActorGauge = 0x007D, // updated 5.25
+    PrepareZoning = 0x00F9, // updated 5.3
+    ActorGauge = 0x020F, // updated 5.3
 
     // daily quest info -> without them sent,  login will take longer...
     DailyQuests = 0x031E, // updated 5.25
@@ -303,10 +306,10 @@ namespace Sapphire::Network::Packets
     SocialReqSendHandler = 0x00AE, // updated 4.1
     CreateCrossWorldLS = 0x00AF, // updated 4.3
 
-    ChatHandler = 0x0189, // updated 5.25
+    ChatHandler = 0x01E2, // updated 5.3
 
     SocialListHandler = 0x0371, // updated 5.25
-    SetSearchInfoHandler = 0x00FA, // updated 5.25
+    SetSearchInfoHandler = 0x0210, // updated 5.3
     ReqSearchInfoHandler = 0x0366, // updated 5.25
     ReqExamineSearchCommentHandler = 0x00E7, // updated 5.0
 
@@ -334,7 +337,7 @@ namespace Sapphire::Network::Packets
     ReqCountdownCancel = 0x0244, // updated 5.25
 
     ZoneLineHandler = 0x0214, // updated 5.25
-    ClientTrigger = 0x017D, // updated 5.25
+    ClientTrigger = 0x02BE, // updated 5.3
     DiscoveryHandler = 0x02C8, // updated 5.25
 
     PlaceFieldMarkerPreset = 0x023F, // updated 5.25
@@ -344,9 +347,9 @@ namespace Sapphire::Network::Packets
     GMCommand2 = 0x0368, // updated 5.25
     AoESkillHandler = 0x0364, // updated 5.21 hotfix
 
-    UpdatePositionHandler = 0x014D, // updated 5.25
+    UpdatePositionHandler = 0x037B, // updated 5.3
 
-    InventoryModifyHandler = 0x0179, // updated 5.25
+    InventoryModifyHandler = 0x0118, // updated 5.3
     
     InventoryEquipRecommendedItems = 0x0149, // updated 5.0
 
@@ -375,7 +378,7 @@ namespace Sapphire::Network::Packets
 
     SetSharedEstateSettings = 0x017B, // updated 5.0
 
-    UpdatePositionInstance = 0x0080, // updated 5.21 hotfix
+    UpdatePositionInstance = 0x0245, // updated 5.3
 
     PerformNoteHandler = 0x029B, // updated 4.3
 

From d4d8f36819b690a18fb7ac44477d4d660dd728cc Mon Sep 17 00:00:00 2001
From: karashiiro <49822414+karashiiro@users.noreply.github.com>
Date: Sat, 15 Aug 2020 07:53:44 -0700
Subject: [PATCH 343/351] Remove UseMooch, this was renamed to
 InventoryTransaction at some point

---
 src/common/Network/PacketDef/Ipcs.h | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/common/Network/PacketDef/Ipcs.h b/src/common/Network/PacketDef/Ipcs.h
index 1a9878df..604c83cf 100644
--- a/src/common/Network/PacketDef/Ipcs.h
+++ b/src/common/Network/PacketDef/Ipcs.h
@@ -192,8 +192,6 @@ namespace Sapphire::Network::Packets
 
     EventStart = 0x020D, // updated 5.3
     EventFinish = 0x00DF, // updated 5.3
-    
-    UseMooch = 0x00C5, // updated 5.3
 
     EventLinkshell = 0x1169,
 

From 669da79ac028e28feb02959d9727b34b3ed8b9b5 Mon Sep 17 00:00:00 2001
From: karashiiro <49822414+karashiiro@users.noreply.github.com>
Date: Sat, 15 Aug 2020 15:27:05 -0700
Subject: [PATCH 344/351] Toss in SkillHandler = 0x033C from Winter while we're
 at it

---
 src/common/Network/PacketDef/Ipcs.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/common/Network/PacketDef/Ipcs.h b/src/common/Network/PacketDef/Ipcs.h
index 604c83cf..ff682f2f 100644
--- a/src/common/Network/PacketDef/Ipcs.h
+++ b/src/common/Network/PacketDef/Ipcs.h
@@ -340,7 +340,7 @@ namespace Sapphire::Network::Packets
 
     PlaceFieldMarkerPreset = 0x023F, // updated 5.25
     PlaceFieldMarker = 0x01BA, // updated 5.25
-    SkillHandler = 0x0241, // updated 5.25
+    SkillHandler = 0x033C, // updated 5.3
     GMCommand1 = 0x01EC, // updated 5.25
     GMCommand2 = 0x0368, // updated 5.25
     AoESkillHandler = 0x0364, // updated 5.21 hotfix

From a6e9c567ee316dbf2b5b3411e3a1f93c549c9240 Mon Sep 17 00:00:00 2001
From: karashiiro <49822414+karashiiro@users.noreply.github.com>
Date: Tue, 15 Sep 2020 11:02:23 -0700
Subject: [PATCH 345/351] MiniCactpotInit opcode and documentation;
 MarketTaxRates tweak

---
 src/common/Network/PacketDef/Ipcs.h           |  2 +
 .../Network/PacketDef/Zone/ServerZoneDef.h    | 57 +++++++++++++++++--
 2 files changed, 54 insertions(+), 5 deletions(-)

diff --git a/src/common/Network/PacketDef/Ipcs.h b/src/common/Network/PacketDef/Ipcs.h
index ff682f2f..b188abeb 100644
--- a/src/common/Network/PacketDef/Ipcs.h
+++ b/src/common/Network/PacketDef/Ipcs.h
@@ -229,6 +229,8 @@ namespace Sapphire::Network::Packets
 
     EquipDisplayFlags = 0x010D, // updated 5.25
 
+    MiniCactpotInit = 0x0286, // added 5.31
+
     /// Housing //////////////////////////////////////
 
     LandSetInitialize = 0x0234, // updated 5.0
diff --git a/src/common/Network/PacketDef/Zone/ServerZoneDef.h b/src/common/Network/PacketDef/Zone/ServerZoneDef.h
index f941f744..92ced6ca 100644
--- a/src/common/Network/PacketDef/Zone/ServerZoneDef.h
+++ b/src/common/Network/PacketDef/Zone/ServerZoneDef.h
@@ -286,9 +286,11 @@ namespace Sapphire::Network::Packets::Server
 
   struct FFFXIVIpcMarketTaxRates : FFXIVIpcBasePacket< MarketTaxRates >
   {
-    uint32_t unknown1;
-    uint16_t padding1;
-    uint16_t unknown2;
+    // Same handler as MiniCactpotInit
+    uint32_t type;
+    uint16_t category;
+    uint8_t unknown1;
+    uint8_t unknown2;
     uint32_t taxRate[Common::TOWN_COUNT]; // In the order of Common::Town
     uint64_t unknown3;
   };
@@ -1552,7 +1554,7 @@ namespace Sapphire::Network::Packets::Server
 
   /**
   * Structural representation of the packet sent by the server
-  * to send a unviel a map
+  * to send a unveil a map
   */
   struct FFXIVIpcDiscovery : FFXIVIpcBasePacket< Discovery >
   {
@@ -1681,6 +1683,52 @@ namespace Sapphire::Network::Packets::Server
     uint8_t bitmask;
   };
 
+  struct FFXIVIpcMiniCactPotInit : FFXIVIpcBasePacket< MiniCactpotInit >
+  {
+    /*
+    * Looks like this shares a handler with MarketTaxRates and a few
+    * other packets, so these first fields are most likely discriminators
+    * or other metadata for the handler itself.
+    */
+    uint32_t type;
+    uint16_t category;
+    uint8_t unknown1;
+    uint8_t unknown2;
+    /*
+    * Always 18 for this packet, incidentally the number of payouts plus 1.
+    * Used similarly for MarketTaxRates => for (auto i = 0; i <= indexEnd; i++) {}
+    */
+    uint8_t indexEnd;
+    uint8_t unknown3;
+    uint16_t padding1;
+    /*
+    * On clicking a number, the client sends a ClientTrigger (DirectorSync) with an unknown
+    * param2, param5; param1 session, param3 column, param4 row; zero param6, and the server
+    * replies with an ActorControlSelf (DirectorUpdate) with an unknown param2; param1 session,
+    * param3 column, param4 row, param5 digit; zero param6. After a line is selected,
+    * the server replies with 9 DirectorUpdate packets, in order (column, row), containing every
+    * number on the board (why tho). Finally, one last DirectorUpdate is sent with parameters
+    * param1 session, param3 payout index; unknown param2, param4; zero param5, param6.
+    */
+    uint32_t column; // zero-based
+    uint32_t row;
+    uint32_t firstDigit;
+    uint32_t payouts[19]; // In in-game display order
+    uint32_t unknown4;
+    /*
+    * All of the below fields seem to be gibberish, and change completely between
+    * draws and characters.
+    */
+    uint32_t unknown5;
+    uint32_t unknown6;
+    uint32_t unknown7;
+    uint32_t unknown8;
+    uint16_t unknown9;
+    uint16_t unknown10;
+    uint32_t unknown11;
+    uint64_t unknown12;
+  };
+
   /**
    * Structural representation of the packet sent by the server
    * to place/remove field marker presets
@@ -2077,7 +2125,6 @@ namespace Sapphire::Network::Packets::Server
     uint32_t param6;
     uint32_t param7;
   };
-
 }
 
 #endif /*_CORE_NETWORK_PACKETS_SERVER_IPC_H*/

From 292cf7867250c50aec236b366cfb067a800a77bf Mon Sep 17 00:00:00 2001
From: reiichi001 <reiichi001@gmail.com>
Date: Tue, 27 Oct 2020 08:44:16 -0700
Subject: [PATCH 346/351] update IPCs for 5.35

All of the known IPCs from opcodes channel for 5.35 now that 5.35 hotfix is out.
---
 src/common/Network/PacketDef/Ipcs.h | 102 ++++++++++++++--------------
 1 file changed, 51 insertions(+), 51 deletions(-)

diff --git a/src/common/Network/PacketDef/Ipcs.h b/src/common/Network/PacketDef/Ipcs.h
index b188abeb..302d9c3d 100644
--- a/src/common/Network/PacketDef/Ipcs.h
+++ b/src/common/Network/PacketDef/Ipcs.h
@@ -47,28 +47,28 @@ namespace Sapphire::Network::Packets
     Init = 0x03B9, // updated 5.25
 
     ActorFreeSpawn = 0x022F, // updated 5.3
-    InitZone = 0x0388, // updated 5.3
+    InitZone = 00x0303, // updated 5.35
 
-    EffectResult = 0x0346, // updated 5.3
-    ActorControl = 0x0344, // updated 5.3
-    ActorControlSelf = 0x0212, // updated 5.3
+    EffectResult = 0x035E, // updated 5.35
+    ActorControl = 0x02DC, // updated 5.35
+    ActorControlSelf = 0x032C, // updated 5.35
     ActorControlTarget = 0x01EB, // updated 5.25
 
     /*!
      * @brief Used when resting
      */
-    UpdateHpMpTp = 0x00F8, // updated 5.25
+    UpdateHpMpTp = 0x0153, // updated 5.35
 
     ///////////////////////////////////////////////////
 
     ChatBanned = 0xF06B,
-    Playtime = 0x0207, // updated 5.3
+    Playtime = 0x03E4, // updated 5.35
     Logout = 0x00CD, // updated 5.25
-    CFNotify = 0x00FD, // updated 5.3
+    CFNotify = 0x016F, // updated 5.35
     CFMemberStatus = 0x0079,
     CFDutyInfo = 0x007A,
     CFPlayerInNeed = 0xF07F,
-    CFPreferredRole = 0x013C, // updated 5.3
+    CFPreferredRole = 0x0073, // updated 5.35
     CFCancel = 0x00B7, // updated 5.25
     SocialRequestError = 0xF0AD,
 
@@ -84,8 +84,8 @@ namespace Sapphire::Network::Packets
 
     SocialList = 0x0269, // updated 5.25
 
-    ExamineSearchInfo = 0x03A1, // updated 5.3
-    UpdateSearchInfo = 0x009E, // updated 5.3
+    ExamineSearchInfo = 0x0126, // updated 5.35
+    UpdateSearchInfo = 0x0251, // updated 5.35
     InitSearchInfo = 0x0347, // updated 5.25
     ExamineSearchComment = 0x0102, // updated 4.1
 
@@ -109,12 +109,12 @@ namespace Sapphire::Network::Packets
     ReqMoogleMailLetter = 0x0139, // updated 5.0
     MailLetterNotification = 0x013A, // updated 5.0
 
-    MarketTaxRates = 0x00C6, // updated 5.3
+    MarketTaxRates = 0x030A, // updated 5.35
 
-    MarketBoardSearchResult = 0x00C0, // updated 5.3
-    MarketBoardItemListingCount = 0x016C, // updated 5.3
-    MarketBoardItemListingHistory = 0x03BB, // updated 5.3
-    MarketBoardItemListing = 0x0233, // updated 5.3
+    MarketBoardSearchResult = 0x0297, // updated 5.35
+    MarketBoardItemListingCount = 0x0075, // updated 5.35
+    MarketBoardItemListingHistory = 0x00B8, // updated 5.35
+    MarketBoardItemListing = 0x0154, // updated 5.35
     
     CharaFreeCompanyTag = 0x013B, // updated 4.5
     FreeCompanyBoardMsg = 0x013C, // updated 4.5
@@ -135,63 +135,63 @@ namespace Sapphire::Network::Packets
 
     GCAffiliation = 0xF16F, // updated 5.0
 
-    PlayerSpawn = 0x038E, // updated 5.3
-    NpcSpawn = 0x0083, // updated 5.3
+    PlayerSpawn = 0x038E, // updated 5.35
+    NpcSpawn = 0x01DA, // updated 5.35
     NpcSpawn2 = 0x01CB, // ( Bigger statuseffectlist? ) updated 5.3
-    ActorMove = 0x0352, // updated 5.3
+    ActorMove = 0x02C5, // updated 5.35
 
     ActorSetPos = 0x02A5, // updated 5.3
 
-    ActorCast = 0x00E7, // updated 5.3
+    ActorCast = 0x0111, // updated 5.35
     SomeCustomiseChangePacketProbably = 0x00CD, // added 5.18
 
     PartyList = 0x0287, // updated 5.18
     HateRank = 0x012E, // updated 5.25
     HateList = 0x02C4, // updated 5.25
-    ObjectSpawn = 0x01A0, // updated 5.3
+    ObjectSpawn = 0x01F9, // updated 5.35
     ObjectDespawn = 0x034B, // updated 5.18
-    UpdateClassInfo = 0x039A, // updated 5.3
+    UpdateClassInfo = 0x015D, // updated 5.35
     SilentSetClassJob = 0x018E, // updated 5.0 - seems to be the case, not sure if it's actually used for anything
-    PlayerSetup = 0x00D4, // updated 5.3
-    PlayerStats = 0x3D8, // updated 5.3
+    PlayerSetup = 0x032D, // updated 5.35
+    PlayerStats = 0x0177, // updated 5.35
     ActorOwner = 0x0149, // updated 5.25
     PlayerStateFlags = 0x0125, // updated 5.25
     PlayerClassInfo = 0x034F, // updated 5.25
     CharaVisualEffect = 0x0258, // updated 5.25
 
     ModelEquip = 0x01E5, // updated 5.25
-    Examine = 0x03C4, // updated 5.3
-    CharaNameReq = 0x0127, // updated 5.3
+    Examine = 0x0310, // updated 5.35
+    CharaNameReq = 0x01D3, // updated 5.35
 
     // nb: see #565 on github
     UpdateRetainerItemSalePrice = 0x019F, // updated 5.0
     RetainerSaleHistory = 0x020E, // updated 5.21 hotfix
-    RetainerInformation = 0x02B0, // updated 5.3
+    RetainerInformation = 0x0321, // updated 5.35
 
     SetLevelSync = 0x1186, // not updated for 4.4, not sure what it is anymore
 
-    ItemInfo = 0x02A4, // updated 5.3
+    ItemInfo = 0x00F0, // updated 5.35
     ContainerInfo = 0x02A8, // updated 5.25
-    InventoryTransactionFinish = 0x0193, // updated 5.25
-    InventoryTransaction = 0x00C5, // updated 5.3
-    CurrencyCrystalInfo = 0x00D7, // updated 5.3
+    InventoryTransactionFinish = 0x0241, // updated 5.35
+    InventoryTransaction = 0x0136, // updated 5.35
+    CurrencyCrystalInfo = 0x0133, // updated 5.35
 
-    InventoryActionAck = 0x01AE, // updated 5.25
-    UpdateInventorySlot = 0x036A, // updated 5.3
+    InventoryActionAck = 0x0204, // updated 5.35
+    UpdateInventorySlot = 0x03BE, // updated 5.35
 
     HuntingLogEntry = 0xF1B3, // updated 5.0
 
-    EventPlay = 0x0379, // updated 5.3
-    EventPlay4 = 0x030B, // updated 5.3
-    EventPlay8 = 0x014C,   // updated 5.25
-    EventPlay16 = 0x0074,   // updated 5.25
-    EventPlay32 = 0x02D9,  // updated 5.25
-    EventPlay64 = 0x0388,  // updated 5.25
-    EventPlay128 = 0x03A4, // updated 5.25
-    EventPlay255 = 0x01AC, // updated 5.25
+    EventPlay = 0x039A, // updated 5.35
+    EventPlay4 = 0x0382, // updated 5.35
+    EventPlay8 = 0x03E2, // updated 5.35
+    EventPlay16 = 0x01DE, // updated 5.35
+    EventPlay32 = 0x0115, // updated 5.35
+    EventPlay64 = 0x01AF, // updated 5.35
+    EventPlay128 = 0x0205, // updated 5.35
+    EventPlay255 = 0x0322, // updated 5.35
 
-    EventStart = 0x020D, // updated 5.3
-    EventFinish = 0x00DF, // updated 5.3
+    EventStart = 0x0131, // updated 5.35
+    EventFinish = 0x03DC, // updated 5.35
 
     EventLinkshell = 0x1169,
 
@@ -212,7 +212,7 @@ namespace Sapphire::Network::Packets
     DirectorVars = 0x00E6, // updated 5.18
     SomeDirectorUnk1 = 0x0084, // updated 5.18
     SomeDirectorUnk2 = 0xF0C1, // updated 5.18
-    SomeDirectorUnk4 = 0x01DF, // updated 5.3
+    SomeDirectorUnk4 = 0x0333, // updated 5.35
     SomeDirectorUnk8 = 0x028A, // updated 5.18
     SomeDirectorUnk16 = 0x028C, // updated 5.18
     DirectorPopUp = 0xF162, // updated 5.18 - display dialogue pop-ups in duties and FATEs, for example, Teraflare's countdown
@@ -221,7 +221,7 @@ namespace Sapphire::Network::Packets
 
     CFAvailableContents = 0xF1FD, // updated 4.2
 
-    WeatherChange = 0x03D6, // updated 5.3
+    WeatherChange = 0x00BC, // updated 5.35
     PlayerTitleList = 0x037D, // updated 5.1
     Discovery = 0x0173, // updated 5.25
 
@@ -262,7 +262,7 @@ namespace Sapphire::Network::Packets
     DuelChallenge = 0x0277, // 4.2; this is responsible for opening the ui
     PerformNote = 0x0286, // updated 4.3
 
-    PrepareZoning = 0x00F9, // updated 5.3
+    PrepareZoning = 0x0160, // updated 5.35
     ActorGauge = 0x020F, // updated 5.3
 
     // daily quest info -> without them sent,  login will take longer...
@@ -306,10 +306,10 @@ namespace Sapphire::Network::Packets
     SocialReqSendHandler = 0x00AE, // updated 4.1
     CreateCrossWorldLS = 0x00AF, // updated 4.3
 
-    ChatHandler = 0x01E2, // updated 5.3
+    ChatHandler = 0x021C, // updated 5.35
 
     SocialListHandler = 0x0371, // updated 5.25
-    SetSearchInfoHandler = 0x0210, // updated 5.3
+    SetSearchInfoHandler = 0x034C, // updated 5.35
     ReqSearchInfoHandler = 0x0366, // updated 5.25
     ReqExamineSearchCommentHandler = 0x00E7, // updated 5.0
 
@@ -337,7 +337,7 @@ namespace Sapphire::Network::Packets
     ReqCountdownCancel = 0x0244, // updated 5.25
 
     ZoneLineHandler = 0x0214, // updated 5.25
-    ClientTrigger = 0x02BE, // updated 5.3
+    ClientTrigger = 0x01DF, // updated 5.3
     DiscoveryHandler = 0x02C8, // updated 5.25
 
     PlaceFieldMarkerPreset = 0x023F, // updated 5.25
@@ -347,9 +347,9 @@ namespace Sapphire::Network::Packets
     GMCommand2 = 0x0368, // updated 5.25
     AoESkillHandler = 0x0364, // updated 5.21 hotfix
 
-    UpdatePositionHandler = 0x037B, // updated 5.3
+    UpdatePositionHandler = 0x00BD, // updated 5.35
 
-    InventoryModifyHandler = 0x0118, // updated 5.3
+    InventoryModifyHandler = 0x0343, // updated 5.35 (Base offset: 0x034A)
     
     InventoryEquipRecommendedItems = 0x0149, // updated 5.0
 
@@ -378,7 +378,7 @@ namespace Sapphire::Network::Packets
 
     SetSharedEstateSettings = 0x017B, // updated 5.0
 
-    UpdatePositionInstance = 0x0245, // updated 5.3
+    UpdatePositionInstance = 0x0081, // updated 5.35
 
     PerformNoteHandler = 0x029B, // updated 4.3
 

From c6e1405802b793d9533b0394b8ab53d48b886163 Mon Sep 17 00:00:00 2001
From: collett <collett0301@gmail.com>
Date: Tue, 10 Nov 2020 00:07:26 +0900
Subject: [PATCH 347/351] 5.3 exd update

---
 src/common/Exd/ExdDataGenerated.cpp | 4553 ++++++++++++++++++++++++---
 src/common/Exd/ExdDataGenerated.h   |  997 +++++-
 2 files changed, 4975 insertions(+), 575 deletions(-)

diff --git a/src/common/Exd/ExdDataGenerated.cpp b/src/common/Exd/ExdDataGenerated.cpp
index 67a01ec8..fd44e942 100644
--- a/src/common/Exd/ExdDataGenerated.cpp
+++ b/src/common/Exd/ExdDataGenerated.cpp
@@ -22,7 +22,6 @@ Sapphire::Data::Achievement::Achievement( uint32_t row_id, Sapphire::Data::ExdDa
   data.push_back( exdData->getField< int32_t >( row, 16 ) );
   data.push_back( exdData->getField< int32_t >( row, 17 ) );
   order = exdData->getField< uint16_t >( row, 18 );
-  padding = exdData->getField< uint8_t >( row, 19 );
   achievementHideCondition = exdData->getField< uint8_t >( row, 20 );
 }
 
@@ -33,6 +32,7 @@ Sapphire::Data::AchievementCategory::AchievementCategory( uint32_t row_id, Sapph
   achievementKind = exdData->getField< uint8_t >( row, 1 );
   showComplete = exdData->getField< bool >( row, 2 );
   hideCategory = exdData->getField< bool >( row, 3 );
+  order = exdData->getField< uint8_t >( row, 4 );
 }
 
 Sapphire::Data::AchievementHideCondition::AchievementHideCondition( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
@@ -47,6 +47,7 @@ Sapphire::Data::AchievementKind::AchievementKind( uint32_t row_id, Sapphire::Dat
 {
   auto row = exdData->m_AchievementKindDat.get_row( row_id );
   name = exdData->getField< std::string >( row, 0 );
+  order = exdData->getField< uint8_t >( row, 1 );
 }
 
 Sapphire::Data::Action::Action( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
@@ -322,6 +323,7 @@ Sapphire::Data::AetheryteSystemDefine::AetheryteSystemDefine( uint32_t row_id, S
 Sapphire::Data::AirshipExplorationLevel::AirshipExplorationLevel( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
 {
   auto row = exdData->m_AirshipExplorationLevelDat.get_row( row_id );
+  capacity = exdData->getField< uint16_t >( row, 0 );
   expToNext = exdData->getField< uint32_t >( row, 1 );
 }
 
@@ -546,13 +548,6 @@ Sapphire::Data::AOZContentBriefingBNpc::AOZContentBriefingBNpc( uint32_t row_id,
   instaDeathResistance = exdData->getField< bool >( row, 24 );
 }
 
-Sapphire::Data::AOZReport::AOZReport( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
-{
-  auto row = exdData->m_AOZReportDat.get_row( row_id );
-  reward = exdData->getField< uint8_t >( row, 1 );
-  order = exdData->getField< int8_t >( row, 2 );
-}
-
 Sapphire::Data::AquariumFish::AquariumFish( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
 {
   auto row = exdData->m_AquariumFishDat.get_row( row_id );
@@ -730,18 +725,21 @@ Sapphire::Data::BattleLeve::BattleLeve( uint32_t row_id, Sapphire::Data::ExdData
   toDoNumberInvolved.push_back( exdData->getField< uint32_t >( row, 61 ) );
   toDoNumberInvolved.push_back( exdData->getField< uint32_t >( row, 62 ) );
   toDoNumberInvolved.push_back( exdData->getField< uint32_t >( row, 63 ) );
-  toDoParam.push_back( exdData->getField< uint32_t >( row, 64 ) );
-  toDoParam.push_back( exdData->getField< uint32_t >( row, 65 ) );
-  toDoParam.push_back( exdData->getField< uint32_t >( row, 66 ) );
-  toDoParam.push_back( exdData->getField< uint32_t >( row, 67 ) );
-  toDoParam.push_back( exdData->getField< uint32_t >( row, 68 ) );
-  toDoParam.push_back( exdData->getField< uint32_t >( row, 69 ) );
-  toDoParam.push_back( exdData->getField< uint32_t >( row, 70 ) );
-  toDoParam.push_back( exdData->getField< uint32_t >( row, 71 ) );
+  toDoSequence.push_back( exdData->getField< uint8_t >( row, 168 ) );
+  toDoSequence.push_back( exdData->getField< uint8_t >( row, 169 ) );
+  toDoSequence.push_back( exdData->getField< uint8_t >( row, 170 ) );
+  toDoSequence.push_back( exdData->getField< uint8_t >( row, 171 ) );
+  toDoSequence.push_back( exdData->getField< uint8_t >( row, 172 ) );
+  toDoSequence.push_back( exdData->getField< uint8_t >( row, 173 ) );
+  toDoSequence.push_back( exdData->getField< uint8_t >( row, 174 ) );
+  toDoSequence.push_back( exdData->getField< uint8_t >( row, 175 ) );
   rule = exdData->getField< int32_t >( row, 176 );
   varient = exdData->getField< uint8_t >( row, 177 );
   objective0 = exdData->getField< uint16_t >( row, 178 );
   objective1 = exdData->getField< uint16_t >( row, 179 );
+  objective2 = exdData->getField< uint16_t >( row, 180 );
+  help0 = exdData->getField< uint16_t >( row, 181 );
+  help1 = exdData->getField< uint16_t >( row, 182 );
 }
 
 Sapphire::Data::BattleLeveRule::BattleLeveRule( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
@@ -753,6 +751,14 @@ Sapphire::Data::BattleLeveRule::BattleLeveRule( uint32_t row_id, Sapphire::Data:
 Sapphire::Data::BeastRankBonus::BeastRankBonus( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
 {
   auto row = exdData->m_BeastRankBonusDat.get_row( row_id );
+  neutral = exdData->getField< uint16_t >( row, 0 );
+  recognized = exdData->getField< uint16_t >( row, 1 );
+  friendly = exdData->getField< uint16_t >( row, 2 );
+  trusted = exdData->getField< uint16_t >( row, 3 );
+  respected = exdData->getField< uint16_t >( row, 4 );
+  honored = exdData->getField< uint16_t >( row, 5 );
+  sworn = exdData->getField< uint16_t >( row, 6 );
+  alliedBloodsworn = exdData->getField< uint16_t >( row, 7 );
   item = exdData->getField< uint32_t >( row, 8 );
   itemQuantity.push_back( exdData->getField< uint8_t >( row, 9 ) );
   itemQuantity.push_back( exdData->getField< uint8_t >( row, 10 ) );
@@ -769,6 +775,8 @@ Sapphire::Data::BeastReputationRank::BeastReputationRank( uint32_t row_id, Sapph
   auto row = exdData->m_BeastReputationRankDat.get_row( row_id );
   requiredReputation = exdData->getField< uint16_t >( row, 0 );
   name = exdData->getField< std::string >( row, 1 );
+  alliedNames = exdData->getField< std::string >( row, 2 );
+  color = exdData->getField< uint32_t >( row, 3 );
 }
 
 Sapphire::Data::BeastTribe::BeastTribe( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
@@ -783,13 +791,26 @@ Sapphire::Data::BeastTribe::BeastTribe( uint32_t row_id, Sapphire::Data::ExdData
   currencyItem = exdData->getField< uint32_t >( row, 7 );
   displayOrder = exdData->getField< uint8_t >( row, 8 );
   name = exdData->getField< std::string >( row, 9 );
+  adjective = exdData->getField< int8_t >( row, 10 );
+  plural = exdData->getField< std::string >( row, 11 );
+  possessivePronoun = exdData->getField< int8_t >( row, 12 );
+  startsWithVowel = exdData->getField< int8_t >( row, 13 );
+  pronoun = exdData->getField< int8_t >( row, 14 );
+  article = exdData->getField< int8_t >( row, 15 );
+  dEF = exdData->getField< int8_t >( row, 16 );
   nameRelation = exdData->getField< std::string >( row, 17 );
 }
 
 Sapphire::Data::Behavior::Behavior( uint32_t row_id, uint32_t subRow, Sapphire::Data::ExdDataGenerated* exdData )
 {
   auto row = exdData->m_BehaviorDat.get_row( row_id, subRow );
+  condition0Target = exdData->getField< uint8_t >( row, 2 );
+  condition0Type = exdData->getField< uint8_t >( row, 3 );
   balloon = exdData->getField< int32_t >( row, 4 );
+  condition1Target = exdData->getField< uint8_t >( row, 9 );
+  condition1Type = exdData->getField< uint8_t >( row, 10 );
+  contentArgument0 = exdData->getField< uint32_t >( row, 11 );
+  contentArgument1 = exdData->getField< uint8_t >( row, 12 );
 }
 
 Sapphire::Data::BehaviorPath::BehaviorPath( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
@@ -885,6 +906,7 @@ Sapphire::Data::BGMSwitch::BGMSwitch( uint32_t row_id, uint32_t subRow, Sapphire
   auto row = exdData->m_BGMSwitchDat.get_row( row_id, subRow );
   bGMSystemDefine = exdData->getField< uint8_t >( row, 0 );
   quest = exdData->getField< uint32_t >( row, 1 );
+  bGM = exdData->getField< uint16_t >( row, 3 );
 }
 
 Sapphire::Data::BGMSystemDefine::BGMSystemDefine( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
@@ -1178,6 +1200,7 @@ Sapphire::Data::Channeling::Channeling( uint32_t row_id, Sapphire::Data::ExdData
   auto row = exdData->m_ChannelingDat.get_row( row_id );
   file = exdData->getField< std::string >( row, 0 );
   widthScale = exdData->getField< uint8_t >( row, 1 );
+  addedIn53 = exdData->getField< bool >( row, 2 );
 }
 
 Sapphire::Data::CharaMakeClassEquip::CharaMakeClassEquip( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
@@ -1204,6 +1227,55 @@ Sapphire::Data::CharaMakeCustomize::CharaMakeCustomize( uint32_t row_id, Sapphir
   hintItem = exdData->getField< uint32_t >( row, 5 );
 }
 
+Sapphire::Data::CharaMakeName::CharaMakeName( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
+{
+  auto row = exdData->m_CharaMakeNameDat.get_row( row_id );
+  hyurMidlanderMale = exdData->getField< std::string >( row, 0 );
+  hyurMidlanderFemale = exdData->getField< std::string >( row, 1 );
+  hyurMidlanderLastName = exdData->getField< std::string >( row, 2 );
+  hyurHighlanderMale = exdData->getField< std::string >( row, 3 );
+  hyurHighlanderFemale = exdData->getField< std::string >( row, 4 );
+  hyurHighlanderLastName = exdData->getField< std::string >( row, 5 );
+  elezenMale = exdData->getField< std::string >( row, 6 );
+  elezenFemale = exdData->getField< std::string >( row, 7 );
+  elezenWildwoodLastName = exdData->getField< std::string >( row, 8 );
+  elezenDuskwightLastName = exdData->getField< std::string >( row, 9 );
+  miqoteSunMale = exdData->getField< std::string >( row, 10 );
+  miqoteSunFemale = exdData->getField< std::string >( row, 11 );
+  miqoteSunMaleLastName = exdData->getField< std::string >( row, 12 );
+  miqoteSunFemaleLastName = exdData->getField< std::string >( row, 13 );
+  miqoteMoonMale = exdData->getField< std::string >( row, 14 );
+  miqoteMoonFemale = exdData->getField< std::string >( row, 15 );
+  miqoteMoonLastname = exdData->getField< std::string >( row, 16 );
+  lalafellPlainsfolkFirstNameStart = exdData->getField< std::string >( row, 17 );
+  lalafellPlainsfolkLastNameStart = exdData->getField< std::string >( row, 18 );
+  lalafellPlainsfolkEndOfNames = exdData->getField< std::string >( row, 19 );
+  lalafellDunesfolkMale = exdData->getField< std::string >( row, 20 );
+  lalafellDunesfolkMaleLastName = exdData->getField< std::string >( row, 21 );
+  lalafellDunesfolkFemale = exdData->getField< std::string >( row, 22 );
+  lalafellDunesfolkFemaleLastName = exdData->getField< std::string >( row, 23 );
+  roegadynSeaWolfMale = exdData->getField< std::string >( row, 24 );
+  roegadynSeaWolfMaleLastName = exdData->getField< std::string >( row, 25 );
+  roegadynSeaWolfFemale = exdData->getField< std::string >( row, 26 );
+  roegadynSeaWolfFemaleLastName = exdData->getField< std::string >( row, 27 );
+  roegadynHellsguardFirstName = exdData->getField< std::string >( row, 28 );
+  roegadynHellsguardMaleLastName = exdData->getField< std::string >( row, 29 );
+  roegadynHellsguardFemaleLastName = exdData->getField< std::string >( row, 30 );
+  auRaRaenMale = exdData->getField< std::string >( row, 31 );
+  auRaRaenFemale = exdData->getField< std::string >( row, 32 );
+  auRaRaenLastName = exdData->getField< std::string >( row, 33 );
+  auRaXaelaMale = exdData->getField< std::string >( row, 34 );
+  auRaXaelaFemale = exdData->getField< std::string >( row, 35 );
+  auRaXaelaLastName = exdData->getField< std::string >( row, 36 );
+  hrothgarHellionsFirstName = exdData->getField< std::string >( row, 37 );
+  hrothgarHellionsLastName = exdData->getField< std::string >( row, 38 );
+  hrothgarLostFirstName = exdData->getField< std::string >( row, 39 );
+  hrothgarLostLastName = exdData->getField< std::string >( row, 40 );
+  vieraFirstName = exdData->getField< std::string >( row, 41 );
+  vieraRavaLastName = exdData->getField< std::string >( row, 42 );
+  vieraVeenaLastName = exdData->getField< std::string >( row, 43 );
+}
+
 Sapphire::Data::CharaMakeType::CharaMakeType( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
 {
   auto row = exdData->m_CharaMakeTypeDat.get_row( row_id );
@@ -1418,62 +1490,6 @@ Sapphire::Data::CharaMakeType::CharaMakeType( uint32_t row_id, Sapphire::Data::E
   voiceStruct.push_back( exdData->getField< uint8_t >( row, 3288 ) );
   voiceStruct.push_back( exdData->getField< uint8_t >( row, 3289 ) );
   voiceStruct.push_back( exdData->getField< uint8_t >( row, 3290 ) );
-  facialFeatureOption.push_back( exdData->getField< int32_t >( row, 3291 ) );
-  facialFeatureOption.push_back( exdData->getField< int32_t >( row, 3292 ) );
-  facialFeatureOption.push_back( exdData->getField< int32_t >( row, 3293 ) );
-  facialFeatureOption.push_back( exdData->getField< int32_t >( row, 3294 ) );
-  facialFeatureOption.push_back( exdData->getField< int32_t >( row, 3295 ) );
-  facialFeatureOption.push_back( exdData->getField< int32_t >( row, 3296 ) );
-  facialFeatureOption.push_back( exdData->getField< int32_t >( row, 3297 ) );
-  facialFeatureOption.push_back( exdData->getField< int32_t >( row, 3298 ) );
-  facialFeatureOption.push_back( exdData->getField< int32_t >( row, 3299 ) );
-  facialFeatureOption.push_back( exdData->getField< int32_t >( row, 3300 ) );
-  facialFeatureOption.push_back( exdData->getField< int32_t >( row, 3301 ) );
-  facialFeatureOption.push_back( exdData->getField< int32_t >( row, 3302 ) );
-  facialFeatureOption.push_back( exdData->getField< int32_t >( row, 3303 ) );
-  facialFeatureOption.push_back( exdData->getField< int32_t >( row, 3304 ) );
-  facialFeatureOption.push_back( exdData->getField< int32_t >( row, 3305 ) );
-  facialFeatureOption.push_back( exdData->getField< int32_t >( row, 3306 ) );
-  facialFeatureOption.push_back( exdData->getField< int32_t >( row, 3307 ) );
-  facialFeatureOption.push_back( exdData->getField< int32_t >( row, 3308 ) );
-  facialFeatureOption.push_back( exdData->getField< int32_t >( row, 3309 ) );
-  facialFeatureOption.push_back( exdData->getField< int32_t >( row, 3310 ) );
-  facialFeatureOption.push_back( exdData->getField< int32_t >( row, 3311 ) );
-  facialFeatureOption.push_back( exdData->getField< int32_t >( row, 3312 ) );
-  facialFeatureOption.push_back( exdData->getField< int32_t >( row, 3313 ) );
-  facialFeatureOption.push_back( exdData->getField< int32_t >( row, 3314 ) );
-  facialFeatureOption.push_back( exdData->getField< int32_t >( row, 3315 ) );
-  facialFeatureOption.push_back( exdData->getField< int32_t >( row, 3316 ) );
-  facialFeatureOption.push_back( exdData->getField< int32_t >( row, 3317 ) );
-  facialFeatureOption.push_back( exdData->getField< int32_t >( row, 3318 ) );
-  facialFeatureOption.push_back( exdData->getField< int32_t >( row, 3319 ) );
-  facialFeatureOption.push_back( exdData->getField< int32_t >( row, 3320 ) );
-  facialFeatureOption.push_back( exdData->getField< int32_t >( row, 3321 ) );
-  facialFeatureOption.push_back( exdData->getField< int32_t >( row, 3322 ) );
-  facialFeatureOption.push_back( exdData->getField< int32_t >( row, 3323 ) );
-  facialFeatureOption.push_back( exdData->getField< int32_t >( row, 3324 ) );
-  facialFeatureOption.push_back( exdData->getField< int32_t >( row, 3325 ) );
-  facialFeatureOption.push_back( exdData->getField< int32_t >( row, 3326 ) );
-  facialFeatureOption.push_back( exdData->getField< int32_t >( row, 3327 ) );
-  facialFeatureOption.push_back( exdData->getField< int32_t >( row, 3328 ) );
-  facialFeatureOption.push_back( exdData->getField< int32_t >( row, 3329 ) );
-  facialFeatureOption.push_back( exdData->getField< int32_t >( row, 3330 ) );
-  facialFeatureOption.push_back( exdData->getField< int32_t >( row, 3331 ) );
-  facialFeatureOption.push_back( exdData->getField< int32_t >( row, 3332 ) );
-  facialFeatureOption.push_back( exdData->getField< int32_t >( row, 3333 ) );
-  facialFeatureOption.push_back( exdData->getField< int32_t >( row, 3334 ) );
-  facialFeatureOption.push_back( exdData->getField< int32_t >( row, 3335 ) );
-  facialFeatureOption.push_back( exdData->getField< int32_t >( row, 3336 ) );
-  facialFeatureOption.push_back( exdData->getField< int32_t >( row, 3337 ) );
-  facialFeatureOption.push_back( exdData->getField< int32_t >( row, 3338 ) );
-  facialFeatureOption.push_back( exdData->getField< int32_t >( row, 3339 ) );
-  facialFeatureOption.push_back( exdData->getField< int32_t >( row, 3340 ) );
-  facialFeatureOption.push_back( exdData->getField< int32_t >( row, 3341 ) );
-  facialFeatureOption.push_back( exdData->getField< int32_t >( row, 3342 ) );
-  facialFeatureOption.push_back( exdData->getField< int32_t >( row, 3343 ) );
-  facialFeatureOption.push_back( exdData->getField< int32_t >( row, 3344 ) );
-  facialFeatureOption.push_back( exdData->getField< int32_t >( row, 3345 ) );
-  facialFeatureOption.push_back( exdData->getField< int32_t >( row, 3346 ) );
 }
 
 Sapphire::Data::ChocoboRace::ChocoboRace( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
@@ -1561,6 +1577,14 @@ Sapphire::Data::ChocoboTaxi::ChocoboTaxi( uint32_t row_id, Sapphire::Data::ExdDa
 Sapphire::Data::ChocoboTaxiStand::ChocoboTaxiStand( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
 {
   auto row = exdData->m_ChocoboTaxiStandDat.get_row( row_id );
+  targetLocations.push_back( exdData->getField< uint16_t >( row, 0 ) );
+  targetLocations.push_back( exdData->getField< uint16_t >( row, 1 ) );
+  targetLocations.push_back( exdData->getField< uint16_t >( row, 2 ) );
+  targetLocations.push_back( exdData->getField< uint16_t >( row, 3 ) );
+  targetLocations.push_back( exdData->getField< uint16_t >( row, 4 ) );
+  targetLocations.push_back( exdData->getField< uint16_t >( row, 5 ) );
+  targetLocations.push_back( exdData->getField< uint16_t >( row, 6 ) );
+  targetLocations.push_back( exdData->getField< uint16_t >( row, 7 ) );
   placeName = exdData->getField< std::string >( row, 8 );
 }
 
@@ -1655,6 +1679,67 @@ Sapphire::Data::ClassJobCategory::ClassJobCategory( uint32_t row_id, Sapphire::D
   dNC = exdData->getField< bool >( row, 39 );
 }
 
+Sapphire::Data::CollectablesShop::CollectablesShop( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
+{
+  auto row = exdData->m_CollectablesShopDat.get_row( row_id );
+  name = exdData->getField< std::string >( row, 0 );
+  quest = exdData->getField< uint32_t >( row, 1 );
+  shopItems.push_back( exdData->getField< uint16_t >( row, 3 ) );
+  shopItems.push_back( exdData->getField< uint16_t >( row, 4 ) );
+  shopItems.push_back( exdData->getField< uint16_t >( row, 5 ) );
+  shopItems.push_back( exdData->getField< uint16_t >( row, 6 ) );
+  shopItems.push_back( exdData->getField< uint16_t >( row, 7 ) );
+  shopItems.push_back( exdData->getField< uint16_t >( row, 8 ) );
+  shopItems.push_back( exdData->getField< uint16_t >( row, 9 ) );
+  shopItems.push_back( exdData->getField< uint16_t >( row, 10 ) );
+  shopItems.push_back( exdData->getField< uint16_t >( row, 11 ) );
+  shopItems.push_back( exdData->getField< uint16_t >( row, 12 ) );
+  shopItems.push_back( exdData->getField< uint16_t >( row, 13 ) );
+}
+
+Sapphire::Data::CollectablesShopItem::CollectablesShopItem( uint32_t row_id, uint32_t subRow, Sapphire::Data::ExdDataGenerated* exdData )
+{
+  auto row = exdData->m_CollectablesShopItemDat.get_row( row_id, subRow );
+  item = exdData->getField< uint32_t >( row, 0 );
+  collectablesShopItemGroup = exdData->getField< uint8_t >( row, 1 );
+  levelMin = exdData->getField< uint16_t >( row, 2 );
+  levelMax = exdData->getField< uint16_t >( row, 3 );
+  collectablesShopRefine = exdData->getField< uint16_t >( row, 6 );
+  collectablesShopRewardScrip = exdData->getField< uint16_t >( row, 7 );
+}
+
+Sapphire::Data::CollectablesShopItemGroup::CollectablesShopItemGroup( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
+{
+  auto row = exdData->m_CollectablesShopItemGroupDat.get_row( row_id );
+  name = exdData->getField< std::string >( row, 0 );
+}
+
+Sapphire::Data::CollectablesShopRefine::CollectablesShopRefine( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
+{
+  auto row = exdData->m_CollectablesShopRefineDat.get_row( row_id );
+  lowCollectability = exdData->getField< uint16_t >( row, 0 );
+  midCollectability = exdData->getField< uint16_t >( row, 1 );
+  highCollectability = exdData->getField< uint16_t >( row, 2 );
+}
+
+Sapphire::Data::CollectablesShopRewardItem::CollectablesShopRewardItem( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
+{
+  auto row = exdData->m_CollectablesShopRewardItemDat.get_row( row_id );
+  item = exdData->getField< uint32_t >( row, 0 );
+}
+
+Sapphire::Data::CollectablesShopRewardScrip::CollectablesShopRewardScrip( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
+{
+  auto row = exdData->m_CollectablesShopRewardScripDat.get_row( row_id );
+  currency = exdData->getField< uint16_t >( row, 0 );
+  lowReward = exdData->getField< uint16_t >( row, 1 );
+  midReward = exdData->getField< uint16_t >( row, 2 );
+  highReward = exdData->getField< uint16_t >( row, 3 );
+  expRatioLow = exdData->getField< uint16_t >( row, 4 );
+  expRatioMid = exdData->getField< uint16_t >( row, 5 );
+  expRatioHigh = exdData->getField< uint16_t >( row, 6 );
+}
+
 Sapphire::Data::Companion::Companion( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
 {
   auto row = exdData->m_CompanionDat.get_row( row_id );
@@ -1766,6 +1851,7 @@ Sapphire::Data::CompanyCraftSequence::CompanyCraftSequence( uint32_t row_id, Sap
 {
   auto row = exdData->m_CompanyCraftSequenceDat.get_row( row_id );
   resultItem = exdData->getField< int32_t >( row, 0 );
+  category = exdData->getField< int32_t >( row, 1 );
   companyCraftDraftCategory = exdData->getField< int32_t >( row, 2 );
   companyCraftType = exdData->getField< int32_t >( row, 3 );
   companyCraftDraft = exdData->getField< int32_t >( row, 4 );
@@ -1777,6 +1863,7 @@ Sapphire::Data::CompanyCraftSequence::CompanyCraftSequence( uint32_t row_id, Sap
   companyCraftPart.push_back( exdData->getField< uint16_t >( row, 10 ) );
   companyCraftPart.push_back( exdData->getField< uint16_t >( row, 11 ) );
   companyCraftPart.push_back( exdData->getField< uint16_t >( row, 12 ) );
+  order = exdData->getField< uint32_t >( row, 13 );
 }
 
 Sapphire::Data::CompanyCraftSupplyItem::CompanyCraftSupplyItem( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
@@ -1794,14 +1881,14 @@ Sapphire::Data::CompanyCraftType::CompanyCraftType( uint32_t row_id, Sapphire::D
 Sapphire::Data::CompanyLeve::CompanyLeve( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
 {
   auto row = exdData->m_CompanyLeveDat.get_row( row_id );
-  time.push_back( exdData->getField< uint16_t >( row, 0 ) );
-  time.push_back( exdData->getField< uint16_t >( row, 1 ) );
-  time.push_back( exdData->getField< uint16_t >( row, 2 ) );
-  time.push_back( exdData->getField< uint16_t >( row, 3 ) );
-  time.push_back( exdData->getField< uint16_t >( row, 4 ) );
-  time.push_back( exdData->getField< uint16_t >( row, 5 ) );
-  time.push_back( exdData->getField< uint16_t >( row, 6 ) );
-  time.push_back( exdData->getField< uint16_t >( row, 7 ) );
+  routePointTime.push_back( exdData->getField< uint16_t >( row, 0 ) );
+  routePointTime.push_back( exdData->getField< uint16_t >( row, 1 ) );
+  routePointTime.push_back( exdData->getField< uint16_t >( row, 2 ) );
+  routePointTime.push_back( exdData->getField< uint16_t >( row, 3 ) );
+  routePointTime.push_back( exdData->getField< uint16_t >( row, 4 ) );
+  routePointTime.push_back( exdData->getField< uint16_t >( row, 5 ) );
+  routePointTime.push_back( exdData->getField< uint16_t >( row, 6 ) );
+  routePointTime.push_back( exdData->getField< uint16_t >( row, 7 ) );
   baseID.push_back( exdData->getField< int32_t >( row, 8 ) );
   baseID.push_back( exdData->getField< int32_t >( row, 9 ) );
   baseID.push_back( exdData->getField< int32_t >( row, 10 ) );
@@ -1850,22 +1937,14 @@ Sapphire::Data::CompanyLeve::CompanyLeve( uint32_t row_id, Sapphire::Data::ExdDa
   itemDropRate.push_back( exdData->getField< uint8_t >( row, 53 ) );
   itemDropRate.push_back( exdData->getField< uint8_t >( row, 54 ) );
   itemDropRate.push_back( exdData->getField< uint8_t >( row, 55 ) );
-  toDoNumberInvolved.push_back( exdData->getField< uint32_t >( row, 56 ) );
-  toDoNumberInvolved.push_back( exdData->getField< uint32_t >( row, 57 ) );
-  toDoNumberInvolved.push_back( exdData->getField< uint32_t >( row, 58 ) );
-  toDoNumberInvolved.push_back( exdData->getField< uint32_t >( row, 59 ) );
-  toDoNumberInvolved.push_back( exdData->getField< uint32_t >( row, 60 ) );
-  toDoNumberInvolved.push_back( exdData->getField< uint32_t >( row, 61 ) );
-  toDoNumberInvolved.push_back( exdData->getField< uint32_t >( row, 62 ) );
-  toDoNumberInvolved.push_back( exdData->getField< uint32_t >( row, 63 ) );
-  toDoParam.push_back( exdData->getField< uint32_t >( row, 64 ) );
-  toDoParam.push_back( exdData->getField< uint32_t >( row, 65 ) );
-  toDoParam.push_back( exdData->getField< uint32_t >( row, 66 ) );
-  toDoParam.push_back( exdData->getField< uint32_t >( row, 67 ) );
-  toDoParam.push_back( exdData->getField< uint32_t >( row, 68 ) );
-  toDoParam.push_back( exdData->getField< uint32_t >( row, 69 ) );
-  toDoParam.push_back( exdData->getField< uint32_t >( row, 70 ) );
-  toDoParam.push_back( exdData->getField< uint32_t >( row, 71 ) );
+  toDoSequence.push_back( exdData->getField< uint8_t >( row, 168 ) );
+  toDoSequence.push_back( exdData->getField< uint8_t >( row, 169 ) );
+  toDoSequence.push_back( exdData->getField< uint8_t >( row, 170 ) );
+  toDoSequence.push_back( exdData->getField< uint8_t >( row, 171 ) );
+  toDoSequence.push_back( exdData->getField< uint8_t >( row, 172 ) );
+  toDoSequence.push_back( exdData->getField< uint8_t >( row, 173 ) );
+  toDoSequence.push_back( exdData->getField< uint8_t >( row, 174 ) );
+  toDoSequence.push_back( exdData->getField< uint8_t >( row, 175 ) );
   rule = exdData->getField< int32_t >( row, 176 );
   ruleParam = exdData->getField< uint8_t >( row, 177 );
 }
@@ -1917,6 +1996,12 @@ Sapphire::Data::CompleteJournalCategory::CompleteJournalCategory( uint32_t row_i
   lastQuest = exdData->getField< uint32_t >( row, 1 );
 }
 
+Sapphire::Data::Condition::Condition( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
+{
+  auto row = exdData->m_ConditionDat.get_row( row_id );
+  logMessage = exdData->getField< uint32_t >( row, 2 );
+}
+
 Sapphire::Data::ConfigKey::ConfigKey( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
 {
   auto row = exdData->m_ConfigKeyDat.get_row( row_id );
@@ -1957,28 +2042,29 @@ Sapphire::Data::ContentFinderCondition::ContentFinderCondition( uint32_t row_id,
   classJobLevelSync = exdData->getField< uint8_t >( row, 16 );
   itemLevelRequired = exdData->getField< uint16_t >( row, 17 );
   itemLevelSync = exdData->getField< uint16_t >( row, 18 );
-  allowUndersized = exdData->getField< bool >( row, 19 );
-  allowReplacement = exdData->getField< bool >( row, 20 );
-  highEndDuty = exdData->getField< bool >( row, 26 );
-  dutyRecorderAllowed = exdData->getField< bool >( row, 30 );
-  name = exdData->getField< std::string >( row, 35 );
-  contentType = exdData->getField< uint8_t >( row, 36 );
-  transientKey = exdData->getField< uint8_t >( row, 37 );
-  transient = exdData->getField< uint32_t >( row, 38 );
-  sortKey = exdData->getField< uint16_t >( row, 39 );
-  image = exdData->getField< uint32_t >( row, 40 );
-  icon = exdData->getField< uint32_t >( row, 41 );
-  levelingRoulette = exdData->getField< bool >( row, 43 );
-  level5060Roulette = exdData->getField< bool >( row, 44 );
-  mSQRoulette = exdData->getField< bool >( row, 45 );
-  guildHestRoulette = exdData->getField< bool >( row, 46 );
-  expertRoulette = exdData->getField< bool >( row, 47 );
-  trialRoulette = exdData->getField< bool >( row, 48 );
-  dailyFrontlineChallenge = exdData->getField< bool >( row, 49 );
-  level70Roulette = exdData->getField< bool >( row, 50 );
-  mentorRoulette = exdData->getField< bool >( row, 51 );
-  allianceRoulette = exdData->getField< bool >( row, 57 );
-  normalRaidRoulette = exdData->getField< bool >( row, 59 );
+  addedIn53 = exdData->getField< bool >( row, 19 );
+  allowUndersized = exdData->getField< bool >( row, 20 );
+  allowReplacement = exdData->getField< bool >( row, 21 );
+  highEndDuty = exdData->getField< bool >( row, 27 );
+  dutyRecorderAllowed = exdData->getField< bool >( row, 31 );
+  name = exdData->getField< std::string >( row, 36 );
+  contentType = exdData->getField< uint8_t >( row, 37 );
+  transientKey = exdData->getField< uint8_t >( row, 38 );
+  transient = exdData->getField< uint32_t >( row, 39 );
+  sortKey = exdData->getField< uint16_t >( row, 40 );
+  image = exdData->getField< uint32_t >( row, 41 );
+  icon = exdData->getField< uint32_t >( row, 42 );
+  levelingRoulette = exdData->getField< bool >( row, 44 );
+  level5060Roulette = exdData->getField< bool >( row, 45 );
+  mSQRoulette = exdData->getField< bool >( row, 46 );
+  guildHestRoulette = exdData->getField< bool >( row, 47 );
+  expertRoulette = exdData->getField< bool >( row, 48 );
+  trialRoulette = exdData->getField< bool >( row, 49 );
+  dailyFrontlineChallenge = exdData->getField< bool >( row, 50 );
+  level70Roulette = exdData->getField< bool >( row, 51 );
+  mentorRoulette = exdData->getField< bool >( row, 52 );
+  allianceRoulette = exdData->getField< bool >( row, 58 );
+  normalRaidRoulette = exdData->getField< bool >( row, 60 );
 }
 
 Sapphire::Data::ContentFinderConditionTransient::ContentFinderConditionTransient( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
@@ -2472,6 +2558,12 @@ Sapphire::Data::DeepDungeonLayer::DeepDungeonLayer( uint32_t row_id, Sapphire::D
 {
   auto row = exdData->m_DeepDungeonLayerDat.get_row( row_id );
   deepDungeon = exdData->getField< uint8_t >( row, 0 );
+  floorSet = exdData->getField< uint8_t >( row, 1 );
+  roomA = exdData->getField< uint16_t >( row, 2 );
+  roomB = exdData->getField< uint16_t >( row, 3 );
+  roomC = exdData->getField< uint16_t >( row, 4 );
+  wepMinLv = exdData->getField< uint8_t >( row, 5 );
+  armourMinLv = exdData->getField< uint8_t >( row, 6 );
 }
 
 Sapphire::Data::DeepDungeonMagicStone::DeepDungeonMagicStone( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
@@ -2655,6 +2747,41 @@ Sapphire::Data::DpsChallengeTransient::DpsChallengeTransient( uint32_t row_id, S
   instanceContent = exdData->getField< uint16_t >( row, 0 );
 }
 
+Sapphire::Data::DynamicEvent::DynamicEvent( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
+{
+  auto row = exdData->m_DynamicEventDat.get_row( row_id );
+  eventType = exdData->getField< uint8_t >( row, 0 );
+  enemyType = exdData->getField< uint8_t >( row, 1 );
+  lGBEventObject = exdData->getField< uint32_t >( row, 4 );
+  lGBMapRange = exdData->getField< uint32_t >( row, 5 );
+  quest = exdData->getField< uint32_t >( row, 6 );
+  singleBattle = exdData->getField< uint8_t >( row, 8 );
+  announce = exdData->getField< uint32_t >( row, 9 );
+  name = exdData->getField< std::string >( row, 10 );
+  description = exdData->getField< std::string >( row, 11 );
+}
+
+Sapphire::Data::DynamicEventEnemyType::DynamicEventEnemyType( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
+{
+  auto row = exdData->m_DynamicEventEnemyTypeDat.get_row( row_id );
+  name = exdData->getField< std::string >( row, 0 );
+}
+
+Sapphire::Data::DynamicEventSingleBattle::DynamicEventSingleBattle( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
+{
+  auto row = exdData->m_DynamicEventSingleBattleDat.get_row( row_id );
+  actionIcon = exdData->getField< int32_t >( row, 0 );
+  icon = exdData->getField< uint32_t >( row, 1 );
+  text = exdData->getField< std::string >( row, 2 );
+}
+
+Sapphire::Data::DynamicEventType::DynamicEventType( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
+{
+  auto row = exdData->m_DynamicEventTypeDat.get_row( row_id );
+  iconObjective0 = exdData->getField< uint32_t >( row, 0 );
+  iconObjective1 = exdData->getField< uint32_t >( row, 1 );
+}
+
 Sapphire::Data::EmjAddon::EmjAddon( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
 {
   auto row = exdData->m_EmjAddonDat.get_row( row_id );
@@ -2814,22 +2941,25 @@ Sapphire::Data::ENpcDressUp::ENpcDressUp( uint32_t row_id, Sapphire::Data::ExdDa
 Sapphire::Data::ENpcDressUpDress::ENpcDressUpDress( uint32_t row_id, uint32_t subRow, Sapphire::Data::ExdDataGenerated* exdData )
 {
   auto row = exdData->m_ENpcDressUpDressDat.get_row( row_id, subRow );
-  eNpc = exdData->getField< uint32_t >( row, 6 );
-  behavior = exdData->getField< uint16_t >( row, 8 );
-  modelMainHand = exdData->getField< uint64_t >( row, 35 );
-  dyeMainHand = exdData->getField< uint8_t >( row, 36 );
-  modelOffHand = exdData->getField< uint64_t >( row, 37 );
-  dyeOffHand = exdData->getField< uint8_t >( row, 38 );
-  modelHead = exdData->getField< uint32_t >( row, 39 );
-  dyeHead = exdData->getField< uint8_t >( row, 40 );
-  modelBody = exdData->getField< uint32_t >( row, 41 );
-  dyeBody = exdData->getField< uint8_t >( row, 42 );
-  modelHands = exdData->getField< uint32_t >( row, 43 );
-  dyeHands = exdData->getField< uint8_t >( row, 44 );
-  modelLegs = exdData->getField< uint32_t >( row, 45 );
-  dyeLegs = exdData->getField< uint8_t >( row, 46 );
-  modelFeet = exdData->getField< uint32_t >( row, 47 );
-  dyeFeet = exdData->getField< uint8_t >( row, 48 );
+  addedIn530 = exdData->getField< bool >( row, 5 );
+  eNpc = exdData->getField< uint32_t >( row, 7 );
+  addedIn531 = exdData->getField< uint16_t >( row, 8 );
+  behavior = exdData->getField< uint16_t >( row, 9 );
+  addedIn532 = exdData->getField< uint8_t >( row, 36 );
+  modelMainHand = exdData->getField< uint64_t >( row, 37 );
+  dyeMainHand = exdData->getField< uint8_t >( row, 38 );
+  modelOffHand = exdData->getField< uint64_t >( row, 39 );
+  dyeOffHand = exdData->getField< uint8_t >( row, 40 );
+  modelHead = exdData->getField< uint32_t >( row, 41 );
+  dyeHead = exdData->getField< uint8_t >( row, 42 );
+  modelBody = exdData->getField< uint32_t >( row, 43 );
+  dyeBody = exdData->getField< uint8_t >( row, 44 );
+  modelHands = exdData->getField< uint32_t >( row, 45 );
+  dyeHands = exdData->getField< uint8_t >( row, 46 );
+  modelLegs = exdData->getField< uint32_t >( row, 47 );
+  dyeLegs = exdData->getField< uint8_t >( row, 48 );
+  modelFeet = exdData->getField< uint32_t >( row, 49 );
+  dyeFeet = exdData->getField< uint8_t >( row, 50 );
 }
 
 Sapphire::Data::ENpcResident::ENpcResident( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
@@ -2857,6 +2987,7 @@ Sapphire::Data::EObj::EObj( uint32_t row_id, Sapphire::Data::ExdDataGenerated* e
   directorControl = exdData->getField< bool >( row, 13 );
   target = exdData->getField< bool >( row, 14 );
   eventHighAddition = exdData->getField< uint8_t >( row, 15 );
+  addedIn53 = exdData->getField< bool >( row, 18 );
 }
 
 Sapphire::Data::EObjName::EObjName( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
@@ -3061,6 +3192,8 @@ Sapphire::Data::ExVersion::ExVersion( uint32_t row_id, Sapphire::Data::ExdDataGe
 {
   auto row = exdData->m_ExVersionDat.get_row( row_id );
   name = exdData->getField< std::string >( row, 0 );
+  acceptJingle = exdData->getField< uint16_t >( row, 1 );
+  completeJingle = exdData->getField< uint16_t >( row, 2 );
 }
 
 Sapphire::Data::Fate::Fate( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
@@ -3068,6 +3201,7 @@ Sapphire::Data::Fate::Fate( uint32_t row_id, Sapphire::Data::ExdDataGenerated* e
   auto row = exdData->m_FateDat.get_row( row_id );
   eurekaFate = exdData->getField< uint8_t >( row, 0 );
   rule = exdData->getField< uint8_t >( row, 1 );
+  fateRuleEx = exdData->getField< uint16_t >( row, 2 );
   location = exdData->getField< uint32_t >( row, 3 );
   classJobLevel = exdData->getField< uint8_t >( row, 4 );
   classJobLevelMax = exdData->getField< uint8_t >( row, 5 );
@@ -3083,15 +3217,28 @@ Sapphire::Data::Fate::Fate( uint32_t row_id, Sapphire::Data::ExdDataGenerated* e
   screenImageAccept = exdData->getField< uint16_t >( row, 15 );
   screenImageComplete = exdData->getField< uint16_t >( row, 16 );
   screenImageFailed = exdData->getField< uint16_t >( row, 17 );
-  hasWorldMapIcon = exdData->getField< bool >( row, 18 );
-  isQuest = exdData->getField< bool >( row, 19 );
-  name = exdData->getField< std::string >( row, 29 );
-  description = exdData->getField< std::string >( row, 30 );
-  objective = exdData->getField< std::string >( row, 31 );
-  statusText.push_back( exdData->getField< std::string >( row, 32 ) );
+  specialFate = exdData->getField< bool >( row, 20 );
+  givenStatus = exdData->getField< uint16_t >( row, 22 );
+  adventEvent = exdData->getField< bool >( row, 24 );
+  moonFaireEvent = exdData->getField< bool >( row, 25 );
+  fATEChain = exdData->getField< uint32_t >( row, 27 );
+  name = exdData->getField< std::string >( row, 30 );
+  description = exdData->getField< std::string >( row, 31 );
+  objective = exdData->getField< std::string >( row, 32 );
   statusText.push_back( exdData->getField< std::string >( row, 33 ) );
   statusText.push_back( exdData->getField< std::string >( row, 34 ) );
-  arrayIndex = exdData->getField< uint32_t >( row, 35 );
+  statusText.push_back( exdData->getField< std::string >( row, 35 ) );
+  arrayIndex = exdData->getField< uint32_t >( row, 36 );
+  reqEventItem = exdData->getField< uint32_t >( row, 38 );
+  turnInEventItem = exdData->getField< uint32_t >( row, 39 );
+  objectiveIcon.push_back( exdData->getField< uint16_t >( row, 40 ) );
+  objectiveIcon.push_back( exdData->getField< uint16_t >( row, 41 ) );
+  objectiveIcon.push_back( exdData->getField< uint16_t >( row, 42 ) );
+  objectiveIcon.push_back( exdData->getField< uint16_t >( row, 43 ) );
+  objectiveIcon.push_back( exdData->getField< uint16_t >( row, 44 ) );
+  objectiveIcon.push_back( exdData->getField< uint16_t >( row, 45 ) );
+  objectiveIcon.push_back( exdData->getField< uint16_t >( row, 46 ) );
+  objectiveIcon.push_back( exdData->getField< uint16_t >( row, 47 ) );
 }
 
 Sapphire::Data::FateEvent::FateEvent( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
@@ -3163,6 +3310,15 @@ Sapphire::Data::FateEvent::FateEvent( uint32_t row_id, Sapphire::Data::ExdDataGe
   text.push_back( exdData->getField< std::string >( row, 63 ) );
 }
 
+Sapphire::Data::FateMode::FateMode( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
+{
+  auto row = exdData->m_FateModeDat.get_row( row_id );
+  motivationIcon = exdData->getField< uint32_t >( row, 1 );
+  motivationMapMarker = exdData->getField< uint32_t >( row, 2 );
+  objectiveIcon = exdData->getField< uint32_t >( row, 3 );
+  objectiveMapMarker = exdData->getField< uint32_t >( row, 4 );
+}
+
 Sapphire::Data::FateProgressUI::FateProgressUI( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
 {
   auto row = exdData->m_FateProgressUIDat.get_row( row_id );
@@ -3624,9 +3780,10 @@ Sapphire::Data::GatheringPointBonus::GatheringPointBonus( uint32_t row_id, Sapph
 {
   auto row = exdData->m_GatheringPointBonusDat.get_row( row_id );
   condition = exdData->getField< uint8_t >( row, 0 );
-  conditionValue = exdData->getField< uint16_t >( row, 1 );
+  conditionValue = exdData->getField< uint32_t >( row, 1 );
   bonusType = exdData->getField< uint8_t >( row, 3 );
   bonusValue = exdData->getField< uint16_t >( row, 4 );
+  addedIn53 = exdData->getField< bool >( row, 6 );
 }
 
 Sapphire::Data::GatheringPointBonusType::GatheringPointBonusType( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
@@ -3647,6 +3804,19 @@ Sapphire::Data::GatheringPointName::GatheringPointName( uint32_t row_id, Sapphir
   article = exdData->getField< int8_t >( row, 7 );
 }
 
+Sapphire::Data::GatheringPointTransient::GatheringPointTransient( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
+{
+  auto row = exdData->m_GatheringPointTransientDat.get_row( row_id );
+  ephemeralStartTime = exdData->getField< uint16_t >( row, 0 );
+  ephemeralEndTime = exdData->getField< uint16_t >( row, 1 );
+  gatheringRarePopTimeTable = exdData->getField< int32_t >( row, 2 );
+}
+
+Sapphire::Data::GatheringRarePopTimeTable::GatheringRarePopTimeTable( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
+{
+  auto row = exdData->m_GatheringRarePopTimeTableDat.get_row( row_id );
+}
+
 Sapphire::Data::GatheringSubCategory::GatheringSubCategory( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
 {
   auto row = exdData->m_GatheringSubCategoryDat.get_row( row_id );
@@ -3995,6 +4165,20 @@ Sapphire::Data::GroupPoseFrame::GroupPoseFrame( uint32_t row_id, Sapphire::Data:
   text = exdData->getField< std::string >( row, 6 );
 }
 
+Sapphire::Data::GroupPoseStamp::GroupPoseStamp( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
+{
+  auto row = exdData->m_GroupPoseStampDat.get_row( row_id );
+  stampIcon = exdData->getField< int32_t >( row, 0 );
+  category = exdData->getField< int32_t >( row, 2 );
+  name = exdData->getField< std::string >( row, 6 );
+}
+
+Sapphire::Data::GroupPoseStampCategory::GroupPoseStampCategory( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
+{
+  auto row = exdData->m_GroupPoseStampCategoryDat.get_row( row_id );
+  name = exdData->getField< std::string >( row, 1 );
+}
+
 Sapphire::Data::GuardianDeity::GuardianDeity( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
 {
   auto row = exdData->m_GuardianDeityDat.get_row( row_id );
@@ -4032,9 +4216,10 @@ Sapphire::Data::GuideTitle::GuideTitle( uint32_t row_id, Sapphire::Data::ExdData
 Sapphire::Data::GuildleveAssignment::GuildleveAssignment( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
 {
   auto row = exdData->m_GuildleveAssignmentDat.get_row( row_id );
-  assignmentTalk = exdData->getField< uint32_t >( row, 1 );
-  quest.push_back( exdData->getField< uint32_t >( row, 2 ) );
+  addedIn53 = exdData->getField< uint8_t >( row, 1 );
+  assignmentTalk = exdData->getField< uint32_t >( row, 2 );
   quest.push_back( exdData->getField< uint32_t >( row, 3 ) );
+  quest.push_back( exdData->getField< uint32_t >( row, 4 ) );
 }
 
 Sapphire::Data::GuildleveAssignmentCategory::GuildleveAssignmentCategory( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
@@ -4483,41 +4668,171 @@ Sapphire::Data::HWDCrafterSupply::HWDCrafterSupply( uint32_t row_id, Sapphire::D
   itemTradeIn.push_back( exdData->getField< uint32_t >( row, 2 ) );
   itemTradeIn.push_back( exdData->getField< uint32_t >( row, 3 ) );
   itemTradeIn.push_back( exdData->getField< uint32_t >( row, 4 ) );
-  level.push_back( exdData->getField< uint8_t >( row, 16 ) );
+  itemTradeIn.push_back( exdData->getField< uint32_t >( row, 5 ) );
+  itemTradeIn.push_back( exdData->getField< uint32_t >( row, 6 ) );
+  itemTradeIn.push_back( exdData->getField< uint32_t >( row, 7 ) );
+  itemTradeIn.push_back( exdData->getField< uint32_t >( row, 8 ) );
+  itemTradeIn.push_back( exdData->getField< uint32_t >( row, 9 ) );
+  itemTradeIn.push_back( exdData->getField< uint32_t >( row, 10 ) );
+  itemTradeIn.push_back( exdData->getField< uint32_t >( row, 11 ) );
+  itemTradeIn.push_back( exdData->getField< uint32_t >( row, 12 ) );
+  itemTradeIn.push_back( exdData->getField< uint32_t >( row, 13 ) );
+  itemTradeIn.push_back( exdData->getField< uint32_t >( row, 14 ) );
+  itemTradeIn.push_back( exdData->getField< uint32_t >( row, 15 ) );
+  itemTradeIn.push_back( exdData->getField< uint32_t >( row, 16 ) );
   level.push_back( exdData->getField< uint8_t >( row, 17 ) );
   level.push_back( exdData->getField< uint8_t >( row, 18 ) );
   level.push_back( exdData->getField< uint8_t >( row, 19 ) );
   level.push_back( exdData->getField< uint8_t >( row, 20 ) );
-  baseCollectableRating.push_back( exdData->getField< uint8_t >( row, 48 ) );
-  baseCollectableRating.push_back( exdData->getField< uint8_t >( row, 49 ) );
-  baseCollectableRating.push_back( exdData->getField< uint8_t >( row, 50 ) );
-  baseCollectableRating.push_back( exdData->getField< uint8_t >( row, 51 ) );
-  baseCollectableRating.push_back( exdData->getField< uint8_t >( row, 52 ) );
-  midBaseCollectableRating.push_back( exdData->getField< uint16_t >( row, 64 ) );
-  midBaseCollectableRating.push_back( exdData->getField< uint16_t >( row, 65 ) );
-  midBaseCollectableRating.push_back( exdData->getField< uint16_t >( row, 66 ) );
-  midBaseCollectableRating.push_back( exdData->getField< uint16_t >( row, 67 ) );
-  midBaseCollectableRating.push_back( exdData->getField< uint16_t >( row, 68 ) );
-  highBaseCollectableRating.push_back( exdData->getField< uint16_t >( row, 80 ) );
-  highBaseCollectableRating.push_back( exdData->getField< uint16_t >( row, 81 ) );
-  highBaseCollectableRating.push_back( exdData->getField< uint16_t >( row, 82 ) );
-  highBaseCollectableRating.push_back( exdData->getField< uint16_t >( row, 83 ) );
-  highBaseCollectableRating.push_back( exdData->getField< uint16_t >( row, 84 ) );
-  baseCollectableReward.push_back( exdData->getField< uint16_t >( row, 96 ) );
-  baseCollectableReward.push_back( exdData->getField< uint16_t >( row, 97 ) );
-  baseCollectableReward.push_back( exdData->getField< uint16_t >( row, 98 ) );
-  baseCollectableReward.push_back( exdData->getField< uint16_t >( row, 99 ) );
-  baseCollectableReward.push_back( exdData->getField< uint16_t >( row, 100 ) );
-  midCollectableReward.push_back( exdData->getField< uint16_t >( row, 112 ) );
-  midCollectableReward.push_back( exdData->getField< uint16_t >( row, 113 ) );
-  midCollectableReward.push_back( exdData->getField< uint16_t >( row, 114 ) );
-  midCollectableReward.push_back( exdData->getField< uint16_t >( row, 115 ) );
-  midCollectableReward.push_back( exdData->getField< uint16_t >( row, 116 ) );
-  highCollectableReward.push_back( exdData->getField< uint16_t >( row, 128 ) );
-  highCollectableReward.push_back( exdData->getField< uint16_t >( row, 129 ) );
-  highCollectableReward.push_back( exdData->getField< uint16_t >( row, 130 ) );
-  highCollectableReward.push_back( exdData->getField< uint16_t >( row, 131 ) );
-  highCollectableReward.push_back( exdData->getField< uint16_t >( row, 132 ) );
+  level.push_back( exdData->getField< uint8_t >( row, 21 ) );
+  level.push_back( exdData->getField< uint8_t >( row, 22 ) );
+  level.push_back( exdData->getField< uint8_t >( row, 23 ) );
+  level.push_back( exdData->getField< uint8_t >( row, 24 ) );
+  level.push_back( exdData->getField< uint8_t >( row, 25 ) );
+  level.push_back( exdData->getField< uint8_t >( row, 26 ) );
+  level.push_back( exdData->getField< uint8_t >( row, 27 ) );
+  level.push_back( exdData->getField< uint8_t >( row, 28 ) );
+  level.push_back( exdData->getField< uint8_t >( row, 29 ) );
+  level.push_back( exdData->getField< uint8_t >( row, 30 ) );
+  level.push_back( exdData->getField< uint8_t >( row, 31 ) );
+  level.push_back( exdData->getField< uint8_t >( row, 32 ) );
+  level.push_back( exdData->getField< uint8_t >( row, 33 ) );
+  levelMax.push_back( exdData->getField< uint8_t >( row, 34 ) );
+  levelMax.push_back( exdData->getField< uint8_t >( row, 35 ) );
+  levelMax.push_back( exdData->getField< uint8_t >( row, 36 ) );
+  levelMax.push_back( exdData->getField< uint8_t >( row, 37 ) );
+  levelMax.push_back( exdData->getField< uint8_t >( row, 38 ) );
+  levelMax.push_back( exdData->getField< uint8_t >( row, 39 ) );
+  levelMax.push_back( exdData->getField< uint8_t >( row, 40 ) );
+  levelMax.push_back( exdData->getField< uint8_t >( row, 41 ) );
+  levelMax.push_back( exdData->getField< uint8_t >( row, 42 ) );
+  levelMax.push_back( exdData->getField< uint8_t >( row, 43 ) );
+  levelMax.push_back( exdData->getField< uint8_t >( row, 44 ) );
+  levelMax.push_back( exdData->getField< uint8_t >( row, 45 ) );
+  levelMax.push_back( exdData->getField< uint8_t >( row, 46 ) );
+  levelMax.push_back( exdData->getField< uint8_t >( row, 47 ) );
+  levelMax.push_back( exdData->getField< uint8_t >( row, 48 ) );
+  levelMax.push_back( exdData->getField< uint8_t >( row, 49 ) );
+  levelMax.push_back( exdData->getField< uint8_t >( row, 50 ) );
+  baseCollectableRating.push_back( exdData->getField< uint16_t >( row, 68 ) );
+  baseCollectableRating.push_back( exdData->getField< uint16_t >( row, 69 ) );
+  baseCollectableRating.push_back( exdData->getField< uint16_t >( row, 70 ) );
+  baseCollectableRating.push_back( exdData->getField< uint16_t >( row, 71 ) );
+  baseCollectableRating.push_back( exdData->getField< uint16_t >( row, 72 ) );
+  baseCollectableRating.push_back( exdData->getField< uint16_t >( row, 73 ) );
+  baseCollectableRating.push_back( exdData->getField< uint16_t >( row, 74 ) );
+  baseCollectableRating.push_back( exdData->getField< uint16_t >( row, 75 ) );
+  baseCollectableRating.push_back( exdData->getField< uint16_t >( row, 76 ) );
+  baseCollectableRating.push_back( exdData->getField< uint16_t >( row, 77 ) );
+  baseCollectableRating.push_back( exdData->getField< uint16_t >( row, 78 ) );
+  baseCollectableRating.push_back( exdData->getField< uint16_t >( row, 79 ) );
+  baseCollectableRating.push_back( exdData->getField< uint16_t >( row, 80 ) );
+  baseCollectableRating.push_back( exdData->getField< uint16_t >( row, 81 ) );
+  baseCollectableRating.push_back( exdData->getField< uint16_t >( row, 82 ) );
+  baseCollectableRating.push_back( exdData->getField< uint16_t >( row, 83 ) );
+  baseCollectableRating.push_back( exdData->getField< uint16_t >( row, 84 ) );
+  midCollectableRating.push_back( exdData->getField< uint16_t >( row, 85 ) );
+  midCollectableRating.push_back( exdData->getField< uint16_t >( row, 86 ) );
+  midCollectableRating.push_back( exdData->getField< uint16_t >( row, 87 ) );
+  midCollectableRating.push_back( exdData->getField< uint16_t >( row, 88 ) );
+  midCollectableRating.push_back( exdData->getField< uint16_t >( row, 89 ) );
+  midCollectableRating.push_back( exdData->getField< uint16_t >( row, 90 ) );
+  midCollectableRating.push_back( exdData->getField< uint16_t >( row, 91 ) );
+  midCollectableRating.push_back( exdData->getField< uint16_t >( row, 92 ) );
+  midCollectableRating.push_back( exdData->getField< uint16_t >( row, 93 ) );
+  midCollectableRating.push_back( exdData->getField< uint16_t >( row, 94 ) );
+  midCollectableRating.push_back( exdData->getField< uint16_t >( row, 95 ) );
+  midCollectableRating.push_back( exdData->getField< uint16_t >( row, 96 ) );
+  midCollectableRating.push_back( exdData->getField< uint16_t >( row, 97 ) );
+  midCollectableRating.push_back( exdData->getField< uint16_t >( row, 98 ) );
+  midCollectableRating.push_back( exdData->getField< uint16_t >( row, 99 ) );
+  midCollectableRating.push_back( exdData->getField< uint16_t >( row, 100 ) );
+  midCollectableRating.push_back( exdData->getField< uint16_t >( row, 101 ) );
+  highCollectableRating.push_back( exdData->getField< uint16_t >( row, 102 ) );
+  highCollectableRating.push_back( exdData->getField< uint16_t >( row, 103 ) );
+  highCollectableRating.push_back( exdData->getField< uint16_t >( row, 104 ) );
+  highCollectableRating.push_back( exdData->getField< uint16_t >( row, 105 ) );
+  highCollectableRating.push_back( exdData->getField< uint16_t >( row, 106 ) );
+  highCollectableRating.push_back( exdData->getField< uint16_t >( row, 107 ) );
+  highCollectableRating.push_back( exdData->getField< uint16_t >( row, 108 ) );
+  highCollectableRating.push_back( exdData->getField< uint16_t >( row, 109 ) );
+  highCollectableRating.push_back( exdData->getField< uint16_t >( row, 110 ) );
+  highCollectableRating.push_back( exdData->getField< uint16_t >( row, 111 ) );
+  highCollectableRating.push_back( exdData->getField< uint16_t >( row, 112 ) );
+  highCollectableRating.push_back( exdData->getField< uint16_t >( row, 113 ) );
+  highCollectableRating.push_back( exdData->getField< uint16_t >( row, 114 ) );
+  highCollectableRating.push_back( exdData->getField< uint16_t >( row, 115 ) );
+  highCollectableRating.push_back( exdData->getField< uint16_t >( row, 116 ) );
+  highCollectableRating.push_back( exdData->getField< uint16_t >( row, 117 ) );
+  highCollectableRating.push_back( exdData->getField< uint16_t >( row, 118 ) );
+  baseCollectableReward.push_back( exdData->getField< uint16_t >( row, 119 ) );
+  baseCollectableReward.push_back( exdData->getField< uint16_t >( row, 120 ) );
+  baseCollectableReward.push_back( exdData->getField< uint16_t >( row, 121 ) );
+  baseCollectableReward.push_back( exdData->getField< uint16_t >( row, 122 ) );
+  baseCollectableReward.push_back( exdData->getField< uint16_t >( row, 123 ) );
+  baseCollectableReward.push_back( exdData->getField< uint16_t >( row, 124 ) );
+  baseCollectableReward.push_back( exdData->getField< uint16_t >( row, 125 ) );
+  baseCollectableReward.push_back( exdData->getField< uint16_t >( row, 126 ) );
+  baseCollectableReward.push_back( exdData->getField< uint16_t >( row, 127 ) );
+  baseCollectableReward.push_back( exdData->getField< uint16_t >( row, 128 ) );
+  baseCollectableReward.push_back( exdData->getField< uint16_t >( row, 129 ) );
+  baseCollectableReward.push_back( exdData->getField< uint16_t >( row, 130 ) );
+  baseCollectableReward.push_back( exdData->getField< uint16_t >( row, 131 ) );
+  baseCollectableReward.push_back( exdData->getField< uint16_t >( row, 132 ) );
+  baseCollectableReward.push_back( exdData->getField< uint16_t >( row, 133 ) );
+  baseCollectableReward.push_back( exdData->getField< uint16_t >( row, 134 ) );
+  baseCollectableReward.push_back( exdData->getField< uint16_t >( row, 135 ) );
+  midCollectableReward.push_back( exdData->getField< uint16_t >( row, 136 ) );
+  midCollectableReward.push_back( exdData->getField< uint16_t >( row, 137 ) );
+  midCollectableReward.push_back( exdData->getField< uint16_t >( row, 138 ) );
+  midCollectableReward.push_back( exdData->getField< uint16_t >( row, 139 ) );
+  midCollectableReward.push_back( exdData->getField< uint16_t >( row, 140 ) );
+  midCollectableReward.push_back( exdData->getField< uint16_t >( row, 141 ) );
+  midCollectableReward.push_back( exdData->getField< uint16_t >( row, 142 ) );
+  midCollectableReward.push_back( exdData->getField< uint16_t >( row, 143 ) );
+  midCollectableReward.push_back( exdData->getField< uint16_t >( row, 144 ) );
+  midCollectableReward.push_back( exdData->getField< uint16_t >( row, 145 ) );
+  midCollectableReward.push_back( exdData->getField< uint16_t >( row, 146 ) );
+  midCollectableReward.push_back( exdData->getField< uint16_t >( row, 147 ) );
+  midCollectableReward.push_back( exdData->getField< uint16_t >( row, 148 ) );
+  midCollectableReward.push_back( exdData->getField< uint16_t >( row, 149 ) );
+  midCollectableReward.push_back( exdData->getField< uint16_t >( row, 150 ) );
+  midCollectableReward.push_back( exdData->getField< uint16_t >( row, 151 ) );
+  midCollectableReward.push_back( exdData->getField< uint16_t >( row, 152 ) );
+  highCollectableReward.push_back( exdData->getField< uint16_t >( row, 153 ) );
+  highCollectableReward.push_back( exdData->getField< uint16_t >( row, 154 ) );
+  highCollectableReward.push_back( exdData->getField< uint16_t >( row, 155 ) );
+  highCollectableReward.push_back( exdData->getField< uint16_t >( row, 156 ) );
+  highCollectableReward.push_back( exdData->getField< uint16_t >( row, 157 ) );
+  highCollectableReward.push_back( exdData->getField< uint16_t >( row, 158 ) );
+  highCollectableReward.push_back( exdData->getField< uint16_t >( row, 159 ) );
+  highCollectableReward.push_back( exdData->getField< uint16_t >( row, 160 ) );
+  highCollectableReward.push_back( exdData->getField< uint16_t >( row, 161 ) );
+  highCollectableReward.push_back( exdData->getField< uint16_t >( row, 162 ) );
+  highCollectableReward.push_back( exdData->getField< uint16_t >( row, 163 ) );
+  highCollectableReward.push_back( exdData->getField< uint16_t >( row, 164 ) );
+  highCollectableReward.push_back( exdData->getField< uint16_t >( row, 165 ) );
+  highCollectableReward.push_back( exdData->getField< uint16_t >( row, 166 ) );
+  highCollectableReward.push_back( exdData->getField< uint16_t >( row, 167 ) );
+  highCollectableReward.push_back( exdData->getField< uint16_t >( row, 168 ) );
+  highCollectableReward.push_back( exdData->getField< uint16_t >( row, 169 ) );
+  termName.push_back( exdData->getField< uint8_t >( row, 221 ) );
+  termName.push_back( exdData->getField< uint8_t >( row, 222 ) );
+  termName.push_back( exdData->getField< uint8_t >( row, 223 ) );
+  termName.push_back( exdData->getField< uint8_t >( row, 224 ) );
+  termName.push_back( exdData->getField< uint8_t >( row, 225 ) );
+  termName.push_back( exdData->getField< uint8_t >( row, 226 ) );
+  termName.push_back( exdData->getField< uint8_t >( row, 227 ) );
+  termName.push_back( exdData->getField< uint8_t >( row, 228 ) );
+  termName.push_back( exdData->getField< uint8_t >( row, 229 ) );
+  termName.push_back( exdData->getField< uint8_t >( row, 230 ) );
+  termName.push_back( exdData->getField< uint8_t >( row, 231 ) );
+  termName.push_back( exdData->getField< uint8_t >( row, 232 ) );
+  termName.push_back( exdData->getField< uint8_t >( row, 233 ) );
+  termName.push_back( exdData->getField< uint8_t >( row, 234 ) );
+  termName.push_back( exdData->getField< uint8_t >( row, 235 ) );
+  termName.push_back( exdData->getField< uint8_t >( row, 236 ) );
+  termName.push_back( exdData->getField< uint8_t >( row, 237 ) );
 }
 
 Sapphire::Data::HWDCrafterSupplyReward::HWDCrafterSupplyReward( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
@@ -4525,6 +4840,7 @@ Sapphire::Data::HWDCrafterSupplyReward::HWDCrafterSupplyReward( uint32_t row_id,
   auto row = exdData->m_HWDCrafterSupplyRewardDat.get_row( row_id );
   scriptRewardAmount = exdData->getField< uint16_t >( row, 0 );
   expReward = exdData->getField< uint32_t >( row, 1 );
+  Points = exdData->getField< uint16_t >( row, 2 );
 }
 
 Sapphire::Data::HWDDevLayerControl::HWDDevLayerControl( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
@@ -4549,6 +4865,395 @@ Sapphire::Data::HWDDevProgress::HWDDevProgress( uint32_t row_id, Sapphire::Data:
   canGoNext = exdData->getField< bool >( row, 0 );
 }
 
+Sapphire::Data::HWDGathereInspectTerm::HWDGathereInspectTerm( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
+{
+  auto row = exdData->m_HWDGathereInspectTermDat.get_row( row_id );
+  name = exdData->getField< std::string >( row, 0 );
+}
+
+Sapphire::Data::HWDGathererInspection::HWDGathererInspection( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
+{
+  auto row = exdData->m_HWDGathererInspectionDat.get_row( row_id );
+  itemRequired.push_back( exdData->getField< uint32_t >( row, 0 ) );
+  itemRequired.push_back( exdData->getField< uint32_t >( row, 1 ) );
+  itemRequired.push_back( exdData->getField< uint32_t >( row, 2 ) );
+  itemRequired.push_back( exdData->getField< uint32_t >( row, 3 ) );
+  itemRequired.push_back( exdData->getField< uint32_t >( row, 4 ) );
+  itemRequired.push_back( exdData->getField< uint32_t >( row, 5 ) );
+  itemRequired.push_back( exdData->getField< uint32_t >( row, 6 ) );
+  itemRequired.push_back( exdData->getField< uint32_t >( row, 7 ) );
+  itemRequired.push_back( exdData->getField< uint32_t >( row, 8 ) );
+  itemRequired.push_back( exdData->getField< uint32_t >( row, 9 ) );
+  itemRequired.push_back( exdData->getField< uint32_t >( row, 10 ) );
+  itemRequired.push_back( exdData->getField< uint32_t >( row, 11 ) );
+  itemRequired.push_back( exdData->getField< uint32_t >( row, 12 ) );
+  itemRequired.push_back( exdData->getField< uint32_t >( row, 13 ) );
+  itemRequired.push_back( exdData->getField< uint32_t >( row, 14 ) );
+  itemRequired.push_back( exdData->getField< uint32_t >( row, 15 ) );
+  itemRequired.push_back( exdData->getField< uint32_t >( row, 16 ) );
+  itemRequired.push_back( exdData->getField< uint32_t >( row, 17 ) );
+  itemRequired.push_back( exdData->getField< uint32_t >( row, 18 ) );
+  itemRequired.push_back( exdData->getField< uint32_t >( row, 19 ) );
+  itemRequired.push_back( exdData->getField< uint32_t >( row, 20 ) );
+  itemRequired.push_back( exdData->getField< uint32_t >( row, 21 ) );
+  itemRequired.push_back( exdData->getField< uint32_t >( row, 22 ) );
+  itemRequired.push_back( exdData->getField< uint32_t >( row, 23 ) );
+  itemRequired.push_back( exdData->getField< uint32_t >( row, 24 ) );
+  itemRequired.push_back( exdData->getField< uint32_t >( row, 25 ) );
+  itemRequired.push_back( exdData->getField< uint32_t >( row, 26 ) );
+  itemRequired.push_back( exdData->getField< uint32_t >( row, 27 ) );
+  itemRequired.push_back( exdData->getField< uint32_t >( row, 28 ) );
+  itemRequired.push_back( exdData->getField< uint32_t >( row, 29 ) );
+  itemRequired.push_back( exdData->getField< uint32_t >( row, 30 ) );
+  itemRequired.push_back( exdData->getField< uint32_t >( row, 31 ) );
+  itemRequired.push_back( exdData->getField< uint32_t >( row, 32 ) );
+  itemRequired.push_back( exdData->getField< uint32_t >( row, 33 ) );
+  itemRequired.push_back( exdData->getField< uint32_t >( row, 34 ) );
+  itemRequired.push_back( exdData->getField< uint32_t >( row, 35 ) );
+  itemRequired.push_back( exdData->getField< uint32_t >( row, 36 ) );
+  itemRequired.push_back( exdData->getField< uint32_t >( row, 37 ) );
+  itemRequired.push_back( exdData->getField< uint32_t >( row, 38 ) );
+  itemRequired.push_back( exdData->getField< uint32_t >( row, 39 ) );
+  itemRequired.push_back( exdData->getField< uint32_t >( row, 40 ) );
+  itemRequired.push_back( exdData->getField< uint32_t >( row, 41 ) );
+  itemRequired.push_back( exdData->getField< uint32_t >( row, 42 ) );
+  itemRequired.push_back( exdData->getField< uint32_t >( row, 43 ) );
+  itemRequired.push_back( exdData->getField< uint32_t >( row, 44 ) );
+  itemRequired.push_back( exdData->getField< uint32_t >( row, 45 ) );
+  itemRequired.push_back( exdData->getField< uint32_t >( row, 46 ) );
+  itemRequired.push_back( exdData->getField< uint32_t >( row, 47 ) );
+  itemRequired.push_back( exdData->getField< uint32_t >( row, 48 ) );
+  itemRequired.push_back( exdData->getField< uint32_t >( row, 49 ) );
+  itemRequired.push_back( exdData->getField< uint32_t >( row, 50 ) );
+  itemRequired.push_back( exdData->getField< uint32_t >( row, 51 ) );
+  itemRequired.push_back( exdData->getField< uint32_t >( row, 52 ) );
+  fishParameter.push_back( exdData->getField< uint32_t >( row, 53 ) );
+  fishParameter.push_back( exdData->getField< uint32_t >( row, 54 ) );
+  fishParameter.push_back( exdData->getField< uint32_t >( row, 55 ) );
+  fishParameter.push_back( exdData->getField< uint32_t >( row, 56 ) );
+  fishParameter.push_back( exdData->getField< uint32_t >( row, 57 ) );
+  fishParameter.push_back( exdData->getField< uint32_t >( row, 58 ) );
+  fishParameter.push_back( exdData->getField< uint32_t >( row, 59 ) );
+  fishParameter.push_back( exdData->getField< uint32_t >( row, 60 ) );
+  fishParameter.push_back( exdData->getField< uint32_t >( row, 61 ) );
+  fishParameter.push_back( exdData->getField< uint32_t >( row, 62 ) );
+  fishParameter.push_back( exdData->getField< uint32_t >( row, 63 ) );
+  fishParameter.push_back( exdData->getField< uint32_t >( row, 64 ) );
+  fishParameter.push_back( exdData->getField< uint32_t >( row, 65 ) );
+  fishParameter.push_back( exdData->getField< uint32_t >( row, 66 ) );
+  fishParameter.push_back( exdData->getField< uint32_t >( row, 67 ) );
+  fishParameter.push_back( exdData->getField< uint32_t >( row, 68 ) );
+  fishParameter.push_back( exdData->getField< uint32_t >( row, 69 ) );
+  fishParameter.push_back( exdData->getField< uint32_t >( row, 70 ) );
+  fishParameter.push_back( exdData->getField< uint32_t >( row, 71 ) );
+  fishParameter.push_back( exdData->getField< uint32_t >( row, 72 ) );
+  fishParameter.push_back( exdData->getField< uint32_t >( row, 73 ) );
+  fishParameter.push_back( exdData->getField< uint32_t >( row, 74 ) );
+  fishParameter.push_back( exdData->getField< uint32_t >( row, 75 ) );
+  fishParameter.push_back( exdData->getField< uint32_t >( row, 76 ) );
+  fishParameter.push_back( exdData->getField< uint32_t >( row, 77 ) );
+  fishParameter.push_back( exdData->getField< uint32_t >( row, 78 ) );
+  fishParameter.push_back( exdData->getField< uint32_t >( row, 79 ) );
+  fishParameter.push_back( exdData->getField< uint32_t >( row, 80 ) );
+  fishParameter.push_back( exdData->getField< uint32_t >( row, 81 ) );
+  fishParameter.push_back( exdData->getField< uint32_t >( row, 82 ) );
+  fishParameter.push_back( exdData->getField< uint32_t >( row, 83 ) );
+  fishParameter.push_back( exdData->getField< uint32_t >( row, 84 ) );
+  fishParameter.push_back( exdData->getField< uint32_t >( row, 85 ) );
+  fishParameter.push_back( exdData->getField< uint32_t >( row, 86 ) );
+  fishParameter.push_back( exdData->getField< uint32_t >( row, 87 ) );
+  fishParameter.push_back( exdData->getField< uint32_t >( row, 88 ) );
+  fishParameter.push_back( exdData->getField< uint32_t >( row, 89 ) );
+  fishParameter.push_back( exdData->getField< uint32_t >( row, 90 ) );
+  fishParameter.push_back( exdData->getField< uint32_t >( row, 91 ) );
+  fishParameter.push_back( exdData->getField< uint32_t >( row, 92 ) );
+  fishParameter.push_back( exdData->getField< uint32_t >( row, 93 ) );
+  fishParameter.push_back( exdData->getField< uint32_t >( row, 94 ) );
+  fishParameter.push_back( exdData->getField< uint32_t >( row, 95 ) );
+  fishParameter.push_back( exdData->getField< uint32_t >( row, 96 ) );
+  fishParameter.push_back( exdData->getField< uint32_t >( row, 97 ) );
+  fishParameter.push_back( exdData->getField< uint32_t >( row, 98 ) );
+  fishParameter.push_back( exdData->getField< uint32_t >( row, 99 ) );
+  fishParameter.push_back( exdData->getField< uint32_t >( row, 100 ) );
+  fishParameter.push_back( exdData->getField< uint32_t >( row, 101 ) );
+  fishParameter.push_back( exdData->getField< uint32_t >( row, 102 ) );
+  fishParameter.push_back( exdData->getField< uint32_t >( row, 103 ) );
+  fishParameter.push_back( exdData->getField< uint32_t >( row, 104 ) );
+  fishParameter.push_back( exdData->getField< uint32_t >( row, 105 ) );
+  amountRequired.push_back( exdData->getField< uint8_t >( row, 106 ) );
+  amountRequired.push_back( exdData->getField< uint8_t >( row, 107 ) );
+  amountRequired.push_back( exdData->getField< uint8_t >( row, 108 ) );
+  amountRequired.push_back( exdData->getField< uint8_t >( row, 109 ) );
+  amountRequired.push_back( exdData->getField< uint8_t >( row, 110 ) );
+  amountRequired.push_back( exdData->getField< uint8_t >( row, 111 ) );
+  amountRequired.push_back( exdData->getField< uint8_t >( row, 112 ) );
+  amountRequired.push_back( exdData->getField< uint8_t >( row, 113 ) );
+  amountRequired.push_back( exdData->getField< uint8_t >( row, 114 ) );
+  amountRequired.push_back( exdData->getField< uint8_t >( row, 115 ) );
+  amountRequired.push_back( exdData->getField< uint8_t >( row, 116 ) );
+  amountRequired.push_back( exdData->getField< uint8_t >( row, 117 ) );
+  amountRequired.push_back( exdData->getField< uint8_t >( row, 118 ) );
+  amountRequired.push_back( exdData->getField< uint8_t >( row, 119 ) );
+  amountRequired.push_back( exdData->getField< uint8_t >( row, 120 ) );
+  amountRequired.push_back( exdData->getField< uint8_t >( row, 121 ) );
+  amountRequired.push_back( exdData->getField< uint8_t >( row, 122 ) );
+  amountRequired.push_back( exdData->getField< uint8_t >( row, 123 ) );
+  amountRequired.push_back( exdData->getField< uint8_t >( row, 124 ) );
+  amountRequired.push_back( exdData->getField< uint8_t >( row, 125 ) );
+  amountRequired.push_back( exdData->getField< uint8_t >( row, 126 ) );
+  amountRequired.push_back( exdData->getField< uint8_t >( row, 127 ) );
+  amountRequired.push_back( exdData->getField< uint8_t >( row, 128 ) );
+  amountRequired.push_back( exdData->getField< uint8_t >( row, 129 ) );
+  amountRequired.push_back( exdData->getField< uint8_t >( row, 130 ) );
+  amountRequired.push_back( exdData->getField< uint8_t >( row, 131 ) );
+  amountRequired.push_back( exdData->getField< uint8_t >( row, 132 ) );
+  amountRequired.push_back( exdData->getField< uint8_t >( row, 133 ) );
+  amountRequired.push_back( exdData->getField< uint8_t >( row, 134 ) );
+  amountRequired.push_back( exdData->getField< uint8_t >( row, 135 ) );
+  amountRequired.push_back( exdData->getField< uint8_t >( row, 136 ) );
+  amountRequired.push_back( exdData->getField< uint8_t >( row, 137 ) );
+  amountRequired.push_back( exdData->getField< uint8_t >( row, 138 ) );
+  amountRequired.push_back( exdData->getField< uint8_t >( row, 139 ) );
+  amountRequired.push_back( exdData->getField< uint8_t >( row, 140 ) );
+  amountRequired.push_back( exdData->getField< uint8_t >( row, 141 ) );
+  amountRequired.push_back( exdData->getField< uint8_t >( row, 142 ) );
+  amountRequired.push_back( exdData->getField< uint8_t >( row, 143 ) );
+  amountRequired.push_back( exdData->getField< uint8_t >( row, 144 ) );
+  amountRequired.push_back( exdData->getField< uint8_t >( row, 145 ) );
+  amountRequired.push_back( exdData->getField< uint8_t >( row, 146 ) );
+  amountRequired.push_back( exdData->getField< uint8_t >( row, 147 ) );
+  amountRequired.push_back( exdData->getField< uint8_t >( row, 148 ) );
+  amountRequired.push_back( exdData->getField< uint8_t >( row, 149 ) );
+  amountRequired.push_back( exdData->getField< uint8_t >( row, 150 ) );
+  amountRequired.push_back( exdData->getField< uint8_t >( row, 151 ) );
+  amountRequired.push_back( exdData->getField< uint8_t >( row, 152 ) );
+  amountRequired.push_back( exdData->getField< uint8_t >( row, 153 ) );
+  amountRequired.push_back( exdData->getField< uint8_t >( row, 154 ) );
+  amountRequired.push_back( exdData->getField< uint8_t >( row, 155 ) );
+  amountRequired.push_back( exdData->getField< uint8_t >( row, 156 ) );
+  amountRequired.push_back( exdData->getField< uint8_t >( row, 157 ) );
+  amountRequired.push_back( exdData->getField< uint8_t >( row, 158 ) );
+  itemReceived.push_back( exdData->getField< uint32_t >( row, 159 ) );
+  itemReceived.push_back( exdData->getField< uint32_t >( row, 160 ) );
+  itemReceived.push_back( exdData->getField< uint32_t >( row, 161 ) );
+  itemReceived.push_back( exdData->getField< uint32_t >( row, 162 ) );
+  itemReceived.push_back( exdData->getField< uint32_t >( row, 163 ) );
+  itemReceived.push_back( exdData->getField< uint32_t >( row, 164 ) );
+  itemReceived.push_back( exdData->getField< uint32_t >( row, 165 ) );
+  itemReceived.push_back( exdData->getField< uint32_t >( row, 166 ) );
+  itemReceived.push_back( exdData->getField< uint32_t >( row, 167 ) );
+  itemReceived.push_back( exdData->getField< uint32_t >( row, 168 ) );
+  itemReceived.push_back( exdData->getField< uint32_t >( row, 169 ) );
+  itemReceived.push_back( exdData->getField< uint32_t >( row, 170 ) );
+  itemReceived.push_back( exdData->getField< uint32_t >( row, 171 ) );
+  itemReceived.push_back( exdData->getField< uint32_t >( row, 172 ) );
+  itemReceived.push_back( exdData->getField< uint32_t >( row, 173 ) );
+  itemReceived.push_back( exdData->getField< uint32_t >( row, 174 ) );
+  itemReceived.push_back( exdData->getField< uint32_t >( row, 175 ) );
+  itemReceived.push_back( exdData->getField< uint32_t >( row, 176 ) );
+  itemReceived.push_back( exdData->getField< uint32_t >( row, 177 ) );
+  itemReceived.push_back( exdData->getField< uint32_t >( row, 178 ) );
+  itemReceived.push_back( exdData->getField< uint32_t >( row, 179 ) );
+  itemReceived.push_back( exdData->getField< uint32_t >( row, 180 ) );
+  itemReceived.push_back( exdData->getField< uint32_t >( row, 181 ) );
+  itemReceived.push_back( exdData->getField< uint32_t >( row, 182 ) );
+  itemReceived.push_back( exdData->getField< uint32_t >( row, 183 ) );
+  itemReceived.push_back( exdData->getField< uint32_t >( row, 184 ) );
+  itemReceived.push_back( exdData->getField< uint32_t >( row, 185 ) );
+  itemReceived.push_back( exdData->getField< uint32_t >( row, 186 ) );
+  itemReceived.push_back( exdData->getField< uint32_t >( row, 187 ) );
+  itemReceived.push_back( exdData->getField< uint32_t >( row, 188 ) );
+  itemReceived.push_back( exdData->getField< uint32_t >( row, 189 ) );
+  itemReceived.push_back( exdData->getField< uint32_t >( row, 190 ) );
+  itemReceived.push_back( exdData->getField< uint32_t >( row, 191 ) );
+  itemReceived.push_back( exdData->getField< uint32_t >( row, 192 ) );
+  itemReceived.push_back( exdData->getField< uint32_t >( row, 193 ) );
+  itemReceived.push_back( exdData->getField< uint32_t >( row, 194 ) );
+  itemReceived.push_back( exdData->getField< uint32_t >( row, 195 ) );
+  itemReceived.push_back( exdData->getField< uint32_t >( row, 196 ) );
+  itemReceived.push_back( exdData->getField< uint32_t >( row, 197 ) );
+  itemReceived.push_back( exdData->getField< uint32_t >( row, 198 ) );
+  itemReceived.push_back( exdData->getField< uint32_t >( row, 199 ) );
+  itemReceived.push_back( exdData->getField< uint32_t >( row, 200 ) );
+  itemReceived.push_back( exdData->getField< uint32_t >( row, 201 ) );
+  itemReceived.push_back( exdData->getField< uint32_t >( row, 202 ) );
+  itemReceived.push_back( exdData->getField< uint32_t >( row, 203 ) );
+  itemReceived.push_back( exdData->getField< uint32_t >( row, 204 ) );
+  itemReceived.push_back( exdData->getField< uint32_t >( row, 205 ) );
+  itemReceived.push_back( exdData->getField< uint32_t >( row, 206 ) );
+  itemReceived.push_back( exdData->getField< uint32_t >( row, 207 ) );
+  itemReceived.push_back( exdData->getField< uint32_t >( row, 208 ) );
+  itemReceived.push_back( exdData->getField< uint32_t >( row, 209 ) );
+  itemReceived.push_back( exdData->getField< uint32_t >( row, 210 ) );
+  itemReceived.push_back( exdData->getField< uint32_t >( row, 211 ) );
+  reward1.push_back( exdData->getField< uint16_t >( row, 212 ) );
+  reward1.push_back( exdData->getField< uint16_t >( row, 213 ) );
+  reward1.push_back( exdData->getField< uint16_t >( row, 214 ) );
+  reward1.push_back( exdData->getField< uint16_t >( row, 215 ) );
+  reward1.push_back( exdData->getField< uint16_t >( row, 216 ) );
+  reward1.push_back( exdData->getField< uint16_t >( row, 217 ) );
+  reward1.push_back( exdData->getField< uint16_t >( row, 218 ) );
+  reward1.push_back( exdData->getField< uint16_t >( row, 219 ) );
+  reward1.push_back( exdData->getField< uint16_t >( row, 220 ) );
+  reward1.push_back( exdData->getField< uint16_t >( row, 221 ) );
+  reward1.push_back( exdData->getField< uint16_t >( row, 222 ) );
+  reward1.push_back( exdData->getField< uint16_t >( row, 223 ) );
+  reward1.push_back( exdData->getField< uint16_t >( row, 224 ) );
+  reward1.push_back( exdData->getField< uint16_t >( row, 225 ) );
+  reward1.push_back( exdData->getField< uint16_t >( row, 226 ) );
+  reward1.push_back( exdData->getField< uint16_t >( row, 227 ) );
+  reward1.push_back( exdData->getField< uint16_t >( row, 228 ) );
+  reward1.push_back( exdData->getField< uint16_t >( row, 229 ) );
+  reward1.push_back( exdData->getField< uint16_t >( row, 230 ) );
+  reward1.push_back( exdData->getField< uint16_t >( row, 231 ) );
+  reward1.push_back( exdData->getField< uint16_t >( row, 232 ) );
+  reward1.push_back( exdData->getField< uint16_t >( row, 233 ) );
+  reward1.push_back( exdData->getField< uint16_t >( row, 234 ) );
+  reward1.push_back( exdData->getField< uint16_t >( row, 235 ) );
+  reward1.push_back( exdData->getField< uint16_t >( row, 236 ) );
+  reward1.push_back( exdData->getField< uint16_t >( row, 237 ) );
+  reward1.push_back( exdData->getField< uint16_t >( row, 238 ) );
+  reward1.push_back( exdData->getField< uint16_t >( row, 239 ) );
+  reward1.push_back( exdData->getField< uint16_t >( row, 240 ) );
+  reward1.push_back( exdData->getField< uint16_t >( row, 241 ) );
+  reward1.push_back( exdData->getField< uint16_t >( row, 242 ) );
+  reward1.push_back( exdData->getField< uint16_t >( row, 243 ) );
+  reward1.push_back( exdData->getField< uint16_t >( row, 244 ) );
+  reward1.push_back( exdData->getField< uint16_t >( row, 245 ) );
+  reward1.push_back( exdData->getField< uint16_t >( row, 246 ) );
+  reward1.push_back( exdData->getField< uint16_t >( row, 247 ) );
+  reward1.push_back( exdData->getField< uint16_t >( row, 248 ) );
+  reward1.push_back( exdData->getField< uint16_t >( row, 249 ) );
+  reward1.push_back( exdData->getField< uint16_t >( row, 250 ) );
+  reward1.push_back( exdData->getField< uint16_t >( row, 251 ) );
+  reward1.push_back( exdData->getField< uint16_t >( row, 252 ) );
+  reward1.push_back( exdData->getField< uint16_t >( row, 253 ) );
+  reward1.push_back( exdData->getField< uint16_t >( row, 254 ) );
+  reward1.push_back( exdData->getField< uint16_t >( row, 255 ) );
+  reward1.push_back( exdData->getField< uint16_t >( row, 256 ) );
+  reward1.push_back( exdData->getField< uint16_t >( row, 257 ) );
+  reward1.push_back( exdData->getField< uint16_t >( row, 258 ) );
+  reward1.push_back( exdData->getField< uint16_t >( row, 259 ) );
+  reward1.push_back( exdData->getField< uint16_t >( row, 260 ) );
+  reward1.push_back( exdData->getField< uint16_t >( row, 261 ) );
+  reward1.push_back( exdData->getField< uint16_t >( row, 262 ) );
+  reward1.push_back( exdData->getField< uint16_t >( row, 263 ) );
+  reward1.push_back( exdData->getField< uint16_t >( row, 264 ) );
+  reward2.push_back( exdData->getField< uint16_t >( row, 265 ) );
+  reward2.push_back( exdData->getField< uint16_t >( row, 266 ) );
+  reward2.push_back( exdData->getField< uint16_t >( row, 267 ) );
+  reward2.push_back( exdData->getField< uint16_t >( row, 268 ) );
+  reward2.push_back( exdData->getField< uint16_t >( row, 269 ) );
+  reward2.push_back( exdData->getField< uint16_t >( row, 270 ) );
+  reward2.push_back( exdData->getField< uint16_t >( row, 271 ) );
+  reward2.push_back( exdData->getField< uint16_t >( row, 272 ) );
+  reward2.push_back( exdData->getField< uint16_t >( row, 273 ) );
+  reward2.push_back( exdData->getField< uint16_t >( row, 274 ) );
+  reward2.push_back( exdData->getField< uint16_t >( row, 275 ) );
+  reward2.push_back( exdData->getField< uint16_t >( row, 276 ) );
+  reward2.push_back( exdData->getField< uint16_t >( row, 277 ) );
+  reward2.push_back( exdData->getField< uint16_t >( row, 278 ) );
+  reward2.push_back( exdData->getField< uint16_t >( row, 279 ) );
+  reward2.push_back( exdData->getField< uint16_t >( row, 280 ) );
+  reward2.push_back( exdData->getField< uint16_t >( row, 281 ) );
+  reward2.push_back( exdData->getField< uint16_t >( row, 282 ) );
+  reward2.push_back( exdData->getField< uint16_t >( row, 283 ) );
+  reward2.push_back( exdData->getField< uint16_t >( row, 284 ) );
+  reward2.push_back( exdData->getField< uint16_t >( row, 285 ) );
+  reward2.push_back( exdData->getField< uint16_t >( row, 286 ) );
+  reward2.push_back( exdData->getField< uint16_t >( row, 287 ) );
+  reward2.push_back( exdData->getField< uint16_t >( row, 288 ) );
+  reward2.push_back( exdData->getField< uint16_t >( row, 289 ) );
+  reward2.push_back( exdData->getField< uint16_t >( row, 290 ) );
+  reward2.push_back( exdData->getField< uint16_t >( row, 291 ) );
+  reward2.push_back( exdData->getField< uint16_t >( row, 292 ) );
+  reward2.push_back( exdData->getField< uint16_t >( row, 293 ) );
+  reward2.push_back( exdData->getField< uint16_t >( row, 294 ) );
+  reward2.push_back( exdData->getField< uint16_t >( row, 295 ) );
+  reward2.push_back( exdData->getField< uint16_t >( row, 296 ) );
+  reward2.push_back( exdData->getField< uint16_t >( row, 297 ) );
+  reward2.push_back( exdData->getField< uint16_t >( row, 298 ) );
+  reward2.push_back( exdData->getField< uint16_t >( row, 299 ) );
+  reward2.push_back( exdData->getField< uint16_t >( row, 300 ) );
+  reward2.push_back( exdData->getField< uint16_t >( row, 301 ) );
+  reward2.push_back( exdData->getField< uint16_t >( row, 302 ) );
+  reward2.push_back( exdData->getField< uint16_t >( row, 303 ) );
+  reward2.push_back( exdData->getField< uint16_t >( row, 304 ) );
+  reward2.push_back( exdData->getField< uint16_t >( row, 305 ) );
+  reward2.push_back( exdData->getField< uint16_t >( row, 306 ) );
+  reward2.push_back( exdData->getField< uint16_t >( row, 307 ) );
+  reward2.push_back( exdData->getField< uint16_t >( row, 308 ) );
+  reward2.push_back( exdData->getField< uint16_t >( row, 309 ) );
+  reward2.push_back( exdData->getField< uint16_t >( row, 310 ) );
+  reward2.push_back( exdData->getField< uint16_t >( row, 311 ) );
+  reward2.push_back( exdData->getField< uint16_t >( row, 312 ) );
+  reward2.push_back( exdData->getField< uint16_t >( row, 313 ) );
+  reward2.push_back( exdData->getField< uint16_t >( row, 314 ) );
+  reward2.push_back( exdData->getField< uint16_t >( row, 315 ) );
+  reward2.push_back( exdData->getField< uint16_t >( row, 316 ) );
+  reward2.push_back( exdData->getField< uint16_t >( row, 317 ) );
+  phase.push_back( exdData->getField< uint8_t >( row, 318 ) );
+  phase.push_back( exdData->getField< uint8_t >( row, 319 ) );
+  phase.push_back( exdData->getField< uint8_t >( row, 320 ) );
+  phase.push_back( exdData->getField< uint8_t >( row, 321 ) );
+  phase.push_back( exdData->getField< uint8_t >( row, 322 ) );
+  phase.push_back( exdData->getField< uint8_t >( row, 323 ) );
+  phase.push_back( exdData->getField< uint8_t >( row, 324 ) );
+  phase.push_back( exdData->getField< uint8_t >( row, 325 ) );
+  phase.push_back( exdData->getField< uint8_t >( row, 326 ) );
+  phase.push_back( exdData->getField< uint8_t >( row, 327 ) );
+  phase.push_back( exdData->getField< uint8_t >( row, 328 ) );
+  phase.push_back( exdData->getField< uint8_t >( row, 329 ) );
+  phase.push_back( exdData->getField< uint8_t >( row, 330 ) );
+  phase.push_back( exdData->getField< uint8_t >( row, 331 ) );
+  phase.push_back( exdData->getField< uint8_t >( row, 332 ) );
+  phase.push_back( exdData->getField< uint8_t >( row, 333 ) );
+  phase.push_back( exdData->getField< uint8_t >( row, 334 ) );
+  phase.push_back( exdData->getField< uint8_t >( row, 335 ) );
+  phase.push_back( exdData->getField< uint8_t >( row, 336 ) );
+  phase.push_back( exdData->getField< uint8_t >( row, 337 ) );
+  phase.push_back( exdData->getField< uint8_t >( row, 338 ) );
+  phase.push_back( exdData->getField< uint8_t >( row, 339 ) );
+  phase.push_back( exdData->getField< uint8_t >( row, 340 ) );
+  phase.push_back( exdData->getField< uint8_t >( row, 341 ) );
+  phase.push_back( exdData->getField< uint8_t >( row, 342 ) );
+  phase.push_back( exdData->getField< uint8_t >( row, 343 ) );
+  phase.push_back( exdData->getField< uint8_t >( row, 344 ) );
+  phase.push_back( exdData->getField< uint8_t >( row, 345 ) );
+  phase.push_back( exdData->getField< uint8_t >( row, 346 ) );
+  phase.push_back( exdData->getField< uint8_t >( row, 347 ) );
+  phase.push_back( exdData->getField< uint8_t >( row, 348 ) );
+  phase.push_back( exdData->getField< uint8_t >( row, 349 ) );
+  phase.push_back( exdData->getField< uint8_t >( row, 350 ) );
+  phase.push_back( exdData->getField< uint8_t >( row, 351 ) );
+  phase.push_back( exdData->getField< uint8_t >( row, 352 ) );
+  phase.push_back( exdData->getField< uint8_t >( row, 353 ) );
+  phase.push_back( exdData->getField< uint8_t >( row, 354 ) );
+  phase.push_back( exdData->getField< uint8_t >( row, 355 ) );
+  phase.push_back( exdData->getField< uint8_t >( row, 356 ) );
+  phase.push_back( exdData->getField< uint8_t >( row, 357 ) );
+  phase.push_back( exdData->getField< uint8_t >( row, 358 ) );
+  phase.push_back( exdData->getField< uint8_t >( row, 359 ) );
+  phase.push_back( exdData->getField< uint8_t >( row, 360 ) );
+  phase.push_back( exdData->getField< uint8_t >( row, 361 ) );
+  phase.push_back( exdData->getField< uint8_t >( row, 362 ) );
+  phase.push_back( exdData->getField< uint8_t >( row, 363 ) );
+  phase.push_back( exdData->getField< uint8_t >( row, 364 ) );
+  phase.push_back( exdData->getField< uint8_t >( row, 365 ) );
+  phase.push_back( exdData->getField< uint8_t >( row, 366 ) );
+  phase.push_back( exdData->getField< uint8_t >( row, 367 ) );
+  phase.push_back( exdData->getField< uint8_t >( row, 368 ) );
+  phase.push_back( exdData->getField< uint8_t >( row, 369 ) );
+  phase.push_back( exdData->getField< uint8_t >( row, 370 ) );
+}
+
+Sapphire::Data::HWDGathererInspectionReward::HWDGathererInspectionReward( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
+{
+  auto row = exdData->m_HWDGathererInspectionRewardDat.get_row( row_id );
+  scrips = exdData->getField< uint16_t >( row, 0 );
+  points = exdData->getField< uint16_t >( row, 1 );
+}
+
 Sapphire::Data::HWDInfoBoardArticle::HWDInfoBoardArticle( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
 {
   auto row = exdData->m_HWDInfoBoardArticleDat.get_row( row_id );
@@ -4633,6 +5338,55 @@ Sapphire::Data::IKDSpot::IKDSpot( uint32_t row_id, Sapphire::Data::ExdDataGenera
   placeName = exdData->getField< uint32_t >( row, 2 );
 }
 
+Sapphire::Data::InclusionShop::InclusionShop( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
+{
+  auto row = exdData->m_InclusionShopDat.get_row( row_id );
+  category.push_back( exdData->getField< uint16_t >( row, 2 ) );
+  category.push_back( exdData->getField< uint16_t >( row, 3 ) );
+  category.push_back( exdData->getField< uint16_t >( row, 4 ) );
+  category.push_back( exdData->getField< uint16_t >( row, 5 ) );
+  category.push_back( exdData->getField< uint16_t >( row, 6 ) );
+  category.push_back( exdData->getField< uint16_t >( row, 7 ) );
+  category.push_back( exdData->getField< uint16_t >( row, 8 ) );
+  category.push_back( exdData->getField< uint16_t >( row, 9 ) );
+  category.push_back( exdData->getField< uint16_t >( row, 10 ) );
+  category.push_back( exdData->getField< uint16_t >( row, 11 ) );
+  category.push_back( exdData->getField< uint16_t >( row, 12 ) );
+  category.push_back( exdData->getField< uint16_t >( row, 13 ) );
+  category.push_back( exdData->getField< uint16_t >( row, 14 ) );
+  category.push_back( exdData->getField< uint16_t >( row, 15 ) );
+  category.push_back( exdData->getField< uint16_t >( row, 16 ) );
+  category.push_back( exdData->getField< uint16_t >( row, 17 ) );
+  category.push_back( exdData->getField< uint16_t >( row, 18 ) );
+  category.push_back( exdData->getField< uint16_t >( row, 19 ) );
+  category.push_back( exdData->getField< uint16_t >( row, 20 ) );
+  category.push_back( exdData->getField< uint16_t >( row, 21 ) );
+  category.push_back( exdData->getField< uint16_t >( row, 22 ) );
+  category.push_back( exdData->getField< uint16_t >( row, 23 ) );
+  category.push_back( exdData->getField< uint16_t >( row, 24 ) );
+  category.push_back( exdData->getField< uint16_t >( row, 25 ) );
+  category.push_back( exdData->getField< uint16_t >( row, 26 ) );
+  category.push_back( exdData->getField< uint16_t >( row, 27 ) );
+  category.push_back( exdData->getField< uint16_t >( row, 28 ) );
+  category.push_back( exdData->getField< uint16_t >( row, 29 ) );
+  category.push_back( exdData->getField< uint16_t >( row, 30 ) );
+  category.push_back( exdData->getField< uint16_t >( row, 31 ) );
+}
+
+Sapphire::Data::InclusionShopCategory::InclusionShopCategory( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
+{
+  auto row = exdData->m_InclusionShopCategoryDat.get_row( row_id );
+  name = exdData->getField< std::string >( row, 0 );
+  classJobCategory = exdData->getField< uint8_t >( row, 1 );
+  inclusionShopSeries = exdData->getField< uint16_t >( row, 2 );
+}
+
+Sapphire::Data::InclusionShopSeries::InclusionShopSeries( uint32_t row_id, uint32_t subRow, Sapphire::Data::ExdDataGenerated* exdData )
+{
+  auto row = exdData->m_InclusionShopSeriesDat.get_row( row_id, subRow );
+  specialShop = exdData->getField< uint32_t >( row, 0 );
+}
+
 Sapphire::Data::IndividualWeather::IndividualWeather( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
 {
   auto row = exdData->m_IndividualWeatherDat.get_row( row_id );
@@ -4641,11 +5395,15 @@ Sapphire::Data::IndividualWeather::IndividualWeather( uint32_t row_id, Sapphire:
   weather.push_back( exdData->getField< uint8_t >( row, 2 ) );
   weather.push_back( exdData->getField< uint8_t >( row, 3 ) );
   weather.push_back( exdData->getField< uint8_t >( row, 4 ) );
-  quest.push_back( exdData->getField< uint32_t >( row, 10 ) );
-  quest.push_back( exdData->getField< uint32_t >( row, 11 ) );
-  quest.push_back( exdData->getField< uint32_t >( row, 12 ) );
-  quest.push_back( exdData->getField< uint32_t >( row, 13 ) );
-  quest.push_back( exdData->getField< uint32_t >( row, 14 ) );
+  weather.push_back( exdData->getField< uint8_t >( row, 5 ) );
+  addedIn530 = exdData->getField< uint8_t >( row, 12 );
+  addedIn531 = exdData->getField< uint8_t >( row, 13 );
+  quest.push_back( exdData->getField< uint32_t >( row, 15 ) );
+  quest.push_back( exdData->getField< uint32_t >( row, 16 ) );
+  quest.push_back( exdData->getField< uint32_t >( row, 17 ) );
+  quest.push_back( exdData->getField< uint32_t >( row, 18 ) );
+  quest.push_back( exdData->getField< uint32_t >( row, 19 ) );
+  quest.push_back( exdData->getField< uint32_t >( row, 20 ) );
 }
 
 Sapphire::Data::InstanceContent::InstanceContent( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
@@ -4654,29 +5412,29 @@ Sapphire::Data::InstanceContent::InstanceContent( uint32_t row_id, Sapphire::Dat
   instanceContentType = exdData->getField< uint8_t >( row, 0 );
   weekRestriction = exdData->getField< uint8_t >( row, 1 );
   timeLimitmin = exdData->getField< uint16_t >( row, 2 );
-  bGM = exdData->getField< uint16_t >( row, 5 );
-  winBGM = exdData->getField< uint32_t >( row, 6 );
-  cutscene = exdData->getField< uint32_t >( row, 7 );
-  order = exdData->getField< uint8_t >( row, 9 );
-  colosseum = exdData->getField< bool >( row, 10 );
-  instanceContentTextDataBossStart = exdData->getField< uint32_t >( row, 12 );
-  instanceContentTextDataBossEnd = exdData->getField< uint32_t >( row, 13 );
-  bNpcBaseBoss = exdData->getField< uint32_t >( row, 14 );
-  instanceContentTextDataObjectiveStart = exdData->getField< uint32_t >( row, 15 );
-  instanceContentTextDataObjectiveEnd = exdData->getField< uint16_t >( row, 16 );
-  sortKey = exdData->getField< uint32_t >( row, 17 );
-  instanceClearExp = exdData->getField< uint32_t >( row, 18 );
-  newPlayerBonusA = exdData->getField< uint16_t >( row, 20 );
-  finalBossCurrencyC = exdData->getField< uint32_t >( row, 21 );
-  finalBossCurrencyA = exdData->getField< uint16_t >( row, 23 );
-  finalBossCurrencyB = exdData->getField< uint16_t >( row, 24 );
-  newPlayerBonusB = exdData->getField< uint32_t >( row, 25 );
-  instanceClearGil = exdData->getField< uint32_t >( row, 47 );
-  instanceContentRewardItem = exdData->getField< uint8_t >( row, 48 );
-  finalBossExp = exdData->getField< int32_t >( row, 50 );
-  instanceContentBuff = exdData->getField< uint32_t >( row, 51 );
-  reqInstance = exdData->getField< int16_t >( row, 52 );
-  partyCondition = exdData->getField< uint8_t >( row, 54 );
+  bGM = exdData->getField< uint16_t >( row, 4 );
+  winBGM = exdData->getField< uint16_t >( row, 5 );
+  cutscene = exdData->getField< uint32_t >( row, 6 );
+  order = exdData->getField< uint16_t >( row, 8 );
+  colosseum = exdData->getField< uint8_t >( row, 9 );
+  instanceContentTextDataBossStart = exdData->getField< uint32_t >( row, 11 );
+  instanceContentTextDataBossEnd = exdData->getField< uint32_t >( row, 12 );
+  bNpcBaseBoss = exdData->getField< uint32_t >( row, 13 );
+  instanceContentTextDataObjectiveStart = exdData->getField< uint32_t >( row, 14 );
+  instanceContentTextDataObjectiveEnd = exdData->getField< uint32_t >( row, 15 );
+  sortKey = exdData->getField< uint16_t >( row, 16 );
+  instanceClearExp = exdData->getField< uint32_t >( row, 17 );
+  newPlayerBonusA = exdData->getField< uint16_t >( row, 19 );
+  finalBossCurrencyC = exdData->getField< uint16_t >( row, 20 );
+  finalBossCurrencyA = exdData->getField< uint32_t >( row, 22 );
+  finalBossCurrencyB = exdData->getField< uint16_t >( row, 23 );
+  newPlayerBonusB = exdData->getField< uint16_t >( row, 24 );
+  instanceClearGil = exdData->getField< uint32_t >( row, 46 );
+  instanceContentRewardItem = exdData->getField< uint32_t >( row, 47 );
+  finalBossExp = exdData->getField< uint8_t >( row, 49 );
+  instanceContentBuff = exdData->getField< uint32_t >( row, 50 );
+  reqInstance = exdData->getField< int32_t >( row, 51 );
+  partyCondition = exdData->getField< int16_t >( row, 53 );
 }
 
 Sapphire::Data::InstanceContentBuff::InstanceContentBuff( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
@@ -4725,22 +5483,23 @@ Sapphire::Data::Item::Item( uint32_t row_id, Sapphire::Data::ExdDataGenerated* e
   itemUICategory = exdData->getField< uint8_t >( row, 15 );
   itemSearchCategory = exdData->getField< uint8_t >( row, 16 );
   equipSlotCategory = exdData->getField< uint8_t >( row, 17 );
-  stackSize = exdData->getField< uint32_t >( row, 19 );
-  isUnique = exdData->getField< bool >( row, 20 );
-  isUntradable = exdData->getField< bool >( row, 21 );
-  isIndisposable = exdData->getField< bool >( row, 22 );
-  isEquippable = exdData->getField< bool >( row, 23 );
-  priceMid = exdData->getField< uint32_t >( row, 24 );
-  priceLow = exdData->getField< uint32_t >( row, 25 );
-  canBeHq = exdData->getField< bool >( row, 26 );
-  isDyeable = exdData->getField< bool >( row, 27 );
-  isCrestWorthy = exdData->getField< bool >( row, 28 );
-  itemAction = exdData->getField< uint16_t >( row, 29 );
-  cooldowns = exdData->getField< uint16_t >( row, 31 );
-  classJobRepair = exdData->getField< uint8_t >( row, 32 );
-  itemRepair = exdData->getField< int32_t >( row, 33 );
-  itemGlamour = exdData->getField< int32_t >( row, 34 );
-  salvage = exdData->getField< uint16_t >( row, 35 );
+  itemSortCategory = exdData->getField< uint8_t >( row, 18 );
+  stackSize = exdData->getField< uint32_t >( row, 20 );
+  isUnique = exdData->getField< bool >( row, 21 );
+  isUntradable = exdData->getField< bool >( row, 22 );
+  isIndisposable = exdData->getField< bool >( row, 23 );
+  isEquippable = exdData->getField< bool >( row, 24 );
+  priceMid = exdData->getField< uint32_t >( row, 25 );
+  priceLow = exdData->getField< uint32_t >( row, 26 );
+  canBeHq = exdData->getField< bool >( row, 27 );
+  isDyeable = exdData->getField< bool >( row, 28 );
+  isCrestWorthy = exdData->getField< bool >( row, 29 );
+  itemAction = exdData->getField< uint16_t >( row, 30 );
+  cooldowns = exdData->getField< uint16_t >( row, 32 );
+  classJobRepair = exdData->getField< uint8_t >( row, 33 );
+  itemRepair = exdData->getField< int32_t >( row, 34 );
+  itemGlamour = exdData->getField< int32_t >( row, 35 );
+  desynth = exdData->getField< uint16_t >( row, 36 );
   isCollectable = exdData->getField< bool >( row, 37 );
   alwaysCollectable = exdData->getField< bool >( row, 38 );
   aetherialReduce = exdData->getField< uint16_t >( row, 39 );
@@ -4803,6 +5562,21 @@ Sapphire::Data::ItemAction::ItemAction( uint32_t row_id, Sapphire::Data::ExdData
   dataHQ.push_back( exdData->getField< uint16_t >( row, 22 ) );
 }
 
+Sapphire::Data::ItemActionTelepo::ItemActionTelepo( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
+{
+  auto row = exdData->m_ItemActionTelepoDat.get_row( row_id );
+  requirement = exdData->getField< uint32_t >( row, 0 );
+  denyMessage = exdData->getField< uint32_t >( row, 1 );
+}
+
+Sapphire::Data::ItemBarterCheck::ItemBarterCheck( uint32_t row_id, uint32_t subRow, Sapphire::Data::ExdDataGenerated* exdData )
+{
+  auto row = exdData->m_ItemBarterCheckDat.get_row( row_id, subRow );
+  category = exdData->getField< uint16_t >( row, 0 );
+  question = exdData->getField< uint32_t >( row, 1 );
+  confirm = exdData->getField< uint32_t >( row, 2 );
+}
+
 Sapphire::Data::ItemFood::ItemFood( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
 {
   auto row = exdData->m_ItemFoodDat.get_row( row_id );
@@ -4903,6 +5677,12 @@ Sapphire::Data::ItemSeries::ItemSeries( uint32_t row_id, Sapphire::Data::ExdData
   name = exdData->getField< std::string >( row, 0 );
 }
 
+Sapphire::Data::ItemSortCategory::ItemSortCategory( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
+{
+  auto row = exdData->m_ItemSortCategoryDat.get_row( row_id );
+  param = exdData->getField< uint8_t >( row, 0 );
+}
+
 Sapphire::Data::ItemSpecialBonus::ItemSpecialBonus( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
 {
   auto row = exdData->m_ItemSpecialBonusDat.get_row( row_id );
@@ -4984,32 +5764,32 @@ Sapphire::Data::Leve::Leve( uint32_t row_id, Sapphire::Data::ExdDataGenerated* e
   name = exdData->getField< std::string >( row, 0 );
   description = exdData->getField< std::string >( row, 1 );
   leveClient = exdData->getField< int32_t >( row, 2 );
-  leveAssignmentType = exdData->getField< int32_t >( row, 3 );
+  leveAssignmentType = exdData->getField< uint8_t >( row, 3 );
   town = exdData->getField< int32_t >( row, 4 );
-  classJobLevel = exdData->getField< uint16_t >( row, 5 );
-  timeLimit = exdData->getField< uint8_t >( row, 6 );
-  allowanceCost = exdData->getField< uint8_t >( row, 7 );
-  evaluation = exdData->getField< int32_t >( row, 8 );
-  placeNameStart = exdData->getField< int32_t >( row, 9 );
-  placeNameIssued = exdData->getField< int32_t >( row, 10 );
-  classJobCategory = exdData->getField< uint8_t >( row, 12 );
-  journalGenre = exdData->getField< int32_t >( row, 13 );
-  placeNameStartZone = exdData->getField< int32_t >( row, 15 );
-  iconCityState = exdData->getField< int32_t >( row, 16 );
-  dataId = exdData->getField< int32_t >( row, 17 );
-  canCancel = exdData->getField< bool >( row, 18 );
-  maxDifficulty = exdData->getField< uint8_t >( row, 19 );
-  expFactor = exdData->getField< float >( row, 20 );
-  expReward = exdData->getField< uint32_t >( row, 21 );
-  gilReward = exdData->getField< uint32_t >( row, 22 );
-  leveRewardItem = exdData->getField< uint16_t >( row, 23 );
-  leveVfx = exdData->getField< uint8_t >( row, 24 );
-  leveVfxFrame = exdData->getField< uint8_t >( row, 25 );
-  levelLevemete = exdData->getField< uint32_t >( row, 26 );
-  iconIssuer = exdData->getField< int32_t >( row, 27 );
-  lockedLeve = exdData->getField< bool >( row, 28 );
-  levelStart = exdData->getField< uint32_t >( row, 29 );
-  bGM = exdData->getField< uint16_t >( row, 30 );
+  classJobLevel = exdData->getField< uint16_t >( row, 6 );
+  timeLimit = exdData->getField< uint8_t >( row, 7 );
+  allowanceCost = exdData->getField< uint8_t >( row, 8 );
+  evaluation = exdData->getField< int32_t >( row, 9 );
+  placeNameStart = exdData->getField< int32_t >( row, 10 );
+  placeNameIssued = exdData->getField< int32_t >( row, 11 );
+  classJobCategory = exdData->getField< uint8_t >( row, 13 );
+  journalGenre = exdData->getField< int32_t >( row, 14 );
+  placeNameStartZone = exdData->getField< int32_t >( row, 16 );
+  iconCityState = exdData->getField< int32_t >( row, 17 );
+  dataId = exdData->getField< int32_t >( row, 18 );
+  canCancel = exdData->getField< bool >( row, 19 );
+  maxDifficulty = exdData->getField< uint8_t >( row, 20 );
+  expFactor = exdData->getField< float >( row, 21 );
+  expReward = exdData->getField< uint32_t >( row, 22 );
+  gilReward = exdData->getField< uint32_t >( row, 23 );
+  leveRewardItem = exdData->getField< uint16_t >( row, 24 );
+  leveVfx = exdData->getField< uint8_t >( row, 25 );
+  leveVfxFrame = exdData->getField< uint8_t >( row, 26 );
+  levelLevemete = exdData->getField< uint32_t >( row, 27 );
+  iconIssuer = exdData->getField< int32_t >( row, 28 );
+  lockedLeve = exdData->getField< bool >( row, 29 );
+  levelStart = exdData->getField< uint32_t >( row, 30 );
+  bGM = exdData->getField< uint16_t >( row, 31 );
 }
 
 Sapphire::Data::LeveAssignmentType::LeveAssignmentType( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
@@ -5134,6 +5914,9 @@ Sapphire::Data::LotteryExchangeShop::LotteryExchangeShop( uint32_t row_id, Sapph
   amountAccepted.push_back( exdData->getField< uint32_t >( row, 30 ) );
   amountAccepted.push_back( exdData->getField< uint32_t >( row, 31 ) );
   amountAccepted.push_back( exdData->getField< uint32_t >( row, 32 ) );
+  lua = exdData->getField< std::string >( row, 65 );
+  logMessage.push_back( exdData->getField< uint32_t >( row, 66 ) );
+  logMessage.push_back( exdData->getField< uint32_t >( row, 67 ) );
 }
 
 Sapphire::Data::MacroIcon::MacroIcon( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
@@ -5603,6 +6386,35 @@ Sapphire::Data::MovieSubtitleVoyage::MovieSubtitleVoyage( uint32_t row_id, Sapph
   endTime = exdData->getField< float >( row, 1 );
 }
 
+Sapphire::Data::MYCTemporaryItem::MYCTemporaryItem( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
+{
+  auto row = exdData->m_MYCTemporaryItemDat.get_row( row_id );
+  category = exdData->getField< uint8_t >( row, 0 );
+  type = exdData->getField< uint8_t >( row, 1 );
+  action = exdData->getField< uint32_t >( row, 2 );
+  max = exdData->getField< uint8_t >( row, 3 );
+  weight = exdData->getField< uint8_t >( row, 4 );
+  order = exdData->getField< uint8_t >( row, 5 );
+}
+
+Sapphire::Data::MYCTemporaryItemUICategory::MYCTemporaryItemUICategory( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
+{
+  auto row = exdData->m_MYCTemporaryItemUICategoryDat.get_row( row_id );
+  name = exdData->getField< std::string >( row, 0 );
+}
+
+Sapphire::Data::MYCWarResultNotebook::MYCWarResultNotebook( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
+{
+  auto row = exdData->m_MYCWarResultNotebookDat.get_row( row_id );
+  number = exdData->getField< uint8_t >( row, 0 );
+  icon = exdData->getField< int32_t >( row, 1 );
+  image = exdData->getField< int32_t >( row, 2 );
+  rarity = exdData->getField< uint8_t >( row, 3 );
+  nameJP = exdData->getField< std::string >( row, 4 );
+  name = exdData->getField< std::string >( row, 5 );
+  description = exdData->getField< std::string >( row, 6 );
+}
+
 Sapphire::Data::NotebookDivision::NotebookDivision( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
 {
   auto row = exdData->m_NotebookDivisionDat.get_row( row_id );
@@ -5625,6 +6437,7 @@ Sapphire::Data::NotebookDivisionCategory::NotebookDivisionCategory( uint32_t row
 {
   auto row = exdData->m_NotebookDivisionCategoryDat.get_row( row_id );
   name = exdData->getField< std::string >( row, 0 );
+  index = exdData->getField< uint8_t >( row, 1 );
 }
 
 Sapphire::Data::NotoriousMonster::NotoriousMonster( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
@@ -5755,6 +6568,8 @@ Sapphire::Data::OrchestrionCategory::OrchestrionCategory( uint32_t row_id, Sapph
 {
   auto row = exdData->m_OrchestrionCategoryDat.get_row( row_id );
   name = exdData->getField< std::string >( row, 0 );
+  hideCategory = exdData->getField< uint8_t >( row, 1 );
+  order = exdData->getField< uint8_t >( row, 3 );
 }
 
 Sapphire::Data::OrchestrionPath::OrchestrionPath( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
@@ -5770,6 +6585,22 @@ Sapphire::Data::OrchestrionUiparam::OrchestrionUiparam( uint32_t row_id, Sapphir
   order = exdData->getField< uint16_t >( row, 1 );
 }
 
+Sapphire::Data::Ornament::Ornament( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
+{
+  auto row = exdData->m_OrnamentDat.get_row( row_id );
+  model = exdData->getField< uint16_t >( row, 0 );
+  order = exdData->getField< int16_t >( row, 4 );
+  icon = exdData->getField< uint16_t >( row, 5 );
+  transient = exdData->getField< uint16_t >( row, 6 );
+  singular = exdData->getField< std::string >( row, 7 );
+  adjective = exdData->getField< int8_t >( row, 8 );
+  plural = exdData->getField< std::string >( row, 9 );
+  possessivePronoun = exdData->getField< int8_t >( row, 10 );
+  startsWithVowel = exdData->getField< int8_t >( row, 11 );
+  pronoun = exdData->getField< int8_t >( row, 13 );
+  article = exdData->getField< int8_t >( row, 14 );
+}
+
 Sapphire::Data::ParamGrow::ParamGrow( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
 {
   auto row = exdData->m_ParamGrowDat.get_row( row_id );
@@ -5929,8 +6760,11 @@ Sapphire::Data::PlantPotFlowerSeed::PlantPotFlowerSeed( uint32_t row_id, Sapphir
 Sapphire::Data::PreHandler::PreHandler( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
 {
   auto row = exdData->m_PreHandlerDat.get_row( row_id );
-  target = exdData->getField< uint32_t >( row, 0 );
-  actionTimeline = exdData->getField< uint16_t >( row, 2 );
+  image = exdData->getField< uint32_t >( row, 1 );
+  target = exdData->getField< uint32_t >( row, 2 );
+  unlockQuest = exdData->getField< uint32_t >( row, 3 );
+  acceptMessage = exdData->getField< uint32_t >( row, 4 );
+  denyMessage = exdData->getField< uint32_t >( row, 5 );
 }
 
 Sapphire::Data::PresetCamera::PresetCamera( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
@@ -5983,8 +6817,8 @@ Sapphire::Data::PublicContent::PublicContent( uint32_t row_id, Sapphire::Data::E
   name = exdData->getField< std::string >( row, 3 );
   textDataStart = exdData->getField< uint32_t >( row, 4 );
   textDataEnd = exdData->getField< uint32_t >( row, 5 );
-  contentFinderCondition = exdData->getField< uint16_t >( row, 8 );
-  additionalData = exdData->getField< uint16_t >( row, 9 );
+  contentFinderCondition = exdData->getField< uint16_t >( row, 9 );
+  additionalData = exdData->getField< uint16_t >( row, 10 );
 }
 
 Sapphire::Data::PublicContentCutscene::PublicContentCutscene( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
@@ -6063,6 +6897,7 @@ Sapphire::Data::Quest::Quest( uint32_t row_id, Sapphire::Data::ExdDataGenerated*
   questLockJoin = exdData->getField< uint8_t >( row, 13 );
   questLock.push_back( exdData->getField< uint32_t >( row, 14 ) );
   questLock.push_back( exdData->getField< uint32_t >( row, 15 ) );
+  header = exdData->getField< uint16_t >( row, 16 );
   classJobUnlock = exdData->getField< uint8_t >( row, 19 );
   grandCompany = exdData->getField< uint8_t >( row, 20 );
   grandCompanyRank = exdData->getField< uint8_t >( row, 21 );
@@ -6071,23 +6906,27 @@ Sapphire::Data::Quest::Quest( uint32_t row_id, Sapphire::Data::ExdDataGenerated*
   instanceContent.push_back( exdData->getField< uint32_t >( row, 24 ) );
   instanceContent.push_back( exdData->getField< uint32_t >( row, 25 ) );
   festival = exdData->getField< uint8_t >( row, 26 );
+  festivalBegin = exdData->getField< uint8_t >( row, 27 );
+  festivalEnd = exdData->getField< uint8_t >( row, 28 );
   bellStart = exdData->getField< uint16_t >( row, 29 );
   bellEnd = exdData->getField< uint16_t >( row, 30 );
   beastTribe = exdData->getField< uint8_t >( row, 31 );
   beastReputationRank = exdData->getField< uint8_t >( row, 32 );
-  levelMax = exdData->getField< uint16_t >( row, 33 );
+  beastReputationValue = exdData->getField< uint16_t >( row, 33 );
   mountRequired = exdData->getField< int32_t >( row, 36 );
   isHouseRequired = exdData->getField< bool >( row, 37 );
   deliveryQuest = exdData->getField< uint8_t >( row, 38 );
   issuerStart = exdData->getField< uint32_t >( row, 39 );
-  behavior = exdData->getField< uint32_t >( row, 40 );
+  issuerLocation = exdData->getField< uint32_t >( row, 40 );
+  clientBehavior = exdData->getField< uint16_t >( row, 41 );
   targetEnd = exdData->getField< uint32_t >( row, 42 );
   isRepeatable = exdData->getField< bool >( row, 43 );
   repeatIntervalType = exdData->getField< uint8_t >( row, 44 );
   questRepeatFlag = exdData->getField< uint8_t >( row, 45 );
-  unlocksSystemContent = exdData->getField< bool >( row, 46 );
-  type = exdData->getField< uint8_t >( row, 48 );
-  questClassJobSupply = exdData->getField< uint16_t >( row, 49 );
+  canCancel = exdData->getField< bool >( row, 46 );
+  type = exdData->getField< uint8_t >( row, 47 );
+  questClassJobSupply = exdData->getField< uint16_t >( row, 48 );
+  scriptInstruction.push_back( exdData->getField< std::string >( row, 49 ) );
   scriptInstruction.push_back( exdData->getField< std::string >( row, 50 ) );
   scriptInstruction.push_back( exdData->getField< std::string >( row, 51 ) );
   scriptInstruction.push_back( exdData->getField< std::string >( row, 52 ) );
@@ -6137,7 +6976,7 @@ Sapphire::Data::Quest::Quest( uint32_t row_id, Sapphire::Data::ExdDataGenerated*
   scriptInstruction.push_back( exdData->getField< std::string >( row, 96 ) );
   scriptInstruction.push_back( exdData->getField< std::string >( row, 97 ) );
   scriptInstruction.push_back( exdData->getField< std::string >( row, 98 ) );
-  scriptInstruction.push_back( exdData->getField< std::string >( row, 99 ) );
+  scriptArg.push_back( exdData->getField< uint32_t >( row, 99 ) );
   scriptArg.push_back( exdData->getField< uint32_t >( row, 100 ) );
   scriptArg.push_back( exdData->getField< uint32_t >( row, 101 ) );
   scriptArg.push_back( exdData->getField< uint32_t >( row, 102 ) );
@@ -6187,7 +7026,7 @@ Sapphire::Data::Quest::Quest( uint32_t row_id, Sapphire::Data::ExdDataGenerated*
   scriptArg.push_back( exdData->getField< uint32_t >( row, 146 ) );
   scriptArg.push_back( exdData->getField< uint32_t >( row, 147 ) );
   scriptArg.push_back( exdData->getField< uint32_t >( row, 148 ) );
-  scriptArg.push_back( exdData->getField< uint32_t >( row, 149 ) );
+  actorSpawnSeq.push_back( exdData->getField< uint8_t >( row, 149 ) );
   actorSpawnSeq.push_back( exdData->getField< uint8_t >( row, 150 ) );
   actorSpawnSeq.push_back( exdData->getField< uint8_t >( row, 151 ) );
   actorSpawnSeq.push_back( exdData->getField< uint8_t >( row, 152 ) );
@@ -6251,7 +7090,7 @@ Sapphire::Data::Quest::Quest( uint32_t row_id, Sapphire::Data::ExdDataGenerated*
   actorSpawnSeq.push_back( exdData->getField< uint8_t >( row, 210 ) );
   actorSpawnSeq.push_back( exdData->getField< uint8_t >( row, 211 ) );
   actorSpawnSeq.push_back( exdData->getField< uint8_t >( row, 212 ) );
-  actorSpawnSeq.push_back( exdData->getField< uint8_t >( row, 213 ) );
+  actorDespawnSeq.push_back( exdData->getField< uint8_t >( row, 213 ) );
   actorDespawnSeq.push_back( exdData->getField< uint8_t >( row, 214 ) );
   actorDespawnSeq.push_back( exdData->getField< uint8_t >( row, 215 ) );
   actorDespawnSeq.push_back( exdData->getField< uint8_t >( row, 216 ) );
@@ -6315,71 +7154,71 @@ Sapphire::Data::Quest::Quest( uint32_t row_id, Sapphire::Data::ExdDataGenerated*
   actorDespawnSeq.push_back( exdData->getField< uint8_t >( row, 274 ) );
   actorDespawnSeq.push_back( exdData->getField< uint8_t >( row, 275 ) );
   actorDespawnSeq.push_back( exdData->getField< uint8_t >( row, 276 ) );
-  actorDespawnSeq.push_back( exdData->getField< uint8_t >( row, 277 ) );
-  actorSpawn.push_back( exdData->getField< uint32_t >( row, 278 ) );
-  actorSpawn.push_back( exdData->getField< uint32_t >( row, 279 ) );
-  actorSpawn.push_back( exdData->getField< uint32_t >( row, 280 ) );
-  actorSpawn.push_back( exdData->getField< uint32_t >( row, 281 ) );
-  actorSpawn.push_back( exdData->getField< uint32_t >( row, 282 ) );
-  actorSpawn.push_back( exdData->getField< uint32_t >( row, 283 ) );
-  actorSpawn.push_back( exdData->getField< uint32_t >( row, 284 ) );
-  actorSpawn.push_back( exdData->getField< uint32_t >( row, 285 ) );
-  actorSpawn.push_back( exdData->getField< uint32_t >( row, 286 ) );
-  actorSpawn.push_back( exdData->getField< uint32_t >( row, 287 ) );
-  actorSpawn.push_back( exdData->getField< uint32_t >( row, 288 ) );
-  actorSpawn.push_back( exdData->getField< uint32_t >( row, 289 ) );
-  actorSpawn.push_back( exdData->getField< uint32_t >( row, 290 ) );
-  actorSpawn.push_back( exdData->getField< uint32_t >( row, 291 ) );
-  actorSpawn.push_back( exdData->getField< uint32_t >( row, 292 ) );
-  actorSpawn.push_back( exdData->getField< uint32_t >( row, 293 ) );
-  actorSpawn.push_back( exdData->getField< uint32_t >( row, 294 ) );
-  actorSpawn.push_back( exdData->getField< uint32_t >( row, 295 ) );
-  actorSpawn.push_back( exdData->getField< uint32_t >( row, 296 ) );
-  actorSpawn.push_back( exdData->getField< uint32_t >( row, 297 ) );
-  actorSpawn.push_back( exdData->getField< uint32_t >( row, 298 ) );
-  actorSpawn.push_back( exdData->getField< uint32_t >( row, 299 ) );
-  actorSpawn.push_back( exdData->getField< uint32_t >( row, 300 ) );
-  actorSpawn.push_back( exdData->getField< uint32_t >( row, 301 ) );
-  actorSpawn.push_back( exdData->getField< uint32_t >( row, 302 ) );
-  actorSpawn.push_back( exdData->getField< uint32_t >( row, 303 ) );
-  actorSpawn.push_back( exdData->getField< uint32_t >( row, 304 ) );
-  actorSpawn.push_back( exdData->getField< uint32_t >( row, 305 ) );
-  actorSpawn.push_back( exdData->getField< uint32_t >( row, 306 ) );
-  actorSpawn.push_back( exdData->getField< uint32_t >( row, 307 ) );
-  actorSpawn.push_back( exdData->getField< uint32_t >( row, 308 ) );
-  actorSpawn.push_back( exdData->getField< uint32_t >( row, 309 ) );
-  actorSpawn.push_back( exdData->getField< uint32_t >( row, 310 ) );
-  actorSpawn.push_back( exdData->getField< uint32_t >( row, 311 ) );
-  actorSpawn.push_back( exdData->getField< uint32_t >( row, 312 ) );
-  actorSpawn.push_back( exdData->getField< uint32_t >( row, 313 ) );
-  actorSpawn.push_back( exdData->getField< uint32_t >( row, 314 ) );
-  actorSpawn.push_back( exdData->getField< uint32_t >( row, 315 ) );
-  actorSpawn.push_back( exdData->getField< uint32_t >( row, 316 ) );
-  actorSpawn.push_back( exdData->getField< uint32_t >( row, 317 ) );
-  actorSpawn.push_back( exdData->getField< uint32_t >( row, 318 ) );
-  actorSpawn.push_back( exdData->getField< uint32_t >( row, 319 ) );
-  actorSpawn.push_back( exdData->getField< uint32_t >( row, 320 ) );
-  actorSpawn.push_back( exdData->getField< uint32_t >( row, 321 ) );
-  actorSpawn.push_back( exdData->getField< uint32_t >( row, 322 ) );
-  actorSpawn.push_back( exdData->getField< uint32_t >( row, 323 ) );
-  actorSpawn.push_back( exdData->getField< uint32_t >( row, 324 ) );
-  actorSpawn.push_back( exdData->getField< uint32_t >( row, 325 ) );
-  actorSpawn.push_back( exdData->getField< uint32_t >( row, 326 ) );
-  actorSpawn.push_back( exdData->getField< uint32_t >( row, 327 ) );
-  actorSpawn.push_back( exdData->getField< uint32_t >( row, 328 ) );
-  actorSpawn.push_back( exdData->getField< uint32_t >( row, 329 ) );
-  actorSpawn.push_back( exdData->getField< uint32_t >( row, 330 ) );
-  actorSpawn.push_back( exdData->getField< uint32_t >( row, 331 ) );
-  actorSpawn.push_back( exdData->getField< uint32_t >( row, 332 ) );
-  actorSpawn.push_back( exdData->getField< uint32_t >( row, 333 ) );
-  actorSpawn.push_back( exdData->getField< uint32_t >( row, 334 ) );
-  actorSpawn.push_back( exdData->getField< uint32_t >( row, 335 ) );
-  actorSpawn.push_back( exdData->getField< uint32_t >( row, 336 ) );
-  actorSpawn.push_back( exdData->getField< uint32_t >( row, 337 ) );
-  actorSpawn.push_back( exdData->getField< uint32_t >( row, 338 ) );
-  actorSpawn.push_back( exdData->getField< uint32_t >( row, 339 ) );
-  actorSpawn.push_back( exdData->getField< uint32_t >( row, 340 ) );
-  actorSpawn.push_back( exdData->getField< uint32_t >( row, 341 ) );
+  listener.push_back( exdData->getField< uint32_t >( row, 277 ) );
+  listener.push_back( exdData->getField< uint32_t >( row, 278 ) );
+  listener.push_back( exdData->getField< uint32_t >( row, 279 ) );
+  listener.push_back( exdData->getField< uint32_t >( row, 280 ) );
+  listener.push_back( exdData->getField< uint32_t >( row, 281 ) );
+  listener.push_back( exdData->getField< uint32_t >( row, 282 ) );
+  listener.push_back( exdData->getField< uint32_t >( row, 283 ) );
+  listener.push_back( exdData->getField< uint32_t >( row, 284 ) );
+  listener.push_back( exdData->getField< uint32_t >( row, 285 ) );
+  listener.push_back( exdData->getField< uint32_t >( row, 286 ) );
+  listener.push_back( exdData->getField< uint32_t >( row, 287 ) );
+  listener.push_back( exdData->getField< uint32_t >( row, 288 ) );
+  listener.push_back( exdData->getField< uint32_t >( row, 289 ) );
+  listener.push_back( exdData->getField< uint32_t >( row, 290 ) );
+  listener.push_back( exdData->getField< uint32_t >( row, 291 ) );
+  listener.push_back( exdData->getField< uint32_t >( row, 292 ) );
+  listener.push_back( exdData->getField< uint32_t >( row, 293 ) );
+  listener.push_back( exdData->getField< uint32_t >( row, 294 ) );
+  listener.push_back( exdData->getField< uint32_t >( row, 295 ) );
+  listener.push_back( exdData->getField< uint32_t >( row, 296 ) );
+  listener.push_back( exdData->getField< uint32_t >( row, 297 ) );
+  listener.push_back( exdData->getField< uint32_t >( row, 298 ) );
+  listener.push_back( exdData->getField< uint32_t >( row, 299 ) );
+  listener.push_back( exdData->getField< uint32_t >( row, 300 ) );
+  listener.push_back( exdData->getField< uint32_t >( row, 301 ) );
+  listener.push_back( exdData->getField< uint32_t >( row, 302 ) );
+  listener.push_back( exdData->getField< uint32_t >( row, 303 ) );
+  listener.push_back( exdData->getField< uint32_t >( row, 304 ) );
+  listener.push_back( exdData->getField< uint32_t >( row, 305 ) );
+  listener.push_back( exdData->getField< uint32_t >( row, 306 ) );
+  listener.push_back( exdData->getField< uint32_t >( row, 307 ) );
+  listener.push_back( exdData->getField< uint32_t >( row, 308 ) );
+  listener.push_back( exdData->getField< uint32_t >( row, 309 ) );
+  listener.push_back( exdData->getField< uint32_t >( row, 310 ) );
+  listener.push_back( exdData->getField< uint32_t >( row, 311 ) );
+  listener.push_back( exdData->getField< uint32_t >( row, 312 ) );
+  listener.push_back( exdData->getField< uint32_t >( row, 313 ) );
+  listener.push_back( exdData->getField< uint32_t >( row, 314 ) );
+  listener.push_back( exdData->getField< uint32_t >( row, 315 ) );
+  listener.push_back( exdData->getField< uint32_t >( row, 316 ) );
+  listener.push_back( exdData->getField< uint32_t >( row, 317 ) );
+  listener.push_back( exdData->getField< uint32_t >( row, 318 ) );
+  listener.push_back( exdData->getField< uint32_t >( row, 319 ) );
+  listener.push_back( exdData->getField< uint32_t >( row, 320 ) );
+  listener.push_back( exdData->getField< uint32_t >( row, 321 ) );
+  listener.push_back( exdData->getField< uint32_t >( row, 322 ) );
+  listener.push_back( exdData->getField< uint32_t >( row, 323 ) );
+  listener.push_back( exdData->getField< uint32_t >( row, 324 ) );
+  listener.push_back( exdData->getField< uint32_t >( row, 325 ) );
+  listener.push_back( exdData->getField< uint32_t >( row, 326 ) );
+  listener.push_back( exdData->getField< uint32_t >( row, 327 ) );
+  listener.push_back( exdData->getField< uint32_t >( row, 328 ) );
+  listener.push_back( exdData->getField< uint32_t >( row, 329 ) );
+  listener.push_back( exdData->getField< uint32_t >( row, 330 ) );
+  listener.push_back( exdData->getField< uint32_t >( row, 331 ) );
+  listener.push_back( exdData->getField< uint32_t >( row, 332 ) );
+  listener.push_back( exdData->getField< uint32_t >( row, 333 ) );
+  listener.push_back( exdData->getField< uint32_t >( row, 334 ) );
+  listener.push_back( exdData->getField< uint32_t >( row, 335 ) );
+  listener.push_back( exdData->getField< uint32_t >( row, 336 ) );
+  listener.push_back( exdData->getField< uint32_t >( row, 337 ) );
+  listener.push_back( exdData->getField< uint32_t >( row, 338 ) );
+  listener.push_back( exdData->getField< uint32_t >( row, 339 ) );
+  listener.push_back( exdData->getField< uint32_t >( row, 340 ) );
+  questUInt8A.push_back( exdData->getField< uint8_t >( row, 341 ) );
   questUInt8A.push_back( exdData->getField< uint8_t >( row, 342 ) );
   questUInt8A.push_back( exdData->getField< uint8_t >( row, 343 ) );
   questUInt8A.push_back( exdData->getField< uint8_t >( row, 344 ) );
@@ -6411,7 +7250,7 @@ Sapphire::Data::Quest::Quest( uint32_t row_id, Sapphire::Data::ExdDataGenerated*
   questUInt8A.push_back( exdData->getField< uint8_t >( row, 370 ) );
   questUInt8A.push_back( exdData->getField< uint8_t >( row, 371 ) );
   questUInt8A.push_back( exdData->getField< uint8_t >( row, 372 ) );
-  questUInt8A.push_back( exdData->getField< uint8_t >( row, 373 ) );
+  questUInt8B.push_back( exdData->getField< uint8_t >( row, 373 ) );
   questUInt8B.push_back( exdData->getField< uint8_t >( row, 374 ) );
   questUInt8B.push_back( exdData->getField< uint8_t >( row, 375 ) );
   questUInt8B.push_back( exdData->getField< uint8_t >( row, 376 ) );
@@ -6443,7 +7282,775 @@ Sapphire::Data::Quest::Quest( uint32_t row_id, Sapphire::Data::ExdDataGenerated*
   questUInt8B.push_back( exdData->getField< uint8_t >( row, 402 ) );
   questUInt8B.push_back( exdData->getField< uint8_t >( row, 403 ) );
   questUInt8B.push_back( exdData->getField< uint8_t >( row, 404 ) );
-  questUInt8B.push_back( exdData->getField< uint8_t >( row, 405 ) );
+  conditionType.push_back( exdData->getField< uint8_t >( row, 405 ) );
+  conditionType.push_back( exdData->getField< uint8_t >( row, 406 ) );
+  conditionType.push_back( exdData->getField< uint8_t >( row, 407 ) );
+  conditionType.push_back( exdData->getField< uint8_t >( row, 408 ) );
+  conditionType.push_back( exdData->getField< uint8_t >( row, 409 ) );
+  conditionType.push_back( exdData->getField< uint8_t >( row, 410 ) );
+  conditionType.push_back( exdData->getField< uint8_t >( row, 411 ) );
+  conditionType.push_back( exdData->getField< uint8_t >( row, 412 ) );
+  conditionType.push_back( exdData->getField< uint8_t >( row, 413 ) );
+  conditionType.push_back( exdData->getField< uint8_t >( row, 414 ) );
+  conditionType.push_back( exdData->getField< uint8_t >( row, 415 ) );
+  conditionType.push_back( exdData->getField< uint8_t >( row, 416 ) );
+  conditionType.push_back( exdData->getField< uint8_t >( row, 417 ) );
+  conditionType.push_back( exdData->getField< uint8_t >( row, 418 ) );
+  conditionType.push_back( exdData->getField< uint8_t >( row, 419 ) );
+  conditionType.push_back( exdData->getField< uint8_t >( row, 420 ) );
+  conditionType.push_back( exdData->getField< uint8_t >( row, 421 ) );
+  conditionType.push_back( exdData->getField< uint8_t >( row, 422 ) );
+  conditionType.push_back( exdData->getField< uint8_t >( row, 423 ) );
+  conditionType.push_back( exdData->getField< uint8_t >( row, 424 ) );
+  conditionType.push_back( exdData->getField< uint8_t >( row, 425 ) );
+  conditionType.push_back( exdData->getField< uint8_t >( row, 426 ) );
+  conditionType.push_back( exdData->getField< uint8_t >( row, 427 ) );
+  conditionType.push_back( exdData->getField< uint8_t >( row, 428 ) );
+  conditionType.push_back( exdData->getField< uint8_t >( row, 429 ) );
+  conditionType.push_back( exdData->getField< uint8_t >( row, 430 ) );
+  conditionType.push_back( exdData->getField< uint8_t >( row, 431 ) );
+  conditionType.push_back( exdData->getField< uint8_t >( row, 432 ) );
+  conditionType.push_back( exdData->getField< uint8_t >( row, 433 ) );
+  conditionType.push_back( exdData->getField< uint8_t >( row, 434 ) );
+  conditionType.push_back( exdData->getField< uint8_t >( row, 435 ) );
+  conditionType.push_back( exdData->getField< uint8_t >( row, 436 ) );
+  conditionType.push_back( exdData->getField< uint8_t >( row, 437 ) );
+  conditionType.push_back( exdData->getField< uint8_t >( row, 438 ) );
+  conditionType.push_back( exdData->getField< uint8_t >( row, 439 ) );
+  conditionType.push_back( exdData->getField< uint8_t >( row, 440 ) );
+  conditionType.push_back( exdData->getField< uint8_t >( row, 441 ) );
+  conditionType.push_back( exdData->getField< uint8_t >( row, 442 ) );
+  conditionType.push_back( exdData->getField< uint8_t >( row, 443 ) );
+  conditionType.push_back( exdData->getField< uint8_t >( row, 444 ) );
+  conditionType.push_back( exdData->getField< uint8_t >( row, 445 ) );
+  conditionType.push_back( exdData->getField< uint8_t >( row, 446 ) );
+  conditionType.push_back( exdData->getField< uint8_t >( row, 447 ) );
+  conditionType.push_back( exdData->getField< uint8_t >( row, 448 ) );
+  conditionType.push_back( exdData->getField< uint8_t >( row, 449 ) );
+  conditionType.push_back( exdData->getField< uint8_t >( row, 450 ) );
+  conditionType.push_back( exdData->getField< uint8_t >( row, 451 ) );
+  conditionType.push_back( exdData->getField< uint8_t >( row, 452 ) );
+  conditionType.push_back( exdData->getField< uint8_t >( row, 453 ) );
+  conditionType.push_back( exdData->getField< uint8_t >( row, 454 ) );
+  conditionType.push_back( exdData->getField< uint8_t >( row, 455 ) );
+  conditionType.push_back( exdData->getField< uint8_t >( row, 456 ) );
+  conditionType.push_back( exdData->getField< uint8_t >( row, 457 ) );
+  conditionType.push_back( exdData->getField< uint8_t >( row, 458 ) );
+  conditionType.push_back( exdData->getField< uint8_t >( row, 459 ) );
+  conditionType.push_back( exdData->getField< uint8_t >( row, 460 ) );
+  conditionType.push_back( exdData->getField< uint8_t >( row, 461 ) );
+  conditionType.push_back( exdData->getField< uint8_t >( row, 462 ) );
+  conditionType.push_back( exdData->getField< uint8_t >( row, 463 ) );
+  conditionType.push_back( exdData->getField< uint8_t >( row, 464 ) );
+  conditionType.push_back( exdData->getField< uint8_t >( row, 465 ) );
+  conditionType.push_back( exdData->getField< uint8_t >( row, 466 ) );
+  conditionType.push_back( exdData->getField< uint8_t >( row, 467 ) );
+  conditionType.push_back( exdData->getField< uint8_t >( row, 468 ) );
+  conditionValue.push_back( exdData->getField< uint32_t >( row, 469 ) );
+  conditionValue.push_back( exdData->getField< uint32_t >( row, 470 ) );
+  conditionValue.push_back( exdData->getField< uint32_t >( row, 471 ) );
+  conditionValue.push_back( exdData->getField< uint32_t >( row, 472 ) );
+  conditionValue.push_back( exdData->getField< uint32_t >( row, 473 ) );
+  conditionValue.push_back( exdData->getField< uint32_t >( row, 474 ) );
+  conditionValue.push_back( exdData->getField< uint32_t >( row, 475 ) );
+  conditionValue.push_back( exdData->getField< uint32_t >( row, 476 ) );
+  conditionValue.push_back( exdData->getField< uint32_t >( row, 477 ) );
+  conditionValue.push_back( exdData->getField< uint32_t >( row, 478 ) );
+  conditionValue.push_back( exdData->getField< uint32_t >( row, 479 ) );
+  conditionValue.push_back( exdData->getField< uint32_t >( row, 480 ) );
+  conditionValue.push_back( exdData->getField< uint32_t >( row, 481 ) );
+  conditionValue.push_back( exdData->getField< uint32_t >( row, 482 ) );
+  conditionValue.push_back( exdData->getField< uint32_t >( row, 483 ) );
+  conditionValue.push_back( exdData->getField< uint32_t >( row, 484 ) );
+  conditionValue.push_back( exdData->getField< uint32_t >( row, 485 ) );
+  conditionValue.push_back( exdData->getField< uint32_t >( row, 486 ) );
+  conditionValue.push_back( exdData->getField< uint32_t >( row, 487 ) );
+  conditionValue.push_back( exdData->getField< uint32_t >( row, 488 ) );
+  conditionValue.push_back( exdData->getField< uint32_t >( row, 489 ) );
+  conditionValue.push_back( exdData->getField< uint32_t >( row, 490 ) );
+  conditionValue.push_back( exdData->getField< uint32_t >( row, 491 ) );
+  conditionValue.push_back( exdData->getField< uint32_t >( row, 492 ) );
+  conditionValue.push_back( exdData->getField< uint32_t >( row, 493 ) );
+  conditionValue.push_back( exdData->getField< uint32_t >( row, 494 ) );
+  conditionValue.push_back( exdData->getField< uint32_t >( row, 495 ) );
+  conditionValue.push_back( exdData->getField< uint32_t >( row, 496 ) );
+  conditionValue.push_back( exdData->getField< uint32_t >( row, 497 ) );
+  conditionValue.push_back( exdData->getField< uint32_t >( row, 498 ) );
+  conditionValue.push_back( exdData->getField< uint32_t >( row, 499 ) );
+  conditionValue.push_back( exdData->getField< uint32_t >( row, 500 ) );
+  conditionValue.push_back( exdData->getField< uint32_t >( row, 501 ) );
+  conditionValue.push_back( exdData->getField< uint32_t >( row, 502 ) );
+  conditionValue.push_back( exdData->getField< uint32_t >( row, 503 ) );
+  conditionValue.push_back( exdData->getField< uint32_t >( row, 504 ) );
+  conditionValue.push_back( exdData->getField< uint32_t >( row, 505 ) );
+  conditionValue.push_back( exdData->getField< uint32_t >( row, 506 ) );
+  conditionValue.push_back( exdData->getField< uint32_t >( row, 507 ) );
+  conditionValue.push_back( exdData->getField< uint32_t >( row, 508 ) );
+  conditionValue.push_back( exdData->getField< uint32_t >( row, 509 ) );
+  conditionValue.push_back( exdData->getField< uint32_t >( row, 510 ) );
+  conditionValue.push_back( exdData->getField< uint32_t >( row, 511 ) );
+  conditionValue.push_back( exdData->getField< uint32_t >( row, 512 ) );
+  conditionValue.push_back( exdData->getField< uint32_t >( row, 513 ) );
+  conditionValue.push_back( exdData->getField< uint32_t >( row, 514 ) );
+  conditionValue.push_back( exdData->getField< uint32_t >( row, 515 ) );
+  conditionValue.push_back( exdData->getField< uint32_t >( row, 516 ) );
+  conditionValue.push_back( exdData->getField< uint32_t >( row, 517 ) );
+  conditionValue.push_back( exdData->getField< uint32_t >( row, 518 ) );
+  conditionValue.push_back( exdData->getField< uint32_t >( row, 519 ) );
+  conditionValue.push_back( exdData->getField< uint32_t >( row, 520 ) );
+  conditionValue.push_back( exdData->getField< uint32_t >( row, 521 ) );
+  conditionValue.push_back( exdData->getField< uint32_t >( row, 522 ) );
+  conditionValue.push_back( exdData->getField< uint32_t >( row, 523 ) );
+  conditionValue.push_back( exdData->getField< uint32_t >( row, 524 ) );
+  conditionValue.push_back( exdData->getField< uint32_t >( row, 525 ) );
+  conditionValue.push_back( exdData->getField< uint32_t >( row, 526 ) );
+  conditionValue.push_back( exdData->getField< uint32_t >( row, 527 ) );
+  conditionValue.push_back( exdData->getField< uint32_t >( row, 528 ) );
+  conditionValue.push_back( exdData->getField< uint32_t >( row, 529 ) );
+  conditionValue.push_back( exdData->getField< uint32_t >( row, 530 ) );
+  conditionValue.push_back( exdData->getField< uint32_t >( row, 531 ) );
+  conditionValue.push_back( exdData->getField< uint32_t >( row, 532 ) );
+  conditionOperator.push_back( exdData->getField< uint8_t >( row, 533 ) );
+  conditionOperator.push_back( exdData->getField< uint8_t >( row, 534 ) );
+  conditionOperator.push_back( exdData->getField< uint8_t >( row, 535 ) );
+  conditionOperator.push_back( exdData->getField< uint8_t >( row, 536 ) );
+  conditionOperator.push_back( exdData->getField< uint8_t >( row, 537 ) );
+  conditionOperator.push_back( exdData->getField< uint8_t >( row, 538 ) );
+  conditionOperator.push_back( exdData->getField< uint8_t >( row, 539 ) );
+  conditionOperator.push_back( exdData->getField< uint8_t >( row, 540 ) );
+  conditionOperator.push_back( exdData->getField< uint8_t >( row, 541 ) );
+  conditionOperator.push_back( exdData->getField< uint8_t >( row, 542 ) );
+  conditionOperator.push_back( exdData->getField< uint8_t >( row, 543 ) );
+  conditionOperator.push_back( exdData->getField< uint8_t >( row, 544 ) );
+  conditionOperator.push_back( exdData->getField< uint8_t >( row, 545 ) );
+  conditionOperator.push_back( exdData->getField< uint8_t >( row, 546 ) );
+  conditionOperator.push_back( exdData->getField< uint8_t >( row, 547 ) );
+  conditionOperator.push_back( exdData->getField< uint8_t >( row, 548 ) );
+  conditionOperator.push_back( exdData->getField< uint8_t >( row, 549 ) );
+  conditionOperator.push_back( exdData->getField< uint8_t >( row, 550 ) );
+  conditionOperator.push_back( exdData->getField< uint8_t >( row, 551 ) );
+  conditionOperator.push_back( exdData->getField< uint8_t >( row, 552 ) );
+  conditionOperator.push_back( exdData->getField< uint8_t >( row, 553 ) );
+  conditionOperator.push_back( exdData->getField< uint8_t >( row, 554 ) );
+  conditionOperator.push_back( exdData->getField< uint8_t >( row, 555 ) );
+  conditionOperator.push_back( exdData->getField< uint8_t >( row, 556 ) );
+  conditionOperator.push_back( exdData->getField< uint8_t >( row, 557 ) );
+  conditionOperator.push_back( exdData->getField< uint8_t >( row, 558 ) );
+  conditionOperator.push_back( exdData->getField< uint8_t >( row, 559 ) );
+  conditionOperator.push_back( exdData->getField< uint8_t >( row, 560 ) );
+  conditionOperator.push_back( exdData->getField< uint8_t >( row, 561 ) );
+  conditionOperator.push_back( exdData->getField< uint8_t >( row, 562 ) );
+  conditionOperator.push_back( exdData->getField< uint8_t >( row, 563 ) );
+  conditionOperator.push_back( exdData->getField< uint8_t >( row, 564 ) );
+  conditionOperator.push_back( exdData->getField< uint8_t >( row, 565 ) );
+  conditionOperator.push_back( exdData->getField< uint8_t >( row, 566 ) );
+  conditionOperator.push_back( exdData->getField< uint8_t >( row, 567 ) );
+  conditionOperator.push_back( exdData->getField< uint8_t >( row, 568 ) );
+  conditionOperator.push_back( exdData->getField< uint8_t >( row, 569 ) );
+  conditionOperator.push_back( exdData->getField< uint8_t >( row, 570 ) );
+  conditionOperator.push_back( exdData->getField< uint8_t >( row, 571 ) );
+  conditionOperator.push_back( exdData->getField< uint8_t >( row, 572 ) );
+  conditionOperator.push_back( exdData->getField< uint8_t >( row, 573 ) );
+  conditionOperator.push_back( exdData->getField< uint8_t >( row, 574 ) );
+  conditionOperator.push_back( exdData->getField< uint8_t >( row, 575 ) );
+  conditionOperator.push_back( exdData->getField< uint8_t >( row, 576 ) );
+  conditionOperator.push_back( exdData->getField< uint8_t >( row, 577 ) );
+  conditionOperator.push_back( exdData->getField< uint8_t >( row, 578 ) );
+  conditionOperator.push_back( exdData->getField< uint8_t >( row, 579 ) );
+  conditionOperator.push_back( exdData->getField< uint8_t >( row, 580 ) );
+  conditionOperator.push_back( exdData->getField< uint8_t >( row, 581 ) );
+  conditionOperator.push_back( exdData->getField< uint8_t >( row, 582 ) );
+  conditionOperator.push_back( exdData->getField< uint8_t >( row, 583 ) );
+  conditionOperator.push_back( exdData->getField< uint8_t >( row, 584 ) );
+  conditionOperator.push_back( exdData->getField< uint8_t >( row, 585 ) );
+  conditionOperator.push_back( exdData->getField< uint8_t >( row, 586 ) );
+  conditionOperator.push_back( exdData->getField< uint8_t >( row, 587 ) );
+  conditionOperator.push_back( exdData->getField< uint8_t >( row, 588 ) );
+  conditionOperator.push_back( exdData->getField< uint8_t >( row, 589 ) );
+  conditionOperator.push_back( exdData->getField< uint8_t >( row, 590 ) );
+  conditionOperator.push_back( exdData->getField< uint8_t >( row, 591 ) );
+  conditionOperator.push_back( exdData->getField< uint8_t >( row, 592 ) );
+  conditionOperator.push_back( exdData->getField< uint8_t >( row, 593 ) );
+  conditionOperator.push_back( exdData->getField< uint8_t >( row, 594 ) );
+  conditionOperator.push_back( exdData->getField< uint8_t >( row, 595 ) );
+  conditionOperator.push_back( exdData->getField< uint8_t >( row, 596 ) );
+  behavior.push_back( exdData->getField< uint16_t >( row, 597 ) );
+  behavior.push_back( exdData->getField< uint16_t >( row, 598 ) );
+  behavior.push_back( exdData->getField< uint16_t >( row, 599 ) );
+  behavior.push_back( exdData->getField< uint16_t >( row, 600 ) );
+  behavior.push_back( exdData->getField< uint16_t >( row, 601 ) );
+  behavior.push_back( exdData->getField< uint16_t >( row, 602 ) );
+  behavior.push_back( exdData->getField< uint16_t >( row, 603 ) );
+  behavior.push_back( exdData->getField< uint16_t >( row, 604 ) );
+  behavior.push_back( exdData->getField< uint16_t >( row, 605 ) );
+  behavior.push_back( exdData->getField< uint16_t >( row, 606 ) );
+  behavior.push_back( exdData->getField< uint16_t >( row, 607 ) );
+  behavior.push_back( exdData->getField< uint16_t >( row, 608 ) );
+  behavior.push_back( exdData->getField< uint16_t >( row, 609 ) );
+  behavior.push_back( exdData->getField< uint16_t >( row, 610 ) );
+  behavior.push_back( exdData->getField< uint16_t >( row, 611 ) );
+  behavior.push_back( exdData->getField< uint16_t >( row, 612 ) );
+  behavior.push_back( exdData->getField< uint16_t >( row, 613 ) );
+  behavior.push_back( exdData->getField< uint16_t >( row, 614 ) );
+  behavior.push_back( exdData->getField< uint16_t >( row, 615 ) );
+  behavior.push_back( exdData->getField< uint16_t >( row, 616 ) );
+  behavior.push_back( exdData->getField< uint16_t >( row, 617 ) );
+  behavior.push_back( exdData->getField< uint16_t >( row, 618 ) );
+  behavior.push_back( exdData->getField< uint16_t >( row, 619 ) );
+  behavior.push_back( exdData->getField< uint16_t >( row, 620 ) );
+  behavior.push_back( exdData->getField< uint16_t >( row, 621 ) );
+  behavior.push_back( exdData->getField< uint16_t >( row, 622 ) );
+  behavior.push_back( exdData->getField< uint16_t >( row, 623 ) );
+  behavior.push_back( exdData->getField< uint16_t >( row, 624 ) );
+  behavior.push_back( exdData->getField< uint16_t >( row, 625 ) );
+  behavior.push_back( exdData->getField< uint16_t >( row, 626 ) );
+  behavior.push_back( exdData->getField< uint16_t >( row, 627 ) );
+  behavior.push_back( exdData->getField< uint16_t >( row, 628 ) );
+  behavior.push_back( exdData->getField< uint16_t >( row, 629 ) );
+  behavior.push_back( exdData->getField< uint16_t >( row, 630 ) );
+  behavior.push_back( exdData->getField< uint16_t >( row, 631 ) );
+  behavior.push_back( exdData->getField< uint16_t >( row, 632 ) );
+  behavior.push_back( exdData->getField< uint16_t >( row, 633 ) );
+  behavior.push_back( exdData->getField< uint16_t >( row, 634 ) );
+  behavior.push_back( exdData->getField< uint16_t >( row, 635 ) );
+  behavior.push_back( exdData->getField< uint16_t >( row, 636 ) );
+  behavior.push_back( exdData->getField< uint16_t >( row, 637 ) );
+  behavior.push_back( exdData->getField< uint16_t >( row, 638 ) );
+  behavior.push_back( exdData->getField< uint16_t >( row, 639 ) );
+  behavior.push_back( exdData->getField< uint16_t >( row, 640 ) );
+  behavior.push_back( exdData->getField< uint16_t >( row, 641 ) );
+  behavior.push_back( exdData->getField< uint16_t >( row, 642 ) );
+  behavior.push_back( exdData->getField< uint16_t >( row, 643 ) );
+  behavior.push_back( exdData->getField< uint16_t >( row, 644 ) );
+  behavior.push_back( exdData->getField< uint16_t >( row, 645 ) );
+  behavior.push_back( exdData->getField< uint16_t >( row, 646 ) );
+  behavior.push_back( exdData->getField< uint16_t >( row, 647 ) );
+  behavior.push_back( exdData->getField< uint16_t >( row, 648 ) );
+  behavior.push_back( exdData->getField< uint16_t >( row, 649 ) );
+  behavior.push_back( exdData->getField< uint16_t >( row, 650 ) );
+  behavior.push_back( exdData->getField< uint16_t >( row, 651 ) );
+  behavior.push_back( exdData->getField< uint16_t >( row, 652 ) );
+  behavior.push_back( exdData->getField< uint16_t >( row, 653 ) );
+  behavior.push_back( exdData->getField< uint16_t >( row, 654 ) );
+  behavior.push_back( exdData->getField< uint16_t >( row, 655 ) );
+  behavior.push_back( exdData->getField< uint16_t >( row, 656 ) );
+  behavior.push_back( exdData->getField< uint16_t >( row, 657 ) );
+  behavior.push_back( exdData->getField< uint16_t >( row, 658 ) );
+  behavior.push_back( exdData->getField< uint16_t >( row, 659 ) );
+  behavior.push_back( exdData->getField< uint16_t >( row, 660 ) );
+  visibleBool.push_back( exdData->getField< bool >( row, 661 ) );
+  visibleBool.push_back( exdData->getField< bool >( row, 662 ) );
+  visibleBool.push_back( exdData->getField< bool >( row, 663 ) );
+  visibleBool.push_back( exdData->getField< bool >( row, 664 ) );
+  visibleBool.push_back( exdData->getField< bool >( row, 665 ) );
+  visibleBool.push_back( exdData->getField< bool >( row, 666 ) );
+  visibleBool.push_back( exdData->getField< bool >( row, 667 ) );
+  visibleBool.push_back( exdData->getField< bool >( row, 668 ) );
+  visibleBool.push_back( exdData->getField< bool >( row, 669 ) );
+  visibleBool.push_back( exdData->getField< bool >( row, 670 ) );
+  visibleBool.push_back( exdData->getField< bool >( row, 671 ) );
+  visibleBool.push_back( exdData->getField< bool >( row, 672 ) );
+  visibleBool.push_back( exdData->getField< bool >( row, 673 ) );
+  visibleBool.push_back( exdData->getField< bool >( row, 674 ) );
+  visibleBool.push_back( exdData->getField< bool >( row, 675 ) );
+  visibleBool.push_back( exdData->getField< bool >( row, 676 ) );
+  visibleBool.push_back( exdData->getField< bool >( row, 677 ) );
+  visibleBool.push_back( exdData->getField< bool >( row, 678 ) );
+  visibleBool.push_back( exdData->getField< bool >( row, 679 ) );
+  visibleBool.push_back( exdData->getField< bool >( row, 680 ) );
+  visibleBool.push_back( exdData->getField< bool >( row, 681 ) );
+  visibleBool.push_back( exdData->getField< bool >( row, 682 ) );
+  visibleBool.push_back( exdData->getField< bool >( row, 683 ) );
+  visibleBool.push_back( exdData->getField< bool >( row, 684 ) );
+  visibleBool.push_back( exdData->getField< bool >( row, 685 ) );
+  visibleBool.push_back( exdData->getField< bool >( row, 686 ) );
+  visibleBool.push_back( exdData->getField< bool >( row, 687 ) );
+  visibleBool.push_back( exdData->getField< bool >( row, 688 ) );
+  visibleBool.push_back( exdData->getField< bool >( row, 689 ) );
+  visibleBool.push_back( exdData->getField< bool >( row, 690 ) );
+  visibleBool.push_back( exdData->getField< bool >( row, 691 ) );
+  visibleBool.push_back( exdData->getField< bool >( row, 692 ) );
+  visibleBool.push_back( exdData->getField< bool >( row, 693 ) );
+  visibleBool.push_back( exdData->getField< bool >( row, 694 ) );
+  visibleBool.push_back( exdData->getField< bool >( row, 695 ) );
+  visibleBool.push_back( exdData->getField< bool >( row, 696 ) );
+  visibleBool.push_back( exdData->getField< bool >( row, 697 ) );
+  visibleBool.push_back( exdData->getField< bool >( row, 698 ) );
+  visibleBool.push_back( exdData->getField< bool >( row, 699 ) );
+  visibleBool.push_back( exdData->getField< bool >( row, 700 ) );
+  visibleBool.push_back( exdData->getField< bool >( row, 701 ) );
+  visibleBool.push_back( exdData->getField< bool >( row, 702 ) );
+  visibleBool.push_back( exdData->getField< bool >( row, 703 ) );
+  visibleBool.push_back( exdData->getField< bool >( row, 704 ) );
+  visibleBool.push_back( exdData->getField< bool >( row, 705 ) );
+  visibleBool.push_back( exdData->getField< bool >( row, 706 ) );
+  visibleBool.push_back( exdData->getField< bool >( row, 707 ) );
+  visibleBool.push_back( exdData->getField< bool >( row, 708 ) );
+  visibleBool.push_back( exdData->getField< bool >( row, 709 ) );
+  visibleBool.push_back( exdData->getField< bool >( row, 710 ) );
+  visibleBool.push_back( exdData->getField< bool >( row, 711 ) );
+  visibleBool.push_back( exdData->getField< bool >( row, 712 ) );
+  visibleBool.push_back( exdData->getField< bool >( row, 713 ) );
+  visibleBool.push_back( exdData->getField< bool >( row, 714 ) );
+  visibleBool.push_back( exdData->getField< bool >( row, 715 ) );
+  visibleBool.push_back( exdData->getField< bool >( row, 716 ) );
+  visibleBool.push_back( exdData->getField< bool >( row, 717 ) );
+  visibleBool.push_back( exdData->getField< bool >( row, 718 ) );
+  visibleBool.push_back( exdData->getField< bool >( row, 719 ) );
+  visibleBool.push_back( exdData->getField< bool >( row, 720 ) );
+  visibleBool.push_back( exdData->getField< bool >( row, 721 ) );
+  visibleBool.push_back( exdData->getField< bool >( row, 722 ) );
+  visibleBool.push_back( exdData->getField< bool >( row, 723 ) );
+  visibleBool.push_back( exdData->getField< bool >( row, 724 ) );
+  conditionBool.push_back( exdData->getField< bool >( row, 725 ) );
+  conditionBool.push_back( exdData->getField< bool >( row, 726 ) );
+  conditionBool.push_back( exdData->getField< bool >( row, 727 ) );
+  conditionBool.push_back( exdData->getField< bool >( row, 728 ) );
+  conditionBool.push_back( exdData->getField< bool >( row, 729 ) );
+  conditionBool.push_back( exdData->getField< bool >( row, 730 ) );
+  conditionBool.push_back( exdData->getField< bool >( row, 731 ) );
+  conditionBool.push_back( exdData->getField< bool >( row, 732 ) );
+  conditionBool.push_back( exdData->getField< bool >( row, 733 ) );
+  conditionBool.push_back( exdData->getField< bool >( row, 734 ) );
+  conditionBool.push_back( exdData->getField< bool >( row, 735 ) );
+  conditionBool.push_back( exdData->getField< bool >( row, 736 ) );
+  conditionBool.push_back( exdData->getField< bool >( row, 737 ) );
+  conditionBool.push_back( exdData->getField< bool >( row, 738 ) );
+  conditionBool.push_back( exdData->getField< bool >( row, 739 ) );
+  conditionBool.push_back( exdData->getField< bool >( row, 740 ) );
+  conditionBool.push_back( exdData->getField< bool >( row, 741 ) );
+  conditionBool.push_back( exdData->getField< bool >( row, 742 ) );
+  conditionBool.push_back( exdData->getField< bool >( row, 743 ) );
+  conditionBool.push_back( exdData->getField< bool >( row, 744 ) );
+  conditionBool.push_back( exdData->getField< bool >( row, 745 ) );
+  conditionBool.push_back( exdData->getField< bool >( row, 746 ) );
+  conditionBool.push_back( exdData->getField< bool >( row, 747 ) );
+  conditionBool.push_back( exdData->getField< bool >( row, 748 ) );
+  conditionBool.push_back( exdData->getField< bool >( row, 749 ) );
+  conditionBool.push_back( exdData->getField< bool >( row, 750 ) );
+  conditionBool.push_back( exdData->getField< bool >( row, 751 ) );
+  conditionBool.push_back( exdData->getField< bool >( row, 752 ) );
+  conditionBool.push_back( exdData->getField< bool >( row, 753 ) );
+  conditionBool.push_back( exdData->getField< bool >( row, 754 ) );
+  conditionBool.push_back( exdData->getField< bool >( row, 755 ) );
+  conditionBool.push_back( exdData->getField< bool >( row, 756 ) );
+  conditionBool.push_back( exdData->getField< bool >( row, 757 ) );
+  conditionBool.push_back( exdData->getField< bool >( row, 758 ) );
+  conditionBool.push_back( exdData->getField< bool >( row, 759 ) );
+  conditionBool.push_back( exdData->getField< bool >( row, 760 ) );
+  conditionBool.push_back( exdData->getField< bool >( row, 761 ) );
+  conditionBool.push_back( exdData->getField< bool >( row, 762 ) );
+  conditionBool.push_back( exdData->getField< bool >( row, 763 ) );
+  conditionBool.push_back( exdData->getField< bool >( row, 764 ) );
+  conditionBool.push_back( exdData->getField< bool >( row, 765 ) );
+  conditionBool.push_back( exdData->getField< bool >( row, 766 ) );
+  conditionBool.push_back( exdData->getField< bool >( row, 767 ) );
+  conditionBool.push_back( exdData->getField< bool >( row, 768 ) );
+  conditionBool.push_back( exdData->getField< bool >( row, 769 ) );
+  conditionBool.push_back( exdData->getField< bool >( row, 770 ) );
+  conditionBool.push_back( exdData->getField< bool >( row, 771 ) );
+  conditionBool.push_back( exdData->getField< bool >( row, 772 ) );
+  conditionBool.push_back( exdData->getField< bool >( row, 773 ) );
+  conditionBool.push_back( exdData->getField< bool >( row, 774 ) );
+  conditionBool.push_back( exdData->getField< bool >( row, 775 ) );
+  conditionBool.push_back( exdData->getField< bool >( row, 776 ) );
+  conditionBool.push_back( exdData->getField< bool >( row, 777 ) );
+  conditionBool.push_back( exdData->getField< bool >( row, 778 ) );
+  conditionBool.push_back( exdData->getField< bool >( row, 779 ) );
+  conditionBool.push_back( exdData->getField< bool >( row, 780 ) );
+  conditionBool.push_back( exdData->getField< bool >( row, 781 ) );
+  conditionBool.push_back( exdData->getField< bool >( row, 782 ) );
+  conditionBool.push_back( exdData->getField< bool >( row, 783 ) );
+  conditionBool.push_back( exdData->getField< bool >( row, 784 ) );
+  conditionBool.push_back( exdData->getField< bool >( row, 785 ) );
+  conditionBool.push_back( exdData->getField< bool >( row, 786 ) );
+  conditionBool.push_back( exdData->getField< bool >( row, 787 ) );
+  conditionBool.push_back( exdData->getField< bool >( row, 788 ) );
+  itemBool.push_back( exdData->getField< bool >( row, 789 ) );
+  itemBool.push_back( exdData->getField< bool >( row, 790 ) );
+  itemBool.push_back( exdData->getField< bool >( row, 791 ) );
+  itemBool.push_back( exdData->getField< bool >( row, 792 ) );
+  itemBool.push_back( exdData->getField< bool >( row, 793 ) );
+  itemBool.push_back( exdData->getField< bool >( row, 794 ) );
+  itemBool.push_back( exdData->getField< bool >( row, 795 ) );
+  itemBool.push_back( exdData->getField< bool >( row, 796 ) );
+  itemBool.push_back( exdData->getField< bool >( row, 797 ) );
+  itemBool.push_back( exdData->getField< bool >( row, 798 ) );
+  itemBool.push_back( exdData->getField< bool >( row, 799 ) );
+  itemBool.push_back( exdData->getField< bool >( row, 800 ) );
+  itemBool.push_back( exdData->getField< bool >( row, 801 ) );
+  itemBool.push_back( exdData->getField< bool >( row, 802 ) );
+  itemBool.push_back( exdData->getField< bool >( row, 803 ) );
+  itemBool.push_back( exdData->getField< bool >( row, 804 ) );
+  itemBool.push_back( exdData->getField< bool >( row, 805 ) );
+  itemBool.push_back( exdData->getField< bool >( row, 806 ) );
+  itemBool.push_back( exdData->getField< bool >( row, 807 ) );
+  itemBool.push_back( exdData->getField< bool >( row, 808 ) );
+  itemBool.push_back( exdData->getField< bool >( row, 809 ) );
+  itemBool.push_back( exdData->getField< bool >( row, 810 ) );
+  itemBool.push_back( exdData->getField< bool >( row, 811 ) );
+  itemBool.push_back( exdData->getField< bool >( row, 812 ) );
+  itemBool.push_back( exdData->getField< bool >( row, 813 ) );
+  itemBool.push_back( exdData->getField< bool >( row, 814 ) );
+  itemBool.push_back( exdData->getField< bool >( row, 815 ) );
+  itemBool.push_back( exdData->getField< bool >( row, 816 ) );
+  itemBool.push_back( exdData->getField< bool >( row, 817 ) );
+  itemBool.push_back( exdData->getField< bool >( row, 818 ) );
+  itemBool.push_back( exdData->getField< bool >( row, 819 ) );
+  itemBool.push_back( exdData->getField< bool >( row, 820 ) );
+  itemBool.push_back( exdData->getField< bool >( row, 821 ) );
+  itemBool.push_back( exdData->getField< bool >( row, 822 ) );
+  itemBool.push_back( exdData->getField< bool >( row, 823 ) );
+  itemBool.push_back( exdData->getField< bool >( row, 824 ) );
+  itemBool.push_back( exdData->getField< bool >( row, 825 ) );
+  itemBool.push_back( exdData->getField< bool >( row, 826 ) );
+  itemBool.push_back( exdData->getField< bool >( row, 827 ) );
+  itemBool.push_back( exdData->getField< bool >( row, 828 ) );
+  itemBool.push_back( exdData->getField< bool >( row, 829 ) );
+  itemBool.push_back( exdData->getField< bool >( row, 830 ) );
+  itemBool.push_back( exdData->getField< bool >( row, 831 ) );
+  itemBool.push_back( exdData->getField< bool >( row, 832 ) );
+  itemBool.push_back( exdData->getField< bool >( row, 833 ) );
+  itemBool.push_back( exdData->getField< bool >( row, 834 ) );
+  itemBool.push_back( exdData->getField< bool >( row, 835 ) );
+  itemBool.push_back( exdData->getField< bool >( row, 836 ) );
+  itemBool.push_back( exdData->getField< bool >( row, 837 ) );
+  itemBool.push_back( exdData->getField< bool >( row, 838 ) );
+  itemBool.push_back( exdData->getField< bool >( row, 839 ) );
+  itemBool.push_back( exdData->getField< bool >( row, 840 ) );
+  itemBool.push_back( exdData->getField< bool >( row, 841 ) );
+  itemBool.push_back( exdData->getField< bool >( row, 842 ) );
+  itemBool.push_back( exdData->getField< bool >( row, 843 ) );
+  itemBool.push_back( exdData->getField< bool >( row, 844 ) );
+  itemBool.push_back( exdData->getField< bool >( row, 845 ) );
+  itemBool.push_back( exdData->getField< bool >( row, 846 ) );
+  itemBool.push_back( exdData->getField< bool >( row, 847 ) );
+  itemBool.push_back( exdData->getField< bool >( row, 848 ) );
+  itemBool.push_back( exdData->getField< bool >( row, 849 ) );
+  itemBool.push_back( exdData->getField< bool >( row, 850 ) );
+  itemBool.push_back( exdData->getField< bool >( row, 851 ) );
+  itemBool.push_back( exdData->getField< bool >( row, 852 ) );
+  announceBool.push_back( exdData->getField< bool >( row, 853 ) );
+  announceBool.push_back( exdData->getField< bool >( row, 854 ) );
+  announceBool.push_back( exdData->getField< bool >( row, 855 ) );
+  announceBool.push_back( exdData->getField< bool >( row, 856 ) );
+  announceBool.push_back( exdData->getField< bool >( row, 857 ) );
+  announceBool.push_back( exdData->getField< bool >( row, 858 ) );
+  announceBool.push_back( exdData->getField< bool >( row, 859 ) );
+  announceBool.push_back( exdData->getField< bool >( row, 860 ) );
+  announceBool.push_back( exdData->getField< bool >( row, 861 ) );
+  announceBool.push_back( exdData->getField< bool >( row, 862 ) );
+  announceBool.push_back( exdData->getField< bool >( row, 863 ) );
+  announceBool.push_back( exdData->getField< bool >( row, 864 ) );
+  announceBool.push_back( exdData->getField< bool >( row, 865 ) );
+  announceBool.push_back( exdData->getField< bool >( row, 866 ) );
+  announceBool.push_back( exdData->getField< bool >( row, 867 ) );
+  announceBool.push_back( exdData->getField< bool >( row, 868 ) );
+  announceBool.push_back( exdData->getField< bool >( row, 869 ) );
+  announceBool.push_back( exdData->getField< bool >( row, 870 ) );
+  announceBool.push_back( exdData->getField< bool >( row, 871 ) );
+  announceBool.push_back( exdData->getField< bool >( row, 872 ) );
+  announceBool.push_back( exdData->getField< bool >( row, 873 ) );
+  announceBool.push_back( exdData->getField< bool >( row, 874 ) );
+  announceBool.push_back( exdData->getField< bool >( row, 875 ) );
+  announceBool.push_back( exdData->getField< bool >( row, 876 ) );
+  announceBool.push_back( exdData->getField< bool >( row, 877 ) );
+  announceBool.push_back( exdData->getField< bool >( row, 878 ) );
+  announceBool.push_back( exdData->getField< bool >( row, 879 ) );
+  announceBool.push_back( exdData->getField< bool >( row, 880 ) );
+  announceBool.push_back( exdData->getField< bool >( row, 881 ) );
+  announceBool.push_back( exdData->getField< bool >( row, 882 ) );
+  announceBool.push_back( exdData->getField< bool >( row, 883 ) );
+  announceBool.push_back( exdData->getField< bool >( row, 884 ) );
+  announceBool.push_back( exdData->getField< bool >( row, 885 ) );
+  announceBool.push_back( exdData->getField< bool >( row, 886 ) );
+  announceBool.push_back( exdData->getField< bool >( row, 887 ) );
+  announceBool.push_back( exdData->getField< bool >( row, 888 ) );
+  announceBool.push_back( exdData->getField< bool >( row, 889 ) );
+  announceBool.push_back( exdData->getField< bool >( row, 890 ) );
+  announceBool.push_back( exdData->getField< bool >( row, 891 ) );
+  announceBool.push_back( exdData->getField< bool >( row, 892 ) );
+  announceBool.push_back( exdData->getField< bool >( row, 893 ) );
+  announceBool.push_back( exdData->getField< bool >( row, 894 ) );
+  announceBool.push_back( exdData->getField< bool >( row, 895 ) );
+  announceBool.push_back( exdData->getField< bool >( row, 896 ) );
+  announceBool.push_back( exdData->getField< bool >( row, 897 ) );
+  announceBool.push_back( exdData->getField< bool >( row, 898 ) );
+  announceBool.push_back( exdData->getField< bool >( row, 899 ) );
+  announceBool.push_back( exdData->getField< bool >( row, 900 ) );
+  announceBool.push_back( exdData->getField< bool >( row, 901 ) );
+  announceBool.push_back( exdData->getField< bool >( row, 902 ) );
+  announceBool.push_back( exdData->getField< bool >( row, 903 ) );
+  announceBool.push_back( exdData->getField< bool >( row, 904 ) );
+  announceBool.push_back( exdData->getField< bool >( row, 905 ) );
+  announceBool.push_back( exdData->getField< bool >( row, 906 ) );
+  announceBool.push_back( exdData->getField< bool >( row, 907 ) );
+  announceBool.push_back( exdData->getField< bool >( row, 908 ) );
+  announceBool.push_back( exdData->getField< bool >( row, 909 ) );
+  announceBool.push_back( exdData->getField< bool >( row, 910 ) );
+  announceBool.push_back( exdData->getField< bool >( row, 911 ) );
+  announceBool.push_back( exdData->getField< bool >( row, 912 ) );
+  announceBool.push_back( exdData->getField< bool >( row, 913 ) );
+  announceBool.push_back( exdData->getField< bool >( row, 914 ) );
+  announceBool.push_back( exdData->getField< bool >( row, 915 ) );
+  announceBool.push_back( exdData->getField< bool >( row, 916 ) );
+  behaviorBool.push_back( exdData->getField< bool >( row, 917 ) );
+  behaviorBool.push_back( exdData->getField< bool >( row, 918 ) );
+  behaviorBool.push_back( exdData->getField< bool >( row, 919 ) );
+  behaviorBool.push_back( exdData->getField< bool >( row, 920 ) );
+  behaviorBool.push_back( exdData->getField< bool >( row, 921 ) );
+  behaviorBool.push_back( exdData->getField< bool >( row, 922 ) );
+  behaviorBool.push_back( exdData->getField< bool >( row, 923 ) );
+  behaviorBool.push_back( exdData->getField< bool >( row, 924 ) );
+  behaviorBool.push_back( exdData->getField< bool >( row, 925 ) );
+  behaviorBool.push_back( exdData->getField< bool >( row, 926 ) );
+  behaviorBool.push_back( exdData->getField< bool >( row, 927 ) );
+  behaviorBool.push_back( exdData->getField< bool >( row, 928 ) );
+  behaviorBool.push_back( exdData->getField< bool >( row, 929 ) );
+  behaviorBool.push_back( exdData->getField< bool >( row, 930 ) );
+  behaviorBool.push_back( exdData->getField< bool >( row, 931 ) );
+  behaviorBool.push_back( exdData->getField< bool >( row, 932 ) );
+  behaviorBool.push_back( exdData->getField< bool >( row, 933 ) );
+  behaviorBool.push_back( exdData->getField< bool >( row, 934 ) );
+  behaviorBool.push_back( exdData->getField< bool >( row, 935 ) );
+  behaviorBool.push_back( exdData->getField< bool >( row, 936 ) );
+  behaviorBool.push_back( exdData->getField< bool >( row, 937 ) );
+  behaviorBool.push_back( exdData->getField< bool >( row, 938 ) );
+  behaviorBool.push_back( exdData->getField< bool >( row, 939 ) );
+  behaviorBool.push_back( exdData->getField< bool >( row, 940 ) );
+  behaviorBool.push_back( exdData->getField< bool >( row, 941 ) );
+  behaviorBool.push_back( exdData->getField< bool >( row, 942 ) );
+  behaviorBool.push_back( exdData->getField< bool >( row, 943 ) );
+  behaviorBool.push_back( exdData->getField< bool >( row, 944 ) );
+  behaviorBool.push_back( exdData->getField< bool >( row, 945 ) );
+  behaviorBool.push_back( exdData->getField< bool >( row, 946 ) );
+  behaviorBool.push_back( exdData->getField< bool >( row, 947 ) );
+  behaviorBool.push_back( exdData->getField< bool >( row, 948 ) );
+  behaviorBool.push_back( exdData->getField< bool >( row, 949 ) );
+  behaviorBool.push_back( exdData->getField< bool >( row, 950 ) );
+  behaviorBool.push_back( exdData->getField< bool >( row, 951 ) );
+  behaviorBool.push_back( exdData->getField< bool >( row, 952 ) );
+  behaviorBool.push_back( exdData->getField< bool >( row, 953 ) );
+  behaviorBool.push_back( exdData->getField< bool >( row, 954 ) );
+  behaviorBool.push_back( exdData->getField< bool >( row, 955 ) );
+  behaviorBool.push_back( exdData->getField< bool >( row, 956 ) );
+  behaviorBool.push_back( exdData->getField< bool >( row, 957 ) );
+  behaviorBool.push_back( exdData->getField< bool >( row, 958 ) );
+  behaviorBool.push_back( exdData->getField< bool >( row, 959 ) );
+  behaviorBool.push_back( exdData->getField< bool >( row, 960 ) );
+  behaviorBool.push_back( exdData->getField< bool >( row, 961 ) );
+  behaviorBool.push_back( exdData->getField< bool >( row, 962 ) );
+  behaviorBool.push_back( exdData->getField< bool >( row, 963 ) );
+  behaviorBool.push_back( exdData->getField< bool >( row, 964 ) );
+  behaviorBool.push_back( exdData->getField< bool >( row, 965 ) );
+  behaviorBool.push_back( exdData->getField< bool >( row, 966 ) );
+  behaviorBool.push_back( exdData->getField< bool >( row, 967 ) );
+  behaviorBool.push_back( exdData->getField< bool >( row, 968 ) );
+  behaviorBool.push_back( exdData->getField< bool >( row, 969 ) );
+  behaviorBool.push_back( exdData->getField< bool >( row, 970 ) );
+  behaviorBool.push_back( exdData->getField< bool >( row, 971 ) );
+  behaviorBool.push_back( exdData->getField< bool >( row, 972 ) );
+  behaviorBool.push_back( exdData->getField< bool >( row, 973 ) );
+  behaviorBool.push_back( exdData->getField< bool >( row, 974 ) );
+  behaviorBool.push_back( exdData->getField< bool >( row, 975 ) );
+  behaviorBool.push_back( exdData->getField< bool >( row, 976 ) );
+  behaviorBool.push_back( exdData->getField< bool >( row, 977 ) );
+  behaviorBool.push_back( exdData->getField< bool >( row, 978 ) );
+  behaviorBool.push_back( exdData->getField< bool >( row, 979 ) );
+  behaviorBool.push_back( exdData->getField< bool >( row, 980 ) );
+  acceptBool.push_back( exdData->getField< bool >( row, 981 ) );
+  acceptBool.push_back( exdData->getField< bool >( row, 982 ) );
+  acceptBool.push_back( exdData->getField< bool >( row, 983 ) );
+  acceptBool.push_back( exdData->getField< bool >( row, 984 ) );
+  acceptBool.push_back( exdData->getField< bool >( row, 985 ) );
+  acceptBool.push_back( exdData->getField< bool >( row, 986 ) );
+  acceptBool.push_back( exdData->getField< bool >( row, 987 ) );
+  acceptBool.push_back( exdData->getField< bool >( row, 988 ) );
+  acceptBool.push_back( exdData->getField< bool >( row, 989 ) );
+  acceptBool.push_back( exdData->getField< bool >( row, 990 ) );
+  acceptBool.push_back( exdData->getField< bool >( row, 991 ) );
+  acceptBool.push_back( exdData->getField< bool >( row, 992 ) );
+  acceptBool.push_back( exdData->getField< bool >( row, 993 ) );
+  acceptBool.push_back( exdData->getField< bool >( row, 994 ) );
+  acceptBool.push_back( exdData->getField< bool >( row, 995 ) );
+  acceptBool.push_back( exdData->getField< bool >( row, 996 ) );
+  acceptBool.push_back( exdData->getField< bool >( row, 997 ) );
+  acceptBool.push_back( exdData->getField< bool >( row, 998 ) );
+  acceptBool.push_back( exdData->getField< bool >( row, 999 ) );
+  acceptBool.push_back( exdData->getField< bool >( row, 1000 ) );
+  acceptBool.push_back( exdData->getField< bool >( row, 1001 ) );
+  acceptBool.push_back( exdData->getField< bool >( row, 1002 ) );
+  acceptBool.push_back( exdData->getField< bool >( row, 1003 ) );
+  acceptBool.push_back( exdData->getField< bool >( row, 1004 ) );
+  acceptBool.push_back( exdData->getField< bool >( row, 1005 ) );
+  acceptBool.push_back( exdData->getField< bool >( row, 1006 ) );
+  acceptBool.push_back( exdData->getField< bool >( row, 1007 ) );
+  acceptBool.push_back( exdData->getField< bool >( row, 1008 ) );
+  acceptBool.push_back( exdData->getField< bool >( row, 1009 ) );
+  acceptBool.push_back( exdData->getField< bool >( row, 1010 ) );
+  acceptBool.push_back( exdData->getField< bool >( row, 1011 ) );
+  acceptBool.push_back( exdData->getField< bool >( row, 1012 ) );
+  acceptBool.push_back( exdData->getField< bool >( row, 1013 ) );
+  acceptBool.push_back( exdData->getField< bool >( row, 1014 ) );
+  acceptBool.push_back( exdData->getField< bool >( row, 1015 ) );
+  acceptBool.push_back( exdData->getField< bool >( row, 1016 ) );
+  acceptBool.push_back( exdData->getField< bool >( row, 1017 ) );
+  acceptBool.push_back( exdData->getField< bool >( row, 1018 ) );
+  acceptBool.push_back( exdData->getField< bool >( row, 1019 ) );
+  acceptBool.push_back( exdData->getField< bool >( row, 1020 ) );
+  acceptBool.push_back( exdData->getField< bool >( row, 1021 ) );
+  acceptBool.push_back( exdData->getField< bool >( row, 1022 ) );
+  acceptBool.push_back( exdData->getField< bool >( row, 1023 ) );
+  acceptBool.push_back( exdData->getField< bool >( row, 1024 ) );
+  acceptBool.push_back( exdData->getField< bool >( row, 1025 ) );
+  acceptBool.push_back( exdData->getField< bool >( row, 1026 ) );
+  acceptBool.push_back( exdData->getField< bool >( row, 1027 ) );
+  acceptBool.push_back( exdData->getField< bool >( row, 1028 ) );
+  acceptBool.push_back( exdData->getField< bool >( row, 1029 ) );
+  acceptBool.push_back( exdData->getField< bool >( row, 1030 ) );
+  acceptBool.push_back( exdData->getField< bool >( row, 1031 ) );
+  acceptBool.push_back( exdData->getField< bool >( row, 1032 ) );
+  acceptBool.push_back( exdData->getField< bool >( row, 1033 ) );
+  acceptBool.push_back( exdData->getField< bool >( row, 1034 ) );
+  acceptBool.push_back( exdData->getField< bool >( row, 1035 ) );
+  acceptBool.push_back( exdData->getField< bool >( row, 1036 ) );
+  acceptBool.push_back( exdData->getField< bool >( row, 1037 ) );
+  acceptBool.push_back( exdData->getField< bool >( row, 1038 ) );
+  acceptBool.push_back( exdData->getField< bool >( row, 1039 ) );
+  acceptBool.push_back( exdData->getField< bool >( row, 1040 ) );
+  acceptBool.push_back( exdData->getField< bool >( row, 1041 ) );
+  acceptBool.push_back( exdData->getField< bool >( row, 1042 ) );
+  acceptBool.push_back( exdData->getField< bool >( row, 1043 ) );
+  acceptBool.push_back( exdData->getField< bool >( row, 1044 ) );
+  qualifiedBool.push_back( exdData->getField< bool >( row, 1045 ) );
+  qualifiedBool.push_back( exdData->getField< bool >( row, 1046 ) );
+  qualifiedBool.push_back( exdData->getField< bool >( row, 1047 ) );
+  qualifiedBool.push_back( exdData->getField< bool >( row, 1048 ) );
+  qualifiedBool.push_back( exdData->getField< bool >( row, 1049 ) );
+  qualifiedBool.push_back( exdData->getField< bool >( row, 1050 ) );
+  qualifiedBool.push_back( exdData->getField< bool >( row, 1051 ) );
+  qualifiedBool.push_back( exdData->getField< bool >( row, 1052 ) );
+  qualifiedBool.push_back( exdData->getField< bool >( row, 1053 ) );
+  qualifiedBool.push_back( exdData->getField< bool >( row, 1054 ) );
+  qualifiedBool.push_back( exdData->getField< bool >( row, 1055 ) );
+  qualifiedBool.push_back( exdData->getField< bool >( row, 1056 ) );
+  qualifiedBool.push_back( exdData->getField< bool >( row, 1057 ) );
+  qualifiedBool.push_back( exdData->getField< bool >( row, 1058 ) );
+  qualifiedBool.push_back( exdData->getField< bool >( row, 1059 ) );
+  qualifiedBool.push_back( exdData->getField< bool >( row, 1060 ) );
+  qualifiedBool.push_back( exdData->getField< bool >( row, 1061 ) );
+  qualifiedBool.push_back( exdData->getField< bool >( row, 1062 ) );
+  qualifiedBool.push_back( exdData->getField< bool >( row, 1063 ) );
+  qualifiedBool.push_back( exdData->getField< bool >( row, 1064 ) );
+  qualifiedBool.push_back( exdData->getField< bool >( row, 1065 ) );
+  qualifiedBool.push_back( exdData->getField< bool >( row, 1066 ) );
+  qualifiedBool.push_back( exdData->getField< bool >( row, 1067 ) );
+  qualifiedBool.push_back( exdData->getField< bool >( row, 1068 ) );
+  qualifiedBool.push_back( exdData->getField< bool >( row, 1069 ) );
+  qualifiedBool.push_back( exdData->getField< bool >( row, 1070 ) );
+  qualifiedBool.push_back( exdData->getField< bool >( row, 1071 ) );
+  qualifiedBool.push_back( exdData->getField< bool >( row, 1072 ) );
+  qualifiedBool.push_back( exdData->getField< bool >( row, 1073 ) );
+  qualifiedBool.push_back( exdData->getField< bool >( row, 1074 ) );
+  qualifiedBool.push_back( exdData->getField< bool >( row, 1075 ) );
+  qualifiedBool.push_back( exdData->getField< bool >( row, 1076 ) );
+  qualifiedBool.push_back( exdData->getField< bool >( row, 1077 ) );
+  qualifiedBool.push_back( exdData->getField< bool >( row, 1078 ) );
+  qualifiedBool.push_back( exdData->getField< bool >( row, 1079 ) );
+  qualifiedBool.push_back( exdData->getField< bool >( row, 1080 ) );
+  qualifiedBool.push_back( exdData->getField< bool >( row, 1081 ) );
+  qualifiedBool.push_back( exdData->getField< bool >( row, 1082 ) );
+  qualifiedBool.push_back( exdData->getField< bool >( row, 1083 ) );
+  qualifiedBool.push_back( exdData->getField< bool >( row, 1084 ) );
+  qualifiedBool.push_back( exdData->getField< bool >( row, 1085 ) );
+  qualifiedBool.push_back( exdData->getField< bool >( row, 1086 ) );
+  qualifiedBool.push_back( exdData->getField< bool >( row, 1087 ) );
+  qualifiedBool.push_back( exdData->getField< bool >( row, 1088 ) );
+  qualifiedBool.push_back( exdData->getField< bool >( row, 1089 ) );
+  qualifiedBool.push_back( exdData->getField< bool >( row, 1090 ) );
+  qualifiedBool.push_back( exdData->getField< bool >( row, 1091 ) );
+  qualifiedBool.push_back( exdData->getField< bool >( row, 1092 ) );
+  qualifiedBool.push_back( exdData->getField< bool >( row, 1093 ) );
+  qualifiedBool.push_back( exdData->getField< bool >( row, 1094 ) );
+  qualifiedBool.push_back( exdData->getField< bool >( row, 1095 ) );
+  qualifiedBool.push_back( exdData->getField< bool >( row, 1096 ) );
+  qualifiedBool.push_back( exdData->getField< bool >( row, 1097 ) );
+  qualifiedBool.push_back( exdData->getField< bool >( row, 1098 ) );
+  qualifiedBool.push_back( exdData->getField< bool >( row, 1099 ) );
+  qualifiedBool.push_back( exdData->getField< bool >( row, 1100 ) );
+  qualifiedBool.push_back( exdData->getField< bool >( row, 1101 ) );
+  qualifiedBool.push_back( exdData->getField< bool >( row, 1102 ) );
+  qualifiedBool.push_back( exdData->getField< bool >( row, 1103 ) );
+  qualifiedBool.push_back( exdData->getField< bool >( row, 1104 ) );
+  qualifiedBool.push_back( exdData->getField< bool >( row, 1105 ) );
+  qualifiedBool.push_back( exdData->getField< bool >( row, 1106 ) );
+  qualifiedBool.push_back( exdData->getField< bool >( row, 1107 ) );
+  qualifiedBool.push_back( exdData->getField< bool >( row, 1108 ) );
+  canTargetBool.push_back( exdData->getField< bool >( row, 1109 ) );
+  canTargetBool.push_back( exdData->getField< bool >( row, 1110 ) );
+  canTargetBool.push_back( exdData->getField< bool >( row, 1111 ) );
+  canTargetBool.push_back( exdData->getField< bool >( row, 1112 ) );
+  canTargetBool.push_back( exdData->getField< bool >( row, 1113 ) );
+  canTargetBool.push_back( exdData->getField< bool >( row, 1114 ) );
+  canTargetBool.push_back( exdData->getField< bool >( row, 1115 ) );
+  canTargetBool.push_back( exdData->getField< bool >( row, 1116 ) );
+  canTargetBool.push_back( exdData->getField< bool >( row, 1117 ) );
+  canTargetBool.push_back( exdData->getField< bool >( row, 1118 ) );
+  canTargetBool.push_back( exdData->getField< bool >( row, 1119 ) );
+  canTargetBool.push_back( exdData->getField< bool >( row, 1120 ) );
+  canTargetBool.push_back( exdData->getField< bool >( row, 1121 ) );
+  canTargetBool.push_back( exdData->getField< bool >( row, 1122 ) );
+  canTargetBool.push_back( exdData->getField< bool >( row, 1123 ) );
+  canTargetBool.push_back( exdData->getField< bool >( row, 1124 ) );
+  canTargetBool.push_back( exdData->getField< bool >( row, 1125 ) );
+  canTargetBool.push_back( exdData->getField< bool >( row, 1126 ) );
+  canTargetBool.push_back( exdData->getField< bool >( row, 1127 ) );
+  canTargetBool.push_back( exdData->getField< bool >( row, 1128 ) );
+  canTargetBool.push_back( exdData->getField< bool >( row, 1129 ) );
+  canTargetBool.push_back( exdData->getField< bool >( row, 1130 ) );
+  canTargetBool.push_back( exdData->getField< bool >( row, 1131 ) );
+  canTargetBool.push_back( exdData->getField< bool >( row, 1132 ) );
+  canTargetBool.push_back( exdData->getField< bool >( row, 1133 ) );
+  canTargetBool.push_back( exdData->getField< bool >( row, 1134 ) );
+  canTargetBool.push_back( exdData->getField< bool >( row, 1135 ) );
+  canTargetBool.push_back( exdData->getField< bool >( row, 1136 ) );
+  canTargetBool.push_back( exdData->getField< bool >( row, 1137 ) );
+  canTargetBool.push_back( exdData->getField< bool >( row, 1138 ) );
+  canTargetBool.push_back( exdData->getField< bool >( row, 1139 ) );
+  canTargetBool.push_back( exdData->getField< bool >( row, 1140 ) );
+  canTargetBool.push_back( exdData->getField< bool >( row, 1141 ) );
+  canTargetBool.push_back( exdData->getField< bool >( row, 1142 ) );
+  canTargetBool.push_back( exdData->getField< bool >( row, 1143 ) );
+  canTargetBool.push_back( exdData->getField< bool >( row, 1144 ) );
+  canTargetBool.push_back( exdData->getField< bool >( row, 1145 ) );
+  canTargetBool.push_back( exdData->getField< bool >( row, 1146 ) );
+  canTargetBool.push_back( exdData->getField< bool >( row, 1147 ) );
+  canTargetBool.push_back( exdData->getField< bool >( row, 1148 ) );
+  canTargetBool.push_back( exdData->getField< bool >( row, 1149 ) );
+  canTargetBool.push_back( exdData->getField< bool >( row, 1150 ) );
+  canTargetBool.push_back( exdData->getField< bool >( row, 1151 ) );
+  canTargetBool.push_back( exdData->getField< bool >( row, 1152 ) );
+  canTargetBool.push_back( exdData->getField< bool >( row, 1153 ) );
+  canTargetBool.push_back( exdData->getField< bool >( row, 1154 ) );
+  canTargetBool.push_back( exdData->getField< bool >( row, 1155 ) );
+  canTargetBool.push_back( exdData->getField< bool >( row, 1156 ) );
+  canTargetBool.push_back( exdData->getField< bool >( row, 1157 ) );
+  canTargetBool.push_back( exdData->getField< bool >( row, 1158 ) );
+  canTargetBool.push_back( exdData->getField< bool >( row, 1159 ) );
+  canTargetBool.push_back( exdData->getField< bool >( row, 1160 ) );
+  canTargetBool.push_back( exdData->getField< bool >( row, 1161 ) );
+  canTargetBool.push_back( exdData->getField< bool >( row, 1162 ) );
+  canTargetBool.push_back( exdData->getField< bool >( row, 1163 ) );
+  canTargetBool.push_back( exdData->getField< bool >( row, 1164 ) );
+  canTargetBool.push_back( exdData->getField< bool >( row, 1165 ) );
+  canTargetBool.push_back( exdData->getField< bool >( row, 1166 ) );
+  canTargetBool.push_back( exdData->getField< bool >( row, 1167 ) );
+  canTargetBool.push_back( exdData->getField< bool >( row, 1168 ) );
+  canTargetBool.push_back( exdData->getField< bool >( row, 1169 ) );
+  canTargetBool.push_back( exdData->getField< bool >( row, 1170 ) );
+  canTargetBool.push_back( exdData->getField< bool >( row, 1171 ) );
+  canTargetBool.push_back( exdData->getField< bool >( row, 1172 ) );
+  toDoCompleteSeq.push_back( exdData->getField< uint8_t >( row, 1173 ) );
   toDoCompleteSeq.push_back( exdData->getField< uint8_t >( row, 1174 ) );
   toDoCompleteSeq.push_back( exdData->getField< uint8_t >( row, 1175 ) );
   toDoCompleteSeq.push_back( exdData->getField< uint8_t >( row, 1176 ) );
@@ -6467,7 +8074,7 @@ Sapphire::Data::Quest::Quest( uint32_t row_id, Sapphire::Data::ExdDataGenerated*
   toDoCompleteSeq.push_back( exdData->getField< uint8_t >( row, 1194 ) );
   toDoCompleteSeq.push_back( exdData->getField< uint8_t >( row, 1195 ) );
   toDoCompleteSeq.push_back( exdData->getField< uint8_t >( row, 1196 ) );
-  toDoCompleteSeq.push_back( exdData->getField< uint8_t >( row, 1197 ) );
+  toDoQty.push_back( exdData->getField< uint8_t >( row, 1197 ) );
   toDoQty.push_back( exdData->getField< uint8_t >( row, 1198 ) );
   toDoQty.push_back( exdData->getField< uint8_t >( row, 1199 ) );
   toDoQty.push_back( exdData->getField< uint8_t >( row, 1200 ) );
@@ -6491,7 +8098,7 @@ Sapphire::Data::Quest::Quest( uint32_t row_id, Sapphire::Data::ExdDataGenerated*
   toDoQty.push_back( exdData->getField< uint8_t >( row, 1218 ) );
   toDoQty.push_back( exdData->getField< uint8_t >( row, 1219 ) );
   toDoQty.push_back( exdData->getField< uint8_t >( row, 1220 ) );
-  toDoQty.push_back( exdData->getField< uint8_t >( row, 1221 ) );
+  toDoMainLocation.push_back( exdData->getField< uint32_t >( row, 1221 ) );
   toDoMainLocation.push_back( exdData->getField< uint32_t >( row, 1222 ) );
   toDoMainLocation.push_back( exdData->getField< uint32_t >( row, 1223 ) );
   toDoMainLocation.push_back( exdData->getField< uint32_t >( row, 1224 ) );
@@ -6515,71 +8122,101 @@ Sapphire::Data::Quest::Quest( uint32_t row_id, Sapphire::Data::ExdDataGenerated*
   toDoMainLocation.push_back( exdData->getField< uint32_t >( row, 1242 ) );
   toDoMainLocation.push_back( exdData->getField< uint32_t >( row, 1243 ) );
   toDoMainLocation.push_back( exdData->getField< uint32_t >( row, 1244 ) );
-  toDoMainLocation.push_back( exdData->getField< uint32_t >( row, 1245 ) );
-  classJobRequired = exdData->getField< uint8_t >( row, 1439 );
-  expFactor = exdData->getField< uint16_t >( row, 1441 );
-  gilReward = exdData->getField< uint32_t >( row, 1442 );
-  gCSeals = exdData->getField< uint16_t >( row, 1444 );
+  countableNum.push_back( exdData->getField< uint8_t >( row, 1413 ) );
+  countableNum.push_back( exdData->getField< uint8_t >( row, 1414 ) );
+  countableNum.push_back( exdData->getField< uint8_t >( row, 1415 ) );
+  countableNum.push_back( exdData->getField< uint8_t >( row, 1416 ) );
+  countableNum.push_back( exdData->getField< uint8_t >( row, 1417 ) );
+  countableNum.push_back( exdData->getField< uint8_t >( row, 1418 ) );
+  countableNum.push_back( exdData->getField< uint8_t >( row, 1419 ) );
+  countableNum.push_back( exdData->getField< uint8_t >( row, 1420 ) );
+  countableNum.push_back( exdData->getField< uint8_t >( row, 1421 ) );
+  countableNum.push_back( exdData->getField< uint8_t >( row, 1422 ) );
+  countableNum.push_back( exdData->getField< uint8_t >( row, 1423 ) );
+  countableNum.push_back( exdData->getField< uint8_t >( row, 1424 ) );
+  countableNum.push_back( exdData->getField< uint8_t >( row, 1425 ) );
+  countableNum.push_back( exdData->getField< uint8_t >( row, 1426 ) );
+  countableNum.push_back( exdData->getField< uint8_t >( row, 1427 ) );
+  countableNum.push_back( exdData->getField< uint8_t >( row, 1428 ) );
+  countableNum.push_back( exdData->getField< uint8_t >( row, 1429 ) );
+  countableNum.push_back( exdData->getField< uint8_t >( row, 1430 ) );
+  countableNum.push_back( exdData->getField< uint8_t >( row, 1431 ) );
+  countableNum.push_back( exdData->getField< uint8_t >( row, 1432 ) );
+  countableNum.push_back( exdData->getField< uint8_t >( row, 1433 ) );
+  countableNum.push_back( exdData->getField< uint8_t >( row, 1434 ) );
+  countableNum.push_back( exdData->getField< uint8_t >( row, 1435 ) );
+  countableNum.push_back( exdData->getField< uint8_t >( row, 1436 ) );
+  levelMax = exdData->getField< uint8_t >( row, 1437 );
+  classJobRequired = exdData->getField< uint8_t >( row, 1438 );
+  expFactor = exdData->getField< uint16_t >( row, 1440 );
+  gilReward = exdData->getField< uint32_t >( row, 1441 );
+  gCSeals = exdData->getField< uint16_t >( row, 1443 );
+  itemCatalyst.push_back( exdData->getField< uint8_t >( row, 1444 ) );
   itemCatalyst.push_back( exdData->getField< uint8_t >( row, 1445 ) );
   itemCatalyst.push_back( exdData->getField< uint8_t >( row, 1446 ) );
-  itemCatalyst.push_back( exdData->getField< uint8_t >( row, 1447 ) );
+  itemCountCatalyst.push_back( exdData->getField< uint8_t >( row, 1447 ) );
   itemCountCatalyst.push_back( exdData->getField< uint8_t >( row, 1448 ) );
   itemCountCatalyst.push_back( exdData->getField< uint8_t >( row, 1449 ) );
-  itemCountCatalyst.push_back( exdData->getField< uint8_t >( row, 1450 ) );
-  itemRewardType = exdData->getField< uint8_t >( row, 1451 );
+  itemRewardType = exdData->getField< uint8_t >( row, 1450 );
+  itemReward0.push_back( exdData->getField< uint32_t >( row, 1451 ) );
   itemReward0.push_back( exdData->getField< uint32_t >( row, 1452 ) );
   itemReward0.push_back( exdData->getField< uint32_t >( row, 1453 ) );
   itemReward0.push_back( exdData->getField< uint32_t >( row, 1454 ) );
   itemReward0.push_back( exdData->getField< uint32_t >( row, 1455 ) );
   itemReward0.push_back( exdData->getField< uint32_t >( row, 1456 ) );
   itemReward0.push_back( exdData->getField< uint32_t >( row, 1457 ) );
+  itemCountReward0.push_back( exdData->getField< uint8_t >( row, 1458 ) );
   itemCountReward0.push_back( exdData->getField< uint8_t >( row, 1459 ) );
   itemCountReward0.push_back( exdData->getField< uint8_t >( row, 1460 ) );
   itemCountReward0.push_back( exdData->getField< uint8_t >( row, 1461 ) );
   itemCountReward0.push_back( exdData->getField< uint8_t >( row, 1462 ) );
   itemCountReward0.push_back( exdData->getField< uint8_t >( row, 1463 ) );
-  itemCountReward0.push_back( exdData->getField< uint8_t >( row, 1464 ) );
+  stainReward0.push_back( exdData->getField< uint8_t >( row, 1465 ) );
   stainReward0.push_back( exdData->getField< uint8_t >( row, 1466 ) );
   stainReward0.push_back( exdData->getField< uint8_t >( row, 1467 ) );
   stainReward0.push_back( exdData->getField< uint8_t >( row, 1468 ) );
   stainReward0.push_back( exdData->getField< uint8_t >( row, 1469 ) );
   stainReward0.push_back( exdData->getField< uint8_t >( row, 1470 ) );
-  stainReward0.push_back( exdData->getField< uint8_t >( row, 1471 ) );
+  itemReward1.push_back( exdData->getField< uint32_t >( row, 1472 ) );
   itemReward1.push_back( exdData->getField< uint32_t >( row, 1473 ) );
   itemReward1.push_back( exdData->getField< uint32_t >( row, 1474 ) );
   itemReward1.push_back( exdData->getField< uint32_t >( row, 1475 ) );
   itemReward1.push_back( exdData->getField< uint32_t >( row, 1476 ) );
-  itemReward1.push_back( exdData->getField< uint32_t >( row, 1477 ) );
+  itemCountReward1.push_back( exdData->getField< uint8_t >( row, 1477 ) );
   itemCountReward1.push_back( exdData->getField< uint8_t >( row, 1478 ) );
   itemCountReward1.push_back( exdData->getField< uint8_t >( row, 1479 ) );
   itemCountReward1.push_back( exdData->getField< uint8_t >( row, 1480 ) );
   itemCountReward1.push_back( exdData->getField< uint8_t >( row, 1481 ) );
-  itemCountReward1.push_back( exdData->getField< uint8_t >( row, 1482 ) );
+  isHQReward1.push_back( exdData->getField< bool >( row, 1482 ) );
   isHQReward1.push_back( exdData->getField< bool >( row, 1483 ) );
   isHQReward1.push_back( exdData->getField< bool >( row, 1484 ) );
   isHQReward1.push_back( exdData->getField< bool >( row, 1485 ) );
   isHQReward1.push_back( exdData->getField< bool >( row, 1486 ) );
-  isHQReward1.push_back( exdData->getField< bool >( row, 1487 ) );
+  stainReward1.push_back( exdData->getField< uint8_t >( row, 1487 ) );
   stainReward1.push_back( exdData->getField< uint8_t >( row, 1488 ) );
   stainReward1.push_back( exdData->getField< uint8_t >( row, 1489 ) );
   stainReward1.push_back( exdData->getField< uint8_t >( row, 1490 ) );
   stainReward1.push_back( exdData->getField< uint8_t >( row, 1491 ) );
-  stainReward1.push_back( exdData->getField< uint8_t >( row, 1492 ) );
-  emoteReward = exdData->getField< uint8_t >( row, 1493 );
-  actionReward = exdData->getField< uint16_t >( row, 1494 );
+  emoteReward = exdData->getField< uint8_t >( row, 1492 );
+  actionReward = exdData->getField< uint16_t >( row, 1493 );
+  generalActionReward.push_back( exdData->getField< uint8_t >( row, 1494 ) );
   generalActionReward.push_back( exdData->getField< uint8_t >( row, 1495 ) );
-  generalActionReward.push_back( exdData->getField< uint8_t >( row, 1496 ) );
-  otherReward = exdData->getField< uint8_t >( row, 1498 );
-  instanceContentUnlock = exdData->getField< uint32_t >( row, 1501 );
-  tomestoneReward = exdData->getField< uint8_t >( row, 1503 );
-  tomestoneCountReward = exdData->getField< uint8_t >( row, 1504 );
-  reputationReward = exdData->getField< uint8_t >( row, 1505 );
-  placeName = exdData->getField< uint16_t >( row, 1506 );
-  journalGenre = exdData->getField< uint8_t >( row, 1507 );
-  icon = exdData->getField< uint32_t >( row, 1509 );
-  iconSpecial = exdData->getField< uint32_t >( row, 1510 );
-  eventIconType = exdData->getField< uint8_t >( row, 1513 );
-  sortKey = exdData->getField< uint16_t >( row, 1515 );
+  systemReward0 = exdData->getField< uint16_t >( row, 1496 );
+  otherReward = exdData->getField< uint8_t >( row, 1497 );
+  systemReward1 = exdData->getField< uint16_t >( row, 1498 );
+  gCTypeReward = exdData->getField< uint16_t >( row, 1499 );
+  instanceContentUnlock = exdData->getField< uint32_t >( row, 1500 );
+  tomestoneReward = exdData->getField< uint8_t >( row, 1502 );
+  tomestoneCountReward = exdData->getField< uint8_t >( row, 1503 );
+  reputationReward = exdData->getField< uint8_t >( row, 1504 );
+  placeName = exdData->getField< uint16_t >( row, 1505 );
+  journalGenre = exdData->getField< uint8_t >( row, 1506 );
+  icon = exdData->getField< uint32_t >( row, 1508 );
+  iconSpecial = exdData->getField< uint32_t >( row, 1509 );
+  introduction = exdData->getField< bool >( row, 1510 );
+  hideOfferIcon = exdData->getField< bool >( row, 1511 );
+  eventIconType = exdData->getField< uint8_t >( row, 1512 );
+  sortKey = exdData->getField< uint16_t >( row, 1514 );
 }
 
 Sapphire::Data::QuestBattle::QuestBattle( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
@@ -7147,6 +8784,7 @@ Sapphire::Data::Race::Race( uint32_t row_id, Sapphire::Data::ExdDataGenerated* e
   rSEFHands = exdData->getField< int32_t >( row, 7 );
   rSEFLegs = exdData->getField< int32_t >( row, 8 );
   rSEFFeet = exdData->getField< int32_t >( row, 9 );
+  exPac = exdData->getField< uint8_t >( row, 10 );
 }
 
 Sapphire::Data::RacingChocoboItem::RacingChocoboItem( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
@@ -7220,13 +8858,14 @@ Sapphire::Data::Recipe::Recipe( uint32_t row_id, Sapphire::Data::ExdDataGenerate
   quickSynthCraftsmanship = exdData->getField< uint16_t >( row, 34 );
   quickSynthControl = exdData->getField< uint16_t >( row, 35 );
   secretRecipeBook = exdData->getField< uint16_t >( row, 36 );
-  canQuickSynth = exdData->getField< bool >( row, 37 );
-  canHq = exdData->getField< bool >( row, 38 );
-  expRewarded = exdData->getField< bool >( row, 39 );
-  statusRequired = exdData->getField< int32_t >( row, 40 );
-  itemRequired = exdData->getField< int32_t >( row, 41 );
-  isSpecializationRequired = exdData->getField< bool >( row, 42 );
-  patchNumber = exdData->getField< uint16_t >( row, 44 );
+  canQuickSynth = exdData->getField< bool >( row, 38 );
+  canHq = exdData->getField< bool >( row, 39 );
+  expRewarded = exdData->getField< bool >( row, 40 );
+  statusRequired = exdData->getField< int32_t >( row, 41 );
+  itemRequired = exdData->getField< int32_t >( row, 42 );
+  isSpecializationRequired = exdData->getField< bool >( row, 43 );
+  isExpert = exdData->getField< bool >( row, 44 );
+  patchNumber = exdData->getField< uint16_t >( row, 45 );
 }
 
 Sapphire::Data::RecipeLevelTable::RecipeLevelTable( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
@@ -7241,6 +8880,19 @@ Sapphire::Data::RecipeLevelTable::RecipeLevelTable( uint32_t row_id, Sapphire::D
   durability = exdData->getField< uint16_t >( row, 6 );
 }
 
+Sapphire::Data::RecipeLookup::RecipeLookup( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
+{
+  auto row = exdData->m_RecipeLookupDat.get_row( row_id );
+  cRP = exdData->getField< uint16_t >( row, 0 );
+  bSM = exdData->getField< uint16_t >( row, 1 );
+  aRM = exdData->getField< uint16_t >( row, 2 );
+  gSM = exdData->getField< uint16_t >( row, 3 );
+  lTW = exdData->getField< uint16_t >( row, 4 );
+  wVR = exdData->getField< uint16_t >( row, 5 );
+  aLC = exdData->getField< uint16_t >( row, 6 );
+  cUL = exdData->getField< uint16_t >( row, 7 );
+}
+
 Sapphire::Data::RecipeNotebookList::RecipeNotebookList( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
 {
   auto row = exdData->m_RecipeNotebookListDat.get_row( row_id );
@@ -7485,7 +9137,8 @@ Sapphire::Data::Resident::Resident( uint32_t row_id, uint32_t subRow, Sapphire::
   auto row = exdData->m_ResidentDat.get_row( row_id, subRow );
   model = exdData->getField< uint64_t >( row, 1 );
   npcYell = exdData->getField< int32_t >( row, 2 );
-  residentMotionType = exdData->getField< uint8_t >( row, 3 );
+  addedIn53 = exdData->getField< uint16_t >( row, 3 );
+  residentMotionType = exdData->getField< uint8_t >( row, 4 );
 }
 
 Sapphire::Data::RetainerTask::RetainerTask( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
@@ -7499,6 +9152,8 @@ Sapphire::Data::RetainerTask::RetainerTask( uint32_t row_id, Sapphire::Data::Exd
   maxTimemin = exdData->getField< uint16_t >( row, 6 );
   experience = exdData->getField< int32_t >( row, 7 );
   requiredItemLevel = exdData->getField< uint16_t >( row, 8 );
+  conditionParam0 = exdData->getField< uint8_t >( row, 9 );
+  conditionParam1 = exdData->getField< uint8_t >( row, 10 );
   requiredGathering = exdData->getField< uint16_t >( row, 11 );
   task = exdData->getField< uint16_t >( row, 13 );
 }
@@ -7539,6 +9194,43 @@ Sapphire::Data::RetainerTaskRandom::RetainerTaskRandom( uint32_t row_id, Sapphir
   requirement = exdData->getField< int16_t >( row, 1 );
 }
 
+Sapphire::Data::RideShooting::RideShooting( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
+{
+  auto row = exdData->m_RideShootingDat.get_row( row_id );
+  gFateRideShooting = exdData->getField< uint16_t >( row, 0 );
+  startText = exdData->getField< uint16_t >( row, 5 );
+  popRange.push_back( exdData->getField< uint32_t >( row, 14 ) );
+  popRange.push_back( exdData->getField< uint32_t >( row, 15 ) );
+  popRange.push_back( exdData->getField< uint32_t >( row, 16 ) );
+  popRange.push_back( exdData->getField< uint32_t >( row, 17 ) );
+  popRange.push_back( exdData->getField< uint32_t >( row, 18 ) );
+  popRange.push_back( exdData->getField< uint32_t >( row, 19 ) );
+  popRange.push_back( exdData->getField< uint32_t >( row, 20 ) );
+  popRange.push_back( exdData->getField< uint32_t >( row, 21 ) );
+  eNpc.push_back( exdData->getField< uint32_t >( row, 22 ) );
+  eNpc.push_back( exdData->getField< uint32_t >( row, 23 ) );
+  eNpc.push_back( exdData->getField< uint32_t >( row, 24 ) );
+  eNpc.push_back( exdData->getField< uint32_t >( row, 25 ) );
+  eNpc.push_back( exdData->getField< uint32_t >( row, 26 ) );
+  eNpc.push_back( exdData->getField< uint32_t >( row, 27 ) );
+  eNpc.push_back( exdData->getField< uint32_t >( row, 28 ) );
+  eNpc.push_back( exdData->getField< uint32_t >( row, 29 ) );
+  eNpcScale.push_back( exdData->getField< uint8_t >( row, 30 ) );
+  eNpcScale.push_back( exdData->getField< uint8_t >( row, 31 ) );
+  eNpcScale.push_back( exdData->getField< uint8_t >( row, 32 ) );
+  eNpcScale.push_back( exdData->getField< uint8_t >( row, 33 ) );
+  eNpcScale.push_back( exdData->getField< uint8_t >( row, 34 ) );
+  eNpcScale.push_back( exdData->getField< uint8_t >( row, 35 ) );
+  eNpcScale.push_back( exdData->getField< uint8_t >( row, 36 ) );
+  eNpcScale.push_back( exdData->getField< uint8_t >( row, 37 ) );
+}
+
+Sapphire::Data::RideShootingTextData::RideShootingTextData( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
+{
+  auto row = exdData->m_RideShootingTextDataDat.get_row( row_id );
+  string = exdData->getField< std::string >( row, 0 );
+}
+
 Sapphire::Data::RPParameter::RPParameter( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
 {
   auto row = exdData->m_RPParameterDat.get_row( row_id );
@@ -7546,10 +9238,10 @@ Sapphire::Data::RPParameter::RPParameter( uint32_t row_id, Sapphire::Data::ExdDa
   classJob = exdData->getField< uint8_t >( row, 1 );
 }
 
-Sapphire::Data::Salvage::Salvage( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
+Sapphire::Data::SatisfactionArbitration::SatisfactionArbitration( uint32_t row_id, uint32_t subRow, Sapphire::Data::ExdDataGenerated* exdData )
 {
-  auto row = exdData->m_SalvageDat.get_row( row_id );
-  optimalSkill = exdData->getField< uint16_t >( row, 0 );
+  auto row = exdData->m_SatisfactionArbitrationDat.get_row( row_id, subRow );
+  quest = exdData->getField< uint32_t >( row, 2 );
 }
 
 Sapphire::Data::SatisfactionNpc::SatisfactionNpc( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
@@ -7572,6 +9264,8 @@ Sapphire::Data::SatisfactionNpc::SatisfactionNpc( uint32_t row_id, Sapphire::Dat
   satisfactionRequired.push_back( exdData->getField< uint16_t >( row, 14 ) );
   satisfactionRequired.push_back( exdData->getField< uint16_t >( row, 15 ) );
   icon = exdData->getField< int32_t >( row, 70 );
+  addedIn530 = exdData->getField< uint8_t >( row, 72 );
+  addedIn531 = exdData->getField< uint8_t >( row, 73 );
 }
 
 Sapphire::Data::SatisfactionSupply::SatisfactionSupply( uint32_t row_id, uint32_t subRow, Sapphire::Data::ExdDataGenerated* exdData )
@@ -7620,12 +9314,6 @@ Sapphire::Data::ScenarioTreeTipsClassQuest::ScenarioTreeTipsClassQuest( uint32_t
   requiredQuest = exdData->getField< uint32_t >( row, 3 );
 }
 
-Sapphire::Data::ScenarioTreeTipsQuest::ScenarioTreeTipsQuest( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
-{
-  auto row = exdData->m_ScenarioTreeTipsQuestDat.get_row( row_id );
-  level = exdData->getField< uint32_t >( row, 0 );
-}
-
 Sapphire::Data::ScenarioType::ScenarioType( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
 {
   auto row = exdData->m_ScenarioTypeDat.get_row( row_id );
@@ -7653,11 +9341,15 @@ Sapphire::Data::SkyIsland2Mission::SkyIsland2Mission( uint32_t row_id, Sapphire:
   auto row = exdData->m_SkyIsland2MissionDat.get_row( row_id );
   item1 = exdData->getField< uint32_t >( row, 0 );
   item2 = exdData->getField< uint32_t >( row, 1 );
+  placeName = exdData->getField< uint16_t >( row, 2 );
   objective1 = exdData->getField< uint16_t >( row, 4 );
+  popRange0 = exdData->getField< uint32_t >( row, 5 );
   requiredAmount1 = exdData->getField< uint8_t >( row, 6 );
   objective2 = exdData->getField< uint16_t >( row, 9 );
+  popRange1 = exdData->getField< uint32_t >( row, 10 );
   requiredAmount2 = exdData->getField< uint8_t >( row, 11 );
   objective3 = exdData->getField< uint16_t >( row, 14 );
+  popRange2 = exdData->getField< uint32_t >( row, 15 );
   image = exdData->getField< uint32_t >( row, 20 );
 }
 
@@ -7909,70 +9601,70 @@ Sapphire::Data::SpecialShop::SpecialShop( uint32_t row_id, Sapphire::Data::ExdDa
   achievementUnlock.push_back( exdData->getField< int32_t >( row, 1378 ) );
   achievementUnlock.push_back( exdData->getField< int32_t >( row, 1379 ) );
   achievementUnlock.push_back( exdData->getField< int32_t >( row, 1380 ) );
-  patchNumber.push_back( exdData->getField< uint8_t >( row, 1801 ) );
-  patchNumber.push_back( exdData->getField< uint8_t >( row, 1802 ) );
-  patchNumber.push_back( exdData->getField< uint8_t >( row, 1803 ) );
-  patchNumber.push_back( exdData->getField< uint8_t >( row, 1804 ) );
-  patchNumber.push_back( exdData->getField< uint8_t >( row, 1805 ) );
-  patchNumber.push_back( exdData->getField< uint8_t >( row, 1806 ) );
-  patchNumber.push_back( exdData->getField< uint8_t >( row, 1807 ) );
-  patchNumber.push_back( exdData->getField< uint8_t >( row, 1808 ) );
-  patchNumber.push_back( exdData->getField< uint8_t >( row, 1809 ) );
-  patchNumber.push_back( exdData->getField< uint8_t >( row, 1810 ) );
-  patchNumber.push_back( exdData->getField< uint8_t >( row, 1811 ) );
-  patchNumber.push_back( exdData->getField< uint8_t >( row, 1812 ) );
-  patchNumber.push_back( exdData->getField< uint8_t >( row, 1813 ) );
-  patchNumber.push_back( exdData->getField< uint8_t >( row, 1814 ) );
-  patchNumber.push_back( exdData->getField< uint8_t >( row, 1815 ) );
-  patchNumber.push_back( exdData->getField< uint8_t >( row, 1816 ) );
-  patchNumber.push_back( exdData->getField< uint8_t >( row, 1817 ) );
-  patchNumber.push_back( exdData->getField< uint8_t >( row, 1818 ) );
-  patchNumber.push_back( exdData->getField< uint8_t >( row, 1819 ) );
-  patchNumber.push_back( exdData->getField< uint8_t >( row, 1820 ) );
-  patchNumber.push_back( exdData->getField< uint8_t >( row, 1821 ) );
-  patchNumber.push_back( exdData->getField< uint8_t >( row, 1822 ) );
-  patchNumber.push_back( exdData->getField< uint8_t >( row, 1823 ) );
-  patchNumber.push_back( exdData->getField< uint8_t >( row, 1824 ) );
-  patchNumber.push_back( exdData->getField< uint8_t >( row, 1825 ) );
-  patchNumber.push_back( exdData->getField< uint8_t >( row, 1826 ) );
-  patchNumber.push_back( exdData->getField< uint8_t >( row, 1827 ) );
-  patchNumber.push_back( exdData->getField< uint8_t >( row, 1828 ) );
-  patchNumber.push_back( exdData->getField< uint8_t >( row, 1829 ) );
-  patchNumber.push_back( exdData->getField< uint8_t >( row, 1830 ) );
-  patchNumber.push_back( exdData->getField< uint8_t >( row, 1831 ) );
-  patchNumber.push_back( exdData->getField< uint8_t >( row, 1832 ) );
-  patchNumber.push_back( exdData->getField< uint8_t >( row, 1833 ) );
-  patchNumber.push_back( exdData->getField< uint8_t >( row, 1834 ) );
-  patchNumber.push_back( exdData->getField< uint8_t >( row, 1835 ) );
-  patchNumber.push_back( exdData->getField< uint8_t >( row, 1836 ) );
-  patchNumber.push_back( exdData->getField< uint8_t >( row, 1837 ) );
-  patchNumber.push_back( exdData->getField< uint8_t >( row, 1838 ) );
-  patchNumber.push_back( exdData->getField< uint8_t >( row, 1839 ) );
-  patchNumber.push_back( exdData->getField< uint8_t >( row, 1840 ) );
-  patchNumber.push_back( exdData->getField< uint8_t >( row, 1841 ) );
-  patchNumber.push_back( exdData->getField< uint8_t >( row, 1842 ) );
-  patchNumber.push_back( exdData->getField< uint8_t >( row, 1843 ) );
-  patchNumber.push_back( exdData->getField< uint8_t >( row, 1844 ) );
-  patchNumber.push_back( exdData->getField< uint8_t >( row, 1845 ) );
-  patchNumber.push_back( exdData->getField< uint8_t >( row, 1846 ) );
-  patchNumber.push_back( exdData->getField< uint8_t >( row, 1847 ) );
-  patchNumber.push_back( exdData->getField< uint8_t >( row, 1848 ) );
-  patchNumber.push_back( exdData->getField< uint8_t >( row, 1849 ) );
-  patchNumber.push_back( exdData->getField< uint8_t >( row, 1850 ) );
-  patchNumber.push_back( exdData->getField< uint8_t >( row, 1851 ) );
-  patchNumber.push_back( exdData->getField< uint8_t >( row, 1852 ) );
-  patchNumber.push_back( exdData->getField< uint8_t >( row, 1853 ) );
-  patchNumber.push_back( exdData->getField< uint8_t >( row, 1854 ) );
-  patchNumber.push_back( exdData->getField< uint8_t >( row, 1855 ) );
-  patchNumber.push_back( exdData->getField< uint8_t >( row, 1856 ) );
-  patchNumber.push_back( exdData->getField< uint8_t >( row, 1857 ) );
-  patchNumber.push_back( exdData->getField< uint8_t >( row, 1858 ) );
-  patchNumber.push_back( exdData->getField< uint8_t >( row, 1859 ) );
-  patchNumber.push_back( exdData->getField< uint8_t >( row, 1860 ) );
-  useCurrencyType = exdData->getField< uint16_t >( row, 1861 );
-  questUnlock = exdData->getField< uint16_t >( row, 1862 );
-  completeText = exdData->getField< uint16_t >( row, 1863 );
-  notCompleteText = exdData->getField< uint16_t >( row, 1864 );
+  patchNumber.push_back( exdData->getField< uint16_t >( row, 1441 ) );
+  patchNumber.push_back( exdData->getField< uint16_t >( row, 1442 ) );
+  patchNumber.push_back( exdData->getField< uint16_t >( row, 1443 ) );
+  patchNumber.push_back( exdData->getField< uint16_t >( row, 1444 ) );
+  patchNumber.push_back( exdData->getField< uint16_t >( row, 1445 ) );
+  patchNumber.push_back( exdData->getField< uint16_t >( row, 1446 ) );
+  patchNumber.push_back( exdData->getField< uint16_t >( row, 1447 ) );
+  patchNumber.push_back( exdData->getField< uint16_t >( row, 1448 ) );
+  patchNumber.push_back( exdData->getField< uint16_t >( row, 1449 ) );
+  patchNumber.push_back( exdData->getField< uint16_t >( row, 1450 ) );
+  patchNumber.push_back( exdData->getField< uint16_t >( row, 1451 ) );
+  patchNumber.push_back( exdData->getField< uint16_t >( row, 1452 ) );
+  patchNumber.push_back( exdData->getField< uint16_t >( row, 1453 ) );
+  patchNumber.push_back( exdData->getField< uint16_t >( row, 1454 ) );
+  patchNumber.push_back( exdData->getField< uint16_t >( row, 1455 ) );
+  patchNumber.push_back( exdData->getField< uint16_t >( row, 1456 ) );
+  patchNumber.push_back( exdData->getField< uint16_t >( row, 1457 ) );
+  patchNumber.push_back( exdData->getField< uint16_t >( row, 1458 ) );
+  patchNumber.push_back( exdData->getField< uint16_t >( row, 1459 ) );
+  patchNumber.push_back( exdData->getField< uint16_t >( row, 1460 ) );
+  patchNumber.push_back( exdData->getField< uint16_t >( row, 1461 ) );
+  patchNumber.push_back( exdData->getField< uint16_t >( row, 1462 ) );
+  patchNumber.push_back( exdData->getField< uint16_t >( row, 1463 ) );
+  patchNumber.push_back( exdData->getField< uint16_t >( row, 1464 ) );
+  patchNumber.push_back( exdData->getField< uint16_t >( row, 1465 ) );
+  patchNumber.push_back( exdData->getField< uint16_t >( row, 1466 ) );
+  patchNumber.push_back( exdData->getField< uint16_t >( row, 1467 ) );
+  patchNumber.push_back( exdData->getField< uint16_t >( row, 1468 ) );
+  patchNumber.push_back( exdData->getField< uint16_t >( row, 1469 ) );
+  patchNumber.push_back( exdData->getField< uint16_t >( row, 1470 ) );
+  patchNumber.push_back( exdData->getField< uint16_t >( row, 1471 ) );
+  patchNumber.push_back( exdData->getField< uint16_t >( row, 1472 ) );
+  patchNumber.push_back( exdData->getField< uint16_t >( row, 1473 ) );
+  patchNumber.push_back( exdData->getField< uint16_t >( row, 1474 ) );
+  patchNumber.push_back( exdData->getField< uint16_t >( row, 1475 ) );
+  patchNumber.push_back( exdData->getField< uint16_t >( row, 1476 ) );
+  patchNumber.push_back( exdData->getField< uint16_t >( row, 1477 ) );
+  patchNumber.push_back( exdData->getField< uint16_t >( row, 1478 ) );
+  patchNumber.push_back( exdData->getField< uint16_t >( row, 1479 ) );
+  patchNumber.push_back( exdData->getField< uint16_t >( row, 1480 ) );
+  patchNumber.push_back( exdData->getField< uint16_t >( row, 1481 ) );
+  patchNumber.push_back( exdData->getField< uint16_t >( row, 1482 ) );
+  patchNumber.push_back( exdData->getField< uint16_t >( row, 1483 ) );
+  patchNumber.push_back( exdData->getField< uint16_t >( row, 1484 ) );
+  patchNumber.push_back( exdData->getField< uint16_t >( row, 1485 ) );
+  patchNumber.push_back( exdData->getField< uint16_t >( row, 1486 ) );
+  patchNumber.push_back( exdData->getField< uint16_t >( row, 1487 ) );
+  patchNumber.push_back( exdData->getField< uint16_t >( row, 1488 ) );
+  patchNumber.push_back( exdData->getField< uint16_t >( row, 1489 ) );
+  patchNumber.push_back( exdData->getField< uint16_t >( row, 1490 ) );
+  patchNumber.push_back( exdData->getField< uint16_t >( row, 1491 ) );
+  patchNumber.push_back( exdData->getField< uint16_t >( row, 1492 ) );
+  patchNumber.push_back( exdData->getField< uint16_t >( row, 1493 ) );
+  patchNumber.push_back( exdData->getField< uint16_t >( row, 1494 ) );
+  patchNumber.push_back( exdData->getField< uint16_t >( row, 1495 ) );
+  patchNumber.push_back( exdData->getField< uint16_t >( row, 1496 ) );
+  patchNumber.push_back( exdData->getField< uint16_t >( row, 1497 ) );
+  patchNumber.push_back( exdData->getField< uint16_t >( row, 1498 ) );
+  patchNumber.push_back( exdData->getField< uint16_t >( row, 1499 ) );
+  patchNumber.push_back( exdData->getField< uint16_t >( row, 1500 ) );
+  useCurrencyType = exdData->getField< bool >( row, 1501 );
+  questUnlock = exdData->getField< uint32_t >( row, 1502 );
+  completeText = exdData->getField< int32_t >( row, 1503 );
+  notCompleteText = exdData->getField< int32_t >( row, 1504 );
 }
 
 Sapphire::Data::SpecialShopItemCategory::SpecialShopItemCategory( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
@@ -8014,9 +9706,9 @@ Sapphire::Data::Status::Status( uint32_t row_id, Sapphire::Data::ExdDataGenerate
   inflictedByActor = exdData->getField< bool >( row, 15 );
   isPermanent = exdData->getField< bool >( row, 16 );
   partyListPriority = exdData->getField< uint8_t >( row, 17 );
-  log = exdData->getField< uint16_t >( row, 23 );
-  isFcBuff = exdData->getField< bool >( row, 24 );
-  invisibility = exdData->getField< bool >( row, 25 );
+  log = exdData->getField< uint16_t >( row, 24 );
+  isFcBuff = exdData->getField< bool >( row, 25 );
+  invisibility = exdData->getField< bool >( row, 26 );
 }
 
 Sapphire::Data::StatusHitEffect::StatusHitEffect( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
@@ -8036,6 +9728,1869 @@ Sapphire::Data::StatusLoopVFX::StatusLoopVFX( uint32_t row_id, Sapphire::Data::E
 Sapphire::Data::Story::Story( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
 {
   auto row = exdData->m_StoryDat.get_row( row_id );
+  script = exdData->getField< std::string >( row, 0 );
+  instruction.push_back( exdData->getField< std::string >( row, 1 ) );
+  instruction.push_back( exdData->getField< std::string >( row, 2 ) );
+  instruction.push_back( exdData->getField< std::string >( row, 3 ) );
+  instruction.push_back( exdData->getField< std::string >( row, 4 ) );
+  instruction.push_back( exdData->getField< std::string >( row, 5 ) );
+  instruction.push_back( exdData->getField< std::string >( row, 6 ) );
+  instruction.push_back( exdData->getField< std::string >( row, 7 ) );
+  instruction.push_back( exdData->getField< std::string >( row, 8 ) );
+  instruction.push_back( exdData->getField< std::string >( row, 9 ) );
+  instruction.push_back( exdData->getField< std::string >( row, 10 ) );
+  instruction.push_back( exdData->getField< std::string >( row, 11 ) );
+  instruction.push_back( exdData->getField< std::string >( row, 12 ) );
+  instruction.push_back( exdData->getField< std::string >( row, 13 ) );
+  instruction.push_back( exdData->getField< std::string >( row, 14 ) );
+  instruction.push_back( exdData->getField< std::string >( row, 15 ) );
+  instruction.push_back( exdData->getField< std::string >( row, 16 ) );
+  instruction.push_back( exdData->getField< std::string >( row, 17 ) );
+  instruction.push_back( exdData->getField< std::string >( row, 18 ) );
+  instruction.push_back( exdData->getField< std::string >( row, 19 ) );
+  instruction.push_back( exdData->getField< std::string >( row, 20 ) );
+  instruction.push_back( exdData->getField< std::string >( row, 21 ) );
+  instruction.push_back( exdData->getField< std::string >( row, 22 ) );
+  instruction.push_back( exdData->getField< std::string >( row, 23 ) );
+  instruction.push_back( exdData->getField< std::string >( row, 24 ) );
+  instruction.push_back( exdData->getField< std::string >( row, 25 ) );
+  instruction.push_back( exdData->getField< std::string >( row, 26 ) );
+  instruction.push_back( exdData->getField< std::string >( row, 27 ) );
+  instruction.push_back( exdData->getField< std::string >( row, 28 ) );
+  instruction.push_back( exdData->getField< std::string >( row, 29 ) );
+  instruction.push_back( exdData->getField< std::string >( row, 30 ) );
+  instruction.push_back( exdData->getField< std::string >( row, 31 ) );
+  instruction.push_back( exdData->getField< std::string >( row, 32 ) );
+  instruction.push_back( exdData->getField< std::string >( row, 33 ) );
+  instruction.push_back( exdData->getField< std::string >( row, 34 ) );
+  instruction.push_back( exdData->getField< std::string >( row, 35 ) );
+  instruction.push_back( exdData->getField< std::string >( row, 36 ) );
+  instruction.push_back( exdData->getField< std::string >( row, 37 ) );
+  instruction.push_back( exdData->getField< std::string >( row, 38 ) );
+  instruction.push_back( exdData->getField< std::string >( row, 39 ) );
+  instruction.push_back( exdData->getField< std::string >( row, 40 ) );
+  argument.push_back( exdData->getField< uint32_t >( row, 41 ) );
+  argument.push_back( exdData->getField< uint32_t >( row, 42 ) );
+  argument.push_back( exdData->getField< uint32_t >( row, 43 ) );
+  argument.push_back( exdData->getField< uint32_t >( row, 44 ) );
+  argument.push_back( exdData->getField< uint32_t >( row, 45 ) );
+  argument.push_back( exdData->getField< uint32_t >( row, 46 ) );
+  argument.push_back( exdData->getField< uint32_t >( row, 47 ) );
+  argument.push_back( exdData->getField< uint32_t >( row, 48 ) );
+  argument.push_back( exdData->getField< uint32_t >( row, 49 ) );
+  argument.push_back( exdData->getField< uint32_t >( row, 50 ) );
+  argument.push_back( exdData->getField< uint32_t >( row, 51 ) );
+  argument.push_back( exdData->getField< uint32_t >( row, 52 ) );
+  argument.push_back( exdData->getField< uint32_t >( row, 53 ) );
+  argument.push_back( exdData->getField< uint32_t >( row, 54 ) );
+  argument.push_back( exdData->getField< uint32_t >( row, 55 ) );
+  argument.push_back( exdData->getField< uint32_t >( row, 56 ) );
+  argument.push_back( exdData->getField< uint32_t >( row, 57 ) );
+  argument.push_back( exdData->getField< uint32_t >( row, 58 ) );
+  argument.push_back( exdData->getField< uint32_t >( row, 59 ) );
+  argument.push_back( exdData->getField< uint32_t >( row, 60 ) );
+  argument.push_back( exdData->getField< uint32_t >( row, 61 ) );
+  argument.push_back( exdData->getField< uint32_t >( row, 62 ) );
+  argument.push_back( exdData->getField< uint32_t >( row, 63 ) );
+  argument.push_back( exdData->getField< uint32_t >( row, 64 ) );
+  argument.push_back( exdData->getField< uint32_t >( row, 65 ) );
+  argument.push_back( exdData->getField< uint32_t >( row, 66 ) );
+  argument.push_back( exdData->getField< uint32_t >( row, 67 ) );
+  argument.push_back( exdData->getField< uint32_t >( row, 68 ) );
+  argument.push_back( exdData->getField< uint32_t >( row, 69 ) );
+  argument.push_back( exdData->getField< uint32_t >( row, 70 ) );
+  argument.push_back( exdData->getField< uint32_t >( row, 71 ) );
+  argument.push_back( exdData->getField< uint32_t >( row, 72 ) );
+  argument.push_back( exdData->getField< uint32_t >( row, 73 ) );
+  argument.push_back( exdData->getField< uint32_t >( row, 74 ) );
+  argument.push_back( exdData->getField< uint32_t >( row, 75 ) );
+  argument.push_back( exdData->getField< uint32_t >( row, 76 ) );
+  argument.push_back( exdData->getField< uint32_t >( row, 77 ) );
+  argument.push_back( exdData->getField< uint32_t >( row, 78 ) );
+  argument.push_back( exdData->getField< uint32_t >( row, 79 ) );
+  argument.push_back( exdData->getField< uint32_t >( row, 80 ) );
+  sequence.push_back( exdData->getField< uint16_t >( row, 81 ) );
+  sequence.push_back( exdData->getField< uint16_t >( row, 82 ) );
+  sequence.push_back( exdData->getField< uint16_t >( row, 83 ) );
+  sequence.push_back( exdData->getField< uint16_t >( row, 84 ) );
+  sequence.push_back( exdData->getField< uint16_t >( row, 85 ) );
+  sequence.push_back( exdData->getField< uint16_t >( row, 86 ) );
+  sequence.push_back( exdData->getField< uint16_t >( row, 87 ) );
+  sequence.push_back( exdData->getField< uint16_t >( row, 88 ) );
+  sequence.push_back( exdData->getField< uint16_t >( row, 89 ) );
+  sequence.push_back( exdData->getField< uint16_t >( row, 90 ) );
+  sequence.push_back( exdData->getField< uint16_t >( row, 91 ) );
+  sequence.push_back( exdData->getField< uint16_t >( row, 92 ) );
+  sequence.push_back( exdData->getField< uint16_t >( row, 93 ) );
+  sequence.push_back( exdData->getField< uint16_t >( row, 94 ) );
+  sequence.push_back( exdData->getField< uint16_t >( row, 95 ) );
+  sequence.push_back( exdData->getField< uint16_t >( row, 96 ) );
+  sequence.push_back( exdData->getField< uint16_t >( row, 97 ) );
+  sequence.push_back( exdData->getField< uint16_t >( row, 98 ) );
+  sequence.push_back( exdData->getField< uint16_t >( row, 99 ) );
+  sequence.push_back( exdData->getField< uint16_t >( row, 100 ) );
+  sequence.push_back( exdData->getField< uint16_t >( row, 101 ) );
+  sequence.push_back( exdData->getField< uint16_t >( row, 102 ) );
+  sequence.push_back( exdData->getField< uint16_t >( row, 103 ) );
+  sequence.push_back( exdData->getField< uint16_t >( row, 104 ) );
+  sequence.push_back( exdData->getField< uint16_t >( row, 105 ) );
+  sequence.push_back( exdData->getField< uint16_t >( row, 106 ) );
+  sequence.push_back( exdData->getField< uint16_t >( row, 107 ) );
+  sequence.push_back( exdData->getField< uint16_t >( row, 108 ) );
+  sequence.push_back( exdData->getField< uint16_t >( row, 109 ) );
+  sequence.push_back( exdData->getField< uint16_t >( row, 110 ) );
+  sequence.push_back( exdData->getField< uint16_t >( row, 111 ) );
+  sequence.push_back( exdData->getField< uint16_t >( row, 112 ) );
+  sequence.push_back( exdData->getField< uint16_t >( row, 113 ) );
+  sequence.push_back( exdData->getField< uint16_t >( row, 114 ) );
+  sequence.push_back( exdData->getField< uint16_t >( row, 115 ) );
+  sequence.push_back( exdData->getField< uint16_t >( row, 116 ) );
+  sequence.push_back( exdData->getField< uint16_t >( row, 117 ) );
+  sequence.push_back( exdData->getField< uint16_t >( row, 118 ) );
+  sequence.push_back( exdData->getField< uint16_t >( row, 119 ) );
+  sequence.push_back( exdData->getField< uint16_t >( row, 120 ) );
+  sequence.push_back( exdData->getField< uint16_t >( row, 121 ) );
+  sequence.push_back( exdData->getField< uint16_t >( row, 122 ) );
+  sequence.push_back( exdData->getField< uint16_t >( row, 123 ) );
+  sequence.push_back( exdData->getField< uint16_t >( row, 124 ) );
+  sequence.push_back( exdData->getField< uint16_t >( row, 125 ) );
+  sequence.push_back( exdData->getField< uint16_t >( row, 126 ) );
+  sequence.push_back( exdData->getField< uint16_t >( row, 127 ) );
+  sequence.push_back( exdData->getField< uint16_t >( row, 128 ) );
+  sequence.push_back( exdData->getField< uint16_t >( row, 129 ) );
+  sequence.push_back( exdData->getField< uint16_t >( row, 130 ) );
+  sequence.push_back( exdData->getField< uint16_t >( row, 131 ) );
+  sequence.push_back( exdData->getField< uint16_t >( row, 132 ) );
+  sequence.push_back( exdData->getField< uint16_t >( row, 133 ) );
+  sequence.push_back( exdData->getField< uint16_t >( row, 134 ) );
+  sequence.push_back( exdData->getField< uint16_t >( row, 135 ) );
+  sequence.push_back( exdData->getField< uint16_t >( row, 136 ) );
+  sequence.push_back( exdData->getField< uint16_t >( row, 137 ) );
+  sequence.push_back( exdData->getField< uint16_t >( row, 138 ) );
+  sequence.push_back( exdData->getField< uint16_t >( row, 139 ) );
+  sequence.push_back( exdData->getField< uint16_t >( row, 140 ) );
+  sequence.push_back( exdData->getField< uint16_t >( row, 141 ) );
+  sequence.push_back( exdData->getField< uint16_t >( row, 142 ) );
+  sequence.push_back( exdData->getField< uint16_t >( row, 143 ) );
+  sequence.push_back( exdData->getField< uint16_t >( row, 144 ) );
+  sequence.push_back( exdData->getField< uint16_t >( row, 145 ) );
+  sequence.push_back( exdData->getField< uint16_t >( row, 146 ) );
+  sequence.push_back( exdData->getField< uint16_t >( row, 147 ) );
+  sequence.push_back( exdData->getField< uint16_t >( row, 148 ) );
+  sequence.push_back( exdData->getField< uint16_t >( row, 149 ) );
+  sequence.push_back( exdData->getField< uint16_t >( row, 150 ) );
+  sequence.push_back( exdData->getField< uint16_t >( row, 151 ) );
+  sequence.push_back( exdData->getField< uint16_t >( row, 152 ) );
+  sequence.push_back( exdData->getField< uint16_t >( row, 153 ) );
+  sequence.push_back( exdData->getField< uint16_t >( row, 154 ) );
+  sequence.push_back( exdData->getField< uint16_t >( row, 155 ) );
+  sequence.push_back( exdData->getField< uint16_t >( row, 156 ) );
+  sequence.push_back( exdData->getField< uint16_t >( row, 157 ) );
+  sequence.push_back( exdData->getField< uint16_t >( row, 158 ) );
+  sequence.push_back( exdData->getField< uint16_t >( row, 159 ) );
+  sequence.push_back( exdData->getField< uint16_t >( row, 160 ) );
+  sequence.push_back( exdData->getField< uint16_t >( row, 161 ) );
+  sequence.push_back( exdData->getField< uint16_t >( row, 162 ) );
+  sequence.push_back( exdData->getField< uint16_t >( row, 163 ) );
+  sequence.push_back( exdData->getField< uint16_t >( row, 164 ) );
+  sequence.push_back( exdData->getField< uint16_t >( row, 165 ) );
+  sequence.push_back( exdData->getField< uint16_t >( row, 166 ) );
+  sequence.push_back( exdData->getField< uint16_t >( row, 167 ) );
+  sequence.push_back( exdData->getField< uint16_t >( row, 168 ) );
+  sequence.push_back( exdData->getField< uint16_t >( row, 169 ) );
+  sequence.push_back( exdData->getField< uint16_t >( row, 170 ) );
+  sequence.push_back( exdData->getField< uint16_t >( row, 171 ) );
+  sequence.push_back( exdData->getField< uint16_t >( row, 172 ) );
+  sequence.push_back( exdData->getField< uint16_t >( row, 173 ) );
+  sequence.push_back( exdData->getField< uint16_t >( row, 174 ) );
+  sequence.push_back( exdData->getField< uint16_t >( row, 175 ) );
+  sequence.push_back( exdData->getField< uint16_t >( row, 176 ) );
+  sequence.push_back( exdData->getField< uint16_t >( row, 177 ) );
+  sequence.push_back( exdData->getField< uint16_t >( row, 178 ) );
+  sequence.push_back( exdData->getField< uint16_t >( row, 179 ) );
+  sequence.push_back( exdData->getField< uint16_t >( row, 180 ) );
+  sequence.push_back( exdData->getField< uint16_t >( row, 181 ) );
+  sequence.push_back( exdData->getField< uint16_t >( row, 182 ) );
+  sequence.push_back( exdData->getField< uint16_t >( row, 183 ) );
+  sequence.push_back( exdData->getField< uint16_t >( row, 184 ) );
+  sequence.push_back( exdData->getField< uint16_t >( row, 185 ) );
+  sequence.push_back( exdData->getField< uint16_t >( row, 186 ) );
+  sequence.push_back( exdData->getField< uint16_t >( row, 187 ) );
+  sequence.push_back( exdData->getField< uint16_t >( row, 188 ) );
+  sequence.push_back( exdData->getField< uint16_t >( row, 189 ) );
+  sequence.push_back( exdData->getField< uint16_t >( row, 190 ) );
+  completedQuestOperator.push_back( exdData->getField< uint8_t >( row, 191 ) );
+  completedQuestOperator.push_back( exdData->getField< uint8_t >( row, 192 ) );
+  completedQuestOperator.push_back( exdData->getField< uint8_t >( row, 193 ) );
+  completedQuestOperator.push_back( exdData->getField< uint8_t >( row, 194 ) );
+  completedQuestOperator.push_back( exdData->getField< uint8_t >( row, 195 ) );
+  completedQuestOperator.push_back( exdData->getField< uint8_t >( row, 196 ) );
+  completedQuestOperator.push_back( exdData->getField< uint8_t >( row, 197 ) );
+  completedQuestOperator.push_back( exdData->getField< uint8_t >( row, 198 ) );
+  completedQuestOperator.push_back( exdData->getField< uint8_t >( row, 199 ) );
+  completedQuestOperator.push_back( exdData->getField< uint8_t >( row, 200 ) );
+  completedQuestOperator.push_back( exdData->getField< uint8_t >( row, 201 ) );
+  completedQuestOperator.push_back( exdData->getField< uint8_t >( row, 202 ) );
+  completedQuestOperator.push_back( exdData->getField< uint8_t >( row, 203 ) );
+  completedQuestOperator.push_back( exdData->getField< uint8_t >( row, 204 ) );
+  completedQuestOperator.push_back( exdData->getField< uint8_t >( row, 205 ) );
+  completedQuestOperator.push_back( exdData->getField< uint8_t >( row, 206 ) );
+  completedQuestOperator.push_back( exdData->getField< uint8_t >( row, 207 ) );
+  completedQuestOperator.push_back( exdData->getField< uint8_t >( row, 208 ) );
+  completedQuestOperator.push_back( exdData->getField< uint8_t >( row, 209 ) );
+  completedQuestOperator.push_back( exdData->getField< uint8_t >( row, 210 ) );
+  completedQuestOperator.push_back( exdData->getField< uint8_t >( row, 211 ) );
+  completedQuestOperator.push_back( exdData->getField< uint8_t >( row, 212 ) );
+  completedQuestOperator.push_back( exdData->getField< uint8_t >( row, 213 ) );
+  completedQuestOperator.push_back( exdData->getField< uint8_t >( row, 214 ) );
+  completedQuestOperator.push_back( exdData->getField< uint8_t >( row, 215 ) );
+  completedQuestOperator.push_back( exdData->getField< uint8_t >( row, 216 ) );
+  completedQuestOperator.push_back( exdData->getField< uint8_t >( row, 217 ) );
+  completedQuestOperator.push_back( exdData->getField< uint8_t >( row, 218 ) );
+  completedQuestOperator.push_back( exdData->getField< uint8_t >( row, 219 ) );
+  completedQuestOperator.push_back( exdData->getField< uint8_t >( row, 220 ) );
+  completedQuestOperator.push_back( exdData->getField< uint8_t >( row, 221 ) );
+  completedQuestOperator.push_back( exdData->getField< uint8_t >( row, 222 ) );
+  completedQuestOperator.push_back( exdData->getField< uint8_t >( row, 223 ) );
+  completedQuestOperator.push_back( exdData->getField< uint8_t >( row, 224 ) );
+  completedQuestOperator.push_back( exdData->getField< uint8_t >( row, 225 ) );
+  completedQuestOperator.push_back( exdData->getField< uint8_t >( row, 226 ) );
+  completedQuestOperator.push_back( exdData->getField< uint8_t >( row, 227 ) );
+  completedQuestOperator.push_back( exdData->getField< uint8_t >( row, 228 ) );
+  completedQuestOperator.push_back( exdData->getField< uint8_t >( row, 229 ) );
+  completedQuestOperator.push_back( exdData->getField< uint8_t >( row, 230 ) );
+  completedQuestOperator.push_back( exdData->getField< uint8_t >( row, 231 ) );
+  completedQuestOperator.push_back( exdData->getField< uint8_t >( row, 232 ) );
+  completedQuestOperator.push_back( exdData->getField< uint8_t >( row, 233 ) );
+  completedQuestOperator.push_back( exdData->getField< uint8_t >( row, 234 ) );
+  completedQuestOperator.push_back( exdData->getField< uint8_t >( row, 235 ) );
+  completedQuestOperator.push_back( exdData->getField< uint8_t >( row, 236 ) );
+  completedQuestOperator.push_back( exdData->getField< uint8_t >( row, 237 ) );
+  completedQuestOperator.push_back( exdData->getField< uint8_t >( row, 238 ) );
+  completedQuestOperator.push_back( exdData->getField< uint8_t >( row, 239 ) );
+  completedQuestOperator.push_back( exdData->getField< uint8_t >( row, 240 ) );
+  completedQuestOperator.push_back( exdData->getField< uint8_t >( row, 241 ) );
+  completedQuestOperator.push_back( exdData->getField< uint8_t >( row, 242 ) );
+  completedQuestOperator.push_back( exdData->getField< uint8_t >( row, 243 ) );
+  completedQuestOperator.push_back( exdData->getField< uint8_t >( row, 244 ) );
+  completedQuestOperator.push_back( exdData->getField< uint8_t >( row, 245 ) );
+  completedQuestOperator.push_back( exdData->getField< uint8_t >( row, 246 ) );
+  completedQuestOperator.push_back( exdData->getField< uint8_t >( row, 247 ) );
+  completedQuestOperator.push_back( exdData->getField< uint8_t >( row, 248 ) );
+  completedQuestOperator.push_back( exdData->getField< uint8_t >( row, 249 ) );
+  completedQuestOperator.push_back( exdData->getField< uint8_t >( row, 250 ) );
+  completedQuestOperator.push_back( exdData->getField< uint8_t >( row, 251 ) );
+  completedQuestOperator.push_back( exdData->getField< uint8_t >( row, 252 ) );
+  completedQuestOperator.push_back( exdData->getField< uint8_t >( row, 253 ) );
+  completedQuestOperator.push_back( exdData->getField< uint8_t >( row, 254 ) );
+  completedQuestOperator.push_back( exdData->getField< uint8_t >( row, 255 ) );
+  completedQuestOperator.push_back( exdData->getField< uint8_t >( row, 256 ) );
+  completedQuestOperator.push_back( exdData->getField< uint8_t >( row, 257 ) );
+  completedQuestOperator.push_back( exdData->getField< uint8_t >( row, 258 ) );
+  completedQuestOperator.push_back( exdData->getField< uint8_t >( row, 259 ) );
+  completedQuestOperator.push_back( exdData->getField< uint8_t >( row, 260 ) );
+  completedQuestOperator.push_back( exdData->getField< uint8_t >( row, 261 ) );
+  completedQuestOperator.push_back( exdData->getField< uint8_t >( row, 262 ) );
+  completedQuestOperator.push_back( exdData->getField< uint8_t >( row, 263 ) );
+  completedQuestOperator.push_back( exdData->getField< uint8_t >( row, 264 ) );
+  completedQuestOperator.push_back( exdData->getField< uint8_t >( row, 265 ) );
+  completedQuestOperator.push_back( exdData->getField< uint8_t >( row, 266 ) );
+  completedQuestOperator.push_back( exdData->getField< uint8_t >( row, 267 ) );
+  completedQuestOperator.push_back( exdData->getField< uint8_t >( row, 268 ) );
+  completedQuestOperator.push_back( exdData->getField< uint8_t >( row, 269 ) );
+  completedQuestOperator.push_back( exdData->getField< uint8_t >( row, 270 ) );
+  completedQuestOperator.push_back( exdData->getField< uint8_t >( row, 271 ) );
+  completedQuestOperator.push_back( exdData->getField< uint8_t >( row, 272 ) );
+  completedQuestOperator.push_back( exdData->getField< uint8_t >( row, 273 ) );
+  completedQuestOperator.push_back( exdData->getField< uint8_t >( row, 274 ) );
+  completedQuestOperator.push_back( exdData->getField< uint8_t >( row, 275 ) );
+  completedQuestOperator.push_back( exdData->getField< uint8_t >( row, 276 ) );
+  completedQuestOperator.push_back( exdData->getField< uint8_t >( row, 277 ) );
+  completedQuestOperator.push_back( exdData->getField< uint8_t >( row, 278 ) );
+  completedQuestOperator.push_back( exdData->getField< uint8_t >( row, 279 ) );
+  completedQuestOperator.push_back( exdData->getField< uint8_t >( row, 280 ) );
+  completedQuestOperator.push_back( exdData->getField< uint8_t >( row, 281 ) );
+  completedQuestOperator.push_back( exdData->getField< uint8_t >( row, 282 ) );
+  completedQuestOperator.push_back( exdData->getField< uint8_t >( row, 283 ) );
+  completedQuestOperator.push_back( exdData->getField< uint8_t >( row, 284 ) );
+  completedQuestOperator.push_back( exdData->getField< uint8_t >( row, 285 ) );
+  completedQuestOperator.push_back( exdData->getField< uint8_t >( row, 286 ) );
+  completedQuestOperator.push_back( exdData->getField< uint8_t >( row, 287 ) );
+  completedQuestOperator.push_back( exdData->getField< uint8_t >( row, 288 ) );
+  completedQuestOperator.push_back( exdData->getField< uint8_t >( row, 289 ) );
+  completedQuestOperator.push_back( exdData->getField< uint8_t >( row, 290 ) );
+  completedQuestOperator.push_back( exdData->getField< uint8_t >( row, 291 ) );
+  completedQuestOperator.push_back( exdData->getField< uint8_t >( row, 292 ) );
+  completedQuestOperator.push_back( exdData->getField< uint8_t >( row, 293 ) );
+  completedQuestOperator.push_back( exdData->getField< uint8_t >( row, 294 ) );
+  completedQuestOperator.push_back( exdData->getField< uint8_t >( row, 295 ) );
+  completedQuestOperator.push_back( exdData->getField< uint8_t >( row, 296 ) );
+  completedQuestOperator.push_back( exdData->getField< uint8_t >( row, 297 ) );
+  completedQuestOperator.push_back( exdData->getField< uint8_t >( row, 298 ) );
+  completedQuestOperator.push_back( exdData->getField< uint8_t >( row, 299 ) );
+  completedQuestOperator.push_back( exdData->getField< uint8_t >( row, 300 ) );
+  completedQuest0.push_back( exdData->getField< uint32_t >( row, 301 ) );
+  completedQuest0.push_back( exdData->getField< uint32_t >( row, 302 ) );
+  completedQuest0.push_back( exdData->getField< uint32_t >( row, 303 ) );
+  completedQuest0.push_back( exdData->getField< uint32_t >( row, 304 ) );
+  completedQuest0.push_back( exdData->getField< uint32_t >( row, 305 ) );
+  completedQuest0.push_back( exdData->getField< uint32_t >( row, 306 ) );
+  completedQuest0.push_back( exdData->getField< uint32_t >( row, 307 ) );
+  completedQuest0.push_back( exdData->getField< uint32_t >( row, 308 ) );
+  completedQuest0.push_back( exdData->getField< uint32_t >( row, 309 ) );
+  completedQuest0.push_back( exdData->getField< uint32_t >( row, 310 ) );
+  completedQuest0.push_back( exdData->getField< uint32_t >( row, 311 ) );
+  completedQuest0.push_back( exdData->getField< uint32_t >( row, 312 ) );
+  completedQuest0.push_back( exdData->getField< uint32_t >( row, 313 ) );
+  completedQuest0.push_back( exdData->getField< uint32_t >( row, 314 ) );
+  completedQuest0.push_back( exdData->getField< uint32_t >( row, 315 ) );
+  completedQuest0.push_back( exdData->getField< uint32_t >( row, 316 ) );
+  completedQuest0.push_back( exdData->getField< uint32_t >( row, 317 ) );
+  completedQuest0.push_back( exdData->getField< uint32_t >( row, 318 ) );
+  completedQuest0.push_back( exdData->getField< uint32_t >( row, 319 ) );
+  completedQuest0.push_back( exdData->getField< uint32_t >( row, 320 ) );
+  completedQuest0.push_back( exdData->getField< uint32_t >( row, 321 ) );
+  completedQuest0.push_back( exdData->getField< uint32_t >( row, 322 ) );
+  completedQuest0.push_back( exdData->getField< uint32_t >( row, 323 ) );
+  completedQuest0.push_back( exdData->getField< uint32_t >( row, 324 ) );
+  completedQuest0.push_back( exdData->getField< uint32_t >( row, 325 ) );
+  completedQuest0.push_back( exdData->getField< uint32_t >( row, 326 ) );
+  completedQuest0.push_back( exdData->getField< uint32_t >( row, 327 ) );
+  completedQuest0.push_back( exdData->getField< uint32_t >( row, 328 ) );
+  completedQuest0.push_back( exdData->getField< uint32_t >( row, 329 ) );
+  completedQuest0.push_back( exdData->getField< uint32_t >( row, 330 ) );
+  completedQuest0.push_back( exdData->getField< uint32_t >( row, 331 ) );
+  completedQuest0.push_back( exdData->getField< uint32_t >( row, 332 ) );
+  completedQuest0.push_back( exdData->getField< uint32_t >( row, 333 ) );
+  completedQuest0.push_back( exdData->getField< uint32_t >( row, 334 ) );
+  completedQuest0.push_back( exdData->getField< uint32_t >( row, 335 ) );
+  completedQuest0.push_back( exdData->getField< uint32_t >( row, 336 ) );
+  completedQuest0.push_back( exdData->getField< uint32_t >( row, 337 ) );
+  completedQuest0.push_back( exdData->getField< uint32_t >( row, 338 ) );
+  completedQuest0.push_back( exdData->getField< uint32_t >( row, 339 ) );
+  completedQuest0.push_back( exdData->getField< uint32_t >( row, 340 ) );
+  completedQuest0.push_back( exdData->getField< uint32_t >( row, 341 ) );
+  completedQuest0.push_back( exdData->getField< uint32_t >( row, 342 ) );
+  completedQuest0.push_back( exdData->getField< uint32_t >( row, 343 ) );
+  completedQuest0.push_back( exdData->getField< uint32_t >( row, 344 ) );
+  completedQuest0.push_back( exdData->getField< uint32_t >( row, 345 ) );
+  completedQuest0.push_back( exdData->getField< uint32_t >( row, 346 ) );
+  completedQuest0.push_back( exdData->getField< uint32_t >( row, 347 ) );
+  completedQuest0.push_back( exdData->getField< uint32_t >( row, 348 ) );
+  completedQuest0.push_back( exdData->getField< uint32_t >( row, 349 ) );
+  completedQuest0.push_back( exdData->getField< uint32_t >( row, 350 ) );
+  completedQuest0.push_back( exdData->getField< uint32_t >( row, 351 ) );
+  completedQuest0.push_back( exdData->getField< uint32_t >( row, 352 ) );
+  completedQuest0.push_back( exdData->getField< uint32_t >( row, 353 ) );
+  completedQuest0.push_back( exdData->getField< uint32_t >( row, 354 ) );
+  completedQuest0.push_back( exdData->getField< uint32_t >( row, 355 ) );
+  completedQuest0.push_back( exdData->getField< uint32_t >( row, 356 ) );
+  completedQuest0.push_back( exdData->getField< uint32_t >( row, 357 ) );
+  completedQuest0.push_back( exdData->getField< uint32_t >( row, 358 ) );
+  completedQuest0.push_back( exdData->getField< uint32_t >( row, 359 ) );
+  completedQuest0.push_back( exdData->getField< uint32_t >( row, 360 ) );
+  completedQuest0.push_back( exdData->getField< uint32_t >( row, 361 ) );
+  completedQuest0.push_back( exdData->getField< uint32_t >( row, 362 ) );
+  completedQuest0.push_back( exdData->getField< uint32_t >( row, 363 ) );
+  completedQuest0.push_back( exdData->getField< uint32_t >( row, 364 ) );
+  completedQuest0.push_back( exdData->getField< uint32_t >( row, 365 ) );
+  completedQuest0.push_back( exdData->getField< uint32_t >( row, 366 ) );
+  completedQuest0.push_back( exdData->getField< uint32_t >( row, 367 ) );
+  completedQuest0.push_back( exdData->getField< uint32_t >( row, 368 ) );
+  completedQuest0.push_back( exdData->getField< uint32_t >( row, 369 ) );
+  completedQuest0.push_back( exdData->getField< uint32_t >( row, 370 ) );
+  completedQuest0.push_back( exdData->getField< uint32_t >( row, 371 ) );
+  completedQuest0.push_back( exdData->getField< uint32_t >( row, 372 ) );
+  completedQuest0.push_back( exdData->getField< uint32_t >( row, 373 ) );
+  completedQuest0.push_back( exdData->getField< uint32_t >( row, 374 ) );
+  completedQuest0.push_back( exdData->getField< uint32_t >( row, 375 ) );
+  completedQuest0.push_back( exdData->getField< uint32_t >( row, 376 ) );
+  completedQuest0.push_back( exdData->getField< uint32_t >( row, 377 ) );
+  completedQuest0.push_back( exdData->getField< uint32_t >( row, 378 ) );
+  completedQuest0.push_back( exdData->getField< uint32_t >( row, 379 ) );
+  completedQuest0.push_back( exdData->getField< uint32_t >( row, 380 ) );
+  completedQuest0.push_back( exdData->getField< uint32_t >( row, 381 ) );
+  completedQuest0.push_back( exdData->getField< uint32_t >( row, 382 ) );
+  completedQuest0.push_back( exdData->getField< uint32_t >( row, 383 ) );
+  completedQuest0.push_back( exdData->getField< uint32_t >( row, 384 ) );
+  completedQuest0.push_back( exdData->getField< uint32_t >( row, 385 ) );
+  completedQuest0.push_back( exdData->getField< uint32_t >( row, 386 ) );
+  completedQuest0.push_back( exdData->getField< uint32_t >( row, 387 ) );
+  completedQuest0.push_back( exdData->getField< uint32_t >( row, 388 ) );
+  completedQuest0.push_back( exdData->getField< uint32_t >( row, 389 ) );
+  completedQuest0.push_back( exdData->getField< uint32_t >( row, 390 ) );
+  completedQuest0.push_back( exdData->getField< uint32_t >( row, 391 ) );
+  completedQuest0.push_back( exdData->getField< uint32_t >( row, 392 ) );
+  completedQuest0.push_back( exdData->getField< uint32_t >( row, 393 ) );
+  completedQuest0.push_back( exdData->getField< uint32_t >( row, 394 ) );
+  completedQuest0.push_back( exdData->getField< uint32_t >( row, 395 ) );
+  completedQuest0.push_back( exdData->getField< uint32_t >( row, 396 ) );
+  completedQuest0.push_back( exdData->getField< uint32_t >( row, 397 ) );
+  completedQuest0.push_back( exdData->getField< uint32_t >( row, 398 ) );
+  completedQuest0.push_back( exdData->getField< uint32_t >( row, 399 ) );
+  completedQuest0.push_back( exdData->getField< uint32_t >( row, 400 ) );
+  completedQuest0.push_back( exdData->getField< uint32_t >( row, 401 ) );
+  completedQuest0.push_back( exdData->getField< uint32_t >( row, 402 ) );
+  completedQuest0.push_back( exdData->getField< uint32_t >( row, 403 ) );
+  completedQuest0.push_back( exdData->getField< uint32_t >( row, 404 ) );
+  completedQuest0.push_back( exdData->getField< uint32_t >( row, 405 ) );
+  completedQuest0.push_back( exdData->getField< uint32_t >( row, 406 ) );
+  completedQuest0.push_back( exdData->getField< uint32_t >( row, 407 ) );
+  completedQuest0.push_back( exdData->getField< uint32_t >( row, 408 ) );
+  completedQuest0.push_back( exdData->getField< uint32_t >( row, 409 ) );
+  completedQuest0.push_back( exdData->getField< uint32_t >( row, 410 ) );
+  completedQuest1.push_back( exdData->getField< uint32_t >( row, 411 ) );
+  completedQuest1.push_back( exdData->getField< uint32_t >( row, 412 ) );
+  completedQuest1.push_back( exdData->getField< uint32_t >( row, 413 ) );
+  completedQuest1.push_back( exdData->getField< uint32_t >( row, 414 ) );
+  completedQuest1.push_back( exdData->getField< uint32_t >( row, 415 ) );
+  completedQuest1.push_back( exdData->getField< uint32_t >( row, 416 ) );
+  completedQuest1.push_back( exdData->getField< uint32_t >( row, 417 ) );
+  completedQuest1.push_back( exdData->getField< uint32_t >( row, 418 ) );
+  completedQuest1.push_back( exdData->getField< uint32_t >( row, 419 ) );
+  completedQuest1.push_back( exdData->getField< uint32_t >( row, 420 ) );
+  completedQuest1.push_back( exdData->getField< uint32_t >( row, 421 ) );
+  completedQuest1.push_back( exdData->getField< uint32_t >( row, 422 ) );
+  completedQuest1.push_back( exdData->getField< uint32_t >( row, 423 ) );
+  completedQuest1.push_back( exdData->getField< uint32_t >( row, 424 ) );
+  completedQuest1.push_back( exdData->getField< uint32_t >( row, 425 ) );
+  completedQuest1.push_back( exdData->getField< uint32_t >( row, 426 ) );
+  completedQuest1.push_back( exdData->getField< uint32_t >( row, 427 ) );
+  completedQuest1.push_back( exdData->getField< uint32_t >( row, 428 ) );
+  completedQuest1.push_back( exdData->getField< uint32_t >( row, 429 ) );
+  completedQuest1.push_back( exdData->getField< uint32_t >( row, 430 ) );
+  completedQuest1.push_back( exdData->getField< uint32_t >( row, 431 ) );
+  completedQuest1.push_back( exdData->getField< uint32_t >( row, 432 ) );
+  completedQuest1.push_back( exdData->getField< uint32_t >( row, 433 ) );
+  completedQuest1.push_back( exdData->getField< uint32_t >( row, 434 ) );
+  completedQuest1.push_back( exdData->getField< uint32_t >( row, 435 ) );
+  completedQuest1.push_back( exdData->getField< uint32_t >( row, 436 ) );
+  completedQuest1.push_back( exdData->getField< uint32_t >( row, 437 ) );
+  completedQuest1.push_back( exdData->getField< uint32_t >( row, 438 ) );
+  completedQuest1.push_back( exdData->getField< uint32_t >( row, 439 ) );
+  completedQuest1.push_back( exdData->getField< uint32_t >( row, 440 ) );
+  completedQuest1.push_back( exdData->getField< uint32_t >( row, 441 ) );
+  completedQuest1.push_back( exdData->getField< uint32_t >( row, 442 ) );
+  completedQuest1.push_back( exdData->getField< uint32_t >( row, 443 ) );
+  completedQuest1.push_back( exdData->getField< uint32_t >( row, 444 ) );
+  completedQuest1.push_back( exdData->getField< uint32_t >( row, 445 ) );
+  completedQuest1.push_back( exdData->getField< uint32_t >( row, 446 ) );
+  completedQuest1.push_back( exdData->getField< uint32_t >( row, 447 ) );
+  completedQuest1.push_back( exdData->getField< uint32_t >( row, 448 ) );
+  completedQuest1.push_back( exdData->getField< uint32_t >( row, 449 ) );
+  completedQuest1.push_back( exdData->getField< uint32_t >( row, 450 ) );
+  completedQuest1.push_back( exdData->getField< uint32_t >( row, 451 ) );
+  completedQuest1.push_back( exdData->getField< uint32_t >( row, 452 ) );
+  completedQuest1.push_back( exdData->getField< uint32_t >( row, 453 ) );
+  completedQuest1.push_back( exdData->getField< uint32_t >( row, 454 ) );
+  completedQuest1.push_back( exdData->getField< uint32_t >( row, 455 ) );
+  completedQuest1.push_back( exdData->getField< uint32_t >( row, 456 ) );
+  completedQuest1.push_back( exdData->getField< uint32_t >( row, 457 ) );
+  completedQuest1.push_back( exdData->getField< uint32_t >( row, 458 ) );
+  completedQuest1.push_back( exdData->getField< uint32_t >( row, 459 ) );
+  completedQuest1.push_back( exdData->getField< uint32_t >( row, 460 ) );
+  completedQuest1.push_back( exdData->getField< uint32_t >( row, 461 ) );
+  completedQuest1.push_back( exdData->getField< uint32_t >( row, 462 ) );
+  completedQuest1.push_back( exdData->getField< uint32_t >( row, 463 ) );
+  completedQuest1.push_back( exdData->getField< uint32_t >( row, 464 ) );
+  completedQuest1.push_back( exdData->getField< uint32_t >( row, 465 ) );
+  completedQuest1.push_back( exdData->getField< uint32_t >( row, 466 ) );
+  completedQuest1.push_back( exdData->getField< uint32_t >( row, 467 ) );
+  completedQuest1.push_back( exdData->getField< uint32_t >( row, 468 ) );
+  completedQuest1.push_back( exdData->getField< uint32_t >( row, 469 ) );
+  completedQuest1.push_back( exdData->getField< uint32_t >( row, 470 ) );
+  completedQuest1.push_back( exdData->getField< uint32_t >( row, 471 ) );
+  completedQuest1.push_back( exdData->getField< uint32_t >( row, 472 ) );
+  completedQuest1.push_back( exdData->getField< uint32_t >( row, 473 ) );
+  completedQuest1.push_back( exdData->getField< uint32_t >( row, 474 ) );
+  completedQuest1.push_back( exdData->getField< uint32_t >( row, 475 ) );
+  completedQuest1.push_back( exdData->getField< uint32_t >( row, 476 ) );
+  completedQuest1.push_back( exdData->getField< uint32_t >( row, 477 ) );
+  completedQuest1.push_back( exdData->getField< uint32_t >( row, 478 ) );
+  completedQuest1.push_back( exdData->getField< uint32_t >( row, 479 ) );
+  completedQuest1.push_back( exdData->getField< uint32_t >( row, 480 ) );
+  completedQuest1.push_back( exdData->getField< uint32_t >( row, 481 ) );
+  completedQuest1.push_back( exdData->getField< uint32_t >( row, 482 ) );
+  completedQuest1.push_back( exdData->getField< uint32_t >( row, 483 ) );
+  completedQuest1.push_back( exdData->getField< uint32_t >( row, 484 ) );
+  completedQuest1.push_back( exdData->getField< uint32_t >( row, 485 ) );
+  completedQuest1.push_back( exdData->getField< uint32_t >( row, 486 ) );
+  completedQuest1.push_back( exdData->getField< uint32_t >( row, 487 ) );
+  completedQuest1.push_back( exdData->getField< uint32_t >( row, 488 ) );
+  completedQuest1.push_back( exdData->getField< uint32_t >( row, 489 ) );
+  completedQuest1.push_back( exdData->getField< uint32_t >( row, 490 ) );
+  completedQuest1.push_back( exdData->getField< uint32_t >( row, 491 ) );
+  completedQuest1.push_back( exdData->getField< uint32_t >( row, 492 ) );
+  completedQuest1.push_back( exdData->getField< uint32_t >( row, 493 ) );
+  completedQuest1.push_back( exdData->getField< uint32_t >( row, 494 ) );
+  completedQuest1.push_back( exdData->getField< uint32_t >( row, 495 ) );
+  completedQuest1.push_back( exdData->getField< uint32_t >( row, 496 ) );
+  completedQuest1.push_back( exdData->getField< uint32_t >( row, 497 ) );
+  completedQuest1.push_back( exdData->getField< uint32_t >( row, 498 ) );
+  completedQuest1.push_back( exdData->getField< uint32_t >( row, 499 ) );
+  completedQuest1.push_back( exdData->getField< uint32_t >( row, 500 ) );
+  completedQuest1.push_back( exdData->getField< uint32_t >( row, 501 ) );
+  completedQuest1.push_back( exdData->getField< uint32_t >( row, 502 ) );
+  completedQuest1.push_back( exdData->getField< uint32_t >( row, 503 ) );
+  completedQuest1.push_back( exdData->getField< uint32_t >( row, 504 ) );
+  completedQuest1.push_back( exdData->getField< uint32_t >( row, 505 ) );
+  completedQuest1.push_back( exdData->getField< uint32_t >( row, 506 ) );
+  completedQuest1.push_back( exdData->getField< uint32_t >( row, 507 ) );
+  completedQuest1.push_back( exdData->getField< uint32_t >( row, 508 ) );
+  completedQuest1.push_back( exdData->getField< uint32_t >( row, 509 ) );
+  completedQuest1.push_back( exdData->getField< uint32_t >( row, 510 ) );
+  completedQuest1.push_back( exdData->getField< uint32_t >( row, 511 ) );
+  completedQuest1.push_back( exdData->getField< uint32_t >( row, 512 ) );
+  completedQuest1.push_back( exdData->getField< uint32_t >( row, 513 ) );
+  completedQuest1.push_back( exdData->getField< uint32_t >( row, 514 ) );
+  completedQuest1.push_back( exdData->getField< uint32_t >( row, 515 ) );
+  completedQuest1.push_back( exdData->getField< uint32_t >( row, 516 ) );
+  completedQuest1.push_back( exdData->getField< uint32_t >( row, 517 ) );
+  completedQuest1.push_back( exdData->getField< uint32_t >( row, 518 ) );
+  completedQuest1.push_back( exdData->getField< uint32_t >( row, 519 ) );
+  completedQuest1.push_back( exdData->getField< uint32_t >( row, 520 ) );
+  completedQuest2.push_back( exdData->getField< uint32_t >( row, 521 ) );
+  completedQuest2.push_back( exdData->getField< uint32_t >( row, 522 ) );
+  completedQuest2.push_back( exdData->getField< uint32_t >( row, 523 ) );
+  completedQuest2.push_back( exdData->getField< uint32_t >( row, 524 ) );
+  completedQuest2.push_back( exdData->getField< uint32_t >( row, 525 ) );
+  completedQuest2.push_back( exdData->getField< uint32_t >( row, 526 ) );
+  completedQuest2.push_back( exdData->getField< uint32_t >( row, 527 ) );
+  completedQuest2.push_back( exdData->getField< uint32_t >( row, 528 ) );
+  completedQuest2.push_back( exdData->getField< uint32_t >( row, 529 ) );
+  completedQuest2.push_back( exdData->getField< uint32_t >( row, 530 ) );
+  completedQuest2.push_back( exdData->getField< uint32_t >( row, 531 ) );
+  completedQuest2.push_back( exdData->getField< uint32_t >( row, 532 ) );
+  completedQuest2.push_back( exdData->getField< uint32_t >( row, 533 ) );
+  completedQuest2.push_back( exdData->getField< uint32_t >( row, 534 ) );
+  completedQuest2.push_back( exdData->getField< uint32_t >( row, 535 ) );
+  completedQuest2.push_back( exdData->getField< uint32_t >( row, 536 ) );
+  completedQuest2.push_back( exdData->getField< uint32_t >( row, 537 ) );
+  completedQuest2.push_back( exdData->getField< uint32_t >( row, 538 ) );
+  completedQuest2.push_back( exdData->getField< uint32_t >( row, 539 ) );
+  completedQuest2.push_back( exdData->getField< uint32_t >( row, 540 ) );
+  completedQuest2.push_back( exdData->getField< uint32_t >( row, 541 ) );
+  completedQuest2.push_back( exdData->getField< uint32_t >( row, 542 ) );
+  completedQuest2.push_back( exdData->getField< uint32_t >( row, 543 ) );
+  completedQuest2.push_back( exdData->getField< uint32_t >( row, 544 ) );
+  completedQuest2.push_back( exdData->getField< uint32_t >( row, 545 ) );
+  completedQuest2.push_back( exdData->getField< uint32_t >( row, 546 ) );
+  completedQuest2.push_back( exdData->getField< uint32_t >( row, 547 ) );
+  completedQuest2.push_back( exdData->getField< uint32_t >( row, 548 ) );
+  completedQuest2.push_back( exdData->getField< uint32_t >( row, 549 ) );
+  completedQuest2.push_back( exdData->getField< uint32_t >( row, 550 ) );
+  completedQuest2.push_back( exdData->getField< uint32_t >( row, 551 ) );
+  completedQuest2.push_back( exdData->getField< uint32_t >( row, 552 ) );
+  completedQuest2.push_back( exdData->getField< uint32_t >( row, 553 ) );
+  completedQuest2.push_back( exdData->getField< uint32_t >( row, 554 ) );
+  completedQuest2.push_back( exdData->getField< uint32_t >( row, 555 ) );
+  completedQuest2.push_back( exdData->getField< uint32_t >( row, 556 ) );
+  completedQuest2.push_back( exdData->getField< uint32_t >( row, 557 ) );
+  completedQuest2.push_back( exdData->getField< uint32_t >( row, 558 ) );
+  completedQuest2.push_back( exdData->getField< uint32_t >( row, 559 ) );
+  completedQuest2.push_back( exdData->getField< uint32_t >( row, 560 ) );
+  completedQuest2.push_back( exdData->getField< uint32_t >( row, 561 ) );
+  completedQuest2.push_back( exdData->getField< uint32_t >( row, 562 ) );
+  completedQuest2.push_back( exdData->getField< uint32_t >( row, 563 ) );
+  completedQuest2.push_back( exdData->getField< uint32_t >( row, 564 ) );
+  completedQuest2.push_back( exdData->getField< uint32_t >( row, 565 ) );
+  completedQuest2.push_back( exdData->getField< uint32_t >( row, 566 ) );
+  completedQuest2.push_back( exdData->getField< uint32_t >( row, 567 ) );
+  completedQuest2.push_back( exdData->getField< uint32_t >( row, 568 ) );
+  completedQuest2.push_back( exdData->getField< uint32_t >( row, 569 ) );
+  completedQuest2.push_back( exdData->getField< uint32_t >( row, 570 ) );
+  completedQuest2.push_back( exdData->getField< uint32_t >( row, 571 ) );
+  completedQuest2.push_back( exdData->getField< uint32_t >( row, 572 ) );
+  completedQuest2.push_back( exdData->getField< uint32_t >( row, 573 ) );
+  completedQuest2.push_back( exdData->getField< uint32_t >( row, 574 ) );
+  completedQuest2.push_back( exdData->getField< uint32_t >( row, 575 ) );
+  completedQuest2.push_back( exdData->getField< uint32_t >( row, 576 ) );
+  completedQuest2.push_back( exdData->getField< uint32_t >( row, 577 ) );
+  completedQuest2.push_back( exdData->getField< uint32_t >( row, 578 ) );
+  completedQuest2.push_back( exdData->getField< uint32_t >( row, 579 ) );
+  completedQuest2.push_back( exdData->getField< uint32_t >( row, 580 ) );
+  completedQuest2.push_back( exdData->getField< uint32_t >( row, 581 ) );
+  completedQuest2.push_back( exdData->getField< uint32_t >( row, 582 ) );
+  completedQuest2.push_back( exdData->getField< uint32_t >( row, 583 ) );
+  completedQuest2.push_back( exdData->getField< uint32_t >( row, 584 ) );
+  completedQuest2.push_back( exdData->getField< uint32_t >( row, 585 ) );
+  completedQuest2.push_back( exdData->getField< uint32_t >( row, 586 ) );
+  completedQuest2.push_back( exdData->getField< uint32_t >( row, 587 ) );
+  completedQuest2.push_back( exdData->getField< uint32_t >( row, 588 ) );
+  completedQuest2.push_back( exdData->getField< uint32_t >( row, 589 ) );
+  completedQuest2.push_back( exdData->getField< uint32_t >( row, 590 ) );
+  completedQuest2.push_back( exdData->getField< uint32_t >( row, 591 ) );
+  completedQuest2.push_back( exdData->getField< uint32_t >( row, 592 ) );
+  completedQuest2.push_back( exdData->getField< uint32_t >( row, 593 ) );
+  completedQuest2.push_back( exdData->getField< uint32_t >( row, 594 ) );
+  completedQuest2.push_back( exdData->getField< uint32_t >( row, 595 ) );
+  completedQuest2.push_back( exdData->getField< uint32_t >( row, 596 ) );
+  completedQuest2.push_back( exdData->getField< uint32_t >( row, 597 ) );
+  completedQuest2.push_back( exdData->getField< uint32_t >( row, 598 ) );
+  completedQuest2.push_back( exdData->getField< uint32_t >( row, 599 ) );
+  completedQuest2.push_back( exdData->getField< uint32_t >( row, 600 ) );
+  completedQuest2.push_back( exdData->getField< uint32_t >( row, 601 ) );
+  completedQuest2.push_back( exdData->getField< uint32_t >( row, 602 ) );
+  completedQuest2.push_back( exdData->getField< uint32_t >( row, 603 ) );
+  completedQuest2.push_back( exdData->getField< uint32_t >( row, 604 ) );
+  completedQuest2.push_back( exdData->getField< uint32_t >( row, 605 ) );
+  completedQuest2.push_back( exdData->getField< uint32_t >( row, 606 ) );
+  completedQuest2.push_back( exdData->getField< uint32_t >( row, 607 ) );
+  completedQuest2.push_back( exdData->getField< uint32_t >( row, 608 ) );
+  completedQuest2.push_back( exdData->getField< uint32_t >( row, 609 ) );
+  completedQuest2.push_back( exdData->getField< uint32_t >( row, 610 ) );
+  completedQuest2.push_back( exdData->getField< uint32_t >( row, 611 ) );
+  completedQuest2.push_back( exdData->getField< uint32_t >( row, 612 ) );
+  completedQuest2.push_back( exdData->getField< uint32_t >( row, 613 ) );
+  completedQuest2.push_back( exdData->getField< uint32_t >( row, 614 ) );
+  completedQuest2.push_back( exdData->getField< uint32_t >( row, 615 ) );
+  completedQuest2.push_back( exdData->getField< uint32_t >( row, 616 ) );
+  completedQuest2.push_back( exdData->getField< uint32_t >( row, 617 ) );
+  completedQuest2.push_back( exdData->getField< uint32_t >( row, 618 ) );
+  completedQuest2.push_back( exdData->getField< uint32_t >( row, 619 ) );
+  completedQuest2.push_back( exdData->getField< uint32_t >( row, 620 ) );
+  completedQuest2.push_back( exdData->getField< uint32_t >( row, 621 ) );
+  completedQuest2.push_back( exdData->getField< uint32_t >( row, 622 ) );
+  completedQuest2.push_back( exdData->getField< uint32_t >( row, 623 ) );
+  completedQuest2.push_back( exdData->getField< uint32_t >( row, 624 ) );
+  completedQuest2.push_back( exdData->getField< uint32_t >( row, 625 ) );
+  completedQuest2.push_back( exdData->getField< uint32_t >( row, 626 ) );
+  completedQuest2.push_back( exdData->getField< uint32_t >( row, 627 ) );
+  completedQuest2.push_back( exdData->getField< uint32_t >( row, 628 ) );
+  completedQuest2.push_back( exdData->getField< uint32_t >( row, 629 ) );
+  completedQuest2.push_back( exdData->getField< uint32_t >( row, 630 ) );
+  acceptedQuestOperator.push_back( exdData->getField< uint8_t >( row, 631 ) );
+  acceptedQuestOperator.push_back( exdData->getField< uint8_t >( row, 632 ) );
+  acceptedQuestOperator.push_back( exdData->getField< uint8_t >( row, 633 ) );
+  acceptedQuestOperator.push_back( exdData->getField< uint8_t >( row, 634 ) );
+  acceptedQuestOperator.push_back( exdData->getField< uint8_t >( row, 635 ) );
+  acceptedQuestOperator.push_back( exdData->getField< uint8_t >( row, 636 ) );
+  acceptedQuestOperator.push_back( exdData->getField< uint8_t >( row, 637 ) );
+  acceptedQuestOperator.push_back( exdData->getField< uint8_t >( row, 638 ) );
+  acceptedQuestOperator.push_back( exdData->getField< uint8_t >( row, 639 ) );
+  acceptedQuestOperator.push_back( exdData->getField< uint8_t >( row, 640 ) );
+  acceptedQuestOperator.push_back( exdData->getField< uint8_t >( row, 641 ) );
+  acceptedQuestOperator.push_back( exdData->getField< uint8_t >( row, 642 ) );
+  acceptedQuestOperator.push_back( exdData->getField< uint8_t >( row, 643 ) );
+  acceptedQuestOperator.push_back( exdData->getField< uint8_t >( row, 644 ) );
+  acceptedQuestOperator.push_back( exdData->getField< uint8_t >( row, 645 ) );
+  acceptedQuestOperator.push_back( exdData->getField< uint8_t >( row, 646 ) );
+  acceptedQuestOperator.push_back( exdData->getField< uint8_t >( row, 647 ) );
+  acceptedQuestOperator.push_back( exdData->getField< uint8_t >( row, 648 ) );
+  acceptedQuestOperator.push_back( exdData->getField< uint8_t >( row, 649 ) );
+  acceptedQuestOperator.push_back( exdData->getField< uint8_t >( row, 650 ) );
+  acceptedQuestOperator.push_back( exdData->getField< uint8_t >( row, 651 ) );
+  acceptedQuestOperator.push_back( exdData->getField< uint8_t >( row, 652 ) );
+  acceptedQuestOperator.push_back( exdData->getField< uint8_t >( row, 653 ) );
+  acceptedQuestOperator.push_back( exdData->getField< uint8_t >( row, 654 ) );
+  acceptedQuestOperator.push_back( exdData->getField< uint8_t >( row, 655 ) );
+  acceptedQuestOperator.push_back( exdData->getField< uint8_t >( row, 656 ) );
+  acceptedQuestOperator.push_back( exdData->getField< uint8_t >( row, 657 ) );
+  acceptedQuestOperator.push_back( exdData->getField< uint8_t >( row, 658 ) );
+  acceptedQuestOperator.push_back( exdData->getField< uint8_t >( row, 659 ) );
+  acceptedQuestOperator.push_back( exdData->getField< uint8_t >( row, 660 ) );
+  acceptedQuestOperator.push_back( exdData->getField< uint8_t >( row, 661 ) );
+  acceptedQuestOperator.push_back( exdData->getField< uint8_t >( row, 662 ) );
+  acceptedQuestOperator.push_back( exdData->getField< uint8_t >( row, 663 ) );
+  acceptedQuestOperator.push_back( exdData->getField< uint8_t >( row, 664 ) );
+  acceptedQuestOperator.push_back( exdData->getField< uint8_t >( row, 665 ) );
+  acceptedQuestOperator.push_back( exdData->getField< uint8_t >( row, 666 ) );
+  acceptedQuestOperator.push_back( exdData->getField< uint8_t >( row, 667 ) );
+  acceptedQuestOperator.push_back( exdData->getField< uint8_t >( row, 668 ) );
+  acceptedQuestOperator.push_back( exdData->getField< uint8_t >( row, 669 ) );
+  acceptedQuestOperator.push_back( exdData->getField< uint8_t >( row, 670 ) );
+  acceptedQuestOperator.push_back( exdData->getField< uint8_t >( row, 671 ) );
+  acceptedQuestOperator.push_back( exdData->getField< uint8_t >( row, 672 ) );
+  acceptedQuestOperator.push_back( exdData->getField< uint8_t >( row, 673 ) );
+  acceptedQuestOperator.push_back( exdData->getField< uint8_t >( row, 674 ) );
+  acceptedQuestOperator.push_back( exdData->getField< uint8_t >( row, 675 ) );
+  acceptedQuestOperator.push_back( exdData->getField< uint8_t >( row, 676 ) );
+  acceptedQuestOperator.push_back( exdData->getField< uint8_t >( row, 677 ) );
+  acceptedQuestOperator.push_back( exdData->getField< uint8_t >( row, 678 ) );
+  acceptedQuestOperator.push_back( exdData->getField< uint8_t >( row, 679 ) );
+  acceptedQuestOperator.push_back( exdData->getField< uint8_t >( row, 680 ) );
+  acceptedQuestOperator.push_back( exdData->getField< uint8_t >( row, 681 ) );
+  acceptedQuestOperator.push_back( exdData->getField< uint8_t >( row, 682 ) );
+  acceptedQuestOperator.push_back( exdData->getField< uint8_t >( row, 683 ) );
+  acceptedQuestOperator.push_back( exdData->getField< uint8_t >( row, 684 ) );
+  acceptedQuestOperator.push_back( exdData->getField< uint8_t >( row, 685 ) );
+  acceptedQuestOperator.push_back( exdData->getField< uint8_t >( row, 686 ) );
+  acceptedQuestOperator.push_back( exdData->getField< uint8_t >( row, 687 ) );
+  acceptedQuestOperator.push_back( exdData->getField< uint8_t >( row, 688 ) );
+  acceptedQuestOperator.push_back( exdData->getField< uint8_t >( row, 689 ) );
+  acceptedQuestOperator.push_back( exdData->getField< uint8_t >( row, 690 ) );
+  acceptedQuestOperator.push_back( exdData->getField< uint8_t >( row, 691 ) );
+  acceptedQuestOperator.push_back( exdData->getField< uint8_t >( row, 692 ) );
+  acceptedQuestOperator.push_back( exdData->getField< uint8_t >( row, 693 ) );
+  acceptedQuestOperator.push_back( exdData->getField< uint8_t >( row, 694 ) );
+  acceptedQuestOperator.push_back( exdData->getField< uint8_t >( row, 695 ) );
+  acceptedQuestOperator.push_back( exdData->getField< uint8_t >( row, 696 ) );
+  acceptedQuestOperator.push_back( exdData->getField< uint8_t >( row, 697 ) );
+  acceptedQuestOperator.push_back( exdData->getField< uint8_t >( row, 698 ) );
+  acceptedQuestOperator.push_back( exdData->getField< uint8_t >( row, 699 ) );
+  acceptedQuestOperator.push_back( exdData->getField< uint8_t >( row, 700 ) );
+  acceptedQuestOperator.push_back( exdData->getField< uint8_t >( row, 701 ) );
+  acceptedQuestOperator.push_back( exdData->getField< uint8_t >( row, 702 ) );
+  acceptedQuestOperator.push_back( exdData->getField< uint8_t >( row, 703 ) );
+  acceptedQuestOperator.push_back( exdData->getField< uint8_t >( row, 704 ) );
+  acceptedQuestOperator.push_back( exdData->getField< uint8_t >( row, 705 ) );
+  acceptedQuestOperator.push_back( exdData->getField< uint8_t >( row, 706 ) );
+  acceptedQuestOperator.push_back( exdData->getField< uint8_t >( row, 707 ) );
+  acceptedQuestOperator.push_back( exdData->getField< uint8_t >( row, 708 ) );
+  acceptedQuestOperator.push_back( exdData->getField< uint8_t >( row, 709 ) );
+  acceptedQuestOperator.push_back( exdData->getField< uint8_t >( row, 710 ) );
+  acceptedQuestOperator.push_back( exdData->getField< uint8_t >( row, 711 ) );
+  acceptedQuestOperator.push_back( exdData->getField< uint8_t >( row, 712 ) );
+  acceptedQuestOperator.push_back( exdData->getField< uint8_t >( row, 713 ) );
+  acceptedQuestOperator.push_back( exdData->getField< uint8_t >( row, 714 ) );
+  acceptedQuestOperator.push_back( exdData->getField< uint8_t >( row, 715 ) );
+  acceptedQuestOperator.push_back( exdData->getField< uint8_t >( row, 716 ) );
+  acceptedQuestOperator.push_back( exdData->getField< uint8_t >( row, 717 ) );
+  acceptedQuestOperator.push_back( exdData->getField< uint8_t >( row, 718 ) );
+  acceptedQuestOperator.push_back( exdData->getField< uint8_t >( row, 719 ) );
+  acceptedQuestOperator.push_back( exdData->getField< uint8_t >( row, 720 ) );
+  acceptedQuestOperator.push_back( exdData->getField< uint8_t >( row, 721 ) );
+  acceptedQuestOperator.push_back( exdData->getField< uint8_t >( row, 722 ) );
+  acceptedQuestOperator.push_back( exdData->getField< uint8_t >( row, 723 ) );
+  acceptedQuestOperator.push_back( exdData->getField< uint8_t >( row, 724 ) );
+  acceptedQuestOperator.push_back( exdData->getField< uint8_t >( row, 725 ) );
+  acceptedQuestOperator.push_back( exdData->getField< uint8_t >( row, 726 ) );
+  acceptedQuestOperator.push_back( exdData->getField< uint8_t >( row, 727 ) );
+  acceptedQuestOperator.push_back( exdData->getField< uint8_t >( row, 728 ) );
+  acceptedQuestOperator.push_back( exdData->getField< uint8_t >( row, 729 ) );
+  acceptedQuestOperator.push_back( exdData->getField< uint8_t >( row, 730 ) );
+  acceptedQuestOperator.push_back( exdData->getField< uint8_t >( row, 731 ) );
+  acceptedQuestOperator.push_back( exdData->getField< uint8_t >( row, 732 ) );
+  acceptedQuestOperator.push_back( exdData->getField< uint8_t >( row, 733 ) );
+  acceptedQuestOperator.push_back( exdData->getField< uint8_t >( row, 734 ) );
+  acceptedQuestOperator.push_back( exdData->getField< uint8_t >( row, 735 ) );
+  acceptedQuestOperator.push_back( exdData->getField< uint8_t >( row, 736 ) );
+  acceptedQuestOperator.push_back( exdData->getField< uint8_t >( row, 737 ) );
+  acceptedQuestOperator.push_back( exdData->getField< uint8_t >( row, 738 ) );
+  acceptedQuestOperator.push_back( exdData->getField< uint8_t >( row, 739 ) );
+  acceptedQuestOperator.push_back( exdData->getField< uint8_t >( row, 740 ) );
+  acceptedQuest0.push_back( exdData->getField< uint32_t >( row, 741 ) );
+  acceptedQuest0.push_back( exdData->getField< uint32_t >( row, 742 ) );
+  acceptedQuest0.push_back( exdData->getField< uint32_t >( row, 743 ) );
+  acceptedQuest0.push_back( exdData->getField< uint32_t >( row, 744 ) );
+  acceptedQuest0.push_back( exdData->getField< uint32_t >( row, 745 ) );
+  acceptedQuest0.push_back( exdData->getField< uint32_t >( row, 746 ) );
+  acceptedQuest0.push_back( exdData->getField< uint32_t >( row, 747 ) );
+  acceptedQuest0.push_back( exdData->getField< uint32_t >( row, 748 ) );
+  acceptedQuest0.push_back( exdData->getField< uint32_t >( row, 749 ) );
+  acceptedQuest0.push_back( exdData->getField< uint32_t >( row, 750 ) );
+  acceptedQuest0.push_back( exdData->getField< uint32_t >( row, 751 ) );
+  acceptedQuest0.push_back( exdData->getField< uint32_t >( row, 752 ) );
+  acceptedQuest0.push_back( exdData->getField< uint32_t >( row, 753 ) );
+  acceptedQuest0.push_back( exdData->getField< uint32_t >( row, 754 ) );
+  acceptedQuest0.push_back( exdData->getField< uint32_t >( row, 755 ) );
+  acceptedQuest0.push_back( exdData->getField< uint32_t >( row, 756 ) );
+  acceptedQuest0.push_back( exdData->getField< uint32_t >( row, 757 ) );
+  acceptedQuest0.push_back( exdData->getField< uint32_t >( row, 758 ) );
+  acceptedQuest0.push_back( exdData->getField< uint32_t >( row, 759 ) );
+  acceptedQuest0.push_back( exdData->getField< uint32_t >( row, 760 ) );
+  acceptedQuest0.push_back( exdData->getField< uint32_t >( row, 761 ) );
+  acceptedQuest0.push_back( exdData->getField< uint32_t >( row, 762 ) );
+  acceptedQuest0.push_back( exdData->getField< uint32_t >( row, 763 ) );
+  acceptedQuest0.push_back( exdData->getField< uint32_t >( row, 764 ) );
+  acceptedQuest0.push_back( exdData->getField< uint32_t >( row, 765 ) );
+  acceptedQuest0.push_back( exdData->getField< uint32_t >( row, 766 ) );
+  acceptedQuest0.push_back( exdData->getField< uint32_t >( row, 767 ) );
+  acceptedQuest0.push_back( exdData->getField< uint32_t >( row, 768 ) );
+  acceptedQuest0.push_back( exdData->getField< uint32_t >( row, 769 ) );
+  acceptedQuest0.push_back( exdData->getField< uint32_t >( row, 770 ) );
+  acceptedQuest0.push_back( exdData->getField< uint32_t >( row, 771 ) );
+  acceptedQuest0.push_back( exdData->getField< uint32_t >( row, 772 ) );
+  acceptedQuest0.push_back( exdData->getField< uint32_t >( row, 773 ) );
+  acceptedQuest0.push_back( exdData->getField< uint32_t >( row, 774 ) );
+  acceptedQuest0.push_back( exdData->getField< uint32_t >( row, 775 ) );
+  acceptedQuest0.push_back( exdData->getField< uint32_t >( row, 776 ) );
+  acceptedQuest0.push_back( exdData->getField< uint32_t >( row, 777 ) );
+  acceptedQuest0.push_back( exdData->getField< uint32_t >( row, 778 ) );
+  acceptedQuest0.push_back( exdData->getField< uint32_t >( row, 779 ) );
+  acceptedQuest0.push_back( exdData->getField< uint32_t >( row, 780 ) );
+  acceptedQuest0.push_back( exdData->getField< uint32_t >( row, 781 ) );
+  acceptedQuest0.push_back( exdData->getField< uint32_t >( row, 782 ) );
+  acceptedQuest0.push_back( exdData->getField< uint32_t >( row, 783 ) );
+  acceptedQuest0.push_back( exdData->getField< uint32_t >( row, 784 ) );
+  acceptedQuest0.push_back( exdData->getField< uint32_t >( row, 785 ) );
+  acceptedQuest0.push_back( exdData->getField< uint32_t >( row, 786 ) );
+  acceptedQuest0.push_back( exdData->getField< uint32_t >( row, 787 ) );
+  acceptedQuest0.push_back( exdData->getField< uint32_t >( row, 788 ) );
+  acceptedQuest0.push_back( exdData->getField< uint32_t >( row, 789 ) );
+  acceptedQuest0.push_back( exdData->getField< uint32_t >( row, 790 ) );
+  acceptedQuest0.push_back( exdData->getField< uint32_t >( row, 791 ) );
+  acceptedQuest0.push_back( exdData->getField< uint32_t >( row, 792 ) );
+  acceptedQuest0.push_back( exdData->getField< uint32_t >( row, 793 ) );
+  acceptedQuest0.push_back( exdData->getField< uint32_t >( row, 794 ) );
+  acceptedQuest0.push_back( exdData->getField< uint32_t >( row, 795 ) );
+  acceptedQuest0.push_back( exdData->getField< uint32_t >( row, 796 ) );
+  acceptedQuest0.push_back( exdData->getField< uint32_t >( row, 797 ) );
+  acceptedQuest0.push_back( exdData->getField< uint32_t >( row, 798 ) );
+  acceptedQuest0.push_back( exdData->getField< uint32_t >( row, 799 ) );
+  acceptedQuest0.push_back( exdData->getField< uint32_t >( row, 800 ) );
+  acceptedQuest0.push_back( exdData->getField< uint32_t >( row, 801 ) );
+  acceptedQuest0.push_back( exdData->getField< uint32_t >( row, 802 ) );
+  acceptedQuest0.push_back( exdData->getField< uint32_t >( row, 803 ) );
+  acceptedQuest0.push_back( exdData->getField< uint32_t >( row, 804 ) );
+  acceptedQuest0.push_back( exdData->getField< uint32_t >( row, 805 ) );
+  acceptedQuest0.push_back( exdData->getField< uint32_t >( row, 806 ) );
+  acceptedQuest0.push_back( exdData->getField< uint32_t >( row, 807 ) );
+  acceptedQuest0.push_back( exdData->getField< uint32_t >( row, 808 ) );
+  acceptedQuest0.push_back( exdData->getField< uint32_t >( row, 809 ) );
+  acceptedQuest0.push_back( exdData->getField< uint32_t >( row, 810 ) );
+  acceptedQuest0.push_back( exdData->getField< uint32_t >( row, 811 ) );
+  acceptedQuest0.push_back( exdData->getField< uint32_t >( row, 812 ) );
+  acceptedQuest0.push_back( exdData->getField< uint32_t >( row, 813 ) );
+  acceptedQuest0.push_back( exdData->getField< uint32_t >( row, 814 ) );
+  acceptedQuest0.push_back( exdData->getField< uint32_t >( row, 815 ) );
+  acceptedQuest0.push_back( exdData->getField< uint32_t >( row, 816 ) );
+  acceptedQuest0.push_back( exdData->getField< uint32_t >( row, 817 ) );
+  acceptedQuest0.push_back( exdData->getField< uint32_t >( row, 818 ) );
+  acceptedQuest0.push_back( exdData->getField< uint32_t >( row, 819 ) );
+  acceptedQuest0.push_back( exdData->getField< uint32_t >( row, 820 ) );
+  acceptedQuest0.push_back( exdData->getField< uint32_t >( row, 821 ) );
+  acceptedQuest0.push_back( exdData->getField< uint32_t >( row, 822 ) );
+  acceptedQuest0.push_back( exdData->getField< uint32_t >( row, 823 ) );
+  acceptedQuest0.push_back( exdData->getField< uint32_t >( row, 824 ) );
+  acceptedQuest0.push_back( exdData->getField< uint32_t >( row, 825 ) );
+  acceptedQuest0.push_back( exdData->getField< uint32_t >( row, 826 ) );
+  acceptedQuest0.push_back( exdData->getField< uint32_t >( row, 827 ) );
+  acceptedQuest0.push_back( exdData->getField< uint32_t >( row, 828 ) );
+  acceptedQuest0.push_back( exdData->getField< uint32_t >( row, 829 ) );
+  acceptedQuest0.push_back( exdData->getField< uint32_t >( row, 830 ) );
+  acceptedQuest0.push_back( exdData->getField< uint32_t >( row, 831 ) );
+  acceptedQuest0.push_back( exdData->getField< uint32_t >( row, 832 ) );
+  acceptedQuest0.push_back( exdData->getField< uint32_t >( row, 833 ) );
+  acceptedQuest0.push_back( exdData->getField< uint32_t >( row, 834 ) );
+  acceptedQuest0.push_back( exdData->getField< uint32_t >( row, 835 ) );
+  acceptedQuest0.push_back( exdData->getField< uint32_t >( row, 836 ) );
+  acceptedQuest0.push_back( exdData->getField< uint32_t >( row, 837 ) );
+  acceptedQuest0.push_back( exdData->getField< uint32_t >( row, 838 ) );
+  acceptedQuest0.push_back( exdData->getField< uint32_t >( row, 839 ) );
+  acceptedQuest0.push_back( exdData->getField< uint32_t >( row, 840 ) );
+  acceptedQuest0.push_back( exdData->getField< uint32_t >( row, 841 ) );
+  acceptedQuest0.push_back( exdData->getField< uint32_t >( row, 842 ) );
+  acceptedQuest0.push_back( exdData->getField< uint32_t >( row, 843 ) );
+  acceptedQuest0.push_back( exdData->getField< uint32_t >( row, 844 ) );
+  acceptedQuest0.push_back( exdData->getField< uint32_t >( row, 845 ) );
+  acceptedQuest0.push_back( exdData->getField< uint32_t >( row, 846 ) );
+  acceptedQuest0.push_back( exdData->getField< uint32_t >( row, 847 ) );
+  acceptedQuest0.push_back( exdData->getField< uint32_t >( row, 848 ) );
+  acceptedQuest0.push_back( exdData->getField< uint32_t >( row, 849 ) );
+  acceptedQuest0.push_back( exdData->getField< uint32_t >( row, 850 ) );
+  acceptedQuestSequence0.push_back( exdData->getField< uint8_t >( row, 851 ) );
+  acceptedQuestSequence0.push_back( exdData->getField< uint8_t >( row, 852 ) );
+  acceptedQuestSequence0.push_back( exdData->getField< uint8_t >( row, 853 ) );
+  acceptedQuestSequence0.push_back( exdData->getField< uint8_t >( row, 854 ) );
+  acceptedQuestSequence0.push_back( exdData->getField< uint8_t >( row, 855 ) );
+  acceptedQuestSequence0.push_back( exdData->getField< uint8_t >( row, 856 ) );
+  acceptedQuestSequence0.push_back( exdData->getField< uint8_t >( row, 857 ) );
+  acceptedQuestSequence0.push_back( exdData->getField< uint8_t >( row, 858 ) );
+  acceptedQuestSequence0.push_back( exdData->getField< uint8_t >( row, 859 ) );
+  acceptedQuestSequence0.push_back( exdData->getField< uint8_t >( row, 860 ) );
+  acceptedQuestSequence0.push_back( exdData->getField< uint8_t >( row, 861 ) );
+  acceptedQuestSequence0.push_back( exdData->getField< uint8_t >( row, 862 ) );
+  acceptedQuestSequence0.push_back( exdData->getField< uint8_t >( row, 863 ) );
+  acceptedQuestSequence0.push_back( exdData->getField< uint8_t >( row, 864 ) );
+  acceptedQuestSequence0.push_back( exdData->getField< uint8_t >( row, 865 ) );
+  acceptedQuestSequence0.push_back( exdData->getField< uint8_t >( row, 866 ) );
+  acceptedQuestSequence0.push_back( exdData->getField< uint8_t >( row, 867 ) );
+  acceptedQuestSequence0.push_back( exdData->getField< uint8_t >( row, 868 ) );
+  acceptedQuestSequence0.push_back( exdData->getField< uint8_t >( row, 869 ) );
+  acceptedQuestSequence0.push_back( exdData->getField< uint8_t >( row, 870 ) );
+  acceptedQuestSequence0.push_back( exdData->getField< uint8_t >( row, 871 ) );
+  acceptedQuestSequence0.push_back( exdData->getField< uint8_t >( row, 872 ) );
+  acceptedQuestSequence0.push_back( exdData->getField< uint8_t >( row, 873 ) );
+  acceptedQuestSequence0.push_back( exdData->getField< uint8_t >( row, 874 ) );
+  acceptedQuestSequence0.push_back( exdData->getField< uint8_t >( row, 875 ) );
+  acceptedQuestSequence0.push_back( exdData->getField< uint8_t >( row, 876 ) );
+  acceptedQuestSequence0.push_back( exdData->getField< uint8_t >( row, 877 ) );
+  acceptedQuestSequence0.push_back( exdData->getField< uint8_t >( row, 878 ) );
+  acceptedQuestSequence0.push_back( exdData->getField< uint8_t >( row, 879 ) );
+  acceptedQuestSequence0.push_back( exdData->getField< uint8_t >( row, 880 ) );
+  acceptedQuestSequence0.push_back( exdData->getField< uint8_t >( row, 881 ) );
+  acceptedQuestSequence0.push_back( exdData->getField< uint8_t >( row, 882 ) );
+  acceptedQuestSequence0.push_back( exdData->getField< uint8_t >( row, 883 ) );
+  acceptedQuestSequence0.push_back( exdData->getField< uint8_t >( row, 884 ) );
+  acceptedQuestSequence0.push_back( exdData->getField< uint8_t >( row, 885 ) );
+  acceptedQuestSequence0.push_back( exdData->getField< uint8_t >( row, 886 ) );
+  acceptedQuestSequence0.push_back( exdData->getField< uint8_t >( row, 887 ) );
+  acceptedQuestSequence0.push_back( exdData->getField< uint8_t >( row, 888 ) );
+  acceptedQuestSequence0.push_back( exdData->getField< uint8_t >( row, 889 ) );
+  acceptedQuestSequence0.push_back( exdData->getField< uint8_t >( row, 890 ) );
+  acceptedQuestSequence0.push_back( exdData->getField< uint8_t >( row, 891 ) );
+  acceptedQuestSequence0.push_back( exdData->getField< uint8_t >( row, 892 ) );
+  acceptedQuestSequence0.push_back( exdData->getField< uint8_t >( row, 893 ) );
+  acceptedQuestSequence0.push_back( exdData->getField< uint8_t >( row, 894 ) );
+  acceptedQuestSequence0.push_back( exdData->getField< uint8_t >( row, 895 ) );
+  acceptedQuestSequence0.push_back( exdData->getField< uint8_t >( row, 896 ) );
+  acceptedQuestSequence0.push_back( exdData->getField< uint8_t >( row, 897 ) );
+  acceptedQuestSequence0.push_back( exdData->getField< uint8_t >( row, 898 ) );
+  acceptedQuestSequence0.push_back( exdData->getField< uint8_t >( row, 899 ) );
+  acceptedQuestSequence0.push_back( exdData->getField< uint8_t >( row, 900 ) );
+  acceptedQuestSequence0.push_back( exdData->getField< uint8_t >( row, 901 ) );
+  acceptedQuestSequence0.push_back( exdData->getField< uint8_t >( row, 902 ) );
+  acceptedQuestSequence0.push_back( exdData->getField< uint8_t >( row, 903 ) );
+  acceptedQuestSequence0.push_back( exdData->getField< uint8_t >( row, 904 ) );
+  acceptedQuestSequence0.push_back( exdData->getField< uint8_t >( row, 905 ) );
+  acceptedQuestSequence0.push_back( exdData->getField< uint8_t >( row, 906 ) );
+  acceptedQuestSequence0.push_back( exdData->getField< uint8_t >( row, 907 ) );
+  acceptedQuestSequence0.push_back( exdData->getField< uint8_t >( row, 908 ) );
+  acceptedQuestSequence0.push_back( exdData->getField< uint8_t >( row, 909 ) );
+  acceptedQuestSequence0.push_back( exdData->getField< uint8_t >( row, 910 ) );
+  acceptedQuestSequence0.push_back( exdData->getField< uint8_t >( row, 911 ) );
+  acceptedQuestSequence0.push_back( exdData->getField< uint8_t >( row, 912 ) );
+  acceptedQuestSequence0.push_back( exdData->getField< uint8_t >( row, 913 ) );
+  acceptedQuestSequence0.push_back( exdData->getField< uint8_t >( row, 914 ) );
+  acceptedQuestSequence0.push_back( exdData->getField< uint8_t >( row, 915 ) );
+  acceptedQuestSequence0.push_back( exdData->getField< uint8_t >( row, 916 ) );
+  acceptedQuestSequence0.push_back( exdData->getField< uint8_t >( row, 917 ) );
+  acceptedQuestSequence0.push_back( exdData->getField< uint8_t >( row, 918 ) );
+  acceptedQuestSequence0.push_back( exdData->getField< uint8_t >( row, 919 ) );
+  acceptedQuestSequence0.push_back( exdData->getField< uint8_t >( row, 920 ) );
+  acceptedQuestSequence0.push_back( exdData->getField< uint8_t >( row, 921 ) );
+  acceptedQuestSequence0.push_back( exdData->getField< uint8_t >( row, 922 ) );
+  acceptedQuestSequence0.push_back( exdData->getField< uint8_t >( row, 923 ) );
+  acceptedQuestSequence0.push_back( exdData->getField< uint8_t >( row, 924 ) );
+  acceptedQuestSequence0.push_back( exdData->getField< uint8_t >( row, 925 ) );
+  acceptedQuestSequence0.push_back( exdData->getField< uint8_t >( row, 926 ) );
+  acceptedQuestSequence0.push_back( exdData->getField< uint8_t >( row, 927 ) );
+  acceptedQuestSequence0.push_back( exdData->getField< uint8_t >( row, 928 ) );
+  acceptedQuestSequence0.push_back( exdData->getField< uint8_t >( row, 929 ) );
+  acceptedQuestSequence0.push_back( exdData->getField< uint8_t >( row, 930 ) );
+  acceptedQuestSequence0.push_back( exdData->getField< uint8_t >( row, 931 ) );
+  acceptedQuestSequence0.push_back( exdData->getField< uint8_t >( row, 932 ) );
+  acceptedQuestSequence0.push_back( exdData->getField< uint8_t >( row, 933 ) );
+  acceptedQuestSequence0.push_back( exdData->getField< uint8_t >( row, 934 ) );
+  acceptedQuestSequence0.push_back( exdData->getField< uint8_t >( row, 935 ) );
+  acceptedQuestSequence0.push_back( exdData->getField< uint8_t >( row, 936 ) );
+  acceptedQuestSequence0.push_back( exdData->getField< uint8_t >( row, 937 ) );
+  acceptedQuestSequence0.push_back( exdData->getField< uint8_t >( row, 938 ) );
+  acceptedQuestSequence0.push_back( exdData->getField< uint8_t >( row, 939 ) );
+  acceptedQuestSequence0.push_back( exdData->getField< uint8_t >( row, 940 ) );
+  acceptedQuestSequence0.push_back( exdData->getField< uint8_t >( row, 941 ) );
+  acceptedQuestSequence0.push_back( exdData->getField< uint8_t >( row, 942 ) );
+  acceptedQuestSequence0.push_back( exdData->getField< uint8_t >( row, 943 ) );
+  acceptedQuestSequence0.push_back( exdData->getField< uint8_t >( row, 944 ) );
+  acceptedQuestSequence0.push_back( exdData->getField< uint8_t >( row, 945 ) );
+  acceptedQuestSequence0.push_back( exdData->getField< uint8_t >( row, 946 ) );
+  acceptedQuestSequence0.push_back( exdData->getField< uint8_t >( row, 947 ) );
+  acceptedQuestSequence0.push_back( exdData->getField< uint8_t >( row, 948 ) );
+  acceptedQuestSequence0.push_back( exdData->getField< uint8_t >( row, 949 ) );
+  acceptedQuestSequence0.push_back( exdData->getField< uint8_t >( row, 950 ) );
+  acceptedQuestSequence0.push_back( exdData->getField< uint8_t >( row, 951 ) );
+  acceptedQuestSequence0.push_back( exdData->getField< uint8_t >( row, 952 ) );
+  acceptedQuestSequence0.push_back( exdData->getField< uint8_t >( row, 953 ) );
+  acceptedQuestSequence0.push_back( exdData->getField< uint8_t >( row, 954 ) );
+  acceptedQuestSequence0.push_back( exdData->getField< uint8_t >( row, 955 ) );
+  acceptedQuestSequence0.push_back( exdData->getField< uint8_t >( row, 956 ) );
+  acceptedQuestSequence0.push_back( exdData->getField< uint8_t >( row, 957 ) );
+  acceptedQuestSequence0.push_back( exdData->getField< uint8_t >( row, 958 ) );
+  acceptedQuestSequence0.push_back( exdData->getField< uint8_t >( row, 959 ) );
+  acceptedQuestSequence0.push_back( exdData->getField< uint8_t >( row, 960 ) );
+  acceptedQuest1.push_back( exdData->getField< uint32_t >( row, 961 ) );
+  acceptedQuest1.push_back( exdData->getField< uint32_t >( row, 962 ) );
+  acceptedQuest1.push_back( exdData->getField< uint32_t >( row, 963 ) );
+  acceptedQuest1.push_back( exdData->getField< uint32_t >( row, 964 ) );
+  acceptedQuest1.push_back( exdData->getField< uint32_t >( row, 965 ) );
+  acceptedQuest1.push_back( exdData->getField< uint32_t >( row, 966 ) );
+  acceptedQuest1.push_back( exdData->getField< uint32_t >( row, 967 ) );
+  acceptedQuest1.push_back( exdData->getField< uint32_t >( row, 968 ) );
+  acceptedQuest1.push_back( exdData->getField< uint32_t >( row, 969 ) );
+  acceptedQuest1.push_back( exdData->getField< uint32_t >( row, 970 ) );
+  acceptedQuest1.push_back( exdData->getField< uint32_t >( row, 971 ) );
+  acceptedQuest1.push_back( exdData->getField< uint32_t >( row, 972 ) );
+  acceptedQuest1.push_back( exdData->getField< uint32_t >( row, 973 ) );
+  acceptedQuest1.push_back( exdData->getField< uint32_t >( row, 974 ) );
+  acceptedQuest1.push_back( exdData->getField< uint32_t >( row, 975 ) );
+  acceptedQuest1.push_back( exdData->getField< uint32_t >( row, 976 ) );
+  acceptedQuest1.push_back( exdData->getField< uint32_t >( row, 977 ) );
+  acceptedQuest1.push_back( exdData->getField< uint32_t >( row, 978 ) );
+  acceptedQuest1.push_back( exdData->getField< uint32_t >( row, 979 ) );
+  acceptedQuest1.push_back( exdData->getField< uint32_t >( row, 980 ) );
+  acceptedQuest1.push_back( exdData->getField< uint32_t >( row, 981 ) );
+  acceptedQuest1.push_back( exdData->getField< uint32_t >( row, 982 ) );
+  acceptedQuest1.push_back( exdData->getField< uint32_t >( row, 983 ) );
+  acceptedQuest1.push_back( exdData->getField< uint32_t >( row, 984 ) );
+  acceptedQuest1.push_back( exdData->getField< uint32_t >( row, 985 ) );
+  acceptedQuest1.push_back( exdData->getField< uint32_t >( row, 986 ) );
+  acceptedQuest1.push_back( exdData->getField< uint32_t >( row, 987 ) );
+  acceptedQuest1.push_back( exdData->getField< uint32_t >( row, 988 ) );
+  acceptedQuest1.push_back( exdData->getField< uint32_t >( row, 989 ) );
+  acceptedQuest1.push_back( exdData->getField< uint32_t >( row, 990 ) );
+  acceptedQuest1.push_back( exdData->getField< uint32_t >( row, 991 ) );
+  acceptedQuest1.push_back( exdData->getField< uint32_t >( row, 992 ) );
+  acceptedQuest1.push_back( exdData->getField< uint32_t >( row, 993 ) );
+  acceptedQuest1.push_back( exdData->getField< uint32_t >( row, 994 ) );
+  acceptedQuest1.push_back( exdData->getField< uint32_t >( row, 995 ) );
+  acceptedQuest1.push_back( exdData->getField< uint32_t >( row, 996 ) );
+  acceptedQuest1.push_back( exdData->getField< uint32_t >( row, 997 ) );
+  acceptedQuest1.push_back( exdData->getField< uint32_t >( row, 998 ) );
+  acceptedQuest1.push_back( exdData->getField< uint32_t >( row, 999 ) );
+  acceptedQuest1.push_back( exdData->getField< uint32_t >( row, 1000 ) );
+  acceptedQuest1.push_back( exdData->getField< uint32_t >( row, 1001 ) );
+  acceptedQuest1.push_back( exdData->getField< uint32_t >( row, 1002 ) );
+  acceptedQuest1.push_back( exdData->getField< uint32_t >( row, 1003 ) );
+  acceptedQuest1.push_back( exdData->getField< uint32_t >( row, 1004 ) );
+  acceptedQuest1.push_back( exdData->getField< uint32_t >( row, 1005 ) );
+  acceptedQuest1.push_back( exdData->getField< uint32_t >( row, 1006 ) );
+  acceptedQuest1.push_back( exdData->getField< uint32_t >( row, 1007 ) );
+  acceptedQuest1.push_back( exdData->getField< uint32_t >( row, 1008 ) );
+  acceptedQuest1.push_back( exdData->getField< uint32_t >( row, 1009 ) );
+  acceptedQuest1.push_back( exdData->getField< uint32_t >( row, 1010 ) );
+  acceptedQuest1.push_back( exdData->getField< uint32_t >( row, 1011 ) );
+  acceptedQuest1.push_back( exdData->getField< uint32_t >( row, 1012 ) );
+  acceptedQuest1.push_back( exdData->getField< uint32_t >( row, 1013 ) );
+  acceptedQuest1.push_back( exdData->getField< uint32_t >( row, 1014 ) );
+  acceptedQuest1.push_back( exdData->getField< uint32_t >( row, 1015 ) );
+  acceptedQuest1.push_back( exdData->getField< uint32_t >( row, 1016 ) );
+  acceptedQuest1.push_back( exdData->getField< uint32_t >( row, 1017 ) );
+  acceptedQuest1.push_back( exdData->getField< uint32_t >( row, 1018 ) );
+  acceptedQuest1.push_back( exdData->getField< uint32_t >( row, 1019 ) );
+  acceptedQuest1.push_back( exdData->getField< uint32_t >( row, 1020 ) );
+  acceptedQuest1.push_back( exdData->getField< uint32_t >( row, 1021 ) );
+  acceptedQuest1.push_back( exdData->getField< uint32_t >( row, 1022 ) );
+  acceptedQuest1.push_back( exdData->getField< uint32_t >( row, 1023 ) );
+  acceptedQuest1.push_back( exdData->getField< uint32_t >( row, 1024 ) );
+  acceptedQuest1.push_back( exdData->getField< uint32_t >( row, 1025 ) );
+  acceptedQuest1.push_back( exdData->getField< uint32_t >( row, 1026 ) );
+  acceptedQuest1.push_back( exdData->getField< uint32_t >( row, 1027 ) );
+  acceptedQuest1.push_back( exdData->getField< uint32_t >( row, 1028 ) );
+  acceptedQuest1.push_back( exdData->getField< uint32_t >( row, 1029 ) );
+  acceptedQuest1.push_back( exdData->getField< uint32_t >( row, 1030 ) );
+  acceptedQuest1.push_back( exdData->getField< uint32_t >( row, 1031 ) );
+  acceptedQuest1.push_back( exdData->getField< uint32_t >( row, 1032 ) );
+  acceptedQuest1.push_back( exdData->getField< uint32_t >( row, 1033 ) );
+  acceptedQuest1.push_back( exdData->getField< uint32_t >( row, 1034 ) );
+  acceptedQuest1.push_back( exdData->getField< uint32_t >( row, 1035 ) );
+  acceptedQuest1.push_back( exdData->getField< uint32_t >( row, 1036 ) );
+  acceptedQuest1.push_back( exdData->getField< uint32_t >( row, 1037 ) );
+  acceptedQuest1.push_back( exdData->getField< uint32_t >( row, 1038 ) );
+  acceptedQuest1.push_back( exdData->getField< uint32_t >( row, 1039 ) );
+  acceptedQuest1.push_back( exdData->getField< uint32_t >( row, 1040 ) );
+  acceptedQuest1.push_back( exdData->getField< uint32_t >( row, 1041 ) );
+  acceptedQuest1.push_back( exdData->getField< uint32_t >( row, 1042 ) );
+  acceptedQuest1.push_back( exdData->getField< uint32_t >( row, 1043 ) );
+  acceptedQuest1.push_back( exdData->getField< uint32_t >( row, 1044 ) );
+  acceptedQuest1.push_back( exdData->getField< uint32_t >( row, 1045 ) );
+  acceptedQuest1.push_back( exdData->getField< uint32_t >( row, 1046 ) );
+  acceptedQuest1.push_back( exdData->getField< uint32_t >( row, 1047 ) );
+  acceptedQuest1.push_back( exdData->getField< uint32_t >( row, 1048 ) );
+  acceptedQuest1.push_back( exdData->getField< uint32_t >( row, 1049 ) );
+  acceptedQuest1.push_back( exdData->getField< uint32_t >( row, 1050 ) );
+  acceptedQuest1.push_back( exdData->getField< uint32_t >( row, 1051 ) );
+  acceptedQuest1.push_back( exdData->getField< uint32_t >( row, 1052 ) );
+  acceptedQuest1.push_back( exdData->getField< uint32_t >( row, 1053 ) );
+  acceptedQuest1.push_back( exdData->getField< uint32_t >( row, 1054 ) );
+  acceptedQuest1.push_back( exdData->getField< uint32_t >( row, 1055 ) );
+  acceptedQuest1.push_back( exdData->getField< uint32_t >( row, 1056 ) );
+  acceptedQuest1.push_back( exdData->getField< uint32_t >( row, 1057 ) );
+  acceptedQuest1.push_back( exdData->getField< uint32_t >( row, 1058 ) );
+  acceptedQuest1.push_back( exdData->getField< uint32_t >( row, 1059 ) );
+  acceptedQuest1.push_back( exdData->getField< uint32_t >( row, 1060 ) );
+  acceptedQuest1.push_back( exdData->getField< uint32_t >( row, 1061 ) );
+  acceptedQuest1.push_back( exdData->getField< uint32_t >( row, 1062 ) );
+  acceptedQuest1.push_back( exdData->getField< uint32_t >( row, 1063 ) );
+  acceptedQuest1.push_back( exdData->getField< uint32_t >( row, 1064 ) );
+  acceptedQuest1.push_back( exdData->getField< uint32_t >( row, 1065 ) );
+  acceptedQuest1.push_back( exdData->getField< uint32_t >( row, 1066 ) );
+  acceptedQuest1.push_back( exdData->getField< uint32_t >( row, 1067 ) );
+  acceptedQuest1.push_back( exdData->getField< uint32_t >( row, 1068 ) );
+  acceptedQuest1.push_back( exdData->getField< uint32_t >( row, 1069 ) );
+  acceptedQuest1.push_back( exdData->getField< uint32_t >( row, 1070 ) );
+  acceptedQuestSequence1.push_back( exdData->getField< uint8_t >( row, 1071 ) );
+  acceptedQuestSequence1.push_back( exdData->getField< uint8_t >( row, 1072 ) );
+  acceptedQuestSequence1.push_back( exdData->getField< uint8_t >( row, 1073 ) );
+  acceptedQuestSequence1.push_back( exdData->getField< uint8_t >( row, 1074 ) );
+  acceptedQuestSequence1.push_back( exdData->getField< uint8_t >( row, 1075 ) );
+  acceptedQuestSequence1.push_back( exdData->getField< uint8_t >( row, 1076 ) );
+  acceptedQuestSequence1.push_back( exdData->getField< uint8_t >( row, 1077 ) );
+  acceptedQuestSequence1.push_back( exdData->getField< uint8_t >( row, 1078 ) );
+  acceptedQuestSequence1.push_back( exdData->getField< uint8_t >( row, 1079 ) );
+  acceptedQuestSequence1.push_back( exdData->getField< uint8_t >( row, 1080 ) );
+  acceptedQuestSequence1.push_back( exdData->getField< uint8_t >( row, 1081 ) );
+  acceptedQuestSequence1.push_back( exdData->getField< uint8_t >( row, 1082 ) );
+  acceptedQuestSequence1.push_back( exdData->getField< uint8_t >( row, 1083 ) );
+  acceptedQuestSequence1.push_back( exdData->getField< uint8_t >( row, 1084 ) );
+  acceptedQuestSequence1.push_back( exdData->getField< uint8_t >( row, 1085 ) );
+  acceptedQuestSequence1.push_back( exdData->getField< uint8_t >( row, 1086 ) );
+  acceptedQuestSequence1.push_back( exdData->getField< uint8_t >( row, 1087 ) );
+  acceptedQuestSequence1.push_back( exdData->getField< uint8_t >( row, 1088 ) );
+  acceptedQuestSequence1.push_back( exdData->getField< uint8_t >( row, 1089 ) );
+  acceptedQuestSequence1.push_back( exdData->getField< uint8_t >( row, 1090 ) );
+  acceptedQuestSequence1.push_back( exdData->getField< uint8_t >( row, 1091 ) );
+  acceptedQuestSequence1.push_back( exdData->getField< uint8_t >( row, 1092 ) );
+  acceptedQuestSequence1.push_back( exdData->getField< uint8_t >( row, 1093 ) );
+  acceptedQuestSequence1.push_back( exdData->getField< uint8_t >( row, 1094 ) );
+  acceptedQuestSequence1.push_back( exdData->getField< uint8_t >( row, 1095 ) );
+  acceptedQuestSequence1.push_back( exdData->getField< uint8_t >( row, 1096 ) );
+  acceptedQuestSequence1.push_back( exdData->getField< uint8_t >( row, 1097 ) );
+  acceptedQuestSequence1.push_back( exdData->getField< uint8_t >( row, 1098 ) );
+  acceptedQuestSequence1.push_back( exdData->getField< uint8_t >( row, 1099 ) );
+  acceptedQuestSequence1.push_back( exdData->getField< uint8_t >( row, 1100 ) );
+  acceptedQuestSequence1.push_back( exdData->getField< uint8_t >( row, 1101 ) );
+  acceptedQuestSequence1.push_back( exdData->getField< uint8_t >( row, 1102 ) );
+  acceptedQuestSequence1.push_back( exdData->getField< uint8_t >( row, 1103 ) );
+  acceptedQuestSequence1.push_back( exdData->getField< uint8_t >( row, 1104 ) );
+  acceptedQuestSequence1.push_back( exdData->getField< uint8_t >( row, 1105 ) );
+  acceptedQuestSequence1.push_back( exdData->getField< uint8_t >( row, 1106 ) );
+  acceptedQuestSequence1.push_back( exdData->getField< uint8_t >( row, 1107 ) );
+  acceptedQuestSequence1.push_back( exdData->getField< uint8_t >( row, 1108 ) );
+  acceptedQuestSequence1.push_back( exdData->getField< uint8_t >( row, 1109 ) );
+  acceptedQuestSequence1.push_back( exdData->getField< uint8_t >( row, 1110 ) );
+  acceptedQuestSequence1.push_back( exdData->getField< uint8_t >( row, 1111 ) );
+  acceptedQuestSequence1.push_back( exdData->getField< uint8_t >( row, 1112 ) );
+  acceptedQuestSequence1.push_back( exdData->getField< uint8_t >( row, 1113 ) );
+  acceptedQuestSequence1.push_back( exdData->getField< uint8_t >( row, 1114 ) );
+  acceptedQuestSequence1.push_back( exdData->getField< uint8_t >( row, 1115 ) );
+  acceptedQuestSequence1.push_back( exdData->getField< uint8_t >( row, 1116 ) );
+  acceptedQuestSequence1.push_back( exdData->getField< uint8_t >( row, 1117 ) );
+  acceptedQuestSequence1.push_back( exdData->getField< uint8_t >( row, 1118 ) );
+  acceptedQuestSequence1.push_back( exdData->getField< uint8_t >( row, 1119 ) );
+  acceptedQuestSequence1.push_back( exdData->getField< uint8_t >( row, 1120 ) );
+  acceptedQuestSequence1.push_back( exdData->getField< uint8_t >( row, 1121 ) );
+  acceptedQuestSequence1.push_back( exdData->getField< uint8_t >( row, 1122 ) );
+  acceptedQuestSequence1.push_back( exdData->getField< uint8_t >( row, 1123 ) );
+  acceptedQuestSequence1.push_back( exdData->getField< uint8_t >( row, 1124 ) );
+  acceptedQuestSequence1.push_back( exdData->getField< uint8_t >( row, 1125 ) );
+  acceptedQuestSequence1.push_back( exdData->getField< uint8_t >( row, 1126 ) );
+  acceptedQuestSequence1.push_back( exdData->getField< uint8_t >( row, 1127 ) );
+  acceptedQuestSequence1.push_back( exdData->getField< uint8_t >( row, 1128 ) );
+  acceptedQuestSequence1.push_back( exdData->getField< uint8_t >( row, 1129 ) );
+  acceptedQuestSequence1.push_back( exdData->getField< uint8_t >( row, 1130 ) );
+  acceptedQuestSequence1.push_back( exdData->getField< uint8_t >( row, 1131 ) );
+  acceptedQuestSequence1.push_back( exdData->getField< uint8_t >( row, 1132 ) );
+  acceptedQuestSequence1.push_back( exdData->getField< uint8_t >( row, 1133 ) );
+  acceptedQuestSequence1.push_back( exdData->getField< uint8_t >( row, 1134 ) );
+  acceptedQuestSequence1.push_back( exdData->getField< uint8_t >( row, 1135 ) );
+  acceptedQuestSequence1.push_back( exdData->getField< uint8_t >( row, 1136 ) );
+  acceptedQuestSequence1.push_back( exdData->getField< uint8_t >( row, 1137 ) );
+  acceptedQuestSequence1.push_back( exdData->getField< uint8_t >( row, 1138 ) );
+  acceptedQuestSequence1.push_back( exdData->getField< uint8_t >( row, 1139 ) );
+  acceptedQuestSequence1.push_back( exdData->getField< uint8_t >( row, 1140 ) );
+  acceptedQuestSequence1.push_back( exdData->getField< uint8_t >( row, 1141 ) );
+  acceptedQuestSequence1.push_back( exdData->getField< uint8_t >( row, 1142 ) );
+  acceptedQuestSequence1.push_back( exdData->getField< uint8_t >( row, 1143 ) );
+  acceptedQuestSequence1.push_back( exdData->getField< uint8_t >( row, 1144 ) );
+  acceptedQuestSequence1.push_back( exdData->getField< uint8_t >( row, 1145 ) );
+  acceptedQuestSequence1.push_back( exdData->getField< uint8_t >( row, 1146 ) );
+  acceptedQuestSequence1.push_back( exdData->getField< uint8_t >( row, 1147 ) );
+  acceptedQuestSequence1.push_back( exdData->getField< uint8_t >( row, 1148 ) );
+  acceptedQuestSequence1.push_back( exdData->getField< uint8_t >( row, 1149 ) );
+  acceptedQuestSequence1.push_back( exdData->getField< uint8_t >( row, 1150 ) );
+  acceptedQuestSequence1.push_back( exdData->getField< uint8_t >( row, 1151 ) );
+  acceptedQuestSequence1.push_back( exdData->getField< uint8_t >( row, 1152 ) );
+  acceptedQuestSequence1.push_back( exdData->getField< uint8_t >( row, 1153 ) );
+  acceptedQuestSequence1.push_back( exdData->getField< uint8_t >( row, 1154 ) );
+  acceptedQuestSequence1.push_back( exdData->getField< uint8_t >( row, 1155 ) );
+  acceptedQuestSequence1.push_back( exdData->getField< uint8_t >( row, 1156 ) );
+  acceptedQuestSequence1.push_back( exdData->getField< uint8_t >( row, 1157 ) );
+  acceptedQuestSequence1.push_back( exdData->getField< uint8_t >( row, 1158 ) );
+  acceptedQuestSequence1.push_back( exdData->getField< uint8_t >( row, 1159 ) );
+  acceptedQuestSequence1.push_back( exdData->getField< uint8_t >( row, 1160 ) );
+  acceptedQuestSequence1.push_back( exdData->getField< uint8_t >( row, 1161 ) );
+  acceptedQuestSequence1.push_back( exdData->getField< uint8_t >( row, 1162 ) );
+  acceptedQuestSequence1.push_back( exdData->getField< uint8_t >( row, 1163 ) );
+  acceptedQuestSequence1.push_back( exdData->getField< uint8_t >( row, 1164 ) );
+  acceptedQuestSequence1.push_back( exdData->getField< uint8_t >( row, 1165 ) );
+  acceptedQuestSequence1.push_back( exdData->getField< uint8_t >( row, 1166 ) );
+  acceptedQuestSequence1.push_back( exdData->getField< uint8_t >( row, 1167 ) );
+  acceptedQuestSequence1.push_back( exdData->getField< uint8_t >( row, 1168 ) );
+  acceptedQuestSequence1.push_back( exdData->getField< uint8_t >( row, 1169 ) );
+  acceptedQuestSequence1.push_back( exdData->getField< uint8_t >( row, 1170 ) );
+  acceptedQuestSequence1.push_back( exdData->getField< uint8_t >( row, 1171 ) );
+  acceptedQuestSequence1.push_back( exdData->getField< uint8_t >( row, 1172 ) );
+  acceptedQuestSequence1.push_back( exdData->getField< uint8_t >( row, 1173 ) );
+  acceptedQuestSequence1.push_back( exdData->getField< uint8_t >( row, 1174 ) );
+  acceptedQuestSequence1.push_back( exdData->getField< uint8_t >( row, 1175 ) );
+  acceptedQuestSequence1.push_back( exdData->getField< uint8_t >( row, 1176 ) );
+  acceptedQuestSequence1.push_back( exdData->getField< uint8_t >( row, 1177 ) );
+  acceptedQuestSequence1.push_back( exdData->getField< uint8_t >( row, 1178 ) );
+  acceptedQuestSequence1.push_back( exdData->getField< uint8_t >( row, 1179 ) );
+  acceptedQuestSequence1.push_back( exdData->getField< uint8_t >( row, 1180 ) );
+  acceptedQuest2.push_back( exdData->getField< uint32_t >( row, 1181 ) );
+  acceptedQuest2.push_back( exdData->getField< uint32_t >( row, 1182 ) );
+  acceptedQuest2.push_back( exdData->getField< uint32_t >( row, 1183 ) );
+  acceptedQuest2.push_back( exdData->getField< uint32_t >( row, 1184 ) );
+  acceptedQuest2.push_back( exdData->getField< uint32_t >( row, 1185 ) );
+  acceptedQuest2.push_back( exdData->getField< uint32_t >( row, 1186 ) );
+  acceptedQuest2.push_back( exdData->getField< uint32_t >( row, 1187 ) );
+  acceptedQuest2.push_back( exdData->getField< uint32_t >( row, 1188 ) );
+  acceptedQuest2.push_back( exdData->getField< uint32_t >( row, 1189 ) );
+  acceptedQuest2.push_back( exdData->getField< uint32_t >( row, 1190 ) );
+  acceptedQuest2.push_back( exdData->getField< uint32_t >( row, 1191 ) );
+  acceptedQuest2.push_back( exdData->getField< uint32_t >( row, 1192 ) );
+  acceptedQuest2.push_back( exdData->getField< uint32_t >( row, 1193 ) );
+  acceptedQuest2.push_back( exdData->getField< uint32_t >( row, 1194 ) );
+  acceptedQuest2.push_back( exdData->getField< uint32_t >( row, 1195 ) );
+  acceptedQuest2.push_back( exdData->getField< uint32_t >( row, 1196 ) );
+  acceptedQuest2.push_back( exdData->getField< uint32_t >( row, 1197 ) );
+  acceptedQuest2.push_back( exdData->getField< uint32_t >( row, 1198 ) );
+  acceptedQuest2.push_back( exdData->getField< uint32_t >( row, 1199 ) );
+  acceptedQuest2.push_back( exdData->getField< uint32_t >( row, 1200 ) );
+  acceptedQuest2.push_back( exdData->getField< uint32_t >( row, 1201 ) );
+  acceptedQuest2.push_back( exdData->getField< uint32_t >( row, 1202 ) );
+  acceptedQuest2.push_back( exdData->getField< uint32_t >( row, 1203 ) );
+  acceptedQuest2.push_back( exdData->getField< uint32_t >( row, 1204 ) );
+  acceptedQuest2.push_back( exdData->getField< uint32_t >( row, 1205 ) );
+  acceptedQuest2.push_back( exdData->getField< uint32_t >( row, 1206 ) );
+  acceptedQuest2.push_back( exdData->getField< uint32_t >( row, 1207 ) );
+  acceptedQuest2.push_back( exdData->getField< uint32_t >( row, 1208 ) );
+  acceptedQuest2.push_back( exdData->getField< uint32_t >( row, 1209 ) );
+  acceptedQuest2.push_back( exdData->getField< uint32_t >( row, 1210 ) );
+  acceptedQuest2.push_back( exdData->getField< uint32_t >( row, 1211 ) );
+  acceptedQuest2.push_back( exdData->getField< uint32_t >( row, 1212 ) );
+  acceptedQuest2.push_back( exdData->getField< uint32_t >( row, 1213 ) );
+  acceptedQuest2.push_back( exdData->getField< uint32_t >( row, 1214 ) );
+  acceptedQuest2.push_back( exdData->getField< uint32_t >( row, 1215 ) );
+  acceptedQuest2.push_back( exdData->getField< uint32_t >( row, 1216 ) );
+  acceptedQuest2.push_back( exdData->getField< uint32_t >( row, 1217 ) );
+  acceptedQuest2.push_back( exdData->getField< uint32_t >( row, 1218 ) );
+  acceptedQuest2.push_back( exdData->getField< uint32_t >( row, 1219 ) );
+  acceptedQuest2.push_back( exdData->getField< uint32_t >( row, 1220 ) );
+  acceptedQuest2.push_back( exdData->getField< uint32_t >( row, 1221 ) );
+  acceptedQuest2.push_back( exdData->getField< uint32_t >( row, 1222 ) );
+  acceptedQuest2.push_back( exdData->getField< uint32_t >( row, 1223 ) );
+  acceptedQuest2.push_back( exdData->getField< uint32_t >( row, 1224 ) );
+  acceptedQuest2.push_back( exdData->getField< uint32_t >( row, 1225 ) );
+  acceptedQuest2.push_back( exdData->getField< uint32_t >( row, 1226 ) );
+  acceptedQuest2.push_back( exdData->getField< uint32_t >( row, 1227 ) );
+  acceptedQuest2.push_back( exdData->getField< uint32_t >( row, 1228 ) );
+  acceptedQuest2.push_back( exdData->getField< uint32_t >( row, 1229 ) );
+  acceptedQuest2.push_back( exdData->getField< uint32_t >( row, 1230 ) );
+  acceptedQuest2.push_back( exdData->getField< uint32_t >( row, 1231 ) );
+  acceptedQuest2.push_back( exdData->getField< uint32_t >( row, 1232 ) );
+  acceptedQuest2.push_back( exdData->getField< uint32_t >( row, 1233 ) );
+  acceptedQuest2.push_back( exdData->getField< uint32_t >( row, 1234 ) );
+  acceptedQuest2.push_back( exdData->getField< uint32_t >( row, 1235 ) );
+  acceptedQuest2.push_back( exdData->getField< uint32_t >( row, 1236 ) );
+  acceptedQuest2.push_back( exdData->getField< uint32_t >( row, 1237 ) );
+  acceptedQuest2.push_back( exdData->getField< uint32_t >( row, 1238 ) );
+  acceptedQuest2.push_back( exdData->getField< uint32_t >( row, 1239 ) );
+  acceptedQuest2.push_back( exdData->getField< uint32_t >( row, 1240 ) );
+  acceptedQuest2.push_back( exdData->getField< uint32_t >( row, 1241 ) );
+  acceptedQuest2.push_back( exdData->getField< uint32_t >( row, 1242 ) );
+  acceptedQuest2.push_back( exdData->getField< uint32_t >( row, 1243 ) );
+  acceptedQuest2.push_back( exdData->getField< uint32_t >( row, 1244 ) );
+  acceptedQuest2.push_back( exdData->getField< uint32_t >( row, 1245 ) );
+  acceptedQuest2.push_back( exdData->getField< uint32_t >( row, 1246 ) );
+  acceptedQuest2.push_back( exdData->getField< uint32_t >( row, 1247 ) );
+  acceptedQuest2.push_back( exdData->getField< uint32_t >( row, 1248 ) );
+  acceptedQuest2.push_back( exdData->getField< uint32_t >( row, 1249 ) );
+  acceptedQuest2.push_back( exdData->getField< uint32_t >( row, 1250 ) );
+  acceptedQuest2.push_back( exdData->getField< uint32_t >( row, 1251 ) );
+  acceptedQuest2.push_back( exdData->getField< uint32_t >( row, 1252 ) );
+  acceptedQuest2.push_back( exdData->getField< uint32_t >( row, 1253 ) );
+  acceptedQuest2.push_back( exdData->getField< uint32_t >( row, 1254 ) );
+  acceptedQuest2.push_back( exdData->getField< uint32_t >( row, 1255 ) );
+  acceptedQuest2.push_back( exdData->getField< uint32_t >( row, 1256 ) );
+  acceptedQuest2.push_back( exdData->getField< uint32_t >( row, 1257 ) );
+  acceptedQuest2.push_back( exdData->getField< uint32_t >( row, 1258 ) );
+  acceptedQuest2.push_back( exdData->getField< uint32_t >( row, 1259 ) );
+  acceptedQuest2.push_back( exdData->getField< uint32_t >( row, 1260 ) );
+  acceptedQuest2.push_back( exdData->getField< uint32_t >( row, 1261 ) );
+  acceptedQuest2.push_back( exdData->getField< uint32_t >( row, 1262 ) );
+  acceptedQuest2.push_back( exdData->getField< uint32_t >( row, 1263 ) );
+  acceptedQuest2.push_back( exdData->getField< uint32_t >( row, 1264 ) );
+  acceptedQuest2.push_back( exdData->getField< uint32_t >( row, 1265 ) );
+  acceptedQuest2.push_back( exdData->getField< uint32_t >( row, 1266 ) );
+  acceptedQuest2.push_back( exdData->getField< uint32_t >( row, 1267 ) );
+  acceptedQuest2.push_back( exdData->getField< uint32_t >( row, 1268 ) );
+  acceptedQuest2.push_back( exdData->getField< uint32_t >( row, 1269 ) );
+  acceptedQuest2.push_back( exdData->getField< uint32_t >( row, 1270 ) );
+  acceptedQuest2.push_back( exdData->getField< uint32_t >( row, 1271 ) );
+  acceptedQuest2.push_back( exdData->getField< uint32_t >( row, 1272 ) );
+  acceptedQuest2.push_back( exdData->getField< uint32_t >( row, 1273 ) );
+  acceptedQuest2.push_back( exdData->getField< uint32_t >( row, 1274 ) );
+  acceptedQuest2.push_back( exdData->getField< uint32_t >( row, 1275 ) );
+  acceptedQuest2.push_back( exdData->getField< uint32_t >( row, 1276 ) );
+  acceptedQuest2.push_back( exdData->getField< uint32_t >( row, 1277 ) );
+  acceptedQuest2.push_back( exdData->getField< uint32_t >( row, 1278 ) );
+  acceptedQuest2.push_back( exdData->getField< uint32_t >( row, 1279 ) );
+  acceptedQuest2.push_back( exdData->getField< uint32_t >( row, 1280 ) );
+  acceptedQuest2.push_back( exdData->getField< uint32_t >( row, 1281 ) );
+  acceptedQuest2.push_back( exdData->getField< uint32_t >( row, 1282 ) );
+  acceptedQuest2.push_back( exdData->getField< uint32_t >( row, 1283 ) );
+  acceptedQuest2.push_back( exdData->getField< uint32_t >( row, 1284 ) );
+  acceptedQuest2.push_back( exdData->getField< uint32_t >( row, 1285 ) );
+  acceptedQuest2.push_back( exdData->getField< uint32_t >( row, 1286 ) );
+  acceptedQuest2.push_back( exdData->getField< uint32_t >( row, 1287 ) );
+  acceptedQuest2.push_back( exdData->getField< uint32_t >( row, 1288 ) );
+  acceptedQuest2.push_back( exdData->getField< uint32_t >( row, 1289 ) );
+  acceptedQuest2.push_back( exdData->getField< uint32_t >( row, 1290 ) );
+  acceptedQuestSequence2.push_back( exdData->getField< uint8_t >( row, 1291 ) );
+  acceptedQuestSequence2.push_back( exdData->getField< uint8_t >( row, 1292 ) );
+  acceptedQuestSequence2.push_back( exdData->getField< uint8_t >( row, 1293 ) );
+  acceptedQuestSequence2.push_back( exdData->getField< uint8_t >( row, 1294 ) );
+  acceptedQuestSequence2.push_back( exdData->getField< uint8_t >( row, 1295 ) );
+  acceptedQuestSequence2.push_back( exdData->getField< uint8_t >( row, 1296 ) );
+  acceptedQuestSequence2.push_back( exdData->getField< uint8_t >( row, 1297 ) );
+  acceptedQuestSequence2.push_back( exdData->getField< uint8_t >( row, 1298 ) );
+  acceptedQuestSequence2.push_back( exdData->getField< uint8_t >( row, 1299 ) );
+  acceptedQuestSequence2.push_back( exdData->getField< uint8_t >( row, 1300 ) );
+  acceptedQuestSequence2.push_back( exdData->getField< uint8_t >( row, 1301 ) );
+  acceptedQuestSequence2.push_back( exdData->getField< uint8_t >( row, 1302 ) );
+  acceptedQuestSequence2.push_back( exdData->getField< uint8_t >( row, 1303 ) );
+  acceptedQuestSequence2.push_back( exdData->getField< uint8_t >( row, 1304 ) );
+  acceptedQuestSequence2.push_back( exdData->getField< uint8_t >( row, 1305 ) );
+  acceptedQuestSequence2.push_back( exdData->getField< uint8_t >( row, 1306 ) );
+  acceptedQuestSequence2.push_back( exdData->getField< uint8_t >( row, 1307 ) );
+  acceptedQuestSequence2.push_back( exdData->getField< uint8_t >( row, 1308 ) );
+  acceptedQuestSequence2.push_back( exdData->getField< uint8_t >( row, 1309 ) );
+  acceptedQuestSequence2.push_back( exdData->getField< uint8_t >( row, 1310 ) );
+  acceptedQuestSequence2.push_back( exdData->getField< uint8_t >( row, 1311 ) );
+  acceptedQuestSequence2.push_back( exdData->getField< uint8_t >( row, 1312 ) );
+  acceptedQuestSequence2.push_back( exdData->getField< uint8_t >( row, 1313 ) );
+  acceptedQuestSequence2.push_back( exdData->getField< uint8_t >( row, 1314 ) );
+  acceptedQuestSequence2.push_back( exdData->getField< uint8_t >( row, 1315 ) );
+  acceptedQuestSequence2.push_back( exdData->getField< uint8_t >( row, 1316 ) );
+  acceptedQuestSequence2.push_back( exdData->getField< uint8_t >( row, 1317 ) );
+  acceptedQuestSequence2.push_back( exdData->getField< uint8_t >( row, 1318 ) );
+  acceptedQuestSequence2.push_back( exdData->getField< uint8_t >( row, 1319 ) );
+  acceptedQuestSequence2.push_back( exdData->getField< uint8_t >( row, 1320 ) );
+  acceptedQuestSequence2.push_back( exdData->getField< uint8_t >( row, 1321 ) );
+  acceptedQuestSequence2.push_back( exdData->getField< uint8_t >( row, 1322 ) );
+  acceptedQuestSequence2.push_back( exdData->getField< uint8_t >( row, 1323 ) );
+  acceptedQuestSequence2.push_back( exdData->getField< uint8_t >( row, 1324 ) );
+  acceptedQuestSequence2.push_back( exdData->getField< uint8_t >( row, 1325 ) );
+  acceptedQuestSequence2.push_back( exdData->getField< uint8_t >( row, 1326 ) );
+  acceptedQuestSequence2.push_back( exdData->getField< uint8_t >( row, 1327 ) );
+  acceptedQuestSequence2.push_back( exdData->getField< uint8_t >( row, 1328 ) );
+  acceptedQuestSequence2.push_back( exdData->getField< uint8_t >( row, 1329 ) );
+  acceptedQuestSequence2.push_back( exdData->getField< uint8_t >( row, 1330 ) );
+  acceptedQuestSequence2.push_back( exdData->getField< uint8_t >( row, 1331 ) );
+  acceptedQuestSequence2.push_back( exdData->getField< uint8_t >( row, 1332 ) );
+  acceptedQuestSequence2.push_back( exdData->getField< uint8_t >( row, 1333 ) );
+  acceptedQuestSequence2.push_back( exdData->getField< uint8_t >( row, 1334 ) );
+  acceptedQuestSequence2.push_back( exdData->getField< uint8_t >( row, 1335 ) );
+  acceptedQuestSequence2.push_back( exdData->getField< uint8_t >( row, 1336 ) );
+  acceptedQuestSequence2.push_back( exdData->getField< uint8_t >( row, 1337 ) );
+  acceptedQuestSequence2.push_back( exdData->getField< uint8_t >( row, 1338 ) );
+  acceptedQuestSequence2.push_back( exdData->getField< uint8_t >( row, 1339 ) );
+  acceptedQuestSequence2.push_back( exdData->getField< uint8_t >( row, 1340 ) );
+  acceptedQuestSequence2.push_back( exdData->getField< uint8_t >( row, 1341 ) );
+  acceptedQuestSequence2.push_back( exdData->getField< uint8_t >( row, 1342 ) );
+  acceptedQuestSequence2.push_back( exdData->getField< uint8_t >( row, 1343 ) );
+  acceptedQuestSequence2.push_back( exdData->getField< uint8_t >( row, 1344 ) );
+  acceptedQuestSequence2.push_back( exdData->getField< uint8_t >( row, 1345 ) );
+  acceptedQuestSequence2.push_back( exdData->getField< uint8_t >( row, 1346 ) );
+  acceptedQuestSequence2.push_back( exdData->getField< uint8_t >( row, 1347 ) );
+  acceptedQuestSequence2.push_back( exdData->getField< uint8_t >( row, 1348 ) );
+  acceptedQuestSequence2.push_back( exdData->getField< uint8_t >( row, 1349 ) );
+  acceptedQuestSequence2.push_back( exdData->getField< uint8_t >( row, 1350 ) );
+  acceptedQuestSequence2.push_back( exdData->getField< uint8_t >( row, 1351 ) );
+  acceptedQuestSequence2.push_back( exdData->getField< uint8_t >( row, 1352 ) );
+  acceptedQuestSequence2.push_back( exdData->getField< uint8_t >( row, 1353 ) );
+  acceptedQuestSequence2.push_back( exdData->getField< uint8_t >( row, 1354 ) );
+  acceptedQuestSequence2.push_back( exdData->getField< uint8_t >( row, 1355 ) );
+  acceptedQuestSequence2.push_back( exdData->getField< uint8_t >( row, 1356 ) );
+  acceptedQuestSequence2.push_back( exdData->getField< uint8_t >( row, 1357 ) );
+  acceptedQuestSequence2.push_back( exdData->getField< uint8_t >( row, 1358 ) );
+  acceptedQuestSequence2.push_back( exdData->getField< uint8_t >( row, 1359 ) );
+  acceptedQuestSequence2.push_back( exdData->getField< uint8_t >( row, 1360 ) );
+  acceptedQuestSequence2.push_back( exdData->getField< uint8_t >( row, 1361 ) );
+  acceptedQuestSequence2.push_back( exdData->getField< uint8_t >( row, 1362 ) );
+  acceptedQuestSequence2.push_back( exdData->getField< uint8_t >( row, 1363 ) );
+  acceptedQuestSequence2.push_back( exdData->getField< uint8_t >( row, 1364 ) );
+  acceptedQuestSequence2.push_back( exdData->getField< uint8_t >( row, 1365 ) );
+  acceptedQuestSequence2.push_back( exdData->getField< uint8_t >( row, 1366 ) );
+  acceptedQuestSequence2.push_back( exdData->getField< uint8_t >( row, 1367 ) );
+  acceptedQuestSequence2.push_back( exdData->getField< uint8_t >( row, 1368 ) );
+  acceptedQuestSequence2.push_back( exdData->getField< uint8_t >( row, 1369 ) );
+  acceptedQuestSequence2.push_back( exdData->getField< uint8_t >( row, 1370 ) );
+  acceptedQuestSequence2.push_back( exdData->getField< uint8_t >( row, 1371 ) );
+  acceptedQuestSequence2.push_back( exdData->getField< uint8_t >( row, 1372 ) );
+  acceptedQuestSequence2.push_back( exdData->getField< uint8_t >( row, 1373 ) );
+  acceptedQuestSequence2.push_back( exdData->getField< uint8_t >( row, 1374 ) );
+  acceptedQuestSequence2.push_back( exdData->getField< uint8_t >( row, 1375 ) );
+  acceptedQuestSequence2.push_back( exdData->getField< uint8_t >( row, 1376 ) );
+  acceptedQuestSequence2.push_back( exdData->getField< uint8_t >( row, 1377 ) );
+  acceptedQuestSequence2.push_back( exdData->getField< uint8_t >( row, 1378 ) );
+  acceptedQuestSequence2.push_back( exdData->getField< uint8_t >( row, 1379 ) );
+  acceptedQuestSequence2.push_back( exdData->getField< uint8_t >( row, 1380 ) );
+  acceptedQuestSequence2.push_back( exdData->getField< uint8_t >( row, 1381 ) );
+  acceptedQuestSequence2.push_back( exdData->getField< uint8_t >( row, 1382 ) );
+  acceptedQuestSequence2.push_back( exdData->getField< uint8_t >( row, 1383 ) );
+  acceptedQuestSequence2.push_back( exdData->getField< uint8_t >( row, 1384 ) );
+  acceptedQuestSequence2.push_back( exdData->getField< uint8_t >( row, 1385 ) );
+  acceptedQuestSequence2.push_back( exdData->getField< uint8_t >( row, 1386 ) );
+  acceptedQuestSequence2.push_back( exdData->getField< uint8_t >( row, 1387 ) );
+  acceptedQuestSequence2.push_back( exdData->getField< uint8_t >( row, 1388 ) );
+  acceptedQuestSequence2.push_back( exdData->getField< uint8_t >( row, 1389 ) );
+  acceptedQuestSequence2.push_back( exdData->getField< uint8_t >( row, 1390 ) );
+  acceptedQuestSequence2.push_back( exdData->getField< uint8_t >( row, 1391 ) );
+  acceptedQuestSequence2.push_back( exdData->getField< uint8_t >( row, 1392 ) );
+  acceptedQuestSequence2.push_back( exdData->getField< uint8_t >( row, 1393 ) );
+  acceptedQuestSequence2.push_back( exdData->getField< uint8_t >( row, 1394 ) );
+  acceptedQuestSequence2.push_back( exdData->getField< uint8_t >( row, 1395 ) );
+  acceptedQuestSequence2.push_back( exdData->getField< uint8_t >( row, 1396 ) );
+  acceptedQuestSequence2.push_back( exdData->getField< uint8_t >( row, 1397 ) );
+  acceptedQuestSequence2.push_back( exdData->getField< uint8_t >( row, 1398 ) );
+  acceptedQuestSequence2.push_back( exdData->getField< uint8_t >( row, 1399 ) );
+  acceptedQuestSequence2.push_back( exdData->getField< uint8_t >( row, 1400 ) );
+  layerSet0.push_back( exdData->getField< uint32_t >( row, 1401 ) );
+  layerSet0.push_back( exdData->getField< uint32_t >( row, 1402 ) );
+  layerSet0.push_back( exdData->getField< uint32_t >( row, 1403 ) );
+  layerSet0.push_back( exdData->getField< uint32_t >( row, 1404 ) );
+  layerSet0.push_back( exdData->getField< uint32_t >( row, 1405 ) );
+  layerSet0.push_back( exdData->getField< uint32_t >( row, 1406 ) );
+  layerSet0.push_back( exdData->getField< uint32_t >( row, 1407 ) );
+  layerSet0.push_back( exdData->getField< uint32_t >( row, 1408 ) );
+  layerSet0.push_back( exdData->getField< uint32_t >( row, 1409 ) );
+  layerSet0.push_back( exdData->getField< uint32_t >( row, 1410 ) );
+  layerSet0.push_back( exdData->getField< uint32_t >( row, 1411 ) );
+  layerSet0.push_back( exdData->getField< uint32_t >( row, 1412 ) );
+  layerSet0.push_back( exdData->getField< uint32_t >( row, 1413 ) );
+  layerSet0.push_back( exdData->getField< uint32_t >( row, 1414 ) );
+  layerSet0.push_back( exdData->getField< uint32_t >( row, 1415 ) );
+  layerSet0.push_back( exdData->getField< uint32_t >( row, 1416 ) );
+  layerSet0.push_back( exdData->getField< uint32_t >( row, 1417 ) );
+  layerSet0.push_back( exdData->getField< uint32_t >( row, 1418 ) );
+  layerSet0.push_back( exdData->getField< uint32_t >( row, 1419 ) );
+  layerSet0.push_back( exdData->getField< uint32_t >( row, 1420 ) );
+  layerSet0.push_back( exdData->getField< uint32_t >( row, 1421 ) );
+  layerSet0.push_back( exdData->getField< uint32_t >( row, 1422 ) );
+  layerSet0.push_back( exdData->getField< uint32_t >( row, 1423 ) );
+  layerSet0.push_back( exdData->getField< uint32_t >( row, 1424 ) );
+  layerSet0.push_back( exdData->getField< uint32_t >( row, 1425 ) );
+  layerSet0.push_back( exdData->getField< uint32_t >( row, 1426 ) );
+  layerSet0.push_back( exdData->getField< uint32_t >( row, 1427 ) );
+  layerSet0.push_back( exdData->getField< uint32_t >( row, 1428 ) );
+  layerSet0.push_back( exdData->getField< uint32_t >( row, 1429 ) );
+  layerSet0.push_back( exdData->getField< uint32_t >( row, 1430 ) );
+  layerSet0.push_back( exdData->getField< uint32_t >( row, 1431 ) );
+  layerSet0.push_back( exdData->getField< uint32_t >( row, 1432 ) );
+  layerSet0.push_back( exdData->getField< uint32_t >( row, 1433 ) );
+  layerSet0.push_back( exdData->getField< uint32_t >( row, 1434 ) );
+  layerSet0.push_back( exdData->getField< uint32_t >( row, 1435 ) );
+  layerSet0.push_back( exdData->getField< uint32_t >( row, 1436 ) );
+  layerSet0.push_back( exdData->getField< uint32_t >( row, 1437 ) );
+  layerSet0.push_back( exdData->getField< uint32_t >( row, 1438 ) );
+  layerSet0.push_back( exdData->getField< uint32_t >( row, 1439 ) );
+  layerSet0.push_back( exdData->getField< uint32_t >( row, 1440 ) );
+  layerSet0.push_back( exdData->getField< uint32_t >( row, 1441 ) );
+  layerSet0.push_back( exdData->getField< uint32_t >( row, 1442 ) );
+  layerSet0.push_back( exdData->getField< uint32_t >( row, 1443 ) );
+  layerSet0.push_back( exdData->getField< uint32_t >( row, 1444 ) );
+  layerSet0.push_back( exdData->getField< uint32_t >( row, 1445 ) );
+  layerSet0.push_back( exdData->getField< uint32_t >( row, 1446 ) );
+  layerSet0.push_back( exdData->getField< uint32_t >( row, 1447 ) );
+  layerSet0.push_back( exdData->getField< uint32_t >( row, 1448 ) );
+  layerSet0.push_back( exdData->getField< uint32_t >( row, 1449 ) );
+  layerSet0.push_back( exdData->getField< uint32_t >( row, 1450 ) );
+  layerSet0.push_back( exdData->getField< uint32_t >( row, 1451 ) );
+  layerSet0.push_back( exdData->getField< uint32_t >( row, 1452 ) );
+  layerSet0.push_back( exdData->getField< uint32_t >( row, 1453 ) );
+  layerSet0.push_back( exdData->getField< uint32_t >( row, 1454 ) );
+  layerSet0.push_back( exdData->getField< uint32_t >( row, 1455 ) );
+  layerSet0.push_back( exdData->getField< uint32_t >( row, 1456 ) );
+  layerSet0.push_back( exdData->getField< uint32_t >( row, 1457 ) );
+  layerSet0.push_back( exdData->getField< uint32_t >( row, 1458 ) );
+  layerSet0.push_back( exdData->getField< uint32_t >( row, 1459 ) );
+  layerSet0.push_back( exdData->getField< uint32_t >( row, 1460 ) );
+  layerSet0.push_back( exdData->getField< uint32_t >( row, 1461 ) );
+  layerSet0.push_back( exdData->getField< uint32_t >( row, 1462 ) );
+  layerSet0.push_back( exdData->getField< uint32_t >( row, 1463 ) );
+  layerSet0.push_back( exdData->getField< uint32_t >( row, 1464 ) );
+  layerSet0.push_back( exdData->getField< uint32_t >( row, 1465 ) );
+  layerSet0.push_back( exdData->getField< uint32_t >( row, 1466 ) );
+  layerSet0.push_back( exdData->getField< uint32_t >( row, 1467 ) );
+  layerSet0.push_back( exdData->getField< uint32_t >( row, 1468 ) );
+  layerSet0.push_back( exdData->getField< uint32_t >( row, 1469 ) );
+  layerSet0.push_back( exdData->getField< uint32_t >( row, 1470 ) );
+  layerSet0.push_back( exdData->getField< uint32_t >( row, 1471 ) );
+  layerSet0.push_back( exdData->getField< uint32_t >( row, 1472 ) );
+  layerSet0.push_back( exdData->getField< uint32_t >( row, 1473 ) );
+  layerSet0.push_back( exdData->getField< uint32_t >( row, 1474 ) );
+  layerSet0.push_back( exdData->getField< uint32_t >( row, 1475 ) );
+  layerSet0.push_back( exdData->getField< uint32_t >( row, 1476 ) );
+  layerSet0.push_back( exdData->getField< uint32_t >( row, 1477 ) );
+  layerSet0.push_back( exdData->getField< uint32_t >( row, 1478 ) );
+  layerSet0.push_back( exdData->getField< uint32_t >( row, 1479 ) );
+  layerSet0.push_back( exdData->getField< uint32_t >( row, 1480 ) );
+  layerSet0.push_back( exdData->getField< uint32_t >( row, 1481 ) );
+  layerSet0.push_back( exdData->getField< uint32_t >( row, 1482 ) );
+  layerSet0.push_back( exdData->getField< uint32_t >( row, 1483 ) );
+  layerSet0.push_back( exdData->getField< uint32_t >( row, 1484 ) );
+  layerSet0.push_back( exdData->getField< uint32_t >( row, 1485 ) );
+  layerSet0.push_back( exdData->getField< uint32_t >( row, 1486 ) );
+  layerSet0.push_back( exdData->getField< uint32_t >( row, 1487 ) );
+  layerSet0.push_back( exdData->getField< uint32_t >( row, 1488 ) );
+  layerSet0.push_back( exdData->getField< uint32_t >( row, 1489 ) );
+  layerSet0.push_back( exdData->getField< uint32_t >( row, 1490 ) );
+  layerSet0.push_back( exdData->getField< uint32_t >( row, 1491 ) );
+  layerSet0.push_back( exdData->getField< uint32_t >( row, 1492 ) );
+  layerSet0.push_back( exdData->getField< uint32_t >( row, 1493 ) );
+  layerSet0.push_back( exdData->getField< uint32_t >( row, 1494 ) );
+  layerSet0.push_back( exdData->getField< uint32_t >( row, 1495 ) );
+  layerSet0.push_back( exdData->getField< uint32_t >( row, 1496 ) );
+  layerSet0.push_back( exdData->getField< uint32_t >( row, 1497 ) );
+  layerSet0.push_back( exdData->getField< uint32_t >( row, 1498 ) );
+  layerSet0.push_back( exdData->getField< uint32_t >( row, 1499 ) );
+  layerSet0.push_back( exdData->getField< uint32_t >( row, 1500 ) );
+  layerSet0.push_back( exdData->getField< uint32_t >( row, 1501 ) );
+  layerSet0.push_back( exdData->getField< uint32_t >( row, 1502 ) );
+  layerSet0.push_back( exdData->getField< uint32_t >( row, 1503 ) );
+  layerSet0.push_back( exdData->getField< uint32_t >( row, 1504 ) );
+  layerSet0.push_back( exdData->getField< uint32_t >( row, 1505 ) );
+  layerSet0.push_back( exdData->getField< uint32_t >( row, 1506 ) );
+  layerSet0.push_back( exdData->getField< uint32_t >( row, 1507 ) );
+  layerSet0.push_back( exdData->getField< uint32_t >( row, 1508 ) );
+  layerSet0.push_back( exdData->getField< uint32_t >( row, 1509 ) );
+  layerSet0.push_back( exdData->getField< uint32_t >( row, 1510 ) );
+  layerSet1.push_back( exdData->getField< uint32_t >( row, 1511 ) );
+  layerSet1.push_back( exdData->getField< uint32_t >( row, 1512 ) );
+  layerSet1.push_back( exdData->getField< uint32_t >( row, 1513 ) );
+  layerSet1.push_back( exdData->getField< uint32_t >( row, 1514 ) );
+  layerSet1.push_back( exdData->getField< uint32_t >( row, 1515 ) );
+  layerSet1.push_back( exdData->getField< uint32_t >( row, 1516 ) );
+  layerSet1.push_back( exdData->getField< uint32_t >( row, 1517 ) );
+  layerSet1.push_back( exdData->getField< uint32_t >( row, 1518 ) );
+  layerSet1.push_back( exdData->getField< uint32_t >( row, 1519 ) );
+  layerSet1.push_back( exdData->getField< uint32_t >( row, 1520 ) );
+  layerSet1.push_back( exdData->getField< uint32_t >( row, 1521 ) );
+  layerSet1.push_back( exdData->getField< uint32_t >( row, 1522 ) );
+  layerSet1.push_back( exdData->getField< uint32_t >( row, 1523 ) );
+  layerSet1.push_back( exdData->getField< uint32_t >( row, 1524 ) );
+  layerSet1.push_back( exdData->getField< uint32_t >( row, 1525 ) );
+  layerSet1.push_back( exdData->getField< uint32_t >( row, 1526 ) );
+  layerSet1.push_back( exdData->getField< uint32_t >( row, 1527 ) );
+  layerSet1.push_back( exdData->getField< uint32_t >( row, 1528 ) );
+  layerSet1.push_back( exdData->getField< uint32_t >( row, 1529 ) );
+  layerSet1.push_back( exdData->getField< uint32_t >( row, 1530 ) );
+  layerSet1.push_back( exdData->getField< uint32_t >( row, 1531 ) );
+  layerSet1.push_back( exdData->getField< uint32_t >( row, 1532 ) );
+  layerSet1.push_back( exdData->getField< uint32_t >( row, 1533 ) );
+  layerSet1.push_back( exdData->getField< uint32_t >( row, 1534 ) );
+  layerSet1.push_back( exdData->getField< uint32_t >( row, 1535 ) );
+  layerSet1.push_back( exdData->getField< uint32_t >( row, 1536 ) );
+  layerSet1.push_back( exdData->getField< uint32_t >( row, 1537 ) );
+  layerSet1.push_back( exdData->getField< uint32_t >( row, 1538 ) );
+  layerSet1.push_back( exdData->getField< uint32_t >( row, 1539 ) );
+  layerSet1.push_back( exdData->getField< uint32_t >( row, 1540 ) );
+  layerSet1.push_back( exdData->getField< uint32_t >( row, 1541 ) );
+  layerSet1.push_back( exdData->getField< uint32_t >( row, 1542 ) );
+  layerSet1.push_back( exdData->getField< uint32_t >( row, 1543 ) );
+  layerSet1.push_back( exdData->getField< uint32_t >( row, 1544 ) );
+  layerSet1.push_back( exdData->getField< uint32_t >( row, 1545 ) );
+  layerSet1.push_back( exdData->getField< uint32_t >( row, 1546 ) );
+  layerSet1.push_back( exdData->getField< uint32_t >( row, 1547 ) );
+  layerSet1.push_back( exdData->getField< uint32_t >( row, 1548 ) );
+  layerSet1.push_back( exdData->getField< uint32_t >( row, 1549 ) );
+  layerSet1.push_back( exdData->getField< uint32_t >( row, 1550 ) );
+  layerSet1.push_back( exdData->getField< uint32_t >( row, 1551 ) );
+  layerSet1.push_back( exdData->getField< uint32_t >( row, 1552 ) );
+  layerSet1.push_back( exdData->getField< uint32_t >( row, 1553 ) );
+  layerSet1.push_back( exdData->getField< uint32_t >( row, 1554 ) );
+  layerSet1.push_back( exdData->getField< uint32_t >( row, 1555 ) );
+  layerSet1.push_back( exdData->getField< uint32_t >( row, 1556 ) );
+  layerSet1.push_back( exdData->getField< uint32_t >( row, 1557 ) );
+  layerSet1.push_back( exdData->getField< uint32_t >( row, 1558 ) );
+  layerSet1.push_back( exdData->getField< uint32_t >( row, 1559 ) );
+  layerSet1.push_back( exdData->getField< uint32_t >( row, 1560 ) );
+  layerSet1.push_back( exdData->getField< uint32_t >( row, 1561 ) );
+  layerSet1.push_back( exdData->getField< uint32_t >( row, 1562 ) );
+  layerSet1.push_back( exdData->getField< uint32_t >( row, 1563 ) );
+  layerSet1.push_back( exdData->getField< uint32_t >( row, 1564 ) );
+  layerSet1.push_back( exdData->getField< uint32_t >( row, 1565 ) );
+  layerSet1.push_back( exdData->getField< uint32_t >( row, 1566 ) );
+  layerSet1.push_back( exdData->getField< uint32_t >( row, 1567 ) );
+  layerSet1.push_back( exdData->getField< uint32_t >( row, 1568 ) );
+  layerSet1.push_back( exdData->getField< uint32_t >( row, 1569 ) );
+  layerSet1.push_back( exdData->getField< uint32_t >( row, 1570 ) );
+  layerSet1.push_back( exdData->getField< uint32_t >( row, 1571 ) );
+  layerSet1.push_back( exdData->getField< uint32_t >( row, 1572 ) );
+  layerSet1.push_back( exdData->getField< uint32_t >( row, 1573 ) );
+  layerSet1.push_back( exdData->getField< uint32_t >( row, 1574 ) );
+  layerSet1.push_back( exdData->getField< uint32_t >( row, 1575 ) );
+  layerSet1.push_back( exdData->getField< uint32_t >( row, 1576 ) );
+  layerSet1.push_back( exdData->getField< uint32_t >( row, 1577 ) );
+  layerSet1.push_back( exdData->getField< uint32_t >( row, 1578 ) );
+  layerSet1.push_back( exdData->getField< uint32_t >( row, 1579 ) );
+  layerSet1.push_back( exdData->getField< uint32_t >( row, 1580 ) );
+  layerSet1.push_back( exdData->getField< uint32_t >( row, 1581 ) );
+  layerSet1.push_back( exdData->getField< uint32_t >( row, 1582 ) );
+  layerSet1.push_back( exdData->getField< uint32_t >( row, 1583 ) );
+  layerSet1.push_back( exdData->getField< uint32_t >( row, 1584 ) );
+  layerSet1.push_back( exdData->getField< uint32_t >( row, 1585 ) );
+  layerSet1.push_back( exdData->getField< uint32_t >( row, 1586 ) );
+  layerSet1.push_back( exdData->getField< uint32_t >( row, 1587 ) );
+  layerSet1.push_back( exdData->getField< uint32_t >( row, 1588 ) );
+  layerSet1.push_back( exdData->getField< uint32_t >( row, 1589 ) );
+  layerSet1.push_back( exdData->getField< uint32_t >( row, 1590 ) );
+  layerSet1.push_back( exdData->getField< uint32_t >( row, 1591 ) );
+  layerSet1.push_back( exdData->getField< uint32_t >( row, 1592 ) );
+  layerSet1.push_back( exdData->getField< uint32_t >( row, 1593 ) );
+  layerSet1.push_back( exdData->getField< uint32_t >( row, 1594 ) );
+  layerSet1.push_back( exdData->getField< uint32_t >( row, 1595 ) );
+  layerSet1.push_back( exdData->getField< uint32_t >( row, 1596 ) );
+  layerSet1.push_back( exdData->getField< uint32_t >( row, 1597 ) );
+  layerSet1.push_back( exdData->getField< uint32_t >( row, 1598 ) );
+  layerSet1.push_back( exdData->getField< uint32_t >( row, 1599 ) );
+  layerSet1.push_back( exdData->getField< uint32_t >( row, 1600 ) );
+  layerSet1.push_back( exdData->getField< uint32_t >( row, 1601 ) );
+  layerSet1.push_back( exdData->getField< uint32_t >( row, 1602 ) );
+  layerSet1.push_back( exdData->getField< uint32_t >( row, 1603 ) );
+  layerSet1.push_back( exdData->getField< uint32_t >( row, 1604 ) );
+  layerSet1.push_back( exdData->getField< uint32_t >( row, 1605 ) );
+  layerSet1.push_back( exdData->getField< uint32_t >( row, 1606 ) );
+  layerSet1.push_back( exdData->getField< uint32_t >( row, 1607 ) );
+  layerSet1.push_back( exdData->getField< uint32_t >( row, 1608 ) );
+  layerSet1.push_back( exdData->getField< uint32_t >( row, 1609 ) );
+  layerSet1.push_back( exdData->getField< uint32_t >( row, 1610 ) );
+  layerSet1.push_back( exdData->getField< uint32_t >( row, 1611 ) );
+  layerSet1.push_back( exdData->getField< uint32_t >( row, 1612 ) );
+  layerSet1.push_back( exdData->getField< uint32_t >( row, 1613 ) );
+  layerSet1.push_back( exdData->getField< uint32_t >( row, 1614 ) );
+  layerSet1.push_back( exdData->getField< uint32_t >( row, 1615 ) );
+  layerSet1.push_back( exdData->getField< uint32_t >( row, 1616 ) );
+  layerSet1.push_back( exdData->getField< uint32_t >( row, 1617 ) );
+  layerSet1.push_back( exdData->getField< uint32_t >( row, 1618 ) );
+  layerSet1.push_back( exdData->getField< uint32_t >( row, 1619 ) );
+  layerSet1.push_back( exdData->getField< uint32_t >( row, 1620 ) );
+  sequenceBegin.push_back( exdData->getField< uint16_t >( row, 1621 ) );
+  sequenceBegin.push_back( exdData->getField< uint16_t >( row, 1622 ) );
+  sequenceBegin.push_back( exdData->getField< uint16_t >( row, 1623 ) );
+  sequenceBegin.push_back( exdData->getField< uint16_t >( row, 1624 ) );
+  sequenceBegin.push_back( exdData->getField< uint16_t >( row, 1625 ) );
+  sequenceBegin.push_back( exdData->getField< uint16_t >( row, 1626 ) );
+  sequenceBegin.push_back( exdData->getField< uint16_t >( row, 1627 ) );
+  sequenceBegin.push_back( exdData->getField< uint16_t >( row, 1628 ) );
+  sequenceBegin.push_back( exdData->getField< uint16_t >( row, 1629 ) );
+  sequenceBegin.push_back( exdData->getField< uint16_t >( row, 1630 ) );
+  sequenceBegin.push_back( exdData->getField< uint16_t >( row, 1631 ) );
+  sequenceBegin.push_back( exdData->getField< uint16_t >( row, 1632 ) );
+  sequenceBegin.push_back( exdData->getField< uint16_t >( row, 1633 ) );
+  sequenceBegin.push_back( exdData->getField< uint16_t >( row, 1634 ) );
+  sequenceBegin.push_back( exdData->getField< uint16_t >( row, 1635 ) );
+  sequenceBegin.push_back( exdData->getField< uint16_t >( row, 1636 ) );
+  sequenceBegin.push_back( exdData->getField< uint16_t >( row, 1637 ) );
+  sequenceBegin.push_back( exdData->getField< uint16_t >( row, 1638 ) );
+  sequenceBegin.push_back( exdData->getField< uint16_t >( row, 1639 ) );
+  sequenceBegin.push_back( exdData->getField< uint16_t >( row, 1640 ) );
+  sequenceBegin.push_back( exdData->getField< uint16_t >( row, 1641 ) );
+  sequenceBegin.push_back( exdData->getField< uint16_t >( row, 1642 ) );
+  sequenceBegin.push_back( exdData->getField< uint16_t >( row, 1643 ) );
+  sequenceBegin.push_back( exdData->getField< uint16_t >( row, 1644 ) );
+  sequenceBegin.push_back( exdData->getField< uint16_t >( row, 1645 ) );
+  sequenceBegin.push_back( exdData->getField< uint16_t >( row, 1646 ) );
+  sequenceBegin.push_back( exdData->getField< uint16_t >( row, 1647 ) );
+  sequenceBegin.push_back( exdData->getField< uint16_t >( row, 1648 ) );
+  sequenceBegin.push_back( exdData->getField< uint16_t >( row, 1649 ) );
+  sequenceBegin.push_back( exdData->getField< uint16_t >( row, 1650 ) );
+  sequenceBegin.push_back( exdData->getField< uint16_t >( row, 1651 ) );
+  sequenceBegin.push_back( exdData->getField< uint16_t >( row, 1652 ) );
+  sequenceBegin.push_back( exdData->getField< uint16_t >( row, 1653 ) );
+  sequenceBegin.push_back( exdData->getField< uint16_t >( row, 1654 ) );
+  sequenceBegin.push_back( exdData->getField< uint16_t >( row, 1655 ) );
+  sequenceBegin.push_back( exdData->getField< uint16_t >( row, 1656 ) );
+  sequenceBegin.push_back( exdData->getField< uint16_t >( row, 1657 ) );
+  sequenceBegin.push_back( exdData->getField< uint16_t >( row, 1658 ) );
+  sequenceBegin.push_back( exdData->getField< uint16_t >( row, 1659 ) );
+  sequenceBegin.push_back( exdData->getField< uint16_t >( row, 1660 ) );
+  sequenceBegin.push_back( exdData->getField< uint16_t >( row, 1661 ) );
+  sequenceBegin.push_back( exdData->getField< uint16_t >( row, 1662 ) );
+  sequenceBegin.push_back( exdData->getField< uint16_t >( row, 1663 ) );
+  sequenceBegin.push_back( exdData->getField< uint16_t >( row, 1664 ) );
+  sequenceBegin.push_back( exdData->getField< uint16_t >( row, 1665 ) );
+  sequenceBegin.push_back( exdData->getField< uint16_t >( row, 1666 ) );
+  sequenceBegin.push_back( exdData->getField< uint16_t >( row, 1667 ) );
+  sequenceBegin.push_back( exdData->getField< uint16_t >( row, 1668 ) );
+  sequenceBegin.push_back( exdData->getField< uint16_t >( row, 1669 ) );
+  sequenceBegin.push_back( exdData->getField< uint16_t >( row, 1670 ) );
+  sequenceBegin.push_back( exdData->getField< uint16_t >( row, 1671 ) );
+  sequenceBegin.push_back( exdData->getField< uint16_t >( row, 1672 ) );
+  sequenceBegin.push_back( exdData->getField< uint16_t >( row, 1673 ) );
+  sequenceBegin.push_back( exdData->getField< uint16_t >( row, 1674 ) );
+  sequenceBegin.push_back( exdData->getField< uint16_t >( row, 1675 ) );
+  sequenceBegin.push_back( exdData->getField< uint16_t >( row, 1676 ) );
+  sequenceBegin.push_back( exdData->getField< uint16_t >( row, 1677 ) );
+  sequenceBegin.push_back( exdData->getField< uint16_t >( row, 1678 ) );
+  sequenceBegin.push_back( exdData->getField< uint16_t >( row, 1679 ) );
+  sequenceBegin.push_back( exdData->getField< uint16_t >( row, 1680 ) );
+  sequenceBegin.push_back( exdData->getField< uint16_t >( row, 1681 ) );
+  sequenceBegin.push_back( exdData->getField< uint16_t >( row, 1682 ) );
+  sequenceBegin.push_back( exdData->getField< uint16_t >( row, 1683 ) );
+  sequenceBegin.push_back( exdData->getField< uint16_t >( row, 1684 ) );
+  sequenceBegin.push_back( exdData->getField< uint16_t >( row, 1685 ) );
+  sequenceBegin.push_back( exdData->getField< uint16_t >( row, 1686 ) );
+  sequenceBegin.push_back( exdData->getField< uint16_t >( row, 1687 ) );
+  sequenceBegin.push_back( exdData->getField< uint16_t >( row, 1688 ) );
+  sequenceBegin.push_back( exdData->getField< uint16_t >( row, 1689 ) );
+  sequenceBegin.push_back( exdData->getField< uint16_t >( row, 1690 ) );
+  sequenceBegin.push_back( exdData->getField< uint16_t >( row, 1691 ) );
+  sequenceBegin.push_back( exdData->getField< uint16_t >( row, 1692 ) );
+  sequenceBegin.push_back( exdData->getField< uint16_t >( row, 1693 ) );
+  sequenceBegin.push_back( exdData->getField< uint16_t >( row, 1694 ) );
+  sequenceBegin.push_back( exdData->getField< uint16_t >( row, 1695 ) );
+  sequenceBegin.push_back( exdData->getField< uint16_t >( row, 1696 ) );
+  sequenceBegin.push_back( exdData->getField< uint16_t >( row, 1697 ) );
+  sequenceBegin.push_back( exdData->getField< uint16_t >( row, 1698 ) );
+  sequenceBegin.push_back( exdData->getField< uint16_t >( row, 1699 ) );
+  sequenceBegin.push_back( exdData->getField< uint16_t >( row, 1700 ) );
+  sequenceEnd.push_back( exdData->getField< uint16_t >( row, 1701 ) );
+  sequenceEnd.push_back( exdData->getField< uint16_t >( row, 1702 ) );
+  sequenceEnd.push_back( exdData->getField< uint16_t >( row, 1703 ) );
+  sequenceEnd.push_back( exdData->getField< uint16_t >( row, 1704 ) );
+  sequenceEnd.push_back( exdData->getField< uint16_t >( row, 1705 ) );
+  sequenceEnd.push_back( exdData->getField< uint16_t >( row, 1706 ) );
+  sequenceEnd.push_back( exdData->getField< uint16_t >( row, 1707 ) );
+  sequenceEnd.push_back( exdData->getField< uint16_t >( row, 1708 ) );
+  sequenceEnd.push_back( exdData->getField< uint16_t >( row, 1709 ) );
+  sequenceEnd.push_back( exdData->getField< uint16_t >( row, 1710 ) );
+  sequenceEnd.push_back( exdData->getField< uint16_t >( row, 1711 ) );
+  sequenceEnd.push_back( exdData->getField< uint16_t >( row, 1712 ) );
+  sequenceEnd.push_back( exdData->getField< uint16_t >( row, 1713 ) );
+  sequenceEnd.push_back( exdData->getField< uint16_t >( row, 1714 ) );
+  sequenceEnd.push_back( exdData->getField< uint16_t >( row, 1715 ) );
+  sequenceEnd.push_back( exdData->getField< uint16_t >( row, 1716 ) );
+  sequenceEnd.push_back( exdData->getField< uint16_t >( row, 1717 ) );
+  sequenceEnd.push_back( exdData->getField< uint16_t >( row, 1718 ) );
+  sequenceEnd.push_back( exdData->getField< uint16_t >( row, 1719 ) );
+  sequenceEnd.push_back( exdData->getField< uint16_t >( row, 1720 ) );
+  sequenceEnd.push_back( exdData->getField< uint16_t >( row, 1721 ) );
+  sequenceEnd.push_back( exdData->getField< uint16_t >( row, 1722 ) );
+  sequenceEnd.push_back( exdData->getField< uint16_t >( row, 1723 ) );
+  sequenceEnd.push_back( exdData->getField< uint16_t >( row, 1724 ) );
+  sequenceEnd.push_back( exdData->getField< uint16_t >( row, 1725 ) );
+  sequenceEnd.push_back( exdData->getField< uint16_t >( row, 1726 ) );
+  sequenceEnd.push_back( exdData->getField< uint16_t >( row, 1727 ) );
+  sequenceEnd.push_back( exdData->getField< uint16_t >( row, 1728 ) );
+  sequenceEnd.push_back( exdData->getField< uint16_t >( row, 1729 ) );
+  sequenceEnd.push_back( exdData->getField< uint16_t >( row, 1730 ) );
+  sequenceEnd.push_back( exdData->getField< uint16_t >( row, 1731 ) );
+  sequenceEnd.push_back( exdData->getField< uint16_t >( row, 1732 ) );
+  sequenceEnd.push_back( exdData->getField< uint16_t >( row, 1733 ) );
+  sequenceEnd.push_back( exdData->getField< uint16_t >( row, 1734 ) );
+  sequenceEnd.push_back( exdData->getField< uint16_t >( row, 1735 ) );
+  sequenceEnd.push_back( exdData->getField< uint16_t >( row, 1736 ) );
+  sequenceEnd.push_back( exdData->getField< uint16_t >( row, 1737 ) );
+  sequenceEnd.push_back( exdData->getField< uint16_t >( row, 1738 ) );
+  sequenceEnd.push_back( exdData->getField< uint16_t >( row, 1739 ) );
+  sequenceEnd.push_back( exdData->getField< uint16_t >( row, 1740 ) );
+  sequenceEnd.push_back( exdData->getField< uint16_t >( row, 1741 ) );
+  sequenceEnd.push_back( exdData->getField< uint16_t >( row, 1742 ) );
+  sequenceEnd.push_back( exdData->getField< uint16_t >( row, 1743 ) );
+  sequenceEnd.push_back( exdData->getField< uint16_t >( row, 1744 ) );
+  sequenceEnd.push_back( exdData->getField< uint16_t >( row, 1745 ) );
+  sequenceEnd.push_back( exdData->getField< uint16_t >( row, 1746 ) );
+  sequenceEnd.push_back( exdData->getField< uint16_t >( row, 1747 ) );
+  sequenceEnd.push_back( exdData->getField< uint16_t >( row, 1748 ) );
+  sequenceEnd.push_back( exdData->getField< uint16_t >( row, 1749 ) );
+  sequenceEnd.push_back( exdData->getField< uint16_t >( row, 1750 ) );
+  sequenceEnd.push_back( exdData->getField< uint16_t >( row, 1751 ) );
+  sequenceEnd.push_back( exdData->getField< uint16_t >( row, 1752 ) );
+  sequenceEnd.push_back( exdData->getField< uint16_t >( row, 1753 ) );
+  sequenceEnd.push_back( exdData->getField< uint16_t >( row, 1754 ) );
+  sequenceEnd.push_back( exdData->getField< uint16_t >( row, 1755 ) );
+  sequenceEnd.push_back( exdData->getField< uint16_t >( row, 1756 ) );
+  sequenceEnd.push_back( exdData->getField< uint16_t >( row, 1757 ) );
+  sequenceEnd.push_back( exdData->getField< uint16_t >( row, 1758 ) );
+  sequenceEnd.push_back( exdData->getField< uint16_t >( row, 1759 ) );
+  sequenceEnd.push_back( exdData->getField< uint16_t >( row, 1760 ) );
+  sequenceEnd.push_back( exdData->getField< uint16_t >( row, 1761 ) );
+  sequenceEnd.push_back( exdData->getField< uint16_t >( row, 1762 ) );
+  sequenceEnd.push_back( exdData->getField< uint16_t >( row, 1763 ) );
+  sequenceEnd.push_back( exdData->getField< uint16_t >( row, 1764 ) );
+  sequenceEnd.push_back( exdData->getField< uint16_t >( row, 1765 ) );
+  sequenceEnd.push_back( exdData->getField< uint16_t >( row, 1766 ) );
+  sequenceEnd.push_back( exdData->getField< uint16_t >( row, 1767 ) );
+  sequenceEnd.push_back( exdData->getField< uint16_t >( row, 1768 ) );
+  sequenceEnd.push_back( exdData->getField< uint16_t >( row, 1769 ) );
+  sequenceEnd.push_back( exdData->getField< uint16_t >( row, 1770 ) );
+  sequenceEnd.push_back( exdData->getField< uint16_t >( row, 1771 ) );
+  sequenceEnd.push_back( exdData->getField< uint16_t >( row, 1772 ) );
+  sequenceEnd.push_back( exdData->getField< uint16_t >( row, 1773 ) );
+  sequenceEnd.push_back( exdData->getField< uint16_t >( row, 1774 ) );
+  sequenceEnd.push_back( exdData->getField< uint16_t >( row, 1775 ) );
+  sequenceEnd.push_back( exdData->getField< uint16_t >( row, 1776 ) );
+  sequenceEnd.push_back( exdData->getField< uint16_t >( row, 1777 ) );
+  sequenceEnd.push_back( exdData->getField< uint16_t >( row, 1778 ) );
+  sequenceEnd.push_back( exdData->getField< uint16_t >( row, 1779 ) );
+  sequenceEnd.push_back( exdData->getField< uint16_t >( row, 1780 ) );
+  listener.push_back( exdData->getField< uint32_t >( row, 1781 ) );
+  listener.push_back( exdData->getField< uint32_t >( row, 1782 ) );
+  listener.push_back( exdData->getField< uint32_t >( row, 1783 ) );
+  listener.push_back( exdData->getField< uint32_t >( row, 1784 ) );
+  listener.push_back( exdData->getField< uint32_t >( row, 1785 ) );
+  listener.push_back( exdData->getField< uint32_t >( row, 1786 ) );
+  listener.push_back( exdData->getField< uint32_t >( row, 1787 ) );
+  listener.push_back( exdData->getField< uint32_t >( row, 1788 ) );
+  listener.push_back( exdData->getField< uint32_t >( row, 1789 ) );
+  listener.push_back( exdData->getField< uint32_t >( row, 1790 ) );
+  listener.push_back( exdData->getField< uint32_t >( row, 1791 ) );
+  listener.push_back( exdData->getField< uint32_t >( row, 1792 ) );
+  listener.push_back( exdData->getField< uint32_t >( row, 1793 ) );
+  listener.push_back( exdData->getField< uint32_t >( row, 1794 ) );
+  listener.push_back( exdData->getField< uint32_t >( row, 1795 ) );
+  listener.push_back( exdData->getField< uint32_t >( row, 1796 ) );
+  listener.push_back( exdData->getField< uint32_t >( row, 1797 ) );
+  listener.push_back( exdData->getField< uint32_t >( row, 1798 ) );
+  listener.push_back( exdData->getField< uint32_t >( row, 1799 ) );
+  listener.push_back( exdData->getField< uint32_t >( row, 1800 ) );
+  listener.push_back( exdData->getField< uint32_t >( row, 1801 ) );
+  listener.push_back( exdData->getField< uint32_t >( row, 1802 ) );
+  listener.push_back( exdData->getField< uint32_t >( row, 1803 ) );
+  listener.push_back( exdData->getField< uint32_t >( row, 1804 ) );
+  listener.push_back( exdData->getField< uint32_t >( row, 1805 ) );
+  listener.push_back( exdData->getField< uint32_t >( row, 1806 ) );
+  listener.push_back( exdData->getField< uint32_t >( row, 1807 ) );
+  listener.push_back( exdData->getField< uint32_t >( row, 1808 ) );
+  listener.push_back( exdData->getField< uint32_t >( row, 1809 ) );
+  listener.push_back( exdData->getField< uint32_t >( row, 1810 ) );
+  listener.push_back( exdData->getField< uint32_t >( row, 1811 ) );
+  listener.push_back( exdData->getField< uint32_t >( row, 1812 ) );
+  listener.push_back( exdData->getField< uint32_t >( row, 1813 ) );
+  listener.push_back( exdData->getField< uint32_t >( row, 1814 ) );
+  listener.push_back( exdData->getField< uint32_t >( row, 1815 ) );
+  listener.push_back( exdData->getField< uint32_t >( row, 1816 ) );
+  listener.push_back( exdData->getField< uint32_t >( row, 1817 ) );
+  listener.push_back( exdData->getField< uint32_t >( row, 1818 ) );
+  listener.push_back( exdData->getField< uint32_t >( row, 1819 ) );
+  listener.push_back( exdData->getField< uint32_t >( row, 1820 ) );
+  listener.push_back( exdData->getField< uint32_t >( row, 1821 ) );
+  listener.push_back( exdData->getField< uint32_t >( row, 1822 ) );
+  listener.push_back( exdData->getField< uint32_t >( row, 1823 ) );
+  listener.push_back( exdData->getField< uint32_t >( row, 1824 ) );
+  listener.push_back( exdData->getField< uint32_t >( row, 1825 ) );
+  listener.push_back( exdData->getField< uint32_t >( row, 1826 ) );
+  listener.push_back( exdData->getField< uint32_t >( row, 1827 ) );
+  listener.push_back( exdData->getField< uint32_t >( row, 1828 ) );
+  listener.push_back( exdData->getField< uint32_t >( row, 1829 ) );
+  listener.push_back( exdData->getField< uint32_t >( row, 1830 ) );
+  listener.push_back( exdData->getField< uint32_t >( row, 1831 ) );
+  listener.push_back( exdData->getField< uint32_t >( row, 1832 ) );
+  listener.push_back( exdData->getField< uint32_t >( row, 1833 ) );
+  listener.push_back( exdData->getField< uint32_t >( row, 1834 ) );
+  listener.push_back( exdData->getField< uint32_t >( row, 1835 ) );
+  listener.push_back( exdData->getField< uint32_t >( row, 1836 ) );
+  listener.push_back( exdData->getField< uint32_t >( row, 1837 ) );
+  listener.push_back( exdData->getField< uint32_t >( row, 1838 ) );
+  listener.push_back( exdData->getField< uint32_t >( row, 1839 ) );
+  listener.push_back( exdData->getField< uint32_t >( row, 1840 ) );
+  listener.push_back( exdData->getField< uint32_t >( row, 1841 ) );
+  listener.push_back( exdData->getField< uint32_t >( row, 1842 ) );
+  listener.push_back( exdData->getField< uint32_t >( row, 1843 ) );
+  listener.push_back( exdData->getField< uint32_t >( row, 1844 ) );
+  listener.push_back( exdData->getField< uint32_t >( row, 1845 ) );
+  listener.push_back( exdData->getField< uint32_t >( row, 1846 ) );
+  listener.push_back( exdData->getField< uint32_t >( row, 1847 ) );
+  listener.push_back( exdData->getField< uint32_t >( row, 1848 ) );
+  listener.push_back( exdData->getField< uint32_t >( row, 1849 ) );
+  listener.push_back( exdData->getField< uint32_t >( row, 1850 ) );
+  listener.push_back( exdData->getField< uint32_t >( row, 1851 ) );
+  listener.push_back( exdData->getField< uint32_t >( row, 1852 ) );
+  listener.push_back( exdData->getField< uint32_t >( row, 1853 ) );
+  listener.push_back( exdData->getField< uint32_t >( row, 1854 ) );
+  listener.push_back( exdData->getField< uint32_t >( row, 1855 ) );
+  listener.push_back( exdData->getField< uint32_t >( row, 1856 ) );
+  listener.push_back( exdData->getField< uint32_t >( row, 1857 ) );
+  listener.push_back( exdData->getField< uint32_t >( row, 1858 ) );
+  listener.push_back( exdData->getField< uint32_t >( row, 1859 ) );
+  listener.push_back( exdData->getField< uint32_t >( row, 1860 ) );
+  layerSetTerritoryType0 = exdData->getField< uint16_t >( row, 1861 );
+  layerSetTerritoryType1 = exdData->getField< uint16_t >( row, 1862 );
 }
 
 Sapphire::Data::SubmarineExploration::SubmarineExploration( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
@@ -8043,6 +11598,8 @@ Sapphire::Data::SubmarineExploration::SubmarineExploration( uint32_t row_id, Sap
   auto row = exdData->m_SubmarineExplorationDat.get_row( row_id );
   destination = exdData->getField< std::string >( row, 0 );
   location = exdData->getField< std::string >( row, 1 );
+  map = exdData->getField< uint8_t >( row, 5 );
+  stars = exdData->getField< uint8_t >( row, 7 );
   rankReq = exdData->getField< uint8_t >( row, 8 );
   ceruleumTankReq = exdData->getField< uint8_t >( row, 9 );
   durationmin = exdData->getField< uint16_t >( row, 10 );
@@ -8074,44 +11631,26 @@ Sapphire::Data::SubmarinePart::SubmarinePart( uint32_t row_id, Sapphire::Data::E
 Sapphire::Data::SubmarineRank::SubmarineRank( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
 {
   auto row = exdData->m_SubmarineRankDat.get_row( row_id );
-  rank = exdData->getField< uint16_t >( row, 0 );
+  capacity = exdData->getField< uint16_t >( row, 0 );
   expToNext = exdData->getField< uint32_t >( row, 1 );
+  surveillanceBonus = exdData->getField< uint8_t >( row, 2 );
+  retrievalBonus = exdData->getField< uint8_t >( row, 3 );
+  speedBonus = exdData->getField< uint8_t >( row, 4 );
+  rangeBonus = exdData->getField< uint8_t >( row, 5 );
+  favorBonus = exdData->getField< uint8_t >( row, 6 );
 }
 
 Sapphire::Data::SwitchTalk::SwitchTalk( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
 {
   auto row = exdData->m_SwitchTalkDat.get_row( row_id );
-  quest.push_back( exdData->getField< uint32_t >( row, 2 ) );
-  quest.push_back( exdData->getField< uint32_t >( row, 3 ) );
-  quest.push_back( exdData->getField< uint32_t >( row, 4 ) );
-  quest.push_back( exdData->getField< uint32_t >( row, 5 ) );
-  quest.push_back( exdData->getField< uint32_t >( row, 6 ) );
-  quest.push_back( exdData->getField< uint32_t >( row, 7 ) );
-  quest.push_back( exdData->getField< uint32_t >( row, 8 ) );
-  quest.push_back( exdData->getField< uint32_t >( row, 9 ) );
-  quest.push_back( exdData->getField< uint32_t >( row, 10 ) );
-  quest.push_back( exdData->getField< uint32_t >( row, 11 ) );
-  quest.push_back( exdData->getField< uint32_t >( row, 12 ) );
-  quest.push_back( exdData->getField< uint32_t >( row, 13 ) );
-  quest.push_back( exdData->getField< uint32_t >( row, 14 ) );
-  quest.push_back( exdData->getField< uint32_t >( row, 15 ) );
-  quest.push_back( exdData->getField< uint32_t >( row, 16 ) );
-  defaultTalk.push_back( exdData->getField< uint32_t >( row, 17 ) );
-  defaultTalk.push_back( exdData->getField< uint32_t >( row, 18 ) );
-  defaultTalk.push_back( exdData->getField< uint32_t >( row, 19 ) );
-  defaultTalk.push_back( exdData->getField< uint32_t >( row, 20 ) );
-  defaultTalk.push_back( exdData->getField< uint32_t >( row, 21 ) );
-  defaultTalk.push_back( exdData->getField< uint32_t >( row, 22 ) );
-  defaultTalk.push_back( exdData->getField< uint32_t >( row, 23 ) );
-  defaultTalk.push_back( exdData->getField< uint32_t >( row, 24 ) );
-  defaultTalk.push_back( exdData->getField< uint32_t >( row, 25 ) );
-  defaultTalk.push_back( exdData->getField< uint32_t >( row, 26 ) );
-  defaultTalk.push_back( exdData->getField< uint32_t >( row, 27 ) );
-  defaultTalk.push_back( exdData->getField< uint32_t >( row, 28 ) );
-  defaultTalk.push_back( exdData->getField< uint32_t >( row, 29 ) );
-  defaultTalk.push_back( exdData->getField< uint32_t >( row, 30 ) );
-  defaultTalk.push_back( exdData->getField< uint32_t >( row, 31 ) );
-  defaultTalk.push_back( exdData->getField< uint32_t >( row, 32 ) );
+}
+
+Sapphire::Data::SwitchTalkVariation::SwitchTalkVariation( uint32_t row_id, uint32_t subRow, Sapphire::Data::ExdDataGenerated* exdData )
+{
+  auto row = exdData->m_SwitchTalkVariationDat.get_row( row_id, subRow );
+  quest0 = exdData->getField< uint32_t >( row, 0 );
+  quest1 = exdData->getField< uint32_t >( row, 1 );
+  defaultTalk = exdData->getField< uint32_t >( row, 3 );
 }
 
 Sapphire::Data::TerritoryType::TerritoryType( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
@@ -8141,6 +11680,15 @@ Sapphire::Data::TerritoryType::TerritoryType( uint32_t row_id, Sapphire::Data::E
   resident = exdData->getField< uint16_t >( row, 26 );
   achievementIndex = exdData->getField< int8_t >( row, 27 );
   isPvpZone = exdData->getField< bool >( row, 28 );
+  exVersion = exdData->getField< uint8_t >( row, 29 );
+  addedIn53 = exdData->getField< uint8_t >( row, 32 );
+  mountSpeed = exdData->getField< uint8_t >( row, 33 );
+}
+
+Sapphire::Data::TerritoryTypeTransient::TerritoryTypeTransient( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
+{
+  auto row = exdData->m_TerritoryTypeTransientDat.get_row( row_id );
+  offsetZ = exdData->getField< int16_t >( row, 0 );
 }
 
 Sapphire::Data::TextCommand::TextCommand( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
@@ -8227,15 +11775,18 @@ Sapphire::Data::Transformation::Transformation( uint32_t row_id, Sapphire::Data:
   action2 = exdData->getField< uint16_t >( row, 10 );
   action3 = exdData->getField< uint16_t >( row, 12 );
   action4 = exdData->getField< uint16_t >( row, 14 );
-  action5 = exdData->getField< uint16_t >( row, 15 );
-  rPParameter = exdData->getField< uint8_t >( row, 18 );
-  speed = exdData->getField< float >( row, 19 );
-  scale = exdData->getField< float >( row, 20 );
-  isPvP = exdData->getField< bool >( row, 21 );
-  isEvent = exdData->getField< bool >( row, 22 );
-  playerCamera = exdData->getField< bool >( row, 23 );
-  startVFX = exdData->getField< bool >( row, 24 );
-  endVFX = exdData->getField< bool >( row, 25 );
+  action5 = exdData->getField< uint16_t >( row, 16 );
+  rPParameter = exdData->getField< uint16_t >( row, 18 );
+  removeAction = exdData->getField< uint16_t >( row, 19 );
+  speed = exdData->getField< float >( row, 23 );
+  scale = exdData->getField< float >( row, 24 );
+  isPvP = exdData->getField< bool >( row, 25 );
+  isEvent = exdData->getField< bool >( row, 26 );
+  playerCamera = exdData->getField< bool >( row, 27 );
+  startVFX = exdData->getField< uint16_t >( row, 30 );
+  endVFX = exdData->getField< uint16_t >( row, 31 );
+  action6 = exdData->getField< uint32_t >( row, 32 );
+  action7 = exdData->getField< uint16_t >( row, 34 );
 }
 
 Sapphire::Data::Treasure::Treasure( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
@@ -8252,7 +11803,7 @@ Sapphire::Data::TreasureHuntRank::TreasureHuntRank( uint32_t row_id, Sapphire::D
   keyItemName = exdData->getField< int32_t >( row, 3 );
   instanceMap = exdData->getField< int32_t >( row, 4 );
   maxPartySize = exdData->getField< uint8_t >( row, 5 );
-  minPartySize = exdData->getField< uint8_t >( row, 6 );
+  treasureHuntTexture = exdData->getField< uint8_t >( row, 6 );
 }
 
 Sapphire::Data::TreasureModel::TreasureModel( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
@@ -8597,6 +12148,9 @@ Sapphire::Data::YKW::YKW( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exd
   location.push_back( exdData->getField< uint16_t >( row, 2 ) );
   location.push_back( exdData->getField< uint16_t >( row, 3 ) );
   location.push_back( exdData->getField< uint16_t >( row, 4 ) );
+  location.push_back( exdData->getField< uint16_t >( row, 5 ) );
+  location.push_back( exdData->getField< uint16_t >( row, 6 ) );
+  location.push_back( exdData->getField< uint16_t >( row, 7 ) );
 }
 
 Sapphire::Data::ZoneSharedGroup::ZoneSharedGroup( uint32_t row_id, uint32_t subRow, Sapphire::Data::ExdDataGenerated* exdData )
@@ -8694,7 +12248,6 @@ bool Sapphire::Data::ExdDataGenerated::init( const std::string& path )
     m_AOZBossDat = setupDatAccess( "AOZBoss", xiv::exd::Language::none );
     m_AOZContentDat = setupDatAccess( "AOZContent", xiv::exd::Language::none );
     m_AOZContentBriefingBNpcDat = setupDatAccess( "AOZContentBriefingBNpc", xiv::exd::Language::none );
-    m_AOZReportDat = setupDatAccess( "AOZReport", xiv::exd::Language::none );
     m_AquariumFishDat = setupDatAccess( "AquariumFish", xiv::exd::Language::none );
     m_AquariumWaterDat = setupDatAccess( "AquariumWater", xiv::exd::Language::en );
     m_ArrayEventHandlerDat = setupDatAccess( "ArrayEventHandler", xiv::exd::Language::none );
@@ -8737,6 +12290,7 @@ bool Sapphire::Data::ExdDataGenerated::init( const std::string& path )
     m_ChannelingDat = setupDatAccess( "Channeling", xiv::exd::Language::none );
     m_CharaMakeClassEquipDat = setupDatAccess( "CharaMakeClassEquip", xiv::exd::Language::none );
     m_CharaMakeCustomizeDat = setupDatAccess( "CharaMakeCustomize", xiv::exd::Language::none );
+    m_CharaMakeNameDat = setupDatAccess( "CharaMakeName", xiv::exd::Language::en );
     m_CharaMakeTypeDat = setupDatAccess( "CharaMakeType", xiv::exd::Language::en );
     m_ChocoboRaceDat = setupDatAccess( "ChocoboRace", xiv::exd::Language::none );
     m_ChocoboRaceAbilityDat = setupDatAccess( "ChocoboRaceAbility", xiv::exd::Language::en );
@@ -8752,6 +12306,12 @@ bool Sapphire::Data::ExdDataGenerated::init( const std::string& path )
     m_CircleActivityDat = setupDatAccess( "CircleActivity", xiv::exd::Language::en );
     m_ClassJobDat = setupDatAccess( "ClassJob", xiv::exd::Language::en );
     m_ClassJobCategoryDat = setupDatAccess( "ClassJobCategory", xiv::exd::Language::en );
+    m_CollectablesShopDat = setupDatAccess( "CollectablesShop", xiv::exd::Language::en );
+    m_CollectablesShopItemDat = setupDatAccess( "CollectablesShopItem", xiv::exd::Language::none );
+    m_CollectablesShopItemGroupDat = setupDatAccess( "CollectablesShopItemGroup", xiv::exd::Language::en );
+    m_CollectablesShopRefineDat = setupDatAccess( "CollectablesShopRefine", xiv::exd::Language::none );
+    m_CollectablesShopRewardItemDat = setupDatAccess( "CollectablesShopRewardItem", xiv::exd::Language::none );
+    m_CollectablesShopRewardScripDat = setupDatAccess( "CollectablesShopRewardScrip", xiv::exd::Language::none );
     m_CompanionDat = setupDatAccess( "Companion", xiv::exd::Language::en );
     m_CompanionMoveDat = setupDatAccess( "CompanionMove", xiv::exd::Language::en );
     m_CompanionTransientDat = setupDatAccess( "CompanionTransient", xiv::exd::Language::en );
@@ -8768,6 +12328,7 @@ bool Sapphire::Data::ExdDataGenerated::init( const std::string& path )
     m_CompanyLeveRuleDat = setupDatAccess( "CompanyLeveRule", xiv::exd::Language::none );
     m_CompleteJournalDat = setupDatAccess( "CompleteJournal", xiv::exd::Language::en );
     m_CompleteJournalCategoryDat = setupDatAccess( "CompleteJournalCategory", xiv::exd::Language::none );
+    m_ConditionDat = setupDatAccess( "Condition", xiv::exd::Language::none );
     m_ConfigKeyDat = setupDatAccess( "ConfigKey", xiv::exd::Language::en );
     m_ContentCloseCycleDat = setupDatAccess( "ContentCloseCycle", xiv::exd::Language::none );
     m_ContentExActionDat = setupDatAccess( "ContentExAction", xiv::exd::Language::none );
@@ -8833,6 +12394,10 @@ bool Sapphire::Data::ExdDataGenerated::init( const std::string& path )
     m_DpsChallengeDat = setupDatAccess( "DpsChallenge", xiv::exd::Language::en );
     m_DpsChallengeOfficerDat = setupDatAccess( "DpsChallengeOfficer", xiv::exd::Language::none );
     m_DpsChallengeTransientDat = setupDatAccess( "DpsChallengeTransient", xiv::exd::Language::none );
+    m_DynamicEventDat = setupDatAccess( "DynamicEvent", xiv::exd::Language::en );
+    m_DynamicEventEnemyTypeDat = setupDatAccess( "DynamicEventEnemyType", xiv::exd::Language::en );
+    m_DynamicEventSingleBattleDat = setupDatAccess( "DynamicEventSingleBattle", xiv::exd::Language::en );
+    m_DynamicEventTypeDat = setupDatAccess( "DynamicEventType", xiv::exd::Language::none );
     m_EmjAddonDat = setupDatAccess( "EmjAddon", xiv::exd::Language::en );
     m_EmjDaniDat = setupDatAccess( "EmjDani", xiv::exd::Language::none );
     m_EmoteDat = setupDatAccess( "Emote", xiv::exd::Language::en );
@@ -8866,6 +12431,7 @@ bool Sapphire::Data::ExdDataGenerated::init( const std::string& path )
     m_ExVersionDat = setupDatAccess( "ExVersion", xiv::exd::Language::en );
     m_FateDat = setupDatAccess( "Fate", xiv::exd::Language::en );
     m_FateEventDat = setupDatAccess( "FateEvent", xiv::exd::Language::en );
+    m_FateModeDat = setupDatAccess( "FateMode", xiv::exd::Language::none );
     m_FateProgressUIDat = setupDatAccess( "FateProgressUI", xiv::exd::Language::none );
     m_FateTokenTypeDat = setupDatAccess( "FateTokenType", xiv::exd::Language::none );
     m_FCActivityDat = setupDatAccess( "FCActivity", xiv::exd::Language::en );
@@ -8905,6 +12471,8 @@ bool Sapphire::Data::ExdDataGenerated::init( const std::string& path )
     m_GatheringPointBonusDat = setupDatAccess( "GatheringPointBonus", xiv::exd::Language::none );
     m_GatheringPointBonusTypeDat = setupDatAccess( "GatheringPointBonusType", xiv::exd::Language::en );
     m_GatheringPointNameDat = setupDatAccess( "GatheringPointName", xiv::exd::Language::en );
+    m_GatheringPointTransientDat = setupDatAccess( "GatheringPointTransient", xiv::exd::Language::none );
+    m_GatheringRarePopTimeTableDat = setupDatAccess( "GatheringRarePopTimeTable", xiv::exd::Language::none );
     m_GatheringSubCategoryDat = setupDatAccess( "GatheringSubCategory", xiv::exd::Language::en );
     m_GatheringTypeDat = setupDatAccess( "GatheringType", xiv::exd::Language::en );
     m_GcArmyCaptureTacticsDat = setupDatAccess( "GcArmyCaptureTactics", xiv::exd::Language::none );
@@ -8941,6 +12509,8 @@ bool Sapphire::Data::ExdDataGenerated::init( const std::string& path )
     m_GrandCompanyDat = setupDatAccess( "GrandCompany", xiv::exd::Language::en );
     m_GrandCompanyRankDat = setupDatAccess( "GrandCompanyRank", xiv::exd::Language::none );
     m_GroupPoseFrameDat = setupDatAccess( "GroupPoseFrame", xiv::exd::Language::en );
+    m_GroupPoseStampDat = setupDatAccess( "GroupPoseStamp", xiv::exd::Language::en );
+    m_GroupPoseStampCategoryDat = setupDatAccess( "GroupPoseStampCategory", xiv::exd::Language::en );
     m_GuardianDeityDat = setupDatAccess( "GuardianDeity", xiv::exd::Language::en );
     m_GuideDat = setupDatAccess( "Guide", xiv::exd::Language::none );
     m_GuidePageDat = setupDatAccess( "GuidePage", xiv::exd::Language::none );
@@ -8978,6 +12548,9 @@ bool Sapphire::Data::ExdDataGenerated::init( const std::string& path )
     m_HWDDevLevelUIDat = setupDatAccess( "HWDDevLevelUI", xiv::exd::Language::none );
     m_HWDDevLivelyDat = setupDatAccess( "HWDDevLively", xiv::exd::Language::none );
     m_HWDDevProgressDat = setupDatAccess( "HWDDevProgress", xiv::exd::Language::none );
+    m_HWDGathereInspectTermDat = setupDatAccess( "HWDGathereInspectTerm", xiv::exd::Language::en );
+    m_HWDGathererInspectionDat = setupDatAccess( "HWDGathererInspection", xiv::exd::Language::none );
+    m_HWDGathererInspectionRewardDat = setupDatAccess( "HWDGathererInspectionReward", xiv::exd::Language::none );
     m_HWDInfoBoardArticleDat = setupDatAccess( "HWDInfoBoardArticle", xiv::exd::Language::en );
     m_HWDInfoBoardArticleTransientDat = setupDatAccess( "HWDInfoBoardArticleTransient", xiv::exd::Language::en );
     m_HWDInfoBoardArticleTypeDat = setupDatAccess( "HWDInfoBoardArticleType", xiv::exd::Language::en );
@@ -8989,6 +12562,9 @@ bool Sapphire::Data::ExdDataGenerated::init( const std::string& path )
     m_IKDRouteDat = setupDatAccess( "IKDRoute", xiv::exd::Language::en );
     m_IKDRouteTableDat = setupDatAccess( "IKDRouteTable", xiv::exd::Language::none );
     m_IKDSpotDat = setupDatAccess( "IKDSpot", xiv::exd::Language::none );
+    m_InclusionShopDat = setupDatAccess( "InclusionShop", xiv::exd::Language::en );
+    m_InclusionShopCategoryDat = setupDatAccess( "InclusionShopCategory", xiv::exd::Language::en );
+    m_InclusionShopSeriesDat = setupDatAccess( "InclusionShopSeries", xiv::exd::Language::none );
     m_IndividualWeatherDat = setupDatAccess( "IndividualWeather", xiv::exd::Language::none );
     m_InstanceContentDat = setupDatAccess( "InstanceContent", xiv::exd::Language::none );
     m_InstanceContentBuffDat = setupDatAccess( "InstanceContentBuff", xiv::exd::Language::none );
@@ -8997,10 +12573,13 @@ bool Sapphire::Data::ExdDataGenerated::init( const std::string& path )
     m_InstanceContentTextDataDat = setupDatAccess( "InstanceContentTextData", xiv::exd::Language::en );
     m_ItemDat = setupDatAccess( "Item", xiv::exd::Language::en );
     m_ItemActionDat = setupDatAccess( "ItemAction", xiv::exd::Language::none );
+    m_ItemActionTelepoDat = setupDatAccess( "ItemActionTelepo", xiv::exd::Language::none );
+    m_ItemBarterCheckDat = setupDatAccess( "ItemBarterCheck", xiv::exd::Language::none );
     m_ItemFoodDat = setupDatAccess( "ItemFood", xiv::exd::Language::none );
     m_ItemLevelDat = setupDatAccess( "ItemLevel", xiv::exd::Language::none );
     m_ItemSearchCategoryDat = setupDatAccess( "ItemSearchCategory", xiv::exd::Language::en );
     m_ItemSeriesDat = setupDatAccess( "ItemSeries", xiv::exd::Language::en );
+    m_ItemSortCategoryDat = setupDatAccess( "ItemSortCategory", xiv::exd::Language::none );
     m_ItemSpecialBonusDat = setupDatAccess( "ItemSpecialBonus", xiv::exd::Language::en );
     m_ItemUICategoryDat = setupDatAccess( "ItemUICategory", xiv::exd::Language::en );
     m_JobHudManualDat = setupDatAccess( "JobHudManual", xiv::exd::Language::none );
@@ -9066,6 +12645,9 @@ bool Sapphire::Data::ExdDataGenerated::init( const std::string& path )
     m_MovieSubtitleDat = setupDatAccess( "MovieSubtitle", xiv::exd::Language::en );
     m_MovieSubtitle500Dat = setupDatAccess( "MovieSubtitle500", xiv::exd::Language::en );
     m_MovieSubtitleVoyageDat = setupDatAccess( "MovieSubtitleVoyage", xiv::exd::Language::en );
+    m_MYCTemporaryItemDat = setupDatAccess( "MYCTemporaryItem", xiv::exd::Language::none );
+    m_MYCTemporaryItemUICategoryDat = setupDatAccess( "MYCTemporaryItemUICategory", xiv::exd::Language::en );
+    m_MYCWarResultNotebookDat = setupDatAccess( "MYCWarResultNotebook", xiv::exd::Language::en );
     m_NotebookDivisionDat = setupDatAccess( "NotebookDivision", xiv::exd::Language::en );
     m_NotebookDivisionCategoryDat = setupDatAccess( "NotebookDivisionCategory", xiv::exd::Language::en );
     m_NotoriousMonsterDat = setupDatAccess( "NotoriousMonster", xiv::exd::Language::none );
@@ -9080,6 +12662,7 @@ bool Sapphire::Data::ExdDataGenerated::init( const std::string& path )
     m_OrchestrionCategoryDat = setupDatAccess( "OrchestrionCategory", xiv::exd::Language::en );
     m_OrchestrionPathDat = setupDatAccess( "OrchestrionPath", xiv::exd::Language::none );
     m_OrchestrionUiparamDat = setupDatAccess( "OrchestrionUiparam", xiv::exd::Language::none );
+    m_OrnamentDat = setupDatAccess( "Ornament", xiv::exd::Language::en );
     m_ParamGrowDat = setupDatAccess( "ParamGrow", xiv::exd::Language::none );
     m_PartyContentDat = setupDatAccess( "PartyContent", xiv::exd::Language::none );
     m_PartyContentCutsceneDat = setupDatAccess( "PartyContentCutscene", xiv::exd::Language::none );
@@ -9094,7 +12677,7 @@ bool Sapphire::Data::ExdDataGenerated::init( const std::string& path )
     m_PictureDat = setupDatAccess( "Picture", xiv::exd::Language::none );
     m_PlaceNameDat = setupDatAccess( "PlaceName", xiv::exd::Language::en );
     m_PlantPotFlowerSeedDat = setupDatAccess( "PlantPotFlowerSeed", xiv::exd::Language::none );
-    m_PreHandlerDat = setupDatAccess( "PreHandler", xiv::exd::Language::none );
+    m_PreHandlerDat = setupDatAccess( "PreHandler", xiv::exd::Language::en );
     m_PresetCameraDat = setupDatAccess( "PresetCamera", xiv::exd::Language::none );
     m_PresetCameraAdjustDat = setupDatAccess( "PresetCameraAdjust", xiv::exd::Language::none );
     m_PublicContentDat = setupDatAccess( "PublicContent", xiv::exd::Language::en );
@@ -9130,6 +12713,7 @@ bool Sapphire::Data::ExdDataGenerated::init( const std::string& path )
     m_RecastNavimeshDat = setupDatAccess( "RecastNavimesh", xiv::exd::Language::none );
     m_RecipeDat = setupDatAccess( "Recipe", xiv::exd::Language::none );
     m_RecipeLevelTableDat = setupDatAccess( "RecipeLevelTable", xiv::exd::Language::none );
+    m_RecipeLookupDat = setupDatAccess( "RecipeLookup", xiv::exd::Language::none );
     m_RecipeNotebookListDat = setupDatAccess( "RecipeNotebookList", xiv::exd::Language::none );
     m_RecommendContentsDat = setupDatAccess( "RecommendContents", xiv::exd::Language::none );
     m_RelicDat = setupDatAccess( "Relic", xiv::exd::Language::none );
@@ -9143,15 +12727,16 @@ bool Sapphire::Data::ExdDataGenerated::init( const std::string& path )
     m_RetainerTaskNormalDat = setupDatAccess( "RetainerTaskNormal", xiv::exd::Language::none );
     m_RetainerTaskParameterDat = setupDatAccess( "RetainerTaskParameter", xiv::exd::Language::none );
     m_RetainerTaskRandomDat = setupDatAccess( "RetainerTaskRandom", xiv::exd::Language::en );
+    m_RideShootingDat = setupDatAccess( "RideShooting", xiv::exd::Language::none );
+    m_RideShootingTextDataDat = setupDatAccess( "RideShootingTextData", xiv::exd::Language::en );
     m_RPParameterDat = setupDatAccess( "RPParameter", xiv::exd::Language::none );
-    m_SalvageDat = setupDatAccess( "Salvage", xiv::exd::Language::none );
+    m_SatisfactionArbitrationDat = setupDatAccess( "SatisfactionArbitration", xiv::exd::Language::none );
     m_SatisfactionNpcDat = setupDatAccess( "SatisfactionNpc", xiv::exd::Language::none );
     m_SatisfactionSupplyDat = setupDatAccess( "SatisfactionSupply", xiv::exd::Language::none );
     m_SatisfactionSupplyRewardDat = setupDatAccess( "SatisfactionSupplyReward", xiv::exd::Language::none );
     m_ScenarioTreeDat = setupDatAccess( "ScenarioTree", xiv::exd::Language::none );
     m_ScenarioTreeTipsDat = setupDatAccess( "ScenarioTreeTips", xiv::exd::Language::none );
     m_ScenarioTreeTipsClassQuestDat = setupDatAccess( "ScenarioTreeTipsClassQuest", xiv::exd::Language::none );
-    m_ScenarioTreeTipsQuestDat = setupDatAccess( "ScenarioTreeTipsQuest", xiv::exd::Language::none );
     m_ScenarioTypeDat = setupDatAccess( "ScenarioType", xiv::exd::Language::en );
     m_ScreenImageDat = setupDatAccess( "ScreenImage", xiv::exd::Language::none );
     m_SecretRecipeBookDat = setupDatAccess( "SecretRecipeBook", xiv::exd::Language::en );
@@ -9177,7 +12762,9 @@ bool Sapphire::Data::ExdDataGenerated::init( const std::string& path )
     m_SubmarinePartDat = setupDatAccess( "SubmarinePart", xiv::exd::Language::none );
     m_SubmarineRankDat = setupDatAccess( "SubmarineRank", xiv::exd::Language::none );
     m_SwitchTalkDat = setupDatAccess( "SwitchTalk", xiv::exd::Language::none );
+    m_SwitchTalkVariationDat = setupDatAccess( "SwitchTalkVariation", xiv::exd::Language::none );
     m_TerritoryTypeDat = setupDatAccess( "TerritoryType", xiv::exd::Language::none );
+    m_TerritoryTypeTransientDat = setupDatAccess( "TerritoryTypeTransient", xiv::exd::Language::none );
     m_TextCommandDat = setupDatAccess( "TextCommand", xiv::exd::Language::en );
     m_TitleDat = setupDatAccess( "Title", xiv::exd::Language::en );
     m_TomestonesDat = setupDatAccess( "Tomestones", xiv::exd::Language::none );
diff --git a/src/common/Exd/ExdDataGenerated.h b/src/common/Exd/ExdDataGenerated.h
index d5bedc63..78eaa037 100644
--- a/src/common/Exd/ExdDataGenerated.h
+++ b/src/common/Exd/ExdDataGenerated.h
@@ -18,8 +18,7 @@
 #undef far
 #endif
 
-namespace Sapphire {
-namespace Data {
+namespace Sapphire::Data {
 
 class ExdDataGenerated;
 
@@ -73,7 +72,6 @@ struct AOZArrangement;
 struct AOZBoss;
 struct AOZContent;
 struct AOZContentBriefingBNpc;
-struct AOZReport;
 struct AquariumFish;
 struct AquariumWater;
 struct ArrayEventHandler;
@@ -116,6 +114,7 @@ struct Carry;
 struct Channeling;
 struct CharaMakeClassEquip;
 struct CharaMakeCustomize;
+struct CharaMakeName;
 struct CharaMakeType;
 struct ChocoboRace;
 struct ChocoboRaceAbility;
@@ -131,6 +130,12 @@ struct ChocoboTaxiStand;
 struct CircleActivity;
 struct ClassJob;
 struct ClassJobCategory;
+struct CollectablesShop;
+struct CollectablesShopItem;
+struct CollectablesShopItemGroup;
+struct CollectablesShopRefine;
+struct CollectablesShopRewardItem;
+struct CollectablesShopRewardScrip;
 struct Companion;
 struct CompanionMove;
 struct CompanionTransient;
@@ -147,6 +152,7 @@ struct CompanyLeve;
 struct CompanyLeveRule;
 struct CompleteJournal;
 struct CompleteJournalCategory;
+struct Condition;
 struct ConfigKey;
 struct ContentCloseCycle;
 struct ContentExAction;
@@ -212,6 +218,10 @@ struct DisposalShopItem;
 struct DpsChallenge;
 struct DpsChallengeOfficer;
 struct DpsChallengeTransient;
+struct DynamicEvent;
+struct DynamicEventEnemyType;
+struct DynamicEventSingleBattle;
+struct DynamicEventType;
 struct EmjAddon;
 struct EmjDani;
 struct Emote;
@@ -245,6 +255,7 @@ struct ExportedSG;
 struct ExVersion;
 struct Fate;
 struct FateEvent;
+struct FateMode;
 struct FateProgressUI;
 struct FateTokenType;
 struct FCActivity;
@@ -284,6 +295,8 @@ struct GatheringPointBase;
 struct GatheringPointBonus;
 struct GatheringPointBonusType;
 struct GatheringPointName;
+struct GatheringPointTransient;
+struct GatheringRarePopTimeTable;
 struct GatheringSubCategory;
 struct GatheringType;
 struct GcArmyCaptureTactics;
@@ -320,6 +333,8 @@ struct GoldSaucerTextData;
 struct GrandCompany;
 struct GrandCompanyRank;
 struct GroupPoseFrame;
+struct GroupPoseStamp;
+struct GroupPoseStampCategory;
 struct GuardianDeity;
 struct Guide;
 struct GuidePage;
@@ -357,6 +372,9 @@ struct HWDDevLayerControl;
 struct HWDDevLevelUI;
 struct HWDDevLively;
 struct HWDDevProgress;
+struct HWDGathereInspectTerm;
+struct HWDGathererInspection;
+struct HWDGathererInspectionReward;
 struct HWDInfoBoardArticle;
 struct HWDInfoBoardArticleTransient;
 struct HWDInfoBoardArticleType;
@@ -368,6 +386,9 @@ struct IKDFishParam;
 struct IKDRoute;
 struct IKDRouteTable;
 struct IKDSpot;
+struct InclusionShop;
+struct InclusionShopCategory;
+struct InclusionShopSeries;
 struct IndividualWeather;
 struct InstanceContent;
 struct InstanceContentBuff;
@@ -376,10 +397,13 @@ struct InstanceContentGuide;
 struct InstanceContentTextData;
 struct Item;
 struct ItemAction;
+struct ItemActionTelepo;
+struct ItemBarterCheck;
 struct ItemFood;
 struct ItemLevel;
 struct ItemSearchCategory;
 struct ItemSeries;
+struct ItemSortCategory;
 struct ItemSpecialBonus;
 struct ItemUICategory;
 struct JobHudManual;
@@ -445,6 +469,9 @@ struct MoveVfx;
 struct MovieSubtitle;
 struct MovieSubtitle500;
 struct MovieSubtitleVoyage;
+struct MYCTemporaryItem;
+struct MYCTemporaryItemUICategory;
+struct MYCWarResultNotebook;
 struct NotebookDivision;
 struct NotebookDivisionCategory;
 struct NotoriousMonster;
@@ -459,6 +486,7 @@ struct Orchestrion;
 struct OrchestrionCategory;
 struct OrchestrionPath;
 struct OrchestrionUiparam;
+struct Ornament;
 struct ParamGrow;
 struct PartyContent;
 struct PartyContentCutscene;
@@ -509,6 +537,7 @@ struct RacingChocoboParam;
 struct RecastNavimesh;
 struct Recipe;
 struct RecipeLevelTable;
+struct RecipeLookup;
 struct RecipeNotebookList;
 struct RecommendContents;
 struct Relic;
@@ -522,15 +551,16 @@ struct RetainerTaskLvRange;
 struct RetainerTaskNormal;
 struct RetainerTaskParameter;
 struct RetainerTaskRandom;
+struct RideShooting;
+struct RideShootingTextData;
 struct RPParameter;
-struct Salvage;
+struct SatisfactionArbitration;
 struct SatisfactionNpc;
 struct SatisfactionSupply;
 struct SatisfactionSupplyReward;
 struct ScenarioTree;
 struct ScenarioTreeTips;
 struct ScenarioTreeTipsClassQuest;
-struct ScenarioTreeTipsQuest;
 struct ScenarioType;
 struct ScreenImage;
 struct SecretRecipeBook;
@@ -556,7 +586,9 @@ struct SubmarineMap;
 struct SubmarinePart;
 struct SubmarineRank;
 struct SwitchTalk;
+struct SwitchTalkVariation;
 struct TerritoryType;
+struct TerritoryTypeTransient;
 struct TextCommand;
 struct Title;
 struct Tomestones;
@@ -620,7 +652,6 @@ struct Achievement
   int32_t key;
   std::vector< int32_t > data;
   uint16_t order;
-  uint8_t padding;
   uint8_t achievementHideCondition;
 
   Achievement( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
@@ -632,6 +663,7 @@ struct AchievementCategory
   uint8_t achievementKind;
   bool showComplete;
   bool hideCategory;
+  uint8_t order;
 
   AchievementCategory( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
@@ -648,6 +680,7 @@ struct AchievementHideCondition
 struct AchievementKind
 {
   std::string name;
+  uint8_t order;
 
   AchievementKind( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
@@ -928,6 +961,7 @@ struct AetheryteSystemDefine
 
 struct AirshipExplorationLevel
 {
+  uint16_t capacity;
   uint32_t expToNext;
 
   AirshipExplorationLevel( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
@@ -1151,14 +1185,6 @@ struct AOZContentBriefingBNpc
   AOZContentBriefingBNpc( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
 
-struct AOZReport
-{
-  uint8_t reward;
-  int8_t order;
-
-  AOZReport( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
-};
-
 struct AquariumFish
 {
   uint8_t aquariumWater;
@@ -1260,11 +1286,14 @@ struct BattleLeve
   std::vector< uint8_t > itemsInvolvedQty;
   std::vector< uint8_t > itemDropRate;
   std::vector< uint32_t > toDoNumberInvolved;
-  std::vector< uint32_t > toDoParam;
+  std::vector< uint8_t > toDoSequence;
   int32_t rule;
   uint8_t varient;
   uint16_t objective0;
   uint16_t objective1;
+  uint16_t objective2;
+  uint16_t help0;
+  uint16_t help1;
 
   BattleLeve( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
@@ -1278,6 +1307,14 @@ struct BattleLeveRule
 
 struct BeastRankBonus
 {
+  uint16_t neutral;
+  uint16_t recognized;
+  uint16_t friendly;
+  uint16_t trusted;
+  uint16_t respected;
+  uint16_t honored;
+  uint16_t sworn;
+  uint16_t alliedBloodsworn;
   uint32_t item;
   std::vector< uint8_t > itemQuantity;
 
@@ -1288,6 +1325,8 @@ struct BeastReputationRank
 {
   uint16_t requiredReputation;
   std::string name;
+  std::string alliedNames;
+  uint32_t color;
 
   BeastReputationRank( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
@@ -1303,6 +1342,13 @@ struct BeastTribe
   uint32_t currencyItem;
   uint8_t displayOrder;
   std::string name;
+  int8_t adjective;
+  std::string plural;
+  int8_t possessivePronoun;
+  int8_t startsWithVowel;
+  int8_t pronoun;
+  int8_t article;
+  int8_t dEF;
   std::string nameRelation;
 
   BeastTribe( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
@@ -1310,7 +1356,13 @@ struct BeastTribe
 
 struct Behavior
 {
+  uint8_t condition0Target;
+  uint8_t condition0Type;
   int32_t balloon;
+  uint8_t condition1Target;
+  uint8_t condition1Type;
+  uint32_t contentArgument0;
+  uint8_t contentArgument1;
 
   Behavior( uint32_t row_id, uint32_t subRow, Sapphire::Data::ExdDataGenerated* exdData );
 };
@@ -1414,6 +1466,7 @@ struct BGMSwitch
 {
   uint8_t bGMSystemDefine;
   uint32_t quest;
+  uint16_t bGM;
 
   BGMSwitch( uint32_t row_id, uint32_t subRow, Sapphire::Data::ExdDataGenerated* exdData );
 };
@@ -1663,6 +1716,7 @@ struct Channeling
 {
   std::string file;
   uint8_t widthScale;
+  bool addedIn53;
 
   Channeling( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
@@ -1693,6 +1747,56 @@ struct CharaMakeCustomize
   CharaMakeCustomize( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
 
+struct CharaMakeName
+{
+  std::string hyurMidlanderMale;
+  std::string hyurMidlanderFemale;
+  std::string hyurMidlanderLastName;
+  std::string hyurHighlanderMale;
+  std::string hyurHighlanderFemale;
+  std::string hyurHighlanderLastName;
+  std::string elezenMale;
+  std::string elezenFemale;
+  std::string elezenWildwoodLastName;
+  std::string elezenDuskwightLastName;
+  std::string miqoteSunMale;
+  std::string miqoteSunFemale;
+  std::string miqoteSunMaleLastName;
+  std::string miqoteSunFemaleLastName;
+  std::string miqoteMoonMale;
+  std::string miqoteMoonFemale;
+  std::string miqoteMoonLastname;
+  std::string lalafellPlainsfolkFirstNameStart;
+  std::string lalafellPlainsfolkLastNameStart;
+  std::string lalafellPlainsfolkEndOfNames;
+  std::string lalafellDunesfolkMale;
+  std::string lalafellDunesfolkMaleLastName;
+  std::string lalafellDunesfolkFemale;
+  std::string lalafellDunesfolkFemaleLastName;
+  std::string roegadynSeaWolfMale;
+  std::string roegadynSeaWolfMaleLastName;
+  std::string roegadynSeaWolfFemale;
+  std::string roegadynSeaWolfFemaleLastName;
+  std::string roegadynHellsguardFirstName;
+  std::string roegadynHellsguardMaleLastName;
+  std::string roegadynHellsguardFemaleLastName;
+  std::string auRaRaenMale;
+  std::string auRaRaenFemale;
+  std::string auRaRaenLastName;
+  std::string auRaXaelaMale;
+  std::string auRaXaelaFemale;
+  std::string auRaXaelaLastName;
+  std::string hrothgarHellionsFirstName;
+  std::string hrothgarHellionsLastName;
+  std::string hrothgarLostFirstName;
+  std::string hrothgarLostLastName;
+  std::string vieraFirstName;
+  std::string vieraRavaLastName;
+  std::string vieraVeenaLastName;
+
+  CharaMakeName( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+};
+
 struct CharaMakeType
 {
   int32_t race;
@@ -1706,7 +1810,6 @@ struct CharaMakeType
   std::vector< uint32_t > subMenuMask;
   std::vector< uint32_t > customize;
   std::vector< uint8_t > voiceStruct;
-  std::vector< int32_t > facialFeatureOption;
 
   CharaMakeType( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
@@ -1798,6 +1901,7 @@ struct ChocoboTaxi
 
 struct ChocoboTaxiStand
 {
+  std::vector< uint16_t > targetLocations;
   std::string placeName;
 
   ChocoboTaxiStand( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
@@ -1897,6 +2001,63 @@ struct ClassJobCategory
   ClassJobCategory( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
 
+struct CollectablesShop
+{
+  std::string name;
+  uint32_t quest;
+  std::vector< uint16_t > shopItems;
+
+  CollectablesShop( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+};
+
+struct CollectablesShopItem
+{
+  uint32_t item;
+  uint8_t collectablesShopItemGroup;
+  uint16_t levelMin;
+  uint16_t levelMax;
+  uint16_t collectablesShopRefine;
+  uint16_t collectablesShopRewardScrip;
+
+  CollectablesShopItem( uint32_t row_id, uint32_t subRow, Sapphire::Data::ExdDataGenerated* exdData );
+};
+
+struct CollectablesShopItemGroup
+{
+  std::string name;
+
+  CollectablesShopItemGroup( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+};
+
+struct CollectablesShopRefine
+{
+  uint16_t lowCollectability;
+  uint16_t midCollectability;
+  uint16_t highCollectability;
+
+  CollectablesShopRefine( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+};
+
+struct CollectablesShopRewardItem
+{
+  uint32_t item;
+
+  CollectablesShopRewardItem( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+};
+
+struct CollectablesShopRewardScrip
+{
+  uint16_t currency;
+  uint16_t lowReward;
+  uint16_t midReward;
+  uint16_t highReward;
+  uint16_t expRatioLow;
+  uint16_t expRatioMid;
+  uint16_t expRatioHigh;
+
+  CollectablesShopRewardScrip( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+};
+
 struct Companion
 {
   std::string singular;
@@ -2014,10 +2175,12 @@ struct CompanyCraftProcess
 struct CompanyCraftSequence
 {
   int32_t resultItem;
+  int32_t category;
   int32_t companyCraftDraftCategory;
   int32_t companyCraftType;
   int32_t companyCraftDraft;
   std::vector< uint16_t > companyCraftPart;
+  uint32_t order;
 
   CompanyCraftSequence( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
@@ -2038,15 +2201,14 @@ struct CompanyCraftType
 
 struct CompanyLeve
 {
-  std::vector< uint16_t > time;
+  std::vector< uint16_t > routePointTime;
   std::vector< int32_t > baseID;
   std::vector< uint16_t > enemyLevel;
   std::vector< uint32_t > bNpcName;
   std::vector< int32_t > itemsInvolved;
   std::vector< uint8_t > itemsInvolvedQty;
   std::vector< uint8_t > itemDropRate;
-  std::vector< uint32_t > toDoNumberInvolved;
-  std::vector< uint32_t > toDoParam;
+  std::vector< uint8_t > toDoSequence;
   int32_t rule;
   uint8_t ruleParam;
 
@@ -2080,6 +2242,13 @@ struct CompleteJournalCategory
   CompleteJournalCategory( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
 
+struct Condition
+{
+  uint32_t logMessage;
+
+  Condition( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+};
+
 struct ConfigKey
 {
   std::string label;
@@ -2122,6 +2291,7 @@ struct ContentFinderCondition
   uint8_t classJobLevelSync;
   uint16_t itemLevelRequired;
   uint16_t itemLevelSync;
+  bool addedIn53;
   bool allowUndersized;
   bool allowReplacement;
   bool highEndDuty;
@@ -2593,6 +2763,12 @@ struct DeepDungeonItem
 struct DeepDungeonLayer
 {
   uint8_t deepDungeon;
+  uint8_t floorSet;
+  uint16_t roomA;
+  uint16_t roomB;
+  uint16_t roomC;
+  uint8_t wepMinLv;
+  uint8_t armourMinLv;
 
   DeepDungeonLayer( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
@@ -2759,6 +2935,45 @@ struct DpsChallengeTransient
   DpsChallengeTransient( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
 
+struct DynamicEvent
+{
+  uint8_t eventType;
+  uint8_t enemyType;
+  uint32_t lGBEventObject;
+  uint32_t lGBMapRange;
+  uint32_t quest;
+  uint8_t singleBattle;
+  uint32_t announce;
+  std::string name;
+  std::string description;
+
+  DynamicEvent( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+};
+
+struct DynamicEventEnemyType
+{
+  std::string name;
+
+  DynamicEventEnemyType( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+};
+
+struct DynamicEventSingleBattle
+{
+  int32_t actionIcon;
+  uint32_t icon;
+  std::string text;
+
+  DynamicEventSingleBattle( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+};
+
+struct DynamicEventType
+{
+  uint32_t iconObjective0;
+  uint32_t iconObjective1;
+
+  DynamicEventType( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+};
+
 struct EmjAddon
 {
   std::string text;
@@ -2887,8 +3102,11 @@ struct ENpcDressUp
 
 struct ENpcDressUpDress
 {
+  bool addedIn530;
   uint32_t eNpc;
+  uint16_t addedIn531;
   uint16_t behavior;
+  uint8_t addedIn532;
   uint64_t modelMainHand;
   uint8_t dyeMainHand;
   uint64_t modelOffHand;
@@ -2932,6 +3150,7 @@ struct EObj
   bool directorControl;
   bool target;
   uint8_t eventHighAddition;
+  bool addedIn53;
 
   EObj( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
@@ -3137,6 +3356,8 @@ struct ExportedSG
 struct ExVersion
 {
   std::string name;
+  uint16_t acceptJingle;
+  uint16_t completeJingle;
 
   ExVersion( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
@@ -3145,6 +3366,7 @@ struct Fate
 {
   uint8_t eurekaFate;
   uint8_t rule;
+  uint16_t fateRuleEx;
   uint32_t location;
   uint8_t classJobLevel;
   uint8_t classJobLevelMax;
@@ -3158,13 +3380,19 @@ struct Fate
   uint16_t screenImageAccept;
   uint16_t screenImageComplete;
   uint16_t screenImageFailed;
-  bool hasWorldMapIcon;
-  bool isQuest;
+  bool specialFate;
+  uint16_t givenStatus;
+  bool adventEvent;
+  bool moonFaireEvent;
+  uint32_t fATEChain;
   std::string name;
   std::string description;
   std::string objective;
   std::vector< std::string > statusText;
   uint32_t arrayIndex;
+  uint32_t reqEventItem;
+  uint32_t turnInEventItem;
+  std::vector< uint16_t > objectiveIcon;
 
   Fate( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
@@ -3183,6 +3411,16 @@ struct FateEvent
   FateEvent( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
 
+struct FateMode
+{
+  uint32_t motivationIcon;
+  uint32_t motivationMapMarker;
+  uint32_t objectiveIcon;
+  uint32_t objectiveMapMarker;
+
+  FateMode( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+};
+
 struct FateProgressUI
 {
   int32_t location;
@@ -3526,9 +3764,10 @@ struct GatheringPointBase
 struct GatheringPointBonus
 {
   uint8_t condition;
-  uint16_t conditionValue;
+  uint32_t conditionValue;
   uint8_t bonusType;
   uint16_t bonusValue;
+  bool addedIn53;
 
   GatheringPointBonus( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
@@ -3553,6 +3792,21 @@ struct GatheringPointName
   GatheringPointName( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
 
+struct GatheringPointTransient
+{
+  uint16_t ephemeralStartTime;
+  uint16_t ephemeralEndTime;
+  int32_t gatheringRarePopTimeTable;
+
+  GatheringPointTransient( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+};
+
+struct GatheringRarePopTimeTable
+{
+
+  GatheringRarePopTimeTable( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+};
+
 struct GatheringSubCategory
 {
   uint8_t gatheringType;
@@ -3920,6 +4174,22 @@ struct GroupPoseFrame
   GroupPoseFrame( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
 
+struct GroupPoseStamp
+{
+  int32_t stampIcon;
+  int32_t category;
+  std::string name;
+
+  GroupPoseStamp( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+};
+
+struct GroupPoseStampCategory
+{
+  std::string name;
+
+  GroupPoseStampCategory( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+};
+
 struct GuardianDeity
 {
   std::string name;
@@ -3961,6 +4231,7 @@ struct GuideTitle
 
 struct GuildleveAssignment
 {
+  uint8_t addedIn53;
   uint32_t assignmentTalk;
   std::vector< uint32_t > quest;
 
@@ -4215,12 +4486,14 @@ struct HWDCrafterSupply
 {
   std::vector< uint32_t > itemTradeIn;
   std::vector< uint8_t > level;
-  std::vector< uint8_t > baseCollectableRating;
-  std::vector< uint16_t > midBaseCollectableRating;
-  std::vector< uint16_t > highBaseCollectableRating;
+  std::vector< uint8_t > levelMax;
+  std::vector< uint16_t > baseCollectableRating;
+  std::vector< uint16_t > midCollectableRating;
+  std::vector< uint16_t > highCollectableRating;
   std::vector< uint16_t > baseCollectableReward;
   std::vector< uint16_t > midCollectableReward;
   std::vector< uint16_t > highCollectableReward;
+  std::vector< uint8_t > termName;
 
   HWDCrafterSupply( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
@@ -4229,6 +4502,7 @@ struct HWDCrafterSupplyReward
 {
   uint16_t scriptRewardAmount;
   uint32_t expReward;
+  uint16_t Points;
 
   HWDCrafterSupplyReward( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
@@ -4259,6 +4533,34 @@ struct HWDDevProgress
   HWDDevProgress( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
 
+struct HWDGathereInspectTerm
+{
+  std::string name;
+
+  HWDGathereInspectTerm( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+};
+
+struct HWDGathererInspection
+{
+  std::vector< uint32_t > itemRequired;
+  std::vector< uint32_t > fishParameter;
+  std::vector< uint8_t > amountRequired;
+  std::vector< uint32_t > itemReceived;
+  std::vector< uint16_t > reward1;
+  std::vector< uint16_t > reward2;
+  std::vector< uint8_t > phase;
+
+  HWDGathererInspection( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+};
+
+struct HWDGathererInspectionReward
+{
+  uint16_t scrips;
+  uint16_t points;
+
+  HWDGathererInspectionReward( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+};
+
 struct HWDInfoBoardArticle
 {
   uint8_t type;
@@ -4350,9 +4652,34 @@ struct IKDSpot
   IKDSpot( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
 
+struct InclusionShop
+{
+  std::vector< uint16_t > category;
+
+  InclusionShop( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+};
+
+struct InclusionShopCategory
+{
+  std::string name;
+  uint8_t classJobCategory;
+  uint16_t inclusionShopSeries;
+
+  InclusionShopCategory( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+};
+
+struct InclusionShopSeries
+{
+  uint32_t specialShop;
+
+  InclusionShopSeries( uint32_t row_id, uint32_t subRow, Sapphire::Data::ExdDataGenerated* exdData );
+};
+
 struct IndividualWeather
 {
   std::vector< uint8_t > weather;
+  uint8_t addedIn530;
+  uint8_t addedIn531;
   std::vector< uint32_t > quest;
 
   IndividualWeather( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
@@ -4364,28 +4691,28 @@ struct InstanceContent
   uint8_t weekRestriction;
   uint16_t timeLimitmin;
   uint16_t bGM;
-  uint32_t winBGM;
+  uint16_t winBGM;
   uint32_t cutscene;
-  uint8_t order;
-  bool colosseum;
+  uint16_t order;
+  uint8_t colosseum;
   uint32_t instanceContentTextDataBossStart;
   uint32_t instanceContentTextDataBossEnd;
   uint32_t bNpcBaseBoss;
   uint32_t instanceContentTextDataObjectiveStart;
-  uint16_t instanceContentTextDataObjectiveEnd;
-  uint32_t sortKey;
+  uint32_t instanceContentTextDataObjectiveEnd;
+  uint16_t sortKey;
   uint32_t instanceClearExp;
   uint16_t newPlayerBonusA;
-  uint32_t finalBossCurrencyC;
-  uint16_t finalBossCurrencyA;
+  uint16_t finalBossCurrencyC;
+  uint32_t finalBossCurrencyA;
   uint16_t finalBossCurrencyB;
-  uint32_t newPlayerBonusB;
+  uint16_t newPlayerBonusB;
   uint32_t instanceClearGil;
-  uint8_t instanceContentRewardItem;
-  int32_t finalBossExp;
+  uint32_t instanceContentRewardItem;
+  uint8_t finalBossExp;
   uint32_t instanceContentBuff;
-  int16_t reqInstance;
-  uint8_t partyCondition;
+  int32_t reqInstance;
+  int16_t partyCondition;
 
   InstanceContent( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
@@ -4439,6 +4766,7 @@ struct Item
   uint8_t itemUICategory;
   uint8_t itemSearchCategory;
   uint8_t equipSlotCategory;
+  uint8_t itemSortCategory;
   uint32_t stackSize;
   bool isUnique;
   bool isUntradable;
@@ -4454,7 +4782,7 @@ struct Item
   uint8_t classJobRepair;
   int32_t itemRepair;
   int32_t itemGlamour;
-  uint16_t salvage;
+  uint16_t desynth;
   bool isCollectable;
   bool alwaysCollectable;
   uint16_t aetherialReduce;
@@ -4504,6 +4832,23 @@ struct ItemAction
   ItemAction( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
 
+struct ItemActionTelepo
+{
+  uint32_t requirement;
+  uint32_t denyMessage;
+
+  ItemActionTelepo( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+};
+
+struct ItemBarterCheck
+{
+  uint16_t category;
+  uint32_t question;
+  uint32_t confirm;
+
+  ItemBarterCheck( uint32_t row_id, uint32_t subRow, Sapphire::Data::ExdDataGenerated* exdData );
+};
+
 struct ItemFood
 {
   uint8_t eXPBonus;
@@ -4608,6 +4953,13 @@ struct ItemSeries
   ItemSeries( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
 
+struct ItemSortCategory
+{
+  uint8_t param;
+
+  ItemSortCategory( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+};
+
 struct ItemSpecialBonus
 {
   std::string name;
@@ -4695,7 +5047,7 @@ struct Leve
   std::string name;
   std::string description;
   int32_t leveClient;
-  int32_t leveAssignmentType;
+  uint8_t leveAssignmentType;
   int32_t town;
   uint16_t classJobLevel;
   uint8_t timeLimit;
@@ -4827,6 +5179,8 @@ struct LotteryExchangeShop
 {
   std::vector< int32_t > itemAccepted;
   std::vector< uint32_t > amountAccepted;
+  std::string lua;
+  std::vector< uint32_t > logMessage;
 
   LotteryExchangeShop( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
@@ -5293,6 +5647,38 @@ struct MovieSubtitleVoyage
   MovieSubtitleVoyage( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
 
+struct MYCTemporaryItem
+{
+  uint8_t category;
+  uint8_t type;
+  uint32_t action;
+  uint8_t max;
+  uint8_t weight;
+  uint8_t order;
+
+  MYCTemporaryItem( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+};
+
+struct MYCTemporaryItemUICategory
+{
+  std::string name;
+
+  MYCTemporaryItemUICategory( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+};
+
+struct MYCWarResultNotebook
+{
+  uint8_t number;
+  int32_t icon;
+  int32_t image;
+  uint8_t rarity;
+  std::string nameJP;
+  std::string name;
+  std::string description;
+
+  MYCWarResultNotebook( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+};
+
 struct NotebookDivision
 {
   std::string name;
@@ -5315,6 +5701,7 @@ struct NotebookDivision
 struct NotebookDivisionCategory
 {
   std::string name;
+  uint8_t index;
 
   NotebookDivisionCategory( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
@@ -5425,6 +5812,8 @@ struct Orchestrion
 struct OrchestrionCategory
 {
   std::string name;
+  uint8_t hideCategory;
+  uint8_t order;
 
   OrchestrionCategory( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
@@ -5444,6 +5833,23 @@ struct OrchestrionUiparam
   OrchestrionUiparam( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
 
+struct Ornament
+{
+  uint16_t model;
+  int16_t order;
+  uint16_t icon;
+  uint16_t transient;
+  std::string singular;
+  int8_t adjective;
+  std::string plural;
+  int8_t possessivePronoun;
+  int8_t startsWithVowel;
+  int8_t pronoun;
+  int8_t article;
+
+  Ornament( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+};
+
 struct ParamGrow
 {
   int32_t expToNext;
@@ -5596,8 +6002,11 @@ struct PlantPotFlowerSeed
 
 struct PreHandler
 {
+  uint32_t image;
   uint32_t target;
-  uint16_t actionTimeline;
+  uint32_t unlockQuest;
+  uint32_t acceptMessage;
+  uint32_t denyMessage;
 
   PreHandler( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
@@ -5739,39 +6148,57 @@ struct Quest
   uint32_t previousQuest2;
   uint8_t questLockJoin;
   std::vector< uint32_t > questLock;
+  uint16_t header;
   uint8_t classJobUnlock;
   uint8_t grandCompany;
   uint8_t grandCompanyRank;
   uint8_t instanceContentJoin;
   std::vector< uint32_t > instanceContent;
   uint8_t festival;
+  uint8_t festivalBegin;
+  uint8_t festivalEnd;
   uint16_t bellStart;
   uint16_t bellEnd;
   uint8_t beastTribe;
   uint8_t beastReputationRank;
-  uint16_t levelMax;
+  uint16_t beastReputationValue;
   int32_t mountRequired;
   bool isHouseRequired;
   uint8_t deliveryQuest;
   uint32_t issuerStart;
-  uint32_t behavior;
+  uint32_t issuerLocation;
+  uint16_t clientBehavior;
   uint32_t targetEnd;
   bool isRepeatable;
   uint8_t repeatIntervalType;
   uint8_t questRepeatFlag;
-  bool unlocksSystemContent;
+  bool canCancel;
   uint8_t type;
   uint16_t questClassJobSupply;
   std::vector< std::string > scriptInstruction;
   std::vector< uint32_t > scriptArg;
   std::vector< uint8_t > actorSpawnSeq;
   std::vector< uint8_t > actorDespawnSeq;
-  std::vector< uint32_t > actorSpawn;
+  std::vector< uint32_t > listener;
   std::vector< uint8_t > questUInt8A;
   std::vector< uint8_t > questUInt8B;
+  std::vector< uint8_t > conditionType;
+  std::vector< uint32_t > conditionValue;
+  std::vector< uint8_t > conditionOperator;
+  std::vector< uint16_t > behavior;
+  std::vector< bool > visibleBool;
+  std::vector< bool > conditionBool;
+  std::vector< bool > itemBool;
+  std::vector< bool > announceBool;
+  std::vector< bool > behaviorBool;
+  std::vector< bool > acceptBool;
+  std::vector< bool > qualifiedBool;
+  std::vector< bool > canTargetBool;
   std::vector< uint8_t > toDoCompleteSeq;
   std::vector< uint8_t > toDoQty;
   std::vector< uint32_t > toDoMainLocation;
+  std::vector< uint8_t > countableNum;
+  uint8_t levelMax;
   uint8_t classJobRequired;
   uint16_t expFactor;
   uint32_t gilReward;
@@ -5789,7 +6216,10 @@ struct Quest
   uint8_t emoteReward;
   uint16_t actionReward;
   std::vector< uint8_t > generalActionReward;
+  uint16_t systemReward0;
   uint8_t otherReward;
+  uint16_t systemReward1;
+  uint16_t gCTypeReward;
   uint32_t instanceContentUnlock;
   uint8_t tomestoneReward;
   uint8_t tomestoneCountReward;
@@ -5798,6 +6228,8 @@ struct Quest
   uint8_t journalGenre;
   uint32_t icon;
   uint32_t iconSpecial;
+  bool introduction;
+  bool hideOfferIcon;
   uint8_t eventIconType;
   uint16_t sortKey;
 
@@ -5941,6 +6373,7 @@ struct Race
   int32_t rSEFHands;
   int32_t rSEFLegs;
   int32_t rSEFFeet;
+  uint8_t exPac;
 
   Race( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
@@ -6026,6 +6459,7 @@ struct Recipe
   int32_t statusRequired;
   int32_t itemRequired;
   bool isSpecializationRequired;
+  bool isExpert;
   uint16_t patchNumber;
 
   Recipe( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
@@ -6044,6 +6478,20 @@ struct RecipeLevelTable
   RecipeLevelTable( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
 
+struct RecipeLookup
+{
+  uint16_t cRP;
+  uint16_t bSM;
+  uint16_t aRM;
+  uint16_t gSM;
+  uint16_t lTW;
+  uint16_t wVR;
+  uint16_t aLC;
+  uint16_t cUL;
+
+  RecipeLookup( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+};
+
 struct RecipeNotebookList
 {
   std::vector< int32_t > recipe;
@@ -6131,6 +6579,7 @@ struct Resident
 {
   uint64_t model;
   int32_t npcYell;
+  uint16_t addedIn53;
   uint8_t residentMotionType;
 
   Resident( uint32_t row_id, uint32_t subRow, Sapphire::Data::ExdDataGenerated* exdData );
@@ -6146,6 +6595,8 @@ struct RetainerTask
   uint16_t maxTimemin;
   int32_t experience;
   uint16_t requiredItemLevel;
+  uint8_t conditionParam0;
+  uint8_t conditionParam1;
   uint16_t requiredGathering;
   uint16_t task;
 
@@ -6189,6 +6640,24 @@ struct RetainerTaskRandom
   RetainerTaskRandom( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
 
+struct RideShooting
+{
+  uint16_t gFateRideShooting;
+  uint16_t startText;
+  std::vector< uint32_t > popRange;
+  std::vector< uint32_t > eNpc;
+  std::vector< uint8_t > eNpcScale;
+
+  RideShooting( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+};
+
+struct RideShootingTextData
+{
+  std::string string;
+
+  RideShootingTextData( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+};
+
 struct RPParameter
 {
   uint16_t bNpcName;
@@ -6197,11 +6666,11 @@ struct RPParameter
   RPParameter( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
 
-struct Salvage
+struct SatisfactionArbitration
 {
-  uint16_t optimalSkill;
+  uint32_t quest;
 
-  Salvage( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+  SatisfactionArbitration( uint32_t row_id, uint32_t subRow, Sapphire::Data::ExdDataGenerated* exdData );
 };
 
 struct SatisfactionNpc
@@ -6213,6 +6682,8 @@ struct SatisfactionNpc
   std::vector< int32_t > supplyIndex;
   std::vector< uint16_t > satisfactionRequired;
   int32_t icon;
+  uint8_t addedIn530;
+  uint8_t addedIn531;
 
   SatisfactionNpc( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
@@ -6268,13 +6739,6 @@ struct ScenarioTreeTipsClassQuest
   ScenarioTreeTipsClassQuest( uint32_t row_id, uint32_t subRow, Sapphire::Data::ExdDataGenerated* exdData );
 };
 
-struct ScenarioTreeTipsQuest
-{
-  uint32_t level;
-
-  ScenarioTreeTipsQuest( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
-};
-
 struct ScenarioType
 {
   std::string type;
@@ -6304,11 +6768,15 @@ struct SkyIsland2Mission
 {
   uint32_t item1;
   uint32_t item2;
+  uint16_t placeName;
   uint16_t objective1;
+  uint32_t popRange0;
   uint8_t requiredAmount1;
   uint16_t objective2;
+  uint32_t popRange1;
   uint8_t requiredAmount2;
   uint16_t objective3;
+  uint32_t popRange2;
   uint32_t image;
 
   SkyIsland2Mission( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
@@ -6392,11 +6860,11 @@ struct SpecialShop
   std::vector< int32_t > questItem;
   std::vector< int32_t > unknown;
   std::vector< int32_t > achievementUnlock;
-  std::vector< uint8_t > patchNumber;
-  uint16_t useCurrencyType;
-  uint16_t questUnlock;
-  uint16_t completeText;
-  uint16_t notCompleteText;
+  std::vector< uint16_t > patchNumber;
+  bool useCurrencyType;
+  uint32_t questUnlock;
+  int32_t completeText;
+  int32_t notCompleteText;
 
   SpecialShop( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
@@ -6467,6 +6935,28 @@ struct StatusLoopVFX
 
 struct Story
 {
+  std::string script;
+  std::vector< std::string > instruction;
+  std::vector< uint32_t > argument;
+  std::vector< uint16_t > sequence;
+  std::vector< uint8_t > completedQuestOperator;
+  std::vector< uint32_t > completedQuest0;
+  std::vector< uint32_t > completedQuest1;
+  std::vector< uint32_t > completedQuest2;
+  std::vector< uint8_t > acceptedQuestOperator;
+  std::vector< uint32_t > acceptedQuest0;
+  std::vector< uint8_t > acceptedQuestSequence0;
+  std::vector< uint32_t > acceptedQuest1;
+  std::vector< uint8_t > acceptedQuestSequence1;
+  std::vector< uint32_t > acceptedQuest2;
+  std::vector< uint8_t > acceptedQuestSequence2;
+  std::vector< uint32_t > layerSet0;
+  std::vector< uint32_t > layerSet1;
+  std::vector< uint16_t > sequenceBegin;
+  std::vector< uint16_t > sequenceEnd;
+  std::vector< uint32_t > listener;
+  uint16_t layerSetTerritoryType0;
+  uint16_t layerSetTerritoryType1;
 
   Story( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
@@ -6475,6 +6965,8 @@ struct SubmarineExploration
 {
   std::string destination;
   std::string location;
+  uint8_t map;
+  uint8_t stars;
   uint8_t rankReq;
   uint8_t ceruleumTankReq;
   uint16_t durationmin;
@@ -6509,20 +7001,32 @@ struct SubmarinePart
 
 struct SubmarineRank
 {
-  uint16_t rank;
+  uint16_t capacity;
   uint32_t expToNext;
+  uint8_t surveillanceBonus;
+  uint8_t retrievalBonus;
+  uint8_t speedBonus;
+  uint8_t rangeBonus;
+  uint8_t favorBonus;
 
   SubmarineRank( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
 
 struct SwitchTalk
 {
-  std::vector< uint32_t > quest;
-  std::vector< uint32_t > defaultTalk;
 
   SwitchTalk( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
 
+struct SwitchTalkVariation
+{
+  uint32_t quest0;
+  uint32_t quest1;
+  uint32_t defaultTalk;
+
+  SwitchTalkVariation( uint32_t row_id, uint32_t subRow, Sapphire::Data::ExdDataGenerated* exdData );
+};
+
 struct TerritoryType
 {
   std::string name;
@@ -6549,10 +7053,20 @@ struct TerritoryType
   uint16_t resident;
   int8_t achievementIndex;
   bool isPvpZone;
+  uint8_t exVersion;
+  uint8_t addedIn53;
+  uint8_t mountSpeed;
 
   TerritoryType( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
 
+struct TerritoryTypeTransient
+{
+  int16_t offsetZ;
+
+  TerritoryTypeTransient( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+};
+
 struct TextCommand
 {
   std::string command;
@@ -6646,14 +7160,17 @@ struct Transformation
   uint16_t action3;
   uint16_t action4;
   uint16_t action5;
-  uint8_t rPParameter;
+  uint16_t rPParameter;
+  uint16_t removeAction;
   float speed;
   float scale;
   bool isPvP;
   bool isEvent;
   bool playerCamera;
-  bool startVFX;
-  bool endVFX;
+  uint16_t startVFX;
+  uint16_t endVFX;
+  uint32_t action6;
+  uint16_t action7;
 
   Transformation( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
@@ -6672,7 +7189,7 @@ struct TreasureHuntRank
   int32_t keyItemName;
   int32_t instanceMap;
   uint8_t maxPartySize;
-  uint8_t minPartySize;
+  uint8_t treasureHuntTexture;
 
   TreasureHuntRank( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
@@ -7121,7 +7638,6 @@ struct ZoneSharedGroup
      xiv::exd::Exd m_AOZBossDat;
      xiv::exd::Exd m_AOZContentDat;
      xiv::exd::Exd m_AOZContentBriefingBNpcDat;
-     xiv::exd::Exd m_AOZReportDat;
      xiv::exd::Exd m_AquariumFishDat;
      xiv::exd::Exd m_AquariumWaterDat;
      xiv::exd::Exd m_ArrayEventHandlerDat;
@@ -7164,6 +7680,7 @@ struct ZoneSharedGroup
      xiv::exd::Exd m_ChannelingDat;
      xiv::exd::Exd m_CharaMakeClassEquipDat;
      xiv::exd::Exd m_CharaMakeCustomizeDat;
+     xiv::exd::Exd m_CharaMakeNameDat;
      xiv::exd::Exd m_CharaMakeTypeDat;
      xiv::exd::Exd m_ChocoboRaceDat;
      xiv::exd::Exd m_ChocoboRaceAbilityDat;
@@ -7179,6 +7696,12 @@ struct ZoneSharedGroup
      xiv::exd::Exd m_CircleActivityDat;
      xiv::exd::Exd m_ClassJobDat;
      xiv::exd::Exd m_ClassJobCategoryDat;
+     xiv::exd::Exd m_CollectablesShopDat;
+     xiv::exd::Exd m_CollectablesShopItemDat;
+     xiv::exd::Exd m_CollectablesShopItemGroupDat;
+     xiv::exd::Exd m_CollectablesShopRefineDat;
+     xiv::exd::Exd m_CollectablesShopRewardItemDat;
+     xiv::exd::Exd m_CollectablesShopRewardScripDat;
      xiv::exd::Exd m_CompanionDat;
      xiv::exd::Exd m_CompanionMoveDat;
      xiv::exd::Exd m_CompanionTransientDat;
@@ -7195,6 +7718,7 @@ struct ZoneSharedGroup
      xiv::exd::Exd m_CompanyLeveRuleDat;
      xiv::exd::Exd m_CompleteJournalDat;
      xiv::exd::Exd m_CompleteJournalCategoryDat;
+     xiv::exd::Exd m_ConditionDat;
      xiv::exd::Exd m_ConfigKeyDat;
      xiv::exd::Exd m_ContentCloseCycleDat;
      xiv::exd::Exd m_ContentExActionDat;
@@ -7260,6 +7784,10 @@ struct ZoneSharedGroup
      xiv::exd::Exd m_DpsChallengeDat;
      xiv::exd::Exd m_DpsChallengeOfficerDat;
      xiv::exd::Exd m_DpsChallengeTransientDat;
+     xiv::exd::Exd m_DynamicEventDat;
+     xiv::exd::Exd m_DynamicEventEnemyTypeDat;
+     xiv::exd::Exd m_DynamicEventSingleBattleDat;
+     xiv::exd::Exd m_DynamicEventTypeDat;
      xiv::exd::Exd m_EmjAddonDat;
      xiv::exd::Exd m_EmjDaniDat;
      xiv::exd::Exd m_EmoteDat;
@@ -7293,6 +7821,7 @@ struct ZoneSharedGroup
      xiv::exd::Exd m_ExVersionDat;
      xiv::exd::Exd m_FateDat;
      xiv::exd::Exd m_FateEventDat;
+     xiv::exd::Exd m_FateModeDat;
      xiv::exd::Exd m_FateProgressUIDat;
      xiv::exd::Exd m_FateTokenTypeDat;
      xiv::exd::Exd m_FCActivityDat;
@@ -7332,6 +7861,8 @@ struct ZoneSharedGroup
      xiv::exd::Exd m_GatheringPointBonusDat;
      xiv::exd::Exd m_GatheringPointBonusTypeDat;
      xiv::exd::Exd m_GatheringPointNameDat;
+     xiv::exd::Exd m_GatheringPointTransientDat;
+     xiv::exd::Exd m_GatheringRarePopTimeTableDat;
      xiv::exd::Exd m_GatheringSubCategoryDat;
      xiv::exd::Exd m_GatheringTypeDat;
      xiv::exd::Exd m_GcArmyCaptureTacticsDat;
@@ -7368,6 +7899,8 @@ struct ZoneSharedGroup
      xiv::exd::Exd m_GrandCompanyDat;
      xiv::exd::Exd m_GrandCompanyRankDat;
      xiv::exd::Exd m_GroupPoseFrameDat;
+     xiv::exd::Exd m_GroupPoseStampDat;
+     xiv::exd::Exd m_GroupPoseStampCategoryDat;
      xiv::exd::Exd m_GuardianDeityDat;
      xiv::exd::Exd m_GuideDat;
      xiv::exd::Exd m_GuidePageDat;
@@ -7405,6 +7938,9 @@ struct ZoneSharedGroup
      xiv::exd::Exd m_HWDDevLevelUIDat;
      xiv::exd::Exd m_HWDDevLivelyDat;
      xiv::exd::Exd m_HWDDevProgressDat;
+     xiv::exd::Exd m_HWDGathereInspectTermDat;
+     xiv::exd::Exd m_HWDGathererInspectionDat;
+     xiv::exd::Exd m_HWDGathererInspectionRewardDat;
      xiv::exd::Exd m_HWDInfoBoardArticleDat;
      xiv::exd::Exd m_HWDInfoBoardArticleTransientDat;
      xiv::exd::Exd m_HWDInfoBoardArticleTypeDat;
@@ -7416,6 +7952,9 @@ struct ZoneSharedGroup
      xiv::exd::Exd m_IKDRouteDat;
      xiv::exd::Exd m_IKDRouteTableDat;
      xiv::exd::Exd m_IKDSpotDat;
+     xiv::exd::Exd m_InclusionShopDat;
+     xiv::exd::Exd m_InclusionShopCategoryDat;
+     xiv::exd::Exd m_InclusionShopSeriesDat;
      xiv::exd::Exd m_IndividualWeatherDat;
      xiv::exd::Exd m_InstanceContentDat;
      xiv::exd::Exd m_InstanceContentBuffDat;
@@ -7424,10 +7963,13 @@ struct ZoneSharedGroup
      xiv::exd::Exd m_InstanceContentTextDataDat;
      xiv::exd::Exd m_ItemDat;
      xiv::exd::Exd m_ItemActionDat;
+     xiv::exd::Exd m_ItemActionTelepoDat;
+     xiv::exd::Exd m_ItemBarterCheckDat;
      xiv::exd::Exd m_ItemFoodDat;
      xiv::exd::Exd m_ItemLevelDat;
      xiv::exd::Exd m_ItemSearchCategoryDat;
      xiv::exd::Exd m_ItemSeriesDat;
+     xiv::exd::Exd m_ItemSortCategoryDat;
      xiv::exd::Exd m_ItemSpecialBonusDat;
      xiv::exd::Exd m_ItemUICategoryDat;
      xiv::exd::Exd m_JobHudManualDat;
@@ -7493,6 +8035,9 @@ struct ZoneSharedGroup
      xiv::exd::Exd m_MovieSubtitleDat;
      xiv::exd::Exd m_MovieSubtitle500Dat;
      xiv::exd::Exd m_MovieSubtitleVoyageDat;
+     xiv::exd::Exd m_MYCTemporaryItemDat;
+     xiv::exd::Exd m_MYCTemporaryItemUICategoryDat;
+     xiv::exd::Exd m_MYCWarResultNotebookDat;
      xiv::exd::Exd m_NotebookDivisionDat;
      xiv::exd::Exd m_NotebookDivisionCategoryDat;
      xiv::exd::Exd m_NotoriousMonsterDat;
@@ -7507,6 +8052,7 @@ struct ZoneSharedGroup
      xiv::exd::Exd m_OrchestrionCategoryDat;
      xiv::exd::Exd m_OrchestrionPathDat;
      xiv::exd::Exd m_OrchestrionUiparamDat;
+     xiv::exd::Exd m_OrnamentDat;
      xiv::exd::Exd m_ParamGrowDat;
      xiv::exd::Exd m_PartyContentDat;
      xiv::exd::Exd m_PartyContentCutsceneDat;
@@ -7557,6 +8103,7 @@ struct ZoneSharedGroup
      xiv::exd::Exd m_RecastNavimeshDat;
      xiv::exd::Exd m_RecipeDat;
      xiv::exd::Exd m_RecipeLevelTableDat;
+     xiv::exd::Exd m_RecipeLookupDat;
      xiv::exd::Exd m_RecipeNotebookListDat;
      xiv::exd::Exd m_RecommendContentsDat;
      xiv::exd::Exd m_RelicDat;
@@ -7570,15 +8117,16 @@ struct ZoneSharedGroup
      xiv::exd::Exd m_RetainerTaskNormalDat;
      xiv::exd::Exd m_RetainerTaskParameterDat;
      xiv::exd::Exd m_RetainerTaskRandomDat;
+     xiv::exd::Exd m_RideShootingDat;
+     xiv::exd::Exd m_RideShootingTextDataDat;
      xiv::exd::Exd m_RPParameterDat;
-     xiv::exd::Exd m_SalvageDat;
+     xiv::exd::Exd m_SatisfactionArbitrationDat;
      xiv::exd::Exd m_SatisfactionNpcDat;
      xiv::exd::Exd m_SatisfactionSupplyDat;
      xiv::exd::Exd m_SatisfactionSupplyRewardDat;
      xiv::exd::Exd m_ScenarioTreeDat;
      xiv::exd::Exd m_ScenarioTreeTipsDat;
      xiv::exd::Exd m_ScenarioTreeTipsClassQuestDat;
-     xiv::exd::Exd m_ScenarioTreeTipsQuestDat;
      xiv::exd::Exd m_ScenarioTypeDat;
      xiv::exd::Exd m_ScreenImageDat;
      xiv::exd::Exd m_SecretRecipeBookDat;
@@ -7604,7 +8152,9 @@ struct ZoneSharedGroup
      xiv::exd::Exd m_SubmarinePartDat;
      xiv::exd::Exd m_SubmarineRankDat;
      xiv::exd::Exd m_SwitchTalkDat;
+     xiv::exd::Exd m_SwitchTalkVariationDat;
      xiv::exd::Exd m_TerritoryTypeDat;
+     xiv::exd::Exd m_TerritoryTypeTransientDat;
      xiv::exd::Exd m_TextCommandDat;
      xiv::exd::Exd m_TitleDat;
      xiv::exd::Exd m_TomestonesDat;
@@ -7705,7 +8255,6 @@ struct ZoneSharedGroup
      using AOZBossPtr = std::shared_ptr< AOZBoss >;
      using AOZContentPtr = std::shared_ptr< AOZContent >;
      using AOZContentBriefingBNpcPtr = std::shared_ptr< AOZContentBriefingBNpc >;
-     using AOZReportPtr = std::shared_ptr< AOZReport >;
      using AquariumFishPtr = std::shared_ptr< AquariumFish >;
      using AquariumWaterPtr = std::shared_ptr< AquariumWater >;
      using ArrayEventHandlerPtr = std::shared_ptr< ArrayEventHandler >;
@@ -7748,6 +8297,7 @@ struct ZoneSharedGroup
      using ChannelingPtr = std::shared_ptr< Channeling >;
      using CharaMakeClassEquipPtr = std::shared_ptr< CharaMakeClassEquip >;
      using CharaMakeCustomizePtr = std::shared_ptr< CharaMakeCustomize >;
+     using CharaMakeNamePtr = std::shared_ptr< CharaMakeName >;
      using CharaMakeTypePtr = std::shared_ptr< CharaMakeType >;
      using ChocoboRacePtr = std::shared_ptr< ChocoboRace >;
      using ChocoboRaceAbilityPtr = std::shared_ptr< ChocoboRaceAbility >;
@@ -7763,6 +8313,12 @@ struct ZoneSharedGroup
      using CircleActivityPtr = std::shared_ptr< CircleActivity >;
      using ClassJobPtr = std::shared_ptr< ClassJob >;
      using ClassJobCategoryPtr = std::shared_ptr< ClassJobCategory >;
+     using CollectablesShopPtr = std::shared_ptr< CollectablesShop >;
+     using CollectablesShopItemPtr = std::shared_ptr< CollectablesShopItem >;
+     using CollectablesShopItemGroupPtr = std::shared_ptr< CollectablesShopItemGroup >;
+     using CollectablesShopRefinePtr = std::shared_ptr< CollectablesShopRefine >;
+     using CollectablesShopRewardItemPtr = std::shared_ptr< CollectablesShopRewardItem >;
+     using CollectablesShopRewardScripPtr = std::shared_ptr< CollectablesShopRewardScrip >;
      using CompanionPtr = std::shared_ptr< Companion >;
      using CompanionMovePtr = std::shared_ptr< CompanionMove >;
      using CompanionTransientPtr = std::shared_ptr< CompanionTransient >;
@@ -7779,6 +8335,7 @@ struct ZoneSharedGroup
      using CompanyLeveRulePtr = std::shared_ptr< CompanyLeveRule >;
      using CompleteJournalPtr = std::shared_ptr< CompleteJournal >;
      using CompleteJournalCategoryPtr = std::shared_ptr< CompleteJournalCategory >;
+     using ConditionPtr = std::shared_ptr< Condition >;
      using ConfigKeyPtr = std::shared_ptr< ConfigKey >;
      using ContentCloseCyclePtr = std::shared_ptr< ContentCloseCycle >;
      using ContentExActionPtr = std::shared_ptr< ContentExAction >;
@@ -7844,6 +8401,10 @@ struct ZoneSharedGroup
      using DpsChallengePtr = std::shared_ptr< DpsChallenge >;
      using DpsChallengeOfficerPtr = std::shared_ptr< DpsChallengeOfficer >;
      using DpsChallengeTransientPtr = std::shared_ptr< DpsChallengeTransient >;
+     using DynamicEventPtr = std::shared_ptr< DynamicEvent >;
+     using DynamicEventEnemyTypePtr = std::shared_ptr< DynamicEventEnemyType >;
+     using DynamicEventSingleBattlePtr = std::shared_ptr< DynamicEventSingleBattle >;
+     using DynamicEventTypePtr = std::shared_ptr< DynamicEventType >;
      using EmjAddonPtr = std::shared_ptr< EmjAddon >;
      using EmjDaniPtr = std::shared_ptr< EmjDani >;
      using EmotePtr = std::shared_ptr< Emote >;
@@ -7877,6 +8438,7 @@ struct ZoneSharedGroup
      using ExVersionPtr = std::shared_ptr< ExVersion >;
      using FatePtr = std::shared_ptr< Fate >;
      using FateEventPtr = std::shared_ptr< FateEvent >;
+     using FateModePtr = std::shared_ptr< FateMode >;
      using FateProgressUIPtr = std::shared_ptr< FateProgressUI >;
      using FateTokenTypePtr = std::shared_ptr< FateTokenType >;
      using FCActivityPtr = std::shared_ptr< FCActivity >;
@@ -7916,6 +8478,8 @@ struct ZoneSharedGroup
      using GatheringPointBonusPtr = std::shared_ptr< GatheringPointBonus >;
      using GatheringPointBonusTypePtr = std::shared_ptr< GatheringPointBonusType >;
      using GatheringPointNamePtr = std::shared_ptr< GatheringPointName >;
+     using GatheringPointTransientPtr = std::shared_ptr< GatheringPointTransient >;
+     using GatheringRarePopTimeTablePtr = std::shared_ptr< GatheringRarePopTimeTable >;
      using GatheringSubCategoryPtr = std::shared_ptr< GatheringSubCategory >;
      using GatheringTypePtr = std::shared_ptr< GatheringType >;
      using GcArmyCaptureTacticsPtr = std::shared_ptr< GcArmyCaptureTactics >;
@@ -7952,6 +8516,8 @@ struct ZoneSharedGroup
      using GrandCompanyPtr = std::shared_ptr< GrandCompany >;
      using GrandCompanyRankPtr = std::shared_ptr< GrandCompanyRank >;
      using GroupPoseFramePtr = std::shared_ptr< GroupPoseFrame >;
+     using GroupPoseStampPtr = std::shared_ptr< GroupPoseStamp >;
+     using GroupPoseStampCategoryPtr = std::shared_ptr< GroupPoseStampCategory >;
      using GuardianDeityPtr = std::shared_ptr< GuardianDeity >;
      using GuidePtr = std::shared_ptr< Guide >;
      using GuidePagePtr = std::shared_ptr< GuidePage >;
@@ -7989,6 +8555,9 @@ struct ZoneSharedGroup
      using HWDDevLevelUIPtr = std::shared_ptr< HWDDevLevelUI >;
      using HWDDevLivelyPtr = std::shared_ptr< HWDDevLively >;
      using HWDDevProgressPtr = std::shared_ptr< HWDDevProgress >;
+     using HWDGathereInspectTermPtr = std::shared_ptr< HWDGathereInspectTerm >;
+     using HWDGathererInspectionPtr = std::shared_ptr< HWDGathererInspection >;
+     using HWDGathererInspectionRewardPtr = std::shared_ptr< HWDGathererInspectionReward >;
      using HWDInfoBoardArticlePtr = std::shared_ptr< HWDInfoBoardArticle >;
      using HWDInfoBoardArticleTransientPtr = std::shared_ptr< HWDInfoBoardArticleTransient >;
      using HWDInfoBoardArticleTypePtr = std::shared_ptr< HWDInfoBoardArticleType >;
@@ -8000,6 +8569,9 @@ struct ZoneSharedGroup
      using IKDRoutePtr = std::shared_ptr< IKDRoute >;
      using IKDRouteTablePtr = std::shared_ptr< IKDRouteTable >;
      using IKDSpotPtr = std::shared_ptr< IKDSpot >;
+     using InclusionShopPtr = std::shared_ptr< InclusionShop >;
+     using InclusionShopCategoryPtr = std::shared_ptr< InclusionShopCategory >;
+     using InclusionShopSeriesPtr = std::shared_ptr< InclusionShopSeries >;
      using IndividualWeatherPtr = std::shared_ptr< IndividualWeather >;
      using InstanceContentPtr = std::shared_ptr< InstanceContent >;
      using InstanceContentBuffPtr = std::shared_ptr< InstanceContentBuff >;
@@ -8008,10 +8580,13 @@ struct ZoneSharedGroup
      using InstanceContentTextDataPtr = std::shared_ptr< InstanceContentTextData >;
      using ItemPtr = std::shared_ptr< Item >;
      using ItemActionPtr = std::shared_ptr< ItemAction >;
+     using ItemActionTelepoPtr = std::shared_ptr< ItemActionTelepo >;
+     using ItemBarterCheckPtr = std::shared_ptr< ItemBarterCheck >;
      using ItemFoodPtr = std::shared_ptr< ItemFood >;
      using ItemLevelPtr = std::shared_ptr< ItemLevel >;
      using ItemSearchCategoryPtr = std::shared_ptr< ItemSearchCategory >;
      using ItemSeriesPtr = std::shared_ptr< ItemSeries >;
+     using ItemSortCategoryPtr = std::shared_ptr< ItemSortCategory >;
      using ItemSpecialBonusPtr = std::shared_ptr< ItemSpecialBonus >;
      using ItemUICategoryPtr = std::shared_ptr< ItemUICategory >;
      using JobHudManualPtr = std::shared_ptr< JobHudManual >;
@@ -8077,6 +8652,9 @@ struct ZoneSharedGroup
      using MovieSubtitlePtr = std::shared_ptr< MovieSubtitle >;
      using MovieSubtitle500Ptr = std::shared_ptr< MovieSubtitle500 >;
      using MovieSubtitleVoyagePtr = std::shared_ptr< MovieSubtitleVoyage >;
+     using MYCTemporaryItemPtr = std::shared_ptr< MYCTemporaryItem >;
+     using MYCTemporaryItemUICategoryPtr = std::shared_ptr< MYCTemporaryItemUICategory >;
+     using MYCWarResultNotebookPtr = std::shared_ptr< MYCWarResultNotebook >;
      using NotebookDivisionPtr = std::shared_ptr< NotebookDivision >;
      using NotebookDivisionCategoryPtr = std::shared_ptr< NotebookDivisionCategory >;
      using NotoriousMonsterPtr = std::shared_ptr< NotoriousMonster >;
@@ -8091,6 +8669,7 @@ struct ZoneSharedGroup
      using OrchestrionCategoryPtr = std::shared_ptr< OrchestrionCategory >;
      using OrchestrionPathPtr = std::shared_ptr< OrchestrionPath >;
      using OrchestrionUiparamPtr = std::shared_ptr< OrchestrionUiparam >;
+     using OrnamentPtr = std::shared_ptr< Ornament >;
      using ParamGrowPtr = std::shared_ptr< ParamGrow >;
      using PartyContentPtr = std::shared_ptr< PartyContent >;
      using PartyContentCutscenePtr = std::shared_ptr< PartyContentCutscene >;
@@ -8141,6 +8720,7 @@ struct ZoneSharedGroup
      using RecastNavimeshPtr = std::shared_ptr< RecastNavimesh >;
      using RecipePtr = std::shared_ptr< Recipe >;
      using RecipeLevelTablePtr = std::shared_ptr< RecipeLevelTable >;
+     using RecipeLookupPtr = std::shared_ptr< RecipeLookup >;
      using RecipeNotebookListPtr = std::shared_ptr< RecipeNotebookList >;
      using RecommendContentsPtr = std::shared_ptr< RecommendContents >;
      using RelicPtr = std::shared_ptr< Relic >;
@@ -8154,15 +8734,16 @@ struct ZoneSharedGroup
      using RetainerTaskNormalPtr = std::shared_ptr< RetainerTaskNormal >;
      using RetainerTaskParameterPtr = std::shared_ptr< RetainerTaskParameter >;
      using RetainerTaskRandomPtr = std::shared_ptr< RetainerTaskRandom >;
+     using RideShootingPtr = std::shared_ptr< RideShooting >;
+     using RideShootingTextDataPtr = std::shared_ptr< RideShootingTextData >;
      using RPParameterPtr = std::shared_ptr< RPParameter >;
-     using SalvagePtr = std::shared_ptr< Salvage >;
+     using SatisfactionArbitrationPtr = std::shared_ptr< SatisfactionArbitration >;
      using SatisfactionNpcPtr = std::shared_ptr< SatisfactionNpc >;
      using SatisfactionSupplyPtr = std::shared_ptr< SatisfactionSupply >;
      using SatisfactionSupplyRewardPtr = std::shared_ptr< SatisfactionSupplyReward >;
      using ScenarioTreePtr = std::shared_ptr< ScenarioTree >;
      using ScenarioTreeTipsPtr = std::shared_ptr< ScenarioTreeTips >;
      using ScenarioTreeTipsClassQuestPtr = std::shared_ptr< ScenarioTreeTipsClassQuest >;
-     using ScenarioTreeTipsQuestPtr = std::shared_ptr< ScenarioTreeTipsQuest >;
      using ScenarioTypePtr = std::shared_ptr< ScenarioType >;
      using ScreenImagePtr = std::shared_ptr< ScreenImage >;
      using SecretRecipeBookPtr = std::shared_ptr< SecretRecipeBook >;
@@ -8188,7 +8769,9 @@ struct ZoneSharedGroup
      using SubmarinePartPtr = std::shared_ptr< SubmarinePart >;
      using SubmarineRankPtr = std::shared_ptr< SubmarineRank >;
      using SwitchTalkPtr = std::shared_ptr< SwitchTalk >;
+     using SwitchTalkVariationPtr = std::shared_ptr< SwitchTalkVariation >;
      using TerritoryTypePtr = std::shared_ptr< TerritoryType >;
+     using TerritoryTypeTransientPtr = std::shared_ptr< TerritoryTypeTransient >;
      using TextCommandPtr = std::shared_ptr< TextCommand >;
      using TitlePtr = std::shared_ptr< Title >;
      using TomestonesPtr = std::shared_ptr< Tomestones >;
@@ -8289,7 +8872,6 @@ struct ZoneSharedGroup
      std::set< uint32_t > m_AOZBossIdList;
      std::set< uint32_t > m_AOZContentIdList;
      std::set< uint32_t > m_AOZContentBriefingBNpcIdList;
-     std::set< uint32_t > m_AOZReportIdList;
      std::set< uint32_t > m_AquariumFishIdList;
      std::set< uint32_t > m_AquariumWaterIdList;
      std::set< uint32_t > m_ArrayEventHandlerIdList;
@@ -8332,6 +8914,7 @@ struct ZoneSharedGroup
      std::set< uint32_t > m_ChannelingIdList;
      std::set< uint32_t > m_CharaMakeClassEquipIdList;
      std::set< uint32_t > m_CharaMakeCustomizeIdList;
+     std::set< uint32_t > m_CharaMakeNameIdList;
      std::set< uint32_t > m_CharaMakeTypeIdList;
      std::set< uint32_t > m_ChocoboRaceIdList;
      std::set< uint32_t > m_ChocoboRaceAbilityIdList;
@@ -8347,6 +8930,12 @@ struct ZoneSharedGroup
      std::set< uint32_t > m_CircleActivityIdList;
      std::set< uint32_t > m_ClassJobIdList;
      std::set< uint32_t > m_ClassJobCategoryIdList;
+     std::set< uint32_t > m_CollectablesShopIdList;
+     std::set< uint32_t > m_CollectablesShopItemIdList;
+     std::set< uint32_t > m_CollectablesShopItemGroupIdList;
+     std::set< uint32_t > m_CollectablesShopRefineIdList;
+     std::set< uint32_t > m_CollectablesShopRewardItemIdList;
+     std::set< uint32_t > m_CollectablesShopRewardScripIdList;
      std::set< uint32_t > m_CompanionIdList;
      std::set< uint32_t > m_CompanionMoveIdList;
      std::set< uint32_t > m_CompanionTransientIdList;
@@ -8363,6 +8952,7 @@ struct ZoneSharedGroup
      std::set< uint32_t > m_CompanyLeveRuleIdList;
      std::set< uint32_t > m_CompleteJournalIdList;
      std::set< uint32_t > m_CompleteJournalCategoryIdList;
+     std::set< uint32_t > m_ConditionIdList;
      std::set< uint32_t > m_ConfigKeyIdList;
      std::set< uint32_t > m_ContentCloseCycleIdList;
      std::set< uint32_t > m_ContentExActionIdList;
@@ -8428,6 +9018,10 @@ struct ZoneSharedGroup
      std::set< uint32_t > m_DpsChallengeIdList;
      std::set< uint32_t > m_DpsChallengeOfficerIdList;
      std::set< uint32_t > m_DpsChallengeTransientIdList;
+     std::set< uint32_t > m_DynamicEventIdList;
+     std::set< uint32_t > m_DynamicEventEnemyTypeIdList;
+     std::set< uint32_t > m_DynamicEventSingleBattleIdList;
+     std::set< uint32_t > m_DynamicEventTypeIdList;
      std::set< uint32_t > m_EmjAddonIdList;
      std::set< uint32_t > m_EmjDaniIdList;
      std::set< uint32_t > m_EmoteIdList;
@@ -8461,6 +9055,7 @@ struct ZoneSharedGroup
      std::set< uint32_t > m_ExVersionIdList;
      std::set< uint32_t > m_FateIdList;
      std::set< uint32_t > m_FateEventIdList;
+     std::set< uint32_t > m_FateModeIdList;
      std::set< uint32_t > m_FateProgressUIIdList;
      std::set< uint32_t > m_FateTokenTypeIdList;
      std::set< uint32_t > m_FCActivityIdList;
@@ -8500,6 +9095,8 @@ struct ZoneSharedGroup
      std::set< uint32_t > m_GatheringPointBonusIdList;
      std::set< uint32_t > m_GatheringPointBonusTypeIdList;
      std::set< uint32_t > m_GatheringPointNameIdList;
+     std::set< uint32_t > m_GatheringPointTransientIdList;
+     std::set< uint32_t > m_GatheringRarePopTimeTableIdList;
      std::set< uint32_t > m_GatheringSubCategoryIdList;
      std::set< uint32_t > m_GatheringTypeIdList;
      std::set< uint32_t > m_GcArmyCaptureTacticsIdList;
@@ -8536,6 +9133,8 @@ struct ZoneSharedGroup
      std::set< uint32_t > m_GrandCompanyIdList;
      std::set< uint32_t > m_GrandCompanyRankIdList;
      std::set< uint32_t > m_GroupPoseFrameIdList;
+     std::set< uint32_t > m_GroupPoseStampIdList;
+     std::set< uint32_t > m_GroupPoseStampCategoryIdList;
      std::set< uint32_t > m_GuardianDeityIdList;
      std::set< uint32_t > m_GuideIdList;
      std::set< uint32_t > m_GuidePageIdList;
@@ -8573,6 +9172,9 @@ struct ZoneSharedGroup
      std::set< uint32_t > m_HWDDevLevelUIIdList;
      std::set< uint32_t > m_HWDDevLivelyIdList;
      std::set< uint32_t > m_HWDDevProgressIdList;
+     std::set< uint32_t > m_HWDGathereInspectTermIdList;
+     std::set< uint32_t > m_HWDGathererInspectionIdList;
+     std::set< uint32_t > m_HWDGathererInspectionRewardIdList;
      std::set< uint32_t > m_HWDInfoBoardArticleIdList;
      std::set< uint32_t > m_HWDInfoBoardArticleTransientIdList;
      std::set< uint32_t > m_HWDInfoBoardArticleTypeIdList;
@@ -8584,6 +9186,9 @@ struct ZoneSharedGroup
      std::set< uint32_t > m_IKDRouteIdList;
      std::set< uint32_t > m_IKDRouteTableIdList;
      std::set< uint32_t > m_IKDSpotIdList;
+     std::set< uint32_t > m_InclusionShopIdList;
+     std::set< uint32_t > m_InclusionShopCategoryIdList;
+     std::set< uint32_t > m_InclusionShopSeriesIdList;
      std::set< uint32_t > m_IndividualWeatherIdList;
      std::set< uint32_t > m_InstanceContentIdList;
      std::set< uint32_t > m_InstanceContentBuffIdList;
@@ -8592,10 +9197,13 @@ struct ZoneSharedGroup
      std::set< uint32_t > m_InstanceContentTextDataIdList;
      std::set< uint32_t > m_ItemIdList;
      std::set< uint32_t > m_ItemActionIdList;
+     std::set< uint32_t > m_ItemActionTelepoIdList;
+     std::set< uint32_t > m_ItemBarterCheckIdList;
      std::set< uint32_t > m_ItemFoodIdList;
      std::set< uint32_t > m_ItemLevelIdList;
      std::set< uint32_t > m_ItemSearchCategoryIdList;
      std::set< uint32_t > m_ItemSeriesIdList;
+     std::set< uint32_t > m_ItemSortCategoryIdList;
      std::set< uint32_t > m_ItemSpecialBonusIdList;
      std::set< uint32_t > m_ItemUICategoryIdList;
      std::set< uint32_t > m_JobHudManualIdList;
@@ -8661,6 +9269,9 @@ struct ZoneSharedGroup
      std::set< uint32_t > m_MovieSubtitleIdList;
      std::set< uint32_t > m_MovieSubtitle500IdList;
      std::set< uint32_t > m_MovieSubtitleVoyageIdList;
+     std::set< uint32_t > m_MYCTemporaryItemIdList;
+     std::set< uint32_t > m_MYCTemporaryItemUICategoryIdList;
+     std::set< uint32_t > m_MYCWarResultNotebookIdList;
      std::set< uint32_t > m_NotebookDivisionIdList;
      std::set< uint32_t > m_NotebookDivisionCategoryIdList;
      std::set< uint32_t > m_NotoriousMonsterIdList;
@@ -8675,6 +9286,7 @@ struct ZoneSharedGroup
      std::set< uint32_t > m_OrchestrionCategoryIdList;
      std::set< uint32_t > m_OrchestrionPathIdList;
      std::set< uint32_t > m_OrchestrionUiparamIdList;
+     std::set< uint32_t > m_OrnamentIdList;
      std::set< uint32_t > m_ParamGrowIdList;
      std::set< uint32_t > m_PartyContentIdList;
      std::set< uint32_t > m_PartyContentCutsceneIdList;
@@ -8725,6 +9337,7 @@ struct ZoneSharedGroup
      std::set< uint32_t > m_RecastNavimeshIdList;
      std::set< uint32_t > m_RecipeIdList;
      std::set< uint32_t > m_RecipeLevelTableIdList;
+     std::set< uint32_t > m_RecipeLookupIdList;
      std::set< uint32_t > m_RecipeNotebookListIdList;
      std::set< uint32_t > m_RecommendContentsIdList;
      std::set< uint32_t > m_RelicIdList;
@@ -8738,15 +9351,16 @@ struct ZoneSharedGroup
      std::set< uint32_t > m_RetainerTaskNormalIdList;
      std::set< uint32_t > m_RetainerTaskParameterIdList;
      std::set< uint32_t > m_RetainerTaskRandomIdList;
+     std::set< uint32_t > m_RideShootingIdList;
+     std::set< uint32_t > m_RideShootingTextDataIdList;
      std::set< uint32_t > m_RPParameterIdList;
-     std::set< uint32_t > m_SalvageIdList;
+     std::set< uint32_t > m_SatisfactionArbitrationIdList;
      std::set< uint32_t > m_SatisfactionNpcIdList;
      std::set< uint32_t > m_SatisfactionSupplyIdList;
      std::set< uint32_t > m_SatisfactionSupplyRewardIdList;
      std::set< uint32_t > m_ScenarioTreeIdList;
      std::set< uint32_t > m_ScenarioTreeTipsIdList;
      std::set< uint32_t > m_ScenarioTreeTipsClassQuestIdList;
-     std::set< uint32_t > m_ScenarioTreeTipsQuestIdList;
      std::set< uint32_t > m_ScenarioTypeIdList;
      std::set< uint32_t > m_ScreenImageIdList;
      std::set< uint32_t > m_SecretRecipeBookIdList;
@@ -8772,7 +9386,9 @@ struct ZoneSharedGroup
      std::set< uint32_t > m_SubmarinePartIdList;
      std::set< uint32_t > m_SubmarineRankIdList;
      std::set< uint32_t > m_SwitchTalkIdList;
+     std::set< uint32_t > m_SwitchTalkVariationIdList;
      std::set< uint32_t > m_TerritoryTypeIdList;
+     std::set< uint32_t > m_TerritoryTypeTransientIdList;
      std::set< uint32_t > m_TextCommandIdList;
      std::set< uint32_t > m_TitleIdList;
      std::set< uint32_t > m_TomestonesIdList;
@@ -9123,12 +9739,6 @@ const std::set< uint32_t >& getAOZContentBriefingBNpcIdList()
       loadIdList( m_AOZContentBriefingBNpcDat, m_AOZContentBriefingBNpcIdList );
    return m_AOZContentBriefingBNpcIdList;
 }
-const std::set< uint32_t >& getAOZReportIdList()
-{
-   if( m_AOZReportIdList.size() == 0 )
-      loadIdList( m_AOZReportDat, m_AOZReportIdList );
-   return m_AOZReportIdList;
-}
 const std::set< uint32_t >& getAquariumFishIdList()
 {
    if( m_AquariumFishIdList.size() == 0 )
@@ -9381,6 +9991,12 @@ const std::set< uint32_t >& getCharaMakeCustomizeIdList()
       loadIdList( m_CharaMakeCustomizeDat, m_CharaMakeCustomizeIdList );
    return m_CharaMakeCustomizeIdList;
 }
+const std::set< uint32_t >& getCharaMakeNameIdList()
+{
+   if( m_CharaMakeNameIdList.size() == 0 )
+      loadIdList( m_CharaMakeNameDat, m_CharaMakeNameIdList );
+   return m_CharaMakeNameIdList;
+}
 const std::set< uint32_t >& getCharaMakeTypeIdList()
 {
    if( m_CharaMakeTypeIdList.size() == 0 )
@@ -9471,6 +10087,42 @@ const std::set< uint32_t >& getClassJobCategoryIdList()
       loadIdList( m_ClassJobCategoryDat, m_ClassJobCategoryIdList );
    return m_ClassJobCategoryIdList;
 }
+const std::set< uint32_t >& getCollectablesShopIdList()
+{
+   if( m_CollectablesShopIdList.size() == 0 )
+      loadIdList( m_CollectablesShopDat, m_CollectablesShopIdList );
+   return m_CollectablesShopIdList;
+}
+const std::set< uint32_t >& getCollectablesShopItemIdList()
+{
+   if( m_CollectablesShopItemIdList.size() == 0 )
+      loadIdList( m_CollectablesShopItemDat, m_CollectablesShopItemIdList );
+   return m_CollectablesShopItemIdList;
+}
+const std::set< uint32_t >& getCollectablesShopItemGroupIdList()
+{
+   if( m_CollectablesShopItemGroupIdList.size() == 0 )
+      loadIdList( m_CollectablesShopItemGroupDat, m_CollectablesShopItemGroupIdList );
+   return m_CollectablesShopItemGroupIdList;
+}
+const std::set< uint32_t >& getCollectablesShopRefineIdList()
+{
+   if( m_CollectablesShopRefineIdList.size() == 0 )
+      loadIdList( m_CollectablesShopRefineDat, m_CollectablesShopRefineIdList );
+   return m_CollectablesShopRefineIdList;
+}
+const std::set< uint32_t >& getCollectablesShopRewardItemIdList()
+{
+   if( m_CollectablesShopRewardItemIdList.size() == 0 )
+      loadIdList( m_CollectablesShopRewardItemDat, m_CollectablesShopRewardItemIdList );
+   return m_CollectablesShopRewardItemIdList;
+}
+const std::set< uint32_t >& getCollectablesShopRewardScripIdList()
+{
+   if( m_CollectablesShopRewardScripIdList.size() == 0 )
+      loadIdList( m_CollectablesShopRewardScripDat, m_CollectablesShopRewardScripIdList );
+   return m_CollectablesShopRewardScripIdList;
+}
 const std::set< uint32_t >& getCompanionIdList()
 {
    if( m_CompanionIdList.size() == 0 )
@@ -9567,6 +10219,12 @@ const std::set< uint32_t >& getCompleteJournalCategoryIdList()
       loadIdList( m_CompleteJournalCategoryDat, m_CompleteJournalCategoryIdList );
    return m_CompleteJournalCategoryIdList;
 }
+const std::set< uint32_t >& getConditionIdList()
+{
+   if( m_ConditionIdList.size() == 0 )
+      loadIdList( m_ConditionDat, m_ConditionIdList );
+   return m_ConditionIdList;
+}
 const std::set< uint32_t >& getConfigKeyIdList()
 {
    if( m_ConfigKeyIdList.size() == 0 )
@@ -9957,6 +10615,30 @@ const std::set< uint32_t >& getDpsChallengeTransientIdList()
       loadIdList( m_DpsChallengeTransientDat, m_DpsChallengeTransientIdList );
    return m_DpsChallengeTransientIdList;
 }
+const std::set< uint32_t >& getDynamicEventIdList()
+{
+   if( m_DynamicEventIdList.size() == 0 )
+      loadIdList( m_DynamicEventDat, m_DynamicEventIdList );
+   return m_DynamicEventIdList;
+}
+const std::set< uint32_t >& getDynamicEventEnemyTypeIdList()
+{
+   if( m_DynamicEventEnemyTypeIdList.size() == 0 )
+      loadIdList( m_DynamicEventEnemyTypeDat, m_DynamicEventEnemyTypeIdList );
+   return m_DynamicEventEnemyTypeIdList;
+}
+const std::set< uint32_t >& getDynamicEventSingleBattleIdList()
+{
+   if( m_DynamicEventSingleBattleIdList.size() == 0 )
+      loadIdList( m_DynamicEventSingleBattleDat, m_DynamicEventSingleBattleIdList );
+   return m_DynamicEventSingleBattleIdList;
+}
+const std::set< uint32_t >& getDynamicEventTypeIdList()
+{
+   if( m_DynamicEventTypeIdList.size() == 0 )
+      loadIdList( m_DynamicEventTypeDat, m_DynamicEventTypeIdList );
+   return m_DynamicEventTypeIdList;
+}
 const std::set< uint32_t >& getEmjAddonIdList()
 {
    if( m_EmjAddonIdList.size() == 0 )
@@ -10155,6 +10837,12 @@ const std::set< uint32_t >& getFateEventIdList()
       loadIdList( m_FateEventDat, m_FateEventIdList );
    return m_FateEventIdList;
 }
+const std::set< uint32_t >& getFateModeIdList()
+{
+   if( m_FateModeIdList.size() == 0 )
+      loadIdList( m_FateModeDat, m_FateModeIdList );
+   return m_FateModeIdList;
+}
 const std::set< uint32_t >& getFateProgressUIIdList()
 {
    if( m_FateProgressUIIdList.size() == 0 )
@@ -10389,6 +11077,18 @@ const std::set< uint32_t >& getGatheringPointNameIdList()
       loadIdList( m_GatheringPointNameDat, m_GatheringPointNameIdList );
    return m_GatheringPointNameIdList;
 }
+const std::set< uint32_t >& getGatheringPointTransientIdList()
+{
+   if( m_GatheringPointTransientIdList.size() == 0 )
+      loadIdList( m_GatheringPointTransientDat, m_GatheringPointTransientIdList );
+   return m_GatheringPointTransientIdList;
+}
+const std::set< uint32_t >& getGatheringRarePopTimeTableIdList()
+{
+   if( m_GatheringRarePopTimeTableIdList.size() == 0 )
+      loadIdList( m_GatheringRarePopTimeTableDat, m_GatheringRarePopTimeTableIdList );
+   return m_GatheringRarePopTimeTableIdList;
+}
 const std::set< uint32_t >& getGatheringSubCategoryIdList()
 {
    if( m_GatheringSubCategoryIdList.size() == 0 )
@@ -10605,6 +11305,18 @@ const std::set< uint32_t >& getGroupPoseFrameIdList()
       loadIdList( m_GroupPoseFrameDat, m_GroupPoseFrameIdList );
    return m_GroupPoseFrameIdList;
 }
+const std::set< uint32_t >& getGroupPoseStampIdList()
+{
+   if( m_GroupPoseStampIdList.size() == 0 )
+      loadIdList( m_GroupPoseStampDat, m_GroupPoseStampIdList );
+   return m_GroupPoseStampIdList;
+}
+const std::set< uint32_t >& getGroupPoseStampCategoryIdList()
+{
+   if( m_GroupPoseStampCategoryIdList.size() == 0 )
+      loadIdList( m_GroupPoseStampCategoryDat, m_GroupPoseStampCategoryIdList );
+   return m_GroupPoseStampCategoryIdList;
+}
 const std::set< uint32_t >& getGuardianDeityIdList()
 {
    if( m_GuardianDeityIdList.size() == 0 )
@@ -10827,6 +11539,24 @@ const std::set< uint32_t >& getHWDDevProgressIdList()
       loadIdList( m_HWDDevProgressDat, m_HWDDevProgressIdList );
    return m_HWDDevProgressIdList;
 }
+const std::set< uint32_t >& getHWDGathereInspectTermIdList()
+{
+   if( m_HWDGathereInspectTermIdList.size() == 0 )
+      loadIdList( m_HWDGathereInspectTermDat, m_HWDGathereInspectTermIdList );
+   return m_HWDGathereInspectTermIdList;
+}
+const std::set< uint32_t >& getHWDGathererInspectionIdList()
+{
+   if( m_HWDGathererInspectionIdList.size() == 0 )
+      loadIdList( m_HWDGathererInspectionDat, m_HWDGathererInspectionIdList );
+   return m_HWDGathererInspectionIdList;
+}
+const std::set< uint32_t >& getHWDGathererInspectionRewardIdList()
+{
+   if( m_HWDGathererInspectionRewardIdList.size() == 0 )
+      loadIdList( m_HWDGathererInspectionRewardDat, m_HWDGathererInspectionRewardIdList );
+   return m_HWDGathererInspectionRewardIdList;
+}
 const std::set< uint32_t >& getHWDInfoBoardArticleIdList()
 {
    if( m_HWDInfoBoardArticleIdList.size() == 0 )
@@ -10893,6 +11623,24 @@ const std::set< uint32_t >& getIKDSpotIdList()
       loadIdList( m_IKDSpotDat, m_IKDSpotIdList );
    return m_IKDSpotIdList;
 }
+const std::set< uint32_t >& getInclusionShopIdList()
+{
+   if( m_InclusionShopIdList.size() == 0 )
+      loadIdList( m_InclusionShopDat, m_InclusionShopIdList );
+   return m_InclusionShopIdList;
+}
+const std::set< uint32_t >& getInclusionShopCategoryIdList()
+{
+   if( m_InclusionShopCategoryIdList.size() == 0 )
+      loadIdList( m_InclusionShopCategoryDat, m_InclusionShopCategoryIdList );
+   return m_InclusionShopCategoryIdList;
+}
+const std::set< uint32_t >& getInclusionShopSeriesIdList()
+{
+   if( m_InclusionShopSeriesIdList.size() == 0 )
+      loadIdList( m_InclusionShopSeriesDat, m_InclusionShopSeriesIdList );
+   return m_InclusionShopSeriesIdList;
+}
 const std::set< uint32_t >& getIndividualWeatherIdList()
 {
    if( m_IndividualWeatherIdList.size() == 0 )
@@ -10941,6 +11689,18 @@ const std::set< uint32_t >& getItemActionIdList()
       loadIdList( m_ItemActionDat, m_ItemActionIdList );
    return m_ItemActionIdList;
 }
+const std::set< uint32_t >& getItemActionTelepoIdList()
+{
+   if( m_ItemActionTelepoIdList.size() == 0 )
+      loadIdList( m_ItemActionTelepoDat, m_ItemActionTelepoIdList );
+   return m_ItemActionTelepoIdList;
+}
+const std::set< uint32_t >& getItemBarterCheckIdList()
+{
+   if( m_ItemBarterCheckIdList.size() == 0 )
+      loadIdList( m_ItemBarterCheckDat, m_ItemBarterCheckIdList );
+   return m_ItemBarterCheckIdList;
+}
 const std::set< uint32_t >& getItemFoodIdList()
 {
    if( m_ItemFoodIdList.size() == 0 )
@@ -10965,6 +11725,12 @@ const std::set< uint32_t >& getItemSeriesIdList()
       loadIdList( m_ItemSeriesDat, m_ItemSeriesIdList );
    return m_ItemSeriesIdList;
 }
+const std::set< uint32_t >& getItemSortCategoryIdList()
+{
+   if( m_ItemSortCategoryIdList.size() == 0 )
+      loadIdList( m_ItemSortCategoryDat, m_ItemSortCategoryIdList );
+   return m_ItemSortCategoryIdList;
+}
 const std::set< uint32_t >& getItemSpecialBonusIdList()
 {
    if( m_ItemSpecialBonusIdList.size() == 0 )
@@ -11355,6 +12121,24 @@ const std::set< uint32_t >& getMovieSubtitleVoyageIdList()
       loadIdList( m_MovieSubtitleVoyageDat, m_MovieSubtitleVoyageIdList );
    return m_MovieSubtitleVoyageIdList;
 }
+const std::set< uint32_t >& getMYCTemporaryItemIdList()
+{
+   if( m_MYCTemporaryItemIdList.size() == 0 )
+      loadIdList( m_MYCTemporaryItemDat, m_MYCTemporaryItemIdList );
+   return m_MYCTemporaryItemIdList;
+}
+const std::set< uint32_t >& getMYCTemporaryItemUICategoryIdList()
+{
+   if( m_MYCTemporaryItemUICategoryIdList.size() == 0 )
+      loadIdList( m_MYCTemporaryItemUICategoryDat, m_MYCTemporaryItemUICategoryIdList );
+   return m_MYCTemporaryItemUICategoryIdList;
+}
+const std::set< uint32_t >& getMYCWarResultNotebookIdList()
+{
+   if( m_MYCWarResultNotebookIdList.size() == 0 )
+      loadIdList( m_MYCWarResultNotebookDat, m_MYCWarResultNotebookIdList );
+   return m_MYCWarResultNotebookIdList;
+}
 const std::set< uint32_t >& getNotebookDivisionIdList()
 {
    if( m_NotebookDivisionIdList.size() == 0 )
@@ -11439,6 +12223,12 @@ const std::set< uint32_t >& getOrchestrionUiparamIdList()
       loadIdList( m_OrchestrionUiparamDat, m_OrchestrionUiparamIdList );
    return m_OrchestrionUiparamIdList;
 }
+const std::set< uint32_t >& getOrnamentIdList()
+{
+   if( m_OrnamentIdList.size() == 0 )
+      loadIdList( m_OrnamentDat, m_OrnamentIdList );
+   return m_OrnamentIdList;
+}
 const std::set< uint32_t >& getParamGrowIdList()
 {
    if( m_ParamGrowIdList.size() == 0 )
@@ -11739,6 +12529,12 @@ const std::set< uint32_t >& getRecipeLevelTableIdList()
       loadIdList( m_RecipeLevelTableDat, m_RecipeLevelTableIdList );
    return m_RecipeLevelTableIdList;
 }
+const std::set< uint32_t >& getRecipeLookupIdList()
+{
+   if( m_RecipeLookupIdList.size() == 0 )
+      loadIdList( m_RecipeLookupDat, m_RecipeLookupIdList );
+   return m_RecipeLookupIdList;
+}
 const std::set< uint32_t >& getRecipeNotebookListIdList()
 {
    if( m_RecipeNotebookListIdList.size() == 0 )
@@ -11817,17 +12613,29 @@ const std::set< uint32_t >& getRetainerTaskRandomIdList()
       loadIdList( m_RetainerTaskRandomDat, m_RetainerTaskRandomIdList );
    return m_RetainerTaskRandomIdList;
 }
+const std::set< uint32_t >& getRideShootingIdList()
+{
+   if( m_RideShootingIdList.size() == 0 )
+      loadIdList( m_RideShootingDat, m_RideShootingIdList );
+   return m_RideShootingIdList;
+}
+const std::set< uint32_t >& getRideShootingTextDataIdList()
+{
+   if( m_RideShootingTextDataIdList.size() == 0 )
+      loadIdList( m_RideShootingTextDataDat, m_RideShootingTextDataIdList );
+   return m_RideShootingTextDataIdList;
+}
 const std::set< uint32_t >& getRPParameterIdList()
 {
    if( m_RPParameterIdList.size() == 0 )
       loadIdList( m_RPParameterDat, m_RPParameterIdList );
    return m_RPParameterIdList;
 }
-const std::set< uint32_t >& getSalvageIdList()
+const std::set< uint32_t >& getSatisfactionArbitrationIdList()
 {
-   if( m_SalvageIdList.size() == 0 )
-      loadIdList( m_SalvageDat, m_SalvageIdList );
-   return m_SalvageIdList;
+   if( m_SatisfactionArbitrationIdList.size() == 0 )
+      loadIdList( m_SatisfactionArbitrationDat, m_SatisfactionArbitrationIdList );
+   return m_SatisfactionArbitrationIdList;
 }
 const std::set< uint32_t >& getSatisfactionNpcIdList()
 {
@@ -11865,12 +12673,6 @@ const std::set< uint32_t >& getScenarioTreeTipsClassQuestIdList()
       loadIdList( m_ScenarioTreeTipsClassQuestDat, m_ScenarioTreeTipsClassQuestIdList );
    return m_ScenarioTreeTipsClassQuestIdList;
 }
-const std::set< uint32_t >& getScenarioTreeTipsQuestIdList()
-{
-   if( m_ScenarioTreeTipsQuestIdList.size() == 0 )
-      loadIdList( m_ScenarioTreeTipsQuestDat, m_ScenarioTreeTipsQuestIdList );
-   return m_ScenarioTreeTipsQuestIdList;
-}
 const std::set< uint32_t >& getScenarioTypeIdList()
 {
    if( m_ScenarioTypeIdList.size() == 0 )
@@ -12021,12 +12823,24 @@ const std::set< uint32_t >& getSwitchTalkIdList()
       loadIdList( m_SwitchTalkDat, m_SwitchTalkIdList );
    return m_SwitchTalkIdList;
 }
+const std::set< uint32_t >& getSwitchTalkVariationIdList()
+{
+   if( m_SwitchTalkVariationIdList.size() == 0 )
+      loadIdList( m_SwitchTalkVariationDat, m_SwitchTalkVariationIdList );
+   return m_SwitchTalkVariationIdList;
+}
 const std::set< uint32_t >& getTerritoryTypeIdList()
 {
    if( m_TerritoryTypeIdList.size() == 0 )
       loadIdList( m_TerritoryTypeDat, m_TerritoryTypeIdList );
    return m_TerritoryTypeIdList;
 }
+const std::set< uint32_t >& getTerritoryTypeTransientIdList()
+{
+   if( m_TerritoryTypeTransientIdList.size() == 0 )
+      loadIdList( m_TerritoryTypeTransientDat, m_TerritoryTypeTransientIdList );
+   return m_TerritoryTypeTransientIdList;
+}
 const std::set< uint32_t >& getTextCommandIdList()
 {
    if( m_TextCommandIdList.size() == 0 )
@@ -12320,7 +13134,6 @@ const std::set< uint32_t >& getZoneSharedGroupIdList()
   };
 
 }
-}
 
 #endif
 

From 0ec4c4e4fd883f408496ff910c063d4d7333f097 Mon Sep 17 00:00:00 2001
From: collett <collett0301@gmail.com>
Date: Wed, 11 Nov 2020 02:07:59 +0900
Subject: [PATCH 348/351] 5.35 updates

---
 src/common/Common.h                           |  10 +-
 src/common/Network/CommonActorControl.h       |   4 +-
 src/common/Network/PacketDef/Ipcs.h           | 288 +++++++++---------
 .../Network/PacketDef/Zone/ClientZoneDef.h    |  62 ++++
 .../Network/PacketDef/Zone/ServerZoneDef.h    | 127 +++++++-
 src/world/Actor/Player.cpp                    |  31 +-
 6 files changed, 358 insertions(+), 164 deletions(-)

diff --git a/src/common/Common.h b/src/common/Common.h
index 9c3b9bd3..d8e7618c 100644
--- a/src/common/Common.h
+++ b/src/common/Common.h
@@ -51,11 +51,11 @@ namespace Sapphire::Common
 
   enum InventoryOperation : uint16_t
   {
-    Discard = 0x0180,
-    Move = 0x0181,
-    Swap = 0x0182,
-    Split = 0x0183,
-    Merge = 0x0185,
+    Discard = 0x013C,
+    Move = 0x013D,
+    Swap = 0x013E,
+    Split = 0x013F,
+    Merge = 0x0141,
   };
 
   enum ClientLanguage : uint8_t
diff --git a/src/common/Network/CommonActorControl.h b/src/common/Network/CommonActorControl.h
index 2a74cba4..fbeea52f 100644
--- a/src/common/Network/CommonActorControl.h
+++ b/src/common/Network/CommonActorControl.h
@@ -271,9 +271,9 @@ namespace Sapphire::Network::ActorControl
     * Retail sends 12 for mount speed star 1 unlocked and 15 for mount speed star 2 unlocked
     * This also has to be sent before mounting finishes for it to take effect
     */
-    SetMountSpeed = 0x39F,
+    SetMountSpeed = 0x3A0, // updated 5.35 hotfix
 
-    Dismount = 0x3A1, // updated 4.5
+    Dismount = 0x3A2, // updated 5.35 hotfix
 
     // Duty Recorder
     BeginReplayAck = 0x3A2,
diff --git a/src/common/Network/PacketDef/Ipcs.h b/src/common/Network/PacketDef/Ipcs.h
index b188abeb..0c3f8cb1 100644
--- a/src/common/Network/PacketDef/Ipcs.h
+++ b/src/common/Network/PacketDef/Ipcs.h
@@ -43,78 +43,81 @@ namespace Sapphire::Network::Packets
   */
   enum ServerZoneIpcType : uint16_t
   {
-    Ping = 0x017A, // updated 5.25
-    Init = 0x03B9, // updated 5.25
+    Ping = 0x0219, // updated 5.35 hotfix
+    Init = 0x0185, // updated 5.35 hotfix
 
-    ActorFreeSpawn = 0x022F, // updated 5.3
-    InitZone = 0x0388, // updated 5.3
+    ActorFreeSpawn = 0x0239, // updated 5.35 hotfix
+    InitZone = 0x03CD, // updated 5.35 hotfix
 
-    EffectResult = 0x0346, // updated 5.3
-    ActorControl = 0x0344, // updated 5.3
-    ActorControlSelf = 0x0212, // updated 5.3
-    ActorControlTarget = 0x01EB, // updated 5.25
+    EffectResult = 0x01C2, // updated 5.35 hotfix
+    ActorControl = 0x02A4, // updated 5.35 hotfix
+    ActorControlSelf = 0x02C8, // updated 5.35 hotfix
+    ActorControlTarget = 0x0209, // updated 5.35 hotfix
 
     /*!
      * @brief Used when resting
      */
-    UpdateHpMpTp = 0x00F8, // updated 5.25
+    UpdateHpMpTp = 0x0319, // updated 5.35 hotfix
 
     ///////////////////////////////////////////////////
 
     ChatBanned = 0xF06B,
-    Playtime = 0x0207, // updated 5.3
-    Logout = 0x00CD, // updated 5.25
-    CFNotify = 0x00FD, // updated 5.3
+    Playtime = 0x03A4, // updated 5.35 hotfix
+    Logout = 0x02AD, // updated 5.35 hotfix
+    CFNotify = 0x02C4, // updated 5.35 hotfix
     CFMemberStatus = 0x0079,
     CFDutyInfo = 0x007A,
     CFPlayerInNeed = 0xF07F,
-    CFPreferredRole = 0x013C, // updated 5.3
-    CFCancel = 0x00B7, // updated 5.25
+    CFPreferredRole = 0x0196, // updated 5.35 hotfix
+    CFCancel = 0x00EC, // updated 5.35 hotfix
     SocialRequestError = 0xF0AD,
 
-    CFRegistered = 0x00B8, // updated 4.1
-    SocialRequestResponse = 0x00BB, // updated 4.1
+    CFRegistered = 0x010C, // updated 5.35 hotfix
+    SocialRequestResponse = 0x01C7, // updated 5.35 hotfix
+    SocialMessage = 0x0308, // updated 5.35 hotfix
+    SocialMessage2 = 0x037C, // updated 5.35 hotfix
     CancelAllianceForming = 0x00C6, // updated 4.2
 
     LogMessage = 0x00D0,
 
-    Chat = 0x0161, // updated 5.25
+    Chat = 0x0349, // updated 5.35 hotfix
+    PartyChat = 0x0065,
 
     WorldVisitList = 0xF0FE, // added 4.5
 
-    SocialList = 0x0269, // updated 5.25
+    SocialList = 0x0216, // updated 5.35 hotfix
 
-    ExamineSearchInfo = 0x03A1, // updated 5.3
-    UpdateSearchInfo = 0x009E, // updated 5.3
-    InitSearchInfo = 0x0347, // updated 5.25
+    ExamineSearchInfo = 0x03C3, // updated 5.35 hotfix
+    UpdateSearchInfo = 0x0121, // updated 5.35 hotfix
+    InitSearchInfo = 0x036F, // updated 5.35 hotfix
     ExamineSearchComment = 0x0102, // updated 4.1
 
     ServerNoticeShort = 0x0115, // updated 5.0
-    ServerNotice = 0x00E9, // updated 5.25
-    SetOnlineStatus = 0x0381, // updated 5.25
+    ServerNotice = 0x02F8, // updated 5.35 hotfix
+    SetOnlineStatus = 0x03D7, // updated 5.35 hotfix
 
     CountdownInitiate = 0x0237, // updated 5.25
     CountdownCancel = 0x00D9, // updated 5.18
 
     PlayerAddedToBlacklist = 0x033F, // updated 5.1
     PlayerRemovedFromBlacklist = 0x0385, // updated 5.1
-    BlackList = 0x027A, // updated 5.25
+    BlackList = 0x02DB, // updated 5.35 hotfix
 
-    LinkshellList = 0x00A9, // updated 5.25
+    LinkshellList = 0x01F0, // updated 5.35 hotfix
 
     MailDeleteRequest = 0xF12B, // updated 5.0
 
     // 12D - 137 - constant gap between 4.5x -> 5.0
-    ReqMoogleMailList = 0x0138, // updated 5.0
-    ReqMoogleMailLetter = 0x0139, // updated 5.0
+    ReqMoogleMailList = 0xF138, // updated 5.0
+    ReqMoogleMailLetter = 0xF139, // updated 5.0
     MailLetterNotification = 0x013A, // updated 5.0
 
-    MarketTaxRates = 0x00C6, // updated 5.3
+    MarketTaxRates = 0x01F8, // updated 5.35 hotfix
 
-    MarketBoardSearchResult = 0x00C0, // updated 5.3
-    MarketBoardItemListingCount = 0x016C, // updated 5.3
-    MarketBoardItemListingHistory = 0x03BB, // updated 5.3
-    MarketBoardItemListing = 0x0233, // updated 5.3
+    MarketBoardSearchResult = 0x032C, // updated 5.35 hotfix
+    MarketBoardItemListingCount = 0x038F, // updated 5.35 hotfix
+    MarketBoardItemListingHistory = 0x0186, // updated 5.35 hotfix
+    MarketBoardItemListing = 0x025F, // updated 5.35 hotfix
     
     CharaFreeCompanyTag = 0x013B, // updated 4.5
     FreeCompanyBoardMsg = 0x013C, // updated 4.5
@@ -123,96 +126,97 @@ namespace Sapphire::Network::Packets
 
     FreeCompanyUpdateShortMessage = 0xF157, // added 5.0
 
-    StatusEffectList = 0x0172, // updated 5.3
+    StatusEffectList = 0x0382, // updated 5.35 hotfix
     EurekaStatusEffectList = 0x0167, // updated 5.18
     BossStatusEffectList = 0x0312, // added 5.1
-    Effect = 0x00F4, // updated 5.3
-    AoeEffect8 = 0x00C9, // updated 5.3
+    Effect = 0x0192, // updated 5.35 hotfix
+    AoeEffect8 = 0x012C, // updated 5.35 hotfix
     AoeEffect16 = 0x03BF, // updated 5.3
     AoeEffect24 = 0x027E, // updated 5.3
     AoeEffect32 = 0x017E, // updated 5.3
-    PersistantEffect = 0x032E, // updated 5.25
+    PersistantEffect = 0x0317, // updated 5.35 hotfix
 
     GCAffiliation = 0xF16F, // updated 5.0
 
-    PlayerSpawn = 0x038E, // updated 5.3
-    NpcSpawn = 0x0083, // updated 5.3
+    PlayerSpawn = 0x0179, // updated 5.35 hotfix
+    NpcSpawn = 0x03A8, // updated 5.35 hotfix
     NpcSpawn2 = 0x01CB, // ( Bigger statuseffectlist? ) updated 5.3
-    ActorMove = 0x0352, // updated 5.3
+    ActorMove = 0x01BF, // updated 5.35 hotfix
 
-    ActorSetPos = 0x02A5, // updated 5.3
+    ActorSetPos = 0x03DF, // updated 5.35 hotfix
 
-    ActorCast = 0x00E7, // updated 5.3
+    ActorCast = 0x0302, // updated 5.35 hotfix
     SomeCustomiseChangePacketProbably = 0x00CD, // added 5.18
 
-    PartyList = 0x0287, // updated 5.18
-    HateRank = 0x012E, // updated 5.25
-    HateList = 0x02C4, // updated 5.25
-    ObjectSpawn = 0x01A0, // updated 5.3
-    ObjectDespawn = 0x034B, // updated 5.18
-    UpdateClassInfo = 0x039A, // updated 5.3
+    PartyList = 0x02B2, // updated 5.35 hotfix
+    PartyMessage = 0x00AE, // updated 5.35 hotfix
+    HateRank = 0x02CC, // updated 5.35 hotfix
+    HateList = 0x0198, // updated 5.35 hotfix
+    ObjectSpawn = 0x02B8, // updated 5.35 hotfix
+    ObjectDespawn = 0xF34B, // updated 5.18
+    UpdateClassInfo = 0x0235, // updated 5.35 hotfix
     SilentSetClassJob = 0x018E, // updated 5.0 - seems to be the case, not sure if it's actually used for anything
-    PlayerSetup = 0x00D4, // updated 5.3
-    PlayerStats = 0x3D8, // updated 5.3
-    ActorOwner = 0x0149, // updated 5.25
-    PlayerStateFlags = 0x0125, // updated 5.25
-    PlayerClassInfo = 0x034F, // updated 5.25
-    CharaVisualEffect = 0x0258, // updated 5.25
+    PlayerSetup = 0x0290, // updated 5.35 hotfix
+    PlayerStats = 0x023B, // updated 5.35 hotfix
+    ActorOwner = 0x00E8, // updated 5.35 hotfix
+    PlayerStateFlags = 0x00F8, // updated 5.35 hotfix
+    PlayerClassInfo = 0x02C3, // updated 5.35 hotfix
+    CharaVisualEffect = 0x02E2, // updated 5.35 hotfix
 
-    ModelEquip = 0x01E5, // updated 5.25
-    Examine = 0x03C4, // updated 5.3
-    CharaNameReq = 0x0127, // updated 5.3
+    ModelEquip = 0x0277, // updated 5.35 hotfix
+    Examine = 0x00BC, // updated 5.35 hotfix
+    CharaNameReq = 0x008E, // updated 5.35 hotfix
 
     // nb: see #565 on github
-    UpdateRetainerItemSalePrice = 0x019F, // updated 5.0
+    UpdateRetainerItemSalePrice = 0xF19F, // updated 5.0
     RetainerSaleHistory = 0x020E, // updated 5.21 hotfix
-    RetainerInformation = 0x02B0, // updated 5.3
+    RetainerInformation = 0x01F9, // updated 5.35 hotfix
 
     SetLevelSync = 0x1186, // not updated for 4.4, not sure what it is anymore
 
-    ItemInfo = 0x02A4, // updated 5.3
-    ContainerInfo = 0x02A8, // updated 5.25
-    InventoryTransactionFinish = 0x0193, // updated 5.25
-    InventoryTransaction = 0x00C5, // updated 5.3
-    CurrencyCrystalInfo = 0x00D7, // updated 5.3
+    ItemInfo = 0x0214, // updated 5.35 hotfix
+    ContainerInfo = 0x00C5, // updated 5.35 hotfix
+    InventoryTransactionFinish = 0x02F0, // updated 5.35 hotfix
+    InventoryTransaction = 0x01FD, // updated 5.35 hotfix
+    CurrencyCrystalInfo = 0x0379, // updated 5.35 hotfix
 
-    InventoryActionAck = 0x01AE, // updated 5.25
-    UpdateInventorySlot = 0x036A, // updated 5.3
+    InventoryActionAck = 0x03E4, // updated 5.35 hotfix
+    UpdateInventorySlot = 0x036A, // updated 5.35 hotfix
 
-    HuntingLogEntry = 0xF1B3, // updated 5.0
+    HuntingLogEntry = 0x0146, // updated 5.35 hotfix
 
-    EventPlay = 0x0379, // updated 5.3
-    EventPlay4 = 0x030B, // updated 5.3
-    EventPlay8 = 0x014C,   // updated 5.25
-    EventPlay16 = 0x0074,   // updated 5.25
-    EventPlay32 = 0x02D9,  // updated 5.25
-    EventPlay64 = 0x0388,  // updated 5.25
-    EventPlay128 = 0x03A4, // updated 5.25
-    EventPlay255 = 0x01AC, // updated 5.25
+    EventPlay = 0x00F3, // updated 5.35 hotfix
+    EventPlay4 = 0x00AC, // updated 5.35 hotfix
+    EventPlay8 = 0x023F, // updated 5.35 hotfix
+    EventPlay16 = 0x025B, // updated 5.35 hotfix
+    EventPlay32 = 0x029A, // updated 5.35 hotfix
+    EventPlay64 = 0x02C1, // updated 5.35 hotfix
+    EventPlay128 = 0x038A, // updated 5.35 hotfix
+    EventPlay255 = 0x034B, // updated 5.35 hotfix
 
-    EventStart = 0x020D, // updated 5.3
-    EventFinish = 0x00DF, // updated 5.3
+    EventStart = 0x009A, // updated 5.35 hotfix
+    EventFinish = 0x007E, // updated 5.35 hotfix
 
     EventLinkshell = 0x1169,
 
-    QuestActiveList = 0x0391, // updated 5.25
-    QuestUpdate = 0x0352, // updated 5.25
-    QuestCompleteList = 0x0231, // updated 5.25
+    QuestActiveList = 0x0117, // updated 5.35 hotfix
+    QuestUpdate = 0x0073, // updated 5.35 hotfix
+    QuestCompleteList = 0x0240, // updated 5.35 hotfix
 
-    QuestFinish = 0x02B6, // updated 5.25
-    MSQTrackerComplete = 0x01D6, // updated 5.0
+    QuestFinish = 0x00E9, // updated 5.35 hotfix
+    MSQTrackerComplete = 0xF1D6, // updated 5.0
     MSQTrackerProgress = 0xF1CD, // updated 4.5 ? this actually looks like the two opcodes have been combined, see #474
 
-    QuestMessage = 0x0093, // updated 5.25
+    QuestMessage = 0x0381, // updated 5.35 hotfix
 
-    QuestTracker = 0x00AD, // updated 5.25
+    QuestTracker = 0x018B, // updated 5.35 hotfix
 
-    Mount = 0x02BE, // updated 5.25
+    Mount = 0x01B5, // updated 5.35 hotfix
 
     DirectorVars = 0x00E6, // updated 5.18
     SomeDirectorUnk1 = 0x0084, // updated 5.18
     SomeDirectorUnk2 = 0xF0C1, // updated 5.18
-    SomeDirectorUnk4 = 0x01DF, // updated 5.3
+    SomeDirectorUnk4 = 0x0202, // updated 5.35 hotfix
     SomeDirectorUnk8 = 0x028A, // updated 5.18
     SomeDirectorUnk16 = 0x028C, // updated 5.18
     DirectorPopUp = 0xF162, // updated 5.18 - display dialogue pop-ups in duties and FATEs, for example, Teraflare's countdown
@@ -221,35 +225,37 @@ namespace Sapphire::Network::Packets
 
     CFAvailableContents = 0xF1FD, // updated 4.2
 
-    WeatherChange = 0x03D6, // updated 5.3
+    WeatherChange = 0x027B, // updated 5.35 hotfix
     PlayerTitleList = 0x037D, // updated 5.1
-    Discovery = 0x0173, // updated 5.25
+    Discovery = 0x031B, // updated 5.35 hotfix
 
-    EorzeaTimeOffset = 0x03B8, // updated 5.1
+    EorzeaTimeOffset = 0xF3B8, // updated 5.1
 
-    EquipDisplayFlags = 0x010D, // updated 5.25
+    EquipDisplayFlags = 0x00BE, // updated 5.35 hotfix
 
     MiniCactpotInit = 0x0286, // added 5.31
+    ShopMessage = 0x0197, // updated 5.35 hotfix
+    LootMessage = 0x01B7, // updated 5.35 hotfix
 
     /// Housing //////////////////////////////////////
 
     LandSetInitialize = 0x0234, // updated 5.0
     LandUpdate = 0x0235, // updated 5.0
-    YardObjectSpawn = 0x0236, // updated 5.0
+    YardObjectSpawn = 0xF236, // updated 5.0
     HousingIndoorInitialize = 0x0237, // updated 5.0
     LandPriceUpdate = 0x0238, // updated 5.0
-    LandInfoSign = 0x037F, // updated 5.25
+    LandInfoSign = 0x023D, // updated 5.35 hotfix
     LandRename = 0x023A, // updated 5.0
     HousingEstateGreeting = 0x023B, // updated 5.0
     HousingUpdateLandFlagsSlot = 0x023C, // updated 5.0
-    HousingLandFlags = 0x0177, // updated 5.25
+    HousingLandFlags = 0x022F, // updated 5.35 hotfix
     HousingShowEstateGuestAccess = 0x023E, // updated 5.0
 
-    HousingObjectInitialize = 0x0333, // updated 5.25
-    HousingInternalObjectSpawn = 0x241, // updated 5.0
+    HousingObjectInitialize = 0x01AA, // updated 5.35 hotfix
+    HousingInternalObjectSpawn = 0xF241, // updated 5.0
 
-    HousingWardInfo = 0x01D1, // updated 5.25
-    HousingObjectMove = 0x0244, // updated 5.0
+    HousingWardInfo = 0x02FD, // updated 5.35 hotfix
+    HousingObjectMove = 0xF244, // updated 5.0
 
     SharedEstateSettingsResponse = 0x0245, // updated 4.5
 
@@ -262,12 +268,12 @@ namespace Sapphire::Network::Packets
     DuelChallenge = 0x0277, // 4.2; this is responsible for opening the ui
     PerformNote = 0x0286, // updated 4.3
 
-    PrepareZoning = 0x00F9, // updated 5.3
-    ActorGauge = 0x020F, // updated 5.3
+    PrepareZoning = 0x026C, // updated 5.35 hotfix
+    ActorGauge = 0x0112, // updated 5.35 hotfix
 
     // daily quest info -> without them sent,  login will take longer...
-    DailyQuests = 0x031E, // updated 5.25
-    DailyQuestRepeatFlags = 0x00A7, // updated 5.25
+    DailyQuests = 0x0139, // updated 5.35 hotfix
+    DailyQuestRepeatFlags = 0x024C, // updated 5.35 hotfix
 
     /// Doman Mahjong //////////////////////////////////////
     MahjongOpenGui = 0x02A4, // only available in mahjong instance
@@ -287,37 +293,43 @@ namespace Sapphire::Network::Packets
   */
   enum ClientZoneIpcType : uint16_t
   {
-    PingHandler = 0x017A, // updated 5.25
-    InitHandler = 0x03B9, // updated 5.25
+    PingHandler = 0x0219, // updated 5.35 hotfix
+    InitHandler = 0x0185, // updated 5.35 hotfix
 
-    FinishLoadingHandler = 0x008A, // updated 5.25
+    FinishLoadingHandler = 0x01BE, // updated 5.35 hotfix
 
-    CFCommenceHandler = 0x0228, // updated 5.25
+    CFCommenceHandler = 0x0118, // updated 5.35 hotfix
 
-    CFCancelHandler = 0x013E, // updated 5.25
-    CFRegisterDuty = 0x0180, // updated 5.25
-    CFRegisterRoulette = 0x0395, // updated 5.25
-    PlayTimeHandler = 0x02FE, // updated 5.25
-    LogoutHandler = 0x00B7, // updated 5.25
-    CancelLogout = 0x008F, // updated 5.1
+    CFCancelHandler = 0x0332, // updated 5.35 hotfix
+    CFRegisterDuty = 0x0289, // updated 5.35 hotfix
+    CFRegisterRoulette = 0x0088, // updated 5.35 hotfix
+    PlayTimeHandler = 0x02A8, // updated 5.35 hotfix
+    LogoutHandler = 0x00EC, // updated 5.35 hotfix
+    CancelLogout = 0x03DB, // updated 5.35 hotfix
 
     CFDutyInfoHandler = 0x0078, // updated 4.2
 
-    SocialReqSendHandler = 0x00AE, // updated 4.1
+    SocialReqSendHandler = 0x0387, // updated 5.35 hotfix
+    SocialResponseHandler = 0x028D, // updated 5.35 hotfix
     CreateCrossWorldLS = 0x00AF, // updated 4.3
 
-    ChatHandler = 0x01E2, // updated 5.3
+    ChatHandler = 0x0131, // updated 5.35 hotfix
+    PartyChatHandler = 0x0065,
+    PartySetLeaderHandler = 0x0208, // updated 5.35 hotfix
+    LeavePartyHandler = 0x0337, // updated 5.35 hotfix
+    KickPartyMemberHandler = 0x014C, // updated 5.35 hotfix
+    DisbandPartyHandler = 0x0205, // updated 5.35 hotfix
 
-    SocialListHandler = 0x0371, // updated 5.25
-    SetSearchInfoHandler = 0x0210, // updated 5.3
-    ReqSearchInfoHandler = 0x0366, // updated 5.25
+    SocialListHandler = 0x0340, // updated 5.35 hotfix
+    SetSearchInfoHandler = 0x0314, // updated 5.35 hotfix
+    ReqSearchInfoHandler = 0x01E9, // updated 5.35 hotfix
     ReqExamineSearchCommentHandler = 0x00E7, // updated 5.0
 
     ReqRemovePlayerFromBlacklist = 0x00F1, // updated 5.0
-    BlackListHandler = 0x0354, // updated 5.25
+    BlackListHandler = 0x0079, // updated 5.35 hotfix
     PlayerSearchHandler = 0x00F4, // updated 5.0
 
-    LinkshellListHandler = 0x01D4, // updated 5.25
+    LinkshellListHandler = 0x024B, // updated 5.35 hotfix
 
     MarketBoardRequestItemListingInfo = 0x0102, // updated 4.5
     MarketBoardRequestItemListings = 0x0103, // updated 4.5
@@ -336,41 +348,41 @@ namespace Sapphire::Network::Packets
     ReqCountdownInitiate = 0x009A, // updated 5.25
     ReqCountdownCancel = 0x0244, // updated 5.25
 
-    ZoneLineHandler = 0x0214, // updated 5.25
-    ClientTrigger = 0x02BE, // updated 5.3
-    DiscoveryHandler = 0x02C8, // updated 5.25
+    ZoneLineHandler = 0x0279, // updated 5.35 hotfix
+    ClientTrigger = 0x03D3, // updated 5.35 hotfix
+    DiscoveryHandler = 0x00E3, // updated 5.35 hotfix
 
     PlaceFieldMarkerPreset = 0x023F, // updated 5.25
     PlaceFieldMarker = 0x01BA, // updated 5.25
-    SkillHandler = 0x033C, // updated 5.3
-    GMCommand1 = 0x01EC, // updated 5.25
-    GMCommand2 = 0x0368, // updated 5.25
-    AoESkillHandler = 0x0364, // updated 5.21 hotfix
+    SkillHandler = 0x01CD, // updated 5.35 hotfix
+    GMCommand1 = 0x02AC, // updated 5.35 hotfix
+    GMCommand2 = 0x029F, // updated 5.35 hotfix
+    AoESkillHandler = 0x030C, // updated 5.35 hotfix
 
-    UpdatePositionHandler = 0x037B, // updated 5.3
+    UpdatePositionHandler = 0x0236, // updated 5.35 hotfix
 
-    InventoryModifyHandler = 0x0118, // updated 5.3
+    InventoryModifyHandler = 0x0135, // updated 5.35 hotfix
     
     InventoryEquipRecommendedItems = 0x0149, // updated 5.0
 
     ReqPlaceHousingItem = 0x014B, // updated 5.0
     BuildPresetHandler = 0x0150, // updated 5.0
 
-    TalkEventHandler = 0x030F, // updated 5.25
-    EmoteEventHandler = 0x01DD, // updated 5.25
-    WithinRangeEventHandler = 0x0165, // updated 5.25
-    OutOfRangeEventHandler = 0x01EB, // updated 5.25
-    EnterTeriEventHandler = 0x00F8, // updated 5.25
+    TalkEventHandler = 0x02A4, // updated 5.35 hotfix
+    EmoteEventHandler = 0x02C8, // updated 5.35 hotfix
+    WithinRangeEventHandler = 0x0209, // updated 5.35 hotfix
+    OutOfRangeEventHandler = 0x0319, // updated 5.35 hotfix
+    EnterTeriEventHandler = 0x0192, // updated 5.35 hotfix
     ShopEventHandler = 0x0156, // updated 5.0
 
-    ReturnEventHandler = 0x00BB, // updated 5.25
-    TradeReturnEventHandler = 0x03B6, // updated 5.25
-    TradeMultipleReturnEventHander = 0x02B0, // updated 5.25
+    ReturnEventHandler = 0x02B4, // updated 5.35 hotfix
+    TradeReturnEventHandler = 0x00A4, // updated 5.35 hotfix
+    TradeMultipleReturnEventHander = 0x035C, // updated 5.35 hotfix
 
     LinkshellEventHandler = 0x016B, // updated 4.5
     LinkshellEventHandler1 = 0x016C, // updated 4.5
 
-    ReqEquipDisplayFlagsChange = 0x0202, // updated 5.25
+    ReqEquipDisplayFlagsChange = 0x02F6, // updated 5.35 hotfix
 
     LandRenameHandler = 0xF177, // updated 5.0
     HousingUpdateHouseGreeting = 0x0178, // updated 5.0
@@ -378,13 +390,11 @@ namespace Sapphire::Network::Packets
 
     SetSharedEstateSettings = 0x017B, // updated 5.0
 
-    UpdatePositionInstance = 0x0245, // updated 5.3
+    UpdatePositionInstance = 0x0345, // updated 5.35 hotfix
 
     PerformNoteHandler = 0x029B, // updated 4.3
 
-    WorldInteractionHandler = 0x0285, // updated 5.25
-    ShopMessage = 0x00C1, // updated 5.25
-    LootMessage = 0x00B1, // updated 5.25
+    WorldInteractionHandler = 0x00A9, // updated 5.35 hotfix
   };
 
   ////////////////////////////////////////////////////////////////////////////////
diff --git a/src/common/Network/PacketDef/Zone/ClientZoneDef.h b/src/common/Network/PacketDef/Zone/ClientZoneDef.h
index 7df75c0e..bfadc021 100644
--- a/src/common/Network/PacketDef/Zone/ClientZoneDef.h
+++ b/src/common/Network/PacketDef/Zone/ClientZoneDef.h
@@ -207,6 +207,13 @@ struct FFXIVIpcChatHandler :
   /* 001A */ char message[1012];
 };
 
+struct FFXIVIpcPartyChatHandler :
+  FFXIVIpcBasePacket< ChatHandler >
+{
+  uint64_t unknown;
+  char message[1024];
+};
+
 struct FFXIVIpcShopEventHandler :
   FFXIVIpcBasePacket< ShopEventHandler >
 {
@@ -355,6 +362,61 @@ struct FFXIVIpcWorldInteractionHandler :
   Common::FFXIVARR_POSITION3 position;
 };
 
+struct FFXIVIpcSocialReqSendHandler :
+  FFXIVIpcBasePacket< SocialReqSendHandler >
+{
+  uint64_t unknown;
+  uint8_t p1;
+  uint8_t p2;
+  uint8_t socialType;
+  char name[32];
+  uint8_t padding[5];
+};
+
+struct FFXIVIpcSocialResponseHandler :
+  FFXIVIpcBasePacket< SocialResponseHandler >
+{
+  uint64_t contentId;
+  uint8_t p1;
+  uint8_t p2;
+  uint8_t socialType;
+  uint8_t response;
+  uint32_t unknown;
+};
+
+struct FFXIVIpcPartySetLeaderHandler :
+  FFXIVIpcBasePacket< PartySetLeaderHandler >
+{
+  uint64_t contentId;
+  uint8_t p1;
+  uint8_t p2;
+  char name[32];
+  uint8_t padding[6];
+};
+
+struct FFXIVIpcLeavePartyHandler :
+  FFXIVIpcBasePacket< LeavePartyHandler >
+{
+  uint64_t empty;
+};
+
+struct FFXIVIpcKickPartyMemberHander :
+  FFXIVIpcBasePacket< KickPartyMemberHandler >
+{
+  uint64_t contentId;
+  uint8_t p1;
+  uint8_t p2;
+  char name[32];
+  uint8_t padding[6];
+};
+
+struct FFXIVIpcDisbandPartyHandler :
+  FFXIVIpcBasePacket< DisbandPartyHandler >
+{
+  uint64_t empty;
+};
+
+
 }
 
 #endif //_CORE_NETWORK_PACKETS_ZONE_CLIENT_IPC_H
diff --git a/src/common/Network/PacketDef/Zone/ServerZoneDef.h b/src/common/Network/PacketDef/Zone/ServerZoneDef.h
index 92ced6ca..f78a9cd3 100644
--- a/src/common/Network/PacketDef/Zone/ServerZoneDef.h
+++ b/src/common/Network/PacketDef/Zone/ServerZoneDef.h
@@ -46,6 +46,19 @@ namespace Sapphire::Network::Packets::Server
     char msg[1012];
   };
 
+  struct FFXIVIpcPartyChat : FFXIVIpcBasePacket< PartyChat >
+  {
+    uint64_t unknown;
+    uint64_t contentId;
+    uint32_t charaId;
+    uint8_t u1;
+    uint8_t u2;
+    uint8_t u3;
+    char name[32];
+    char message[1024];
+    uint8_t padding;
+  };
+
   struct FFXIVIpcChatBanned : FFXIVIpcBasePacket< ChatBanned >
   {
     uint8_t padding[4]; // I was not sure reinterpreting ZST is valid behavior in C++.
@@ -1010,6 +1023,7 @@ namespace Sapphire::Network::Packets::Server
     unsigned int pvpExp;
     unsigned int pvpFrontlineOverallRanks[3];
     unsigned short levels[Common::CLASSJOB_SLOTS];
+    /*
     unsigned short unknown15C[9];
     unsigned short u1;
     unsigned short u2;
@@ -1026,6 +1040,15 @@ namespace Sapphire::Network::Packets::Server
     unsigned char u19[8];
     unsigned char mountGuideMask[22];
     unsigned char u19_2;
+    */
+    unsigned char unknown5_3a[176];
+    unsigned char companionName[21];
+    unsigned char companionDefRank;
+    unsigned char companionAttRank;
+    unsigned char companionHealRank;
+    unsigned char mountGuideMask[23];
+    unsigned char maybeReservedMountSlots;
+    //==
     char name[32];
     unsigned char unknownOword[16];
     unsigned char unknownOw;
@@ -1033,13 +1056,14 @@ namespace Sapphire::Network::Packets::Server
     unsigned char aetheryte[21];
     unsigned char discovery[445];
     unsigned char howto[34];
-    unsigned char minions[45];
+    unsigned char minions[51];
     unsigned char chocoboTaxiMask[10];
-    unsigned char watchedCutscenes[124];
+    unsigned char watchedCutscenes[131];
     unsigned char companionBardingMask[10];
     unsigned char companionEquippedHead;
     unsigned char companionEquippedBody;
     unsigned char companionEquippedLegs;
+    /*
     unsigned char unknown52A[4];
     unsigned char unknownMask52E[11];
     unsigned char fishingGuideMask[105];
@@ -1049,7 +1073,11 @@ namespace Sapphire::Network::Packets::Server
     unsigned char beastRank[11];
     unsigned char unknownPvp5AB[11];
     unsigned char unknown5B9[5];
+    */
+    unsigned char unknown5_3c[234];
+    //==
     unsigned char pose;
+    /*
     unsigned char unknown5B91;
     unsigned char challengeLogComplete[9];
     unsigned char weaponPose;
@@ -1063,24 +1091,30 @@ namespace Sapphire::Network::Packets::Server
     unsigned char u13;
     unsigned char aetherCurrentMask[22];
     unsigned char u10[3];
+    */
+    unsigned char unknown5_3d[292];
+    //==
     unsigned char orchestrionMask[40];
     unsigned char hallOfNoviceCompletion[3];
     unsigned char animaCompletion[11];
-    unsigned char u14[16];
-    unsigned char u15[13];
+    unsigned char unknown5_3e[33];
     unsigned char unlockedRaids[28];
     unsigned char unlockedDungeons[18];
     unsigned char unlockedGuildhests[10];
-    unsigned char unlockedTrials[8];
+    unsigned char unlockedTrials[9]; // 5.35 trial:pvp either 9:5 or 8:6 not confirmed
     unsigned char unlockedPvp[5];
     unsigned char clearedRaids[28];
     unsigned char clearedDungeons[18];
     unsigned char clearedGuildhests[10];
-    unsigned char clearedTrials[8];
+    unsigned char clearedTrials[9];
     unsigned char clearedPvp[5];
+    /*
     unsigned short fishingRecordsFishWeight[26];
     unsigned int exploratoryMissionNextTimestamp;
     unsigned char pvpLevel;
+    */
+    unsigned char padding2[8];
+    //==
   };
 
 
@@ -1764,6 +1798,7 @@ namespace Sapphire::Network::Packets::Server
   struct FFXIVIpcMount : FFXIVIpcBasePacket< Mount >
   {
     uint32_t id;
+    uint32_t padding[3];
   };
 
   /**
@@ -1981,7 +2016,7 @@ namespace Sapphire::Network::Packets::Server
       uint32_t housePrice;
       uint8_t infoFlags;
       Common::HousingAppeal houseAppeal[3];
-      char estateOwnerName[30];
+      char estateOwnerName[32];
     } houseInfoEntry[60];
   };
 
@@ -2125,6 +2160,84 @@ namespace Sapphire::Network::Packets::Server
     uint32_t param6;
     uint32_t param7;
   };
+
+  struct FFXIVIpcSocialMessage : FFXIVIpcBasePacket< SocialMessage >
+  {
+    uint64_t contentId;
+    uint32_t expireTime;
+    uint8_t p1;
+    uint8_t p2;
+    uint8_t socialType;
+    uint8_t padding;
+    uint8_t type;
+    uint8_t unknown4;
+    char name[32];
+    uint8_t padding2[6];
+  };
+
+  struct FFXIVIpcSocialMessage2 : FFXIVIpcBasePacket< SocialMessage2 >
+  {
+    uint64_t contentId;
+    uint32_t unknown3;
+    uint8_t p1;
+    uint8_t p2;
+    uint8_t socialType;
+    uint8_t padding;
+    char name[32];
+  };
+
+  struct FFXIVIpcSocialRequestResponse : FFXIVIpcBasePacket< SocialRequestResponse >
+  {
+    uint64_t contentId;
+    uint32_t unknown3;
+    uint8_t u1AlwaysOne;
+    uint8_t response;
+    uint8_t u2AlwaysOne;
+    char name[32];
+    uint8_t padding;
+  };
+
+  struct FFXIVIpcPartyList : FFXIVIpcBasePacket< PartyList >
+  {
+    struct
+    {
+      char name[32];
+      uint64_t contentId;
+      uint32_t charaId;
+      uint32_t u1;
+      uint32_t u2;
+      uint32_t hp;
+      uint32_t maxHp;
+      uint16_t mp;
+      uint16_t maxMp;
+      uint16_t u3;
+      uint16_t zoneId;
+      uint8_t gposeSelectable;
+      uint8_t classId;
+      uint8_t u5;
+      uint8_t level;
+      uint8_t otherData[368];
+    } member[8];
+    uint64_t someContentId1;
+    uint64_t someContentId2;
+    uint8_t leaderIndex;
+    uint8_t partySize;
+    uint16_t padding1;
+    uint32_t padding2;
+  };
+
+  struct FFXIVIpcPartyMessage : FFXIVIpcBasePacket< PartyMessage >
+  {
+    uint64_t leaderContentId;
+    uint64_t memberContentId;
+    uint8_t u1;
+    uint8_t u2;
+    uint16_t type;
+    uint8_t partySize; // ?
+    char leaderName[32];
+    char memberName[32];
+    uint8_t padding[3];
+  };
 }
 
 #endif /*_CORE_NETWORK_PACKETS_SERVER_IPC_H*/
diff --git a/src/world/Actor/Player.cpp b/src/world/Actor/Player.cpp
index f64f6afc..aa882b45 100644
--- a/src/world/Actor/Player.cpp
+++ b/src/world/Actor/Player.cpp
@@ -1544,22 +1544,31 @@ uint8_t Sapphire::Entity::Player::getEquipDisplayFlags() const
 
 void Sapphire::Entity::Player::mount( uint32_t id )
 {
-  m_mount = id;
-  sendToInRangeSet( makeActorControl( getId(), ActorControlType::SetStatus,
-                                         static_cast< uint8_t >( Common::ActorStatus::Mounted ) ), true );
-  sendToInRangeSet( makeActorControlSelf( getId(), 0x39e, 12 ), true ); //?
+  if( id > 0 )
+  {
+    m_mount = id;
+    sendToInRangeSet( makeActorControl( getId(), ActorControlType::SetStatus,
+      static_cast< uint8_t >( Common::ActorStatus::Mounted ) ), true );
+    sendToInRangeSet( makeActorControlSelf( getId(), ActorControlType::SetMountSpeed, 12 ), true );
+    sendToInRangeSet( makeActorControlSelf( getId(), 0x107, 1 ), true );
 
-  auto mountPacket = makeZonePacket< FFXIVIpcMount >( getId() );
-  mountPacket->data().id = id;
-  sendToInRangeSet( mountPacket, true );
+    auto mountPacket = makeZonePacket< FFXIVIpcMount >( getId() );
+    mountPacket->data().id = id;
+    sendToInRangeSet( mountPacket, true );
+  }
 }
 
 void Sapphire::Entity::Player::dismount()
 {
-  sendToInRangeSet( makeActorControl( getId(), ActorControlType::SetStatus,
-                                         static_cast< uint8_t >( Common::ActorStatus::Idle ) ), true );
-  sendToInRangeSet( makeActorControlSelf( getId(), ActorControlType::Dismount, 1 ), true );
-  m_mount = 0;
+  if( m_mount > 0 )
+  {
+    sendToInRangeSet( makeActorControl( getId(), ActorControlType::SetStatus,
+      static_cast< uint8_t >( Common::ActorStatus::Idle ) ), true );
+    sendToInRangeSet( makeActorControl( getId(), ActorControlType::Dismount, 1 ), true );
+    sendToInRangeSet( makeActorControlSelf( getId(), 0x393, 1 ), true );
+    sendToInRangeSet( makeActorControlSelf( getId(), 0x107, 0 ), true );
+    m_mount = 0;
+  }
 }
 
 void Sapphire::Entity::Player::spawnCompanion( uint16_t id )

From a006900fba463dbe9b063750e161048d1f32b288 Mon Sep 17 00:00:00 2001
From: collett <collett0301@gmail.com>
Date: Wed, 11 Nov 2020 20:00:59 +0900
Subject: [PATCH 349/351] event battle fix

---
 src/common/Network/CommonActorControl.h             | 2 +-
 src/world/Network/Handlers/ClientTriggerHandler.cpp | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/common/Network/CommonActorControl.h b/src/common/Network/CommonActorControl.h
index fbeea52f..6ead8897 100644
--- a/src/common/Network/CommonActorControl.h
+++ b/src/common/Network/CommonActorControl.h
@@ -264,7 +264,7 @@ namespace Sapphire::Network::ActorControl
 
     ToggleOrchestrionUnlock = 0x396,
 
-    EventBattleDialog = 0x39C,
+    EventBattleDialog = 0x39D,
 
     /*!
     * param1 = mountSpeed
diff --git a/src/world/Network/Handlers/ClientTriggerHandler.cpp b/src/world/Network/Handlers/ClientTriggerHandler.cpp
index 6ca7a7b4..285df66d 100644
--- a/src/world/Network/Handlers/ClientTriggerHandler.cpp
+++ b/src/world/Network/Handlers/ClientTriggerHandler.cpp
@@ -491,7 +491,7 @@ void Sapphire::Network::GameConnection::clientTriggerHandler( const Packets::FFX
       auto packet = makeActorControlSelf( player.getId(), ActorControl::EventBattleDialog, 0, param12, param2 );
       player.queuePacket( packet );
 
-      player.sendDebug( "event battle level sync: {0}, ilevel sync?: {1}", param12, param2 );
+      player.sendDebug( "event battle p1: {0}, p11: {1}, p12: {2}, p2: {3}, p3: {4}, p4: {5}, p5: {6}", param1, param11, param12, param2, param3, param4, param5 );
       break;
     }
 

From 82eaa62a24b525e4a7d0f13be316473ab84f2d01 Mon Sep 17 00:00:00 2001
From: Sophie Hamilton <git-commits@theblob.org>
Date: Sat, 14 Nov 2020 15:04:43 +0000
Subject: [PATCH 350/351] Fix bad hex number

The number format here was typoed, preventing a successful compile.
---
 src/common/Network/PacketDef/Ipcs.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/common/Network/PacketDef/Ipcs.h b/src/common/Network/PacketDef/Ipcs.h
index 302d9c3d..0cf9c386 100644
--- a/src/common/Network/PacketDef/Ipcs.h
+++ b/src/common/Network/PacketDef/Ipcs.h
@@ -47,7 +47,7 @@ namespace Sapphire::Network::Packets
     Init = 0x03B9, // updated 5.25
 
     ActorFreeSpawn = 0x022F, // updated 5.3
-    InitZone = 00x0303, // updated 5.35
+    InitZone = 0x0303, // updated 5.35
 
     EffectResult = 0x035E, // updated 5.35
     ActorControl = 0x02DC, // updated 5.35

From 3d4e39846cbb47ae1c16d62303109c250027dbac Mon Sep 17 00:00:00 2001
From: collett <collett0301@gmail.com>
Date: Sat, 14 Nov 2020 06:15:10 +0900
Subject: [PATCH 351/351] implement diving

---
 src/common/Network/PacketDef/Ipcs.h           |   1 +
 .../Network/PacketDef/Zone/ClientZoneDef.h    |   9 +
 src/world/Network/GameConnection.cpp          |   1 +
 src/world/Network/GameConnection.h            |   1 +
 src/world/Network/Handlers/PacketHandlers.cpp | 197 +++++++++++++-----
 5 files changed, 157 insertions(+), 52 deletions(-)

diff --git a/src/common/Network/PacketDef/Ipcs.h b/src/common/Network/PacketDef/Ipcs.h
index 0c3f8cb1..0b93fdaf 100644
--- a/src/common/Network/PacketDef/Ipcs.h
+++ b/src/common/Network/PacketDef/Ipcs.h
@@ -395,6 +395,7 @@ namespace Sapphire::Network::Packets
     PerformNoteHandler = 0x029B, // updated 4.3
 
     WorldInteractionHandler = 0x00A9, // updated 5.35 hotfix
+    Dive = 0x02CC, // updated 5.35 hotfix
   };
 
   ////////////////////////////////////////////////////////////////////////////////
diff --git a/src/common/Network/PacketDef/Zone/ClientZoneDef.h b/src/common/Network/PacketDef/Zone/ClientZoneDef.h
index bfadc021..19b4fff5 100644
--- a/src/common/Network/PacketDef/Zone/ClientZoneDef.h
+++ b/src/common/Network/PacketDef/Zone/ClientZoneDef.h
@@ -417,6 +417,15 @@ struct FFXIVIpcDisbandPartyHandler :
 };
 
 
+struct FFXIVIpcDive :
+  FFXIVIpcBasePacket< Dive >
+{
+  float unknown;
+  Common::FFXIVARR_POSITION3 posTarget;
+  Common::FFXIVARR_POSITION3 posOriginal;
+  uint32_t padding;
+};
+
 }
 
 #endif //_CORE_NETWORK_PACKETS_ZONE_CLIENT_IPC_H
diff --git a/src/world/Network/GameConnection.cpp b/src/world/Network/GameConnection.cpp
index f8603f17..82b401ee 100644
--- a/src/world/Network/GameConnection.cpp
+++ b/src/world/Network/GameConnection.cpp
@@ -132,6 +132,7 @@ Sapphire::Network::GameConnection::GameConnection( Sapphire::Network::HivePtr pH
                   &GameConnection::marketBoardRequestItemListings );
 
   setZoneHandler( ClientZoneIpcType::WorldInteractionHandler, "WorldInteractionHandler", &GameConnection::worldInteractionhandler );
+  setZoneHandler( ClientZoneIpcType::Dive, "Dive", &GameConnection::diveHandler );
 
   setChatHandler( ClientChatIpcType::TellReq, "TellReq", &GameConnection::tellHandler );
 
diff --git a/src/world/Network/GameConnection.h b/src/world/Network/GameConnection.h
index 8f343dbc..8a3aabc0 100644
--- a/src/world/Network/GameConnection.h
+++ b/src/world/Network/GameConnection.h
@@ -189,6 +189,7 @@ namespace Sapphire::Network
 
     DECLARE_HANDLER( worldInteractionhandler );
 
+    DECLARE_HANDLER( diveHandler );
   };
 
 }
diff --git a/src/world/Network/Handlers/PacketHandlers.cpp b/src/world/Network/Handlers/PacketHandlers.cpp
index ed917a69..af472089 100644
--- a/src/world/Network/Handlers/PacketHandlers.cpp
+++ b/src/world/Network/Handlers/PacketHandlers.cpp
@@ -731,65 +731,158 @@ void Sapphire::Network::GameConnection::worldInteractionhandler( const Packets::
   const auto packet = ZoneChannelPacket< Client::FFXIVIpcWorldInteractionHandler >( inPacket );
   auto action = packet.data().action;
   player.sendDebug( "WorldInteraction {}", action );
-  if( action == 0x1F5 )
+  switch( action )
   {
-    auto emote = packet.data().param1;
-    if( emote == 0x32 || emote == 0x33 ) // "/sit"
+    case 0x1F5: // emote
     {
-      auto param4 = packet.data().param4;
-      auto& exdData = Common::Service< Data::ExdDataGenerated >::ref();
-      auto emoteData = exdData.get< Data::Emote >( emote );
-
-      if( !emoteData )
-        return;
-
-      player.setPos( packet.data().position );
-      if( emote == 0x32 && player.hasInRangeActor() )
+      auto emote = packet.data().param1;
+      if( emote == 0x32 || emote == 0x33 ) // "/sit"
       {
-        auto setpos = makeZonePacket< FFXIVIpcActorSetPos >( player.getId() );
-        setpos->data().r16 = param4;
-        setpos->data().waitForLoad = 18;
-        setpos->data().unknown1 = 1;
-        setpos->data().x = packet.data().position.x;
-        setpos->data().y = packet.data().position.y;
-        setpos->data().z = packet.data().position.z;
-        player.sendToInRangeSet( setpos, false );
-      }
-      player.sendToInRangeSet( makeActorControlTarget( player.getId(), ActorControl::ActorControlType::Emote, emote, 0, 0, param4, 0xE0000000 ), true );
+        auto param4 = packet.data().param4;
+        auto& exdData = Common::Service< Data::ExdDataGenerated >::ref();
+        auto emoteData = exdData.get< Data::Emote >( emote );
 
-      if( emote == 0x32 && emoteData->emoteMode != 0 )
-      {
-        player.setStance( Common::Stance::Passive );
-        player.setAutoattack( false );
-        player.setPersistentEmote( emoteData->emoteMode );
-        player.setStatus( Common::ActorStatus::EmoteMode );
+        if( !emoteData )
+          break;
+
+        player.setPos( packet.data().position );
+        if( emote == 0x32 && player.hasInRangeActor() )
+        {
+          auto setpos = makeZonePacket< FFXIVIpcActorSetPos >( player.getId() );
+          setpos->data().r16 = param4;
+          setpos->data().waitForLoad = 18;
+          setpos->data().unknown1 = 1;
+          setpos->data().x = packet.data().position.x;
+          setpos->data().y = packet.data().position.y;
+          setpos->data().z = packet.data().position.z;
+          player.sendToInRangeSet( setpos, false );
+        }
+        player.sendToInRangeSet( makeActorControlTarget( player.getId(), ActorControl::ActorControlType::Emote, emote, 0, 0, param4, 0xE0000000 ), true );
+
+        if( emote == 0x32 && emoteData->emoteMode != 0 )
+        {
+          player.setStance( Common::Stance::Passive );
+          player.setAutoattack( false );
+          player.setPersistentEmote( emoteData->emoteMode );
+          player.setStatus( Common::ActorStatus::EmoteMode );
+        }
       }
+      break;
+    }
+    case 0x1F8:
+    {
+      if( player.getPersistentEmote() > 0 )
+      {
+        auto param2 = packet.data().param2;
+
+        player.setPos( packet.data().position );
+        if( player.hasInRangeActor() )
+        {
+          auto setpos = makeZonePacket< FFXIVIpcActorSetPos >( player.getId() );
+          setpos->data().r16 = param2;
+          setpos->data().waitForLoad = 18;
+          setpos->data().unknown1 = 2;
+          setpos->data().x = packet.data().position.x;
+          setpos->data().y = packet.data().position.y;
+          setpos->data().z = packet.data().position.z;
+          player.sendToInRangeSet( setpos, false );
+        }
+
+        player.setPersistentEmote( 0 );
+        player.emoteInterrupt();
+        player.setStatus( Common::ActorStatus::Idle );
+        auto pSetStatusPacket = makeActorControl( player.getId(), SetStatus, static_cast< uint8_t >( Common::ActorStatus::Idle ) );
+        player.sendToInRangeSet( pSetStatusPacket );
+      }
+      break;
+    }
+    case 0x25E: // coming out from water
+    case 0xD1: // underwater town portal
+    {
+      auto p = makeZonePacket< FFXIVIpcPrepareZoning >( player.getId() );
+      p->data().targetZone = player.getCurrentTerritory()->getTerritoryTypeId();
+      p->data().param4 = action == 0xD1 ? 14 : 227;
+      p->data().hideChar = action == 0xD1 ? 2 : 1;
+      p->data().fadeOut = action == 0xD1 ? 24 : 25;
+      p->data().fadeOutTime = 1;
+      p->data().unknown = action == 0xD1 ? 4 : 6;
+      auto x = packet.data().position.x;
+      auto y = packet.data().position.y;
+      auto z = packet.data().position.z;
+      auto rot = player.getRot();
+      if( action == 0xD1 )
+      {
+        auto exitRange = packet.data().param1;
+
+        auto& instanceObjectCache = Common::Service< InstanceObjectCache >::ref();
+        auto exit = instanceObjectCache.getExitRange( p->data().targetZone, exitRange );
+        if( exit )
+        {
+          player.sendDebug( "exitRange {0} found!", exitRange );
+          auto destZone = exit->data.destTerritoryType;
+          if( destZone == 0 )
+            destZone = p->data().targetZone;
+          else
+            p->data().targetZone = destZone;
+          auto pop = instanceObjectCache.getPopRange( destZone, exit->data.destInstanceObjectId );
+          if( pop )
+          {
+            player.sendDebug( "popRange {0} found!", exit->data.destInstanceObjectId );
+            x = pop->header.transform.translation.x;
+            y = pop->header.transform.translation.y;
+            z = pop->header.transform.translation.z;
+            //rot = pop->header.transform.rotation.y; all x/y/z not correct, maybe we don't need it since we have to be facing the portal anyway?
+          }
+          else
+          {
+            player.sendUrgent( "popRange {0} not found in {1}!", exit->data.destInstanceObjectId, destZone );
+          }
+        }
+        else
+        {
+          player.sendUrgent( "exitRange {0} not found in {1}!", exitRange, p->data().targetZone );
+        }
+      }
+      player.queuePacket( p );
+      player.setPos( x, y, z, true );
+      player.setRot( rot );
+      auto setPos = makeZonePacket< FFXIVIpcActorSetPos >( player.getId() );
+      setPos->data().r16 = Common::Util::floatToUInt16Rot( player.getRot() );
+      setPos->data().x = x;
+      setPos->data().y = y;
+      setPos->data().z = z;
+      setPos->data().waitForLoad = action == 0xD1 ? 24 : 25;
+      setPos->data().unknown1 = 0;
+      player.queuePacket( setPos ); // this packet needs a delay of 0.8 second to wait for the client finishing its water animation otherwise it looks odd.
+      break;
     }
   }
-  else if( action == 0x1F8 )
-  {
-    if( player.getPersistentEmote() > 0 )
-    {
-      auto param2 = packet.data().param2;
+}
 
-      player.setPos( packet.data().position );
-      if( player.hasInRangeActor() )
-      {
-        auto setpos = makeZonePacket< FFXIVIpcActorSetPos >( player.getId() );
-        setpos->data().r16 = param2;
-        setpos->data().waitForLoad = 18;
-        setpos->data().unknown1 = 2;
-        setpos->data().x = packet.data().position.x;
-        setpos->data().y = packet.data().position.y;
-        setpos->data().z = packet.data().position.z;
-        player.sendToInRangeSet( setpos, false );
-      }
+void Sapphire::Network::GameConnection::diveHandler( const Packets::FFXIVARR_PACKET_RAW& inPacket, Entity::Player& player )
+{
+  const auto packetIn = ZoneChannelPacket< Client::FFXIVIpcDive >( inPacket );
+  auto p = makeZonePacket< FFXIVIpcPrepareZoning >( player.getId() );
+  p->data().targetZone = player.getCurrentTerritory()->getTerritoryTypeId();
+  p->data().param4 = 218;
+  p->data().hideChar = 1;
+  p->data().fadeOut = 25;
+  p->data().fadeOutTime = 1;
+  p->data().unknown = 6;
+  player.queuePacket( p );
 
-      player.setPersistentEmote( 0 );
-      player.emoteInterrupt();
-      player.setStatus( Common::ActorStatus::Idle );
-      auto pSetStatusPacket = makeActorControl( player.getId(), SetStatus, static_cast< uint8_t >( Common::ActorStatus::Idle ) );
-      player.sendToInRangeSet( pSetStatusPacket );
-    }
-  }
+  player.setStance( Common::Stance::Passive );
+
+  auto x = packetIn.data().posTarget.x;
+  auto y = packetIn.data().posTarget.y;
+  auto z = packetIn.data().posTarget.z;
+  player.setPos( x, y, z, true );
+  auto setPos = makeZonePacket< FFXIVIpcActorSetPos >( player.getId() );
+  setPos->data().r16 = Common::Util::floatToUInt16Rot( player.getRot() );
+  setPos->data().x = x;
+  setPos->data().y = y;
+  setPos->data().z = z;
+  setPos->data().waitForLoad = 25;
+  setPos->data().unknown1 = 0;
+  player.queuePacket( setPos ); // need delay, same as above.
 }
\ No newline at end of file