Compare commits
20 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 5f39ea21fa | |||
| 57c603fa8e | |||
| f4f3de929b | |||
| ee3fec624d | |||
| 863709e450 | |||
| 78e50e9f5c | |||
| 14dd30e9a9 | |||
| 996a11dd0a | |||
| d1616b4354 | |||
| 3663d44cd4 | |||
| d915f6b844 | |||
| d440c62a73 | |||
| 219e749046 | |||
| 0a56cbe560 | |||
| b8d619c3bb | |||
| f305f0a226 | |||
| f64d2c9250 | |||
| 1faf213f17 | |||
| ee7770baed | |||
| e555a22f36 |
+16
-7
@@ -335,8 +335,10 @@ function addon:OnEnable()
|
||||
|
||||
-- CoA: just "Altoholic <version>" in the title bar (Exiles branding + author credit live in the .toc).
|
||||
-- Read the live .toc Version so it tracks each -coa.N release without editing this string.
|
||||
local titleVersion = GetAddOnMetadata(addonName, "Version") or addon.Version
|
||||
AltoholicFrameName:SetText("Altoholic |cFFFFFFFF".. titleVersion .."|r")
|
||||
-- CoA: use a Lua constant, not GetAddOnMetadata — TOC metadata is cached at game launch
|
||||
-- and does NOT refresh on /reload, so the .toc version looked stale ("still .18"). A Lua
|
||||
-- constant re-evaluates on every /reload, giving a truthful loaded-code version. Bump with the .toc.
|
||||
AltoholicFrameName:SetText("Altoholic |cFFFFFFFF3.3.002b-coa.30|r")
|
||||
|
||||
local realm = GetRealmName()
|
||||
local player = UnitName("player")
|
||||
@@ -495,11 +497,12 @@ function addon:SetItemButtonTexture(button, texture, width, height)
|
||||
height = height or 36
|
||||
|
||||
local itemTexture = _G[button.."IconTexture"]
|
||||
|
||||
if not itemTexture then return end -- CoA: guard buttons that don't exist / lack an IconTexture region (e.g. iterating more professions than there are _ProfN buttons)
|
||||
|
||||
itemTexture:SetWidth(width);
|
||||
itemTexture:SetHeight(height);
|
||||
itemTexture:SetAllPoints(_G[button]);
|
||||
|
||||
|
||||
SetItemButtonTexture(_G[button], texture)
|
||||
end
|
||||
|
||||
@@ -551,6 +554,7 @@ function addon:GetSpellIDFromRecipeLink(link)
|
||||
end
|
||||
|
||||
function addon:GetMoneyString(copper, color, noTexture)
|
||||
copper = copper or 0 -- CoA: callers may pass a no-value DS getter result
|
||||
color = color or "|cFFFFD700"
|
||||
|
||||
local gold = floor( copper / 10000 );
|
||||
@@ -571,6 +575,7 @@ function addon:GetMoneyString(copper, color, noTexture)
|
||||
end
|
||||
|
||||
function addon:GetTimeString(seconds)
|
||||
seconds = seconds or 0 -- CoA: callers may pass a no-value DS getter result
|
||||
local days = floor(seconds / 86400); -- TotalTime is expressed in seconds
|
||||
seconds = mod(seconds, 86400)
|
||||
local hours = floor(seconds / 3600);
|
||||
@@ -603,13 +608,17 @@ end
|
||||
-- Fresh alts have partial per-module data, so every field is guarded here once
|
||||
-- instead of being copy-pasted (and missed) across the frames.
|
||||
function Altoholic:AddCharacterTooltipHeader(character)
|
||||
local locClass, engClass = DS:GetCharacterClass(character)
|
||||
local className = Altoholic:GetCoAClassName(engClass) or locClass or "" -- CoA: current class name (PROPHET->Venomancer, …)
|
||||
AltoTooltip:AddDoubleLine(DS:GetColoredCharacterName(character) or "?", DS:GetColoredCharacterFaction(character) or "")
|
||||
AltoTooltip:AddLine(format("%s %s |r%s %s", L["Level"],
|
||||
GREEN..(DS:GetCharacterLevel(character) or 0), DS:GetCharacterRace(character) or "", DS:GetCharacterClass(character) or ""), 1, 1, 1)
|
||||
GREEN..(DS:GetCharacterLevel(character) or 0), DS:GetCharacterRace(character) or "", className), 1, 1, 1)
|
||||
end
|
||||
|
||||
function Altoholic:SetCharacterRowNameLevel(entry, i, icon, character)
|
||||
_G[entry..i.."NameNormalText"]:SetText(icon .. format("%s (%s)", DS:GetColoredCharacterName(character) or "?", DS:GetCharacterClass(character) or ""))
|
||||
local locClass, engClass = DS:GetCharacterClass(character)
|
||||
local className = Altoholic:GetCoAClassName(engClass) or locClass or "" -- CoA: current class name
|
||||
_G[entry..i.."NameNormalText"]:SetText(icon .. format("%s (%s)", DS:GetColoredCharacterName(character) or "?", className))
|
||||
_G[entry..i.."Level"]:SetText(GREEN .. (DS:GetCharacterLevel(character) or 0))
|
||||
end
|
||||
|
||||
@@ -647,7 +656,7 @@ function Altoholic:FormatDelay(timeStamp)
|
||||
end
|
||||
|
||||
function addon:GetRestedXP(character)
|
||||
local rate = DS:GetRestXPRate(character)
|
||||
local rate = DS:GetRestXPRate(character) or 0 -- CoA: getter returns no value for unscanned/partial chars
|
||||
|
||||
local coeff = 1
|
||||
if addon.Options:Get("RestXPMode") == 1 then
|
||||
|
||||
@@ -13,7 +13,7 @@
|
||||
|
||||
## Author: Thaoky, Telkar-RG
|
||||
## X-Edited-By: Exiles (Sub-Net) — florian.berthold@sub-net.at
|
||||
## Version: 3.3.002b-coa.10
|
||||
## Version: 3.3.002b-coa.30
|
||||
## X-Category: Inventory, Tradeskill, Mail
|
||||
## X-Localizations: enUS, frFR, zhCN, zhTW, deDE, koKR, esES, esMX, ruRU
|
||||
## X-Website: http://wow.curse.com/downloads/wow-addons/details/altoholic.aspx
|
||||
|
||||
+46
-3
@@ -92,7 +92,7 @@
|
||||
|
||||
<Frame name="AltoholicFrame" toplevel="true" parent="UIParent" movable="true" enableMouse="true" hidden="true">
|
||||
<Size>
|
||||
<AbsDimension x="832" y="447"/>
|
||||
<AbsDimension x="832" y="555"/>
|
||||
</Size>
|
||||
<Anchors>
|
||||
<Anchor point="TOPLEFT">
|
||||
@@ -172,6 +172,49 @@
|
||||
</Anchor>
|
||||
</Anchors>
|
||||
</Texture>
|
||||
<!-- Filler strip covering the gap opened between the top row (ends at y=-256) and the
|
||||
re-anchored bottom row (top now at y=-364). 108px tall = +6 content rows.
|
||||
Uses a thin horizontal slice from the vertical middle (flat parchment / side border)
|
||||
of the same AuctionFrame-Browse tiles, stretched over the 108px gap. -->
|
||||
<Texture name="$parentMidLeft" file="Interface\AuctionFrame\UI-AuctionFrame-Browse-BotLeft">
|
||||
<Size>
|
||||
<AbsDimension x="256" y="108"/>
|
||||
</Size>
|
||||
<Anchors>
|
||||
<Anchor point="TOPLEFT">
|
||||
<Offset>
|
||||
<AbsDimension x="0" y="-256"/>
|
||||
</Offset>
|
||||
</Anchor>
|
||||
</Anchors>
|
||||
<TexCoords left="0" right="1.0" top="0.46" bottom="0.54"/>
|
||||
</Texture>
|
||||
<Texture name="$parentMid" file="Interface\AuctionFrame\UI-AuctionFrame-Browse-Bot">
|
||||
<Size>
|
||||
<AbsDimension x="320" y="108"/>
|
||||
</Size>
|
||||
<Anchors>
|
||||
<Anchor point="TOPLEFT">
|
||||
<Offset>
|
||||
<AbsDimension x="256" y="-256"/>
|
||||
</Offset>
|
||||
</Anchor>
|
||||
</Anchors>
|
||||
<TexCoords left="0" right="1.0" top="0.46" bottom="0.54"/>
|
||||
</Texture>
|
||||
<Texture name="$parentMidRight" file="Interface\AuctionFrame\UI-AuctionFrame-Browse-BotRight">
|
||||
<Size>
|
||||
<AbsDimension x="256" y="108"/>
|
||||
</Size>
|
||||
<Anchors>
|
||||
<Anchor point="TOPLEFT" relativeTo="$parentMid" relativePoint="TOPRIGHT">
|
||||
<Offset>
|
||||
<AbsDimension x="0" y="0"/>
|
||||
</Offset>
|
||||
</Anchor>
|
||||
</Anchors>
|
||||
<TexCoords left="0" right="1.0" top="0.46" bottom="0.54"/>
|
||||
</Texture>
|
||||
<Texture name="$parentBotLeft" file="Interface\AuctionFrame\UI-AuctionFrame-Browse-BotLeft">
|
||||
<Size>
|
||||
<AbsDimension x="256" y="256"/>
|
||||
@@ -179,7 +222,7 @@
|
||||
<Anchors>
|
||||
<Anchor point="TOPLEFT">
|
||||
<Offset>
|
||||
<AbsDimension x="0" y="-256"/>
|
||||
<AbsDimension x="0" y="-364"/>
|
||||
</Offset>
|
||||
</Anchor>
|
||||
</Anchors>
|
||||
@@ -191,7 +234,7 @@
|
||||
<Anchors>
|
||||
<Anchor point="TOPLEFT">
|
||||
<Offset>
|
||||
<AbsDimension x="256" y="-256"/>
|
||||
<AbsDimension x="256" y="-364"/>
|
||||
</Offset>
|
||||
</Anchor>
|
||||
</Anchors>
|
||||
|
||||
@@ -98,6 +98,7 @@ local function AddRealm(AccountName, RealmName)
|
||||
professions[#professions + 1] = {
|
||||
name = p.name,
|
||||
rank = p.rank or 0,
|
||||
maxRank = p.maxRank or 0, -- CoA: needed for the "rank/max" display in the vertical Skills list
|
||||
spellID = DataStore:GetProfessionSpellID(p.name),
|
||||
}
|
||||
end
|
||||
|
||||
@@ -115,3 +115,23 @@ function Alto:GetCoAClassIcon(token)
|
||||
if not tc then return end
|
||||
return COA_CLASS_ICON_TEXTURE, tc[1], tc[2], tc[3], tc[4]
|
||||
end
|
||||
|
||||
-- CoA renamed its classes, but UnitClass()/DataStore still return the OLD tokens
|
||||
-- (PROPHET, MONK, …). Map them to the current display names. Source: coa-omen/README-CoA.md.
|
||||
-- Tokens not listed here keep their normal localized name (returns nil).
|
||||
local COA_CLASS_NAMES = {
|
||||
HERO = "Hero", BARBARIAN = "Barbarian", WITCHDOCTOR = "Witch Doctor",
|
||||
DEMONHUNTER = "Felsworn", WITCHHUNTER = "Witch Hunter", STORMBRINGER = "Stormbringer",
|
||||
FLESHWARDEN = "Knight of Xoroth", GUARDIAN = "Guardian", MONK = "Templar",
|
||||
SONOFARUGAL = "Bloodmage", RANGER = "Ranger", CHRONOMANCER = "Chronomancer",
|
||||
NECROMANCER = "Necromancer", PYROMANCER = "Pyromancer", CULTIST = "Cultist",
|
||||
STARCALLER = "Starcaller", SUNCLERIC = "Sun Cleric", TINKER = "Tinker",
|
||||
PROPHET = "Venomancer", REAPER = "Reaper", WILDWALKER = "Primalist",
|
||||
SPIRITMAGE = "Runemaster",
|
||||
}
|
||||
|
||||
-- Current CoA display name for a class token, or nil if unmapped (caller falls back).
|
||||
function Alto:GetCoAClassName(token)
|
||||
if type(token) ~= "string" then return end
|
||||
return COA_CLASS_NAMES[token]
|
||||
end
|
||||
|
||||
@@ -168,7 +168,7 @@ end
|
||||
|
||||
|
||||
function ns:Update()
|
||||
local VisibleLines = 14
|
||||
local VisibleLines = 18
|
||||
local frame = "AltoholicFrameSummary"
|
||||
local entry = frame.."Entry"
|
||||
|
||||
|
||||
@@ -168,7 +168,7 @@
|
||||
|
||||
<Frame name="AltoholicFrameSummary" parent="AltoholicTabSummary">
|
||||
<Size>
|
||||
<AbsDimension x="615" y="306"/>
|
||||
<AbsDimension x="615" y="414"/>
|
||||
</Size>
|
||||
<Anchors>
|
||||
<Anchor point="TOPRIGHT">
|
||||
@@ -294,6 +294,36 @@
|
||||
<Anchor point="TOPLEFT" relativeTo="$parentEntry13" relativePoint="BOTTOMLEFT" />
|
||||
</Anchors>
|
||||
</Button>
|
||||
<Button name="$parentEntry15" inherits="AltoCharacterSummaryTemplate">
|
||||
<Anchors>
|
||||
<Anchor point="TOPLEFT" relativeTo="$parentEntry14" relativePoint="BOTTOMLEFT" />
|
||||
</Anchors>
|
||||
</Button>
|
||||
<Button name="$parentEntry16" inherits="AltoCharacterSummaryTemplate">
|
||||
<Anchors>
|
||||
<Anchor point="TOPLEFT" relativeTo="$parentEntry15" relativePoint="BOTTOMLEFT" />
|
||||
</Anchors>
|
||||
</Button>
|
||||
<Button name="$parentEntry17" inherits="AltoCharacterSummaryTemplate">
|
||||
<Anchors>
|
||||
<Anchor point="TOPLEFT" relativeTo="$parentEntry16" relativePoint="BOTTOMLEFT" />
|
||||
</Anchors>
|
||||
</Button>
|
||||
<Button name="$parentEntry18" inherits="AltoCharacterSummaryTemplate">
|
||||
<Anchors>
|
||||
<Anchor point="TOPLEFT" relativeTo="$parentEntry17" relativePoint="BOTTOMLEFT" />
|
||||
</Anchors>
|
||||
</Button>
|
||||
<Button name="$parentEntry19" inherits="AltoCharacterSummaryTemplate">
|
||||
<Anchors>
|
||||
<Anchor point="TOPLEFT" relativeTo="$parentEntry18" relativePoint="BOTTOMLEFT" />
|
||||
</Anchors>
|
||||
</Button>
|
||||
<Button name="$parentEntry20" inherits="AltoCharacterSummaryTemplate">
|
||||
<Anchors>
|
||||
<Anchor point="TOPLEFT" relativeTo="$parentEntry19" relativePoint="BOTTOMLEFT" />
|
||||
</Anchors>
|
||||
</Button>
|
||||
|
||||
<Frame name="$parentRightClickMenu" inherits="UIDropDownMenuTemplate" id="1" hidden="true">
|
||||
<Size>
|
||||
|
||||
@@ -23,7 +23,7 @@ local ns = addon.Activity -- ns = namespace
|
||||
local Characters = addon.Characters
|
||||
|
||||
function ns:Update()
|
||||
local VisibleLines = 14
|
||||
local VisibleLines = 18
|
||||
local frame = "AltoholicFrameActivity"
|
||||
local entry = frame.."Entry"
|
||||
|
||||
|
||||
@@ -176,7 +176,7 @@
|
||||
|
||||
<Frame name="AltoholicFrameActivity" parent="AltoholicTabSummary" hidden="true">
|
||||
<Size>
|
||||
<AbsDimension x="615" y="306"/>
|
||||
<AbsDimension x="615" y="414"/>
|
||||
</Size>
|
||||
<Anchors>
|
||||
<Anchor point="TOPRIGHT">
|
||||
@@ -302,6 +302,36 @@
|
||||
<Anchor point="TOPLEFT" relativeTo="$parentEntry13" relativePoint="BOTTOMLEFT" />
|
||||
</Anchors>
|
||||
</Button>
|
||||
<Button name="$parentEntry15" inherits="AltoActivityTemplate">
|
||||
<Anchors>
|
||||
<Anchor point="TOPLEFT" relativeTo="$parentEntry14" relativePoint="BOTTOMLEFT" />
|
||||
</Anchors>
|
||||
</Button>
|
||||
<Button name="$parentEntry16" inherits="AltoActivityTemplate">
|
||||
<Anchors>
|
||||
<Anchor point="TOPLEFT" relativeTo="$parentEntry15" relativePoint="BOTTOMLEFT" />
|
||||
</Anchors>
|
||||
</Button>
|
||||
<Button name="$parentEntry17" inherits="AltoActivityTemplate">
|
||||
<Anchors>
|
||||
<Anchor point="TOPLEFT" relativeTo="$parentEntry16" relativePoint="BOTTOMLEFT" />
|
||||
</Anchors>
|
||||
</Button>
|
||||
<Button name="$parentEntry18" inherits="AltoActivityTemplate">
|
||||
<Anchors>
|
||||
<Anchor point="TOPLEFT" relativeTo="$parentEntry17" relativePoint="BOTTOMLEFT" />
|
||||
</Anchors>
|
||||
</Button>
|
||||
<Button name="$parentEntry19" inherits="AltoActivityTemplate">
|
||||
<Anchors>
|
||||
<Anchor point="TOPLEFT" relativeTo="$parentEntry18" relativePoint="BOTTOMLEFT" />
|
||||
</Anchors>
|
||||
</Button>
|
||||
<Button name="$parentEntry20" inherits="AltoActivityTemplate">
|
||||
<Anchors>
|
||||
<Anchor point="TOPLEFT" relativeTo="$parentEntry19" relativePoint="BOTTOMLEFT" />
|
||||
</Anchors>
|
||||
</Button>
|
||||
</Frames>
|
||||
</Frame>
|
||||
|
||||
|
||||
@@ -136,7 +136,7 @@ function ns:InvalidateView()
|
||||
end
|
||||
|
||||
function ns:UpdateAuctions()
|
||||
local VisibleLines = 7
|
||||
local VisibleLines = 10
|
||||
local frame = "AltoholicFrameAuctions"
|
||||
local entry = frame.."Entry"
|
||||
|
||||
@@ -217,7 +217,7 @@ function ns:UpdateAuctions()
|
||||
end
|
||||
|
||||
function ns:UpdateBids()
|
||||
local VisibleLines = 7
|
||||
local VisibleLines = 10
|
||||
local frame = "AltoholicFrameAuctions"
|
||||
local entry = frame.."Entry"
|
||||
|
||||
|
||||
@@ -106,7 +106,7 @@
|
||||
|
||||
<Frame name="AltoholicFrameAuctions" parent="AltoholicTabCharacters" hidden="true">
|
||||
<Size>
|
||||
<AbsDimension x="615" y="306"/>
|
||||
<AbsDimension x="615" y="414"/>
|
||||
</Size>
|
||||
<Anchors>
|
||||
<Anchor point="TOPRIGHT">
|
||||
@@ -222,6 +222,21 @@
|
||||
<Anchor point="TOPLEFT" relativeTo="$parentEntry6" relativePoint="BOTTOMLEFT" />
|
||||
</Anchors>
|
||||
</Button>
|
||||
<Button name="$parentEntry8" inherits="AltoAuctionEntryTemplate">
|
||||
<Anchors>
|
||||
<Anchor point="TOPLEFT" relativeTo="$parentEntry7" relativePoint="BOTTOMLEFT" />
|
||||
</Anchors>
|
||||
</Button>
|
||||
<Button name="$parentEntry9" inherits="AltoAuctionEntryTemplate">
|
||||
<Anchors>
|
||||
<Anchor point="TOPLEFT" relativeTo="$parentEntry8" relativePoint="BOTTOMLEFT" />
|
||||
</Anchors>
|
||||
</Button>
|
||||
<Button name="$parentEntry10" inherits="AltoAuctionEntryTemplate">
|
||||
<Anchors>
|
||||
<Anchor point="TOPLEFT" relativeTo="$parentEntry9" relativePoint="BOTTOMLEFT" />
|
||||
</Anchors>
|
||||
</Button>
|
||||
|
||||
</Frames>
|
||||
</Frame>
|
||||
|
||||
@@ -22,7 +22,7 @@ local ns = addon.BagUsage -- ns = namespace
|
||||
local Characters = addon.Characters
|
||||
|
||||
function ns:Update()
|
||||
local VisibleLines = 14
|
||||
local VisibleLines = 18
|
||||
local frame = "AltoholicFrameBagUsage"
|
||||
local entry = frame.."Entry"
|
||||
|
||||
@@ -118,15 +118,15 @@ function ns:Update()
|
||||
_G[entry..i.."BankSlotsNormalText"]:SetText(L["Bank not visited yet"])
|
||||
else
|
||||
_G[entry..i.."BankSlotsNormalText"]:SetText(format("%s/%s|r/%s|r/%s|r/%s|r/%s|r/%s|r/%s |r(%s|r)",
|
||||
DS:GetContainerSize(character, 100),
|
||||
WHITE .. DS:GetContainerSize(character, 5),
|
||||
WHITE .. DS:GetContainerSize(character, 6),
|
||||
WHITE .. DS:GetContainerSize(character, 7),
|
||||
WHITE .. DS:GetContainerSize(character, 8),
|
||||
WHITE .. DS:GetContainerSize(character, 9),
|
||||
WHITE .. DS:GetContainerSize(character, 10),
|
||||
WHITE .. DS:GetContainerSize(character, 11),
|
||||
CYAN .. DS:GetNumBankSlots(character)))
|
||||
DS:GetContainerSize(character, 100) or 0, -- CoA: empty/unscanned bank bags return nil size
|
||||
WHITE .. (DS:GetContainerSize(character, 5) or 0),
|
||||
WHITE .. (DS:GetContainerSize(character, 6) or 0),
|
||||
WHITE .. (DS:GetContainerSize(character, 7) or 0),
|
||||
WHITE .. (DS:GetContainerSize(character, 8) or 0),
|
||||
WHITE .. (DS:GetContainerSize(character, 9) or 0),
|
||||
WHITE .. (DS:GetContainerSize(character, 10) or 0),
|
||||
WHITE .. (DS:GetContainerSize(character, 11) or 0),
|
||||
CYAN .. (DS:GetNumBankSlots(character) or 0)))
|
||||
end
|
||||
elseif (lineType == INFO_TOTAL_LINE) then
|
||||
_G[entry..i.."Collapse"]:Hide()
|
||||
|
||||
@@ -177,7 +177,7 @@
|
||||
|
||||
<Frame name="AltoholicFrameBagUsage" parent="AltoholicTabSummary" hidden="true">
|
||||
<Size>
|
||||
<AbsDimension x="615" y="306"/>
|
||||
<AbsDimension x="615" y="414"/>
|
||||
</Size>
|
||||
<Anchors>
|
||||
<Anchor point="TOPRIGHT">
|
||||
@@ -303,6 +303,36 @@
|
||||
<Anchor point="TOPLEFT" relativeTo="$parentEntry13" relativePoint="BOTTOMLEFT" />
|
||||
</Anchors>
|
||||
</Button>
|
||||
<Button name="$parentEntry15" inherits="AltoBagUsageTemplate">
|
||||
<Anchors>
|
||||
<Anchor point="TOPLEFT" relativeTo="$parentEntry14" relativePoint="BOTTOMLEFT" />
|
||||
</Anchors>
|
||||
</Button>
|
||||
<Button name="$parentEntry16" inherits="AltoBagUsageTemplate">
|
||||
<Anchors>
|
||||
<Anchor point="TOPLEFT" relativeTo="$parentEntry15" relativePoint="BOTTOMLEFT" />
|
||||
</Anchors>
|
||||
</Button>
|
||||
<Button name="$parentEntry17" inherits="AltoBagUsageTemplate">
|
||||
<Anchors>
|
||||
<Anchor point="TOPLEFT" relativeTo="$parentEntry16" relativePoint="BOTTOMLEFT" />
|
||||
</Anchors>
|
||||
</Button>
|
||||
<Button name="$parentEntry18" inherits="AltoBagUsageTemplate">
|
||||
<Anchors>
|
||||
<Anchor point="TOPLEFT" relativeTo="$parentEntry17" relativePoint="BOTTOMLEFT" />
|
||||
</Anchors>
|
||||
</Button>
|
||||
<Button name="$parentEntry19" inherits="AltoBagUsageTemplate">
|
||||
<Anchors>
|
||||
<Anchor point="TOPLEFT" relativeTo="$parentEntry18" relativePoint="BOTTOMLEFT" />
|
||||
</Anchors>
|
||||
</Button>
|
||||
<Button name="$parentEntry20" inherits="AltoBagUsageTemplate">
|
||||
<Anchors>
|
||||
<Anchor point="TOPLEFT" relativeTo="$parentEntry19" relativePoint="BOTTOMLEFT" />
|
||||
</Anchors>
|
||||
</Button>
|
||||
</Frames>
|
||||
</Frame>
|
||||
|
||||
|
||||
@@ -764,7 +764,7 @@ function Altoholic.Calendar.Events:BuildList()
|
||||
self:BuildView()
|
||||
end
|
||||
|
||||
local NUM_EVENTLINES = 14
|
||||
local NUM_EVENTLINES = 20
|
||||
|
||||
function Altoholic.Calendar.Events:Update()
|
||||
local self = Altoholic.Calendar.Events
|
||||
|
||||
@@ -131,7 +131,7 @@
|
||||
|
||||
<Frame name="AltoholicFrameCalendar" parent="AltoholicTabSummary" hidden="true">
|
||||
<Size>
|
||||
<AbsDimension x="615" y="306"/>
|
||||
<AbsDimension x="615" y="414"/>
|
||||
</Size>
|
||||
<Anchors>
|
||||
<Anchor point="TOPRIGHT">
|
||||
@@ -286,7 +286,7 @@
|
||||
|
||||
<ScrollFrame name="$parentScrollFrame" inherits="FauxScrollFrameTemplate">
|
||||
<Size>
|
||||
<AbsDimension x="250" y="306"/>
|
||||
<AbsDimension x="250" y="414"/>
|
||||
</Size>
|
||||
<Anchors>
|
||||
<Anchor point="TOPLEFT">
|
||||
@@ -406,6 +406,36 @@
|
||||
<Anchor point="TOPLEFT" relativeTo="$parentEntry13" relativePoint="BOTTOMLEFT" />
|
||||
</Anchors>
|
||||
</Button>
|
||||
<Button name="$parentEntry15" inherits="AltoCalendarEventTemplate">
|
||||
<Anchors>
|
||||
<Anchor point="TOPLEFT" relativeTo="$parentEntry14" relativePoint="BOTTOMLEFT" />
|
||||
</Anchors>
|
||||
</Button>
|
||||
<Button name="$parentEntry16" inherits="AltoCalendarEventTemplate">
|
||||
<Anchors>
|
||||
<Anchor point="TOPLEFT" relativeTo="$parentEntry15" relativePoint="BOTTOMLEFT" />
|
||||
</Anchors>
|
||||
</Button>
|
||||
<Button name="$parentEntry17" inherits="AltoCalendarEventTemplate">
|
||||
<Anchors>
|
||||
<Anchor point="TOPLEFT" relativeTo="$parentEntry16" relativePoint="BOTTOMLEFT" />
|
||||
</Anchors>
|
||||
</Button>
|
||||
<Button name="$parentEntry18" inherits="AltoCalendarEventTemplate">
|
||||
<Anchors>
|
||||
<Anchor point="TOPLEFT" relativeTo="$parentEntry17" relativePoint="BOTTOMLEFT" />
|
||||
</Anchors>
|
||||
</Button>
|
||||
<Button name="$parentEntry19" inherits="AltoCalendarEventTemplate">
|
||||
<Anchors>
|
||||
<Anchor point="TOPLEFT" relativeTo="$parentEntry18" relativePoint="BOTTOMLEFT" />
|
||||
</Anchors>
|
||||
</Button>
|
||||
<Button name="$parentEntry20" inherits="AltoCalendarEventTemplate">
|
||||
<Anchors>
|
||||
<Anchor point="TOPLEFT" relativeTo="$parentEntry19" relativePoint="BOTTOMLEFT" />
|
||||
</Anchors>
|
||||
</Button>
|
||||
|
||||
</Frames>
|
||||
</Frame>
|
||||
|
||||
@@ -96,7 +96,7 @@ end
|
||||
local function UpdateSpread()
|
||||
local mode = UIDropDownMenu_GetSelectedValue(AltoholicFrameContainers_SelectContainerView)
|
||||
local rarity = UIDropDownMenu_GetSelectedValue(AltoholicFrameContainers_SelectRarity)
|
||||
local VisibleLines = 7
|
||||
local VisibleLines = 10
|
||||
local frame = "AltoholicFrameContainers"
|
||||
local entry = frame.."Entry"
|
||||
|
||||
@@ -177,8 +177,8 @@ local function UpdateSpread()
|
||||
|
||||
local slotID = bagIndices[line].from - 3 + j
|
||||
local itemID, itemLink, itemCount = DS:GetSlotInfo(container, slotID)
|
||||
|
||||
if (slotID <= containerSize) then
|
||||
|
||||
if (slotID <= (containerSize or 0)) then -- CoA: containerSize nil for unscanned bag on partial-data alt
|
||||
if itemID then
|
||||
Altoholic:SetItemButtonTexture(itemName, GetItemIcon(itemID));
|
||||
|
||||
@@ -242,7 +242,7 @@ end
|
||||
local function UpdateAllInOne()
|
||||
local mode = UIDropDownMenu_GetSelectedValue(AltoholicFrameContainers_SelectContainerView)
|
||||
local rarity = UIDropDownMenu_GetSelectedValue(AltoholicFrameContainers_SelectRarity)
|
||||
local VisibleLines = 7
|
||||
local VisibleLines = 10
|
||||
local frame = "AltoholicFrameContainers"
|
||||
local entry = frame.."Entry"
|
||||
|
||||
@@ -278,7 +278,7 @@ local function UpdateAllInOne()
|
||||
local container = DS:GetContainer(character, containerID)
|
||||
local _, _, containerSize = DS:GetContainerInfo(character, containerID)
|
||||
|
||||
for slotID = 1, containerSize do
|
||||
for slotID = 1, (containerSize or 0) do -- CoA: containerSize nil for unscanned bag on partial-data alt
|
||||
local itemID, itemLink, itemCount = DS:GetSlotInfo(container, slotID)
|
||||
if itemID then
|
||||
currentSlotIndex = currentSlotIndex + 1
|
||||
|
||||
@@ -137,7 +137,7 @@
|
||||
|
||||
<Frame name="AltoholicFrameContainers" parent="AltoholicTabCharacters" hidden="true">
|
||||
<Size>
|
||||
<AbsDimension x="615" y="306"/>
|
||||
<AbsDimension x="615" y="414"/>
|
||||
</Size>
|
||||
<Anchors>
|
||||
<Anchor point="TOPRIGHT">
|
||||
@@ -282,6 +282,21 @@
|
||||
<Anchor point="TOPLEFT" relativeTo="$parentEntry6" relativePoint="BOTTOMLEFT" />
|
||||
</Anchors>
|
||||
</Button>
|
||||
<Button name="$parentEntry8" inherits="AltoContainerTemplate">
|
||||
<Anchors>
|
||||
<Anchor point="TOPLEFT" relativeTo="$parentEntry7" relativePoint="BOTTOMLEFT" />
|
||||
</Anchors>
|
||||
</Button>
|
||||
<Button name="$parentEntry9" inherits="AltoContainerTemplate">
|
||||
<Anchors>
|
||||
<Anchor point="TOPLEFT" relativeTo="$parentEntry8" relativePoint="BOTTOMLEFT" />
|
||||
</Anchors>
|
||||
</Button>
|
||||
<Button name="$parentEntry10" inherits="AltoContainerTemplate">
|
||||
<Anchors>
|
||||
<Anchor point="TOPLEFT" relativeTo="$parentEntry9" relativePoint="BOTTOMLEFT" />
|
||||
</Anchors>
|
||||
</Button>
|
||||
|
||||
</Frames>
|
||||
</Frame>
|
||||
|
||||
@@ -177,7 +177,7 @@ local function Currencies_UpdateEx(self, offset, entry, desc)
|
||||
end
|
||||
|
||||
local CurrenciesScrollFrame_Desc = {
|
||||
NumLines = 8,
|
||||
NumLines = 10,
|
||||
LineHeight = 41,
|
||||
Frame = "AltoholicFrameCurrencies",
|
||||
GetSize = function() return #usedTokens end,
|
||||
|
||||
@@ -175,7 +175,7 @@
|
||||
|
||||
<Frame name="AltoholicFrameCurrencies" parent="AltoholicTabCharacters" hidden="true">
|
||||
<Size>
|
||||
<AbsDimension x="615" y="306"/>
|
||||
<AbsDimension x="615" y="414"/>
|
||||
</Size>
|
||||
<Anchors>
|
||||
<Anchor point="TOPRIGHT">
|
||||
@@ -302,6 +302,16 @@
|
||||
<Anchor point="TOPLEFT" relativeTo="$parentEntry7" relativePoint="BOTTOMLEFT" />
|
||||
</Anchors>
|
||||
</Button>
|
||||
<Button name="$parentEntry9" inherits="AltoCurrenciesEntryTemplate">
|
||||
<Anchors>
|
||||
<Anchor point="TOPLEFT" relativeTo="$parentEntry8" relativePoint="BOTTOMLEFT" />
|
||||
</Anchors>
|
||||
</Button>
|
||||
<Button name="$parentEntry10" inherits="AltoCurrenciesEntryTemplate">
|
||||
<Anchors>
|
||||
<Anchor point="TOPLEFT" relativeTo="$parentEntry9" relativePoint="BOTTOMLEFT" />
|
||||
</Anchors>
|
||||
</Button>
|
||||
</Frames>
|
||||
</Frame>
|
||||
|
||||
|
||||
@@ -415,7 +415,7 @@ function ns:GetInventoryTypeName(inv)
|
||||
end
|
||||
|
||||
function ns:Update()
|
||||
local VisibleLines = 7
|
||||
local VisibleLines = 10
|
||||
local frame = "AltoholicFrameEquipment"
|
||||
local entry = frame.."Entry"
|
||||
|
||||
|
||||
@@ -117,7 +117,7 @@
|
||||
|
||||
<Frame name="AltoholicFrameEquipment" parent="AltoholicTabCharacters" hidden="true">
|
||||
<Size>
|
||||
<AbsDimension x="615" y="306"/>
|
||||
<AbsDimension x="615" y="414"/>
|
||||
</Size>
|
||||
<Anchors>
|
||||
<Anchor point="TOPRIGHT">
|
||||
@@ -213,6 +213,21 @@
|
||||
<Anchor point="TOPLEFT" relativeTo="$parentEntry6" relativePoint="BOTTOMLEFT" />
|
||||
</Anchors>
|
||||
</Button>
|
||||
<Button name="$parentEntry8" inherits="AltoEquipmentEntryTemplate">
|
||||
<Anchors>
|
||||
<Anchor point="TOPLEFT" relativeTo="$parentEntry7" relativePoint="BOTTOMLEFT" />
|
||||
</Anchors>
|
||||
</Button>
|
||||
<Button name="$parentEntry9" inherits="AltoEquipmentEntryTemplate">
|
||||
<Anchors>
|
||||
<Anchor point="TOPLEFT" relativeTo="$parentEntry8" relativePoint="BOTTOMLEFT" />
|
||||
</Anchors>
|
||||
</Button>
|
||||
<Button name="$parentEntry10" inherits="AltoEquipmentEntryTemplate">
|
||||
<Anchors>
|
||||
<Anchor point="TOPLEFT" relativeTo="$parentEntry9" relativePoint="BOTTOMLEFT" />
|
||||
</Anchors>
|
||||
</Button>
|
||||
|
||||
</Frames>
|
||||
</Frame>
|
||||
|
||||
@@ -72,7 +72,7 @@ function ns:Update()
|
||||
BuildView()
|
||||
end
|
||||
|
||||
local VisibleLines = 14
|
||||
local VisibleLines = 18
|
||||
local frame = "AltoholicFrameGuildBankTabs"
|
||||
local entry = frame.."Entry"
|
||||
|
||||
|
||||
@@ -107,7 +107,7 @@
|
||||
|
||||
<Frame name="AltoholicFrameGuildBankTabs" parent="AltoholicTabSummary" hidden="true">
|
||||
<Size>
|
||||
<AbsDimension x="615" y="306"/>
|
||||
<AbsDimension x="615" y="414"/>
|
||||
</Size>
|
||||
<Anchors>
|
||||
<Anchor point="TOPRIGHT">
|
||||
@@ -233,6 +233,36 @@
|
||||
<Anchor point="TOPLEFT" relativeTo="$parentEntry13" relativePoint="BOTTOMLEFT" />
|
||||
</Anchors>
|
||||
</Button>
|
||||
<Button name="$parentEntry15" inherits="AltoGuildBankTabsTemplate">
|
||||
<Anchors>
|
||||
<Anchor point="TOPLEFT" relativeTo="$parentEntry14" relativePoint="BOTTOMLEFT" />
|
||||
</Anchors>
|
||||
</Button>
|
||||
<Button name="$parentEntry16" inherits="AltoGuildBankTabsTemplate">
|
||||
<Anchors>
|
||||
<Anchor point="TOPLEFT" relativeTo="$parentEntry15" relativePoint="BOTTOMLEFT" />
|
||||
</Anchors>
|
||||
</Button>
|
||||
<Button name="$parentEntry17" inherits="AltoGuildBankTabsTemplate">
|
||||
<Anchors>
|
||||
<Anchor point="TOPLEFT" relativeTo="$parentEntry16" relativePoint="BOTTOMLEFT" />
|
||||
</Anchors>
|
||||
</Button>
|
||||
<Button name="$parentEntry18" inherits="AltoGuildBankTabsTemplate">
|
||||
<Anchors>
|
||||
<Anchor point="TOPLEFT" relativeTo="$parentEntry17" relativePoint="BOTTOMLEFT" />
|
||||
</Anchors>
|
||||
</Button>
|
||||
<Button name="$parentEntry19" inherits="AltoGuildBankTabsTemplate">
|
||||
<Anchors>
|
||||
<Anchor point="TOPLEFT" relativeTo="$parentEntry18" relativePoint="BOTTOMLEFT" />
|
||||
</Anchors>
|
||||
</Button>
|
||||
<Button name="$parentEntry20" inherits="AltoGuildBankTabsTemplate">
|
||||
<Anchors>
|
||||
<Anchor point="TOPLEFT" relativeTo="$parentEntry19" relativePoint="BOTTOMLEFT" />
|
||||
</Anchors>
|
||||
</Button>
|
||||
|
||||
</Frames>
|
||||
</Frame>
|
||||
|
||||
@@ -81,9 +81,9 @@ local SecondaryLevelSort = {-- sort functions for the alts
|
||||
end
|
||||
end,
|
||||
["level"] = function(a, b)
|
||||
local levelA = select(4, DataStore:GetGuildMemberInfo(a))
|
||||
local levelB = select(4, DataStore:GetGuildMemberInfo(b))
|
||||
|
||||
local levelA = select(4, DataStore:GetGuildMemberInfo(a)) or 0 -- CoA: nil level on partial guild data crashed table.sort
|
||||
local levelB = select(4, DataStore:GetGuildMemberInfo(b)) or 0
|
||||
|
||||
if viewSortOrder then
|
||||
return levelA < levelB
|
||||
else
|
||||
@@ -285,7 +285,7 @@ function ns:Update()
|
||||
BuildView()
|
||||
end
|
||||
|
||||
local VisibleLines = 14
|
||||
local VisibleLines = 17
|
||||
local frame = "AltoholicFrameGuildMembers"
|
||||
local entry = frame.."Entry"
|
||||
|
||||
|
||||
@@ -159,7 +159,7 @@
|
||||
|
||||
<Frame name="AltoholicFrameGuildMembers" parent="AltoholicTabSummary" hidden="true">
|
||||
<Size>
|
||||
<AbsDimension x="615" y="306"/>
|
||||
<AbsDimension x="615" y="414"/>
|
||||
</Size>
|
||||
<Anchors>
|
||||
<Anchor point="TOPRIGHT">
|
||||
@@ -307,6 +307,36 @@
|
||||
<Anchor point="TOPLEFT" relativeTo="$parentEntry13" relativePoint="BOTTOMLEFT" />
|
||||
</Anchors>
|
||||
</Button>
|
||||
<Button name="$parentEntry15" inherits="AltoGuildMembersTemplate">
|
||||
<Anchors>
|
||||
<Anchor point="TOPLEFT" relativeTo="$parentEntry14" relativePoint="BOTTOMLEFT" />
|
||||
</Anchors>
|
||||
</Button>
|
||||
<Button name="$parentEntry16" inherits="AltoGuildMembersTemplate">
|
||||
<Anchors>
|
||||
<Anchor point="TOPLEFT" relativeTo="$parentEntry15" relativePoint="BOTTOMLEFT" />
|
||||
</Anchors>
|
||||
</Button>
|
||||
<Button name="$parentEntry17" inherits="AltoGuildMembersTemplate">
|
||||
<Anchors>
|
||||
<Anchor point="TOPLEFT" relativeTo="$parentEntry16" relativePoint="BOTTOMLEFT" />
|
||||
</Anchors>
|
||||
</Button>
|
||||
<Button name="$parentEntry18" inherits="AltoGuildMembersTemplate">
|
||||
<Anchors>
|
||||
<Anchor point="TOPLEFT" relativeTo="$parentEntry17" relativePoint="BOTTOMLEFT" />
|
||||
</Anchors>
|
||||
</Button>
|
||||
<Button name="$parentEntry19" inherits="AltoGuildMembersTemplate">
|
||||
<Anchors>
|
||||
<Anchor point="TOPLEFT" relativeTo="$parentEntry18" relativePoint="BOTTOMLEFT" />
|
||||
</Anchors>
|
||||
</Button>
|
||||
<Button name="$parentEntry20" inherits="AltoGuildMembersTemplate">
|
||||
<Anchors>
|
||||
<Anchor point="TOPLEFT" relativeTo="$parentEntry19" relativePoint="BOTTOMLEFT" />
|
||||
</Anchors>
|
||||
</Button>
|
||||
|
||||
<!-- Equipment Icons on the right of the frame -->
|
||||
<Button name="$parentItem1" inherits="AltoAltEquipmentTemplate">
|
||||
|
||||
@@ -25,9 +25,9 @@ local PrimaryLevelSort = { -- sort functions for the mains
|
||||
end
|
||||
end,
|
||||
["level"] = function(a, b)
|
||||
local levelA = select(4, DataStore:GetGuildMemberInfo(a.name))
|
||||
local levelB = select(4, DataStore:GetGuildMemberInfo(b.name))
|
||||
|
||||
local levelA = select(4, DataStore:GetGuildMemberInfo(a.name)) or 0 -- CoA: nil level on partial guild data crashed table.sort
|
||||
local levelB = select(4, DataStore:GetGuildMemberInfo(b.name)) or 0
|
||||
|
||||
if viewSortOrder then
|
||||
return levelA < levelB
|
||||
else
|
||||
@@ -76,9 +76,9 @@ local SecondaryLevelSort = {-- sort functions for the alts
|
||||
end
|
||||
end,
|
||||
["level"] = function(a, b)
|
||||
local levelA = select(4, DataStore:GetGuildMemberInfo(a))
|
||||
local levelB = select(4, DataStore:GetGuildMemberInfo(b))
|
||||
|
||||
local levelA = select(4, DataStore:GetGuildMemberInfo(a)) or 0 -- CoA: nil level on partial guild data crashed table.sort
|
||||
local levelB = select(4, DataStore:GetGuildMemberInfo(b)) or 0
|
||||
|
||||
if viewSortOrder then
|
||||
return levelA < levelB
|
||||
else
|
||||
@@ -199,6 +199,7 @@ local function DisplayProfessionLink(frameName, member, index)
|
||||
local icon = addon:TextureToFontstring(addon:GetSpellIcon(tonumber(spellID)), 18, 18) .. " "
|
||||
if link then
|
||||
local curRank, maxRank = DataStore:GetProfessionInfo(link)
|
||||
curRank, maxRank = curRank or 0, maxRank or 0 -- CoA: GetProfessionInfo returns nil if the link doesn't match the trade pattern
|
||||
local ts = addon.TradeSkills
|
||||
text:SetText(icon .. ts:GetColor(curRank) .. curRank .. "/" .. maxRank)
|
||||
else
|
||||
@@ -220,7 +221,7 @@ function ns:Update()
|
||||
BuildView()
|
||||
end
|
||||
|
||||
local VisibleLines = 14
|
||||
local VisibleLines = 18
|
||||
local frame = "AltoholicFrameGuildProfessions"
|
||||
local entry = frame.."Entry"
|
||||
|
||||
@@ -350,7 +351,8 @@ function ns:OnEnter(self)
|
||||
if not spellID or not link then return end
|
||||
|
||||
local curRank, maxRank = DataStore:GetProfessionInfo(link)
|
||||
|
||||
curRank, maxRank = curRank or 0, maxRank or 0 -- CoA: nil ranks when link doesn't match trade pattern; guard concat below
|
||||
|
||||
AltoTooltip:ClearLines();
|
||||
AltoTooltip:SetOwner(self, "ANCHOR_RIGHT");
|
||||
|
||||
|
||||
@@ -143,7 +143,7 @@
|
||||
|
||||
<Frame name="AltoholicFrameGuildProfessions" parent="AltoholicTabSummary" hidden="true">
|
||||
<Size>
|
||||
<AbsDimension x="615" y="306"/>
|
||||
<AbsDimension x="615" y="414"/>
|
||||
</Size>
|
||||
<Anchors>
|
||||
<Anchor point="TOPRIGHT">
|
||||
@@ -269,6 +269,36 @@
|
||||
<Anchor point="TOPLEFT" relativeTo="$parentEntry13" relativePoint="BOTTOMLEFT" />
|
||||
</Anchors>
|
||||
</Button>
|
||||
<Button name="$parentEntry15" inherits="AltoGuildProfessionsTemplate">
|
||||
<Anchors>
|
||||
<Anchor point="TOPLEFT" relativeTo="$parentEntry14" relativePoint="BOTTOMLEFT" />
|
||||
</Anchors>
|
||||
</Button>
|
||||
<Button name="$parentEntry16" inherits="AltoGuildProfessionsTemplate">
|
||||
<Anchors>
|
||||
<Anchor point="TOPLEFT" relativeTo="$parentEntry15" relativePoint="BOTTOMLEFT" />
|
||||
</Anchors>
|
||||
</Button>
|
||||
<Button name="$parentEntry17" inherits="AltoGuildProfessionsTemplate">
|
||||
<Anchors>
|
||||
<Anchor point="TOPLEFT" relativeTo="$parentEntry16" relativePoint="BOTTOMLEFT" />
|
||||
</Anchors>
|
||||
</Button>
|
||||
<Button name="$parentEntry18" inherits="AltoGuildProfessionsTemplate">
|
||||
<Anchors>
|
||||
<Anchor point="TOPLEFT" relativeTo="$parentEntry17" relativePoint="BOTTOMLEFT" />
|
||||
</Anchors>
|
||||
</Button>
|
||||
<Button name="$parentEntry19" inherits="AltoGuildProfessionsTemplate">
|
||||
<Anchors>
|
||||
<Anchor point="TOPLEFT" relativeTo="$parentEntry18" relativePoint="BOTTOMLEFT" />
|
||||
</Anchors>
|
||||
</Button>
|
||||
<Button name="$parentEntry20" inherits="AltoGuildProfessionsTemplate">
|
||||
<Anchors>
|
||||
<Anchor point="TOPLEFT" relativeTo="$parentEntry19" relativePoint="BOTTOMLEFT" />
|
||||
</Anchors>
|
||||
</Button>
|
||||
|
||||
</Frames>
|
||||
</Frame>
|
||||
|
||||
@@ -461,7 +461,7 @@ function ns:Update()
|
||||
AltoTooltip:Hide();
|
||||
GameTooltip:Hide();
|
||||
|
||||
local VisibleLines = 8
|
||||
local VisibleLines = 10
|
||||
local NumLines = VisibleLines
|
||||
local frame = "AltoholicFrameKeys"
|
||||
local entry = frame.."Entry"
|
||||
|
||||
@@ -221,7 +221,7 @@
|
||||
|
||||
<Frame name="AltoholicFrameKeys" parent="AltoholicTabCharacters" hidden="true">
|
||||
<Size>
|
||||
<AbsDimension x="615" y="306"/>
|
||||
<AbsDimension x="615" y="414"/>
|
||||
</Size>
|
||||
<Anchors>
|
||||
<Anchor point="TOPRIGHT">
|
||||
@@ -317,6 +317,16 @@
|
||||
<Anchor point="TOPLEFT" relativeTo="$parentEntry7" relativePoint="BOTTOMLEFT" />
|
||||
</Anchors>
|
||||
</Button>
|
||||
<Button name="$parentEntry9" inherits="AltoKeyEntryTemplate">
|
||||
<Anchors>
|
||||
<Anchor point="TOPLEFT" relativeTo="$parentEntry8" relativePoint="BOTTOMLEFT" />
|
||||
</Anchors>
|
||||
</Button>
|
||||
<Button name="$parentEntry10" inherits="AltoKeyEntryTemplate">
|
||||
<Anchors>
|
||||
<Anchor point="TOPLEFT" relativeTo="$parentEntry9" relativePoint="BOTTOMLEFT" />
|
||||
</Anchors>
|
||||
</Button>
|
||||
|
||||
</Frames>
|
||||
</Frame>
|
||||
|
||||
@@ -81,7 +81,7 @@ function ns:BuildView(field, ascending)
|
||||
end
|
||||
|
||||
function ns:Update()
|
||||
local VisibleLines = 7
|
||||
local VisibleLines = 10
|
||||
local frame = "AltoholicFrameMail"
|
||||
local entry = frame.."Entry"
|
||||
local player = addon:GetCurrentCharacter()
|
||||
|
||||
@@ -84,7 +84,7 @@
|
||||
|
||||
<Frame name="AltoholicFrameMail" parent="AltoholicTabCharacters" hidden="true">
|
||||
<Size>
|
||||
<AbsDimension x="615" y="306"/>
|
||||
<AbsDimension x="615" y="414"/>
|
||||
</Size>
|
||||
<Anchors>
|
||||
<Anchor point="TOPRIGHT">
|
||||
@@ -190,6 +190,21 @@
|
||||
<Anchor point="TOPLEFT" relativeTo="$parentEntry6" relativePoint="BOTTOMLEFT" />
|
||||
</Anchors>
|
||||
</Button>
|
||||
<Button name="$parentEntry8" inherits="AltoMailEntryTemplate">
|
||||
<Anchors>
|
||||
<Anchor point="TOPLEFT" relativeTo="$parentEntry7" relativePoint="BOTTOMLEFT" />
|
||||
</Anchors>
|
||||
</Button>
|
||||
<Button name="$parentEntry9" inherits="AltoMailEntryTemplate">
|
||||
<Anchors>
|
||||
<Anchor point="TOPLEFT" relativeTo="$parentEntry8" relativePoint="BOTTOMLEFT" />
|
||||
</Anchors>
|
||||
</Button>
|
||||
<Button name="$parentEntry10" inherits="AltoMailEntryTemplate">
|
||||
<Anchors>
|
||||
<Anchor point="TOPLEFT" relativeTo="$parentEntry9" relativePoint="BOTTOMLEFT" />
|
||||
</Anchors>
|
||||
</Button>
|
||||
|
||||
</Frames>
|
||||
</Frame>
|
||||
|
||||
@@ -212,7 +212,7 @@ function ns:UpdatePets()
|
||||
end
|
||||
|
||||
function ns:UpdatePetsAllInOne()
|
||||
local VisibleLines = 8
|
||||
local VisibleLines = 10
|
||||
local frame = "AltoholicFramePetsAllInOne"
|
||||
local entry = frame.."Entry"
|
||||
|
||||
|
||||
@@ -25,7 +25,7 @@
|
||||
|
||||
<Frame name="AltoholicFramePets" parent="AltoholicTabCharacters" hidden="true">
|
||||
<Size>
|
||||
<AbsDimension x="615" y="306"/>
|
||||
<AbsDimension x="615" y="414"/>
|
||||
</Size>
|
||||
<Anchors>
|
||||
<Anchor point="TOPRIGHT">
|
||||
@@ -333,7 +333,7 @@
|
||||
|
||||
<Frame name="$parentAllInOne" hidden="true">
|
||||
<Size>
|
||||
<AbsDimension x="615" y="306"/>
|
||||
<AbsDimension x="615" y="414"/>
|
||||
</Size>
|
||||
<Anchors>
|
||||
<Anchor point="TOPLEFT">
|
||||
@@ -429,6 +429,16 @@
|
||||
<Anchor point="TOPLEFT" relativeTo="$parentEntry7" relativePoint="BOTTOMLEFT" />
|
||||
</Anchors>
|
||||
</Button>
|
||||
<Button name="$parentEntry9" inherits="AltoIconListtEntryTemplate">
|
||||
<Anchors>
|
||||
<Anchor point="TOPLEFT" relativeTo="$parentEntry8" relativePoint="BOTTOMLEFT" />
|
||||
</Anchors>
|
||||
</Button>
|
||||
<Button name="$parentEntry10" inherits="AltoIconListtEntryTemplate">
|
||||
<Anchors>
|
||||
<Anchor point="TOPLEFT" relativeTo="$parentEntry9" relativePoint="BOTTOMLEFT" />
|
||||
</Anchors>
|
||||
</Button>
|
||||
|
||||
</Frames>
|
||||
</Frame>
|
||||
|
||||
@@ -34,7 +34,7 @@ function ns:Update()
|
||||
local character = addon.Tabs.Characters:GetCurrent()
|
||||
|
||||
|
||||
local VisibleLines = 14
|
||||
local VisibleLines = 18
|
||||
local frame = "AltoholicFrameQuests"
|
||||
local entry = frame.."Entry"
|
||||
|
||||
|
||||
@@ -106,7 +106,7 @@
|
||||
|
||||
<Frame name="AltoholicFrameQuests" parent="AltoholicTabCharacters" hidden="true">
|
||||
<Size>
|
||||
<AbsDimension x="615" y="306"/>
|
||||
<AbsDimension x="615" y="414"/>
|
||||
</Size>
|
||||
<Anchors>
|
||||
<Anchor point="TOPRIGHT">
|
||||
@@ -232,6 +232,36 @@
|
||||
<Anchor point="TOPLEFT" relativeTo="$parentEntry13" relativePoint="BOTTOMLEFT" />
|
||||
</Anchors>
|
||||
</Button>
|
||||
<Button name="$parentEntry15" inherits="AltoQuestEntryTemplate">
|
||||
<Anchors>
|
||||
<Anchor point="TOPLEFT" relativeTo="$parentEntry14" relativePoint="BOTTOMLEFT" />
|
||||
</Anchors>
|
||||
</Button>
|
||||
<Button name="$parentEntry16" inherits="AltoQuestEntryTemplate">
|
||||
<Anchors>
|
||||
<Anchor point="TOPLEFT" relativeTo="$parentEntry15" relativePoint="BOTTOMLEFT" />
|
||||
</Anchors>
|
||||
</Button>
|
||||
<Button name="$parentEntry17" inherits="AltoQuestEntryTemplate">
|
||||
<Anchors>
|
||||
<Anchor point="TOPLEFT" relativeTo="$parentEntry16" relativePoint="BOTTOMLEFT" />
|
||||
</Anchors>
|
||||
</Button>
|
||||
<Button name="$parentEntry18" inherits="AltoQuestEntryTemplate">
|
||||
<Anchors>
|
||||
<Anchor point="TOPLEFT" relativeTo="$parentEntry17" relativePoint="BOTTOMLEFT" />
|
||||
</Anchors>
|
||||
</Button>
|
||||
<Button name="$parentEntry19" inherits="AltoQuestEntryTemplate">
|
||||
<Anchors>
|
||||
<Anchor point="TOPLEFT" relativeTo="$parentEntry18" relativePoint="BOTTOMLEFT" />
|
||||
</Anchors>
|
||||
</Button>
|
||||
<Button name="$parentEntry20" inherits="AltoQuestEntryTemplate">
|
||||
<Anchors>
|
||||
<Anchor point="TOPLEFT" relativeTo="$parentEntry19" relativePoint="BOTTOMLEFT" />
|
||||
</Anchors>
|
||||
</Button>
|
||||
|
||||
</Frames>
|
||||
</Frame>
|
||||
|
||||
@@ -218,7 +218,7 @@ end
|
||||
function ns:Update()
|
||||
local currentProfession = addon.TradeSkills.CurrentProfession
|
||||
|
||||
local VisibleLines = 14
|
||||
local VisibleLines = 18
|
||||
local frame = "AltoholicFrameRecipes"
|
||||
local entry = frame.."Entry"
|
||||
|
||||
|
||||
@@ -196,7 +196,7 @@
|
||||
|
||||
<Frame name="AltoholicFrameRecipes" parent="AltoholicTabCharacters" hidden="true">
|
||||
<Size>
|
||||
<AbsDimension x="615" y="306"/>
|
||||
<AbsDimension x="615" y="414"/>
|
||||
</Size>
|
||||
<Anchors>
|
||||
<Anchor point="TOPRIGHT">
|
||||
@@ -459,6 +459,36 @@
|
||||
<Anchor point="TOPLEFT" relativeTo="$parentEntry13" relativePoint="BOTTOMLEFT" />
|
||||
</Anchors>
|
||||
</Button>
|
||||
<Button name="$parentEntry15" inherits="AltoRecipesEntryTemplate">
|
||||
<Anchors>
|
||||
<Anchor point="TOPLEFT" relativeTo="$parentEntry14" relativePoint="BOTTOMLEFT" />
|
||||
</Anchors>
|
||||
</Button>
|
||||
<Button name="$parentEntry16" inherits="AltoRecipesEntryTemplate">
|
||||
<Anchors>
|
||||
<Anchor point="TOPLEFT" relativeTo="$parentEntry15" relativePoint="BOTTOMLEFT" />
|
||||
</Anchors>
|
||||
</Button>
|
||||
<Button name="$parentEntry17" inherits="AltoRecipesEntryTemplate">
|
||||
<Anchors>
|
||||
<Anchor point="TOPLEFT" relativeTo="$parentEntry16" relativePoint="BOTTOMLEFT" />
|
||||
</Anchors>
|
||||
</Button>
|
||||
<Button name="$parentEntry18" inherits="AltoRecipesEntryTemplate">
|
||||
<Anchors>
|
||||
<Anchor point="TOPLEFT" relativeTo="$parentEntry17" relativePoint="BOTTOMLEFT" />
|
||||
</Anchors>
|
||||
</Button>
|
||||
<Button name="$parentEntry19" inherits="AltoRecipesEntryTemplate">
|
||||
<Anchors>
|
||||
<Anchor point="TOPLEFT" relativeTo="$parentEntry18" relativePoint="BOTTOMLEFT" />
|
||||
</Anchors>
|
||||
</Button>
|
||||
<Button name="$parentEntry20" inherits="AltoRecipesEntryTemplate">
|
||||
<Anchors>
|
||||
<Anchor point="TOPLEFT" relativeTo="$parentEntry19" relativePoint="BOTTOMLEFT" />
|
||||
</Anchors>
|
||||
</Button>
|
||||
|
||||
</Frames>
|
||||
</Frame>
|
||||
|
||||
@@ -365,7 +365,7 @@ local function Reputations_UpdateEx(self, offset, entry, desc)
|
||||
end
|
||||
|
||||
local ReputationsScrollFrame_Desc = {
|
||||
NumLines = 8,
|
||||
NumLines = 10,
|
||||
LineHeight = 41,
|
||||
Frame = "AltoholicFrameReputations",
|
||||
GetSize = function() return #displayedFactions end,
|
||||
|
||||
@@ -178,7 +178,7 @@
|
||||
|
||||
<Frame name="AltoholicFrameReputations" parent="AltoholicTabCharacters" hidden="true">
|
||||
<Size>
|
||||
<AbsDimension x="615" y="306"/>
|
||||
<AbsDimension x="615" y="414"/>
|
||||
</Size>
|
||||
<Anchors>
|
||||
<Anchor point="TOPRIGHT">
|
||||
@@ -309,6 +309,16 @@
|
||||
<Anchor point="TOPLEFT" relativeTo="$parentEntry7" relativePoint="BOTTOMLEFT" />
|
||||
</Anchors>
|
||||
</Button>
|
||||
<Button name="$parentEntry9" inherits="AltoReputationEntryTemplate">
|
||||
<Anchors>
|
||||
<Anchor point="TOPLEFT" relativeTo="$parentEntry8" relativePoint="BOTTOMLEFT" />
|
||||
</Anchors>
|
||||
</Button>
|
||||
<Button name="$parentEntry10" inherits="AltoReputationEntryTemplate">
|
||||
<Anchors>
|
||||
<Anchor point="TOPLEFT" relativeTo="$parentEntry9" relativePoint="BOTTOMLEFT" />
|
||||
</Anchors>
|
||||
</Button>
|
||||
</Frames>
|
||||
</Frame>
|
||||
|
||||
|
||||
@@ -239,7 +239,7 @@ function ns:Realm_Update()
|
||||
end
|
||||
|
||||
function ns:Loots_Update()
|
||||
local VisibleLines = 7
|
||||
local VisibleLines = 10
|
||||
local frame = "AltoholicFrameSearch"
|
||||
local entry = frame.."Entry"
|
||||
|
||||
@@ -311,7 +311,7 @@ function ns:Loots_Update()
|
||||
end
|
||||
|
||||
function ns:Upgrade_Update()
|
||||
local VisibleLines = 7
|
||||
local VisibleLines = 10
|
||||
local frame = "AltoholicFrameSearch"
|
||||
local entry = frame.."Entry"
|
||||
|
||||
|
||||
@@ -240,7 +240,7 @@
|
||||
|
||||
<Frame name="AltoholicFrameSearch" parent="AltoholicTabSearch" hidden="true">
|
||||
<Size>
|
||||
<AbsDimension x="615" y="306"/>
|
||||
<AbsDimension x="615" y="414"/>
|
||||
</Size>
|
||||
<Anchors>
|
||||
<Anchor point="TOPRIGHT">
|
||||
@@ -331,6 +331,21 @@
|
||||
<Anchor point="TOPLEFT" relativeTo="$parentEntry6" relativePoint="BOTTOMLEFT" />
|
||||
</Anchors>
|
||||
</Button>
|
||||
<Button name="$parentEntry8" inherits="AltoSearchEntryTemplate">
|
||||
<Anchors>
|
||||
<Anchor point="TOPLEFT" relativeTo="$parentEntry7" relativePoint="BOTTOMLEFT" />
|
||||
</Anchors>
|
||||
</Button>
|
||||
<Button name="$parentEntry9" inherits="AltoSearchEntryTemplate">
|
||||
<Anchors>
|
||||
<Anchor point="TOPLEFT" relativeTo="$parentEntry8" relativePoint="BOTTOMLEFT" />
|
||||
</Anchors>
|
||||
</Button>
|
||||
<Button name="$parentEntry10" inherits="AltoSearchEntryTemplate">
|
||||
<Anchors>
|
||||
<Anchor point="TOPLEFT" relativeTo="$parentEntry9" relativePoint="BOTTOMLEFT" />
|
||||
</Anchors>
|
||||
</Button>
|
||||
|
||||
</Frames>
|
||||
</Frame>
|
||||
|
||||
+106
-382
@@ -28,407 +28,130 @@ local Characters = addon.Characters
|
||||
local size = 22
|
||||
local inset = 2
|
||||
|
||||
|
||||
function ns:Update()
|
||||
local VisibleLines = 14
|
||||
local VisibleLines = 18
|
||||
local frame = "AltoholicFrameSkills"
|
||||
local entry = frame.."Entry"
|
||||
|
||||
|
||||
local DS = DataStore
|
||||
|
||||
local offset = FauxScrollFrame_GetOffset( _G[ frame.."ScrollFrame" ] );
|
||||
local DisplayedCount = 0
|
||||
local VisibleCount = 0
|
||||
local DrawRealm
|
||||
local i=1
|
||||
|
||||
for _, line in pairs(Characters:GetView()) do
|
||||
local lineType = Characters:GetLineType(line)
|
||||
|
||||
if (offset > 0) or (DisplayedCount >= VisibleLines) then -- if the line will not be visible
|
||||
if lineType == INFO_REALM_LINE then -- then keep track of counters
|
||||
if Characters:GetField(line, "isCollapsed") == false then
|
||||
DrawRealm = true
|
||||
else
|
||||
DrawRealm = false
|
||||
end
|
||||
VisibleCount = VisibleCount + 1
|
||||
offset = offset - 1 -- no further control, nevermind if it goes negative
|
||||
elseif DrawRealm then
|
||||
VisibleCount = VisibleCount + 1
|
||||
offset = offset - 1 -- no further control, nevermind if it goes negative
|
||||
end
|
||||
else -- line will be displayed
|
||||
if lineType == INFO_REALM_LINE then
|
||||
local _, realm, account = Characters:GetInfo(line)
|
||||
|
||||
if Characters:GetField(line, "isCollapsed") == false then
|
||||
_G[ entry..i.."Collapse" ]:SetNormalTexture("Interface\\Buttons\\UI-MinusButton-Up");
|
||||
DrawRealm = true
|
||||
else
|
||||
_G[ entry..i.."Collapse" ]:SetNormalTexture("Interface\\Buttons\\UI-PlusButton-Up");
|
||||
DrawRealm = false
|
||||
end
|
||||
_G[entry..i.."Collapse"]:Show()
|
||||
_G[entry..i.."Name"]:SetWidth(300)
|
||||
_G[entry..i.."Name"]:SetPoint("TOPLEFT", 25, 0)
|
||||
_G[entry..i.."NameNormalText"]:SetWidth(300)
|
||||
if account == "Default" then -- saved as default, display as localized.
|
||||
_G[entry..i.."NameNormalText"]:SetText(format("%s (%s".. L["Account"]..": %s%s|r)", realm, WHITE, GREEN, L["Default"]))
|
||||
else
|
||||
local last = addon:GetLastAccountSharingInfo(realm, account)
|
||||
_G[entry..i.."NameNormalText"]:SetText(format("%s (%s".. L["Account"]..": %s%s %s%s|r)", realm, WHITE, GREEN, account, YELLOW, last or ""))
|
||||
end
|
||||
_G[entry..i.."Level"]:SetText("")
|
||||
_G[entry..i.."Skill1NormalText"]:SetText("")
|
||||
_G[entry..i.."CookingNormalText"]:SetText("")
|
||||
_G[entry..i.."FirstAidNormalText"]:SetText("")
|
||||
_G[entry..i.."FishingNormalText"]:SetText("")
|
||||
_G[entry..i.."RidingNormalText"]:SetText("")
|
||||
|
||||
_G[ entry..i ]:SetID(line)
|
||||
_G[ entry..i ]:Show()
|
||||
i = i + 1
|
||||
VisibleCount = VisibleCount + 1
|
||||
DisplayedCount = DisplayedCount + 1
|
||||
elseif DrawRealm then
|
||||
if (lineType == INFO_CHARACTER_LINE) then
|
||||
local character = DS:GetCharacter( Characters:GetInfo(line) )
|
||||
|
||||
local icon
|
||||
if DS:GetCharacterFaction(character) == "Alliance" then
|
||||
-- icon = addon:TextureToFontstring(ICON_FACTION_ALLIANCE, size, size) .. " "
|
||||
icon = addon:TextureToFontstring2(ICON_FACTION_ALLIANCE, size, size, inset, inset, inset, inset) .. " "
|
||||
else
|
||||
-- icon = addon:TextureToFontstring(ICON_FACTION_HORDE, size, size) .. " "
|
||||
icon = addon:TextureToFontstring2(ICON_FACTION_HORDE, size, size, inset, inset, inset, inset) .. " "
|
||||
end
|
||||
|
||||
_G[entry..i.."Collapse"]:Hide()
|
||||
_G[entry..i.."Name"]:SetWidth(170)
|
||||
_G[entry..i.."Name"]:SetPoint("TOPLEFT", 10, 0)
|
||||
_G[entry..i.."NameNormalText"]:SetWidth(170)
|
||||
addon:SetCharacterRowNameLevel(entry, i, icon, character)
|
||||
|
||||
-- CoA: render ALL primary professions the character knows into the
|
||||
-- single wide Professions cell, as a row of icon+rank segments.
|
||||
-- The list is precomputed in Characters.lua (field "professions")
|
||||
-- and may be empty (unscanned char) -> cell renders blank. Every
|
||||
-- value is guarded with "or 0" before GetColor/concat.
|
||||
local professions = Characters:GetField(line, "professions")
|
||||
local profText = ""
|
||||
if professions then
|
||||
for _, p in ipairs(professions) do
|
||||
local rank = p.rank or 0
|
||||
local profIcon = ""
|
||||
if p.spellID then
|
||||
profIcon = addon:TextureToFontstring2(addon:GetSpellIcon(p.spellID), size, size, inset, inset, inset, inset) .. " "
|
||||
end
|
||||
profText = profText .. profIcon .. ns:GetColor(rank) .. rank .. "|r "
|
||||
end
|
||||
end
|
||||
_G[entry..i.."Skill1NormalText"]:SetText(profText)
|
||||
-- CoA: vertical list. For each visible character a header row, then one row per known
|
||||
-- profession / secondary skill (icon + name + rank/max), top to bottom (like the other detail views).
|
||||
local SECONDARY = { 2550, 3273, 7733 } -- Cooking, First Aid, Fishing (spell id -> icon + GetSpellInfo name)
|
||||
local items = {}
|
||||
for _, viewLine in pairs(Characters:GetView()) do
|
||||
if Characters:GetLineType(viewLine) == INFO_CHARACTER_LINE then
|
||||
local character = DS:GetCharacter( Characters:GetInfo(viewLine) )
|
||||
items[#items + 1] = { kind = "header", viewLine = viewLine, character = character }
|
||||
|
||||
local field
|
||||
-- cooking
|
||||
-- icon = addon:TextureToFontstring(addon:GetSpellIcon(2550), size, size) .. " "
|
||||
icon = addon:TextureToFontstring2(addon:GetSpellIcon(2550), size, size, inset, inset, inset, inset) .. " "
|
||||
field = Characters:GetField(line, "cooking") or 0
|
||||
_G[entry..i.."CookingNormalText"]:SetText(icon .. ns:GetColor(field) .. field)
|
||||
|
||||
-- first aid
|
||||
-- icon = addon:TextureToFontstring(addon:GetSpellIcon(3273), size, size) .. " "
|
||||
icon = addon:TextureToFontstring2(addon:GetSpellIcon(3273), size, size, inset, inset, inset, inset) .. " "
|
||||
field = Characters:GetField(line, "firstaid") or 0
|
||||
_G[entry..i.."FirstAidNormalText"]:SetText(icon .. ns:GetColor(field) .. field)
|
||||
|
||||
-- fishing
|
||||
-- icon = addon:TextureToFontstring(addon:GetSpellIcon(7733), size, size) .. " "
|
||||
icon = addon:TextureToFontstring2(addon:GetSpellIcon(7733), size, size, inset, inset, inset, inset) .. " "
|
||||
field = Characters:GetField(line, "fishing") or 0
|
||||
_G[entry..i.."FishingNormalText"]:SetText(icon .. ns:GetColor(field) .. field)
|
||||
|
||||
-- riding
|
||||
field = Characters:GetField(line, "riding") or 0
|
||||
if field >= 300 then
|
||||
-- icon = addon:TextureToFontstring("Interface\\Icons\\Ability_Mount_Gryphon_01", size, size) .. " "
|
||||
icon = addon:TextureToFontstring2("Interface\\Icons\\ability_mount_drake_bronze", size, size, inset, inset, inset, inset)
|
||||
|
||||
for _,spId in pairs({63956, 63963, 60024, 72808, 72807, 63796, 40192, 69395, 60021, 59976, 64927, 67336, 65439, 49193, 71810, 44317, 44744, 58615, 37015, 3363, 32345}) do
|
||||
-- IsPetKnown(character, companionType, spellID)
|
||||
if DS:IsPetKnown(character, "MOUNT", spId) then
|
||||
icon = addon:TextureToFontstring2("Interface\\Icons\\inv_misc_enggizmos_03", size, size, inset, inset, inset, inset)
|
||||
break
|
||||
end
|
||||
end
|
||||
elseif field >= 225 then
|
||||
icon = addon:TextureToFontstring2("Interface\\Icons\\ability_mount_goldengryphon", size, size, inset, inset, inset, inset)
|
||||
elseif field >= 150 then
|
||||
icon = addon:TextureToFontstring2("Interface\\Icons\\ability_mount_charger", size, size, inset, inset, inset, inset)
|
||||
elseif field >= 75 then
|
||||
icon = addon:TextureToFontstring2("Interface\\Icons\\spell_nature_swiftness", size, size, inset, inset, inset, inset)
|
||||
else
|
||||
icon = addon:TextureToFontstring2("Interface\\Icons\\inv_boots_03", size, size, inset, inset, inset, inset)
|
||||
end
|
||||
|
||||
if DS:IsSpellKnown(character, 54197) then -- KNOWS [Cold Weather Flying]
|
||||
-- Interface\Icons\Spell_Frost_FrostShock
|
||||
-- icon = addon:TextureToFontstring(addon:GetSpellIcon(54197), size, size) .. " "
|
||||
-- TextureToFontstringHalfSquare(name, side, inset, isRight)
|
||||
-- icon = addon:TextureToFontstringHalfSquare(addon:GetSpellIcon(54197), size, inset, true) .. " "
|
||||
-- icon = icon .. addon:TextureToFontstringHalfSquare(addon:GetSpellIcon(54197), size, inset, 0.7, 1.0) .. " "
|
||||
|
||||
-- TextureToFontstringCut(name, heightOrig, widthOrig, insetLeft, insetRight, insetTop, insetBottom)
|
||||
-- local sTemp = size+2*inset
|
||||
-- icon = icon .. addon:TextureToFontstringCut(addon:GetSpellIcon(54197), sTemp, sTemp, floor(0.7*sTemp), floor(0.1*sTemp), inset, inset) .. " "
|
||||
icon = addon:TextureToFontstring(addon:GetSpellIcon(54197), size, size) .. " " .. icon .. " "
|
||||
|
||||
else -- DOES NOT KNOW [Cold Weather Flying]
|
||||
icon = format("|T%s:%s:%s:0:0:%s:%s:%s:%s:%s:%s|t", addon:GetSpellIcon(54197), size, size, size, size, 0, 0, 0, 0) .. " " .. icon .. " "
|
||||
end
|
||||
|
||||
_G[entry..i.."RidingNormalText"]:SetText(icon .. ns:GetColor(field, 300) .. field)
|
||||
elseif (lineType == INFO_TOTAL_LINE) then
|
||||
_G[entry..i.."Collapse"]:Hide()
|
||||
_G[entry..i.."Name"]:SetWidth(200)
|
||||
_G[entry..i.."Name"]:SetPoint("TOPLEFT", 15, 0)
|
||||
_G[entry..i.."NameNormalText"]:SetWidth(200)
|
||||
_G[entry..i.."NameNormalText"]:SetText(L["Totals"])
|
||||
_G[entry..i.."Level"]:SetText(Characters:GetField(line, "level"))
|
||||
_G[entry..i.."Skill1NormalText"]:SetText("")
|
||||
_G[entry..i.."CookingNormalText"]:SetText("")
|
||||
_G[entry..i.."FirstAidNormalText"]:SetText("")
|
||||
_G[entry..i.."FishingNormalText"]:SetText("")
|
||||
_G[entry..i.."RidingNormalText"]:SetText("")
|
||||
local profs = Characters:GetField(viewLine, "professions")
|
||||
if profs then
|
||||
for _, p in ipairs(profs) do
|
||||
items[#items + 1] = { kind = "skill", viewLine = viewLine, character = character,
|
||||
spellID = p.spellID, name = p.name, rank = p.rank or 0, maxRank = p.maxRank or 0 }
|
||||
end
|
||||
_G[ entry..i ]:SetID(line)
|
||||
_G[ entry..i ]:Show()
|
||||
i = i + 1
|
||||
VisibleCount = VisibleCount + 1
|
||||
DisplayedCount = DisplayedCount + 1
|
||||
end
|
||||
for _, sid in ipairs(SECONDARY) do
|
||||
local sName = GetSpellInfo(sid)
|
||||
if sName then
|
||||
local cur, max = DS:GetSkillInfo(character, sName)
|
||||
if cur and cur > 0 then
|
||||
items[#items + 1] = { kind = "skill", viewLine = viewLine, character = character,
|
||||
spellID = sid, name = sName, rank = cur, maxRank = max or 0 }
|
||||
end
|
||||
end
|
||||
end
|
||||
local riding = Characters:GetField(viewLine, "riding") or 0
|
||||
if riding > 0 then
|
||||
items[#items + 1] = { kind = "skill", viewLine = viewLine, character = character,
|
||||
spellID = 33388, name = (L and L["Riding"]) or "Riding", rank = riding, maxRank = 300 }
|
||||
end
|
||||
items[#items + 1] = { kind = "spacer" } -- blank row between characters
|
||||
end
|
||||
end
|
||||
|
||||
while i <= VisibleLines do
|
||||
_G[ entry..i ]:SetID(0)
|
||||
_G[ entry..i ]:Hide()
|
||||
i = i + 1
|
||||
end
|
||||
|
||||
FauxScrollFrame_Update( _G[ frame.."ScrollFrame" ], VisibleCount, VisibleLines, 18);
|
||||
end
|
||||
local offset = FauxScrollFrame_GetOffset( _G[ frame.."ScrollFrame" ] )
|
||||
for i = 1, VisibleLines do
|
||||
local e = entry..i
|
||||
local btn = _G[e]
|
||||
local item = items[i + offset]
|
||||
if item then
|
||||
_G[e.."Collapse"]:Hide()
|
||||
_G[e.."Skill1NormalText"]:SetText("")
|
||||
_G[e.."CookingNormalText"]:SetText("")
|
||||
_G[e.."FirstAidNormalText"]:SetText("")
|
||||
_G[e.."FishingNormalText"]:SetText("")
|
||||
_G[e.."RidingNormalText"]:SetText("")
|
||||
|
||||
if item.kind == "spacer" then
|
||||
-- blank separator row between characters
|
||||
_G[e.."Name"]:SetPoint("TOPLEFT", 15, 0)
|
||||
_G[e.."NameNormalText"]:SetText("")
|
||||
_G[e.."Level"]:SetText("")
|
||||
elseif item.kind == "header" then
|
||||
-- character header: gold "Name (Class)" across the row, no rank column
|
||||
_G[e.."Name"]:SetPoint("TOPLEFT", 12, 0)
|
||||
_G[e.."Name"]:SetWidth(420)
|
||||
_G[e.."NameNormalText"]:SetWidth(420)
|
||||
local cname = Characters:GetInfo(item.viewLine) or "?" -- name from the key, always present (scanned char.name can be nil)
|
||||
local locClass, engClass = DS:GetCharacterClass(item.character)
|
||||
local className = Altoholic:GetCoAClassName(engClass) or locClass or "" -- CoA: PROPHET->Venomancer, MONK->Templar, …
|
||||
local classColor = DS:GetClassColor(item.character) or WHITE
|
||||
_G[e.."NameNormalText"]:SetText( classColor .. cname .. "|r " .. WHITE .. "(" .. className .. ")" )
|
||||
_G[e.."Level"]:SetText("")
|
||||
else
|
||||
-- profession row: [icon] name in the Name cell (indented), rank/max in its own column
|
||||
local iconEsc = ""
|
||||
if item.spellID then
|
||||
iconEsc = addon:TextureToFontstring2(addon:GetSpellIcon(item.spellID), size, size, inset, inset, inset, inset) .. " "
|
||||
end
|
||||
_G[e.."Name"]:SetPoint("TOPLEFT", 34, 0)
|
||||
_G[e.."Name"]:SetWidth(170)
|
||||
_G[e.."NameNormalText"]:SetWidth(170)
|
||||
_G[e.."NameNormalText"]:SetText( iconEsc .. WHITE .. item.name )
|
||||
|
||||
local cap = (item.maxRank > 0) and item.maxRank or 450
|
||||
_G[e.."Level"]:SetPoint("TOPLEFT", 195, 0)
|
||||
_G[e.."Level"]:SetWidth(120)
|
||||
_G[e.."Level"]:SetJustifyH("LEFT")
|
||||
_G[e.."Level"]:SetText( ns:GetColor(item.rank, cap) .. item.rank .. " / " .. item.maxRank )
|
||||
end
|
||||
btn.coaItem = item
|
||||
btn:SetID(item.viewLine or 0)
|
||||
btn:Show()
|
||||
else
|
||||
btn.coaItem = nil
|
||||
btn:SetID(0)
|
||||
btn:Hide()
|
||||
end
|
||||
end
|
||||
FauxScrollFrame_Update( _G[ frame.."ScrollFrame" ], #items, VisibleLines, 18 )
|
||||
end
|
||||
|
||||
function ns:OnEnter(frame)
|
||||
local line = frame:GetParent():GetID()
|
||||
local lineType = Characters:GetLineType(line)
|
||||
if lineType ~= INFO_CHARACTER_LINE then
|
||||
return
|
||||
end
|
||||
|
||||
local id = frame:GetID()
|
||||
local skillName, rank, suggestion
|
||||
|
||||
local DS = DataStore
|
||||
local character = DS:GetCharacter(Characters:GetInfo(line))
|
||||
|
||||
-- CoA: id 1 is now the combined "Professions" cell -> list every known primary
|
||||
-- profession with rank/max and recipe counts in a single tooltip.
|
||||
if id == 1 then
|
||||
local professions = Characters:GetField(line, "professions")
|
||||
AltoTooltip:ClearLines()
|
||||
AltoTooltip:SetOwner(frame, "ANCHOR_RIGHT")
|
||||
AltoTooltip:AddLine(L["Professions"] or "Professions", 1, 1, 1)
|
||||
if not professions or #professions == 0 then
|
||||
AltoTooltip:AddLine(L["No data"])
|
||||
AltoTooltip:Show()
|
||||
return
|
||||
end
|
||||
for _, p in ipairs(professions) do
|
||||
local pName = p.name
|
||||
local curRank, maxRank = DS:GetSkillInfo(character, pName)
|
||||
curRank, maxRank = curRank or 0, maxRank or 0
|
||||
local rankText = ns:GetColor(curRank) .. curRank .. "/" .. maxRank
|
||||
local recipeText = ""
|
||||
local prof = DS:GetProfession(character, pName)
|
||||
if prof and DS:GetNumCraftLines(prof) > 0 then
|
||||
local orange, yellow, green, grey = DS:GetNumRecipesByColor(prof)
|
||||
recipeText = WHITE .. " (" .. (orange + yellow + green + grey) .. " " .. TRADESKILL_SERVICE_LEARN .. ")"
|
||||
end
|
||||
-- localized display name where possible
|
||||
local displayName = pName
|
||||
local spellID = DS:GetProfessionSpellID(pName)
|
||||
if spellID then
|
||||
displayName = GetSpellInfo(spellID) or pName
|
||||
end
|
||||
AltoTooltip:AddDoubleLine(WHITE .. displayName, rankText .. recipeText)
|
||||
end
|
||||
AltoTooltip:Show()
|
||||
return
|
||||
end
|
||||
|
||||
if id == 3 then
|
||||
skillName = GetSpellInfo(2550) -- cooking
|
||||
elseif id == 4 then
|
||||
skillName = GetSpellInfo(3273) -- First Aid
|
||||
elseif id == 5 then
|
||||
skillName = GetSpellInfo(24303) -- Fishing
|
||||
elseif id == 6 then
|
||||
skillName = L["Riding"]
|
||||
end
|
||||
|
||||
local curRank, maxRank = DS:GetSkillInfo(character, skillName)
|
||||
curRank, maxRank = curRank or 0, maxRank or 0 -- CoA: getter returns no value for skills DataStore_Skills hasn't scanned
|
||||
local profession = DS:GetProfession(character, skillName)
|
||||
|
||||
if (id >= 3) and (id <= 6) then
|
||||
if id == 6 then -- riding
|
||||
rank = ns:GetColor(curRank, 300) .. curRank .. "/" .. maxRank
|
||||
else
|
||||
rank = ns:GetColor(curRank) .. curRank .. "/" .. maxRank
|
||||
end
|
||||
suggestion = addon:GetSuggestion(skillName, curRank)
|
||||
elseif id == 7 then -- class
|
||||
local _, class = DS:GetCharacterClass(character)
|
||||
if class ~= "ROGUE" then
|
||||
return
|
||||
end
|
||||
skillName = L["Rogue Proficiencies"]
|
||||
|
||||
local curLock, maxLock = DS:GetSkillInfo(character, L["Lockpicking"])
|
||||
curLock, maxLock = curLock or 0, maxLock or 0 -- CoA: guard unscanned lockpicking
|
||||
rank = TEAL .. L["Lockpicking"] .. " " .. curLock .. "/" .. maxLock
|
||||
suggestion = addon:GetSuggestion(L["Lockpicking"], curLock)
|
||||
end
|
||||
|
||||
AltoTooltip:ClearLines();
|
||||
AltoTooltip:SetOwner(frame, "ANCHOR_RIGHT");
|
||||
AltoTooltip:AddLine(skillName,1,1,1);
|
||||
AltoTooltip:AddLine(GREEN..rank,1,1,1);
|
||||
|
||||
if (id == 3) or (id == 4) then -- crafting secondary skills (Cooking, First Aid); skips fishing/riding
|
||||
if skillName ~= GetSpellInfo(13614) and skillName ~= GetSpellInfo(8613) then -- no display for herbalism & skinning
|
||||
AltoTooltip:AddLine(" ");
|
||||
|
||||
if not profession then
|
||||
AltoTooltip:AddLine(L["No data"]);
|
||||
AltoTooltip:Show();
|
||||
return
|
||||
end
|
||||
|
||||
if DS:GetNumCraftLines(profession) == 0 then
|
||||
AltoTooltip:AddLine(L["No data"].. ": 0 " .. TRADESKILL_SERVICE_LEARN,1,1,1);
|
||||
else
|
||||
local orange, yellow, green, grey = DS:GetNumRecipesByColor(profession)
|
||||
|
||||
AltoTooltip:AddLine(orange+yellow+green+grey .. " " .. TRADESKILL_SERVICE_LEARN,1,1,1);
|
||||
AltoTooltip:AddLine(format(WHITE .. "%d " .. RECIPE_GREEN .. "Green|r /"
|
||||
.. WHITE .. " %d " .. YELLOW .. "Yellow|r /"
|
||||
.. WHITE .. " %d " .. RECIPE_ORANGE .. "Orange",
|
||||
green, yellow, orange))
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
local skillCap = 450
|
||||
if id == 6 then
|
||||
skillCap = 300
|
||||
end
|
||||
|
||||
AltoTooltip:AddLine(" ");
|
||||
AltoTooltip:AddLine(RECIPE_GREY .. L["Grey"] .. "|r " .. L["up to"] .. " " .. (floor(skillCap*0.25)-1),1,1,1);
|
||||
AltoTooltip:AddLine(RED .. RED_GEM .. "|r " .. L["up to"] .. " " .. (floor(skillCap*0.50)-1),1,1,1);
|
||||
AltoTooltip:AddLine(ORANGE .. BI["Orange"] .. "|r " .. L["up to"] .. " " .. (floor(skillCap*0.75)-1),1,1,1);
|
||||
AltoTooltip:AddLine(YELLOW .. YELLOW_GEM .. "|r " .. L["up to"] .. " " .. (skillCap-1),1,1,1);
|
||||
AltoTooltip:AddLine(GREEN .. BI["Green"] .. "|r " .. L["at"] .. " "..skillCap.." " .. L["and above"],1,1,1);
|
||||
|
||||
if suggestion then
|
||||
AltoTooltip:AddLine(" ",1,1,1);
|
||||
AltoTooltip:AddLine(L["Suggestion"] .. ": ",1,1,1);
|
||||
AltoTooltip:AddLine(TEAL .. suggestion,1,1,1);
|
||||
end
|
||||
|
||||
-- parse profession cooldowns
|
||||
if id ~= 7 and profession then
|
||||
DS:ClearExpiredCooldowns(profession)
|
||||
local numCooldows = DS:GetNumActiveCooldowns(profession)
|
||||
|
||||
if numCooldows == 0 then
|
||||
AltoTooltip:AddLine(" ",1,1,1);
|
||||
AltoTooltip:AddLine(L["All cooldowns are up"],1,1,1);
|
||||
else
|
||||
AltoTooltip:AddLine(" ",1,1,1);
|
||||
for i = 1, numCooldows do
|
||||
local craftName, expiresIn = DS:GetCraftCooldownInfo(profession, i)
|
||||
AltoTooltip:AddDoubleLine(craftName, addon:GetTimeString(expiresIn));
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
AltoTooltip:Show();
|
||||
local item = frame:GetParent() and frame:GetParent().coaItem
|
||||
if not item or item.kind ~= "skill" then return end
|
||||
AltoTooltip:ClearLines()
|
||||
AltoTooltip:SetOwner(frame, "ANCHOR_RIGHT")
|
||||
AltoTooltip:AddLine(WHITE .. item.name, 1, 1, 1)
|
||||
local cap = (item.maxRank > 0) and item.maxRank or 450
|
||||
AltoTooltip:AddLine( ns:GetColor(item.rank, cap) .. item.rank .. " / " .. item.maxRank, 1, 1, 1 )
|
||||
AltoTooltip:Show()
|
||||
end
|
||||
|
||||
local VIEW_MOUNTS = 8
|
||||
|
||||
function ns:OnClick(frame, button)
|
||||
local line = frame:GetParent():GetID()
|
||||
local lineType = Characters:GetLineType(line)
|
||||
if lineType ~= INFO_CHARACTER_LINE then
|
||||
return
|
||||
end
|
||||
|
||||
local id = frame:GetID()
|
||||
if id == 5 then return end -- fishing ? do nothing
|
||||
|
||||
addon:SetCurrentCharacter( Characters:GetInfo(line) )
|
||||
|
||||
local skillName
|
||||
if id == 1 then
|
||||
-- CoA: id 1 is the combined Professions cell. A single click can't pick one
|
||||
-- of several professions, so default to the first known primary profession
|
||||
-- (opens its recipes / supplies its trade link on shift-click).
|
||||
local professions = Characters:GetField(line, "professions")
|
||||
if professions and professions[1] then
|
||||
skillName = professions[1].name
|
||||
end
|
||||
elseif id == 3 then
|
||||
skillName = GetSpellInfo(2550) -- cooking
|
||||
elseif id == 4 then
|
||||
skillName = GetSpellInfo(3273) -- First Aid
|
||||
end
|
||||
|
||||
local DS = DataStore
|
||||
local character = DS:GetCharacter(Characters:GetInfo(line))
|
||||
local profession = DS:GetProfession(character, skillName)
|
||||
|
||||
if skillName then
|
||||
if not profession or DS:GetNumCraftLines(profession) == 0 then -- if profession hasn't been scanned (or scan failed), exit
|
||||
return
|
||||
end
|
||||
end
|
||||
|
||||
local charName, realm, account = addon:GetCurrentCharacter()
|
||||
local chat = ChatEdit_GetLastActiveWindow()
|
||||
|
||||
if chat:IsShown() and IsShiftKeyDown() and realm == GetRealmName() and id ~= 6 then
|
||||
-- if shift-click, then display the profession link and exit
|
||||
local link = profession.FullLink
|
||||
if link and link:match("trade:") then
|
||||
chat:Insert(link);
|
||||
end
|
||||
return
|
||||
end
|
||||
|
||||
addon.Tabs.Characters:SetCurrent(charName, realm, account)
|
||||
addon.Tabs:OnClick(2)
|
||||
|
||||
if id == 6 then
|
||||
addon.Tabs.Characters:ViewCharInfo(VIEW_MOUNTS)
|
||||
else
|
||||
addon.Tabs.Characters:ViewRecipes(skillName)
|
||||
-- CoA: clicking a profession row opens that character's profession recipe list, if available.
|
||||
local item = frame:GetParent() and frame:GetParent().coaItem
|
||||
if not item or item.kind ~= "skill" or not item.character then return end
|
||||
if addon.Tabs and addon.Tabs.Characters and addon.Tabs.Characters.ViewCharInfo then
|
||||
local name, realm, account = Characters:GetInfo(item.viewLine)
|
||||
addon:SetCurrentCharacter(name, realm, account)
|
||||
addon.Tabs.Characters:SetCurrent(name, realm, account)
|
||||
addon.Tabs:OnClick(2)
|
||||
end
|
||||
end
|
||||
|
||||
|
||||
local skillColors = { RECIPE_GREY, RED, ORANGE, YELLOW, GREEN }
|
||||
|
||||
function ns:GetColor(rank, skillCap)
|
||||
@@ -442,3 +165,4 @@ function ns:GetColor(rank, skillCap)
|
||||
if index > #skillColors then index = #skillColors end
|
||||
return skillColors[index]
|
||||
end
|
||||
|
||||
|
||||
@@ -34,7 +34,7 @@
|
||||
|
||||
<Button name="AltoSkillsTemplate" virtual="true">
|
||||
<Size>
|
||||
<AbsDimension x="745" y="22"/>
|
||||
<AbsDimension x="615" y="22"/>
|
||||
</Size>
|
||||
<Layers>
|
||||
<Layer level="BACKGROUND">
|
||||
@@ -112,7 +112,11 @@
|
||||
profession (incl. customs Woodcutting/Woodworking) as icon+rank
|
||||
segments, replacing the old fixed Prof.1/Prof.2 columns. Width
|
||||
(325) must match the "Professions" header in TabSummary.lua. -->
|
||||
<Button name="$parentSkill1" inherits="AltoSkillButtonTemplate" id="1">
|
||||
<!-- CoA: self-contained (NOT inheriting AltoSkillButtonTemplate) so the wide
|
||||
325px professions-strip ButtonText is the ONLY $parentNormalText on this
|
||||
button. Inheriting + redefining ButtonText collided on the global name and
|
||||
left Skill1NormalText nil (crashed the Skills tab). -->
|
||||
<Button name="$parentSkill1" id="1">
|
||||
<Size>
|
||||
<AbsDimension x="325" y="18"/>
|
||||
</Size>
|
||||
@@ -135,6 +139,19 @@
|
||||
</Anchor>
|
||||
</Anchors>
|
||||
</ButtonText>
|
||||
<Scripts>
|
||||
<OnEnter>
|
||||
Altoholic.TradeSkills:OnEnter(self)
|
||||
</OnEnter>
|
||||
<OnClick>
|
||||
Altoholic.TradeSkills:OnClick(self, button)
|
||||
</OnClick>
|
||||
<OnLeave>
|
||||
AltoTooltip:Hide();
|
||||
</OnLeave>
|
||||
</Scripts>
|
||||
<NormalFont style="GameFontNormalSmallLeft"/>
|
||||
<HighlightFont style="GameFontHighlightSmallLeft"/>
|
||||
</Button>
|
||||
<Button name="$parentCooking" inherits="AltoSkillButtonTemplate" id="3">
|
||||
<Anchors>
|
||||
@@ -177,7 +194,7 @@
|
||||
|
||||
<Frame name="AltoholicFrameSkills" parent="AltoholicTabSummary" hidden="true">
|
||||
<Size>
|
||||
<AbsDimension x="745" y="306"/>
|
||||
<AbsDimension x="615" y="414"/>
|
||||
</Size>
|
||||
<Anchors>
|
||||
<Anchor point="TOPRIGHT">
|
||||
@@ -303,6 +320,36 @@
|
||||
<Anchor point="TOPLEFT" relativeTo="$parentEntry13" relativePoint="BOTTOMLEFT" />
|
||||
</Anchors>
|
||||
</Button>
|
||||
<Button name="$parentEntry15" inherits="AltoSkillsTemplate">
|
||||
<Anchors>
|
||||
<Anchor point="TOPLEFT" relativeTo="$parentEntry14" relativePoint="BOTTOMLEFT" />
|
||||
</Anchors>
|
||||
</Button>
|
||||
<Button name="$parentEntry16" inherits="AltoSkillsTemplate">
|
||||
<Anchors>
|
||||
<Anchor point="TOPLEFT" relativeTo="$parentEntry15" relativePoint="BOTTOMLEFT" />
|
||||
</Anchors>
|
||||
</Button>
|
||||
<Button name="$parentEntry17" inherits="AltoSkillsTemplate">
|
||||
<Anchors>
|
||||
<Anchor point="TOPLEFT" relativeTo="$parentEntry16" relativePoint="BOTTOMLEFT" />
|
||||
</Anchors>
|
||||
</Button>
|
||||
<Button name="$parentEntry18" inherits="AltoSkillsTemplate">
|
||||
<Anchors>
|
||||
<Anchor point="TOPLEFT" relativeTo="$parentEntry17" relativePoint="BOTTOMLEFT" />
|
||||
</Anchors>
|
||||
</Button>
|
||||
<Button name="$parentEntry19" inherits="AltoSkillsTemplate">
|
||||
<Anchors>
|
||||
<Anchor point="TOPLEFT" relativeTo="$parentEntry18" relativePoint="BOTTOMLEFT" />
|
||||
</Anchors>
|
||||
</Button>
|
||||
<Button name="$parentEntry20" inherits="AltoSkillsTemplate">
|
||||
<Anchors>
|
||||
<Anchor point="TOPLEFT" relativeTo="$parentEntry19" relativePoint="BOTTOMLEFT" />
|
||||
</Anchors>
|
||||
</Button>
|
||||
</Frames>
|
||||
</Frame>
|
||||
|
||||
|
||||
@@ -227,22 +227,32 @@ function ns:UpdateViewIcons()
|
||||
AltoholicTabCharacters_FirstAid.text = professionName
|
||||
AltoholicTabCharacters_FirstAid:Show()
|
||||
|
||||
-- CoA: characters can know far more than the retail 2 primary professions, so the
|
||||
-- _ProfN button row may run out before the profession list does. Stop at the last
|
||||
-- existing button instead of indexing a nil frame (which crashed the character view).
|
||||
local i = 1
|
||||
for skillName, skill in pairs(DS:GetPrimaryProfessions(character) or {}) do -- CoA: getter returns no value for chars DataStore_Crafts hasn't scanned
|
||||
for skillName, skill in pairs(DS:GetPrimaryProfessions(character) or {}) do
|
||||
local itemName = "AltoholicTabCharacters_Prof" .. i
|
||||
local item = _G[itemName]
|
||||
if not item then break end -- no more profession buttons available
|
||||
local spellID = DataStore:GetProfessionSpellID(skillName)
|
||||
|
||||
|
||||
if spellID then
|
||||
addon:SetItemButtonTexture(itemName, addon:GetSpellIcon(spellID), size, size)
|
||||
item.text = skillName
|
||||
item:Show()
|
||||
else
|
||||
item.text = nil
|
||||
item:Hide()
|
||||
item:Hide()
|
||||
end
|
||||
i = i + 1
|
||||
end
|
||||
-- Hide any leftover profession buttons this character doesn't fill.
|
||||
while _G["AltoholicTabCharacters_Prof" .. i] do
|
||||
_G["AltoholicTabCharacters_Prof" .. i].text = nil
|
||||
_G["AltoholicTabCharacters_Prof" .. i]:Hide()
|
||||
i = i + 1
|
||||
end
|
||||
end
|
||||
|
||||
function ns:MenuItem_OnClick(frame, button)
|
||||
|
||||
@@ -55,7 +55,7 @@
|
||||
|
||||
<Frame name="AltoholicTabCharacters" parent="AltoholicFrame" hidden="true">
|
||||
<Size>
|
||||
<AbsDimension x="758" y="447"/>
|
||||
<AbsDimension x="758" y="555"/>
|
||||
</Size>
|
||||
<Anchors>
|
||||
<Anchor point="TOPLEFT">
|
||||
@@ -243,19 +243,44 @@
|
||||
</Anchor>
|
||||
</Anchors>
|
||||
</Button>
|
||||
<!-- CoA: a character can learn every profession. Lay the profession quick-icons out
|
||||
as a wrapped 4-per-row grid in the open middle-left area (the taller window has room
|
||||
below the Character dropdown). UpdateViewIcons fills/hides Prof1..12 dynamically. -->
|
||||
<Button name="$parent_Prof1" inherits="AltoViewIconTemplate">
|
||||
<Anchors>
|
||||
<Anchor point="BOTTOMLEFT" relativeTo="$parent_FirstAid" relativePoint="BOTTOMRIGHT" >
|
||||
<Offset x="5" y="0" />
|
||||
</Anchor>
|
||||
</Anchors>
|
||||
<Anchors><Anchor point="TOPLEFT" relativeTo="AltoholicTabCharacters" relativePoint="TOPLEFT"><Offset x="30" y="-205" /></Anchor></Anchors>
|
||||
</Button>
|
||||
<Button name="$parent_Prof2" inherits="AltoViewIconTemplate">
|
||||
<Anchors>
|
||||
<Anchor point="BOTTOMLEFT" relativeTo="$parent_Prof1" relativePoint="BOTTOMRIGHT" >
|
||||
<Offset x="5" y="0" />
|
||||
</Anchor>
|
||||
</Anchors>
|
||||
<Anchors><Anchor point="BOTTOMLEFT" relativeTo="$parent_Prof1" relativePoint="BOTTOMRIGHT"><Offset x="5" y="0" /></Anchor></Anchors>
|
||||
</Button>
|
||||
<Button name="$parent_Prof3" inherits="AltoViewIconTemplate">
|
||||
<Anchors><Anchor point="BOTTOMLEFT" relativeTo="$parent_Prof2" relativePoint="BOTTOMRIGHT"><Offset x="5" y="0" /></Anchor></Anchors>
|
||||
</Button>
|
||||
<Button name="$parent_Prof4" inherits="AltoViewIconTemplate">
|
||||
<Anchors><Anchor point="BOTTOMLEFT" relativeTo="$parent_Prof3" relativePoint="BOTTOMRIGHT"><Offset x="5" y="0" /></Anchor></Anchors>
|
||||
</Button>
|
||||
<Button name="$parent_Prof5" inherits="AltoViewIconTemplate">
|
||||
<Anchors><Anchor point="TOPLEFT" relativeTo="$parent_Prof1" relativePoint="BOTTOMLEFT"><Offset x="0" y="-5" /></Anchor></Anchors>
|
||||
</Button>
|
||||
<Button name="$parent_Prof6" inherits="AltoViewIconTemplate">
|
||||
<Anchors><Anchor point="BOTTOMLEFT" relativeTo="$parent_Prof5" relativePoint="BOTTOMRIGHT"><Offset x="5" y="0" /></Anchor></Anchors>
|
||||
</Button>
|
||||
<Button name="$parent_Prof7" inherits="AltoViewIconTemplate">
|
||||
<Anchors><Anchor point="BOTTOMLEFT" relativeTo="$parent_Prof6" relativePoint="BOTTOMRIGHT"><Offset x="5" y="0" /></Anchor></Anchors>
|
||||
</Button>
|
||||
<Button name="$parent_Prof8" inherits="AltoViewIconTemplate">
|
||||
<Anchors><Anchor point="BOTTOMLEFT" relativeTo="$parent_Prof7" relativePoint="BOTTOMRIGHT"><Offset x="5" y="0" /></Anchor></Anchors>
|
||||
</Button>
|
||||
<Button name="$parent_Prof9" inherits="AltoViewIconTemplate">
|
||||
<Anchors><Anchor point="TOPLEFT" relativeTo="$parent_Prof5" relativePoint="BOTTOMLEFT"><Offset x="0" y="-5" /></Anchor></Anchors>
|
||||
</Button>
|
||||
<Button name="$parent_Prof10" inherits="AltoViewIconTemplate">
|
||||
<Anchors><Anchor point="BOTTOMLEFT" relativeTo="$parent_Prof9" relativePoint="BOTTOMRIGHT"><Offset x="5" y="0" /></Anchor></Anchors>
|
||||
</Button>
|
||||
<Button name="$parent_Prof11" inherits="AltoViewIconTemplate">
|
||||
<Anchors><Anchor point="BOTTOMLEFT" relativeTo="$parent_Prof10" relativePoint="BOTTOMRIGHT"><Offset x="5" y="0" /></Anchor></Anchors>
|
||||
</Button>
|
||||
<Button name="$parent_Prof12" inherits="AltoViewIconTemplate">
|
||||
<Anchors><Anchor point="BOTTOMLEFT" relativeTo="$parent_Prof11" relativePoint="BOTTOMRIGHT"><Offset x="5" y="0" /></Anchor></Anchors>
|
||||
</Button>
|
||||
|
||||
<Button name="$parent_Sort1" inherits="AltoSortButtonTemplate" id="1">
|
||||
|
||||
@@ -18,7 +18,7 @@
|
||||
|
||||
<Frame name="AltoholicTabGuildBank" parent="AltoholicFrame" hidden="true">
|
||||
<Size>
|
||||
<AbsDimension x="758" y="447"/>
|
||||
<AbsDimension x="758" y="555"/>
|
||||
</Size>
|
||||
<Anchors>
|
||||
<Anchor point="TOPLEFT">
|
||||
|
||||
@@ -3,7 +3,7 @@
|
||||
|
||||
<Frame name="AltoholicTabSearch" parent="AltoholicFrame" hidden="true">
|
||||
<Size>
|
||||
<AbsDimension x="758" y="447"/>
|
||||
<AbsDimension x="758" y="555"/>
|
||||
</Size>
|
||||
<Anchors>
|
||||
<Anchor point="TOPLEFT"/>
|
||||
|
||||
@@ -158,20 +158,11 @@ function ns:SetMode(mode)
|
||||
Columns:Add(L["free"], 50, function(self) addon.Characters:Sort(self, "GetNumFreeBankSlots") end)
|
||||
|
||||
elseif currentMode == 3 then
|
||||
Columns:Add(NAME, 100, function(self) addon.Characters:Sort(self, "GetCharacterName") end)
|
||||
Columns:Add(LEVEL, 60, function(self) addon.Characters:Sort(self, "GetCharacterLevel") end)
|
||||
-- CoA: a character can know ALL professions at once, so the old fixed
|
||||
-- Prof. 1 / Prof. 2 columns are replaced by one wide "Professions" column
|
||||
-- that lists every known primary profession (incl. the customs Woodcutting
|
||||
-- and Woodworking). Width matches the widened Skill1 cell in Skills.xml.
|
||||
Columns:Add(L["Professions"] or "Professions", 325, function(self) addon.Characters:Sort(self, "GetCharacterName") end)
|
||||
title = GetSpellInfo(2550) -- cooking
|
||||
Columns:Add(title, 65, function(self) addon.Characters:Sort(self, "GetCookingRank") end)
|
||||
title = GetSpellInfo(3273) -- First Aid
|
||||
Columns:Add(title, 65, function(self) addon.Characters:Sort(self, "GetFirstAidRank") end)
|
||||
title = GetSpellInfo(24303) -- Fishing
|
||||
Columns:Add(title, 65, function(self) addon.Characters:Sort(self, "GetFishingRank") end)
|
||||
Columns:Add(L["Riding"], 65, function(self) addon.Characters:Sort(self, "GetRidingRank") end)
|
||||
-- CoA: the Skills view is now a vertical list (character header, then one row per
|
||||
-- known profession/secondary skill, top to bottom). A single wide column header
|
||||
-- replaces the old per-skill columns, which no longer match the layout.
|
||||
Columns:Add((L["Character"] or "Character") .. " / " .. (L["Professions"] or "Professions"), 460, function(self) addon.Characters:Sort(self, "GetCharacterName") end)
|
||||
Columns:Add((SKILL or "Skill"), 220, function(self) addon.Characters:Sort(self, "GetCharacterName") end)
|
||||
|
||||
elseif currentMode == 4 then
|
||||
Columns:Add(NAME, 100, function(self) addon.Characters:Sort(self, "GetCharacterName") end)
|
||||
|
||||
@@ -14,7 +14,7 @@
|
||||
|
||||
<Frame name="AltoholicTabSummary" parent="AltoholicFrame">
|
||||
<Size>
|
||||
<AbsDimension x="758" y="447"/>
|
||||
<AbsDimension x="758" y="555"/>
|
||||
</Size>
|
||||
<Anchors>
|
||||
<Anchor point="TOPLEFT"/>
|
||||
|
||||
@@ -337,6 +337,7 @@ function tns:Update(treeIndex)
|
||||
|
||||
-- textures are 90.625% of the original size
|
||||
local _, bg = DS:GetTreeInfo(class, treeName)
|
||||
if not bg then return end -- CoA: no talent-tree background for this class (e.g. custom class with no reference data)
|
||||
AltoholicFrameTalents_bgTopLeft:SetTexture(bg.."-TopLeft")
|
||||
AltoholicFrameTalents_bgTopRight:SetTexture(bg.."-TopRight")
|
||||
AltoholicFrameTalents_bgBottomLeft:SetTexture(bg.."-BottomLeft")
|
||||
|
||||
@@ -380,7 +380,7 @@ local function GetItemCount(searchedID)
|
||||
for tabID = 1, 6 do
|
||||
local tabCount = DataStore:GetGuildBankTabItemCount(guildKey, tabID, searchedID)
|
||||
if tabCount > 0 then
|
||||
table.insert(tabCounters, format("%s: %s", WHITE .. DataStore:GetGuildBankTabName(guildKey, tabID), TEAL..tabCount))
|
||||
table.insert(tabCounters, format("%s: %s", WHITE .. (DataStore:GetGuildBankTabName(guildKey, tabID) or ""), TEAL..tabCount)) -- CoA: tab name nil on partial guild-bank data
|
||||
end
|
||||
end
|
||||
|
||||
|
||||
@@ -55,8 +55,8 @@ local function ScanSingleAchievement(id, isCompleted, month, day, year)
|
||||
if critCompleted then
|
||||
table.insert(CriteriaCache, tostring(j))
|
||||
else
|
||||
if reqQuantity > 1 then
|
||||
table.insert(CriteriaCache, j .. ":" .. quantity)
|
||||
if (reqQuantity or 0) > 1 then -- CoA: GetAchievementCriteriaInfo can return nil quantities for custom/partial achievements
|
||||
table.insert(CriteriaCache, j .. ":" .. (quantity or 0))
|
||||
end
|
||||
end
|
||||
end
|
||||
@@ -235,7 +235,8 @@ end
|
||||
-- *** EVENT HANDLERS ***
|
||||
function addon:PLAYER_ALIVE()
|
||||
-- print("DataStore_Achievements.lua") -- DEBUG 2025 07 21
|
||||
if not UnitIsGhost("player") then return end -- only scan if player released spirit and went to graveyard
|
||||
if addon.coaScannedThisSession then return end -- CoA: scan once at login (was ghost-gated, so data never saved on a normal login - the cause of "data not saved")
|
||||
addon.coaScannedThisSession = true
|
||||
|
||||
ScanAllAchievements()
|
||||
ScanProgress()
|
||||
|
||||
@@ -86,10 +86,15 @@ local function OnPlayerMoney()
|
||||
addon.ThisCharacter.money = GetMoney();
|
||||
end
|
||||
|
||||
local hasScannedThisSession
|
||||
local function OnPlayerAlive()
|
||||
-- print("DataStore_Characters.lua") -- DEBUG 2025 07 21
|
||||
if not UnitIsGhost("player") then return end -- only scan if player released spirit and went to graveyard
|
||||
|
||||
-- CoA: scan once at login. PLAYER_ALIVE also fires on resurrect / Feign-Death cancel
|
||||
-- (unchanged data), so skip those. The previous "only when ghost" gate skipped LOGIN
|
||||
-- too, so name/level/class/money/XP never populated on a normal login - the root of
|
||||
-- "no character data". (Same trap as DataStore_Inventory / _Skills; see commit fdcb25a.)
|
||||
if hasScannedThisSession then return end
|
||||
hasScannedThisSession = true
|
||||
|
||||
local character = addon.ThisCharacter
|
||||
|
||||
character.name = UnitName("player") -- to simplify processing a bit, the name is saved in the table too, in addition to being part of the key
|
||||
@@ -263,7 +268,7 @@ local function _GetGuildInfo(character)
|
||||
end
|
||||
|
||||
local function _GetPlayTime(character)
|
||||
return character.played
|
||||
return character.played or 0 -- CoA: nil on partial-data alt; callers do arithmetic (AccountSummary)
|
||||
end
|
||||
|
||||
local function _GetLocation(character)
|
||||
|
||||
@@ -678,25 +678,28 @@ local BagTypeStrings = {
|
||||
|
||||
local function _GetContainerInfo(character, containerID)
|
||||
local bag = _GetContainer(character, containerID)
|
||||
if type(bag) ~= "table" then return end -- CoA: unscanned bag on partial-data alt; was an index-nil crash
|
||||
return bag.icon, bag.link, bag.size, bag.freeslots, BagTypeStrings[bag.bagtype]
|
||||
end
|
||||
|
||||
local function _GetContainerSize(character, containerID)
|
||||
-- containerID can be number or string
|
||||
return character.Containers["Bag" .. containerID].size
|
||||
local bag = character.Containers["Bag" .. containerID] -- CoA: nil for unscanned bag on partial-data alt
|
||||
return bag and bag.size
|
||||
end
|
||||
|
||||
local function _GetSlotInfo(bag, slotID)
|
||||
assert(type(bag) == "table") -- this is the pointer to a bag table, obtained through addon:GetContainer()
|
||||
assert(type(slotID) == "number")
|
||||
-- CoA: partial-data alts can have an unscanned/nil bag pointer (GetContainer returns nil
|
||||
-- for a "BagN" the Containers module never scanned); return empties instead of asserting.
|
||||
if type(bag) ~= "table" or type(slotID) ~= "number" then return end
|
||||
|
||||
-- return itemID, itemLink, itemCount
|
||||
return bag.ids[slotID], bag.links[slotID], bag.counts[slotID] or 1
|
||||
return bag.ids and bag.ids[slotID], bag.links and bag.links[slotID], (bag.counts and bag.counts[slotID]) or 1
|
||||
end
|
||||
|
||||
local function _GetContainerCooldownInfo(bag, slotID)
|
||||
assert(type(bag) == "table") -- this is the pointer to a bag table, obtained through addon:GetContainer()
|
||||
assert(type(slotID) == "number")
|
||||
-- CoA: partial-data alts can have an unscanned/nil bag pointer; degrade to nil gracefully.
|
||||
if type(bag) ~= "table" or type(slotID) ~= "number" or type(bag.cooldowns) ~= "table" then return end
|
||||
|
||||
local cd = bag.cooldowns[slotID]
|
||||
if cd then
|
||||
@@ -868,7 +871,7 @@ end
|
||||
local function _GetGuildBankTabItemCount(guild, tabID, searchedID)
|
||||
local count = 0
|
||||
local container = guild.Tabs[tabID]
|
||||
|
||||
if type(container) ~= "table" or type(container.ids) ~= "table" then return count end -- CoA: unscanned guild bank tab; was a pairs(nil) crash on item tooltips
|
||||
for slotID, id in pairs(container.ids) do
|
||||
if (id == searchedID) then
|
||||
count = count + (container.counts[slotID] or 1)
|
||||
|
||||
@@ -546,7 +546,8 @@ end
|
||||
-- *** Event Handlers ***
|
||||
local function OnPlayerAlive()
|
||||
-- print("DataStore_Crafts.lua") -- DEBUG 2025 07 21
|
||||
if not UnitIsGhost("player") then return end -- only scan if player released spirit and went to graveyard
|
||||
if addon.coaScannedThisSession then return end -- CoA: scan once at login (was ghost-gated, so data never saved on a normal login - the cause of "data not saved")
|
||||
addon.coaScannedThisSession = true
|
||||
|
||||
ScanProfessionLinks()
|
||||
end
|
||||
@@ -625,6 +626,9 @@ local function _GetProfessionInfo(profession)
|
||||
end
|
||||
|
||||
local function _GetNumCraftLines(profession)
|
||||
-- CoA: profession is nil for an unscanned/custom profession on a partial-data alt;
|
||||
-- callers use this as a numeric `for` limit, so return 0 instead of crashing on #nil.Crafts
|
||||
if type(profession) ~= "table" or type(profession.Crafts) ~= "table" then return 0 end
|
||||
return #profession.Crafts
|
||||
end
|
||||
|
||||
@@ -709,7 +713,7 @@ local function _GetNumRecipesByColor(profession)
|
||||
for i = 1, _GetNumCraftLines(profession) do
|
||||
local isHeader, color = _GetCraftLineInfo(profession, i)
|
||||
|
||||
if not isHeader then
|
||||
if not isHeader and color and counts[color] then -- CoA: custom-profession craft lines can carry an out-of-range/nil color
|
||||
counts[color] = counts[color] + 1
|
||||
end
|
||||
end
|
||||
|
||||
@@ -46,7 +46,8 @@ end
|
||||
-- *** Event Handlers ***
|
||||
local function OnPlayerAlive()
|
||||
-- print("DataStore_Pets.lua") -- DEBUG 2025 07 21
|
||||
if not UnitIsGhost("player") then return end -- only scan if player released spirit and went to graveyard
|
||||
if addon.coaScannedThisSession then return end -- CoA: scan once at login (was ghost-gated, so data never saved on a normal login - the cause of "data not saved")
|
||||
addon.coaScannedThisSession = true
|
||||
|
||||
ScanCompanions("CRITTER")
|
||||
ScanCompanions("MOUNT")
|
||||
|
||||
@@ -177,7 +177,8 @@ end
|
||||
-- *** Event Handlers ***
|
||||
local function OnPlayerAlive()
|
||||
-- print("DataStore_Quests.lua") -- DEBUG 2025 07 21
|
||||
if not UnitIsGhost("player") then return end -- only scan if player released spirit and went to graveyard
|
||||
if addon.coaScannedThisSession then return end -- CoA: scan once at login (was ghost-gated, so data never saved on a normal login - the cause of "data not saved")
|
||||
addon.coaScannedThisSession = true
|
||||
|
||||
ScanQuests()
|
||||
end
|
||||
@@ -274,8 +275,10 @@ local function _GetQuestLogRewardInfo(character, index, rewardIndex)
|
||||
end
|
||||
|
||||
local function _GetQuestInfo(link)
|
||||
assert(type(link) == "string")
|
||||
|
||||
-- CoA: GetQuestLogInfo can hand back a nil link for a partial-data alt; degrade to nil
|
||||
-- returns instead of asserting (callers already nil-check the returned name/level).
|
||||
if type(link) ~= "string" then return end
|
||||
|
||||
local questID, questLevel = link:match("quest:(%d+):(-?%d+)")
|
||||
local questName = link:match("%[(.+)%]")
|
||||
|
||||
|
||||
@@ -177,7 +177,8 @@ end
|
||||
-- *** EVENT HANDLERS ***
|
||||
function addon:PLAYER_ALIVE()
|
||||
-- print("DataStore_Reputations.lua") -- DEBUG 2025 07 21
|
||||
if not UnitIsGhost("player") then return end -- only scan if player released spirit and went to graveyard
|
||||
if addon.coaScannedThisSession then return end -- CoA: scan once at login (was ghost-gated, so data never saved on a normal login - the cause of "data not saved")
|
||||
addon.coaScannedThisSession = true
|
||||
|
||||
ScanReputations()
|
||||
end
|
||||
|
||||
@@ -239,7 +239,8 @@ end
|
||||
-- *** EVENT HANDLERS ***
|
||||
function addon:PLAYER_ALIVE()
|
||||
-- print("DataStore_Skills.lua") -- DEBUG 2025 07 21
|
||||
if not UnitIsGhost("player") then return end -- only scan if player released spirit and went to graveyard
|
||||
if addon.coaScannedThisSession then return end -- CoA: scan once at login (was ghost-gated, so data never saved on a normal login - the cause of "data not saved")
|
||||
addon.coaScannedThisSession = true
|
||||
|
||||
ScanSkills()
|
||||
end
|
||||
|
||||
@@ -105,7 +105,8 @@ end
|
||||
-- *** EVENT HANDLERS ***
|
||||
function addon:PLAYER_ALIVE()
|
||||
-- print("DataStore_Spells.lua") -- DEBUG 2025 07 21
|
||||
if not UnitIsGhost("player") then return end -- only scan if player released spirit and went to graveyard
|
||||
if addon.coaScannedThisSession then return end -- CoA: scan once at login (was ghost-gated, so data never saved on a normal login - the cause of "data not saved")
|
||||
addon.coaScannedThisSession = true
|
||||
|
||||
ScanSpells()
|
||||
end
|
||||
|
||||
@@ -156,7 +156,8 @@ end
|
||||
-- *** EVENT HANDLERS ***
|
||||
function addon:PLAYER_ALIVE()
|
||||
-- print("DataStore_Stats.lua") -- DEBUG 2025 07 21
|
||||
if not UnitIsGhost("player") then return end -- only scan if player released spirit and went to graveyard
|
||||
if addon.coaScannedThisSession then return end -- CoA: scan once at login (was ghost-gated, so data never saved on a normal login - the cause of "data not saved")
|
||||
addon.coaScannedThisSession = true
|
||||
|
||||
ScanStats()
|
||||
end
|
||||
|
||||
@@ -234,41 +234,47 @@ local function _GetReferenceTable()
|
||||
end
|
||||
|
||||
local function _GetClassReference(class)
|
||||
assert(type(class) == "string")
|
||||
-- CoA: custom classes (MONK, BARBARIAN, …) have no vanilla reference table; return nil
|
||||
-- instead of asserting/crashing so callers can degrade gracefully.
|
||||
if type(class) ~= "string" then return end
|
||||
return addon.ref.global[class]
|
||||
end
|
||||
|
||||
local function _GetTreeReference(class, tree)
|
||||
assert(type(class) == "string")
|
||||
assert(type(tree) == "string")
|
||||
return addon.ref.global[class].Trees[tree]
|
||||
-- CoA: custom classes (MONK, etc.) may have no/partial talent reference data, so a
|
||||
-- tree lookup can arrive with a nil tree name. Degrade to nil instead of asserting.
|
||||
if type(class) ~= "string" or type(tree) ~= "string" then return end
|
||||
local c = addon.ref.global[class]
|
||||
if not c or not c.Trees then return end
|
||||
return c.Trees[tree]
|
||||
end
|
||||
|
||||
local function _IsClassKnown(class)
|
||||
class = class or "" -- if by any chance nil is passed, trap it to make sure the function does not fail, but returns nil anyway
|
||||
|
||||
local ref = _GetClassReference(class)
|
||||
if ref.Order then -- if the Order field is not nil, we have data for this class
|
||||
if ref and ref.Order then -- CoA: ref is nil for custom classes; was an unguarded index crash
|
||||
return true
|
||||
end
|
||||
end
|
||||
|
||||
local function _ImportClassReference(class, data)
|
||||
assert(type(class) == "string")
|
||||
assert(type(data) == "table")
|
||||
|
||||
-- CoA: data arrives over Comm/AccountSharing; a peer with no reference for a custom
|
||||
-- class can send nil, which used to crash the import. Skip silently instead.
|
||||
if type(class) ~= "string" or type(data) ~= "table" then return end
|
||||
|
||||
addon.ref.global[class] = data
|
||||
end
|
||||
|
||||
local function _GetClassTrees(class)
|
||||
assert(type(class) == "string")
|
||||
|
||||
-- CoA: ref is nil for custom classes; guard so the `for tree in DS:GetClassTrees()`
|
||||
-- loops in Talents.lua get an empty iterator instead of an index-nil crash.
|
||||
local ref = _GetClassReference(class)
|
||||
local order = ref.Order
|
||||
local order = ref and ref.Order
|
||||
if order then
|
||||
return order:gmatch("([^,]+)")
|
||||
end
|
||||
-- to do, add a return value that does not require validity testing by the caller
|
||||
return function() return nil end -- empty iterator so callers can loop safely
|
||||
end
|
||||
|
||||
local function _GetTreeInfo(class, tree)
|
||||
@@ -281,8 +287,7 @@ end
|
||||
|
||||
local function _GetTreeNameByID(class, id)
|
||||
-- returns the name of tree "id" for a given class
|
||||
assert(type(class) == "string")
|
||||
|
||||
-- CoA: _GetClassTrees now yields an empty iterator for custom classes, so no assert needed
|
||||
local index = 1
|
||||
for name in _GetClassTrees(class) do
|
||||
if index == id then
|
||||
@@ -414,7 +419,8 @@ end
|
||||
-- *** EVENT HANDLERS ***
|
||||
function addon:PLAYER_ALIVE()
|
||||
-- print("DataStore_Talents.lua") -- DEBUG 2025 07 21
|
||||
if not UnitIsGhost("player") then return end -- only scan if player released spirit and went to graveyard
|
||||
if addon.coaScannedThisSession then return end -- CoA: scan once at login (was ghost-gated, so data never saved on a normal login - the cause of "data not saved")
|
||||
addon.coaScannedThisSession = true
|
||||
|
||||
ScanTalents()
|
||||
ScanTalentReference()
|
||||
|
||||
@@ -5,6 +5,8 @@ Altoholic: modified development for WotLK
|
||||
|
||||
Ported for the Ascension CoA (Vol'jin) 3.3.5a client by the Exiles guild. Released as `*-coa.N` tags via Gitea Actions; see `Exiles/coa-altoholic`.
|
||||
|
||||
- **3.3.002b-coa.12** — Bigger main window (real size, not scale): `AltoholicFrame` 447→555px tall; AuctionFrame background art re-anchored with a middle filler; every scrolling tab shows more rows (18px tabs 14→20, 41px tabs 7/8→10) with matching `$parentEntryN` frames + grown scrollframes. Visual polish (art seam, scrollbar track length) may need a tweak after testing.
|
||||
- **3.3.002b-coa.11** — Hotfix: Skills tab crash — `$parentSkill1` ButtonText global-name collision left `Skill1NormalText` nil; made it self-contained.
|
||||
- **3.3.002b-coa.10** — Three CoA data-coverage features:
|
||||
- **Reputation** is now data-driven: shows every faction a character actually has (grouped by in-game category), so CoA's custom factions (and future ones) appear automatically. The old hardcoded faction tree is kept only as an icon lookup.
|
||||
- **Class icons** for CoA custom classes (12–32) now render from a bundled CoA atlas (`Altoholic/images/coa-classes.blp`, texcoords from the CoA Details fork) instead of falling back to the Warrior glue icon.
|
||||
|
||||
Reference in New Issue
Block a user