Merge branch 'indev'

8 files changed, 254 insertions, 76 deletions

diff --git a/roadsigns/init.lua b/roadsigns/init.lua
index 4985694..38e8692 100644
--- a/roadsigns/init.lua
+++ b/roadsigns/init.lua
@@ -2,4 +2,5 @@
 	StreetsMod: Poles and signs
 ]]
 dofile(minetest.get_modpath(minetest.get_current_modname()) .. "/pole.lua")
-dofile(minetest.get_modpath(minetest.get_current_modname()) .. "/signs.lua")
\ No newline at end of file
+dofile(minetest.get_modpath(minetest.get_current_modname()) .. "/signs.lua")
+dofile(minetest.get_modpath(minetest.get_current_modname()) .. "/workshop.lua")
\ No newline at end of file
diff --git a/roadsigns/pole.lua b/roadsigns/pole.lua
index 8f2f7ba..478afb9 100644
--- a/roadsigns/pole.lua
+++ b/roadsigns/pole.lua
@@ -48,7 +48,8 @@ minetest.register_node(":streets:pole_top",{
 	paramtype = "light",
 	paramtype2 = "facedir",
 	drawtype = "nodebox",
-	can_dig = function(pos,player)
+	drop = "",
+	can_dig = function()
 		return false
 	end,
 	node_box = {
diff --git a/roadsigns/signs.lua b/roadsigns/signs.lua
index a73b294..0992adf 100644
--- a/roadsigns/signs.lua
+++ b/roadsigns/signs.lua
@@ -1,81 +1,110 @@
-if streets.extendedBy.bucket == true and streets.extendedBy.wool then
-	minetest.register_node(":streets:sign_lava",{
-		description = "Warning sign (lava)",
-		tiles = {"streets_sign_lava.png"},
-		inventory_image = "streets_sign_lava.png",
-		wield_image = "streets_sign_lava.png",
-		groups = {snappy = 1,attached_node = 1},
-		drawtype = "signlike",
-		paramtype = "light",
-		paramtype2 = "wallmounted",
-		walkable = false,
-		sunlight_propagates = true,
-		selection_box = {
-			type = "wallmounted"
+minetest.register_node(":streets:sign_blank",{
+	description = "Emtpy sign",
+	tiles = {"streets_sign_back.png"},
+	inventory_image = "streets_sign_back.png",
+	wield_image = "streets_sign_back.png",
+	groups = {snappy = 1,attached_node = 1},
+	drawtype = "nodebox",
+	node_box = {
+		type = "wallmounted",
+		fixed = {
+			{-0.4,-0.5,-0.4,0.4,-0.4,0.4}
 		}
-	})
-
-	minetest.register_craft({
-		output = "streets:sign_lava 2",
-		recipe = {
-			{"wool:red","wool:red","wool:red"},
-			{"wool:red","bucket:bucket_lava","wool:red"},
-			{"wool:red","wool:red","wool:red"}
-		},
-		replacements = {
-			{"bucket:bucket_lava", "bucket:bucket_empty"}
+	},
+	paramtype = "light",
+	paramtype2 = "wallmounted",
+	walkable = false,
+	sunlight_propagates = true,
+	selection_box = {
+		type = "wallmounted"
+	},
+	streets = {
+		signworkshop = {
+			recipe = {"default:steel_ingot","","",""},
+			time = 3
 		}
-	})
-	
-	minetest.register_node(":streets:sign_water",{
-		description = "Warning sign (water)",
-		tiles = {"streets_sign_water.png"},
-		inventory_image = "streets_sign_water.png",
-		wield_image = "streets_sign_water.png",
-		groups = {snappy = 1,attached_node = 1},
-		drawtype = "signlike",
-		paramtype = "light",
-		paramtype2 = "wallmounted",
-		walkable = false,
-		sunlight_propagates = true,
-		selection_box = {
-			type = "wallmounted"
+	}
+})
+minetest.register_node(":streets:sign_lava",{
+	description = "Warning sign (lava)",
+	tiles = {"streets_sign_lava.png"},
+	inventory_image = "streets_sign_lava.png",
+	wield_image = "streets_sign_lava.png",
+	groups = {snappy = 1,attached_node = 1},
+	drawtype = "nodebox",
+	node_box = {
+		type = "wallmounted",
+		fixed = {
+			{-0.4,-0.5,-0.4,0.4,-0.4,0.4}
 		}
-	})
-
-	minetest.register_craft({
-		output = "streets:sign_water 2",
-		recipe = {
-			{"wool:red","wool:red","wool:red"},
-			{"wool:red","bucket:bucket_water","wool:red"},
-			{"wool:red","wool:red","wool:red"}
-		},
-		replacements = {
-			{"bucket:bucket_water", "bucket:bucket_empty"}
+	},
+	paramtype = "light",
+	paramtype2 = "wallmounted",
+	walkable = false,
+	sunlight_propagates = true,
+	selection_box = {
+		type = "wallmounted"
+	},
+	streets = {
+		signworkshop = {
+			recipe = {"streets:sign_blank","bucket:bucket_lava","",""},
+			time = 5
 		}
-	})
+	}
+})
 	
-	minetest.register_node(":streets:sign_construction",{
-		description = "Warning sign (Construction area)",
-		tiles = {"streets_sign_construction.png"},
-		inventory_image = "streets_sign_construction.png",
-		wield_image = "streets_sign_construction.png",
-		groups = {snappy = 1,attached_node = 1},
-		drawtype = "signlike",
-		paramtype = "light",
-		paramtype2 = "wallmounted",
-		walkable = false,
-		sunlight_propagates = true,
-		selection_box = {
-			type = "wallmounted"
+minetest.register_node(":streets:sign_water",{
+	description = "Warning sign (water)",
+	tiles = {"streets_sign_water.png"},
+	inventory_image = "streets_sign_water.png",
+	wield_image = "streets_sign_water.png",
+	groups = {snappy = 1,attached_node = 1},
+	drawtype = "nodebox",
+	node_box = {
+		type = "wallmounted",
+		fixed = {
+			{-0.4,-0.5,-0.4,0.4,-0.4,0.4}
+		}
+	},
+	paramtype = "light",
+	paramtype2 = "wallmounted",
+	walkable = false,
+	sunlight_propagates = true,
+	selection_box = {
+		type = "wallmounted"
+	},
+	streets = {
+		signworkshop = {
+			recipe = {"streets:sign_blank","bucket:bucket_water","",""},
+			time = 5
+		}
+	}
+})
+
+minetest.register_node(":streets:sign_construction",{
+	description = "Warning sign (Construction area)",
+	tiles = {"streets_sign_construction.png"},
+	inventory_image = "streets_sign_construction.png",
+	wield_image = "streets_sign_construction.png",
+	groups = {snappy = 1,attached_node = 1},
+	drawtype = "nodebox",
+	node_box = {
+		type = "wallmounted",
+		fixed = {
+			{-0.4,-0.5,-0.4,0.4,-0.4,0.4}
 		}
-	})
-	minetest.register_craft({
-		output = "streets:sign_construction 2",
-		recipe = {
-			{"wool:red","wool:red","wool:red"},
-			{"wool:red","default:shovel_steel","wool:red"},
-			{"wool:red","wool:red","wool:red"}
+	},
+	paramtype = "light",
+	paramtype2 = "wallmounted",
+	walkable = false,
+	sunlight_propagates = true,
+	selection_box = {
+		type = "wallmounted"
+	},
+	streets = {
+		signworkshop = {
+			recipe = {"streets:sign_blank","default:dirt","",""},
+			time = 5
 		}
-	})
-end
\ No newline at end of file
+	}
+})
\ No newline at end of file
diff --git a/roadsigns/textures/streets_signworkshop_bottom.png b/roadsigns/textures/streets_signworkshop_bottom.png
new file mode 100644
index 0000000..022bb2c
--- /dev/null
+++ b/roadsigns/textures/streets_signworkshop_bottom.png
diff --git a/roadsigns/textures/streets_signworkshop_front.png b/roadsigns/textures/streets_signworkshop_front.png
new file mode 100644
index 0000000..83317b1
--- /dev/null
+++ b/roadsigns/textures/streets_signworkshop_front.png
diff --git a/roadsigns/textures/streets_signworkshop_side.png b/roadsigns/textures/streets_signworkshop_side.png
new file mode 100644
index 0000000..509a3e3
--- /dev/null
+++ b/roadsigns/textures/streets_signworkshop_side.png
diff --git a/roadsigns/textures/streets_signworkshop_top.png b/roadsigns/textures/streets_signworkshop_top.png
new file mode 100644
index 0000000..07f4f06
--- /dev/null
+++ b/roadsigns/textures/streets_signworkshop_top.png
diff --git a/roadsigns/workshop.lua b/roadsigns/workshop.lua
new file mode 100644
index 0000000..9c68fb7
--- /dev/null
+++ b/roadsigns/workshop.lua
@@ -0,0 +1,147 @@
+--[[
+	StreetsMod: Create signs in the signworkshop
+]]
+local forms = {
+	inactive = {
+		"size[12,10]",
+		"label[3.5,0;Sign workshop - Create signs for your roads!]",
+		"label[0,0.5;Available signs:]",
+		"list[context;streets:signworkshop_list;0,1;5,4]",
+		"label[9,0.5;Needed stuff:]",
+		"list[context;streets:signworkshop_recipe;8,1;4,1]",
+		"label[9,2;Put it here:]",
+		"list[context;streets:signworkshop_input;8,3;4,1]",
+		"button[8,4;2,1;streets:signworkshop_send;Start!]",
+		"label[5.8,0.5;Selected:]",
+		"list[context;streets:signworkshop_select;6,1;1,1]",
+		"label[5.8,2.5;Output:]",
+		"list[context;streets:signworkshop_output;6,3;1,1]",
+		"list[current_player;main;2,6;8,4]",
+	},
+	active = {
+		"size[12,10]",
+		"label[3.5,0;Sign workshop - Create signs for your roads!]",
+		"label[0,0.5;Available signs:]",
+		"list[context;streets:signworkshop_list;0,1;5,4]",
+		"label[9,0.5;Needed stuff:]",
+		"list[context;streets:signworkshop_recipe;8,1;4,1]",
+		"label[9,2;Put it here:]",
+		"list[context;streets:signworkshop_input;8,3;4,1]",
+		"label[5.8,0.5;Selected:]",
+		"list[context;streets:signworkshop_select;6,1;1,1]",
+		"label[5.8,2.5;Output:]",
+		"list[context;streets:signworkshop_output;6,3;1,1]",
+		"list[current_player;main;2,6;8,4]"
+		-- 
+	}
+}
+minetest.register_node(":streets:signworkshop",{
+	description = "Sign workshop",
+	tiles = {"streets_signworkshop_top.png","streets_signworkshop_bottom.png","streets_signworkshop_side.png","streets_signworkshop_side.png","streets_signworkshop_side.png","streets_signworkshop_front.png"},
+	groups = {cracky = 1, level = 2},
+	paramtype2 = "facedir",
+	after_place_node = function(pos)
+		minetest.get_meta(pos):set_string("formspec",table.concat(forms.inactive))
+		local meta = minetest.get_meta(pos)
+		local inv = meta:get_inventory()
+		inv:set_size("streets:signworkshop_list",5*4)
+		inv:set_size("streets:signworkshop_recipe",3*2)
+		inv:set_size("streets:signworkshop_input",4*1)
+		inv:set_size("streets:signworkshop_select",1*1)
+		inv:set_size("streets:signworkshop_output",1*1)
+		-- Fill
+		inv:add_item("streets:signworkshop_list","streets:sign_blank")
+		inv:add_item("streets:signworkshop_list","streets:sign_lava")
+		inv:add_item("streets:signworkshop_list","streets:sign_water")
+		inv:add_item("streets:signworkshop_list","streets:sign_construction")
+		-- Meta
+		meta:set_string("infotext","Sign workshop idle")
+		meta:set_string("idle","y")
+	end,
+	allow_metadata_inventory_put = function(pos, listname, index, stack, player)
+		if listname ~= "streets:signworkshop_input" then
+			return 0
+		else
+			return 1
+		end
+	end,
+	allow_metadata_inventory_move = function(pos, from_list, from_index, to_list, to_index, count, player)
+		-- Move items inside input slots
+		if to_list == "streets:signworkshop_input" and from_list == "streets:signworkshop_input" then
+			return 1
+		-- List -> selection
+		elseif from_list == "streets:signworkshop_list" and to_list == "streets:signworkshop_select" then
+			local inv = minetest.get_meta(pos):get_inventory()
+			local selected = inv:get_stack("streets:signworkshop_list",from_index):to_table()
+			local need = minetest.registered_nodes[selected.name].streets.signworkshop.recipe
+			inv:set_list("streets:signworkshop_recipe",{need[1],need[2],need[3],need[4]})
+			return 1
+		-- selection -> list
+		elseif from_list == "streets:signworkshop_select" and to_list == "streets:signworkshop_list" then
+			local inv = minetest.get_meta(pos):get_inventory()
+			inv:set_list("streets:signworkshop_recipe",{"","","",""})
+			return 1
+		-- Every other case
+		else
+			return 0
+		end
+	end,
+	allow_metadata_inventory_take = function(pos, listname, index, stack, player)
+		if listname == "streets:signworkshop_input" or listname == "streets:signworkshop_output" then
+			return 99
+		else
+			return 0
+		end
+	end,
+	on_receive_fields = function(pos, formname, fields, sender)
+		local meta = minetest.get_meta(pos)
+		local inv = meta:get_inventory()
+		--
+		if inv:is_empty("streets:signworkshop_input") ~= true and inv:is_empty("streets:signworkshop_select") ~= true and meta:get_string("idle") == "y" then
+			local selection = inv:get_stack("streets:signworkshop_select",1):get_name()
+			local def = minetest.registered_nodes[selection].streets.signworkshop
+			local need = inv:get_list("streets:signworkshop_recipe")
+			local has = inv:get_list("streets:signworkshop_input")
+			need[1] = need[1]:to_table()
+			need[2] = need[2]:to_table()
+			need[3] = need[3]:to_table()
+			need[4] = need[4]:to_table()
+			has[1] = has[1]:to_table()
+			has[2] = has[2]:to_table()
+			has[3] = has[3]:to_table()
+			has[4] = has[4]:to_table()
+			if need[1] == nil then need[1] = { name = "" } end
+			if need[2] == nil then need[2] = { name = "" } end
+			if need[3] == nil then need[3] = { name = "" } end
+			if need[4] == nil then need[4] = { name = "" } end
+			if has[1] == nil then has[1] = { name = "" } end
+			if has[2] == nil then has[2] = { name = "" } end
+			if has[3] == nil then has[3] = { name = "" } end
+			if has[4] == nil then has[4] = { name = "" } end
+			if need[1].name == has[1].name and need[2].name == has[2].name and need[3].name == has[3].name and need[4].name == has[4].name then
+				meta:set_string("infotext","Sign workshop working")
+				meta:set_string("idle","n")
+				meta:set_string("formspec",table.concat(forms.active) .. "label[8,4;Please wait " .. def.time .. " seconds...]")
+				-- Clear input
+				inv:set_list("streets:signworkshop_input",{"","","",""})
+				minetest.after(def.time,function()
+					-- Reset infotext and meta
+					meta:set_string("infotext","Sign workshop idle")
+					meta:set_string("idle","y")
+					meta:set_string("formspec",table.concat(forms.inactive))
+					-- Fill output
+					inv:add_item("streets:signworkshop_output",selection)
+				end)
+			end
+		end
+	end
+})
+
+minetest.register_craft({
+	output = "streets:signworkshop",
+	recipe = {
+		{"default:steel_ingot","default:glass","default:steel_ingot"},
+		{"default:steel_ingot","default:diamond","default:steel_ingot"},
+		{"default:cobble","default:cobble","default:cobble"}
+	}
+})
\ No newline at end of file