2.5.0 for 6.2.0 release candidate 1
Alar of Daggerspine [06-21-15 - 22:16]
2.5.0 for 6.2.0 release candidate 1
Signed-off-by: Alar of Daggerspine <alar@aspide.it>
diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index 0d247ac..0dfcc9c 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -1,4 +1,7 @@
==GarrisonCommander helps you when choosing the right follower for the right mission==
+*2.5.0
+Greatly improved matchmaking
+Missino control: unified priorities and allowed itmes. Now you can just drag items around to change priority
* 2.4.7
Fix: Sometimes daily reset was not fired at dure time
Feature: Redone all buttomns to be more consistent. Old behaviour configurable via options
diff --git a/MatchMaker.lua b/MatchMaker.lua
index 6b07106..fbf70e0 100644
--- a/MatchMaker.lua
+++ b/MatchMaker.lua
@@ -190,15 +190,16 @@ local function MatchMaker(self,missionID,party,includeBusy,onlyBest)
--]]
local minchance=floor(self:GetNumber('MAXRESCHANCE')/mission.numFollowers)-mission.numFollowers*mission.numFollowers
for _,followerID in self:GetFollowersIterator() do
-
- if P:AddFollower(followerID) then
- local score,chance=self:FollowerScore(mission,followerID)
- if (score~=self:FollowerScore(nil,followerID) and chance >minchance) then
- tinsert(scores,format("%s@%s",score,followerID))
- else
- tinsert(fillers,format("%s@%s",score,followerID))
+ if self:IsFollowerAvailableForMission(followerID,filters.skipBusy) then
+ if P:AddFollower(followerID) then
+ local score,chance=self:FollowerScore(mission,followerID)
+ if (score~=self:FollowerScore(nil,followerID) and chance >minchance) then
+ tinsert(scores,format("%s@%s",score,followerID))
+ else
+ tinsert(fillers,format("%s@%s",score,followerID))
+ end
+ P:RemoveFollower(followerID)
end
- P:RemoveFollower(followerID)
end
--end
end
diff --git a/MissionControl.lua b/MissionControl.lua
index 9491e18..b248092 100644
--- a/MissionControl.lua
+++ b/MissionControl.lua
@@ -330,7 +330,7 @@ local function drawItemButtons()
tinsert(tOrder,to,appo)
end
drawItemButtons()
- --GMC.startButton:Click()
+ GMC.startButton:Click()
end)
frame:SetScript('OnLeave', function() GameTooltip:Hide() end)
frame:Show()