1
0
mirror of https://github.com/sys4-fr/server-nalc.git synced 2024-12-24 17:50:37 +01:00

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

This commit is contained in:
Quentin BUISSON-DEBON 2015-07-25 00:31:44 +02:00
commit 31384b2026
6 changed files with 24 additions and 24 deletions

View File

@ -1,8 +1,8 @@
local armors_no_shields = {["3d_armor:helmet_leather_hunter"] = true,["3d_armor:chestplate_leather_hunter"] = true,
["3d_armor:leggings_leather_hunter"] = true,["3d_armor:boots_leather_hunter"] = true,
["3d_armor:hardened_leather"] = true,["3d_armor:helmet_reinforced_leather_hunter"] = true,
["3d_armor:chestplate_reinforced_leather_hunter"] = true,["3d_armor:leggings_reinforced_leather_hunter"] = true,
["3d_armor:boots_reinforced_leather_hunter"] = true,["3d_armor:reinforced_leather"] = true
local armors_no_shields = {["3d_armor:helmet_leather"] = true,["3d_armor:chestplate_leather"] = true,
["3d_armor:leggings_leather"] = true,["3d_armor:boots_leather"] = true,
["3d_armor:hardenedleather"] = true,["3d_armor:helmet_reinforcedleather"] = true,
["3d_armor:chestplate_reinforcedleather"] = true,["3d_armor:leggings_reinforcedleather"] = true,
["3d_armor:boots_reinforcedleather"] = true,["3d_armor:reinforcedleather"] = true
} -- modif MFF (crabman/24/06/2015)
@ -23,11 +23,11 @@ ARMOR_MATERIALS = {
gold = "default:gold_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",
hardenedleather = "3d_armor:hardenedleather",
reinforcedleather = "3d_armor:reinforcedleather",
-- Warrior armors
mithril = "moreores:mithril_ingot",
black_mithril = "3d_armor:black_mithril"
blackmithril = "3d_armor:blackmithril"
-- Wizard armors
--armor = "xxx",
--armor = "xxx",

View File

@ -103,7 +103,7 @@ 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",
inventory_image = "shields_inv_shield_black_mithril_warrior.png",
groups = {armor_shield=15, armor_heal=2, armor_use=50},
wear = 0,
})

View File

