show separate flavored/base 'owned' counts for flavored items

Pathoschild · Pathoschild · commit e71c0082350e · 2025-03-24T21:53:14.000-04:00
diff --git a/LookupAnything/Framework/Lookups/Items/ItemSubject.cs b/LookupAnything/Framework/Lookups/Items/ItemSubject.cs
@@ -388,7 +388,7 @@ select name
         if (showInventoryFields && !isCrop)
         {
             // owned
-            yield return new GenericField(I18n.Item_NumberOwned(), I18n.Item_NumberOwned_Summary(count: this.GameHelper.CountOwnedItems(item)));
+            yield return new GenericField(I18n.Item_NumberOwned(), this.GetNumberOwnedText(item));
 
             // times crafted
             RecipeModel[] recipes = this.GameHelper
@@ -902,6 +902,28 @@ bool IsBundleOpen(int id)
         }
     }
 
+    /// <summary>Get a text summary of the number of an item owned by the player.</summary>
+    /// <param name="item">The item to count in the world.</param>
+    private string GetNumberOwnedText(Item item)
+    {
+        // get counts
+        int baseCount = this.GameHelper.CountOwnedItems(item, flavorSpecific: false);
+        int flavoredCount = item is SObject
+            ? this.GameHelper.CountOwnedItems(item, flavorSpecific: true)
+            : baseCount;
+
+        // show flavored + base count
+        if (baseCount != flavoredCount)
+        {
+            ParsedItemData? baseData = ItemRegistry.GetData(item.QualifiedItemId);
+            if (baseData != null)
+                return I18n.Item_NumberOwnedFlavored_Summary(name: item.Name, count: flavoredCount, baseName: baseData.DisplayName, baseCount: baseCount);
+        }
+
+        // show flavored count only
+        return I18n.Item_NumberOwned_Summary(count: flavoredCount);
+    }
+
     /// <summary>Get the translated name for a bundle's area.</summary>
     /// <param name="bundle">The bundle.</param>
     private string GetTranslatedBundleArea(BundleModel bundle)
diff --git a/LookupAnything/GameHelper.cs b/LookupAnything/GameHelper.cs
@@ -240,12 +240,13 @@ public IEnumerable<NPC> GetAllCharacters()
 
     /// <summary>Count how many of an item the player owns.</summary>
     /// <param name="item">The item to count.</param>
