Last tweaks before release
Alar of Daggerspine [02-24-15 - 18:47]
Last tweaks before release
Signed-off-by: Alar of Daggerspine <alar@aspide.it>
diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index a8fad07..92404ca 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -6,6 +6,7 @@
** Feature: Mission list in follower page is scrolling and has now no limit
** Feature: Mission Completion has an hopefully nicer new interface
** Feature: "Improved" rewards now have their quantity written in green
+** Feature: In progress mission sorted by end time
** Fix: inactive followers are ignored even when "Ignore unavailable" is unchecked
* 2.3.0
** Feature: Mission autocompletion.
diff --git a/GarrisonCommander-Broker/GarrisonCommander-Broker.toc b/GarrisonCommander-Broker/GarrisonCommander-Broker.toc
index 32b5f0a..f49f988 100644
--- a/GarrisonCommander-Broker/GarrisonCommander-Broker.toc
+++ b/GarrisonCommander-Broker/GarrisonCommander-Broker.toc
@@ -5,14 +5,12 @@
## Notes-frFR: Data-Broker pour GarrisonCommander
## Author: Alar of Daggerspine
## Version: @project-version@ @project-abbreviated-hash@
-## X-Version: 2.3.0-Beta2
+## X-Version: 2.3.5
## X-Revision: @project-abbreviated-hash@
## eMail: alar@aspide.it
## URL: http://wow.aspide.it
-## OptionalDeps: Titan, Bazooka, ChocolateBar , FuBar
+## OptionalDeps: Titan, Bazooka, ChocolateBar , FuBar , LibDataBroker-1.1
## DefaultState: Enabled
-## LoadOnDemand: 1
-## LoadWith: Titan,Bazooka,ChocolateBar,FuBar
## SavedVariables: dbGACB
## X-ID: GACB
## X-Database:dbGACB
diff --git a/GarrisonCommander.lua b/GarrisonCommander.lua
index 4a6bf34..be0f9fe 100644
--- a/GarrisonCommander.lua
+++ b/GarrisonCommander.lua
@@ -785,7 +785,6 @@ function addon:EventGARRISON_MISSION_STARTED(event,missionID,...)
-- duration=0
-- }
-- },
- table.sort(GMFMissions.inProgressMissions,sorters.EndTime)
dbcache.running[missionID].started=time()
dbcache.running[missionID].duration=select(2,G.GetPartyMissionInfo(missionID))
wipe(dbcache.running[missionID].followers)
@@ -2077,7 +2076,6 @@ function addon:StartUp(...)
self:Trigger("MSORT")
self:Trigger("CKMP")
GMFMissions.listScroll.update = over.GarrisonMissionList_Update
- table.sort(GMFMissions.inProgressMissions,sorters.EndTime)
return self:RefreshMissions()
end
function addon:MarkAsNew(obj,key,message)
diff --git a/GarrisonCommander.toc b/GarrisonCommander.toc
index f44d57f..25248d9 100644
--- a/GarrisonCommander.toc
+++ b/GarrisonCommander.toc
@@ -5,7 +5,7 @@
## Notes-frFR: Vous aide au moment de choisir le droit utilisateur pour la bonne mission
## Author: Alar of Daggerspine
## Version: @project-version@
-## X-Version: 2.3.0-Beta4
+## X-Version: 2.3.5
## X-Revision: @project-abbreviated-hash@
## eMail: alar@aspide.it
## URL: http://wow.aspide.it
diff --git a/MissionCache.lua b/MissionCache.lua
index e642d4f..0cd9fce 100644
--- a/MissionCache.lua
+++ b/MissionCache.lua
@@ -72,7 +72,7 @@ end
function AddExtraData(mission)
local _
_,mission.xp,mission.type,mission.typeDesc,mission.typeIcon,mission.locPrefix,_,mission.enemies=G.GetMissionInfo(mission.missionID)
- mission.rank=mission.level < 100 and mission.level or mission.iLevel
+ mission.rank=mission.level < GARRISON_FOLLOWER_MAX_LEVEL and mission.level or mission.iLevel
mission.resources=0
mission.gold=0
mission.followerUpgrade=0