From 17f4daba5d69674bca6735fbf511c5c52d375582 Mon Sep 17 00:00:00 2001 From: LeMagnesium Date: Wed, 29 Jul 2015 21:54:18 +0200 Subject: [PATCH] Various fixes about shields and moreores - Fixed crash with moreore - Fixed textures' name for blackmithril shield --- mods/3d_armor/shields/init.lua | 2 +- ..._warrior.png => shields_shield_blackmithril.png} | Bin ....png => shields_shield_blackmithril_preview.png} | Bin mods/3d_armor_classes/reinforcedleather/init.lua | 2 +- mods/moreores/init.lua | 3 +-- 5 files changed, 3 insertions(+), 4 deletions(-) rename mods/3d_armor/shields/textures/{shields_shield_black_mithril_warrior.png => shields_shield_blackmithril.png} (100%) rename mods/3d_armor/shields/textures/{shields_shield_black_mithril_warrior_preview.png => shields_shield_blackmithril_preview.png} (100%) diff --git a/mods/3d_armor/shields/init.lua b/mods/3d_armor/shields/init.lua index 837e9c29..bf697cdf 100755 --- a/mods/3d_armor/shields/init.lua +++ b/mods/3d_armor/shields/init.lua @@ -101,7 +101,7 @@ if ARMOR_MATERIALS.mithril then end if ARMOR_MATERIALS.blackmithril then - minetest.register_tool("shields:shield_black_mithril_warrior", { + minetest.register_tool("shields:shield_blackmithril", { description = "Black Mithril Shield (Warrior)", inventory_image = "shields_inv_shield_black_mithril_warrior.png", groups = {armor_shield=15, armor_heal=0, armor_use=50}, diff --git a/mods/3d_armor/shields/textures/shields_shield_black_mithril_warrior.png b/mods/3d_armor/shields/textures/shields_shield_blackmithril.png similarity index 100% rename from mods/3d_armor/shields/textures/shields_shield_black_mithril_warrior.png rename to mods/3d_armor/shields/textures/shields_shield_blackmithril.png diff --git a/mods/3d_armor/shields/textures/shields_shield_black_mithril_warrior_preview.png b/mods/3d_armor/shields/textures/shields_shield_blackmithril_preview.png similarity index 100% rename from mods/3d_armor/shields/textures/shields_shield_black_mithril_warrior_preview.png rename to mods/3d_armor/shields/textures/shields_shield_blackmithril_preview.png diff --git a/mods/3d_armor_classes/reinforcedleather/init.lua b/mods/3d_armor_classes/reinforcedleather/init.lua index 3f4ab059..c0c4e830 100755 --- a/mods/3d_armor_classes/reinforcedleather/init.lua +++ b/mods/3d_armor_classes/reinforcedleather/init.lua @@ -1,7 +1,7 @@ if ARMOR_MATERIALS.reinforcedleather then -- Register helmets : minetest.register_tool(":3d_armor:helmet_reinforcedleather", { - description = "Hunter's Reinforced Leather Helmet (Hunter)", + description = "Reinforced Leather Helmet (Hunter)", inventory_image = "3d_armor_inv_helmet_reinforcedleather.png", groups = {armor_head = 6, armor_heal = 0, armor_use = 40}, wear = 0, diff --git a/mods/moreores/init.lua b/mods/moreores/init.lua index c33e04b7..e466b940 100755 --- a/mods/moreores/init.lua +++ b/mods/moreores/init.lua @@ -286,7 +286,7 @@ local oredefs = { tools = {} }, mithril = { - description = "Mithril", + description = "Mithril (Warrior) ", makes = {ore = true, block = true, lump = true, ingot = true, chest = false}, oredef = {clust_scarcity = moreores_mithril_chunk_size * moreores_mithril_chunk_size * moreores_mithril_chunk_size, clust_num_ores = moreores_mithril_ore_per_chunk, @@ -320,7 +320,6 @@ local oredefs = { damage_groups = {fleshy = 5}, full_punch_interval = 0.5, }, - description = "Mithril (Warrior)", sword = { groupcaps = { fleshy = {times = {[2] = 0.65, [3] = 0.25}, uses = 200, maxlevel= 1},