fix: review quests version 11

data-otservbr-global/scripts/quests/ferumbras_ascension/actions_ferumbras_lever.lua

@@ -1,91 +1,69 @@
-local crystals = {
-	[1] = { crystalPosition = Position(33390, 31468, 14), globalStorage = Storage.Quest.U10_90.FerumbrasAscension.Crystals.Crystal1 },
-	[2] = { crystalPosition = Position(33394, 31468, 14), globalStorage = Storage.Quest.U10_90.FerumbrasAscension.Crystals.Crystal2 },
-	[3] = { crystalPosition = Position(33397, 31471, 14), globalStorage = Storage.Quest.U10_90.FerumbrasAscension.Crystals.Crystal3 },
-	[4] = { crystalPosition = Position(33397, 31475, 14), globalStorage = Storage.Quest.U10_90.FerumbrasAscension.Crystals.Crystal4 },
-	[5] = { crystalPosition = Position(33394, 31478, 14), globalStorage = Storage.Quest.U10_90.FerumbrasAscension.Crystals.Crystal5 },
-	[6] = { crystalPosition = Position(33390, 31478, 14), globalStorage = Storage.Quest.U10_90.FerumbrasAscension.Crystals.Crystal6 },
-	[7] = { crystalPosition = Position(33387, 31475, 14), globalStorage = Storage.Quest.U10_90.FerumbrasAscension.Crystals.Crystal7 },
-	[8] = { crystalPosition = Position(33387, 31471, 14), globalStorage = Storage.Quest.U10_90.FerumbrasAscension.Crystals.Crystal8 },
-}
-
 local config = {
-	centerRoom = Position(33392, 31473, 14),
-	BossPosition = Position(33392, 31473, 14),
+	boss = {
+		name = "Ascending Ferumbras",
+		position = Position(33392, 31473, 14),
+	},
+	timeToFightAgain = 60 * 60 * 20 * 24,
 	playerPositions = {
-		Position(33269, 31477, 14),
-		Position(33269, 31478, 14),
-		Position(33269, 31479, 14),
-		Position(33269, 31480, 14),
-		Position(33269, 31481, 14),
-		Position(33270, 31477, 14),
-		Position(33270, 31478, 14),
-		Position(33270, 31479, 14),
-		Position(33270, 31480, 14),
-		Position(33270, 31481, 14),
-		Position(33271, 31477, 14),
-		Position(33271, 31478, 14),
-		Position(33271, 31479, 14),
-		Position(33271, 31480, 14),
-		Position(33271, 31481, 14),
+		{ pos = Position(33270, 31477, 14), teleport = Position(33392, 31479, 14) },
+		{ pos = Position(33269, 31477, 14), teleport = Position(33392, 31479, 14) },
+		{ pos = Position(33269, 31478, 14), teleport = Position(33392, 31479, 14) },
+		{ pos = Position(33269, 31479, 14), teleport = Position(33392, 31479, 14) },
+		{ pos = Position(33269, 31480, 14), teleport = Position(33392, 31479, 14) },
+		{ pos = Position(33269, 31481, 14), teleport = Position(33392, 31479, 14) },
+		{ pos = Position(33270, 31478, 14), teleport = Position(33392, 31479, 14) },
+		{ pos = Position(33270, 31479, 14), teleport = Position(33392, 31479, 14) },
+		{ pos = Position(33270, 31480, 14), teleport = Position(33392, 31479, 14) },
+		{ pos = Position(33270, 31481, 14), teleport = Position(33392, 31479, 14) },
+		{ pos = Position(33271, 31477, 14), teleport = Position(33392, 31479, 14) },
+		{ pos = Position(33271, 31478, 14), teleport = Position(33392, 31479, 14) },
+		{ pos = Position(33271, 31479, 14), teleport = Position(33392, 31479, 14) },
+		{ pos = Position(33271, 31480, 14), teleport = Position(33392, 31479, 14) },
+		{ pos = Position(33271, 31481, 14), teleport = Position(33392, 31479, 14) },
 	},
-	newPosition = Position(33392, 31479, 14),
-}
-
-local leverFerumbras = Action()
-
-function leverFerumbras.onUse(player, item, fromPosition, target, toPosition, isHotkey)
-	local playersTable = {}
-	if item.itemid == 8911 then
-		if player:getPosition() ~= Position(33270, 31477, 14) then
-			item:transform(8912)
-			return true
-		end
-	end
-	if item.itemid == 8911 then
-		if player:doCheckBossRoom("Ascending Ferumbras", Position(33379, 31460, 14), Position(33405, 31485, 14)) then
-			Game.createMonster("Ascending Ferumbras", config.BossPosition, true, true)
-			for b = 1, 10 do
-				local xrand = math.random(-10, 10)
-				local yrand = math.random(-10, 10)
-				local position = Position(33392 + xrand, 31473 + yrand, 14)
-				if Game.createMonster("rift invader", position) then
-				end
-			end
-			for x = 33269, 33271 do
-				for y = 31477, 31481 do
-					local playerTile = Tile(Position(x, y, 14)):getTopCreature()
-					if playerTile and playerTile:isPlayer() then
-						playerTile:getPosition():sendMagicEffect(CONST_ME_POFF)
-						playerTile:teleportTo(config.newPosition)
-						playerTile:getPosition():sendMagicEffect(CONST_ME_TELEPORT)
-						playerTile:setStorageValue(Storage.Quest.U10_90.FerumbrasAscension.FerumbrasTimer, os.time() + 60 * 60 * 20 * 24)
-						table.insert(playersTable, playerTile:getId())
-					end
-				end
-			end
-			Game.setStorageValue(Storage.Quest.U10_90.FerumbrasAscension.Crystals.AllCrystals, 0)
-			Game.setStorageValue(Storage.Quest.U10_90.FerumbrasAscension.FerumbrasEssence, 0)
-			for _, crystal in pairs(crystals) do
-				local pos = crystal.crystalPosition
-				local stg = crystal.globalStorage
-				local sqm = Tile(pos)
-				if sqm then
-					local item = sqm:getItemById(14961)
-					if item then
-						item:transform(14955)
-					end
+	specPos = {
+		from = Position(33379, 31460, 14),
+		to = Position(33405, 31485, 14),
+	},
+	exit = Position(33319, 32318, 13),
+	monsters = {
+		{ name = "rift invader", pos = Position(33385, 31466, 14) },
+		{ name = "rift invader", pos = Position(33396, 31466, 14) },
+		{ name = "rift invader", pos = Position(33392, 31480, 14) },
+		{ name = "rift invader", pos = Position(33392, 31468, 14) },
+		{ name = "rift invader", pos = Position(33385, 31473, 14) },
+		{ name = "rift invader", pos = Position(33398, 31478, 14) },
+		{ name = "rift invader", pos = Position(33384, 31478, 14) },
+		{ name = "rift invader", pos = Position(33390, 31463, 14) },
+		{ name = "rift invader", pos = Position(33400, 31473, 14) },
+		{ name = "rift invader", pos = Position(33400, 31465, 14) },
+	},
+	onUseExtra = function(player)
+		local crystals = {
+			[1] = { crystalPosition = Position(33390, 31468, 14), globalStorage = Storage.Quest.U10_90.FerumbrasAscension.Crystals.Crystal1 },
+			[2] = { crystalPosition = Position(33394, 31468, 14), globalStorage = Storage.Quest.U10_90.FerumbrasAscension.Crystals.Crystal2 },
+			[3] = { crystalPosition = Position(33397, 31471, 14), globalStorage = Storage.Quest.U10_90.FerumbrasAscension.Crystals.Crystal3 },
+			[4] = { crystalPosition = Position(33397, 31475, 14), globalStorage = Storage.Quest.U10_90.FerumbrasAscension.Crystals.Crystal4 },
+			[5] = { crystalPosition = Position(33394, 31478, 14), globalStorage = Storage.Quest.U10_90.FerumbrasAscension.Crystals.Crystal5 },
+			[6] = { crystalPosition = Position(33390, 31478, 14), globalStorage = Storage.Quest.U10_90.FerumbrasAscension.Crystals.Crystal6 },
+			[7] = { crystalPosition = Position(33387, 31475, 14), globalStorage = Storage.Quest.U10_90.FerumbrasAscension.Crystals.Crystal7 },
+			[8] = { crystalPosition = Position(33387, 31471, 14), globalStorage = Storage.Quest.U10_90.FerumbrasAscension.Crystals.Crystal8 },
+		}
+		Game.setStorageValue(Storage.Quest.U10_90.FerumbrasAscension.Crystals.AllCrystals, 0)
+		Game.setStorageValue(Storage.Quest.U10_90.FerumbrasAscension.FerumbrasEssence, 0)
+		for _, crystal in pairs(crystals) do
+			local tile = Tile(crystal.crystalPosition)
+			if tile then
+				local item = tile:getItemById(14961)
+				if item then
+					item:transform(14955)
 				end
