[Protocol 12.85] Support for client version 12.85 datapack + 'loadLua…

…MapAction' fix (#419) Protocol 12.85 datapack Syncronize datapack with Canary 12.85 commit: opentibiabr/canary@e9c85a5 'loadLuaMapAction' fix Small fix on the "loadLuaMapAction" function that was breaking the map loading by LUA. The changes on this commit is following the same changes on the pull request :opentibiabr/canary#203
opentibiabr · Feb 10, 2022 · a29bc41 · a29bc41
1 parent 2cc1a6d
commit a29bc41
Show file tree

Hide file tree

Showing 234 changed files with 20,479 additions and 17,871 deletions.
diff --git a/config.lua.dist b/config.lua.dist
@@ -43,8 +43,8 @@ maxItem = 2000
 maxContainer = 100
 
 -- Version
-clientVersion = 1272
-clientVersionStr = "12.72"
+clientVersion = 1285
+clientVersionStr = "12.85"
 
 -- Depot Limit
 freeDepotLimit = 2000

diff --git a/data/XML/mounts.xml b/data/XML/mounts.xml
@@ -190,4 +190,8 @@
 	<mount id="188" clientid="1446" name="Rustwurm" speed="20" premium="no" type="store" />
 	<mount id="189" clientid="1447" name="Bogwurm" speed="20" premium="no" type="store" />
 	<mount id="190" clientid="1448" name="Gloomwurm" speed="20" premium="no" type="store" />
+	<mount id="191" clientid="1453" name="Emerald Raven" speed="20" premium="no" type="store" />
+	<mount id="192" clientid="1454" name="Mystic Raven" speed="20" premium="no" type="store" />
+	<mount id="193" clientid="1455" name="Radiant Raven" speed="20" premium="no" type="store" />
+	<mount id="194" clientid="1459" name="Gloothomotive" speed="20" premium="yes" type="store" />
 </mounts>
diff --git a/data/XML/outfits.xml b/data/XML/outfits.xml
@@ -103,6 +103,9 @@
 	<outfit type="0" looktype="1437" name="Royal Bounacean Advisor" premium="yes" unlocked="no" enabled="yes" from="quest" />
 	<outfit type="0" looktype="1445" name="Dragon Knight" premium="no" unlocked="no" enabled="yes" from="store" />
 	<outfit type="0" looktype="1450" name="Arbalester" premium="no" unlocked="no" enabled="yes" from="store" />
+	<outfit type="0" looktype="1456" name="Royal Costume" premium="no" unlocked="no" enabled="yes" from="store" />
+	<outfit type="0" looktype="1461" name="Formal Dress" premium="yes" unlocked="no" enabled="yes" from="store" />
+	<outfit type="0" looktype="1490" name="Ghost Blade" premium="yes" unlocked="no" enabled="yes" from="store" />
 
 	<!-- Male outfits -->
 	<outfit type="1" looktype="128" name="Citizen" premium="no" unlocked="yes" enabled="yes" />
@@ -207,4 +210,7 @@
 	<outfit type="1" looktype="1436" name="Royal Bounacean Advisor" premium="yes" unlocked="no" enabled="yes" from="quest" />
 	<outfit type="1" looktype="1444" name="Dragon Knight" premium="no" unlocked="no" enabled="yes" from="store" />
 	<outfit type="1" looktype="1449" name="Arbalester" premium="no" unlocked="no" enabled="yes" from="store" />
+	<outfit type="1" looktype="1457" name="Royal Costume" premium="no" unlocked="no" enabled="yes" from="store" />
+	<outfit type="1" looktype="1460" name="Formal Dress" premium="yes" unlocked="no" enabled="yes" from="store" />
+	<outfit type="1" looktype="1489" name="Ghost Blade" premium="yes" unlocked="no" enabled="yes" from="store" />
 </outfits>
