1
0
mirror of https://github.com/sys4-fr/server-nalc.git synced 2024-12-25 02:00:37 +01:00

[moreblocks] Updates

- Fix #302
- Add cherry tree/wood to the list of sawable items
This commit is contained in:
LeMagnesium 2015-10-11 16:16:22 +02:00
parent 11c8a7f060
commit 61822023cf
24 changed files with 587 additions and 349 deletions

View File

@ -12,6 +12,8 @@ minetest.register_alias("jungle_stick", "moreblocks:jungle_stick")
-- Wrong drops -- Wrong drops
-- //MFF(Mg|10/11/15)
-- Microblocks -- Microblocks
for _,i in pairs({"", "_1", "_2", "_4", "_12", "_14", "_15"}) do for _,i in pairs({"", "_1", "_2", "_4", "_12", "_14", "_15"}) do
minetest.register_alias("moreblocks:micro_clay_brick" .. i, "moreblocks:micro_brick" .. i) minetest.register_alias("moreblocks:micro_clay_brick" .. i, "moreblocks:micro_brick" .. i)

View File

@ -21,12 +21,14 @@ circular_saw.known_stairs = setmetatable({}, {
circular_saw.known_nodes = {} circular_saw.known_nodes = {}
-- How many microblocks does this shape at the output inventory cost: -- How many microblocks does this shape at the output inventory cost:
-- It may cause slight loss, but no gain.
circular_saw.cost_in_microblocks = { circular_saw.cost_in_microblocks = {
1, 1, 1, 1, 1, 1, 1, 2, 1, 1, 1, 1, 1, 1, 1, 2,
2, 3, 2, 4, 2, 4, 5, 6, 2, 3, 2, 4, 2, 4, 5, 6,
7, 1, 1, 2, 4, 6, 7, 8, 7, 1, 1, 2, 4, 6, 7, 8,
3, 1, 1, 2, 4, 4, 2, 7, 3, 1, 1, 2, 4, 4, 2, 6,
7, 2, 7, 6, 4, 6, 5, 4, 7, 3, 7, 7, 4, 8, 3, 2,
6, 2, 1, 3, 4,
} }
circular_saw.names = { circular_saw.names = {
@ -65,11 +67,16 @@ circular_saw.names = {
{"slope", "_inner"}, {"slope", "_inner"},
{"slope", "_inner_half"}, {"slope", "_inner_half"},
{"slope", "_inner_half_raised"}, {"slope", "_inner_half_raised"},
{"slope", "_inner_cut"},
{"slope", "_inner_cut_half"},
{"slope", "_inner_cut_half_raised"},
{"slope", "_outer"}, {"slope", "_outer"},
{"slope", "_outer_half"}, {"slope", "_outer_half"},
{"slope", "_outer_half_raised"}, {"slope", "_outer_half_raised"},
{"slope", "_outer_cut"}, {"slope", "_outer_cut"},
{"slope", "_outer_cut_half"}, {"slope", "_outer_cut_half"},
{"slope", "_outer_cut_half_raised"},
{"slope", "_cut"},
} }
function circular_saw:get_cost(inv, stackname) function circular_saw:get_cost(inv, stackname)
@ -91,7 +98,8 @@ function circular_saw:get_output_inv(modname, material, amount, max)
return list return list
end end
for i, t in ipairs(circular_saw.names) do for i = 1, #circular_saw.names do
local t = circular_saw.names[i]
local cost = circular_saw.cost_in_microblocks[i] local cost = circular_saw.cost_in_microblocks[i]
local balance = math.min(math.floor(amount/cost), max) local balance = math.min(math.floor(amount/cost), max)
pos = pos + 1 pos = pos + 1
@ -232,10 +240,18 @@ function circular_saw.allow_metadata_inventory_put(
-- Only accept certain blocks as input which are known to be craftable into stairs: -- Only accept certain blocks as input which are known to be craftable into stairs:
if listname == "input" then if listname == "input" then
if not inv:is_empty("input") and if not inv:is_empty("input") then
inv:get_stack("input", index):get_name() ~= stackname then if inv:get_stack("input", index):get_name() ~= stackname then
return 0 return 0
end end
end
if not inv:is_empty("micro") then
local microstackname = inv:get_stack("micro", 1):get_name():gsub("^.+:micro_", "", 1)
local cutstackname = stackname:gsub("^.+:", "", 1)
if microstackname ~= cutstackname then
return 0
end
end
for name, t in pairs(circular_saw.known_nodes) do for name, t in pairs(circular_saw.known_nodes) do
if name == stackname and inv:room_for_item("input", stack) then if name == stackname and inv:room_for_item("input", stack) then
return count return count
@ -294,7 +310,7 @@ gui_slots = "listcolors[#606060AA;#808080;#101010;#202020;#FFF]"
function circular_saw.on_construct(pos) function circular_saw.on_construct(pos)
local meta = minetest.get_meta(pos) local meta = minetest.get_meta(pos)
local fancy_inv = default.gui_bg..default.gui_bg_img..default.gui_slots local fancy_inv = default.gui_bg..default.gui_bg_img..default.gui_slots
meta:set_string("formspec", "size[11,9]"..fancy_inv.. meta:set_string("formspec", "size[11,10]"..fancy_inv..
"label[0,0;" ..S("Input\nmaterial").. "]" .. "label[0,0;" ..S("Input\nmaterial").. "]" ..
"list[current_name;input;1.5,0;1,1;]" .. "list[current_name;input;1.5,0;1,1;]" ..
"label[0,1;" ..S("Left-over").. "]" .. "label[0,1;" ..S("Left-over").. "]" ..
@ -303,8 +319,8 @@ function circular_saw.on_construct(pos)
"list[current_name;recycle;1.5,2;1,1;]" .. "list[current_name;recycle;1.5,2;1,1;]" ..
"field[0.3,3.5;1,1;max_offered;" ..S("Max").. ":;${max_offered}]" .. "field[0.3,3.5;1,1;max_offered;" ..S("Max").. ":;${max_offered}]" ..
"button[1,3.2;1,1;Set;" ..S("Set").. "]" .. "button[1,3.2;1,1;Set;" ..S("Set").. "]" ..
"list[current_name;output;2.8,0;8,5;]" .. "list[current_name;output;2.8,0;8,6;]" ..
"list[current_player;main;1.5,5.25;8,4;]") "list[current_player;main;1.5,6.25;8,4;]")
meta:set_int("anz", 0) -- No microblocks inside yet. meta:set_int("anz", 0) -- No microblocks inside yet.
meta:set_string("max_offered", 99) -- How many items of this kind are offered by default? meta:set_string("max_offered", 99) -- How many items of this kind are offered by default?
@ -314,7 +330,7 @@ function circular_saw.on_construct(pos)
inv:set_size("input", 1) -- Input slot for full blocks of material x. inv:set_size("input", 1) -- Input slot for full blocks of material x.
inv:set_size("micro", 1) -- Storage for 1-7 surplus microblocks. inv:set_size("micro", 1) -- Storage for 1-7 surplus microblocks.
inv:set_size("recycle", 1) -- Surplus partial blocks can be placed here. inv:set_size("recycle", 1) -- Surplus partial blocks can be placed here.
inv:set_size("output", 5*8) -- 5x8 versions of stair-parts of material x. inv:set_size("output", 6*8) -- 6x8 versions of stair-parts of material x.
circular_saw:reset(pos) circular_saw:reset(pos)
end end

View File

@ -44,6 +44,12 @@ minetest.register_craft({
recipe = {"default:junglegrass", "default:dirt"}, recipe = {"default:junglegrass", "default:dirt"},
}) })
minetest.register_craft({
output = "default:dirt_with_grass",
type = "shapeless",
recipe = {"default:mese", "default:dirt"},
})
minetest.register_craft({ minetest.register_craft({
output = "default:mossycobble", output = "default:mossycobble",
type = "shapeless", type = "shapeless",

19
mods/moreblocks/models/moreblocks_slope.obj Executable file → Normal file
View File

@ -1,6 +1,6 @@
# Blender v2.69 (sub 0) OBJ File: 'slope_test_slope_onetexture.blend' # Blender v2.72 (sub 0) OBJ File: ''
# www.blender.org # www.blender.org
mtllib slope_test_slope_onetexture.mtl mtllib moreblocks_slope.mtl
o Cube_Cube.002 o Cube_Cube.002
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
@ -12,10 +12,15 @@ vt 1.000000 1.000000
vt 0.000000 1.000000 vt 0.000000 1.000000
vt 0.000000 0.000000 vt 0.000000 0.000000
vt 1.000000 0.000000 vt 1.000000 0.000000
vn 0.000000 -0.000000 1.000000
vn 0.000000 -1.000000 -0.000000
vn -1.000000 0.000000 0.000000
vn 1.000000 0.000000 0.000000
vn 0.000000 0.707100 -0.707100
usemtl None usemtl None
s off s off
f 1/1 2/2 3/3 4/4 f 1/1/1 2/2/1 3/3/1 4/4/1
f 4/3 3/4 5/1 6/2 f 4/3/2 3/4/2 5/1/2 6/2/2
f 2/1 5/3 3/4 f 2/1/3 5/3/3 3/4/3
f 1/2 4/3 6/4 f 1/2/4 4/3/4 6/4/4
f 2/1 1/2 6/3 5/4 f 2/1/5 1/2/5 6/3/5 5/4/5

View File

@ -0,0 +1,33 @@
# Blender v2.72 (sub 0) OBJ File: ''
# www.blender.org
mtllib moreblocks_slope_cut.mtl
o moreblocks_slope_cut
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.000000 0.500000
v 0.500000 -0.500000 -0.500000
v 0.500000 0.000000 -0.500000
v -0.500000 -0.500000 -0.500000
vt 0.000000 0.000000
vt 1.000000 0.000000
vt 1.000000 1.000000
vt 0.000000 0.500000
vt 1.000000 0.500000
vt 0.000000 1.000000
vt 0.500000 0.000000
vt 0.500000 2.000000
vn 0.000000 -0.000000 1.000000
vn 1.000000 0.000000 0.000000
vn 0.000000 -1.000000 -0.000000
vn -0.408200 0.816500 -0.408200
vn 0.000000 0.000000 -1.000000
vn -1.000000 0.000000 0.000000
usemtl None
s off
f 1/1/1 2/2/1 3/3/1 4/4/1
f 2/1/2 5/2/2 6/5/2 3/6/2
f 2/3/3 1/6/3 7/1/3 5/2/3
f 7/7/4 4/3/4 3/8/4 6/6/4
f 5/1/5 7/2/5 6/4/5
f 7/1/6 1/2/6 4/5/6

19
mods/moreblocks/models/moreblocks_slope_half.obj Executable file → Normal file
View File

@ -1,6 +1,6 @@
# Blender v2.69 (sub 0) OBJ File: 'slope_test_slope_long_fronthalf_onetexture.blend' # Blender v2.72 (sub 0) OBJ File: ''
# www.blender.org # www.blender.org
mtllib slope_test_slope_long_fronthalf_onetexture.mtl mtllib moreblocks_slope_half.mtl
o Cube_Cube.002 o Cube_Cube.002
v 0.500000 -0.000000 0.500000 v 0.500000 -0.000000 0.500000
v -0.500000 -0.000000 0.500000 v -0.500000 -0.000000 0.500000
@ -14,10 +14,15 @@ vt 0.000000 0.000000
vt 1.000000 0.000000 vt 1.000000 0.000000
vt 1.000000 1.000000 vt 1.000000 1.000000
vt 0.000000 1.000000 vt 0.000000 1.000000
vn 0.000000 -0.000000 1.000000
vn 0.000000 -1.000000 -0.000000
vn -1.000000 0.000000 0.000000
vn 1.000000 0.000000 0.000000
vn 0.000000 0.894400 -0.447200
usemtl None usemtl None
s off s off
f 1/1 2/2 3/3 4/4 f 1/1/1 2/2/1 3/3/1 4/4/1
f 4/3 3/4 5/5 6/6 f 4/3/2 3/4/2 5/5/2 6/6/2
f 2/1 5/3 3/4 f 2/1/3 5/3/3 3/4/3
f 1/2 4/3 6/4 f 1/2/4 4/3/4 6/4/4
f 2/5 1/6 6/3 5/4 f 2/5/5 1/6/5 6/3/5 5/4/5

34
mods/moreblocks/models/moreblocks_slope_half_raised.obj Executable file → Normal file
View File

@ -1,26 +1,32 @@
# Blender v2.69 (sub 0) OBJ File: 'slope_test_slope_long_backhalf_onetexture.blend' # Blender v2.72 (sub 0) OBJ File: ''
# www.blender.org # www.blender.org
mtllib slope_test_slope_long_backhalf_onetexture.mtl mtllib moreblocks_slope_half_raised.mtl
o Cube o Cube.001
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
v -0.500000 0.500000 0.500000 v -0.500000 0.500000 0.500000
v -0.500000 0.000000 -0.500000 v -0.500000 0.000000 -0.500000
v -0.500000 -0.500000 -0.500000
v -0.500000 -0.500000 0.500000
v 0.500000 0.000000 -0.500000 v 0.500000 0.000000 -0.500000
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.000000 1.000000 vt 1.000000 1.000000
vt 0.000000 0.500000 vt 0.000000 0.500000
vt 0.000000 0.000000 vt 0.000000 0.000000
vt 1.000000 0.000000 vt 1.000000 0.000000
vt 1.000000 0.500000 vt 1.000000 0.500000
vt 0.000000 1.000000 vt 0.000000 1.000000
usemtl None vn -1.000000 0.000000 0.000000
vn 0.000000 0.000000 -1.000000
vn 1.000000 0.000000 0.000000
vn 0.000000 -0.000000 1.000000
vn 0.000000 -1.000000 -0.000000
vn 0.000000 0.894400 -0.447200
usemtl None.001
s off s off
f 5/1 6/2 2/3 1/4 f 1/1/1 2/2/1 3/3/1 4/4/1
f 6/5 7/2 3/3 2/4 f 2/5/2 5/2/2 6/3/2 3/4/2
f 7/5 8/6 4/3 3/4 f 5/5/3 7/6/3 8/3/3 6/4/3
f 8/1 5/6 1/3 4/4 f 7/1/4 1/6/4 4/3/4 8/4/4
f 1/4 2/1 3/6 4/3 f 4/4/5 3/1/5 6/6/5 8/3/5
f 8/6 7/3 6/4 5/1 f 2/4/6 1/1/6 7/6/6 5/3/6

39
mods/moreblocks/models/moreblocks_slope_inner.obj Executable file → Normal file
View File

@ -1,26 +1,35 @@
# Blender v2.69 (sub 0) OBJ File: 'slope_test_icorner_onetexture.blend' # Blender v2.72 (sub 0) OBJ File: ''
# www.blender.org # www.blender.org
mtllib moreblocks_slope_inner.mtl
o Cube_Cube.000 o Cube_Cube.000
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
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
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
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
v -0.500000 -0.500000 -0.500000
v 0.500000 -0.500000 0.500000
vt 1.000000 1.000000 vt 1.000000 1.000000
vt 0.000000 1.000000 vt 0.000000 1.000000
vt 0.000000 0.000000 vt 0.000000 0.000000
vt 1.000000 0.000000 vt 1.000000 0.000000
vn 1.000000 0.000000 0.000000
vn -1.000000 0.000000 0.000000
vn 0.000000 0.707100 -0.707100
vn 0.000000 0.000000 -1.000000
vn 0.000000 -1.000000 -0.000000
vn 0.000000 -0.000000 1.000000
vn -0.707100 0.707100 0.000000
usemtl None
s off s off
f 6/1 1/2 7/3 8/4 f 1/1/1 2/2/1 3/3/1 4/4/1
f 2/1 5/3 3/4 f 5/1/2 6/3/2 7/4/2
f 2/1 1/2 5/4 f 5/1/3 2/2/3 6/4/3
f 6/2 8/3 9/4 f 1/2/4 4/3/4 8/4/4
f 9/1 8/2 7/3 3/4 f 8/1/5 4/2/5 3/3/5 7/4/5
f 3/3 7/4 1/1 2/2 f 7/3/6 3/4/6 2/1/6 5/2/6
f 1/1 6/2 9/3 f 2/1/7 1/2/7 8/3/7
l 1 4 l 7 9
l 3 4 l 2 9

View File

@ -0,0 +1,32 @@
# Blender v2.72 (sub 0) OBJ File: ''
# www.blender.org
mtllib moreblocks_slope_inner_cut.mtl
o moreblocks_slope_inner_cut
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
v -0.500000 -0.500000 0.500000
v -0.500000 0.500000 0.500000
v -0.500000 -0.500000 -0.500000
vt 0.000000 0.000000
vt 1.000000 0.000000
vt 1.000000 1.000000
vt 0.000000 1.000000
vt 0.500000 0.000000
vn 1.000000 0.000000 0.000000
vn 0.000000 -0.000000 1.000000
vn 0.000000 -1.000000 -0.000000
vn 0.000000 1.000000 0.000000
vn -1.000000 0.000000 0.000000
vn 0.000000 0.000000 -1.000000
vn -0.577400 0.577400 -0.577400
usemtl None
s off
f 1/1/1 2/2/1 3/3/1 4/4/1
f 5/1/2 1/2/2 4/3/2 6/4/2
f 2/1/3 1/2/3 5/3/3 7/4/3
f 6/1/4 4/2/4 3/3/4
f 7/1/5 5/2/5 6/3/5
f 2/1/6 7/2/6 3/4/6
f 7/5/7 6/3/7 3/4/7

View File

@ -0,0 +1,34 @@
# Blender v2.72 (sub 0) OBJ File: ''
# www.blender.org
mtllib moreblocks_slope_inner_cut_half.mtl
o moreblocks_slope_inner_cut_half
v 0.500000 -0.500000 0.500000
v 0.500000 -0.500000 -0.500000
v 0.500000 0.000000 -0.500000
v 0.500000 -0.000000 0.500000
v -0.500000 -0.500000 0.500000
v -0.500000 -0.000000 0.500000
v -0.500000 -0.500000 -0.500000
vt 0.000000 0.000000
vt 1.000000 0.000000
vt 1.000000 0.500000
vt 0.000000 0.500000
vt 1.000000 1.000000
vt 0.000000 1.000000
vt 0.500000 0.000000
vn 1.000000 0.000000 0.000000
vn 0.000000 -0.000000 1.000000
vn 0.000000 -1.000000 -0.000000
vn 0.000000 1.000000 0.000000
vn -1.000000 0.000000 0.000000
vn 0.000000 0.000000 -1.000000
vn -0.408200 0.816500 -0.408200
usemtl None
s off
f 1/1/1 2/2/1 3/3/1 4/4/1
f 5/1/2 1/2/2 4/3/2 6/4/2
f 2/1/3 1/2/3 5/5/3 7/6/3
f 6/1/4 4/2/4 3/5/4
f 7/1/5 5/2/5 6/3/5
f 2/1/6 7/2/6 3/4/6
f 7/7/7 6/5/7 3/6/7

View File

@ -0,0 +1,35 @@
# Blender v2.72 (sub 0) OBJ File: ''
# www.blender.org
mtllib moreblocks_slope_inner_cut_half_raised.mtl
o moreblocks_slope_inner_cut_half_raised
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
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.000000 -0.500000
vt 0.000000 0.000000
vt 1.000000 0.000000
vt 1.000000 1.000000
vt 0.000000 1.000000
vt 0.000000 0.500000
vt 1.000000 0.500000
vt 0.500000 0.000000
vn 1.000000 0.000000 0.000000
vn 0.000000 -0.000000 1.000000
vn 0.000000 -1.000000 -0.000000
vn 0.000000 1.000000 0.000000
vn -1.000000 0.000000 0.000000
vn -0.000000 0.000000 -1.000000
vn -0.408200 0.816500 -0.408200
usemtl None
s off
f 1/1/1 2/2/1 3/3/1 4/4/1
f 5/1/2 1/2/2 4/3/2 6/4/2
f 2/1/3 1/2/3 5/3/3 7/4/3
f 6/1/4 4/2/4 3/3/4
f 7/1/5 5/2/5 6/3/5 8/5/5
f 2/1/6 7/2/6 8/6/6 3/4/6
f 8/7/7 6/3/7 3/4/7

43
mods/moreblocks/models/moreblocks_slope_inner_half.obj Executable file → Normal file
View File

@ -1,28 +1,35 @@
# Blender v2.69 (sub 0) OBJ File: 'slope_test_icorner_half_short_onetexture.blend' # Blender v2.72 (sub 0) OBJ File: ''
# www.blender.org # www.blender.org
mtllib slope_test_icorner_half_short_onetexture.mtl mtllib moreblocks_slope_inner_half.mtl
o Cube_Cube.000 o Cube_Cube.001
v 0.500000 0.000000 -0.500000
v 0.500000 -0.000000 0.500000 v 0.500000 -0.000000 0.500000
v -0.500000 -0.000000 0.500000
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.000000 -0.500000
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
v -0.500000 -0.000000 0.500000
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
v 0.500000 -0.500000 0.500000
vt 1.000000 1.000000 vt 1.000000 1.000000
vt 0.000000 1.000000 vt 0.000000 1.000000
vt 0.000000 0.000000 vt 0.000000 0.000000
vt 1.000000 0.000000 vt 1.000000 0.000000
usemtl None vn 1.000000 0.000000 0.000000
vn -1.000000 0.000000 0.000000
vn 0.000000 0.894400 -0.447200
vn 0.000000 0.000000 -1.000000
vn 0.000000 -1.000000 -0.000000
vn 0.000000 -0.000000 1.000000
vn -0.447200 0.894400 0.000000
usemtl None.002
s off s off
f 6/1 1/2 7/3 8/4 f 1/1/1 2/2/1 3/3/1 4/4/1
f 2/1 5/3 3/4 f 5/1/2 6/3/2 7/4/2
f 2/1 1/2 5/4 f 5/1/3 2/2/3 6/4/3
f 6/2 8/3 9/4 f 1/2/4 4/3/4 8/4/4
f 9/1 8/2 7/3 3/4 f 8/1/5 4/2/5 3/3/5 7/4/5
f 3/3 7/4 1/1 2/2 f 7/3/6 3/4/6 2/1/6 5/2/6
f 1/1 6/2 9/3 f 2/1/7 1/2/7 8/3/7
l 1 4 l 7 9
l 3 4 l 2 9

View File

@ -1,31 +1,38 @@
# Blender v2.69 (sub 0) OBJ File: 'slope_test_icorner_half_tall_onetexture.blend' # Blender v2.72 (sub 0) OBJ File: ''
# www.blender.org # www.blender.org
mtllib slope_test_icorner_half_tall_onetexture.mtl mtllib moreblocks_slope_inner_half_raised.mtl
o Cube_Cube.000 o Cube_Cube.003
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
v -0.500000 0.000000 -0.500000
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 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
v -0.500000 0.000000 -0.500000
v -0.500000 -0.500000 0.500000
v -0.500000 0.000000 -0.500000 v -0.500000 0.000000 -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.000000 1.000000 vt 1.000000 1.000000
vt 0.000000 1.000000 vt 0.000000 1.000000
vt 0.000000 0.000000 vt 0.000000 0.000000
vt 1.000000 0.000000 vt 1.000000 0.000000
vt 1.000000 0.500000 vt 1.000000 0.500000
vt 0.000000 0.500000 vt 0.000000 0.500000
usemtl None vn 1.000000 0.000000 0.000000
vn 0.000000 0.894400 -0.447200
vn 0.000000 -0.000000 1.000000
vn -0.447200 0.894400 0.000000
vn 0.000000 -1.000000 -0.000000
vn 0.000000 0.000000 -1.000000
vn -1.000000 0.000000 0.000000
usemtl None.003
s off s off
f 6/1 1/2 7/3 8/4 f 1/1/1 2/2/1 3/3/1 4/4/1
f 2/1 1/2 5/4 f 5/1/2 2/2/2 6/4/2
f 3/3 7/4 1/1 2/2 f 7/3/3 3/4/3 2/1/3 5/2/3
f 1/2 6/3 9/4 f 2/2/4 1/3/4 8/4/4
f 3/1 10/2 8/3 7/4 f 7/1/5 9/2/5 4/3/5 3/4/5
f 8/3 10/4 5/5 6/2 f 6/5/6 1/2/6 4/3/6 9/4/6
f 3/4 2/1 5/6 10/3 f 7/4/7 5/1/7 6/6/7 9/3/7
l 1 4 l 2 10
l 3 4 l 7 10

25
mods/moreblocks/models/moreblocks_slope_outer.obj Executable file → Normal file
View File

@ -1,18 +1,25 @@
# Blender v2.69 (sub 0) OBJ File: 'slope_test_ocorner_onetexture.blend' # Blender v2.72 (sub 0) OBJ File: ''
# www.blender.org # www.blender.org
o Cube_Cube.002 mtllib moreblocks_slope_outer.mtl
v 0.500000 0.500000 0.500000 o Cube_Cube.004
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
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
v 0.500000 0.500000 0.500000
vt 1.000000 1.000000 vt 1.000000 1.000000
vt 0.000000 1.000000 vt 0.000000 1.000000
vt 0.000000 0.000000 vt 0.000000 0.000000
vt 1.000000 0.000000 vt 1.000000 0.000000
vn 0.000000 -1.000000 -0.000000
vn 1.000000 0.000000 0.000000
vn 0.000000 -0.000000 1.000000
vn -0.707100 0.707100 0.000000
vn 0.000000 0.707100 -0.707100
usemtl None
s off s off
f 3/1 2/2 4/3 5/4 f 1/1/1 2/2/1 3/3/1 4/4/1
f 1/2 3/3 5/4 f 5/2/2 1/3/2 4/4/2
f 1/1 2/3 3/4 f 2/3/3 1/4/3 5/1/3
f 1/1 4/3 2/4 f 5/1/4 3/3/4 2/4/4
f 1/2 5/3 4/4 f 5/2/5 4/3/5 3/4/5

26
mods/moreblocks/models/moreblocks_slope_outer_cut.obj Executable file → Normal file
View File

@ -1,19 +1,23 @@
# Blender v2.69 (sub 0) OBJ File: 'slope_test_corner_pyramid_tall_2_onetexture.blend' # Blender v2.72 (sub 0) OBJ File: ''
# www.blender.org # www.blender.org
mtllib slope_test_corner_pyramid_tall_2_onetexture.mtl mtllib moreblocks_slope_outer_cut.mtl
o Cube o Cube.002
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 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.000000 1.000000 vt 1.000000 1.000000
vt 0.000000 0.000000 vt 0.000000 0.000000
vt 1.000000 0.000000 vt 1.000000 0.000000
vt 0.000000 1.000000 vt 0.000000 1.000000
vt 0.500000 1.000000 vt 0.500000 1.000000
usemtl None vn 0.000000 -0.000000 1.000000
vn 1.000000 0.000000 0.000000
vn 0.000000 -1.000000 0.000000
vn -0.577400 0.577400 -0.577400
usemtl None.004
s off s off
f 4/1 1/2 3/3 f 1/1/1 2/2/1 3/3/1
f 2/3 4/4 3/2 f 4/3/2 1/4/2 3/2/2
f 3/2 1/3 2/4 f 3/2/3 2/3/3 4/4/3
f 1/3 4/5 2/2 f 2/3/4 1/5/4 4/2/4

View File

@ -1,20 +1,24 @@
# Blender v2.69 (sub 0) OBJ File: 'slope_test_corner_pyramid_short_2_onetexture.blend' # Blender v2.72 (sub 0) OBJ File: ''
# www.blender.org # www.blender.org
mtllib slope_test_corner_pyramid_short_2_onetexture.mtl mtllib moreblocks_slope_outer_cut_half.mtl
o Cube o Cube.003
v 0.500000 -0.000000 0.500000
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 v 0.500000 -0.500000 0.500000
v 0.500000 0.000000 0.500000 v 0.500000 -0.500000 -0.500000
vt 1.000000 0.500000 vt 1.000000 0.500000
vt 0.000000 0.000000 vt 0.000000 0.000000
vt 1.000000 0.000000 vt 1.000000 0.000000
vt 0.000000 0.500000 vt 0.000000 0.500000
vt 0.000000 1.000000 vt 0.000000 1.000000
vt 0.500000 1.000000 vt 0.500000 1.000000
usemtl None vn 0.000000 -0.000000 1.000000
vn 1.000000 0.000000 0.000000
vn 0.000000 -1.000000 0.000000
vn -0.408200 0.816500 -0.408200
usemtl None.005
s off s off
f 4/1 1/2 3/3 f 1/1/1 2/2/1 3/3/1
f 2/3 4/4 3/2 f 4/3/2 1/4/2 3/2/2
f 3/2 1/3 2/5 f 3/2/3 2/3/3 4/5/3
f 1/3 4/6 2/2 f 2/3/4 1/6/4 4/2/4

View File

@ -1,23 +1,28 @@
# Blender v2.69 (sub 0) OBJ File: 'slope_test_corner_pyramid_short_3_onetexture.blend' # Blender v2.72 (sub 0) OBJ File: ''
# www.blender.org # www.blender.org
mtllib slope_test_corner_pyramid_short_3_onetexture.mtl mtllib moreblocks_slope_outer_cut_half_raised.mtl
o Cube_Cube.002 o Cube_Cube.005
v -0.500000 -0.000000 0.500000 v -0.500000 -0.000000 0.500000
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
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
v 0.500000 -0.000000 -0.500000 v 0.500000 0.000000 -0.500000
vt 0.000000 0.500000 vt 0.000000 0.500000
vt 0.000000 0.000000 vt 0.000000 0.000000
vt 1.000000 0.000000 vt 1.000000 0.000000
vt 1.000000 1.000000 vt 1.000000 1.000000
vt 0.000000 1.000000 vt 0.000000 1.000000
vt 1.000000 0.500000 vt 1.000000 0.500000
usemtl None vn 0.000000 -0.000000 1.000000
vn 1.000000 0.000000 0.000000
vn 0.000000 -1.000000 0.000000
vn -0.408200 0.816500 -0.408200
vn -0.707100 0.000000 -0.707100
usemtl None.006
s off s off
f 1/1 2/2 3/3 4/4 f 1/1/1 2/2/1 3/3/1 4/4/1
f 4/5 3/2 5/3 6/6 f 4/5/2 3/2/2 5/3/2 6/6/2
f 2/5 5/3 3/4 f 2/5/3 5/3/3 3/4/3
f 1/2 4/3 6/4 f 1/2/4 4/3/4 6/4/4
f 2/3 1/6 6/1 5/2 f 2/3/5 1/6/5 6/1/5 5/2/5

25
mods/moreblocks/models/moreblocks_slope_outer_half.obj Executable file → Normal file
View File

@ -1,22 +1,27 @@
# Blender v2.69 (sub 0) OBJ File: 'slope_test_corner_pyramid_short_1_onetexture.blend' # Blender v2.72 (sub 0) OBJ File: ''
# www.blender.org # www.blender.org
mtllib slope_test_corner_pyramid_short_1_onetexture.mtl mtllib moreblocks_slope_outer_half.mtl
o Cube o Cube.004
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
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
v 0.500000 0.000000 0.500000 v 0.500000 -0.000000 0.500000
vt 1.000000 1.000000 vt 1.000000 1.000000
vt 0.000000 1.000000 vt 0.000000 1.000000
vt 0.000000 0.000000 vt 0.000000 0.000000
vt 1.000000 0.000000 vt 1.000000 0.000000
vt 1.000000 0.500000 vt 1.000000 0.500000
vt 0.000000 0.500000 vt 0.000000 0.500000
usemtl None vn 0.000000 -1.000000 -0.000000
vn 0.000000 -0.000000 1.000000
vn 1.000000 0.000000 0.000000
vn 0.000000 0.894400 -0.447200
vn -0.447200 0.894400 0.000000
usemtl None.007
s off s off
f 1/1 2/2 3/3 4/4 f 1/1/1 2/2/1 3/3/1 4/4/1
f 5/5 1/3 4/4 f 5/5/2 1/3/2 4/4/2
f 3/4 5/6 4/3 f 3/4/3 5/6/3 4/3/3
f 2/4 5/2 3/3 f 2/4/4 5/2/4 3/3/4
f 1/4 5/1 2/3 f 1/4/5 5/1/5 2/3/5

View File

@ -1,27 +1,34 @@
# Blender v2.69 (sub 0) OBJ File: 'slope_test_corner_pyramid_tall_3_onetexture.blend' # Blender v2.72 (sub 0) OBJ File: ''
# www.blender.org # www.blender.org
mtllib slope_test_corner_pyramid_tall_3_onetexture.mtl mtllib moreblocks_slope_outer_half_raised.mtl
o Cube_Cube.002 o Cube_Cube.006
v -0.500000 -0.000000 0.500000 v -0.500000 -0.000000 0.500000
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
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
v 0.500000 -0.000000 -0.500000 v 0.500000 0.000000 -0.500000
v -0.500000 0.000000 -0.500000
v -0.500000 -0.500000 -0.500000 v -0.500000 -0.500000 -0.500000
v -0.500000 -0.000000 -0.500000
vt 0.000000 0.500000 vt 0.000000 0.500000
vt 0.000000 0.000000 vt 0.000000 0.000000
vt 1.000000 0.000000 vt 1.000000 0.000000
vt 1.000000 1.000000 vt 1.000000 1.000000
vt 0.000000 1.000000 vt 0.000000 1.000000
vt 1.000000 0.500000 vt 1.000000 0.500000
usemtl None vn 0.000000 -0.000000 1.000000
vn 1.000000 0.000000 0.000000
vn 0.000000 0.894400 -0.447200
vn -1.000000 0.000000 0.000000
vn -0.447200 0.894400 0.000000
vn 0.000000 0.000000 -1.000000
vn 0.000000 -1.000000 -0.000000
usemtl None.008
s off s off
f 1/1 2/2 3/3 4/4 f 1/1/1 2/2/1 3/3/1 4/4/1
f 4/5 3/2 5/3 6/6 f 4/5/2 3/2/2 5/3/2 6/6/2
f 8/3 4/5 6/2 f 7/3/3 4/5/3 6/2/3
f 1/6 8/1 7/2 2/3 f 1/6/4 7/1/4 8/2/4 2/3/4
f 4/5 8/3 1/4 f 7/3/5 1/4/5 4/5/5
f 6/1 5/2 7/3 8/6 f 6/1/6 5/2/6 8/3/6 7/6/6
f 5/5 3/2 2/3 7/4 f 5/5/7 3/2/7 2/3/7 8/4/7

View File

@ -110,6 +110,18 @@ function stairsplus:register_micro(modname, subname, recipeitem, fields)
recipe = {modname .. ":slab_" .. subname}, recipe = {modname .. ":slab_" .. subname},
}) })
minetest.register_craft({
type = "shapeless",
output = modname .. ":micro_" .. subname .. " 4",
recipe = {modname .. ":stair_" .. subname .. "_alt"},
})
minetest.register_craft({
type = "shapeless",
output = modname .. ":micro_" .. subname .. " 3",
recipe = {modname .. ":stair_" .. subname .. "_right_half"},
})
minetest.register_craft({ minetest.register_craft({
type = "shapeless", type = "shapeless",
output = modname .. ":micro_" .. subname .. " 2", output = modname .. ":micro_" .. subname .. " 2",

View File

@ -18,18 +18,24 @@ local default_nodes = { -- Default stairs/slabs/panels/microblocks:
"diamondblock", "diamondblock",
"desert_stone", "desert_stone",
"desert_cobble", "desert_cobble",
"meselamp",
"glass", "glass",
"tree", "tree",
"wood", "wood",
"jungletree", "jungletree",
"junglewood", "junglewood",
"pinetree", "pine_tree",
"pinewood", "pine_wood",
"cherry_tree",
"cherry_plank",
"acacia_tree",
"acacia_wood",
"obsidian", "obsidian",
"obsidian_glass", "obsidian_glass",
"stonebrick", "stonebrick",
"desert_stonebrick", "desert_stonebrick",
"sandstonebrick", "sandstonebrick",
"obsidianbrick",
} }
for _, name in pairs(default_nodes) do for _, name in pairs(default_nodes) do
@ -54,7 +60,7 @@ for _, name in pairs(default_nodes) do
sounds = ndef.sounds, sounds = ndef.sounds,
tiles = ndef.tiles, tiles = ndef.tiles,
sunlight_propagates = true, sunlight_propagates = true,
light_source = ndef.light_source
}) })
end end
end end

View File

@ -66,6 +66,15 @@ function stairsplus:register_slab(modname, subname, recipeitem, fields)
recipe = {modname .. ":micro_" .. subname, modname .. ":micro_" .. subname, modname .. ":micro_" .. subname, modname .. ":micro_" .. subname}, recipe = {modname .. ":micro_" .. subname, modname .. ":micro_" .. subname, modname .. ":micro_" .. subname, modname .. ":micro_" .. subname},
}) })
-- uncomment this rule when conflict is no longer likely to happen
-- https://github.com/minetest/minetest/issues/2881
-- minetest.register_craft({
-- type = "shapeless",
-- output = modname .. ":slab_" .. subname,
-- recipe = {modname .. ":panel_" .. subname, modname .. ":panel_" .. subname},
-- })
-- then remove these two
minetest.register_craft({ minetest.register_craft({
output = modname .. ":slab_" .. subname, output = modname .. ":slab_" .. subname,
recipe = {{modname .. ":panel_" .. subname, modname .. ":panel_" .. subname}}, recipe = {{modname .. ":panel_" .. subname, modname .. ":panel_" .. subname}},
@ -78,6 +87,7 @@ function stairsplus:register_slab(modname, subname, recipeitem, fields)
{modname .. ":panel_" .. subname}, {modname .. ":panel_" .. subname},
}, },
}) })
------------------------------
minetest.register_craft({ minetest.register_craft({
type = "shapeless", type = "shapeless",
@ -85,6 +95,108 @@ function stairsplus:register_slab(modname, subname, recipeitem, fields)
recipe = {modname .. ":slab_" .. subname, modname .. ":slab_" .. subname}, recipe = {modname .. ":slab_" .. subname, modname .. ":slab_" .. subname},
}) })
minetest.register_craft({
type = "shapeless",
output = recipeitem,
recipe = {modname .. ":slab_" .. subname .. "_quarter", modname .. ":slab_" .. subname .. "_quarter", modname .. ":slab_" .. subname .. "_quarter", modname .. ":slab_" .. subname .. "_quarter"},
})
minetest.register_craft({
type = "shapeless",
output = recipeitem,
recipe = {modname .. ":slab_" .. subname .. "_2", modname .. ":slab_" .. subname .. "_2", modname .. ":slab_" .. subname .. "_2", modname .. ":slab_" .. subname .. "_2", modname .. ":slab_" .. subname .. "_2", modname .. ":slab_" .. subname .. "_2", modname .. ":slab_" .. subname .. "_2", modname .. ":slab_" .. subname .. "_2"},
})
minetest.register_craft({
type = "shapeless",
output = recipeitem,
recipe = {modname .. ":slab_" .. subname .. "_three_quarter", modname .. ":slab_" .. subname .. "_quarter"},
})
minetest.register_craft({
type = "shapeless",
output = recipeitem,
recipe = {modname .. ":slab_" .. subname .. "_14", modname .. ":slab_" .. subname .. "_2"},
})
minetest.register_craft({
type = "shapeless",
output = recipeitem,
recipe = {modname .. ":slab_" .. subname .. "_15", modname .. ":slab_" .. subname .. "_1"},
})
minetest.register_craft({
type = "shapeless",
output = modname .. ":slab_" .. subname,
recipe = {modname .. ":slab_" .. subname .. "_quarter", modname .. ":slab_" .. subname .. "_quarter"},
})
minetest.register_craft({
type = "shapeless",
output = modname .. ":slab_" .. subname,
recipe = {modname .. ":slab_" .. subname .. "_2", modname .. ":slab_" .. subname .. "_2", modname .. ":slab_" .. subname .. "_2", modname .. ":slab_" .. subname .. "_2"},
})
minetest.register_craft({
type = "shapeless",
output = modname .. ":slab_" .. subname,
recipe = {modname .. ":slab_" .. subname .. "_1", modname .. ":slab_" .. subname .. "_1", modname .. ":slab_" .. subname .. "_1", modname .. ":slab_" .. subname .. "_1", modname .. ":slab_" .. subname .. "_1", modname .. ":slab_" .. subname .. "_1", modname .. ":slab_" .. subname .. "_1", modname .. ":slab_" .. subname .. "_1"},
})
minetest.register_craft({
type = "shapeless",
output = modname .. ":slab_" .. subname .. "_quarter",
recipe = {modname .. ":slab_" .. subname .. "_2", modname .. ":slab_" .. subname .. "_2"},
})
minetest.register_craft({
type = "shapeless",
output = modname .. ":slab_" .. subname .. "_quarter",
recipe = {modname .. ":slab_" .. subname .. "_1", modname .. ":slab_" .. subname .. "_1", modname .. ":slab_" .. subname .. "_1", modname .. ":slab_" .. subname .. "_1"},
})
minetest.register_craft({
type = "shapeless",
output = modname .. ":slab_" .. subname .. "_2",
recipe = {modname .. ":slab_" .. subname .. "_1", modname .. ":slab_" .. subname .. "_1"},
})
minetest.register_craft({
type = "shapeless",
output = modname .. ":slab_" .. subname .. "_three_quarter",
recipe = {modname .. ":slab_" .. subname, modname .. ":slab_" .. subname .. "_quarter"},
})
minetest.register_craft({
type = "shapeless",
output = modname .. ":slab_" .. subname .. "_three_quarter",
recipe = {modname .. ":slab_" .. subname .. "_quarter", modname .. ":slab_" .. subname .. "_quarter", modname .. ":slab_" .. subname .. "_quarter"},
})
minetest.register_craft({
type = "shapeless",
output = modname .. ":slab_" .. subname .. "_three_quarter",
recipe = {modname .. ":slab_" .. subname .. "_2", modname .. ":slab_" .. subname .. "_2", modname .. ":slab_" .. subname .. "_2", modname .. ":slab_" .. subname .. "_2", modname .. ":slab_" .. subname .. "_2", modname .. ":slab_" .. subname .. "_2"},
})
minetest.register_craft({
type = "shapeless",
output = modname .. ":slab_" .. subname .. "_14",
recipe = {modname .. ":slab_" .. subname .. "_three_quarter", modname .. ":slab_" .. subname .. "_2"},
})
minetest.register_craft({
type = "shapeless",
output = modname .. ":slab_" .. subname .. "_14",
recipe = {modname .. ":slab_" .. subname .. "_2", modname .. ":slab_" .. subname .. "_2", modname .. ":slab_" .. subname .. "_2", modname .. ":slab_" .. subname .. "_2", modname .. ":slab_" .. subname .. "_2", modname .. ":slab_" .. subname .. "_2", modname .. ":slab_" .. subname .. "_2"},
})
minetest.register_craft({
type = "shapeless",
output = modname .. ":slab_" .. subname .. "_15",
recipe = {modname .. ":slab_" .. subname .. "_14", modname .. ":slab_" .. subname .. "_1"},
})
minetest.register_craft({ minetest.register_craft({
type = "shapeless", type = "shapeless",
output = modname .. ":slab_" .. subname .. " 3", output = modname .. ":slab_" .. subname .. " 3",

View File

@ -160,6 +160,24 @@ function stairsplus:register_slope(modname, subname, recipeitem, fields)
selection_box = box_slope_inner_half_raised, selection_box = box_slope_inner_half_raised,
}, },
--==============================================================
["_inner_cut"] = {
mesh = "moreblocks_slope_inner_cut.obj",
collision_box = box_slope_inner,
selection_box = box_slope_inner,
},
["_inner_cut_half"] = {
mesh = "moreblocks_slope_inner_cut_half.obj",
collision_box = box_slope_inner_half,
selection_box = box_slope_inner_half,
},
["_inner_cut_half_raised"] = {
mesh = "moreblocks_slope_inner_cut_half_raised.obj",
collision_box = box_slope_inner_half_raised,
selection_box = box_slope_inner_half_raised,
},
--============================================================== --==============================================================
["_outer"] = { ["_outer"] = {
@ -195,6 +213,11 @@ function stairsplus:register_slope(modname, subname, recipeitem, fields)
collision_box = box_slope_outer_half_raised, collision_box = box_slope_outer_half_raised,
selection_box = box_slope_outer_half_raised, selection_box = box_slope_outer_half_raised,
}, },
["_cut"] = {
mesh = "moreblocks_slope_cut.obj",
collision_box = box_slope_outer,
selection_box = box_slope_outer,
},
} }
local desc = S("%s Slope"):format(fields.description) local desc = S("%s Slope"):format(fields.description)
@ -215,180 +238,12 @@ function stairsplus:register_slope(modname, subname, recipeitem, fields)
-- Some saw-less recipes: -- Some saw-less recipes:
minetest.register_craft({
output = modname .. ":slope_" .. subname .. " 7",
recipe = {
{modname .. ":panel_" .. subname, "", ""},
{recipeitem, modname .. ":panel_" .. subname, ""},
{recipeitem, recipeitem, modname .. ":panel_" .. subname},
},
})
minetest.register_craft({
output = modname .. ":slope_" .. subname .. " 7",
recipe = {
{"", "", modname .. ":panel_" .. subname},
{"", modname .. ":panel_" .. subname, recipeitem},
{modname .. ":panel_" .. subname, recipeitem, recipeitem},
},
})
minetest.register_craft({
output = modname .. ":slope_" .. subname .. "_half 10",
recipe = {
{modname .. ":panel_" .. subname, "", ""},
{recipeitem, recipeitem, modname .. ":panel_" .. subname},
},
})
minetest.register_craft({
output = modname .. ":slope_" .. subname .. "_half 10",
recipe = {
{"", "", modname .. ":panel_" .. subname},
{modname .. ":panel_" .. subname, recipeitem, recipeitem},
},
})
minetest.register_craft({
output = modname .. ":slope_" .. subname .. "_half_raised 7",
recipe = {
{modname .. ":panel_" .. subname, "", ""},
{recipeitem, recipeitem, modname .. ":panel_" .. subname},
{recipeitem, recipeitem, recipeitem},
},
})
minetest.register_craft({
output = modname .. ":slope_" .. subname .. "_half_raised 7",
recipe = {
{"", "", modname .. ":panel_" .. subname},
{modname .. ":panel_" .. subname, recipeitem, recipeitem},
{recipeitem, recipeitem, recipeitem},
},
})
--===================================================== Inner ==
minetest.register_craft({
output = modname .. ":slope_" .. subname .. "_inner 7",
recipe = {
{modname .. ":stair_" .. subname .. "_half", "", ""},
{recipeitem, modname .. ":stair_" .. subname .. "_half", ""},
{recipeitem, recipeitem, modname .. ":stair_" .. subname .. "_half"},
},
})
minetest.register_craft({
output = modname .. ":slope_" .. subname .. "_inner 7",
recipe = {
{"", "", modname .. ":stair_" .. subname .. "_half"},
{"", modname .. ":stair_" .. subname .. "_half", recipeitem},
{modname .. ":stair_" .. subname .. "_half", recipeitem, recipeitem},
},
})
minetest.register_craft({
output = modname .. ":slope_" .. subname .. "_inner_half 10",
recipe = {
{modname .. ":stair_" .. subname .. "_half", "", ""},
{recipeitem, recipeitem, modname .. ":stair_" .. subname .. "_half"},
},
})
minetest.register_craft({
output = modname .. ":slope_" .. subname .. "_inner_half 10",
recipe = {
{"", "", modname .. ":stair_" .. subname .. "_half"},
{modname .. ":stair_" .. subname .. "_half", recipeitem, recipeitem},
},
})
minetest.register_craft({
output = modname .. ":slope_" .. subname .. "_inner_half_raised 7",
recipe = {
{modname .. ":stair_" .. subname .. "_half", "", ""},
{recipeitem, recipeitem, modname .. ":stair_" .. subname .. "_half"},
{recipeitem, recipeitem, recipeitem},
},
})
minetest.register_craft({
output = modname .. ":slope_" .. subname .. "_inner_half_raised 7",
recipe = {
{"", "", modname .. ":stair_" .. subname .. "_half"},
{modname .. ":stair_" .. subname .. "_half", recipeitem, recipeitem},
{recipeitem, recipeitem, recipeitem},
},
})
--===================================================== Outer ==
minetest.register_craft({
output = modname .. ":slope_" .. subname .. "_outer 7",
recipe = {
{modname .. ":micro_" .. subname, "", ""},
{recipeitem, modname .. ":micro_" .. subname, ""},
{recipeitem, recipeitem, modname .. ":micro_" .. subname},
},
})
minetest.register_craft({
output = modname .. ":slope_" .. subname .. "_outer 7",
recipe = {
{"", "", modname .. ":micro_" .. subname},
{"", modname .. ":micro_" .. subname, recipeitem},
{modname .. ":micro_" .. subname, recipeitem, recipeitem},
},
})
minetest.register_craft({
output = modname .. ":slope_" .. subname .. "_outer_half 10",
recipe = {
{modname .. ":micro_" .. subname, "", ""},
{recipeitem, recipeitem, modname .. ":micro_" .. subname},
},
})
minetest.register_craft({
output = modname .. ":slope_" .. subname .. "_outer_half 10",
recipe = {
{"", "", modname .. ":micro_" .. subname},
{modname .. ":micro_" .. subname, recipeitem, recipeitem},
},
})
minetest.register_craft({
output = modname .. ":slope_" .. subname .. "_outer_half_raised 7",
recipe = {
{modname .. ":micro_" .. subname, "", ""},
{recipeitem, recipeitem, modname .. ":micro_" .. subname},
{recipeitem, recipeitem, recipeitem},
},
})
minetest.register_craft({
output = modname .. ":slope_" .. subname .. "_outer_half_raised 7",
recipe = {
{"", "", modname .. ":micro_" .. subname},
{modname .. ":micro_" .. subname, recipeitem, recipeitem},
{recipeitem, recipeitem, recipeitem},
},
})
--================================================= Shapeless ==
minetest.register_craft({ minetest.register_craft({
type = "shapeless", type = "shapeless",
output = recipeitem, output = recipeitem,
recipe = {modname .. ":slope_" .. subname, modname .. ":slope_" .. subname}, recipe = {modname .. ":slope_" .. subname, modname .. ":slope_" .. subname},
}) })
minetest.register_craft({
type = "shapeless",
output = recipeitem,
recipe = {modname .. ":slope_" .. subname .. "_outer_cut", modname .. ":slope_" .. subname .. "_outer_cut"},
})
minetest.register_craft({ minetest.register_craft({
type = "shapeless", type = "shapeless",
output = recipeitem, output = recipeitem,
@ -402,12 +257,60 @@ function stairsplus:register_slope(modname, subname, recipeitem, fields)
modname .. ":slope_" .. subname .. "_half", modname .. ":slope_" .. subname .. "_half"}, modname .. ":slope_" .. subname .. "_half", modname .. ":slope_" .. subname .. "_half"},
}) })
minetest.register_craft({
type = "shapeless",
output = recipeitem,
recipe = {modname .. ":slope_" .. subname .. "_outer", modname .. ":slope_" .. subname .. "_inner"},
})
minetest.register_craft({
type = "shapeless",
output = recipeitem,
recipe = {modname .. ":slope_" .. subname .. "_outer_half", modname .. ":slope_" .. subname .. "_inner_half_raised"},
})
minetest.register_craft({
type = "shapeless",
output = recipeitem,
recipe = {modname .. ":slope_" .. subname .. "_outer_half_raised", modname .. ":slope_" .. subname .. "_inner_half"},
})
minetest.register_craft({
type = "shapeless",
output = recipeitem,
recipe = {modname .. ":slope_" .. subname .. "_outer_cut", modname .. ":slope_" .. subname .. "_inner_cut"},
})
minetest.register_craft({
type = "shapeless",
output = recipeitem,
recipe = {modname .. ":slope_" .. subname .. "_outer_cut_half", modname .. ":slope_" .. subname .. "_inner_cut_half_raised"},
})
minetest.register_craft({
type = "shapeless",
output = recipeitem,
recipe = {modname .. ":slope_" .. subname .. "_cut", modname .. ":slope_" .. subname .. "_cut"},
})
minetest.register_craft({ minetest.register_craft({
type = "shapeless", type = "shapeless",
output = modname .. ":slab_" .. subname, output = modname .. ":slab_" .. subname,
recipe = {modname .. ":slope_" .. subname .. "_half", modname .. ":slope_" .. subname .. "_half"}, recipe = {modname .. ":slope_" .. subname .. "_half", modname .. ":slope_" .. subname .. "_half"},
}) })
minetest.register_craft({
type = "shapeless",
output = modname .. ":slab_" .. subname,
recipe = {modname .. ":slope_" .. subname .. "_outer_half", modname .. ":slope_" .. subname .. "_inner_half"},
})
minetest.register_craft({
type = "shapeless",
output = modname .. ":slab_" .. subname,
recipe = {modname .. ":slope_" .. subname .. "_outer_cut_half", modname .. ":slope_" .. subname .. "_inner_cut_half"},
})
minetest.register_craft({ minetest.register_craft({
type = "shapeless", type = "shapeless",
output = modname .. ":slope_" .. subname .. "_half_raised", output = modname .. ":slope_" .. subname .. "_half_raised",
@ -435,25 +338,7 @@ function stairsplus:register_slope(modname, subname, recipeitem, fields)
minetest.register_craft({ minetest.register_craft({
type = "shapeless", type = "shapeless",
output = modname .. ":slope_" .. subname .. "_outer_cut_half_raised", output = modname .. ":slope_" .. subname .. "_inner_cut_half_raised",
recipe = {modname .. ":slab_" .. subname, modname .. ":slope_" .. subname .. "_outer_cut_half"}, recipe = {modname .. ":slab_" .. subname, modname .. ":slope_" .. subname .. "_inner_cut_half"},
})
minetest.register_craft({
type = "shapeless",
output = modname .. ":slope_" .. subname .. "_outer_cut",
recipe = {modname .. ":slope_" .. subname .. "_outer"},
})
minetest.register_craft({
type = "shapeless",
output = modname .. ":slope_" .. subname .. "_outer_cut_half",
recipe = {modname .. ":slope_" .. subname .. "_outer_half"},
})
minetest.register_craft({
type = "shapeless",
output = modname .. ":slope_" .. subname .. "_outer_cut_half_raised",
recipe = {modname .. ":slope_" .. subname .. "_outer_half_raised"},
}) })
end end

View File

@ -179,12 +179,6 @@ function stairsplus:register_stair(modname, subname, recipeitem, fields)
recipe = {modname .. ":stair_" .. subname .. "_half"}, recipe = {modname .. ":stair_" .. subname .. "_half"},
}) })
minetest.register_craft({
type = "shapeless",
output = modname .. ":stair_" .. subname .. "_half",
recipe = {modname .. ":stair_" .. subname .. "_right_half"},
})
minetest.register_craft({ minetest.register_craft({
type = "shapeless", type = "shapeless",
output = modname .. ":stair_" .. subname, output = modname .. ":stair_" .. subname,