feat: innervate cooldown, spell reordering, and dead-state toggle (#12)

* feat: innervate cooldown, spell reordering, and dead-state toggle

- Add Innervate (180s) to Druid cooldowns in Data.lua
- Right-click any tracker row to toggle dead state: desaturates icon and
  greys out the card to indicate the player has died; right-click again
  to restore (battle rez). Timer continues running. /cdt reset clears all
  dead states.
- Spell reordering via Settings panel: each ability row now has ▲/▼ arrow
  buttons to move it up or down in the tracker. Order is persisted in the
  new CooldownTrackerDB.spellOrder SavedVariable. A Reset Order button
  restores the default sequence.

* fix: sort comparator strict ordering and stale spellOrder pruning

- Guard sort comparator against comparing an element with itself (a.id ==
  b.id returns false immediately), fixing potential 'invalid order function'
  runtime error in Lua 5.1 when spellOrder is empty.
- Prune stale spell IDs from spellOrder during BuildExpandedCooldowns so
  ghost entries from renamed/removed spells can never silently consume swap
  positions.

* fix: replace cramped scroll-bar arrow textures with UIPanelButton arrows

Reorder buttons were 22x15px scroll-bar textures with overlapping anchors
inside a 42px row. Replaced with UIPanelButtonTemplate buttons (24x18px
each, 2px gap) anchored correctly so they stack cleanly without overlap.
Switched arrow glyphs to unicode ▲/▼ which are far more legible at this
size.

* fix: use ASCII glyphs and center reorder buttons vertically in row

FRIZQT__.TTF lacks the Unicode geometric arrow codepoints, causing them
to render as boxes. Replaced with ASCII ^ and v which the font supports.
Anchored both buttons from the row RIGHT with +/-10 Y offsets so the
18+2+18px pair is centered in the 42px row instead of sitting at the top.

* fix: use native WoW arrow textures for reorder buttons

Replaced mismatched font glyphs (^ vs v render at different heights in
FRIZQT) with inline |T...|t texture escapes pointing at the same Arrow-Up
and Arrow-Down assets Blizzard uses in their own UI. Both arrows render at
12x12px so they are guaranteed identical in size.

* fix: center arrow textures in reorder buttons using child overlay

Inline |T|t text can't be offset, so asymmetric padding in the native
arrow textures made the up arrow hug the bottom and down arrow hug the
top. Replaced with explicit child OVERLAY textures anchored at CENTER
with +/-1 Y nudges to counteract the texture's internal whitespace.

* fix: increase down arrow Y nudge to -3 for visual centering

* fix: grey out timer and name text when player is marked dead

ApplyDeadVisuals now sets timerLabel, nameLabel, and classLabel to grey
(0.5, 0.5, 0.5) alongside the icon/strip/bg. ClearDeadVisuals restores
nameLabel to white and classLabel to its class colour. timerLabel is
restored implicitly by the UpdateRow tick which rewrites it each frame.

* fix: preserve active timers across RebuildUI calls

Removing CT.activeTimers = {} from RebuildUI() was wiping all running
timers every time a settings change (column count, class count, spell
visibility, reorder) triggered a rebuild. Timers are now only cleared
explicitly by the /cdt reset slash command, which is the only caller
that actually intends to reset them. Orphaned entries from ID changes
(e.g. count 1→2) are harmless -- UpdateRow ignores keys with no
matching row.

* fix: use grey color codes in timer text for dead-state rows

SetTextColor() is overridden by embedded |cff...|r escape sequences in
the text string. UpdateRow now reads CT.deadStates each tick and injects
|cff808080 instead of the normal green/orange codes, so the grey sticks
regardless of timer state. Works whether dead is marked before or after
the timer starts since UpdateRow fires every frame.

* docs: update README for innervate, reorder, and dead-state features

* fix: prune stale spellOrder IDs in MoveSpell and drop RebuildUI timer flash

- MoveSpell now rebuilds the order array by removing any IDs not in
  CT.COOLDOWNS before searching for the swap position, matching the
  knownIds pruning already present in BuildExpandedCooldowns. Previously
  a ghost entry could silently consume a swap slot.
- RebuildUI no longer unconditionally overwrites timerLabel with 'Ready'.
  UpdateRow handles the correct text (respecting active timers and dead
  state) on the next OnUpdate tick, eliminating the one-frame green flash
  when reordering while a timer is running.

Author: Rubyj

AGENTS.md

@@ -64,6 +64,7 @@ Also update `## Version:` in `CooldownTracker.toc` to match the tag before taggi
    | `playSoundOnReady` | boolean | `true` | Play alert sound on cooldown expiry |
    | `frameLocked` | boolean | `false` | Lock window position (disable drag) |
    | `point`, `relPoint`, `x`, `y` | mixed | nil | Saved window position |
+   | `spellOrder` | table | `{}` | Ordered array of spell `id` strings defining tracker display order; empty = default |
 3. **Slash Commands:** Register slash commands via the `SlashCmdList` table. Handle arguments cleanly.
 4. **No Third-Party Libraries:** The addon intentionally does not use Ace3 or other framework libraries to remain lightweight. Rely on the standard WoW API.
 

Core.lua

@@ -26,6 +26,7 @@ eventFrame:SetScript("OnEvent", function(_, event, name)
         CooldownTrackerDB = CooldownTrackerDB or {}
         CooldownTrackerDB.classCounts     = CooldownTrackerDB.classCounts or {}
         CooldownTrackerDB.disabledSpells  = CooldownTrackerDB.disabledSpells or {}
+        CooldownTrackerDB.spellOrder      = CooldownTrackerDB.spellOrder or {}
         if CooldownTrackerDB.playSoundOnReady == nil then
             CooldownTrackerDB.playSoundOnReady = true
         end
@@ -53,6 +54,8 @@ SlashCmdList["COOLDOWNTRACKER"] = function(msg)
         for _, cd in ipairs(CT.expandedCooldowns) do
             CT.activeTimers[cd.id] = nil
         end
+        CT.deadStates = {}
+        CT:UpdateAllRows()
         print("|cffaaddff[CooldownTracker]|r All timers reset.")
     elseif cmd == "settings" then
         CT:OpenSettings()

Data.lua

@@ -35,6 +35,15 @@ CT.COOLDOWNS = {
         icon            = "Interface\\Icons\\spell_nature_tranquility",
         r               = 1.0, g = 0.49, b = 0.04,
     },
+    {
+        id              = "druid_innervate",
+        class           = "Druid",
+        name            = "Innervate",
+        duration        = 180,
+        defaultDuration = 180,
+        icon            = "Interface\\Icons\\spell_nature_lightning",
+        r               = 1.0, g = 0.49, b = 0.04,
+    },
 
     -- -------------------------------------------------------------------------
     -- Paladin (class colour: pink)

README.md

@@ -7,14 +7,17 @@ Because Midnight restricts addons from reading real-time combat data, this addon
 ## Features
 
 - Click anywhere on a spell row to start or reset its timer
+- Right-click a spell row to mark a player as dead (row goes grey); right-click again to restore (battle rez)
 - Countdown display (`M:SS`) with colour-coded progress bar (green → yellow → red)
 - Audible alert when a cooldown becomes ready (toggleable)
 - Grid or vertical layout with configurable column count (1–9)
+- Reorderable spells — use ▲/▼ arrows in the settings panel to set any display order
 - Per-spell visibility toggles — hide abilities you're not tracking
 - Lockable window — prevent accidental dragging mid-raid
 - Draggable window with position saved between sessions
 - In-game settings panel (Escape → Options → AddOns → Healer Cooldown Tracker)
 - Tooltips showing cooldown details on hover
+- Tracks Druid cooldowns: Convoke the Spirits, Tranquility, Innervate
 
 ## Installation
 
@@ -42,6 +45,7 @@ Clone the repo and symlink (or copy) the folder directly into your AddOns direct
 
 - Click any spell row to start the cooldown timer
 - Click the same row again to reset a running timer
+- Right-click any spell row to mark the player as **dead** (row goes grey, timer keeps running); right-click again to restore (battle rez)
 - Drag the title bar to reposition; position saves on drag-stop
 - Click the **lock icon** (top-right of title bar) to lock/unlock the window position
 
@@ -53,6 +57,7 @@ Open via **Escape → Options → AddOns → Healer Cooldown Tracker**:
 - **Play sound when cooldown is ready** — toggle the audible alert
 - **Class Roster** — set how many of each class are in the raid; abilities duplicate per player (up to 5)
 - **Show checkboxes** — hide individual spells from the tracker
+- **Spell order** — use ▲/▼ arrows next to each spell to reorder them; Reset Order restores the default sequence
 - **Cooldown durations** — override any ability's cooldown in seconds; revert with the Default button
 
 ## Adding More Cooldowns

Settings.lua

@@ -29,6 +29,61 @@ local function ApplyCustomDurations()
     end
 end
 
+-- Ensures spellOrder is fully populated from the default CT.COOLDOWNS order,
+-- then moves the spell with the given id by `delta` positions (-1 = up, +1 = down).
+-- Refreshes the tracker and updates the provided order-indicator labels table.
+local function MoveSpell(id, delta, labels)
+    local order = CooldownTrackerDB.spellOrder
+    if not order then return end
+
+    -- Populate from defaults if empty.
+    if #order == 0 then
+        for _, cd in ipairs(CT.COOLDOWNS) do
+            table.insert(order, cd.id)
+        end
+    end
+
+    -- Build known-ID set, then rebuild order: remove stale IDs and append any missing ones.
+    local knownIds = {}
+    for _, cd in ipairs(CT.COOLDOWNS) do knownIds[cd.id] = true end
+
+    local pruned = {}
+    for _, sid in ipairs(order) do
+        if knownIds[sid] then table.insert(pruned, sid) end
+    end
+    for _, cd in ipairs(CT.COOLDOWNS) do
+        local found = false
+        for _, sid in ipairs(pruned) do
+            if sid == cd.id then found = true; break end
+        end
+        if not found then table.insert(pruned, cd.id) end
+    end
+    order = pruned
+    CooldownTrackerDB.spellOrder = order
+
+    local pos = nil
+    for i, sid in ipairs(order) do
+        if sid == id then pos = i; break end
+    end
+    if not pos then return end
+
+    local newPos = pos + delta
+    if newPos < 1 or newPos > #order then return end
+    order[pos], order[newPos] = order[newPos], order[pos]
+    CooldownTrackerDB.spellOrder = order
+
+    if CT.RebuildUI then CT:RebuildUI() end
+
+    -- Refresh position indicators in the settings panel.
+    if labels then
+        local posMap = {}
+        for i, sid in ipairs(order) do posMap[sid] = i end
+        for spellId, lbl in pairs(labels) do
+            lbl:SetText(tostring(posMap[spellId] or ""))
+        end
+    end
+end
+
 -- ---------------------------------------------------------------------------
 -- Panel construction
 -- ---------------------------------------------------------------------------
@@ -239,10 +294,32 @@ local function CreateSettingsPanel()
     divider:SetWidth(CONTENT_WIDTH)
     divider:SetColorTexture(0.3, 0.3, 0.4, 0.6)
 
-    -- editBoxes and RefreshAllEditBoxes must be declared here so the OnShow
-    -- closure below can reference them (Lua requires locals before use).
+    -- editBoxes, spellCheckboxes, and orderLabels must be declared here so the
+    -- OnShow closure below can reference them (Lua requires locals before use).
     local editBoxes = {}
     local spellCheckboxes = {}
+    local orderLabels = {}
+
+    local function GetEffectiveOrderPos()
+        local order = CooldownTrackerDB.spellOrder or {}
+        local posMap = {}
+        if #order == 0 then
+            for i, cd in ipairs(CT.COOLDOWNS) do posMap[cd.id] = i end
+        else
+            for i, sid in ipairs(order) do posMap[sid] = i end
+        end
+        return posMap
+    end
+
+    local function RefreshOrderIndicators()
+        C_Timer.After(0, function()
+            local posMap = GetEffectiveOrderPos()
+            for spellId, lbl in pairs(orderLabels) do
+                lbl:SetText(tostring(posMap[spellId] or ""))
+            end
+        end)
+    end
+
     local function RefreshAllEditBoxes()
         C_Timer.After(0, function()
             for _, cd in ipairs(CT.COOLDOWNS) do
@@ -269,6 +346,7 @@ local function CreateSettingsPanel()
                 cb:SetChecked(not disabled[spellId])
             end
             RefreshAllEditBoxes()
+            RefreshOrderIndicators()
         end)
     end)
 
@@ -412,6 +490,52 @@ local function CreateSettingsPanel()
             GameTooltip:Show()
         end)
         editBox:SetScript("OnLeave", function() GameTooltip:Hide() end)
