Merge branch 'main' into spells

opentibiabr · Jan 25, 2025 · e9f55c7 · e9f55c7
2 parents dbef42a + 1ff6943
commit e9f55c7
Show file tree

Hide file tree

Showing 12 changed files with 154 additions and 132 deletions.
diff --git a/data-otservbr-global/lib/core/storages.lua b/data-otservbr-global/lib/core/storages.lua
@@ -2114,84 +2114,83 @@ Storage = {
 		U10_90 = { -- update 10.90 - Reserved Storages 45201 - 45350
 			FerumbrasAscension = {
 				RiftRunner = 45201, -- Scroll
-				TheShattererTimer = 45202,
-				TheLordOfTheLiceTimer = 45203,
-				Tarbaz = 45204,
-				Razzagorn = 45205,
-				Ragiaz = 45206,
-				Zamulosh = 45207,
-				Shulgrax = 45208,
-				Mazoran = 45209,
-				Plagirath = 45210,
-				Access = 45211,
-				TheShatterer = 45212,
-				ZamuloshTeleports = 45213,
-				BasinCounter = 45214,
-				TheLordOfTheLiceAccess = 45215,
-				FirstDoor = 45216,
-				MonsterDoor = 45217,
-				TarbazDoor = 45218,
-				HabitatsAccess = 45219,
-				HabitatsTimer = 45220,
-				TarbazNotes = 45221,
-				ColorLever = 45222,
-				BoneFluteWall = 45223,
-				BoneFlute = 45224,
-				Ring = 45225,
-				Statue = 45226,
-				Fount = 45227,
-				Vampire = 45228,
-				Flower = 45229,
-				Ring2 = 45230,
-				Bone = 45231,
-				Reward = 45232,
-				TheShattererLever = 45233,
-				TheLordOfTheLiceTime = 45234,
-				TarbazTime = 45235,
-				RagiazTime = 45236,
-				PlagirathTime = 45237,
-				RazzagornTime = 45238,
-				ZamuloshTime = 45239,
-				MazoranTime = 45240,
-				ShulgraxTime = 45241,
-				FerumbrasMortalShellTime = 45242,
-				ZamuloshSummon = 45243,
-				FerumbrasEssence = 45244,
-				DesperateSoul = 45245,
-				FlowerPuzzleTimer = 45246,
+				Tarbaz = 45202,
+				Razzagorn = 45203,
+				Ragiaz = 45204,
+				Zamulosh = 45205,
+				Shulgrax = 45206,
+				Mazoran = 45207,
+				Plagirath = 45208,
+				Access = 45209,
+				TheShatterer = 45210,
+				ZamuloshTeleports = 45211,
+				BasinCounter = 45212,
+				TheLordOfTheLiceAccess = 45213,
+				FirstDoor = 45214,
+				MonsterDoor = 45215,
+				TarbazDoor = 45216,
+				HabitatsAccess = 45217,
+				HabitatsTimer = 45218,
+				TarbazNotes = 45219,
+				ColorLever = 45220,
+				BoneFluteWall = 45221,
+				BoneFlute = 45222,
+				Ring = 45223,
+				Statue = 45224,
+				Fount = 45225,
+				Vampire = 45226,
+				Flower = 45227,
+				Ring2 = 45228,
+				Bone = 45229,
+				Reward = 45230,
+				TheShattererLever = 45231,
+				TheShattererTimer = 45232,
+				TheLordOfTheLiceTimer = 45233,
+				TarbazTimer = 45234,
+				RagiazTimer = 45235,
+				PlagirathTimer = 45236,
+				RazzagornTimer = 45237,
+				ZamuloshTimer = 45238,
+				MazoranTimer = 45239,
+				ShulgraxTimer = 45240,
+				FerumbrasMortalShellTimer = 45241,
+				ZamuloshSummon = 45242,
+				FerumbrasEssence = 45243,
+				DesperateSoul = 45244,
+				FlowerPuzzleTimer = 45245,
 				Crystals = {
-					Crystal1 = 45247,
-					Crystal2 = 45248,
-					Crystal3 = 45249,
-					Crystal4 = 45250,
-					Crystal5 = 45251,
-					Crystal6 = 45252,
-					Crystal7 = 45253,
-					Crystal8 = 45254,
-					AllCrystals = 45255,
+					Crystal1 = 45246,
+					Crystal2 = 45247,
+					Crystal3 = 45248,
+					Crystal4 = 45249,
+					Crystal5 = 45250,
+					Crystal6 = 45251,
+					Crystal7 = 45252,
+					Crystal8 = 45253,
+					AllCrystals = 45254,
 				},
 				Habitats = {
-					Roshamuul = 45256,
-					Grass = 45257,
-					Mushroom = 45258,
-					Desert = 45259,
-					Venom = 45260,
-					Ice = 45261,
-					Corrupted = 45262,
-					Dimension = 45263,
-					AllHabitats = 45264,
+					Roshamuul = 45255,
+					Grass = 45256,
+					Mushroom = 45257,
+					Desert = 45258,
+					Venom = 45259,
+					Ice = 45260,
+					Corrupted = 45261,
+					Dimension = 45262,
+					AllHabitats = 45263,
 				},
 				Elements = {
-					First = 45265,
-					Second = 45266,
-					Third = 45267,
-					Four = 45268,
-					Active = 45269,
-					Done = 45270,
-				},
-				TheRiteOfEternalNight = 45271,
-				StoneCoffinsBones = 45272,
-				VampireTeeth = 45273,
+					First = 45264,
+					Second = 45265,
+					Third = 45266,
+					Four = 45267,
+					Active = 45268,
+					Done = 45269,
+				},
+				TheRiteOfEternalNight = 45270,
+				StoneCoffinsBones = 45271,
+				VampireTeeth = 45272,
 			},
 			Krailos = {},
 		},

