Merge branch 'main' into fix-quests-from-version-12-revised

.github/workflows/build-ubuntu.yml

@@ -52,12 +52,14 @@ jobs:
         run: >
           sudo apt-get update && sudo apt-get install ccache linux-headers-"$(uname -r)"
 
-      - name: Switch to gcc-12 on Ubuntu 22.04
+      - name: Switch to gcc-13 on Ubuntu 22.04
         if: matrix.os == 'ubuntu-22.04'
         run: |
-          sudo apt install gcc-12 g++-12
-          sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-12 100 --slave /usr/bin/g++ g++ /usr/bin/g++-12 --slave /usr/bin/gcov gcov /usr/bin/gcov-12
-          sudo update-alternatives --set gcc /usr/bin/gcc-12
+          sudo add-apt-repository ppa:ubuntu-toolchain-r/test -y
+          sudo apt-get update
+          sudo apt install gcc-13 g++-13 -y
+          sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-13 100 --slave /usr/bin/g++ g++ /usr/bin/g++-13 --slave /usr/bin/gcov gcov /usr/bin/gcov-12
+          sudo update-alternatives --set gcc /usr/bin/gcc-13
 
       - name: Switch to gcc-14 on Ubuntu 24.04
         if: matrix.os == 'ubuntu-24.04'

.gitignore

@@ -395,5 +395,8 @@ canary.old
 # VCPKG
 vcpkg_installed
 
+# DB Backups
+database_backup
+
 # CLION
 cmake-build-*

config.lua.dist

@@ -26,6 +26,7 @@ maintainModeMessage = ""
 -- NOTE: valid values for worldType are: "pvp", "no-pvp" and "pvp-enforced"
 -- NOTE: removeBeginningWeaponAmmunition: spears, arrows, bolt have endless ammo (allows training for paladins)
 -- NOTE: refundManaOnBeginningWeapons: wand of vortex and snakebite refund mana used (allows training for mages)
+-- NOTE: loginProtectionTime in MS
 worldType = "pvp"
 hotkeyAimbotEnabled = true
 protectionLevel = 7
@@ -47,6 +48,7 @@ monthKillsToRedSkull = 10
 redSkullDuration = 1
 blackSkullDuration = 3
 orangeSkullDuration = 7
+loginProtectionTime = 10 * 1000
 
 cleanProtectionZones = false
 
@@ -344,9 +346,11 @@ Setting this to false may pose risks; if a house is abandoned and contains a lar
 ]]
 -- Periods: daily/weekly/monthly/yearly/never
 -- Base: sqm,rent,sqm+rent
+toggleCyclopediaHouseAuction = true
+daysToCloseBid = 7
 housePriceRentMultiplier = 0.0
 housePriceEachSQM = 1000
-houseRentPeriod = "never"
+houseRentPeriod = "monthly"
 houseRentRate = 1.0
 houseOwnedByAccount = false
 houseBuyLevel = 100
@@ -399,6 +403,7 @@ mysqlHost = "127.0.0.1"
 mysqlUser = "root"
 mysqlPass = "root"
 mysqlDatabase = "otservbr-global"
+mysqlDatabaseBackup = false
 mysqlPort = 3306
 mysqlSock = ""
 passwordType = "sha1"

data-canary/scripts/actions/objects/imbuement_shrine.lua

@@ -5,7 +5,7 @@ function imbuement.onUse(player, item, fromPosition, target, toPosition, isHotke
 		return player:sendTextMessage(MESSAGE_EVENT_ADVANCE, "You did not collect enough knowledge from the ancient Shapers. Visit the Shaper temple in Montag for help.")
 	end
 
-	if not target or not (target:isItem()) then
+	if not target or type(target) ~= "userdata" or not target:isItem() then
 		return player:sendTextMessage(MESSAGE_EVENT_ADVANCE, "You can only use the shrine on an valid item.")
 	end
 

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

@@ -854,6 +854,7 @@ Storage = {
 				NoblemanSecondAddon = 41308,
 				FormorgarMinesHoistSkeleton = 41309,
 				FormorgarMinesHoistChest = 41310,
+				PickAmount = 41311,
 			},
 		},
 		U8_1 = { -- update 8.1 - Reserved Storages 41351 - 41650
@@ -2945,6 +2946,11 @@ Storage = {
 				},
 			},
 		},
