Merge branch 'dev'

Author: LocalIdentity

Classes/CalcBreakdownControl.lua

@@ -70,7 +70,12 @@ function CalcBreakdownClass:SetBreakdownData(displayData, pinned)
 		if section.type == "TEXT" then
 			section.width = 0
 			for _, line in ipairs(section.lines) do
-				section.width = m_max(section.width, DrawStringWidth(section.textSize, "VAR", line) + 8)
+				local _, num = string.gsub(line, "%d%d%d%d", "") -- count how many commas will be added
+				if main.showThousandsCalcs and num > 0 then
+					section.width = m_max(section.width, DrawStringWidth(section.textSize, "VAR", line) + 8 + (4 * num))
+				else
+					section.width = m_max(section.width, DrawStringWidth(section.textSize, "VAR", line) + 8)
+				end
 			end
 			section.height = #section.lines * section.textSize + 4
 		elseif section.type == "TABLE" then
@@ -79,20 +84,27 @@ function CalcBreakdownClass:SetBreakdownData(displayData, pinned)
 			for _, col in pairs(section.colList) do
 				for _, row in pairs(section.rowList) do
 					if row[col.key] then
-						col.width = m_max(col.width or 0, DrawStringWidth(16, "VAR", col.label) + 6, DrawStringWidth(12, "VAR", row[col.key]) + 6)
+						local _, num = string.gsub(row[col.key], "%d%d%d%d", "") -- count how many commas will be added
+						if main.showThousandsCalcs and num > 0 then
+							col.width = m_max(col.width or 0, DrawStringWidth(16, "VAR", col.label) + 6, DrawStringWidth(12, "VAR", row[col.key]) + 6 + (4 * num))
+						else 
+							col.width = m_max(col.width or 0, DrawStringWidth(16, "VAR", col.label) + 6, DrawStringWidth(12, "VAR", row[col.key]) + 6)
+						end
 					end
 				end
 				if col.width then
 					section.width = section.width + col.width
 				end
 			end
-			if section.label then
-				section.width = m_max(section.width, 6 + DrawStringWidth(16, "VAR", section.label..":"))
-			end
 			section.height = #section.rowList * 14 + 20
 			if section.label then
+				self.contentWidth = m_max(self.contentWidth, 6 + DrawStringWidth(16, "VAR", section.label..":"))
 				section.height = section.height + 16
 			end
+			if section.footer then
+				self.contentWidth = m_max(self.contentWidth, 6 + DrawStringWidth(12, "VAR", section.footer))
+				section.height = section.height + 12
+			end
 		end
 		self.contentWidth = m_max(self.contentWidth, section.width)
 		section.offset = offset
@@ -139,6 +151,7 @@ function CalcBreakdownClass:AddBreakdownSection(sectionData)
 		local section = {
 			type = "TABLE",
 			label = breakdown.label,
+			footer = breakdown.footer,
 			rowList = breakdown.rowList,
 			colList = breakdown.colList,
 		}
@@ -506,7 +519,7 @@ function CalcBreakdownClass:DrawBreakdownTable(viewPort, x, y, section)
 			if index > 1 then
 				-- Skip the separator for the first column
 				SetDrawColor(0.5, 0.5, 0.5)
-				DrawImage(nil, colX - 2, y, 1, section.label and section.height - 16 or section.height)
+				DrawImage(nil, colX - 2, y, 1, section.height - (section.label and 16 or 0) - (section.footer and 12 or 0))
 			end
 			SetDrawColor(1, 1, 1)
 			DrawString(colX, y + 2, "LEFT", 16, "VAR", col.label)
@@ -521,8 +534,15 @@ function CalcBreakdownClass:DrawBreakdownTable(viewPort, x, y, section)
 		for _, col in ipairs(section.colList) do
 			if col.width and row[col.key] then
 				-- This row has an entry for this column, draw it
