Merge branch 'main' into improvement-onlook

opentibiabr · Oct 10, 2024 · a2f6ea2 · a2f6ea2
2 parents 4307c97 + ad56722
commit a2f6ea2
Show file tree

Hide file tree

Showing 673 changed files with 8,041 additions and 866,809 deletions.
diff --git a/.github/workflows/analysis-qodana.yml b/.github/workflows/analysis-qodana.yml
diff --git a/.github/workflows/analysis-sonarcloud.yml b/.github/workflows/analysis-sonarcloud.yml
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -125,6 +125,6 @@ option(RUN_TESTS_AFTER_BUILD "Run tests when building" OFF) # By default, tests
 # *****************************************************************************
 add_subdirectory(src)
 
-if(BUILD_TESTS)
+if(BUILD_TESTS OR PACKAGE_TESTS)
     add_subdirectory(tests)
 endif()
diff --git a/cmake/modules/CanaryLib.cmake b/cmake/modules/CanaryLib.cmake
@@ -23,9 +23,7 @@ add_subdirectory(utils)
 target_sources(${PROJECT_NAME}_lib PRIVATE canary_server.cpp)
 
 # Add public pre compiler header to lib, to pass down to related targets
-if (NOT SPEED_UP_BUILD_UNITY)
-    target_precompile_headers(${PROJECT_NAME}_lib PUBLIC pch.hpp)
-endif()
+target_precompile_headers(${PROJECT_NAME}_lib PUBLIC pch.hpp)
 
 if(NOT SPEED_UP_BUILD_UNITY AND USE_PRECOMPILED_HEADERS)
     target_compile_definitions(${PROJECT_NAME}_lib PUBLIC -DUSE_PRECOMPILED_HEADERS)

diff --git a/config.lua.dist b/config.lua.dist
@@ -66,8 +66,6 @@ serverMotd = "Welcome to the OTServBR-Global!"
 statusTimeout = 5 * 1000
 replaceKickOnLogin = true
 maxPacketsPerSecond = 25
-maxItem = 2000
-maxContainer = 100
 maxPlayersOnlinePerAccount = 1
 maxPlayersOutsidePZPerAccount = 1
 
@@ -81,6 +79,12 @@ freeDepotLimit = 2000
 premiumDepotLimit = 10000
 depotBoxes = 20
 
