Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 22 additions & 5 deletions AddonMenu.lua
Original file line number Diff line number Diff line change
@@ -1,7 +1,14 @@
local _
local LAM = LibStub:GetLibrary("LibAddonMenu-2.0")
local LMP = LibStub:GetLibrary("LibMediaProvider-1.0")

------------------
--LOAD LIBRARIES--
------------------

local LAM = LibAddonMenu2
local LMP = LibMediaProvider

----------------------
--INITIATE VARIABLES--
----------------------

local L = AutoCategory.localizefunc

local needReloadUI = false
Expand All @@ -15,18 +22,21 @@ cacheBags.showNames = { [AC_BAG_TYPE_BACKPACK] = L(SI_AC_BAGTYPE_SHOWNAME_BACKPA
[AC_BAG_TYPE_GUILDBANK] = L(SI_AC_BAGTYPE_SHOWNAME_GUILDBANK),
[AC_BAG_TYPE_CRAFTBAG] = L(SI_AC_BAGTYPE_SHOWNAME_CRAFTBAG),
[AC_BAG_TYPE_CRAFTSTATION] = L(SI_AC_BAGTYPE_SHOWNAME_CRAFTSTATION),
[AC_BAG_TYPE_HOUSEBANK] = L(SI_AC_BAGTYPE_SHOWNAME_HOUSEBANK),
}
cacheBags.values = { AC_BAG_TYPE_BACKPACK,
AC_BAG_TYPE_BANK,
AC_BAG_TYPE_GUILDBANK,
AC_BAG_TYPE_CRAFTBAG,
AC_BAG_TYPE_CRAFTSTATION,
AC_BAG_TYPE_HOUSEBANK,
}
cacheBags.tooltips = { L(SI_AC_BAGTYPE_TOOLTIP_BACKPACK),
L(SI_AC_BAGTYPE_TOOLTIP_BANK),
L(SI_AC_BAGTYPE_TOOLTIP_GUILDBANK),
L(SI_AC_BAGTYPE_TOOLTIP_CRAFTBAG),
L(SI_AC_BAGTYPE_TOOLTIP_CRAFTSTATION),
L(SI_AC_BAGTYPE_TOOLTIP_HOUSEBANK),
}

local cacheRulesByTag = {}
Expand Down Expand Up @@ -912,6 +922,7 @@ function AutoCategory.AddonMenuInit()
UpdateDropDownMenu("AC_DROPDOWN_EDITRULE_RULE")
UpdateDropDownMenu("AC_DROPDOWN_EDITBAG_RULE")
UpdateDropDownMenu("AC_DROPDOWN_ADDCATEGORY_RULE")
AutoCategory.RecompileRules(AutoCategory.curSavedVars.rules)
end,
isMultiline = false,
disabled = function() return #dropdownData["AC_DROPDOWN_EDITRULE_TAG"].choicesValues == 0 end,
Expand Down Expand Up @@ -1004,7 +1015,10 @@ function AutoCategory.AddonMenuInit()
end
return ""
end,
setFunc = function(value) cacheRulesByName[GetDropDownSelection("AC_DROPDOWN_EDITRULE_RULE")].rule = value end,
setFunc = function(value)
cacheRulesByName[GetDropDownSelection("AC_DROPDOWN_EDITRULE_RULE")].rule = value
AutoCategory.RecompileRules(AutoCategory.curSavedVars.rules)
end,
isMultiline = true,
isExtraWide = true,
disabled = function() return #dropdownData["AC_DROPDOWN_EDITRULE_TAG"].choicesValues == 0 end,
Expand Down Expand Up @@ -1041,6 +1055,7 @@ function AutoCategory.AddonMenuInit()
UpdateDropDownMenu("AC_DROPDOWN_EDITRULE_RULE")
UpdateDropDownMenu("AC_DROPDOWN_ADDCATEGORY_RULE")
UpdateDropDownMenu("AC_DROPDOWN_ADDCATEGORY_TAG")
AutoCategory.RecompileRules(AutoCategory.curSavedVars.rules)
end,
width = "full",
},
Expand Down Expand Up @@ -1070,6 +1085,7 @@ function AutoCategory.AddonMenuInit()
UpdateDropDownMenu("AC_DROPDOWN_EDITRULE_RULE")
UpdateDropDownMenu("AC_DROPDOWN_ADDCATEGORY_RULE")
UpdateDropDownMenu("AC_DROPDOWN_ADDCATEGORY_TAG")
AutoCategory.RecompileRules(AutoCategory.curSavedVars.rules)
end,
width = "full",
},
Expand Down Expand Up @@ -1110,6 +1126,7 @@ function AutoCategory.AddonMenuInit()
UpdateDropDownMenu("AC_DROPDOWN_ADDCATEGORY_RULE")
--rule is missing
UpdateDropDownMenu("AC_DROPDOWN_EDITBAG_RULE")
AutoCategory.RecompileRules(AutoCategory.curSavedVars.rules)
end,
width = "full",
disabled = function() return #dropdownData["AC_DROPDOWN_EDITRULE_RULE"].choicesValues == 0 end,
Expand Down
56 changes: 50 additions & 6 deletions AutoCategory.lua
Original file line number Diff line number Diff line change
Expand Up @@ -3,24 +3,41 @@
------------------

