Stairs: Use one recipe matching inventory appearence
[oweals/minetest_game.git] / mods / stairs / init.lua
index faaa92b31eb4b5d5b7905176a780fcd6b2b969d3..8ec5aa7a190b29ac9c7991a4d06d7244c059218c 100644 (file)
@@ -15,8 +15,32 @@ minetest.register_alias("stairs:slab_pinewood", "stairs:slab_pine_wood")
 
 -- Get setting for replace ABM
 
-local replace = minetest.setting_getbool("enable_stairs_replace_abm")
+local replace = minetest.settings:get_bool("enable_stairs_replace_abm")
 
+local function rotate_and_place(itemstack, placer, pointed_thing)
+       local p0 = pointed_thing.under
+       local p1 = pointed_thing.above
+       local param2 = 0
+
+       local placer_pos = placer:getpos()
+       if placer_pos then
+               param2 = minetest.dir_to_facedir(vector.subtract(p1, placer_pos))
+       end
+
+       local finepos = minetest.pointed_thing_to_face_pos(placer, pointed_thing)
+       local fpos = finepos.y % 1
+
+       if p0.y - 1 == p1.y or (fpos > 0 and fpos < 0.5)
+                       or (fpos < -0.5 and fpos > -0.999999999) then
+               param2 = param2 + 20
+               if param2 == 21 then
+                       param2 = 23
+               elseif param2 == 23 then
+                       param2 = 21
+               end
+       end
+       return minetest.item_place(itemstack, placer, pointed_thing, param2)
+end
 
 -- Register stairs.
 -- Node will be called stairs:stair_<subname>
@@ -52,30 +76,7 @@ function stairs.register_stair(subname, recipeitem, groups, images, description,
                                return itemstack
                        end
 
-                       local p0 = pointed_thing.under
-                       local p1 = pointed_thing.above
-                       local param2 = 0
-
-                       local placer_pos = placer:getpos()
-                       if placer_pos then
-                               local dir = {
-                                       x = p1.x - placer_pos.x,
-                                       y = p1.y - placer_pos.y,
-                                       z = p1.z - placer_pos.z
-                               }
-                               param2 = minetest.dir_to_facedir(dir)
-                       end
-
-                       if p0.y - 1 == p1.y then
-                               param2 = param2 + 20
-                               if param2 == 21 then
-                                       param2 = 23
-                               elseif param2 == 23 then
-                                       param2 = 21
-                               end
-                       end
-
-                       return minetest.item_place(itemstack, placer, pointed_thing, param2)
+                       return rotate_and_place(itemstack, placer, pointed_thing)
                end,
        })
 
