dungeon reward fixes

Author: giniedp

apps/web/app/pages/misc/about/about.component.ts

@@ -21,8 +21,7 @@ export class AboutComponent implements OnInit {
     if (APP_CONFIG.isPTR) {
       return `Public Test Realm ${version}`
     }
-    return '1.6.6'
-    // return APP_CONFIG.version.split('-')[0]
+    return APP_CONFIG.version.split('-')[0]
   }
 
   constructor() {}

apps/web/app/pages/tools/dungeons/dungeon-detail.component.ts

@@ -118,21 +118,28 @@ export class DungeonDetailComponent implements OnInit {
       difficulty: this.difficulty$,
       events: this.nw.db.gameEventsMap,
       items: this.nw.db.itemsMap,
+      loot: this.nw.db.lootTablesMap
     })
   ).pipe(
-    map(({ rank, difficulty, events, items }) => {
+    map(({ rank, difficulty, events, items, loot }) => {
+
       if (!difficulty) {
         return []
       }
 
       return [
-        { eventId: difficulty.CompletionEvent1, rankId: 'bronze' as DifficultyRank },
-        { eventId: difficulty.CompletionEvent2, rankId: 'silver' as DifficultyRank },
-        { eventId: difficulty.CompletionEvent3, rankId: 'gold' as DifficultyRank },
+        { eventId: difficulty.CompletionEvent1, rankPos: 1, rankId: 'bronze' as DifficultyRank },
+        { eventId: difficulty.CompletionEvent2, rankPos: 2, rankId: 'silver' as DifficultyRank },
+        { eventId: difficulty.CompletionEvent3, rankPos: 3, rankId: 'gold' as DifficultyRank },
       ]
-        .map(({ eventId, rankId }, i) => {
+        .map(({ eventId, rankPos, rankId }, i) => {
+          // TODO: cleanup
           const event = events.get(eventId)
-          const item = items.get(event.ItemReward as string)
+          const bucket = loot.get(`Loot_MutDiff${difficulty.MutationDifficulty}T${rankPos}`)
+          const bucketItem = bucket.Items?.[0]
+          const itemId = bucketItem?.ItemID
+          const item = items.get(itemId)
+
           if (!item) {
             return null
           }
@@ -141,7 +148,7 @@ export class DungeonDetailComponent implements OnInit {
             ItemID: item.ItemID,
             ItemName: item.Name,
             IconPath: getItemIconPath(item),
-            Quantity: event.ItemRewardQty,
+            Quantity: bucketItem?.Qty || '?',
             Completed: rankId == rank,
             toggle: () => {
               if (rankId == rank) {

apps/web/app/pages/tools/dungeons/dungeons.service.ts

@@ -1,7 +1,7 @@
 import { Injectable } from '@angular/core'
 import { GameEvent, Gamemodes, Housingitems, ItemDefinitionMaster, Mutationdifficulty } from '@nw-data/types'
 import { uniq } from 'lodash'
-import { combineLatest, defer, isObservable, map, Observable, of, switchMap } from 'rxjs'
+import { combineLatest, defer, isObservable, map, Observable, of, switchMap, tap } from 'rxjs'
 import { NwLootbucketService, NwService } from '~/nw'
 import { getVitalDungeon } from '~/nw/utils'
 import { DungeonPreferencesService } from '~/preferences'

apps/web/app/widgets/item-detail/item-detail-header.component.html

@@ -7,15 +7,18 @@
   </a>
   <aside class="flex-1 flex flex-col justify-between">
     <div class="flex flex-row justify-between">
-      <h3 class="font-bold text-rarity-{{vm.rarity}}" [nwText]="vm.name"></h3>
+      <h3 class="font-bold text-rarity-{{vm.rarity}} leading-4 mt-1" [nwText]="vm.name"></h3>
       <div class="flex flex-col items-end">
         <nwb-item-marker [itemId]="vm.entityId" *ngIf="showMarker$ | async" class="text-right"></nwb-item-marker>
         <nwb-gs-tracker [itemId]="vm.entityId" *ngIf="showGsMarker$ | async" class="text-right mt-1 tooltip-left" [emptyTip]="'Track Gear Score'"></nwb-gs-tracker>
       </div>
     </div>
-    <div class="flex flex-row justify-between gap-2">
-      <span [nwText]="vm.typeName"></span>
-      <span class="font-bold text-rarity-{{vm.rarity}}" [nwText]="vm.rarityName"></span>
+    <div>
+      <div *ngIf="vm.sourceLabel" class="text-xs" [class.text-error]="vm.isDeprecated">{{ vm.sourceLabel }}</div>
+      <div class="flex flex-row justify-between gap-2">
+        <span [nwText]="vm.typeName"></span>
+        <span class="font-bold text-rarity-{{vm.rarity}}" [nwText]="vm.rarityName"></span>
+      </div>
     </div>
   </aside>
 </ng-container>

apps/web/app/widgets/item-detail/item-detail-header.component.ts

@@ -26,6 +26,7 @@ export class ItemDetailHeaderComponent {
   }
 
   protected name$ = this.detail.name$
+  protected source$ = this.detail.source$
   protected rarity$ = this.detail.rarity$
   protected rarityName$ = this.detail.rarityName$
   protected tier$ = this.detail.tierLabel$

apps/web/app/widgets/item-detail/item-detail.service.ts

@@ -17,7 +17,7 @@ import {
   hasPerkInherentAffix,
   getItemTierAsRoman,
 } from '~/nw/utils'
-import { deferStateFlat, shareReplayRefCount } from '~/utils'
+import { deferStateFlat, humanize, shareReplayRefCount } from '~/utils'
 
 function isTruthy(value: any) {
   return !!value
@@ -59,6 +59,7 @@ export class ItemDetailService {
   public readonly itemStatsRef$ = this.item$.pipe(map((it) => it?.ItemStatsRef))
   public readonly entityId$ = new ReplaySubject<string>(1)
   public readonly name$ = this.entity$.pipe(map((it) => it?.Name))
+  public readonly source$ = this.entity$.pipe(map((it) => it?.['$source']))
   public readonly description$ = this.entity$.pipe(map((it) => it?.Description))
   public readonly icon$ = this.entity$.pipe(map((it) => getItemIconPath(it)))
   public readonly rarity$ = this.entity$.pipe(map((it) => getItemRarity(it)))
@@ -87,6 +88,8 @@ export class ItemDetailService {
       entity: this.entity$,
       entityId: this.entityId$,
       name: this.name$,
+      sourceLabel: this.source$.pipe(map((it) => humanize(it))),
+      isDeprecated: this.source$.pipe(map((it) => /depricated/i.test(it|| ''))),
       description: this.description$,
       icon: this.icon$,
       rarity: this.finalRarity$,

apps/web/app/widgets/vitals-families/vital-detail.component.ts

@@ -25,6 +25,10 @@ const FAMILY_META = {
     Icon: 'assets/images/missionimage_undead1.png',
     Name: 'VC_Lost',
   },
+  fae: {
+    Icon: '',
+    Name: 'Fae',
+  },
 }
 
 @Component({

apps/web/nw-data/types.ts

@@ -2842,7 +2842,7 @@ export interface Spelltable {
     SpellID:                                         string;
     SpellPrefabPath?:                                string;
     SpellTypes?:                                     string;
-    StatusEffectDurations?:                          string;
+    StatusEffectDurations?:                          number | string;
     StatusEffects?:                                  string;
     StickWhenAttached?:                              boolean;
     StoreOffsetWhenStuckToGDE?:                      boolean;

package.json

@@ -1,6 +1,6 @@
 {
   "name": "nw-buddy",
-  "version": "1.7.0-6",
+  "version": "1.7.0-7",
   "description": "New World Buddy",
   "keywords": [],
   "main": "dist/electron/main.js",
@@ -15,7 +15,7 @@
     "dev": "npm-run-all -p dev:electron dev:web",
     "dev:web": "ng serve --host 0.0.0.0 --disable-host-check -c dev -o",
     "dev:electron": "yarn electron:serve",
-    "build": "yarn build:electron && yarn build:web:capacitor && electron-builder build --publish=never --config=electron-config.js",
+    "build": "yarn build:electron && yarn build:web && electron-builder build --publish=never --config=electron-config.js",
     "build:web": "ng build --base-href ./",
     "build:web:electron": "yarn build:web -c electron",
     "build:web:capacitor": "yarn build:web -c capacitor",