Comm update
Repooc [10-13-14 - 20:53]
Comm update
Signed-off-by: Repooc <repooc82@gmail.com>
diff --git a/ElvUI_SLE/modules/characterframe/communication.lua b/ElvUI_SLE/modules/characterframe/communication.lua
index 4dad28c..4125075 100644
--- a/ElvUI_SLE/modules/characterframe/communication.lua
+++ b/ElvUI_SLE/modules/characterframe/communication.lua
@@ -31,7 +31,8 @@ if not AISM.Revision or AISM.Revision <= Revision then
AISM.Tooltip:SetOwner(UIParent, 'ANCHOR_NONE')
AISM.Updater = _G['AISM_Updater'] or AISM.Updater or CreateFrame('Frame', 'AISM_Updater', UIParent)
- AISM.SendMessageDelay_Group = 2
+ AISM.Delay_SendMessage = 2
+ AISM.Delay_Updater = .5
AISM.PlayerData = { SetItem = {} }
AISM.PlayerData_ShortString = { SetItem = {} }
@@ -195,22 +196,24 @@ if not AISM.Revision or AISM.Revision <= Revision then
end
end
end)
+
if playerNumSpecGroup ~= MAX_TALENT_GROUPS then
AISM.Updater:RegisterEvent('PLAYER_TALENT_UPDATE')
end
- AISM.Updater:RegisterEvent('PLAYER_TALENT_UPDATE')
- AISM.UpdateHelmDisplaying = function(value)
+
+ function AISM:UpdateHelmDisplaying(value)
isHelmDisplayed = value == '1'
AISM.Updater.GearUpdated = nil
AISM.Updater:Show()
end
- hooksecurefunc('ShowHelm', AISM.UpdateHelmDisplaying)
- AISM.UpdateCloakDisplaying = function(value)
+ hooksecurefunc('ShowHelm', function(value) AISM:UpdateHelmDisplaying(value) end)
+
+ function AISM:UpdateCloakDisplaying(value)
isCloakDisplayed = value == '1'
AISM.Updater.GearUpdated = nil
AISM.Updater:Show()
end
- hooksecurefunc('ShowCloak', AISM.UpdateCloakDisplaying)
+ hooksecurefunc('ShowCloak', function(value) AISM:UpdateCloakDisplaying(value) end)
--<< Profession String >>--
@@ -492,15 +495,15 @@ if not AISM.Revision or AISM.Revision <= Revision then
local guildName, guildRankName = GetGuildInfo('player')
TableToSave.PlayerInfo = playerName..'_'..UnitPVPName('player')..'/'..playerRealm..'/'..UnitLevel('player')..'/'..playerClass..'/'..playerClassID..'/'..playerRace..'/'..playerRaceID..'/'..playerSex..(guildName and '/'..guildName..'/'..guildRankName or '')
- --[[
+
if IsInGuild() then
- TableToSave.GuildInfo = GetGuildLevel()..'/'..GetNumGuildMembers()
+ TableToSave.GuildInfo = GetTotalAchievementPoints(true)..'/'..GetNumGuildMembers()
for _, DataString in ipairs({ GetGuildLogoInfo('player') }) do
TableToSave.GuildInfo = TableToSave.GuildInfo..'/'..DataString
end
end
- ]]
+
TableToSave.PvP = GetPVPLifetimeStats()
local Rating, Played, Won
@@ -650,7 +653,7 @@ if not AISM.Revision or AISM.Revision <= Revision then
end
if needSendData and self.Updater.SpecUpdated and self.Updater.GlyphUpdated and self.Updater.GearUpdated then
- self.SendDataGroupUpdated = (self.SendDataGroupUpdated or self.SendMessageDelay_Group) - elapsed
+ self.SendDataGroupUpdated = (self.SendDataGroupUpdated or self.Delay_SendMessage) - elapsed
if self.SendDataGroupUpdated < 0 then
needSendData = nil
@@ -688,7 +691,7 @@ if not AISM.Revision or AISM.Revision <= Revision then
local SenderRealm
function AISM:Receiver(Prefix, Message, Channel, Sender)
Sender, SenderRealm = strsplit('-', Sender)
- SenderRealm = gsub(SenderRealm,'[%s%-]','')
+ SenderRealm = SenderRealm and gsub(SenderRealm,'[%s%-]','') or nil
Sender = Sender..(SenderRealm and SenderRealm ~= '' and SenderRealm ~= playerRealm and '-'..SenderRealm or '')
--print('|cffceff00['..Channel..']|r|cff2eb7e4['..Prefix..']|r '..Sender..' : ')
@@ -777,7 +780,6 @@ if not AISM.Revision or AISM.Revision <= Revision then
local Spec, Talent, isSelected
for i = 1, #stringTable do
- print(stringTable[i])
Spec, Talent, isSelected = strsplit('_', stringTable[i])
if not Talent then
@@ -850,7 +852,7 @@ if not AISM.Revision or AISM.Revision <= Revision then
TableToSave.guildName = stringTable[9]
TableToSave.guildRankName = stringTable[10]
elseif self.DataTypeTable[DataType] == 'GuildInfo' then
- TableToSave.guildLevel = stringTable[1]
+ TableToSave.guildPoint = stringTable[1]
TableToSave.guildNumMembers = stringTable[2]
for i = 3, #stringTable do