summaryrefslogtreecommitdiff
path: root/homedecor/furniture.lua
diff options
context:
space:
mode:
authorVanessa Ezekowitz <vanessaezekowitz@gmail.com>2017-02-04 20:11:09 -0500
committerVanessa Ezekowitz <vanessaezekowitz@gmail.com>2017-02-04 20:11:09 -0500
commit921c05da0d057469032fe9aced321503f1f0d498 (patch)
tree7e7d75b4a15cee7984d98f9da2230d74b19aea96 /homedecor/furniture.lua
parenteba6f42678dbdb4837a30908b0627bee6f35440a (diff)
downloaddreambuilder_modpack-921c05da0d057469032fe9aced321503f1f0d498.tar
dreambuilder_modpack-921c05da0d057469032fe9aced321503f1f0d498.tar.gz
dreambuilder_modpack-921c05da0d057469032fe9aced321503f1f0d498.tar.bz2
dreambuilder_modpack-921c05da0d057469032fe9aced321503f1f0d498.tar.xz
dreambuilder_modpack-921c05da0d057469032fe9aced321503f1f0d498.zip
updated several mods to use newer unified dyes API
blox, bobblocks, coloredwood, framedglass, homedecor, ilights, plasticbox, stained_glass, unifiedbricks, and of course unified dyes.
Diffstat (limited to 'homedecor/furniture.lua')
-rw-r--r--homedecor/furniture.lua22
1 files changed, 6 insertions, 16 deletions
diff --git a/homedecor/furniture.lua b/homedecor/furniture.lua
index 8f60c5d..d1e24a9 100644
--- a/homedecor/furniture.lua
+++ b/homedecor/furniture.lua
@@ -66,7 +66,7 @@ homedecor.register("kitchen_chair_wood", {
paramtype2 = "wallmounted",
selection_box = kc_cbox,
collision_box = kc_cbox,
- groups = {snappy=2,choppy=2,oddly_breakable_by_hand=2},
+ groups = {snappy=2,choppy=2,oddly_breakable_by_hand=2, ud_param2_colorable = 1},
sounds = default.node_sound_wood_defaults(),
after_place_node = homedecor.fix_rotation_nsew,
on_rightclick = function(pos, node, clicker, itemstack, pointed_thing)
@@ -88,20 +88,15 @@ homedecor.register("kitchen_chair_padded", {
palette = "unifieddyes_palette_colorwallmounted.png",
selection_box = kc_cbox,
collision_box = kc_cbox,
- groups = {snappy=2,choppy=2,oddly_breakable_by_hand=2},
+ groups = {snappy=2,choppy=2,oddly_breakable_by_hand=2, ud_param2_colorable = 1},
sounds = default.node_sound_wood_defaults(),
after_place_node = homedecor.fix_rotation_nsew,
after_dig_node = unifieddyes.after_dig_node,
on_rightclick = function(pos, node, clicker, itemstack, pointed_thing)
local itemname = itemstack:get_name()
- if string.find(itemname, "dye:") or string.find(itemname, "unifieddyes:") then
- unifieddyes.on_rightclick(pos, node, clicker,
- itemstack, pointed_thing, "homedecor:kitchen_chair_padded", "wallmounted")
- else
- pos.y = pos.y+0 -- where do I put my ass ?
- homedecor.sit(pos, node, clicker)
- return itemstack
- end
+ pos.y = pos.y+0 -- where do I put my ass ?
+ homedecor.sit(pos, node, clicker)
+ return itemstack
end
})
@@ -116,16 +111,11 @@ homedecor.register("armchair", {
inventory_image = "homedecor_armchair_inv.png",
paramtype2 = "colorwallmounted",
palette = "unifieddyes_palette_colorwallmounted.png",
- groups = {snappy=3},
+ groups = {snappy=3, ud_param2_colorable = 1},
sounds = default.node_sound_wood_defaults(),
node_box = ac_cbox,
after_place_node = homedecor.fix_rotation_nsew,
after_dig_node = unifieddyes.after_dig_node,
- on_rightclick = function(pos, node, clicker, itemstack, pointed_thing)
- local itemname = itemstack:get_name()
- unifieddyes.on_rightclick(pos, node, clicker,
- itemstack, pointed_thing, "homedecor:armchair", "wallmounted")
- end
})
local ob_cbox = {