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
13 changes: 13 additions & 0 deletions Locales/enUS.lua
100755 → 100644
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,19 @@ COLLECTIONATOR_LOCALES.enUS = function()
L["SHOWING_X_RESULTS"] = "Showing %s results"
L["TYPE"] = "Type"
L["SLOT"] = "Slot"
L["EXPANSION"] = "Expansion"
L["EXPANSION_CLASSIC"] = "Classic"
L["EXPANSION_BURNING_CRUSADE"] = "TBC"
L["EXPANSION_WRATH_OF_THE_LICH_KING"] = "WotLK"
L["EXPANSION_CATACLYSM"] = "Cata"
L["EXPANSION_MISTS_OF_PANDARIA"] = "MoP"
L["EXPANSION_WARLORDS_OF_DRAENOR"] = "WoD"
L["EXPANSION_LEGION"] = "Legion"
L["EXPANSION_BATTLE_FOR_AZEROTH"] = "BfA"
L["EXPANSION_SHADOWLANDS"] = "SL"
L["EXPANSION_DRAGONFLIGHT"] = "DF"
L["EXPANSION_WAR_WITHIN"] = "TWW"

L["QUALITY"] = "Quality"
L["ARMOR"] = "Armor"
L["WEAPON"] = "Weapon"
Expand Down
40 changes: 40 additions & 0 deletions Source/Filters/Filters.lua
Original file line number Diff line number Diff line change
Expand Up @@ -151,6 +151,46 @@ function CollectionatorSlotFilterMixin:GetFilterName(filter)
return SLOTS_TO_NAME[filter]
end

local EXPANSIONS = {
LE_EXPANSION_CLASSIC,
LE_EXPANSION_BURNING_CRUSADE,
LE_EXPANSION_WRATH_OF_THE_LICH_KING,
LE_EXPANSION_CATACLYSM,
LE_EXPANSION_MISTS_OF_PANDARIA,
LE_EXPANSION_WARLORDS_OF_DRAENOR,
LE_EXPANSION_LEGION,
LE_EXPANSION_BATTLE_FOR_AZEROTH,
LE_EXPANSION_SHADOWLANDS,
LE_EXPANSION_DRAGONFLIGHT,
LE_EXPANSION_WAR_WITHIN
}



CollectionatorExpansionFilterMixin = CreateFromMixins(CollectionatorFilterDropDownMixin)
function CollectionatorExpansionFilterMixin:GetFilters()
return EXPANSIONS
end

local EXPANSION_TO_NAME = {
[LE_EXPANSION_CLASSIC] = COLLECTIONATOR_L_EXPANSION_CLASSIC,
[LE_EXPANSION_BURNING_CRUSADE] = COLLECTIONATOR_L_EXPANSION_BURNING_CRUSADE,
[LE_EXPANSION_WRATH_OF_THE_LICH_KING] = COLLECTIONATOR_L_EXPANSION_WRATH_OF_THE_LICH_KING,
[LE_EXPANSION_CATACLYSM] = COLLECTIONATOR_L_EXPANSION_CATACLYSM,
[LE_EXPANSION_MISTS_OF_PANDARIA] = COLLECTIONATOR_L_EXPANSION_MISTS_OF_PANDARIA,
[LE_EXPANSION_WARLORDS_OF_DRAENOR] = COLLECTIONATOR_L_EXPANSION_WARLORDS_OF_DRAENOR,
[LE_EXPANSION_LEGION] = COLLECTIONATOR_L_EXPANSION_LEGION,
[LE_EXPANSION_BATTLE_FOR_AZEROTH] = COLLECTIONATOR_L_EXPANSION_BATTLE_FOR_AZEROTH,
[LE_EXPANSION_SHADOWLANDS] = COLLECTIONATOR_L_EXPANSION_SHADOWLANDS,
[LE_EXPANSION_DRAGONFLIGHT] = COLLECTIONATOR_L_EXPANSION_DRAGONFLIGHT,
[LE_EXPANSION_WAR_WITHIN] = COLLECTIONATOR_L_EXPANSION_WAR_WITHIN

}

function CollectionatorExpansionFilterMixin:GetFilterName(filter)
return EXPANSION_TO_NAME[filter]
end

local MOUNT_TYPES = {
230, 424, 254
}
Expand Down
5 changes: 5 additions & 0 deletions Source/Summary/DataProviders/TMogs.lua
Original file line number Diff line number Diff line change
Expand Up @@ -178,6 +178,10 @@ function CollectionatorSummaryTMogDataProviderMixin:TMogFilterCheck(sourceInfo,

check = check and cachedFilters.slotFilter:GetValue(sourceInfo.slot)

check = check and cachedFilters.expFilter:GetValue(sourceInfo.expansion)



if sourceInfo.armor ~= -1 then
check = check and cachedFilters.armorFilter:GetValue(sourceInfo.armor)
else
Expand Down Expand Up @@ -272,6 +276,7 @@ function CollectionatorSummaryTMogDataProviderMixin:Refresh()
characterOnly = self:GetParent().CharacterOnly:GetChecked(),
qualityFilter = self:GetParent().QualityFilter,
slotFilter = self:GetParent().SlotFilter,
expFilter = self:GetParent().ExpFilter,
armorFilter = self:GetParent().ArmorFilter,
weaponFilter = self:GetParent().WeaponFilter,
}
Expand Down
8 changes: 7 additions & 1 deletion Source/Summary/Scanner/TMog.lua
Original file line number Diff line number Diff line change
Expand Up @@ -46,10 +46,16 @@ function CollectionatorSummaryTMogScannerFrameMixin:GetItem(index, itemKeyInfo,
weaponType = itemInfo[13]
end

local expansion = 0
if itemInfo[15] then
expansion = itemInfo[15]
end


local replacementItemLink = select(6, C_TransmogCollection.GetAppearanceSourceInfo(source))

return {
id = source, visual = visual, index = index, set = set,
id = source, visual = visual, index = index, set = set, expansion = expansion,
armor = armorType, weapon = weaponType, slot = inventorySlot,
levelRequired = C_AuctionHouse.GetItemKeyRequiredLevel(scanInfo.itemKey) or 0,
itemID = scanInfo.itemKey.itemID,
Expand Down
6 changes: 5 additions & 1 deletion Source/Summary/Tab/TMogView.xml
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,11 @@
<Anchor point="TOPLEFT" relativePoint="TOPLEFT" x="40" y="54"/>
</Anchors>
</DropDownToggleButton>

<DropDownToggleButton parentKey="ExpFilter" inherits="CollectionatorFilterDropDownTemplate" mixin="CollectionatorExpansionFilterMixin" text="COLLECTIONATOR_L_EXPANSION">
<Anchors>
<Anchor point="TOPLEFT" relativeKey="$parent.SlotFilter" relativePoint="TOPRIGHT" x="25"/>
</Anchors>
</DropDownToggleButton>
<Frame parentKey="LevelFilter" inherits="AuctionatorConfigurationMinMaxFrame">
<KeyValues>
<KeyValue key="titleText" value="AUCTIONATOR_L_LEVEL" type="global"/>
Expand Down