Merge branch 'main' into dudantas/feat-soul-war-quest

.github/workflows/build-ubuntu-dummy.yml

@@ -17,11 +17,9 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [ubuntu-20.04, ubuntu-22.04]
+        os: [ubuntu-22.04]
         buildtype: [linux-release, linux-debug]
         include:
-          - os: ubuntu-20.04
-            triplet: x64-linux
           - os: ubuntu-22.04
             triplet: x64-linux
 

.github/workflows/build-ubuntu.yml

@@ -36,11 +36,9 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [ubuntu-20.04, ubuntu-22.04]
+        os: [ubuntu-22.04]
         buildtype: [linux-release, linux-debug]
         include:
-          - os: ubuntu-20.04
-            triplet: x64-linux
           - os: ubuntu-22.04
             triplet: x64-linux
 

CMakeLists.txt

@@ -86,17 +86,17 @@ endif()
 
 
 # === IPO ===
-option(OPTIONS_ENABLE_IPO "Check and Enable interprocedural optimization (IPO/LTO)" ON)
 if(OPTIONS_ENABLE_IPO)
-    log_option_enabled("IPO/LTO")
     if(MSVC)
+        log_option_enabled("IPO/LTO")
         set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELWITHDEBINFO} /GL")
         set(CMAKE_SHARED_LINKER_FLAGS_RELWITHDEBINFO "${CMAKE_SHARED_LINKER_FLAGS_RELWITHDEBINFO} /LTCG")
         set(CMAKE_STATIC_LINKER_FLAGS_RELWITHDEBINFO "${CMAKE_STATIC_LINKER_FLAGS_RELWITHDEBINFO} /LTCG")
         set(CMAKE_MODULE_LINKER_FLAGS_RELWITHDEBINFO "${CMAKE_MODULE_LINKER_FLAGS_RELWITHDEBINFO} /LTCG")
         set(CMAKE_EXE_LINKER_FLAGS_RELWITHDEBINFO "${CMAKE_EXE_LINKER_FLAGS_RELWITHDEBINFO} /LTCG")
     else()
         if(CMAKE_BUILD_TYPE STREQUAL "RelWithDebInfo" OR CMAKE_BUILD_TYPE STREQUAL "Release")
+            log_option_enabled("IPO/LTO")
             include(CheckIPOSupported)
             check_ipo_supported(RESULT result OUTPUT output)
             if(result)

cmake/modules/BaseConfig.cmake

@@ -121,7 +121,9 @@ if (MSVC)
     endforeach(type)
 
     add_compile_options(/MP /FS /Zf /EHsc)
-endif (MSVC)
+else()
+    add_compile_options(-Wno-unused-parameter -Wno-sign-compare -Wno-switch -Wno-implicit-fallthrough -Wno-extra)
+endif()
 
 ## Link compilation files to build/bin folder, else link to the main dir
 function(set_output_directory target_name)

config.lua.dist

@@ -52,7 +52,8 @@ cleanProtectionZones = false
 -- Connection Config
 -- NOTE: allowOldProtocol can allow login on 10x protocol. (11.00)
 -- NOTE: maxPlayers set to 0 means no limit
--- NOTE: MaxPacketsPerSeconds if you change you will be subject to bugs by WPE, keep the default value of 25
+-- NOTE: MaxPacketsPerSeconds if you change you will be subject to bugs by WPE, keep the default value of 25, 
+-- It's recommended to use a range like min 50 in this function, otherwise you will be disconnected after equipping two-handed distance weapons.
 ip = "127.0.0.1"
 allowOldProtocol = false
 bindOnlyGlobalAddress = false
@@ -80,6 +81,17 @@ freeDepotLimit = 2000
 premiumDepotLimit = 10000
 depotBoxes = 20
 
