Merge branch 'dev' into add-buildfile-onedrive-check

Author: Nightblade

.github/tweak_changelogs.sh

@@ -50,6 +50,8 @@ sed -i -re 's/( \()?\[\\#[0-9]+\]\([^)]*\),? ?\)?//g' changelog_temp.txt
 sed -i -re 's/\[([^]]*)\]\(https:\/\/github\.com\/[^)]*\)/\1/g' changelog_temp.txt
 # Create new changelog format: add version header, remove lines 2-3, format section headers, remove ## headers with following line, prepend to existing changelog
 echo "VERSION[${RELEASE_VERSION#v}][$(date +'%Y/%m/%d')]" | cat - changelog_temp.txt | sed '2,3d' | sed -re 's/^### (.*)/\n--- \1 ---/' | sed -e '/^##.*/,+1 d' | cat - changelog.txt > changelog_new.txt
+# Convert dashes to asterisks for bullet points
+sed -i -e 's/^- /* /' changelog_new.txt
 mv changelog_new.txt changelog.txt
 
 # Normalize line endings to CRLF for all output files to ensure consistent checksums with Windows

changelog.txt

@@ -1,54 +1,54 @@
 VERSION[2.58.1][2025/11/05]
 
 --- User Interface ---
-- Fix incorrect tooltip when crafting some flask mods (LocalIdentity)
-- Fix Damage Gain breakdown including skill conversion (LocalIdentity)
-- Fix insufficient skill cost warning applying to other skills (LocalIdentity)
+* Fix incorrect tooltip when crafting some flask mods (LocalIdentity)
+* Fix Damage Gain breakdown including skill conversion (LocalIdentity)
+* Fix insufficient skill cost warning applying to other skills (LocalIdentity)
 
 --- Fixed Calculations ---
-- Fix Spectre conversion multiplier applying to "gain as x" mods and Chaos damage (LocalIdentity)
-- Fix Pyroclast Mine Exposure being inverted and unscalable (LocalIdentity)
+* Fix Spectre conversion multiplier applying to "gain as x" mods and Chaos damage (LocalIdentity)
+* Fix Pyroclast Mine Exposure being inverted and unscalable (LocalIdentity)
 
 --- Fixed Behaviours ---
-- Fix Intuitive Leap, Thread of Hope and Impossible Escape not parsing correctly (Wires77)
-- Fix mod order when crafting Grafts (LocalIdentity)
-- Fix "Farewell to Flesh" not applying to Agony Crawler ailment damage (LocalIdentity)
-- Fix Dying Breath Curse effect mod not working (LocalIdentity)
+* Fix Intuitive Leap, Thread of Hope and Impossible Escape not parsing correctly (Wires77)
+* Fix mod order when crafting Grafts (LocalIdentity)
+* Fix "Farewell to Flesh" not applying to Agony Crawler ailment damage (LocalIdentity)
+* Fix Dying Breath Curse effect mod not working (LocalIdentity)
 
 
 VERSION[2.58.0][2025/11/03]
 
 --- Keepers of the Flame ---
-- Update and add new 3.27 skills (LocalIdentity)
-- Add new Wand and Ring item bases (LocalIdentity)
-- Add initial support for Grafts (LocalIdentity)
-- Add initial support for Foulborn unique mods (Wires77)
-- Add Support for new Monster Phys damage conversion logic (LocalIdentity)
-- Add support for "Farewell to Flesh" (Lycia Bloodline Herald Ascendancy Node) (majochem)
-- Add instant buyout to search URLs (Goufix)
+* Update and add new 3.27 skills (LocalIdentity)
+* Add new Wand and Ring item bases (LocalIdentity)
+* Add initial support for Grafts (LocalIdentity)
+* Add initial support for Foulborn unique mods (Wires77)
+* Add Support for new Monster Phys damage conversion logic (LocalIdentity)
+* Add support for "Farewell to Flesh" (Lycia Bloodline Herald Ascendancy Node) (majochem)
+* Add instant buyout to search URLs (Goufix)
 
 --- User Interface ---
