Cherry (#28962)

* Add files via upload * Update produce.yml * Update produce.yml * Update seeds.yml * Update flavor-profiles.ftl * Update flavors.yml * Update meal_recipes.yml * Update food_produce.yml * Update meta.json * Update seeds.yml * Update botany.yml * Delete Resources/Textures/Objects/Specific/Hydroponics/cherry.rsi/meta.json * Create meta.json * Delete Resources/Textures/Objects/Specific/Hydroponics/cherry.rsi/meta.json * Create meta.json * Update produce.yml * Update produce.yml * Update produce.yml * Update food_produce.yml * Update food_produce.yml * Update produce.yml * Apply suggestions from code review Co-authored-by: Tayrtahn <tayrtahn@gmail.com> * Update seeds.yml * Update juice.yml * Update juice.ftl * Update seeds.ftl * Update seeds.yml * Update cargo_botany.yml * Update cargo_botany.yml * Update cargo_botany.yml * Update cargo_vending.yml * Update cargo_vending.yml * Update seeds.yml * Update seeds.yml * Update meta.json * Update produce.yml * Cherry Tree * Alphabetical order * Update food_produce.yml * Update food-sequence.ftl * Update food-sequence.ftl * Update produce.yml * Update produce.yml * Update food-sequence.ftl --------- Co-authored-by: Tayrtahn <tayrtahn@gmail.com>
2024-08-29 04:30:58 +03:00
parent 26ba9918f3
commit d9b1369dae
26 changed files with 189 additions and 11 deletions
--- a/Resources/Prototypes/Catalog/Cargo/cargo_botany.yml
+++ b/Resources/Prototypes/Catalog/Cargo/cargo_botany.yml
@@ -34,7 +34,7 @@
    sprite: Objects/Specific/Hydroponics/apple.rsi
    state: seed
  product: CrateHydroponicsSeeds
-  cost: 550
+  cost: 600
  category: cargoproduct-category-name-hydroponics
  group: market

--- a/Resources/Prototypes/Catalog/Fills/Crates/botany.yml
+++ b/Resources/Prototypes/Catalog/Fills/Crates/botany.yml
@@ -91,3 +91,4 @@
      - id: GrapeSeeds
      - id: WatermelonSeeds
      - id: PeaSeeds
+      - id: CherrySeeds
--- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/seeds.yml
+++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/seeds.yml
@@ -9,6 +9,7 @@
    CarrotSeeds: 5
    CabbageSeeds: 5
    ChanterelleSeeds: 5
+    CherrySeeds: 5
    ChiliSeeds: 5
    CocoaSeeds: 3
    CornSeeds: 5
--- a/Resources/Prototypes/Entities/Markers/Spawners/Random/Food_Drinks/food_produce.yml
+++ b/Resources/Prototypes/Entities/Markers/Spawners/Random/Food_Drinks/food_produce.yml
@@ -139,6 +139,9 @@
      - id: FoodCocoaBeans
        amount: !type:RangeNumberSelector
          range: 1, 5
+      - id: FoodCherry
+        amount: !type:RangeNumberSelector
+          range: 1, 5
    #rare
    - !type:GroupSelector
      children:
--- a/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml
@@ -2573,3 +2573,75 @@
    - CottonBoll
  - type: Extractable
    grindableSolutionName: food
+
+- type: entity
+  name: cherry
+  parent: FoodProduceBase
+  id: FoodCherry
+  description: Juicy red cherry with a pit inside.
+  components:
+  - type: FlavorProfile
+    flavors:
+      - cherry
+  - type: Food
+    trash:
+    - TrashCherryPit
+  - type: SolutionContainerManager
+    solutions:
+      food:
+        maxVol: 8
+        reagents:
+        - ReagentId: Nutriment
+          Quantity: 3
+        - ReagentId: Vitamin
+          Quantity: 3
+  - type: Sprite
+    sprite: Objects/Specific/Hydroponics/cherry.rsi
+  - type: Produce
+    seedId: cherry
+  - type: Extractable
+    juiceSolution:
+      reagents:
+      - ReagentId: JuiceCherry
+        Quantity: 5
+  - type: Tag
+    tags:
+    - Fruit
+  - type: FoodSequenceElement
+    sprite:
+      sprite: Objects/Specific/Hydroponics/cherry.rsi
+      state: produce
+    entries:
+      burger:
+        name: food-sequence-content-cherry
+      taco:
+        name: food-sequence-content-cherry
+
+- type: entity
+  name: cherry pit
+  parent: FoodInjectableBase
+  id: TrashCherryPit
+  components:
+  - type: Sprite
+    sprite: Objects/Specific/Hydroponics/cherry.rsi
+    state: pit
+  - type: Item
+    sprite: Objects/Specific/Hydroponics/cherry.rsi
+    heldPrefix: pit
+  - type: Tag
+    tags:
+    - Recyclable
+    - Trash
+  - type: SolutionContainerManager
+    solutions:
+      food:
+        maxVol: 1
+        reagents:
+        - ReagentId: Toxin
+          Quantity: 1
+  - type: Extractable
+    grindableSolutionName: food
+  - type: Seed
+    seedId: cherry
+  - type: SpaceGarbage
+  - type: BadFood
--- a/Resources/Prototypes/Entities/Objects/Specific/Hydroponics/seeds.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/Hydroponics/seeds.yml
@@ -672,3 +672,13 @@
  components:
    - type: Seed
      seedId: fakeCapfruit
+
+- type: entity
+  parent: SeedBase
+  name: packet of cherry seeds
+  id: CherrySeeds
+  components:
+    - type: Seed
+      seedId: cherry
+    - type: Sprite
+      sprite: Objects/Specific/Hydroponics/cherry.rsi
--- a/Resources/Prototypes/Flavors/flavors.yml
+++ b/Resources/Prototypes/Flavors/flavors.yml
@@ -1108,3 +1108,8 @@
  id: paintthinner
  flavorType: Complex
  description: flavor-complex-paint-thinner
+
+- type: flavor
+  id: cherry
+  flavorType: Complex
+  description: flavor-complex-cherry
--- a/Resources/Prototypes/Hydroponics/seeds.yml
+++ b/Resources/Prototypes/Hydroponics/seeds.yml
@@ -1799,3 +1799,29 @@
      Min: 4
      Max: 8
      PotencyDivisor: 30
+
+- type: seed
+  id: cherry
+  name: seeds-cherry-name
+  noun: seeds-noun-seeds
+  displayName: seeds-cherry-display-name
+  plantRsi: Objects/Specific/Hydroponics/cherry.rsi
+  packetPrototype: CherrySeeds
+  productPrototypes:
+    - FoodCherry
+  harvestRepeat: Repeat
+  lifespan: 55
+  maturation: 6
+  production: 6
+  yield: 5
+  potency: 10
+  idealLight: 6
+  chemicals:
+    Nutriment:
+      Min: 1
+      Max: 3
+      PotencyDivisor: 30
+    Vitamin:
+      Min: 1
+      Max: 3
+      PotencyDivisor: 40
--- a/Resources/Prototypes/Reagents/Consumable/Drink/juice.yml
+++ b/Resources/Prototypes/Reagents/Consumable/Drink/juice.yml
@@ -161,3 +161,12 @@
  metamorphicMaxFillLevels: 4
  metamorphicFillBaseName: fill-
  metamorphicChangeColor: false
+
+- type: reagent
+  id: JuiceCherry
+  name: reagent-name-juice-cherry
+  parent: BaseJuice
+  desc: reagent-desc-juice-cherry
+  physicalDesc: reagent-physical-desc-sweet
+  flavor: cherry
+  color: "#84031a"
--- a/Resources/Prototypes/Recipes/Cooking/meal_recipes.yml
+++ b/Resources/Prototypes/Recipes/Cooking/meal_recipes.yml
@@ -996,15 +996,15 @@
    FoodBerries: 3
    FoodPlateTin: 1

-#- type: microwaveMealRecipe
-#  id: RecipeCherryPie
-#  name: cherry pie recipe
-#  result: FoodPieCherry
-#  time: 15
-#  solids:
-#    FoodDoughPie: 1
-#    FoodCherry: 3 #cherries don't exist yet
-#    FoodPlateTin: 1
+- type: microwaveMealRecipe
+  id: RecipeCherryPie
+  name: cherry pie recipe
+  result: FoodPieCherry
+  time: 15
+  solids:
+    FoodDoughPie: 1
+    FoodCherry: 5
+    FoodPlateTin: 1

 - type: microwaveMealRecipe
  id: RecipeFrostyPie