From 54e593572b5ee8d0da34c1354652ced023dcdddc Mon Sep 17 00:00:00 2001 From: Aleksandr Avdeev Date: Thu, 4 Jul 2024 10:44:52 +0300 Subject: [PATCH] additions mod: gravel and sand --- .gitignore | 1 + crafting.lua | 256 ++++++++++++ models/moreblocks_slope_third.obj | 56 +++ models/moreblocks_slope_third_raised.obj | 72 ++++ models/moreblocks_slope_third_top.obj | 72 ++++ nodes.lua | 503 +++++++++++++++++++++-- stairsplus/recipes.lua | 13 +- 7 files changed, 938 insertions(+), 35 deletions(-) create mode 100644 .gitignore create mode 100644 models/moreblocks_slope_third.obj create mode 100644 models/moreblocks_slope_third_raised.obj create mode 100644 models/moreblocks_slope_third_top.obj diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..85e7c1d --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +/.idea/ diff --git a/crafting.lua b/crafting.lua index 0161a2e..2764713 100644 --- a/crafting.lua +++ b/crafting.lua @@ -646,3 +646,259 @@ if minetest.settings:get_bool("moreblocks.circular_saw_crafting") ~= false then } }) end + +-- add gravel + +minetest.register_craft({ + output = "moreblocks:gravel_stonebrick 2", + recipe = { + { "default:gravel" }, + { "default:stonebrick"}, + } +}) + +minetest.register_craft({ + output = "moreblocks:gravel_slope 6", + recipe = { + { "","","" }, + { "","","default:gravel", }, + { "", "default:gravel", "default:gravel" }, + } +}) + + +minetest.register_craft({ + output = "moreblocks:gravel_slope_2a 12", + recipe = { + { "","","" }, + { "","","", }, + { "", "default:gravel", "default:gravel" }, + } +}) + +minetest.register_craft({ + output = "moreblocks:gravel_slope_2b 4", + recipe = { + { "","","default:gravel", }, + { "","","" }, + { "", "default:gravel", "default:gravel" }, + } +}) + +minetest.register_craft({ + output = "moreblocks:gravel_slope_3a 18", + recipe = { + { "","","" }, + { "","","", }, + { "default:gravel", "default:gravel", "default:gravel" }, + } +}) + +minetest.register_craft({ + output = "moreblocks:gravel_slope_3b 8", + recipe = { + { "","","" }, + { "","","default:gravel", }, + { "default:gravel", "default:gravel", "default:gravel" }, + } +}) + +minetest.register_craft({ + output = "moreblocks:gravel_slope_3c 8", + recipe = { + { "","","default:gravel", }, + { "","default:gravel","" }, + { "default:gravel", "default:gravel", "default:gravel" }, + } +}) +-- End gravel slope + +-- Песок начало sand -- +minetest.register_craft({ + output = "moreblocks:sand_slope_2a 12", + recipe = { + { "","","" }, + { "","","", }, + { "", "default:sand", "default:sand" }, + } +}) + + +minetest.register_craft({ + output = "moreblocks:sand_slope_2b 4", + recipe = { + { "","","default:sand", }, + { "","","" }, + { "", "default:sand", "default:sand" }, + } +}) + + +minetest.register_craft({ + output = "moreblocks:sand_slope_3a 18", + recipe = { + { "","","" }, + { "","","", }, + { "default:sand", "default:sand", "default:sand" }, + } +}) + +minetest.register_craft({ + output = "moreblocks:sand_slope_3b 8", + recipe = { + { "","","" }, + { "","","default:sand", }, + { "default:sand", "default:sand", "default:sand" }, + } +}) + +minetest.register_craft({ + output = "moreblocks:sand_slope_3c 8", + recipe = { + { "","","default:sand", }, + { "","default:sand","" }, + { "default:sand", "default:sand", "default:sand" }, + } +}) +-- Хвойная земля +minetest.register_craft({ + output = "moreblocks:dirt_with_coniferous_litter_slope_2a 12", + recipe = { + { "","","" }, + { "","","", }, + { "", "default:dirt_with_coniferous_litter", "default:dirt_with_coniferous_litter" }, + } +}) + + +minetest.register_craft({ + output = "moreblocks:dirt_with_coniferous_litter_slope_2b 4", + recipe = { + { "","","default:dirt_with_coniferous_litter", }, + { "","","" }, + { "", "default:dirt_with_coniferous_litter", "default:dirt_with_coniferous_litter" }, + } +}) + + +minetest.register_craft({ + output = "moreblocks:dirt_with_coniferous_litter_slope_3a 18", + recipe = { + { "","","" }, + { "","","", }, + { "default:dirt_with_coniferous_litter", "default:dirt_with_coniferous_litter", "default:dirt_with_coniferous_litter" }, + } +}) + +minetest.register_craft({ + output = "moreblocks:dirt_with_coniferous_litter_slope_3b 8", + recipe = { + { "","","" }, + { "","","default:dirt_with_coniferous_litter", }, + { "default:dirt_with_coniferous_litter", "default:dirt_with_coniferous_litter", "default:dirt_with_coniferous_litter" }, + } +}) + +minetest.register_craft({ + output = "moreblocks:dirt_with_coniferous_litter_slope_3c 8", + recipe = { + { "","","default:dirt_with_coniferous_litter", }, + { "","default:dirt_with_coniferous_litter","" }, + { "default:dirt_with_coniferous_litter", "default:dirt_with_coniferous_litter", "default:dirt_with_coniferous_litter" }, + } +}) +-- Песок конец sand ---- Песок начало sand -- +minetest.register_craft({ + output = "moreblocks:sand_slope_2a 12", + recipe = { + { "","","" }, + { "","","", }, + { "", "default:sand", "default:sand" }, + } +}) + + +minetest.register_craft({ + output = "moreblocks:sand_slope_2b 4", + recipe = { + { "","","default:sand", }, + { "","","" }, + { "", "default:sand", "default:sand" }, + } +}) + + +minetest.register_craft({ + output = "moreblocks:sand_slope_3a 18", + recipe = { + { "","","" }, + { "","","", }, + { "default:sand", "default:sand", "default:sand" }, + } +}) + +minetest.register_craft({ + output = "moreblocks:sand_slope_3b 8", + recipe = { + { "","","" }, + { "","","default:sand", }, + { "default:sand", "default:sand", "default:sand" }, + } +}) + +minetest.register_craft({ + output = "moreblocks:sand_slope_3c 8", + recipe = { + { "","","default:sand", }, + { "","default:sand","" }, + { "default:sand", "default:sand", "default:sand" }, + } +}) +-- Хвойная земля +minetest.register_craft({ + output = "moreblocks:dirt_with_coniferous_litter_slope_2a 12", + recipe = { + { "","","" }, + { "","","", }, + { "", "default:dirt_with_coniferous_litter", "default:dirt_with_coniferous_litter" }, + } +}) + +minetest.register_craft({ + output = "moreblocks:dirt_with_coniferous_litter_slope_2b 4", + recipe = { + { "","","default:dirt_with_coniferous_litter", }, + { "","","" }, + { "", "default:dirt_with_coniferous_litter", "default:dirt_with_coniferous_litter" }, + } +}) + + +minetest.register_craft({ + output = "moreblocks:dirt_with_coniferous_litter_slope_3a 18", + recipe = { + { "","","" }, + { "","","", }, + { "default:dirt_with_coniferous_litter", "default:dirt_with_coniferous_litter", "default:dirt_with_coniferous_litter" }, + } +}) + +minetest.register_craft({ + output = "moreblocks:dirt_with_coniferous_litter_slope_3b 8", + recipe = { + { "","","" }, + { "","","default:dirt_with_coniferous_litter", }, + { "default:dirt_with_coniferous_litter", "default:dirt_with_coniferous_litter", "default:dirt_with_coniferous_litter" }, + } +}) + +minetest.register_craft({ + output = "moreblocks:dirt_with_coniferous_litter_slope_3c 8", + recipe = { + { "","","default:dirt_with_coniferous_litter", }, + { "","default:dirt_with_coniferous_litter","" }, + { "default:dirt_with_coniferous_litter", "default:dirt_with_coniferous_litter", "default:dirt_with_coniferous_litter" }, + } +}) +-- Песок конец sand -- + diff --git a/models/moreblocks_slope_third.obj b/models/moreblocks_slope_third.obj new file mode 100644 index 0000000..b7b7631 --- /dev/null +++ b/models/moreblocks_slope_third.obj @@ -0,0 +1,56 @@ +g top +v 0.500000 -0.1667 0.500000 +v -0.500000 -0.1667 0.500000 +v -0.500000 -0.500000 -0.500000 +v 0.500000 -0.500000 -0.500000 +vt 1.0000 1.0000 +vt 0.0000 1.0000 +vt 0.0000 0.0000 +vt 1.0000 0.0000 +vn 0.0000 0.8944 -0.4472 +s off +f 2/1/1 1/2/1 4/3/1 3/4/1 +g bottom +v -0.500000 -0.500000 0.500000 +v 0.500000 -0.500000 0.500000 +v -0.500000 -0.500000 -0.500000 +v 0.500000 -0.500000 -0.500000 +vt 0.0000 0.0000 +vt 1.0000 0.0000 +vt 1.0000 1.0000 +vt 0.0000 1.0000 +vn 0.0000 -1.0000 -0.0000 +s off +f 6/5/2 5/6/2 7/7/2 8/8/2 +g right +v -0.500000 -0.1667 0.500000 +v -0.500000 -0.500000 0.500000 +v -0.500000 -0.500000 -0.500000 +vt 1.0000 0.5000 +vt 0.0000 0.0000 +vt 1.0000 0.0000 +vn -1.0000 0.0000 0.0000 +s off +f 9/9/3 11/10/3 10/11/3 +g left +v 0.500000 -0.1667 0.500000 +v 0.500000 -0.500000 0.500000 +v 0.500000 -0.500000 -0.500000 +vt 0.0000 0.5000 +vt 0.0000 0.0000 +vt 1.0000 0.0000 +vn 1.0000 0.0000 0.0000 +s off +f 12/12/4 13/13/4 14/14/4 +g back +v 0.500000 -0.1667 0.500000 +v -0.500000 -0.1667 0.500000 +v -0.500000 -0.500000 0.500000 +v 0.500000 -0.500000 0.500000 +vt 1.0000 0.5000 +vt 0.0000 0.5000 +vt 0.0000 0.0000 +vt 1.0000 0.0000 +vn 0.0000 -0.0000 1.0000 +s off +f 15/15/5 16/16/5 17/17/5 18/18/5 diff --git a/models/moreblocks_slope_third_raised.obj b/models/moreblocks_slope_third_raised.obj new file mode 100644 index 0000000..3aa4a85 --- /dev/null +++ b/models/moreblocks_slope_third_raised.obj @@ -0,0 +1,72 @@ +g top +v -0.500000 0.166666 0.500000 +v -0.500000 -0.166666 -0.500000 +v 0.500000 -0.166666 -0.500000 +v 0.500000 0.166666 0.500000 +vt 1.0000 0.0000 +vt 1.0000 1.0000 +vt 0.0000 1.0000 +vt 0.0000 0.0000 +vn 0.0000 0.8944 -0.4472 +s off +f 2/1/1 1/2/1 4/3/1 3/4/1 +g bottom +v -0.500000 -0.500000 -0.500000 +v -0.500000 -0.500000 0.500000 +v 0.500000 -0.500000 -0.500000 +v 0.500000 -0.500000 0.500000 +vt 1.0000 0.0000 +vt 1.0000 1.0000 +vt 0.0000 1.0000 +vt 0.0000 0.0000 +vn 0.0000 -1.0000 -0.0000 +s off +f 6/5/2 5/6/2 7/7/2 8/8/2 +g right +v -0.500000 0.166666 0.500000 +v -0.500000 -0.166666 -0.500000 +v -0.500000 -0.500000 -0.500000 +v -0.500000 -0.500000 0.500000 +vt 1.0000 1.0000 +vt 0.0000 0.5000 +vt 0.0000 0.0000 +vt 1.0000 0.0000 +vn -1.0000 0.0000 0.0000 +s off +f 9/9/3 10/10/3 11/11/3 12/12/3 +g left +v 0.500000 -0.166666 -0.500000 +v 0.500000 -0.500000 -0.500000 +v 0.500000 0.166666 0.500000 +v 0.500000 -0.500000 0.500000 +vt 1.0000 0.5000 +vt 0.0000 1.0000 +vt 0.0000 0.0000 +vt 1.0000 0.0000 +vn 1.0000 0.0000 0.0000 +s off +f 13/13/4 15/14/4 16/15/4 14/16/4 +g back +v -0.500000 0.166666 0.500000 +v -0.500000 -0.500000 0.500000 +v 0.500000 0.166666 0.500000 +v 0.500000 -0.500000 0.500000 +vt 1.0000 1.0000 +vt 0.0000 1.0000 +vt 0.0000 0.0000 +vt 1.0000 0.0000 +vn 0.0000 -0.0000 1.0000 +s off +f 19/17/5 17/18/5 18/19/5 20/20/5 +g front +v -0.500000 -0.166666 -0.500000 +v -0.500000 -0.500000 -0.500000 +v 0.500000 -0.166666 -0.500000 +v 0.500000 -0.500000 -0.500000 +vt 1.0000 0.5000 +vt 0.0000 0.5000 +vt 0.0000 0.0000 +vt 1.0000 0.0000 +vn 0.0000 0.0000 -1.0000 +s off +f 21/21/6 23/22/6 24/23/6 22/24/6 diff --git a/models/moreblocks_slope_third_top.obj b/models/moreblocks_slope_third_top.obj new file mode 100644 index 0000000..e9dc139 --- /dev/null +++ b/models/moreblocks_slope_third_top.obj @@ -0,0 +1,72 @@ +g top +v -0.500000 0.500000 0.500000 +v -0.500000 0.166666 -0.500000 +v 0.500000 0.166666 -0.500000 +v 0.500000 0.500000 0.500000 +vt 1.0000 0.0000 +vt 1.0000 1.0000 +vt 0.0000 1.0000 +vt 0.0000 0.0000 +vn 0.0000 0.8944 -0.4472 +s off +f 2/1/1 1/2/1 4/3/1 3/4/1 +g bottom +v -0.500000 -0.500000 -0.500000 +v -0.500000 -0.500000 0.500000 +v 0.500000 -0.500000 -0.500000 +v 0.500000 -0.500000 0.500000 +vt 1.0000 0.0000 +vt 1.0000 1.0000 +vt 0.0000 1.0000 +vt 0.0000 0.0000 +vn 0.0000 -1.0000 -0.0000 +s off +f 6/5/2 5/6/2 7/7/2 8/8/2 +g right +v -0.500000 0.500000 0.500000 +v -0.500000 0.166666 -0.500000 +v -0.500000 -0.500000 -0.500000 +v -0.500000 -0.500000 0.500000 +vt 1.0000 1.0000 +vt 0.0000 0.5000 +vt 0.0000 0.0000 +vt 1.0000 0.0000 +vn -1.0000 0.0000 0.0000 +s off +f 9/9/3 10/10/3 11/11/3 12/12/3 +g left +v 0.500000 0.166666 -0.500000 +v 0.500000 -0.500000 -0.500000 +v 0.500000 0.500000 0.500000 +v 0.500000 -0.500000 0.500000 +vt 1.0000 0.5000 +vt 0.0000 1.0000 +vt 0.0000 0.0000 +vt 1.0000 0.0000 +vn 1.0000 0.0000 0.0000 +s off +f 13/13/4 15/14/4 16/15/4 14/16/4 +g back +v -0.500000 0.500000 0.500000 +v -0.500000 -0.500000 0.500000 +v 0.500000 0.500000 0.500000 +v 0.500000 -0.500000 0.500000 +vt 1.0000 1.0000 +vt 0.0000 1.0000 +vt 0.0000 0.0000 +vt 1.0000 0.0000 +vn 0.0000 -0.0000 1.0000 +s off +f 19/17/5 17/18/5 18/19/5 20/20/5 +g front +v -0.500000 0.166666 -0.500000 +v -0.500000 -0.500000 -0.500000 +v 0.500000 0.166666 -0.500000 +v 0.500000 -0.500000 -0.500000 +vt 1.0000 0.5000 +vt 0.0000 0.5000 +vt 0.0000 0.0000 +vt 1.0000 0.0000 +vn 0.0000 0.0000 -1.0000 +s off +f 21/21/6 23/22/6 24/23/6 22/24/6 diff --git a/nodes.lua b/nodes.lua index e41318b..ec1a650 100644 --- a/nodes.lua +++ b/nodes.lua @@ -15,7 +15,7 @@ local sound_leaves = moreblocks.node_sound_leaves_defaults() -- Don't break on 0.4.14 and earlier. local sound_metal = (moreblocks.node_sound_metal_defaults - and moreblocks.node_sound_metal_defaults() or sound_stone) + and moreblocks.node_sound_metal_defaults() or sound_stone) local function tile_tiles(name) local tex = "moreblocks_" ..name.. ".png" @@ -37,6 +37,72 @@ local function wood_tile_replace(itemstack, placer, pointed_thing) end local deprecated = (" ("..S('Deprecated')..")") + +-- start gravel add part 1 +local sound_gravel = default.node_sound_gravel_defaults() + +local box_slope = { + type = "fixed", + fixed = { + {-0.5, -0.5, -0.5, 0.5, -0.25, 0.5}, + {-0.5, -0.25, -0.25, 0.5, 0, 0.5}, + {-0.5, 0, 0, 0.5, 0.25, 0.5}, + {-0.5, 0.25, 0.25, 0.5, 0.5, 0.5} + } +} + +local box_slope_half = { + type = "fixed", + fixed = { + {-0.5, -0.5, -0.5, 0.5, -0.375, 0.5}, + {-0.5, -0.375, -0.25, 0.5, -0.25, 0.5}, + {-0.5, -0.25, 0, 0.5, -0.125, 0.5}, + {-0.5, -0.125, 0.25, 0.5, 0, 0.5}, + } +} + +local box_slope_half_raised = { + type = "fixed", + fixed = { + {-0.5, -0.5, -0.5, 0.5, 0.125, 0.5}, + {-0.5, 0.125, -0.25, 0.5, 0.25, 0.5}, + {-0.5, 0.25, 0, 0.5, 0.375, 0.5}, + {-0.5, 0.375, 0.25, 0.5, 0.5, 0.5}, + } +} + + +local box_slope_third = { + type = "fixed", + fixed = { + {-0.5, -0.5, -0.5, 0.5, -0.417 , 0.5}, + {-0.5, -0.417, -0.25, 0.5, -0.333 , 0.5}, + {-0.5, -0.333, 0, 0.5, -0.250 , 0.5}, + {-0.5, -0.250, 0.25, 0.5, -0.167, 0.5}, + } +} + +local box_slope_third_raised = { + type = "fixed", + fixed = { + {-0.5, -0.5, -0.5, 0.5, -0.083 , 0.5}, + {-0.5, -0.083, -0.25, 0.5, 0 , 0.5}, + {-0.5, 0 , 0, 0.5, 0.083 , 0.5}, + {-0.5, 0.083, 0.25, 0.5, 0.167, 0.5}, + } +} + +local box_slope_third_top = { + type = "fixed", + fixed = { + {-0.5, -0.5, -0.5, 0.5, 0.250, 0.5}, + {-0.5, 0.250, -0.25, 0.5, 0.333, 0.5}, + {-0.5, 0.333, 0, 0.5, 0.417, 0.5}, + {-0.5, 0.417, 0.25, 0.5, 0.5 , 0.5}, + } +} +-- end gravel add part 1 + local nodes = { ["wood_tile"] = { description = S("Wooden Tile"), @@ -44,21 +110,21 @@ local nodes = { paramtype2 = "facedir", place_param2 = 0, tiles = {"default_wood.png^moreblocks_wood_tile.png", - "default_wood.png^moreblocks_wood_tile.png", - "default_wood.png^moreblocks_wood_tile.png", - "default_wood.png^moreblocks_wood_tile.png", - "default_wood.png^moreblocks_wood_tile.png^[transformR90", - "default_wood.png^moreblocks_wood_tile.png^[transformR90"}, + "default_wood.png^moreblocks_wood_tile.png", + "default_wood.png^moreblocks_wood_tile.png", + "default_wood.png^moreblocks_wood_tile.png", + "default_wood.png^moreblocks_wood_tile.png^[transformR90", + "default_wood.png^moreblocks_wood_tile.png^[transformR90"}, sounds = sound_wood, }, ["wood_tile_flipped"] = { description = S("Wooden Tile") .. deprecated, tiles = {"default_wood.png^moreblocks_wood_tile.png^[transformR90", - "default_wood.png^moreblocks_wood_tile.png^[transformR90", - "default_wood.png^moreblocks_wood_tile.png^[transformR90", - "default_wood.png^moreblocks_wood_tile.png^[transformR90", - "default_wood.png^moreblocks_wood_tile.png^[transformR180", - "default_wood.png^moreblocks_wood_tile.png^[transformR180"}, + "default_wood.png^moreblocks_wood_tile.png^[transformR90", + "default_wood.png^moreblocks_wood_tile.png^[transformR90", + "default_wood.png^moreblocks_wood_tile.png^[transformR90", + "default_wood.png^moreblocks_wood_tile.png^[transformR180", + "default_wood.png^moreblocks_wood_tile.png^[transformR180"}, no_stairs = true, on_place = wood_tile_replace }, @@ -137,7 +203,7 @@ local nodes = { paramtype2 = "facedir", place_param2 = 0, tiles = {"moreblocks_split_stone_tile_top.png", - "moreblocks_split_stone_tile.png"}, + "moreblocks_split_stone_tile.png"}, groups = {stone = 1, cracky = 3}, sounds = sound_stone, }, @@ -215,18 +281,18 @@ local nodes = { description = S("Cactus Checker"), groups = {stone = 1, cracky = 3}, tiles = {"default_stone.png^moreblocks_cactus_checker.png", - "default_stone.png^moreblocks_cactus_checker.png", - "default_stone.png^moreblocks_cactus_checker.png", - "default_stone.png^moreblocks_cactus_checker.png", - "default_stone.png^moreblocks_cactus_checker.png^[transformR90", - "default_stone.png^moreblocks_cactus_checker.png^[transformR90"}, + "default_stone.png^moreblocks_cactus_checker.png", + "default_stone.png^moreblocks_cactus_checker.png", + "default_stone.png^moreblocks_cactus_checker.png", + "default_stone.png^moreblocks_cactus_checker.png^[transformR90", + "default_stone.png^moreblocks_cactus_checker.png^[transformR90"}, sounds = sound_stone, }, ["empty_shelf"] = { description = S("Empty Shelf"), paramtype2 = "facedir", tiles = {"default_wood.png", "default_wood.png", "default_wood.png", - "default_wood.png", "moreblocks_empty_shelf.png", "moreblocks_empty_shelf.png"}, + "default_wood.png", "moreblocks_empty_shelf.png", "moreblocks_empty_shelf.png"}, groups = {choppy = 3, oddly_breakable_by_hand = 2, flammable = 3}, sounds = sound_wood, furnace_burntime = 15, @@ -245,22 +311,22 @@ local nodes = { ["coal_checker"] = { description = S("Coal Checker"), tiles = {"default_stone.png^moreblocks_coal_checker.png", - "default_stone.png^moreblocks_coal_checker.png", - "default_stone.png^moreblocks_coal_checker.png", - "default_stone.png^moreblocks_coal_checker.png", - "default_stone.png^moreblocks_coal_checker.png^[transformR90", - "default_stone.png^moreblocks_coal_checker.png^[transformR90"}, + "default_stone.png^moreblocks_coal_checker.png", + "default_stone.png^moreblocks_coal_checker.png", + "default_stone.png^moreblocks_coal_checker.png", + "default_stone.png^moreblocks_coal_checker.png^[transformR90", + "default_stone.png^moreblocks_coal_checker.png^[transformR90"}, groups = {stone = 1, cracky = 3}, sounds = sound_stone, }, ["iron_checker"] = { description = S("Iron Checker"), tiles = {"default_stone.png^moreblocks_iron_checker.png", - "default_stone.png^moreblocks_iron_checker.png", - "default_stone.png^moreblocks_iron_checker.png", - "default_stone.png^moreblocks_iron_checker.png", - "default_stone.png^moreblocks_iron_checker.png^[transformR90", - "default_stone.png^moreblocks_iron_checker.png^[transformR90"}, + "default_stone.png^moreblocks_iron_checker.png", + "default_stone.png^moreblocks_iron_checker.png", + "default_stone.png^moreblocks_iron_checker.png", + "default_stone.png^moreblocks_iron_checker.png^[transformR90", + "default_stone.png^moreblocks_iron_checker.png^[transformR90"}, groups = {stone = 1, cracky = 3}, sounds = sound_stone, }, @@ -491,6 +557,385 @@ local nodes = { groups = {cracky = 1, level = 2}, sounds = sound_metal, }, + ["gravel_stonebrick"] = { + description = S("Gravel on Stonebrick"), + tiles = {"default_gravel.png", + "default_stone_brick.png", + "default_gravel.png^[lowpart:50:default_stone_brick.png", + "default_gravel.png^[lowpart:50:default_stone_brick.png", + "default_gravel.png^[lowpart:50:default_stone_brick.png", + "default_gravel.png^[lowpart:50:default_stone_brick.png"}, + no_stairs = true; + groups = {cracky = 3}, + sounds = sound_gravel, + }, + -- start gravel add part 2 + ["gravel_slope"] = { + description = S("Gravel Slope"), + tiles = { "default_gravel.png" } , + no_stairs = true, + groups = {crumbly = 2, falling_node = 1, not_blocking_trains = 1}, + sounds = sound_gravel, + drawtype = "mesh", + mesh = "moreblocks_slope.obj", + collision_box = box_slope, + selection_box = box_slope, + sunlight_propagates = false, + light_source = 0, + paramtype = "light", + paramtype2 = "facedir", -- neu + on_rotate = screwdriver.rotate_simple , -- neu + is_ground_content = false, --neu + }, + + ["gravel_slope_2a"] = { + description = S("Gravel Slope 2a"), + tiles = { "default_gravel.png" } , + no_stairs = true, + groups = {crumbly = 2, falling_node = 1, not_blocking_trains = 1}, + sounds = sound_gravel, + drawtype = "mesh", + mesh = "moreblocks_slope_half.obj", + collision_box = box_slope_half, + selection_box = box_slope_half, + sunlight_propagates = false, + light_source = 0, + paramtype = "light", + paramtype2 = "facedir", -- neu + on_rotate = screwdriver.rotate_simple , -- neu + is_ground_content = false, --neu + }, + + ["gravel_slope_2b"] = { + description = S("Gravel Slope 2b"), + tiles = { "default_gravel.png" } , + no_stairs = true, + groups = {crumbly = 2, falling_node = 1, not_blocking_trains = 1}, + sounds = sound_gravel, + drawtype = "mesh", + mesh = "moreblocks_slope_half_raised.obj", + collision_box = box_slope_half_raised, + selection_box = box_slope_half_raised, + sunlight_propagates = false, + light_source = 0, + paramtype = "light", + paramtype2 = "facedir", -- neu + on_rotate = screwdriver.rotate_simple , -- neu + is_ground_content = false, --neu + }, + + + ["gravel_slope_3a"] = { + description = S("Gravel Slope 3a"), + tiles = { "default_gravel.png" } , + no_stairs = true, + groups = {crumbly = 2, falling_node = 1, not_blocking_trains = 1}, + sounds = sound_gravel, + drawtype = "mesh", + mesh = "moreblocks_slope_third.obj", + collision_box = box_slope_third, + selection_box = box_slope_third, + sunlight_propagates = false, + light_source = 0, + paramtype = "light", + paramtype2 = "facedir", -- neu + on_rotate = screwdriver.rotate_simple , -- neu + is_ground_content = false, --neu + }, + + ["gravel_slope_3b"] = { + description = S("Gravel Slope 3b"), + tiles = { "default_gravel.png" } , + no_stairs = true, + groups = {crumbly = 2, falling_node = 1, not_blocking_trains = 1}, + sounds = sound_gravel, + drawtype = "mesh", + mesh = "moreblocks_slope_third_raised.obj", + collision_box = box_slope_third_raised, + selection_box = box_slope_third_raised, + sunlight_propagates = false, + light_source = 0, + paramtype = "light", + paramtype2 = "facedir", -- neu + on_rotate = screwdriver.rotate_simple , -- neu + is_ground_content = false, --neu + }, + + ["gravel_slope_3c"] = { + description = S("Gravel Slope 3c"), + tiles = { "default_gravel.png" } , + no_stairs = true, + groups = {crumbly = 2, falling_node = 1, not_blocking_trains = 1}, + sounds = sound_gravel, + drawtype = "mesh", + mesh = "moreblocks_slope_third_top.obj", + collision_box = box_slope_third_top, + selection_box = box_slope_third_top, + sunlight_propagates = false, + light_source = 0, + paramtype = "light", + paramtype2 = "facedir", -- neu + on_rotate = screwdriver.rotate_simple , -- neu + is_ground_content = false, --neu + }, + -- end gravel add part 2 + ---- Песок начало sand --- + + ["sand_slope"] = { + description = S("Sand Slope"), + tiles = { "default_sand.png" } , + no_stairs = true, + groups = {crumbly = 2, falling_node = 1, not_blocking_trains = 1}, + sounds = sound_sand, + drawtype = "mesh", + mesh = "moreblocks_slope.obj", + collision_box = box_slope, + selection_box = box_slope, + sunlight_propagates = false, + light_source = 0, + paramtype = "light", + paramtype2 = "facedir", -- neu + on_rotate = screwdriver.rotate_simple , -- neu + is_ground_content = false, --neu + }, + + ["sand_slope_2a"] = { + description = S("Sand Slope 2a"), + tiles = { "default_sand.png" } , + no_stairs = true, + groups = {crumbly = 2, falling_node = 1, not_blocking_trains = 1}, + sounds = sound_sand, + drawtype = "mesh", + mesh = "moreblocks_slope_half.obj", + collision_box = box_slope_half, + selection_box = box_slope_half, + sunlight_propagates = false, + light_source = 0, + paramtype = "light", + paramtype2 = "facedir", -- neu + on_rotate = screwdriver.rotate_simple , -- neu + is_ground_content = false, --neu + }, + + ["sand_slope_2b"] = { + description = S("Sand Slope 2b"), + tiles = { "default_sand.png" } , + no_stairs = true, + groups = {crumbly = 2, falling_node = 1, not_blocking_trains = 1}, + sounds = sound_sand, + drawtype = "mesh", + mesh = "moreblocks_slope_half_raised.obj", + collision_box = box_slope_half_raised, + selection_box = box_slope_half_raised, + sunlight_propagates = false, + light_source = 0, + paramtype = "light", + paramtype2 = "facedir", -- neu + on_rotate = screwdriver.rotate_simple , -- neu + is_ground_content = false, --neu + }, + + + ["sand_slope_3a"] = { + description = S("Sand Slope 3a"), + tiles = { "default_sand.png" } , + no_stairs = true, + groups = {crumbly = 2, falling_node = 1, not_blocking_trains = 1}, + sounds = sound_sand, + drawtype = "mesh", + mesh = "moreblocks_slope_third.obj", + collision_box = box_slope_third, + selection_box = box_slope_third, + sunlight_propagates = false, + light_source = 0, + paramtype = "light", + paramtype2 = "facedir", -- neu + on_rotate = screwdriver.rotate_simple , -- neu + is_ground_content = false, --neu + }, + + ["sand_slope_3b"] = { + description = S("Sand Slope 3b"), + tiles = { "default_sand.png" } , + no_stairs = true, + groups = {crumbly = 2, falling_node = 1, not_blocking_trains = 1}, + sounds = sound_sand, + drawtype = "mesh", + mesh = "moreblocks_slope_third_raised.obj", + collision_box = box_slope_third_raised, + selection_box = box_slope_third_raised, + sunlight_propagates = false, + light_source = 0, + paramtype = "light", + paramtype2 = "facedir", -- neu + on_rotate = screwdriver.rotate_simple , -- neu + is_ground_content = false, --neu + }, + + ["sand_slope_3c"] = { + description = S("Sand Slope 3c"), + tiles = { "default_sand.png" } , + no_stairs = true, + groups = {crumbly = 2, falling_node = 1, not_blocking_trains = 1}, + sounds = sound_sand, + drawtype = "mesh", + mesh = "moreblocks_slope_third_top.obj", + collision_box = box_slope_third_top, + selection_box = box_slope_third_top, + sunlight_propagates = false, + light_source = 0, + paramtype = "light", + paramtype2 = "facedir", -- neu + on_rotate = screwdriver.rotate_simple , -- neu + is_ground_content = false, --neu + }, + + --- Хвойная земля + + ["dirt_with_coniferous_litter_slope"] = { + description = S("Dirt with coniferous litter Slope"), + + -- + tiles = {"default_coniferous_litter.png", + "default_dirt.png", + + "default_coniferous_litter.png^[lowpart:65:default_dirt.png"}, + -- + + --tiles = { "default_coniferous_litter.png" } , + no_stairs = true, + groups = {crumbly = 2, falling_node = 1, not_blocking_trains = 1}, + --sounds = sound_dirt_with_coniferous_litter, + sounds = default.node_sound_dirt_defaults({ + footstep = {name = "default_grass_footstep", gain = 0.4}, + }), + drawtype = "mesh", + mesh = "moreblocks_slope.obj", + collision_box = box_slope, + selection_box = box_slope, + sunlight_propagates = false, + light_source = 0, + paramtype = "light", + paramtype2 = "facedir", -- neu + on_rotate = screwdriver.rotate_simple , -- neu + is_ground_content = false, --neu + }, + + ["dirt_with_coniferous_litter_slope_2a"] = { + description = S("Dirt with coniferous litter Slope 2a"), + --tiles = { "default_coniferous_litter.png" } , + tiles = {"default_coniferous_litter.png", + "default_dirt.png", + + "default_coniferous_litter.png^[lowpart:65:default_dirt.png"}, + no_stairs = true, + groups = {crumbly = 2, falling_node = 1, not_blocking_trains = 1}, + sounds = default.node_sound_dirt_defaults({ + footstep = {name = "default_grass_footstep", gain = 0.4}, + }), + drawtype = "mesh", + mesh = "moreblocks_slope_half.obj", + collision_box = box_slope_half, + selection_box = box_slope_half, + sunlight_propagates = false, + light_source = 0, + paramtype = "light", + paramtype2 = "facedir", -- neu + on_rotate = screwdriver.rotate_simple , -- neu + is_ground_content = false, --neu + }, + + ["dirt_with_coniferous_litter_slope_2b"] = { + description = S("Dirt with coniferous litter Slope 2b"), + tiles = {"default_coniferous_litter.png", + "default_dirt.png", + + "default_coniferous_litter.png^[lowpart:65:default_dirt.png"}, + no_stairs = true, + groups = {crumbly = 2, falling_node = 1, not_blocking_trains = 1}, + sounds = default.node_sound_dirt_defaults({ + footstep = {name = "default_grass_footstep", gain = 0.4}, + }), + drawtype = "mesh", + mesh = "moreblocks_slope_half_raised.obj", + collision_box = box_slope_half_raised, + selection_box = box_slope_half_raised, + sunlight_propagates = false, + light_source = 0, + paramtype = "light", + paramtype2 = "facedir", -- neu + on_rotate = screwdriver.rotate_simple , -- neu + is_ground_content = false, --neu + }, + + + ["dirt_with_coniferous_litter_slope_3a"] = { + description = S("Dirt with coniferous litter Slope 3a"), + tiles = {"default_coniferous_litter.png", + "default_dirt.png", + + "default_coniferous_litter.png^[lowpart:60:default_dirt.png"}, + no_stairs = true, + groups = {crumbly = 2, falling_node = 1, not_blocking_trains = 1}, + sounds = default.node_sound_dirt_defaults({ + footstep = {name = "default_grass_footstep", gain = 0.4}, + }), + drawtype = "mesh", + mesh = "moreblocks_slope_third.obj", + collision_box = box_slope_third, + selection_box = box_slope_third, + sunlight_propagates = false, + light_source = 0, + paramtype = "light", + paramtype2 = "facedir", -- neu + on_rotate = screwdriver.rotate_simple , -- neu + is_ground_content = false, --neu + }, + + ["dirt_with_coniferous_litter_slope_3b"] = { + description = S("Dirt with coniferous litter Slope 3b"), + tiles = {"default_coniferous_litter.png", + "default_dirt.png"}, + no_stairs = true, + groups = {crumbly = 2, falling_node = 1, not_blocking_trains = 1}, + sounds = default.node_sound_dirt_defaults({ + footstep = {name = "default_grass_footstep", gain = 0.4}, + }), + drawtype = "mesh", + mesh = "moreblocks_slope_third_raised.obj", + collision_box = box_slope_third_raised, + selection_box = box_slope_third_raised, + sunlight_propagates = false, + light_source = 0, + paramtype = "light", + paramtype2 = "facedir", -- neu + on_rotate = screwdriver.rotate_simple , -- neu + is_ground_content = false, --neu + }, + + ["dirt_with_coniferous_litter_slope_3c"] = { + description = S("Dirt with coniferous litter Slope 3c"), + tiles = {"default_coniferous_litter.png", + "default_dirt.png", + + "default_coniferous_litter.png^[lowpart:65:default_dirt.png"}, + no_stairs = true, + groups = {crumbly = 2, falling_node = 1, not_blocking_trains = 1}, + sounds = default.node_sound_dirt_defaults({ + footstep = {name = "default_grass_footstep", gain = 0.4}, + }), + drawtype = "mesh", + mesh = "moreblocks_slope_third_top.obj", + collision_box = box_slope_third_top, + selection_box = box_slope_third_top, + sunlight_propagates = false, + light_source = 0, + paramtype = "light", + paramtype2 = "facedir", -- neu + on_rotate = screwdriver.rotate_simple , -- neu + is_ground_content = false, --neu + } + ---- Песок конец sand --- } for name, def in pairs(nodes) do @@ -504,7 +949,7 @@ for name, def in pairs(nodes) do -- Use the primary tile for all sides of cut glasslike nodes. -- This makes them easier to see if - #def_copy.tiles > 1 and + #def_copy.tiles > 1 and def_copy.drawtype and def_copy.drawtype == "glasslike_framed" or def_copy.drawtype == "glasslike_framed_optional" diff --git a/stairsplus/recipes.lua b/stairsplus/recipes.lua index c9aaa29..fc4ffd0 100644 --- a/stairsplus/recipes.lua +++ b/stairsplus/recipes.lua @@ -89,10 +89,11 @@ stairsplus.register_recipes = function(category, alternate, modname, subname, re minetest.register_alias(modname.. ":panel_" ..subname.. "_bottom", modname.. ":panel_" ..subname) elseif category == "slab" then if alternate == "" then - minetest.register_craft({ - output = modname .. ":slab_" .. subname .. " 6", - recipe = {{recipeitem, recipeitem, recipeitem}}, - }) + --отключение конфликтующего рецепта с модом stairs + --minetest.register_craft({ + -- output = modname .. ":slab_" .. subname .. " 6", + -- recipe = {{recipeitem, recipeitem, recipeitem}}, + --}) minetest.register_craft({ type = "shapeless", @@ -273,7 +274,7 @@ stairsplus.register_recipes = function(category, alternate, modname, subname, re type = "shapeless", output = recipeitem, recipe = {modname .. ":slope_" .. subname .. "_half", modname .. ":slope_" .. subname .. "_half", - modname .. ":slope_" .. subname .. "_half", modname .. ":slope_" .. subname .. "_half"}, + modname .. ":slope_" .. subname .. "_half", modname .. ":slope_" .. subname .. "_half"}, }) elseif alternate == "_outer" then minetest.register_craft({ @@ -316,7 +317,7 @@ stairsplus.register_recipes = function(category, alternate, modname, subname, re type = "shapeless", output = modname .. ":slope_" .. subname .. "_half_raised", recipe = {modname .. ":slope_" .. subname .. "_half", modname .. ":slope_" .. subname .. "_half", - modname .. ":slope_" .. subname .. "_half"}, + modname .. ":slope_" .. subname .. "_half"}, }) minetest.register_craft({