From 963981412444afe682608efe042d06b38027cce0 Mon Sep 17 00:00:00 2001 From: Alar of Daggerspine Date: Thu, 12 Mar 2015 00:15:48 +0100 Subject: [PATCH] Beta 3 Signed-off-by: Alar of Daggerspine --- CHANGELOG.txt | 2 ++ FollowerCache.lua | 2 +- GarrisonCommander-Broker/ldb.lua | 2 +- MissionCache.lua | 1 + 4 files changed, 5 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.txt b/CHANGELOG.txt index 8304124..d2f5a76 100644 --- a/CHANGELOG.txt +++ b/CHANGELOG.txt @@ -12,6 +12,8 @@ *** Feature: In buildings map, working follower are displayed on plots. Plots with no followers but which could have one are marked ** General *** Feature: threat tooltip in mission list wiht full countering follower list +*** Feature: Broker displays not which toon has completed missions ** Fix from previous beta *** Sometimes opening mission after heartstoning to Garrison raised a lua error +*** Sometimes opening the mission table as the very first action after login raised a lua error *** Priorities list in mission control was misaligned when choosing more than 5 priorities diff --git a/FollowerCache.lua b/FollowerCache.lua index d6b792a..278683a 100644 --- a/FollowerCache.lua +++ b/FollowerCache.lua @@ -93,8 +93,8 @@ function addon:GetFollowerData(followerID,key,default) --@debug@ ns.xprint("Not found",followerID,key,"at",idx,"len",#Mbase.followers) print(debugstack()) - return default --@end-debug@ + return default end if (key==nil) then return follower diff --git a/GarrisonCommander-Broker/ldb.lua b/GarrisonCommander-Broker/ldb.lua index 64cff9f..32f8b9f 100644 --- a/GarrisonCommander-Broker/ldb.lua +++ b/GarrisonCommander-Broker/ldb.lua @@ -56,7 +56,7 @@ function addon:ldbUpdate() end completed=completed+1 end - dataobj.text=format("%s: %s (Tot: %d) %s: %s",READY,ready,completed,NEXT,prox) + dataobj.text=format("%s: %s (Tot: |cff00ff00%d|r) %s: %s",READY,ready,completed,NEXT,prox) end function addon:GARRISON_MISSION_STARTED(event,missionID) local duration=select(2,G.GetPartyMissionInfo(missionID)) or 0 diff --git a/MissionCache.lua b/MissionCache.lua index fabd938..5a4c7f9 100644 --- a/MissionCache.lua +++ b/MissionCache.lua @@ -79,6 +79,7 @@ function AddExtraData(mission) mission.itemLevel=0 mission.xpBonus=0 mission.others=0 + mission.xp=mission.xp or 0 local numrewards=0 for k,v in pairs(mission.rewards) do numrewards=numrewards+1 -- 1.7.9.5