Merge pull request #20 from ethic-rush/master

Made a few changes to the way signs are registered

8 files changed, 52 insertions, 130 deletions

diff --git a/roadsigns/init.lua b/roadsigns/init.lua
index 73401fa..ccb58ea 100644
--- a/roadsigns/init.lua
+++ b/roadsigns/init.lua
@@ -3,5 +3,40 @@
 ]]
 streets.workshop = {}
 
+streets.workshop.register_sign  = function(nodename, desc, img, rrecipe, rtime)
+	
+	minetest.register_node(nodename,{
+		description = desc,
+		tiles = img,
+		inventory_image = img,
+		wield_image = img,
+		groups = {snappy = 1,attached_node = 1},
+		on_construct = function(pos)
+			local meta = minetest.get_meta(pos)
+			meta:set_string("infotext", desc)
+		end,
+		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 = rrecipe,
+		time = rtime
+		}
+		}
+	})
+end
+
 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
+dofile(minetest.get_modpath(minetest.get_current_modname()) .. "/workshop.lua")
diff --git a/roadsigns/signs.lua b/roadsigns/signs.lua
index 03b4139..d5d8ee1 100644
--- a/roadsigns/signs.lua
+++ b/roadsigns/signs.lua
@@ -1,130 +1,17 @@
-minetest.register_node(":streets:sign_blank",{
-	description = streets.S("Empty 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}
-		}
-	},
-	paramtype = "light",
-	paramtype2 = "wallmounted",
-	walkable = false,
-	sunlight_propagates = true,
-	selection_box = {
-		type = "wallmounted"
-	},
-	streets = {
-		signworkshop = {
-			recipe = {"default:steel_ingot","","",""},
-			time = 3
-		}
-	},
-	after_place_node = function(pos)
-		local meta = minetest.get_meta(pos)
-		
-		meta:set_string("infotext", streets.S("Empty Sign"))
-	end
-})
-minetest.register_node(":streets:sign_lava",{
-	description = streets.S("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}
-		}
-	},
-	paramtype = "light",
-	paramtype2 = "wallmounted",
-	walkable = false,
-	sunlight_propagates = true,
-	selection_box = {
-		type = "wallmounted"
-	},
-	streets = {
-		signworkshop = {
-			recipe = {"streets:sign_blank","bucket:bucket_lava","",""},
-			time = 5
-		}
-	},
-	after_place_node = function(pos)
-		local meta = minetest.get_meta(pos)
-		
-		meta:set_string("infotext", streets.S("Warning: Careful of lava"))
-	end
-})
-	
-minetest.register_node(":streets:sign_water",{
-	description = streets.S("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
-		}
-	},
-	after_place_node = function(pos)
-		local meta = minetest.get_meta(pos)
-		
-		meta:set_string("infotext", streets.S("Warning: Water nearby"))
-	end
-})
+-- example: streets.workshop.register_sign(nodename, desc, img, recipe, time)
+streets.workshop.register_sign(":streets:sign_blank", treets.S("Empty sign"), "streets_sign_back.png", {"default:steel_ingot","","",""}, 3)
 
-minetest.register_node(":streets:sign_construction",{
-	description = streets.S("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}
-		}
-	},
-	paramtype = "light",
-	paramtype2 = "wallmounted",
-	walkable = false,
-	sunlight_propagates = true,
-	selection_box = {
-		type = "wallmounted"
-	},
-	streets = {
-		signworkshop = {
-			recipe = {"streets:sign_blank","default:dirt","",""},
-			time = 5
-		}
-	},
-	after_place_node = function(pos)
-		local meta = minetest.get_meta(pos)
-		
-		meta:set_string("infotext", streets.S("Warning: Construction area, possible deep excavations"))
-	end
-})
+streets.workshop.register_sign(":streets:sign_lava", streets.S("Warning sign (lava)"), "streets_sign_lava.png", {"streets:sign_blank","bucket:bucket_lava","",""}, 5)
+
+streets.workshop.register_sign(":streets:sign_water", streets.S("Warning sign (water)"), "streets_sign_water.png", {"streets:sign_blank","bucket:bucket_water","",""}, 5)
+
+streets.workshop.register_sign(":streets:sign_construction", streets.S("Warning sign (Construction area)"), "streets_sign_construction.png", {"streets:sign_blank","default:dirt","",""}, 5)
+
+
+streets.workshop.register_sign(":streets:sign_mine", streets.S("Notice sign (Public Mine Ahead)"), "streets_sign_mine.png", {"streets:sign_blank","default:dirt","",""}, 5)
+
+streets.workshop.register_sign(":streets:sign_shop", streets.S("Notice sign (Shop/Mall Ahead)"), "streets_sign_construction.png", {"streets:sign_blank","default:dirt","",""}, 5)
+
+streets.workshop.register_sign(":streets:sign_workshop", streets.S("Notice sign (Public Workshop Ahead)"), "streets_sign_workshop.png", {"streets:sign_blank","default:dirt","",""}, 5)
+
+streets.workshop.register_sign(":streets:sign_grasswalk", streets.S("Warning sign (No walking on the grass)"), "streets_sign_grasswalk.png", {"streets:sign_blank","default:dirt","",""}, 5)
diff --git a/streetsmod/textures/Thumbs.db b/streetsmod/textures/Thumbs.db
new file mode 100644
index 0000000..e4d9f4f
--- /dev/null
+++ b/streetsmod/textures/Thumbs.db
diff --git a/streetsmod/textures/streets_asphalt.png b/streetsmod/textures/streets_asphalt.png
index 9210759..1841635 100644
--- a/streetsmod/textures/streets_asphalt.png
+++ b/streetsmod/textures/streets_asphalt.png
diff --git a/streetsmod/textures/streets_sign_grasswalk.png b/streetsmod/textures/streets_sign_grasswalk.png
new file mode 100644
index 0000000..1a72dff
--- /dev/null
+++ b/streetsmod/textures/streets_sign_grasswalk.png
diff --git a/streetsmod/textures/streets_sign_mine.png b/streetsmod/textures/streets_sign_mine.png
new file mode 100644
index 0000000..92aaf97
--- /dev/null
+++ b/streetsmod/textures/streets_sign_mine.png
diff --git a/streetsmod/textures/streets_sign_shop.png b/streetsmod/textures/streets_sign_shop.png
new file mode 100644
index 0000000..b30ea8e
--- /dev/null
+++ b/streetsmod/textures/streets_sign_shop.png
diff --git a/streetsmod/textures/streets_sign_workshop.png b/streetsmod/textures/streets_sign_workshop.png
new file mode 100644
index 0000000..3c399bc
--- /dev/null
+++ b/streetsmod/textures/streets_sign_workshop.png