Merge pull request #94 from dragoni7/generation

Mod Combos Generation
dragoni7 · Sep 17, 2024 · 5d26a79 · 5d26a79
2 parents 2511abc + c650448
commit 5d26a79
Show file tree

Hide file tree

Showing 6 changed files with 109 additions and 597 deletions.
diff --git a/package.json b/package.json
@@ -6,6 +6,7 @@
   "scripts": {
     "dev": "vite",
     "build": "tsc && vite build",
+    "generate": "npx tsx src/generated/generate-mod-combos.ts",
     "lint": "eslint . --ext js,jsx --report-unused-disable-directives --max-warnings 0",
     "preview": "vite preview"
   },

diff --git a/src/features/armor-optimization/PermutationsList.tsx b/src/features/armor-optimization/PermutationsList.tsx
@@ -39,6 +39,7 @@ const StyledCard = styled(Card)(({ theme }) => ({
   backgroundColor: 'rgba(0, 0, 0, 0.5)',
   backdropFilter: 'blur(10px)',
   alignItems: 'center',
+  justifyContent: 'center',
 }));
 
 const ArmorRow = styled(Grid)(({ theme }) => ({
@@ -236,39 +237,41 @@ const PermutationsList: React.FC<PermutationsListProps> = ({
                 onPermutationClick(perm);
               }}
             >
-              <ArmorRow container spacing={0}>
-                {perm.permutation.map((item, idx) => (
-                  <Grid item md={2} key={idx}>
-                    <Tooltip title={`${item.name}\n${formatArmorStats(item)}`}>
-                      <Box>
-                        <ArmorIcon armor={item} />
-                      </Box>
-                    </Tooltip>
-                  </Grid>
-                ))}
-              </ArmorRow>
-              <StatsRow container spacing={1} alignItems="center" justifyContent="center">
-                {(STATS as StatName[]).map((stat) => (
-                  <Grid item md={1} key={stat}>
-                    <StatContainer>
-                      <StatIcon src={statIcons[stat]} alt={stat} />
-                      <StatValue variant="body2">{calculateTotal(perm, stat)}</StatValue>
-                    </StatContainer>
-                  </Grid>
-                ))}
-              </StatsRow>
-              <Stack direction="row" alignItems="start" justifyContent="center" spacing={0.5}>
-                {(STATS as StatName[]).map((stat) =>
-                  perm.modsArray[stat].length !== 0 ? (
-                    <>
-                      {renderStatModCount(perm, stat, 10)}
-                      {renderStatModCount(perm, stat, 5)}
-                      {renderStatModCount(perm, stat, 3)}
-                    </>
-                  ) : (
-                    false
-                  )
-                )}
+              <Stack justifyContent="center" alignItems="center" height="100%">
+                <ArmorRow container spacing={0}>
+                  {perm.permutation.map((item, idx) => (
+                    <Grid item md={2} key={idx}>
+                      <Tooltip title={`${item.name}\n${formatArmorStats(item)}`}>
+                        <Box>
+                          <ArmorIcon armor={item} />
+                        </Box>
+                      </Tooltip>
+                    </Grid>
+                  ))}
+                </ArmorRow>
+                <StatsRow container spacing={1} alignItems="center" justifyContent="center">
+                  {(STATS as StatName[]).map((stat) => (
+                    <Grid item md={1} key={stat}>
+                      <StatContainer>
+                        <StatIcon src={statIcons[stat]} alt={stat} />
+                        <StatValue variant="body2">{calculateTotal(perm, stat)}</StatValue>
+                      </StatContainer>
+                    </Grid>
+                  ))}
+                </StatsRow>
+                <Stack direction="row" alignItems="start" justifyContent="center" spacing={0.5}>
+                  {(STATS as StatName[]).map((stat) =>
+                    perm.modsArray[stat].length !== 0 ? (
+                      <>
+                        {renderStatModCount(perm, stat, 10)}
+                        {renderStatModCount(perm, stat, 5)}
+                        {renderStatModCount(perm, stat, 3)}
+                      </>
+                    ) : (
+                      false
+                    )
+                  )}
+                </Stack>
               </Stack>
             </StyledCard>
           ))}

diff --git a/src/features/armor-optimization/filter-permutations.ts b/src/features/armor-optimization/filter-permutations.ts
@@ -1,3 +1,4 @@
+import { generatedModCombos } from '../../generated/generated-mod-combos';
 import { STATS } from '../../lib/bungie_api/constants';
 import {
   DecodedLoadoutData,
@@ -6,7 +7,6 @@ import {
   StatName,
   FragmentStatModifications,
 } from '../../types/d2l-types';
-import { precalculatedModCombinations } from './precalculatedModCombinations';
 
 interface SelectedThresholds {
   [key: string]: number;
@@ -56,7 +56,7 @@ export const filterPermutations = (
         return tryModCombination(statIndex + 1, artificeUsed, regularModsUsed);
       }
 
-      const combinations = precalculatedModCombinations[deficit] || [];
+      const combinations = generatedModCombos[deficit] || [];
       for (const [artifice, minor, major] of combinations) {
         if (artifice <= artificeCount - artificeUsed && minor + major <= 5 - regularModsUsed) {
           modsArray[stat.toLowerCase() as keyof FilteredPermutation['modsArray']] = [