Merge branch 'dev'

PathOfBuildingCommunity · Jul 23, 2024 · cb98cd1 · cb98cd1
2 parents 2b7a951 + 9eca117
commit cb98cd1
Show file tree

Hide file tree

Showing 31 changed files with 422 additions and 404 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,44 @@
 # Changelog
 
+## [v2.44.0](https://github.com/PathOfBuildingCommunity/PathOfBuilding/tree/v2.44.0) (2024/07/23)
+
+[Full Changelog](https://github.com/PathOfBuildingCommunity/PathOfBuilding/compare/v2.43.0...v2.44.0)
+
+<!-- Release notes generated using configuration in .github/release.yml at dev -->
+
+## What's Changed
+### New to Path of Building
+- Update Axe, Claw, Dagger, Sceptre,  Staff and Flask Bases with 3.25 Changes [\#7828](https://github.com/PathOfBuildingCommunity/PathOfBuilding/pull/7828), [\#7815](https://github.com/PathOfBuildingCommunity/PathOfBuilding/pull/7815) ([LocalIdentity](https://github.com/LocalIdentity), [pauloday](https://github.com/pauloday))
+### Fixed Crashes
+- Fix crash when trying to add gems to Penance Brand of Dissipation [\#7825](https://github.com/PathOfBuildingCommunity/PathOfBuilding/pull/7825) ([Paliak](https://github.com/Paliak))
+### User Interface
+- Fix tree selection hotkey double selecting [\#7789](https://github.com/PathOfBuildingCommunity/PathOfBuilding/pull/7789) ([Wires77](https://github.com/Wires77))
+- Add toggle for node search viewport edge highlight [\#7822](https://github.com/PathOfBuildingCommunity/PathOfBuilding/pull/7822) ([Paliak](https://github.com/Paliak))
+### Fixed Calculations
+- Fix "damage with Bleeding" mod not working [\#7800](https://github.com/PathOfBuildingCommunity/PathOfBuilding/pull/7800) ([LocalIdentity](https://github.com/LocalIdentity))
+- Fix War Banner not granting damage to Bleed [\#7799](https://github.com/PathOfBuildingCommunity/PathOfBuilding/pull/7799) ([LocalIdentity](https://github.com/LocalIdentity))
+- Fix Valour incorrectly granting increased Aura effect instead of more Aura Effect [\#7810](https://github.com/PathOfBuildingCommunity/PathOfBuilding/pull/7810) ([LocalIdentity](https://github.com/LocalIdentity))
+- Fix Perfect Agony not including on enemy effects [\#7807](https://github.com/PathOfBuildingCommunity/PathOfBuilding/pull/7807) ([Paliak](https://github.com/Paliak))
+- Fix Svalinn Lucky block mod not applying to Spell Block [\#7817](https://github.com/PathOfBuildingCommunity/PathOfBuilding/pull/7817) ([LocalIdentity](https://github.com/LocalIdentity))
+- Fix Seismic Cry more AoE mod scaling with Buff Effect [\#7813](https://github.com/PathOfBuildingCommunity/PathOfBuilding/pull/7813) ([LocalIdentity](https://github.com/LocalIdentity))
+- Fix Seething Fury not working with Perfect Agony [\#7812](https://github.com/PathOfBuildingCommunity/PathOfBuilding/pull/7812) ([Paliak](https://github.com/Paliak))
+### Fixed Behaviours
+- Fix Power Siphon not benefiting from Spell Damage [\#7802](https://github.com/PathOfBuildingCommunity/PathOfBuilding/pull/7802) ([LocalIdentity](https://github.com/LocalIdentity))
+- Fix pathing from Ascendant path node to class start [\#7806](https://github.com/PathOfBuildingCommunity/PathOfBuilding/pull/7806) ([trimbe](https://github.com/trimbe))
+- Fix Divine Blessing flat cost not appearing in breakdown [\#7811](https://github.com/PathOfBuildingCommunity/PathOfBuilding/pull/7811) ([LocalIdentity](https://github.com/LocalIdentity))
+- Fix Blood Rage not granting Attack damage leech [\#7823](https://github.com/PathOfBuildingCommunity/PathOfBuilding/pull/7823) ([LocalIdentity](https://github.com/LocalIdentity))
+- Fix Enduring Cry having incorrect duration [\#7814](https://github.com/PathOfBuildingCommunity/PathOfBuilding/pull/7814) ([LocalIdentity](https://github.com/LocalIdentity))
+### Accuracy Improvements
+- Fix Fist of War description not applying damage to Ailments [\#7798](https://github.com/PathOfBuildingCommunity/PathOfBuilding/pull/7798) ([LocalIdentity](https://github.com/LocalIdentity))
+- Fix Blade Flurry using the wrong damage effectiveness values [\#7797](https://github.com/PathOfBuildingCommunity/PathOfBuilding/pull/7797) ([LocalIdentity](https://github.com/LocalIdentity))
+- Fix Seismic Cry including old AoE increase mod [\#7791](https://github.com/PathOfBuildingCommunity/PathOfBuilding/pull/7791) ([LocalIdentity](https://github.com/LocalIdentity))
+- Fix Caustic Arrow of Poison still having Flat Damage [\#7803](https://github.com/PathOfBuildingCommunity/PathOfBuilding/pull/7803) ([LocalIdentity](https://github.com/LocalIdentity))
+- Fix elemental catalyst not applying to new The Taming [\#7821](https://github.com/PathOfBuildingCommunity/PathOfBuilding/pull/7821) ([Nerotox](https://github.com/Nerotox))
+- Fix Lethal Pride granting Phys as Extra Fire instead of Rage on hit [\#7819](https://github.com/PathOfBuildingCommunity/PathOfBuilding/pull/7819) ([LocalIdentity](https://github.com/LocalIdentity))
+### Other changes
+- Use Default value for loadout with no set name match [\#7793](https://github.com/PathOfBuildingCommunity/PathOfBuilding/pull/7793) ([deathbeam](https://github.com/deathbeam))
+
+
 ## [v2.43.0](https://github.com/PathOfBuildingCommunity/PathOfBuilding/tree/v2.43.0) (2024/07/23)
 
 [Full Changelog](https://github.com/PathOfBuildingCommunity/PathOfBuilding/compare/v2.42.0...v2.43.0)
@@ -14,7 +53,7 @@
 - Add support for linking sets through Loadouts by [#7672](https://github.com/PathOfBuildingCommunity/PathOfBuilding/pull/7672) ([Subtractem](https://github.com/Subtractem), [Peechey](https://github.com/Peechey), [deathbeam](https://github.com/deathbeam))
 - Add support for multiple configurations [\#7212](https://github.com/PathOfBuildingCommunity/PathOfBuilding/pull/7212) ([Peechey](https://github.com/Peechey))
 - Add support for new Gladiator Ascendancy nodes  [#7704](https://github.com/PathOfBuildingCommunity/PathOfBuilding/pull/7704), [#7697](https://github.com/PathOfBuildingCommunity/PathOfBuilding/pull/7697), [#7733](https://github.com/PathOfBuildingCommunity/PathOfBuilding/pull/7733) ([Regisle](https://github.com/Regisle), [dicsantana](https://github.com/dicsantana))
-- Add support for Tinctures [\#7749](https://github.com/PathOfBuildingCommunity/PathOfBuilding/pull/7749) ([Regisle](https://github.com/Regisle))
+- Add support for Tinctures [\#7749](https://github.com/PathOfBuildingCommunity/PathOfBuilding/pull/7749) ([Regisle](https://github.com/Regisle), [Nostrademous](https://github.com/Nostrademous))
 - Add support for new Warden Ascendancy nodes  [#7707](https://github.com/PathOfBuildingCommunity/PathOfBuilding/pull/7707), [#7782](https://github.com/PathOfBuildingCommunity/PathOfBuilding/pull/7782) ([Nerotox](https://github.com/Nerotox), [Regisle](https://github.com/Regisle))
 - Add support for new double Exerts Berserker Ascendancy [\#7745](https://github.com/PathOfBuildingCommunity/PathOfBuilding/pull/7745) ([Paliak](https://github.com/Paliak))
 - Add support for Champion's new Fortify on allies Ascendancy [\#7773](https://github.com/PathOfBuildingCommunity/PathOfBuilding/pull/7773) ([Regisle](https://github.com/Regisle))
@@ -122,7 +161,7 @@
 - Fix incorrect shortcut key mapping on some keyboards [\#7717](https://github.com/PathOfBuildingCommunity/PathOfBuilding/pull/7717) ([Wires77](https://github.com/Wires77))
 - Fix slow startup on certain computers [\#7717](https://github.com/PathOfBuildingCommunity/PathOfBuilding/pull/7717) ([zao](https://github.com/zao))
 - Fix error when deleting empty folders [\#7717](https://github.com/PathOfBuildingCommunity/PathOfBuilding/pull/7717) ([Wires77](https://github.com/Wires77))
-- Fix incorrectly needing to redownload Timeless Jewel files [\#7717](https://github.com/PathOfBuildingCommunity/PathOfBuilding/pull/7717) ([zao](https://github.com/zao))
+- Fix incorrectly needing to re-download Timeless Jewel files [\#7717](https://github.com/PathOfBuildingCommunity/PathOfBuilding/pull/7717) ([zao](https://github.com/zao))
 
 
 ## [v2.42.0](https://github.com/PathOfBuildingCommunity/PathOfBuilding/tree/v2.42.0) (2024/03/30)

diff --git a/changelog.txt b/changelog.txt
@@ -1,3 +1,39 @@
+VERSION[2.44.0][2024/07/23]
+
+--- New to Path of Building ---
+* Update Axe, Claw, Dagger, Sceptre,  Staff and Flask Bases with 3.25 Changes (LocalIdentity, pauloday)
+
+--- Fixed Crashes ---
+* Fix crash when trying to add gems to Penance Brand of Dissipation (Paliak)
+
+--- User Interface ---
+* Fix tree selection hotkey double selecting (Wires77)
+* Add toggle for node search viewport edge highlight (Paliak)
+
+--- Fixed Calculations ---
+* Fix "damage with Bleeding" mod not working (LocalIdentity)
+* Fix War Banner not granting damage to Bleed (LocalIdentity)
+* Fix Valour incorrectly granting increased Aura effect instead of more Aura Effect (LocalIdentity)
+* Fix Perfect Agony not including on enemy effects (Paliak)
+* Fix Svalinn Lucky block mod not applying to Spell Block (LocalIdentity)
+* Fix Seismic Cry more AoE mod scaling with Buff Effect (LocalIdentity)
+* Fix Seething Fury not working with Perfect Agony (Paliak)
+
+--- Fixed Behaviours ---
+* Fix Power Siphon not benefiting from Spell Damage (LocalIdentity)
+* Fix pathing from Ascendant path node to class start (trimbe)
+* Fix Divine Blessing flat cost not appearing in breakdown (LocalIdentity)
+* Fix Blood Rage not granting Attack damage leech (LocalIdentity)
+* Fix Enduring Cry having incorrect duration (LocalIdentity)
+
+--- Accuracy Improvements ---
+* Fix Fist of War description not applying damage to Ailments (LocalIdentity)
+* Fix Blade Flurry using the wrong damage effectiveness values (LocalIdentity)
+* Fix Seismic Cry including old AoE increase mod (LocalIdentity)
+* Fix Caustic Arrow of Poison still having Flat Damage (LocalIdentity)
+* Fix elemental catalyst not applying to new The Taming (Nerotox)
+* Fix Lethal Pride granting Phys as Extra Fire instead of Rage on hit (LocalIdentity)
+
 VERSION[2.43.0][2024/07/23]
 
 --- New to Path of Building ---
@@ -7,7 +43,7 @@ VERSION[2.43.0][2024/07/23]
 * Add support for linking sets through Loadouts (Subtractem, Peechey, deathbeam)
 * Add support for multiple configurations (Peechey)
 * Add support for new Gladiator Ascendancy nodes (Regisle, dicsantana)
-* Add support for Tinctures (Regisle)
+* Add support for Tinctures (Regisle, Nostrademous)
 * Add support for new Warden Ascendancy nodes (Nerotox, Regisle)
 * Add support for new double Exerts Berserker Ascendancy (Paliak)
 * Add support for Champion's new Fortify on allies Ascendancy (Regisle)
@@ -115,7 +151,7 @@ VERSION[2.43.0][2024/07/23]
 * Fix incorrect shortcut key mapping on some keyboards (Wires77)
 * Fix slow startup on certain computers (zao)
 * Fix error when deleting empty folders (Wires77)
-* Fix incorrectly needing to redownload Timeless Jewel files (zao)
+* Fix incorrectly needing to re-download Timeless Jewel files (zao)
 
 VERSION[2.42.0][2024/03/30]
 

diff --git a/spec/System/TestTriggers_spec.lua b/spec/System/TestTriggers_spec.lua
@@ -507,7 +507,7 @@ describe("TestTriggers", function()
         build.itemsTab:AddDisplayItem()
         runCallback("OnFrame")
 
-		build.skillsTab:PasteSocketGroup("Frenzy 20/0 Default  1\n")
+		build.skillsTab:PasteSocketGroup("Reave 20/0 Default  1\n")
         runCallback("OnFrame")
 
 		assert.True(build.calcsTab.mainOutput.SkillTriggerRate ~= nil)
@@ -823,7 +823,7 @@ describe("TestTriggers", function()
 		build.skillsTab:PasteSocketGroup("Slot: Weapon 1\nArc 20/0 Default  1\n")
         runCallback("OnFrame")
 
-		build.skillsTab:PasteSocketGroup("Frenzy 20/0 Default  1\n")
+		build.skillsTab:PasteSocketGroup("Reave 20/0 Default  1\n")
         runCallback("OnFrame")
 
 		assert.True(build.calcsTab.mainOutput.SkillTriggerRate ~= nil)
@@ -912,7 +912,7 @@ describe("TestTriggers", function()
 		build.skillsTab:PasteSocketGroup("Slot: Weapon 1\nArc 20/0 Default  1\n")
         runCallback("OnFrame")
 
-		build.skillsTab:PasteSocketGroup("Frenzy 20/0 Default  1\n")
+		build.skillsTab:PasteSocketGroup("Smite 20/0 Default  1\n")
         runCallback("OnFrame")
 
 		assert.True(build.calcsTab.mainOutput.SkillTriggerRate ~= nil)
@@ -943,7 +943,7 @@ describe("TestTriggers", function()
 		build.skillsTab:PasteSocketGroup("Slot: Weapon 1\nIce Nova 20/0 Default  1\n")
         runCallback("OnFrame")
 
-		build.skillsTab:PasteSocketGroup("Frenzy 20/0 Default  1\n")
+		build.skillsTab:PasteSocketGroup("Reave 20/0 Default  1\n")
         runCallback("OnFrame")
 
 		assert.True(build.calcsTab.mainOutput.SkillTriggerRate ~= nil)
@@ -1013,7 +1013,7 @@ describe("TestTriggers", function()
 		build.skillsTab:PasteSocketGroup("Summon Holy Relic 20/0 Default  1\n")
         runCallback("OnFrame")
 
-		build.skillsTab:PasteSocketGroup("Frenzy 20/0 Default  1\n")
+		build.skillsTab:PasteSocketGroup("Smite 20/0 Default  1\n")
         runCallback("OnFrame")
 
 		assert.True(build.calcsTab.mainOutput.Minion.SkillTriggerRate ~= nil)
@@ -1068,42 +1068,14 @@ describe("TestTriggers", function()
 		build.skillsTab:PasteSocketGroup("Mark On Hit 20/0 Default  1\nAlchemist's Mark 20/0 Default  1\n")
         runCallback("OnFrame")
 
-		build.skillsTab:PasteSocketGroup("Frenzy 20/0 Default  1\n")
+		build.skillsTab:PasteSocketGroup("Smite 20/0 Default  1\n")
         runCallback("OnFrame")
 
 		assert.True(build.calcsTab.mainOutput.SkillTriggerRate ~= nil)
     end)
 
 	it("Trigger Hextouch", function()
-		build.skillsTab:PasteSocketGroup("Despair 20/0 Default  1\nHextouch 20/0 Default  1\nFrenzy 20/0 Default  1\n")
-        runCallback("OnFrame")
-
-		assert.True(build.calcsTab.mainOutput.SkillTriggerRate ~= nil)
-    end)
-
-	it("Trigger Oskarm", function()
-		build.itemsTab:CreateDisplayItemFromRaw([[Oskarm
-		Nubuck Gloves
-		Evasion: 131
-		EvasionBasePercentile: 0
-		Variant: Pre 3.16.0
-		Variant: Current
-		Selected Variant: 2
-		Quality: 20
-		Sockets: G-G-G-G
-		LevelReq: 52
-		Implicits: 0
-		Trigger Level 10 Assassin's Mark when you Hit a Rare or Unique Enemy
-		{range:0.5}(30-40)% increased Accuracy Rating
-		{range:0.5}+(40-50) to maximum Life
-		{range:0.5}-(20-10)% to Chaos Resistance
-		{variant:1}{range:0.5}(7-8)% chance to Suppress Spell Damage
-		{variant:2}{range:0.5}(10-12)% chance to Suppress Spell Damage
-		2% increased Attack Critical Strike Chance per 200 Accuracy Rating]])
-        build.itemsTab:AddDisplayItem()
-        runCallback("OnFrame")
-
-		build.skillsTab:PasteSocketGroup("Frenzy 20/0 Default  1\n")
+		build.skillsTab:PasteSocketGroup("Despair 20/0 Default  1\nHextouch 20/0 Default  1\nSmite 20/0 Default  1\n")
         runCallback("OnFrame")
 
 		assert.True(build.calcsTab.mainOutput.SkillTriggerRate ~= nil)
@@ -1131,7 +1103,7 @@ describe("TestTriggers", function()
         build.itemsTab:AddDisplayItem()
         runCallback("OnFrame")
 
-		build.skillsTab:PasteSocketGroup("Frenzy 20/0 Default  1\n")
+		build.skillsTab:PasteSocketGroup("Smite 20/0 Default  1\n")
         runCallback("OnFrame")
 
 		assert.True(build.calcsTab.mainOutput.SkillTriggerRate ~= nil)
@@ -1262,14 +1234,14 @@ describe("TestTriggers", function()
 		build.buildFlag = true
 		runCallback("OnFrame")
 
-		build.skillsTab:PasteSocketGroup("Frenzy 20/0 Default  1\n")
+		build.skillsTab:PasteSocketGroup("Smite 20/0 Default  1\n")
         runCallback("OnFrame")
 
 		assert.True(build.calcsTab.mainOutput.SkillTriggerRate ~= nil)
     end)
 
 	it("Trigger Prismatic Burst", function()
-		build.skillsTab:PasteSocketGroup("Frenzy 20/0 Default  1\nPrismatic Burst 20/0 Default  1\n")
+		build.skillsTab:PasteSocketGroup("Smite 20/0 Default  1\nPrismatic Burst 20/0 Default  1\n")
         runCallback("OnFrame")
 
 		local mainSocketGroup = build.skillsTab.socketGroupList[build.mainSocketGroup]
@@ -1303,7 +1275,7 @@ describe("TestTriggers", function()
         build.itemsTab:AddDisplayItem()
         runCallback("OnFrame")
 
-		build.skillsTab:PasteSocketGroup("Frenzy 20/0 Default  1\nShockwave 20/0 Default  1\n")
+		build.skillsTab:PasteSocketGroup("Smite 20/0 Default  1\nShockwave 20/0 Default  1\n")
         runCallback("OnFrame")
 
 		local mainSocketGroup = build.skillsTab.socketGroupList[build.mainSocketGroup]

diff --git a/src/Classes/PassiveSpec.lua b/src/Classes/PassiveSpec.lua
@@ -801,7 +801,7 @@ function PassiveSpecClass:BuildPathFromNode(root)
 			if not other.pathDist then
 				ConPrintTable(other, true)
 			end
-			if node.type ~= "Mastery" and other.type ~= "ClassStart" and other.type ~= "AscendClassStart" and other.pathDist > curDist and (node.ascendancyName == other.ascendancyName or (curDist == 1 and not other.ascendancyName)) then
+			if node.type ~= "Mastery" and other.type ~= "ClassStart" and other.type ~= "AscendClassStart" and other.pathDist > curDist and (node.ascendancyName == other.ascendancyName or (curDist == 0 and not other.ascendancyName)) then
 				-- The shortest path to the other node is through the current node
 				other.pathDist = curDist
 				if not other.alloc then

diff --git a/src/Classes/PassiveTreeView.lua b/src/Classes/PassiveTreeView.lua
@@ -689,20 +689,25 @@ function PassiveTreeViewClass:Draw(build, viewPort, inputEvents)
 			SetDrawColor(rgbColor[1], rgbColor[2], rgbColor[3])
 			local size = 175 * scale / self.zoom ^ 0.4
 
-			-- Snap node matches to the edge of the viewPort
-			local peekaboo_ratio = 1.15
-			local scaled_down_ratio = 0.6667
-			local wide_cull = {viewPort.x - size / peekaboo_ratio, viewPort.x + viewPort.width - size * peekaboo_ratio}
-			local high_cull = {viewPort.y - size / peekaboo_ratio, viewPort.y + viewPort.height - size * peekaboo_ratio}
-			local newX = m_min(m_max(scrX - size, wide_cull[1]), wide_cull[2])
-			local newY = m_min(m_max(scrY - size, high_cull[1]), high_cull[2])
+			if main.edgeSearchHighlight then
+				-- Snap node matches to the edge of the viewPort
+				local peekaboo_ratio = 1.15
+				local scaled_down_ratio = 0.6667
+				local wide_cull = {viewPort.x - size / peekaboo_ratio, viewPort.x + viewPort.width - size * peekaboo_ratio}
+				local high_cull = {viewPort.y - size / peekaboo_ratio, viewPort.y + viewPort.height - size * peekaboo_ratio}
+				local newX = m_min(m_max(scrX - size, wide_cull[1]), wide_cull[2])
+				local newY = m_min(m_max(scrY - size, high_cull[1]), high_cull[2])
 
-			if newX ~= scrX - size or newY ~= scrY - size then
-			  size = size * scaled_down_ratio
-			  newX = newX + size / 2
-			  newY = newY + size / 2
+				if newX ~= scrX - size or newY ~= scrY - size then
+				size = size * scaled_down_ratio
+				newX = newX + size / 2
+				newY = newY + size / 2
+				end
+				DrawImage(self.highlightRing, newX, newY, size * 2, size * 2)
+			else
+				DrawImage(self.highlightRing, scrX - size, scrY - size, size * 2, size * 2)
 			end
-			DrawImage(self.highlightRing, newX, newY, size * 2, size * 2)
+
 		end
 		if node == hoverNode and (node.type ~= "Socket" or not IsKeyDown("SHIFT")) and (node.type ~= "Mastery" or node.masteryEffects) and not IsKeyDown("CTRL") and not main.popups[1] then
 			-- Draw tooltip

diff --git a/src/Classes/TreeTab.lua b/src/Classes/TreeTab.lua
@@ -287,13 +287,13 @@ function TreeTabClass:Draw(viewPort, inputEvents)
 				self.build.buildFlag = true
 				inputEvents[id] = nil
 			elseif event.key == "UP" then
-				index = self.activeSpec - 1
-				if self.specList[index] then
+				local index = self.activeSpec - 1
+				if self.specList[index] and not self.controls.specSelect:IsMouseOver() and not self.controls.specSelect.dropped then
 					self.build.modFlag = true
 					self:SetActiveSpec(index)
 				end
-			elseif event.key == "DOWN" then
-				index = self.activeSpec + 1
+			elseif event.key == "DOWN" and not self.controls.specSelect:IsMouseOver() and not self.controls.specSelect.dropped then
+				local index = self.activeSpec + 1
 				if self.specList[index] then
 					self.build.modFlag = true
 					self:SetActiveSpec(index)