From 476be0a916e114c71701e9aa6ec4336f46262c78 Mon Sep 17 00:00:00 2001 From: FreeLikeGNU Date: Sat, 8 Aug 2015 10:24:08 -0700 Subject: [PATCH] Revert "Bronze is made of copper and not better than steel." This reverts commit e3abcb55455e774afd1c0bfb1ead2b9820a1aad5. --- mods/default/crafting.lua | 40 ++++++++--------- mods/default/craftitems.lua | 8 ++-- mods/default/tools.lua | 88 ++++++++++++++++++------------------- mods/farming/hoes.lua | 14 +++--- 4 files changed, 75 insertions(+), 75 deletions(-) diff --git a/mods/default/crafting.lua b/mods/default/crafting.lua index 99ff4222..304b2032 100644 --- a/mods/default/crafting.lua +++ b/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", diff --git a/mods/default/craftitems.lua b/mods/default/craftitems.lua index 7d35cd05..facff57e 100644 --- a/mods/default/craftitems.lua +++ b/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", diff --git a/mods/default/tools.lua b/mods/default/tools.lua index 13f67225..a948886a 100644 --- a/mods/default/tools.lua +++ b/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", diff --git a/mods/farming/hoes.lua b/mods/farming/hoes.lua index ed439140..31da19ff 100644 --- a/mods/farming/hoes.lua +++ b/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",