-				Game.setStorageValue(stg, 0)
 			end
-			addEvent(kickPlayersAfterTime, 30 * 60 * 1000, playersTable, Position(33379, 31460, 14), Position(33405, 31485, 14), Position(33319, 32318, 13))
-			item:transform(8912)
+			Game.setStorageValue(crystal.globalStorage, 0)
 		end
-	elseif item.itemid == 8912 then
-		item:transform(8911)
-	end
-	return true
-end
+	end,
+}
 
-leverFerumbras:uid(1021)
+local leverFerumbras = BossLever(config)
+leverFerumbras:position(Position(33270, 31476, 14))
 leverFerumbras:register()

data-otservbr-global/scripts/quests/ferumbras_ascension/actions_rat_lever.lua

@@ -1,57 +1,23 @@
 local config = {
-	centerRoom = Position(33215, 31456, 12),
-	BossPosition = Position(33220, 31460, 12),
+	boss = {
+		name = "The Lord of the Lice",
+		position = Position(33220, 31460, 12),
+	},
+	timeToFightAgain = 2 * 24 * 60 * 60,
 	playerPositions = {
-		Position(33197, 31475, 11),
-		Position(33198, 31475, 11),
-		Position(33199, 31475, 11),
-		Position(33200, 31475, 11),
-		Position(33201, 31475, 11),
+		{ pos = Position(33201, 31475, 11), teleport = Position(33215, 31470, 12) },
+		{ pos = Position(33197, 31475, 11), teleport = Position(33215, 31470, 12) },
+		{ pos = Position(33198, 31475, 11), teleport = Position(33215, 31470, 12) },
+		{ pos = Position(33199, 31475, 11), teleport = Position(33215, 31470, 12) },
+		{ pos = Position(33200, 31475, 11), teleport = Position(33215, 31470, 12) },
+	},
+	specPos = {
+		from = Position(33187, 31429, 12),
+		to = Position(33242, 31487, 12),
 	},
-	newPosition = Position(33215, 31470, 12),
+	exit = Position(33319, 32318, 13),
 }
 
