wow/turok: Turok/Modules/Timer/Timer.lua comparison

comparison Turok/Modules/Timer/Timer.lua @ 9:9400a0ff8540

Ugh Timer: - container update directionality - talent update iterates over a non-volatile table to carry out updates - index management steps organized - talentRow status implemented, returns the spell associated with the talent chosen from that row CombatLog: - sort out font controls and unbork arguments

author	Nenue
date	Sun, 21 Feb 2016 13:08:30 -0500
parents	a9b8b0866ece
children

comparison

equal deleted inserted replaced

-:7790dff0fe13
+:9400a0ff8540
 -- @project-revision@ @project-hash@
 -- @file-revision@ @file-hash@
 --- Defines common elements for the various timer HUDs
 local ADDON, _A = ...
 local _G, CreateFrame, tconcat, GetInventoryItemsForSlot, GetInventoryItemID = _G, CreateFrame, table.concat, GetInventoryItemsForSlot, GetInventoryItemID
-local T, F, tostring, type, max, tinsert, unpack, UIParent, loadstring = _A.Addon, _A.LibFog, tostring, type, max, table.insert, unpack, _G.UIParent, loadstring
+local T, F, tostring, type, max, tinsert, unpack, UIParent, loadstring, rawset = _A.Addon, _A.LibFog, tostring, type, max, table.insert, unpack, _G.UIParent, loadstring, rawset
 local mod = T.modules.TimerControl
 local P = mod.prototype
 local db
-local pairs, ipairs, gsub, sub, setmetatable = pairs, ipairs, string.gsub, string.sub, setmetatable
+local pairs, ipairs, gsub, sub, setmetatable, wipe = pairs, ipairs, string.gsub, string.sub, setmetatable, wipe
 local INVTYPE_FINGER, INVSLOT_FINGER1, INVSLOT_FINGER2, INVTYPE_TRINKET, INVSLOT_TRINKET1, INVSLOT_TRINKET2 =
 INVTYPE_FINGER, INVSLOT_FINGER1, INVSLOT_FINGER2, INVTYPE_TRINKET, INVSLOT_TRINKET1, INVSLOT_TRINKET2
 --@debug@
 local DEBUG = true
 --@end-debug@
 if not DEBUG then return end
 if _G.Devian and _G.DevianDB.workspace ~= 1 then
 _G.print('Timer', ...)
 end
 end
+local teprint = function(...)
+if not DEBUG then return end
+if _G.Devian and _G.DevianDB.workspace ~= 1 then
+_G.print('TimerEvent',...)
+end
+end
+local tfprint = function(...)
+if not DEBUG then return end
+if _G.Devian and _G.DevianDB.workspace ~= 1 then
+_G.print('TimerFocus',...)
+end
+end
 local Timer_GetPrintHandler = function(self)
 if self.trace then
 return function(...)
 print(...)
