Merge pull request #10543 from DestinyItemManager/sunset-sunset

Remove powerCap / sunset concept

config/i18n.json

@@ -97,6 +97,7 @@
     "VendorNotFound": "Vendor data is unavailable."
   },
   "Compare": {
+    "NoModArmor": "Pre-mods",
     "Button": "Compare",
     "Archetype": "Archetype",
     "ButtonHelp": "Compare Items",
@@ -232,6 +233,7 @@
     "CurrentClass": "Shows items that are equippable on the currently logged in guardian.",
     "DamageType": "Shows items based on their damage type.",
     "Deepsight": "Shows weapons with Deepsight Resonance, which can have their pattern extracted, or which can have Deepsight Resonance enabled using a Deepsight Harmonizer.",
+    "Deprecated": "This filter is no longer supported.",
     "Description": "Description",
     "DescriptionFilter": "Shows items whose description has a partial match to the filter text. Search for entire phrases using quotes.",
     "RetiredPerk": "Shows weapons with perks that no longer obtainable.",
@@ -264,7 +266,6 @@
     "Infusable": "Shows items that can be infused.",
     "IsAdept": "Shows weapons compatible with Adept mods.",
     "IsCrafted": "Shows weapons that have been crafted.",
-    "IsSunset": "Shows items that have been sunset and can no longer be infused to max power.",
     "ItemId": "Shows the item with the given inventory item ID. For advanced users.",
     "ItemHash": "Shows the items with the given inventory item hash. For advanced users.",
     "Leveling": {
@@ -301,7 +302,6 @@
     "PerkName": "Shows items with a perk or mod whose name matches (exactperk:) or partially matches (perkname:) the filter text. Search for entire phrases using quotes.",
     "Postmaster": "Items that are currently in the Postmaster.",
     "PowerLevel": "Shows items based on their power level. $t(Filter.PowerKeywords)",
-    "PowerLimit": "Shows items based on the maximum power level they can be infused to. $t(Filter.PowerKeywords)",
     "PowerKeywords": "Use the pinnaclecap or softcap keyword instead of a number to refer to the current season's power limits.",
     "PowerfulReward": "Shows pursuits which produce a powerful reward.",
     "PinnacleReward": "Shows pursuits which produce a pinnacle reward.",
@@ -1204,7 +1204,6 @@
     "SortByTag": "Tag ({{taglist}})",
     "SortByType": "Type",
     "SortBySeason": "Season (D2)",
-    "SortBySunset": "Has Been Sunset (D2)",
     "SortByWeaponElement": "Damage Type",
     "SortCustom": "Custom Sort",
     "SortName": "Name",
@@ -1264,7 +1263,6 @@
     "Prestige": "Prestige Level: {{level}}\n{{exp}}xp until 5 motes of light.",
     "Quality": "Stats quality",
     "Strength": "Strength",
-    "Sunset": "Sunset",
     "Tier": "Tier {{tier}}",
     "TierProgress": "T{{tier}} {{statName}} ({{progress}}/60 for T{{nextTier}})\n",
     "TierProgress_Max": "T{{tier}} {{statName}} ({{progress}}/300)\n",

src/app/compare/CompareSuggestions.tsx

@@ -55,9 +55,9 @@ export default memo(function CompareSuggestions({
         nextCompareButton?.items.some((nextSetItem) => nextSetItem === setItem),
       )
     ) {
-      // do include this button, if the next button is the "includes sunset items" button.
-      // that's a confusing label to users with no sunset items.
-      if (exampleItem.bucket.inArmor && !nextCompareButton?.query.includes('not:sunset')) {
+      // do include this button, if the next button is the "includes armor 2.0 items" button.
+      // that's a confusing label to users with no armor 2.0 items.
+      if (exampleItem.bucket.inArmor && !nextCompareButton?.query.includes('is:armor2.0')) {
         keptPenultimateButton = true;
         return true;
       }

src/app/compare/compare-buttons.tsx

@@ -36,15 +36,15 @@ export function findSimilarArmors(exampleItem: DimItem): CompareButton[] {
     {
       buttonLabel: [
         <ArmorSlotIcon key="slot" item={exampleItem} className={styles.svgIcon} />,
-        `+ ${t('Stats.Sunset')}`,
+        `+ ${t('Compare.NoModArmor')}`,
       ],
       query: '', // since we already filter by itemCategoryHash, an empty query gives you all items matching that category
     },
 
     // above but also has to be armor 2.0
     exampleItem.destinyVersion === 2 && {
       buttonLabel: [<ArmorSlotIcon key="slot" item={exampleItem} className={styles.svgIcon} />],
-      query: 'not:sunset',
+      query: 'is:armor2.0',
     },
 
     // above but also has to be legendary
@@ -54,7 +54,7 @@ export function findSimilarArmors(exampleItem: DimItem): CompareButton[] {
           <BungieImage key="rarity" src={rarityIcons.Legendary} />,
           <ArmorSlotIcon key="slot" item={exampleItem} className={styles.svgIcon} />,
         ],
-        query: 'not:sunset is:legendary',
+        query: 'is:armor2.0 is:legendary',
       },
 
     // above but also the same seasonal mod slot, if it has one
@@ -70,7 +70,7 @@ export function findSimilarArmors(exampleItem: DimItem): CompareButton[] {
           />,
           <ArmorSlotIcon key="slot" item={exampleItem} className={styles.svgIcon} />,
         ],
-        query: `not:sunset ${exampleItemModSlotMetadatas
+        query: `is:armor2.0 ${exampleItemModSlotMetadatas
           .map((m) => `modslot:${m.slotTag || 'none'}`)
           .join(' ')}`,
       },
@@ -84,7 +84,7 @@ export function findSimilarArmors(exampleItem: DimItem): CompareButton[] {
           </PressTip>,
           <ArmorSlotIcon key="slot" item={exampleItem} className={styles.svgIcon} />,
         ],
-        query: `not:sunset perk:${quoteFilterString(exampleItemIntrinsic.name)}`,
+        query: `is:armor2.0 perk:${quoteFilterString(exampleItemIntrinsic.name)}`,
       },
 
     // basically stuff with the same name & categories

src/app/destiny2/d2-definitions.ts

@@ -29,7 +29,6 @@ import {
   DestinyObjectiveDefinition,
   DestinyPlaceDefinition,
   DestinyPlugSetDefinition,
-  DestinyPowerCapDefinition,
   DestinyPresentationNodeDefinition,
   DestinyProgressionDefinition,
   DestinyRaceDefinition,
@@ -79,7 +78,6 @@ export const allTables: ManifestTablesShort[] = [
   'Record',
   'Metric',
   'Trait',
-  'PowerCap',
   'BreakerType',
   'EventCard',
   'LoadoutName',
@@ -138,7 +136,6 @@ export interface D2ManifestDefinitions {
   Record: DefinitionTable<DestinyRecordDefinition>;
   Metric: DefinitionTable<DestinyMetricDefinition>;
   Trait: DefinitionTable<DestinyTraitDefinition>;
-  PowerCap: DefinitionTable<DestinyPowerCapDefinition>;
   BreakerType: DefinitionTable<DestinyBreakerTypeDefinition>;
   DamageType: DefinitionTable<DestinyDamageTypeDefinition>;
   Collectible: DefinitionTable<DestinyCollectibleDefinition>;