Skip to content

Commit

Permalink
Merge branch 'main' into refactor-sendSaleItemList
Browse files Browse the repository at this point in the history
  • Loading branch information
Luan Luciano authored Jun 7, 2024
2 parents 1138b90 + 4af13ee commit 8d2c307
Show file tree
Hide file tree
Showing 32 changed files with 405 additions and 204 deletions.
1 change: 1 addition & 0 deletions config.lua.dist
Original file line number Diff line number Diff line change
Expand Up @@ -511,6 +511,7 @@ bossDefaultTimeToFightAgain = 20 * 60 * 60 -- 20 hours
bossDefaultTimeToDefeat = 20 * 60 -- 20 minutes

-- Monsters
defaultRespawnTime = 60
deSpawnRange = 2
deSpawnRadius = 50

Expand Down
28 changes: 0 additions & 28 deletions data-canary/scripts/actions/other/large_sea_shell.lua

This file was deleted.

101 changes: 0 additions & 101 deletions data-canary/scripts/weapons/scripted_weapons.lua

This file was deleted.

1 change: 0 additions & 1 deletion data-otservbr-global/lib/others/load.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")
20 changes: 0 additions & 20 deletions data-otservbr-global/scripts/creaturescripts/customs/vip.lua

This file was deleted.

12 changes: 0 additions & 12 deletions data-otservbr-global/scripts/creaturescripts/others/forge_kill.lua

This file was deleted.

Loading

0 comments on commit 8d2c307

Please sign in to comment.