From: RumiTiger <154005209+RumiTiger@users.noreply.github.com> Date: Thu, 29 Aug 2024 01:30:58 +0000 (+0300) Subject: Cherry (#28962) X-Git-Url: https://git.smokeofanarchy.ru/gitweb.cgi?a=commitdiff_plain;h=d9b1369dae0b24d010f33f8fe05567b5f1cf0bd4;p=space-station-14.git 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 * 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 --- diff --git a/Resources/Locale/en-US/flavors/flavor-profiles.ftl b/Resources/Locale/en-US/flavors/flavor-profiles.ftl index 879bbb8812..eb6a43c1b4 100644 --- a/Resources/Locale/en-US/flavors/flavor-profiles.ftl +++ b/Resources/Locale/en-US/flavors/flavor-profiles.ftl @@ -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) diff --git a/Resources/Locale/en-US/nutrition/components/food-sequence.ftl b/Resources/Locale/en-US/nutrition/components/food-sequence.ftl index 0da77b7bc7..672b0a0e7a 100644 --- a/Resources/Locale/en-US/nutrition/components/food-sequence.ftl +++ b/Resources/Locale/en-US/nutrition/components/food-sequence.ftl @@ -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 diff --git a/Resources/Locale/en-US/reagents/meta/consumable/drink/juice.ftl b/Resources/Locale/en-US/reagents/meta/consumable/drink/juice.ftl index daa54bc3b1..b9fd54bc13 100644 --- a/Resources/Locale/en-US/reagents/meta/consumable/drink/juice.ftl +++ b/Resources/Locale/en-US/reagents/meta/consumable/drink/juice.ftl @@ -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. diff --git a/Resources/Locale/en-US/seeds/seeds.ftl b/Resources/Locale/en-US/seeds/seeds.ftl index 72b88ea3c5..138d3c9914 100644 --- a/Resources/Locale/en-US/seeds/seeds.ftl +++ b/Resources/Locale/en-US/seeds/seeds.ftl @@ -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 diff --git a/Resources/Prototypes/Catalog/Cargo/cargo_botany.yml b/Resources/Prototypes/Catalog/Cargo/cargo_botany.yml index a6671ff099..0a24240e7d 100644 --- 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 diff --git a/Resources/Prototypes/Catalog/Fills/Crates/botany.yml b/Resources/Prototypes/Catalog/Fills/Crates/botany.yml index c0d8a422f2..85b635289e 100644 --- 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 diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/seeds.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/seeds.yml index d625d42743..bd0990050b 100644 --- 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 diff --git a/Resources/Prototypes/Entities/Markers/Spawners/Random/Food_Drinks/food_produce.yml b/Resources/Prototypes/Entities/Markers/Spawners/Random/Food_Drinks/food_produce.yml index 0105c948c7..feee3cfbfd 100644 --- 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: diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml index 23c22e3bef..7a6f40fab6 100644 --- 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 diff --git a/Resources/Prototypes/Entities/Objects/Specific/Hydroponics/seeds.yml b/Resources/Prototypes/Entities/Objects/Specific/Hydroponics/seeds.yml index c9c372e277..56692f13cd 100644 --- 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 diff --git a/Resources/Prototypes/Flavors/flavors.yml b/Resources/Prototypes/Flavors/flavors.yml index 44966e32a7..f1d3e194ac 100644 --- 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 diff --git a/Resources/Prototypes/Hydroponics/seeds.yml b/Resources/Prototypes/Hydroponics/seeds.yml index bff2c019c1..7407a6b75f 100644 --- 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 diff --git a/Resources/Prototypes/Reagents/Consumable/Drink/juice.yml b/Resources/Prototypes/Reagents/Consumable/Drink/juice.yml index b9baf395d3..ff07c341d8 100644 --- 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" diff --git a/Resources/Prototypes/Recipes/Cooking/meal_recipes.yml b/Resources/Prototypes/Recipes/Cooking/meal_recipes.yml index ce38125627..4c1080c135 100644 --- 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 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 index 0000000000..d5667d2721 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 index 0000000000..16a55ee65f 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 index 0000000000..35c8da9203 --- /dev/null +++ b/Resources/Textures/Objects/Specific/Hydroponics/cherry.rsi/meta.json @@ -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 index 0000000000..12219e5067 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 index 0000000000..9d48f86f86 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 index 0000000000..b246d45d84 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 index 0000000000..21053aed96 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 index 0000000000..8073923cd6 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 index 0000000000..09a351404e 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 index 0000000000..8256962328 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 index 0000000000..038eff2fb2 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 index 0000000000..5bd86228a2 Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/cherry.rsi/stage-6.png differ