Allow nodeboxes combination by pressing sneak + right-click

diff --git a/sitting.lua b/sitting.lua
index 14cb310ba751c5b5002538fa8416afc8a82db539..d1495de9bb782205ece6d0f316f0c894f27e1725 100644 (file)
--- a/sitting.lua
+++ b/sitting.lua
@@ -1,13 +1,9 @@
-local function node_pointed_face(pointed_thing)
-       local ay = pointed_thing.above.y
-       local uy = pointed_thing.under.y
-
-       if     ay > uy then return 1     -- Top face pointed.
-       elseif ay < uy then return 2 end -- Bottom face pointed.
+local function pointed_face(pointed_thing)
+       return pointed_thing.above.y > pointed_thing.under.y -- Top face pointed.
 end
 
 local function sit(pos, node, clicker, pointed_thing)
-       if node_pointed_face(pointed_thing) == 2 then return end
+       if not pointed_face(pointed_thing) then return end
        local player = clicker:get_player_name()
        local objs = minetest.get_objects_inside_radius(pos, 0.1)
 
@@ -102,16 +98,15 @@ xdecor.register("cushion", {
                                return
                        end
 
-                       if node_pointed_face(pointed_thing) == 1 then
-                               minetest.set_node(pos, {name = "xdecor:cushion_block", param2 = node.param2})
-                       else
-                               minetest.set_node(pointed_thing.above, {name = wield_item, param2 = 20})
+                       if pointed_face(pointed_thing) then
+                               minetest.set_node(pos, {name="xdecor:cushion_block", param2=node.param2})
                        end
 
                        if not minetest.setting_getbool("creative_mode") then
                                itemstack:take_item()
-                               return itemstack
                        end
+
+                       return itemstack
                end
        end
 })

diff --git a/worktable.lua b/worktable.lua
index 350e9a0e426f4f9cb29790322be7f94bc8efec15..9561096c55839410626ecaed92bc8781416c7015 100644 (file)
--- a/worktable.lua
+++ b/worktable.lua
@@ -33,7 +33,7 @@ local defs = {
        {"microslab",   8,  { 0, 0,  0, 16, 1, 16 }},
        {"thinstair",   8,  { 0, 7,  0, 16, 1, 8  },
                            { 0, 15, 8, 16, 1, 8  }},
-       {"cube",        4,  { 0, 0,  8, 8,  8, 8  }},
+       {"cube",        4,  { 0, 0,  0, 8,  8, 8  }},
        {"panel",       4,  { 0, 0,  0, 16, 8, 8  }},
        {"slab",        2,  { 0, 0,  0, 16, 8, 16 }},
        {"doublepanel", 2,  { 0, 0,  0, 16, 8, 8  },
@@ -431,7 +431,63 @@ for name in n:gmatch("[%w_]+") do
                        groups = groups,
                        node_box = xdecor.pixelnodebox(16, {d[3], d[4], d[5]}),
                        sunlight_propagates = true,
-                       on_place = minetest.rotate_node
+                       on_place = minetest.rotate_node,
+                       on_rightclick = function(pos, node, clicker, itemstack, pointed_thing)
+                               local pointed_nodebox = minetest.get_node(pos).name:match("(%w+)$")
+                               local wield_item = clicker:get_wielded_item():get_name()
+                               local player_name = clicker:get_player_name()
+                               local newnode = ""
+
+                               if minetest.is_protected(pos, player_name) then
+                                       minetest.record_protection_violation(pos, player_name)
+                                       return
+                               end
+
+                               local T = {
+                                       {"nanoslab",   nil,          2},
+                                       {"micropanel", nil,          3},
+                                       {"cube",       nil,          6},
+                                       {"cube",       "panel",      9},
+                                       {"cube",       "slab",       10},
+                                       {"cube",       "outerstair", 11},
+                                       {"cube",       "stair",      12},
+                                       {"cube",       "halfstair",  7},
+                                       {"cube",       "innerstair", nil},
+                                       {"panel",      nil,          7},
+                                       {"panel",      "slab",       11},
+                                       {"panel",      "outerstair", 12},
+                                       {"panel",      "stair",      nil},
+                                       {"halfstair",  nil,          11},
+                                       {"halfstair",  "slab",       12},
+                                       {"slab",       nil,          nil}
+                               }
+
+                               for _, x in pairs(T) do
+                                       if wield_item == mod..":"..name.."_"..x[1] then
+                                               if not x[2] then x[2] = x[1] end
+                                               if x[2] == pointed_nodebox then
+                                                       if not x[3] then
+                                                               newnode = mod..":"..name
+                                                       else
+                                                               newnode = mod..":"..name.."_"..defs[x[3]][1]
+                                                       end
+                                               end
+                                       end
+                               end
+
+                               if clicker:get_player_control().sneak then
+                                       if not minetest.registered_nodes[newnode] then return end
+                                       minetest.set_node(pos, {name=newnode, param2=node.param2})
+                               else
+                                       minetest.item_place_node(ItemStack(wield_item), clicker, pointed_thing)
+                               end
+
+                               if not minetest.setting_getbool("creative_mode") then
+                                       itemstack:take_item()
+                               end
+
+                               return itemstack
+                       end
                })
        end
 end