From f8d90782a796824161a0e4d6751e607e491cbf17 Mon Sep 17 00:00:00 2001 From: Alexander Drozdov Date: Thu, 1 Aug 2024 14:46:53 +0300 Subject: [PATCH] Tinctures are now modifiable items --- renderer/src/web/price-check/CheckedItem.vue | 1 - .../src/web/price-check/filters/create-item-filters.ts | 8 +++----- .../src/web/price-check/filters/create-stat-filters.ts | 6 +++--- 3 files changed, 6 insertions(+), 9 deletions(-) diff --git a/renderer/src/web/price-check/CheckedItem.vue b/renderer/src/web/price-check/CheckedItem.vue index f5664ae39..1c74ce08b 100644 --- a/renderer/src/web/price-check/CheckedItem.vue +++ b/renderer/src/web/price-check/CheckedItem.vue @@ -128,7 +128,6 @@ export default defineComponent({ (item.category === ItemCategory.Map) || (item.category === ItemCategory.HeistBlueprint) || (item.category === ItemCategory.SanctumRelic) || - (item.category === ItemCategory.Tincture) || (item.category === ItemCategory.Charm) || (!CATEGORY_TO_TRADE_ID.has(item.category!)) || (item.isUnidentified) || diff --git a/renderer/src/web/price-check/filters/create-item-filters.ts b/renderer/src/web/price-check/filters/create-item-filters.ts index ad1c1132d..849789552 100644 --- a/renderer/src/web/price-check/filters/create-item-filters.ts +++ b/renderer/src/web/price-check/filters/create-item-filters.ts @@ -170,8 +170,7 @@ export function createFilters ( disabled = true } else if ( item.category === ItemCategory.SanctumRelic || - item.category === ItemCategory.Charm || - item.category === ItemCategory.Tincture + item.category === ItemCategory.Charm ) { disabled = false } @@ -190,7 +189,7 @@ export function createFilters ( } if (item.quality && item.quality >= 20) { - if (item.category === ItemCategory.Flask) { + if (item.category === ItemCategory.Flask || item.category === ItemCategory.Tincture) { filters.quality = { value: item.quality, disabled: (item.quality <= 20) @@ -271,7 +270,6 @@ export function createFilters ( item.category !== ItemCategory.HeistContract && item.category !== ItemCategory.MemoryLine && item.category !== ItemCategory.SanctumRelic && - item.category !== ItemCategory.Tincture && item.category !== ItemCategory.Charm && item.info.refName !== 'Expedition Logbook' ) { @@ -285,7 +283,7 @@ export function createFilters ( // TODO limit level by item type filters.itemLevel = { value: Math.min(item.itemLevel, 86), - disabled: (!opts.exact || item.category === ItemCategory.Flask) + disabled: (!opts.exact || item.category === ItemCategory.Flask || item.category === ItemCategory.Tincture) } } } diff --git a/renderer/src/web/price-check/filters/create-stat-filters.ts b/renderer/src/web/price-check/filters/create-stat-filters.ts index 471da2e0b..3fb18de45 100644 --- a/renderer/src/web/price-check/filters/create-stat-filters.ts +++ b/renderer/src/web/price-check/filters/create-stat-filters.ts @@ -35,7 +35,8 @@ export function createExactStatFilters ( if ( !item.influences.length && - !item.isFractured + !item.isFractured && + item.category !== ItemCategory.Tincture ) { keepByType.push(ModifierType.Implicit) } @@ -102,8 +103,7 @@ export function createExactStatFilters ( } else if ( item.category === ItemCategory.MemoryLine || item.category === ItemCategory.SanctumRelic || - item.category === ItemCategory.Charm || - item.category === ItemCategory.Tincture + item.category === ItemCategory.Charm ) { enableAllFilters(ctx.filters) }