diff --git a/boot.lua b/boot.lua index 42fbaa97c..0646bf90a 100644 --- a/boot.lua +++ b/boot.lua @@ -410,6 +410,7 @@ Details:EndCombat() currentCombat.is_trash = false + currentCombat.combat_type = DETAILS_SEGMENTTYPE_DUNGEON_OVERALL currentCombat.is_dungeon_overall = true end diff --git a/classes/class_combat.lua b/classes/class_combat.lua index c148d4947..ef88671c8 100644 --- a/classes/class_combat.lua +++ b/classes/class_combat.lua @@ -731,13 +731,12 @@ local segmentTypeToString = { local instanceType = self.instance_type if (instanceType == "party") then - local bossInfo = self:GetBossInfo() - if (self.is_dungeon_overall) then self.combat_type = DETAILS_SEGMENTTYPE_DUNGEON_OVERALL return DETAILS_SEGMENTTYPE_DUNGEON_OVERALL end + local bossInfo = self:GetBossInfo() if (bossInfo) then if (bossInfo.mapid == 33 and bossInfo.diff_string == "Event" and bossInfo.id == 2879) then --Shadowfang Keep | The Crown Chemical Co. self.combat_type = DETAILS_SEGMENTTYPE_EVENT_VALENTINEDAY diff --git a/frames/window_main.lua b/frames/window_main.lua index 574589a87..b0ca22918 100644 --- a/frames/window_main.lua +++ b/frames/window_main.lua @@ -6651,6 +6651,13 @@ local buildSegmentTooltip = function(self, deltaTime) --end of mythic+ segments + elseif (combatType == DETAILS_SEGMENTTYPE_DUNGEON_OVERALL) then + gameCooltip:AddLine(thisCombat:GetCombatName(), detailsFramework:IntegerToTimer(thisCombat:GetCombatTime()), 1, dungeonColor) + local combatIcon, categoryIcon = thisCombat:GetCombatIcon() + gameCooltip:AddIcon(combatIcon, "main", "left") + gameCooltip:AddStatusBar(100, 1, .5, .1, 0, 0.55, false, false, statusBarTexture) + local timeInCombat = thisCombat:GetCombatTime() + elseif (combatType == DETAILS_SEGMENTTYPE_DUNGEON_BOSS or combatType == DETAILS_SEGMENTTYPE_RAID_BOSS) then --if this is a boss encounter --isn't anymore a sequence of mythic+ segments mythicDungeonRunId = false @@ -6968,7 +6975,11 @@ local buildSegmentTooltip = function(self, deltaTime) end if (not bSegmentInfoAdded) then - gameCooltip:AddLine(Loc["STRING_SEGMENT_ENEMY"] .. ":", enemy, 2, "white", "white") + if (thisCombat.combat_type == DETAILS_SEGMENTTYPE_DUNGEON_OVERALL) then + gameCooltip:AddLine(Loc["STRING_SEGMENT_ENEMY"] .. ":", thisCombat:GetCombatName(), 2, "white", "white") + else + gameCooltip:AddLine(Loc["STRING_SEGMENT_ENEMY"] .. ":", enemy, 2, "white", "white") + end if (not thisCombat:GetEndTime()) then if (Details.in_combat) then