@@ -88,28 +89,45 @@ function stairs.register_stair(subname, recipeitem, groups, images, description,
        end
 
        if recipeitem then
+               -- Recipe matches appearence in inventory
                minetest.register_craft({
                        output = 'stairs:stair_' .. subname .. ' 8',
                        recipe = {
-                               {recipeitem, "", ""},
-                               {recipeitem, recipeitem, ""},
+                               {"", "", recipeitem},
+                               {"", recipeitem, recipeitem},
                                {recipeitem, recipeitem, recipeitem},
                        },
                })
 
-               -- Flipped recipe for the silly minecrafters
+               -- Use stairs to craft full blocks again (1:1)
                minetest.register_craft({
-                       output = 'stairs:stair_' .. subname .. ' 8',
+                       output = recipeitem .. ' 3',
                        recipe = {
-                               {"", "", recipeitem},
-                               {"", recipeitem, recipeitem},
-                               {recipeitem, recipeitem, recipeitem},
+                               {'stairs:stair_' .. subname, 'stairs:stair_' .. subname},
+                               {'stairs:stair_' .. subname, 'stairs:stair_' .. subname},
                        },
                })
+
+               -- Fuel
+               local baseburntime = minetest.get_craft_result({
+                       method = "fuel",
+                       width = 1,
+                       items = {recipeitem}
+               }).time
+               if baseburntime > 0 then
+                       minetest.register_craft({
+                               type = "fuel",
+                               recipe = 'stairs:stair_' .. subname,
+                               burntime = math.floor(baseburntime * 0.75),
+                       })
+               end
        end
 end
 
 
+-- Slab facedir to placement 6d matching table
+local slab_trans_dir = {[0] = 8, 0, 2, 1, 3, 4}
+
 -- Register slabs.
 -- Node will be called stairs:slab_<subname>
 
@@ -129,86 +147,56 @@ function stairs.register_slab(subname, recipeitem, groups, images, description,
                        fixed = {-0.5, -0.5, -0.5, 0.5, 0, 0.5},
                },
                on_place = function(itemstack, placer, pointed_thing)
-                       if pointed_thing.type ~= "node" then
-                               return itemstack
-                       end
+                       local under = minetest.get_node(pointed_thing.under)
+                       local wield_item = itemstack:get_name()
+                       local creative_enabled = (creative and creative.is_enabled_for
+                                       and creative.is_enabled_for(placer:get_player_name()))
 
-                       -- If it's being placed on an another similar one, replace it with
-                       -- a full block
-                       local slabpos = nil
-                       local slabnode = nil
-                       local p0 = pointed_thing.under
-                       local p1 = pointed_thing.above
-                       local n0 = minetest.get_node(p0)
-                       local n1 = minetest.get_node(p1)
-                       local param2 = 0
-
-                       local n0_is_upside_down = (n0.name == "stairs:slab_" .. subname and
-                                       n0.param2 >= 20)
-
-                       if n0.name == "stairs:slab_" .. subname and not n0_is_upside_down and
-                                       p0.y + 1 == p1.y then
-                               slabpos = p0
-                               slabnode = n0
-                       elseif n1.name == "stairs:slab_" .. subname then
-                               slabpos = p1
-                               slabnode = n1
-                       end
-                       if slabpos then
-                               -- Remove the slab at slabpos
-                               minetest.remove_node(slabpos)
-                               -- Make a fake stack of a single item and try to place it
-                               local fakestack = ItemStack(recipeitem)
-                               fakestack:set_count(itemstack:get_count())
-
-                               pointed_thing.above = slabpos
-                               local success
-                               fakestack, success = minetest.item_place(fakestack, placer,
-                                       pointed_thing)
-                               -- If the item was taken from the fake stack, decrement original
-                               if success then
-                                       itemstack:set_count(fakestack:get_count())
-                               -- Else put old node back
-                               else
-                                       minetest.set_node(slabpos, slabnode)
-                               end
-                               return itemstack
-                       end
-                       
-                       -- Upside down slabs
-                       if p0.y - 1 == p1.y then
-                               -- Turn into full block if pointing at a existing slab
-                               if n0_is_upside_down  then
-                                       -- Remove the slab at the position of the slab
-                                       minetest.remove_node(p0)
-                                       -- Make a fake stack of a single item and try to place it
-                                       local fakestack = ItemStack(recipeitem)
-                                       fakestack:set_count(itemstack:get_count())
-
-                                       pointed_thing.above = p0
-                                       local success
-                                       fakestack, success = minetest.item_place(fakestack, placer,
-                                               pointed_thing)
-                                       -- If the item was taken from the fake stack, decrement original
-                                       if success then
-                                               itemstack:set_count(fakestack:get_count())
-                                       -- Else put old node back
-                                       else
-                                               minetest.set_node(p0, n0)
+                       if under and under.name:find("stairs:slab_") then
+                               -- place slab using under node orientation
+                               local dir = minetest.dir_to_facedir(vector.subtract(
+                                       pointed_thing.above, pointed_thing.under), true)
+
+                               local p2 = under.param2
+
+                               -- combine two slabs if possible
+                               if slab_trans_dir[math.floor(p2 / 4)] == dir
+                                               and wield_item == under.name then
+
+                                       if not recipeitem then
+                                               return itemstack
+                                       end
+                                       local player_name = placer:get_player_name()
+                                       if minetest.is_protected(pointed_thing.under, player_name) and not
+                                                       minetest.check_player_privs(placer, "protection_bypass") then
+                                               minetest.record_protection_violation(pointed_thing.under,
+                                                       player_name)
+                                               return
+                                       end
+                                       minetest.set_node(pointed_thing.under, {name = recipeitem, param2 = p2})
+                                       if not creative_enabled then
+                                               itemstack:take_item()
                                        end
                                        return itemstack
                                end
 
-                               -- Place upside down slab
-                               param2 = 20
-                       end
+                               -- Placing a slab on an upside down slab should make it right-side up.
+                               if p2 >= 20 and dir == 8 then
+                                       p2 = p2 - 20
+                               -- same for the opposite case: slab below normal slab
+                               elseif p2 <= 3 and dir == 4 then
+                                       p2 = p2 + 20
+                               end
 
-                       -- If pointing at the side of a upside down slab
-                       if n0_is_upside_down and p0.y + 1 ~= p1.y then
-                               param2 = 20
+                               -- else attempt to place node with proper param2
+                               minetest.item_place_node(ItemStack(wield_item), placer, pointed_thing, p2)
+                               if not creative_enabled then
+                                       itemstack:take_item()
+                               end
+                               return itemstack
+                       else
+                               return rotate_and_place(itemstack, placer, pointed_thing)
                        end
-
-                       return minetest.item_place(itemstack, placer, pointed_thing, param2)
                end,
        })
 
