Skip to content

Commit

Permalink
Merge branch 'main' into phantasmal-jade
Browse files Browse the repository at this point in the history
  • Loading branch information
omarcopires authored Nov 17, 2024
2 parents da475c6 + 4ee11d6 commit 2f35a16
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 38 deletions.
2 changes: 1 addition & 1 deletion data-canary/scripts/actions/other/destroy.lua
Original file line number Diff line number Diff line change
Expand Up @@ -250,7 +250,7 @@ local setting = {
local destroy = Action()

function destroy.onUse(player, item, fromPosition, target, toPosition, isHotkey)
return ActionsLib.destroyItem(player, target, toPosition)
return destroyItem(player, target, toPosition)
end

for index, value in ipairs(setting) do
Expand Down
12 changes: 0 additions & 12 deletions data-canary/scripts/actions/other/sewer.lua

This file was deleted.

19 changes: 0 additions & 19 deletions data-otservbr-global/scripts/actions/other/teleport.lua

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
local setting = { 1948, 1968, 5542, 20474, 20475, 28656, 31262 }
local ladderTable = Game.getLadderIds()

local ladder = Action()

function ladder.onUse(player, item, fromPosition, target, toPosition, isHotkey)
if table.contains(setting, item.itemid) then
if table.contains(ladderTable, item.itemid) then
fromPosition:moveUpstairs()
else
fromPosition.z = fromPosition.z + 1
Expand All @@ -18,8 +18,5 @@ function ladder.onUse(player, item, fromPosition, target, toPosition, isHotkey)
return true
end

for index, value in ipairs(setting) do
ladder:id(value)
end

ladder:id(435, unpack(ladderTable))
ladder:register()

0 comments on commit 2f35a16

Please sign in to comment.