]> git.smokeofanarchy.ru Git - space-station-14.git/commitdiff
Cherry (#28962)
authorRumiTiger <154005209+RumiTiger@users.noreply.github.com>
Thu, 29 Aug 2024 01:30:58 +0000 (04:30 +0300)
committerGitHub <noreply@github.com>
Thu, 29 Aug 2024 01:30:58 +0000 (11:30 +1000)
* 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>
26 files changed:
Resources/Locale/en-US/flavors/flavor-profiles.ftl
Resources/Locale/en-US/nutrition/components/food-sequence.ftl
Resources/Locale/en-US/reagents/meta/consumable/drink/juice.ftl
Resources/Locale/en-US/seeds/seeds.ftl
Resources/Prototypes/Catalog/Cargo/cargo_botany.yml
Resources/Prototypes/Catalog/Fills/Crates/botany.yml
Resources/Prototypes/Catalog/VendingMachines/Inventories/seeds.yml
Resources/Prototypes/Entities/Markers/Spawners/Random/Food_Drinks/food_produce.yml
Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml
Resources/Prototypes/Entities/Objects/Specific/Hydroponics/seeds.yml
Resources/Prototypes/Flavors/flavors.yml
Resources/Prototypes/Hydroponics/seeds.yml
Resources/Prototypes/Reagents/Consumable/Drink/juice.yml
Resources/Prototypes/Recipes/Cooking/meal_recipes.yml
Resources/Textures/Objects/Specific/Hydroponics/cherry.rsi/dead.png [new file with mode: 0644]
Resources/Textures/Objects/Specific/Hydroponics/cherry.rsi/harvest.png [new file with mode: 0644]
Resources/Textures/Objects/Specific/Hydroponics/cherry.rsi/meta.json [new file with mode: 0644]
Resources/Textures/Objects/Specific/Hydroponics/cherry.rsi/pit.png [new file with mode: 0644]
Resources/Textures/Objects/Specific/Hydroponics/cherry.rsi/produce.png [new file with mode: 0644]
Resources/Textures/Objects/Specific/Hydroponics/cherry.rsi/seed.png [new file with mode: 0644]
Resources/Textures/Objects/Specific/Hydroponics/cherry.rsi/stage-1.png [new file with mode: 0644]
Resources/Textures/Objects/Specific/Hydroponics/cherry.rsi/stage-2.png [new file with mode: 0644]
Resources/Textures/Objects/Specific/Hydroponics/cherry.rsi/stage-3.png [new file with mode: 0644]
Resources/Textures/Objects/Specific/Hydroponics/cherry.rsi/stage-4.png [new file with mode: 0644]
Resources/Textures/Objects/Specific/Hydroponics/cherry.rsi/stage-5.png [new file with mode: 0644]
Resources/Textures/Objects/Specific/Hydroponics/cherry.rsi/stage-6.png [new file with mode: 0644]

index 879bbb88127b36d4f2bf8df166a7a7ef6b1fdbd2..eb6a43c1b44275b66d639c9a2e6735b97e9ef2fc 100644 (file)
@@ -123,6 +123,7 @@ flavor-complex-meatballs = like meatballs
 flavor-complex-nettles = like nettles
 flavor-complex-jungle = like jungle
 flavor-complex-vegetables = like vegetables
+flavor-complex-cherry = like cherries
 # use it when there multiple types of veggies
 
 ## Complex foodstuffs (cooked foods, joke flavors, etc)
index 0da77b7bc76b4d116c7313251edf7ca057d3b16f..672b0a0e7adddb0a58dfb187c46ffb981751d330 100644 (file)
@@ -72,6 +72,7 @@ food-sequence-content-suppermatter = suppermatter
 food-sequence-content-capfruit = capfruit
 food-sequence-content-berries = berries
 food-sequence-content-spacemans-trumpet = spacemans trupmet
+food-sequence-content-cherry = cherry
 
 # BURGERS
 
@@ -117,4 +118,4 @@ food-sequence-taco-gen = taco with {$content}
 
 # SKEWER
 
-food-sequence-skewer-gen = {$content} kebab
\ No newline at end of file
+food-sequence-skewer-gen = {$content} kebab
index daa54bc3b1bc6769c2c1d0660df6db2836a97374..b9fd54bc13737c0d497a1ab3cdc73b9ee3413c5b 100644 (file)
@@ -42,3 +42,6 @@ reagent-desc-juice-tomato = Tomatoes made into juice. What a waste of good tomat
 
 reagent-name-juice-watermelon = water melon juice
 reagent-desc-juice-watermelon = The delicious juice of a watermelon.
+
+reagent-name-juice-cherry = cherry juice
+reagent-desc-juice-cherry = Tasty cherry juice, sweet and tangy.
index 72b88ea3c55a4c9108861e132ea049807af5818d..138d3c9914d8af1a9ac13eb940322487380b5db7 100644 (file)
@@ -130,3 +130,5 @@ seeds-pyrotton-name = pyrotton
 seeds-pyrotton-display-name = pyrotton plant
 seeds-capfruit-name = capfruit
 seeds-capfruit-display-name = capfruit tree
+seeds-cherry-name = cherry
+seeds-cherry-display-name = cherry tree
index a6671ff0998d3e67a2c2490a518cee0a56cf9707..0a24240e7d00921437de345067dcc01482ee7443 100644 (file)
@@ -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
 
index c0d8a422f270aaebdaf42f9ec1f71e851f983b8e..85b635289e05240fdd5078f5c9d0e2960279377a 100644 (file)
@@ -91,3 +91,4 @@
       - id: GrapeSeeds
       - id: WatermelonSeeds
       - id: PeaSeeds
+      - id: CherrySeeds
index d625d427430c637498e50fa6b39cafe0ad82375c..bd0990050b3d9c0c175807c6f96b37c488de98b0 100644 (file)
@@ -9,6 +9,7 @@
     CarrotSeeds: 5
     CabbageSeeds: 5
     ChanterelleSeeds: 5
+    CherrySeeds: 5
     ChiliSeeds: 5
     CocoaSeeds: 3
     CornSeeds: 5
index 0105c948c75018833821d735e058309d5b428cdd..feee3cfbfd478bd71e990a8f3e3a8330fdb33276 100644 (file)
       - id: FoodCocoaBeans
         amount: !type:RangeNumberSelector
           range: 1, 5
+      - id: FoodCherry
+        amount: !type:RangeNumberSelector
+          range: 1, 5
     #rare
     - !type:GroupSelector
       children:
index 23c22e3befc0e2c9e0970f75dc71c0d98bb2ab86..7a6f40fab67373bb8f6d33e175b67026cc029dce 100644 (file)
     - 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
index c9c372e2773e5c8cb7cdb69a06b143de417b0abf..56692f13cdc8857e263c03bdfc0e47338354c37b 100644 (file)
   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
index 44966e32a7b93559afad094655955bcd2b521b8e..f1d3e194ac5ca6441a97541d25917add3e147619 100644 (file)
   id: paintthinner
   flavorType: Complex
   description: flavor-complex-paint-thinner
+
+- type: flavor
+  id: cherry
+  flavorType: Complex
+  description: flavor-complex-cherry
index bff2c019c180db7b72ffd23a206336d6598cffdd..7407a6b75fc65a600d244c9b120aaec21917b55f 100644 (file)
       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
index b9baf395d359f7a147eded25e05573be1dde43e8..ff07c341d890ff0aabac268fb003ba6f82e648bc 100644 (file)
   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"
index ce381256270e427e8f8356253845c08e73385cab..4c1080c135c5e2face1c40821e2b6cdabf28d26d 100644 (file)
     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
diff --git a/Resources/Textures/Objects/Specific/Hydroponics/cherry.rsi/dead.png b/Resources/Textures/Objects/Specific/Hydroponics/cherry.rsi/dead.png
new file mode 100644 (file)
index 0000000..d5667d2
Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/cherry.rsi/dead.png differ
diff --git a/Resources/Textures/Objects/Specific/Hydroponics/cherry.rsi/harvest.png b/Resources/Textures/Objects/Specific/Hydroponics/cherry.rsi/harvest.png
new file mode 100644 (file)
index 0000000..16a55ee
Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/cherry.rsi/harvest.png differ
diff --git a/Resources/Textures/Objects/Specific/Hydroponics/cherry.rsi/meta.json b/Resources/Textures/Objects/Specific/Hydroponics/cherry.rsi/meta.json
new file mode 100644 (file)
index 0000000..35c8da9
--- /dev/null
@@ -0,0 +1,44 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Taken from https://github.com/vgstation-coders/vgstation13/commit/1dbcf389b0ec6b2c51b002df5fef8dd1519f8068 and remade by RumiTiger",
+  "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"
+    },
+    {
+        "name": "pit"
+    }
+  ]
+}
diff --git a/Resources/Textures/Objects/Specific/Hydroponics/cherry.rsi/pit.png b/Resources/Textures/Objects/Specific/Hydroponics/cherry.rsi/pit.png
new file mode 100644 (file)
index 0000000..12219e5
Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/cherry.rsi/pit.png differ
diff --git a/Resources/Textures/Objects/Specific/Hydroponics/cherry.rsi/produce.png b/Resources/Textures/Objects/Specific/Hydroponics/cherry.rsi/produce.png
new file mode 100644 (file)
index 0000000..9d48f86
Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/cherry.rsi/produce.png differ
diff --git a/Resources/Textures/Objects/Specific/Hydroponics/cherry.rsi/seed.png b/Resources/Textures/Objects/Specific/Hydroponics/cherry.rsi/seed.png
new file mode 100644 (file)
index 0000000..b246d45
Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/cherry.rsi/seed.png differ
diff --git a/Resources/Textures/Objects/Specific/Hydroponics/cherry.rsi/stage-1.png b/Resources/Textures/Objects/Specific/Hydroponics/cherry.rsi/stage-1.png
new file mode 100644 (file)
index 0000000..21053ae
Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/cherry.rsi/stage-1.png differ
diff --git a/Resources/Textures/Objects/Specific/Hydroponics/cherry.rsi/stage-2.png b/Resources/Textures/Objects/Specific/Hydroponics/cherry.rsi/stage-2.png
new file mode 100644 (file)
index 0000000..8073923
Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/cherry.rsi/stage-2.png differ
diff --git a/Resources/Textures/Objects/Specific/Hydroponics/cherry.rsi/stage-3.png b/Resources/Textures/Objects/Specific/Hydroponics/cherry.rsi/stage-3.png
new file mode 100644 (file)
index 0000000..09a3514
Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/cherry.rsi/stage-3.png differ
diff --git a/Resources/Textures/Objects/Specific/Hydroponics/cherry.rsi/stage-4.png b/Resources/Textures/Objects/Specific/Hydroponics/cherry.rsi/stage-4.png
new file mode 100644 (file)
index 0000000..8256962
Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/cherry.rsi/stage-4.png differ
diff --git a/Resources/Textures/Objects/Specific/Hydroponics/cherry.rsi/stage-5.png b/Resources/Textures/Objects/Specific/Hydroponics/cherry.rsi/stage-5.png
new file mode 100644 (file)
index 0000000..038eff2
Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/cherry.rsi/stage-5.png differ
diff --git a/Resources/Textures/Objects/Specific/Hydroponics/cherry.rsi/stage-6.png b/Resources/Textures/Objects/Specific/Hydroponics/cherry.rsi/stage-6.png
new file mode 100644 (file)
index 0000000..5bd8622
Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/cherry.rsi/stage-6.png differ