fix(combat): items should show the effect name, not key

WorldSellerGame · Mar 17, 2023 · 47b6ec1 · 47b6ec1
1 parent 7a88e90
commit 47b6ec1
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 14 deletions.
diff --git a/src/app/components/combat-item-display/combat-item-display.component.html b/src/app/components/combat-item-display/combat-item-display.component.html
@@ -9,11 +9,15 @@
         {{ item.name }}
       </div>
 
-      <div class="effect" *ngIf="effectInfo && showEffectInfo">
-        <strong>{{ item.effects?.[0]?.effect }}</strong>: {{ effectInfo }}
-      </div>
+      <ng-container *ngIf="showEffectInfo">
+        <div class="effect" *ngFor="let effect of item.effects">
+          <ng-container *ngIf="getAbility(effect.effect) as effectRef">
+            <strong>{{ effectRef.name }}</strong>: {{ effectRef.description }}
+          </ng-container>
+        </div>
+      </ng-container>
 
-      <div class="effect-uses" *ngIf="effectInfo && showEffectInfo && showUses">
+      <div class="effect-uses" *ngIf="showEffectInfo && showUses">
         <ion-text color="energy">{{ item.durability }} Use(s)</ion-text>
       </div>
     </ion-col>

diff --git a/src/app/components/combat-item-display/combat-item-display.component.ts b/src/app/components/combat-item-display/combat-item-display.component.ts
@@ -1,5 +1,5 @@
 import { Component, Input, OnInit } from '@angular/core';
-import { IGameItem } from '../../../interfaces';
+import { IGameCombatAbility, IGameItem } from '../../../interfaces';
 import { getItemRarityClass } from '../../helpers';
 import { ContentService } from '../../services/content.service';
 
@@ -18,16 +18,12 @@ export class CombatItemDisplayComponent implements OnInit {
     return getItemRarityClass(this.item);
   }
 
-  get effectInfo() {
-    if(!this.item.effects) {
-      return '';
-    }
-
-    return this.contentService.getAbilityByName(this.item.effects[0].effect)?.description || '';
-  }
-
   constructor(private contentService: ContentService) { }
 
   ngOnInit() {}
 
+  getAbility(name: string): IGameCombatAbility {
+    return this.contentService.getAbilityByName(name) || '';
+  }
+
 }
diff --git a/src/app/components/refining-page-display/refining-page-display.component.ts b/src/app/components/refining-page-display/refining-page-display.component.ts
@@ -73,7 +73,6 @@ export class RefiningPageDisplayComponent implements OnInit, OnChanges, OnDestro
     this.setTotalResources();
 
     this.resourcesSub = this.resources$.subscribe((resources) => {
-      console.log({ resources });
       this.resources = resources;
 
       this.setVisibleRecipes();