From c89b67d438ec2454a4e186f216a3be4a335f5cf1 Mon Sep 17 00:00:00 2001 From: Darthpred Date: Sat, 16 Feb 2013 10:47:51 +0400 Subject: [PATCH] Redid logic of showing stuff --- ElvUI_SLE/modules/datatexts/lfr.lua | 5 --- ElvUI_SLE/modules/datatexts/time.lua | 56 +++++++++++++++++++++++++--------- 2 files changed, 41 insertions(+), 20 deletions(-) diff --git a/ElvUI_SLE/modules/datatexts/lfr.lua b/ElvUI_SLE/modules/datatexts/lfr.lua index 1280e54..423f7c7 100644 --- a/ElvUI_SLE/modules/datatexts/lfr.lua +++ b/ElvUI_SLE/modules/datatexts/lfr.lua @@ -199,7 +199,6 @@ function DT:TwelveShift(id1, id2, id3, id4) end function DT:DragonSoul(id1, id2) - DT.tooltip:AddLine(" "..GetMapNameByID(824)) --Instance name if IsShiftKeyDown() then DT:EightShift(id1, id2) else @@ -208,7 +207,6 @@ function DT:DragonSoul(id1, id2) end function DT:Mogushan(id1, id2) - DT.tooltip:AddLine(" "..GetMapNameByID(896)) --Instance name if IsShiftKeyDown() then DT:SixShift(id1, id2) else @@ -217,7 +215,6 @@ function DT:Mogushan(id1, id2) end function DT:HoF(id1, id2) - DT.tooltip:AddLine(" "..GetMapNameByID(897)) --Instance name if IsShiftKeyDown() then DT:SixShift(id1, id2) else @@ -226,7 +223,6 @@ function DT:HoF(id1, id2) end function DT:ToES(id) - DT.tooltip:AddLine(" "..GetMapNameByID(886)) --Instance name if IsShiftKeyDown() then DT:FourShift(id) else @@ -235,7 +231,6 @@ function DT:ToES(id) end function DT:ToT(id1, id2, id3, id4) - DT.tooltip:AddLine(" "..GetMapNameByID(930)) if IsShiftKeyDown() then DT:TwelveShift(id1, id2, id3, id4) else diff --git a/ElvUI_SLE/modules/datatexts/time.lua b/ElvUI_SLE/modules/datatexts/time.lua index 7cd63a2..f956955 100644 --- a/ElvUI_SLE/modules/datatexts/time.lua +++ b/ElvUI_SLE/modules/datatexts/time.lua @@ -137,28 +137,54 @@ local function OnEnter(self) local ilvl = GetAverageItemLevel() DT.tooltip:AddLine(" ") DT.tooltip:AddLine(RAID_FINDER) - --if lvl == 85 and ilvl >= 372 then - DT:DragonSoul(416, 417) - --else - if lvl == 90 then - if ilvl >= 460 then + if E.db.sle.lfrshow.ds then + DT.tooltip:AddLine(" "..GetMapNameByID(824)) + if lvl == 85 and ilvl >= 372 then + DT:DragonSoul(416, 417) + else + DT.tooltip:AddLine(" "..L["No LFR is available for your level/gear."]) + end + DT.tooltip:AddLine(" ") + end + + if E.db.sle.lfrshow.mv then + DT.tooltip:AddLine(" "..GetMapNameByID(896)) + if lvl == 90 and ilvl >= 460 then DT:Mogushan(527, 528) - DT.tooltip:AddLine(" ") + else + DT.tooltip:AddLine(" "..L["No LFR is available for your level/gear."]) end - if ilvl >= 470 then + DT.tooltip:AddLine(" ") + end + + if E.db.sle.lfrshow.hof then + DT.tooltip:AddLine(" "..GetMapNameByID(897)) + if lvl == 90 and ilvl >= 470 then DT:HoF(529, 530) - DT.tooltip:AddLine(" ") + else + DT.tooltip:AddLine(" "..L["No LFR is available for your level/gear."]) + end + DT.tooltip:AddLine(" ") + end + + if E.db.sle.lfrshow.toes then + DT.tooltip:AddLine(" "..GetMapNameByID(886)) + if lvl == 90 and ilvl >= 470 then DT:ToES(526) - DT.tooltip:AddLine(" ") + else + DT.tooltip:AddLine(" "..L["No LFR is available for your level/gear."]) end - if ilvl >= 480 then + DT.tooltip:AddLine(" ") + end + + if E.db.sle.lfrshow.tot then + DT.tooltip:AddLine(" "..GetMapNameByID(930)) + if lvl == 90 and ilvl >= 480 then DT:ToT(610, 611, 612, 613) + else + DT.tooltip:AddLine(" "..L["No LFR is available for your level/gear."]) end - if ilvl < 460 then - DT.tooltip:AddLine(L["No LFR is available for your level/gear."]) - end - else - DT.tooltip:AddLine(L["No LFR is available for your level/gear."]) + DT.tooltip:AddLine(" ") end --LFR lockout end end -- 1.7.9.5