From de7fcb197696b7cb595f8a40d09784abd1efb187 Mon Sep 17 00:00:00 2001 From: mattyx14 Date: Thu, 15 Dec 2016 13:38:42 -0600 Subject: [PATCH] Added support to clientVersion 11_ - aka10 - (no official items.otb // no supported new items) - (jo3bingham) --- CHANGELOG | 3 ++- path_11_x/config.lua | 6 +++--- path_11_x/src/definitions.h | 6 +++--- path_11_x/src/itemloader.h | 1 + path_11_x/src/protocolgame.cpp | 2 ++ path_11_x/src/protocolgamebase.cpp | 1 + 6 files changed, 12 insertions(+), 7 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index f5fce0b79..ec89fe79c 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -63,7 +63,7 @@ STARTED AND ON PROTOCOL SUPPORTED - Version Clients - 7.6 to 10.99 + Version Clients - 7.6 to 11_ Version Client 11.x BUGS @@ -80,6 +80,7 @@ - Added UnjustPanel Kills (brunominervino) - Added support to orangeSkull (brunominervino) - Added support to current frag system (brunominervino) + - Added support to clientVersion 11_ - aka10 - (no official items.otb // no supported new items) - (jo3bingham) - Fileloader refactor (djarek) - Fix connectionLock on old protocols - Fix potions onTarget diff --git a/path_11_x/config.lua b/path_11_x/config.lua index 43d4fa3ed..7f19ffc92 100644 --- a/path_11_x/config.lua +++ b/path_11_x/config.lua @@ -34,9 +34,9 @@ replaceKickOnLogin = true maxPacketsPerSecond = 25 -- Version Manual -clientVersionMin = 1098 -clientVersionMax = 1099 -clientVersionStr = "Only clients with protocol 10.98/99 or allowed!" +clientVersionMin = 1100 +clientVersionMax = 1100 +clientVersionStr = "Only clients with protocol 10 and 11 or allowed!" -- Depot Limit freeDepotLimit = 2000 diff --git a/path_11_x/src/definitions.h b/path_11_x/src/definitions.h index 30d4c23a7..4e29f02e8 100644 --- a/path_11_x/src/definitions.h +++ b/path_11_x/src/definitions.h @@ -28,9 +28,9 @@ static constexpr auto SOFTWARE_CODENAME = "LEZICK"; static constexpr auto STATUS_SERVER_DEVELOPERS = "Mattyx14, Brewsterl, Malucooo and The Forgotten Server Developers"; static constexpr auto GIT_REPO = "https://github.com/mattyx14/otxserver/tree/otxserv3/"; -static constexpr auto CLIENT_VERSION_MIN = 1098; -static constexpr auto CLIENT_VERSION_MAX = 1099; -static constexpr auto CLIENT_VERSION_STR = "10.99"; +static constexpr auto CLIENT_VERSION_MIN = 1100; +static constexpr auto CLIENT_VERSION_MAX = 1100; +static constexpr auto CLIENT_VERSION_STR = "10 and 11"; static constexpr auto AUTHENTICATOR_DIGITS = 6U; static constexpr auto AUTHENTICATOR_PERIOD = 30U; diff --git a/path_11_x/src/itemloader.h b/path_11_x/src/itemloader.h index 4e80ab12d..4ed01c308 100644 --- a/path_11_x/src/itemloader.h +++ b/path_11_x/src/itemloader.h @@ -103,6 +103,7 @@ enum clientVersion_t { CLIENT_VERSION_1035 = 55, CLIENT_VERSION_1076 = 56, CLIENT_VERSION_1098 = 57, + // CLIENT_VERSION_1100 = 58, }; enum rootattrib_ { diff --git a/path_11_x/src/protocolgame.cpp b/path_11_x/src/protocolgame.cpp index 3f7d3207a..c11750ee2 100644 --- a/path_11_x/src/protocolgame.cpp +++ b/path_11_x/src/protocolgame.cpp @@ -1745,6 +1745,8 @@ void ProtocolGame::sendMarketDetail(uint16_t itemId) msg.add(0x00); } + msg.add(0x00); // imbuement detail + MarketStatistics* statistics = IOMarket::getInstance()->getPurchaseStatistics(itemId); if (statistics) { msg.addByte(0x01); diff --git a/path_11_x/src/protocolgamebase.cpp b/path_11_x/src/protocolgamebase.cpp index 56f63beb5..ad8cab0d7 100644 --- a/path_11_x/src/protocolgamebase.cpp +++ b/path_11_x/src/protocolgamebase.cpp @@ -729,6 +729,7 @@ void ProtocolGameBase::sendBasicData() msg.add(0); } msg.addByte(player->getVocation()->getClientId()); + msg.addByte(1); // has reached Main (allow player to open Prey window) msg.add(0x00); writeToOutputBuffer(msg); }