Merge branch 'main' into spells

config.lua.dist

@@ -88,6 +88,17 @@ maxItem = 5000
 maxContainer = 500
 maxContainerDepth = 200
 
+-- Animus Mastery - SoulPit (Get more info in: https://github.com/opentibiabr/canary/pull/3230)
+-- NOTE: animusMasteryMaxMonsterXpMultiplier is the maximum experience the multiplier can be.
+-- NOTE: animusMasteryMonsterXpMultiplier is the monster experience multiplier that has the animus mastery unlocked.
+-- NOTE: animusMasteryMonstersXpMultiplier is the multiplier for each 'animusMasteryMonstersToIncreaseXpMultiplier' monsters that
+-- the player has the animus mastery unlocked.
+-- NOTE: animusMasteryMonstersToIncreaseXpMultiplier is the amount of monster to increase the experience multiplier by 'animusMasteryMonstersXpMultiplier'.
+animusMasteryMaxMonsterXpMultiplier = 4.0
+animusMasteryMonsterXpMultiplier = 2.0
+animusMasteryMonstersXpMultiplier = 0.1
+animusMasteryMonstersToIncreaseXpMultiplier = 10
+
 -- Augments System (Get more info in: https://github.com/opentibiabr/canary/pull/2602)
 -- NOTE: the following values are for all weapons and equipments that have type of "increase damage", "powerful impact" and "strong impact".
 -- To customize the percentage of a particular item with these augment types, please add to the item "augments" section on items.xml as the example above.

data-otservbr-global/lib/others/load.lua

@@ -1 +1,2 @@
 dofile(DATA_DIRECTORY .. "/lib/others/dawnport.lua")
+dofile(DATA_DIRECTORY .. "/lib/others/soulpit.lua")

data-otservbr-global/lib/others/soulpit.lua

@@ -0,0 +1,174 @@
+SoulPit = {
+	SoulCoresConfiguration = {
+		chanceToGetSameMonsterSoulCore = 15, -- 15%
+		chanceToDropSoulCore = 5, -- 5%
+		chanceToGetOminousSoulCore = 2, -- 2%
+		chanceToDropSoulPrism = 4, -- 4%
+		monsterVariationsSoulCore = {
+			["Horse"] = "horse soul core (taupe)",
+			["Brown Horse"] = "horse soul core (brown)",
+			["Grey Horse"] = "horse soul core (gray)",
+			["Nomad"] = "nomad soul core (basic)",
+			["Nomad Blue"] = "nomad soul core (blue)",
+			["Nomad Female"] = "nomad soul core (female)",
+			["Purple Butterfly"] = "butterfly soul core (purple)",
+			["Butterfly"] = "butterfly soul core (blue)",
+			["Blue Butterfly"] = "butterfly soul core (blue)",
+			["Red Butterfly"] = "butterfly soul core (red)",
+		},
+		monstersDifficulties = {
+			["Harmless"] = 1,
+			["Trivial"] = 2,
+			["Easy"] = 3,
+			["Medium"] = 4,
+			["Hard"] = 5,
+			["Challenge"] = 6,
+		},
+	},
+	encounter = nil,
+	kickEvent = nil,
+	soulCores = Game.getSoulCoreItems(),
+	requiredLevel = 8,
+	playerPositions = {
+		{
+			pos = Position(32375, 31158, 8),
+			teleport = Position(32373, 31151, 8),
+			effect = CONST_ME_TELEPORT,
+		},
+		{
+			pos = Position(32375, 31159, 8),
+			teleport = Position(32374, 31151, 8),
+			effect = CONST_ME_TELEPORT,
+		},
+		{
+			pos = Position(32375, 31160, 8),
+			teleport = Position(32375, 31151, 8),
+			effect = CONST_ME_TELEPORT,
+		},
+		{
+			pos = Position(32375, 31161, 8),
+			teleport = Position(32376, 31151, 8),
+			effect = CONST_ME_TELEPORT,
+		},
+		{
+			pos = Position(32375, 31162, 8),
+			teleport = Position(32377, 31151, 8),
+			effect = CONST_ME_TELEPORT,
+		},
+	},
+	waves = {
+		[1] = {
+			stacks = {
+				[1] = 7,
+			},
+		},
+		[2] = {
+			stacks = {
+				[1] = 4,
+				[5] = 3,
+			},
+		},
+		[3] = {
+			stacks = {
+				[1] = 5,
+				[15] = 2,
+			},
+		},
+		[4] = {
+			stacks = {
+				[1] = 3,
+				[5] = 3,
+				[40] = 1,
+			},
+		},
+	},
+	effects = {
+		[1] = CONST_ME_TELEPORT,
+		[5] = CONST_ME_ORANGETELEPORT,
+		[15] = CONST_ME_REDTELEPORT,
+		[40] = CONST_ME_PURPLETELEPORT,
+	},
+	possibleAbilities = {
+		"overpowerSoulPit",
+		"enrageSoulPit",
+		"opressorSoulPit",
+	},
+	bossAbilities = {
+		overpowerSoulPit = {
+			criticalChance = 50, -- 50%
+			criticalDamage = 25, -- 25%
+			apply = function(monster)
+				monster:criticalChance(SoulPit.bossAbilities.overpowerSoulPit.criticalChance)
+				monster:criticalDamage(SoulPit.bossAbilities.overpowerSoulPit.criticalDamage)
+			end,
+		},
+		enrageSoulPit = {
+			bounds = {
+				[{ 0.8, 0.6 }] = 0.9, -- 10% damage reduction
+				[{ 0.6, 0.4 }] = 0.75, -- 25% damage reduction
+				[{ 0.4, 0.2 }] = 0.6, -- 40% damage reduction
+				[{ 0.0, 0.2 }] = 0.4, -- 60% damage reduction
+			},
+			apply = function(monster)
+				monster:registerEvent("enrageSoulPit")
+			end,
+		},
+		opressorSoulPit = {
+			spells = {
+				{ name = "soulpit opressor", interval = 2000, chance = 25, minDamage = 0, maxDamage = 0 },
+				{ name = "soulpit powerless", interval = 2000, chance = 30, minDamage = 0, maxDamage = 0 },
+				{ name = "soulpit intensehex", interval = 2000, chance = 15, minDamage = 0, maxDamage = 0 },
+			},
+			apply = function(monster)
+				-- Applying spells
+				for _, spell in pairs(SoulPit.bossAbilities.opressorSoulPit.spells) do
+					monster:addAttackSpell(readSpell(spell, monster:getType()))
+				end
+
+				return true
+			end,
+		},
+	},
+	timeToKick = 10 * 60 * 1000, -- 10 minutes
+	checkMonstersDelay = 4.5 * 1000, -- 4.5 seconds | The check delay should never be less than the timeToSpawnMonsters.
+	timeToSpawnMonsters = 4 * 1000, -- 4 seconds
+	totalMonsters = 7,
+	obeliskActive = 47379,
+	obeliskInactive = 47367,
+	obeliskPosition = Position(32375, 31157, 8),
+	bossPosition = Position(32376, 31144, 8),
+	exit = Position(32373, 31158, 8),
+	zone = Zone("soulpit"),
+
+	getMonsterVariationNameBySoulCore = function(searchName)
+		for mTypeName, soulCoreName in pairs(SoulPit.SoulCoresConfiguration.monsterVariationsSoulCore) do
+			if soulCoreName == searchName then
+				return mTypeName
+			end
+		end
+
+		return nil
+	end,
+	getSoulCoreMonster = function(name)
+		return name:match("^(.-) soul core")
+	end,
+	onFuseSoulCores = function(player, item, target)
+		local itemName = item:getName()
+		local targetItemName = target:getName()
+
+		if SoulPit.getSoulCoreMonster(itemName) and SoulPit.getSoulCoreMonster(targetItemName) then
+			local randomSoulCore = SoulPit.soulCores[math.random(#SoulPit.soulCores)]
+			player:addItem(randomSoulCore:getId(), 1)
+			player:getPosition():sendMagicEffect(CONST_ME_MAGIC_BLUE)
+			player:sendTextMessage(MESSAGE_EVENT_ADVANCE, string.format("You have received a %s soul core.", randomSoulCore:getName()))
+			item:remove(1)
+			target:remove(1)
+			return true
+		end
+
+		return false
+	end,
+}
+
+SoulPit.zone:addArea(Position(32362, 31132, 8), Position(32390, 31153, 8))
+SoulPit.zone:setRemoveDestination(SoulPit.exit)

data-otservbr-global/migrations/49.lua

@@ -0,0 +1,5 @@
+function onUpdateDatabase()
+	logger.info("Updating database to version 49 (feat: animus mastery (soulpit))")
+
+	db.query("ALTER TABLE `players` ADD `animus_mastery` mediumblob DEFAULT NULL;")
+end

data-otservbr-global/npc/plunderpurse.lua

@@ -7,15 +7,15 @@ npcConfig.description = internalNpcName
 
 npcConfig.health = 100
 npcConfig.maxHealth = npcConfig.health
-npcConfig.walkInterval = 0
+npcConfig.walkInterval = 2000
 npcConfig.walkRadius = 2
 
 npcConfig.outfit = {
 	lookType = 151,
 	lookHead = 114,
-	lookBody = 131,
+	lookBody = 132,
 	lookLegs = 0,
-	lookFeet = 20,
+	lookFeet = 78,
 	lookAddons = 1,
 }
 

data-otservbr-global/scripts/actions/soulpit/soulpit_arena_exit.lua

@@ -0,0 +1,17 @@
+local soulpitArenaExitConfig = {
+	arenaExit = Position(32375, 31153, 8),
+	destination = Position(32373, 31158, 8),
+}
+
+local soulpitArenaExit = Action()
+
+function soulpitArenaExit.onUse(player, item, fromPosition, target, toPosition, isHotkey)
+	if not player then
+		return false
+	end
+	player:getPosition():sendMagicEffect(CONST_ME_TELEPORT)
+	player:teleportTo(soulpitArenaExitConfig.destination)
+end
+
+soulpitArenaExit:position(soulpitArenaExitConfig.arenaExit)
+soulpitArenaExit:register()

data-otservbr-global/scripts/actions/soulpit/soulpit_entrance.lua

@@ -0,0 +1,57 @@
+local config = {
+	entrance = {
+		positions = {
+			Position(32350, 31030, 3),
+			Position(32349, 31030, 3),
+		},
+		destination = Position(32374, 31171, 8),
+	},
+	exit = {
+		position = Position(32374, 31173, 8),
+		destination = Position(32349, 31032, 3),
+	},
+}
+
+local soulpitEntrance = MoveEvent()
+
+function soulpitEntrance.onStepIn(creature, item, position, fromPosition)
+	local player = creature:getPlayer()
+	if not player then
+		return true
+	end
+
+	if not config.entrance.destination then
+		return true
+	end
+
+	player:teleportTo(config.entrance.destination)
+	position:sendMagicEffect(CONST_ME_TELEPORT)
+	return true
+end
+
+soulpitEntrance:type("stepin")
+for value in pairs(config.entrance.positions) do
+	soulpitEntrance:position(config.entrance.positions[value])
+end
+soulpitEntrance:register()
+
+local soulpitExit = MoveEvent()
+
+function soulpitExit.onStepIn(creature, item, position, fromPosition)
+	local player = creature:getPlayer()
+	if not player then
+		return true
+	end
+
+	if not config.exit then
+		return true
+	end
+
+	player:teleportTo(config.exit.destination)
+	position:sendMagicEffect(CONST_ME_TELEPORT)
+	return true
+end
+
+soulpitExit:type("stepin")
+soulpitExit:position(config.exit.position)
+soulpitExit:register()

data-otservbr-global/scripts/globalevents/dawnport_magic_effect.lua

@@ -1,12 +1,12 @@
 local positions = {
+	{ x = 32054, y = 31889, z = 5 },
 	{ x = 32056, y = 31889, z = 5 },
-	{ x = 32056, y = 31892, z = 5 },
-	{ x = 32063, y = 31900, z = 5 },
-	{ x = 32066, y = 31900, z = 5 },
-	{ x = 32074, y = 31892, z = 5 },
-	{ x = 32074, y = 31889, z = 5 },
-	{ x = 32063, y = 31881, z = 5 },
-	{ x = 32066, y = 31881, z = 5 },
+	{ x = 32063, y = 31880, z = 5 },
+	{ x = 32063, y = 31882, z = 5 },
+	{ x = 32073, y = 31889, z = 5 },
+	{ x = 32075, y = 31889, z = 5 },
+	{ x = 32063, y = 31899, z = 5 },
+	{ x = 32063, y = 31901, z = 5 },
 }
 local dawnportMagicEffect = GlobalEvent("DawnportMagicEffect")
 

data-otservbr-global/scripts/movements/others/dawnport_vocation_trial.lua

@@ -7,7 +7,7 @@ local vocationTrials = {
 	-- Sorcerer trial
 	[25005] = {
 		tutorialId = 5,
-		effectPosition = { x = 32050, y = 31891, z = 5 },
+		effectPosition = { x = 32064, y = 31905, z = 5 },
 		storage = Storage.Dawnport.Sorcerer,
 		message = "As a sorcerer, you can use the following spells: Magic Patch, Buzz, Scorch.",
 		vocation = {
@@ -37,7 +37,7 @@ local vocationTrials = {
 	-- Druid trial
 	[25006] = {
 		tutorialId = 6,
-		effectPosition = { x = 32064, y = 31905, z = 5 },
+		effectPosition = { x = 32064, y = 31876, z = 5 },
 		storage = Storage.Dawnport.Druid,
 		message = "As a druid, you can use these spells: Mud Attack, Chill Out, Magic Patch.",
 		vocation = {
@@ -67,7 +67,7 @@ local vocationTrials = {
 	-- Paladin trial
 	[25007] = {
 		tutorialId = 4,
-		effectPosition = { x = 32078, y = 31891, z = 5 },
+		effectPosition = { x = 32050, y = 31891, z = 5 },
 		storage = Storage.Dawnport.Paladin,
 		message = "As a paladin, you can use the following spells: Magic Patch, Arrow Call.",
 		vocation = {
@@ -98,7 +98,7 @@ local vocationTrials = {
 	-- Knight trial
 	[25008] = {
 		tutorialId = 3,
-		effectPosition = { x = 32064, y = 31876, z = 5 },
+		effectPosition = { x = 32078, y = 31891, z = 5 },
 		storage = Storage.Dawnport.Knight,
 		message = "As a knight, you can use the following spells: Bruise Bane.",
 		vocation = {
@@ -259,8 +259,8 @@ function dawnportVocationTrial.onStepIn(creature, item, position, fromPosition)
 	local trial = vocationTrials[item.actionid]
 	if trial then
 		-- Center room position
-		local centerPosition = Position(32065, 31891, 5)
-		if centerPosition:getDistance(fromPosition) < centerPosition:getDistance(position) then
+		local centerPosition = Position(32063, 31889, 5)
+		if centerPosition:getDistance(fromPosition) >= centerPosition:getDistance(position) then
 			-- Blocks the vocation trial if same vocation or after level 20
 			if player:getVocation():getId() == trial.vocation.id or player:getLevel() >= 20 then
 				return true

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

@@ -5,7 +5,7 @@ function ferumbrasAscendantLeverFirst.onUse(player, item, fromPosition, target,
 	end
 	if item.itemid == 9110 then
 		if player:getStorageValue(Storage.Quest.U10_90.FerumbrasAscension.Elements.Done) >= 1 then
-			local spectators = player:getSpectators(item:getPosition(), false, false, 9, 9, 6, 6)
+			local spectators = Game.getSpectators(item:getPosition(), false, false, 9, 9, 6, 6)
 			for i = 1, #spectators do
 				if spectators[i]:isPlayer() then
 					local spec = spectators[i]

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

@@ -5,7 +5,7 @@ function ferumbrasAscendantLevelFour.onUse(player, item, fromPosition, target, t
 	end
 	if item.itemid == 9110 then
 		if player:getStorageValue(Storage.Quest.U10_90.FerumbrasAscension.Elements.Done) < 4 then
-			local spectators = player:getSpectators(item:getPosition(), false, false, 9, 9, 6, 6)
+			local spectators = Game.getSpectators(item:getPosition(), false, false, 9, 9, 6, 6)
 			for i = 1, #spectators do
 				if spectators[i]:isPlayer() then
 					local spec = spectators[i]

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

@@ -5,7 +5,7 @@ function ferumbrasAscendantLeverSecond.onUse(player, item, fromPosition, target,
 	end
 	if item.itemid == 9110 then
 		if player:getStorageValue(Storage.Quest.U10_90.FerumbrasAscension.Elements.Done) < 2 then
-			local spectators = player:getSpectators(item:getPosition(), false, false, 9, 9, 6, 6)
+			local spectators = Game.getSpectators(item:getPosition(), false, false, 9, 9, 6, 6)
 			for i = 1, #spectators do
 				if spectators[i]:isPlayer() then
 					local spec = spectators[i]

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

@@ -5,7 +5,7 @@ function ferumbrasAscendantLeverThird.onUse(player, item, fromPosition, target,
 	end
 	if item.itemid == 9110 then
 		if player:getStorageValue(Storage.Quest.U10_90.FerumbrasAscension.Elements.Done) < 3 then
-			local spectators = player:getSpectators(item:getPosition(), false, false, 9, 9, 6, 6)
+			local spectators = Game.getSpectators(item:getPosition(), false, false, 9, 9, 6, 6)
 			for i = 1, #spectators do
 				if spectators[i]:isPlayer() then
 					local spec = spectators[i]