From ce8e4aceecd4b1fdd9a1000dd1085d44e1204820 Mon Sep 17 00:00:00 2001 From: F16Gaming Date: Wed, 8 Aug 2012 20:32:56 +0200 Subject: [PATCH 1/4] Some hotfixes (missing comma and misnamed local). --- SummonManager.lua | 6 +++--- locales/enUS.lua | 2 +- locales/svSE.lua | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/SummonManager.lua b/SummonManager.lua index ea7c972..99f32a1 100644 --- a/SummonManager.lua +++ b/SummonManager.lua @@ -39,7 +39,7 @@ local L = C.LocaleManager local SM = C.SummonManager local CM -local MAX_TIME = 110 -- 1 minute 50 seconds, summons expire after 2 minutes (usually) +local MAX_DELAY = 110 -- 1 minute 50 seconds, summons expire after 2 minutes (usually) local LastSummoner @@ -165,7 +165,7 @@ function SM:GetDelay() end return ("%d:%s"):format(minutes, seconds) end - return ("%d %s"):format(total, L("SECONDS")) + return ("%d %s"):format(total, L("SECONDS"):lower()) end function SM:GetRawDelay() @@ -188,7 +188,7 @@ function SM:SetDelay(amount) end return "SM_SETDELAY_SUCCESS", {("%d:%s"):format(minutes, seconds)} else - return "SM_SETDELAY_SUCCESS", {("%d %s"):format(amount, L("SECONDS"))} + return "SM_SETDELAY_SUCCESS", {("%d %s"):format(amount, L("SECONDS"):lower())} end end return "SM_SETDELAY_INSTANT" diff --git a/locales/enUS.lua b/locales/enUS.lua index 2537e7a..4320683 100644 --- a/locales/enUS.lua +++ b/locales/enUS.lua @@ -124,7 +124,7 @@ local L = { CM_SET_SM_ISENABLED = "SummonManager is enabled.", CM_SET_SM_ISDISABLED = "SummonManager is disabled.", CM_SET_SM_DELAY_CURRENT = "The current delay for summon announcements is %s.", - CM_SET_SM_DELAY_USAGE = "Usage: set sm delay " + CM_SET_SM_DELAY_USAGE = "Usage: set sm delay ", CM_SET_SM_USAGE = "Usage: set sm [enable|disable|toggle|delay]", CM_LOCALE_HELP = "Change locale settings.", diff --git a/locales/svSE.lua b/locales/svSE.lua index 240b73a..ede6e08 100644 --- a/locales/svSE.lua +++ b/locales/svSE.lua @@ -124,7 +124,7 @@ local L = { CM_SET_SM_ISENABLED = "SummonManager is enabled.", CM_SET_SM_ISDISABLED = "SummonManager is disabled.", CM_SET_SM_DELAY_CURRENT = "The current delay for summon announcements is %s.", - CM_SET_SM_DELAY_USAGE = "Usage: set sm delay " + CM_SET_SM_DELAY_USAGE = "Usage: set sm delay ", CM_SET_SM_USAGE = "Användning: set sm [enable|disable|toggle|delay]", CM_LOCALE_HELP = "Change locale settings.", -- 1.7.9.5 From 6d1922483329c30b4b913a0b8c0e362fcf469b3c Mon Sep 17 00:00:00 2001 From: F16Gaming Date: Wed, 8 Aug 2012 20:39:18 +0200 Subject: [PATCH 2/4] SummonManager: OnSummon will now send whisper to summoner if player is not in a group. --- SummonManager.lua | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/SummonManager.lua b/SummonManager.lua index 99f32a1..f4f4046 100644 --- a/SummonManager.lua +++ b/SummonManager.lua @@ -38,6 +38,7 @@ C.SummonManager = {} local L = C.LocaleManager local SM = C.SummonManager local CM +local GT = C.GroupTools local MAX_DELAY = 110 -- 1 minute 50 seconds, summons expire after 2 minutes (usually) @@ -107,7 +108,9 @@ function SM:Announce() LastSummoner = name - CM:SendMessage(L("SM_ONSUMMON"):format(area, name, left), "SMART") + local channel = "SMART" + if not GT:InGroup() then channel = "WHISPER" end + CM:SendMessage(L("SM_ONSUMMON"):format(area, name, left), channel, name) end function SM:AcceptSummon() -- 1.7.9.5 From bda1a39313e1db990e178e28fd2aabdaf3223645 Mon Sep 17 00:00:00 2001 From: F16Gaming Date: Wed, 8 Aug 2012 22:03:48 +0200 Subject: [PATCH 3/4] Typo fix. --- SummonManager.lua | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/SummonManager.lua b/SummonManager.lua index f4f4046..3c33062 100644 --- a/SummonManager.lua +++ b/SummonManager.lua @@ -26,11 +26,14 @@ local tostring = tostring local CreateFrame = CreateFrame local CancelSummon = CancelSummon local ConfirmSummon = ConfirmSummon +local StaticPopup_Hide = StaticPopup_Hide local PlayerCanTeleport = PlayerCanTeleport +local StaticPopup_Visible = StaticPopup_Visible local GetSummonConfirmSummoner = GetSummonConfirmSummoner local GetSummonConfirmAreaName = GetSummonConfirmAreaName local GetSummonConfirmTimeLeft = GetSummonConfirmTimeLeft + local C = Command C.SummonManager = {} @@ -109,7 +112,7 @@ function SM:Announce() LastSummoner = name local channel = "SMART" - if not GT:InGroup() then channel = "WHISPER" end + if not GT:IsGroup() then channel = "WHISPER" end CM:SendMessage(L("SM_ONSUMMON"):format(area, name, left), channel, name) end @@ -120,6 +123,10 @@ function SM:AcceptSummon() ConfirmSummon() + if StaticPopup_Visible("CONFIRM_SUMMON") then + StaticPopup_Hide("CONFIRM_SUMMON") + end + return "SM_ACCEPTED", {LastSummoner} end @@ -130,6 +137,10 @@ function SM:DeclineSummon() CancelSummon() + if StaticPopup_Visible("CONFIRM_SUMMON") then + StaticPopup_Hide("CONFIRM_SUMMON") + end + return "SM_DECLINED", {LastSummoner} end -- 1.7.9.5 From 85f6d7614c54fada8b62baeac7b136f63bf27cbd Mon Sep 17 00:00:00 2001 From: F16Gaming Date: Thu, 9 Aug 2012 04:55:19 +0200 Subject: [PATCH 4/4] Missing API upvalue. --- Events_Chat.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/Events_Chat.lua b/Events_Chat.lua index 0db5abe..f5fd810 100644 --- a/Events_Chat.lua +++ b/Events_Chat.lua @@ -22,6 +22,7 @@ local select = select -- API Upvalues local BNET_CLIENT_WOW = BNET_CLIENT_WOW +local UnitFactionGroup = UnitFactionGroup local C = Command local CM = C.ChatManager -- 1.7.9.5