-local ferumbrasAscendantRatLever = Action()
-
-function ferumbrasAscendantRatLever.onUse(player, item, fromPosition, target, toPosition, isHotkey)
-	if item.itemid == 8911 then
-		if player:getPosition() ~= Position(33201, 31475, 11) then
-			item:transform(8912)
-			return true
-		end
-	end
-
-	if item.itemid == 8911 then
-		local playersTable = {}
-		if player:doCheckBossRoom("The Lord of the Lice", Position(33187, 31429, 12), Position(33242, 31487, 12)) then
-			local specs, spec = Game.getSpectators(config.centerRoom, false, false, 30, 30, 30, 30)
-			for i = 1, #specs do
-				spec = specs[i]
-				if spec:isPlayer() then
-					player:sendTextMessage(MESSAGE_EVENT_ADVANCE, "Someone is fighting with The Lord of The Lice.")
-					return true
-				end
-			end
-			Game.createMonster("the lord of the lice", config.BossPosition, true, true)
-			for x = 33197, 33201 do
-				local playerTile = Tile(Position(x, 31475, 11)):getTopCreature()
-				if playerTile and playerTile:isPlayer() then
-					playerTile:getPosition():sendMagicEffect(CONST_ME_POFF)
-					playerTile:teleportTo(config.newPosition)
-					playerTile:getPosition():sendMagicEffect(CONST_ME_TELEPORT)
-					playerTile:setStorageValue(Storage.Quest.U10_90.FerumbrasAscension.TheLordOfTheLiceTimer, os.time() + 60 * 60 * 2 * 24)
-					table.insert(playersTable, playerTile:getId())
-				end
-			end
-			addEvent(kickPlayersAfterTime, 30 * 60 * 1000, playersTable, Position(33187, 31429, 12), Position(33242, 31487, 12), Position(33319, 32318, 13))
-			item:transform(8912)
-		end
-	elseif item.itemid == 8912 then
-		item:transform(8911)
-	end
-
-	return true
-end
-
-ferumbrasAscendantRatLever:uid(1030)
-ferumbrasAscendantRatLever:register()
+local leverLordOfTheLice = BossLever(config)
+leverLordOfTheLice:position(Position(33202, 31475, 11))
+leverLordOfTheLice:register()

