Mercurial > wow > worldplan

changeset 105:9f664a0ef8a8

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge
author Nenue
date Sun, 28 May 2017 19:55:26 -0400
parents a3800989f515 (current diff) 4d1520186ea4 (diff)
children 1197c8825eda
files ClassPlan.lua QuestPOI.lua WorldQuests.lua
diffstat 2 files changed, 5 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/ClassPlan.lua	Sun May 28 19:53:11 2017 -0400
+++ b/ClassPlan.lua	Sun May 28 19:55:26 2017 -0400
@@ -55,6 +55,7 @@
   Queued = {},
   Timers = {},
   ReportChunks = {},
+  maxItems = 12
 }
 ClassPlanHandlerBase = {
   numBlocks = 0,
--- a/ClassPlanShipments.lua	Sun May 28 19:53:11 2017 -0400
+++ b/ClassPlanShipments.lua	Sun May 28 19:55:26 2017 -0400
@@ -107,12 +107,13 @@
       AddShipmentInfo(AK_NOTES, name, texture, shipmentCapacity, shipmentsReady, shipmentsTotal, creationTime, duration, timeleftString)
     end
 
-    local talentTrees = CG_GetTalentTrees(garrisonType, select(3, UnitClass("player")));
+    local talentTrees = C_Garrison.GetTalentTreeIDsByClassID(garrisonType, select(3, UnitClass("player")));
     -- this is a talent that has completed, but has not been seen in the talent UI yet.
     local completeTalentID = CG_GetCompleteTalent(garrisonType);
-    --print('Talents:')
+    print('Talents:')
     if (talentTrees) then
-      for treeIndex, tree in ipairs(talentTrees) do
+      for treeIndex, treeID in ipairs(talentTrees) do
+        local _, _, tree = C_Garrison.GetTalentTreeInfoForID(garrisonType, treeID);
         for talentIndex, talent in ipairs(tree) do
           local showTalent = false;
           if (talent.isBeingResearched) or (talent.id == completeTalentID) then