add mismatched ascended trinkets

discretize · Aug 4, 2023 · 337ca81 · 337ca81
1 parent 9327cec
commit 337ca81
Show file tree

Hide file tree

Showing 5 changed files with 195 additions and 5 deletions.
diff --git a/locales/en/translation.json b/locales/en/translation.json
@@ -203,6 +203,7 @@
   "affix_Apothecary": "Apothecary",
   "affix_Assassin": "Assassin",
   "affix_Berserker": "Berserker",
+  "affix_Berserker and Valkyrie": "Berserker and Valkyrie",
   "affix_Bringer": "Bringer",
   "affix_Carrion": "Carrion",
   "affix_Cavalier": "Cavalier",
@@ -212,6 +213,7 @@
   "affix_Crusader": "Crusader",
   "affix_Custom": "Custom",
   "affix_Dire": "Dire",
+  "affix_Dire and Rabid": "Dire and Rabid",
   "affix_Diviner": "Diviner",
   "affix_Dragon": "Dragon",
   "affix_Giver": "Giver",
@@ -225,6 +227,7 @@
   "affix_Nomad": "Nomad",
   "affix_Plaguedoctor": "Plaguedoctor",
   "affix_Rabid": "Rabid",
+  "affix_Rabid and Apothecary": "Rabid and Apothecary",
   "affix_Rampager": "Rampager",
   "affix_Ritualist": "Ritualist",
   "affix_Sentinel": "Sentinel",

diff --git a/src/components/baseComponents/AffixesSelect.jsx b/src/components/baseComponents/AffixesSelect.jsx
@@ -87,7 +87,7 @@ const AffixesSelect = ({ name, multiple, onChange, value: affixes }) => {
               )}
             </Box>
           )}
-          {option.label === 'Custom' ? (
+          {option.label === 'Custom' || option.label.includes(' ') ? (
             <Item
               id={mistBandId}
               disableIcon

diff --git a/src/components/sections/results/table/ResultTableRow.jsx b/src/components/sections/results/table/ResultTableRow.jsx
@@ -81,6 +81,14 @@ const ResultTableRow = ({
           textDecoration = 'underline dotted #ffa405';
         if (!exoticRarity(affix, index) && mostCommonRarity !== 'ascended')
           textDecoration = 'underline dotted #fb3e8d';
+
+        const affixFragments = affix.split(' ').filter((fragment) => fragment !== 'and');
+        const multiWordAffix = affixFragments.length > 1;
+
+        const shortAffix = affixFragments
+          .map((fragment) => fragment.slice(0, multiWordAffix ? 3 : 4))
+          .join('+');
+
         return (
           // eslint-disable-next-line react/no-array-index-key
           <TableCell align="center" key={affix + index} padding="none">
@@ -92,7 +100,7 @@ const ResultTableRow = ({
                 color: mostCommonAffix && mostCommonAffix !== affix ? '#00cccc' : 'inherit',
               }}
             >
-              {affix.slice(0, 4)}
+              {shortAffix}
             </Typography>
           </TableCell>
         );

diff --git a/src/state/optimizer/optimizerSetup.ts b/src/state/optimizer/optimizerSetup.ts
@@ -826,7 +826,7 @@ export function setupCombinations(reduxState: any) {
             number,
           ][];
           for (const [type, bonus] of bonuses) {
-            for (const stat of Affix[affix].bonuses[type]) {
+            for (const stat of Affix[affix].bonuses[type] ?? []) {
               statTotals[stat] = (statTotals[stat] || 0) + bonus;
             }
           }