update to : opentibiabr/canary@e54b9c7

mattyx14 · Nov 1, 2023 · d6678bc · d6678bc
1 parent 4c7786e
commit d6678bc
Show file tree

Hide file tree

Showing 130 changed files with 748 additions and 527 deletions.
diff --git a/data-otxserver/lib/core/storages.lua b/data-otxserver/lib/core/storages.lua
@@ -215,11 +215,7 @@ Storage = {
 		Fourteen = {
 			Remains = 50041,
 		},
-		UrmahlulluTimer = 50042,
 		AccessDoor = 50043,
-		NeferiTheSpyTimer = 50044,
-		SisterHetaiTimer = 55045,
-		AmenefTimer = 55046,
 		CatacombDoors = 55047,
 	},
 	TheSecretLibrary = {
@@ -433,15 +429,11 @@ Storage = {
 		Questline = 50350,
 		DragonCounter = 50351,
 		ChestCounter = 50352,
-		TazhadurTimer = 50353,
-		KalyassaTimer = 50354,
 		SecretsCounter = 50355,
 		GelidrazahAccess = 50356,
-		GelidrazahTimer = 50357,
 		DesertTile = 50358,
 		StoneSculptureTile = 50359,
 		SuntowerTile = 50360,
-		ZorvoraxTimer = 50361,
 		Horn = 50362,
 		Scale = 50363,
 		Bones = 50364,
@@ -473,14 +465,6 @@ Storage = {
 		RiftRunner = 50420, -- Scroll
 		TheShattererTimer = 50421,
 		TheLordOfTheLiceTimer = 50422,
-		TarbazTimer = 50423,
-		RazzagornTimer = 50424,
-		RagiazTimer = 50425,
-		ZamuloshTimer = 50426,
-		ShulgraxTimer = 50427,
-		MazoranTimer = 50428,
-		PlagirathTimer = 50429,
-		FerumbrasTimer = 50430,
 		Tarbaz = 50431,
 		Razzagorn = 50432,
 		Ragiaz = 50433,
@@ -531,19 +515,12 @@ Storage = {
 		DiamondServantCounter = 50484,
 		AccessPortals = 50485,
 		AccessMachine = 50486,
-		LadyTenebrisTimer = 50487,
 		LadyTenebrisKilled = 50488,
-		LloydTimer = 50489,
 		LloydKilled = 50490,
-		ThornKnightTimer = 50491,
 		ThornKnightKilled = 50492,
-		DragonkingTimer = 50493,
 		DragonkingKilled = 50494,
-		HorrorTimer = 50495,
 		HorrorKilled = 50496,
-		TimeGuardianTimer = 50497,
 		TimeGuardianKilled = 50498,
-		LastLoreTimer = 50499,
 		LastLoreKilled = 50501,
 		BirdCage = 50502,
 		AccessLavaTeleport = 50503,
@@ -686,9 +663,6 @@ Storage = {
 		Warzone3Reward = 50704,
 		BossKills = 50705,
 		DoorGoldenFruits = 50706,
-		BossWarzone1 = 50707,
-		BossWarzone2 = 50708,
-		BossWarzone3 = 50709,
 		GnomedixMsg = 50710,
 	},
 	TheirMastersVoice = {
@@ -934,6 +908,7 @@ Storage = {
 		DeeplingAnchor = 51023,
 		FirstOrientalAddon = 51024,
 		SecondOrientalAddon = 51025,
+		RoyalCostumeOutfit = 51026,
 	},
 	TheAncientTombs = {
 		-- Reserved storage from 50940 - 51059
@@ -1707,7 +1682,6 @@ Storage = {
 		Questline = 52310,
 		CobraBastion = {
 			Questline = 52311,
-			ScarlettTimer = 52312,
 		},
 	},
 	RottinWoodAndMaried = {
@@ -1733,7 +1707,6 @@ Storage = {
 			Commander = 52396, -- Global
 			TotalLionCommanders = 52397, -- Global
 			TotalUsurperCommanders = 52398, -- Global
-			Timer = 52399,
 		},
 	},
 	-- News quest development
@@ -2567,17 +2540,8 @@ Storage = {
 			ChakoyaIcebergMiniWorldChange = {},
 			GrimvaleMineWorldChange = {},
 			Grimvale = {
-				BloodbackTimer = 44951,
-				DarkfangTimer = 44952,
-				SharpclawTimer = 44953,
-				ShadowpeltTimer = 44954,
-				BlackVixenTimer = 44955,
 				AncientFeudDoors = 44956,
 				AncientFeudShortcut = 44957,
-				YirkasTimer = 44958,
-				SrezzTimer = 44959,
-				UtuaTimer = 44960,
-				KatexTimer = 44961,
 			},
 			HiveOutpostMiniWorldChange = {},
 			JungleCampMiniWorldChange = {},
@@ -2723,7 +2687,6 @@ Storage = {
 				BuriedCathedralAccess = 46403,
 				DreamScarAccess = 46404,
 				AndrewDoor = 14900,
-				FacelessBaneTime = 50283,
 				AccessDoors = 46309,
 				ArenaTimer = 46310,
 				PlaguerootKilled = 46311,
@@ -2760,18 +2723,12 @@ Storage = {
 					IceIslands = 46863,
 				},
 				Bosses = {
-					BaelocNictrosTimer = 46865,
 					BaelocNictrosKilled = 46866,
-					CountVlarkorthTimer = 46867,
 					CountVlarkorthKilled = 46868,
-					DukeKruleTimer = 46869,
 					DukeKruleKilled = 46870,
-					EarlOsamTimer = 46871,
 					EarlOsamKilled = 46872,
-					LordAzaramTimer = 46873,
 					LordAzaramKilled = 46874,
 					KingZelosDoor = 46875,
-					KingZelosTimer = 46876,
 					KingZelosKilled = 46877,
 					InquisitionOutfitReceived = 46878,
 				},
@@ -2783,20 +2740,12 @@ Storage = {
 		U12_30 = { -- update 12.30 - Reserved Storages 47001 - 47200
 			FalconerOutfits = {},
 			FeasterOfSouls = {
-				IrgixTimer = 47005,
-				IrgixKilled = 47006,
-				UnazTimer = 47007,
 				UnazKilled = 47008,
-				VokTimer = 47009,
 				VokKilled = 47010,
-				FearFeasterTimer = 47011,
 				FearFeasterKilled = 47012,
-				DreadMaidenTimer = 47013,
 				DreadMaidenKilled = 47014,
-				UnwelcomeTimer = 47015,
 				UnwelcomeKilled = 47016,
 				PaleWormEntrance = 47017,
-				PaleWormTimer = 47018,
 				PaleWormKilled = 47019,
 			},
 			PoltergeistOutfits = {
@@ -2811,20 +2760,15 @@ Storage = {
 				AccessSouthernSide = 47403,
 			},
 			SoulWar = {
-				GoshnarMaliceTimer = 47210,
 				GoshnarMaliceKilled = 47211,
-				GoshnarHatredTimer = 47212,
 				GoshnarHatredKilled = 47213,
-				GoshnarSpiteTimer = 47214,
 				GoshnarSpiteKilled = 47215,
-				GoshnarCrueltyTimer = 47216,
 				GoshnarCrueltyKilled = 47217,
-				GoshnarGreedTimer = 47218,
 				GoshnarGreedKilled = 47219,
 				GoshnarMegalomaniaAccess = 47220,
-				GoshnarMegalomaniaTimer = 47221,
 				GoshnarMegalomaniaKilled = 47222,
 				QuestReward = 47223,
+				OutfitReward = 47224,
 			},
 		},
 		U12_60 = { -- update 12.60 - Reserved Storages 47501 - 47600
@@ -2833,21 +2777,15 @@ Storage = {
 				RascacoonShortcut = 47512,
 				TentuglyKilled = 47513,
 				TentuglyDoor = 47514,
-				TentuglyTimer = 47515,
-				RatmiralTimer = 47516,
 			},
 			RascoohanOutfits = {},
 		},
 		U12_70 = { -- update 12.70 - Reserved Storages 47601 - 47800
 			AdventuresOfGalthen = {
 				AccessDoor = 47601,
-				MegasylvanYseldaTimer = 47602,
 			},
 			CitizenOfIssaviOutfits = {},
 			RoyalBounaceanAdvisorOutfits = {},
-			TooHotToHandle = {
-				BrainstealerTimer = 47611,
-			},
 		},
 		U12_80 = { -- update 12.80 - Reserved Storages 47801 - 47850
 			RoyalCostumeOutfits = {},
@@ -2860,15 +2798,10 @@ Storage = {
 					Max = 47857,
 				},
 				Bosses = {
-					MagmaBubbleTimer = 47852,
 					MagmaBubbleKilled = 47853,
-					ThePrimalMenaceTimer = 47854,
 					ThePrimalMenaceKilled = 47855,
 				},
 			},
-			WithinTheTides = {
-				TimiraTimer = 47858,
-			},
 		},
 		U13_10 = { -- update 13.10 - Reserved Storages 47901 - 47951
 			CradleOfMonsters = {

diff --git a/data-otxserver/migrations/40.lua b/data-otxserver/migrations/40.lua
@@ -1,14 +1,17 @@
 function onUpdateDatabase()
 	logger.info("Updating database to version 41 (optimize house_lists)")
-	db.query([[
-			ALTER TABLE `house_lists` DROP COLUMN `id`;
-		]])
 
 	db.query([[
 			ALTER TABLE `house_lists`
 			ADD COLUMN `version` bigint NOT NULL DEFAULT 0 AFTER `listid`,
 			ADD INDEX `version` (`version`),
 			ADD PRIMARY KEY (`house_id`, `listid`);
 		]])
+
+	db.query([[
+		ALTER TABLE `house_lists` 
+		MODIFY `version` bigint(20) NOT NULL DEFAULT '0';
+	]])
+
 	return true
 end
diff --git a/data-otxserver/monster/bosses/morshabaal.lua b/data-otxserver/monster/bosses/morshabaal.lua
@@ -28,7 +28,6 @@ monster.changeTarget = {
 monster.bosstiary = {
 	bossRaceId = 2118,
 	bossRace = RARITY_NEMESIS,
-	--storageCooldown = Storage.Quest.U12_70.AdventuresOfGalthen.MegasylvanYseldaTimer
 }
 
 monster.strategiesTarget = {

diff --git a/data-otxserver/monster/bosses/the_brainstealer.lua b/data-otxserver/monster/bosses/the_brainstealer.lua
@@ -16,7 +16,6 @@ monster.outfit = {
 monster.bosstiary = {
 	bossRaceId = 2055,
 	bossRace = RARITY_ARCHFOE,
-	storageCooldown = Storage.Quest.U12_70.TooHotToHandle.BrainstealerTimer,
 }
 
 monster.health = 300000

diff --git a/data-otxserver/monster/bosses/the_first_dragon.lua b/data-otxserver/monster/bosses/the_first_dragon.lua
@@ -58,7 +58,7 @@ monster.flags = {
 }
 
 monster.events = {
-	"First Dragon Death",
+	"FirstDragonDeath",
 }
 
 monster.light = {

diff --git a/data-otxserver/monster/quests/a_pirates_tail_quest/ratmiral_blackwhiskers.lua b/data-otxserver/monster/quests/a_pirates_tail_quest/ratmiral_blackwhiskers.lua
@@ -20,6 +20,10 @@ monster.corpse = 35846
 monster.speed = 115
 monster.manaCost = 0
 
+monster.events = {
+	"RatmiralBlackwhiskersDeath",
+}
+
 monster.changeTarget = {
 	interval = 4000,
 	chance = 10,
@@ -28,7 +32,6 @@ monster.changeTarget = {
 monster.bosstiary = {
 	bossRaceId = 2006,
 	bossRace = RARITY_ARCHFOE,
-	storageCooldown = Storage.Quest.U12_60.APiratesTail.RatmiralTimer,
 }
 
 monster.strategiesTarget = {

diff --git a/data-otxserver/monster/quests/a_pirates_tail_quest/tentuglys_head.lua b/data-otxserver/monster/quests/a_pirates_tail_quest/tentuglys_head.lua
@@ -10,7 +10,6 @@ monster.outfit = {
 monster.bosstiary = {
 	bossRaceId = 2238,
 	bossRace = RARITY_ARCHFOE,
-	storageCooldown = Storage.Quest.U12_60.APiratesTail.TentuglyTimer,
 }
 
 monster.health = 75000

diff --git a/data-otxserver/monster/quests/adventures_of_galthen/megasylvan_yselda.lua b/data-otxserver/monster/quests/adventures_of_galthen/megasylvan_yselda.lua
@@ -10,7 +10,6 @@ monster.outfit = {
 monster.bosstiary = {
 	bossRaceId = 2114,
 	bossRace = RARITY_ARCHFOE,
-	storageCooldown = Storage.Quest.U12_70.AdventuresOfGalthen.MegasylvanYseldaTimer,
 }
 
 monster.health = 32000

diff --git a/data-otxserver/monster/quests/ancient_feud/katex_blood_tongue.lua b/data-otxserver/monster/quests/ancient_feud/katex_blood_tongue.lua
@@ -28,7 +28,6 @@ monster.changeTarget = {
 monster.bosstiary = {
 	bossRaceId = 1981,
 	bossRace = RARITY_ARCHFOE,
-	storageCooldown = Storage.Quest.U10_80.Grimvale.KatexTimer,
 }
 
 monster.strategiesTarget = {

diff --git a/data-otxserver/monster/quests/ancient_feud/srezz_yellow_eyes.lua b/data-otxserver/monster/quests/ancient_feud/srezz_yellow_eyes.lua
@@ -16,7 +16,6 @@ monster.outfit = {
 monster.bosstiary = {
 	bossRaceId = 1983,
 	bossRace = RARITY_ARCHFOE,
-	storageCooldown = Storage.Quest.U10_80.Grimvale.SrezzTimer,
 }
 
 monster.health = 6200

diff --git a/data-otxserver/monster/quests/ancient_feud/utua_stone_sting.lua b/data-otxserver/monster/quests/ancient_feud/utua_stone_sting.lua
@@ -16,7 +16,6 @@ monster.outfit = {
 monster.bosstiary = {
 	bossRaceId = 1984,
 	bossRace = RARITY_ARCHFOE,
-	storageCooldown = Storage.Quest.U10_80.Grimvale.UtuaTimer,
 }
 
 monster.health = 6400

diff --git a/data-otxserver/monster/quests/ancient_feud/yirkas_blue_scales.lua b/data-otxserver/monster/quests/ancient_feud/yirkas_blue_scales.lua
@@ -16,7 +16,6 @@ monster.outfit = {
 monster.bosstiary = {
 	bossRaceId = 1982,
 	bossRace = RARITY_ARCHFOE,
-	storageCooldown = Storage.Quest.U10_80.Grimvale.YirkasTimer,
 }
 
 monster.health = 6300

diff --git a/data-otxserver/monster/quests/bigfoots_burden/bosses/abyssador.lua b/data-otxserver/monster/quests/bigfoots_burden/bosses/abyssador.lua
@@ -16,7 +16,6 @@ monster.outfit = {
 monster.bosstiary = {
 	bossRaceId = 887,
 	bossRace = RARITY_ARCHFOE,
-	storageCooldown = Storage.BigfootBurden.BossWarzone3,
 }
 
 monster.health = 340000

diff --git a/data-otxserver/monster/quests/bigfoots_burden/bosses/deathstrike.lua b/data-otxserver/monster/quests/bigfoots_burden/bosses/deathstrike.lua
@@ -16,7 +16,6 @@ monster.outfit = {
 monster.bosstiary = {
 	bossRaceId = 892,
 	bossRace = RARITY_ARCHFOE,
-	storageCooldown = Storage.BigfootBurden.BossWarzone1,
 }
 
 monster.health = 200000

diff --git a/data-otxserver/monster/quests/bigfoots_burden/bosses/gnomevil.lua b/data-otxserver/monster/quests/bigfoots_burden/bosses/gnomevil.lua
@@ -16,7 +16,6 @@ monster.outfit = {
 monster.bosstiary = {
 	bossRaceId = 893,
 	bossRace = RARITY_ARCHFOE,
-	storageCooldown = Storage.BigfootBurden.BossWarzone2,
 }
 
 monster.health = 250000

diff --git a/data-otxserver/monster/quests/cults_of_tibia/bosses/essence_of_malice.lua b/data-otxserver/monster/quests/cults_of_tibia/bosses/essence_of_malice.lua
@@ -16,7 +16,6 @@ monster.outfit = {
 monster.bosstiary = {
 	bossRaceId = 1487,
 	bossRace = RARITY_ARCHFOE,
-	storageCooldown = Storage.CultsOfTibia.Humans.BossTimer,
 }
 
 monster.health = 250000

diff --git a/data-otxserver/monster/quests/cults_of_tibia/bosses/ravenous_hunger.lua b/data-otxserver/monster/quests/cults_of_tibia/bosses/ravenous_hunger.lua
@@ -16,7 +16,6 @@ monster.outfit = {
 monster.bosstiary = {
 	bossRaceId = 1427,
 	bossRace = RARITY_ARCHFOE,
-	storageCooldown = Storage.CultsOfTibia.Barkless.BossTimer,
 }
 
 monster.health = 100000

diff --git a/data-otxserver/monster/quests/cults_of_tibia/bosses/the_armored_voidborn.lua b/data-otxserver/monster/quests/cults_of_tibia/bosses/the_armored_voidborn.lua
@@ -16,7 +16,6 @@ monster.outfit = {
 monster.bosstiary = {
 	bossRaceId = 1406,
 	bossRace = RARITY_ARCHFOE,
-	storageCooldown = Storage.CultsOfTibia.Orcs.BossTimer,
 }
 
 monster.health = 60000

diff --git a/data-otxserver/monster/quests/cults_of_tibia/bosses/the_false_god.lua b/data-otxserver/monster/quests/cults_of_tibia/bosses/the_false_god.lua
@@ -16,7 +16,6 @@ monster.outfit = {
 monster.bosstiary = {
 	bossRaceId = 1409,
 	bossRace = RARITY_ARCHFOE,
-	storageCooldown = Storage.CultsOfTibia.Minotaurs.BossTimer,
 }
 
 monster.health = 300000

diff --git a/data-otxserver/monster/quests/cults_of_tibia/bosses/the_sandking.lua b/data-otxserver/monster/quests/cults_of_tibia/bosses/the_sandking.lua
@@ -16,7 +16,6 @@ monster.outfit = {
 monster.bosstiary = {
 	bossRaceId = 1444,
 	bossRace = RARITY_ARCHFOE,
-	storageCooldown = Storage.CultsOfTibia.Life.BossTimer,
 }
 
 monster.health = 50000