diff --git a/data/items/items.otb b/data/items/items.otb
diff --git a/data/items/items.xml b/data/items/items.xml
diff --git a/data/monster/aquatics/crustacea_gigantica.lua b/data/monster/aquatics/crustacea_gigantica.lua
@@ -84,7 +84,7 @@ monster.loot = {
 	{name = "strong mana potion", chance = 8885},
 	{name = "strong health potion", chance = 3880},
 	{name = "giant crab pincer", chance = 5000, maxCount = 2},
-	{name = "ring of healing", chance = 3000},
+	{id = 3098, chance = 3000}, -- Ring of healing
 	{name = "great mana potion", chance = 1220},
 }
 

diff --git a/data/monster/aquatics/deathling_scout.lua b/data/monster/aquatics/deathling_scout.lua
@@ -89,7 +89,7 @@ monster.loot = {
 	{name = "Eye of a Deepling", chance = 6070},
 	{name = "Warrior's Shield", chance = 3630},
 	{name = "Warrior's Axe", chance = 3470},
-	{name = "Life Ring", chance = 3000},
+	{id = 3052, chance = 3000}, -- Life ring
 	{name = "Fish Fin", chance = 920},
 	{name = "Necklace of the Deep", chance = 440}
 }

diff --git a/data/monster/aquatics/deathling_spellsinger.lua b/data/monster/aquatics/deathling_spellsinger.lua
@@ -91,7 +91,7 @@ monster.loot = {
 	{name = "Fish Fin", chance = 2990},
 	{name = "Warrior's Axe", chance = 2950},
 	{name = "Small Enchanted Sapphire", chance = 2220, maxCount = 4},
-	{name = "Life Ring", chance = 2010},
+	{id = 3052, chance = 2010}, -- Life ring
 	{name = "Necklace of the Deep", chance = 200}
 }
 

