Fix Tame beast resistance display

It was still using the regular resist values in the tooltip of the beast selection UI and for the sort

Author: LocalIdentity

spec/System/TestSkills_spec.lua

@@ -102,6 +102,46 @@ describe("TestSkills", function()
 		assert.matches("Explosion radius", qualityDescriptions[1])
 	end)
 
+	it("uses companion resistances in the beast library controls", function()
+		local minionId = "Metadata/Monsters/LeagueAbyss/Lightless/Cocoon3Spectre"
+		local testData = {
+			skills = build.data.skills,
+			minions = {
+				A = copyTable(build.data.minions[minionId]),
+				B = copyTable(build.data.minions[minionId]),
+			},
+		}
+		testData.minions.B.name = "B"
+		testData.minions.B.fireResist = 0
+		testData.minions.B.companionFireResist = 60
+
+		local tooltip = {
+			lines = { },
+			CheckForUpdate = function()
+				return true
+			end,
+			AddLine = function(self, _, text)
+				table.insert(self.lines, text)
+			end,
+			AddSeparator = function()
+			end,
+		}
+		local spectreList = new("MinionListControl", nil, { 0, 0, 100, 100 }, testData, { "A" }, nil, "Spectres")
+		local beastList = new("MinionListControl", nil, { 0, 0, 100, 100 }, testData, { "A" }, nil, "Beasts", true)
+
+		spectreList:AddValueTooltip(tooltip, 1, "A")
+		assert.matches("Resistances:.*75", table.concat(tooltip.lines, "\n"))
+		tooltip.lines = { }
+		beastList:AddValueTooltip(tooltip, 1, "A")
+		assert.matches("Resistances:.*50", table.concat(tooltip.lines, "\n"))
+
+		local sourceList = { "A", "B" }
+		local sourceControl = new("MinionSearchListControl", nil, { 0, 0, 100, 100 }, testData, sourceList, beastList, "Beasts", true)
+		sourceControl.controls.sortModeDropDown.selIndex = 9
+		sourceControl:sortSourceList()
+		assert.are.equals("B", sourceControl.list[1])
+	end)
+
 
 	it("uses granted effect minion list when active skill minion list is missing", function()
 		local srcInstance = { statSet = { }, skillPart = { }, nameSpec = "Spectre: Test" }

src/Classes/MinionListControl.lua

@@ -9,10 +9,11 @@ local t_remove = table.remove
 local s_format = string.format
 local m_max = math.max
 
-local MinionListClass = newClass("MinionListControl", "ListControl", function(self, anchor, rect, data, list, dest, label)
+local MinionListClass = newClass("MinionListControl", "ListControl", function(self, anchor, rect, data, list, dest, label, showCompanionStats)
 	self.ListControl(anchor, rect, 16, "VERTICAL", not dest, list)
 	self.data = data
 	self.dest = dest
+	self.showCompanionStats = showCompanionStats
 	if dest then
 		self.dragTargetList = { dest }
 		self.label = label or "^7Available Spectres:"
@@ -49,6 +50,10 @@ end
 function MinionListClass:AddValueTooltip(tooltip, index, minionId)
 	if tooltip:CheckForUpdate(minionId) then
 		local minion = self.data.minions[minionId]
+		local fireResist = self.showCompanionStats and minion.companionFireResist or minion.fireResist
+		local coldResist = self.showCompanionStats and minion.companionColdResist or minion.coldResist
+		local lightningResist = self.showCompanionStats and minion.companionLightningResist or minion.lightningResist
+		local chaosResist = self.showCompanionStats and minion.companionChaosResist or minion.chaosResist
 		tooltip.center = true
 		tooltip:AddLine(20, "^7"..minion.name, "FONTIN SC")
 		tooltip.center = false
@@ -67,10 +72,10 @@ function MinionListClass:AddValueTooltip(tooltip, index, minionId)
 			tooltip:AddLine(14, s_format("^7Evasion Multiplier: x%.2f", 1 + minion.evasion))
 		end
 		tooltip:AddLine(14, s_format("^7Resistances: %s%d ^7/ %s%d ^7/ %s%d ^7/ %s%d",
-			colorCodes.FIRE, minion.fireResist,
-			colorCodes.COLD, minion.coldResist,
-			colorCodes.LIGHTNING, minion.lightningResist,
-			colorCodes.CHAOS, minion.chaosResist
+			colorCodes.FIRE, fireResist,
+			colorCodes.COLD, coldResist,
+			colorCodes.LIGHTNING, lightningResist,
+			colorCodes.CHAOS, chaosResist
 		))
 		tooltip:AddLine(14, s_format("^7Base Damage: x%.2f", minion.damage))
 		tooltip:AddLine(14, s_format("^7Base Attack Speed: %.2f", 1 / minion.attackTime))
@@ -189,4 +194,4 @@ function SpawnListClass:AddValueTooltip(tooltip, index, value)
 			tooltip:AddLine(18, "^7World area not found: " .. tostring(value))
 		end
 	end
-end
+end

src/Classes/MinionSearchListControl.lua

@@ -8,8 +8,8 @@ local t_insert = table.insert
 local t_remove = table.remove
 local s_format = string.format
 
-local MinionSearchListClass = newClass("MinionSearchListControl", "MinionListControl", function(self, anchor, rect, data, list, dest, label)
-	self.MinionListControl(anchor, rect, data, list, dest, label)
+local MinionSearchListClass = newClass("MinionSearchListControl", "MinionListControl", function(self, anchor, rect, data, list, dest, label, showCompanionStats)
+	self.MinionListControl(anchor, rect, data, list, dest, label, showCompanionStats)
 	self:sortSourceList()
 	self.unfilteredList = copyTable(list)
 	self.isMutable = false
@@ -97,10 +97,10 @@ function MinionSearchListClass:sortSourceList()
 		[6] = { field = "damage", asc = false },
 		[7] = { field = "companionReservation", asc = true },
 		[8] = { field = "spectreReservation", asc = true },
-		[9] = { field = "fireResist", asc = false },
-		[10] = { field = "coldResist", asc = false },
-		[11] = { field = "lightningResist", asc = false },
-		[12] = { field = "chaosResist", asc = false },
+		[9] = { field = self.showCompanionStats and "companionFireResist" or "fireResist", asc = false },
+		[10] = { field = self.showCompanionStats and "companionColdResist" or "coldResist", asc = false },
+		[11] = { field = self.showCompanionStats and "companionLightningResist" or "lightningResist", asc = false },
+		[12] = { field = self.showCompanionStats and "companionChaosResist" or "chaosResist", asc = false },
 		[13] = { field = "totalResist", asc = false },
 		[14] = { field = "baseMovementSpeed", asc = false },
 	}
@@ -122,8 +122,13 @@ function MinionSearchListClass:sortSourceList()
 				valueA = (minionA.energyShield or 0) * minionA.life
 				valueB = (minionB.energyShield or 0) * minionB.life
 			elseif sortOption.field == "totalResist" then
-				valueA = (minionA.fireResist or 0) + (minionA.coldResist or 0) + (minionA.lightningResist or 0) + (minionA.chaosResist or 0)
-				valueB = (minionB.fireResist or 0) + (minionB.coldResist or 0) + (minionB.lightningResist or 0) + (minionB.chaosResist or 0)
+				if self.showCompanionStats then
+					valueA = (minionA.companionFireResist or 0) + (minionA.companionColdResist or 0) + (minionA.companionLightningResist or 0) + (minionA.companionChaosResist or 0)
+					valueB = (minionB.companionFireResist or 0) + (minionB.companionColdResist or 0) + (minionB.companionLightningResist or 0) + (minionB.companionChaosResist or 0)
+				else
+					valueA = (minionA.fireResist or 0) + (minionA.coldResist or 0) + (minionA.lightningResist or 0) + (minionA.chaosResist or 0)
+					valueB = (minionB.fireResist or 0) + (minionB.coldResist or 0) + (minionB.lightningResist or 0) + (minionB.chaosResist or 0)
+				end
 			end
 			if valueA == valueB then
 				return minionA.name < minionB.name

src/Modules/Build.lua

@@ -1651,6 +1651,10 @@ function buildMode:OpenSpectreLibrary(library)
 			end
 		end
 		local movementSpeed = minion.baseMovementSpeed / 10 .. " m/s"
+		local fireResist = library == "beast" and minion.companionFireResist or minion.fireResist
+		local coldResist = library == "beast" and minion.companionColdResist or minion.coldResist
+		local lightningResist = library == "beast" and minion.companionLightningResist or minion.lightningResist
+		local chaosResist = library == "beast" and minion.companionChaosResist or minion.chaosResist
 		controls.minionNameLabel.labelText = "^7" .. minion.name
 		controls.lifeLabel.lifeValue = round(totalLife)
 		controls.energyshieldLabel.energyShieldValue = round(totalES)
@@ -1659,19 +1663,19 @@ function buildMode:OpenSpectreLibrary(library)
 		controls.evasionLabel.evasionValue = round(totalEvasion)
 		controls.spawnLocations.list = spawnLocationList
 		controls.resistsLabel.resistsValue = (
-			colorCodes.FIRE..minion.fireResist.."^7 / "..
-			colorCodes.COLD..minion.coldResist.."^7 / "..
-			colorCodes.LIGHTNING..minion.lightningResist.."^7 / "..
-			colorCodes.CHAOS..minion.chaosResist)
+			colorCodes.FIRE..fireResist.."^7 / "..
+			colorCodes.COLD..coldResist.."^7 / "..
+			colorCodes.LIGHTNING..lightningResist.."^7 / "..
+			colorCodes.CHAOS..chaosResist)
 		controls.movementSpeedLabel.movementSpeedValue = movementSpeed
 	end
 
 	local label = (library == "beast" and "Beasts" or "Spectres")
-	controls.list = new("MinionListControl", nil, {-230, 40, 210, 270}, self.data, destList, nil, label.." in Build:")
+	controls.list = new("MinionListControl", nil, {-230, 40, 210, 270}, self.data, destList, nil, label.." in Build:", library == "beast")
 	controls.list.OnSelect = function()
 			UpdateMinionDisplay(controls.list.selValue)
 	end
-	controls.source = new("MinionSearchListControl", nil, {0, 80, 210, 230}, self.data, sourceList, controls.list, "^7Available "..label..":")
+	controls.source = new("MinionSearchListControl", nil, {0, 80, 210, 230}, self.data, sourceList, controls.list, "^7Available "..label..":", library == "beast")
 	controls.source.OnSelect = function()
 			UpdateMinionDisplay(controls.source.selValue)
 	end