-    public int CountOwnedItems(Item item)
+    /// <param name="flavorSpecific">If the item has a preserved item, whether to only include items with the same preserved item.</param>
+    public int CountOwnedItems(Item item, bool flavorSpecific)
     {
         return (
             from found in this.GetAllOwnedItems()
             let foundItem = found.Item
-            where this.AreEquivalent(foundItem, item)
+            where this.AreEquivalent(foundItem, item, flavorSpecific)
             let canStack = foundItem.canStackWith(foundItem)
             select canStack ? found.GetCount() : 1
         ).Sum();
@@ -463,7 +464,7 @@ public IEnumerable<RecipeModel> GetRecipesForOutput(Item item)
     {
         return this
             .GetRecipes()
-            .Where(recipe => this.AreEquivalent(item, recipe.TryCreateItem(item)));
+            .Where(recipe => this.AreEquivalent(item, recipe.TryCreateItem(item), flavorSpecific: false));
     }
 
     /// <summary>Get the recipes for a given machine.</summary>
@@ -686,13 +687,18 @@ public void ShowErrorMessage(string message)
     /// <summary>Get whether two items are the same type (ignoring flavor text like 'blueberry wine' vs 'cranberry wine').</summary>
     /// <param name="a">The first item to compare.</param>
     /// <param name="b">The second item to compare.</param>
-    private bool AreEquivalent(Item? a, Item? b)
+    /// <param name="flavorSpecific">Whether to only match items with the same preserved item.</param>
+    private bool AreEquivalent(Item? a, Item? b, bool flavorSpecific)
     {
         return
             a != null
             && b != null
             && a.QualifiedItemId == b.QualifiedItemId
-            && (a as Chest)?.fridge.Value == (b as Chest)?.fridge.Value;
+            && (a as Chest)?.fridge.Value == (b as Chest)?.fridge.Value
+            && (
+                !flavorSpecific
+                || (a as SObject)?.GetPreservedItemId() == (b as SObject)?.GetPreservedItemId()
+            );
     }
 
     /// <summary>Get all machine recipes, including those from mods like Producer Framework Mod.</summary>
diff --git a/LookupAnything/docs/release-notes.md b/LookupAnything/docs/release-notes.md
@@ -6,6 +6,7 @@
 * Added item links in item recipe, fish pond drop, and item drop fields (thanks to Mushmato!).
 * Added support for Extra Machine Config mod's multiple output items (thanks to zombifier!).
 * Added support for the upcoming Better Game Menu mod (thanks to KhloeLeclair!).
+* When you look up a flavored item like Sunflower Honey, the 'owned' field now also shows how many you own with the same flavor.
 * Improved schedule data in NPC lookups:
   * The current position is now shown even if they have no schedule.
   * Added separate message when the NPC has a schedule but they're set to ignore it.
diff --git a/LookupAnything/i18n/de.json b/LookupAnything/i18n/de.json
@@ -359,6 +359,7 @@
     "item.recipes-for-machine.same-as-input": "[Gleiches wie Eingabe]", // e.g. crystalarium produces same item that was put in
     "item.recipes-for-machine.too-complex": "Einige Maschinen-Regeln sind zu dynamisch, um sie anzuzeigen.",
     "item.number-owned.summary": "Du besitzt {{count}} davon",
+    "item.number-owned-flavored.summary": "you own {{count}} ({{name}}) or {{baseCount}} ({{baseName}}) of these", // TODO // e.g. "you own 5 (Sturgeon Roe) or 20 (Roe) of these"
     "item.number-crafted.summary": "Du hast bereits {{count}} davon hergestellt",
 
 
diff --git a/LookupAnything/i18n/default.json b/LookupAnything/i18n/default.json
@@ -359,6 +359,7 @@
     "item.recipes-for-machine.same-as-input": "[same as input]", // e.g. crystalarium produces same item that was put in
     "item.recipes-for-machine.too-complex": "Some machine rules are too dynamic to display.",
     "item.number-owned.summary": "you own {{count}} of these",
+    "item.number-owned-flavored.summary": "you own {{count}} ({{name}}) or {{baseCount}} ({{baseName}}) of these", // e.g. "you own 5 (Sturgeon Roe) or 20 (Roe) of these"
     "item.number-crafted.summary": "you made {{count}} of these",
 
 
diff --git a/LookupAnything/i18n/es.json b/LookupAnything/i18n/es.json
@@ -361,6 +361,7 @@
     "item.recipes-for-machine.same-as-input": "[same as input]", // e.g. crystalarium produces same item that was put in // TODO
     "item.recipes-for-machine.too-complex": "Some machine rules are too dynamic to display.", // TODO
     "item.number-owned.summary": "{{count}} ud(s)",
+    "item.number-owned-flavored.summary": "you own {{count}} ({{name}}) or {{baseCount}} ({{baseName}}) of these", // TODO // e.g. "you own 5 (Sturgeon Roe) or 20 (Roe) of these"
     "item.number-crafted.summary": "creaste {{count}} de estos",
 
 
diff --git a/LookupAnything/i18n/fr.json b/LookupAnything/i18n/fr.json
@@ -363,6 +363,7 @@
     "item.recipes-for-machine.same-as-input": "[same as input]", // e.g. crystalarium produces same item that was put in // TODO
     "item.recipes-for-machine.too-complex": "Some machine rules are too dynamic to display.", // TODO
     "item.number-owned.summary": "vous en possédez {{count}}",
+    "item.number-owned-flavored.summary": "you own {{count}} ({{name}}) or {{baseCount}} ({{baseName}}) of these", // TODO // e.g. "you own 5 (Sturgeon Roe) or 20 (Roe) of these"
     "item.number-crafted.summary": "vous en avez fabriqué {{count}}",
 
 
diff --git a/LookupAnything/i18n/hu.json b/LookupAnything/i18n/hu.json
@@ -361,6 +361,7 @@
     "item.recipes-for-machine.same-as-input": "[same as input]", // e.g. crystalarium produces same item that was put in // TODO
     "item.recipes-for-machine.too-complex": "Some machine rules are too dynamic to display.", // TODO
     "item.number-owned.summary": "ennyit birtokolsz ebből: {{count}}",
+    "item.number-owned-flavored.summary": "you own {{count}} ({{name}}) or {{baseCount}} ({{baseName}}) of these", // TODO // e.g. "you own 5 (Sturgeon Roe) or 20 (Roe) of these"
     "item.number-crafted.summary": "ennyit készítettél ebből: {{count}}",
 
 
diff --git a/LookupAnything/i18n/it.json b/LookupAnything/i18n/it.json
@@ -358,6 +358,7 @@
     "item.recipes-for-machine.same-as-input": "[stesso oggetto]", // e.g. crystalarium produces same item that was put in
     "item.recipes-for-machine.too-complex": "Alcune regole della macchina sono troppo dinamiche per essere visualizzate.",
     "item.number-owned.summary": "Quantità posseduta: {{count}}",
+    "item.number-owned-flavored.summary": "you own {{count}} ({{name}}) or {{baseCount}} ({{baseName}}) of these", // TODO // e.g. "you own 5 (Sturgeon Roe) or 20 (Roe) of these"
     "item.number-crafted.summary": "Quantità fabbricata: {{count}}",
 
 
diff --git a/LookupAnything/i18n/ja.json b/LookupAnything/i18n/ja.json
@@ -360,6 +360,7 @@
     "item.recipes-for-machine.same-as-input": "原料と同じ", // e.g. crystalarium produces same item that was put in
     "item.recipes-for-machine.too-complex": "情報が多すぎるため表示することができない",
     "item.number-owned.summary": "{{count}}個持っている",
+    "item.number-owned-flavored.summary": "you own {{count}} ({{name}}) or {{baseCount}} ({{baseName}}) of these", // TODO // e.g. "you own 5 (Sturgeon Roe) or 20 (Roe) of these"
     "item.number-crafted.summary": "{{count}}個作成した",
 
 
diff --git a/LookupAnything/i18n/ko.json b/LookupAnything/i18n/ko.json
@@ -360,6 +360,7 @@
     "item.recipes-for-machine.same-as-input": "[넣는 아이템과 동일]", // e.g. crystalarium produces same item that was put in
     "item.recipes-for-machine.too-complex": "이 기계 규칙은 너무 복잡해서 표시할 수 없습니다.",
     "item.number-owned.summary": "당신은 이것들을 {{count}}개 보유 중.",
+    "item.number-owned-flavored.summary": "you own {{count}} ({{name}}) or {{baseCount}} ({{baseName}}) of these", // TODO // e.g. "you own 5 (Sturgeon Roe) or 20 (Roe) of these"
     "item.number-crafted.summary": "당신은 이것들을 {{count}}개 제작했음.",
 
 
diff --git a/LookupAnything/i18n/pl.json b/LookupAnything/i18n/pl.json
@@ -360,6 +360,7 @@
     "item.recipes-for-machine.same-as-input": "[tak samo jak wejście]", // e.g. crystalarium produces same item that was put in
     "item.recipes-for-machine.too-complex": "Wyświetlenie niektórych reguł maszynowych jest zbyt dynamiczne.",
     "item.number-owned.summary": "masz takich {{count}}",
+    "item.number-owned-flavored.summary": "you own {{count}} ({{name}}) or {{baseCount}} ({{baseName}}) of these", // TODO // e.g. "you own 5 (Sturgeon Roe) or 20 (Roe) of these"
     "item.number-crafted.summary": "zrobiono takich {{count}}",
 
 
diff --git a/LookupAnything/i18n/pt.json b/LookupAnything/i18n/pt.json
@@ -361,6 +361,7 @@
     "item.recipes-for-machine.same-as-input": "[same as input]", // e.g. crystalarium produces same item that was put in // TODO
     "item.recipes-for-machine.too-complex": "Some machine rules are too dynamic to display.", // TODO
     "item.number-owned.summary": "Possui {{count}} desses",
+    "item.number-owned-flavored.summary": "you own {{count}} ({{name}}) or {{baseCount}} ({{baseName}}) of these", // TODO // e.g. "you own 5 (Sturgeon Roe) or 20 (Roe) of these"
     "item.number-crafted.summary": "Criou {{count}} desses",
 
 
diff --git a/LookupAnything/i18n/ru.json b/LookupAnything/i18n/ru.json
@@ -360,6 +360,7 @@
     "item.recipes-for-machine.same-as-input": "[то же, что и на входе]", // e.g. crystalarium produces same item that was put in 
     "item.recipes-for-machine.too-complex": "Функции некоторого оборудования слишком сложны для отображения.",
     "item.number-owned.summary": "У вас есть {{count}} шт.",
+    "item.number-owned-flavored.summary": "you own {{count}} ({{name}}) or {{baseCount}} ({{baseName}}) of these", // TODO // e.g. "you own 5 (Sturgeon Roe) or 20 (Roe) of these"
     "item.number-crafted.summary": "Вы создали {{count}} шт.",
 
 
diff --git a/LookupAnything/i18n/th.json b/LookupAnything/i18n/th.json
@@ -361,6 +361,7 @@
     "item.recipes-for-machine.same-as-input": "[same as input]", // e.g. crystalarium produces same item that was put in // TODO
     "item.recipes-for-machine.too-complex": "Some machine rules are too dynamic to display.", // TODO
     "item.number-owned.summary": "คุณมีแล้ว {{count}} ชิ้น",
+    "item.number-owned-flavored.summary": "you own {{count}} ({{name}}) or {{baseCount}} ({{baseName}}) of these", // TODO // e.g. "you own 5 (Sturgeon Roe) or 20 (Roe) of these"
     "item.number-crafted.summary": "คุณสร้างแล้ว {{count}} ชิ้น",
 
 
diff --git a/LookupAnything/i18n/tr.json b/LookupAnything/i18n/tr.json
@@ -359,6 +359,7 @@
     "item.recipes-for-machine.same-as-input": "[içine koyulan nesne ile aynı]", // e.g. crystalarium produces same item that was put in 
     "item.recipes-for-machine.too-complex": "Bazı makinelerin işlevleri gösterilemeyecek kadar karmaşık",
     "item.number-owned.summary": "bundan {{count}} tane sahipsin",
+    "item.number-owned-flavored.summary": "you own {{count}} ({{name}}) or {{baseCount}} ({{baseName}}) of these", // TODO // e.g. "you own 5 (Sturgeon Roe) or 20 (Roe) of these"
     "item.number-crafted.summary": "bundan {{count}} tane yaptın",
 
 
diff --git a/LookupAnything/i18n/uk.json b/LookupAnything/i18n/uk.json
@@ -361,6 +361,7 @@
     "item.recipes-for-machine.same-as-input": "[same as input]", // e.g. crystalarium produces same item that was put in // TODO
     "item.recipes-for-machine.too-complex": "Some machine rules are too dynamic to display.", // TODO
     "item.number-owned.summary": "Ви маєте {{count}} од.",
+    "item.number-owned-flavored.summary": "you own {{count}} ({{name}}) or {{baseCount}} ({{baseName}}) of these", // TODO // e.g. "you own 5 (Sturgeon Roe) or 20 (Roe) of these"
     "item.number-crafted.summary": "Ви створили {{count}} од.",
 
 
diff --git a/LookupAnything/i18n/vi.json b/LookupAnything/i18n/vi.json
@@ -360,6 +360,7 @@
     "item.recipes-for-machine.same-as-input": "[giống như đầu vào]",
     "item.recipes-for-machine.too-complex": "Một số quy tắc của máy quá phức tạp để hiển thị.",
     "item.number-owned.summary": "Bạn sở hữu {{count}} cái",
+    "item.number-owned-flavored.summary": "you own {{count}} ({{name}}) or {{baseCount}} ({{baseName}}) of these", // TODO // e.g. "you own 5 (Sturgeon Roe) or 20 (Roe) of these"
     "item.number-crafted.summary": "Bạn đã chế tạo {{count}} cái",
 
 
diff --git a/LookupAnything/i18n/zh.json b/LookupAnything/i18n/zh.json
@@ -359,6 +359,7 @@
     "item.recipes-for-machine.same-as-input": "[与输入物品相同]", // e.g. crystalarium produces same item that was put in (例如. 宝石复制机放入的物品和产出的物品一致)
     "item.recipes-for-machine.too-complex": "一些生产规则因太复杂而无法显示",
     "item.number-owned.summary": "你目前拥有的总数为{{count}}",
+    "item.number-owned-flavored.summary": "you own {{count}} ({{name}}) or {{baseCount}} ({{baseName}}) of these", // TODO // e.g. "you own 5 (Sturgeon Roe) or 20 (Roe) of these"
     "item.number-crafted.summary": "你已制造{{count}}个此物",
 
 
diff --git a/README.md b/README.md
@@ -93,7 +93,7 @@ Chinese      | [✓](Automate/i18n/zh.json) | [✓](CentralStation/%5BCP%5D%20Ce
 French       | [✓](Automate/i18n/fr.json) | [✓](CentralStation/%5BCP%5D%20CentralStation/i18n/fr.json) | [↻](ChestsAnywhere/i18n/fr.json) | [❑](CropsAnytimeAnywhere/i18n)         | [↻](DataLayers/i18n/fr.json) | [↻](DebugMode/i18n/fr.json) | [↻](FastAnimations/i18n/fr.json) | [✓](HorseFluteAnywhere/i18n/fr.json) | [↻](LookupAnything/i18n/fr.json) | [✓](NoclipMode/i18n/fr.json) | [✓](SkipIntro/i18n/fr.json) | [✓](SmallBeachFarm/i18n/fr.json) | [↻](TractorMod/i18n/fr.json)
 German       | [✓](Automate/i18n/de.json) | [✓](CentralStation/%5BCP%5D%20CentralStation/i18n/de.json) | [✓](ChestsAnywhere/i18n/de.json) | [✓](CropsAnytimeAnywhere/i18n/de.json) | [✓](DataLayers/i18n/de.json) | [✓](DebugMode/i18n/de.json) | [↻](FastAnimations/i18n/de.json) | [✓](HorseFluteAnywhere/i18n/de.json) | [↻](LookupAnything/i18n/de.json) | [✓](NoclipMode/i18n/de.json) | [✓](SkipIntro/i18n/de.json) | [✓](SmallBeachFarm/i18n/de.json) | [✓](TractorMod/i18n/de.json)
 Hungarian    | [✓](Automate/i18n/hu.json) | [❑](CentralStation/%5BCP%5D%20CentralStation/i18n)         | [↻](ChestsAnywhere/i18n/hu.json) | [❑](CropsAnytimeAnywhere/i18n)         | [↻](DataLayers/i18n/hu.json) | [↻](DebugMode/i18n/hu.json) | [↻](FastAnimations/i18n/hu.json) | [✓](HorseFluteAnywhere/i18n/hu.json) | [↻](LookupAnything/i18n/hu.json) | [✓](NoclipMode/i18n/hu.json) | [❑](SkipIntro/i18n)         | [↻](SmallBeachFarm/i18n/hu.json) | [↻](TractorMod/i18n/hu.json)
-Italian      | [✓](Automate/i18n/it.json) | [✓](CentralStation/%5BCP%5D%20CentralStation/i18n/it.json) | [✓](ChestsAnywhere/i18n/it.json) | [✓](CropsAnytimeAnywhere/i18n/it.json) | [✓](DataLayers/i18n/it.json) | [✓](DebugMode/i18n/it.json) | [✓](FastAnimations/i18n/it.json) | [✓](HorseFluteAnywhere/i18n/it.json) | [✓](LookupAnything/i18n/it.json) | [✓](NoclipMode/i18n/it.json) | [✓](SkipIntro/i18n/it.json) | [✓](SmallBeachFarm/i18n/it.json) | [✓](TractorMod/i18n/it.json)
+Italian      | [✓](Automate/i18n/it.json) | [✓](CentralStation/%5BCP%5D%20CentralStation/i18n/it.json) | [✓](ChestsAnywhere/i18n/it.json) | [✓](CropsAnytimeAnywhere/i18n/it.json) | [✓](DataLayers/i18n/it.json) | [✓](DebugMode/i18n/it.json) | [✓](FastAnimations/i18n/it.json) | [✓](HorseFluteAnywhere/i18n/it.json) | [↻](LookupAnything/i18n/it.json) | [✓](NoclipMode/i18n/it.json) | [✓](SkipIntro/i18n/it.json) | [✓](SmallBeachFarm/i18n/it.json) | [✓](TractorMod/i18n/it.json)
 Japanese     | [❑](Automate/i18n)         | [❑](CentralStation/%5BCP%5D%20CentralStation/i18n)         | [↻](ChestsAnywhere/i18n/ja.json) | [❑](CropsAnytimeAnywhere/i18n)         | [↻](DataLayers/i18n/ja.json) | [↻](DebugMode/i18n/ja.json) | [↻](FastAnimations/i18n/ja.json) | [↻](HorseFluteAnywhere/i18n/ja.json) | [↻](LookupAnything/i18n/ja.json) | [✓](NoclipMode/i18n/ja.json) | [✓](SkipIntro/i18n/ja.json) | [✓](SmallBeachFarm/i18n/ja.json) | [↻](TractorMod/i18n/ja.json)
 Korean       | [✓](Automate/i18n/ko.json) | [✓](CentralStation/%5BCP%5D%20CentralStation/i18n/ko.json) | [↻](ChestsAnywhere/i18n/ko.json) | [✓](CropsAnytimeAnywhere/i18n/ko.json) | [✓](DataLayers/i18n/ko.json) | [↻](DebugMode/i18n/ko.json) | [↻](FastAnimations/i18n/ko.json) | [✓](HorseFluteAnywhere/i18n/ko.json) | [↻](LookupAnything/i18n/ko.json) | [✓](NoclipMode/i18n/ko.json) | [✓](SkipIntro/i18n/ko.json) | [✓](SmallBeachFarm/i18n/ko.json) | [↻](TractorMod/i18n/ko.json)
 [Polish]     | [✓](Automate/i18n/pl.json) | [❑](CentralStation/%5BCP%5D%20CentralStation/i18n)         | [↻](ChestsAnywhere/i18n/pl.json) | [❑](CropsAnytimeAnywhere/i18n)         | [↻](DataLayers/i18n/pl.json) | [↻](DebugMode/i18n/pl.json) | [❑](FastAnimations/i18n)         | [❑](HorseFluteAnywhere/i18n)         | [↻](LookupAnything/i18n/pl.json) | [↻](NoclipMode/i18n/pl.json) | [❑](SkipIntro/i18n)         | [❑](SmallBeachFarm/i18n)         | [↻](TractorMod/i18n/pl.json)
