Merge branch 'main' into fix/map-issues

.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
 

.gitignore

@@ -32,6 +32,9 @@ bld/
 [Ll]og/
 build/
 vcproj/
+!vcproj/canary.sln
+!vcproj/canary.vcxproj
+!vcproj/settings.props
 
 # Visual Studio 2015/2017 cache/options directory
 .vs/
@@ -372,19 +375,14 @@ config.lua
 config_canary.lua
 client_assertions.txt
 .env
-otservbr.otbm
-canary.otbm
-otservbr-custom.otbm
+data-otservbr-global/world/otservbr.otbm
 
 # Extensions
 *.ini
 *.otb
 *.exe
 *.manifest
 *.rar
-*-house.xml
-*-monster.xml
-*-npc.xml
 monster_count.txt
 
 # SFTP for Sublime
@@ -398,4 +396,4 @@ canary.old
 vcpkg_installed
 
 # CLION
-cmake-build-debug*
+cmake-build-*

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.
@@ -212,6 +224,8 @@ wheelAtelierRevealGreaterCost = 6000000
 familiarTime = 30
 
 partyAutoShareExperience = true
+-- partyShareRangeMultiplier: the range of the party share experience, default 3/2 (1.5)
+partyShareRangeMultiplier = 1.5
 partyShareLootBoosts = false
 partyShareLootBoostsDimishingFactor = 0.7
 
@@ -239,6 +253,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
 stashMoving = false
 depotChest = 4
 autoLoot = false
@@ -257,6 +272,7 @@ storeInboxMaxLimit = 2000
 enablePlayerPutItemInAmmoSlot = false
 startStreakLevel = 0
 showLootsInBestiary = false
+minTownIdToBankTransfer = 3
 
 -- Teleport summon
 -- Set to true will never remove the summon
@@ -361,7 +377,10 @@ partyListMaxDistance = 30
 toggleMapCustom = true
 
 -- Market
+-- NOTE: marketRefreshPricesInterval (in minutes, minimum is 1 minute)
+-- NOTE: set it to 0 for disable, is the time in which the task will run updating the prices of the items that will be sent to the client
 marketOfferDuration = 30 * 24 * 60 * 60
+marketRefreshPricesInterval = 30
 premiumToCreateMarketOffer = true
 checkExpiredMarketOffersEachMinutes = 60
 maxMarketOffersAtATimePerPlayer = 100
@@ -393,7 +412,6 @@ resetSessionsOnStartup = false
 -- Misc.
 -- NOTE: experienceDisplayRates: set to false to ignore exp rate or true to include exp rate
 -- NOTE: disableLegacyRaids: set to true to disable legacy XML raids
--- NOTE: combatChainDelay: set to minimum 50 miliseconds
 allowChangeOutfit = true
 toggleMountInProtectionZone = false
 freePremium = false
@@ -426,7 +444,8 @@ maxElementalResistance = 200
 maxDamageReflection = 200
 
 -- Chain system
-toggleChainSystem = true
+-- NOTE: combatChainDelay: set to minimum 50 miliseconds
+toggleChainSystem = false
 combatChainDelay = 50
 combatChainTargets = 5
 combatChainSkillFormulaAxe = 0.9

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

