Merge pull request #25 from dragoni7/LoadoutEquipping

Loadout equipping
dragoni7 · Aug 25, 2024 · 19fcf7b · 19fcf7b
2 parents 31162f8 + c5f5ebf
commit 19fcf7b
Show file tree

Hide file tree

Showing 17 changed files with 755 additions and 911 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/src/app/routes/Dashboard.tsx b/src/app/routes/Dashboard.tsx
@@ -9,7 +9,13 @@ import { updateProfileData } from '../../store/ProfileReducer';
 import { useDispatch, useSelector } from 'react-redux';
 import { generatePermutations } from '../../features/armor-optimization/generate-permutations';
 import { filterPermutations } from '../../features/armor-optimization/filter-permutations';
-import { DestinyArmor, Character, FilteredPermutation, DamageType } from '../../types/d2l-types';
+import {
+  DestinyArmor,
+  Character,
+  FilteredPermutation,
+  DamageType,
+  SubclassConfig,
+} from '../../types/d2l-types';
 import StatsTable from '../../features/armor-optimization/StatsTable';
 import { RootState } from '../../store';
 import HeaderComponent from '../../components/HeaderComponent';
@@ -20,7 +26,7 @@ import ArmorCustomization from '../../features/armor/components/ArmorCustomizati
 import { resetLoadout, updateLoadoutCharacter, updateSubclass } from '../../store/LoadoutReducer';
 import { ManifestSubclass } from '../../types/manifest-types';
 import SubclassCustomizationWrapper from '../../features/subclass/SubclassCustomizationWrapper';
-import { updateManifest } from '../../lib/bungie_api/Manifest';
+import { updateManifest } from '../../lib/bungie_api/manifest';
 
 const PageContainer = styled('div')({
   display: 'flex',
@@ -199,11 +205,11 @@ export const Dashboard: React.FC = () => {
 
   const handleSubclassSelect = (subclass: ManifestSubclass) => {
     setSelectedSubclass(subclass);
-    if (selectedCharacter) {
+
+    if (selectedCharacter && subclass.damageType in selectedCharacter.subclasses) {
       dispatch(
         updateSubclass({
-          damageType: subclass.damageType as DamageType,
-          subclass: selectedCharacter.subclasses[subclass.damageType],
+          subclass: selectedCharacter.subclasses[subclass.damageType]?.subclass,
         })
       );
     }

diff --git a/src/features/armor-optimization/NumberBoxes.tsx b/src/features/armor-optimization/NumberBoxes.tsx
@@ -1,7 +1,7 @@
 import React, { useState } from 'react';
 import { styled } from '@mui/material/styles';
 import { Box, Paper, Grid, ButtonBase } from '@mui/material';
-import { STATS } from '../../lib/bungie_api/Constants';
+import { STATS } from '../../lib/bungie_api/constants';
 
 const ContainerWithBorder = styled(Paper)(({ theme }) => ({
   border: `1px solid ${theme.palette.divider}`,

diff --git a/src/features/armor-optimization/StatsTable.tsx b/src/features/armor-optimization/StatsTable.tsx
@@ -11,7 +11,7 @@ import {
   updateRequiredStatMods,
 } from '../../store/LoadoutReducer';
 import ArmorIcon from '../../components/ArmorIcon';
-import { STAT_MOD_HASHES, STATS } from '../../lib/bungie_api/Constants';
+import { STAT_MOD_HASHES, STATS } from '../../lib/bungie_api/constants';
 import { db } from '../../store/db';
 import { ManifestArmorStatMod } from '../../types/manifest-types';
 

diff --git a/src/features/armor/components/LoadoutArmor.tsx b/src/features/armor/components/LoadoutArmor.tsx
@@ -68,9 +68,10 @@ const LoadoutArmor: React.FC = () => {
             <Box width={81} height={81}>
               Required Mods:
             </Box>
-            {requiredMods.map((mod) => (
+            {requiredMods.map((mod, index) => (
               <Box
                 className="armor-mod-slot"
+                key={index}
                 style={{
                   backgroundImage: `url(${mod.icon})`,
                 }}