Multiple categories for lathe recipes

Content.Client/Lathe/UI/LatheMenu.xaml.cs

@@ -94,8 +94,23 @@ public void PopulateRecipes()
             if (!_prototypeManager.TryIndex(recipe, out var proto))
                 continue;
 
-            if (CurrentCategory != null && proto.Category != CurrentCategory)
-                continue;
+            // Category filtering
+            if (CurrentCategory != null)
+            {
+                if (proto.Categories.Count <= 0)
+                    continue;
+
+                bool validRecipe = false;
+                foreach (var category in proto.Categories)
+                    if (category == CurrentCategory)
+                    {
+                        validRecipe = true;
+                        break;
+                    }
+
+                if (!validRecipe)
+                    continue;
+            }
 
             if (SearchBar.Text.Trim().Length != 0)
             {
@@ -179,18 +194,22 @@ private string GenerateTooltipText(LatheRecipePrototype prototype)
 
     public void UpdateCategories()
     {
+        // Get categories from recipes
         var currentCategories = new List<ProtoId<LatheCategoryPrototype>>();
         foreach (var recipeId in Recipes)
         {
             var recipe = _prototypeManager.Index(recipeId);
 
-            if (recipe.Category == null)
+            if (recipe.Categories.Count <= 0)
                 continue;
 
-            if (currentCategories.Contains(recipe.Category.Value))
-                continue;
+            foreach (var category in recipe.Categories)
+            {
+                if (currentCategories.Contains(category))
+                    continue;
 
-            currentCategories.Add(recipe.Category.Value);
+                currentCategories.Add(category);
+            }
         }
 
         if (Categories != null && (Categories.Count == currentCategories.Count || !Categories.All(currentCategories.Contains)))

Content.Shared/Research/Prototypes/LatheRecipePrototype.cs

@@ -66,9 +66,9 @@ public sealed partial class LatheRecipePrototype : IPrototype, IInheritingProtot
         public bool ApplyMaterialDiscount = true;
 
         /// <summary>
-        /// A category used for visually sorting lathe recipes in the UI.
+        /// List of categories used for visually sorting lathe recipes in the UI.
         /// </summary>
         [DataField]
-        public ProtoId<LatheCategoryPrototype>? Category;
+        public List<ProtoId<LatheCategoryPrototype>> Categories = new();
     }
 }

Resources/Prototypes/Recipes/Lathes/Parts.yml

@@ -2,7 +2,8 @@
 - type: latheRecipe
   abstract: true
   id: BasePartRecipe
-  category: Parts
+  categories:
+    - Parts
   completetime: 2
   materials:
     Steel: 300

Resources/Prototypes/Recipes/Lathes/biogen.yml

@@ -1,23 +1,26 @@
 - type: latheRecipe
   id: BioGenMonkeyCube
   result: MonkeyCube
-  category: Food
+  categories:
+    - Food
   completetime: 3
   materials:
     Biomass: 70
 
 - type: latheRecipe
   id: BioGenKoboldCube
   result: KoboldCube
-  category: Food
+  categories:
+    - Food
   completetime: 3
   materials:
     Biomass: 70
 
 - type: latheRecipe
   id: BioGenMaterialCloth1
   result: MaterialCloth1
-  category: Materials
+  categories:
+    - Materials
   icon:
     sprite: Objects/Materials/materials.rsi
     state: cloth
@@ -28,7 +31,8 @@
 - type: latheRecipe
   id: BioGenMaterialCardboard1
   result: MaterialCardboard1
-  category: Materials
+  categories:
+    - Materials
   icon:
     sprite: Objects/Materials/materials.rsi
     state: cardboard
@@ -39,23 +43,26 @@
 - type: latheRecipe
   id: BioGenPaper
   result: Paper
-  category: Materials
+  categories:
+    - Materials
   completetime: 1
   materials:
     Biomass: 2
 
 - type: latheRecipe
   id: BioGenPaperRolling1
   result: PaperRolling1
-  category: Materials
+  categories:
+    - Materials
   completetime: 1
   materials:
     Biomass: 1
 
 - type: latheRecipe
   id: BioGenCandle
   result: Candle
-  category: Materials
+  categories:
+    - Materials
   completetime: 3
   materials:
     Biomass: 3
@@ -64,7 +71,8 @@
   id: BioGenPlantBGone
   resultReagents:
     PlantBGone: 10
-  category: Chemicals
+  categories:
+    - Chemicals
   icon:
     sprite: Objects/Tools/Hydroponics/sprays.rsi
     state: plantbgone
@@ -76,7 +84,8 @@
   id: BioGenWeedKiller
   resultReagents:
     WeedKiller: 10
-  category: Chemicals
+  categories:
+    - Chemicals
   icon:
     sprite: Objects/Tools/Hydroponics/sprays.rsi
     state: weedspray
@@ -88,7 +97,8 @@
   id: BioGenPestKiller
   resultReagents:
     PestKiller: 10
-  category: Chemicals
+  categories:
+    - Chemicals
   icon:
     sprite: Objects/Tools/Hydroponics/sprays.rsi
     state: weedspray
@@ -100,7 +110,8 @@
   id: BioGenLeft4Zed
   resultReagents:
     Left4Zed: 10
-  category: Chemicals
+  categories:
+    - Chemicals
   icon:
     sprite: Objects/Specific/Chemistry/bottle.rsi
     state: bottle-1
@@ -112,7 +123,8 @@
   id: BioGenEZNutrient
   resultReagents:
     EZNutrient: 10