+		U13_20 = { -- update 13.20 - Reserved Storages 47952 - 47970
+			RottenBlood = {
+				AccessDoor = 47952,
+			},
+		},
 	},
 	-- Reserved storage from 63951 - 63999
 	ThaisExhibition = {

data-otservbr-global/lib/functions/load.lua

@@ -0,0 +1 @@
+dofile(DATA_DIRECTORY .. "/lib/functions/players.lua")

data-otservbr-global/lib/functions/players.lua

@@ -0,0 +1,76 @@
+function Player.getCookiesDelivered(self)
+	local storage, amount =
+		{
+			Storage.Quest.U8_1.WhatAFoolishQuest.CookieDelivery.SimonTheBeggar,
+			Storage.Quest.U8_1.WhatAFoolishQuest.CookieDelivery.Markwin,
+			Storage.Quest.U8_1.WhatAFoolishQuest.CookieDelivery.Ariella,
+			Storage.Quest.U8_1.WhatAFoolishQuest.CookieDelivery.Hairycles,
+			Storage.Quest.U8_1.WhatAFoolishQuest.CookieDelivery.Djinn,
+			Storage.Quest.U8_1.WhatAFoolishQuest.CookieDelivery.AvarTar,
+			Storage.Quest.U8_1.WhatAFoolishQuest.CookieDelivery.OrcKing,
+			Storage.Quest.U8_1.WhatAFoolishQuest.CookieDelivery.Lorbas,
+			Storage.Quest.U8_1.WhatAFoolishQuest.CookieDelivery.Wyda,
+			Storage.Quest.U8_1.WhatAFoolishQuest.CookieDelivery.Hjaern,
+		}, 0
+	for i = 1, #storage do
+		if self:getStorageValue(storage[i]) == 1 then
+			amount = amount + 1
+		end
+	end
+	return amount
+end
+
+function Player.checkGnomeRank(self)
+	local points = self:getStorageValue(Storage.Quest.U9_60.BigfootsBurden.Rank)
+	local questProgress = self:getStorageValue(Storage.Quest.U9_60.BigfootsBurden.QuestLine)
+	if points >= 30 and points < 120 then
+		if questProgress <= 25 then
+			self:setStorageValue(Storage.Quest.U9_60.BigfootsBurden.QuestLine, 26)
+			self:getPosition():sendMagicEffect(CONST_ME_MAGIC_BLUE)
+			self:addAchievement("Gnome Little Helper")
+		end
+	elseif points >= 120 and points < 480 then
+		if questProgress <= 26 then
+			self:setStorageValue(Storage.Quest.U9_60.BigfootsBurden.QuestLine, 27)
+			self:getPosition():sendMagicEffect(CONST_ME_MAGIC_BLUE)
+			self:addAchievement("Gnome Little Helper")
+			self:addAchievement("Gnome Friend")
+		end
+	elseif points >= 480 and points < 1440 then
+		if questProgress <= 27 then
+			self:setStorageValue(Storage.Quest.U9_60.BigfootsBurden.QuestLine, 28)
+			self:getPosition():sendMagicEffect(CONST_ME_MAGIC_BLUE)
+			self:addAchievement("Gnome Little Helper")
+			self:addAchievement("Gnome Friend")
+			self:addAchievement("Gnomelike")
+		end
+	elseif points >= 1440 then
+		if questProgress <= 29 then
+			self:setStorageValue(Storage.Quest.U9_60.BigfootsBurden.QuestLine, 30)
+			self:getPosition():sendMagicEffect(CONST_ME_MAGIC_BLUE)
+			self:addAchievement("Gnome Little Helper")
+			self:addAchievement("Gnome Friend")
+			self:addAchievement("Gnomelike")
+			self:addAchievement("Honorary Gnome")
+		end
+	end
+	return true
+end
+
+function Player.addFamePoint(self)
+	local points = self:getStorageValue(Storage.Quest.U10_20.SpikeTaskQuest.Constants.Spike_Fame_Points)
+	local current = math.max(0, points)
+	self:setStorageValue(Storage.Quest.U10_20.SpikeTaskQuest.Constants.Spike_Fame_Points, current + 1)
+	self:sendTextMessage(MESSAGE_EVENT_ADVANCE, "You have received a fame point.")
+end
+
+function Player.getFamePoints(self)
+	local points = self:getStorageValue(Storage.Quest.U10_20.SpikeTaskQuest.Constants.Spike_Fame_Points)
+	return math.max(0, points)
+end
+
+function Player.removeFamePoints(self, amount)
+	local points = self:getStorageValue(Storage.Quest.U10_20.SpikeTaskQuest.Constants.Spike_Fame_Points)
+	local current = math.max(0, points)
+	self:setStorageValue(Storage.Quest.U10_20.SpikeTaskQuest.Constants.Spike_Fame_Points, current - amount)
+end

data-otservbr-global/lib/lib.lua

@@ -9,3 +9,6 @@ dofile(DATA_DIRECTORY .. "/lib/quests/quest.lua")
 
 -- Tables library
 dofile(DATA_DIRECTORY .. "/lib/tables/load.lua")
+
+-- Functions library
+dofile(DATA_DIRECTORY .. "/lib/functions/load.lua")

data-otservbr-global/migrations/10.lua

@@ -1,4 +1,4 @@
 function onUpdateDatabase()
-	logger.info("Updating database to version 11 (Guilds Balance)")
+	logger.info("Updating database to version 10 (Guilds Balance)")
 	db.query("ALTER TABLE `guilds` ADD `balance` bigint(20) UNSIGNED NOT NULL DEFAULT '0';")
 end

data-otservbr-global/migrations/11.lua

@@ -1,4 +1,4 @@
 function onUpdateDatabase()
-	logger.info("Updating database to version 12 (Player get daily reward)")
+	logger.info("Updating database to version 11 (Player get daily reward)")
 	db.query("ALTER TABLE `players` ADD `isreward` tinyint(1) NOT NULL DEFAULT 1")
 end

data-otservbr-global/migrations/12.lua

@@ -1,5 +1,5 @@
 function onUpdateDatabase()
-	logger.info("Updating database to version 13 (Boosted Creature Outfit)")
+	logger.info("Updating database to version 12 (Boosted Creature Outfit)")
 	db.query("ALTER TABLE boosted_creature ADD `looktype` int(11) NOT NULL DEFAULT 136;")
 	db.query("ALTER TABLE boosted_creature ADD `lookfeet` int(11) NOT NULL DEFAULT 0;")
 	db.query("ALTER TABLE boosted_creature ADD `looklegs` int(11) NOT NULL DEFAULT 0;")

data-otservbr-global/migrations/13.lua

@@ -1,4 +1,4 @@
 function onUpdateDatabase()
-	logger.info("Updating database to version 14 (Fixed mana spent)")
+	logger.info("Updating database to version 13 (Fixed mana spent)")
 	db.query("ALTER TABLE `players` CHANGE `manaspent` `manaspent` BIGINT(20) UNSIGNED NOT NULL DEFAULT '0';")
 end

data-otservbr-global/migrations/14.lua

@@ -1,5 +1,5 @@
 function onUpdateDatabase()
-	logger.info("Updating database to version 15 (Magic Shield Spell)")
+	logger.info("Updating database to version 14 (Magic Shield Spell)")
 	db.query("ALTER TABLE `players` ADD `manashield` SMALLINT UNSIGNED NOT NULL DEFAULT '0' AFTER `skill_manaleech_amount`")
 	db.query("ALTER TABLE `players` ADD `max_manashield` SMALLINT UNSIGNED NOT NULL DEFAULT '0' AFTER `manashield`")
 end

data-otservbr-global/migrations/15.lua

@@ -1,5 +1,5 @@
 function onUpdateDatabase()
-	logger.info("Updating database to version 16 (Rook sample and GOD player values)")
+	logger.info("Updating database to version 15 (Rook sample and GOD player values)")
 	-- Rook Sample
 	db.query("UPDATE `players` SET `maglevel` = 2, `manaspent` = 5936, `skill_club` = 12, `skill_club_tries` = 155, `skill_sword` = 12, `skill_sword_tries` = 155, `skill_axe` = 12, `skill_axe_tries` = 155, `skill_dist` = 12, `skill_dist_tries` = 93 WHERE `id` = 1;")
 	-- GOD

data-otservbr-global/migrations/16.lua

@@ -1,4 +1,4 @@
 function onUpdateDatabase()
-	print("Updating database to version 17 (Tutorial support)")
+	print("Updating database to version 16 (Tutorial support)")
 	db.query("ALTER TABLE `players` ADD `istutorial` SMALLINT(1) NOT NULL DEFAULT '0'")
 end

data-otservbr-global/migrations/17.lua

@@ -1,5 +1,5 @@
 function onUpdateDatabase()
-	logger.info("Updating database to version 18 (Fix guild creation myaac)")
+	logger.info("Updating database to version 17 (Fix guild creation myaac)")
 	db.query("ALTER TABLE `guilds` ADD `level` int(11) NOT NULL DEFAULT 1")
 	db.query("ALTER TABLE `guilds` ADD `points` int(11) NOT NULL DEFAULT 0")
 end

data-otservbr-global/migrations/18.lua

@@ -1,5 +1,5 @@
 function onUpdateDatabase()
-	logger.info("Updating database to version 19 (Prey system rework + Task hunting system)")
+	logger.info("Updating database to version 18 (Prey system rework + Task hunting system)")
 	db.query([[
 		ALTER TABLE `players`
 			DROP `prey_stamina_1`,

data-otservbr-global/migrations/19.lua

@@ -1,5 +1,5 @@
 function onUpdateDatabase()
-	logger.info("Updating database to version 20 (Gamestore accepting Tournament Coins)")
+	logger.info("Updating database to version 19 (Gamestore accepting Tournament Coins)")
 
 	db.query("ALTER TABLE `accounts` ADD `tournament_coins` int(11) NOT NULL DEFAULT 0 AFTER `coins`")
 	db.query("ALTER TABLE `store_history` ADD `coin_type` tinyint(1) NOT NULL DEFAULT 0 AFTER `description`")

data-otservbr-global/migrations/2.lua

@@ -1,5 +1,5 @@
 function onUpdateDatabase()
-	logger.info("Updating database to version 3 (account refactor)")
+	logger.info("Updating database to version 2 (account refactor)")
 
 	db.query([[
 		LOCK TABLES

data-otservbr-global/migrations/20.lua

@@ -1,5 +1,5 @@
 function onUpdateDatabase()
-	logger.info("Updating database to version 21 (Fix market price size)")
+	logger.info("Updating database to version 20 (Fix market price size)")
 	db.query("ALTER TABLE `market_history` CHANGE `price` `price` BIGINT(20) UNSIGNED NOT NULL DEFAULT '0';")
 	db.query("ALTER TABLE `market_offers` CHANGE `price` `price` BIGINT(20) UNSIGNED NOT NULL DEFAULT '0';")
 end

data-otservbr-global/migrations/21.lua

@@ -1,5 +1,5 @@
 function onUpdateDatabase()
-	logger.info("Updating database to version 22 (forge and tier system)")
+	logger.info("Updating database to version 21 (forge and tier system)")
 	db.query("ALTER TABLE `market_offers` ADD `tier` tinyint UNSIGNED NOT NULL DEFAULT '0';")
 	db.query("ALTER TABLE `market_history` ADD `tier` tinyint UNSIGNED NOT NULL DEFAULT '0';")
 	db.query("ALTER TABLE `players` ADD `forge_dusts` bigint(21) NOT NULL DEFAULT '0';")

data-otservbr-global/migrations/22.lua

@@ -1,5 +1,5 @@
 function onUpdateDatabase()
-	logger.info("Updating database to version 23 (fix offline training skill size)")
+	logger.info("Updating database to version 22 (fix offline training skill size)")
 	db.query([[
 			ALTER TABLE `players`
 				MODIFY offlinetraining_skill tinyint(2) NOT NULL DEFAULT '-1';

data-otservbr-global/migrations/23.lua

@@ -1,5 +1,5 @@
 function onUpdateDatabase()
-	logger.info("Updating database to version 24 (forge history)")
+	logger.info("Updating database to version 23 (forge history)")
 	db.query([[
 		CREATE TABLE IF NOT EXISTS `forge_history` (
 			`id` int NOT NULL AUTO_INCREMENT,

data-otservbr-global/migrations/24.lua

@@ -1,4 +1,4 @@
 function onUpdateDatabase()
-	logger.info("Updating database to version 25 (random mount outfit window)")
+	logger.info("Updating database to version 24 (random mount outfit window)")
 	db.query("ALTER TABLE `players` ADD `randomize_mount` SMALLINT(1) NOT NULL DEFAULT '0'")
 end

data-otservbr-global/migrations/25.lua

@@ -1,4 +1,4 @@
 function onUpdateDatabase()
-	logger.info("Updating database to version 26 (reward bag fix)")
+	logger.info("Updating database to version 25 (reward bag fix)")
 	db.query("UPDATE player_rewards SET pid = 0 WHERE itemtype = 19202;")
 end

data-otservbr-global/migrations/26.lua

@@ -1,5 +1,5 @@
 function onUpdateDatabase()
-	logger.info("Updating database to version 27 (towns)")
+	logger.info("Updating database to version 26 (towns)")
 
 	db.query([[
 	CREATE TABLE IF NOT EXISTS `towns` (

data-otservbr-global/migrations/27.lua

@@ -1,5 +1,5 @@
 function onUpdateDatabase()
-	logger.info("Updating database to version 28 (bosstiary system)")
+	logger.info("Updating database to version 27 (bosstiary system)")
 	db.query("ALTER TABLE `players` ADD `boss_points` int NOT NULL DEFAULT '0';")
 	db.query([[
 	CREATE TABLE IF NOT EXISTS `boosted_boss` (

data-otservbr-global/migrations/28.lua

@@ -1,4 +1,4 @@
 function onUpdateDatabase()
-	logger.info("Updating database to version 29 (transfer coins)")
+	logger.info("Updating database to version 28 (transfer coins)")
 	db.query("ALTER TABLE `accounts` ADD `coins_transferable` int unsigned NOT NULL DEFAULT '0';")
 end

data-otservbr-global/migrations/29.lua

@@ -1,4 +1,4 @@
 function onUpdateDatabase()
-	logger.info("Updating database to version 30 (looktypeEx)")
+	logger.info("Updating database to version 29 (looktypeEx)")
 	db.query("ALTER TABLE `boosted_boss` ADD `looktypeEx` int unsigned NOT NULL DEFAULT '0';")
 end

data-otservbr-global/migrations/3.lua

@@ -1,5 +1,5 @@
 function onUpdateDatabase()
-	logger.info("Updating database to version 4 (prey tick)")
+	logger.info("Updating database to version 3 (prey tick)")
 
 	db.query([[
         ALTER TABLE `prey_slots`

data-otservbr-global/migrations/30.lua

@@ -1,5 +1,5 @@
 function onUpdateDatabase()
-	logger.info("Updating database to version 31 (loyalty)")
+	logger.info("Updating database to version 30 (loyalty)")
 	db.query([[
 		ALTER TABLE `accounts` ADD COLUMN `premdays_purchased` int(11) NOT NULL DEFAULT 0;
 	]])

data-otservbr-global/migrations/31.lua

@@ -1,5 +1,5 @@
 function onUpdateDatabase()
-	logger.info("Updating database to version 32 (account_sessions)")
+	logger.info("Updating database to version 31 (account_sessions)")
 	db.query([[
 		CREATE TABLE IF NOT EXISTS `account_sessions` (
 			`id` VARCHAR(191) NOT NULL,

data-otservbr-global/migrations/32.lua

@@ -1,5 +1,5 @@
 function onUpdateDatabase()
-	logger.info("Updating database to version 33 (wheel of destiny)")
+	logger.info("Updating database to version 32 (wheel of destiny)")
 	db.query([[
 	CREATE TABLE IF NOT EXISTS `player_wheeldata` (
 		`player_id` int(11) NOT NULL,

data-otservbr-global/migrations/33.lua

@@ -1,5 +1,5 @@
 function onUpdateDatabase()
-	logger.info("Updating database to version 34 (add primary keys)")
+	logger.info("Updating database to version 33 (add primary keys)")
 	db.query([[
 		ALTER TABLE `player_prey`
 		ADD PRIMARY KEY (`player_id`, `slot`);

data-otservbr-global/migrations/34.lua

@@ -1,4 +1,4 @@
 function onUpdateDatabase()
-	logger.info("Updating database to version 35 (bosstiary tracker)")
+	logger.info("Updating database to version 34 (bosstiary tracker)")
 	db.query("ALTER TABLE `player_bosstiary` ADD `tracker` blob NOT NULL;")
 end

data-otservbr-global/migrations/35.lua

@@ -1,5 +1,5 @@
 function onUpdateDatabase()
-	logger.info("Updating database to version 36 (fix account premdays and lastday)")
+	logger.info("Updating database to version 35 (fix account premdays and lastday)")
 
 	local resultQuery = db.storeQuery("SELECT `id`, `premdays`, `lastday` FROM `accounts` WHERE (`premdays` > 0 OR `lastday` > 0) AND `lastday` <= " .. os.time())
 	if resultQuery ~= false then

data-otservbr-global/migrations/36.lua

@@ -1,4 +1,4 @@
 function onUpdateDatabase()
-	logger.info("Updating database to version 37 (add coin_type to accounts)")
+	logger.info("Updating database to version 36 (add coin_type to accounts)")
 	db.query("ALTER TABLE `coins_transactions` ADD `coin_type` tinyint(1) UNSIGNED NOT NULL DEFAULT '1';")
 end

data-otservbr-global/migrations/37.lua

@@ -1,4 +1,4 @@
 function onUpdateDatabase()
-	logger.info("Updating database to version 38 (add pronoun to players)")
+	logger.info("Updating database to version 37 (add pronoun to players)")
 	db.query("ALTER TABLE `players` ADD `pronoun` int(11) NOT NULL DEFAULT '0';")
 end

data-otservbr-global/migrations/38.lua

@@ -1,5 +1,5 @@
 function onUpdateDatabase()
-	logger.info("Updating database to version 39 (create kv store)")
+	logger.info("Updating database to version 38 (create kv store)")
 	db.query([[
 		CREATE TABLE IF NOT EXISTS `kv_store` (
 			`key_name` varchar(191) NOT NULL,

data-otservbr-global/migrations/39.lua

@@ -1,4 +1,4 @@
 function onUpdateDatabase()
-	logger.info("Updating database to version 40 (house transfer ownership on startup)")
+	logger.info("Updating database to version 39 (house transfer ownership on startup)")
 	db.query("ALTER TABLE `houses` ADD `new_owner` int(11) NOT NULL DEFAULT '-1';")
 end

data-otservbr-global/migrations/4.lua

@@ -1,5 +1,5 @@
 function onUpdateDatabase()
-	logger.info("Updating database to version 5 (boosted creature)")
+	logger.info("Updating database to version 4 (boosted creature)")
 	db.query([[CREATE TABLE IF NOT EXISTS `boosted_creature` (
         `boostname` TEXT,
         `date` varchar(250) NOT NULL DEFAULT '',