From 3ffa3dca0243d6fa7a13de3b67a5dcfb308392ea Mon Sep 17 00:00:00 2001 From: Alar of Runetotem Date: Wed, 29 Mar 2017 09:38:48 +0200 Subject: [PATCH 1/6] Rel notes --- RelNotes.lua | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/RelNotes.lua b/RelNotes.lua index 73e9777..21aa6db 100644 --- a/RelNotes.lua +++ b/RelNotes.lua @@ -22,6 +22,12 @@ self:Wiki([[ == Silent mode == typing /gac silent in chat will eliminate every chat message from GarrisonCommander ]]) +self:RelNotes(2,18,2,[[ +Fix: Message: Interface\AddOns\GarrisonCommander\FollowerCache.lua:25: attempt to perform arithmetic on local 'GARRISON_FOLLOWER_MAX_UPGRADE_QUALITY' (a table value) +]]) +self:RelNotes(2,18,1,[[ +Toc bump +]]) self:RelNotes(2,18,0,[[ Feature: Improved autologout management. Now you are logged out on timeout ONLY if you started mission control via ctrl-click on table. Popup message should be informative -- 1.7.9.5 From 13cd3f4d82b6e815c4e1615ac066be26a191ef4f Mon Sep 17 00:00:00 2001 From: Alar of Runetotem Date: Tue, 29 Aug 2017 10:48:59 +0200 Subject: [PATCH 2/6] Toc bump --- .../GarrisonCommander-Broker.toc | 2 +- GarrisonCommander.toc | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/GarrisonCommander-Broker/GarrisonCommander-Broker.toc b/GarrisonCommander-Broker/GarrisonCommander-Broker.toc index 7b70a85..af24c07 100644 --- a/GarrisonCommander-Broker/GarrisonCommander-Broker.toc +++ b/GarrisonCommander-Broker/GarrisonCommander-Broker.toc @@ -1,4 +1,4 @@ -## Interface: 70200 +## Interface: 70300 ## Title: GarrisonCommander-Broker ## Notes: Data-Broker for GarrisonCommander ## Notes-itIT: Data-Broker per GarrisonCommander diff --git a/GarrisonCommander.toc b/GarrisonCommander.toc index c0a2fc9..7b2a55e 100644 --- a/GarrisonCommander.toc +++ b/GarrisonCommander.toc @@ -1,4 +1,4 @@ -## Interface: 70200 +## Interface: 70300 ## Title: GarrisonCommander ## Notes: Sending all follower to missions with just one click and more ## Notes-itIT: Invia tutti i seguaci in missione con un click e molto altro -- 1.7.9.5 From 61f1c3cda7e631789824b3460c5c9c0b01585644 Mon Sep 17 00:00:00 2001 From: Alar of Runetotem Date: Wed, 30 Aug 2017 10:55:56 +0200 Subject: [PATCH 3/6] Fix: Error when playing sounds --- MissionCompletion.lua | 4 ++-- MissionControl.lua | 4 ++-- RelNotes.lua | 3 +++ ShipControl.lua | 5 +++-- Widgets.lua | 2 +- 5 files changed, 11 insertions(+), 7 deletions(-) diff --git a/MissionCompletion.lua b/MissionCompletion.lua index f23b2a6..df66d5e 100644 --- a/MissionCompletion.lua +++ b/MissionCompletion.lua @@ -311,10 +311,10 @@ function module:GetMissionResults(success,currentMission) stopTimer() if (success) then report:AddMissionResult(currentMission.missionID,true) - PlaySound("UI_Garrison_Mission_Complete_Mission_Success") + PlaySound(SOUNDKIT.UI_GARRISON_MISSION_COMPLETE_MISSION_SUCCESS) else report:AddMissionResult(currentMission.missionID,false) - PlaySound("UI_Garrison_Mission_Complete_Encounter_Fail") + PlaySound(SOUNDKIT.UI_GARRISON_MISSION_COMPLETE_MISSION_FAIL_STINGER) end if success then local resourceMultiplier=currentMission.resourceMultiplier or {} diff --git a/MissionControl.lua b/MissionControl.lua index dc922e0..c30d8c8 100644 --- a/MissionControl.lua +++ b/MissionControl.lua @@ -146,7 +146,7 @@ function module:RunMission(missionID,start) local GMC=GMF.MissionControlTab if (start) then G.StartMission(missionID) - PlaySound("UI_Garrison_CommandTable_MissionStart") + PlaySound(SOUNDKIT.UI_GARRISON_COMMAND_TABLE_MISSION_START) addon:RefreshFollowerStatus() return end @@ -162,7 +162,7 @@ function module:RunMission(missionID,start) if (not missionID) then coroutine.yield(true) G.StartMission(party.missionID) - PlaySound("UI_Garrison_CommandTable_MissionStart") + PlaySound(SOUNDKIT.UI_GARRISON_COMMAND_TABLE_MISSION_START) coroutine.yield(true) else self:ScheduleTimer("RunMission",0.25,party.missionID,true) diff --git a/RelNotes.lua b/RelNotes.lua index 21aa6db..24e0e69 100644 --- a/RelNotes.lua +++ b/RelNotes.lua @@ -22,6 +22,9 @@ self:Wiki([[ == Silent mode == typing /gac silent in chat will eliminate every chat message from GarrisonCommander ]]) +self:RelNotes(2,18,4,[[ +Fix: Error when playing sounds +]]) self:RelNotes(2,18,2,[[ Fix: Message: Interface\AddOns\GarrisonCommander\FollowerCache.lua:25: attempt to perform arithmetic on local 'GARRISON_FOLLOWER_MAX_UPGRADE_QUALITY' (a table value) ]]) diff --git a/ShipControl.lua b/ShipControl.lua index 33c2007..cd1d834 100644 --- a/ShipControl.lua +++ b/ShipControl.lua @@ -178,7 +178,8 @@ function module:RunMission(missionID,start) local GMC=GSF.MissionControlTab if (start) then G.StartMission(missionID) - PlaySound("UI_Garrison_CommandTable_MissionStart") + PlaySound(SOUNDKIT.UI_GARRISON_COMMAND_TABLE_MISSION_START) + addon:RefreshFollowerStatus() return end @@ -197,7 +198,7 @@ function module:RunMission(missionID,start) if (not missionID) then coroutine.yield(true) G.StartMission(party.missionID) - PlaySound("UI_Garrison_CommandTable_MissionStart") + PlaySound(SOUNDKIT.UI_GARRISON_COMMAND_TABLE_MISSION_START) coroutine.yield(true) else self:ScheduleTimer("RunMission",0.25,party.missionID,true) diff --git a/Widgets.lua b/Widgets.lua index 71359d4..e9f4274 100644 --- a/Widgets.lua +++ b/Widgets.lua @@ -127,7 +127,7 @@ print(follower) local quality=G.GetFollowerQuality(followerID) or follower.quality local level=G.GetFollowerLevel(followerID) or follower.level if levelup then - PlaySound("UI_Garrison_CommandTable_Follower_LevelUp"); + PlaySound(SOUNDKIT.UI_GARRISON_COMMAND_TABLE_FOLLOWER_LEVEL_UP); end return self:AddFollowerIcon(followerType, addon:GetFollowerTexture(follower), -- 1.7.9.5 From 31846d809767fe07728a6be8b82fb24a60b4c72a Mon Sep 17 00:00:00 2001 From: Alar of Runetotem Date: Fri, 3 Nov 2017 16:10:21 +0100 Subject: [PATCH 4/6] OrderHallCommander advertising removed --- OrderHall.lua | 3 --- RelNotes.lua | 3 +++ 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/OrderHall.lua b/OrderHall.lua index 48022a5..57e8b4e 100644 --- a/OrderHall.lua +++ b/OrderHall.lua @@ -34,10 +34,7 @@ function module:OnInitialize(...) OHFFollowerTab=OrderHallMissionFrame.FollowerTab -- Contains model view if GetAddOnEnableState(UnitName("player"),"OrderHallCommander") > 0 then ns.ignoreHall=true - self:Print("Delegating hall management to OrderHallCommander") return - else - self:Print(L["Support for Order Hall missions is being moved to OrderHallCommander.\nPlease install and update it"]) end GHF=ns.GHF GHFMissions=ns.GHFMissions diff --git a/RelNotes.lua b/RelNotes.lua index 24e0e69..d938fde 100644 --- a/RelNotes.lua +++ b/RelNotes.lua @@ -22,6 +22,9 @@ self:Wiki([[ == Silent mode == typing /gac silent in chat will eliminate every chat message from GarrisonCommander ]]) +self:RelNotes(2,19,0,[[ +Fix: OrderHallCommander advertising removed. I still stronlgy suggest to install it because Order Hall support in GC is totally outdated +]]) self:RelNotes(2,18,4,[[ Fix: Error when playing sounds ]]) -- 1.7.9.5 From 797379e3c267fc45791bd547aa5bcb120ddc5a6e Mon Sep 17 00:00:00 2001 From: Alar of Runetotem Date: Fri, 3 Nov 2017 16:14:44 +0100 Subject: [PATCH 5/6] doc --- RelNotes.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/RelNotes.lua b/RelNotes.lua index d938fde..8a4a43b 100644 --- a/RelNotes.lua +++ b/RelNotes.lua @@ -22,7 +22,7 @@ self:Wiki([[ == Silent mode == typing /gac silent in chat will eliminate every chat message from GarrisonCommander ]]) -self:RelNotes(2,19,0,[[ +self:RelNotes(2,18,5,[[ Fix: OrderHallCommander advertising removed. I still stronlgy suggest to install it because Order Hall support in GC is totally outdated ]]) self:RelNotes(2,18,4,[[ -- 1.7.9.5 From 66478f8a1932410b6a9f8f4eb20e4290e8798639 Mon Sep 17 00:00:00 2001 From: Alar of Runetotem Date: Wed, 18 Jul 2018 12:25:18 +0200 Subject: [PATCH 6/6] TOC Bumped --- .../GarrisonCommander-Broker.toc | 2 +- GarrisonCommander-Broker/ldb.lua | 10 +++++----- GarrisonCommander.toc | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/GarrisonCommander-Broker/GarrisonCommander-Broker.toc b/GarrisonCommander-Broker/GarrisonCommander-Broker.toc index af24c07..9bf2f65 100644 --- a/GarrisonCommander-Broker/GarrisonCommander-Broker.toc +++ b/GarrisonCommander-Broker/GarrisonCommander-Broker.toc @@ -1,4 +1,4 @@ -## Interface: 70300 +## Interface: 80000 ## Title: GarrisonCommander-Broker ## Notes: Data-Broker for GarrisonCommander ## Notes-itIT: Data-Broker per GarrisonCommander diff --git a/GarrisonCommander-Broker/ldb.lua b/GarrisonCommander-Broker/ldb.lua index f258cad..f635f4f 100644 --- a/GarrisonCommander-Broker/ldb.lua +++ b/GarrisonCommander-Broker/ldb.lua @@ -192,7 +192,10 @@ end function addon:CheckDateReset() local oldToday=today local reset=GetQuestResetTime() - local weekday, month, day, year = CalendarGetDate() + local t= C_Calendar.GetDate() + local day=t.monthDay + local year=t.year + local month=t.month if (day <1 or reset<1) then self:ScheduleTimer("CheckDateReset",1) return day,reset @@ -212,14 +215,11 @@ function addon:CheckDateReset() today=yesterday end self:ScheduleTimer("CheckDateReset",60) ---@debug@ - if (false and today~=oldToday) then - self:Popup(format("o:%s y:%s t:%s r:%s [w:%s m:%s d:%s y:%s] ",oldToday,yesterday,today,reset,CalendarGetDate())) + if (today~=oldToday) then dataobj:Update() farmobj:Update() workobj:Update() end ---@end-debug@ end function addon:CountMissing() local tot=0 diff --git a/GarrisonCommander.toc b/GarrisonCommander.toc index 7b2a55e..62711fd 100644 --- a/GarrisonCommander.toc +++ b/GarrisonCommander.toc @@ -1,4 +1,4 @@ -## Interface: 70300 +## Interface: 80000 ## Title: GarrisonCommander ## Notes: Sending all follower to missions with just one click and more ## Notes-itIT: Invia tutti i seguaci in missione con un click e molto altro -- 1.7.9.5