Merge pull request #10731 from DestinyItemManager/breakerama

Add breaker:intrinsic search and visually differentiate artifact-granted breaker

config/i18n.json

@@ -213,7 +213,7 @@
  "ArmorIntrinsic": "Shows legendary armor which has an intrinsic perk, such as Artifice Armor.",
  "Ascended": "Shows items that have an ascend node which have been ascended.",
  "Unascended": "Shows items that have an ascend node which have not been ascended.",
- "Breaker": "Filter by breaker type or corresponding champion type.",
+ "Breaker": "Filter by breaker type or corresponding champion type. breaker:instrinsic shows items with intrinsic breaker ability.",
  "BulkClear": "Removed tag from 1 item.",
  "BulkClear_plural": "Removed tags from {{count}} items.",
  "BulkRevert": "Reverted tag on 1 item.",

docs/CHANGELOG.md

@@ -1,5 +1,8 @@
 ## Next
 
+* Add `breaker:intrinsic` search that highlights items that have an intrinsic breaker ability (i.e. not granted by the seasonal artifact).
+* Breaker type granted by the seasonal artifact now has a green box around it, reminiscent of the artifact mod that grants it.
+
 ## 8.38.0 <span class="changelog-date">(2024-09-22)</span>
 
 * Renamed `is:class` to `is:subclass`.

src/app/armory/Armory.tsx

@@ -14,6 +14,7 @@ import {
  useSocketOverrides,
 } from 'app/inventory/store/override-sockets';
 import { getEvent, getSeason } from 'app/inventory/store/season';
+import BreakerType from 'app/item-popup/BreakerType';
 import EmblemPreview from 'app/item-popup/EmblemPreview';
 import { AmmoIcon, ItemTypeName } from 'app/item-popup/ItemPopupHeader';
 import ItemSockets from 'app/item-popup/ItemSockets';
@@ -26,7 +27,7 @@ import { Reward } from 'app/progress/Reward';
 import { AppIcon, compareIcon } from 'app/shell/icons';
 import { useIsPhonePortrait } from 'app/shell/selectors';
 import { useThunkDispatch } from 'app/store/thunk-dispatch';
-import { getBreakerTypeHash, getItemYear } from 'app/utils/item-utils';
+import { getItemYear } from 'app/utils/item-utils';
 import clsx from 'clsx';
 import { D2EventInfo } from 'data/d2/d2-event-info-v2';
 import { ItemCategoryHashes } from 'data/d2/generated-enums';
