Mercurial > wow > worldplan

comparison ClassPlanShipments.lua @ 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 4d1520186ea4
children 1197c8825eda
comparison
equal deleted inserted replaced
104:a3800989f515 105:9f664a0ef8a8
105 for i = 1, #looseShipments do 105 for i = 1, #looseShipments do
106 local name, texture, shipmentCapacity, shipmentsReady, shipmentsTotal, creationTime, duration, timeleftString = CG_GetLandingPageShipmentInfoByContainerID(looseShipments[i]); 106 local name, texture, shipmentCapacity, shipmentsReady, shipmentsTotal, creationTime, duration, timeleftString = CG_GetLandingPageShipmentInfoByContainerID(looseShipments[i]);
107 AddShipmentInfo(AK_NOTES, name, texture, shipmentCapacity, shipmentsReady, shipmentsTotal, creationTime, duration, timeleftString) 107 AddShipmentInfo(AK_NOTES, name, texture, shipmentCapacity, shipmentsReady, shipmentsTotal, creationTime, duration, timeleftString)
108 end 108 end
109 109
110 local talentTrees = CG_GetTalentTrees(garrisonType, select(3, UnitClass("player"))); 110 local talentTrees = C_Garrison.GetTalentTreeIDsByClassID(garrisonType, select(3, UnitClass("player")));
111 -- this is a talent that has completed, but has not been seen in the talent UI yet. 111 -- this is a talent that has completed, but has not been seen in the talent UI yet.
112 local completeTalentID = CG_GetCompleteTalent(garrisonType); 112 local completeTalentID = CG_GetCompleteTalent(garrisonType);
113 --print('Talents:') 113 print('Talents:')
114 if (talentTrees) then 114 if (talentTrees) then
115 for treeIndex, tree in ipairs(talentTrees) do 115 for treeIndex, treeID in ipairs(talentTrees) do
116 local _, _, tree = C_Garrison.GetTalentTreeInfoForID(garrisonType, treeID);
116 for talentIndex, talent in ipairs(tree) do 117 for talentIndex, talent in ipairs(tree) do
117 local showTalent = false; 118 local showTalent = false;
118 if (talent.isBeingResearched) or (talent.id == completeTalentID) then 119 if (talent.isBeingResearched) or (talent.id == completeTalentID) then
119 AddShipmentInfo(OH_TALENT, talent.name, talent.icon, 1, (talent.isBeingResearched and 0 or 1), 1, talent.researchStartTime, talent.researchDuration, talent.timeleftString) 120 AddShipmentInfo(OH_TALENT, talent.name, talent.icon, 1, (talent.isBeingResearched and 0 or 1), 1, talent.researchStartTime, talent.researchDuration, talent.timeleftString)
120 end 121 end