data-otservbr-global/scripts/quests/ferumbras_ascension/actions_the_shatterer_lever.lua

@@ -1,56 +1,23 @@
 local config = {
-	centerRoom = Position(33406, 32418, 14),
-	BossPosition = Position(33406, 32418, 14),
+	boss = {
+		name = "The Shatterer",
+		position = Position(33406, 32418, 14),
+	},
+	timeToFightAgain = 2 * 24 * 60 * 60,
 	playerPositions = {
-		Position(33403, 32465, 13),
-		Position(33404, 32465, 13),
-		Position(33405, 32465, 13),
-		Position(33406, 32465, 13),
-		Position(33407, 32465, 13),
+		{ pos = Position(33403, 32465, 13), teleport = Position(33398, 32414, 14) },
+		{ pos = Position(33404, 32465, 13), teleport = Position(33398, 32414, 14) },
+		{ pos = Position(33405, 32465, 13), teleport = Position(33398, 32414, 14) },
+		{ pos = Position(33406, 32465, 13), teleport = Position(33398, 32414, 14) },
+		{ pos = Position(33407, 32465, 13), teleport = Position(33398, 32414, 14) },
+	},
+	specPos = {
+		from = Position(33377, 32390, 14),
+		to = Position(33446, 32447, 14),
 	},
-	newPosition = Position(33398, 32414, 14),
+	exit = Position(33319, 32318, 13),
 }
 
-local ferumbrasAscendantTheShattererLever = Action()
-
-function ferumbrasAscendantTheShattererLever.onUse(player, item, fromPosition, target, toPosition, isHotkey)
-	if item.itemid == 8912 then
-		if player:getPosition() ~= Position(33403, 32465, 13) then
-			item:transform(8911)
-			return true
-		end
-	end
-	if item.itemid == 8912 then
-		local playersTable = {}
-		if player:doCheckBossRoom("The Shatterer", Position(33377, 32390, 14), Position(33446, 32447, 14)) then
-			local specs, spec = Game.getSpectators(config.centerRoom, false, false, 30, 30, 30, 30)
-			for i = 1, #specs do
-				spec = specs[i]
-				if spec:isPlayer() then
-					player:sendTextMessage(MESSAGE_EVENT_ADVANCE, "Someone is fighting with The Shatterer.")
-					return true
-				end
-			end
-			Game.createMonster("The Shatterer", config.BossPosition, true, true)
-			for x = 33403, 33407 do
-				local playerTile = Tile(Position(x, 32465, 13)):getTopCreature()
-				if playerTile and playerTile:isPlayer() then
-					playerTile:getPosition():sendMagicEffect(CONST_ME_POFF)
-					playerTile:teleportTo(config.newPosition)
-					playerTile:getPosition():sendMagicEffect(CONST_ME_TELEPORT)
-					playerTile:setStorageValue(Storage.Quest.U10_90.FerumbrasAscension.TheShattererTimer, os.time() + 60 * 60 * 2 * 24)
-					table.insert(playersTable, playerTile:getId())
-				end
-			end
-			addEvent(kickPlayersAfterTime, 30 * 60 * 1000, playersTable, Position(33377, 32390, 14), Position(33446, 32447, 14), Position(33319, 32318, 13))
-			item:transform(8911)
-		end
-	elseif item.itemid == 8911 then
-		item:transform(8912)
-	end
-
-	return true
-end
-
-ferumbrasAscendantTheShattererLever:uid(1029)
-ferumbrasAscendantTheShattererLever:register()
+local leverShatterer = BossLever(config)
+leverShatterer:position(Position(33402, 32465, 13))
+leverShatterer:register()