Merge branch 'opentibiabr:develop' into develop

recompile.sh

@@ -7,10 +7,10 @@ then
 	echo "Clean build directory"
 	rm -rf *
 	echo "Configuring"
-	cmake ..
+	cmake -DCMAKE_TOOLCHAIN_FILE=../../vcpkg/scripts/buildsystems/vcpkg.cmake ..
 else
 	mkdir "build" && cd build
-	cmake ..
+	cmake -DCMAKE_TOOLCHAIN_FILE=../../vcpkg/scripts/buildsystems/vcpkg.cmake ..
 fi
 
 make -j$(nproc) || exit 1
@@ -24,5 +24,5 @@ else
 		echo "Saving old build"
 		mv ./otbr ./otbr.old
 	fi
-	cp ./build/otbr ./otbr
+	cp ./build/bin/otbr ./otbr
 fi

src/items/item.cpp

@@ -2059,7 +2059,11 @@ std::string Item::getDescription(const ItemType& it, int32_t lookDistance,
 	}
 
 	if (it.showCharges) {
-		s << " that has " << subType << " charge" << (subType != 1 ? "s" : "") << " left";
+		if (subType == 0){
+			s << " that has " << it.charges << " charge" << (subType != 1 ? "s" : "") << " left";
+		} else{
+			s << " that has " << subType << " charge" << (subType != 1 ? "s" : "") << " left";
+		}
 	}
 
 	if (it.showDuration) {

src/server/network/protocol/protocolgame.cpp

@@ -435,7 +435,7 @@ void ProtocolGame::logout(bool displayEffect, bool forced)
 		}
 	}
 
-	sendSessionEndInformation(forced ? SESSION_END_FORCECLOSE : SESSION_END_LOGOUT);
+	sendSessionEndInformation(SESSION_END_LOGOUT2);
 
 	g_game.removeCreature(player);
 }

src/utils/enums.h

@@ -1070,10 +1070,10 @@ enum Webhook_Colors_t : uint32_t {
 enum SessionEndInformations : uint8_t {
 	// I'm guessing unknown types are ban/protocol error or something
 	// but since there aren't any difference from logout should we care?
-	SESSION_END_LOGOUT,
+	SESSION_END_LOGOUT, // work only with standard logout
 	SESSION_END_UNK2,
 	SESSION_END_FORCECLOSE,
-	SESSION_END_UNK3,
+	SESSION_END_LOGOUT2, // work with standard logout and offline training logout
 };
 
 /**