+-- 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.
+-- NOTE: The values represent percentage.
+-- NOTE: augmentIncreasedDamagePercent = value between 1 and 100 (damage percent to increase. ex: 5 = 5%, 50 = 50%)
+-- NOTE: augmentPowerfulImpactPercent = value between 1 and 100 (damage percent to increase. ex: 10 = 10%, 100 = 100%)
+-- NOTE: augmentStrongImpactPercent = value between 1 and 100 (damage percent to increase. ex: 7 = 7%, 70 = 70%)
+augmentIncreasedDamagePercent = 5
+augmentPowerfulImpactPercent = 7
+augmentStrongImpactPercent = 10
+
 -- Prey system
 -- NOTE: preyRerollPricePerLevel: Price multiplier in gold coin for rerolling prey list.
 -- NOTE: preySelectListPrice: Price to manually select creature on list and to lock prey slot.

data-otservbr-global/lib/quests/the_primal_ordeal.lua

@@ -6,12 +6,10 @@ function RegisterPrimalPackBeast(template)
 	primalMonster.loot = {}
 	primalMonster.name = "Primal Pack Beast"
 	primalMonster.description = "a primal pack beast"
-
-	primalMonster.health = primalMonster.health
-	primalMonster.maxHealth = primalMonster.maxHealth
+	primalMonster.maxHealth = primalMonster.maxHealth * 0.7
+	primalMonster.health = primalMonster.maxHealth
 	primalMonster.raceId = nil
 	primalMonster.Bestiary = nil
 	primalMonster.corpse = 0
-
 	primal:register(primalMonster)
 end

data-otservbr-global/monster/quests/primal_ordeal_quest/the_primal_menace.lua

