From 4e928c3c18da976bff563b8ebc06b7b2718d2a42 Mon Sep 17 00:00:00 2001 From: Biscuit Boy Date: Fri, 22 Sep 2017 17:03:25 +1000 Subject: [PATCH 1/4] Added GM Teri Command Added The //gm teri Command (The Internal name can also be used) --- .../Network/Handlers/GMCommandHandlers.cpp | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/src/servers/Server_Zone/Network/Handlers/GMCommandHandlers.cpp b/src/servers/Server_Zone/Network/Handlers/GMCommandHandlers.cpp index 3262aba3..cd7dc6f7 100644 --- a/src/servers/Server_Zone/Network/Handlers/GMCommandHandlers.cpp +++ b/src/servers/Server_Zone/Network/Handlers/GMCommandHandlers.cpp @@ -84,6 +84,7 @@ enum GmCommand GC = 0x0154, GCRank = 0x0155, TeriInfo = 0x025D, + Teri = 0x0258, Jump = 0x025E, JumpNpc = 0x025F, }; @@ -269,6 +270,18 @@ void Core::Network::GameConnection::gm1Handler( const Packets::GamePacket& inPac "\nNextWeather:" + std::to_string( pPlayer->getCurrentZone()->getNextWeather() ) ); break; } + case GmCommand::Teri: + { + if( param1 < 128 ) + pPlayer->sendUrgent( "Zone ID out of range." ); + else + { + targetPlayer->setPosition( targetPlayer->getPos() ); + targetPlayer->performZoning( param1, targetPlayer->getPos(), 0 ); + pPlayer->sendNotice( targetPlayer->getName() + " was warped to Zone " + std::to_string(param1) ); + } + break; + } case GmCommand::Jump: { From 01a82562cb33e3c5a08ef0a924793e30b0390175 Mon Sep 17 00:00:00 2001 From: Biscuit Boy Date: Fri, 22 Sep 2017 17:08:12 +1000 Subject: [PATCH 2/4] Removed Debug Commands that can be used as GM Commands Removed the Debug Commands that have GM counterparts --- .../DebugCommand/DebugCommandHandler.cpp | 60 +------------------ 1 file changed, 1 insertion(+), 59 deletions(-) diff --git a/src/servers/Server_Zone/DebugCommand/DebugCommandHandler.cpp b/src/servers/Server_Zone/DebugCommand/DebugCommandHandler.cpp index 2d9c3d2a..9e509dab 100644 --- a/src/servers/Server_Zone/DebugCommand/DebugCommandHandler.cpp +++ b/src/servers/Server_Zone/DebugCommand/DebugCommandHandler.cpp @@ -176,33 +176,6 @@ void Core::DebugCommandHandler::set( char * data, Core::Entity::PlayerPtr pPlaye pPlayer->queuePacket( setActorPosPacket ); } - else if( ( subCommand == "zone" ) && ( params != "" ) ) - { - int32_t zoneId; - sscanf( params.c_str(), "%i", &zoneId ); - - if( zoneId < 1 ) - pPlayer->sendUrgent( "Zone id out of range." ); - else - { - pPlayer->setPosition( pPlayer->getPos() ); - pPlayer->performZoning( zoneId, pPlayer->getPos(), 0); - } - - } - else if( ( subCommand == "hp" ) && ( params != "" ) ) - { - int32_t hp; - sscanf( params.c_str(), "%i", &hp ); - - pPlayer->setHp( hp ); - - auto control = Network::Packets::Server::ActorControlPacket142( pPlayer->getId(), Common::ActorControlType::HpSetStat, 1, pPlayer->getHp() ); - - pPlayer->sendToInRangeSet( control, true ); - - } - else if( ( subCommand == "tele" ) && ( params != "" ) ) { int32_t aetheryteId; @@ -324,37 +297,7 @@ void Core::DebugCommandHandler::add( char * data, Core::Entity::PlayerPtr pPlaye "subCommand " + subCommand + " params: " + params ); - if( ( subCommand == "item" ) && ( params != "" ) ) - { - int32_t catalogId; - int32_t amount; - - sscanf( params.c_str(), "%d %d", &catalogId, &amount ); - - if( amount < 1 || amount > 99 ) - { - amount = 1; - } - - if( ( catalogId == 0xcccccccc ) ) - { - pPlayer->sendUrgent( "Syntaxerror." ); - return; - } - - if( !pPlayer->addItem( -1, catalogId, amount ) ) - pPlayer->sendUrgent( "Item " + std::to_string( catalogId ) + " not found..." ); - - } - else if( subCommand == "exp" ) - { - int32_t amount; - - sscanf( params.c_str(), "%d", &amount ); - - pPlayer->gainExp( amount ); - } - else if( subCommand == "status" ) + if( subCommand == "status" ) { int32_t id; int32_t duration; @@ -540,4 +483,3 @@ void Core::DebugCommandHandler::serverInfo( char * data, Core::Entity::PlayerPtr pPlayer->sendDebug( "SapphireServer " + Version::VERSION + " - " + Version::GIT_HASH ); pPlayer->sendDebug( "Sessions: " + std::to_string( g_serverZone.getSessionCount() ) ); } - From 71eecf729f2dcefe55ecde480fe87fdcaea1c2a6 Mon Sep 17 00:00:00 2001 From: Biscuit Boy Date: Fri, 22 Sep 2017 17:15:10 +1000 Subject: [PATCH 3/4] Fixed Teri Placement --- src/servers/Server_Zone/Network/Handlers/GMCommandHandlers.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/servers/Server_Zone/Network/Handlers/GMCommandHandlers.cpp b/src/servers/Server_Zone/Network/Handlers/GMCommandHandlers.cpp index cd7dc6f7..8e358d53 100644 --- a/src/servers/Server_Zone/Network/Handlers/GMCommandHandlers.cpp +++ b/src/servers/Server_Zone/Network/Handlers/GMCommandHandlers.cpp @@ -83,8 +83,8 @@ enum GmCommand QuestInspect = 0x0131, GC = 0x0154, GCRank = 0x0155, - TeriInfo = 0x025D, Teri = 0x0258, + TeriInfo = 0x025D, Jump = 0x025E, JumpNpc = 0x025F, }; From 1566178a1ae27aa2780696783ee4030264d2e326 Mon Sep 17 00:00:00 2001 From: Mordred <30826167+SapphireMordred@users.noreply.github.com> Date: Fri, 22 Sep 2017 12:06:35 +0200 Subject: [PATCH 4/4] formatting again --- src/servers/Server_Zone/Network/Handlers/GMCommandHandlers.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/servers/Server_Zone/Network/Handlers/GMCommandHandlers.cpp b/src/servers/Server_Zone/Network/Handlers/GMCommandHandlers.cpp index 8e358d53..da042f44 100644 --- a/src/servers/Server_Zone/Network/Handlers/GMCommandHandlers.cpp +++ b/src/servers/Server_Zone/Network/Handlers/GMCommandHandlers.cpp @@ -278,7 +278,7 @@ void Core::Network::GameConnection::gm1Handler( const Packets::GamePacket& inPac { targetPlayer->setPosition( targetPlayer->getPos() ); targetPlayer->performZoning( param1, targetPlayer->getPos(), 0 ); - pPlayer->sendNotice( targetPlayer->getName() + " was warped to Zone " + std::to_string(param1) ); + pPlayer->sendNotice( targetPlayer->getName() + " was warped to Zone " + std::to_string( param1 ) ); } break; }