--load LibAddonsMenu-2.0
local LAM2 = LibStub:GetLibrary("LibAddonMenu-2.0");
local LAM = LibAddonMenu2

----------------------
--INITIATE VARIABLES--
----------------------

local L = AutoCategory.localizefunc

AutoCategory.compiledRules = {}

AC_EMPTY_TAG_NAME = L(SI_AC_DEFAULT_NAME_EMPTY_TAG)

function AutoCategory.RecompileRules(ruleset)
local compiled = {}
for j = 1, #ruleset do
local n = ruleset[j].name
compiled[n],err = zo_loadstring("return("..ruleset[j].rule..")")
if not compiled[n] then
d("Error1: " .. res)
ruleset[j].damaged = true
end
end
AutoCategory.compiledRules = compiled
end

function AutoCategory.UpdateCurrentSavedVars()
AutoCategory.curSavedVars= {}
if not AutoCategory.charSavedVariables.accountWideSetting then
AutoCategory.curSavedVars.rules = AutoCategory.acctSavedVariables.rules
AutoCategory.RecompileRules(AutoCategory.curSavedVars.rules)
AutoCategory.curSavedVars.bags = AutoCategory.charSavedVariables.bags
AutoCategory.curSavedVars.collapses = AutoCategory.charSavedVariables.collapses
else
AutoCategory.curSavedVars.rules = AutoCategory.acctSavedVariables.rules
AutoCategory.RecompileRules(AutoCategory.curSavedVars.rules)
AutoCategory.curSavedVars.bags = AutoCategory.acctSavedVariables.bags
AutoCategory.curSavedVars.collapses = AutoCategory.acctSavedVariables.collapses
end
Expand All @@ -42,6 +59,7 @@ function AutoCategory.ResetCollapse()
[AC_BAG_TYPE_GUILDBANK] = {},
[AC_BAG_TYPE_CRAFTBAG] = {},
[AC_BAG_TYPE_CRAFTSTATION] = {},
[AC_BAG_TYPE_HOUSEBANK] = {},
}
end

Expand All @@ -68,15 +86,16 @@ local function CheckVersionCompatible()
setting.bags[bagId] = defaultSetting.bags[bagId]
end
end
RebuildBagSettingIfNeeded(AutoCategory.charSavedVariables, AutoCategory.defaultSetting, AC_BAG_TYPE_GUILDBANK)
RebuildBagSettingIfNeeded(AutoCategory.charSavedVariables, AutoCategory.defaultSetting, AC_BAG_TYPE_CRAFTBAG)
RebuildBagSettingIfNeeded(AutoCategory.charSavedVariables, AutoCategory.defaultSetting, AC_BAG_TYPE_CRAFTSTATION)
RebuildBagSettingIfNeeded(AutoCategory.charSavedVariables, AutoCategory.defaultSettings, AC_BAG_TYPE_GUILDBANK)
RebuildBagSettingIfNeeded(AutoCategory.charSavedVariables, AutoCategory.defaultSettings, AC_BAG_TYPE_CRAFTBAG)
RebuildBagSettingIfNeeded(AutoCategory.charSavedVariables, AutoCategory.defaultSettings, AC_BAG_TYPE_CRAFTSTATION)

RebuildBagSettingIfNeeded(AutoCategory.acctSavedVariables, AutoCategory.defaultAcctSettings, AC_BAG_TYPE_GUILDBANK)
RebuildBagSettingIfNeeded(AutoCategory.acctSavedVariables, AutoCategory.defaultAcctSettings, AC_BAG_TYPE_CRAFTBAG)
RebuildBagSettingIfNeeded(AutoCategory.acctSavedVariables, AutoCategory.defaultAcctSettings, AC_BAG_TYPE_CRAFTSTATION)
--v1.12


--v1.15, added some options to modify headers appearance, and general settings
if not AutoCategory.acctSavedVariables.appearance["CATEGORY_OTHER_TEXT"] then
AutoCategory.acctSavedVariables.appearance["CATEGORY_OTHER_TEXT"] = L(SI_AC_DEFAULT_NAME_CATEGORY_OTHER)
Expand Down Expand Up @@ -154,12 +173,35 @@ local function CheckVersionCompatible()
[AC_BAG_TYPE_GUILDBANK] = {},
[AC_BAG_TYPE_CRAFTBAG] = {},
[AC_BAG_TYPE_CRAFTSTATION] = {},
[AC_BAG_TYPE_HOUSEBANK] = {},
}
end
end
addCollapseIfPossible(AutoCategory.charSavedVariables)
addCollapseIfPossible(AutoCategory.acctSavedVariables)
--v1.19

