wow/worldplan: ClassPlan.lua comparison

comparison ClassPlan.lua @ 95:b29b35cb8539

- Fixed quest completion checking and handling - Changed animation method to hopefully stop weird flickering. - Pins are now visible before full reward data is loaded - Filter bar redesigned: - aligned horizontally along the top of the map display - filter buttons display a '+' when there are matches in both current and other zones, and '*' when there only matches in other zones - button tooltips separate local and global quests - button categories are highlighted and labeled when the cursor is over them - Fixed invalid POI targets appearing when the spell targeting cursor is active - ClassOrderPlan can be closed with the game menu button

author	Nenue
date	Mon, 08 May 2017 22:38:52 -0400
parents	79e5e96e5f18
children	4d1520186ea4 a3800989f515

comparison

equal deleted inserted replaced

-:dfd53f7c0fe5
+:b29b35cb8539
 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 '')
+elseif timeLeft < 60 then
+return (seconds .. ' sec')
 else
 return ((hours > 0) and (hours .. 'h') or '') .. ((minutes > 0) and (' ' ..minutes .. ' min') or '')
 end
 end
 self:RegisterEvent('ADDON_LOADED')
 self:RegisterEvent('PLAYER_REGEN_ENABLED')
 self:RegisterEvent('PLAYER_REGEN_DISABLED')
 self:RegisterEvent('GARRISON_SHOW_LANDING_PAGE')
 self:RegisterForDrag('LeftButton')
+self:EnableMouse(true)
 self:SetMovable(true)
 self:SetToplevel(true)
 SLASH_CLASSPLAN1 = "/classplan"
 SLASH_CLASSPLAN2 = "/cp"
 --hooksecurefunc(C_Garrison, 'RequestLandingPageShipmentInfo', function()
 --  WorldPlan:print("Requesting shipments data.")
 --end)
 C_Garrison.RequestLandingPageShipmentInfo();
 self.isStale = true
+UIPanelWindows[self:GetName()] =				{ area = "right",		pushable = 3,	whileDead = 1 };
+tinsert(UISpecialFrames, self:GetName())
 end
 function ClassPlan:GetCurrentProfile()
 WorldPlanData.OrderHall = WorldPlanData.OrderHall or {}
 self.HeaderInset:SetHeight(CP_HEADER_SIZE)
 self.ClassStripe:SetColorTexture(classColor.r, classColor.g, classColor.b, 1)
 self.ClassStripe:SetPoint('TOPLEFT', self.HeaderInset, 'BOTTOMLEFT')
+self.maxItems = db.maxItems or self.maxItems
 return self.profile
 end
 function ClassPlan:AddHandler(frame)
 print('|cFF00FF00'..frame:GetName()..' loaded')
 frame.data = self.data
 self.profile[listKey] = self.profile[listKey] or {}
 local listTitle = frame.listTitle[index]
 setmetatable(self.profile[listKey], { __tostring = function() return listTitle end })
 frame.sortedItems[listKey] = {}
+frame.maxItems = self.maxItems
 end
 frame.owningFrame = self
 frame:SetList(1)
 end
 self.data.IsShown = true
 self.FadeIn:Play()
 end
 end
+function ClassPlan:OnMouseDown(button)
+print(button)
+if button == 'RightButton' then
+self:Toggle()
+end
+end
 function ClassPlan:OnUpdate()
 if self.requestingData then
 self:RefreshData()
 elseif self.isStale then
 if self.OnSetList then
 self:OnSetList(self.currentListIndex, prevIndex)
 end
 end
+function ClassPlanHandlerBase:OnLoad(...)
+print(self:GetName()..':OnLoad()', ...)
+self:EnableMouse(true)
+end
+function ClassPlanHandlerBase:OnMouseDown(button, down)
+print(self:GetName().. ':OnMouseDown()', button)
+ClassOrderPlan:OnMouseDown(button)
+end
 function ClassPlanHandlerBase:OnMouseWheel(delta)
-self.scrollOffset = (self.scrollOffset or 0) - ((delta > 0) and 1 or -1)
+if IsControlKeyDown() then
+if delta > 0 then
+if self.maxItems < 30 then
+self.maxItems = self.maxItems + 1
+end
+else
+if self.maxItems >= 2 then
+self.maxItems = self.maxItems - 1
+end
+end
+if WorldPlanData.OrderHall then
+WorldPlanData.OrderHall.maxItems = self.maxItems
+end
+else
+self.scrollOffset = (self.scrollOffset or 0) - ((delta > 0) and 1 or -1)
+end
 self:UpdateItems()
 end
 function ClassPlanHandlerBase:RefreshData()
 print('|cFF0088FF'..self:GetName()..':RefreshData()')
 totalHeight = totalHeight + block:GetHeight()
 block.lastProfile = lastProfile
 -- blot out arbitrary flags
 block.offerEndTime = nil
+block.isComplete = data.isComplete
 block.missionEndTime = nil
 block.creationTime = nil
 block.duration = nil
 block.throttle = 5
 end
 end
 end
 function ClassPlanEntryBase:SetTimeLeft(expires, duration)
-self.ProgressBG:Hide()
-self.ProgressBar:Hide()
 if not expires then
 return
 end
 -- calculate here since time isn't available
 local timeLeft = expires - time()
+--print(self:GetName(), timeLeft)
 if timeLeft < 0 then
 -- handle being complete
 if self.shipmentsReady and (self.shipmentsReady < self.shipmentsTotal) then
 self.TimeLeft:SetText('Ready')
 else
 self.TimeLeft:SetText('Complete!')
 end
 else
 self.TimeLeft:SetText(GetTimeLeftString(timeLeft))
-end
+if duration then
+local progress = (duration - timeLeft) / duration
-if (timeLeft > 0) and duration then
+local r = ((progress >= .5) and (progress/2)) or 1
-local progress = (duration - timeLeft) / duration
+local g = ((progress <= .5) and (progress*2)) or 1
-local r = ((progress >= .5) and (progress/2)) or 1
+self.ProgressBG:Show()
-local g = ((progress <= .5) and (progress*2)) or 1
+self.ProgressBar:Show()
-self.ProgressBG:Show()
+self.ProgressBG:SetColorTexture(r,g,0,0.25)
-self.ProgressBar:Show()
+self.ProgressBar:SetColorTexture(r,g,0,0.5)
-self.ProgressBG:SetColorTexture(r,g,0,0.25)
+self.ProgressBar:SetWidth(self.ProgressBG:GetWidth() * progress)
-self.ProgressBar:SetColorTexture(r,g,0,0.5)
+else
-self.ProgressBar:SetWidth(self.ProgressBG:GetWidth() * progress)
+self.ProgressBG:Hide()
+self.ProgressBar:Hide()
+end
 end
 end

Mercurial > wow > worldplan

comparison ClassPlan.lua @ 95:b29b35cb8539