From c28fcdd02b93fe5bce35adc94ee7e834cc2b5974 Mon Sep 17 00:00:00 2001 From: amibu Date: Tue, 8 Aug 2017 18:05:56 +0200 Subject: [PATCH 1/3] Set expansion level, update gitignore for libraries --- .gitignore | 3 ++- src/servers/Server_Zone/InitUIPacket.h | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) 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_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 ) ); From 28370ebd30c784c5db91bded7cc1dfdcb5198e4d Mon Sep 17 00:00:00 2001 From: amibu Date: Tue, 8 Aug 2017 18:22:18 +0200 Subject: [PATCH 2/3] GM command opcodes --- src/servers/Server_Common/CommonNetwork.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 From d4a86366dd1f7327ba78254f37eb52e708f71b5c Mon Sep 17 00:00:00 2001 From: amibu Date: Tue, 8 Aug 2017 19:24:41 +0200 Subject: [PATCH 3/3] Added unlockaetheryte command --- src/servers/Server_Zone/GameCommandHandler.cpp | 6 ++++++ 1 file changed, 6 insertions(+) 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;