@@ -24,7 +24,6 @@ local thePrimalMenaceConfig = {
 		CountGrowthPerHazard = 1.05,
 		CountMax = 6,
 
-		HpRateOnSpawn = 0.7,
 		MonsterPool = {
 			"Emerald Tortoise (Primal)",
 			"Gore Horn (Primal)",
@@ -291,8 +290,6 @@ local function spawnMonster(monsterId, spawnPosition)
 		MonsterId = primalMonster:getId(),
 		Created = os.time(),
 	}
-	local monsterMaxHealth = primalMonster:getMaxHealth()
-	primalMonster:setHealth(monsterMaxHealth * thePrimalMenaceConfig.MonsterConfig.HpRateOnSpawn)
 
 	local primalBeasts = monster:getStorageValue(thePrimalMenaceConfig.Storage.PrimalBeasts)
 	table.insert(primalBeasts, primalBeastEntry)

data-otservbr-global/npc/alaistar.lua

@@ -36,13 +36,14 @@ local itemsTable = {
 		{ itemName = "strong health potion", clientId = 236, buy = 115 },
 		{ itemName = "strong mana potion", clientId = 237, buy = 93 },
 		{ itemName = "supreme health potion", clientId = 23375, buy = 625 },
-		{ itemName = "ultimate health potion", clientId = 7643, buy = 438 },
-		{ itemName = "ultimate mana potion", clientId = 23373, buy = 379 },
+		{ itemName = "ultimate health potion", clientId = 7643, buy = 379 },
+		{ itemName = "ultimate mana potion", clientId = 23373, buy = 438 },
 		{ itemName = "ultimate spirit potion", clientId = 23374, buy = 438 },
 		{ itemName = "vial", clientId = 2874, sell = 5 },
 	},
 	["creature products"] = {
 		{ itemName = "cowbell", clientId = 21204, sell = 210 },
+		{ itemName = "execowtioner mask", clientId = 21201, sell = 240 },
 		{ itemName = "giant pacifier", clientId = 21199, sell = 170 },
 		{ itemName = "glob of glooth", clientId = 21182, sell = 125 },
 		{ itemName = "glooth injection tube", clientId = 21103, sell = 350 },

data-otservbr-global/npc/alexander.lua

@@ -30,6 +30,28 @@ npcConfig.voices = {
 }
 
 local itemsTable = {
+	["exercise weapons"] = {
+		{ itemName = "durable exercise rod", clientId = 35283, buy = 945000, count = 1800 },
+		{ itemName = "durable exercise wand", clientId = 35284, buy = 945000, count = 1800 },
+		{ itemName = "exercise rod", clientId = 28556, buy = 262500, count = 500 },
+		{ itemName = "exercise wand", clientId = 28557, buy = 262500, count = 500 },
+		{ itemName = "lasting exercise rod", clientId = 35289, buy = 7560000, count = 14400 },
+		{ itemName = "lasting exercise wand", clientId = 35290, buy = 7560000, count = 14400 },
+	},
+	["creature products"] = {
+		{ itemName = "crystal ball", clientId = 3076, buy = 530, sell = 190 },
+		{ itemName = "life crystal", clientId = 3061, sell = 83 },
+		{ itemName = "mind stone", clientId = 3062, sell = 170 },
+	},
+	["shields"] = {
+		{ itemName = "spellbook of enlightenment", clientId = 8072, sell = 4000 },
+		{ itemName = "spellbook of warding", clientId = 8073, sell = 8000 },
+		{ itemName = "spellbook of mind control", clientId = 8074, sell = 13000 },
+		{ itemName = "spellbook of lost souls", clientId = 8075, sell = 19000 },
+	},
+	["others"] = {
+		{ itemName = "spellwand", clientId = 651, sell = 299 },
+	},
 	["runes"] = {
 		{ itemName = "animate dead rune", clientId = 3203, buy = 375 },
 		{ itemName = "blank rune", clientId = 3147, buy = 10 },

data-otservbr-global/npc/asima.lua

@@ -24,6 +24,14 @@ npcConfig.flags = {
 }
 
 local itemsTable = {
+	["exercise weapons"] = {
+		{ itemName = "durable exercise rod", clientId = 35283, buy = 945000, count = 1800 },
+		{ itemName = "durable exercise wand", clientId = 35284, buy = 945000, count = 1800 },
+		{ itemName = "exercise rod", clientId = 28556, buy = 262500, count = 500 },
+		{ itemName = "exercise wand", clientId = 28557, buy = 262500, count = 500 },
+		{ itemName = "lasting exercise rod", clientId = 35289, buy = 7560000, count = 14400 },
+		{ itemName = "lasting exercise wand", clientId = 35290, buy = 7560000, count = 14400 },
+	},
 	["potions"] = {
 		{ itemName = "empty potion flask", clientId = 283, sell = 5 },
 		{ itemName = "empty potion flask", clientId = 284, sell = 5 },
@@ -41,6 +49,12 @@ local itemsTable = {
 		{ itemName = "ultimate spirit potion", clientId = 23374, buy = 438 },
 		{ itemName = "vial", clientId = 2874, sell = 5 },
 	},
+	["others"] = {
+		{ itemName = "spellwand", clientId = 651, sell = 299 },
+	},
+	["shields"] = {
+		{ itemName = "spellbook", clientId = 3059, buy = 150 },
+	},
 	["runes"] = {
 		{ itemName = "avalanche rune", clientId = 3161, buy = 57 },
 		{ itemName = "blank rune", clientId = 3147, buy = 10 },
@@ -61,8 +75,27 @@ local itemsTable = {
 		{ itemName = "poison field rune", clientId = 3172, buy = 21 },
 		{ itemName = "poison wall rune", clientId = 3176, buy = 52 },
 		{ itemName = "sudden death rune", clientId = 3155, buy = 135 },
+		{ itemName = "stalagmite rune", clientId = 3179, buy = 12 },
 		{ itemName = "ultimate healing rune", clientId = 3160, buy = 175 },
 	},
+	["wands"] = {
+		{ itemName = "hailstorm rod", clientId = 3067, buy = 15000 },
+		{ itemName = "moonlight rod", clientId = 3070, buy = 1000 },
+		{ itemName = "necrotic rod", clientId = 3069, buy = 5000 },
+		{ itemName = "northwind rod", clientId = 8083, buy = 7500 },
+		{ itemName = "snakebite rod", clientId = 3066, buy = 500 },
+		{ itemName = "springsprout rod", clientId = 8084, buy = 18000 },
+		{ itemName = "terra rod", clientId = 3065, buy = 10000 },
+		{ itemName = "underworld rod", clientId = 8082, buy = 22000 },
+		{ itemName = "wand of cosmic energy", clientId = 3073, buy = 10000 },
+		{ itemName = "wand of decay", clientId = 3072, buy = 5000 },
+		{ itemName = "wand of draconia", clientId = 8093, buy = 7500 },
+		{ itemName = "wand of dragonbreath", clientId = 3075, buy = 1000 },
+		{ itemName = "wand of inferno", clientId = 3071, buy = 15000 },
+		{ itemName = "wand of starstorm", clientId = 8092, buy = 18000 },
+		{ itemName = "wand of voodoo", clientId = 8094, buy = 22000 },
+		{ itemName = "wand of vortex", clientId = 3074, buy = 500 },
+	},
 }
 
 npcConfig.shop = {}

data-otservbr-global/npc/briasol.lua

@@ -113,7 +113,7 @@ npcConfig.shop = {
 	{ itemName = "cyan crystal fragment", clientId = 16125, sell = 800 },
 	{ itemName = "dragon figurine", clientId = 30053, sell = 45000 },
 	{ itemName = "gemmed figurine", clientId = 24392, sell = 3500 },
-	{ itemName = "giant amethyst", clientId = 30061, sell = 60000 },
+	{ itemName = "giant amethyst", clientId = 32622, sell = 60000 },
 	{ itemName = "giant emerald", clientId = 30060, sell = 90000 },
 	{ itemName = "giant ruby", clientId = 30059, sell = 70000 },
 	{ itemName = "giant sapphire", clientId = 30061, sell = 50000 },

data-otservbr-global/npc/chantalle.lua

@@ -99,7 +99,7 @@ npcConfig.shop = {
 	{ itemName = "diamond", clientId = 32770, sell = 15000 },
 	{ itemName = "dragon figurine", clientId = 30053, sell = 45000 },
 	{ itemName = "gemmed figurine", clientId = 24392, sell = 3500 },
-	{ itemName = "giant amethyst", clientId = 30061, sell = 60000 },
+	{ itemName = "giant amethyst", clientId = 32622, sell = 60000 },
 	{ itemName = "giant emerald", clientId = 30060, sell = 90000 },
 	{ itemName = "giant ruby", clientId = 30059, sell = 70000 },
 	{ itemName = "giant sapphire", clientId = 30061, sell = 50000 },

data-otservbr-global/npc/chuckles.lua

@@ -59,6 +59,38 @@ local itemsTable = {
 		{ itemName = "sudden death rune", clientId = 3155, buy = 135 },
 		{ itemName = "ultimate healing rune", clientId = 3160, buy = 175 },
 	},
+	["wands"] = {
+		{ itemName = "hailstorm rod", clientId = 3067, buy = 15000 },
+		{ itemName = "moonlight rod", clientId = 3070, buy = 1000 },
+		{ itemName = "necrotic rod", clientId = 3069, buy = 5000 },
+		{ itemName = "northwind rod", clientId = 8083, buy = 7500 },
+		{ itemName = "snakebite rod", clientId = 3066, buy = 500 },
+		{ itemName = "springsprout rod", clientId = 8084, buy = 18000 },
+		{ itemName = "terra rod", clientId = 3065, buy = 10000 },
+		{ itemName = "underworld rod", clientId = 8082, buy = 22000 },
+		{ itemName = "wand of cosmic energy", clientId = 3073, buy = 10000 },
+		{ itemName = "wand of decay", clientId = 3072, buy = 5000 },
+		{ itemName = "wand of draconia", clientId = 8093, buy = 7500 },
+		{ itemName = "wand of dragonbreath", clientId = 3075, buy = 1000 },
+		{ itemName = "wand of inferno", clientId = 3071, buy = 15000 },
+		{ itemName = "wand of starstorm", clientId = 8092, buy = 18000 },
+		{ itemName = "wand of voodoo", clientId = 8094, buy = 22000 },
+		{ itemName = "wand of vortex", clientId = 3074, buy = 500 },
+	},
+	["exercise weapons"] = {
+		{ itemName = "durable exercise rod", clientId = 35283, buy = 945000, count = 1800 },
+		{ itemName = "durable exercise wand", clientId = 35284, buy = 945000, count = 1800 },
+		{ itemName = "exercise rod", clientId = 28556, buy = 262500, count = 500 },
+		{ itemName = "exercise wand", clientId = 28557, buy = 262500, count = 500 },
+		{ itemName = "lasting exercise rod", clientId = 35289, buy = 7560000, count = 14400 },
+		{ itemName = "lasting exercise wand", clientId = 35290, buy = 7560000, count = 14400 },
+	},
+	["others"] = {
+		{ itemName = "spellwand", clientId = 651, sell = 299 },
+	},
+	["shields"] = {
+		{ itemName = "spellbook", clientId = 3059, buy = 150 },
+	},
 }
 
 npcConfig.shop = {}

data-otservbr-global/npc/edmund.lua

@@ -68,7 +68,7 @@ npcConfig.shop = {
 	{ itemName = "cyan crystal fragment", clientId = 16125, sell = 800 },
 	{ itemName = "dragon figurine", clientId = 30053, sell = 45000 },
 	{ itemName = "gemmed figurine", clientId = 24392, sell = 3500 },
-	{ itemName = "giant amethyst", clientId = 30061, sell = 60000 },
+	{ itemName = "giant amethyst", clientId = 32622, sell = 60000 },
 	{ itemName = "giant emerald", clientId = 30060, sell = 90000 },
 	{ itemName = "giant ruby", clientId = 30059, sell = 70000 },
 	{ itemName = "giant sapphire", clientId = 30061, sell = 50000 },

data-otservbr-global/npc/fenech.lua

@@ -71,6 +71,20 @@ local itemsTable = {
 		{ itemName = "sudden death rune", clientId = 3155, buy = 135 },
 		{ itemName = "ultimate healing rune", clientId = 3160, buy = 175 },
 	},
+	["exercise weapons"] = {
+		{ itemName = "durable exercise rod", clientId = 35283, buy = 945000, count = 1800 },
+		{ itemName = "durable exercise wand", clientId = 35284, buy = 945000, count = 1800 },
+		{ itemName = "exercise rod", clientId = 28556, buy = 262500, count = 500 },
+		{ itemName = "exercise wand", clientId = 28557, buy = 262500, count = 500 },
+		{ itemName = "lasting exercise rod", clientId = 35289, buy = 7560000, count = 14400 },
+		{ itemName = "lasting exercise wand", clientId = 35290, buy = 7560000, count = 14400 },
+	},
+	["others"] = {
+		{ itemName = "spellwand", clientId = 651, sell = 299 },
+	},
+	["shields"] = {
+		{ itemName = "spellbook", clientId = 3059, buy = 150 },
+	},
 }
 
 npcConfig.shop = {}

data-otservbr-global/npc/frans.lua

@@ -58,6 +58,20 @@ local itemsTable = {
 		{ itemName = "sudden death rune", clientId = 3155, buy = 135 },
 		{ itemName = "ultimate healing rune", clientId = 3160, buy = 175 },
 	},
+	["exercise weapons"] = {
+		{ itemName = "durable exercise rod", clientId = 35283, buy = 945000, count = 1800 },
+		{ itemName = "durable exercise wand", clientId = 35284, buy = 945000, count = 1800 },
+		{ itemName = "exercise rod", clientId = 28556, buy = 262500, count = 500 },
+		{ itemName = "exercise wand", clientId = 28557, buy = 262500, count = 500 },
+		{ itemName = "lasting exercise rod", clientId = 35289, buy = 7560000, count = 14400 },
+		{ itemName = "lasting exercise wand", clientId = 35290, buy = 7560000, count = 14400 },
+	},
+	["others"] = {
+		{ itemName = "spellwand", clientId = 651, sell = 299 },
+	},
+	["shields"] = {
+		{ itemName = "spellbook", clientId = 3059, buy = 150 },
+	},
 }
 
 npcConfig.shop = {}

data-otservbr-global/npc/frederik.lua

@@ -82,6 +82,20 @@ local itemsTable = {
 		{ itemName = "ultimate spirit potion", clientId = 23374, buy = 438 },
 		{ itemName = "vial", clientId = 2874, sell = 5 },
 	},
+	["exercise weapons"] = {
+		{ itemName = "durable exercise rod", clientId = 35283, buy = 945000, count = 1800 },
+		{ itemName = "durable exercise wand", clientId = 35284, buy = 945000, count = 1800 },
+		{ itemName = "exercise rod", clientId = 28556, buy = 262500, count = 500 },
+		{ itemName = "exercise wand", clientId = 28557, buy = 262500, count = 500 },
+		{ itemName = "lasting exercise rod", clientId = 35289, buy = 7560000, count = 14400 },
+		{ itemName = "lasting exercise wand", clientId = 35290, buy = 7560000, count = 14400 },
+	},
+	["others"] = {
+		{ itemName = "spellwand", clientId = 651, sell = 299 },
+	},
+	["shields"] = {
+		{ itemName = "spellbook", clientId = 3059, buy = 150 },
+	},
 }
 
 npcConfig.shop = {}

data-otservbr-global/npc/gail.lua

@@ -109,7 +109,7 @@ npcConfig.shop = {
 	{ itemName = "cyan crystal fragment", clientId = 16125, sell = 800 },
 	{ itemName = "dragon figurine", clientId = 30053, sell = 45000 },
 	{ itemName = "gemmed figurine", clientId = 24392, sell = 3500 },
-	{ itemName = "giant amethyst", clientId = 30061, sell = 60000 },
+	{ itemName = "giant amethyst", clientId = 32622, sell = 60000 },
 	{ itemName = "giant emerald", clientId = 30060, sell = 90000 },
 	{ itemName = "giant ruby", clientId = 30059, sell = 70000 },
 	{ itemName = "giant sapphire", clientId = 30061, sell = 50000 },

data-otservbr-global/npc/gnomegica.lua

@@ -78,6 +78,20 @@ local itemsTable = {
 		{ itemName = "wand of dragonbreath", clientId = 3075, buy = 1000 },
 		{ itemName = "wand of vortex", clientId = 3074, buy = 500 },
 	},
+	["exercise weapons"] = {
+		{ itemName = "durable exercise rod", clientId = 35283, buy = 945000, count = 1800 },
+		{ itemName = "durable exercise wand", clientId = 35284, buy = 945000, count = 1800 },
+		{ itemName = "exercise rod", clientId = 28556, buy = 262500, count = 500 },
+		{ itemName = "exercise wand", clientId = 28557, buy = 262500, count = 500 },
+		{ itemName = "lasting exercise rod", clientId = 35289, buy = 7560000, count = 14400 },
+		{ itemName = "lasting exercise wand", clientId = 35290, buy = 7560000, count = 14400 },
+	},
+	["others"] = {
+		{ itemName = "spellwand", clientId = 651, sell = 299 },
+	},
+	["shields"] = {
+		{ itemName = "spellbook", clientId = 3059, buy = 150 },
+	},
 }
 
 npcConfig.shop = {}

data-otservbr-global/npc/hanna.lua

@@ -145,7 +145,7 @@ npcConfig.shop = {
 	{ itemName = "cyan crystal fragment", clientId = 16125, sell = 800 },
 	{ itemName = "dragon figurine", clientId = 30053, sell = 45000 },
 	{ itemName = "gemmed figurine", clientId = 24392, sell = 3500 },
-	{ itemName = "giant amethyst", clientId = 30061, sell = 60000 },
+	{ itemName = "giant amethyst", clientId = 32622, sell = 60000 },
 	{ itemName = "giant emerald", clientId = 30060, sell = 90000 },
 	{ itemName = "giant ruby", clientId = 30059, sell = 70000 },
 	{ itemName = "giant sapphire", clientId = 30061, sell = 50000 },

data-otservbr-global/npc/ishina.lua

@@ -139,7 +139,7 @@ npcConfig.shop = {
 	{ itemName = "cyan crystal fragment", clientId = 16125, sell = 800 },
 	{ itemName = "dragon figurine", clientId = 30053, sell = 45000 },
 	{ itemName = "gemmed figurine", clientId = 24392, sell = 3500 },
-	{ itemName = "giant amethyst", clientId = 30061, sell = 60000 },
+	{ itemName = "giant amethyst", clientId = 32622, sell = 60000 },
 	{ itemName = "giant emerald", clientId = 30060, sell = 90000 },
 	{ itemName = "giant ruby", clientId = 30059, sell = 70000 },
 	{ itemName = "giant sapphire", clientId = 30061, sell = 50000 },