From b9e5a991e2575edfefebfc447dd27ea9d6f810fb Mon Sep 17 00:00:00 2001 From: Elias Fleckenstein Date: Tue, 10 Nov 2020 13:58:39 +0100 Subject: [PATCH] Protection --- mods/CORE/mcl_enchanting/enchantments.lua | 2 +- mods/ITEMS/mcl_armor/armor.lua | 16 ++++++++++++---- 2 files changed, 13 insertions(+), 5 deletions(-) diff --git a/mods/CORE/mcl_enchanting/enchantments.lua b/mods/CORE/mcl_enchanting/enchantments.lua index 4301c5642..a90088cd4 100644 --- a/mods/CORE/mcl_enchanting/enchantments.lua +++ b/mods/CORE/mcl_enchanting/enchantments.lua @@ -365,7 +365,7 @@ mcl_enchanting.enchantments.projectile_protection = { requires_tool = false, } --- unimplemented +-- implemented in mcl_armor mcl_enchanting.enchantments.protection = { name = "Protection", max_level = 4, diff --git a/mods/ITEMS/mcl_armor/armor.lua b/mods/ITEMS/mcl_armor/armor.lua index d00348b13..a4b7974d5 100644 --- a/mods/ITEMS/mcl_armor/armor.lua +++ b/mods/ITEMS/mcl_armor/armor.lua @@ -515,14 +515,15 @@ minetest.register_on_player_hpchange(function(player, hp_change, reason) local total_points = 0 local total_toughness = 0 + local protection_reduction = 0 for i=1, 6 do local stack = player_inv:get_stack("armor", i) if stack:get_count() > 0 then -- Damage armor local use = stack:get_definition().groups["mcl_armor_uses"] or 0 - local unbreaking = mcl_enchanting.get_enchantment(stack, "unbreaking") - if unbreaking > 0 then - use = use / (0.6 + 0.4 / (unbreaking + 1)) + local enchantments = mcl_enchanting.get_enchantments(stack) + if enchantments.unbreaking > 0 then + use = use / (0.6 + 0.4 / (enchantments.unbreaking + 1)) end if use > 0 then local wear = armor_damage * math.floor(65536/use) @@ -542,13 +543,20 @@ minetest.register_on_player_hpchange(function(player, hp_change, reason) local tough = stack:get_definition().groups["mcl_armor_toughness"] or 0 total_points = total_points + pts total_toughness = total_toughness + tough + if enchantments.protection then + protection_reduction = protection_reduction + enchantments.protection * 0.04 + end + -- if enchantments.blast_protection and then + -- protection_reduction = protection_reduction + enchantments.blast_protection * 0.08 + -- end end end local damage = math.abs(hp_change) -- Damage calculation formula (from ) damage = damage * (1 - math.min(20, math.max((total_points/5), total_points - damage / (2+(total_toughness/4)))) / 25) - damage = math.floor(damage+0.5) + damage = damage * (1 - math.min(1, protection_reduction)) + damage = math.floor(damage+0.5) hp_change = -math.abs(damage)