minor refactor (#2951)

new-frontiers-14 · Feb 21, 2025 · 5c9d7a2 · 5c9d7a2
1 parent fd731e6
commit 5c9d7a2
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 4 deletions.
diff --git a/Content.Server/_EE/Nutrition/EntitySystems/FoodGuideDataSystem.cs b/Content.Server/_EE/Nutrition/EntitySystems/FoodGuideDataSystem.cs
@@ -99,6 +99,9 @@ public void ReloadRecipes()
         // Recipes
         foreach (var recipe in _protoMan.EnumeratePrototypes<FoodRecipePrototype>())
         {
+            if (recipe.HideInGuidebook) // Frontier
+                continue; // Frontier
+
             _sources.GetOrNew(recipe.Result).Add(new FoodRecipeData(recipe)); // Frontier: _sources<_recipes
         }
 

diff --git a/Content.Server/_NF/Medical/EntitySystems/MedicalRecipeDataSystem.cs b/Content.Server/_NF/Medical/EntitySystems/MedicalRecipeDataSystem.cs
@@ -41,12 +41,14 @@ private void OnPrototypesReloaded(PrototypesReloadedEventArgs args)
 
     public void ReloadRecipes()
     {
-        // TODO: add this code to the list of known recipes because this is spaghetti
         _sources.Clear();
 
         // Recipes
         foreach (var recipe in _protoMan.EnumeratePrototypes<FoodRecipePrototype>())
         {
+            if (recipe.HideInGuidebook)
+                continue;
+
             MicrowaveRecipeType recipeType = (MicrowaveRecipeType)recipe.RecipeType;
             if (recipeType.HasFlag(MicrowaveRecipeType.MedicalAssembler))
             {
@@ -60,7 +62,7 @@ public void ReloadRecipes()
         {
             var proto = _protoMan.Index<EntityPrototype>(result);
             ReagentQuantity[] reagents = [];
-            // Hack: assume 
+            // Hack: assume there is only one solution in the result
             if (proto.TryGetComponent<SolutionContainerManagerComponent>(out var manager, _componentFactory))
                 reagents = manager?.Solutions?.FirstOrNull()?.Value?.Contents?.ToArray() ?? [];
 

diff --git a/Content.Shared/Kitchen/MicrowaveMealRecipePrototype.cs b/Content.Shared/Kitchen/MicrowaveMealRecipePrototype.cs
@@ -31,7 +31,7 @@ public sealed partial class FoodRecipePrototype : IPrototype
         public string Result { get; private set; } = string.Empty;
 
         // Frontier
-        [DataField("resultCount")]
+        [DataField]
         public int ResultCount { get; private set; } = 1;
         // End Frontier
 
@@ -40,9 +40,12 @@ public sealed partial class FoodRecipePrototype : IPrototype
 
         // Frontier: separate microwave recipe types.
 
-        [DataField("recipeType", customTypeSerializer: typeof(FlagSerializer<MicrowaveRecipeTypeFlags>))]
+        [DataField(customTypeSerializer: typeof(FlagSerializer<MicrowaveRecipeTypeFlags>))]
         public int RecipeType = (int)MicrowaveRecipeType.Microwave;
 
+        [DataField]
+        public bool HideInGuidebook;
+
         public string Name => Loc.GetString(_name);
 
         // TODO Turn this into a ReagentQuantity[]

diff --git a/Resources/Prototypes/_NF/Recipes/Cooking/medical_recipes.yml b/Resources/Prototypes/_NF/Recipes/Cooking/medical_recipes.yml
@@ -202,6 +202,7 @@
     LeftFootHuman: 1
     RightFootHuman: 1
   recipeType: MedicalAssembler
+  hideInGuidebook: true
 
 - type: microwaveMealRecipe
   id: NFRecipeBuildABuddyGoblin
@@ -220,6 +221,7 @@
     LeftFootGoblin: 1
     RightFootGoblin: 1
   recipeType: MedicalAssembler
+  hideInGuidebook: true
 
 - type: microwaveMealRecipe
   id: NFRecipeBuildABuddyReptilian
@@ -238,6 +240,7 @@
     LeftFootReptilian: 1
     RightFootReptilian: 1
   recipeType: MedicalAssembler
+  hideInGuidebook: true
 
 - type: microwaveMealRecipe
   id: NFRecipeBuildABuddySlime
@@ -256,6 +259,7 @@
     LeftFootSlime: 1
     RightFootSlime: 1
   recipeType: MedicalAssembler
+  hideInGuidebook: true
 
 - type: microwaveMealRecipe
   id: NFRecipeBuildABuddyVulpkanin
@@ -274,3 +278,4 @@
     LeftFootVulpkanin: 1
     RightFootVulpkanin: 1
   recipeType: MedicalAssembler
+  hideInGuidebook: true