Compare commits
4 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 97e38d5c3d | |||
| 3fde42454e | |||
| f19ff36733 | |||
| b332499098 |
+30
-18
@@ -249,10 +249,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
|
||||
|
||||
@@ -585,6 +587,22 @@ 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)
|
||||
AltoTooltip:AddDoubleLine(DS:GetColoredCharacterName(character) or "?", DS:GetColoredCharacterFaction(character) or "")
|
||||
AltoTooltip:AddLine(format("%s %s |r%s %s", L["Level"],
|
||||
GREEN..(DS:GetCharacterLevel(character) or 0), DS:GetCharacterRace(character) or "", DS:GetCharacterClass(character) or ""), 1, 1, 1)
|
||||
end
|
||||
|
||||
function Altoholic:SetCharacterRowNameLevel(entry, i, icon, character)
|
||||
_G[entry..i.."NameNormalText"]:SetText(icon .. format("%s (%s)", DS:GetColoredCharacterName(character) or "?", DS:GetCharacterClass(character) or ""))
|
||||
_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
|
||||
@@ -679,19 +697,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
|
||||
@@ -763,25 +778,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.2
|
||||
## Version: 3.3.002b-coa.5
|
||||
## 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
|
||||
|
||||
@@ -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();
|
||||
|
||||
@@ -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)
|
||||
|
||||
@@ -96,26 +96,25 @@ 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)",
|
||||
@@ -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
|
||||
|
||||
@@ -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)
|
||||
|
||||
|
||||
@@ -40,7 +40,7 @@ function ns:Update()
|
||||
|
||||
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
|
||||
|
||||
@@ -310,7 +310,7 @@ function ns:OnEnter(frame)
|
||||
|
||||
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 )
|
||||
|
||||
@@ -109,8 +109,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)
|
||||
|
||||
-- profession 1
|
||||
local field = Characters:GetField(line, "spellID1")
|
||||
@@ -251,6 +250,7 @@ function ns:OnEnter(frame)
|
||||
local DS = DataStore
|
||||
local character = DS:GetCharacter(Characters:GetInfo(line))
|
||||
local curRank, maxRank = DS:GetSkillInfo(character, skillName)
|
||||
curRank, maxRank = curRank or 0, maxRank or 0 -- CoA: getter returns no value for skills DataStore_Skills hasn't scanned
|
||||
local profession = DS:GetProfession(character, skillName)
|
||||
|
||||
if (id >= 1) and (id <= 6) then
|
||||
@@ -268,6 +268,7 @@ function ns:OnEnter(frame)
|
||||
skillName = L["Rogue Proficiencies"]
|
||||
|
||||
local curLock, maxLock = DS:GetSkillInfo(character, L["Lockpicking"])
|
||||
curLock, maxLock = curLock or 0, maxLock or 0 -- CoA: guard unscanned lockpicking
|
||||
rank = TEAL .. L["Lockpicking"] .. " " .. curLock .. "/" .. maxLock
|
||||
suggestion = addon:GetSuggestion(L["Lockpicking"], curLock)
|
||||
end
|
||||
|
||||
@@ -228,7 +228,7 @@ function ns:UpdateViewIcons()
|
||||
AltoholicTabCharacters_FirstAid:Show()
|
||||
|
||||
local i = 1
|
||||
for skillName, skill in pairs(DS:GetPrimaryProfessions(character)) do
|
||||
for skillName, skill in pairs(DS:GetPrimaryProfessions(character) or {}) do -- CoA: getter returns no value for chars DataStore_Crafts hasn't scanned
|
||||
local itemName = "AltoholicTabCharacters_Prof" .. i
|
||||
local item = _G[itemName]
|
||||
local spellID = DataStore:GetProfessionSpellID(skillName)
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -206,7 +206,9 @@ local function _GetXP(character)
|
||||
end
|
||||
|
||||
local function _GetXPRate(character)
|
||||
return floor((character.XP / character.XPMax) * 100)
|
||||
local xpMax = character.XPMax or 0 -- CoA: comm-seeded / max-level / unscanned char has no XP data (also avoids /0)
|
||||
if xpMax == 0 then return 0 end
|
||||
return floor(((character.XP or 0) / xpMax) * 100)
|
||||
end
|
||||
|
||||
local function _GetXPMax(character)
|
||||
@@ -234,7 +236,7 @@ local function _GetRestXPRate(character)
|
||||
-- divide rest xp by this value 20400 / 204 = 100 ==> rest xp rate
|
||||
|
||||
local rate = 0
|
||||
if character.RestXP then
|
||||
if character.RestXP and character.XPMax and character.XPMax > 0 then -- CoA: guard nil/zero XPMax
|
||||
rate = (character.RestXP / ((character.XPMax / 100) * 1.5))
|
||||
end
|
||||
|
||||
@@ -242,7 +244,7 @@ local function _GetRestXPRate(character)
|
||||
-- (elapsed time / 3600) * 0.625 * (2/3) simplifies to elapsed time / 8640
|
||||
-- 0.625 comes from 8 hours rested = 5% of a level, *2/3 because 100% rested = 150% of xp (1.5 level)
|
||||
|
||||
if character.lastLogoutTimestamp ~= 0 then -- time since last logout, 0 for current char, <> for all others
|
||||
if character.lastLogoutTimestamp and character.lastLogoutTimestamp ~= 0 then -- time since last logout, 0 for current char, <> for all others (CoA: nil for comm-seeded chars => "nil ~= 0" is true and crashed)
|
||||
if character.isResting then
|
||||
rate = rate + ((time() - character.lastLogoutTimestamp) / 8640)
|
||||
else
|
||||
|
||||
@@ -3,7 +3,7 @@
|
||||
## Notes: Stores information about characters (race, level, etc..)
|
||||
## Author: Thaoky (EU-Marécages de Zangar)
|
||||
## X-Edited-By: Exiles (Sub-Net)
|
||||
## Version: 3.3.001-coa.2
|
||||
## Version: 3.3.001-coa.3
|
||||
## Dependencies: DataStore
|
||||
## OptionalDeps: Ace3
|
||||
## SavedVariables: DataStore_CharactersDB
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -5,6 +5,14 @@ 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.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).
|
||||
- **3.3.002b-coa.2** — Defensive guards for CoA data shapes (custom classes, records seeded from guild comm before a full scan, ungeared chars). Fixes login/UI crashes:
|
||||
- `DataStore_Inventory` — `GetAverageItemLevel` returns `0` instead of `nil` (crashed the Altoholic char sort and AccountSummary iLvl format); guarded the login AIL broadcast and the `0/0` average for ungeared chars.
|
||||
- `DataStore_Pets` — `GetNumPets` returns `0` for an unscanned companion table instead of `assert`-crashing TabCharacters.
|
||||
|
||||
Reference in New Issue
Block a user