Merge PR from mbb: add better textures and crafts

9 files changed, 83 insertions, 9 deletions

diff --git a/advtrains/advtrains/craft_items.lua b/advtrains/advtrains/craft_items.lua
new file mode 100644
index 0000000..a4db385
--- /dev/null
+++ b/advtrains/advtrains/craft_items.lua
@@ -0,0 +1,23 @@
+ 
+core.register_craftitem("advtrains:boiler", {
+	description = "Boiler",
+	inventory_image = "advtrains_boiler.png",
+})
+
+ 
+core.register_craftitem("advtrains:driver_cab", {
+	description = "driver's cab",
+	inventory_image = "advtrains_driver_cab.png",
+})
+
+ 
+core.register_craftitem("advtrains:wheel", {
+	description = "Wheel",
+	inventory_image = "advtrains_wheel.png",
+})
+
+
+core.register_craftitem("advtrains:chimney", {
+	description = "Chimney",
+	inventory_image = "advtrains_chimney.png",
+})
diff --git a/advtrains/advtrains/crafting.lua b/advtrains/advtrains/crafting.lua
index 5ba12ce..72cd6da 100644
--- a/advtrains/advtrains/crafting.lua
+++ b/advtrains/advtrains/crafting.lua
@@ -65,6 +65,45 @@ minetest.register_craft({
 	},
 })
 
+--boiler
+minetest.register_craft({
+	output = 'advtrains:boiler',
+	recipe = {
+		{'default:steel_ingot', 'default:steel_ingot', 'default:steel_ingot'},
+		{'doors:trapdoor_steel', '', 'default:steel_ingot'},
+		{'default:steel_ingot', 'default:steel_ingot', 'default:steel_ingot'},
+	},
+})
+
+--drivers'cab
+minetest.register_craft({
+	output = 'advtrains:driver_cab',
+	recipe = {
+		{'default:steel_ingot', 'default:steel_ingot', 'default:steel_ingot'},
+		{'', '', 'default:glass'},
+		{'default:steel_ingot', 'default:steel_ingot', 'default:steel_ingot'},
+	},
+})
+
+--drivers'cab
+minetest.register_craft({
+	output = 'advtrains:wheel',
+	recipe = {
+		{'', 'default:steel_ingot', ''},
+		{'default:steel_ingot', 'group:stick', 'default:steel_ingot'},
+		{'', 'default:steel_ingot', ''},
+	},
+})
+
+--chimney
+minetest.register_craft({
+	output = 'advtrains:chimney',
+	recipe = {
+		{'', 'default:steel_ingot', ''},
+		{'', 'default:steel_ingot', 'default:torch'},
+		{'', 'default:steel_ingot', ''},
+	},
+})
 
 
 --misc_nodes
diff --git a/advtrains/advtrains/init.lua b/advtrains/advtrains/init.lua
index ad50dfe..5ae5e80 100644
--- a/advtrains/advtrains/init.lua
+++ b/advtrains/advtrains/init.lua
@@ -84,6 +84,8 @@ dofile(advtrains.modpath.."/damage.lua")
 dofile(advtrains.modpath.."/signals.lua")
 dofile(advtrains.modpath.."/misc_nodes.lua")
 dofile(advtrains.modpath.."/crafting.lua")
+dofile(advtrains.modpath.."/craft_items.lua")
+
 
 --load/save
 
diff --git a/advtrains/advtrains/textures/advtrains_boiler.png b/advtrains/advtrains/textures/advtrains_boiler.png
new file mode 100644
index 0000000..8c7ff0d
--- /dev/null
+++ b/advtrains/advtrains/textures/advtrains_boiler.png
diff --git a/advtrains/advtrains/textures/advtrains_chimney.png b/advtrains/advtrains/textures/advtrains_chimney.png
new file mode 100644
index 0000000..285a1a6
--- /dev/null
+++ b/advtrains/advtrains/textures/advtrains_chimney.png
diff --git a/advtrains/advtrains/textures/advtrains_driver_cab.png b/advtrains/advtrains/textures/advtrains_driver_cab.png
new file mode 100644
index 0000000..331bcc9
--- /dev/null
+++ b/advtrains/advtrains/textures/advtrains_driver_cab.png
diff --git a/advtrains/advtrains/textures/advtrains_wheel.png b/advtrains/advtrains/textures/advtrains_wheel.png
new file mode 100644
index 0000000..fb72879
--- /dev/null
+++ b/advtrains/advtrains/textures/advtrains_wheel.png
diff --git a/advtrains/advtrains_train_steam/init.lua b/advtrains/advtrains_train_steam/init.lua
index e489fd4..16a71f7 100644
--- a/advtrains/advtrains_train_steam/init.lua
+++ b/advtrains/advtrains_train_steam/init.lua
@@ -139,7 +139,7 @@ advtrains.register_wagon("detailed_steam_engine", {
 		})
 	end,
 	drops={"default:steelblock 4"},
-}, S("Detailed Steam Engine"), "advtrains_engine_steam_inv.png")
+}, S("Detailed Steam Engine"), "advtrains_detailed_engine_steam_inv.png")
 
 advtrains.register_wagon("wagon_default", {
 	mesh="advtrains_passenger_wagon.b3d",
@@ -209,24 +209,34 @@ advtrains.register_wagon("wagon_box", {
 minetest.register_craft({
 	output = 'advtrains:newlocomotive',
 	recipe = {
-		{'default:steelblock', 'default:steelblock', 'default:steelblock'},
-		{'default:steelblock', 'dye:black', 'default:steelblock'},
-		{'default:steelblock', 'default:steelblock', 'default:steelblock'},
+		{'', '', 'advtrains:chimney'},
+		{'advtrains:driver_cab', 'dye:black', 'advtrains:boiler'},
+		{'advtrains:wheel', 'advtrains:wheel', 'advtrains:wheel'},
 	},
 })
+
+minetest.register_craft({
+	output = 'advtrains:detailed_steam_engine',
+	recipe = {
+		{'', '', 'advtrains:chimney'},
+		{'advtrains:driver_cab', 'dye:green', 'advtrains:boiler'},
+		{'advtrains:wheel', 'advtrains:wheel', 'advtrains:wheel'},
+	},
+})
+
 minetest.register_craft({
 	output = 'advtrains:wagon_default',
 	recipe = {
 		{'default:steelblock', 'default:steelblock', 'default:steelblock'},
-		{'default:steelblock', 'dye:dark_green', 'default:steelblock'},
-		{'default:steelblock', 'default:steelblock', 'default:steelblock'},
+		{'default:glass', 'dye:dark_green', 'default:glass'},
+		{'advtrains:wheel', 'advtrains:wheel', 'advtrains:wheel'},
 	},
 })
 minetest.register_craft({
 	output = 'advtrains:wagon_box',
 	recipe = {
-		{'default:steelblock', 'default:steelblock', 'default:steelblock'},
-		{'default:steelblock', 'default:chest', 'default:steelblock'},
-		{'default:steelblock', 'default:steelblock', 'default:steelblock'},
+		{'group:wood', 'group:wood', 'group:wood'},
+		{'group:wood', 'default:chest', 'group:wood'},
+		{'advtrains:wheel', '', 'advtrains:wheel'},
 	},
 })
diff --git a/advtrains/advtrains_train_steam/textures/advtrains_detailed_engine_steam_inv.png b/advtrains/advtrains_train_steam/textures/advtrains_detailed_engine_steam_inv.png
new file mode 100644
index 0000000..51adb5a
--- /dev/null
+++ b/advtrains/advtrains_train_steam/textures/advtrains_detailed_engine_steam_inv.png