Updated Raid Vault tooltip to separate instances

Breeni · Aug 20, 2022 · 87bdb29 · 87bdb29
1 parent 09f116f
commit 87bdb29
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 5 deletions.
diff --git a/.luacheckrc b/.luacheckrc
@@ -215,6 +215,7 @@ new_read_globals = {
     'date',
     'EditMacro',
     'EJ_GetEncounterInfo',
+    'EJ_GetInstanceInfo',
     'FindBaseSpellByID',
     'format',
     'GetAchievementCriteriaInfoByID',

diff --git a/Register_Mainline.lua b/Register_Mainline.lua
@@ -804,18 +804,23 @@ end
 ]],
         tooltip = [[
 tooltip:AddLine(self:GetName())
+local instanceName = nil
 for _,encounter in ipairs(states[1]:GetEncounters()) do
+    if instanceName ~= encounter.instanceName then
+        tooltip:AddLine(format("%s", encounter.instanceName), 1, 1, 1)
+        instanceName = encounter.instanceName
+    end
     local name = encounter.name
     if encounter.bestDifficulty == 16 then
-        tooltip:AddLine(format("%s (%s)", name, encounter.difficultyName), Colors.LEGENDARY:GetRGB())
+        tooltip:AddLine(format("- %s (%s)", name, encounter.difficultyName), Colors.LEGENDARY:GetRGB())
     elseif encounter.bestDifficulty == 15 then
-        tooltip:AddLine(format("%s (%s)", name, encounter.difficultyName), Colors.EPIC:GetRGB())
+        tooltip:AddLine(format("- %s (%s)", name, encounter.difficultyName), Colors.EPIC:GetRGB())
     elseif encounter.bestDifficulty == 14 then
-        tooltip:AddLine(format("%s (%s)", name, encounter.difficultyName), Colors.RARE:GetRGB())
+        tooltip:AddLine(format("- %s (%s)", name, encounter.difficultyName), Colors.RARE:GetRGB())
     elseif encounter.bestDifficulty == 17 then
-        tooltip:AddLine(format("%s (%s)", name, encounter.difficultyName), Colors.UNCOMMON:GetRGB())
+        tooltip:AddLine(format("- %s (%s)", name, encounter.difficultyName), Colors.UNCOMMON:GetRGB())
     else
-        tooltip:AddLine(name, 1, 1, 1)
+        tooltip:AddLine(format("- %s", name), 0.5, 0.5, 0.5)
     end
 end
 ]],

diff --git a/States/Vault.lua b/States/Vault.lua
@@ -100,12 +100,16 @@ function VaultMixin:GetEncounters()
 	if character:IsPlayer() then
 		encounters = C_WeeklyRewards.GetActivityEncounterInfo(self:GetID(), 3)
 		table.sort(encounters, function(a, b)
+			if a.instanceID ~= b.instanceID then
+				return a.instanceID < b.instanceID;
+			end
 			return a.uiOrder < b.uiOrder
 		end)
 	else
 		encounters = character:GetDataTable("vaultEncounters")
 	end
     for _,encounter in ipairs(encounters) do
+		encounter.instanceName = encounter.instanceID and EJ_GetInstanceInfo(encounter.instanceID) or nil;
         encounter.name = (EJ_GetEncounterInfo(encounter.encounterID))
         if encounter.bestDifficulty > 0 then
             encounter.difficultyName = DifficultyUtil.GetDifficultyName(encounter.bestDifficulty);