diff --git a/data-otservbr-global/npc/eruaran.lua b/data-otservbr-global/npc/eruaran.lua
@@ -159,7 +159,7 @@ local function dreamFirst(npc, creature, message, keywords, parameters, node)
 		if player:getStorageValue(storage + 1) < 1 then
 			if player:getItemCount(20276) > 0 then
 				if player:removeItem(20276, 1) then
-					npcHandler:say(newaddon, npc, creature)
+					npcHandler:say(newAddon, npc, creature)
 					player:getPosition():sendMagicEffect(CONST_ME_MAGIC_BLUE)
 					player:addOutfitAddon(577, 1)
 					player:addOutfitAddon(577, 1)
@@ -184,7 +184,7 @@ local function dreamSecond(npc, creature, message, keywords, parameters, node)
 		if player:getStorageValue(storage) < 1 then
 			if player:getItemCount(20275) > 0 then
 				if player:removeItem(20275, 1) then
-					npcHandler:say(newaddon, npc, creature)
+					npcHandler:say(newAddon, npc, creature)
 					player:getPosition():sendMagicEffect(CONST_ME_MAGIC_BLUE)
 					player:addOutfitAddon(577, 2)
 					player:addOutfitAddon(577, 2)

diff --git a/data-otservbr-global/scripts/creaturescripts/customs/freequests.lua b/data-otservbr-global/scripts/creaturescripts/customs/freequests.lua
@@ -327,8 +327,8 @@ local questTable = {
 	{ storageName = "DjinnWar.EfreetFaction.DoorToMaridTerritory", storage = Storage.Quest.U7_4.DjinnWar.EfreetFaction.DoorToMaridTerritory, storageValue = 1 },
 	{ storageName = "DjinnWar.MaridFaction.DoorToLamp", storage = Storage.Quest.U7_4.DjinnWar.MaridFaction.DoorToLamp, storageValue = 1 },
 	{ storageName = "DjinnWar.MaridFaction.DoorToEfreetTerritory", storage = Storage.Quest.U7_4.DjinnWar.MaridFaction.DoorToEfreetTerritory, storageValue = 1 },
-	{ storageName = "GraveDanger.QuestLine", storage = Storage.Quest.U12_20.GraveDanger.QuestLine, storageValue = 14 },
-	{ storageName = "GraveDanger.Bosses.KingZelosDoor", storage = Storage.Quest.U12_20.GraveDanger.Bosses.KingZelosDoor, storageValue = 1 },
+	{ storageName = "GraveDanger.QuestLine", storage = Storage.Quest.U12_20.GraveDanger.Questline, storageValue = 14 },
+	{ storageName = "GraveDanger.Bosses.KingZelosRoom", storage = Storage.Quest.U12_20.GraveDanger.Bosses.KingZelos.Room, storageValue = 1 },
 	{ storageName = "CradleOfMonsters.Access.Ingol", storage = Storage.Quest.U13_10.CradleOfMonsters.Access.Ingol, storageValue = 1 },
 	{ storageName = "CradleOfMonsters.Access.LowerIngol", storage = Storage.Quest.U13_10.CradleOfMonsters.Access.LowerIngol, storageValue = 1 },
 	{ storageName = "CradleOfMonsters.Access.Monster", storage = Storage.Quest.U13_10.CradleOfMonsters.Access.Monster, storageValue = 1 },

diff --git a/data-otservbr-global/scripts/quests/ferumbras_ascension/creaturescripts_bosses_kill.lua b/data-otservbr-global/scripts/quests/ferumbras_ascension/creaturescripts_bosses_kill.lua
@@ -3,55 +3,55 @@ local bosses = {
 		teleportPos = Position(33226, 31478, 12),
 		godbreakerPos = Position(33237, 31477, 13),
 		cooldown = 44, -- hours
-		storage = Storage.Quest.U10_90.FerumbrasAscension.TheLordOfTheLiceTime,
+		storage = Storage.Quest.U10_90.FerumbrasAscension.TheLordOfTheLiceTimer,
 	},
 	["tarbaz"] = {
 		teleportPos = Position(33460, 32853, 11),
 		godbreakerPos = Position(33427, 32852, 13),
 		cooldown = 44, -- hours
-		storage = Storage.Quest.U10_90.FerumbrasAscension.TarbazTime,
+		storage = Storage.Quest.U10_90.FerumbrasAscension.TarbazTimer,
 	},
 	["ragiaz"] = {
 		teleportPos = Position(33482, 32345, 13),
 		godbreakerPos = Position(33466, 32392, 13),
 		cooldown = 44, -- hours
-		storage = Storage.Quest.U10_90.FerumbrasAscension.RagiazTime,
+		storage = Storage.Quest.U10_90.FerumbrasAscension.RagiazTimer,
 	},
 	["plagirath"] = {
 		teleportPos = Position(33174, 31511, 13),
 		godbreakerPos = Position(33204, 31510, 13),
 		cooldown = 44, -- hours
-		storage = Storage.Quest.U10_90.FerumbrasAscension.PlagirathTime,
+		storage = Storage.Quest.U10_90.FerumbrasAscension.PlagirathTimer,
 	},
 	["razzagorn"] = {
 		teleportPos = Position(33357, 32434, 12),
 		godbreakerPos = Position(33357, 32440, 13),
 		cooldown = 44, -- hours
-		storage = Storage.Quest.U10_90.FerumbrasAscension.RazzagornTime,
+		storage = Storage.Quest.U10_90.FerumbrasAscension.RazzagornTimer,
 	},
 	["zamulosh"] = {
 		teleportPos = Position(33644, 32764, 11),
 		godbreakerPos = Position(33678, 32758, 13),
 		cooldown = 44, -- hours
-		storage = Storage.Quest.U10_90.FerumbrasAscension.ZamuloshTime,
+		storage = Storage.Quest.U10_90.FerumbrasAscension.ZamuloshTimer,
 	},
 	["mazoran"] = {
 		teleportPos = Position(33585, 32699, 14),
 		godbreakerPos = Position(33614, 32679, 15),
 		cooldown = 44, -- hours
-		storage = Storage.Quest.U10_90.FerumbrasAscension.MazoranTime,
+		storage = Storage.Quest.U10_90.FerumbrasAscension.MazoranTimer,
 	},
 	["shulgrax"] = {
 		teleportPos = Position(33486, 32796, 13),
 		godbreakerPos = Position(33459, 32820, 14),
 		cooldown = 44, -- hours
-		storage = Storage.Quest.U10_90.FerumbrasAscension.ShulgraxTime,
+		storage = Storage.Quest.U10_90.FerumbrasAscension.ShulgraxTimer,
 	},
 	["ferumbras mortal shell"] = {
 		teleportPos = Position(33392, 31485, 14),
 		godbreakerPos = Position(33388, 31414, 14),
 		cooldown = 332, -- hours - 13 days and 20 hours
-		storage = Storage.Quest.U10_90.FerumbrasAscension.FerumbrasMortalShellTime,
+		storage = Storage.Quest.U10_90.FerumbrasAscension.FerumbrasMortalShellTimer,
 	},
 }
 

