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.

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

Fix Europa theme godroll indicator color and add godroll/archived to item preview on settings page #10673

Merged
merged 3 commits into from
Aug 5, 2024
Merged
Show file tree
Hide file tree
Changes from 2 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
63 changes: 60 additions & 3 deletions src/app/settings/SettingsPage.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -69,11 +69,40 @@ export default function SettingsPage() {
const exampleWeapon = allItems.find(
(i) => i.bucket.sort === 'Weapons' && !i.isExotic && !i.masterwork && !i.deepsightInfo,
);
const exampleWeaponBad = allItems.find(
(i) =>
i !== exampleWeapon &&
i.bucket.sort === 'Weapons' &&
!i.isExotic &&
!i.masterwork &&
!i.deepsightInfo,
);
// Include a masterworked item because they look different in some themes
const exampleWeaponMasterworked = allItems.find(
(i) => i.bucket.sort === 'Weapons' && !i.isExotic && i.masterwork && !i.deepsightInfo,
);
const exampleWeaponMasterworkedBad = allItems.find(
(i) =>
i !== exampleWeaponMasterworked &&
i.bucket.sort === 'Weapons' &&
!i.isExotic &&
i.masterwork &&
!i.deepsightInfo,
);
const exampleArmor = allItems.find((i) => i.bucket.sort === 'Armor' && !i.isExotic);
const exampleArchivedArmor = allItems.find(
(i) => i !== exampleArmor && i.bucket.sort === 'Armor' && !i.isExotic,
);
const godRoll = {
wishListPerks: new Set<number>(),
notes: undefined,
isUndesirable: false,
};
const badRoll = {
wishListPerks: new Set<number>(),
notes: undefined,
isUndesirable: true,
};

const onCheckChange = (checked: boolean, name: keyof Settings) => {
if (name.length === 0) {
Expand Down Expand Up @@ -270,23 +299,51 @@ export default function SettingsPage() {
<InventoryItem
item={exampleWeapon}
isNew={settings.showNewItems}
tag="favorite"
tag="keep"
wishlistRoll={godRoll}
autoLockTagged={settings.autoLockTagged}
/>
)}
{exampleWeaponBad && (
<InventoryItem
item={exampleWeaponBad}
isNew={settings.showNewItems}
tag="infuse"
wishlistRoll={badRoll}
autoLockTagged={settings.autoLockTagged}
/>
)}
{exampleWeaponMasterworked && (
<InventoryItem
item={exampleWeaponMasterworked}
isNew={settings.showNewItems}
tag="keep"
tag="favorite"
wishlistRoll={godRoll}
autoLockTagged={settings.autoLockTagged}
/>
)}
{exampleWeaponMasterworkedBad && (
<InventoryItem
item={exampleWeaponMasterworkedBad}
isNew={settings.showNewItems}
tag="junk"
wishlistRoll={badRoll}
autoLockTagged={settings.autoLockTagged}
/>
)}
{exampleArmor && (
<InventoryItem
item={exampleArmor}
isNew={settings.showNewItems}
tag="keep"
autoLockTagged={settings.autoLockTagged}
/>
)}
{exampleArchivedArmor && (
<InventoryItem
item={exampleArchivedArmor}
isNew={settings.showNewItems}
tag="archive"
searchHidden={true}
autoLockTagged={settings.autoLockTagged}
/>
)}
Expand Down
2 changes: 1 addition & 1 deletion src/app/themes/_theme-europa.scss
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@
--theme-item-polaroid-masterwork-txt: #000;
--theme-item-polaroid-capped: #f2a5ce;
--theme-item-polaroid-capped-txt: #be0a99;
--theme-item-polaroid-godroll: white;
--theme-item-polaroid-godroll: #0b486b;
--theme-item-polaroid-trashroll: #d14334;

// Item popup
Expand Down
Loading