diff --git a/data/actions/actions.xml b/data/actions/actions.xml
index 7b12ada..67d77f3 100644
--- a/data/actions/actions.xml
+++ b/data/actions/actions.xml
@@ -146,6 +146,7 @@
+
@@ -161,6 +162,7 @@
+
@@ -301,6 +303,8 @@
+
+
diff --git a/data/actions/scripts/misc/baking.lua b/data/actions/scripts/misc/baking.lua
index 11a3552..898d2f3 100644
--- a/data/actions/scripts/misc/baking.lua
+++ b/data/actions/scripts/misc/baking.lua
@@ -29,6 +29,12 @@ function onUse(player, item, fromPosition, target, toPosition)
item:remove(1)
return true
end
+ elseif item:getId() == 6276 then
+ if table.contains(ovens, target:getId()) then
+ Game.createItem(6277, 1, target:getPosition())
+ item:remove(1)
+ return true
+ end
elseif item:getId() == 3605 then
if table.contains(milestone, target:getId()) then
local parent = item:getParent()
diff --git a/data/actions/scripts/misc/food.lua b/data/actions/scripts/misc/food.lua
index 3de627d..334b273 100644
--- a/data/actions/scripts/misc/food.lua
+++ b/data/actions/scripts/misc/food.lua
@@ -40,7 +40,9 @@ local foods = {
[3732] = "Munch.", -- green mushroom
[5096] = "Yum.", -- mango
[5678] = "Gulp.", -- tortoise egg
- [6125] = "Gulp." -- tortoise egg from Nargor
+ [6125] = "Gulp.", -- tortoise egg from Nargor
+ [6277] = "Mmmm.", -- cake
+ [6278] = "Mmmm." -- cake
}
function onUse(player, item, fromPosition, target, toPosition)
diff --git a/data/actions/scripts/misc/knife.lua b/data/actions/scripts/misc/knife.lua
index 828b577..ab9ba8d 100644
--- a/data/actions/scripts/misc/knife.lua
+++ b/data/actions/scripts/misc/knife.lua
@@ -1,3 +1,5 @@
+local fruits = {3584, 3585, 3586, 3587, 3588, 3589, 3590, 3591, 3592, 3593, 3595, 3596, 5096}
+
function onUse(player, item, fromPosition, target, toPosition)
if not target:isItem() then
return false
@@ -7,6 +9,11 @@ function onUse(player, item, fromPosition, target, toPosition)
target:transform(2977, 1)
target:decay()
return true
+ elseif isInArray(fruits, target:getId()) and player:removeItem(6277, 1) then
+ target:remove(1)
+ player:addItem(6278, 1)
+ player:getPosition():sendMagicEffect(CONST_ME_MAGIC_GREEN)
+ return true
end
return false
-end
+end
\ No newline at end of file
diff --git a/data/actions/scripts/misc/party_cake.lua b/data/actions/scripts/misc/party_cake.lua
new file mode 100644
index 0000000..edc712e
--- /dev/null
+++ b/data/actions/scripts/misc/party_cake.lua
@@ -0,0 +1,6 @@
+function onUse(player, item, fromPosition, target, toPosition)
+ item:getPosition():sendMagicEffect(CONST_ME_POFF)
+ item:transform(6278, 1)
+ item:getPosition():sendMonsterSay(player:getName() .. " blew out the candle.")
+ return true
+end
diff --git a/data/items792/items.srv b/data/items792/items.srv
index de66900..ac31cf1 100644
--- a/data/items792/items.srv
+++ b/data/items792/items.srv
@@ -28448,8 +28448,6 @@ TypeID = 6275
Name = "an archway"
Flags = {Top,Unmove}
-# TODO: pradeti nuo cia
-
TypeID = 6276
Name = "a lump of cake dough"
Flags = {Cumulative,Take}
@@ -28457,19 +28455,23 @@ Attributes = {Weight=100}
TypeID = 6277
Name = "a cake"
-Flags = {Take}
-Attributes = {Weight=500}
+Flags = {UseEvent,Take}
+Attributes = {Nutrition=10,Weight=500}
TypeID = 6278
Name = "a cake"
-Flags = {Take}
-Attributes = {Weight=500}
+Description = "It is nicely decorated with fruits and icing"
+Flags = {UseEvent,CollisionEvent,Take}
+Attributes = {Nutrition=10,Weight=500}
TypeID = 6279
Name = "a party cake"
-Flags = {Take}
+Description = "It is nicely decorated with fruits, icing and a candle. Someone is caring about you"
+Flags = {UseEvent,Take}
Attributes = {Weight=500}
+# TODO: pradeti nuo cia
+
TypeID = 6280
Name = "a broken brick wall"
Flags = {Bottom,Unpass,Unmove,Unthrow,Unlay}
@@ -28551,6 +28553,7 @@ Attributes = {Weight=80}
TypeID = 6300
Name = "a death ring"
+Description = "Wearing it makes you feel a little weaker than usual"
Flags = {Take,Expire}
Attributes = {Weight=80,ExpireTarget=0,TotalExpireTime=480}
@@ -28888,11 +28891,13 @@ Attributes = {Capacity=6}
TypeID = 6371
Name = "an oven kit"
+Description = "Use it in your house to construct an oven"
Flags = {Take}
Attributes = {Weight=2500}
TypeID = 6372
Name = "a bookcase kit"
+Description = "Use it in your house to construct a bookcase"
Flags = {Take}
Attributes = {Weight=2500}
@@ -28970,6 +28975,7 @@ Attributes = {FluidSource=WATER}
TypeID = 6390
Name = "a nightmare shield"
+Description = "It was crafted by the ancient order of the nightmare knights"
Flags = {Take}
Attributes = {Weight=3200}
@@ -29141,6 +29147,7 @@ Flags = {Bottom,Unpass,Unmove}
TypeID = 6432
Name = "a necromancer shield"
+Description = "It is enchanted with unholy, necromantic powers"
Flags = {Take}
Attributes = {Weight=3200}
@@ -29404,6 +29411,7 @@ Flags = {Unmove}
TypeID = 6496
Name = "a christmas present bag"
+Description = "It contains presents which were stolen from Santa. Bring them back to Ruprecht on Vega"
Flags = {Take}
Attributes = {Weight=8000}
@@ -29413,11 +29421,13 @@ Flags = {Top,Unmove}
TypeID = 6498
Name = "a certificate"
+Description = "You have mastered the Dream Challenge and may apply for joining the order of the Nightmare Knights"
Flags = {Take}
Attributes = {Weight=150}
TypeID = 6499
Name = "a demonic essence"
+Description = "Someone might be interested in trading this"
Flags = {Cumulative,Take}
Attributes = {Weight=100}
@@ -29453,16 +29463,19 @@ Attributes = {Capacity=5,Weight=600}
TypeID = 6506
Name = "a red christmas bundle"
+Description = "It contains random christmas decoration"
Flags = {Take}
Attributes = {Weight=2500}
TypeID = 6507
Name = "a blue christmas bundle"
+Description = "It contains random christmas decoration"
Flags = {Take}
Attributes = {Weight=2500}
TypeID = 6508
Name = "a green christmas bundle"
+Description = "It contains random christmas decoration"
Flags = {Take}
Attributes = {Weight=2500}
@@ -29540,11 +29553,13 @@ Attributes = {Weight=1000}
TypeID = 6526
Name = "a christmas token"
+Description = "Collect enough of these to trade them for valuable prizes"
Flags = {Cumulative,Take}
Attributes = {Weight=5}
TypeID = 6527
Name = "the avenger"
+Description = "This holy blade was forged of shattered dreams"
Flags = {Take}
Attributes = {Weight=6400}
@@ -29655,11 +29670,13 @@ Attributes = {Weight=750}
TypeID = 6550
Name = "a red powder"
+Description = "It reeks of hatred and malice"
Flags = {Cumulative,Take}
Attributes = {Weight=100}
TypeID = 6551
Name = "a blue powder"
+Description = "Sun can be a merciless killer, but so can you"
Flags = {Cumulative,Take}
Attributes = {Weight=100}
@@ -29681,16 +29698,19 @@ Name = ""
TypeID = 6556
Name = "a tic-tac-toe token"
+Description = "It seems to be rather fragile"
Flags = {Take}
Attributes = {Weight=500}
TypeID = 6557
Name = "a tic-tac-toe token"
+Description = "It seems to be rather fragile"
Flags = {Take}
Attributes = {Weight=500}
TypeID = 6558
Name = "concentrated demonic blood"
+Description = "Shake it to create a potion"
Flags = {Take}
Attributes = {Weight=200}
@@ -29758,6 +29778,11 @@ Name = "a party trumpet"
Flags = {Take}
Attributes = {Weight=50}
+TypeID = 6572
+Name = "a party trumpet"
+Flags = {Take,Expire}
+Attributes = {Weight=50,ExpireTarget=6572,TotalExpireTime=4}
+
TypeID = 6574
Name = "a bar of chocolate"
Flags = {Take}
@@ -29770,6 +29795,7 @@ Attributes = {Weight=10}
TypeID = 6576
Name = "a fireworks rocket"
+Description = "Do not use in your backpack or while asleep. Keep away from animals or children"
Flags = {Take}
Attributes = {Weight=100}
diff --git a/data/movements/movements.xml b/data/movements/movements.xml
index 2db0f4b..aecedc0 100644
--- a/data/movements/movements.xml
+++ b/data/movements/movements.xml
@@ -644,6 +644,7 @@
+
diff --git a/data/movements/scripts/misc/lit_candlestick.lua b/data/movements/scripts/misc/lit_candlestick.lua
new file mode 100644
index 0000000..c13663c
--- /dev/null
+++ b/data/movements/scripts/misc/lit_candlestick.lua
@@ -0,0 +1,8 @@
+function onAddItem(item, tileitem, position)
+ if item:getId() == 2918 or item:getId() == 2917 then
+ tileitem:transform(6279, 1)
+ item:getPosition():sendMagicEffect(CONST_ME_MAGIC_GREEN)
+ item:remove()
+ end
+ return true
+end
\ No newline at end of file