diff --git a/data-otservbr-global/scripts/quests/ferumbras_ascension/movements_boss_teleport.lua b/data-otservbr-global/scripts/quests/ferumbras_ascension/movements_boss_teleport.lua
@@ -1,37 +1,37 @@
 local config = {
 	[24830] = {
 		storage = Storage.Quest.U10_90.FerumbrasAscension.Razzagorn,
-		cooldownStorage = Storage.Quest.U10_90.FerumbrasAscension.RazzagornTime,
+		cooldownStorage = Storage.Quest.U10_90.FerumbrasAscension.RazzagornTimer,
 		bossName = "Razzagorn",
 	},
 	[24831] = {
 		storage = Storage.Quest.U10_90.FerumbrasAscension.Ragiaz,
-		cooldownStorage = Storage.Quest.U10_90.FerumbrasAscension.RagiazTime,
+		cooldownStorage = Storage.Quest.U10_90.FerumbrasAscension.RagiazTimer,
 		bossName = "Ragiaz",
 	},
 	[24832] = {
 		storage = Storage.Quest.U10_90.FerumbrasAscension.Zamulosh,
-		cooldownStorage = Storage.Quest.U10_90.FerumbrasAscension.ZamuloshTime,
+		cooldownStorage = Storage.Quest.U10_90.FerumbrasAscension.ZamuloshTimer,
 		bossName = "Zamulosh",
 	},
 	[24833] = {
 		storage = Storage.Quest.U10_90.FerumbrasAscension.Mazoran,
-		cooldownStorage = Storage.Quest.U10_90.FerumbrasAscension.MazoranTime,
+		cooldownStorage = Storage.Quest.U10_90.FerumbrasAscension.MazoranTimer,
 		bossName = "Mazoran",
 	},
 	[24834] = {
 		storage = Storage.Quest.U10_90.FerumbrasAscension.Tarbaz,
-		cooldownStorage = Storage.Quest.U10_90.FerumbrasAscension.TarbazTime,
+		cooldownStorage = Storage.Quest.U10_90.FerumbrasAscension.TarbazTimer,
 		bossName = "Tarbaz",
 	},
 	[24835] = {
 		storage = Storage.Quest.U10_90.FerumbrasAscension.Shulgrax,
-		cooldownStorage = Storage.Quest.U10_90.FerumbrasAscension.ShulgraxTime,
+		cooldownStorage = Storage.Quest.U10_90.FerumbrasAscension.ShulgraxTimer,
 		bossName = "Shulgrax",
 	},
 	[24836] = {
 		storage = Storage.Quest.U10_90.FerumbrasAscension.Plagirath,
-		cooldownStorage = Storage.Quest.U10_90.FerumbrasAscension.PlagirathTime,
+		cooldownStorage = Storage.Quest.U10_90.FerumbrasAscension.PlagirathTimer,
 		bossName = "Plagirath",
 	},
 }