--v1.22
--add variables for home storage chests
if not AutoCategory.charSavedVariables.bags[AC_BAG_TYPE_HOUSEBANK] then
AutoCategory.charSavedVariables.bags[AC_BAG_TYPE_HOUSEBANK] = AutoCategory.charSavedVariables.bags[AC_BAG_TYPE_BANK]
end

if not AutoCategory.acctSavedVariables.bags[AC_BAG_TYPE_HOUSEBANK] then
AutoCategory.acctSavedVariables.bags[AC_BAG_TYPE_HOUSEBANK] = AutoCategory.acctSavedVariables.bags[AC_BAG_TYPE_BANK]
end

if AutoCategory.charSavedVariables.collapses[AC_BAG_TYPE_HOUSEBANK] == nil then
AutoCategory.charSavedVariables.collapses[AC_BAG_TYPE_HOUSEBANK] = {}
end

if AutoCategory.acctSavedVariables.collapses[AC_BAG_TYPE_HOUSEBANK] == nil then
AutoCategory.acctSavedVariables.collapses[AC_BAG_TYPE_HOUSEBANK] = {}
end
--v1.22



end

function AutoCategory.LazyInit()
Expand Down Expand Up @@ -222,8 +264,8 @@ end
--== Slash command ==--
function AutoCategory.cmd( text )
if text == nil then text = true end
LAM2:OpenToPanel(AC_CATEGORY_SETTINGS)
local addons = LAM2.addonList:GetChild(1)
LAM:OpenToPanel(AC_CATEGORY_SETTINGS)
local addons = LAM.addonList:GetChild(1)
if addons:GetNumChildren() ~= 0 then
for a=1,addons:GetNumChildren(),1 do
if addons:GetChild(a):GetText() == AutoCategory.settingName then
Expand Down Expand Up @@ -254,6 +296,8 @@ function AutoCategory.RefreshCurrentList()
RefreshList(INVENTORY_CRAFT_BAG)
elseif not ZO_GuildBank:IsHidden() then
RefreshList(INVENTORY_GUILD_BANK)
elseif not ZO_HouseBank:IsHidden() then
RefreshList(INVENTORY_HOUSE_BANK)
elseif not ZO_PlayerBank:IsHidden() then
RefreshList(INVENTORY_BANK)
elseif not SMITHING.deconstructionPanel.control:IsHidden() then
Expand Down
24 changes: 4 additions & 20 deletions AutoCategory.txt
Original file line number Diff line number Diff line change
@@ -1,27 +1,11 @@
## Title: AutoCategory
## APIVersion: 100021
## APIVersion: 100029 100030
## Author: RockingDice
## Description: Type "/ac"
## Version: 1.19
## Version: 1.35
## SavedVariables: AutoCategorySavedVars
## OptionalDependsOn: LibAddonMenu-2.0 InventoryGridView GearChangerByIakoni FCOItemSaver QuickMenu DoItAll

Libs/LibStub/LibStub.lua
Libs/LibMediaProvider-1.0/LibMediaProvider-1.0.lua
Libs/LibAddonMenu-2.0/LibAddonMenu-2.0.lua
Libs/LibAddonMenu-2.0/controls/panel.lua
Libs/LibAddonMenu-2.0/controls/submenu.lua
Libs/LibAddonMenu-2.0/controls/button.lua
Libs/LibAddonMenu-2.0/controls/checkbox.lua
Libs/LibAddonMenu-2.0/controls/colorpicker.lua
Libs/LibAddonMenu-2.0/controls/custom.lua
Libs/LibAddonMenu-2.0/controls/description.lua
Libs/LibAddonMenu-2.0/controls/dropdown.lua
Libs/LibAddonMenu-2.0/controls/editbox.lua
Libs/LibAddonMenu-2.0/controls/header.lua
Libs/LibAddonMenu-2.0/controls/slider.lua
Libs/LibAddonMenu-2.0/controls/texture.lua
Libs/LibAddonMenu-2.0/controls/iconpicker.lua
## DependsOn: LibAddonMenu-2.0 LibMediaProvider-1.0
## OptionalDependsOn: InventoryGridView GearChangerByIakoni FCOItemSaver QuickMenu ItemSaver