@ -1,27 +1,27 @@
if ARMOR_MATERIALS.black_mithril then
-- Register helmets :
minetest.register_tool(":3d_armor:helmet_black_mithril_plated_warrior", {
minetest.register_tool(":3d_armor:helmet_blackmithril", {
description = "Warrior's Black Mithril Plated Helmet",
inventory_image = "3d_armor_inv_helmet_black_mithril_plated_warrior.png",
groups = {armor_head = 11, armor_heal = 1, armor_use = 40},
wear = 0,
})
-- Register chestplates :
minetest.register_tool(":3d_armor:chestplate_black_mithril_plated_warrior", {
minetest.register_tool(":3d_armor:chestplate_blackmithril", {
description = "Warrior's Black Mithril Plated Chestplate",
inventory_image = "3d_armor_inv_chestplate_black_mithril_plated_warrior.png",
groups = {armor_torso = 17, armor_heal = 1, armor_use = 40},
wear = 0,
})
-- Register leggings :
minetest.register_tool(":3d_armor:leggings_black_mithril_plated_warrior", {
minetest.register_tool(":3d_armor:leggings_blackmithril", {
description = "Warrior's Black Mithril Plated Leggings",
inventory_image = "3d_armor_inv_leggings_black_mithril_plated_warrior.png",
groups = {armor_legs = 17, armor_heal = 1, armor_use = 40},
wear = 0,
})
-- Register boots :
minetest.register_tool(":3d_armor:boots_black_mithril_plated_warrior", {
minetest.register_tool(":3d_armor:boots_blackmithril", {
description = "Warrior's Black Mithril Plated Boots",
inventory_image = "3d_armor_inv_boots_black_mithril_plated_warrior.png",
groups = {armor_feet = 11, armor_heal = 1, armor_use = 40},

View File

@ -1,27 +1,27 @@
if ARMOR_MATERIALS.hardened_leather then
-- Register helmets :
minetest.register_tool(":3d_armor:helmet_hardened_leather_hunter", {
minetest.register_tool(":3d_armor:helmet_hardenedleather", {
description = "Hunter's Hardened Leather Helmet",
inventory_image = "3d_armor_inv_helmet_hardened_leather_hunter.png",
groups = {armor_head = 5, armor_heal = 0, armor_use = 250},
wear = 0,
})
-- Register chestplates :
minetest.register_tool(":3d_armor:chestplate_hardened_leather_hunter", {
minetest.register_tool(":3d_armor:chestplate_hardenedleather", {
description = "Hunter's Hardened Leather Chestplate",
inventory_image = "3d_armor_inv_chestplate_hardened_leather_hunter.png",
groups = {armor_torso = 8, armor_heal = 0, armor_use = 250},
wear = 0,
})
-- Register leggings :
minetest.register_tool(":3d_armor:leggings_hardened_leather_hunter", {
minetest.register_tool(":3d_armor:leggings_hardenedleather", {
description = "Hunter's Hardened Leather Leggings",
inventory_image = "3d_armor_inv_leggings_hardened_leather_hunter.png",
groups = {armor_legs = 8, armor_heal = 0, armor_use = 250},
wear = 0,
})
-- Register boots :
minetest.register_tool(":3d_armor:boots_hardened_leather_hunter", {
minetest.register_tool(":3d_armor:boots_hardenedleather", {
description = "Hunter's Hardened Leather Boots",
inventory_image = "3d_armor_inv_boots_hardened_leather_hunter.png",
groups = {armor_feet = 5, armor_heal = 0, armor_use = 250},

View File

@ -1,27 +1,27 @@
if ARMOR_MATERIALS.reinforced_leather then
-- Register helmets :
minetest.register_tool(":3d_armor:helmet_reinforced_leather_hunter", {
minetest.register_tool(":3d_armor:helmet_reinforcedleather", {
description = "Hunter's Reinforced Leather Helmet",
inventory_image = "3d_armor_inv_helmet_reinforced_leather_hunter.png",
groups = {armor_head = 6, armor_heal = 0, armor_use = 40},
wear = 0,
})
-- Register chestplates :
minetest.register_tool(":3d_armor:chestplate_reinforced_leather_hunter", {
minetest.register_tool(":3d_armor:chestplate_reinforcedleather", {
description = "Hunter's Reinforced Leather Chestplate",
inventory_image = "3d_armor_inv_chestplate_reinforced_leather_hunter.png",
groups = {armor_torso = 11, armor_heal = 0, armor_use = 40},
wear = 0,
})
-- Register leggings :
minetest.register_tool(":3d_armor:leggings_reinforced_leather_hunter", {
minetest.register_tool(":3d_armor:leggings_reinforcedleather", {
description = "Hunter's Reinforced Leather Leggings",
inventory_image = "3d_armor_inv_leggings_reinforced_leather_hunter.png",
groups = {armor_legs = 11, armor_heal = 0, armor_use = 40},
wear = 0,
})
-- Register boots :
minetest.register_tool(":3d_armor:boots_reinforced_leather_hunter", {
minetest.register_tool(":3d_armor:boots_reinforcedleather", {
description = "Hunter's Reinforced Leather Boots",
inventory_image = "3d_armor_inv_boots_reinforced_leather_hunter.png",
groups = {armor_feet = 6, armor_heal = 0, armor_use = 40},

View File

@ -164,7 +164,7 @@ pclasses.api.register_class("warrior", function(player)
shift_class = true
for _,piece in pairs({"chestplate", "leggings", "boots", "helmet"}) do
shift_class = shift_class and (inv:contains_item("armor", "3d_armor:" .. piece .. "_mithril")
or inv:contains_item("armor", "3d_armor:" .. piece .. "_black_mithril_plated"))
or inv:contains_item("armor", "3d_armor:" .. piece .. "_blackmithril"))
end
return shift_class
end)
@ -177,8 +177,8 @@ pclasses.api.register_class("hunter", function(player)
end
shift_class = true
for _,piece in pairs({"chestplate", "leggings", "boots", "helmet"}) do
shift_class = shift_class and (inv:contains_item("armor", "3d_armor:" .. piece .. "_reinforced_leather_hunter")
or inv:contains_item("armor", "3d_armor:" .. piece .. "_hardened_leather_hunter"))
shift_class = shift_class and (inv:contains_item("armor", "3d_armor:" .. piece .. "_reinforcedleather")
or inv:contains_item("armor", "3d_armor:" .. piece .. "_hardenedleather"))
end
return shift_class
end)