feat(refining): clarify UI about items that are preserved vs consumed…

… when crafting
WorldSellerGame · Mar 27, 2023 · 98d74c2 · 98d74c2
1 parent a8cb999
commit 98d74c2
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/src/app/components/item-icon/item-icon.component.html b/src/app/components/item-icon/item-icon.component.html
@@ -4,7 +4,7 @@
   [ngClass]="[
   itemClass,
   emphasizeText ? 'emphasis' : '',
-  angryColorWhenQuantityExceedsMax && quantity > maxQuantity ? 'angry' : '',
+  angryColorWhenQuantityExceedsMax && maxQuantity > 0 && quantity > maxQuantity ? 'angry' : '',
   name === 'nothing' ? 'nothing' : ''
 ]">
   <app-game-icon class="icon" [icon]="icon" [inlineIconSize]="inlineIconSize"></app-game-icon>

diff --git a/src/app/components/refining-page-display/refining-page-display.component.html b/src/app/components/refining-page-display/refining-page-display.component.html
@@ -110,7 +110,7 @@ <h2>
                     <app-resource-icon *ngFor="let resource of ingredients[recipe.result]"
                                        [name]="resource.name"
                                        [quantity]="recipe.preserve?.includes(resource.name) ? resource.amount : resource.amount * (amounts[recipe.result] || 1)"
-                                       [maxQuantity]="summedResources[resource.name] || 0"
+                                       [maxQuantity]="recipe.preserve?.includes(resource.name) ? 0 : (summedResources[resource.name] || 0)"
                                        [showX]="true"
                                        [inlineIconSize]="true"
                                        [emphasizeText]="false"
@@ -119,7 +119,7 @@ <h2>
                     <app-item-icon *ngFor="let item of itemIngredients[recipe.result]"
                                    [name]="item.name"
                                    [quantity]="recipe.preserve?.includes(item.name) ? item.amount : item.amount * (amounts[recipe.result] || 1)"
-                                   [maxQuantity]="summedResources[item.name] || 0"
+                                   [maxQuantity]="recipe.preserve?.includes(item.name) ? 0 : (summedResources[item.name] || 0)"
                                    [showX]="true"
                                    [inlineIconSize]="true"
                                    [emphasizeText]="false"

diff --git a/src/app/components/resource-icon/resource-icon.component.html b/src/app/components/resource-icon/resource-icon.component.html
@@ -4,7 +4,7 @@
   [ngClass]="[
   rarity || 'Common',
   emphasizeText ? 'emphasis' : '',
-  angryColorWhenQuantityExceedsMax && quantity > maxQuantity ? 'angry' : '',
+  angryColorWhenQuantityExceedsMax && maxQuantity > 0 && quantity > maxQuantity ? 'angry' : '',
   name === 'nothing' ? 'nothing' : ''
 ]">
   <app-game-icon class="icon" [icon]="icon" [inlineIconSize]="inlineIconSize"></app-game-icon>