From 5911447048ad9a715079ad9374ecf25b60c1b1a8 Mon Sep 17 00:00:00 2001 From: stujones11 Date: Wed, 29 Mar 2017 19:13:13 +0100 Subject: [PATCH] Move shields level reduction to shields mod --- 3d_armor/api.lua | 5 +---- shields/init.lua | 2 ++ 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/3d_armor/api.lua b/3d_armor/api.lua index 712ff84..b52b065 100644 --- a/3d_armor/api.lua +++ b/3d_armor/api.lua @@ -217,13 +217,10 @@ armor.set_player_armor = function(self, player) end for group, level in pairs(levels) do if level > 0 then - if minetest.get_modpath("shields") then - level = level * 0.9 - end + level = level * armor.config.level_multiplier if material.name and material.count == #self.elements then level = level * 1.1 end - level = level * armor.config.level_multiplier end local base = self.registered_groups[group] self.def[name].groups[group] = level diff --git a/shields/init.lua b/shields/init.lua index f471cdb..1bb7243 100644 --- a/shields/init.lua +++ b/shields/init.lua @@ -2,6 +2,8 @@ local use_moreores = minetest.get_modpath("moreores") if minetest.global_exists("armor") and armor.elements then table.insert(armor.elements, "shield") + local mult = armor.config.level_multiplier or 1 + armor.config.level_multiplier = mult * 0.9 end -- Regisiter Shields