-- Show Foulborn Icon on new Foulborn uniques and flavour text on new base items (Blitz54)
-- Sort Replica Dragonfang's Flight mods (Wires77)
-- Fix "The Tactician" missing flavour text (Nightblade)
+* Show Foulborn Icon on new Foulborn uniques and flavour text on new base items (Blitz54)
+* Sort Replica Dragonfang's Flight mods (Wires77)
+* Fix "The Tactician" missing flavour text (Nightblade)
 
 --- Fixed Calculations ---
-- Fix Warcry uptime when using  Dual Strike of Ambidexterity (LocalIdentity)
+* Fix Warcry uptime when using  Dual Strike of Ambidexterity (LocalIdentity)
 
 --- Fixed Behaviours ---
-- Fix Gem dropdown tooltip not updating when hovering over gems (LocalIdentity)
-- Fix Aul Bloodline Aura nodes always applying (LocalIdentity)
-- Fix Everlasting Sacrifice not showing the config from the Chaos Ascendancy (Wires77)
-- Fix Intuitive Leap, Thread of Hope and Impossible Escape not working (n1tr0xs)
-- Fix legacy Curse cluster not appearing on tree sometimes (LocalIdentity)
-- Fix Overexertion and Echoes of Creation counting duplicate Warcries (LocalIdentity)
-- Fix Chaos Inoculation not disabling Righteous Fire Buff and Degen (LocalIdentity)
+* Fix Gem dropdown tooltip not updating when hovering over gems (LocalIdentity)
+* Fix Aul Bloodline Aura nodes always applying (LocalIdentity)
+* Fix Everlasting Sacrifice not showing the config from the Chaos Ascendancy (Wires77)
+* Fix Intuitive Leap, Thread of Hope and Impossible Escape not working (n1tr0xs)
+* Fix legacy Curse cluster not appearing on tree sometimes (LocalIdentity)
+* Fix Overexertion and Echoes of Creation counting duplicate Warcries (LocalIdentity)
+* Fix Chaos Inoculation not disabling Righteous Fire Buff and Degen (LocalIdentity)
 
 --- Accuracy Improvements ---
-- Fix Burning Ground from Replica Siegebreaker not working (pabgarbar)
+* Fix Burning Ground from Replica Siegebreaker not working (pabgarbar)
 
 --- Other changes ---
-- Fix broken header images on Linux (ZereoX)
+* Fix broken header images on Linux (ZereoX)
 
 VERSION[2.57.0][2025/10/30]
 
@@ -2587,7 +2587,7 @@ VERSION[2.19.0][2022/07/12]
 VERSION[2.18.1][2022/06/05]
 
 --- Fixed Bugs ---
-- Fix crash related to Life gain on Block (Regisle)
+* Fix crash related to Life gain on Block (Regisle)
 
 VERSION[2.18.0][2022/06/05]
 
@@ -2833,7 +2833,7 @@ VERSION[2.14.0][2022/02/05]
 * Add Armour and Evasion sorting to the tree and uniques tab (Lexy)
 * Add Mastery tooltip for an unallocated node when comparing trees (pHiney)
 * Add improvements to multiple passive tree jewel socket management (Lothrik)
-- Update tree images to use the latest colours (LocalIdentity)
+* Update tree images to use the latest colours (LocalIdentity)
 * Fix Passive Tree Management Titles (pHiney)
 
 --- New Calculations ---
@@ -2862,7 +2862,7 @@ VERSION[2.14.0][2022/02/05]
 * Update Crimson Storm changes (lpolaright)
 * Update Whispering Ice and its trigger conditions (Nostrademous)
 * Update Kraityn's bandit rewards based on 3.16 values (Prismateria)
-- Update Kingmaker with 3.16 changes (Wires77)
+* Update Kingmaker with 3.16 changes (Wires77)
 * Update Blightwell and Solstice Vigil to 3.16.0 (Lothrik)
 * Update Saqawals Flock to 3.16 values (Lexy)
 * Update Survival Jewels to 3.16.0 (Lothrik)

spec/System/TestImpale_spec.lua

