feat: protocol 13.21

opentibiabr · Aug 29, 2023 · 9cc674d · 9cc674d
1 parent 347a8a5
commit 9cc674d
Show file tree

Hide file tree

Showing 13 changed files with 289 additions and 11,539 deletions.
diff --git a/data-otservbr-global/scripts/spells/attack/executioners_throw.lua b/data-otservbr-global/scripts/spells/attack/executioners_throw.lua
@@ -39,7 +39,6 @@ function spell.onCastSpell(creature, var)
 	end
 
 	local grade = creature:revelationStageWOD("Executioner's Throw")
-	Spdlog.info(grade)
 	if grade == 0 then
 		creature:sendCancelMessage("You cannot cast this spell")
 		creature:getPosition():sendMagicEffect(CONST_ME_POFF)

diff --git a/data/items/appearances.dat b/data/items/appearances.dat
diff --git a/src/core.hpp b/src/core.hpp
@@ -16,7 +16,7 @@ static constexpr auto STATUS_SERVER_DEVELOPERS = "OpenTibiaBR Organization";
 static constexpr auto AUTHENTICATOR_DIGITS = 6U;
 static constexpr auto AUTHENTICATOR_PERIOD = 30U;
 
-static constexpr auto CLIENT_VERSION = 1320;
+static constexpr auto CLIENT_VERSION = 1321;
 
 #define CLIENT_VERSION_UPPER (CLIENT_VERSION / 100)
 #define CLIENT_VERSION_LOWER (CLIENT_VERSION % 100)
diff --git a/src/game/game.cpp b/src/game/game.cpp
@@ -42,7 +42,7 @@
 #include "creatures/npcs/npc.hpp"
 #include "creatures/npcs/npcs.hpp"
 #include "server/network/webhook/webhook.hpp"
-#include "protobuf/appearances.pb.hpp"
+#include "protobuf/appearances.pb.h"
 #include "server/network/protocol/protocollogin.hpp"
 #include "server/network/protocol/protocolstatus.hpp"
 

diff --git a/src/game/game.hpp b/src/game/game.hpp
@@ -23,7 +23,7 @@
 #include "creatures/players/grouping/team_finder.hpp"
 #include "utils/wildcardtree.hpp"
 #include "items/items_classification.hpp"
-#include "protobuf/appearances.pb.hpp"
+#include "protobuf/appearances.pb.h"
 
 class ServiceManager;
 class Creature;

diff --git a/src/items/items.cpp b/src/items/items.cpp
@@ -176,6 +176,7 @@ void Items::loadFromProtobuf() {
 		iType.clockExpire = object.flags().clockexpire();
 		iType.expire = object.flags().expire();
 		iType.expireStop = object.flags().expirestop();
+		iType.isWrapKit = object.flags().wrapkit();
 
 		if (!iType.name.empty()) {
 			nameToItems.insert({ asLowerCaseString(iType.name),

diff --git a/src/items/items.hpp b/src/items/items.hpp
@@ -334,6 +334,8 @@ class ItemType {
 	bool isCorpse = false;
 	bool loaded = false;
 	bool spellbook = false;
+
+	bool isWrapKit = false;
 };
 
 class Items {

diff --git a/src/protobuf/CMakeLists.txt b/src/protobuf/CMakeLists.txt
@@ -21,7 +21,7 @@ add_custom_command(
                 ${CMAKE_CURRENT_BINARY_DIR}/appearances.pb.cc
                 ${CMAKE_CURRENT_SOURCE_DIR}/appearances.pb.cc
 
-        # Copy files "appearances.pb.hpp" to the "src/protobuf" folder
+        # Copy files "appearances.pb.h" to the "src/protobuf" folder
         COMMAND ${CMAKE_COMMAND} -E copy
                 ${CMAKE_CURRENT_BINARY_DIR}/appearances.pb.h
                 ${CMAKE_CURRENT_SOURCE_DIR}/appearances.pb.h

diff --git a/src/protobuf/appearances.pb.cc b/src/protobuf/appearances.pb.cc
diff --git a/src/protobuf/appearances.pb.h b/src/protobuf/appearances.pb.h