From 2569995e876e7a3ce68396fa06891a4fc78a9d3a Mon Sep 17 00:00:00 2001 From: Openarl Date: Sun, 20 Nov 2016 15:11:15 +1000 Subject: [PATCH 1/2] Release 1.2.9 - Removed showAverage from Blade Flurry - Fixed default jewel function --- Data/Gems/act_dex.lua | 2 +- Modules/Calcs.lua | 6 +++--- README.md | 4 ++++ changelog.txt | 3 +++ manifest.xml | 8 ++++---- 5 files changed, 15 insertions(+), 8 deletions(-) diff --git a/Data/Gems/act_dex.lua b/Data/Gems/act_dex.lua index 6f192956..75cbc80c 100644 --- a/Data/Gems/act_dex.lua +++ b/Data/Gems/act_dex.lua @@ -223,7 +223,7 @@ gems["Blade Flurry"] = { mod("Speed", "MORE", 65, ModFlag.Attack), --"active_skill_attack_speed_+%_final" = 65 --"charged_attack_damage_per_stack_+%_final" = 20 --"is_area_damage" = ? - skill("showAverage", true), --"base_skill_show_average_damage_instead_of_dps" = ? + nil, --"base_skill_show_average_damage_instead_of_dps" = ? --"skill_can_add_multiple_charges_per_action" = ? mod("Damage", "MORE", 20, ModFlag.Attack, 0, { type = "SkillPart", skillPart = 1 }), mod("Damage", "MORE", 120, ModFlag.Attack, 0, { type = "SkillPart", skillPart = 2 }), diff --git a/Modules/Calcs.lua b/Modules/Calcs.lua index d30fd944..356aab1d 100644 --- a/Modules/Calcs.lua +++ b/Modules/Calcs.lua @@ -671,9 +671,9 @@ local function mergeMainMods(env, repSlotName, repItem) local func = item.jewelFunc or function(nodeMods, out, data) -- Default function just tallies all stats in radius if nodeMods then - data.strBase = (data.strBase or 0) + (nodeMods.strBase or 0) - data.dexBase = (data.dexBase or 0) + (nodeMods.dexBase or 0) - data.intBase = (data.intBase or 0) + (nodeMods.intBase or 0) + for _, stat in pairs({"Str","Dex","Int"}) do + data[stat] = (data[stat] or 0) + nodeMods:Sum("BASE", nil, stat) + end end end local radiusInfo = data.jewelRadius[item.jewelRadiusIndex] diff --git a/README.md b/README.md index 72be7e9e..c4ba8faa 100644 --- a/README.md +++ b/README.md @@ -49,6 +49,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.9 - 2016/11/20 + * Blade Flurry now shows DPS instead of average damage + * Fixed stat counts not showing for some radius jewels + ### 1.2.8 - 2016/11/20 * Fixed dodge not being capped at 75% * Fixed missing area damage flag on Ancestral Warchief diff --git a/changelog.txt b/changelog.txt index 94fcbaae..5b7bab1a 100644 --- a/changelog.txt +++ b/changelog.txt @@ -1,3 +1,6 @@ +VERSION[1.2.9][2016/11/20] + * Blade Flurry now shows DPS instead of average damage + * Fixed stat counts not showing for some radius jewels VERSION[1.2.8][2016/11/20] * Fixed dodge not being capped at 75% * Fixed missing area damage flag on Ancestral Warchief diff --git a/manifest.xml b/manifest.xml index e060f0b8..6879fcd0 100644 --- a/manifest.xml +++ b/manifest.xml @@ -1,13 +1,13 @@ - + - + @@ -43,7 +43,7 @@ - + @@ -55,7 +55,7 @@ - + From d3bddbaba09cf8861e82ddc02326fe0989462741 Mon Sep 17 00:00:00 2001 From: Openarl Date: Sun, 20 Nov 2016 15:16:04 +1000 Subject: [PATCH 2/2] Fix for Might in All Forms --- Modules/ModParser.lua | 4 ++-- manifest.xml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Modules/ModParser.lua b/Modules/ModParser.lua index 7a115992..c1b68e69 100644 --- a/Modules/ModParser.lua +++ b/Modules/ModParser.lua @@ -640,8 +640,8 @@ local jewelFuncs = { ["5% increased Chaos damage per 10 Intelligence from Allocated Passives in Radius"] = getPerStat("ChaosDamage", "INC", 0, "Int", 5 / 10), ["Dexterity and Intelligence from passives in Radius count towards Strength Melee Damage bonus"] = function(nodeMods, out, data) if nodeMods then - data.Dex = (data.Dex or 0) + nodeMods:Sum("BASE", 0, "Dex") - data.Int = (data.Int or 0) + nodeMods:Sum("BASE", 0, "Int") + data.Dex = (data.Dex or 0) + nodeMods:Sum("BASE", nil, "Dex") + data.Int = (data.Int or 0) + nodeMods:Sum("BASE", nil, "Int") else out:NewMod("DexIntToMeleeBonus", "BASE", data.Dex + data.Int, "Tree:Jewel") end diff --git a/manifest.xml b/manifest.xml index 6879fcd0..fb53d367 100644 --- a/manifest.xml +++ b/manifest.xml @@ -49,7 +49,7 @@ - +