Merge remote-tracking branch 'upstream/master'

This commit is contained in:
bri cassa 2022-03-05 11:19:05 +01:00
commit c95eb77a4e
2 changed files with 10 additions and 10 deletions

View File

@ -718,8 +718,8 @@ if armor.materials.mithril then
armor:register_armor("3d_armor:helmet_mithril", {
description = S("Mithril Helmet"),
inventory_image = "3d_armor_inv_helmet_mithril.png",
groups = {armor_head=1, armor_heal=12, armor_use=100},
armor_groups = {fleshy=15},
groups = {armor_head=1, armor_heal=13, armor_use=66},
armor_groups = {fleshy=16},
damage_groups = {cracky=2, snappy=1, level=3},
})
--- Mithril Chestplate
@ -736,8 +736,8 @@ if armor.materials.mithril then
armor:register_armor("3d_armor:chestplate_mithril", {
description = S("Mithril Chestplate"),
inventory_image = "3d_armor_inv_chestplate_mithril.png",
groups = {armor_torso=1, armor_heal=12, armor_use=100},
armor_groups = {fleshy=20},
groups = {armor_torso=1, armor_heal=13, armor_use=66},
armor_groups = {fleshy=21},
damage_groups = {cracky=2, snappy=1, level=3},
})
--- Mithril Leggings
@ -754,8 +754,8 @@ if armor.materials.mithril then
armor:register_armor("3d_armor:leggings_mithril", {
description = S("Mithril Leggings"),
inventory_image = "3d_armor_inv_leggings_mithril.png",
groups = {armor_legs=1, armor_heal=12, armor_use=100},
armor_groups = {fleshy=20},
groups = {armor_legs=1, armor_heal=13, armor_use=66},
armor_groups = {fleshy=21},
damage_groups = {cracky=2, snappy=1, level=3},
})
--- Mithril Boots
@ -772,8 +772,8 @@ if armor.materials.mithril then
armor:register_armor("3d_armor:boots_mithril", {
description = S("Mithril Boots"),
inventory_image = "3d_armor_inv_boots_mithril.png",
groups = {armor_feet=1, armor_heal=12, armor_use=100},
armor_groups = {fleshy=15},
groups = {armor_feet=1, armor_heal=13, armor_use=66},
armor_groups = {fleshy=16},
damage_groups = {cracky=2, snappy=1, level=3},
})
end

View File

@ -328,8 +328,8 @@ if armor.materials.mithril then
armor:register_armor("shields:shield_mithril", {
description = S("Mithril Shield"),
inventory_image = "shields_inv_shield_mithril.png",
groups = {armor_shield=1, armor_heal=12, armor_use=100},
armor_groups = {fleshy=15},
groups = {armor_shield=1, armor_heal=13, armor_use=66},
armor_groups = {fleshy=16},
damage_groups = {cracky=2, snappy=1, level=3},
reciprocate_damage = true,
on_damage = function(player, index, stack)