Merge branch 'main' into fix/support-outfit-crashs

elsongabriel · Jun 6, 2024 · d9a206b · d9a206b
2 parents f3c5d26 + 4af13ee
commit d9a206b
Show file tree

Hide file tree

Showing 32 changed files with 405 additions and 204 deletions.
diff --git a/config.lua.dist b/config.lua.dist
@@ -513,6 +513,7 @@ bossDefaultTimeToFightAgain = 20 * 60 * 60 -- 20 hours
 bossDefaultTimeToDefeat = 20 * 60 -- 20 minutes
 
 -- Monsters
+defaultRespawnTime = 60
 deSpawnRange = 2
 deSpawnRadius = 50
 

diff --git a/data-canary/scripts/actions/other/large_sea_shell.lua b/data-canary/scripts/actions/other/large_sea_shell.lua
diff --git a/data-canary/scripts/weapons/scripted_weapons.lua b/data-canary/scripts/weapons/scripted_weapons.lua
diff --git a/data-otservbr-global/lib/others/load.lua b/data-otservbr-global/lib/others/load.lua
@@ -1,2 +1 @@
 dofile(DATA_DIRECTORY .. "/lib/others/dawnport.lua")
-dofile(DATA_DIRECTORY .. "/lib/others/vip_system.lua")
diff --git a/data-otservbr-global/scripts/creaturescripts/customs/vip.lua b/data-otservbr-global/scripts/creaturescripts/customs/vip.lua
diff --git a/data-otservbr-global/scripts/creaturescripts/others/forge_kill.lua b/data-otservbr-global/scripts/creaturescripts/others/forge_kill.lua
Original file line number	Diff line number	Diff line change
		@@ -1,2 +1 @@
		dofile(DATA_DIRECTORY .. "/lib/others/dawnport.lua")
		dofile(DATA_DIRECTORY .. "/lib/others/vip_system.lua")