Merge pull request #10713 from FlaminSarge/enhancement-tier

Add enhancementTier to craftedInfo and display it in weapon level bar

config/i18n.json

@@ -967,6 +967,7 @@
     "Consolidate": "Consolidate",
     "CommunityData": "Community Insight",
     "DistributeEvenly": "Distribute Evenly",
+    "EnhancementTier": "Tier {{tier}}",
     "Equip": "Equip on:",
     "EquipWithName": "Equip on {{character}}",
     "FavoriteUnFavorite": {

src/app/inventory/item-types.ts

@@ -267,6 +267,8 @@ export interface DimCrafted {
   progress: number;
   /** when this weapon was crafted, UTC epoch seconds timestamp */
   craftedDate: number;
+  /** the enhancement tier for this weapon, if enhanced. 0 otherwise. */
+  enhancementTier: number;
 }
 
 export interface DimCatalyst {

src/app/inventory/store/crafted.ts

@@ -1,6 +1,7 @@
 import { D2ManifestDefinitions } from 'app/destiny2/d2-definitions';
 import { warnLog } from 'app/utils/log';
 import { getFirstSocketByCategoryHash } from 'app/utils/socket-utils';
+import { HashLookup } from 'app/utils/util-types';
 import { DestinyObjectiveProgress, DestinyObjectiveUiStyle } from 'bungie-api-ts/destiny2';
 import { DimCrafted, DimItem, DimSocket } from '../item-types';
 
@@ -10,6 +11,14 @@ export const craftedSocketCategoryHash = 3583996951;
 /** the socket category containing the Mementos */
 export const mementoSocketCategoryHash = 3201856887;
 
+/** the socket containing the enhancement tier plugs */
+export const enhancementSocketHash = 4251072212;
+export const plugHashToEnhancementTier: HashLookup<number> = {
+  2728416798: 1,
+  2728416797: 2,
+  2728416796: 3,
+};
+
 export function buildCraftedInfo(
   item: DimItem,
   defs: D2ManifestDefinitions,
@@ -23,8 +32,12 @@ export function buildCraftedInfo(
   if (!objectives) {
     return undefined;
   }
-
-  return getCraftingInfo(defs, objectives);
+  const craftingInfo = getCraftingInfo(defs, objectives);
+  if (!craftingInfo) {
+    return undefined;
+  }
+  craftingInfo.enhancementTier = getEnhancementTier(item);
+  return craftingInfo;
 }
 
 /** find the item socket that could contain the "this weapon was crafted" plug with its objectives */
@@ -34,6 +47,16 @@ export function getCraftedSocket(item: DimItem): DimSocket | undefined {
   }
 }
 
+export function getEnhancementTier(item: DimItem): number {
+  if (item.bucket.inWeapons && item.sockets) {
+    const plugHash = item.sockets.allSockets.find(
+      (s) => s.socketDefinition.socketTypeHash === enhancementSocketHash,
+    )?.plugged?.plugDef.hash;
+    return (plugHash && plugHashToEnhancementTier[plugHash]) || 0;
+  }
+  return 0;
+}
+
 function getCraftingInfo(
   defs: D2ManifestDefinitions,
   objectives: DestinyObjectiveProgress[],
@@ -64,5 +87,5 @@ function getCraftingInfo(
     return undefined;
   }
 
-  return { level, progress, craftedDate };
+  return { level, progress, craftedDate, enhancementTier: 0 };
 }

src/app/item-popup/WeaponCraftedInfo.tsx

@@ -29,6 +29,8 @@ export function WeaponCraftedInfo({ item, className }: { item: DimItem; classNam
       <div className="objective-progress">
         <div className="objective-progress-bar" style={progressBarStyle} />
         <div className="objective-description">
+          {item.craftedInfo?.enhancementTier > 0 &&
+            `${t('MovePopup.EnhancementTier', { tier: item.craftedInfo?.enhancementTier })} - `}
           {t('MovePopup.WeaponLevel', { level: item.craftedInfo.level })}
         </div>
         <div className="objective-text">{percentWithSingleDecimal(progress)}</div>