Revert "Bronze is made of copper and not better than steel."

This reverts commit e3abcb5545.

mods/default/crafting.lua

@@ -369,7 +369,7 @@ minetest.register_craft({
 minetest.register_craft({
 	type = "shapeless",
 	output = "default:bronze_ingot",
-	recipe = {"default:copper_ingot"},
+	recipe = {"default:steel_ingot", "default:copper_ingot"},
 })
 
 minetest.register_craft({
@@ -404,21 +404,21 @@ minetest.register_craft({
 	}
 })
 
--- minetest.register_craft({
--- 	output = 'default:copperblock',
--- 	recipe = {
--- 		{'default:copper_ingot', 'default:copper_ingot', 'default:copper_ingot'},
--- 		{'default:copper_ingot', 'default:copper_ingot', 'default:copper_ingot'},
--- 		{'default:copper_ingot', 'default:copper_ingot', 'default:copper_ingot'},
--- 	}
--- })
+minetest.register_craft({
+	output = 'default:copperblock',
+	recipe = {
+		{'default:copper_ingot', 'default:copper_ingot', 'default:copper_ingot'},
+		{'default:copper_ingot', 'default:copper_ingot', 'default:copper_ingot'},
+		{'default:copper_ingot', 'default:copper_ingot', 'default:copper_ingot'},
+	}
+})
 
--- minetest.register_craft({
--- 	output = 'default:copper_ingot 9',
--- 	recipe = {
--- 		{'default:copperblock'},
--- 	}
--- })
+minetest.register_craft({
+	output = 'default:copper_ingot 9',
+	recipe = {
+		{'default:copperblock'},
+	}
+})
 
 minetest.register_craft({
 	output = 'default:bronzeblock',
@@ -683,11 +683,11 @@ minetest.register_craft({
 	recipe = "default:iron_lump",
 })
 
---minetest.register_craft({
---	type = "cooking",
---	output = "default:copper_ingot",
---	recipe = "default:copper_lump",
---})
+minetest.register_craft({
+	type = "cooking",
+	output = "default:copper_ingot",
+	recipe = "default:copper_lump",
+})
 
 minetest.register_craft({
 	type = "cooking",

mods/default/craftitems.lua

@@ -128,10 +128,10 @@ minetest.register_craftitem("default:steel_ingot", {
 	inventory_image = "default_steel_ingot.png",
 })
 
---minetest.register_craftitem("default:copper_ingot", {
---	description = "Copper Ingot",
---	inventory_image = "default_copper_ingot.png",
---})
+minetest.register_craftitem("default:copper_ingot", {
+	description = "Copper Ingot",
+	inventory_image = "default_copper_ingot.png",
+})
 
 minetest.register_craftitem("default:bronze_ingot", {
 	description = "Bronze Ingot",

mods/default/tools.lua

@@ -45,21 +45,21 @@ minetest.register_tool("default:pick_stone", {
 		damage_groups = {fleshy=3},
 	},
 })
-minetest.register_tool("default:pick_bronze", {
-	description = "Bronze Pickaxe",
-	inventory_image = "default_tool_bronzepick.png",
+minetest.register_tool("default:pick_steel", {
+	description = "Steel Pickaxe",
+	inventory_image = "default_tool_steelpick.png",
 	tool_capabilities = {
 		full_punch_interval = 1.0,
 		max_drop_level=1,
 		groupcaps={
-			cracky = {times={[1]=3.00, [2]=1.60, [3]=0.80}, uses=25, maxlevel=2},
+			cracky = {times={[1]=4.00, [2]=1.60, [3]=0.80}, uses=20, maxlevel=2},
 		},
 		damage_groups = {fleshy=4},
 	},
 })
-minetest.register_tool("default:pick_steel", {
-	description = "Steel Pickaxe",
-	inventory_image = "default_tool_steelpick.png",
+minetest.register_tool("default:pick_bronze", {
+	description = "Bronze Pickaxe",
+	inventory_image = "default_tool_bronzepick.png",
 	tool_capabilities = {
 		full_punch_interval = 1.0,
 		max_drop_level=1,
@@ -124,19 +124,6 @@ minetest.register_tool("default:shovel_stone", {
 		damage_groups = {fleshy=2},
 	},
 })
-minetest.register_tool("default:shovel_bronze", {
-	description = "Bronze Shovel",
-	inventory_image = "default_tool_bronzeshovel.png",
-	wield_image = "default_tool_bronzeshovel.png^[transformR90",
-	tool_capabilities = {
-		full_punch_interval = 1.1,
-		max_drop_level=1,
-		groupcaps={
-			crumbly = {times={[1]=1.60, [2]=0.90, [3]=0.40}, uses=25, maxlevel=2},
-		},
-		damage_groups = {fleshy=3},
-	},
-})
 minetest.register_tool("default:shovel_steel", {
 	description = "Steel Shovel",
 	inventory_image = "default_tool_steelshovel.png",
@@ -150,6 +137,19 @@ minetest.register_tool("default:shovel_steel", {
 		damage_groups = {fleshy=3},
 	},
 })
+minetest.register_tool("default:shovel_bronze", {
+	description = "Bronze Shovel",
+	inventory_image = "default_tool_bronzeshovel.png",
+	wield_image = "default_tool_bronzeshovel.png^[transformR90",
+	tool_capabilities = {
+		full_punch_interval = 1.1,
+		max_drop_level=1,
+		groupcaps={
+			crumbly = {times={[1]=1.50, [2]=0.90, [3]=0.40}, uses=40, maxlevel=2},
+		},
+		damage_groups = {fleshy=3},
+	},
+})
 minetest.register_tool("default:shovel_mese", {
 	description = "Mese Shovel",
 	inventory_image = "default_tool_meseshovel.png",
@@ -205,18 +205,6 @@ minetest.register_tool("default:axe_stone", {
 		damage_groups = {fleshy=3},
 	},
 })
-minetest.register_tool("default:axe_bronze", {
-	description = "Bronze Axe",
-	inventory_image = "default_tool_bronzeaxe.png",
-	tool_capabilities = {
-		full_punch_interval = 1.0,
-		max_drop_level=1,
-		groupcaps={
-			choppy={times={[1]=2.50, [2]=1.60, [3]=1.00}, uses=25, maxlevel=2},
-		},
-		damage_groups = {fleshy=4},
-	},
-})
 minetest.register_tool("default:axe_steel", {
 	description = "Steel Axe",
 	inventory_image = "default_tool_steelaxe.png",
@@ -229,6 +217,18 @@ minetest.register_tool("default:axe_steel", {
 		damage_groups = {fleshy=4},
 	},
 })
+minetest.register_tool("default:axe_bronze", {
+	description = "Bronze Axe",
+	inventory_image = "default_tool_bronzeaxe.png",
+	tool_capabilities = {
+		full_punch_interval = 1.0,
+		max_drop_level=1,
+		groupcaps={
+			choppy={times={[1]=2.50, [2]=1.40, [3]=1.00}, uses=30, maxlevel=2},
+		},
+		damage_groups = {fleshy=4},
+	},
+})
 minetest.register_tool("default:axe_mese", {
 	description = "Mese Axe",
 	inventory_image = "default_tool_meseaxe.png",
@@ -282,18 +282,6 @@ minetest.register_tool("default:sword_stone", {
 		damage_groups = {fleshy=4},
 	}
 })
-minetest.register_tool("default:sword_bronze", {
-	description = "Bronze Sword",
-	inventory_image = "default_tool_bronzesword.png",
-	tool_capabilities = {
-		full_punch_interval = 0.8,
-		max_drop_level=1,
-		groupcaps={
-			snappy={times={[1]=2, [2]=1.20, [3]=0.35}, uses=25, maxlevel=2},
-		},
-		damage_groups = {fleshy=6},
-	}
-})
 minetest.register_tool("default:sword_steel", {
 	description = "Steel Sword",
 	inventory_image = "default_tool_steelsword.png",
@@ -306,6 +294,18 @@ minetest.register_tool("default:sword_steel", {
 		damage_groups = {fleshy=6},
 	}
 })
+minetest.register_tool("default:sword_bronze", {
+	description = "Bronze Sword",
+	inventory_image = "default_tool_bronzesword.png",
+	tool_capabilities = {
+		full_punch_interval = 0.8,
+		max_drop_level=1,
+		groupcaps={
+			snappy={times={[1]=2.5, [2]=1.20, [3]=0.35}, uses=40, maxlevel=2},
+		},
+		damage_groups = {fleshy=6},
+	}
+})
 minetest.register_tool("default:sword_mese", {
 	description = "Mese Sword",
 	inventory_image = "default_tool_mesesword.png",

mods/farming/hoes.lua

@@ -12,13 +12,6 @@ farming.register_hoe(":farming:hoe_stone", {
 	material = "group:stone"
 })
 
-farming.register_hoe(":farming:hoe_bronze", {
-	description = "Bronze Hoe",
-	inventory_image = "farming_tool_bronzehoe.png",
-	max_uses = 150,
-	material = "default:bronze_ingot"
-})
-
 farming.register_hoe(":farming:hoe_steel", {
 	description = "Steel Hoe",
 	inventory_image = "farming_tool_steelhoe.png",
@@ -26,6 +19,13 @@ farming.register_hoe(":farming:hoe_steel", {
 	material = "default:steel_ingot"
 })
 
+farming.register_hoe(":farming:hoe_bronze", {
+	description = "Bronze Hoe",
+	inventory_image = "farming_tool_bronzehoe.png",
+	max_uses = 220,
+	material = "default:bronze_ingot"
+})
+
 farming.register_hoe(":farming:hoe_mese", {
 	description = "Mese Hoe",
 	inventory_image = "farming_tool_mesehoe.png",