Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/dev'
Browse files Browse the repository at this point in the history
  • Loading branch information
@Openarl
Openarl committed Jan 2, 2019
2 parents 8a7b66d + b7b916f commit d89af95
Show file tree
Hide file tree
Showing 5 changed files with 53 additions and 31 deletions.
4 changes: 4 additions & 0 deletions CHANGELOG.md
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
### 1.4.123 - 2019/01/02
* Fixed issue causing Configuration tab options to sometimes fail to appear when appropriate
* Fixed error when adding crafted modifiers to items

### 1.4.122 - 2019/01/01
* Updated the crafting bench options for 3.5
* Added support for most of the new craft modifiers
Expand Down
12 changes: 6 additions & 6 deletions Data/3_0/ModMaster.lua
View file
Original file line number Diff line number Diff line change
Expand Up @@ -636,12 +636,12 @@ return {
{ type = "Suffix", affix = "of Riker", "(8-10)% increased Fire Damage", "(8-10)% increased Lightning Damage", statOrder = { 498, 514 }, level = 25, group = "IncreasedFireAndLightningDamage", types = { ["Ring"] = true, }, },
{ type = "Suffix", affix = "of Riker", "(11-13)% increased Fire Damage", "(11-13)% increased Lightning Damage", statOrder = { 498, 514 }, level = 50, group = "IncreasedFireAndLightningDamage", types = { ["Ring"] = true, }, },
{ type = "Suffix", affix = "of Riker", "(14-16)% increased Fire Damage", "(14-16)% increased Lightning Damage", statOrder = { 498, 514 }, level = 75, group = "IncreasedFireAndLightningDamage", types = { ["Ring"] = true, }, },
{ type = "Suffix", affix = "of the Order", "3% of Life Regenerated per second during Flask Effect", statOrder = { 3991 }, level = 1, group = "LocalFlaskLifeRegenerationPerMinuteDuringFlaskEffect", types = { ["Flask:Life"] = true, ["Flask:Mana"] = true, ["Flask:Hybrid"] = true, ["Flask:Utility"] = true, ["Flask:Utility"] = true, }, },
{ type = "Suffix", affix = "of the Order", "(8-12)% increased Movement Speed during Flask effect", "50% Chance to avoid being Stunned during Flask Effect", statOrder = { 351, 3986 }, level = 1, group = "LocalFlaskAvoidStunChanceAndMovementSpeedDuringFlaskEffect", types = { ["Flask:Life"] = true, ["Flask:Mana"] = true, ["Flask:Hybrid"] = true, ["Flask:Utility"] = true, ["Flask:Utility"] = true, }, },
{ type = "Suffix", affix = "of the Order", "(20-25)% reduced Mana Cost of Skills during Flask Effect", statOrder = { 366 }, level = 1, group = "LocalFlaskSkillManaCostDuringFlaskEffect", types = { ["Flask:Life"] = true, ["Flask:Mana"] = true, ["Flask:Hybrid"] = true, ["Flask:Utility"] = true, ["Flask:Utility"] = true, }, },
{ type = "Suffix", affix = "of the Order", "(20-30)% increased Rarity of Items found during Flask Effect", statOrder = { 3989 }, level = 1, group = "LocalFlaskItemFoundRarityDuringFlaskEffect", types = { ["Flask:Life"] = true, ["Flask:Mana"] = true, ["Flask:Hybrid"] = true, ["Flask:Utility"] = true, ["Flask:Utility"] = true, }, },
{ type = "Suffix", affix = "of the Order", "(60-80)% increased Critical Strike Chance during Flask Effect", statOrder = { 3987 }, level = 1, group = "LocalFlaskCriticalStrikeChanceDuringFlaskEffect", types = { ["Flask:Life"] = true, ["Flask:Mana"] = true, ["Flask:Hybrid"] = true, ["Flask:Utility"] = true, ["Flask:Utility"] = true, }, },
{ type = "Suffix", affix = "of the Order", "15% of Damage Taken from Hits is Leeched as Life during Flask Effect", statOrder = { 3990 }, level = 1, group = "LocalFlaskLifeLeechOnDamageTakenPermyriadDuringFlaskEffect", types = { ["Flask:Life"] = true, ["Flask:Mana"] = true, ["Flask:Hybrid"] = true, ["Flask:Utility"] = true, ["Flask:Utility"] = true, }, },
{ type = "Suffix", affix = "of the Order", "3% of Life Regenerated per second during Flask Effect", statOrder = { 3991 }, level = 1, group = "LocalFlaskLifeRegenerationPerMinuteDuringFlaskEffect", types = { ["Flask"] = true, ["Flask"] = true, ["Flask"] = true, ["Flask"] = true, ["Flask"] = true, }, },
{ type = "Suffix", affix = "of the Order", "(8-12)% increased Movement Speed during Flask effect", "50% Chance to avoid being Stunned during Flask Effect", statOrder = { 351, 3986 }, level = 1, group = "LocalFlaskAvoidStunChanceAndMovementSpeedDuringFlaskEffect", types = { ["Flask"] = true, ["Flask"] = true, ["Flask"] = true, ["Flask"] = true, ["Flask"] = true, }, },
{ type = "Suffix", affix = "of the Order", "(20-25)% reduced Mana Cost of Skills during Flask Effect", statOrder = { 366 }, level = 1, group = "LocalFlaskSkillManaCostDuringFlaskEffect", types = { ["Flask"] = true, ["Flask"] = true, ["Flask"] = true, ["Flask"] = true, ["Flask"] = true, }, },
{ type = "Suffix", affix = "of the Order", "(20-30)% increased Rarity of Items found during Flask Effect", statOrder = { 3989 }, level = 1, group = "LocalFlaskItemFoundRarityDuringFlaskEffect", types = { ["Flask"] = true, ["Flask"] = true, ["Flask"] = true, ["Flask"] = true, ["Flask"] = true, }, },
{ type = "Suffix", affix = "of the Order", "(60-80)% increased Critical Strike Chance during Flask Effect", statOrder = { 3987 }, level = 1, group = "LocalFlaskCriticalStrikeChanceDuringFlaskEffect", types = { ["Flask"] = true, ["Flask"] = true, ["Flask"] = true, ["Flask"] = true, ["Flask"] = true, }, },
{ type = "Suffix", affix = "of the Order", "15% of Damage Taken from Hits is Leeched as Life during Flask Effect", statOrder = { 3990 }, level = 1, group = "LocalFlaskLifeLeechOnDamageTakenPermyriadDuringFlaskEffect", types = { ["Flask"] = true, ["Flask"] = true, ["Flask"] = true, ["Flask"] = true, ["Flask"] = true, }, },
{ type = "Suffix", affix = "of the Order", "(8-10)% increased Attack Speed", "+(7-12)% to Quality", statOrder = { 546, 3996 }, level = 1, group = "IncreasedAttackSpeed", types = { ["Dagger"] = true, ["One Handed Axe"] = true, ["One Handed Mace"] = true, ["One Handed Sword"] = true, ["Claw"] = true, ["Sceptre"] = true, ["Thrusting One Handed Sword"] = true, ["Wand"] = true, ["Two Handed Axe"] = true, ["Two Handed Mace"] = true, ["Two Handed Sword"] = true, ["Staff"] = true, ["Bow"] = true, }, },
{ type = "Suffix", affix = "of the Order", "(13-16)% increased Attack Speed", "+(13-18)% to Quality", statOrder = { 546, 3996 }, level = 75, group = "IncreasedAttackSpeed", types = { ["Dagger"] = true, ["One Handed Axe"] = true, ["One Handed Mace"] = true, ["One Handed Sword"] = true, ["Claw"] = true, ["Sceptre"] = true, ["Thrusting One Handed Sword"] = true, ["Two Handed Axe"] = true, ["Two Handed Mace"] = true, ["Two Handed Sword"] = true, ["Staff"] = true, }, },
{ type = "Suffix", affix = "of the Order", "(15-20)% increased Critical Strike Chance", "+(7-12)% to Quality", statOrder = { 595, 3996 }, level = 1, group = "CriticalStrikeChanceIncrease", types = { ["Dagger"] = true, ["One Handed Axe"] = true, ["One Handed Mace"] = true, ["One Handed Sword"] = true, ["Claw"] = true, ["Sceptre"] = true, ["Thrusting One Handed Sword"] = true, ["Wand"] = true, ["Two Handed Axe"] = true, ["Two Handed Mace"] = true, ["Two Handed Sword"] = true, ["Staff"] = true, ["Bow"] = true, }, },
Expand Down
57 changes: 36 additions & 21 deletions Modules/Calcs.lua
View file
Original file line number Diff line number Diff line change
Expand Up @@ -184,33 +184,48 @@ function calcs.buildOutput(build, mode)
addMult(out, tag.var, mod)
end
end
local function addModTags(mod)
for _, tag in ipairs(mod) do
if tag.type == "IgnoreCond" then
break
elseif tag.type == "Condition" then
if actor == env.player then
addCondTag(env.conditionsUsed, tag, mod)
else
addCondTag(env.minionConditionsUsed, tag, mod)
end
elseif tag.type == "ActorCondition" and tag.actor == "enemy" then
addCondTag(env.enemyConditionsUsed, tag, mod)
elseif tag.type == "Multiplier" or tag.type == "MultiplierThreshold" then
if not tag.actor then
if actor == env.player then
addMultTag(env.multipliersUsed, tag, mod)
end
elseif tag.actor == "enemy" then
addMultTag(env.enemyMultipliersUsed, tag, mod)
end
end
end
end
for _, actor in ipairs({env.player, env.minion}) do
for modName, modList in pairs(actor.modDB.mods) do
for _, mod in ipairs(modList) do
for _, tag in ipairs(mod) do
if tag.type == "IgnoreCond" then
break
elseif tag.type == "Condition" then
if actor == env.player then
addCondTag(env.conditionsUsed, tag, mod)
else
addCondTag(env.minionConditionsUsed, tag, mod)
end
elseif tag.type == "ActorCondition" and tag.actor == "enemy" then
addCondTag(env.enemyConditionsUsed, tag, mod)
elseif tag.type == "Multiplier" or tag.type == "MultiplierThreshold" then
if not tag.actor then
if actor == env.player then
addMultTag(env.multipliersUsed, tag, mod)
end
elseif tag.actor == "enemy" then
addMultTag(env.enemyMultipliersUsed, tag, mod)
end
end
end
addModTags(mod)
end
end
end
for _, activeSkill in pairs(env.activeSkillList) do
for _, mod in ipairs(activeSkill.skillModList) do
addModTags(mod)
end
if activeSkill.minion then
for _, activeSkill in pairs(activeSkill.minion.activeSkillList) do
for _, mod in ipairs(activeSkill.skillModList) do
addModTags(mod)
end
end
end
end
for modName, modList in pairs(env.enemyDB.mods) do
for _, mod in ipairs(modList) do
for _, tag in ipairs(mod) do
Expand Down
3 changes: 3 additions & 0 deletions changelog.txt
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
VERSION[1.4.123][2019/01/02]
* Fixed issue causing Configuration tab options to sometimes fail to appear when appropriate
* Fixed error when adding crafted modifiers to items
VERSION[1.4.122][2019/01/01]
* Updated the crafting bench options for 3.5
* Added support for most of the new craft modifiers
Expand Down
8 changes: 4 additions & 4 deletions manifest.xml
View file
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
<?xml version="1.0" encoding="UTF-8"?>
<PoBVersion>
<Version number="1.4.122"/>
<Version number="1.4.123"/>
<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="74cd89091c4db01f0673217a5bd0927f232391e2" name="Launch.lua" part="program"/>
<File sha1="72b9bea1871e94a643e4471fd84bbedbc7810336" name="UpdateCheck.lua" part="program"/>
<File sha1="4f17937f2b37784e169a3792b235f2a0a3961e61" name="UpdateApply.lua" part="program"/>
<File sha1="b3377828e20c4a55281c014c20f51cd550ca7689" name="changelog.txt" part="program"/>
<File sha1="06597972da4ebbdb5e851e116fd1aa76f1760d8a" name="changelog.txt" part="program"/>
<File sha1="b093a2709f30c1f83ce5ba9df88c80f22c1beb4a" name="Classes/BuildListControl.lua" part="program"/>
<File sha1="16fc5eaa04cc14b2022f6705a12717935454dab0" name="Classes/ButtonControl.lua" part="program"/>
<File sha1="a1c463f3329010e551700693296e998c8c2acd59" name="Classes/CalcBreakdownControl.lua" part="program"/>
Expand Down Expand Up @@ -62,7 +62,7 @@
<File sha1="997c4bd005a38b8789c515397e15268253753722" name="Modules/CalcOffence-2_6.lua" part="program"/>
<File sha1="96475faacacaf28f72682821e931e8ce6a4a1590" name="Modules/CalcOffence-3_0.lua" part="program"/>
<File sha1="be37d5a67290e76ac997118af7d55bf947a7f81e" name="Modules/CalcPerform.lua" part="program"/>
<File sha1="82e0199bb0f9d23e8b3d931f4095b8111d0e4170" name="Modules/Calcs.lua" part="program"/>
<File sha1="c302345ed78c57863c991091936fd2fb842c4e68" name="Modules/Calcs.lua" part="program"/>
<File sha1="32da2a949a5fe0ab10d54078a96caff0dccb5f3f" name="Modules/CalcSections-2_6.lua" part="program"/>
<File sha1="f4757b7b290dc6e2f3e4c2b47f618cdd6184e893" name="Modules/CalcSections-3_0.lua" part="program"/>
<File sha1="17b1facd712878bf4fc866e575748d42594d55a4" name="Modules/CalcSetup.lua" part="program"/>
Expand Down Expand Up @@ -157,7 +157,7 @@
<File sha1="56d2d437d5b83e4ea5d422c2e09b4365d39db52c" name="Data/3_0/ModItem.lua" part="program"/>
<File sha1="5729c201cc5be380557e576d35eded455ad7b1a0" name="Data/3_0/ModJewel.lua" part="program"/>
<File sha1="1afaad3922511d410e96117c4925f15efa53f374" name="Data/3_0/ModJewelAbyss.lua" part="program"/>
<File sha1="5ea53e890e8756c6b390203b4754bda8f74c10cb" name="Data/3_0/ModMaster.lua" part="program"/>
<File sha1="bbbc1cb2129cd447cdaf8e4a340ae56e1828651c" name="Data/3_0/ModMaster.lua" part="program"/>
<File sha1="16eb3b62d39e511c4de4efd0be461b5fe6af9924" name="Data/3_0/Rares.lua" part="program"/>
<File sha1="3148ac90731103c7e0229f8ad6d2d40e5a8b4e1e" name="Data/3_0/SkillStatMap.lua" part="program"/>
<File sha1="961566101bd0fc3964df5a8885b7c30a574387b4" name="Data/3_0/Spectres.lua" part="program"/>
Expand Down

0 comments on commit d89af95

Please sign in to comment.