+
+        -- ----- Reorder up/down buttons ----------------------------------------
+        local upBtn = CreateFrame("Button", nil, row, "UIPanelButtonTemplate")
+        upBtn:SetSize(24, 18)
+        upBtn:SetPoint("RIGHT", row, "RIGHT", -14, 10)
+        upBtn:SetText("")
+        local upArrow = upBtn:CreateTexture(nil, "OVERLAY")
+        upArrow:SetSize(12, 12)
+        upArrow:SetPoint("CENTER", 0, 1)
+        upArrow:SetTexture("Interface\\Buttons\\Arrow-Up-Up")
+        upBtn:SetScript("OnClick", function()
+            MoveSpell(cd.id, -1, orderLabels)
+        end)
+        upBtn:SetScript("OnEnter", function()
+            GameTooltip:SetOwner(upBtn, "ANCHOR_RIGHT")
+            GameTooltip:SetText("Move Up")
+            GameTooltip:AddLine("Move this spell earlier in the tracker.", 0.8, 0.8, 0.8)
+            GameTooltip:Show()
+        end)
+        upBtn:SetScript("OnLeave", function() GameTooltip:Hide() end)
+
+        local downBtn = CreateFrame("Button", nil, row, "UIPanelButtonTemplate")
+        downBtn:SetSize(24, 18)
+        downBtn:SetPoint("RIGHT", row, "RIGHT", -14, -10)
+        downBtn:SetText("")
+        local downArrow = downBtn:CreateTexture(nil, "OVERLAY")
+        downArrow:SetSize(12, 12)
+        downArrow:SetPoint("CENTER", 0, -3)
+        downArrow:SetTexture("Interface\\Buttons\\Arrow-Down-Up")
+        downBtn:SetScript("OnClick", function()
+            MoveSpell(cd.id, 1, orderLabels)
+        end)
+        downBtn:SetScript("OnEnter", function()
+            GameTooltip:SetOwner(downBtn, "ANCHOR_RIGHT")
+            GameTooltip:SetText("Move Down")
+            GameTooltip:AddLine("Move this spell later in the tracker.", 0.8, 0.8, 0.8)
+            GameTooltip:Show()
+        end)
+        downBtn:SetScript("OnLeave", function() GameTooltip:Hide() end)
+
+        local orderLabel = row:CreateFontString(nil, "OVERLAY", "GameFontHighlightSmall")
+        orderLabel:SetSize(18, 14)
+        orderLabel:SetPoint("RIGHT", upBtn, "LEFT", -2, 0)
+        orderLabel:SetJustifyH("CENTER")
+        orderLabel:SetTextColor(0.5, 0.5, 0.5)
+        orderLabels[cd.id] = orderLabel
     end
 
     -- ----- Reset All button -------------------------------------------------
