Skip to content

Commit

Permalink
Fix ES from Tricksters Escape Artist when using Oath of the Maji (#7018)
Browse files Browse the repository at this point in the history
The calculation for Escape Artist use the final doubled value after Maji has affected the armour

Co-authored-by: LocalIdentity <localidentity2@gmail.com>
  • Loading branch information
LocalIdentity and LocalIdentity authored Dec 12, 2023
1 parent fd307c9 commit e75a632
Showing 1 changed file with 12 additions and 0 deletions.
12 changes: 12 additions & 0 deletions src/Modules/CalcDefence.lua
Original file line number Diff line number Diff line change
Expand Up @@ -275,18 +275,30 @@ function calcs.defence(env, actor)
if armourData then
wardBase = armourData.Ward or 0
if wardBase > 0 then
if slot == "Body Armour" and modDB:Flag(nil, "DoubleBodyArmourDefence") then
wardBase = wardBase * 2
end
output["WardOn"..slot] = wardBase
end
energyShieldBase = armourData.EnergyShield or 0
if energyShieldBase > 0 then
if slot == "Body Armour" and modDB:Flag(nil, "DoubleBodyArmourDefence") then
energyShieldBase = energyShieldBase * 2
end
output["EnergyShieldOn"..slot] = energyShieldBase
end
armourBase = armourData.Armour or 0
if armourBase > 0 then
if slot == "Body Armour" and (modDB:Flag(nil, "Unbreakable") or modDB:Flag(nil, "DoubleBodyArmourDefence")) then
armourBase = armourBase * 2
end
output["ArmourOn"..slot] = armourBase
end
evasionBase = armourData.Evasion or 0
if evasionBase > 0 then
if slot == "Body Armour" and ((modDB:Flag(nil, "Unbreakable") and modDB:Flag(nil, "IronReflexes")) or modDB:Flag(nil, "DoubleBodyArmourDefence")) then
evasionBase = evasionBase * 2
end
output["EvasionOn"..slot] = evasionBase
end
end
Expand Down

0 comments on commit e75a632

Please sign in to comment.