Merge pull request #35 from dragoni7/GreyOutArmorMods&IsOwnedFix

Grey out armor mods&is owned fix

src/app/routes/Dashboard.tsx

@@ -9,13 +9,7 @@ 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,
-  SubclassConfig,
-} from '../../types/d2l-types';
+import { DestinyArmor, Character, FilteredPermutation } from '../../types/d2l-types';
 import StatsTable from '../../features/armor-optimization/StatsTable';
 import { RootState } from '../../store';
 import HeaderComponent from '../../components/HeaderComponent';

src/components/ArmorIcon.tsx

@@ -1,4 +1,4 @@
-import { Box, styled } from '@mui/system';
+import { styled } from '@mui/system';
 import { DestinyArmor } from '../types/d2l-types';
 
 const MasterworkedIconContainer = styled('img')({

src/features/armor/components/ArmorModSelector.tsx

@@ -7,6 +7,9 @@ interface ModSelectorProps {
   onSelectMod: (mod: ManifestArmorMod | ManifestArmorStatMod) => void;
 }
 
+const lockedModIcon =
+  'https://www.bungie.net/common/destiny2_content/icons/1426b518acd10943c31171c99222e6fd.png';
+
 const ArmorModSelector: React.FC<ModSelectorProps> = ({ selected, mods, onSelectMod }) => {
   return (
     <Box
@@ -20,9 +23,11 @@ const ArmorModSelector: React.FC<ModSelectorProps> = ({ selected, mods, onSelect
           <div
             key={mod.itemHash}
             className="submenu-item"
-            style={{ backgroundImage: `url(${mod.icon})` }}
+            style={{
+              backgroundImage: `url(${mod.isOwned ? mod.icon : lockedModIcon})`,
+            }}
             onClick={() => {
-              if (selected.itemHash !== mod.itemHash) {
+              if (selected.itemHash !== mod.itemHash && mod.isOwned) {
                 onSelectMod(mod);
               }
             }}

src/features/profile/destiny-profile.ts

@@ -7,17 +7,14 @@ import {
   PRIMARY_STATS,
   SOCKET_HASH,
   STAT_HASH,
-  SUBCLASS_PLUG_SETS,
 } from '../../lib/bungie_api/constants';
 import { getProfileDataRequest } from '../../lib/bungie_api/requests';
 import { db } from '../../store/db';
 import {
   Character,
   CharacterClass,
-  DamageType,
   DestinyArmor,
   Emblem,
-  Plug,
   ProfileData,
   Subclass,
 } from '../../types/d2l-types';
@@ -36,7 +33,6 @@ export async function getProfileData(): Promise<ProfileData> {
     const characterInventories = response.data.Response.characterInventories.data;
     const characterEquipment = response.data.Response.characterEquipment.data;
     const characterData = response.data.Response.characters.data;
-    const profilePlugSets = response.data.Response.profilePlugSets.data.plugs;
     const profileCollectibles = response.data.Response.profileCollectibles.data.collectibles;
 
     for (const key in characterData) {
@@ -313,16 +309,6 @@ export async function getProfileData(): Promise<ProfileData> {
         }
       }
 
-      // check character plugs for stasis grenade state
-      if (plugSets[SUBCLASS_PLUG_SETS.GRENADES.STASIS]) {
-        for (const plug of plugSets[SUBCLASS_PLUG_SETS.GRENADES.STASIS]) {
-          await db.manifestSubclassModDef
-            .where('itemHash')
-            .equals(plug.plugItemHash)
-            .modify({ isOwned: true });
-        }
-      }
-
       profile.characters.push(character);
     }
 
@@ -405,125 +391,41 @@ export async function getProfileData(): Promise<ProfileData> {
       }
     }
 
-    // iterate profile plugs
-    let abilityPlugSets: number[] = [
-      SUBCLASS_PLUG_SETS.FRAGMENTS.ARC,
-      SUBCLASS_PLUG_SETS.FRAGMENTS.SOLAR,
-      SUBCLASS_PLUG_SETS.FRAGMENTS.VOID,
-      SUBCLASS_PLUG_SETS.FRAGMENTS.STASIS,
-      SUBCLASS_PLUG_SETS.FRAGMENTS.STRAND,
-      SUBCLASS_PLUG_SETS.FRAGMENTS.PRISMATIC,
-
-      SUBCLASS_PLUG_SETS.GRENADES.ARC,
-      SUBCLASS_PLUG_SETS.GRENADES.SOLAR,
-      SUBCLASS_PLUG_SETS.GRENADES.VOID,
-      SUBCLASS_PLUG_SETS.GRENADES.STASIS,
-      SUBCLASS_PLUG_SETS.GRENADES.STRAND,
-      SUBCLASS_PLUG_SETS.GRENADES.PRISMATIC_HUNTER,
-      SUBCLASS_PLUG_SETS.GRENADES.PRISMATIC_WARLOCK,
-
-      SUBCLASS_PLUG_SETS.ASPECTS.HUNTER.ARC,
-      SUBCLASS_PLUG_SETS.ASPECTS.HUNTER.VOID,
-      SUBCLASS_PLUG_SETS.ASPECTS.HUNTER.SOLAR,
-      SUBCLASS_PLUG_SETS.ASPECTS.HUNTER.PRISMATIC,
-
-      SUBCLASS_PLUG_SETS.ASPECTS.TITAN.ARC,
-      SUBCLASS_PLUG_SETS.ASPECTS.TITAN.VOID,
-      SUBCLASS_PLUG_SETS.ASPECTS.TITAN.SOLAR,
-
-      SUBCLASS_PLUG_SETS.ASPECTS.WARLOCK.ARC,
-      SUBCLASS_PLUG_SETS.ASPECTS.WARLOCK.VOID,
-      SUBCLASS_PLUG_SETS.ASPECTS.WARLOCK.SOLAR,
-      SUBCLASS_PLUG_SETS.ASPECTS.WARLOCK.STASIS,
-      SUBCLASS_PLUG_SETS.ASPECTS.WARLOCK.STRAND,
-      SUBCLASS_PLUG_SETS.ASPECTS.WARLOCK.PRISMATIC,
-
-      SUBCLASS_PLUG_SETS.SUPERS.HUNTER.ARC,
-      SUBCLASS_PLUG_SETS.SUPERS.HUNTER.VOID,
-      SUBCLASS_PLUG_SETS.SUPERS.HUNTER.SOLAR,
-      SUBCLASS_PLUG_SETS.SUPERS.HUNTER.PRISMATIC,
-
-      SUBCLASS_PLUG_SETS.SUPERS.TITAN.ARC,
-      SUBCLASS_PLUG_SETS.SUPERS.TITAN.VOID,
-      SUBCLASS_PLUG_SETS.SUPERS.TITAN.SOLAR,
-
-      SUBCLASS_PLUG_SETS.SUPERS.WARLOCK.ARC,
-      SUBCLASS_PLUG_SETS.SUPERS.WARLOCK.VOID,
-      SUBCLASS_PLUG_SETS.SUPERS.WARLOCK.SOLAR,
-      SUBCLASS_PLUG_SETS.SUPERS.WARLOCK.STASIS,
-      SUBCLASS_PLUG_SETS.SUPERS.WARLOCK.STRAND,
-      SUBCLASS_PLUG_SETS.SUPERS.WARLOCK.PRISMATIC,
-
-      SUBCLASS_PLUG_SETS.MELEE_ABILITIES.HUNTER.ARC,
-      SUBCLASS_PLUG_SETS.MELEE_ABILITIES.HUNTER.VOID,
-      SUBCLASS_PLUG_SETS.MELEE_ABILITIES.HUNTER.SOLAR,
-      SUBCLASS_PLUG_SETS.MELEE_ABILITIES.HUNTER.PRISMATIC,
-
-      SUBCLASS_PLUG_SETS.MELEE_ABILITIES.TITAN.ARC,
-      SUBCLASS_PLUG_SETS.MELEE_ABILITIES.TITAN.VOID,
-      SUBCLASS_PLUG_SETS.MELEE_ABILITIES.TITAN.SOLAR,
-
-      SUBCLASS_PLUG_SETS.MELEE_ABILITIES.WARLOCK.ARC,
-      SUBCLASS_PLUG_SETS.MELEE_ABILITIES.WARLOCK.VOID,
-      SUBCLASS_PLUG_SETS.MELEE_ABILITIES.WARLOCK.SOLAR,
-      SUBCLASS_PLUG_SETS.MELEE_ABILITIES.WARLOCK.STASIS,
-      SUBCLASS_PLUG_SETS.MELEE_ABILITIES.WARLOCK.STRAND,
-      SUBCLASS_PLUG_SETS.MELEE_ABILITIES.WARLOCK.PRISMATIC,
-    ];
-
-    for (const key of abilityPlugSets) {
-      if (profilePlugSets[key]) {
-        for (const plug of profilePlugSets[key]) {
-          if (plug.enabled) {
-            await db.manifestSubclassModDef
-              .where('itemHash')
-              .equals(plug.plugItemHash)
-              .modify({ isOwned: true });
-
-            await db.manifestSubclassAspectsDef
-              .where('itemHash')
-              .equals(plug.plugItemHash)
-              .modify({ isOwned: true });
-
-            await db.manifestSubclassFragmentsDef
-              .where('itemHash')
-              .equals(plug.plugItemHash)
-              .modify({ isOwned: true });
-          }
-        }
-      }
-    }
-
     // iterate profile collectibles
     for (const collectible in profileCollectibles) {
       const exoticCollectable = await db.manifestExoticArmorCollection
         .where('collectibleHash')
         .equals(Number(collectible))
         .first();
 
-      if (
-        exoticCollectable &&
-        COLLECTIBLE_OWNED.includes(Number(profileCollectibles[collectible].state))
-      ) {
-        await db.manifestExoticArmorCollection
-          .where('collectibleHash')
-          .equals(Number(collectible))
-          .modify({ isOwned: true });
-      }
-
       const armorModDef = await db.manifestArmorModDef
         .where('collectibleHash')
         .equals(Number(collectible))
         .first();
 
-      if (
-        armorModDef &&
-        COLLECTIBLE_OWNED.includes(Number(profileCollectibles[collectible].state))
-      ) {
-        await db.manifestArmorModDef
-          .where('collectibleHash')
-          .equals(Number(collectible))
-          .modify({ isOwned: true });
+      const armorStatModDef = await db.manifestArmorStatModDef
+        .where('collectibleHash')
+        .equals(Number(collectible))
+        .first();
+
+      if (exoticCollectable) {
+        if (COLLECTIBLE_OWNED.includes(Number(profileCollectibles[collectible].state)))
+          await db.manifestExoticArmorCollection
+            .where('collectibleHash')
+            .equals(Number(collectible))
+            .modify({ isOwned: true });
+      } else if (armorModDef) {
+        if (!COLLECTIBLE_OWNED.includes(Number(profileCollectibles[collectible].state)))
+          await db.manifestArmorModDef
+            .where('collectibleHash')
+            .equals(Number(collectible))
+            .modify({ isOwned: false });
+      } else if (armorStatModDef) {
+        if (!COLLECTIBLE_OWNED.includes(Number(profileCollectibles[collectible].state)))
+          await db.manifestArmorStatModDef
+            .where('collectibleHash')
+            .equals(Number(collectible))
+            .modify({ isOwned: false });
       }
     }