-				if col.right then
+				local _, alpha = string.gsub(row[col.key], "%a", " ") -- counts letters in the string
+				local _, notes = string.gsub(row[col.key], " to ", " ") -- counts " to " in the string
+				local _, paren = string.gsub(row[col.key], "%b()", " ") -- counts parenthesis in the string
+				if main.showThousandsCalcs and (alpha == 0 or notes > 0 or paren > 0) and col.right then
+					DrawString(col.x + col.width - 4, rowY + 1, "RIGHT_X", 12, "VAR", "^7"..formatNumSep(tostring(row[col.key])))
+				elseif col.right then
 					DrawString(col.x + col.width - 4, rowY + 1, "RIGHT_X", 12, "VAR", "^7"..row[col.key])
+				elseif main.showThousandsCalcs and (alpha == 0 or notes > 0 or paren > 0) then
+					DrawString(col.x, rowY + 1, "LEFT", 12, "VAR", "^7"..formatNumSep(tostring(row[col.key])))
 				else
 					DrawString(col.x, rowY + 1, "LEFT", 12, "VAR", "^7"..row[col.key])
 				end
@@ -564,6 +584,10 @@ function CalcBreakdownClass:DrawBreakdownTable(viewPort, x, y, section)
 		end
 		rowY = rowY + 14
 	end
+	if section.footer then
+		-- Draw table footer if able
+		DrawString(x + 2, rowY, "LEFT", 12, "VAR", "^7"..section.footer)
+	end
 end
 
 function CalcBreakdownClass:DrawRadiusVisual(x, y, width, height, radius)
@@ -650,7 +674,12 @@ function CalcBreakdownClass:Draw(viewPort)
 			local lineY = sectionY + 2
 			for i, line in ipairs(section.lines) do
 				SetDrawColor(1, 1, 1)
-				DrawString(x + 4, lineY, "LEFT", section.textSize, "VAR", line)
+				local _, dec = string.gsub(line, "%.%d%d.", " ") -- counts decimals with 2 or more digits
+				if main.showThousandsCalcs and dec == 0 then
+					DrawString(x + 4, lineY, "LEFT", section.textSize, "VAR", formatNumSep(line))
+				else
+					DrawString(x + 4, lineY, "LEFT", section.textSize, "VAR", line)
+				end
 				lineY = lineY + section.textSize
 			end
 		elseif section.type == "TABLE" then

Classes/CalcsTab.lua

@@ -453,8 +453,11 @@ function CalcsTabClass:PowerBuilder()
 	local cache = { }
 	local newPowerMax = {
 		singleStat = 0,
+		singleStatPerPoint = 0,
 		offence = 0,
-		defence = 0
+		offencePerPoint = 0,
+		defence = 0,
+		defencePerPoint = 0
 	}
 	if not self.powerMax then
 		self.powerMax = newPowerMax
@@ -472,8 +475,10 @@ function CalcsTabClass:PowerBuilder()
 			local output = cache[node.modKey]
 			if self.powerStat and self.powerStat.stat and not self.powerStat.ignoreForNodes then
 				node.power.singleStat = self:CalculatePowerStat(self.powerStat, output, calcBase)
-				if node.path then
+				if (node.path or node.recipe) and not node.ascendancyName then
 					newPowerMax.singleStat = m_max(newPowerMax.singleStat, node.power.singleStat)
+					local pathCost = node.path and #node.path or 1
+					newPowerMax.singleStatPerPoint = m_max(node.power.singleStat / pathCost, newPowerMax.singleStatPerPoint)
 				end
 			else
 				if calcBase.Minion then
@@ -487,9 +492,13 @@ function CalcsTabClass:PowerBuilder()
 								(output.Evasion - calcBase.Evasion) / m_max(10000, calcBase.Evasion) +
 								(output.LifeRegen - calcBase.LifeRegen) / 500 +
 								(output.EnergyShieldRegen - calcBase.EnergyShieldRegen) / 1000
-				if node.path then
+				if (node.path or node.recipe) and not node.ascendancyName then
 					newPowerMax.offence = m_max(newPowerMax.offence, node.power.offence)
 					newPowerMax.defence = m_max(newPowerMax.defence, node.power.defence)
+					local pathCost = node.path and #node.path or 1
+					newPowerMax.offencePerPoint = m_max(newPowerMax.offencePerPoint, node.power.offence / pathCost)
+					newPowerMax.defencePerPoint = m_max(newPowerMax.defencePerPoint, node.power.defence / pathCost)
+
 				end
 			end
 		end