-  category: Chemicals
+  categories:
+    - Chemicals
   icon:
     sprite: Objects/Specific/Chemistry/bottle.rsi
     state: bottle-1
@@ -124,7 +136,8 @@
   id: BioGenRobustHarvest
   resultReagents:
     RobustHarvest: 10
-  category: Chemicals
+  categories:
+    - Chemicals
   icon:
     sprite: Objects/Specific/Chemistry/bottle.rsi
     state: bottle-1
@@ -136,7 +149,8 @@
   id: BioGenMilk
   resultReagents:
     Milk: 10
-  category: Food
+  categories:
+    - Food
   icon:
     sprite: Objects/Consumable/Drinks/milk.rsi
     state: icon
@@ -148,7 +162,8 @@
   id: BioGenMilkSoy
   resultReagents:
     MilkSoy: 10
-  category: Food
+  categories:
+    - Food
   icon:
     sprite: Objects/Consumable/Drinks/soymilk.rsi
     state: icon
@@ -160,7 +175,8 @@
   id: BioGenEthanol
   resultReagents:
     Ethanol: 10
-  category: Food
+  categories:
+    - Food
   icon:
     sprite: Objects/Consumable/Drinks/glass_clear.rsi
     state: icon
@@ -172,7 +188,8 @@
   id: BioGenCream
   resultReagents:
     Cream: 10
-  category: Food
+  categories:
+    - Food
   icon:
     sprite: Objects/Consumable/Drinks/cream.rsi
     state: icon
@@ -184,7 +201,8 @@
   id: BioGenBlackpepper
   resultReagents:
     Blackpepper: 10
-  category: Food
+  categories:
+    - Food
   icon:
     sprite: Objects/Consumable/Food/condiments.rsi
     state: packet-pepper
@@ -196,7 +214,8 @@
   id: BioGenEnzyme
   resultReagents:
     Enzyme: 10
-  category: Food
+  categories:
+    - Food
   icon:
     sprite: Objects/Consumable/Food/condiments.rsi
     state: bottle-empty
@@ -208,7 +227,8 @@
   id: BioGenFlour
   resultReagents:
     Flour: 10
-  category: Food
+  categories:
+    - Food
   icon:
     sprite: Objects/Consumable/Food/ingredients.rsi
     state: flour-big
@@ -220,7 +240,8 @@
   id: BioGenSugar
   resultReagents:
     Sugar: 10
-  category: Food
+  categories:
+    - Food
   icon:
     sprite: Objects/Consumable/Food/ingredients.rsi
     state: sugar-big

Resources/Prototypes/Recipes/Lathes/devices.yml

@@ -43,7 +43,8 @@
 - type: latheRecipe
   id: ExplosivePayload
   result: ExplosivePayload
-  category: Weapons
+  categories:
+    - Weapons
   completetime: 4
   materials:
     Steel: 100
@@ -73,7 +74,8 @@
 - type: latheRecipe
   id: AnomalyLocator
   result: AnomalyLocatorEmpty
-  category: Tools
+  categories:
+    - Tools
   completetime: 3
   materials:
     Steel: 400
@@ -82,7 +84,8 @@
 - type: latheRecipe
   id: AnomalyLocatorWide
   result: AnomalyLocatorWideEmpty
-  category: Tools
+  categories:
+    - Tools
   completetime: 3
   materials:
     Steel: 400
@@ -99,7 +102,8 @@
 - type: latheRecipe
   id: WeaponPistolCHIMP
   result: WeaponPistolCHIMP
-  category: Tools
+  categories:
+    - Tools
   completetime: 5
   materials:
     Steel: 500
@@ -108,7 +112,8 @@
 - type: latheRecipe
   id: WeaponGauntletGorilla
   result: WeaponGauntletGorilla
-  category: Tools
+  categories:
+    - Tools
   completetime: 5
   materials:
     Steel: 1500
@@ -153,7 +158,8 @@
 - type: latheRecipe
   id: WeaponForceGun
   result: WeaponForceGun
-  category: Tools
+  categories:
+    - Tools
   completetime: 5
   materials:
     Steel: 500
@@ -172,7 +178,8 @@
 - type: latheRecipe
   id: WeaponProtoKineticAccelerator
   result: WeaponProtoKineticAccelerator
-  category: Weapons
+  categories:
+    - Weapons
   completetime: 5
   materials:
     Steel: 1000
@@ -182,7 +189,8 @@
 - type: latheRecipe
   id: WeaponTetherGun
   result: WeaponTetherGun
-  category: Tools
+  categories:
+    - Tools
   completetime: 5
   materials:
     Steel: 500
@@ -192,7 +200,8 @@
 - type: latheRecipe
   id: WeaponGrapplingGun
   result: WeaponGrapplingGun
-  category: Tools
+  categories:
+    - Tools
   completetime: 5
   materials:
     Steel: 500

Resources/Prototypes/Recipes/Lathes/electronics.yml

@@ -3,7 +3,8 @@
 - type: latheRecipe
   abstract: true
   id: BaseElectronicsRecipe
-  category: Circuitry
+  categories:
+    - Circuitry
   completetime: 2
   materials:
     Steel: 100

Resources/Prototypes/Recipes/Lathes/mech_parts.yml

@@ -3,7 +3,8 @@
 - type: latheRecipe
   abstract: true
   id: BaseMechPartRecipe
-  category: Mech
+  categories:
+    - Mech
   completetime: 10
 
 # Recipes