fix(dungeon): dungeons no longer let you eat food

WorldSellerGame · Mar 27, 2023 · cb0d9a7 · cb0d9a7
1 parent ccdbff7
commit cb0d9a7
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/src/app/pages/character/inventory/inventory.page.html b/src/app/pages/character/inventory/inventory.page.html
@@ -38,7 +38,7 @@
                           <app-game-icon class="popup-icon" [icon]="item.icon" [inlineIconSize]="true"></app-game-icon> {{ item.name }}
                         </ion-item>
 
-                        <ion-item class="cursor-pointer" (click)="eat(item)" *ngIf="item.category === 'Foods' && ((item.oocHealth || 0) > 0 || (item.oocEnergy || 0) > 0)" [class.hidden]="encounter$ | async">
+                        <ion-item class="cursor-pointer" (click)="eat(item)" *ngIf="item.category === 'Foods' && ((item.oocHealth || 0) > 0 || (item.oocEnergy || 0) > 0)" [class.hidden]="(encounter$ | async) || (dungeon$ | async)">
                           <ion-label class="ion-text-wrap">
                             Eat To Heal
                             <span *ngIf="item.oocHealth || item.oocEnergy">&nbsp;(+{{ item.oocHealth || 0 }}/{{ item.oocEnergy || 0}} HP/Energy)</span>

diff --git a/src/app/pages/character/inventory/inventory.page.ts b/src/app/pages/character/inventory/inventory.page.ts
@@ -17,6 +17,7 @@ export class InventoryPage implements OnInit, OnDestroy {
 
   @Select(CharSelectState.activeCharacterInventory) inventory$!: Observable<IGameItem[]>;
   @Select(CombatState.currentEncounter) encounter$!: Observable<any>;
+  @Select(CombatState.currentDungeon) dungeon$!: Observable<any>;
 
   public activeCategory = '';
   public categorySub!: Subscription;