diff --git a/src/common/Common.h b/src/common/Common.h index dc05310d..0eaa4b4f 100644 --- a/src/common/Common.h +++ b/src/common/Common.h @@ -8,9 +8,9 @@ // +--------------------------------------------------------------------------- // The following enumerations are structures to require their type be included. -// They are also defined within the Core::Common namespace to avoid collisions. +// They are also defined within the Sapphire::Common namespace to avoid collisions. // +--------------------------------------------------------------------------- -namespace Core::Common +namespace Sapphire::Common { // 99 is the last spawn id that seems to spawn any actor diff --git a/src/common/CommonGen.cpp b/src/common/CommonGen.cpp index 668f8cee..43bce9b2 100644 --- a/src/common/CommonGen.cpp +++ b/src/common/CommonGen.cpp @@ -2,7 +2,7 @@ #include -namespace Core { +namespace Sapphire { namespace Common { bool operator==( const ActionCategory& t, const uint8_t& g ) diff --git a/src/common/CommonGen.h b/src/common/CommonGen.h index 63988bbc..6004cf83 100644 --- a/src/common/CommonGen.h +++ b/src/common/CommonGen.h @@ -6,7 +6,7 @@ /* This file has been automatically generated. Changes will be lost upon regeneration. To change the content edit tools/exd_common_gen */ -namespace Core { +namespace Sapphire { namespace Common { /////////////////////////////////////////////////////////// diff --git a/src/common/Config/ConfigMgr.cpp b/src/common/Config/ConfigMgr.cpp index 8b72bf1a..d4c9cddc 100644 --- a/src/common/Config/ConfigMgr.cpp +++ b/src/common/Config/ConfigMgr.cpp @@ -10,7 +10,7 @@ namespace fs = std::experimental::filesystem; * @param configName the name of ini file relative to m_configFolderRoot to load alongside global.ini * @return true if loading was successful */ -bool Core::ConfigMgr::loadConfig( const std::string& configName ) +bool Sapphire::ConfigMgr::loadConfig( const std::string& configName ) { // get global config auto configFile = fs::path( fs::path( m_configFolderRoot ) / configName ); @@ -29,7 +29,7 @@ bool Core::ConfigMgr::loadConfig( const std::string& configName ) return true; } -bool Core::ConfigMgr::copyDefaultConfig( const std::string& configName ) +bool Sapphire::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 a28b2da4..cf3109e6 100644 --- a/src/common/Config/ConfigMgr.h +++ b/src/common/Config/ConfigMgr.h @@ -7,7 +7,7 @@ #include #include -namespace Core +namespace Sapphire { class ConfigMgr { diff --git a/src/common/Crypt/base64.cpp b/src/common/Crypt/base64.cpp index 4f0cb9ba..7d31e39b 100644 --- a/src/common/Crypt/base64.cpp +++ b/src/common/Crypt/base64.cpp @@ -39,7 +39,7 @@ static inline bool is_base64( uint8_t c ) return ( isalnum( c ) || ( c == '+' ) || ( c == '/' ) ); } -std::string Core::Util::base64_encode( uint8_t const* bytes_to_encode, uint32_t in_len ) +std::string Sapphire::Util::base64_encode( uint8_t const* bytes_to_encode, uint32_t in_len ) { std::string ret; int32_t i = 0; @@ -85,7 +85,7 @@ std::string Core::Util::base64_encode( uint8_t const* bytes_to_encode, uint32_t } -std::string Core::Util::base64_decode( std::string const& encoded_string ) +std::string Sapphire::Util::base64_decode( 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 b1b9a153..8817ad13 100644 --- a/src/common/Crypt/base64.h +++ b/src/common/Crypt/base64.h @@ -1,6 +1,6 @@ #include -namespace Core::Util +namespace Sapphire::Util { std::string base64_encode( uint8_t const*, uint32_t len ); diff --git a/src/common/Crypt/md5.cpp b/src/common/Crypt/md5.cpp index 64770119..130042e2 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 Core::Util::md5_starts( md5_context* ctx ) +void Sapphire::Util::md5_starts( md5_context* ctx ) { ctx->total[ 0 ] = 0; ctx->total[ 1 ] = 0; @@ -48,7 +48,7 @@ void Core::Util::md5_starts( md5_context* ctx ) ctx->state[ 3 ] = 0x10325476; } -void md5_process( Core::Util::md5_context* ctx, uint8_t data[64] ) +void md5_process( Sapphire::Util::md5_context* ctx, uint8_t data[64] ) { uint32_t X[16], A, B, C, D; @@ -171,7 +171,7 @@ void md5_process( Core::Util::md5_context* ctx, uint8_t data[64] ) ctx->state[ 3 ] += D; } -void Core::Util::md5_update( md5_context* ctx, uint8_t* input, uint32_t length ) +void Sapphire::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 Core::Util::md5_finish( md5_context* ctx, uint8_t digest[16] ) +void Sapphire::Util::md5_finish( md5_context* ctx, uint8_t digest[16] ) { uint32_t last, padn; uint32_t high, low; @@ -248,7 +248,7 @@ void Core::Util::md5_finish( md5_context* ctx, uint8_t digest[16] ) * those are the standard RFC 1321 test vectors */ -void Core::Util::md5( uint8_t* text, uint8_t* hash, int32_t size ) +void Sapphire::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 69bc6274..9d112194 100644 --- a/src/common/Crypt/md5.h +++ b/src/common/Crypt/md5.h @@ -3,7 +3,7 @@ #include -namespace Core::Util +namespace Sapphire::Util { using md5_context = struct { diff --git a/src/common/Database/DatabaseDef.h b/src/common/Database/DatabaseDef.h index bb73957f..02b9d906 100644 --- a/src/common/Database/DatabaseDef.h +++ b/src/common/Database/DatabaseDef.h @@ -7,6 +7,6 @@ #include "Database/DbWorkerPool.h" #include "Database/PreparedStatement.h" -extern Core::Db::DbWorkerPool< Core::Db::ZoneDbConnection > g_charaDb; +extern Sapphire::Db::DbWorkerPool< Sapphire::Db::ZoneDbConnection > g_charaDb; #endif diff --git a/src/common/Database/DbConnection.cpp b/src/common/Database/DbConnection.cpp index 0e6d5101..eb9c920e 100644 --- a/src/common/Database/DbConnection.cpp +++ b/src/common/Database/DbConnection.cpp @@ -6,9 +6,9 @@ #include "PreparedStatement.h" #include "Framework.h" -extern Core::Framework g_fw; +extern Sapphire::Framework g_fw; -Core::Db::DbConnection::DbConnection( ConnectionInfo& connInfo ) : +Sapphire::Db::DbConnection::DbConnection( ConnectionInfo& connInfo ) : m_reconnecting( false ), m_prepareError( false ), m_queue( nullptr ), @@ -19,8 +19,8 @@ Core::Db::DbConnection::DbConnection( ConnectionInfo& connInfo ) : } -Core::Db::DbConnection::DbConnection( Core::LockedWaitQueue< std::shared_ptr< Operation > >* queue, - Core::Db::ConnectionInfo& connInfo ) : +Sapphire::Db::DbConnection::DbConnection( Sapphire::LockedWaitQueue< std::shared_ptr< Operation > >* queue, + Sapphire::Db::ConnectionInfo& connInfo ) : m_reconnecting( false ), m_prepareError( false ), m_queue( queue ), @@ -31,12 +31,12 @@ Core::Db::DbConnection::DbConnection( Core::LockedWaitQueue< std::shared_ptr< Op m_worker = std::make_shared< DbWorker >( m_queue, this ); } -Core::Db::DbConnection::~DbConnection() +Sapphire::Db::DbConnection::~DbConnection() { close(); } -void Core::Db::DbConnection::close() +void Sapphire::Db::DbConnection::close() { m_worker.reset(); m_stmts.clear(); @@ -50,7 +50,7 @@ void Core::Db::DbConnection::close() } -uint32_t Core::Db::DbConnection::open() +uint32_t Sapphire::Db::DbConnection::open() { std::shared_ptr< Mysql::MySqlBase > base( new Mysql::MySqlBase() ); Mysql::optionMap options; @@ -73,42 +73,42 @@ uint32_t Core::Db::DbConnection::open() return 0; } -uint32_t Core::Db::DbConnection::getLastError() +uint32_t Sapphire::Db::DbConnection::getLastError() { return m_pConnection->getErrorNo(); } -bool Core::Db::DbConnection::ping() +bool Sapphire::Db::DbConnection::ping() { return m_pConnection->ping(); } -bool Core::Db::DbConnection::lockIfReady() +bool Sapphire::Db::DbConnection::lockIfReady() { return m_mutex.try_lock(); } -void Core::Db::DbConnection::unlock() +void Sapphire::Db::DbConnection::unlock() { m_mutex.unlock(); } -void Core::Db::DbConnection::beginTransaction() +void Sapphire::Db::DbConnection::beginTransaction() { m_pConnection->beginTransaction(); } -void Core::Db::DbConnection::rollbackTransaction() +void Sapphire::Db::DbConnection::rollbackTransaction() { m_pConnection->rollbackTransaction(); } -void Core::Db::DbConnection::commitTransaction() +void Sapphire::Db::DbConnection::commitTransaction() { m_pConnection->commitTransaction(); } -bool Core::Db::DbConnection::execute( const std::string& sql ) +bool Sapphire::Db::DbConnection::execute( const std::string& sql ) { try { @@ -123,7 +123,7 @@ bool Core::Db::DbConnection::execute( const std::string& sql ) } } -std::shared_ptr< Mysql::ResultSet > Core::Db::DbConnection::query( const std::string& sql ) +std::shared_ptr< Mysql::ResultSet > Sapphire::Db::DbConnection::query( const std::string& sql ) { try { @@ -140,7 +140,7 @@ std::shared_ptr< Mysql::ResultSet > Core::Db::DbConnection::query( const std::st std::shared_ptr< Mysql::ResultSet > -Core::Db::DbConnection::query( std::shared_ptr< Core::Db::PreparedStatement > stmt ) +Sapphire::Db::DbConnection::query( std::shared_ptr< Sapphire::Db::PreparedStatement > stmt ) { std::shared_ptr< Mysql::ResultSet > res( nullptr ); if( !stmt ) @@ -176,7 +176,7 @@ Core::Db::DbConnection::query( std::shared_ptr< Core::Db::PreparedStatement > st } -bool Core::Db::DbConnection::execute( std::shared_ptr< Core::Db::PreparedStatement > stmt ) +bool Sapphire::Db::DbConnection::execute( std::shared_ptr< Sapphire::Db::PreparedStatement > stmt ) { if( !stmt ) return false; @@ -201,7 +201,7 @@ bool Core::Db::DbConnection::execute( std::shared_ptr< Core::Db::PreparedStateme } } -std::shared_ptr< Mysql::PreparedStatement > Core::Db::DbConnection::getPreparedStatement( uint32_t index ) +std::shared_ptr< Mysql::PreparedStatement > Sapphire::Db::DbConnection::getPreparedStatement( uint32_t index ) { assert( index < m_stmts.size() ); auto ret = m_stmts[ index ]; @@ -211,7 +211,7 @@ std::shared_ptr< Mysql::PreparedStatement > Core::Db::DbConnection::getPreparedS return ret; } -void Core::Db::DbConnection::prepareStatement( uint32_t index, const std::string& sql, Core::Db::ConnectionFlags flags ) +void Sapphire::Db::DbConnection::prepareStatement( uint32_t index, const std::string& sql, Sapphire::Db::ConnectionFlags flags ) { m_queries.insert( PreparedStatementMap::value_type( index, std::make_pair( sql, flags ) ) ); @@ -240,7 +240,7 @@ void Core::Db::DbConnection::prepareStatement( uint32_t index, const std::string } -bool Core::Db::DbConnection::prepareStatements() +bool Sapphire::Db::DbConnection::prepareStatements() { doPrepareStatements(); return !m_prepareError; diff --git a/src/common/Database/DbConnection.h b/src/common/Database/DbConnection.h index 7d64437c..05bfd793 100644 --- a/src/common/Database/DbConnection.h +++ b/src/common/Database/DbConnection.h @@ -16,7 +16,7 @@ namespace Mysql class PreparedStatement; } -namespace Core::Db +namespace Sapphire::Db { class DatabaseWorker; class PreparedStatement; @@ -52,7 +52,7 @@ namespace Core::Db DbConnection( ConnectionInfo& connInfo ); // Constructor for asynchronous connections. - DbConnection( Core::LockedWaitQueue< std::shared_ptr< Operation > >* queue, ConnectionInfo& connInfo ); + DbConnection( Sapphire::LockedWaitQueue< std::shared_ptr< Operation > >* queue, ConnectionInfo& connInfo ); virtual ~DbConnection(); diff --git a/src/common/Database/DbLoader.cpp b/src/common/Database/DbLoader.cpp index db3d3f0a..5479874e 100644 --- a/src/common/Database/DbLoader.cpp +++ b/src/common/Database/DbLoader.cpp @@ -5,14 +5,14 @@ #include "Logging/Logger.h" #include "Framework.h" -extern Core::Framework g_fw; +extern Sapphire::Framework g_fw; -Core::Db::DbLoader::DbLoader() +Sapphire::Db::DbLoader::DbLoader() { } template< class T > -Core::Db::DbLoader& Core::Db::DbLoader::addDb( Core::Db::DbWorkerPool< T >& pool, const ConnectionInfo& info ) +Sapphire::Db::DbLoader& Sapphire::Db::DbLoader::addDb( Sapphire::Db::DbWorkerPool< T >& pool, const ConnectionInfo& info ) { m_open.push( [ this, info, &pool ]()->bool @@ -65,7 +65,7 @@ Core::Db::DbLoader& Core::Db::DbLoader::addDb( Core::Db::DbWorkerPool< T >& pool return *this; } -bool Core::Db::DbLoader::initDbs() +bool Sapphire::Db::DbLoader::initDbs() { if( !openDatabases() ) return false; @@ -76,17 +76,17 @@ bool Core::Db::DbLoader::initDbs() return true; } -bool Core::Db::DbLoader::openDatabases() +bool Sapphire::Db::DbLoader::openDatabases() { return process( m_open ); } -bool Core::Db::DbLoader::prepareStatements() +bool Sapphire::Db::DbLoader::prepareStatements() { return process( m_prepare ); } -bool Core::Db::DbLoader::process( std::queue< Predicate >& queue ) +bool Sapphire::Db::DbLoader::process( std::queue< Predicate >& queue ) { while( !queue.empty() ) { @@ -108,7 +108,7 @@ bool Core::Db::DbLoader::process( std::queue< Predicate >& queue ) } template -Core::Db::DbLoader& -Core::Db::DbLoader::addDb< Core::Db::ZoneDbConnection >( Core::Db::DbWorkerPool< Core::Db::ZoneDbConnection >&, +Sapphire::Db::DbLoader& +Sapphire::Db::DbLoader::addDb< Sapphire::Db::ZoneDbConnection >( Sapphire::Db::DbWorkerPool< Sapphire::Db::ZoneDbConnection >&, const ConnectionInfo& ); diff --git a/src/common/Database/DbLoader.h b/src/common/Database/DbLoader.h index a7b6ff9c..d37cb964 100644 --- a/src/common/Database/DbLoader.h +++ b/src/common/Database/DbLoader.h @@ -8,7 +8,7 @@ #include #include "DbConnection.h" -namespace Core::Db +namespace Sapphire::Db { template< class T > diff --git a/src/common/Database/DbWorker.cpp b/src/common/Database/DbWorker.cpp index 8aa41a95..cd492410 100644 --- a/src/common/Database/DbWorker.cpp +++ b/src/common/Database/DbWorker.cpp @@ -2,7 +2,7 @@ #include "Operation.h" #include "Util/LockedWaitQueue.h" -Core::Db::DbWorker::DbWorker( Core::LockedWaitQueue< std::shared_ptr< Operation > >* newQueue, DbConnection* pConn ) +Sapphire::Db::DbWorker::DbWorker( Sapphire::LockedWaitQueue< std::shared_ptr< Operation > >* newQueue, DbConnection* pConn ) { m_pConn = pConn; m_queue = newQueue; @@ -10,14 +10,14 @@ Core::Db::DbWorker::DbWorker( Core::LockedWaitQueue< std::shared_ptr< Operation m_workerThread = std::thread( &DbWorker::workerThread, this ); } -Core::Db::DbWorker::~DbWorker() +Sapphire::Db::DbWorker::~DbWorker() { m_cancelationToken = true; m_queue->cancel(); m_workerThread.join(); } -void Core::Db::DbWorker::workerThread() +void Sapphire::Db::DbWorker::workerThread() { if( !m_queue ) return; diff --git a/src/common/Database/DbWorker.h b/src/common/Database/DbWorker.h index 30b9c1e8..13250c19 100644 --- a/src/common/Database/DbWorker.h +++ b/src/common/Database/DbWorker.h @@ -6,7 +6,7 @@ #include "Util/LockedWaitQueue.h" #include -namespace Core::Db +namespace Sapphire::Db { class DbConnection; class Operation; diff --git a/src/common/Database/DbWorkerPool.cpp b/src/common/Database/DbWorkerPool.cpp index c645700a..9d154967 100644 --- a/src/common/Database/DbWorkerPool.cpp +++ b/src/common/Database/DbWorkerPool.cpp @@ -10,10 +10,10 @@ #include "Logging/Logger.h" #include -extern Core::Framework g_fw; +extern Sapphire::Framework g_fw; class PingOperation : - public Core::Db::Operation + public Sapphire::Db::Operation { bool execute() override { @@ -23,22 +23,22 @@ class PingOperation : }; template< class T > -Core::Db::DbWorkerPool< T >::DbWorkerPool() +Sapphire::Db::DbWorkerPool< T >::DbWorkerPool() : - m_queue( new Core::LockedWaitQueue< std::shared_ptr< Operation > >() ), + m_queue( new Sapphire::LockedWaitQueue< std::shared_ptr< Operation > >() ), m_asyncThreads( 0 ), m_synchThreads( 0 ) { } template< class T > -Core::Db::DbWorkerPool< T >::~DbWorkerPool() +Sapphire::Db::DbWorkerPool< T >::~DbWorkerPool() { m_queue->cancel(); } template< class T > -void Core::Db::DbWorkerPool< T >::setConnectionInfo( const ConnectionInfo& info, +void Sapphire::Db::DbWorkerPool< T >::setConnectionInfo( const ConnectionInfo& info, uint8_t asyncThreads, uint8_t synchThreads ) { @@ -48,7 +48,7 @@ void Core::Db::DbWorkerPool< T >::setConnectionInfo( const ConnectionInfo& info, } template< class T > -uint32_t Core::Db::DbWorkerPool< T >::open() +uint32_t Sapphire::Db::DbWorkerPool< T >::open() { auto pLog = g_fw.get< Logger >(); pLog->info( "[DbPool] Opening DatabasePool " + getDatabaseName() + @@ -73,7 +73,7 @@ uint32_t Core::Db::DbWorkerPool< T >::open() } template< class T > -void Core::Db::DbWorkerPool< T >::close() +void Sapphire::Db::DbWorkerPool< T >::close() { auto pLog = g_fw.get< Logger >(); pLog->info( "[DbPool] Closing down DatabasePool " + getDatabaseName() ); @@ -83,7 +83,7 @@ void Core::Db::DbWorkerPool< T >::close() } template< class T > -bool Core::Db::DbWorkerPool< T >::prepareStatements() +bool Sapphire::Db::DbWorkerPool< T >::prepareStatements() { for( auto& connections : m_connections ) for( auto& connection : connections ) @@ -104,7 +104,7 @@ bool Core::Db::DbWorkerPool< T >::prepareStatements() template< class T > std::shared_ptr< Mysql::ResultSet > -Core::Db::DbWorkerPool< T >::query( const std::string& sql, std::shared_ptr< T > connection ) +Sapphire::Db::DbWorkerPool< T >::query( const std::string& sql, std::shared_ptr< T > connection ) { if( !connection ) connection = getFreeConnection(); @@ -117,7 +117,7 @@ Core::Db::DbWorkerPool< T >::query( const std::string& sql, std::shared_ptr< T > template< class T > std::shared_ptr< Mysql::PreparedResultSet > -Core::Db::DbWorkerPool< T >::query( std::shared_ptr< PreparedStatement > stmt ) +Sapphire::Db::DbWorkerPool< T >::query( std::shared_ptr< PreparedStatement > stmt ) { auto connection = getFreeConnection(); auto ret = std::static_pointer_cast< Mysql::PreparedResultSet >( connection->query( stmt ) ); @@ -127,14 +127,14 @@ Core::Db::DbWorkerPool< T >::query( std::shared_ptr< PreparedStatement > stmt ) } template< class T > -std::shared_ptr< Core::Db::PreparedStatement > -Core::Db::DbWorkerPool< T >::getPreparedStatement( PreparedStatementIndex index ) +std::shared_ptr< Sapphire::Db::PreparedStatement > +Sapphire::Db::DbWorkerPool< T >::getPreparedStatement( PreparedStatementIndex index ) { return std::make_shared< PreparedStatement >( index ); } template< class T > -void Core::Db::DbWorkerPool< T >::escapeString( std::string& str ) +void Sapphire::Db::DbWorkerPool< T >::escapeString( std::string& str ) { if( str.empty() ) return; @@ -146,7 +146,7 @@ void Core::Db::DbWorkerPool< T >::escapeString( std::string& str ) } template< class T > -void Core::Db::DbWorkerPool< T >::keepAlive() +void Sapphire::Db::DbWorkerPool< T >::keepAlive() { for( auto& connection : m_connections[ IDX_SYNCH ] ) { @@ -163,7 +163,7 @@ void Core::Db::DbWorkerPool< T >::keepAlive() } template< class T > -uint32_t Core::Db::DbWorkerPool< T >::openConnections( InternalIndex type, uint8_t numConnections ) +uint32_t Sapphire::Db::DbWorkerPool< T >::openConnections( InternalIndex type, uint8_t numConnections ) { for( uint8_t i = 0; i < numConnections; ++i ) { @@ -194,7 +194,7 @@ uint32_t Core::Db::DbWorkerPool< T >::openConnections( InternalIndex type, uint8 } template< class T > -unsigned long Core::Db::DbWorkerPool< T >::escapeString( char* to, const char* from, unsigned long length ) +unsigned long Sapphire::Db::DbWorkerPool< T >::escapeString( char* to, const char* from, unsigned long length ) { if( !to || !from || !length ) return 0; @@ -204,13 +204,13 @@ unsigned long Core::Db::DbWorkerPool< T >::escapeString( char* to, const char* f } template< class T > -void Core::Db::DbWorkerPool< T >::enqueue( std::shared_ptr< Operation > op ) +void Sapphire::Db::DbWorkerPool< T >::enqueue( std::shared_ptr< Operation > op ) { m_queue->push( op ); } template< class T > -std::shared_ptr< T > Core::Db::DbWorkerPool< T >::getFreeConnection() +std::shared_ptr< T > Sapphire::Db::DbWorkerPool< T >::getFreeConnection() { uint8_t i = 0; const auto numCons = m_connections[ IDX_SYNCH ].size(); @@ -228,27 +228,27 @@ std::shared_ptr< T > Core::Db::DbWorkerPool< T >::getFreeConnection() } template< class T > -const std::string& Core::Db::DbWorkerPool< T >::getDatabaseName() const +const std::string& Sapphire::Db::DbWorkerPool< T >::getDatabaseName() const { return m_connectionInfo.database; } template< class T > -void Core::Db::DbWorkerPool< T >::execute( const std::string& sql ) +void Sapphire::Db::DbWorkerPool< T >::execute( const std::string& sql ) { auto task = std::make_shared< StatementTask >( sql ); enqueue( task ); } template< class T > -void Core::Db::DbWorkerPool< T >::execute( std::shared_ptr< PreparedStatement > stmt ) +void Sapphire::Db::DbWorkerPool< T >::execute( std::shared_ptr< PreparedStatement > stmt ) { auto task = std::make_shared< PreparedStatementTask >( stmt ); enqueue( task ); } template< class T > -void Core::Db::DbWorkerPool< T >::directExecute( const std::string& sql ) +void Sapphire::Db::DbWorkerPool< T >::directExecute( const std::string& sql ) { auto connection = getFreeConnection(); connection->execute( sql ); @@ -256,7 +256,7 @@ void Core::Db::DbWorkerPool< T >::directExecute( const std::string& sql ) } template< class T > -void Core::Db::DbWorkerPool< T >::directExecute( std::shared_ptr< PreparedStatement > stmt ) +void Sapphire::Db::DbWorkerPool< T >::directExecute( std::shared_ptr< PreparedStatement > stmt ) { auto connection = getFreeConnection(); connection->execute( stmt ); @@ -284,4 +284,4 @@ void DatabaseWorkerPool::ExecuteOrAppend(SQLTransaction& trans, PreparedState */ template -class Core::Db::DbWorkerPool< Core::Db::ZoneDbConnection >; +class Sapphire::Db::DbWorkerPool< Sapphire::Db::ZoneDbConnection >; diff --git a/src/common/Database/DbWorkerPool.h b/src/common/Database/DbWorkerPool.h index c23bf31f..6ce6b76d 100644 --- a/src/common/Database/DbWorkerPool.h +++ b/src/common/Database/DbWorkerPool.h @@ -8,7 +8,7 @@ #include "Util/LockedWaitQueue.h" #include "DbConnection.h" -namespace Core::Db +namespace Sapphire::Db { template< typename T > @@ -83,7 +83,7 @@ namespace Core::Db const std::string& getDatabaseName() const; - std::unique_ptr< Core::LockedWaitQueue< std::shared_ptr< Operation > > > m_queue; + std::unique_ptr< Sapphire::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/Operation.h b/src/common/Database/Operation.h index 1ce0a0d7..e2a74586 100644 --- a/src/common/Database/Operation.h +++ b/src/common/Database/Operation.h @@ -6,7 +6,7 @@ namespace Mysql class Connection; } -namespace Core::Db +namespace Sapphire::Db { class DbConnection; diff --git a/src/common/Database/PreparedStatement.cpp b/src/common/Database/PreparedStatement.cpp index 2010e5eb..c01c2a0d 100644 --- a/src/common/Database/PreparedStatement.cpp +++ b/src/common/Database/PreparedStatement.cpp @@ -7,17 +7,17 @@ #include #include -Core::Db::PreparedStatement::PreparedStatement( uint32_t index ) : +Sapphire::Db::PreparedStatement::PreparedStatement( uint32_t index ) : m_stmt( nullptr ), m_index( index ) { } -Core::Db::PreparedStatement::~PreparedStatement() +Sapphire::Db::PreparedStatement::~PreparedStatement() { } -void Core::Db::PreparedStatement::bindParameters() +void Sapphire::Db::PreparedStatement::bindParameters() { assert( m_stmt ); @@ -65,7 +65,7 @@ void Core::Db::PreparedStatement::bindParameters() } //- Bind to buffer -void Core::Db::PreparedStatement::setBool( uint8_t index, const bool value ) +void Sapphire::Db::PreparedStatement::setBool( uint8_t index, const bool value ) { if( index >= m_statementData.size() ) m_statementData.resize( index + 1 ); @@ -74,7 +74,7 @@ void Core::Db::PreparedStatement::setBool( uint8_t index, const bool value ) m_statementData[ index ].type = TYPE_BOOL; } -void Core::Db::PreparedStatement::setUInt( uint8_t index, uint32_t value ) +void Sapphire::Db::PreparedStatement::setUInt( uint8_t index, uint32_t value ) { if( index >= m_statementData.size() ) m_statementData.resize( index + 1 ); @@ -83,7 +83,7 @@ void Core::Db::PreparedStatement::setUInt( uint8_t index, uint32_t value ) m_statementData[ index ].type = TYPE_UI; } -void Core::Db::PreparedStatement::setUInt64( uint8_t index, uint64_t value ) +void Sapphire::Db::PreparedStatement::setUInt64( uint8_t index, uint64_t value ) { if( index >= m_statementData.size() ) m_statementData.resize( index + 1 ); @@ -92,7 +92,7 @@ void Core::Db::PreparedStatement::setUInt64( uint8_t index, uint64_t value ) m_statementData[ index ].type = TYPE_UI64; } -void Core::Db::PreparedStatement::setInt( uint8_t index, int32_t value ) +void Sapphire::Db::PreparedStatement::setInt( uint8_t index, int32_t value ) { if( index >= m_statementData.size() ) m_statementData.resize( index + 1 ); @@ -101,7 +101,7 @@ void Core::Db::PreparedStatement::setInt( uint8_t index, int32_t value ) m_statementData[ index ].type = TYPE_I; } -void Core::Db::PreparedStatement::setInt64( uint8_t index, int64_t value ) +void Sapphire::Db::PreparedStatement::setInt64( uint8_t index, int64_t value ) { if( index >= m_statementData.size() ) m_statementData.resize( index + 1 ); @@ -110,7 +110,7 @@ void Core::Db::PreparedStatement::setInt64( uint8_t index, int64_t value ) m_statementData[ index ].type = TYPE_I64; } -void Core::Db::PreparedStatement::setDouble( uint8_t index, double value ) +void Sapphire::Db::PreparedStatement::setDouble( uint8_t index, double value ) { if( index >= m_statementData.size() ) m_statementData.resize( index + 1 ); @@ -119,7 +119,7 @@ void Core::Db::PreparedStatement::setDouble( uint8_t index, double value ) m_statementData[ index ].type = TYPE_DOUBLE; } -void Core::Db::PreparedStatement::setString( uint8_t index, const std::string& value ) +void Sapphire::Db::PreparedStatement::setString( uint8_t index, const std::string& value ) { if( index >= m_statementData.size() ) m_statementData.resize( index + 1 ); @@ -129,7 +129,7 @@ void Core::Db::PreparedStatement::setString( uint8_t index, const std::string& v m_statementData[ index ].type = TYPE_STRING; } -void Core::Db::PreparedStatement::setBinary( uint8_t index, const std::vector< uint8_t >& value ) +void Sapphire::Db::PreparedStatement::setBinary( uint8_t index, const std::vector< uint8_t >& value ) { if( index >= m_statementData.size() ) m_statementData.resize( index + 1 ); @@ -138,7 +138,7 @@ void Core::Db::PreparedStatement::setBinary( uint8_t index, const std::vector< u m_statementData[ index ].type = TYPE_BINARY; } -void Core::Db::PreparedStatement::setNull( uint8_t index ) +void Sapphire::Db::PreparedStatement::setNull( uint8_t index ) { if( index >= m_statementData.size() ) m_statementData.resize( index + 1 ); @@ -146,12 +146,12 @@ void Core::Db::PreparedStatement::setNull( uint8_t index ) m_statementData[ index ].type = TYPE_NULL; } -uint32_t Core::Db::PreparedStatement::getIndex() const +uint32_t Sapphire::Db::PreparedStatement::getIndex() const { return m_index; } -void Core::Db::PreparedStatement::setMysqlPS( std::shared_ptr< Mysql::PreparedStatement > pStmt ) +void Sapphire::Db::PreparedStatement::setMysqlPS( std::shared_ptr< Mysql::PreparedStatement > pStmt ) { m_stmt = pStmt; } diff --git a/src/common/Database/PreparedStatement.h b/src/common/Database/PreparedStatement.h index 798d90e4..d62c9b9c 100644 --- a/src/common/Database/PreparedStatement.h +++ b/src/common/Database/PreparedStatement.h @@ -12,7 +12,7 @@ namespace Mysql class PreparedStatement; } -namespace Core::Db +namespace Sapphire::Db { union PreparedStatementDataUnion { diff --git a/src/common/Database/StatementTask.cpp b/src/common/Database/StatementTask.cpp index 87bf6e29..d216bce3 100644 --- a/src/common/Database/StatementTask.cpp +++ b/src/common/Database/StatementTask.cpp @@ -4,7 +4,7 @@ #include "DbConnection.h" #include "PreparedStatement.h" -Core::Db::StatementTask::StatementTask( const std::string& sql, bool async ) +Sapphire::Db::StatementTask::StatementTask( const std::string& sql, bool async ) { m_sql = sql; m_hasResult = async; // If the operation is async, then there's a result @@ -12,13 +12,13 @@ Core::Db::StatementTask::StatementTask( const std::string& sql, bool async ) // m_result = new QueryResultPromise(); } -Core::Db::StatementTask::~StatementTask() +Sapphire::Db::StatementTask::~StatementTask() { //if( m_hasResult && m_result != nullptr) // delete m_result; } -bool Core::Db::StatementTask::execute() +bool Sapphire::Db::StatementTask::execute() { if( m_hasResult ) { @@ -38,7 +38,7 @@ bool Core::Db::StatementTask::execute() } -Core::Db::PreparedStatementTask::PreparedStatementTask( std::shared_ptr< Core::Db::PreparedStatement > stmt, +Sapphire::Db::PreparedStatementTask::PreparedStatementTask( std::shared_ptr< Sapphire::Db::PreparedStatement > stmt, bool async ) : m_stmt( stmt ) //, m_result(nullptr) @@ -46,13 +46,13 @@ Core::Db::PreparedStatementTask::PreparedStatementTask( std::shared_ptr< Core::D m_hasResult = async; // If the operation is async, then there's a result } -Core::Db::PreparedStatementTask::~PreparedStatementTask() +Sapphire::Db::PreparedStatementTask::~PreparedStatementTask() { //if (m_has_result && m_result != nullptr) // delete m_result; } -bool Core::Db::PreparedStatementTask::execute() +bool Sapphire::Db::PreparedStatementTask::execute() { //if (m_has_result) //{ diff --git a/src/common/Database/StatementTask.h b/src/common/Database/StatementTask.h index 7054dbb8..1a1e5211 100644 --- a/src/common/Database/StatementTask.h +++ b/src/common/Database/StatementTask.h @@ -5,7 +5,7 @@ #include "Operation.h" #include -namespace Core::Db +namespace Sapphire::Db { class PreparedStatement; diff --git a/src/common/Database/ZoneDbConnection.cpp b/src/common/Database/ZoneDbConnection.cpp index bb92489c..0cc56879 100644 --- a/src/common/Database/ZoneDbConnection.cpp +++ b/src/common/Database/ZoneDbConnection.cpp @@ -1,22 +1,22 @@ #include "ZoneDbConnection.h" #include -Core::Db::ZoneDbConnection::ZoneDbConnection( ConnectionInfo& connInfo ) : +Sapphire::Db::ZoneDbConnection::ZoneDbConnection( ConnectionInfo& connInfo ) : DbConnection( connInfo ) { } -Core::Db::ZoneDbConnection::ZoneDbConnection( Core::LockedWaitQueue< std::shared_ptr< Operation > >* q, +Sapphire::Db::ZoneDbConnection::ZoneDbConnection( Sapphire::LockedWaitQueue< std::shared_ptr< Operation > >* q, ConnectionInfo& connInfo ) : DbConnection( q, connInfo ) { } -Core::Db::ZoneDbConnection::~ZoneDbConnection() +Sapphire::Db::ZoneDbConnection::~ZoneDbConnection() { } -void Core::Db::ZoneDbConnection::doPrepareStatements() +void Sapphire::Db::ZoneDbConnection::doPrepareStatements() { if( !m_reconnecting ) m_stmts.resize( MAX_STATEMENTS ); diff --git a/src/common/Database/ZoneDbConnection.h b/src/common/Database/ZoneDbConnection.h index aa3cdf0f..df8dfdf1 100644 --- a/src/common/Database/ZoneDbConnection.h +++ b/src/common/Database/ZoneDbConnection.h @@ -3,7 +3,7 @@ #include "DbConnection.h" -namespace Core::Db +namespace Sapphire::Db { class DbConnectionInfo; @@ -96,7 +96,7 @@ namespace Core::Db ZoneDbConnection( ConnectionInfo& connInfo ); - ZoneDbConnection( Core::LockedWaitQueue< std::shared_ptr< Operation > >* q, ConnectionInfo& connInfo ); + ZoneDbConnection( Sapphire::LockedWaitQueue< std::shared_ptr< Operation > >* q, ConnectionInfo& connInfo ); ~ZoneDbConnection(); diff --git a/src/common/Exd/ExdDataGenerated.cpp b/src/common/Exd/ExdDataGenerated.cpp index d6585c1a..f73e2013 100644 --- a/src/common/Exd/ExdDataGenerated.cpp +++ b/src/common/Exd/ExdDataGenerated.cpp @@ -1,7 +1,7 @@ #include "ExdDataGenerated.h" #include -Core::Data::Achievement::Achievement( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ) +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 ); @@ -25,7 +25,7 @@ Core::Data::Achievement::Achievement( uint32_t row_id, Core::Data::ExdDataGenera initialHide = exdData->getField< bool >( row, 20 ); } -Core::Data::AchievementCategory::AchievementCategory( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ) +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 ); @@ -33,13 +33,13 @@ Core::Data::AchievementCategory::AchievementCategory( uint32_t row_id, Core::Dat hideCategory = exdData->getField< bool >( row, 3 ); } -Core::Data::AchievementKind::AchievementKind( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ) +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 ); } -Core::Data::Action::Action( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ) +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 ); @@ -80,26 +80,26 @@ Core::Data::Action::Action( uint32_t row_id, Core::Data::ExdDataGenerated* exdDa isPvP = exdData->getField< bool >( row, 50 ); } -Core::Data::ActionCastTimeline::ActionCastTimeline( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ) +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 ); } -Core::Data::ActionCastVFX::ActionCastVFX( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ) +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 ); } -Core::Data::ActionCategory::ActionCategory( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ) +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 ); } -Core::Data::ActionComboRoute::ActionComboRoute( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ) +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 ); @@ -109,49 +109,49 @@ Core::Data::ActionComboRoute::ActionComboRoute( uint32_t row_id, Core::Data::Exd action.push_back( exdData->getField< uint16_t >( row, 5 ) ); } -Core::Data::ActionIndirection::ActionIndirection( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ) +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 ); } -Core::Data::ActionParam::ActionParam( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ) +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 ); } -Core::Data::ActionProcStatus::ActionProcStatus( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ) +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 ); } -Core::Data::ActionTimeline::ActionTimeline( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ) +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 ); } -Core::Data::ActionTimelineMove::ActionTimelineMove( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ) +Sapphire::Data::ActionTimelineMove::ActionTimelineMove( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData ) { auto row = exdData->m_ActionTimelineMoveDat.get_row( row_id ); } -Core::Data::ActionTimelineReplace::ActionTimelineReplace( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ) +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 ); } -Core::Data::ActionTransient::ActionTransient( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ) +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 ); } -Core::Data::ActivityFeedButtons::ActivityFeedButtons( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ) +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 ); @@ -160,7 +160,7 @@ Core::Data::ActivityFeedButtons::ActivityFeedButtons( uint32_t row_id, Core::Dat pictureURL = exdData->getField< std::string >( row, 4 ); } -Core::Data::ActivityFeedCaptions::ActivityFeedCaptions( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ) +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 ); @@ -169,7 +169,7 @@ Core::Data::ActivityFeedCaptions::ActivityFeedCaptions( uint32_t row_id, Core::D fR = exdData->getField< std::string >( row, 3 ); } -Core::Data::ActivityFeedGroupCaptions::ActivityFeedGroupCaptions( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ) +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 ); @@ -178,7 +178,7 @@ Core::Data::ActivityFeedGroupCaptions::ActivityFeedGroupCaptions( uint32_t row_i fR = exdData->getField< std::string >( row, 3 ); } -Core::Data::ActivityFeedImages::ActivityFeedImages( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ) +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 ); @@ -188,13 +188,13 @@ Core::Data::ActivityFeedImages::ActivityFeedImages( uint32_t row_id, Core::Data: activityFeedFR = exdData->getField< std::string >( row, 4 ); } -Core::Data::Addon::Addon( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ) +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 ); } -Core::Data::AddonHud::AddonHud( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ) +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 ); @@ -202,7 +202,7 @@ Core::Data::AddonHud::AddonHud( uint32_t row_id, Core::Data::ExdDataGenerated* e _function = exdData->getField< std::string >( row, 2 ); } -Core::Data::Adventure::Adventure( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ) +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 ); @@ -219,7 +219,7 @@ Core::Data::Adventure::Adventure( uint32_t row_id, Core::Data::ExdDataGenerated* isInitial = exdData->getField< bool >( row, 13 ); } -Core::Data::AdventureExPhase::AdventureExPhase( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ) +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 ); @@ -227,13 +227,13 @@ Core::Data::AdventureExPhase::AdventureExPhase( uint32_t row_id, Core::Data::Exd adventureEnd = exdData->getField< uint32_t >( row, 2 ); } -Core::Data::AetherCurrent::AetherCurrent( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ) +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 ); } -Core::Data::AetherCurrentCompFlgSet::AetherCurrentCompFlgSet( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ) +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 ); @@ -254,7 +254,7 @@ Core::Data::AetherCurrentCompFlgSet::AetherCurrentCompFlgSet( uint32_t row_id, C aetherCurrent.push_back( exdData->getField< int32_t >( row, 16 ) ); } -Core::Data::AetherialWheel::AetherialWheel( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ) +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 ); @@ -263,7 +263,7 @@ Core::Data::AetherialWheel::AetherialWheel( uint32_t row_id, Core::Data::ExdData hoursRequired = exdData->getField< uint8_t >( row, 3 ); } -Core::Data::Aetheryte::Aetheryte( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ) +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 ); @@ -288,31 +288,31 @@ Core::Data::Aetheryte::Aetheryte( uint32_t row_id, Core::Data::ExdDataGenerated* aetherstreamY = exdData->getField< int16_t >( row, 21 ); } -Core::Data::AetheryteSystemDefine::AetheryteSystemDefine( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ) +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 ); } -Core::Data::AirshipExplorationLevel::AirshipExplorationLevel( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ) +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 ); } -Core::Data::AirshipExplorationLog::AirshipExplorationLog( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ) +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 ); } -Core::Data::AirshipExplorationParamType::AirshipExplorationParamType( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ) +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 ); } -Core::Data::AirshipExplorationPart::AirshipExplorationPart( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ) +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 ); @@ -325,7 +325,7 @@ Core::Data::AirshipExplorationPart::AirshipExplorationPart( uint32_t row_id, Cor repairMaterials = exdData->getField< uint8_t >( row, 9 ); } -Core::Data::AirshipExplorationPoint::AirshipExplorationPoint( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ) +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 ); @@ -337,7 +337,7 @@ Core::Data::AirshipExplorationPoint::AirshipExplorationPoint( uint32_t row_id, C expReward = exdData->getField< uint32_t >( row, 13 ); } -Core::Data::AnimaWeapon5::AnimaWeapon5( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ) +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 ); @@ -349,33 +349,33 @@ Core::Data::AnimaWeapon5::AnimaWeapon5( uint32_t row_id, Core::Data::ExdDataGene parameter.push_back( exdData->getField< uint8_t >( row, 7 ) ); } -Core::Data::AnimaWeapon5Param::AnimaWeapon5Param( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ) +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 ); } -Core::Data::AnimaWeapon5PatternGroup::AnimaWeapon5PatternGroup( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ) +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 ); } -Core::Data::AnimaWeapon5SpiritTalk::AnimaWeapon5SpiritTalk( uint32_t row_id, uint32_t subRow, Core::Data::ExdDataGenerated* exdData ) +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 ); } -Core::Data::AnimaWeapon5SpiritTalkParam::AnimaWeapon5SpiritTalkParam( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ) +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 ); } -Core::Data::AnimaWeapon5TradeItem::AnimaWeapon5TradeItem( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ) +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 ); @@ -383,20 +383,20 @@ Core::Data::AnimaWeapon5TradeItem::AnimaWeapon5TradeItem( uint32_t row_id, Core: category = exdData->getField< uint8_t >( row, 27 ); } -Core::Data::AnimaWeaponFUITalk::AnimaWeaponFUITalk( uint32_t row_id, uint32_t subRow, Core::Data::ExdDataGenerated* exdData ) +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 ); } -Core::Data::AnimaWeaponFUITalkParam::AnimaWeaponFUITalkParam( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ) +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 ); } -Core::Data::AnimaWeaponIcon::AnimaWeaponIcon( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ) +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 ); @@ -406,7 +406,7 @@ Core::Data::AnimaWeaponIcon::AnimaWeaponIcon( uint32_t row_id, Core::Data::ExdDa zodiacLux = exdData->getField< int32_t >( row, 4 ); } -Core::Data::AnimaWeaponItem::AnimaWeaponItem( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ) +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 ) ); @@ -425,7 +425,7 @@ Core::Data::AnimaWeaponItem::AnimaWeaponItem( uint32_t row_id, Core::Data::ExdDa item.push_back( exdData->getField< uint32_t >( row, 13 ) ); } -Core::Data::AquariumFish::AquariumFish( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ) +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 ); @@ -433,13 +433,13 @@ Core::Data::AquariumFish::AquariumFish( uint32_t row_id, Core::Data::ExdDataGene item = exdData->getField< uint32_t >( row, 2 ); } -Core::Data::AquariumWater::AquariumWater( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ) +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 ); } -Core::Data::ArrayEventHandler::ArrayEventHandler( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ) +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 ) ); @@ -460,25 +460,25 @@ Core::Data::ArrayEventHandler::ArrayEventHandler( uint32_t row_id, Core::Data::E data.push_back( exdData->getField< uint32_t >( row, 15 ) ); } -Core::Data::AttackType::AttackType( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ) +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 ); } -Core::Data::BacklightColor::BacklightColor( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ) +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 ); } -Core::Data::Balloon::Balloon( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ) +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 ); } -Core::Data::BaseParam::BaseParam( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ) +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 ); @@ -505,7 +505,7 @@ Core::Data::BaseParam::BaseParam( uint32_t row_id, Core::Data::ExdDataGenerated* chestLegsFeet = exdData->getField< uint8_t >( row, 24 ); } -Core::Data::BattleLeve::BattleLeve( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ) +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 ) ); @@ -550,7 +550,7 @@ Core::Data::BattleLeve::BattleLeve( uint32_t row_id, Core::Data::ExdDataGenerate itemDropRate.push_back( exdData->getField< uint8_t >( row, 55 ) ); } -Core::Data::BeastRankBonus::BeastRankBonus( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ) +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 ); @@ -564,14 +564,14 @@ Core::Data::BeastRankBonus::BeastRankBonus( uint32_t row_id, Core::Data::ExdData itemQuantity.push_back( exdData->getField< uint8_t >( row, 16 ) ); } -Core::Data::BeastReputationRank::BeastReputationRank( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ) +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 ); } -Core::Data::BeastTribe::BeastTribe( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ) +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 ); @@ -588,25 +588,25 @@ Core::Data::BeastTribe::BeastTribe( uint32_t row_id, Core::Data::ExdDataGenerate nameRelation = exdData->getField< std::string >( row, 18 ); } -Core::Data::Behavior::Behavior( uint32_t row_id, uint32_t subRow, Core::Data::ExdDataGenerated* 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, 6 ); } -Core::Data::BGM::BGM( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ) +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 ); } -Core::Data::BGMFade::BGMFade( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ) +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 ); } -Core::Data::BGMSituation::BGMSituation( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ) +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 ); @@ -615,26 +615,26 @@ Core::Data::BGMSituation::BGMSituation( uint32_t row_id, Core::Data::ExdDataGene bGMField = exdData->getField< uint16_t >( row, 3 ); } -Core::Data::BGMSwitch::BGMSwitch( uint32_t row_id, uint32_t subRow, Core::Data::ExdDataGenerated* exdData ) +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 ); } -Core::Data::BGMSystemDefine::BGMSystemDefine( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ) +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 ); } -Core::Data::BNpcAnnounceIcon::BNpcAnnounceIcon( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ) +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 ); } -Core::Data::BNpcBase::BNpcBase( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ) +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 ); @@ -647,7 +647,7 @@ Core::Data::BNpcBase::BNpcBase( uint32_t row_id, Core::Data::ExdDataGenerated* e bNpcParts = exdData->getField< uint8_t >( row, 12 ); } -Core::Data::BNpcCustomize::BNpcCustomize( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ) +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 ); @@ -678,7 +678,7 @@ Core::Data::BNpcCustomize::BNpcCustomize( uint32_t row_id, Core::Data::ExdDataGe facePaintColor = exdData->getField< uint8_t >( row, 25 ); } -Core::Data::BNpcName::BNpcName( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ) +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 ); @@ -690,7 +690,7 @@ Core::Data::BNpcName::BNpcName( uint32_t row_id, Core::Data::ExdDataGenerated* e article = exdData->getField< int8_t >( row, 7 ); } -Core::Data::BNpcParts::BNpcParts( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ) +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 ); @@ -725,7 +725,7 @@ Core::Data::BNpcParts::BNpcParts( uint32_t row_id, Core::Data::ExdDataGenerated* scale5 = exdData->getField< float >( row, 54 ); } -Core::Data::Buddy::Buddy( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ) +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 ); @@ -736,7 +736,7 @@ Core::Data::Buddy::Buddy( uint32_t row_id, Core::Data::ExdDataGenerated* exdData soundEffect1 = exdData->getField< std::string >( row, 7 ); } -Core::Data::BuddyAction::BuddyAction( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ) +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 ); @@ -745,7 +745,7 @@ Core::Data::BuddyAction::BuddyAction( uint32_t row_id, Core::Data::ExdDataGenera iconStatus = exdData->getField< int32_t >( row, 3 ); } -Core::Data::BuddyEquip::BuddyEquip( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ) +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 ); @@ -765,19 +765,19 @@ Core::Data::BuddyEquip::BuddyEquip( uint32_t row_id, Core::Data::ExdDataGenerate iconLegs = exdData->getField< uint16_t >( row, 15 ); } -Core::Data::BuddyItem::BuddyItem( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ) +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 ); } -Core::Data::BuddyRank::BuddyRank( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ) +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 ); } -Core::Data::BuddySkill::BuddySkill( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ) +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 ); @@ -787,7 +787,7 @@ Core::Data::BuddySkill::BuddySkill( uint32_t row_id, Core::Data::ExdDataGenerate healer = exdData->getField< uint16_t >( row, 4 ); } -Core::Data::Cabinet::Cabinet( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ) +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 ); @@ -795,7 +795,7 @@ Core::Data::Cabinet::Cabinet( uint32_t row_id, Core::Data::ExdDataGenerated* exd category = exdData->getField< uint8_t >( row, 2 ); } -Core::Data::CabinetCategory::CabinetCategory( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ) +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 ); @@ -803,7 +803,7 @@ Core::Data::CabinetCategory::CabinetCategory( uint32_t row_id, Core::Data::ExdDa category = exdData->getField< int32_t >( row, 2 ); } -Core::Data::Calendar::Calendar( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ) +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 ) ); @@ -872,7 +872,7 @@ Core::Data::Calendar::Calendar( uint32_t row_id, Core::Data::ExdDataGenerated* e day.push_back( exdData->getField< uint8_t >( row, 63 ) ); } -Core::Data::CharaMakeCustomize::CharaMakeCustomize( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ) +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 ); @@ -880,7 +880,7 @@ Core::Data::CharaMakeCustomize::CharaMakeCustomize( uint32_t row_id, Core::Data: isPurchasable = exdData->getField< bool >( row, 3 ); } -Core::Data::CharaMakeType::CharaMakeType( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ) +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 ); @@ -930,14 +930,14 @@ Core::Data::CharaMakeType::CharaMakeType( uint32_t row_id, Core::Data::ExdDataGe facialFeatureIcon.push_back( exdData->getField< int32_t >( row, 3332 ) ); } -Core::Data::ChocoboRace::ChocoboRace( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ) +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 ); } -Core::Data::ChocoboRaceAbility::ChocoboRaceAbility( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ) +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 ); @@ -947,13 +947,13 @@ Core::Data::ChocoboRaceAbility::ChocoboRaceAbility( uint32_t row_id, Core::Data: value = exdData->getField< uint8_t >( row, 4 ); } -Core::Data::ChocoboRaceAbilityType::ChocoboRaceAbilityType( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ) +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 ); } -Core::Data::ChocoboRaceItem::ChocoboRaceItem( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ) +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 ); @@ -961,7 +961,7 @@ Core::Data::ChocoboRaceItem::ChocoboRaceItem( uint32_t row_id, Core::Data::ExdDa icon = exdData->getField< uint32_t >( row, 2 ); } -Core::Data::ChocoboRaceRank::ChocoboRaceRank( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ) +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 ); @@ -971,20 +971,20 @@ Core::Data::ChocoboRaceRank::ChocoboRaceRank( uint32_t row_id, Core::Data::ExdDa icon = exdData->getField< int32_t >( row, 4 ); } -Core::Data::ChocoboRaceStatus::ChocoboRaceStatus( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ) +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 ); } -Core::Data::ChocoboRaceTerritory::ChocoboRaceTerritory( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ) +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 ); } -Core::Data::ChocoboRaceTutorial::ChocoboRaceTutorial( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ) +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 ) ); @@ -997,26 +997,26 @@ Core::Data::ChocoboRaceTutorial::ChocoboRaceTutorial( uint32_t row_id, Core::Dat npcYell.push_back( exdData->getField< int32_t >( row, 7 ) ); } -Core::Data::ChocoboRaceWeather::ChocoboRaceWeather( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ) +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 ); } -Core::Data::ChocoboTaxi::ChocoboTaxi( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ) +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 ); } -Core::Data::ChocoboTaxiStand::ChocoboTaxiStand( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ) +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 ); } -Core::Data::ClassJob::ClassJob( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ) +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 ); @@ -1044,7 +1044,7 @@ Core::Data::ClassJob::ClassJob( uint32_t row_id, Core::Data::ExdDataGenerated* e startingLevel = exdData->getField< uint8_t >( row, 41 ); } -Core::Data::ClassJobCategory::ClassJobCategory( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ) +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 ); @@ -1086,7 +1086,7 @@ Core::Data::ClassJobCategory::ClassJobCategory( uint32_t row_id, Core::Data::Exd rDM = exdData->getField< bool >( row, 36 ); } -Core::Data::Companion::Companion( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ) +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 ); @@ -1106,13 +1106,13 @@ Core::Data::Companion::Companion( uint32_t row_id, Core::Data::ExdDataGenerated* minionRace = exdData->getField< uint8_t >( row, 37 ); } -Core::Data::CompanionMove::CompanionMove( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ) +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 ); } -Core::Data::CompanionTransient::CompanionTransient( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ) +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 ); @@ -1131,7 +1131,7 @@ Core::Data::CompanionTransient::CompanionTransient( uint32_t row_id, Core::Data: minionSkillType = exdData->getField< uint8_t >( row, 13 ); } -Core::Data::CompanyAction::CompanyAction( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ) +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 ); @@ -1143,7 +1143,7 @@ Core::Data::CompanyAction::CompanyAction( uint32_t row_id, Core::Data::ExdDataGe purchasable = exdData->getField< bool >( row, 6 ); } -Core::Data::CompanyCraftDraft::CompanyCraftDraft( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ) +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 ); @@ -1151,19 +1151,19 @@ Core::Data::CompanyCraftDraft::CompanyCraftDraft( uint32_t row_id, Core::Data::E order = exdData->getField< uint32_t >( row, 8 ); } -Core::Data::CompanyCraftDraftCategory::CompanyCraftDraftCategory( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ) +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 ); } -Core::Data::CompanyCraftManufactoryState::CompanyCraftManufactoryState( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ) +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 ); } -Core::Data::CompanyCraftPart::CompanyCraftPart( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ) +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 ); @@ -1172,12 +1172,12 @@ Core::Data::CompanyCraftPart::CompanyCraftPart( uint32_t row_id, Core::Data::Exd companyCraftProcess.push_back( exdData->getField< uint16_t >( row, 4 ) ); } -Core::Data::CompanyCraftProcess::CompanyCraftProcess( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ) +Sapphire::Data::CompanyCraftProcess::CompanyCraftProcess( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData ) { auto row = exdData->m_CompanyCraftProcessDat.get_row( row_id ); } -Core::Data::CompanyCraftSequence::CompanyCraftSequence( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ) +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 ); @@ -1194,19 +1194,19 @@ Core::Data::CompanyCraftSequence::CompanyCraftSequence( uint32_t row_id, Core::D companyCraftPart.push_back( exdData->getField< uint16_t >( row, 12 ) ); } -Core::Data::CompanyCraftSupplyItem::CompanyCraftSupplyItem( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ) +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 ); } -Core::Data::CompanyCraftType::CompanyCraftType( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ) +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 ); } -Core::Data::CompleteJournal::CompleteJournal( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ) +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 ); @@ -1238,28 +1238,28 @@ Core::Data::CompleteJournal::CompleteJournal( uint32_t row_id, Core::Data::ExdDa cutscene.push_back( exdData->getField< int32_t >( row, 29 ) ); } -Core::Data::CompleteJournalCategory::CompleteJournalCategory( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ) +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 ); } -Core::Data::ContentCloseCycle::ContentCloseCycle( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ) +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 ); } -Core::Data::ContentExAction::ContentExAction( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ) +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 ); } -Core::Data::ContentFinderCondition::ContentFinderCondition( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ) +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 ); @@ -1279,13 +1279,13 @@ Core::Data::ContentFinderCondition::ContentFinderCondition( uint32_t row_id, Cor image = exdData->getField< uint32_t >( row, 37 ); } -Core::Data::ContentFinderConditionTransient::ContentFinderConditionTransient( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ) +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 ); } -Core::Data::ContentGauge::ContentGauge( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ) +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 ); @@ -1293,7 +1293,7 @@ Core::Data::ContentGauge::ContentGauge( uint32_t row_id, Core::Data::ExdDataGene textString = exdData->getField< std::string >( row, 3 ); } -Core::Data::ContentGaugeColor::ContentGaugeColor( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ) +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 ); @@ -1301,7 +1301,7 @@ Core::Data::ContentGaugeColor::ContentGaugeColor( uint32_t row_id, Core::Data::E androidColor3 = exdData->getField< uint32_t >( row, 2 ); } -Core::Data::ContentMemberType::ContentMemberType( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ) +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 ); @@ -1310,7 +1310,7 @@ Core::Data::ContentMemberType::ContentMemberType( uint32_t row_id, Core::Data::E rangedPerParty = exdData->getField< uint8_t >( row, 12 ); } -Core::Data::ContentNpcTalk::ContentNpcTalk( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ) +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 ) ); @@ -1323,7 +1323,7 @@ Core::Data::ContentNpcTalk::ContentNpcTalk( uint32_t row_id, Core::Data::ExdData contentTalk.push_back( exdData->getField< uint32_t >( row, 8 ) ); } -Core::Data::ContentRoulette::ContentRoulette( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ) +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 ); @@ -1345,20 +1345,20 @@ Core::Data::ContentRoulette::ContentRoulette( uint32_t row_id, Core::Data::ExdDa instanceContent = exdData->getField< uint16_t >( row, 35 ); } -Core::Data::ContentRouletteOpenRule::ContentRouletteOpenRule( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ) +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 ); } -Core::Data::ContentRouletteRoleBonus::ContentRouletteRoleBonus( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ) +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 ); } -Core::Data::ContentsNote::ContentsNote( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ) +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 ); @@ -1373,21 +1373,21 @@ Core::Data::ContentsNote::ContentsNote( uint32_t row_id, Core::Data::ExdDataGene expCap = exdData->getField< int32_t >( row, 13 ); } -Core::Data::ContentTalk::ContentTalk( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ) +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 ); } -Core::Data::ContentTalkParam::ContentTalkParam( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ) +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 ); } -Core::Data::ContentType::ContentType( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ) +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 ); @@ -1395,7 +1395,7 @@ Core::Data::ContentType::ContentType( uint32_t row_id, Core::Data::ExdDataGenera iconDutyFinder = exdData->getField< uint32_t >( row, 2 ); } -Core::Data::CraftAction::CraftAction( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ) +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 ); @@ -1419,7 +1419,7 @@ Core::Data::CraftAction::CraftAction( uint32_t row_id, Core::Data::ExdDataGenera cUL = exdData->getField< int32_t >( row, 19 ); } -Core::Data::CraftLeve::CraftLeve( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ) +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 ); @@ -1427,13 +1427,13 @@ Core::Data::CraftLeve::CraftLeve( uint32_t row_id, Core::Data::ExdDataGenerated* repeats = exdData->getField< uint8_t >( row, 2 ); } -Core::Data::CraftType::CraftType( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ) +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 ); } -Core::Data::Credit::Credit( uint32_t row_id, uint32_t subRow, Core::Data::ExdDataGenerated* exdData ) +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 ); @@ -1448,20 +1448,20 @@ Core::Data::Credit::Credit( uint32_t row_id, uint32_t subRow, Core::Data::ExdDat germanCast2 = exdData->getField< uint16_t >( row, 10 ); } -Core::Data::CreditCast::CreditCast( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ) +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 ); } -Core::Data::Currency::Currency( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ) +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 ); } -Core::Data::CustomTalk::CustomTalk( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ) +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 ); @@ -1530,30 +1530,30 @@ Core::Data::CustomTalk::CustomTalk( uint32_t row_id, Core::Data::ExdDataGenerate text = exdData->getField< bool >( row, 66 ); } -Core::Data::Cutscene::Cutscene( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ) +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 ); } -Core::Data::CutScreenImage::CutScreenImage( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ) +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 ); } -Core::Data::DailySupplyItem::DailySupplyItem( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ) +Sapphire::Data::DailySupplyItem::DailySupplyItem( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData ) { auto row = exdData->m_DailySupplyItemDat.get_row( row_id ); } -Core::Data::DeepDungeon::DeepDungeon( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ) +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 ); } -Core::Data::DeepDungeonBan::DeepDungeonBan( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ) +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 ); @@ -1561,7 +1561,7 @@ Core::Data::DeepDungeonBan::DeepDungeonBan( uint32_t row_id, Core::Data::ExdData name = exdData->getField< uint16_t >( row, 2 ); } -Core::Data::DeepDungeonDanger::DeepDungeonDanger( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ) +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 ); @@ -1569,7 +1569,7 @@ Core::Data::DeepDungeonDanger::DeepDungeonDanger( uint32_t row_id, Core::Data::E name = exdData->getField< uint16_t >( row, 2 ); } -Core::Data::DeepDungeonEquipment::DeepDungeonEquipment( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ) +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 ); @@ -1584,7 +1584,7 @@ Core::Data::DeepDungeonEquipment::DeepDungeonEquipment( uint32_t row_id, Core::D description = exdData->getField< std::string >( row, 10 ); } -Core::Data::DeepDungeonFloorEffectUI::DeepDungeonFloorEffectUI( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ) +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 ); @@ -1592,7 +1592,7 @@ Core::Data::DeepDungeonFloorEffectUI::DeepDungeonFloorEffectUI( uint32_t row_id, description = exdData->getField< std::string >( row, 2 ); } -Core::Data::DeepDungeonItem::DeepDungeonItem( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ) +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 ); @@ -1608,13 +1608,13 @@ Core::Data::DeepDungeonItem::DeepDungeonItem( uint32_t row_id, Core::Data::ExdDa action = exdData->getField< uint32_t >( row, 11 ); } -Core::Data::DeepDungeonLayer::DeepDungeonLayer( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ) +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 ); } -Core::Data::DeepDungeonMagicStone::DeepDungeonMagicStone( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ) +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 ); @@ -1629,7 +1629,7 @@ Core::Data::DeepDungeonMagicStone::DeepDungeonMagicStone( uint32_t row_id, Core: tooltip = exdData->getField< std::string >( row, 10 ); } -Core::Data::DeepDungeonMap5X::DeepDungeonMap5X( uint32_t row_id, uint32_t subRow, Core::Data::ExdDataGenerated* exdData ) +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 ) ); @@ -1639,7 +1639,7 @@ Core::Data::DeepDungeonMap5X::DeepDungeonMap5X( uint32_t row_id, uint32_t subRow deepDungeonRoom.push_back( exdData->getField< uint16_t >( row, 4 ) ); } -Core::Data::DeepDungeonRoom::DeepDungeonRoom( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ) +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 ) ); @@ -1649,7 +1649,7 @@ Core::Data::DeepDungeonRoom::DeepDungeonRoom( uint32_t row_id, Core::Data::ExdDa level.push_back( exdData->getField< uint32_t >( row, 4 ) ); } -Core::Data::DeepDungeonStatus::DeepDungeonStatus( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ) +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 ); @@ -1657,7 +1657,7 @@ Core::Data::DeepDungeonStatus::DeepDungeonStatus( uint32_t row_id, Core::Data::E name = exdData->getField< uint16_t >( row, 2 ); } -Core::Data::DefaultTalk::DefaultTalk( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ) +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 ) ); @@ -1668,31 +1668,31 @@ Core::Data::DefaultTalk::DefaultTalk( uint32_t row_id, Core::Data::ExdDataGenera text.push_back( exdData->getField< std::string >( row, 22 ) ); } -Core::Data::DefaultTalkLipSyncType::DefaultTalkLipSyncType( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ) +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 ); } -Core::Data::DeliveryQuest::DeliveryQuest( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ) +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 ); } -Core::Data::DisposalShop::DisposalShop( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ) +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 ); } -Core::Data::DisposalShopFilterType::DisposalShopFilterType( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ) +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 ); } -Core::Data::DisposalShopItem::DisposalShopItem( uint32_t row_id, uint32_t subRow, Core::Data::ExdDataGenerated* exdData ) +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 ); @@ -1700,7 +1700,7 @@ Core::Data::DisposalShopItem::DisposalShopItem( uint32_t row_id, uint32_t subRow quantityReceived = exdData->getField< uint32_t >( row, 4 ); } -Core::Data::DpsChallenge::DpsChallenge( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ) +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 ); @@ -1711,7 +1711,7 @@ Core::Data::DpsChallenge::DpsChallenge( uint32_t row_id, Core::Data::ExdDataGene description = exdData->getField< std::string >( row, 5 ); } -Core::Data::DpsChallengeOfficer::DpsChallengeOfficer( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ) +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 ); @@ -1742,13 +1742,13 @@ Core::Data::DpsChallengeOfficer::DpsChallengeOfficer( uint32_t row_id, Core::Dat challengeName.push_back( exdData->getField< uint16_t >( row, 25 ) ); } -Core::Data::DpsChallengeTransient::DpsChallengeTransient( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ) +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 ); } -Core::Data::Emote::Emote( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ) +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 ); @@ -1770,13 +1770,13 @@ Core::Data::Emote::Emote( uint32_t row_id, Core::Data::ExdDataGenerated* exdData unlockLink = exdData->getField< uint32_t >( row, 22 ); } -Core::Data::EmoteCategory::EmoteCategory( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ) +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 ); } -Core::Data::ENpcBase::ENpcBase( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ) +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 ) ); @@ -1867,7 +1867,7 @@ Core::Data::ENpcBase::ENpcBase( uint32_t row_id, Core::Data::ExdDataGenerated* e balloon = exdData->getField< uint16_t >( row, 91 ); } -Core::Data::ENpcResident::ENpcResident( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ) +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 ); @@ -1881,14 +1881,14 @@ Core::Data::ENpcResident::ENpcResident( uint32_t row_id, Core::Data::ExdDataGene map = exdData->getField< uint8_t >( row, 9 ); } -Core::Data::EObj::EObj( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ) +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 ); } -Core::Data::EObjName::EObjName( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ) +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 ); @@ -1900,7 +1900,7 @@ Core::Data::EObjName::EObjName( uint32_t row_id, Core::Data::ExdDataGenerated* e article = exdData->getField< int8_t >( row, 7 ); } -Core::Data::EquipRaceCategory::EquipRaceCategory( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ) +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 ); @@ -1913,7 +1913,7 @@ Core::Data::EquipRaceCategory::EquipRaceCategory( uint32_t row_id, Core::Data::E female = exdData->getField< bool >( row, 7 ); } -Core::Data::EquipSlotCategory::EquipSlotCategory( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ) +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 ); @@ -1932,7 +1932,7 @@ Core::Data::EquipSlotCategory::EquipSlotCategory( uint32_t row_id, Core::Data::E soulCrystal = exdData->getField< int8_t >( row, 13 ); } -Core::Data::EurekaAetherItem::EurekaAetherItem( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ) +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 ); @@ -1945,32 +1945,32 @@ Core::Data::EurekaAetherItem::EurekaAetherItem( uint32_t row_id, Core::Data::Exd name = exdData->getField< std::string >( row, 8 ); } -Core::Data::EurekaAethernet::EurekaAethernet( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ) +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 ); } -Core::Data::EurekaGrowData::EurekaGrowData( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ) +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 ); } -Core::Data::EurekaLogosMixerProbability::EurekaLogosMixerProbability( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ) +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 ); } -Core::Data::EurekaMagiaAction::EurekaMagiaAction( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ) +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 ); } -Core::Data::EurekaMagiciteItem::EurekaMagiciteItem( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ) +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 ); @@ -1978,19 +1978,19 @@ Core::Data::EurekaMagiciteItem::EurekaMagiciteItem( uint32_t row_id, Core::Data: item = exdData->getField< uint32_t >( row, 2 ); } -Core::Data::EurekaMagiciteItemType::EurekaMagiciteItemType( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ) +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 ); } -Core::Data::EurekaSphereElementAdjust::EurekaSphereElementAdjust( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ) +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 ); } -Core::Data::EventAction::EventAction( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ) +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 ); @@ -2001,7 +2001,7 @@ Core::Data::EventAction::EventAction( uint32_t row_id, Core::Data::ExdDataGenera animation.push_back( exdData->getField< uint16_t >( row, 5 ) ); } -Core::Data::EventIconPriority::EventIconPriority( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ) +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 ) ); @@ -2022,7 +2022,7 @@ Core::Data::EventIconPriority::EventIconPriority( uint32_t row_id, Core::Data::E icon.push_back( exdData->getField< uint32_t >( row, 15 ) ); } -Core::Data::EventIconType::EventIconType( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ) +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 ); @@ -2032,7 +2032,7 @@ Core::Data::EventIconType::EventIconType( uint32_t row_id, Core::Data::ExdDataGe iconRange = exdData->getField< uint8_t >( row, 4 ); } -Core::Data::EventItem::EventItem( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ) +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 ); @@ -2050,37 +2050,37 @@ Core::Data::EventItem::EventItem( uint32_t row_id, Core::Data::ExdDataGenerated* castTime = exdData->getField< uint8_t >( row, 15 ); } -Core::Data::EventItemCastTimeline::EventItemCastTimeline( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ) +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 ); } -Core::Data::EventItemHelp::EventItemHelp( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ) +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 ); } -Core::Data::EventItemTimeline::EventItemTimeline( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ) +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 ); } -Core::Data::ExportedSG::ExportedSG( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ) +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 ); } -Core::Data::ExVersion::ExVersion( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ) +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 ); } -Core::Data::Fate::Fate( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ) +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 ); @@ -2101,57 +2101,57 @@ Core::Data::Fate::Fate( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ) arrayIndex = exdData->getField< uint32_t >( row, 33 ); } -Core::Data::FCActivity::FCActivity( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ) +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 ); } -Core::Data::FCActivityCategory::FCActivityCategory( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ) +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 ); } -Core::Data::FCAuthority::FCAuthority( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ) +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 ); } -Core::Data::FCAuthorityCategory::FCAuthorityCategory( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ) +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 ); } -Core::Data::FCChestName::FCChestName( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ) +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 ); } -Core::Data::FccShop::FccShop( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ) +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 ); } -Core::Data::FCHierarchy::FCHierarchy( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ) +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 ); } -Core::Data::FCProfile::FCProfile( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ) +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 ); } -Core::Data::FCReputation::FCReputation( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ) +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 ); @@ -2159,7 +2159,7 @@ Core::Data::FCReputation::FCReputation( uint32_t row_id, Core::Data::ExdDataGene name = exdData->getField< std::string >( row, 4 ); } -Core::Data::FCRights::FCRights( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ) +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 ); @@ -2168,32 +2168,32 @@ Core::Data::FCRights::FCRights( uint32_t row_id, Core::Data::ExdDataGenerated* e fCRank = exdData->getField< uint8_t >( row, 3 ); } -Core::Data::Festival::Festival( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ) +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 ); } -Core::Data::FieldMarker::FieldMarker( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ) +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 ); } -Core::Data::FishingRecordType::FishingRecordType( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ) +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 ); } -Core::Data::FishingRecordTypeTransient::FishingRecordTypeTransient( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ) +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 ); } -Core::Data::FishingSpot::FishingSpot( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ) +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 ); @@ -2217,7 +2217,7 @@ Core::Data::FishingSpot::FishingSpot( uint32_t row_id, Core::Data::ExdDataGenera placeName = exdData->getField< uint16_t >( row, 20 ); } -Core::Data::FishParameter::FishParameter( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ) +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 ); @@ -2232,7 +2232,7 @@ Core::Data::FishParameter::FishParameter( uint32_t row_id, Core::Data::ExdDataGe gatheringSubCategory = exdData->getField< uint16_t >( row, 10 ); } -Core::Data::Frontline03::Frontline03( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ) +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 ) ); @@ -2249,7 +2249,7 @@ Core::Data::Frontline03::Frontline03( uint32_t row_id, Core::Data::ExdDataGenera immortalFlamesIcon.push_back( exdData->getField< uint32_t >( row, 20 ) ); } -Core::Data::Frontline04::Frontline04( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ) +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 ); @@ -2284,26 +2284,26 @@ Core::Data::Frontline04::Frontline04( uint32_t row_id, Core::Data::ExdDataGenera unknownLevel.push_back( exdData->getField< int32_t >( row, 32 ) ); } -Core::Data::GardeningSeed::GardeningSeed( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ) +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 ); } -Core::Data::GatheringCondition::GatheringCondition( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ) +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 ); } -Core::Data::GatheringExp::GatheringExp( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ) +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 ); } -Core::Data::GatheringItem::GatheringItem( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ) +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 ); @@ -2311,20 +2311,20 @@ Core::Data::GatheringItem::GatheringItem( uint32_t row_id, Core::Data::ExdDataGe isHidden = exdData->getField< bool >( row, 2 ); } -Core::Data::GatheringItemLevelConvertTable::GatheringItemLevelConvertTable( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ) +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 ); } -Core::Data::GatheringItemPoint::GatheringItemPoint( uint32_t row_id, uint32_t subRow, Core::Data::ExdDataGenerated* exdData ) +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 ); } -Core::Data::GatheringLeve::GatheringLeve( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ) +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 ); @@ -2332,12 +2332,12 @@ Core::Data::GatheringLeve::GatheringLeve( uint32_t row_id, Core::Data::ExdDataGe requiredItem2 = exdData->getField< int32_t >( row, 6 ); } -Core::Data::GatheringLeveRoute::GatheringLeveRoute( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ) +Sapphire::Data::GatheringLeveRoute::GatheringLeveRoute( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData ) { auto row = exdData->m_GatheringLeveRouteDat.get_row( row_id ); } -Core::Data::GatheringNotebookList::GatheringNotebookList( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ) +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 ) ); @@ -2442,7 +2442,7 @@ Core::Data::GatheringNotebookList::GatheringNotebookList( uint32_t row_id, Core: gatheringItem.push_back( exdData->getField< int32_t >( row, 100 ) ); } -Core::Data::GatheringPoint::GatheringPoint( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ) +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 ); @@ -2453,7 +2453,7 @@ Core::Data::GatheringPoint::GatheringPoint( uint32_t row_id, Core::Data::ExdData gatheringSubCategory = exdData->getField< uint16_t >( row, 7 ); } -Core::Data::GatheringPointBase::GatheringPointBase( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ) +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 ); @@ -2469,7 +2469,7 @@ Core::Data::GatheringPointBase::GatheringPointBase( uint32_t row_id, Core::Data: isLimited = exdData->getField< bool >( row, 10 ); } -Core::Data::GatheringPointBonus::GatheringPointBonus( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ) +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 ); @@ -2478,13 +2478,13 @@ Core::Data::GatheringPointBonus::GatheringPointBonus( uint32_t row_id, Core::Dat bonusValue = exdData->getField< uint16_t >( row, 4 ); } -Core::Data::GatheringPointBonusType::GatheringPointBonusType( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ) +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 ); } -Core::Data::GatheringPointName::GatheringPointName( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ) +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 ); @@ -2496,14 +2496,14 @@ Core::Data::GatheringPointName::GatheringPointName( uint32_t row_id, Core::Data: article = exdData->getField< int8_t >( row, 7 ); } -Core::Data::GatheringSubCategory::GatheringSubCategory( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ) +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 ); } -Core::Data::GatheringType::GatheringType( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ) +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 ); @@ -2511,7 +2511,7 @@ Core::Data::GatheringType::GatheringType( uint32_t row_id, Core::Data::ExdDataGe iconOff = exdData->getField< int32_t >( row, 2 ); } -Core::Data::GcArmyCaptureTactics::GcArmyCaptureTactics( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ) +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 ); @@ -2522,7 +2522,7 @@ Core::Data::GcArmyCaptureTactics::GcArmyCaptureTactics( uint32_t row_id, Core::D icon = exdData->getField< uint32_t >( row, 5 ); } -Core::Data::GcArmyExpedition::GcArmyExpedition( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ) +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 ); @@ -2536,27 +2536,27 @@ Core::Data::GcArmyExpedition::GcArmyExpedition( uint32_t row_id, Core::Data::Exd description = exdData->getField< std::string >( row, 9 ); } -Core::Data::GcArmyExpeditionMemberBonus::GcArmyExpeditionMemberBonus( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ) +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 ); } -Core::Data::GcArmyExpeditionType::GcArmyExpeditionType( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ) +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 ); } -Core::Data::GcArmyMemberGrow::GcArmyMemberGrow( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ) +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 ); } -Core::Data::GcArmyTraining::GcArmyTraining( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ) +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 ); @@ -2567,7 +2567,7 @@ Core::Data::GcArmyTraining::GcArmyTraining( uint32_t row_id, Core::Data::ExdData description = exdData->getField< std::string >( row, 5 ); } -Core::Data::GCRankGridaniaFemaleText::GCRankGridaniaFemaleText( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ) +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 ); @@ -2580,7 +2580,7 @@ Core::Data::GCRankGridaniaFemaleText::GCRankGridaniaFemaleText( uint32_t row_id, nameRank = exdData->getField< std::string >( row, 8 ); } -Core::Data::GCRankGridaniaMaleText::GCRankGridaniaMaleText( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ) +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 ); @@ -2593,7 +2593,7 @@ Core::Data::GCRankGridaniaMaleText::GCRankGridaniaMaleText( uint32_t row_id, Cor nameRank = exdData->getField< std::string >( row, 8 ); } -Core::Data::GCRankLimsaFemaleText::GCRankLimsaFemaleText( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ) +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 ); @@ -2606,7 +2606,7 @@ Core::Data::GCRankLimsaFemaleText::GCRankLimsaFemaleText( uint32_t row_id, Core: nameRank = exdData->getField< std::string >( row, 8 ); } -Core::Data::GCRankLimsaMaleText::GCRankLimsaMaleText( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ) +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 ); @@ -2619,7 +2619,7 @@ Core::Data::GCRankLimsaMaleText::GCRankLimsaMaleText( uint32_t row_id, Core::Dat nameRank = exdData->getField< std::string >( row, 8 ); } -Core::Data::GCRankUldahFemaleText::GCRankUldahFemaleText( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ) +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 ); @@ -2632,7 +2632,7 @@ Core::Data::GCRankUldahFemaleText::GCRankUldahFemaleText( uint32_t row_id, Core: nameRank = exdData->getField< std::string >( row, 8 ); } -Core::Data::GCRankUldahMaleText::GCRankUldahMaleText( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ) +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 ); @@ -2645,7 +2645,7 @@ Core::Data::GCRankUldahMaleText::GCRankUldahMaleText( uint32_t row_id, Core::Dat nameRank = exdData->getField< std::string >( row, 8 ); } -Core::Data::GCScripShopCategory::GCScripShopCategory( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ) +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 ); @@ -2653,7 +2653,7 @@ Core::Data::GCScripShopCategory::GCScripShopCategory( uint32_t row_id, Core::Dat subCategory = exdData->getField< int8_t >( row, 2 ); } -Core::Data::GCScripShopItem::GCScripShopItem( uint32_t row_id, uint32_t subRow, Core::Data::ExdDataGenerated* exdData ) +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 ); @@ -2662,24 +2662,24 @@ Core::Data::GCScripShopItem::GCScripShopItem( uint32_t row_id, uint32_t subRow, sortKey = exdData->getField< uint8_t >( row, 3 ); } -Core::Data::GCShop::GCShop( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ) +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 ); } -Core::Data::GCShopItemCategory::GCShopItemCategory( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ) +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 ); } -Core::Data::GCSupplyDuty::GCSupplyDuty( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ) +Sapphire::Data::GCSupplyDuty::GCSupplyDuty( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData ) { auto row = exdData->m_GCSupplyDutyDat.get_row( row_id ); } -Core::Data::GCSupplyDutyReward::GCSupplyDutyReward( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ) +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 ); @@ -2689,7 +2689,7 @@ Core::Data::GCSupplyDutyReward::GCSupplyDutyReward( uint32_t row_id, Core::Data: sealsProvisioning = exdData->getField< uint32_t >( row, 4 ); } -Core::Data::GeneralAction::GeneralAction( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ) +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 ); @@ -2699,7 +2699,7 @@ Core::Data::GeneralAction::GeneralAction( uint32_t row_id, Core::Data::ExdDataGe icon = exdData->getField< int32_t >( row, 7 ); } -Core::Data::GFATE::GFATE( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ) +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 ) ); @@ -2720,25 +2720,25 @@ Core::Data::GFATE::GFATE( uint32_t row_id, Core::Data::ExdDataGenerated* exdData icon.push_back( exdData->getField< uint32_t >( row, 37 ) ); } -Core::Data::GFateClimbing2::GFateClimbing2( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ) +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 ); } -Core::Data::GFateClimbing2Content::GFateClimbing2Content( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ) +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 ); } -Core::Data::GFateClimbing2TotemType::GFateClimbing2TotemType( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ) +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 ); } -Core::Data::GilShop::GilShop( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ) +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 ); @@ -2751,7 +2751,7 @@ Core::Data::GilShop::GilShop( uint32_t row_id, Core::Data::ExdDataGenerated* exd failTalk = exdData->getField< int32_t >( row, 7 ); } -Core::Data::GilShopItem::GilShopItem( uint32_t row_id, uint32_t subRow, Core::Data::ExdDataGenerated* exdData ) +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 ); @@ -2762,7 +2762,7 @@ Core::Data::GilShopItem::GilShopItem( uint32_t row_id, uint32_t subRow, Core::Da patch = exdData->getField< uint16_t >( row, 8 ); } -Core::Data::GoldSaucerArcadeMachine::GoldSaucerArcadeMachine( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ) +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 ); @@ -2772,19 +2772,19 @@ Core::Data::GoldSaucerArcadeMachine::GoldSaucerArcadeMachine( uint32_t row_id, C excellent = exdData->getField< uint32_t >( row, 38 ); } -Core::Data::GoldSaucerTextData::GoldSaucerTextData( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ) +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 ); } -Core::Data::GrandCompany::GrandCompany( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ) +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 ); } -Core::Data::GrandCompanyRank::GrandCompanyRank( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ) +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 ); @@ -2799,7 +2799,7 @@ Core::Data::GrandCompanyRank::GrandCompanyRank( uint32_t row_id, Core::Data::Exd questFlames = exdData->getField< int32_t >( row, 9 ); } -Core::Data::GuardianDeity::GuardianDeity( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ) +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 ); @@ -2807,7 +2807,7 @@ Core::Data::GuardianDeity::GuardianDeity( uint32_t row_id, Core::Data::ExdDataGe icon = exdData->getField< uint16_t >( row, 2 ); } -Core::Data::GuildleveAssignment::GuildleveAssignment( uint32_t row_id, Core::Data::ExdDataGenerated* 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 ); @@ -2815,7 +2815,7 @@ Core::Data::GuildleveAssignment::GuildleveAssignment( uint32_t row_id, Core::Dat quest.push_back( exdData->getField< uint32_t >( row, 3 ) ); } -Core::Data::GuildleveAssignmentCategory::GuildleveAssignmentCategory( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ) +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 ) ); @@ -2828,17 +2828,17 @@ Core::Data::GuildleveAssignmentCategory::GuildleveAssignmentCategory( uint32_t r category.push_back( exdData->getField< int32_t >( row, 7 ) ); } -Core::Data::GuildOrderGuide::GuildOrderGuide( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ) +Sapphire::Data::GuildOrderGuide::GuildOrderGuide( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData ) { auto row = exdData->m_GuildOrderGuideDat.get_row( row_id ); } -Core::Data::GuildOrderOfficer::GuildOrderOfficer( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ) +Sapphire::Data::GuildOrderOfficer::GuildOrderOfficer( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData ) { auto row = exdData->m_GuildOrderOfficerDat.get_row( row_id ); } -Core::Data::HairMakeType::HairMakeType( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ) +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 ); @@ -2846,13 +2846,13 @@ Core::Data::HairMakeType::HairMakeType( uint32_t row_id, Core::Data::ExdDataGene gender = exdData->getField< int8_t >( row, 2 ); } -Core::Data::HouseRetainerPose::HouseRetainerPose( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ) +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 ); } -Core::Data::HousingAethernet::HousingAethernet( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ) +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 ); @@ -2861,7 +2861,7 @@ Core::Data::HousingAethernet::HousingAethernet( uint32_t row_id, Core::Data::Exd order = exdData->getField< uint8_t >( row, 3 ); } -Core::Data::HousingAppeal::HousingAppeal( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ) +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 ); @@ -2869,7 +2869,7 @@ Core::Data::HousingAppeal::HousingAppeal( uint32_t row_id, Core::Data::ExdDataGe order = exdData->getField< uint8_t >( row, 2 ); } -Core::Data::HousingEmploymentNpcList::HousingEmploymentNpcList( uint32_t row_id, uint32_t subRow, Core::Data::ExdDataGenerated* exdData ) +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 ); @@ -2877,13 +2877,13 @@ Core::Data::HousingEmploymentNpcList::HousingEmploymentNpcList( uint32_t row_id, eNpcBase.push_back( exdData->getField< uint32_t >( row, 2 ) ); } -Core::Data::HousingEmploymentNpcRace::HousingEmploymentNpcRace( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ) +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 ); } -Core::Data::HousingExterior::HousingExterior( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ) +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 ); @@ -2891,7 +2891,7 @@ Core::Data::HousingExterior::HousingExterior( uint32_t row_id, Core::Data::ExdDa model = exdData->getField< std::string >( row, 4 ); } -Core::Data::HousingFurniture::HousingFurniture( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ) +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 ); @@ -2906,20 +2906,20 @@ Core::Data::HousingFurniture::HousingFurniture( uint32_t row_id, Core::Data::Exd tooltip = exdData->getField< bool >( row, 9 ); } -Core::Data::HousingMapMarkerInfo::HousingMapMarkerInfo( uint32_t row_id, uint32_t subRow, Core::Data::ExdDataGenerated* exdData ) +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 ); map = exdData->getField< uint16_t >( row, 4 ); } -Core::Data::HousingMerchantPose::HousingMerchantPose( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ) +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 ); } -Core::Data::HousingLandSet::HousingLandSet( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ) +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 ) ); @@ -3046,13 +3046,13 @@ Core::Data::HousingLandSet::HousingLandSet( uint32_t row_id, Core::Data::ExdData initialPrice.push_back( exdData->getField< uint32_t >( row, 359 ) ); } -Core::Data::HousingPlacement::HousingPlacement( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ) +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 ); } -Core::Data::HousingPreset::HousingPreset( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ) +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 ); @@ -3080,7 +3080,7 @@ Core::Data::HousingPreset::HousingPreset( uint32_t row_id, Core::Data::ExdDataGe mansionLighting = exdData->getField< int32_t >( row, 23 ); } -Core::Data::HousingUnitedExterior::HousingUnitedExterior( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ) +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 ) ); @@ -3093,7 +3093,7 @@ Core::Data::HousingUnitedExterior::HousingUnitedExterior( uint32_t row_id, Core: item.push_back( exdData->getField< uint32_t >( row, 8 ) ); } -Core::Data::HousingYardObject::HousingYardObject( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ) +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 ); @@ -3106,7 +3106,7 @@ Core::Data::HousingYardObject::HousingYardObject( uint32_t row_id, Core::Data::E destroyOnRemoval = exdData->getField< bool >( row, 7 ); } -Core::Data::HowTo::HowTo( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ) +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 ) ); @@ -3122,19 +3122,19 @@ Core::Data::HowTo::HowTo( uint32_t row_id, Core::Data::ExdDataGenerated* exdData category = exdData->getField< int8_t >( row, 12 ); } -Core::Data::HowToCategory::HowToCategory( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ) +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 ); } -Core::Data::HowToPage::HowToPage( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ) +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 ); } -Core::Data::InstanceContent::InstanceContent( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ) +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 ); @@ -3163,20 +3163,20 @@ Core::Data::InstanceContent::InstanceContent( uint32_t row_id, Core::Data::ExdDa partyCondition = exdData->getField< uint8_t >( row, 55 ); } -Core::Data::InstanceContentBuff::InstanceContentBuff( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ) +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 ); } -Core::Data::InstanceContentTextData::InstanceContentTextData( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ) +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 ); } -Core::Data::Item::Item( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ) +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 ); @@ -3239,7 +3239,7 @@ Core::Data::Item::Item( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ) isGlamourous = exdData->getField< bool >( row, 87 ); } -Core::Data::ItemAction::ItemAction( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ) +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 ); @@ -3263,12 +3263,12 @@ Core::Data::ItemAction::ItemAction( uint32_t row_id, Core::Data::ExdDataGenerate dataHQ.push_back( exdData->getField< uint16_t >( row, 22 ) ); } -Core::Data::ItemFood::ItemFood( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ) +Sapphire::Data::ItemFood::ItemFood( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData ) { auto row = exdData->m_ItemFoodDat.get_row( row_id ); } -Core::Data::ItemLevel::ItemLevel( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ) +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 ); @@ -3346,7 +3346,7 @@ Core::Data::ItemLevel::ItemLevel( uint32_t row_id, Core::Data::ExdDataGenerated* perception = exdData->getField< uint16_t >( row, 72 ); } -Core::Data::ItemSearchCategory::ItemSearchCategory( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ) +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 ); @@ -3356,19 +3356,19 @@ Core::Data::ItemSearchCategory::ItemSearchCategory( uint32_t row_id, Core::Data: classJob = exdData->getField< int8_t >( row, 4 ); } -Core::Data::ItemSeries::ItemSeries( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ) +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 ); } -Core::Data::ItemSpecialBonus::ItemSpecialBonus( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ) +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 ); } -Core::Data::ItemUICategory::ItemUICategory( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ) +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 ); @@ -3377,14 +3377,14 @@ Core::Data::ItemUICategory::ItemUICategory( uint32_t row_id, Core::Data::ExdData orderMajor = exdData->getField< uint8_t >( row, 3 ); } -Core::Data::JournalCategory::JournalCategory( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ) +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 ); } -Core::Data::JournalGenre::JournalGenre( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ) +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 ); @@ -3392,13 +3392,13 @@ Core::Data::JournalGenre::JournalGenre( uint32_t row_id, Core::Data::ExdDataGene name = exdData->getField< std::string >( row, 2 ); } -Core::Data::JournalSection::JournalSection( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ) +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 ); } -Core::Data::Leve::Leve( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ) +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 ); @@ -3425,7 +3425,7 @@ Core::Data::Leve::Leve( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ) bGM = exdData->getField< uint16_t >( row, 30 ); } -Core::Data::LeveAssignmentType::LeveAssignmentType( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ) +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 ); @@ -3433,13 +3433,13 @@ Core::Data::LeveAssignmentType::LeveAssignmentType( uint32_t row_id, Core::Data: name = exdData->getField< std::string >( row, 2 ); } -Core::Data::LeveClient::LeveClient( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ) +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 ); } -Core::Data::Level::Level( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ) +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 ); @@ -3454,24 +3454,24 @@ Core::Data::Level::Level( uint32_t row_id, Core::Data::ExdDataGenerated* exdData territory = exdData->getField< uint16_t >( row, 9 ); } -Core::Data::LeveRewardItem::LeveRewardItem( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ) +Sapphire::Data::LeveRewardItem::LeveRewardItem( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData ) { auto row = exdData->m_LeveRewardItemDat.get_row( row_id ); } -Core::Data::LeveRewardItemGroup::LeveRewardItemGroup( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ) +Sapphire::Data::LeveRewardItemGroup::LeveRewardItemGroup( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData ) { auto row = exdData->m_LeveRewardItemGroupDat.get_row( row_id ); } -Core::Data::LeveVfx::LeveVfx( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ) +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 ); } -Core::Data::LogFilter::LogFilter( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ) +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 ); @@ -3479,7 +3479,7 @@ Core::Data::LogFilter::LogFilter( uint32_t row_id, Core::Data::ExdDataGenerated* example = exdData->getField< std::string >( row, 7 ); } -Core::Data::LogKind::LogKind( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ) +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 ); @@ -3488,20 +3488,20 @@ Core::Data::LogKind::LogKind( uint32_t row_id, Core::Data::ExdDataGenerated* exd logKindCategoryText = exdData->getField< uint8_t >( row, 4 ); } -Core::Data::LogKindCategoryText::LogKindCategoryText( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ) +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 ); } -Core::Data::LogMessage::LogMessage( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ) +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 ); } -Core::Data::LotteryExchangeShop::LotteryExchangeShop( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ) +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 ) ); @@ -3538,20 +3538,20 @@ Core::Data::LotteryExchangeShop::LotteryExchangeShop( uint32_t row_id, Core::Dat amountAccepted.push_back( exdData->getField< uint32_t >( row, 32 ) ); } -Core::Data::MacroIcon::MacroIcon( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ) +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 ); } -Core::Data::MacroIconRedirectOld::MacroIconRedirectOld( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ) +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 ); } -Core::Data::MainCommand::MainCommand( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ) +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 ); @@ -3560,13 +3560,13 @@ Core::Data::MainCommand::MainCommand( uint32_t row_id, Core::Data::ExdDataGenera description = exdData->getField< std::string >( row, 5 ); } -Core::Data::MainCommandCategory::MainCommandCategory( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ) +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 ); } -Core::Data::ManeuversArmor::ManeuversArmor( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ) +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 ) ); @@ -3578,7 +3578,7 @@ Core::Data::ManeuversArmor::ManeuversArmor( uint32_t row_id, Core::Data::ExdData icon.push_back( exdData->getField< uint32_t >( row, 9 ) ); } -Core::Data::Map::Map( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ) +Sapphire::Data::Map::Map( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData ) { auto row = exdData->m_MapDat.get_row( row_id ); hierarchy = exdData->getField< uint8_t >( row, 3 ); @@ -3595,7 +3595,7 @@ Core::Data::Map::Map( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ) discoveryArrayByte = exdData->getField< bool >( row, 15 ); } -Core::Data::MapMarker::MapMarker( uint32_t row_id, uint32_t subRow, Core::Data::ExdDataGenerated* exdData ) +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 ); @@ -3609,27 +3609,27 @@ Core::Data::MapMarker::MapMarker( uint32_t row_id, uint32_t subRow, Core::Data:: dataKey = exdData->getField< uint16_t >( row, 8 ); } -Core::Data::MapMarkerRegion::MapMarkerRegion( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ) +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 ); } -Core::Data::MapSymbol::MapSymbol( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ) +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 ); } -Core::Data::Marker::Marker( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ) +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 ); } -Core::Data::MasterpieceSupplyDuty::MasterpieceSupplyDuty( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ) +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 ); @@ -3637,7 +3637,7 @@ Core::Data::MasterpieceSupplyDuty::MasterpieceSupplyDuty( uint32_t row_id, Core: rewardCurrency = exdData->getField< uint16_t >( row, 2 ); } -Core::Data::MasterpieceSupplyMultiplier::MasterpieceSupplyMultiplier( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ) +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 ) ); @@ -3646,7 +3646,7 @@ Core::Data::MasterpieceSupplyMultiplier::MasterpieceSupplyMultiplier( uint32_t r currencyMultiplier.push_back( exdData->getField< uint16_t >( row, 5 ) ); } -Core::Data::Materia::Materia( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ) +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 ) ); @@ -3672,40 +3672,40 @@ Core::Data::Materia::Materia( uint32_t row_id, Core::Data::ExdDataGenerated* exd value.push_back( exdData->getField< uint8_t >( row, 20 ) ); } -Core::Data::MiniGameRA::MiniGameRA( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ) +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 ); } -Core::Data::MinionRace::MinionRace( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ) +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 ); } -Core::Data::MinionRules::MinionRules( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ) +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 ); } -Core::Data::MinionSkillType::MinionSkillType( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ) +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 ); } -Core::Data::MobHuntOrderType::MobHuntOrderType( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ) +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 ); } -Core::Data::MobHuntTarget::MobHuntTarget( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ) +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 ); @@ -3715,7 +3715,7 @@ Core::Data::MobHuntTarget::MobHuntTarget( uint32_t row_id, Core::Data::ExdDataGe placeName = exdData->getField< uint16_t >( row, 4 ); } -Core::Data::ModelChara::ModelChara( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ) +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 ); @@ -3724,14 +3724,14 @@ Core::Data::ModelChara::ModelChara( uint32_t row_id, Core::Data::ExdDataGenerate variant = exdData->getField< uint8_t >( row, 3 ); } -Core::Data::ModelState::ModelState( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ) +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 ); } -Core::Data::MonsterNote::MonsterNote( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ) +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 ) ); @@ -3746,14 +3746,14 @@ Core::Data::MonsterNote::MonsterNote( uint32_t row_id, Core::Data::ExdDataGenera name = exdData->getField< std::string >( row, 9 ); } -Core::Data::MonsterNoteTarget::MonsterNoteTarget( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ) +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 ); } -Core::Data::Mount::Mount( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ) +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 ); @@ -3777,7 +3777,7 @@ Core::Data::Mount::Mount( uint32_t row_id, Core::Data::ExdDataGenerated* exdData isImmobile = exdData->getField< bool >( row, 42 ); } -Core::Data::MountAction::MountAction( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ) +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 ) ); @@ -3788,7 +3788,7 @@ Core::Data::MountAction::MountAction( uint32_t row_id, Core::Data::ExdDataGenera action.push_back( exdData->getField< uint16_t >( row, 5 ) ); } -Core::Data::MountCustomize::MountCustomize( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ) +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 ); @@ -3817,19 +3817,19 @@ Core::Data::MountCustomize::MountCustomize( uint32_t row_id, Core::Data::ExdData auRaFemaleCameraHeight = exdData->getField< uint8_t >( row, 24 ); } -Core::Data::MountFlyingCondition::MountFlyingCondition( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ) +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 ); } -Core::Data::MountSpeed::MountSpeed( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ) +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 ); } -Core::Data::MountTransient::MountTransient( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ) +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 ); @@ -3837,7 +3837,7 @@ Core::Data::MountTransient::MountTransient( uint32_t row_id, Core::Data::ExdData tooltip = exdData->getField< std::string >( row, 2 ); } -Core::Data::MoveTimeline::MoveTimeline( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ) +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 ); @@ -3852,14 +3852,14 @@ Core::Data::MoveTimeline::MoveTimeline( uint32_t row_id, Core::Data::ExdDataGene extra = exdData->getField< uint16_t >( row, 9 ); } -Core::Data::MoveVfx::MoveVfx( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ) +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 ); } -Core::Data::NpcEquip::NpcEquip( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ) +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 ); @@ -3889,19 +3889,19 @@ Core::Data::NpcEquip::NpcEquip( uint32_t row_id, Core::Data::ExdDataGenerated* e dyeRightRing = exdData->getField< uint8_t >( row, 24 ); } -Core::Data::NpcYell::NpcYell( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ) +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 ); } -Core::Data::Omen::Omen( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ) +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 ); } -Core::Data::OnlineStatus::OnlineStatus( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ) +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 ); @@ -3909,40 +3909,40 @@ Core::Data::OnlineStatus::OnlineStatus( uint32_t row_id, Core::Data::ExdDataGene icon = exdData->getField< uint32_t >( row, 4 ); } -Core::Data::Opening::Opening( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ) +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 ); } -Core::Data::Orchestrion::Orchestrion( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ) +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 ); } -Core::Data::OrchestrionCategory::OrchestrionCategory( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ) +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 ); } -Core::Data::OrchestrionPath::OrchestrionPath( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ) +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 ); } -Core::Data::OrchestrionUiparam::OrchestrionUiparam( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ) +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 ); } -Core::Data::ParamGrow::ParamGrow( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ) +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 ); @@ -3955,7 +3955,7 @@ Core::Data::ParamGrow::ParamGrow( uint32_t row_id, Core::Data::ExdDataGenerated* huntingLogExpReward = exdData->getField< int32_t >( row, 9 ); } -Core::Data::PartyContent::PartyContent( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ) +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 ); @@ -3967,19 +3967,19 @@ Core::Data::PartyContent::PartyContent( uint32_t row_id, Core::Data::ExdDataGene image = exdData->getField< uint32_t >( row, 34 ); } -Core::Data::PartyContentCutscene::PartyContentCutscene( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ) +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 ); } -Core::Data::PartyContentTextData::PartyContentTextData( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ) +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 ); } -Core::Data::Perform::Perform( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ) +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 ); @@ -3994,19 +3994,19 @@ Core::Data::Perform::Perform( uint32_t row_id, Core::Data::ExdDataGenerated* exd transient = exdData->getField< uint8_t >( row, 11 ); } -Core::Data::PerformTransient::PerformTransient( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ) +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 ); } -Core::Data::Pet::Pet( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ) +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 ); } -Core::Data::PetAction::PetAction( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ) +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 ); @@ -4016,7 +4016,7 @@ Core::Data::PetAction::PetAction( uint32_t row_id, Core::Data::ExdDataGenerated* pet = exdData->getField< uint8_t >( row, 4 ); } -Core::Data::Picture::Picture( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ) +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 ); @@ -4024,14 +4024,14 @@ Core::Data::Picture::Picture( uint32_t row_id, Core::Data::ExdDataGenerated* exd signature = exdData->getField< int32_t >( row, 2 ); } -Core::Data::PlaceName::PlaceName( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ) +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 ); } -Core::Data::PlantPotFlowerSeed::PlantPotFlowerSeed( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ) +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 ) ); @@ -4045,14 +4045,14 @@ Core::Data::PlantPotFlowerSeed::PlantPotFlowerSeed( uint32_t row_id, Core::Data: seedIcon.push_back( exdData->getField< uint32_t >( row, 8 ) ); } -Core::Data::PreHandler::PreHandler( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ) +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 ); } -Core::Data::PublicContent::PublicContent( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ) +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 ); @@ -4065,39 +4065,39 @@ Core::Data::PublicContent::PublicContent( uint32_t row_id, Core::Data::ExdDataGe additionalData = exdData->getField< uint16_t >( row, 8 ); } -Core::Data::PublicContentCutscene::PublicContentCutscene( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ) +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 ); } -Core::Data::PublicContentTextData::PublicContentTextData( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ) +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 ); } -Core::Data::PvPAction::PvPAction( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ) +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 ); } -Core::Data::PvPActionSort::PvPActionSort( uint32_t row_id, uint32_t subRow, Core::Data::ExdDataGenerated* exdData ) +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 ); } -Core::Data::PvPRank::PvPRank( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ) +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 ); } -Core::Data::PvPSelectTrait::PvPSelectTrait( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ) +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 ); @@ -4105,7 +4105,7 @@ Core::Data::PvPSelectTrait::PvPSelectTrait( uint32_t row_id, Core::Data::ExdData value = exdData->getField< int16_t >( row, 2 ); } -Core::Data::PvPTrait::PvPTrait( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ) +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 ); @@ -4113,7 +4113,7 @@ Core::Data::PvPTrait::PvPTrait( uint32_t row_id, Core::Data::ExdDataGenerated* e trait3 = exdData->getField< uint16_t >( row, 2 ); } -Core::Data::Quest::Quest( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ) +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 ); @@ -4488,7 +4488,7 @@ Core::Data::Quest::Quest( uint32_t row_id, Core::Data::ExdDataGenerated* exdData sortKey = exdData->getField< uint16_t >( row, 1514 ); } -Core::Data::QuestClassJobReward::QuestClassJobReward( uint32_t row_id, uint32_t subRow, Core::Data::ExdDataGenerated* exdData ) +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 ); @@ -4510,7 +4510,7 @@ Core::Data::QuestClassJobReward::QuestClassJobReward( uint32_t row_id, uint32_t requiredAmount.push_back( exdData->getField< uint8_t >( row, 16 ) ); } -Core::Data::QuestClassJobSupply::QuestClassJobSupply( uint32_t row_id, uint32_t subRow, Core::Data::ExdDataGenerated* exdData ) +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 ); @@ -4518,20 +4518,20 @@ Core::Data::QuestClassJobSupply::QuestClassJobSupply( uint32_t row_id, uint32_t item = exdData->getField< uint32_t >( row, 3 ); } -Core::Data::QuestRepeatFlag::QuestRepeatFlag( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ) +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 ); } -Core::Data::QuestRewardOther::QuestRewardOther( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ) +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 ); } -Core::Data::QuickChat::QuickChat( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ) +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 ); @@ -4540,13 +4540,13 @@ Core::Data::QuickChat::QuickChat( uint32_t row_id, Core::Data::ExdDataGenerated* quickChatTransient = exdData->getField< int8_t >( row, 3 ); } -Core::Data::QuickChatTransient::QuickChatTransient( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ) +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 ); } -Core::Data::Race::Race( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ) +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 ); @@ -4561,7 +4561,7 @@ Core::Data::Race::Race( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ) rSEFFeet = exdData->getField< int32_t >( row, 9 ); } -Core::Data::RacingChocoboItem::RacingChocoboItem( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ) +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 ); @@ -4570,32 +4570,32 @@ Core::Data::RacingChocoboItem::RacingChocoboItem( uint32_t row_id, Core::Data::E param.push_back( exdData->getField< uint8_t >( row, 3 ) ); } -Core::Data::RacingChocoboName::RacingChocoboName( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ) +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 ); } -Core::Data::RacingChocoboNameCategory::RacingChocoboNameCategory( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ) +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 ); } -Core::Data::RacingChocoboNameInfo::RacingChocoboNameInfo( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ) +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 ); } -Core::Data::RacingChocoboParam::RacingChocoboParam( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ) +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 ); } -Core::Data::Recipe::Recipe( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ) +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 ); @@ -4621,13 +4621,13 @@ Core::Data::Recipe::Recipe( uint32_t row_id, Core::Data::ExdDataGenerated* exdDa patchNumber = exdData->getField< uint16_t >( row, 44 ); } -Core::Data::RecipeElement::RecipeElement( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ) +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 ); } -Core::Data::RecipeLevelTable::RecipeLevelTable( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ) +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 ); @@ -4638,7 +4638,7 @@ Core::Data::RecipeLevelTable::RecipeLevelTable( uint32_t row_id, Core::Data::Exd durability = exdData->getField< uint16_t >( row, 5 ); } -Core::Data::RecipeNotebookList::RecipeNotebookList( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ) +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 ) ); @@ -4803,13 +4803,13 @@ Core::Data::RecipeNotebookList::RecipeNotebookList( uint32_t row_id, Core::Data: recipe.push_back( exdData->getField< int32_t >( row, 160 ) ); } -Core::Data::RecommendContents::RecommendContents( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ) +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 ); } -Core::Data::Relic::Relic( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ) +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 ); @@ -4817,7 +4817,7 @@ Core::Data::Relic::Relic( uint32_t row_id, Core::Data::ExdDataGenerated* exdData icon = exdData->getField< int32_t >( row, 2 ); } -Core::Data::Relic3::Relic3( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ) +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 ); @@ -4827,7 +4827,7 @@ Core::Data::Relic3::Relic3( uint32_t row_id, Core::Data::ExdDataGenerated* exdDa icon = exdData->getField< int32_t >( row, 4 ); } -Core::Data::RelicItem::RelicItem( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ) +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 ); @@ -4843,7 +4843,7 @@ Core::Data::RelicItem::RelicItem( uint32_t row_id, Core::Data::ExdDataGenerated* rogueItem = exdData->getField< uint32_t >( row, 11 ); } -Core::Data::RelicNote::RelicNote( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ) +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 ); @@ -4855,13 +4855,13 @@ Core::Data::RelicNote::RelicNote( uint32_t row_id, Core::Data::ExdDataGenerated* leve.push_back( exdData->getField< uint16_t >( row, 33 ) ); } -Core::Data::RelicNoteCategory::RelicNoteCategory( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ) +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 ); } -Core::Data::Resident::Resident( uint32_t row_id, uint32_t subRow, Core::Data::ExdDataGenerated* exdData ) +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 ); @@ -4869,7 +4869,7 @@ Core::Data::Resident::Resident( uint32_t row_id, uint32_t subRow, Core::Data::Ex residentMotionType = exdData->getField< uint8_t >( row, 3 ); } -Core::Data::RetainerTask::RetainerTask( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ) +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 ); @@ -4884,14 +4884,14 @@ Core::Data::RetainerTask::RetainerTask( uint32_t row_id, Core::Data::ExdDataGene task = exdData->getField< uint16_t >( row, 13 ); } -Core::Data::RetainerTaskLvRange::RetainerTaskLvRange( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ) +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 ); } -Core::Data::RetainerTaskNormal::RetainerTaskNormal( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ) +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 ); @@ -4902,7 +4902,7 @@ Core::Data::RetainerTaskNormal::RetainerTaskNormal( uint32_t row_id, Core::Data: fishingLog = exdData->getField< int16_t >( row, 5 ); } -Core::Data::RetainerTaskParameter::RetainerTaskParameter( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ) +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 ) ); @@ -4913,27 +4913,27 @@ Core::Data::RetainerTaskParameter::RetainerTaskParameter( uint32_t row_id, Core: gatheringFSH.push_back( exdData->getField< int16_t >( row, 5 ) ); } -Core::Data::RetainerTaskRandom::RetainerTaskRandom( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ) +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 ); } -Core::Data::RPParameter::RPParameter( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ) +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 ); } -Core::Data::Salvage::Salvage( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ) +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 ); } -Core::Data::SatisfactionNpc::SatisfactionNpc( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ) +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 ); @@ -4954,7 +4954,7 @@ Core::Data::SatisfactionNpc::SatisfactionNpc( uint32_t row_id, Core::Data::ExdDa icon = exdData->getField< int32_t >( row, 70 ); } -Core::Data::SatisfactionSupply::SatisfactionSupply( uint32_t row_id, uint32_t subRow, Core::Data::ExdDataGenerated* exdData ) +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 ); @@ -4966,7 +4966,7 @@ Core::Data::SatisfactionSupply::SatisfactionSupply( uint32_t row_id, uint32_t su reward = exdData->getField< uint16_t >( row, 6 ); } -Core::Data::SatisfactionSupplyReward::SatisfactionSupplyReward( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ) +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 ); @@ -4977,21 +4977,21 @@ Core::Data::SatisfactionSupplyReward::SatisfactionSupplyReward( uint32_t row_id, gilHigh = exdData->getField< uint16_t >( row, 15 ); } -Core::Data::ScenarioTree::ScenarioTree( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ) +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 ); } -Core::Data::ScenarioTreeTips::ScenarioTreeTips( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ) +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 ); } -Core::Data::ScenarioTreeTipsClassQuest::ScenarioTreeTipsClassQuest( uint32_t row_id, uint32_t subRow, Core::Data::ExdDataGenerated* exdData ) +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 ); @@ -5000,32 +5000,32 @@ Core::Data::ScenarioTreeTipsClassQuest::ScenarioTreeTipsClassQuest( uint32_t row requiredQuest = exdData->getField< uint32_t >( row, 3 ); } -Core::Data::ScenarioTreeTipsQuest::ScenarioTreeTipsQuest( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ) +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 ); } -Core::Data::ScenarioType::ScenarioType( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ) +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 ); } -Core::Data::ScreenImage::ScreenImage( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ) +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 ); } -Core::Data::SecretRecipeBook::SecretRecipeBook( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ) +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 ); } -Core::Data::SkyIsland2Mission::SkyIsland2Mission( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ) +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 ); @@ -5038,7 +5038,7 @@ Core::Data::SkyIsland2Mission::SkyIsland2Mission( uint32_t row_id, Core::Data::E image = exdData->getField< uint32_t >( row, 20 ); } -Core::Data::SkyIsland2MissionDetail::SkyIsland2MissionDetail( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ) +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 ); @@ -5047,19 +5047,19 @@ Core::Data::SkyIsland2MissionDetail::SkyIsland2MissionDetail( uint32_t row_id, C objective = exdData->getField< std::string >( row, 7 ); } -Core::Data::SkyIsland2MissionType::SkyIsland2MissionType( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ) +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 ); } -Core::Data::SkyIsland2RangeType::SkyIsland2RangeType( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ) +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 ); } -Core::Data::SpearfishingItem::SpearfishingItem( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ) +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 ); @@ -5069,7 +5069,7 @@ Core::Data::SpearfishingItem::SpearfishingItem( uint32_t row_id, Core::Data::Exd isVisible = exdData->getField< bool >( row, 5 ); } -Core::Data::SpearfishingNotebook::SpearfishingNotebook( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ) +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 ); @@ -5081,14 +5081,14 @@ Core::Data::SpearfishingNotebook::SpearfishingNotebook( uint32_t row_id, Core::D gatheringPointBase = exdData->getField< uint16_t >( row, 9 ); } -Core::Data::SpearfishingRecordPage::SpearfishingRecordPage( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ) +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 ); } -Core::Data::SpecialShop::SpecialShop( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ) +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 ); @@ -5158,13 +5158,13 @@ Core::Data::SpecialShop::SpecialShop( uint32_t row_id, Core::Data::ExdDataGenera completeText = exdData->getField< int32_t >( row, 1865 ); } -Core::Data::SpecialShopItemCategory::SpecialShopItemCategory( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ) +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 ); } -Core::Data::Stain::Stain( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ) +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 ); @@ -5172,14 +5172,14 @@ Core::Data::Stain::Stain( uint32_t row_id, Core::Data::ExdDataGenerated* exdData name = exdData->getField< std::string >( row, 2 ); } -Core::Data::StainTransient::StainTransient( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ) +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 ); } -Core::Data::Status::Status( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ) +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 ); @@ -5200,13 +5200,13 @@ Core::Data::Status::Status( uint32_t row_id, Core::Data::ExdDataGenerated* exdDa invisibility = exdData->getField< bool >( row, 22 ); } -Core::Data::StatusHitEffect::StatusHitEffect( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ) +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 ); } -Core::Data::StatusLoopVFX::StatusLoopVFX( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ) +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 ); @@ -5214,12 +5214,12 @@ Core::Data::StatusLoopVFX::StatusLoopVFX( uint32_t row_id, Core::Data::ExdDataGe vFX3 = exdData->getField< uint16_t >( row, 4 ); } -Core::Data::Story::Story( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ) +Sapphire::Data::Story::Story( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData ) { auto row = exdData->m_StoryDat.get_row( row_id ); } -Core::Data::SubmarineExploration::SubmarineExploration( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ) +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 ); @@ -5231,7 +5231,7 @@ Core::Data::SubmarineExploration::SubmarineExploration( uint32_t row_id, Core::D expReward = exdData->getField< uint32_t >( row, 9 ); } -Core::Data::SubmarinePart::SubmarinePart( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ) +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 ); @@ -5245,14 +5245,14 @@ Core::Data::SubmarinePart::SubmarinePart( uint32_t row_id, Core::Data::ExdDataGe repairMaterials = exdData->getField< uint8_t >( row, 9 ); } -Core::Data::SubmarineRank::SubmarineRank( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ) +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 ); } -Core::Data::SwitchTalk::SwitchTalk( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ) +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 ) ); @@ -5288,7 +5288,7 @@ Core::Data::SwitchTalk::SwitchTalk( uint32_t row_id, Core::Data::ExdDataGenerate defaultTalk.push_back( exdData->getField< uint32_t >( row, 32 ) ); } -Core::Data::TerritoryType::TerritoryType( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ) +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 ); @@ -5303,7 +5303,7 @@ Core::Data::TerritoryType::TerritoryType( uint32_t row_id, Core::Data::ExdDataGe aetheryte = exdData->getField< int32_t >( row, 24 ); } -Core::Data::TextCommand::TextCommand( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ) +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 ); @@ -5313,7 +5313,7 @@ Core::Data::TextCommand::TextCommand( uint32_t row_id, Core::Data::ExdDataGenera shortAlias = exdData->getField< std::string >( row, 9 ); } -Core::Data::Title::Title( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ) +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 ); @@ -5322,33 +5322,33 @@ Core::Data::Title::Title( uint32_t row_id, Core::Data::ExdDataGenerated* exdData order = exdData->getField< uint16_t >( row, 3 ); } -Core::Data::Tomestones::Tomestones( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ) +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 ); } -Core::Data::TomestonesItem::TomestonesItem( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ) +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 ); } -Core::Data::TopicSelect::TopicSelect( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ) +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 ); } -Core::Data::Town::Town( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ) +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 ); } -Core::Data::Trait::Trait( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ) +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 ); @@ -5360,7 +5360,7 @@ Core::Data::Trait::Trait( uint32_t row_id, Core::Data::ExdDataGenerated* exdData classJobCategory = exdData->getField< uint8_t >( row, 6 ); } -Core::Data::TraitRecast::TraitRecast( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ) +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 ); @@ -5368,13 +5368,13 @@ Core::Data::TraitRecast::TraitRecast( uint32_t row_id, Core::Data::ExdDataGenera timeds = exdData->getField< uint16_t >( row, 2 ); } -Core::Data::TraitTransient::TraitTransient( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ) +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 ); } -Core::Data::Transformation::Transformation( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ) +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 ); @@ -5392,13 +5392,13 @@ Core::Data::Transformation::Transformation( uint32_t row_id, Core::Data::ExdData playerCamera = exdData->getField< bool >( row, 17 ); } -Core::Data::Treasure::Treasure( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ) +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 ); } -Core::Data::TreasureHuntRank::TreasureHuntRank( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ) +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 ); @@ -5409,7 +5409,7 @@ Core::Data::TreasureHuntRank::TreasureHuntRank( uint32_t row_id, Core::Data::Exd minPartySize = exdData->getField< uint8_t >( row, 6 ); } -Core::Data::Tribe::Tribe( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ) +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 ); @@ -5422,7 +5422,7 @@ Core::Data::Tribe::Tribe( uint32_t row_id, Core::Data::ExdDataGenerated* exdData pIE = exdData->getField< int8_t >( row, 9 ); } -Core::Data::TripleTriad::TripleTriad( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ) +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 ) ); @@ -5456,7 +5456,7 @@ Core::Data::TripleTriad::TripleTriad( uint32_t row_id, Core::Data::ExdDataGenera itemPossibleReward.push_back( exdData->getField< uint32_t >( row, 29 ) ); } -Core::Data::TripleTriadCard::TripleTriadCard( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ) +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 ); @@ -5464,13 +5464,13 @@ Core::Data::TripleTriadCard::TripleTriadCard( uint32_t row_id, Core::Data::ExdDa description = exdData->getField< std::string >( row, 8 ); } -Core::Data::TripleTriadCardRarity::TripleTriadCardRarity( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ) +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 ); } -Core::Data::TripleTriadCardResident::TripleTriadCardResident( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ) +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 ); @@ -5483,25 +5483,25 @@ Core::Data::TripleTriadCardResident::TripleTriadCardResident( uint32_t row_id, C sortKey = exdData->getField< uint8_t >( row, 8 ); } -Core::Data::TripleTriadCardType::TripleTriadCardType( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ) +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 ); } -Core::Data::TripleTriadCompetition::TripleTriadCompetition( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ) +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 ); } -Core::Data::TripleTriadRule::TripleTriadRule( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ) +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 ); } -Core::Data::Tutorial::Tutorial( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ) +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 ); @@ -5512,44 +5512,44 @@ Core::Data::Tutorial::Tutorial( uint32_t row_id, Core::Data::ExdDataGenerated* e objective = exdData->getField< uint32_t >( row, 9 ); } -Core::Data::TutorialDPS::TutorialDPS( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ) +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 ); } -Core::Data::TutorialHealer::TutorialHealer( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ) +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 ); } -Core::Data::TutorialTank::TutorialTank( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ) +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 ); } -Core::Data::UIColor::UIColor( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ) +Sapphire::Data::UIColor::UIColor( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData ) { auto row = exdData->m_UIColorDat.get_row( row_id ); foreground = exdData->getField< uint32_t >( row, 0 ); background = exdData->getField< uint32_t >( row, 1 ); } -Core::Data::VaseFlower::VaseFlower( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ) +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 ); } -Core::Data::VFX::VFX( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ) +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 ); } -Core::Data::Warp::Warp( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ) +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 ); @@ -5561,7 +5561,7 @@ Core::Data::Warp::Warp( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ) warpLogic = exdData->getField< uint16_t >( row, 6 ); } -Core::Data::WarpCondition::WarpCondition( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ) +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 ); @@ -5570,7 +5570,7 @@ Core::Data::WarpCondition::WarpCondition( uint32_t row_id, Core::Data::ExdDataGe requiredQuest4 = exdData->getField< uint32_t >( row, 5 ); } -Core::Data::WarpLogic::WarpLogic( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ) +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 ); @@ -5599,7 +5599,7 @@ Core::Data::WarpLogic::WarpLogic( uint32_t row_id, Core::Data::ExdDataGenerated* responseNo = exdData->getField< std::string >( row, 25 ); } -Core::Data::Weather::Weather( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ) +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 ); @@ -5607,25 +5607,25 @@ Core::Data::Weather::Weather( uint32_t row_id, Core::Data::ExdDataGenerated* exd description = exdData->getField< std::string >( row, 2 ); } -Core::Data::WeatherGroup::WeatherGroup( uint32_t row_id, uint32_t subRow, Core::Data::ExdDataGenerated* exdData ) +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 ); } -Core::Data::WeatherRate::WeatherRate( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ) +Sapphire::Data::WeatherRate::WeatherRate( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData ) { auto row = exdData->m_WeatherRateDat.get_row( row_id ); } -Core::Data::WeddingBGM::WeddingBGM( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ) +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 ); } -Core::Data::WeeklyBingoOrderData::WeeklyBingoOrderData( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ) +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 ); @@ -5634,7 +5634,7 @@ Core::Data::WeeklyBingoOrderData::WeeklyBingoOrderData( uint32_t row_id, Core::D icon = exdData->getField< uint32_t >( row, 4 ); } -Core::Data::WeeklyBingoRewardData::WeeklyBingoRewardData( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ) +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 ); @@ -5642,13 +5642,13 @@ Core::Data::WeeklyBingoRewardData::WeeklyBingoRewardData( uint32_t row_id, Core: rewardQuantity2 = exdData->getField< uint16_t >( row, 12 ); } -Core::Data::WeeklyBingoText::WeeklyBingoText( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ) +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 ); } -Core::Data::WeeklyLotBonus::WeeklyLotBonus( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ) +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 ) ); @@ -5684,7 +5684,7 @@ Core::Data::WeeklyLotBonus::WeeklyLotBonus( uint32_t row_id, Core::Data::ExdData weeklyLotBonusThreshold.push_back( exdData->getField< uint8_t >( row, 30 ) ); } -Core::Data::World::World( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ) +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 ); @@ -5692,13 +5692,13 @@ Core::Data::World::World( uint32_t row_id, Core::Data::ExdDataGenerated* exdData isPublic = exdData->getField< bool >( row, 3 ); } -Core::Data::WorldDCGroupType::WorldDCGroupType( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ) +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 ); } -Core::Data::YKW::YKW( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ) +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 ); @@ -5707,7 +5707,7 @@ Core::Data::YKW::YKW( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ) location.push_back( exdData->getField< uint16_t >( row, 4 ) ); } -Core::Data::ZoneSharedGroup::ZoneSharedGroup( uint32_t row_id, uint32_t subRow, Core::Data::ExdDataGenerated* exdData ) +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 ); @@ -5719,22 +5719,22 @@ Core::Data::ZoneSharedGroup::ZoneSharedGroup( uint32_t row_id, uint32_t subRow, } -Core::Data::ExdDataGenerated::ExdDataGenerated() +Sapphire::Data::ExdDataGenerated::ExdDataGenerated() { } -Core::Data::ExdDataGenerated::~ExdDataGenerated() +Sapphire::Data::ExdDataGenerated::~ExdDataGenerated() { } -xiv::exd::Exd Core::Data::ExdDataGenerated::setupDatAccess( const std::string& name, xiv::exd::Language lang ) +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 ) ); }; -void Core::Data::ExdDataGenerated::loadIdList( xiv::exd::Exd& data, std::set< uint32_t >& outIdList ) +void Sapphire::Data::ExdDataGenerated::loadIdList( xiv::exd::Exd& data, std::set< uint32_t >& outIdList ) { auto pDataRows = data.get_rows(); @@ -5745,7 +5745,7 @@ void Core::Data::ExdDataGenerated::loadIdList( xiv::exd::Exd& data, std::set< ui } } -bool Core::Data::ExdDataGenerated::init( const std::string& path ) +bool Sapphire::Data::ExdDataGenerated::init( const std::string& path ) { try { diff --git a/src/common/Exd/ExdDataGenerated.h b/src/common/Exd/ExdDataGenerated.h index af2974ef..2099dc91 100644 --- a/src/common/Exd/ExdDataGenerated.h +++ b/src/common/Exd/ExdDataGenerated.h @@ -13,7 +13,7 @@ #include #include -namespace Core { +namespace Sapphire { namespace Data { class ExdDataGenerated; @@ -484,7 +484,7 @@ struct Achievement uint16_t order; bool initialHide; - Achievement( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ); + Achievement( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData ); }; struct AchievementCategory @@ -493,14 +493,14 @@ struct AchievementCategory uint8_t achievementKind; bool hideCategory; - AchievementCategory( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ); + AchievementCategory( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData ); }; struct AchievementKind { std::string name; - AchievementKind( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ); + AchievementKind( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData ); }; struct Action @@ -542,7 +542,7 @@ struct Action uint8_t omen; bool isPvP; - Action( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ); + Action( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData ); }; struct ActionCastTimeline @@ -550,21 +550,21 @@ struct ActionCastTimeline uint16_t name; uint16_t vFX; - ActionCastTimeline( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ); + ActionCastTimeline( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData ); }; struct ActionCastVFX { uint16_t vFX; - ActionCastVFX( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ); + ActionCastVFX( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData ); }; struct ActionCategory { std::string name; - ActionCategory( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ); + ActionCategory( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData ); }; struct ActionComboRoute @@ -572,41 +572,41 @@ struct ActionComboRoute std::string name; std::vector< uint16_t > action; - ActionComboRoute( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ); + ActionComboRoute( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData ); }; struct ActionIndirection { int32_t name; - ActionIndirection( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ); + ActionIndirection( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData ); }; struct ActionParam { int16_t name; - ActionParam( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ); + ActionParam( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData ); }; struct ActionProcStatus { uint16_t status; - ActionProcStatus( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ); + ActionProcStatus( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData ); }; struct ActionTimeline { std::string key; - ActionTimeline( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ); + ActionTimeline( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData ); }; struct ActionTimelineMove { - ActionTimelineMove( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ); + ActionTimelineMove( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData ); }; struct ActionTimelineReplace @@ -614,14 +614,14 @@ struct ActionTimelineReplace uint16_t old; uint16_t New; - ActionTimelineReplace( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ); + ActionTimelineReplace( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData ); }; struct ActionTransient { std::string description; - ActionTransient( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ); + ActionTransient( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData ); }; struct ActivityFeedButtons @@ -631,7 +631,7 @@ struct ActivityFeedButtons std::string language; std::string pictureURL; - ActivityFeedButtons( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ); + ActivityFeedButtons( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData ); }; struct ActivityFeedCaptions @@ -641,7 +641,7 @@ struct ActivityFeedCaptions std::string dE; std::string fR; - ActivityFeedCaptions( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ); + ActivityFeedCaptions( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData ); }; struct ActivityFeedGroupCaptions @@ -651,7 +651,7 @@ struct ActivityFeedGroupCaptions std::string dE; std::string fR; - ActivityFeedGroupCaptions( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ); + ActivityFeedGroupCaptions( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData ); }; struct ActivityFeedImages @@ -662,14 +662,14 @@ struct ActivityFeedImages std::string activityFeedDE; std::string activityFeedFR; - ActivityFeedImages( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ); + ActivityFeedImages( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData ); }; struct Addon { std::string text; - Addon( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ); + Addon( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData ); }; struct AddonHud @@ -678,7 +678,7 @@ struct AddonHud std::string _short; std::string _function; - AddonHud( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ); + AddonHud( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData ); }; struct Adventure @@ -696,7 +696,7 @@ struct Adventure int32_t iconUndiscovered; bool isInitial; - Adventure( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ); + Adventure( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData ); }; struct AdventureExPhase @@ -705,14 +705,14 @@ struct AdventureExPhase uint32_t adventureBegin; uint32_t adventureEnd; - AdventureExPhase( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ); + AdventureExPhase( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData ); }; struct AetherCurrent { uint32_t quest; - AetherCurrent( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ); + AetherCurrent( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData ); }; struct AetherCurrentCompFlgSet @@ -720,7 +720,7 @@ struct AetherCurrentCompFlgSet int32_t territory; std::vector< int32_t > aetherCurrent; - AetherCurrentCompFlgSet( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ); + AetherCurrentCompFlgSet( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData ); }; struct AetherialWheel @@ -730,7 +730,7 @@ struct AetherialWheel uint8_t grade; uint8_t hoursRequired; - AetherialWheel( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ); + AetherialWheel( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData ); }; struct Aetheryte @@ -753,35 +753,35 @@ struct Aetheryte int16_t aetherstreamX; int16_t aetherstreamY; - Aetheryte( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ); + Aetheryte( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData ); }; struct AetheryteSystemDefine { std::string text; - AetheryteSystemDefine( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ); + AetheryteSystemDefine( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData ); }; struct AirshipExplorationLevel { uint32_t expToNext; - AirshipExplorationLevel( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ); + AirshipExplorationLevel( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData ); }; struct AirshipExplorationLog { std::string text; - AirshipExplorationLog( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ); + AirshipExplorationLog( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData ); }; struct AirshipExplorationParamType { std::string name; - AirshipExplorationParamType( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ); + AirshipExplorationParamType( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData ); }; struct AirshipExplorationPart @@ -795,7 +795,7 @@ struct AirshipExplorationPart int16_t favor; uint8_t repairMaterials; - AirshipExplorationPart( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ); + AirshipExplorationPart( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData ); }; struct AirshipExplorationPoint @@ -808,7 +808,7 @@ struct AirshipExplorationPoint uint8_t requiredSurveillance; uint32_t expReward; - AirshipExplorationPoint( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ); + AirshipExplorationPoint( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData ); }; struct AnimaWeapon5 @@ -817,7 +817,7 @@ struct AnimaWeapon5 uint8_t secondaryStatTotal; std::vector< uint8_t > parameter; - AnimaWeapon5( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ); + AnimaWeapon5( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData ); }; struct AnimaWeapon5Param @@ -825,21 +825,21 @@ struct AnimaWeapon5Param uint8_t baseParam; std::string name; - AnimaWeapon5Param( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ); + AnimaWeapon5Param( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData ); }; struct AnimaWeapon5PatternGroup { std::string name; - AnimaWeapon5PatternGroup( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ); + AnimaWeapon5PatternGroup( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData ); }; struct AnimaWeapon5SpiritTalk { int32_t dialogue; - AnimaWeapon5SpiritTalk( uint32_t row_id, uint32_t subRow, Core::Data::ExdDataGenerated* exdData ); + AnimaWeapon5SpiritTalk( uint32_t row_id, uint32_t subRow, Sapphire::Data::ExdDataGenerated* exdData ); }; struct AnimaWeapon5SpiritTalkParam @@ -847,7 +847,7 @@ struct AnimaWeapon5SpiritTalkParam std::string prologue; std::string epilogue; - AnimaWeapon5SpiritTalkParam( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ); + AnimaWeapon5SpiritTalkParam( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData ); }; struct AnimaWeapon5TradeItem @@ -856,14 +856,14 @@ struct AnimaWeapon5TradeItem uint8_t qty; uint8_t category; - AnimaWeapon5TradeItem( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ); + AnimaWeapon5TradeItem( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData ); }; struct AnimaWeaponFUITalk { int32_t dialogue; - AnimaWeaponFUITalk( uint32_t row_id, uint32_t subRow, Core::Data::ExdDataGenerated* exdData ); + AnimaWeaponFUITalk( uint32_t row_id, uint32_t subRow, Sapphire::Data::ExdDataGenerated* exdData ); }; struct AnimaWeaponFUITalkParam @@ -871,7 +871,7 @@ struct AnimaWeaponFUITalkParam std::string prologue; std::string epilogue; - AnimaWeaponFUITalkParam( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ); + AnimaWeaponFUITalkParam( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData ); }; struct AnimaWeaponIcon @@ -882,14 +882,14 @@ struct AnimaWeaponIcon int32_t zodiac; int32_t zodiacLux; - AnimaWeaponIcon( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ); + AnimaWeaponIcon( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData ); }; struct AnimaWeaponItem { std::vector< uint32_t > item; - AnimaWeaponItem( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ); + AnimaWeaponItem( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData ); }; struct AquariumFish @@ -898,42 +898,42 @@ struct AquariumFish uint8_t size; uint32_t item; - AquariumFish( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ); + AquariumFish( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData ); }; struct AquariumWater { std::string name; - AquariumWater( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ); + AquariumWater( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData ); }; struct ArrayEventHandler { std::vector< uint32_t > data; - ArrayEventHandler( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ); + ArrayEventHandler( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData ); }; struct AttackType { std::string name; - AttackType( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ); + AttackType( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData ); }; struct BacklightColor { uint32_t color; - BacklightColor( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ); + BacklightColor( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData ); }; struct Balloon { std::string dialogue; - Balloon( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ); + Balloon( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData ); }; struct BaseParam @@ -961,7 +961,7 @@ struct BaseParam uint8_t chestLegsGloves; uint8_t chestLegsFeet; - BaseParam( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ); + BaseParam( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData ); }; struct BattleLeve @@ -972,7 +972,7 @@ struct BattleLeve std::vector< uint8_t > itemsInvolvedQty; std::vector< uint8_t > itemDropRate; - BattleLeve( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ); + BattleLeve( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData ); }; struct BeastRankBonus @@ -980,7 +980,7 @@ struct BeastRankBonus uint32_t item; std::vector< uint8_t > itemQuantity; - BeastRankBonus( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ); + BeastRankBonus( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData ); }; struct BeastReputationRank @@ -988,7 +988,7 @@ struct BeastReputationRank uint16_t requiredReputation; std::string name; - BeastReputationRank( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ); + BeastReputationRank( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData ); }; struct BeastTribe @@ -1006,28 +1006,28 @@ struct BeastTribe std::string name; std::string nameRelation; - BeastTribe( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ); + BeastTribe( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData ); }; struct Behavior { uint16_t balloon; - Behavior( uint32_t row_id, uint32_t subRow, Core::Data::ExdDataGenerated* exdData ); + Behavior( uint32_t row_id, uint32_t subRow, Sapphire::Data::ExdDataGenerated* exdData ); }; struct BGM { std::string file; - BGM( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ); + BGM( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData ); }; struct BGMFade { int32_t bGMFadeType; - BGMFade( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ); + BGMFade( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData ); }; struct BGMSituation @@ -1037,7 +1037,7 @@ struct BGMSituation uint16_t bGMBattle; uint16_t bGMField; - BGMSituation( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ); + BGMSituation( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData ); }; struct BGMSwitch @@ -1045,21 +1045,21 @@ struct BGMSwitch uint8_t bGMSystemDefine; uint32_t quest; - BGMSwitch( uint32_t row_id, uint32_t subRow, Core::Data::ExdDataGenerated* exdData ); + BGMSwitch( uint32_t row_id, uint32_t subRow, Sapphire::Data::ExdDataGenerated* exdData ); }; struct BGMSystemDefine { float define; - BGMSystemDefine( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ); + BGMSystemDefine( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData ); }; struct BNpcAnnounceIcon { uint32_t icon; - BNpcAnnounceIcon( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ); + BNpcAnnounceIcon( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData ); }; struct BNpcBase @@ -1073,7 +1073,7 @@ struct BNpcBase int32_t arrayEventHandler; uint8_t bNpcParts; - BNpcBase( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ); + BNpcBase( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData ); }; struct BNpcCustomize @@ -1105,7 +1105,7 @@ struct BNpcCustomize uint8_t facePaint; uint8_t facePaintColor; - BNpcCustomize( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ); + BNpcCustomize( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData ); }; struct BNpcName @@ -1118,7 +1118,7 @@ struct BNpcName int8_t pronoun; int8_t article; - BNpcName( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ); + BNpcName( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData ); }; struct BNpcParts @@ -1154,7 +1154,7 @@ struct BNpcParts float z5; float scale5; - BNpcParts( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ); + BNpcParts( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData ); }; struct Buddy @@ -1166,7 +1166,7 @@ struct Buddy std::string soundEffect2; std::string soundEffect1; - Buddy( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ); + Buddy( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData ); }; struct BuddyAction @@ -1176,7 +1176,7 @@ struct BuddyAction int32_t icon; int32_t iconStatus; - BuddyAction( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ); + BuddyAction( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData ); }; struct BuddyEquip @@ -1197,21 +1197,21 @@ struct BuddyEquip uint16_t iconBody; uint16_t iconLegs; - BuddyEquip( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ); + BuddyEquip( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData ); }; struct BuddyItem { uint16_t item; - BuddyItem( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ); + BuddyItem( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData ); }; struct BuddyRank { uint32_t expRequired; - BuddyRank( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ); + BuddyRank( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData ); }; struct BuddySkill @@ -1222,7 +1222,7 @@ struct BuddySkill uint16_t attacker; uint16_t healer; - BuddySkill( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ); + BuddySkill( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData ); }; struct Cabinet @@ -1231,7 +1231,7 @@ struct Cabinet uint16_t order; uint8_t category; - Cabinet( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ); + Cabinet( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData ); }; struct CabinetCategory @@ -1240,7 +1240,7 @@ struct CabinetCategory int32_t icon; int32_t category; - CabinetCategory( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ); + CabinetCategory( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData ); }; struct Calendar @@ -1248,7 +1248,7 @@ struct Calendar std::vector< uint8_t > month; std::vector< uint8_t > day; - Calendar( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ); + Calendar( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData ); }; struct CharaMakeCustomize @@ -1257,7 +1257,7 @@ struct CharaMakeCustomize uint16_t data; bool isPurchasable; - CharaMakeCustomize( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ); + CharaMakeCustomize( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData ); }; struct CharaMakeType @@ -1267,7 +1267,7 @@ struct CharaMakeType int8_t gender; std::vector< int32_t > facialFeatureIcon; - CharaMakeType( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ); + CharaMakeType( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData ); }; struct ChocoboRace @@ -1275,7 +1275,7 @@ struct ChocoboRace uint8_t chocoboRaceRank; uint8_t chocoboRaceTerritory; - ChocoboRace( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ); + ChocoboRace( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData ); }; struct ChocoboRaceAbility @@ -1286,14 +1286,14 @@ struct ChocoboRaceAbility int8_t chocoboRaceAbilityType; uint8_t value; - ChocoboRaceAbility( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ); + ChocoboRaceAbility( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData ); }; struct ChocoboRaceAbilityType { bool isActive; - ChocoboRaceAbilityType( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ); + ChocoboRaceAbilityType( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData ); }; struct ChocoboRaceItem @@ -1302,7 +1302,7 @@ struct ChocoboRaceItem std::string description; uint32_t icon; - ChocoboRaceItem( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ); + ChocoboRaceItem( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData ); }; struct ChocoboRaceRank @@ -1313,14 +1313,14 @@ struct ChocoboRaceRank uint16_t fee; int32_t icon; - ChocoboRaceRank( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ); + ChocoboRaceRank( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData ); }; struct ChocoboRaceStatus { int32_t status; - ChocoboRaceStatus( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ); + ChocoboRaceStatus( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData ); }; struct ChocoboRaceTerritory @@ -1328,14 +1328,14 @@ struct ChocoboRaceTerritory uint16_t name; int32_t icon; - ChocoboRaceTerritory( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ); + ChocoboRaceTerritory( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData ); }; struct ChocoboRaceTutorial { std::vector< int32_t > npcYell; - ChocoboRaceTutorial( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ); + ChocoboRaceTutorial( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData ); }; struct ChocoboRaceWeather @@ -1343,21 +1343,21 @@ struct ChocoboRaceWeather int32_t weatherType1; int32_t weatherType2; - ChocoboRaceWeather( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ); + ChocoboRaceWeather( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData ); }; struct ChocoboTaxi { uint32_t location; - ChocoboTaxi( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ); + ChocoboTaxi( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData ); }; struct ChocoboTaxiStand { std::string placeName; - ChocoboTaxiStand( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ); + ChocoboTaxiStand( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData ); }; struct ClassJob @@ -1386,7 +1386,7 @@ struct ClassJob uint32_t prerequisite; uint8_t startingLevel; - ClassJob( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ); + ClassJob( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData ); }; struct ClassJobCategory @@ -1429,7 +1429,7 @@ struct ClassJobCategory bool sAM; bool rDM; - ClassJobCategory( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ); + ClassJobCategory( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData ); }; struct Companion @@ -1450,14 +1450,14 @@ struct Companion uint8_t skillCost; uint8_t minionRace; - Companion( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ); + Companion( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData ); }; struct CompanionMove { std::string name; - CompanionMove( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ); + CompanionMove( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData ); }; struct CompanionTransient @@ -1477,7 +1477,7 @@ struct CompanionTransient bool strengthArcana; uint8_t minionSkillType; - CompanionTransient( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ); + CompanionTransient( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData ); }; struct CompanyAction @@ -1490,7 +1490,7 @@ struct CompanyAction uint8_t order; bool purchasable; - CompanyAction( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ); + CompanyAction( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData ); }; struct CompanyCraftDraft @@ -1499,21 +1499,21 @@ struct CompanyCraftDraft uint8_t companyCraftDraftCategory; uint32_t order; - CompanyCraftDraft( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ); + CompanyCraftDraft( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData ); }; struct CompanyCraftDraftCategory { std::string name; - CompanyCraftDraftCategory( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ); + CompanyCraftDraftCategory( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData ); }; struct CompanyCraftManufactoryState { std::string name; - CompanyCraftManufactoryState( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ); + CompanyCraftManufactoryState( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData ); }; struct CompanyCraftPart @@ -1521,13 +1521,13 @@ struct CompanyCraftPart uint8_t companyCraftType; std::vector< uint16_t > companyCraftProcess; - CompanyCraftPart( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ); + CompanyCraftPart( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData ); }; struct CompanyCraftProcess { - CompanyCraftProcess( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ); + CompanyCraftProcess( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData ); }; struct CompanyCraftSequence @@ -1538,21 +1538,21 @@ struct CompanyCraftSequence int32_t companyCraftDraft; std::vector< uint16_t > companyCraftPart; - CompanyCraftSequence( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ); + CompanyCraftSequence( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData ); }; struct CompanyCraftSupplyItem { uint32_t item; - CompanyCraftSupplyItem( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ); + CompanyCraftSupplyItem( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData ); }; struct CompanyCraftType { std::string name; - CompanyCraftType( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ); + CompanyCraftType( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData ); }; struct CompleteJournal @@ -1562,7 +1562,7 @@ struct CompleteJournal std::string name; std::vector< int32_t > cutscene; - CompleteJournal( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ); + CompleteJournal( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData ); }; struct CompleteJournalCategory @@ -1570,7 +1570,7 @@ struct CompleteJournalCategory uint32_t firstQuest; uint32_t lastQuest; - CompleteJournalCategory( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ); + CompleteJournalCategory( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData ); }; struct ContentCloseCycle @@ -1578,7 +1578,7 @@ struct ContentCloseCycle uint32_t unixtime; uint32_t timeSeconds; - ContentCloseCycle( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ); + ContentCloseCycle( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData ); }; struct ContentExAction @@ -1586,7 +1586,7 @@ struct ContentExAction uint32_t name; uint8_t charges; - ContentExAction( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ); + ContentExAction( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData ); }; struct ContentFinderCondition @@ -1607,14 +1607,14 @@ struct ContentFinderCondition uint8_t transient; uint32_t image; - ContentFinderCondition( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ); + ContentFinderCondition( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData ); }; struct ContentFinderConditionTransient { std::string description; - ContentFinderConditionTransient( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ); + ContentFinderConditionTransient( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData ); }; struct ContentGauge @@ -1623,7 +1623,7 @@ struct ContentGauge uint8_t color; std::string textString; - ContentGauge( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ); + ContentGauge( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData ); }; struct ContentGaugeColor @@ -1632,7 +1632,7 @@ struct ContentGaugeColor uint32_t androidColor2; uint32_t androidColor3; - ContentGaugeColor( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ); + ContentGaugeColor( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData ); }; struct ContentMemberType @@ -1642,14 +1642,14 @@ struct ContentMemberType uint8_t meleesPerParty; uint8_t rangedPerParty; - ContentMemberType( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ); + ContentMemberType( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData ); }; struct ContentNpcTalk { std::vector< uint32_t > contentTalk; - ContentNpcTalk( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ); + ContentNpcTalk( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData ); }; struct ContentRoulette @@ -1672,14 +1672,14 @@ struct ContentRoulette uint8_t contentRouletteOpenRule; uint16_t instanceContent; - ContentRoulette( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ); + ContentRoulette( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData ); }; struct ContentRouletteOpenRule { uint32_t type; - ContentRouletteOpenRule( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ); + ContentRouletteOpenRule( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData ); }; struct ContentRouletteRoleBonus @@ -1687,7 +1687,7 @@ struct ContentRouletteRoleBonus uint32_t itemRewardType; uint8_t rewardAmount; - ContentRouletteRoleBonus( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ); + ContentRouletteRoleBonus( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData ); }; struct ContentsNote @@ -1703,7 +1703,7 @@ struct ContentsNote std::string description; int32_t expCap; - ContentsNote( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ); + ContentsNote( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData ); }; struct ContentTalk @@ -1711,7 +1711,7 @@ struct ContentTalk uint8_t contentTalkParam; std::string text; - ContentTalk( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ); + ContentTalk( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData ); }; struct ContentTalkParam @@ -1719,7 +1719,7 @@ struct ContentTalkParam bool param; uint32_t testAction; - ContentTalkParam( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ); + ContentTalkParam( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData ); }; struct ContentType @@ -1728,7 +1728,7 @@ struct ContentType uint32_t icon; uint32_t iconDutyFinder; - ContentType( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ); + ContentType( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData ); }; struct CraftAction @@ -1753,7 +1753,7 @@ struct CraftAction int32_t aLC; int32_t cUL; - CraftAction( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ); + CraftAction( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData ); }; struct CraftLeve @@ -1762,14 +1762,14 @@ struct CraftLeve int32_t craftLeveTalk; uint8_t repeats; - CraftLeve( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ); + CraftLeve( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData ); }; struct CraftType { std::string name; - CraftType( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ); + CraftType( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData ); }; struct Credit @@ -1785,14 +1785,14 @@ struct Credit uint16_t frenchCast2; uint16_t germanCast2; - Credit( uint32_t row_id, uint32_t subRow, Core::Data::ExdDataGenerated* exdData ); + Credit( uint32_t row_id, uint32_t subRow, Sapphire::Data::ExdDataGenerated* exdData ); }; struct CreditCast { std::string name; - CreditCast( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ); + CreditCast( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData ); }; struct Currency @@ -1800,7 +1800,7 @@ struct Currency uint32_t item; uint32_t limit; - Currency( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ); + Currency( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData ); }; struct CustomTalk @@ -1812,34 +1812,34 @@ struct CustomTalk std::vector< uint32_t > scriptArg; bool text; - CustomTalk( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ); + CustomTalk( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData ); }; struct Cutscene { std::string path; - Cutscene( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ); + Cutscene( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData ); }; struct CutScreenImage { int32_t image; - CutScreenImage( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ); + CutScreenImage( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData ); }; struct DailySupplyItem { - DailySupplyItem( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ); + DailySupplyItem( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData ); }; struct DeepDungeon { std::string name; - DeepDungeon( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ); + DeepDungeon( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData ); }; struct DeepDungeonBan @@ -1848,7 +1848,7 @@ struct DeepDungeonBan uint16_t logMessage; uint16_t name; - DeepDungeonBan( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ); + DeepDungeonBan( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData ); }; struct DeepDungeonDanger @@ -1857,7 +1857,7 @@ struct DeepDungeonDanger uint16_t logMessage; uint16_t name; - DeepDungeonDanger( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ); + DeepDungeonDanger( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData ); }; struct DeepDungeonEquipment @@ -1873,7 +1873,7 @@ struct DeepDungeonEquipment std::string name; std::string description; - DeepDungeonEquipment( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ); + DeepDungeonEquipment( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData ); }; struct DeepDungeonFloorEffectUI @@ -1882,7 +1882,7 @@ struct DeepDungeonFloorEffectUI std::string name; std::string description; - DeepDungeonFloorEffectUI( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ); + DeepDungeonFloorEffectUI( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData ); }; struct DeepDungeonItem @@ -1899,14 +1899,14 @@ struct DeepDungeonItem std::string tooltip; uint32_t action; - DeepDungeonItem( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ); + DeepDungeonItem( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData ); }; struct DeepDungeonLayer { uint8_t deepDungeon; - DeepDungeonLayer( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ); + DeepDungeonLayer( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData ); }; struct DeepDungeonMagicStone @@ -1922,21 +1922,21 @@ struct DeepDungeonMagicStone std::string name; std::string tooltip; - DeepDungeonMagicStone( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ); + DeepDungeonMagicStone( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData ); }; struct DeepDungeonMap5X { std::vector< uint16_t > deepDungeonRoom; - DeepDungeonMap5X( uint32_t row_id, uint32_t subRow, Core::Data::ExdDataGenerated* exdData ); + DeepDungeonMap5X( uint32_t row_id, uint32_t subRow, Sapphire::Data::ExdDataGenerated* exdData ); }; struct DeepDungeonRoom { std::vector< uint32_t > level; - DeepDungeonRoom( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ); + DeepDungeonRoom( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData ); }; struct DeepDungeonStatus @@ -1945,7 +1945,7 @@ struct DeepDungeonStatus uint16_t logMessage; uint16_t name; - DeepDungeonStatus( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ); + DeepDungeonStatus( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData ); }; struct DefaultTalk @@ -1953,35 +1953,35 @@ struct DefaultTalk std::vector< uint16_t > actionTimelinePose; std::vector< std::string > text; - DefaultTalk( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ); + DefaultTalk( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData ); }; struct DefaultTalkLipSyncType { int32_t actionTimeline; - DefaultTalkLipSyncType( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ); + DefaultTalkLipSyncType( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData ); }; struct DeliveryQuest { int32_t quest; - DeliveryQuest( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ); + DeliveryQuest( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData ); }; struct DisposalShop { std::string shopName; - DisposalShop( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ); + DisposalShop( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData ); }; struct DisposalShopFilterType { std::string category; - DisposalShopFilterType( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ); + DisposalShopFilterType( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData ); }; struct DisposalShopItem @@ -1990,7 +1990,7 @@ struct DisposalShopItem int32_t itemReceived; uint32_t quantityReceived; - DisposalShopItem( uint32_t row_id, uint32_t subRow, Core::Data::ExdDataGenerated* exdData ); + DisposalShopItem( uint32_t row_id, uint32_t subRow, Sapphire::Data::ExdDataGenerated* exdData ); }; struct DpsChallenge @@ -2002,7 +2002,7 @@ struct DpsChallenge std::string name; std::string description; - DpsChallenge( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ); + DpsChallenge( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData ); }; struct DpsChallengeOfficer @@ -2010,14 +2010,14 @@ struct DpsChallengeOfficer uint32_t unlockQuest; std::vector< uint16_t > challengeName; - DpsChallengeOfficer( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ); + DpsChallengeOfficer( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData ); }; struct DpsChallengeTransient { uint16_t instanceContent; - DpsChallengeTransient( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ); + DpsChallengeTransient( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData ); }; struct Emote @@ -2034,14 +2034,14 @@ struct Emote uint16_t logMessageUntargeted; uint32_t unlockLink; - Emote( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ); + Emote( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData ); }; struct EmoteCategory { std::string name; - EmoteCategory( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ); + EmoteCategory( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData ); }; struct ENpcBase @@ -2102,7 +2102,7 @@ struct ENpcBase uint8_t dyeRightRing; uint16_t balloon; - ENpcBase( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ); + ENpcBase( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData ); }; struct ENpcResident @@ -2117,7 +2117,7 @@ struct ENpcResident std::string title; uint8_t map; - ENpcResident( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ); + ENpcResident( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData ); }; struct EObj @@ -2125,7 +2125,7 @@ struct EObj uint32_t data; uint16_t sgbPath; - EObj( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ); + EObj( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData ); }; struct EObjName @@ -2138,7 +2138,7 @@ struct EObjName int8_t pronoun; int8_t article; - EObjName( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ); + EObjName( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData ); }; struct EquipRaceCategory @@ -2152,7 +2152,7 @@ struct EquipRaceCategory bool male; bool female; - EquipRaceCategory( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ); + EquipRaceCategory( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData ); }; struct EquipSlotCategory @@ -2172,7 +2172,7 @@ struct EquipSlotCategory int8_t fingerR; int8_t soulCrystal; - EquipSlotCategory( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ); + EquipSlotCategory( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData ); }; struct EurekaAetherItem @@ -2186,28 +2186,28 @@ struct EurekaAetherItem int8_t article; std::string name; - EurekaAetherItem( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ); + EurekaAetherItem( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData ); }; struct EurekaAethernet { uint16_t location; - EurekaAethernet( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ); + EurekaAethernet( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData ); }; struct EurekaGrowData { uint16_t baseResistance; - EurekaGrowData( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ); + EurekaGrowData( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData ); }; struct EurekaLogosMixerProbability { uint8_t probability; - EurekaLogosMixerProbability( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ); + EurekaLogosMixerProbability( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData ); }; struct EurekaMagiaAction @@ -2215,7 +2215,7 @@ struct EurekaMagiaAction uint32_t action; uint8_t maxUses; - EurekaMagiaAction( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ); + EurekaMagiaAction( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData ); }; struct EurekaMagiciteItem @@ -2224,21 +2224,21 @@ struct EurekaMagiciteItem uint8_t classJobCategory; uint32_t item; - EurekaMagiciteItem( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ); + EurekaMagiciteItem( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData ); }; struct EurekaMagiciteItemType { std::string type; - EurekaMagiciteItemType( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ); + EurekaMagiciteItemType( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData ); }; struct EurekaSphereElementAdjust { uint16_t powerModifier; - EurekaSphereElementAdjust( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ); + EurekaSphereElementAdjust( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData ); }; struct EventAction @@ -2248,14 +2248,14 @@ struct EventAction uint8_t castTime; std::vector< uint16_t > animation; - EventAction( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ); + EventAction( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData ); }; struct EventIconPriority { std::vector< uint32_t > icon; - EventIconPriority( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ); + EventIconPriority( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData ); }; struct EventIconType @@ -2266,7 +2266,7 @@ struct EventIconType uint32_t mapIconInvalid; uint8_t iconRange; - EventIconType( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ); + EventIconType( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData ); }; struct EventItem @@ -2285,42 +2285,42 @@ struct EventItem uint32_t quest; uint8_t castTime; - EventItem( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ); + EventItem( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData ); }; struct EventItemCastTimeline { uint32_t actionTimeline; - EventItemCastTimeline( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ); + EventItemCastTimeline( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData ); }; struct EventItemHelp { std::string description; - EventItemHelp( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ); + EventItemHelp( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData ); }; struct EventItemTimeline { uint32_t actionTimeline; - EventItemTimeline( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ); + EventItemTimeline( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData ); }; struct ExportedSG { std::string sgbPath; - ExportedSG( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ); + ExportedSG( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData ); }; struct ExVersion { std::string name; - ExVersion( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ); + ExVersion( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData ); }; struct Fate @@ -2340,7 +2340,7 @@ struct Fate std::vector< std::string > statusText; uint32_t arrayIndex; - Fate( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ); + Fate( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData ); }; struct FCActivity @@ -2348,14 +2348,14 @@ struct FCActivity std::string text; uint8_t fCActivityCategory; - FCActivity( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ); + FCActivity( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData ); }; struct FCActivityCategory { std::string name; - FCActivityCategory( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ); + FCActivityCategory( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData ); }; struct FCAuthority @@ -2363,42 +2363,42 @@ struct FCAuthority std::string name; int32_t fCAuthorityCategory; - FCAuthority( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ); + FCAuthority( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData ); }; struct FCAuthorityCategory { std::string name; - FCAuthorityCategory( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ); + FCAuthorityCategory( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData ); }; struct FCChestName { std::string name; - FCChestName( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ); + FCChestName( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData ); }; struct FccShop { std::string name; - FccShop( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ); + FccShop( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData ); }; struct FCHierarchy { std::string name; - FCHierarchy( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ); + FCHierarchy( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData ); }; struct FCProfile { std::string name; - FCProfile( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ); + FCProfile( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData ); }; struct FCReputation @@ -2407,7 +2407,7 @@ struct FCReputation uint32_t requiredPoints; std::string name; - FCReputation( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ); + FCReputation( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData ); }; struct FCRights @@ -2417,14 +2417,14 @@ struct FCRights uint16_t icon; uint8_t fCRank; - FCRights( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ); + FCRights( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData ); }; struct Festival { std::string name; - Festival( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ); + Festival( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData ); }; struct FieldMarker @@ -2432,21 +2432,21 @@ struct FieldMarker int32_t vFX; uint16_t icon; - FieldMarker( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ); + FieldMarker( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData ); }; struct FishingRecordType { int32_t addon; - FishingRecordType( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ); + FishingRecordType( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData ); }; struct FishingRecordTypeTransient { int32_t image; - FishingRecordTypeTransient( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ); + FishingRecordTypeTransient( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData ); }; struct FishingSpot @@ -2462,7 +2462,7 @@ struct FishingSpot std::vector< int32_t > item; uint16_t placeName; - FishingSpot( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ); + FishingSpot( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData ); }; struct FishParameter @@ -2478,7 +2478,7 @@ struct FishParameter bool weatherRestricted; uint16_t gatheringSubCategory; - FishParameter( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ); + FishParameter( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData ); }; struct Frontline03 @@ -2488,7 +2488,7 @@ struct Frontline03 std::vector< uint32_t > twinAdderIcon; std::vector< uint32_t > immortalFlamesIcon; - Frontline03( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ); + Frontline03( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData ); }; struct Frontline04 @@ -2498,7 +2498,7 @@ struct Frontline04 int32_t level3; std::vector< int32_t > unknownLevel; - Frontline04( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ); + Frontline04( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData ); }; struct GardeningSeed @@ -2506,21 +2506,21 @@ struct GardeningSeed uint32_t item; uint32_t icon; - GardeningSeed( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ); + GardeningSeed( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData ); }; struct GatheringCondition { std::string text; - GatheringCondition( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ); + GatheringCondition( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData ); }; struct GatheringExp { uint16_t exp; - GatheringExp( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ); + GatheringExp( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData ); }; struct GatheringItem @@ -2529,7 +2529,7 @@ struct GatheringItem uint16_t gatheringItemLevel; bool isHidden; - GatheringItem( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ); + GatheringItem( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData ); }; struct GatheringItemLevelConvertTable @@ -2537,14 +2537,14 @@ struct GatheringItemLevelConvertTable uint8_t gatheringItemLevel; uint8_t stars; - GatheringItemLevelConvertTable( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ); + GatheringItemLevelConvertTable( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData ); }; struct GatheringItemPoint { uint32_t gatheringPoint; - GatheringItemPoint( uint32_t row_id, uint32_t subRow, Core::Data::ExdDataGenerated* exdData ); + GatheringItemPoint( uint32_t row_id, uint32_t subRow, Sapphire::Data::ExdDataGenerated* exdData ); }; struct GatheringLeve @@ -2553,20 +2553,20 @@ struct GatheringLeve uint8_t leveLevel; int32_t requiredItem2; - GatheringLeve( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ); + GatheringLeve( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData ); }; struct GatheringLeveRoute { - GatheringLeveRoute( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ); + GatheringLeveRoute( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData ); }; struct GatheringNotebookList { std::vector< int32_t > gatheringItem; - GatheringNotebookList( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ); + GatheringNotebookList( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData ); }; struct GatheringPoint @@ -2577,7 +2577,7 @@ struct GatheringPoint uint16_t placeName; uint16_t gatheringSubCategory; - GatheringPoint( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ); + GatheringPoint( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData ); }; struct GatheringPointBase @@ -2587,7 +2587,7 @@ struct GatheringPointBase std::vector< int32_t > item; bool isLimited; - GatheringPointBase( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ); + GatheringPointBase( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData ); }; struct GatheringPointBonus @@ -2597,14 +2597,14 @@ struct GatheringPointBonus uint8_t bonusType; uint16_t bonusValue; - GatheringPointBonus( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ); + GatheringPointBonus( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData ); }; struct GatheringPointBonusType { std::string text; - GatheringPointBonusType( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ); + GatheringPointBonusType( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData ); }; struct GatheringPointName @@ -2617,7 +2617,7 @@ struct GatheringPointName int8_t pronoun; int8_t article; - GatheringPointName( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ); + GatheringPointName( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData ); }; struct GatheringSubCategory @@ -2625,7 +2625,7 @@ struct GatheringSubCategory int32_t item; std::string folkloreBook; - GatheringSubCategory( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ); + GatheringSubCategory( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData ); }; struct GatheringType @@ -2634,7 +2634,7 @@ struct GatheringType int32_t iconMain; int32_t iconOff; - GatheringType( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ); + GatheringType( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData ); }; struct GcArmyCaptureTactics @@ -2646,7 +2646,7 @@ struct GcArmyCaptureTactics uint32_t tactic; uint32_t icon; - GcArmyCaptureTactics( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ); + GcArmyCaptureTactics( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData ); }; struct GcArmyExpedition @@ -2661,7 +2661,7 @@ struct GcArmyExpedition std::string name; std::string description; - GcArmyExpedition( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ); + GcArmyExpedition( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData ); }; struct GcArmyExpeditionMemberBonus @@ -2669,14 +2669,14 @@ struct GcArmyExpeditionMemberBonus uint8_t race; uint8_t classJob; - GcArmyExpeditionMemberBonus( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ); + GcArmyExpeditionMemberBonus( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData ); }; struct GcArmyExpeditionType { std::string name; - GcArmyExpeditionType( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ); + GcArmyExpeditionType( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData ); }; struct GcArmyMemberGrow @@ -2684,7 +2684,7 @@ struct GcArmyMemberGrow uint8_t classJob; int32_t classBook; - GcArmyMemberGrow( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ); + GcArmyMemberGrow( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData ); }; struct GcArmyTraining @@ -2696,7 +2696,7 @@ struct GcArmyTraining std::string name; std::string description; - GcArmyTraining( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ); + GcArmyTraining( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData ); }; struct GCRankGridaniaFemaleText @@ -2710,7 +2710,7 @@ struct GCRankGridaniaFemaleText int8_t article; std::string nameRank; - GCRankGridaniaFemaleText( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ); + GCRankGridaniaFemaleText( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData ); }; struct GCRankGridaniaMaleText @@ -2724,7 +2724,7 @@ struct GCRankGridaniaMaleText int8_t article; std::string nameRank; - GCRankGridaniaMaleText( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ); + GCRankGridaniaMaleText( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData ); }; struct GCRankLimsaFemaleText @@ -2738,7 +2738,7 @@ struct GCRankLimsaFemaleText int8_t article; std::string nameRank; - GCRankLimsaFemaleText( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ); + GCRankLimsaFemaleText( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData ); }; struct GCRankLimsaMaleText @@ -2752,7 +2752,7 @@ struct GCRankLimsaMaleText int8_t article; std::string nameRank; - GCRankLimsaMaleText( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ); + GCRankLimsaMaleText( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData ); }; struct GCRankUldahFemaleText @@ -2766,7 +2766,7 @@ struct GCRankUldahFemaleText int8_t article; std::string nameRank; - GCRankUldahFemaleText( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ); + GCRankUldahFemaleText( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData ); }; struct GCRankUldahMaleText @@ -2780,7 +2780,7 @@ struct GCRankUldahMaleText int8_t article; std::string nameRank; - GCRankUldahMaleText( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ); + GCRankUldahMaleText( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData ); }; struct GCScripShopCategory @@ -2789,7 +2789,7 @@ struct GCScripShopCategory int8_t tier; int8_t subCategory; - GCScripShopCategory( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ); + GCScripShopCategory( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData ); }; struct GCScripShopItem @@ -2799,27 +2799,27 @@ struct GCScripShopItem uint32_t costGCSeals; uint8_t sortKey; - GCScripShopItem( uint32_t row_id, uint32_t subRow, Core::Data::ExdDataGenerated* exdData ); + GCScripShopItem( uint32_t row_id, uint32_t subRow, Sapphire::Data::ExdDataGenerated* exdData ); }; struct GCShop { int8_t grandCompany; - GCShop( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ); + GCShop( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData ); }; struct GCShopItemCategory { std::string name; - GCShopItemCategory( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ); + GCShopItemCategory( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData ); }; struct GCSupplyDuty { - GCSupplyDuty( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ); + GCSupplyDuty( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData ); }; struct GCSupplyDutyReward @@ -2830,7 +2830,7 @@ struct GCSupplyDutyReward uint32_t sealsSupply; uint32_t sealsProvisioning; - GCSupplyDutyReward( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ); + GCSupplyDutyReward( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData ); }; struct GeneralAction @@ -2841,35 +2841,35 @@ struct GeneralAction uint16_t unlockLink; int32_t icon; - GeneralAction( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ); + GeneralAction( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData ); }; struct GFATE { std::vector< uint32_t > icon; - GFATE( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ); + GFATE( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData ); }; struct GFateClimbing2 { uint32_t contentEntry; - GFateClimbing2( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ); + GFateClimbing2( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData ); }; struct GFateClimbing2Content { uint32_t publicContentTextData; - GFateClimbing2Content( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ); + GFateClimbing2Content( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData ); }; struct GFateClimbing2TotemType { uint32_t publicContentTextData; - GFateClimbing2TotemType( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ); + GFateClimbing2TotemType( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData ); }; struct GilShop @@ -2880,7 +2880,7 @@ struct GilShop int32_t acceptTalk; int32_t failTalk; - GilShop( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ); + GilShop( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData ); }; struct GilShopItem @@ -2890,7 +2890,7 @@ struct GilShopItem uint16_t stateRequired; uint16_t patch; - GilShopItem( uint32_t row_id, uint32_t subRow, Core::Data::ExdDataGenerated* exdData ); + GilShopItem( uint32_t row_id, uint32_t subRow, Sapphire::Data::ExdDataGenerated* exdData ); }; struct GoldSaucerArcadeMachine @@ -2901,21 +2901,21 @@ struct GoldSaucerArcadeMachine uint32_t great; uint32_t excellent; - GoldSaucerArcadeMachine( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ); + GoldSaucerArcadeMachine( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData ); }; struct GoldSaucerTextData { std::string text; - GoldSaucerTextData( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ); + GoldSaucerTextData( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData ); }; struct GrandCompany { std::string name; - GrandCompany( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ); + GrandCompany( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData ); }; struct GrandCompanyRank @@ -2931,7 +2931,7 @@ struct GrandCompanyRank int32_t questSerpents; int32_t questFlames; - GrandCompanyRank( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ); + GrandCompanyRank( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData ); }; struct GuardianDeity @@ -2940,7 +2940,7 @@ struct GuardianDeity std::string description; uint16_t icon; - GuardianDeity( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ); + GuardianDeity( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData ); }; struct GuildleveAssignment @@ -2948,26 +2948,26 @@ struct GuildleveAssignment uint32_t assignmentTalk; std::vector< uint32_t > quest; - GuildleveAssignment( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ); + GuildleveAssignment( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData ); }; struct GuildleveAssignmentCategory { std::vector< int32_t > category; - GuildleveAssignmentCategory( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ); + GuildleveAssignmentCategory( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData ); }; struct GuildOrderGuide { - GuildOrderGuide( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ); + GuildOrderGuide( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData ); }; struct GuildOrderOfficer { - GuildOrderOfficer( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ); + GuildOrderOfficer( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData ); }; struct HairMakeType @@ -2976,14 +2976,14 @@ struct HairMakeType int32_t tribe; int8_t gender; - HairMakeType( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ); + HairMakeType( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData ); }; struct HouseRetainerPose { uint16_t actionTimeline; - HouseRetainerPose( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ); + HouseRetainerPose( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData ); }; struct HousingAethernet @@ -2993,7 +2993,7 @@ struct HousingAethernet uint16_t placeName; uint8_t order; - HousingAethernet( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ); + HousingAethernet( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData ); }; struct HousingAppeal @@ -3002,7 +3002,7 @@ struct HousingAppeal uint32_t icon; uint8_t order; - HousingAppeal( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ); + HousingAppeal( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData ); }; struct HousingEmploymentNpcList @@ -3010,14 +3010,14 @@ struct HousingEmploymentNpcList uint8_t race; std::vector< uint32_t > eNpcBase; - HousingEmploymentNpcList( uint32_t row_id, uint32_t subRow, Core::Data::ExdDataGenerated* exdData ); + HousingEmploymentNpcList( uint32_t row_id, uint32_t subRow, Sapphire::Data::ExdDataGenerated* exdData ); }; struct HousingEmploymentNpcRace { std::string race; - HousingEmploymentNpcRace( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ); + HousingEmploymentNpcRace( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData ); }; struct HousingExterior @@ -3026,7 +3026,7 @@ struct HousingExterior uint8_t housingSize; std::string model; - HousingExterior( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ); + HousingExterior( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData ); }; struct HousingFurniture @@ -3042,14 +3042,14 @@ struct HousingFurniture bool destroyOnRemoval; bool tooltip; - HousingFurniture( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ); + HousingFurniture( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData ); }; struct HousingMapMarkerInfo { uint16_t map; - HousingMapMarkerInfo( uint32_t row_id, uint32_t subRow, Core::Data::ExdDataGenerated* exdData ); + HousingMapMarkerInfo( uint32_t row_id, uint32_t subRow, Sapphire::Data::ExdDataGenerated* exdData ); }; struct HousingMerchantPose @@ -3057,7 +3057,7 @@ struct HousingMerchantPose uint16_t actionTimeline; std::string pose; - HousingMerchantPose( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ); + HousingMerchantPose( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData ); }; struct HousingLandSet @@ -3066,14 +3066,14 @@ struct HousingLandSet std::vector< uint32_t > minPrice; std::vector< uint32_t > initialPrice; - HousingLandSet( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ); + HousingLandSet( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData ); }; struct HousingPlacement { std::string text; - HousingPlacement( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ); + HousingPlacement( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData ); }; struct HousingPreset @@ -3102,14 +3102,14 @@ struct HousingPreset int32_t basementLighting; int32_t mansionLighting; - HousingPreset( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ); + HousingPreset( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData ); }; struct HousingUnitedExterior { std::vector< uint32_t > item; - HousingUnitedExterior( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ); + HousingUnitedExterior( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData ); }; struct HousingYardObject @@ -3123,7 +3123,7 @@ struct HousingYardObject uint32_t item; bool destroyOnRemoval; - HousingYardObject( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ); + HousingYardObject( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData ); }; struct HowTo @@ -3131,21 +3131,21 @@ struct HowTo std::vector< int16_t > images; int8_t category; - HowTo( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ); + HowTo( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData ); }; struct HowToCategory { std::string category; - HowToCategory( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ); + HowToCategory( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData ); }; struct HowToPage { int32_t image; - HowToPage( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ); + HowToPage( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData ); }; struct InstanceContent @@ -3175,7 +3175,7 @@ struct InstanceContent uint32_t reqInstance; uint8_t partyCondition; - InstanceContent( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ); + InstanceContent( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData ); }; struct InstanceContentBuff @@ -3183,14 +3183,14 @@ struct InstanceContentBuff uint16_t echoStart; uint16_t echoDeath; - InstanceContentBuff( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ); + InstanceContentBuff( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData ); }; struct InstanceContentTextData { std::string text; - InstanceContentTextData( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ); + InstanceContentTextData( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData ); }; struct Item @@ -3254,7 +3254,7 @@ struct Item bool isPvP; bool isGlamourous; - Item( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ); + Item( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData ); }; struct ItemAction @@ -3263,13 +3263,13 @@ struct ItemAction std::vector< uint16_t > data; std::vector< uint16_t > dataHQ; - ItemAction( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ); + ItemAction( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData ); }; struct ItemFood { - ItemFood( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ); + ItemFood( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData ); }; struct ItemLevel @@ -3348,7 +3348,7 @@ struct ItemLevel uint16_t gathering; uint16_t perception; - ItemLevel( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ); + ItemLevel( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData ); }; struct ItemSearchCategory @@ -3359,21 +3359,21 @@ struct ItemSearchCategory uint8_t order; int8_t classJob; - ItemSearchCategory( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ); + ItemSearchCategory( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData ); }; struct ItemSeries { std::string name; - ItemSeries( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ); + ItemSeries( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData ); }; struct ItemSpecialBonus { std::string name; - ItemSpecialBonus( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ); + ItemSpecialBonus( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData ); }; struct ItemUICategory @@ -3383,7 +3383,7 @@ struct ItemUICategory uint8_t orderMinor; uint8_t orderMajor; - ItemUICategory( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ); + ItemUICategory( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData ); }; struct JournalCategory @@ -3391,7 +3391,7 @@ struct JournalCategory std::string name; uint8_t journalSection; - JournalCategory( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ); + JournalCategory( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData ); }; struct JournalGenre @@ -3400,14 +3400,14 @@ struct JournalGenre uint8_t journalCategory; std::string name; - JournalGenre( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ); + JournalGenre( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData ); }; struct JournalSection { std::string name; - JournalSection( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ); + JournalSection( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData ); }; struct Leve @@ -3435,7 +3435,7 @@ struct Leve uint32_t levelStart; uint16_t bGM; - Leve( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ); + Leve( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData ); }; struct LeveAssignmentType @@ -3444,14 +3444,14 @@ struct LeveAssignmentType int32_t icon; std::string name; - LeveAssignmentType( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ); + LeveAssignmentType( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData ); }; struct LeveClient { std::string name; - LeveClient( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ); + LeveClient( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData ); }; struct Level @@ -3467,19 +3467,19 @@ struct Level uint32_t eventId; uint16_t territory; - Level( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ); + Level( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData ); }; struct LeveRewardItem { - LeveRewardItem( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ); + LeveRewardItem( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData ); }; struct LeveRewardItemGroup { - LeveRewardItemGroup( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ); + LeveRewardItemGroup( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData ); }; struct LeveVfx @@ -3487,7 +3487,7 @@ struct LeveVfx std::string effect; int32_t icon; - LeveVfx( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ); + LeveVfx( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData ); }; struct LogFilter @@ -3496,7 +3496,7 @@ struct LogFilter std::string name; std::string example; - LogFilter( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ); + LogFilter( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData ); }; struct LogKind @@ -3506,14 +3506,14 @@ struct LogKind std::string example; uint8_t logKindCategoryText; - LogKind( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ); + LogKind( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData ); }; struct LogKindCategoryText { std::string text; - LogKindCategoryText( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ); + LogKindCategoryText( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData ); }; struct LogMessage @@ -3521,7 +3521,7 @@ struct LogMessage uint16_t logKind; std::string text; - LogMessage( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ); + LogMessage( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData ); }; struct LotteryExchangeShop @@ -3529,14 +3529,14 @@ struct LotteryExchangeShop std::vector< int32_t > itemAccepted; std::vector< uint32_t > amountAccepted; - LotteryExchangeShop( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ); + LotteryExchangeShop( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData ); }; struct MacroIcon { int32_t icon; - MacroIcon( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ); + MacroIcon( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData ); }; struct MacroIconRedirectOld @@ -3544,7 +3544,7 @@ struct MacroIconRedirectOld uint32_t iconOld; int32_t iconNew; - MacroIconRedirectOld( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ); + MacroIconRedirectOld( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData ); }; struct MainCommand @@ -3554,14 +3554,14 @@ struct MainCommand std::string name; std::string description; - MainCommand( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ); + MainCommand( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData ); }; struct MainCommandCategory { std::string name; - MainCommandCategory( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ); + MainCommandCategory( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData ); }; struct ManeuversArmor @@ -3569,7 +3569,7 @@ struct ManeuversArmor std::vector< uint32_t > bNpcBase; std::vector< uint32_t > icon; - ManeuversArmor( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ); + ManeuversArmor( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData ); }; struct Map @@ -3587,7 +3587,7 @@ struct Map uint16_t territoryType; bool discoveryArrayByte; - Map( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ); + Map( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData ); }; struct MapMarker @@ -3602,14 +3602,14 @@ struct MapMarker uint8_t dataType; uint16_t dataKey; - MapMarker( uint32_t row_id, uint32_t subRow, Core::Data::ExdDataGenerated* exdData ); + MapMarker( uint32_t row_id, uint32_t subRow, Sapphire::Data::ExdDataGenerated* exdData ); }; struct MapMarkerRegion { int16_t x; - MapMarkerRegion( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ); + MapMarkerRegion( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData ); }; struct MapSymbol @@ -3617,7 +3617,7 @@ struct MapSymbol int32_t icon; int32_t placeName; - MapSymbol( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ); + MapSymbol( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData ); }; struct Marker @@ -3625,7 +3625,7 @@ struct Marker int32_t icon; std::string name; - Marker( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ); + Marker( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData ); }; struct MasterpieceSupplyDuty @@ -3634,7 +3634,7 @@ struct MasterpieceSupplyDuty uint8_t classJobLevel; uint16_t rewardCurrency; - MasterpieceSupplyDuty( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ); + MasterpieceSupplyDuty( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData ); }; struct MasterpieceSupplyMultiplier @@ -3642,7 +3642,7 @@ struct MasterpieceSupplyMultiplier std::vector< uint16_t > xpMultiplier; std::vector< uint16_t > currencyMultiplier; - MasterpieceSupplyMultiplier( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ); + MasterpieceSupplyMultiplier( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData ); }; struct Materia @@ -3651,7 +3651,7 @@ struct Materia uint8_t baseParam; std::vector< uint8_t > value; - Materia( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ); + Materia( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData ); }; struct MiniGameRA @@ -3659,14 +3659,14 @@ struct MiniGameRA int32_t icon; int32_t bGM; - MiniGameRA( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ); + MiniGameRA( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData ); }; struct MinionRace { std::string name; - MinionRace( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ); + MinionRace( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData ); }; struct MinionRules @@ -3674,14 +3674,14 @@ struct MinionRules std::string rule; std::string description; - MinionRules( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ); + MinionRules( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData ); }; struct MinionSkillType { std::string name; - MinionSkillType( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ); + MinionSkillType( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData ); }; struct MobHuntOrderType @@ -3689,7 +3689,7 @@ struct MobHuntOrderType uint32_t quest; uint32_t eventItem; - MobHuntOrderType( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ); + MobHuntOrderType( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData ); }; struct MobHuntTarget @@ -3700,7 +3700,7 @@ struct MobHuntTarget uint16_t territoryType; uint16_t placeName; - MobHuntTarget( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ); + MobHuntTarget( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData ); }; struct ModelChara @@ -3710,7 +3710,7 @@ struct ModelChara uint8_t base; uint8_t variant; - ModelChara( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ); + ModelChara( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData ); }; struct ModelState @@ -3718,7 +3718,7 @@ struct ModelState uint16_t start; uint16_t end; - ModelState( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ); + ModelState( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData ); }; struct MonsterNote @@ -3728,7 +3728,7 @@ struct MonsterNote uint32_t reward; std::string name; - MonsterNote( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ); + MonsterNote( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData ); }; struct MonsterNoteTarget @@ -3736,7 +3736,7 @@ struct MonsterNoteTarget uint16_t bNpcName; int32_t icon; - MonsterNoteTarget( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ); + MonsterNoteTarget( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData ); }; struct Mount @@ -3761,14 +3761,14 @@ struct Mount bool useEP; bool isImmobile; - Mount( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ); + Mount( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData ); }; struct MountAction { std::vector< uint16_t > action; - MountAction( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ); + MountAction( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData ); }; struct MountCustomize @@ -3798,21 +3798,21 @@ struct MountCustomize uint8_t auRaMaleCameraHeight; uint8_t auRaFemaleCameraHeight; - MountCustomize( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ); + MountCustomize( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData ); }; struct MountFlyingCondition { uint32_t quest; - MountFlyingCondition( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ); + MountFlyingCondition( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData ); }; struct MountSpeed { uint32_t quest; - MountSpeed( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ); + MountSpeed( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData ); }; struct MountTransient @@ -3821,7 +3821,7 @@ struct MountTransient std::string descriptionEnhanced; std::string tooltip; - MountTransient( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ); + MountTransient( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData ); }; struct MoveTimeline @@ -3837,7 +3837,7 @@ struct MoveTimeline uint16_t moveTurnRight; uint16_t extra; - MoveTimeline( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ); + MoveTimeline( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData ); }; struct MoveVfx @@ -3845,7 +3845,7 @@ struct MoveVfx uint16_t vFXNormal; uint16_t vFXWalking; - MoveVfx( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ); + MoveVfx( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData ); }; struct NpcEquip @@ -3876,21 +3876,21 @@ struct NpcEquip uint32_t modelRightRing; uint8_t dyeRightRing; - NpcEquip( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ); + NpcEquip( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData ); }; struct NpcYell { std::string text; - NpcYell( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ); + NpcYell( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData ); }; struct Omen { std::string fileName; - Omen( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ); + Omen( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData ); }; struct OnlineStatus @@ -3899,7 +3899,7 @@ struct OnlineStatus std::string name; uint32_t icon; - OnlineStatus( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ); + OnlineStatus( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData ); }; struct Opening @@ -3907,7 +3907,7 @@ struct Opening std::string name; uint32_t quest; - Opening( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ); + Opening( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData ); }; struct Orchestrion @@ -3915,21 +3915,21 @@ struct Orchestrion std::string name; std::string description; - Orchestrion( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ); + Orchestrion( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData ); }; struct OrchestrionCategory { std::string name; - OrchestrionCategory( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ); + OrchestrionCategory( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData ); }; struct OrchestrionPath { std::string file; - OrchestrionPath( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ); + OrchestrionPath( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData ); }; struct OrchestrionUiparam @@ -3937,7 +3937,7 @@ struct OrchestrionUiparam uint8_t orchestrionCategory; uint16_t order; - OrchestrionUiparam( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ); + OrchestrionUiparam( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData ); }; struct ParamGrow @@ -3951,7 +3951,7 @@ struct ParamGrow uint16_t hpModifier; int32_t huntingLogExpReward; - ParamGrow( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ); + ParamGrow( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData ); }; struct PartyContent @@ -3964,21 +3964,21 @@ struct PartyContent uint16_t contentFinderCondition; uint32_t image; - PartyContent( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ); + PartyContent( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData ); }; struct PartyContentCutscene { uint32_t cutscene; - PartyContentCutscene( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ); + PartyContentCutscene( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData ); }; struct PartyContentTextData { std::string data; - PartyContentTextData( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ); + PartyContentTextData( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData ); }; struct Perform @@ -3994,21 +3994,21 @@ struct Perform std::string instrument; uint8_t transient; - Perform( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ); + Perform( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData ); }; struct PerformTransient { std::string text; - PerformTransient( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ); + PerformTransient( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData ); }; struct Pet { std::string name; - Pet( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ); + Pet( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData ); }; struct PetAction @@ -4019,7 +4019,7 @@ struct PetAction uint16_t action; uint8_t pet; - PetAction( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ); + PetAction( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData ); }; struct Picture @@ -4028,7 +4028,7 @@ struct Picture int32_t image; int32_t signature; - Picture( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ); + Picture( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData ); }; struct PlaceName @@ -4036,14 +4036,14 @@ struct PlaceName std::string name; std::string nameNoArticle; - PlaceName( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ); + PlaceName( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData ); }; struct PlantPotFlowerSeed { std::vector< uint32_t > seedIcon; - PlantPotFlowerSeed( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ); + PlantPotFlowerSeed( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData ); }; struct PreHandler @@ -4051,7 +4051,7 @@ struct PreHandler uint32_t gilShop; uint16_t actionTimeline; - PreHandler( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ); + PreHandler( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData ); }; struct PublicContent @@ -4065,7 +4065,7 @@ struct PublicContent uint16_t contentFinderCondition; uint16_t additionalData; - PublicContent( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ); + PublicContent( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData ); }; struct PublicContentCutscene @@ -4073,21 +4073,21 @@ struct PublicContentCutscene uint32_t cutscene; uint32_t cutscene2; - PublicContentCutscene( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ); + PublicContentCutscene( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData ); }; struct PublicContentTextData { std::string textData; - PublicContentTextData( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ); + PublicContentTextData( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData ); }; struct PvPAction { uint16_t action; - PvPAction( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ); + PvPAction( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData ); }; struct PvPActionSort @@ -4095,14 +4095,14 @@ struct PvPActionSort uint8_t name; uint16_t action; - PvPActionSort( uint32_t row_id, uint32_t subRow, Core::Data::ExdDataGenerated* exdData ); + PvPActionSort( uint32_t row_id, uint32_t subRow, Sapphire::Data::ExdDataGenerated* exdData ); }; struct PvPRank { uint32_t expRequired; - PvPRank( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ); + PvPRank( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData ); }; struct PvPSelectTrait @@ -4111,7 +4111,7 @@ struct PvPSelectTrait uint32_t icon; int16_t value; - PvPSelectTrait( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ); + PvPSelectTrait( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData ); }; struct PvPTrait @@ -4120,7 +4120,7 @@ struct PvPTrait uint16_t trait2; uint16_t trait3; - PvPTrait( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ); + PvPTrait( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData ); }; struct Quest @@ -4189,7 +4189,7 @@ struct Quest uint8_t eventIconType; uint16_t sortKey; - Quest( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ); + Quest( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData ); }; struct QuestClassJobReward @@ -4200,7 +4200,7 @@ struct QuestClassJobReward std::vector< uint32_t > requiredItem; std::vector< uint8_t > requiredAmount; - QuestClassJobReward( uint32_t row_id, uint32_t subRow, Core::Data::ExdDataGenerated* exdData ); + QuestClassJobReward( uint32_t row_id, uint32_t subRow, Sapphire::Data::ExdDataGenerated* exdData ); }; struct QuestClassJobSupply @@ -4209,14 +4209,14 @@ struct QuestClassJobSupply uint32_t eNpcResident; uint32_t item; - QuestClassJobSupply( uint32_t row_id, uint32_t subRow, Core::Data::ExdDataGenerated* exdData ); + QuestClassJobSupply( uint32_t row_id, uint32_t subRow, Sapphire::Data::ExdDataGenerated* exdData ); }; struct QuestRepeatFlag { uint32_t quest; - QuestRepeatFlag( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ); + QuestRepeatFlag( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData ); }; struct QuestRewardOther @@ -4224,7 +4224,7 @@ struct QuestRewardOther uint32_t icon; std::string name; - QuestRewardOther( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ); + QuestRewardOther( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData ); }; struct QuickChat @@ -4234,14 +4234,14 @@ struct QuickChat int32_t addon; int8_t quickChatTransient; - QuickChat( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ); + QuickChat( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData ); }; struct QuickChatTransient { std::string textOutput; - QuickChatTransient( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ); + QuickChatTransient( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData ); }; struct Race @@ -4257,7 +4257,7 @@ struct Race int32_t rSEFLegs; int32_t rSEFFeet; - Race( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ); + Race( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData ); }; struct RacingChocoboItem @@ -4266,14 +4266,14 @@ struct RacingChocoboItem uint8_t category; std::vector< uint8_t > param; - RacingChocoboItem( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ); + RacingChocoboItem( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData ); }; struct RacingChocoboName { std::string name; - RacingChocoboName( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ); + RacingChocoboName( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData ); }; struct RacingChocoboNameCategory @@ -4281,21 +4281,21 @@ struct RacingChocoboNameCategory uint8_t sortKey; std::string name; - RacingChocoboNameCategory( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ); + RacingChocoboNameCategory( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData ); }; struct RacingChocoboNameInfo { uint8_t racingChocoboNameCategory; - RacingChocoboNameInfo( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ); + RacingChocoboNameInfo( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData ); }; struct RacingChocoboParam { std::string name; - RacingChocoboParam( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ); + RacingChocoboParam( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData ); }; struct Recipe @@ -4322,14 +4322,14 @@ struct Recipe bool isSpecializationRequired; uint16_t patchNumber; - Recipe( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ); + Recipe( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData ); }; struct RecipeElement { std::string name; - RecipeElement( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ); + RecipeElement( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData ); }; struct RecipeLevelTable @@ -4341,21 +4341,21 @@ struct RecipeLevelTable int16_t quality; uint16_t durability; - RecipeLevelTable( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ); + RecipeLevelTable( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData ); }; struct RecipeNotebookList { std::vector< int32_t > recipe; - RecipeNotebookList( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ); + RecipeNotebookList( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData ); }; struct RecommendContents { int32_t level; - RecommendContents( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ); + RecommendContents( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData ); }; struct Relic @@ -4364,7 +4364,7 @@ struct Relic uint32_t itemAnimus; int32_t icon; - Relic( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ); + Relic( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData ); }; struct Relic3 @@ -4375,7 +4375,7 @@ struct Relic3 uint32_t itemNovus; int32_t icon; - Relic3( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ); + Relic3( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData ); }; struct RelicItem @@ -4392,7 +4392,7 @@ struct RelicItem uint32_t shieldItem; uint32_t rogueItem; - RelicItem( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ); + RelicItem( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData ); }; struct RelicNote @@ -4401,14 +4401,14 @@ struct RelicNote std::vector< uint16_t > monsterNoteTargetNM; std::vector< uint16_t > leve; - RelicNote( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ); + RelicNote( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData ); }; struct RelicNoteCategory { std::string text; - RelicNoteCategory( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ); + RelicNoteCategory( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData ); }; struct Resident @@ -4417,7 +4417,7 @@ struct Resident int32_t npcYell; uint8_t residentMotionType; - Resident( uint32_t row_id, uint32_t subRow, Core::Data::ExdDataGenerated* exdData ); + Resident( uint32_t row_id, uint32_t subRow, Sapphire::Data::ExdDataGenerated* exdData ); }; struct RetainerTask @@ -4433,7 +4433,7 @@ struct RetainerTask uint16_t requiredGathering; uint16_t task; - RetainerTask( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ); + RetainerTask( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData ); }; struct RetainerTaskLvRange @@ -4441,7 +4441,7 @@ struct RetainerTaskLvRange uint8_t min; uint8_t max; - RetainerTaskLvRange( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ); + RetainerTaskLvRange( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData ); }; struct RetainerTaskNormal @@ -4453,7 +4453,7 @@ struct RetainerTaskNormal int16_t gatheringLog; int16_t fishingLog; - RetainerTaskNormal( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ); + RetainerTaskNormal( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData ); }; struct RetainerTaskParameter @@ -4462,7 +4462,7 @@ struct RetainerTaskParameter std::vector< int16_t > gatheringDoL; std::vector< int16_t > gatheringFSH; - RetainerTaskParameter( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ); + RetainerTaskParameter( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData ); }; struct RetainerTaskRandom @@ -4470,7 +4470,7 @@ struct RetainerTaskRandom std::string name; int16_t requirement; - RetainerTaskRandom( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ); + RetainerTaskRandom( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData ); }; struct RPParameter @@ -4478,14 +4478,14 @@ struct RPParameter uint16_t bNpcName; uint8_t classJob; - RPParameter( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ); + RPParameter( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData ); }; struct Salvage { uint16_t optimalSkill; - Salvage( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ); + Salvage( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData ); }; struct SatisfactionNpc @@ -4497,7 +4497,7 @@ struct SatisfactionNpc std::vector< uint16_t > satisfactionRequired; int32_t icon; - SatisfactionNpc( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ); + SatisfactionNpc( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData ); }; struct SatisfactionSupply @@ -4510,7 +4510,7 @@ struct SatisfactionSupply uint16_t collectabilityHigh; uint16_t reward; - SatisfactionSupply( uint32_t row_id, uint32_t subRow, Core::Data::ExdDataGenerated* exdData ); + SatisfactionSupply( uint32_t row_id, uint32_t subRow, Sapphire::Data::ExdDataGenerated* exdData ); }; struct SatisfactionSupplyReward @@ -4522,7 +4522,7 @@ struct SatisfactionSupplyReward uint16_t gilMid; uint16_t gilHigh; - SatisfactionSupplyReward( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ); + SatisfactionSupplyReward( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData ); }; struct ScenarioTree @@ -4530,7 +4530,7 @@ struct ScenarioTree uint8_t type; uint16_t image; - ScenarioTree( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ); + ScenarioTree( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData ); }; struct ScenarioTreeTips @@ -4538,7 +4538,7 @@ struct ScenarioTreeTips uint32_t tips1; uint32_t tips2; - ScenarioTreeTips( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ); + ScenarioTreeTips( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData ); }; struct ScenarioTreeTipsClassQuest @@ -4548,28 +4548,28 @@ struct ScenarioTreeTipsClassQuest uint8_t requiredExpansion; uint32_t requiredQuest; - ScenarioTreeTipsClassQuest( uint32_t row_id, uint32_t subRow, Core::Data::ExdDataGenerated* exdData ); + ScenarioTreeTipsClassQuest( uint32_t row_id, uint32_t subRow, Sapphire::Data::ExdDataGenerated* exdData ); }; struct ScenarioTreeTipsQuest { uint32_t level; - ScenarioTreeTipsQuest( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ); + ScenarioTreeTipsQuest( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData ); }; struct ScenarioType { std::string type; - ScenarioType( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ); + ScenarioType( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData ); }; struct ScreenImage { uint32_t image; - ScreenImage( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ); + ScreenImage( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData ); }; struct SecretRecipeBook @@ -4577,7 +4577,7 @@ struct SecretRecipeBook int32_t item; std::string name; - SecretRecipeBook( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ); + SecretRecipeBook( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData ); }; struct SkyIsland2Mission @@ -4591,7 +4591,7 @@ struct SkyIsland2Mission uint16_t objective3; uint32_t image; - SkyIsland2Mission( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ); + SkyIsland2Mission( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData ); }; struct SkyIsland2MissionDetail @@ -4601,21 +4601,21 @@ struct SkyIsland2MissionDetail uint32_t eObj; std::string objective; - SkyIsland2MissionDetail( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ); + SkyIsland2MissionDetail( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData ); }; struct SkyIsland2MissionType { bool type; - SkyIsland2MissionType( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ); + SkyIsland2MissionType( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData ); }; struct SkyIsland2RangeType { uint8_t type; - SkyIsland2RangeType( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ); + SkyIsland2RangeType( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData ); }; struct SpearfishingItem @@ -4626,7 +4626,7 @@ struct SpearfishingItem uint16_t territoryType; bool isVisible; - SpearfishingItem( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ); + SpearfishingItem( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData ); }; struct SpearfishingNotebook @@ -4639,7 +4639,7 @@ struct SpearfishingNotebook uint16_t placeName; uint16_t gatheringPointBase; - SpearfishingNotebook( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ); + SpearfishingNotebook( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData ); }; struct SpearfishingRecordPage @@ -4647,7 +4647,7 @@ struct SpearfishingRecordPage int32_t placeName; int32_t image; - SpearfishingRecordPage( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ); + SpearfishingRecordPage( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData ); }; struct SpecialShop @@ -4659,14 +4659,14 @@ struct SpecialShop int32_t notCompleteText; int32_t completeText; - SpecialShop( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ); + SpecialShop( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData ); }; struct SpecialShopItemCategory { std::string name; - SpecialShopItemCategory( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ); + SpecialShopItemCategory( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData ); }; struct Stain @@ -4675,7 +4675,7 @@ struct Stain uint8_t shade; std::string name; - Stain( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ); + Stain( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData ); }; struct StainTransient @@ -4683,7 +4683,7 @@ struct StainTransient uint32_t item1; uint32_t item2; - StainTransient( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ); + StainTransient( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData ); }; struct Status @@ -4705,14 +4705,14 @@ struct Status bool isFcBuff; bool invisibility; - Status( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ); + Status( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData ); }; struct StatusHitEffect { uint16_t location; - StatusHitEffect( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ); + StatusHitEffect( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData ); }; struct StatusLoopVFX @@ -4721,13 +4721,13 @@ struct StatusLoopVFX uint16_t vFX2; uint16_t vFX3; - StatusLoopVFX( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ); + StatusLoopVFX( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData ); }; struct Story { - Story( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ); + Story( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData ); }; struct SubmarineExploration @@ -4740,7 +4740,7 @@ struct SubmarineExploration uint8_t distanceForSurvey; uint32_t expReward; - SubmarineExploration( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ); + SubmarineExploration( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData ); }; struct SubmarinePart @@ -4755,7 +4755,7 @@ struct SubmarinePart int16_t favor; uint8_t repairMaterials; - SubmarinePart( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ); + SubmarinePart( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData ); }; struct SubmarineRank @@ -4763,7 +4763,7 @@ struct SubmarineRank uint16_t rank; uint32_t expToNext; - SubmarineRank( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ); + SubmarineRank( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData ); }; struct SwitchTalk @@ -4771,7 +4771,7 @@ struct SwitchTalk std::vector< uint32_t > quest; std::vector< uint32_t > defaultTalk; - SwitchTalk( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ); + SwitchTalk( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData ); }; struct TerritoryType @@ -4787,7 +4787,7 @@ struct TerritoryType uint32_t arrayEventHandler; int32_t aetheryte; - TerritoryType( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ); + TerritoryType( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData ); }; struct TextCommand @@ -4798,7 +4798,7 @@ struct TextCommand std::string alias; std::string shortAlias; - TextCommand( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ); + TextCommand( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData ); }; struct Title @@ -4808,14 +4808,14 @@ struct Title bool isPrefix; uint16_t order; - Title( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ); + Title( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData ); }; struct Tomestones { uint16_t weeklyLimit; - Tomestones( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ); + Tomestones( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData ); }; struct TomestonesItem @@ -4823,14 +4823,14 @@ struct TomestonesItem int32_t item; int32_t tomestones; - TomestonesItem( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ); + TomestonesItem( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData ); }; struct TopicSelect { std::string name; - TopicSelect( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ); + TopicSelect( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData ); }; struct Town @@ -4838,7 +4838,7 @@ struct Town std::string name; int32_t icon; - Town( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ); + Town( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData ); }; struct Trait @@ -4851,7 +4851,7 @@ struct Trait int16_t value; uint8_t classJobCategory; - Trait( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ); + Trait( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData ); }; struct TraitRecast @@ -4860,14 +4860,14 @@ struct TraitRecast uint16_t action; uint16_t timeds; - TraitRecast( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ); + TraitRecast( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData ); }; struct TraitTransient { std::string description; - TraitTransient( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ); + TraitTransient( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData ); }; struct Transformation @@ -4881,14 +4881,14 @@ struct Transformation bool isEvent; bool playerCamera; - Transformation( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ); + Transformation( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData ); }; struct Treasure { uint32_t item; - Treasure( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ); + Treasure( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData ); }; struct TreasureHuntRank @@ -4900,7 +4900,7 @@ struct TreasureHuntRank uint8_t maxPartySize; uint8_t minPartySize; - TreasureHuntRank( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ); + TreasureHuntRank( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData ); }; struct Tribe @@ -4914,7 +4914,7 @@ struct Tribe int8_t mND; int8_t pIE; - Tribe( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ); + Tribe( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData ); }; struct TripleTriad @@ -4935,7 +4935,7 @@ struct TripleTriad uint32_t defaultTalkPCWin; std::vector< uint32_t > itemPossibleReward; - TripleTriad( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ); + TripleTriad( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData ); }; struct TripleTriadCard @@ -4944,14 +4944,14 @@ struct TripleTriadCard int8_t startsWithVowel; std::string description; - TripleTriadCard( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ); + TripleTriadCard( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData ); }; struct TripleTriadCardRarity { uint8_t stars; - TripleTriadCardRarity( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ); + TripleTriadCardRarity( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData ); }; struct TripleTriadCardResident @@ -4965,28 +4965,28 @@ struct TripleTriadCardResident uint16_t saleValue; uint8_t sortKey; - TripleTriadCardResident( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ); + TripleTriadCardResident( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData ); }; struct TripleTriadCardType { std::string name; - TripleTriadCardType( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ); + TripleTriadCardType( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData ); }; struct TripleTriadCompetition { std::string name; - TripleTriadCompetition( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ); + TripleTriadCompetition( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData ); }; struct TripleTriadRule { std::string name; - TripleTriadRule( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ); + TripleTriadRule( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData ); }; struct Tutorial @@ -4998,28 +4998,28 @@ struct Tutorial uint32_t rewardRanged; uint32_t objective; - Tutorial( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ); + Tutorial( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData ); }; struct TutorialDPS { uint8_t objective; - TutorialDPS( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ); + TutorialDPS( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData ); }; struct TutorialHealer { uint8_t objective; - TutorialHealer( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ); + TutorialHealer( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData ); }; struct TutorialTank { uint8_t objective; - TutorialTank( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ); + TutorialTank( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData ); }; struct UIColor @@ -5027,21 +5027,21 @@ struct UIColor uint32_t foreground; uint32_t background; - UIColor( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ); + UIColor( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData ); }; struct VaseFlower { uint32_t item; - VaseFlower( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ); + VaseFlower( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData ); }; struct VFX { std::string location; - VFX( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ); + VFX( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData ); }; struct Warp @@ -5054,7 +5054,7 @@ struct Warp uint16_t warpCondition; uint16_t warpLogic; - Warp( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ); + Warp( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData ); }; struct WarpCondition @@ -5064,7 +5064,7 @@ struct WarpCondition uint32_t dRequiredQuest3; uint32_t requiredQuest4; - WarpCondition( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ); + WarpCondition( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData ); }; struct WarpLogic @@ -5076,7 +5076,7 @@ struct WarpLogic std::string responseYes; std::string responseNo; - WarpLogic( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ); + WarpLogic( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData ); }; struct Weather @@ -5085,20 +5085,20 @@ struct Weather std::string name; std::string description; - Weather( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ); + Weather( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData ); }; struct WeatherGroup { int32_t weatherRate; - WeatherGroup( uint32_t row_id, uint32_t subRow, Core::Data::ExdDataGenerated* exdData ); + WeatherGroup( uint32_t row_id, uint32_t subRow, Sapphire::Data::ExdDataGenerated* exdData ); }; struct WeatherRate { - WeatherRate( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ); + WeatherRate( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData ); }; struct WeddingBGM @@ -5106,7 +5106,7 @@ struct WeddingBGM uint16_t song; std::string songName; - WeddingBGM( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ); + WeddingBGM( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData ); }; struct WeeklyBingoOrderData @@ -5116,7 +5116,7 @@ struct WeeklyBingoOrderData uint8_t text; uint32_t icon; - WeeklyBingoOrderData( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ); + WeeklyBingoOrderData( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData ); }; struct WeeklyBingoRewardData @@ -5125,21 +5125,21 @@ struct WeeklyBingoRewardData bool rewardHQ2; uint16_t rewardQuantity2; - WeeklyBingoRewardData( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ); + WeeklyBingoRewardData( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData ); }; struct WeeklyBingoText { std::string description; - WeeklyBingoText( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ); + WeeklyBingoText( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData ); }; struct WeeklyLotBonus { std::vector< uint8_t > weeklyLotBonusThreshold; - WeeklyLotBonus( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ); + WeeklyLotBonus( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData ); }; struct World @@ -5148,14 +5148,14 @@ struct World uint8_t dataCenter; bool isPublic; - World( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ); + World( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData ); }; struct WorldDCGroupType { std::string name; - WorldDCGroupType( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ); + WorldDCGroupType( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData ); }; struct YKW @@ -5163,7 +5163,7 @@ struct YKW uint32_t item; std::vector< uint16_t > location; - YKW( uint32_t row_id, Core::Data::ExdDataGenerated* exdData ); + YKW( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData ); }; struct ZoneSharedGroup @@ -5175,7 +5175,7 @@ struct ZoneSharedGroup uint32_t quest5; uint32_t quest6; - ZoneSharedGroup( uint32_t row_id, uint32_t subRow, Core::Data::ExdDataGenerated* exdData ); + ZoneSharedGroup( uint32_t row_id, uint32_t subRow, Sapphire::Data::ExdDataGenerated* exdData ); }; diff --git a/src/common/Forwards.h b/src/common/Forwards.h index 54f11073..797b70fe 100644 --- a/src/common/Forwards.h +++ b/src/common/Forwards.h @@ -3,7 +3,7 @@ #include -namespace Core +namespace Sapphire { class ConfigMgr; diff --git a/src/common/Framework.h b/src/common/Framework.h index e5450129..5714bdb3 100644 --- a/src/common/Framework.h +++ b/src/common/Framework.h @@ -7,7 +7,7 @@ #include #include -namespace Core +namespace Sapphire { class Framework diff --git a/src/common/Logging/Logger.cpp b/src/common/Logging/Logger.cpp index 22534330..2282641f 100644 --- a/src/common/Logging/Logger.cpp +++ b/src/common/Logging/Logger.cpp @@ -10,7 +10,7 @@ namespace fs = std::experimental::filesystem; -namespace Core +namespace Sapphire { Logger::Logger() diff --git a/src/common/Logging/Logger.h b/src/common/Logging/Logger.h index b35f3b9d..8c48aa69 100644 --- a/src/common/Logging/Logger.h +++ b/src/common/Logging/Logger.h @@ -3,7 +3,7 @@ #include -namespace Core +namespace Sapphire { class Logger diff --git a/src/common/Network/Acceptor.cpp b/src/common/Network/Acceptor.cpp index 474fc392..bb09869c 100644 --- a/src/common/Network/Acceptor.cpp +++ b/src/common/Network/Acceptor.cpp @@ -2,7 +2,7 @@ #include "Acceptor.h" #include "Connection.h" -namespace Core { +namespace Sapphire { namespace Network { //----------------------------------------------------------------------------- diff --git a/src/common/Network/Acceptor.h b/src/common/Network/Acceptor.h index 1670d8a2..826a93f3 100644 --- a/src/common/Network/Acceptor.h +++ b/src/common/Network/Acceptor.h @@ -13,7 +13,7 @@ #include -namespace Core::Network +namespace Sapphire::Network { class Connection; diff --git a/src/common/Network/CommonActorControl.h b/src/common/Network/CommonActorControl.h index 496ed69e..357bb54b 100644 --- a/src/common/Network/CommonActorControl.h +++ b/src/common/Network/CommonActorControl.h @@ -8,9 +8,9 @@ // +--------------------------------------------------------------------------- // The following enumerations are structures to require their type be included. -// They are also defined within the Core::Common namespace to avoid collisions. +// They are also defined within the Sapphire::Common namespace to avoid collisions. // +--------------------------------------------------------------------------- -namespace Core::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 ede5be3f..1a2bd4d6 100644 --- a/src/common/Network/CommonNetwork.h +++ b/src/common/Network/CommonNetwork.h @@ -5,7 +5,7 @@ #include #include "PacketDef/Ipcs.h" -namespace Core::Network::Packets +namespace Sapphire::Network::Packets { /** diff --git a/src/common/Network/Connection.cpp b/src/common/Network/Connection.cpp index d9a86539..357155b6 100644 --- a/src/common/Network/Connection.cpp +++ b/src/common/Network/Connection.cpp @@ -2,7 +2,7 @@ #include "Hive.h" #include -namespace Core { +namespace Sapphire { namespace Network { //----------------------------------------------------------------------------- diff --git a/src/common/Network/Connection.h b/src/common/Network/Connection.h index e4e77381..84aa76c7 100644 --- a/src/common/Network/Connection.h +++ b/src/common/Network/Connection.h @@ -12,7 +12,7 @@ #include "Acceptor.h" #include -namespace Core::Network +namespace Sapphire::Network { class Hive; diff --git a/src/common/Network/GamePacketNew.h b/src/common/Network/GamePacketNew.h index 15ff798d..4da56eca 100644 --- a/src/common/Network/GamePacketNew.h +++ b/src/common/Network/GamePacketNew.h @@ -14,7 +14,7 @@ #include "CommonNetwork.h" #include "PacketDef/Ipcs.h" -namespace Core::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 77add05c..2e806d5f 100644 --- a/src/common/Network/GamePacketParser.cpp +++ b/src/common/Network/GamePacketParser.cpp @@ -3,9 +3,9 @@ #include // memcpy -using namespace Core::Network::Packets; +using namespace Sapphire::Network::Packets; -PacketParseResult Core::Network::Packets::getHeader( const std::vector< uint8_t >& buffer, +PacketParseResult Sapphire::Network::Packets::getHeader( const std::vector< uint8_t >& buffer, const uint32_t offset, FFXIVARR_PACKET_HEADER& header ) { @@ -25,7 +25,7 @@ PacketParseResult Core::Network::Packets::getHeader( const std::vector< uint8_t return Success; } -PacketParseResult Core::Network::Packets::getSegmentHeader( const std::vector< uint8_t >& buffer, +PacketParseResult Sapphire::Network::Packets::getSegmentHeader( const std::vector< uint8_t >& buffer, const uint32_t offset, FFXIVARR_PACKET_SEGMENT_HEADER& header ) { @@ -42,7 +42,7 @@ PacketParseResult Core::Network::Packets::getSegmentHeader( const std::vector< u return Success; } -PacketParseResult Core::Network::Packets::getPackets( const std::vector< uint8_t >& buffer, +PacketParseResult Sapphire::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 +81,7 @@ PacketParseResult Core::Network::Packets::getPackets( const std::vector< uint8_t return Success; } -PacketParseResult Core::Network::Packets::getPacket( const std::vector< uint8_t >& buffer, const uint32_t offset, +PacketParseResult Sapphire::Network::Packets::getPacket( const std::vector< uint8_t >& buffer, const uint32_t offset, FFXIVARR_PACKET_RAW& packet ) { // Copy segment header @@ -103,7 +103,7 @@ PacketParseResult Core::Network::Packets::getPacket( const std::vector< uint8_t return Success; } -bool Core::Network::Packets::checkHeader( const FFXIVARR_PACKET_HEADER& header ) +bool Sapphire::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 +116,7 @@ bool Core::Network::Packets::checkHeader( const FFXIVARR_PACKET_HEADER& header ) return true; } -bool Core::Network::Packets::checkSegmentHeader( const FFXIVARR_PACKET_SEGMENT_HEADER& header ) +bool Sapphire::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 d90d9396..c50b486a 100644 --- a/src/common/Network/GamePacketParser.h +++ b/src/common/Network/GamePacketParser.h @@ -3,7 +3,7 @@ #include "CommonNetwork.h" -namespace Core::Network::Packets +namespace Sapphire::Network::Packets { enum PacketParseResult diff --git a/src/common/Network/Hive.cpp b/src/common/Network/Hive.cpp index 92259489..af46076a 100644 --- a/src/common/Network/Hive.cpp +++ b/src/common/Network/Hive.cpp @@ -2,7 +2,7 @@ #include #include "Hive.h" -namespace Core { +namespace Sapphire { namespace Network { //----------------------------------------------------------------------------- diff --git a/src/common/Network/Hive.h b/src/common/Network/Hive.h index 40da87ac..3ea94afa 100644 --- a/src/common/Network/Hive.h +++ b/src/common/Network/Hive.h @@ -5,7 +5,7 @@ #include #include -namespace Core:: 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 30aff769..02a42c93 100644 --- a/src/common/Network/PacketContainer.cpp +++ b/src/common/Network/PacketContainer.cpp @@ -7,7 +7,7 @@ #include #include -Core::Network::Packets::PacketContainer::PacketContainer( uint32_t segmentTargetOverride ) : +Sapphire::Network::Packets::PacketContainer::PacketContainer( uint32_t segmentTargetOverride ) : m_segmentTargetOverride( segmentTargetOverride ) { memset( &m_ipcHdr, 0, sizeof( FFXIVARR_PACKET_HEADER ) ); @@ -15,12 +15,12 @@ Core::Network::Packets::PacketContainer::PacketContainer( uint32_t segmentTarget m_ipcHdr.count = 0; } -Core::Network::Packets::PacketContainer::~PacketContainer() +Sapphire::Network::Packets::PacketContainer::~PacketContainer() { m_entryList.clear(); } -void Core::Network::Packets::PacketContainer::addPacket( Core::Network::Packets::FFXIVPacketBasePtr entry ) +void Sapphire::Network::Packets::PacketContainer::addPacket( Sapphire::Network::Packets::FFXIVPacketBasePtr entry ) { m_entryList.push_back( entry ); @@ -28,7 +28,7 @@ void Core::Network::Packets::PacketContainer::addPacket( Core::Network::Packets: m_ipcHdr.count++; } -void Core::Network::Packets::PacketContainer::fillSendBuffer( std::vector< uint8_t >& sendBuffer ) +void Sapphire::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 +67,7 @@ void Core::Network::Packets::PacketContainer::fillSendBuffer( std::vector< uint8 } -std::string Core::Network::Packets::PacketContainer::toString() +std::string Sapphire::Network::Packets::PacketContainer::toString() { std::vector< uint8_t > tmpBuffer; diff --git a/src/common/Network/PacketContainer.h b/src/common/Network/PacketContainer.h index 322c808f..2f1bd313 100644 --- a/src/common/Network/PacketContainer.h +++ b/src/common/Network/PacketContainer.h @@ -8,7 +8,7 @@ #include "GamePacketNew.h" #include "Forwards.h" -namespace Core::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 50353c32..e2ebe0ba 100644 --- a/src/common/Network/PacketDef/Chat/ServerChatDef.h +++ b/src/common/Network/PacketDef/Chat/ServerChatDef.h @@ -4,7 +4,7 @@ #include #include -namespace Core { +namespace Sapphire { namespace Network { namespace Packets { namespace Server { @@ -39,7 +39,7 @@ struct FFXIVIpcTellErrNotFound : } /* Server */ } /* Packets */ } /* Network */ -} /* Core */ +} /* Sapphire */ diff --git a/src/common/Network/PacketDef/Ipcs.h b/src/common/Network/PacketDef/Ipcs.h index 74b997d1..089744ce 100644 --- a/src/common/Network/PacketDef/Ipcs.h +++ b/src/common/Network/PacketDef/Ipcs.h @@ -3,7 +3,7 @@ #include -namespace Core::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 a135a9cf..57948d4b 100644 --- a/src/common/Network/PacketDef/Lobby/ServerLobbyDef.h +++ b/src/common/Network/PacketDef/Lobby/ServerLobbyDef.h @@ -4,7 +4,7 @@ #include #include -namespace Core { +namespace Sapphire { namespace Network { namespace Packets { namespace Server { diff --git a/src/common/Network/PacketDef/Zone/ClientZoneDef.h b/src/common/Network/PacketDef/Zone/ClientZoneDef.h index 69ba674c..07fc7d88 100644 --- a/src/common/Network/PacketDef/Zone/ClientZoneDef.h +++ b/src/common/Network/PacketDef/Zone/ClientZoneDef.h @@ -4,7 +4,7 @@ #include #include -namespace Core { +namespace Sapphire { namespace Network { namespace Packets { namespace Client { diff --git a/src/common/Network/PacketDef/Zone/ServerZoneDef.h b/src/common/Network/PacketDef/Zone/ServerZoneDef.h index 215a14d0..93afb175 100644 --- a/src/common/Network/PacketDef/Zone/ServerZoneDef.h +++ b/src/common/Network/PacketDef/Zone/ServerZoneDef.h @@ -10,7 +10,7 @@ #include #include -namespace Core { +namespace Sapphire { namespace Network { namespace Packets { namespace Server { @@ -1824,7 +1824,7 @@ struct FFXIVIpcDuelChallenge : } /* Server */ } /* Packets */ } /* Network */ -} /* Core */ +} /* Sapphire */ diff --git a/src/common/Util/LockedQueue.h b/src/common/Util/LockedQueue.h index d50b14f7..1e73f4ce 100644 --- a/src/common/Util/LockedQueue.h +++ b/src/common/Util/LockedQueue.h @@ -7,7 +7,7 @@ #include #include -namespace Core +namespace Sapphire { template< class T > diff --git a/src/common/Util/LockedWaitQueue.h b/src/common/Util/LockedWaitQueue.h index 22445920..122cfd1c 100644 --- a/src/common/Util/LockedWaitQueue.h +++ b/src/common/Util/LockedWaitQueue.h @@ -8,7 +8,7 @@ #include #include -namespace Core +namespace Sapphire { template< typename T > diff --git a/src/common/Util/SpawnIndexAllocator.h b/src/common/Util/SpawnIndexAllocator.h index b7304fed..4ddfcc79 100644 --- a/src/common/Util/SpawnIndexAllocator.h +++ b/src/common/Util/SpawnIndexAllocator.h @@ -5,7 +5,7 @@ #include #include -namespace Core::Util +namespace Sapphire::Util { template< typename T, typename ActorIdType = uint32_t > diff --git a/src/common/Util/Util.cpp b/src/common/Util/Util.cpp index b8db0b7c..78db7be7 100644 --- a/src/common/Util/Util.cpp +++ b/src/common/Util/Util.cpp @@ -5,7 +5,7 @@ #include #include -std::string Core::Util::binaryToHexString( uint8_t* pBinData, uint16_t size ) +std::string Sapphire::Util::binaryToHexString( uint8_t* pBinData, uint16_t size ) { std::string outStr; @@ -17,26 +17,26 @@ std::string Core::Util::binaryToHexString( uint8_t* pBinData, uint16_t size ) return outStr; } -std::string Core::Util::toLowerCopy( const std::string& inStr ) +std::string Sapphire::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 Core::Util::eraseAll( std::string& inOutStr, char remove ) +void Sapphire::Util::eraseAll( std::string& inOutStr, char remove ) { inOutStr.erase( std::remove( inOutStr.begin(), inOutStr.end(), remove ), inOutStr.end() ); } -void Core::Util::eraseAllIn( std::string& inOutStr, std::string& remove ) +void Sapphire::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 Core::Util::intToHexString( uint64_t intValue, uint8_t width ) +std::string Sapphire::Util::intToHexString( uint64_t intValue, uint8_t width ) { std::string hexStr; @@ -51,7 +51,7 @@ std::string Core::Util::intToHexString( uint64_t intValue, uint8_t width ) return hexStr; } -std::string Core::Util::binaryToHexDump( uint8_t* pBinData, uint16_t size ) +std::string Sapphire::Util::binaryToHexDump( uint8_t* pBinData, uint16_t size ) { int bytesPerLine = 16; constexpr char hexChars[] = "0123456789ABCDEF"; @@ -112,25 +112,25 @@ std::string Core::Util::binaryToHexDump( uint8_t* pBinData, uint16_t size ) } -uint64_t Core::Util::getTimeMs() +uint64_t Sapphire::Util::getTimeMs() { std::chrono::milliseconds epoch = std::chrono::duration_cast< std::chrono::milliseconds > ( std::chrono::system_clock::now().time_since_epoch() ); return epoch.count(); } -int64_t Core::Util::getTimeSeconds() +int64_t Sapphire::Util::getTimeSeconds() { std::chrono::seconds epoch = std::chrono::seconds( std::time( nullptr ) ); return epoch.count(); } -uint64_t Core::Util::getEorzeanTimeStamp() +uint64_t Sapphire::Util::getEorzeanTimeStamp() { return static_cast< uint64_t >( getTimeSeconds() * 20.571428571428573f ); } -void Core::Util::valueToFlagByteIndexValue( uint32_t inVal, uint8_t& outVal, uint16_t& outIndex ) +void Sapphire::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 c76250e7..ab810cef 100644 --- a/src/common/Util/Util.h +++ b/src/common/Util/Util.h @@ -5,7 +5,7 @@ #include #include -namespace Core::Util +namespace Sapphire::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 890d986c..9f89aea9 100644 --- a/src/common/Util/UtilMath.cpp +++ b/src/common/Util/UtilMath.cpp @@ -1,7 +1,7 @@ #include #include "UtilMath.h" -float Core::Math::Util::distanceSq( float x, float y, float z, float x1, float y1, float z1 ) +float Sapphire::Math::Util::distanceSq( float x, float y, float z, float x1, float y1, float z1 ) { float deltaX = x - x1; float deltaY = y - y1; @@ -10,24 +10,24 @@ float Core::Math::Util::distanceSq( float x, float y, float z, float x1, float y return ( deltaX * deltaX + deltaY * deltaY + deltaZ * deltaZ ); } -float Core::Math::Util::distance( float x, float y, float z, float x1, float y1, float z1 ) +float Sapphire::Math::Util::distance( float x, float y, float z, float x1, float y1, float z1 ) { return sqrtf( distanceSq( x, y, z, x1, y1, z1 ) ); } -float Core::Math::Util::distance2DSq( float x, float y, float x1, float y1 ) +float Sapphire::Math::Util::distance2DSq( float x, float y, float x1, float y1 ) { float deltaX = x - x1; float deltaY = y - y1; return ( deltaX * deltaX + deltaY * deltaY ); } -float Core::Math::Util::distance2D( float x, float y, float x1, float y1 ) +float Sapphire::Math::Util::distance2D( float x, float y, float x1, float y1 ) { return sqrtf( distance2DSq( x, y, x1, y1 ) ); } -float Core::Math::Util::calcAngTo( float x, float y, float x1, float y1 ) +float Sapphire::Math::Util::calcAngTo( float x, float y, float x1, float y1 ) { float dx = x - x1; float dy = y - y1; @@ -41,7 +41,7 @@ float Core::Math::Util::calcAngTo( float x, float y, float x1, float y1 ) } } -float Core::Math::Util::calcAngFrom( float x, float y, float x1, float y1 ) +float Sapphire::Math::Util::calcAngFrom( float x, float y, float x1, float y1 ) { float dx = x - x1; float dy = y - y1; @@ -55,17 +55,17 @@ float Core::Math::Util::calcAngFrom( float x, float y, float x1, float y1 ) } } -uint16_t Core::Math::Util::floatToUInt16( float val ) +uint16_t Sapphire::Math::Util::floatToUInt16( float val ) { return static_cast< uint16_t >( 0x8000 + val * 32.767f ); } -uint16_t Core::Math::Util::floatToUInt16Rot( float val ) +uint16_t Sapphire::Math::Util::floatToUInt16Rot( float val ) { return static_cast< uint16_t >( 0x8000 * ( ( val + PI ) ) / PI ); } -uint8_t Core::Math::Util::floatToUInt8Rot( float val ) +uint8_t Sapphire::Math::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 b6f3340d..1fcf95d4 100644 --- a/src/common/Util/UtilMath.h +++ b/src/common/Util/UtilMath.h @@ -5,7 +5,7 @@ #define PI 3.14159265358979323846f -namespace Core::Math::Util +namespace Sapphire::Math::Util { float distanceSq( float x, float y, float z, float x1, float y1, float z1 ); diff --git a/src/common/Version.cpp.in b/src/common/Version.cpp.in index b2de470a..9f973861 100644 --- a/src/common/Version.cpp.in +++ b/src/common/Version.cpp.in @@ -1,10 +1,10 @@ #include "Version.h" -namespace Core { +namespace Sapphire { namespace Version { const std::string GIT_HASH = "@GIT_SHA1@"; const std::string VERSION = "@VERSION@"; } /* Version */ -} /* Core */ +} /* Sapphire */ diff --git a/src/common/Version.h b/src/common/Version.h index 9f3b481b..20642265 100644 --- a/src/common/Version.h +++ b/src/common/Version.h @@ -3,7 +3,7 @@ #include -namespace Core::Version +namespace Sapphire::Version { extern const std::string GIT_HASH; extern const std::string VERSION; diff --git a/src/dbm/main.cpp b/src/dbm/main.cpp index 3c1f8d14..c8f20207 100644 --- a/src/dbm/main.cpp +++ b/src/dbm/main.cpp @@ -16,7 +16,7 @@ namespace filesys = std::experimental::filesystem; #include "DbManager.h" -Core::Logger g_log; +Sapphire::Logger g_log; std::vector< std::string > getAllFilesInDir( const std::string& dirPath, const std::vector< std::string > dirSkipList = {} ) diff --git a/src/servers/Scripts/action/ActionReturn6.cpp b/src/servers/Scripts/action/ActionReturn6.cpp index 82580430..3734a060 100644 --- a/src/servers/Scripts/action/ActionReturn6.cpp +++ b/src/servers/Scripts/action/ActionReturn6.cpp @@ -11,7 +11,7 @@ public: { } - void onCastFinish( Core::Entity::Player& player, Core::Entity::Chara& targetActor ) override + void onCastFinish( Sapphire::Entity::Player& player, Sapphire::Entity::Chara& targetActor ) override { player.returnToHomepoint(); } diff --git a/src/servers/Scripts/action/ActionSprint3.cpp b/src/servers/Scripts/action/ActionSprint3.cpp index 31767e03..bf725e63 100644 --- a/src/servers/Scripts/action/ActionSprint3.cpp +++ b/src/servers/Scripts/action/ActionSprint3.cpp @@ -10,7 +10,7 @@ public: { } - void onCastFinish( Core::Entity::Player& player, Core::Entity::Chara& targetActor ) override + void onCastFinish( Sapphire::Entity::Player& player, Sapphire::Entity::Chara& targetActor ) override { player.addStatusEffectByIdIfNotExist( 50, 20000, player, 30 ); } diff --git a/src/servers/Scripts/common/CmnDefCutSceneReplay.cpp b/src/servers/Scripts/common/CmnDefCutSceneReplay.cpp index 51d94663..590f7bf2 100644 --- a/src/servers/Scripts/common/CmnDefCutSceneReplay.cpp +++ b/src/servers/Scripts/common/CmnDefCutSceneReplay.cpp @@ -1,7 +1,7 @@ #include #include -using namespace Core; +using namespace Sapphire; class CmnDefCutSceneReplay : public Sapphire::ScriptAPI::EventScript diff --git a/src/servers/Scripts/common/CmnDefHousingSignboard.cpp b/src/servers/Scripts/common/CmnDefHousingSignboard.cpp index ae9c8c5e..a037349e 100644 --- a/src/servers/Scripts/common/CmnDefHousingSignboard.cpp +++ b/src/servers/Scripts/common/CmnDefHousingSignboard.cpp @@ -8,7 +8,7 @@ #include "Framework.h" -using namespace Core; +using namespace Sapphire; using namespace Network; using namespace Packets; using namespace Server; @@ -35,7 +35,7 @@ public: auto pTerritory = player.getCurrentZone(); auto pHousing = std::dynamic_pointer_cast< HousingZone >( pTerritory ); - auto pHouMgr = pFw->get< Core::HousingMgr >(); + auto pHouMgr = pFw->get< Sapphire::HousingMgr >(); LandPurchaseResult res = pHouMgr->purchaseLand( player, activeLand.plot, static_cast< uint8_t >( result.param2 ) ); diff --git a/src/servers/Scripts/common/CmnDefInnBed.cpp b/src/servers/Scripts/common/CmnDefInnBed.cpp index 4d89e93e..2d8171fa 100644 --- a/src/servers/Scripts/common/CmnDefInnBed.cpp +++ b/src/servers/Scripts/common/CmnDefInnBed.cpp @@ -1,7 +1,7 @@ #include #include -using namespace Core; +using namespace Sapphire; class CmnDefInnBed : public Sapphire::ScriptAPI::EventScript diff --git a/src/servers/Scripts/common/CmnDefLinkShell.cpp b/src/servers/Scripts/common/CmnDefLinkShell.cpp index b340a4b7..42476cda 100644 --- a/src/servers/Scripts/common/CmnDefLinkShell.cpp +++ b/src/servers/Scripts/common/CmnDefLinkShell.cpp @@ -5,7 +5,7 @@ #define ACTION_RENAME 3 #define ACTION_REMOVE 4 -using namespace Core; +using namespace Sapphire; class CmnDefLinkShell : public Sapphire::ScriptAPI::EventScript diff --git a/src/servers/Scripts/common/CmnDefMarketBoardGridania.cpp b/src/servers/Scripts/common/CmnDefMarketBoardGridania.cpp index 4429c393..4c2ce359 100644 --- a/src/servers/Scripts/common/CmnDefMarketBoardGridania.cpp +++ b/src/servers/Scripts/common/CmnDefMarketBoardGridania.cpp @@ -1,7 +1,7 @@ #include #include -using namespace Core; +using namespace Sapphire; class CmnDefMarketBoardGridania : public Sapphire::ScriptAPI::EventScript diff --git a/src/servers/Scripts/common/CmnDefMogLetter.cpp b/src/servers/Scripts/common/CmnDefMogLetter.cpp index 03de2ba0..9aa7e676 100644 --- a/src/servers/Scripts/common/CmnDefMogLetter.cpp +++ b/src/servers/Scripts/common/CmnDefMogLetter.cpp @@ -1,7 +1,7 @@ #include #include -using namespace Core; +using namespace Sapphire; class CmnDefMogLetter : public Sapphire::ScriptAPI::EventScript diff --git a/src/servers/Scripts/common/CmnDefNpcRepair.cpp b/src/servers/Scripts/common/CmnDefNpcRepair.cpp index 5629d97c..857b45ed 100644 --- a/src/servers/Scripts/common/CmnDefNpcRepair.cpp +++ b/src/servers/Scripts/common/CmnDefNpcRepair.cpp @@ -1,7 +1,7 @@ #include #include -using namespace Core; +using namespace Sapphire; class CmnDefNpcRepair : public Sapphire::ScriptAPI::EventScript diff --git a/src/servers/Scripts/common/CmnDefWeatherForeCast.cpp b/src/servers/Scripts/common/CmnDefWeatherForeCast.cpp index 69d565ac..42ee359c 100644 --- a/src/servers/Scripts/common/CmnDefWeatherForeCast.cpp +++ b/src/servers/Scripts/common/CmnDefWeatherForeCast.cpp @@ -1,7 +1,7 @@ #include #include -using namespace Core; +using namespace Sapphire; class CmnDefWeatherForeCast : public Sapphire::ScriptAPI::EventScript diff --git a/src/servers/Scripts/common/ComDefMobHuntBoard.cpp b/src/servers/Scripts/common/ComDefMobHuntBoard.cpp index 732b88b9..0efe6358 100644 --- a/src/servers/Scripts/common/ComDefMobHuntBoard.cpp +++ b/src/servers/Scripts/common/ComDefMobHuntBoard.cpp @@ -1,7 +1,7 @@ #include #include -using namespace Core; +using namespace Sapphire; class ComDefMobHuntBoard : public Sapphire::ScriptAPI::EventScript diff --git a/src/servers/Scripts/common/GilShop.cpp b/src/servers/Scripts/common/GilShop.cpp index d2d8cd5b..bb8d7f9f 100644 --- a/src/servers/Scripts/common/GilShop.cpp +++ b/src/servers/Scripts/common/GilShop.cpp @@ -4,7 +4,7 @@ #include #include -using namespace Core; +using namespace Sapphire; class GilShop : public Sapphire::ScriptAPI::EventScript diff --git a/src/servers/Scripts/common/HouFurOrchestrion.cpp b/src/servers/Scripts/common/HouFurOrchestrion.cpp index 196a7d77..56e33d71 100644 --- a/src/servers/Scripts/common/HouFurOrchestrion.cpp +++ b/src/servers/Scripts/common/HouFurOrchestrion.cpp @@ -1,7 +1,7 @@ #include #include -using namespace Core; +using namespace Sapphire; class HouFurOrchestrion : public Sapphire::ScriptAPI::EventScript diff --git a/src/servers/Scripts/common/WarpTaxi.cpp b/src/servers/Scripts/common/WarpTaxi.cpp index b36763e7..4a2ba1a7 100644 --- a/src/servers/Scripts/common/WarpTaxi.cpp +++ b/src/servers/Scripts/common/WarpTaxi.cpp @@ -5,7 +5,7 @@ #include #include -using namespace Core; +using namespace Sapphire; class WarpTaxi : public Sapphire::ScriptAPI::EventScript { @@ -27,8 +27,8 @@ public: player.eventFinish( 1310721, 0 ); player.eventFinish( getId(), 1 ); - auto exdData = getFramework()->get< Core::Data::ExdDataGenerated >(); - auto warp = exdData->get< Core::Data::Warp >( getId() ); + auto exdData = getFramework()->get< Sapphire::Data::ExdDataGenerated >(); + auto warp = exdData->get< Sapphire::Data::Warp >( getId() ); if( !warp ) return; @@ -53,11 +53,11 @@ public: void onTalk( uint32_t eventId, Entity::Player& player, uint64_t actorId ) override { - auto exdData = getFramework()->get< Core::Data::ExdDataGenerated >(); + auto exdData = getFramework()->get< Sapphire::Data::ExdDataGenerated >(); if( !exdData ) return; - auto warp = exdData->get< Core::Data::Warp >( eventId ); + auto warp = exdData->get< Sapphire::Data::Warp >( eventId ); if( !warp ) return; diff --git a/src/servers/Scripts/common/aethernet/Aetheryte.cpp b/src/servers/Scripts/common/aethernet/Aetheryte.cpp index 44e7fccf..f5403d7b 100644 --- a/src/servers/Scripts/common/aethernet/Aetheryte.cpp +++ b/src/servers/Scripts/common/aethernet/Aetheryte.cpp @@ -6,7 +6,7 @@ -using namespace Core; +using namespace Sapphire; class Aetheryte : public Sapphire::ScriptAPI::EventScript @@ -108,11 +108,11 @@ public: void onTalk( uint32_t eventId, Entity::Player& player, uint64_t actorId ) override { - auto pExdData = getFramework()->get< Core::Data::ExdDataGenerated >(); + auto pExdData = getFramework()->get< Sapphire::Data::ExdDataGenerated >(); if( !pExdData ) return; - auto aetherInfo = pExdData->get< Core::Data::Aetheryte >( eventId & 0xFFFF ); + auto aetherInfo = pExdData->get< Sapphire::Data::Aetheryte >( eventId & 0xFFFF ); if( !aetherInfo ) return; diff --git a/src/servers/Scripts/common/aethernet/HousingAethernet.cpp b/src/servers/Scripts/common/aethernet/HousingAethernet.cpp index e6854980..9a159349 100644 --- a/src/servers/Scripts/common/aethernet/HousingAethernet.cpp +++ b/src/servers/Scripts/common/aethernet/HousingAethernet.cpp @@ -5,7 +5,7 @@ #include #include -using namespace Core; +using namespace Sapphire; class HousingAethernet : public Sapphire::ScriptAPI::EventScript @@ -20,7 +20,7 @@ public: { player.playScene( eventId, 0, HIDE_HOTBAR | NO_DEFAULT_CAMERA, [this, eventId]( Entity::Player& player, const Event::SceneResult& result ) { - auto pExdData = getFramework()->get< Core::Data::ExdDataGenerated >(); + auto pExdData = getFramework()->get< Sapphire::Data::ExdDataGenerated >(); if( !pExdData ) return; @@ -28,7 +28,7 @@ public: auto terrritoryTypeId = player.getCurrentZone()->getTerritoryTypeId(); // param2 is the index starting from 0 inside housingaethernet.exd, but the ID column starts at 0x001E0000........ wtf - auto pHousingAethernet = pExdData->get< Core::Data::HousingAethernet >( getId() + result.param2 ); + auto pHousingAethernet = pExdData->get< Sapphire::Data::HousingAethernet >( getId() + result.param2 ); if( !pHousingAethernet ) return; diff --git a/src/servers/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors101110.cpp b/src/servers/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors101110.cpp index c6830f72..6e5e34d9 100644 --- a/src/servers/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors101110.cpp +++ b/src/servers/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors101110.cpp @@ -1,7 +1,7 @@ #include #include -using namespace Core; +using namespace Sapphire; class ThePalaceoftheDeadFloors101110 : public Sapphire::ScriptAPI::InstanceContentScript diff --git a/src/servers/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors110.cpp b/src/servers/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors110.cpp index 60e1f2c2..d2c95441 100644 --- a/src/servers/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors110.cpp +++ b/src/servers/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors110.cpp @@ -1,7 +1,7 @@ #include #include -using namespace Core; +using namespace Sapphire; class ThePalaceoftheDeadFloors110 : public Sapphire::ScriptAPI::InstanceContentScript diff --git a/src/servers/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors111120.cpp b/src/servers/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors111120.cpp index dd7b48ea..01c56163 100644 --- a/src/servers/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors111120.cpp +++ b/src/servers/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors111120.cpp @@ -1,7 +1,7 @@ #include #include -using namespace Core; +using namespace Sapphire; class ThePalaceoftheDeadFloors111120 : public Sapphire::ScriptAPI::InstanceContentScript diff --git a/src/servers/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors1120.cpp b/src/servers/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors1120.cpp index 0193c863..a60180f3 100644 --- a/src/servers/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors1120.cpp +++ b/src/servers/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors1120.cpp @@ -1,7 +1,7 @@ #include #include -using namespace Core; +using namespace Sapphire; class ThePalaceoftheDeadFloors1120 : public Sapphire::ScriptAPI::InstanceContentScript diff --git a/src/servers/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors121130.cpp b/src/servers/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors121130.cpp index 61744f2a..a410a7c2 100644 --- a/src/servers/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors121130.cpp +++ b/src/servers/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors121130.cpp @@ -1,7 +1,7 @@ #include #include -using namespace Core; +using namespace Sapphire; class ThePalaceoftheDeadFloors121130 : public Sapphire::ScriptAPI::InstanceContentScript diff --git a/src/servers/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors131140.cpp b/src/servers/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors131140.cpp index ff6f6202..0bfa21ab 100644 --- a/src/servers/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors131140.cpp +++ b/src/servers/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors131140.cpp @@ -1,7 +1,7 @@ #include #include -using namespace Core; +using namespace Sapphire; class ThePalaceoftheDeadFloors131140 : public Sapphire::ScriptAPI::InstanceContentScript diff --git a/src/servers/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors141150.cpp b/src/servers/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors141150.cpp index 08b2c657..ef73f13c 100644 --- a/src/servers/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors141150.cpp +++ b/src/servers/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors141150.cpp @@ -1,7 +1,7 @@ #include #include -using namespace Core; +using namespace Sapphire; class ThePalaceoftheDeadFloors141150 : public Sapphire::ScriptAPI::InstanceContentScript diff --git a/src/servers/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors151160.cpp b/src/servers/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors151160.cpp index 0324fc13..87d560f5 100644 --- a/src/servers/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors151160.cpp +++ b/src/servers/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors151160.cpp @@ -1,7 +1,7 @@ #include #include -using namespace Core; +using namespace Sapphire; class ThePalaceoftheDeadFloors151160 : public Sapphire::ScriptAPI::InstanceContentScript diff --git a/src/servers/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors161170.cpp b/src/servers/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors161170.cpp index 8523dfaa..3cdb5c17 100644 --- a/src/servers/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors161170.cpp +++ b/src/servers/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors161170.cpp @@ -1,7 +1,7 @@ #include #include -using namespace Core; +using namespace Sapphire; class ThePalaceoftheDeadFloors161170 : public Sapphire::ScriptAPI::InstanceContentScript diff --git a/src/servers/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors171180.cpp b/src/servers/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors171180.cpp index b4dd9b78..e047273b 100644 --- a/src/servers/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors171180.cpp +++ b/src/servers/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors171180.cpp @@ -1,7 +1,7 @@ #include #include -using namespace Core; +using namespace Sapphire; class ThePalaceoftheDeadFloors171180 : public Sapphire::ScriptAPI::InstanceContentScript diff --git a/src/servers/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors181190.cpp b/src/servers/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors181190.cpp index bc197672..e62879cb 100644 --- a/src/servers/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors181190.cpp +++ b/src/servers/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors181190.cpp @@ -1,7 +1,7 @@ #include #include -using namespace Core; +using namespace Sapphire; class ThePalaceoftheDeadFloors181190 : public Sapphire::ScriptAPI::InstanceContentScript diff --git a/src/servers/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors191200.cpp b/src/servers/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors191200.cpp index eb877fd3..ad581254 100644 --- a/src/servers/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors191200.cpp +++ b/src/servers/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors191200.cpp @@ -1,7 +1,7 @@ #include #include -using namespace Core; +using namespace Sapphire; class ThePalaceoftheDeadFloors191200 : public Sapphire::ScriptAPI::InstanceContentScript diff --git a/src/servers/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors2130.cpp b/src/servers/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors2130.cpp index 1bf1d276..51a293b0 100644 --- a/src/servers/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors2130.cpp +++ b/src/servers/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors2130.cpp @@ -1,7 +1,7 @@ #include #include -using namespace Core; +using namespace Sapphire; class ThePalaceoftheDeadFloors2130 : public Sapphire::ScriptAPI::InstanceContentScript diff --git a/src/servers/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors3140.cpp b/src/servers/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors3140.cpp index 5e122192..75b07a30 100644 --- a/src/servers/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors3140.cpp +++ b/src/servers/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors3140.cpp @@ -1,7 +1,7 @@ #include #include -using namespace Core; +using namespace Sapphire; class ThePalaceoftheDeadFloors3140 : public Sapphire::ScriptAPI::InstanceContentScript diff --git a/src/servers/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors4150.cpp b/src/servers/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors4150.cpp index ead27865..b1232eaa 100644 --- a/src/servers/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors4150.cpp +++ b/src/servers/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors4150.cpp @@ -1,7 +1,7 @@ #include #include -using namespace Core; +using namespace Sapphire; class ThePalaceoftheDeadFloors4150 : public Sapphire::ScriptAPI::InstanceContentScript diff --git a/src/servers/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors5160.cpp b/src/servers/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors5160.cpp index e9391c05..d3acd3ef 100644 --- a/src/servers/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors5160.cpp +++ b/src/servers/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors5160.cpp @@ -1,7 +1,7 @@ #include #include -using namespace Core; +using namespace Sapphire; class ThePalaceoftheDeadFloors5160 : public Sapphire::ScriptAPI::InstanceContentScript diff --git a/src/servers/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors6170.cpp b/src/servers/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors6170.cpp index 8fac7b93..def4bd97 100644 --- a/src/servers/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors6170.cpp +++ b/src/servers/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors6170.cpp @@ -1,7 +1,7 @@ #include #include -using namespace Core; +using namespace Sapphire; class ThePalaceoftheDeadFloors6170 : public Sapphire::ScriptAPI::InstanceContentScript diff --git a/src/servers/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors7180.cpp b/src/servers/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors7180.cpp index 08e3d1f9..0a4d6ca8 100644 --- a/src/servers/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors7180.cpp +++ b/src/servers/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors7180.cpp @@ -1,7 +1,7 @@ #include #include -using namespace Core; +using namespace Sapphire; class ThePalaceoftheDeadFloors7180 : public Sapphire::ScriptAPI::InstanceContentScript diff --git a/src/servers/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors8190.cpp b/src/servers/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors8190.cpp index 7457e2a3..46127f4d 100644 --- a/src/servers/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors8190.cpp +++ b/src/servers/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors8190.cpp @@ -1,7 +1,7 @@ #include #include -using namespace Core; +using namespace Sapphire; class ThePalaceoftheDeadFloors8190 : public Sapphire::ScriptAPI::InstanceContentScript diff --git a/src/servers/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors91100.cpp b/src/servers/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors91100.cpp index ef06aa30..867c7b45 100644 --- a/src/servers/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors91100.cpp +++ b/src/servers/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors91100.cpp @@ -1,7 +1,7 @@ #include #include -using namespace Core; +using namespace Sapphire; class ThePalaceoftheDeadFloors91100 : public Sapphire::ScriptAPI::InstanceContentScript diff --git a/src/servers/Scripts/instances/dungeons/AlaMhigo.cpp b/src/servers/Scripts/instances/dungeons/AlaMhigo.cpp index 3fb7fc32..eaeab694 100644 --- a/src/servers/Scripts/instances/dungeons/AlaMhigo.cpp +++ b/src/servers/Scripts/instances/dungeons/AlaMhigo.cpp @@ -1,7 +1,7 @@ #include #include -using namespace Core; +using namespace Sapphire; class AlaMhigo : public Sapphire::ScriptAPI::InstanceContentScript diff --git a/src/servers/Scripts/instances/dungeons/AmdaporKeep.cpp b/src/servers/Scripts/instances/dungeons/AmdaporKeep.cpp index db538952..79c21ecb 100644 --- a/src/servers/Scripts/instances/dungeons/AmdaporKeep.cpp +++ b/src/servers/Scripts/instances/dungeons/AmdaporKeep.cpp @@ -1,7 +1,7 @@ #include #include -using namespace Core; +using namespace Sapphire; class AmdaporKeep : public Sapphire::ScriptAPI::InstanceContentScript diff --git a/src/servers/Scripts/instances/dungeons/AmdaporKeepHard.cpp b/src/servers/Scripts/instances/dungeons/AmdaporKeepHard.cpp index c820bdb6..07ddb36d 100644 --- a/src/servers/Scripts/instances/dungeons/AmdaporKeepHard.cpp +++ b/src/servers/Scripts/instances/dungeons/AmdaporKeepHard.cpp @@ -1,7 +1,7 @@ #include #include -using namespace Core; +using namespace Sapphire; class AmdaporKeepHard : public Sapphire::ScriptAPI::InstanceContentScript diff --git a/src/servers/Scripts/instances/dungeons/BaelsarsWall.cpp b/src/servers/Scripts/instances/dungeons/BaelsarsWall.cpp index f99202bf..cc058d0a 100644 --- a/src/servers/Scripts/instances/dungeons/BaelsarsWall.cpp +++ b/src/servers/Scripts/instances/dungeons/BaelsarsWall.cpp @@ -1,7 +1,7 @@ #include #include -using namespace Core; +using namespace Sapphire; class BaelsarsWall : public Sapphire::ScriptAPI::InstanceContentScript diff --git a/src/servers/Scripts/instances/dungeons/BardamsMettle.cpp b/src/servers/Scripts/instances/dungeons/BardamsMettle.cpp index 728d4788..384f2c3d 100644 --- a/src/servers/Scripts/instances/dungeons/BardamsMettle.cpp +++ b/src/servers/Scripts/instances/dungeons/BardamsMettle.cpp @@ -1,7 +1,7 @@ #include #include -using namespace Core; +using namespace Sapphire; class BardamsMettle : public Sapphire::ScriptAPI::InstanceContentScript diff --git a/src/servers/Scripts/instances/dungeons/BrayfloxsLongstop.cpp b/src/servers/Scripts/instances/dungeons/BrayfloxsLongstop.cpp index 961003e2..e8cc5ae4 100644 --- a/src/servers/Scripts/instances/dungeons/BrayfloxsLongstop.cpp +++ b/src/servers/Scripts/instances/dungeons/BrayfloxsLongstop.cpp @@ -1,7 +1,7 @@ #include #include -using namespace Core; +using namespace Sapphire; class BrayfloxsLongstop : public Sapphire::ScriptAPI::InstanceContentScript diff --git a/src/servers/Scripts/instances/dungeons/BrayfloxsLongstopHard.cpp b/src/servers/Scripts/instances/dungeons/BrayfloxsLongstopHard.cpp index 89e575ca..4dde97ef 100644 --- a/src/servers/Scripts/instances/dungeons/BrayfloxsLongstopHard.cpp +++ b/src/servers/Scripts/instances/dungeons/BrayfloxsLongstopHard.cpp @@ -1,7 +1,7 @@ #include #include -using namespace Core; +using namespace Sapphire; class BrayfloxsLongstopHard : public Sapphire::ScriptAPI::InstanceContentScript diff --git a/src/servers/Scripts/instances/dungeons/CastrumAbania.cpp b/src/servers/Scripts/instances/dungeons/CastrumAbania.cpp index afcac3f1..8b2ee8b3 100644 --- a/src/servers/Scripts/instances/dungeons/CastrumAbania.cpp +++ b/src/servers/Scripts/instances/dungeons/CastrumAbania.cpp @@ -1,7 +1,7 @@ #include #include -using namespace Core; +using namespace Sapphire; class CastrumAbania : public Sapphire::ScriptAPI::InstanceContentScript diff --git a/src/servers/Scripts/instances/dungeons/CastrumMeridianum.cpp b/src/servers/Scripts/instances/dungeons/CastrumMeridianum.cpp index 8528f003..2d80787f 100644 --- a/src/servers/Scripts/instances/dungeons/CastrumMeridianum.cpp +++ b/src/servers/Scripts/instances/dungeons/CastrumMeridianum.cpp @@ -1,7 +1,7 @@ #include #include -using namespace Core; +using namespace Sapphire; class CastrumMeridianum : public Sapphire::ScriptAPI::InstanceContentScript diff --git a/src/servers/Scripts/instances/dungeons/CopperbellMines.cpp b/src/servers/Scripts/instances/dungeons/CopperbellMines.cpp index 5e055cb3..f14d71bb 100644 --- a/src/servers/Scripts/instances/dungeons/CopperbellMines.cpp +++ b/src/servers/Scripts/instances/dungeons/CopperbellMines.cpp @@ -1,7 +1,7 @@ #include #include -using namespace Core; +using namespace Sapphire; class CopperbellMines : public Sapphire::ScriptAPI::InstanceContentScript diff --git a/src/servers/Scripts/instances/dungeons/CopperbellMinesHard.cpp b/src/servers/Scripts/instances/dungeons/CopperbellMinesHard.cpp index 531bedfc..fd052be4 100644 --- a/src/servers/Scripts/instances/dungeons/CopperbellMinesHard.cpp +++ b/src/servers/Scripts/instances/dungeons/CopperbellMinesHard.cpp @@ -1,7 +1,7 @@ #include #include -using namespace Core; +using namespace Sapphire; class CopperbellMinesHard : public Sapphire::ScriptAPI::InstanceContentScript diff --git a/src/servers/Scripts/instances/dungeons/CuttersCry.cpp b/src/servers/Scripts/instances/dungeons/CuttersCry.cpp index 0b97079a..507b4ca8 100644 --- a/src/servers/Scripts/instances/dungeons/CuttersCry.cpp +++ b/src/servers/Scripts/instances/dungeons/CuttersCry.cpp @@ -1,7 +1,7 @@ #include #include -using namespace Core; +using namespace Sapphire; class CuttersCry : public Sapphire::ScriptAPI::InstanceContentScript diff --git a/src/servers/Scripts/instances/dungeons/DomaCastle.cpp b/src/servers/Scripts/instances/dungeons/DomaCastle.cpp index 258433a9..4554ce07 100644 --- a/src/servers/Scripts/instances/dungeons/DomaCastle.cpp +++ b/src/servers/Scripts/instances/dungeons/DomaCastle.cpp @@ -1,7 +1,7 @@ #include #include -using namespace Core; +using namespace Sapphire; class DomaCastle : public Sapphire::ScriptAPI::InstanceContentScript diff --git a/src/servers/Scripts/instances/dungeons/DzemaelDarkhold.cpp b/src/servers/Scripts/instances/dungeons/DzemaelDarkhold.cpp index d80fcda8..ba8f1642 100644 --- a/src/servers/Scripts/instances/dungeons/DzemaelDarkhold.cpp +++ b/src/servers/Scripts/instances/dungeons/DzemaelDarkhold.cpp @@ -1,7 +1,7 @@ #include #include -using namespace Core; +using namespace Sapphire; class DzemaelDarkhold : public Sapphire::ScriptAPI::InstanceContentScript diff --git a/src/servers/Scripts/instances/dungeons/Halatali.cpp b/src/servers/Scripts/instances/dungeons/Halatali.cpp index f4a3f351..667c110f 100644 --- a/src/servers/Scripts/instances/dungeons/Halatali.cpp +++ b/src/servers/Scripts/instances/dungeons/Halatali.cpp @@ -1,7 +1,7 @@ #include #include -using namespace Core; +using namespace Sapphire; class Halatali : public Sapphire::ScriptAPI::InstanceContentScript diff --git a/src/servers/Scripts/instances/dungeons/HalataliHard.cpp b/src/servers/Scripts/instances/dungeons/HalataliHard.cpp index 6c94f120..012e9c3d 100644 --- a/src/servers/Scripts/instances/dungeons/HalataliHard.cpp +++ b/src/servers/Scripts/instances/dungeons/HalataliHard.cpp @@ -1,7 +1,7 @@ #include #include -using namespace Core; +using namespace Sapphire; class HalataliHard : public Sapphire::ScriptAPI::InstanceContentScript diff --git a/src/servers/Scripts/instances/dungeons/HaukkeManor.cpp b/src/servers/Scripts/instances/dungeons/HaukkeManor.cpp index d971a867..05bf63aa 100644 --- a/src/servers/Scripts/instances/dungeons/HaukkeManor.cpp +++ b/src/servers/Scripts/instances/dungeons/HaukkeManor.cpp @@ -1,7 +1,7 @@ #include #include -using namespace Core; +using namespace Sapphire; class HaukkeManor : public Sapphire::ScriptAPI::InstanceContentScript diff --git a/src/servers/Scripts/instances/dungeons/HaukkeManorHard.cpp b/src/servers/Scripts/instances/dungeons/HaukkeManorHard.cpp index 6453acfa..aa1071ec 100644 --- a/src/servers/Scripts/instances/dungeons/HaukkeManorHard.cpp +++ b/src/servers/Scripts/instances/dungeons/HaukkeManorHard.cpp @@ -1,7 +1,7 @@ #include #include -using namespace Core; +using namespace Sapphire; class HaukkeManorHard : public Sapphire::ScriptAPI::InstanceContentScript diff --git a/src/servers/Scripts/instances/dungeons/HellsLid.cpp b/src/servers/Scripts/instances/dungeons/HellsLid.cpp index 2a13194a..faa38b51 100644 --- a/src/servers/Scripts/instances/dungeons/HellsLid.cpp +++ b/src/servers/Scripts/instances/dungeons/HellsLid.cpp @@ -1,7 +1,7 @@ #include #include -using namespace Core; +using namespace Sapphire; class HellsLid : public Sapphire::ScriptAPI::InstanceContentScript diff --git a/src/servers/Scripts/instances/dungeons/HullbreakerIsle.cpp b/src/servers/Scripts/instances/dungeons/HullbreakerIsle.cpp index 4928ea5e..f38db5e4 100644 --- a/src/servers/Scripts/instances/dungeons/HullbreakerIsle.cpp +++ b/src/servers/Scripts/instances/dungeons/HullbreakerIsle.cpp @@ -1,7 +1,7 @@ #include #include -using namespace Core; +using namespace Sapphire; class HullbreakerIsle : public Sapphire::ScriptAPI::InstanceContentScript diff --git a/src/servers/Scripts/instances/dungeons/HullbreakerIsleHard.cpp b/src/servers/Scripts/instances/dungeons/HullbreakerIsleHard.cpp index be755127..13cd76c0 100644 --- a/src/servers/Scripts/instances/dungeons/HullbreakerIsleHard.cpp +++ b/src/servers/Scripts/instances/dungeons/HullbreakerIsleHard.cpp @@ -1,7 +1,7 @@ #include #include -using namespace Core; +using namespace Sapphire; class HullbreakerIsleHard : public Sapphire::ScriptAPI::InstanceContentScript diff --git a/src/servers/Scripts/instances/dungeons/KuganeCastle.cpp b/src/servers/Scripts/instances/dungeons/KuganeCastle.cpp index 3ebf2d44..a1e0b73e 100644 --- a/src/servers/Scripts/instances/dungeons/KuganeCastle.cpp +++ b/src/servers/Scripts/instances/dungeons/KuganeCastle.cpp @@ -1,7 +1,7 @@ #include #include -using namespace Core; +using namespace Sapphire; class KuganeCastle : public Sapphire::ScriptAPI::InstanceContentScript diff --git a/src/servers/Scripts/instances/dungeons/Neverreap.cpp b/src/servers/Scripts/instances/dungeons/Neverreap.cpp index 0ab7bd05..7152ce44 100644 --- a/src/servers/Scripts/instances/dungeons/Neverreap.cpp +++ b/src/servers/Scripts/instances/dungeons/Neverreap.cpp @@ -1,7 +1,7 @@ #include #include -using namespace Core; +using namespace Sapphire; class Neverreap : public Sapphire::ScriptAPI::InstanceContentScript diff --git a/src/servers/Scripts/instances/dungeons/PharosSirius.cpp b/src/servers/Scripts/instances/dungeons/PharosSirius.cpp index 7fefad30..a30dd45a 100644 --- a/src/servers/Scripts/instances/dungeons/PharosSirius.cpp +++ b/src/servers/Scripts/instances/dungeons/PharosSirius.cpp @@ -1,7 +1,7 @@ #include #include -using namespace Core; +using namespace Sapphire; class PharosSirius : public Sapphire::ScriptAPI::InstanceContentScript diff --git a/src/servers/Scripts/instances/dungeons/PharosSiriusHard.cpp b/src/servers/Scripts/instances/dungeons/PharosSiriusHard.cpp index 3fc88190..86901f72 100644 --- a/src/servers/Scripts/instances/dungeons/PharosSiriusHard.cpp +++ b/src/servers/Scripts/instances/dungeons/PharosSiriusHard.cpp @@ -1,7 +1,7 @@ #include #include -using namespace Core; +using namespace Sapphire; class PharosSiriusHard : public Sapphire::ScriptAPI::InstanceContentScript diff --git a/src/servers/Scripts/instances/dungeons/SaintMociannesArboretum.cpp b/src/servers/Scripts/instances/dungeons/SaintMociannesArboretum.cpp index d71a5f7a..150954f7 100644 --- a/src/servers/Scripts/instances/dungeons/SaintMociannesArboretum.cpp +++ b/src/servers/Scripts/instances/dungeons/SaintMociannesArboretum.cpp @@ -1,7 +1,7 @@ #include #include -using namespace Core; +using namespace Sapphire; class SaintMociannesArboretum : public Sapphire::ScriptAPI::InstanceContentScript diff --git a/src/servers/Scripts/instances/dungeons/Sastasha.cpp b/src/servers/Scripts/instances/dungeons/Sastasha.cpp index 2590119c..fd466b95 100644 --- a/src/servers/Scripts/instances/dungeons/Sastasha.cpp +++ b/src/servers/Scripts/instances/dungeons/Sastasha.cpp @@ -2,7 +2,7 @@ #include #include -using namespace Core; +using namespace Sapphire; class Sastasha : public Sapphire::ScriptAPI::InstanceContentScript diff --git a/src/servers/Scripts/instances/dungeons/SastashaHard.cpp b/src/servers/Scripts/instances/dungeons/SastashaHard.cpp index 52e059b0..73129e05 100644 --- a/src/servers/Scripts/instances/dungeons/SastashaHard.cpp +++ b/src/servers/Scripts/instances/dungeons/SastashaHard.cpp @@ -1,7 +1,7 @@ #include #include -using namespace Core; +using namespace Sapphire; class SastashaHard : public Sapphire::ScriptAPI::InstanceContentScript diff --git a/src/servers/Scripts/instances/dungeons/ShisuioftheVioletTides.cpp b/src/servers/Scripts/instances/dungeons/ShisuioftheVioletTides.cpp index 05ae83b9..4ca48f1a 100644 --- a/src/servers/Scripts/instances/dungeons/ShisuioftheVioletTides.cpp +++ b/src/servers/Scripts/instances/dungeons/ShisuioftheVioletTides.cpp @@ -1,7 +1,7 @@ #include #include -using namespace Core; +using namespace Sapphire; class ShisuioftheVioletTides : public Sapphire::ScriptAPI::InstanceContentScript diff --git a/src/servers/Scripts/instances/dungeons/Snowcloak.cpp b/src/servers/Scripts/instances/dungeons/Snowcloak.cpp index 192c2a60..f71bf4bb 100644 --- a/src/servers/Scripts/instances/dungeons/Snowcloak.cpp +++ b/src/servers/Scripts/instances/dungeons/Snowcloak.cpp @@ -1,7 +1,7 @@ #include #include -using namespace Core; +using namespace Sapphire; class Snowcloak : public Sapphire::ScriptAPI::InstanceContentScript diff --git a/src/servers/Scripts/instances/dungeons/SohmAl.cpp b/src/servers/Scripts/instances/dungeons/SohmAl.cpp index 7398b1db..c3775916 100644 --- a/src/servers/Scripts/instances/dungeons/SohmAl.cpp +++ b/src/servers/Scripts/instances/dungeons/SohmAl.cpp @@ -1,7 +1,7 @@ #include #include -using namespace Core; +using namespace Sapphire; class SohmAl : public Sapphire::ScriptAPI::InstanceContentScript diff --git a/src/servers/Scripts/instances/dungeons/SohmAlHard.cpp b/src/servers/Scripts/instances/dungeons/SohmAlHard.cpp index 203f43a4..27f27cad 100644 --- a/src/servers/Scripts/instances/dungeons/SohmAlHard.cpp +++ b/src/servers/Scripts/instances/dungeons/SohmAlHard.cpp @@ -1,7 +1,7 @@ #include #include -using namespace Core; +using namespace Sapphire; class SohmAlHard : public Sapphire::ScriptAPI::InstanceContentScript diff --git a/src/servers/Scripts/instances/dungeons/SohrKhai.cpp b/src/servers/Scripts/instances/dungeons/SohrKhai.cpp index 2f53ea94..0649f1a6 100644 --- a/src/servers/Scripts/instances/dungeons/SohrKhai.cpp +++ b/src/servers/Scripts/instances/dungeons/SohrKhai.cpp @@ -1,7 +1,7 @@ #include #include -using namespace Core; +using namespace Sapphire; class SohrKhai : public Sapphire::ScriptAPI::InstanceContentScript diff --git a/src/servers/Scripts/instances/dungeons/TheAery.cpp b/src/servers/Scripts/instances/dungeons/TheAery.cpp index 3fdc271d..1f3ddd71 100644 --- a/src/servers/Scripts/instances/dungeons/TheAery.cpp +++ b/src/servers/Scripts/instances/dungeons/TheAery.cpp @@ -1,7 +1,7 @@ #include #include -using namespace Core; +using namespace Sapphire; class TheAery : public Sapphire::ScriptAPI::InstanceContentScript diff --git a/src/servers/Scripts/instances/dungeons/TheAetherochemicalResearchFacility.cpp b/src/servers/Scripts/instances/dungeons/TheAetherochemicalResearchFacility.cpp index bb4a0d0d..aa6baeb3 100644 --- a/src/servers/Scripts/instances/dungeons/TheAetherochemicalResearchFacility.cpp +++ b/src/servers/Scripts/instances/dungeons/TheAetherochemicalResearchFacility.cpp @@ -1,7 +1,7 @@ #include #include -using namespace Core; +using namespace Sapphire; class TheAetherochemicalResearchFacility : public Sapphire::ScriptAPI::InstanceContentScript diff --git a/src/servers/Scripts/instances/dungeons/TheAntitower.cpp b/src/servers/Scripts/instances/dungeons/TheAntitower.cpp index 49c5d8fe..6e64d73d 100644 --- a/src/servers/Scripts/instances/dungeons/TheAntitower.cpp +++ b/src/servers/Scripts/instances/dungeons/TheAntitower.cpp @@ -1,7 +1,7 @@ #include #include -using namespace Core; +using namespace Sapphire; class TheAntitower : public Sapphire::ScriptAPI::InstanceContentScript diff --git a/src/servers/Scripts/instances/dungeons/TheAurumVale.cpp b/src/servers/Scripts/instances/dungeons/TheAurumVale.cpp index 58a0160a..4d44c343 100644 --- a/src/servers/Scripts/instances/dungeons/TheAurumVale.cpp +++ b/src/servers/Scripts/instances/dungeons/TheAurumVale.cpp @@ -1,7 +1,7 @@ #include #include -using namespace Core; +using namespace Sapphire; class TheAurumVale : public Sapphire::ScriptAPI::InstanceContentScript diff --git a/src/servers/Scripts/instances/dungeons/TheDrownedCityofSkalla.cpp b/src/servers/Scripts/instances/dungeons/TheDrownedCityofSkalla.cpp index a121d8c6..cfa8f269 100644 --- a/src/servers/Scripts/instances/dungeons/TheDrownedCityofSkalla.cpp +++ b/src/servers/Scripts/instances/dungeons/TheDrownedCityofSkalla.cpp @@ -1,7 +1,7 @@ #include #include -using namespace Core; +using namespace Sapphire; class TheDrownedCityofSkalla : public Sapphire::ScriptAPI::InstanceContentScript diff --git a/src/servers/Scripts/instances/dungeons/TheDuskVigil.cpp b/src/servers/Scripts/instances/dungeons/TheDuskVigil.cpp index 2bc1de12..594b7dd7 100644 --- a/src/servers/Scripts/instances/dungeons/TheDuskVigil.cpp +++ b/src/servers/Scripts/instances/dungeons/TheDuskVigil.cpp @@ -1,7 +1,7 @@ #include #include -using namespace Core; +using namespace Sapphire; class TheDuskVigil : public Sapphire::ScriptAPI::InstanceContentScript diff --git a/src/servers/Scripts/instances/dungeons/TheFractalContinuum.cpp b/src/servers/Scripts/instances/dungeons/TheFractalContinuum.cpp index 3381682f..fb407215 100644 --- a/src/servers/Scripts/instances/dungeons/TheFractalContinuum.cpp +++ b/src/servers/Scripts/instances/dungeons/TheFractalContinuum.cpp @@ -1,7 +1,7 @@ #include #include -using namespace Core; +using namespace Sapphire; class TheFractalContinuum : public Sapphire::ScriptAPI::InstanceContentScript diff --git a/src/servers/Scripts/instances/dungeons/TheFractalContinuumHard.cpp b/src/servers/Scripts/instances/dungeons/TheFractalContinuumHard.cpp index 09d7b2bb..cc5284d0 100644 --- a/src/servers/Scripts/instances/dungeons/TheFractalContinuumHard.cpp +++ b/src/servers/Scripts/instances/dungeons/TheFractalContinuumHard.cpp @@ -1,7 +1,7 @@ #include #include -using namespace Core; +using namespace Sapphire; class TheFractalContinuumHard : public Sapphire::ScriptAPI::InstanceContentScript diff --git a/src/servers/Scripts/instances/dungeons/TheGreatGubalLibrary.cpp b/src/servers/Scripts/instances/dungeons/TheGreatGubalLibrary.cpp index c8109e07..43aeb7b0 100644 --- a/src/servers/Scripts/instances/dungeons/TheGreatGubalLibrary.cpp +++ b/src/servers/Scripts/instances/dungeons/TheGreatGubalLibrary.cpp @@ -1,7 +1,7 @@ #include #include -using namespace Core; +using namespace Sapphire; class TheGreatGubalLibrary : public Sapphire::ScriptAPI::InstanceContentScript diff --git a/src/servers/Scripts/instances/dungeons/TheGreatGubalLibraryHard.cpp b/src/servers/Scripts/instances/dungeons/TheGreatGubalLibraryHard.cpp index d0eb3528..857b46c5 100644 --- a/src/servers/Scripts/instances/dungeons/TheGreatGubalLibraryHard.cpp +++ b/src/servers/Scripts/instances/dungeons/TheGreatGubalLibraryHard.cpp @@ -1,7 +1,7 @@ #include #include -using namespace Core; +using namespace Sapphire; class TheGreatGubalLibraryHard : public Sapphire::ScriptAPI::InstanceContentScript diff --git a/src/servers/Scripts/instances/dungeons/TheKeeperoftheLake.cpp b/src/servers/Scripts/instances/dungeons/TheKeeperoftheLake.cpp index 1fb32b2d..42f86b90 100644 --- a/src/servers/Scripts/instances/dungeons/TheKeeperoftheLake.cpp +++ b/src/servers/Scripts/instances/dungeons/TheKeeperoftheLake.cpp @@ -1,7 +1,7 @@ #include #include -using namespace Core; +using namespace Sapphire; class TheKeeperoftheLake : public Sapphire::ScriptAPI::InstanceContentScript diff --git a/src/servers/Scripts/instances/dungeons/TheLostCityofAmdapor.cpp b/src/servers/Scripts/instances/dungeons/TheLostCityofAmdapor.cpp index 4a393373..db82d09f 100644 --- a/src/servers/Scripts/instances/dungeons/TheLostCityofAmdapor.cpp +++ b/src/servers/Scripts/instances/dungeons/TheLostCityofAmdapor.cpp @@ -1,7 +1,7 @@ #include #include -using namespace Core; +using namespace Sapphire; class TheLostCityofAmdapor : public Sapphire::ScriptAPI::InstanceContentScript diff --git a/src/servers/Scripts/instances/dungeons/TheLostCityofAmdaporHard.cpp b/src/servers/Scripts/instances/dungeons/TheLostCityofAmdaporHard.cpp index c62e4e95..dbff517b 100644 --- a/src/servers/Scripts/instances/dungeons/TheLostCityofAmdaporHard.cpp +++ b/src/servers/Scripts/instances/dungeons/TheLostCityofAmdaporHard.cpp @@ -1,7 +1,7 @@ #include #include -using namespace Core; +using namespace Sapphire; class TheLostCityofAmdaporHard : public Sapphire::ScriptAPI::InstanceContentScript diff --git a/src/servers/Scripts/instances/dungeons/ThePraetorium.cpp b/src/servers/Scripts/instances/dungeons/ThePraetorium.cpp index a491c95d..8c84d685 100644 --- a/src/servers/Scripts/instances/dungeons/ThePraetorium.cpp +++ b/src/servers/Scripts/instances/dungeons/ThePraetorium.cpp @@ -1,7 +1,7 @@ #include #include -using namespace Core; +using namespace Sapphire; class ThePraetorium : public Sapphire::ScriptAPI::InstanceContentScript diff --git a/src/servers/Scripts/instances/dungeons/TheSirensongSea.cpp b/src/servers/Scripts/instances/dungeons/TheSirensongSea.cpp index ba97b9ca..c7ddd5d7 100644 --- a/src/servers/Scripts/instances/dungeons/TheSirensongSea.cpp +++ b/src/servers/Scripts/instances/dungeons/TheSirensongSea.cpp @@ -1,7 +1,7 @@ #include #include -using namespace Core; +using namespace Sapphire; class TheSirensongSea : public Sapphire::ScriptAPI::InstanceContentScript diff --git a/src/servers/Scripts/instances/dungeons/TheStoneVigil.cpp b/src/servers/Scripts/instances/dungeons/TheStoneVigil.cpp index 2111b994..6185305f 100644 --- a/src/servers/Scripts/instances/dungeons/TheStoneVigil.cpp +++ b/src/servers/Scripts/instances/dungeons/TheStoneVigil.cpp @@ -1,7 +1,7 @@ #include #include -using namespace Core; +using namespace Sapphire; class TheStoneVigil : public Sapphire::ScriptAPI::InstanceContentScript diff --git a/src/servers/Scripts/instances/dungeons/TheStoneVigilHard.cpp b/src/servers/Scripts/instances/dungeons/TheStoneVigilHard.cpp index 856c7453..b90fa464 100644 --- a/src/servers/Scripts/instances/dungeons/TheStoneVigilHard.cpp +++ b/src/servers/Scripts/instances/dungeons/TheStoneVigilHard.cpp @@ -1,7 +1,7 @@ #include #include -using namespace Core; +using namespace Sapphire; class TheStoneVigilHard : public Sapphire::ScriptAPI::InstanceContentScript diff --git a/src/servers/Scripts/instances/dungeons/TheSunkenTempleofQarn.cpp b/src/servers/Scripts/instances/dungeons/TheSunkenTempleofQarn.cpp index a7788b52..30c0fdba 100644 --- a/src/servers/Scripts/instances/dungeons/TheSunkenTempleofQarn.cpp +++ b/src/servers/Scripts/instances/dungeons/TheSunkenTempleofQarn.cpp @@ -1,7 +1,7 @@ #include #include -using namespace Core; +using namespace Sapphire; class TheSunkenTempleofQarn : public Sapphire::ScriptAPI::InstanceContentScript diff --git a/src/servers/Scripts/instances/dungeons/TheSunkenTempleofQarnHard.cpp b/src/servers/Scripts/instances/dungeons/TheSunkenTempleofQarnHard.cpp index 31a593fc..4c8e4336 100644 --- a/src/servers/Scripts/instances/dungeons/TheSunkenTempleofQarnHard.cpp +++ b/src/servers/Scripts/instances/dungeons/TheSunkenTempleofQarnHard.cpp @@ -1,7 +1,7 @@ #include #include -using namespace Core; +using namespace Sapphire; class TheSunkenTempleofQarnHard : public Sapphire::ScriptAPI::InstanceContentScript diff --git a/src/servers/Scripts/instances/dungeons/TheTamTaraDeepcroft.cpp b/src/servers/Scripts/instances/dungeons/TheTamTaraDeepcroft.cpp index 44311393..efffdfac 100644 --- a/src/servers/Scripts/instances/dungeons/TheTamTaraDeepcroft.cpp +++ b/src/servers/Scripts/instances/dungeons/TheTamTaraDeepcroft.cpp @@ -1,7 +1,7 @@ #include #include -using namespace Core; +using namespace Sapphire; class TheTamTaraDeepcroft : public Sapphire::ScriptAPI::InstanceContentScript diff --git a/src/servers/Scripts/instances/dungeons/TheTamTaraDeepcroftHard.cpp b/src/servers/Scripts/instances/dungeons/TheTamTaraDeepcroftHard.cpp index f3198b1d..d6fb7640 100644 --- a/src/servers/Scripts/instances/dungeons/TheTamTaraDeepcroftHard.cpp +++ b/src/servers/Scripts/instances/dungeons/TheTamTaraDeepcroftHard.cpp @@ -1,7 +1,7 @@ #include #include -using namespace Core; +using namespace Sapphire; class TheTamTaraDeepcroftHard : public Sapphire::ScriptAPI::InstanceContentScript diff --git a/src/servers/Scripts/instances/dungeons/TheTempleoftheFist.cpp b/src/servers/Scripts/instances/dungeons/TheTempleoftheFist.cpp index 2bc27a7a..170c179c 100644 --- a/src/servers/Scripts/instances/dungeons/TheTempleoftheFist.cpp +++ b/src/servers/Scripts/instances/dungeons/TheTempleoftheFist.cpp @@ -1,7 +1,7 @@ #include #include -using namespace Core; +using namespace Sapphire; class TheTempleoftheFist : public Sapphire::ScriptAPI::InstanceContentScript diff --git a/src/servers/Scripts/instances/dungeons/TheThousandMawsofTotoRak.cpp b/src/servers/Scripts/instances/dungeons/TheThousandMawsofTotoRak.cpp index 0d7910f3..c57651b2 100644 --- a/src/servers/Scripts/instances/dungeons/TheThousandMawsofTotoRak.cpp +++ b/src/servers/Scripts/instances/dungeons/TheThousandMawsofTotoRak.cpp @@ -1,7 +1,7 @@ #include #include -using namespace Core; +using namespace Sapphire; class TheThousandMawsofTotoRak : public Sapphire::ScriptAPI::InstanceContentScript diff --git a/src/servers/Scripts/instances/dungeons/TheVault.cpp b/src/servers/Scripts/instances/dungeons/TheVault.cpp index 583a64e2..80848fec 100644 --- a/src/servers/Scripts/instances/dungeons/TheVault.cpp +++ b/src/servers/Scripts/instances/dungeons/TheVault.cpp @@ -1,7 +1,7 @@ #include #include -using namespace Core; +using namespace Sapphire; class TheVault : public Sapphire::ScriptAPI::InstanceContentScript diff --git a/src/servers/Scripts/instances/dungeons/TheWanderersPalace.cpp b/src/servers/Scripts/instances/dungeons/TheWanderersPalace.cpp index 61f515eb..23bd854f 100644 --- a/src/servers/Scripts/instances/dungeons/TheWanderersPalace.cpp +++ b/src/servers/Scripts/instances/dungeons/TheWanderersPalace.cpp @@ -1,7 +1,7 @@ #include #include -using namespace Core; +using namespace Sapphire; class TheWanderersPalace : public Sapphire::ScriptAPI::InstanceContentScript diff --git a/src/servers/Scripts/instances/dungeons/TheWanderersPalaceHard.cpp b/src/servers/Scripts/instances/dungeons/TheWanderersPalaceHard.cpp index cef7b8cf..87649edf 100644 --- a/src/servers/Scripts/instances/dungeons/TheWanderersPalaceHard.cpp +++ b/src/servers/Scripts/instances/dungeons/TheWanderersPalaceHard.cpp @@ -1,7 +1,7 @@ #include #include -using namespace Core; +using namespace Sapphire; class TheWanderersPalaceHard : public Sapphire::ScriptAPI::InstanceContentScript diff --git a/src/servers/Scripts/instances/dungeons/Xelphatol.cpp b/src/servers/Scripts/instances/dungeons/Xelphatol.cpp index 6b5e980a..50800ec9 100644 --- a/src/servers/Scripts/instances/dungeons/Xelphatol.cpp +++ b/src/servers/Scripts/instances/dungeons/Xelphatol.cpp @@ -1,7 +1,7 @@ #include #include -using namespace Core; +using namespace Sapphire; class Xelphatol : public Sapphire::ScriptAPI::InstanceContentScript diff --git a/src/servers/Scripts/instances/events/TheHauntedManor.cpp b/src/servers/Scripts/instances/events/TheHauntedManor.cpp index 320f2b36..36ceea06 100644 --- a/src/servers/Scripts/instances/events/TheHauntedManor.cpp +++ b/src/servers/Scripts/instances/events/TheHauntedManor.cpp @@ -1,7 +1,7 @@ #include #include -using namespace Core; +using namespace Sapphire; class TheHauntedManor : public Sapphire::ScriptAPI::InstanceContentScript diff --git a/src/servers/Scripts/instances/events/TheValentionesCeremony.cpp b/src/servers/Scripts/instances/events/TheValentionesCeremony.cpp index 44cea731..662bba88 100644 --- a/src/servers/Scripts/instances/events/TheValentionesCeremony.cpp +++ b/src/servers/Scripts/instances/events/TheValentionesCeremony.cpp @@ -1,7 +1,7 @@ #include #include -using namespace Core; +using namespace Sapphire; class TheValentionesCeremony : public Sapphire::ScriptAPI::InstanceContentScript diff --git a/src/servers/Scripts/instances/guildhests/AllsWellthatEndsintheWell.cpp b/src/servers/Scripts/instances/guildhests/AllsWellthatEndsintheWell.cpp index 9930fcdd..6372860c 100644 --- a/src/servers/Scripts/instances/guildhests/AllsWellthatEndsintheWell.cpp +++ b/src/servers/Scripts/instances/guildhests/AllsWellthatEndsintheWell.cpp @@ -1,7 +1,7 @@ #include #include -using namespace Core; +using namespace Sapphire; class AllsWellthatEndsintheWell : public Sapphire::ScriptAPI::InstanceContentScript diff --git a/src/servers/Scripts/instances/guildhests/AnnoytheVoid.cpp b/src/servers/Scripts/instances/guildhests/AnnoytheVoid.cpp index 302ef4e9..eba6136b 100644 --- a/src/servers/Scripts/instances/guildhests/AnnoytheVoid.cpp +++ b/src/servers/Scripts/instances/guildhests/AnnoytheVoid.cpp @@ -1,7 +1,7 @@ #include #include -using namespace Core; +using namespace Sapphire; class AnnoytheVoid : public Sapphire::ScriptAPI::InstanceContentScript diff --git a/src/servers/Scripts/instances/guildhests/BasicTrainingEnemyParties.cpp b/src/servers/Scripts/instances/guildhests/BasicTrainingEnemyParties.cpp index 47f76d71..2b628bb9 100644 --- a/src/servers/Scripts/instances/guildhests/BasicTrainingEnemyParties.cpp +++ b/src/servers/Scripts/instances/guildhests/BasicTrainingEnemyParties.cpp @@ -1,7 +1,7 @@ #include #include -using namespace Core; +using namespace Sapphire; class BasicTrainingEnemyParties : public Sapphire::ScriptAPI::InstanceContentScript diff --git a/src/servers/Scripts/instances/guildhests/BasicTrainingEnemyStrongholds.cpp b/src/servers/Scripts/instances/guildhests/BasicTrainingEnemyStrongholds.cpp index 8af49bb0..4fd6cecc 100644 --- a/src/servers/Scripts/instances/guildhests/BasicTrainingEnemyStrongholds.cpp +++ b/src/servers/Scripts/instances/guildhests/BasicTrainingEnemyStrongholds.cpp @@ -1,7 +1,7 @@ #include #include -using namespace Core; +using namespace Sapphire; class BasicTrainingEnemyStrongholds : public Sapphire::ScriptAPI::InstanceContentScript diff --git a/src/servers/Scripts/instances/guildhests/FlickingSticksandTakingNames.cpp b/src/servers/Scripts/instances/guildhests/FlickingSticksandTakingNames.cpp index b8f371e9..808b7c80 100644 --- a/src/servers/Scripts/instances/guildhests/FlickingSticksandTakingNames.cpp +++ b/src/servers/Scripts/instances/guildhests/FlickingSticksandTakingNames.cpp @@ -1,7 +1,7 @@ #include #include -using namespace Core; +using namespace Sapphire; class FlickingSticksandTakingNames : public Sapphire::ScriptAPI::InstanceContentScript diff --git a/src/servers/Scripts/instances/guildhests/HeroontheHalfShell.cpp b/src/servers/Scripts/instances/guildhests/HeroontheHalfShell.cpp index 4adf9750..cff97d5f 100644 --- a/src/servers/Scripts/instances/guildhests/HeroontheHalfShell.cpp +++ b/src/servers/Scripts/instances/guildhests/HeroontheHalfShell.cpp @@ -1,7 +1,7 @@ #include #include -using namespace Core; +using namespace Sapphire; class HeroontheHalfShell : public Sapphire::ScriptAPI::InstanceContentScript diff --git a/src/servers/Scripts/instances/guildhests/LongLivetheQueen.cpp b/src/servers/Scripts/instances/guildhests/LongLivetheQueen.cpp index f461543c..d5b03c71 100644 --- a/src/servers/Scripts/instances/guildhests/LongLivetheQueen.cpp +++ b/src/servers/Scripts/instances/guildhests/LongLivetheQueen.cpp @@ -1,7 +1,7 @@ #include #include -using namespace Core; +using namespace Sapphire; class LongLivetheQueen : public Sapphire::ScriptAPI::InstanceContentScript diff --git a/src/servers/Scripts/instances/guildhests/MorethanaFeeler.cpp b/src/servers/Scripts/instances/guildhests/MorethanaFeeler.cpp index 25bec36c..f9e30f97 100644 --- a/src/servers/Scripts/instances/guildhests/MorethanaFeeler.cpp +++ b/src/servers/Scripts/instances/guildhests/MorethanaFeeler.cpp @@ -1,7 +1,7 @@ #include #include -using namespace Core; +using namespace Sapphire; class MorethanaFeeler : public Sapphire::ScriptAPI::InstanceContentScript diff --git a/src/servers/Scripts/instances/guildhests/PullingPoisonPosies.cpp b/src/servers/Scripts/instances/guildhests/PullingPoisonPosies.cpp index 251059ff..e48bfcd4 100644 --- a/src/servers/Scripts/instances/guildhests/PullingPoisonPosies.cpp +++ b/src/servers/Scripts/instances/guildhests/PullingPoisonPosies.cpp @@ -1,7 +1,7 @@ #include #include -using namespace Core; +using namespace Sapphire; class PullingPoisonPosies : public Sapphire::ScriptAPI::InstanceContentScript diff --git a/src/servers/Scripts/instances/guildhests/ShadowandClaw.cpp b/src/servers/Scripts/instances/guildhests/ShadowandClaw.cpp index 950f7b5a..4cc2d298 100644 --- a/src/servers/Scripts/instances/guildhests/ShadowandClaw.cpp +++ b/src/servers/Scripts/instances/guildhests/ShadowandClaw.cpp @@ -1,7 +1,7 @@ #include #include -using namespace Core; +using namespace Sapphire; class ShadowandClaw : public Sapphire::ScriptAPI::InstanceContentScript diff --git a/src/servers/Scripts/instances/guildhests/SolemnTrinity.cpp b/src/servers/Scripts/instances/guildhests/SolemnTrinity.cpp index 119386d5..432b5e23 100644 --- a/src/servers/Scripts/instances/guildhests/SolemnTrinity.cpp +++ b/src/servers/Scripts/instances/guildhests/SolemnTrinity.cpp @@ -1,7 +1,7 @@ #include #include -using namespace Core; +using namespace Sapphire; class SolemnTrinity : public Sapphire::ScriptAPI::InstanceContentScript diff --git a/src/servers/Scripts/instances/guildhests/StingingBack.cpp b/src/servers/Scripts/instances/guildhests/StingingBack.cpp index ac2b1808..906c2c95 100644 --- a/src/servers/Scripts/instances/guildhests/StingingBack.cpp +++ b/src/servers/Scripts/instances/guildhests/StingingBack.cpp @@ -1,7 +1,7 @@ #include #include -using namespace Core; +using namespace Sapphire; class StingingBack : public Sapphire::ScriptAPI::InstanceContentScript diff --git a/src/servers/Scripts/instances/guildhests/UndertheArmor.cpp b/src/servers/Scripts/instances/guildhests/UndertheArmor.cpp index e2393955..5379f9bc 100644 --- a/src/servers/Scripts/instances/guildhests/UndertheArmor.cpp +++ b/src/servers/Scripts/instances/guildhests/UndertheArmor.cpp @@ -1,7 +1,7 @@ #include #include -using namespace Core; +using namespace Sapphire; class UndertheArmor : public Sapphire::ScriptAPI::InstanceContentScript diff --git a/src/servers/Scripts/instances/guildhests/WardUp.cpp b/src/servers/Scripts/instances/guildhests/WardUp.cpp index 889dd4a5..970e54c8 100644 --- a/src/servers/Scripts/instances/guildhests/WardUp.cpp +++ b/src/servers/Scripts/instances/guildhests/WardUp.cpp @@ -1,7 +1,7 @@ #include #include -using namespace Core; +using namespace Sapphire; class WardUp : public Sapphire::ScriptAPI::InstanceContentScript diff --git a/src/servers/Scripts/instances/hallofthenovice/AccrueEnmityfromMultipleTargets.cpp b/src/servers/Scripts/instances/hallofthenovice/AccrueEnmityfromMultipleTargets.cpp index acd22554..5ac0b32c 100644 --- a/src/servers/Scripts/instances/hallofthenovice/AccrueEnmityfromMultipleTargets.cpp +++ b/src/servers/Scripts/instances/hallofthenovice/AccrueEnmityfromMultipleTargets.cpp @@ -1,7 +1,7 @@ #include #include -using namespace Core; +using namespace Sapphire; class AccrueEnmityfromMultipleTargets : public Sapphire::ScriptAPI::InstanceContentScript diff --git a/src/servers/Scripts/instances/hallofthenovice/AssistAlliesinDefeatingaTarget.cpp b/src/servers/Scripts/instances/hallofthenovice/AssistAlliesinDefeatingaTarget.cpp index 33e488a3..dc64211e 100644 --- a/src/servers/Scripts/instances/hallofthenovice/AssistAlliesinDefeatingaTarget.cpp +++ b/src/servers/Scripts/instances/hallofthenovice/AssistAlliesinDefeatingaTarget.cpp @@ -1,7 +1,7 @@ #include #include -using namespace Core; +using namespace Sapphire; class AssistAlliesinDefeatingaTarget : public Sapphire::ScriptAPI::InstanceContentScript diff --git a/src/servers/Scripts/instances/hallofthenovice/AvoidAreaofEffectAttacks.cpp b/src/servers/Scripts/instances/hallofthenovice/AvoidAreaofEffectAttacks.cpp index 59cf12a4..97537b97 100644 --- a/src/servers/Scripts/instances/hallofthenovice/AvoidAreaofEffectAttacks.cpp +++ b/src/servers/Scripts/instances/hallofthenovice/AvoidAreaofEffectAttacks.cpp @@ -1,7 +1,7 @@ #include #include -using namespace Core; +using namespace Sapphire; class AvoidAreaofEffectAttacks : public Sapphire::ScriptAPI::InstanceContentScript diff --git a/src/servers/Scripts/instances/hallofthenovice/AvoidEngagedTargets.cpp b/src/servers/Scripts/instances/hallofthenovice/AvoidEngagedTargets.cpp index e6c698d0..7f95e54e 100644 --- a/src/servers/Scripts/instances/hallofthenovice/AvoidEngagedTargets.cpp +++ b/src/servers/Scripts/instances/hallofthenovice/AvoidEngagedTargets.cpp @@ -1,7 +1,7 @@ #include #include -using namespace Core; +using namespace Sapphire; class AvoidEngagedTargets : public Sapphire::ScriptAPI::InstanceContentScript diff --git a/src/servers/Scripts/instances/hallofthenovice/DefeatanOccupiedTarget.cpp b/src/servers/Scripts/instances/hallofthenovice/DefeatanOccupiedTarget.cpp index 061f6983..b100decf 100644 --- a/src/servers/Scripts/instances/hallofthenovice/DefeatanOccupiedTarget.cpp +++ b/src/servers/Scripts/instances/hallofthenovice/DefeatanOccupiedTarget.cpp @@ -1,7 +1,7 @@ #include #include -using namespace Core; +using namespace Sapphire; class DefeatanOccupiedTarget : public Sapphire::ScriptAPI::InstanceContentScript diff --git a/src/servers/Scripts/instances/hallofthenovice/EngageEnemyReinforcements.cpp b/src/servers/Scripts/instances/hallofthenovice/EngageEnemyReinforcements.cpp index f47d47a6..eb8aa38a 100644 --- a/src/servers/Scripts/instances/hallofthenovice/EngageEnemyReinforcements.cpp +++ b/src/servers/Scripts/instances/hallofthenovice/EngageEnemyReinforcements.cpp @@ -1,7 +1,7 @@ #include #include -using namespace Core; +using namespace Sapphire; class EngageEnemyReinforcements : public Sapphire::ScriptAPI::InstanceContentScript diff --git a/src/servers/Scripts/instances/hallofthenovice/EngageMultipleTargets.cpp b/src/servers/Scripts/instances/hallofthenovice/EngageMultipleTargets.cpp index a6f89615..0f0925fa 100644 --- a/src/servers/Scripts/instances/hallofthenovice/EngageMultipleTargets.cpp +++ b/src/servers/Scripts/instances/hallofthenovice/EngageMultipleTargets.cpp @@ -1,7 +1,7 @@ #include #include -using namespace Core; +using namespace Sapphire; class EngageMultipleTargets : public Sapphire::ScriptAPI::InstanceContentScript diff --git a/src/servers/Scripts/instances/hallofthenovice/ExecuteaComboinBattle.cpp b/src/servers/Scripts/instances/hallofthenovice/ExecuteaComboinBattle.cpp index d4308f8f..94ff639d 100644 --- a/src/servers/Scripts/instances/hallofthenovice/ExecuteaComboinBattle.cpp +++ b/src/servers/Scripts/instances/hallofthenovice/ExecuteaComboinBattle.cpp @@ -1,7 +1,7 @@ #include #include -using namespace Core; +using namespace Sapphire; class ExecuteaComboinBattle : public Sapphire::ScriptAPI::InstanceContentScript diff --git a/src/servers/Scripts/instances/hallofthenovice/ExecuteaCombotoIncreaseEnmity.cpp b/src/servers/Scripts/instances/hallofthenovice/ExecuteaCombotoIncreaseEnmity.cpp index 10db2adb..ec52f532 100644 --- a/src/servers/Scripts/instances/hallofthenovice/ExecuteaCombotoIncreaseEnmity.cpp +++ b/src/servers/Scripts/instances/hallofthenovice/ExecuteaCombotoIncreaseEnmity.cpp @@ -1,7 +1,7 @@ #include #include -using namespace Core; +using namespace Sapphire; class ExecuteaCombotoIncreaseEnmity : public Sapphire::ScriptAPI::InstanceContentScript diff --git a/src/servers/Scripts/instances/hallofthenovice/ExecuteaRangedAttacktoIncreaseEnmity.cpp b/src/servers/Scripts/instances/hallofthenovice/ExecuteaRangedAttacktoIncreaseEnmity.cpp index a8915102..16cda58d 100644 --- a/src/servers/Scripts/instances/hallofthenovice/ExecuteaRangedAttacktoIncreaseEnmity.cpp +++ b/src/servers/Scripts/instances/hallofthenovice/ExecuteaRangedAttacktoIncreaseEnmity.cpp @@ -1,7 +1,7 @@ #include #include -using namespace Core; +using namespace Sapphire; class ExecuteaRangedAttacktoIncreaseEnmity : public Sapphire::ScriptAPI::InstanceContentScript diff --git a/src/servers/Scripts/instances/hallofthenovice/FinalExercise.cpp b/src/servers/Scripts/instances/hallofthenovice/FinalExercise.cpp index 623f41d0..106e95b2 100644 --- a/src/servers/Scripts/instances/hallofthenovice/FinalExercise.cpp +++ b/src/servers/Scripts/instances/hallofthenovice/FinalExercise.cpp @@ -1,7 +1,7 @@ #include #include -using namespace Core; +using namespace Sapphire; class FinalExercise : public Sapphire::ScriptAPI::InstanceContentScript diff --git a/src/servers/Scripts/instances/hallofthenovice/HealMultipleAllies.cpp b/src/servers/Scripts/instances/hallofthenovice/HealMultipleAllies.cpp index 56342715..b5fcd5d9 100644 --- a/src/servers/Scripts/instances/hallofthenovice/HealMultipleAllies.cpp +++ b/src/servers/Scripts/instances/hallofthenovice/HealMultipleAllies.cpp @@ -1,7 +1,7 @@ #include #include -using namespace Core; +using namespace Sapphire; class HealMultipleAllies : public Sapphire::ScriptAPI::InstanceContentScript diff --git a/src/servers/Scripts/instances/hallofthenovice/HealanAlly.cpp b/src/servers/Scripts/instances/hallofthenovice/HealanAlly.cpp index 3eb502ce..87f2a97d 100644 --- a/src/servers/Scripts/instances/hallofthenovice/HealanAlly.cpp +++ b/src/servers/Scripts/instances/hallofthenovice/HealanAlly.cpp @@ -1,7 +1,7 @@ #include #include -using namespace Core; +using namespace Sapphire; class HealanAlly : public Sapphire::ScriptAPI::InstanceContentScript diff --git a/src/servers/Scripts/instances/hallofthenovice/InteractwiththeBattlefield.cpp b/src/servers/Scripts/instances/hallofthenovice/InteractwiththeBattlefield.cpp index ba568c68..eea766d9 100644 --- a/src/servers/Scripts/instances/hallofthenovice/InteractwiththeBattlefield.cpp +++ b/src/servers/Scripts/instances/hallofthenovice/InteractwiththeBattlefield.cpp @@ -1,7 +1,7 @@ #include #include -using namespace Core; +using namespace Sapphire; class InteractwiththeBattlefield : public Sapphire::ScriptAPI::InstanceContentScript diff --git a/src/servers/Scripts/instances/pvp/Astragalos.cpp b/src/servers/Scripts/instances/pvp/Astragalos.cpp index 9bd97972..8c4d8de1 100644 --- a/src/servers/Scripts/instances/pvp/Astragalos.cpp +++ b/src/servers/Scripts/instances/pvp/Astragalos.cpp @@ -1,7 +1,7 @@ #include #include -using namespace Core; +using namespace Sapphire; class Astragalos : public Sapphire::ScriptAPI::InstanceContentScript diff --git a/src/servers/Scripts/instances/pvp/SealRockSeize.cpp b/src/servers/Scripts/instances/pvp/SealRockSeize.cpp index 957c9f22..b1efa7dd 100644 --- a/src/servers/Scripts/instances/pvp/SealRockSeize.cpp +++ b/src/servers/Scripts/instances/pvp/SealRockSeize.cpp @@ -1,7 +1,7 @@ #include #include -using namespace Core; +using namespace Sapphire; class SealRockSeize : public Sapphire::ScriptAPI::InstanceContentScript diff --git a/src/servers/Scripts/instances/pvp/TheBorderlandRuinsSecure.cpp b/src/servers/Scripts/instances/pvp/TheBorderlandRuinsSecure.cpp index 767b3a51..a6ec9ac8 100644 --- a/src/servers/Scripts/instances/pvp/TheBorderlandRuinsSecure.cpp +++ b/src/servers/Scripts/instances/pvp/TheBorderlandRuinsSecure.cpp @@ -1,7 +1,7 @@ #include #include -using namespace Core; +using namespace Sapphire; class TheBorderlandRuinsSecure : public Sapphire::ScriptAPI::InstanceContentScript diff --git a/src/servers/Scripts/instances/pvp/TheFeast4on4LightParty.cpp b/src/servers/Scripts/instances/pvp/TheFeast4on4LightParty.cpp index a697210f..519aac3c 100644 --- a/src/servers/Scripts/instances/pvp/TheFeast4on4LightParty.cpp +++ b/src/servers/Scripts/instances/pvp/TheFeast4on4LightParty.cpp @@ -1,7 +1,7 @@ #include #include -using namespace Core; +using namespace Sapphire; class TheFeast4on4LightParty : public Sapphire::ScriptAPI::InstanceContentScript diff --git a/src/servers/Scripts/instances/pvp/TheFeast4on4Ranked.cpp b/src/servers/Scripts/instances/pvp/TheFeast4on4Ranked.cpp index d9a0c6d4..a71516b9 100644 --- a/src/servers/Scripts/instances/pvp/TheFeast4on4Ranked.cpp +++ b/src/servers/Scripts/instances/pvp/TheFeast4on4Ranked.cpp @@ -1,7 +1,7 @@ #include #include -using namespace Core; +using namespace Sapphire; class TheFeast4on4Ranked : public Sapphire::ScriptAPI::InstanceContentScript diff --git a/src/servers/Scripts/instances/pvp/TheFeast4on4Training.cpp b/src/servers/Scripts/instances/pvp/TheFeast4on4Training.cpp index 5b08c17b..34043bc3 100644 --- a/src/servers/Scripts/instances/pvp/TheFeast4on4Training.cpp +++ b/src/servers/Scripts/instances/pvp/TheFeast4on4Training.cpp @@ -1,7 +1,7 @@ #include #include -using namespace Core; +using namespace Sapphire; class TheFeast4on4Training : public Sapphire::ScriptAPI::InstanceContentScript diff --git a/src/servers/Scripts/instances/pvp/TheFeastCustomMatchCrystalTower.cpp b/src/servers/Scripts/instances/pvp/TheFeastCustomMatchCrystalTower.cpp index ab00a81f..100ba852 100644 --- a/src/servers/Scripts/instances/pvp/TheFeastCustomMatchCrystalTower.cpp +++ b/src/servers/Scripts/instances/pvp/TheFeastCustomMatchCrystalTower.cpp @@ -1,7 +1,7 @@ #include #include -using namespace Core; +using namespace Sapphire; class TheFeastCustomMatchCrystalTower : public Sapphire::ScriptAPI::InstanceContentScript diff --git a/src/servers/Scripts/instances/pvp/TheFeastCustomMatchFeastingGrounds.cpp b/src/servers/Scripts/instances/pvp/TheFeastCustomMatchFeastingGrounds.cpp index c62ebafa..161e2b6c 100644 --- a/src/servers/Scripts/instances/pvp/TheFeastCustomMatchFeastingGrounds.cpp +++ b/src/servers/Scripts/instances/pvp/TheFeastCustomMatchFeastingGrounds.cpp @@ -1,7 +1,7 @@ #include #include -using namespace Core; +using namespace Sapphire; class TheFeastCustomMatchFeastingGrounds : public Sapphire::ScriptAPI::InstanceContentScript diff --git a/src/servers/Scripts/instances/pvp/TheFeastCustomMatchLichenweed.cpp b/src/servers/Scripts/instances/pvp/TheFeastCustomMatchLichenweed.cpp index 1b3e00a5..1d9e491a 100644 --- a/src/servers/Scripts/instances/pvp/TheFeastCustomMatchLichenweed.cpp +++ b/src/servers/Scripts/instances/pvp/TheFeastCustomMatchLichenweed.cpp @@ -1,7 +1,7 @@ #include #include -using namespace Core; +using namespace Sapphire; class TheFeastCustomMatchLichenweed : public Sapphire::ScriptAPI::InstanceContentScript diff --git a/src/servers/Scripts/instances/pvp/TheFeastRanked.cpp b/src/servers/Scripts/instances/pvp/TheFeastRanked.cpp index 2614c52d..be0348ff 100644 --- a/src/servers/Scripts/instances/pvp/TheFeastRanked.cpp +++ b/src/servers/Scripts/instances/pvp/TheFeastRanked.cpp @@ -1,7 +1,7 @@ #include #include -using namespace Core; +using namespace Sapphire; class TheFeastRanked : public Sapphire::ScriptAPI::InstanceContentScript diff --git a/src/servers/Scripts/instances/pvp/TheFeastTeamRanked.cpp b/src/servers/Scripts/instances/pvp/TheFeastTeamRanked.cpp index 86a1d7a2..6e1dbffb 100644 --- a/src/servers/Scripts/instances/pvp/TheFeastTeamRanked.cpp +++ b/src/servers/Scripts/instances/pvp/TheFeastTeamRanked.cpp @@ -1,7 +1,7 @@ #include #include -using namespace Core; +using namespace Sapphire; class TheFeastTeamRanked : public Sapphire::ScriptAPI::InstanceContentScript diff --git a/src/servers/Scripts/instances/pvp/TheFeastTraining.cpp b/src/servers/Scripts/instances/pvp/TheFeastTraining.cpp index 109fa8c3..a3aac623 100644 --- a/src/servers/Scripts/instances/pvp/TheFeastTraining.cpp +++ b/src/servers/Scripts/instances/pvp/TheFeastTraining.cpp @@ -1,7 +1,7 @@ #include #include -using namespace Core; +using namespace Sapphire; class TheFeastTraining : public Sapphire::ScriptAPI::InstanceContentScript diff --git a/src/servers/Scripts/instances/pvp/TheFieldsofGloryShatter.cpp b/src/servers/Scripts/instances/pvp/TheFieldsofGloryShatter.cpp index ffa05e9a..c3dc287d 100644 --- a/src/servers/Scripts/instances/pvp/TheFieldsofGloryShatter.cpp +++ b/src/servers/Scripts/instances/pvp/TheFieldsofGloryShatter.cpp @@ -1,7 +1,7 @@ #include #include -using namespace Core; +using namespace Sapphire; class TheFieldsofGloryShatter : public Sapphire::ScriptAPI::InstanceContentScript diff --git a/src/servers/Scripts/instances/questbattles/ABloodyReunion.cpp b/src/servers/Scripts/instances/questbattles/ABloodyReunion.cpp index 5156924c..fe15d51d 100644 --- a/src/servers/Scripts/instances/questbattles/ABloodyReunion.cpp +++ b/src/servers/Scripts/instances/questbattles/ABloodyReunion.cpp @@ -1,7 +1,7 @@ #include #include -using namespace Core; +using namespace Sapphire; class ABloodyReunion : public Sapphire::ScriptAPI::InstanceContentScript diff --git a/src/servers/Scripts/instances/questbattles/ASpectaclefortheAges.cpp b/src/servers/Scripts/instances/questbattles/ASpectaclefortheAges.cpp index 812ca933..66a74b21 100644 --- a/src/servers/Scripts/instances/questbattles/ASpectaclefortheAges.cpp +++ b/src/servers/Scripts/instances/questbattles/ASpectaclefortheAges.cpp @@ -1,7 +1,7 @@ #include #include -using namespace Core; +using namespace Sapphire; class ASpectaclefortheAges : public Sapphire::ScriptAPI::InstanceContentScript diff --git a/src/servers/Scripts/instances/questbattles/BloodDragoon.cpp b/src/servers/Scripts/instances/questbattles/BloodDragoon.cpp index 213ea2a3..170f689a 100644 --- a/src/servers/Scripts/instances/questbattles/BloodDragoon.cpp +++ b/src/servers/Scripts/instances/questbattles/BloodDragoon.cpp @@ -1,7 +1,7 @@ #include #include -using namespace Core; +using namespace Sapphire; class BloodDragoon : public Sapphire::ScriptAPI::InstanceContentScript diff --git a/src/servers/Scripts/instances/questbattles/BloodontheDeck.cpp b/src/servers/Scripts/instances/questbattles/BloodontheDeck.cpp index 7d7a7904..6c7e665a 100644 --- a/src/servers/Scripts/instances/questbattles/BloodontheDeck.cpp +++ b/src/servers/Scripts/instances/questbattles/BloodontheDeck.cpp @@ -1,7 +1,7 @@ #include #include -using namespace Core; +using namespace Sapphire; class BloodontheDeck : public Sapphire::ScriptAPI::InstanceContentScript diff --git a/src/servers/Scripts/instances/questbattles/CuriousGorgeMeetsHisMatch.cpp b/src/servers/Scripts/instances/questbattles/CuriousGorgeMeetsHisMatch.cpp index 9d11e0d9..1ee71fde 100644 --- a/src/servers/Scripts/instances/questbattles/CuriousGorgeMeetsHisMatch.cpp +++ b/src/servers/Scripts/instances/questbattles/CuriousGorgeMeetsHisMatch.cpp @@ -1,7 +1,7 @@ #include #include -using namespace Core; +using namespace Sapphire; class CuriousGorgeMeetsHisMatch : public Sapphire::ScriptAPI::InstanceContentScript diff --git a/src/servers/Scripts/instances/questbattles/DarkwingDragon.cpp b/src/servers/Scripts/instances/questbattles/DarkwingDragon.cpp index dbb22306..29d57183 100644 --- a/src/servers/Scripts/instances/questbattles/DarkwingDragon.cpp +++ b/src/servers/Scripts/instances/questbattles/DarkwingDragon.cpp @@ -1,7 +1,7 @@ #include #include -using namespace Core; +using namespace Sapphire; class DarkwingDragon : public Sapphire::ScriptAPI::InstanceContentScript diff --git a/src/servers/Scripts/instances/questbattles/InThalsName.cpp b/src/servers/Scripts/instances/questbattles/InThalsName.cpp index 30651049..ac4d87c3 100644 --- a/src/servers/Scripts/instances/questbattles/InThalsName.cpp +++ b/src/servers/Scripts/instances/questbattles/InThalsName.cpp @@ -1,7 +1,7 @@ #include #include -using namespace Core; +using namespace Sapphire; class InThalsName : public Sapphire::ScriptAPI::InstanceContentScript diff --git a/src/servers/Scripts/instances/questbattles/InterdimensionalRift.cpp b/src/servers/Scripts/instances/questbattles/InterdimensionalRift.cpp index 3d59bb98..324e6162 100644 --- a/src/servers/Scripts/instances/questbattles/InterdimensionalRift.cpp +++ b/src/servers/Scripts/instances/questbattles/InterdimensionalRift.cpp @@ -1,7 +1,7 @@ #include #include -using namespace Core; +using namespace Sapphire; class InterdimensionalRift : public Sapphire::ScriptAPI::InstanceContentScript diff --git a/src/servers/Scripts/instances/questbattles/ItsProbablyaTrap.cpp b/src/servers/Scripts/instances/questbattles/ItsProbablyaTrap.cpp index e66d6988..808a9ad2 100644 --- a/src/servers/Scripts/instances/questbattles/ItsProbablyaTrap.cpp +++ b/src/servers/Scripts/instances/questbattles/ItsProbablyaTrap.cpp @@ -1,7 +1,7 @@ #include #include -using namespace Core; +using namespace Sapphire; class ItsProbablyaTrap : public Sapphire::ScriptAPI::InstanceContentScript diff --git a/src/servers/Scripts/instances/questbattles/MatsubaMayhem.cpp b/src/servers/Scripts/instances/questbattles/MatsubaMayhem.cpp index b300c2a0..4b535e4b 100644 --- a/src/servers/Scripts/instances/questbattles/MatsubaMayhem.cpp +++ b/src/servers/Scripts/instances/questbattles/MatsubaMayhem.cpp @@ -1,7 +1,7 @@ #include #include -using namespace Core; +using namespace Sapphire; class MatsubaMayhem : public Sapphire::ScriptAPI::InstanceContentScript diff --git a/src/servers/Scripts/instances/questbattles/Naadam.cpp b/src/servers/Scripts/instances/questbattles/Naadam.cpp index 24d86f58..57c3bfb6 100644 --- a/src/servers/Scripts/instances/questbattles/Naadam.cpp +++ b/src/servers/Scripts/instances/questbattles/Naadam.cpp @@ -1,7 +1,7 @@ #include #include -using namespace Core; +using namespace Sapphire; class Naadam : public Sapphire::ScriptAPI::InstanceContentScript diff --git a/src/servers/Scripts/instances/questbattles/OneLifeforOneWorld.cpp b/src/servers/Scripts/instances/questbattles/OneLifeforOneWorld.cpp index 04e19bcc..f1299596 100644 --- a/src/servers/Scripts/instances/questbattles/OneLifeforOneWorld.cpp +++ b/src/servers/Scripts/instances/questbattles/OneLifeforOneWorld.cpp @@ -1,7 +1,7 @@ #include #include -using namespace Core; +using namespace Sapphire; class OneLifeforOneWorld : public Sapphire::ScriptAPI::InstanceContentScript diff --git a/src/servers/Scripts/instances/questbattles/OurCompromise.cpp b/src/servers/Scripts/instances/questbattles/OurCompromise.cpp index d1a86fb4..0a8e24f7 100644 --- a/src/servers/Scripts/instances/questbattles/OurCompromise.cpp +++ b/src/servers/Scripts/instances/questbattles/OurCompromise.cpp @@ -1,7 +1,7 @@ #include #include -using namespace Core; +using namespace Sapphire; class OurCompromise : public Sapphire::ScriptAPI::InstanceContentScript diff --git a/src/servers/Scripts/instances/questbattles/OurUnsungHeroes.cpp b/src/servers/Scripts/instances/questbattles/OurUnsungHeroes.cpp index 1e8eead9..8af495da 100644 --- a/src/servers/Scripts/instances/questbattles/OurUnsungHeroes.cpp +++ b/src/servers/Scripts/instances/questbattles/OurUnsungHeroes.cpp @@ -1,7 +1,7 @@ #include #include -using namespace Core; +using namespace Sapphire; class OurUnsungHeroes : public Sapphire::ScriptAPI::InstanceContentScript diff --git a/src/servers/Scripts/instances/questbattles/RaisingtheSword.cpp b/src/servers/Scripts/instances/questbattles/RaisingtheSword.cpp index ece6cfa3..a93ce442 100644 --- a/src/servers/Scripts/instances/questbattles/RaisingtheSword.cpp +++ b/src/servers/Scripts/instances/questbattles/RaisingtheSword.cpp @@ -1,7 +1,7 @@ #include #include -using namespace Core; +using namespace Sapphire; class RaisingtheSword : public Sapphire::ScriptAPI::InstanceContentScript diff --git a/src/servers/Scripts/instances/questbattles/ReturnoftheBull.cpp b/src/servers/Scripts/instances/questbattles/ReturnoftheBull.cpp index ce800b13..3b78b442 100644 --- a/src/servers/Scripts/instances/questbattles/ReturnoftheBull.cpp +++ b/src/servers/Scripts/instances/questbattles/ReturnoftheBull.cpp @@ -1,7 +1,7 @@ #include #include -using namespace Core; +using namespace Sapphire; class ReturnoftheBull : public Sapphire::ScriptAPI::InstanceContentScript diff --git a/src/servers/Scripts/instances/questbattles/TheBattleonBekko.cpp b/src/servers/Scripts/instances/questbattles/TheBattleonBekko.cpp index 96279282..b722dbca 100644 --- a/src/servers/Scripts/instances/questbattles/TheBattleonBekko.cpp +++ b/src/servers/Scripts/instances/questbattles/TheBattleonBekko.cpp @@ -1,7 +1,7 @@ #include #include -using namespace Core; +using namespace Sapphire; class TheBattleonBekko : public Sapphire::ScriptAPI::InstanceContentScript diff --git a/src/servers/Scripts/instances/questbattles/TheCarteneauFlatsHeliodrome.cpp b/src/servers/Scripts/instances/questbattles/TheCarteneauFlatsHeliodrome.cpp index 6c5deaaf..0d9ca6a7 100644 --- a/src/servers/Scripts/instances/questbattles/TheCarteneauFlatsHeliodrome.cpp +++ b/src/servers/Scripts/instances/questbattles/TheCarteneauFlatsHeliodrome.cpp @@ -1,7 +1,7 @@ #include #include -using namespace Core; +using namespace Sapphire; class TheCarteneauFlatsHeliodrome : public Sapphire::ScriptAPI::InstanceContentScript diff --git a/src/servers/Scripts/instances/questbattles/TheFaceofTrueEvil.cpp b/src/servers/Scripts/instances/questbattles/TheFaceofTrueEvil.cpp index 66caf3cd..f1343594 100644 --- a/src/servers/Scripts/instances/questbattles/TheFaceofTrueEvil.cpp +++ b/src/servers/Scripts/instances/questbattles/TheFaceofTrueEvil.cpp @@ -1,7 +1,7 @@ #include #include -using namespace Core; +using namespace Sapphire; class TheFaceofTrueEvil : public Sapphire::ScriptAPI::InstanceContentScript diff --git a/src/servers/Scripts/instances/questbattles/TheHeartoftheProblem.cpp b/src/servers/Scripts/instances/questbattles/TheHeartoftheProblem.cpp index 9524aa55..c68ef053 100644 --- a/src/servers/Scripts/instances/questbattles/TheHeartoftheProblem.cpp +++ b/src/servers/Scripts/instances/questbattles/TheHeartoftheProblem.cpp @@ -1,7 +1,7 @@ #include #include -using namespace Core; +using namespace Sapphire; class TheHeartoftheProblem : public Sapphire::ScriptAPI::InstanceContentScript diff --git a/src/servers/Scripts/instances/questbattles/TheOrphansandtheBrokenBlade.cpp b/src/servers/Scripts/instances/questbattles/TheOrphansandtheBrokenBlade.cpp index 7fbc59da..ac159b51 100644 --- a/src/servers/Scripts/instances/questbattles/TheOrphansandtheBrokenBlade.cpp +++ b/src/servers/Scripts/instances/questbattles/TheOrphansandtheBrokenBlade.cpp @@ -1,7 +1,7 @@ #include #include -using namespace Core; +using namespace Sapphire; class TheOrphansandtheBrokenBlade : public Sapphire::ScriptAPI::InstanceContentScript diff --git a/src/servers/Scripts/instances/questbattles/TheResonant.cpp b/src/servers/Scripts/instances/questbattles/TheResonant.cpp index c09b35d1..6c9358a5 100644 --- a/src/servers/Scripts/instances/questbattles/TheResonant.cpp +++ b/src/servers/Scripts/instances/questbattles/TheResonant.cpp @@ -1,7 +1,7 @@ #include #include -using namespace Core; +using namespace Sapphire; class TheResonant : public Sapphire::ScriptAPI::InstanceContentScript diff --git a/src/servers/Scripts/instances/questbattles/WhenClansCollide.cpp b/src/servers/Scripts/instances/questbattles/WhenClansCollide.cpp index 78fae391..6a8e7791 100644 --- a/src/servers/Scripts/instances/questbattles/WhenClansCollide.cpp +++ b/src/servers/Scripts/instances/questbattles/WhenClansCollide.cpp @@ -1,7 +1,7 @@ #include #include -using namespace Core; +using namespace Sapphire; class WhenClansCollide : public Sapphire::ScriptAPI::InstanceContentScript diff --git a/src/servers/Scripts/instances/questbattles/WithHeartandSteel.cpp b/src/servers/Scripts/instances/questbattles/WithHeartandSteel.cpp index 8c0c3923..16bae070 100644 --- a/src/servers/Scripts/instances/questbattles/WithHeartandSteel.cpp +++ b/src/servers/Scripts/instances/questbattles/WithHeartandSteel.cpp @@ -1,7 +1,7 @@ #include #include -using namespace Core; +using namespace Sapphire; class WithHeartandSteel : public Sapphire::ScriptAPI::InstanceContentScript diff --git a/src/servers/Scripts/instances/raids/AlexanderTheArmoftheFather.cpp b/src/servers/Scripts/instances/raids/AlexanderTheArmoftheFather.cpp index b5161204..b3124ca8 100644 --- a/src/servers/Scripts/instances/raids/AlexanderTheArmoftheFather.cpp +++ b/src/servers/Scripts/instances/raids/AlexanderTheArmoftheFather.cpp @@ -1,7 +1,7 @@ #include #include -using namespace Core; +using namespace Sapphire; class AlexanderTheArmoftheFather : public Sapphire::ScriptAPI::InstanceContentScript diff --git a/src/servers/Scripts/instances/raids/AlexanderTheArmoftheFatherSavage.cpp b/src/servers/Scripts/instances/raids/AlexanderTheArmoftheFatherSavage.cpp index 02a980f8..ca4e6eee 100644 --- a/src/servers/Scripts/instances/raids/AlexanderTheArmoftheFatherSavage.cpp +++ b/src/servers/Scripts/instances/raids/AlexanderTheArmoftheFatherSavage.cpp @@ -1,7 +1,7 @@ #include #include -using namespace Core; +using namespace Sapphire; class AlexanderTheArmoftheFatherSavage : public Sapphire::ScriptAPI::InstanceContentScript diff --git a/src/servers/Scripts/instances/raids/AlexanderTheArmoftheSon.cpp b/src/servers/Scripts/instances/raids/AlexanderTheArmoftheSon.cpp index b6c952b2..952bfa8e 100644 --- a/src/servers/Scripts/instances/raids/AlexanderTheArmoftheSon.cpp +++ b/src/servers/Scripts/instances/raids/AlexanderTheArmoftheSon.cpp @@ -1,7 +1,7 @@ #include #include -using namespace Core; +using namespace Sapphire; class AlexanderTheArmoftheSon : public Sapphire::ScriptAPI::InstanceContentScript diff --git a/src/servers/Scripts/instances/raids/AlexanderTheArmoftheSonSavage.cpp b/src/servers/Scripts/instances/raids/AlexanderTheArmoftheSonSavage.cpp index 9164e297..b6f677ad 100644 --- a/src/servers/Scripts/instances/raids/AlexanderTheArmoftheSonSavage.cpp +++ b/src/servers/Scripts/instances/raids/AlexanderTheArmoftheSonSavage.cpp @@ -1,7 +1,7 @@ #include #include -using namespace Core; +using namespace Sapphire; class AlexanderTheArmoftheSonSavage : public Sapphire::ScriptAPI::InstanceContentScript diff --git a/src/servers/Scripts/instances/raids/AlexanderTheBreathoftheCreator.cpp b/src/servers/Scripts/instances/raids/AlexanderTheBreathoftheCreator.cpp index 6d0c95e9..92f71afb 100644 --- a/src/servers/Scripts/instances/raids/AlexanderTheBreathoftheCreator.cpp +++ b/src/servers/Scripts/instances/raids/AlexanderTheBreathoftheCreator.cpp @@ -1,7 +1,7 @@ #include #include -using namespace Core; +using namespace Sapphire; class AlexanderTheBreathoftheCreator : public Sapphire::ScriptAPI::InstanceContentScript diff --git a/src/servers/Scripts/instances/raids/AlexanderTheBreathoftheCreatorSavage.cpp b/src/servers/Scripts/instances/raids/AlexanderTheBreathoftheCreatorSavage.cpp index 858e3c06..86e2e353 100644 --- a/src/servers/Scripts/instances/raids/AlexanderTheBreathoftheCreatorSavage.cpp +++ b/src/servers/Scripts/instances/raids/AlexanderTheBreathoftheCreatorSavage.cpp @@ -1,7 +1,7 @@ #include #include -using namespace Core; +using namespace Sapphire; class AlexanderTheBreathoftheCreatorSavage : public Sapphire::ScriptAPI::InstanceContentScript diff --git a/src/servers/Scripts/instances/raids/AlexanderTheBurdenoftheFather.cpp b/src/servers/Scripts/instances/raids/AlexanderTheBurdenoftheFather.cpp index 282e906b..36779b87 100644 --- a/src/servers/Scripts/instances/raids/AlexanderTheBurdenoftheFather.cpp +++ b/src/servers/Scripts/instances/raids/AlexanderTheBurdenoftheFather.cpp @@ -1,7 +1,7 @@ #include #include -using namespace Core; +using namespace Sapphire; class AlexanderTheBurdenoftheFather : public Sapphire::ScriptAPI::InstanceContentScript diff --git a/src/servers/Scripts/instances/raids/AlexanderTheBurdenoftheFatherSavage.cpp b/src/servers/Scripts/instances/raids/AlexanderTheBurdenoftheFatherSavage.cpp index 9a90cb11..49416462 100644 --- a/src/servers/Scripts/instances/raids/AlexanderTheBurdenoftheFatherSavage.cpp +++ b/src/servers/Scripts/instances/raids/AlexanderTheBurdenoftheFatherSavage.cpp @@ -1,7 +1,7 @@ #include #include -using namespace Core; +using namespace Sapphire; class AlexanderTheBurdenoftheFatherSavage : public Sapphire::ScriptAPI::InstanceContentScript diff --git a/src/servers/Scripts/instances/raids/AlexanderTheBurdenoftheSon.cpp b/src/servers/Scripts/instances/raids/AlexanderTheBurdenoftheSon.cpp index 55e43cf9..bcb0e0a1 100644 --- a/src/servers/Scripts/instances/raids/AlexanderTheBurdenoftheSon.cpp +++ b/src/servers/Scripts/instances/raids/AlexanderTheBurdenoftheSon.cpp @@ -1,7 +1,7 @@ #include #include -using namespace Core; +using namespace Sapphire; class AlexanderTheBurdenoftheSon : public Sapphire::ScriptAPI::InstanceContentScript diff --git a/src/servers/Scripts/instances/raids/AlexanderTheBurdenoftheSonSavage.cpp b/src/servers/Scripts/instances/raids/AlexanderTheBurdenoftheSonSavage.cpp index c4590c74..0958d702 100644 --- a/src/servers/Scripts/instances/raids/AlexanderTheBurdenoftheSonSavage.cpp +++ b/src/servers/Scripts/instances/raids/AlexanderTheBurdenoftheSonSavage.cpp @@ -1,7 +1,7 @@ #include #include -using namespace Core; +using namespace Sapphire; class AlexanderTheBurdenoftheSonSavage : public Sapphire::ScriptAPI::InstanceContentScript diff --git a/src/servers/Scripts/instances/raids/AlexanderTheCuffoftheFather.cpp b/src/servers/Scripts/instances/raids/AlexanderTheCuffoftheFather.cpp index 8dd80f5c..83d7a3d7 100644 --- a/src/servers/Scripts/instances/raids/AlexanderTheCuffoftheFather.cpp +++ b/src/servers/Scripts/instances/raids/AlexanderTheCuffoftheFather.cpp @@ -1,7 +1,7 @@ #include #include -using namespace Core; +using namespace Sapphire; class AlexanderTheCuffoftheFather : public Sapphire::ScriptAPI::InstanceContentScript diff --git a/src/servers/Scripts/instances/raids/AlexanderTheCuffoftheFatherSavage.cpp b/src/servers/Scripts/instances/raids/AlexanderTheCuffoftheFatherSavage.cpp index b84bbe49..ce4d8868 100644 --- a/src/servers/Scripts/instances/raids/AlexanderTheCuffoftheFatherSavage.cpp +++ b/src/servers/Scripts/instances/raids/AlexanderTheCuffoftheFatherSavage.cpp @@ -1,7 +1,7 @@ #include #include -using namespace Core; +using namespace Sapphire; class AlexanderTheCuffoftheFatherSavage : public Sapphire::ScriptAPI::InstanceContentScript diff --git a/src/servers/Scripts/instances/raids/AlexanderTheCuffoftheSon.cpp b/src/servers/Scripts/instances/raids/AlexanderTheCuffoftheSon.cpp index 2f54eeae..e0009b2b 100644 --- a/src/servers/Scripts/instances/raids/AlexanderTheCuffoftheSon.cpp +++ b/src/servers/Scripts/instances/raids/AlexanderTheCuffoftheSon.cpp @@ -1,7 +1,7 @@ #include #include -using namespace Core; +using namespace Sapphire; class AlexanderTheCuffoftheSon : public Sapphire::ScriptAPI::InstanceContentScript diff --git a/src/servers/Scripts/instances/raids/AlexanderTheCuffoftheSonSavage.cpp b/src/servers/Scripts/instances/raids/AlexanderTheCuffoftheSonSavage.cpp index 7c90efa7..6d895dab 100644 --- a/src/servers/Scripts/instances/raids/AlexanderTheCuffoftheSonSavage.cpp +++ b/src/servers/Scripts/instances/raids/AlexanderTheCuffoftheSonSavage.cpp @@ -1,7 +1,7 @@ #include #include -using namespace Core; +using namespace Sapphire; class AlexanderTheCuffoftheSonSavage : public Sapphire::ScriptAPI::InstanceContentScript diff --git a/src/servers/Scripts/instances/raids/AlexanderTheEyesoftheCreator.cpp b/src/servers/Scripts/instances/raids/AlexanderTheEyesoftheCreator.cpp index 00aeb92c..5aeaee83 100644 --- a/src/servers/Scripts/instances/raids/AlexanderTheEyesoftheCreator.cpp +++ b/src/servers/Scripts/instances/raids/AlexanderTheEyesoftheCreator.cpp @@ -1,7 +1,7 @@ #include #include -using namespace Core; +using namespace Sapphire; class AlexanderTheEyesoftheCreator : public Sapphire::ScriptAPI::InstanceContentScript diff --git a/src/servers/Scripts/instances/raids/AlexanderTheEyesoftheCreatorSavage.cpp b/src/servers/Scripts/instances/raids/AlexanderTheEyesoftheCreatorSavage.cpp index 7793d5b1..662e11cc 100644 --- a/src/servers/Scripts/instances/raids/AlexanderTheEyesoftheCreatorSavage.cpp +++ b/src/servers/Scripts/instances/raids/AlexanderTheEyesoftheCreatorSavage.cpp @@ -1,7 +1,7 @@ #include #include -using namespace Core; +using namespace Sapphire; class AlexanderTheEyesoftheCreatorSavage : public Sapphire::ScriptAPI::InstanceContentScript diff --git a/src/servers/Scripts/instances/raids/AlexanderTheFistoftheFather.cpp b/src/servers/Scripts/instances/raids/AlexanderTheFistoftheFather.cpp index f9debc0a..fb984a7a 100644 --- a/src/servers/Scripts/instances/raids/AlexanderTheFistoftheFather.cpp +++ b/src/servers/Scripts/instances/raids/AlexanderTheFistoftheFather.cpp @@ -1,7 +1,7 @@ #include #include -using namespace Core; +using namespace Sapphire; class AlexanderTheFistoftheFather : public Sapphire::ScriptAPI::InstanceContentScript diff --git a/src/servers/Scripts/instances/raids/AlexanderTheFistoftheFatherSavage.cpp b/src/servers/Scripts/instances/raids/AlexanderTheFistoftheFatherSavage.cpp index 2428de47..9c67e0e0 100644 --- a/src/servers/Scripts/instances/raids/AlexanderTheFistoftheFatherSavage.cpp +++ b/src/servers/Scripts/instances/raids/AlexanderTheFistoftheFatherSavage.cpp @@ -1,7 +1,7 @@ #include #include -using namespace Core; +using namespace Sapphire; class AlexanderTheFistoftheFatherSavage : public Sapphire::ScriptAPI::InstanceContentScript diff --git a/src/servers/Scripts/instances/raids/AlexanderTheFistoftheSon.cpp b/src/servers/Scripts/instances/raids/AlexanderTheFistoftheSon.cpp index 3701bf2a..df385fe0 100644 --- a/src/servers/Scripts/instances/raids/AlexanderTheFistoftheSon.cpp +++ b/src/servers/Scripts/instances/raids/AlexanderTheFistoftheSon.cpp @@ -1,7 +1,7 @@ #include #include -using namespace Core; +using namespace Sapphire; class AlexanderTheFistoftheSon : public Sapphire::ScriptAPI::InstanceContentScript diff --git a/src/servers/Scripts/instances/raids/AlexanderTheFistoftheSonSavage.cpp b/src/servers/Scripts/instances/raids/AlexanderTheFistoftheSonSavage.cpp index ecf691c2..177cfe71 100644 --- a/src/servers/Scripts/instances/raids/AlexanderTheFistoftheSonSavage.cpp +++ b/src/servers/Scripts/instances/raids/AlexanderTheFistoftheSonSavage.cpp @@ -1,7 +1,7 @@ #include #include -using namespace Core; +using namespace Sapphire; class AlexanderTheFistoftheSonSavage : public Sapphire::ScriptAPI::InstanceContentScript diff --git a/src/servers/Scripts/instances/raids/AlexanderTheHeartoftheCreator.cpp b/src/servers/Scripts/instances/raids/AlexanderTheHeartoftheCreator.cpp index b11bea73..de5114be 100644 --- a/src/servers/Scripts/instances/raids/AlexanderTheHeartoftheCreator.cpp +++ b/src/servers/Scripts/instances/raids/AlexanderTheHeartoftheCreator.cpp @@ -1,7 +1,7 @@ #include #include -using namespace Core; +using namespace Sapphire; class AlexanderTheHeartoftheCreator : public Sapphire::ScriptAPI::InstanceContentScript diff --git a/src/servers/Scripts/instances/raids/AlexanderTheHeartoftheCreatorSavage.cpp b/src/servers/Scripts/instances/raids/AlexanderTheHeartoftheCreatorSavage.cpp index b75875f4..c448dd00 100644 --- a/src/servers/Scripts/instances/raids/AlexanderTheHeartoftheCreatorSavage.cpp +++ b/src/servers/Scripts/instances/raids/AlexanderTheHeartoftheCreatorSavage.cpp @@ -1,7 +1,7 @@ #include #include -using namespace Core; +using namespace Sapphire; class AlexanderTheHeartoftheCreatorSavage : public Sapphire::ScriptAPI::InstanceContentScript diff --git a/src/servers/Scripts/instances/raids/AlexanderTheSouloftheCreator.cpp b/src/servers/Scripts/instances/raids/AlexanderTheSouloftheCreator.cpp index 452d046c..4de86a8a 100644 --- a/src/servers/Scripts/instances/raids/AlexanderTheSouloftheCreator.cpp +++ b/src/servers/Scripts/instances/raids/AlexanderTheSouloftheCreator.cpp @@ -1,7 +1,7 @@ #include #include -using namespace Core; +using namespace Sapphire; class AlexanderTheSouloftheCreator : public Sapphire::ScriptAPI::InstanceContentScript diff --git a/src/servers/Scripts/instances/raids/AlexanderTheSouloftheCreatorSavage.cpp b/src/servers/Scripts/instances/raids/AlexanderTheSouloftheCreatorSavage.cpp index 2ec67e1f..e28013da 100644 --- a/src/servers/Scripts/instances/raids/AlexanderTheSouloftheCreatorSavage.cpp +++ b/src/servers/Scripts/instances/raids/AlexanderTheSouloftheCreatorSavage.cpp @@ -1,7 +1,7 @@ #include #include -using namespace Core; +using namespace Sapphire; class AlexanderTheSouloftheCreatorSavage : public Sapphire::ScriptAPI::InstanceContentScript diff --git a/src/servers/Scripts/instances/raids/DeltascapeV10.cpp b/src/servers/Scripts/instances/raids/DeltascapeV10.cpp index 68d9ba14..6ce0bbd0 100644 --- a/src/servers/Scripts/instances/raids/DeltascapeV10.cpp +++ b/src/servers/Scripts/instances/raids/DeltascapeV10.cpp @@ -1,7 +1,7 @@ #include #include -using namespace Core; +using namespace Sapphire; class DeltascapeV10 : public Sapphire::ScriptAPI::InstanceContentScript diff --git a/src/servers/Scripts/instances/raids/DeltascapeV10Savage.cpp b/src/servers/Scripts/instances/raids/DeltascapeV10Savage.cpp index 52bf199e..90355626 100644 --- a/src/servers/Scripts/instances/raids/DeltascapeV10Savage.cpp +++ b/src/servers/Scripts/instances/raids/DeltascapeV10Savage.cpp @@ -1,7 +1,7 @@ #include #include -using namespace Core; +using namespace Sapphire; class DeltascapeV10Savage : public Sapphire::ScriptAPI::InstanceContentScript diff --git a/src/servers/Scripts/instances/raids/DeltascapeV20.cpp b/src/servers/Scripts/instances/raids/DeltascapeV20.cpp index 910c47e2..091b80ae 100644 --- a/src/servers/Scripts/instances/raids/DeltascapeV20.cpp +++ b/src/servers/Scripts/instances/raids/DeltascapeV20.cpp @@ -1,7 +1,7 @@ #include #include -using namespace Core; +using namespace Sapphire; class DeltascapeV20 : public Sapphire::ScriptAPI::InstanceContentScript diff --git a/src/servers/Scripts/instances/raids/DeltascapeV20Savage.cpp b/src/servers/Scripts/instances/raids/DeltascapeV20Savage.cpp index a65efc62..4bdb703b 100644 --- a/src/servers/Scripts/instances/raids/DeltascapeV20Savage.cpp +++ b/src/servers/Scripts/instances/raids/DeltascapeV20Savage.cpp @@ -1,7 +1,7 @@ #include #include -using namespace Core; +using namespace Sapphire; class DeltascapeV20Savage : public Sapphire::ScriptAPI::InstanceContentScript diff --git a/src/servers/Scripts/instances/raids/DeltascapeV30.cpp b/src/servers/Scripts/instances/raids/DeltascapeV30.cpp index 56dae699..359a5006 100644 --- a/src/servers/Scripts/instances/raids/DeltascapeV30.cpp +++ b/src/servers/Scripts/instances/raids/DeltascapeV30.cpp @@ -1,7 +1,7 @@ #include #include -using namespace Core; +using namespace Sapphire; class DeltascapeV30 : public Sapphire::ScriptAPI::InstanceContentScript diff --git a/src/servers/Scripts/instances/raids/DeltascapeV30Savage.cpp b/src/servers/Scripts/instances/raids/DeltascapeV30Savage.cpp index ed6487f1..15da8045 100644 --- a/src/servers/Scripts/instances/raids/DeltascapeV30Savage.cpp +++ b/src/servers/Scripts/instances/raids/DeltascapeV30Savage.cpp @@ -1,7 +1,7 @@ #include #include -using namespace Core; +using namespace Sapphire; class DeltascapeV30Savage : public Sapphire::ScriptAPI::InstanceContentScript diff --git a/src/servers/Scripts/instances/raids/DeltascapeV40.cpp b/src/servers/Scripts/instances/raids/DeltascapeV40.cpp index be9f64b9..cb8bba6b 100644 --- a/src/servers/Scripts/instances/raids/DeltascapeV40.cpp +++ b/src/servers/Scripts/instances/raids/DeltascapeV40.cpp @@ -1,7 +1,7 @@ #include #include -using namespace Core; +using namespace Sapphire; class DeltascapeV40 : public Sapphire::ScriptAPI::InstanceContentScript diff --git a/src/servers/Scripts/instances/raids/DeltascapeV40Savage.cpp b/src/servers/Scripts/instances/raids/DeltascapeV40Savage.cpp index bd3f4d5b..feb2bea5 100644 --- a/src/servers/Scripts/instances/raids/DeltascapeV40Savage.cpp +++ b/src/servers/Scripts/instances/raids/DeltascapeV40Savage.cpp @@ -1,7 +1,7 @@ #include #include -using namespace Core; +using namespace Sapphire; class DeltascapeV40Savage : public Sapphire::ScriptAPI::InstanceContentScript diff --git a/src/servers/Scripts/instances/raids/DunScaith.cpp b/src/servers/Scripts/instances/raids/DunScaith.cpp index 06c8e9aa..3f35df35 100644 --- a/src/servers/Scripts/instances/raids/DunScaith.cpp +++ b/src/servers/Scripts/instances/raids/DunScaith.cpp @@ -1,7 +1,7 @@ #include #include -using namespace Core; +using namespace Sapphire; class DunScaith : public Sapphire::ScriptAPI::InstanceContentScript diff --git a/src/servers/Scripts/instances/raids/SigmascapeV10.cpp b/src/servers/Scripts/instances/raids/SigmascapeV10.cpp index d9608496..f0fe4820 100644 --- a/src/servers/Scripts/instances/raids/SigmascapeV10.cpp +++ b/src/servers/Scripts/instances/raids/SigmascapeV10.cpp @@ -1,7 +1,7 @@ #include #include -using namespace Core; +using namespace Sapphire; class SigmascapeV10 : public Sapphire::ScriptAPI::InstanceContentScript diff --git a/src/servers/Scripts/instances/raids/SigmascapeV10Savage.cpp b/src/servers/Scripts/instances/raids/SigmascapeV10Savage.cpp index 1e57ffcc..25648e9c 100644 --- a/src/servers/Scripts/instances/raids/SigmascapeV10Savage.cpp +++ b/src/servers/Scripts/instances/raids/SigmascapeV10Savage.cpp @@ -1,7 +1,7 @@ #include #include -using namespace Core; +using namespace Sapphire; class SigmascapeV10Savage : public Sapphire::ScriptAPI::InstanceContentScript diff --git a/src/servers/Scripts/instances/raids/SigmascapeV20.cpp b/src/servers/Scripts/instances/raids/SigmascapeV20.cpp index 605c83a0..e9a2474d 100644 --- a/src/servers/Scripts/instances/raids/SigmascapeV20.cpp +++ b/src/servers/Scripts/instances/raids/SigmascapeV20.cpp @@ -1,7 +1,7 @@ #include #include -using namespace Core; +using namespace Sapphire; class SigmascapeV20 : public Sapphire::ScriptAPI::InstanceContentScript diff --git a/src/servers/Scripts/instances/raids/SigmascapeV20Savage.cpp b/src/servers/Scripts/instances/raids/SigmascapeV20Savage.cpp index 9ee27657..ae51396f 100644 --- a/src/servers/Scripts/instances/raids/SigmascapeV20Savage.cpp +++ b/src/servers/Scripts/instances/raids/SigmascapeV20Savage.cpp @@ -1,7 +1,7 @@ #include #include -using namespace Core; +using namespace Sapphire; class SigmascapeV20Savage : public Sapphire::ScriptAPI::InstanceContentScript diff --git a/src/servers/Scripts/instances/raids/SigmascapeV30.cpp b/src/servers/Scripts/instances/raids/SigmascapeV30.cpp index 898e409f..9e27d9dd 100644 --- a/src/servers/Scripts/instances/raids/SigmascapeV30.cpp +++ b/src/servers/Scripts/instances/raids/SigmascapeV30.cpp @@ -1,7 +1,7 @@ #include #include -using namespace Core; +using namespace Sapphire; class SigmascapeV30 : public Sapphire::ScriptAPI::InstanceContentScript diff --git a/src/servers/Scripts/instances/raids/SigmascapeV30Savage.cpp b/src/servers/Scripts/instances/raids/SigmascapeV30Savage.cpp index 48e0c000..2a8c9f30 100644 --- a/src/servers/Scripts/instances/raids/SigmascapeV30Savage.cpp +++ b/src/servers/Scripts/instances/raids/SigmascapeV30Savage.cpp @@ -1,7 +1,7 @@ #include #include -using namespace Core; +using namespace Sapphire; class SigmascapeV30Savage : public Sapphire::ScriptAPI::InstanceContentScript diff --git a/src/servers/Scripts/instances/raids/SigmascapeV40.cpp b/src/servers/Scripts/instances/raids/SigmascapeV40.cpp index 303b1cb2..3dab868b 100644 --- a/src/servers/Scripts/instances/raids/SigmascapeV40.cpp +++ b/src/servers/Scripts/instances/raids/SigmascapeV40.cpp @@ -1,7 +1,7 @@ #include #include -using namespace Core; +using namespace Sapphire; class SigmascapeV40 : public Sapphire::ScriptAPI::InstanceContentScript diff --git a/src/servers/Scripts/instances/raids/SigmascapeV40Savage.cpp b/src/servers/Scripts/instances/raids/SigmascapeV40Savage.cpp index 4f78764e..121cb8f6 100644 --- a/src/servers/Scripts/instances/raids/SigmascapeV40Savage.cpp +++ b/src/servers/Scripts/instances/raids/SigmascapeV40Savage.cpp @@ -1,7 +1,7 @@ #include #include -using namespace Core; +using namespace Sapphire; class SigmascapeV40Savage : public Sapphire::ScriptAPI::InstanceContentScript diff --git a/src/servers/Scripts/instances/raids/SyrcusTower.cpp b/src/servers/Scripts/instances/raids/SyrcusTower.cpp index e70e9634..8765ecd4 100644 --- a/src/servers/Scripts/instances/raids/SyrcusTower.cpp +++ b/src/servers/Scripts/instances/raids/SyrcusTower.cpp @@ -1,7 +1,7 @@ #include #include -using namespace Core; +using namespace Sapphire; class SyrcusTower : public Sapphire::ScriptAPI::InstanceContentScript diff --git a/src/servers/Scripts/instances/raids/TheBindingCoilofBahamutTurn1.cpp b/src/servers/Scripts/instances/raids/TheBindingCoilofBahamutTurn1.cpp index 235b388f..913242d0 100644 --- a/src/servers/Scripts/instances/raids/TheBindingCoilofBahamutTurn1.cpp +++ b/src/servers/Scripts/instances/raids/TheBindingCoilofBahamutTurn1.cpp @@ -1,7 +1,7 @@ #include #include -using namespace Core; +using namespace Sapphire; class TheBindingCoilofBahamutTurn1 : public Sapphire::ScriptAPI::InstanceContentScript diff --git a/src/servers/Scripts/instances/raids/TheBindingCoilofBahamutTurn2.cpp b/src/servers/Scripts/instances/raids/TheBindingCoilofBahamutTurn2.cpp index a46be3e8..1857a95a 100644 --- a/src/servers/Scripts/instances/raids/TheBindingCoilofBahamutTurn2.cpp +++ b/src/servers/Scripts/instances/raids/TheBindingCoilofBahamutTurn2.cpp @@ -1,7 +1,7 @@ #include #include -using namespace Core; +using namespace Sapphire; class TheBindingCoilofBahamutTurn2 : public Sapphire::ScriptAPI::InstanceContentScript diff --git a/src/servers/Scripts/instances/raids/TheBindingCoilofBahamutTurn3.cpp b/src/servers/Scripts/instances/raids/TheBindingCoilofBahamutTurn3.cpp index 250b23bf..9627dea1 100644 --- a/src/servers/Scripts/instances/raids/TheBindingCoilofBahamutTurn3.cpp +++ b/src/servers/Scripts/instances/raids/TheBindingCoilofBahamutTurn3.cpp @@ -1,7 +1,7 @@ #include #include -using namespace Core; +using namespace Sapphire; class TheBindingCoilofBahamutTurn3 : public Sapphire::ScriptAPI::InstanceContentScript diff --git a/src/servers/Scripts/instances/raids/TheBindingCoilofBahamutTurn4.cpp b/src/servers/Scripts/instances/raids/TheBindingCoilofBahamutTurn4.cpp index 3d71d330..1d25869f 100644 --- a/src/servers/Scripts/instances/raids/TheBindingCoilofBahamutTurn4.cpp +++ b/src/servers/Scripts/instances/raids/TheBindingCoilofBahamutTurn4.cpp @@ -1,7 +1,7 @@ #include #include -using namespace Core; +using namespace Sapphire; class TheBindingCoilofBahamutTurn4 : public Sapphire::ScriptAPI::InstanceContentScript diff --git a/src/servers/Scripts/instances/raids/TheBindingCoilofBahamutTurn5.cpp b/src/servers/Scripts/instances/raids/TheBindingCoilofBahamutTurn5.cpp index ef292f8e..fda3a6a1 100644 --- a/src/servers/Scripts/instances/raids/TheBindingCoilofBahamutTurn5.cpp +++ b/src/servers/Scripts/instances/raids/TheBindingCoilofBahamutTurn5.cpp @@ -1,7 +1,7 @@ #include #include -using namespace Core; +using namespace Sapphire; class TheBindingCoilofBahamutTurn5 : public Sapphire::ScriptAPI::InstanceContentScript diff --git a/src/servers/Scripts/instances/raids/TheFinalCoilofBahamutTurn1.cpp b/src/servers/Scripts/instances/raids/TheFinalCoilofBahamutTurn1.cpp index 0b3389da..adf01465 100644 --- a/src/servers/Scripts/instances/raids/TheFinalCoilofBahamutTurn1.cpp +++ b/src/servers/Scripts/instances/raids/TheFinalCoilofBahamutTurn1.cpp @@ -1,7 +1,7 @@ #include #include -using namespace Core; +using namespace Sapphire; class TheFinalCoilofBahamutTurn1 : public Sapphire::ScriptAPI::InstanceContentScript diff --git a/src/servers/Scripts/instances/raids/TheFinalCoilofBahamutTurn2.cpp b/src/servers/Scripts/instances/raids/TheFinalCoilofBahamutTurn2.cpp index 9d92d87b..d20322c2 100644 --- a/src/servers/Scripts/instances/raids/TheFinalCoilofBahamutTurn2.cpp +++ b/src/servers/Scripts/instances/raids/TheFinalCoilofBahamutTurn2.cpp @@ -1,7 +1,7 @@ #include #include -using namespace Core; +using namespace Sapphire; class TheFinalCoilofBahamutTurn2 : public Sapphire::ScriptAPI::InstanceContentScript diff --git a/src/servers/Scripts/instances/raids/TheFinalCoilofBahamutTurn3.cpp b/src/servers/Scripts/instances/raids/TheFinalCoilofBahamutTurn3.cpp index 3e5c1293..e97e6e9c 100644 --- a/src/servers/Scripts/instances/raids/TheFinalCoilofBahamutTurn3.cpp +++ b/src/servers/Scripts/instances/raids/TheFinalCoilofBahamutTurn3.cpp @@ -1,7 +1,7 @@ #include #include -using namespace Core; +using namespace Sapphire; class TheFinalCoilofBahamutTurn3 : public Sapphire::ScriptAPI::InstanceContentScript diff --git a/src/servers/Scripts/instances/raids/TheFinalCoilofBahamutTurn4.cpp b/src/servers/Scripts/instances/raids/TheFinalCoilofBahamutTurn4.cpp index bb4a3fa2..a75576d2 100644 --- a/src/servers/Scripts/instances/raids/TheFinalCoilofBahamutTurn4.cpp +++ b/src/servers/Scripts/instances/raids/TheFinalCoilofBahamutTurn4.cpp @@ -1,7 +1,7 @@ #include #include -using namespace Core; +using namespace Sapphire; class TheFinalCoilofBahamutTurn4 : public Sapphire::ScriptAPI::InstanceContentScript diff --git a/src/servers/Scripts/instances/raids/TheLabyrinthoftheAncients.cpp b/src/servers/Scripts/instances/raids/TheLabyrinthoftheAncients.cpp index 4d5e5c5e..5c180590 100644 --- a/src/servers/Scripts/instances/raids/TheLabyrinthoftheAncients.cpp +++ b/src/servers/Scripts/instances/raids/TheLabyrinthoftheAncients.cpp @@ -1,7 +1,7 @@ #include #include -using namespace Core; +using namespace Sapphire; class TheLabyrinthoftheAncients : public Sapphire::ScriptAPI::InstanceContentScript diff --git a/src/servers/Scripts/instances/raids/TheRoyalCityofRabanastre.cpp b/src/servers/Scripts/instances/raids/TheRoyalCityofRabanastre.cpp index a10c2ffb..b2cf9842 100644 --- a/src/servers/Scripts/instances/raids/TheRoyalCityofRabanastre.cpp +++ b/src/servers/Scripts/instances/raids/TheRoyalCityofRabanastre.cpp @@ -1,7 +1,7 @@ #include #include -using namespace Core; +using namespace Sapphire; class TheRoyalCityofRabanastre : public Sapphire::ScriptAPI::InstanceContentScript diff --git a/src/servers/Scripts/instances/raids/TheSecondCoilofBahamutSavageTurn1.cpp b/src/servers/Scripts/instances/raids/TheSecondCoilofBahamutSavageTurn1.cpp index fae2b3fe..c46e1bff 100644 --- a/src/servers/Scripts/instances/raids/TheSecondCoilofBahamutSavageTurn1.cpp +++ b/src/servers/Scripts/instances/raids/TheSecondCoilofBahamutSavageTurn1.cpp @@ -1,7 +1,7 @@ #include #include -using namespace Core; +using namespace Sapphire; class TheSecondCoilofBahamutSavageTurn1 : public Sapphire::ScriptAPI::InstanceContentScript diff --git a/src/servers/Scripts/instances/raids/TheSecondCoilofBahamutSavageTurn2.cpp b/src/servers/Scripts/instances/raids/TheSecondCoilofBahamutSavageTurn2.cpp index f7b175c4..37ab7ff6 100644 --- a/src/servers/Scripts/instances/raids/TheSecondCoilofBahamutSavageTurn2.cpp +++ b/src/servers/Scripts/instances/raids/TheSecondCoilofBahamutSavageTurn2.cpp @@ -1,7 +1,7 @@ #include #include -using namespace Core; +using namespace Sapphire; class TheSecondCoilofBahamutSavageTurn2 : public Sapphire::ScriptAPI::InstanceContentScript diff --git a/src/servers/Scripts/instances/raids/TheSecondCoilofBahamutSavageTurn3.cpp b/src/servers/Scripts/instances/raids/TheSecondCoilofBahamutSavageTurn3.cpp index cb88270b..f5f6ae38 100644 --- a/src/servers/Scripts/instances/raids/TheSecondCoilofBahamutSavageTurn3.cpp +++ b/src/servers/Scripts/instances/raids/TheSecondCoilofBahamutSavageTurn3.cpp @@ -1,7 +1,7 @@ #include #include -using namespace Core; +using namespace Sapphire; class TheSecondCoilofBahamutSavageTurn3 : public Sapphire::ScriptAPI::InstanceContentScript diff --git a/src/servers/Scripts/instances/raids/TheSecondCoilofBahamutSavageTurn4.cpp b/src/servers/Scripts/instances/raids/TheSecondCoilofBahamutSavageTurn4.cpp index 610f265d..0f03e032 100644 --- a/src/servers/Scripts/instances/raids/TheSecondCoilofBahamutSavageTurn4.cpp +++ b/src/servers/Scripts/instances/raids/TheSecondCoilofBahamutSavageTurn4.cpp @@ -1,7 +1,7 @@ #include #include -using namespace Core; +using namespace Sapphire; class TheSecondCoilofBahamutSavageTurn4 : public Sapphire::ScriptAPI::InstanceContentScript diff --git a/src/servers/Scripts/instances/raids/TheSecondCoilofBahamutTurn1.cpp b/src/servers/Scripts/instances/raids/TheSecondCoilofBahamutTurn1.cpp index 4b4fed34..2283673f 100644 --- a/src/servers/Scripts/instances/raids/TheSecondCoilofBahamutTurn1.cpp +++ b/src/servers/Scripts/instances/raids/TheSecondCoilofBahamutTurn1.cpp @@ -1,7 +1,7 @@ #include #include -using namespace Core; +using namespace Sapphire; class TheSecondCoilofBahamutTurn1 : public Sapphire::ScriptAPI::InstanceContentScript diff --git a/src/servers/Scripts/instances/raids/TheSecondCoilofBahamutTurn2.cpp b/src/servers/Scripts/instances/raids/TheSecondCoilofBahamutTurn2.cpp index 4fb47af4..13e6481e 100644 --- a/src/servers/Scripts/instances/raids/TheSecondCoilofBahamutTurn2.cpp +++ b/src/servers/Scripts/instances/raids/TheSecondCoilofBahamutTurn2.cpp @@ -1,7 +1,7 @@ #include #include -using namespace Core; +using namespace Sapphire; class TheSecondCoilofBahamutTurn2 : public Sapphire::ScriptAPI::InstanceContentScript diff --git a/src/servers/Scripts/instances/raids/TheSecondCoilofBahamutTurn3.cpp b/src/servers/Scripts/instances/raids/TheSecondCoilofBahamutTurn3.cpp index c94efd60..e29ba451 100644 --- a/src/servers/Scripts/instances/raids/TheSecondCoilofBahamutTurn3.cpp +++ b/src/servers/Scripts/instances/raids/TheSecondCoilofBahamutTurn3.cpp @@ -1,7 +1,7 @@ #include #include -using namespace Core; +using namespace Sapphire; class TheSecondCoilofBahamutTurn3 : public Sapphire::ScriptAPI::InstanceContentScript diff --git a/src/servers/Scripts/instances/raids/TheSecondCoilofBahamutTurn4.cpp b/src/servers/Scripts/instances/raids/TheSecondCoilofBahamutTurn4.cpp index 8974b720..a853df26 100644 --- a/src/servers/Scripts/instances/raids/TheSecondCoilofBahamutTurn4.cpp +++ b/src/servers/Scripts/instances/raids/TheSecondCoilofBahamutTurn4.cpp @@ -1,7 +1,7 @@ #include #include -using namespace Core; +using namespace Sapphire; class TheSecondCoilofBahamutTurn4 : public Sapphire::ScriptAPI::InstanceContentScript diff --git a/src/servers/Scripts/instances/raids/TheUnendingCoilofBahamutUltimate.cpp b/src/servers/Scripts/instances/raids/TheUnendingCoilofBahamutUltimate.cpp index ec389f1f..dda7c9b8 100644 --- a/src/servers/Scripts/instances/raids/TheUnendingCoilofBahamutUltimate.cpp +++ b/src/servers/Scripts/instances/raids/TheUnendingCoilofBahamutUltimate.cpp @@ -1,7 +1,7 @@ #include #include -using namespace Core; +using namespace Sapphire; class TheUnendingCoilofBahamutUltimate : public Sapphire::ScriptAPI::InstanceContentScript diff --git a/src/servers/Scripts/instances/raids/TheVoidArk.cpp b/src/servers/Scripts/instances/raids/TheVoidArk.cpp index 86a6a9e7..c1eff79b 100644 --- a/src/servers/Scripts/instances/raids/TheVoidArk.cpp +++ b/src/servers/Scripts/instances/raids/TheVoidArk.cpp @@ -1,7 +1,7 @@ #include #include -using namespace Core; +using namespace Sapphire; class TheVoidArk : public Sapphire::ScriptAPI::InstanceContentScript diff --git a/src/servers/Scripts/instances/raids/TheWeaponsRefrainUltimate.cpp b/src/servers/Scripts/instances/raids/TheWeaponsRefrainUltimate.cpp index 67bd9aeb..7a3a6a88 100644 --- a/src/servers/Scripts/instances/raids/TheWeaponsRefrainUltimate.cpp +++ b/src/servers/Scripts/instances/raids/TheWeaponsRefrainUltimate.cpp @@ -1,7 +1,7 @@ #include #include -using namespace Core; +using namespace Sapphire; class TheWeaponsRefrainUltimate : public Sapphire::ScriptAPI::InstanceContentScript diff --git a/src/servers/Scripts/instances/raids/TheWeepingCityofMhach.cpp b/src/servers/Scripts/instances/raids/TheWeepingCityofMhach.cpp index 46a057e7..f335841f 100644 --- a/src/servers/Scripts/instances/raids/TheWeepingCityofMhach.cpp +++ b/src/servers/Scripts/instances/raids/TheWeepingCityofMhach.cpp @@ -1,7 +1,7 @@ #include #include -using namespace Core; +using namespace Sapphire; class TheWeepingCityofMhach : public Sapphire::ScriptAPI::InstanceContentScript diff --git a/src/servers/Scripts/instances/raids/TheWorldofDarkness.cpp b/src/servers/Scripts/instances/raids/TheWorldofDarkness.cpp index fbc4df00..43abeaf4 100644 --- a/src/servers/Scripts/instances/raids/TheWorldofDarkness.cpp +++ b/src/servers/Scripts/instances/raids/TheWorldofDarkness.cpp @@ -1,7 +1,7 @@ #include #include -using namespace Core; +using namespace Sapphire; class TheWorldofDarkness : public Sapphire::ScriptAPI::InstanceContentScript diff --git a/src/servers/Scripts/instances/treasurehunt/TheAquapolis.cpp b/src/servers/Scripts/instances/treasurehunt/TheAquapolis.cpp index bc94deb6..c298bbc9 100644 --- a/src/servers/Scripts/instances/treasurehunt/TheAquapolis.cpp +++ b/src/servers/Scripts/instances/treasurehunt/TheAquapolis.cpp @@ -1,7 +1,7 @@ #include #include -using namespace Core; +using namespace Sapphire; class TheAquapolis : public Sapphire::ScriptAPI::InstanceContentScript diff --git a/src/servers/Scripts/instances/treasurehunt/TheHiddenCanalsofUznair.cpp b/src/servers/Scripts/instances/treasurehunt/TheHiddenCanalsofUznair.cpp index 64f769bd..34783087 100644 --- a/src/servers/Scripts/instances/treasurehunt/TheHiddenCanalsofUznair.cpp +++ b/src/servers/Scripts/instances/treasurehunt/TheHiddenCanalsofUznair.cpp @@ -1,7 +1,7 @@ #include #include -using namespace Core; +using namespace Sapphire; class TheHiddenCanalsofUznair : public Sapphire::ScriptAPI::InstanceContentScript diff --git a/src/servers/Scripts/instances/treasurehunt/TheLostCanalsofUznair.cpp b/src/servers/Scripts/instances/treasurehunt/TheLostCanalsofUznair.cpp index 3005ce36..73c2eb16 100644 --- a/src/servers/Scripts/instances/treasurehunt/TheLostCanalsofUznair.cpp +++ b/src/servers/Scripts/instances/treasurehunt/TheLostCanalsofUznair.cpp @@ -1,7 +1,7 @@ #include #include -using namespace Core; +using namespace Sapphire; class TheLostCanalsofUznair : public Sapphire::ScriptAPI::InstanceContentScript diff --git a/src/servers/Scripts/instances/trials/ARelicReborntheChimera.cpp b/src/servers/Scripts/instances/trials/ARelicReborntheChimera.cpp index 4b5c2d2f..e723ce21 100644 --- a/src/servers/Scripts/instances/trials/ARelicReborntheChimera.cpp +++ b/src/servers/Scripts/instances/trials/ARelicReborntheChimera.cpp @@ -1,7 +1,7 @@ #include #include -using namespace Core; +using namespace Sapphire; class ARelicReborntheChimera : public Sapphire::ScriptAPI::InstanceContentScript diff --git a/src/servers/Scripts/instances/trials/ARelicReborntheHydra.cpp b/src/servers/Scripts/instances/trials/ARelicReborntheHydra.cpp index fe590f66..943dc3bd 100644 --- a/src/servers/Scripts/instances/trials/ARelicReborntheHydra.cpp +++ b/src/servers/Scripts/instances/trials/ARelicReborntheHydra.cpp @@ -1,7 +1,7 @@ #include #include -using namespace Core; +using namespace Sapphire; class ARelicReborntheHydra : public Sapphire::ScriptAPI::InstanceContentScript diff --git a/src/servers/Scripts/instances/trials/AkhAfahAmphitheatreExtreme.cpp b/src/servers/Scripts/instances/trials/AkhAfahAmphitheatreExtreme.cpp index 0fcac9c1..113102bd 100644 --- a/src/servers/Scripts/instances/trials/AkhAfahAmphitheatreExtreme.cpp +++ b/src/servers/Scripts/instances/trials/AkhAfahAmphitheatreExtreme.cpp @@ -1,7 +1,7 @@ #include #include -using namespace Core; +using namespace Sapphire; class AkhAfahAmphitheatreExtreme : public Sapphire::ScriptAPI::InstanceContentScript { diff --git a/src/servers/Scripts/instances/trials/AkhAfahAmphitheatreHard.cpp b/src/servers/Scripts/instances/trials/AkhAfahAmphitheatreHard.cpp index 7147090a..0369c236 100644 --- a/src/servers/Scripts/instances/trials/AkhAfahAmphitheatreHard.cpp +++ b/src/servers/Scripts/instances/trials/AkhAfahAmphitheatreHard.cpp @@ -1,7 +1,7 @@ #include #include -using namespace Core; +using namespace Sapphire; class AkhAfahAmphitheatreHard : public Sapphire::ScriptAPI::InstanceContentScript diff --git a/src/servers/Scripts/instances/trials/BattleintheBigKeep.cpp b/src/servers/Scripts/instances/trials/BattleintheBigKeep.cpp index 3e283f09..e7664c65 100644 --- a/src/servers/Scripts/instances/trials/BattleintheBigKeep.cpp +++ b/src/servers/Scripts/instances/trials/BattleintheBigKeep.cpp @@ -1,7 +1,7 @@ #include #include -using namespace Core; +using namespace Sapphire; class BattleintheBigKeep : public Sapphire::ScriptAPI::InstanceContentScript diff --git a/src/servers/Scripts/instances/trials/BattleontheBigBridge.cpp b/src/servers/Scripts/instances/trials/BattleontheBigBridge.cpp index 26fb633b..d45d1660 100644 --- a/src/servers/Scripts/instances/trials/BattleontheBigBridge.cpp +++ b/src/servers/Scripts/instances/trials/BattleontheBigBridge.cpp @@ -1,7 +1,7 @@ #include #include -using namespace Core; +using namespace Sapphire; class BattleontheBigBridge : public Sapphire::ScriptAPI::InstanceContentScript diff --git a/src/servers/Scripts/instances/trials/CapeWestwind.cpp b/src/servers/Scripts/instances/trials/CapeWestwind.cpp index d67714e2..031c54d9 100644 --- a/src/servers/Scripts/instances/trials/CapeWestwind.cpp +++ b/src/servers/Scripts/instances/trials/CapeWestwind.cpp @@ -1,7 +1,7 @@ #include #include -using namespace Core; +using namespace Sapphire; class CapeWestwind : public Sapphire::ScriptAPI::InstanceContentScript diff --git a/src/servers/Scripts/instances/trials/ContainmentBayP1T6.cpp b/src/servers/Scripts/instances/trials/ContainmentBayP1T6.cpp index 931f5d90..50a6a203 100644 --- a/src/servers/Scripts/instances/trials/ContainmentBayP1T6.cpp +++ b/src/servers/Scripts/instances/trials/ContainmentBayP1T6.cpp @@ -1,7 +1,7 @@ #include #include -using namespace Core; +using namespace Sapphire; class ContainmentBayP1T6 : public Sapphire::ScriptAPI::InstanceContentScript diff --git a/src/servers/Scripts/instances/trials/ContainmentBayP1T6Extreme.cpp b/src/servers/Scripts/instances/trials/ContainmentBayP1T6Extreme.cpp index 2595a99f..5f25e2d6 100644 --- a/src/servers/Scripts/instances/trials/ContainmentBayP1T6Extreme.cpp +++ b/src/servers/Scripts/instances/trials/ContainmentBayP1T6Extreme.cpp @@ -1,7 +1,7 @@ #include #include -using namespace Core; +using namespace Sapphire; class ContainmentBayP1T6Extreme : public Sapphire::ScriptAPI::InstanceContentScript diff --git a/src/servers/Scripts/instances/trials/ContainmentBayS1T7.cpp b/src/servers/Scripts/instances/trials/ContainmentBayS1T7.cpp index b0ec25d9..6b68e282 100644 --- a/src/servers/Scripts/instances/trials/ContainmentBayS1T7.cpp +++ b/src/servers/Scripts/instances/trials/ContainmentBayS1T7.cpp @@ -1,7 +1,7 @@ #include #include -using namespace Core; +using namespace Sapphire; class ContainmentBayS1T7 : public Sapphire::ScriptAPI::InstanceContentScript diff --git a/src/servers/Scripts/instances/trials/ContainmentBayS1T7Extreme.cpp b/src/servers/Scripts/instances/trials/ContainmentBayS1T7Extreme.cpp index 846bb7bc..2b5985a5 100644 --- a/src/servers/Scripts/instances/trials/ContainmentBayS1T7Extreme.cpp +++ b/src/servers/Scripts/instances/trials/ContainmentBayS1T7Extreme.cpp @@ -1,7 +1,7 @@ #include #include -using namespace Core; +using namespace Sapphire; class ContainmentBayS1T7Extreme : public Sapphire::ScriptAPI::InstanceContentScript diff --git a/src/servers/Scripts/instances/trials/ContainmentBayZ1T9.cpp b/src/servers/Scripts/instances/trials/ContainmentBayZ1T9.cpp index d7d6f352..14b73206 100644 --- a/src/servers/Scripts/instances/trials/ContainmentBayZ1T9.cpp +++ b/src/servers/Scripts/instances/trials/ContainmentBayZ1T9.cpp @@ -1,7 +1,7 @@ #include #include -using namespace Core; +using namespace Sapphire; class ContainmentBayZ1T9 : public Sapphire::ScriptAPI::InstanceContentScript diff --git a/src/servers/Scripts/instances/trials/ContainmentBayZ1T9Extreme.cpp b/src/servers/Scripts/instances/trials/ContainmentBayZ1T9Extreme.cpp index 2ecd9f20..ec54c2c2 100644 --- a/src/servers/Scripts/instances/trials/ContainmentBayZ1T9Extreme.cpp +++ b/src/servers/Scripts/instances/trials/ContainmentBayZ1T9Extreme.cpp @@ -1,7 +1,7 @@ #include #include -using namespace Core; +using namespace Sapphire; class ContainmentBayZ1T9Extreme : public Sapphire::ScriptAPI::InstanceContentScript diff --git a/src/servers/Scripts/instances/trials/Emanation.cpp b/src/servers/Scripts/instances/trials/Emanation.cpp index 6860ffcb..c5789df5 100644 --- a/src/servers/Scripts/instances/trials/Emanation.cpp +++ b/src/servers/Scripts/instances/trials/Emanation.cpp @@ -1,7 +1,7 @@ #include #include -using namespace Core; +using namespace Sapphire; class Emanation : public Sapphire::ScriptAPI::InstanceContentScript diff --git a/src/servers/Scripts/instances/trials/EmanationExtreme.cpp b/src/servers/Scripts/instances/trials/EmanationExtreme.cpp index 8bfefb1e..359e9302 100644 --- a/src/servers/Scripts/instances/trials/EmanationExtreme.cpp +++ b/src/servers/Scripts/instances/trials/EmanationExtreme.cpp @@ -1,7 +1,7 @@ #include #include -using namespace Core; +using namespace Sapphire; class EmanationExtreme : public Sapphire::ScriptAPI::InstanceContentScript diff --git a/src/servers/Scripts/instances/trials/SpecialEventI.cpp b/src/servers/Scripts/instances/trials/SpecialEventI.cpp index 8945086d..943212d2 100644 --- a/src/servers/Scripts/instances/trials/SpecialEventI.cpp +++ b/src/servers/Scripts/instances/trials/SpecialEventI.cpp @@ -1,7 +1,7 @@ #include #include -using namespace Core; +using namespace Sapphire; class SpecialEventI : public Sapphire::ScriptAPI::InstanceContentScript diff --git a/src/servers/Scripts/instances/trials/SpecialEventII.cpp b/src/servers/Scripts/instances/trials/SpecialEventII.cpp index 450976b7..f1ffca66 100644 --- a/src/servers/Scripts/instances/trials/SpecialEventII.cpp +++ b/src/servers/Scripts/instances/trials/SpecialEventII.cpp @@ -1,7 +1,7 @@ #include #include -using namespace Core; +using namespace Sapphire; class SpecialEventII : public Sapphire::ScriptAPI::InstanceContentScript diff --git a/src/servers/Scripts/instances/trials/SpecialEventIII.cpp b/src/servers/Scripts/instances/trials/SpecialEventIII.cpp index d0a8a2ca..9b5e370f 100644 --- a/src/servers/Scripts/instances/trials/SpecialEventIII.cpp +++ b/src/servers/Scripts/instances/trials/SpecialEventIII.cpp @@ -1,7 +1,7 @@ #include #include -using namespace Core; +using namespace Sapphire; class SpecialEventIII : public Sapphire::ScriptAPI::InstanceContentScript diff --git a/src/servers/Scripts/instances/trials/TheBowlofEmbers.cpp b/src/servers/Scripts/instances/trials/TheBowlofEmbers.cpp index 6f8c70b0..e802a901 100644 --- a/src/servers/Scripts/instances/trials/TheBowlofEmbers.cpp +++ b/src/servers/Scripts/instances/trials/TheBowlofEmbers.cpp @@ -1,7 +1,7 @@ #include #include -using namespace Core; +using namespace Sapphire; class TheBowlofEmbers : public Sapphire::ScriptAPI::InstanceContentScript diff --git a/src/servers/Scripts/instances/trials/TheBowlofEmbersExtreme.cpp b/src/servers/Scripts/instances/trials/TheBowlofEmbersExtreme.cpp index 22b137ee..496d6d47 100644 --- a/src/servers/Scripts/instances/trials/TheBowlofEmbersExtreme.cpp +++ b/src/servers/Scripts/instances/trials/TheBowlofEmbersExtreme.cpp @@ -1,7 +1,7 @@ #include #include -using namespace Core; +using namespace Sapphire; class TheBowlofEmbersExtreme : public Sapphire::ScriptAPI::InstanceContentScript diff --git a/src/servers/Scripts/instances/trials/TheBowlofEmbersHard.cpp b/src/servers/Scripts/instances/trials/TheBowlofEmbersHard.cpp index 6b9408cf..d6743f4d 100644 --- a/src/servers/Scripts/instances/trials/TheBowlofEmbersHard.cpp +++ b/src/servers/Scripts/instances/trials/TheBowlofEmbersHard.cpp @@ -1,7 +1,7 @@ #include #include -using namespace Core; +using namespace Sapphire; class TheBowlofEmbersHard : public Sapphire::ScriptAPI::InstanceContentScript diff --git a/src/servers/Scripts/instances/trials/TheChrysalis.cpp b/src/servers/Scripts/instances/trials/TheChrysalis.cpp index 57adf3ca..c986cf1c 100644 --- a/src/servers/Scripts/instances/trials/TheChrysalis.cpp +++ b/src/servers/Scripts/instances/trials/TheChrysalis.cpp @@ -1,7 +1,7 @@ #include #include -using namespace Core; +using namespace Sapphire; class TheChrysalis : public Sapphire::ScriptAPI::InstanceContentScript diff --git a/src/servers/Scripts/instances/trials/TheDragonsNeck.cpp b/src/servers/Scripts/instances/trials/TheDragonsNeck.cpp index bd9762ec..a07a73e6 100644 --- a/src/servers/Scripts/instances/trials/TheDragonsNeck.cpp +++ b/src/servers/Scripts/instances/trials/TheDragonsNeck.cpp @@ -1,7 +1,7 @@ #include #include -using namespace Core; +using namespace Sapphire; class TheDragonsNeck : public Sapphire::ScriptAPI::InstanceContentScript diff --git a/src/servers/Scripts/instances/trials/TheFinalStepsofFaith.cpp b/src/servers/Scripts/instances/trials/TheFinalStepsofFaith.cpp index 0900ff1f..1fb8d69f 100644 --- a/src/servers/Scripts/instances/trials/TheFinalStepsofFaith.cpp +++ b/src/servers/Scripts/instances/trials/TheFinalStepsofFaith.cpp @@ -1,7 +1,7 @@ #include #include -using namespace Core; +using namespace Sapphire; class TheFinalStepsofFaith : public Sapphire::ScriptAPI::InstanceContentScript diff --git a/src/servers/Scripts/instances/trials/TheHowlingEye.cpp b/src/servers/Scripts/instances/trials/TheHowlingEye.cpp index 5fc19232..3daf3251 100644 --- a/src/servers/Scripts/instances/trials/TheHowlingEye.cpp +++ b/src/servers/Scripts/instances/trials/TheHowlingEye.cpp @@ -1,7 +1,7 @@ #include #include -using namespace Core; +using namespace Sapphire; class TheHowlingEye : public Sapphire::ScriptAPI::InstanceContentScript diff --git a/src/servers/Scripts/instances/trials/TheHowlingEyeExtreme.cpp b/src/servers/Scripts/instances/trials/TheHowlingEyeExtreme.cpp index fbeead31..3f6d66d8 100644 --- a/src/servers/Scripts/instances/trials/TheHowlingEyeExtreme.cpp +++ b/src/servers/Scripts/instances/trials/TheHowlingEyeExtreme.cpp @@ -1,7 +1,7 @@ #include #include -using namespace Core; +using namespace Sapphire; class TheHowlingEyeExtreme : public Sapphire::ScriptAPI::InstanceContentScript diff --git a/src/servers/Scripts/instances/trials/TheHowlingEyeHard.cpp b/src/servers/Scripts/instances/trials/TheHowlingEyeHard.cpp index 1f301b38..7dd4dbeb 100644 --- a/src/servers/Scripts/instances/trials/TheHowlingEyeHard.cpp +++ b/src/servers/Scripts/instances/trials/TheHowlingEyeHard.cpp @@ -1,7 +1,7 @@ #include #include -using namespace Core; +using namespace Sapphire; class TheHowlingEyeHard : public Sapphire::ScriptAPI::InstanceContentScript diff --git a/src/servers/Scripts/instances/trials/TheJadeStoa.cpp b/src/servers/Scripts/instances/trials/TheJadeStoa.cpp index 52d2ed64..99436ffc 100644 --- a/src/servers/Scripts/instances/trials/TheJadeStoa.cpp +++ b/src/servers/Scripts/instances/trials/TheJadeStoa.cpp @@ -1,7 +1,7 @@ #include #include -using namespace Core; +using namespace Sapphire; class TheJadeStoa : public Sapphire::ScriptAPI::InstanceContentScript diff --git a/src/servers/Scripts/instances/trials/TheJadeStoaExtreme.cpp b/src/servers/Scripts/instances/trials/TheJadeStoaExtreme.cpp index 8b4f1857..f43329d5 100644 --- a/src/servers/Scripts/instances/trials/TheJadeStoaExtreme.cpp +++ b/src/servers/Scripts/instances/trials/TheJadeStoaExtreme.cpp @@ -1,7 +1,7 @@ #include #include -using namespace Core; +using namespace Sapphire; class TheJadeStoaExtreme : public Sapphire::ScriptAPI::InstanceContentScript diff --git a/src/servers/Scripts/instances/trials/TheLimitlessBlueExtreme.cpp b/src/servers/Scripts/instances/trials/TheLimitlessBlueExtreme.cpp index 4d869a19..4b4eb5ee 100644 --- a/src/servers/Scripts/instances/trials/TheLimitlessBlueExtreme.cpp +++ b/src/servers/Scripts/instances/trials/TheLimitlessBlueExtreme.cpp @@ -1,7 +1,7 @@ #include #include -using namespace Core; +using namespace Sapphire; class TheLimitlessBlueExtreme : public Sapphire::ScriptAPI::InstanceContentScript diff --git a/src/servers/Scripts/instances/trials/TheLimitlessBlueHard.cpp b/src/servers/Scripts/instances/trials/TheLimitlessBlueHard.cpp index c1bf0dd8..bcb090e0 100644 --- a/src/servers/Scripts/instances/trials/TheLimitlessBlueHard.cpp +++ b/src/servers/Scripts/instances/trials/TheLimitlessBlueHard.cpp @@ -1,7 +1,7 @@ #include #include -using namespace Core; +using namespace Sapphire; class TheLimitlessBlueHard : public Sapphire::ScriptAPI::InstanceContentScript diff --git a/src/servers/Scripts/instances/trials/TheMinstrelsBalladNidhoggsRage.cpp b/src/servers/Scripts/instances/trials/TheMinstrelsBalladNidhoggsRage.cpp index 7600ef70..b28494b4 100644 --- a/src/servers/Scripts/instances/trials/TheMinstrelsBalladNidhoggsRage.cpp +++ b/src/servers/Scripts/instances/trials/TheMinstrelsBalladNidhoggsRage.cpp @@ -1,7 +1,7 @@ #include #include -using namespace Core; +using namespace Sapphire; class TheMinstrelsBalladNidhoggsRage : public Sapphire::ScriptAPI::InstanceContentScript diff --git a/src/servers/Scripts/instances/trials/TheMinstrelsBalladShinryusDomain.cpp b/src/servers/Scripts/instances/trials/TheMinstrelsBalladShinryusDomain.cpp index 1cde1c30..74b8c11e 100644 --- a/src/servers/Scripts/instances/trials/TheMinstrelsBalladShinryusDomain.cpp +++ b/src/servers/Scripts/instances/trials/TheMinstrelsBalladShinryusDomain.cpp @@ -1,7 +1,7 @@ #include #include -using namespace Core; +using namespace Sapphire; class TheMinstrelsBalladShinryusDomain : public Sapphire::ScriptAPI::InstanceContentScript diff --git a/src/servers/Scripts/instances/trials/TheMinstrelsBalladThordansReign.cpp b/src/servers/Scripts/instances/trials/TheMinstrelsBalladThordansReign.cpp index bd67a04f..966bd77f 100644 --- a/src/servers/Scripts/instances/trials/TheMinstrelsBalladThordansReign.cpp +++ b/src/servers/Scripts/instances/trials/TheMinstrelsBalladThordansReign.cpp @@ -1,7 +1,7 @@ #include #include -using namespace Core; +using namespace Sapphire; class TheMinstrelsBalladThordansReign : public Sapphire::ScriptAPI::InstanceContentScript diff --git a/src/servers/Scripts/instances/trials/TheMinstrelsBalladUltimasBane.cpp b/src/servers/Scripts/instances/trials/TheMinstrelsBalladUltimasBane.cpp index 9b2a0c87..79fa4e89 100644 --- a/src/servers/Scripts/instances/trials/TheMinstrelsBalladUltimasBane.cpp +++ b/src/servers/Scripts/instances/trials/TheMinstrelsBalladUltimasBane.cpp @@ -1,7 +1,7 @@ #include #include -using namespace Core; +using namespace Sapphire; class TheMinstrelsBalladUltimasBane : public Sapphire::ScriptAPI::InstanceContentScript diff --git a/src/servers/Scripts/instances/trials/TheNavel.cpp b/src/servers/Scripts/instances/trials/TheNavel.cpp index 6daf15f3..cab03b0c 100644 --- a/src/servers/Scripts/instances/trials/TheNavel.cpp +++ b/src/servers/Scripts/instances/trials/TheNavel.cpp @@ -1,7 +1,7 @@ #include #include -using namespace Core; +using namespace Sapphire; class TheNavel : public Sapphire::ScriptAPI::InstanceContentScript diff --git a/src/servers/Scripts/instances/trials/TheNavelExtreme.cpp b/src/servers/Scripts/instances/trials/TheNavelExtreme.cpp index 145dc1cf..191aa768 100644 --- a/src/servers/Scripts/instances/trials/TheNavelExtreme.cpp +++ b/src/servers/Scripts/instances/trials/TheNavelExtreme.cpp @@ -1,7 +1,7 @@ #include #include -using namespace Core; +using namespace Sapphire; class TheNavelExtreme : public Sapphire::ScriptAPI::InstanceContentScript diff --git a/src/servers/Scripts/instances/trials/TheNavelHard.cpp b/src/servers/Scripts/instances/trials/TheNavelHard.cpp index 2f7f601a..22ae7441 100644 --- a/src/servers/Scripts/instances/trials/TheNavelHard.cpp +++ b/src/servers/Scripts/instances/trials/TheNavelHard.cpp @@ -1,7 +1,7 @@ #include #include -using namespace Core; +using namespace Sapphire; class TheNavelHard : public Sapphire::ScriptAPI::InstanceContentScript diff --git a/src/servers/Scripts/instances/trials/ThePoolofTribute.cpp b/src/servers/Scripts/instances/trials/ThePoolofTribute.cpp index cba40367..203a34b7 100644 --- a/src/servers/Scripts/instances/trials/ThePoolofTribute.cpp +++ b/src/servers/Scripts/instances/trials/ThePoolofTribute.cpp @@ -1,7 +1,7 @@ #include #include -using namespace Core; +using namespace Sapphire; class ThePoolofTribute : public Sapphire::ScriptAPI::InstanceContentScript diff --git a/src/servers/Scripts/instances/trials/ThePoolofTributeExtreme.cpp b/src/servers/Scripts/instances/trials/ThePoolofTributeExtreme.cpp index 8b65f471..e9141ff0 100644 --- a/src/servers/Scripts/instances/trials/ThePoolofTributeExtreme.cpp +++ b/src/servers/Scripts/instances/trials/ThePoolofTributeExtreme.cpp @@ -1,7 +1,7 @@ #include #include -using namespace Core; +using namespace Sapphire; class ThePoolofTributeExtreme : public Sapphire::ScriptAPI::InstanceContentScript diff --git a/src/servers/Scripts/instances/trials/TheRoyalMenagerie.cpp b/src/servers/Scripts/instances/trials/TheRoyalMenagerie.cpp index c16d50b4..e7581de5 100644 --- a/src/servers/Scripts/instances/trials/TheRoyalMenagerie.cpp +++ b/src/servers/Scripts/instances/trials/TheRoyalMenagerie.cpp @@ -1,7 +1,7 @@ #include #include -using namespace Core; +using namespace Sapphire; class TheRoyalMenagerie : public Sapphire::ScriptAPI::InstanceContentScript diff --git a/src/servers/Scripts/instances/trials/TheSingularityReactor.cpp b/src/servers/Scripts/instances/trials/TheSingularityReactor.cpp index 910219c4..23afa8e6 100644 --- a/src/servers/Scripts/instances/trials/TheSingularityReactor.cpp +++ b/src/servers/Scripts/instances/trials/TheSingularityReactor.cpp @@ -1,7 +1,7 @@ #include #include -using namespace Core; +using namespace Sapphire; class TheSingularityReactor : public Sapphire::ScriptAPI::InstanceContentScript diff --git a/src/servers/Scripts/instances/trials/TheStepsofFaith.cpp b/src/servers/Scripts/instances/trials/TheStepsofFaith.cpp index a0253e07..4c394631 100644 --- a/src/servers/Scripts/instances/trials/TheStepsofFaith.cpp +++ b/src/servers/Scripts/instances/trials/TheStepsofFaith.cpp @@ -1,7 +1,7 @@ #include #include -using namespace Core; +using namespace Sapphire; class TheStepsofFaith : public Sapphire::ScriptAPI::InstanceContentScript diff --git a/src/servers/Scripts/instances/trials/TheStrikingTreeExtreme.cpp b/src/servers/Scripts/instances/trials/TheStrikingTreeExtreme.cpp index b0a48eb0..a8977105 100644 --- a/src/servers/Scripts/instances/trials/TheStrikingTreeExtreme.cpp +++ b/src/servers/Scripts/instances/trials/TheStrikingTreeExtreme.cpp @@ -1,7 +1,7 @@ #include #include -using namespace Core; +using namespace Sapphire; class TheStrikingTreeExtreme : public Sapphire::ScriptAPI::InstanceContentScript diff --git a/src/servers/Scripts/instances/trials/TheStrikingTreeHard.cpp b/src/servers/Scripts/instances/trials/TheStrikingTreeHard.cpp index fe3245ee..794d6ffe 100644 --- a/src/servers/Scripts/instances/trials/TheStrikingTreeHard.cpp +++ b/src/servers/Scripts/instances/trials/TheStrikingTreeHard.cpp @@ -1,7 +1,7 @@ #include #include -using namespace Core; +using namespace Sapphire; class TheStrikingTreeHard : public Sapphire::ScriptAPI::InstanceContentScript diff --git a/src/servers/Scripts/instances/trials/TheWhorleaterExtreme.cpp b/src/servers/Scripts/instances/trials/TheWhorleaterExtreme.cpp index 450da17f..30008db5 100644 --- a/src/servers/Scripts/instances/trials/TheWhorleaterExtreme.cpp +++ b/src/servers/Scripts/instances/trials/TheWhorleaterExtreme.cpp @@ -1,7 +1,7 @@ #include #include -using namespace Core; +using namespace Sapphire; class TheWhorleaterExtreme : public Sapphire::ScriptAPI::InstanceContentScript diff --git a/src/servers/Scripts/instances/trials/TheWhorleaterHard.cpp b/src/servers/Scripts/instances/trials/TheWhorleaterHard.cpp index cb73810f..d7e5c897 100644 --- a/src/servers/Scripts/instances/trials/TheWhorleaterHard.cpp +++ b/src/servers/Scripts/instances/trials/TheWhorleaterHard.cpp @@ -1,7 +1,7 @@ #include #include -using namespace Core; +using namespace Sapphire; class TheWhorleaterHard : public Sapphire::ScriptAPI::InstanceContentScript diff --git a/src/servers/Scripts/instances/trials/ThokastThokExtreme.cpp b/src/servers/Scripts/instances/trials/ThokastThokExtreme.cpp index 89003f45..badfd17f 100644 --- a/src/servers/Scripts/instances/trials/ThokastThokExtreme.cpp +++ b/src/servers/Scripts/instances/trials/ThokastThokExtreme.cpp @@ -1,7 +1,7 @@ #include #include -using namespace Core; +using namespace Sapphire; class ThokastThokExtreme : public Sapphire::ScriptAPI::InstanceContentScript diff --git a/src/servers/Scripts/instances/trials/ThokastThokHard.cpp b/src/servers/Scripts/instances/trials/ThokastThokHard.cpp index ee25d9db..370e7186 100644 --- a/src/servers/Scripts/instances/trials/ThokastThokHard.cpp +++ b/src/servers/Scripts/instances/trials/ThokastThokHard.cpp @@ -1,7 +1,7 @@ #include #include -using namespace Core; +using namespace Sapphire; class ThokastThokHard : public Sapphire::ScriptAPI::InstanceContentScript diff --git a/src/servers/Scripts/instances/trials/ThornmarchExtreme.cpp b/src/servers/Scripts/instances/trials/ThornmarchExtreme.cpp index df1edf14..20bf9a9d 100644 --- a/src/servers/Scripts/instances/trials/ThornmarchExtreme.cpp +++ b/src/servers/Scripts/instances/trials/ThornmarchExtreme.cpp @@ -1,7 +1,7 @@ #include #include -using namespace Core; +using namespace Sapphire; class ThornmarchExtreme : public Sapphire::ScriptAPI::InstanceContentScript diff --git a/src/servers/Scripts/instances/trials/ThornmarchHard.cpp b/src/servers/Scripts/instances/trials/ThornmarchHard.cpp index b6f02b7e..bf3706e5 100644 --- a/src/servers/Scripts/instances/trials/ThornmarchHard.cpp +++ b/src/servers/Scripts/instances/trials/ThornmarchHard.cpp @@ -1,7 +1,7 @@ #include #include -using namespace Core; +using namespace Sapphire; class ThornmarchHard : public Sapphire::ScriptAPI::InstanceContentScript diff --git a/src/servers/Scripts/instances/trials/UrthsFount.cpp b/src/servers/Scripts/instances/trials/UrthsFount.cpp index adefd618..f206105b 100644 --- a/src/servers/Scripts/instances/trials/UrthsFount.cpp +++ b/src/servers/Scripts/instances/trials/UrthsFount.cpp @@ -1,7 +1,7 @@ #include #include -using namespace Core; +using namespace Sapphire; class UrthsFount : public Sapphire::ScriptAPI::InstanceContentScript diff --git a/src/servers/Scripts/opening/OpeningGridania.cpp b/src/servers/Scripts/opening/OpeningGridania.cpp index 069625cd..0623890a 100644 --- a/src/servers/Scripts/opening/OpeningGridania.cpp +++ b/src/servers/Scripts/opening/OpeningGridania.cpp @@ -1,7 +1,7 @@ #include #include -using namespace Core; +using namespace Sapphire; class OpeningGridania : public Sapphire::ScriptAPI::EventScript { diff --git a/src/servers/Scripts/opening/OpeningLimsa.cpp b/src/servers/Scripts/opening/OpeningLimsa.cpp index 2401ccc6..73f9af52 100644 --- a/src/servers/Scripts/opening/OpeningLimsa.cpp +++ b/src/servers/Scripts/opening/OpeningLimsa.cpp @@ -1,7 +1,7 @@ #include #include -using namespace Core; +using namespace Sapphire; // Opening Script: OpeningLimsaLominsa // Quest Name: OpeningLimsaLominsa diff --git a/src/servers/Scripts/opening/OpeningUldah.cpp b/src/servers/Scripts/opening/OpeningUldah.cpp index 42e9fada..256d3b34 100644 --- a/src/servers/Scripts/opening/OpeningUldah.cpp +++ b/src/servers/Scripts/opening/OpeningUldah.cpp @@ -1,7 +1,7 @@ #include #include -using namespace Core; +using namespace Sapphire; class OpeningUldah : public Sapphire::ScriptAPI::EventScript { diff --git a/src/servers/Scripts/quest/ManFst001.cpp b/src/servers/Scripts/quest/ManFst001.cpp index 8aceb25b..8b5b7e95 100644 --- a/src/servers/Scripts/quest/ManFst001.cpp +++ b/src/servers/Scripts/quest/ManFst001.cpp @@ -9,7 +9,7 @@ // Start NPC: 1001148 // End NPC: 1001140 -using namespace Core; +using namespace Sapphire; class ManFst001 : public Sapphire::ScriptAPI::EventScript diff --git a/src/servers/Scripts/quest/ManFst002.cpp b/src/servers/Scripts/quest/ManFst002.cpp index cd72400c..7f892de4 100644 --- a/src/servers/Scripts/quest/ManFst002.cpp +++ b/src/servers/Scripts/quest/ManFst002.cpp @@ -9,7 +9,7 @@ // Start NPC: 1001140 // End NPC: 1000100 -using namespace Core; +using namespace Sapphire; class ManFst002 : public Sapphire::ScriptAPI::EventScript { diff --git a/src/servers/Scripts/quest/ManFst003.cpp b/src/servers/Scripts/quest/ManFst003.cpp index b0c5f26e..640b6107 100644 --- a/src/servers/Scripts/quest/ManFst003.cpp +++ b/src/servers/Scripts/quest/ManFst003.cpp @@ -8,7 +8,7 @@ // Start NPC: 1001140 // End NPC: 1000100 -using namespace Core; +using namespace Sapphire; class ManFst003 : public Sapphire::ScriptAPI::EventScript diff --git a/src/servers/Scripts/quest/ManFst004.cpp b/src/servers/Scripts/quest/ManFst004.cpp index 4231a30e..6d64b301 100644 --- a/src/servers/Scripts/quest/ManFst004.cpp +++ b/src/servers/Scripts/quest/ManFst004.cpp @@ -8,7 +8,7 @@ // Start NPC: 1001140 // End NPC: 1000100 -using namespace Core; +using namespace Sapphire; class ManFst004 : public Sapphire::ScriptAPI::EventScript diff --git a/src/servers/Scripts/quest/ManSea001.cpp b/src/servers/Scripts/quest/ManSea001.cpp index 61899a69..27db50f1 100644 --- a/src/servers/Scripts/quest/ManSea001.cpp +++ b/src/servers/Scripts/quest/ManSea001.cpp @@ -8,7 +8,7 @@ // Start NPC: 1001028 // End NPC: 1002697 -using namespace Core; +using namespace Sapphire; class ManSea001 : public Sapphire::ScriptAPI::EventScript diff --git a/src/servers/Scripts/quest/ManSea002.cpp b/src/servers/Scripts/quest/ManSea002.cpp index 088a9153..c2fd2f37 100644 --- a/src/servers/Scripts/quest/ManSea002.cpp +++ b/src/servers/Scripts/quest/ManSea002.cpp @@ -8,7 +8,7 @@ // Start NPC: 1002697 // End NPC: 1000972 -using namespace Core; +using namespace Sapphire; class ManSea002 : public Sapphire::ScriptAPI::EventScript diff --git a/src/servers/Scripts/quest/ManSea003.cpp b/src/servers/Scripts/quest/ManSea003.cpp index e4904ba4..f340937c 100644 --- a/src/servers/Scripts/quest/ManSea003.cpp +++ b/src/servers/Scripts/quest/ManSea003.cpp @@ -8,7 +8,7 @@ // Start NPC: 1002697 // End NPC: 1000972 -using namespace Core; +using namespace Sapphire; class ManSea003 : public Sapphire::ScriptAPI::EventScript diff --git a/src/servers/Scripts/quest/ManWil001.cpp b/src/servers/Scripts/quest/ManWil001.cpp index 03602e5f..d497b08f 100644 --- a/src/servers/Scripts/quest/ManWil001.cpp +++ b/src/servers/Scripts/quest/ManWil001.cpp @@ -8,7 +8,7 @@ // Start NPC: 1003987 // End NPC: 1003988 -using namespace Core; +using namespace Sapphire; class ManWil001 : public Sapphire::ScriptAPI::EventScript diff --git a/src/servers/Scripts/quest/ManWil002.cpp b/src/servers/Scripts/quest/ManWil002.cpp index 0412de3b..b2dd4db6 100644 --- a/src/servers/Scripts/quest/ManWil002.cpp +++ b/src/servers/Scripts/quest/ManWil002.cpp @@ -8,7 +8,7 @@ // Start NPC: 1003988 // End NPC: 1001353 -using namespace Core; +using namespace Sapphire; class ManWil002 : public Sapphire::ScriptAPI::EventScript diff --git a/src/servers/Scripts/quest/subquest/gridania/SubFst001.cpp b/src/servers/Scripts/quest/subquest/gridania/SubFst001.cpp index c71fadce..45c2bbf6 100644 --- a/src/servers/Scripts/quest/subquest/gridania/SubFst001.cpp +++ b/src/servers/Scripts/quest/subquest/gridania/SubFst001.cpp @@ -2,7 +2,7 @@ #include "Event/EventHelper.h" #include -using namespace Core; +using namespace Sapphire; // Quest Script: SubFst001_00024 // Quest Name: Coarse Correspondence diff --git a/src/servers/Scripts/quest/subquest/gridania/SubFst002.cpp b/src/servers/Scripts/quest/subquest/gridania/SubFst002.cpp index 481e3610..85722cde 100644 --- a/src/servers/Scripts/quest/subquest/gridania/SubFst002.cpp +++ b/src/servers/Scripts/quest/subquest/gridania/SubFst002.cpp @@ -2,7 +2,7 @@ #include "Event/EventHelper.h" #include -using namespace Core; +using namespace Sapphire; // Quest Script: SubFst002_00025 // Quest Name: Quarrels with Squirrels diff --git a/src/servers/Scripts/quest/subquest/gridania/SubFst003.cpp b/src/servers/Scripts/quest/subquest/gridania/SubFst003.cpp index c019ea1f..e5d0aca7 100644 --- a/src/servers/Scripts/quest/subquest/gridania/SubFst003.cpp +++ b/src/servers/Scripts/quest/subquest/gridania/SubFst003.cpp @@ -2,7 +2,7 @@ #include #include -using namespace Core; +using namespace Sapphire; // Quest Script: SubFst003_00026 // Quest Name: Once Bitten, Twice Shy diff --git a/src/servers/Scripts/quest/subquest/gridania/SubFst004.cpp b/src/servers/Scripts/quest/subquest/gridania/SubFst004.cpp index 155db5ca..7cf1a84d 100644 --- a/src/servers/Scripts/quest/subquest/gridania/SubFst004.cpp +++ b/src/servers/Scripts/quest/subquest/gridania/SubFst004.cpp @@ -2,7 +2,7 @@ #include #include -using namespace Core; +using namespace Sapphire; // Quest Script: SubFst004_00027 // Quest Name: Preserving the Past diff --git a/src/servers/Scripts/quest/subquest/gridania/SubFst008.cpp b/src/servers/Scripts/quest/subquest/gridania/SubFst008.cpp index 641ec07e..c0193abc 100644 --- a/src/servers/Scripts/quest/subquest/gridania/SubFst008.cpp +++ b/src/servers/Scripts/quest/subquest/gridania/SubFst008.cpp @@ -2,7 +2,7 @@ #include #include -using namespace Core; +using namespace Sapphire; // Quest Script: SubFst008_00032 // Quest Name: A Hard Nut to Crack diff --git a/src/servers/Scripts/quest/subquest/gridania/SubFst009.cpp b/src/servers/Scripts/quest/subquest/gridania/SubFst009.cpp index e9cee5ee..0542f689 100644 --- a/src/servers/Scripts/quest/subquest/gridania/SubFst009.cpp +++ b/src/servers/Scripts/quest/subquest/gridania/SubFst009.cpp @@ -2,7 +2,7 @@ #include #include -using namespace Core; +using namespace Sapphire; // Quest Script: SubFst009_00034 // Quest Name: Derision of Labor diff --git a/src/servers/Scripts/quest/subquest/gridania/SubFst010.cpp b/src/servers/Scripts/quest/subquest/gridania/SubFst010.cpp index d1339fb8..a8a2defe 100644 --- a/src/servers/Scripts/quest/subquest/gridania/SubFst010.cpp +++ b/src/servers/Scripts/quest/subquest/gridania/SubFst010.cpp @@ -2,7 +2,7 @@ #include "Event/EventHelper.h" #include -using namespace Core; +using namespace Sapphire; // Quest Script: SubFst010_00001 // Quest Name: A Good Adventurer Is Hard to Find diff --git a/src/servers/Scripts/quest/subquest/gridania/SubFst011.cpp b/src/servers/Scripts/quest/subquest/gridania/SubFst011.cpp index e9839111..ceadb3d4 100644 --- a/src/servers/Scripts/quest/subquest/gridania/SubFst011.cpp +++ b/src/servers/Scripts/quest/subquest/gridania/SubFst011.cpp @@ -2,7 +2,7 @@ #include #include -using namespace Core; +using namespace Sapphire; // Quest Script: SubFst011_00037 // Quest Name: Population Control diff --git a/src/servers/Scripts/quest/subquest/gridania/SubFst013.cpp b/src/servers/Scripts/quest/subquest/gridania/SubFst013.cpp index 740da9b7..e813acab 100644 --- a/src/servers/Scripts/quest/subquest/gridania/SubFst013.cpp +++ b/src/servers/Scripts/quest/subquest/gridania/SubFst013.cpp @@ -2,7 +2,7 @@ #include #include "Event/EventHelper.h" -using namespace Core; +using namespace Sapphire; // Quest Script: SubFst013_00040 // Quest Name: For Friendship diff --git a/src/servers/Scripts/quest/subquest/gridania/SubFst014.cpp b/src/servers/Scripts/quest/subquest/gridania/SubFst014.cpp index abea218c..735f54a0 100644 --- a/src/servers/Scripts/quest/subquest/gridania/SubFst014.cpp +++ b/src/servers/Scripts/quest/subquest/gridania/SubFst014.cpp @@ -2,7 +2,7 @@ #include #include -using namespace Core; +using namespace Sapphire; // Quest Script: SubFst014_00041 // Quest Name: Covered in Roses diff --git a/src/servers/Scripts/quest/subquest/gridania/SubFst015.cpp b/src/servers/Scripts/quest/subquest/gridania/SubFst015.cpp index a574dc7b..bd0aa913 100644 --- a/src/servers/Scripts/quest/subquest/gridania/SubFst015.cpp +++ b/src/servers/Scripts/quest/subquest/gridania/SubFst015.cpp @@ -2,7 +2,7 @@ #include #include -using namespace Core; +using namespace Sapphire; // Quest Script: SubFst015_00042 // Quest Name: Sylphic Gratitude diff --git a/src/servers/Scripts/quest/subquest/gridania/SubFst019.cpp b/src/servers/Scripts/quest/subquest/gridania/SubFst019.cpp index 3e793627..51701057 100644 --- a/src/servers/Scripts/quest/subquest/gridania/SubFst019.cpp +++ b/src/servers/Scripts/quest/subquest/gridania/SubFst019.cpp @@ -2,7 +2,7 @@ #include #include -using namespace Core; +using namespace Sapphire; // Quest Script: SubFst019_00049 // Quest Name: I Am Millicent, Hear Me Roar diff --git a/src/servers/Scripts/quest/subquest/gridania/SubFst026.cpp b/src/servers/Scripts/quest/subquest/gridania/SubFst026.cpp index 6c1710ad..e5136621 100644 --- a/src/servers/Scripts/quest/subquest/gridania/SubFst026.cpp +++ b/src/servers/Scripts/quest/subquest/gridania/SubFst026.cpp @@ -2,7 +2,7 @@ #include #include -using namespace Core; +using namespace Sapphire; // Quest Script: SubFst026_00170 // Quest Name: Jumping at Shadows diff --git a/src/servers/Scripts/quest/subquest/gridania/SubFst029.cpp b/src/servers/Scripts/quest/subquest/gridania/SubFst029.cpp index 90e5862f..d2d6d65a 100644 --- a/src/servers/Scripts/quest/subquest/gridania/SubFst029.cpp +++ b/src/servers/Scripts/quest/subquest/gridania/SubFst029.cpp @@ -2,7 +2,7 @@ #include #include -using namespace Core; +using namespace Sapphire; // Quest Script: SubFst029_00172 // Quest Name: More than a Flesh Wound diff --git a/src/servers/Scripts/quest/subquest/gridania/SubFst030.cpp b/src/servers/Scripts/quest/subquest/gridania/SubFst030.cpp index 2ba2eb3b..9f7dedfe 100644 --- a/src/servers/Scripts/quest/subquest/gridania/SubFst030.cpp +++ b/src/servers/Scripts/quest/subquest/gridania/SubFst030.cpp @@ -3,7 +3,7 @@ #include "Event/EventHelper.h" #include -using namespace Core; +using namespace Sapphire; // Quest Script: SubFst030_00173 // Quest Name: The Nose Knows diff --git a/src/servers/Scripts/quest/subquest/gridania/SubFst041.cpp b/src/servers/Scripts/quest/subquest/gridania/SubFst041.cpp index 6ab413f2..720b0cd9 100644 --- a/src/servers/Scripts/quest/subquest/gridania/SubFst041.cpp +++ b/src/servers/Scripts/quest/subquest/gridania/SubFst041.cpp @@ -2,7 +2,7 @@ #include #include -using namespace Core; +using namespace Sapphire; // Quest Script: SubFst041_00197 // Quest Name: Splitting Shells diff --git a/src/servers/Scripts/quest/subquest/limsa/SubSea001.cpp b/src/servers/Scripts/quest/subquest/limsa/SubSea001.cpp index 1c947ed9..2edf9e7c 100644 --- a/src/servers/Scripts/quest/subquest/limsa/SubSea001.cpp +++ b/src/servers/Scripts/quest/subquest/limsa/SubSea001.cpp @@ -3,7 +3,7 @@ #include "Event/EventHelper.h" #include -using namespace Core; +using namespace Sapphire; // Quest Script: SubSea001_00111 // Quest Name: Making a Name diff --git a/src/servers/Scripts/quest/subquest/uldah/SubWil000.cpp b/src/servers/Scripts/quest/subquest/uldah/SubWil000.cpp index 760db8ac..fe3f4488 100644 --- a/src/servers/Scripts/quest/subquest/uldah/SubWil000.cpp +++ b/src/servers/Scripts/quest/subquest/uldah/SubWil000.cpp @@ -2,7 +2,7 @@ #include #include -using namespace Core; +using namespace Sapphire; // Quest Script: SubWil000_00149 // Quest Name: Due Diligence diff --git a/src/servers/Scripts/quest/subquest/uldah/SubWil001.cpp b/src/servers/Scripts/quest/subquest/uldah/SubWil001.cpp index fdd6ef2f..ddce1461 100644 --- a/src/servers/Scripts/quest/subquest/uldah/SubWil001.cpp +++ b/src/servers/Scripts/quest/subquest/uldah/SubWil001.cpp @@ -2,7 +2,7 @@ #include #include -using namespace Core; +using namespace Sapphire; // Quest Script: SubWil001_00150 // Quest Name: Motivational Speaking diff --git a/src/servers/Scripts/quest/subquest/uldah/SubWil002.cpp b/src/servers/Scripts/quest/subquest/uldah/SubWil002.cpp index 20f65c02..b5843361 100644 --- a/src/servers/Scripts/quest/subquest/uldah/SubWil002.cpp +++ b/src/servers/Scripts/quest/subquest/uldah/SubWil002.cpp @@ -2,7 +2,7 @@ #include #include -using namespace Core; +using namespace Sapphire; // Quest Script: SubWil002_00151 // Quest Name: Gil for Gold diff --git a/src/servers/Scripts/quest/subquest/uldah/SubWil004.cpp b/src/servers/Scripts/quest/subquest/uldah/SubWil004.cpp index 6d857111..b066055c 100644 --- a/src/servers/Scripts/quest/subquest/uldah/SubWil004.cpp +++ b/src/servers/Scripts/quest/subquest/uldah/SubWil004.cpp @@ -2,7 +2,7 @@ #include #include -using namespace Core; +using namespace Sapphire; // Quest Script: SubWil004_00153 // Quest Name: Unholy Matrimony diff --git a/src/servers/Scripts/quest/subquest/uldah/SubWil006.cpp b/src/servers/Scripts/quest/subquest/uldah/SubWil006.cpp index 0cf698ea..a5bc3fdf 100644 --- a/src/servers/Scripts/quest/subquest/uldah/SubWil006.cpp +++ b/src/servers/Scripts/quest/subquest/uldah/SubWil006.cpp @@ -2,7 +2,7 @@ #include #include -using namespace Core; +using namespace Sapphire; // Quest Script: SubWil006_00165 // Quest Name: The Great Gladiator diff --git a/src/servers/Scripts/quest/subquest/uldah/SubWil007.cpp b/src/servers/Scripts/quest/subquest/uldah/SubWil007.cpp index 9d2f2200..bc6e90be 100644 --- a/src/servers/Scripts/quest/subquest/uldah/SubWil007.cpp +++ b/src/servers/Scripts/quest/subquest/uldah/SubWil007.cpp @@ -3,7 +3,7 @@ #include #include -using namespace Core; +using namespace Sapphire; // Quest Script: SubWil007_00167 // Quest Name: With Open Arms diff --git a/src/servers/Scripts/quest/subquest/uldah/SubWil018.cpp b/src/servers/Scripts/quest/subquest/uldah/SubWil018.cpp index 097320d5..ba2745a9 100644 --- a/src/servers/Scripts/quest/subquest/uldah/SubWil018.cpp +++ b/src/servers/Scripts/quest/subquest/uldah/SubWil018.cpp @@ -2,7 +2,7 @@ #include #include -using namespace Core; +using namespace Sapphire; // Quest Script: SubWil018_00396 // Quest Name: No Lady Is an Island diff --git a/src/servers/Scripts/quest/subquest/uldah/SubWil019.cpp b/src/servers/Scripts/quest/subquest/uldah/SubWil019.cpp index 550d359f..7eb1716a 100644 --- a/src/servers/Scripts/quest/subquest/uldah/SubWil019.cpp +++ b/src/servers/Scripts/quest/subquest/uldah/SubWil019.cpp @@ -2,7 +2,7 @@ #include #include -using namespace Core; +using namespace Sapphire; // Quest Script: SubWil019_00392 // Quest Name: Decisions, Decisions diff --git a/src/servers/Scripts/quest/subquest/uldah/SubWil021.cpp b/src/servers/Scripts/quest/subquest/uldah/SubWil021.cpp index 0920de6a..850f8ae4 100644 --- a/src/servers/Scripts/quest/subquest/uldah/SubWil021.cpp +++ b/src/servers/Scripts/quest/subquest/uldah/SubWil021.cpp @@ -2,7 +2,7 @@ #include #include -using namespace Core; +using namespace Sapphire; // Quest Script: SubWil021_00394 // Quest Name: A Luxury Long Lost diff --git a/src/servers/Scripts/quest/subquest/uldah/SubWil022.cpp b/src/servers/Scripts/quest/subquest/uldah/SubWil022.cpp index 1d090eb0..7cd0c32a 100644 --- a/src/servers/Scripts/quest/subquest/uldah/SubWil022.cpp +++ b/src/servers/Scripts/quest/subquest/uldah/SubWil022.cpp @@ -2,7 +2,7 @@ #include #include -using namespace Core; +using namespace Sapphire; // Quest Script: SubWil022_00395 // Quest Name: The Wealth of Nations diff --git a/src/servers/Scripts/quest/subquest/uldah/SubWil027.cpp b/src/servers/Scripts/quest/subquest/uldah/SubWil027.cpp index 11097fc0..dbca92e8 100644 --- a/src/servers/Scripts/quest/subquest/uldah/SubWil027.cpp +++ b/src/servers/Scripts/quest/subquest/uldah/SubWil027.cpp @@ -2,7 +2,7 @@ #include #include -using namespace Core; +using namespace Sapphire; // Quest Script: SubWil027_00595 // Quest Name: We Must Rebuild diff --git a/src/servers/Scripts/quest/subquest/uldah/SubWil028.cpp b/src/servers/Scripts/quest/subquest/uldah/SubWil028.cpp index 1fcef78e..3a7793df 100644 --- a/src/servers/Scripts/quest/subquest/uldah/SubWil028.cpp +++ b/src/servers/Scripts/quest/subquest/uldah/SubWil028.cpp @@ -2,7 +2,7 @@ #include #include -using namespace Core; +using namespace Sapphire; // Quest Script: SubWil028_00389 // Quest Name: Fantastic Voyage diff --git a/src/servers/Scripts/quest/subquest/uldah/SubWil029.cpp b/src/servers/Scripts/quest/subquest/uldah/SubWil029.cpp index eddeabad..fee8e96a 100644 --- a/src/servers/Scripts/quest/subquest/uldah/SubWil029.cpp +++ b/src/servers/Scripts/quest/subquest/uldah/SubWil029.cpp @@ -2,7 +2,7 @@ #include #include -using namespace Core; +using namespace Sapphire; // Quest Script: SubWil029_00390 // Quest Name: Catch Your Breath diff --git a/src/servers/sapphire_api/Forwards.h b/src/servers/sapphire_api/Forwards.h index cf8c0a4c..8c50d1ff 100644 --- a/src/servers/sapphire_api/Forwards.h +++ b/src/servers/sapphire_api/Forwards.h @@ -3,7 +3,7 @@ #include -namespace Core +namespace Sapphire { class Cell; class Zone; diff --git a/src/servers/sapphire_api/LoginSession.cpp b/src/servers/sapphire_api/LoginSession.cpp index ed9dcf5a..8e202d4c 100644 --- a/src/servers/sapphire_api/LoginSession.cpp +++ b/src/servers/sapphire_api/LoginSession.cpp @@ -1,6 +1,6 @@ #include "LoginSession.h" -namespace Core { +namespace Sapphire { LoginSession::LoginSession( void ) { //setSocket(NULL); diff --git a/src/servers/sapphire_api/LoginSession.h b/src/servers/sapphire_api/LoginSession.h index e5493c7a..66fc1f4f 100644 --- a/src/servers/sapphire_api/LoginSession.h +++ b/src/servers/sapphire_api/LoginSession.h @@ -7,7 +7,7 @@ #include #include -namespace Core +namespace Sapphire { class LoginSession diff --git a/src/servers/sapphire_api/PlayerMinimal.cpp b/src/servers/sapphire_api/PlayerMinimal.cpp index 9829ae1c..31e84818 100644 --- a/src/servers/sapphire_api/PlayerMinimal.cpp +++ b/src/servers/sapphire_api/PlayerMinimal.cpp @@ -6,9 +6,9 @@ #include -extern Core::Data::ExdDataGenerated g_exdDataGen; +extern Sapphire::Data::ExdDataGenerated g_exdDataGen; -namespace Core { +namespace Sapphire { using namespace Common; @@ -146,7 +146,7 @@ std::string PlayerMinimal::getInfoJson() uint8_t PlayerMinimal::getClassLevel() { - uint8_t classJobIndex = g_exdDataGen.get< Core::Data::ClassJob >( static_cast< uint8_t >( m_class ) )->expArrayIndex; + uint8_t classJobIndex = g_exdDataGen.get< Sapphire::Data::ClassJob >( static_cast< uint8_t >( m_class ) )->expArrayIndex; return static_cast< uint8_t >( m_classMap[ classJobIndex ] ); } @@ -206,11 +206,11 @@ void PlayerMinimal::saveAsNew() float x, y, z, o; int32_t startTown = 0; - switch( static_cast< Core::Common::ClassJob >( m_class ) ) + switch( static_cast< Sapphire::Common::ClassJob >( m_class ) ) { - case Core::Common::ClassJob::Conjurer: - case Core::Common::ClassJob::Lancer: - case Core::Common::ClassJob::Archer: + case Sapphire::Common::ClassJob::Conjurer: + case Sapphire::Common::ClassJob::Lancer: + case Sapphire::Common::ClassJob::Archer: x = 127.0f; y = -13.0f; z = 147.0f; @@ -219,8 +219,8 @@ void PlayerMinimal::saveAsNew() startTown = 2; break; - case Core::Common::ClassJob::Marauder: - case Core::Common::ClassJob::Arcanist: + case Sapphire::Common::ClassJob::Marauder: + case Sapphire::Common::ClassJob::Arcanist: x = -53.0f; y = 18.0f; z = 0.0f; @@ -229,9 +229,9 @@ void PlayerMinimal::saveAsNew() startZone = 181; break; - case Core::Common::ClassJob::Thaumaturge: - case Core::Common::ClassJob::Pugilist: - case Core::Common::ClassJob::Gladiator: + case Sapphire::Common::ClassJob::Thaumaturge: + case Sapphire::Common::ClassJob::Pugilist: + case Sapphire::Common::ClassJob::Gladiator: x = 42.0f; y = 4.0f; z = -157.6f; @@ -253,7 +253,7 @@ void PlayerMinimal::saveAsNew() // CharacterId, ClassIdx, Exp, Lvl auto stmtClass = g_charaDb.getPreparedStatement( Db::ZoneDbStatements::CHARA_CLASS_INS ); stmtClass->setInt( 1, m_id ); - stmtClass->setInt( 2, g_exdDataGen.get< Core::Data::ClassJob >( m_class )->expArrayIndex ); + stmtClass->setInt( 2, g_exdDataGen.get< Sapphire::Data::ClassJob >( m_class )->expArrayIndex ); stmtClass->setInt( 3, 0 ); stmtClass->setInt( 4, 1 ); g_charaDb.directExecute( stmtClass ); @@ -326,14 +326,14 @@ void PlayerMinimal::saveAsNew() /////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// /// SETUP EQUIPMENT / STARTING GEAR - auto classJobInfo = g_exdDataGen.get< Core::Data::ClassJob >( m_class ); + auto classJobInfo = g_exdDataGen.get< Sapphire::Data::ClassJob >( m_class ); uint32_t weaponId = classJobInfo->itemStartingWeapon; uint64_t uniqueId = getNextUId64(); uint8_t race = customize[ CharaLook::Race ]; uint8_t gender = customize[ CharaLook::Gender ]; - auto raceInfo = g_exdDataGen.get< Core::Data::Race >( race ); + auto raceInfo = g_exdDataGen.get< Sapphire::Data::Race >( race ); uint32_t body; uint32_t hands; diff --git a/src/servers/sapphire_api/PlayerMinimal.h b/src/servers/sapphire_api/PlayerMinimal.h index df8efd7c..7cbaade8 100644 --- a/src/servers/sapphire_api/PlayerMinimal.h +++ b/src/servers/sapphire_api/PlayerMinimal.h @@ -5,7 +5,7 @@ #include #include -namespace Core +namespace Sapphire { class PlayerMinimal diff --git a/src/servers/sapphire_api/SapphireAPI.cpp b/src/servers/sapphire_api/SapphireAPI.cpp index 1f981514..d6b0065d 100644 --- a/src/servers/sapphire_api/SapphireAPI.cpp +++ b/src/servers/sapphire_api/SapphireAPI.cpp @@ -10,17 +10,17 @@ #include -Core::Network::SapphireAPI::SapphireAPI() +Sapphire::Network::SapphireAPI::SapphireAPI() { } -Core::Network::SapphireAPI::~SapphireAPI() +Sapphire::Network::SapphireAPI::~SapphireAPI() { } -bool Core::Network::SapphireAPI::login( const std::string& username, const std::string& pass, std::string& sId ) +bool Sapphire::Network::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 + "';"; @@ -63,7 +63,7 @@ bool Core::Network::SapphireAPI::login( const std::string& username, const std:: } -bool Core::Network::SapphireAPI::insertSession( const uint32_t& accountId, std::string& sId ) +bool Sapphire::Network::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 >(); @@ -76,7 +76,7 @@ bool Core::Network::SapphireAPI::insertSession( const uint32_t& accountId, std:: } -bool Core::Network::SapphireAPI::createAccount( const std::string& username, const std::string& pass, std::string& sId ) +bool Sapphire::Network::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 + "';" ); @@ -107,10 +107,10 @@ bool Core::Network::SapphireAPI::createAccount( const std::string& username, con } int -Core::Network::SapphireAPI::createCharacter( const int& accountId, const std::string& name, const std::string& infoJson, +Sapphire::Network::SapphireAPI::createCharacter( const int& accountId, const std::string& name, const std::string& infoJson, const int& gmRank ) { - Core::PlayerMinimal newPlayer; + Sapphire::PlayerMinimal newPlayer; newPlayer.setAccountId( accountId ); newPlayer.setId( getNextCharId() ); @@ -179,7 +179,7 @@ Core::Network::SapphireAPI::createCharacter( const int& accountId, const std::st return newPlayer.getAccountId(); } -void Core::Network::SapphireAPI::deleteCharacter( std::string name, uint32_t accountId ) +void Sapphire::Network::SapphireAPI::deleteCharacter( std::string name, uint32_t accountId ) { PlayerMinimal deletePlayer; auto charList = getCharList( accountId ); @@ -209,17 +209,17 @@ void Core::Network::SapphireAPI::deleteCharacter( std::string name, uint32_t acc g_charaDb.execute( "DELETE FROM charaquestnew WHERE CharacterId LIKE '" + std::to_string( id ) + "';" ); } -std::vector< Core::PlayerMinimal > Core::Network::SapphireAPI::getCharList( uint32_t accountId ) +std::vector< Sapphire::PlayerMinimal > Sapphire::Network::SapphireAPI::getCharList( uint32_t accountId ) { - std::vector< Core::PlayerMinimal > charList; + std::vector< Sapphire::PlayerMinimal > charList; auto pQR = g_charaDb.query( "SELECT CharacterId, ContentId FROM charainfo WHERE AccountId = " + std::to_string( accountId ) + ";" ); while( pQR->next() ) { - Core::PlayerMinimal player; + Sapphire::PlayerMinimal player; uint32_t charId = pQR->getUInt( 1 ); @@ -230,7 +230,7 @@ std::vector< Core::PlayerMinimal > Core::Network::SapphireAPI::getCharList( uint return charList; } -bool Core::Network::SapphireAPI::checkNameTaken( std::string name ) +bool Sapphire::Network::SapphireAPI::checkNameTaken( std::string name ) { g_charaDb.escapeString( name ); @@ -244,7 +244,7 @@ bool Core::Network::SapphireAPI::checkNameTaken( std::string name ) return true; } -uint32_t Core::Network::SapphireAPI::getNextCharId() +uint32_t Sapphire::Network::SapphireAPI::getNextCharId() { uint32_t charId = 0; @@ -260,7 +260,7 @@ uint32_t Core::Network::SapphireAPI::getNextCharId() return charId; } -uint64_t Core::Network::SapphireAPI::getNextContentId() +uint64_t Sapphire::Network::SapphireAPI::getNextContentId() { uint64_t contentId = 0; @@ -276,7 +276,7 @@ uint64_t Core::Network::SapphireAPI::getNextContentId() return contentId; } -int Core::Network::SapphireAPI::checkSession( const std::string& sId ) +int Sapphire::Network::SapphireAPI::checkSession( const std::string& sId ) { auto it = m_sessionMap.find( sId ); @@ -287,7 +287,7 @@ int Core::Network::SapphireAPI::checkSession( const std::string& sId ) } -bool Core::Network::SapphireAPI::removeSession( const std::string& sId ) +bool Sapphire::Network::SapphireAPI::removeSession( const std::string& sId ) { auto it = m_sessionMap.find( sId ); diff --git a/src/servers/sapphire_api/SapphireAPI.h b/src/servers/sapphire_api/SapphireAPI.h index be9df44c..ca064968 100644 --- a/src/servers/sapphire_api/SapphireAPI.h +++ b/src/servers/sapphire_api/SapphireAPI.h @@ -7,12 +7,12 @@ #include #include "PlayerMinimal.h" -namespace Core +namespace Sapphire { class Session; } -namespace Core::Network +namespace Sapphire::Network { class SapphireAPI @@ -35,7 +35,7 @@ namespace Core::Network bool insertSession( const uint32_t& accountId, std::string& sId ); - std::vector< Core::PlayerMinimal > getCharList( uint32_t accountId ); + std::vector< Sapphire::PlayerMinimal > getCharList( uint32_t accountId ); bool checkNameTaken( std::string name ); diff --git a/src/servers/sapphire_api/Session.cpp b/src/servers/sapphire_api/Session.cpp index f3523a04..fc40d265 100644 --- a/src/servers/sapphire_api/Session.cpp +++ b/src/servers/sapphire_api/Session.cpp @@ -1,6 +1,6 @@ #include "Session.h" -namespace Core { +namespace Sapphire { Session::Session() { diff --git a/src/servers/sapphire_api/Session.h b/src/servers/sapphire_api/Session.h index 66c44578..5d9efc41 100644 --- a/src/servers/sapphire_api/Session.h +++ b/src/servers/sapphire_api/Session.h @@ -5,7 +5,7 @@ #include #include -namespace Core +namespace Sapphire { class Session diff --git a/src/servers/sapphire_api/main.cpp b/src/servers/sapphire_api/main.cpp index 90edbd05..e8641c50 100644 --- a/src/servers/sapphire_api/main.cpp +++ b/src/servers/sapphire_api/main.cpp @@ -32,11 +32,11 @@ #include "SapphireAPI.h" -Core::Framework g_fw; -Core::Logger g_log; -Core::Db::DbWorkerPool< Core::Db::ZoneDbConnection > g_charaDb; -Core::Data::ExdDataGenerated g_exdDataGen; -Core::Network::SapphireAPI g_sapphireAPI; +Sapphire::Framework g_fw; +Sapphire::Logger g_log; +Sapphire::Db::DbWorkerPool< Sapphire::Db::ZoneDbConnection > g_charaDb; +Sapphire::Data::ExdDataGenerated g_exdDataGen; +Sapphire::Network::SapphireAPI g_sapphireAPI; namespace fs = std::experimental::filesystem; @@ -50,13 +50,13 @@ void default_resource_send( const HttpServer& server, const shared_ptr< HttpServ const shared_ptr< ifstream >& ifs ); -auto m_pConfig = std::make_shared< Core::ConfigMgr >(); +auto m_pConfig = std::make_shared< Sapphire::ConfigMgr >(); HttpServer server; std::string configPath( "config.ini" ); void reloadConfig() { - m_pConfig = std::make_shared< Core::ConfigMgr >(); + m_pConfig = std::make_shared< Sapphire::ConfigMgr >(); if( !m_pConfig->loadConfig( configPath ) ) throw "Error loading config "; @@ -85,7 +85,7 @@ bool loadSettings( int32_t argc, char* argv[] ) try { - arg = Core::Util::toLowerCopy( std::string( args[ i ] ) ); + arg = Sapphire::Util::toLowerCopy( std::string( args[ i ] ) ); val = std::string( args[ i + 1 ] ); // trim '-' from start of arg @@ -146,9 +146,9 @@ bool loadSettings( int32_t argc, char* argv[] ) return false; } - Core::Db::DbLoader loader; + Sapphire::Db::DbLoader loader; - Core::Db::ConnectionInfo info; + Sapphire::Db::ConnectionInfo info; info.password = m_pConfig->getValue< std::string >( "Database", "Password", "" ); info.host = m_pConfig->getValue< std::string >( "Database", "Host", "127.0.0.1" ); info.database = m_pConfig->getValue< std::string >( "Database", "Database", "sapphire" ); @@ -241,7 +241,7 @@ std::string buildHttpResponse( uint16_t rCode, const std::string& content = "", void getZoneName( shared_ptr< HttpServer::Response > response, shared_ptr< HttpServer::Request > request ) { string number = request->path_match[ 1 ]; - auto info = g_exdDataGen.get< Core::Data::TerritoryType >( atoi( number.c_str() ) ); + auto info = g_exdDataGen.get< Sapphire::Data::TerritoryType >( atoi( number.c_str() ) ); std::string responseStr = "Not found!"; if( info ) responseStr = info->name + ", " + info->bg; @@ -362,7 +362,7 @@ void createCharacter( shared_ptr< HttpServer::Response > response, shared_ptr< H std::string name = json["name"]; std::string infoJson = json["infoJson"]; - std::string finalJson = Core::Util::base64_decode( infoJson ); + std::string finalJson = Sapphire::Util::base64_decode( infoJson ); // reloadConfig(); @@ -732,8 +732,8 @@ void defaultGet( shared_ptr< HttpServer::Response > response, shared_ptr< HttpSe int main( int argc, char* argv[] ) { - auto pLog = std::shared_ptr< Core::Logger >( new Core::Logger() ); - g_fw.set< Core::Logger >( pLog ); + auto pLog = std::shared_ptr< Sapphire::Logger >( new Sapphire::Logger() ); + g_fw.set< Sapphire::Logger >( pLog ); g_log.setLogPath( "log/SapphireAPI" ); g_log.init(); diff --git a/src/servers/sapphire_api/server_http.hpp b/src/servers/sapphire_api/server_http.hpp index 5b6659fb..7c831e69 100644 --- a/src/servers/sapphire_api/server_http.hpp +++ b/src/servers/sapphire_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 Core::Util::toLowerCopy( key1 ) == Core::Util::toLowerCopy( key2 ); + return Sapphire::Util::toLowerCopy( key1 ) == Sapphire::Util::toLowerCopy( key2 ); } }; class case_insensitive_hash { @@ -27,7 +27,7 @@ public: { std::size_t seed=0; for( auto &c : key ) - Core::Util::hashCombine< char >( seed, std::tolower( c ) ); + Sapphire::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( Core::Util::toLowerCopy( it->second ) == "close" ) + if( Sapphire::Util::toLowerCopy( it->second ) == "close" ) return; } if(http_version>1.05) diff --git a/src/servers/sapphire_lobby/Forwards.h b/src/servers/sapphire_lobby/Forwards.h index 38fef5f3..9cc3ac76 100644 --- a/src/servers/sapphire_lobby/Forwards.h +++ b/src/servers/sapphire_lobby/Forwards.h @@ -12,12 +12,12 @@ x ## Ptr make_ ## x( Args &&...args ) { \ return std::make_shared< x >( std::forward< Args >( args ) ... ); }\ typedef std::vector< x > x ## PtrList; -namespace Core +namespace Sapphire { TYPE_FORWARD( LobbySession ); } -namespace Core::Network +namespace Sapphire::Network { TYPE_FORWARD( Hive ); TYPE_FORWARD( Acceptor ); @@ -25,7 +25,7 @@ namespace Core::Network TYPE_FORWARD( GameConnection ); } -namespace Core::Network::Packets +namespace Sapphire::Network::Packets { TYPE_FORWARD( GamePacket ); TYPE_FORWARD( FFXIVPacketBase ); diff --git a/src/servers/sapphire_lobby/GameConnection.cpp b/src/servers/sapphire_lobby/GameConnection.cpp index c56850ce..3f5e861e 100644 --- a/src/servers/sapphire_lobby/GameConnection.cpp +++ b/src/servers/sapphire_lobby/GameConnection.cpp @@ -15,29 +15,29 @@ #include "RestConnector.h" #include "LobbySession.h" -extern Core::Logger g_log; -extern Core::ServerLobby g_serverLobby; -extern Core::Network::RestConnector g_restConnector; +extern Sapphire::Logger g_log; +extern Sapphire::ServerLobby g_serverLobby; +extern Sapphire::Network::RestConnector g_restConnector; -using namespace Core::Common; -using namespace Core::Network::Packets; -using namespace Core::Network::Packets::Server; +using namespace Sapphire::Common; +using namespace Sapphire::Network::Packets; +using namespace Sapphire::Network::Packets::Server; -Core::Network::GameConnection::GameConnection( Core::Network::HivePtr pHive, - Core::Network::AcceptorPtr pAcceptor ) +Sapphire::Network::GameConnection::GameConnection( Sapphire::Network::HivePtr pHive, + Sapphire::Network::AcceptorPtr pAcceptor ) : Connection( pHive ), m_pAcceptor( pAcceptor ), m_bEncryptionInitialized( false ) { } -Core::Network::GameConnection::~GameConnection() +Sapphire::Network::GameConnection::~GameConnection() { } // overwrite the parents onConnect for our game socket needs -void Core::Network::GameConnection::OnAccept( const std::string& host, uint16_t port ) +void Sapphire::Network::GameConnection::OnAccept( const std::string& host, uint16_t port ) { auto connection = make_GameConnection( m_hive, m_pAcceptor ); m_pAcceptor->Accept( connection ); @@ -46,12 +46,12 @@ void Core::Network::GameConnection::OnAccept( const std::string& host, uint16_t } -void Core::Network::GameConnection::OnDisconnect() +void Sapphire::Network::GameConnection::OnDisconnect() { g_log.debug( "DISCONNECT" ); } -void Core::Network::GameConnection::OnRecv( std::vector< uint8_t >& buffer ) +void Sapphire::Network::GameConnection::OnRecv( std::vector< uint8_t >& buffer ) { Packets::FFXIVARR_PACKET_HEADER packetHeader; const auto headerResult = Packets::getHeader( buffer, 0, packetHeader ); @@ -96,13 +96,13 @@ void Core::Network::GameConnection::OnRecv( std::vector< uint8_t >& buffer ) } -void Core::Network::GameConnection::OnError( const asio::error_code& error ) +void Sapphire::Network::GameConnection::OnError( const asio::error_code& error ) { g_log.info( "GameConnection closed: " + error.message() ); } void -Core::Network::GameConnection::sendError( uint64_t sequence, uint32_t errorcode, uint16_t messageId, uint32_t tmpId ) +Sapphire::Network::GameConnection::sendError( uint64_t sequence, uint32_t errorcode, uint16_t messageId, uint32_t tmpId ) { auto errorPacket = makeLobbyPacket< FFXIVIpcLobbyError >( tmpId ); errorPacket->data().seq = sequence; @@ -114,7 +114,7 @@ Core::Network::GameConnection::sendError( uint64_t sequence, uint32_t errorcode, sendPacket( pRP ); } -void Core::Network::GameConnection::getCharList( FFXIVARR_PACKET_RAW& packet, uint32_t tmpId ) +void Sapphire::Network::GameConnection::getCharList( FFXIVARR_PACKET_RAW& packet, uint32_t tmpId ) { uint64_t sequence = *reinterpret_cast< uint64_t* >( &packet.data[ 0 ] + 0x10 ); g_log.info( "Sequence [" + std::to_string( sequence ) + "]" ); @@ -199,7 +199,7 @@ void Core::Network::GameConnection::getCharList( FFXIVARR_PACKET_RAW& packet, ui } } -void Core::Network::GameConnection::enterWorld( FFXIVARR_PACKET_RAW& packet, uint32_t tmpId ) +void Sapphire::Network::GameConnection::enterWorld( FFXIVARR_PACKET_RAW& packet, uint32_t tmpId ) { uint64_t sequence = *reinterpret_cast< uint64_t* >( &packet.data[ 0 ] + 0x10 ); g_log.info( "Sequence [" + std::to_string( sequence ) + "]" ); @@ -243,7 +243,7 @@ void Core::Network::GameConnection::enterWorld( FFXIVARR_PACKET_RAW& packet, uin sendPacket( pRP ); } -bool Core::Network::GameConnection::sendServiceAccountList( FFXIVARR_PACKET_RAW& packet, uint32_t tmpId ) +bool Sapphire::Network::GameConnection::sendServiceAccountList( FFXIVARR_PACKET_RAW& packet, uint32_t tmpId ) { LobbySessionPtr pSession = g_serverLobby.getSession( ( char* ) &packet.data[ 0 ] + 0x20 ); @@ -282,7 +282,7 @@ bool Core::Network::GameConnection::sendServiceAccountList( FFXIVARR_PACKET_RAW& return false; } -bool Core::Network::GameConnection::createOrModifyChar( FFXIVARR_PACKET_RAW& packet, uint32_t tmpId ) +bool Sapphire::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 ); @@ -395,7 +395,7 @@ bool Core::Network::GameConnection::createOrModifyChar( FFXIVARR_PACKET_RAW& pac return false; } -void Core::Network::GameConnection::handleGamePacket( Packets::FFXIVARR_PACKET_RAW& packet ) +void Sapphire::Network::GameConnection::handleGamePacket( Packets::FFXIVARR_PACKET_RAW& packet ) { uint32_t tmpId = packet.segHdr.target_actor; @@ -433,7 +433,7 @@ void Core::Network::GameConnection::handleGamePacket( Packets::FFXIVARR_PACKET_R } -void Core::Network::GameConnection::sendPacket( Packets::LobbyPacketContainer& pLpc ) +void Sapphire::Network::GameConnection::sendPacket( Packets::LobbyPacketContainer& pLpc ) { uint16_t size = pLpc.getSize(); uint8_t* dataPtr = pLpc.getRawData( false ); @@ -442,7 +442,7 @@ void Core::Network::GameConnection::sendPacket( Packets::LobbyPacketContainer& p Send( sendBuffer ); } -void Core::Network::GameConnection::sendPackets( Packets::PacketContainer* pPacket ) +void Sapphire::Network::GameConnection::sendPackets( Packets::PacketContainer* pPacket ) { //g_log.Log(LoggingSeverity::info, pPacket->toString()); std::vector< uint8_t > sendBuffer; @@ -451,14 +451,14 @@ void Core::Network::GameConnection::sendPackets( Packets::PacketContainer* pPack Send( sendBuffer ); } -void Core::Network::GameConnection::sendSinglePacket( FFXIVPacketBasePtr pPacket ) +void Sapphire::Network::GameConnection::sendSinglePacket( FFXIVPacketBasePtr pPacket ) { PacketContainer pRP = PacketContainer(); pRP.addPacket( pPacket ); sendPackets( &pRP ); } -void Core::Network::GameConnection::generateEncryptionKey( uint32_t key, const std::string& keyPhrase ) +void Sapphire::Network::GameConnection::generateEncryptionKey( uint32_t key, const std::string& keyPhrase ) { memset( m_baseKey, 0, 0x2C ); m_baseKey[ 0 ] = 0x78; @@ -469,11 +469,11 @@ void Core::Network::GameConnection::generateEncryptionKey( uint32_t key, const s m_baseKey[ 8 ] = 0x30; m_baseKey[ 9 ] = 0x11; memcpy( ( char* ) m_baseKey + 0x0C, keyPhrase.c_str(), keyPhrase.size() ); - Core::Util::md5( m_baseKey, m_encKey, 0x2C ); + Sapphire::Util::md5( m_baseKey, m_encKey, 0x2C ); } -void Core::Network::GameConnection::handlePackets( const Core::Network::Packets::FFXIVARR_PACKET_HEADER& ipcHeader, - const std::vector< Core::Network::Packets::FFXIVARR_PACKET_RAW >& packetData ) +void Sapphire::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/servers/sapphire_lobby/GameConnection.h b/src/servers/sapphire_lobby/GameConnection.h index 1778cb91..d4626407 100644 --- a/src/servers/sapphire_lobby/GameConnection.h +++ b/src/servers/sapphire_lobby/GameConnection.h @@ -16,7 +16,7 @@ #define DECLARE_HANDLER( x ) void x( Packets::GamePacketPtr pInPacket, Entity::PlayerPtr pPlayer ) -namespace Core::Network +namespace Sapphire::Network { class GameConnection : public Connection diff --git a/src/servers/sapphire_lobby/LobbyPacketContainer.cpp b/src/servers/sapphire_lobby/LobbyPacketContainer.cpp index 0927056a..5f4c9a99 100644 --- a/src/servers/sapphire_lobby/LobbyPacketContainer.cpp +++ b/src/servers/sapphire_lobby/LobbyPacketContainer.cpp @@ -4,25 +4,25 @@ #include #include -using namespace Core::Common; -using namespace Core::Network::Packets; +using namespace Sapphire::Common; +using namespace Sapphire::Network::Packets; -Core::Network::Packets::LobbyPacketContainer::LobbyPacketContainer( uint8_t* encKey ) +Sapphire::Network::Packets::LobbyPacketContainer::LobbyPacketContainer( uint8_t* encKey ) { - memset( &m_header, 0, sizeof( Core::Network::Packets::FFXIVARR_PACKET_HEADER ) ); - m_header.size = sizeof( Core::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; memset( m_dataBuf, 0, 0x1570 ); } -Core::Network::Packets::LobbyPacketContainer::~LobbyPacketContainer() +Sapphire::Network::Packets::LobbyPacketContainer::~LobbyPacketContainer() { m_entryList.clear(); } -void Core::Network::Packets::LobbyPacketContainer::addPacket( FFXIVPacketBasePtr pEntry ) +void Sapphire::Network::Packets::LobbyPacketContainer::addPacket( FFXIVPacketBasePtr pEntry ) { memcpy( m_dataBuf + m_header.size, &pEntry->getData()[ 0 ], pEntry->getSize() ); @@ -38,18 +38,18 @@ void Core::Network::Packets::LobbyPacketContainer::addPacket( FFXIVPacketBasePtr m_header.count++; } -uint16_t Core::Network::Packets::LobbyPacketContainer::getSize() const +uint16_t Sapphire::Network::Packets::LobbyPacketContainer::getSize() const { return m_header.size; } -uint8_t* Core::Network::Packets::LobbyPacketContainer::getRawData( bool addstuff ) +uint8_t* Sapphire::Network::Packets::LobbyPacketContainer::getRawData( bool addstuff ) { if( addstuff ) { m_header.unknown_0 = 0xff41a05252; - m_header.timestamp = Core::Util::getTimeMs(); + m_header.timestamp = Sapphire::Util::getTimeMs(); } - memcpy( m_dataBuf, &m_header, sizeof( Core::Network::Packets::FFXIVARR_PACKET_HEADER ) ); + memcpy( m_dataBuf, &m_header, sizeof( Sapphire::Network::Packets::FFXIVARR_PACKET_HEADER ) ); return m_dataBuf; } diff --git a/src/servers/sapphire_lobby/LobbyPacketContainer.h b/src/servers/sapphire_lobby/LobbyPacketContainer.h index 45bd2fee..9f40ef93 100644 --- a/src/servers/sapphire_lobby/LobbyPacketContainer.h +++ b/src/servers/sapphire_lobby/LobbyPacketContainer.h @@ -9,7 +9,7 @@ #include "Forwards.h" -namespace Core::Network::Packets +namespace Sapphire::Network::Packets { using FFXIVPacketBasePtr = std::shared_ptr< FFXIVPacketBase >; @@ -28,7 +28,7 @@ namespace Core::Network::Packets uint8_t* getRawData( bool addstuff = true ); private: - Core::Network::Packets::FFXIVARR_PACKET_HEADER m_header; + Sapphire::Network::Packets::FFXIVARR_PACKET_HEADER m_header; uint8_t* m_encKey; diff --git a/src/servers/sapphire_lobby/LobbySession.cpp b/src/servers/sapphire_lobby/LobbySession.cpp index 3a20dfd4..4cdd58b8 100644 --- a/src/servers/sapphire_lobby/LobbySession.cpp +++ b/src/servers/sapphire_lobby/LobbySession.cpp @@ -1,6 +1,6 @@ #include "LobbySession.h" -namespace Core { +namespace Sapphire { LobbySession::LobbySession( void ) { //setSocket(NULL); diff --git a/src/servers/sapphire_lobby/LobbySession.h b/src/servers/sapphire_lobby/LobbySession.h index 43226269..95eeb5f8 100644 --- a/src/servers/sapphire_lobby/LobbySession.h +++ b/src/servers/sapphire_lobby/LobbySession.h @@ -7,7 +7,7 @@ #include #include -namespace Core +namespace Sapphire { class LobbySession diff --git a/src/servers/sapphire_lobby/RestConnector.cpp b/src/servers/sapphire_lobby/RestConnector.cpp index 96ac9c6f..54a78236 100644 --- a/src/servers/sapphire_lobby/RestConnector.cpp +++ b/src/servers/sapphire_lobby/RestConnector.cpp @@ -8,21 +8,21 @@ #include -extern Core::Logger g_log; +extern Sapphire::Logger g_log; typedef std::vector< std::tuple< std::string, uint32_t, uint64_t, std::string > > CharList; -Core::Network::RestConnector::RestConnector() +Sapphire::Network::RestConnector::RestConnector() { } -Core::Network::RestConnector::~RestConnector() +Sapphire::Network::RestConnector::~RestConnector() { } -HttpResponse Core::Network::RestConnector::requestApi( std::string endpoint, std::string data ) +HttpResponse Sapphire::Network::RestConnector::requestApi( std::string endpoint, std::string data ) { HttpClient client( restHost ); @@ -41,7 +41,7 @@ HttpResponse Core::Network::RestConnector::requestApi( std::string endpoint, std return r; } -Core::LobbySessionPtr Core::Network::RestConnector::getSession( char* sId ) +Sapphire::LobbySessionPtr Sapphire::Network::RestConnector::getSession( char* sId ) { std::string json_string = "{\"sId\": \"" + std::string( sId ) + "\",\"secret\": \"" + serverSecret + "\"}"; @@ -67,7 +67,7 @@ Core::LobbySessionPtr Core::Network::RestConnector::getSession( char* sId ) if( content.find( "invalid" ) == std::string::npos ) { - LobbySessionPtr pSession( new Core::LobbySession() ); + LobbySessionPtr pSession( new Sapphire::LobbySession() ); pSession->setAccountID( json["result"].get< uint32_t >() ); pSession->setSessionId( ( uint8_t* ) sId ); return pSession; @@ -83,7 +83,7 @@ Core::LobbySessionPtr Core::Network::RestConnector::getSession( char* sId ) } } -bool Core::Network::RestConnector::checkNameTaken( std::string name ) +bool Sapphire::Network::RestConnector::checkNameTaken( std::string name ) { std::string json_string = "{\"name\": \"" + name + "\",\"secret\": \"" + serverSecret + "\"}"; @@ -117,7 +117,7 @@ bool Core::Network::RestConnector::checkNameTaken( std::string name ) } } -uint32_t Core::Network::RestConnector::getNextCharId() +uint32_t Sapphire::Network::RestConnector::getNextCharId() { std::string json_string = "{\"secret\": \"" + serverSecret + "\"}"; @@ -156,7 +156,7 @@ uint32_t Core::Network::RestConnector::getNextCharId() } } -uint64_t Core::Network::RestConnector::getNextContentId() +uint64_t Sapphire::Network::RestConnector::getNextContentId() { std::string json_string = "{\"secret\": \"" + serverSecret + "\"}"; @@ -195,7 +195,7 @@ uint64_t Core::Network::RestConnector::getNextContentId() } } -CharList Core::Network::RestConnector::getCharList( char* sId ) +CharList Sapphire::Network::RestConnector::getCharList( char* sId ) { std::string json_string = "{\"sId\": \"" + std::string( sId, 56 ) + "\",\"secret\": \"" + serverSecret + "\"}"; @@ -251,7 +251,7 @@ CharList Core::Network::RestConnector::getCharList( char* sId ) } } -bool Core::Network::RestConnector::deleteCharacter( char* sId, std::string name ) +bool Sapphire::Network::RestConnector::deleteCharacter( char* sId, std::string name ) { std::string json_string = "{\"sId\": \"" + std::string( sId, 56 ) + "\",\"secret\": \"" + serverSecret + "\",\"name\": \"" + name + "\"}"; @@ -285,11 +285,11 @@ bool Core::Network::RestConnector::deleteCharacter( char* sId, std::string name } } -int Core::Network::RestConnector::createCharacter( char* sId, std::string name, std::string infoJson ) +int Sapphire::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\": \"" + Core::Util::base64_encode( ( uint8_t* ) infoJson.c_str(), infoJson.length() ) + "\"}"; + "\",\"infoJson\": \"" + Sapphire::Util::base64_encode( ( uint8_t* ) infoJson.c_str(), infoJson.length() ) + "\"}"; HttpResponse r = requestApi( "createCharacter", json_string ); diff --git a/src/servers/sapphire_lobby/RestConnector.h b/src/servers/sapphire_lobby/RestConnector.h index e56bdd32..b8c2935c 100644 --- a/src/servers/sapphire_lobby/RestConnector.h +++ b/src/servers/sapphire_lobby/RestConnector.h @@ -10,12 +10,12 @@ using HttpClient = SimpleWeb::Client< SimpleWeb::HTTP >; using HttpResponse = std::shared_ptr< SimpleWeb::ClientBase< SimpleWeb::HTTP >::Response >; -namespace Core +namespace Sapphire { class Session; } -namespace Core::Network +namespace Sapphire::Network { class LobbySession; diff --git a/src/servers/sapphire_lobby/ServerLobby.cpp b/src/servers/sapphire_lobby/ServerLobby.cpp index 64f552af..bfaaeb53 100644 --- a/src/servers/sapphire_lobby/ServerLobby.cpp +++ b/src/servers/sapphire_lobby/ServerLobby.cpp @@ -21,10 +21,10 @@ #include -Core::Logger g_log; -Core::Network::RestConnector g_restConnector; +Sapphire::Logger g_log; +Sapphire::Network::RestConnector g_restConnector; -namespace Core { +namespace Sapphire { ServerLobby::ServerLobby( const std::string& configPath ) : diff --git a/src/servers/sapphire_lobby/ServerLobby.h b/src/servers/sapphire_lobby/ServerLobby.h index f927fc78..e0907682 100644 --- a/src/servers/sapphire_lobby/ServerLobby.h +++ b/src/servers/sapphire_lobby/ServerLobby.h @@ -8,7 +8,7 @@ const std::string LOBBY_VERSION = "0.0.5"; -namespace Core +namespace Sapphire { class LobbySession; class ConfigMgr; diff --git a/src/servers/sapphire_lobby/client_http.hpp b/src/servers/sapphire_lobby/client_http.hpp index dfca7326..fc30d950 100644 --- a/src/servers/sapphire_lobby/client_http.hpp +++ b/src/servers/sapphire_lobby/client_http.hpp @@ -17,7 +17,7 @@ class case_insensitive_equals { public: bool operator()(const std::string &key1, const std::string &key2) const { - return Core::Util::toLowerCopy( key1 ) == Core::Util::toLowerCopy( key2 ); + return Sapphire::Util::toLowerCopy( key1 ) == Sapphire::Util::toLowerCopy( key2 ); } }; class case_insensitive_hash { @@ -26,7 +26,7 @@ public: { std::size_t seed=0; for( auto &c : key ) - Core::Util::hashCombine< char >( seed, std::tolower( c ) ); + Sapphire::Util::hashCombine< char >( seed, std::tolower( c ) ); return seed; } }; diff --git a/src/servers/sapphire_lobby/mainLobbyServer.cpp b/src/servers/sapphire_lobby/mainLobbyServer.cpp index 16abe4d6..2ef742e4 100644 --- a/src/servers/sapphire_lobby/mainLobbyServer.cpp +++ b/src/servers/sapphire_lobby/mainLobbyServer.cpp @@ -1,6 +1,6 @@ #include "ServerLobby.h" -Core::ServerLobby g_serverLobby( "config.ini" ); +Sapphire::ServerLobby g_serverLobby( "config.ini" ); int main( int32_t argc, char* argv[] ) { diff --git a/src/servers/sapphire_zone/Action/Action.cpp b/src/servers/sapphire_zone/Action/Action.cpp index b1a0c0df..d6ae040a 100644 --- a/src/servers/sapphire_zone/Action/Action.cpp +++ b/src/servers/sapphire_zone/Action/Action.cpp @@ -3,66 +3,66 @@ #include -Core::Action::Action::Action() +Sapphire::Action::Action::Action() { } -Core::Action::Action::~Action() +Sapphire::Action::Action::~Action() { } -uint16_t Core::Action::Action::getId() const +uint16_t Sapphire::Action::Action::getId() const { return m_id; } -Core::Common::HandleActionType Core::Action::Action::getHandleActionType() const +Sapphire::Common::HandleActionType Sapphire::Action::Action::getHandleActionType() const { return m_handleActionType; } -Core::Entity::CharaPtr Core::Action::Action::getTargetChara() const +Sapphire::Entity::CharaPtr Sapphire::Action::Action::getTargetChara() const { return m_pTarget; } -bool Core::Action::Action::isInterrupted() const +bool Sapphire::Action::Action::isInterrupted() const { return m_bInterrupt; } -void Core::Action::Action::setInterrupted() +void Sapphire::Action::Action::setInterrupted() { m_bInterrupt = true; } -uint64_t Core::Action::Action::getStartTime() const +uint64_t Sapphire::Action::Action::getStartTime() const { return m_startTime; } -void Core::Action::Action::setStartTime( uint64_t startTime ) +void Sapphire::Action::Action::setStartTime( uint64_t startTime ) { m_startTime = startTime; } -uint32_t Core::Action::Action::getCastTime() const +uint32_t Sapphire::Action::Action::getCastTime() const { return m_castTime; } -void Core::Action::Action::setCastTime( uint32_t castTime ) +void Sapphire::Action::Action::setCastTime( uint32_t castTime ) { m_castTime = castTime; } -Core::Entity::CharaPtr Core::Action::Action::getActionSource() const +Sapphire::Entity::CharaPtr Sapphire::Action::Action::getActionSource() const { return m_pSource; } -bool Core::Action::Action::update() +bool Sapphire::Action::Action::update() { // action has not been started yet if( m_startTime == 0 ) diff --git a/src/servers/sapphire_zone/Action/Action.h b/src/servers/sapphire_zone/Action/Action.h index 1c559507..7d75d0a3 100644 --- a/src/servers/sapphire_zone/Action/Action.h +++ b/src/servers/sapphire_zone/Action/Action.h @@ -4,7 +4,7 @@ #include #include "ForwardsZone.h" -namespace Core::Action +namespace Sapphire::Action { class Action diff --git a/src/servers/sapphire_zone/Action/ActionCast.cpp b/src/servers/sapphire_zone/Action/ActionCast.cpp index 91aa9667..98c24bf0 100644 --- a/src/servers/sapphire_zone/Action/ActionCast.cpp +++ b/src/servers/sapphire_zone/Action/ActionCast.cpp @@ -16,34 +16,34 @@ #include "ActionCast.h" #include "Framework.h" -using namespace Core::Common; -using namespace Core::Network; -using namespace Core::Network::Packets; -using namespace Core::Network::Packets::Server; -using namespace Core::Network::ActorControl; +using namespace Sapphire::Common; +using namespace Sapphire::Network; +using namespace Sapphire::Network::Packets; +using namespace Sapphire::Network::Packets::Server; +using namespace Sapphire::Network::ActorControl; -extern Core::Framework g_fw; +extern Sapphire::Framework g_fw; -Core::Action::ActionCast::ActionCast() +Sapphire::Action::ActionCast::ActionCast() { m_handleActionType = Common::HandleActionType::Event; } -Core::Action::ActionCast::ActionCast( Entity::CharaPtr pActor, Entity::CharaPtr pTarget, uint16_t actionId ) +Sapphire::Action::ActionCast::ActionCast( Entity::CharaPtr pActor, Entity::CharaPtr pTarget, uint16_t actionId ) { auto pExdData = g_fw.get< Data::ExdDataGenerated >(); m_startTime = 0; m_id = actionId; m_handleActionType = HandleActionType::Spell; - m_castTime = pExdData->get< Core::Data::Action >( actionId )->cast100ms * 100; // TODO: Add security checks. + m_castTime = pExdData->get< Sapphire::Data::Action >( actionId )->cast100ms * 100; // TODO: Add security checks. m_pSource = pActor; m_pTarget = pTarget; m_bInterrupt = false; } -Core::Action::ActionCast::~ActionCast() = default; +Sapphire::Action::ActionCast::~ActionCast() = default; -void Core::Action::ActionCast::onStart() +void Sapphire::Action::ActionCast::onStart() { if( !m_pSource ) return; @@ -65,7 +65,7 @@ void Core::Action::ActionCast::onStart() } -void Core::Action::ActionCast::onFinish() +void Sapphire::Action::ActionCast::onFinish() { if( !m_pSource ) return; @@ -84,7 +84,7 @@ void Core::Action::ActionCast::onFinish() pScriptMgr->onCastFinish( *pPlayer, m_pTarget, m_id ); } -void Core::Action::ActionCast::onInterrupt() +void Sapphire::Action::ActionCast::onInterrupt() { if( !m_pSource ) return; diff --git a/src/servers/sapphire_zone/Action/ActionCast.h b/src/servers/sapphire_zone/Action/ActionCast.h index 3ec9ce01..c5a03689 100644 --- a/src/servers/sapphire_zone/Action/ActionCast.h +++ b/src/servers/sapphire_zone/Action/ActionCast.h @@ -4,7 +4,7 @@ #include "ForwardsZone.h" #include "Action.h" -namespace Core::Action +namespace Sapphire::Action { class ActionCast : public Action diff --git a/src/servers/sapphire_zone/Action/ActionCollision.cpp b/src/servers/sapphire_zone/Action/ActionCollision.cpp index b3169afb..92666c73 100644 --- a/src/servers/sapphire_zone/Action/ActionCollision.cpp +++ b/src/servers/sapphire_zone/Action/ActionCollision.cpp @@ -11,8 +11,8 @@ #include #include -using namespace Core::Entity; -using namespace Core::Common; +using namespace Sapphire::Entity; +using namespace Sapphire::Common; // todo: add AoE actor limits (16, 32) @@ -53,9 +53,9 @@ bool ActionCollision::isActorApplicable( Actor& actor, TargetFilter targetFilter return ( actorApplicable && actor.getAsChara()->isAlive() ); } -std::set< Core::Entity::ActorPtr > ActionCollision::getActorsHitFromAction( FFXIVARR_POSITION3 aoePosition, +std::set< Sapphire::Entity::ActorPtr > ActionCollision::getActorsHitFromAction( FFXIVARR_POSITION3 aoePosition, std::set< ActorPtr > actorsInRange, - std::shared_ptr< Core::Data::Action > actionInfo, + std::shared_ptr< Sapphire::Data::Action > actionInfo, TargetFilter targetFilter ) { std::set< ActorPtr > actorsCollided; @@ -129,7 +129,7 @@ std::set< Core::Entity::ActorPtr > ActionCollision::getActorsHitFromAction( FFXI bool ActionCollision::radiusCollision( FFXIVARR_POSITION3 actorPosition, FFXIVARR_POSITION3 aoePosition, uint16_t radius ) { - return Core::Math::Util::distance( actorPosition.x, actorPosition.y, actorPosition.z, + return Sapphire::Math::Util::distance( actorPosition.x, actorPosition.y, actorPosition.z, aoePosition.x, aoePosition.y, aoePosition.z ) <= radius; } diff --git a/src/servers/sapphire_zone/Action/ActionCollision.h b/src/servers/sapphire_zone/Action/ActionCollision.h index f16f9be2..9c9f5e18 100644 --- a/src/servers/sapphire_zone/Action/ActionCollision.h +++ b/src/servers/sapphire_zone/Action/ActionCollision.h @@ -4,12 +4,12 @@ #include #include "ForwardsZone.h" -namespace Core::Data +namespace Sapphire::Data { struct Action; } -namespace Core::Entity +namespace Sapphire::Entity { enum class TargetFilter diff --git a/src/servers/sapphire_zone/Action/ActionMount.cpp b/src/servers/sapphire_zone/Action/ActionMount.cpp index 2b86f592..c8ec1afb 100644 --- a/src/servers/sapphire_zone/Action/ActionMount.cpp +++ b/src/servers/sapphire_zone/Action/ActionMount.cpp @@ -15,20 +15,20 @@ #include "ActionMount.h" #include "Framework.h" -using namespace Core::Common; -using namespace Core::Network; -using namespace Core::Network::Packets; -using namespace Core::Network::Packets::Server; -using namespace Core::Network::ActorControl; +using namespace Sapphire::Common; +using namespace Sapphire::Network; +using namespace Sapphire::Network::Packets; +using namespace Sapphire::Network::Packets::Server; +using namespace Sapphire::Network::ActorControl; -extern Core::Framework g_framework; +extern Sapphire::Framework g_framework; -Core::Action::ActionMount::ActionMount() +Sapphire::Action::ActionMount::ActionMount() { m_handleActionType = HandleActionType::Event; } -Core::Action::ActionMount::ActionMount( Entity::CharaPtr pActor, uint16_t mountId ) +Sapphire::Action::ActionMount::ActionMount( Entity::CharaPtr pActor, uint16_t mountId ) { m_startTime = 0; m_id = mountId; @@ -38,12 +38,12 @@ Core::Action::ActionMount::ActionMount( Entity::CharaPtr pActor, uint16_t mountI m_bInterrupt = false; } -Core::Action::ActionMount::~ActionMount() +Sapphire::Action::ActionMount::~ActionMount() { } -void Core::Action::ActionMount::onStart() +void Sapphire::Action::ActionMount::onStart() { if( !m_pSource ) return; @@ -64,7 +64,7 @@ void Core::Action::ActionMount::onStart() } -void Core::Action::ActionMount::onFinish() +void Sapphire::Action::ActionMount::onFinish() { if( !m_pSource ) return; @@ -89,7 +89,7 @@ void Core::Action::ActionMount::onFinish() pPlayer->mount( m_id ); } -void Core::Action::ActionMount::onInterrupt() +void Sapphire::Action::ActionMount::onInterrupt() { if( !m_pSource ) return; diff --git a/src/servers/sapphire_zone/Action/ActionMount.h b/src/servers/sapphire_zone/Action/ActionMount.h index 689832ce..3fbcb96e 100644 --- a/src/servers/sapphire_zone/Action/ActionMount.h +++ b/src/servers/sapphire_zone/Action/ActionMount.h @@ -4,7 +4,7 @@ #include "ForwardsZone.h" #include "Action.h" -namespace Core::Action +namespace Sapphire::Action { class ActionMount : public Action diff --git a/src/servers/sapphire_zone/Action/ActionTeleport.cpp b/src/servers/sapphire_zone/Action/ActionTeleport.cpp index 012107c4..27c3cf84 100644 --- a/src/servers/sapphire_zone/Action/ActionTeleport.cpp +++ b/src/servers/sapphire_zone/Action/ActionTeleport.cpp @@ -13,38 +13,38 @@ #include "ActionTeleport.h" #include "Framework.h" -using namespace Core::Common; -using namespace Core::Network; -using namespace Core::Network::Packets; -using namespace Core::Network::Packets::Server; -using namespace Core::Network::ActorControl; +using namespace Sapphire::Common; +using namespace Sapphire::Network; +using namespace Sapphire::Network::Packets; +using namespace Sapphire::Network::Packets::Server; +using namespace Sapphire::Network::ActorControl; -extern Core::Framework g_fw; +extern Sapphire::Framework g_fw; -Core::Action::ActionTeleport::ActionTeleport() +Sapphire::Action::ActionTeleport::ActionTeleport() { m_handleActionType = HandleActionType::Event; } -Core::Action::ActionTeleport::ActionTeleport( Entity::CharaPtr pActor, uint16_t targetZone, uint16_t cost ) +Sapphire::Action::ActionTeleport::ActionTeleport( Entity::CharaPtr pActor, uint16_t targetZone, uint16_t cost ) { auto pExdData = g_fw.get< Data::ExdDataGenerated >(); m_startTime = 0; m_id = 5; m_handleActionType = HandleActionType::Teleport; - m_castTime = pExdData->get< Core::Data::Action >( 5 )->cast100ms * 100; // TODO: Add security checks. + m_castTime = pExdData->get< Sapphire::Data::Action >( 5 )->cast100ms * 100; // TODO: Add security checks. m_pSource = pActor; m_bInterrupt = false; m_targetAetheryte = targetZone; m_cost = cost; } -Core::Action::ActionTeleport::~ActionTeleport() +Sapphire::Action::ActionTeleport::~ActionTeleport() { } -void Core::Action::ActionTeleport::onStart() +void Sapphire::Action::ActionTeleport::onStart() { if( !m_pSource ) return; @@ -62,7 +62,7 @@ void Core::Action::ActionTeleport::onStart() } -void Core::Action::ActionTeleport::onFinish() +void Sapphire::Action::ActionTeleport::onFinish() { if( !m_pSource ) return; @@ -94,7 +94,7 @@ void Core::Action::ActionTeleport::onFinish() pPlayer->teleport( m_targetAetheryte ); } -void Core::Action::ActionTeleport::onInterrupt() +void Sapphire::Action::ActionTeleport::onInterrupt() { if( !m_pSource ) return; diff --git a/src/servers/sapphire_zone/Action/ActionTeleport.h b/src/servers/sapphire_zone/Action/ActionTeleport.h index 21c9fb7b..33595b87 100644 --- a/src/servers/sapphire_zone/Action/ActionTeleport.h +++ b/src/servers/sapphire_zone/Action/ActionTeleport.h @@ -4,7 +4,7 @@ #include "ForwardsZone.h" #include "Action.h" -namespace Core::Action +namespace Sapphire::Action { class ActionTeleport : public Action diff --git a/src/servers/sapphire_zone/Action/EventAction.cpp b/src/servers/sapphire_zone/Action/EventAction.cpp index c8730296..abe398f2 100644 --- a/src/servers/sapphire_zone/Action/EventAction.cpp +++ b/src/servers/sapphire_zone/Action/EventAction.cpp @@ -11,20 +11,20 @@ #include "EventAction.h" #include "Framework.h" -extern Core::Framework g_fw; +extern Sapphire::Framework g_fw; -using namespace Core::Common; -using namespace Core::Network; -using namespace Core::Network::Packets; -using namespace Core::Network::Packets::Server; -using namespace Core::Network::ActorControl; +using namespace Sapphire::Common; +using namespace Sapphire::Network; +using namespace Sapphire::Network::Packets; +using namespace Sapphire::Network::Packets::Server; +using namespace Sapphire::Network::ActorControl; -Core::Action::EventAction::EventAction() +Sapphire::Action::EventAction::EventAction() { m_handleActionType = HandleActionType::Event; } -Core::Action::EventAction::EventAction( Entity::CharaPtr pActor, uint32_t eventId, uint16_t action, +Sapphire::Action::EventAction::EventAction( Entity::CharaPtr pActor, uint32_t eventId, uint16_t action, ActionCallback finishRef, ActionCallback interruptRef, uint64_t additional ) { auto pExdData = g_fw.get< Data::ExdDataGenerated >(); @@ -33,19 +33,19 @@ Core::Action::EventAction::EventAction( Entity::CharaPtr pActor, uint32_t eventI m_handleActionType = HandleActionType::Event; m_eventId = eventId; m_id = action; - m_castTime = pExdData->get< Core::Data::EventAction >( action )->castTime * 1000; // TODO: Add security checks. + m_castTime = pExdData->get< Sapphire::Data::EventAction >( action )->castTime * 1000; // TODO: Add security checks. m_onActionFinishClb = finishRef; m_onActionInterruptClb = interruptRef; m_pSource = pActor; m_bInterrupt = false; } -Core::Action::EventAction::~EventAction() +Sapphire::Action::EventAction::~EventAction() { } -void Core::Action::EventAction::onStart() +void Sapphire::Action::EventAction::onStart() { if( !m_pSource ) return; @@ -64,7 +64,7 @@ void Core::Action::EventAction::onStart() m_pSource->sendToInRangeSet( control ); } -void Core::Action::EventAction::onFinish() +void Sapphire::Action::EventAction::onFinish() { if( !m_pSource ) return; @@ -101,7 +101,7 @@ void Core::Action::EventAction::onFinish() } -void Core::Action::EventAction::onInterrupt() +void Sapphire::Action::EventAction::onInterrupt() { if( !m_pSource ) return; diff --git a/src/servers/sapphire_zone/Action/EventAction.h b/src/servers/sapphire_zone/Action/EventAction.h index 728231d0..1d10c8b1 100644 --- a/src/servers/sapphire_zone/Action/EventAction.h +++ b/src/servers/sapphire_zone/Action/EventAction.h @@ -6,7 +6,7 @@ #include "ForwardsZone.h" #include "Action.h" -namespace Core::Action +namespace Sapphire::Action { class EventAction : public Action diff --git a/src/servers/sapphire_zone/Action/EventItemAction.cpp b/src/servers/sapphire_zone/Action/EventItemAction.cpp index 4c4d96e7..926af056 100644 --- a/src/servers/sapphire_zone/Action/EventItemAction.cpp +++ b/src/servers/sapphire_zone/Action/EventItemAction.cpp @@ -14,20 +14,20 @@ #include "EventItemAction.h" #include "Framework.h" -extern Core::Framework g_fw; +extern Sapphire::Framework g_fw; -using namespace Core::Common; -using namespace Core::Network; -using namespace Core::Network::Packets; -using namespace Core::Network::Packets::Server; -using namespace Core::Network::ActorControl; +using namespace Sapphire::Common; +using namespace Sapphire::Network; +using namespace Sapphire::Network::Packets; +using namespace Sapphire::Network::Packets::Server; +using namespace Sapphire::Network::ActorControl; -Core::Action::EventItemAction::EventItemAction() +Sapphire::Action::EventItemAction::EventItemAction() { m_handleActionType = HandleActionType::Event; } -Core::Action::EventItemAction::EventItemAction( Entity::CharaPtr pActor, uint32_t eventId, uint16_t action, +Sapphire::Action::EventItemAction::EventItemAction( Entity::CharaPtr pActor, uint32_t eventId, uint16_t action, ActionCallback finishRef, ActionCallback interruptRef, uint64_t additional ) { @@ -43,9 +43,9 @@ Core::Action::EventItemAction::EventItemAction( Entity::CharaPtr pActor, uint32_ m_bInterrupt = false; } -Core::Action::EventItemAction::~EventItemAction() = default; +Sapphire::Action::EventItemAction::~EventItemAction() = default; -void Core::Action::EventItemAction::onStart() +void Sapphire::Action::EventItemAction::onStart() { if( !m_pSource ) return; @@ -64,7 +64,7 @@ void Core::Action::EventItemAction::onStart() } -void Core::Action::EventItemAction::onFinish() +void Sapphire::Action::EventItemAction::onFinish() { if( !m_pSource ) return; @@ -89,7 +89,7 @@ void Core::Action::EventItemAction::onFinish() } -void Core::Action::EventItemAction::onInterrupt() +void Sapphire::Action::EventItemAction::onInterrupt() { if( !m_pSource ) return; diff --git a/src/servers/sapphire_zone/Action/EventItemAction.h b/src/servers/sapphire_zone/Action/EventItemAction.h index cdf29aca..323a41f2 100644 --- a/src/servers/sapphire_zone/Action/EventItemAction.h +++ b/src/servers/sapphire_zone/Action/EventItemAction.h @@ -4,7 +4,7 @@ #include "ForwardsZone.h" #include "Action.h" -namespace Core::Action +namespace Sapphire::Action { class EventItemAction : public Action diff --git a/src/servers/sapphire_zone/Actor/Actor.cpp b/src/servers/sapphire_zone/Actor/Actor.cpp index fdb174b7..62664869 100644 --- a/src/servers/sapphire_zone/Actor/Actor.cpp +++ b/src/servers/sapphire_zone/Actor/Actor.cpp @@ -29,39 +29,39 @@ #include "Framework.h" -extern Core::Framework g_fw; +extern Sapphire::Framework g_fw; -using namespace Core::Common; -using namespace Core::Network::Packets; -//using namespace Core::Network::Packets::Server; +using namespace Sapphire::Common; +using namespace Sapphire::Network::Packets; +//using namespace Sapphire::Network::Packets::Server; -Core::Entity::Actor::Actor( ObjKind type ) : +Sapphire::Entity::Actor::Actor( ObjKind type ) : m_objKind( type ) { } -uint32_t Core::Entity::Actor::getId() const +uint32_t Sapphire::Entity::Actor::getId() const { return m_id; } -void Core::Entity::Actor::setId( uint32_t id ) +void Sapphire::Entity::Actor::setId( uint32_t id ) { m_id = id; } -Core::Common::ObjKind Core::Entity::Actor::getObjKind() const +Sapphire::Common::ObjKind Sapphire::Entity::Actor::getObjKind() const { return m_objKind; } -Core::Common::FFXIVARR_POSITION3& Core::Entity::Actor::getPos() +Sapphire::Common::FFXIVARR_POSITION3& Sapphire::Entity::Actor::getPos() { return m_pos; } -void Core::Entity::Actor::setPos( float x, float y, float z ) +void Sapphire::Entity::Actor::setPos( float x, float y, float z ) { m_pos.x = x; m_pos.y = y; @@ -69,70 +69,70 @@ void Core::Entity::Actor::setPos( float x, float y, float z ) m_pCurrentZone->updateActorPosition( *this ); } -void Core::Entity::Actor::setPos( const Core::Common::FFXIVARR_POSITION3& pos ) +void Sapphire::Entity::Actor::setPos( const Sapphire::Common::FFXIVARR_POSITION3& pos ) { m_pos = pos; m_pCurrentZone->updateActorPosition( *this ); } -float Core::Entity::Actor::getRot() const +float Sapphire::Entity::Actor::getRot() const { return m_rot; } -void Core::Entity::Actor::setRot( float rot ) +void Sapphire::Entity::Actor::setRot( float rot ) { m_rot = rot; } -bool Core::Entity::Actor::isChara() const +bool Sapphire::Entity::Actor::isChara() const { return isPlayer() || isBattleNpc() || isEventNpc() || isRetainer() || isCompanion(); } -bool Core::Entity::Actor::isPlayer() const +bool Sapphire::Entity::Actor::isPlayer() const { return m_objKind == ObjKind::Player; } -bool Core::Entity::Actor::isEventNpc() const +bool Sapphire::Entity::Actor::isEventNpc() const { return m_objKind == ObjKind::EventNpc; } -bool Core::Entity::Actor::isBattleNpc() const +bool Sapphire::Entity::Actor::isBattleNpc() const { return m_objKind == ObjKind::BattleNpc; } -bool Core::Entity::Actor::isRetainer() const +bool Sapphire::Entity::Actor::isRetainer() const { return m_objKind == ObjKind::Retainer; } -bool Core::Entity::Actor::isCompanion() const +bool Sapphire::Entity::Actor::isCompanion() const { return m_objKind == ObjKind::Companion; } -bool Core::Entity::Actor::isEventObj() const +bool Sapphire::Entity::Actor::isEventObj() const { return m_objKind == ObjKind::EventObj; } -bool Core::Entity::Actor::isHousingEventObj() const +bool Sapphire::Entity::Actor::isHousingEventObj() const { return m_objKind == ObjKind::Housing; } -bool Core::Entity::Actor::isAetheryte() const +bool Sapphire::Entity::Actor::isAetheryte() const { return m_objKind == ObjKind::Aetheryte; } /*! \return pointer to this instance as ActorPtr */ -Core::Entity::CharaPtr Core::Entity::Actor::getAsChara() +Sapphire::Entity::CharaPtr Sapphire::Entity::Actor::getAsChara() { if( !isChara() ) return nullptr; @@ -140,7 +140,7 @@ Core::Entity::CharaPtr Core::Entity::Actor::getAsChara() } /*! \return pointer to this instance as PlayerPtr */ -Core::Entity::PlayerPtr Core::Entity::Actor::getAsPlayer() +Sapphire::Entity::PlayerPtr Sapphire::Entity::Actor::getAsPlayer() { if( !isPlayer() ) return nullptr; @@ -148,7 +148,7 @@ Core::Entity::PlayerPtr Core::Entity::Actor::getAsPlayer() } /*! \return pointer to this instance as EventObjPtr */ -Core::Entity::EventObjectPtr Core::Entity::Actor::getAsEventObj() +Sapphire::Entity::EventObjectPtr Sapphire::Entity::Actor::getAsEventObj() { if( !isEventObj() ) return nullptr; @@ -156,7 +156,7 @@ Core::Entity::EventObjectPtr Core::Entity::Actor::getAsEventObj() } /*! \return pointer to this instance as BNpcPtr */ -Core::Entity::BNpcPtr Core::Entity::Actor::getAsBNpc() +Sapphire::Entity::BNpcPtr Sapphire::Entity::Actor::getAsBNpc() { if( !isBattleNpc() ) return nullptr; @@ -169,7 +169,7 @@ but also to the global actor map \param ActorPtr to add */ -void Core::Entity::Actor::addInRangeActor( ActorPtr pActor ) +void Sapphire::Entity::Actor::addInRangeActor( ActorPtr pActor ) { // if this is null, something went wrong @@ -202,7 +202,7 @@ but also to the global actor map \param ActorPtr to remove */ -void Core::Entity::Actor::removeInRangeActor( Actor& actor ) +void Sapphire::Entity::Actor::removeInRangeActor( Actor& actor ) { // call virtual event onRemoveInRangeActor( actor ); @@ -223,12 +223,12 @@ void Core::Entity::Actor::removeInRangeActor( Actor& actor ) } /*! \return true if there is at least one actor in the in range set */ -bool Core::Entity::Actor::hasInRangeActor() const +bool Sapphire::Entity::Actor::hasInRangeActor() const { return ( m_inRangeActor.size() > 0 ); } -void Core::Entity::Actor::removeFromInRange() +void Sapphire::Entity::Actor::removeFromInRange() { if( !hasInRangeActor() ) return; @@ -248,14 +248,14 @@ check if a given actor is in the actors in range set \param ActorPtr to be checked for \return true if the actor was found */ -bool Core::Entity::Actor::isInRangeSet( ActorPtr pActor ) const +bool Sapphire::Entity::Actor::isInRangeSet( ActorPtr pActor ) const { return !( m_inRangeActor.find( pActor ) == m_inRangeActor.end() ); } /*! \return ActorPtr of the closest actor in range, if none, nullptr */ -Core::Entity::ActorPtr Core::Entity::Actor::getClosestActor() +Sapphire::Entity::ActorPtr Sapphire::Entity::Actor::getClosestActor() { if( m_inRangeActor.empty() ) // no actors in range, don't bother @@ -286,7 +286,7 @@ Core::Entity::ActorPtr Core::Entity::Actor::getClosestActor() } /*! Clear the whole in range set, this does no cleanup */ -void Core::Entity::Actor::clearInRangeSet() +void Sapphire::Entity::Actor::clearInRangeSet() { m_inRangeActor.clear(); m_inRangePlayers.clear(); @@ -299,7 +299,7 @@ Send a packet to all players in range, potentially to self if set and is player \param GamePacketPtr to send \param bool should be send to self? */ -void Core::Entity::Actor::sendToInRangeSet( Network::Packets::FFXIVPacketBasePtr pPacket, bool bToSelf ) +void Sapphire::Entity::Actor::sendToInRangeSet( Network::Packets::FFXIVPacketBasePtr pPacket, bool bToSelf ) { auto pServerZone = g_fw.get< ServerMgr >(); if( bToSelf && isPlayer() ) @@ -328,7 +328,7 @@ void Core::Entity::Actor::sendToInRangeSet( Network::Packets::FFXIVPacketBasePtr } /*! \return list of actors currently in range */ -std::set< Core::Entity::ActorPtr > Core::Entity::Actor::getInRangeActors( bool includeSelf ) +std::set< Sapphire::Entity::ActorPtr > Sapphire::Entity::Actor::getInRangeActors( bool includeSelf ) { auto tempInRange = m_inRangeActor; @@ -339,19 +339,19 @@ std::set< Core::Entity::ActorPtr > Core::Entity::Actor::getInRangeActors( bool i } /*! \return ZonePtr to the current zone, nullptr if not set */ -Core::ZonePtr Core::Entity::Actor::getCurrentZone() const +Sapphire::ZonePtr Sapphire::Entity::Actor::getCurrentZone() const { return m_pCurrentZone; } /*! \param ZonePtr to the zone to be set as current */ -void Core::Entity::Actor::setCurrentZone( ZonePtr currZone ) +void Sapphire::Entity::Actor::setCurrentZone( ZonePtr currZone ) { m_pCurrentZone = currZone; } /*! \return InstanceContentPtr to the current instance, nullptr if not an instance or not set */ -Core::InstanceContentPtr Core::Entity::Actor::getCurrentInstance() const +Sapphire::InstanceContentPtr Sapphire::Entity::Actor::getCurrentInstance() const { if( m_pCurrentZone ) return m_pCurrentZone->getAsInstanceContent(); @@ -364,7 +364,7 @@ Get the current cell of a region the actor is in \return Cell* */ -Core::Cell* Core::Entity::Actor::getCellPtr() +Sapphire::Cell* Sapphire::Entity::Actor::getCellPtr() { return m_pCell; } @@ -374,7 +374,7 @@ Set the current cell the actor is in \param Cell* for the cell to be set */ -void Core::Entity::Actor::setCell( Cell* pCell ) +void Sapphire::Entity::Actor::setCell( Cell* pCell ) { m_pCell = pCell; } diff --git a/src/servers/sapphire_zone/Actor/Actor.h b/src/servers/sapphire_zone/Actor/Actor.h index c5f3eb5a..bacb63e0 100644 --- a/src/servers/sapphire_zone/Actor/Actor.h +++ b/src/servers/sapphire_zone/Actor/Actor.h @@ -9,7 +9,7 @@ #include #include -namespace Core::Entity +namespace Sapphire::Entity { /*! @@ -40,7 +40,7 @@ namespace Core::Entity std::set< BNpcPtr > m_inRangeBNpc; /*! Parent cell in the zone */ - Core::Cell* m_pCell; + Sapphire::Cell* m_pCell; public: explicit Actor( Common::ObjKind type ); diff --git a/src/servers/sapphire_zone/Actor/BNpc.cpp b/src/servers/sapphire_zone/Actor/BNpc.cpp index baad273a..125235b3 100644 --- a/src/servers/sapphire_zone/Actor/BNpc.cpp +++ b/src/servers/sapphire_zone/Actor/BNpc.cpp @@ -31,18 +31,18 @@ #include "Framework.h" #include "Common.h" -extern Core::Framework g_fw; +extern Sapphire::Framework g_fw; -using namespace Core::Common; -using namespace Core::Network::Packets; -using namespace Core::Network::Packets::Server; -using namespace Core::Network::ActorControl; +using namespace Sapphire::Common; +using namespace Sapphire::Network::Packets; +using namespace Sapphire::Network::Packets::Server; +using namespace Sapphire::Network::ActorControl; -Core::Entity::BNpc::BNpc() : Npc( ObjKind::BattleNpc ) +Sapphire::Entity::BNpc::BNpc() : Npc( ObjKind::BattleNpc ) { } -Core::Entity::BNpc::BNpc( BNpcTemplatePtr pTemplate, float posX, float posY, float posZ, uint8_t level ) : Npc( ObjKind::BattleNpc ) +Sapphire::Entity::BNpc::BNpc( BNpcTemplatePtr pTemplate, float posX, float posY, float posZ, uint8_t level ) : Npc( ObjKind::BattleNpc ) { m_modelChara = pTemplate->getModelChara(); m_displayFlags = pTemplate->getDisplayFlags(); @@ -71,51 +71,51 @@ Core::Entity::BNpc::BNpc( BNpcTemplatePtr pTemplate, float posX, float posY, flo } -Core::Entity::BNpc::~BNpc() +Sapphire::Entity::BNpc::~BNpc() { } -uint8_t Core::Entity::BNpc::getAggressionMode() const +uint8_t Sapphire::Entity::BNpc::getAggressionMode() const { return m_aggressionMode; } -uint8_t Core::Entity::BNpc::getEnemyType() const +uint8_t Sapphire::Entity::BNpc::getEnemyType() const { return m_enemyType; } -uint64_t Core::Entity::BNpc::getWeaponMain() const +uint64_t Sapphire::Entity::BNpc::getWeaponMain() const { return m_weaponMain; } -uint64_t Core::Entity::BNpc::getWeaponSub() const +uint64_t Sapphire::Entity::BNpc::getWeaponSub() const { return m_weaponSub; } -uint16_t Core::Entity::BNpc::getModelChara() const +uint16_t Sapphire::Entity::BNpc::getModelChara() const { return m_modelChara; } -uint8_t Core::Entity::BNpc::getLevel() const +uint8_t Sapphire::Entity::BNpc::getLevel() const { return m_level; } -uint32_t Core::Entity::BNpc::getBNpcBaseId() const +uint32_t Sapphire::Entity::BNpc::getBNpcBaseId() const { return m_bNpcBaseId; } -uint32_t Core::Entity::BNpc::getBNpcNameId() const +uint32_t Sapphire::Entity::BNpc::getBNpcNameId() const { return m_bNpcNameId; } -void Core::Entity::BNpc::spawn( PlayerPtr pTarget ) +void Sapphire::Entity::BNpc::spawn( PlayerPtr pTarget ) { pTarget->queuePacket( std::make_shared< NpcSpawnPacket >( *getAsBNpc(), *pTarget ) ); } diff --git a/src/servers/sapphire_zone/Actor/BNpc.h b/src/servers/sapphire_zone/Actor/BNpc.h index 674a4313..220ec5cd 100644 --- a/src/servers/sapphire_zone/Actor/BNpc.h +++ b/src/servers/sapphire_zone/Actor/BNpc.h @@ -10,7 +10,7 @@ #include #include -namespace Core::Entity +namespace Sapphire::Entity { /*! diff --git a/src/servers/sapphire_zone/Actor/BNpcTemplate.cpp b/src/servers/sapphire_zone/Actor/BNpcTemplate.cpp index c313ac13..5646c9c4 100644 --- a/src/servers/sapphire_zone/Actor/BNpcTemplate.cpp +++ b/src/servers/sapphire_zone/Actor/BNpcTemplate.cpp @@ -2,7 +2,7 @@ #include #include -Core::Entity::BNpcTemplate::BNpcTemplate( uint32_t id, uint32_t baseId, uint32_t nameId, uint64_t weaponMain, uint64_t weaponSub, +Sapphire::Entity::BNpcTemplate::BNpcTemplate( uint32_t id, uint32_t baseId, uint32_t nameId, uint64_t weaponMain, uint64_t weaponSub, uint8_t aggressionMode, uint8_t enemyType, uint8_t onlineStatus, uint8_t pose, uint16_t modelChara, uint32_t displayFlags, uint32_t* modelEquip, uint8_t* customize ) : @@ -27,127 +27,127 @@ Core::Entity::BNpcTemplate::BNpcTemplate( uint32_t id, uint32_t baseId, uint32_t } -Core::Entity::BNpcTemplate::~BNpcTemplate() +Sapphire::Entity::BNpcTemplate::~BNpcTemplate() { } -uint32_t Core::Entity::BNpcTemplate::getId() const +uint32_t Sapphire::Entity::BNpcTemplate::getId() const { return m_id; } -void Core::Entity::BNpcTemplate::setId( uint32_t id ) +void Sapphire::Entity::BNpcTemplate::setId( uint32_t id ) { m_id = id; } -uint32_t Core::Entity::BNpcTemplate::getBNpcBaseId() const +uint32_t Sapphire::Entity::BNpcTemplate::getBNpcBaseId() const { return m_bNpcBaseId; } -void Core::Entity::BNpcTemplate::setBNpcBaseId( uint32_t bNpcBaseId ) +void Sapphire::Entity::BNpcTemplate::setBNpcBaseId( uint32_t bNpcBaseId ) { m_bNpcBaseId = bNpcBaseId; } -uint32_t Core::Entity::BNpcTemplate::getBNpcNameId() const +uint32_t Sapphire::Entity::BNpcTemplate::getBNpcNameId() const { return m_bNpcNameId; } -void Core::Entity::BNpcTemplate::setBNpcNameId( uint32_t bNpcNameId ) +void Sapphire::Entity::BNpcTemplate::setBNpcNameId( uint32_t bNpcNameId ) { m_bNpcNameId = bNpcNameId; } -uint64_t Core::Entity::BNpcTemplate::getWeaponMain() const +uint64_t Sapphire::Entity::BNpcTemplate::getWeaponMain() const { return m_weaponMain; } -void Core::Entity::BNpcTemplate::setWeaponMain( uint64_t weaponMain ) +void Sapphire::Entity::BNpcTemplate::setWeaponMain( uint64_t weaponMain ) { m_weaponMain = weaponMain; } -uint64_t Core::Entity::BNpcTemplate::getWeaponSub() const +uint64_t Sapphire::Entity::BNpcTemplate::getWeaponSub() const { return m_weaponSub; } -void Core::Entity::BNpcTemplate::setWeaponSub( uint64_t weaponSub ) +void Sapphire::Entity::BNpcTemplate::setWeaponSub( uint64_t weaponSub ) { m_weaponSub = weaponSub; } -uint8_t Core::Entity::BNpcTemplate::getAggressionMode() const +uint8_t Sapphire::Entity::BNpcTemplate::getAggressionMode() const { return m_aggressionMode; } -void Core::Entity::BNpcTemplate::setAggressionMode( uint8_t aggressionMode ) +void Sapphire::Entity::BNpcTemplate::setAggressionMode( uint8_t aggressionMode ) { m_aggressionMode = aggressionMode; } -uint8_t Core::Entity::BNpcTemplate::getEnemyType() const +uint8_t Sapphire::Entity::BNpcTemplate::getEnemyType() const { return m_enemyType; } -void Core::Entity::BNpcTemplate::setEnemyType( uint8_t enemyType ) +void Sapphire::Entity::BNpcTemplate::setEnemyType( uint8_t enemyType ) { m_enemyType = enemyType; } -uint8_t Core::Entity::BNpcTemplate::getOnlineStatus() const +uint8_t Sapphire::Entity::BNpcTemplate::getOnlineStatus() const { return m_onlineStatus; } -void Core::Entity::BNpcTemplate::setOnlineStatus( uint8_t onlineStatus ) +void Sapphire::Entity::BNpcTemplate::setOnlineStatus( uint8_t onlineStatus ) { m_onlineStatus = onlineStatus; } -uint8_t Core::Entity::BNpcTemplate::getPose() const +uint8_t Sapphire::Entity::BNpcTemplate::getPose() const { return m_pose; } -void Core::Entity::BNpcTemplate::setPose( uint8_t pose ) +void Sapphire::Entity::BNpcTemplate::setPose( uint8_t pose ) { m_pose = pose; } -uint16_t Core::Entity::BNpcTemplate::getModelChara() const +uint16_t Sapphire::Entity::BNpcTemplate::getModelChara() const { return m_modelChara; } -void Core::Entity::BNpcTemplate::setModelChara( uint16_t modelChara ) +void Sapphire::Entity::BNpcTemplate::setModelChara( uint16_t modelChara ) { m_modelChara = modelChara; } -uint32_t Core::Entity::BNpcTemplate::getDisplayFlags() const +uint32_t Sapphire::Entity::BNpcTemplate::getDisplayFlags() const { return m_displayFlags; } -void Core::Entity::BNpcTemplate::setDisplayFlags( uint32_t displayFlags ) +void Sapphire::Entity::BNpcTemplate::setDisplayFlags( uint32_t displayFlags ) { m_displayFlags = displayFlags; } -const uint32_t* Core::Entity::BNpcTemplate::getModelEquip() const +const uint32_t* Sapphire::Entity::BNpcTemplate::getModelEquip() const { return m_modelEquip; } -const uint8_t* Core::Entity::BNpcTemplate::getCustomize() const +const uint8_t* Sapphire::Entity::BNpcTemplate::getCustomize() const { return m_customize; } diff --git a/src/servers/sapphire_zone/Actor/BNpcTemplate.h b/src/servers/sapphire_zone/Actor/BNpcTemplate.h index b8558a3c..953398d3 100644 --- a/src/servers/sapphire_zone/Actor/BNpcTemplate.h +++ b/src/servers/sapphire_zone/Actor/BNpcTemplate.h @@ -3,7 +3,7 @@ #include -namespace Core::Entity +namespace Sapphire::Entity { class BNpcTemplate diff --git a/src/servers/sapphire_zone/Actor/Chara.cpp b/src/servers/sapphire_zone/Actor/Chara.cpp index 302a590f..92495e14 100644 --- a/src/servers/sapphire_zone/Actor/Chara.cpp +++ b/src/servers/sapphire_zone/Actor/Chara.cpp @@ -29,14 +29,14 @@ #include "Framework.h" #include "Common.h" -extern Core::Framework g_fw; +extern Sapphire::Framework g_fw; -using namespace Core::Common; -using namespace Core::Network::Packets; -using namespace Core::Network::Packets::Server; -using namespace Core::Network::ActorControl; +using namespace Sapphire::Common; +using namespace Sapphire::Network::Packets; +using namespace Sapphire::Network::Packets::Server; +using namespace Sapphire::Network::ActorControl; -Core::Entity::Chara::Chara( ObjKind type ) : +Sapphire::Entity::Chara::Chara( ObjKind type ) : Actor( type ), m_pose( 0 ), m_targetId( INVALID_GAME_OBJECT_ID ) @@ -48,156 +48,156 @@ Core::Entity::Chara::Chara( ObjKind type ) : } } -Core::Entity::Chara::~Chara() +Sapphire::Entity::Chara::~Chara() { } /*! \return the actors name */ -std::string Core::Entity::Chara::getName() const +std::string Sapphire::Entity::Chara::getName() const { return std::string( m_name ); } /*! \return current stance of the actors */ -Core::Common::Stance Core::Entity::Chara::getStance() const +Sapphire::Common::Stance Sapphire::Entity::Chara::getStance() const { return m_currentStance; } /*! \return actor stats */ -Core::Entity::Chara::ActorStats Core::Entity::Chara::getStats() const +Sapphire::Entity::Chara::ActorStats Sapphire::Entity::Chara::getStats() const { return m_baseStats; } /*! \return current HP */ -uint32_t Core::Entity::Chara::getHp() const +uint32_t Sapphire::Entity::Chara::getHp() const { return m_hp; } /*! \return current MP */ -uint32_t Core::Entity::Chara::getMp() const +uint32_t Sapphire::Entity::Chara::getMp() const { return m_mp; } /*! \return current TP */ -uint16_t Core::Entity::Chara::getTp() const +uint16_t Sapphire::Entity::Chara::getTp() const { return m_tp; } /*! \return current GP */ -uint16_t Core::Entity::Chara::getGp() const +uint16_t Sapphire::Entity::Chara::getGp() const { return m_gp; } /*! \return current invincibility type */ -InvincibilityType Core::Entity::Chara::getInvincibilityType() const +InvincibilityType Sapphire::Entity::Chara::getInvincibilityType() const { return m_invincibilityType; } /*! \return current class or job */ -Core::Common::ClassJob Core::Entity::Chara::getClass() const +Sapphire::Common::ClassJob Sapphire::Entity::Chara::getClass() const { return m_class; } /*! \return current class or job as int32_t ( this feels pointless ) */ -uint8_t Core::Entity::Chara::getClassAsInt() const +uint8_t Sapphire::Entity::Chara::getClassAsInt() const { return static_cast< uint8_t >( m_class ); } /*! \param ClassJob to set */ -void Core::Entity::Chara::setClass( Common::ClassJob classJob ) +void Sapphire::Entity::Chara::setClass( Common::ClassJob classJob ) { m_class = classJob; } /*! \param Id of the target to set */ -void Core::Entity::Chara::setTargetId( uint64_t targetId ) +void Sapphire::Entity::Chara::setTargetId( uint64_t targetId ) { m_targetId = targetId; } /*! \return Id of the current target */ -uint64_t Core::Entity::Chara::getTargetId() const +uint64_t Sapphire::Entity::Chara::getTargetId() const { return m_targetId; } /*! \return True if the actor is alive */ -bool Core::Entity::Chara::isAlive() const +bool Sapphire::Entity::Chara::isAlive() const { return ( m_hp > 0 ); } /*! \return max hp for the actor */ -uint32_t Core::Entity::Chara::getMaxHp() const +uint32_t Sapphire::Entity::Chara::getMaxHp() const { return m_baseStats.max_hp; } /*! \return max mp for the actor */ -uint32_t Core::Entity::Chara::getMaxMp() const +uint32_t Sapphire::Entity::Chara::getMaxMp() const { return m_baseStats.max_mp; } /*! \return reset hp to current max hp */ -void Core::Entity::Chara::resetHp() +void Sapphire::Entity::Chara::resetHp() { m_hp = getMaxHp(); sendStatusUpdate( true ); } /*! \return reset mp to current max mp */ -void Core::Entity::Chara::resetMp() +void Sapphire::Entity::Chara::resetMp() { m_mp = getMaxMp(); sendStatusUpdate( true ); } /*! \param hp amount to set ( caps to maxHp ) */ -void Core::Entity::Chara::setHp( uint32_t hp ) +void Sapphire::Entity::Chara::setHp( uint32_t hp ) { m_hp = hp < getMaxHp() ? hp : getMaxHp(); sendStatusUpdate( true ); } /*! \param mp amount to set ( caps to maxMp ) */ -void Core::Entity::Chara::setMp( uint32_t mp ) +void Sapphire::Entity::Chara::setMp( uint32_t mp ) { m_mp = mp < getMaxMp() ? mp : getMaxMp(); sendStatusUpdate( true ); } /*! \param gp amount to set*/ -void Core::Entity::Chara::setGp( uint32_t gp ) +void Sapphire::Entity::Chara::setGp( uint32_t gp ) { m_gp = gp; sendStatusUpdate( true ); } /*! \param type invincibility type to set */ -void Core::Entity::Chara::setInvincibilityType( Common::InvincibilityType type ) +void Sapphire::Entity::Chara::setInvincibilityType( Common::InvincibilityType type ) { m_invincibilityType = type; } /*! \return current status of the actor */ -Core::Common::ActorStatus Core::Entity::Chara::getStatus() const +Sapphire::Common::ActorStatus Sapphire::Entity::Chara::getStatus() const { return m_status; } /*! \param status to set */ -void Core::Entity::Chara::setStatus( ActorStatus status ) +void Sapphire::Entity::Chara::setStatus( ActorStatus status ) { m_status = status; } @@ -206,7 +206,7 @@ void Core::Entity::Chara::setStatus( ActorStatus status ) Performs necessary steps to mark an actor dead. Sets hp/mp/tp, sets status, plays animation and fires onDeath event */ -void Core::Entity::Chara::die() +void Sapphire::Entity::Chara::die() { m_status = ActorStatus::Dead; m_hp = 0; @@ -236,7 +236,7 @@ position \param Position to look towards */ -bool Core::Entity::Chara::face( const Common::FFXIVARR_POSITION3& p ) +bool Sapphire::Entity::Chara::face( const Common::FFXIVARR_POSITION3& p ) { float oldRot = getRot(); float rot = Math::Util::calcAngFrom( getPos().x, getPos().z, p.x, p.z ); @@ -255,7 +255,7 @@ Set and propagate the actor stance to in range players \param stance to set */ -void Core::Entity::Chara::setStance( Stance stance ) +void Sapphire::Entity::Chara::setStance( Stance stance ) { m_currentStance = stance; @@ -269,7 +269,7 @@ and if fully performed, clean up again. \return true if a queued action has been updated */ -bool Core::Entity::Chara::checkAction() +bool Sapphire::Entity::Chara::checkAction() { if( m_pCurrentAction == nullptr ) @@ -287,7 +287,7 @@ Change the current target and propagate to in range players \param target actor id */ -void Core::Entity::Chara::changeTarget( uint64_t targetId ) +void Sapphire::Entity::Chara::changeTarget( uint64_t targetId ) { setTargetId( targetId ); FFXIVPacketBasePtr packet = makeActorControl144( m_id, SetTarget, 0, 0, 0, 0, targetId ); @@ -297,7 +297,7 @@ void Core::Entity::Chara::changeTarget( uint64_t targetId ) /*! Dummy function \return 0 */ -uint8_t Core::Entity::Chara::getLevel() const +uint8_t Sapphire::Entity::Chara::getLevel() const { return 0; } @@ -311,7 +311,7 @@ magical dmg and take status effects into account \param amount of damage to be taken */ -void Core::Entity::Chara::takeDamage( uint32_t damage ) +void Sapphire::Entity::Chara::takeDamage( uint32_t damage ) { if( damage >= m_hp ) { @@ -342,7 +342,7 @@ in range \param amount of hp to be healed */ -void Core::Entity::Chara::heal( uint32_t amount ) +void Sapphire::Entity::Chara::heal( uint32_t amount ) { if( ( m_hp + amount ) > getMaxHp() ) { @@ -361,20 +361,20 @@ so players can have their own version and we can abolish the param. \param true if the update should also be sent to the actor ( player ) himself */ -void Core::Entity::Chara::sendStatusUpdate( bool toSelf ) +void Sapphire::Entity::Chara::sendStatusUpdate( bool toSelf ) { FFXIVPacketBasePtr packet = std::make_shared< UpdateHpMpTpPacket >( *this ); sendToInRangeSet( packet ); } /*! \return ActionPtr of the currently registered action, or nullptr */ -Core::Action::ActionPtr Core::Entity::Chara::getCurrentAction() const +Sapphire::Action::ActionPtr Sapphire::Entity::Chara::getCurrentAction() const { return m_pCurrentAction; } /*! \param ActionPtr of the action to be registered */ -void Core::Entity::Chara::setCurrentAction( Core::Action::ActionPtr pAction ) +void Sapphire::Entity::Chara::setCurrentAction( Sapphire::Action::ActionPtr pAction ) { m_pCurrentAction = pAction; } @@ -388,7 +388,7 @@ Will have to be extended for ranged attacks. \param ActorPtr the autoAttack is performed on */ -void Core::Entity::Chara::autoAttack( CharaPtr pTarget ) +void Sapphire::Entity::Chara::autoAttack( CharaPtr pTarget ) { uint64_t tick = Util::getTimeMs(); @@ -427,7 +427,7 @@ ChaiScript Skill Handler. \param GamePacketPtr to send \param bool should be send to self? */ -void Core::Entity::Chara::handleScriptSkill( uint32_t type, uint16_t actionId, uint64_t param1, +void Sapphire::Entity::Chara::handleScriptSkill( uint32_t type, uint16_t actionId, uint64_t param1, uint64_t param2, Entity::Chara& target ) { auto pExdData = g_fw.get< Data::ExdDataGenerated >(); @@ -437,7 +437,7 @@ void Core::Entity::Chara::handleScriptSkill( uint32_t type, uint16_t actionId, u getAsPlayer()->sendDebug( "Handle script skill type: " + std::to_string( type ) ); } - auto actionInfoPtr = pExdData->get< Core::Data::Action >( actionId ); + auto actionInfoPtr = pExdData->get< Sapphire::Data::Action >( actionId ); // Todo: Effect packet generator. 90% of this is basically setting params and it's basically unreadable. // Prepare packet. This is seemingly common for all packets in the action handler. @@ -562,7 +562,7 @@ void Core::Entity::Chara::handleScriptSkill( uint32_t type, uint16_t actionId, u } /*! \param StatusEffectPtr to be applied to the actor */ -void Core::Entity::Chara::addStatusEffect( StatusEffect::StatusEffectPtr pEffect ) +void Sapphire::Entity::Chara::addStatusEffect( StatusEffect::StatusEffectPtr pEffect ) { int8_t nextSlot = getStatusEffectFreeSlot(); // if there is no slot left, do not add the effect @@ -592,7 +592,7 @@ void Core::Entity::Chara::addStatusEffect( StatusEffect::StatusEffectPtr pEffect } /*! \param StatusEffectPtr to be applied to the actor */ -void Core::Entity::Chara::addStatusEffectById( uint32_t id, int32_t duration, Entity::Chara& source, uint16_t param ) +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 ); effect->setParam( param ); @@ -600,7 +600,7 @@ void Core::Entity::Chara::addStatusEffectById( uint32_t id, int32_t duration, En } /*! \param StatusEffectPtr to be applied to the actor */ -void Core::Entity::Chara::addStatusEffectByIdIfNotExist( uint32_t id, int32_t duration, Entity::Chara& source, +void Sapphire::Entity::Chara::addStatusEffectByIdIfNotExist( uint32_t id, int32_t duration, Entity::Chara& source, uint16_t param ) { if( hasStatusEffect( id ) ) @@ -612,7 +612,7 @@ void Core::Entity::Chara::addStatusEffectByIdIfNotExist( uint32_t id, int32_t du } -int8_t Core::Entity::Chara::getStatusEffectFreeSlot() +int8_t Sapphire::Entity::Chara::getStatusEffectFreeSlot() { int8_t freeEffectSlot = -1; @@ -625,12 +625,12 @@ int8_t Core::Entity::Chara::getStatusEffectFreeSlot() return freeEffectSlot; } -void Core::Entity::Chara::statusEffectFreeSlot( uint8_t slotId ) +void Sapphire::Entity::Chara::statusEffectFreeSlot( uint8_t slotId ) { m_statusEffectFreeSlotQueue.push( slotId ); } -void Core::Entity::Chara::removeSingleStatusEffectById( uint32_t id ) +void Sapphire::Entity::Chara::removeSingleStatusEffectById( uint32_t id ) { for( auto effectIt : m_statusEffectMap ) { @@ -642,7 +642,7 @@ void Core::Entity::Chara::removeSingleStatusEffectById( uint32_t id ) } } -void Core::Entity::Chara::removeStatusEffect( uint8_t effectSlotId ) +void Sapphire::Entity::Chara::removeStatusEffect( uint8_t effectSlotId ) { auto pEffectIt = m_statusEffectMap.find( effectSlotId ); if( pEffectIt == m_statusEffectMap.end() ) @@ -660,32 +660,32 @@ void Core::Entity::Chara::removeStatusEffect( uint8_t effectSlotId ) sendStatusEffectUpdate(); } -std::map< uint8_t, Core::StatusEffect::StatusEffectPtr > Core::Entity::Chara::getStatusEffectMap() const +std::map< uint8_t, Sapphire::StatusEffect::StatusEffectPtr > Sapphire::Entity::Chara::getStatusEffectMap() const { return m_statusEffectMap; } -const uint8_t* Core::Entity::Chara::getLookArray() const +const uint8_t* Sapphire::Entity::Chara::getLookArray() const { return m_customize; } -const uint32_t* Core::Entity::Chara::getModelArray() const +const uint32_t* Sapphire::Entity::Chara::getModelArray() const { return m_modelEquip; } -uint8_t Core::Entity::Chara::getPose() const +uint8_t Sapphire::Entity::Chara::getPose() const { return m_pose; } -void Core::Entity::Chara::setPose( uint8_t pose ) +void Sapphire::Entity::Chara::setPose( uint8_t pose ) { m_pose = pose; } -void Core::Entity::Chara::sendStatusEffectUpdate() +void Sapphire::Entity::Chara::sendStatusEffectUpdate() { uint64_t currentTimeMs = Util::getTimeMs(); @@ -714,7 +714,7 @@ void Core::Entity::Chara::sendStatusEffectUpdate() } -void Core::Entity::Chara::updateStatusEffects() +void Sapphire::Entity::Chara::updateStatusEffects() { uint64_t currentTimeMs = Util::getTimeMs(); @@ -781,7 +781,7 @@ void Core::Entity::Chara::updateStatusEffects() } } -bool Core::Entity::Chara::hasStatusEffect( uint32_t id ) +bool Sapphire::Entity::Chara::hasStatusEffect( uint32_t id ) { if( m_statusEffectMap.find( id ) != m_statusEffectMap.end() ) return true; diff --git a/src/servers/sapphire_zone/Actor/Chara.h b/src/servers/sapphire_zone/Actor/Chara.h index c07c7758..1bb9fe69 100644 --- a/src/servers/sapphire_zone/Actor/Chara.h +++ b/src/servers/sapphire_zone/Actor/Chara.h @@ -9,7 +9,7 @@ #include #include -namespace Core::Entity +namespace Sapphire::Entity { /*! @@ -136,7 +136,7 @@ namespace Core::Entity void setPose( uint8_t pose ); - std::map< uint8_t, Core::StatusEffect::StatusEffectPtr > getStatusEffectMap() const; + std::map< uint8_t, Sapphire::StatusEffect::StatusEffectPtr > getStatusEffectMap() const; void sendStatusEffectUpdate(); diff --git a/src/servers/sapphire_zone/Actor/EventObject.cpp b/src/servers/sapphire_zone/Actor/EventObject.cpp index 5e191703..5dea822f 100644 --- a/src/servers/sapphire_zone/Actor/EventObject.cpp +++ b/src/servers/sapphire_zone/Actor/EventObject.cpp @@ -13,19 +13,19 @@ #include #include -using namespace Core::Common; -using namespace Core::Network::Packets; -using namespace Core::Network::Packets::Server; -using namespace Core::Network::ActorControl; +using namespace Sapphire::Common; +using namespace Sapphire::Network::Packets; +using namespace Sapphire::Network::Packets::Server; +using namespace Sapphire::Network::ActorControl; #include "Framework.h" -extern Core::Framework g_fw; +extern Sapphire::Framework g_fw; -Core::Entity::EventObject::EventObject( uint32_t actorId, uint32_t objectId, uint32_t gimmickId, +Sapphire::Entity::EventObject::EventObject( uint32_t actorId, uint32_t objectId, uint32_t gimmickId, uint8_t initialState, Common::FFXIVARR_POSITION3 pos, float rotation, const std::string& givenName ) : - Core::Entity::Actor( ObjKind::EventObj ), + Sapphire::Entity::Actor( ObjKind::EventObj ), m_gimmickId( gimmickId ), m_state( initialState ), m_objectId( objectId ), @@ -38,47 +38,47 @@ Core::Entity::EventObject::EventObject( uint32_t actorId, uint32_t objectId, uin m_rot = rotation; } -uint32_t Core::Entity::EventObject::getGimmickId() const +uint32_t Sapphire::Entity::EventObject::getGimmickId() const { return m_gimmickId; } -uint32_t Core::Entity::EventObject::getObjectId() const +uint32_t Sapphire::Entity::EventObject::getObjectId() const { return m_objectId; } -float Core::Entity::EventObject::getScale() const +float Sapphire::Entity::EventObject::getScale() const { return m_scale; } -void Core::Entity::EventObject::setScale( float scale ) +void Sapphire::Entity::EventObject::setScale( float scale ) { m_scale = scale; } -Core::Entity::EventObject::OnTalkEventHandler Core::Entity::EventObject::getOnTalkHandler() const +Sapphire::Entity::EventObject::OnTalkEventHandler Sapphire::Entity::EventObject::getOnTalkHandler() const { return m_onTalkEventHandler; } -void Core::Entity::EventObject::setOnTalkHandler( Core::Entity::EventObject::OnTalkEventHandler handler ) +void Sapphire::Entity::EventObject::setOnTalkHandler( Sapphire::Entity::EventObject::OnTalkEventHandler handler ) { m_onTalkEventHandler = handler; } -void Core::Entity::EventObject::setGimmickId( uint32_t gimmickId ) +void Sapphire::Entity::EventObject::setGimmickId( uint32_t gimmickId ) { m_gimmickId = gimmickId; } -uint8_t Core::Entity::EventObject::getState() const +uint8_t Sapphire::Entity::EventObject::getState() const { return m_state; } -void Core::Entity::EventObject::setState( uint8_t state ) +void Sapphire::Entity::EventObject::setState( uint8_t state ) { m_state = state; @@ -88,7 +88,7 @@ void Core::Entity::EventObject::setState( uint8_t state ) } } -void Core::Entity::EventObject::setAnimationFlag( uint32_t flag, uint32_t animationFlag ) +void Sapphire::Entity::EventObject::setAnimationFlag( uint32_t flag, uint32_t animationFlag ) { for( const auto& player : m_inRangePlayers ) { @@ -96,17 +96,17 @@ void Core::Entity::EventObject::setAnimationFlag( uint32_t flag, uint32_t animat } } -void Core::Entity::EventObject::setParentInstance( Core::InstanceContentPtr instance ) +void Sapphire::Entity::EventObject::setParentInstance( Sapphire::InstanceContentPtr instance ) { m_parentInstance = instance; } -Core::InstanceContentPtr Core::Entity::EventObject::getParentInstance() const +Sapphire::InstanceContentPtr Sapphire::Entity::EventObject::getParentInstance() const { return m_parentInstance; } -void Core::Entity::EventObject::spawn( Core::Entity::PlayerPtr pTarget ) +void Sapphire::Entity::EventObject::spawn( Sapphire::Entity::PlayerPtr pTarget ) { auto spawnIndex = pTarget->getNextObjSpawnIndexForActorId( getId() ); if( !pTarget->isObjSpawnIndexValid( spawnIndex ) ) @@ -130,7 +130,7 @@ void Core::Entity::EventObject::spawn( Core::Entity::PlayerPtr pTarget ) } -void Core::Entity::EventObject::despawn( Core::Entity::PlayerPtr pTarget ) +void Sapphire::Entity::EventObject::despawn( Sapphire::Entity::PlayerPtr pTarget ) { auto pLog = g_fw.get< Logger >(); pLog->debug( "despawn eobj: " + std::to_string( getId() ) ); @@ -138,7 +138,7 @@ void Core::Entity::EventObject::despawn( Core::Entity::PlayerPtr pTarget ) pTarget->freeObjSpawnIndexForActorId( getId() ); } -const std::string& Core::Entity::EventObject::getName() const +const std::string& Sapphire::Entity::EventObject::getName() const { return m_name; } diff --git a/src/servers/sapphire_zone/Actor/EventObject.h b/src/servers/sapphire_zone/Actor/EventObject.h index 5ce5de54..ad7382ce 100644 --- a/src/servers/sapphire_zone/Actor/EventObject.h +++ b/src/servers/sapphire_zone/Actor/EventObject.h @@ -3,7 +3,7 @@ #include "Actor.h" -namespace Core::Entity +namespace Sapphire::Entity { class EventObject : public Actor diff --git a/src/servers/sapphire_zone/Actor/Npc.cpp b/src/servers/sapphire_zone/Actor/Npc.cpp index ef4cf4e6..cd79d2c7 100644 --- a/src/servers/sapphire_zone/Actor/Npc.cpp +++ b/src/servers/sapphire_zone/Actor/Npc.cpp @@ -30,19 +30,19 @@ #include "Framework.h" #include "Common.h" -extern Core::Framework g_fw; +extern Sapphire::Framework g_fw; -using namespace Core::Common; -using namespace Core::Network::Packets; -using namespace Core::Network::Packets::Server; -using namespace Core::Network::ActorControl; +using namespace Sapphire::Common; +using namespace Sapphire::Network::Packets; +using namespace Sapphire::Network::Packets::Server; +using namespace Sapphire::Network::ActorControl; -Core::Entity::Npc::Npc( ObjKind type ) : +Sapphire::Entity::Npc::Npc( ObjKind type ) : Chara( type ) { } -Core::Entity::Npc::~Npc() +Sapphire::Entity::Npc::~Npc() { } diff --git a/src/servers/sapphire_zone/Actor/Npc.h b/src/servers/sapphire_zone/Actor/Npc.h index aef2e75c..bf7cb4f2 100644 --- a/src/servers/sapphire_zone/Actor/Npc.h +++ b/src/servers/sapphire_zone/Actor/Npc.h @@ -9,7 +9,7 @@ #include #include -namespace Core::Entity +namespace Sapphire::Entity { /*! diff --git a/src/servers/sapphire_zone/Actor/Player.cpp b/src/servers/sapphire_zone/Actor/Player.cpp index c286833c..3d7010c5 100644 --- a/src/servers/sapphire_zone/Actor/Player.cpp +++ b/src/servers/sapphire_zone/Actor/Player.cpp @@ -43,19 +43,19 @@ #include "ServerMgr.h" #include "Framework.h" -extern Core::Framework g_fw; +extern Sapphire::Framework g_fw; -using namespace Core::Common; -using namespace Core::Network::Packets; -using namespace Core::Network::Packets::Server; -using namespace Core::Network::ActorControl; +using namespace Sapphire::Common; +using namespace Sapphire::Network::Packets; +using namespace Sapphire::Network::Packets::Server; +using namespace Sapphire::Network::ActorControl; -using InventoryMap = std::map< uint16_t, Core::ItemContainerPtr >; +using InventoryMap = std::map< uint16_t, Sapphire::ItemContainerPtr >; using InvSlotPair = std::pair< uint16_t, int8_t >; using InvSlotPairVec = std::vector< InvSlotPair >; // player constructor -Core::Entity::Player::Player() : +Sapphire::Entity::Player::Player() : Chara( ObjKind::Player ), m_lastWrite( 0 ), m_lastPing( 0 ), @@ -102,11 +102,11 @@ Core::Entity::Player::Player() : m_actorSpawnIndexAllocator.init( MAX_DISPLAYED_ACTORS, true ); } -Core::Entity::Player::~Player() +Sapphire::Entity::Player::~Player() { } -void Core::Entity::Player::injectPacket( const std::string& path ) +void Sapphire::Entity::Player::injectPacket( const std::string& path ) { auto pServerZone = g_fw.get< ServerMgr >(); auto session = pServerZone->getSession( getId() ); @@ -115,84 +115,84 @@ void Core::Entity::Player::injectPacket( const std::string& path ) } // TODO: add a proper calculation based on race / job / level / gear -uint32_t Core::Entity::Player::getMaxHp() +uint32_t Sapphire::Entity::Player::getMaxHp() { return m_baseStats.max_hp; } -uint32_t Core::Entity::Player::getMaxMp() +uint32_t Sapphire::Entity::Player::getMaxMp() { return m_baseStats.max_mp; } -uint16_t Core::Entity::Player::getZoneId() const +uint16_t Sapphire::Entity::Player::getZoneId() const { return m_zoneId; } -uint32_t Core::Entity::Player::getTerritoryId() const +uint32_t Sapphire::Entity::Player::getTerritoryId() const { return m_territoryId; } -void Core::Entity::Player::setTerritoryId( uint32_t territoryId ) +void Sapphire::Entity::Player::setTerritoryId( uint32_t territoryId ) { m_territoryId = territoryId; } -uint8_t Core::Entity::Player::getGmRank() const +uint8_t Sapphire::Entity::Player::getGmRank() const { return m_gmRank; } -void Core::Entity::Player::setGmRank( uint8_t rank ) +void Sapphire::Entity::Player::setGmRank( uint8_t rank ) { m_gmRank = rank; } -bool Core::Entity::Player::getGmInvis() const +bool Sapphire::Entity::Player::getGmInvis() const { return m_gmInvis; } -void Core::Entity::Player::setGmInvis( bool invis ) +void Sapphire::Entity::Player::setGmInvis( bool invis ) { m_gmInvis = invis; } -bool Core::Entity::Player::isActingAsGm() const +bool Sapphire::Entity::Player::isActingAsGm() const { auto status = getOnlineStatus(); return status == OnlineStatus::GameMaster || status == OnlineStatus::GameMaster1 || status == OnlineStatus::GameMaster2; } -uint8_t Core::Entity::Player::getMode() const +uint8_t Sapphire::Entity::Player::getMode() const { return m_mode; } -void Core::Entity::Player::setMode( uint8_t mode ) +void Sapphire::Entity::Player::setMode( uint8_t mode ) { m_mode = mode; } -uint8_t Core::Entity::Player::getStartTown() const +uint8_t Sapphire::Entity::Player::getStartTown() const { return m_startTown; } -void Core::Entity::Player::setMarkedForRemoval() +void Sapphire::Entity::Player::setMarkedForRemoval() { m_markedForRemoval = true; } -bool Core::Entity::Player::isMarkedForRemoval() const +bool Sapphire::Entity::Player::isMarkedForRemoval() const { return m_markedForRemoval; } -Core::Common::OnlineStatus Core::Entity::Player::getOnlineStatus() const +Sapphire::Common::OnlineStatus Sapphire::Entity::Player::getOnlineStatus() const { auto pExdData = g_fw.get< Data::ExdDataGenerated >(); if( !pExdData ) @@ -223,17 +223,17 @@ Core::Common::OnlineStatus Core::Entity::Player::getOnlineStatus() const return static_cast< OnlineStatus >( applicableStatus ); } -void Core::Entity::Player::setOnlineStatusMask( uint64_t status ) +void Sapphire::Entity::Player::setOnlineStatusMask( uint64_t status ) { m_onlineStatus = status; } -uint64_t Core::Entity::Player::getOnlineStatusMask() const +uint64_t Sapphire::Entity::Player::getOnlineStatusMask() const { return m_onlineStatus; } -void Core::Entity::Player::prepareZoning( uint16_t targetZone, bool fadeOut, uint8_t fadeOutTime, uint16_t animation ) +void Sapphire::Entity::Player::prepareZoning( uint16_t targetZone, bool fadeOut, uint8_t fadeOutTime, uint16_t animation ) { auto preparePacket = makeZonePacket< FFXIVIpcPrepareZoning >( getId() ); preparePacket->data().targetZone = targetZone; @@ -243,7 +243,7 @@ void Core::Entity::Player::prepareZoning( uint16_t targetZone, bool fadeOut, uin queuePacket( preparePacket ); } -void Core::Entity::Player::calculateStats() +void Sapphire::Entity::Player::calculateStats() { uint8_t tribe = getLookAt( Common::CharaLook::Tribe ); uint8_t level = getLevel(); @@ -251,9 +251,9 @@ void Core::Entity::Player::calculateStats() auto pExdData = g_fw.get< Data::ExdDataGenerated >(); - auto classInfo = pExdData->get< Core::Data::ClassJob >( job ); - auto tribeInfo = pExdData->get< Core::Data::Tribe >( tribe ); - auto paramGrowthInfo = pExdData->get< Core::Data::ParamGrow >( level ); + auto classInfo = pExdData->get< Sapphire::Data::ClassJob >( job ); + auto tribeInfo = pExdData->get< Sapphire::Data::Tribe >( tribe ); + auto paramGrowthInfo = pExdData->get< Sapphire::Data::ParamGrow >( level ); // TODO: put formula somewhere else... float base = Math::CalcStats::calculateBaseStat( getAsPlayer() ); @@ -295,18 +295,18 @@ void Core::Entity::Player::calculateStats() } -void Core::Entity::Player::setAutoattack( bool mode ) +void Sapphire::Entity::Player::setAutoattack( bool mode ) { m_bAutoattack = mode; m_lastAttack = Util::getTimeMs(); } -bool Core::Entity::Player::isAutoattackOn() const +bool Sapphire::Entity::Player::isAutoattackOn() const { return m_bAutoattack; } -void Core::Entity::Player::sendStats() +void Sapphire::Entity::Player::sendStats() { auto statPacket = makeZonePacket< FFXIVIpcPlayerStats >( getId() ); @@ -336,12 +336,12 @@ void Core::Entity::Player::sendStats() queuePacket( statPacket ); } -void Core::Entity::Player::teleport( uint16_t aetheryteId, uint8_t type ) +void Sapphire::Entity::Player::teleport( uint16_t aetheryteId, uint8_t type ) { auto pExdData = g_fw.get< Data::ExdDataGenerated >(); auto pTeriMgr = g_fw.get< TerritoryMgr >(); - auto data = pExdData->get< Core::Data::Aetheryte >( aetheryteId ); + auto data = pExdData->get< Sapphire::Data::Aetheryte >( aetheryteId ); if( data == nullptr ) { @@ -363,8 +363,8 @@ void Core::Entity::Player::teleport( uint16_t aetheryteId, uint8_t type ) rot = targetPos->getTargetRotation(); } - sendDebug( "Teleport: " + pExdData->get< Core::Data::PlaceName >( data->placeName )->name + " " + - pExdData->get< Core::Data::PlaceName >( data->aethernetName )->name + + sendDebug( "Teleport: " + pExdData->get< Sapphire::Data::PlaceName >( data->placeName )->name + " " + + pExdData->get< Sapphire::Data::PlaceName >( data->aethernetName )->name + "(" + std::to_string( data->territory ) + ")" ); // TODO: this should be simplified and a type created in server_common/common.h. @@ -392,19 +392,19 @@ void Core::Entity::Player::teleport( uint16_t aetheryteId, uint8_t type ) } -void Core::Entity::Player::forceZoneing( uint32_t zoneId ) +void Sapphire::Entity::Player::forceZoneing( uint32_t zoneId ) { m_queuedZoneing = std::make_shared< QueuedZoning >( zoneId, getPos(), Util::getTimeMs(), 0.f ); //performZoning( zoneId, Common::ZoneingType::None, getPos() ); } -void Core::Entity::Player::returnToHomepoint() +void Sapphire::Entity::Player::returnToHomepoint() { setZoningType( Common::ZoneingType::Return ); teleport( getHomepoint(), 3 ); } -void Core::Entity::Player::setZone( uint32_t zoneId ) +void Sapphire::Entity::Player::setZone( uint32_t zoneId ) { auto pTeriMgr = g_fw.get< TerritoryMgr >(); m_onEnterEventDone = false; @@ -422,7 +422,7 @@ void Core::Entity::Player::setZone( uint32_t zoneId ) sendZonePackets(); } -bool Core::Entity::Player::setInstance( uint32_t instanceContentId ) +bool Sapphire::Entity::Player::setInstance( uint32_t instanceContentId ) { auto pTeriMgr = g_fw.get< TerritoryMgr >(); m_onEnterEventDone = false; @@ -433,7 +433,7 @@ bool Core::Entity::Player::setInstance( uint32_t instanceContentId ) return setInstance( instance ); } -bool Core::Entity::Player::setInstance( ZonePtr instance ) +bool Sapphire::Entity::Player::setInstance( ZonePtr instance ) { m_onEnterEventDone = false; if( !instance ) @@ -457,7 +457,7 @@ bool Core::Entity::Player::setInstance( ZonePtr instance ) return true; } -bool Core::Entity::Player::exitInstance() +bool Sapphire::Entity::Player::exitInstance() { auto pTeriMgr = g_fw.get< TerritoryMgr >(); if( !pTeriMgr->movePlayer( m_prevZoneId, getAsPlayer() ) ) @@ -472,37 +472,37 @@ bool Core::Entity::Player::exitInstance() return true; } -uint32_t Core::Entity::Player::getPlayTime() const +uint32_t Sapphire::Entity::Player::getPlayTime() const { return m_playTime; } -uint8_t Core::Entity::Player::getRace() const +uint8_t Sapphire::Entity::Player::getRace() const { return getLookAt( CharaLook::Race ); } -uint8_t Core::Entity::Player::getGender() const +uint8_t Sapphire::Entity::Player::getGender() const { return getLookAt( CharaLook::Gender ); } -void Core::Entity::Player::initSpawnIdQueue() +void Sapphire::Entity::Player::initSpawnIdQueue() { m_actorSpawnIndexAllocator.freeAllSpawnIndexes(); } -uint8_t Core::Entity::Player::getSpawnIdForActorId( uint32_t actorId ) +uint8_t Sapphire::Entity::Player::getSpawnIdForActorId( uint32_t actorId ) { return m_actorSpawnIndexAllocator.getNextFreeSpawnIndex( actorId ); } -bool Core::Entity::Player::isActorSpawnIdValid( uint8_t spawnIndex ) +bool Sapphire::Entity::Player::isActorSpawnIdValid( uint8_t spawnIndex ) { return m_actorSpawnIndexAllocator.isSpawnIndexValid( spawnIndex ); } -void Core::Entity::Player::registerAetheryte( uint8_t aetheryteId ) +void Sapphire::Entity::Player::registerAetheryte( uint8_t aetheryteId ) { uint16_t index; uint8_t value; @@ -512,7 +512,7 @@ void Core::Entity::Player::registerAetheryte( uint8_t aetheryteId ) queuePacket( makeActorControl143( getId(), LearnTeleport, aetheryteId, 1 ) ); } -bool Core::Entity::Player::isAetheryteRegistered( uint8_t aetheryteId ) const +bool Sapphire::Entity::Player::isAetheryteRegistered( uint8_t aetheryteId ) const { uint16_t index; uint8_t value; @@ -521,12 +521,12 @@ bool Core::Entity::Player::isAetheryteRegistered( uint8_t aetheryteId ) const return ( m_aetheryte[ index ] & value ) != 0; } -uint8_t* Core::Entity::Player::getDiscoveryBitmask() +uint8_t* Sapphire::Entity::Player::getDiscoveryBitmask() { return m_discovery; } -void Core::Entity::Player::discover( int16_t map_id, int16_t sub_id ) +void Sapphire::Entity::Player::discover( int16_t map_id, int16_t sub_id ) { // map.exd field 12 -> index in one of the two discovery sections, if field 15 is false, need to use 2nd section // section 1 starts at 4 - 2 bytes each @@ -537,8 +537,8 @@ void Core::Entity::Player::discover( int16_t map_id, int16_t sub_id ) int32_t offset = 4; - auto info = pExdData->get< Core::Data::Map >( - pExdData->get< Core::Data::TerritoryType >( getCurrentZone()->getTerritoryTypeId() )->map ); + auto info = pExdData->get< Sapphire::Data::Map >( + pExdData->get< Sapphire::Data::TerritoryType >( getCurrentZone()->getTerritoryTypeId() )->map ); if( info->discoveryArrayByte ) offset = 5 + 2 * info->discoveryIndex; else @@ -553,19 +553,19 @@ void Core::Entity::Player::discover( int16_t map_id, int16_t sub_id ) uint16_t level = getLevel(); - uint32_t exp = ( pExdData->get< Core::Data::ParamGrow >( level )->expToNext * 5 / 100 ); + uint32_t exp = ( pExdData->get< Sapphire::Data::ParamGrow >( level )->expToNext * 5 / 100 ); gainExp( exp ); } -bool Core::Entity::Player::isNewAdventurer() const +bool Sapphire::Entity::Player::isNewAdventurer() const { return m_bNewAdventurer; } -void Core::Entity::Player::setNewAdventurer( bool state ) +void Sapphire::Entity::Player::setNewAdventurer( bool state ) { //if( !state ) //{ @@ -578,12 +578,12 @@ void Core::Entity::Player::setNewAdventurer( bool state ) m_bNewAdventurer = state; } -void Core::Entity::Player::resetDiscovery() +void Sapphire::Entity::Player::resetDiscovery() { memset( m_discovery, 0, sizeof( m_discovery ) ); } -void Core::Entity::Player::changePosition( float x, float y, float z, float o ) +void Sapphire::Entity::Player::changePosition( float x, float y, float z, float o ) { Common::FFXIVARR_POSITION3 pos; pos.x = x; @@ -592,7 +592,7 @@ void Core::Entity::Player::changePosition( float x, float y, float z, float o ) m_queuedZoneing = std::make_shared< QueuedZoning >( getZoneId(), pos, Util::getTimeMs(), o ); } -void Core::Entity::Player::learnAction( uint16_t actionId ) +void Sapphire::Entity::Player::learnAction( uint16_t actionId ) { uint16_t index; uint8_t value; @@ -603,7 +603,7 @@ void Core::Entity::Player::learnAction( uint16_t actionId ) queuePacket( makeActorControl143( getId(), ToggleActionUnlock, actionId, 1 ) ); } -void Core::Entity::Player::learnSong( uint8_t songId, uint32_t itemId ) +void Sapphire::Entity::Player::learnSong( uint8_t songId, uint32_t itemId ) { uint16_t index; uint8_t value; @@ -614,7 +614,7 @@ void Core::Entity::Player::learnSong( uint8_t songId, uint32_t itemId ) queuePacket( makeActorControl143( getId(), ToggleOrchestrionUnlock, songId, 1, itemId ) ); } -bool Core::Entity::Player::isActionLearned( uint8_t actionId ) const +bool Sapphire::Entity::Player::isActionLearned( uint8_t actionId ) const { uint16_t index; uint8_t value; @@ -623,7 +623,7 @@ bool Core::Entity::Player::isActionLearned( uint8_t actionId ) const return ( m_unlocks[ index ] & value ) != 0; } -void Core::Entity::Player::gainExp( uint32_t amount ) +void Sapphire::Entity::Player::gainExp( uint32_t amount ) { auto pExdData = g_fw.get< Data::ExdDataGenerated >(); @@ -631,9 +631,9 @@ void Core::Entity::Player::gainExp( uint32_t amount ) uint16_t level = getLevel(); - uint32_t neededExpToLevel = pExdData->get< Core::Data::ParamGrow >( level )->expToNext; + uint32_t neededExpToLevel = pExdData->get< Sapphire::Data::ParamGrow >( level )->expToNext; - uint32_t neededExpToLevelplus1 = pExdData->get< Core::Data::ParamGrow >( level + 1 )->expToNext; + uint32_t neededExpToLevelplus1 = pExdData->get< Sapphire::Data::ParamGrow >( level + 1 )->expToNext; queuePacket( makeActorControl143( getId(), GainExpMsg, static_cast< uint8_t >( getClass() ), amount ) ); @@ -664,7 +664,7 @@ void Core::Entity::Player::gainExp( uint32_t amount ) sendStatusUpdate(); } -void Core::Entity::Player::gainLevel() +void Sapphire::Entity::Player::gainLevel() { setLevel( getLevel() + 1 ); @@ -699,57 +699,57 @@ void Core::Entity::Player::gainLevel() } -void Core::Entity::Player::sendStatusUpdate( bool toSelf ) +void Sapphire::Entity::Player::sendStatusUpdate( bool toSelf ) { sendToInRangeSet( std::make_shared< UpdateHpMpTpPacket >( *this ), true ); } -uint8_t Core::Entity::Player::getLevel() const +uint8_t Sapphire::Entity::Player::getLevel() const { auto pExdData = g_fw.get< Data::ExdDataGenerated >(); - uint8_t classJobIndex = pExdData->get< Core::Data::ClassJob >( static_cast< uint8_t >( getClass() ) )->expArrayIndex; + uint8_t classJobIndex = pExdData->get< Sapphire::Data::ClassJob >( static_cast< uint8_t >( getClass() ) )->expArrayIndex; return static_cast< uint8_t >( m_classArray[ classJobIndex ] ); } -uint8_t Core::Entity::Player::getLevelForClass( Common::ClassJob pClass ) const +uint8_t Sapphire::Entity::Player::getLevelForClass( Common::ClassJob pClass ) const { auto pExdData = g_fw.get< Data::ExdDataGenerated >(); - uint8_t classJobIndex = pExdData->get< Core::Data::ClassJob >( static_cast< uint8_t >( pClass ) )->expArrayIndex; + uint8_t classJobIndex = pExdData->get< Sapphire::Data::ClassJob >( static_cast< uint8_t >( pClass ) )->expArrayIndex; return static_cast< uint8_t >( m_classArray[ classJobIndex ] ); } -bool Core::Entity::Player::isClassJobUnlocked( Common::ClassJob classJob ) const +bool Sapphire::Entity::Player::isClassJobUnlocked( Common::ClassJob classJob ) const { // todo: need to properly check if a job is unlocked, at the moment we just check the class array which will return true for every job if the base class is unlocked return getLevelForClass( classJob ) != 0; } -uint32_t Core::Entity::Player::getExp() const +uint32_t Sapphire::Entity::Player::getExp() const { auto pExdData = g_fw.get< Data::ExdDataGenerated >(); - uint8_t classJobIndex = pExdData->get< Core::Data::ClassJob >( static_cast< uint8_t >( getClass() ) )->expArrayIndex; + uint8_t classJobIndex = pExdData->get< Sapphire::Data::ClassJob >( static_cast< uint8_t >( getClass() ) )->expArrayIndex; return m_expArray[ classJobIndex ]; } -void Core::Entity::Player::setExp( uint32_t amount ) +void Sapphire::Entity::Player::setExp( uint32_t amount ) { auto pExdData = g_fw.get< Data::ExdDataGenerated >(); - uint8_t classJobIndex = pExdData->get< Core::Data::ClassJob >( static_cast< uint8_t >( getClass() ) )->expArrayIndex; + uint8_t classJobIndex = pExdData->get< Sapphire::Data::ClassJob >( static_cast< uint8_t >( getClass() ) )->expArrayIndex; m_expArray[ classJobIndex ] = amount; } -bool Core::Entity::Player::isInCombat() const +bool Sapphire::Entity::Player::isInCombat() const { return m_bInCombat; } -void Core::Entity::Player::setInCombat( bool mode ) +void Sapphire::Entity::Player::setInCombat( bool mode ) { //m_lastAttack = GetTickCount(); m_bInCombat = mode; } -void Core::Entity::Player::setClassJob( Common::ClassJob classJob ) +void Sapphire::Entity::Player::setClassJob( Common::ClassJob classJob ) { m_class = classJob; uint8_t level = getLevel(); @@ -773,17 +773,17 @@ void Core::Entity::Player::setClassJob( Common::ClassJob classJob ) sendStatusUpdate( true ); } -void Core::Entity::Player::setLevel( uint8_t level ) +void Sapphire::Entity::Player::setLevel( uint8_t level ) { auto pExdData = g_fw.get< Data::ExdDataGenerated >(); - uint8_t classJobIndex = pExdData->get< Core::Data::ClassJob >( static_cast< uint8_t >( getClass() ) )->expArrayIndex; + uint8_t classJobIndex = pExdData->get< Sapphire::Data::ClassJob >( static_cast< uint8_t >( getClass() ) )->expArrayIndex; m_classArray[ classJobIndex ] = level; } -void Core::Entity::Player::setLevelForClass( uint8_t level, Common::ClassJob classjob ) +void Sapphire::Entity::Player::setLevelForClass( uint8_t level, Common::ClassJob classjob ) { auto pExdData = g_fw.get< Data::ExdDataGenerated >(); - uint8_t classJobIndex = pExdData->get< Core::Data::ClassJob >( static_cast< uint8_t >( classjob ) )->expArrayIndex; + uint8_t classJobIndex = pExdData->get< Sapphire::Data::ClassJob >( static_cast< uint8_t >( classjob ) )->expArrayIndex; if( m_classArray[ classJobIndex ] == 0 ) insertDbClass( classJobIndex ); @@ -791,65 +791,65 @@ void Core::Entity::Player::setLevelForClass( uint8_t level, Common::ClassJob cla m_classArray[ classJobIndex ] = level; } -void Core::Entity::Player::sendModel() +void Sapphire::Entity::Player::sendModel() { sendToInRangeSet( std::make_shared< ModelEquipPacket >( *getAsPlayer() ), true ); } -uint32_t Core::Entity::Player::getModelForSlot( Common::GearModelSlot slot ) +uint32_t Sapphire::Entity::Player::getModelForSlot( Common::GearModelSlot slot ) { return m_modelEquip[ slot ]; } -uint64_t Core::Entity::Player::getModelMainWeapon() const +uint64_t Sapphire::Entity::Player::getModelMainWeapon() const { return m_modelMainWeapon; } -uint64_t Core::Entity::Player::getModelSubWeapon() const +uint64_t Sapphire::Entity::Player::getModelSubWeapon() const { return m_modelSubWeapon; } -uint64_t Core::Entity::Player::getModelSystemWeapon() const +uint64_t Sapphire::Entity::Player::getModelSystemWeapon() const { return m_modelSystemWeapon; } -int8_t Core::Entity::Player::getAetheryteMaskAt( uint8_t index ) const +int8_t Sapphire::Entity::Player::getAetheryteMaskAt( uint8_t index ) const { if( index > sizeof( m_aetheryte ) ) return 0; return m_aetheryte[ index ]; } -uint8_t Core::Entity::Player::getBirthDay() const +uint8_t Sapphire::Entity::Player::getBirthDay() const { return m_birthDay; } -uint8_t Core::Entity::Player::getBirthMonth() const +uint8_t Sapphire::Entity::Player::getBirthMonth() const { return m_birthMonth; } -uint8_t Core::Entity::Player::getGuardianDeity() const +uint8_t Sapphire::Entity::Player::getGuardianDeity() const { return m_guardianDeity; } -uint8_t Core::Entity::Player::getLookAt( uint8_t index ) const +uint8_t Sapphire::Entity::Player::getLookAt( uint8_t index ) const { return m_customize[ index ]; } -void Core::Entity::Player::setLookAt( uint8_t index, uint8_t value ) +void Sapphire::Entity::Player::setLookAt( uint8_t index, uint8_t value ) { m_customize[ index ] = value; } // spawn this player for pTarget -void Core::Entity::Player::spawn( Entity::PlayerPtr pTarget ) +void Sapphire::Entity::Player::spawn( Entity::PlayerPtr pTarget ) { auto pLog = g_fw.get< Logger >(); pLog->debug( "[" + std::to_string( pTarget->getId() ) + "] Spawning " + @@ -860,7 +860,7 @@ void Core::Entity::Player::spawn( Entity::PlayerPtr pTarget ) } // despawn -void Core::Entity::Player::despawn( Entity::PlayerPtr pTarget ) +void Sapphire::Entity::Player::despawn( Entity::PlayerPtr pTarget ) { auto pPlayer = pTarget; auto pLog = g_fw.get< Logger >(); @@ -871,7 +871,7 @@ void Core::Entity::Player::despawn( Entity::PlayerPtr pTarget ) pPlayer->queuePacket( makeActorControl143( getId(), DespawnZoneScreenMsg, 0x04, getId(), 0x01 ) ); } -Core::Entity::ActorPtr Core::Entity::Player::lookupTargetById( uint64_t targetId ) +Sapphire::Entity::ActorPtr Sapphire::Entity::Player::lookupTargetById( uint64_t targetId ) { ActorPtr targetActor; auto inRange = getInRangeActors( true ); @@ -883,22 +883,22 @@ Core::Entity::ActorPtr Core::Entity::Player::lookupTargetById( uint64_t targetId return targetActor; } -void Core::Entity::Player::setLastPing( uint32_t ping ) +void Sapphire::Entity::Player::setLastPing( uint32_t ping ) { m_lastPing = ping; } -uint32_t Core::Entity::Player::getLastPing() const +uint32_t Sapphire::Entity::Player::getLastPing() const { return m_lastPing; } -void Core::Entity::Player::setVoiceId( uint8_t voiceId ) +void Sapphire::Entity::Player::setVoiceId( uint8_t voiceId ) { m_voice = voiceId; } -void Core::Entity::Player::setGc( uint8_t gc ) +void Sapphire::Entity::Player::setGc( uint8_t gc ) { m_gc = gc; @@ -910,7 +910,7 @@ void Core::Entity::Player::setGc( uint8_t gc ) queuePacket( gcAffPacket ); } -void Core::Entity::Player::setGcRankAt( uint8_t index, uint8_t rank ) +void Sapphire::Entity::Player::setGcRankAt( uint8_t index, uint8_t rank ) { m_gcRank[ index ] = rank; @@ -922,15 +922,15 @@ void Core::Entity::Player::setGcRankAt( uint8_t index, uint8_t rank ) queuePacket( gcAffPacket ); } -const uint8_t* Core::Entity::Player::getStateFlags() const +const uint8_t* Sapphire::Entity::Player::getStateFlags() const { return m_stateFlags; } -bool Core::Entity::Player::actionHasCastTime( uint32_t actionId ) //TODO: Add logic for special cases +bool Sapphire::Entity::Player::actionHasCastTime( uint32_t actionId ) //TODO: Add logic for special cases { auto pExdData = g_fw.get< Data::ExdDataGenerated >(); - auto actionInfoPtr = pExdData->get< Core::Data::Action >( actionId ); + auto actionInfoPtr = pExdData->get< Sapphire::Data::Action >( actionId ); if( actionInfoPtr->preservesCombo ) return false; @@ -938,7 +938,7 @@ bool Core::Entity::Player::actionHasCastTime( uint32_t actionId ) //TODO: Add lo } -bool Core::Entity::Player::hasStateFlag( Common::PlayerStateFlag flag ) const +bool Sapphire::Entity::Player::hasStateFlag( Common::PlayerStateFlag flag ) const { int32_t iFlag = static_cast< uint32_t >( flag ); @@ -949,7 +949,7 @@ bool Core::Entity::Player::hasStateFlag( Common::PlayerStateFlag flag ) const return ( m_stateFlags[ index ] & value ) != 0; } -void Core::Entity::Player::setStateFlag( Common::PlayerStateFlag flag ) +void Sapphire::Entity::Player::setStateFlag( Common::PlayerStateFlag flag ) { auto prevOnlineStatus = getOnlineStatus(); int32_t iFlag = static_cast< uint32_t >( flag ); @@ -969,7 +969,7 @@ void Core::Entity::Player::setStateFlag( Common::PlayerStateFlag flag ) } -void Core::Entity::Player::setStateFlags( std::vector< Common::PlayerStateFlag > flags ) +void Sapphire::Entity::Player::setStateFlags( std::vector< Common::PlayerStateFlag > flags ) { for( const auto& flag : flags ) { @@ -977,12 +977,12 @@ void Core::Entity::Player::setStateFlags( std::vector< Common::PlayerStateFlag > } } -void Core::Entity::Player::sendStateFlags() +void Sapphire::Entity::Player::sendStateFlags() { queuePacket( std::make_shared< PlayerStateFlagsPacket >( *getAsPlayer() ) ); } -void Core::Entity::Player::unsetStateFlag( Common::PlayerStateFlag flag ) +void Sapphire::Entity::Player::unsetStateFlag( Common::PlayerStateFlag flag ) { if( !hasStateFlag( flag ) ) return; @@ -1005,7 +1005,7 @@ void Core::Entity::Player::unsetStateFlag( Common::PlayerStateFlag flag ) true ); } -void Core::Entity::Player::update( int64_t currTime ) +void Sapphire::Entity::Player::update( int64_t currTime ) { // a zoning is pending, lets do it @@ -1088,13 +1088,13 @@ void Core::Entity::Player::update( int64_t currTime ) } } -void Core::Entity::Player::onMobKill( uint16_t nameId ) +void Sapphire::Entity::Player::onMobKill( uint16_t nameId ) { auto pScriptMgr = g_fw.get< Scripting::ScriptMgr >(); pScriptMgr->onMobKill( *getAsPlayer(), nameId ); } -void Core::Entity::Player::freePlayerSpawnId( uint32_t actorId ) +void Sapphire::Entity::Player::freePlayerSpawnId( uint32_t actorId ) { auto spawnId = m_actorSpawnIndexAllocator.freeUsedSpawnIndex( actorId ); @@ -1105,13 +1105,13 @@ void Core::Entity::Player::freePlayerSpawnId( uint32_t actorId ) } -uint8_t* Core::Entity::Player::getAetheryteArray() +uint8_t* Sapphire::Entity::Player::getAetheryteArray() { return m_aetheryte; } /*! set homepoint */ -void Core::Entity::Player::setHomepoint( uint8_t aetheryteId ) +void Sapphire::Entity::Player::setHomepoint( uint8_t aetheryteId ) { m_homePoint = aetheryteId; @@ -1119,77 +1119,77 @@ void Core::Entity::Player::setHomepoint( uint8_t aetheryteId ) } /*! get homepoint */ -uint8_t Core::Entity::Player::getHomepoint() const +uint8_t Sapphire::Entity::Player::getHomepoint() const { return m_homePoint; } -uint16_t* Core::Entity::Player::getClassArray() +uint16_t* Sapphire::Entity::Player::getClassArray() { return m_classArray; } -const uint16_t* Core::Entity::Player::getClassArray() const +const uint16_t* Sapphire::Entity::Player::getClassArray() const { return m_classArray; } -uint32_t* Core::Entity::Player::getExpArray() +uint32_t* Sapphire::Entity::Player::getExpArray() { return m_expArray; } -const uint32_t* Core::Entity::Player::getExpArray() const +const uint32_t* Sapphire::Entity::Player::getExpArray() const { return m_expArray; } -uint8_t* Core::Entity::Player::getHowToArray() +uint8_t* Sapphire::Entity::Player::getHowToArray() { return m_howTo; } -const uint8_t* Core::Entity::Player::getHowToArray() const +const uint8_t* Sapphire::Entity::Player::getHowToArray() const { return m_howTo; } -const uint8_t* Core::Entity::Player::getUnlockBitmask() const +const uint8_t* Sapphire::Entity::Player::getUnlockBitmask() const { return m_unlocks; } -const uint8_t* Core::Entity::Player::getOrchestrionBitmask() const +const uint8_t* Sapphire::Entity::Player::getOrchestrionBitmask() const { return m_orchestrion; } -const uint8_t* Core::Entity::Player::getMountGuideBitmask() const +const uint8_t* Sapphire::Entity::Player::getMountGuideBitmask() const { return m_mountGuide; } -uint64_t Core::Entity::Player::getContentId() const +uint64_t Sapphire::Entity::Player::getContentId() const { return m_contentId; } -uint8_t Core::Entity::Player::getVoiceId() const +uint8_t Sapphire::Entity::Player::getVoiceId() const { return m_voice; } -uint8_t Core::Entity::Player::getGc() const +uint8_t Sapphire::Entity::Player::getGc() const { return m_gc; } -const uint8_t* Core::Entity::Player::getGcRankArray() const +const uint8_t* Sapphire::Entity::Player::getGcRankArray() const { return m_gcRank; } -void Core::Entity::Player::queuePacket( Network::Packets::FFXIVPacketBasePtr pPacket ) +void Sapphire::Entity::Player::queuePacket( Network::Packets::FFXIVPacketBasePtr pPacket ) { auto pServerZone = g_fw.get< ServerMgr >(); auto pSession = pServerZone->getSession( m_id ); @@ -1204,7 +1204,7 @@ void Core::Entity::Player::queuePacket( Network::Packets::FFXIVPacketBasePtr pPa } -void Core::Entity::Player::queueChatPacket( Network::Packets::FFXIVPacketBasePtr pPacket ) +void Sapphire::Entity::Player::queueChatPacket( Network::Packets::FFXIVPacketBasePtr pPacket ) { auto pServerZone = g_fw.get< ServerMgr >(); auto pSession = pServerZone->getSession( m_id ); @@ -1218,17 +1218,17 @@ void Core::Entity::Player::queueChatPacket( Network::Packets::FFXIVPacketBasePtr pChatCon->queueOutPacket( pPacket ); } -bool Core::Entity::Player::isLoadingComplete() const +bool Sapphire::Entity::Player::isLoadingComplete() const { return m_bLoadingComplete; } -void Core::Entity::Player::setLoadingComplete( bool bComplete ) +void Sapphire::Entity::Player::setLoadingComplete( bool bComplete ) { m_bLoadingComplete = bComplete; } -void Core::Entity::Player::performZoning( uint16_t zoneId, const Common::FFXIVARR_POSITION3& pos, float rotation ) +void Sapphire::Entity::Player::performZoning( uint16_t zoneId, const Common::FFXIVARR_POSITION3& pos, float rotation ) { m_pos = pos; m_zoneId = zoneId; @@ -1237,22 +1237,22 @@ void Core::Entity::Player::performZoning( uint16_t zoneId, const Common::FFXIVAR setZone( zoneId ); } -bool Core::Entity::Player::isMarkedForZoning() const +bool Sapphire::Entity::Player::isMarkedForZoning() const { return m_bMarkedForZoning; } -ZoneingType Core::Entity::Player::getZoningType() const +ZoneingType Sapphire::Entity::Player::getZoningType() const { return m_zoningType; } -void Core::Entity::Player::setZoningType( Common::ZoneingType zoneingType ) +void Sapphire::Entity::Player::setZoningType( Common::ZoneingType zoneingType ) { m_zoningType = zoneingType; } -void Core::Entity::Player::setSearchInfo( uint8_t selectRegion, uint8_t selectClass, const char* searchMessage ) +void Sapphire::Entity::Player::setSearchInfo( uint8_t selectRegion, uint8_t selectClass, const char* searchMessage ) { m_searchSelectRegion = selectRegion; m_searchSelectClass = selectClass; @@ -1260,43 +1260,43 @@ void Core::Entity::Player::setSearchInfo( uint8_t selectRegion, uint8_t selectCl strcpy( &m_searchMessage[ 0 ], searchMessage ); } -const char* Core::Entity::Player::getSearchMessage() const +const char* Sapphire::Entity::Player::getSearchMessage() const { return &m_searchMessage[ 0 ]; } -uint8_t Core::Entity::Player::getSearchSelectRegion() const +uint8_t Sapphire::Entity::Player::getSearchSelectRegion() const { return m_searchSelectRegion; } -uint8_t Core::Entity::Player::getSearchSelectClass() const +uint8_t Sapphire::Entity::Player::getSearchSelectClass() const { return m_searchSelectClass; } -void Core::Entity::Player::sendNotice( const std::string& message ) //Purple Text +void Sapphire::Entity::Player::sendNotice( const std::string& message ) //Purple Text { queuePacket( std::make_shared< ServerNoticePacket >( getId(), message ) ); } -void Core::Entity::Player::sendUrgent( const std::string& message ) //Red Text +void Sapphire::Entity::Player::sendUrgent( const std::string& message ) //Red Text { queuePacket( std::make_shared< ChatPacket >( *getAsPlayer(), ChatType::ServerUrgent, message ) ); } -void Core::Entity::Player::sendDebug( const std::string& message ) //Grey Text +void Sapphire::Entity::Player::sendDebug( const std::string& message ) //Grey Text { queuePacket( std::make_shared< ChatPacket >( *getAsPlayer(), ChatType::ServerDebug, message ) ); } -void Core::Entity::Player::sendLogMessage( uint32_t messageId, uint32_t param2, uint32_t param3, +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 ) ); } -void Core::Entity::Player::updateHowtosSeen( uint32_t howToId ) +void Sapphire::Entity::Player::updateHowtosSeen( uint32_t howToId ) { uint8_t index = howToId / 8; uint8_t bitIndex = howToId % 8; @@ -1306,14 +1306,14 @@ void Core::Entity::Player::updateHowtosSeen( uint32_t howToId ) m_howTo[ index ] |= value; } -void Core::Entity::Player::initHateSlotQueue() +void Sapphire::Entity::Player::initHateSlotQueue() { m_freeHateSlotQueue = std::queue< uint8_t >(); for( int32_t i = 1; i < 26; i++ ) m_freeHateSlotQueue.push( i ); } -void Core::Entity::Player::sendHateList() +void Sapphire::Entity::Player::sendHateList() { auto hateListPacket = makeZonePacket< FFXIVIpcHateList >( getId() ); hateListPacket->data().numEntries = m_actorIdTohateSlotMap.size(); @@ -1326,32 +1326,32 @@ void Core::Entity::Player::sendHateList() queuePacket( hateListPacket ); } -bool Core::Entity::Player::isLogin() const +bool Sapphire::Entity::Player::isLogin() const { return m_bIsLogin; } -void Core::Entity::Player::setIsLogin( bool bIsLogin ) +void Sapphire::Entity::Player::setIsLogin( bool bIsLogin ) { m_bIsLogin = bIsLogin; } -uint8_t* Core::Entity::Player::getTitleList() +uint8_t* Sapphire::Entity::Player::getTitleList() { return m_titleList; } -const uint8_t* Core::Entity::Player::getTitleList() const +const uint8_t* Sapphire::Entity::Player::getTitleList() const { return m_titleList; } -uint16_t Core::Entity::Player::getTitle() const +uint16_t Sapphire::Entity::Player::getTitle() const { return m_activeTitle; } -void Core::Entity::Player::addTitle( uint16_t titleId ) +void Sapphire::Entity::Player::addTitle( uint16_t titleId ) { uint16_t index; uint8_t value; @@ -1360,7 +1360,7 @@ void Core::Entity::Player::addTitle( uint16_t titleId ) m_titleList[ index ] |= value; } -void Core::Entity::Player::setTitle( uint16_t titleId ) +void Sapphire::Entity::Player::setTitle( uint16_t titleId ) { uint16_t index; uint8_t value; @@ -1374,7 +1374,7 @@ void Core::Entity::Player::setTitle( uint16_t titleId ) sendToInRangeSet( makeActorControl142( getId(), SetTitle, titleId ), true ); } -void Core::Entity::Player::setEquipDisplayFlags( uint8_t state ) +void Sapphire::Entity::Player::setEquipDisplayFlags( uint8_t state ) { m_equipDisplayFlags = state; auto paramPacket = makeZonePacket< FFXIVIpcEquipDisplayFlags >( getId() ); @@ -1382,12 +1382,12 @@ void Core::Entity::Player::setEquipDisplayFlags( uint8_t state ) sendToInRangeSet( paramPacket, true ); } -uint8_t Core::Entity::Player::getEquipDisplayFlags() const +uint8_t Sapphire::Entity::Player::getEquipDisplayFlags() const { return m_equipDisplayFlags; } -void Core::Entity::Player::mount( uint32_t id ) +void Sapphire::Entity::Player::mount( uint32_t id ) { m_mount = id; sendToInRangeSet( makeActorControl142( getId(), ActorControlType::SetStatus, @@ -1399,7 +1399,7 @@ void Core::Entity::Player::mount( uint32_t id ) sendToInRangeSet( mountPacket, true ); } -void Core::Entity::Player::dismount() +void Sapphire::Entity::Player::dismount() { sendToInRangeSet( makeActorControl142( getId(), ActorControlType::SetStatus, static_cast< uint8_t >( Common::ActorStatus::Idle ) ), true ); @@ -1407,22 +1407,22 @@ void Core::Entity::Player::dismount() m_mount = 0; } -uint8_t Core::Entity::Player::getCurrentMount() const +uint8_t Sapphire::Entity::Player::getCurrentMount() const { return m_mount; } -void Core::Entity::Player::setPersistentEmote( uint32_t emoteId ) +void Sapphire::Entity::Player::setPersistentEmote( uint32_t emoteId ) { m_emoteMode = emoteId; } -uint32_t Core::Entity::Player::getPersistentEmote() const +uint32_t Sapphire::Entity::Player::getPersistentEmote() const { return m_emoteMode; } -void Core::Entity::Player::autoAttack( CharaPtr pTarget ) +void Sapphire::Entity::Player::autoAttack( CharaPtr pTarget ) { auto mainWeap = getItemAt( Common::GearSet0, Common::GearSetSlot::MainHand ); @@ -1472,19 +1472,19 @@ void Core::Entity::Player::autoAttack( CharaPtr pTarget ) ///////////////////////////// // Content Finder ///////////////////////////// -uint32_t Core::Entity::Player::getCFPenaltyTimestamp() const +uint32_t Sapphire::Entity::Player::getCFPenaltyTimestamp() const { return m_cfPenaltyUntil; } -void Core::Entity::Player::setCFPenaltyTimestamp( uint32_t timestamp ) +void Sapphire::Entity::Player::setCFPenaltyTimestamp( uint32_t timestamp ) { m_cfPenaltyUntil = timestamp; } -uint32_t Core::Entity::Player::getCFPenaltyMinutes() const +uint32_t Sapphire::Entity::Player::getCFPenaltyMinutes() const { - auto currentTimestamp = Core::Util::getTimeSeconds(); + auto currentTimestamp = Sapphire::Util::getTimeSeconds(); auto endTimestamp = getCFPenaltyTimestamp(); // check if penalty timestamp already passed current time @@ -1495,29 +1495,29 @@ uint32_t Core::Entity::Player::getCFPenaltyMinutes() const return static_cast< uint32_t > ( std::ceil( static_cast< float > (deltaTime) / 60 ) ); } -void Core::Entity::Player::setCFPenaltyMinutes( uint32_t minutes ) +void Sapphire::Entity::Player::setCFPenaltyMinutes( uint32_t minutes ) { - auto currentTimestamp = Core::Util::getTimeSeconds(); + auto currentTimestamp = Sapphire::Util::getTimeSeconds(); setCFPenaltyTimestamp( static_cast< uint32_t >( currentTimestamp + minutes * 60 ) ); } -uint8_t Core::Entity::Player::getOpeningSequence() const +uint8_t Sapphire::Entity::Player::getOpeningSequence() const { return m_openingSequence; } -void Core::Entity::Player::setOpeningSequence( uint8_t seq ) +void Sapphire::Entity::Player::setOpeningSequence( uint8_t seq ) { m_openingSequence = seq; } -uint16_t Core::Entity::Player::getItemLevel() const +uint16_t Sapphire::Entity::Player::getItemLevel() const { return m_itemLevel; } /// Tells client to offset their eorzean time by given timestamp. -void Core::Entity::Player::setEorzeaTimeOffset( uint64_t timestamp ) +void Sapphire::Entity::Player::setEorzeaTimeOffset( uint64_t timestamp ) { // TODO: maybe change to persistent? auto packet = makeZonePacket< FFXIVIpcEorzeaTimeOffset >( getId() ); @@ -1527,22 +1527,22 @@ void Core::Entity::Player::setEorzeaTimeOffset( uint64_t timestamp ) queuePacket( packet ); } -void Core::Entity::Player::setTerritoryTypeId( uint32_t territoryTypeId ) +void Sapphire::Entity::Player::setTerritoryTypeId( uint32_t territoryTypeId ) { m_zoneId = territoryTypeId; } -uint32_t Core::Entity::Player::getTerritoryTypeId() const +uint32_t Sapphire::Entity::Player::getTerritoryTypeId() const { return m_zoneId; } -void Core::Entity::Player::sendZonePackets() +void Sapphire::Entity::Player::sendZonePackets() { if( isLogin() ) { //Update player map in servermgr - in case player name has been changed - auto pServerMgr = g_fw.get< Core::ServerMgr >(); + auto pServerMgr = g_fw.get< Sapphire::ServerMgr >(); pServerMgr->updatePlayerName( getId(), getName() ); } @@ -1591,7 +1591,7 @@ void Core::Entity::Player::sendZonePackets() } auto pHousingMgr = g_fw.get< HousingMgr >(); - if( Core::LandPtr pLand = pHousingMgr->getLandByOwnerId( getId() ) ) + if( Sapphire::LandPtr pLand = pHousingMgr->getLandByOwnerId( getId() ) ) { uint32_t state = 0; @@ -1637,17 +1637,17 @@ void Core::Entity::Player::sendZonePackets() m_bMarkedForZoning = false; } -void Core::Entity::Player::setDirectorInitialized( bool isInitialized ) +void Sapphire::Entity::Player::setDirectorInitialized( bool isInitialized ) { m_directorInitialized = isInitialized; } -bool Core::Entity::Player::isDirectorInitialized() const +bool Sapphire::Entity::Player::isDirectorInitialized() const { return m_directorInitialized; } -void Core::Entity::Player::sendTitleList() +void Sapphire::Entity::Player::sendTitleList() { auto titleListPacket = makeZonePacket< FFXIVIpcPlayerTitleList >( getId() ); memcpy( titleListPacket->data().titleList, getTitleList(), sizeof( titleListPacket->data().titleList ) ); @@ -1656,7 +1656,7 @@ void Core::Entity::Player::sendTitleList() } void -Core::Entity::Player::sendZoneInPackets( uint32_t param1, uint32_t param2 = 0, uint32_t param3 = 0, uint32_t param4 = 0, +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 ); @@ -1675,7 +1675,7 @@ Core::Entity::Player::sendZoneInPackets( uint32_t param1, uint32_t param2 = 0, u unsetStateFlag( PlayerStateFlag::BetweenAreas ); } -void Core::Entity::Player::finishZoning() +void Sapphire::Entity::Player::finishZoning() { switch( getZoningType() ) { @@ -1707,27 +1707,27 @@ void Core::Entity::Player::finishZoning() } } -void Core::Entity::Player::emote( uint32_t emoteId, uint64_t targetId, bool isSilent ) +void Sapphire::Entity::Player::emote( uint32_t emoteId, uint64_t targetId, bool isSilent ) { sendToInRangeSet( makeActorControl144( getId(), ActorControlType::Emote, emoteId, 0, isSilent ? 1 : 0, 0, targetId ) ); } -void Core::Entity::Player::emoteInterrupt() +void Sapphire::Entity::Player::emoteInterrupt() { sendToInRangeSet( makeActorControl142( getId(), ActorControlType::EmoteInterrupt ) ); } -void Core::Entity::Player::teleportQuery( uint16_t aetheryteId ) +void Sapphire::Entity::Player::teleportQuery( uint16_t aetheryteId ) { auto pExdData = g_fw.get< Data::ExdDataGenerated >(); // TODO: only register this action if enough gil is in possession - auto targetAetheryte = pExdData->get< Core::Data::Aetheryte >( aetheryteId ); + auto targetAetheryte = pExdData->get< Sapphire::Data::Aetheryte >( aetheryteId ); if( targetAetheryte ) { - auto fromAetheryte = pExdData->get< Core::Data::Aetheryte >( - pExdData->get< Core::Data::TerritoryType >( getZoneId() )->aetheryte ); + auto fromAetheryte = pExdData->get< Sapphire::Data::Aetheryte >( + pExdData->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 > ( @@ -1750,17 +1750,17 @@ void Core::Entity::Player::teleportQuery( uint16_t aetheryteId ) } } -uint8_t Core::Entity::Player::getNextObjSpawnIndexForActorId( uint32_t actorId ) +uint8_t Sapphire::Entity::Player::getNextObjSpawnIndexForActorId( uint32_t actorId ) { return m_objSpawnIndexAllocator.getNextFreeSpawnIndex( actorId ); } -void Core::Entity::Player::resetObjSpawnIndex() +void Sapphire::Entity::Player::resetObjSpawnIndex() { m_objSpawnIndexAllocator.freeAllSpawnIndexes(); } -void Core::Entity::Player::freeObjSpawnIndexForActorId( uint32_t actorId ) +void Sapphire::Entity::Player::freeObjSpawnIndexForActorId( uint32_t actorId ) { auto spawnId = m_objSpawnIndexAllocator.freeUsedSpawnIndex( actorId ); @@ -1769,22 +1769,22 @@ void Core::Entity::Player::freeObjSpawnIndexForActorId( uint32_t actorId ) queuePacket( freeObjectSpawnPacket ); } -bool Core::Entity::Player::isObjSpawnIndexValid( uint8_t index ) +bool Sapphire::Entity::Player::isObjSpawnIndexValid( uint8_t index ) { return m_objSpawnIndexAllocator.isSpawnIndexValid( index ); } -void Core::Entity::Player::setOnEnterEventDone( bool isDone ) +void Sapphire::Entity::Player::setOnEnterEventDone( bool isDone ) { m_onEnterEventDone = isDone; } -bool Core::Entity::Player::isOnEnterEventDone() const +bool Sapphire::Entity::Player::isOnEnterEventDone() const { return m_onEnterEventDone; } -void Core::Entity::Player::setLandFlags( uint8_t flagSlot, uint32_t landFlags, +void Sapphire::Entity::Player::setLandFlags( uint8_t flagSlot, uint32_t landFlags, int16_t landId, int16_t wardNum, int16_t zoneId ) { m_landFlags[ flagSlot ].landIdent.landId = landId; @@ -1795,7 +1795,7 @@ void Core::Entity::Player::setLandFlags( uint8_t flagSlot, uint32_t landFlags, m_landFlags[ flagSlot ].unkown1 = 0; } -void Core::Entity::Player::sendLandFlags() +void Sapphire::Entity::Player::sendLandFlags() { auto landFlags = makeZonePacket< FFXIVIpcHousingLandFlags >( getId() ); @@ -1808,7 +1808,7 @@ void Core::Entity::Player::sendLandFlags() queuePacket( landFlags ); } -void Core::Entity::Player::sendLandFlagsSlot( Common::LandFlagsSlot slot ) +void Sapphire::Entity::Player::sendLandFlagsSlot( Common::LandFlagsSlot slot ) { auto landFlags = makeZonePacket< FFXIVIpcHousingUpdateLandFlagsSlot >( getId() ); diff --git a/src/servers/sapphire_zone/Actor/Player.h b/src/servers/sapphire_zone/Actor/Player.h index 9633a618..a80cdc6f 100644 --- a/src/servers/sapphire_zone/Actor/Player.h +++ b/src/servers/sapphire_zone/Actor/Player.h @@ -11,7 +11,7 @@ #include #include -namespace Core::Entity +namespace Sapphire::Entity { struct QueuedZoning @@ -361,7 +361,7 @@ namespace Core::Entity /*! return the current amount of crystals of type */ uint32_t getCrystal( uint8_t type ) const; - void updateModels( Common::GearSetSlot equipSlotId, const Core::ItemPtr& pItem, bool updateClass ); + void updateModels( Common::GearSetSlot equipSlotId, const Sapphire::ItemPtr& pItem, bool updateClass ); Common::GearModelSlot equipSlotToModelSlot( Common::GearSetSlot slot ); @@ -778,7 +778,7 @@ namespace Core::Entity bool actionHasCastTime( uint32_t actionId ); - Core::Entity::ActorPtr lookupTargetById( uint64_t targetId ); + Sapphire::Entity::ActorPtr lookupTargetById( uint64_t targetId ); bool isLogin() const; @@ -870,7 +870,7 @@ namespace Core::Entity InvSlotPair getFreeBagSlot(); - Core::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 ); void moveItem( uint16_t fromInventoryId, uint8_t fromSlotId, uint16_t toInventoryId, uint8_t toSlot ); @@ -940,7 +940,7 @@ namespace Core::Entity bool m_onEnterEventDone; private: - using InventoryMap = std::map< uint16_t, Core::ItemContainerPtr >; + using InventoryMap = std::map< uint16_t, Sapphire::ItemContainerPtr >; InventoryMap m_storageMap; diff --git a/src/servers/sapphire_zone/Actor/PlayerEvent.cpp b/src/servers/sapphire_zone/Actor/PlayerEvent.cpp index 80d8210d..013b6824 100644 --- a/src/servers/sapphire_zone/Actor/PlayerEvent.cpp +++ b/src/servers/sapphire_zone/Actor/PlayerEvent.cpp @@ -19,23 +19,23 @@ #include "ServerMgr.h" #include "Framework.h" -extern Core::Framework g_fw; +extern Sapphire::Framework g_fw; -using namespace Core::Common; -using namespace Core::Network::Packets; -using namespace Core::Network::Packets::Server; +using namespace Sapphire::Common; +using namespace Sapphire::Network::Packets; +using namespace Sapphire::Network::Packets::Server; -void Core::Entity::Player::addEvent( Event::EventHandlerPtr pEvent ) +void Sapphire::Entity::Player::addEvent( Event::EventHandlerPtr pEvent ) { m_eventHandlerMap[ pEvent->getId() ] = pEvent; } -std::map< uint32_t, Core::Event::EventHandlerPtr >& Core::Entity::Player::eventList() +std::map< uint32_t, Sapphire::Event::EventHandlerPtr >& Sapphire::Entity::Player::eventList() { return m_eventHandlerMap; } -Core::Event::EventHandlerPtr Core::Entity::Player::getEvent( uint32_t eventId ) +Sapphire::Event::EventHandlerPtr Sapphire::Entity::Player::getEvent( uint32_t eventId ) { auto it = m_eventHandlerMap.find( eventId ); if( it != m_eventHandlerMap.end() ) @@ -44,12 +44,12 @@ Core::Event::EventHandlerPtr Core::Entity::Player::getEvent( uint32_t eventId ) return Event::EventHandlerPtr( nullptr ); } -size_t Core::Entity::Player::getEventCount() +size_t Sapphire::Entity::Player::getEventCount() { return m_eventHandlerMap.size(); } -void Core::Entity::Player::removeEvent( uint32_t eventId ) +void Sapphire::Entity::Player::removeEvent( uint32_t eventId ) { auto it = m_eventHandlerMap.find( eventId ); if( it != m_eventHandlerMap.end() ) @@ -59,7 +59,7 @@ void Core::Entity::Player::removeEvent( uint32_t eventId ) } } -void Core::Entity::Player::checkEvent( uint32_t eventId ) +void Sapphire::Entity::Player::checkEvent( uint32_t eventId ) { auto pEvent = getEvent( eventId ); @@ -68,7 +68,7 @@ void Core::Entity::Player::checkEvent( uint32_t eventId ) } -void Core::Entity::Player::directorPlayScene( uint32_t eventId, uint32_t scene, uint32_t flags, uint32_t eventParam3, +void Sapphire::Entity::Player::directorPlayScene( uint32_t eventId, uint32_t scene, uint32_t flags, uint32_t eventParam3, uint32_t eventParam4, uint32_t eventParam5 ) { if( flags & 0x02 ) @@ -90,7 +90,7 @@ void Core::Entity::Player::directorPlayScene( uint32_t eventId, uint32_t scene, queuePacket( eventPlay ); } -void Core::Entity::Player::eventStart( uint64_t actorId, uint32_t eventId, +void Sapphire::Entity::Player::eventStart( uint64_t actorId, uint32_t eventId, Event::EventHandler::EventType eventType, uint8_t eventParam1, uint32_t eventParam2, Event::EventHandler::EventFinishCallback callback ) { @@ -110,32 +110,32 @@ void Core::Entity::Player::eventStart( uint64_t actorId, uint32_t eventId, } -void Core::Entity::Player::playScene( uint32_t eventId, uint32_t scene, +void Sapphire::Entity::Player::playScene( uint32_t eventId, uint32_t scene, uint32_t flags, uint32_t eventParam2, uint32_t eventParam3 ) { playScene( eventId, scene, flags, eventParam2, eventParam3, nullptr ); } -void Core::Entity::Player::playScene( uint32_t eventId, uint32_t scene, +void Sapphire::Entity::Player::playScene( uint32_t eventId, uint32_t scene, uint32_t flags, Event::EventHandler::SceneReturnCallback eventCallback ) { playScene( eventId, scene, flags, 0, 0, eventCallback ); } -void Core::Entity::Player::playScene( uint32_t eventId, uint32_t scene, uint32_t flags ) +void Sapphire::Entity::Player::playScene( uint32_t eventId, uint32_t scene, uint32_t flags ) { playScene( eventId, scene, flags, 0, 0, nullptr ); } -void Core::Entity::Player::playScene( uint32_t eventId, uint32_t scene, +void Sapphire::Entity::Player::playScene( uint32_t eventId, uint32_t scene, uint32_t flags, uint32_t eventParam2, uint32_t eventParam3, Event::EventHandler::SceneReturnCallback eventCallback ) { playScene( eventId, scene, flags, eventParam2, eventParam3, 0, eventCallback ); } -void Core::Entity::Player::playGilShop( uint32_t eventId, uint32_t flags, +void Sapphire::Entity::Player::playGilShop( uint32_t eventId, uint32_t flags, Event::EventHandler::SceneReturnCallback eventCallback ) { auto pEvent = bootstrapSceneEvent( eventId, flags ); @@ -156,7 +156,7 @@ void Core::Entity::Player::playGilShop( uint32_t eventId, uint32_t flags, queuePacket( openGilShopPacket ); } -Core::Event::EventHandlerPtr Core::Entity::Player::bootstrapSceneEvent( uint32_t eventId, uint32_t flags ) +Sapphire::Event::EventHandlerPtr Sapphire::Entity::Player::bootstrapSceneEvent( uint32_t eventId, uint32_t flags ) { auto pEvent = getEvent( eventId ); @@ -173,7 +173,7 @@ Core::Event::EventHandlerPtr Core::Entity::Player::bootstrapSceneEvent( uint32_t return pEvent; } -void Core::Entity::Player::playScene( uint32_t eventId, uint32_t scene, +void Sapphire::Entity::Player::playScene( uint32_t eventId, uint32_t scene, uint32_t flags, uint32_t eventParam2, uint32_t eventParam3, uint32_t eventParam4, Event::EventHandler::SceneReturnCallback eventCallback ) @@ -201,9 +201,9 @@ void Core::Entity::Player::playScene( uint32_t eventId, uint32_t scene, queuePacket( eventPlay ); } -void Core::Entity::Player::playSceneChain( uint32_t eventId, uint32_t scene, uint32_t flags, +void Sapphire::Entity::Player::playSceneChain( uint32_t eventId, uint32_t scene, uint32_t flags, uint32_t eventParam2, uint32_t eventParam3, uint32_t eventParam4, - Core::Event::EventHandler::SceneChainCallback sceneChainCallback ) + Sapphire::Event::EventHandler::SceneChainCallback sceneChainCallback ) { auto pEvent = bootstrapSceneEvent( eventId, flags ); if( !pEvent ) @@ -218,20 +218,20 @@ void Core::Entity::Player::playSceneChain( uint32_t eventId, uint32_t scene, uin queuePacket( eventPlay ); } -void Core::Entity::Player::playSceneChain( uint32_t eventId, uint32_t scene, uint32_t flags, +void Sapphire::Entity::Player::playSceneChain( uint32_t eventId, uint32_t scene, uint32_t flags, uint32_t eventParam2, uint32_t eventParam3, - Core::Event::EventHandler::SceneChainCallback sceneChainCallback ) + Sapphire::Event::EventHandler::SceneChainCallback sceneChainCallback ) { playSceneChain( eventId, scene, flags, eventParam2, eventParam3, 0, sceneChainCallback ); } -void Core::Entity::Player::playSceneChain( uint32_t eventId, uint32_t scene, uint32_t flags, - Core::Event::EventHandler::SceneChainCallback sceneChainCallback ) +void Sapphire::Entity::Player::playSceneChain( uint32_t eventId, uint32_t scene, uint32_t flags, + Sapphire::Event::EventHandler::SceneChainCallback sceneChainCallback ) { playSceneChain( eventId, scene, flags, 0, 0, 0, sceneChainCallback ); } -void Core::Entity::Player::eventFinish( uint32_t eventId, uint32_t freePlayer ) +void Sapphire::Entity::Player::eventFinish( uint32_t eventId, uint32_t freePlayer ) { auto pEvent = getEvent( eventId ); @@ -280,7 +280,7 @@ void Core::Entity::Player::eventFinish( uint32_t eventId, uint32_t freePlayer ) unsetStateFlag( PlayerStateFlag::InNpcEvent ); } -void Core::Entity::Player::eventActionStart( uint32_t eventId, +void Sapphire::Entity::Player::eventActionStart( uint32_t eventId, uint32_t action, ActionCallback finishCallback, ActionCallback interruptCallback, @@ -311,7 +311,7 @@ void Core::Entity::Player::eventActionStart( uint32_t eventId, } -void Core::Entity::Player::eventItemActionStart( uint32_t eventId, +void Sapphire::Entity::Player::eventItemActionStart( uint32_t eventId, uint32_t action, ActionCallback finishCallback, ActionCallback interruptCallback, @@ -327,7 +327,7 @@ void Core::Entity::Player::eventItemActionStart( uint32_t eventId, ///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// -void Core::Entity::Player::onLogin() +void Sapphire::Entity::Player::onLogin() { auto pConfig = g_fw.get< ConfigMgr >(); auto motd = pConfig->getValue< std::string >( "General", "MotD", "" ); @@ -340,23 +340,23 @@ void Core::Entity::Player::onLogin() } } -void Core::Entity::Player::onZoneStart() +void Sapphire::Entity::Player::onZoneStart() { } -void Core::Entity::Player::onZoneDone() +void Sapphire::Entity::Player::onZoneDone() { } -void Core::Entity::Player::onDeath() +void Sapphire::Entity::Player::onDeath() { } // TODO: slightly ugly here and way too static. Needs too be done properly -void Core::Entity::Player::onTick() +void Sapphire::Entity::Player::onTick() { bool sendUpdate = false; diff --git a/src/servers/sapphire_zone/Actor/PlayerInventory.cpp b/src/servers/sapphire_zone/Actor/PlayerInventory.cpp index 11fa3f08..2c37e108 100644 --- a/src/servers/sapphire_zone/Actor/PlayerInventory.cpp +++ b/src/servers/sapphire_zone/Actor/PlayerInventory.cpp @@ -31,15 +31,15 @@ #include "Framework.h" #include -extern Core::Framework g_fw; +extern Sapphire::Framework g_fw; -using namespace Core::Common; -using namespace Core::Network::Packets; -using namespace Core::Network::Packets::Server; -using namespace Core::Network::ActorControl; +using namespace Sapphire::Common; +using namespace Sapphire::Network::Packets; +using namespace Sapphire::Network::Packets::Server; +using namespace Sapphire::Network::ActorControl; -void Core::Entity::Player::initInventory() +void Sapphire::Entity::Player::initInventory() { auto setupContainer = [ this ]( InventoryType type, uint8_t maxSize, const std::string& tableName, bool isMultiStorage, bool isPersistentStorage = true ) @@ -107,20 +107,20 @@ void Core::Entity::Player::initInventory() } -void Core::Entity::Player::sendItemLevel() +void Sapphire::Entity::Player::sendItemLevel() { queuePacket( makeActorControl142( getId(), SetItemLevel, getItemLevel(), 0 ) ); } -void Core::Entity::Player::equipWeapon( ItemPtr pItem, bool updateClass ) +void Sapphire::Entity::Player::equipWeapon( ItemPtr pItem, bool updateClass ) { - auto exdData = g_fw.get< Core::Data::ExdDataGenerated >(); + auto exdData = g_fw.get< Sapphire::Data::ExdDataGenerated >(); if( !exdData ) return; - auto itemInfo = exdData->get< Core::Data::Item >( pItem->getId() ); + auto itemInfo = exdData->get< Sapphire::Data::Item >( pItem->getId() ); auto itemClassJob = itemInfo->classJobUse; - auto classJobInfo = exdData->get< Core::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 ); @@ -133,13 +133,13 @@ void Core::Entity::Player::equipWeapon( ItemPtr pItem, bool updateClass ) } } -void Core::Entity::Player::equipSoulCrystal( ItemPtr pItem, bool updateJob ) +void Sapphire::Entity::Player::equipSoulCrystal( ItemPtr pItem, bool updateJob ) { - auto exdData = g_fw.get< Core::Data::ExdDataGenerated >(); + auto exdData = g_fw.get< Sapphire::Data::ExdDataGenerated >(); if ( !exdData ) return; - auto itemInfo = exdData->get< Core::Data::Item >( pItem->getId() ); + auto itemInfo = exdData->get< Sapphire::Data::Item >( pItem->getId() ); auto itemClassJob = itemInfo->classJobUse; auto newClassJob = static_cast< ClassJob >( itemClassJob ); @@ -148,7 +148,7 @@ void Core::Entity::Player::equipSoulCrystal( ItemPtr pItem, bool updateJob ) } // equip an item -void Core::Entity::Player::equipItem( Common::GearSetSlot equipSlotId, ItemPtr pItem, bool sendUpdate ) +void Sapphire::Entity::Player::equipItem( Common::GearSetSlot equipSlotId, ItemPtr pItem, bool sendUpdate ) { //g_framework.getLogger().debug( "Equipping into slot " + std::to_string( equipSlotId ) ); @@ -163,7 +163,7 @@ void Core::Entity::Player::equipItem( Common::GearSetSlot equipSlotId, ItemPtr p updateModels( equipSlotId, pItem, false ); } -void Core::Entity::Player::updateModels( GearSetSlot equipSlotId, const Core::ItemPtr& pItem, bool updateClass ) +void Sapphire::Entity::Player::updateModels( GearSetSlot equipSlotId, const Sapphire::ItemPtr& pItem, bool updateClass ) { uint64_t model = pItem->getModelId1(); uint64_t model2 = pItem->getModelId2(); @@ -197,7 +197,7 @@ void Core::Entity::Player::updateModels( GearSetSlot equipSlotId, const Core::It } } -Core::Common::GearModelSlot Core::Entity::Player::equipSlotToModelSlot( Common::GearSetSlot slot ) +Sapphire::Common::GearModelSlot Sapphire::Entity::Player::equipSlotToModelSlot( Common::GearSetSlot slot ) { switch( slot ) { @@ -230,7 +230,7 @@ Core::Common::GearModelSlot Core::Entity::Player::equipSlotToModelSlot( Common:: } } -void Core::Entity::Player::unequipItem( Common::GearSetSlot equipSlotId, ItemPtr pItem ) +void Sapphire::Entity::Player::unequipItem( Common::GearSetSlot equipSlotId, ItemPtr pItem ) { auto modelSlot = equipSlotToModelSlot( equipSlotId ); if( modelSlot != GearModelSlot::ModelInvalid ) @@ -244,19 +244,19 @@ void Core::Entity::Player::unequipItem( Common::GearSetSlot equipSlotId, ItemPtr unequipSoulCrystal( pItem ); } -void Core::Entity::Player::unequipSoulCrystal( ItemPtr pItem ) +void Sapphire::Entity::Player::unequipSoulCrystal( ItemPtr pItem ) { - auto exdData = g_fw.get< Core::Data::ExdDataGenerated >(); + auto exdData = g_fw.get< Sapphire::Data::ExdDataGenerated >(); if ( !exdData ) return; - auto currentClassJob = exdData->get< Core::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 ); } // TODO: these next functions are so similar that they could likely be simplified -void Core::Entity::Player::addCurrency( CurrencyType type, uint32_t amount ) +void Sapphire::Entity::Player::addCurrency( CurrencyType type, uint32_t amount ) { auto slot = static_cast< uint8_t >( static_cast< uint8_t >( type ) - 1 ); auto currItem = m_storageMap[ Currency ]->getItem( slot ); @@ -281,7 +281,7 @@ void Core::Entity::Player::addCurrency( CurrencyType type, uint32_t amount ) queuePacket( invUpdate ); } -void Core::Entity::Player::removeCurrency( Common::CurrencyType type, uint32_t amount ) +void Sapphire::Entity::Player::removeCurrency( Common::CurrencyType type, uint32_t amount ) { auto currItem = m_storageMap[ Currency ]->getItem( static_cast< uint8_t >( type ) - 1 ); @@ -304,7 +304,7 @@ void Core::Entity::Player::removeCurrency( Common::CurrencyType type, uint32_t a } -void Core::Entity::Player::addCrystal( Common::CrystalType type, uint32_t amount ) +void Sapphire::Entity::Player::addCrystal( Common::CrystalType type, uint32_t amount ) { auto currItem = m_storageMap[ Crystal ]->getItem( static_cast< uint8_t >( type ) - 1 ); @@ -332,7 +332,7 @@ void Core::Entity::Player::addCrystal( Common::CrystalType type, uint32_t amount queuePacket( makeActorControl143( getId(), ItemObtainIcon, static_cast< uint8_t >( type ) + 1, amount ) ); } -void Core::Entity::Player::removeCrystal( Common::CrystalType type, uint32_t amount ) +void Sapphire::Entity::Player::removeCrystal( Common::CrystalType type, uint32_t amount ) { auto currItem = m_storageMap[ Crystal ]->getItem( static_cast< uint8_t >( type ) - 1 ); @@ -354,7 +354,7 @@ void Core::Entity::Player::removeCrystal( Common::CrystalType type, uint32_t amo queuePacket( invUpdate ); } -void Core::Entity::Player::sendInventory() +void Sapphire::Entity::Player::sendInventory() { InventoryMap::iterator it; @@ -408,7 +408,7 @@ void Core::Entity::Player::sendInventory() } -Core::Entity::Player::InvSlotPairVec Core::Entity::Player::getSlotsOfItemsInInventory( uint32_t catalogId ) +Sapphire::Entity::Player::InvSlotPairVec Sapphire::Entity::Player::getSlotsOfItemsInInventory( uint32_t catalogId ) { InvSlotPairVec outVec; for( auto i : { Bag0, Bag1, Bag2, Bag3 } ) @@ -423,7 +423,7 @@ Core::Entity::Player::InvSlotPairVec Core::Entity::Player::getSlotsOfItemsInInve return outVec; } -Core::Entity::Player::InvSlotPair Core::Entity::Player::getFreeBagSlot() +Sapphire::Entity::Player::InvSlotPair Sapphire::Entity::Player::getFreeBagSlot() { for( auto i : { Bag0, Bag1, Bag2, Bag3 } ) { @@ -436,13 +436,13 @@ Core::Entity::Player::InvSlotPair Core::Entity::Player::getFreeBagSlot() return std::make_pair( 0, -1 ); } -Core::ItemPtr Core::Entity::Player::getItemAt( uint16_t containerId, uint8_t slotId ) +Sapphire::ItemPtr Sapphire::Entity::Player::getItemAt( uint16_t containerId, uint8_t slotId ) { return m_storageMap[ containerId ]->getItem( slotId ); } -uint32_t Core::Entity::Player::getCurrency( CurrencyType type ) +uint32_t Sapphire::Entity::Player::getCurrency( CurrencyType type ) { auto currItem = m_storageMap[ Currency ]->getItem( static_cast< uint8_t >( type ) - 1 ); @@ -454,7 +454,7 @@ uint32_t Core::Entity::Player::getCurrency( CurrencyType type ) } -uint32_t Core::Entity::Player::getCrystal( CrystalType type ) +uint32_t Sapphire::Entity::Player::getCrystal( CrystalType type ) { auto currItem = m_storageMap[ Crystal ]->getItem( static_cast< uint8_t >( type ) - 1 ); @@ -466,7 +466,7 @@ uint32_t Core::Entity::Player::getCrystal( CrystalType type ) } -void Core::Entity::Player::writeInventory( InventoryType type ) +void Sapphire::Entity::Player::writeInventory( InventoryType type ) { auto pLog = g_fw.get< Logger >(); auto pDb = g_fw.get< Db::DbWorkerPool< Db::ZoneDbConnection > >(); @@ -497,7 +497,7 @@ void Core::Entity::Player::writeInventory( InventoryType type ) pDb->execute( query ); } -void Core::Entity::Player::writeItem( Core::ItemPtr pItem ) const +void Sapphire::Entity::Player::writeItem( Sapphire::ItemPtr pItem ) const { auto pDb = g_fw.get< Db::DbWorkerPool< Db::ZoneDbConnection > >(); auto stmt = pDb->getPreparedStatement( Db::CHARA_ITEMGLOBAL_UP ); @@ -512,7 +512,7 @@ void Core::Entity::Player::writeItem( Core::ItemPtr pItem ) const pDb->directExecute( stmt ); } -void Core::Entity::Player::deleteItemDb( Core::ItemPtr item ) const +void Sapphire::Entity::Player::deleteItemDb( Sapphire::ItemPtr item ) const { auto pDb = g_fw.get< Db::DbWorkerPool< Db::ZoneDbConnection > >(); auto stmt = pDb->getPreparedStatement( Db::CHARA_ITEMGLOBAL_DELETE ); @@ -523,18 +523,18 @@ void Core::Entity::Player::deleteItemDb( Core::ItemPtr item ) const } -bool Core::Entity::Player::isObtainable( uint32_t catalogId, uint8_t quantity ) +bool Sapphire::Entity::Player::isObtainable( uint32_t catalogId, uint8_t quantity ) { return true; } -Core::ItemPtr Core::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 ) { auto pDb = g_fw.get< Db::DbWorkerPool< Db::ZoneDbConnection > >(); auto pExdData = g_fw.get< Data::ExdDataGenerated >(); - auto itemInfo = pExdData->get< Core::Data::Item >( catalogId ); + auto itemInfo = pExdData->get< Sapphire::Data::Item >( catalogId ); // if item data doesn't exist or it's a blank field if( !itemInfo || itemInfo->levelItem == 0 ) @@ -638,7 +638,7 @@ Core::ItemPtr Core::Entity::Player::addItem( uint32_t catalogId, uint32_t quanti } void -Core::Entity::Player::moveItem( uint16_t fromInventoryId, uint8_t fromSlotId, uint16_t toInventoryId, uint8_t toSlot ) +Sapphire::Entity::Player::moveItem( uint16_t fromInventoryId, uint8_t fromSlotId, uint16_t toInventoryId, uint8_t toSlot ) { auto tmpItem = m_storageMap[ fromInventoryId ]->getItem( fromSlotId ); @@ -665,7 +665,7 @@ Core::Entity::Player::moveItem( uint16_t fromInventoryId, uint8_t fromSlotId, ui } -bool Core::Entity::Player::updateContainer( uint16_t storageId, uint8_t slotId, ItemPtr pItem ) +bool Sapphire::Entity::Player::updateContainer( uint16_t storageId, uint8_t slotId, ItemPtr pItem ) { auto containerType = Items::Util::getContainerType( storageId ); @@ -698,7 +698,7 @@ bool Core::Entity::Player::updateContainer( uint16_t storageId, uint8_t slotId, return true; } -void Core::Entity::Player::splitItem( uint16_t fromInventoryId, uint8_t fromSlotId, +void Sapphire::Entity::Player::splitItem( uint16_t fromInventoryId, uint8_t fromSlotId, uint16_t toInventoryId, uint8_t toSlot, uint16_t itemCount ) { if( itemCount == 0 ) @@ -731,7 +731,7 @@ void Core::Entity::Player::splitItem( uint16_t fromInventoryId, uint8_t fromSlot writeItem( fromItem ); } -void Core::Entity::Player::mergeItem( uint16_t fromInventoryId, uint8_t fromSlotId, +void Sapphire::Entity::Player::mergeItem( uint16_t fromInventoryId, uint8_t fromSlotId, uint16_t toInventoryId, uint8_t toSlot ) { auto fromItem = m_storageMap[ fromInventoryId ]->getItem( fromSlotId ); @@ -766,7 +766,7 @@ void Core::Entity::Player::mergeItem( uint16_t fromInventoryId, uint8_t fromSlot updateContainer( toInventoryId, toSlot, toItem ); } -void Core::Entity::Player::swapItem( uint16_t fromInventoryId, uint8_t fromSlotId, +void Sapphire::Entity::Player::swapItem( uint16_t fromInventoryId, uint8_t fromSlotId, uint16_t toInventoryId, uint8_t toSlot ) { auto fromItem = m_storageMap[ fromInventoryId ]->getItem( fromSlotId ); @@ -794,7 +794,7 @@ void Core::Entity::Player::swapItem( uint16_t fromInventoryId, uint8_t fromSlotI updateContainer( fromInventoryId, fromSlotId, toItem ); } -void Core::Entity::Player::discardItem( uint16_t fromInventoryId, uint8_t fromSlotId ) +void Sapphire::Entity::Player::discardItem( uint16_t fromInventoryId, uint8_t fromSlotId ) { // i am not entirely sure how this should be generated or if it even is important for us... uint32_t transactionId = 1; @@ -822,18 +822,18 @@ void Core::Entity::Player::discardItem( uint16_t fromInventoryId, uint8_t fromSl queuePacket( invTransFinPacket ); } -void Core::Entity::Player::setActiveLand( uint8_t land, uint8_t ward ) +void Sapphire::Entity::Player::setActiveLand( uint8_t land, uint8_t ward ) { m_activeLand.plot = land; m_activeLand.ward = ward; } -Core::Common::ActiveLand Core::Entity::Player::getActiveLand() const +Sapphire::Common::ActiveLand Sapphire::Entity::Player::getActiveLand() const { return m_activeLand; } -uint16_t Core::Entity::Player::calculateEquippedGearItemLevel() +uint16_t Sapphire::Entity::Player::calculateEquippedGearItemLevel() { uint32_t iLvlResult = 0; @@ -863,7 +863,7 @@ uint16_t Core::Entity::Player::calculateEquippedGearItemLevel() } -uint8_t Core::Entity::Player::getFreeSlotsInBags() +uint8_t Sapphire::Entity::Player::getFreeSlotsInBags() { uint8_t slots = 0; for( uint8_t container : { Bag0, Bag1, Bag2, Bag3 } ) @@ -874,7 +874,7 @@ uint8_t Core::Entity::Player::getFreeSlotsInBags() return slots; } -bool Core::Entity::Player::collectHandInItems( std::vector< uint32_t > itemIds ) +bool Sapphire::Entity::Player::collectHandInItems( std::vector< uint32_t > itemIds ) { // todo: figure out how the game gets the required stack count const auto& container = m_storageMap[ HandIn ]; diff --git a/src/servers/sapphire_zone/Actor/PlayerQuest.cpp b/src/servers/sapphire_zone/Actor/PlayerQuest.cpp index 94ef38c4..b3466e27 100644 --- a/src/servers/sapphire_zone/Actor/PlayerQuest.cpp +++ b/src/servers/sapphire_zone/Actor/PlayerQuest.cpp @@ -9,13 +9,13 @@ #include "Session.h" #include "Framework.h" -extern Core::Framework g_fw; +extern Sapphire::Framework g_fw; -using namespace Core::Common; -using namespace Core::Network::Packets; -using namespace Core::Network::Packets::Server; +using namespace Sapphire::Common; +using namespace Sapphire::Network::Packets; +using namespace Sapphire::Network::Packets::Server; -void Core::Entity::Player::finishQuest( uint16_t questId ) +void Sapphire::Entity::Player::finishQuest( uint16_t questId ) { int8_t idx = getQuestIndex( questId ); @@ -27,13 +27,13 @@ void Core::Entity::Player::finishQuest( uint16_t questId ) } -void Core::Entity::Player::unfinishQuest( uint16_t questId ) +void Sapphire::Entity::Player::unfinishQuest( uint16_t questId ) { removeQuestsCompleted( questId ); sendQuestInfo(); } -void Core::Entity::Player::removeQuest( uint16_t questId ) +void Sapphire::Entity::Player::removeQuest( uint16_t questId ) { int8_t idx = getQuestIndex( questId ); @@ -72,12 +72,12 @@ void Core::Entity::Player::removeQuest( uint16_t questId ) } -bool Core::Entity::Player::hasQuest( uint32_t questId ) +bool Sapphire::Entity::Player::hasQuest( uint32_t questId ) { return ( getQuestIndex( static_cast< uint16_t >( questId ) ) > -1 ); } -int8_t Core::Entity::Player::getQuestIndex( uint16_t questId ) +int8_t Sapphire::Entity::Player::getQuestIndex( uint16_t questId ) { auto it = m_questIdToQuestIdx.find( questId ); if( it != m_questIdToQuestIdx.end() ) @@ -86,7 +86,7 @@ int8_t Core::Entity::Player::getQuestIndex( uint16_t questId ) return -1; } -bool Core::Entity::Player::getQuestBitFlag8( uint16_t questId, uint8_t index ) +bool Sapphire::Entity::Player::getQuestBitFlag8( uint16_t questId, uint8_t index ) { int8_t idx = getQuestIndex( questId ); uint8_t value = 0; @@ -99,7 +99,7 @@ bool Core::Entity::Player::getQuestBitFlag8( uint16_t questId, uint8_t index ) return false; } -bool Core::Entity::Player::getQuestBitFlag16( uint16_t questId, uint8_t index ) +bool Sapphire::Entity::Player::getQuestBitFlag16( uint16_t questId, uint8_t index ) { int8_t idx = getQuestIndex( questId ); uint8_t value = 0; @@ -112,7 +112,7 @@ bool Core::Entity::Player::getQuestBitFlag16( uint16_t questId, uint8_t index ) return false; } -bool Core::Entity::Player::getQuestBitFlag24( uint16_t questId, uint8_t index ) +bool Sapphire::Entity::Player::getQuestBitFlag24( uint16_t questId, uint8_t index ) { int8_t idx = getQuestIndex( questId ); uint8_t value = 0; @@ -125,7 +125,7 @@ bool Core::Entity::Player::getQuestBitFlag24( uint16_t questId, uint8_t index ) return false; } -bool Core::Entity::Player::getQuestBitFlag32( uint16_t questId, uint8_t index ) +bool Sapphire::Entity::Player::getQuestBitFlag32( uint16_t questId, uint8_t index ) { int8_t idx = getQuestIndex( questId ); uint8_t value = 0; @@ -138,7 +138,7 @@ bool Core::Entity::Player::getQuestBitFlag32( uint16_t questId, uint8_t index ) return false; } -bool Core::Entity::Player::getQuestBitFlag40( uint16_t questId, uint8_t index ) +bool Sapphire::Entity::Player::getQuestBitFlag40( uint16_t questId, uint8_t index ) { int8_t idx = getQuestIndex( questId ); uint8_t value = 0; @@ -151,7 +151,7 @@ bool Core::Entity::Player::getQuestBitFlag40( uint16_t questId, uint8_t index ) return false; } -bool Core::Entity::Player::getQuestBitFlag48( uint16_t questId, uint8_t index ) +bool Sapphire::Entity::Player::getQuestBitFlag48( uint16_t questId, uint8_t index ) { int8_t idx = getQuestIndex( questId ); uint8_t value = 0; @@ -164,7 +164,7 @@ bool Core::Entity::Player::getQuestBitFlag48( uint16_t questId, uint8_t index ) return false; } -uint8_t Core::Entity::Player::getQuestUI8A( uint16_t questId ) +uint8_t Sapphire::Entity::Player::getQuestUI8A( uint16_t questId ) { int8_t idx = getQuestIndex( questId ); uint8_t value = 0; @@ -177,7 +177,7 @@ uint8_t Core::Entity::Player::getQuestUI8A( uint16_t questId ) return value; } -uint8_t Core::Entity::Player::getQuestUI8B( uint16_t questId ) +uint8_t Sapphire::Entity::Player::getQuestUI8B( uint16_t questId ) { int8_t idx = getQuestIndex( questId ); uint8_t value = 0; @@ -190,7 +190,7 @@ uint8_t Core::Entity::Player::getQuestUI8B( uint16_t questId ) return value; } -uint8_t Core::Entity::Player::getQuestUI8C( uint16_t questId ) +uint8_t Sapphire::Entity::Player::getQuestUI8C( uint16_t questId ) { int8_t idx = getQuestIndex( questId ); uint8_t value = 0; @@ -203,7 +203,7 @@ uint8_t Core::Entity::Player::getQuestUI8C( uint16_t questId ) return value; } -uint8_t Core::Entity::Player::getQuestUI8D( uint16_t questId ) +uint8_t Sapphire::Entity::Player::getQuestUI8D( uint16_t questId ) { int8_t idx = getQuestIndex( questId ); uint8_t value = 0; @@ -216,7 +216,7 @@ uint8_t Core::Entity::Player::getQuestUI8D( uint16_t questId ) return value; } -uint8_t Core::Entity::Player::getQuestUI8E( uint16_t questId ) +uint8_t Sapphire::Entity::Player::getQuestUI8E( uint16_t questId ) { int8_t idx = getQuestIndex( questId ); uint8_t value = 0; @@ -229,7 +229,7 @@ uint8_t Core::Entity::Player::getQuestUI8E( uint16_t questId ) return value; } -uint8_t Core::Entity::Player::getQuestUI8F( uint16_t questId ) +uint8_t Sapphire::Entity::Player::getQuestUI8F( uint16_t questId ) { int8_t idx = getQuestIndex( questId ); uint8_t value = 0; @@ -242,7 +242,7 @@ uint8_t Core::Entity::Player::getQuestUI8F( uint16_t questId ) return value; } -uint8_t Core::Entity::Player::getQuestUI8AH( uint16_t questId ) +uint8_t Sapphire::Entity::Player::getQuestUI8AH( uint16_t questId ) { int8_t idx = getQuestIndex( questId ); uint8_t value = 0; @@ -255,7 +255,7 @@ uint8_t Core::Entity::Player::getQuestUI8AH( uint16_t questId ) return value; } -uint8_t Core::Entity::Player::getQuestUI8BH( uint16_t questId ) +uint8_t Sapphire::Entity::Player::getQuestUI8BH( uint16_t questId ) { int8_t idx = getQuestIndex( questId ); uint8_t value = 0; @@ -268,7 +268,7 @@ uint8_t Core::Entity::Player::getQuestUI8BH( uint16_t questId ) return value; } -uint8_t Core::Entity::Player::getQuestUI8CH( uint16_t questId ) +uint8_t Sapphire::Entity::Player::getQuestUI8CH( uint16_t questId ) { int8_t idx = getQuestIndex( questId ); uint8_t value = 0; @@ -281,7 +281,7 @@ uint8_t Core::Entity::Player::getQuestUI8CH( uint16_t questId ) return value; } -uint8_t Core::Entity::Player::getQuestUI8DH( uint16_t questId ) +uint8_t Sapphire::Entity::Player::getQuestUI8DH( uint16_t questId ) { int8_t idx = getQuestIndex( questId ); uint8_t value = 0; @@ -294,7 +294,7 @@ uint8_t Core::Entity::Player::getQuestUI8DH( uint16_t questId ) return value; } -uint8_t Core::Entity::Player::getQuestUI8EH( uint16_t questId ) +uint8_t Sapphire::Entity::Player::getQuestUI8EH( uint16_t questId ) { int8_t idx = getQuestIndex( questId ); uint8_t value = 0; @@ -307,7 +307,7 @@ uint8_t Core::Entity::Player::getQuestUI8EH( uint16_t questId ) return value; } -uint8_t Core::Entity::Player::getQuestUI8FH( uint16_t questId ) +uint8_t Sapphire::Entity::Player::getQuestUI8FH( uint16_t questId ) { int8_t idx = getQuestIndex( questId ); uint8_t value = 0; @@ -320,7 +320,7 @@ uint8_t Core::Entity::Player::getQuestUI8FH( uint16_t questId ) return value; } -uint8_t Core::Entity::Player::getQuestUI8AL( uint16_t questId ) +uint8_t Sapphire::Entity::Player::getQuestUI8AL( uint16_t questId ) { int8_t idx = getQuestIndex( questId ); uint8_t value = 0; @@ -333,7 +333,7 @@ uint8_t Core::Entity::Player::getQuestUI8AL( uint16_t questId ) return value; } -uint8_t Core::Entity::Player::getQuestUI8BL( uint16_t questId ) +uint8_t Sapphire::Entity::Player::getQuestUI8BL( uint16_t questId ) { int8_t idx = getQuestIndex( questId ); uint8_t value = 0; @@ -346,7 +346,7 @@ uint8_t Core::Entity::Player::getQuestUI8BL( uint16_t questId ) return value; } -uint8_t Core::Entity::Player::getQuestUI8CL( uint16_t questId ) +uint8_t Sapphire::Entity::Player::getQuestUI8CL( uint16_t questId ) { int8_t idx = getQuestIndex( questId ); uint8_t value = 0; @@ -359,7 +359,7 @@ uint8_t Core::Entity::Player::getQuestUI8CL( uint16_t questId ) return value; } -uint8_t Core::Entity::Player::getQuestUI8DL( uint16_t questId ) +uint8_t Sapphire::Entity::Player::getQuestUI8DL( uint16_t questId ) { int8_t idx = getQuestIndex( questId ); uint8_t value = 0; @@ -372,7 +372,7 @@ uint8_t Core::Entity::Player::getQuestUI8DL( uint16_t questId ) return value; } -uint8_t Core::Entity::Player::getQuestUI8EL( uint16_t questId ) +uint8_t Sapphire::Entity::Player::getQuestUI8EL( uint16_t questId ) { int8_t idx = getQuestIndex( questId ); uint8_t value = 0; @@ -385,7 +385,7 @@ uint8_t Core::Entity::Player::getQuestUI8EL( uint16_t questId ) return value; } -uint8_t Core::Entity::Player::getQuestUI8FL( uint16_t questId ) +uint8_t Sapphire::Entity::Player::getQuestUI8FL( uint16_t questId ) { int8_t idx = getQuestIndex( questId ); uint8_t value = 0; @@ -398,7 +398,7 @@ uint8_t Core::Entity::Player::getQuestUI8FL( uint16_t questId ) return value; } -uint16_t Core::Entity::Player::getQuestUI16A( uint16_t questId ) +uint16_t Sapphire::Entity::Player::getQuestUI16A( uint16_t questId ) { int8_t idx = getQuestIndex( questId ); uint16_t value = 0; @@ -411,7 +411,7 @@ uint16_t Core::Entity::Player::getQuestUI16A( uint16_t questId ) return value; } -uint16_t Core::Entity::Player::getQuestUI16B( uint16_t questId ) +uint16_t Sapphire::Entity::Player::getQuestUI16B( uint16_t questId ) { int8_t idx = getQuestIndex( questId ); uint16_t value = 0; @@ -424,7 +424,7 @@ uint16_t Core::Entity::Player::getQuestUI16B( uint16_t questId ) return value; } -uint16_t Core::Entity::Player::getQuestUI16C( uint16_t questId ) +uint16_t Sapphire::Entity::Player::getQuestUI16C( uint16_t questId ) { int8_t idx = getQuestIndex( questId ); uint16_t value = 0; @@ -437,7 +437,7 @@ uint16_t Core::Entity::Player::getQuestUI16C( uint16_t questId ) return value; } -uint32_t Core::Entity::Player::getQuestUI32A( uint16_t questId ) +uint32_t Sapphire::Entity::Player::getQuestUI32A( uint16_t questId ) { int8_t idx = getQuestIndex( questId ); uint32_t value = 0; @@ -450,7 +450,7 @@ uint32_t Core::Entity::Player::getQuestUI32A( uint16_t questId ) return value; } -void Core::Entity::Player::setQuestUI8A( uint16_t questId, uint8_t val ) +void Sapphire::Entity::Player::setQuestUI8A( uint16_t questId, uint8_t val ) { int8_t idx = getQuestIndex( questId ); @@ -464,7 +464,7 @@ void Core::Entity::Player::setQuestUI8A( uint16_t questId, uint8_t val ) } } -void Core::Entity::Player::setQuestUI8B( uint16_t questId, uint8_t val ) +void Sapphire::Entity::Player::setQuestUI8B( uint16_t questId, uint8_t val ) { int8_t idx = getQuestIndex( questId ); @@ -478,7 +478,7 @@ void Core::Entity::Player::setQuestUI8B( uint16_t questId, uint8_t val ) } } -void Core::Entity::Player::setQuestUI8C( uint16_t questId, uint8_t val ) +void Sapphire::Entity::Player::setQuestUI8C( uint16_t questId, uint8_t val ) { int8_t idx = getQuestIndex( questId ); @@ -492,7 +492,7 @@ void Core::Entity::Player::setQuestUI8C( uint16_t questId, uint8_t val ) } } -void Core::Entity::Player::setQuestUI8D( uint16_t questId, uint8_t val ) +void Sapphire::Entity::Player::setQuestUI8D( uint16_t questId, uint8_t val ) { int8_t idx = getQuestIndex( questId ); @@ -506,7 +506,7 @@ void Core::Entity::Player::setQuestUI8D( uint16_t questId, uint8_t val ) } } -void Core::Entity::Player::setQuestUI8E( uint16_t questId, uint8_t val ) +void Sapphire::Entity::Player::setQuestUI8E( uint16_t questId, uint8_t val ) { int8_t idx = getQuestIndex( questId ); @@ -520,7 +520,7 @@ void Core::Entity::Player::setQuestUI8E( uint16_t questId, uint8_t val ) } } -void Core::Entity::Player::setQuestUI8F( uint16_t questId, uint8_t val ) +void Sapphire::Entity::Player::setQuestUI8F( uint16_t questId, uint8_t val ) { int8_t idx = getQuestIndex( questId ); @@ -534,7 +534,7 @@ void Core::Entity::Player::setQuestUI8F( uint16_t questId, uint8_t val ) } } -void Core::Entity::Player::setQuestUI8AH( uint16_t questId, uint8_t val ) +void Sapphire::Entity::Player::setQuestUI8AH( uint16_t questId, uint8_t val ) { int8_t idx = getQuestIndex( questId ); @@ -548,7 +548,7 @@ void Core::Entity::Player::setQuestUI8AH( uint16_t questId, uint8_t val ) } } -void Core::Entity::Player::setQuestUI8BH( uint16_t questId, uint8_t val ) +void Sapphire::Entity::Player::setQuestUI8BH( uint16_t questId, uint8_t val ) { int8_t idx = getQuestIndex( questId ); @@ -562,7 +562,7 @@ void Core::Entity::Player::setQuestUI8BH( uint16_t questId, uint8_t val ) } } -void Core::Entity::Player::setQuestUI8CH( uint16_t questId, uint8_t val ) +void Sapphire::Entity::Player::setQuestUI8CH( uint16_t questId, uint8_t val ) { int8_t idx = getQuestIndex( questId ); @@ -576,7 +576,7 @@ void Core::Entity::Player::setQuestUI8CH( uint16_t questId, uint8_t val ) } } -void Core::Entity::Player::setQuestUI8DH( uint16_t questId, uint8_t val ) +void Sapphire::Entity::Player::setQuestUI8DH( uint16_t questId, uint8_t val ) { int8_t idx = getQuestIndex( questId ); @@ -590,7 +590,7 @@ void Core::Entity::Player::setQuestUI8DH( uint16_t questId, uint8_t val ) } } -void Core::Entity::Player::setQuestUI8EH( uint16_t questId, uint8_t val ) +void Sapphire::Entity::Player::setQuestUI8EH( uint16_t questId, uint8_t val ) { int8_t idx = getQuestIndex( questId ); @@ -604,7 +604,7 @@ void Core::Entity::Player::setQuestUI8EH( uint16_t questId, uint8_t val ) } } -void Core::Entity::Player::setQuestUI8FH( uint16_t questId, uint8_t val ) +void Sapphire::Entity::Player::setQuestUI8FH( uint16_t questId, uint8_t val ) { int8_t idx = getQuestIndex( questId ); @@ -618,7 +618,7 @@ void Core::Entity::Player::setQuestUI8FH( uint16_t questId, uint8_t val ) } } -void Core::Entity::Player::setQuestUI8AL( uint16_t questId, uint8_t val ) +void Sapphire::Entity::Player::setQuestUI8AL( uint16_t questId, uint8_t val ) { int8_t idx = getQuestIndex( questId ); @@ -632,7 +632,7 @@ void Core::Entity::Player::setQuestUI8AL( uint16_t questId, uint8_t val ) } } -void Core::Entity::Player::setQuestUI8BL( uint16_t questId, uint8_t val ) +void Sapphire::Entity::Player::setQuestUI8BL( uint16_t questId, uint8_t val ) { int8_t idx = getQuestIndex( questId ); @@ -646,7 +646,7 @@ void Core::Entity::Player::setQuestUI8BL( uint16_t questId, uint8_t val ) } } -void Core::Entity::Player::setQuestUI8CL( uint16_t questId, uint8_t val ) +void Sapphire::Entity::Player::setQuestUI8CL( uint16_t questId, uint8_t val ) { int8_t idx = getQuestIndex( questId ); @@ -660,7 +660,7 @@ void Core::Entity::Player::setQuestUI8CL( uint16_t questId, uint8_t val ) } } -void Core::Entity::Player::setQuestUI8DL( uint16_t questId, uint8_t val ) +void Sapphire::Entity::Player::setQuestUI8DL( uint16_t questId, uint8_t val ) { int8_t idx = getQuestIndex( questId ); @@ -674,7 +674,7 @@ void Core::Entity::Player::setQuestUI8DL( uint16_t questId, uint8_t val ) } } -void Core::Entity::Player::setQuestUI8EL( uint16_t questId, uint8_t val ) +void Sapphire::Entity::Player::setQuestUI8EL( uint16_t questId, uint8_t val ) { int8_t idx = getQuestIndex( questId ); @@ -688,7 +688,7 @@ void Core::Entity::Player::setQuestUI8EL( uint16_t questId, uint8_t val ) } } -void Core::Entity::Player::setQuestUI8FL( uint16_t questId, uint8_t val ) +void Sapphire::Entity::Player::setQuestUI8FL( uint16_t questId, uint8_t val ) { int8_t idx = getQuestIndex( questId ); @@ -702,7 +702,7 @@ void Core::Entity::Player::setQuestUI8FL( uint16_t questId, uint8_t val ) } } -void Core::Entity::Player::setQuestUI16A( uint16_t questId, uint16_t val ) +void Sapphire::Entity::Player::setQuestUI16A( uint16_t questId, uint16_t val ) { int8_t idx = getQuestIndex( questId ); @@ -716,7 +716,7 @@ void Core::Entity::Player::setQuestUI16A( uint16_t questId, uint16_t val ) } } -void Core::Entity::Player::setQuestUI16B( uint16_t questId, uint16_t val ) +void Sapphire::Entity::Player::setQuestUI16B( uint16_t questId, uint16_t val ) { int8_t idx = getQuestIndex( questId ); @@ -730,7 +730,7 @@ void Core::Entity::Player::setQuestUI16B( uint16_t questId, uint16_t val ) } } -void Core::Entity::Player::setQuestUI16C( uint16_t questId, uint16_t val ) +void Sapphire::Entity::Player::setQuestUI16C( uint16_t questId, uint16_t val ) { int8_t idx = getQuestIndex( questId ); @@ -744,7 +744,7 @@ void Core::Entity::Player::setQuestUI16C( uint16_t questId, uint16_t val ) } } -void Core::Entity::Player::setQuestUI32A( uint16_t questId, uint32_t val ) +void Sapphire::Entity::Player::setQuestUI32A( uint16_t questId, uint32_t val ) { int8_t idx = getQuestIndex( questId ); @@ -758,7 +758,7 @@ void Core::Entity::Player::setQuestUI32A( uint16_t questId, uint32_t val ) } } -void Core::Entity::Player::setQuestBitFlag8( uint16_t questId, uint8_t index, bool val ) +void Sapphire::Entity::Player::setQuestBitFlag8( uint16_t questId, uint8_t index, bool val ) { int8_t idx = getQuestIndex( questId ); @@ -775,7 +775,7 @@ void Core::Entity::Player::setQuestBitFlag8( uint16_t questId, uint8_t index, bo } } -void Core::Entity::Player::setQuestBitFlag16( uint16_t questId, uint8_t index, bool val ) +void Sapphire::Entity::Player::setQuestBitFlag16( uint16_t questId, uint8_t index, bool val ) { int8_t idx = getQuestIndex( questId ); @@ -792,7 +792,7 @@ void Core::Entity::Player::setQuestBitFlag16( uint16_t questId, uint8_t index, b } } -void Core::Entity::Player::setQuestBitFlag24( uint16_t questId, uint8_t index, bool val ) +void Sapphire::Entity::Player::setQuestBitFlag24( uint16_t questId, uint8_t index, bool val ) { int8_t idx = getQuestIndex( questId ); @@ -809,7 +809,7 @@ void Core::Entity::Player::setQuestBitFlag24( uint16_t questId, uint8_t index, b } } -void Core::Entity::Player::setQuestBitFlag32( uint16_t questId, uint8_t index, bool val ) +void Sapphire::Entity::Player::setQuestBitFlag32( uint16_t questId, uint8_t index, bool val ) { int8_t idx = getQuestIndex( questId ); @@ -826,7 +826,7 @@ void Core::Entity::Player::setQuestBitFlag32( uint16_t questId, uint8_t index, b } } -void Core::Entity::Player::setQuestBitFlag40( uint16_t questId, uint8_t index, bool val ) +void Sapphire::Entity::Player::setQuestBitFlag40( uint16_t questId, uint8_t index, bool val ) { int8_t idx = getQuestIndex( questId ); @@ -843,7 +843,7 @@ void Core::Entity::Player::setQuestBitFlag40( uint16_t questId, uint8_t index, b } } -void Core::Entity::Player::setQuestBitFlag48( uint16_t questId, uint8_t index, bool val ) +void Sapphire::Entity::Player::setQuestBitFlag48( uint16_t questId, uint8_t index, bool val ) { int8_t idx = getQuestIndex( questId ); @@ -861,7 +861,7 @@ void Core::Entity::Player::setQuestBitFlag48( uint16_t questId, uint8_t index, b } -uint8_t Core::Entity::Player::getQuestSeq( uint16_t questId ) +uint8_t Sapphire::Entity::Player::getQuestSeq( uint16_t questId ) { int8_t idx = getQuestIndex( questId ); @@ -873,7 +873,7 @@ uint8_t Core::Entity::Player::getQuestSeq( uint16_t questId ) return 0; } -void Core::Entity::Player::updateQuest( uint16_t questId, uint8_t sequence ) +void Sapphire::Entity::Player::updateQuest( uint16_t questId, uint8_t sequence ) { if( hasQuest( questId ) ) { @@ -930,7 +930,7 @@ void Core::Entity::Player::updateQuest( uint16_t questId, uint8_t sequence ) } } -void Core::Entity::Player::sendQuestTracker() +void Sapphire::Entity::Player::sendQuestTracker() { auto trackerPacket = makeZonePacket< FFXIVIpcQuestTracker >( getId() ); @@ -945,7 +945,7 @@ void Core::Entity::Player::sendQuestTracker() queuePacket( trackerPacket ); } -void Core::Entity::Player::setQuestTracker( uint16_t index, int16_t flag ) +void Sapphire::Entity::Player::setQuestTracker( uint16_t index, int16_t flag ) { if( flag == 0 ) { @@ -975,7 +975,7 @@ void Core::Entity::Player::setQuestTracker( uint16_t index, int16_t flag ) } -void Core::Entity::Player::sendQuestInfo() +void Sapphire::Entity::Player::sendQuestInfo() { auto activeQuestListPacket = makeZonePacket< FFXIVIpcQuestActiveList >( getId() ); @@ -1001,13 +1001,13 @@ void Core::Entity::Player::sendQuestInfo() } void -Core::Entity::Player::sendQuestMessage( uint32_t questId, int8_t msgId, uint8_t type, uint32_t var1, uint32_t var2 ) +Sapphire::Entity::Player::sendQuestMessage( uint32_t questId, int8_t msgId, uint8_t type, uint32_t var1, uint32_t var2 ) { queuePacket( std::make_shared< QuestMessagePacket >( getAsPlayer(), questId, msgId, type, var1, var2 ) ); } -void Core::Entity::Player::updateQuestsCompleted( uint32_t questId ) +void Sapphire::Entity::Player::updateQuestsCompleted( uint32_t questId ) { uint8_t index = questId / 8; uint8_t bitIndex = ( questId ) % 8; @@ -1017,7 +1017,7 @@ void Core::Entity::Player::updateQuestsCompleted( uint32_t questId ) m_questCompleteFlags[ index ] |= value; } -void Core::Entity::Player::removeQuestsCompleted( uint32_t questId ) +void Sapphire::Entity::Player::removeQuestsCompleted( uint32_t questId ) { uint8_t index = questId / 8; uint8_t bitIndex = ( questId ) % 8; @@ -1028,17 +1028,17 @@ void Core::Entity::Player::removeQuestsCompleted( uint32_t questId ) } -bool Core::Entity::Player::giveQuestRewards( uint32_t questId, uint32_t optionalChoice ) +bool Sapphire::Entity::Player::giveQuestRewards( uint32_t questId, uint32_t optionalChoice ) { auto pExdData = g_fw.get< Data::ExdDataGenerated >(); uint32_t playerLevel = getLevel(); - auto questInfo = pExdData->get< Core::Data::Quest >( questId ); + auto questInfo = pExdData->get< Sapphire::Data::Quest >( questId ); if( !questInfo ) return false; - auto paramGrowth = pExdData->get< Core::Data::ParamGrow >( questInfo->classJobLevel0 ); + auto paramGrowth = pExdData->get< Sapphire::Data::ParamGrow >( questInfo->classJobLevel0 ); // TODO: use the correct formula, this one is wrong uint32_t exp = @@ -1076,7 +1076,7 @@ bool Core::Entity::Player::giveQuestRewards( uint32_t questId, uint32_t optional return true; } -std::shared_ptr< QuestActive > Core::Entity::Player::getQuestActive( uint16_t index ) +std::shared_ptr< QuestActive > Sapphire::Entity::Player::getQuestActive( uint16_t index ) { return m_activeQuests[ index ]; } diff --git a/src/servers/sapphire_zone/Actor/PlayerSql.cpp b/src/servers/sapphire_zone/Actor/PlayerSql.cpp index 03eb605a..62fea9fe 100644 --- a/src/servers/sapphire_zone/Actor/PlayerSql.cpp +++ b/src/servers/sapphire_zone/Actor/PlayerSql.cpp @@ -21,14 +21,14 @@ #include "ServerMgr.h" #include "Framework.h" -extern Core::Framework g_fw; +extern Sapphire::Framework g_fw; -using namespace Core::Common; -using namespace Core::Network::Packets; -using namespace Core::Network::Packets::Server; +using namespace Sapphire::Common; +using namespace Sapphire::Network::Packets; +using namespace Sapphire::Network::Packets::Server; // load player from the db -bool Core::Entity::Player::load( uint32_t charId, SessionPtr pSession ) +bool Sapphire::Entity::Player::load( uint32_t charId, SessionPtr pSession ) { auto pDb = g_fw.get< Db::DbWorkerPool< Db::ZoneDbConnection > >(); auto pTeriMgr = g_fw.get< TerritoryMgr >(); @@ -245,7 +245,7 @@ bool Core::Entity::Player::load( uint32_t charId, SessionPtr pSession ) return true; } -bool Core::Entity::Player::loadActiveQuests() +bool Sapphire::Entity::Player::loadActiveQuests() { auto pDb = g_fw.get< Db::DbWorkerPool< Db::ZoneDbConnection > >(); auto stmt = pDb->getPreparedStatement( Db::ZoneDbStatements::CHARA_SEL_QUEST ); @@ -281,7 +281,7 @@ bool Core::Entity::Player::loadActiveQuests() } -bool Core::Entity::Player::loadClassData() +bool Sapphire::Entity::Player::loadClassData() { auto pDb = g_fw.get< Db::DbWorkerPool< Db::ZoneDbConnection > >(); // ClassIdx, Exp, Lvl @@ -302,7 +302,7 @@ bool Core::Entity::Player::loadClassData() return true; } -bool Core::Entity::Player::loadSearchInfo() +bool Sapphire::Entity::Player::loadSearchInfo() { auto pDb = g_fw.get< Db::DbWorkerPool< Db::ZoneDbConnection > >(); auto stmt = pDb->getPreparedStatement( Db::ZoneDbStatements::CHARA_SEL_SEARCHINFO ); @@ -324,7 +324,7 @@ bool Core::Entity::Player::loadSearchInfo() } -void Core::Entity::Player::updateSql() +void Sapphire::Entity::Player::updateSql() { auto pDb = g_fw.get< Db::DbWorkerPool< Db::ZoneDbConnection > >(); /*"Hp 1, Mp 2, Tp 3, Gp 4, Mode 5, Mount 6, InvincibleGM 7, Voice 8, " @@ -466,11 +466,11 @@ void Core::Entity::Player::updateSql() } -void Core::Entity::Player::updateDbClass() const +void Sapphire::Entity::Player::updateDbClass() const { auto pDb = g_fw.get< Db::DbWorkerPool< Db::ZoneDbConnection > >(); auto pExdData = g_fw.get< Data::ExdDataGenerated >(); - uint8_t classJobIndex = pExdData->get< Core::Data::ClassJob >( static_cast( getClass() ) )->expArrayIndex; + uint8_t classJobIndex = pExdData->get< Sapphire::Data::ClassJob >( static_cast( getClass() ) )->expArrayIndex; //Exp = ?, Lvl = ? WHERE CharacterId = ? AND ClassIdx = ? auto stmtS = pDb->getPreparedStatement( Db::CHARA_CLASS_UP ); @@ -481,7 +481,7 @@ void Core::Entity::Player::updateDbClass() const pDb->execute( stmtS ); } -void Core::Entity::Player::insertDbClass( const uint8_t classJobIndex ) const +void Sapphire::Entity::Player::insertDbClass( const uint8_t classJobIndex ) const { auto pDb = g_fw.get< Db::DbWorkerPool< Db::ZoneDbConnection > >(); auto stmtClass = pDb->getPreparedStatement( Db::CHARA_CLASS_INS ); @@ -492,7 +492,7 @@ void Core::Entity::Player::insertDbClass( const uint8_t classJobIndex ) const pDb->directExecute( stmtClass ); } -void Core::Entity::Player::updateDbSearchInfo() const +void Sapphire::Entity::Player::updateDbSearchInfo() const { auto pDb = g_fw.get< Db::DbWorkerPool< Db::ZoneDbConnection > >(); auto stmtS = pDb->getPreparedStatement( Db::CHARA_SEARCHINFO_UP_SELECTCLASS ); @@ -511,7 +511,7 @@ void Core::Entity::Player::updateDbSearchInfo() const pDb->execute( stmtS2 ); } -void Core::Entity::Player::updateDbAllQuests() const +void Sapphire::Entity::Player::updateDbAllQuests() const { auto pDb = g_fw.get< Db::DbWorkerPool< Db::ZoneDbConnection > >(); for( int32_t i = 0; i < 30; i++ ) @@ -536,7 +536,7 @@ void Core::Entity::Player::updateDbAllQuests() const } } -void Core::Entity::Player::deleteQuest( uint16_t questId ) const +void Sapphire::Entity::Player::deleteQuest( uint16_t questId ) const { auto pDb = g_fw.get< Db::DbWorkerPool< Db::ZoneDbConnection > >(); auto stmt = pDb->getPreparedStatement( Db::CHARA_QUEST_DEL ); @@ -545,7 +545,7 @@ void Core::Entity::Player::deleteQuest( uint16_t questId ) const pDb->execute( stmt ); } -void Core::Entity::Player::insertQuest( uint16_t questId, uint8_t index, uint8_t seq ) const +void Sapphire::Entity::Player::insertQuest( uint16_t questId, uint8_t index, uint8_t seq ) const { auto pDb = g_fw.get< Db::DbWorkerPool< Db::ZoneDbConnection > >(); auto stmt = pDb->getPreparedStatement( Db::CHARA_QUEST_INS ); @@ -564,11 +564,11 @@ void Core::Entity::Player::insertQuest( uint16_t questId, uint8_t index, uint8_t pDb->execute( stmt ); } -Core::ItemPtr Core::Entity::Player::createItem( uint32_t catalogId, uint32_t quantity ) +Sapphire::ItemPtr Sapphire::Entity::Player::createItem( uint32_t catalogId, uint32_t quantity ) { auto pExdData = g_fw.get< Data::ExdDataGenerated >(); auto pDb = g_fw.get< Db::DbWorkerPool< Db::ZoneDbConnection > >(); - auto itemInfo = pExdData->get< Core::Data::Item >( catalogId ); + auto itemInfo = pExdData->get< Sapphire::Data::Item >( catalogId ); if( !itemInfo ) return nullptr; @@ -595,7 +595,7 @@ Core::ItemPtr Core::Entity::Player::createItem( uint32_t catalogId, uint32_t qua return pItem; } -bool Core::Entity::Player::loadInventory() +bool Sapphire::Entity::Player::loadInventory() { auto pDb = g_fw.get< Db::DbWorkerPool< Db::ZoneDbConnection > >(); ////////////////////////////////////////////////////////////////////////////////////////////////////// diff --git a/src/servers/sapphire_zone/Actor/SpawnPoint.cpp b/src/servers/sapphire_zone/Actor/SpawnPoint.cpp index 1a349474..de98f2cc 100644 --- a/src/servers/sapphire_zone/Actor/SpawnPoint.cpp +++ b/src/servers/sapphire_zone/Actor/SpawnPoint.cpp @@ -1,12 +1,12 @@ #include "SpawnPoint.h" #include "BNpc.h" -Core::Entity::SpawnPoint::SpawnPoint() +Sapphire::Entity::SpawnPoint::SpawnPoint() { } -Core::Entity::SpawnPoint::SpawnPoint( float x, float y, float z, float rot, uint32_t gimmickId ) : +Sapphire::Entity::SpawnPoint::SpawnPoint( float x, float y, float z, float rot, uint32_t gimmickId ) : m_posX( x ), m_posY( y ), m_posZ( z ), @@ -15,37 +15,37 @@ Core::Entity::SpawnPoint::SpawnPoint( float x, float y, float z, float rot, uint { } -float Core::Entity::SpawnPoint::getPosX() const +float Sapphire::Entity::SpawnPoint::getPosX() const { return m_posX; } -float Core::Entity::SpawnPoint::getPosY() const +float Sapphire::Entity::SpawnPoint::getPosY() const { return m_posY; } -float Core::Entity::SpawnPoint::getPosZ() const +float Sapphire::Entity::SpawnPoint::getPosZ() const { return m_posZ; } -float Core::Entity::SpawnPoint::getRotation() const +float Sapphire::Entity::SpawnPoint::getRotation() const { return m_rotation; } -uint32_t Core::Entity::SpawnPoint::getGimmickId() const +uint32_t Sapphire::Entity::SpawnPoint::getGimmickId() const { return m_gimmickId; } -Core::Entity::BNpcPtr Core::Entity::SpawnPoint::getLinkedBNpc() +Sapphire::Entity::BNpcPtr Sapphire::Entity::SpawnPoint::getLinkedBNpc() { return m_pLinkedBnpc; } -void Core::Entity::SpawnPoint::setLinkedBNpc( BNpcPtr pBnpc ) +void Sapphire::Entity::SpawnPoint::setLinkedBNpc( BNpcPtr pBnpc ) { m_pLinkedBnpc = pBnpc; } \ No newline at end of file diff --git a/src/servers/sapphire_zone/Actor/SpawnPoint.h b/src/servers/sapphire_zone/Actor/SpawnPoint.h index 122ad4a7..032add2d 100644 --- a/src/servers/sapphire_zone/Actor/SpawnPoint.h +++ b/src/servers/sapphire_zone/Actor/SpawnPoint.h @@ -3,7 +3,7 @@ #include "ForwardsZone.h" -namespace Core::Entity +namespace Sapphire::Entity { class SpawnPoint diff --git a/src/servers/sapphire_zone/DebugCommand/DebugCommand.h b/src/servers/sapphire_zone/DebugCommand/DebugCommand.h index 5f1394d5..5a7c9e2a 100644 --- a/src/servers/sapphire_zone/DebugCommand/DebugCommand.h +++ b/src/servers/sapphire_zone/DebugCommand/DebugCommand.h @@ -5,7 +5,7 @@ #include "ForwardsZone.h" -namespace Core +namespace Sapphire { class DebugCommandHandler; diff --git a/src/servers/sapphire_zone/DebugCommand/DebugCommandHandler.cpp b/src/servers/sapphire_zone/DebugCommand/DebugCommandHandler.cpp index 86da3c95..79d4960e 100644 --- a/src/servers/sapphire_zone/DebugCommand/DebugCommandHandler.cpp +++ b/src/servers/sapphire_zone/DebugCommand/DebugCommandHandler.cpp @@ -37,14 +37,14 @@ #include "Session.h" #include "Framework.h" -extern Core::Framework g_fw; +extern Sapphire::Framework g_fw; -using namespace Core::Network; -using namespace Core::Network::Packets; -using namespace Core::Network::Packets::Server; +using namespace Sapphire::Network; +using namespace Sapphire::Network::Packets; +using namespace Sapphire::Network::Packets::Server; // instanciate and initialize commands -Core::DebugCommandHandler::DebugCommandHandler() +Sapphire::DebugCommandHandler::DebugCommandHandler() { // Push all commands onto the register map ( command name - function - description - required GM level ) registerCommand( "set", &DebugCommandHandler::set, "Executes SET commands.", 1 ); @@ -62,21 +62,21 @@ Core::DebugCommandHandler::DebugCommandHandler() } // clear all loaded commands -Core::DebugCommandHandler::~DebugCommandHandler() +Sapphire::DebugCommandHandler::~DebugCommandHandler() { for( auto it = m_commandMap.begin(); it != m_commandMap.end(); ++it ) ( *it ).second.reset(); } // add a command set to the register map -void Core::DebugCommandHandler::registerCommand( const std::string& n, DebugCommand::pFunc functionPtr, +void Sapphire::DebugCommandHandler::registerCommand( const std::string& n, DebugCommand::pFunc functionPtr, const std::string& hText, uint8_t uLevel ) { m_commandMap[ std::string( n ) ] = std::make_shared< DebugCommand >( n, functionPtr, hText, uLevel ); } // try to retrieve the command in question, execute if found -void Core::DebugCommandHandler::execCommand( char* data, Entity::Player& player ) +void Sapphire::DebugCommandHandler::execCommand( char* data, Entity::Player& player ) { // define callback pointer @@ -123,7 +123,7 @@ void Core::DebugCommandHandler::execCommand( char* data, Entity::Player& player // Definition of the commands /////////////////////////////////////////////////////////////////////////////////////// -void Core::DebugCommandHandler::help( char* data, Entity::Player& player, std::shared_ptr< DebugCommand > command ) +void Sapphire::DebugCommandHandler::help( char* data, Entity::Player& player, std::shared_ptr< DebugCommand > command ) { player.sendDebug( "Registered debug commands:" ); for( auto cmd : m_commandMap ) @@ -135,7 +135,7 @@ void Core::DebugCommandHandler::help( char* data, Entity::Player& player, std::s } } -void Core::DebugCommandHandler::set( char* data, Entity::Player& player, std::shared_ptr< DebugCommand > command ) +void Sapphire::DebugCommandHandler::set( char* data, Entity::Player& player, std::shared_ptr< DebugCommand > command ) { auto pLog = g_fw.get< Logger >(); auto pTerriMgr = g_fw.get< TerritoryMgr >(); @@ -374,7 +374,7 @@ void Core::DebugCommandHandler::set( char* data, Entity::Player& player, std::sh } -void Core::DebugCommandHandler::add( char* data, Entity::Player& player, std::shared_ptr< DebugCommand > command ) +void Sapphire::DebugCommandHandler::add( char* data, Entity::Player& player, std::shared_ptr< DebugCommand > command ) { auto pLog = g_fw.get< Logger >(); std::string subCommand; @@ -508,7 +508,7 @@ void Core::DebugCommandHandler::add( char* data, Entity::Player& player, std::sh } -void Core::DebugCommandHandler::get( char* data, Entity::Player& player, std::shared_ptr< DebugCommand > command ) +void Sapphire::DebugCommandHandler::get( char* data, Entity::Player& player, std::shared_ptr< DebugCommand > command ) { auto pLog = g_fw.get< Logger >(); auto pExdData = g_fw.get< Data::ExdDataGenerated >(); @@ -537,7 +537,7 @@ void Core::DebugCommandHandler::get( char* data, Entity::Player& player, std::sh if( ( subCommand == "pos" ) ) { - int16_t map_id = pExdData->get< Core::Data::TerritoryType >( player.getCurrentZone()->getTerritoryTypeId() )->map; + int16_t map_id = pExdData->get< Sapphire::Data::TerritoryType >( player.getCurrentZone()->getTerritoryTypeId() )->map; player.sendNotice( "Pos:\n" + std::to_string( player.getPos().x ) + "\n" + @@ -555,7 +555,7 @@ void Core::DebugCommandHandler::get( char* data, Entity::Player& player, std::sh } void -Core::DebugCommandHandler::injectPacket( char* data, Entity::Player& player, std::shared_ptr< DebugCommand > command ) +Sapphire::DebugCommandHandler::injectPacket( char* data, Entity::Player& player, std::shared_ptr< DebugCommand > command ) { auto pServerZone = g_fw.get< ServerMgr >(); auto pSession = pServerZone->getSession( player.getId() ); @@ -563,7 +563,7 @@ Core::DebugCommandHandler::injectPacket( char* data, Entity::Player& player, std pSession->getZoneConnection()->injectPacket( data + 7, player ); } -void Core::DebugCommandHandler::injectChatPacket( char* data, Entity::Player& player, +void Sapphire::DebugCommandHandler::injectChatPacket( char* data, Entity::Player& player, std::shared_ptr< DebugCommand > command ) { auto pServerZone = g_fw.get< ServerMgr >(); @@ -572,7 +572,7 @@ void Core::DebugCommandHandler::injectChatPacket( char* data, Entity::Player& pl pSession->getChatConnection()->injectPacket( data + 8, player ); } -void Core::DebugCommandHandler::replay( char* data, Entity::Player& player, std::shared_ptr< DebugCommand > command ) +void Sapphire::DebugCommandHandler::replay( char* data, Entity::Player& player, std::shared_ptr< DebugCommand > command ) { auto pLog = g_fw.get< Logger >(); auto pServerZone = g_fw.get< ServerMgr >(); @@ -624,7 +624,7 @@ void Core::DebugCommandHandler::replay( char* data, Entity::Player& player, std: } -void Core::DebugCommandHandler::nudge( char* data, Entity::Player& player, std::shared_ptr< DebugCommand > command ) +void Sapphire::DebugCommandHandler::nudge( char* data, Entity::Player& player, std::shared_ptr< DebugCommand > command ) { std::string subCommand; @@ -671,7 +671,7 @@ void Core::DebugCommandHandler::nudge( char* data, Entity::Player& player, std:: } void -Core::DebugCommandHandler::serverInfo( char* data, Entity::Player& player, std::shared_ptr< DebugCommand > command ) +Sapphire::DebugCommandHandler::serverInfo( char* data, Entity::Player& player, std::shared_ptr< DebugCommand > command ) { auto pServerZone = g_fw.get< ServerMgr >(); player.sendDebug( "SapphireZone " + Version::VERSION + "\nRev: " + Version::GIT_HASH ); @@ -679,7 +679,7 @@ Core::DebugCommandHandler::serverInfo( char* data, Entity::Player& player, std:: player.sendDebug( "Sessions: " + std::to_string( pServerZone->getSessionCount() ) ); } -void Core::DebugCommandHandler::script( char* data, Entity::Player& player, std::shared_ptr< DebugCommand > command ) +void Sapphire::DebugCommandHandler::script( char* data, Entity::Player& player, std::shared_ptr< DebugCommand > command ) { auto pLog = g_fw.get< Logger >(); auto pScriptMgr = g_fw.get< Scripting::ScriptMgr >(); @@ -720,7 +720,7 @@ void Core::DebugCommandHandler::script( char* data, Entity::Player& player, std: player.sendDebug( "Because reasons of filling chat with nonsense, please enter a search term" ); else { - std::set< Core::Scripting::ScriptInfo* > scripts; + std::set< Sapphire::Scripting::ScriptInfo* > scripts; pScriptMgr->getNativeScriptHandler().findScripts( scripts, params ); if( !scripts.empty() ) @@ -768,7 +768,7 @@ void Core::DebugCommandHandler::script( char* data, Entity::Player& player, std: } void -Core::DebugCommandHandler::instance( char* data, Entity::Player& player, std::shared_ptr< DebugCommand > command ) +Sapphire::DebugCommandHandler::instance( char* data, Entity::Player& player, std::shared_ptr< DebugCommand > command ) { auto pTeriMgr = g_fw.get< TerritoryMgr >(); std::string cmd( data ), params, subCommand; @@ -984,7 +984,7 @@ Core::DebugCommandHandler::instance( char* data, Entity::Player& player, std::sh } } -void Core::DebugCommandHandler::housing( char* data, Entity::Player& player, std::shared_ptr< DebugCommand > command ) +void Sapphire::DebugCommandHandler::housing( char* data, Entity::Player& player, std::shared_ptr< DebugCommand > command ) { auto pTeriMgr = g_fw.get< TerritoryMgr >(); std::string cmd( data ), params, subCommand; diff --git a/src/servers/sapphire_zone/DebugCommand/DebugCommandHandler.h b/src/servers/sapphire_zone/DebugCommand/DebugCommandHandler.h index 3a9ebc80..02bf76d8 100644 --- a/src/servers/sapphire_zone/DebugCommand/DebugCommandHandler.h +++ b/src/servers/sapphire_zone/DebugCommand/DebugCommandHandler.h @@ -7,7 +7,7 @@ #include "DebugCommand.h" #include "ForwardsZone.h" -namespace Core +namespace Sapphire { // handler for in game commands diff --git a/src/servers/sapphire_zone/Event/Director.cpp b/src/servers/sapphire_zone/Event/Director.cpp index b84fc478..90b083fb 100644 --- a/src/servers/sapphire_zone/Event/Director.cpp +++ b/src/servers/sapphire_zone/Event/Director.cpp @@ -10,12 +10,12 @@ #include "Network/PacketWrappers/ActorControlPacket143.h" -using namespace Core::Common; -using namespace Core::Network::Packets; -using namespace Core::Network::Packets::Server; -using namespace Core::Network::ActorControl; +using namespace Sapphire::Common; +using namespace Sapphire::Network::Packets; +using namespace Sapphire::Network::Packets::Server; +using namespace Sapphire::Network::ActorControl; -Core::Event::Director::Director( Core::Event::Director::DirectorType type, uint16_t contentId ) : +Sapphire::Event::Director::Director( Sapphire::Event::Director::DirectorType type, uint16_t contentId ) : m_contentId( contentId ), m_type( type ), m_directorId( ( static_cast< uint32_t >( type ) << 16 ) | contentId ), @@ -26,27 +26,27 @@ Core::Event::Director::Director( Core::Event::Director::DirectorType type, uint1 memset( m_unionData.arrData, 0, sizeof( m_unionData ) ); } -uint32_t Core::Event::Director::getDirectorId() const +uint32_t Sapphire::Event::Director::getDirectorId() const { return m_directorId; } -uint16_t Core::Event::Director::getContentId() const +uint16_t Sapphire::Event::Director::getContentId() const { return m_contentId; } -uint8_t Core::Event::Director::getSequence() const +uint8_t Sapphire::Event::Director::getSequence() const { return m_sequence; } -void Core::Event::Director::sendDirectorClear( Core::Entity::Player& player ) const +void Sapphire::Event::Director::sendDirectorClear( Sapphire::Entity::Player& player ) const { player.queuePacket( makeActorControl143( player.getId(), DirectorClear, m_directorId ) ); } -void Core::Event::Director::sendDirectorVars( Core::Entity::Player& player ) const +void Sapphire::Event::Director::sendDirectorVars( Sapphire::Entity::Player& player ) const { auto varPacket = makeZonePacket< FFXIVIpcDirectorVars >( player.getId() ); varPacket->data().m_directorId = getDirectorId(); @@ -56,127 +56,127 @@ void Core::Event::Director::sendDirectorVars( Core::Entity::Player& player ) con player.queuePacket( varPacket ); } -void Core::Event::Director::sendDirectorInit( Core::Entity::Player& player ) const +void Sapphire::Event::Director::sendDirectorInit( Sapphire::Entity::Player& player ) const { player.queuePacket( makeActorControl143( player.getId(), DirectorInit, m_directorId, m_contentId ) ); } -Core::Event::Director::DirectorType Core::Event::Director::getType() const +Sapphire::Event::Director::DirectorType Sapphire::Event::Director::getType() const { return m_type; } -uint8_t Core::Event::Director::getBranch() const +uint8_t Sapphire::Event::Director::getBranch() const { return m_branch; } -void Core::Event::Director::setDirectorUI8AL( uint8_t value ) +void Sapphire::Event::Director::setDirectorUI8AL( uint8_t value ) { m_unionData.ui8lh.UI8AL = value; } -void Core::Event::Director::setDirectorUI8AH( uint8_t value ) +void Sapphire::Event::Director::setDirectorUI8AH( uint8_t value ) { m_unionData.ui8lh.UI8AH = value; } -void Core::Event::Director::setDirectorUI8BL( uint8_t value ) +void Sapphire::Event::Director::setDirectorUI8BL( uint8_t value ) { m_unionData.ui8lh.UI8BL = value; } -void Core::Event::Director::setDirectorUI8BH( uint8_t value ) +void Sapphire::Event::Director::setDirectorUI8BH( uint8_t value ) { m_unionData.ui8lh.UI8BH = value; } -void Core::Event::Director::setDirectorUI8CL( uint8_t value ) +void Sapphire::Event::Director::setDirectorUI8CL( uint8_t value ) { m_unionData.ui8lh.UI8CL = value; } -void Core::Event::Director::setDirectorUI8CH( uint8_t value ) +void Sapphire::Event::Director::setDirectorUI8CH( uint8_t value ) { m_unionData.ui8lh.UI8CH = value; } -void Core::Event::Director::setDirectorUI8DL( uint8_t value ) +void Sapphire::Event::Director::setDirectorUI8DL( uint8_t value ) { m_unionData.ui8lh.UI8DL = value; } -void Core::Event::Director::setDirectorUI8DH( uint8_t value ) +void Sapphire::Event::Director::setDirectorUI8DH( uint8_t value ) { m_unionData.ui8lh.UI8DH = value; } -void Core::Event::Director::setDirectorUI8EL( uint8_t value ) +void Sapphire::Event::Director::setDirectorUI8EL( uint8_t value ) { m_unionData.ui8lh.UI8EL = value; } -void Core::Event::Director::setDirectorUI8EH( uint8_t value ) +void Sapphire::Event::Director::setDirectorUI8EH( uint8_t value ) { m_unionData.ui8lh.UI8EH = value; } -void Core::Event::Director::setDirectorUI8FL( uint8_t value ) +void Sapphire::Event::Director::setDirectorUI8FL( uint8_t value ) { m_unionData.ui8lh.UI8FL = value; } -void Core::Event::Director::setDirectorUI8FH( uint8_t value ) +void Sapphire::Event::Director::setDirectorUI8FH( uint8_t value ) { m_unionData.ui8lh.UI8FH = value; } -void Core::Event::Director::setDirectorUI8GL( uint8_t value ) +void Sapphire::Event::Director::setDirectorUI8GL( uint8_t value ) { m_unionData.ui8lh.UI8GL = value; } -void Core::Event::Director::setDirectorUI8GH( uint8_t value ) +void Sapphire::Event::Director::setDirectorUI8GH( uint8_t value ) { m_unionData.ui8lh.UI8GH = value; } -void Core::Event::Director::setDirectorUI8HL( uint8_t value ) +void Sapphire::Event::Director::setDirectorUI8HL( uint8_t value ) { m_unionData.ui8lh.UI8HL = value; } -void Core::Event::Director::setDirectorUI8HH( uint8_t value ) +void Sapphire::Event::Director::setDirectorUI8HH( uint8_t value ) { m_unionData.ui8lh.UI8HH = value; } -void Core::Event::Director::setDirectorUI8IL( uint8_t value ) +void Sapphire::Event::Director::setDirectorUI8IL( uint8_t value ) { m_unionData.ui8lh.UI8IL = value; } -void Core::Event::Director::setDirectorUI8IH( uint8_t value ) +void Sapphire::Event::Director::setDirectorUI8IH( uint8_t value ) { m_unionData.ui8lh.UI8IH = value; } -void Core::Event::Director::setDirectorUI8JL( uint8_t value ) +void Sapphire::Event::Director::setDirectorUI8JL( uint8_t value ) { m_unionData.ui8lh.UI8JL = value; } -void Core::Event::Director::setDirectorUI8JH( uint8_t value ) +void Sapphire::Event::Director::setDirectorUI8JH( uint8_t value ) { m_unionData.ui8lh.UI8JH = value; } -void Core::Event::Director::setDirectorBranch( uint8_t value ) +void Sapphire::Event::Director::setDirectorBranch( uint8_t value ) { m_branch = value; } -void Core::Event::Director::setDirectorSequence( uint8_t value ) +void Sapphire::Event::Director::setDirectorSequence( uint8_t value ) { m_sequence = value; } diff --git a/src/servers/sapphire_zone/Event/Director.h b/src/servers/sapphire_zone/Event/Director.h index a5ac3914..bf985be5 100644 --- a/src/servers/sapphire_zone/Event/Director.h +++ b/src/servers/sapphire_zone/Event/Director.h @@ -5,7 +5,7 @@ #include "ForwardsZone.h" -namespace Core::Event +namespace Sapphire::Event { /*! diff --git a/src/servers/sapphire_zone/Event/EventDefs.h b/src/servers/sapphire_zone/Event/EventDefs.h index 26247b34..e7158fdd 100644 --- a/src/servers/sapphire_zone/Event/EventDefs.h +++ b/src/servers/sapphire_zone/Event/EventDefs.h @@ -1,7 +1,7 @@ #ifndef SAPPHIRE_EVENTDEFS_H #define SAPPHIRE_EVENTDEFS_H -namespace Core +namespace Sapphire { enum EventFlags { diff --git a/src/servers/sapphire_zone/Event/EventHandler.cpp b/src/servers/sapphire_zone/Event/EventHandler.cpp index cd62b2b8..c9b40c72 100644 --- a/src/servers/sapphire_zone/Event/EventHandler.cpp +++ b/src/servers/sapphire_zone/Event/EventHandler.cpp @@ -1,6 +1,6 @@ #include "EventHandler.h" -Core::Event::EventHandler::EventHandler( Entity::Player* pOwner, uint64_t actorId, uint32_t eventId, +Sapphire::Event::EventHandler::EventHandler( Entity::Player* pOwner, uint64_t actorId, uint32_t eventId, EventType eventType, uint32_t eventParam ) : m_pOwner( pOwner ), m_actorId( actorId ), @@ -14,82 +14,82 @@ Core::Event::EventHandler::EventHandler( Entity::Player* pOwner, uint64_t actorI m_returnCallback = nullptr; } -uint64_t Core::Event::EventHandler::getActorId() const +uint64_t Sapphire::Event::EventHandler::getActorId() const { return m_actorId; } -uint32_t Core::Event::EventHandler::getId() const +uint32_t Sapphire::Event::EventHandler::getId() const { return m_eventId; } -uint8_t Core::Event::EventHandler::getEventType() const +uint8_t Sapphire::Event::EventHandler::getEventType() const { return m_eventType; } -uint16_t Core::Event::EventHandler::getType() const +uint16_t Sapphire::Event::EventHandler::getType() const { return m_type; } -uint16_t Core::Event::EventHandler::getEntryId() const +uint16_t Sapphire::Event::EventHandler::getEntryId() const { return m_entryId; } -uint32_t Core::Event::EventHandler::getEventParam() const +uint32_t Sapphire::Event::EventHandler::getEventParam() const { return m_eventParam; } -Core::Event::EventHandler::SceneReturnCallback Core::Event::EventHandler::getEventReturnCallback() const +Sapphire::Event::EventHandler::SceneReturnCallback Sapphire::Event::EventHandler::getEventReturnCallback() const { return m_returnCallback; } -void Core::Event::EventHandler::setEventReturnCallback( SceneReturnCallback callback ) +void Sapphire::Event::EventHandler::setEventReturnCallback( SceneReturnCallback callback ) { m_returnCallback = callback; } -Core::Event::EventHandler::SceneChainCallback Core::Event::EventHandler::getSceneChainCallback() const +Sapphire::Event::EventHandler::SceneChainCallback Sapphire::Event::EventHandler::getSceneChainCallback() const { return m_chainCallback; } -void Core::Event::EventHandler::setSceneChainCallback( Core::Event::EventHandler::SceneChainCallback callback ) +void Sapphire::Event::EventHandler::setSceneChainCallback( Sapphire::Event::EventHandler::SceneChainCallback callback ) { m_chainCallback = callback; } -Core::Event::EventHandler::EventFinishCallback Core::Event::EventHandler::getEventFinishCallback() const +Sapphire::Event::EventHandler::EventFinishCallback Sapphire::Event::EventHandler::getEventFinishCallback() const { return m_finishCallback; } -void Core::Event::EventHandler::setEventFinishCallback( EventFinishCallback callback ) +void Sapphire::Event::EventHandler::setEventFinishCallback( EventFinishCallback callback ) { m_finishCallback = callback; } -bool Core::Event::EventHandler::hasPlayedScene() const +bool Sapphire::Event::EventHandler::hasPlayedScene() const { return m_playedScene; } -void Core::Event::EventHandler::setPlayedScene( bool playedScene ) +void Sapphire::Event::EventHandler::setPlayedScene( bool playedScene ) { m_playedScene = playedScene; } -bool Core::Event::EventHandler::hasNestedEvent() const +bool Sapphire::Event::EventHandler::hasNestedEvent() const { return m_pNestedEvent != nullptr; } -void Core::Event::EventHandler::removeNestedEvent() +void Sapphire::Event::EventHandler::removeNestedEvent() { m_pNestedEvent.reset(); } diff --git a/src/servers/sapphire_zone/Event/EventHandler.h b/src/servers/sapphire_zone/Event/EventHandler.h index 77735623..4ace5d59 100644 --- a/src/servers/sapphire_zone/Event/EventHandler.h +++ b/src/servers/sapphire_zone/Event/EventHandler.h @@ -3,7 +3,7 @@ #include "ForwardsZone.h" -namespace Core::Event +namespace Sapphire::Event { struct SceneResult diff --git a/src/servers/sapphire_zone/Event/EventHelper.cpp b/src/servers/sapphire_zone/Event/EventHelper.cpp index 37f7bcfe..66f6dc09 100644 --- a/src/servers/sapphire_zone/Event/EventHelper.cpp +++ b/src/servers/sapphire_zone/Event/EventHelper.cpp @@ -7,12 +7,12 @@ #include "EventHandler.h" -extern Core::Framework g_fw; +extern Sapphire::Framework g_fw; -using namespace Core::Common; +using namespace Sapphire::Common; -std::string Core::Event::getEventName( uint32_t eventId ) +std::string Sapphire::Event::getEventName( uint32_t eventId ) { auto pExdData = g_fw.get< Data::ExdDataGenerated >(); uint16_t eventType = eventId >> 16; @@ -23,7 +23,7 @@ std::string Core::Event::getEventName( uint32_t eventId ) { case Event::EventHandler::EventHandlerType::Quest: { - auto questInfo = pExdData->get< Core::Data::Quest >( eventId ); + auto questInfo = pExdData->get< Sapphire::Data::Quest >( eventId ); if( !questInfo ) return unknown + "Quest"; @@ -34,7 +34,7 @@ std::string Core::Event::getEventName( uint32_t eventId ) } case Event::EventHandler::EventHandlerType::CustomTalk: { - auto customTalkInfo = pExdData->get< Core::Data::CustomTalk >( eventId ); + auto customTalkInfo = pExdData->get< Sapphire::Data::CustomTalk >( eventId ); if( !customTalkInfo ) return unknown + "CustomTalk"; @@ -45,21 +45,21 @@ std::string Core::Event::getEventName( uint32_t eventId ) } case Event::EventHandler::EventHandlerType::Opening: { - auto openingInfo = pExdData->get< Core::Data::Opening >( eventId ); + auto openingInfo = pExdData->get< Sapphire::Data::Opening >( eventId ); if( openingInfo ) return openingInfo->name; return unknown + "Opening"; } case Event::EventHandler::EventHandlerType::Aetheryte: { - auto aetherInfo = pExdData->get< Core::Data::Aetheryte >( eventId & 0xFFFF ); + auto aetherInfo = pExdData->get< Sapphire::Data::Aetheryte >( eventId & 0xFFFF ); if( aetherInfo->isAetheryte ) return "Aetheryte"; return "Aethernet"; } case Event::EventHandler::EventHandlerType::ICDirector: { - auto contentInfo = pExdData->get< Core::Data::InstanceContent >( eventId & 0xFFFF ); + 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 ); @@ -69,7 +69,7 @@ std::string Core::Event::getEventName( uint32_t eventId ) case Event::EventHandler::EventHandlerType::Warp: { - auto warpInfo = pExdData->get< Core::Data::Warp >( eventId ); + auto warpInfo = pExdData->get< Sapphire::Data::Warp >( eventId ); if( warpInfo ) return "WarpTaxi"; return unknown + "ChocoboWarp"; //who know @@ -77,7 +77,7 @@ std::string Core::Event::getEventName( uint32_t eventId ) case Event::EventHandler::EventHandlerType::Shop: { - auto shopInfo = pExdData->get< Core::Data::GilShop >( eventId ); + auto shopInfo = pExdData->get< Sapphire::Data::GilShop >( eventId ); return "GilShop" + std::to_string( eventId ); /*if( shopInfo ) @@ -95,10 +95,10 @@ std::string Core::Event::getEventName( uint32_t eventId ) } } -uint32_t Core::Event::mapEventActorToRealActor( uint32_t eventActorId ) +uint32_t Sapphire::Event::mapEventActorToRealActor( uint32_t eventActorId ) { auto pExdData = g_fw.get< Data::ExdDataGenerated >(); - auto levelInfo = pExdData->get< Core::Data::Level >( eventActorId ); + auto levelInfo = pExdData->get< Sapphire::Data::Level >( eventActorId ); if( levelInfo ) return levelInfo->object; diff --git a/src/servers/sapphire_zone/Event/EventHelper.h b/src/servers/sapphire_zone/Event/EventHelper.h index 8beaac35..71a56a77 100644 --- a/src/servers/sapphire_zone/Event/EventHelper.h +++ b/src/servers/sapphire_zone/Event/EventHelper.h @@ -4,7 +4,7 @@ #include #include -namespace Core::Event +namespace Sapphire::Event { std::string getEventName( uint32_t eventId ); diff --git a/src/servers/sapphire_zone/ForwardsZone.h b/src/servers/sapphire_zone/ForwardsZone.h index 61abb4e7..b3783830 100644 --- a/src/servers/sapphire_zone/ForwardsZone.h +++ b/src/servers/sapphire_zone/ForwardsZone.h @@ -16,7 +16,7 @@ x ## Ptr make_ ## x( Args &&...args ) { \ return std::make_shared< x >( std::forward< Args >( args ) ... ); }\ typedef std::vector< x > x ## PtrList; -namespace Core { +namespace Sapphire { TYPE_FORWARD( Cell ); TYPE_FORWARD( Zone ); TYPE_FORWARD( HousingZone ); diff --git a/src/servers/sapphire_zone/Inventory/Item.cpp b/src/servers/sapphire_zone/Inventory/Item.cpp index 6537aae1..5421f355 100644 --- a/src/servers/sapphire_zone/Inventory/Item.cpp +++ b/src/servers/sapphire_zone/Inventory/Item.cpp @@ -5,9 +5,9 @@ #include "Framework.h" #include "Item.h" -extern Core::Framework g_fw; +extern Sapphire::Framework g_fw; -Core::Item::Item( uint64_t uId, uint32_t catalogId, uint64_t model1, uint64_t model2, bool isHq ) : +Sapphire::Item::Item( uint64_t uId, uint32_t catalogId, uint64_t model1, uint64_t model2, bool isHq ) : m_id( catalogId ), m_uId( uId ), m_model1( model1 ), @@ -17,7 +17,7 @@ Core::Item::Item( uint64_t uId, uint32_t catalogId, uint64_t model1, uint64_t mo m_durability( 30000 ) { auto pExdData = g_fw.get< Data::ExdDataGenerated >(); - auto itemInfo = pExdData->get< Core::Data::Item >( catalogId ); + auto itemInfo = pExdData->get< Sapphire::Data::Item >( catalogId ); m_delayMs = itemInfo->delayms; m_physicalDmg = itemInfo->damagePhys; @@ -29,128 +29,128 @@ Core::Item::Item( uint64_t uId, uint32_t catalogId, uint64_t model1, uint64_t mo m_maxStackSize = itemInfo->stackSize; } -float Core::Item::getAutoAttackDmg() const +float Sapphire::Item::getAutoAttackDmg() const { return m_autoAttackDmg; } -uint16_t Core::Item::getDelay() const +uint16_t Sapphire::Item::getDelay() const { return m_delayMs; } -uint16_t Core::Item::getPhysicalDmg() const +uint16_t Sapphire::Item::getPhysicalDmg() const { return m_physicalDmg; } -uint16_t Core::Item::getMagicalDmg() const +uint16_t Sapphire::Item::getMagicalDmg() const { return m_magicalDmg; } -uint16_t Core::Item::getItemLevel() const +uint16_t Sapphire::Item::getItemLevel() const { return m_itemLevel; } -uint16_t Core::Item::getWeaponDmg() const +uint16_t Sapphire::Item::getWeaponDmg() const { return m_weaponDmg; } -bool Core::Item::isWeapon() const +bool Sapphire::Item::isWeapon() const { return ( m_weaponDmg != 0 ); } -uint32_t Core::Item::getId() const +uint32_t Sapphire::Item::getId() const { return m_id; } -void Core::Item::setId( uint32_t id ) +void Sapphire::Item::setId( uint32_t id ) { m_id = id; } -uint64_t Core::Item::getUId() const +uint64_t Sapphire::Item::getUId() const { return m_uId; } -void Core::Item::setUId( uint64_t id ) +void Sapphire::Item::setUId( uint64_t id ) { m_uId = id; } -void Core::Item::setStackSize( uint32_t size ) +void Sapphire::Item::setStackSize( uint32_t size ) { m_stackSize = std::min< uint32_t >( size, m_maxStackSize ); } -uint32_t Core::Item::getStackSize() const +uint32_t Sapphire::Item::getStackSize() const { return m_stackSize; } -void Core::Item::setCategory( Common::ItemUICategory categoryId ) +void Sapphire::Item::setCategory( Common::ItemUICategory categoryId ) { m_category = categoryId; } -Core::Common::ItemUICategory Core::Item::getCategory() const +Sapphire::Common::ItemUICategory Sapphire::Item::getCategory() const { return m_category; } -void Core::Item::setModelIds( uint64_t model1, uint64_t model2 ) +void Sapphire::Item::setModelIds( uint64_t model1, uint64_t model2 ) { m_model1 = model1; m_model2 = model2; } -uint64_t Core::Item::getModelId1() const +uint64_t Sapphire::Item::getModelId1() const { return m_model1; } -uint64_t Core::Item::getModelId2() const +uint64_t Sapphire::Item::getModelId2() const { return m_model2; } -bool Core::Item::isHq() const +bool Sapphire::Item::isHq() const { return m_isHq; } -void Core::Item::setHq( bool isHq ) +void Sapphire::Item::setHq( bool isHq ) { m_isHq = isHq; } -uint32_t Core::Item::getMaxStackSize() const +uint32_t Sapphire::Item::getMaxStackSize() const { return m_maxStackSize; } -uint16_t Core::Item::getDurability() const +uint16_t Sapphire::Item::getDurability() const { return m_durability; } -void Core::Item::setDurability( uint16_t durability ) +void Sapphire::Item::setDurability( uint16_t durability ) { m_durability = durability; } -uint16_t Core::Item::getStain() const +uint16_t Sapphire::Item::getStain() const { return m_stain; } -void Core::Item::setStain( uint16_t stain ) +void Sapphire::Item::setStain( uint16_t stain ) { m_stain = stain; } diff --git a/src/servers/sapphire_zone/Inventory/Item.h b/src/servers/sapphire_zone/Inventory/Item.h index 9927d126..e5babd3d 100644 --- a/src/servers/sapphire_zone/Inventory/Item.h +++ b/src/servers/sapphire_zone/Inventory/Item.h @@ -3,7 +3,7 @@ #include -namespace Core +namespace Sapphire { class Item diff --git a/src/servers/sapphire_zone/Inventory/ItemContainer.cpp b/src/servers/sapphire_zone/Inventory/ItemContainer.cpp index b38e73e1..775b122e 100644 --- a/src/servers/sapphire_zone/Inventory/ItemContainer.cpp +++ b/src/servers/sapphire_zone/Inventory/ItemContainer.cpp @@ -9,9 +9,9 @@ #include "Forwards.h" #include "ItemContainer.h" -extern Core::Framework g_fw; +extern Sapphire::Framework g_fw; -Core::ItemContainer::ItemContainer( uint16_t storageId, uint8_t maxSize, const std::string& tableName, +Sapphire::ItemContainer::ItemContainer( uint16_t storageId, uint8_t maxSize, const std::string& tableName, bool isMultiStorage, bool isPersistentStorage ) : m_id( storageId ), m_size( maxSize ), @@ -22,22 +22,22 @@ Core::ItemContainer::ItemContainer( uint16_t storageId, uint8_t maxSize, const s } -Core::ItemContainer::~ItemContainer() +Sapphire::ItemContainer::~ItemContainer() { } -uint16_t Core::ItemContainer::getId() const +uint16_t Sapphire::ItemContainer::getId() const { return m_id; } -uint8_t Core::ItemContainer::getEntryCount() const +uint8_t Sapphire::ItemContainer::getEntryCount() const { return static_cast< uint8_t >( m_itemMap.size() ); } -void Core::ItemContainer::removeItem( uint8_t slotId ) +void Sapphire::ItemContainer::removeItem( uint8_t slotId ) { auto pLog = g_fw.get< Logger >(); auto pDb = g_fw.get< Db::DbWorkerPool< Db::ZoneDbConnection > >(); @@ -58,17 +58,17 @@ void Core::ItemContainer::removeItem( uint8_t slotId ) } } -Core::ItemMap& Core::ItemContainer::getItemMap() +Sapphire::ItemMap& Sapphire::ItemContainer::getItemMap() { return m_itemMap; } -const Core::ItemMap& Core::ItemContainer::getItemMap() const +const Sapphire::ItemMap& Sapphire::ItemContainer::getItemMap() const { return m_itemMap; } -int8_t Core::ItemContainer::getFreeSlot() +int8_t Sapphire::ItemContainer::getFreeSlot() { for( uint8_t slotId = 0; slotId < m_size; slotId++ ) { @@ -80,7 +80,7 @@ int8_t Core::ItemContainer::getFreeSlot() return -1; } -Core::ItemPtr Core::ItemContainer::getItem( uint8_t slotId ) +Sapphire::ItemPtr Sapphire::ItemContainer::getItem( uint8_t slotId ) { if( ( slotId > m_size ) ) @@ -93,7 +93,7 @@ Core::ItemPtr Core::ItemContainer::getItem( uint8_t slotId ) return m_itemMap[ slotId ]; } -void Core::ItemContainer::setItem( uint8_t slotId, ItemPtr pItem ) +void Sapphire::ItemContainer::setItem( uint8_t slotId, ItemPtr pItem ) { if( slotId > m_size ) return; @@ -101,22 +101,22 @@ void Core::ItemContainer::setItem( uint8_t slotId, ItemPtr pItem ) m_itemMap[ slotId ] = pItem; } -uint8_t Core::ItemContainer::getMaxSize() const +uint8_t Sapphire::ItemContainer::getMaxSize() const { return m_size; } -std::string Core::ItemContainer::getTableName() const +std::string Sapphire::ItemContainer::getTableName() const { return m_tableName; } -bool Core::ItemContainer::isMultiStorage() const +bool Sapphire::ItemContainer::isMultiStorage() const { return m_bMultiStorage; } -bool Core::ItemContainer::isPersistentStorage() const +bool Sapphire::ItemContainer::isPersistentStorage() const { return m_isPersistentStorage; } diff --git a/src/servers/sapphire_zone/Inventory/ItemContainer.h b/src/servers/sapphire_zone/Inventory/ItemContainer.h index d463087e..39d21510 100644 --- a/src/servers/sapphire_zone/Inventory/ItemContainer.h +++ b/src/servers/sapphire_zone/Inventory/ItemContainer.h @@ -5,7 +5,7 @@ #include #include "ForwardsZone.h" -namespace Core +namespace Sapphire { using ItemMap = std::map< uint8_t, ItemPtr >; diff --git a/src/servers/sapphire_zone/Inventory/ItemUtil.cpp b/src/servers/sapphire_zone/Inventory/ItemUtil.cpp index 5894e6eb..bb036828 100644 --- a/src/servers/sapphire_zone/Inventory/ItemUtil.cpp +++ b/src/servers/sapphire_zone/Inventory/ItemUtil.cpp @@ -10,9 +10,9 @@ #include -extern Core::Framework g_fw; +extern Sapphire::Framework g_fw; -bool Core::Items::Util::isArmory( uint16_t containerId ) +bool Sapphire::Items::Util::isArmory( uint16_t containerId ) { return containerId == Common::ArmoryBody || @@ -29,7 +29,7 @@ bool Core::Items::Util::isArmory( uint16_t containerId ) containerId == Common::ArmorySoulCrystal; } -uint16_t Core::Items::Util::getCharaEquipSlotCategoryToArmoryId( uint8_t slotId ) +uint16_t Sapphire::Items::Util::getCharaEquipSlotCategoryToArmoryId( uint8_t slotId ) { switch( slotId ) @@ -87,13 +87,13 @@ uint16_t Core::Items::Util::getCharaEquipSlotCategoryToArmoryId( uint8_t slotId } -bool Core::Items::Util::isEquipment( uint16_t containerId ) +bool Sapphire::Items::Util::isEquipment( uint16_t containerId ) { return containerId == Common::GearSet0; } -bool Core::Items::Util::isOneHandedWeapon( Common::ItemUICategory weaponCategory ) +bool Sapphire::Items::Util::isOneHandedWeapon( Common::ItemUICategory weaponCategory ) { switch( weaponCategory ) { @@ -117,7 +117,7 @@ bool Core::Items::Util::isOneHandedWeapon( Common::ItemUICategory weaponCategory } } -Core::ItemPtr Core::Items::Util::loadItem( uint64_t uId ) +Sapphire::ItemPtr Sapphire::Items::Util::loadItem( uint64_t uId ) { auto pExdData = g_fw.get< Data::ExdDataGenerated >(); auto pDb = g_fw.get< Db::DbWorkerPool< Db::ZoneDbConnection > >(); @@ -129,7 +129,7 @@ Core::ItemPtr Core::Items::Util::loadItem( uint64_t uId ) try { - auto itemInfo = pExdData->get< Core::Data::Item >( itemRes->getUInt( 1 ) ); + auto itemInfo = pExdData->get< Sapphire::Data::Item >( itemRes->getUInt( 1 ) ); bool isHq = itemRes->getUInt( 3 ) == 1; ItemPtr pItem = make_Item( uId, @@ -148,7 +148,7 @@ Core::ItemPtr Core::Items::Util::loadItem( uint64_t uId ) } } -Core::Common::ContainerType Core::Items::Util::getContainerType( uint32_t containerId ) +Sapphire::Common::ContainerType Sapphire::Items::Util::getContainerType( uint32_t containerId ) { if( containerId < 5 ) { @@ -173,7 +173,7 @@ Core::Common::ContainerType Core::Items::Util::getContainerType( uint32_t contai } -uint32_t Core::Items::Util::getNextUId() +uint32_t Sapphire::Items::Util::getNextUId() { uint32_t charId = 0; auto pDb = g_fw.get< Db::DbWorkerPool< Db::ZoneDbConnection > >(); diff --git a/src/servers/sapphire_zone/Inventory/ItemUtil.h b/src/servers/sapphire_zone/Inventory/ItemUtil.h index b8d46c38..6645425c 100644 --- a/src/servers/sapphire_zone/Inventory/ItemUtil.h +++ b/src/servers/sapphire_zone/Inventory/ItemUtil.h @@ -4,7 +4,7 @@ #include #include "ForwardsZone.h" -namespace Core::Items::Util +namespace Sapphire::Items::Util { ItemPtr loadItem( uint64_t uId ); diff --git a/src/servers/sapphire_zone/Linkshell/Linkshell.cpp b/src/servers/sapphire_zone/Linkshell/Linkshell.cpp index 257794e2..0d6bcb3e 100644 --- a/src/servers/sapphire_zone/Linkshell/Linkshell.cpp +++ b/src/servers/sapphire_zone/Linkshell/Linkshell.cpp @@ -1,7 +1,7 @@ #include "Linkshell.h" -Core::Linkshell::Linkshell( uint64_t id, +Sapphire::Linkshell::Linkshell( uint64_t id, const std::string& name, uint64_t masterId, const std::set< uint64_t >& members, @@ -17,77 +17,77 @@ Core::Linkshell::Linkshell( uint64_t id, } -uint64_t Core::Linkshell::getId() const +uint64_t Sapphire::Linkshell::getId() const { return m_linkshellId; } -uint64_t Core::Linkshell::getMasterId() const +uint64_t Sapphire::Linkshell::getMasterId() const { return m_masterCharacterId; } -const std::set< uint64_t >& Core::Linkshell::getMemberIdList() const +const std::set< uint64_t >& Sapphire::Linkshell::getMemberIdList() const { return m_memberIds; } -std::set< uint64_t >& Core::Linkshell::getMemberIdList() +std::set< uint64_t >& Sapphire::Linkshell::getMemberIdList() { return m_memberIds; } -const std::string& Core::Linkshell::getName() const +const std::string& Sapphire::Linkshell::getName() const { return m_name; } -const std::set< uint64_t >& Core::Linkshell::getLeaderIdList() const +const std::set< uint64_t >& Sapphire::Linkshell::getLeaderIdList() const { return m_leaderIds; } -std::set< uint64_t >& Core::Linkshell::getLeaderIdList() +std::set< uint64_t >& Sapphire::Linkshell::getLeaderIdList() { return m_leaderIds; } -const std::set< uint64_t >& Core::Linkshell::getInviteIdList() const +const std::set< uint64_t >& Sapphire::Linkshell::getInviteIdList() const { return m_inviteIds; } -std::set< uint64_t >& Core::Linkshell::getInviteIdList() +std::set< uint64_t >& Sapphire::Linkshell::getInviteIdList() { return m_inviteIds; } -void Core::Linkshell::addMember( uint64_t memberId ) +void Sapphire::Linkshell::addMember( uint64_t memberId ) { m_memberIds.insert( memberId ); } -void Core::Linkshell::removeMember( uint64_t memberId ) +void Sapphire::Linkshell::removeMember( uint64_t memberId ) { m_memberIds.erase( memberId ); } -void Core::Linkshell::addLeader( uint64_t memberId ) +void Sapphire::Linkshell::addLeader( uint64_t memberId ) { m_leaderIds.insert( memberId ); } -void Core::Linkshell::removeLeader( uint64_t memberId ) +void Sapphire::Linkshell::removeLeader( uint64_t memberId ) { m_leaderIds.erase( memberId ); } -void Core::Linkshell::addInvite( uint64_t memberId ) +void Sapphire::Linkshell::addInvite( uint64_t memberId ) { m_inviteIds.insert( memberId ); } -void Core::Linkshell::removeInvite( uint64_t memberId ) +void Sapphire::Linkshell::removeInvite( uint64_t memberId ) { m_inviteIds.erase( memberId ); } diff --git a/src/servers/sapphire_zone/Linkshell/Linkshell.h b/src/servers/sapphire_zone/Linkshell/Linkshell.h index af153dad..31d32717 100644 --- a/src/servers/sapphire_zone/Linkshell/Linkshell.h +++ b/src/servers/sapphire_zone/Linkshell/Linkshell.h @@ -4,7 +4,7 @@ #include #include -namespace Core +namespace Sapphire { class Linkshell diff --git a/src/servers/sapphire_zone/Linkshell/LinkshellMgr.cpp b/src/servers/sapphire_zone/Linkshell/LinkshellMgr.cpp index 535acc6f..a0909468 100644 --- a/src/servers/sapphire_zone/Linkshell/LinkshellMgr.cpp +++ b/src/servers/sapphire_zone/Linkshell/LinkshellMgr.cpp @@ -5,14 +5,14 @@ #include "Framework.h" #include "LinkshellMgr.h" -extern Core::Framework g_fw; +extern Sapphire::Framework g_fw; -Core::LinkshellMgr::LinkshellMgr() +Sapphire::LinkshellMgr::LinkshellMgr() { } -bool Core::LinkshellMgr::loadLinkshells() +bool Sapphire::LinkshellMgr::loadLinkshells() { auto pDb = g_fw.get< Db::DbWorkerPool< Db::ZoneDbConnection > >(); auto res = pDb->query( "SELECT LinkshellId, MasterCharacterId, CharacterIdList, " @@ -61,7 +61,7 @@ bool Core::LinkshellMgr::loadLinkshells() } -Core::LinkshellPtr Core::LinkshellMgr::getLinkshellByName( const std::string& name ) +Sapphire::LinkshellPtr Sapphire::LinkshellMgr::getLinkshellByName( const std::string& name ) { auto it = m_linkshellNameMap.find( name ); if( it == m_linkshellNameMap.end() ) @@ -70,7 +70,7 @@ Core::LinkshellPtr Core::LinkshellMgr::getLinkshellByName( const std::string& na return it->second; } -Core::LinkshellPtr Core::LinkshellMgr::getLinkshellById( uint64_t lsId ) +Sapphire::LinkshellPtr Sapphire::LinkshellMgr::getLinkshellById( uint64_t lsId ) { auto it = m_linkshellIdMap.find( lsId ); if( it == m_linkshellIdMap.end() ) diff --git a/src/servers/sapphire_zone/Linkshell/LinkshellMgr.h b/src/servers/sapphire_zone/Linkshell/LinkshellMgr.h index dedd3c70..5597dc74 100644 --- a/src/servers/sapphire_zone/Linkshell/LinkshellMgr.h +++ b/src/servers/sapphire_zone/Linkshell/LinkshellMgr.h @@ -4,7 +4,7 @@ #include #include -namespace Core +namespace Sapphire { class Linkshell; diff --git a/src/servers/sapphire_zone/Manager/PlayerMgr.cpp b/src/servers/sapphire_zone/Manager/PlayerMgr.cpp index 95ae01a3..bcb0a2ce 100644 --- a/src/servers/sapphire_zone/Manager/PlayerMgr.cpp +++ b/src/servers/sapphire_zone/Manager/PlayerMgr.cpp @@ -10,16 +10,16 @@ #include -extern Core::Framework g_fw; +extern Sapphire::Framework g_fw; -void Sapphire::World::Manager::PlayerMgr::movePlayerToLandDestination( Core::Entity::Player& player, uint32_t landId, uint16_t param ) +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 = g_fw.get< Core::TerritoryMgr >(); + auto terriMgr = g_fw.get< Sapphire::TerritoryMgr >(); if( !terriMgr ) return; - Core::ZonePtr destinationZone; + Sapphire::ZonePtr destinationZone; auto terriPos = terriMgr->getTerritoryPosition( landId ); if( terriPos ) @@ -27,7 +27,7 @@ void Sapphire::World::Manager::PlayerMgr::movePlayerToLandDestination( Core::Ent // check if its a housing zone, zoning is different here if( terriMgr->isHousingTerritory( terriPos->getTargetZoneId() ) ) { - auto housingMgr = g_fw.get< Core::HousingMgr >(); + auto housingMgr = g_fw.get< Sapphire::HousingMgr >(); auto landSetId = housingMgr->toLandSetId( terriPos->getTargetZoneId(), param ); auto housingZone = housingMgr->getHousingZoneByLandSetId( landSetId ); diff --git a/src/servers/sapphire_zone/Manager/PlayerMgr.h b/src/servers/sapphire_zone/Manager/PlayerMgr.h index f25ba192..37592972 100644 --- a/src/servers/sapphire_zone/Manager/PlayerMgr.h +++ b/src/servers/sapphire_zone/Manager/PlayerMgr.h @@ -5,6 +5,6 @@ namespace Sapphire::World::Manager class PlayerMgr { public: - void movePlayerToLandDestination( Core::Entity::Player& player, uint32_t landId, uint16_t param = 0 ); + void movePlayerToLandDestination( Sapphire::Entity::Player& player, uint32_t landId, uint16_t param = 0 ); }; } \ No newline at end of file diff --git a/src/servers/sapphire_zone/Manager/ShopMgr.cpp b/src/servers/sapphire_zone/Manager/ShopMgr.cpp index 78173a1f..bc37488c 100644 --- a/src/servers/sapphire_zone/Manager/ShopMgr.cpp +++ b/src/servers/sapphire_zone/Manager/ShopMgr.cpp @@ -5,8 +5,8 @@ #include #include -extern Core::Framework g_fw; -using namespace Core; +extern Sapphire::Framework g_fw; +using namespace Sapphire; bool Sapphire::World::Manager::ShopMgr::purchaseGilShopItem( Entity::Player& player, uint32_t shopId, uint16_t itemId, uint32_t quantity ) { diff --git a/src/servers/sapphire_zone/Manager/ShopMgr.h b/src/servers/sapphire_zone/Manager/ShopMgr.h index 8ec5de4d..17f3c55f 100644 --- a/src/servers/sapphire_zone/Manager/ShopMgr.h +++ b/src/servers/sapphire_zone/Manager/ShopMgr.h @@ -5,6 +5,6 @@ namespace Sapphire::World::Manager class ShopMgr { public: - bool purchaseGilShopItem( Core::Entity::Player& player, uint32_t shopId, uint16_t itemId, uint32_t quantity ); + 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/servers/sapphire_zone/Math/CalcBattle.cpp b/src/servers/sapphire_zone/Math/CalcBattle.cpp index a3be3bed..9578dc7b 100644 --- a/src/servers/sapphire_zone/Math/CalcBattle.cpp +++ b/src/servers/sapphire_zone/Math/CalcBattle.cpp @@ -10,10 +10,10 @@ #include "CalcBattle.h" #include "Framework.h" -extern Core::Framework g_fw; +extern Sapphire::Framework g_fw; -using namespace Core::Math; -using namespace Core::Entity; +using namespace Sapphire::Math; +using namespace Sapphire::Entity; /* Class used for battle-related formulas and calculations. @@ -34,8 +34,8 @@ using namespace Core::Entity; uint32_t CalcBattle::calculateHealValue( PlayerPtr pPlayer, uint32_t potency ) { auto pExdData = g_fw.get< Data::ExdDataGenerated >(); - auto classInfo = pExdData->get< Core::Data::ClassJob >( static_cast< uint8_t >( pPlayer->getClass() ) ); - auto paramGrowthInfo = pExdData->get< Core::Data::ParamGrow >( pPlayer->getLevel() ); + 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; diff --git a/src/servers/sapphire_zone/Math/CalcBattle.h b/src/servers/sapphire_zone/Math/CalcBattle.h index 36f33c77..d34bbe01 100644 --- a/src/servers/sapphire_zone/Math/CalcBattle.h +++ b/src/servers/sapphire_zone/Math/CalcBattle.h @@ -4,13 +4,13 @@ #include #include "Forwards.h" -namespace Core::Math +namespace Sapphire::Math { class CalcBattle { public: - static uint32_t calculateHealValue( Core::Entity::PlayerPtr pPlayer, uint32_t potency ); + static uint32_t calculateHealValue( Sapphire::Entity::PlayerPtr pPlayer, uint32_t potency ); }; diff --git a/src/servers/sapphire_zone/Math/CalcStats.cpp b/src/servers/sapphire_zone/Math/CalcStats.cpp index 966d50df..7ef9f876 100644 --- a/src/servers/sapphire_zone/Math/CalcStats.cpp +++ b/src/servers/sapphire_zone/Math/CalcStats.cpp @@ -10,10 +10,10 @@ #include "CalcStats.h" #include "Framework.h" -using namespace Core::Math; -using namespace Core::Entity; +using namespace Sapphire::Math; +using namespace Sapphire::Entity; -extern Core::Framework g_fw; +extern Sapphire::Framework g_fw; /* Class used for battle-related formulas and calculations. @@ -64,8 +64,8 @@ uint32_t CalcStats::calculateMaxHp( PlayerPtr pPlayer ) // 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< Core::Data::ClassJob >( static_cast< uint8_t >( pPlayer->getClass() ) ); - auto paramGrowthInfo = pExdData->get< Core::Data::ParamGrow >( pPlayer->getLevel() ); + 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; @@ -99,8 +99,8 @@ uint32_t CalcStats::calculateMaxHp( PlayerPtr pPlayer ) uint32_t CalcStats::calculateMaxMp( PlayerPtr pPlayer ) { auto pExdData = g_fw.get< Data::ExdDataGenerated >(); - auto classInfo = pExdData->get< Core::Data::ClassJob >( static_cast< uint8_t >( pPlayer->getClass() ) ); - auto paramGrowthInfo = pExdData->get< Core::Data::ParamGrow >( pPlayer->getLevel() ); + 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; diff --git a/src/servers/sapphire_zone/Math/CalcStats.h b/src/servers/sapphire_zone/Math/CalcStats.h index 9e19477c..745900db 100644 --- a/src/servers/sapphire_zone/Math/CalcStats.h +++ b/src/servers/sapphire_zone/Math/CalcStats.h @@ -4,17 +4,17 @@ #include #include "Forwards.h" -namespace Core::Math +namespace Sapphire::Math { class CalcStats { public: - static float calculateBaseStat( Core::Entity::PlayerPtr pPlayer ); + static float calculateBaseStat( Sapphire::Entity::PlayerPtr pPlayer ); - static uint32_t calculateMaxMp( Core::Entity::PlayerPtr pPlayer ); + static uint32_t calculateMaxMp( Sapphire::Entity::PlayerPtr pPlayer ); - static uint32_t calculateMaxHp( Core::Entity::PlayerPtr pPlayer ); + static uint32_t calculateMaxHp( Sapphire::Entity::PlayerPtr pPlayer ); private: diff --git a/src/servers/sapphire_zone/Network/GameConnection.cpp b/src/servers/sapphire_zone/Network/GameConnection.cpp index 71028d7a..acc5296c 100644 --- a/src/servers/sapphire_zone/Network/GameConnection.cpp +++ b/src/servers/sapphire_zone/Network/GameConnection.cpp @@ -20,16 +20,17 @@ #include "Framework.h" #include "Forwards.h" -extern Core::Framework g_fw; +extern Sapphire::Framework g_fw; -using namespace Core::Common; -using namespace Core::Network::Packets; -using namespace Core::Network::Packets::Server; +using namespace Sapphire::Common; +using namespace Sapphire::Network::Packets; +using namespace Sapphire::Network::Packets::Server; -Core::Network::GameConnection::GameConnection( Core::Network::HivePtr pHive, - Core::Network::AcceptorPtr pAcceptor ) - : - Connection( pHive ), m_pAcceptor( pAcceptor ), m_conType( ConnectionType::None ) +Sapphire::Network::GameConnection::GameConnection( Sapphire::Network::HivePtr pHive, + Sapphire::Network::AcceptorPtr pAcceptor ) : + Connection( pHive ), + m_pAcceptor( pAcceptor ), + m_conType( ConnectionType::None ) { auto setZoneHandler = [ = ]( uint16_t opcode, std::string handlerName, GameConnection::Handler pHandler ) { @@ -124,11 +125,11 @@ Core::Network::GameConnection::GameConnection( Core::Network::HivePtr pHive, } -Core::Network::GameConnection::~GameConnection() = default; +Sapphire::Network::GameConnection::~GameConnection() = default; // overwrite the parents onConnect for our game socket needs -void Core::Network::GameConnection::OnAccept( const std::string& host, uint16_t port ) +void Sapphire::Network::GameConnection::OnAccept( const std::string& host, uint16_t port ) { GameConnectionPtr connection( new GameConnection( m_hive, m_pAcceptor ) ); m_pAcceptor->Accept( connection ); @@ -137,14 +138,14 @@ void Core::Network::GameConnection::OnAccept( const std::string& host, uint16_t } -void Core::Network::GameConnection::OnDisconnect() +void Sapphire::Network::GameConnection::OnDisconnect() { auto pLog = g_fw.get< Logger >(); pLog->debug( "GameConnection DISCONNECT" ); m_pSession = nullptr; } -void Core::Network::GameConnection::OnRecv( std::vector< uint8_t >& buffer ) +void Sapphire::Network::GameConnection::OnRecv( std::vector< uint8_t >& buffer ) { // This is assumed packet always start with valid FFXIVARR_PACKET_HEADER for now. auto pLog = g_fw.get< Logger >(); @@ -188,23 +189,23 @@ void Core::Network::GameConnection::OnRecv( std::vector< uint8_t >& buffer ) handlePackets( packetHeader, packetList ); } -void Core::Network::GameConnection::OnError( const asio::error_code& error ) +void Sapphire::Network::GameConnection::OnError( const asio::error_code& error ) { auto pLog = g_fw.get< Logger >(); pLog->debug( "GameConnection ERROR: " + error.message() ); } -void Core::Network::GameConnection::queueInPacket( Core::Network::Packets::FFXIVARR_PACKET_RAW inPacket ) +void Sapphire::Network::GameConnection::queueInPacket( Sapphire::Network::Packets::FFXIVARR_PACKET_RAW inPacket ) { m_inQueue.push( inPacket ); } -void Core::Network::GameConnection::queueOutPacket( Core::Network::Packets::FFXIVPacketBasePtr outPacket ) +void Sapphire::Network::GameConnection::queueOutPacket( Sapphire::Network::Packets::FFXIVPacketBasePtr outPacket ) { m_outQueue.push( outPacket ); } -void Core::Network::GameConnection::handleZonePacket( Core::Network::Packets::FFXIVARR_PACKET_RAW& pPacket ) +void Sapphire::Network::GameConnection::handleZonePacket( Sapphire::Network::Packets::FFXIVARR_PACKET_RAW& pPacket ) { auto pLog = g_fw.get< Logger >(); uint16_t opcode = *reinterpret_cast< uint16_t* >( &pPacket.data[ 0x02 ] ); @@ -235,7 +236,7 @@ void Core::Network::GameConnection::handleZonePacket( Core::Network::Packets::FF } -void Core::Network::GameConnection::handleChatPacket( Core::Network::Packets::FFXIVARR_PACKET_RAW& pPacket ) +void Sapphire::Network::GameConnection::handleChatPacket( Sapphire::Network::Packets::FFXIVARR_PACKET_RAW& pPacket ) { auto pLog = g_fw.get< Logger >(); uint16_t opcode = *reinterpret_cast< uint16_t* >( &pPacket.data[ 0x02 ] ); @@ -262,7 +263,7 @@ void Core::Network::GameConnection::handleChatPacket( Core::Network::Packets::FF } } -void Core::Network::GameConnection::handlePacket( Core::Network::Packets::FFXIVARR_PACKET_RAW& pPacket ) +void Sapphire::Network::GameConnection::handlePacket( Sapphire::Network::Packets::FFXIVARR_PACKET_RAW& pPacket ) { if( !m_pSession ) return; @@ -283,7 +284,7 @@ void Core::Network::GameConnection::handlePacket( Core::Network::Packets::FFXIVA } -void Core::Network::GameConnection::sendPackets( Packets::PacketContainer* pPacket ) +void Sapphire::Network::GameConnection::sendPackets( Packets::PacketContainer* pPacket ) { //g_log.Log(LoggingSeverity::info, pPacket->toString()); std::vector< uint8_t > sendBuffer; @@ -292,7 +293,7 @@ void Core::Network::GameConnection::sendPackets( Packets::PacketContainer* pPack Send( sendBuffer ); } -void Core::Network::GameConnection::processInQueue() +void Sapphire::Network::GameConnection::processInQueue() { // handle the incoming game packets while( m_inQueue.size() ) @@ -302,7 +303,7 @@ void Core::Network::GameConnection::processInQueue() } } -void Core::Network::GameConnection::processOutQueue() +void Sapphire::Network::GameConnection::processOutQueue() { auto pLog = g_fw.get< Logger >(); if( m_outQueue.size() < 1 ) @@ -335,14 +336,14 @@ void Core::Network::GameConnection::processOutQueue() } -void Core::Network::GameConnection::sendSinglePacket( Core::Network::Packets::FFXIVPacketBasePtr pPacket ) +void Sapphire::Network::GameConnection::sendSinglePacket( Sapphire::Network::Packets::FFXIVPacketBasePtr pPacket ) { PacketContainer pRP = PacketContainer(); pRP.addPacket( pPacket ); sendPackets( &pRP ); } -void Core::Network::GameConnection::injectPacket( const std::string& packetpath, Core::Entity::Player& player ) +void Sapphire::Network::GameConnection::injectPacket( const std::string& packetpath, Sapphire::Entity::Player& player ) { char packet[0x11570]; @@ -392,8 +393,8 @@ void Core::Network::GameConnection::injectPacket( const std::string& packetpath, } } -void Core::Network::GameConnection::handlePackets( const Core::Network::Packets::FFXIVARR_PACKET_HEADER& ipcHeader, - const std::vector< Core::Network::Packets::FFXIVARR_PACKET_RAW >& packetData ) +void Sapphire::Network::GameConnection::handlePackets( const Sapphire::Network::Packets::FFXIVARR_PACKET_HEADER& ipcHeader, + const std::vector< Sapphire::Network::Packets::FFXIVARR_PACKET_RAW >& packetData ) { auto pLog = g_fw.get< Logger >(); auto pServerZone = g_fw.get< ServerMgr >(); diff --git a/src/servers/sapphire_zone/Network/GameConnection.h b/src/servers/sapphire_zone/Network/GameConnection.h index 9ab043f2..3efbdde5 100644 --- a/src/servers/sapphire_zone/Network/GameConnection.h +++ b/src/servers/sapphire_zone/Network/GameConnection.h @@ -9,14 +9,14 @@ #include "ForwardsZone.h" -#define DECLARE_HANDLER( x ) void x( const Core::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 Core::Network::Packets +namespace Sapphire::Network::Packets { class GamePacket; } -namespace Core::Network +namespace Sapphire::Network { enum ConnectionType : uint8_t @@ -31,7 +31,7 @@ namespace Core::Network { private: - typedef void ( GameConnection::* Handler )( const Core::Network::Packets::FFXIVARR_PACKET_RAW& inPacket, + typedef void ( GameConnection::* Handler )( const Sapphire::Network::Packets::FFXIVARR_PACKET_RAW& inPacket, Entity::Player& player ); using HandlerMap = std::map< uint16_t, Handler >; @@ -49,7 +49,7 @@ namespace Core::Network SessionPtr m_pSession; - LockedQueue< Core::Network::Packets::FFXIVARR_PACKET_RAW > m_inQueue; + LockedQueue< Sapphire::Network::Packets::FFXIVARR_PACKET_RAW > m_inQueue; LockedQueue< Packets::FFXIVPacketBasePtr > m_outQueue; public: @@ -71,7 +71,7 @@ namespace Core::Network void handlePackets( const Packets::FFXIVARR_PACKET_HEADER& ipcHeader, const std::vector< Packets::FFXIVARR_PACKET_RAW >& packetData ); - void queueInPacket( Core::Network::Packets::FFXIVARR_PACKET_RAW inPacket ); + void queueInPacket( Sapphire::Network::Packets::FFXIVARR_PACKET_RAW inPacket ); void queueOutPacket( Packets::FFXIVPacketBasePtr outPacket ); @@ -79,15 +79,15 @@ namespace Core::Network void processOutQueue(); - void handlePacket( Core::Network::Packets::FFXIVARR_PACKET_RAW& pPacket ); + void handlePacket( Sapphire::Network::Packets::FFXIVARR_PACKET_RAW& pPacket ); - void handleZonePacket( Core::Network::Packets::FFXIVARR_PACKET_RAW& pPacket ); + void handleZonePacket( Sapphire::Network::Packets::FFXIVARR_PACKET_RAW& pPacket ); - void handleChatPacket( Core::Network::Packets::FFXIVARR_PACKET_RAW& pPacket ); + void handleChatPacket( Sapphire::Network::Packets::FFXIVARR_PACKET_RAW& pPacket ); void sendPackets( Packets::PacketContainer* pPacket ); - void sendSinglePacket( Core::Network::Packets::FFXIVPacketBasePtr pPacket ); + void sendSinglePacket( Sapphire::Network::Packets::FFXIVPacketBasePtr pPacket ); void injectPacket( const std::string& packetpath, Entity::Player& player ); diff --git a/src/servers/sapphire_zone/Network/Handlers/ActionHandler.cpp b/src/servers/sapphire_zone/Network/Handlers/ActionHandler.cpp index dab257f2..b6e4f1db 100644 --- a/src/servers/sapphire_zone/Network/Handlers/ActionHandler.cpp +++ b/src/servers/sapphire_zone/Network/Handlers/ActionHandler.cpp @@ -28,15 +28,15 @@ #include "Session.h" #include "Framework.h" -extern Core::Framework g_fw; +extern Sapphire::Framework g_fw; -using namespace Core::Common; -using namespace Core::Network::Packets; -using namespace Core::Network::Packets::Server; -using namespace Core::Network::ActorControl; +using namespace Sapphire::Common; +using namespace Sapphire::Network::Packets; +using namespace Sapphire::Network::Packets::Server; +using namespace Sapphire::Network::ActorControl; -void Core::Network::GameConnection::actionHandler( const Packets::FFXIVARR_PACKET_RAW& inPacket, - Entity::Player& player ) +void Sapphire::Network::GameConnection::actionHandler( const Packets::FFXIVARR_PACKET_RAW& inPacket, + Entity::Player& player ) { const auto packet = ZoneChannelPacket< Client::FFXIVIpcSkillHandler >( inPacket ); @@ -59,7 +59,7 @@ void Core::Network::GameConnection::actionHandler( const Packets::FFXIVARR_PACKE std::string actionIdStr = Util::intToHexString( action, 4 ); player.sendDebug( "---------------------------------------" ); player.sendDebug( "ActionHandler ( " + actionIdStr + " | " + - pExdData->get< Core::Data::Action >( action )->name + + pExdData->get< Sapphire::Data::Action >( action )->name + " | " + std::to_string( targetId ) + " )" ); player.queuePacket( makeActorControl142( player.getId(), ActorControlType::ActionStart, 0x01, action ) ); @@ -74,7 +74,7 @@ void Core::Network::GameConnection::actionHandler( const Packets::FFXIVARR_PACKE } else { - Core::Entity::ActorPtr targetActor = player.getAsPlayer(); + Sapphire::Entity::ActorPtr targetActor = player.getAsPlayer(); if( targetId != player.getId() ) { @@ -108,7 +108,7 @@ void Core::Network::GameConnection::actionHandler( const Packets::FFXIVARR_PACKE } else if( action < 3000000 ) // item action { - auto info = pExdData->get< Core::Data::EventItem >( action ); + auto info = pExdData->get< Sapphire::Data::EventItem >( action ); if( info ) { pScriptMgr->onEventItem( player, action, info->quest, info->castTime, targetId ); diff --git a/src/servers/sapphire_zone/Network/Handlers/CFHandlers.cpp b/src/servers/sapphire_zone/Network/Handlers/CFHandlers.cpp index df03db4f..8727bfb9 100644 --- a/src/servers/sapphire_zone/Network/Handlers/CFHandlers.cpp +++ b/src/servers/sapphire_zone/Network/Handlers/CFHandlers.cpp @@ -16,15 +16,15 @@ #include "Session.h" -extern Core::Framework g_fw; +extern Sapphire::Framework g_fw; -using namespace Core::Common; -using namespace Core::Network::Packets; -using namespace Core::Network::Packets::Server; +using namespace Sapphire::Common; +using namespace Sapphire::Network::Packets; +using namespace Sapphire::Network::Packets::Server; -void Core::Network::GameConnection::cfDutyInfoRequest( const Packets::FFXIVARR_PACKET_RAW& inPacket, - Entity::Player& player ) +void Sapphire::Network::GameConnection::cfDutyInfoRequest( const Packets::FFXIVARR_PACKET_RAW& inPacket, + Entity::Player& player ) { auto dutyInfoPacket = makeZonePacket< FFXIVIpcCFDutyInfo >( player.getId() ); auto penaltyMinutes = player.getCFPenaltyMinutes(); @@ -41,7 +41,7 @@ void Core::Network::GameConnection::cfDutyInfoRequest( const Packets::FFXIVARR_P } -void Core::Network::GameConnection::cfRegisterDuty( 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; @@ -73,7 +73,7 @@ void Core::Network::GameConnection::cfRegisterDuty( const Packets::FFXIVARR_PACK cfCancelPacket->data().state2 = 1; // Your registration is withdrawn. queueOutPacket( cfCancelPacket ); - auto cfCondition = pExdData->get< Core::Data::ContentFinderCondition >( contentId ); + auto cfCondition = pExdData->get< Sapphire::Data::ContentFinderCondition >( contentId ); if( !cfCondition ) return; @@ -89,7 +89,7 @@ void Core::Network::GameConnection::cfRegisterDuty( const Packets::FFXIVARR_PACK player.setInstance( instance ); } -void Core::Network::GameConnection::cfRegisterRoulette( 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() ); @@ -100,7 +100,7 @@ void Core::Network::GameConnection::cfRegisterRoulette( const Packets::FFXIVARR_ player.sendDebug( "Roulette register" ); } -void Core::Network::GameConnection::cfDutyAccepted( 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/servers/sapphire_zone/Network/Handlers/ClientTriggerHandler.cpp b/src/servers/sapphire_zone/Network/Handlers/ClientTriggerHandler.cpp index 7e06e9fa..f1be2d0c 100644 --- a/src/servers/sapphire_zone/Network/Handlers/ClientTriggerHandler.cpp +++ b/src/servers/sapphire_zone/Network/Handlers/ClientTriggerHandler.cpp @@ -36,18 +36,18 @@ #include "Framework.h" #include -extern Core::Framework g_fw; +extern Sapphire::Framework g_fw; -using namespace Core::Common; -using namespace Core::Network::Packets; -using namespace Core::Network::Packets::Server; -using namespace Core::Network::ActorControl; +using namespace Sapphire::Common; +using namespace Sapphire::Network::Packets; +using namespace Sapphire::Network::Packets::Server; +using namespace Sapphire::Network::ActorControl; -void examineHandler( Core::Entity::Player& player, uint32_t targetId ) +void examineHandler( Sapphire::Entity::Player& player, uint32_t targetId ) { - using namespace Core; + using namespace Sapphire; - auto pSession = g_fw.get< Core::ServerMgr >()->getSession( targetId ); + auto pSession = g_fw.get< Sapphire::ServerMgr >()->getSession( targetId ); if( pSession ) { auto pTarget = pSession->getPlayer(); @@ -65,7 +65,7 @@ void examineHandler( Core::Entity::Player& player, uint32_t targetId ) } } -void Core::Network::GameConnection::clientTriggerHandler( const Packets::FFXIVARR_PACKET_RAW& inPacket, +void Sapphire::Network::GameConnection::clientTriggerHandler( const Packets::FFXIVARR_PACKET_RAW& inPacket, Entity::Player& player ) { auto pLog = g_fw.get< Logger >(); diff --git a/src/servers/sapphire_zone/Network/Handlers/EventHandlers.cpp b/src/servers/sapphire_zone/Network/Handlers/EventHandlers.cpp index ffb3124a..f02ea7ef 100644 --- a/src/servers/sapphire_zone/Network/Handlers/EventHandlers.cpp +++ b/src/servers/sapphire_zone/Network/Handlers/EventHandlers.cpp @@ -26,14 +26,14 @@ #include "Framework.h" -extern Core::Framework g_fw; +extern Sapphire::Framework g_fw; -using namespace Core::Common; -using namespace Core::Network::Packets; -using namespace Core::Network::Packets::Server; +using namespace Sapphire::Common; +using namespace Sapphire::Network::Packets; +using namespace Sapphire::Network::Packets::Server; -void Core::Network::GameConnection::eventHandlerTalk( const Packets::FFXIVARR_PACKET_RAW& inPacket, - Entity::Player& player ) +void Sapphire::Network::GameConnection::eventHandlerTalk( const Packets::FFXIVARR_PACKET_RAW& inPacket, + Entity::Player& player ) { auto pScriptMgr = g_fw.get< Scripting::ScriptMgr >(); auto pExdData = g_fw.get< Data::ExdDataGenerated >(); @@ -66,7 +66,7 @@ void Core::Network::GameConnection::eventHandlerTalk( const Packets::FFXIVARR_PA else if( !pScriptMgr->onTalk( player, actorId, eventId ) && eventType == Event::EventHandler::EventHandlerType::Quest ) { - auto questInfo = pExdData->get< Core::Data::Quest >( eventId ); + auto questInfo = pExdData->get< Sapphire::Data::Quest >( eventId ); if( questInfo ) player.sendUrgent( "Quest not implemented: " + questInfo->name + " (" + questInfo->id + ")" ); } @@ -75,7 +75,7 @@ void Core::Network::GameConnection::eventHandlerTalk( const Packets::FFXIVARR_PA } -void Core::Network::GameConnection::eventHandlerEmote( const Packets::FFXIVARR_PACKET_RAW& inPacket, +void Sapphire::Network::GameConnection::eventHandlerEmote( const Packets::FFXIVARR_PACKET_RAW& inPacket, Entity::Player& player ) { @@ -106,7 +106,7 @@ void Core::Network::GameConnection::eventHandlerEmote( const Packets::FFXIVARR_P if( !pScriptMgr->onEmote( player, actorId, eventId, static_cast< uint8_t >( emoteId ) ) && eventType == Event::EventHandler::EventHandlerType::Quest ) { - auto questInfo = pExdData->get< Core::Data::Quest >( eventId ); + auto questInfo = pExdData->get< Sapphire::Data::Quest >( eventId ); if( questInfo ) player.sendUrgent( "Quest not implemented: " + questInfo->name ); } @@ -114,7 +114,7 @@ void Core::Network::GameConnection::eventHandlerEmote( const Packets::FFXIVARR_P player.checkEvent( eventId ); } -void Core::Network::GameConnection::eventHandlerWithinRange( const Packets::FFXIVARR_PACKET_RAW& inPacket, +void Sapphire::Network::GameConnection::eventHandlerWithinRange( const Packets::FFXIVARR_PACKET_RAW& inPacket, Entity::Player& player ) { auto pScriptMgr = g_fw.get< Scripting::ScriptMgr >(); @@ -137,7 +137,7 @@ void Core::Network::GameConnection::eventHandlerWithinRange( const Packets::FFXI player.checkEvent( eventId ); } -void Core::Network::GameConnection::eventHandlerOutsideRange( const Packets::FFXIVARR_PACKET_RAW& inPacket, +void Sapphire::Network::GameConnection::eventHandlerOutsideRange( const Packets::FFXIVARR_PACKET_RAW& inPacket, Entity::Player& player ) { auto pScriptMgr = g_fw.get< Scripting::ScriptMgr >(); @@ -159,7 +159,7 @@ void Core::Network::GameConnection::eventHandlerOutsideRange( const Packets::FFX player.checkEvent( eventId ); } -void Core::Network::GameConnection::eventHandlerEnterTerritory( const Packets::FFXIVARR_PACKET_RAW& inPacket, +void Sapphire::Network::GameConnection::eventHandlerEnterTerritory( const Packets::FFXIVARR_PACKET_RAW& inPacket, Entity::Player& player ) { auto pScriptMgr = g_fw.get< Scripting::ScriptMgr >(); @@ -190,7 +190,7 @@ void Core::Network::GameConnection::eventHandlerEnterTerritory( const Packets::F player.checkEvent( eventId ); } -void Core::Network::GameConnection::eventHandlerReturn( const Packets::FFXIVARR_PACKET_RAW& inPacket, +void Sapphire::Network::GameConnection::eventHandlerReturn( const Packets::FFXIVARR_PACKET_RAW& inPacket, Entity::Player& player ) { const auto packet = ZoneChannelPacket< Client::FFXIVIpcEventHandlerReturn >( inPacket ); @@ -239,7 +239,7 @@ void Core::Network::GameConnection::eventHandlerReturn( const Packets::FFXIVARR_ } -void Core::Network::GameConnection::eventHandlerLinkshell( 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 ); @@ -253,7 +253,7 @@ void Core::Network::GameConnection::eventHandlerLinkshell( const Packets::FFXIVA } -void Core::Network::GameConnection::eventHandlerShop( const Packets::FFXIVARR_PACKET_RAW& inPacket, +void Sapphire::Network::GameConnection::eventHandlerShop( const Packets::FFXIVARR_PACKET_RAW& inPacket, Entity::Player& player ) { const auto packet = ZoneChannelPacket< Client::FFXIVIpcShopEventHandler >( inPacket ); diff --git a/src/servers/sapphire_zone/Network/Handlers/GMCommandHandlers.cpp b/src/servers/sapphire_zone/Network/Handlers/GMCommandHandlers.cpp index 54507a44..a6beaf1d 100644 --- a/src/servers/sapphire_zone/Network/Handlers/GMCommandHandlers.cpp +++ b/src/servers/sapphire_zone/Network/Handlers/GMCommandHandlers.cpp @@ -32,12 +32,12 @@ #include "ServerMgr.h" #include "Framework.h" -extern Core::Framework g_fw; +extern Sapphire::Framework g_fw; -using namespace Core::Common; -using namespace Core::Network::Packets; -using namespace Core::Network::Packets::Server; -using namespace Core::Network::ActorControl; +using namespace Sapphire::Common; +using namespace Sapphire::Network::Packets; +using namespace Sapphire::Network::Packets::Server; +using namespace Sapphire::Network::ActorControl; enum GmCommand { @@ -87,7 +87,7 @@ enum GmCommand JumpNpc = 0x025F, }; -void Core::Network::GameConnection::gm1Handler( const Packets::FFXIVARR_PACKET_RAW& inPacket, Entity::Player& player ) +void Sapphire::Network::GameConnection::gm1Handler( const Packets::FFXIVARR_PACKET_RAW& inPacket, Entity::Player& player ) { if( player.getGmRank() <= 0 ) return; @@ -106,7 +106,7 @@ void Core::Network::GameConnection::gm1Handler( const Packets::FFXIVARR_PACKET_R std::to_string( param2 ) + ", " + std::to_string( param3 ) + ", " + std::to_string( param4 ) + ", target: " + std::to_string( target ) ); - Core::Entity::ActorPtr targetActor; + Sapphire::Entity::ActorPtr targetActor; if( player.getId() == target ) @@ -471,7 +471,7 @@ void Core::Network::GameConnection::gm1Handler( const Packets::FFXIVARR_PACKET_R for( auto i : idList ) { - auto data = pExdData->get< Core::Data::Aetheryte >( i ); + auto data = pExdData->get< Sapphire::Data::Aetheryte >( i ); if( !data ) { @@ -545,7 +545,7 @@ void Core::Network::GameConnection::gm1Handler( const Packets::FFXIVARR_PACKET_R } -void Core::Network::GameConnection::gm2Handler( const Packets::FFXIVARR_PACKET_RAW& inPacket, Entity::Player& player ) +void Sapphire::Network::GameConnection::gm2Handler( const Packets::FFXIVARR_PACKET_RAW& inPacket, Entity::Player& player ) { if( player.getGmRank() <= 0 ) return; @@ -568,7 +568,7 @@ void Core::Network::GameConnection::gm2Handler( const Packets::FFXIVARR_PACKET_R ", target: " + target ); auto targetSession = pServerZone->getSession( target ); - Core::Entity::CharaPtr targetActor; + Sapphire::Entity::CharaPtr targetActor; if( targetSession != nullptr ) { diff --git a/src/servers/sapphire_zone/Network/Handlers/InventoryHandler.cpp b/src/servers/sapphire_zone/Network/Handlers/InventoryHandler.cpp index d518432b..a0925f98 100644 --- a/src/servers/sapphire_zone/Network/Handlers/InventoryHandler.cpp +++ b/src/servers/sapphire_zone/Network/Handlers/InventoryHandler.cpp @@ -19,14 +19,14 @@ #include "Framework.h" -extern Core::Framework g_fw; +extern Sapphire::Framework g_fw; -using namespace Core::Common; -using namespace Core::Network::Packets; -using namespace Core::Network::Packets::Server; +using namespace Sapphire::Common; +using namespace Sapphire::Network::Packets; +using namespace Sapphire::Network::Packets::Server; -void Core::Network::GameConnection::inventoryModifyHandler( const Packets::FFXIVARR_PACKET_RAW& inPacket, - Entity::Player& player ) +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/servers/sapphire_zone/Network/Handlers/PacketHandlers.cpp b/src/servers/sapphire_zone/Network/Handlers/PacketHandlers.cpp index e6cd8a16..3de70b02 100644 --- a/src/servers/sapphire_zone/Network/Handlers/PacketHandlers.cpp +++ b/src/servers/sapphire_zone/Network/Handlers/PacketHandlers.cpp @@ -46,15 +46,15 @@ #include "Forwards.h" #include "Framework.h" -extern Core::Framework g_fw; +extern Sapphire::Framework g_fw; -using namespace Core::Common; -using namespace Core::Network::Packets; -using namespace Core::Network::Packets::Server; -using namespace Core::Network::ActorControl; +using namespace Sapphire::Common; +using namespace Sapphire::Network::Packets; +using namespace Sapphire::Network::Packets::Server; +using namespace Sapphire::Network::ActorControl; -void Core::Network::GameConnection::fcInfoReqHandler( const Core::Network::Packets::FFXIVARR_PACKET_RAW& inPacket, - Entity::Player& player ) +void Sapphire::Network::GameConnection::fcInfoReqHandler( const Sapphire::Network::Packets::FFXIVARR_PACKET_RAW& inPacket, + Entity::Player& player ) { // TODO: use new packet struct for this //GamePacketPtr pPe( new GamePacket( 0xDD, 0x78, player.getId(), player.getId() ) ); @@ -62,8 +62,8 @@ void Core::Network::GameConnection::fcInfoReqHandler( const Core::Network::Packe //queueOutPacket( pPe ); } -void Core::Network::GameConnection::setSearchInfoHandler( const Packets::FFXIVARR_PACKET_RAW& inPacket, - Entity::Player& player ) +void Sapphire::Network::GameConnection::setSearchInfoHandler( const Packets::FFXIVARR_PACKET_RAW& inPacket, + Entity::Player& player ) { const auto packet = ZoneChannelPacket< Client::FFXIVIpcSetSearchInfo >( inPacket ); @@ -97,8 +97,8 @@ void Core::Network::GameConnection::setSearchInfoHandler( const Packets::FFXIVAR static_cast< uint8_t >( player.getOnlineStatus() ) ), true ); } -void Core::Network::GameConnection::reqSearchInfoHandler( const Core::Network::Packets::FFXIVARR_PACKET_RAW& inPacket, - Entity::Player& player ) +void Sapphire::Network::GameConnection::reqSearchInfoHandler( const Packets::FFXIVARR_PACKET_RAW& inPacket, + Entity::Player& player ) { auto searchInfoPacket = makeZonePacket< FFXIVIpcInitSearchInfo >( player.getId() ); searchInfoPacket->data().onlineStatusFlags = player.getOnlineStatusMask(); @@ -107,14 +107,14 @@ void Core::Network::GameConnection::reqSearchInfoHandler( const Core::Network::P queueOutPacket( searchInfoPacket ); } -void Core::Network::GameConnection::reqExamineSearchCommentHandler( const Core::Network::Packets::FFXIVARR_PACKET_RAW& inPacket, - Entity::Player& player ) +void Sapphire::Network::GameConnection::reqExamineSearchCommentHandler( const Packets::FFXIVARR_PACKET_RAW& inPacket, + Entity::Player& player ) { auto targetId = *reinterpret_cast< const uint32_t* >( &inPacket.data[ 0x10 ] ); - auto pSession = g_fw.get< Core::ServerMgr >()->getSession( targetId ); + auto pSession = g_fw.get< Sapphire::ServerMgr >()->getSession( targetId ); - g_fw.get< Core::Logger >()->debug( std::to_string( targetId ) ); + g_fw.get< Sapphire::Logger >()->debug( std::to_string( targetId ) ); if( pSession ) { @@ -134,14 +134,14 @@ void Core::Network::GameConnection::reqExamineSearchCommentHandler( const Core:: } } -void Core::Network::GameConnection::reqExamineFcInfo( const Core::Network::Packets::FFXIVARR_PACKET_RAW& inPacket, +void Sapphire::Network::GameConnection::reqExamineFcInfo( const Packets::FFXIVARR_PACKET_RAW& inPacket, Entity::Player& player ) { auto targetId = *reinterpret_cast< const uint32_t* >( &inPacket.data[ 0x18 ] ); - auto pSession = g_fw.get< Core::ServerMgr >()->getSession( targetId ); + auto pSession = g_fw.get< Sapphire::ServerMgr >()->getSession( targetId ); - g_fw.get< Core::Logger >()->debug( std::to_string( targetId ) ); + g_fw.get< Sapphire::Logger >()->debug( std::to_string( targetId ) ); if( pSession ) { @@ -162,15 +162,15 @@ void Core::Network::GameConnection::reqExamineFcInfo( const Core::Network::Packe } } -void Core::Network::GameConnection::linkshellListHandler( const Core::Network::Packets::FFXIVARR_PACKET_RAW& inPacket, - Entity::Player& player ) +void Sapphire::Network::GameConnection::linkshellListHandler( const Packets::FFXIVARR_PACKET_RAW& inPacket, + Entity::Player& player ) { auto linkshellListPacket = makeZonePacket< FFXIVIpcLinkshellList >( player.getId() ); queueOutPacket( linkshellListPacket ); } -void Core::Network::GameConnection::updatePositionHandler( const Core::Network::Packets::FFXIVARR_PACKET_RAW& inPacket, - Entity::Player& player ) +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 if( player.isMarkedForZoning() ) @@ -305,16 +305,16 @@ void Core::Network::GameConnection::updatePositionHandler( const Core::Network:: } void -Core::Network::GameConnection::reqEquipDisplayFlagsHandler( const Core::Network::Packets::FFXIVARR_PACKET_RAW& inPacket, - Entity::Player& player ) +Sapphire::Network::GameConnection::reqEquipDisplayFlagsHandler( const Packets::FFXIVARR_PACKET_RAW& inPacket, + Entity::Player& player ) { player.setEquipDisplayFlags( inPacket.data[ 0x10 ] ); player.sendDebug( "EquipDisplayFlag CHANGE: " + std::to_string( player.getEquipDisplayFlags() ) ); } -void Core::Network::GameConnection::zoneLineHandler( const Core::Network::Packets::FFXIVARR_PACKET_RAW& inPacket, - Entity::Player& player ) +void Sapphire::Network::GameConnection::zoneLineHandler( const Packets::FFXIVARR_PACKET_RAW& inPacket, + Entity::Player& player ) { auto pTeriMgr = g_fw.get< TerritoryMgr >(); @@ -359,8 +359,8 @@ void Core::Network::GameConnection::zoneLineHandler( const Core::Network::Packet } -void Core::Network::GameConnection::discoveryHandler( const Core::Network::Packets::FFXIVARR_PACKET_RAW& inPacket, - Entity::Player& player ) +void Sapphire::Network::GameConnection::discoveryHandler( const Packets::FFXIVARR_PACKET_RAW& inPacket, + Entity::Player& player ) { const auto packet = ZoneChannelPacket< Client::FFXIVIpcDiscoveryHandler >( inPacket ); const auto positionRef = packet.data().positionRef; @@ -389,8 +389,8 @@ void Core::Network::GameConnection::discoveryHandler( const Core::Network::Packe } -void Core::Network::GameConnection::playTimeHandler( const Core::Network::Packets::FFXIVARR_PACKET_RAW& inPacket, - Entity::Player& player ) +void Sapphire::Network::GameConnection::playTimeHandler( const Packets::FFXIVARR_PACKET_RAW& inPacket, + Entity::Player& player ) { auto playTimePacket = makeZonePacket< FFXIVIpcPlayTime >( player.getId() ); playTimePacket->data().playTimeInMinutes = player.getPlayTime() / 60; @@ -398,8 +398,8 @@ void Core::Network::GameConnection::playTimeHandler( const Core::Network::Packet } -void Core::Network::GameConnection::initHandler( const Core::Network::Packets::FFXIVARR_PACKET_RAW& inPacket, - Entity::Player& player ) +void Sapphire::Network::GameConnection::initHandler( const Packets::FFXIVARR_PACKET_RAW& inPacket, + Entity::Player& player ) { // init handler means this is a login procedure player.setIsLogin( true ); @@ -408,8 +408,8 @@ void Core::Network::GameConnection::initHandler( const Core::Network::Packets::F } -void Core::Network::GameConnection::blackListHandler( const Core::Network::Packets::FFXIVARR_PACKET_RAW& inPacket, - Entity::Player& player ) +void Sapphire::Network::GameConnection::blackListHandler( const Packets::FFXIVARR_PACKET_RAW& inPacket, + Entity::Player& player ) { uint8_t count = inPacket.data[ 0x11 ]; @@ -423,8 +423,8 @@ void Core::Network::GameConnection::blackListHandler( const Core::Network::Packe } -void Core::Network::GameConnection::pingHandler( const Core::Network::Packets::FFXIVARR_PACKET_RAW& inPacket, - Entity::Player& player ) +void Sapphire::Network::GameConnection::pingHandler( const Packets::FFXIVARR_PACKET_RAW& inPacket, + Entity::Player& player ) { const auto packet = ZoneChannelPacket< Client::FFXIVIpcPingHandler >( inPacket ); @@ -434,8 +434,8 @@ void Core::Network::GameConnection::pingHandler( const Core::Network::Packets::F } -void Core::Network::GameConnection::finishLoadingHandler( const Core::Network::Packets::FFXIVARR_PACKET_RAW& inPacket, - Entity::Player& player ) +void Sapphire::Network::GameConnection::finishLoadingHandler( const Packets::FFXIVARR_PACKET_RAW& inPacket, + Entity::Player& player ) { player.sendQuestInfo(); @@ -467,8 +467,8 @@ void Core::Network::GameConnection::finishLoadingHandler( const Core::Network::P player.getCurrentZone()->updateActorPosition( player ); } -void Core::Network::GameConnection::socialListHandler( const Core::Network::Packets::FFXIVARR_PACKET_RAW& inPacket, - Entity::Player& player ) +void Sapphire::Network::GameConnection::socialListHandler( const Packets::FFXIVARR_PACKET_RAW& inPacket, + Entity::Player& player ) { uint8_t type = inPacket.data[ 0x1A ]; @@ -524,8 +524,8 @@ void Core::Network::GameConnection::socialListHandler( const Core::Network::Pack } -void Core::Network::GameConnection::chatHandler( const Core::Network::Packets::FFXIVARR_PACKET_RAW& inPacket, - Entity::Player& player ) +void Sapphire::Network::GameConnection::chatHandler( const Packets::FFXIVARR_PACKET_RAW& inPacket, + Entity::Player& player ) { auto pDebugCom = g_fw.get< DebugCommandHandler >(); @@ -582,8 +582,8 @@ void Core::Network::GameConnection::chatHandler( const Core::Network::Packets::F // 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 Core::Network::GameConnection::logoutHandler( const Core::Network::Packets::FFXIVARR_PACKET_RAW& inPacket, - Entity::Player& player ) +void Sapphire::Network::GameConnection::logoutHandler( const Packets::FFXIVARR_PACKET_RAW& inPacket, + Entity::Player& player ) { auto logoutPacket = makeZonePacket< FFXIVIpcLogout >( player.getId() ); logoutPacket->data().flags1 = 0x02; @@ -594,8 +594,8 @@ void Core::Network::GameConnection::logoutHandler( const Core::Network::Packets: } -void Core::Network::GameConnection::tellHandler( const Core::Network::Packets::FFXIVARR_PACKET_RAW& inPacket, - Entity::Player& player ) +void Sapphire::Network::GameConnection::tellHandler( const Packets::FFXIVARR_PACKET_RAW& inPacket, + Entity::Player& player ) { const auto packet = ZoneChannelPacket< Client::FFXIVIpcTellHandler >( inPacket ); @@ -645,16 +645,16 @@ void Core::Network::GameConnection::tellHandler( const Core::Network::Packets::F } -void Core::Network::GameConnection::performNoteHandler( const Core::Network::Packets::FFXIVARR_PACKET_RAW& inPacket, - Entity::Player& player ) +void Sapphire::Network::GameConnection::performNoteHandler( const Packets::FFXIVARR_PACKET_RAW& inPacket, + Entity::Player& player ) { auto performPacket = makeZonePacket< FFXIVIpcPerformNote >( player.getId() ); memcpy( &performPacket->data().data[ 0 ], &inPacket.data[ 0x10 ], 32 ); player.sendToInRangeSet( performPacket ); } -void Core::Network::GameConnection::landRenameHandler( const Core::Network::Packets::FFXIVARR_PACKET_RAW& inPacket, - Entity::Player& player ) +void Sapphire::Network::GameConnection::landRenameHandler( const Packets::FFXIVARR_PACKET_RAW& inPacket, + Entity::Player& player ) { const auto packet = ZoneChannelPacket< Client::FFXIVIpcRenameLandHandler >( inPacket ); @@ -686,8 +686,8 @@ void Core::Network::GameConnection::landRenameHandler( const Core::Network::Pack player.queuePacket( nameUpdatePacket ); } -void Core::Network::GameConnection::buildPresetHandler( const Core::Network::Packets::FFXIVARR_PACKET_RAW& inPacket, - Entity::Player& player ) +void Sapphire::Network::GameConnection::buildPresetHandler( const Packets::FFXIVARR_PACKET_RAW& inPacket, + Entity::Player& player ) { const auto packet = ZoneChannelPacket< Client::FFXIVIpcBuildPresetHandler >( inPacket ); @@ -695,8 +695,8 @@ void Core::Network::GameConnection::buildPresetHandler( const Core::Network::Pac pHousingMgr->buildPresetEstate( player, packet.data().plotNum, packet.data().itemId ); } -void Core::Network::GameConnection::housingUpdateGreetingHandler( const Core::Network::Packets::FFXIVARR_PACKET_RAW& inPacket, - Entity::Player& player ) +void Sapphire::Network::GameConnection::housingUpdateGreetingHandler( const Packets::FFXIVARR_PACKET_RAW& inPacket, + Entity::Player& player ) { const auto packet = ZoneChannelPacket< Client::FFXIVIpcHousingUpdateHouseGreeting >( inPacket ); diff --git a/src/servers/sapphire_zone/Network/PacketWrappers/ActorControlPacket142.h b/src/servers/sapphire_zone/Network/PacketWrappers/ActorControlPacket142.h index a68ac4f5..13981adb 100644 --- a/src/servers/sapphire_zone/Network/PacketWrappers/ActorControlPacket142.h +++ b/src/servers/sapphire_zone/Network/PacketWrappers/ActorControlPacket142.h @@ -5,7 +5,7 @@ #include #include "Forwards.h" -namespace Core::Network::Packets::Server +namespace Sapphire::Network::Packets::Server { /** diff --git a/src/servers/sapphire_zone/Network/PacketWrappers/ActorControlPacket143.h b/src/servers/sapphire_zone/Network/PacketWrappers/ActorControlPacket143.h index e920ef15..af71bf02 100644 --- a/src/servers/sapphire_zone/Network/PacketWrappers/ActorControlPacket143.h +++ b/src/servers/sapphire_zone/Network/PacketWrappers/ActorControlPacket143.h @@ -6,7 +6,7 @@ #include "Forwards.h" -namespace Core::Network::Packets::Server +namespace Sapphire::Network::Packets::Server { /** diff --git a/src/servers/sapphire_zone/Network/PacketWrappers/ActorControlPacket144.h b/src/servers/sapphire_zone/Network/PacketWrappers/ActorControlPacket144.h index 8950cff9..02d12b77 100644 --- a/src/servers/sapphire_zone/Network/PacketWrappers/ActorControlPacket144.h +++ b/src/servers/sapphire_zone/Network/PacketWrappers/ActorControlPacket144.h @@ -4,7 +4,7 @@ #include #include -namespace Core::Network::Packets::Server +namespace Sapphire::Network::Packets::Server { /** diff --git a/src/servers/sapphire_zone/Network/PacketWrappers/ChatPacket.h b/src/servers/sapphire_zone/Network/PacketWrappers/ChatPacket.h index 08e2394e..ef77fe1a 100644 --- a/src/servers/sapphire_zone/Network/PacketWrappers/ChatPacket.h +++ b/src/servers/sapphire_zone/Network/PacketWrappers/ChatPacket.h @@ -6,7 +6,7 @@ #include "Forwards.h" -namespace Core::Network::Packets::Server +namespace Sapphire::Network::Packets::Server { /** diff --git a/src/servers/sapphire_zone/Network/PacketWrappers/DirectorPlayScenePacket.h b/src/servers/sapphire_zone/Network/PacketWrappers/DirectorPlayScenePacket.h index 268279bf..e7f1698b 100644 --- a/src/servers/sapphire_zone/Network/PacketWrappers/DirectorPlayScenePacket.h +++ b/src/servers/sapphire_zone/Network/PacketWrappers/DirectorPlayScenePacket.h @@ -4,7 +4,7 @@ #include #include "Forwards.h" -namespace Core::Network::Packets::Server +namespace Sapphire::Network::Packets::Server { /** diff --git a/src/servers/sapphire_zone/Network/PacketWrappers/EffectPacket.h b/src/servers/sapphire_zone/Network/PacketWrappers/EffectPacket.h index ddc48343..694cefc8 100644 --- a/src/servers/sapphire_zone/Network/PacketWrappers/EffectPacket.h +++ b/src/servers/sapphire_zone/Network/PacketWrappers/EffectPacket.h @@ -8,7 +8,7 @@ #include #include -namespace Core::Network::Packets::Server +namespace Sapphire::Network::Packets::Server { class EffectPacket : public ZoneChannelPacket< FFXIVIpcEffect > diff --git a/src/servers/sapphire_zone/Network/PacketWrappers/EventFinishPacket.h b/src/servers/sapphire_zone/Network/PacketWrappers/EventFinishPacket.h index d6de2a35..aa9b78f0 100644 --- a/src/servers/sapphire_zone/Network/PacketWrappers/EventFinishPacket.h +++ b/src/servers/sapphire_zone/Network/PacketWrappers/EventFinishPacket.h @@ -3,7 +3,7 @@ #include -namespace Core::Network::Packets::Server +namespace Sapphire::Network::Packets::Server { /** diff --git a/src/servers/sapphire_zone/Network/PacketWrappers/EventPlayPacket.h b/src/servers/sapphire_zone/Network/PacketWrappers/EventPlayPacket.h index 748946d7..b434666f 100644 --- a/src/servers/sapphire_zone/Network/PacketWrappers/EventPlayPacket.h +++ b/src/servers/sapphire_zone/Network/PacketWrappers/EventPlayPacket.h @@ -4,7 +4,7 @@ #include #include "Forwards.h" -namespace Core::Network::Packets::Server +namespace Sapphire::Network::Packets::Server { /** diff --git a/src/servers/sapphire_zone/Network/PacketWrappers/EventStartPacket.h b/src/servers/sapphire_zone/Network/PacketWrappers/EventStartPacket.h index 935693fc..8fd9223e 100644 --- a/src/servers/sapphire_zone/Network/PacketWrappers/EventStartPacket.h +++ b/src/servers/sapphire_zone/Network/PacketWrappers/EventStartPacket.h @@ -4,7 +4,7 @@ #include #include "Forwards.h" -namespace Core::Network::Packets::Server +namespace Sapphire::Network::Packets::Server { /** diff --git a/src/servers/sapphire_zone/Network/PacketWrappers/ExaminePacket.h b/src/servers/sapphire_zone/Network/PacketWrappers/ExaminePacket.h index dd446296..463b884d 100644 --- a/src/servers/sapphire_zone/Network/PacketWrappers/ExaminePacket.h +++ b/src/servers/sapphire_zone/Network/PacketWrappers/ExaminePacket.h @@ -10,7 +10,7 @@ #include "StatusEffect/StatusEffect.h" -namespace Core::Network::Packets::Server +namespace Sapphire::Network::Packets::Server { /** diff --git a/src/servers/sapphire_zone/Network/PacketWrappers/InitUIPacket.h b/src/servers/sapphire_zone/Network/PacketWrappers/InitUIPacket.h index a6a7b186..91fa6c59 100644 --- a/src/servers/sapphire_zone/Network/PacketWrappers/InitUIPacket.h +++ b/src/servers/sapphire_zone/Network/PacketWrappers/InitUIPacket.h @@ -6,7 +6,7 @@ #include "Actor/Player.h" #include "Forwards.h" -namespace Core::Network::Packets::Server +namespace Sapphire::Network::Packets::Server { /** diff --git a/src/servers/sapphire_zone/Network/PacketWrappers/ModelEquipPacket.h b/src/servers/sapphire_zone/Network/PacketWrappers/ModelEquipPacket.h index 1cbed7b7..76fcda43 100644 --- a/src/servers/sapphire_zone/Network/PacketWrappers/ModelEquipPacket.h +++ b/src/servers/sapphire_zone/Network/PacketWrappers/ModelEquipPacket.h @@ -5,7 +5,7 @@ #include "Actor/Player.h" #include "Forwards.h" -namespace Core::Network::Packets::Server +namespace Sapphire::Network::Packets::Server { /** diff --git a/src/servers/sapphire_zone/Network/PacketWrappers/MoveActorPacket.h b/src/servers/sapphire_zone/Network/PacketWrappers/MoveActorPacket.h index eb228045..7a3f05a7 100644 --- a/src/servers/sapphire_zone/Network/PacketWrappers/MoveActorPacket.h +++ b/src/servers/sapphire_zone/Network/PacketWrappers/MoveActorPacket.h @@ -8,7 +8,7 @@ #include "Forwards.h" -namespace Core::Network::Packets::Server +namespace Sapphire::Network::Packets::Server { /** diff --git a/src/servers/sapphire_zone/Network/PacketWrappers/NpcSpawnPacket.h b/src/servers/sapphire_zone/Network/PacketWrappers/NpcSpawnPacket.h index 5b538b36..7975ac87 100644 --- a/src/servers/sapphire_zone/Network/PacketWrappers/NpcSpawnPacket.h +++ b/src/servers/sapphire_zone/Network/PacketWrappers/NpcSpawnPacket.h @@ -10,7 +10,7 @@ #include "Inventory/Item.h" #include "StatusEffect/StatusEffect.h" -namespace Core::Network::Packets::Server +namespace Sapphire::Network::Packets::Server { /** @@ -106,7 +106,7 @@ namespace Core::Network::Packets::Server //m_data.unknown_61 = 7; - uint64_t currentTimeMs = Core::Util::getTimeMs(); + uint64_t currentTimeMs = Sapphire::Util::getTimeMs(); for( auto const& effect : bnpc.getStatusEffectMap() ) { diff --git a/src/servers/sapphire_zone/Network/PacketWrappers/PingPacket.h b/src/servers/sapphire_zone/Network/PacketWrappers/PingPacket.h index 44330d62..50c77337 100644 --- a/src/servers/sapphire_zone/Network/PacketWrappers/PingPacket.h +++ b/src/servers/sapphire_zone/Network/PacketWrappers/PingPacket.h @@ -5,7 +5,7 @@ #include "Forwards.h" -namespace Core::Network::Packets::Server +namespace Sapphire::Network::Packets::Server { /** diff --git a/src/servers/sapphire_zone/Network/PacketWrappers/PlayerSpawnPacket.h b/src/servers/sapphire_zone/Network/PacketWrappers/PlayerSpawnPacket.h index 36c4cabd..2e871336 100644 --- a/src/servers/sapphire_zone/Network/PacketWrappers/PlayerSpawnPacket.h +++ b/src/servers/sapphire_zone/Network/PacketWrappers/PlayerSpawnPacket.h @@ -9,7 +9,7 @@ #include "Inventory/Item.h" #include "StatusEffect/StatusEffect.h" -namespace Core::Network::Packets::Server +namespace Sapphire::Network::Packets::Server { /** @@ -97,22 +97,22 @@ namespace Core::Network::Packets::Server m_data.displayFlags |= static_cast< uint16_t >( Common::DisplayFlags::Invisible ); } - if( player.getEquipDisplayFlags() & Core::Common::EquipDisplayFlags::HideHead ) + if( player.getEquipDisplayFlags() & Sapphire::Common::EquipDisplayFlags::HideHead ) { m_data.displayFlags |= static_cast< uint16_t >( Common::DisplayFlags::HideHead ); } - if( player.getEquipDisplayFlags() & Core::Common::EquipDisplayFlags::HideWeapon ) + if( player.getEquipDisplayFlags() & Sapphire::Common::EquipDisplayFlags::HideWeapon ) { m_data.displayFlags |= static_cast< uint16_t >( Common::DisplayFlags::HideWeapon ); } - if( player.getEquipDisplayFlags() & Core::Common::EquipDisplayFlags::Visor ) + if( player.getEquipDisplayFlags() & Sapphire::Common::EquipDisplayFlags::Visor ) { m_data.displayFlags |= static_cast< uint16_t >( Common::DisplayFlags::Visor ); } - if( !( player.getEquipDisplayFlags() & Core::Common::EquipDisplayFlags::HideLegacyMark ) ) + if( !( player.getEquipDisplayFlags() & Sapphire::Common::EquipDisplayFlags::HideLegacyMark ) ) { m_data.look[ 0xC ] = m_data.look[ 0xC ] | 1 << 7; } @@ -127,7 +127,7 @@ namespace Core::Network::Packets::Server //m_data.unknown_60 = 3; //m_data.unknown_61 = 7; - uint64_t currentTimeMs = Core::Util::getTimeMs(); + uint64_t currentTimeMs = Sapphire::Util::getTimeMs(); for( auto const& effect : player.getStatusEffectMap() ) { diff --git a/src/servers/sapphire_zone/Network/PacketWrappers/PlayerStateFlagsPacket.h b/src/servers/sapphire_zone/Network/PacketWrappers/PlayerStateFlagsPacket.h index e7ce2c8f..f68fb69f 100644 --- a/src/servers/sapphire_zone/Network/PacketWrappers/PlayerStateFlagsPacket.h +++ b/src/servers/sapphire_zone/Network/PacketWrappers/PlayerStateFlagsPacket.h @@ -5,7 +5,7 @@ #include "Actor/Player.h" #include "Forwards.h" -namespace Core::Network::Packets::Server +namespace Sapphire::Network::Packets::Server { /** diff --git a/src/servers/sapphire_zone/Network/PacketWrappers/QuestMessagePacket.h b/src/servers/sapphire_zone/Network/PacketWrappers/QuestMessagePacket.h index 059b5596..d00a9cf1 100644 --- a/src/servers/sapphire_zone/Network/PacketWrappers/QuestMessagePacket.h +++ b/src/servers/sapphire_zone/Network/PacketWrappers/QuestMessagePacket.h @@ -5,7 +5,7 @@ #include "Actor/Player.h" #include "Forwards.h" -namespace Core::Network::Packets::Server +namespace Sapphire::Network::Packets::Server { /** diff --git a/src/servers/sapphire_zone/Network/PacketWrappers/ServerNoticePacket.h b/src/servers/sapphire_zone/Network/PacketWrappers/ServerNoticePacket.h index 933cce0e..ccf10662 100644 --- a/src/servers/sapphire_zone/Network/PacketWrappers/ServerNoticePacket.h +++ b/src/servers/sapphire_zone/Network/PacketWrappers/ServerNoticePacket.h @@ -5,7 +5,7 @@ #include #include "Forwards.h" -namespace Core::Network::Packets::Server +namespace Sapphire::Network::Packets::Server { /** diff --git a/src/servers/sapphire_zone/Network/PacketWrappers/UpdateHpMpTpPacket.h b/src/servers/sapphire_zone/Network/PacketWrappers/UpdateHpMpTpPacket.h index 64957ce7..54d8e349 100644 --- a/src/servers/sapphire_zone/Network/PacketWrappers/UpdateHpMpTpPacket.h +++ b/src/servers/sapphire_zone/Network/PacketWrappers/UpdateHpMpTpPacket.h @@ -5,7 +5,7 @@ #include #include "Forwards.h" -namespace Core::Network::Packets::Server +namespace Sapphire::Network::Packets::Server { /** diff --git a/src/servers/sapphire_zone/Network/PacketWrappers/UpdateInventorySlotPacket.h b/src/servers/sapphire_zone/Network/PacketWrappers/UpdateInventorySlotPacket.h index 289e0b05..312b7abf 100644 --- a/src/servers/sapphire_zone/Network/PacketWrappers/UpdateInventorySlotPacket.h +++ b/src/servers/sapphire_zone/Network/PacketWrappers/UpdateInventorySlotPacket.h @@ -6,7 +6,7 @@ #include "Inventory/Item.h" #include "Forwards.h" -namespace Core::Network::Packets::Server +namespace Sapphire::Network::Packets::Server { /** diff --git a/src/servers/sapphire_zone/Script/NativeScriptApi.cpp b/src/servers/sapphire_zone/Script/NativeScriptApi.cpp index e4dc2e7e..49b78d9f 100644 --- a/src/servers/sapphire_zone/Script/NativeScriptApi.cpp +++ b/src/servers/sapphire_zone/Script/NativeScriptApi.cpp @@ -11,7 +11,7 @@ #define EXPORT __attribute__((visibility("default"))) #endif -using namespace Core; +using namespace Sapphire; namespace Sapphire::ScriptAPI { @@ -31,13 +31,13 @@ namespace Sapphire::ScriptAPI return m_type; } - void ScriptObject::setFramework( Core::Framework* fw ) + void ScriptObject::setFramework( Sapphire::Framework* fw ) { assert( fw ); m_framework = fw; } - Core::Framework* ScriptObject::getFramework() const + Sapphire::Framework* ScriptObject::getFramework() const { return m_framework; } @@ -96,7 +96,7 @@ namespace Sapphire::ScriptAPI { } - void ActionScript::onInterrupt( Entity::Chara& sourceActor/*, Core::Entity::Chara targetActor*/ ) + void ActionScript::onInterrupt( Entity::Chara& sourceActor/*, Sapphire::Entity::Chara targetActor*/ ) { } @@ -174,8 +174,8 @@ namespace Sapphire::ScriptAPI { } - void InstanceContentScript::onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1, - uint16_t param2 ) + void InstanceContentScript::onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, + uint16_t param1, uint16_t param2 ) { } diff --git a/src/servers/sapphire_zone/Script/NativeScriptApi.h b/src/servers/sapphire_zone/Script/NativeScriptApi.h index d96f3022..05329528 100644 --- a/src/servers/sapphire_zone/Script/NativeScriptApi.h +++ b/src/servers/sapphire_zone/Script/NativeScriptApi.h @@ -10,7 +10,7 @@ #define EXPORT __attribute__((visibility("default"))) #endif -namespace Core +namespace Sapphire { class Framework; } @@ -26,7 +26,7 @@ namespace Sapphire::ScriptAPI uint32_t m_id; std::size_t m_type; - Core::Framework* m_framework; + Sapphire::Framework* m_framework; public: /*! @@ -54,14 +54,14 @@ namespace Sapphire::ScriptAPI * * @param fw The ptr to g_fw (Core::Framework) */ - virtual void setFramework( Core::Framework* fw ); + 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 Core::Framework* getFramework() const; + virtual Sapphire::Framework* getFramework() const; }; @@ -78,28 +78,28 @@ namespace Sapphire::ScriptAPI * * @param actor the actor the status effect is ticking on */ - virtual void onTick( Core::Entity::Chara& actor ); + virtual void onTick( Sapphire::Entity::Chara& actor ); /*! * @brief Called when the status effect is applied to an actor * * @param actor the actor on which the status effect was applied to */ - virtual void onApply( Core::Entity::Chara& actor ); + virtual void onApply( Sapphire::Entity::Chara& actor ); /*! * @brief Called when the actor (usually a player) removes the status effect by right clicking it * * @param actor The actor on which the effect was removed from */ - virtual void onRemove( Core::Entity::Chara& actor ); + virtual void onRemove( Sapphire::Entity::Chara& actor ); /*! * @brief Called when the status effect expires * * @param actor The actor on which the efect expired on */ - virtual void onExpire( Core::Entity::Chara& actor ); + virtual void onExpire( Sapphire::Entity::Chara& actor ); /*! * @brief Called when the player with the status effect collides with another player, eg. hot potato @@ -107,28 +107,28 @@ namespace Sapphire::ScriptAPI * @param actor The actor which has status effect * @param actorHit The actor who collided with the status effect owner */ - virtual void onPlayerCollision( Core::Entity::Chara& actor, Core::Entity::Chara& actorHit ); + virtual void onPlayerCollision( Sapphire::Entity::Chara& actor, Sapphire::Entity::Chara& actorHit ); /*! * @brief Called when the owner finishes a cast * * @param actor The actor who finished a cast */ - virtual void onPlayerFinishCast( Core::Entity::Chara& actor ); + virtual void onPlayerFinishCast( Sapphire::Entity::Chara& actor ); /*! * @brief Called when the status effect owner was damaged * * @param actor The actor that was damaged */ - virtual void onPlayerDamaged( Core::Entity::Chara& actor ); + virtual void onPlayerDamaged( Sapphire::Entity::Chara& actor ); /*! * @brief Called when the status effect owner dies * * @param actor The actor that died */ - virtual void onPlayerDeath( Core::Entity::Chara& actor ); + virtual void onPlayerDeath( Sapphire::Entity::Chara& actor ); }; @@ -140,11 +140,11 @@ namespace Sapphire::ScriptAPI public: explicit ActionScript( uint32_t abilityId ); - virtual void onStart( Core::Entity::Chara& sourceActor, Core::Entity::Chara& targetActor ); + virtual void onStart( Sapphire::Entity::Chara& sourceActor, Sapphire::Entity::Chara& targetActor ); - virtual void onCastFinish( Core::Entity::Player& player, Core::Entity::Chara& targetActor ); + virtual void onCastFinish( Sapphire::Entity::Player& player, Sapphire::Entity::Chara& targetActor ); - virtual void onInterrupt( Core::Entity::Chara& sourceActor/*, Core::Entity::Chara targetActor*/ ); + virtual void onInterrupt( Sapphire::Entity::Chara& sourceActor/*, Sapphire::Entity::Chara targetActor*/ ); }; /*! @@ -155,7 +155,7 @@ namespace Sapphire::ScriptAPI { protected: template< typename Ret, class Obj > - inline std::function< void( Core::Entity::Player& ) > bindScene( Ret ( Obj::*f )( Core::Entity::Player& ) ) + inline std::function< void( Sapphire::Entity::Player& ) > bindScene( Ret ( Obj::*f )( Sapphire::Entity::Player& ) ) { return std::bind( f, static_cast< Obj* >( this ), std::placeholders::_1 ); } @@ -163,22 +163,22 @@ namespace Sapphire::ScriptAPI public: explicit EventScript( uint32_t questId ); - virtual void onTalk( uint32_t eventId, Core::Entity::Player& player, uint64_t actorId ); + virtual void onTalk( uint32_t eventId, Sapphire::Entity::Player& player, uint64_t actorId ); - virtual void onNpcKill( uint32_t npcId, Core::Entity::Player& player ); + virtual void onNpcKill( uint32_t npcId, Sapphire::Entity::Player& player ); - virtual void onEmote( uint64_t actorId, uint32_t eventId, uint32_t emoteId, Core::Entity::Player& player ); + virtual void onEmote( uint64_t actorId, uint32_t eventId, uint32_t emoteId, Sapphire::Entity::Player& player ); - virtual void onEnterTerritory( Core::Entity::Player& player, uint32_t eventId, uint16_t param1, uint16_t param2 ); + virtual void onEnterTerritory( Sapphire::Entity::Player& player, uint32_t eventId, uint16_t param1, uint16_t param2 ); - virtual void onWithinRange( Core::Entity::Player& player, uint32_t eventId, uint32_t param1, float x, float y, float z ); + virtual void onWithinRange( Sapphire::Entity::Player& player, uint32_t eventId, uint32_t param1, float x, float y, float z ); - virtual void onOutsideRange( Core::Entity::Player& player, uint32_t eventId, uint32_t param1, float x, float y, float z ); + virtual void onOutsideRange( Sapphire::Entity::Player& player, uint32_t eventId, uint32_t param1, float x, float y, float z ); virtual void - onEventItem( Core::Entity::Player& player, uint32_t eventItemId, uint32_t eventId, uint32_t castTime, uint64_t targetId ); + onEventItem( Sapphire::Entity::Player& player, uint32_t eventItemId, uint32_t eventId, uint32_t castTime, uint64_t targetId ); - virtual void onEventHandlerTradeReturn( Core::Entity::Player& player, uint32_t eventId, uint16_t subEvent, uint16_t param, + virtual void onEventHandlerTradeReturn( Sapphire::Entity::Player& player, uint32_t eventId, uint16_t subEvent, uint16_t param, uint32_t catalogId ); }; @@ -211,11 +211,11 @@ namespace Sapphire::ScriptAPI public: explicit InstanceContentScript( uint32_t instanceContentId ); - virtual void onInit( Core::InstanceContentPtr instance ); + virtual void onInit( Sapphire::InstanceContentPtr instance ); - virtual void onUpdate( Core::InstanceContentPtr instance, uint32_t currTime ); + virtual void onUpdate( Sapphire::InstanceContentPtr instance, uint32_t currTime ); - virtual void onEnterTerritory( Core::InstanceContentPtr instance, Core::Entity::Player& player, uint32_t eventId, + virtual void onEnterTerritory( Sapphire::InstanceContentPtr instance, Sapphire::Entity::Player& player, uint32_t eventId, uint16_t param1, uint16_t param2 ); }; diff --git a/src/servers/sapphire_zone/Script/NativeScriptMgr.cpp b/src/servers/sapphire_zone/Script/NativeScriptMgr.cpp index d7bd0139..9acdab8c 100644 --- a/src/servers/sapphire_zone/Script/NativeScriptMgr.cpp +++ b/src/servers/sapphire_zone/Script/NativeScriptMgr.cpp @@ -4,128 +4,128 @@ #include "Framework.h" -extern Core::Framework g_fw; +extern Sapphire::Framework g_fw; -namespace Core { -namespace Scripting { - -bool NativeScriptMgr::loadScript( const std::string& path ) +namespace Sapphire::Scripting { - auto module = m_loader.loadModule( path ); - if( !module ) - return false; - auto scripts = m_loader.getScripts( module->handle ); - if( !scripts ) + bool NativeScriptMgr::loadScript( const std::string& path ) { - m_loader.unloadScript( module ); - return false; + auto module = m_loader.loadModule( path ); + if( !module ) + return false; + + auto scripts = m_loader.getScripts( module->handle ); + if( !scripts ) + { + m_loader.unloadScript( module ); + return false; + } + + // + bool success = false; + + for( int i = 0;; i++ ) + { + if( scripts[ i ] == nullptr ) + break; + + auto script = scripts[ i ]; + module->scripts.push_back( script ); + + script->setFramework( &g_fw ); + + m_scripts[ script->getType() ][ script->getId() ] = script; + + success = true; + } + + if( !success ) + { + m_loader.unloadScript( module->handle ); + return false; + } + + return true; } - // - bool success = false; - - for( int i = 0;; i++ ) + const std::string NativeScriptMgr::getModuleExtension() { - if( scripts[ i ] == nullptr ) - break; - - auto script = scripts[ i ]; - module->scripts.push_back( script ); - - script->setFramework( &g_fw ); - - m_scripts[ script->getType() ][ script->getId() ] = script; - - success = true; + return m_loader.getModuleExtension(); } - if( !success ) + bool NativeScriptMgr::unloadScript( const std::string& name ) { - m_loader.unloadScript( module->handle ); - return false; + auto info = m_loader.getScriptInfo( name ); + if( !info ) + return false; + + return unloadScript( info ); } - return true; -} - -const std::string NativeScriptMgr::getModuleExtension() -{ - return m_loader.getModuleExtension(); -} - -bool NativeScriptMgr::unloadScript( const std::string& name ) -{ - auto info = m_loader.getScriptInfo( name ); - if( !info ) - return false; - - return unloadScript( info ); -} - -bool NativeScriptMgr::unloadScript( ScriptInfo* info ) -{ - for( auto& script : info->scripts ) + bool NativeScriptMgr::unloadScript( ScriptInfo* info ) { - m_scripts[ script->getType() ].erase( script->getId() ); + for( auto& script : info->scripts ) + { + m_scripts[ script->getType() ].erase( script->getId() ); - delete script; + delete script; + } + + return m_loader.unloadScript( info ); } - return m_loader.unloadScript( info ); -} - -void NativeScriptMgr::queueScriptReload( const std::string& name ) -{ - auto info = m_loader.getScriptInfo( name ); - if( !info ) - return; - - // backup actual lib path - std::string libPath( info->library_path ); - - if( !unloadScript( info ) ) - return; - - m_scriptLoadQueue.push( libPath ); -} - -void NativeScriptMgr::processLoadQueue() -{ - std::vector< std::string > deferredLoads; - - while( !m_scriptLoadQueue.empty() ) + void NativeScriptMgr::queueScriptReload( const std::string& name ) { - auto item = m_scriptLoadQueue.front(); + auto info = m_loader.getScriptInfo( name ); + if( !info ) + return; - // if it fails, we defer the loading to the next tick - if( !loadScript( item ) ) - deferredLoads.push_back( item ); + // backup actual lib path + std::string libPath( info->library_path ); - m_scriptLoadQueue.pop(); + if( !unloadScript( info ) ) + return; + + m_scriptLoadQueue.push( libPath ); } - if( !deferredLoads.empty() ) + void NativeScriptMgr::processLoadQueue() { - for( auto& item : deferredLoads ) - m_scriptLoadQueue.push( item ); + std::vector< std::string > deferredLoads; + + while( !m_scriptLoadQueue.empty() ) + { + auto item = m_scriptLoadQueue.front(); + + // if it fails, we defer the loading to the next tick + if( !loadScript( item ) ) + deferredLoads.push_back( item ); + + m_scriptLoadQueue.pop(); + } + + if( !deferredLoads.empty() ) + { + for( auto& item : deferredLoads ) + m_scriptLoadQueue.push( item ); + } + } + + void NativeScriptMgr::findScripts( std::set< Sapphire::Scripting::ScriptInfo* >& scripts, const std::string& search ) + { + return m_loader.findScripts( scripts, search ); + } + + bool NativeScriptMgr::isModuleLoaded( const std::string& name ) + { + return m_loader.isModuleLoaded( name ); + } + + + std::shared_ptr< NativeScriptMgr > createNativeScriptMgr() + { + return std::make_shared< NativeScriptMgr >(); } } -void NativeScriptMgr::findScripts( std::set< Core::Scripting::ScriptInfo* >& scripts, const std::string& search ) -{ - return m_loader.findScripts( scripts, search ); -} - -bool NativeScriptMgr::isModuleLoaded( const std::string& name ) -{ - return m_loader.isModuleLoaded( name ); -} - - -std::shared_ptr< NativeScriptMgr > createNativeScriptMgr() -{ - return std::make_shared< NativeScriptMgr >(); -} -} -} diff --git a/src/servers/sapphire_zone/Script/NativeScriptMgr.h b/src/servers/sapphire_zone/Script/NativeScriptMgr.h index 5d326cef..6cfec934 100644 --- a/src/servers/sapphire_zone/Script/NativeScriptMgr.h +++ b/src/servers/sapphire_zone/Script/NativeScriptMgr.h @@ -7,7 +7,7 @@ #include "ScriptLoader.h" -namespace Core::Scripting +namespace Sapphire::Scripting { /*! @@ -76,7 +76,7 @@ namespace Core::Scripting * @param scripts a set of ScriptInfo ptrs * @param search the search term */ - void findScripts( std::set< Core::Scripting::ScriptInfo* >& scripts, const std::string& search ); + void findScripts( std::set< Sapphire::Scripting::ScriptInfo* >& scripts, const std::string& search ); /*! * @brief Called on a regular interval, allows for scripts to be loaded from the internal load queue. diff --git a/src/servers/sapphire_zone/Script/ScriptInfo.h b/src/servers/sapphire_zone/Script/ScriptInfo.h index 2632c762..becec5f9 100644 --- a/src/servers/sapphire_zone/Script/ScriptInfo.h +++ b/src/servers/sapphire_zone/Script/ScriptInfo.h @@ -15,7 +15,7 @@ using ModuleHandle = HMODULE; using ModuleHandle = void*; #endif -namespace Core::Scripting +namespace Sapphire::Scripting { /*! diff --git a/src/servers/sapphire_zone/Script/ScriptLoader.cpp b/src/servers/sapphire_zone/Script/ScriptLoader.cpp index ec0f7966..c68083ea 100644 --- a/src/servers/sapphire_zone/Script/ScriptLoader.cpp +++ b/src/servers/sapphire_zone/Script/ScriptLoader.cpp @@ -9,11 +9,11 @@ #include "Framework.h" -extern Core::Framework g_fw; +extern Sapphire::Framework g_fw; namespace fs = std::experimental::filesystem; -const std::string Core::Scripting::ScriptLoader::getModuleExtension() +const std::string Sapphire::Scripting::ScriptLoader::getModuleExtension() { #ifdef _WIN32 return ".dll"; @@ -24,7 +24,7 @@ const std::string Core::Scripting::ScriptLoader::getModuleExtension() #endif } -bool Core::Scripting::ScriptLoader::unloadModule( ModuleHandle handle ) +bool Sapphire::Scripting::ScriptLoader::unloadModule( ModuleHandle handle ) { #ifdef _WIN32 bool success = FreeLibrary( handle ) != 0; @@ -46,7 +46,7 @@ bool Core::Scripting::ScriptLoader::unloadModule( ModuleHandle handle ) return true; } -Core::Scripting::ScriptInfo* Core::Scripting::ScriptLoader::loadModule( const std::string& path ) +Sapphire::Scripting::ScriptInfo* Sapphire::Scripting::ScriptLoader::loadModule( const std::string& path ) { auto pLog = g_fw.get< Logger >(); auto pConfig = g_fw.get< ConfigMgr >(); @@ -101,7 +101,7 @@ Core::Scripting::ScriptInfo* Core::Scripting::ScriptLoader::loadModule( const st return info; } -Sapphire::ScriptAPI::ScriptObject** Core::Scripting::ScriptLoader::getScripts( ModuleHandle handle ) +Sapphire::ScriptAPI::ScriptObject** Sapphire::Scripting::ScriptLoader::getScripts( ModuleHandle handle ) { using getScripts = Sapphire::ScriptAPI::ScriptObject** ( * )(); auto pLog = g_fw.get< Logger >(); @@ -122,12 +122,12 @@ Sapphire::ScriptAPI::ScriptObject** Core::Scripting::ScriptLoader::getScripts( M return nullptr; } -bool Core::Scripting::ScriptLoader::unloadScript( Core::Scripting::ScriptInfo* info ) +bool Sapphire::Scripting::ScriptLoader::unloadScript( Sapphire::Scripting::ScriptInfo* info ) { return unloadScript( info->handle ); } -bool Core::Scripting::ScriptLoader::unloadScript( ModuleHandle handle ) +bool Sapphire::Scripting::ScriptLoader::unloadScript( ModuleHandle handle ) { auto pLog = g_fw.get< Logger >(); for( auto it = m_scriptMap.begin(); it != m_scriptMap.end(); ++it ) @@ -157,7 +157,7 @@ bool Core::Scripting::ScriptLoader::unloadScript( ModuleHandle handle ) return false; } -bool Core::Scripting::ScriptLoader::isModuleLoaded( std::string name ) +bool Sapphire::Scripting::ScriptLoader::isModuleLoaded( std::string name ) { for( auto it = m_scriptMap.begin(); it != m_scriptMap.end(); ++it ) { @@ -169,7 +169,7 @@ bool Core::Scripting::ScriptLoader::isModuleLoaded( std::string name ) return false; } -Core::Scripting::ScriptInfo* Core::Scripting::ScriptLoader::getScriptInfo( std::string name ) +Sapphire::Scripting::ScriptInfo* Sapphire::Scripting::ScriptLoader::getScriptInfo( std::string name ) { for( auto it = m_scriptMap.begin(); it != m_scriptMap.end(); ++it ) { @@ -182,7 +182,7 @@ Core::Scripting::ScriptInfo* Core::Scripting::ScriptLoader::getScriptInfo( std:: return nullptr; } -void Core::Scripting::ScriptLoader::findScripts( std::set< Core::Scripting::ScriptInfo* >& scripts, +void Sapphire::Scripting::ScriptLoader::findScripts( std::set< Sapphire::Scripting::ScriptInfo* >& scripts, const std::string& search ) { for( auto it = m_scriptMap.begin(); it != m_scriptMap.end(); ++it ) diff --git a/src/servers/sapphire_zone/Script/ScriptLoader.h b/src/servers/sapphire_zone/Script/ScriptLoader.h index 403556c8..c4c9677d 100644 --- a/src/servers/sapphire_zone/Script/ScriptLoader.h +++ b/src/servers/sapphire_zone/Script/ScriptLoader.h @@ -18,7 +18,7 @@ using ModuleHandle = HMODULE; using ModuleHandle = void*; #endif -namespace Core::Scripting +namespace Sapphire::Scripting { /*! @@ -102,7 +102,7 @@ namespace Core::Scripting * @param scripts a set of ScriptInfo ptrs * @param search the search term */ - void findScripts( std::set< Core::Scripting::ScriptInfo* >& scripts, const std::string& search ); + void findScripts( std::set< Sapphire::Scripting::ScriptInfo* >& scripts, const std::string& search ); }; } diff --git a/src/servers/sapphire_zone/Script/ScriptMgr.cpp b/src/servers/sapphire_zone/Script/ScriptMgr.cpp index 67d7fe40..b84c17c1 100644 --- a/src/servers/sapphire_zone/Script/ScriptMgr.cpp +++ b/src/servers/sapphire_zone/Script/ScriptMgr.cpp @@ -24,27 +24,27 @@ // enable the ambiguity fix for every platform to avoid #define nonsense #define WIN_AMBIGUITY_FIX -extern Core::Framework g_fw; +extern Sapphire::Framework g_fw; namespace fs = std::experimental::filesystem; -Core::Scripting::ScriptMgr::ScriptMgr() : +Sapphire::Scripting::ScriptMgr::ScriptMgr() : m_firstScriptChangeNotificiation( false ) { m_nativeScriptMgr = createNativeScriptMgr(); } -Core::Scripting::ScriptMgr::~ScriptMgr() +Sapphire::Scripting::ScriptMgr::~ScriptMgr() { Watchdog::unwatchAll(); } -void Core::Scripting::ScriptMgr::update() +void Sapphire::Scripting::ScriptMgr::update() { m_nativeScriptMgr->processLoadQueue(); } -bool Core::Scripting::ScriptMgr::init() +bool Sapphire::Scripting::ScriptMgr::init() { std::set< std::string > files; auto pConfig = g_fw.get< ConfigMgr >(); @@ -81,7 +81,7 @@ bool Core::Scripting::ScriptMgr::init() return true; } -void Core::Scripting::ScriptMgr::watchDirectories() +void Sapphire::Scripting::ScriptMgr::watchDirectories() { auto pConfig = g_fw.get< ConfigMgr >(); auto shouldWatch = pConfig->getValue< bool >( "Scripts", "HotSwap", true ); @@ -119,7 +119,7 @@ void Core::Scripting::ScriptMgr::watchDirectories() } ); } -bool Core::Scripting::ScriptMgr::loadDir( const std::string& dirname, std::set< std::string >& files, +bool Sapphire::Scripting::ScriptMgr::loadDir( const std::string& dirname, std::set< std::string >& files, const std::string& ext ) { @@ -153,7 +153,7 @@ bool Core::Scripting::ScriptMgr::loadDir( const std::string& dirname, std::set< } } -void Core::Scripting::ScriptMgr::onPlayerFirstEnterWorld( Entity::Player& player ) +void Sapphire::Scripting::ScriptMgr::onPlayerFirstEnterWorld( Entity::Player& player ) { // try // { @@ -166,7 +166,7 @@ void Core::Scripting::ScriptMgr::onPlayerFirstEnterWorld( Entity::Player& player // } } -bool Core::Scripting::ScriptMgr::onTalk( Entity::Player& player, uint64_t actorId, uint32_t eventId ) +bool Sapphire::Scripting::ScriptMgr::onTalk( Entity::Player& player, uint64_t actorId, uint32_t eventId ) { auto script = m_nativeScriptMgr->getScript< Sapphire::ScriptAPI::EventScript >( eventId ); if( script ) @@ -187,7 +187,7 @@ bool Core::Scripting::ScriptMgr::onTalk( Entity::Player& player, uint64_t actorI return false; } -bool Core::Scripting::ScriptMgr::onEnterTerritory( Entity::Player& player, uint32_t eventId, +bool Sapphire::Scripting::ScriptMgr::onEnterTerritory( Entity::Player& player, uint32_t eventId, uint16_t param1, uint16_t param2 ) { auto script = m_nativeScriptMgr->getScript< Sapphire::ScriptAPI::EventScript >( eventId ); @@ -197,7 +197,7 @@ bool Core::Scripting::ScriptMgr::onEnterTerritory( Entity::Player& player, uint3 return true; } -bool Core::Scripting::ScriptMgr::onWithinRange( Entity::Player& player, uint32_t eventId, uint32_t param1, +bool Sapphire::Scripting::ScriptMgr::onWithinRange( Entity::Player& player, uint32_t eventId, uint32_t param1, float x, float y, float z ) { auto script = m_nativeScriptMgr->getScript< Sapphire::ScriptAPI::EventScript >( eventId ); @@ -207,7 +207,7 @@ bool Core::Scripting::ScriptMgr::onWithinRange( Entity::Player& player, uint32_t return true; } -bool Core::Scripting::ScriptMgr::onOutsideRange( Entity::Player& player, uint32_t eventId, uint32_t param1, +bool Sapphire::Scripting::ScriptMgr::onOutsideRange( Entity::Player& player, uint32_t eventId, uint32_t param1, float x, float y, float z ) { auto script = m_nativeScriptMgr->getScript< Sapphire::ScriptAPI::EventScript >( eventId ); @@ -217,7 +217,7 @@ bool Core::Scripting::ScriptMgr::onOutsideRange( Entity::Player& player, uint32_ return true; } -bool Core::Scripting::ScriptMgr::onEmote( Entity::Player& player, uint64_t actorId, +bool Sapphire::Scripting::ScriptMgr::onEmote( Entity::Player& player, uint64_t actorId, uint32_t eventId, uint8_t emoteId ) { auto script = m_nativeScriptMgr->getScript< Sapphire::ScriptAPI::EventScript >( eventId ); @@ -227,7 +227,7 @@ bool Core::Scripting::ScriptMgr::onEmote( Entity::Player& player, uint64_t actor return true; } -bool Core::Scripting::ScriptMgr::onEventHandlerReturn( Entity::Player& player, uint32_t eventId, +bool Sapphire::Scripting::ScriptMgr::onEventHandlerReturn( Entity::Player& player, uint32_t eventId, uint16_t subEvent, uint16_t param1, uint16_t param2, uint16_t param3 ) { @@ -235,7 +235,7 @@ bool Core::Scripting::ScriptMgr::onEventHandlerReturn( Entity::Player& player, u return false; } -bool Core::Scripting::ScriptMgr::onEventHandlerTradeReturn( Entity::Player& player, uint32_t eventId, +bool Sapphire::Scripting::ScriptMgr::onEventHandlerTradeReturn( Entity::Player& player, uint32_t eventId, uint16_t subEvent, uint16_t param, uint32_t catalogId ) { auto script = m_nativeScriptMgr->getScript< Sapphire::ScriptAPI::EventScript >( eventId ); @@ -248,7 +248,7 @@ bool Core::Scripting::ScriptMgr::onEventHandlerTradeReturn( Entity::Player& play return false; } -bool Core::Scripting::ScriptMgr::onEventItem( Entity::Player& player, uint32_t eventItemId, +bool Sapphire::Scripting::ScriptMgr::onEventItem( Entity::Player& player, uint32_t eventItemId, uint32_t eventId, uint32_t castTime, uint64_t targetId ) { std::string eventName = "onEventItem"; @@ -267,7 +267,7 @@ bool Core::Scripting::ScriptMgr::onEventItem( Entity::Player& player, uint32_t e return false; } -bool Core::Scripting::ScriptMgr::onMobKill( Entity::Player& player, uint16_t nameId ) +bool Sapphire::Scripting::ScriptMgr::onMobKill( Entity::Player& player, uint16_t nameId ) { std::string eventName = "onBnpcKill_" + std::to_string( nameId ); @@ -295,7 +295,7 @@ bool Core::Scripting::ScriptMgr::onMobKill( Entity::Player& player, uint16_t nam return true; } -bool Core::Scripting::ScriptMgr::onCastFinish( Entity::Player& player, Entity::CharaPtr pTarget, uint32_t actionId ) +bool Sapphire::Scripting::ScriptMgr::onCastFinish( Entity::Player& player, Entity::CharaPtr pTarget, uint32_t actionId ) { auto script = m_nativeScriptMgr->getScript< Sapphire::ScriptAPI::ActionScript >( actionId ); @@ -304,7 +304,7 @@ bool Core::Scripting::ScriptMgr::onCastFinish( Entity::Player& player, Entity::C return true; } -bool Core::Scripting::ScriptMgr::onStatusReceive( Entity::CharaPtr pActor, uint32_t effectId ) +bool Sapphire::Scripting::ScriptMgr::onStatusReceive( Entity::CharaPtr pActor, uint32_t effectId ) { auto script = m_nativeScriptMgr->getScript< Sapphire::ScriptAPI::StatusEffectScript >( effectId ); @@ -320,7 +320,7 @@ bool Core::Scripting::ScriptMgr::onStatusReceive( Entity::CharaPtr pActor, uint3 return false; } -bool Core::Scripting::ScriptMgr::onStatusTick( Entity::CharaPtr pChara, Core::StatusEffect::StatusEffect& effect ) +bool Sapphire::Scripting::ScriptMgr::onStatusTick( Entity::CharaPtr pChara, Sapphire::StatusEffect::StatusEffect& effect ) { auto script = m_nativeScriptMgr->getScript< Sapphire::ScriptAPI::StatusEffectScript >( effect.getId() ); if( script ) @@ -335,7 +335,7 @@ bool Core::Scripting::ScriptMgr::onStatusTick( Entity::CharaPtr pChara, Core::St return false; } -bool Core::Scripting::ScriptMgr::onStatusTimeOut( Entity::CharaPtr pChara, uint32_t effectId ) +bool Sapphire::Scripting::ScriptMgr::onStatusTimeOut( Entity::CharaPtr pChara, uint32_t effectId ) { auto script = m_nativeScriptMgr->getScript< Sapphire::ScriptAPI::StatusEffectScript >( effectId ); if( script ) @@ -350,7 +350,7 @@ bool Core::Scripting::ScriptMgr::onStatusTimeOut( Entity::CharaPtr pChara, uint3 return false; } -bool Core::Scripting::ScriptMgr::onZoneInit( ZonePtr pZone ) +bool Sapphire::Scripting::ScriptMgr::onZoneInit( ZonePtr pZone ) { auto script = m_nativeScriptMgr->getScript< Sapphire::ScriptAPI::ZoneScript >( pZone->getTerritoryTypeId() ); if( script ) @@ -362,7 +362,7 @@ bool Core::Scripting::ScriptMgr::onZoneInit( ZonePtr pZone ) return false; } -bool Core::Scripting::ScriptMgr::onInstanceInit( InstanceContentPtr instance ) +bool Sapphire::Scripting::ScriptMgr::onInstanceInit( InstanceContentPtr instance ) { auto script = m_nativeScriptMgr->getScript< Sapphire::ScriptAPI::InstanceContentScript >( instance->getDirectorId() ); if( script ) @@ -374,7 +374,7 @@ bool Core::Scripting::ScriptMgr::onInstanceInit( InstanceContentPtr instance ) return false; } -bool Core::Scripting::ScriptMgr::onInstanceUpdate( InstanceContentPtr instance, uint32_t currTime ) +bool Sapphire::Scripting::ScriptMgr::onInstanceUpdate( InstanceContentPtr instance, uint32_t currTime ) { auto script = m_nativeScriptMgr->getScript< Sapphire::ScriptAPI::InstanceContentScript >( instance->getDirectorId() ); @@ -387,7 +387,7 @@ bool Core::Scripting::ScriptMgr::onInstanceUpdate( InstanceContentPtr instance, return false; } -bool Core::Scripting::ScriptMgr::onInstanceEnterTerritory( InstanceContentPtr instance, Entity::Player& player, +bool Sapphire::Scripting::ScriptMgr::onInstanceEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1, uint16_t param2 ) { auto script = m_nativeScriptMgr->getScript< Sapphire::ScriptAPI::InstanceContentScript >( instance->getDirectorId() ); @@ -400,7 +400,7 @@ bool Core::Scripting::ScriptMgr::onInstanceEnterTerritory( InstanceContentPtr in return false; } -Core::Scripting::NativeScriptMgr& Core::Scripting::ScriptMgr::getNativeScriptHandler() +Sapphire::Scripting::NativeScriptMgr& Sapphire::Scripting::ScriptMgr::getNativeScriptHandler() { return *m_nativeScriptMgr; } diff --git a/src/servers/sapphire_zone/Script/ScriptMgr.h b/src/servers/sapphire_zone/Script/ScriptMgr.h index 89b0ab2f..853fd7b9 100644 --- a/src/servers/sapphire_zone/Script/ScriptMgr.h +++ b/src/servers/sapphire_zone/Script/ScriptMgr.h @@ -8,7 +8,7 @@ #include #include "Forwards.h" -namespace Core::Scripting +namespace Sapphire::Scripting { class ScriptMgr @@ -73,7 +73,7 @@ namespace Core::Scripting bool onStatusReceive( Entity::CharaPtr pActor, uint32_t effectId ); - bool onStatusTick( Entity::CharaPtr pActor, Core::StatusEffect::StatusEffect& effect ); + bool onStatusTick( Entity::CharaPtr pActor, Sapphire::StatusEffect::StatusEffect& effect ); bool onStatusTimeOut( Entity::CharaPtr pActor, uint32_t effectId ); diff --git a/src/servers/sapphire_zone/ServerMgr.cpp b/src/servers/sapphire_zone/ServerMgr.cpp index 6f8f39b0..9870b975 100644 --- a/src/servers/sapphire_zone/ServerMgr.cpp +++ b/src/servers/sapphire_zone/ServerMgr.cpp @@ -26,9 +26,9 @@ #include "Script/ScriptMgr.h" #include "Linkshell/LinkshellMgr.h" -extern Core::Framework g_fw; +extern Sapphire::Framework g_fw; -Core::ServerMgr::ServerMgr( const std::string& configName ) : +Sapphire::ServerMgr::ServerMgr( const std::string& configName ) : m_configName( configName ), m_bRunning( true ), m_lastDBPingTime( 0 ), @@ -36,19 +36,19 @@ Core::ServerMgr::ServerMgr( const std::string& configName ) : { } -Core::ServerMgr::~ServerMgr() +Sapphire::ServerMgr::~ServerMgr() { } -size_t Core::ServerMgr::getSessionCount() const +size_t Sapphire::ServerMgr::getSessionCount() const { return m_sessionMapById.size(); } -bool Core::ServerMgr::loadSettings( int32_t argc, char* argv[] ) +bool Sapphire::ServerMgr::loadSettings( int32_t argc, char* argv[] ) { - auto pLog = g_fw.get< Core::Logger >(); - auto pConfig = g_fw.get< Core::ConfigMgr >(); + auto pLog = g_fw.get< Sapphire::Logger >(); + auto pConfig = g_fw.get< Sapphire::ConfigMgr >(); auto pExd = g_fw.get< Data::ExdDataGenerated >(); auto pDb = g_fw.get< Db::DbWorkerPool< Db::ZoneDbConnection > >(); @@ -122,9 +122,9 @@ bool Core::ServerMgr::loadSettings( int32_t argc, char* argv[] ) return false; } - Core::Db::DbLoader loader; + Sapphire::Db::DbLoader loader; - Core::Db::ConnectionInfo info; + Sapphire::Db::ConnectionInfo info; info.password = pConfig->getValue< std::string >( "Database", "Password", "" ); info.host = pConfig->getValue< std::string >( "Database", "Host", "127.0.0.1" ); info.database = pConfig->getValue< std::string >( "Database", "Database", "sapphire" ); @@ -143,9 +143,9 @@ bool Core::ServerMgr::loadSettings( int32_t argc, char* argv[] ) return true; } -void Core::ServerMgr::run( int32_t argc, char* argv[] ) +void Sapphire::ServerMgr::run( int32_t argc, char* argv[] ) { - auto pLog = g_fw.get< Core::Logger >(); + auto pLog = g_fw.get< Sapphire::Logger >(); auto pScript = g_fw.get< Scripting::ScriptMgr >(); auto pLsMgr = g_fw.get< LinkshellMgr >(); auto pTeriMgr = g_fw.get< TerritoryMgr >(); @@ -189,19 +189,19 @@ void Core::ServerMgr::run( int32_t argc, char* argv[] ) } -uint16_t Core::ServerMgr::getWorldId() const +uint16_t Sapphire::ServerMgr::getWorldId() const { return m_worldId; } -void Core::ServerMgr::setWorldId( uint16_t worldId ) +void Sapphire::ServerMgr::setWorldId( uint16_t worldId ) { m_worldId = worldId; } -void Core::ServerMgr::printBanner() const +void Sapphire::ServerMgr::printBanner() const { - auto pLog = g_fw.get< Core::Logger >(); + auto pLog = g_fw.get< Sapphire::Logger >(); pLog->info( "===========================================================" ); pLog->info( "Sapphire Server Project " ); @@ -211,7 +211,7 @@ void Core::ServerMgr::printBanner() const pLog->info( "===========================================================" ); } -void Core::ServerMgr::mainLoop() +void Sapphire::ServerMgr::mainLoop() { auto pLog = g_fw.get< Logger >(); auto pTeriMgr = g_fw.get< TerritoryMgr >(); @@ -292,9 +292,9 @@ void Core::ServerMgr::mainLoop() } } -bool Core::ServerMgr::createSession( uint32_t sessionId ) +bool Sapphire::ServerMgr::createSession( uint32_t sessionId ) { - auto pLog = g_fw.get< Core::Logger >(); + auto pLog = g_fw.get< Sapphire::Logger >(); std::lock_guard< std::mutex > lock( m_sessionMutex ); @@ -325,12 +325,12 @@ bool Core::ServerMgr::createSession( uint32_t sessionId ) } -void Core::ServerMgr::removeSession( uint32_t sessionId ) +void Sapphire::ServerMgr::removeSession( uint32_t sessionId ) { m_sessionMapById.erase( sessionId ); } -Core::SessionPtr Core::ServerMgr::getSession( uint32_t id ) +Sapphire::SessionPtr Sapphire::ServerMgr::getSession( uint32_t id ) { //std::lock_guard lock( m_sessionMutex ); @@ -342,7 +342,7 @@ Core::SessionPtr Core::ServerMgr::getSession( uint32_t id ) return nullptr; } -Core::SessionPtr Core::ServerMgr::getSession( const std::string& playerName ) +Sapphire::SessionPtr Sapphire::ServerMgr::getSession( const std::string& playerName ) { //std::lock_guard lock( m_sessionMutex ); @@ -354,18 +354,18 @@ Core::SessionPtr Core::ServerMgr::getSession( const std::string& playerName ) return nullptr; } -void Core::ServerMgr::removeSession( const std::string& playerName ) +void Sapphire::ServerMgr::removeSession( const std::string& playerName ) { m_sessionMapByName.erase( playerName ); } -bool Core::ServerMgr::isRunning() const +bool Sapphire::ServerMgr::isRunning() const { return m_bRunning; } -std::string Core::ServerMgr::getPlayerNameFromDb( uint32_t playerId, bool forceDbLoad ) +std::string Sapphire::ServerMgr::getPlayerNameFromDb( uint32_t playerId, bool forceDbLoad ) { if( !forceDbLoad ) { @@ -387,12 +387,12 @@ std::string Core::ServerMgr::getPlayerNameFromDb( uint32_t playerId, bool forceD return playerName; } -void Core::ServerMgr::updatePlayerName( uint32_t playerId, const std::string & playerNewName ) +void Sapphire::ServerMgr::updatePlayerName( uint32_t playerId, const std::string & playerNewName ) { m_playerNameMapById[ playerId ] = playerNewName; } -void Core::ServerMgr::loadBNpcTemplates() +void Sapphire::ServerMgr::loadBNpcTemplates() { auto pDb = g_fw.get< Db::DbWorkerPool< Db::ZoneDbConnection > >(); auto pTeriMgr = g_fw.get< TerritoryMgr >(); @@ -435,7 +435,7 @@ void Core::ServerMgr::loadBNpcTemplates() } -Core::Entity::BNpcTemplatePtr Core::ServerMgr::getBNpcTemplate( const std::string& key ) +Sapphire::Entity::BNpcTemplatePtr Sapphire::ServerMgr::getBNpcTemplate( const std::string& key ) { auto it = m_bNpcTemplateMap.find( key ); @@ -445,7 +445,7 @@ Core::Entity::BNpcTemplatePtr Core::ServerMgr::getBNpcTemplate( const std::strin return it->second; } -Core::Entity::BNpcTemplatePtr Core::ServerMgr::getBNpcTemplate( uint32_t id ) +Sapphire::Entity::BNpcTemplatePtr Sapphire::ServerMgr::getBNpcTemplate( uint32_t id ) { for( auto entry : m_bNpcTemplateMap ) { diff --git a/src/servers/sapphire_zone/ServerMgr.h b/src/servers/sapphire_zone/ServerMgr.h index efdb4870..75a22263 100644 --- a/src/servers/sapphire_zone/ServerMgr.h +++ b/src/servers/sapphire_zone/ServerMgr.h @@ -8,63 +8,64 @@ #include "ForwardsZone.h" -namespace Core { - -class ServerMgr +namespace Sapphire { -public: - ServerMgr( const std::string& configName ); - ~ServerMgr(); + class ServerMgr + { + public: + ServerMgr( const std::string& configName ); - void run( int32_t argc, char* argv[] ); + ~ServerMgr(); - bool createSession( uint32_t sessionId ); + void run( int32_t argc, char* argv[] ); - void removeSession( uint32_t sessionId ); - void removeSession( const std::string& playerName ); + bool createSession( uint32_t sessionId ); - SessionPtr getSession( uint32_t id ); - SessionPtr getSession( const std::string& playerName ); + void removeSession( uint32_t sessionId ); + void removeSession( const std::string& playerName ); - size_t getSessionCount() const; + SessionPtr getSession( uint32_t id ); + SessionPtr getSession( const std::string& playerName ); - uint16_t getWorldId() const; - void setWorldId( uint16_t worldId ); + size_t getSessionCount() const; - void mainLoop(); + uint16_t getWorldId() const; + void setWorldId( uint16_t worldId ); - bool isRunning() const; + void mainLoop(); - void printBanner() const; + bool isRunning() const; - bool loadSettings( int32_t argc, char* argv[] ); - void loadBNpcTemplates(); + void printBanner() const; - Entity::BNpcTemplatePtr getBNpcTemplate( const std::string& key ); - Entity::BNpcTemplatePtr getBNpcTemplate( uint32_t id ); + bool loadSettings( int32_t argc, char* argv[] ); + void loadBNpcTemplates(); - std::string getPlayerNameFromDb( uint32_t playerId, bool forceDbLoad = false ); - void updatePlayerName( uint32_t playerId, const std::string& playerNewName ); + Entity::BNpcTemplatePtr getBNpcTemplate( const std::string& key ); + Entity::BNpcTemplatePtr getBNpcTemplate( uint32_t id ); -private: - uint16_t m_port; - std::string m_ip; - int64_t m_lastDBPingTime; - bool m_bRunning; - uint16_t m_worldId; + std::string getPlayerNameFromDb( uint32_t playerId, bool forceDbLoad = false ); + void updatePlayerName( uint32_t playerId, const std::string& playerNewName ); - std::string m_configName; + private: + uint16_t m_port; + std::string m_ip; + int64_t m_lastDBPingTime; + bool m_bRunning; + uint16_t m_worldId; - std::mutex m_sessionMutex; + std::string m_configName; - std::map< uint32_t, SessionPtr > m_sessionMapById; - std::map< std::string, SessionPtr > m_sessionMapByName; - std::map< uint32_t, std::string > m_playerNameMapById; - std::map< uint32_t, uint32_t > m_zones; - std::map< std::string, Entity::BNpcTemplatePtr > m_bNpcTemplateMap; + std::mutex m_sessionMutex; -}; + std::map< uint32_t, SessionPtr > m_sessionMapById; + std::map< std::string, SessionPtr > m_sessionMapByName; + std::map< uint32_t, std::string > m_playerNameMapById; + std::map< uint32_t, uint32_t > m_zones; + std::map< std::string, Entity::BNpcTemplatePtr > m_bNpcTemplateMap; + + }; } diff --git a/src/servers/sapphire_zone/Session.cpp b/src/servers/sapphire_zone/Session.cpp index 3d5070de..144650e0 100644 --- a/src/servers/sapphire_zone/Session.cpp +++ b/src/servers/sapphire_zone/Session.cpp @@ -12,10 +12,10 @@ #include "Framework.h" -extern Core::Framework g_fw; +extern Sapphire::Framework g_fw; namespace fs = std::experimental::filesystem; -Core::Session::Session( uint32_t sessionId ) : +Sapphire::Session::Session( uint32_t sessionId ) : m_sessionId( sessionId ), m_lastDataTime( Util::getTimeSeconds() ), m_lastSqlTime( Util::getTimeSeconds() ), @@ -23,34 +23,34 @@ Core::Session::Session( uint32_t sessionId ) : { } -Core::Session::~Session() +Sapphire::Session::~Session() { } -void Core::Session::setZoneConnection( Network::GameConnectionPtr pZoneCon ) +void Sapphire::Session::setZoneConnection( Network::GameConnectionPtr pZoneCon ) { pZoneCon->m_conType = Network::ConnectionType::Zone; m_pZoneConnection = pZoneCon; } -void Core::Session::setChatConnection( Network::GameConnectionPtr pChatCon ) +void Sapphire::Session::setChatConnection( Network::GameConnectionPtr pChatCon ) { pChatCon->m_conType = Network::ConnectionType::Chat; m_pChatConnection = pChatCon; } -Core::Network::GameConnectionPtr Core::Session::getZoneConnection() const +Sapphire::Network::GameConnectionPtr Sapphire::Session::getZoneConnection() const { return m_pZoneConnection; } -Core::Network::GameConnectionPtr Core::Session::getChatConnection() const +Sapphire::Network::GameConnectionPtr Sapphire::Session::getChatConnection() const { return m_pChatConnection; } -bool Core::Session::loadPlayer() +bool Sapphire::Session::loadPlayer() { m_pPlayer = Entity::make_Player(); @@ -67,7 +67,7 @@ bool Core::Session::loadPlayer() } -void Core::Session::close() +void Sapphire::Session::close() { if( m_pZoneConnection ) m_pZoneConnection->Disconnect(); @@ -85,37 +85,37 @@ void Core::Session::close() } } -uint32_t Core::Session::getId() const +uint32_t Sapphire::Session::getId() const { return m_sessionId; } -int64_t Core::Session::getLastDataTime() const +int64_t Sapphire::Session::getLastDataTime() const { return m_lastDataTime; } -int64_t Core::Session::getLastSqlTime() const +int64_t Sapphire::Session::getLastSqlTime() const { return m_lastSqlTime; } -bool Core::Session::isValid() const +bool Sapphire::Session::isValid() const { return m_isValid; } -void Core::Session::updateLastDataTime() +void Sapphire::Session::updateLastDataTime() { m_lastDataTime = Util::getTimeSeconds(); } -void Core::Session::updateLastSqlTime() +void Sapphire::Session::updateLastSqlTime() { m_lastSqlTime = Util::getTimeSeconds(); } -void Core::Session::startReplay( const std::string& path ) +void Sapphire::Session::startReplay( const std::string& path ) { auto pLog = g_fw.get< Logger >(); if( !fs::exists( path ) ) @@ -161,13 +161,13 @@ void Core::Session::startReplay( const std::string& path ) m_isReplaying = true; } -void Core::Session::stopReplay() +void Sapphire::Session::stopReplay() { m_isReplaying = false; m_replayCache.clear(); } -void Core::Session::processReplay() +void Sapphire::Session::processReplay() { int at = 0; for( const auto& set : m_replayCache ) @@ -185,7 +185,7 @@ void Core::Session::processReplay() m_isReplaying = false; } -void Core::Session::sendReplayInfo() +void Sapphire::Session::sendReplayInfo() { std::string message = std::to_string( m_replayCache.size() ) + " Sets left in cache, "; @@ -197,7 +197,7 @@ void Core::Session::sendReplayInfo() getPlayer()->sendDebug( message ); } -void Core::Session::update() +void Sapphire::Session::update() { if( m_isReplaying ) processReplay(); @@ -226,7 +226,7 @@ void Core::Session::update() } -Core::Entity::PlayerPtr Core::Session::getPlayer() const +Sapphire::Entity::PlayerPtr Sapphire::Session::getPlayer() const { return m_pPlayer; } diff --git a/src/servers/sapphire_zone/Session.h b/src/servers/sapphire_zone/Session.h index 6be6ef82..c82fda41 100644 --- a/src/servers/sapphire_zone/Session.h +++ b/src/servers/sapphire_zone/Session.h @@ -5,7 +5,7 @@ #include "ForwardsZone.h" -namespace Core { +namespace Sapphire { class Session : public std::enable_shared_from_this< Session > diff --git a/src/servers/sapphire_zone/StatusEffect/StatusEffect.cpp b/src/servers/sapphire_zone/StatusEffect/StatusEffect.cpp index c8b06efa..ac5cb5ae 100644 --- a/src/servers/sapphire_zone/StatusEffect/StatusEffect.cpp +++ b/src/servers/sapphire_zone/StatusEffect/StatusEffect.cpp @@ -13,20 +13,20 @@ #include "StatusEffect.h" #include "Framework.h" -extern Core::Framework g_fw; +extern Sapphire::Framework g_fw; -using namespace Core::Common; -using namespace Core::Network::Packets; -using namespace Core::Network::Packets::Server; +using namespace Sapphire::Common; +using namespace Sapphire::Network::Packets; +using namespace Sapphire::Network::Packets::Server; -Core::StatusEffect::StatusEffect::StatusEffect( uint32_t id, Entity::CharaPtr sourceActor, Entity::CharaPtr targetActor, +Sapphire::StatusEffect::StatusEffect::StatusEffect( uint32_t id, Entity::CharaPtr sourceActor, Entity::CharaPtr targetActor, 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 ) { auto pExdData = g_fw.get< Data::ExdDataGenerated >(); - auto entry = pExdData->get< Core::Data::Status >( id ); + auto entry = pExdData->get< Sapphire::Data::Status >( id ); m_name = entry->name; std::replace( m_name.begin(), m_name.end(), ' ', '_' ); @@ -41,45 +41,45 @@ Core::StatusEffect::StatusEffect::StatusEffect( uint32_t id, Entity::CharaPtr so } -Core::StatusEffect::StatusEffect::~StatusEffect() +Sapphire::StatusEffect::StatusEffect::~StatusEffect() { } -void Core::StatusEffect::StatusEffect::registerTickEffect( uint8_t type, uint32_t param ) +void Sapphire::StatusEffect::StatusEffect::registerTickEffect( uint8_t type, uint32_t param ) { m_currTickEffect = std::make_pair( type, param ); } -std::pair< uint8_t, uint32_t > Core::StatusEffect::StatusEffect::getTickEffect() +std::pair< uint8_t, uint32_t > Sapphire::StatusEffect::StatusEffect::getTickEffect() { auto thisTick = m_currTickEffect; m_currTickEffect = std::make_pair( 0, 0 ); return thisTick; } -void Core::StatusEffect::StatusEffect::onTick() +void Sapphire::StatusEffect::StatusEffect::onTick() { auto pScriptMgr = g_fw.get< Scripting::ScriptMgr >(); m_lastTick = Util::getTimeMs(); pScriptMgr->onStatusTick( m_targetActor, *this ); } -uint32_t Core::StatusEffect::StatusEffect::getSrcActorId() const +uint32_t Sapphire::StatusEffect::StatusEffect::getSrcActorId() const { return m_sourceActor->getId(); } -uint32_t Core::StatusEffect::StatusEffect::getTargetActorId() const +uint32_t Sapphire::StatusEffect::StatusEffect::getTargetActorId() const { return m_targetActor->getId(); } -uint16_t Core::StatusEffect::StatusEffect::getParam() const +uint16_t Sapphire::StatusEffect::StatusEffect::getParam() const { return m_param; } -void Core::StatusEffect::StatusEffect::applyStatus() +void Sapphire::StatusEffect::StatusEffect::applyStatus() { m_startTime = Util::getTimeMs(); auto pScriptMgr = g_fw.get< Scripting::ScriptMgr >(); @@ -105,48 +105,48 @@ void Core::StatusEffect::StatusEffect::applyStatus() pScriptMgr->onStatusReceive( m_targetActor, m_id ); } -void Core::StatusEffect::StatusEffect::removeStatus() +void Sapphire::StatusEffect::StatusEffect::removeStatus() { auto pScriptMgr = g_fw.get< Scripting::ScriptMgr >(); pScriptMgr->onStatusTimeOut( m_targetActor, m_id ); } -uint32_t Core::StatusEffect::StatusEffect::getId() const +uint32_t Sapphire::StatusEffect::StatusEffect::getId() const { return m_id; } -uint32_t Core::StatusEffect::StatusEffect::getDuration() const +uint32_t Sapphire::StatusEffect::StatusEffect::getDuration() const { return m_duration; } -uint32_t Core::StatusEffect::StatusEffect::getTickRate() const +uint32_t Sapphire::StatusEffect::StatusEffect::getTickRate() const { return m_tickRate; } -uint64_t Core::StatusEffect::StatusEffect::getLastTickMs() const +uint64_t Sapphire::StatusEffect::StatusEffect::getLastTickMs() const { return m_lastTick; } -uint64_t Core::StatusEffect::StatusEffect::getStartTimeMs() const +uint64_t Sapphire::StatusEffect::StatusEffect::getStartTimeMs() const { return m_startTime; } -void Core::StatusEffect::StatusEffect::setLastTick( uint64_t lastTick ) +void Sapphire::StatusEffect::StatusEffect::setLastTick( uint64_t lastTick ) { m_lastTick = lastTick; } -void Core::StatusEffect::StatusEffect::setParam( uint16_t param ) +void Sapphire::StatusEffect::StatusEffect::setParam( uint16_t param ) { m_param = param; } -const std::string& Core::StatusEffect::StatusEffect::getName() const +const std::string& Sapphire::StatusEffect::StatusEffect::getName() const { return m_name; } diff --git a/src/servers/sapphire_zone/StatusEffect/StatusEffect.h b/src/servers/sapphire_zone/StatusEffect/StatusEffect.h index ce5fbee5..e6bb1c8e 100644 --- a/src/servers/sapphire_zone/StatusEffect/StatusEffect.h +++ b/src/servers/sapphire_zone/StatusEffect/StatusEffect.h @@ -3,7 +3,7 @@ #include "Forwards.h" -namespace Core { +namespace Sapphire { namespace StatusEffect { diff --git a/src/servers/sapphire_zone/Zone/Cell.cpp b/src/servers/sapphire_zone/Zone/Cell.cpp index d9b7f600..62273ab5 100644 --- a/src/servers/sapphire_zone/Zone/Cell.cpp +++ b/src/servers/sapphire_zone/Zone/Cell.cpp @@ -7,12 +7,12 @@ #include "Framework.h" -extern Core::Framework g_fw; +extern Sapphire::Framework g_fw; // TODO: the entire zone / areahandling is a bit outdated ( in parts i used this for the 1.0 iteration ) // likely this could be greatly improved or redone -Core::Cell::Cell() : +Sapphire::Cell::Cell() : m_bActive( false ), m_bLoaded( false ), m_playerCount( 0 ), @@ -21,12 +21,12 @@ Core::Cell::Cell() : m_bForcedActive = false; } -Core::Cell::~Cell() +Sapphire::Cell::~Cell() { removeActors(); } -void Core::Cell::init( uint32_t x, uint32_t y, ZonePtr pZone ) +void Sapphire::Cell::init( uint32_t x, uint32_t y, ZonePtr pZone ) { m_pZone = pZone; m_posX = x; @@ -35,25 +35,25 @@ void Core::Cell::init( uint32_t x, uint32_t y, ZonePtr pZone ) m_actors.clear(); } -void Core::Cell::addActor( Entity::ActorPtr pAct ) +void Sapphire::Cell::addActor( Entity::ActorPtr pAct ) { - auto pLog = g_fw.get< Core::Logger >(); + auto pLog = g_fw.get< Sapphire::Logger >(); if( pAct->isPlayer() ) ++m_playerCount; m_actors.insert( pAct ); } -void Core::Cell::removeActor( Entity::ActorPtr pAct ) +void Sapphire::Cell::removeActor( Entity::ActorPtr pAct ) { - auto pLog = g_fw.get< Core::Logger >(); + auto pLog = g_fw.get< Sapphire::Logger >(); if( pAct->isPlayer() ) --m_playerCount; m_actors.erase( pAct ); } -void Core::Cell::setActivity( bool state ) +void Sapphire::Cell::setActivity( bool state ) { if( !m_bActive && state ) { @@ -82,7 +82,7 @@ void Core::Cell::setActivity( bool state ) } -void Core::Cell::removeActors() +void Sapphire::Cell::removeActors() { //uint32_t ltime = getMSTime(); @@ -111,7 +111,7 @@ void Core::Cell::removeActors() m_bLoaded = false; } -void Core::Cell::queueUnloadPending() +void Sapphire::Cell::queueUnloadPending() { if( m_bUnloadPending ) return; @@ -120,13 +120,13 @@ void Core::Cell::queueUnloadPending() } -void Core::Cell::cancelPendingUnload() +void Sapphire::Cell::cancelPendingUnload() { if( !m_bUnloadPending ) return; } -void Core::Cell::unload() +void Sapphire::Cell::unload() { assert( m_bUnloadPending ); diff --git a/src/servers/sapphire_zone/Zone/Cell.h b/src/servers/sapphire_zone/Zone/Cell.h index 94529d2c..f637220b 100644 --- a/src/servers/sapphire_zone/Zone/Cell.h +++ b/src/servers/sapphire_zone/Zone/Cell.h @@ -7,7 +7,7 @@ #include "ForwardsZone.h" #include -namespace Core { +namespace Sapphire { typedef std::set< Entity::ActorPtr > ActorSet; diff --git a/src/servers/sapphire_zone/Zone/CellHandler.h b/src/servers/sapphire_zone/Zone/CellHandler.h index 7bf7009b..bfcdac52 100644 --- a/src/servers/sapphire_zone/Zone/CellHandler.h +++ b/src/servers/sapphire_zone/Zone/CellHandler.h @@ -16,7 +16,7 @@ #define _sizeY (TilesCount*CellsPerTile) #define GetRelatCoord( Coord, CellCoord ) ((_maxX-Coord)-CellCoord*_cellSize) -namespace Core { +namespace Sapphire { class Zone; diff --git a/src/servers/sapphire_zone/Zone/House.cpp b/src/servers/sapphire_zone/Zone/House.cpp index 498a0781..5698635c 100644 --- a/src/servers/sapphire_zone/Zone/House.cpp +++ b/src/servers/sapphire_zone/Zone/House.cpp @@ -11,9 +11,9 @@ #include #include "Framework.h" -extern Core::Framework g_fw; +extern Sapphire::Framework g_fw; -Core::House::House( uint32_t houseId, uint32_t landSetId, uint8_t landId, uint8_t wardNum, uint16_t territoryTypeId ) : +Sapphire::House::House( uint32_t houseId, uint32_t landSetId, uint8_t landId, uint8_t wardNum, uint16_t territoryTypeId ) : m_houseId( houseId ), m_landSetId( landSetId ), m_landId( landId ), @@ -27,7 +27,7 @@ Core::House::House( uint32_t houseId, uint32_t landSetId, uint8_t landId, uint8_ if( !res->next() ) { - g_fw.get< Core::Logger >()->info( "Creating house House#" + std::to_string( houseId ) + " in LandSet#" + std::to_string( landSetId ) ); + g_fw.get< Sapphire::Logger >()->info( "Creating house House#" + std::to_string( houseId ) + " in LandSet#" + std::to_string( landSetId ) ); auto stmt = pDB->getPreparedStatement( Db::HOUSING_HOUSE_INS ); @@ -56,11 +56,11 @@ Core::House::House( uint32_t houseId, uint32_t landSetId, uint8_t landId, uint8_ } } -Core::House::~House() +Sapphire::House::~House() { } -void Core::House::updateHouseDb() +void Sapphire::House::updateHouseDb() { auto pDB = g_fw.get< Db::DbWorkerPool< Db::ZoneDbConnection > >(); @@ -97,74 +97,74 @@ void Core::House::updateHouseDb() pDB->execute( stmt ); } -uint32_t Core::House::getLandSetId() const +uint32_t Sapphire::House::getLandSetId() const { return m_landSetId; } -uint8_t Core::House::getLandId() const +uint8_t Sapphire::House::getLandId() const { return m_landId; } -uint8_t Core::House::getWardNum() const +uint8_t Sapphire::House::getWardNum() const { return m_wardNum; } -uint16_t Core::House::getTerritoryTypeId() const +uint16_t Sapphire::House::getTerritoryTypeId() const { return m_territoryTypeId; } -uint32_t Core::House::getHouseId() const +uint32_t Sapphire::House::getHouseId() const { return m_houseId; } -uint8_t Core::House::getHousePartColor( Common::HousePartSlot slot ) const +uint8_t Sapphire::House::getHousePartColor( Common::HousePartSlot slot ) const { return m_houseParts[ slot ].second; } -void Core::House::setHousePart( Common::HousePartSlot slot, uint32_t id ) +void Sapphire::House::setHousePart( Common::HousePartSlot slot, uint32_t id ) { m_houseParts[ slot ].first = id; } -void Core::House::setHousePartColor( Common::HousePartSlot slot, uint32_t id ) +void Sapphire::House::setHousePartColor( Common::HousePartSlot slot, uint32_t id ) { m_houseParts[ slot ].second = id; } -uint32_t Core::House::getHousePart( Common::HousePartSlot slot ) const +uint32_t Sapphire::House::getHousePart( Common::HousePartSlot slot ) const { return m_houseParts[ slot ].first; } -Core::House::HousePartsArray const& Core::House::getHouseParts() const +Sapphire::House::HousePartsArray const& Sapphire::House::getHouseParts() const { return m_houseParts; } -const std::string& Core::House::getHouseName() const +const std::string& Sapphire::House::getHouseName() const { return m_houseName; } -const std::string& Core::House::getHouseGreeting() const +const std::string& Sapphire::House::getHouseGreeting() const { return m_estateMessage; } -void Core::House::setHouseGreeting( const std::string& greeting ) +void Sapphire::House::setHouseGreeting( const std::string& greeting ) { m_estateMessage = greeting; updateHouseDb(); } -void Core::House::setHouseName( const std::string& name ) +void Sapphire::House::setHouseName( const std::string& name ) { m_houseName = name; diff --git a/src/servers/sapphire_zone/Zone/House.h b/src/servers/sapphire_zone/Zone/House.h index ec2d3df4..6a9196d4 100644 --- a/src/servers/sapphire_zone/Zone/House.h +++ b/src/servers/sapphire_zone/Zone/House.h @@ -6,7 +6,7 @@ #include #include -namespace Core +namespace Sapphire { class House diff --git a/src/servers/sapphire_zone/Zone/HousingMgr.cpp b/src/servers/sapphire_zone/Zone/HousingMgr.cpp index 868cbd79..2824eb4f 100644 --- a/src/servers/sapphire_zone/Zone/HousingMgr.cpp +++ b/src/servers/sapphire_zone/Zone/HousingMgr.cpp @@ -22,41 +22,41 @@ #include "ServerMgr.h" #include "House.h" -using namespace Core::Common; -using namespace Core::Network; -using namespace Core::Network::Packets; -using namespace Core::Network::Packets::Server; +using namespace Sapphire::Common; +using namespace Sapphire::Network; +using namespace Sapphire::Network::Packets; +using namespace Sapphire::Network::Packets::Server; -extern Core::Framework g_fw; +extern Sapphire::Framework g_fw; -Core::HousingMgr::HousingMgr() +Sapphire::HousingMgr::HousingMgr() { } -Core::HousingMgr::~HousingMgr() +Sapphire::HousingMgr::~HousingMgr() { } -bool Core::HousingMgr::init() +bool Sapphire::HousingMgr::init() { return true; } -uint32_t Core::HousingMgr::toLandSetId( uint16_t territoryTypeId, uint8_t wardId ) const +uint32_t Sapphire::HousingMgr::toLandSetId( uint16_t territoryTypeId, uint8_t wardId ) const { return ( static_cast< uint32_t >( territoryTypeId ) << 16 ) | wardId; } -Core::Data::HousingZonePtr Core::HousingMgr::getHousingZoneByLandSetId( uint32_t id ) +Sapphire::Data::HousingZonePtr Sapphire::HousingMgr::getHousingZoneByLandSetId( uint32_t id ) { auto pTeriMgr = g_fw.get< TerritoryMgr >(); return std::dynamic_pointer_cast< HousingZone >( pTeriMgr->getZoneByLandSetId( id ) ); } -Core::LandPtr Core::HousingMgr::getLandByOwnerId( uint32_t id ) +Sapphire::LandPtr Sapphire::HousingMgr::getLandByOwnerId( uint32_t id ) { auto pDb = g_fw.get< Db::DbWorkerPool< Db::ZoneDbConnection > >(); auto res = pDb->query( "SELECT LandSetId, LandId FROM land WHERE OwnerId = " + std::to_string( id ) ); @@ -72,7 +72,7 @@ Core::LandPtr Core::HousingMgr::getLandByOwnerId( uint32_t id ) return hZone->getLand( res->getUInt( 2 ) ); } -void Core::HousingMgr::sendLandSignOwned( Entity::Player& player, uint8_t wardId, uint8_t plotId, uint16_t territoryTypeId ) +void Sapphire::HousingMgr::sendLandSignOwned( Entity::Player& player, uint8_t wardId, uint8_t plotId, uint16_t territoryTypeId ) { player.setActiveLand( plotId, wardId ); @@ -90,7 +90,7 @@ void Core::HousingMgr::sendLandSignOwned( Entity::Player& player, uint8_t wardId auto landInfoSignPacket = makeZonePacket< Server::FFXIVIpcLandInfoSign >( player.getId() ); uint32_t playerId = land->getPlayerOwner(); - std::string playerName = g_fw.get< Core::ServerMgr >()->getPlayerNameFromDb( playerId ); + std::string playerName = g_fw.get< Sapphire::ServerMgr >()->getPlayerNameFromDb( playerId ); //memcpy( &landInfoSignPacket->data().estateGreeting, "Hello World", 11 ); //memcpy( &landInfoSignPacket->data().estateName, land->getLandName().c_str(), land->getLandName().size() ); landInfoSignPacket->data().houseSize = land->getSize(); @@ -113,7 +113,7 @@ void Core::HousingMgr::sendLandSignOwned( Entity::Player& player, uint8_t wardId player.queuePacket( landInfoSignPacket ); } -void Core::HousingMgr::sendLandSignFree( Entity::Player& player, uint8_t wardId, uint8_t plotId, uint16_t territoryTypeId ) +void Sapphire::HousingMgr::sendLandSignFree( Entity::Player& player, uint8_t wardId, uint8_t plotId, uint16_t territoryTypeId ) { player.setActiveLand( plotId, wardId ); @@ -130,7 +130,7 @@ void Core::HousingMgr::sendLandSignFree( Entity::Player& player, uint8_t wardId, player.queuePacket( plotPricePacket ); } -Core::LandPurchaseResult Core::HousingMgr::purchaseLand( Entity::Player& player, uint8_t plot, uint8_t state ) +Sapphire::LandPurchaseResult Sapphire::HousingMgr::purchaseLand( Entity::Player& player, uint8_t plot, uint8_t state ) { auto pHousing = std::dynamic_pointer_cast< HousingZone >( player.getCurrentZone() ); @@ -185,7 +185,7 @@ Core::LandPurchaseResult Core::HousingMgr::purchaseLand( Entity::Player& player, } -bool Core::HousingMgr::relinquishLand( Entity::Player& player, uint8_t plot ) +bool Sapphire::HousingMgr::relinquishLand( Entity::Player& player, uint8_t plot ) { // TODO: Fix "permissions" being sent incorrectly // TODO: Add checks for land state before relinquishing @@ -231,7 +231,7 @@ bool Core::HousingMgr::relinquishLand( Entity::Player& player, uint8_t plot ) return true; } -void Core::HousingMgr::sendWardLandInfo( Entity::Player& player, uint8_t wardId, uint16_t territoryTypeId ) +void Sapphire::HousingMgr::sendWardLandInfo( Entity::Player& player, uint8_t wardId, uint16_t territoryTypeId ) { auto landSetId = toLandSetId( territoryTypeId, wardId ); auto hZone = getHousingZoneByLandSetId( landSetId ); @@ -270,7 +270,7 @@ void Core::HousingMgr::sendWardLandInfo( Entity::Player& player, uint8_t wardId, entry.infoFlags = Common::WardlandFlags::IsEstateOwned; auto owner = land->getPlayerOwner(); - std::string playerName = g_fw.get< Core::ServerMgr >()->getPlayerNameFromDb( owner ); + std::string playerName = g_fw.get< Sapphire::ServerMgr >()->getPlayerNameFromDb( owner ); memcpy( &entry.estateOwnerName, playerName.c_str(), playerName.size() ); break; @@ -283,7 +283,7 @@ void Core::HousingMgr::sendWardLandInfo( Entity::Player& player, uint8_t wardId, player.queuePacket( wardInfoPacket ); } -void Core::HousingMgr::buildPresetEstate( Entity::Player& player, uint8_t plotNum, uint32_t presetItem ) +void Sapphire::HousingMgr::buildPresetEstate( Entity::Player& player, uint8_t plotNum, uint32_t presetItem ) { auto hZone = std::dynamic_pointer_cast< HousingZone >( player.getCurrentZone() ); @@ -323,7 +323,7 @@ void Core::HousingMgr::buildPresetEstate( Entity::Player& player, uint8_t plotNu player.sendLandFlagsSlot( LandFlagsSlot::Private ); } -void Core::HousingMgr::requestEstateRename( Entity::Player& player, uint16_t territoryTypeId, uint16_t worldId, uint8_t wardId, uint8_t plotId ) +void Sapphire::HousingMgr::requestEstateRename( Entity::Player& player, uint16_t territoryTypeId, uint16_t worldId, uint8_t wardId, uint8_t plotId ) { auto landSetId = toLandSetId( territoryTypeId, wardId ); auto hZone = getHousingZoneByLandSetId( landSetId ); @@ -348,7 +348,7 @@ void Core::HousingMgr::requestEstateRename( Entity::Player& player, uint16_t ter player.queuePacket( landRenamePacket ); } -void Core::HousingMgr::requestEstateEditGreeting( Entity::Player& player, uint16_t territoryTypeId, uint16_t worldId, uint8_t wardId, uint8_t plotId ) +void Sapphire::HousingMgr::requestEstateEditGreeting( Entity::Player& player, uint16_t territoryTypeId, uint16_t worldId, uint8_t wardId, uint8_t plotId ) { auto landSetId = toLandSetId( territoryTypeId, wardId ); auto hZone = getHousingZoneByLandSetId( landSetId ); @@ -375,7 +375,7 @@ void Core::HousingMgr::requestEstateEditGreeting( Entity::Player& player, uint16 player.queuePacket( estateGreetingPacket ); } -void Core::HousingMgr::updateEstateGreeting( Entity::Player& player, const Common::LandIdent& ident, const std::string& greeting ) +void Sapphire::HousingMgr::updateEstateGreeting( Entity::Player& player, const Common::LandIdent& ident, const std::string& greeting ) { auto landSetId = toLandSetId( ident.territoryTypeId, ident.wardNum ); auto zone = getHousingZoneByLandSetId( landSetId ); @@ -401,7 +401,7 @@ void Core::HousingMgr::updateEstateGreeting( Entity::Player& player, const Commo player.sendLogMessage( 3381 ); } -void Core::HousingMgr::requestEstateEditGuestAccess( Entity::Player& player, uint16_t territoryTypeId, uint16_t worldId, uint8_t wardId, uint8_t plotId ) +void Sapphire::HousingMgr::requestEstateEditGuestAccess( Entity::Player& player, uint16_t territoryTypeId, uint16_t worldId, uint8_t wardId, uint8_t plotId ) { auto landSetId = toLandSetId( territoryTypeId, wardId ); auto hZone = getHousingZoneByLandSetId( landSetId ); diff --git a/src/servers/sapphire_zone/Zone/HousingMgr.h b/src/servers/sapphire_zone/Zone/HousingMgr.h index bd3c39db..d10a0325 100644 --- a/src/servers/sapphire_zone/Zone/HousingMgr.h +++ b/src/servers/sapphire_zone/Zone/HousingMgr.h @@ -6,13 +6,13 @@ #include #include -namespace Core +namespace Sapphire::Data { - namespace Data - { - using HousingZonePtr = std::shared_ptr< HousingZone >; - } + using HousingZonePtr = std::shared_ptr< HousingZone >; +} +namespace Sapphire +{ class HousingMgr { @@ -23,8 +23,8 @@ namespace Core bool init(); uint32_t toLandSetId( uint16_t territoryTypeId, uint8_t wardId ) const; - Core::Data::HousingZonePtr getHousingZoneByLandSetId( uint32_t id ); - Core::LandPtr getLandByOwnerId( uint32_t id ); + Sapphire::Data::HousingZonePtr getHousingZoneByLandSetId( uint32_t id ); + Sapphire::LandPtr getLandByOwnerId( uint32_t id ); void sendLandSignOwned( Entity::Player& player, uint8_t wardId, uint8_t plotId, uint16_t territoryTypeId ); void sendLandSignFree( Entity::Player& player, uint8_t wardId, uint8_t plotId, uint16_t territoryTypeId ); @@ -43,8 +43,6 @@ namespace Core void requestEstateEditGuestAccess( Entity::Player& player, uint16_t territoryTypeId, uint16_t worldId, uint8_t wardId, uint8_t plotId ); - private: - }; } diff --git a/src/servers/sapphire_zone/Zone/HousingZone.cpp b/src/servers/sapphire_zone/Zone/HousingZone.cpp index d3b99e4c..c53d4a0c 100644 --- a/src/servers/sapphire_zone/Zone/HousingZone.cpp +++ b/src/servers/sapphire_zone/Zone/HousingZone.cpp @@ -17,13 +17,13 @@ #include "HousingMgr.h" #include "Framework.h" -extern Core::Framework g_fw; +extern Sapphire::Framework g_fw; -using namespace Core::Common; -using namespace Core::Network::Packets; -using namespace Core::Network::Packets::Server; +using namespace Sapphire::Common; +using namespace Sapphire::Network::Packets; +using namespace Sapphire::Network::Packets::Server; -Core::HousingZone::HousingZone( uint8_t wardNum, +Sapphire::HousingZone::HousingZone( uint8_t wardNum, uint16_t territoryTypeId, uint32_t guId, const std::string& internalName, @@ -36,7 +36,7 @@ Core::HousingZone::HousingZone( uint8_t wardNum, } -bool Core::HousingZone::init() +bool Sapphire::HousingZone::init() { auto pDb = g_fw.get< Db::DbWorkerPool< Db::ZoneDbConnection > >(); @@ -57,7 +57,7 @@ bool Core::HousingZone::init() housingIndex = 3; auto pExdData = g_fw.get< Data::ExdDataGenerated >(); - auto info = pExdData->get< Core::Data::HousingLandSet >( housingIndex ); + auto info = pExdData->get< Sapphire::Data::HousingLandSet >( housingIndex ); uint32_t landId; for( landId = 0; landId < 60; landId++ ) @@ -69,12 +69,12 @@ bool Core::HousingZone::init() return true; } -Core::HousingZone::~HousingZone() +Sapphire::HousingZone::~HousingZone() { } -void Core::HousingZone::onPlayerZoneIn( Entity::Player& player ) +void Sapphire::HousingZone::onPlayerZoneIn( Entity::Player& player ) { auto pLog = g_fw.get< Logger >(); pLog->debug( @@ -112,7 +112,7 @@ void Core::HousingZone::onPlayerZoneIn( Entity::Player& player ) } -void Core::HousingZone::sendLandSet( Entity::Player& player ) +void Sapphire::HousingZone::sendLandSet( Entity::Player& player ) { auto landsetInitializePacket = makeZonePacket< FFXIVIpcLandSetInitialize >( player.getId() ); @@ -155,7 +155,7 @@ void Core::HousingZone::sendLandSet( Entity::Player& player ) player.queuePacket( landsetInitializePacket ); } -void Core::HousingZone::sendLandUpdate( uint8_t landId ) +void Sapphire::HousingZone::sendLandUpdate( uint8_t landId ) { auto pLand = getLand( landId ); for( const auto& playerIt : m_playerMap ) @@ -191,12 +191,12 @@ void Core::HousingZone::sendLandUpdate( uint8_t landId ) } } -bool Core::HousingZone::isPlayerSubInstance( Entity::Player& player ) +bool Sapphire::HousingZone::isPlayerSubInstance( Entity::Player& player ) { return player.getPos().x < -15000.0f; //ToDo: get correct pos } -void Core::HousingZone::onUpdate( uint32_t currTime ) +void Sapphire::HousingZone::onUpdate( uint32_t currTime ) { for( auto pLandItr : m_landPtrMap ) { @@ -204,17 +204,17 @@ void Core::HousingZone::onUpdate( uint32_t currTime ) } } -uint8_t Core::HousingZone::getWardNum() const +uint8_t Sapphire::HousingZone::getWardNum() const { return m_wardNum; } -uint32_t Core::HousingZone::getLandSetId() const +uint32_t Sapphire::HousingZone::getLandSetId() const { return m_landSetId; } -Core::LandPtr Core::HousingZone::getLand( uint8_t id ) +Sapphire::LandPtr Sapphire::HousingZone::getLand( uint8_t id ) { auto it = m_landPtrMap.find( id ); if( it == m_landPtrMap.end() ) diff --git a/src/servers/sapphire_zone/Zone/HousingZone.h b/src/servers/sapphire_zone/Zone/HousingZone.h index 919d69df..1c86d9dd 100644 --- a/src/servers/sapphire_zone/Zone/HousingZone.h +++ b/src/servers/sapphire_zone/Zone/HousingZone.h @@ -4,7 +4,7 @@ #include "Zone.h" #include "Forwards.h" -namespace Core +namespace Sapphire { enum class LandPurchaseResult { @@ -46,10 +46,10 @@ namespace Core uint8_t getWardNum() const; uint32_t getLandSetId() const; - Core::LandPtr getLand( uint8_t id ); + Sapphire::LandPtr getLand( uint8_t id ); private: - using LandPtrMap = std::unordered_map< uint8_t, Core::LandPtr >; + using LandPtrMap = std::unordered_map< uint8_t, Sapphire::LandPtr >; const uint32_t m_landSetMax = 18; LandPtrMap m_landPtrMap; uint8_t m_wardNum; diff --git a/src/servers/sapphire_zone/Zone/InstanceContent.cpp b/src/servers/sapphire_zone/Zone/InstanceContent.cpp index 6f0040e8..c957e6e6 100644 --- a/src/servers/sapphire_zone/Zone/InstanceContent.cpp +++ b/src/servers/sapphire_zone/Zone/InstanceContent.cpp @@ -22,14 +22,14 @@ #include "InstanceContent.h" #include "Framework.h" -extern Core::Framework g_fw; +extern Sapphire::Framework g_fw; -using namespace Core::Common; -using namespace Core::Network::Packets; -using namespace Core::Network::Packets::Server; -using namespace Core::Network::ActorControl; +using namespace Sapphire::Common; +using namespace Sapphire::Network::Packets; +using namespace Sapphire::Network::Packets::Server; +using namespace Sapphire::Network::ActorControl; -Core::InstanceContent::InstanceContent( std::shared_ptr< Core::Data::InstanceContent > pInstanceConfiguration, +Sapphire::InstanceContent::InstanceContent( std::shared_ptr< Sapphire::Data::InstanceContent > pInstanceConfiguration, uint16_t territoryType, uint32_t guId, const std::string& internalName, @@ -48,7 +48,7 @@ Core::InstanceContent::InstanceContent( std::shared_ptr< Core::Data::InstanceCon } -bool Core::InstanceContent::init() +bool Sapphire::InstanceContent::init() { auto pScriptMgr = g_fw.get< Scripting::ScriptMgr >(); pScriptMgr->onInstanceInit( getAsInstanceContent() ); @@ -57,22 +57,22 @@ bool Core::InstanceContent::init() } -Core::InstanceContent::~InstanceContent() +Sapphire::InstanceContent::~InstanceContent() { } -uint32_t Core::InstanceContent::getInstanceContentId() const +uint32_t Sapphire::InstanceContent::getInstanceContentId() const { return m_instanceContentId; } -Core::Data::ExdDataGenerated::InstanceContentPtr Core::InstanceContent::getInstanceConfiguration() const +Sapphire::Data::ExdDataGenerated::InstanceContentPtr Sapphire::InstanceContent::getInstanceConfiguration() const { return m_instanceConfiguration; } -void Core::InstanceContent::onPlayerZoneIn( Entity::Player& player ) +void Sapphire::InstanceContent::onPlayerZoneIn( Entity::Player& player ) { auto pLog = g_fw.get< Logger >(); pLog->debug( "InstanceContent::onPlayerZoneIn: Zone#" + std::to_string( getGuId() ) + "|" @@ -89,7 +89,7 @@ void Core::InstanceContent::onPlayerZoneIn( Entity::Player& player ) } -void Core::InstanceContent::onLeaveTerritory( Entity::Player& player ) +void Sapphire::InstanceContent::onLeaveTerritory( Entity::Player& player ) { auto pLog = g_fw.get< Logger >(); pLog->debug( "InstanceContent::onLeaveTerritory: Zone#" + std::to_string( getGuId() ) + "|" @@ -102,7 +102,7 @@ void Core::InstanceContent::onLeaveTerritory( Entity::Player& player ) player.unsetStateFlag( PlayerStateFlag::BoundByDuty ); } -void Core::InstanceContent::onUpdate( uint32_t currTime ) +void Sapphire::InstanceContent::onUpdate( uint32_t currTime ) { switch( m_state ) { @@ -166,24 +166,24 @@ void Core::InstanceContent::onUpdate( uint32_t currTime ) pScriptMgr->onInstanceUpdate( getAsInstanceContent(), currTime ); } -void Core::InstanceContent::onFinishLoading( Entity::Player& player ) +void Sapphire::InstanceContent::onFinishLoading( Entity::Player& player ) { sendDirectorInit( player ); } -void Core::InstanceContent::onInitDirector( Entity::Player& player ) +void Sapphire::InstanceContent::onInitDirector( Entity::Player& player ) { sendDirectorVars( player ); player.setDirectorInitialized( true ); } -void Core::InstanceContent::onDirectorSync( Entity::Player& player ) +void Sapphire::InstanceContent::onDirectorSync( Entity::Player& player ) { player.queuePacket( makeActorControl143( player.getId(), DirectorUpdate, 0x00110001, 0x80000000, 1 ) ); } -void Core::InstanceContent::setVar( uint8_t index, uint8_t value ) +void Sapphire::InstanceContent::setVar( uint8_t index, uint8_t value ) { if( index > 19 ) return; @@ -260,7 +260,7 @@ void Core::InstanceContent::setVar( uint8_t index, uint8_t value ) } } -void Core::InstanceContent::setSequence( uint8_t value ) +void Sapphire::InstanceContent::setSequence( uint8_t value ) { setDirectorSequence( value ); @@ -270,7 +270,7 @@ void Core::InstanceContent::setSequence( uint8_t value ) } } -void Core::InstanceContent::setBranch( uint8_t value ) +void Sapphire::InstanceContent::setBranch( uint8_t value ) { setDirectorBranch( value ); @@ -280,7 +280,7 @@ void Core::InstanceContent::setBranch( uint8_t value ) } } -void Core::InstanceContent::startQte() +void Sapphire::InstanceContent::startQte() { for( const auto& playerIt : m_playerMap ) { @@ -289,7 +289,7 @@ void Core::InstanceContent::startQte() } } -void Core::InstanceContent::startEventCutscene() +void Sapphire::InstanceContent::startEventCutscene() { // TODO: lock player movement for( const auto& playerIt : m_playerMap ) @@ -299,7 +299,7 @@ void Core::InstanceContent::startEventCutscene() } } -void Core::InstanceContent::endEventCutscene() +void Sapphire::InstanceContent::endEventCutscene() { for( const auto& playerIt : m_playerMap ) { @@ -308,7 +308,7 @@ void Core::InstanceContent::endEventCutscene() } } -void Core::InstanceContent::onRegisterEObj( Entity::EventObjectPtr object ) +void Sapphire::InstanceContent::onRegisterEObj( Entity::EventObjectPtr object ) { if( object->getName() != "none" ) m_eventObjectMap[ object->getName() ] = object; @@ -317,7 +317,7 @@ void Core::InstanceContent::onRegisterEObj( Entity::EventObjectPtr object ) auto pLog = g_fw.get< Logger >(); auto pExdData = g_fw.get< Data::ExdDataGenerated >(); - auto objData = pExdData->get< Core::Data::EObj >( object->getObjectId() ); + auto objData = pExdData->get< Sapphire::Data::EObj >( object->getObjectId() ); if( objData ) // todo: data should be renamed to eventId m_eventIdToObjectMap[ objData->data ] = object; @@ -327,18 +327,18 @@ void Core::InstanceContent::onRegisterEObj( Entity::EventObjectPtr object ) std::to_string( object->getObjectId() ) ); } -bool Core::InstanceContent::hasPlayerPreviouslySpawned( Entity::Player& player ) const +bool Sapphire::InstanceContent::hasPlayerPreviouslySpawned( Entity::Player& player ) const { auto it = m_spawnedPlayers.find( player.getId() ); return it != m_spawnedPlayers.end(); } -Core::InstanceContent::InstanceContentState Core::InstanceContent::getState() const +Sapphire::InstanceContent::InstanceContentState Sapphire::InstanceContent::getState() const { return m_state; } -void Core::InstanceContent::onBeforePlayerZoneIn( Core::Entity::Player& player ) +void Sapphire::InstanceContent::onBeforePlayerZoneIn( Sapphire::Entity::Player& player ) { // remove any players from the instance who aren't bound on zone in if( !isPlayerBound( player.getId() ) ) @@ -362,7 +362,7 @@ void Core::InstanceContent::onBeforePlayerZoneIn( Core::Entity::Player& player ) player.resetObjSpawnIndex(); } -Core::Entity::EventObjectPtr Core::InstanceContent::getEObjByName( const std::string& name ) +Sapphire::Entity::EventObjectPtr Sapphire::InstanceContent::getEObjByName( const std::string& name ) { auto it = m_eventObjectMap.find( name ); if( it == m_eventObjectMap.end() ) @@ -371,7 +371,7 @@ Core::Entity::EventObjectPtr Core::InstanceContent::getEObjByName( const std::st return it->second; } -void Core::InstanceContent::onTalk( Core::Entity::Player& player, uint32_t eventId, uint64_t actorId ) +void Sapphire::InstanceContent::onTalk( Sapphire::Entity::Player& player, uint32_t eventId, uint64_t actorId ) { // todo: handle exit (and maybe shortcut?) behaviour here @@ -387,7 +387,7 @@ void Core::InstanceContent::onTalk( Core::Entity::Player& player, uint32_t event } void -Core::InstanceContent::onEnterTerritory( Entity::Player& player, uint32_t eventId, uint16_t param1, uint16_t param2 ) +Sapphire::InstanceContent::onEnterTerritory( Entity::Player& player, uint32_t eventId, uint16_t param1, uint16_t param2 ) { auto pScriptMgr = g_fw.get< Scripting::ScriptMgr >(); pScriptMgr->onInstanceEnterTerritory( getAsInstanceContent(), player, eventId, param1, param2 ); @@ -405,7 +405,7 @@ Core::InstanceContent::onEnterTerritory( Entity::Player& player, uint32_t eventI player.directorPlayScene( getDirectorId(), 2, NO_DEFAULT_CAMERA | HIDE_HOTBAR, 0, 0x9, getCurrentBGM() ); } -void Core::InstanceContent::setCurrentBGM( uint16_t bgmIndex ) +void Sapphire::InstanceContent::setCurrentBGM( uint16_t bgmIndex ) { m_currentBgm = bgmIndex; @@ -420,17 +420,17 @@ void Core::InstanceContent::setCurrentBGM( uint16_t bgmIndex ) } } -void Core::InstanceContent::setPlayerBGM( Core::Entity::Player& player, uint16_t bgmId ) +void Sapphire::InstanceContent::setPlayerBGM( Sapphire::Entity::Player& player, uint16_t bgmId ) { player.queuePacket( makeActorControl143( player.getId(), DirectorUpdate, getDirectorId(), 0x80000001, bgmId ) ); } -uint16_t Core::InstanceContent::getCurrentBGM() const +uint16_t Sapphire::InstanceContent::getCurrentBGM() const { return m_currentBgm; } -bool Core::InstanceContent::bindPlayer( uint32_t playerId ) +bool Sapphire::InstanceContent::bindPlayer( uint32_t playerId ) { // if player already bound, return false if( m_boundPlayerIds.count( playerId ) ) @@ -444,12 +444,12 @@ bool Core::InstanceContent::bindPlayer( uint32_t playerId ) return true; } -bool Core::InstanceContent::isPlayerBound( uint32_t playerId ) const +bool Sapphire::InstanceContent::isPlayerBound( uint32_t playerId ) const { return m_boundPlayerIds.count( playerId ) > 0; } -void Core::InstanceContent::unbindPlayer( uint32_t playerId ) +void Sapphire::InstanceContent::unbindPlayer( uint32_t playerId ) { m_boundPlayerIds.erase( playerId ); diff --git a/src/servers/sapphire_zone/Zone/InstanceContent.h b/src/servers/sapphire_zone/Zone/InstanceContent.h index c8834d82..ec97a63a 100644 --- a/src/servers/sapphire_zone/Zone/InstanceContent.h +++ b/src/servers/sapphire_zone/Zone/InstanceContent.h @@ -5,7 +5,7 @@ #include "Event/Director.h" #include "Forwards.h" -namespace Core { +namespace Sapphire { namespace Data { struct InstanceContent; } @@ -20,7 +20,7 @@ public: DutyFinished }; - InstanceContent( std::shared_ptr< Core::Data::InstanceContent > pInstanceConfiguration, + InstanceContent( std::shared_ptr< Sapphire::Data::InstanceContent > pInstanceConfiguration, uint16_t territoryType, uint32_t guId, const std::string& internalName, @@ -76,7 +76,7 @@ public: InstanceContentState getState() const; - std::shared_ptr< Core::Data::InstanceContent > getInstanceConfiguration() const; + std::shared_ptr< Sapphire::Data::InstanceContent > getInstanceConfiguration() const; uint32_t getInstanceContentId() const; @@ -95,7 +95,7 @@ public: const uint32_t instanceStartDelay = 1250; private: - std::shared_ptr< Core::Data::InstanceContent > m_instanceConfiguration; + std::shared_ptr< Sapphire::Data::InstanceContent > m_instanceConfiguration; uint32_t m_instanceContentId; InstanceContentState m_state; uint16_t m_currentBgm; diff --git a/src/servers/sapphire_zone/Zone/Land.cpp b/src/servers/sapphire_zone/Zone/Land.cpp index 4db6c196..187d2759 100644 --- a/src/servers/sapphire_zone/Zone/Land.cpp +++ b/src/servers/sapphire_zone/Zone/Land.cpp @@ -22,12 +22,12 @@ #include "Framework.h" #include "House.h" -extern Core::Framework g_fw; +extern Sapphire::Framework g_fw; -using namespace Core::Common; +using namespace Sapphire::Common; -Core::Land::Land( uint16_t territoryTypeId, uint8_t wardNum, uint8_t landId, uint32_t landSetId, - Core::Data::HousingLandSetPtr info ) : +Sapphire::Land::Land( uint16_t territoryTypeId, uint8_t wardNum, uint8_t landId, uint32_t landSetId, + Sapphire::Data::HousingLandSetPtr info ) : m_territoryTypeId( territoryTypeId ), m_wardNum( wardNum ), m_landId( landId ), @@ -48,12 +48,12 @@ Core::Land::Land( uint16_t territoryTypeId, uint8_t wardNum, uint8_t landId, uin load(); } -Core::Land::~Land() +Sapphire::Land::~Land() { } -void Core::Land::load() +void Sapphire::Land::load() { auto pDb = g_fw.get< Db::DbWorkerPool< Db::ZoneDbConnection > >(); auto res = pDb->query( "SELECT * FROM land WHERE LandSetId = " + std::to_string( m_landSetId ) + " " @@ -91,149 +91,149 @@ void Core::Land::load() init(); } -uint32_t Core::Land::convertItemIdToHousingItemId( uint32_t itemId ) +uint32_t Sapphire::Land::convertItemIdToHousingItemId( uint32_t itemId ) { auto pExdData = g_fw.get< Data::ExdDataGenerated >(); - auto info = pExdData->get< Core::Data::Item >( itemId ); + auto info = pExdData->get< Sapphire::Data::Item >( itemId ); return info->additionalData; } -uint32_t Core::Land::getCurrentPrice() const +uint32_t Sapphire::Land::getCurrentPrice() const { return m_currentPrice; } -uint32_t Core::Land::getMaxPrice() const +uint32_t Sapphire::Land::getMaxPrice() const { return m_maxPrice; } //Primary State -void Core::Land::setSize( uint8_t size ) +void Sapphire::Land::setSize( uint8_t size ) { m_size = size; } -void Core::Land::setState( uint8_t state ) +void Sapphire::Land::setState( uint8_t state ) { m_state = state; } -void Core::Land::setSharing( uint8_t state ) +void Sapphire::Land::setSharing( uint8_t state ) { m_iconAddIcon = state; } -void Core::Land::setLandType( Common::LandType type ) +void Sapphire::Land::setLandType( Common::LandType type ) { m_type = type; } -uint8_t Core::Land::getSize() const +uint8_t Sapphire::Land::getSize() const { return m_size; } -uint8_t Core::Land::getState() const +uint8_t Sapphire::Land::getState() const { return m_state; } -uint8_t Core::Land::getSharing() const +uint8_t Sapphire::Land::getSharing() const { return m_iconAddIcon; } -uint32_t Core::Land::getLandSetId() const +uint32_t Sapphire::Land::getLandSetId() const { return m_landSetId; } -uint8_t Core::Land::getWardNum() const +uint8_t Sapphire::Land::getWardNum() const { return m_wardNum; } -uint8_t Core::Land::getLandId() const +uint8_t Sapphire::Land::getLandId() const { return m_landId; } -uint16_t Core::Land::getTerritoryTypeId() const +uint16_t Sapphire::Land::getTerritoryTypeId() const { return m_territoryTypeId; } -Core::HousePtr Core::Land::getHouse() const +Sapphire::HousePtr Sapphire::Land::getHouse() const { return m_pHouse; } -Core::Common::LandType Core::Land::getLandType() const +Sapphire::Common::LandType Sapphire::Land::getLandType() const { return m_type; } //Free Comapny -void Core::Land::setFreeCompany( uint32_t id, uint32_t icon, uint32_t color ) +void Sapphire::Land::setFreeCompany( uint32_t id, uint32_t icon, uint32_t color ) { m_fcId = id; m_fcIcon = icon; m_fcIconColor = color; //RGBA } -uint32_t Core::Land::getFcId() +uint32_t Sapphire::Land::getFcId() { return m_fcIcon; } -uint32_t Core::Land::getFcIcon() +uint32_t Sapphire::Land::getFcIcon() { return m_fcIcon; } -uint32_t Core::Land::getFcColor() +uint32_t Sapphire::Land::getFcColor() { return m_fcIconColor; } //Player -void Core::Land::setPlayerOwner( uint32_t id ) +void Sapphire::Land::setPlayerOwner( uint32_t id ) { m_ownerPlayerId = id; } -uint32_t Core::Land::getPlayerOwner() +uint32_t Sapphire::Land::getPlayerOwner() { return m_ownerPlayerId; } -uint32_t Core::Land::getMaxItems() +uint32_t Sapphire::Land::getMaxItems() { return m_maxItems; } -uint32_t Core::Land::getDevaluationTime() +uint32_t Sapphire::Land::getDevaluationTime() { return m_nextDrop - static_cast< uint32_t >( Util::getTimeSeconds() ); } -void Core::Land::setCurrentPrice( uint32_t currentPrice ) +void Sapphire::Land::setCurrentPrice( uint32_t currentPrice ) { m_currentPrice = currentPrice; } -void Core::Land::setLandTag( uint8_t slot, uint8_t tag ) +void Sapphire::Land::setLandTag( uint8_t slot, uint8_t tag ) { m_tag[ slot ] = tag; } -uint8_t Core::Land::getLandTag( uint8_t slot ) +uint8_t Sapphire::Land::getLandTag( uint8_t slot ) { return m_tag[ slot ]; } -void Core::Land::init() +void Sapphire::Land::init() { switch( m_size ) @@ -252,7 +252,7 @@ void Core::Land::init() } } -void Core::Land::updateLandDb() +void Sapphire::Land::updateLandDb() { uint32_t houseId = 0; @@ -274,7 +274,7 @@ void Core::Land::updateLandDb() house->updateHouseDb(); } -void Core::Land::update( uint32_t currTime ) +void Sapphire::Land::update( uint32_t currTime ) { if( getState() == HouseState::forSale ) { @@ -287,7 +287,7 @@ void Core::Land::update( uint32_t currTime ) } } -uint32_t Core::Land::getNextHouseId() +uint32_t Sapphire::Land::getNextHouseId() { auto pDb = g_fw.get< Db::DbWorkerPool< Db::ZoneDbConnection > >(); auto pQR = pDb->query( "SELECT MAX( HouseId ) FROM house" ); @@ -298,15 +298,15 @@ uint32_t Core::Land::getNextHouseId() return pQR->getUInt( 1 ) + 1; } -bool Core::Land::setPreset( uint32_t itemId ) +bool Sapphire::Land::setPreset( uint32_t itemId ) { auto housingItemId = convertItemIdToHousingItemId( itemId ); - auto exdData = g_fw.get< Core::Data::ExdDataGenerated >(); + auto exdData = g_fw.get< Sapphire::Data::ExdDataGenerated >(); if( !exdData ) return false; - auto housingPreset = exdData->get< Core::Data::HousingPreset >( housingItemId ); + auto housingPreset = exdData->get< Sapphire::Data::HousingPreset >( housingItemId ); if( !housingPreset ) return false; diff --git a/src/servers/sapphire_zone/Zone/Land.h b/src/servers/sapphire_zone/Zone/Land.h index 3bf792d2..82702dd9 100644 --- a/src/servers/sapphire_zone/Zone/Land.h +++ b/src/servers/sapphire_zone/Zone/Land.h @@ -4,7 +4,7 @@ #include "Exd/ExdDataGenerated.h" #include "ForwardsZone.h" -namespace Core +namespace Sapphire { namespace Data { @@ -15,7 +15,7 @@ namespace Core { public: - Land( uint16_t zoneId, uint8_t wardNum, uint8_t landId, uint32_t landSetId, Core::Data::HousingLandSetPtr info ); + Land( uint16_t zoneId, uint8_t wardNum, uint8_t landId, uint32_t landSetId, Sapphire::Data::HousingLandSetPtr info ); virtual ~Land(); void load(); @@ -35,7 +35,7 @@ namespace Core uint8_t getLandId() const; uint16_t getTerritoryTypeId() const; Common::LandType getLandType() const; - Core::HousePtr getHouse() const; + Sapphire::HousePtr getHouse() const; //Free Comapny void setFreeCompany( uint32_t id, uint32_t icon, uint32_t color ); @@ -79,12 +79,12 @@ namespace Core uint32_t m_fcIconColor; uint32_t m_ownerPlayerId; - Core::Data::HousingLandSetPtr m_landInfo; + Sapphire::Data::HousingLandSetPtr m_landInfo; - Core::HousePtr m_pHouse; + Sapphire::HousePtr m_pHouse; //item storage - Core::ItemContainerPtr ItemsOutdoorContainer; + Sapphire::ItemContainerPtr ItemsOutdoorContainer; uint32_t m_maxItems; //price diff --git a/src/servers/sapphire_zone/Zone/TerritoryMgr.cpp b/src/servers/sapphire_zone/Zone/TerritoryMgr.cpp index d355bc81..29d61afe 100644 --- a/src/servers/sapphire_zone/Zone/TerritoryMgr.cpp +++ b/src/servers/sapphire_zone/Zone/TerritoryMgr.cpp @@ -13,34 +13,34 @@ #include "TerritoryMgr.h" #include "Framework.h" -extern Core::Framework g_fw; +extern Sapphire::Framework g_fw; -Core::TerritoryMgr::TerritoryMgr() : +Sapphire::TerritoryMgr::TerritoryMgr() : m_lastInstanceId( 10000 ) { } -void Core::TerritoryMgr::loadTerritoryTypeDetailCache() +void Sapphire::TerritoryMgr::loadTerritoryTypeDetailCache() { auto pExdData = g_fw.get< Data::ExdDataGenerated >(); auto idList = pExdData->getTerritoryTypeIdList(); for( auto id : idList ) { - auto teri1 = pExdData->get< Core::Data::TerritoryType >( id ); + auto teri1 = pExdData->get< Sapphire::Data::TerritoryType >( id ); if( !teri1->name.empty() ) m_territoryTypeDetailCacheMap[ id ] = teri1; } } -bool Core::TerritoryMgr::isValidTerritory( uint32_t territoryTypeId ) const +bool Sapphire::TerritoryMgr::isValidTerritory( uint32_t territoryTypeId ) const { return !( m_territoryTypeDetailCacheMap.find( territoryTypeId ) == m_territoryTypeDetailCacheMap.end() ); } -bool Core::TerritoryMgr::init() +bool Sapphire::TerritoryMgr::init() { loadTerritoryTypeDetailCache(); loadTerritoryPositionMap(); @@ -51,12 +51,12 @@ bool Core::TerritoryMgr::init() return true; } -uint32_t Core::TerritoryMgr::getNextInstanceId() +uint32_t Sapphire::TerritoryMgr::getNextInstanceId() { return ++m_lastInstanceId; } -Core::Data::TerritoryTypePtr Core::TerritoryMgr::getTerritoryDetail( uint32_t territoryTypeId ) const +Sapphire::Data::TerritoryTypePtr Sapphire::TerritoryMgr::getTerritoryDetail( uint32_t territoryTypeId ) const { auto tIt = m_territoryTypeDetailCacheMap.find( territoryTypeId ); if( tIt == m_territoryTypeDetailCacheMap.end() ) @@ -65,7 +65,7 @@ Core::Data::TerritoryTypePtr Core::TerritoryMgr::getTerritoryDetail( uint32_t te return tIt->second; } -bool Core::TerritoryMgr::isInstanceContentTerritory( uint32_t territoryTypeId ) const +bool Sapphire::TerritoryMgr::isInstanceContentTerritory( uint32_t territoryTypeId ) const { auto pTeri = getTerritoryDetail( territoryTypeId ); @@ -86,7 +86,7 @@ bool Core::TerritoryMgr::isInstanceContentTerritory( uint32_t territoryTypeId ) intendedUse == TerritoryIntendedUse::EventTrial; } -bool Core::TerritoryMgr::isPrivateTerritory( uint32_t territoryTypeId ) const +bool Sapphire::TerritoryMgr::isPrivateTerritory( uint32_t territoryTypeId ) const { auto pTeri = getTerritoryDetail( territoryTypeId ); @@ -100,7 +100,7 @@ bool Core::TerritoryMgr::isPrivateTerritory( uint32_t territoryTypeId ) const pTeri->territoryIntendedUse == TerritoryIntendedUse::MSQPrivateArea; } -bool Core::TerritoryMgr::isDefaultTerritory( uint32_t territoryTypeId ) const +bool Sapphire::TerritoryMgr::isDefaultTerritory( uint32_t territoryTypeId ) const { auto pTeri = getTerritoryDetail( territoryTypeId ); @@ -114,7 +114,7 @@ bool Core::TerritoryMgr::isDefaultTerritory( uint32_t territoryTypeId ) const } -bool Core::TerritoryMgr::isHousingTerritory( uint32_t territoryTypeId ) const +bool Sapphire::TerritoryMgr::isHousingTerritory( uint32_t territoryTypeId ) const { auto pTeri = getTerritoryDetail( territoryTypeId ); @@ -124,7 +124,7 @@ bool Core::TerritoryMgr::isHousingTerritory( uint32_t territoryTypeId ) const return pTeri->territoryIntendedUse == TerritoryIntendedUse::HousingArea; } -bool Core::TerritoryMgr::createDefaultTerritories() +bool Sapphire::TerritoryMgr::createDefaultTerritories() { auto pExdData = g_fw.get< Data::ExdDataGenerated >(); auto pLog = g_fw.get< Logger >(); @@ -138,7 +138,7 @@ bool Core::TerritoryMgr::createDefaultTerritories() if( territoryInfo->name.empty() ) continue; - auto pPlaceName = pExdData->get< Core::Data::PlaceName >( territoryInfo->placeName ); + auto pPlaceName = pExdData->get< Sapphire::Data::PlaceName >( territoryInfo->placeName ); if( !pPlaceName || pPlaceName->name.empty() || !isDefaultTerritory( territoryTypeId ) ) continue; @@ -165,7 +165,7 @@ bool Core::TerritoryMgr::createDefaultTerritories() return true; } -bool Core::TerritoryMgr::createHousingTerritories() +bool Sapphire::TerritoryMgr::createHousingTerritories() { //separate housing zones from default auto pExdData = g_fw.get< Data::ExdDataGenerated >(); @@ -180,7 +180,7 @@ bool Core::TerritoryMgr::createHousingTerritories() if( territoryInfo->name.empty() ) continue; - auto pPlaceName = pExdData->get< Core::Data::PlaceName >( territoryInfo->placeName ); + auto pPlaceName = pExdData->get< Sapphire::Data::PlaceName >( territoryInfo->placeName ); if( !pPlaceName || pPlaceName->name.empty() || !isHousingTerritory( territoryTypeId ) ) continue; @@ -213,7 +213,7 @@ bool Core::TerritoryMgr::createHousingTerritories() return true; } -Core::ZonePtr Core::TerritoryMgr::createTerritoryInstance( uint32_t territoryTypeId ) +Sapphire::ZonePtr Sapphire::TerritoryMgr::createTerritoryInstance( uint32_t territoryTypeId ) { if( !isValidTerritory( territoryTypeId ) ) return nullptr; @@ -224,7 +224,7 @@ Core::ZonePtr Core::TerritoryMgr::createTerritoryInstance( uint32_t territoryTyp auto pExdData = g_fw.get< Data::ExdDataGenerated >(); auto pLog = g_fw.get< Logger >(); auto pTeri = getTerritoryDetail( territoryTypeId ); - auto pPlaceName = pExdData->get< Core::Data::PlaceName >( pTeri->placeName ); + auto pPlaceName = pExdData->get< Sapphire::Data::PlaceName >( pTeri->placeName ); if( !pTeri || !pPlaceName ) return nullptr; @@ -242,16 +242,16 @@ Core::ZonePtr Core::TerritoryMgr::createTerritoryInstance( uint32_t territoryTyp return pZone; } -Core::ZonePtr Core::TerritoryMgr::createInstanceContent( uint32_t contentFinderConditionId ) +Sapphire::ZonePtr Sapphire::TerritoryMgr::createInstanceContent( uint32_t contentFinderConditionId ) { auto pExdData = g_fw.get< Data::ExdDataGenerated >(); - auto pContentFinderCondition = pExdData->get< Core::Data::ContentFinderCondition >( contentFinderConditionId ); + auto pContentFinderCondition = pExdData->get< Sapphire::Data::ContentFinderCondition >( contentFinderConditionId ); if( !pContentFinderCondition ) return nullptr; auto instanceContentId = pContentFinderCondition->content; - auto pInstanceContent = pExdData->get< Core::Data::InstanceContent >( instanceContentId ); + auto pInstanceContent = pExdData->get< Sapphire::Data::InstanceContent >( instanceContentId ); if( !pInstanceContent ) return nullptr; @@ -278,7 +278,7 @@ Core::ZonePtr Core::TerritoryMgr::createInstanceContent( uint32_t contentFinderC return pZone; } -bool Core::TerritoryMgr::removeTerritoryInstance( uint32_t instanceId ) +bool Sapphire::TerritoryMgr::removeTerritoryInstance( uint32_t instanceId ) { ZonePtr pZone; if( ( pZone = getInstanceZonePtr( instanceId ) ) == nullptr ) @@ -301,7 +301,7 @@ bool Core::TerritoryMgr::removeTerritoryInstance( uint32_t instanceId ) return true; } -Core::ZonePtr Core::TerritoryMgr::getInstanceZonePtr( uint32_t instanceId ) const +Sapphire::ZonePtr Sapphire::TerritoryMgr::getInstanceZonePtr( uint32_t instanceId ) const { auto it = m_instanceIdToZonePtrMap.find( instanceId ); if( it == m_instanceIdToZonePtrMap.end() ) @@ -310,7 +310,7 @@ Core::ZonePtr Core::TerritoryMgr::getInstanceZonePtr( uint32_t instanceId ) cons return it->second; } -void Core::TerritoryMgr::loadTerritoryPositionMap() +void Sapphire::TerritoryMgr::loadTerritoryPositionMap() { auto pDb = g_fw.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;" ); @@ -330,7 +330,7 @@ void Core::TerritoryMgr::loadTerritoryPositionMap() } } -Core::ZonePositionPtr Core::TerritoryMgr::getTerritoryPosition( uint32_t territoryPositionId ) const +Sapphire::ZonePositionPtr Sapphire::TerritoryMgr::getTerritoryPosition( uint32_t territoryPositionId ) const { auto it = m_territoryPositionMap.find( territoryPositionId ); @@ -340,7 +340,7 @@ Core::ZonePositionPtr Core::TerritoryMgr::getTerritoryPosition( uint32_t territo return nullptr; } -Core::ZonePtr Core::TerritoryMgr::getZoneByTerritoryTypeId( uint32_t territoryTypeId ) const +Sapphire::ZonePtr Sapphire::TerritoryMgr::getZoneByTerritoryTypeId( uint32_t territoryTypeId ) const { auto zoneMap = m_territoryTypeIdToInstanceGuidMap.find( territoryTypeId ); if( zoneMap == m_territoryTypeIdToInstanceGuidMap.end() ) @@ -350,7 +350,7 @@ Core::ZonePtr Core::TerritoryMgr::getZoneByTerritoryTypeId( uint32_t territoryTy return zoneMap->second.begin()->second; } -Core::ZonePtr Core::TerritoryMgr::getZoneByLandSetId( uint32_t landSetId ) const +Sapphire::ZonePtr Sapphire::TerritoryMgr::getZoneByLandSetId( uint32_t landSetId ) const { auto zoneMap = m_landSetIdToZonePtrMap.find( landSetId ); if( zoneMap == m_landSetIdToZonePtrMap.end() ) @@ -359,7 +359,7 @@ Core::ZonePtr Core::TerritoryMgr::getZoneByLandSetId( uint32_t landSetId ) const return zoneMap->second; } -void Core::TerritoryMgr::updateTerritoryInstances( uint32_t currentTime ) +void Sapphire::TerritoryMgr::updateTerritoryInstances( uint32_t currentTime ) { for( auto& zone : m_zoneSet ) { @@ -372,7 +372,7 @@ void Core::TerritoryMgr::updateTerritoryInstances( uint32_t currentTime ) } } -Core::TerritoryMgr::InstanceIdList Core::TerritoryMgr::getInstanceContentIdList( uint16_t instanceContentId ) const +Sapphire::TerritoryMgr::InstanceIdList Sapphire::TerritoryMgr::getInstanceContentIdList( uint16_t instanceContentId ) const { std::vector< uint32_t > idList; auto zoneMap = m_instanceContentToInstanceMap.find( instanceContentId ); @@ -387,14 +387,14 @@ Core::TerritoryMgr::InstanceIdList Core::TerritoryMgr::getInstanceContentIdList( return idList; } -bool Core::TerritoryMgr::movePlayer( uint32_t territoryTypeId, Core::Entity::PlayerPtr pPlayer ) +bool Sapphire::TerritoryMgr::movePlayer( uint32_t territoryTypeId, Sapphire::Entity::PlayerPtr pPlayer ) { auto pZone = getZoneByTerritoryTypeId( territoryTypeId ); assert( pZone ); return movePlayer( pZone, pPlayer ); } -bool Core::TerritoryMgr::movePlayer( ZonePtr pZone, Core::Entity::PlayerPtr pPlayer ) +bool Sapphire::TerritoryMgr::movePlayer( ZonePtr pZone, Sapphire::Entity::PlayerPtr pPlayer ) { auto pLog = g_fw.get< Logger >(); if( !pZone ) @@ -437,7 +437,7 @@ bool Core::TerritoryMgr::movePlayer( ZonePtr pZone, Core::Entity::PlayerPtr pPla return true; } -Core::ZonePtr Core::TerritoryMgr::getLinkedInstance( uint32_t playerId ) const +Sapphire::ZonePtr Sapphire::TerritoryMgr::getLinkedInstance( uint32_t playerId ) const { auto it = m_playerIdToInstanceMap.find( playerId ); if( it != m_playerIdToInstanceMap.end() ) @@ -447,12 +447,12 @@ Core::ZonePtr Core::TerritoryMgr::getLinkedInstance( uint32_t playerId ) const return nullptr; } -const std::pair< uint16_t, uint16_t >& Core::TerritoryMgr::getCurrentFestival() const +const std::pair< uint16_t, uint16_t >& Sapphire::TerritoryMgr::getCurrentFestival() const { return m_currentFestival; } -void Core::TerritoryMgr::setCurrentFestival( uint16_t festivalId, uint16_t additionalFestival ) +void Sapphire::TerritoryMgr::setCurrentFestival( uint16_t festivalId, uint16_t additionalFestival ) { m_currentFestival = { festivalId, additionalFestival }; @@ -462,7 +462,7 @@ void Core::TerritoryMgr::setCurrentFestival( uint16_t festivalId, uint16_t addit } } -void Core::TerritoryMgr::disableCurrentFestival() +void Sapphire::TerritoryMgr::disableCurrentFestival() { setCurrentFestival( 0 ); } diff --git a/src/servers/sapphire_zone/Zone/TerritoryMgr.h b/src/servers/sapphire_zone/Zone/TerritoryMgr.h index 8e08fdef..1e4dd85c 100644 --- a/src/servers/sapphire_zone/Zone/TerritoryMgr.h +++ b/src/servers/sapphire_zone/Zone/TerritoryMgr.h @@ -5,7 +5,7 @@ #include #include -namespace Core::Data +namespace Sapphire::Data { // TODO: this should actually not be here but should be generated in exdData aswell struct PlaceName; @@ -17,7 +17,7 @@ namespace Core::Data using InstanceContentPtr = std::shared_ptr< InstanceContent >; } -namespace Core +namespace Sapphire { /*! \class TerritoryMgr_c diff --git a/src/servers/sapphire_zone/Zone/Zone.cpp b/src/servers/sapphire_zone/Zone/Zone.cpp index bf615b31..8a1bce65 100644 --- a/src/servers/sapphire_zone/Zone/Zone.cpp +++ b/src/servers/sapphire_zone/Zone/Zone.cpp @@ -37,17 +37,17 @@ #include "TerritoryMgr.h" #include "Framework.h" -using namespace Core::Common; -using namespace Core::Network::Packets; -using namespace Core::Network::Packets::Server; -using namespace Core::Network::ActorControl; +using namespace Sapphire::Common; +using namespace Sapphire::Network::Packets; +using namespace Sapphire::Network::Packets::Server; +using namespace Sapphire::Network::ActorControl; -extern Core::Framework g_fw; +extern Sapphire::Framework g_fw; /** * \brief */ -Core::Zone::Zone() : +Sapphire::Zone::Zone() : m_territoryTypeId( 0 ), m_guId( 0 ), m_currentWeather( Weather::FairSkies ), @@ -57,7 +57,7 @@ Core::Zone::Zone() : { } -Core::Zone::Zone( uint16_t territoryTypeId, uint32_t guId, const std::string& internalName, const std::string& placeName ) : +Sapphire::Zone::Zone( uint16_t territoryTypeId, uint32_t guId, const std::string& internalName, const std::string& placeName ) : m_currentWeather( Weather::FairSkies ), m_nextEObjId( 0x400D0000 ) { @@ -70,14 +70,14 @@ Core::Zone::Zone( uint16_t territoryTypeId, uint32_t guId, const std::string& in m_lastMobUpdate = 0; m_weatherOverride = Weather::None; - m_territoryTypeInfo = pExdData->get< Core::Data::TerritoryType >( territoryTypeId ); + m_territoryTypeInfo = pExdData->get< Sapphire::Data::TerritoryType >( territoryTypeId ); loadWeatherRates(); m_currentWeather = getNextWeather(); } -void Core::Zone::loadWeatherRates() +void Sapphire::Zone::loadWeatherRates() { if( !m_territoryTypeInfo ) return; @@ -102,11 +102,11 @@ void Core::Zone::loadWeatherRates() } } -Core::Zone::~Zone() +Sapphire::Zone::~Zone() { } -bool Core::Zone::init() +bool Sapphire::Zone::init() { auto pScriptMgr = g_fw.get< Scripting::ScriptMgr >(); @@ -119,22 +119,22 @@ bool Core::Zone::init() return true; } -void Core::Zone::setWeatherOverride( Weather weather ) +void Sapphire::Zone::setWeatherOverride( Weather weather ) { m_weatherOverride = weather; } -Weather Core::Zone::getCurrentWeather() const +Weather Sapphire::Zone::getCurrentWeather() const { return m_currentWeather; } -const Core::FestivalPair& Core::Zone::getCurrentFestival() const +const Sapphire::FestivalPair& Sapphire::Zone::getCurrentFestival() const { return m_currentFestival; } -void Core::Zone::setCurrentFestival( uint16_t festivalId, uint16_t additionalFestivalId ) +void Sapphire::Zone::setCurrentFestival( uint16_t festivalId, uint16_t additionalFestivalId ) { m_currentFestival = { festivalId, additionalFestivalId }; @@ -147,11 +147,11 @@ void Core::Zone::setCurrentFestival( uint16_t festivalId, uint16_t additionalFes } } -void Core::Zone::loadCellCache() +void Sapphire::Zone::loadCellCache() { } -Weather Core::Zone::getNextWeather() +Weather Sapphire::Zone::getNextWeather() { uint32_t unixTime = static_cast< uint32_t >( Util::getTimeSeconds() ); // Get Eorzea hour for weather start @@ -181,7 +181,7 @@ Weather Core::Zone::getNextWeather() return Weather::FairSkies; } -void Core::Zone::pushActor( Entity::ActorPtr pActor ) +void Sapphire::Zone::pushActor( Entity::ActorPtr pActor ) { float mx = pActor->getPos().x; float my = pActor->getPos().z; @@ -239,7 +239,7 @@ void Core::Zone::pushActor( Entity::ActorPtr pActor ) } } -void Core::Zone::removeActor( Entity::ActorPtr pActor ) +void Sapphire::Zone::removeActor( Entity::ActorPtr pActor ) { float mx = pActor->getPos().x; float my = pActor->getPos().z; @@ -277,7 +277,7 @@ void Core::Zone::removeActor( Entity::ActorPtr pActor ) } -void Core::Zone::queuePacketForRange( Entity::Player& sourcePlayer, uint32_t range, +void Sapphire::Zone::queuePacketForRange( Entity::Player& sourcePlayer, uint32_t range, Network::Packets::FFXIVPacketBasePtr pPacketEntry ) { auto pTeriMgr = g_fw.get< TerritoryMgr >(); @@ -306,7 +306,7 @@ void Core::Zone::queuePacketForRange( Entity::Player& sourcePlayer, uint32_t ran } } -void Core::Zone::queuePacketForZone( Entity::Player& sourcePlayer, +void Sapphire::Zone::queuePacketForZone( Entity::Player& sourcePlayer, Network::Packets::FFXIVPacketBasePtr pPacketEntry, bool forSelf ) { @@ -328,32 +328,32 @@ void Core::Zone::queuePacketForZone( Entity::Player& sourcePlayer, } } -uint32_t Core::Zone::getTerritoryTypeId() const +uint32_t Sapphire::Zone::getTerritoryTypeId() const { return m_territoryTypeId; } -uint32_t Core::Zone::getGuId() const +uint32_t Sapphire::Zone::getGuId() const { return m_guId; } -const std::string& Core::Zone::getName() const +const std::string& Sapphire::Zone::getName() const { return m_placeName; } -const std::string& Core::Zone::getInternalName() const +const std::string& Sapphire::Zone::getInternalName() const { return m_internalName; } -std::size_t Core::Zone::getPopCount() const +std::size_t Sapphire::Zone::getPopCount() const { return m_playerMap.size(); } -bool Core::Zone::checkWeather() +bool Sapphire::Zone::checkWeather() { if( m_weatherOverride != Weather::None ) { @@ -376,7 +376,7 @@ bool Core::Zone::checkWeather() } /* -void Core::Zone::updateBnpcs( int64_t tickCount ) +void Sapphire::Zone::updateBnpcs( int64_t tickCount ) { if( ( tickCount - m_lastMobUpdate ) > 250 ) { @@ -425,7 +425,7 @@ void Core::Zone::updateBnpcs( int64_t tickCount ) } */ -bool Core::Zone::update( uint32_t currTime ) +bool Sapphire::Zone::update( uint32_t currTime ) { int64_t tickCount = Util::getTimeMs(); @@ -439,7 +439,7 @@ bool Core::Zone::update( uint32_t currTime ) return true; } -void Core::Zone::updateSessions( bool changedWeather ) +void Sapphire::Zone::updateSessions( bool changedWeather ) { auto it = m_sessionSet.begin(); @@ -480,7 +480,7 @@ void Core::Zone::updateSessions( bool changedWeather ) } } -bool Core::Zone::isCellActive( uint32_t x, uint32_t y ) +bool Sapphire::Zone::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 ); @@ -505,7 +505,7 @@ bool Core::Zone::isCellActive( uint32_t x, uint32_t y ) return false; } -void Core::Zone::updateCellActivity( uint32_t x, uint32_t y, int32_t radius ) +void Sapphire::Zone::updateCellActivity( uint32_t x, uint32_t y, int32_t radius ) { uint32_t endX = ( x + radius ) <= _sizeX ? x + radius : ( _sizeX - 1 ); @@ -554,7 +554,7 @@ void Core::Zone::updateCellActivity( uint32_t x, uint32_t y, int32_t radius ) } } -void Core::Zone::updateActorPosition( Entity::Actor& actor ) +void Sapphire::Zone::updateActorPosition( Entity::Actor& actor ) { if( actor.getCurrentZone() != shared_from_this() ) @@ -626,7 +626,7 @@ void Core::Zone::updateActorPosition( Entity::Actor& actor ) } -void Core::Zone::updateInRangeSet( Entity::ActorPtr pActor, Cell* pCell ) +void Sapphire::Zone::updateInRangeSet( Entity::ActorPtr pActor, Cell* pCell ) { if( pCell == nullptr ) return; @@ -679,7 +679,7 @@ void Core::Zone::updateInRangeSet( Entity::ActorPtr pActor, Cell* pCell ) } } -void Core::Zone::onPlayerZoneIn( Entity::Player& player ) +void Sapphire::Zone::onPlayerZoneIn( Entity::Player& player ) { auto pLog = g_fw.get< Logger >(); pLog->debug( @@ -687,7 +687,7 @@ void Core::Zone::onPlayerZoneIn( Entity::Player& player ) +", Entity#" + std::to_string( player.getId() ) ); } -void Core::Zone::onLeaveTerritory( Entity::Player& player ) +void Sapphire::Zone::onLeaveTerritory( Entity::Player& player ) { auto pLog = g_fw.get< Logger >(); pLog->debug( @@ -695,27 +695,27 @@ void Core::Zone::onLeaveTerritory( Entity::Player& player ) +", Entity#" + std::to_string( player.getId() ) ); } -void Core::Zone::onUpdate( uint32_t currTime ) +void Sapphire::Zone::onUpdate( uint32_t currTime ) { } -void Core::Zone::onFinishLoading( Entity::Player& player ) +void Sapphire::Zone::onFinishLoading( Entity::Player& player ) { } -void Core::Zone::onInitDirector( Entity::Player& player ) +void Sapphire::Zone::onInitDirector( Entity::Player& player ) { } -void Core::Zone::onEnterTerritory( Core::Entity::Player& player, uint32_t eventId, uint16_t param1, uint16_t param2 ) +void Sapphire::Zone::onEnterTerritory( Sapphire::Entity::Player& player, uint32_t eventId, uint16_t param1, uint16_t param2 ) { } -void Core::Zone::registerEObj( Entity::EventObjectPtr object ) +void Sapphire::Zone::registerEObj( Entity::EventObjectPtr object ) { if( !object ) return; @@ -730,7 +730,7 @@ void Core::Zone::registerEObj( Entity::EventObjectPtr object ) pLog->debug( "Registered instance eobj: " + std::to_string( object->getId() ) ); } -Core::Entity::EventObjectPtr Core::Zone::getEObj( uint32_t objId ) +Sapphire::Entity::EventObjectPtr Sapphire::Zone::getEObj( uint32_t objId ) { auto obj = m_eventObjects.find( objId ); if( obj == m_eventObjects.end() ) @@ -739,17 +739,17 @@ Core::Entity::EventObjectPtr Core::Zone::getEObj( uint32_t objId ) return obj->second; } -Core::InstanceContentPtr Core::Zone::getAsInstanceContent() +Sapphire::InstanceContentPtr Sapphire::Zone::getAsInstanceContent() { return std::dynamic_pointer_cast< InstanceContent, Zone >( shared_from_this() ); } -uint32_t Core::Zone::getNextEObjId() +uint32_t Sapphire::Zone::getNextEObjId() { return ++m_nextEObjId; } -Core::Entity::EventObjectPtr Core::Zone::registerEObj( const std::string& name, uint32_t objectId, uint32_t mapLink, +Sapphire::Entity::EventObjectPtr Sapphire::Zone::registerEObj( const std::string& name, uint32_t objectId, uint32_t mapLink, uint8_t state, FFXIVARR_POSITION3 pos, float scale, float rotation ) { diff --git a/src/servers/sapphire_zone/Zone/Zone.h b/src/servers/sapphire_zone/Zone/Zone.h index 9e973702..fabadf8b 100644 --- a/src/servers/sapphire_zone/Zone/Zone.h +++ b/src/servers/sapphire_zone/Zone/Zone.h @@ -16,7 +16,7 @@ #include #include -namespace Core +namespace Sapphire { class Session; diff --git a/src/servers/sapphire_zone/Zone/ZonePosition.cpp b/src/servers/sapphire_zone/Zone/ZonePosition.cpp index a1a1a6ee..2b017d78 100644 --- a/src/servers/sapphire_zone/Zone/ZonePosition.cpp +++ b/src/servers/sapphire_zone/Zone/ZonePosition.cpp @@ -1,12 +1,12 @@ #include "ZonePosition.h" -Core::ZonePosition::ZonePosition() +Sapphire::ZonePosition::ZonePosition() : m_id( 0 ), m_targetZoneId( 0 ), m_radius( 0 ) { } -Core::ZonePosition::ZonePosition( uint32_t id, uint32_t targetZoneId, const Common::FFXIVARR_POSITION3& targetPosition, +Sapphire::ZonePosition::ZonePosition( uint32_t id, uint32_t targetZoneId, const Common::FFXIVARR_POSITION3& targetPosition, uint32_t radius, float rotation ) { m_id = id; @@ -16,26 +16,26 @@ Core::ZonePosition::ZonePosition( uint32_t id, uint32_t targetZoneId, const Comm m_rotation = rotation; } -Core::ZonePosition::~ZonePosition() +Sapphire::ZonePosition::~ZonePosition() { } -uint32_t Core::ZonePosition::getId() const +uint32_t Sapphire::ZonePosition::getId() const { return m_id; } -uint32_t Core::ZonePosition::getTargetZoneId() const +uint32_t Sapphire::ZonePosition::getTargetZoneId() const { return m_targetZoneId; } -const Core::Common::FFXIVARR_POSITION3& Core::ZonePosition::getTargetPosition() const +const Sapphire::Common::FFXIVARR_POSITION3& Sapphire::ZonePosition::getTargetPosition() const { return m_targetPos; } -float Core::ZonePosition::getTargetRotation() const +float Sapphire::ZonePosition::getTargetRotation() const { return m_rotation; } diff --git a/src/servers/sapphire_zone/Zone/ZonePosition.h b/src/servers/sapphire_zone/Zone/ZonePosition.h index 82ae6494..cdbc887e 100644 --- a/src/servers/sapphire_zone/Zone/ZonePosition.h +++ b/src/servers/sapphire_zone/Zone/ZonePosition.h @@ -3,7 +3,7 @@ #include -namespace Core { +namespace Sapphire { class ZonePosition { diff --git a/src/servers/sapphire_zone/mainGameServer.cpp b/src/servers/sapphire_zone/mainGameServer.cpp index e6acc87d..d0ac6c4c 100644 --- a/src/servers/sapphire_zone/mainGameServer.cpp +++ b/src/servers/sapphire_zone/mainGameServer.cpp @@ -16,9 +16,9 @@ #include -Core::Framework g_fw; +Sapphire::Framework g_fw; -using namespace Core; +using namespace Sapphire; bool setupFramework() { diff --git a/src/tools/discovery_parser/main.cpp b/src/tools/discovery_parser/main.cpp index 17efbed0..06c1326d 100644 --- a/src/tools/discovery_parser/main.cpp +++ b/src/tools/discovery_parser/main.cpp @@ -261,7 +261,7 @@ std::string zoneNameToPath( const std::string& name ) info.name = teriName; zoneInfoMap[ row.first ] = info; - if( !found && ( Core::Util::toLowerCopy( name ) == Core::Util::toLowerCopy( teriName ) ) ) + if( !found && ( Sapphire::Util::toLowerCopy( name ) == Sapphire::Util::toLowerCopy( teriName ) ) ) { found = true; path = teriPath; @@ -273,7 +273,7 @@ std::string zoneNameToPath( const std::string& name ) { for( const auto& entry : zoneInfoMap ) { - if( found = Core::Util::toLowerCopy( name ) == Core::Util::toLowerCopy( entry.second.name ) ) + if( found = Sapphire::Util::toLowerCopy( name ) == Sapphire::Util::toLowerCopy( entry.second.name ) ) { path = entry.second.path; zoneId = entry.second.id; diff --git a/src/tools/event_object_parser/instance.tmpl b/src/tools/event_object_parser/instance.tmpl index d86b4ac5..7544e2e9 100644 --- a/src/tools/event_object_parser/instance.tmpl +++ b/src/tools/event_object_parser/instance.tmpl @@ -17,7 +17,7 @@ public: } - void onEnterTerritory( InstanceContentPtr instance, Core::Entity::Player& player, Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override + void onEnterTerritory( InstanceContentPtr instance, Sapphire::Entity::Player& player, Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override { } diff --git a/src/tools/event_object_parser/main.cpp b/src/tools/event_object_parser/main.cpp index 1f5c2333..dc943f60 100644 --- a/src/tools/event_object_parser/main.cpp +++ b/src/tools/event_object_parser/main.cpp @@ -209,7 +209,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 && ( Core::Util::toLowerCopy( name) == Core::Util::toLowerCopy( teriName ) ) ) + if( !found && ( Sapphire::Util::toLowerCopy( name) == Sapphire::Util::toLowerCopy( teriName ) ) ) { path = teriPath; found = true; @@ -331,7 +331,7 @@ void loadAllInstanceContentEntries() zoneDumpList.emplace( zoneNameMap[ teri ] ); std::string remove = "★_ '()[]-\x1a\x1\x2\x1f\x1\x3.:"; - Core::Util::eraseAllIn( name, remove ); + Sapphire::Util::eraseAllIn( name, remove ); name[ 0 ] = toupper( name[ 0 ] ); contentList.push_back( { id, name, zoneNameMap[ teri ], type } ); } @@ -585,7 +585,7 @@ int main( int argc, char* argv[] ) { name = eobjNameMap[ id ]; std::string remove = "★_ '()[]-\x1a\x1\x2\x1f\x1\x3.:"; - Core::Util::eraseAllIn( name, remove ); + Sapphire::Util::eraseAllIn( name, remove ); name[ 0 ] = toupper( name[ 0 ] ); } diff --git a/src/tools/exd_common_gen/generated.h b/src/tools/exd_common_gen/generated.h index 06a911ba..ef6ceb13 100644 --- a/src/tools/exd_common_gen/generated.h +++ b/src/tools/exd_common_gen/generated.h @@ -6,7 +6,7 @@ /* This file has been automatically generated. Changes will be lost upon regeneration. To change the content edit tools/exd_common_gen */ -namespace Core { +namespace Sapphire { namespace Common { /////////////////////////////////////////////////////////// diff --git a/src/tools/exd_common_gen/main.cpp b/src/tools/exd_common_gen/main.cpp index aa2ba071..0174ba6b 100644 --- a/src/tools/exd_common_gen/main.cpp +++ b/src/tools/exd_common_gen/main.cpp @@ -17,8 +17,8 @@ #include -Core::Logger g_log; -Core::Data::ExdDataGenerated g_exdData; +Sapphire::Logger g_log; +Sapphire::Data::ExdDataGenerated g_exdData; //const std::string datLocation( "/opt/sapphire_3_15_0/bin/sqpack" ); @@ -57,7 +57,7 @@ std::string generateEnum( const std::string& exd, int8_t nameIndex, const std::s } std::string remove = ",_-':!(){} \x02\x1f\x01\x03"; - Core::Util::eraseAllIn( value, remove ); + Sapphire::Util::eraseAllIn( value, remove ); value[ 0 ] = std::toupper( value[ 0 ] ); @@ -109,7 +109,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 Core {\n"; + result += "namespace Sapphire {\n"; result += "namespace Common {\n"; result += generateEnum( "ActionCategory", 0, "uint8_t" ); result += generateEnum( "BeastReputationRank", 1, "uint8_t" ); diff --git a/src/tools/exd_struct_gen/ExdData.cpp.tmpl b/src/tools/exd_struct_gen/ExdData.cpp.tmpl index a4babc6d..72a2d752 100644 --- a/src/tools/exd_struct_gen/ExdData.cpp.tmpl +++ b/src/tools/exd_struct_gen/ExdData.cpp.tmpl @@ -6,22 +6,22 @@ CONSTRUCTORS -Core::Data::ExdDataGenerated::ExdDataGenerated() +Sapphire::Data::ExdDataGenerated::ExdDataGenerated() { } -Core::Data::ExdDataGenerated::~ExdDataGenerated() +Sapphire::Data::ExdDataGenerated::~ExdDataGenerated() { } -xiv::exd::Exd Core::Data::ExdDataGenerated::setupDatAccess( const std::string& name, xiv::exd::Language lang ) +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 ) ); }; -void Core::Data::ExdDataGenerated::loadIdList( xiv::exd::Exd& data, std::set< uint32_t >& outIdList ) +void Sapphire::Data::ExdDataGenerated::loadIdList( xiv::exd::Exd& data, std::set< uint32_t >& outIdList ) { auto pDataRows = data.get_rows(); @@ -32,7 +32,7 @@ void Core::Data::ExdDataGenerated::loadIdList( xiv::exd::Exd& data, std::set< ui } } -bool Core::Data::ExdDataGenerated::init( const std::string& path ) +bool Sapphire::Data::ExdDataGenerated::init( const std::string& path ) { try { diff --git a/src/tools/exd_struct_gen/ExdData.h.tmpl b/src/tools/exd_struct_gen/ExdData.h.tmpl index 20ac48c5..6af410b4 100644 --- a/src/tools/exd_struct_gen/ExdData.h.tmpl +++ b/src/tools/exd_struct_gen/ExdData.h.tmpl @@ -13,7 +13,7 @@ #include #include -namespace Core { +namespace Sapphire { namespace Data { class ExdDataGenerated; diff --git a/src/tools/exd_struct_gen/main.cpp b/src/tools/exd_struct_gen/main.cpp index 306e2473..7f8c9fec 100644 --- a/src/tools/exd_struct_gen/main.cpp +++ b/src/tools/exd_struct_gen/main.cpp @@ -21,8 +21,8 @@ -Core::Logger g_log; -Core::Data::ExdDataGenerated g_exdData; +Sapphire::Logger g_log; +Sapphire::Data::ExdDataGenerated g_exdData; bool skipUnmapped = true; std::map< char, std::string > numberToStringMap @@ -244,11 +244,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, Core::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, Core::Data::ExdDataGenerated* exdData );\n"; + result += "\n " + exd + "( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );\n"; } result += "};\n\n"; @@ -269,13 +269,13 @@ std::string generateConstructorsDecl( const std::string& exd ) auto exhHead = exh.get_header(); if( exhHead.variant == 2 ) { - result += "\nCore::Data::" + exd + "::" + exd + "( uint32_t row_id, uint32_t subRow, Core::Data::ExdDataGenerated* exdData )\n"; + result += "\nSapphire::Data::" + exd + "::" + exd + "( uint32_t row_id, uint32_t subRow, Sapphire::Data::ExdDataGenerated* exdData )\n"; result += "{\n"; result += indent + "auto row = exdData->m_" + exd + "Dat.get_row( row_id, subRow );\n"; } else { - result += "\nCore::Data::" + exd + "::" + exd + "( uint32_t row_id, Core::Data::ExdDataGenerated* exdData )\n"; + result += "\nSapphire::Data::" + exd + "::" + exd + "( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )\n"; result += "{\n"; result += indent + "auto row = exdData->m_" + exd + "Dat.get_row( row_id );\n"; } diff --git a/src/tools/exd_struct_test/ExdData.cpp.tmpl b/src/tools/exd_struct_test/ExdData.cpp.tmpl index 47bd4ac5..c38a99b8 100644 --- a/src/tools/exd_struct_test/ExdData.cpp.tmpl +++ b/src/tools/exd_struct_test/ExdData.cpp.tmpl @@ -3,21 +3,21 @@ #include -Core::Data::ExdDataGenerated::ExdDataGenerated() +Sapphire::Data::ExdDataGenerated::ExdDataGenerated() { } -Core::Data::ExdDataGenerated::~ExdDataGenerated() +Sapphire::Data::ExdDataGenerated::~ExdDataGenerated() { } -xiv::exd::Exd Core::Data::ExdDataGenerated::setupDatAccess( const std::string& name, xiv::exd::Language lang ) +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 ) ); }; -bool Core::Data::ExdDataGenerated::init( const std::string& path ) +bool Sapphire::Data::ExdDataGenerated::init( const std::string& path ) { try { diff --git a/src/tools/exd_struct_test/ExdData.h.tmpl b/src/tools/exd_struct_test/ExdData.h.tmpl index 93bc1edf..aa5e2872 100644 --- a/src/tools/exd_struct_test/ExdData.h.tmpl +++ b/src/tools/exd_struct_test/ExdData.h.tmpl @@ -12,7 +12,7 @@ #include #include -namespace Core { +namespace Sapphire { namespace Data { STRUCTS diff --git a/src/tools/exd_struct_test/main.cpp b/src/tools/exd_struct_test/main.cpp index ea4389d9..d86f00e0 100644 --- a/src/tools/exd_struct_test/main.cpp +++ b/src/tools/exd_struct_test/main.cpp @@ -17,8 +17,8 @@ #include -Core::Logger g_log; -Core::Data::ExdDataGenerated g_exdData; +Sapphire::Logger g_log; +Sapphire::Data::ExdDataGenerated g_exdData; //const std::string datLocation( "/opt/sapphire_3_15_0/bin/sqpack" ); @@ -44,13 +44,13 @@ int main() //g_log.info( "getting id list done" ); //for( auto id : idList ) { - auto teri1 = g_exdData.get< Core::Data::GilShopItem >( 262440, 0 ); + auto teri1 = g_exdData.get< Sapphire::Data::GilShopItem >( 262440, 0 ); g_log.info( "0 -> " + std::to_string( teri1->item ) ); - auto teri2 = g_exdData.get< Core::Data::GilShopItem >( 262440, 1 ); + auto teri2 = g_exdData.get< Sapphire::Data::GilShopItem >( 262440, 1 ); g_log.info( "1 -> " + std::to_string( teri2->item ) ); - auto teri3 = g_exdData.get< Core::Data::GilShopItem >( 262440, 2 ); + auto teri3 = g_exdData.get< Sapphire::Data::GilShopItem >( 262440, 2 ); g_log.info( "2 -> " + std::to_string( teri3->item ) ); } diff --git a/src/tools/mob_parse/main.cpp b/src/tools/mob_parse/main.cpp index c7de3b46..8fa6ab68 100644 --- a/src/tools/mob_parse/main.cpp +++ b/src/tools/mob_parse/main.cpp @@ -22,8 +22,8 @@ namespace filesys = std::experimental::filesystem; #include #include -Core::Logger g_log; -Core::Data::ExdDataGenerated g_exdData; +Sapphire::Logger g_log; +Sapphire::Data::ExdDataGenerated g_exdData; //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" ); @@ -120,7 +120,7 @@ std::string binaryToHexString( uint8_t* pBinData, uint16_t size ) for( uint32_t i = 0; i < size; i++ ) { - outStr += Core::Util::intToHexString( pBinData[ i ] & 0xFF ); + outStr += Sapphire::Util::intToHexString( pBinData[ i ] & 0xFF ); } return outStr; @@ -255,9 +255,9 @@ int dumpSpawns() for( auto entry : zoneToPacketList ) { - //auto nameStruct = g_exdData.get< Core::Data::BNpcName >( entry.first ); - auto teri1 = g_exdData.get< Core::Data::TerritoryType >( entry.first ); - auto teriPlaceName = g_exdData.get< Core::Data::PlaceName >( teri1->placeName ); + //auto nameStruct = g_exdData.get< Sapphire::Data::BNpcName >( entry.first ); + auto teri1 = g_exdData.get< Sapphire::Data::TerritoryType >( entry.first ); + auto teriPlaceName = g_exdData.get< Sapphire::Data::PlaceName >( teri1->placeName ); g_log.info( std::to_string( entry.first ) + " - " + teri1->name + " - " + teriPlaceName->name ); g_log.info( "Mob Count: " + std::to_string( entry.second.size() ) ); @@ -265,7 +265,7 @@ int dumpSpawns() { nameToPacketList[ mob.bNPCBase ].push_back( mob ); - auto nameStruct = g_exdData.get< Core::Data::BNpcName >( mob.bNPCName ); + auto nameStruct = g_exdData.get< Sapphire::Data::BNpcName >( mob.bNPCName ); //g_log.info( nameStruct->singular + " " + std::to_string( packet.bNPCBase ) ); } @@ -281,7 +281,7 @@ int dumpSpawns() for( auto mobName : lvlToPacket ) { - auto nameStruct = g_exdData.get< Core::Data::BNpcName >( mobName.second.at(0).bNPCName ); + auto nameStruct = g_exdData.get< Sapphire::Data::BNpcName >( mobName.second.at(0).bNPCName ); g_log.info( "|--> " + nameStruct->singular + "(" + std::to_string( mobName.second.size() ) + ")" ); spawngroups++; @@ -418,7 +418,7 @@ int dumpTemplates() if( pos != std::string::npos ) { auto zoneIdStr = file.substr( pos + 1 ); - auto teri1 = g_exdData.get< Core::Data::TerritoryType >( std::stoi( zoneIdStr ) ); + auto teri1 = g_exdData.get< Sapphire::Data::TerritoryType >( std::stoi( zoneIdStr ) ); g_log.info( zoneIdStr + " - " + teri1->name ); } } @@ -433,7 +433,7 @@ int dumpTemplates() nameToPacketList[ packet.bNPCName ].push_back( packet ); - auto nameStruct = g_exdData.get< Core::Data::BNpcName >( packet.bNPCName ); + auto nameStruct = g_exdData.get< Sapphire::Data::BNpcName >( packet.bNPCName ); //g_log.info( nameStruct->singular + " " + std::to_string( packet.bNPCBase ) ); } */ @@ -445,9 +445,9 @@ int dumpTemplates() for( auto entry : zoneToPacketList ) { - //auto nameStruct = g_exdData.get< Core::Data::BNpcName >( entry.first ); - auto teri1 = g_exdData.get< Core::Data::TerritoryType >( entry.first ); - auto teriPlaceName = g_exdData.get< Core::Data::PlaceName >( teri1->placeName ); + //auto nameStruct = g_exdData.get< Sapphire::Data::BNpcName >( entry.first ); + auto teri1 = g_exdData.get< Sapphire::Data::TerritoryType >( entry.first ); + auto teriPlaceName = g_exdData.get< Sapphire::Data::PlaceName >( teri1->placeName ); g_log.info( std::to_string( entry.first ) + " - " + teri1->name + " - " + teriPlaceName->name ); g_log.info( "Mob Count: " + std::to_string( entry.second.size() ) ); @@ -455,7 +455,7 @@ int dumpTemplates() { nameToPacketList[ mob.bNPCBase ].push_back( mob ); - auto nameStruct = g_exdData.get< Core::Data::BNpcName >( mob.bNPCName ); + auto nameStruct = g_exdData.get< Sapphire::Data::BNpcName >( mob.bNPCName ); //g_log.info( nameStruct->singular + " " + std::to_string( packet.bNPCBase ) ); } @@ -463,7 +463,7 @@ int dumpTemplates() for( auto mobName : nameToPacketList ) { - auto nameStruct = g_exdData.get< Core::Data::BNpcName >( mobName.second.at(0).bNPCName ); + auto nameStruct = g_exdData.get< Sapphire::Data::BNpcName >( mobName.second.at(0).bNPCName ); g_log.info( "|--> " + nameStruct->singular + "(" + std::to_string( mobName.second.size() ) + ")" ); auto instance = mobName.second.at(0); @@ -560,7 +560,7 @@ int dumpTemplates() g_log.info( "getting id list done" ); for( auto id : idList ) { - auto teri1 = g_exdData.get( id ); + auto teri1 = g_exdData.get( id ); g_log.info( teri1->name ); }*/ diff --git a/src/tools/pcb_reader/main.cpp b/src/tools/pcb_reader/main.cpp index 7c92eb63..30544613 100644 --- a/src/tools/pcb_reader/main.cpp +++ b/src/tools/pcb_reader/main.cpp @@ -195,7 +195,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 && ( Core::Util::toLowerCopy( name ) == Core::Util::toLowerCopy( teriName ) ) ) + if( !found && ( Sapphire::Util::toLowerCopy( name ) == Sapphire::Util::toLowerCopy( teriName ) ) ) { path = teriPath; found = true; diff --git a/src/tools/quest_parser/main.cpp b/src/tools/quest_parser/main.cpp index 06990703..3205576d 100644 --- a/src/tools/quest_parser/main.cpp +++ b/src/tools/quest_parser/main.cpp @@ -21,8 +21,8 @@ #include -Core::Logger g_log; -Core::Data::ExdDataGenerated g_exdDataGen; +Sapphire::Logger g_log; +Sapphire::Data::ExdDataGenerated g_exdDataGen; namespace fs = std::experimental::filesystem; const std::string onTalkStr( @@ -63,7 +63,7 @@ std::string titleCase( const std::string& str ) } void -createScript( std::shared_ptr< Core::Data::Quest >& pQuestData, std::set< std::string >& additionalList, int questId ) +createScript( std::shared_ptr< Sapphire::Data::Quest >& pQuestData, std::set< std::string >& additionalList, int questId ) { std::string header( "// This is an automatically generated C++ script template\n" @@ -364,7 +364,7 @@ int main( int argc, char** argv ) for( const auto& row : rows ) { g_log.info( "Generating " + std::to_string( row ) ); - auto questInfo = g_exdDataGen.get< Core::Data::Quest >( row ); + auto questInfo = g_exdDataGen.get< Sapphire::Data::Quest >( row ); if( questInfo->name.empty() || questInfo->id.empty() ) {