nalc
/
homedecor_modpack
forked from mtcontrib/homedecor_modpack
1
0
Fork 1
Code Issues Pull Requests Releases Wiki Activity

rename sit functions

This commit is contained in:
jp 2015-02-25 11:17:42 +01:00
parent d3199606ec
commit 4fe73ade80
2 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
homedecor/exterior.lua
View File

@ -84,7 +84,7 @@ homedecor.register("bench_large_1_left", {
expand = { right="homedecor:bench_large_1_right" }, expand = { right="homedecor:bench_large_1_right" },
on_rightclick = function(pos, node, clicker) on_rightclick = function(pos, node, clicker)
pos.y = pos.y-0 -- player's sit position. pos.y = pos.y-0 -- player's sit position.
sit_exec(pos, node, clicker) homedecor.sit_exec(pos, node, clicker)
end, end,
}) })
@ -154,7 +154,7 @@ homedecor.register("bench_large_2_left", {
expand = { right="homedecor:bench_large_2_right" }, expand = { right="homedecor:bench_large_2_right" },
on_rightclick = function(pos, node, clicker) on_rightclick = function(pos, node, clicker)
pos.y = pos.y-0 -- player's sit position. pos.y = pos.y-0 -- player's sit position.
sit_exec(pos, node, clicker) homedecor.sit_exec(pos, node, clicker)
end, end,
}) })
@ -347,7 +347,7 @@ homedecor.register("simple_bench", {
}, },
on_rightclick = function(pos, node, clicker) on_rightclick = function(pos, node, clicker)
pos.y = pos.y-0 -- player's sit position. pos.y = pos.y-0 -- player's sit position.
sit_exec(pos, node, clicker) homedecor.sit_exec(pos, node, clicker)
end, end,
}) })

16
homedecor/furniture.lua
View File

@ -1,6 +1,6 @@
local S = homedecor.gettext local S = homedecor.gettext
function sit(pos, node, clicker) function homedecor.sit(pos, node, clicker)
local name = clicker:get_player_name() local name = clicker:get_player_name()
local meta = minetest:get_meta(pos) local meta = minetest:get_meta(pos)
local param2 = node.param2 local param2 = node.param2
@ -29,13 +29,13 @@ function sit(pos, node, clicker)
end end
end end
function sit_exec(pos, node, clicker) -- don't move these functions inside sit() function homedecor.sit_exec(pos, node, clicker) -- don't move these functions inside sit()
if not clicker or not clicker:is_player() if not clicker or not clicker:is_player()
or clicker:get_player_control().up == true or clicker:get_player_control().down == true or clicker:get_player_control().up == true or clicker:get_player_control().down == true
or clicker:get_player_control().left == true or clicker:get_player_control().right == true or clicker:get_player_control().left == true or clicker:get_player_control().right == true
or clicker:get_player_control().jump == true then -- make sure that the player is immobile. or clicker:get_player_control().jump == true then -- make sure that the player is immobile.
return end return end
sit(pos, node, clicker) homedecor.sit(pos, node, clicker)
clicker:setpos(pos) clicker:setpos(pos)
default.player_set_animation(clicker, "sit", 30) default.player_set_animation(clicker, "sit", 30)
end end
@ -121,7 +121,7 @@ for i in ipairs(chaircolors) do
groups = {snappy=2,choppy=2,oddly_breakable_by_hand=2}, groups = {snappy=2,choppy=2,oddly_breakable_by_hand=2},
on_rightclick = function(pos, node, clicker) on_rightclick = function(pos, node, clicker)
pos.y = pos.y-0 -- player's sit position. pos.y = pos.y-0 -- player's sit position.
sit_exec(pos, node, clicker) homedecor.sit_exec(pos, node, clicker)
end, end,
}) })
@ -154,7 +154,7 @@ for i in ipairs(chaircolors) do
groups = {snappy=2,choppy=2,oddly_breakable_by_hand=2}, groups = {snappy=2,choppy=2,oddly_breakable_by_hand=2},
on_rightclick = function(pos, node, clicker) on_rightclick = function(pos, node, clicker)
pos.y = pos.y-0.1 -- player's sit position. pos.y = pos.y-0.1 -- player's sit position.
sit_exec(pos, node, clicker) homedecor.sit_exec(pos, node, clicker)
clicker:set_hp(20) clicker:set_hp(20)
end, end,
}) })
@ -362,7 +362,7 @@ homedecor.register("wardrobe_bottom", {
}, },
inventory_image = "homedecor_wardrobe_inv.png", inventory_image = "homedecor_wardrobe_inv.png",
description = "Wardrobe", description = "Wardrobe",
groups = {snappy=3}, groups = {snappy=3},
node_box = { node_box = {
type = "fixed", type = "fixed",
fixed = { fixed = {
@ -473,7 +473,7 @@ homedecor.register("office_chair_upscale", {
expand = { top = "air" }, expand = { top = "air" },
on_rightclick = function(pos, node, clicker) on_rightclick = function(pos, node, clicker)
pos.y = pos.y+0.14 -- player's sit position. pos.y = pos.y+0.14 -- player's sit position.
sit_exec(pos, node, clicker) homedecor.sit_exec(pos, node, clicker)
end, end,
}) })
@ -500,7 +500,7 @@ homedecor.register("office_chair_basic", {
expand = { top = "air" }, expand = { top = "air" },
on_rightclick = function(pos, node, clicker) on_rightclick = function(pos, node, clicker)
pos.y = pos.y+0.14 -- player's sit position. pos.y = pos.y+0.14 -- player's sit position.
sit_exec(pos, node, clicker) homedecor.sit_exec(pos, node, clicker)
end, end,
}) })