diff --git a/data/monster/aquatics/deepling_elite.lua b/data/monster/aquatics/deepling_elite.lua
@@ -87,7 +87,7 @@ monster.loot = {
 	{name = "deeptags", chance = 20600},
 	{name = "deepling ridge", chance = 19500},
 	{name = "small emerald", chance = 6890, maxCount = 2},
-	{name = "life ring", chance = 5360},
+	{id = 3052, chance = 5360}, -- Life ring
 	{name = "heavy trident", chance = 3680},
 	{name = "fish fin", chance = 2300},
 	{name = "warrior's shield", chance = 1534},

diff --git a/data/monster/aquatics/deepling_master_librarian.lua b/data/monster/aquatics/deepling_master_librarian.lua
@@ -85,7 +85,7 @@ monster.loot = {
 	{id = 3578, chance = 9090, maxCount = 2},
 	{name = "small sapphire", chance = 8440, maxCount = 3},
 	{name = "deepling staff", chance = 3130},
-	{name = "life ring", chance = 3200},
+	{id = 3052, chance = 3200}, -- Life ring
 	{name = "fish fin", chance = 1800},
 	{name = "necklace of the deep", chance = 1250},
 	{name = "ornate crossbow", chance = 35}

diff --git a/data/monster/aquatics/deepling_scout.lua b/data/monster/aquatics/deepling_scout.lua
@@ -82,7 +82,7 @@ monster.voices = {
 monster.loot = {
 	{name = "gold coin", chance = 75000, maxCount = 50},
 	{name = "hunting spear", chance = 15185, maxCount = 3},
-	{name = "life ring", chance = 2127},
+	{id = 3052, chance = 2127}, -- Life ring
 	{name = "rusted armor", chance = 925},
 	{name = "heavy trident", chance = 505},
 	{name = "eye of a deepling", chance = 310},

diff --git a/data/monster/aquatics/deepling_spellsinger.lua b/data/monster/aquatics/deepling_spellsinger.lua
@@ -86,7 +86,7 @@ monster.loot = {
 	{id = 3578, chance = 3448},--fish
 	{name = "small sapphire", chance = 2934},
 	{name = "eye of a deepling", chance = 2540},
-	{name = "life ring", chance = 2459},
+	{id = 3052, chance = 2459}, -- Life ring
 	{name = "deepling staff", chance = 2020},
 	{name = "necklace of the deep", chance = 790},
 	{name = "fish fin", chance = 520},

diff --git a/data/monster/aquatics/deepling_warrior.lua b/data/monster/aquatics/deepling_warrior.lua
@@ -87,7 +87,7 @@ monster.loot = {
 	{name = "great health potion", chance = 10030},
 	{name = "vortex bolt", chance = 3431, maxCount = 5},
 	{name = "small emerald", chance = 3104},
-	{name = "life ring", chance = 3001},
+	{id = 3052, chance = 3001}, -- Life ring
 	{name = "heavy trident", chance = 999},
 	{name = "fish fin", chance = 870},
 	{name = "warrior's shield", chance = 610},

diff --git a/data/monster/aquatics/quara_hydromancer.lua b/data/monster/aquatics/quara_hydromancer.lua
@@ -88,7 +88,7 @@ monster.loot = {
 	{name = "black pearl", chance = 3150},
 	{name = "great mana potion", chance = 2880},
 	{name = "fish fin", chance = 1410},
-	{name = "ring of healing", chance = 1218},
+	{id = 3098, chance = 1218}, -- Ring of healing
 	{name = "wand of cosmic energy", chance = 980},
 	{name = "knight armor", chance = 230}
 }

diff --git a/data/monster/aquatics/quara_hydromancer_scout.lua b/data/monster/aquatics/quara_hydromancer_scout.lua
@@ -89,7 +89,7 @@ monster.loot = {
 	{name = "black pearl", chance = 2650},
 	{name = "fish fin", chance = 2090},
 	{name = "obsidian lance", chance = 1530},
-	{name = "ring of healing", chance = 940},
+	{id = 3098, chance = 940}, -- Ring of healing
 	{name = "wand of cosmic energy", chance = 910},
 	{name = "knight armor", chance = 520}
 }

diff --git a/data/monster/aquatics/quara_mantassin.lua b/data/monster/aquatics/quara_mantassin.lua
@@ -82,7 +82,7 @@ monster.loot = {
 	{name = "halberd", chance = 4970},
 	{name = "small sapphire", chance = 1130},
 	{name = "cape", chance = 1090},
-	{name = "stealth ring", chance = 1050},
+	{id = 3049, chance = 1050}, -- Stealth ring
 	{name = "two handed sword", chance = 990},
 	{name = "fish fin", chance = 610},
 	{name = "strange helmet", chance = 100},

diff --git a/data/monster/aquatics/quara_mantassin_scout.lua b/data/monster/aquatics/quara_mantassin_scout.lua
@@ -81,7 +81,7 @@ monster.loot = {
 	{id = 3114, chance = 990},--skull
 	{name = "small sapphire", chance = 990},
 	{name = "two handed sword", chance = 810},
-	{name = "stealth ring", chance = 710},
+	{id = 3049, chance = 710}, -- Stealth ring
 	{name = "fish fin", chance = 360}
 }
 

diff --git a/data/monster/aquatics/renegade_quara_constrictor.lua b/data/monster/aquatics/renegade_quara_constrictor.lua
@@ -79,7 +79,7 @@ monster.loot = {
 	{name = "platinum coin", chance = 79280, maxCount = 3},
 	{name = "quara tentacle", chance = 15240},
 	{name = "mind stone", chance = 6880},
-	{name = "ring of healing", chance = 5580},
+	{id = 3098, chance = 5580}, -- Ring of healing
 	{name = "great mana potion", chance = 5390, maxCount = 5},
 	{name = "shrimp", chance = 5300, maxCount = 4},
 	{name = "small amethyst", chance = 5200, maxCount = 2},

diff --git a/data/monster/aquatics/renegade_quara_hydromancer.lua b/data/monster/aquatics/renegade_quara_hydromancer.lua
@@ -88,7 +88,7 @@ monster.loot = {
 	{name = "yellow piece of cloth", chance = 3230},
 	{name = "green crystal shard", chance = 3000},
 	{name = "green piece of cloth", chance = 2880},
-	{name = "life ring", chance = 2190},
+	{id = 3052, chance = 2190}, -- Life ring
 	{name = "fish fin", chance = 1380},
 	{id = 281, chance = 1150}, -- giant shimmering pearl
 	{name = "wand of cosmic energy", chance = 1150},

diff --git a/data/monster/aquatics/renegade_quara_mantassin.lua b/data/monster/aquatics/renegade_quara_mantassin.lua
@@ -80,14 +80,14 @@ monster.loot = {
 	{name = "mind stone", chance = 10370},
 	{name = "shrimp", chance = 3950, maxCount = 3},
 	{name = "small sapphire", chance = 3540, maxCount = 3},
-	{name = "stealth ring", chance = 3290},
+	{id = 3049, chance = 3290}, -- Stealth ring
 	{name = "ice rapier", chance = 2060},
 	{name = "blue crystal shard", chance = 1890},
 	{name = "strange helmet", chance = 1320},
 	{name = "two handed sword", chance = 820},
 	{name = "fish fin", chance = 740},
 	{name = "blue robe", chance = 660},
-	{name = "energy ring", chance = 580}
+	{id = 3051, chance = 580} -- Energy ring
 }
 
 monster.attacks = {

diff --git a/data/monster/bosses/apocalypse.lua b/data/monster/bosses/apocalypse.lua
@@ -67,7 +67,7 @@ monster.voices = {
 }
 
 monster.loot = {
-	{name = "ancient amulet", chance = 13500},
+	{id = 3025, chance = 13500}, -- Ancient amulet
 	{id = 3116, chance = 19000}, -- big bone
 	{name = "black pearl", chance = 15000, maxCount = 35},
 	{name = "boots of haste", chance = 14000},
@@ -77,7 +77,7 @@ monster.loot = {
 	{name = "demon shield", chance = 15500},
 	{name = "devil helmet", chance = 11000},
 	{name = "dragon hammer", chance = 34500},
-	{name = "energy ring", chance = 13500},
+	{id = 3051, chance = 13500}, -- Energy ring
 	{name = "fire axe", chance = 17000},
 	{name = "giant sword", chance = 12500},
 	{name = "platinum coin", chance = 69900, maxCount = 100},

diff --git a/data/monster/bosses/bazir.lua b/data/monster/bosses/bazir.lua
@@ -74,7 +74,7 @@ monster.voices = {
 }
 
 monster.loot = {
-	{id = 3025, chance = 3500},
+	{id = 3025, chance = 3500}, -- Ancient amulet
 	{id = 3116, chance = 9000},
 	{id = 3027, chance = 15000, maxCount = 15},
 	{id = 3041, chance = 1500},
@@ -87,7 +87,7 @@ monster.loot = {
 	{id = 3356, chance = 11000},
 	{id = 3275, chance = 20000},
 	{id = 3322, chance = 4500},
-	{id = 3051, chance = 13500},
+	{id = 3051, chance = 13500}, -- Energy ring
 	{id = 3320, chance = 17000},
 	{id = 3281, chance = 12500},
 	{id = 3031, chance = 99900, maxCount = 100},
@@ -112,7 +112,7 @@ monster.loot = {
 	{id = 3055, chance = 4500},
 	{id = 3084, chance = 4500},
 	{id = 2848, chance = 2600},
-	{id = 3098, chance = 13000},
+	{id = 3098, chance = 13000}, -- Ring of healing
 	{id = 3006, chance = 3500},
 	{id = 3054, chance = 13000},
 	{id = 3290, chance = 15500},
@@ -121,7 +121,7 @@ monster.loot = {
 	{id = 3028, chance = 9500, maxCount = 5},
 	{id = 3032, chance = 15500, maxCount = 10},
 	{id = 3029, chance = 13500, maxCount = 10},
-	{id = 3049, chance = 9500},
+	{id = 3049, chance = 9500}, -- Stealth ring
 	{id = 3081, chance = 4000},
 	{id = 3058, chance = 2500},
 	{id = 3034, chance = 14000, maxCount = 7},

diff --git a/data/monster/bosses/bibby_bloodbath.lua b/data/monster/bosses/bibby_bloodbath.lua
@@ -76,7 +76,7 @@ monster.loot = {
 	{id = 3578, chance = 10300, maxCount = 1},-- fish
 	{name = "meat", chance = 10300},
 	{name = "plate legs", chance = 8100},
-	{name = "stealth ring", chance = 6960},
+	{id = 3049, chance = 6960}, -- Stealth ring
 	{name = "magma amulet", chance = 5700},
 	{name = "giant sword", chance = 3160},
 	{name = "crusader helmet", chance = 1900},

diff --git a/data/monster/bosses/diblis_the_fair.lua b/data/monster/bosses/diblis_the_fair.lua
@@ -80,7 +80,7 @@ monster.loot = {
 	{name = "vampire shield", chance = 22000},
 	{name = "strong health potion", chance = 18000},
 	{name = "platinum coin", chance = 12000, maxCount = 5},
-	{name = "ring of healing", chance = 12000},
+	{id = 3098, chance = 12000}, -- Ring of healing
 	{id = 3114, chance = 12000},
 	{name = "spellbook of lost souls", chance = 2000}
 }

diff --git a/data/monster/bosses/freegoiz.lua b/data/monster/bosses/freegoiz.lua
@@ -67,7 +67,7 @@ monster.voices = {
 }
 
 monster.loot = {
-	{id = 3025, chance = 3500},
+	{id = 3025, chance = 3500}, -- Ancient amulet
 	{id = 3116, chance = 9000},
 	{id = 3027, chance = 15000, maxCount = 15},
 	{id = 3041, chance = 1500},
@@ -79,7 +79,7 @@ monster.loot = {
 	{id = 3356, chance = 11000},
 	{id = 3275, chance = 20000},
 	{id = 3322, chance = 4500},
-	{id = 3051, chance = 13500},
+	{id = 3051, chance = 13500}, -- Energy ring
 	{id = 3320, chance = 17000},
 	{id = 3281, chance = 12500},
 	{id = 3031, chance = 99900, maxCount = 100},
@@ -103,7 +103,7 @@ monster.loot = {
 	{id = 3055, chance = 4500},
 	{id = 3084, chance = 4500},
 	{id = 2848, chance = 2600},
-	{id = 3098, chance = 13000},
+	{id = 3098, chance = 13000}, -- Ring of healing
 	{id = 3006, chance = 3500},
 	{id = 3054, chance = 13000},
 	{id = 3290, chance = 15500},
@@ -113,7 +113,7 @@ monster.loot = {
 	{id = 3032, chance = 15500, maxCount = 10},
 	{id = 3029, chance = 13500, maxCount = 10},
 	{id = 3066, chance = 3500},
-	{id = 3049, chance = 9500},
+	{id = 3049, chance = 9500}, -- Stealth ring
 	{id = 3081, chance = 4000},
 	{id = 3058, chance = 2500},
 	{id = 3034, chance = 14000, maxCount = 7},

diff --git a/data/monster/bosses/gaffir.lua b/data/monster/bosses/gaffir.lua
@@ -86,7 +86,7 @@ monster.loot = {
 	{id = 281, chance = 14520}, -- giant shimmering pearl
 	{name = "gold ingot", chance = 14500},
 	{name = "spellbook of warding", chance = 6500},
-	{name = "ring of healing", chance = 5400},
+	{id = 3098, chance = 5400}, -- Ring of healing
 	{name = "terra hood", chance = 1600},
 	{name = "amulet of loss", chance = 3400},
 	{name = "wand of everblazing", chance = 2900},

diff --git a/data/monster/bosses/gravelord_oshuran.lua b/data/monster/bosses/gravelord_oshuran.lua
@@ -75,7 +75,7 @@ monster.loot = {
 	{id = 237, chance = 17500},
 	{id = 3027, chance = 15960},
 	{id = 3026, chance = 15000},
-	{id = 3098, chance = 15040},
+	{id = 3098, chance = 15040}, -- Ring of healing
 	{id = 3567, chance = 500},
 	{id = 820, chance = 900},
 	{id = 8076, chance = 300},

diff --git a/data/monster/bosses/groam.lua b/data/monster/bosses/groam.lua
@@ -68,7 +68,7 @@ monster.voices = {
 monster.loot = {
 	{name = "gold coin", chance = 100000, maxCount = 50},
 	{name = "hunting spear", chance = 31250, maxCount = 4},
-	{name = "life ring", chance = 25000},
+	{id = 3052, chance = 25000}, -- Life ring
 	{name = "rusted armor", chance = 6250},
 	{name = "fish fin", chance = 1500}
 }

diff --git a/data/monster/bosses/hairman_the_huge.lua b/data/monster/bosses/hairman_the_huge.lua
@@ -64,7 +64,7 @@ monster.voices = {
 
 monster.loot = {
 	{name = "gold coin", chance = 100000, maxCount = 60},
-	{name = "club ring", chance = 25000},
+	{id = 3093, chance = 25000}, -- Club ring
 	{name = "banana", chance = 25000, maxCount = 1}
 }
 

diff --git a/data/monster/bosses/infernatil.lua b/data/monster/bosses/infernatil.lua
@@ -76,7 +76,7 @@ monster.voices = {
 }
 
 monster.loot = {
-	{id = 3025, chance = 3500},
+	{id = 3025, chance = 3500}, -- Ancient amulet
 	{id = 3116, chance = 9000},
 	{id = 3027, chance = 15000, maxCount = 15},
 	{id = 3041, chance = 1500},
@@ -88,7 +88,7 @@ monster.loot = {
 	{id = 3356, chance = 11000},
 	{id = 3275, chance = 20000},
 	{id = 3322, chance = 4500},
-	{id = 3051, chance = 13500},
+	{id = 3051, chance = 13500}, -- Energy ring
 	{id = 3320, chance = 17000},
 	{id = 3281, chance = 12500},
 	{id = 3031, chance = 99900, maxCount = 100},
@@ -112,7 +112,7 @@ monster.loot = {
 	{id = 3055, chance = 4500},
 	{id = 3084, chance = 4500},
 	{id = 2848, chance = 2600},
-	{id = 3098, chance = 13000},
+	{id = 3098, chance = 13000}, -- Ring of healing
 	{id = 3006, chance = 3500},
 	{id = 3054, chance = 13000},
 	{id = 3290, chance = 15500},
@@ -122,7 +122,7 @@ monster.loot = {
 	{id = 3032, chance = 15500, maxCount = 10},
 	{id = 3029, chance = 13500, maxCount = 10},
 	{id = 3066, chance = 3500},
-	{id = 3049, chance = 9500},
+	{id = 3049, chance = 9500}, -- Stealth ring
 	{id = 3081, chance = 4000},
 	{id = 3058, chance = 2500},
 	{id = 3034, chance = 14000, maxCount = 7},

diff --git a/data/monster/bosses/mad_mage.lua b/data/monster/bosses/mad_mage.lua
@@ -78,7 +78,7 @@ monster.loot = {
 	{id = 237, chance = 21000, maxCount = 5},
 	{id = 236, chance = 17000, maxCount = 5},
 	{id = 3062, chance = 9000},
-	{id = 3049, chance = 6000},
+	{id = 3049, chance = 6000}, -- Stealth ring
 	{id = 7368, chance = 4000, maxCount = 4},
 	{id = 3728, chance = 4000, maxCount = 3},
 	{id = 5911, chance = 5000},

diff --git a/data/monster/bosses/raging_mage.lua b/data/monster/bosses/raging_mage.lua
@@ -81,7 +81,7 @@ monster.loot = {
 	{id = 3062, chance = 9760},
 	{id = 7443, chance = 6710, maxCount = 2},
 	{id = 8043, chance = 4880},
-	{id = 3049, chance = 4880},
+	{id = 3049, chance = 4880}, -- Stealth ring
 	{id = 11454, chance = 4270},
 	{id = 3728, chance = 3600, maxCount = 4},
 	{id = 7368, chance = 1830, maxCount = 7},

diff --git a/data/monster/bosses/renegade_orc.lua b/data/monster/bosses/renegade_orc.lua
@@ -70,7 +70,7 @@ monster.loot = {
 	{id = 3410, chance = 10000},
 	{id = 3298, chance = 9850, maxCount = 4},
 	{id = 3725, chance = 9650},
-	{id = 3091, chance = 3920},
+	{id = 3091, chance = 3920}, -- Sword ring
 	{id = 3285, chance = 2800},
 	{id = 7378, chance = 2600},
 	{id = 3307, chance = 2100},