Merge pull request #4 from jprzimba/tibia1405

Tibia 14.05
jprzimba · Dec 18, 2024 · e7075b3 · e7075b3
2 parents 3b0d0bd + 2df9e66
commit e7075b3
Show file tree

Hide file tree

Showing 74 changed files with 1,493 additions and 372 deletions.
diff --git a/README.md b/README.md
@@ -22,7 +22,7 @@ use the [Game Client](https://github.com/jprzimba/gameclient/releases) or [mehah
 
 You can see the complete change log for Crystal Server at [this link](https://github.com/jprzimba/crystalserver/blob/main/markdowns/CHANGELOG.md).
 
-If you want edit the map, use the [Remere's Map Editor](https://www.mediafire.com/file/o2e06j8j2lsxmh8/RME.rar/file).
+If you want edit the map, use the [Remere's Map Editor](https://github.com/jprzimba/rme-crystalserver/releases).
 
 You are subject to our code of conduct, read
 at [this link](https://github.com/jprzimba/crystalserver/blob/main/markdowns/CODE_OF_CONDUCT.md).
@@ -35,7 +35,8 @@ Enjoy our [Discord](https://discord.gg/7AYJEHTghQ)
 ### Thanks
 - [Open Tibia](https://github.com/opentibia/server) and their [contributors](https://github.com/opentibia/server/graphs/contributors).
 - [The Forgotten Server](https://github.com/otland/forgottenserver) and their [contributors](https://github.com/otland/forgottenserver/graphs/contributors).
-- [Canary Server](https://github.com/opentibiabr/canary) and its [contributors](https://github.com/opentibiabr/canary/graphs/contributors).
+- [Crsystal Server](https://github.com/jprzimba/crystalserver) and their [contributors](https://github.com/jprzimba/crystalserver/graphs/contributors).
+- [Canary Server](https://github.com/opentibiabr/canary) and their [contributors](https://github.com/opentibiabr/canary/graphs/contributors).
 
 
 ### Issues

diff --git a/data-global/monster/1330/bosses/mitmah_vanguard.lua b/data-global/monster/1330/bosses/mitmah_vanguard.lua
@@ -81,7 +81,7 @@ monster.loot = {
 	{ id = 44621, chance = 440 }, -- health potion
 	{ id = 44624, chance = 440 }, -- halberd
 	{ name = "Gold Coin", chance = 9650, maxCount = 400 },
-	{ name = "Crystal Coin", chance = 700,  maxCount = 2 },
+	{ name = "Crystal Coin", chance = 700, maxCount = 2 },
 	{ name = "Great Spirit Potion", chance = 2450 },
 	{ name = "Ultimate Mana Potion", chance = 5450, maxCount = 15 },
 	{ name = "Ultimate Health Potion", chance = 5450, maxCount = 15 },
@@ -103,7 +103,6 @@ monster.defenses = {
 	armor = 45,
 	mitigation = 3.00,
 	{ name = "combat", interval = 2000, chance = 8, type = COMBAT_HEALING, minDamage = 2500, maxDamage = 5000, effect = CONST_ME_MAGIC_GREEN, target = false },
-
 }
 
 monster.elements = {
@@ -141,4 +140,3 @@ mType.onMove = function(monster, creature, fromPosition, toPosition) end
 mType.onSay = function(monster, creature, type, message) end
 
 mType:register(monster)
-
diff --git a/data-global/monster/1330/bulltaur_alchemist.lua b/data-global/monster/1330/bulltaur_alchemist.lua
@@ -83,11 +83,11 @@ monster.loot = {
 	{ name = "platinum coin", chance = 3533, maxCount = 7 },
 	{ id = 44736, chance = 4545 }, -- stealth ring
 	{ id = 44737, chance = 4545 }, -- stealth ring
-	{ id = 44738, chance = 4545 }, -- stealth ring	
+	{ id = 44738, chance = 4545 }, -- stealth ring
 	{ name = "might ring", chance = 4285 },
 	{ name = "mino shield", chance = 840 },
 	{ name = "dragon hammer", chance = 420 },
-	{ id = 3041, chance = 4545 }, -- stealth ring	
+	{ id = 3041, chance = 4545 }, -- stealth ring
 	{ name = "ultimate health potion", chance = 5285 },
 	{ name = "great mana potion", chance = 6285 },
 	{ name = "alloy legs", chance = 1285 },
@@ -100,7 +100,6 @@ monster.attacks = {
 	{ name = "melee", interval = 2000, chance = 100, minDamage = 90, maxDamage = -390 },
 	{ name = "combat", interval = 2000, chance = 20, type = COMBAT_ICEDAMAGE, minDamage = -150, maxDamage = -450, range = 3, radius = 4, effect = CONST_ME_ICEAREA, target = true },
 	{ name = "combat", interval = 2000, chance = 20, type = COMBAT_ENERGYDAMAGE, minDamage = -150, maxDamage = -450, range = 3, radius = 4, effect = 170, target = true },
-
 }
 
 monster.defenses = {
@@ -130,4 +129,3 @@ monster.immunities = {
 }
 
 mType:register(monster)
-
diff --git a/data-global/monster/1330/bulltaur_brute.lua b/data-global/monster/1330/bulltaur_brute.lua
@@ -84,11 +84,11 @@ monster.loot = {
 	{ name = "platinum coin", chance = 3533, maxCount = 7 },
 	{ id = 44736, chance = 4545 }, -- stealth ring
 	{ id = 44737, chance = 4545 }, -- stealth ring
-	{ id = 44738, chance = 4545 }, -- stealth ring	
+	{ id = 44738, chance = 4545 }, -- stealth ring
 	{ name = "might ring", chance = 14285 },
 	{ name = "mino shield", chance = 840 },
 	{ name = "dragon hammer", chance = 420 },
-	{ id = 3041, chance = 4545 }, -- stealth ring	
+	{ id = 3041, chance = 4545 }, -- stealth ring
 }
 
 monster.attacks = {

diff --git a/data-global/monster/1330/bulltaur_forgepriest.lua b/data-global/monster/1330/bulltaur_forgepriest.lua
@@ -83,11 +83,11 @@ monster.loot = {
 	{ name = "platinum coin", chance = 3533, maxCount = 7 },
 	{ id = 44736, chance = 4545 }, -- stealth ring
 	{ id = 44737, chance = 4545 }, -- stealth ring
-	{ id = 44738, chance = 4545 }, -- stealth ring	
+	{ id = 44738, chance = 4545 }, -- stealth ring
 	{ name = "might ring", chance = 14285 },
 	{ name = "mino shield", chance = 840 },
 	{ name = "dragon hammer", chance = 420 },
-	{ id = 3041, chance = 4545 }, -- stealth ring	
+	{ id = 3041, chance = 4545 }, -- stealth ring
 	{ name = "ultimate health potion", chance = 5285 },
 	{ name = "great mana potion", chance = 6285 },
 	{ name = "alloy legs", chance = 1285 },
@@ -108,7 +108,6 @@ monster.attacks = {
 	{ name = "speed", interval = 2000, chance = 15, speedChange = -650, range = 7, radius = 4, effect = 168, target = false, duration = 1500 },
 	{ name = "energy wave", interval = 2000, chance = 15, minDamage = -350, maxDamage = -500, length = 1, spread = 0, effect = CONST_ME_ENERGYAREA, target = true },
 	{ name = "combat", interval = 2000, chance = 20, type = COMBAT_ENERGYDAMAGE, minDamage = -150, maxDamage = -450, range = 3, radius = 4, effect = 170, target = true },
-
 }
 
 monster.defenses = {
@@ -138,4 +137,3 @@ monster.immunities = {
 }
 
 mType:register(monster)
-
diff --git a/data-global/monster/1330/mitmah scout.lua b/data-global/monster/1330/mitmah scout.lua
@@ -82,19 +82,18 @@ monster.loot = {
 	{ name = "platinum coin", chance = 5000, maxCount = 10 },
 	{ name = "Strong Health Potion", chance = 1200, maxCount = 3 },
 	{ name = "Green Crystal Splinter", chance = 1000, maxCount = 1 },
-    { name = "Brown Crystal Splinter", chance = 1000, maxCount = 1 },
-    { name = "Broken Mitmah Necklace", chance = 500, maxCount = 1 },
+	{ name = "Brown Crystal Splinter", chance = 1000, maxCount = 1 },
+	{ name = "Broken Mitmah Necklace", chance = 500, maxCount = 1 },
 	{ name = "Ruby Necklace", chance = 1000, maxCount = 1 },
 	{ name = "Yellow Gem", chance = 900, maxCount = 3 },
 	{ name = "Gold Ingot", chance = 1000, maxCount = 1 },
 	{ name = "Drill Bolt", chance = 1000, maxCount = 10 },
 	{ name = "Onyx Chip", chance = 1000, maxCount = 1 },
 	{ name = "Opal", chance = 1000, maxCount = 1 },
 	{ name = "Prismatic Quartz", chance = 1000, maxCount = 1 },
-	{ name = "Gold-Brocaded Cloth", chance = 1000, maxCount = 1 },	
-    { name = "Ornate Crossbow", chance = 400, maxCount = 1 },
+	{ name = "Gold-Brocaded Cloth", chance = 1000, maxCount = 1 },
+	{ name = "Ornate Crossbow", chance = 400, maxCount = 1 },
 	{ name = "Broken Mitmah Necklace", chance = 500, maxCount = 1 },
-
 }
 
 monster.attacks = {

diff --git a/data-global/monster/quests/rotten_bood/ayana the crimson curse.lua b/data-global/monster/quests/rotten_bood/ayana the crimson curse.lua
@@ -128,4 +128,4 @@ monster.immunities = {
 	{ type = "bleed", condition = false },
 }
 
-mType:register(monster)
+mType:register(monster)
diff --git a/data-global/monster/quests/rotten_bood/bloated_man-maggot.lua b/data-global/monster/quests/rotten_bood/bloated_man-maggot.lua
@@ -123,4 +123,3 @@ monster.immunities = {
 }
 
 mType:register(monster)
-
diff --git a/data-global/monster/quests/rotten_bood/bosses/bakragore.lua b/data-global/monster/quests/rotten_bood/bosses/bakragore.lua
@@ -31,7 +31,7 @@ monster.changeTarget = {
 
 monster.bosstiary = {
 	bossRaceId = 2367,
-	bossRace = RARITY_NEMESIS
+	bossRace = RARITY_NEMESIS,
 }
 
 monster.strategiesTarget = {
@@ -66,19 +66,18 @@ monster.light = {
 	color = 0,
 }
 
-monster.summon = {
-}
+monster.summon = {}
 
 monster.voices = {
 	interval = 5000,
 	chance = 10,
 }
 
 monster.loot = {
-	{ id = 3043, chance = 100000, maxCount = 30 }, 
+	{ id = 3043, chance = 100000, maxCount = 30 },
 	{ id = 7643, chance = 40000, maxCount = 20 },
-	{ id = 238, chance = 40000, maxCount = 20 }, 
-	{ id = 7642, chance = 40000, maxCount = 20 }, 
+	{ id = 238, chance = 40000, maxCount = 20 },
+	{ id = 7642, chance = 40000, maxCount = 20 },
 	{ name = "white gem", chance = 30000, maxCount = 1 },
 	{ name = "giant sapphire", chance = 3000, maxCount = 1 },
 	{ id = 44008, chance = 10000, maxCount = 2 },
@@ -131,23 +130,23 @@ monster.loot = {
 	{ id = 43884, chance = 420 },
 	{ id = 43885, chance = 430 },
 	{ id = 43887, chance = 440 },
-	{ id = 36478, chance = 450 }
+	{ id = 36478, chance = 450 },
 }
 
 monster.attacks = {
-	{ name ="melee", interval = 2000, chance = 100, minDamage = 0, maxDamage = -3000 },
-	{ name ="combat", interval = 3000, chance = 35, type = COMBAT_ICEDAMAGE, minDamage = -900, maxDamage = -1100, range = 7, radius = 7, shootEffect = CONST_ANI_ICE, effect = 243, target = true },
-	{ name ="combat", interval = 2000, chance = 13, type = COMBAT_DEATHDAMAGE, minDamage = -100, maxDamage = -1000, length = 8, spread = 3, effect = 252, target = false },
-	{ name ="combat", interval = 3000, chance = 30, type = COMBAT_FIREDAMAGE, minDamage = -1000, maxDamage = -2000, length = 8, spread = 3, effect = 249, target = false },
-	{ name ="combat", interval = 2000, chance = 30, type = COMBAT_ICEDAMAGE, minDamage = -950, maxDamage = -2400, range = 7, radius = 3, shootEffect = 37, effect = 240, target = true },
-	{ name ="combat", interval = 2000, chance = 10, type = COMBAT_DEATHDAMAGE, minDamage = -1000, maxDamage = -2500, length = 8, spread = 3, effect = 244, target = false },
+	{ name = "melee", interval = 2000, chance = 100, minDamage = 0, maxDamage = -3000 },
+	{ name = "combat", interval = 3000, chance = 35, type = COMBAT_ICEDAMAGE, minDamage = -900, maxDamage = -1100, range = 7, radius = 7, shootEffect = CONST_ANI_ICE, effect = 243, target = true },
+	{ name = "combat", interval = 2000, chance = 13, type = COMBAT_DEATHDAMAGE, minDamage = -100, maxDamage = -1000, length = 8, spread = 3, effect = 252, target = false },
+	{ name = "combat", interval = 3000, chance = 30, type = COMBAT_FIREDAMAGE, minDamage = -1000, maxDamage = -2000, length = 8, spread = 3, effect = 249, target = false },
+	{ name = "combat", interval = 2000, chance = 30, type = COMBAT_ICEDAMAGE, minDamage = -950, maxDamage = -2400, range = 7, radius = 3, shootEffect = 37, effect = 240, target = true },
+	{ name = "combat", interval = 2000, chance = 10, type = COMBAT_DEATHDAMAGE, minDamage = -1000, maxDamage = -2500, length = 8, spread = 3, effect = 244, target = false },
 }
 
 monster.defenses = {
 	defense = 135,
 	armor = 135,
-	{ name ="combat", interval = 3000, chance = 15, type = COMBAT_HEALING, minDamage = 2500, maxDamage = 3500, effect = 236, target = false },
-	{ name ="speed", interval = 4000, chance = 80, speedChange = 700, effect = CONST_ME_MAGIC_RED, target = false, duration = 6000 }
+	{ name = "combat", interval = 3000, chance = 15, type = COMBAT_HEALING, minDamage = 2500, maxDamage = 3500, effect = 236, target = false },
+	{ name = "speed", interval = 4000, chance = 80, speedChange = 700, effect = CONST_ME_MAGIC_RED, target = false, duration = 6000 },
 }
 
 monster.elements = {

diff --git a/data-global/monster/quests/rotten_bood/bosses/chagorz.lua b/data-global/monster/quests/rotten_bood/bosses/chagorz.lua
@@ -31,7 +31,7 @@ monster.changeTarget = {
 
 monster.bosstiary = {
 	bossRaceId = 2366,
-	bossRace = RARITY_NEMESIS
+	bossRace = RARITY_NEMESIS,
 }
 
 monster.strategiesTarget = {
@@ -67,51 +67,50 @@ monster.light = {
 	color = 0,
 }
 
-monster.summon = {
-}
+monster.summon = {}
 
 monster.voices = {
 	interval = 5000,
 	chance = 10,
 }
 
 monster.loot = {
-	{ id = 43895, chance = 4996}, -- bag you covet,
-	{ name = "berserk potion", chance = 2758, minCount = 0, maxCount = 40},
-	{ id = 3041, chance = 4702, minCount = 0, maxCount = 1}, -- blue gem,
-	{ name = "bullseye potion", chance = 3972, minCount = 0, maxCount = 31},
-	{ name = "crystal coin", chance = 4018, minCount = 0, maxCount = 100},
-	{ name = "darklight figurine", chance = 3164},
-	{ name = "giant topaz", chance = 3744, minCount = 0, maxCount = 1},
-	{ name = "giant sapphire", chance = 4917, minCount = 0, maxCount = 1},
-	{ name = "gold ingot", chance = 2250, minCount = 0, maxCount = 1},
-	{ name = "green gem", chance = 4373, minCount = 0, maxCount = 1},
-	{ name = "mastermind potion", chance = 3945, minCount = 0, maxCount = 27},
-	{ name = "raw watermelon tourmaline", chance = 1876, minCount = 0, maxCount = 1},
-	{ id = 3039, chance = 2121, minCount = 0, maxCount = 1}, -- red gem,
-	{ name = "supreme health potion", chance = 2303, minCount = 0, maxCount = 164},
-	{ name = "the essence of chagorz", chance = 4820},
-	{ name = "unicorn figurine", chance = 3030},
-	{ name = "ultimate mana potion", chance = 2519, minCount = 0, maxCount = 98},
-	{ name = "ultimate spirit potion", chance = 2047, minCount = 0, maxCount = 127},
-	{ name = "violet gem", chance = 4963, minCount = 0, maxCount = 1},
-	{ name = "white gem", chance = 4927, minCount = 0, maxCount = 3},
-	{ name = "yellow gem", chance = 1940, minCount = 0, maxCount = 1}
+	{ id = 43895, chance = 4996 }, -- bag you covet,
+	{ name = "berserk potion", chance = 2758, minCount = 0, maxCount = 40 },
+	{ id = 3041, chance = 4702, minCount = 0, maxCount = 1 }, -- blue gem,
+	{ name = "bullseye potion", chance = 3972, minCount = 0, maxCount = 31 },
+	{ name = "crystal coin", chance = 4018, minCount = 0, maxCount = 100 },
+	{ name = "darklight figurine", chance = 3164 },
+	{ name = "giant topaz", chance = 3744, minCount = 0, maxCount = 1 },
+	{ name = "giant sapphire", chance = 4917, minCount = 0, maxCount = 1 },
+	{ name = "gold ingot", chance = 2250, minCount = 0, maxCount = 1 },
+	{ name = "green gem", chance = 4373, minCount = 0, maxCount = 1 },
+	{ name = "mastermind potion", chance = 3945, minCount = 0, maxCount = 27 },
+	{ name = "raw watermelon tourmaline", chance = 1876, minCount = 0, maxCount = 1 },
+	{ id = 3039, chance = 2121, minCount = 0, maxCount = 1 }, -- red gem,
+	{ name = "supreme health potion", chance = 2303, minCount = 0, maxCount = 164 },
+	{ name = "the essence of chagorz", chance = 4820 },
+	{ name = "unicorn figurine", chance = 3030 },
+	{ name = "ultimate mana potion", chance = 2519, minCount = 0, maxCount = 98 },
+	{ name = "ultimate spirit potion", chance = 2047, minCount = 0, maxCount = 127 },
+	{ name = "violet gem", chance = 4963, minCount = 0, maxCount = 1 },
+	{ name = "white gem", chance = 4927, minCount = 0, maxCount = 3 },
+	{ name = "yellow gem", chance = 1940, minCount = 0, maxCount = 1 },
 }
 
 monster.attacks = {
-	{ name ="melee", interval = 2000, chance = 100, minDamage = -1300, maxDamage = -2250 },
-	{ name ="combat", interval = 2000, chance = 20, type = COMBAT_EARTHDAMAGE, minDamage = -500, maxDamage = -900, radius = 4, effect = CONST_ME_GREEN_RINGS, target = false },
-	{ name ="combat", interval = 2000, chance = 20, type = COMBAT_DEATHDAMAGE, minDamage = -500, maxDamage = -900, range = 4, radius = 4, effect = 241, target = true },
-	{ name ="combat", interval = 2000, chance = 20, type = COMBAT_EARTHDAMAGE, minDamage = -1000, maxDamage = -1200, length = 10, spread = 3, effect = CONST_ME_POFF, target = false },
-	{ name ="combat", interval = 2000, chance = 20, type = COMBAT_LIFEDRAIN, minDamage = -1500, maxDamage = -1900, length = 10, spread = 3, effect = 225, target = false },
-	{ name ="speed", interval = 2000, chance = 20, speedChange = -600, radius = 7, effect = CONST_ME_MAGIC_GREEN, target = false, duration = 20000 },
+	{ name = "melee", interval = 2000, chance = 100, minDamage = -1300, maxDamage = -2250 },
+	{ name = "combat", interval = 2000, chance = 20, type = COMBAT_EARTHDAMAGE, minDamage = -500, maxDamage = -900, radius = 4, effect = CONST_ME_GREEN_RINGS, target = false },
+	{ name = "combat", interval = 2000, chance = 20, type = COMBAT_DEATHDAMAGE, minDamage = -500, maxDamage = -900, range = 4, radius = 4, effect = 241, target = true },
+	{ name = "combat", interval = 2000, chance = 20, type = COMBAT_EARTHDAMAGE, minDamage = -1000, maxDamage = -1200, length = 10, spread = 3, effect = CONST_ME_POFF, target = false },
+	{ name = "combat", interval = 2000, chance = 20, type = COMBAT_LIFEDRAIN, minDamage = -1500, maxDamage = -1900, length = 10, spread = 3, effect = 225, target = false },
+	{ name = "speed", interval = 2000, chance = 20, speedChange = -600, radius = 7, effect = CONST_ME_MAGIC_GREEN, target = false, duration = 20000 },
 }
 
 monster.defenses = {
 	defense = 105,
 	armor = 105,
-	{ name ="combat", interval = 3000, chance = 10, type = COMBAT_HEALING, minDamage = 700, maxDamage = 1500, effect = 236, target = false },
+	{ name = "combat", interval = 3000, chance = 10, type = COMBAT_HEALING, minDamage = 700, maxDamage = 1500, effect = 236, target = false },
 }
 
 monster.elements = {
@@ -124,7 +123,7 @@ monster.elements = {
 	{ type = "COMBAT_EARTHDAMAGE", percent = 10 },
 	{ type = "COMBAT_LIFEDRAIN", percent = 0 },
 	{ type = "COMBAT_MANADRAIN", percent = 0 },
-	{ type = "COMBAT_DROWNDAMAGE", percent = 0 }
+	{ type = "COMBAT_DROWNDAMAGE", percent = 0 },
 }
 
 monster.immunities = {

diff --git a/data-global/monster/quests/rotten_bood/bosses/echo_of_chagorz.lua b/data-global/monster/quests/rotten_bood/bosses/echo_of_chagorz.lua
@@ -98,4 +98,4 @@ monster.immunities = {
 	{ type = "bleed", condition = false },
 }
 
-mType:register(monster)
+mType:register(monster)
diff --git a/data-global/monster/quests/rotten_bood/bosses/echo_of_ichgahal.lua b/data-global/monster/quests/rotten_bood/bosses/echo_of_ichgahal.lua
@@ -98,4 +98,4 @@ monster.immunities = {
 	{ type = "bleed", condition = false },
 }
 
-mType:register(monster)
+mType:register(monster)
diff --git a/data-global/monster/quests/rotten_bood/bosses/echo_of_murcion.lua b/data-global/monster/quests/rotten_bood/bosses/echo_of_murcion.lua
@@ -98,4 +98,4 @@ monster.immunities = {
 	{ type = "bleed", condition = false },
 }
 
-mType:register(monster)
+mType:register(monster)
diff --git a/data-global/monster/quests/rotten_bood/bosses/echo_of_vemiath.lua b/data-global/monster/quests/rotten_bood/bosses/echo_of_vemiath.lua
@@ -98,4 +98,4 @@ monster.immunities = {
 	{ type = "bleed", condition = false },
 }
 
-mType:register(monster)
+mType:register(monster)
diff --git a/data-global/monster/quests/rotten_bood/bosses/elder_bloodjaw.lua b/data-global/monster/quests/rotten_bood/bosses/elder_bloodjaw.lua
@@ -59,7 +59,7 @@ monster.light = {
 monster.voices = {
 	interval = 5000,
 	chance = 10,
-	{ text = "SHWAARR!", yell = true }
+	{ text = "SHWAARR!", yell = true },
 }
 
 monster.loot = {}
@@ -98,4 +98,4 @@ monster.immunities = {
 	{ type = "bleed", condition = false },
 }
 
-mType:register(monster)
+mType:register(monster)
Original file line number	Diff line number	Diff line change
Expand Up		@@ -123,4 +123,3 @@ monster.immunities = {
		}

		mType:register(monster)