Merge branch 'dev'

Author: LocalIdentity

CHANGELOG.md

@@ -1,5 +1,37 @@
 # Changelog
 
+## [v0.14.0](https://github.com/PathOfBuildingCommunity/PathOfBuilding-PoE2/tree/v0.14.0) (2025/12/19)
+
+[Full Changelog](https://github.com/PathOfBuildingCommunity/PathOfBuilding-PoE2/compare/v0.13.0...v0.14.0)
+
+
+## What's Changed
+### New to Path of Building
+- Add support for while Shapeshifted and add Shapeshift base stats [\#1636](https://github.com/PathOfBuildingCommunity/PathOfBuilding-PoE2/pull/1636) ([LocalIdentity](https://github.com/LocalIdentity))
+- Add support for Entwined Realities [\#1642](https://github.com/PathOfBuildingCommunity/PathOfBuilding-PoE2/pull/1642) ([Wires77](https://github.com/Wires77))
+- Add support for Disciples reduced Focus Effect Ascendancy [\#1647](https://github.com/PathOfBuildingCommunity/PathOfBuilding-PoE2/pull/1647) ([LocalIdentity](https://github.com/LocalIdentity))
+- Add support for changed Smith of Kitava nodes [\#1640](https://github.com/PathOfBuildingCommunity/PathOfBuilding-PoE2/pull/1640) ([LocalIdentity](https://github.com/LocalIdentity))
+- Add support for Warbringer Imploding Impacts [\#1624](https://github.com/PathOfBuildingCommunity/PathOfBuilding-PoE2/pull/1624) ([user-74](https://github.com/user-74))
+- Support for many changed Ascendancy nodes [\#1650](https://github.com/PathOfBuildingCommunity/PathOfBuilding-PoE2/pull/1650) ([LocalIdentity](https://github.com/LocalIdentity))
+- Add support Garukhan's Resolve and Oisín's Oath [\#1651](https://github.com/PathOfBuildingCommunity/PathOfBuilding-PoE2/pull/1651) ([LocalIdentity](https://github.com/LocalIdentity))
+- Add support for a many new tree mods [\#1649](https://github.com/PathOfBuildingCommunity/PathOfBuilding-PoE2/pull/1649) ([LocalIdentity](https://github.com/LocalIdentity))
+- Add support for Instruments of Power + Lord of the Wilds weapon mods [\#1646](https://github.com/PathOfBuildingCommunity/PathOfBuilding-PoE2/pull/1646) ([LocalIdentity](https://github.com/LocalIdentity))
+- Add support for Surpassing Chance for additional projectiles [\#1655](https://github.com/PathOfBuildingCommunity/PathOfBuilding-PoE2/pull/1655) ([LocalIdentity](https://github.com/LocalIdentity))
+- Update Tailwind and basic attack rate from 0.4 patch notes [\#1639](https://github.com/PathOfBuildingCommunity/PathOfBuilding-PoE2/pull/1639) ([LocalIdentity](https://github.com/LocalIdentity))
+### Fixed Crashes
+- Fix Crash when using importing build with radius jewel [\#1621](https://github.com/PathOfBuildingCommunity/PathOfBuilding-PoE2/pull/1621) ([LocalIdentity](https://github.com/LocalIdentity))
+### User Interface
+- Fix Small Passive effect mod not visually changing mods on the tree [\#1653](https://github.com/PathOfBuildingCommunity/PathOfBuilding-PoE2/pull/1653) ([LocalIdentity](https://github.com/LocalIdentity))
+- Show Vaal item icon, colour mutated mods and fix import of mutated mods [\#1629](https://github.com/PathOfBuildingCommunity/PathOfBuilding-PoE2/pull/1629) ([Blitz54](https://github.com/Blitz54))
+- Fix font for Elemental Damage on weapon [\#1628](https://github.com/PathOfBuildingCommunity/PathOfBuilding-PoE2/pull/1628) ([Blitz54](https://github.com/Blitz54))
+### Fixed Behaviours
+- Fix Pathfinder's alternate start nodes not connecting [\#1618](https://github.com/PathOfBuildingCommunity/PathOfBuilding-PoE2/pull/1618) ([Wires77](https://github.com/Wires77))
+- Fix Quest import on low level characters [\#1641](https://github.com/PathOfBuildingCommunity/PathOfBuilding-PoE2/pull/1641) ([LocalIdentity](https://github.com/LocalIdentity))
+- Fix fully broken armour's damage increase not applying to negative armour [\#1624](https://github.com/PathOfBuildingCommunity/PathOfBuilding-PoE2/pull/1624) ([user-74](https://github.com/user-74))
+- Fix Talisman's not appearing in Trader [\#1626](https://github.com/PathOfBuildingCommunity/PathOfBuilding-PoE2/pull/1626) ([LocalIdentity](https://github.com/LocalIdentity))
+- Fix Poison III, Admixture and Poisonburst Arrow Poison Magnitude mods not working [\#1630](https://github.com/PathOfBuildingCommunity/PathOfBuilding-PoE2/pull/1630) ([LocalIdentity](https://github.com/LocalIdentity))
+
+
 ## [v0.13.0](https://github.com/PathOfBuildingCommunity/PathOfBuilding-PoE2/tree/v0.13.0) (2025/12/15)
 
 [Full Changelog](https://github.com/PathOfBuildingCommunity/PathOfBuilding-PoE2/compare/v0.12.2...v0.13.0)

changelog.txt

@@ -1,3 +1,33 @@
+VERSION[0.14.0][2025/12/19]
+
+--- New to Path of Building ---
+* Add support for while Shapeshifted and add Shapeshift base stats (LocalIdentity)
+* Add support for Entwined Realities (Wires77)
+* Add support for Disciples reduced Focus Effect Ascendancy (LocalIdentity)
+* Add support for changed Smith of Kitava nodes (LocalIdentity)
+* Add support for Warbringer Imploding Impacts (user-74)
+* Support for many changed Ascendancy nodes (LocalIdentity)
+* Add support Garukhan's Resolve and Oisín's Oath (LocalIdentity)
+* Add support for a many new tree mods (LocalIdentity)
+* Add support for Instruments of Power + Lord of the Wilds weapon mods (LocalIdentity)
+* Add support for Surpassing Chance for additional projectiles (LocalIdentity)
+* Update Tailwind and basic attack rate from 0.4 patch notes (LocalIdentity)
+
+--- Fixed Crashes ---
+* Fix Crash when using importing build with radius jewel (LocalIdentity)
+
+--- User Interface ---
+* Fix Small Passive effect mod not visually changing mods on the tree (LocalIdentity)
+* Show Vaal item icon, colour mutated mods and fix import of mutated mods (Blitz54)
+* Fix font for Elemental Damage on weapon (Blitz54)
+
+--- Fixed Behaviours ---
+* Fix Pathfinder's alternate start nodes not connecting (Wires77)
+* Fix Quest import on low level characters (LocalIdentity)
+* Fix fully broken armour's damage increase not applying to negative armour (user-74)
+* Fix Talisman's not appearing in Trader (LocalIdentity)
+* Fix Poison III, Admixture and Poisonburst Arrow Poison Magnitude mods not working (LocalIdentity)
+
 VERSION[0.13.0][2025/12/15]
 
 --- The Last of the Druids ---

manifest.cfg

@@ -15,5 +15,5 @@ exclude-directories = src/Export,src/TreeData,src/Builds,src/luacov.stats.out,sr
 
 [tree]
 path = src
-exclude-files = export_lines.bat,extract_lines.scm,log_lines_extract.txt,script_lines_extract_orbit_active.scm,script_lines_extract_orbit_intermediate.scm,script_lines_extract_orbit_normal.scm,missingStats.txt
+exclude-files = *.scm,export_lines.bat,log_lines_extract.txt,missingStats.txt
 include-directories = src/TreeData

manifest.xml

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

runtime/lua/dkjson.lua

@@ -130,6 +130,26 @@ local function escapeutf8 (uchar)
   end
 end
 
+local function sortedkeys(tbl)
+  local keys = {}
+  for k in pairs(tbl) do
+    keys[#keys + 1] = k
+  end
+  table.sort(keys, function(a, b)
+    local ta, tb = type(a), type(b)
+    if ta == tb then
+      return a < b
+    end
+    if ta == "number" then
+      return true
+    elseif tb == "number" then
+      return false
+    end
+    return ta < tb
+  end)
+  return keys
+end
+
 local function fsub (str, pattern, repl)
   -- gsub always builds a new string in a buffer, even when no match
   -- exists. First using find should be more efficient when most strings
@@ -333,7 +353,10 @@ encode2 = function (value, indent, level, buffer, buflen, tables, globalorder, s
           end
         end
       else -- unordered
-        for k,v in pairs (value) do
+        local keys = sortedkeys(value)
+        for i = 1, #keys do
+          local k = keys[i]
+          local v = value[k]
           buflen, msg = addpair (k, v, prev, indent, level, buffer, buflen, tables, globalorder, state)
           if not buflen then return nil, msg end
           prev = true -- add a seperator before the next element
@@ -711,4 +734,3 @@ if always_try_using_lpeg then
 end
 
 return json
-

src/Assets/vaalitemicon.png

@@ -470,14 +470,15 @@ function CalcBreakdownClass:AddModSection(sectionData, modList)
 				elseif tag.type == "SkillId" then
 					desc = "Skill: "..build.data.skills[tag.skillId].name
 				elseif tag.type == "SkillType" then
-					for name, type in pairs(SkillType) do
-						if type == tag.skillType then
-							desc = "Skill type: "..(tag.neg and "Not " or "")..self:FormatModName(name)
-							break
+					if tag.skillTypeList then
+						local typeNames = { }
+						for _, skillType in ipairs(tag.skillTypeList) do
+							local formattedSkillType = self:FormatModName(SkillTypeName[skillType] or tostring(skillType))
+							t_insert(typeNames, formattedSkillType)
 						end
-					end
-					if not desc then
-						desc = "Skill type: "..(tag.neg and "Not " or "").."?"
+						desc = "Skill type: "..(tag.neg and "Not " or "")..table.concat(typeNames, " / ")
+					else
+						desc = "Skill type: "..(tag.neg and "Not " or "")..self:FormatModName(SkillTypeName[tag.skillType])
 					end
 				elseif tag.type == "SlotNumber" then
 					desc = "When in slot #"..tag.num

src/Classes/CalcBreakdownControl.lua

@@ -624,9 +624,6 @@ function ImportTabClass:ImportQuestRewardConfig(questStats)
 
 	local updated = false
 	for _, quest in ipairs(data.questRewards) do
-		if #statLines == 0 then
-			break
-		end
 		if quest.useConfig == true then
 			local var = "quest" .. quest.Description .. quest.Area .. quest.Info
 			if quest.Stat then
@@ -1038,6 +1035,7 @@ function ImportTabClass:ImportItem(itemData, slotName)
 	item.corrupted = itemData.corrupted
 	item.fractured = itemData.fractured
 	item.desecrated = itemData.desecrated
+	item.mutated = itemData.mutated
 	if itemData.sockets and itemData.sockets[1] then
 		item.sockets = { }
 		item.itemSocketCount = 0
@@ -1117,6 +1115,14 @@ function ImportTabClass:ImportItem(itemData, slotName)
 			end
 		end
 	end
+	if itemData.mutatedMods then
+		for _, line in ipairs(itemData.mutatedMods) do
+			for line in line:gmatch("[^\n]+") do
+				local modList, extra = modLib.parseMod(line)
+				t_insert(item.explicitModLines, { line = line, extra = extra, mods = modList or { }, mutated = true })
+			end
+		end
+	end
 
 	if itemData.grantedSkills then
 		for _, grantedSkillInfo in ipairs(itemData.grantedSkills) do

src/Classes/ImportTab.lua

@@ -59,7 +59,7 @@ local ItemClass = newClass("Item", function(self, raw, rarity, highQuality)
 end)
 
 local lineFlags = {
-	["custom"] = true, ["fractured"] = true, ["desecrated"] = true, ["enchant"] = true, ["implicit"] = true, ["rune"] = true,
+	["custom"] = true, ["fractured"] = true, ["desecrated"] = true, ["mutated"] = true, ["enchant"] = true, ["implicit"] = true, ["rune"] = true,
 }
 
 -- Special function to store unique instances of modifier on specific item slots
@@ -643,6 +643,9 @@ function ItemClass:ParseRaw(raw, rarity, highQuality)
 				if modLine.desecrated then
 					self.desecrated = true
 				end
+				if modLine.mutated then
+					self.mutated = true
+				end
 				if modLine.fractured then
 					self.fractured = true
 				end
@@ -1198,6 +1201,9 @@ function ItemClass:BuildRaw()
 		if modLine.desecrated then
 			line = "{desecrated}" .. line
 		end
+		if modLine.mutated then
+			line = "{mutated}" .. line
+		end
 		if modLine.variantList then
 			local varSpec
 			for varId in pairs(modLine.variantList) do

src/Classes/Item.lua

@@ -1886,7 +1886,7 @@ end
 
 -- Check if the given item could be equipped in the given slot, taking into account possible conflicts with currently equipped items
 -- For example, a shield is not valid for Weapon 2 if Weapon 1 is a staff, and a wand is not valid for Weapon 2 if Weapon 1 is a dagger
-function ItemsTabClass:IsItemValidForSlot(item, slotName, itemSet)
+function ItemsTabClass:IsItemValidForSlot(item, slotName, itemSet, flagState)
 	itemSet = itemSet or self.activeItemSet
 	local slotType, slotId = slotName:match("^([%a ]+) (%d+)$")
 	if not slotType then
@@ -1934,12 +1934,22 @@ function ItemsTabClass:IsItemValidForSlot(item, slotName, itemSet)
 		local weapon1Sel = itemSet[slotName == "Weapon 2" and "Weapon 1" or "Weapon 1 Swap"].selItemId or 0
 		local weapon1Base = self.items[weapon1Sel] and self.items[weapon1Sel].base or "Unarmed"
 		-- Calcs tab isn't loaded yet when the items tab gets loaded, so assume we have Giant's Blood until proven wrong
-		local giantsBlood = true
-		if self.build.calcsTab and self.build.calcsTab.mainEnv then
+		local giantsBlood, instrumentsOfPower, lordOfTheWilds = true, true, true
+		if flagState then
+			giantsBlood = flagState.giantsBlood
+			instrumentsOfPower = flagState.instrumentsOfPower
+			lordOfTheWilds = flagState.lordOfTheWilds
+		elseif self.build.calcsTab and self.build.calcsTab.mainEnv then
 			giantsBlood = self.build.calcsTab.mainEnv.modDB:Flag(nil, "GiantsBlood")
+			instrumentsOfPower = self.build.calcsTab.mainEnv.modDB:Flag(nil, "InstrumentsOfPower")
+			lordOfTheWilds = self.build.calcsTab.mainEnv.modDB:Flag(nil, "LordOfTheWilds")
 		end
 		if weapon1Base.type == "Bow" then
 			return item.type == "Quiver"
+		elseif weapon1Base.type == "Talisman" and lordOfTheWilds then
+			return item.type == "Sceptre" and item.rarity ~= "UNIQUE" and item.rarity ~= "RELIC"
+		elseif weapon1Base.type == "Staff" and instrumentsOfPower then
+			return item.type == "Focus"
 		elseif weapon1Base == "Unarmed" or weapon1Base.tags.onehand or (giantsBlood and (weapon1Base.tags.axe or weapon1Base.tags.mace or weapon1Base.tags.sword)) then
 			return item.type == "Shield" or item.type == "Focus" or item.type == "Sceptre"
 					or (item.base.tags.one_hand_weapon and weapon1Base.type ~= "Wand" and weapon1Base.type ~= "Sceptre")
@@ -1948,6 +1958,28 @@ function ItemsTabClass:IsItemValidForSlot(item, slotName, itemSet)
 	end
 end
 
+-- Ensure weapon 2 slots remain valid if keystone-dependent restrictions change
+function ItemsTabClass:ValidateWeaponSlots(flagState)
+	local activeSetChanged = false
+	local itemSet = self.activeItemSet
+	if itemSet then
+		local slotName = itemSet.useSecondWeaponSet and "Weapon 2 Swap" or "Weapon 2"
+		local slotData = itemSet[slotName]
+		if slotData and slotData.selItemId and slotData.selItemId ~= 0 then
+			local item = self.items[slotData.selItemId]
+			if not item or not self:IsItemValidForSlot(item, slotName, itemSet, flagState) then
+				if self.slots[slotName] then
+					self.slots[slotName]:SetSelItemId(0)
+				else
+					slotData.selItemId = 0
+				end
+				activeSetChanged = true
+			end
+		end
+	end
+	return activeSetChanged
+end
+
 -- Opens the item set manager
 function ItemsTabClass:OpenItemSetManagePopup()
 	local controls = { }
@@ -2678,7 +2710,13 @@ function ItemsTabClass:SetTooltipHeaderInfluence(tooltip, item)
 			tooltip.influenceHeader2 = "Desecrated"
 		end
 	end
-
+	if item.mutated then
+		if not tooltip.influenceHeader1 then
+			tooltip.influenceHeader1 = "Mutated"
+		else
+			tooltip.influenceHeader2 = "Mutated"
+		end
+	end
 	-- If only one influence, we copy to second header. Preparing for dual influence mods like in first game.
 	if tooltip.influenceHeader1 and not tooltip.influenceHeader2 then
 		tooltip.influenceHeader2 = tooltip.influenceHeader1
@@ -2770,7 +2808,7 @@ function ItemsTabClass:AddItemTooltip(tooltip, item, slot, dbMode)
 					elemLine = elemLine..s_format("%s%d-%d", colorCodes[var:upper()], weaponData[var.."Min"], weaponData[var.."Max"], "FONTIN SC")
 				end
 			end
-			tooltip:AddLine(fontSizeBig, elemLine)
+			tooltip:AddLine(fontSizeBig, elemLine, "FONTIN SC")
 			tooltip:AddLine(fontSizeBig, s_format("^x7F7F7FElemental DPS: "..colorCodes.MAGIC.."%.1f", weaponData.ElementalDPS), "FONTIN SC")
 			totalDamageTypes = totalDamageTypes + 1	
 		end