Added combat:GetBossHealth(); combat:GetBossName(); combat:GetCurrentPhase()
This commit is contained in:
+10
-6
@@ -2119,11 +2119,14 @@ local iconFrame_OnEnter = function(self)
|
||||
Details:AddTooltipHeaderStatusbar()
|
||||
|
||||
local talentString = ""
|
||||
if (talents and not (DetailsFramework.IsClassicWow() or DetailsFramework.IsTBCWow() or DetailsFramework.IsWotLKWow())) then
|
||||
for i = 1, #talents do
|
||||
local talentID, talentName, texture, selected, available = GetTalentInfoByID(talents [i])
|
||||
if (texture) then
|
||||
talentString = talentString .. " |T" .. texture .. ":" .. 24 .. ":" .. 24 ..":0:0:64:64:4:60:4:60|t"
|
||||
|
||||
if (type(talents) == "table") then
|
||||
if (talents and not (DetailsFramework.IsClassicWow() or DetailsFramework.IsTBCWow() or DetailsFramework.IsWotLKWow())) then
|
||||
for i = 1, #talents do
|
||||
local talentID, talentName, texture, selected, available = GetTalentInfoByID(talents [i])
|
||||
if (texture) then
|
||||
talentString = talentString .. " |T" .. texture .. ":" .. 24 .. ":" .. 24 ..":0:0:64:64:4:60:4:60|t"
|
||||
end
|
||||
end
|
||||
end
|
||||
end
|
||||
@@ -6628,7 +6631,8 @@ local buildSegmentTooltip = function(self, deltaTime)
|
||||
elseif (bossInfo.killed) then
|
||||
gameCooltip:AddLine(combatName, formattedElapsedTime, 1, "lime", combatTimeColor)
|
||||
else
|
||||
gameCooltip:AddLine(combatName, formattedElapsedTime, 1, "orange", combatTimeColor)
|
||||
--include phase string: "P" .. thisCombat:GetCurrentPhase() .. " " ..
|
||||
gameCooltip:AddLine(combatName, math.floor(thisCombat:GetBossHealth()*100) .. "%", 1, "orange", combatTimeColor) --formattedElapsedTime
|
||||
end
|
||||
|
||||
gameCooltip:AddIcon(combatIcon, "main", "left")
|
||||
|
||||
@@ -943,17 +943,21 @@ function mythicDungeonFrames.ShowEndOfMythicPlusPanel()
|
||||
readyFrame.DungeonBackdropTexture:SetTexture(overallMythicDungeonCombat.is_mythic_dungeon.DungeonTexture)
|
||||
end
|
||||
|
||||
|
||||
wipe(readyFrame.playerCacheByName)
|
||||
|
||||
if (Details222.MythicPlus.OnTime) then
|
||||
readyFrame.YouBeatTheTimerLabel:SetFormattedText(CHALLENGE_MODE_COMPLETE_BEAT_TIMER .. " | " .. CHALLENGE_MODE_COMPLETE_KEYSTONE_UPGRADED, Details222.MythicPlus.KeystoneUpgradeLevels) --"You beat the timer!"
|
||||
readyFrame.YouBeatTheTimerLabel.textcolor = "limegreen"
|
||||
--readyFrame.KeystoneUpgradeLabel:SetFormattedText(CHALLENGE_MODE_COMPLETE_KEYSTONE_UPGRADED, Details222.MythicPlus.KeystoneUpgradeLevels)
|
||||
PlaySound(SOUNDKIT.UI_70_CHALLENGE_MODE_KEYSTONE_UPGRADE)
|
||||
C_Timer.After(0.020, function()
|
||||
--PlaySoundFile([[Interface\AddOns\Details\sounds\bassdrop2.mp3]])
|
||||
end)
|
||||
else
|
||||
readyFrame.YouBeatTheTimerLabel.textcolor = "white"
|
||||
readyFrame.YouBeatTheTimerLabel.text = CHALLENGE_MODE_COMPLETE_TIME_EXPIRED --"Time expired!"
|
||||
--readyFrame.KeystoneUpgradeLabel.text = CHALLENGE_MODE_COMPLETE_TRY_AGAIN --"Try again! Beat the timer to upgrade your keystone!"
|
||||
PlaySound(SOUNDKIT.UI_70_CHALLENGE_MODE_COMPLETE_NO_UPGRADE)
|
||||
end
|
||||
|
||||
if (Details222.MythicPlus.NewDungeonScore and Details222.MythicPlus.OldDungeonScore) then
|
||||
|
||||
Reference in New Issue
Block a user