diff --git a/CharBagSpaceTooltip.lua b/CharBagSpaceTooltip.lua
index 8924b4f..7cf999d 100644
--- a/CharBagSpaceTooltip.lua
+++ b/CharBagSpaceTooltip.lua
@@ -165,15 +165,18 @@ function CharBagFrame:Initialize(objectForAssets)
self.totSpaceMax = 0
for i=1, GetNumCharacters() do
- local charName, _, _, _, _, _, charId, _ = GetCharacterInfo(i)
+ local charName, _, _, _, _, alliance, charId, _ = GetCharacterInfo(i)
charName = charName:sub(1, charName:find("%^") - 1)
tControl = CreateControlFromVirtual("IIFA_GUI_Bag_Grid_Row_" .. i, self.frame, "IIFA_CharBagRow")
if i == 1 then
- tControl:SetAnchor(TOPLEFT, prevControl:GetNamedChild("_Title"), BOTTOMLEFT, 0, 26)
+ tControl:SetAnchor(TOPLEFT, prevControl:GetNamedChild("_Title"), BOTTOMLEFT, 0, 30)
+ prevControl:GetNamedChild("_Title"):SetText("Bag Space")
+ prevControl:GetNamedChild("_TitleCharName"):SetText(GetString(SI_GROUP_LIST_PANEL_NAME_HEADER))
else
tControl:SetAnchor(TOPLEFT, prevControl, BOTTOMLEFT, 0, 2)
end
- tControl:GetNamedChild("charName"):SetText(charName)
+ tControl:GetNamedChild("charName"):SetWrapMode(TEXT_WRAP_MODE_ELLIPSIS)
+ tControl:GetNamedChild("charName"):SetText(GetAllianceColor(alliance):Colorize(charName))
if charId == currId then
self.charControl = tControl
else
@@ -189,14 +192,27 @@ function CharBagFrame:Initialize(objectForAssets)
end
prevControl = tControl
end
+
+ tControl = CreateControlFromVirtual("IIFA_GUI_Bag_Row_Divider1", self.frame, "ZO_Options_Divider")
+ tControl:SetDimensions(288, 3)
+ tControl:SetAnchor(TOPLEFT, prevControl, BOTTOMLEFT, 0, 0)
+ tControl:SetAlpha(1)
+ self.divider1 = tControl
+
tControl = CreateControlFromVirtual("IIFA_GUI_Bag_Row_Bank", self.frame, "IIFA_CharBagRow")
- tControl:GetNamedChild("charName"):SetText("Bank")
- tControl:SetAnchor(TOPLEFT, prevControl, BOTTOMLEFT, 0, 0)
+ tControl:GetNamedChild("charName"):SetText(GetString(SI_CURRENCYLOCATION1))
+ tControl:SetAnchor(TOPLEFT, self.divider1, BOTTOMLEFT, 0, 0)
self.bankControl = tControl
+ tControl = CreateControlFromVirtual("IIFA_GUI_Bag_Row_Divider2", self.frame, "ZO_Options_Divider")
+ tControl:SetDimensions(288, 3)
+ tControl:SetAnchor(TOPLEFT, self.bankControl, BOTTOMLEFT, 0, 0)
+ tControl:SetAlpha(1)
+ self.divider2 = tControl
+
tControl = CreateControlFromVirtual("IIFA_GUI_Bag_Row_Tots", self.frame, "IIFA_CharBagRow")
tControl:GetNamedChild("charName"):SetText("Totals")
- tControl:SetAnchor(TOPLEFT, self.bankControl, BOTTOMLEFT, 0, 0)
+ tControl:SetAnchor(TOPLEFT, self.divider2, BOTTOMLEFT, 0, 0)
self.totControl = tControl
self.frame:SetHeight((GetNumCharacters() + 4) * 26) -- numchars + 4 represents # chars + bank + total + title and col titles
diff --git a/CharCurrencyTooltip.lua b/CharCurrencyTooltip.lua
index 57784d6..2d92da1 100644
--- a/CharCurrencyTooltip.lua
+++ b/CharCurrencyTooltip.lua
@@ -65,6 +65,16 @@ function CharCurrencyFrame:Initialize(objectForAssets)
local tControl
local prevControl = self.frame
local currId = GetCurrentCharacterId()
+
+ local iconSize = 18
+ prevControl:GetNamedChild("CURT_MONEY"):SetTexture(GetCurrencyKeyboardIcon(CURT_MONEY))
+ prevControl:GetNamedChild("CURT_MONEY"):SetDimensions(iconSize, iconSize)
+ prevControl:GetNamedChild("CURT_ALLIANCE_POINTS"):SetTexture(GetCurrencyKeyboardIcon(CURT_ALLIANCE_POINTS))
+ prevControl:GetNamedChild("CURT_ALLIANCE_POINTS"):SetDimensions(iconSize, iconSize)
+ prevControl:GetNamedChild("CURT_TELVAR_STONES"):SetTexture(GetCurrencyKeyboardIcon(CURT_TELVAR_STONES))
+ prevControl:GetNamedChild("CURT_TELVAR_STONES"):SetDimensions(iconSize, iconSize)
+ prevControl:GetNamedChild("CURT_WRIT_VOUCHERS"):SetTexture(GetCurrencyKeyboardIcon(CURT_WRIT_VOUCHERS))
+ prevControl:GetNamedChild("CURT_WRIT_VOUCHERS"):SetDimensions(iconSize, iconSize)
if objectForAssets.assets == nil then
objectForAssets.assets = {}
@@ -101,15 +111,18 @@ function CharCurrencyFrame:Initialize(objectForAssets)
self.totWV = 0
for i=1, GetNumCharacters() do
- local charName, _, _, _, _, _, charId, _ = GetCharacterInfo(i)
+ local charName, _, _, _, _, alliance, charId, _ = GetCharacterInfo(i)
charName = charName:sub(1, charName:find("%^") - 1)
tControl = CreateControlFromVirtual("IIFA_GUI_AssetsGrid_Row_" .. i, self.frame, "IIFA_CharCurrencyRow")
if i == 1 then
tControl:SetAnchor(TOPLEFT, prevControl:GetNamedChild("_Title"), BOTTOMLEFT, 0, 26)
+ prevControl:GetNamedChild("_Title"):SetText(GetString(SI_INVENTORY_MODE_CURRENCY))
+ prevControl:GetNamedChild("_TitleCharName"):SetText(GetString(SI_GROUP_LIST_PANEL_NAME_HEADER))
else
tControl:SetAnchor(TOPLEFT, prevControl, BOTTOMLEFT, 0, 2)
end
- tControl:GetNamedChild("charName"):SetText(charName)
+ tControl:GetNamedChild("charName"):SetWrapMode(TEXT_WRAP_MODE_ELLIPSIS)
+ tControl:GetNamedChild("charName"):SetText(GetAllianceColor(alliance):Colorize(charName))
if GetCurrentCharacterId() == charId then
self.charControl = tControl
else
@@ -142,15 +155,29 @@ function CharCurrencyFrame:Initialize(objectForAssets)
end
prevControl = tControl
end
+
+ tControl = CreateControlFromVirtual("IIFA_GUI_AssetsGrid_Row_Divider1", self.frame, "ZO_Options_Divider")
+ tControl:SetDimensions(490, 3)
+ tControl:SetAnchor(TOPLEFT, prevControl, BOTTOMLEFT, 0, 0)
+ tControl:SetAlpha(1)
+ self.divider1 = tControl
+
tControl = CreateControlFromVirtual("IIFA_GUI_AssetsGrid_Row_Bank", self.frame, "IIFA_CharCurrencyRow")
- tControl:GetNamedChild("charName"):SetText("Bank")
- tControl:SetAnchor(TOPLEFT, prevControl, BOTTOMLEFT, 0, 0)
+ tControl:GetNamedChild("charName"):SetText(GetString(SI_CURRENCYLOCATION1))
+ tControl:SetAnchor(TOPLEFT, self.divider1, BOTTOMLEFT, 0, 0)
self.bankControl = tControl
+
+ tControl = CreateControlFromVirtual("IIFA_GUI_AssetsGrid_Row_Divider2", self.frame, "ZO_Options_Divider")
+ tControl:SetDimensions(490, 3)
+ tControl:SetAnchor(TOPLEFT, self.bankControl, BOTTOMLEFT, 0, 0)
+ tControl:SetAlpha(1)
+ self.divider2 = tControl
tControl = CreateControlFromVirtual("IIFA_GUI_AssetsGrid_Row_Tots", self.frame, "IIFA_CharCurrencyRow")
tControl:GetNamedChild("charName"):SetText("Totals")
- tControl:SetAnchor(TOPLEFT, self.bankControl, BOTTOMLEFT, 0, 0)
+ tControl:SetAnchor(TOPLEFT, self.divider2, BOTTOMLEFT, 0, 0)
self.totControl = tControl
+
self.frame:SetHeight((GetNumCharacters() + 4) * 26) -- numchars + 4 represents # chars + bank + total + title and col titles
diff --git a/IIfA.lua b/IIfA.lua
index db08014..5870dab 100644
--- a/IIfA.lua
+++ b/IIfA.lua
@@ -20,7 +20,7 @@ if IIfA == nil then IIfA = {} end
--local IIfA = IIfA
IIfA.name = "Inventory Insight"
-IIfA.version = "2.16a"
+IIfA.version = "2.20"
IIfA.author = "AssemblerManiac & manavortex"
IIfA.defaultAlertType = UI_ALERT_CATEGORY_ALERT
IIfA.defaultAlertSound = nil
@@ -53,18 +53,18 @@ IIfA.trackedBags = {
[BAG_BANK] = true,
[BAG_GUILDBANK] = true,
}
-IIfA.dropdownBankNames = {
- "All",
+IIfA.dropdownBankNames = {
+ "All",
"All Banks",
- "All Guild Banks",
- "All Characters",
- "Bank and Characters",
- "Bank and Current Character",
- "Bank Only",
- "Craft Bag"
+ "All Guild Banks",
+ "All Characters",
+ "Bank and Characters",
+ "Bank and Current Character",
+ "Bank Only",
+ "Craft Bag"
}
-if GetAPIVersion() >= 100022 then
+if GetAPIVersion() >= 100022 then
IIfA.trackedBags[BAG_SUBSCRIBER_BANK] = true
IIfA.trackedBags[BAG_HOUSE_BANK_TWO] = true
IIfA.trackedBags[BAG_HOUSE_BANK_THREE] = true
@@ -231,8 +231,19 @@ function IIfA_onLoad(eventCode, addOnName)
IIfA.settings = ZO_SavedVars:NewCharacterIdSettings("IIfA_Settings", 1, nil, default)
IIfA.data = ZO_SavedVars:NewAccountWide("IIfA_Data", 1, "Data", defaultGlobal)
+-- IIfA.testdata = ZO_SavedVars:NewAccountWide("IIfA_TestData", 1, "Data", defaultGlobal, "ProfileHere", "NotAnAccountName")
-- top level, version, bottom level, array of default data)
--[[
+
+adding 2 more parms in newaccountwide call *shoud* allow using of global data spanning accounts
+- but no way to test, and not sure if it would zap data when toons go missing
+
+function ZO_SavedVars:NewAccountWide(savedVariableTable, version, namespace, defaults, profile, displayName)
+ displayName = displayName or GetDisplayName()
+ return GetNewSavedVars(savedVariableTable, version, namespace, defaults, profile, displayName)
+end
+local globalVars = ZO_SavedVars:NewAccountWide("yourSavedVar", 1, nil, defaults, nil, "$(global)")
+
IIfA_Data =
{
["Default"] =
@@ -243,6 +254,15 @@ IIfA_Data =
{
["Data"] =
{
+
+IIfA_TestData =
+{
+ ["ProfileHere"] =
+ {
+ ["NotAnAccountName"] =
+ {
+ ["$AccountWide"] =
+
--]]
local ObjSettings = IIfA:GetSettings()
diff --git a/IIfA.txt b/IIfA.txt
index 1bb1ed5..6a58431 100644
--- a/IIfA.txt
+++ b/IIfA.txt
@@ -1,7 +1,7 @@
-## Title: InventoryInsightFromAshes
+## Title: Inventory Insight
## Author: manavortex, AssemblerManiac
-## Version: 2.19
-## APIVersion: 100021
+## Version: 2.20
+## APIVersion: 100021 100022
## SavedVariables: IIfA_Settings IIfA_Data
## OptionalDependsOn: libFilters
diff --git a/IIfA.xml b/IIfA.xml
index 230fa01..a349e29 100644
--- a/IIfA.xml
+++ b/IIfA.xml
@@ -1018,33 +1018,33 @@
<TopLevelControl name="IIFA_CharCurrencyFrame" clampedToScreen="true" hidden="true">
- <Dimensions x="467" />
+ <Dimensions x="467" />
<Controls>
<Backdrop name="$(parent)_BG" inherits="ZO_DefaultBackdrop" ></Backdrop>
- <Label name="$(parent)_Title" font="ZoFontGameShadow" text="Gold / Telvar Stones / Alliance Points / Writ Vouchers Info" horizontalAlignment="CENTER">
+ <Label name="$(parent)_Title" font="ZoFontGameShadow" text="" horizontalAlignment="CENTER">
<Anchor point="TOPLEFT" relativeTo="$(parent)" relativePoint="TOPLEFT" offsetX="0" offsetY="0" />
<Dimensions x="467" y="26" />
</Label>
- <Label name="$(parent)_TitleCharName" font="ZoFontGameShadow" text="Char Name">
+ <Label name="$(parent)_TitleCharName" font="ZoFontGameShadow" text="">
<Anchor point="TOPLEFT" relativeTo="$(parent)_Title" relativePoint="BOTTOMLEFT" offsetX="0" offsetY="0" />
<Dimensions x="165" y="24" />
</Label>
- <Label name="$(parent)_TitleGold" font="ZoFontGameShadow" text="Gold" horizontalAlignment="RIGHT">
- <Anchor point="TOPLEFT" relativeTo="$(parent)_TitleCharName" relativePoint="TOPRIGHT" offsetX="0" offsetY="0" />
- <Dimensions x="72" y="24" />
- </Label>
- <Label name="$(parent)_TitleTV" font="ZoFontGameShadow" text="TV" horizontalAlignment="RIGHT">
- <Anchor point="TOPLEFT" relativeTo="$(parent)_TitleGold" relativePoint="TOPRIGHT" offsetX="5" offsetY="0" />
- <Dimensions x="72" y="24" />
- </Label>
- <Label name="$(parent)_TitleAP" font="ZoFontGameShadow" text="AP" horizontalAlignment="RIGHT" >
- <Anchor point="TOPLEFT" relativeTo="$(parent)_TitleTV" relativePoint="TOPRIGHT" offsetX="5" offsetY="0" />
- <Dimensions x="72" y="24" />
- </Label>
- <Label name="$(parent)_TitleWV" font="ZoFontGameShadow" text="WV" horizontalAlignment="RIGHT" >
- <Anchor point="TOPLEFT" relativeTo="$(parent)_TitleAP" relativePoint="TOPRIGHT" offsetX="5" offsetY="0" />
- <Dimensions x="68" y="24" />
- </Label>
+ <Texture name="$(parent)CURT_MONEY">
+ <Anchor point="TOPLEFT" relativeTo="$(parent)_TitleCharName" relativePoint="TOPRIGHT" offsetX="54" offsetY="4" />
+ </Texture>
+ <Texture name="$(parent)CURT_TELVAR_STONES">
+ <Anchor point="TOPLEFT" relativeTo="$(parent)CURT_MONEY" relativePoint="TOPRIGHT" offsetX="59" offsetY="0" />
+ </Texture>
+ <Texture name="$(parent)CURT_ALLIANCE_POINTS">
+ <Anchor point="TOPLEFT" relativeTo="$(parent)CURT_TELVAR_STONES" relativePoint="TOPRIGHT" offsetX="59" offsetY="0" />
+ </Texture>
+ <Texture name="$(parent)CURT_WRIT_VOUCHERS">
+ <Anchor point="TOPLEFT" relativeTo="$(parent)CURT_ALLIANCE_POINTS" relativePoint="TOPRIGHT" offsetX="59" offsetY="0" />
+ </Texture>
+ <Texture name="$(parent)_Divider" inherits="ZO_Options_Divider">
+ <Anchor point="TOPLEFT" relativeTo="$(parent)_TitleCharName" relativePoint="BOTTOMLEFT" offsetX="0" offsetY="0" />
+ <Dimensions x="490" y="3" />
+ </Texture>
</Controls>
</TopLevelControl>
@@ -1078,11 +1078,11 @@
<Dimensions x="274" />
<Controls>
<Backdrop name="$(parent)_BG" inherits="ZO_DefaultBackdrop" ></Backdrop>
- <Label name="$(parent)_Title" font="ZoFontGameShadow" text="BackPack Used/Tot Space" horizontalAlignment="CENTER">
+ <Label name="$(parent)_Title" font="ZoFontGameShadow" text="" horizontalAlignment="CENTER">
<Anchor point="TOPLEFT" relativeTo="$(parent)" relativePoint="TOPLEFT" offsetX="0" offsetY="0" />
<Dimensions x="274" y="26" />
</Label>
- <Label name="$(parent)_TitleCharName" font="ZoFontGameShadow" text="Char Name">
+ <Label name="$(parent)_TitleCharName" font="ZoFontGameShadow" text="">
<Anchor point="TOPLEFT" relativeTo="$(parent)_Title" relativePoint="BOTTOMLEFT" offsetX="0" offsetY="0" />
<Dimensions x="165" y="24" />
</Label>
@@ -1094,6 +1094,10 @@
<Anchor point="TOPLEFT" relativeTo="$(parent)_TitleUsed" relativePoint="TOPRIGHT" offsetX="5" offsetY="0" />
<Dimensions x="55" y="24" />
</Label>
+ <Texture name="$(parent)_Divider" inherits="ZO_Options_Divider">
+ <Anchor point="TOPLEFT" relativeTo="$(parent)_TitleCharName" relativePoint="BOTTOMLEFT" offsetX="0" offsetY="0" />
+ <Dimensions x="288" y="3" />
+ </Texture>
</Controls>
</TopLevelControl>
diff --git a/IIfABackpack.lua b/IIfABackpack.lua
index c0987de..6a41292 100644
--- a/IIfABackpack.lua
+++ b/IIfABackpack.lua
@@ -743,8 +743,8 @@ function IIfA:FMC(control, WhoSeesIt)
-- |H1:achievement:1318:16383:1431113493|h|h
local motifAchieves =
{
- [15] = 1144, -- dwemer
- [16] = 1319, -- glass
+ [15] = 1144, -- Dwemer
+ [16] = 1319, -- Glass
[17] = 1181, -- Xivkyn
[18] = 1318, -- Akaviri
[19] = 1348, -- Mercenary
@@ -768,7 +768,7 @@ function IIfA:FMC(control, WhoSeesIt)
[37] = 1798, -- Ebony
[38] = 1715, -- Draugr
[39] = 1662, -- Minotaur
- [40] = 1660, -- Order Hour/skinchanger
+ [40] = 1660, -- Order Hour
[41] = 1714, -- Celestial
[42] = 1545, -- Hollowjack
-- [43] = 0, -- Harlequin
@@ -778,9 +778,13 @@ function IIfA:FMC(control, WhoSeesIt)
[47] = 1934, -- Bouyant Armiger
[48] = 1932, -- Ashlander
[49] = 1935, -- Militant Ordinator
- [50] = 2022, -- Telvani
+ [50] = 2023, -- Telvani
[51] = 2021, -- Hlaalu
- [52] = 2023, -- Redoran
+ [52] = 2022, -- Redoran
+ [54] = 2098, -- Bloodforge
+ [55] = 2097, -- Dreadhorn
+ [56] = 2044, -- Apostle
+ [57] = 2045, -- Ebonshadow
}
-- local i, a
diff --git a/IIfATooltip.lua b/IIfATooltip.lua
index 0c980d4..6c73c09 100644
--- a/IIfATooltip.lua
+++ b/IIfATooltip.lua
@@ -101,10 +101,9 @@ IIfA.racialTextures = {
[61] = { styleName = zo_strformat("<<1>>", GetItemStyleName(61)), styleTexture = getTex("bloodforge")}, -- Bloodforge
[62] = { styleName = zo_strformat("<<1>>", GetItemStyleName(62)), styleTexture = getTex("dreadhorn")}, -- Dreadhorn / Falkreath
[63] = { styleName = zo_strformat("<<1>>", GetItemStyleName(63)), styleTexture = getTex("")}, -- Unused
-
- [64] = { styleName = zo_strformat("<<1>>", GetItemStyleName(64)), styleTexture = getTex("apostle")}, -- Apostle
- [65] = { styleName = zo_strformat("<<1>>", GetItemStyleName(65)), styleTexture = getTex("ebonshadow")}, -- Ebonshadow
- [66] = { styleName = zo_strformat("<<1>>", GetItemStyleName(66)), styleTexture = getTex("")}, -- Unused
+ [64] = { styleName = zo_strformat("<<1>>", GetItemStyleName(64)), styleTexture = getTex("")}, -- Unused
+ [65] = { styleName = zo_strformat("<<1>>", GetItemStyleName(65)), styleTexture = getTex("apostle")}, -- Apostle
+ [66] = { styleName = zo_strformat("<<1>>", GetItemStyleName(66)), styleTexture = getTex("ebonshadow")}, -- Ebonshadow
[67] = { styleName = zo_strformat("<<1>>", GetItemStyleName(67)), styleTexture = getTex("")}, -- Unused
[68] = { styleName = zo_strformat("<<1>>", GetItemStyleName(68)), styleTexture = getTex("")}, -- Unused
[69] = { styleName = zo_strformat("<<1>>", GetItemStyleName(69)), styleTexture = getTex("")}, -- Unused
@@ -256,7 +255,13 @@ local function getStyleIntel(itemLink)
itemIsBound,
itemChargeStatus = zo_strsplit(':', data)
- return IIfA.racialTextures[tonumber(itemStyle)]
+ itemStyle = tonumber(itemStyle)
+
+ if itemStyle == ITEMSTYLE_UNIVERSAL then
+ return nil
+ else
+ return IIfA.racialTextures[itemStyle]
+ end
end
function IIfA:AnchorFrame(frame, parentTooltip)
diff --git a/libs/LibAddonMenu-2.0/controls/separator.dds b/libs/LibAddonMenu-2.0/controls/separator.dds
new file mode 100644
index 0000000..02bb2ab
Binary files /dev/null and b/libs/LibAddonMenu-2.0/controls/separator.dds differ