diff --git a/mods/3d_armor/3d_armor/armor.lua b/mods/3d_armor/3d_armor/armor.lua index 1c1d7919..6b384bf4 100755 --- a/mods/3d_armor/3d_armor/armor.lua +++ b/mods/3d_armor/3d_armor/armor.lua @@ -21,11 +21,13 @@ ARMOR_MATERIALS = { bronze = "default:bronze_ingot", diamond = "default:diamond", gold = "default:gold_ingot", - mithril = "moreores:mithril_ingot", crystal = "ethereal:crystal_ingot", -- Hunter armors (A déc-ommenter quand activation de l'armure au total) hardened_leather = "3d_armor:hardened_leather", - reinforced_leather = "3d_armor:reinforced_leather" + reinforced_leather = "3d_armor:reinforced_leather", + -- Warrior armors + mithril = "moreores:mithril_ingot", + black_mithril = "3d_armor:black_mithril" -- Wizard armors --armor = "xxx", --armor = "xxx", diff --git a/mods/3d_armor/shields/init.lua b/mods/3d_armor/shields/init.lua index ab420f0f..d81b7234 100755 --- a/mods/3d_armor/shields/init.lua +++ b/mods/3d_armor/shields/init.lua @@ -100,6 +100,15 @@ if ARMOR_MATERIALS.mithril then }) end +if ARMOR_MATERIALS.black_mithril then + minetest.register_tool("shields:shield_black_mithril_warrior", { + description = "Black Mithril Shield", + inventory_image = "shields_inv_shield_mithril.png", + groups = {armor_shield=15, armor_heal=2, armor_use=50}, + wear = 0, + }) +end + if ARMOR_MATERIALS.crystal then minetest.register_tool("shields:shield_crystal", { description = "Crystal Shield", diff --git a/mods/3d_armor/shields/textures/shields_inv_shield_black_mithril_plated_armor_warrior.png b/mods/3d_armor/shields/textures/shields_inv_shield_black_mithril_plated_armor_warrior.png new file mode 100755 index 00000000..d32665a2 Binary files /dev/null and b/mods/3d_armor/shields/textures/shields_inv_shield_black_mithril_plated_armor_warrior.png differ diff --git a/mods/3d_armor_classes/black_mithril_plated_armor_warrior/init.lua b/mods/3d_armor_classes/black_mithril_plated_armor_warrior/init.lua index 2820010c..e9224ec4 100755 --- a/mods/3d_armor_classes/black_mithril_plated_armor_warrior/init.lua +++ b/mods/3d_armor_classes/black_mithril_plated_armor_warrior/init.lua @@ -1,30 +1,30 @@ if ARMOR_MATERIALS.black_mithril then -- Register helmets : - minetest.register_tool(":3d_armor:helmet_black_mithril_plated_armor_warrior", { + minetest.register_tool(":3d_armor:helmet_black_mithril_plated_warrior", { description = "Warrior's Black Mithril Plated Helmet", - inventory_image = "3d_armor_inv_helmet_black_mithril_plated_armor_warrior.png", - groups = {armor_head = 5, armor_heal = 0, armor_use = 250}, + inventory_image = "3d_armor_inv_helmet_black_mithril_plated_warrior.png", + groups = {armor_head = 11, armor_heal = 0, armor_use = 250}, wear = 0, }) -- Register chestplates : - minetest.register_tool(":3d_armor:chestplate_black_mithril_plated_armor_warrior", { + minetest.register_tool(":3d_armor:chestplate_black_mithril_plated_warrior", { description = "Warrior's Black Mithril Plated Chestplate", inventory_image = "3d_armor_inv_chestplate_black_mithril_plated_warrior.png", - groups = {armor_torso = 8, armor_heal = 0, armor_use = 250}, + groups = {armor_torso = 17, armor_heal = 0, armor_use = 250}, wear = 0, }) -- Register leggings : - minetest.register_tool(":3d_armor:leggings_black_mithril_plated_armor_warrior", { + minetest.register_tool(":3d_armor:leggings_black_mithril_plated_warrior", { description = "Warrior's Black Mithril Plated Leggings", - inventory_image = "3d_armor_inv_leggings_black_mithril_plated_armor_warrior.png", - groups = {armor_legs = 8, armor_heal = 0, armor_use = 250}, + inventory_image = "3d_armor_inv_leggings_black_mithril_plated_warrior.png", + groups = {armor_legs = 17, armor_heal = 0, armor_use = 250}, wear = 0, }) -- Register boots : - minetest.register_tool(":3d_armor:boots_black_mithril_plated_armor_warrior", { + minetest.register_tool(":3d_armor:boots_black_mithril_plated_warrior", { description = "Warrior's Black Mithril Plated Boots", - inventory_image = "3d_armor_inv_boots_black_mithril_plated_armor_warrior.png", - groups = {armor_feet = 5, armor_heal = 0, armor_use = 250}, + inventory_image = "3d_armor_inv_boots_black_mithril_plated_warrior.png", + groups = {armor_feet = 11, armor_heal = 0, armor_use = 250}, wear = 0, }) end diff --git a/mods/3d_armor_classes/black_mithril_plated_armor_warrior/textures/3d_armor_boots_black_mithril_plated_armor_warrior.png b/mods/3d_armor_classes/black_mithril_plated_armor_warrior/textures/3d_armor_boots_black_mithril_plated_warrior.png similarity index 100% rename from mods/3d_armor_classes/black_mithril_plated_armor_warrior/textures/3d_armor_boots_black_mithril_plated_armor_warrior.png rename to mods/3d_armor_classes/black_mithril_plated_armor_warrior/textures/3d_armor_boots_black_mithril_plated_warrior.png diff --git a/mods/3d_armor_classes/black_mithril_plated_armor_warrior/textures/3d_armor_boots_black_mithril_plated_armor_warrior_preview.png b/mods/3d_armor_classes/black_mithril_plated_armor_warrior/textures/3d_armor_boots_black_mithril_plated_warrior_preview.png similarity index 100% rename from mods/3d_armor_classes/black_mithril_plated_armor_warrior/textures/3d_armor_boots_black_mithril_plated_armor_warrior_preview.png rename to mods/3d_armor_classes/black_mithril_plated_armor_warrior/textures/3d_armor_boots_black_mithril_plated_warrior_preview.png diff --git a/mods/3d_armor_classes/black_mithril_plated_armor_warrior/textures/3d_armor_chestplate_black_mithril_plated_armor_warrior.png b/mods/3d_armor_classes/black_mithril_plated_armor_warrior/textures/3d_armor_chestplate_black_mithril_plated_warrior.png similarity index 100% rename from mods/3d_armor_classes/black_mithril_plated_armor_warrior/textures/3d_armor_chestplate_black_mithril_plated_armor_warrior.png rename to mods/3d_armor_classes/black_mithril_plated_armor_warrior/textures/3d_armor_chestplate_black_mithril_plated_warrior.png diff --git a/mods/3d_armor_classes/black_mithril_plated_armor_warrior/textures/3d_armor_chestplate_black_mithril_plated_armor_warrior_preview.png b/mods/3d_armor_classes/black_mithril_plated_armor_warrior/textures/3d_armor_chestplate_black_mithril_plated_warrior_preview.png similarity index 100% rename from mods/3d_armor_classes/black_mithril_plated_armor_warrior/textures/3d_armor_chestplate_black_mithril_plated_armor_warrior_preview.png rename to mods/3d_armor_classes/black_mithril_plated_armor_warrior/textures/3d_armor_chestplate_black_mithril_plated_warrior_preview.png diff --git a/mods/3d_armor_classes/black_mithril_plated_armor_warrior/textures/3d_armor_helmet_black_mithril_plated_armor_warrior.png b/mods/3d_armor_classes/black_mithril_plated_armor_warrior/textures/3d_armor_helmet_black_mithril_plated_warrior.png similarity index 100% rename from mods/3d_armor_classes/black_mithril_plated_armor_warrior/textures/3d_armor_helmet_black_mithril_plated_armor_warrior.png rename to mods/3d_armor_classes/black_mithril_plated_armor_warrior/textures/3d_armor_helmet_black_mithril_plated_warrior.png diff --git a/mods/3d_armor_classes/black_mithril_plated_armor_warrior/textures/3d_armor_helmet_black_mithril_plated_armor_warrior_preview.png b/mods/3d_armor_classes/black_mithril_plated_armor_warrior/textures/3d_armor_helmet_black_mithril_plated_warrior_preview.png similarity index 100% rename from mods/3d_armor_classes/black_mithril_plated_armor_warrior/textures/3d_armor_helmet_black_mithril_plated_armor_warrior_preview.png rename to mods/3d_armor_classes/black_mithril_plated_armor_warrior/textures/3d_armor_helmet_black_mithril_plated_warrior_preview.png diff --git a/mods/3d_armor_classes/black_mithril_plated_armor_warrior/textures/3d_armor_inv_boots_black_mithril_plated_armor_warrior.png b/mods/3d_armor_classes/black_mithril_plated_armor_warrior/textures/3d_armor_inv_boots_black_mithril_plated_warrior.png similarity index 100% rename from mods/3d_armor_classes/black_mithril_plated_armor_warrior/textures/3d_armor_inv_boots_black_mithril_plated_armor_warrior.png rename to mods/3d_armor_classes/black_mithril_plated_armor_warrior/textures/3d_armor_inv_boots_black_mithril_plated_warrior.png diff --git a/mods/3d_armor_classes/black_mithril_plated_armor_warrior/textures/3d_armor_inv_chestplate_black_mithril_plated_armor_warrior.png b/mods/3d_armor_classes/black_mithril_plated_armor_warrior/textures/3d_armor_inv_chestplate_black_mithril_plated_warrior.png similarity index 100% rename from mods/3d_armor_classes/black_mithril_plated_armor_warrior/textures/3d_armor_inv_chestplate_black_mithril_plated_armor_warrior.png rename to mods/3d_armor_classes/black_mithril_plated_armor_warrior/textures/3d_armor_inv_chestplate_black_mithril_plated_warrior.png diff --git a/mods/3d_armor_classes/black_mithril_plated_armor_warrior/textures/3d_armor_inv_helmet_black_mithril_plated_armor_warrior.png b/mods/3d_armor_classes/black_mithril_plated_armor_warrior/textures/3d_armor_inv_helmet_black_mithril_plated_warrior.png similarity index 100% rename from mods/3d_armor_classes/black_mithril_plated_armor_warrior/textures/3d_armor_inv_helmet_black_mithril_plated_armor_warrior.png rename to mods/3d_armor_classes/black_mithril_plated_armor_warrior/textures/3d_armor_inv_helmet_black_mithril_plated_warrior.png diff --git a/mods/3d_armor_classes/black_mithril_plated_armor_warrior/textures/3d_armor_inv_leggings_black_mithril_plated_armor_warrior.png b/mods/3d_armor_classes/black_mithril_plated_armor_warrior/textures/3d_armor_inv_leggings_black_mithril_plated_warrior.png similarity index 100% rename from mods/3d_armor_classes/black_mithril_plated_armor_warrior/textures/3d_armor_inv_leggings_black_mithril_plated_armor_warrior.png rename to mods/3d_armor_classes/black_mithril_plated_armor_warrior/textures/3d_armor_inv_leggings_black_mithril_plated_warrior.png diff --git a/mods/3d_armor_classes/black_mithril_plated_armor_warrior/textures/3d_armor_leggings_black_mithril_plated_armor_warrior.png b/mods/3d_armor_classes/black_mithril_plated_armor_warrior/textures/3d_armor_leggings_black_mithril_plated_warrior.png similarity index 100% rename from mods/3d_armor_classes/black_mithril_plated_armor_warrior/textures/3d_armor_leggings_black_mithril_plated_armor_warrior.png rename to mods/3d_armor_classes/black_mithril_plated_armor_warrior/textures/3d_armor_leggings_black_mithril_plated_warrior.png diff --git a/mods/3d_armor_classes/black_mithril_plated_armor_warrior/textures/3d_armor_leggings_black_mithril_plated_armor_warrior_preview.png b/mods/3d_armor_classes/black_mithril_plated_armor_warrior/textures/3d_armor_leggings_black_mithril_plated_warrior_preview.png similarity index 100% rename from mods/3d_armor_classes/black_mithril_plated_armor_warrior/textures/3d_armor_leggings_black_mithril_plated_armor_warrior_preview.png rename to mods/3d_armor_classes/black_mithril_plated_armor_warrior/textures/3d_armor_leggings_black_mithril_plated_warrior_preview.png diff --git a/other_things/Tableau-valeurs-MFF.ods b/other_things/Tableau-valeurs-MFF.ods index 48db5641..cf745f61 100755 Binary files a/other_things/Tableau-valeurs-MFF.ods and b/other_things/Tableau-valeurs-MFF.ods differ