From 260caf5c56bc01d51d200c0cc145af8902844b68 Mon Sep 17 00:00:00 2001 From: Alar of Daggerspine Date: Tue, 23 Jun 2015 10:56:44 +0200 Subject: [PATCH] Fix: ticket http://wow.curseforge.com/addons/garrisoncommander/tickets/76-graphics-on-garrison-commander-not-nice/ Signed-off-by: Alar of Daggerspine --- GarrisonCommander.lua | 4 ++++ GarrisonCommander.toc | 4 ++-- MissionCompletion.lua | 8 +++++++- 3 files changed, 13 insertions(+), 3 deletions(-) diff --git a/GarrisonCommander.lua b/GarrisonCommander.lua index 6e0f0c6..bcdc60b 100644 --- a/GarrisonCommander.lua +++ b/GarrisonCommander.lua @@ -2082,6 +2082,7 @@ function addon:RenderFollowerButton(frame,followerID,missionID,b,t) frame.PortraitFrame.LevelBorder:SetWidth(58); showItemLevel = false; end + print(info.name,info.followerID,info.quality) GarrisonMissionFrame_SetFollowerPortrait(frame.PortraitFrame, info, false); -- Counters icon if (frame.Name and frame.Threats) then @@ -3006,6 +3007,9 @@ override("GarrisonMissionPageFollowerFrame_OnEnter") override("GarrisonMissionList_SetTab") override("GarrisonMissionButton_OnClick") override("GarrisonMissionFrame","SelectTab") +if (ns.toc < 60200) then + override("GarrisonMissionFrame_SelectTab") +end GMF.MissionTab.MissionPage.CloseButton:SetScript("OnClick",over.GarrisonMissionPage_Close) for i=1,#GMFMissionListButtons do diff --git a/GarrisonCommander.toc b/GarrisonCommander.toc index 94332c5..b617512 100644 --- a/GarrisonCommander.toc +++ b/GarrisonCommander.toc @@ -4,8 +4,8 @@ ## Notes-itIT: Ti aiuta a scegliere il giusto seguace per la giusta missione ## Notes-frFR: Vous aide au moment de choisir le droit utilisateur pour la bonne mission ## Author: Alar of Daggerspine -## Version: @project-version@ 6.1.0 -## X-Version: 2.5.0 +## Version: @project-version@ +## X-Version: 2.5.2 ## X-Revision: @project-abbreviated-hash@ ## eMail: alar@aspide.it ## URL: http://wow.aspide.it diff --git a/MissionCompletion.lua b/MissionCompletion.lua index 23dd028..53cac42 100644 --- a/MissionCompletion.lua +++ b/MissionCompletion.lua @@ -6,6 +6,8 @@ local GMF=GarrisonMissionFrame local GMFMissions=GarrisonMissionFrameMissions local GARRISON_CURRENCY=GARRISON_CURRENCY local GARRISON_SHIP_OIL_CURRENCY=_G.GARRISON_SHIP_OIL_CURRENCY or 0 +local LE_FOLLOWER_TYPE_GARRISON_6_0=_G.LE_FOLLOWER_TYPE_GARRISON_6_0 +local LE_FOLLOWER_TYPE_SHIPYARD_6_2=_G.LE_FOLLOWER_TYPE_SHIPYARD_6_2 local pairs=pairs local format=format local strsplit=strsplit @@ -91,7 +93,11 @@ function module:CloseReport() if report then pcall(report.Close,report) report=nil end end function module:MissionComplete(this,button) - missions=G.GetCompleteMissions() + if ns.toc < 60200 then + missions=G.GetCompleteMissions() + else + missions=G.GetCompleteMissions(LE_FOLLOWER_TYPE_GARRISON_6_0) + end if (missions and #missions > 0) then GMFMissions.CompleteDialog.BorderFrame.ViewButton:SetEnabled(false) -- Disabling standard Blizzard Completion report=self:GenerateMissionCompleteList("Missions' results") -- 1.7.9.5