Merge branch 'opentibiabr:main' into Nyedson-patch-2

config.lua.dist

@@ -224,8 +224,6 @@ tibiadromeConcoctionTickType = "online" -- "online" | "experience"
 onlyPremiumAccount = false
 
 -- Customs
--- NOTE: weatherRain = true, activates weather raining effects
--- NOTE: thunderEffect = true, activates thunder effects
 -- NOTE: stashMoving = true, stow an container inside your stash
 -- NOTE: depotChest, the non-stackable items will be moved to the selected depot chest(I - XVIII).
 -- NOTE: autoBank = true, the dropped coins from monsters will be automatically deposited to your bank account.
@@ -239,8 +237,6 @@ onlyPremiumAccount = false
 -- NOTE: toggleReceiveReward = true, will enable players to choose one of reward exercise weapon by command !reward
 -- NOTE: randomMonsterSpawn = true, will enable monsters from the same spawn to be randomized between them, thus making a variable hunt
 -- NOTE: enablePlayerPutItemInAmmoSlot = true, will enable players to put any items on ammo slot, more used in custom shopping system
-weatherRain = false
-thunderEffect = false
 stashMoving = false
 depotChest = 4
 autoLoot = false

data-otservbr-global/scripts/world_changes/spawns_npc_by_time.lua

@@ -12,15 +12,13 @@ function spawnsNpcByTime.onPeriodChange(period)
 			local spawnNpc = Game.createNpc(npcSpawn.name, npcSpawn.position)
 			if spawnNpc then
 				spawnNpc:setMasterPos(npcSpawn.position)
-				npcSpawn.position:sendMagicEffect(CONST_ME_TELEPORT)
-				logger.info("[NPC Spawn] {} has spawned", npcSpawn.name)
+				spawnNpc:getPosition():sendMagicEffect(CONST_ME_TELEPORT)
 			end
 		elseif npcSpawn.despawnPeriod == period then
 			local despawnNpc = Npc(npcSpawn.name)
 			if despawnNpc then
 				despawnNpc:getPosition():sendMagicEffect(CONST_ME_TELEPORT)
 				despawnNpc:remove()
-				logger.info("[NPC Despawn] {} has despawned", npcSpawn.name)
 			end
 		end
 	end

data/XML/familiars.xml

@@ -1,32 +1,26 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <familiars>
-	<!-- Familiars sorcerrers -->
+	<!-- Sorcerer -->
 	<familiar vocation="1" lookType="994" name="Thundergiant" premium="yes" unlocked="no" enabled="yes" />
 	<familiar vocation="5" lookType="994" name="Thundergiant" premium="yes" unlocked="no" enabled="yes" />
-
 	<familiar vocation="1" lookType="1367" name="Bladespark" premium="yes" unlocked="no" enabled="yes" type="quest" />
 	<familiar vocation="5" lookType="1367" name="Bladespark" premium="yes" unlocked="no" enabled="yes" type="quest" />
-	
-	<!-- Familiars druids -->
+
+	<!-- Druid -->
 	<familiar vocation="2" lookType="993" name="Grovebeast" premium="no" unlocked="no" enabled="yes" />
 	<familiar vocation="6" lookType="993" name="Grovebeast" premium="no" unlocked="no" enabled="yes" />
-
 	<familiar vocation="2" lookType="1364" name="Mossmasher" premium="no" unlocked="no" enabled="yes" type="quest" />
 	<familiar vocation="6" lookType="1364" name="Mossmasher" premium="no" unlocked="no" enabled="yes" type="quest" />
-	
-	<!-- Familiars paladins -->
+
+	<!-- Paladin -->
 	<familiar vocation="3" lookType="992" name="Emberwing" premium="no" unlocked="no" enabled="yes" />
 	<familiar vocation="7" lookType="992" name="Emberwing" premium="yes" unlocked="no" enabled="yes" />
-
 	<familiar vocation="3" lookType="1366" name="Sandscourge" premium="no" unlocked="no" enabled="yes" type="quest" />
 	<familiar vocation="7" lookType="1366" name="Sandscourge" premium="yes" unlocked="no" enabled="yes" type="quest" />
-	
-	<!-- Familiars knights -->
+
+	<!-- Knight -->
 	<familiar vocation="4" lookType="991" name="Skullfrost" premium="yes" unlocked="no" enabled="yes" />
 	<familiar vocation="8" lookType="991" name="Skullfrost" premium="yes" unlocked="no" enabled="yes" />
-
 	<familiar vocation="4" lookType="1365" name="Snowbash" premium="yes" unlocked="no" enabled="yes" type="quest" />
 	<familiar vocation="8" lookType="1365" name="Snowbash" premium="yes" unlocked="no" enabled="yes" type="quest" />
-
-
 </familiars>

data/XML/mounts.xml

