diff --git a/Modules/CalcSections.lua b/Modules/CalcSections.lua index e4777c17..5e7da216 100644 --- a/Modules/CalcSections.lua +++ b/Modules/CalcSections.lua @@ -218,9 +218,11 @@ return { { label = "Chance to Shock", flag = "shock", { format = "{0:output:ShockChance}%", { label = "Player modifiers", modName = "EnemyShockChance", cfg = "skill" }, { label = "Enemy modifiers", modName = "SelfShockChance", enemy = true }, }, }, { label = "Shock Dur. Mod", flag = "shock", { format = "x {2:output:ShockDurationMod}", { label = "Player modifiers", modName = "EnemyShockDuration", cfg = "skill" }, { label = "Enemy modifiers", modName = "SelfShockDuration", enemy = true }, }, }, { label = "Chance to Freeze", flag = "freeze", { format = "{0:output:FreezeChance}%", { label = "Player modifiers", modName = "EnemyFreezeChance", cfg = "skill" }, { label = "Enemy modifiers", modName = "SelfFreezeChance", enemy = true }, }, }, - { label = "Freeze Dur. Mod", flag = "shock", { format = "x {2:output:FreezeDurationMod}", { label = "Player modifiers", modName = "EnemyFreezeDuration", cfg = "skill" }, { label = "Enemy modifiers", modName = "SelfFreezeDuration", enemy = true }, }, }, + { label = "Freeze Dur. Mod", flag = "freeze", { format = "x {2:output:FreezeDurationMod}", { label = "Player modifiers", modName = "EnemyFreezeDuration", cfg = "skill" }, { label = "Enemy modifiers", modName = "SelfFreezeDuration", enemy = true }, }, }, { label = "Stun Thresh. Mod", { format = "x {2:output:EnemyStunThresholdMod}", { modName = "EnemyStunThreshold", cfg = "skill" }, }, }, { label = "Stun Duration", { format = "{2:output:EnemyStunDuration}s", { breakdown = "EnemyStunDuration" }, { label = "Player modifiers", modName = { "EnemyStunDuration" }, cfg = "skill" }, { label = "Enemy modifiers", modName = { "StunRecovery" }, enemy = true }, }, }, + { label = "Inc. Item Quantity", { format = "{0:mod:1}%", { modName = "LootQuantity", modType = "INC", cfg = "skill" }, }, }, + { label = "Inc. Item Rarity", { format = "{0:mod:1}%", { modName = "LootRarity", modType = "INC", cfg = "skill" }, }, }, } }, { 1, "Attributes", 2, "Attributes", data.colorCodes.NORMAL, { extra = data.colorCodes.STRENGTH.."{0:output:Str}^7, "..data.colorCodes.DEXTERITY.."{0:output:Dex}^7, "..data.colorCodes.INTELLIGENCE.."{0:output:Int}", diff --git a/Modules/Calcs.lua b/Modules/Calcs.lua index 031cf838..7bae1898 100644 --- a/Modules/Calcs.lua +++ b/Modules/Calcs.lua @@ -605,6 +605,7 @@ local function initEnv(build, mode) modDB:NewMod("Speed", "MORE", 10, "Base", ModFlag.Attack, { type = "Condition", var = "DualWielding" }) modDB:NewMod("PhysicalDamage", "MORE", 20, "Base", ModFlag.Attack, { type = "Condition", var = "DualWielding" }) modDB:NewMod("BlockChance", "BASE", 15, "Base", { type = "Condition", var = "DualWielding" }) + modDB:NewMod("LifeRegenPercent", "BASE", 4, "Base", { type = "Condition", var = "OnConsecratedGround" }) modDB:NewMod("Misc", "LIST", { type = "EnemyModifier", mod = modLib.createMod("DamageTaken", "INC", 50, "Shock") }, "Base", { type = "Condition", var = "EnemyShocked" }) -- Add bandit mods @@ -2315,7 +2316,7 @@ local function performCalcs(env) end local effMult = 1 if env.mode_effective then - local resist = output["EnemyFireResist"] + local resist = m_min(enemyDB:Sum("BASE", nil, "FireResist", "ElementalResist"), 75) local taken = enemyDB:Sum("INC", dotCfg, "DamageTaken", "FireDamageTaken", "ElementalDamageTaken", "BurningDamageTaken", "DotTaken") effMult = (1 - resist / 100) * (1 + taken / 100) output["IgniteEffMult"] = effMult diff --git a/README.md b/README.md index 4c5b6dd3..8b34308f 100644 --- a/README.md +++ b/README.md @@ -48,6 +48,10 @@ Head over to the [Releases](https://github.com/Openarl/PathOfBuilding/releases) ![ss3](https://cloud.githubusercontent.com/assets/19189971/18089780/f0ff234a-6f04-11e6-8c88-6193fe59a5c4.png) ## Changelog +### 1.2.34 - 2017/01/27 + * IIQ/IIR totals are now shown in the "Other Effects" section in the Calcs tab + * Enabling the "on Consecrated Ground" option now applies the 4% life regen granted by that ground effect + ### 1.2.33 - 2017/01/21 * The aura effects granted by Unwavering Faith and Commander of Darkness now correctly benefit from aura effect modifiers * The calculation of crit chance now factors in accuracy when in Effective DPS mode diff --git a/changelog.txt b/changelog.txt index 2291350b..f263543d 100644 --- a/changelog.txt +++ b/changelog.txt @@ -1,3 +1,6 @@ +VERSION[1.2.34][2017/01/27] + * IIQ/IIR totals are now shown in the "Other Effects" section in the Calcs tab + * Enabling the "on Consecrated Ground" option now applies the 4% life regen granted by that ground effect VERSION[1.2.33][2017/01/21] * The aura effects granted by Unwavering Faith and Commander of Darkness now correctly benefit from aura effect modifiers * The calculation of crit chance now factors in accuracy when in Effective DPS mode diff --git a/manifest.xml b/manifest.xml index bae0f7cc..737c03ff 100644 --- a/manifest.xml +++ b/manifest.xml @@ -1,13 +1,13 @@ - + - + @@ -44,8 +44,8 @@ - - + +