Metals update

Double ingots, sheets, double sheets added. Now buckets must be forged by sheets.

mods/anvil/init.lua

@@ -21,18 +21,34 @@ function realtest.register_anvil_recipe(RecipeDef)
 	end
 end
 
---Unshaped metals and buckets
+--Unshaped metals, buckets, double ingots and sheets
 for _, metal in ipairs(METALS_LIST) do
 	realtest.register_anvil_recipe({
 		item1 = "metals:"..metal.."_unshaped",
 		output = "metals:"..metal.."_ingot",
 	})
 	realtest.register_anvil_recipe({
-		item1 = "metals:"..metal.."_ingot",
+		item1 = "metals:"..metal.."_sheet",
 		item2 = "metals:recipe_bucket",
 		rmitem2 = false,
 		output = "metals:bucket_empty_"..metal,
 	})
+	realtest.register_anvil_recipe({
+		item1 = "metals:"..metal.."_doubleingot",
+		output = "metals:"..metal.."_sheet",
+	})
+	realtest.register_anvil_recipe({
+		type = "weld",
+		item1 = "metals:"..metal.."_ingot",
+		item2 = "metals:"..metal.."_ingot",
+		output = "metals:"..metal.."_doubleingot",
+	})
+	realtest.register_anvil_recipe({
+		type = "weld",
+		item1 = "metals:"..metal.."_sheet",
+		item2 = "metals:"..metal.."_sheet",
+		output = "metals:"..metal.."_doublesheet",
+	})
 end
 --Pig iron --> Wrought iron
 realtest.register_anvil_recipe({
@@ -191,7 +207,29 @@ minetest.register_node("anvil:self", {
 				end 
 			end
 		elseif fields["buttonWeld"] then
-			
+			if flux:get_name() == "minerals:flux" and table.contains(anvil.hammers, hammer:get_name()) then
+				for _, recipe in ipairs(realtest.registered_anvil_recipes) do
+					if recipe.type == "weld" and recipe.item1 == src1:get_name() and recipe.item2 == src2:get_name() then
+						if inv:room_for_item("output", recipe.output) then
+							if recipe.rmitem1 then
+								src1:take_item()
+								inv:set_stack("src1", 1, src1)
+							end
+							if recipe.item2 ~= "" and recipe.rmitem2 then
+								src2:take_item()
+								inv:set_stack("src2", 1, src2)
+							end
+							output:add_item(recipe.output)
+							inv:set_stack("output", 1, output)
+							flux:take_item()
+							inv:set_stack("flux", 1, flux)
+							hammer:add_wear(65535/60)
+							inv:set_stack("hammer", 1, hammer)
+						end
+						return
+					end
+				end 
+			end
 		end
 	end,
 })

mods/metals/init.lua

@@ -29,8 +29,8 @@ METALS_LIST={
 
 DESC_LIST={
 	'Bismuth',
-	'Pig iron',
-	'Wrought iron',
+	'Pig Iron',
+	'Wrought Iron',
 	'Steel',
 	'Gold',
 	'Nickel',
@@ -41,12 +41,12 @@ DESC_LIST={
 	'Copper',
 	'Zinc',
 	'Brass',
-	'Sterling silver',
-	'Rose gold',
-	'Black bronze',
-	'Bismuth bronze',
+	'Sterling Silver',
+	'Rose Gold',
+	'Black Bronze',
+	'Bismuth Bronze',
 	'Bronze',
-	'Black steel',
+	'Black Steel',
 	'Aluminium'
 }
 
@@ -84,15 +84,30 @@ for i=1, #METALS_LIST do
 	--
 	
 	minetest.register_craftitem("metals:"..METALS_LIST[i].."_unshaped", {
-		description = "Unshaped "..DESC_SMALL_LIST[i],
+		description = "Unshaped "..DESC_LIST[i],
 		inventory_image = "metals_"..METALS_LIST[i].."_unshaped.png",
 	})
 	
 	minetest.register_craftitem("metals:"..METALS_LIST[i].."_ingot", {
-		description = DESC_LIST[i].." ingot",
+		description = DESC_LIST[i].." Ingot",
 		inventory_image = "metals_"..METALS_LIST[i].."_ingot.png",
 	})
 	
+	minetest.register_craftitem("metals:" .. METALS_LIST[i] .. "_doubleingot", {
+		description = DESC_LIST[i] .. " Double Ingot",
+		inventory_image = "metals_" .. METALS_LIST[i] .. "_doubleingot.png",
+	})
+	
+	minetest.register_craftitem("metals:" .. METALS_LIST[i] .. "_sheet", {
+		description = DESC_LIST[i] .. " Sheet",
+		inventory_image = "metals_" .. METALS_LIST[i] .. "_sheet.png",
+	})
+	
+	minetest.register_craftitem("metals:" .. METALS_LIST[i] .. "_doublesheet", {
+		description = DESC_LIST[i] .. " Double Sheet",
+		inventory_image = "metals_" .. METALS_LIST[i] .. "_doublesheet.png",
+	})
+	
 	minetest.register_craftitem("metals:tool_pick_"..METALS_LIST[i].."_head", {
 		description =DESC_LIST[i].." pickaxe head",
 		inventory_image = "metals_tool_pick_"..METALS_LIST[i].."_head.png",
@@ -439,13 +454,13 @@ end
 --
 
 local recipes = {
-	{"metals:recipe_pick", "Pick recipe"},
-	{"metals:recipe_axe", "Axe recipe"},
-	{"metals:recipe_shovel", "Shovel recipe"},
-	{"metals:recipe_sword", "Sword recipe"},
-	{"metals:recipe_hammer", "Hammer recipe"},
-	{"metals:recipe_spear", "Spear recipe"},
-	{"metals:recipe_bucket","Bucket recipe"},
+	{"metals:recipe_pick", "Pick Recipe"},
+	{"metals:recipe_axe", "Axe Recipe"},
+	{"metals:recipe_shovel", "Shovel Recipe"},
+	{"metals:recipe_sword", "Sword Recipe"},
+	{"metals:recipe_hammer", "Hammer Recipe"},
+	{"metals:recipe_spear", "Spear Recipe"},
+	{"metals:recipe_bucket","Bucket Recipe"},
 }
 
 for _, recipe in ipairs(recipes) do
@@ -512,11 +527,6 @@ minetest.register_craft({
 -- Other
 --
 
-minetest.register_craftitem(":default:steel_ingot", {
-	description = "Double wrought ingot",
-	inventory_image = "metals_wrought_iron_ingot.png",
-})
-
 --
 -- Entitis