@@ -227,6 +215,29 @@ function stairs.register_slab(subname, recipeitem, groups, images, description,
                                {recipeitem, recipeitem, recipeitem},
                        },
                })
+
+               -- Use 2 slabs to craft a full block again (1:1)
+               minetest.register_craft({
+                       output = recipeitem,
+                       recipe = {
+                               {'stairs:slab_' .. subname},
+                               {'stairs:slab_' .. subname},
+                       },
+               })
+
+               -- Fuel
+               local baseburntime = minetest.get_craft_result({
+                       method = "fuel",
+                       width = 1,
+                       items = {recipeitem}
+               }).time
+               if baseburntime > 0 then
+                       minetest.register_craft({
+                               type = "fuel",
+                               recipe = 'stairs:slab_' .. subname,
+                               burntime = math.floor(baseburntime * 0.5),
+                       })
+               end
        end
 end
 
@@ -236,6 +247,7 @@ end
 
 if replace then
        minetest.register_abm({
+               label = "Slab replace",
                nodenames = {"group:slabs_replace"},
                interval = 16,
                chance = 1,
@@ -268,7 +280,7 @@ end
 stairs.register_stair_and_slab(
        "wood",
        "default:wood",
-       {choppy = 2, oddly_breakable_by_hand = 2, flammable = 3},
+       {choppy = 2, oddly_breakable_by_hand = 2, flammable = 2},
        {"default_wood.png"},
        "Wooden Stair",
        "Wooden Slab",
@@ -278,7 +290,7 @@ stairs.register_stair_and_slab(
 stairs.register_stair_and_slab(
        "junglewood",
        "default:junglewood",
-       {choppy = 2, oddly_breakable_by_hand = 2, flammable = 3},
+       {choppy = 2, oddly_breakable_by_hand = 2, flammable = 2},
        {"default_junglewood.png"},
        "Jungle Wood Stair",
        "Jungle Wood Slab",
@@ -288,7 +300,7 @@ stairs.register_stair_and_slab(
 stairs.register_stair_and_slab(
        "pine_wood",
        "default:pine_wood",
-       {choppy = 2, oddly_breakable_by_hand = 2, flammable = 3},
+       {choppy = 3, oddly_breakable_by_hand = 2, flammable = 3},
        {"default_pine_wood.png"},
        "Pine Wood Stair",
        "Pine Wood Slab",
@@ -298,7 +310,7 @@ stairs.register_stair_and_slab(
 stairs.register_stair_and_slab(
        "acacia_wood",
        "default:acacia_wood",
-       {choppy = 2, oddly_breakable_by_hand = 2, flammable = 3},
+       {choppy = 2, oddly_breakable_by_hand = 2, flammable = 2},
        {"default_acacia_wood.png"},
        "Acacia Wood Stair",
        "Acacia Wood Slab",
@@ -308,7 +320,7 @@ stairs.register_stair_and_slab(
 stairs.register_stair_and_slab(
        "aspen_wood",
        "default:aspen_wood",
-       {choppy = 2, oddly_breakable_by_hand = 2, flammable = 3},
+       {choppy = 3, oddly_breakable_by_hand = 2, flammable = 3},
        {"default_aspen_wood.png"},
        "Aspen Wood Stair",
        "Aspen Wood Slab",
@@ -435,6 +447,66 @@ stairs.register_stair_and_slab(
        default.node_sound_stone_defaults()
 )
 
+stairs.register_stair_and_slab(
+       "desert_sandstone",
+       "default:desert_sandstone",
+       {crumbly = 1, cracky = 3},
+       {"default_desert_sandstone.png"},
+       "Desert Sandstone Stair",
+       "Desert Sandstone Slab",
+       default.node_sound_stone_defaults()
+)
+
+stairs.register_stair_and_slab(
+       "desert_sandstone_brick",
+       "default:desert_sandstone_brick",
+       {cracky = 2},
+       {"default_desert_sandstone_brick.png"},
+       "Desert Sandstone Brick Stair",
+       "Desert Sandstone Brick Slab",
+       default.node_sound_stone_defaults()
+)
+
+stairs.register_stair_and_slab(
+       "desert_sandstone_block",
+       "default:desert_sandstone_block",
+       {cracky = 2},
+       {"default_desert_sandstone_block.png"},
+       "Desert Sandstone Block Stair",
+       "Desert Sandstone Block Slab",
+       default.node_sound_stone_defaults()
+)
+
+stairs.register_stair_and_slab(
+       "silver_sandstone",
+       "default:silver_sandstone",
+       {crumbly = 1, cracky = 3},
+       {"default_silver_sandstone.png"},
+       "Silver Sandstone Stair",
+       "Silver Sandstone Slab",
+       default.node_sound_stone_defaults()
+)
+
+stairs.register_stair_and_slab(
+       "silver_sandstone_brick",
+       "default:silver_sandstone_brick",
+       {cracky = 2},
+       {"default_silver_sandstone_brick.png"},
+       "Silver Sandstone Brick Stair",
+       "Silver Sandstone Brick Slab",
+       default.node_sound_stone_defaults()
+)
+
+stairs.register_stair_and_slab(
+       "silver_sandstone_block",
+       "default:silver_sandstone_block",
+       {cracky = 2},
+       {"default_silver_sandstone_block.png"},
+       "Silver Sandstone Block Stair",
+       "Silver Sandstone Block Slab",
+       default.node_sound_stone_defaults()
+)
+
 stairs.register_stair_and_slab(
        "obsidian",
        "default:obsidian",
@@ -492,7 +564,7 @@ stairs.register_stair_and_slab(
        {"default_steel_block.png"},
        "Steel Block Stair",
        "Steel Block Slab",
-       default.node_sound_stone_defaults()
+       default.node_sound_metal_defaults()
 )
 
 stairs.register_stair_and_slab(
@@ -502,7 +574,7 @@ stairs.register_stair_and_slab(
        {"default_copper_block.png"},
        "Copper Block Stair",
        "Copper Block Slab",
-       default.node_sound_stone_defaults()
+       default.node_sound_metal_defaults()
 )
 
 stairs.register_stair_and_slab(
@@ -512,7 +584,7 @@ stairs.register_stair_and_slab(
        {"default_bronze_block.png"},
        "Bronze Block Stair",
        "Bronze Block Slab",
-       default.node_sound_stone_defaults()
+       default.node_sound_metal_defaults()
 )
 
 stairs.register_stair_and_slab(
@@ -522,5 +594,29 @@ stairs.register_stair_and_slab(
        {"default_gold_block.png"},
        "Gold Block Stair",
        "Gold Block Slab",
-       default.node_sound_stone_defaults()
+       default.node_sound_metal_defaults()
+)
+
+stairs.register_stair_and_slab(
+       "ice",
+       "default:ice",
+       {cracky = 3, puts_out_fire = 1, cools_lava = 1},
+       {"default_ice.png"},
+       "Ice Stair",
+       "Ice Slab",
+       default.node_sound_glass_defaults()
+)
+
+stairs.register_stair_and_slab(
+       "snowblock",
+       "default:snowblock",
+       {crumbly = 3, puts_out_fire = 1, cools_lava = 1, snowy = 1},
+       {"default_snow.png"},
+       "Snow Block Stair",
+       "Snow Block Slab",
+       default.node_sound_dirt_defaults({
+               footstep = {name = "default_snow_footstep", gain = 0.15},
+               dug = {name = "default_snow_footstep", gain = 0.2},
+               dig = {name = "default_snow_footstep", gain = 0.2}
+       })
 )