Updated moreblocks (with slopes)

- Solves #87

mods/moreblocks/circular_saw.lua

@@ -25,7 +25,8 @@ circular_saw.cost_in_microblocks = {
 	1, 1, 1, 1, 1, 1, 1, 2,
 	2, 3, 2, 4, 2, 4, 5, 6,
 	7, 1, 1, 2, 4, 6, 7, 8,
-	3, 1, 1, 2, 4, 0, 0, 0,
+	3, 1, 1, 2, 4, 4, 2, 7,
+	7, 2, 7, 6, 4, 6, 5, 4,
 }
 
 circular_saw.names = {
@@ -58,6 +59,17 @@ circular_saw.names = {
 	{"stair", "_alt_2"},
 	{"stair", "_alt_4"},
 	{"stair", "_alt"},
+	{"slope", ""},
+	{"slope", "_half"},
+	{"slope", "_half_raised"},
+	{"slope", "_inner"},
+	{"slope", "_inner_half"},
+	{"slope", "_inner_half_raised"},
+	{"slope", "_outer"},
+	{"slope", "_outer_half"},
+	{"slope", "_outer_half_raised"},
+	{"slope", "_outer_cut"},
+	{"slope", "_outer_cut_half"},
 }
 
 function circular_saw:get_cost(inv, stackname)
@@ -72,6 +84,8 @@ function circular_saw:get_output_inv(modname, material, amount, max)
 	if (not max or max < 1 or max > 99) then max = 99 end
 
 	local list = {}
+	local pos = #list
+
 	-- If there is nothing inside, display empty inventory:
 	if amount < 1 then
 		return list
@@ -79,8 +93,10 @@ function circular_saw:get_output_inv(modname, material, amount, max)
 
 	for i, t in ipairs(circular_saw.names) do
 		local cost = circular_saw.cost_in_microblocks[i]
-		table.insert(list, modname .. ":" .. t[1] .. "_" .. material .. t[2]
-				.. " " .. math.min(math.floor(amount/cost), max))
+		local balance = math.min(math.floor(amount/cost), max)
+		pos = pos + 1
+		list[pos] = modname .. ":" .. t[1] .. "_" .. material .. t[2]
+				.. " " .. balance
 	end
 	return list
 end
@@ -277,7 +293,8 @@ gui_slots = "listcolors[#606060AA;#808080;#101010;#202020;#FFF]"
 
 function circular_saw.on_construct(pos)
 	local meta = minetest.get_meta(pos)
-	meta:set_string("formspec", "size[11,9]" ..gui_slots..
+	local fancy_inv = default.gui_bg..default.gui_bg_img..default.gui_slots
+	meta:set_string("formspec", "size[11,9]"..fancy_inv..
 			"label[0,0;" ..S("Input\nmaterial").. "]" ..
 			"list[current_name;input;1.5,0;1,1;]" ..
 			"label[0,1;" ..S("Left-over").. "]" ..
@@ -286,8 +303,8 @@ function circular_saw.on_construct(pos)
 			"list[current_name;recycle;1.5,2;1,1;]" ..
 			"field[0.3,3.5;1,1;max_offered;" ..S("Max").. ":;${max_offered}]" ..
 			"button[1,3.2;1,1;Set;" ..S("Set").. "]" ..
-			"list[current_name;output;2.8,0;8,4;]" ..
-			"list[current_player;main;1.5,5;8,4;]")
+			"list[current_name;output;2.8,0;8,5;]" ..
+			"list[current_player;main;1.5,5.25;8,4;]")
 
 	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?
@@ -297,7 +314,7 @@ function circular_saw.on_construct(pos)
 	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("recycle", 1)  -- Surplus partial blocks can be placed here.
-	inv:set_size("output", 4*8) -- 4x8 versions of stair-parts of material x.
+	inv:set_size("output", 5*8) -- 5x8 versions of stair-parts of material x.
 
 	circular_saw:reset(pos)
 end

mods/moreblocks/nodes.lua

@@ -137,7 +137,8 @@ local nodes = {
 	["iron_glass"] = {
 		description = S("Iron Glass"),
 		drawtype = "glasslike_framed_optional",
-		tiles = {"moreblocks_iron_glass.png", "moreblocks_iron_glass_detail.png"},
+		--tiles = {"moreblocks_iron_glass.png", "moreblocks_iron_glass_detail.png"},
+		tiles = {"moreblocks_iron_glass.png"},
 		paramtype = "light",
 		sunlight_propagates = true,
 		groups = {snappy = 2, cracky = 3, oddly_breakable_by_hand = 3},
@@ -146,7 +147,8 @@ local nodes = {
 	["coal_glass"] = {
 		description = S("Coal Glass"),
 		drawtype = "glasslike_framed_optional",
-		tiles = {"moreblocks_coal_glass.png", "moreblocks_coal_glass_detail.png"},
+		--tiles = {"moreblocks_coal_glass.png", "moreblocks_coal_glass_detail.png"},
+		tiles = {"moreblocks_coal_glass.png"},
 		paramtype = "light",
 		sunlight_propagates = true,
 		groups = {snappy = 2, cracky = 3, oddly_breakable_by_hand = 3},
@@ -155,7 +157,8 @@ local nodes = {
 	["clean_glass"] = {
 		description = S("Clean Glass"),
 		drawtype = "glasslike_framed_optional",
-		tiles = {"moreblocks_clean_glass.png", "moreblocks_clean_glass_detail.png"},
+		--tiles = {"moreblocks_clean_glass.png", "moreblocks_clean_glass_detail.png"},
+		tiles = {"moreblocks_clean_glass.png"},
 		paramtype = "light",
 		sunlight_propagates = true,
 		groups = {snappy = 2, cracky = 3, oddly_breakable_by_hand = 3},
@@ -227,7 +230,8 @@ local nodes = {
 	["trap_glass"] = {
 		description = S("Trap Glass"),
 		drawtype = "glasslike_framed_optional",
-		tiles = {"moreblocks_trap_glass.png", "default_glass_detail.png"},
+		--tiles = {"moreblocks_trap_glass.png", "default_glass_detail.png"},
+		tiles = {"moreblocks_trap_glass.png"},
 		paramtype = "light",
 		sunlight_propagates = true,
 		walkable = false,
@@ -267,7 +271,8 @@ local nodes = {
 	["glow_glass"] = {
 		description = S("Glow Glass"),
 		drawtype = "glasslike_framed_optional",
-		tiles = {"moreblocks_glow_glass.png", "moreblocks_glow_glass_detail.png"},
+		--tiles = {"moreblocks_glow_glass.png", "moreblocks_glow_glass_detail.png"},
+		tiles = {"moreblocks_glow_glass.png"},
 		paramtype = "light",
 		sunlight_propagates = true,
 		light_source = 11,
@@ -277,7 +282,8 @@ local nodes = {
 	["trap_glow_glass"] = {
 		description = S("Trap Glow Glass"),
 		drawtype = "glasslike_framed_optional",
-		tiles = {"moreblocks_trap_glass.png", "moreblocks_glow_glass_detail.png"},
+		--tiles = {"moreblocks_trap_glass.png", "moreblocks_glow_glass_detail.png"},
+		tiles = {"moreblocks_trap_glass.png"},
 		paramtype = "light",
 		sunlight_propagates = true,
 		light_source = 11,
@@ -289,7 +295,8 @@ local nodes = {
 	["super_glow_glass"] = {
 		description = S("Super Glow Glass"),
 		drawtype = "glasslike_framed_optional",
-		tiles = {"moreblocks_super_glow_glass.png", "moreblocks_super_glow_glass_detail.png"},
+		--tiles = {"moreblocks_super_glow_glass.png", "moreblocks_super_glow_glass_detail.png"},
+		tiles = {"moreblocks_super_glow_glass.png"},
 		paramtype = "light",
 		sunlight_propagates = true,
 		light_source = 15,
@@ -299,7 +306,8 @@ local nodes = {
 	["trap_super_glow_glass"] = {
 		description = S("Trap Super Glow Glass"),
 		drawtype = "glasslike_framed_optional",
-		tiles = {"moreblocks_trap_super_glow_glass.png", "moreblocks_super_glow_glass_detail.png"},
+		--tiles = {"moreblocks_trap_super_glow_glass.png", "moreblocks_super_glow_glass_detail.png"},
+		tiles = {"moreblocks_trap_super_glow_glass.png"},
 		paramtype = "light",
 		sunlight_propagates = true,
 		light_source = 15,

mods/moreblocks/redefinitions.lua

@@ -33,7 +33,7 @@ minetest.register_craft({
 })
 
 minetest.register_craft({
-	output = "default:rail 16",
+	output = "default:rail 16", -- /MFF (Mg|06/10/15)
 	recipe = {
 		{"default:steel_ingot", "", "default:steel_ingot"},
 		{"default:steel_ingot", "default:stick", "default:steel_ingot"},