diff --git a/data-otservbr-global/scripts/quests/ferumbras_ascension/movements_seal.lua b/data-otservbr-global/scripts/quests/ferumbras_ascension/movements_seal.lua
@@ -3,49 +3,49 @@ local config = {
 		toPosition = Position(33419, 32841, 11),
 		backPosition = Position(33484, 32775, 12),
 		boss = "Tarbaz",
-		cooldownStorage = Storage.Quest.U10_90.FerumbrasAscension.TarbazTime,
+		cooldownStorage = Storage.Quest.U10_90.FerumbrasAscension.TarbazTimer,
 	},
 	[24840] = {
 		toPosition = Position(33452, 32356, 13),
 		backPosition = Position(33432, 32330, 14),
 		boss = "Ragiaz",
-		cooldownStorage = Storage.Quest.U10_90.FerumbrasAscension.RagiazTime,
+		cooldownStorage = Storage.Quest.U10_90.FerumbrasAscension.RagiazTimer,
 	},
 	[24841] = {
 		toPosition = Position(33230, 31493, 13),
 		backPosition = Position(33197, 31438, 13),
 		boss = "Plagirath",
-		cooldownStorage = Storage.Quest.U10_90.FerumbrasAscension.PlagirathTime,
+		cooldownStorage = Storage.Quest.U10_90.FerumbrasAscension.PlagirathTimer,
 	},
 	[24842] = {
 		toPosition = Position(33380, 32454, 14),
 		backPosition = Position(33399, 32402, 15),
 		boss = "Razzagorn",
-		cooldownStorage = Storage.Quest.U10_90.FerumbrasAscension.RazzagornTime,
+		cooldownStorage = Storage.Quest.U10_90.FerumbrasAscension.RazzagornTimer,
 	},
 	[24843] = {
 		toPosition = Position(33680, 32736, 11),
 		backPosition = Position(33664, 32682, 10),
 		boss = "Zamulosh",
-		cooldownStorage = Storage.Quest.U10_90.FerumbrasAscension.ZamuloshTime,
+		cooldownStorage = Storage.Quest.U10_90.FerumbrasAscension.ZamuloshTimer,
 	},
 	[24844] = {
 		toPosition = Position(33593, 32658, 14),
 		backPosition = Position(33675, 32690, 13),
 		boss = "Mazoran",
-		cooldownStorage = Storage.Quest.U10_90.FerumbrasAscension.MazoranTime,
+		cooldownStorage = Storage.Quest.U10_90.FerumbrasAscension.MazoranTimer,
 	},
 	[24845] = {
 		toPosition = Position(33436, 32800, 13),
 		backPosition = Position(33477, 32701, 14),
 		boss = "Shulgrax",
-		cooldownStorage = Storage.Quest.U10_90.FerumbrasAscension.ShulgraxTime,
+		cooldownStorage = Storage.Quest.U10_90.FerumbrasAscension.ShulgraxTimer,
 	},
 	[24846] = {
 		toPosition = Position(33270, 31474, 14),
 		backPosition = Position(33324, 31374, 14),
 		boss = "Ferumbras Mortal Shell",
-		cooldownStorage = Storage.Quest.U10_90.FerumbrasAscension.FerumbrasMortalShellTime,
+		cooldownStorage = Storage.Quest.U10_90.FerumbrasAscension.FerumbrasMortalShellTimer,
 	},
 }
 

