diff --git a/3d_armor/admin.lua b/3d_armor/admin.lua new file mode 100644 index 00000000..e7040875 --- /dev/null +++ b/3d_armor/admin.lua @@ -0,0 +1,33 @@ +minetest.register_alias("adminboots","3d_armor:boots_admin") +minetest.register_alias("adminhelmet","3d_armor:helmet_admin") +minetest.register_alias("adminchestplate","3d_armor:chestplate_admin") +minetest.register_alias("adminlegginss","3d_armor:leggings_admin") + +minetest.register_tool("3d_armor:helmet_admin", { + description = "Admin Helmet", + inventory_image = "3d_armor_inv_helmet_admin.png", + groups = {armor_head=1000, armor_heal=1000, armor_use=0, not_in_creative=0}, + wear = 0, +}) + +minetest.register_tool("3d_armor:chestplate_admin", { + description = "Admin Chestplate", + inventory_image = "3d_armor_inv_chestplate_admin.png", + groups = {armor_torso=1000, armor_heal=1000, armor_use=0, not_in_creative=0}, + wear = 0, +}) + +minetest.register_tool("3d_armor:leggings_admin", { + description = "Admin Leggings", + inventory_image = "3d_armor_inv_leggings_admin.png", + groups = {armor_legs=1000, armor_heal=1000, armor_use=0, not_in_creative=0}, + wear = 0, +}) + +minetest.register_tool("3d_armor:boots_admin", { + description = "Admin Boots", + inventory_image = "3d_armor_inv_boots_admin.png", + groups = {armor_feet=1000, armor_heal=1000, armor_use=0, not_in_creative=0}, + wear = 0, +}) + diff --git a/3d_armor/crafting_guide.txt b/3d_armor/crafting_guide.txt index f76ff129..1503a3c1 100644 --- a/3d_armor/crafting_guide.txt +++ b/3d_armor/crafting_guide.txt @@ -12,6 +12,7 @@ Helmets: +---+---+---+ [3d_armor:helmet_wood] X = [default:wood] +[3d_armor:helmet_cactus] X = [default:cactus] [3d_armor:helmet_steel] X = [default:steel_ingot] [3d_armor:helmet_bronze] X = [default:bronze_ingot] [3d_armor:helmet_diamond] X = [default:diamond] @@ -29,6 +30,7 @@ Chestplates: +---+---+---+ [3d_armor:chestplate_wood] X = [default:wood] +[3d_armor:chestplate_cactus] X = [default:cactus] [3d_armor:chestplate_steel] X = [default:steel_ingot] [3d_armor:chestplate_bronze] X = [default:bronze_ingot] [3d_armor:chestplate_diamond] X = [default:diamond] @@ -46,6 +48,7 @@ Leggings: +---+---+---+ [3d_armor:leggings_wood] X = [default:wood] +[3d_armor:leggings_cactus] X = [default:cactus] [3d_armor:leggings_steel] X = [default:steel_ingot] [3d_armor:leggings_bronze] X = [default:bronze_ingot] [3d_armor:leggings_diamond] X = [default:diamond] @@ -61,6 +64,7 @@ Boots: +---+---+---+ [3d_armor:boots_wood] X = [default:wood] +[3d_armor:boots_cactus] X = [default:cactus] [3d_armor:boots_steel] X = [default:steel_ingot] [3d_armor:boots_bronze] X = [default:bronze_ingot [3d_armor:boots_diamond] X = [default:diamond] diff --git a/3d_armor/init.lua b/3d_armor/init.lua index ff31ba7d..fa825f29 100644 --- a/3d_armor/init.lua +++ b/3d_armor/init.lua @@ -1,5 +1,7 @@ ARMOR_MOD_NAME = minetest.get_current_modname() dofile(minetest.get_modpath(ARMOR_MOD_NAME).."/armor.lua") +dofile(minetest.get_modpath(ARMOR_MOD_NAME).."/admin.lua") + local use_moreores = minetest.get_modpath("moreores") -- Regisiter Head Armor @@ -11,6 +13,13 @@ minetest.register_tool("3d_armor:helmet_wood", { wear = 0, }) +minetest.register_tool("3d_armor:helmet_cactus", { + description = "Cactuc Helmet", + inventory_image = "3d_armor_inv_helmet_cactus.png", + groups = {armor_head=5, armor_heal=0, armor_use=1000}, + wear = 0, +}) + minetest.register_tool("3d_armor:helmet_steel", { description = "Steel Helmet", inventory_image = "3d_armor_inv_helmet_steel.png", @@ -57,6 +66,13 @@ minetest.register_tool("3d_armor:chestplate_wood", { wear = 0, }) +minetest.register_tool("3d_armor:chestplate_cactus", { + description = "Cactus Chestplate", + inventory_image = "3d_armor_inv_chestplate_cactus.png", + groups = {armor_torso=10, armor_heal=0, armor_use=1000}, + wear = 0, +}) + minetest.register_tool("3d_armor:chestplate_steel", { description = "Steel Chestplate", inventory_image = "3d_armor_inv_chestplate_steel.png", @@ -103,6 +119,13 @@ minetest.register_tool("3d_armor:leggings_wood", { wear = 0, }) +minetest.register_tool("3d_armor:leggings_cactus", { + description = "Cactus Leggings", + inventory_image = "3d_armor_inv_leggings_cactus.png", + groups = {armor_legs=5, armor_heal=0, armor_use=1000}, + wear = 0, +}) + minetest.register_tool("3d_armor:leggings_steel", { description = "Steel Leggings", inventory_image = "3d_armor_inv_leggings_steel.png", @@ -149,6 +172,13 @@ minetest.register_tool("3d_armor:boots_wood", { wear = 0, }) +minetest.register_tool("3d_armor:boots_cactus", { + description = "Cactus Boots", + inventory_image = "3d_armor_inv_boots_cactus.png", + groups = {armor_feet=5, armor_heal=0, armor_use=2000}, + wear = 0, +}) + minetest.register_tool("3d_armor:boots_steel", { description = "Steel Boots", inventory_image = "3d_armor_inv_boots_steel.png", @@ -190,6 +220,7 @@ end local craft_ingreds = { wood = "default:wood", + cactus = "default:cactus", steel = "default:steel_ingot", bronze = "default:bronze_ingot", diamond = "default:diamond", diff --git a/3d_armor/textures/3d_armor_boots_admin_preview.png b/3d_armor/textures/3d_armor_boots_admin_preview.png new file mode 100644 index 00000000..d61a042e Binary files /dev/null and b/3d_armor/textures/3d_armor_boots_admin_preview.png differ diff --git a/3d_armor/textures/3d_armor_boots_cactus.png b/3d_armor/textures/3d_armor_boots_cactus.png new file mode 100644 index 00000000..f8aebabe Binary files /dev/null and b/3d_armor/textures/3d_armor_boots_cactus.png differ diff --git a/3d_armor/textures/3d_armor_boots_cactus_preview.png b/3d_armor/textures/3d_armor_boots_cactus_preview.png new file mode 100644 index 00000000..96d50c06 Binary files /dev/null and b/3d_armor/textures/3d_armor_boots_cactus_preview.png differ diff --git a/3d_armor/textures/3d_armor_chestplate_admin.png b/3d_armor/textures/3d_armor_chestplate_admin.png new file mode 100644 index 00000000..f96c04c7 Binary files /dev/null and b/3d_armor/textures/3d_armor_chestplate_admin.png differ diff --git a/3d_armor/textures/3d_armor_chestplate_admin_preview.png b/3d_armor/textures/3d_armor_chestplate_admin_preview.png new file mode 100644 index 00000000..329ca744 Binary files /dev/null and b/3d_armor/textures/3d_armor_chestplate_admin_preview.png differ diff --git a/3d_armor/textures/3d_armor_chestplate_cactus.png b/3d_armor/textures/3d_armor_chestplate_cactus.png new file mode 100644 index 00000000..7dccf1a1 Binary files /dev/null and b/3d_armor/textures/3d_armor_chestplate_cactus.png differ diff --git a/3d_armor/textures/3d_armor_chestplate_cactus_preview.png b/3d_armor/textures/3d_armor_chestplate_cactus_preview.png new file mode 100644 index 00000000..c819bcb2 Binary files /dev/null and b/3d_armor/textures/3d_armor_chestplate_cactus_preview.png differ diff --git a/3d_armor/textures/3d_armor_helmet_admin.png b/3d_armor/textures/3d_armor_helmet_admin.png new file mode 100644 index 00000000..914d0ead Binary files /dev/null and b/3d_armor/textures/3d_armor_helmet_admin.png differ diff --git a/3d_armor/textures/3d_armor_helmet_admin_preview.png b/3d_armor/textures/3d_armor_helmet_admin_preview.png new file mode 100644 index 00000000..7f3a627a Binary files /dev/null and b/3d_armor/textures/3d_armor_helmet_admin_preview.png differ diff --git a/3d_armor/textures/3d_armor_helmet_cactus.png b/3d_armor/textures/3d_armor_helmet_cactus.png new file mode 100644 index 00000000..4653dbfc Binary files /dev/null and b/3d_armor/textures/3d_armor_helmet_cactus.png differ diff --git a/3d_armor/textures/3d_armor_helmet_cactus_preview.png b/3d_armor/textures/3d_armor_helmet_cactus_preview.png new file mode 100644 index 00000000..cfae3055 Binary files /dev/null and b/3d_armor/textures/3d_armor_helmet_cactus_preview.png differ diff --git a/3d_armor/textures/3d_armor_inv_boots_admin.png b/3d_armor/textures/3d_armor_inv_boots_admin.png new file mode 100644 index 00000000..ea44bd94 Binary files /dev/null and b/3d_armor/textures/3d_armor_inv_boots_admin.png differ diff --git a/3d_armor/textures/3d_armor_inv_boots_cactus.png b/3d_armor/textures/3d_armor_inv_boots_cactus.png new file mode 100644 index 00000000..5f135d90 Binary files /dev/null and b/3d_armor/textures/3d_armor_inv_boots_cactus.png differ diff --git a/3d_armor/textures/3d_armor_inv_chestplate_admin.png b/3d_armor/textures/3d_armor_inv_chestplate_admin.png new file mode 100644 index 00000000..04fa7fdd Binary files /dev/null and b/3d_armor/textures/3d_armor_inv_chestplate_admin.png differ diff --git a/3d_armor/textures/3d_armor_inv_chestplate_cactus.png b/3d_armor/textures/3d_armor_inv_chestplate_cactus.png new file mode 100644 index 00000000..10f2d14d Binary files /dev/null and b/3d_armor/textures/3d_armor_inv_chestplate_cactus.png differ diff --git a/3d_armor/textures/3d_armor_inv_helmet_admin.png b/3d_armor/textures/3d_armor_inv_helmet_admin.png new file mode 100644 index 00000000..9c7e50d9 Binary files /dev/null and b/3d_armor/textures/3d_armor_inv_helmet_admin.png differ diff --git a/3d_armor/textures/3d_armor_inv_helmet_cactus.png b/3d_armor/textures/3d_armor_inv_helmet_cactus.png new file mode 100644 index 00000000..5c4d8258 Binary files /dev/null and b/3d_armor/textures/3d_armor_inv_helmet_cactus.png differ diff --git a/3d_armor/textures/3d_armor_inv_leggings_admin.png b/3d_armor/textures/3d_armor_inv_leggings_admin.png new file mode 100644 index 00000000..72407058 Binary files /dev/null and b/3d_armor/textures/3d_armor_inv_leggings_admin.png differ diff --git a/3d_armor/textures/3d_armor_inv_leggings_cactus.png b/3d_armor/textures/3d_armor_inv_leggings_cactus.png new file mode 100644 index 00000000..aa179d3f Binary files /dev/null and b/3d_armor/textures/3d_armor_inv_leggings_cactus.png differ diff --git a/3d_armor/textures/3d_armor_leggings_admin.png b/3d_armor/textures/3d_armor_leggings_admin.png new file mode 100644 index 00000000..8593eed0 Binary files /dev/null and b/3d_armor/textures/3d_armor_leggings_admin.png differ diff --git a/3d_armor/textures/3d_armor_leggings_admin_preview.png b/3d_armor/textures/3d_armor_leggings_admin_preview.png new file mode 100644 index 00000000..1e3f91be Binary files /dev/null and b/3d_armor/textures/3d_armor_leggings_admin_preview.png differ diff --git a/3d_armor/textures/3d_armor_leggings_cactus.png b/3d_armor/textures/3d_armor_leggings_cactus.png new file mode 100644 index 00000000..0efbfd1b Binary files /dev/null and b/3d_armor/textures/3d_armor_leggings_cactus.png differ diff --git a/3d_armor/textures/3d_armor_leggings_cactus_preview.png b/3d_armor/textures/3d_armor_leggings_cactus_preview.png new file mode 100644 index 00000000..f28b984c Binary files /dev/null and b/3d_armor/textures/3d_armor_leggings_cactus_preview.png differ diff --git a/shields/crafting_guide.txt b/shields/crafting_guide.txt index 6426f685..445837e2 100644 --- a/shields/crafting_guide.txt +++ b/shields/crafting_guide.txt @@ -10,7 +10,25 @@ Shields -- Crafting Guide +---+---+---+ [shields:shield_wood] X = [default:wood] +[shields:shield_cactus] X = [default:cactus] [shields:shield_steel] X = [default:steel_ingot] [shields:shield_bronze] X = [default:bronze_ingot] [shields:shield_diamond] X = [default:diamond] [shields:shield_gold] X = [default:gold_ingot] + +Enhanced Shields +---------------- + ++---+ +| S | ++---+ +| X | ++---+ +| S | ++---+ + +[shields:shield_enhanced_wood] X = [shields:shield_wood] +[shields:shield_enhanced_cactus] X = [shields:shield_cactus] + +S = [default:steel_ingot] + diff --git a/shields/init.lua b/shields/init.lua index cb82582a..8a677134 100644 --- a/shields/init.lua +++ b/shields/init.lua @@ -2,6 +2,13 @@ local use_moreores = minetest.get_modpath("moreores") -- Regisiter Shields +minetest.register_tool("shields:shield_admin", { + description = "Admin Shield", + inventory_image = "shields_inv_shield_admin.png", + groups = {armor_shield=1000, armor_heal=100, armor_use=0}, + wear = 0, +}) + minetest.register_tool("shields:shield_wood", { description = "Wooden Shield", inventory_image = "shields_inv_shield_wood.png", @@ -9,6 +16,13 @@ minetest.register_tool("shields:shield_wood", { wear = 0, }) +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_steel", { description = "Steel Shield", inventory_image = "shields_inv_shield_steel.png", @@ -48,6 +62,7 @@ end local craft_ingreds = { wood = "default:wood", + cactus = "default:cactus", steel = "default:steel_ingot", bronze = "default:bronze_ingot", diamond = "default:diamond", @@ -69,8 +84,38 @@ 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) - - diff --git a/shields/textures/shields_inv_shield_admin.png b/shields/textures/shields_inv_shield_admin.png new file mode 100644 index 00000000..3c448dea Binary files /dev/null and b/shields/textures/shields_inv_shield_admin.png differ diff --git a/shields/textures/shields_inv_shield_cactus.png b/shields/textures/shields_inv_shield_cactus.png new file mode 100644 index 00000000..04eb4870 Binary files /dev/null and b/shields/textures/shields_inv_shield_cactus.png differ diff --git a/shields/textures/shields_inv_shield_enhanced_cactus.png b/shields/textures/shields_inv_shield_enhanced_cactus.png new file mode 100644 index 00000000..a8590796 Binary files /dev/null and b/shields/textures/shields_inv_shield_enhanced_cactus.png differ diff --git a/shields/textures/shields_inv_shield_enhanced_wood.png b/shields/textures/shields_inv_shield_enhanced_wood.png new file mode 100644 index 00000000..ad256c55 Binary files /dev/null and b/shields/textures/shields_inv_shield_enhanced_wood.png differ diff --git a/shields/textures/shields_shield_admin.png b/shields/textures/shields_shield_admin.png new file mode 100644 index 00000000..e49f4b34 Binary files /dev/null and b/shields/textures/shields_shield_admin.png differ diff --git a/shields/textures/shields_shield_admin_preview.png b/shields/textures/shields_shield_admin_preview.png new file mode 100644 index 00000000..8b3514f2 Binary files /dev/null and b/shields/textures/shields_shield_admin_preview.png differ diff --git a/shields/textures/shields_shield_cactus.png b/shields/textures/shields_shield_cactus.png new file mode 100644 index 00000000..4c0b492d Binary files /dev/null and b/shields/textures/shields_shield_cactus.png differ diff --git a/shields/textures/shields_shield_cactus_preview.png b/shields/textures/shields_shield_cactus_preview.png new file mode 100644 index 00000000..4bd487d3 Binary files /dev/null and b/shields/textures/shields_shield_cactus_preview.png differ diff --git a/shields/textures/shields_shield_enhanced_cactus.png b/shields/textures/shields_shield_enhanced_cactus.png new file mode 100644 index 00000000..19b892a2 Binary files /dev/null and b/shields/textures/shields_shield_enhanced_cactus.png differ diff --git a/shields/textures/shields_shield_enhanced_cactus_preview.png b/shields/textures/shields_shield_enhanced_cactus_preview.png new file mode 100644 index 00000000..84d37452 Binary files /dev/null and b/shields/textures/shields_shield_enhanced_cactus_preview.png differ diff --git a/shields/textures/shields_shield_enhanced_wood.png b/shields/textures/shields_shield_enhanced_wood.png new file mode 100644 index 00000000..03542bb7 Binary files /dev/null and b/shields/textures/shields_shield_enhanced_wood.png differ diff --git a/shields/textures/shields_shield_enhanced_wood_preview.png b/shields/textures/shields_shield_enhanced_wood_preview.png new file mode 100644 index 00000000..a67b26c8 Binary files /dev/null and b/shields/textures/shields_shield_enhanced_wood_preview.png differ