wow/worldplan: ClassPlan.lua comparison

comparison ClassPlan.lua @ 6:48001b6a9496

shipment/missions list refresh should commit all result sets

author	Nenue
date	Fri, 21 Oct 2016 18:10:53 -0400
parents	4e1883842abf
children	802abb8a10ea

comparison

equal deleted inserted replaced

-:4e1883842abf
+:48001b6a9496
 timers = {},
 shipments = {},
 playerFirst = false,
 prototypes = {}
 }
-ClassPlanBlockMixin = {
+ClassPlanMissionMixin = {
-templateName = 'ClassPlanBlock',
+templateName = 'ClassPlanMissionEntry',
 events = {'GARRISON_MISSION_LIST_UPDATE', 'GARRISON_MISSION_STARTED', 'GARRISON_MISSION_FINISHED'},}
 ClassPlanShipmentMixin = {
-templateName = 'ClassPlanShipment',
+templateName = 'ClassPlanShipmentEntry',
 parent = false,
 point = 'TOPRIGHT',
 relativePoint ='TOPRIGHT',
 events = {'GARRISON_LANDINGPAGE_SHIPMENTS', 'GARRISON_TALENT_UPDATE', "GARRISON_TALENT_COMPLETE", "GARRISON_SHIPMENT_RECEIVED"},
 }
-setmetatable(ClassPlanShipmentMixin, {__index = ClassPlanBlockMixin})
+setmetatable(ClassPlanShipmentMixin, {__index = ClassPlanMissionMixin})
-local core, MissionsHandler, ShipmentsHandler = ClassOrderPlanCore, ClassPlanBlockMixin, ClassPlanShipmentMixin
+local core, MissionsHandler, ShipmentsHandler = ClassOrderPlanCore, ClassPlanMissionMixin, ClassPlanShipmentMixin
 local print = DEVIAN_WORKSPACE and function(...) print('ClassPlan', ...) end or nop
 local GetTimeLeftString = function(timeLeft)
 local days = floor(timeLeft/(24*3600))
 local hours = floor(mod(timeLeft, (24*3600)) / 3600)
 local minutes = floor(mod(timeLeft, 3600) / 60)
 local seconds = mod(timeLeft, 60)
 if days >= 1 then
-return (days .. 'd' .. ' ') .. ((hours > 0) and (hours .. 'h ') or '')
+return (days .. 'd' .. ' ') .. ((hours > 0) and (hours .. 'h') or '')
 else
-return ((hours > 0) and (hours .. 'h ') or '') .. ((minutes > 0) and (minutes .. ' min') or '')
+return ((hours > 0) and (hours .. 'h') or '') .. ((minutes > 0) and (' ' ..minutes .. ' min') or '')
 end
 end
 MissionsHandler.GetPlayerData = function(self)
 if not self.profile then
 ShipmentsHandler.OnGetItem = function(data)
 if data.shipmentsTotal then
 local timeLeft = data.creationTime + data.duration - GI_currentTime
 if (timeLeft <= 0) and (data.shipmentsReady < data.shipmentsTotal) then
-local numOrders = -1*floor(timeLeft/data.duration)
+local numOrders = min(-1*floor(timeLeft/data.duration), (data.shipmentsTotal - data.shipmentsReady))
-data.originalCreationTime = data.creationTime
+if not data.originalCreationTime then
-data.originalShipmentsReady = data.shipmentsReady
+data.originalCreationTime = data.creationTime
+data.originalShipmentsReady = data.shipmentsReady
+end
 data.creationTime = data.creationTime + numOrders*data.duration
 data.shipmentsReady = data.shipmentsReady + numOrders
 print(data.profileKey, 'shipment "'.. data.name..'" reconciling', numOrders, 'lapsed orders. -->', data.creationTime, data.shipmentsReady)
 end
 else
 return (a.creationTime) < (b.creationTime)
 end
 end
-local AddShipmentInfo = function(self, shipmentType, name, texture, shipmentCapacity, shipmentsReady, shipmentsTotal, creationTime, duration, timeleftString, itemName, itemIcon, itemQuality, itemID, followerID)
+local ShipmentsInfo = {}
+local AddShipmentInfo = function(shipmentType, name, texture, shipmentCapacity, shipmentsReady, shipmentsTotal, creationTime, duration, timeleftString, itemName, itemIcon, itemQuality, itemID, followerID)
 -- early login queries may return empty tables, causing the sorter to compare nil
 if not creationTime then
 return
 end
 print(shipmentType, name, shipmentCapacity, shipmentsReady, shipmentsTotal, creationTime, duration, timeleftString)
-tinsert(self.shipments,
+tinsert(ShipmentsInfo,
 {
 shipmentType = shipmentType,
 name = name,
 icon = texture,
 shipmentCapacity = shipmentCapacity,
 end
 ShipmentsHandler.GetPlayerData = function (self)
 if not self.profile then
 return
 end
-wipe(self.shipments)
+wipe(ShipmentsInfo)
 local garrisonType = LE_GARRISON_TYPE_7_0
 local buildings = C_Garrison.GetBuildings(garrisonType);
 local shipmentIndex = 0
 --print('Buildings:')
 for i = 1, #buildings do
 local name, texture, shipmentCapacity, shipmentsReady, shipmentsTotal, creationTime, duration, timeleftString, itemName, itemIcon, itemQuality, itemID = C_Garrison.GetLandingPageShipmentInfo(buildingID);
-AddShipmentInfo(self, 'Building', name, texture, shipmentCapacity, shipmentsReady, shipmentsTotal, creationTime, duration, timeleftString, itemName, itemIcon, itemQuality, itemID)
+AddShipmentInfo('Building', name, texture, shipmentCapacity, shipmentsReady, shipmentsTotal, creationTime, duration, timeleftString, itemName, itemIcon, itemQuality, itemID)
 end
 --print('Follower:')
 local followerShipments = C_Garrison.GetFollowerShipments(garrisonType);
 for i = 1, #followerShipments do
 local name, texture, shipmentCapacity, shipmentsReady, shipmentsTotal, creationTime, duration, timeleftString, _, _, _, _, followerID = C_Garrison.GetLandingPageShipmentInfoByContainerID(followerShipments[i]);
-AddShipmentInfo(self, 'Follower', name, texture, shipmentCapacity, shipmentsReady, shipmentsTotal, creationTime, duration, timeleftString, nil, nil, nil, nil, followerID)
+AddShipmentInfo('Follower', name, texture, shipmentCapacity, shipmentsReady, shipmentsTotal, creationTime, duration, timeleftString, nil, nil, nil, nil, followerID)
 end
 --print('Loose:')
 local looseShipments = C_Garrison.GetLooseShipments(garrisonType)
 for i = 1, #looseShipments do
 local name, texture, shipmentCapacity, shipmentsReady, shipmentsTotal, creationTime, duration, timeleftString = C_Garrison.GetLandingPageShipmentInfoByContainerID(looseShipments[i]);
-AddShipmentInfo(self, 'Follower', name, texture, shipmentCapacity, shipmentsReady, shipmentsTotal, creationTime, duration, timeleftString)
+AddShipmentInfo('Misc', name, texture, shipmentCapacity, shipmentsReady, shipmentsTotal, creationTime, duration, timeleftString)
 end
 local talentTrees = C_Garrison.GetTalentTrees(garrisonType, select(3, UnitClass("player")));
 -- this is a talent that has completed, but has not been seen in the talent UI yet.
 local completeTalentID = C_Garrison.GetCompleteTalent(garrisonType);
 if (talentTrees) then
 for treeIndex, tree in ipairs(talentTrees) do
 for talentIndex, talent in ipairs(tree) do
 local showTalent = false;
 if (talent.isBeingResearched) or (talent.id == completeTalentID) then
-AddShipmentInfo(self, 'Talent', talent.name, talent.icon, 1, (talent.isBeingResearched and 0 or 1), 1, talent.researchStartTime, talent.researchDuration, talent.timeleftString)
+AddShipmentInfo('Talent', talent.name, talent.icon, 1, (talent.isBeingResearched and 0 or 1), 1, talent.researchStartTime, talent.researchDuration, talent.timeleftString)
 end
 end
 end
 end
 self.profile.shipments = self.profile.shipments or {}
-if #self.shipments >= 1 then
+wipe(self.profile.shipments)
-wipe(self.profile.shipments)
+for index, data in ipairs(ShipmentsInfo) do
-for index, data in ipairs(self.shipments) do
+--DEFAULT_CHAT_FRAME:AddMessage(data.shipmentType ..' '.. tostring(data.name) ..' '.. tostring(data.creationTime) ..' '.. tostring(data.duration))
+tinsert(self.profile.shipments, data)
---DEFAULT_CHAT_FRAME:AddMessage(data.shipmentType ..' '.. tostring(data.name) ..' '.. tostring(data.creationTime) ..' '.. tostring(data.duration))
+end
-tinsert(self.profile.shipments, data)
+self.isStale = true
-end
-self.isStale = true
-end
 if self:IsVisible() then
 self:Refresh()
 end
 end
 end
 function core:OnEvent (event, ...)
 print(event)
 if event == 'PLAYER_REGEN_DISABLED' then
-self:SetShown(false)
+if self:IsVisible() then
+self.combatHide = true
+self:SetShown(false)
+end
 elseif event == 'PLAYER_REGEN_ENABLED' then
-self:SetShown(true)
+if self.combatHide == true then
+self.combatHide = nil
+self:SetShown(true)
+end
 elseif event == 'PLAYER_LOGIN' then
 if not self.initialized then
 self:Setup()
 end
 elseif self.initialized and self.events[event] then
 function MissionsHandler:OnComplete()
 print('flagging complete', self.name)
 self:Refresh()
 end
-function MissionsHandler:OnUpdate()
+function MissionsHandler:OnUpdate(sinceLast)
 if self.isComplete then
 return
 end
+self.throttle = (self.throttle or .5) + sinceLast
+if self.throttle >= .5 then
+self.throttle = self.throttle - .5
+else
+return
+end
 if self.missionEndTime then
 local timeLeft = self.missionEndTime - time()
 if timeLeft < 0 then
 self:OnComplete()
 if timeLeft > 3600 then
 self.TimeLeft:SetTextColor(1,1,1)
 else
 self.TimeLeft:SetTextColor(1,1,0)
 end
+end
-end
+if not self.isComplete then
+local progress = (self.missionEndTime - time()) / self.durationSeconds
+local w = self.ProgressBG:GetWidth()
+if progress >= 1 then
+self.ProgressBar:SetWidth(w)
+else
+self.ProgressBar:SetWidth(w - (progress * w))
+end
+self.ProgressBG:Show()
+self.ProgressBar:Show()
+else
+self.ProgressBG:Hide()
+self.ProgressBar:Hide()
+end
 else
 self.TimeLeft:SetText(self.missionEndTime)
 end
 end
 self.Icon:SetTexture(self.rewards[1].icon or GetItemIcon(self.rewards[1].itemID))
 self.rewardInfo = self.rewards[1]
 else
 self.Icon:SetAtlas(self.typeAtlas, false)
 end
 end
 function MissionsHandler:OnEnter()
 if self.rewardInfo and self.rewardInfo.itemID then
 self.Count:SetText(self.shipmentsReady)
 self.Done:SetShown(self.shipmentsReady and (self.shipmentsReady >= 1))
 -- flag as complete
-if ( self.shipmentsReady == self.shipmentsTotal ) and (not self.isBeingResearched) then
+if ( self.shipmentsReady >= self.shipmentsTotal ) and (not self.isBeingResearched) then
 self.Swipe:SetCooldownUNIX(0, 0);
 self.Done:Show();
 self.isComplete = true
 else
 self.Swipe:SetCooldownUNIX(self.creationTime or 0 , self.duration or 0);
 self.Background:SetAlpha(hasPickups and 1 or 0.1)
 end
 local time = time
 function ShipmentsHandler:OnUpdate()
-if (self.shipmentsReady and self.shipmentsTotal) and (self.shipmentsReady ~= self.shipmentsTotal) then
+if (self.shipmentsReady and self.shipmentsTotal) and (self.shipmentsReady < self.shipmentsTotal) then
 local timeLeft = self.creationTime + self.duration - time()
-self.TimeLeft:SetText('Next: '.. GetTimeLeftString(timeLeft) .. ' |cFFFFFF00'..self.shipmentsTotal..' orders|r')
+if self.shipmentsReady >= 1 then
-elseif self.isStale then
+self.TimeLeft:SetText(GetTimeLeftString(timeLeft))
-self.TimeLeft:SetText('|cFFFF0000Needs refresh|r')
+self.TimeLeft:SetTextColor(0,1,0)
+else
+self.TimeLeft:SetText(GetTimeLeftString(timeLeft))
+self.TimeLeft:SetTextColor(1,1,1)
+end
+if (timeLeft < 0) then
+if self.shipmentsReady < self.shipmentsTotal then
+self.shipmentsReady = self.shipmentsReady + 1
+self.creationTime = self.creationTime + self.duration
+-- text will be set on next update
+end
+end
 elseif self.isBeingResearched then
 self.TimeLeft:SetText(GetTimeLeftString(self.researchStartTime + self.researchDuration - time()))
+self.TimeLeft:SetTextColor(1,1,0)
 else
 self.TimeLeft:SetText('Complete!')
+self.TimeLeft:SetTextColor(0,1,0)
 end
 end
 function ShipmentsHandler:OnEnter()

Mercurial > wow > worldplan

comparison ClassPlan.lua @ 6:48001b6a9496