diff --git a/ElvUI_SLE/modules/characterframe/characterframe.lua b/ElvUI_SLE/modules/characterframe/characterframe.lua index 3500f6c..52f86c1 100644 --- a/ElvUI_SLE/modules/characterframe/characterframe.lua +++ b/ElvUI_SLE/modules/characterframe/characterframe.lua @@ -1,5 +1,4 @@ local E, L, V, P, G, _ = unpack(ElvUI); --- local CFO = E:NewModule('CharacterFrameOptions', 'AceEvent-3.0'); local CFO = E:GetModule('CharacterFrameOptions'); local LSM = LibStub("LibSharedMedia-3.0") @@ -610,6 +609,4 @@ function CFO:Initialize() end) CFO:StartArmoryFrame() -end - --- E:RegisterModule(CFO:GetName()) \ No newline at end of file +end \ No newline at end of file diff --git a/ElvUI_SLE/modules/characterframe/inspectframe.lua b/ElvUI_SLE/modules/characterframe/inspectframe.lua index d0fcd34..3d73ec4 100644 --- a/ElvUI_SLE/modules/characterframe/inspectframe.lua +++ b/ElvUI_SLE/modules/characterframe/inspectframe.lua @@ -1,7 +1,6 @@ local E, L, V, P, G, _ = unpack(ElvUI) local AISM = _G['Armory_InspectSupportModule'] local IFO = E:GetModule('InspectFrameOptions') --- local IFO = E:NewModule('InspectFrameOptions', 'AceEvent-3.0') local SLE = E:GetModule('SLE'); local S = E:GetModule('Skins') @@ -2237,5 +2236,4 @@ function IFO:Initialize() ]] SLI.Activate = true -end --- E:RegisterModule(IFO:GetName()) \ No newline at end of file +end \ No newline at end of file diff --git a/ElvUI_SLE/modules/dashboard/dashboard.lua b/ElvUI_SLE/modules/dashboard/dashboard.lua index ffe016a..0c48590 100644 --- a/ElvUI_SLE/modules/dashboard/dashboard.lua +++ b/ElvUI_SLE/modules/dashboard/dashboard.lua @@ -2,8 +2,7 @@ Credits : Sinaris, Elv made for ElvUI under Sinaris permission. Big thanks :) ]] - -local E, L, V, P, G, _ = unpack(ElvUI); --Inport: Engine, Locales, PrivateDB, ProfileDB, GlobalDB +local E, L, V, P, G, _ = unpack(ElvUI); local DTP = E:GetModule('SLE_DTPanels') local DT = E:GetModule('DataTexts') local LSM = LibStub("LibSharedMedia-3.0") diff --git a/ElvUI_SLE/modules/dashboard/datapanels/bags.lua b/ElvUI_SLE/modules/dashboard/datapanels/bags.lua index 5545571..9bb03ac 100644 --- a/ElvUI_SLE/modules/dashboard/datapanels/bags.lua +++ b/ElvUI_SLE/modules/dashboard/datapanels/bags.lua @@ -1,5 +1,4 @@ -local E, L, V, P, G = unpack(ElvUI); --Inport: Engine, Locales, PrivateDB, ProfileDB, GlobalDB - +local E, L, V, P, G = unpack(ElvUI); local LastUpdate = 1 board[2].Status:SetScript("OnUpdate", function(self) diff --git a/ElvUI_SLE/modules/dashboard/datapanels/durability.lua b/ElvUI_SLE/modules/dashboard/datapanels/durability.lua index 81ac536..b60782d 100644 --- a/ElvUI_SLE/modules/dashboard/datapanels/durability.lua +++ b/ElvUI_SLE/modules/dashboard/datapanels/durability.lua @@ -1,5 +1,4 @@ -local E, L, V, P, G, _ = unpack(ElvUI); --Inport: Engine, Locales, PrivateDB, ProfileDB, GlobalDB - +local E, L, V, P, G, _ = unpack(ElvUI); local displayString = "" local total, totalDurability, totalPerc = 0, 0, 0 local current, max, lastPanel diff --git a/ElvUI_SLE/modules/dashboard/datapanels/fps.lua b/ElvUI_SLE/modules/dashboard/datapanels/fps.lua index 73be1b0..447f690 100644 --- a/ElvUI_SLE/modules/dashboard/datapanels/fps.lua +++ b/ElvUI_SLE/modules/dashboard/datapanels/fps.lua @@ -1,5 +1,4 @@ -local E, L, V, P, G = unpack(ElvUI); --Inport: Engine, Locales, PrivateDB, ProfileDB, GlobalDB - +local E, L, V, P, G = unpack(ElvUI); local LastUpdate = 1 board[3].Status:SetScript("OnUpdate", function( self, elapsed) diff --git a/ElvUI_SLE/modules/marks/flares.lua b/ElvUI_SLE/modules/marks/flares.lua index 0e7edf0..6497835 100644 --- a/ElvUI_SLE/modules/marks/flares.lua +++ b/ElvUI_SLE/modules/marks/flares.lua @@ -1,6 +1,5 @@ local E, L, V, P, G, _ = unpack(ElvUI); local RF = E:GetModule('SLE_RaidFlares'); --- local RF = E:NewModule('SLE_RaidFlares', 'AceHook-3.0', 'AceEvent-3.0'); local template = "SecureActionButtonTemplate" BINDING_HEADER_SHADOWLIGHT_WORLDMARKER = "|cff1784d1Shadow & Light|r" @@ -191,6 +190,4 @@ function RF:Initialize() self:RegisterEvent("PLAYER_ENTERING_WORLD", "UpdateVisibility"); E:CreateMover(mainFlares, "FlareMover", "RF", nil, nil, nil, "ALL,S&L,S&L MISC") -end - --- E:RegisterModule(RF:GetName()) \ No newline at end of file +end \ No newline at end of file diff --git a/ElvUI_SLE/modules/sledatatexts/friends.lua b/ElvUI_SLE/modules/sledatatexts/friends.lua index fda3df0..a672bb2 100644 --- a/ElvUI_SLE/modules/sledatatexts/friends.lua +++ b/ElvUI_SLE/modules/sledatatexts/friends.lua @@ -1,4 +1,4 @@ -local E, L, V, P, G, _ = unpack(ElvUI); --Inport: Engine, Locales, PrivateDB, ProfileDB, GlobalDB, Localize Underscore +local E, L, V, P, G, _ = unpack(ElvUI); local LibQTip = LibStub('LibQTip-1.0') local ACD = LibStub("AceConfigDialog-3.0") local DT = E:GetModule('DataTexts') @@ -218,7 +218,6 @@ local function Entry_OnMouseUp(frame, info, button) if IsAltKeyDown() then if i_type == "realid" then local presenceID, presenceName, battleTag, isBattleTagPresence, toonName, toonID = BNGetFriendInfo(BNGetFriendIndex(presence_id)) - --local _, toonName, client, realmName, realmID, faction, race, class, guild, zoneName, level, gameText = BNGetFriendToonInfo(BNGetFriendIndex(presence_id), 1) local _, toonName, client, realmName, realmID, faction, race, class, guild, zoneName, level, gameText = BNGetToonInfo(toonID or 0) InviteUnit(toon_name.."-"..realmName) @@ -351,57 +350,49 @@ function LDB.OnEnter(self) if numBNOnline > 0 then local realid_table = {} for i = 1, numBNOnline do - --local presenceID, givenName, surname = BNGetFriendInfo(i) local presenceID, givenName, bTag, _, _, toonID, gameClient, isOnline, lastOnline, isAFK, isDND, broadcast, note, _, castTime = BNGetFriendInfo(i) local _, toonName, client, realmName, realmID, faction, race, class, guild, zoneName, level, gameText = BNGetToonInfo(toonID or 0) local broadcastTime = "" if castTime then broadcastTime = string.format(BNET_BROADCAST_SENT_TIME, sletime_Conversion(castTime)); end - --for toonidx = 1, BNGetNumFriendToons(i) do - local fcolor - local status = "" - --local _, _, _, _, _, _, _, isOnline, lastOnline, isAFK, isDND, broadcast, note = BNGetFriendInfoByID(presenceID) - --local _, toonName, client, realmName, realmID, faction, race, class, guild, zoneName, level, gameText = BNGetFriendToonInfo(i, toonidx) - - if toonName then - if faction then - if faction == "Horde" then - fcolor = RED_FONT_COLOR_CODE - else - fcolor = "|cff0070dd" - end + + local fcolor + local status = "" + if toonName then + if faction then + if faction == "Horde" then + fcolor = RED_FONT_COLOR_CODE + else + fcolor = "|cff0070dd" end - - if isAFK then - status = AWAY_ICON - end - - if isDND then - status = BUSY_ICON - end - - if note and note ~= "" then note = "|cffff8800{"..note.."}|r" end - - table.insert(realid_table, { - GIVENNAME = givenName, - SURNAME = bTag or "", - LEVEL = level, - CLASS = class, - FCOLOR = fcolor, - STATUS = status, - BROADCAST_TEXT = broadcast or "", - BROADCAST_TIME = broadcastTime or "", - TOONNAME = toonName, - CLIENT = client, - ZONENAME = zoneName, - REALMNAME = realmName, - GAMETEXT = gameText, - NOTE = note, - PRESENCEID = presenceID - }) end - --end + if isAFK then + status = AWAY_ICON + end + if isDND then + status = BUSY_ICON + end + if note and note ~= "" then note = "|cffff8800{"..note.."}|r" end + + table.insert(realid_table, { + GIVENNAME = givenName, + SURNAME = bTag or "", + LEVEL = level, + CLASS = class, + FCOLOR = fcolor, + STATUS = status, + BROADCAST_TEXT = broadcast or "", + BROADCAST_TIME = broadcastTime or "", + TOONNAME = toonName, + CLIENT = client, + ZONENAME = zoneName, + REALMNAME = realmName, + GAMETEXT = gameText, + NOTE = note, + PRESENCEID = presenceID + }) + end end if (E.db.sle.dt.friends["sortBN"] ~= "REALID") and (E.db.sle.dt.friends["sortBN"] ~= "revREALID") then @@ -429,10 +420,8 @@ function LDB.OnEnter(self) line = tooltip:SetCell(line, 5, player["ZONENAME"]) line = tooltip:SetCell(line, 6, player["FCOLOR"] .. player["REALMNAME"] .. "|r") elseif player["CLIENT"] == "App" then - --if player["CLIENT"] == "App" then line = tooltip:SetCell(line, 5, "|cff82c5ffDesktop Application|r") line = tooltip:SetCell(line, 6, "|cff01b2f1Battle.net|r") - --end else line = tooltip:SetCell(line, 5, player["GAMETEXT"]) if player["CLIENT"] == "S2" then diff --git a/ElvUI_SLE/modules/sledatatexts/guild.lua b/ElvUI_SLE/modules/sledatatexts/guild.lua index f981505..ae6e49c 100644 --- a/ElvUI_SLE/modules/sledatatexts/guild.lua +++ b/ElvUI_SLE/modules/sledatatexts/guild.lua @@ -1,4 +1,4 @@ -local E, L, V, P, G, _ = unpack(ElvUI); --Inport: Engine, Locales, PrivateDB, ProfileDB, GlobalDB, Localize Underscore +local E, L, V, P, G, _ = unpack(ElvUI); local LibQTip = LibStub('LibQTip-1.0') local ACD = LibStub("AceConfigDialog-3.0") local DT = E:GetModule('DataTexts') @@ -187,7 +187,7 @@ function DT:update_Guild() end end if E.db.sle.dt.guild.totals then - LDB.text = --[["|cff82c5ff"]]"|cffffffff"..GUILD..": |r"..valueColor(online).."/"..valueColor(guildTotal)--[["|r"]] + LDB.text = "|cffffffff"..GUILD..": |r"..valueColor(online).."/"..valueColor(guildTotal) else LDB.text = "|cffffffff"..GUILD..": |r"..valueColor(online) end @@ -418,15 +418,15 @@ function LDB.OnEnter(self) line = tooltip:AddLine() tooltip:SetCell(line, 1, "", "LEFT", 1) tooltip:SetCell(line, 2, "|cffeda55fLeft Click|r a line to whisper a player.", "LEFT", 3) - tooltip:SetCell(line, 5, "|cffeda55fShift+Left Click|r a line to lookup a player.", "LEFT", 3)-- + tooltip:SetCell(line, 5, "|cffeda55fShift+Left Click|r a line to lookup a player.", "LEFT", 3) line = tooltip:AddLine() tooltip:SetCell(line, 1, "", "LEFT", 1) tooltip:SetCell(line, 2, "|cffeda55fCtrl+Left Click|r a line to edit note.", "LEFT", 3) tooltip:SetCell(line, 5, "|cffeda55fCtrl+Right Click|r a line to edit officer note.", "LEFT", 3) line = tooltip:AddLine() tooltip:SetCell(line, 1, "", "LEFT", 1) - tooltip:SetCell(line, 2, "|cffeda55fAlt+Left Click|r a line to invite.", "LEFT", 3)-- - tooltip:SetCell(line, 5, "|cffeda55fLeft Click|r a Header to hide it or sort it.", "LEFT", 3)-- + tooltip:SetCell(line, 2, "|cffeda55fAlt+Left Click|r a line to invite.", "LEFT", 3) + tooltip:SetCell(line, 5, "|cffeda55fLeft Click|r a Header to hide it or sort it.", "LEFT", 3) end end diff --git a/ElvUI_SLE/modules/sledatatexts/lfr.lua b/ElvUI_SLE/modules/sledatatexts/lfr.lua index cb4c4e7..0e1686c 100644 --- a/ElvUI_SLE/modules/sledatatexts/lfr.lua +++ b/ElvUI_SLE/modules/sledatatexts/lfr.lua @@ -1,5 +1,5 @@ --LFR boss status calculations-- -local E, L, V, P, G, _ = unpack(ElvUI); --Inport: Engine, Locales, PrivateDB, ProfileDB, GlobalDB, Localize Underscore +local E, L, V, P, G, _ = unpack(ElvUI); local DT = E:GetModule('DataTexts') local GetLFGDungeonEncounterInfo = GetLFGDungeonEncounterInfo