From 3924e5450c61a8346128b126eafaaaaba2b6bb47 Mon Sep 17 00:00:00 2001 From: Mordred Admin Date: Wed, 9 Aug 2017 10:30:18 +0200 Subject: [PATCH 1/5] Please use spaces instead of tabs --- src/servers/Server_Common/Common.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/servers/Server_Common/Common.h b/src/servers/Server_Common/Common.h index 0aac4f00..47551971 100644 --- a/src/servers/Server_Common/Common.h +++ b/src/servers/Server_Common/Common.h @@ -639,7 +639,7 @@ namespace Core { Cutscene, ChocoPorter, Afk, - CameraMode, + CameraMode, LfRepairs, LfRepair, LfMeld, @@ -955,4 +955,4 @@ namespace Core { } /* Common */ } /* Core */ -#endif \ No newline at end of file +#endif From eeee74d523134d96fe2b210d4823b78a6b0760f2 Mon Sep 17 00:00:00 2001 From: amibu Date: Wed, 9 Aug 2017 14:38:46 +0200 Subject: [PATCH 2/5] Add "@set classjob" command --- src/servers/Server_Zone/GameCommandHandler.cpp | 16 ++++++++++++++++ src/servers/Server_Zone/Player.cpp | 14 ++++++++++++++ src/servers/Server_Zone/Player.h | 4 ++++ 3 files changed, 34 insertions(+) diff --git a/src/servers/Server_Zone/GameCommandHandler.cpp b/src/servers/Server_Zone/GameCommandHandler.cpp index 9d449372..1a567b95 100644 --- a/src/servers/Server_Zone/GameCommandHandler.cpp +++ b/src/servers/Server_Zone/GameCommandHandler.cpp @@ -243,6 +243,22 @@ void Core::GameCommandHandler::set( char * data, Core::Entity::PlayerPtr pPlayer pPlayer->resetDiscovery(); pPlayer->queuePacket( Network::Packets::Server::InitUIPacket( pPlayer ) ); } + else if( subCommand == "classjob" ) + { + int32_t id; + + sscanf( params.c_str(), "%d", &id ); + + g_log.debug( std::to_string( pPlayer->getLevelForClass( static_cast ( id ) ) ) ); + + if( pPlayer->getLevelForClass( static_cast ( id ) ) == 0 ) + { + pPlayer->setLevelForClass( 1, static_cast ( id ) ); + pPlayer->setClassJob( static_cast ( id ) ); + } + else + pPlayer->setClassJob( static_cast ( id ) ); + } } diff --git a/src/servers/Server_Zone/Player.cpp b/src/servers/Server_Zone/Player.cpp index 66872071..e607be79 100644 --- a/src/servers/Server_Zone/Player.cpp +++ b/src/servers/Server_Zone/Player.cpp @@ -700,6 +700,12 @@ uint8_t Core::Entity::Player::getLevel() const return static_cast< uint8_t >( m_classArray[classJobIndex] ); } +uint8_t Core::Entity::Player::getLevelForClass( Core::Common::ClassJob pClass ) const +{ + uint8_t classJobIndex = g_exdData.m_classJobInfoMap[static_cast< uint8_t >( pClass )].exp_idx; + return static_cast< uint8_t >( m_classArray[classJobIndex] ); +} + uint32_t Core::Entity::Player::getExp() const { uint8_t classJobIndex = g_exdData.m_classJobInfoMap[static_cast< uint8_t >( getClass() )].exp_idx; @@ -755,6 +761,14 @@ void Core::Entity::Player::setLevel( uint8_t level ) setSyncFlag( PlayerSyncFlags::ExpLevel ); } +void Core::Entity::Player::setLevelForClass( uint8_t level, Core::Common::ClassJob classjob ) +{ + uint8_t classJobIndex = g_exdData.m_classJobInfoMap[static_cast< uint8_t >( classjob )].exp_idx; + m_classArray[classJobIndex] = level; + + setSyncFlag( PlayerSyncFlags::ExpLevel ); +} + uint8_t Core::Entity::Player::getUserLevel() const { return m_userLevel; diff --git a/src/servers/Server_Zone/Player.h b/src/servers/Server_Zone/Player.h index 4f2ae69d..1d7b8d22 100644 --- a/src/servers/Server_Zone/Player.h +++ b/src/servers/Server_Zone/Player.h @@ -231,6 +231,8 @@ public: ////////////////////////////////////////////////////////////////////////////////////////////////////// /*! returns the level of the currently active class / job */ uint8_t getLevel() const override; + /*! returns the level of the provided class / job */ + uint8_t getLevelForClass( Core::Common::ClassJob pClass ) const; /*! returns the exp of the currently active class / job */ uint32_t getExp() const; /*! sets the exp of the currently active class / job */ @@ -241,6 +243,8 @@ public: void gainLevel(); /*! set level on the currently active class / job to given level */ void setLevel( uint8_t level ); + /*! set level on the provided class / job to given level */ + void setLevelForClass( uint8_t level, Core::Common::ClassJob classjob ); /*! change class or job to given class / job */ void setClassJob( Core::Common::ClassJob classJob ); /*! returns a pointer to the class array */ From da93ea0de283db210d0c22a973a2735feb57decb Mon Sep 17 00:00:00 2001 From: Tahir Akhlaq Date: Wed, 9 Aug 2017 13:44:57 +0100 Subject: [PATCH 3/5] add editorconfig file --- .editorconfig | 9 +++++++++ 1 file changed, 9 insertions(+) create mode 100644 .editorconfig diff --git a/.editorconfig b/.editorconfig new file mode 100644 index 00000000..84678469 --- /dev/null +++ b/.editorconfig @@ -0,0 +1,9 @@ +root = true + +# find plugin for your editor here: http://editorconfig.org/#download +[*.{cpp,h,chai,inc}] +indent_style = space +indent_size = 3 +end_of_line = lf +trim_trailing_whitespace = true +indent_brace_style = Allman From e6c9c959f2893a430b8faccfc902abf54104b8a6 Mon Sep 17 00:00:00 2001 From: amibu Date: Wed, 9 Aug 2017 15:02:24 +0200 Subject: [PATCH 4/5] ZoneLine chat output --- src/servers/Server_Zone/PacketHandlers.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/servers/Server_Zone/PacketHandlers.cpp b/src/servers/Server_Zone/PacketHandlers.cpp index fdd1f42f..db3d27b9 100644 --- a/src/servers/Server_Zone/PacketHandlers.cpp +++ b/src/servers/Server_Zone/PacketHandlers.cpp @@ -642,6 +642,8 @@ void Core::Network::GameConnection::zoneLineHandler( Core::Network::Packets::Gam { uint32_t zoneLineId = pInPacket->getValAt< uint32_t >( 0x20 ); + pPlayer->sendDebug( "Walking ZoneLine " + std::to_string( zoneLineId ) ); + auto pZone = pPlayer->getCurrentZone(); auto pLine = g_zoneMgr.getZonePosition( zoneLineId ); @@ -652,7 +654,7 @@ void Core::Network::GameConnection::zoneLineHandler( Core::Network::Packets::Gam if( pLine != nullptr ) { - g_log.debug( "ZoneLine " + std::to_string( zoneLineId ) + " found." ); + pPlayer->sendDebug( "ZoneLine " + std::to_string( zoneLineId ) + " found." ); targetPos = pLine->getTargetPosition(); targetZone = pLine->getTargetZoneId(); rotation = pLine->getTargetRotation(); @@ -667,7 +669,7 @@ void Core::Network::GameConnection::zoneLineHandler( Core::Network::Packets::Gam else { // No zoneline found, revert to last zone - g_log.debug( "ZoneLine " + std::to_string( zoneLineId ) + " not found." ); + pPlayer->sendUrgent( "ZoneLine " + std::to_string( zoneLineId ) + " not found." ); targetPos.x = 0; targetPos.y = 0; targetPos.z = 0; From d382b4d11386e2afe06c3fe7e747903c48cbd622 Mon Sep 17 00:00:00 2001 From: Biscuit Boy Date: Wed, 9 Aug 2017 23:17:15 +1000 Subject: [PATCH 5/5] Updated Zoneline 1317533 Zoneline 1317533 will no longer put you back into Old Grid --- sql/zonepositions.sql | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sql/zonepositions.sql b/sql/zonepositions.sql index 8650cf59..8424eb7f 100644 --- a/sql/zonepositions.sql +++ b/sql/zonepositions.sql @@ -53,7 +53,7 @@ INSERT INTO `zonepositions` VALUES (1320086,148,158,-24,546,-3,2); INSERT INTO `zonepositions` VALUES (1317630,153,-366,29,-241,0.8,2); INSERT INTO `zonepositions` VALUES (1332303,152,-165,6,450,-1.4,2); INSERT INTO `zonepositions` VALUES (1320082,153,275.5,11.1,-258.7,-0.8,2); -INSERT INTO `zonepositions` VALUES (1317533,132,105,6,9,-0.6,2); +INSERT INTO `zonepositions` VALUES (1317533,132,99.2226,4.78645,16.5797,-0.741859,2); INSERT INTO `zonepositions` VALUES (1317542,154,452,-1,196,-1,2); INSERT INTO `zonepositions` VALUES (1320072,133,-205,10,-96,1.6,2); INSERT INTO `zonepositions` VALUES (1317633,154,14.8739,-55.3396,527.905,-2.44165,2);