Merge branch 'dev'

PathOfBuildingCommunity · Dec 11, 2023 · a9d9b47 · a9d9b47
2 parents 7040c23 + dfdf799
commit a9d9b47
Show file tree

Hide file tree

Showing 16 changed files with 3,890 additions and 3,839 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,20 @@
 # Changelog
 
+## [v2.36.1](https://github.com/PathOfBuildingCommunity/PathOfBuilding/tree/v2.36.1) (2023/12/11)
+
+[Full Changelog](https://github.com/PathOfBuildingCommunity/PathOfBuilding/compare/v2.36.0...v2.36.1)
+
+<!-- Release notes generated using configuration in .github/release.yml at dev -->
+
+## What's Changed
+### Fixed Crashes
+- Fix Crash when opening Timeless Jewel search [\#6995](https://github.com/PathOfBuildingCommunity/PathOfBuilding/pull/6995) ([LocalIdentity](https://github.com/LocalIdentity))
+
+### Fixed Bugs
+- Fix crash when hovering over Masteries [\#6989](https://github.com/PathOfBuildingCommunity/PathOfBuilding/pull/6989) ([Wires77](https://github.com/Wires77))
+- Fix negative bypass being ignored [\#6992](https://github.com/PathOfBuildingCommunity/PathOfBuilding/pull/6992) ([mortentc](https://github.com/mortentc))
+
+
 ## [v2.36.0](https://github.com/PathOfBuildingCommunity/PathOfBuilding/tree/v2.36.0) (2023/12/11)
 
 [Full Changelog](https://github.com/PathOfBuildingCommunity/PathOfBuilding/compare/v2.35.5...v2.36.0)

diff --git a/changelog.txt b/changelog.txt
@@ -1,3 +1,12 @@
+VERSION[2.36.1][2023/12/11]
+
+--- Fixed Crashes ---
+* Fix Crash when opening Timeless Jewel search (LocalIdentity)
+
+--- Fixed Bugs ---
+* Fix crash when hovering over Masteries (Wires77)
+* Fix negative bypass being ignored (mortentc)
+
 VERSION[2.36.0][2023/12/11]
 
 --- New to Path of Building ---

diff --git a/manifest.xml b/manifest.xml
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <PoBVersion>
-	<Version number="2.36.0" />
+	<Version number="2.36.1" />
 	<Source part="default" url="https://raw.githubusercontent.com/PathOfBuildingCommunity/PathOfBuilding/{branch}/" />
 	<Source part="runtime" platform="win32" url="https://raw.githubusercontent.com/PathOfBuildingCommunity/PathOfBuilding/{branch}/runtime/" />
 	<Source part="program" url="https://raw.githubusercontent.com/PathOfBuildingCommunity/PathOfBuilding/{branch}/src/" />

diff --git a/spec/System/TestDefence_spec.lua b/spec/System/TestDefence_spec.lua
@@ -603,6 +603,19 @@ describe("TestDefence", function()
     end)
 
     it("energy shield bypass tests #pet", function()
+        -- Mastery
+        build.configTab.input.customMods = [[
+            +40 to maximum life
+            +200 to energy shield
+            50% of chaos damage taken does not bypass energy shield
+            You have no intelligence
+            +60% to all resistances
+        ]]
+        build.configTab:BuildModList()
+        runCallback("OnFrame")
+        assert.are.equals(300, build.calcsTab.calcsOutput.FireMaximumHitTaken)
+        assert.are.equals(200, build.calcsTab.calcsOutput.ChaosMaximumHitTaken)
+
         -- Negative overrides positive
         build.configTab.input.customMods = [[
             +40 to maximum life

diff --git a/src/Classes/PassiveSpec.lua b/src/Classes/PassiveSpec.lua
@@ -264,6 +264,9 @@ function PassiveSpecClass:ImportFromNodeList(classId, ascendClassId, secondaryAs
 			self.allocNodes[id] = node
 		end
 	end
+
+	-- Rebuild all the node paths and dependencies
+	self:BuildAllDependsAndPaths()
 end
 
 function PassiveSpecClass:AllocateDecodedNodes(nodes, isCluster, endian)

diff --git a/src/Classes/TreeTab.lua b/src/Classes/TreeTab.lua
@@ -1014,7 +1014,7 @@ function TreeTabClass:FindTimelessJewel()
 	}
 	local jewelSockets = { }
 	for socketId, socketData in pairs(self.build.spec.nodes) do
-		if socketData.isJewelSocket then
+		if socketData.isJewelSocket and socketData.name ~= "Charm Socket"then
 			local keystone = "Unknown"
 			if socketId == 26725 then
 				keystone = "Marauder"

diff --git a/src/Data/Bases/jewel.lua b/src/Data/Bases/jewel.lua
@@ -89,21 +89,21 @@ itemBases["Timeless Jewel"] = {
 itemBases["Ursine Charm"] = {
 	type = "Jewel",
 	subType = "Charm",
-	tags = { str_animal_charm = true, },
+	tags = { animal_charm = true, str_animal_charm = true, default = true, },
 	implicitModTypes = { },
 	req = { },
 }
 itemBases["Lupine Charm"] = {
 	type = "Jewel",
 	subType = "Charm",
-	tags = { dex_animal_charm = true, },
+	tags = { animal_charm = true, dex_animal_charm = true, default = true, },
 	implicitModTypes = { },
 	req = { },
 }
 itemBases["Corvine Charm"] = {
 	type = "Jewel",
 	subType = "Charm",
-	tags = { int_animal_charm = true, },
+	tags = { animal_charm = true, int_animal_charm = true, default = true, },
 	implicitModTypes = { },
 	req = { },
 }