From d80ade1498dc6b866138e6aa2854582cf81acaa1 Mon Sep 17 00:00:00 2001 From: Teun Beijers Date: Wed, 6 Mar 2019 18:02:31 +0100 Subject: [PATCH 1/2] crit chance cap change --- .gitignore | 2 ++ Modules/CalcOffence-3_0.lua | 8 ++++---- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 6cfbc912e..f9facf05a 100644 --- a/.gitignore +++ b/.gitignore @@ -262,3 +262,5 @@ ModelManifest.xml /Export/Data /Export/DatView /Export/StatDescriptions + +.idea/ \ No newline at end of file diff --git a/Modules/CalcOffence-3_0.lua b/Modules/CalcOffence-3_0.lua index 80dfc15ab..9a67cdd9b 100644 --- a/Modules/CalcOffence-3_0.lua +++ b/Modules/CalcOffence-3_0.lua @@ -782,9 +782,9 @@ function calcs.offence(env, actor, activeSkill) local enemyExtra = env.mode_effective and enemyDB:Sum("BASE", nil, "SelfExtraCritChance") or 0 output.CritChance = (baseCrit + base) * (1 + inc / 100) * more local preCapCritChance = output.CritChance - output.CritChance = m_min(output.CritChance, 95) + output.CritChance = m_min(output.CritChance, 100) if (baseCrit + base) > 0 then - output.CritChance = m_max(output.CritChance, 5) + output.CritChance = m_max(output.CritChance, 0) end output.PreEffectiveCritChance = output.CritChance if enemyExtra ~= 0 then @@ -812,8 +812,8 @@ function calcs.offence(env, actor, activeSkill) t_insert(breakdown.CritChance, s_format("x %.2f", more).." ^8(more/less)") end t_insert(breakdown.CritChance, s_format("= %.2f%% ^8(crit chance)", output.PreEffectiveCritChance)) - if preCapCritChance > 95 then - local overCap = preCapCritChance - 95 + if preCapCritChance > 100 then + local overCap = preCapCritChance - 100 t_insert(breakdown.CritChance, s_format("Crit is overcapped by %.2f%% (%d%% increased Critical Strike Chance)", overCap, overCap / more / (baseCrit + base) * 100)) end if enemyExtra ~= 0 then From 5143dcdf20a76ec14aa0a9afafec6de468043167 Mon Sep 17 00:00:00 2001 From: Teun Beijers Date: Wed, 6 Mar 2019 18:08:03 +0100 Subject: [PATCH 2/2] Revert accidental gitignore change --- .gitignore | 2 -- 1 file changed, 2 deletions(-) diff --git a/.gitignore b/.gitignore index f9facf05a..6cfbc912e 100644 --- a/.gitignore +++ b/.gitignore @@ -262,5 +262,3 @@ ModelManifest.xml /Export/Data /Export/DatView /Export/StatDescriptions - -.idea/ \ No newline at end of file