From 7a6535205636665b7589775266c9665cb8984b03 Mon Sep 17 00:00:00 2001 From: Regisle <49933620+Regisle@users.noreply.github.com> Date: Mon, 3 Apr 2023 13:18:33 +0930 Subject: [PATCH] use slot concatenation rather than checking specific slot (#5866) --- src/Modules/CalcDefence.lua | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/src/Modules/CalcDefence.lua b/src/Modules/CalcDefence.lua index c89ce7e923..7313d9ab6d 100644 --- a/src/Modules/CalcDefence.lua +++ b/src/Modules/CalcDefence.lua @@ -480,11 +480,7 @@ function calcs.defence(env, actor) }) end else - if slot == "Body Armour" then - energyShield = energyShield + energyShieldBase * calcLib.mod(modDB, slotCfg, "EnergyShield", "Defences", "Body ArmourESAndArmour") - else - energyShield = energyShield + energyShieldBase * calcLib.mod(modDB, slotCfg, "EnergyShield", "Defences") - end + energyShield = energyShield + energyShieldBase * calcLib.mod(modDB, slotCfg, "EnergyShield", "Defences", slot.."ESAndArmour") gearEnergyShield = gearEnergyShield + energyShieldBase if breakdown then breakdown.slot(slot, nil, slotCfg, energyShieldBase, nil, "EnergyShield", "Defences") @@ -496,11 +492,7 @@ function calcs.defence(env, actor) if slot == "Body Armour" and modDB:Flag(nil, "Unbreakable") then armourBase = armourBase * 2 end - if slot == "Body Armour" then - armour = armour + armourBase * calcLib.mod(modDB, slotCfg, "Armour", "ArmourAndEvasion", "Defences", "Body ArmourESAndArmour") - else - armour = armour + armourBase * calcLib.mod(modDB, slotCfg, "Armour", "ArmourAndEvasion", "Defences") - end + armour = armour + armourBase * calcLib.mod(modDB, slotCfg, "Armour", "ArmourAndEvasion", "Defences", slot.."ESAndArmour") gearArmour = gearArmour + armourBase if breakdown then breakdown.slot(slot, nil, slotCfg, armourBase, nil, "Armour", "ArmourAndEvasion", "Defences")