@@ -430,6 +554,25 @@ local function CreateSettingsPanel()
         print("|cffaaddff[CooldownTracker]|r All durations reset to defaults.")
     end)
 
+    -- ----- Reset Order button -----------------------------------------------
+    local resetOrderBtn = CreateFrame("Button", nil, panel, "UIPanelButtonTemplate")
+    resetOrderBtn:SetSize(100, 26)
+    resetOrderBtn:SetPoint("LEFT", resetAllBtn, "RIGHT", 8, 0)
+    resetOrderBtn:SetText("Reset Order")
+    resetOrderBtn:SetScript("OnClick", function()
+        CooldownTrackerDB.spellOrder = {}
+        if CT.RebuildUI then CT:RebuildUI() end
+        RefreshOrderIndicators()
+        print("|cffaaddff[CooldownTracker]|r Spell order reset to defaults.")
+    end)
+    resetOrderBtn:SetScript("OnEnter", function()
+        GameTooltip:SetOwner(resetOrderBtn, "ANCHOR_TOP")
+        GameTooltip:SetText("Reset Spell Order")
+        GameTooltip:AddLine("Restores the default display order for all spells.", 0.8, 0.8, 0.8)
+        GameTooltip:Show()
+    end)
+    resetOrderBtn:SetScript("OnLeave", function() GameTooltip:Hide() end)
+
     return panel
 end