gldrk
/
MineClone2
forked from VoxeLibre/VoxeLibre
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'master' into mineclone5

This commit is contained in:
Lizzy Fleckenstein 2021-04-28 12:27:28 +02:00
parent cca03bcbd2 13a0fa2314
commit 33c235362e
1 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
mods/ITEMS/mcl_armor/api.lua
View File

@ -90,6 +90,12 @@ function mcl_armor.register_set(def)
local S = minetest.get_translator(modname) local S = minetest.get_translator(modname)
local descriptions = def.descriptions or {} local descriptions = def.descriptions or {}
local groups = def.groups or {} local groups = def.groups or {}
local on_equip_callbacks = def.on_equip_callbacks or {}
local on_unequip_callbacks = def.on_unequip_callbacks or {}
local textures = def.textures or {}
local previews = def.previews or {}
local durabilities = def.durabilities or {}
for name, element in pairs(mcl_armor.elements) do for name, element in pairs(mcl_armor.elements) do
local itemname = element.name .. "_" .. def.name local itemname = element.name .. "_" .. def.name
local itemstring = modname .. ":" .. itemname local itemstring = modname .. ":" .. itemname
@ -101,7 +107,7 @@ function mcl_armor.register_set(def)
groups.combat_armor = 1 groups.combat_armor = 1
groups.mcl_armor_points = def.points[name] groups.mcl_armor_points = def.points[name]
groups.mcl_armor_toughness = def.toughness groups.mcl_armor_toughness = def.toughness
groups.mcl_armor_uses = math.floor(def.durability * element.durability) + 1 groups.mcl_armor_uses = (durabilities[name] or math.floor(def.durability * element.durability)) + 1
groups.enchantability = def.enchantability groups.enchantability = def.enchantability
minetest.register_tool(itemstring, { minetest.register_tool(itemstring, {
@ -117,11 +123,11 @@ function mcl_armor.register_set(def)
}, },
on_place = mcl_armor.equip_on_use, on_place = mcl_armor.equip_on_use,
on_secondary_use = mcl_armor.equip_on_use, on_secondary_use = mcl_armor.equip_on_use,
_on_equip = def.on_equip, _on_equip = on_equip_callbacks[name] or def.on_equip,
_on_unequip = def.on_unequip, _on_unequip = on_unequip_callbacks[name] or def.on_unequip,
_mcl_armor_element = name, _mcl_armor_element = name,
_mcl_armor_texture = modname .. "_" .. itemname .. ".png", _mcl_armor_texture = textures[name] or modname .. "_" .. itemname .. ".png",
_mcl_armor_preview = modname .. "_" .. itemname .. "_preview.png", _mcl_armor_preview = previews[name] or modname .. "_" .. itemname .. "_preview.png",
}) })
if def.craft_material then if def.craft_material then