[Frozen] Soups tweaks (#15110)

Co-authored-by: Moony <moony@hellomouse.net>
Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>

Resources/Locale/en-US/flavors/flavor-profiles.ftl

@@ -78,8 +78,8 @@ flavor-complex-ice-cream = like ice cream
 flavor-complex-dough = like dough
 flavor-complex-sweet-dough = like sweet dough
 flavor-complex-tofu = like tofu
+flavor-complex-miso = like miso
 flavor-complex-muffin = like a muffin
-
 flavor-complex-peas = like peas
 flavor-complex-pineapple = like pineapple
 flavor-complex-onion = like onion
@@ -98,6 +98,11 @@ flavor-complex-orange = like oranges
 flavor-complex-watermelon = like watermelon
 flavor-complex-garlic = like garlic
 flavor-complex-grape = like grapes
+flavor-complex-meatballs = like meatballs
+flavor-complex-nettles = like nettles
+flavor-complex-jungle = like jungle
+flavor-complex-vegetables = like vegetables
+# use it when there multiple types of veggies
 
 ## Complex foodstuffs (cooked foods, joke flavors, etc)
 
@@ -118,9 +123,16 @@ flavor-complex-boritos = like gaming
 flavor-complex-nachos = like nachos
 flavor-complex-donk = like cheap pizza
 flavor-complex-copypasta = like a repetitive joke
+flavor-complex-bad-joke = like a bad joke
 flavor-complex-memory-leek = like a fork bomb
 flavor-complex-gunpowder = like gunpowder
 flavor-complex-validhunting = like validhunting
+flavor-complex-sadness = like sadness
+flavor-complex-hope = like hope
+flavor-complex-chaos = like chaos
+flavor-complex-squirming = like squirming
+flavor-complex-electrons = like electrons
+flavor-complex-parents = like someone's parents
 
 # Drink-specific flavors.
 

Resources/Prototypes/Entities/Objects/Consumable/Food/soup.yml

@@ -63,6 +63,7 @@
   components:
   - type: FlavorProfile
     flavors:
+      - creamy
       - peas
   - type: Sprite
     sprite: Objects/Consumable/Food/bowl.rsi
@@ -79,7 +80,6 @@
           Quantity: 8
         - ReagentId: Vitamin
           Quantity: 5
-# Tastes like creamy peas.
 
 # Salad
 
@@ -107,7 +107,6 @@
           Quantity: 6
         - ReagentId: Omnizine
           Quantity: 8
-# Tastes like leaves
 
 - type: entity
   name: herb salad
@@ -132,7 +131,6 @@
           Quantity: 8
         - ReagentId: Vitamin
           Quantity: 2
-# Tastes like leaves, apples.
 
 - type: entity
   name: valid salad
@@ -161,7 +159,6 @@
           Quantity: 2
         - ReagentId: DoctorsDelight
           Quantity: 5
-# Tastes like leaves, potato, meat, valids.
 
 - type: entity
   name: coleslaw
@@ -189,7 +186,6 @@
           Quantity: 2
         - ReagentId: Allicin
           Quantity: 3
-# Tastes like cabbage, onion, sour.
 
 - type: entity
   name: caesar salad
@@ -216,7 +212,6 @@
           Quantity: 8
         - ReagentId: Vitamin
           Quantity: 6
-# Tastes like cabbage, onion, croutons, cheese.
 
 - type: entity
   name: kimchi salad
@@ -244,7 +239,6 @@
           Quantity: 2
         - ReagentId: Allicin
           Quantity: 2
-# Tastes like spicy cabbage, carrots.
 
 - type: entity
   name: fruit salad
@@ -268,7 +262,6 @@
           Quantity: 2
         - ReagentId: Vitamin
           Quantity: 4
-# Tastes like fruit.
 
 - type: entity
   name: jungle salad
@@ -279,6 +272,7 @@
   - type: FlavorProfile
     flavors:
       - fruity
+      - jungle
   - type: Sprite
     layers:
     - state: bowl
@@ -292,7 +286,6 @@
           Quantity: 7
         - ReagentId: Vitamin
           Quantity: 4
-# Tastes like fruit, the jungle.
 
 - type: entity
   name: citrus salad
@@ -317,7 +310,6 @@
           Quantity: 18
         - ReagentId: Vitamin
           Quantity: 15
-# Tastes like sourness, leaves.
 
 - type: entity
   name: salad of eden
@@ -328,6 +320,7 @@
   - type: FlavorProfile
     flavors:
       - bitter
+      - hope
   - type: Sprite
     layers:
     - state: bowl
@@ -343,7 +336,6 @@
           Quantity: 5
         - ReagentId: Omnizine
           Quantity: 5
-# Tastes like extreme bitterness, hope.
 
 # Rice
 
@@ -360,7 +352,6 @@
     layers:
     - state: bowl
     - state: rice
-# Tastes like rice.
 
 - type: entity
   name: egg-fried rice
@@ -385,7 +376,7 @@
           Quantity: 4
         - ReagentId: Vitamin
           Quantity: 4
-# Tastes like rice, egg. Egg =/= Meat -Swept 2020
+
 - type: entity
   name: rice and pork
   parent: FoodBowlBase
@@ -413,7 +404,6 @@
           Quantity: 6.5
         - ReagentId: Epinephrine
           Quantity: 2
-# Tastes like rice, meat.
 
 - type: entity
   name: rice pudding
@@ -442,7 +432,6 @@
           Quantity: 5
         - ReagentId: Sugar
           Quantity: 5
-# Tastes like rice, sweetness.
 
 - type: entity
   name: black-eyed gumbo
@@ -471,7 +460,6 @@
           Quantity: 3
         - ReagentId: CapsaicinOil
           Quantity: 2
-# Tastes like building heat, savory meat, savory vegetables, suppressed rice.
 
 # Misc
 
@@ -484,6 +472,7 @@
   - type: FlavorProfile
     flavors:
       - oats
+      - milk
   - type: Sprite
     layers:
     - state: bowl
@@ -499,7 +488,6 @@
           Quantity: 2
         - ReagentId: Milk
           Quantity: 10
-# Tastes like oats, milk.
 
 - type: entity
   name: space liberty duff
@@ -507,11 +495,15 @@
   id: FoodJellyDuff
   description: Jello gelatin, from Alfred Hubbard's cookbook.
   components:
+  - type: FlavorProfile
+    flavors:
+      - jelly
+      - mushrooms
   - type: Sprite
     layers:
     - state: bowl
     - state: spacelibertyduff
-# Tastes like jelly, mushroom.
+
 - type: entity
   name: amanita jelly
   parent: FoodInjectableBase
@@ -534,7 +526,6 @@
           Quantity: 6
         - ReagentId: Amatoxin
           Quantity: 6
-# Tastes like jelly, mushroom.
 
 # Soup
 
@@ -544,6 +535,9 @@
   id: FoodSoupMeatball
   description: You've got balls kid, BALLS!
   components:
+  - type: FlavorProfile
+    flavors:
+      - meatballs
   - type: Sprite
     layers:
     - state: bowl
@@ -559,7 +553,6 @@
           Quantity: 8
         - ReagentId: Water
           Quantity: 10
-# Tastes like meatballs.
 
 - type: entity
   name: slime soup
@@ -567,6 +560,9 @@
   id: FoodSoupSlime
   description: If no water is available, you may substitute tears.
   components:
+  - type: FlavorProfile
+    flavors:
+      - slimy
   - type: Sprite
     layers:
     - state: bowl
@@ -582,7 +578,6 @@
           Quantity: 5
         - ReagentId: Water
           Quantity: 10
-# Tastes like slime.
 
 - type: entity
   name: tomato soup
@@ -590,6 +585,10 @@
   id: FoodSoupTomatoBlood
   description: Smells like copper... is that a bone?
   components:
+  - type: FlavorProfile
+    flavors:
+      - metallic
+      - tomato
   - type: Sprite
     layers:
     - state: bowl
@@ -601,11 +600,10 @@
         reagents:
         - ReagentId: Nutriment
           Quantity: 3
-        - ReagentId: Vitamin
-          Quantity: 5
-        - ReagentId: Water
+        - ReagentId: Iron
           Quantity: 10
-# Tastes like iron.
+        - ReagentId: Blood
+          Quantity: 5
 
 - type: entity
   name: wing fang chu
@@ -613,6 +611,10 @@
   id: FoodSoupWingFangChu
   description: A savory dish of alien wing wang in soy.
   components:
+  - type: FlavorProfile
+    flavors:
+      - meaty
+      - salty
   - type: Sprite
     layers:
     - state: bowl
@@ -628,7 +630,6 @@
           Quantity: 10
         - ReagentId: Vitamin
           Quantity: 7
-# Tastes like soy.
 
 - type: entity
   name: clown's tears
@@ -636,6 +637,9 @@
   id: FoodSoupClown
   description: Not very funny.
   components:
+  - type: FlavorProfile
+    flavors:
+      - bad-joke
   - type: Sprite
     layers:
     - state: bowl
@@ -651,7 +655,6 @@
           Quantity: 9
         - ReagentId: Water
           Quantity: 10
-# Tastes like a bad joke.
 
 - type: entity
   name: vegetable soup
@@ -659,6 +662,10 @@
   id: FoodSoupVegetable
   description: A true vegan meal.
   components:
+  - type: FlavorProfile
+    flavors:
+      - vegetables
+      - sadness
   - type: Sprite
     layers:
     - state: bowl
@@ -671,10 +678,11 @@
         - ReagentId: Nutriment
           Quantity: 5
         - ReagentId: Vitamin
-          Quantity: 8
+          Quantity: 7
         - ReagentId: Water
           Quantity: 10
-# Tastes like vegetables, sadness.
+        - ReagentId: Oculine
+          Quantity: 1
 
 - type: entity
   name: nettle soup
@@ -682,6 +690,9 @@
   id: FoodSoupNettle
   description: To think, the botanist would've beat you to death with one of these.
   components:
+  - type: FlavorProfile
+    flavors:
+      - nettles
   - type: Sprite
     layers:
     - state: bowl
@@ -701,7 +712,6 @@
           Quantity: 5
         - ReagentId: Histamine
           Quantity: 0.5
-# Tastes like nettles.
 
 - type: entity
   name: mystery soup
@@ -709,11 +719,13 @@
   id: FoodSoupMystery
   description: The mystery is, why aren't you eating it?
   components:
+  - type: FlavorProfile
+    flavors:
+      - chaos
   - type: Sprite
     layers:
     - state: bowl
     - state: mystery
-# Tastes like chaos.
 
 - type: entity
   name: bowl of hot chili
@@ -721,6 +733,9 @@
   id: FoodSoupChiliHot
   description: A Texan five-alarm chili!
   components:
+  - type: FlavorProfile
+    flavors:
+      - spicy
   - type: Sprite
     layers:
     - state: bowl
@@ -738,7 +753,6 @@
             Quantity: 4
           - ReagentId: Allicin
             Quantity: 3
-# Tastes like hot peppers.
 
 - type: entity
   name: cold chili
@@ -746,6 +760,10 @@
   id: FoodSoupChiliCold
   description: This slush is barely a liquid!
   components:
+  - type: FlavorProfile
+    flavors:
+      - minty
+      - tomato
   - type: Sprite
     layers:
     - state: bowl
@@ -759,7 +777,6 @@
             Quantity: 8
           - ReagentId: Vitamin
             Quantity: 4
-# Tastes like tomato, mint.
 
 - type: entity
   name: chili con carnival
@@ -767,6 +784,12 @@
   id: FoodSoupChiliClown
   description: A delicious stew of meat, chilies, and salty, salty clown tears.
   components:
+  - type: FlavorProfile
+    flavors:
+      - spicy
+      - tomato
+      - bad-joke
+      - parents
   - type: Sprite
     layers:
     - state: bowl
@@ -784,7 +807,6 @@
             Quantity: 4
           - ReagentId: Allicin
             Quantity: 3
-# Tastes like tomato, hot peppers, clown feet, kind of funny, someone's parents.
 
 - type: entity
   name: monkey's delight
@@ -792,6 +814,10 @@
   id: FoodSoupMonkey
   description: A delicious soup with hunks of monkey meat simmered to perfection, in a broth that tastes faintly of bananas.
   components:
+  - type: FlavorProfile
+    flavors:
+      - jungle
+      - banana
   - type: Sprite
     layers:
     - state: bowl
@@ -809,7 +835,6 @@
             Quantity: 1
           - ReagentId: Blackpepper
             Quantity: 1
-# Tastes like the jungle, banana.
 
 - type: entity
   name: tomato soup
@@ -817,6 +842,9 @@
   id: FoodSoupTomato
   description: Drinking this feels like being a vampire! A tomato vampire...
   components:
+  - type: FlavorProfile
+    flavors:
+      - tomato
   - type: Sprite
     layers:
     - state: bowl
@@ -832,7 +860,6 @@
             Quantity: 5
           - ReagentId: Water
             Quantity: 10
-# Tastes like tomato.
 
 - type: entity
   name: eyeball soup
@@ -840,6 +867,10 @@
   id: FoodSoupEyeball
   description: It's looking back at you...
   components:
+  - type: FlavorProfile
+    flavors:
+      - tomato
+      - squirming
   - type: Sprite
     layers:
     - state: bowl
@@ -853,7 +884,6 @@
             Quantity: 5
           - ReagentId: Vitamin
             Quantity: 3
-# Tastes like tomato, squirming.
 
 - type: entity
   name: miso soup
@@ -861,12 +891,16 @@
   id: FoodSoupMiso
   description: Salty, fishy soup, best had with ramen.
   components:
+  - type: FlavorProfile
+    flavors:
+      - miso
   - type: Food
     trash: FoodBowlFancy
   - type: Sprite
     layers:
     - state: bowl2
-    - state: milo ##Why is this misspelled and why does it break if I fix it
+    - state: miso
+        #rip milo
   - type: SolutionContainerManager
     solutions:
       food:
@@ -878,7 +912,6 @@
             Quantity: 3
           - ReagentId: Water
             Quantity: 10
-# Tastes like miso.
 
 - type: entity
   name: mushroom soup
@@ -886,6 +919,9 @@
   id: FoodSoupMushroom
   description: A delicious and hearty mushroom soup.
   components:
+  - type: FlavorProfile
+    flavors:
+      - mushroom
   - type: Sprite
     layers:
     - state: bowl
@@ -903,7 +939,6 @@
             Quantity: 5
           - ReagentId: Milk
             Quantity: 5
-# Tastes like mushroom.
 
 - type: entity
   name: beet soup
@@ -947,7 +982,7 @@
             Quantity: 4
           - ReagentId: Vitamin
             Quantity: 6
-# Tastes like
+# Tastes like beet.
 
 - type: entity
   name: stew
@@ -955,6 +990,11 @@
   id: FoodSoupStew
   description: A nice and warm stew. Healthy and strong.
   components:
+  - type: FlavorProfile
+    flavors:
+      - meaty
+      - tomato
+      - carrot
   - type: Sprite
     layers:
     - state: bowl
@@ -965,10 +1005,11 @@
         maxVol: 15
         reagents:
           - ReagentId: Nutriment
-            Quantity: 7
+            Quantity: 15
+          - ReagentId: Protein
+            Quantity: 5
           - ReagentId: Vitamin
             Quantity: 2
-# Tastes like tomato, carrot.
 
 - type: entity
   name: sweet potato soup
@@ -976,6 +1017,9 @@
   id: FoodSoupPotato
   description: Delicious sweet potato in soup form.
   components:
+  - type: FlavorProfile
+    flavors:
+      - sweet
   - type: Sprite
     layers:
     - state: bowl
@@ -997,6 +1041,9 @@
   id: FoodSoupOnion
   description: Good enough to make a grown mime cry.
   components:
+  - type: FlavorProfile
+    flavors:
+      - onion
   - type: Sprite
     layers:
     - state: bowl
@@ -1012,7 +1059,6 @@
             Quantity: 5
           - ReagentId: Allicin
             Quantity: 5
-# Tastes like onion, france.
 
 - type: entity
   name: bisque
@@ -1020,6 +1066,9 @@
   id: FoodSoupBisque
   description: A classic entrée from Space France.
   components:
+  - type: FlavorProfile
+    flavors:
+      - creamy
   - type: Sprite
     layers:
     - state: bowl
@@ -1037,7 +1086,7 @@
             Quantity: 6
           - ReagentId: Water
             Quantity: 5
-# Tastes like cream, crab.
+# Tastes like crab.
 
 - type: entity
   name: electron soup
@@ -1045,6 +1094,10 @@
   id: FoodSoupElectron
   description: A gastronomic curiosity of ethereal origin.
   components:
+  - type: FlavorProfile
+    flavors:
+      - mushrooms
+      - electrons
   - type: Sprite
     layers:
     - state: bowl
@@ -1058,7 +1111,6 @@
             Quantity: 3
           - ReagentId: Licoxide
             Quantity: 6
-# Tastes like mushroom, electrons.
 
 - type: entity
   name: bungo curry
@@ -1066,6 +1118,9 @@
   id: FoodSoupBungo
   description: A spicy vegetable curry made with the humble bungo fruit, Exotic!
   components:
+  - type: FlavorProfile
+    flavors:
+      - jungle
   - type: Sprite
     layers:
     - state: bowl
@@ -1081,4 +1136,4 @@
             Quantity: 5
           - ReagentId: CapsaicinOil
             Quantity: 5
-# Tastes like bungo, hot curry, tropical sweetness.
+# Tastes like bungo, hot curry.

Resources/Prototypes/Flavors/flavors.yml

@@ -679,6 +679,71 @@
   flavorType: Complex
   description: flavor-complex-bottledlightning
 
+- type: flavor
+  id: bad-joke
+  flavorType: Complex
+  description: flavor-complex-bad-joke
+
+- type: flavor
+  id: vegetables
+  flavorType: Complex
+  description: flavor-complex-vegetables
+
+- type: flavor
+  id: sadness
+  flavorType: Complex
+  description: flavor-complex-sadness
+
+- type: flavor
+  id: nettles
+  flavorType: Complex
+  description: flavor-complex-nettles
+
+- type: flavor
+  id: parents
+  flavorType: Complex
+  description: flavor-complex-parents
+
+- type: flavor
+  id: jungle
+  flavorType: Complex
+  description: flavor-complex-jungle
+
+- type: flavor
+  id: squirming
+  flavorType: Complex
+  description: flavor-complex-squirming
+
+- type: flavor
+  id: miso
+  flavorType: Complex
+  description: flavor-complex-miso
+
+- type: flavor
+  id: electrons
+  flavorType: Complex
+  description: flavor-complex-electrons
+
+- type: flavor
+  id: bottledlightning
+  flavorType: Complex
+  description: flavor-complex-bottledlightning
+
+- type: flavor
+  id: meatballs
+  flavorType: Complex
+  description: flavor-complex-meatballs
+
+- type: flavor
+  id: hope
+  flavorType: Complex
+  description: flavor-complex-hope
+
+- type: flavor
+  id: chaos
+  flavorType: Complex
+  description: flavor-complex-chaos
+  
 - type: flavor
   id: themartinez
   flavorType: Complex

Resources/Prototypes/Recipes/Cooking/meal_recipes.yml

@@ -511,6 +511,132 @@
   solids:
     FoodFlyAmanita: 3
 
+- type: microwaveMealRecipe
+  id: RecipeOnionSoup
+  name: onion soup recipe
+  result: FoodSoupOnion
+  time: 10
+  reagents:
+    Water: 10
+  solids:
+    FoodBowlBig: 1
+    FoodOnionSlice: 5
+    FoodCheeseSlice: 1
+
+- type: microwaveMealRecipe
+  id: RecipeMushroomSoup
+  name: mushroom soup recipe
+  result: FoodSoupMushroom
+  time: 10
+  reagents:
+    Water: 5
+    Milk: 5
+  solids:
+    FoodBowlBig: 1
+    FoodMushroom: 2
+
+- type: microwaveMealRecipe
+  id: RecipeStewSoup
+  name: stew recipe
+  result: FoodSoupStew
+  time: 10
+  reagents:
+    Water: 10
+  solids:
+    FoodBowlBig: 1
+    FoodMeatCutlet: 3
+    FoodTomato: 1
+    FoodPotato: 1
+    FoodCarrot: 1
+    FoodEggplant: 1
+    FoodMushroom: 1
+
+- type: microwaveMealRecipe
+  id: RecipeTomatoSoup
+  name: tomato soup recipe
+  result: FoodSoupTomato
+  time: 10
+  reagents:
+    Water: 10
+  solids:
+    FoodBowlBig: 1
+    FoodTomato: 2
+
+- type: microwaveMealRecipe
+  id: RecipeTomatoBloodSoup
+  name: tomato blood soup recipe
+  result: FoodSoupTomatoBlood
+  time: 10
+  reagents:
+    Blood: 10
+  solids:
+    FoodBowlBig: 1
+    FoodTomato: 2
+  #todo Replace with blood tomato
+
+- type: microwaveMealRecipe
+  id: RecipeWingFangChuSoup
+  name: wing fang chu recipe
+  result: FoodSoupWingFangChu
+  time: 10
+  reagents:
+    Soysauce: 5
+  solids:
+    FoodBowlBig: 1
+    FoodMeatXenoCutlet: 2
+
+- type: microwaveMealRecipe
+  id: RecipeWingFangChuSoupSpider
+  name: wing fang chu recipe
+  result: FoodSoupWingFangChu
+  time: 10
+  reagents:
+    Soysauce: 5
+  solids:
+    FoodBowlBig: 1
+    FoodMeatSpider: 2
+
+- type: microwaveMealRecipe
+  id: RecipeVegetableSoup
+  name: vegetable soup recipe
+  result: FoodSoupVegetable
+  time: 10
+  reagents:
+    Water: 5
+  solids:
+    FoodBowlBig: 1
+    FoodCorn: 1
+    FoodCarrot: 1
+    FoodPotato: 1
+    FoodEggplant: 1
+
+- type: microwaveMealRecipe
+  id: RecipeClownTearsSoup
+  name: clown tears soup recipe
+  result: FoodSoupClown
+  time: 10
+  reagents:
+    Water: 10
+  solids:
+    FoodBowlBig: 1
+    FoodBanana: 1
+    ShardGlass: 1
+    #idk probably replace shard with someting bananium when #14663 merged
+
+- type: microwaveMealRecipe
+  id: RecipeMonkeysDelightSoup
+  name: monkeys delight recipe
+  result: FoodSoupMonkey
+  time: 10
+  reagents:
+    Flour: 5
+    TableSalt: 1
+    Blackpepper: 1
+  solids:
+    FoodBowlBig: 1
+    FoodBanana: 1
+    MonkeyCube: 1
+
 #Other
 
 - type: microwaveMealRecipe
@@ -536,7 +662,7 @@
 
 - type: microwaveMealRecipe
   id: RecipeMisoColaSoup
-  name: salty sweet milocola soup recipe
+  name: salty sweet misocola soup recipe
   result: DisgustingSweptSoup
   time: 15
   reagents:

Resources/Textures/Objects/Consumable/Food/bowl.rsi/meta.json

@@ -86,7 +86,7 @@
       "name": "meatball"
     },
     {
-      "name": "milo"
+      "name": "miso"
     },
     {
       "name": "monkeydelight"