Merge remote-tracking branch 'upstream/dev' into vixen-es-leech
This commit is contained in:
Markus Persson
@@ -1,3 +1,8 @@
|
||||
### 1.4.131 - 2019/03/08
|
||||
* Updated boss curse effect penalty
|
||||
* Removed min/max Crit Chance limits
|
||||
* Fixed the passive tree node location popup showing the wrong locations
|
||||
|
||||
### 1.4.130 - 2019/03/07
|
||||
* Passive tree updated to 3.6
|
||||
* Added the following 3.6 uniques: (thanks PJacek)
|
||||
|
||||
@@ -510,8 +510,9 @@ function CalcBreakdownClass:DrawBreakdownTable(viewPort, x, y, section)
|
||||
DrawImage(nil, viewerX, viewerY, 304, 304)
|
||||
local viewer = self.nodeViewer
|
||||
viewer.zoom = 5
|
||||
viewer.zoomX = -ttNode.x / 11.85
|
||||
viewer.zoomY = -ttNode.y / 11.85
|
||||
local scale = self.calcsTab.build.targetVersion == "2_6" and 11.85 or 12.42
|
||||
viewer.zoomX = -ttNode.x / scale
|
||||
viewer.zoomY = -ttNode.y / scale
|
||||
SetViewport(viewerX + 2, viewerY + 2, 300, 300)
|
||||
viewer:Draw(self.calcsTab.build, { x = 0, y = 0, width = 300, height = 300 }, { })
|
||||
SetDrawLayer(nil, 30)
|
||||
|
||||
@@ -10,7 +10,7 @@ local m_floor = math.floor
|
||||
|
||||
local gameVersionDropList = {
|
||||
{ label = "2.6 (Atlas of Worlds)", version = "2_6", versionPretty = "2.6" },
|
||||
{ label = "3.5 (War for the Atlas)", version = "3_0", versionPretty = "3.5" },
|
||||
{ label = "3.6 (War for the Atlas)", version = "3_0", versionPretty = "3.6" },
|
||||
}
|
||||
|
||||
local varList = LoadModule("Modules/ConfigOptions")
|
||||
|
||||
@@ -130,8 +130,9 @@ function ItemSlotClass:Draw(viewPort)
|
||||
local viewer = self.itemsTab.socketViewer
|
||||
local node = self.itemsTab.build.spec.nodes[self.nodeId]
|
||||
viewer.zoom = 5
|
||||
viewer.zoomX = -node.x / 11.85
|
||||
viewer.zoomY = -node.y / 11.85
|
||||
local scale = self.itemsTab.build.targetVersion == "2_6" and 11.85 or 12.42
|
||||
viewer.zoomX = -node.x / scale
|
||||
viewer.zoomY = -node.y / scale
|
||||
SetViewport(viewerX + 2, viewerY + 2, 300, 300)
|
||||
viewer:Draw(self.itemsTab.build, { x = 0, y = 0, width = 300, height = 300 }, { })
|
||||
SetDrawLayer(nil, 30)
|
||||
|
||||
@@ -282,7 +282,7 @@ function TreeTabClass:OpenImportPopup()
|
||||
end
|
||||
|
||||
function TreeTabClass:OpenExportPopup()
|
||||
local treeLink = self.build.spec:EncodeURL("https://www.pathofexile.com/passive-skill-tree/"..(self.build.targetVersion == "2_6" and "2.6.2/" or "3.4.0/"))
|
||||
local treeLink = self.build.spec:EncodeURL("https://www.pathofexile.com/passive-skill-tree/"..(self.build.targetVersion == "2_6" and "2.6.2/" or "3.6.0/"))
|
||||
local popup
|
||||
local controls = { }
|
||||
controls.label = new("LabelControl", nil, 0, 20, 0, 16, "Passive tree link:")
|
||||
|
||||
38
Data/New.lua
38
Data/New.lua
@@ -27,7 +27,7 @@ Requires Level 35
|
||||
Creates Consecrated Ground on Use
|
||||
36% increased Duration
|
||||
Consecrated Ground created by this Flask has Tripled Radius
|
||||
+2% to Critical Strike Chance against Enemies on Consecrated ground during Effect
|
||||
+2% to Critical Strike Chance against Enemies on Consecrated Ground during Effect
|
||||
Enemies on Consecrated Ground you create during Effect take 10% increased Damage
|
||||
]],[[
|
||||
Mask of the Tribunal
|
||||
@@ -82,14 +82,46 @@ Triggers Level 20 Lightning Aegis when Equipped
|
||||
+47 to maximum Mana
|
||||
6% increased Movement Speed
|
||||
]],[[
|
||||
Vixen's Entrapment
|
||||
Vixen's Entrapment
|
||||
Embroidered Gloves
|
||||
Requires Level: 36
|
||||
Requires Level 36, 54 Int
|
||||
+64 to maximum Energy Shield
|
||||
You can apply an additional Curse
|
||||
16% increased Cast Speed with Curse Skills
|
||||
0.2% of Spell Damage Leeched as Energy Shield for each Curse on Enemy
|
||||
Trigger Socketed Curse Spells when you cast a Curse
|
||||
]],[[
|
||||
The Eternity Shroud
|
||||
Blood Raiment
|
||||
Shaper Item
|
||||
Requires Level 65, 107 Dex, 90 Int
|
||||
Implicits: 0
|
||||
Trigger Level 20 Glimpse of Eternity when Hit
|
||||
144% increased Evasion and Energy Shield
|
||||
+79 to maximum Life
|
||||
+21% to Chaos Resistance
|
||||
Gain 5% of Elemental Damage as Extra Chaos Damage per Shaper Item Equipped
|
||||
Hits ignore Enemy Monster Chaos Resistance if all Equipped Items are Shaper Items
|
||||
]],[[
|
||||
Maloney's Mechanism
|
||||
Ornate Quiver
|
||||
Requires Level 45
|
||||
Has 1 Socket
|
||||
Has 2 Sockets
|
||||
Trigger a Socketed Bow Skill when you Attack with a Bow
|
||||
8% increased Attack Speed
|
||||
+67 to maximum Life
|
||||
5% chance to Blind Enemies on Hit with Attacks
|
||||
]],[[
|
||||
Offering of the Serpent
|
||||
Legion Gloves
|
||||
Requires Level 57, 44 Str, 44 Int
|
||||
+21 to all Attributes
|
||||
157% increased Armour and Energy Shield
|
||||
50% reduced Maximum Recovery per Life Leech
|
||||
6% increased Attack and Cast Speed
|
||||
22% increased Damage while Leeching
|
||||
Life Leech effects are not removed at Full Life
|
||||
]],
|
||||
|
||||
}
|
||||
|
||||
@@ -782,9 +782,9 @@ function calcs.offence(env, actor, activeSkill)
|
||||
local enemyExtra = env.mode_effective and enemyDB:Sum("BASE", nil, "SelfExtraCritChance") or 0
|
||||
output.CritChance = (baseCrit + base) * (1 + inc / 100) * more
|
||||
local preCapCritChance = output.CritChance
|
||||
output.CritChance = m_min(output.CritChance, 95)
|
||||
output.CritChance = m_min(output.CritChance, 100)
|
||||
if (baseCrit + base) > 0 then
|
||||
output.CritChance = m_max(output.CritChance, 5)
|
||||
output.CritChance = m_max(output.CritChance, 0)
|
||||
end
|
||||
output.PreEffectiveCritChance = output.CritChance
|
||||
if enemyExtra ~= 0 then
|
||||
@@ -812,8 +812,8 @@ function calcs.offence(env, actor, activeSkill)
|
||||
t_insert(breakdown.CritChance, s_format("x %.2f", more).." ^8(more/less)")
|
||||
end
|
||||
t_insert(breakdown.CritChance, s_format("= %.2f%% ^8(crit chance)", output.PreEffectiveCritChance))
|
||||
if preCapCritChance > 95 then
|
||||
local overCap = preCapCritChance - 95
|
||||
if preCapCritChance > 100 then
|
||||
local overCap = preCapCritChance - 100
|
||||
t_insert(breakdown.CritChance, s_format("Crit is overcapped by %.2f%% (%d%% increased Critical Strike Chance)", overCap, overCap / more / (baseCrit + base) * 100))
|
||||
end
|
||||
if enemyExtra ~= 0 then
|
||||
|
||||
@@ -27,7 +27,7 @@ function calcs.initModDB(env, modDB)
|
||||
modDB:NewMod("EnduranceChargesMax", "BASE", 3, "Base")
|
||||
modDB:NewMod("MaxLifeLeechRate", "BASE", 20, "Base")
|
||||
modDB:NewMod("MaxManaLeechRate", "BASE", 20, "Base")
|
||||
if env.build.targerVersion ~= "2_6" then
|
||||
if env.build.targetVersion ~= "2_6" then
|
||||
modDB:NewMod("MaxEnergyShieldLeechRate", "BASE", 10, "Base")
|
||||
modDB:NewMod("MaxLifeLeechInstance", "BASE", 10, "Base")
|
||||
modDB:NewMod("MaxManaLeechInstance", "BASE", 10, "Base")
|
||||
|
||||
@@ -1,3 +1,7 @@
|
||||
VERSION[1.4.131][2019/03/08]
|
||||
* Updated boss curse effect penalty
|
||||
* Removed min/max Crit Chance limits
|
||||
* Fixed the passive tree node location popup showing the wrong locations
|
||||
VERSION[1.4.130][2019/03/07]
|
||||
* Passive tree updated to 3.6
|
||||
* Added the following 3.6 uniques: (thanks PJacek)
|
||||
|
||||
18
manifest.xml
18
manifest.xml
@@ -1,20 +1,20 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<PoBVersion>
|
||||
<Version number="1.4.130"/>
|
||||
<Version number="1.4.131"/>
|
||||
<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="9e79b228cbb2ccb751aeaafb566070337a8a41b7" name="changelog.txt" part="program"/>
|
||||
<File sha1="b0033de920541d9a9e70750ea20e1cecb59234f4" 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"/>
|
||||
<File sha1="56207534c1398237cf337e483af4ec798086c2d2" name="Classes/CalcBreakdownControl.lua" part="program"/>
|
||||
<File sha1="e496e2eb8959e1f0f1cc2568c3acf558e748f5bf" name="Classes/CalcSectionControl.lua" part="program"/>
|
||||
<File sha1="a37911c2c192b4796ebbc344da925fb85c7de16a" name="Classes/CalcsTab.lua" part="program"/>
|
||||
<File sha1="d2e5a1d2717da6853a9c5e788bc45c309d925e77" name="Classes/CheckBoxControl.lua" part="program"/>
|
||||
<File sha1="c1aa9fec15bcac1872d6f15c0ca555fa1c42da81" name="Classes/ConfigTab.lua" part="program"/>
|
||||
<File sha1="4a91962a24f92b7fc58ebfd0a01a4d99f63fb7f5" name="Classes/ConfigTab.lua" part="program"/>
|
||||
<File sha1="64fc5fd8e3d4ade976f51c4a28d782b9b2ad31ac" name="Classes/Control.lua" part="program"/>
|
||||
<File sha1="8bc9c45c9223fb0d51e67cde556849678862817a" name="Classes/ControlHost.lua" part="program"/>
|
||||
<File sha1="5efd9a36853d6fb5214a9e4b88a5ca94d470b44f" name="Classes/DropDownControl.lua" part="program"/>
|
||||
@@ -26,7 +26,7 @@
|
||||
<File sha1="10a80027f6c1f27893ba08c3a1b4c5a56aefc151" name="Classes/ItemDBControl.lua" part="program"/>
|
||||
<File sha1="8298506b88cea37e78c1c5faebc05335b3ace240" name="Classes/ItemListControl.lua" part="program"/>
|
||||
<File sha1="7ecee459d3c477b46c6b6115bfeb2480995e17ed" name="Classes/ItemSetListControl.lua" part="program"/>
|
||||
<File sha1="531cbee8beb690fa9909affc9e5af0d697170c4e" name="Classes/ItemSlotControl.lua" part="program"/>
|
||||
<File sha1="ba194f2eb89e8ab59a500c4ffc27a4f5e12b68e3" name="Classes/ItemSlotControl.lua" part="program"/>
|
||||
<File sha1="a83f21746dd0197701f680c1d7f3239629893615" name="Classes/ItemsTab.lua" part="program"/>
|
||||
<File sha1="d2ffe0071641c07b63d152c0f48b691eba0cffb0" name="Classes/LabelControl.lua" part="program"/>
|
||||
<File sha1="075b986fe07f2c5d33eea4c1b6984198adf62fa4" name="Classes/ListControl.lua" part="program"/>
|
||||
@@ -51,7 +51,7 @@
|
||||
<File sha1="bb62a34443d64f21c5f0e3e00cae736a8eb6bd87" name="Classes/TextListControl.lua" part="program"/>
|
||||
<File sha1="a9c6a1965fb2d7b7435bd635cd4241ee6e771ec9" name="Classes/Tooltip.lua" part="program"/>
|
||||
<File sha1="23274906162877c09d2119237414b6747a0e6cea" name="Classes/TooltipHost.lua" part="program"/>
|
||||
<File sha1="85def77444be68d786d44abb8477a0d95db14fc3" name="Classes/TreeTab.lua" part="program"/>
|
||||
<File sha1="facd21caaf2c71767f7d5de27d2850d124f63814" name="Classes/TreeTab.lua" part="program"/>
|
||||
<File sha1="ce4835c384c834da0de47b0302b1e774c8300c6b" name="Classes/UndoHandler.lua" part="program"/>
|
||||
<File sha1="b0deb992c84cf2a24ec87ca1f256029653d9c256" name="Modules/Build.lua" part="program"/>
|
||||
<File sha1="bcda0c5148b9e40274acd13702896cc430c89eba" name="Modules/BuildList.lua" part="program"/>
|
||||
@@ -60,15 +60,15 @@
|
||||
<File sha1="f08ee16af3c136348fe98bc97b5b7f2d2c1f79e4" name="Modules/CalcDefence-2_6.lua" part="program"/>
|
||||
<File sha1="6e9e8e34f0cbe3bdeaa73f8bd309d9409b2441b6" name="Modules/CalcDefence-3_0.lua" part="program"/>
|
||||
<File sha1="5094a7c53f3991dbc33cea86e1e5fc0658e7a08d" name="Modules/CalcOffence-2_6.lua" part="program"/>
|
||||
<File sha1="4a8fa03c0b1ac89164a796b6e169c9f3aa68f051" name="Modules/CalcOffence-3_0.lua" part="program"/>
|
||||
<File sha1="51153665e19133b9b10470002c6ba90c760cc635" name="Modules/CalcOffence-3_0.lua" part="program"/>
|
||||
<File sha1="674ac1b18ad72adac959ee831a9fd17d4d26c0b7" name="Modules/CalcPerform.lua" part="program"/>
|
||||
<File sha1="602057f90cbc7152a65472a2293c7bc2cad15fb2" name="Modules/Calcs.lua" part="program"/>
|
||||
<File sha1="32da2a949a5fe0ab10d54078a96caff0dccb5f3f" name="Modules/CalcSections-2_6.lua" part="program"/>
|
||||
<File sha1="4aa75958a0ebb4c688782420af96a911ec072d0b" name="Modules/CalcSections-3_0.lua" part="program"/>
|
||||
<File sha1="30ff22f3bcca21a1703edfe8c4fe0c7fbe83d9a8" name="Modules/CalcSetup.lua" part="program"/>
|
||||
<File sha1="8825be36a6ceb83dbd1d77a76825f7740bc4d99d" name="Modules/CalcSetup.lua" part="program"/>
|
||||
<File sha1="d63cf884b273fbbee81a6274581011519f73c529" name="Modules/CalcTools.lua" part="program"/>
|
||||
<File sha1="3fd4ec579d4b6cb23a5a18aaffbf713712fb05a9" name="Modules/Common.lua" part="program"/>
|
||||
<File sha1="60bd733f9a00dcc0d6dd67fcf75d248d2957e976" name="Modules/ConfigOptions.lua" part="program"/>
|
||||
<File sha1="9ed2c2b5ebf7ade3ecf13069675f5fe7d0f891e4" name="Modules/ConfigOptions.lua" part="program"/>
|
||||
<File sha1="45959b8e64bd8b75c2b4019555589b745d0ac68a" name="Modules/Data.lua" part="program"/>
|
||||
<File sha1="ee6926d9acb29152f44f223dd117c0b72f1e73af" name="Modules/ItemTools.lua" part="program"/>
|
||||
<File sha1="8ec34cb6ab6e8d08ddc06c524179be1e656c3a8d" name="Modules/Main.lua" part="program"/>
|
||||
|
||||
Reference in New Issue
Block a user