Feature/fragment selection

src/app/components/authenticated-v2/results/expanded-result-content/expanded-result-content.component.html

@@ -247,57 +247,75 @@
           src="https://www.bungie.net/common/destiny2_content/icons/ea5af04ccd6a3470a44fd7bb0f66e2f7.png" />
       </td>
     </tr>
-    <!-- Config Mods -->
-    <tr class="result-config">
-      <td>Configuration</td>
-      <td
-        ><span
-          *ngIf="this.configValues[ArmorStat.Mobility] !== 0"
-          [class]="this.configValues[ArmorStat.Mobility] > 0 ? 'positive' : 'negative'">
-          <span *ngIf="this.configValues[ArmorStat.Mobility] > 0">+</span
-          >{{ this.configValues[ArmorStat.Mobility] }}
-        </span></td
-      >
-      <td
-        ><span
-          *ngIf="this.configValues[ArmorStat.Resilience] !== 0"
-          [class]="this.configValues[ArmorStat.Resilience] > 0 ? 'positive' : 'negative'">
-          <span *ngIf="this.configValues[ArmorStat.Resilience] > 0">+</span
-          >{{ this.configValues[ArmorStat.Resilience] }}
-        </span></td
-      >
-      <td
-        ><span
-          *ngIf="this.configValues[ArmorStat.Recovery] !== 0"
-          [class]="this.configValues[ArmorStat.Recovery] > 0 ? 'positive' : 'negative'">
-          <span *ngIf="this.configValues[ArmorStat.Recovery] > 0">+</span
-          >{{ this.configValues[ArmorStat.Recovery] }}
-        </span></td
-      >
-      <td
-        ><span
-          *ngIf="this.configValues[ArmorStat.Discipline] !== 0"
-          [class]="this.configValues[ArmorStat.Discipline] > 0 ? 'positive' : 'negative'">
-          <span *ngIf="this.configValues[ArmorStat.Discipline] > 0">+</span
-          >{{ this.configValues[ArmorStat.Discipline] }}
-        </span></td
-      >
-      <td
-        ><span
-          *ngIf="this.configValues[ArmorStat.Intellect] !== 0"
-          [class]="this.configValues[ArmorStat.Intellect] > 0 ? 'positive' : 'negative'">
-          <span *ngIf="this.configValues[ArmorStat.Intellect] > 0">+</span
-          >{{ this.configValues[ArmorStat.Intellect] }}
-        </span></td
-      >
-      <td
-        ><span
-          *ngIf="this.configValues[ArmorStat.Strength] !== 0"
-          [class]="this.configValues[ArmorStat.Strength] > 0 ? 'positive' : 'negative'">
-          <span *ngIf="this.configValues[ArmorStat.Strength] > 0">+</span
-          >{{ this.configValues[ArmorStat.Strength] }}
-        </span></td
-      >
+
+    <!-- ALTERNATIVE: each fragment -->
+    <tr class="result-frags" *ngFor="let fragment of getAllEnabledModsAndFragments()">
+      <ng-container
+        *ngVar="
+          calculateStatValuesFromFragmentsAndMods(
+            [fragment],
+            config_characterClass
+          ) as fragmentValues
+        ">
+        <td>
+          {{ ModInformation[fragment].name }}
+        </td>
+        <td
+          ><span
+            *ngIf="fragmentValues[ArmorStat.Mobility] !== 0"
+            [class]="fragmentValues[ArmorStat.Mobility] > 0 ? 'positive' : 'negative'">
+            <span *ngIf="fragmentValues[ArmorStat.Mobility] > 0">+</span
+            >{{ fragmentValues[ArmorStat.Mobility] }}
+          </span></td
+        >
+        <td
+          ><span
+            *ngIf="fragmentValues[ArmorStat.Resilience] !== 0"
+            [class]="fragmentValues[ArmorStat.Resilience] > 0 ? 'positive' : 'negative'">
+            <span *ngIf="fragmentValues[ArmorStat.Resilience] > 0">+</span
+            >{{ fragmentValues[ArmorStat.Resilience] }}
+          </span></td
+        >
+        <td
+          ><span
+            *ngIf="fragmentValues[ArmorStat.Recovery] !== 0"
+            [class]="fragmentValues[ArmorStat.Recovery] > 0 ? 'positive' : 'negative'">
+            <span *ngIf="fragmentValues[ArmorStat.Recovery] > 0">+</span
+            >{{ fragmentValues[ArmorStat.Recovery] }}
+          </span></td
+        >
+        <td
+          ><span
+            *ngIf="fragmentValues[ArmorStat.Discipline] !== 0"
+            [class]="fragmentValues[ArmorStat.Discipline] > 0 ? 'positive' : 'negative'">
+            <span *ngIf="fragmentValues[ArmorStat.Discipline] > 0">+</span
+            >{{ fragmentValues[ArmorStat.Discipline] }}
+          </span></td
+        >
+        <td
+          ><span
+            *ngIf="fragmentValues[ArmorStat.Intellect] !== 0"
+            [class]="fragmentValues[ArmorStat.Intellect] > 0 ? 'positive' : 'negative'">
+            <span *ngIf="fragmentValues[ArmorStat.Intellect] > 0">+</span
+            >{{ fragmentValues[ArmorStat.Intellect] }}
+          </span></td
+        >
+        <td
+          ><span
+            *ngIf="fragmentValues[ArmorStat.Strength] !== 0"
+            [class]="fragmentValues[ArmorStat.Strength] > 0 ? 'positive' : 'negative'">
+            <span *ngIf="fragmentValues[ArmorStat.Strength] > 0">+</span
+            >{{ fragmentValues[ArmorStat.Strength] }}
+          </span></td
+        >
+        <td class="icon-column">
+          <!-- Item Icon -->
+          <div class="item-icon-container">
+            <app-item-icon [itemHash]="ModInformation[fragment].hash" class="item-icon">
+            </app-item-icon>
+          </div>
+        </td>
+      </ng-container>
     </tr>
     <!-- +5 Mods -->
     <tr *ngVar="element?.mods as mods" class="highlight-row">