-_G.print('TimerFocus', ...)
+tfprint(...)
 end else
 return print
 end
 end
 local pb_suppressed = {}
 local mt_single = {
 __mode = "v",
 __newindex = function(t,k,v)
 rawset(t,k,v)
-_G.print('DB', 'TCMeta: adding leaf', k, '=', v)
+--_G.print('DB', 'TCMeta: adding leaf', k, '=', v)
 end}
 local mt_double = {
 __index = function(t,k)
 t[k] = setmetatable({}, mt_single)
-_G.print('DB', 'TCMeta: add layer', k, '=', t[k])
+--_G.print('DB', 'TCMeta: add layer', k, '=', t[k])
 return t[k]
 end,
 __newindex = function(t,k,v)
 rawset(t,k,v)
-_G.print('DB', 'TCMeta: adding to top layer', k, '=', v)
+--_G.print('DB', 'TCMeta: adding to top layer', k, '=', v)
 end
 }
 local mt_error = {
 __call =function (t, txt)
 t.disable = true
 return mod.timers[id], newFrame
 end
 function mod.InitTimers()
-local print = function(...) _G.print('TimerEvent', ...) end
+teprint('INIT TIMERS ====================')
-print('INIT TIMERS ====================')
 for id, spirit in pairs(mod.timers) do
 if spirit.disable then
-print(id, 'disabled:', tconcat(spirit.debug_info or {}, ', '))
+teprint(id, 'disabled:', tconcat(spirit.debug_info or {}, ', '))
 else
-print(cText('init'), cNum(id), cWord(spirit.name))
+teprint(cText('init'), cNum(id), cWord(spirit.name))
 --- Throw a dry event to initialize values
-print(cText(' *'), cWord('prototype.'..cKey(spirit.dvars.type)..'.'..cWord('Load')))
+teprint(cText(' *'), cWord('prototype.'..cKey(spirit.dvars.type)..'.'..cWord('Load')))
 P.trigger[spirit.dvars.type].Event(spirit)
 --- Set loose
-print(cText(' *'), cWord('prototype')..'.'..cKey('events')..'.'..cWord('Load'))
+teprint(cText(' *'), cWord('prototype')..'.'..cKey('events')..'.'..cWord('Load'))
 mod.UpdateEvents(spirit, P.trigger[spirit.dvars.type].events)
 end
 end
-print('INIT DONE =========================')
+teprint('INIT DONE =========================')
 end
 function mod:DisableTimer(name, timer)
 local timer_frame = mod.db.timers[name]
 if timer_frame and not timer_frame.disable then
 end
 local match_sub = {
 {'%%c', "' .. tostring(t.caster).. '"},
 {'%%h', "' .. tostring((t.valueFull >= 60) and (math.floor(t.valueFull/60)) or t.value) .. '"},
-{'%%i', "' .. tostring((t.valueFull >= 60) and (t.value % 60) or ((t.valueFull < 6) and math.floor((t.ValueFull * 100) % 100) or '')) .. '"},
+{'%%i', "' .. tostring((t.valueFull >= 60) and (math.floor(t.valueFull/60) .. ':' .. ((t.value %% 60) < 10 and '0' or '').. (t.value %% 60)) or ((t.valueFull < 6) and (t.value .. '.' .. math.floor((t.valueFull * 10) %% 10)) or t.value)) .. '"},
 {'%%n', "' .. tostring(t.spellName) .. '"},
 {'%%p', "' .. tostring(t.value) .. '"},
 {'%%d', "' .. tostring(t.chargeDuration or t.duration) .. '"},
 {'%%%.p', "' .. string.sub(tostring((t.valueFull %% 1) * 100),0,1) .. '"},
 {"%%s", "' .. (t.stacks or t.charges or '') .. '"},
 v:Event(nil, 'target')
 end
 end
 --- Same thing but for talent/spec-driven
+local update_queue = {}
+function mod.ResetTimers(heading)
+print(cText('*** Flushing update queue for'), cWord(heading))
+for id, frame in pairs(update_queue) do
+print('  ', cNum(id), cKey(frame.timerName))
+frame.disable = nil
+wipe(frame.debug_info)
+local res, msg = mod:EnableTimer(id, frame.dvars)
+end
+wipe(update_queue)
+end
 function mod:PLAYER_TALENT_UPDATE(e, unit)
 print('')
 print('')
 print(cText(e), T.specPage, T.specName)
-local update_queue = {}
 for _, k in ipairs({'talentID', 'talentRow', 'specPage'}) do
 for value, frameSet in pairs(mod.frames.talentID) do
 for id, frame in ipairs(frameSet) do
 print(frame.timerID, frame.timerName)
 update_queue[frame.timerID] = frame
 end
 end
 end
+mod.resetTimers('Talent')
-for id, frame in pairs(update_queue) do
-print('Refreshing spec-related frames', id, frame.timerName)
-frame.disable = nil
-table.wipe(frame.debug_info)
-local res, msg = mod:EnableTimer(id, frame.dvars)
-end
 end
 function mod:PLAYER_EQUIPMENT_CHANGED(e, slot, hasItem)
 print(e, slot, hasItem)
-local itemCheckList
+if mod.frames.inventoryID and mod.frames.inventoryID[slot] then
-if mod.frames.inventoryID and  mod.frames.inventoryID[slot] then
+print('  Inventory slot:', cNum(slot))
-print('  Inventory Frames:')
+for i, slotFrame in ipairs(mod.frames.inventoryID[slot]) do
-itemCheckList = GetInventoryItemsForSlot(slot, {}, false)
+print('   ', cNum(i), cText(slotFrame.timerName))
-for id, slotFrame in pairs(mod.frames.inventoryID[slot]) do
+update_queue[slotFrame.timerID] = slotFrame
-print('   * Updating', cNum(id), cWord(slotFrame.timerName))
+if mod.frames.itemID then
-local res, msg = mod:EnableTimer(slotFrame.timerID, slotFrame.dvars)
+local itemsForSlot = GetInventoryItemsForSlot(slot, {}, false)
-print('     ', cBool(res), cText(msg))
+for _, itemID in pairs(itemsForSlot) do
-end
+if mod.frames.itemID[itemID] then
-end
+print('    Frames for equippable item:', cNum(itemID))
-if itemCheckList then
+for j, itemFrame in ipairs(mod.frames.itemID[itemID]) do
-print(unpack(itemCheckList))
+print('     ', cNum(j), cText(itemFrame.timerName))
-end
+update_queue[itemFrame.timerID] = itemFrame
-local itemID = GetInventoryItemID('player', slot)
+end
-if itemID and mod.frames.itemID[itemID] then
+end
-print('  Item ID Frames:')
+end
-for id, itemFrame in pairs(mod.frames.itemID[itemID]) do
+end
-print('   * Updating', cNum(id), cWord(itemFrame.timerName))
+end
+end
-local res, msg = mod:EnableTimer(itemFrame.timerID, itemFrame.dvars)
+mod.ResetTimers('Equipment')
-print('     ', cBool(res), cText(msg))
-end
-end
 end
 function mod:PET_BATTLE_OPENING_START ()
 for i, v in pairs(mod.timers) do
 if not v.disable then
 print('suppressing', v:GetName())

Mercurial > wow > turok

comparison Turok/Modules/Timer/Timer.lua @ 9:9400a0ff8540