@@ -112,34 +112,34 @@ describe("TestAttacks", function()
 		build.configTab.input.customMods = "\z
 		never deal critical strikes\n\z
 		"
-		build.configTab.input.enemyPhysicalReduction = 10
+		build.configTab.input.enemyPhysicalReduction = 8
 		build.configTab.input.enemyArmour = 1000 -- 50% dr for 200 damage, 66.6% dr for 100 dmg (impale stacks)
 		build.configTab:BuildModList()
 		runCallback("OnFrame")
 
 		-- dam * (1 - (armourDR + additionalDR)
-		assert.are.equals(200 * (1 - (0.5 + 0.1)), build.calcsTab.mainOutput.MainHand.PhysicalHitAverage)
+		assert.are.equals(200 * (1 - (0.5 + 0.08)), build.calcsTab.mainOutput.MainHand.PhysicalHitAverage)
 		assert.are.equals(200, build.calcsTab.mainOutput.MainHand.impaleStoredHitAvg)
 		assert.are.equals(200, build.calcsTab.mainOutput.impaleStoredHitAvg)
 		-- [5 impales * 10% stored damage] * 1.3 attacks * (armour mod - phys DR)
-		assert.are.near(100 * 1.3 * (1 - (2/3 + 0.1)), build.calcsTab.mainOutput.ImpaleDPS, 0.0000001) -- floating point math
+		assert.are.near(100 * 1.3 * (1 - (2/3 + 0.08)), build.calcsTab.mainOutput.ImpaleDPS, 0.0000001) -- floating point math
 
 
 		-- 100% crit
 		build.configTab.input.customMods = "\z
 		+100% critical strike chance\n\z
 		"
-		build.configTab.input.enemyPhysicalReduction = 10
+		build.configTab.input.enemyPhysicalReduction = 8
 		build.configTab.input.enemyArmour = 1500 -- 50% dr for 300 damage, 66.6% dr for 150 dmg (impale stacks)
 		build.configTab:BuildModList()
 		runCallback("OnFrame")
 
 		-- dam * (1 - (armourDR + additionalDR)
-		assert.are.equals(300 * (1 - (0.5 + 0.1)), build.calcsTab.mainOutput.MainHand.PhysicalCritAverage)
+		assert.are.equals(300 * (1 - (0.5 + 0.08)), build.calcsTab.mainOutput.MainHand.PhysicalCritAverage)
 		assert.are.equals(300, build.calcsTab.mainOutput.MainHand.impaleStoredHitAvg)
 		assert.are.equals(300, build.calcsTab.mainOutput.impaleStoredHitAvg)
 		-- [5 impales * 10% stored damage] * 1.3 attacks * (armour mod - phys DR)
-		assert.are.near(150 * 1.3 * (1 - (2/3 + 0.1)), build.calcsTab.mainOutput.ImpaleDPS, 0.0000001) -- floating point math
+		assert.are.near(150 * 1.3 * (1 - (2/3 + 0.08)), build.calcsTab.mainOutput.ImpaleDPS, 0.0000001) -- floating point math
 
 	end)
 
@@ -149,35 +149,35 @@ describe("TestAttacks", function()
 		never deal critical strikes\n\z
 		Nearby enemies take 100% increased physical damage\n\z
 		"
-		build.configTab.input.enemyPhysicalReduction = 10
+		build.configTab.input.enemyPhysicalReduction = 8
 		build.configTab.input.enemyArmour = 1000 -- 50% dr for 200 damage, 66.6% dr for 100 dmg (impale stacks) .. damage taken is after armour
 		build.configTab:BuildModList()
 		runCallback("OnFrame")
 
 		-- taken * dam * (1 - (armourDR + additionalDR)
-		assert.are.equals(2 * 200 * (1 - (0.5 + 0.1)), build.calcsTab.mainOutput.MainHand.PhysicalHitAverage)
+		assert.are.equals(2 * 200 * (1 - (0.5 + 0.08)), build.calcsTab.mainOutput.MainHand.PhysicalHitAverage)
 		assert.are.equals(200, build.calcsTab.mainOutput.MainHand.impaleStoredHitAvg)
 		assert.are.equals(200, build.calcsTab.mainOutput.impaleStoredHitAvg)
 		-- taken * [5 impales * 10% stored damage] * 1.3 attacks * (armour mod - phys DR)
-		assert.are.near(2 * 100 * 1.3 * (1 - (2/3 + 0.1)), build.calcsTab.mainOutput.ImpaleDPS, 0.0000001) -- floating point math
+		assert.are.near(2 * 100 * 1.3 * (1 - (2/3 + 0.08)), build.calcsTab.mainOutput.ImpaleDPS, 0.0000001) -- floating point math
 
 
 		-- 100% crit
 		build.configTab.input.customMods = "\z
 		+100% critical strike chance\n\z
 		Nearby enemies take 100% increased physical damage\n\z
 		"
-		build.configTab.input.enemyPhysicalReduction = 10
+		build.configTab.input.enemyPhysicalReduction = 8
 		build.configTab.input.enemyArmour = 1500 -- 50% dr for 300 damage, 66.6% dr for 150 dmg (impale stacks)
 		build.configTab:BuildModList()
 		runCallback("OnFrame")
 
 		-- taken * dam * (1 - (armourDR + additionalDR)
-		assert.are.equals(2 * 300 * (1 - (0.5 + 0.1)), build.calcsTab.mainOutput.MainHand.PhysicalCritAverage)
+		assert.are.equals(2 * 300 * (1 - (0.5 + 0.08)), build.calcsTab.mainOutput.MainHand.PhysicalCritAverage)
 		assert.are.equals(300, build.calcsTab.mainOutput.MainHand.impaleStoredHitAvg)
 		assert.are.equals(300, build.calcsTab.mainOutput.impaleStoredHitAvg)
 		-- taken * [5 impales * 10% stored damage] * 1.3 attacks * (armour mod - phys DR)
-		assert.are.near(2 * 150 * 1.3 * (1 - (2/3 + 0.1)), build.calcsTab.mainOutput.ImpaleDPS, 0.0000001) -- floating point math
+		assert.are.near(2 * 150 * 1.3 * (1 - (2/3 + 0.08)), build.calcsTab.mainOutput.ImpaleDPS, 0.0000001) -- floating point math
 
 	end)
 

spec/System/TestItemMods_spec.lua

@@ -553,4 +553,36 @@ describe("TetsItemMods", function()
 		assert.are_not.equals(64, build.calcsTab.mainOutput.Armour)
 		runCallback("OnFrame")
 	end)
+	
+	it("Heralds apply exposure with Heraldry", function()
+		build.skillsTab:PasteSocketGroup("Arc 20/0 Default  1\nHerald of Thunder 20/0 Default  1\n")
+		runCallback("OnFrame")
+		
+		assert.are.equals(0.5, build.calcsTab.calcsOutput.LightningEffMult)
+				
+		build.configTab.input.customMods = [[
+		Nearby Enemies have Cold Exposure while you are affected by Herald of Ice
+		Nearby Enemies have Fire Exposure while you are affected by Herald of Ash
+		Nearby Enemies have Lightning Exposure while you are affected by Herald of Thunder
+		]]
+		build.configTab:BuildModList()
+		runCallback("OnFrame")
+
+		assert.are.equals(0.6, build.calcsTab.calcsOutput.LightningEffMult)
+	end)
+	
+	it("Enemy self curse effect", function()
+		build.skillsTab:PasteSocketGroup("Arc 20/0 Default  1\nConductivity 14/0 Default  1\n")
+		runCallback("OnFrame")
+		
+		assert.are.equals(0.8, build.calcsTab.calcsOutput.LightningEffMult)
+				
+		build.configTab.input.customMods = [[
+		Nearby Enemies have 20% increased Effect of Curses on them
+		]]
+		build.configTab:BuildModList()
+		runCallback("OnFrame")
+
+		assert.are.equals(0.86, build.calcsTab.calcsOutput.LightningEffMult)
+	end)
 end)

src/Classes/CalcBreakdownControl.lua

@@ -457,7 +457,7 @@ function CalcBreakdownClass:AddModSection(sectionData, modList)
 				elseif tag.type == "MultiplierThreshold" or tag.type == "StatThreshold" then
 					desc = "If "..self:FormatVarNameOrList(tag.var or tag.stat, tag.varList or tag.statList)..(tag.upper and " <= " or " >= ")..(tag.thresholdPercent and tag.thresholdPercent.."% " or "")..(tag.threshold or self:FormatModName(tag.thresholdVar or tag.thresholdStat))
 				elseif tag.type == "SkillName" then
-					desc = "Skill: "..(tag.skillNameList and table.concat(tag.skillNameList, "/") or tag.skillName)
+					desc = "Skill: "..(tag.skillNameList and table.concat(tag.skillNameList, " / ") or tag.skillName)
 				elseif tag.type == "SkillId" then
 					desc = "Skill: "..build.data.skills[tag.skillId].name
 				elseif tag.type == "SkillType" then
@@ -494,7 +494,7 @@ function CalcBreakdownClass:FormatModName(modName)
 end
 
 function CalcBreakdownClass:FormatVarNameOrList(var, varList)
-	return var and self:FormatModName(var) or table.concat(varList, "/")
+	return var and self:FormatModName(var) or self:FormatModName(table.concat(varList, " / "))
 end
 
 function CalcBreakdownClass:FormatModBase(mod, base)

src/Classes/ImportTab.lua

@@ -1126,7 +1126,7 @@ function ImportTabClass:ImportSocketedItems(item, socketedItems, slotName)
 					itemSocketGroupList[groupID] = { label = "", enabled = true, gemList = { }, slot = slotName }
 				end
 				local socketGroup = itemSocketGroupList[groupID]
-				if not socketedItem.support and socketGroup.gemList[1] and socketGroup.gemList[1].support and item.title ~= "Dialla's Malefaction" then
+				if not socketedItem.support and socketGroup.gemList[1] and socketGroup.gemList[1].support and not item.title:match("Dialla's Malefaction") then
 					-- If the first gemInstance is a support gemInstance, put the first active gemInstance before it
 					t_insert(socketGroup.gemList, 1, gemInstance)
 				else

src/Classes/Item.lua

@@ -1438,6 +1438,7 @@ function ItemClass:BuildModListForSlotNum(baseList, slotNum)
 		local weaponData = { }
 		self.weaponData[slotNum] = weaponData
 		weaponData.type = self.base.type
+		weaponData.subType = self.base.subType
 		weaponData.name = self.name
 		weaponData.AttackSpeedInc = calcLocal(modList, "Speed", "INC", ModFlag.Attack) + m_floor(self.quality / 8 * calcLocal(modList, "AlternateQualityLocalAttackSpeedPer8Quality", "INC", 0))
 		weaponData.AttackRate = round(self.base.weapon.AttackRateBase * (1 + weaponData.AttackSpeedInc / 100), 2)
@@ -1552,7 +1553,7 @@ function ItemClass:BuildModListForSlotNum(baseList, slotNum)
 		end
 
 		if self.base.armour.BlockChance then
-			armourData.BlockChance = m_floor((self.base.armour.BlockChance + calcLocal(modList, "BlockChance", "BASE", 0)) * (1 + calcLocal(modList, "BlockChance", "INC", 0) / 100))
+			armourData.BlockChance = m_floor((self.base.armour.BlockChance * (1 + calcLocal(modList, "BlockChance", "INC", 0) / 100) + calcLocal(modList, "BlockChance", "BASE", 0)))
 		end
 		if self.base.armour.MovementPenalty then
 			modList:NewMod("MovementSpeed", "INC", -self.base.armour.MovementPenalty, self.modSource, { type = "Condition", var = "IgnoreMovementPenalties", neg = true })

src/Classes/ItemsTab.lua

@@ -1542,6 +1542,14 @@ end
 function ItemsTabClass:CreateDisplayItemFromRaw(itemRaw, normalise)
 	local newItem = new("Item", itemRaw)
 	if newItem.base then
+		-- if the new item is an amulet and does not have an anoint and your current amulet does, apply that anoint to the new item
+		if newItem.base.type == "Amulet" and #newItem.enchantModLines == 0 and self.activeItemSet["Amulet"].selItemId > 0 then
+			local currentAnoint = self.items[self.activeItemSet["Amulet"].selItemId].enchantModLines
+			if currentAnoint and #currentAnoint == 1 then -- skip if amulet has more than one anoint e.g. Stranglegasp
+				newItem.enchantModLines = currentAnoint
+				newItem:BuildAndParseRaw()
+			end
+		end
 		if normalise then
 			newItem:NormaliseQuality()
 			newItem:BuildModList()
@@ -3344,7 +3352,7 @@ function ItemsTabClass:AddItemTooltip(tooltip, item, slot, dbMode)
 	if base.weapon then
 		-- Weapon-specific info
 		local weaponData = item.weaponData[slotNum]
-		tooltip:AddLine(fontSizeBig, s_format("^x7F7F7F%s", self.build.data.weaponTypeInfo[base.type].label or base.type), "FONTIN SC")
+		tooltip:AddLine(fontSizeBig, s_format("^x7F7F7F%s", self.build.data.weaponTypeInfo[base.type].label or base.subType or base.type), "FONTIN SC")
 		if item.quality > 0 then
 			tooltip:AddLine(fontSizeBig, s_format("^x7F7F7FQuality: "..colorCodes.MAGIC.."+%d%%", item.quality), "FONTIN SC")
 		end
@@ -3599,7 +3607,7 @@ function ItemsTabClass:AddItemTooltip(tooltip, item, slot, dbMode)
 		end
 
 		if flavourTable then
-			if item.title == "Grand Spectrum" then
+			if item.title:match("Grand Spectrum") then
 				local selectedFlavourId = nil
 				for _, lineEntry in ipairs(tooltip.lines or {}) do
 					local lineText = lineEntry.text or ""
@@ -3899,7 +3907,7 @@ function ItemsTabClass:AddItemTooltip(tooltip, item, slot, dbMode)
 		-- Build sorted list of slots to compare with
 		local compareSlots = { }
 		for slotName, slot in pairs(self.slots) do
-			if self:IsItemValidForSlot(item, slotName) and not slot.inactive and (not slot.weaponSet or slot.weaponSet == (self.activeItemSet.useSecondWeaponSet and 2 or 1)) then
+			if self:IsItemValidForSlot(item, slotName) and not slot.inactive and (not slot.weaponSet or slot.weaponSet == (self.activeItemSet.useSecondWeaponSet and 2 or 1)) and slot.shown() then
 				t_insert(compareSlots, slot)
 			end
 		end

src/Classes/ModStore.lua

@@ -631,7 +631,7 @@ function ModStoreClass:EvalMod(mod, cfg, globalLimits)
 			end
 			if tag.searchCond then
 				for slot, item in pairs(items) do
-					if (not tag.allSlots or tag.allSlots and item.type ~= "Jewel") and slot ~= itemSlot or not tag.excludeSelf then
+					if (not tag.allSlots or tag.allSlots and (item.type ~= "Jewel" and item.type ~= "Graft")) and slot ~= itemSlot or not tag.excludeSelf then
 						t_insert(matches, item:FindModifierSubstring(tag.searchCond:lower(), slot:lower()))
 					end
 				end

src/Classes/PassiveTreeView.lua

@@ -795,7 +795,7 @@ function PassiveTreeViewClass:Draw(build, viewPort, inputEvents)
 					local outerSize = radData.outer * scale
 					local innerSize = radData.inner * scale * 1.06
 					SetDrawColor(1,1,1,0.7)
-					if jewel.title == "Impossible Escape" then
+					if jewel.title:match("Impossible Escape") then
 						-- Impossible Escape ring shows on the allocated Keystone
 						for keystoneName, _ in pairs(jewel.jewelData.impossibleEscapeKeystones) do
 							local keystone = spec.tree.keystoneMap[keystoneName]
@@ -1230,9 +1230,17 @@ function PassiveTreeViewClass:AddNodeTooltip(tooltip, node, build)
 			end
 		end
 	end
+	local goldCost = data.goldRespecPrices[build.characterLevel]
+	if node.ascendancyName then
+		goldCost = goldCost * 5
+	end
 	if node.depends and #node.depends > 1 then
 		tooltip:AddSeparator(14)
 		tooltip:AddLine(14, "^7"..#node.depends .. " points gained from unallocating these nodes")
+		tooltip:AddLine(14, "^xFFD700"..formatNumSep(#node.depends * goldCost) .. " Gold ^7required to unallocate these nodes")
+		tooltip:AddLine(14, colorCodes.TIP)
+	elseif node.alloc then
+		tooltip:AddLine(14, "^xFFD700"..formatNumSep(#node.depends * goldCost) .. " Gold ^7required to unallocate this node")
 		tooltip:AddLine(14, colorCodes.TIP)
 	end
 	if node.type == "Socket" then