From 512e506b2f483f64150de60353893cb76bac2ed8 Mon Sep 17 00:00:00 2001 From: Openarl Date: Fri, 2 Sep 2016 11:30:40 +1000 Subject: [PATCH] Release 1.0.17 - Now shows more accurate DPS for Lightning Tendrils - Fixed Lioneye's Fall - Added accuracy to helmets and gloves - Added resistance overcaps to sidebar --- Classes/BuildListControl.lua | 2 +- Data/Gems/act_int.lua | 1 + Data/Rares.lua | 12 ++++++++++++ Modules/Build.lua | 4 ++++ Modules/Calcs.lua | 11 +++++++---- Modules/ModParser.lua | 2 +- README.md | 6 ++++++ manifest.xml | 14 +++++++------- 8 files changed, 39 insertions(+), 13 deletions(-) diff --git a/Classes/BuildListControl.lua b/Classes/BuildListControl.lua index 35c552d7..c963a575 100644 --- a/Classes/BuildListControl.lua +++ b/Classes/BuildListControl.lua @@ -23,7 +23,7 @@ local BuildListClass = common.NewClass("BuildList", "Control", "ControlHost", fu self.controls.scrollBar.locked = function() return self.listMode.edit end - self.controls.nameEdit = common.New("EditControl", {"TOPLEFT",self,"TOPLEFT"}, 0, 0, 0, 20, nil, nil, "[%w _+-.()]", 50) + self.controls.nameEdit = common.New("EditControl", {"TOPLEFT",self,"TOPLEFT"}, 0, 0, 0, 20, nil, nil, "[%w _+-.()'\"]", 50) self.controls.nameEdit.shown = function() return self.listMode.edit end diff --git a/Data/Gems/act_int.lua b/Data/Gems/act_int.lua index 5693f1b0..a517a210 100644 --- a/Data/Gems/act_int.lua +++ b/Data/Gems/act_int.lua @@ -1529,6 +1529,7 @@ gems["Lightning Tendrils"] = { skill_castTime = 0.8, skill_damageEffectiveness = 0.35, skill_critChanceBase = 6, + skill_dpsMultiplier = 4, }, quality = { lightningInc = 1, diff --git a/Data/Rares.lua b/Data/Rares.lua index 0d62310f..b68069c3 100644 --- a/Data/Rares.lua +++ b/Data/Rares.lua @@ -175,6 +175,7 @@ Prefixes: {range:.75}+(0 to 99) to maximum Life {range:0}+(0 to 2) to Level of Socketed Minion Gems Suffixes: +{range:0}+(0 to 400) to Accuracy Rating {str} {int} {res} @@ -187,6 +188,7 @@ Prefixes: {range:.75}+(0 to 99) to maximum Life {range:0}+(0 to 2) to Level of Socketed Minion Gems Suffixes: +{range:0}+(0 to 400) to Accuracy Rating {dex} {int} {res} @@ -199,6 +201,7 @@ Prefixes: {range:.75}+(0 to 99) to maximum Life {range:0}+(0 to 2) to Level of Socketed Minion Gems Suffixes: +{range:0}+(0 to 400) to Accuracy Rating {int} {res} ]],[[ @@ -211,6 +214,7 @@ Prefixes: {range:.75}+(0 to 99) to maximum Life {range:0}+(0 to 2) to Level of Socketed Minion Gems Suffixes: +{range:0}+(0 to 400) to Accuracy Rating {str} {dex} {int} @@ -225,6 +229,7 @@ Prefixes: {range:.75}+(0 to 99) to maximum Life {range:0}+(0 to 2) to Level of Socketed Minion Gems Suffixes: +{range:0}+(0 to 400) to Accuracy Rating {str} {int} {res} @@ -238,6 +243,7 @@ Prefixes: {range:.75}+(0 to 99) to maximum Life {range:0}+(0 to 2) to Level of Socketed Minion Gems Suffixes: +{range:0}+(0 to 400) to Accuracy Rating {dex} {int} {res} @@ -253,6 +259,7 @@ Prefixes: {range:0}Adds (0-6 to 0-10) Physical Damage to Attacks Suffixes: {range:0}(0 to 16)% increased Attack Speed +{range:0}+(0 to 400) to Accuracy Rating {str} {dex} {res} @@ -266,6 +273,7 @@ Prefixes: {range:0}Adds (0-6 to 0-10) Physical Damage to Attacks Suffixes: {range:0}(0 to 16)% increased Attack Speed +{range:0}+(0 to 400) to Accuracy Rating {dex} {res} ]],[[ @@ -278,6 +286,7 @@ Prefixes: {range:0}Adds (0-6 to 0-10) Physical Damage to Attacks Suffixes: {range:0}(0 to 16)% increased Attack Speed +{range:0}+(0 to 400) to Accuracy Rating {dex} {int} {res} @@ -292,6 +301,7 @@ Prefixes: {range:0}Adds (0-6 to 0-10) Physical Damage to Attacks Suffixes: {range:0}(0 to 16)% increased Attack Speed +{range:0}+(0 to 400) to Accuracy Rating {str} {dex} {res} @@ -306,6 +316,7 @@ Prefixes: {range:0}Adds (0-6 to 0-10) Physical Damage to Attacks Suffixes: {range:0}(0 to 16)% increased Attack Speed +{range:0}+(0 to 400) to Accuracy Rating {str} {dex} {int} @@ -321,6 +332,7 @@ Prefixes: {range:0}Adds (0-6 to 0-10) Physical Damage to Attacks Suffixes: {range:0}(0 to 16)% increased Attack Speed +{range:0}+(0 to 400) to Accuracy Rating {dex} {int} {res} diff --git a/Modules/Build.lua b/Modules/Build.lua index 76e83ee1..c862f124 100644 --- a/Modules/Build.lua +++ b/Modules/Build.lua @@ -213,6 +213,10 @@ function buildMode:Init(dbFileName, buildName) { mod = "total_coldResist", label = "Cold Resistance", fmt = "d%%" }, { mod = "total_lightningResist", label = "Lightning Resistance", fmt = "d%%" }, { mod = "total_chaosResist", label = "Chaos Resistance", fmt = "d%%" }, + { mod = "total_fireResistOverCap", label = "Fire Res. Over Max", fmt = "d%%" }, + { mod = "total_coldResistOverCap", label = "Cold Res. Over Max", fmt = "d%%" }, + { mod = "total_lightningResistOverCap", label = "Lightning Res. Over Max", fmt = "d%%" }, + { mod = "total_chaosResistOverCap", label = "Chaos Res. Over Max", fmt = "d%%" }, } self.viewMode = "TREE" diff --git a/Modules/Calcs.lua b/Modules/Calcs.lua index 477ff5b4..a7fb3d79 100644 --- a/Modules/Calcs.lua +++ b/Modules/Calcs.lua @@ -1151,16 +1151,19 @@ local function performCalcs(env, output) for _, elem in pairs({"fire", "cold", "lightning"}) do output["total_"..elem.."ResistMax"] = sumMods(modDB, false, elem.."ResistMax") output["total_"..elem.."ResistTotal"] = sumMods(modDB, false, elem.."Resist", "elementalResist") - 60 - output["total_"..elem.."Resist"] = m_min(output["total_"..elem.."ResistTotal"], output["total_"..elem.."ResistMax"]) end if getMiscVal(modDB, nil, "chaosInoculation", false) then output.total_chaosResistMax = 100 output.total_chaosResistTotal = 100 - output.total_chaosResist = 100 else output.total_chaosResistMax = sumMods(modDB, false, "chaosResistMax") output.total_chaosResistTotal = sumMods(modDB, false, "chaosResist") - 60 - output.total_chaosResist = m_min(output.total_chaosResistTotal, output.total_chaosResistMax) + end + for _, elem in pairs({"fire", "cold", "lightning", "chaos"}) do + local total = output["total_"..elem.."ResistTotal"] + local cap = output["total_"..elem.."ResistMax"] + output["total_"..elem.."Resist"] = m_min(total, cap) + output["total_"..elem.."ResistOverCap"] = m_max(0, total - cap) end endWatch(env, "resist") end @@ -1389,7 +1392,7 @@ local function performCalcs(env, output) -- Calculate average damage and final DPS output.total_averageHit = (combMin + combMax) / 2 * output.total_critEffect output.total_averageDamage = output.total_averageHit * output.total_hitChance - output.total_dps = output.total_averageDamage * output.total_speed + output.total_dps = output.total_averageDamage * output.total_speed * getMiscVal(modDB, "skill", "dpsMultiplier", 1) -- Calculate mana cost (may be slightly off due to rounding differences) output.total_manaCost = m_floor(m_max(0, getMiscVal(modDB, "skill", "manaCostBase", 0) * (1 + sumMods(modDB, false, "manaCostInc") / 100) * sumMods(modDB, true, "manaCostMore") - sumMods(modDB, false, "manaCostBase"))) diff --git a/Modules/ModParser.lua b/Modules/ModParser.lua index bb498701..b8900236 100644 --- a/Modules/ModParser.lua +++ b/Modules/ModParser.lua @@ -527,7 +527,7 @@ local jewelFuncs = { ["Increases and Reductions to Physical Damage in Radius are Transformed to apply to Cold Damage"] = getMatchConv({"physicalInc"}, "coldInc"), ["Increases and Reductions to Cold Damage in Radius are Transformed to apply to Physical Damage"] = getMatchConv({"coldInc"}, "physicalInc"), ["Increases and Reductions to other Damage Types in Radius are Transformed to apply to Fire Damage"] = getMatchConv({"physicalInc","coldInc","lightningInc","chaosInc"}, "fireInc"), - ["Melee and Melee Weapon Type Modifiers in Radius are Transformed to Bow Modifiers"] = getMatchConv({"melee_","axe_","claw_","dagger_","mace_","staff_","sword_"}, "bow_"), + ["Melee and Melee Weapon Type Modifiers in Radius are Transformed to Bow Modifiers"] = getMatchConv({"melee_","weapon1hMelee_","weapon2hMelee_","axe_","claw_","dagger_","mace_","staff_","sword_"}, "bow_"), ["Adds 1 to maximum Life per 3 Intelligence in Radius"] = getPerStat("lifeBase", "intBase", 1 / 3), ["1% increased Evasion Rating per 3 Dexterity Allocated in Radius"] = getPerStat("evasionInc", "dexBase", 1 / 3), ["1% increased Claw Physical Damage per 3 Dexterity Allocated in Radius"] = getPerStat("claw_physicalInc", "dexBase", 1 / 3), diff --git a/README.md b/README.md index f283656b..09299829 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.0.17 - 2016/09/02 + * Added support for skill DPS multipliers; current only Lightning Tendrils uses it (it has a 4x mutliplier) + * Fixed Lioneye's Fall not converting One Handed Melee and Two Handed Melee modifiers + * Added Accuracy Rating to helm and glove templates + * Side bar now shows you how far over the resistance caps you are + ### 1.0.16 - 2016/09/02 * Emergency fix for the passive tree controls diff --git a/manifest.xml b/manifest.xml index 6242cf7c..b4009520 100644 --- a/manifest.xml +++ b/manifest.xml @@ -1,13 +1,13 @@ - + - + @@ -34,21 +34,21 @@ - + - + - + - + - +