Merge branch 'dev' into timeless-memes

Author: LocalIdentity

.github/workflows/test.yml

@@ -13,10 +13,7 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v4
       - name: Run tests
-        run: busted --lua=luajit
-      - name: Report coverage
-        continue-on-error: true # May fail on server errors (of coveralls.io)
-        run: cd src; luacov-coveralls --repo-token=${{ secrets.github_token }} -e TestData -e Data -e runtime
+        run: busted --lua=luajit --no-coverage
   check_modcache:
     runs-on: ubuntu-latest
     container: ghcr.io/pathofbuildingcommunity/pathofbuilding-tests:latest

src/Classes/CalcsTab.lua

@@ -614,7 +614,7 @@ function CalcsTabClass:PowerBuilder()
 end
 
 function CalcsTabClass:CalculatePowerStat(selection, original, modified)
-	if modified.Minion and not selection.stat == "FullDPS" then
+	if modified.Minion and selection.stat ~= "FullDPS" then
 		original = original.Minion
 		modified = modified.Minion
 	end

src/Classes/ConfigTab.lua

@@ -330,6 +330,18 @@ local ConfigTabClass = newClass("ConfigTab", "UndoHandler", "ControlHost", "Cont
 					return out
 				end))
 			end
+			if varData.ifCondTrue then
+				t_insert(shownFuncs, listOrSingleIfOption(varData.ifCondTrue, function(ifOption)
+					return self.build.calcsTab.mainEnv.player.modDB.conditions[ifOption]
+				end))
+				t_insert(tooltipFuncs, listOrSingleIfTooltip(varData.ifCondTrue, function(ifOption)
+					if not launch.devModeAlt then
+						return
+					end
+					local out = "Condition state: " .. ifOption .. "=" .. tostring(self.build.calcsTab.mainEnv.player.modDB.conditions[ifOption])
+					return out
+				end))
+			end
 			if varData.ifMult then
 				t_insert(shownFuncs, listOrSingleIfOption(varData.ifMult, function(ifOption)
 					if implyCond(varData) then

src/Classes/FolderListControl.lua

@@ -9,6 +9,7 @@ local t_insert = table.insert
 local FolderListClass = newClass("FolderListControl", "ListControl", function(self, anchor, rect, subPath, onChange)
 	self.ListControl(anchor, rect, 16, "VERTICAL", false, { })
 	self.subPath = subPath or ""
+	self.sortMode = "NAME"
 	self.onChangeCallback = onChange
 
 	self.controls.path = new("PathControl", {"BOTTOM",self,"TOP"}, {0, -2, self.width, 24}, main.buildPath, self.subPath, function(newSubPath)
@@ -25,7 +26,7 @@ end)
 
 function FolderListClass:SortList()
 	if not self.list then return end
-	local sortMode = main.buildSortMode or "NAME"
+	local sortMode = self.sortMode
 
 	table.sort(self.list, function(a, b)
 		if sortMode == "EDITED" then
@@ -91,4 +92,4 @@ function FolderListClass:OnSelDelete(index, folder)
 		self.selIndex = nil
 		self.selValue = nil
 	end
-end
+end

src/Classes/GemSelectControl.lua

@@ -12,11 +12,6 @@ local m_max = math.max
 local m_floor = math.floor
 
 local toolTipText = "Prefix tag searches with a colon and exclude tags with a dash. e.g. :fire:lightning:-cold:area"
-local nonLegacyAwakened = {
-	["SupportAwakenedEmpower"] = true,
-	["SupportAwakenedEnlighten"] = true,
-	["SupportAwakenedEnhance"] = true,
-}
 local altQualMap = {
 	["Default"] = "",
 	["Alternate1"] = "Anomalous ",
@@ -121,7 +116,7 @@ function GemSelectClass:PopulateGemList()
 			local levelRequirement = gemData.grantedEffect.levels[1].levelRequirement or 1
 			if characterLevel >= levelRequirement or not matchLevel then
 				if (showExceptional or showAll) and gemData.grantedEffect.plusVersionOf then
-					if self.skillsTab.showLegacyGems or nonLegacyAwakened[gemData.grantedEffectId] or not gemData.name:match("^Awakened") then
+					if self.skillsTab.showLegacyGems or not gemData.grantedEffect.legacy then
 						self.gems["Default:" .. gemId] = gemData
 					end
 				elseif showNormal or showAll then
@@ -144,7 +139,7 @@ end
 
 function GemSelectClass:FilterSupport(gemId, gemData)
 	local showSupportTypes = self.skillsTab.showSupportGemTypes
-	if gemData.name:match("^Awakened") and not self.skillsTab.showLegacyGems and not nonLegacyAwakened[gemData.grantedEffectId] then
+	if gemData.grantedEffect.legacy and not self.skillsTab.showLegacyGems then
 		return false
 	end
 	return (not gemData.grantedEffect.support
@@ -615,6 +610,11 @@ function GemSelectClass:AddGemTooltip(gemInstance)
 		local grantedEffect = gemInstance.gemData.grantedEffect
 		self.tooltip:AddLine(fontSizeTitle, colorCodes.GEM .. altQualMap[gemInstance.qualityId]..grantedEffect.name, "FONTIN SC")
 		self.tooltip:AddSeparator(10)
+		if grantedEffect.legacy then
+			self.tooltip:AddLine(fontSizeTitle, colorCodes.WARNING .. "Legacy Gem", "FONTIN SC")
+			self.tooltip:AddLine(fontSizeBig, colorCodes.WARNING .. "Gem only exists in Standard League", "FONTIN SC")
+			self.tooltip:AddSeparator(10)
+		end
 		self.tooltip:AddLine(fontSizeBig, "^x7F7F7F" .. gemInstance.gemData.tagString, "FONTIN SC")
 		self:AddCommonGemInfo(gemInstance, grantedEffect, true, secondary and secondary.support and secondary)
 	end

src/Classes/Item.lua

@@ -1568,6 +1568,7 @@ function ItemClass:BuildModListForSlotNum(baseList, slotNum)
 		if self.base.flask.life or self.base.flask.mana then
 			-- Recovery flask
 			flaskData.instantPerc = calcLocal(modList, "FlaskInstantRecovery", "BASE", 0)
+			flaskData.instantLowLifePerc = calcLocal(modList, "FlaskLowLifeInstantRecovery", "BASE", 0)
 			local recoveryMod = 1 + calcLocal(modList, "FlaskRecovery", "INC", 0) / 100
 			local rateMod = 1 + calcLocal(modList, "FlaskRecoveryRate", "INC", 0) / 100
 			flaskData.duration = round(self.base.flask.duration * (1 + durationInc / 100) / rateMod * durationMore, 1)

src/Classes/ModStore.lua

@@ -300,7 +300,7 @@ function ModStoreClass:GetStat(stat, cfg)
 	if stat == "ManaUnreserved" and self.actor.output[stat] ~= self.actor.output[stat] then
 		-- 0% reserved = total mana
 		return self.actor.output["Mana"]
-	elseif stat == "ManaUnreserved" and not self.actor.output[stat] == nil and self.actor.output[stat] < 0 then
+	elseif stat == "ManaUnreserved" and self.actor.output[stat] ~= nil and self.actor.output[stat] < 0 then
 		-- This reverse engineers how much mana is unreserved before efficiency for accurate Arcane Cloak calcs
 		local reservedPercentBeforeEfficiency = (math.abs(self.actor.output["ManaUnreservedPercent"]) + 100) * ((100 + self.actor["ManaEfficiency"]) / 100)
 		return self.actor.output["Mana"] * (math.ceil(reservedPercentBeforeEfficiency) / 100);

src/Classes/SkillsTab.lua

@@ -50,6 +50,11 @@ Awakened gems default to their highest valid non-corrupted gem level.]],
 This hides gems with a minimum level requirement above your character level, preventing them from showing up in the dropdown list.]],
 		gemLevel = "characterLevel",
 	},
+	{
+		label = "Level 1",
+		description = "All gems default to level 1.",
+		gemLevel = "levelOne",
+	},
 }
 
 local showSupportGemTypeList = {
@@ -1053,6 +1058,8 @@ function SkillsTabClass:ProcessGemLevel(gemData)
 		end
 	elseif self.defaultGemLevel == "normalMaximum" then
 		return naturalMaxLevel
+	elseif self.defaultGemLevel == "levelOne" then
+		return 1
 	else -- self.defaultGemLevel == "characterLevel"
 		local maxGemLevel = naturalMaxLevel
 		if not grantedEffect.levels[maxGemLevel] then

src/Classes/TradeQueryGenerator.lua

@@ -916,6 +916,9 @@ function TradeQueryGeneratorClass:FinishQuery()
 
 	-- Sort by mean Stat diff rather than weight to more accurately prioritize stats that can contribute more
 	table.sort(self.modWeights, function(a, b)
+		if a.meanStatDiff == b.meanStatDiff then
+			return math.abs(a.weight) > math.abs(b.weight)
+		end
 		return a.meanStatDiff > b.meanStatDiff
 	end)
 
@@ -968,9 +971,6 @@ function TradeQueryGeneratorClass:FinishQuery()
 
 	local effective_max = MAX_FILTERS - num_extra
 
-	-- Prioritize top mods by abs(weight)
-	table.sort(self.modWeights, function(a, b) return math.abs(a.weight) > math.abs(b.weight) end)
-
 	local prioritizedMods = {}
 	for _, entry in ipairs(self.modWeights) do
 		if #prioritizedMods < effective_max then

src/Classes/TreeTab.lua

@@ -2349,31 +2349,32 @@ function TreeTabClass:FindTimelessJewel()
 						end
 						curNodeId = "totalStat"
 					end
-					if jewelDataTbl[1] >= data.timelessJewelAdditions and not isValueInTable(protectedNodes, treeData.nodes[targetNode].dn) then -- replace
-						curNode = legionNodes[jewelDataTbl[1] + 1 - data.timelessJewelAdditions]
-						curNodeId = curNode and legionNodes[jewelDataTbl[1] + 1 - data.timelessJewelAdditions].id or nil
-					else -- add
-						curNode = legionAdditions[jewelDataTbl[1] + 1]
-						curNodeId = curNode and legionAdditions[jewelDataTbl[1] + 1].id or nil
-					end
-					if desiredNodes["totalStat"] and reverseTotalModIDs[curNodeId] then
-						curNodeId = "totalStat"
-					end
-					if timelessData.jewelType.id == 1 then
-						local headerSize = #jewelDataTbl
-						if headerSize == 2 or headerSize == 3 then
-							if desiredNodes[curNodeId] then
-								resultNodes[curSeed][curNodeId] = resultNodes[curSeed][curNodeId] or { targetNodeNames = { }, totalWeight = 0 }
-								local statMod1 = curNode.stats[curNode.sortedStats[1]]
-								local weight = desiredNodes[curNodeId].nodeWeight * jewelDataTbl[statMod1.index + 1]
-								local statMod2 = curNode.stats[curNode.sortedStats[2]]
-								if statMod2 then
-									weight = weight + desiredNodes[curNodeId].nodeWeight2 * jewelDataTbl[statMod2.index + 1]
-								end
-								t_insert(resultNodes[curSeed][curNodeId], targetNode)
-								t_insert(resultNodes[curSeed][curNodeId].targetNodeNames, treeData.nodes[targetNode].name)
-								resultNodes[curSeed][curNodeId].totalWeight = resultNodes[curSeed][curNodeId].totalWeight + weight
-								seedWeights[curSeed] = seedWeights[curSeed] + weight
+				end
+			end
+			local seedWeights = { }
+			local seedMultiplier = timelessData.jewelType.id == 5 and 20 or 1 -- Elegant Hubris
+			for curSeed = data.timelessJewelSeedMin[timelessData.jewelType.id] * seedMultiplier, data.timelessJewelSeedMax[timelessData.jewelType.id] * seedMultiplier, seedMultiplier do
+				seedWeights[curSeed] = 0
+				resultNodes[curSeed] = { }
+				for targetNode in pairs(targetNodes) do
+					local jewelDataTbl = data.readLUT(curSeed, targetNode, timelessData.jewelType.id)
+					if not next(jewelDataTbl) then
+						ConPrintf("Missing LUT: " .. timelessData.jewelType.label)
+					else
+						local curNode = nil
+						local curNodeId = nil
+						if (timelessData.jewelType.id == 4 and isValueInTable(protectedNodes, treeData.nodes[targetNode].dn)) then -- protected
+							if jewelDataTbl[1] >= data.timelessJewelAdditions then -- protected node is a replacement, invalidate seed
+								resultNodes[curSeed] = nil
+								break
+							end
+							if not desiredNodes["totalStat"] then -- only add if user has not entered their own Devotion to the table
+								desiredNodes["totalStat"] = {
+									nodeWeight = 0.1, -- keeps total score low to let desired stats decide sort
+									nodeWeight2 = 0,
+									displayName = "Devotion",
+									desiredIdx = desiredIdx + 1
+								}
 							end
 						elseif headerSize == 6 or headerSize == 8 then
 							for i, jewelData in ipairs(jewelDataTbl) do
@@ -2401,74 +2402,18 @@ function TreeTabClass:FindTimelessJewel()
 						seedWeights[curSeed] = seedWeights[curSeed] + desiredNodes[curNodeId].nodeWeight
 					end
 				end
-			end
-			if desiredNodes["totalStat"] then
-				resultNodes[curSeed]["totalStat"] = resultNodes[curSeed]["totalStat"] or { targetNodeNames = { }, totalWeight = 0 }
-				if timelessData.jewelType.id == 4 then -- Militant Faith
-					local addedWeight = desiredNodes["totalStat"].nodeWeight * (5 * targetSmallNodes.otherSmalls + 10 * targetSmallNodes.attributeSmalls)
-					addedWeight = addedWeight + resultNodes[curSeed]["totalStat"].totalWeight * 4
-					resultNodes[curSeed]["totalStat"].totalWeight = resultNodes[curSeed]["totalStat"].totalWeight + addedWeight
-					seedWeights[curSeed] = seedWeights[curSeed] + addedWeight
-				else
-					local addedWeight = desiredNodes["totalStat"].nodeWeight * (4 * targetSmallNodes.otherSmalls + 2 * targetSmallNodes.attributeSmalls)
-					addedWeight = addedWeight + resultNodes[curSeed]["totalStat"].totalWeight * 19
-					resultNodes[curSeed]["totalStat"].totalWeight = resultNodes[curSeed]["totalStat"].totalWeight + addedWeight
-					seedWeights[curSeed] = seedWeights[curSeed] + addedWeight
-				end
-			end
-			-- check minimum weights
-			for _, val in ipairs(minimumWeights) do
-				if (resultNodes[curSeed][val.reqNode] and resultNodes[curSeed][val.reqNode].totalWeight or 0) < val.weight then
-					resultNodes[curSeed] = nil
-					break
-				end
-			end
-		end
-		
-		return {
-			resultNodes = resultNodes,
-			seedWeights = seedWeights,
-			desiredNodes = desiredNodes,
-			socketInfo = socketInfo
-		}
-	end
-
-	local function formatSearchValue(input)
-		local   matchPattern1 = " 0"
-		local replacePattern1 = "   "
-		local   matchPattern2 = ".0 "
-		local replacePattern2 = "    "
-		local   matchPattern3 = "  %."
-		local replacePattern3 = "0."
-		local   matchPattern4 = "%.([0-9])0"
-		local replacePattern4 = ".%1  "
-		return (" " .. s_format("%006.2f", input))
-		:gsub(matchPattern1, replacePattern1):gsub(matchPattern1, replacePattern1)
-		:gsub(matchPattern2, replacePattern2):gsub(matchPattern2, replacePattern2)
-		:gsub(matchPattern3, replacePattern3)
-		:gsub(matchPattern4, replacePattern4)
-	end
-
-	local function formatResults(resultNodes, seedWeights, desiredNodes, socketInfo)
-		local results = { }
-		for seedMatch, seedData in pairs(resultNodes) do
-			-- filter out the results so that only the ones that beat the total minimum weight parameter remain in search results
-			local passesMin = (not timelessData.totalMinimumWeight) or (seedWeights[seedMatch] >= timelessData.totalMinimumWeight)
-			if seedWeights[seedMatch] > 0 and passesMin then
-				local labelPrefix = socketInfo and (socketInfo.label .. " | ") or ""
-				local result = { 
-					label = labelPrefix .. seedMatch .. ":",
-					seed = seedMatch,
-					total = seedWeights[seedMatch]
-				}
-				if socketInfo then
-					result.socketId = socketInfo.id
-					result.socketLabel = socketInfo.label
-				end
-				if timelessData.jewelType.id == 1 or timelessData.jewelType.id == 3 then
-					-- Glorious Vanity [100-8000], Brutal Restraint [500-8000]
-					if seedMatch < 1000 then
-						result.label = "  " .. result.label
+				if resultNodes[curSeed] and desiredNodes["totalStat"] then
+					resultNodes[curSeed]["totalStat"] = resultNodes[curSeed]["totalStat"] or { targetNodeNames = { }, totalWeight = 0 }
+					if timelessData.jewelType.id == 4 then -- Militant Faith
+						local addedWeight = desiredNodes["totalStat"].nodeWeight * (5 * targetSmallNodes.otherSmalls + 10 * targetSmallNodes.attributeSmalls)
+						addedWeight = addedWeight + resultNodes[curSeed]["totalStat"].totalWeight * 4
+						resultNodes[curSeed]["totalStat"].totalWeight = resultNodes[curSeed]["totalStat"].totalWeight + addedWeight
+						seedWeights[curSeed] = seedWeights[curSeed] + addedWeight
+					else
+						local addedWeight = desiredNodes["totalStat"].nodeWeight * (4 * targetSmallNodes.otherSmalls + 2 * targetSmallNodes.attributeSmalls)
+						addedWeight = addedWeight + resultNodes[curSeed]["totalStat"].totalWeight * 19
+						resultNodes[curSeed]["totalStat"].totalWeight = resultNodes[curSeed]["totalStat"].totalWeight + addedWeight
+						seedWeights[curSeed] = seedWeights[curSeed] + addedWeight
 					end
 				elseif timelessData.jewelType.id == 4 then
 					-- Militant Faith [2000-10000]
@@ -2483,18 +2428,13 @@ function TreeTabClass:FindTimelessJewel()
 						result.label = "  " .. result.label
 					end
 				end
-				local sortedNodeArray = { }
-				for legionId, desiredNode in pairs(desiredNodes) do
-					if seedData[legionId] then
-						if desiredNode.desiredIdx == 8 then
-							sortedNodeArray[8] = " ..."
-						elseif desiredNode.desiredIdx < 8 then
-							sortedNodeArray[desiredNode.desiredIdx] = formatSearchValue(seedData[legionId].totalWeight)
+				if resultNodes[curSeed] then
+					-- check minimum weights
+					for _, val in ipairs(minimumWeights) do
+						if (resultNodes[curSeed][val.reqNode] and resultNodes[curSeed][val.reqNode].totalWeight or 0) < val.weight then
+							resultNodes[curSeed] = nil
+							break
 						end
-						result[legionId] = result[legionId] or { }
-						result[legionId].targetNodeNames = seedData[legionId].targetNodeNames
-					elseif desiredNode.desiredIdx < 8 then
-						sortedNodeArray[desiredNode.desiredIdx] = "     0     "
 					end
 				end
 				result.label = result.label .. t_concat(sortedNodeArray)