+-- Item and containers limit
+-- NOTE: 'maxContainerDepth' defines the maximum depth to which containers can be nested
+maxItem = 5000
+maxContainer = 500
+maxContainerDepth = 200
+
 -- Augments System (Get more info in: https://github.com/opentibiabr/canary/pull/2602)
 -- NOTE: the following values are for all weapons and equipments that have type of "increase damage", "powerful impact" and "strong impact".
 -- To customize the percentage of a particular item with these augment types, please add to the item "augments" section on items.xml as the example above.
@@ -254,7 +258,7 @@ onlyPremiumAccount = false
 -- NOTE: enablePlayerPutItemInAmmoSlot = true, will enable players to put any items on ammo slot, more used in custom shopping system
 -- NOTE: startStreakLevel will make a reward streak level for new players who never logged in
 -- NOTE: if showLootsInBestiary is true, will cause all loots to be shown in the bestiary even if the player has not reached the required number of kills
--- NOTE: minTownIdToBankTransfer blocks towns less than defined from receiving money transfers
+-- NOTE: minTownIdToBankTransferFromMain blocks towns less than defined from receiving money transfers
 -- NOTE: enableSupportOutfit enable GODS and GMS to select support outfit (gamemaster, customer support or community manager)
 stashMoving = false
 stashItemCount = 5000
@@ -275,7 +279,7 @@ storeInboxMaxLimit = 2000
 enablePlayerPutItemInAmmoSlot = false
 startStreakLevel = 0
 showLootsInBestiary = false
-minTownIdToBankTransfer = 3
+minTownIdToBankTransferFromMain = 4
 enableSupportOutfit = true
 
 -- Teleport summon

diff --git a/data-canary/monster/demons/demon.lua b/data-canary/monster/demons/demon.lua
@@ -67,7 +67,6 @@ monster.flags = {
 	canWalkOnEnergy = true,
 	canWalkOnFire = true,
 	canWalkOnPoison = true,
-	pet = false,
 }
 
 monster.light = {

diff --git a/data-canary/monster/demons/destroyer.lua b/data-canary/monster/demons/destroyer.lua
@@ -63,7 +63,6 @@ monster.flags = {
 	canWalkOnEnergy = true,
 	canWalkOnFire = false,
 	canWalkOnPoison = false,
-	pet = false,
 }
 
 monster.light = {

diff --git a/data-canary/monster/demons/hellhound.lua b/data-canary/monster/demons/hellhound.lua
@@ -64,7 +64,6 @@ monster.flags = {
 	canWalkOnEnergy = false,
 	canWalkOnFire = true,
 	canWalkOnPoison = true,
-	pet = false,
 }
 
 monster.light = {

diff --git a/data-canary/monster/demons/hellspawn.lua b/data-canary/monster/demons/hellspawn.lua
@@ -63,7 +63,6 @@ monster.flags = {
 	canWalkOnEnergy = true,
 	canWalkOnFire = true,
 	canWalkOnPoison = true,
-	pet = false,
 }
 
 monster.light = {

diff --git a/data-canary/monster/demons/juggernaut.lua b/data-canary/monster/demons/juggernaut.lua
@@ -64,7 +64,6 @@ monster.flags = {
 	canWalkOnEnergy = false,
 	canWalkOnFire = true,
 	canWalkOnPoison = true,
-	pet = false,
 }
 
 monster.light = {

diff --git a/data-canary/monster/dragons/dragon.lua b/data-canary/monster/dragons/dragon.lua
@@ -68,7 +68,6 @@ monster.flags = {
 	canWalkOnEnergy = false,
 	canWalkOnFire = true,
 	canWalkOnPoison = false,
-	pet = false,
 }
 
 monster.light = {

diff --git a/data-canary/monster/dragons/dragon_lord.lua b/data-canary/monster/dragons/dragon_lord.lua
@@ -69,7 +69,6 @@ monster.flags = {
 	canWalkOnEnergy = true,
 	canWalkOnFire = true,
 	canWalkOnPoison = true,
-	pet = false,
 }
 
 monster.light = {

diff --git a/data-canary/monster/dragons/hydra.lua b/data-canary/monster/dragons/hydra.lua
@@ -68,7 +68,6 @@ monster.flags = {
 	canWalkOnEnergy = true,
 	canWalkOnFire = true,
 	canWalkOnPoison = true,
-	pet = false,
 }
 
 monster.light = {

diff --git a/data-canary/monster/dragons/ice_dragon.lua b/data-canary/monster/dragons/ice_dragon.lua
@@ -63,7 +63,6 @@ monster.flags = {
 	canWalkOnEnergy = false,
 	canWalkOnFire = false,
 	canWalkOnPoison = false,
-	pet = false,
 }
 
 monster.light = {

diff --git a/data-canary/monster/dragons/wyrm.lua b/data-canary/monster/dragons/wyrm.lua
@@ -64,7 +64,6 @@ monster.flags = {
 	canWalkOnEnergy = true,
 	canWalkOnFire = true,
 	canWalkOnPoison = true,
-	pet = false,
 }
 
 monster.light = {

diff --git a/data-canary/monster/giants/behemoth.lua b/data-canary/monster/giants/behemoth.lua
@@ -63,7 +63,6 @@ monster.flags = {
 	canWalkOnEnergy = false,
 	canWalkOnFire = true,
 	canWalkOnPoison = true,
-	pet = false,
 }
 
 monster.light = {

diff --git a/data-canary/monster/giants/cyclops_drone.lua b/data-canary/monster/giants/cyclops_drone.lua
@@ -61,7 +61,6 @@ monster.flags = {
 	canWalkOnEnergy = false,
 	canWalkOnFire = false,
 	canWalkOnPoison = false,
-	pet = false,
 }
 
 monster.light = {

diff --git a/data-canary/monster/giants/cyclops_smith.lua b/data-canary/monster/giants/cyclops_smith.lua
@@ -62,7 +62,6 @@ monster.flags = {
 	canWalkOnEnergy = false,
 	canWalkOnFire = false,
 	canWalkOnPoison = false,
-	pet = false,
 }
 
 monster.light = {

diff --git a/data-canary/monster/humanoids/frost_troll.lua b/data-canary/monster/humanoids/frost_troll.lua
@@ -60,7 +60,6 @@ monster.flags = {
 	canWalkOnEnergy = false,
 	canWalkOnFire = false,
 	canWalkOnPoison = false,
-	pet = false,
 }
 
 monster.light = {

diff --git a/data-canary/monster/humanoids/goblin.lua b/data-canary/monster/humanoids/goblin.lua
@@ -61,7 +61,6 @@ monster.flags = {
 	canWalkOnEnergy = false,
 	canWalkOnFire = false,
 	canWalkOnPoison = false,
-	pet = false,
 }
 
 monster.light = {

diff --git a/data-canary/monster/humanoids/island_troll.lua b/data-canary/monster/humanoids/island_troll.lua
@@ -60,7 +60,6 @@ monster.flags = {
 	canWalkOnEnergy = false,
 	canWalkOnFire = false,
 	canWalkOnPoison = false,
-	pet = false,
 }
 
 monster.light = {

diff --git a/data-canary/monster/humanoids/troll.lua b/data-canary/monster/humanoids/troll.lua
@@ -61,7 +61,6 @@ monster.flags = {
 	canWalkOnEnergy = false,
 	canWalkOnFire = false,
 	canWalkOnPoison = false,
-	pet = false,
 }
 
 monster.light = {

diff --git a/data-canary/monster/humans/amazon.lua b/data-canary/monster/humans/amazon.lua
@@ -61,7 +61,6 @@ monster.flags = {
 	canWalkOnEnergy = false,
 	canWalkOnFire = false,
 	canWalkOnPoison = false,
-	pet = false,
 }
 
 monster.light = {

diff --git a/data-canary/monster/humans/assassin.lua b/data-canary/monster/humans/assassin.lua
@@ -62,7 +62,6 @@ monster.flags = {
 	canWalkOnEnergy = false,
 	canWalkOnFire = false,
 	canWalkOnPoison = false,
-	pet = false,
 }
 
 monster.light = {

diff --git a/data-canary/monster/humans/bandit.lua b/data-canary/monster/humans/bandit.lua
@@ -61,7 +61,6 @@ monster.flags = {
 	canWalkOnEnergy = false,
 	canWalkOnFire = false,
 	canWalkOnPoison = false,
-	pet = false,
 }
 
 monster.light = {

diff --git a/data-canary/monster/humans/hunter.lua b/data-canary/monster/humans/hunter.lua
@@ -62,7 +62,6 @@ monster.flags = {
 	canWalkOnEnergy = false,
 	canWalkOnFire = false,
 	canWalkOnPoison = false,
-	pet = false,
 }
 
 monster.light = {

diff --git a/data-canary/monster/humans/monk.lua b/data-canary/monster/humans/monk.lua
@@ -63,7 +63,6 @@ monster.flags = {
 	canWalkOnEnergy = false,
 	canWalkOnFire = false,
 	canWalkOnPoison = false,
-	pet = false,
 }
 
 monster.light = {

diff --git a/data-canary/monster/humans/valkyrie.lua b/data-canary/monster/humans/valkyrie.lua
@@ -61,7 +61,6 @@ monster.flags = {
 	canWalkOnEnergy = false,
 	canWalkOnFire = false,
 	canWalkOnPoison = false,
-	pet = false,
 }
 
 monster.light = {

diff --git a/data-canary/monster/mammals/bat.lua b/data-canary/monster/mammals/bat.lua
@@ -61,7 +61,6 @@ monster.flags = {
 	canWalkOnEnergy = false,
 	canWalkOnFire = false,
 	canWalkOnPoison = false,
-	pet = false,
 }
 
 monster.light = {