diff --git a/Data/Rares.lua b/Data/Rares.lua index 20368b70..44e3f657 100644 --- a/Data/Rares.lua +++ b/Data/Rares.lua @@ -919,7 +919,7 @@ Suffixes: ]],[[ Spell Sceptre Void Sceptre -15% increased Elemental Damage +40% increased Elemental Damage {spell 1h} ]],[[ Physical 1H Mace @@ -927,11 +927,21 @@ Behemoth Mace 6% increased Attack Speed {phys 1h} ]],[[ +Physical Sceptre +Void Sceptre +40% increased Elemental Damage +{phys 1h} +]],[[ Elemental 1H Mace Behemoth Mace 6% increased Attack Speed {elem 1h} ]],[[ +Elemental Sceptre +Void Sceptre +40% increased Elemental Damage +{elem 1h} +]],[[ Physical 2H Mace Coronal Maul 6% increased Radius of Area Skills @@ -1037,20 +1047,20 @@ Reaver Sword ]],[[ Physical Wand Imbued Wand -(15 to 19)% increased Spell Damage +(33-37)% increased Spell Damage {phys 1h pre} {range:0}Adds (0-72 to 0-123) Chaos Damage {ranged suf} ]],[[ Elemental Wand Imbued Wand -(15 to 19)% increased Spell Damage +(33-37)% increased Spell Damage {elem 1h pre} {ranged suf} ]],[[ Spell Wand Prophecy Wand -(16 to 20)% increased Spell Damage +(36-40)% increased Spell Damage {spell 1h} ]], -- Jewels diff --git a/Modules/Calcs.lua b/Modules/Calcs.lua index 0d347d40..b130132f 100644 --- a/Modules/Calcs.lua +++ b/Modules/Calcs.lua @@ -1097,7 +1097,9 @@ local function performCalcs(env) local mult = skillModList:Sum("MORE", skillCfg, "ManaCost") local more = modDB:Sum("MORE", skillCfg, "ManaReserved") * skillModList:Sum("MORE", skillCfg, "ManaReserved") local inc = modDB:Sum("INC", skillCfg, "ManaReserved") + skillModList:Sum("INC", skillCfg, "ManaReserved") - local cost = m_ceil(m_ceil(m_floor(baseVal * mult) * more) * (1 + inc / 100)) + --local cost = m_ceil(m_ceil(m_floor(baseVal * mult) * more) * (1 + inc / 100)) + local base = m_floor(baseVal * mult) + local cost = base - m_floor(base * -m_floor((100 + inc) * more - 100) / 100) local pool if modDB:Sum("FLAG", skillCfg, "BloodMagic", "SkillBloodMagic") or skillModList:Sum("FLAG", skillCfg, "SkillBloodMagic") then pool = "Life" diff --git a/Modules/ModParser.lua b/Modules/ModParser.lua index d2978e20..b322af41 100644 --- a/Modules/ModParser.lua +++ b/Modules/ModParser.lua @@ -478,6 +478,7 @@ local specialModList = { -- Special node types ["(%d+)%% of block chance applied to spells"] = function(num) return { mod("BlockChanceConv", "BASE", num) } end, ["(%d+)%% additional block chance with staves"] = function(num) return { mod("BlockChance", "BASE", num, { type = "Condition", var = "UsingStaff" }) } end, + ["(%d+)%% additional chance to block with staves"] = function(num) return { mod("BlockChance", "BASE", num, { type = "Condition", var = "UsingStaff" }) } end, ["(%d+)%% additional block chance while dual wielding or holding a shield"] = function(num) return { mod("BlockChance", "BASE", num, { type = "Condition", var = "DualWielding"}), mod("BlockChance", "BASE", num, { type = "Condition", var = "UsingShield"}) } end, ["can have up to (%d+) additional traps? placed at a time"] = function(num) return { mod("ActiveTrapLimit", "BASE", num) } end, ["can have up to (%d+) additional remote mines? placed at a time"] = function(num) return { mod("ActiveMineLimit", "BASE", num) } end, diff --git a/README.md b/README.md index cbf5de5f..12c7438e 100644 --- a/README.md +++ b/README.md @@ -48,6 +48,12 @@ 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.31 - 2017/01/08 + * Added two new templates for sceptre attack builds + * Corrected the implicits on the wand and sceptre templates + * Fixed the rounding on life/mana reservation calculations + * Fixed the "additional Block Chance with Staves" modifier + ### 1.2.30 - 2016/12/30 * Added options to the Configuration tab for "Are you Ignited/Frozen/Shocked" * Discharge's damage penalty when triggered will now apply correctly