lang/all.lua
lang/$(language).lua
Expand Down
3 changes: 2 additions & 1 deletion AutoCategory_Global.lua
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ AC_BAG_TYPE_BANK = 2
AC_BAG_TYPE_GUILDBANK = 3
AC_BAG_TYPE_CRAFTBAG = 4
AC_BAG_TYPE_CRAFTSTATION = 5
AC_BAG_TYPE_HOUSEBANK = 6

AutoCategory = {}

Expand All @@ -11,7 +12,7 @@ AutoCategory.Inited = false
AutoCategory.Enabled = true

AutoCategory.name = "AutoCategory";
AutoCategory.version = "1.19";
AutoCategory.version = "1.35";
AutoCategory.settingName = "Auto Category"
AutoCategory.settingDisplayName = "RockingDice's AutoCategory"
AutoCategory.author = "RockingDice"
Expand Down
6 changes: 5 additions & 1 deletion AutoCategory_Hooks.lua
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
local LMP = LibStub:GetLibrary("LibMediaProvider-1.0")
local LMP = LibMediaProvider

local CUSTOM_GAMEPAD_ITEM_SORT =
{
Expand All @@ -22,6 +22,7 @@ local sortKeys =
age = { tiebreaker = "name", tieBreakerSortOrder = ZO_SORT_ORDER_UP, isNumeric = true},
statValue = { tiebreaker = "name", isNumeric = true, tieBreakerSortOrder = ZO_SORT_ORDER_UP },
traitInformationSortOrder = { tiebreaker = "name", isNumeric = true, tieBreakerSortOrder = ZO_SORT_ORDER_UP },
sellInformationSortOrder = { tiebreaker = "name", isNumeric = true, tieBreakerSortOrder = ZO_SORT_ORDER_UP },
}

local function AutoCategory_ItemSortComparator(left, right)
Expand Down Expand Up @@ -73,6 +74,7 @@ function AutoCategory.HookKeyboardMode()
ZO_ScrollList_AddDataType(ZO_CraftBagList, 998, "AC_InventoryItemRowHeader", rowHeight, AC_Setup_InventoryRowWithHeader, PLAYER_INVENTORY.inventories[INVENTORY_BACKPACK].listHiddenCallback, nil, ZO_InventorySlot_OnPoolReset)
ZO_ScrollList_AddDataType(ZO_PlayerBankBackpack, 998, "AC_InventoryItemRowHeader", rowHeight, AC_Setup_InventoryRowWithHeader, PLAYER_INVENTORY.inventories[INVENTORY_BACKPACK].listHiddenCallback, nil, ZO_InventorySlot_OnPoolReset)
ZO_ScrollList_AddDataType(ZO_GuildBankBackpack, 998, "AC_InventoryItemRowHeader", rowHeight, AC_Setup_InventoryRowWithHeader, PLAYER_INVENTORY.inventories[INVENTORY_BACKPACK].listHiddenCallback, nil, ZO_InventorySlot_OnPoolReset)
ZO_ScrollList_AddDataType(ZO_HouseBankBackpack, 998, "AC_InventoryItemRowHeader", rowHeight, AC_Setup_InventoryRowWithHeader, PLAYER_INVENTORY.inventories[INVENTORY_BACKPACK].listHiddenCallback, nil, ZO_InventorySlot_OnPoolReset)
ZO_ScrollList_AddDataType(ZO_PlayerInventoryQuest, 998, "AC_InventoryItemRowHeader", rowHeight, AC_Setup_InventoryRowWithHeader, PLAYER_INVENTORY.inventories[INVENTORY_QUEST_ITEM].listHiddenCallback, nil, ZO_InventorySlot_OnPoolReset)
ZO_ScrollList_AddDataType(SMITHING.deconstructionPanel.inventory.list, 998, "AC_InventoryItemRowHeader", rowHeight, AC_Setup_InventoryRowWithHeader, nil, nil, ZO_InventorySlot_OnPoolReset)
ZO_ScrollList_AddDataType(SMITHING.improvementPanel.inventory.list, 998, "AC_InventoryItemRowHeader", rowHeight, AC_Setup_InventoryRowWithHeader, nil, nil, ZO_InventorySlot_OnPoolReset)
Expand Down Expand Up @@ -108,6 +110,8 @@ function AutoCategory.HookKeyboardMode()
inventory = self.inventories[INVENTORY_GUILD_BANK]
elseif inventoryType == INVENTORY_CRAFT_BAG then
inventory = self.inventories[INVENTORY_CRAFT_BAG]
elseif inventoryType == INVENTORY_HOUSE_BANK then
inventory = self.inventories[INVENTORY_HOUSE_BANK]
else
-- Use normal inventory by default (instead of the quest item inventory for example)
inventory = self.inventories[self.selectedTabType]
Expand Down
32 changes: 0 additions & 32 deletions Libs/LibAddonMenu-2.0.txt

This file was deleted.

Loading