diff --git a/Altoholic/Altoholic.lua b/Altoholic/Altoholic.lua index 5f6a3ff..c497779 100644 --- a/Altoholic/Altoholic.lua +++ b/Altoholic/Altoholic.lua @@ -338,7 +338,7 @@ function addon:OnEnable() -- 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") + AltoholicFrameName:SetText("Altoholic |cFFFFFFFF3.3.002b-coa.23|r") local realm = GetRealmName() local player = UnitName("player") diff --git a/Altoholic/Altoholic.toc b/Altoholic/Altoholic.toc index 7e30c77..5a1a2d4 100644 --- a/Altoholic/Altoholic.toc +++ b/Altoholic/Altoholic.toc @@ -13,7 +13,7 @@ ## Author: Thaoky, Telkar-RG ## X-Edited-By: Exiles (Sub-Net) — florian.berthold@sub-net.at -## Version: 3.3.002b-coa.30 +## Version: 3.3.002b-coa.23 ## 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 diff --git a/Altoholic/Frames/AccountSummary.lua b/Altoholic/Frames/AccountSummary.lua index 2a90d21..98a04a1 100644 --- a/Altoholic/Frames/AccountSummary.lua +++ b/Altoholic/Frames/AccountSummary.lua @@ -168,7 +168,7 @@ end function ns:Update() - local VisibleLines = 18 + local VisibleLines = 20 local frame = "AltoholicFrameSummary" local entry = frame.."Entry" diff --git a/Altoholic/Frames/Activity.lua b/Altoholic/Frames/Activity.lua index 6525114..2324d52 100644 --- a/Altoholic/Frames/Activity.lua +++ b/Altoholic/Frames/Activity.lua @@ -23,7 +23,7 @@ local ns = addon.Activity -- ns = namespace local Characters = addon.Characters function ns:Update() - local VisibleLines = 18 + local VisibleLines = 20 local frame = "AltoholicFrameActivity" local entry = frame.."Entry" diff --git a/Altoholic/Frames/BagUsage.lua b/Altoholic/Frames/BagUsage.lua index a478b50..8c29a9b 100644 --- a/Altoholic/Frames/BagUsage.lua +++ b/Altoholic/Frames/BagUsage.lua @@ -22,7 +22,7 @@ local ns = addon.BagUsage -- ns = namespace local Characters = addon.Characters function ns:Update() - local VisibleLines = 18 + local VisibleLines = 20 local frame = "AltoholicFrameBagUsage" local entry = frame.."Entry" diff --git a/Altoholic/Frames/GuildBankTabs.lua b/Altoholic/Frames/GuildBankTabs.lua index ea44eef..e7e60f6 100644 --- a/Altoholic/Frames/GuildBankTabs.lua +++ b/Altoholic/Frames/GuildBankTabs.lua @@ -72,7 +72,7 @@ function ns:Update() BuildView() end - local VisibleLines = 18 + local VisibleLines = 20 local frame = "AltoholicFrameGuildBankTabs" local entry = frame.."Entry" diff --git a/Altoholic/Frames/GuildMembers.lua b/Altoholic/Frames/GuildMembers.lua index d9d4dd7..5a49210 100644 --- a/Altoholic/Frames/GuildMembers.lua +++ b/Altoholic/Frames/GuildMembers.lua @@ -285,7 +285,7 @@ function ns:Update() BuildView() end - local VisibleLines = 17 + local VisibleLines = 20 local frame = "AltoholicFrameGuildMembers" local entry = frame.."Entry" diff --git a/Altoholic/Frames/GuildProfessions.lua b/Altoholic/Frames/GuildProfessions.lua index 963f70a..b98653f 100644 --- a/Altoholic/Frames/GuildProfessions.lua +++ b/Altoholic/Frames/GuildProfessions.lua @@ -221,7 +221,7 @@ function ns:Update() BuildView() end - local VisibleLines = 18 + local VisibleLines = 20 local frame = "AltoholicFrameGuildProfessions" local entry = frame.."Entry" diff --git a/Altoholic/Frames/Quests.lua b/Altoholic/Frames/Quests.lua index 77f24df..e6c8c26 100644 --- a/Altoholic/Frames/Quests.lua +++ b/Altoholic/Frames/Quests.lua @@ -34,7 +34,7 @@ function ns:Update() local character = addon.Tabs.Characters:GetCurrent() - local VisibleLines = 18 + local VisibleLines = 20 local frame = "AltoholicFrameQuests" local entry = frame.."Entry" diff --git a/Altoholic/Frames/Recipes.lua b/Altoholic/Frames/Recipes.lua index cb1cb49..37d27b5 100644 --- a/Altoholic/Frames/Recipes.lua +++ b/Altoholic/Frames/Recipes.lua @@ -218,7 +218,7 @@ end function ns:Update() local currentProfession = addon.TradeSkills.CurrentProfession - local VisibleLines = 18 + local VisibleLines = 20 local frame = "AltoholicFrameRecipes" local entry = frame.."Entry" diff --git a/Altoholic/Frames/Skills.lua b/Altoholic/Frames/Skills.lua index 164ede4..413a2d3 100644 --- a/Altoholic/Frames/Skills.lua +++ b/Altoholic/Frames/Skills.lua @@ -30,7 +30,7 @@ local inset = 2 function ns:Update() - local VisibleLines = 18 + local VisibleLines = 20 local frame = "AltoholicFrameSkills" local entry = frame.."Entry" local DS = DataStore @@ -66,7 +66,6 @@ function ns:Update() 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 @@ -77,44 +76,27 @@ function ns:Update() local item = items[i + offset] if item then _G[e.."Collapse"]:Hide() + _G[e.."Level"]:SetText("") _G[e.."Skill1NormalText"]:SetText("") _G[e.."CookingNormalText"]:SetText("") _G[e.."FirstAidNormalText"]:SetText("") _G[e.."FishingNormalText"]:SetText("") _G[e.."RidingNormalText"]:SetText("") + _G[e.."Name"]:SetWidth(680) + _G[e.."Name"]:SetPoint("TOPLEFT", 15, 0) + _G[e.."NameNormalText"]:SetWidth(680) - 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) + if item.kind == "header" then 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("") + _G[e.."NameNormalText"]:SetText( (DS:GetColoredCharacterName(item.character) or "?") .. " " .. WHITE .. "(" .. className .. ")" ) else - -- profession row: [icon] name in the Name cell (indented), rank/max in its own column local iconEsc = "" if item.spellID then iconEsc = addon:TextureToFontstring2(addon:GetSpellIcon(item.spellID), size, size, inset, inset, inset, inset) .. " " end - _G[e.."Name"]:SetPoint("TOPLEFT", 34, 0) - _G[e.."Name"]:SetWidth(170) - _G[e.."NameNormalText"]:SetWidth(170) - _G[e.."NameNormalText"]:SetText( iconEsc .. WHITE .. item.name ) - local cap = (item.maxRank > 0) and item.maxRank or 450 - _G[e.."Level"]:SetPoint("TOPLEFT", 195, 0) - _G[e.."Level"]:SetWidth(120) - _G[e.."Level"]:SetJustifyH("LEFT") - _G[e.."Level"]:SetText( ns:GetColor(item.rank, cap) .. item.rank .. " / " .. item.maxRank ) + _G[e.."NameNormalText"]:SetText( " " .. iconEsc .. WHITE .. item.name .. " " .. ns:GetColor(item.rank, cap) .. item.rank .. "/" .. item.maxRank .. "|r" ) end btn.coaItem = item btn:SetID(item.viewLine or 0) diff --git a/Altoholic/Frames/Skills.xml b/Altoholic/Frames/Skills.xml index d275ec0..c669b2b 100644 --- a/Altoholic/Frames/Skills.xml +++ b/Altoholic/Frames/Skills.xml @@ -34,7 +34,7 @@ - - - - - - - - - - -