diff --git a/CHANGELOG.md b/CHANGELOG.md index bbdd791d..d608ae56 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -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) diff --git a/Classes/CalcBreakdownControl.lua b/Classes/CalcBreakdownControl.lua index 6afe3c40..464801e1 100644 --- a/Classes/CalcBreakdownControl.lua +++ b/Classes/CalcBreakdownControl.lua @@ -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) diff --git a/Classes/ConfigTab.lua b/Classes/ConfigTab.lua index 2f7eed0a..90910626 100644 --- a/Classes/ConfigTab.lua +++ b/Classes/ConfigTab.lua @@ -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") diff --git a/Classes/ItemSlotControl.lua b/Classes/ItemSlotControl.lua index 735b83d4..027010d2 100644 --- a/Classes/ItemSlotControl.lua +++ b/Classes/ItemSlotControl.lua @@ -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) diff --git a/Classes/TreeTab.lua b/Classes/TreeTab.lua index 65443694..e97d05c3 100644 --- a/Classes/TreeTab.lua +++ b/Classes/TreeTab.lua @@ -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:") diff --git a/Data/New.lua b/Data/New.lua index 05b6a001..15e2e6b7 100644 --- a/Data/New.lua +++ b/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 ]], } diff --git a/Modules/CalcOffence-3_0.lua b/Modules/CalcOffence-3_0.lua index 13491164..22e55bec 100644 --- a/Modules/CalcOffence-3_0.lua +++ b/Modules/CalcOffence-3_0.lua @@ -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 diff --git a/Modules/CalcSetup.lua b/Modules/CalcSetup.lua index dfc055c1..d78d3e0e 100644 --- a/Modules/CalcSetup.lua +++ b/Modules/CalcSetup.lua @@ -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") diff --git a/changelog.txt b/changelog.txt index 0ec15034..9b9f61f6 100644 --- a/changelog.txt +++ b/changelog.txt @@ -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) diff --git a/manifest.xml b/manifest.xml index 6b7f910c..b11caf3f 100644 --- a/manifest.xml +++ b/manifest.xml @@ -1,20 +1,20 @@ - + - + - + - + @@ -26,7 +26,7 @@ - + @@ -51,7 +51,7 @@ - + @@ -60,15 +60,15 @@ - + - + - +