@@ -218,7 +218,9 @@
 	<mount id="216" clientid="1677" name="Darkfire Devourer" speed="10" premium="no" type="store" />
 	<mount id="217" clientid="1682" name="Spirit of Purity" speed="10" premium="no" type="store" />
 	<mount id="218" clientid="1632" name="Foxmouse" speed="10" premium="no" type="store" />
-	<!--<mount id="219" clientid="1685" name="Doom Skull" speed="10" premium="no" type="store" />
+	<mount id="219" clientid="1685" name="Doom Skull" speed="10" premium="no" type="store" />
 	<mount id="220" clientid="1686" name="Magma Skull" speed="10" premium="no" type="store" />
-	<mount id="221" clientid="1687" name="Corpsefire Skull" speed="10" premium="no" type="store"-->
+	<mount id="221" clientid="1687" name="Corpsefire Skull" speed="10" premium="no" type="store" />
+	<mount id="222" clientid="1721" name="Mystic Jaguar" speed="10" premium="yes" type="quest" />
+	<mount id="223" clientid="1724" name="Gorgon Hydra" speed="10" premium="no" type="store" />
 </mounts>

data/XML/outfits.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <outfits>
-	<!-- Female outfits -->
+	<!-- Female -->
 	<outfit type="0" looktype="136" name="Citizen" premium="no" unlocked="yes" enabled="yes" />
 	<outfit type="0" looktype="137" name="Hunter" premium="no" unlocked="yes" enabled="yes" />
 	<outfit type="0" looktype="138" name="Mage" premium="no" unlocked="yes" enabled="yes" />
@@ -89,7 +89,7 @@
 	<outfit type="0" looktype="1252" name="Orcsoberfest Garb" premium="yes" unlocked="no" enabled="yes" from="quest" />
 	<outfit type="0" looktype="1271" name="Poltergeist" premium="yes" unlocked="no" enabled="yes" from="quest" />
 	<outfit type="0" looktype="1280" name="Herder" premium="no" unlocked="no" enabled="yes" from="store" />
-	<outfit type="0" looktype="1283" name="Falconer" premium="yes" unlocked="no" enabled="yes" from="quest" />	
+	<outfit type="0" looktype="1283" name="Falconer" premium="yes" unlocked="no" enabled="yes" from="quest" />
 	<outfit type="0" looktype="1289" name="Dragon Slayer" premium="no" unlocked="no" enabled="yes" from="store" />
 	<outfit type="0" looktype="1293" name="Trailblazer" premium="no" unlocked="no" enabled="yes" from="store" />
 	<outfit type="0" looktype="1323" name="Revenant" premium="yes" unlocked="no" enabled="yes" from="quest" />
@@ -117,7 +117,7 @@
 	<outfit type="0" looktype="1676" name="Darklight Evoker" premium="no" unlocked="no" enabled="yes" from="store" />
 	<outfit type="0" looktype="1681" name="Flamefury Mage" premium="no" unlocked="no" enabled="yes" from="store" />
 
-	<!-- Male outfits -->
+	<!-- Male -->
 	<outfit type="1" looktype="128" name="Citizen" premium="no" unlocked="yes" enabled="yes" />
 	<outfit type="1" looktype="129" name="Hunter" premium="no" unlocked="yes" enabled="yes" />
 	<outfit type="1" looktype="130" name="Mage" premium="no" unlocked="yes" enabled="yes" />

data/events/scripts/monster.lua

@@ -1,19 +0,0 @@
-local function calculateBonus(bonus)
-	local bonusCount = math.floor(bonus / 100)
-	local remainder = bonus % 100
-	if remainder > 0 then
-		local probability = math.random(0, 100)
-		bonusCount = bonusCount + (probability < remainder and 1 or 0)
-	end
-
-	return bonusCount
-end
-
-local function checkItemType(itemId)
-	local itemType = ItemType(itemId):getType()
-	-- Based on enum ItemTypes_t
-	if (itemType > 0 and itemType < 4) or itemType == 7 or itemType == 8 or itemType == 11 or itemType == 13 or (itemType > 15 and itemType < 22) then
-		return true
-	end
-	return false
-end

data/global.lua

@@ -56,15 +56,6 @@ AUTH_TYPE = configManager.getString(configKeys.AUTH_TYPE)
 GLOBAL_CHARM_GUT = 120 -- 20% more chance to get creature products from looting
 GLOBAL_CHARM_SCAVENGE = 125 -- 25% more chance to get creature products from skinning
 
---WEATHER
-weatherConfig = {
-	groundEffect = CONST_ME_LOSEENERGY,
-	fallEffect = CONST_ANI_SMALLICE,
-	thunderEffect = configManager.getBoolean(configKeys.WEATHER_THUNDER),
-	minDMG = 1,
-	maxDMG = 5,
-}
-
 -- Event Schedule
 SCHEDULE_LOOT_RATE = 100
 SCHEDULE_EXP_RATE = 100