diff --git a/FollowerPage.lua b/FollowerPage.lua index ad92a56..f8d0be6 100644 --- a/FollowerPage.lua +++ b/FollowerPage.lua @@ -31,16 +31,15 @@ function addon:ShowImprovements() b:SetCallback("OnEnter",function(this) --@debug@ -print("Item:",this:GetUserData("item")) + print("Item:",this:GetUserData("item")) --@end-debug@ - GameTooltip:SetOwner(this.frame,"ANCHOR_CURSOR") - GameTooltip:AddLine("Reward") - GameTooltip:SetItemByID(this:GetUserData("item")) - GameTooltip:Show() end) + GameTooltip:SetOwner(this.frame,"ANCHOR_CURSOR") + GameTooltip:AddLine("Reward") + GameTooltip:SetItemByID(this:GetUserData("item")) + GameTooltip:Show() end) b:SetCallback("OnLeave",function(this) GameTooltip:Hide() end) - b:SetCallback("OnClick",function(this) --@debug@ -print("Clicckete") end) + b:SetCallback("OnClick",function(this) print("Click") end) --@end-debug@ end end diff --git a/PartyCache.lua b/PartyCache.lua index ddd864b..b6758d2 100644 --- a/PartyCache.lua +++ b/PartyCache.lua @@ -189,7 +189,7 @@ function party:Close(desttable) if (members[i]) then local rc,code=pcall(G.RemoveFollowerFromMission,ID,members[i]) --@debug@ - if (not rc) then ns.xtrace("Unable to pop", G.GetFollowerName(members[i])," from ",ID,code) end + if (not rc) then print("Unable to pop", G.GetFollowerName(members[i])," from ",ID,code,debugstack()) end --@end-debug@ else @@ -209,10 +209,12 @@ end function addon:GetParty(missionID,key,default) if not missionID then return parties end local party=parties[missionID] + party.missionID=missionID if not party then --@debug@ -print(GetTime(),missionID,G.GetMissionName(missionID),"Empty") end + print(GetTime(),missionID,G.GetMissionName(missionID),"Empty") --@end-debug@ + end if not party then return default end if #party.members==0 and G.GetNumFollowersOnMission(missionID)>0 then if not party.perc or party.perc < 1 then @@ -221,9 +223,8 @@ print(GetTime(),missionID,G.GetMissionName(missionID),"Empty") end party.full=true --Running Mission, taking followers from mission data local followers=self:GetMissionData(missionID,'followers') - --@debug@ -print(followers) + print(followers) --@end-debug@ --addPartyMissionInfo(party,missionID) if followers then diff --git a/ShipYard.lua b/ShipYard.lua index 14a97f9..1e202c0 100644 --- a/ShipYard.lua +++ b/ShipYard.lua @@ -52,9 +52,9 @@ print(ref) end self:SafeSecureHook("GarrisonShipyardMap_SetupBonus") self:SafeHookScript(GSF,"OnShow","Setup",true) - self:SafeHookScript(GSF.MissionTab.MissionList.CompleteDialog,"OnShow",function(... ) sprint("CompleteDialog",...) end,true) - self:SafeHookScript(GSF.MissionTab,"OnShow",function(... ) sprint("MissionTab",...) end,true) - self:SafeHookScript(GSF.FollowerTab,"OnShow",function(... ) sprint("FollowerTab",...) end,true) + self:SafeHookScript(GSF.MissionTab.MissionList.CompleteDialog,"OnShow",true) + self:SafeHookScript(GSF.MissionTab,"OnShow",true) + self:SafeHookScript(GSF.FollowerTab,"OnShow",true) --GarrisonShipyardFrameFollowersListScrollFrameButton1 --GarrisonShipyardMapMission1 --@end-debug@ diff --git a/Widgets.lua b/Widgets.lua index d1a3dd6..3b83073 100644 --- a/Widgets.lua +++ b/Widgets.lua @@ -371,7 +371,7 @@ local function GMCMissionButton() self.frame.info=mission self.frame.fromFollowerPage=true self.frame:EnableMouse(true) - self.frame.party=party or addon:GetParty(mission.missionID) + self.frame.party=party if self.type==Type1 then addon:DrawSingleButton(false,self.frame,false,false) self.frame:SetScript("OnEnter",GarrisonMissionButton_OnEnter)