Merge branch 'main' into patch-1

opentibiabr · Sep 15, 2024 · 597c763 · 597c763
2 parents 3539e65 + b3b19a6
commit 597c763
Show file tree

Hide file tree

Showing 179 changed files with 7,258 additions and 705 deletions.
diff --git a/data-canary/scripts/lib/register_actions.lua b/data-canary/scripts/lib/register_actions.lua
@@ -1,5 +1,5 @@
 local holeId = { 294, 369, 370, 385, 394, 411, 412, 413, 432, 433, 435, 482, 483, 594, 595, 609, 610, 615, 868, 874, 1156, 4824, 7515, 7516, 7517, 7518, 7519, 7520, 7521, 7522, 7737, 7755, 7762, 7767, 7768, 8144, 8690, 8709, 12203, 12961, 17239, 19220, 23364 } -- usable rope holes, for rope spots see global.lua
-local wildGrowth = { 3635, 30224 } -- wild growth destroyable by machete
+local wildGrowth = { 2130, 3635, 30224 } -- wild growth destroyable by machete
 local jungleGrass = { -- grass destroyable by machete
 	[3696] = 3695,
 	[3702] = 3701,

diff --git a/data-otservbr-global/lib/quests/quest.lua b/data-otservbr-global/lib/quests/quest.lua
@@ -5,5 +5,6 @@ dofile(DATA_DIRECTORY .. "/lib/quests/killing_in_the_name_of.lua")
 dofile(DATA_DIRECTORY .. "/lib/quests/svargrond_arena.lua")
 dofile(DATA_DIRECTORY .. "/lib/quests/the_cursed_crystal.lua")
 dofile(DATA_DIRECTORY .. "/lib/quests/the_queen_of_the_banshees.lua")
+dofile(DATA_DIRECTORY .. "/lib/quests/soul_war.lua")
 dofile(DATA_DIRECTORY .. "/lib/quests/their_masters_voice.lua")
 dofile(DATA_DIRECTORY .. "/lib/quests/the_primal_ordeal.lua")