From 707493148fac96c34070d325424bfc0c6bc8b1ee Mon Sep 17 00:00:00 2001 From: Alar of Daggerspine Date: Sat, 6 Dec 2014 13:06:44 +0100 Subject: [PATCH] More refresh and busy followers ignored also when filling party Signed-off-by: Alar of Daggerspine --- CHANGELOG.txt | 1 + GarrisonCommander.lua | 6 ++++-- RelNotes.lua | 1 + 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.txt b/CHANGELOG.txt index 23d5daa..b2c477e 100644 --- a/CHANGELOG.txt +++ b/CHANGELOG.txt @@ -1,6 +1,7 @@ = GarrisonCommander helps you when choosing the right follower for the right mission = * 1.1.7 Fix: Followers cache was not initialized +FIx: When filling a party using followers with no counters, was taking busy followers in all cases * 1.1.6 Fix: GarrisonCommander was unwilling triggering a mission reordering. Fix: First mission list button was opening the wrong mission diff --git a/GarrisonCommander.lua b/GarrisonCommander.lua index 7369b07..bbbc7dd 100644 --- a/GarrisonCommander.lua +++ b/GarrisonCommander.lua @@ -225,6 +225,7 @@ function addon:TooltipAdder(missionID,skipTT) follower.rank=follower.level < 100 and follower.level or follower.iLevel if (not follower.isCollected) then break end follower.status=C_Garrison.GetFollowerStatus(follower.followerID) + followers[index].status=follower.status if (not follower.status) then availableFollowers=availableFollowers+1 end @@ -327,7 +328,7 @@ function addon:TooltipAdder(missionID,skipTT) if (roomInParty() and next(traits)) then for id,i in pairs(traits) do local follower=followers[i] - if (follower.status and self:GetBoolean('IGM')) then + if (follower.status and skipBusy) then elseif (pushFollower(id)) then if (not skipTT) then GameTooltip:AddDoubleLine(ENVIRONMENT_SUBHEADER,fullname[id],0,1,0) end break @@ -339,7 +340,7 @@ function addon:TooltipAdder(missionID,skipTT) if (roomInParty()) then for index=1,#followers do local follower=followers[index] - if (follower.status and self:GetBoolean('IGM')) then + if (follower.status and skipBusy) then elseif (pushFollower(follower.followerID)) then if (not partyshown) then if (not skipTT) then GameTooltip:AddLine(PARTY,1) end @@ -605,6 +606,7 @@ function addon:RefreshMissions() print("Refresh missions called") --@end-debug@ if (self:IsAvailableMission()) then + self:CacheFollowers() wipe(successes) GarrisonMissionList_UpdateMissions() end diff --git a/RelNotes.lua b/RelNotes.lua index 0db6e39..3541f1a 100644 --- a/RelNotes.lua +++ b/RelNotes.lua @@ -19,6 +19,7 @@ self:Wiki([[ ]]) self:RelNotes(1,1,7,[[ Fix: Followers cache was not initialized +FIx: When filling a party using followers with no counters, was taking busy followers in all cases ]]) self:RelNotes(1,1,6,[[ Fix: GarrisonCommander was unwilling triggering a mission reordering. -- 1.7.9.5