Merge branch 'master' of github.com:Ombridride/minetest-minetestforfun-server

This commit is contained in:
Ombridride 2015-07-21 01:10:30 +02:00
commit 76e1d4bc38
3 changed files with 25 additions and 8 deletions

View File

@ -168,25 +168,25 @@ if ARMOR_MATERIALS.mithril then
minetest.register_tool("3d_armor:helmet_mithril", {
description = "Mithril Helmet",
inventory_image = "3d_armor_inv_helmet_mithril.png",
groups = {armor_head=9, armor_heal=0, armor_use=50},
groups = {armor_head=9, armor_heal=0.5, armor_use=50},
wear = 0,
})
minetest.register_tool("3d_armor:chestplate_mithril", {
description = "Mithril Chestplate",
inventory_image = "3d_armor_inv_chestplate_mithril.png",
groups = {armor_torso=15, armor_heal=0, armor_use=50},
groups = {armor_torso=15, armor_heal=0.5, armor_use=50},
wear = 0,
})
minetest.register_tool("3d_armor:leggings_mithril", {
description = "Mithril Leggings",
inventory_image = "3d_armor_inv_leggings_mithril.png",
groups = {armor_legs=15, armor_heal=0, armor_use=50},
groups = {armor_legs=15, armor_heal=0.5, armor_use=50},
wear = 0,
})
minetest.register_tool("3d_armor:boots_mithril", {
description = "Mithril Boots",
inventory_image = "3d_armor_inv_boots_mithril.png",
groups = {armor_feet=9, armor_heal=0, armor_use=50},
groups = {armor_feet=9, armor_heal=0.5, armor_use=50},
wear = 0,
})
end

View File

@ -3,28 +3,28 @@ if ARMOR_MATERIALS.black_mithril then
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_warrior.png",
groups = {armor_head = 11, armor_heal = 0, armor_use = 250},
groups = {armor_head = 11, armor_heal = 1, armor_use = 40},
wear = 0,
})
-- Register chestplates :
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 = 17, armor_heal = 0, armor_use = 250},
groups = {armor_torso = 17, armor_heal = 1, armor_use = 40},
wear = 0,
})
-- Register leggings :
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_warrior.png",
groups = {armor_legs = 17, armor_heal = 0, armor_use = 250},
groups = {armor_legs = 17, armor_heal = 1, armor_use = 40},
wear = 0,
})
-- Register boots :
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_warrior.png",
groups = {armor_feet = 11, armor_heal = 0, armor_use = 250},
groups = {armor_feet = 11, armor_heal = 1, armor_use = 40},
wear = 0,
})
end

View File

@ -314,6 +314,23 @@ function awards.give_achievement(name, award)
end
end
--MFF crabman(20/07/2015) add button inventory
if (minetest.get_modpath("unified_inventory")) then
unified_inventory.register_button("menu_award", {
type = "image",
image = "miniminer.png",
tooltip = "List My Award",
show_with = false,
action = function(player)
local name = player:get_player_name()
if not name then return end
awards.showto(name, name, nil, false)
end,
})
end
-- List a player's achievements
minetest.register_chatcommand("list_awards", {
params = "obsolete",