From ee1222dcf4a645f6ed727bb6e57c727364e5cdb6 Mon Sep 17 00:00:00 2001 From: Nim <128169402+Nimfar11@users.noreply.github.com> Date: Thu, 26 Jun 2025 13:45:52 +0300 Subject: [PATCH] slice (#1472) --- .../en-US/_CP14/nutrition/food-sequence.ftl | 1 + .../ru-RU/_CP14/nutrition/food-sequence.ftl | 1 + .../Objects/Consumable/Food/produce.yml | 105 +++++++++++++++++- .../Recipes/Cooking/food_sequence_element.yml | 23 ++++ .../Objects/Flora/Farm/cucumber.rsi/meta.json | 3 + .../Flora/Farm/cucumber.rsi/slice1.png | Bin 0 -> 267 bytes .../Objects/Flora/Farm/onion.rsi/meta.json | 3 + .../Objects/Flora/Farm/onion.rsi/slice1.png | Bin 0 -> 326 bytes .../Objects/Flora/Farm/pepper.rsi/meta.json | 3 + .../Objects/Flora/Farm/pepper.rsi/slice1.png | Bin 0 -> 301 bytes 10 files changed, 137 insertions(+), 2 deletions(-) create mode 100644 Resources/Textures/_CP14/Objects/Flora/Farm/cucumber.rsi/slice1.png create mode 100644 Resources/Textures/_CP14/Objects/Flora/Farm/onion.rsi/slice1.png create mode 100644 Resources/Textures/_CP14/Objects/Flora/Farm/pepper.rsi/slice1.png diff --git a/Resources/Locale/en-US/_CP14/nutrition/food-sequence.ftl b/Resources/Locale/en-US/_CP14/nutrition/food-sequence.ftl index 4524744417..8f45ec586d 100644 --- a/Resources/Locale/en-US/_CP14/nutrition/food-sequence.ftl +++ b/Resources/Locale/en-US/_CP14/nutrition/food-sequence.ftl @@ -2,6 +2,7 @@ cp14-food-sequence-content-pumpkin = pumpkin cp14-food-sequence-content-cucumber = cucumber +cp14-food-sequence-content-pepper = pepper # SANDWICH diff --git a/Resources/Locale/ru-RU/_CP14/nutrition/food-sequence.ftl b/Resources/Locale/ru-RU/_CP14/nutrition/food-sequence.ftl index bb492af922..6b29c2d981 100644 --- a/Resources/Locale/ru-RU/_CP14/nutrition/food-sequence.ftl +++ b/Resources/Locale/ru-RU/_CP14/nutrition/food-sequence.ftl @@ -2,6 +2,7 @@ cp14-food-sequence-content-pumpkin = тыква cp14-food-sequence-content-cucumber = огурец +cp14-food-sequence-content-pepper = перец # SANDWICH diff --git a/Resources/Prototypes/_CP14/Entities/Objects/Consumable/Food/produce.yml b/Resources/Prototypes/_CP14/Entities/Objects/Consumable/Food/produce.yml index 777ed72b73..bf45ea892d 100644 --- a/Resources/Prototypes/_CP14/Entities/Objects/Consumable/Food/produce.yml +++ b/Resources/Prototypes/_CP14/Entities/Objects/Consumable/Food/produce.yml @@ -43,7 +43,7 @@ parent: FoodInjectableBase categories: [ ForkFiltered ] name: cabbage leaf - description: Time to make green salads + description: Time to make green salads. components: - type: Item size: Tiny @@ -158,7 +158,7 @@ parent: FoodInjectableBase categories: [ ForkFiltered ] name: potato - description: Cute potato + description: Cute potato. components: - type: Item size: Tiny @@ -237,9 +237,42 @@ Quantity: 2 - ReagentId: Water Quantity: 3 + - type: SliceableFood + count: 2 + sliceTime: 1 + slice: CP14FoodCucumberSlice - type: Tag tags: - CP14FarmFood + +- type: entity + id: CP14FoodCucumberSlice + parent: FoodInjectableBase + categories: [ ForkFiltered ] + name: cucumber slice + description: An evenly cut cucumber, still as green and watery. + components: + - type: Item + size: Tiny + - type: FlavorProfile + flavors: + - CP14Water + - CP14cucumber + - type: Sprite + sprite: _CP14/Objects/Flora/Farm/cucumber.rsi + layers: + - state: slice1 + - type: SolutionContainerManager + solutions: + food: + maxVol: 5 + reagents: + - ReagentId: Nutriment + Quantity: 2 + - ReagentId: Vitamin + Quantity: 1 + - ReagentId: Water + Quantity: 1.5 - type: FoodSequenceElement entries: CP14Sandwich: CP14CucumberSandwich @@ -436,6 +469,10 @@ base1: "" base2: "" base3: "" + - type: SliceableFood + count: 4 + sliceTime: 2 + slice: CP14FoodPepperSlice - type: SolutionContainerManager solutions: food: @@ -449,6 +486,35 @@ tags: - CP14FarmFood +- type: entity + id: CP14FoodPepperSlice + parent: FoodInjectableBase + categories: [ ForkFiltered ] + name: pepper slice + description: Still as red and sweetish. + components: + - type: Item + size: Tiny + - type: FlavorProfile + flavors: + - peppery + - type: Sprite + sprite: _CP14/Objects/Flora/Farm/pepper.rsi + layers: + - state: slice1 + - type: SolutionContainerManager + solutions: + food: + maxVol: 3.5 + reagents: + - ReagentId: Nutriment + Quantity: 2 + - ReagentId: Vitamin + Quantity: 1 + - type: FoodSequenceElement + entries: + CP14Sandwich: CP14PepperSandwich + - type: entity id: CP14FoodOnion parent: FoodInjectableBase @@ -483,8 +549,43 @@ Quantity: 4 - ReagentId: Allicin Quantity: 3 + - type: SliceableFood + count: 4 + sliceTime: 2 + slice: CP14FoodOnionSlice - type: CP14Seed plantProto: CP14PlantOnion - type: Tag tags: - CP14FarmFood + +- type: entity + id: CP14FoodOnionSlice + parent: FoodInjectableBase + categories: [ ForkFiltered ] + name: onion ring + description: A more tolerable and easy to eat onion ring. + components: + - type: Item + size: Tiny + - type: FlavorProfile + flavors: + - onion + - type: Sprite + sprite: _CP14/Objects/Flora/Farm/onion.rsi + layers: + - state: slice1 + - type: SolutionContainerManager + solutions: + food: + maxVol: 5 + reagents: + - ReagentId: Nutriment + Quantity: 2.2 + - ReagentId: Vitamin + Quantity: 1 + - ReagentId: Allicin + Quantity: 0.8 + - type: FoodSequenceElement + entries: + CP14Sandwich: CP14OnionSandwich diff --git a/Resources/Prototypes/_CP14/Recipes/Cooking/food_sequence_element.yml b/Resources/Prototypes/_CP14/Recipes/Cooking/food_sequence_element.yml index d1dc1b638b..96beac71c1 100644 --- a/Resources/Prototypes/_CP14/Recipes/Cooking/food_sequence_element.yml +++ b/Resources/Prototypes/_CP14/Recipes/Cooking/food_sequence_element.yml @@ -96,3 +96,26 @@ state: slice1 tags: - Fruit + +# Pepper + +- type: foodSequenceElement + id: CP14PepperSandwich + name: cp14-food-sequence-content-pepper + sprites: + - sprite: _CP14/Objects/Flora/Farm/pepper.rsi + state: slice1 + tags: + - Vegetable + +# Onion + +- type: foodSequenceElement + id: CP14OnionSandwich + name: food-sequence-content-onion + sprites: + - sprite: _CP14/Objects/Flora/Farm/onion.rsi + state: slice1 + tags: + - Vegetable + - Slice diff --git a/Resources/Textures/_CP14/Objects/Flora/Farm/cucumber.rsi/meta.json b/Resources/Textures/_CP14/Objects/Flora/Farm/cucumber.rsi/meta.json index a8586fd342..c760ebc254 100644 --- a/Resources/Textures/_CP14/Objects/Flora/Farm/cucumber.rsi/meta.json +++ b/Resources/Textures/_CP14/Objects/Flora/Farm/cucumber.rsi/meta.json @@ -18,6 +18,9 @@ }, { "name": "base4" + }, + { + "name": "slice1" } ] } \ No newline at end of file diff --git a/Resources/Textures/_CP14/Objects/Flora/Farm/cucumber.rsi/slice1.png b/Resources/Textures/_CP14/Objects/Flora/Farm/cucumber.rsi/slice1.png new file mode 100644 index 0000000000000000000000000000000000000000..8207b7efcada54cce7f20603dfd45455ffa8b565 GIT binary patch literal 267 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}M?GB}Ln2z= zURcO|C_$k8VfY3KUOo{+-r3x2uD(qQYT<9a*&@Hi2MF-E&5mfv6!%e*(9w1~T#%T^ z_B-A9hF$x~>PNEW-yb`0D7O44U#W7q*){&^CrgHNiASn-T)sE`-?xhV6z%P|)jO2C zZp!#_M=U6D&S0NW*=N-*xWK^Z+3vg)AGz?q?OCiqv8*WFH@i+gtxMW7_fc7HlLeE) zhxz+?H_W-O;d_c9gqzn)rf|;H-S6eU-O|4xw_=O6)=5Xj7J)~Xxo1x_>F#>@Qv&EA N22WQ%mvv4FO#rwUXx9J$ literal 0 HcmV?d00001 diff --git a/Resources/Textures/_CP14/Objects/Flora/Farm/onion.rsi/meta.json b/Resources/Textures/_CP14/Objects/Flora/Farm/onion.rsi/meta.json index 0e000b787a..ec4cd529b6 100644 --- a/Resources/Textures/_CP14/Objects/Flora/Farm/onion.rsi/meta.json +++ b/Resources/Textures/_CP14/Objects/Flora/Farm/onion.rsi/meta.json @@ -15,6 +15,9 @@ }, { "name": "base3" + }, + { + "name": "slice1" } ] } diff --git a/Resources/Textures/_CP14/Objects/Flora/Farm/onion.rsi/slice1.png b/Resources/Textures/_CP14/Objects/Flora/Farm/onion.rsi/slice1.png new file mode 100644 index 0000000000000000000000000000000000000000..23b61650754f324c481b642895a370aad4c18f74 GIT binary patch literal 326 zcmV-M0lEH(P)Px$07*naR9J=W(!XlLP!z}UZ%c=CN`i%ey;~uh&?!i95b5IBc2MXuxcDGh`V2xd zsBa(+MT(Qqt*#fPptJ#pY;j6J=yC*Uhw~XP=g*JJ0i~2u>W`fr+h}KT4p6zO0&p32 zkD4WJDi$x-yYlV(>xcGz#CEg7-1S8>Ma6a&=ktZd4?LQU7FlZ9ZdL%y7Z!l%)`&u! zO9B+%T`Yh9_++`>aeWi<@briucxBB=0ywV04?M=h5sqtUHd@qcAz5mfzD>#+i3>?_ zGDzq=cK{dPx#=Sf6CR9J=Wk}(RxKoCX$igqaki6A+ENeaOOq)6cftZdR-c>oXK8SK;8n8H?4 zhDb^}WN(Tj-dDYHm=kFh80fu21hWRt%o946Usdnuq3E7X-;QJZY z_k{ug%QUo}%SxYT*AvN;boppcm1P=;Z!g&W8k^Bh_pk2@Wtj$YS&>3?C;|5J2>^(k zP+W_i*5{W%HFaD6c>n;2Z!aC9Sx4lAB632J%L-{-lKjY@W;qzEl{?gRv;SuDv@WrI zWFPx>sR6RdLBy9pPd+aK)t;L2IKwau!vMe=7Ku?L>Y?D500000NkvXXu0mjf23vk6 literal 0 HcmV?d00001