diff --git a/data-otservbr-global/scripts/quests/others/actions_holy_water.lua b/data-otservbr-global/scripts/quests/others/actions_holy_water.lua
@@ -128,6 +128,7 @@ function othersHolyWater.onUse(player, item, fromPosition, target, toPosition, i
 			end
 			nexusMessage(player, player:getName() .. " destroyed the shadow nexus! In 10 seconds it will return to its original state.")
 			item:remove(1)
+			player:setStorageValue(Storage.Quest.U8_2.TheInquisitionQuest.Questline, 22)
 			toPosition:sendMagicEffect(CONST_ME_HOLYAREA)
 		else
 			target:transform(7925)

diff --git a/data-otservbr-global/scripts/quests/the_dream_courts_quest/actions_facelessLever.lua b/data-otservbr-global/scripts/quests/the_dream_courts_quest/actions_facelessLever.lua
@@ -20,5 +20,5 @@ local config = {
 }
 
 local lever = BossLever(config)
-lever:uid(1039)
+lever:position(Position(33637, 32562, 13))
 lever:register()
diff --git a/...tservbr-global/scripts/quests/the_dream_courts_quest/creaturescripts_dreamCourtsDeath.lua b/...tservbr-global/scripts/quests/the_dream_courts_quest/creaturescripts_dreamCourtsDeath.lua
@@ -2,7 +2,7 @@ local questlog = {
 	[1] = {
 		bossName = "Faceless Bane",
 		storageQuestline = Storage.Quest.U12_00.TheDreamCourts.HauntedHouse.Questline,
-		storageTimer = Storage.Quest.U12_00.TheDreamCourts.BurriedCatedralGlobal.FacelessTime,
+		storageTimer = Storage.Quest.U12_00.TheDreamCourts.BurriedCatedralGlobal.FacelessTimer,
 		middlePosition = Position(33617, 32563, 13),
 		maxValue = 4,
 	},

diff --git a/data-otservbr-global/startup/tables/teleport_item.lua b/data-otservbr-global/startup/tables/teleport_item.lua
@@ -161,4 +161,11 @@ TeleportItemUnique = {
 		destination = { x = 33916, y = 31466, z = 8 },
 		effect = CONST_ME_TELEPORT,
 	},
+	-- Faceless Bane entrance
+	[15004] = {
+		itemId = 29954,
+		itemPos = { x = 33619, y = 32518, z = 15 },
+		destination = { x = 33640, y = 32561, z = 13 },
+		effect = CONST_ME_TELEPORT,
+	},
 }