Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

APIVersion 100031 #249

Merged
merged 3 commits into from May 22, 2020
Merged

APIVersion 100031 #249

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2af2b22
APIVersion bump
klingo Apr 23, 2020
67845dd
Merge branch 'master-v2' into APIVersion-100031
klingo Apr 23, 2020
02c05c5
implemented new ItemQuality functions/constants
klingo Apr 24, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
24 changes: 12 additions & 12 deletions PersonalAssistant/Menu/MenuChoices.lua
View file
Open in desktop
Expand Up @@ -91,21 +91,21 @@ local PAMenuChoicesValues = {
PAJunk = {
qualityLevel = {
PAC.ITEM_QUALITY.DISABLED, -- -1 (disabled)
ITEM_QUALITY_TRASH, -- 0
ITEM_QUALITY_NORMAL, -- 1
ITEM_QUALITY_MAGIC, -- 2
ITEM_QUALITY_ARCANE, -- 3
ITEM_QUALITY_ARTIFACT, -- 4
-- ITEM_QUALITY_LEGENDARY, -- 5
ITEM_FUNCTIONAL_QUALITY_TRASH, -- 0
ITEM_FUNCTIONAL_QUALITY_NORMAL, -- 1
ITEM_FUNCTIONAL_QUALITY_MAGIC, -- 2
ITEM_FUNCTIONAL_QUALITY_ARCANE, -- 3
ITEM_FUNCTIONAL_QUALITY_ARTIFACT, -- 4
-- ITEM_FUNCTIONAL_QUALITY_LEGENDARY, -- 5
},
qualityLevelReverse = {
PAC.ITEM_QUALITY.DISABLED_REVERSE, -- 99 (disabled)
ITEM_QUALITY_LEGENDARY, -- 5
ITEM_QUALITY_ARTIFACT, -- 4
ITEM_QUALITY_ARCANE, -- 3
ITEM_QUALITY_MAGIC, -- 2
ITEM_QUALITY_NORMAL, -- 1
ITEM_QUALITY_TRASH, -- 0
ITEM_FUNCTIONAL_QUALITY_LEGENDARY, -- 5
ITEM_FUNCTIONAL_QUALITY_ARTIFACT, -- 4
ITEM_FUNCTIONAL_QUALITY_ARCANE, -- 3
ITEM_FUNCTIONAL_QUALITY_MAGIC, -- 2
ITEM_FUNCTIONAL_QUALITY_NORMAL, -- 1
ITEM_FUNCTIONAL_QUALITY_TRASH, -- 0
},
itemAction = {
PAC.ITEM_ACTION.NOTHING, -- 0
Expand Down
2 changes: 1 addition & 1 deletion PersonalAssistant/PersonalAssistant.txt
View file
Open in desktop
Expand Up @@ -8,7 +8,7 @@
## Version: {VERSION_NUMBER}
## AddOnVersion: {BUILD_NUMBER}
## Author: Klingo
## APIVersion: 100030
## APIVersion: 100031
## SavedVariables: PersonalAssistant_SavedVariables
## DependsOn: LibAddonMenu-2.0>=30 LibMainMenu-2.0>=432 LibCustomMenu>=692

Expand Down
2 changes: 1 addition & 1 deletion PersonalAssistant/PersonalAssistantBanking/PersonalAssistantBanking.txt
View file
Open in desktop
Expand Up @@ -8,7 +8,7 @@
## Version: {VERSION_NUMBER}
## AddOnVersion: {BUILD_NUMBER}
## Author: Klingo
## APIVersion: 100030
## APIVersion: 100031
## SavedVariables: PersonalAssistantBanking_SavedVariables
## DependsOn: PersonalAssistant

Expand Down
2 changes: 1 addition & 1 deletion PersonalAssistant/PersonalAssistantIntegration/PersonalAssistantIntegration.txt
View file
Open in desktop
Expand Up @@ -8,7 +8,7 @@
## Version: {VERSION_NUMBER}
## AddOnVersion: {BUILD_NUMBER}
## Author: Klingo
## APIVersion: 100030
## APIVersion: 100031
## SavedVariables: PersonalAssistantIntegration_SavedVariables
## DependsOn: PersonalAssistant

Expand Down
2 changes: 1 addition & 1 deletion PersonalAssistant/PersonalAssistantJunk/Menu/PAJunkMenuDefaults.lua
View file
Open in desktop
Expand Up @@ -88,7 +88,7 @@ local PAJunkMenuDefaults = {
showMarkUnmarkAsJunkKeybind = true,
enableDestroyItemKeybind = false,
showDestroyItemKeybind = true,
destroyItemQualityThreshold = ITEM_QUALITY_LEGENDARY,
destroyItemQualityThreshold = ITEM_FUNCTIONAL_QUALITY_LEGENDARY,
destroyExcludeUnknownItems = false,
},

Expand Down
2 changes: 1 addition & 1 deletion PersonalAssistant/PersonalAssistantJunk/PAJunk/PAJunk.lua
View file
Open in desktop
Expand Up @@ -722,7 +722,7 @@ local function OnInventorySingleSlotUpdate(eventCode, bagId, slotIndex, isNewIte
-- -------------------------------------------------------------------------------------------------
-- all rules for NOT stolen items
local sellInformation = GetItemLinkSellInformation(itemLink)
local itemQuality = GetItemQuality(bagId, slotIndex)
local itemQuality = GetItemFunctionalQuality(bagId, slotIndex)

if itemType == ITEMTYPE_TRASH or specializedItemType == SPECIALIZED_ITEMTYPE_TRASH then
if PAJunkSavedVars.Trash.autoMarkTrash then
Expand Down
2 changes: 1 addition & 1 deletion PersonalAssistant/PersonalAssistantJunk/PAJunk/PAJunkKeybindStrip.lua
View file
Open in desktop
Expand Up @@ -32,7 +32,7 @@ local function _isDestroyItemEnabled()
if not PA.Junk.SavedVars or not PA.Junk.SavedVars.KeyBindings.enableDestroyItemKeybind then return false end

if IsItemPlayerLocked(_mouseOverBagId, _mouseOverSlotIndex) then return false end
if GetItemQuality(_mouseOverBagId, _mouseOverSlotIndex) >= PA.Junk.SavedVars.KeyBindings.destroyItemQualityThreshold then return false end
if GetItemFunctionalQuality(_mouseOverBagId, _mouseOverSlotIndex) >= PA.Junk.SavedVars.KeyBindings.destroyItemQualityThreshold then return false end

if PA.Junk.SavedVars.KeyBindings.destroyExcludeUnknownItems then
local itemType, specializedItemType = GetItemType(_mouseOverBagId, _mouseOverSlotIndex)
Expand Down
2 changes: 1 addition & 1 deletion PersonalAssistant/PersonalAssistantJunk/PersonalAssistantJunk.txt
View file
Open in desktop
Expand Up @@ -8,7 +8,7 @@
## Version: {VERSION_NUMBER}
## AddOnVersion: {BUILD_NUMBER}
## Author: Klingo
## APIVersion: 100030
## APIVersion: 100031
## SavedVariables: PersonalAssistantJunk_SavedVariables
## DependsOn: PersonalAssistant

Expand Down
2 changes: 1 addition & 1 deletion PersonalAssistant/PersonalAssistantLoot/PersonalAssistantLoot.txt
View file
Open in desktop
Expand Up @@ -8,7 +8,7 @@
## Version: {VERSION_NUMBER}
## AddOnVersion: {BUILD_NUMBER}
## Author: Klingo
## APIVersion: 100030
## APIVersion: 100031
## SavedVariables: PersonalAssistantLoot_SavedVariables
## DependsOn: PersonalAssistant

Expand Down
2 changes: 1 addition & 1 deletion PersonalAssistant/PersonalAssistantRepair/PersonalAssistantRepair.txt
View file
Open in desktop
Expand Up @@ -8,7 +8,7 @@
## Version: {VERSION_NUMBER}
## AddOnVersion: {BUILD_NUMBER}
## Author: Klingo
## APIVersion: 100030
## APIVersion: 100031
## SavedVariables: PersonalAssistantRepair_SavedVariables
## DependsOn: PersonalAssistant

Expand Down
12 changes: 6 additions & 6 deletions PersonalAssistant/localization/en.lua
View file
Open in desktop
Expand Up @@ -208,12 +208,12 @@ local PAGenericStrings = {
-- -----------------------------------------------------------------------------------------------------------------
-- Item Qualitiy Levels --
SI_PA_QUALITY_DISABLED = table.concat({"- ", GetString(SI_CHECK_BUTTON_DISABLED), " -"}),
SI_PA_QUALITY_TRASH = GetItemQualityColor(ITEM_QUALITY_TRASH):Colorize(GetString("SI_ITEMQUALITY", ITEM_QUALITY_TRASH)),
SI_PA_QUALITY_NORMAL = GetItemQualityColor(ITEM_QUALITY_NORMAL):Colorize(GetString("SI_ITEMQUALITY", ITEM_QUALITY_NORMAL)),
SI_PA_QUALITY_FINE = GetItemQualityColor(ITEM_QUALITY_MAGIC):Colorize(GetString("SI_ITEMQUALITY", ITEM_QUALITY_MAGIC)),
SI_PA_QUALITY_SUPERIOR = GetItemQualityColor(ITEM_QUALITY_ARCANE):Colorize(GetString("SI_ITEMQUALITY", ITEM_QUALITY_ARCANE)),
SI_PA_QUALITY_EPIC = GetItemQualityColor(ITEM_QUALITY_ARTIFACT):Colorize(GetString("SI_ITEMQUALITY", ITEM_QUALITY_ARTIFACT)),
SI_PA_QUALITY_LEGENDARY = GetItemQualityColor(ITEM_QUALITY_LEGENDARY):Colorize(GetString("SI_ITEMQUALITY", ITEM_QUALITY_LEGENDARY)),
SI_PA_QUALITY_TRASH = GetItemQualityColor(ITEM_FUNCTIONAL_QUALITY_TRASH):Colorize(GetString("SI_ITEMQUALITY", ITEM_FUNCTIONAL_QUALITY_TRASH)),
SI_PA_QUALITY_NORMAL = GetItemQualityColor(ITEM_FUNCTIONAL_QUALITY_NORMAL):Colorize(GetString("SI_ITEMQUALITY", ITEM_FUNCTIONAL_QUALITY_NORMAL)),
SI_PA_QUALITY_FINE = GetItemQualityColor(ITEM_FUNCTIONAL_QUALITY_MAGIC):Colorize(GetString("SI_ITEMQUALITY", ITEM_FUNCTIONAL_QUALITY_MAGIC)),
SI_PA_QUALITY_SUPERIOR = GetItemQualityColor(ITEM_FUNCTIONAL_QUALITY_ARCANE):Colorize(GetString("SI_ITEMQUALITY", ITEM_FUNCTIONAL_QUALITY_ARCANE)),
SI_PA_QUALITY_EPIC = GetItemQualityColor(ITEM_FUNCTIONAL_QUALITY_ARTIFACT):Colorize(GetString("SI_ITEMQUALITY", ITEM_FUNCTIONAL_QUALITY_ARTIFACT)),
SI_PA_QUALITY_LEGENDARY = GetItemQualityColor(ITEM_FUNCTIONAL_QUALITY_LEGENDARY):Colorize(GetString("SI_ITEMQUALITY", ITEM_FUNCTIONAL_QUALITY_LEGENDARY)),

-- -----------------------------------------------------------------------------------------------------------------
-- PABanking --
Expand Down