feat(inventory): allow multiple collects for collectibles and equipment

After-the-End-of-All-Things · Jul 4, 2023 · b95bfcf · b95bfcf
1 parent b097634
commit b95bfcf
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 13 deletions.
diff --git a/client/src/app/pages/inventory/inventory.page.html b/client/src/app/pages/inventory/inventory.page.html
@@ -145,23 +145,28 @@
 
                           <ion-item
                             class="cursor-pointer"
-                            *ngIf="row.type === 'collectible' && !isDiscovered(row)"
+                            *ngIf="row.type === 'collectible'"
                             (click)="discoverCollectible(row); popover.dismiss()"
                           >
                             Collect
+                            <ion-icon
+                              slot="end"
+                              [name]="isDiscovered(row) ? 'checkmark-circle' : 'close-circle'"
+                              [color]="isDiscovered(row) ? 'success' : 'danger'"
+                            ></ion-icon>
                           </ion-item>
 
                           <ion-item
                             class="cursor-pointer"
-                            *ngIf="row.type !== 'collectible' && !isDiscovered(row)"
+                            *ngIf="row.type !== 'collectible'"
                             (click)="discoverEquipment(row); popover.dismiss()"
                           >
                             Collect
-                          </ion-item>
-
-                          <ion-item *ngIf="isDiscovered(row)" [disabled]>
-                            <em>Collected</em>
-                            <ion-icon slot="end" name="checkbox"></ion-icon>
+                            <ion-icon
+                              slot="end"
+                              [name]="isDiscovered(row) ? 'checkmark-circle' : 'close-circle'"
+                              [color]="isDiscovered(row) ? 'success' : 'danger'"
+                            ></ion-icon>
                           </ion-item>
                         </ion-list>
                       </ion-content>

diff --git a/server/src/modules/discoveries/discoveries.service.ts b/server/src/modules/discoveries/discoveries.service.ts
@@ -120,9 +120,6 @@ export class DiscoveriesService {
     if (!itemDefinition)
       throw new NotFoundException('Item definition not found');
 
-    if (discoveries.collectibles?.[itemDefinition.itemId])
-      throw new BadRequestException('Collectible already discovered');
-
     await this.inventoryService.removeInventoryItemForUser(userId, instanceId);
 
     const discoveryPatches = await getPatchesAfterPropChanges<Discoveries>(
@@ -165,9 +162,6 @@ export class DiscoveriesService {
     if (!itemDefinition)
       throw new NotFoundException('Item definition not found');
 
-    if (discoveries.items?.[itemDefinition.itemId])
-      throw new BadRequestException('Item already discovered');
-
     await this.inventoryService.removeInventoryItemForUser(userId, instanceId);
 
     const discoveryPatches = await getPatchesAfterPropChanges<Discoveries>(