overspend1/PathOfBuilding
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/dev'

Browse Source
This commit is contained in:
Dayve
2016-11-20 15:18:09 +10:00
parent a1e892ceae d3bddbaba0
commit 22857d5268
6 changed files with 18 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Data/Gems/act_dex.lua
View File

@@ -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 }),

6
Modules/Calcs.lua
View File

@@ -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]

4
Modules/ModParser.lua
View File

@@ -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

4
README.md
View File

@@ -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

3
changelog.txt
View File

@@ -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

10
manifest.xml
View File

@@ -1,13 +1,13 @@
<?xml version="1.0" encoding="UTF-8"?>
<PoBVersion>
<Version number="1.2.8"/>
<Version number="1.2.9"/>
<Source part="program" url="https://raw.githubusercontent.com/Openarl/PathOfBuilding/{branch}/"/>
<Source part="tree" url="https://raw.githubusercontent.com/Openarl/PathOfBuilding/{branch}/tree.zip"/>
<Source url="https://raw.githubusercontent.com/Openarl/PathOfBuilding/{branch}/runtime-win32.zip" part="runtime" platform="win32"/>
<File sha1="6bb074e0d3a4043f0e5dcbd25c33f8e5e1f5cfe0" name="Launch.lua" part="program"/>
<File sha1="93e19c2a160eb49993d50d9e2b47ea79962373d9" name="UpdateCheck.lua" part="program"/>
<File sha1="4f17937f2b37784e169a3792b235f2a0a3961e61" name="UpdateApply.lua" part="program"/>
<File sha1="abd9b49cf1353cb3f5b5b78f2664e7209104f32b" name="changelog.txt" part="program"/>
<File sha1="3cb71f6fd687c94f18a4632304c26b1b17a4e630" name="changelog.txt" part="program"/>
<File sha1="ea886e9e8ce013ed7d8805174d43becdca1f533e" name="Classes/BuildListControl.lua" part="program"/>
<File sha1="e42437dd7e1b5a1032f1be9852ede4399a003826" name="Classes/ButtonControl.lua" part="program"/>
<File sha1="8df790619a3284b8ed78075f59dd34d5b00d28a3" name="Classes/CalcBreakdownControl.lua" part="program"/>
@@ -43,19 +43,19 @@
<File sha1="4b7675c8b4fe71cade7dd3d70793df1ed8022d01" name="Classes/UndoHandler.lua" part="program"/>
<File sha1="75cac21dc38aa8ff266ba7362ba4abfb27092774" name="Modules/Build.lua" part="program"/>
<File sha1="c03a7796aea3e9aa832fbb92c1f674ef5af690ca" name="Modules/BuildList.lua" part="program"/>
<File sha1="0e53efbb839016a56f59bf6ef09bb69f8556b3f7" name="Modules/Calcs.lua" part="program"/>
<File sha1="d6428d447114d16648dc89f4f391df6340a4944b" name="Modules/Calcs.lua" part="program"/>
<File sha1="99148774ffc1c326f3a50e7d8b3f7a68fe1ede57" name="Modules/CalcSections.lua" part="program"/>
<File sha1="f207df4010cb3c7bc6cce98be2529a3b8a708b8f" name="Modules/Common.lua" part="program"/>
<File sha1="0deb086a2fcf8aa8637d59ef6f2b825354b9b2c3" name="Modules/Data.lua" part="program"/>
<File sha1="5ddfa4a5904cefbf2755c231797175c8ae24ac49" name="Modules/ItemTools.lua" part="program"/>
<File sha1="b97d6e1c70b75805f4a2d0d0950c170f4b6d7e17" name="Modules/Main.lua" part="program"/>
<File sha1="39f2113f009b7c535aa44e693f263942bdccbbc1" name="Modules/ModParser.lua" part="program"/>
<File sha1="eb5792af777dba9bb1861398aeb977df314ec6f5" name="Modules/ModParser.lua" part="program"/>
<File sha1="5f93a9d8f58e0d5990a1f84e1ab1d53fbd35fb56" name="Modules/ModTools.lua" part="program"/>
<File sha1="e7ee7e5b6388facb7bf568517ecc401590757df7" name="Assets/ring.png" part="program"/>
<File sha1="9a320bfe629b1cf3f14fc77fbbf2508d0a5b2841" name="Assets/small_ring.png" part="program"/>
<File sha1="698c46ec242133014f6904d276b27106580ea392" name="Data/New.lua" part="program"/>
<File sha1="4bda866bb45169b51bd193039a87d7bcc6cbacaa" name="Data/Rares.lua" part="program"/>
<File sha1="d62aec8ef283c1c30dc2b0d16e73ad15405d34f7" name="Data/Gems/act_dex.lua" part="program"/>
<File sha1="9ce87f1a96439c4318688da3b971261614dec76b" name="Data/Gems/act_dex.lua" part="program"/>
<File sha1="4f869301558956c9102ea00b3d9576e96b3cc8cb" name="Data/Gems/act_int.lua" part="program"/>
<File sha1="7c8ddce1da8d4e954729524c03cd68d26e468a9a" name="Data/Gems/act_str.lua" part="program"/>
<File sha1="f6d7bc0e523b7d97fd3f2a8d2f09476716757ce1" name="Data/Gems/other.lua" part="program"/>