From 3de3275ffe079a87736a3bb2ad9848b3d1231a85 Mon Sep 17 00:00:00 2001
From: Whatstone <whatston3@gmail.com>
Date: Thu, 26 Sep 2024 22:05:24 -0400
Subject: [PATCH] Pear fixes, pear flavor, pear ID consistency

---
 .../Objects/Consumable/Food/meals.yml         | 26 +++++--------------
 Resources/Prototypes/_NF/Flavors/flavors.yml  |  5 ++++
 .../_NF/Recipes/Cooking/meal_recipes.yml      | 23 ++++++++--------
 .../Consumable/Food/Baked/pie.rsi/meta.json   |  2 +-
 4 files changed, 23 insertions(+), 33 deletions(-)

diff --git a/Resources/Prototypes/_NF/Entities/Objects/Consumable/Food/meals.yml b/Resources/Prototypes/_NF/Entities/Objects/Consumable/Food/meals.yml
index 049320e322d..2a9df9dec32 100644
--- a/Resources/Prototypes/_NF/Entities/Objects/Consumable/Food/meals.yml
+++ b/Resources/Prototypes/_NF/Entities/Objects/Consumable/Food/meals.yml
@@ -277,7 +277,7 @@
     - Fruit
   
 - type: entity
-  name: poached pear
+  name: poached pears
   parent: FoodBowlBase
   id: FoodMealPoachedPears
   description: The classiest use for a can of wine.
@@ -305,13 +305,12 @@
           Quantity: 8
   - type: Tag
     tags:
-    - Vegetable
     - Fruit
 
 - type: entity
-  name: belle pear
+  name: pears belle helene
   parent: FoodBowlBase
-  id: FoodMealBellaPears
+  id: FoodMealPearsBelleHelene
   description: The delicate flavor of the immaculate pear drenched in chocolate.
   components:
   - type: FlavorProfile
@@ -339,14 +338,13 @@
           Quantity: 3
   - type: Tag
     tags:
-    - Vegetable
     - Fruit
 
 - type: entity
   name: pear muffin
   parent: FoodMealBase
-  id: FoodMealPearMuffin
-  description: I wont tell if you just try to pick out the chocolate.
+  id: FoodBakedMuffinPear
+  description: I won't tell if you just try to pick out the chocolate.
   components:
   - type: FlavorProfile
     flavors:
@@ -372,13 +370,12 @@
           Quantity: 1
   - type: Tag
     tags:
-    - Vegetable
     - Fruit
 
 - type: entity
   name: pear and cheese tart
   parent: FoodPieBase
-  id: FoodMealPearTart
+  id: FoodTartPearCheese
   description: The most sublime pair.
   components:
   - type: FlavorProfile
@@ -391,17 +388,6 @@
     layers:
     - state: tin
     - state: pearandcheese
-  - type: SolutionContainerManager
-    solutions:
-      food:
-        maxVol: 30
-        reagents:
-        - ReagentId: Nutriment
-          Quantity: 12
-        - ReagentId: Vitamin
-          Quantity: 8
-        - ReagentId: Flavorol
-          Quantity: 8
   - type: Tag
     tags:
     - Fruit
diff --git a/Resources/Prototypes/_NF/Flavors/flavors.yml b/Resources/Prototypes/_NF/Flavors/flavors.yml
index 1c3408d5b1b..8279b7e59e4 100644
--- a/Resources/Prototypes/_NF/Flavors/flavors.yml
+++ b/Resources/Prototypes/_NF/Flavors/flavors.yml
@@ -37,3 +37,8 @@
   id: cucumber
   flavorType: Complex
   description: flavor-complex-cucumber
+
+- type: flavor
+  id: pear
+  flavorType: Complex
+  description: flavor-complex-pear
diff --git a/Resources/Prototypes/_NF/Recipes/Cooking/meal_recipes.yml b/Resources/Prototypes/_NF/Recipes/Cooking/meal_recipes.yml
index f35eb1a81d4..e6675fd0571 100644
--- a/Resources/Prototypes/_NF/Recipes/Cooking/meal_recipes.yml
+++ b/Resources/Prototypes/_NF/Recipes/Cooking/meal_recipes.yml
@@ -151,7 +151,7 @@
 
 - type: microwaveMealRecipe
   id: RecipeRaisins
-  name: raisins
+  name: raisins recipe
   result: ReagentContainerRaisin # A little bit cursed, spawning a bag
   time: 30
   solids:
@@ -169,7 +169,7 @@
     
 - type: microwaveMealRecipe
   id: RecipePoachedPears
-  name: poached pears
+  name: poached pears recipe
   result: FoodMealPoachedPears
   time: 10
   solids:
@@ -180,9 +180,9 @@
     Wine: 10
     
 - type: microwaveMealRecipe
-  id: RecipeBellaPears
-  name: bella pears
-  result: FoodMealBellaPears
+  id: RecipePearsBelleHelene
+  name: pears belle helene recipe
+  result: FoodMealPearsBelleHelene
   time: 10
   solids:
     FoodBowlBig: 1
@@ -194,8 +194,8 @@
 
 - type: microwaveMealRecipe
   id: RecipePearMuffin
-  name: pear muffin
-  result: FoodMealPearMuffin
+  name: pear muffin recipe
+  result: FoodBakedMuffinPear
   time: 10
   solids:
     FoodPear: 1
@@ -207,15 +207,14 @@
     
 - type: microwaveMealRecipe
   id: RecipePearCheeseTart
-  name: pear and goat cheese tart
-  result: FoodMealPearTart
-  time: 10
+  name: pear and cheese tart recipe
+  result: FoodTartPearCheese
+  time: 15
   solids:
     FoodPlateTin: 1
     FoodDoughPie: 1
-    FoodPear: 3
+    FoodPear: 2
     FoodChevre: 1
-    FoodButter: 1
 
 # NOT ACTUAL FOOD
 
diff --git a/Resources/Textures/_NF/Objects/Consumable/Food/Baked/pie.rsi/meta.json b/Resources/Textures/_NF/Objects/Consumable/Food/Baked/pie.rsi/meta.json
index 545e6ab16a6..1355ee3a5ca 100644
--- a/Resources/Textures/_NF/Objects/Consumable/Food/Baked/pie.rsi/meta.json
+++ b/Resources/Textures/_NF/Objects/Consumable/Food/Baked/pie.rsi/meta.json
@@ -1,7 +1,7 @@
 {
     "version": 1,
     "license": "CC-BY-SA-3.0",
-    "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c6e3401f2e7e1e55c57060cdf956a98ef1fefc24, mime tart slice and banana cream pie slice from rosysyntax under under CC BY-SA 4.0",
+    "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c6e3401f2e7e1e55c57060cdf956a98ef1fefc24, pearandcheese by dustylens (GitHub)",
     "size": {
         "x": 32,
         "y": 32