Classes/ItemDBControl.lua

@@ -51,7 +51,7 @@ local ItemDBClass = newClass("ItemDBControl", "ListControl", function(self, anch
 	t_insert(self.typeList, 4, "One Handed Melee")
 	t_insert(self.typeList, 5, "Two Handed Melee")
 	self.slotList = { "Any slot", "Weapon 1", "Weapon 2", "Helmet", "Body Armour", "Gloves", "Boots", "Amulet", "Ring", "Belt", "Jewel" }
-	local baseY = dbType == "RARE" and -22 or -42
+	local baseY = dbType == "RARE" and -22 or -62
 	self.controls.slot = new("DropDownControl", {"BOTTOMLEFT",self,"TOPLEFT"}, 0, baseY, 179, 18, self.slotList, function(index, value)
 		self.listBuildFlag = true
 	end)
@@ -65,6 +65,9 @@ local ItemDBClass = newClass("ItemDBControl", "ListControl", function(self, anch
 		self.controls.league = new("DropDownControl", {"LEFT",self.controls.sort,"RIGHT"}, 2, 0, 179, 18, self.leagueList, function(index, value)
 			self.listBuildFlag = true
 		end)
+		self.controls.requirement = new("DropDownControl", {"LEFT",self.controls.sort,"BOTTOMLEFT"}, 0, 11, 179, 18, { "Any requirements", "Current level", "Current attributes", "Current useable" }, function(index, value)
+			self.listBuildFlag = true
+		end)
 	end
 	self.controls.search = new("EditControl", {"BOTTOMLEFT",self,"TOPLEFT"}, 0, -2, 258, 18, "", "Search", "%c", 100, function()
 		self.listBuildFlag = true
@@ -107,6 +110,14 @@ function ItemDBClass:DoesItemMatchFilters(item)
 			return false
 		end
 	end
+	if self.dbType == "UNIQUE" and self.controls.requirement.selIndex > 1 then
+		if (self.controls.requirement.selIndex == 2 or self.controls.requirement.selIndex == 4) and item.requirements.level and item.requirements.level > self.itemsTab.build.characterLevel then
+			return false
+		end
+		if self.controls.requirement.selIndex > 2 and item.requirements and (item.requirements.str > self.itemsTab.build.calcsTab.mainOutput.Str or item.requirements.dex > self.itemsTab.build.calcsTab.mainOutput.Dex or item.requirements.int > self.itemsTab.build.calcsTab.mainOutput.Int) then
+			return false
+		end
+	end
 	local searchStr = self.controls.search.buf:lower()
 	if searchStr:match("%S") then
 		local found = false

Classes/ItemsTab.lua

@@ -201,7 +201,7 @@ local ItemsTabClass = newClass("ItemsTab", "UndoHandler", "ControlHost", "Contro
 	-- Unique database
 	self.controls.uniqueDB = new("ItemDBControl", {"TOPLEFT",self.controls.itemList,"BOTTOMLEFT"}, 0, 76, 360, function(c) return m_min(244, self.maxY - select(2, c:GetPos())) end, self, main.uniqueDB[build.targetVersion], "UNIQUE")
 	self.controls.uniqueDB.y = function()
-		return self.controls.selectDBLabel:IsShown() and 98 or 76
+		return self.controls.selectDBLabel:IsShown() and 118 or 96
 	end
 	self.controls.uniqueDB.shown = function()
 		return not self.controls.selectDBLabel:IsShown() or self.controls.selectDB.selIndex == 1
@@ -210,7 +210,7 @@ local ItemsTabClass = newClass("ItemsTab", "UndoHandler", "ControlHost", "Contro
 	-- Rare template database
 	self.controls.rareDB = new("ItemDBControl", {"TOPLEFT",self.controls.itemList,"BOTTOMLEFT"}, 0, 76, 360, function(c) return m_min(260, self.maxY - select(2, c:GetPos())) end, self, main.rareDB[build.targetVersion], "RARE")
 	self.controls.rareDB.y = function()
-		return self.controls.selectDBLabel:IsShown() and 78 or 376
+		return self.controls.selectDBLabel:IsShown() and 78 or 396
 	end
 	self.controls.rareDB.shown = function()
 		return not self.controls.selectDBLabel:IsShown() or self.controls.selectDB.selIndex == 2
@@ -343,7 +343,7 @@ If there's 2 slots an item can go in, holding Shift will put it in the second.]]
 	end
 
 	-- Section: Enchant / Anoint / Corrupt
-	self.controls.displayItemSectionEnchant = new("Control", {"TOPLEFT",self.controls.displayItemSectionSockets,"BOTTOMLEFT",true}, 0, 0, 0, function()
+	self.controls.displayItemSectionEnchant = new("Control", {"TOPLEFT",self.controls.displayItemSectionSockets,"BOTTOMLEFT"}, 0, 0, 0, function()
 		return (self.controls.displayItemEnchant:IsShown() or self.controls.displayItemEnchant2:IsShown() or self.controls.displayItemAnoint:IsShown() or self.controls.displayItemAnoint2:IsShown() or self.controls.displayItemCorrupt:IsShown() ) and 28 or 0
 	end)
 	self.controls.displayItemEnchant = new("ButtonControl", {"TOPLEFT",self.controls.displayItemSectionEnchant,"TOPLEFT"}, 0, 0, 160, 20, "Apply Enchantment...", function()
@@ -541,6 +541,56 @@ If there's 2 slots an item can go in, holding Shift will put it in the second.]]
 					if mod.modTags and #mod.modTags > 0 then
 						tooltip:AddLine(16, "Tags: "..table.concat(mod.modTags, ', '))
 					end
+
+					local notableName = mod[1] and mod[1]:match("1 Added Passive Skill is (.*)")
+					local node = notableName and self.build.spec.tree.clusterNodeMap[notableName]
+					if node then
+						tooltip:AddSeparator(14)
+
+						-- Node name
+						self.socketViewer:AddNodeName(tooltip, node, self.build)
+
+						-- Node description
+						if node.sd[1] then
+							tooltip:AddLine(16, "")
+							for i, line in ipairs(node.sd) do
+								tooltip:AddLine(16, ((node.mods[i].extra or not node.mods[i].list) and colorCodes.UNSUPPORTED or colorCodes.MAGIC)..line)
+							end
+						end
+
+						-- Reminder text
+						if node.reminderText then
+							tooltip:AddSeparator(14)
+							for _, line in ipairs(node.reminderText) do
+								tooltip:AddLine(14, "^xA0A080"..line)
+							end
+						end
+
+						-- Comparison
+						tooltip:AddSeparator(14)
+						self:AppendAnointTooltip(tooltip, node, "Allocating")
+
+						-- Information of for this notable appears
+						local clusterInfo = self.build.data.clusterJewelInfoForNotable[notableName]
+						if clusterInfo then
+							tooltip:AddSeparator(14)
+							tooltip:AddLine(20, "^7"..notableName.." can appear on:")
+							local isFirstSize = true
+							for size, v in pairs(clusterInfo.size) do
+								tooltip:AddLine(18, colorCodes.MAGIC..size..":")
+								local sizeSkills = self.build.data.clusterJewels.jewels[size].skills
+								for i, type in ipairs(clusterInfo.jewelTypes) do
+									if sizeSkills[type] then
+										tooltip:AddLine(14, "^7    "..sizeSkills[type].name)
+									end
+								end
+								if not isFirstSize then
+									tooltip:AddLine(10, "")
+								end
+								isFirstSize = false
+							end
+						end
+					end
 				else
 					tooltip:AddLine(16, "^7"..#modList.." Tiers")
 					local minMod = self.displayItem.affixes[modList[1]]
@@ -825,13 +875,15 @@ function ItemsTabClass:Draw(viewPort, inputEvents)
 	self.controls.scrollBarV.y = viewPort.y
 	do
 		local maxY = select(2, self.lastSlot:GetPos()) + 24
+		local maxX = self.anchorDisplayItem:GetPos() + 462
 		if self.displayItem then
 			local x, y = self.controls.displayItemTooltipAnchor:GetPos()
-			local ttW, ttH = self.displayItemTooltip:GetSize()
+			local ttW, ttH = self.displayItemTooltip:GetDynamicSize(viewPort)
 			maxY = m_max(maxY, y + ttH + 4)
+			maxX = m_max(maxX, x + ttW + 80)
 		end
 		local contentHeight = maxY - self.y
-		local contentWidth = self.anchorDisplayItem:GetPos() + 462 - self.x
+		local contentWidth = maxX - self.x
 		local v = contentHeight > viewPort.height
 		local h = contentWidth > viewPort.width - (v and 20 or 0)
 		if h then
@@ -1270,6 +1322,11 @@ function ItemsTabClass:CraftClusterJewel()
 	local item = self.displayItem
 	wipeTable(item.enchantModLines)
 	t_insert(item.enchantModLines, { line = "Adds "..(item.clusterJewelNodeCount or item.clusterJewel.maxNodes).." Passive Skills", crafted = true })
+	if item.clusterJewel.size == "Large" then
+		t_insert(item.enchantModLines, { line = "2 Added Passive Skills are Jewel Sockets", crafted = true })
+	elseif item.clusterJewel.size == "Medium" then
+		t_insert(item.enchantModLines, { line = "1 Added Passive Skill is a Jewel Socket", crafted = true })
+	end
 	local skill = item.clusterJewel.skills[item.clusterJewelSkill]
 	t_insert(item.enchantModLines, { line = table.concat(skill.enchant, "\n"), crafted = true })
 	item:BuildAndParseRaw()
@@ -1798,38 +1855,42 @@ end
 ---Appends tooltip information for anointing a new passive tree node onto the currently editing amulet
 ---@param tooltip table @The tooltip to append into
 ---@param node table @The passive tree node that will be anointed, or nil to remove the current anoint.
-function ItemsTabClass:AppendAnointTooltip(tooltip, node)
+function ItemsTabClass:AppendAnointTooltip(tooltip, node, actionText)
 	if not self.displayItem then
 		return
 	end
 
+	if not actionText then
+		actionText = "Anointing"
+	end
+
 	local header
 	if node then
 		if self.build.spec.allocNodes[node.id] then
-			tooltip:AddLine(14, "^7Anointing "..node.dn.." changes nothing because this node is already allocated on the tree.")
+			tooltip:AddLine(14, "^7"..actionText.." "..node.dn.." changes nothing because this node is already allocated on the tree.")
 			return
 		end
 
 		local curAnoints = self:getAnoint(self.displayItem)
 		if curAnoints and #curAnoints > 0 then
 			for _, curAnoint in ipairs(curAnoints) do
 				if curAnoint == node.dn then
-					tooltip:AddLine(14, "^7Anointing "..node.dn.." changes nothing because this node is already anointed.")
+					tooltip:AddLine(14, "^7"..actionText.." "..node.dn.." changes nothing because this node is already anointed.")
 					return
 				end
 			end
 		end
 
-		header = "^7Anointing "..node.dn.." will give you: "
+		header = "^7"..actionText.." "..node.dn.." will give you: "
 	else
-		header = "^7Anointing nothing will give you: "
+		header = "^7"..actionText.." nothing will give you: "
 	end
 	local calcFunc = self.build.calcsTab:GetMiscCalculator()
 	local outputBase = calcFunc({ repSlotName = "Amulet", repItem = self.displayItem })
 	local outputNew = calcFunc({ repSlotName = "Amulet", repItem = self:anointItem(node) })
 	local numChanges = self.build:AddStatComparesToTooltip(tooltip, outputBase, outputNew, header)
 	if node and numChanges == 0 then
-		tooltip:AddLine(14, "^7Anointing "..node.dn.." changes nothing.")
+		tooltip:AddLine(14, "^7"..actionText.." "..node.dn.." changes nothing.")
 	end
 end
 

Classes/PassiveTreeView.lua

@@ -470,6 +470,17 @@ function PassiveTreeViewClass:Draw(build, viewPort, inputEvents)
 					-- Calculate color based on a single stat
 					local stat = m_max(node.power.singleStat or 0, 0)
 					local statCol = (stat / build.calcsTab.powerMax.singleStat * 1.5) ^ 0.5
+					local path = (node.alloc and node.depends) or self.tracePath or node.path or { }
+					local pathCost = #path == 0 and 1 or #path
+					if(stat ~= 0) then
+						if(self.heatMapStatPerPoint and self.heatMapTopPick) then
+							statCol = stat / pathCost == build.calcsTab.powerMax.singleStatPerPoint and 1.5 ^ 0.5 or 0
+						elseif self.heatMapStatPerPoint then
+							statCol = statCol / pathCost * 4
+						elseif self.heatMapTopPick then
+							statCol = stat == build.calcsTab.powerMax.singleStat and 1.5 ^ 0.5 or 0
+						end
+					end
 					if main.nodePowerTheme == "RED/BLUE" then
 						SetDrawColor(statCol, 0, 0)
 					elseif main.nodePowerTheme == "RED/GREEN" then
@@ -483,6 +494,18 @@ function PassiveTreeViewClass:Draw(build, viewPort, inputEvents)
 					local defence = m_max(node.power.defence or 0, 0)
 					local dpsCol = (offence / build.calcsTab.powerMax.offence * 1.5) ^ 0.5
 					local defCol = (defence / build.calcsTab.powerMax.defence * 1.5) ^ 0.5
+					local path = (node.alloc and node.depends) or self.tracePath or node.path or { }
+					local pathCost = #path == 0 and 1 or #path
+					if(self.heatMapStatPerPoint and self.heatMapTopPick) then
+						dpsCol = offence / pathCost == build.calcsTab.powerMax.offencePerPoint and 1.5 ^ 0.5 or 0
+						defCol = defence / pathCost == build.calcsTab.powerMax.defencePerPoint and 1.5 ^ 0.5 or 0
+					elseif self.heatMapStatPerPoint then
+						dpsCol = dpsCol / pathCost * 4
+						defCol = defCol / pathCost * 4
+					elseif self.heatMapTopPick then
+						dpsCol = offence == build.calcsTab.powerMax.offence and 1.5 ^ 0.5 or 0
+						defCol = defence == build.calcsTab.powerMax.defence and 1.5 ^ 0.5 or 0
+					end
 					local mixCol = (m_max(dpsCol - 0.5, 0) + m_max(defCol - 0.5, 0)) / 2
 					if main.nodePowerTheme == "RED/BLUE" then
 						SetDrawColor(dpsCol, mixCol, defCol)

Classes/SkillsTab.lua

@@ -69,11 +69,11 @@ local SkillsTabClass = newClass("SkillsTab", "UndoHandler", "ControlHost", "Cont
 		self.sortGemsByDPSField = value.type
 	end)
 	self.controls.defaultLevel = new("EditControl", {"TOPLEFT",self.controls.groupList,"BOTTOMLEFT"}, 150, 94, 60, 20, nil, nil, "%D", 2, function(buf)
-		self.defaultGemLevel = m_min(tonumber(buf), 21)
+		self.defaultGemLevel = m_min(tonumber(buf) or 20, 21)
 	end)
 	self.controls.defaultLevelLabel = new("LabelControl", {"RIGHT",self.controls.defaultLevel,"LEFT"}, -4, 0, 0, 16, "^7Default gem level:")
 	self.controls.defaultQuality = new("EditControl", {"TOPLEFT",self.controls.groupList,"BOTTOMLEFT"}, 150, 118, 60, 20, nil, nil, "%D", 2, function(buf)
-		self.defaultGemQuality = m_min(tonumber(buf), 23)
+		self.defaultGemQuality = m_min(tonumber(buf) or 0, 23)
 	end)
 	self.controls.defaultQualityLabel = new("LabelControl", {"RIGHT",self.controls.defaultQuality,"LEFT"}, -4, 0, 0, 16, "^7Default gem quality:")
 	self.controls.showSupportGemTypes = new("DropDownControl", {"TOPLEFT",self.controls.groupList,"BOTTOMLEFT"}, 150, 142, 120, 20, showSupportGemTypeList, function(index, value)