Fixed some bosses checks from (opentibiabr#1724).

elsongabriel · Oct 25, 2023 · 042c35b · 042c35b
1 parent f17f918
commit 042c35b
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 9 deletions.
diff --git a/data-otservbr-global/scripts/actions/quests/feaster_of_souls/portal_minis_feaster.lua b/data-otservbr-global/scripts/actions/quests/feaster_of_souls/portal_minis_feaster.lua
@@ -84,7 +84,7 @@ function teleportBoss.onStepIn(creature, item, position, fromPosition)
 				creature:sendTextMessage(MESSAGE_EVENT_ADVANCE, "All the players need to be level " .. value.requiredLevel .. " or higher.")
 				return true
 			end
-			if creature:canFightBoss(value.bossName) then
+			if not creature:canFightBoss(value.bossName) then
 				creature:teleportTo(fromPosition, true)
 				creature:getPosition():sendMagicEffect(CONST_ME_TELEPORT)
 				creature:sendTextMessage(MESSAGE_EVENT_ADVANCE, "You have to wait " .. value.timeToFightAgain .. " hours to face " .. value.bossName .. " again!")

diff --git a/data-otservbr-global/scripts/actions/quests/ferumbras_ascendant/ferumbras_lever.lua b/data-otservbr-global/scripts/actions/quests/ferumbras_ascendant/ferumbras_lever.lua
@@ -50,7 +50,7 @@ function ferumbrasAscendantLever.onUse(player, item, fromPosition, target, toPos
 			for y = 31477, 31481 do
 				local playerTile = Tile(Position(x, y, 14)):getTopCreature()
 				if playerTile and playerTile:isPlayer() then
-					if playerTile:canFightBoss("Ferumbras Mortal Shell") then
+					if not playerTile:canFightBoss("Ferumbras Mortal Shell") then
 						player:sendTextMessage(MESSAGE_EVENT_ADVANCE, "You or a member in your team have to wait 5 days to face Ferumbras again!")
 						item:transform(8912)
 						return true

diff --git a/data-otservbr-global/scripts/actions/quests/kilmaresh/portal_minis_kilmaresh.lua b/data-otservbr-global/scripts/actions/quests/kilmaresh/portal_minis_kilmaresh.lua
@@ -84,7 +84,7 @@ function teleportBoss.onStepIn(creature, item, position, fromPosition)
 				creature:sendTextMessage(MESSAGE_EVENT_ADVANCE, "All the players need to be level " .. value.requiredLevel .. " or higher.")
 				return true
 			end
-			if creature:canFightBoss(value.bossName) then
+			if not creature:canFightBoss(value.bossName) then
 				creature:teleportTo(fromPosition, true)
 				creature:getPosition():sendMagicEffect(CONST_ME_TELEPORT)
 				creature:sendTextMessage(MESSAGE_EVENT_ADVANCE, "You have to wait " .. value.timeToFightAgain .. " hours to face " .. value.bossName .. " again!")

diff --git a/data-otservbr-global/scripts/movements/quests/first_dragon/entrance_teleport.lua b/data-otservbr-global/scripts/movements/quests/first_dragon/entrance_teleport.lua
@@ -57,7 +57,7 @@ function entranceTeleport.onStepIn(creature, item, position, fromPosition)
 		return true
 	end
 
-	if player:canFightBoss(setting.bossName) then
+	if not player:canFightBoss(setting.bossName) then
 		player:getPosition():sendMagicEffect(CONST_ME_TELEPORT)
 		player:teleportTo(fromPosition)
 		player:getPosition():sendMagicEffect(CONST_ME_TELEPORT)

diff --git a/data-otservbr-global/scripts/movements/quests/forgotten_knowledge/servant_teleport.lua b/data-otservbr-global/scripts/movements/quests/forgotten_knowledge/servant_teleport.lua
@@ -6,7 +6,7 @@ function servantTeleport.onStepIn(creature, item, position, fromPosition)
 		return
 	end
 
-	if player:canFightBoss("LLoyd") then
+	if not player:canFightBoss("LLoyd") then
 		player:teleportTo(Position(32815, 32872, 13))
 		player:getPosition():sendMagicEffect(CONST_ME_TELEPORT)
 		position:sendMagicEffect(CONST_ME_TELEPORT)

diff --git a/data/libs/functions/player.lua b/data/libs/functions/player.lua
@@ -677,8 +677,5 @@ end
 
 function Player:canFightBoss(bossNameOrId)
 	local cooldown = self:getBossCooldown(bossNameOrId)
-	if cooldown > os.time() then
-		return false
-	end
-	return true
+	return cooldown > os.time() and false or true
 end