src/app/components/authenticated-v2/results/expanded-result-content/expanded-result-content.component.ts

@@ -70,9 +70,9 @@ export class ExpandedResultContentComponent implements OnInit, OnDestroy {
   public config_assumeLegendariesMasterworked = false;
   public config_assumeExoticsMasterworked = false;
   public config_assumeClassItemMasterworked = false;
+  public config_automaticallySelectFragments = false;
   public config_enabledMods: ModOrAbility[] = [];
   public DIMUrl: string = "";
-  configValues: [number, number, number, number, number, number] = [0, 0, 0, 0, 0, 0];
 
   @Input()
   element: ResultDefinition | null = null;
@@ -84,6 +84,25 @@ export class ExpandedResultContentComponent implements OnInit, OnDestroy {
     private membership: MembershipService
   ) {}
 
+  calculateStatValuesFromFragmentsAndMods(
+    m: ModOrAbility[],
+    cls: DestinyClass
+  ): [number, number, number, number, number, number] {
+    return m
+      .reduce((p, v) => {
+        p = p.concat(ModInformation[v].bonus);
+        return p;
+      }, [] as ModifierValue[])
+      .reduce(
+        (p, v) => {
+          if (v.stat == SpecialArmorStat.ClassAbilityRegenerationStat) p[[1, 0, 2][cls]] += v.value;
+          else p[v.stat as number] += v.value;
+          return p;
+        },
+        [0, 0, 0, 0, 0, 0]
+      );
+  }
+
   public buildItemIdString(element: ResultDefinition | null) {
     if (!element) return "";
     let result = element.items
@@ -133,20 +152,7 @@ export class ExpandedResultContentComponent implements OnInit, OnDestroy {
       this.config_assumeExoticsMasterworked = c.assumeExoticsMasterworked;
       this.config_assumeClassItemMasterworked = c.assumeClassItemMasterworked;
       this.config_enabledMods = c.enabledMods;
-      this.configValues = c.enabledMods
-        .reduce((p, v) => {
-          p = p.concat(ModInformation[v].bonus);
-          return p;
-        }, [] as ModifierValue[])
-        .reduce(
-          (p, v) => {
-            if (v.stat == SpecialArmorStat.ClassAbilityRegenerationStat)
-              p[[1, 0, 2][c.characterClass]] += v.value;
-            else p[v.stat as number] += v.value;
-            return p;
-          },
-          [0, 0, 0, 0, 0, 0]
-        );
+      this.config_automaticallySelectFragments = c.automaticallySelectFragments;
 
       this.DIMUrl = this.generateDIMLink(c);
     });
@@ -244,12 +250,16 @@ export class ExpandedResultContentComponent implements OnInit, OnDestroy {
     return cost;
   }
 
+  getAllEnabledModsAndFragments() {
+    return this.config_enabledMods.concat(this.element?.additionalFragments || []);
+  }
+
   generateDIMLink(c: BuildConfiguration): string {
     const mods: number[] = [];
     const fragments: number[] = [];
 
     // add selected mods
-    for (let mod of this.config_enabledMods) {
+    for (let mod of this.getAllEnabledModsAndFragments()) {
       const modInfo = ModInformation[mod];
       if (modInfo.type === ModifierType.CombatStyleMod) {
         mods.push(modInfo.hash);
@@ -324,7 +334,8 @@ export class ExpandedResultContentComponent implements OnInit, OnDestroy {
 
       if (
         c.characterClass != DestinyClass.Unknown &&
-        c.selectedModElement != ModifierType.CombatStyleMod
+        c.selectedModElement != ModifierType.CombatStyleMod &&
+        c.selectedModElement != ModifierType.AnySubclass
       ) {
         const cl = SubclassHashes[c.characterClass];
         const subclassHash = cl[c.selectedModElement];
@@ -354,7 +365,11 @@ export class ExpandedResultContentComponent implements OnInit, OnDestroy {
   }
 
   getColumnForStat(statId: number) {
-    var configValueTiers = Math.floor(this.configValues[statId] / 10);
+    const configValues = this.calculateStatValuesFromFragmentsAndMods(
+      this.getAllEnabledModsAndFragments(),
+      this.config_characterClass
+    );
+    var configValueTiers = Math.floor(configValues[statId] / 10);
     let d = [];
     let total = 0;
 

src/app/components/authenticated-v2/results/results.component.html

@@ -166,6 +166,19 @@
             <mat-icon inline style="height: 100%">report_problem</mat-icon>
           </mat-chip>
 
+          <mat-chip
+            #tooltip="matTooltip"
+            *ngIf="_config_automaticallySelectFragments"
+            disableRipple
+            color="warn"
+            selected
+            matTooltip="This setting enforces that all exotics are ignored.">
+            <mat-icon inline style="height: 100%">report_problem</mat-icon>
+            &nbsp;Automatically add up to
+            {{ _config_maximumAutoSelectableFragments }} fragments&nbsp;
+            <mat-icon inline style="height: 100%">report_problem</mat-icon>
+          </mat-chip>
+
           <mat-chip
             #tooltip="matTooltip"
             *ngIf="_config_onlyUseMasterworkedExotics"

src/app/components/authenticated-v2/results/results.component.ts

@@ -30,6 +30,8 @@ import { FixableSelection } from "../../../data/buildConfiguration";
 import { Subject } from "rxjs";
 import { takeUntil } from "rxjs/operators";
 import { InventoryArmorSource } from "src/app/data/types/IInventoryArmor";
+import { MaximumFragmentsPerClass } from "src/app/data/ModInformation";
+import { ModOrAbility } from "src/app/data/enum/modOrAbility";
 
 export interface ResultDefinition {
   exotic:
@@ -46,6 +48,7 @@ export interface ResultDefinition {
     perk: ArmorPerkOrSlot;
   };
   mods: number[];
+  additionalFragments: ModOrAbility[];
   stats: number[];
   statsNoMods: number[];
   items: ResultItem[][];
@@ -105,6 +108,8 @@ export class ResultsComponent implements OnInit, OnDestroy {
   _config_assumeExoticsMasterworked: Boolean = false;
   _config_assumeClassItemMasterworked: Boolean = false;
 
+  _config_automaticallySelectFragments: boolean = false;
+  _config_maximumAutoSelectableFragments: number = 0;
   _config_maximumStatMods: number = 5;
   _config_selectedExotics: number[] = [];
   _config_tryLimitWastedStats: boolean = false;
@@ -157,6 +162,15 @@ export class ResultsComponent implements OnInit, OnDestroy {
       this._config_assumeClassItemMasterworked = c.assumeClassItemMasterworked;
       this._config_tryLimitWastedStats = c.tryLimitWastedStats;
 
+      this._config_maximumAutoSelectableFragments = Math.min(
+        c.maximumAutoSelectableFragments,
+        Math.max(
+          0,
+          MaximumFragmentsPerClass[c.characterClass][c.selectedModElement] - c.enabledMods.length
+        )
+      );
+      this._config_automaticallySelectFragments =
+        this._config_maximumAutoSelectableFragments > 0 && c.automaticallySelectFragments;
       this._config_maximumStatMods = c.maximumStatMods;
       this._config_onlyUseMasterworkedExotics = c.onlyUseMasterworkedExotics;
       this._config_onlyUseMasterworkedLegendaries = c.onlyUseMasterworkedLegendaries;
@@ -206,33 +220,43 @@ export class ResultsComponent implements OnInit, OnDestroy {
     this.tableDataSource.paginator = this.paginator;
     this.tableDataSource.sort = this.sort;
     this.tableDataSource.sortingDataAccessor = (data, sortHeaderId) => {
+      let value = 0;
       switch (sortHeaderId) {
         case "Mobility":
-          return data.stats[ArmorStat.Mobility];
+          value = data.stats[ArmorStat.Mobility];
+          break;
         case "Resilience":
-          return data.stats[ArmorStat.Resilience];
+          value = data.stats[ArmorStat.Resilience];
+          break;
         case "Recovery":
-          return data.stats[ArmorStat.Recovery];
+          value = data.stats[ArmorStat.Recovery];
+          break;
         case "Discipline":
-          return data.stats[ArmorStat.Discipline];
+          value = data.stats[ArmorStat.Discipline];
+          break;
         case "Intellect":
-          return data.stats[ArmorStat.Intellect];
+          value = data.stats[ArmorStat.Intellect];
+          break;
         case "Strength":
-          return data.stats[ArmorStat.Strength];
+          value = data.stats[ArmorStat.Strength];
+          break;
         case "Tiers":
-          return data.tiers;
+          value = data.tiers;
+          break;
         case "Max Tiers":
-          return 10 * (data.tiers + (5 - data.modCount));
+          value = 10 * (data.tiers + (5 - data.modCount));
+          break;
         case "Waste":
-          return data.waste;
+          value = data.waste;
+          break;
         case "Mods":
-          return (
-            +100 * data.modCount +
-            //+ 40 * data.artifice.length
-            data.modCost
-          );
+          value = +100 * data.modCount + data.modCost;
       }
-      return 0;
+
+      // subtract the count of additional used fragments divided by 10
+      value += data.additionalFragments.length / 6;
+
+      return value;
     };
   }
 
@@ -263,9 +287,11 @@ export class ResultsComponent implements OnInit, OnDestroy {
       config: this.config.readonlyConfigurationSnapshot,
       results: this._results.map((r) => {
         let p = Object.assign({}, r);
-        p.items = p.items.map((i) => {
-          return { hash: i[0].hash, instance: i[0].itemInstanceId } as any;
-        });
+        p.items = p.items
+          .filter((i) => !!i[0])
+          .map((i) => {
+            return { hash: i[0].hash, instance: i[0].itemInstanceId } as any;
+          });
         delete p.exotic;
         return p;
       }),

src/app/components/authenticated-v2/settings/advanced-settings/advanced-settings.component.html

@@ -44,6 +44,16 @@
       #tooltip="matTooltip">
       report_problem
     </mat-icon>
+    <mat-icon
+      inline
+      aria-hidden="false"
+      aria-label="Help"
+      *ngIf="f.featureInDevelopment"
+      class="indevelopment-icon"
+      matTooltip="This setting is currently in development and may not work as expected. Report bugs if possible."
+      #tooltip="matTooltip">
+      developer_board
+    </mat-icon>
   </div>
   <div class="category-spacer"></div>
 </div>

src/app/components/authenticated-v2/settings/advanced-settings/advanced-settings.component.scss

@@ -30,3 +30,7 @@
 .report-problem-icon {
   color: lightcoral;
 }
+
+.indevelopment-icon {
+  color: rgb(128, 240, 221);
+}