From 3dd43c7c6f8a0dc370b5ffcee6405c6b5530e597 Mon Sep 17 00:00:00 2001 From: stujones11 Date: Thu, 19 Feb 2015 19:18:34 +0000 Subject: [PATCH] Update shields to use the ARMOR_MATERIALS table --- shields/init.lua | 162 +++++++++++++++++++++++------------------------ 1 file changed, 79 insertions(+), 83 deletions(-) diff --git a/shields/init.lua b/shields/init.lua index 8a67713..2bc3019 100644 --- a/shields/init.lua +++ b/shields/init.lua @@ -9,49 +9,89 @@ minetest.register_tool("shields:shield_admin", { wear = 0, }) -minetest.register_tool("shields:shield_wood", { - description = "Wooden Shield", - inventory_image = "shields_inv_shield_wood.png", - groups = {armor_shield=5, armor_heal=0, armor_use=2000}, - wear = 0, -}) +if ARMOR_MATERIALS.wood then + minetest.register_tool("shields:shield_wood", { + description = "Wooden Shield", + inventory_image = "shields_inv_shield_wood.png", + groups = {armor_shield=5, armor_heal=0, armor_use=2000}, + wear = 0, + }) + minetest.register_tool("shields:shield_enhanced_wood", { + description = "Enhanced Wood Shield", + inventory_image = "shields_inv_shield_enhanced_wood.png", + groups = {armor_shield=8, armor_heal=0, armor_use=1000}, + wear = 0, + }) + minetest.register_craft({ + output = "shields:shield_enhanced_wood", + recipe = { + {"default:steel_ingot"}, + {"shields:shield_wood"}, + {"default:steel_ingot"}, + }, + }) +end -minetest.register_tool("shields:shield_cactus", { - description = "Cactus Shield", - inventory_image = "shields_inv_shield_cactus.png", - groups = {armor_shield=5, armor_heal=0, armor_use=2000}, - wear = 0, -}) +if ARMOR_MATERIALS.cactus then + minetest.register_tool("shields:shield_cactus", { + description = "Cactus Shield", + inventory_image = "shields_inv_shield_cactus.png", + groups = {armor_shield=5, armor_heal=0, armor_use=2000}, + wear = 0, + }) + minetest.register_tool("shields:shield_enhanced_cactus", { + description = "Enhanced Cactus Shield", + inventory_image = "shields_inv_shield_enhanced_cactus.png", + groups = {armor_shield=8, armor_heal=0, armor_use=1000}, + wear = 0, + }) + minetest.register_craft({ + output = "shields:shield_enhanced_cactus", + recipe = { + {"default:steel_ingot"}, + {"shields:shield_cactus"}, + {"default:steel_ingot"}, + }, + }) +end -minetest.register_tool("shields:shield_steel", { - description = "Steel Shield", - inventory_image = "shields_inv_shield_steel.png", - groups = {armor_shield=10, armor_heal=0, armor_use=500}, - wear = 0, -}) +if ARMOR_MATERIALS.steel then + minetest.register_tool("shields:shield_steel", { + description = "Steel Shield", + inventory_image = "shields_inv_shield_steel.png", + groups = {armor_shield=10, armor_heal=0, armor_use=500}, + wear = 0, + }) +end -minetest.register_tool("shields:shield_bronze", { - description = "Bronze Shield", - inventory_image = "shields_inv_shield_bronze.png", - groups = {armor_shield=10, armor_heal=6, armor_use=250}, - wear = 0, -}) +if ARMOR_MATERIALS.bronze then + minetest.register_tool("shields:shield_bronze", { + description = "Bronze Shield", + inventory_image = "shields_inv_shield_bronze.png", + groups = {armor_shield=10, armor_heal=6, armor_use=250}, + wear = 0, + }) +end -minetest.register_tool("shields:shield_diamond", { - description = "Diamond Shield", - inventory_image = "shields_inv_shield_diamond.png", - groups = {armor_shield=15, armor_heal=12, armor_use=100}, - wear = 0, -}) +if ARMOR_MATERIALS.diamond then + minetest.register_tool("shields:shield_diamond", { + description = "Diamond Shield", + inventory_image = "shields_inv_shield_diamond.png", + groups = {armor_shield=15, armor_heal=12, armor_use=100}, + wear = 0, + }) +end -minetest.register_tool("shields:shield_gold", { - description = "Gold Shield", - inventory_image = "shields_inv_shield_gold.png", - groups = {armor_shield=10, armor_heal=6, armor_use=250}, - wear = 0, -}) +if ARMOR_MATERIALS.gold then + minetest.register_tool("shields:shield_gold", { + description = "Gold Shield", + inventory_image = "shields_inv_shield_gold.png", + groups = {armor_shield=10, armor_heal=6, armor_use=250}, + wear = 0, + }) +end -if use_moreores then +if ARMOR_MATERIALS.mithril then minetest.register_tool("shields:shield_mithril", { description = "Mithril Shield", inventory_image = "shields_inv_shield_mithril.png", @@ -60,20 +100,7 @@ if use_moreores then }) end -local craft_ingreds = { - wood = "default:wood", - cactus = "default:cactus", - steel = "default:steel_ingot", - bronze = "default:bronze_ingot", - diamond = "default:diamond", - gold = "default:gold_ingot", -} - -if use_moreores then - craft_ingreds.mithril = "moreores:mithril_ingot" -end - -for k, v in pairs(craft_ingreds) do +for k, v in pairs(ARMOR_MATERIALS) do minetest.register_craft({ output = "shields:shield_"..k, recipe = { @@ -84,38 +111,7 @@ for k, v in pairs(craft_ingreds) do }) end -minetest.register_tool("shields:shield_enhanced_wood", { - description = "Enhanced Wood Shield", - inventory_image = "shields_inv_shield_enhanced_wood.png", - groups = {armor_shield=8, armor_heal=0, armor_use=1000}, - wear = 0, -}) - -minetest.register_tool("shields:shield_enhanced_cactus", { - description = "Enhanced Cactus Shield", - inventory_image = "shields_inv_shield_enhanced_cactus.png", - groups = {armor_shield=8, armor_heal=0, armor_use=1000}, - wear = 0, -}) - -minetest.register_craft({ - output = "shields:shield_enhanced_wood", - recipe = { - {"default:steel_ingot"}, - {"shields:shield_wood"}, - {"default:steel_ingot"}, - }, -}) - -minetest.register_craft({ - output = "shields:shield_enhanced_cactus", - recipe = { - {"default:steel_ingot"}, - {"shields:shield_cactus"}, - {"default:steel_ingot"}, - }, -}) - minetest.after(0, function() table.insert(armor.elements, "shield") end) +