Skip to content

Fold poisons into the Potions trade filter and rename Misc/Gems #11

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鈥檒l occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
absol89 merged 1 commit into from
Oct 7, 2026
Merged

Fold poisons into the Potions trade filter and rename Misc/Gems #11

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 3 additions & 3 deletions Code/skyrim_ui/src/app/models/trade-category.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
export const tradeCategories = [
'all', 'weapons', 'armor', 'potions', 'poisons', 'scrolls',
'all', 'weapons', 'armor', 'potions', 'scrolls',
'food', 'ingredients', 'books', 'keys', 'misc',
] as const;

export type TradeCategory = typeof tradeCategories[number];
const tradeItemCategories = [...tradeCategories.filter(category => category !== 'all'), 'ammunition', 'soul_gems'] as const;
export type TradeItemCategory = Exclude<TradeCategory, 'all'> | 'ammunition' | 'soul_gems';
const tradeItemCategories = [...tradeCategories.filter(category => category !== 'all'), 'ammunition', 'poisons', 'soul_gems'] as const;
export type TradeItemCategory = Exclude<TradeCategory, 'all'> | 'ammunition' | 'poisons' | 'soul_gems';

export function normalizeTradeCategory(value: unknown): TradeItemCategory {
return tradeItemCategories.includes(value as TradeItemCategory)
Expand Down
2 changes: 1 addition & 1 deletion Code/skyrim_ui/src/assets/i18n/en.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -166,7 +166,7 @@
"books": "Books",
"keys": "Keys",
"soul_gems": "Soul Gems",
"misc": "Misc/Gems"
"misc": "Misc"
},
"EQUIPPED_ITEM_WARNING": "Unequip this item before trading it.",
"INVITES_TITLE": "Trade invitations",
Expand Down
1 change: 1 addition & 0 deletions Code/skyrim_ui/test/trade-ui.test.cjs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -240,6 +240,7 @@ test('broad categories include ammo, poisons and soul gems; unknown types remain
assert.equal(visible.length, 2);
assert.equal(fixture.service.categories.includes('soul_gems'), false);
assert.equal(fixture.service.categories.includes('ammunition'), false);
assert.equal(fixture.service.categories.includes('poisons'), false);
subscription.unsubscribe();
fixture.service.ngOnDestroy();
});
Expand Down