fix(combat): can no longer eat food while in combat

WorldSellerGame · Mar 24, 2023 · 649de45 · 649de45
1 parent 7ae3092
commit 649de45
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
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)">
+                        <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-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
@@ -3,7 +3,7 @@ import { Select, Store } from '@ngxs/store';
 import { sortBy, uniq } from 'lodash';
 import { Observable, Subscription } from 'rxjs';
 import { IGameItem } from '../../../../interfaces';
-import { CharSelectState } from '../../../../stores';
+import { CharSelectState, CombatState } from '../../../../stores';
 import { OOCEatFood } from '../../../../stores/combat/combat.actions';
 import { QuickSellItemFromInventory, SellItem, SendToStockpile } from '../../../../stores/mercantile/mercantile.actions';
 import { setDiscordStatus } from '../../../helpers/electron';
@@ -16,6 +16,7 @@ import { setDiscordStatus } from '../../../helpers/electron';
 export class InventoryPage implements OnInit, OnDestroy {
 
   @Select(CharSelectState.activeCharacterInventory) inventory$!: Observable<IGameItem[]>;
+  @Select(CombatState.currentEncounter) encounter$!: Observable<any>;
 
   public activeCategory = '';
   public categorySub!: Subscription;