From 10e0c8e4c7a31b495ff0a71d77737f07d1556c28 Mon Sep 17 00:00:00 2001 From: Michael Tindal Date: Thu, 11 Dec 2014 01:33:48 -0800 Subject: [PATCH] Update the LFR datatext to remove SoO flex (does not exist in 6.0) and add Highmaul. --- ElvUI_SLE/defaults/profile.lua | 2 +- ElvUI_SLE/modules/sledatatexts/lfr.lua | 85 ++++++++++++++++++++++++++++---- ElvUI_SLE/options/datatexts_c.lua | 4 +- 3 files changed, 79 insertions(+), 12 deletions(-) mode change 100644 => 100755 ElvUI_SLE/modules/sledatatexts/lfr.lua diff --git a/ElvUI_SLE/defaults/profile.lua b/ElvUI_SLE/defaults/profile.lua index 3640112..f8e93c8 100644 --- a/ElvUI_SLE/defaults/profile.lua +++ b/ElvUI_SLE/defaults/profile.lua @@ -239,8 +239,8 @@ P['sle'] = { ['toes'] = false, ['tot'] = false, ['soo'] = false, - ['soof'] = false, ['leishen'] = false, + ['hm'] = false, }, --Loot (Restructured) diff --git a/ElvUI_SLE/modules/sledatatexts/lfr.lua b/ElvUI_SLE/modules/sledatatexts/lfr.lua old mode 100644 new mode 100755 index 8527e37..b6fa1e9 --- a/ElvUI_SLE/modules/sledatatexts/lfr.lua +++ b/ElvUI_SLE/modules/sledatatexts/lfr.lua @@ -81,6 +81,67 @@ local function SixShift(id1, id2) end end +--For 7 boss raid +local function SevenKill(id1, id2, id3) + local killNum = 0 + for i =1,3 do --1st part + _, _, isKilled = GetLFGDungeonEncounterInfo(id1, i); + if (isKilled) then + killNum = killNum + 1 + end + end + for i =4,6 do --2nd part + _, _, isKilled = GetLFGDungeonEncounterInfo(id2, i); + if (isKilled) then + killNum = killNum + 1 + end + end + + -- 3rd part + _, _, isKilled = GetLFGDungeonEncounterInfo(id3, 7); + if (isKilled) then + killNum = killNum+1; + end + + if killNum == 7 then + DT.tooltip:AddLine(" "..L["Bosses killed: "]..killNum.."/7", RED_FONT_COLOR.r, RED_FONT_COLOR.g, RED_FONT_COLOR.b, RED_FONT_COLOR.r, RED_FONT_COLOR.g, RED_FONT_COLOR.b) + else + DT.tooltip:AddLine(" "..L["Bosses killed: "]..killNum.."/7", GREEN_FONT_COLOR.r, GREEN_FONT_COLOR.g, GREEN_FONT_COLOR.b, GREEN_FONT_COLOR.r, GREEN_FONT_COLOR.g, GREEN_FONT_COLOR.b) + end +end + +local function SevenShift(id1, id2, id3) + for i =1,3 do --1st part + bossName, _, isKilled, isIneligible = GetLFGDungeonEncounterInfo(id1, i); + if (isKilled) then + DT.tooltip:AddDoubleLine(" "..bossName, BOSS_DEAD, RED_FONT_COLOR.r, RED_FONT_COLOR.g, RED_FONT_COLOR.b, RED_FONT_COLOR.r, RED_FONT_COLOR.g, RED_FONT_COLOR.b); + elseif ( isIneligible ) then + DT.tooltip:AddDoubleLine(" "..bossName, BOSS_ALIVE_INELIGIBLE, GREEN_FONT_COLOR.r, GREEN_FONT_COLOR.g, GREEN_FONT_COLOR.b, GREEN_FONT_COLOR.r, GREEN_FONT_COLOR.g, GREEN_FONT_COLOR.b); + else + DT.tooltip:AddDoubleLine(" "..bossName, BOSS_ALIVE, GREEN_FONT_COLOR.r, GREEN_FONT_COLOR.g, GREEN_FONT_COLOR.b, GREEN_FONT_COLOR.r, GREEN_FONT_COLOR.g, GREEN_FONT_COLOR.b); + end + end + for i =4,6 do --2nd part + bossName, _, isKilled, isIneligible = GetLFGDungeonEncounterInfo(id2, i); + if (isKilled) then + DT.tooltip:AddDoubleLine(" "..bossName, BOSS_DEAD, RED_FONT_COLOR.r, RED_FONT_COLOR.g, RED_FONT_COLOR.b, RED_FONT_COLOR.r, RED_FONT_COLOR.g, RED_FONT_COLOR.b); + elseif (isIneligible) then + DT.tooltip:AddDoubleLine(" "..bossName, BOSS_ALIVE_INELIGIBLE, GREEN_FONT_COLOR.r, GREEN_FONT_COLOR.g, GREEN_FONT_COLOR.b, GREEN_FONT_COLOR.r, GREEN_FONT_COLOR.g, GREEN_FONT_COLOR.b); + else + DT.tooltip:AddDoubleLine(" "..bossName, BOSS_ALIVE, GREEN_FONT_COLOR.r, GREEN_FONT_COLOR.g, GREEN_FONT_COLOR.b, GREEN_FONT_COLOR.r, GREEN_FONT_COLOR.g, GREEN_FONT_COLOR.b); + end + end + -- 3rd part + bossName, _, isKilled, isIneligible = GetLFGDungeonEncounterInfo(id3, 7); + if (isKilled) then + DT.tooltip:AddDoubleLine(" "..bossName, BOSS_DEAD, RED_FONT_COLOR.r, RED_FONT_COLOR.g, RED_FONT_COLOR.b, RED_FONT_COLOR.r, RED_FONT_COLOR.g, RED_FONT_COLOR.b); + elseif ( isIneligible ) then + DT.tooltip:AddDoubleLine(" "..bossName, BOSS_ALIVE_INELIGIBLE, GREEN_FONT_COLOR.r, GREEN_FONT_COLOR.g, GREEN_FONT_COLOR.b, GREEN_FONT_COLOR.r, GREEN_FONT_COLOR.g, GREEN_FONT_COLOR.b); + else + DT.tooltip:AddDoubleLine(" "..bossName, BOSS_ALIVE, GREEN_FONT_COLOR.r, GREEN_FONT_COLOR.g, GREEN_FONT_COLOR.b, GREEN_FONT_COLOR.r, GREEN_FONT_COLOR.g, GREEN_FONT_COLOR.b); + end +end + --For 8 boss raid local function EightKill(id1, id2) local killNum = 0 @@ -328,6 +389,14 @@ local function SoO(id1, id2, id3, id4) end end +local function HM(id1, id2, id3) + if IsShiftKeyDown() then + SevenShift(id1, id2, id3); + else + SevenKill(id1, id2, id3); + end +end + function DT:LFRShow() local lvl = UnitLevel("player") local ilvl = GetAverageItemLevel() @@ -391,17 +460,15 @@ function DT:LFRShow() end DT.tooltip:AddLine(" ") end - - if E.db.sle.lfrshow.soof then - DT.tooltip:AddLine(" "..FLEX_RAID.." "..GetMapNameByID(953)) - if lvl == 90 then - SoO(726, 728, 729, 730) - else - DT.tooltip:AddLine(" "..L["This LFR isn't available for your level/gear."]) + + if E.db.sle.lfrshow.hm then + DT.tooltip:AddLine(" "..GetMapNameByID(994)) + if lvl == 100 and ilvl >= 615 then + HM(849, 850, 851); end - DT.tooltip:AddLine(" ") end - if not E.db.sle.lfrshow.ds and not E.db.sle.lfrshow.mv and not E.db.sle.lfrshow.hof and not E.db.sle.lfrshow.toes and not E.db.sle.lfrshow.tot and not E.db.sle.lfrshow.soo and not E.db.sle.lfrshow.soof then + + if not E.db.sle.lfrshow.ds and not E.db.sle.lfrshow.mv and not E.db.sle.lfrshow.hof and not E.db.sle.lfrshow.toes and not E.db.sle.lfrshow.tot and not E.db.sle.lfrshow.soo and not E.db.sle.lfrshow.hm then DT.tooltip:AddLine(" "..L["You didn't select any instance to track."]) end end \ No newline at end of file diff --git a/ElvUI_SLE/options/datatexts_c.lua b/ElvUI_SLE/options/datatexts_c.lua index 3611679..67d0a74 100644 --- a/ElvUI_SLE/options/datatexts_c.lua +++ b/ElvUI_SLE/options/datatexts_c.lua @@ -263,10 +263,10 @@ local function configTable() type = "toggle", name = GetMapNameByID(953), }, - soof = { + hm = { order = 7, type = "toggle", - name = FLEX_RAID.." "..GetMapNameByID(953), + name = GetMapNameByID(994), }, }, }, -- 1.7.9.5