Merge branch 'add_3.22-additions' into spellblade

Author: Lilylicious

CHANGELOG.md

@@ -1,5 +1,35 @@
 # Changelog
 
+## [v2.31.2](https://github.com/PathOfBuildingCommunity/PathOfBuilding/tree/v2.31.2) (2023/08/16)
+
+[Full Changelog](https://github.com/PathOfBuildingCommunity/PathOfBuilding/compare/v2.31.1...v2.31.2)
+
+<!-- Release notes generated using configuration in .github/release.yml at dev -->
+
+## What's Changed
+### Fixed Bugs
+* Fix issue when importing characters by @Wires77
+* Fix typo with Ignite Stack Potential Override by @Wires77
+
+
+## [v2.31.1](https://github.com/PathOfBuildingCommunity/PathOfBuilding/tree/v2.31.1) (2023/08/16)
+
+[Full Changelog](https://github.com/PathOfBuildingCommunity/PathOfBuilding/compare/v2.31.0...v2.31.1)
+
+<!-- Release notes generated using configuration in .github/release.yml at dev -->
+
+## What's Changed
+### User Interface
+- Lower contrast of gem select highlight [\#6338](https://github.com/PathOfBuildingCommunity/PathOfBuilding/pull/6338) ([ryuukk](https://github.com/ryuukk))
+### Accuracy Improvements
+- Undo incorrect Explosive Arrow change [\#6335](https://github.com/PathOfBuildingCommunity/PathOfBuilding/pull/6335) ([Lilylicious](https://github.com/Lilylicious))
+- Fix Frozen Legion benefiting from exerts [\#6331](https://github.com/PathOfBuildingCommunity/PathOfBuilding/pull/6331) ([Lilylicious](https://github.com/Lilylicious))
+- Fix Combustion debuff not applying when a non-damaging skill precedes a damaging skill [\#6344](https://github.com/PathOfBuildingCommunity/PathOfBuilding/pull/6344) ([Lilylicious](https://github.com/Lilylicious))
+- Fix Blood Sacrament not being capped by Cooldown [\#6351](https://github.com/PathOfBuildingCommunity/PathOfBuilding/pull/6351) ([LocalIdentity](https://github.com/LocalIdentity))
+- Fix Tree conversion stopping you from allocating some tree nodes [\#6352](https://github.com/PathOfBuildingCommunity/PathOfBuilding/pull/6352) ([LocalIdentity](https://github.com/LocalIdentity))
+- Fix Mana cost when using 'Wait for max unleash seals' [\#6333](https://github.com/PathOfBuildingCommunity/PathOfBuilding/pull/6333) ([busterw](https://github.com/busterw))
+
+
 ## [v2.31.0](https://github.com/PathOfBuildingCommunity/PathOfBuilding/tree/v2.31.0) (2023/08/15)
 
 [Full Changelog](https://github.com/PathOfBuildingCommunity/PathOfBuilding/compare/v2.30.1...v2.31.0)

CONTRIBUTING.md

@@ -43,7 +43,7 @@ Feature requests are always welcome. Note that not all requests will receive an
 ### Before submitting a pull request:
 * Familiarise yourself with the code base [here](docs/rundown.md) to get you started.
 * There is a [Discord](https://discordapp.com/) server for **active development** on the fork and members are happy to answer your questions there.
-  If you are interested in joining, send a private message to any of **Cinnabarit#1341**, **LocalIdentity#9871**, **Yamin#5575** and we'll send you an invitation.
+  If you are interested in joining, send a private message to **localidentity** or **wires77** and we'll send you an invitation.
 
 ### When submitting a pull request:
 * **Pull requests must be created against the `dev` branch**, as all changes to the code are staged there before merging to `master`.

changelog.txt

@@ -1,3 +1,22 @@
+VERSION[2.31.2][2023/08/16]
+
+--- Fixed Bugs ---
+* Fix issue when importing characters (Wires77)
+* Fix typo with Ignite Stack Potential Override (Wires77)
+
+VERSION[2.31.1][2023/08/16]
+
+--- User Interface ---
+* Lower contrast of gem select highlight (ryuukk)
+
+--- Accuracy Improvements ---
+* Undo incorrect Explosive Arrow change (Lilylicious)
+* Fix Frozen Legion benefiting from exerts (Lilylicious)
+* Fix Combustion debuff not applying when a non-damaging skill precedes a damaging skill (Lilylicious)
+* Fix Blood Sacrament not being capped by Cooldown (LocalIdentity)
+* Fix Tree conversion stopping you from allocating some tree nodes (LocalIdentity)
+* Fix Mana cost when using 'Wait for max unleash seals' (busterw)
+
 VERSION[2.31.0][2023/08/15]
 
 --- New to Path of Building ---

help.txt

@@ -1,21 +1,13 @@
----[Help File][1]
+---[Help File Introduction]
 
-This file contains a list of shortcuts, and other misc things PoB has
+This file contains a list of shortcuts, and other misc information about PoB functionality
+While holding shift scroll bars in help section and version history will jump to the previous/next section while scrolling
 
----[Contents][2]
+---[Contents]
 
-1. Intro
-2. Contents
-3. FAQ
-4. Hotkeys
-5. Other Notable Things
-6. Timeless Jewels
-7. Party Tab
-8. Items Tab
+---[FAQ]
 
----[FAQ][3]
-
----[Hotkeys][4]
+---[Hotkeys]
 
 General Shortcuts:
 
@@ -35,13 +27,14 @@ Ctrl + N	New build (in build selection menu)
 Ctrl + S	Save build to file
 Ctrl + U	Check for update
 Ctrl + V or RMB	Paste
-Ctrl + W or Mouse 4	Close Build (gives save prompt if unsaved)
+Ctrl + W or	
+Mouse 4	Close Build (gives save prompt if unsaved)
 Ctrl + X	Cut
 Ctrl + Y	Redo
 Ctrl + Z	Undo
 Ctrl + BSP / DEL	Faster text delete
 Ctrl + + /-/0	Zoom in / Out / Reset
-F1	Open item/gem/etc in poewiki.net
+F1	Open item/gem/etc in poewiki.net, or if nothing to open, opens help file
 F2	Rename item, set, etc.
 E	On an equipped item will open it on the edit menu on the right.
 Ctrl + LMB	Enable / disable gems
@@ -50,6 +43,7 @@ Mouse 4/5	Undo / Redo path respectively (in build selection menu)
 Shift	While scrolling on a slider makes it 5* times faster
 Ctrl	While scrolling on a slider makes it 5* times slower
 * default of 5, some scroll bars have more or less extreme modifiers to scroll speed
+  and scroll bars in help section and version history will jump to the previous/next section
 
 When creating an item either through item creator or adding an item pressing ctrl will add it to the first slot
     and ctrl+shift will add it to the second slot e.g. offhand for a weapon.
@@ -80,11 +74,11 @@ DEV[F5	Restart]
 DEV[F6	Run garbage collector]
 DEV[Shift	Copy export xml to clipboard (hold key during export)]
 
----[Other Notable Things][5]
+---[Other Notable Things]
 
 Adding ^ and then a number or hex code before text will change the colour of the text, eg ^^77 will make the following text white until the next colour marker is set.
 
----[Timeless Jewels][6]
+---[Timeless Jewels]
 
 Timeless jewels modify nodes in a radius based off their seed, the same seed will apply the same changes to the same small/notable nodes so that is the number you look for. The Conqueror (name on the jewel) only affects the keystone.
 
@@ -118,7 +112,7 @@ Militant Faith jewels also have the option to select the other mods on the jewel
 Advanced tricks:
     For Militant Faith, if you don't want any nodes to change, you can just sort by devotion. As unchanged nodes add devotion, the ones with the most devotion will be the ones with unchanged nodes
 
----[Party Tab][7]
+---[Party Tab]
 
 The Party tab Allows you to import support characters and have their auras and curses apply
 
@@ -135,7 +129,7 @@ Your curses will take priority over a support's
 For now Enemy conditions and Modifiers are not exported but can be imported if its saved in the XML, and Links skills are not exported or parsed
 Some auras like Mines which use a stack value for their effect will not apply as their stack value is missing
 
----[Items Tab][8]
+---[Items Tab]
 
 The Item Tab in Path of Building allows you to plan out the gear you will use for your character. To access the Item Tab, click on the "Items" tab located at the top of the screen.
 

manifest.xml

@@ -1,11 +1,11 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <PoBVersion>
-	<Version number="2.31.0" />
+	<Version number="2.31.2" />
 	<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/" />
 	<Source part="tree" url="https://raw.githubusercontent.com/PathOfBuildingCommunity/PathOfBuilding/{branch}/src/" />
-	<File name="changelog.txt" part="default" sha1="a6cdcb66f00a8eed0491cfe625a8e4a31ef26d70" />
+	<File name="changelog.txt" part="default" sha1="e00639c70dbed9735c64f314806fde0c42d9d7e4" />
 	<File name="help.txt" part="default" sha1="1edba2005ea8dec7bea31db4e225cef869692834" />
 	<File name="LICENSE.md" part="default" sha1="eacedd00e9707defe051bd7151466d223376afa6" />
 	<File name="Assets/game_ui_small.png" part="program" sha1="3e3f01a7c21ffe5ee7dfb644e9f3b7188c319d4d" />
@@ -28,8 +28,8 @@
 	<File name="Classes/DropDownControl.lua" part="program" sha1="74b790e7633de7ba8eb2c5f4204d411f9aff68aa" />
 	<File name="Classes/EditControl.lua" part="program" sha1="90194ba472124ee8b57eab0abe3c573399f2892e" />
 	<File name="Classes/FolderListControl.lua" part="program" sha1="64706fc226b02939112f90735c5d78ddf99b896f" />
-	<File name="Classes/GemSelectControl.lua" part="program" sha1="cbe8ef4eb078e0591b457439e882370d57056bac" />
-	<File name="Classes/ImportTab.lua" part="program" sha1="80643172c8bc02458385f3a1d2bd0b9740a5729f" />
+	<File name="Classes/GemSelectControl.lua" part="program" sha1="89c5fcc63c259a851c41bb58c72489cfaa4934da" />
+	<File name="Classes/ImportTab.lua" part="program" sha1="071e1fc002ff9bcb8c3e6560c84c394898e2c09e" />
 	<File name="Classes/Item.lua" part="program" sha1="7b5d833e0036285edef2334c417cd1d62dab588d" />
 	<File name="Classes/ItemDBControl.lua" part="program" sha1="3dbdf8a18b48ada819720326e7f54b0c46ac3ab5" />
 	<File name="Classes/ItemListControl.lua" part="program" sha1="be99fb0de3a9f2324921368799bcef3eac4ac820" />
@@ -46,7 +46,7 @@
 	<File name="Classes/NotesTab.lua" part="program" sha1="67827a564d75d6f639893d0f0978212cf01ba4a4" />
 	<File name="Classes/PartyTab.lua" part="program" sha1="0302128331fee33dfb66ef5466757f9ea97c6bd3" />
 	<File name="Classes/PassiveMasteryControl.lua" part="program" sha1="f15e2d078e9b36d42616d11b652eb7160ffb0627" />
-	<File name="Classes/PassiveSpec.lua" part="program" sha1="bdc3beb67cb195fd542ea4a9ea36788eb0b2af72" />
+	<File name="Classes/PassiveSpec.lua" part="program" sha1="f9e6310861f35b47c5354dcd9ca86350e621ad83" />
 	<File name="Classes/PassiveSpecListControl.lua" part="program" sha1="4da957f305cb61c9ba021d1d19a0e7501d5c053d" />
 	<File name="Classes/PassiveTree.lua" part="program" sha1="cd6c133de149deb51c921e1a16448e2cb622bc9b" />
 	<File name="Classes/PassiveTreeView.lua" part="program" sha1="f27faaaab7ab57da877501eb89de440854ee7542" />
@@ -126,7 +126,7 @@
 	<File name="Data/Pantheons.lua" part="program" sha1="b1e6520cfffeeccf88566b7613120fab4e097acc" />
 	<File name="Data/QueryMods.lua" part="program" sha1="2563ec6532f96c90e384ca4971a5e4a8b0a3cd02" />
 	<File name="Data/Rares.lua" part="program" sha1="3901663e512fbf4f37e20de4dbcff39c3a3e658b" />
-	<File name="Data/Skills/act_dex.lua" part="program" sha1="f06bc098fb8de4a741e425367aba115006e97fb8" />
+	<File name="Data/Skills/act_dex.lua" part="program" sha1="ffb2c4a13cb6a60d22d423c7ed344cf001f205a0" />
 	<File name="Data/Skills/act_int.lua" part="program" sha1="a3563952706d933add8e963d06cd096ceb8298b0" />
 	<File name="Data/Skills/act_str.lua" part="program" sha1="6448b6ecc5d3c3fe1f24145dee18e1c51fa40f76" />
 	<File name="Data/Skills/glove.lua" part="program" sha1="e0315c8fe86fccf1563711ed91968f03606a804c" />
@@ -199,8 +199,8 @@
 	<File name="Modules/CalcActiveSkill.lua" part="program" sha1="1a6549b1d76b4de324163041232f06ae04737c81" />
 	<File name="Modules/CalcBreakdown.lua" part="program" sha1="4460ce0aac0086a9667d38131eaeb968cd64b77b" />
 	<File name="Modules/CalcDefence.lua" part="program" sha1="2b63750fbdc233e1da00d96b2ab05836e37e98a5" />
-	<File name="Modules/CalcOffence.lua" part="program" sha1="de71821377abf202de749b746e1b0987822d895b" />
-	<File name="Modules/CalcPerform.lua" part="program" sha1="2669c74015b1218704e76ff4be8438287f03efe8" />
+	<File name="Modules/CalcOffence.lua" part="program" sha1="eab2d9f842113788d54262dac9c658135bad36be" />
+	<File name="Modules/CalcPerform.lua" part="program" sha1="207981d0c0bbad8370f3897616c9d60673043f22" />
 	<File name="Modules/Calcs.lua" part="program" sha1="feb334dab9ac610bb719673ddf3be256924fa1db" />
 	<File name="Modules/CalcSections.lua" part="program" sha1="c25d61bd8502f79c8e5343a63f7218cbe43f83a4" />
 	<File name="Modules/CalcSetup.lua" part="program" sha1="a86f6c92fd18f2626cadf3dbe347eb496ca26e93" />

src/Classes/GemSelectControl.lua

@@ -381,7 +381,7 @@ function GemSelectClass:Draw(viewPort, noTooltip)
 		for index = minIndex, maxIndex do
 			local y = (index - 1) * (height - 4) - scrollBar.offset
 			if index == self.hoverSel or index == self.selIndex or (index == 1 and self.selIndex == 0) then
-				SetDrawColor(0.33, 0.33, 0.33)
+				SetDrawColor(0.2, 0.2, 0.2)
 				DrawImage(nil, 0, y, width - 4, height - 4)
 			end
 			SetDrawColor(1, 1, 1)
@@ -803,4 +803,4 @@ function GemSelectClass:OnKeyUp(key)
 	end
 	local newSel = self.EditControl:OnKeyUp(key)
 	return newSel == self.EditControl and self or newSel
-end
+end

src/Classes/ImportTab.lua

@@ -588,6 +588,20 @@ function ImportTabClass:ImportPassiveTreeAndJewels(json, charData)
 	end
 	self.build.itemsTab:PopulateSlots()
 	self.build.itemsTab:AddUndoState()
+	for classId, class in pairs(self.build.spec.tree.classes) do
+		if charData.class == class.name then
+			charData.classId = classId
+			charData.ascendancyClass = 0
+			break
+		end
+		for ascendId, ascendancyClass in pairs(class.ascendancies) do
+			if charData.class == ascendancyClass.name then
+				charData.classId = classId
+				charData.ascendancyClass = ascendId
+				break
+			end
+		end
+	end
 	self.build.spec:ImportFromNodeList(charData.classId, charData.ascendancyClass, charPassiveData.hashes, charPassiveData.mastery_effects or {}, latestTreeVersion)
 	self.build.spec:AddUndoState()
 	self.build.characterLevel = charData.level

src/Classes/ModStore.lua

@@ -513,7 +513,7 @@ function ModStoreClass:EvalMod(mod, cfg)
 			if tag.actor then
 				target = self.actor[tag.actor] and self.actor[tag.actor].modDB
 			end
-			if target then
+			if target and (tag.var or tag.varList) then
 				if tag.varList then
 					for _, var in pairs(tag.varList) do
 						if target:GetCondition(var, cfg) then
@@ -524,7 +524,7 @@ function ModStoreClass:EvalMod(mod, cfg)
 				else
 					match = target:GetCondition(tag.var, cfg)
 				end
-			elseif tag.actor and cfg and tag.var == nil and tag.varList == nil and tag.actor == cfg.actor then
+			elseif tag.actor and cfg and tag.actor == cfg.actor then
 				match = true
 			end
 			if tag.neg then
@@ -534,35 +534,51 @@ function ModStoreClass:EvalMod(mod, cfg)
 				return
 			end
 		elseif tag.type == "ItemCondition" then
+			local matches = {}
 			local match = false
-			local searchCond = tag.var
-			local itemSlot = tag.itemSlot:gsub("(%l)(%w*)", function(a,b) return string.upper(a)..b end):gsub('^%s*(.-)%s*$', '%1')
-			local bCheckAllAppropriateSlots = tag.allSlots
-			if searchCond and itemSlot then
+			local searchCond = tag.searchCond
+			local rarityCond = tag.rarityCond
+			local allSlots = tag.allSlots
+			local itemSlot = tag.itemSlot:lower():gsub("(%l)(%w*)", function(a,b) return string.upper(a)..b end):gsub('^%s*(.-)%s*$', '%1')
+			local bCheckAllAppropriateSlots = tag.bothSlots
+			local items
+			if allSlots then
+				items = self.actor.itemList
+			elseif self.actor.itemList then
+				items = {self.actor.itemList[itemSlot] or (cfg and cfg.item)}
 				if bCheckAllAppropriateSlots then
-					local match1 = false
-					local match2 = false
 					local itemSlot1 = self.actor.itemList[itemSlot .. " 1"]
 					local itemSlot2 = self.actor.itemList[itemSlot .. " 2"]
 					if itemSlot1 and itemSlot1.name:match("Kalandra's Touch") then itemSlot1 = itemSlot2 end
 					if itemSlot2 and itemSlot2.name:match("Kalandra's Touch") then itemSlot2 = itemSlot1 end
-					if itemSlot1 then
-						match1 = itemSlot1:FindModifierSubstring(searchCond:lower(), itemSlot:lower())
+					if itemSlot1 and itemSlot2 then
+						t_insert(items, itemSlot1)
+						t_insert(items, itemSlot2)
 					end
-					if itemSlot2 then
-						match2 = itemSlot2:FindModifierSubstring(searchCond:lower(), itemSlot:lower())
+				end
+			end
+			if items and #items > 0 or allSlots then
+				if searchCond then
+					for slot, item in pairs(items) do
+						if slot ~= itemSlot or not tag.excludeSelf then
+							t_insert(matches, item:FindModifierSubstring(searchCond:lower(), itemSlot:lower()))
+						end
 					end
-					match = match1 and match2
-				else
-					if self.actor.itemList[itemSlot] then
-						match = self.actor.itemList[itemSlot]:FindModifierSubstring(searchCond:lower(), itemSlot:lower())
+				end
+				if rarityCond then
+					for _, item in pairs(items) do
+						t_insert(matches, item.rarity == rarityCond)
 					end
 				end
 			end
-			if tag.neg then
-				match = not match
+			for _, bool in ipairs(matches) do
+				if bool then
+					match = not tag.neg
+					break
+				end
+				match = tag.neg == true
 			end
-			if not match then
+			if not match and #matches > 0 then
 				return
 			end
 		elseif tag.type == "SocketedIn" then

src/Classes/PassiveSpec.lua

@@ -893,6 +893,8 @@ function PassiveSpecClass:BuildAllDependsAndPaths()
 		if self.ignoredNodes[id] and self.allocNodes[id] then
 			self.nodes[id].alloc = false
 			self.allocNodes[id] = nil
+			-- remove once processed to avoid allocation issue after convert
+			self.ignoredNodes[id] = nil
 		else
 			if node.type == "Mastery" and self.masterySelections[id] then
 				local effect = self.tree.masteryEffects[self.masterySelections[id]]

src/Classes/PassiveTree.lua

@@ -51,7 +51,7 @@ local PassiveTreeClass = newClass("PassiveTree", function(self, treeVersion)
 	self.treeVersion = treeVersion
 	local versionNum = treeVersions[treeVersion].num
 
-	self.legion = LoadModule("Data/LegionPassives")
+	self.legion = LoadModule("Data/TimelessJewelData/LegionPassives")
 
 	MakeDir("TreeData")