New crops: Berries and Bungo (#19800)

* Add berries

* Berry recipes

* Add bungo fruit

* yml tweaks

* yummy poisonous pits

* Technically it's a seed

* Revert "Technically it's a seed"

This reverts commit be892cf119c1e733ac2922b878aaa476f435152a.

Slapping the seed component onto it led to unforeseen consequences, and I don't want to mess with the seed system for a mostly useless gimmick.

* Revert 2 Electric Boogaloo

This reverts commit 2c4fb34250e9369085d49e730de3dab0e077b687.

* Small rewording

* Cocoa balancing

* Oops

Resources/Locale/en-US/botany/components/seed-component.ftl

@@ -1,6 +1,6 @@
 ## Entity
 
-seed-component-description = It has a picture of [color=yellow]{$seedName}[/color] on the front.
+seed-component-description = It looks like you can grow [color=yellow]{$seedName}[/color] from these.
 seed-component-has-variety-tag = It's tagged as variety [color=lightgray]no. {$seedUid}[/color].
 seed-component-plant-yield-text = Plant Yield:    [color=lightblue]{$seedYield}[/color]
 seed-component-plant-potency-text = Plant Potency: [color=lightblue]{$seedPotency}[/color]

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

@@ -103,6 +103,7 @@ flavor-complex-orange = like oranges
 flavor-complex-watermelon = like watermelon
 flavor-complex-garlic = like garlic
 flavor-complex-grape = like grapes
+flavor-complex-berry = like berries
 flavor-complex-meatballs = like meatballs
 flavor-complex-nettles = like nettles
 flavor-complex-jungle = like jungle

Resources/Locale/en-US/reagents/meta/toxins.ftl

@@ -63,3 +63,6 @@ reagent-desc-honk = A toxin found in bananium. Causes severe honking and interna
 
 reagent-name-lead = lead
 reagent-desc-lead = A slow-acting but incredibly lethal toxin found in steel, albiet in trace amounts. Tasteless.
+
+reagent-name-bungotoxin = bungotoxin
+reagent-desc-bungotoxin = A moderately slow-acting poison found within the pit of the bungo fruit.

Resources/Locale/en-US/seeds/seeds.ftl

@@ -93,3 +93,7 @@ seeds-grape-name = grape
 seeds-grape-display-name = grape plant
 seeds-cocoa-name = cocoa
 seeds-cocoa-display-name = cocoa plant
+seeds-berries-name = berries
+seeds-berries-display-name = berry bush
+seeds-bungo-name = bungo
+seeds-bungo-display-name = bungo plant

Resources/Prototypes/Catalog/Fills/Crates/botany.yml

@@ -20,6 +20,8 @@
         amount: 2
       - id: PineappleSeeds
         amount: 2
+      - id: BungoSeeds
+        amount: 2
 
 - type: entity
   id: CrateHydroponicsSeedsMedicinal

Resources/Prototypes/Catalog/VendingMachines/Inventories/seeds.yml

@@ -32,5 +32,6 @@
     WheatSeeds: 5
     WatermelonSeeds: 5
     CocoaSeeds: 3
+    BerrySeeds: 5
   emaggedInventory:
     FlyAmanitaSeeds: 1

Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/pie.yml

@@ -154,8 +154,7 @@
   - type: FlavorProfile
     flavors:
       - sweet
-      - banana
-      - creamy
+      - berry
   - type: Sprite
     layers:
     - state: tin
@@ -172,6 +171,7 @@
   - type: FlavorProfile
     flavors:
       - sweet
+      - berry
   - type: Sprite
     layers:
     - state: plain-slice

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

@@ -1451,3 +1451,84 @@
       reagents:
       - ReagentId: JuiceGrape
         Quantity: 10
+
+- type: entity
+  name: berries
+  parent: FoodProduceBase
+  id: FoodBerries
+  description: A handful of various types of berries.
+  components:
+  - type: FlavorProfile
+    flavors:
+      - berry
+  - type: SolutionContainerManager
+    solutions:
+      food:
+        maxVol: 11
+        reagents:
+        - ReagentId: Nutriment
+          Quantity: 5
+        - ReagentId: Vitamin
+          Quantity: 4
+  - type: Sprite
+    sprite: Objects/Specific/Hydroponics/berries.rsi
+  - type: Produce
+    seedId: berries
+  - type: Extractable
+    juiceSolution:
+      reagents:
+      - ReagentId: JuiceBerry
+        Quantity: 10
+
+- type: entity
+  name: bungo fruit
+  parent: FoodProduceBase
+  id: FoodBungo
+  description: The humble bungo fruit.
+  components:
+  - type: FlavorProfile
+    flavors:
+      - bungo
+  - type: Food
+    trash: FoodBungoPit
+  - type: SolutionContainerManager
+    solutions:
+      food:
+        maxVol: 20
+        reagents:
+        - ReagentId: Nutriment
+          Quantity: 10
+        - ReagentId: Enzyme
+          Quantity: 10
+  - type: Sprite
+    sprite: Objects/Specific/Hydroponics/bungo.rsi
+  - type: Produce
+    seedId: bungo
+
+- type: entity
+  name: bungo pit
+  parent: FoodInjectableBase
+  id: FoodBungoPit
+  components:
+  - type: Sprite
+    sprite: Objects/Specific/Hydroponics/bungo.rsi
+    state: pit
+  - type: Tag
+    tags:
+    - Recyclable
+    - Trash
+  - type: SolutionContainerManager
+    solutions:
+      food:
+        maxVol: 7
+        reagents:
+        - ReagentId: Nutriment
+          Quantity: 2
+        - ReagentId: Bungotoxin
+          Quantity: 5
+  - type: Extractable
+    grindableSolutionName: food
+  - type: Seed
+    seedId: bungo
+  - type: SpaceGarbage
+  - type: BadFood

Resources/Prototypes/Entities/Objects/Specific/Hydroponics/seeds.yml

@@ -477,4 +477,24 @@
       seedId: cocoa
     - type: Sprite
       sprite: Objects/Specific/Hydroponics/cocoa.rsi
-      
+
+- type: entity
+  parent: SeedBase
+  name: packet of berry seeds
+  id: BerrySeeds
+  components:
+    - type: Seed
+      seedId: berries
+    - type: Sprite
+      sprite: Objects/Specific/Hydroponics/berries.rsi
+
+- type: entity
+  parent: SeedBase
+  name: packet of bungo seeds
+  description: "Don't eat the pits."
+  id: BungoSeeds
+  components:
+    - type: Seed
+      seedId: bungo
+    - type: Sprite
+      sprite: Objects/Specific/Hydroponics/bungo.rsi

Resources/Prototypes/Flavors/flavors.yml

@@ -729,6 +729,11 @@
   flavorType: Complex
   description: flavor-complex-grape
 
+- type: flavor
+  id: berry
+  flavorType: Complex
+  description: flavor-complex-berry
+
 - type: flavor
   id: garlic
   flavorType: Complex

Resources/Prototypes/Hydroponics/seeds.yml

@@ -1235,7 +1235,8 @@
   production: 6
   yield: 6
   idealLight: 7
-  waterConsumption: 6
+  waterConsumption: 1
+  nutrientConsumption: 0.8
   idealHeat: 298
   chemicals:
     Vitamin:
@@ -1246,3 +1247,58 @@
       Min: 1
       Max: 2
       PotencyDivisor: 50
+
+- type: seed
+  id: berries
+  name: seeds-berries-name
+  noun: seeds-noun-seeds
+  displayName: seeds-berries-display-name
+  plantRsi: Objects/Specific/Hydroponics/berries.rsi
+  packetPrototype: BerrySeeds
+  productPrototypes:
+    - FoodBerries
+  harvestRepeat: Repeat
+  lifespan: 50
+  maturation: 6
+  production: 6
+  yield: 4
+  idealLight: 7
+  nutrientConsumption: 0.6
+  chemicals:
+    Nutriment:
+      Min: 2
+      Max: 5
+      PotencyDivisor: 30
+    Vitamin:
+      Min: 1
+      Max: 4
+      PotencyDivisor: 40	
+
+- type: seed
+  id: bungo
+  name: seeds-bungo-name
+  noun: seeds-noun-seeds
+  displayName: seeds-bungo-display-name
+  plantRsi: Objects/Specific/Hydroponics/bungo.rsi
+  packetPrototype: BungoSeeds
+  productPrototypes:
+    - FoodBungo
+  harvestRepeat: Repeat
+  lifespan: 50
+  maturation: 8
+  production: 6
+  potency: 10
+  yield: 3
+  idealLight: 8
+  idealHeat: 298
+  growthStages: 4
+  waterConsumption: 0.6
+  chemicals:
+    Nutriment:
+      Min: 5
+      Max: 10
+      PotencyDivisor: 20
+    Enzyme:
+      Min: 5
+      Max: 10
+      PotencyDivisor: 20

Resources/Prototypes/Reagents/Consumable/Drink/juice.yml

@@ -23,7 +23,7 @@
   parent: BaseDrink
   desc: reagent-desc-juice-berry
   physicalDesc: reagent-physical-desc-sweet
-  flavor: juice
+  flavor: berry
   color: "#660099"
 
 - type: reagent

Resources/Prototypes/Reagents/toxins.yml

@@ -533,3 +533,19 @@
         damage:
           types:
             Poison: 0.6 # Makes it 20 damage per unit.
+
+- type: reagent
+  id: Bungotoxin
+  name: reagent-name-bungotoxin
+  group: Toxins
+  desc: reagent-desc-bungotoxin
+  physicalDesc: reagent-physical-desc-nondescript
+  color: "#EBFF8E"
+  metabolisms:
+    Poison:
+      metabolismRate: 0.2
+      effects:
+      - !type:HealthChange
+        damage:
+          types:
+            Poison: 1.8

Resources/Prototypes/Recipes/Cooking/meal_recipes.yml

@@ -868,6 +868,18 @@
     FoodBanana: 1
     MonkeyCube: 1
 
+- type: microwaveMealRecipe
+  id: RecipeBungoSoup
+  name: bungo soup recipe
+  result: FoodSoupBungo
+  time: 10
+  reagents:
+    Water: 5
+  solids:
+    FoodBowlBig: 1
+    FoodBungo: 2
+    FoodChili: 1
+
 #Other
 
 - type: microwaveMealRecipe
@@ -959,6 +971,18 @@
     Milk: 5
     Egg: 6
 
+- type: microwaveMealRecipe
+  id: RecipeBlueberryPancake
+  name: blueberry pancake recipe
+  result: FoodBakedPancakeBb
+  time: 5
+  reagents:
+    Flour: 5
+    Milk: 5
+    Egg: 6
+  solids:
+    FoodBerries: 2
+
 - type: microwaveMealRecipe
   id: RecipeWaffles
   name: waffle recipe
@@ -1048,6 +1072,16 @@
     FoodApple: 3
     FoodPlateTin: 1
 
+- type: microwaveMealRecipe
+  id: RecipeBerryClafoutis
+  name: berry clafoutis
+  result: FoodPieClafoutis
+  time: 15
+  solids:
+    FoodDoughPie: 1
+    FoodBerries: 3
+    FoodPlateTin: 1
+
 - type: microwaveMealRecipe
   id: RecipeMeatPie
   name: meat pie recipe
@@ -1104,6 +1138,15 @@
     FoodCakePlain: 1
     FoodOrange: 3
 
+- type: microwaveMealRecipe
+  id: RecipeBlueberryCake
+  name: blueberry cake recipe
+  result: FoodCakeBlueberry
+  time: 5
+  solids:
+    FoodCakePlain: 1
+    FoodBerries: 3
+
 - type: microwaveMealRecipe
   id: RecipeLimeCake
   name: lime cake recipe

Resources/Textures/Objects/Specific/Hydroponics/berries.rsi/meta.json

@@ -0,0 +1,41 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Taken from tgstation: https://github.com/tgstation/tgstation/commit/696dfcc59c9e65e7bbe3923d1f7e880ea384783f",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "dead"
+    },
+    {
+      "name": "harvest"
+    },
+    {
+      "name": "produce"
+    },
+    {
+      "name": "seed"
+    },
+    {
+      "name": "stage-1"
+    },
+    {
+      "name": "stage-2"
+    },
+    {
+      "name": "stage-3"
+    },
+    {
+      "name": "stage-4"
+    },
+    {
+      "name": "stage-5"
+    },
+    {
+      "name": "stage-6"
+    }
+  ]
+}

Resources/Textures/Objects/Specific/Hydroponics/bungo.rsi/meta.json

@@ -0,0 +1,38 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Taken from tgstation: https://github.com/tgstation/tgstation/commit/b3399ffe39f9ace645123c98323c4832412cc641",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "dead"
+    },
+    {
+      "name": "harvest"
+    },
+    {
+      "name": "produce"
+    },
+    {
+      "name": "pit"
+    },
+    {
+      "name": "seed"
+    },
+    {
+      "name": "stage-1"
+    },
+    {
+      "name": "stage-2"
+    },
+    {
+      "name": "stage-3"
+    },
+    {
+      "name": "stage-4"
+    }
+  ]
+}