@@ -5592,7 +5592,7 @@ if not Quests then
 		},
 		[41] = {
 			name = "Adventurers Guild",
-			startStorageId = Storage.AdventurersGuild.GreatDragonHunt.WarriorSkeleton,
+			startStorageId = Storage.AdventurersGuild.QuestLine,
 			startStorageValue = 1,
 			missions = {
 				[1] = {
@@ -5606,6 +5606,18 @@ if not Quests then
 						But the dragon hoards might justify the risks. You killed %d/50 dragons and dragon lords."):format(math.max(player:getStorageValue(Storage.AdventurersGuild.GreatDragonHunt.DragonCounter), 0))
 					end,
 				},
+				[2] = {
+					name = "The Lost Brother",
+					storageId = Storage.AdventurersGuild.TheLostBrother,
+					missionId = 11000,
+					startValue = 1,
+					endValue = 3,
+					states = {
+						[1] = "At the Kha'zeel Mountains you met the merchant Tarun. His brother has gone missing and was last seen following a beautiful woman into a palace. Tarun fears this woman might have been a demon.",
+						[2] = "You found the remains of Tarun's brother containing a message. Go back to Tarun and report his brother's last words.",
+						[3] = "You told Tarun about his brother's sad fate. He was very downhearted but gave you his sincere thanks. The beautiful asuri have taken a young man's life and the happiness of another one.",
+					},
+				},
 			},
 		},
 		[42] = {

data-otservbr-global/lib/core/storages.lua

@@ -106,7 +106,6 @@ Storage = {
 	-- unused ExerciseDummyExhaust = 30029,
 	SamsOldBackpack = 30030,
 	SamsOldBackpackDoor = 30031,
-	StrawberryCupcake = 30032,
 	ChayenneReward = 30033,
 	SwampDiggingTimeout = 30034,
 	HydraEggQuest = 30035,
@@ -125,8 +124,6 @@ Storage = {
 	Navigator = 30048,
 	DwarvenLegs = 30049,
 	PrinceDrazzakTime = 30050,
-	LemonCupcake = 30052,
-	BlueberryCupcake = 30053,
 	-- Reserved in Global.Storage.FamiliarSummonEvent10 = 30054
 	-- Reserved in Global.Storage.FamiliarSummonEvent60 = 30055
 	ChayenneKeyTime = 30056,
@@ -1573,6 +1570,8 @@ Storage = {
 			WarriorSkeleton = 52146,
 			DragonCounter = 52147,
 		},
+		QuestLine = 52148,
+		TheLostBrother = 52149,
 	},
 	DreamersChallenge = {
 		-- Reserved storage from 52160 - 52199
@@ -2537,7 +2536,6 @@ Storage = {
 			NightmareTeddy = {},
 			PoacherCavesMiniWorldChange = {},
 			TheGreatDragonHunt = {},
-			TheLostBrother = {},
 			TheTaintedSouls = {},
 		},
 		U10_90 = { -- update 10.90 - Reserved Storages 45201 - 45350

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/migrations/43.lua

@@ -1,5 +1,5 @@
 function onUpdateDatabase()
-	logger.info("Updating database to version 43 (feat frags_limit, payment and duration_days in guild wars)")
+	logger.info("Updating database to version 44 (feat frags_limit, payment and duration_days in guild wars)")
 
 	db.query([[
 			ALTER TABLE `guild_wars`

data-otservbr-global/migrations/44.lua

@@ -1,3 +1,11 @@
 function onUpdateDatabase()
-	return false -- true = There are others migrations file | false = this is the last migration file
+	logger.info("Updating database to version 45 (fix: mana shield column size for more than 65k)")
+
+	db.query([[
+			ALTER TABLE `players`
+    	MODIFY COLUMN `manashield` INT UNSIGNED NOT NULL DEFAULT '0',
+    	MODIFY COLUMN `max_manashield` INT UNSIGNED NOT NULL DEFAULT '0';
+	]])
+
+	return true
 end

data-otservbr-global/migrations/45.lua

@@ -0,0 +1,56 @@
+function onUpdateDatabase()
+	logger.info("Updating database to version 46 (feat: vip groups)")
+
+	db.query([[
+		CREATE TABLE IF NOT EXISTS `account_vipgroups` (
+			`id` tinyint(3) UNSIGNED NOT NULL,
+			`account_id` int(11) UNSIGNED NOT NULL COMMENT 'id of account whose vip group entry it is',
+			`name` varchar(128) NOT NULL,
+			`customizable` BOOLEAN NOT NULL DEFAULT '1',
+			CONSTRAINT `account_vipgroups_pk` PRIMARY KEY (`id`, `account_id`)
+		) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+	]])
+
+	db.query([[
+		CREATE TRIGGER `oncreate_accounts` AFTER INSERT ON `accounts` FOR EACH ROW BEGIN
+			INSERT INTO `account_vipgroups` (`id`, `account_id`, `name`, `customizable`) VALUES (1, NEW.`id`, 'Enemies', 0);
+			INSERT INTO `account_vipgroups` (`id`, `account_id`, `name`, `customizable`) VALUES (2, NEW.`id`, 'Friends', 0);
+			INSERT INTO `account_vipgroups` (`id`, `account_id`, `name`, `customizable`) VALUES (3, NEW.`id`, 'Trading Partner', 0);
+		END;
+	]])
+
+	db.query([[
+		CREATE TABLE IF NOT EXISTS `account_vipgrouplist` (
+			`account_id` int(11) UNSIGNED NOT NULL COMMENT 'id of account whose viplist entry it is',
+			`player_id` int(11) NOT NULL COMMENT 'id of target player of viplist entry',
+			`vipgroup_id` tinyint(3) UNSIGNED NOT NULL COMMENT 'id of vip group that player belongs',
+			INDEX `account_id` (`account_id`),
+			INDEX `player_id` (`player_id`),
+			INDEX `vipgroup_id` (`vipgroup_id`),
+			CONSTRAINT `account_vipgrouplist_unique` UNIQUE (`account_id`, `player_id`, `vipgroup_id`),
+			CONSTRAINT `account_vipgrouplist_player_fk`
+			FOREIGN KEY (`player_id`) REFERENCES `players` (`id`)
+			ON DELETE CASCADE,
+			CONSTRAINT `account_vipgrouplist_vipgroup_fk`
+			FOREIGN KEY (`vipgroup_id`, `account_id`) REFERENCES `account_vipgroups` (`id`, `account_id`)
+			ON DELETE CASCADE
+		) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+	]])
+
+	db.query([[
+		INSERT INTO `account_vipgroups` (`id`, `account_id`, `name`, `customizable`)
+		SELECT 1, id, 'Friends', 0 FROM `accounts`;
+	]])
+
+	db.query([[
+		INSERT INTO `account_vipgroups` (`id`, `account_id`, `name`, `customizable`)
+		SELECT 2, id, 'Enemies', 0 FROM `accounts`;
+	]])
+
+	db.query([[
+		INSERT INTO `account_vipgroups` (`id`, `account_id`, `name`, `customizable`)
+		SELECT 3, id, 'Trading Partners', 0 FROM `accounts`;
+	]])
+
+	return true
+end

data-otservbr-global/migrations/46.lua

@@ -0,0 +1,3 @@
+function onUpdateDatabase()
+	return false -- true = There are others migrations file | false = this is the last migration file
+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 },