41

Jonyrewind · Nov 24, 2023 · 5bdb0d6 · 5bdb0d6
1 parent 083d894
commit 5bdb0d6
Show file tree

Hide file tree

Showing 8 changed files with 17 additions and 28 deletions.
diff --git a/data-otservbr-global/scripts/globalevents/quests/ancient_lion_knight.lua b/data-otservbr-global/scripts/globalevents/quests/ancient_lion_knight.lua
@@ -4,32 +4,15 @@ local config = {
 	centerPosition = Position(32456, 32495, 7),
 	rangeX = 50,
 	rangeY = 50,
-	spawn = configManager.getNumber(configKeys.RATE_SPAWN),
+	timer = configManager.getNumber(configKeys.RATE_SPAWN) * SCHEDULE_SPAWN_RATE,
 }
 
-local function checkBoss(centerPosition, rangeX, rangeY, bossName)
-	local spectators, spec = Game.getSpectators(centerPosition, false, false, rangeX, rangeX, rangeY, rangeY)
-	for i = 1, #spectators do
-		spec = spectators[i]
-		if spec:isMonster() then
-			if spec:getName() == bossName then
-				return true
-			end
-		end
-	end
-	return false
-end
 
 local lionKnight = GlobalEvent("ancient lion knight")
 function lionKnight.onThink(interval, lastExecution)
-	if checkBoss(config.centerPosition, config.rangeX, config.rangeY, config.monsterName) then
-		return true
-	end
-
-	local boss = Game.createMonster(config.monsterName, config.bossPosition, true, true)
-	boss:setReward(true)
+	checkBoss(config.centerPosition, config.rangeX, config.rangeY, config.monsterName, config.bossPosition)
 	return true
 end
 
-lionKnight:interval(1 * 60 * 1000)
+lionKnight:interval(15 * 60 * 1000 / config.timer)
 lionKnight:register()
diff --git a/data-otservbr-global/scripts/globalevents/quests/cobra_minis_custodian.lua b/data-otservbr-global/scripts/globalevents/quests/cobra_minis_custodian.lua
@@ -4,6 +4,7 @@ local config = {
 	centerPosition = Position(33376, 32825, 8),
 	rangeX = 50,
 	rangeY = 50,
+	timer = configManager.getNumber(configKeys.RATE_SPAWN) * SCHEDULE_SPAWN_RATE,
 }
 
 local miniBoss = GlobalEvent("custodian")
@@ -12,5 +13,5 @@ function miniBoss.onThink(interval, lastExecution)
 	return true
 end
 
-miniBoss:interval(1 * 60 * 1000)
+miniBoss:interval(15 * 60 * 1000 / config.timer)
 miniBoss:register()
diff --git a/data-otservbr-global/scripts/globalevents/quests/cobra_minis_gaffir.lua b/data-otservbr-global/scripts/globalevents/quests/cobra_minis_gaffir.lua
@@ -4,6 +4,7 @@ local config = {
 	centerPosition = Position(33394, 32674, 4),
 	rangeX = 50,
 	rangeY = 50,
+	timer = configManager.getNumber(configKeys.RATE_SPAWN) * SCHEDULE_SPAWN_RATE,
 }
 
 local miniBoss = GlobalEvent("gaffir")
@@ -12,5 +13,5 @@ function miniBoss.onThink(interval, lastExecution)
 	return true
 end
 
-miniBoss:interval(1 * 60 * 1000)
+miniBoss:interval(15 * 60 * 1000 / config.timer)
 miniBoss:register()
diff --git a/data-otservbr-global/scripts/globalevents/quests/cobra_minis_quaid.lua b/data-otservbr-global/scripts/globalevents/quests/cobra_minis_quaid.lua
@@ -4,6 +4,7 @@ local config = {
 	centerPosition = Position(33392, 32660, 3),
 	rangeX = 50,
 	rangeY = 50,
+	timer = configManager.getNumber(configKeys.RATE_SPAWN) * SCHEDULE_SPAWN_RATE,
 }
 
 local miniBoss = GlobalEvent("guard captain quaid")
@@ -12,5 +13,5 @@ function miniBoss.onThink(interval, lastExecution)
 	return true
 end
 
-miniBoss:interval(1 * 60 * 1000)
+miniBoss:interval(15 * 60 * 1000 / config.timer)
 miniBoss:register()
diff --git a/data-otservbr-global/scripts/globalevents/quests/secret_library_grand_canon_dominus.lua b/data-otservbr-global/scripts/globalevents/quests/secret_library_grand_canon_dominus.lua
@@ -13,5 +13,5 @@ function canonDominus.onThink(interval, lastExecution)
 	return true
 end
 
-canonDominus:interval(1 * 60 * 1000 / config.timer)
+canonDominus:interval(15 * 60 * 1000 / config.timer)
 canonDominus:register()
diff --git a/data-otservbr-global/scripts/globalevents/quests/secret_library_grand_chaplain_gaunder.lua b/data-otservbr-global/scripts/globalevents/quests/secret_library_grand_chaplain_gaunder.lua
@@ -4,6 +4,7 @@ local config = {
 	centerPosition = Position(33370, 31327, 5),
 	rangeX = 50,
 	rangeY = 50,
+	timer = configManager.getNumber(configKeys.RATE_SPAWN) * SCHEDULE_SPAWN_RATE,
 }
 
 local chaplaingaunder = GlobalEvent("chaplaingaunder")
@@ -12,5 +13,5 @@ function chaplaingaunder.onThink(interval, lastExecution)
 	return true
 end
 
-chaplaingaunder:interval(1 * 60 * 1000)
+chaplaingaunder:interval(15 * 60 * 1000 / config.timer)
 chaplaingaunder:register()
diff --git a/data-otservbr-global/scripts/globalevents/quests/secret_library_grand_commander_soeren.lua b/data-otservbr-global/scripts/globalevents/quests/secret_library_grand_commander_soeren.lua
@@ -4,6 +4,7 @@ local config = {
 	centerPosition = Position(33376, 31320, 2),
 	rangeX = 50,
 	rangeY = 50,
+	timer = configManager.getNumber(configKeys.RATE_SPAWN) * SCHEDULE_SPAWN_RATE,
 }
 
 local grandCommander = GlobalEvent("grand commander")
@@ -12,5 +13,5 @@ function grandCommander.onThink(interval, lastExecution)
 	return true
 end
 
-grandCommander:interval(15 * 60 * 1000) -- 15 minutes
-grandCommander:register()
+grandCommander:interval(15 * 60 * 1000 / config.timer) -- 15 minutes
+grandCommander:register()
diff --git a/data-otservbr-global/scripts/globalevents/quests/secret_library_preceptor_lazare.lua b/data-otservbr-global/scripts/globalevents/quests/secret_library_preceptor_lazare.lua
@@ -4,6 +4,7 @@ local config = {
 	centerPosition = Position(33373, 31348, 3),
 	rangeX = 50,
 	rangeY = 50,
+	timer = configManager.getNumber(configKeys.RATE_SPAWN) * SCHEDULE_SPAWN_RATE,
 }
 
 local preceptorLazare = GlobalEvent("preceptor lazare")
@@ -12,5 +13,5 @@ function preceptorLazare.onThink(interval, lastExecution)
 	return true
 end
 
-preceptorLazare:interval(1 * 60 * 1000)
+preceptorLazare:interval(15 * 60 * 1000 / config.timer)
 preceptorLazare:register()