diff --git a/.gitignore b/.gitignore index ab6dec6b..b0edf0d5 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,4 @@ -bin +bin .vs *.dat *.suo @@ -63,6 +63,7 @@ bin /Debug /bin/s /bin/initui_1121.cpp +/src/libraries /lib/xiv_dat_lib/.vs /Server_Common/.vs /Server_Common/.vs diff --git a/src/servers/Server_Common/CommonNetwork.h b/src/servers/Server_Common/CommonNetwork.h index 017035a6..0ddcbc54 100644 --- a/src/servers/Server_Common/CommonNetwork.h +++ b/src/servers/Server_Common/CommonNetwork.h @@ -255,8 +255,8 @@ namespace Packets { DiscoveryHandler = 0x0109,// updated for sb SkillHandler = 0x010B, // updated for sb - GMCommand1 = 0x010D,// updated for sb - GMCommand2 = 0x010E,// updated for sb + GMCommand1 = 0x010C,// updated for sb + GMCommand2 = 0x010D,// updated for sb UpdatePositionHandler = 0x010F, // updated for sb InventoryModifyHandler = 0x0116, // updated for sb diff --git a/src/servers/Server_Zone/GameCommandHandler.cpp b/src/servers/Server_Zone/GameCommandHandler.cpp index 59318d6b..e0868335 100644 --- a/src/servers/Server_Zone/GameCommandHandler.cpp +++ b/src/servers/Server_Zone/GameCommandHandler.cpp @@ -201,6 +201,12 @@ void Core::GameCommandHandler::set( char * data, Core::Entity::PlayerPtr pPlayer pPlayer->teleport( aetheryteId ); } + else if( ( subCommand == "unlockaetheryte" ) && ( params != "" ) ) + { + for( uint8_t i = 0; i < 255; i++ ) + pPlayer->registerAetheryte( i ); + } + else if( ( subCommand == "discovery" ) && ( params != "" ) ) { int32_t map_id; diff --git a/src/servers/Server_Zone/InitUIPacket.h b/src/servers/Server_Zone/InitUIPacket.h index 44d033f6..9854aa4f 100644 --- a/src/servers/Server_Zone/InitUIPacket.h +++ b/src/servers/Server_Zone/InitUIPacket.h @@ -68,6 +68,7 @@ private: memcpy( m_data.howto, player->getHowToArray(), sizeof( m_data.howto ) ); + m_data.expansion = 2; //memset( m_data.unlockBitmask, 0xFF, sizeof( m_data.unlockBitmask ) ); //memset( m_data.unknown_0344, 0xFF, sizeof( m_data.unknown_0344 ) );