From 391cc8e7a5252887ab45fe14f244dad010feca26 Mon Sep 17 00:00:00 2001 From: Nim <128169402+Nimfar11@users.noreply.github.com> Date: Mon, 10 Mar 2025 14:18:36 +0200 Subject: [PATCH] Green salad (#999) * green salad * maxvol * duplicate --- .../en-US/_CP14/flavors/flavor-profiles.ftl | 1 + .../ru-RU/_CP14/flavors/flavor-profiles.ftl | 1 + .../Objects/Consumable/Food/plate.yml | 3 ++ .../Objects/Consumable/Food/produce.yml | 3 +- .../Objects/Consumable/Food/salad.yml | 35 ++++++++++++++++++ Resources/Prototypes/_CP14/Flavors/flavor.yml | 5 +++ .../Recipes/Workbench/CookingTable/salad.yml | 17 +++++++++ Resources/Prototypes/_CP14/tags.yml | 6 +-- .../Consumable/Food/salad.rsi/green_salad.png | Bin 0 -> 470 bytes .../Consumable/Food/salad.rsi/meta.json | 14 +++++++ 10 files changed, 81 insertions(+), 4 deletions(-) create mode 100644 Resources/Prototypes/_CP14/Entities/Objects/Consumable/Food/salad.yml create mode 100644 Resources/Prototypes/_CP14/Recipes/Workbench/CookingTable/salad.yml create mode 100644 Resources/Textures/_CP14/Objects/Consumable/Food/salad.rsi/green_salad.png create mode 100644 Resources/Textures/_CP14/Objects/Consumable/Food/salad.rsi/meta.json diff --git a/Resources/Locale/en-US/_CP14/flavors/flavor-profiles.ftl b/Resources/Locale/en-US/_CP14/flavors/flavor-profiles.ftl index 7c3f453514..0dada06b73 100644 --- a/Resources/Locale/en-US/_CP14/flavors/flavor-profiles.ftl +++ b/Resources/Locale/en-US/_CP14/flavors/flavor-profiles.ftl @@ -25,3 +25,4 @@ cp14-flavor-complex-durandate = like cheap and tart cp14-flavor-complex-ale = like bread cp14-flavor-complex-bloody-tear = like sad and alcoholic cp14-flavor-complex-bottomless = like semi-divine and dangerous +cp14-flavor-complex-cucumber = like cucumber diff --git a/Resources/Locale/ru-RU/_CP14/flavors/flavor-profiles.ftl b/Resources/Locale/ru-RU/_CP14/flavors/flavor-profiles.ftl index a0272c3650..355247ccfe 100644 --- a/Resources/Locale/ru-RU/_CP14/flavors/flavor-profiles.ftl +++ b/Resources/Locale/ru-RU/_CP14/flavors/flavor-profiles.ftl @@ -25,3 +25,4 @@ cp14-flavor-complex-durandate = дешёвое и терпкое cp14-flavor-complex-ale = как хлеб cp14-flavor-complex-bloody-tear = печально и алкогольно cp14-flavor-complex-bottomless = полубожественно и опасно +cp14-flavor-complex-cucumber = как огурец diff --git a/Resources/Prototypes/_CP14/Entities/Objects/Consumable/Food/plate.yml b/Resources/Prototypes/_CP14/Entities/Objects/Consumable/Food/plate.yml index 4df2c6f1a1..c1bd15e878 100644 --- a/Resources/Prototypes/_CP14/Entities/Objects/Consumable/Food/plate.yml +++ b/Resources/Prototypes/_CP14/Entities/Objects/Consumable/Food/plate.yml @@ -11,6 +11,9 @@ - type: Item shape: - 0,0,1,0 + - type: Tag + tags: + - CP14Plate - type: entity id: CP14PlatePie diff --git a/Resources/Prototypes/_CP14/Entities/Objects/Consumable/Food/produce.yml b/Resources/Prototypes/_CP14/Entities/Objects/Consumable/Food/produce.yml index 05fd10b763..1bb072d6b7 100644 --- a/Resources/Prototypes/_CP14/Entities/Objects/Consumable/Food/produce.yml +++ b/Resources/Prototypes/_CP14/Entities/Objects/Consumable/Food/produce.yml @@ -197,7 +197,8 @@ size: Tiny - type: FlavorProfile flavors: - - CP14Water #TODO + - CP14Water + - CP14cucumber - type: Sprite sprite: _CP14/Objects/Flora/Farm/cucumber.rsi layers: diff --git a/Resources/Prototypes/_CP14/Entities/Objects/Consumable/Food/salad.yml b/Resources/Prototypes/_CP14/Entities/Objects/Consumable/Food/salad.yml new file mode 100644 index 0000000000..73bcbda07c --- /dev/null +++ b/Resources/Prototypes/_CP14/Entities/Objects/Consumable/Food/salad.yml @@ -0,0 +1,35 @@ +- type: entity + name: green salad + parent: FoodInjectableBase + id: CP14FoodSaladGreen + description: An extremely nutritious green salad, with a pumpkin twist. + categories: [ ForkFiltered ] + components: + - type: FlavorProfile + flavors: + - pumpkin + - cabbage + - CP14cucumber + - type: SolutionContainerManager + solutions: + food: + maxVol: 47 + reagents: + - ReagentId: PumpkinFlesh + Quantity: 12 + - ReagentId: Nutriment + Quantity: 22 + - ReagentId: Vitamin + Quantity: 10 + - type: Sprite + layers: + - sprite: _CP14/Objects/Consumable/Food/plates.rsi + state: plate + - sprite: _CP14/Objects/Consumable/Food/salad.rsi + state: green_salad + - type: Tag + tags: + - Fruit + - type: Food + trash: + - CP14Plate diff --git a/Resources/Prototypes/_CP14/Flavors/flavor.yml b/Resources/Prototypes/_CP14/Flavors/flavor.yml index c7efdc5346..2d8d801436 100644 --- a/Resources/Prototypes/_CP14/Flavors/flavor.yml +++ b/Resources/Prototypes/_CP14/Flavors/flavor.yml @@ -116,3 +116,8 @@ id: CP14bottomless flavorType: Complex description: cp14-flavor-complex-bottomless + +- type: flavor + id: CP14cucumber + flavorType: Complex + description: cp14-flavor-complex-cucumber diff --git a/Resources/Prototypes/_CP14/Recipes/Workbench/CookingTable/salad.yml b/Resources/Prototypes/_CP14/Recipes/Workbench/CookingTable/salad.yml new file mode 100644 index 0000000000..948e8d2b91 --- /dev/null +++ b/Resources/Prototypes/_CP14/Recipes/Workbench/CookingTable/salad.yml @@ -0,0 +1,17 @@ +- type: CP14Recipe + id: CP14FoodSaladGreen + tag: CP14RecipeCooking + craftTime: 5 + requirements: + - !type:ProtoIdResource + protoId: CP14Plate + - !type:ProtoIdResource + protoId: CP14FoodCabbageSlice + count: 4 + - !type:ProtoIdResource + protoId: CP14FoodPumpkinSlice + count: 3 + - !type:ProtoIdResource + protoId: CP14FoodCucumber + count: 2 + result: CP14FoodSaladGreen diff --git a/Resources/Prototypes/_CP14/tags.yml b/Resources/Prototypes/_CP14/tags.yml index 6bd6ea8851..28c16b49a4 100644 --- a/Resources/Prototypes/_CP14/tags.yml +++ b/Resources/Prototypes/_CP14/tags.yml @@ -28,9 +28,6 @@ - type: Tag id: CP14AmbientWater -- type: Tag - id: CP14Plate - - type: Tag id: CP14InkwellFittable @@ -103,6 +100,9 @@ - type: Tag id: CP14Arrow +- type: Tag + id: CP14Plate + - type: Tag id: CP14PlatePie diff --git a/Resources/Textures/_CP14/Objects/Consumable/Food/salad.rsi/green_salad.png b/Resources/Textures/_CP14/Objects/Consumable/Food/salad.rsi/green_salad.png new file mode 100644 index 0000000000000000000000000000000000000000..541b1d11f56c11e81e3a323319923a3522a16028 GIT binary patch literal 470 zcmV;{0V)28P)Iy`~|p%mWoY$M@z2+8V=n{a>Qy_a(i-*+x36bgmnIg-yMMLw4l zzBhy7dvZi^hu&Hbz2z3z`P8ci^_ma2xiJdmD-RMJneF%b*CqiAITxH8N5dq1$UyU*mX zlfsQaw@t81*gik{eT5FsJpT7HkLtgW32=M&my^^sZljN_v;{!>uXPsmZkB)i!KFF5 zr3<6E1VG`s2p1n^q~%wDUBb*90kE?a=d9gL;o_A3z7AGrL+mWY`BoWX%JUZcRS&k$ zFC{BomO$7mYJ~&n)&k6}rEqD^dJ${A(0~8rOZq`dTY3W7Ox^+2{a=}7idL4z2@Rw9 zoZ9*HWE+6Ac|!pJLcv4FfV&l_Howzn)Xi)6dz;4%eQkw8p-?FP16B2orr7B