Rename mod: 3d_armor → mcl_armor

This commit is contained in:
Wuzzy 2020-02-18 15:44:54 +01:00
parent edab0be8f5
commit fb251db925
103 changed files with 185 additions and 182 deletions

@ -203,25 +203,25 @@ local professions = {
trades = { trades = {
{ {
{ { "mcl_core:coal_lump", 16, 24 }, E1 }, { { "mcl_core:coal_lump", 16, 24 }, E1 },
{ { "mcl_core:emerald", 4, 6 }, { "3d_armor:helmet_iron", 1, 1 } }, { { "mcl_core:emerald", 4, 6 }, { "mcl_armor:helmet_iron", 1, 1 } },
}, },
{ {
{ { "mcl_core:iron_ingot", 7, 9 }, E1 }, { { "mcl_core:iron_ingot", 7, 9 }, E1 },
{ { "mcl_core:emerald", 10, 14 }, { "3d_armor:chestplate_iron", 1, 1 } }, { { "mcl_core:emerald", 10, 14 }, { "mcl_armor:chestplate_iron", 1, 1 } },
}, },
{ {
{ { "mcl_core:diamond", 3, 4 }, E1 }, { { "mcl_core:diamond", 3, 4 }, E1 },
-- TODO: enchant -- TODO: enchant
{ { "mcl_core:emerald", 16, 19 }, { "3d_armor:chestplate_diamond", 1, 1 } }, { { "mcl_core:emerald", 16, 19 }, { "mcl_armor:chestplate_diamond", 1, 1 } },
}, },
{ {
{ { "mcl_core:emerald", 5, 7 }, { "3d_armor:boots_chain", 1, 1 } }, { { "mcl_core:emerald", 5, 7 }, { "mcl_armor:boots_chain", 1, 1 } },
{ { "mcl_core:emerald", 9, 11 }, { "3d_armor:leggings_chain", 1, 1 } }, { { "mcl_core:emerald", 9, 11 }, { "mcl_armor:leggings_chain", 1, 1 } },
{ { "mcl_core:emerald", 5, 7 }, { "3d_armor:helmet_chain", 1, 1 } }, { { "mcl_core:emerald", 5, 7 }, { "mcl_armor:helmet_chain", 1, 1 } },
{ { "mcl_core:emerald", 11, 15 }, { "3d_armor:chestplate_chain", 1, 1 } }, { { "mcl_core:emerald", 11, 15 }, { "mcl_armor:chestplate_chain", 1, 1 } },
}, },
}, },
}, },
@ -231,12 +231,12 @@ local professions = {
trades = { trades = {
{ {
{ { "mcl_mobitems:leather", 9, 12 }, E1 }, { { "mcl_mobitems:leather", 9, 12 }, E1 },
{ { "mcl_core:emerald", 2, 4 }, { "3d_armor:leggings_leather", 2, 4 } }, { { "mcl_core:emerald", 2, 4 }, { "mcl_armor:leggings_leather", 2, 4 } },
}, },
{ {
-- TODO: enchant -- TODO: enchant
{ { "mcl_core:emerald", 7, 12 }, { "3d_armor:chestplate_leather", 1, 1 } }, { { "mcl_core:emerald", 7, 12 }, { "mcl_armor:chestplate_leather", 1, 1 } },
}, },
{ {

@ -1,4 +1,4 @@
# MineClone 2 HUD bar for `3d_armor` [`mcl_hbarmor`] # MineClone 2 HUD bar for `mcl_armor` [`mcl_hbarmor`]
## Description ## Description
This mod adds a simple HUD bar which displays the player's armor points. This mod adds a simple HUD bar which displays the player's armor points.

@ -1,7 +1,7 @@
local S = minetest.get_translator("mcl_hbarmor") local S = minetest.get_translator("mcl_hbarmor")
if (not armor) or (not armor.def) then if (not armor) or (not armor.def) then
minetest.log("error", "[mcl_hbarmor] Outdated 3d_armor version. Please update your version of 3d_armor!") minetest.log("error", "[mcl_hbarmor] Outdated mcl_armor version. Please update your version of mcl_armor!")
end end
local mcl_hbarmor = {} local mcl_hbarmor = {}

@ -1,2 +1,2 @@
name = mcl_hbarmor name = mcl_hbarmor
depends = hudbars, 3d_armor depends = hudbars, mcl_armor

@ -7,7 +7,7 @@ local players = {}
-- Containing all the items for each Creative Mode tab -- Containing all the items for each Creative Mode tab
local inventory_lists = {} local inventory_lists = {}
local show_armor = minetest.get_modpath("3d_armor") ~= nil local show_armor = minetest.get_modpath("mcl_armor") ~= nil
local mod_player = minetest.get_modpath("mcl_player") ~= nil local mod_player = minetest.get_modpath("mcl_player") ~= nil
-- TODO: Brewing is disabled. Add brewing (uncommented code) when it is implemented properly -- TODO: Brewing is disabled. Add brewing (uncommented code) when it is implemented properly

@ -1,4 +1,4 @@
mcl_init mcl_init
mcl_player? mcl_player?
_mcl_autogroup? _mcl_autogroup?
3d_armor? mcl_armor?

@ -3,7 +3,7 @@ local F = minetest.formspec_escape
mcl_inventory = {} mcl_inventory = {}
local show_armor = minetest.get_modpath("3d_armor") ~= nil local show_armor = minetest.get_modpath("mcl_armor") ~= nil
local mod_player = minetest.get_modpath("mcl_player") ~= nil local mod_player = minetest.get_modpath("mcl_player") ~= nil
local mod_craftguide = minetest.get_modpath("mcl_craftguide") ~= nil local mod_craftguide = minetest.get_modpath("mcl_craftguide") ~= nil

@ -6,6 +6,6 @@ mcl_worlds
mcl_core mcl_core
mcl_nether mcl_nether
3d_armor_stand 3d_armor_stand
3d_armor mcl_armor
doc? doc?
screwdriver? screwdriver?

@ -65,7 +65,7 @@ local fish = function(itemstack, player)
{ itemstring = "mcl_core:bowl", weight = 10 }, { itemstring = "mcl_core:bowl", weight = 10 },
{ itemstring = "mcl_fishing:fishing_rod", weight = 2, wear_min = 6554, wear_max = 65535 }, -- 10%-100% damage { itemstring = "mcl_fishing:fishing_rod", weight = 2, wear_min = 6554, wear_max = 65535 }, -- 10%-100% damage
{ itemstring = "mcl_mobitems:leather", weight = 10 }, { itemstring = "mcl_mobitems:leather", weight = 10 },
{ itemstring = "3d_armor:boots_leather", weight = 10, wear_min = 6554, wear_max = 65535 }, -- 10%-100% damage { itemstring = "mcl_armor:boots_leather", weight = 10, wear_min = 6554, wear_max = 65535 }, -- 10%-100% damage
{ itemstring = "mcl_mobitems:rotten_flesh", weight = 10 }, { itemstring = "mcl_mobitems:rotten_flesh", weight = 10 },
{ itemstring = "mcl_core:stick", weight = 5 }, { itemstring = "mcl_core:stick", weight = 5 },
{ itemstring = "mcl_mobitems:string", weight = 5 }, { itemstring = "mcl_mobitems:string", weight = 5 },

@ -1,6 +1,6 @@
[mod] 3d Armor Stand [3d_armor_stand] [mod] 3d Armor Stand [3d_armor_stand]
===================================== =====================================
Depends: 3d_armor Depends: mcl_armor
Adds a chest-like armor stand for armor storage and display. Adds an armor stand for armor storage and display.

@ -1,4 +1,4 @@
3d_armor mcl_armor
mcl_core mcl_core
mcl_sounds mcl_sounds
mcl_stairs mcl_stairs

@ -43,6 +43,9 @@ local function update_entity(pos)
local stack = inv:get_stack("armor_"..element, 1) local stack = inv:get_stack("armor_"..element, 1)
if stack:get_count() == 1 then if stack:get_count() == 1 then
local item = stack:get_name() or "" local item = stack:get_name() or ""
if minetest.registered_aliases[item] then
item = minetest.registered_aliases[item]
end
local def = stack:get_definition() or {} local def = stack:get_definition() or {}
local groups = def.groups or {} local groups = def.groups or {}
if groups["armor_"..element] then if groups["armor_"..element] then

@ -1,30 +1,15 @@
Modpack - 3d Armor Modpack - Armor
================== ==================
[mod] Unified Skins [unified_skins] [mod] Visible Wielded Items `[wieldview]`
----------------------------------- -----------------------------------------
depends: default
A 3d character model re-texturing api used as the framework for this modpack.
Compatible with player skins mod [skins] by Zeg9 and Player Textures [player_textures] by sdzen.
Note: Currently only supports 64x32px player skins.
[mod] Visible Wielded Items [wieldview]
---------------------------------------
depends: unified_skins
Makes hand wielded items visible to other players. Makes hand wielded items visible to other players.
Note: Currently only supports 16x16px texture packs, sorry! Note: Currently only supports 16x16px texture packs, sorry!
[mod] Visible Player Armor [3d_armor] [mod] Visible Player Armor `[mcl_armor]`
------------------------------------- ----------------------------------------
depends: unified_skins, inventory_plus
Adds craftable armor that is visible to other players. Each armor item worn contributes to Adds craftable armor that is visible to other players. Each armor item worn contributes to
a player's armor group level making them less vulnerable to weapons. a player's armor group level making them less vulnerable to weapons.
@ -32,10 +17,3 @@ a player's armor group level making them less vulnerable to weapons.
Armor takes damage when a player is hurt, however, many armor items offer a 'stackable' Armor takes damage when a player is hurt, however, many armor items offer a 'stackable'
percentage chance of restoring the lost health points. percentage chance of restoring the lost health points.
[mod] Shields [shields]
-------------------------------------
depends: 3d_armor
Originally a part of 3d_armor, shields have been re-included as an optional extra.
If you do not want shields then simply remove the shields folder from the modpack.

@ -1,7 +1,5 @@
[mod] Visible Player Armor [3d_armor] [mod] Visible Player Armor [mcl_armor]
===================================== ======================================
MineClone 2 edition
-------------------------------------
Adds craftable armor that is visible to other players. Each armor item worn contributes to Adds craftable armor that is visible to other players. Each armor item worn contributes to
a player's armor group level making them less vulnerable to some forms of damage. a player's armor group level making them less vulnerable to some forms of damage.
@ -12,13 +10,13 @@ This mod is based on 3D Armor mod by stu.
Media credits Media credits
------------- -------------
* 3d_armor_equip_diamond.ogg * mcl_armor_equip_diamond.ogg
* 3d_armor_unequip_diamond.ogg * mcl_armor_unequip_diamond.ogg
Licensed CC0, by Freesound.org user juryduty. Licensed CC0, by Freesound.org user juryduty.
Source: <https://freesound.org/people/juryduty/sounds/180231/> Source: <https://freesound.org/people/juryduty/sounds/180231/>
* 3d_armor_equip_iron.ogg * mcl_armor_equip_iron.ogg
* 3d_armor_unequip_iron.ogg * mcl_armor_unequip_iron.ogg
Licensed CC0, by Freesound.org user mtchanary. Licensed CC0, by Freesound.org user mtchanary.
Source: <https://freesound.org/people/mitchanary/sounds/506148/> Source: <https://freesound.org/people/mitchanary/sounds/506148/>

@ -0,0 +1,23 @@
minetest.register_alias("3d_armor:helmet_leather", "mcl_armor:helmet_leather")
minetest.register_alias("3d_armor:helmet_iron", "mcl_armor:helmet_iron")
minetest.register_alias("3d_armor:helmet_chain", "mcl_armor:helmet_chain")
minetest.register_alias("3d_armor:helmet_gold", "mcl_armor:helmet_gold")
minetest.register_alias("3d_armor:helmet_diamond", "mcl_armor:helmet_diamond")
minetest.register_alias("3d_armor:chestplate_leather", "mcl_armor:chestplate_leather")
minetest.register_alias("3d_armor:chestplate_iron", "mcl_armor:chestplate_iron")
minetest.register_alias("3d_armor:chestplate_chain", "mcl_armor:chestplate_chain")
minetest.register_alias("3d_armor:chestplate_gold", "mcl_armor:chestplate_gold")
minetest.register_alias("3d_armor:chestplate_diamond", "mcl_armor:chestplate_diamond")
minetest.register_alias("3d_armor:leggings_leather", "mcl_armor:leggings_leather")
minetest.register_alias("3d_armor:leggings_iron", "mcl_armor:leggings_iron")
minetest.register_alias("3d_armor:leggings_chain", "mcl_armor:leggings_chain")
minetest.register_alias("3d_armor:leggings_gold", "mcl_armor:leggings_gold")
minetest.register_alias("3d_armor:leggings_diamond", "mcl_armor:leggings_diamond")
minetest.register_alias("3d_armor:boots_leather", "mcl_armor:boots_leather")
minetest.register_alias("3d_armor:boots_iron", "mcl_armor:boots_iron")
minetest.register_alias("3d_armor:boots_chain", "mcl_armor:boots_chain")
minetest.register_alias("3d_armor:boots_gold", "mcl_armor:boots_gold")
minetest.register_alias("3d_armor:boots_diamond", "mcl_armor:boots_diamond")

@ -18,7 +18,6 @@ armor = {
.."listring[current_player;craft]", .."listring[current_player;craft]",
textures = {}, textures = {},
default_skin = "character", default_skin = "character",
version = "0.4.6",
} }
if minetest.get_modpath("mcl_skins") then if minetest.get_modpath("mcl_skins") then
@ -71,6 +70,9 @@ armor.set_player_armor = function(self, player)
for i=1, 6 do for i=1, 6 do
local stack = player_inv:get_stack("armor", i) local stack = player_inv:get_stack("armor", i)
local item = stack:get_name() local item = stack:get_name()
if minetest.registered_aliases[item] then
item = minetest.registered_aliases[item]
end
if stack:get_count() == 1 then if stack:get_count() == 1 then
local def = stack:get_definition() local def = stack:get_definition()
for k, v in pairs(elements) do for k, v in pairs(elements) do
@ -177,11 +179,11 @@ end
armor.get_armor_formspec = function(self, name) armor.get_armor_formspec = function(self, name)
if not armor.textures[name] then if not armor.textures[name] then
minetest.log("error", "3d_armor: Player texture["..name.."] is nil [get_armor_formspec]") minetest.log("error", "mcl_armor: Player texture["..name.."] is nil [get_armor_formspec]")
return "" return ""
end end
if not armor.def[name] then if not armor.def[name] then
minetest.log("error", "3d_armor: Armor def["..name.."] is nil [get_armor_formspec]") minetest.log("error", "mcl_armor: Armor def["..name.."] is nil [get_armor_formspec]")
return "" return ""
end end
local formspec = armor.formspec.."list[detached:"..name.."_armor;armor;0,1;2,3;]" local formspec = armor.formspec.."list[detached:"..name.."_armor;armor;0,1;2,3;]"
@ -197,25 +199,25 @@ end
armor.get_valid_player = function(self, player, msg) armor.get_valid_player = function(self, player, msg)
msg = msg or "" msg = msg or ""
if not player then if not player then
minetest.log("error", "3d_armor: Player reference is nil "..msg) minetest.log("error", "mcl_armor: Player reference is nil "..msg)
return return
end end
local name = player:get_player_name() local name = player:get_player_name()
if not name then if not name then
minetest.log("error", "3d_armor: Player name is nil "..msg) minetest.log("error", "mcl_armor: Player name is nil "..msg)
return return
end end
local pos = player:get_pos() local pos = player:get_pos()
local player_inv = player:get_inventory() local player_inv = player:get_inventory()
local armor_inv = minetest.get_inventory({type="detached", name=name.."_armor"}) local armor_inv = minetest.get_inventory({type="detached", name=name.."_armor"})
if not pos then if not pos then
minetest.log("error", "3d_armor: Player position is nil "..msg) minetest.log("error", "mcl_armor: Player position is nil "..msg)
return return
elseif not player_inv then elseif not player_inv then
minetest.log("error", "3d_armor: Player inventory is nil "..msg) minetest.log("error", "mcl_armor: Player inventory is nil "..msg)
return return
elseif not armor_inv then elseif not armor_inv then
minetest.log("error", "3d_armor: Detached armor inventory is nil "..msg) minetest.log("error", "mcl_armor: Detached armor inventory is nil "..msg)
return return
end end
return name, player_inv, armor_inv, pos return name, player_inv, armor_inv, pos
@ -230,7 +232,7 @@ armor.play_equip_sound = function(self, player, stack, unequip)
local snd = def.sounds and def.sounds["_mcl_armor_"..estr] local snd = def.sounds and def.sounds["_mcl_armor_"..estr]
if not snd then if not snd then
-- Fallback sound -- Fallback sound
snd = { name = "3d_armor_"..estr.."_iron" } snd = { name = "mcl_armor_"..estr.."_iron" }
end end
if snd then if snd then
minetest.sound_play(snd, {object=player, gain=0.5, max_hear_distance=8}) minetest.sound_play(snd, {object=player, gain=0.5, max_hear_distance=8})
@ -239,7 +241,7 @@ end
-- Register Player Model -- Register Player Model
mcl_player.player_register_model("3d_armor_character.b3d", { mcl_player.player_register_model("mcl_armor_character.b3d", {
animation_speed = 30, animation_speed = 30,
textures = { textures = {
armor.default_skin..".png", armor.default_skin..".png",
@ -282,7 +284,7 @@ minetest.register_on_player_receive_fields(function(player, formname, fields)
end) end)
minetest.register_on_joinplayer(function(player) minetest.register_on_joinplayer(function(player)
mcl_player.player_set_model(player, "3d_armor_character.b3d") mcl_player.player_set_model(player, "mcl_armor_character.b3d")
local name = player:get_player_name() local name = player:get_player_name()
local player_inv = player:get_inventory() local player_inv = player:get_inventory()
local armor_inv = minetest.create_detached_inventory(name.."_armor", { local armor_inv = minetest.create_detached_inventory(name.."_armor", {

@ -1,258 +1,259 @@
local S = minetest.get_translator("3d_armor") local S = minetest.get_translator("mcl_armor")
dofile(minetest.get_modpath(minetest.get_current_modname()).."/armor.lua") dofile(minetest.get_modpath(minetest.get_current_modname()).."/armor.lua")
dofile(minetest.get_modpath(minetest.get_current_modname()).."/alias.lua")
-- Regisiter Head Armor -- Regisiter Head Armor
local longdesc = S("This is a piece of equippable armor which reduces the amount of damage you receive.") local longdesc = S("This is a piece of equippable armor which reduces the amount of damage you receive.")
local usage = S("To equip it, put it on the corresponding armor slot in your inventory menu.") local usage = S("To equip it, put it on the corresponding armor slot in your inventory menu.")
minetest.register_tool("3d_armor:helmet_leather", { minetest.register_tool("mcl_armor:helmet_leather", {
description = S("Leather Cap"), description = S("Leather Cap"),
_doc_items_longdesc = longdesc, _doc_items_longdesc = longdesc,
_doc_items_usagehelp = usage, _doc_items_usagehelp = usage,
inventory_image = "3d_armor_inv_helmet_leather.png", inventory_image = "mcl_armor_inv_helmet_leather.png",
groups = {armor_head=1, mcl_armor_points=1, mcl_armor_uses=56}, groups = {armor_head=1, mcl_armor_points=1, mcl_armor_uses=56},
_repair_material = "mcl_mobitems:leather", _repair_material = "mcl_mobitems:leather",
sounds = { sounds = {
_mcl_armor_equip = "3d_armor_equip_leather", _mcl_armor_equip = "mcl_armor_equip_leather",
_mcl_armor_unequip = "3d_armor_unequip_leather", _mcl_armor_unequip = "mcl_armor_unequip_leather",
}, },
}) })
minetest.register_tool("3d_armor:helmet_iron", { minetest.register_tool("mcl_armor:helmet_iron", {
description = S("Iron Helmet"), description = S("Iron Helmet"),
_doc_items_longdesc = longdesc, _doc_items_longdesc = longdesc,
_doc_items_usagehelp = usage, _doc_items_usagehelp = usage,
inventory_image = "3d_armor_inv_helmet_iron.png", inventory_image = "mcl_armor_inv_helmet_iron.png",
groups = {armor_head=1, mcl_armor_points=2, mcl_armor_uses=166}, groups = {armor_head=1, mcl_armor_points=2, mcl_armor_uses=166},
_repair_material = "mcl_core:iron_ingot", _repair_material = "mcl_core:iron_ingot",
sounds = { sounds = {
_mcl_armor_equip = "3d_armor_equip_iron", _mcl_armor_equip = "mcl_armor_equip_iron",
_mcl_armor_unequip = "3d_armor_unequip_iron", _mcl_armor_unequip = "mcl_armor_unequip_iron",
}, },
}) })
minetest.register_tool("3d_armor:helmet_gold", { minetest.register_tool("mcl_armor:helmet_gold", {
description = S("Golden Helmet"), description = S("Golden Helmet"),
_doc_items_longdesc = longdesc, _doc_items_longdesc = longdesc,
_doc_items_usagehelp = usage, _doc_items_usagehelp = usage,
inventory_image = "3d_armor_inv_helmet_gold.png", inventory_image = "mcl_armor_inv_helmet_gold.png",
groups = {armor_head=1, mcl_armor_points=2, mcl_armor_uses=78}, groups = {armor_head=1, mcl_armor_points=2, mcl_armor_uses=78},
_repair_material = "mcl_core:gold_ingot", _repair_material = "mcl_core:gold_ingot",
}) })
minetest.register_tool("3d_armor:helmet_diamond",{ minetest.register_tool("mcl_armor:helmet_diamond",{
description = S("Diamond Helmet"), description = S("Diamond Helmet"),
_doc_items_longdesc = longdesc, _doc_items_longdesc = longdesc,
_doc_items_usagehelp = usage, _doc_items_usagehelp = usage,
inventory_image = "3d_armor_inv_helmet_diamond.png", inventory_image = "mcl_armor_inv_helmet_diamond.png",
groups = {armor_head=1, mcl_armor_points=3, mcl_armor_uses=364, mcl_armor_toughness=2}, groups = {armor_head=1, mcl_armor_points=3, mcl_armor_uses=364, mcl_armor_toughness=2},
_repair_material = "mcl_core:diamond", _repair_material = "mcl_core:diamond",
sounds = { sounds = {
_mcl_armor_equip = "3d_armor_equip_diamond", _mcl_armor_equip = "mcl_armor_equip_diamond",
_mcl_armor_unequip = "3d_armor_unequip_diamond", _mcl_armor_unequip = "mcl_armor_unequip_diamond",
}, },
}) })
minetest.register_tool("3d_armor:helmet_chain", { minetest.register_tool("mcl_armor:helmet_chain", {
description = S("Chain Helmet"), description = S("Chain Helmet"),
_doc_items_longdesc = longdesc, _doc_items_longdesc = longdesc,
_doc_items_usagehelp = usage, _doc_items_usagehelp = usage,
inventory_image = "3d_armor_inv_helmet_chain.png", inventory_image = "mcl_armor_inv_helmet_chain.png",
groups = {armor_head=1, mcl_armor_points=2, mcl_armor_uses=166}, groups = {armor_head=1, mcl_armor_points=2, mcl_armor_uses=166},
_repair_material = "mcl_core:iron_ingot", _repair_material = "mcl_core:iron_ingot",
sounds = { sounds = {
_mcl_armor_equip = "3d_armor_equip_chainmail", _mcl_armor_equip = "mcl_armor_equip_chainmail",
_mcl_armor_unequip = "3d_armor_unequip_chainmail", _mcl_armor_unequip = "mcl_armor_unequip_chainmail",
}, },
}) })
-- Regisiter Torso Armor -- Regisiter Torso Armor
minetest.register_tool("3d_armor:chestplate_leather", { minetest.register_tool("mcl_armor:chestplate_leather", {
description = S("Leather Tunic"), description = S("Leather Tunic"),
_doc_items_longdesc = longdesc, _doc_items_longdesc = longdesc,
_doc_items_usagehelp = usage, _doc_items_usagehelp = usage,
inventory_image = "3d_armor_inv_chestplate_leather.png", inventory_image = "mcl_armor_inv_chestplate_leather.png",
groups = {armor_torso=1, mcl_armor_points=3, mcl_armor_uses=81}, groups = {armor_torso=1, mcl_armor_points=3, mcl_armor_uses=81},
_repair_material = "mcl_mobitems:leather", _repair_material = "mcl_mobitems:leather",
sounds = { sounds = {
_mcl_armor_equip = "3d_armor_equip_leather", _mcl_armor_equip = "mcl_armor_equip_leather",
_mcl_armor_unequip = "3d_armor_unequip_leather", _mcl_armor_unequip = "mcl_armor_unequip_leather",
}, },
}) })
minetest.register_tool("3d_armor:chestplate_iron", { minetest.register_tool("mcl_armor:chestplate_iron", {
description = S("Iron Chestplate"), description = S("Iron Chestplate"),
_doc_items_longdesc = longdesc, _doc_items_longdesc = longdesc,
_doc_items_usagehelp = usage, _doc_items_usagehelp = usage,
inventory_image = "3d_armor_inv_chestplate_iron.png", inventory_image = "mcl_armor_inv_chestplate_iron.png",
groups = {armor_torso=1, mcl_armor_points=6, mcl_armor_uses=241}, groups = {armor_torso=1, mcl_armor_points=6, mcl_armor_uses=241},
_repair_material = "mcl_core:iron_ingot", _repair_material = "mcl_core:iron_ingot",
sounds = { sounds = {
_mcl_armor_equip = "3d_armor_equip_iron", _mcl_armor_equip = "mcl_armor_equip_iron",
_mcl_armor_unequip = "3d_armor_unequip_iron", _mcl_armor_unequip = "mcl_armor_unequip_iron",
}, },
}) })
minetest.register_tool("3d_armor:chestplate_gold", { minetest.register_tool("mcl_armor:chestplate_gold", {
description = S("Golden Chestplate"), description = S("Golden Chestplate"),
_doc_items_longdesc = longdesc, _doc_items_longdesc = longdesc,
_doc_items_usagehelp = usage, _doc_items_usagehelp = usage,
inventory_image = "3d_armor_inv_chestplate_gold.png", inventory_image = "mcl_armor_inv_chestplate_gold.png",
groups = {armor_torso=1, mcl_armor_points=5, mcl_armor_uses=113}, groups = {armor_torso=1, mcl_armor_points=5, mcl_armor_uses=113},
_repair_material = "mcl_core:gold_ingot", _repair_material = "mcl_core:gold_ingot",
}) })
minetest.register_tool("3d_armor:chestplate_diamond",{ minetest.register_tool("mcl_armor:chestplate_diamond",{
description = S("Diamond Chestplate"), description = S("Diamond Chestplate"),
_doc_items_longdesc = longdesc, _doc_items_longdesc = longdesc,
_doc_items_usagehelp = usage, _doc_items_usagehelp = usage,
inventory_image = "3d_armor_inv_chestplate_diamond.png", inventory_image = "mcl_armor_inv_chestplate_diamond.png",
groups = {armor_torso=1, mcl_armor_points=8, mcl_armor_uses=529, mcl_armor_toughness=2}, groups = {armor_torso=1, mcl_armor_points=8, mcl_armor_uses=529, mcl_armor_toughness=2},
_repair_material = "mcl_core:diamond", _repair_material = "mcl_core:diamond",
sounds = { sounds = {
_mcl_armor_equip = "3d_armor_equip_diamond", _mcl_armor_equip = "mcl_armor_equip_diamond",
_mcl_armor_unequip = "3d_armor_unequip_diamond", _mcl_armor_unequip = "mcl_armor_unequip_diamond",
}, },
}) })
minetest.register_tool("3d_armor:chestplate_chain", { minetest.register_tool("mcl_armor:chestplate_chain", {
description = S("Chain Chestplate"), description = S("Chain Chestplate"),
_doc_items_longdesc = longdesc, _doc_items_longdesc = longdesc,
_doc_items_usagehelp = usage, _doc_items_usagehelp = usage,
inventory_image = "3d_armor_inv_chestplate_chain.png", inventory_image = "mcl_armor_inv_chestplate_chain.png",
groups = {armor_torso=1, mcl_armor_points=5, mcl_armor_uses=241}, groups = {armor_torso=1, mcl_armor_points=5, mcl_armor_uses=241},
_repair_material = "mcl_core:iron_ingot", _repair_material = "mcl_core:iron_ingot",
sounds = { sounds = {
_mcl_armor_equip = "3d_armor_equip_chainmail", _mcl_armor_equip = "mcl_armor_equip_chainmail",
_mcl_armor_unequip = "3d_armor_unequip_chainmail", _mcl_armor_unequip = "mcl_armor_unequip_chainmail",
}, },
}) })
-- Regisiter Leg Armor -- Regisiter Leg Armor
minetest.register_tool("3d_armor:leggings_leather", { minetest.register_tool("mcl_armor:leggings_leather", {
description = S("Leather Pants"), description = S("Leather Pants"),
_doc_items_longdesc = longdesc, _doc_items_longdesc = longdesc,
_doc_items_usagehelp = usage, _doc_items_usagehelp = usage,
inventory_image = "3d_armor_inv_leggings_leather.png", inventory_image = "mcl_armor_inv_leggings_leather.png",
groups = {armor_legs=1, mcl_armor_points=2, mcl_armor_uses=76}, groups = {armor_legs=1, mcl_armor_points=2, mcl_armor_uses=76},
_repair_material = "mcl_mobitems:leather", _repair_material = "mcl_mobitems:leather",
sounds = { sounds = {
_mcl_armor_equip = "3d_armor_equip_leather", _mcl_armor_equip = "mcl_armor_equip_leather",
_mcl_armor_unequip = "3d_armor_unequip_leather", _mcl_armor_unequip = "mcl_armor_unequip_leather",
}, },
}) })
minetest.register_tool("3d_armor:leggings_iron", { minetest.register_tool("mcl_armor:leggings_iron", {
description = S("Iron Leggings"), description = S("Iron Leggings"),
_doc_items_longdesc = longdesc, _doc_items_longdesc = longdesc,
_doc_items_usagehelp = usage, _doc_items_usagehelp = usage,
inventory_image = "3d_armor_inv_leggings_iron.png", inventory_image = "mcl_armor_inv_leggings_iron.png",
groups = {armor_legs=1, mcl_armor_points=5, mcl_armor_uses=226}, groups = {armor_legs=1, mcl_armor_points=5, mcl_armor_uses=226},
_repair_material = "mcl_core:iron_ingot", _repair_material = "mcl_core:iron_ingot",
sounds = { sounds = {
_mcl_armor_equip = "3d_armor_equip_iron", _mcl_armor_equip = "mcl_armor_equip_iron",
_mcl_armor_unequip = "3d_armor_unequip_iron", _mcl_armor_unequip = "mcl_armor_unequip_iron",
}, },
}) })
minetest.register_tool("3d_armor:leggings_gold", { minetest.register_tool("mcl_armor:leggings_gold", {
description = S("Golden Leggings"), description = S("Golden Leggings"),
_doc_items_longdesc = longdesc, _doc_items_longdesc = longdesc,
_doc_items_usagehelp = usage, _doc_items_usagehelp = usage,
inventory_image = "3d_armor_inv_leggings_gold.png", inventory_image = "mcl_armor_inv_leggings_gold.png",
groups = {armor_legs=1, mcl_armor_points=3, mcl_armor_uses=106}, groups = {armor_legs=1, mcl_armor_points=3, mcl_armor_uses=106},
_repair_material = "mcl_core:gold_ingot", _repair_material = "mcl_core:gold_ingot",
}) })
minetest.register_tool("3d_armor:leggings_diamond",{ minetest.register_tool("mcl_armor:leggings_diamond",{
description = S("Diamond Leggings"), description = S("Diamond Leggings"),
_doc_items_longdesc = longdesc, _doc_items_longdesc = longdesc,
_doc_items_usagehelp = usage, _doc_items_usagehelp = usage,
inventory_image = "3d_armor_inv_leggings_diamond.png", inventory_image = "mcl_armor_inv_leggings_diamond.png",
groups = {armor_legs=1, mcl_armor_points=6, mcl_armor_uses=496, mcl_armor_toughness=2}, groups = {armor_legs=1, mcl_armor_points=6, mcl_armor_uses=496, mcl_armor_toughness=2},
_repair_material = "mcl_core:diamond", _repair_material = "mcl_core:diamond",
sounds = { sounds = {
_mcl_armor_equip = "3d_armor_equip_diamond", _mcl_armor_equip = "mcl_armor_equip_diamond",
_mcl_armor_unequip = "3d_armor_unequip_diamond", _mcl_armor_unequip = "mcl_armor_unequip_diamond",
}, },
}) })
minetest.register_tool("3d_armor:leggings_chain", { minetest.register_tool("mcl_armor:leggings_chain", {
description = S("Chain Leggings"), description = S("Chain Leggings"),
_doc_items_longdesc = longdesc, _doc_items_longdesc = longdesc,
_doc_items_usagehelp = usage, _doc_items_usagehelp = usage,
inventory_image = "3d_armor_inv_leggings_chain.png", inventory_image = "mcl_armor_inv_leggings_chain.png",
groups = {armor_legs=1, mcl_armor_points=4, mcl_armor_uses=226}, groups = {armor_legs=1, mcl_armor_points=4, mcl_armor_uses=226},
_repair_material = "mcl_core:iron_ingot", _repair_material = "mcl_core:iron_ingot",
sounds = { sounds = {
_mcl_armor_equip = "3d_armor_equip_chainmail", _mcl_armor_equip = "mcl_armor_equip_chainmail",
_mcl_armor_unequip = "3d_armor_unequip_chainmail", _mcl_armor_unequip = "mcl_armor_unequip_chainmail",
}, },
}) })
-- Regisiter Boots -- Regisiter Boots
minetest.register_tool("3d_armor:boots_leather", { minetest.register_tool("mcl_armor:boots_leather", {
description = S("Leather Boots"), description = S("Leather Boots"),
_doc_items_longdesc = longdesc, _doc_items_longdesc = longdesc,
_doc_items_usagehelp = usage, _doc_items_usagehelp = usage,
inventory_image = "3d_armor_inv_boots_leather.png", inventory_image = "mcl_armor_inv_boots_leather.png",
groups = {armor_feet=1, mcl_armor_points=1, mcl_armor_uses=66}, groups = {armor_feet=1, mcl_armor_points=1, mcl_armor_uses=66},
_repair_material = "mcl_mobitems:leather", _repair_material = "mcl_mobitems:leather",
sounds = { sounds = {
_mcl_armor_equip = "3d_armor_equip_leather", _mcl_armor_equip = "mcl_armor_equip_leather",
_mcl_armor_unequip = "3d_armor_unequip_leather", _mcl_armor_unequip = "mcl_armor_unequip_leather",
}, },
}) })
minetest.register_tool("3d_armor:boots_iron", { minetest.register_tool("mcl_armor:boots_iron", {
description = S("Iron Boots"), description = S("Iron Boots"),
_doc_items_longdesc = longdesc, _doc_items_longdesc = longdesc,
_doc_items_usagehelp = usage, _doc_items_usagehelp = usage,
inventory_image = "3d_armor_inv_boots_iron.png", inventory_image = "mcl_armor_inv_boots_iron.png",
groups = {armor_feet=1, mcl_armor_points=2, mcl_armor_uses=196}, groups = {armor_feet=1, mcl_armor_points=2, mcl_armor_uses=196},
_repair_material = "mcl_core:iron_ingot", _repair_material = "mcl_core:iron_ingot",
sounds = { sounds = {
_mcl_armor_equip = "3d_armor_equip_iron", _mcl_armor_equip = "mcl_armor_equip_iron",
_mcl_armor_unequip = "3d_armor_unequip_iron", _mcl_armor_unequip = "mcl_armor_unequip_iron",
}, },
}) })
minetest.register_tool("3d_armor:boots_gold", { minetest.register_tool("mcl_armor:boots_gold", {
description = S("Golden Boots"), description = S("Golden Boots"),
_doc_items_longdesc = longdesc, _doc_items_longdesc = longdesc,
_doc_items_usagehelp = usage, _doc_items_usagehelp = usage,
inventory_image = "3d_armor_inv_boots_gold.png", inventory_image = "mcl_armor_inv_boots_gold.png",
groups = {armor_feet=1, mcl_armor_points=1, mcl_armor_uses=92}, groups = {armor_feet=1, mcl_armor_points=1, mcl_armor_uses=92},
_repair_material = "mcl_core:gold_ingot", _repair_material = "mcl_core:gold_ingot",
}) })
minetest.register_tool("3d_armor:boots_diamond",{ minetest.register_tool("mcl_armor:boots_diamond",{
description = S("Diamond Boots"), description = S("Diamond Boots"),
_doc_items_longdesc = longdesc, _doc_items_longdesc = longdesc,
_doc_items_usagehelp = usage, _doc_items_usagehelp = usage,
inventory_image = "3d_armor_inv_boots_diamond.png", inventory_image = "mcl_armor_inv_boots_diamond.png",
groups = {armor_feet=1, mcl_armor_points=3, mcl_armor_uses=430, mcl_armor_toughness=2}, groups = {armor_feet=1, mcl_armor_points=3, mcl_armor_uses=430, mcl_armor_toughness=2},
_repair_material = "mcl_core:diamond", _repair_material = "mcl_core:diamond",
sounds = { sounds = {
_mcl_armor_equip = "3d_armor_equip_diamond", _mcl_armor_equip = "mcl_armor_equip_diamond",
_mcl_armor_unequip = "3d_armor_unequip_diamond", _mcl_armor_unequip = "mcl_armor_unequip_diamond",
}, },
}) })
minetest.register_tool("3d_armor:boots_chain", { minetest.register_tool("mcl_armor:boots_chain", {
description = S("Chain Boots"), description = S("Chain Boots"),
_doc_items_longdesc = longdesc, _doc_items_longdesc = longdesc,
_doc_items_usagehelp = usage, _doc_items_usagehelp = usage,
inventory_image = "3d_armor_inv_boots_chain.png", inventory_image = "mcl_armor_inv_boots_chain.png",
groups = {armor_feet=1, mcl_armor_points=1, mcl_armor_uses=196}, groups = {armor_feet=1, mcl_armor_points=1, mcl_armor_uses=196},
_repair_material = "mcl_core:iron_ingot", _repair_material = "mcl_core:iron_ingot",
sounds = { sounds = {
_mcl_armor_equip = "3d_armor_equip_chainmail", _mcl_armor_equip = "mcl_armor_equip_chainmail",
_mcl_armor_unequip = "3d_armor_unequip_chainmail", _mcl_armor_unequip = "mcl_armor_unequip_chainmail",
}, },
}) })
@ -273,7 +274,7 @@ for k, v in pairs(craft_ingreds) do
local c = v[2] local c = v[2]
if m ~= nil then if m ~= nil then
minetest.register_craft({ minetest.register_craft({
output = "3d_armor:helmet_"..k, output = "mcl_armor:helmet_"..k,
recipe = { recipe = {
{m, m, m}, {m, m, m},
{m, "", m}, {m, "", m},
@ -281,7 +282,7 @@ for k, v in pairs(craft_ingreds) do
}, },
}) })
minetest.register_craft({ minetest.register_craft({
output = "3d_armor:chestplate_"..k, output = "mcl_armor:chestplate_"..k,
recipe = { recipe = {
{m, "", m}, {m, "", m},
{m, m, m}, {m, m, m},
@ -289,7 +290,7 @@ for k, v in pairs(craft_ingreds) do
}, },
}) })
minetest.register_craft({ minetest.register_craft({
output = "3d_armor:leggings_"..k, output = "mcl_armor:leggings_"..k,
recipe = { recipe = {
{m, m, m}, {m, m, m},
{m, "", m}, {m, "", m},
@ -297,7 +298,7 @@ for k, v in pairs(craft_ingreds) do
}, },
}) })
minetest.register_craft({ minetest.register_craft({
output = "3d_armor:boots_"..k, output = "mcl_armor:boots_"..k,
recipe = { recipe = {
{m, "", m}, {m, "", m},
{m, "", m}, {m, "", m},
@ -308,26 +309,27 @@ for k, v in pairs(craft_ingreds) do
minetest.register_craft({ minetest.register_craft({
type = "cooking", type = "cooking",
output = c, output = c,
recipe = "3d_armor:helmet_"..k, recipe = "mcl_armor:helmet_"..k,
cooktime = 10, cooktime = 10,
}) })
minetest.register_craft({ minetest.register_craft({
type = "cooking", type = "cooking",
output = c, output = c,
recipe = "3d_armor:chestplate_"..k, recipe = "mcl_armor:chestplate_"..k,
cooktime = 10, cooktime = 10,
}) })
minetest.register_craft({ minetest.register_craft({
type = "cooking", type = "cooking",
output = c, output = c,
recipe = "3d_armor:leggings_"..k, recipe = "mcl_armor:leggings_"..k,
cooktime = 10, cooktime = 10,
}) })
minetest.register_craft({ minetest.register_craft({
type = "cooking", type = "cooking",
output = c, output = c,
recipe = "3d_armor:boots_"..k, recipe = "mcl_armor:boots_"..k,
cooktime = 10, cooktime = 10,
}) })
end end
end end

@ -1,4 +1,4 @@
# textdomain: 3d_armor # textdomain: mcl_armor
This is a piece of equippable armor which reduces the amount of damage you receive.=Dies ist ein Teil einer tragbaren Rüstung, die die Menge an Schaden, den Sie erleiden, reduziert. This is a piece of equippable armor which reduces the amount of damage you receive.=Dies ist ein Teil einer tragbaren Rüstung, die die Menge an Schaden, den Sie erleiden, reduziert.
To equip it, put it on the corresponding armor slot in your inventory menu.=Um es zu tragen, legen Sie es in den passenden Rüstungsplatz in ihrem Inventarmenü. To equip it, put it on the corresponding armor slot in your inventory menu.=Um es zu tragen, legen Sie es in den passenden Rüstungsplatz in ihrem Inventarmenü.
Leather Cap=Lederkappe Leather Cap=Lederkappe

@ -1,4 +1,4 @@
# textdomain: 3d_armor # textdomain: mcl_armor
This is a piece of equippable armor which reduces the amount of damage you receive.=Dies ist ein Teil einer tragbaren Rüstung, die die Menge an Schaden, den Sie erleiden, reduziert. This is a piece of equippable armor which reduces the amount of damage you receive.=Dies ist ein Teil einer tragbaren Rüstung, die die Menge an Schaden, den Sie erleiden, reduziert.
To equip it, put it on the corresponding armor slot in your inventory menu.=Um es zu tragen, legen Sie es in den passenden Rüstungsplatz in ihrem Inventarmenü. To equip it, put it on the corresponding armor slot in your inventory menu.=Um es zu tragen, legen Sie es in den passenden Rüstungsplatz in ihrem Inventarmenü.
Leather Cap=Sombrero de cuero Leather Cap=Sombrero de cuero

@ -1,4 +1,4 @@
# textdomain: 3d_armor # textdomain: mcl_armor
This is a piece of equippable armor which reduces the amount of damage you receive.= This is a piece of equippable armor which reduces the amount of damage you receive.=
To equip it, put it on the corresponding armor slot in your inventory menu.= To equip it, put it on the corresponding armor slot in your inventory menu.=
Leather Cap= Leather Cap=

@ -1,7 +1,7 @@
[mod] visible wielded items [wieldview] [mod] visible wielded items [wieldview]
======================================= =======================================
Depends on: 3d_armor Depends on: mcl_armor
Makes hand wielded items visible to other players. Makes hand wielded items visible to other players.

@ -1 +1 @@
3d_armor mcl_armor

@ -40,7 +40,7 @@ minetest.register_craft({
}) })
minetest.register_craft({ minetest.register_craft({
output = "3d_armor:helmet_chain", output = "mcl_armor:helmet_chain",
recipe = { recipe = {
{ "xpanes:bar_flat", "mcl_core:iron_ingot", "xpanes:bar_flat" }, { "xpanes:bar_flat", "mcl_core:iron_ingot", "xpanes:bar_flat" },
{ "xpanes:bar_flat", "", "xpanes:bar_flat" }, { "xpanes:bar_flat", "", "xpanes:bar_flat" },
@ -48,7 +48,7 @@ minetest.register_craft({
}) })
minetest.register_craft({ minetest.register_craft({
output = "3d_armor:leggings_chain", output = "mcl_armor:leggings_chain",
recipe = { recipe = {
{ "xpanes:bar_flat", "mcl_core:iron_ingot", "xpanes:bar_flat" }, { "xpanes:bar_flat", "mcl_core:iron_ingot", "xpanes:bar_flat" },
{ "xpanes:bar_flat", "", "xpanes:bar_flat" }, { "xpanes:bar_flat", "", "xpanes:bar_flat" },
@ -57,7 +57,7 @@ minetest.register_craft({
}) })
minetest.register_craft({ minetest.register_craft({
output = "3d_armor:boots_chain", output = "mcl_armor:boots_chain",
recipe = { recipe = {
{ "xpanes:bar_flat", "", "xpanes:bar_flat" }, { "xpanes:bar_flat", "", "xpanes:bar_flat" },
{ "xpanes:bar_flat", "", "xpanes:bar_flat" }, { "xpanes:bar_flat", "", "xpanes:bar_flat" },
@ -65,7 +65,7 @@ minetest.register_craft({
}) })
minetest.register_craft({ minetest.register_craft({
output = "3d_armor:chestplate_chain", output = "mcl_armor:chestplate_chain",
recipe = { recipe = {
{ "xpanes:bar_flat", "", "xpanes:bar_flat" }, { "xpanes:bar_flat", "", "xpanes:bar_flat" },
{ "xpanes:bar_flat", "mcl_core:iron_ingot", "xpanes:bar_flat" }, { "xpanes:bar_flat", "mcl_core:iron_ingot", "xpanes:bar_flat" },

@ -1 +1 @@
3d_armor mcl_armor

@ -2,4 +2,3 @@ mcl_init
mcl_core mcl_core
mcl_particles mcl_particles
mcl_death_messages mcl_death_messages
3d_armor?

@ -5,6 +5,5 @@ mcl_hunger
mcl_death_messages mcl_death_messages
playerphysics playerphysics
mcl_playerinfo mcl_playerinfo
3d_armor?
mcl_weather mcl_weather
mcl_spawn mcl_spawn

@ -3,7 +3,6 @@ local S = minetest.get_translator("mcl_playerplus")
-- Internal player state -- Internal player state
local mcl_playerplus_internal = {} local mcl_playerplus_internal = {}
local armor_mod = minetest.get_modpath("3d_armor")
local def = {} local def = {}
local time = 0 local time = 0

Some files were not shown because too many files have changed in this diff Show More