diff --git a/data/actions/actions.xml b/data/actions/actions.xml index 9e4accd..0421a7c 100644 --- a/data/actions/actions.xml +++ b/data/actions/actions.xml @@ -147,6 +147,7 @@ + diff --git a/data/actions/scripts/misc/skull_candle.lua b/data/actions/scripts/misc/skull_candle.lua new file mode 100644 index 0000000..ef0f284 --- /dev/null +++ b/data/actions/scripts/misc/skull_candle.lua @@ -0,0 +1,14 @@ +function onUse(player, item, fromPosition, target, toPosition) + if not target:isItem() then + return false + end + + if target:getId() == 2917 then + player:addItem(5813, 1) + item:remove(1) + target:remove(1) + return true + end + + return false +end diff --git a/data/items/items.srv b/data/items/items.srv index 3105452..4214cc3 100644 --- a/data/items/items.srv +++ b/data/items/items.srv @@ -26226,7 +26226,8 @@ Flags = {Take} Attributes = {Weight=30} TypeID = 5810 -Name = "a pirate voodoo doll" +Name = "a voodoo doll" +Description = "It looks like a small pirate" Flags = {Take} Attributes = {Weight=650} @@ -26242,7 +26243,7 @@ Attributes = {ChangeTarget=5813,Weight=2200,Brightness=3,LightColor=206,ExpireT TypeID = 5813 Name = "a skull candle" Flags = {ChangeUse,Take,ExpireStop} -Attributes = {ChangeTarget=5812,Weight=2200,Brightness=0,LightColor=215} # TODO: implement like in tibia wiki +Attributes = {ChangeTarget=5812,Weight=2200,Brightness=0,LightColor=215} TypeID = 5814 Name = "small lava cracks" @@ -26473,7 +26474,7 @@ Flags = {Unmove} TypeID = 5864 Name = "" # this is nothing in client - +# pradzia nuo cia jau reikia implementuoti juiceri TypeID = 5865 Name = "a juice squeezer" Flags = {Take} diff --git a/data/monster/dharalion.xml b/data/monster/dharalion.xml index 5a9719d..2bf3cea 100644 --- a/data/monster/dharalion.xml +++ b/data/monster/dharalion.xml @@ -65,5 +65,6 @@ + \ No newline at end of file diff --git a/data/monster/hornedfox.xml b/data/monster/hornedfox.xml index cab2dfb..6a7142f 100644 --- a/data/monster/hornedfox.xml +++ b/data/monster/hornedfox.xml @@ -56,5 +56,6 @@ + \ No newline at end of file diff --git a/data/monster/necropharus.xml b/data/monster/necropharus.xml index a45e4bb..85e2b32 100644 --- a/data/monster/necropharus.xml +++ b/data/monster/necropharus.xml @@ -60,5 +60,6 @@ + \ No newline at end of file diff --git a/data/monster/orshabaal.xml b/data/monster/orshabaal.xml index 364d9a4..52cfc1f 100644 --- a/data/monster/orshabaal.xml +++ b/data/monster/orshabaal.xml @@ -119,5 +119,6 @@ + \ No newline at end of file diff --git a/data/movements/scripts/misc/floorchange.lua b/data/movements/scripts/misc/floorchange.lua index acc8c4a..d579515 100644 --- a/data/movements/scripts/misc/floorchange.lua +++ b/data/movements/scripts/misc/floorchange.lua @@ -3,6 +3,7 @@ local list = { [294] = {x = 0, y = 0, z = 1}, [369] = {x = 0, y = 0, z = 1}, [370] = {x = 0, y = 0, z = 1}, + [385] = {x = 0, y = 0, z = 1}, [394] = {x = 0, y = 0, z = 1}, [411] = {x = 0, y = 0, z = 1}, [412] = {x = 0, y = 0, z = 1},