Skip to content
Closed
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
3 changes: 2 additions & 1 deletion config/i18n.json
Original file line number Diff line number Diff line change
Expand Up @@ -901,7 +901,8 @@
"Fashion": "Fashion (shaders & ornaments)",
"Subclass": "Subclass customization",
"LoadoutOptimizer": "Loadout Optimizer settings",
"Notes": "Notes"
"Notes": "Notes",
"SocketOverrides": "Subclass/artifact customization"
},
"ShareLoadout": "Share",
"ShowModPlacement": "Show Mod Placement",
Expand Down
6 changes: 3 additions & 3 deletions src/app/loadout/loadout-share/LoadoutShareSheet.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ export default function LoadoutShareSheet({
const numMods = loadout.parameters?.mods?.length ?? 0;
const numItems = count(loadout.items, (i) => !i.socketOverrides);
const hasFashion = Boolean(loadout.parameters?.modsByBucket);
const hasSubclass = loadout.items.some((i) => i.equip && i.socketOverrides);
const hasOverrides = loadout.items.some((i) => i.equip && i.socketOverrides);
const hasLoParams = Boolean(
loadout.parameters &&
(loadout.parameters.query ||
Expand Down Expand Up @@ -106,9 +106,9 @@ export default function LoadoutShareSheet({
{t('Loadouts.Share.Summary')}
<ul>
{numItems > 0 && <li>{t('Loadouts.Share.NumItems', { count: numItems })}</li>}
{numMods > 0 && <li>{t('Loadouts.Share.NumMods', { count: numItems })}</li>}
{numMods > 0 && <li>{t('Loadouts.Share.NumMods', { count: numMods })}</li>}
{hasFashion && <li>{t('Loadouts.Share.Fashion')}</li>}
{hasSubclass && <li>{t('Loadouts.Share.Subclass')}</li>}
{hasOverrides && <li>{t('Loadouts.Share.SocketOverrides')}</li>}
{hasLoParams && <li>{t('Loadouts.Share.LoadoutOptimizer')}</li>}
{loadout.notes && <li>{t('Loadouts.Share.Notes')}</li>}
</ul>
Expand Down
24 changes: 19 additions & 5 deletions src/app/loadout/spreadsheets.ts
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,9 @@ export function downloadLoadoutsCsv(): ThunkResult {
const fragments = subclassPlugs.filter((p) =>
fragmentSocketCategoryHashes.includes(p.socketCategoryHash),
);
// TODO artifact and artifactPlugs
const artifact = resolvedLoadout.resolvedLoadoutItems.find(
(item) => item.item.bucket.hash === BucketHashes.Artifacts,
);
const stats: CsvRow = {};
const equippedArmor = resolvedLoadout.resolvedLoadoutItems.filter(
(i) => i.loadoutItem.equip && i.item.bucket.inArmor,
Expand Down Expand Up @@ -122,7 +124,12 @@ export function downloadLoadoutsCsv(): ThunkResult {
);

const equippedItems = resolvedLoadout.resolvedLoadoutItems
.filter((i) => i.loadoutItem.equip && i.item.bucket.hash !== BucketHashes.Subclass)
.filter(
(i) =>
i.loadoutItem.equip &&
i.item.bucket.hash !== BucketHashes.Subclass &&
i.item.bucket.hash !== BucketHashes.Artifacts,
)
.sort(sortItems);

const equippedItemValues = Object.fromEntries(
Expand Down Expand Up @@ -163,9 +170,16 @@ export function downloadLoadoutsCsv(): ThunkResult {
Aspects: localizeResolvedPlugs(aspects),
Fragments: localizeResolvedPlugs(fragments),
Mods: mods.map((mod) => mod.displayProperties.name),
'Artifact Season': loadout.parameters?.artifactUnlocks?.seasonNumber,
'Artifact Unlocks': loadout.parameters?.artifactUnlocks?.unlockedItemHashes.map(
(modHash) => defs.InventoryItem.get(modHash)?.displayProperties.name,
'Artifact Season':
artifact?.item.name || loadout.parameters?.artifactUnlocks?.seasonNumber || '',
'Artifact Unlocks': (
artifact?.item.sockets?.allSockets?.map(
(s) => artifact?.loadoutItem.socketOverrides?.[s.socketIndex] || 0,
) ||
loadout.parameters?.artifactUnlocks?.unlockedItemHashes ||
[]
).map(
(modHash) => (modHash && defs.InventoryItem.get(modHash)?.displayProperties.name) || '',
),
Comment on lines +175 to 183

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fills in the artifact unlocks with the 7 slots (including empty/non-overridden slots as empty string) of modern artifact.

};
});
Expand Down
2 changes: 1 addition & 1 deletion src/locale/en.json
Original file line number Diff line number Diff line change
Expand Up @@ -948,7 +948,7 @@
"NumMods_one": "{{count}} mod",
"NumMods_other": "{{count}} mods",
"Placeholder": "Loading share link",
"Subclass": "Subclass customization",
"SocketOverrides": "Subclass/artifact customization",
"Summary": "Share this loadout containing:",
"Title": "Share \"{{name}}\""
},
Expand Down