@@ -91,14 +92,6 @@ export default function Armory({
  const screenshot = ornamentSocket?.plugged?.plugDef.screenshot || itemDef.screenshot;
  const flavorText = itemDef.flavorText || itemDef.displaySource;
 
- let breakerType = item.breakerType;
- if (!breakerType) {
- const breakerTypeHash = getBreakerTypeHash(item);
- if (breakerTypeHash) {
- breakerType = defs.BreakerType.get(breakerTypeHash);
- }
- }
-
  // TODO: Show Catalyst benefits for exotics
 
  return (
@@ -123,7 +116,7 @@ export default function Armory({
  <div className={styles.headerContent}>
  <div className={styles.subtitle}>
  <ElementIcon element={item.element} className={styles.element} />
- {breakerType && <BungieImage src={breakerType.displayProperties.icon} height={15} />}
+ <BreakerType item={item} />
  {item.destinyVersion === 2 && item.ammoType > 0 && <AmmoIcon type={item.ammoType} />}
  <ItemTypeName item={item} />
  {item.pursuit?.questLine && (

src/app/item-popup/BreakerType.m.scss

@@ -0,0 +1,11 @@
+.breakerIcon {
+ margin: 0 4px;
+ width: 15px;
+ height: 15px;
+}
+
+.artifactBreaker {
+ background-color: #3f8e90;
+ padding: 1px 2px;
+ border-radius: 1px;
+}

src/app/item-popup/BreakerType.tsx

@@ -0,0 +1,28 @@
+import BungieImage from 'app/dim-ui/BungieImage';
+import { DimItem } from 'app/inventory/item-types';
+import { useD2Definitions } from 'app/manifest/selectors';
+import { getSeasonalBreakerTypeHash } from 'app/utils/item-utils';
+import clsx from 'clsx';
+import styles from './BreakerType.m.scss';
+
+export default function BreakerType({ item }: { item: DimItem }) {
+ const defs = useD2Definitions()!;
+ let breakerType = item.breakerType;
+ let breakerClass: string | undefined;
+ if (!breakerType) {
+ const breakerTypeHash = getSeasonalBreakerTypeHash(item);
+ if (breakerTypeHash) {
+ breakerType = defs.BreakerType.get(breakerTypeHash);
+ breakerClass = styles.artifactBreaker;
+ }
+ }
+
+ return (
+ breakerType && (
+ <BungieImage
+ className={clsx(styles.breakerIcon, breakerClass)}
+ src={breakerType.displayProperties.icon}
+ />
+ )
+ );
+}

src/app/item-popup/ItemPopupHeader.m.scss

@@ -69,12 +69,6 @@
  }
 }
 
-.breakerIcon {
- margin: 0 4px;
- width: 15px;
- height: 15px;
-}
-
 .ammoIcon {
  margin: 0 2px 0 6px;
  height: 14px;
@@ -135,10 +129,6 @@
 
 .legendary {
  background-color: $legendary;
- .primary,
- .breakerIcon {
- opacity: 0.8;
- }
 }
 
 .exotic {

src/app/item-popup/ItemPopupHeader.tsx

@@ -1,13 +1,10 @@
 import ArmorySheet from 'app/armory/ArmorySheet';
-import BungieImage from 'app/dim-ui/BungieImage';
 import ElementIcon from 'app/dim-ui/ElementIcon';
 import RichDestinyText from 'app/dim-ui/destiny-symbols/RichDestinyText';
 import { useHotkey } from 'app/hotkeys/useHotkey';
 import { t } from 'app/i18next-t';
-import { useD2Definitions } from 'app/manifest/selectors';
 import { D1BucketHashes } from 'app/search/d1-known-values';
 import type { ItemTierName } from 'app/search/d2-known-values';
-import { getBreakerTypeHash } from 'app/utils/item-utils';
 import { LookupTable } from 'app/utils/util-types';
 import { DestinyAmmunitionType, DestinyClass } from 'bungie-api-ts/destiny2';
 import clsx from 'clsx';
@@ -17,6 +14,7 @@ import primary from 'destiny-icons/general/ammo-primary.svg';
 import special from 'destiny-icons/general/ammo-special.svg';
 import { useState } from 'react';
 import { DimItem } from '../inventory/item-types';
+import BreakerType from './BreakerType';
 import styles from './ItemPopupHeader.m.scss';
 
 const tierClassName: LookupTable<ItemTierName, string> = {
@@ -35,22 +33,13 @@ export default function ItemPopupHeader({
  /** Don't allow opening Armory from the header link */
  noLink?: boolean;
 }) {
- const defs = useD2Definitions()!;
  const [showArmory, setShowArmory] = useState(false);
  useHotkey('a', t('Hotkey.Armory'), () => setShowArmory(true));
 
  const showElementIcon = Boolean(item.element);
 
  const linkToArmory = !noLink && item.destinyVersion === 2;
 
- let breakerType = item.breakerType;
- if (!breakerType) {
- const breakerTypeHash = getBreakerTypeHash(item);
- if (breakerTypeHash) {
- breakerType = defs.BreakerType.get(breakerTypeHash);
- }
- }
-
  return (
  <button
  type="button"
@@ -75,9 +64,7 @@ export default function ItemPopupHeader({
  <div className={styles.type}>
  <ItemTypeName item={item} className={styles.itemType} />
  {item.destinyVersion === 2 && item.ammoType > 0 && <AmmoIcon type={item.ammoType} />}
- {breakerType && (
- <BungieImage className={styles.breakerIcon} src={breakerType.displayProperties.icon} />
- )}
+ <BreakerType item={item} />
  </div>
 
  <div className={styles.details}>

src/app/search/items/search-filters/known-values.ts

@@ -320,9 +320,12 @@ const knownValuesFilters: ItemFilterDefinition[] = [
  keywords: 'breaker',
  description: tl('Filter.Breaker'),
  format: 'query',
- suggestions: Object.keys(breakerTypes),
+ suggestions: [...Object.keys(breakerTypes), 'intrinsic'],
  destinyVersion: 2,
  filter: ({ filterValue }) => {
+ if (filterValue === 'intrinsic') {
+ return (item) => Boolean(item.breakerType);
+ }
  const breakerType = breakerTypes[filterValue as keyof typeof breakerTypes];
  if (!breakerType) {
  throw new Error(`Unknown breaker type ${filterValue}`);

src/app/utils/item-utils.ts

@@ -352,17 +352,13 @@ const ichToBreakerType = Object.entries(artifactBreakerMods).reduce<
 }, {});
 
 /**
- * Get the effective breaker type of a weapon, which is either its intrinsic
- * breaker type (for some exotics) or one of the breaker types enabled by this
- * season's artifact mods.
+ * Get the effective breaker type of a weapon as granted by the seasonal
+ * artifact. This does not include intrinsic breaker types (e.g. on some
+ * exotics) so you should check item.breakerType first if you want the effective
+ * overall breaker type, as intrinsic breaker beats artifact breaker.
  */
-export function getBreakerTypeHash(item: DimItem): number | undefined {
- if (item.destinyVersion === 1) {
- return;
- }
- if (item.breakerType) {
- return item.breakerType.hash;
- } else if (item.bucket.inWeapons) {
+export function getSeasonalBreakerTypeHash(item: DimItem): number | undefined {
+ if (item.destinyVersion === 2 && item.bucket.inWeapons && !item.breakerType) {
  for (const ich of item.itemCategoryHashes) {
  if (ichToBreakerType[ich]) {
  return ichToBreakerType[ich];

src/locale/en.json

@@ -201,7 +201,7 @@
  "ArmorCategory": "Shows armors based on their category.",
  "ArmorIntrinsic": "Shows legendary armor which has an intrinsic perk, such as Artifice Armor.",
  "Ascended": "Shows items that have an ascend node which have been ascended.",
- "Breaker": "Filter by breaker type or corresponding champion type.",
+ "Breaker": "Filter by breaker type or corresponding champion type. breaker:instrinsic shows items with intrinsic breaker ability.",
  "BulkClear": "Removed tag from 1 item.",
  "BulkClear_plural": "Removed tags from {{count}} items.",
  "BulkRevert": "Reverted tag on 1 item.",