Compare commits
28 Commits
3.3.002b-coa.3
...
master
| Author | SHA1 | Date | |
|---|---|---|---|
| 5f39ea21fa | |||
| 57c603fa8e | |||
| f4f3de929b | |||
| ee3fec624d | |||
| 863709e450 | |||
| 78e50e9f5c | |||
| 14dd30e9a9 | |||
| 996a11dd0a | |||
| d1616b4354 | |||
| 3663d44cd4 | |||
| d915f6b844 | |||
| d440c62a73 | |||
| 219e749046 | |||
| 0a56cbe560 | |||
| b8d619c3bb | |||
| f305f0a226 | |||
| f64d2c9250 | |||
| 1faf213f17 | |||
| ee7770baed | |||
| e555a22f36 | |||
| 0565051302 | |||
| ec868716ed | |||
| ad54312ad9 | |||
| 11c47a86db | |||
| 86e5b3485f | |||
| 97e38d5c3d | |||
| 3fde42454e | |||
| f19ff36733 |
+65
-25
@@ -17,7 +17,6 @@ local TEAL = "|cFF00FF9A"
|
||||
local GOLD = "|cFFFFD700"
|
||||
|
||||
local THIS_ACCOUNT = "Default"
|
||||
local VERSION_STRING = "1.04a"
|
||||
|
||||
Altoholic.ClassInfo = {
|
||||
["MAGE"] = "|cFF69CCF0",
|
||||
@@ -249,10 +248,12 @@ end
|
||||
|
||||
|
||||
-- *** Event Handlers ***
|
||||
local hasScannedThisSession
|
||||
local function OnPlayerAlive()
|
||||
-- print("Altoholic.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 (see DataStore_Inventory / commit fdcb25a). FRIENDLIST_UPDATE also
|
||||
-- keeps the friends list fresh; this just guarantees an initial scan without rescanning on res.
|
||||
if hasScannedThisSession then return end
|
||||
hasScannedThisSession = true
|
||||
ScanFriends()
|
||||
end
|
||||
|
||||
@@ -332,7 +333,12 @@ function addon:OnEnable()
|
||||
addon:RegisterEvent("AUCTION_HOUSE_SHOW", addon.AuctionHouse.OnShow)
|
||||
addon:RegisterEvent("PLAYER_TALENT_UPDATE", addon.Talents.OnUpdate);
|
||||
|
||||
AltoholicFrameName:SetText("Altoholic |cFFFFFFFF".. addon.Version .. "|r by |cFF69CCF0Thaoky|r" .. " (Edited by |cFF69CCF0Telkar-RG|r ".."|cFFFFFFFF".. VERSION_STRING .."|r)")
|
||||
-- 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.
|
||||
-- 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")
|
||||
@@ -400,6 +406,14 @@ end
|
||||
function addon:OnShow()
|
||||
SetPortraitTexture(AltoholicFramePortrait, "player");
|
||||
|
||||
-- CoA: apply the saved UI scale on open (upstream only applied it after the Options
|
||||
-- tab was visited, so the window opened un-scaled). Default is 1.0 — scaling is opt-in
|
||||
-- via Options; a true larger layout is tracked separately.
|
||||
local O = addon.db.global.options
|
||||
if O and O.UIScale then
|
||||
AltoholicFrame:SetScale(O.UIScale)
|
||||
end
|
||||
|
||||
addon.Characters:BuildList()
|
||||
addon.Characters:BuildView()
|
||||
|
||||
@@ -483,6 +497,7 @@ 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);
|
||||
@@ -539,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 );
|
||||
@@ -559,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);
|
||||
@@ -585,6 +602,26 @@ function addon:GetDelayInDays(delay)
|
||||
return floor((time() - delay) / 86400)
|
||||
end
|
||||
|
||||
-- CoA: shared, nil-safe character display helpers.
|
||||
-- DataStore char-based getters return *no value* for any module that hasn't
|
||||
-- scanned a given character (DataStore.lua: "if not arg1.lastUpdate then return 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 "", className), 1, 1, 1)
|
||||
end
|
||||
|
||||
function Altoholic:SetCharacterRowNameLevel(entry, i, icon, character)
|
||||
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
|
||||
|
||||
function Altoholic:FormatDelay(timeStamp)
|
||||
-- timeStamp = value when time() was last called for a given variable (ex: last time the mailbox was checked)
|
||||
if not timeStamp then
|
||||
@@ -619,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
|
||||
@@ -679,19 +716,16 @@ function Altoholic:ShowClassIcons()
|
||||
local realm, account = Altoholic:GetCurrentRealm()
|
||||
|
||||
|
||||
-- ####################
|
||||
-- Sort characters by level first, then average item level. The getters yield no value
|
||||
-- for alts whose Characters/Inventory module hasn't scanned them, so default [3]/[4] to 0.
|
||||
local CharNameList = DS:GetCharacters(realm, account)
|
||||
local CharNameList_sort = {}
|
||||
|
||||
for k,v in pairs(CharNameList) do
|
||||
table.insert(CharNameList_sort,{k,v, DS:GetAverageItemLevel(v), DS:GetCharacterLevel(v)})
|
||||
table.insert(CharNameList_sort, {k, v, DS:GetAverageItemLevel(v) or 0, DS:GetCharacterLevel(v) or 0})
|
||||
end
|
||||
|
||||
-- sort for level first, avg iLevel secondly
|
||||
table.sort(CharNameList_sort, function(a,b) return b[3]+b[4]*10000 < a[3]+a[4]*10000 end)
|
||||
-- DEBUG_CHARLIST = CharNameList
|
||||
-- print("-- altoholic DEBUG READY")
|
||||
-- ####################
|
||||
|
||||
|
||||
-- for characterName, character in pairs(DS:GetCharacters(realm, account)) do
|
||||
@@ -707,13 +741,22 @@ function Altoholic:ShowClassIcons()
|
||||
end)
|
||||
|
||||
local _, class = DS:GetCharacterClass(character)
|
||||
-- CoA: CLASS_ICON_TCOORDS only carries the vanilla 10 + DK on Voljin.
|
||||
-- For the 21 CoA custom classes the lookup is nil; fall back to
|
||||
-- WARRIOR's coords so we render *something* rather than crashing.
|
||||
local tc = CLASS_ICON_TCOORDS[class] or CLASS_ICON_TCOORDS["WARRIOR"]
|
||||
local itemTexture = _G[itemName .. "IconTexture"]
|
||||
-- CoA: CLASS_ICON_TCOORDS only carries the vanilla 10 + DK on Voljin,
|
||||
-- so the 21 CoA custom classes have no entry. GetCoAClassIcon (defined
|
||||
-- in CoAClassColors.lua) returns the realm-authoritative atlas + coords
|
||||
-- for any CoA-playable class (incl. vanilla 10 + DK); it returns nil for
|
||||
-- an unknown/unscanned (no-value) token, in which case we keep the stock
|
||||
-- CLASS_ICON_TCOORDS path, defaulting to WARRIOR rather than crashing.
|
||||
local coaTex, l, r, t, b = Altoholic:GetCoAClassIcon(class)
|
||||
if coaTex then
|
||||
itemTexture:SetTexture(coaTex);
|
||||
itemTexture:SetTexCoord(l, r, t, b);
|
||||
else
|
||||
local tc = CLASS_ICON_TCOORDS[class] or CLASS_ICON_TCOORDS["WARRIOR"]
|
||||
itemTexture:SetTexture("Interface\\Glues\\CharacterCreate\\UI-CharacterCreate-Classes");
|
||||
itemTexture:SetTexCoord(tc[1], tc[2], tc[3], tc[4]);
|
||||
end
|
||||
itemTexture:SetWidth(36);
|
||||
itemTexture:SetHeight(36);
|
||||
itemTexture:SetAllPoints(itemButton);
|
||||
@@ -763,25 +806,22 @@ function Altoholic:DrawCharacterTooltip(self, charName)
|
||||
|
||||
AltoTooltip:SetOwner(self, "ANCHOR_LEFT");
|
||||
AltoTooltip:ClearLines();
|
||||
AltoTooltip:AddDoubleLine(DS:GetColoredCharacterName(character), DS:GetColoredCharacterFaction(character))
|
||||
|
||||
AltoTooltip:AddLine(format("%s %s |r%s %s", L["Level"],
|
||||
GREEN..DS:GetCharacterLevel(character), DS:GetCharacterRace(character), DS:GetCharacterClass(character)),1,1,1)
|
||||
Altoholic:AddCharacterTooltipHeader(character)
|
||||
|
||||
local zone, subZone = DS:GetLocation(character)
|
||||
AltoTooltip:AddLine(format("%s: %s |r(%s|r)", L["Zone"], GOLD..zone, GOLD..subZone),1,1,1)
|
||||
AltoTooltip:AddLine(format("%s: %s |r(%s|r)", L["Zone"], GOLD..(zone or "?"), GOLD..(subZone or "")),1,1,1)
|
||||
|
||||
local restXP = DS:GetRestXP(character)
|
||||
if restXP and restXP > 0 then
|
||||
AltoTooltip:AddLine(format("%s: %s", L["Rest XP"], GREEN..restXP),1,1,1)
|
||||
end
|
||||
|
||||
AltoTooltip:AddLine("Average iLevel: " .. GREEN .. format("%.1f", DS:GetAverageItemLevel(character)),1,1,1);
|
||||
AltoTooltip:AddLine("Average iLevel: " .. GREEN .. format("%.1f", DS:GetAverageItemLevel(character) or 0),1,1,1);
|
||||
|
||||
if IsAddOnLoaded("DataStore_Achievements") then
|
||||
if DS:GetNumCompletedAchievements(character) > 0 then
|
||||
AltoTooltip:AddLine(ACHIEVEMENTS_COMPLETED ..": " .. GREEN .. DS:GetNumCompletedAchievements(character) .. "/"..DS:GetNumAchievements(character))
|
||||
AltoTooltip:AddLine(ACHIEVEMENT_TITLE ..": " .. GREEN .. DS:GetNumAchievementPoints(character))
|
||||
if (DS:GetNumCompletedAchievements(character) or 0) > 0 then
|
||||
AltoTooltip:AddLine(ACHIEVEMENTS_COMPLETED ..": " .. GREEN .. DS:GetNumCompletedAchievements(character) .. "/"..(DS:GetNumAchievements(character) or 0))
|
||||
AltoTooltip:AddLine(ACHIEVEMENT_TITLE ..": " .. GREEN .. (DS:GetNumAchievementPoints(character) or 0))
|
||||
end
|
||||
end
|
||||
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
## Interface: 30300
|
||||
## Title: Altoholic (|cFF69CCF0Telkar-RG|cFFFFFFFF 1.04a|r |cFFFFD100CoA|r)
|
||||
## Title: Altoholic (|cFFFFD100Exiles|r)
|
||||
|
||||
## X-Curse-Packaged-Version: r90
|
||||
## X-Curse-Project-Name: Altoholic
|
||||
@@ -13,7 +13,7 @@
|
||||
|
||||
## Author: Thaoky, Telkar-RG
|
||||
## X-Edited-By: Exiles (Sub-Net) — florian.berthold@sub-net.at
|
||||
## Version: 3.3.002b-coa.3
|
||||
## 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>
|
||||
|
||||
+17
-27
@@ -76,8 +76,6 @@ local function AddRealm(AccountName, RealmName)
|
||||
local realmBankSlots = 0
|
||||
local realmFreeBankSlots = 0
|
||||
|
||||
local SkillsCache = { {name = "", rank = 0}, {name = "", rank = 0} }
|
||||
|
||||
-- 1) Add the realm name
|
||||
table.insert(characterList, { linetype = INFO_REALM_LINE + (realmCount*3),
|
||||
isCollapsed = false,
|
||||
@@ -87,36 +85,28 @@ local function AddRealm(AccountName, RealmName)
|
||||
|
||||
-- 2) Add the characters
|
||||
for characterName, character in pairs(DataStore:GetCharacters(RealmName, AccountName)) do
|
||||
SkillsCache[1].name = ""
|
||||
SkillsCache[1].rank = 0
|
||||
SkillsCache[1].spellID = nil
|
||||
SkillsCache[2].name = ""
|
||||
SkillsCache[2].rank = 0
|
||||
SkillsCache[2].spellID = nil
|
||||
|
||||
local i = 1
|
||||
local professions = DataStore:GetPrimaryProfessions(character)
|
||||
if professions then
|
||||
for SkillName, s in pairs(professions) do
|
||||
SkillsCache[i].name = SkillName
|
||||
SkillsCache[i].rank = DataStore:GetSkillInfo(character, SkillName)
|
||||
SkillsCache[i].spellID = DataStore:GetProfessionSpellID(SkillName)
|
||||
i = i + 1
|
||||
|
||||
if i > 2 then -- it seems that under certain conditions, the loop continues after 2 professions.., so break
|
||||
break
|
||||
end
|
||||
-- CoA: characters can know ALL professions at once (no retail 2-primary
|
||||
-- limit) plus the customs Woodcutting/Woodworking. Build a dynamic list of
|
||||
-- every known primary profession instead of the old fixed 2 slots. Each
|
||||
-- entry carries its own name/rank/spellID(icon) so Skills.lua can render an
|
||||
-- arbitrary number of professions. GetPrimaryProfessionList never returns
|
||||
-- nil (returns {} for unscanned chars), but guard anyway.
|
||||
local professions = {}
|
||||
if DataStore.GetPrimaryProfessionList then
|
||||
local list = DataStore:GetPrimaryProfessionList(character) or {}
|
||||
for _, p in ipairs(list) do
|
||||
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
|
||||
end
|
||||
|
||||
table.insert(characterList, { linetype = INFO_CHARACTER_LINE + (realmCount*3),
|
||||
key = character,
|
||||
skillName1 = SkillsCache[1].name,
|
||||
skillRank1 = SkillsCache[1].rank,
|
||||
spellID1 = SkillsCache[1].spellID,
|
||||
skillName2 = SkillsCache[2].name,
|
||||
skillRank2 = SkillsCache[2].rank,
|
||||
spellID2 = SkillsCache[2].spellID,
|
||||
professions = professions, -- CoA: dynamic list of all primary professions
|
||||
cooking = DataStore:GetCookingRank(character),
|
||||
firstaid = DataStore:GetFirstAidRank(character),
|
||||
fishing = DataStore:GetFishingRank(character),
|
||||
|
||||
@@ -24,7 +24,8 @@
|
||||
-- Source of truth: db.exil.es /coa/dev for the full palette;
|
||||
-- _G.RAID_CLASS_COLORS at FrameXML load time for the running client.
|
||||
|
||||
local AC = _G.Altoholic and _G.Altoholic.ClassInfo
|
||||
local Alto = _G.Altoholic
|
||||
local AC = Alto and Alto.ClassInfo
|
||||
if type(AC) ~= "table" then return end
|
||||
|
||||
local source = _G.RAID_CLASS_COLORS
|
||||
@@ -45,3 +46,92 @@ for token, color in pairs(source) do
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
-- Class ICONS
|
||||
-- -----------
|
||||
-- WoW's _G.CLASS_ICON_TCOORDS only carries texcoords for the playable
|
||||
-- classes the *client* shipped with — on the CoA Voljin client that is
|
||||
-- the vanilla 10 + DEATHKNIGHT only. The 21 CoA custom classes
|
||||
-- (BARBARIAN, WITCHDOCTOR, CHRONOMANCER, …) have no entry, so any draw
|
||||
-- site that does `CLASS_ICON_TCOORDS[class]` falls back to a wrong or
|
||||
-- blank icon (Altoholic.lua:ShowClassIcons hit this).
|
||||
--
|
||||
-- The realm-authoritative class-icon atlas is the 512x512 (8x8 grid of
|
||||
-- 64px cells) BLP that the CoA Details! fork bundles and renders for
|
||||
-- all 32 classes. We ship a copy of that atlas as
|
||||
-- Interface\AddOns\Altoholic\images\coa-classes.blp and reproduce its
|
||||
-- per-token texcoords below (source: Details/functions/profiles.lua
|
||||
-- class_coords). Keyed by the UPPERCASE englishClass token — the same
|
||||
-- key DataStore stores (DataStore_Characters: UnitClass()'s 2nd return)
|
||||
-- and CLASS_ICON_TCOORDS uses, so it is a drop-in for both.
|
||||
--
|
||||
-- Includes the vanilla 10 + DK too, so a single lookup covers every
|
||||
-- CoA-playable class uniformly out of one texture.
|
||||
|
||||
local COA_CLASS_ICON_TEXTURE = [[Interface\AddOns\Altoholic\images\coa-classes]]
|
||||
|
||||
-- left, right, top, bottom (verbatim from the CoA Details atlas)
|
||||
local COA_CLASS_ICON_TCOORDS = {
|
||||
WITCHHUNTER = { 0.875, 1, 0.375, 0.5 },
|
||||
WITCHDOCTOR = { 0.75, 0.875, 0.375, 0.5 },
|
||||
WILDWALKER = { 0.625, 0.75, 0.375, 0.5 },
|
||||
WARRIOR = { 0.5, 0.625, 0.375, 0.5 },
|
||||
WARLOCK = { 0.375, 0.5, 0.375, 0.5 },
|
||||
TINKER = { 0.25, 0.375, 0.375, 0.5 },
|
||||
SUNCLERIC = { 0.125, 0.25, 0.375, 0.5 },
|
||||
STORMBRINGER = { 0, 0.125, 0.375, 0.5 },
|
||||
STARCALLER = { 0.875, 1, 0.25, 0.375 },
|
||||
SPIRITMAGE = { 0.75, 0.875, 0.25, 0.375 },
|
||||
SONOFARUGAL = { 0.625, 0.75, 0.25, 0.375 },
|
||||
SHAMAN = { 0.5, 0.625, 0.25, 0.375 },
|
||||
ROGUE = { 0.375, 0.5, 0.25, 0.375 },
|
||||
REAPER = { 0.25, 0.375, 0.25, 0.375 },
|
||||
RANGER = { 0.125, 0.25, 0.25, 0.375 },
|
||||
PYROMANCER = { 0, 0.125, 0.25, 0.375 },
|
||||
PROPHET = { 0.875, 1, 0.125, 0.25 },
|
||||
PRIEST = { 0.75, 0.875, 0.125, 0.25 },
|
||||
PALADIN = { 0.625, 0.75, 0.125, 0.25 },
|
||||
NECROMANCER = { 0.5, 0.625, 0.125, 0.25 },
|
||||
MONK = { 0.375, 0.5, 0.125, 0.25 },
|
||||
MAGE = { 0.25, 0.375, 0.125, 0.25 },
|
||||
HUNTER = { 0.125, 0.25, 0.125, 0.25 },
|
||||
HERO = { 0, 0.125, 0.125, 0.25 },
|
||||
GUARDIAN = { 0.875, 1, 0, 0.125 },
|
||||
FLESHWARDEN = { 0.75, 0.875, 0, 0.125 },
|
||||
DRUID = { 0.625, 0.75, 0, 0.125 },
|
||||
DEMONHUNTER = { 0.5, 0.625, 0, 0.125 },
|
||||
DEATHKNIGHT = { 0.375, 0.5, 0, 0.125 },
|
||||
CULTIST = { 0.25, 0.375, 0, 0.125 },
|
||||
CHRONOMANCER = { 0.125, 0.25, 0, 0.125 },
|
||||
BARBARIAN = { 0, 0.125, 0, 0.125 },
|
||||
}
|
||||
|
||||
-- Returns texture, left, right, top, bottom for a CoA-playable class
|
||||
-- token, or nil if the token is unknown (caller should fall back to the
|
||||
-- stock CLASS_ICON_TCOORDS path). Tolerant of a nil/missing token.
|
||||
function Alto:GetCoAClassIcon(token)
|
||||
if type(token) ~= "string" then return end
|
||||
local tc = COA_CLASS_ICON_TCOORDS[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
|
||||
|
||||
@@ -279,7 +279,7 @@ local ContentScrollFrame_Desc = {
|
||||
[CHARACTER_HEADER_LINE] = {
|
||||
GetText = function(self, line)
|
||||
local _, realm, name = strsplit(".", line.key)
|
||||
return format("%s|r / %s", WHITE..realm, DataStore:GetColoredCharacterName(line.key))
|
||||
return format("%s|r / %s", WHITE..realm, DataStore:GetColoredCharacterName(line.key) or "?")
|
||||
end,
|
||||
GetOffset = function(self, line)
|
||||
return 20
|
||||
|
||||
@@ -168,7 +168,7 @@ end
|
||||
|
||||
|
||||
function ns:Update()
|
||||
local VisibleLines = 14
|
||||
local VisibleLines = 18
|
||||
local frame = "AltoholicFrameSummary"
|
||||
local entry = frame.."Entry"
|
||||
|
||||
@@ -249,12 +249,11 @@ function ns:Update()
|
||||
_G[entry..i.."Name"]:SetWidth(170)
|
||||
_G[entry..i.."Name"]:SetPoint("TOPLEFT", 10, 0)
|
||||
_G[entry..i.."NameNormalText"]:SetWidth(170)
|
||||
_G[entry..i.."NameNormalText"]:SetText(icon .. format("%s (%s)", DS:GetColoredCharacterName(character), DS:GetCharacterClass(character)))
|
||||
_G[entry..i.."Level"]:SetText(GREEN .. DS:GetCharacterLevel(character))
|
||||
addon:SetCharacterRowNameLevel(entry, i, icon, character)
|
||||
|
||||
_G[entry..i.."Money"]:SetText(addon:GetMoneyString(DS:GetMoney(character)))
|
||||
_G[entry..i.."Played"]:SetText(addon:GetTimeString(DS:GetPlayTime(character)))
|
||||
_G[entry..i.."XP"]:SetText(GREEN .. DS:GetXPRate(character) .. "%")
|
||||
_G[entry..i.."Money"]:SetText(addon:GetMoneyString(DS:GetMoney(character) or 0))
|
||||
_G[entry..i.."Played"]:SetText(addon:GetTimeString(DS:GetPlayTime(character) or 0))
|
||||
_G[entry..i.."XP"]:SetText(GREEN .. (DS:GetXPRate(character) or 0) .. "%")
|
||||
|
||||
if DS:GetCharacterLevel(character) == MAX_PLAYER_LEVEL then
|
||||
_G[entry..i.."Rested"]:SetText(WHITE .. "0%")
|
||||
@@ -262,7 +261,7 @@ function ns:Update()
|
||||
_G[entry..i.."Rested"]:SetText( addon:GetRestedXP(character) )
|
||||
end
|
||||
|
||||
_G[entry..i.."AvgILevelNormalText"]:SetText(YELLOW..format("%.1f", DS:GetAverageItemLevel(character)))
|
||||
_G[entry..i.."AvgILevelNormalText"]:SetText(YELLOW..format("%.1f", DS:GetAverageItemLevel(character) or 0))
|
||||
|
||||
elseif (lineType == INFO_TOTAL_LINE) then
|
||||
_G[entry..i.."Collapse"]:Hide()
|
||||
@@ -342,12 +341,10 @@ function ns:Level_OnEnter(frame)
|
||||
AltoTooltip:ClearLines();
|
||||
AltoTooltip:SetOwner(frame, "ANCHOR_RIGHT");
|
||||
|
||||
AltoTooltip:AddDoubleLine(DS:GetColoredCharacterName(character), DS:GetColoredCharacterFaction(character))
|
||||
AltoTooltip:AddLine(format("%s %s |r%s %s", L["Level"],
|
||||
GREEN..DS:GetCharacterLevel(character), DS:GetCharacterRace(character), DS:GetCharacterClass(character)),1,1,1)
|
||||
addon:AddCharacterTooltipHeader(character)
|
||||
|
||||
local zone, subZone = DS:GetLocation(character)
|
||||
AltoTooltip:AddLine(format("%s: %s |r(%s|r)", L["Zone"], GOLD..zone, GOLD..subZone),1,1,1)
|
||||
AltoTooltip:AddLine(format("%s: %s |r(%s|r)", L["Zone"], GOLD..(zone or "?"), GOLD..(subZone or "")),1,1,1)
|
||||
|
||||
local guildName = DS:GetGuildInfo(character)
|
||||
if guildName then
|
||||
@@ -355,9 +352,9 @@ function ns:Level_OnEnter(frame)
|
||||
end
|
||||
|
||||
AltoTooltip:AddLine(EXPERIENCE_COLON .. " "
|
||||
.. GREEN .. DS:GetXP(character) .. WHITE .. "/"
|
||||
.. GREEN .. DS:GetXPMax(character) .. WHITE .. " ("
|
||||
.. GREEN .. DS:GetXPRate(character) .. "%"
|
||||
.. GREEN .. (DS:GetXP(character) or 0) .. WHITE .. "/"
|
||||
.. GREEN .. (DS:GetXPMax(character) or 0) .. WHITE .. " ("
|
||||
.. GREEN .. (DS:GetXPRate(character) or 0) .. "%"
|
||||
.. WHITE .. ")",1,1,1);
|
||||
|
||||
local restXP = DS:GetRestXP(character)
|
||||
@@ -448,7 +445,7 @@ function ns:AIL_OnEnter(frame)
|
||||
AltoTooltip:ClearLines();
|
||||
AltoTooltip:SetOwner(frame, "ANCHOR_RIGHT");
|
||||
AltoTooltip:AddLine(DS:GetColoredCharacterName(character),1,1,1);
|
||||
AltoTooltip:AddLine(WHITE .. L["Average Item Level"] ..": " .. GREEN.. format("%.1f", DS:GetAverageItemLevel(character)),1,1,1);
|
||||
AltoTooltip:AddLine(WHITE .. L["Average Item Level"] ..": " .. GREEN.. format("%.1f", DS:GetAverageItemLevel(character) or 0),1,1,1);
|
||||
|
||||
addon:AiLTooltip()
|
||||
AltoTooltip:Show();
|
||||
|
||||
@@ -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"
|
||||
|
||||
@@ -100,8 +100,7 @@ function ns:Update()
|
||||
_G[entry..i.."Name"]:SetWidth(170)
|
||||
_G[entry..i.."Name"]:SetPoint("TOPLEFT", 10, 0)
|
||||
_G[entry..i.."NameNormalText"]:SetWidth(170)
|
||||
_G[entry..i.."NameNormalText"]:SetText(icon .. format("%s (%s)", DS:GetColoredCharacterName(character), DS:GetCharacterClass(character)))
|
||||
_G[entry..i.."Level"]:SetText(GREEN .. DS:GetCharacterLevel(character))
|
||||
addon:SetCharacterRowNameLevel(entry, i, icon, character)
|
||||
|
||||
local color
|
||||
local num = DS:GetNumMails(character) or 0
|
||||
@@ -112,7 +111,7 @@ function ns:Update()
|
||||
color = GREEN -- green by default, red if at least one mail is about to expire
|
||||
|
||||
local threshold = DataStore:GetOption("DataStore_Mails", "MailWarningThreshold")
|
||||
if DS:GetNumExpiredMails(character, threshold) > 0 then
|
||||
if (DS:GetNumExpiredMails(character, threshold) or 0) > 0 then
|
||||
color = RED
|
||||
end
|
||||
end
|
||||
@@ -181,17 +180,15 @@ function ns:OnEnter(self)
|
||||
AltoTooltip:ClearLines();
|
||||
AltoTooltip:SetOwner(self, "ANCHOR_RIGHT");
|
||||
|
||||
AltoTooltip:AddDoubleLine(DS:GetColoredCharacterName(character), DS:GetColoredCharacterFaction(character))
|
||||
AltoTooltip:AddLine(format("%s %s |r%s %s", L["Level"],
|
||||
GREEN..DS:GetCharacterLevel(character), DS:GetCharacterRace(character), DS:GetCharacterClass(character)),1,1,1)
|
||||
addon:AddCharacterTooltipHeader(character)
|
||||
|
||||
local zone, subZone = DS:GetLocation(character)
|
||||
AltoTooltip:AddLine(format("%s: %s |r(%s|r)", L["Zone"], GOLD..zone, GOLD..subZone),1,1,1)
|
||||
AltoTooltip:AddLine(format("%s: %s |r(%s|r)", L["Zone"], GOLD..(zone or "?"), GOLD..(subZone or "")),1,1,1)
|
||||
|
||||
AltoTooltip:AddLine(EXPERIENCE_COLON .. " "
|
||||
.. GREEN .. DS:GetXP(character) .. WHITE .. "/"
|
||||
.. GREEN .. DS:GetXPMax(character) .. WHITE .. " ("
|
||||
.. GREEN .. DS:GetXPRate(character) .. "%"
|
||||
.. GREEN .. (DS:GetXP(character) or 0) .. WHITE .. "/"
|
||||
.. GREEN .. (DS:GetXPMax(character) or 0) .. WHITE .. " ("
|
||||
.. GREEN .. (DS:GetXPRate(character) or 0) .. "%"
|
||||
.. WHITE .. ")",1,1,1);
|
||||
|
||||
local restXP = DS:GetRestXP(character)
|
||||
|
||||
@@ -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"
|
||||
|
||||
@@ -96,38 +96,37 @@ function ns:Update()
|
||||
_G[entry..i.."Name"]:SetWidth(170)
|
||||
_G[entry..i.."Name"]:SetPoint("TOPLEFT", 10, 0)
|
||||
_G[entry..i.."NameNormalText"]:SetWidth(170)
|
||||
_G[entry..i.."NameNormalText"]:SetText(icon .. format("%s (%s)", DS:GetColoredCharacterName(character), DS:GetCharacterClass(character)))
|
||||
_G[entry..i.."Level"]:SetText(GREEN .. DS:GetCharacterLevel(character))
|
||||
addon:SetCharacterRowNameLevel(entry, i, icon, character)
|
||||
|
||||
_G[entry..i.."FreeBags"]:SetText(GREEN .. DS:GetNumFreeBagSlots(character))
|
||||
_G[entry..i.."FreeBank"]:SetText(GREEN .. DS:GetNumFreeBankSlots(character))
|
||||
_G[entry..i.."FreeBags"]:SetText(GREEN .. (DS:GetNumFreeBagSlots(character) or 0))
|
||||
_G[entry..i.."FreeBank"]:SetText(GREEN .. (DS:GetNumFreeBankSlots(character) or 0))
|
||||
|
||||
_G[entry..i.."BagSlotsNormalText"]:SetJustifyH("LEFT")
|
||||
_G[entry..i.."BankSlotsNormalText"]:SetJustifyH("LEFT")
|
||||
|
||||
-- Normal bags
|
||||
_G[entry..i.."BagSlotsNormalText"]:SetText(format("%s/%s|r/%s|r/%s|r/%s |r(%s|r)",
|
||||
DS:GetContainerSize(character, 0),
|
||||
WHITE .. DS:GetContainerSize(character, 1),
|
||||
WHITE .. DS:GetContainerSize(character, 2),
|
||||
WHITE .. DS:GetContainerSize(character, 3),
|
||||
WHITE .. DS:GetContainerSize(character, 4),
|
||||
CYAN .. DS:GetNumBagSlots(character)))
|
||||
DS:GetContainerSize(character, 0) or 0,
|
||||
WHITE .. (DS:GetContainerSize(character, 1) or 0),
|
||||
WHITE .. (DS:GetContainerSize(character, 2) or 0),
|
||||
WHITE .. (DS:GetContainerSize(character, 3) or 0),
|
||||
WHITE .. (DS:GetContainerSize(character, 4) or 0),
|
||||
CYAN .. (DS:GetNumBagSlots(character) or 0)))
|
||||
|
||||
-- Bank bags
|
||||
if DS:GetNumBankSlots(character) < 28 then
|
||||
if (DS:GetNumBankSlots(character) or 0) < 28 then
|
||||
_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()
|
||||
@@ -182,9 +181,7 @@ function ns:OnEnter(self)
|
||||
|
||||
AltoTooltip:ClearLines();
|
||||
AltoTooltip:SetOwner(self, "ANCHOR_RIGHT");
|
||||
AltoTooltip:AddDoubleLine(DS:GetColoredCharacterName(character), DS:GetColoredCharacterFaction(character))
|
||||
AltoTooltip:AddLine(format("%s %s |r%s %s", L["Level"],
|
||||
GREEN..DS:GetCharacterLevel(character), DS:GetCharacterRace(character), DS:GetCharacterClass(character)),1,1,1)
|
||||
addon:AddCharacterTooltipHeader(character)
|
||||
AltoTooltip:AddLine(" ",1,1,1);
|
||||
|
||||
local id = self:GetID()
|
||||
@@ -203,7 +200,7 @@ function ns:OnEnter(self)
|
||||
end
|
||||
numSlots = DS:GetNumBagSlots(character)
|
||||
numFree = DS:GetNumFreeBagSlots(character)
|
||||
elseif DS:GetNumBankSlots(character) < 28 then
|
||||
elseif (DS:GetNumBankSlots(character) or 0) < 28 then
|
||||
AltoTooltip:AddLine(L["Bank not visited yet"],1,1,1);
|
||||
AltoTooltip:Show();
|
||||
return
|
||||
@@ -221,5 +218,15 @@ function ns:OnEnter(self)
|
||||
|
||||
AltoTooltip:AddLine(" ",1,1,1);
|
||||
AltoTooltip:AddLine(CYAN .. numSlots .. " |r" .. L["slots"] .. " (" .. GREEN .. numFree .. "|r " ..L["free"] .. ") ",1,1,1);
|
||||
|
||||
-- CoA personal bank (per-character). Realm bank is per-realm, not per
|
||||
-- character, so it is intentionally not shown on this character tooltip.
|
||||
local personalTabs = DS:GetPersonalBankTabCount(character) or 0
|
||||
if personalTabs > 0 then
|
||||
AltoTooltip:AddLine(" ",1,1,1);
|
||||
AltoTooltip:AddLine(format("%sPersonal Bank|r: %s%d|r %s",
|
||||
CYAN, WHITE, personalTabs, (personalTabs == 1) and "tab" or "tabs"), 1, 1, 1);
|
||||
end
|
||||
|
||||
AltoTooltip:Show();
|
||||
end
|
||||
|
||||
@@ -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"
|
||||
|
||||
@@ -178,7 +178,7 @@ 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,8 +81,8 @@ 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
|
||||
@@ -285,7 +285,7 @@ function ns:Update()
|
||||
BuildView()
|
||||
end
|
||||
|
||||
local VisibleLines = 14
|
||||
local VisibleLines = 17
|
||||
local frame = "AltoholicFrameGuildMembers"
|
||||
local entry = frame.."Entry"
|
||||
|
||||
@@ -460,7 +460,9 @@ function ns:Level_OnClick(self, button)
|
||||
if button ~= "LeftButton" then return end
|
||||
|
||||
local id = self:GetParent():GetID()
|
||||
if id == 0 then return end -- CoA: cleared/hidden rows keep SetID(0); view[0] is nil and indexing line.lineType below errors. Level_OnEnter & Collapse_OnClick already guard this; Level_OnClick (the AiL click that opens equipment) was the only handler missing it.
|
||||
local line = view[id]
|
||||
if not line then return end -- CoA: stale button ID after a GUILD_ROSTER_UPDATE view rebuild can point past #view
|
||||
if line.lineType == NORMALPLAYER_LINE then return end
|
||||
|
||||
local member = self:GetParent().CharName
|
||||
|
||||
@@ -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,8 +25,8 @@ 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
|
||||
@@ -76,8 +76,8 @@ 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
|
||||
@@ -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,6 +351,7 @@ 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"
|
||||
@@ -789,7 +789,7 @@ function ns:Item_OnEnter(frame)
|
||||
|
||||
AltoTooltip:SetOwner(frame, "ANCHOR_LEFT")
|
||||
AltoTooltip:ClearLines()
|
||||
AltoTooltip:AddLine( format("%s|r: %s", DS:GetColoredCharacterName(character), nameKey) )
|
||||
AltoTooltip:AddLine( format("%s|r: %s", DS:GetColoredCharacterName(character) or "?", nameKey) )
|
||||
AltoTooltip:AddLine(" ")
|
||||
|
||||
local questDone, cr,cg,cb
|
||||
@@ -848,7 +848,7 @@ function ns:Item_OnEnter(frame)
|
||||
else
|
||||
AltoTooltip:SetOwner(frame, "ANCHOR_LEFT")
|
||||
AltoTooltip:ClearLines()
|
||||
AltoTooltip:AddLine( format("%s|r: %s", DS:GetColoredCharacterName(character), nameKey) )
|
||||
AltoTooltip:AddLine( format("%s|r: %s", DS:GetColoredCharacterName(character) or "?", nameKey) )
|
||||
AltoTooltip:AddLine(" ")
|
||||
|
||||
local questDone, cr,cg,cb
|
||||
@@ -912,7 +912,7 @@ function ns:Item_OnEnter(frame)
|
||||
else
|
||||
AltoTooltip:SetOwner(frame, "ANCHOR_LEFT")
|
||||
AltoTooltip:ClearLines()
|
||||
AltoTooltip:AddLine( format("%s|r: %s", DS:GetColoredCharacterName(character), nameKey) )
|
||||
AltoTooltip:AddLine( format("%s|r: %s", DS:GetColoredCharacterName(character) or "?", nameKey) )
|
||||
AltoTooltip:AddLine(" ")
|
||||
AltoTooltip:AddLine(L["Required reputation"] .. ":",1,1,1)
|
||||
|
||||
|
||||
@@ -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,13 +34,13 @@ function ns:Update()
|
||||
local character = addon.Tabs.Characters:GetCurrent()
|
||||
|
||||
|
||||
local VisibleLines = 14
|
||||
local VisibleLines = 18
|
||||
local frame = "AltoholicFrameQuests"
|
||||
local entry = frame.."Entry"
|
||||
|
||||
local DS = DataStore
|
||||
|
||||
if DS:GetQuestLogSize(character) == 0 then
|
||||
if (DS:GetQuestLogSize(character) or 0) == 0 then
|
||||
AltoholicTabCharactersStatus:SetText(L["No quest found for "] .. addon:GetCurrentCharacter())
|
||||
addon:ClearScrollFrame( _G[ frame.."ScrollFrame" ], entry, VisibleLines, 18)
|
||||
return
|
||||
|
||||
@@ -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>
|
||||
|
||||
@@ -14,6 +14,13 @@ local DARK_RED = "|cFFF00000"
|
||||
local ICON_UNKNOWN = "\124TInterface\\RaidFrame\\ReadyCheck-NotReady:14\124t"
|
||||
local ICON_EXALTED = "\124TInterface\\RaidFrame\\ReadyCheck-Ready:14\124t"
|
||||
|
||||
-- NOTE (Exiles/CoA): The Reputations view is DATA-DRIVEN.
|
||||
-- The hardcoded `Factions` table below is used ONLY as an icon lookup (faction name -> icon),
|
||||
-- so well-known Blizzard factions keep their nice icons. The list of factions actually shown,
|
||||
-- and their grouping, is built at runtime from what DataStore_Reputations scanned on each
|
||||
-- character (faction name + in-game category header). This means CoA's custom factions
|
||||
-- (and any new ones added over time) appear automatically, with no code edits required.
|
||||
-- Factions not present in the icon lookup fall back to a generic faction icon.
|
||||
local Factions = {
|
||||
-- Factions reference table, based on http://www.wowwiki.com/Factions
|
||||
{ -- [1]
|
||||
@@ -151,8 +158,96 @@ local VertexColors = {
|
||||
[FACTION_STANDING_LABEL8] = { r = 1.0, g = 1.0, b = 1.0 }, -- exalted
|
||||
}
|
||||
|
||||
local currentXPack = 1 -- default to wow classic
|
||||
local currentFactionGroup = (UnitFactionGroup("player") == "Alliance") and 1 or 2 -- default to alliance or horde
|
||||
local GENERIC_FACTION_ICON = "Achievement_Reputation_01" -- fallback icon for factions not in the lookup (ex: CoA custom factions)
|
||||
|
||||
-- Flat icon lookup built once from the hardcoded reference table above: faction name -> icon name.
|
||||
local FactionIcons = {}
|
||||
for _, xpack in ipairs(Factions) do
|
||||
for _, factionGroup in ipairs(xpack) do
|
||||
for _, faction in ipairs(factionGroup) do
|
||||
if faction.name and faction.icon then
|
||||
FactionIcons[faction.name] = faction.icon
|
||||
end
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
local function GetFactionIcon(name)
|
||||
return FactionIcons[name] or GENERIC_FACTION_ICON
|
||||
end
|
||||
|
||||
-- *** Dynamic, data-driven group/faction model ***
|
||||
-- currentGroup = "" means "All factions" (every scanned faction, flat). Otherwise it's an in-game
|
||||
-- category header name (ex: "Wrath of the Lich King", or a CoA custom category).
|
||||
local ALL_GROUPS = ""
|
||||
local currentGroup = ALL_GROUPS
|
||||
|
||||
-- Rebuilt on each Update from the union of all characters' scanned reputations on the current realm.
|
||||
local displayedGroups = {} -- ordered list of { name = headerName } for the dropdown
|
||||
local displayedFactions = {} -- ordered list of faction names currently shown (filtered by currentGroup)
|
||||
|
||||
local function BuildModel()
|
||||
local DS = DataStore
|
||||
local realm, account = addon:GetCurrentRealm()
|
||||
|
||||
-- header (group) name -> { set of faction names }, plus first-seen order for stable display
|
||||
local groupSet = {}
|
||||
local factionHeader = {} -- faction name -> its header (last writer wins; headers are consistent across chars)
|
||||
local factionOrder = {} -- faction name -> first-seen index (stable ordering)
|
||||
local orderCounter = 0
|
||||
local groupOrder = {} -- header name -> first-seen index
|
||||
|
||||
for _, characterKey in pairs(DS:GetCharacters(realm, account)) do
|
||||
local reputations = DS:GetReputations(characterKey) or {}
|
||||
local headers = DS:GetReputationHeaders(characterKey) or {}
|
||||
for factionName in pairs(reputations) do
|
||||
local header = headers[factionName] or ""
|
||||
if factionOrder[factionName] == nil then
|
||||
orderCounter = orderCounter + 1
|
||||
factionOrder[factionName] = orderCounter
|
||||
end
|
||||
factionHeader[factionName] = header
|
||||
if not groupSet[header] then
|
||||
groupSet[header] = true
|
||||
groupOrder[header] = orderCounter
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
-- Build the ordered group list for the dropdown.
|
||||
wipe(displayedGroups)
|
||||
local groupNames = {}
|
||||
for header in pairs(groupSet) do
|
||||
tinsert(groupNames, header)
|
||||
end
|
||||
table.sort(groupNames, function(a, b) return (groupOrder[a] or 0) < (groupOrder[b] or 0) end)
|
||||
for _, header in ipairs(groupNames) do
|
||||
tinsert(displayedGroups, header)
|
||||
end
|
||||
|
||||
-- If the previously selected group no longer exists, fall back to "All factions".
|
||||
if currentGroup ~= ALL_GROUPS and not groupSet[currentGroup] then
|
||||
currentGroup = ALL_GROUPS
|
||||
end
|
||||
|
||||
-- Build the ordered faction list for the currently selected group.
|
||||
wipe(displayedFactions)
|
||||
local names = {}
|
||||
for factionName in pairs(factionHeader) do
|
||||
if currentGroup == ALL_GROUPS or factionHeader[factionName] == currentGroup then
|
||||
tinsert(names, factionName)
|
||||
end
|
||||
end
|
||||
table.sort(names, function(a, b) return (factionOrder[a] or 0) < (factionOrder[b] or 0) end)
|
||||
for _, factionName in ipairs(names) do
|
||||
tinsert(displayedFactions, factionName)
|
||||
end
|
||||
end
|
||||
|
||||
local function GroupLabel(header)
|
||||
if header == ALL_GROUPS or header == "" then return ALL end -- "All", a Blizzard global string
|
||||
return header
|
||||
end
|
||||
|
||||
addon.Reputations = {}
|
||||
|
||||
@@ -194,12 +289,10 @@ local function DDM_AddCloseMenu()
|
||||
UIDropDownMenu_AddButton(info, 1)
|
||||
end
|
||||
|
||||
local function DDM_OnClick(self, xpackIndex, factionGroupIndex)
|
||||
currentXPack = xpackIndex
|
||||
currentFactionGroup = factionGroupIndex
|
||||
local function DDM_OnClick(self, header)
|
||||
currentGroup = header or ALL_GROUPS
|
||||
|
||||
local factionGroup = Factions[currentXPack][currentFactionGroup]
|
||||
UIDropDownMenu_SetText(AltoholicFrameReputations_SelectFaction, factionGroup.name)
|
||||
UIDropDownMenu_SetText(AltoholicFrameReputations_SelectFaction, GroupLabel(currentGroup))
|
||||
|
||||
ns:Update()
|
||||
end
|
||||
@@ -211,14 +304,13 @@ local function Reputations_UpdateEx(self, offset, entry, desc)
|
||||
local DS = DataStore
|
||||
local realm, account = addon:GetCurrentRealm()
|
||||
local character
|
||||
local factionGroup = Factions[currentXPack][currentFactionGroup]
|
||||
|
||||
for i=1, desc.NumLines do
|
||||
line = i + offset
|
||||
if line <= size then
|
||||
local faction = factionGroup[line]
|
||||
local factionName = displayedFactions[line]
|
||||
|
||||
_G[entry..i.."Name"]:SetText(WHITE .. faction.name)
|
||||
_G[entry..i.."Name"]:SetText(WHITE .. (factionName or ""))
|
||||
_G[entry..i.."Name"]:SetJustifyH("LEFT")
|
||||
_G[entry..i.."Name"]:SetPoint("TOPLEFT", 15, 0)
|
||||
|
||||
@@ -228,12 +320,12 @@ local function Reputations_UpdateEx(self, offset, entry, desc)
|
||||
local classButton = _G["AltoholicFrameClassesItem" .. j]
|
||||
|
||||
local itemTexture = _G[itemName .. "_Background"]
|
||||
itemTexture:SetTexture("Interface\\Icons\\"..faction.icon)
|
||||
itemTexture:SetTexture("Interface\\Icons\\"..GetFactionIcon(factionName))
|
||||
|
||||
local status, rate
|
||||
if classButton.CharName then -- if there's an alt in this column..
|
||||
character = DS:GetCharacter(classButton.CharName, realm, account)
|
||||
status, _, _, rate = DS:GetReputationInfo(character, faction.name)
|
||||
status, _, _, rate = DS:GetReputationInfo(character, factionName)
|
||||
|
||||
if status and rate then
|
||||
local vc = VertexColors[status]
|
||||
@@ -273,25 +365,27 @@ local function Reputations_UpdateEx(self, offset, entry, desc)
|
||||
end
|
||||
|
||||
local ReputationsScrollFrame_Desc = {
|
||||
NumLines = 8,
|
||||
NumLines = 10,
|
||||
LineHeight = 41,
|
||||
Frame = "AltoholicFrameReputations",
|
||||
GetSize = function() return #Factions[currentXPack][currentFactionGroup] end,
|
||||
GetSize = function() return #displayedFactions end,
|
||||
Update = Reputations_UpdateEx,
|
||||
}
|
||||
|
||||
function ns:DropDownFaction_Initialize()
|
||||
for xpackIndex, xpack in ipairs(Factions) do
|
||||
DDM_AddTitle(xpack.name)
|
||||
-- Dropdown is built dynamically from the categories actually scanned across all characters.
|
||||
BuildModel()
|
||||
|
||||
for factionGroupIndex, factionGroup in ipairs(Factions[xpackIndex]) do
|
||||
DDM_Add(factionGroup.name, DDM_OnClick, xpackIndex, factionGroupIndex)
|
||||
end
|
||||
DDM_Add(GroupLabel(ALL_GROUPS), DDM_OnClick, ALL_GROUPS) -- "All factions" pseudo-group
|
||||
for _, header in ipairs(displayedGroups) do
|
||||
DDM_Add(GroupLabel(header), DDM_OnClick, header)
|
||||
end
|
||||
DDM_AddCloseMenu()
|
||||
end
|
||||
|
||||
function ns:Update()
|
||||
BuildModel()
|
||||
UIDropDownMenu_SetText(AltoholicFrameReputations_SelectFaction, GroupLabel(currentGroup))
|
||||
addon:ScrollFrameUpdate(ReputationsScrollFrame_Desc)
|
||||
end
|
||||
|
||||
@@ -302,15 +396,15 @@ function ns:OnEnter(frame)
|
||||
local DS = DataStore
|
||||
local realm, account = addon:GetCurrentRealm()
|
||||
local character = DS:GetCharacter(charName, realm, account)
|
||||
local factionGroup = Factions[currentXPack][currentFactionGroup]
|
||||
local faction = factionGroup[ frame:GetParent():GetID() ].name
|
||||
local faction = displayedFactions[ frame:GetParent():GetID() ]
|
||||
if not faction then return end
|
||||
|
||||
local status, currentLevel, maxLevel, rate = DS:GetReputationInfo(character, faction)
|
||||
if not status then return end
|
||||
|
||||
AltoTooltip:SetOwner(frame, "ANCHOR_LEFT");
|
||||
AltoTooltip:ClearLines();
|
||||
AltoTooltip:AddLine(DS:GetColoredCharacterName(character) .. WHITE .. " @ " .. TEAL .. faction,1,1,1);
|
||||
AltoTooltip:AddLine((DS:GetColoredCharacterName(character) or "?") .. WHITE .. " @ " .. TEAL .. faction,1,1,1);
|
||||
|
||||
rate = format("%d", floor(rate)) .. "%"
|
||||
AltoTooltip:AddLine(format("%s: %d/%d (%s)", status, currentLevel, maxLevel, rate),1,1,1 )
|
||||
@@ -346,8 +440,8 @@ function ns:OnClick(frame, button)
|
||||
local DS = DataStore
|
||||
local realm, account = addon:GetCurrentRealm()
|
||||
local character = DS:GetCharacter(charName, realm, account)
|
||||
local factionGroup = Factions[currentXPack][currentFactionGroup]
|
||||
local faction = factionGroup[ frame:GetParent():GetID() ].name
|
||||
local faction = displayedFactions[ frame:GetParent():GetID() ]
|
||||
if not faction then return end
|
||||
|
||||
local status, currentLevel, maxLevel, rate = DS:GetReputationInfo(character, faction)
|
||||
if not status then return 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">
|
||||
@@ -213,11 +213,11 @@
|
||||
</Anchors>
|
||||
<Scripts>
|
||||
<OnLoad>
|
||||
local faction = (UnitFactionGroup("player") == "Alliance") and FACTION_ALLIANCE or FACTION_HORDE
|
||||
|
||||
UIDropDownMenu_SetWidth(self, 100)
|
||||
-- Default to "All factions"; the dropdown contents are built dynamically
|
||||
-- from the categories actually scanned (see Reputations.lua / BuildModel).
|
||||
UIDropDownMenu_SetWidth(self, 140)
|
||||
UIDropDownMenu_SetButtonWidth(self, 20)
|
||||
UIDropDownMenu_SetText(self, faction)
|
||||
UIDropDownMenu_SetText(self, ALL)
|
||||
UIDropDownMenu_Initialize(self, Altoholic.Reputations.DropDownFaction_Initialize)
|
||||
</OnLoad>
|
||||
</Scripts>
|
||||
@@ -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"
|
||||
|
||||
@@ -603,6 +603,8 @@ local function BrowseCharacter(character)
|
||||
currentResultLocation = L["Bank"]
|
||||
elseif (containerName == "Bag-2") then
|
||||
currentResultLocation = KEYRING
|
||||
elseif string.sub(containerName, 1, 5) == "PBank" then -- CoA personal bank tab
|
||||
currentResultLocation = "Personal Bank"
|
||||
else
|
||||
local bagNum = tonumber(string.sub(containerName, 4))
|
||||
if (bagNum >= 0) and (bagNum <= 4) then
|
||||
@@ -711,6 +713,38 @@ local function BrowseRealm(realm, account, bothFactions)
|
||||
currentResultLocation = nil
|
||||
end
|
||||
|
||||
-- CoA realm bank: shared per-realm storage. Scanned once per realm (not per
|
||||
-- character). Reported on the player-item line, attributed to the realm.
|
||||
if addon.Options:Get("IncludeGuildBank") == 1 then
|
||||
currentResultType = PLAYER_ITEM_LINE
|
||||
-- Use the first scanned character of this realm as the row "source" so
|
||||
-- the result lists the correct realm/account; if none, skip.
|
||||
local anyChar
|
||||
for _, character in pairs(DS:GetCharacters(realm, account)) do
|
||||
anyChar = character
|
||||
break
|
||||
end
|
||||
|
||||
if anyChar then
|
||||
for tabID = 1, 6 do
|
||||
local tab = DS:GetRealmBankTab(realm, account, tabID)
|
||||
if tab and tab.name then
|
||||
currentResultKey = anyChar
|
||||
for slotID = 1, (tab.size or 0) do
|
||||
currentResultLocation = format("Realm Bank (%s)", tab.name)
|
||||
local id = tab.ids[slotID]
|
||||
if id then
|
||||
VerifyItem((tab.links or {})[slotID] or id, (tab.counts or {})[slotID] or 1)
|
||||
end
|
||||
end
|
||||
end
|
||||
end
|
||||
currentResultKey = nil
|
||||
end
|
||||
currentResultType = nil
|
||||
currentResultLocation = nil
|
||||
end
|
||||
|
||||
if addon.Options:Get("IncludeGuildSkills") == 1 and string.len(currentValue) > 1 then -- Check guild professions ?
|
||||
local guild = addon:GetGuild()
|
||||
if guild and LTL then -- LTL won't be valid if there's a version mismatch (see :Init() )
|
||||
|
||||
@@ -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>
|
||||
|
||||
+111
-347
@@ -28,377 +28,141 @@ 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
|
||||
-- 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 }
|
||||
|
||||
for _, line in pairs(Characters:GetView()) do
|
||||
local lineType = Characters:GetLineType(line)
|
||||
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
|
||||
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
|
||||
|
||||
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
|
||||
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
|
||||
DrawRealm = false
|
||||
-- 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
|
||||
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)
|
||||
_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 )
|
||||
|
||||
if Characters:GetField(line, "isCollapsed") == false then
|
||||
_G[ entry..i.."Collapse" ]:SetNormalTexture("Interface\\Buttons\\UI-MinusButton-Up");
|
||||
DrawRealm = true
|
||||
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
|
||||
_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.."Skill2NormalText"]: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)
|
||||
_G[entry..i.."NameNormalText"]:SetText(icon .. format("%s (%s)", DS:GetColoredCharacterName(character), DS:GetCharacterClass(character)))
|
||||
_G[entry..i.."Level"]:SetText(GREEN .. DS:GetCharacterLevel(character))
|
||||
|
||||
-- profession 1
|
||||
local field = Characters:GetField(line, "spellID1")
|
||||
if field then
|
||||
-- icon = addon:TextureToFontstring(addon:GetSpellIcon(field), size, size) .. " "
|
||||
icon = addon:TextureToFontstring2(addon:GetSpellIcon(field), size, size, inset, inset, inset, inset) .. " "
|
||||
else
|
||||
icon = ""
|
||||
end
|
||||
field = Characters:GetField(line, "skillRank1")
|
||||
_G[entry..i.."Skill1NormalText"]:SetText(icon .. ns:GetColor(field) .. field)
|
||||
|
||||
-- profession 2
|
||||
field = Characters:GetField(line, "spellID2")
|
||||
if field then
|
||||
-- icon = addon:TextureToFontstring(addon:GetSpellIcon(field), size, size) .. " "
|
||||
icon = addon:TextureToFontstring2(addon:GetSpellIcon(field), size, size, inset, inset, inset, inset) .. " "
|
||||
else
|
||||
icon = ""
|
||||
end
|
||||
field = Characters:GetField(line, "skillRank2")
|
||||
_G[entry..i.."Skill2NormalText"]:SetText(icon .. ns:GetColor(field) .. 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")
|
||||
_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")
|
||||
_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")
|
||||
_G[entry..i.."FishingNormalText"]:SetText(icon .. ns:GetColor(field) .. field)
|
||||
|
||||
-- riding
|
||||
field = Characters:GetField(line, "riding")
|
||||
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
|
||||
btn.coaItem = nil
|
||||
btn:SetID(0)
|
||||
btn:Hide()
|
||||
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.."Skill2NormalText"]:SetText("")
|
||||
_G[entry..i.."CookingNormalText"]:SetText("")
|
||||
_G[entry..i.."FirstAidNormalText"]:SetText("")
|
||||
_G[entry..i.."FishingNormalText"]:SetText("")
|
||||
_G[entry..i.."RidingNormalText"]:SetText("")
|
||||
end
|
||||
_G[ entry..i ]:SetID(line)
|
||||
_G[ entry..i ]:Show()
|
||||
i = i + 1
|
||||
VisibleCount = VisibleCount + 1
|
||||
DisplayedCount = DisplayedCount + 1
|
||||
end
|
||||
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);
|
||||
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
|
||||
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 id = frame:GetID()
|
||||
local skillName, rank, suggestion
|
||||
|
||||
if id == 1 then
|
||||
skillName = Characters:GetField(line, "skillName1")
|
||||
elseif id == 2 then
|
||||
skillName = Characters:GetField(line, "skillName2")
|
||||
elseif 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 DS = DataStore
|
||||
local character = DS:GetCharacter(Characters:GetInfo(line))
|
||||
local curRank, maxRank = DS:GetSkillInfo(character, skillName)
|
||||
local profession = DS:GetProfession(character, skillName)
|
||||
|
||||
if (id >= 1) 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"])
|
||||
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 <= 4 then -- all skills except 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();
|
||||
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
|
||||
skillName = Characters:GetField(line, "skillName1")
|
||||
elseif id == 2 then
|
||||
skillName = Characters:GetField(line, "skillName2")
|
||||
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)
|
||||
-- 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
|
||||
|
||||
if id == 6 then
|
||||
addon.Tabs.Characters:ViewCharInfo(VIEW_MOUNTS)
|
||||
else
|
||||
addon.Tabs.Characters:ViewRecipes(skillName)
|
||||
end
|
||||
end
|
||||
|
||||
local skillColors = { RECIPE_GREY, RED, ORANGE, YELLOW, GREEN }
|
||||
|
||||
function ns:GetColor(rank, skillCap)
|
||||
rank = rank or 0 -- CoA: skill fields are nil for chars DataStore_Characters hasn't scanned
|
||||
skillCap = skillCap or 450
|
||||
return skillColors[ floor(rank / (skillCap/4)) + 1 ]
|
||||
-- CoA: custom professions can exceed skillCap (e.g. ranks > 450), which would
|
||||
-- push the index past the 5-colour table and return nil -> crash on concat.
|
||||
-- Clamp into [1, #skillColors].
|
||||
local index = floor(rank / (skillCap / 4)) + 1
|
||||
if index < 1 then index = 1 end
|
||||
if index > #skillColors then index = #skillColors end
|
||||
return skillColors[index]
|
||||
end
|
||||
|
||||
|
||||
@@ -108,7 +108,18 @@
|
||||
<NormalFont style="GameFontNormalSmallLeft"/>
|
||||
<HighlightFont style="GameFontHighlightSmallLeft"/>
|
||||
</Button>
|
||||
<Button name="$parentSkill1" inherits="AltoSkillButtonTemplate" id="1">
|
||||
<!-- CoA: single wide "Professions" cell. Lists every known primary
|
||||
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. -->
|
||||
<!-- 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>
|
||||
<Anchors>
|
||||
<Anchor point="BOTTOMLEFT" relativeTo="$parentLevel" relativePoint="BOTTOMRIGHT">
|
||||
<Offset>
|
||||
@@ -116,19 +127,35 @@
|
||||
</Offset>
|
||||
</Anchor>
|
||||
</Anchors>
|
||||
</Button>
|
||||
<Button name="$parentSkill2" inherits="AltoSkillButtonTemplate" id="2">
|
||||
<ButtonText name="$parentNormalText" justifyH="LEFT">
|
||||
<Size>
|
||||
<AbsDimension x="325" y="18"/>
|
||||
</Size>
|
||||
<Anchors>
|
||||
<Anchor point="BOTTOMLEFT" relativeTo="$parentSkill1" relativePoint="BOTTOMRIGHT">
|
||||
<Anchor point="LEFT">
|
||||
<Offset>
|
||||
<AbsDimension x="0" y="0"/>
|
||||
</Offset>
|
||||
</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>
|
||||
<Anchor point="BOTTOMLEFT" relativeTo="$parentSkill2" relativePoint="BOTTOMRIGHT">
|
||||
<Anchor point="BOTTOMLEFT" relativeTo="$parentSkill1" relativePoint="BOTTOMRIGHT">
|
||||
<Offset>
|
||||
<AbsDimension x="0" y="0"/>
|
||||
</Offset>
|
||||
@@ -167,7 +194,7 @@
|
||||
|
||||
<Frame name="AltoholicFrameSkills" parent="AltoholicTabSummary" hidden="true">
|
||||
<Size>
|
||||
<AbsDimension x="615" y="306"/>
|
||||
<AbsDimension x="615" y="414"/>
|
||||
</Size>
|
||||
<Anchors>
|
||||
<Anchor point="TOPRIGHT">
|
||||
@@ -293,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,10 +227,14 @@ 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)) do
|
||||
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
|
||||
@@ -243,6 +247,12 @@ function ns:UpdateViewIcons()
|
||||
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">
|
||||
|
||||
@@ -432,13 +432,13 @@ function Altoholic:MoveMinimapIcon()
|
||||
end
|
||||
|
||||
function Altoholic.Options:Get(name)
|
||||
if addon.db and addon.db.global then
|
||||
if addon.db and addon.db.global and addon.db.global.options then
|
||||
return addon.db.global.options[name]
|
||||
end
|
||||
end
|
||||
|
||||
function Altoholic.Options:Set(name, value)
|
||||
if addon.db and addon.db.global then
|
||||
if addon.db and addon.db.global and addon.db.global.options then
|
||||
addon.db.global.options[name] = value
|
||||
end
|
||||
end
|
||||
|
||||
@@ -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,17 +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)
|
||||
Columns:Add(L["Prof. 1"], 65, function(self) addon.Characters:Sort(self, "skillName1") end)
|
||||
Columns:Add(L["Prof. 2"], 65, function(self) addon.Characters:Sort(self, "skillName2") 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
|
||||
|
||||
@@ -448,7 +448,7 @@ local function GetRecipeOwners(professionName, link, recipeLevel)
|
||||
table.insert(know, coloredName)
|
||||
else
|
||||
local currentLevel = DataStore:GetSkillInfo(character, professionName)
|
||||
if currentLevel > 0 then
|
||||
if currentLevel and currentLevel > 0 then -- CoA: getter returns no value for chars DataStore_Skills hasn't scanned
|
||||
if currentLevel < recipeLevel then
|
||||
table.insert(willLearn, format("%s |r(%d)", coloredName, currentLevel))
|
||||
else
|
||||
|
||||
Binary file not shown.
@@ -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,9 +86,14 @@ 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
|
||||
|
||||
@@ -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)
|
||||
|
||||
@@ -35,6 +35,24 @@ local MSG_BANKTAB_TRANSFER = 6 -- .. or send the data
|
||||
|
||||
local AddonDB_Defaults = {
|
||||
global = {
|
||||
-- CoA (Ascension) Realm Bank: shared per-realm storage, keyed by "Account.Realm"
|
||||
-- (NOT per-character). Mirrors the guild bank's Tabs layout so the same
|
||||
-- scan/read helpers can be reused.
|
||||
RealmBanks = {
|
||||
['*'] = { -- ["Account.Realm"]
|
||||
lastUpdate = nil,
|
||||
Tabs = {
|
||||
['*'] = { -- tabID = table index [1] to [6]
|
||||
name = nil,
|
||||
icon = nil,
|
||||
size = 0,
|
||||
ids = {},
|
||||
links = {},
|
||||
counts = {}
|
||||
}
|
||||
},
|
||||
}
|
||||
},
|
||||
Guilds = {
|
||||
['*'] = { -- ["Account.Realm.Name"]
|
||||
money = nil,
|
||||
@@ -204,6 +222,16 @@ end
|
||||
local BAGS = 1 -- All bags, 0 to 11, and keyring ( id -2 )
|
||||
local BANK = 2 -- 28 main slots
|
||||
local GUILDBANK = 3 -- 98 main slots
|
||||
local PERSONALBANK = 4 -- CoA personal bank (per-character), read via guild bank API
|
||||
local REALMBANK = 5 -- CoA realm bank (per-realm), read via guild bank API
|
||||
|
||||
-- CoA reuses the Guild Bank UI for the Personal Bank and the Realm Bank.
|
||||
-- These container key prefixes keep their scanned tabs out of the regular
|
||||
-- "Bag0".."Bag11" / "Bag100" / "Bag-2" namespace so item-count loops can tell
|
||||
-- them apart. Personal bank tabs live under the character; realm bank tabs live
|
||||
-- in the realm-keyed global table.
|
||||
local PERSONALBANK_PREFIX = "PBank" -- char.Containers["PBank1".."PBank6"]
|
||||
local MAX_BANK_TABS = 6
|
||||
|
||||
local ContainerTypes = {
|
||||
[BAGS] = {
|
||||
@@ -262,9 +290,81 @@ local ContainerTypes = {
|
||||
GetCooldown = function(self, slotID)
|
||||
return nil
|
||||
end,
|
||||
},
|
||||
-- Personal & Realm banks are read through the guild bank API (CoA reuses that UI).
|
||||
[PERSONALBANK] = {
|
||||
GetSize = function(self)
|
||||
return MAX_GUILDBANK_SLOTS_PER_TAB or 98
|
||||
end,
|
||||
GetFreeSlots = function(self)
|
||||
return nil, nil
|
||||
end,
|
||||
GetLink = function(self, slotID, tabID)
|
||||
return GetGuildBankItemLink(tabID, slotID)
|
||||
end,
|
||||
GetCount = function(self, slotID, tabID)
|
||||
local _, count = GetGuildBankItemInfo(tabID, slotID)
|
||||
return count
|
||||
end,
|
||||
GetCooldown = function(self, slotID)
|
||||
return nil
|
||||
end,
|
||||
},
|
||||
[REALMBANK] = {
|
||||
GetSize = function(self)
|
||||
return MAX_GUILDBANK_SLOTS_PER_TAB or 98
|
||||
end,
|
||||
GetFreeSlots = function(self)
|
||||
return nil, nil
|
||||
end,
|
||||
GetLink = function(self, slotID, tabID)
|
||||
return GetGuildBankItemLink(tabID, slotID)
|
||||
end,
|
||||
GetCount = function(self, slotID, tabID)
|
||||
local _, count = GetGuildBankItemInfo(tabID, slotID)
|
||||
return count
|
||||
end,
|
||||
GetCooldown = function(self, slotID)
|
||||
return nil
|
||||
end,
|
||||
}
|
||||
}
|
||||
|
||||
-- *** CoA bank-type detection ***
|
||||
-- CoA exposes BANK_PERMISSIONS_PAYLOAD via the client-only HasJsonCacheData /
|
||||
-- GetJsonCacheData / C_Serialize APIs. Guard every call so this is harmless on
|
||||
-- non-CoA clients (where the personal/realm bank simply never triggers).
|
||||
local function GetCoABankType()
|
||||
if not (HasJsonCacheData and GetJsonCacheData and C_Serialize and C_Serialize.FromJSON) then
|
||||
return "guild"
|
||||
end
|
||||
if not HasJsonCacheData("BANK_PERMISSIONS_PAYLOAD", 0) then
|
||||
return "guild"
|
||||
end
|
||||
local json = GetJsonCacheData("BANK_PERMISSIONS_PAYLOAD", 0)
|
||||
if not json then
|
||||
return "guild"
|
||||
end
|
||||
local jsonObject = C_Serialize:FromJSON(json)
|
||||
if not jsonObject then
|
||||
return "guild"
|
||||
end
|
||||
if jsonObject.IsPersonalBank then
|
||||
return "personal"
|
||||
elseif jsonObject.IsRealmBank then
|
||||
return "realm"
|
||||
end
|
||||
return "guild"
|
||||
end
|
||||
|
||||
local function GetRealmBankKey()
|
||||
return format("%s.%s", THIS_ACCOUNT, GetRealmName())
|
||||
end
|
||||
|
||||
local function GetThisRealmBank()
|
||||
return addon.db.global.RealmBanks[GetRealmBankKey()]
|
||||
end
|
||||
|
||||
-- *** Scanning functions ***
|
||||
local function ScanContainer(bagID, containerType)
|
||||
local Container = ContainerTypes[containerType]
|
||||
@@ -275,6 +375,13 @@ local function ScanContainer(bagID, containerType)
|
||||
if not thisGuild then return end
|
||||
|
||||
bag = thisGuild.Tabs[bagID] -- bag is actually the current tab
|
||||
elseif containerType == PERSONALBANK then
|
||||
-- per-character storage, keyed by a tab-specific prefix so it never
|
||||
-- collides with the normal bag/bank containers
|
||||
bag = addon.ThisCharacter.Containers[PERSONALBANK_PREFIX .. bagID]
|
||||
elseif containerType == REALMBANK then
|
||||
local realmBank = GetThisRealmBank()
|
||||
bag = realmBank.Tabs[bagID] -- bag is the current tab in the realm-keyed table
|
||||
else
|
||||
bag = addon.ThisCharacter.Containers["Bag" .. bagID]
|
||||
wipe(bag.cooldowns) -- does not exist for a guild bank
|
||||
@@ -316,8 +423,14 @@ local function ScanContainer(bagID, containerType)
|
||||
end
|
||||
end
|
||||
|
||||
if containerType == REALMBANK then
|
||||
GetThisRealmBank().lastUpdate = time()
|
||||
else
|
||||
-- personal bank, bags, bank and guild bank all stamp the character;
|
||||
-- this is what gates DataStore's "no value" guard for char-based getters
|
||||
addon.ThisCharacter.lastUpdate = time()
|
||||
end
|
||||
end
|
||||
|
||||
local function ScanBagSlotsInfo()
|
||||
local char = addon.ThisCharacter
|
||||
@@ -463,25 +576,76 @@ local function OnBankFrameOpened()
|
||||
addon:RegisterEvent("PLAYERBANKSLOTS_CHANGED", OnPlayerBankSlotsChanged)
|
||||
end
|
||||
|
||||
-- Records the name/icon of a personal-bank tab. Reuses the per-character
|
||||
-- container created by ScanContainer (PERSONALBANK_PREFIX .. tabID).
|
||||
local function ScanPersonalBankInfo(tabID)
|
||||
local bag = addon.ThisCharacter.Containers[PERSONALBANK_PREFIX .. tabID]
|
||||
bag.name, bag.icon = GetGuildBankTabInfo(tabID)
|
||||
end
|
||||
|
||||
local function ScanRealmBankInfo(tabID)
|
||||
local t = GetThisRealmBank().Tabs[tabID]
|
||||
t.name, t.icon = GetGuildBankTabInfo(tabID)
|
||||
end
|
||||
|
||||
local function OnGuildBankFrameClosed()
|
||||
addon:UnregisterEvent("GUILDBANKFRAME_CLOSED")
|
||||
addon:UnregisterEvent("GUILDBANKBAGSLOTS_CHANGED")
|
||||
|
||||
-- only broadcast guild bank timestamps for the actual guild bank
|
||||
if addon.coaBankType == "guild" then
|
||||
local guildName = GetGuildInfo("player")
|
||||
if guildName then
|
||||
GuildBroadcast(MSG_SEND_BANK_TIMESTAMPS, GetBankTimestamps(guildName))
|
||||
end
|
||||
end
|
||||
|
||||
addon.coaBankType = nil
|
||||
addon.coaBankAvailableTabs = nil
|
||||
end
|
||||
|
||||
local function OnGuildBankBagSlotsChanged()
|
||||
ScanContainer(GetCurrentGuildBankTab(), GUILDBANK)
|
||||
local currentTab = GetCurrentGuildBankTab()
|
||||
|
||||
if addon.coaBankType == "personal" then
|
||||
ScanContainer(currentTab, PERSONALBANK)
|
||||
ScanPersonalBankInfo(currentTab)
|
||||
elseif addon.coaBankType == "realm" then
|
||||
ScanContainer(currentTab, REALMBANK)
|
||||
ScanRealmBankInfo(currentTab)
|
||||
else
|
||||
-- regular guild bank, unchanged behaviour
|
||||
ScanContainer(currentTab, GUILDBANK)
|
||||
ScanGuildBankInfo()
|
||||
end
|
||||
end
|
||||
|
||||
local function OnGuildBankFrameOpened()
|
||||
-- CoA reuses the guild bank UI for the personal & realm banks; detect which
|
||||
-- one this is BEFORE doing anything guild-specific. Harmless ("guild") when
|
||||
-- the CoA JSON APIs are absent.
|
||||
addon.coaBankType = GetCoABankType()
|
||||
|
||||
addon:RegisterEvent("GUILDBANKFRAME_CLOSED", OnGuildBankFrameClosed)
|
||||
addon:RegisterEvent("GUILDBANKBAGSLOTS_CHANGED", OnGuildBankBagSlotsChanged)
|
||||
|
||||
if addon.coaBankType == "personal" or addon.coaBankType == "realm" then
|
||||
-- Pre-query the other tabs so we snapshot the whole bank without the
|
||||
-- player having to click each tab. Each QueryGuildBankTab triggers a
|
||||
-- GUILDBANKBAGSLOTS_CHANGED for that tab, handled above.
|
||||
if QueryGuildBankTab then
|
||||
local currentTab = GetCurrentGuildBankTab and GetCurrentGuildBankTab() or 0
|
||||
for tabID = 1, MAX_BANK_TABS do
|
||||
local avail = GetGuildBankTabInfo(tabID)
|
||||
if type(avail) == "string" and tabID ~= currentTab then
|
||||
QueryGuildBankTab(tabID)
|
||||
end
|
||||
end
|
||||
end
|
||||
return
|
||||
end
|
||||
|
||||
-- regular guild bank
|
||||
local thisGuild = GetThisGuild()
|
||||
if thisGuild then
|
||||
thisGuild.money = GetGuildBankMoney()
|
||||
@@ -514,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
|
||||
@@ -550,6 +717,7 @@ end
|
||||
local function _GetContainerItemCount(character, searchedID)
|
||||
local bagCount = 0
|
||||
local bankCount = 0
|
||||
local personalBankCount = 0
|
||||
local id
|
||||
|
||||
for containerName, container in pairs(character.Containers) do
|
||||
@@ -563,6 +731,8 @@ local function _GetContainerItemCount(character, searchedID)
|
||||
bankCount = bankCount + itemCount
|
||||
elseif (containerName == "Bag-2") then
|
||||
bagCount = bagCount + itemCount
|
||||
elseif string.sub(containerName, 1, #PERSONALBANK_PREFIX) == PERSONALBANK_PREFIX then
|
||||
personalBankCount = personalBankCount + itemCount -- CoA personal bank tab
|
||||
else
|
||||
local bagNum = tonumber(string.sub(containerName, 4))
|
||||
if (bagNum >= 0) and (bagNum <= 4) then
|
||||
@@ -575,7 +745,79 @@ local function _GetContainerItemCount(character, searchedID)
|
||||
end
|
||||
end
|
||||
|
||||
return bagCount, bankCount
|
||||
-- 3rd return value (personal bank) is additive and backward-compatible:
|
||||
-- existing callers that expect (bags, bank) just ignore it.
|
||||
return bagCount, bankCount, personalBankCount
|
||||
end
|
||||
|
||||
-- *** CoA personal bank (per-character) ***
|
||||
local function _GetPersonalBankItemCount(character, searchedID)
|
||||
local count = 0
|
||||
for containerName, container in pairs(character.Containers) do
|
||||
if string.sub(containerName, 1, #PERSONALBANK_PREFIX) == PERSONALBANK_PREFIX then
|
||||
for slotID = 1, container.size do
|
||||
if container.ids[slotID] == searchedID then
|
||||
count = count + (container.counts[slotID] or 1)
|
||||
end
|
||||
end
|
||||
end
|
||||
end
|
||||
return count
|
||||
end
|
||||
|
||||
local function _GetPersonalBankTabCount(character)
|
||||
-- number of personal bank tabs that have been scanned (have a size)
|
||||
local n = 0
|
||||
for tabID = 1, MAX_BANK_TABS do
|
||||
local container = character.Containers[PERSONALBANK_PREFIX .. tabID]
|
||||
if container and (container.size or 0) > 0 then
|
||||
n = n + 1
|
||||
end
|
||||
end
|
||||
return n
|
||||
end
|
||||
|
||||
-- *** CoA realm bank (per-realm, NOT char-based) ***
|
||||
-- These take a realm key string ("Account.Realm") directly and read the global
|
||||
-- RealmBanks table, so they bypass DataStore's char/guild "no value" wrapper.
|
||||
local function _GetRealmBankKey(realm, account)
|
||||
realm = realm or GetRealmName()
|
||||
account = account or THIS_ACCOUNT
|
||||
return format("%s.%s", account, realm)
|
||||
end
|
||||
|
||||
local function _GetRealmBank(realm, account)
|
||||
return addon.db.global.RealmBanks[_GetRealmBankKey(realm, account)]
|
||||
end
|
||||
|
||||
local function _GetRealmBankItemCount(realm, account, searchedID)
|
||||
local realmBank = _GetRealmBank(realm, account)
|
||||
if not realmBank then return 0 end
|
||||
|
||||
local count = 0
|
||||
for _, tab in pairs(realmBank.Tabs) do
|
||||
for slotID, id in pairs(tab.ids) do
|
||||
if id == searchedID then
|
||||
count = count + (tab.counts[slotID] or 1)
|
||||
end
|
||||
end
|
||||
end
|
||||
return count
|
||||
end
|
||||
|
||||
local function _GetRealmBankTab(realm, account, tabID)
|
||||
local realmBank = _GetRealmBank(realm, account)
|
||||
return realmBank and realmBank.Tabs[tabID]
|
||||
end
|
||||
|
||||
local function _GetRealmBankTabName(realm, account, tabID)
|
||||
local tab = _GetRealmBankTab(realm, account, tabID)
|
||||
return tab and tab.name
|
||||
end
|
||||
|
||||
local function _GetRealmBankLastUpdate(realm, account)
|
||||
local realmBank = _GetRealmBank(realm, account)
|
||||
return realmBank and realmBank.lastUpdate
|
||||
end
|
||||
|
||||
local function _GetNumBagSlots(character)
|
||||
@@ -629,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)
|
||||
@@ -721,6 +963,14 @@ local PublicMethods = {
|
||||
RejectBankTabRequest = _RejectBankTabRequest,
|
||||
SendBankTabToGuildMember = _SendBankTabToGuildMember,
|
||||
GetGuildBankTabSuppliers = _GetGuildBankTabSuppliers,
|
||||
-- CoA personal bank (per-character)
|
||||
GetPersonalBankItemCount = _GetPersonalBankItemCount,
|
||||
GetPersonalBankTabCount = _GetPersonalBankTabCount,
|
||||
-- CoA realm bank (per-realm; takes realm/account, not a character/guild key)
|
||||
GetRealmBankItemCount = _GetRealmBankItemCount,
|
||||
GetRealmBankTab = _GetRealmBankTab,
|
||||
GetRealmBankTabName = _GetRealmBankTabName,
|
||||
GetRealmBankLastUpdate = _GetRealmBankLastUpdate,
|
||||
}
|
||||
|
||||
-- *** Guild Comm ***
|
||||
@@ -809,6 +1059,10 @@ function addon:OnInitialize()
|
||||
DataStore:SetCharacterBasedMethod("GetNumFreeBagSlots")
|
||||
DataStore:SetCharacterBasedMethod("GetNumBankSlots")
|
||||
DataStore:SetCharacterBasedMethod("GetNumFreeBankSlots")
|
||||
DataStore:SetCharacterBasedMethod("GetPersonalBankItemCount")
|
||||
DataStore:SetCharacterBasedMethod("GetPersonalBankTabCount")
|
||||
-- Realm bank methods are intentionally NOT char/guild based: they take a
|
||||
-- realm/account string pair directly and read the realm-keyed global table.
|
||||
|
||||
DataStore:SetGuildBasedMethod("GetGuildBankItemCount")
|
||||
DataStore:SetGuildBasedMethod("GetGuildBankTab")
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
## Title: DataStore_Containers
|
||||
## Notes: Stores information about character bags, bank, and guild banks
|
||||
## Author: Thaoky (EU-Marécages de Zangar)
|
||||
## Version: 3.3.001
|
||||
## Version: 3.3.001-coa.9
|
||||
## Dependencies: DataStore
|
||||
## OptionalDeps: Ace3
|
||||
## SavedVariables: DataStore_ContainersDB
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -167,10 +167,13 @@ function ScanInventory()
|
||||
end
|
||||
|
||||
-- *** Event Handlers ***
|
||||
local hasScannedThisSession
|
||||
local function OnPlayerAlive()
|
||||
-- print("DataStore_Inventory.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 where gear
|
||||
-- is unchanged, so skip those. (The previous "only when ghost" gate also skipped login, so iLvl
|
||||
-- never populated and UNIT_INVENTORY_CHANGED was the only scan path - see commit fdcb25a.)
|
||||
if hasScannedThisSession then return end
|
||||
hasScannedThisSession = true
|
||||
ScanInventory()
|
||||
end
|
||||
|
||||
|
||||
@@ -3,7 +3,7 @@
|
||||
## Notes: Stores information about character inventory
|
||||
## Author: Thaoky (EU-Marécages de Zangar)
|
||||
## X-Edited-By: Exiles (Sub-Net)
|
||||
## Version: 3.3.002-coa.2
|
||||
## Version: 3.3.002-coa.5
|
||||
## Dependencies: DataStore
|
||||
## OptionalDeps: Ace3
|
||||
## SavedVariables: DataStore_InventoryDB
|
||||
|
||||
@@ -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,7 +275,9 @@ 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("%[(.+)%]")
|
||||
|
||||
@@ -17,7 +17,8 @@ local AddonDB_Defaults = {
|
||||
Characters = {
|
||||
['*'] = { -- ["Account.Realm.Name"]
|
||||
lastUpdate = nil,
|
||||
Factions = {},
|
||||
Factions = {}, -- [factionName] = "bottom|top|earned"
|
||||
Headers = {}, -- [factionName] = headerName (in-game category, ex: "Wrath of the Lich King"). Lets the UI group dynamically incl. CoA custom factions.
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -59,13 +60,19 @@ local function _GetRawReputationInfo(character, faction)
|
||||
end
|
||||
|
||||
local function _GetReputations(character)
|
||||
return character.Factions
|
||||
return character.Factions or {}
|
||||
end
|
||||
|
||||
local function _GetReputationHeaders(character)
|
||||
-- [factionName] = headerName (in-game category). May be empty for chars scanned before this field existed; UI must guard with "or {}".
|
||||
return character.Headers or {}
|
||||
end
|
||||
|
||||
local PublicMethods = {
|
||||
GetReputationInfo = _GetReputationInfo,
|
||||
GetRawReputationInfo = _GetRawReputationInfo,
|
||||
GetReputations = _GetReputations,
|
||||
GetReputationHeaders = _GetReputationHeaders,
|
||||
}
|
||||
|
||||
function addon:OnInitialize()
|
||||
@@ -75,6 +82,7 @@ function addon:OnInitialize()
|
||||
DataStore:SetCharacterBasedMethod("GetReputationInfo")
|
||||
DataStore:SetCharacterBasedMethod("GetRawReputationInfo")
|
||||
DataStore:SetCharacterBasedMethod("GetReputations")
|
||||
DataStore:SetCharacterBasedMethod("GetReputationHeaders")
|
||||
end
|
||||
|
||||
function addon:OnEnable()
|
||||
@@ -125,13 +133,24 @@ local function ScanReputations()
|
||||
SaveHeaders()
|
||||
|
||||
local factions = addon.ThisCharacter.Factions
|
||||
local headers = addon.ThisCharacter.Headers or {}
|
||||
addon.ThisCharacter.Headers = headers
|
||||
wipe(factions)
|
||||
wipe(headers)
|
||||
|
||||
local currentHeader = "" -- track the in-game category so the UI can group factions dynamically (incl. CoA custom factions)
|
||||
|
||||
for i = 1, GetNumFactions() do -- 2nd pass, data collection
|
||||
local name, _, _, bottom, top, earned, _, _, isHeader, _, hasRep = GetFactionInfo(i)
|
||||
if (not isHeader) or (isHeader and hasRep) then
|
||||
-- new in 3.0.2, headers may have rep, ex: alliance vanguard + horde expedition
|
||||
factions[name] = bottom .. "|" .. top .. "|" .. earned
|
||||
headers[name] = currentHeader
|
||||
end
|
||||
if isHeader then
|
||||
-- any header (pure category like "Classic"/"Wrath of the Lich King", or a rep-bearing
|
||||
-- header like "Alliance Vanguard") becomes the group for the factions listed beneath it
|
||||
currentHeader = name or ""
|
||||
end
|
||||
end
|
||||
|
||||
@@ -158,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
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
## Title: DataStore_Reputations
|
||||
## Notes: Stores information about character reputation levels
|
||||
## Author: Thaoky (EU-Marécages de Zangar)
|
||||
## Version: 3.3.001
|
||||
## Version: 3.3.001-coa.10
|
||||
## Dependencies: DataStore
|
||||
## OptionalDeps: Ace3
|
||||
## SavedVariables: DataStore_ReputationsDB
|
||||
|
||||
@@ -7,7 +7,7 @@ if not DataStore then return end
|
||||
|
||||
local addonName = "DataStore_Skills"
|
||||
|
||||
_G[addonName] = LibStub("AceAddon-3.0"):NewAddon(addonName, "AceConsole-3.0", "AceEvent-3.0")
|
||||
_G[addonName] = LibStub("AceAddon-3.0"):NewAddon(addonName, "AceConsole-3.0", "AceEvent-3.0", "AceTimer-3.0")
|
||||
|
||||
local addon = _G[addonName]
|
||||
|
||||
@@ -35,6 +35,44 @@ local function _GetPrimaryProfessions(character)
|
||||
return character.Skills[L["Professions"]]
|
||||
end
|
||||
|
||||
-- CoA: a character can know ALL professions at once (no retail 2-primary limit),
|
||||
-- and the two custom professions Woodcutting/Woodworking may sit under a different
|
||||
-- skill-window header. To render "all professions" reliably we don't trust the
|
||||
-- "Professions" category header alone: we collect every known crafting/gathering
|
||||
-- profession by name across all categories. English skill names are the keys; on
|
||||
-- non-English clients these names won't match and the list falls back to whatever
|
||||
-- sits under L["Professions"] via _GetPrimaryProfessions (caller handles that).
|
||||
local PRIMARY_PROFESSION_NAMES = {
|
||||
"Alchemy", "Blacksmithing", "Enchanting", "Engineering", "Inscription",
|
||||
"Jewelcrafting", "Leatherworking", "Tailoring", "Skinning", "Mining",
|
||||
"Herbalism", "Woodcutting", "Woodworking",
|
||||
}
|
||||
|
||||
-- Returns an ordered array of { name = <skillName>, rank = <n>, maxRank = <n> }
|
||||
-- for every primary profession the character actually knows. Never returns nil.
|
||||
local function _GetPrimaryProfessionList(character)
|
||||
local result = {}
|
||||
local skills = character.Skills
|
||||
if not skills then return result end
|
||||
|
||||
for _, profName in ipairs(PRIMARY_PROFESSION_NAMES) do
|
||||
for _, category in pairs(skills) do
|
||||
local skill = category[profName]
|
||||
if skill then
|
||||
local rank, maxRank = strsplit("|", skill)
|
||||
result[#result + 1] = {
|
||||
name = profName,
|
||||
rank = tonumber(rank) or 0,
|
||||
maxRank = tonumber(maxRank) or 0,
|
||||
}
|
||||
break -- found this profession, move to the next name
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
return result
|
||||
end
|
||||
|
||||
local function _GetSecondaryProfessions(character)
|
||||
return character.Skills[L["Secondary Skills"]]
|
||||
end
|
||||
@@ -77,8 +115,25 @@ local function _GetRidingRank(character)
|
||||
return _GetSkillInfoByCategory(character, L["Secondary Skills"], L["Riding"])
|
||||
end
|
||||
|
||||
-- CoA (Ascension Vol'jin) adds two custom professions on top of the vanilla 15:
|
||||
-- Woodcutting (gathering, base spell 13977860) and Woodworking (crafting,
|
||||
-- ranks 1005008-1005011). They register as normal skill lines in the in-game
|
||||
-- skill UI under their English names "Woodcutting" / "Woodworking" (confirmed
|
||||
-- against coa-professionmenu, which reads them via GetSkillLineInfo by name).
|
||||
-- ScanSkills() already buckets them by whatever category header they sit under,
|
||||
-- so a name-based lookup across all categories retrieves them regardless of the
|
||||
-- header. On non-CoA realms the skill simply doesn't exist and these return 0, 0.
|
||||
local function _GetWoodcuttingRank(character)
|
||||
return _GetSkillInfo(character, "Woodcutting")
|
||||
end
|
||||
|
||||
local function _GetWoodworkingRank(character)
|
||||
return _GetSkillInfo(character, "Woodworking")
|
||||
end
|
||||
|
||||
local PublicMethods = {
|
||||
GetPrimaryProfessions = _GetPrimaryProfessions,
|
||||
GetPrimaryProfessionList = _GetPrimaryProfessionList,
|
||||
GetSecondaryProfessions = _GetSecondaryProfessions,
|
||||
GetSkillInfo = _GetSkillInfo,
|
||||
GetSkillInfoByCategory = _GetSkillInfoByCategory,
|
||||
@@ -86,6 +141,8 @@ local PublicMethods = {
|
||||
GetCookingRank = _GetCookingRank,
|
||||
GetFishingRank = _GetFishingRank,
|
||||
GetRidingRank = _GetRidingRank,
|
||||
GetWoodcuttingRank = _GetWoodcuttingRank,
|
||||
GetWoodworkingRank = _GetWoodworkingRank,
|
||||
}
|
||||
|
||||
function addon:OnInitialize()
|
||||
@@ -93,6 +150,7 @@ function addon:OnInitialize()
|
||||
|
||||
DataStore:RegisterModule(addonName, addon, PublicMethods)
|
||||
DataStore:SetCharacterBasedMethod("GetPrimaryProfessions")
|
||||
DataStore:SetCharacterBasedMethod("GetPrimaryProfessionList")
|
||||
DataStore:SetCharacterBasedMethod("GetSecondaryProfessions")
|
||||
DataStore:SetCharacterBasedMethod("GetSkillInfo")
|
||||
DataStore:SetCharacterBasedMethod("GetSkillInfoByCategory")
|
||||
@@ -100,15 +158,25 @@ function addon:OnInitialize()
|
||||
DataStore:SetCharacterBasedMethod("GetCookingRank")
|
||||
DataStore:SetCharacterBasedMethod("GetFishingRank")
|
||||
DataStore:SetCharacterBasedMethod("GetRidingRank")
|
||||
DataStore:SetCharacterBasedMethod("GetWoodcuttingRank")
|
||||
DataStore:SetCharacterBasedMethod("GetWoodworkingRank")
|
||||
end
|
||||
|
||||
function addon:OnEnable()
|
||||
-- CoA fix: the old build only scanned in PLAYER_ALIVE while the player was a
|
||||
-- ghost (see below), so a living character that never died was never scanned
|
||||
-- and every profession rank rendered as 0 ("Skills shows no data"). We now scan
|
||||
-- on login and whenever the skill window changes so every character populates.
|
||||
addon:RegisterEvent("PLAYER_ALIVE")
|
||||
addon:RegisterEvent("PLAYER_ENTERING_WORLD", "ScanOnLogin")
|
||||
addon:RegisterEvent("SKILL_LINES_CHANGED", "ScanOnLogin")
|
||||
addon:RegisterEvent("CHAT_MSG_SKILL")
|
||||
end
|
||||
|
||||
function addon:OnDisable()
|
||||
addon:UnregisterEvent("PLAYER_ALIVE")
|
||||
addon:UnregisterEvent("PLAYER_ENTERING_WORLD")
|
||||
addon:UnregisterEvent("SKILL_LINES_CHANGED")
|
||||
addon:UnregisterEvent("CHAT_MSG_SKILL")
|
||||
end
|
||||
|
||||
@@ -171,11 +239,26 @@ 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
|
||||
|
||||
-- CoA fix: scan once shortly after login / when skills change. SKILL_LINES_CHANGED
|
||||
-- can fire many times in a burst (once per skill line during login), so throttle to
|
||||
-- a single deferred scan instead of scanning on every event.
|
||||
local scanScheduled
|
||||
function addon:ScanOnLogin()
|
||||
if scanScheduled then return end
|
||||
scanScheduled = true
|
||||
-- defer so the skill UI / API is fully populated before we read GetNumSkillLines()
|
||||
addon:ScheduleTimer(function()
|
||||
scanScheduled = nil
|
||||
ScanSkills()
|
||||
end, 2)
|
||||
end
|
||||
|
||||
-- this turns
|
||||
-- "Your skill in %s has increased to %d."
|
||||
-- into
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
## Title: DataStore_Skills
|
||||
## Notes: Stores information about character skills
|
||||
## Author: Thaoky (EU-Marécages de Zangar)
|
||||
## Version: 3.3.002
|
||||
## Version: 3.3.002-coa.10
|
||||
## Dependencies: DataStore
|
||||
## OptionalDeps: Ace3
|
||||
## SavedVariables: DataStore_SkillsDB
|
||||
|
||||
@@ -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,21 @@ 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.
|
||||
- **Skills** tab shows ALL known professions (dynamic list, not 2 fixed slots) incl. Woodcutting/Woodworking, and fixes "no profession data" — `DataStore_Skills` now scans on login (`PLAYER_ENTERING_WORLD`/`SKILL_LINES_CHANGED`) instead of only on death/ghost-release.
|
||||
- **3.3.002b-coa.9** — Reverted the 1.4 default scale (it only zoomed, didn't show more content; scale stays user-opt-in at 1.0 default, applied on open). Hardened `Options:Get/Set` against a nil `options` table (`TabOptions.lua:442` crash). Guild Members: guard `Level_OnClick` against cleared/stale row IDs (clicking AiL crashed). **New:** Personal + Realm bank tracking ported from coa-bagnon (detects CoA `BANK_PERMISSIONS_PAYLOAD`, personal=per-char, realm=per-realm; surfaced in Search + BagUsage tooltip). **New:** Woodcutting + Woodworking columns on the Skills tab (CoA custom professions). NOTE: Skills "all professions" redesign, profession data population, character icons, and reputation factions are still in progress.
|
||||
- **3.3.002b-coa.8** — Title bar reads just `Altoholic <version>` (from the live `.toc`), dropping the "by Thaoky (Edited by Telkar-RG 1.04a)" string. Window now opens at the AtlasLoot-ish default scale (`UIScale` 1.4, ≈ 1105×640); scale is applied on every open (upstream only applied it after visiting Options), with a one-time bump for profiles still on the old 1.0 default.
|
||||
- **3.3.002b-coa.7** — Skills tab: `GetColor()` now nil-safe and the per-skill rank fields (`skillRank1/2`, `cooking`, `firstaid`, `fishing`, `riding`) default to `0` — they're nil for chars `DataStore_Characters` hasn't scanned, which crashed the Skills summary (`floor(rank/…)` arithmetic and the `>= 300` riding check).
|
||||
- **3.3.002b-coa.6** — Final straggler: guarded `AccountSharing.lua` realm/name line (name getter was the last `format` arg, so a no-value collapsed it to a format error). Concludes the frame sweep.
|
||||
- **3.3.002b-coa.5** — Refactor + completeness pass:
|
||||
- Extracted the duplicated character header/row blocks into `Altoholic:AddCharacterTooltipHeader()` and `Altoholic:SetCharacterRowNameLevel()` — the nil-guards now live in one place instead of being copy-pasted across frames.
|
||||
- Fixed crash sites the per-frame sweep had missed: `Skills.lua` (row + skill-rank tooltip), `Keys.lua` (×3 `format` with possibly-nil name), and the latent `ShowClassIcons` sort (`Altoholic.lua` — getters bypass their own `or 0` via the DataStore wrapper).
|
||||
- Restored login scanning: `OnPlayerAlive` in `Altoholic.lua` + `DataStore_Inventory` was gated to ghost-only (commit fdcb25a), so inventory/iLvl never populated on login. Now scans once per session (still skips resurrect/Feign-Death rescans). Removed dated DEBUG leftovers.
|
||||
- **3.3.002b-coa.4** — Rebranded to the Exiles fork (title `Altoholic (Exiles)`; Thaoky/Telkar-RG still credited as Author). Hardened **all** Altoholic frames against partial alt records: DataStore char-based getters return *no value* for any module that hasn't scanned a char, and the frames assumed full data everywhere. Guarded every `format`/concat/arithmetic/`pairs` site across AccountSummary, Activity, BagUsage, Quests, Reputations, TabCharacters, `DrawCharacterTooltip`, and the recipe tooltip. No DataStore contract change.
|
||||
- **3.3.002b-coa.3** — More partial-record guards in `DataStore_Characters` (own alts seen via guild comm but never fully scanned):
|
||||
- `GetXPRate` — guard nil/zero `XPMax` (crashed AccountSummary; also fixes div-by-zero at max level).
|
||||
- `GetRestXPRate` — guard nil/zero `XPMax` and nil `lastLogoutTimestamp` (`nil ~= 0` was true and crashed).
|
||||
|
||||
Reference in New Issue
Block a user