From 92479a4c12d67ef254564a49c3aa17d87464a5b1 Mon Sep 17 00:00:00 2001 From: Nrd-K Date: Fri, 6 Dec 2024 21:29:41 +0300 Subject: [PATCH] =?UTF-8?q?=D0=A1=D1=83=D0=BF=20=D0=B8=D0=B7=20=D0=BE?= =?UTF-8?q?=D0=BF=D0=B8=D0=BB=D0=BE=D0=BA=20(#793)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * суп из опилок * игра не видит доски как часть рецепта * final * fix --- .../entities/objects/consumable/food/soup.ftl | 2 + .../_sunrise/flavors/flavor-profiles.ftl | 1 + .../entities/objects/consumable/food/soup.ftl | 2 + .../_sunrise/flavors/flavor-profiles.ftl | 1 + .../Entities/Objects/Consumable/Food/soup.yml | 26 +++++++++++++ .../Prototypes/_Sunrise/Flavors/flavors.yml | 5 +++ .../Prototypes/_Sunrise/Reagents/fun.yml | 2 +- .../_Sunrise/Recipes/Cooking/meat_recipes.yml | 36 +++++++++++++++++- .../Consumable/Food/bowl.rsi/meta.json | 5 ++- .../Consumable/Food/bowl.rsi/sawdust.png | Bin 0 -> 428 bytes 10 files changed, 77 insertions(+), 3 deletions(-) create mode 100644 Resources/Textures/_Sunrise/Objects/Consumable/Food/bowl.rsi/sawdust.png diff --git a/Resources/Locale/en-US/_prototypes/_sunrise/entities/objects/consumable/food/soup.ftl b/Resources/Locale/en-US/_prototypes/_sunrise/entities/objects/consumable/food/soup.ftl index 1f64b86e88d..958ee2bccfd 100644 --- a/Resources/Locale/en-US/_prototypes/_sunrise/entities/objects/consumable/food/soup.ftl +++ b/Resources/Locale/en-US/_prototypes/_sunrise/entities/objects/consumable/food/soup.ftl @@ -1,2 +1,4 @@ ent-FoodPelmeniBowl = pelmeni .desc = Lots of meat, little dough. +ent-FoodSoupSawdust = sawdust soup + .desc = It smells like sawdust diff --git a/Resources/Locale/en-US/_strings/_sunrise/flavors/flavor-profiles.ftl b/Resources/Locale/en-US/_strings/_sunrise/flavors/flavor-profiles.ftl index 0da323b0bba..1716a0999ec 100644 --- a/Resources/Locale/en-US/_strings/_sunrise/flavors/flavor-profiles.ftl +++ b/Resources/Locale/en-US/_strings/_sunrise/flavors/flavor-profiles.ftl @@ -1,2 +1,3 @@ flavor-complex-fourteen-loko-soda-plus = как бунт в тюрьме flavor-complex-nastoyka-romashki = как ромашка +flavor-complex-sawdust = как 24-х часовая рабочая смена diff --git a/Resources/Locale/ru-RU/_prototypes/_sunrise/entities/objects/consumable/food/soup.ftl b/Resources/Locale/ru-RU/_prototypes/_sunrise/entities/objects/consumable/food/soup.ftl index 2a152e42e06..ab77d39bf3b 100644 --- a/Resources/Locale/ru-RU/_prototypes/_sunrise/entities/objects/consumable/food/soup.ftl +++ b/Resources/Locale/ru-RU/_prototypes/_sunrise/entities/objects/consumable/food/soup.ftl @@ -1,2 +1,4 @@ ent-FoodPelmeniBowl = пельмени .desc = Много мяса, мало теста. +ent-FoodSoupSawdust = суп из опилок + .desc = Пахнет опилками diff --git a/Resources/Locale/ru-RU/_strings/_sunrise/flavors/flavor-profiles.ftl b/Resources/Locale/ru-RU/_strings/_sunrise/flavors/flavor-profiles.ftl index 0da323b0bba..1716a0999ec 100644 --- a/Resources/Locale/ru-RU/_strings/_sunrise/flavors/flavor-profiles.ftl +++ b/Resources/Locale/ru-RU/_strings/_sunrise/flavors/flavor-profiles.ftl @@ -1,2 +1,3 @@ flavor-complex-fourteen-loko-soda-plus = как бунт в тюрьме flavor-complex-nastoyka-romashki = как ромашка +flavor-complex-sawdust = как 24-х часовая рабочая смена diff --git a/Resources/Prototypes/_Sunrise/Entities/Objects/Consumable/Food/soup.yml b/Resources/Prototypes/_Sunrise/Entities/Objects/Consumable/Food/soup.yml index 635a924774a..ef9931929c0 100644 --- a/Resources/Prototypes/_Sunrise/Entities/Objects/Consumable/Food/soup.yml +++ b/Resources/Prototypes/_Sunrise/Entities/Objects/Consumable/Food/soup.yml @@ -30,3 +30,29 @@ - type: Tag tags: - Meat + +- type: entity + name: sawdust soup + parent: FoodBowlBase + id: FoodSoupSawdust + description: It smells like sawdust + components: + - type: FlavorProfile + flavors: + - woodsawdust + - type: Sprite + sprite: _Sunrise/Objects/Consumable/Food/bowl.rsi + layers: + - state: bowl + - state: sawdust + - type: SolutionContainerManager + solutions: + food: + maxVol: 20 + reagents: + - ReagentId: Nutriment + Quantity: 7 + - ReagentId: Water + Quantity: 10 + - ReagentId: Vitamin + Quantity: 3 diff --git a/Resources/Prototypes/_Sunrise/Flavors/flavors.yml b/Resources/Prototypes/_Sunrise/Flavors/flavors.yml index 7bd308f2dc4..c147ff6d587 100644 --- a/Resources/Prototypes/_Sunrise/Flavors/flavors.yml +++ b/Resources/Prototypes/_Sunrise/Flavors/flavors.yml @@ -7,3 +7,8 @@ id: chamomile_tincture flavorType: Complex description: flavor-complex-chamomile-tincture + +- type: flavor + id: woodsawdust + flavorType: Complex + description: flavor-complex-sawdust diff --git a/Resources/Prototypes/_Sunrise/Reagents/fun.yml b/Resources/Prototypes/_Sunrise/Reagents/fun.yml index db40bce31ea..ad744442394 100644 --- a/Resources/Prototypes/_Sunrise/Reagents/fun.yml +++ b/Resources/Prototypes/_Sunrise/Reagents/fun.yml @@ -48,7 +48,7 @@ - type: reagent id: Celliminol name: reagent-name-celliminol - group: Special + group: Medicine desc: reagent-desc-celliminol physicalDesc: reagent-physical-desc-celliminol flavor: medicine diff --git a/Resources/Prototypes/_Sunrise/Recipes/Cooking/meat_recipes.yml b/Resources/Prototypes/_Sunrise/Recipes/Cooking/meat_recipes.yml index 2381263ef85..c72bf771af9 100644 --- a/Resources/Prototypes/_Sunrise/Recipes/Cooking/meat_recipes.yml +++ b/Resources/Prototypes/_Sunrise/Recipes/Cooking/meat_recipes.yml @@ -1,4 +1,4 @@ -- type: microwaveMealRecipe +- type: microwaveMealRecipe id: RecipePelmeni name: pelmeni recipe result: FoodPelmeniBowl @@ -9,3 +9,37 @@ FoodBowlBig: 1 FoodMeatMeatball: 1 FoodDoughSlice: 3 + +- type: microwaveMealRecipe + id: RecipeSoupSawdust + name: sawdust soup recipe + result: FoodSoupSawdust + time: 15 + reagents: + Water: 10 + solids: + FoodBowlBig: 1 + Log: 2 + +- type: microwaveMealRecipe + id: RecipeSoupSawdustSteel + name: sawdust soup recipe steel + result: FoodSoupSawdust + time: 15 + reagents: + Water: 10 + solids: + FoodBowlBig: 1 + SteelLog: 2 + +- type: microwaveMealRecipe + id: RecipeSoupSawdustLog + name: sawdust soup recipe log + result: FoodSoupSawdust + time: 15 + reagents: + Water: 10 + solids: + FoodBowlBig: 1 + SteelLog: 1 + Log: 1 diff --git a/Resources/Textures/_Sunrise/Objects/Consumable/Food/bowl.rsi/meta.json b/Resources/Textures/_Sunrise/Objects/Consumable/Food/bowl.rsi/meta.json index 047d0e2dc19..c84c85d858c 100644 --- a/Resources/Textures/_Sunrise/Objects/Consumable/Food/bowl.rsi/meta.json +++ b/Resources/Textures/_Sunrise/Objects/Consumable/Food/bowl.rsi/meta.json @@ -1,4 +1,4 @@ -{ +{ "version": 1, "license": "CC-BY-SA-3.0", "copyright": "Pelmeni created by SonicDC#9046", @@ -12,6 +12,9 @@ }, { "name": "pelmeni" + }, + { + "name": "sawdust" } ] } diff --git a/Resources/Textures/_Sunrise/Objects/Consumable/Food/bowl.rsi/sawdust.png b/Resources/Textures/_Sunrise/Objects/Consumable/Food/bowl.rsi/sawdust.png new file mode 100644 index 0000000000000000000000000000000000000000..03d1eda286f522793078830a03152c990fd0c377 GIT binary patch literal 428 zcmV;d0aN~oP)n1qW{G&D5YBDDk&1T79pl!Hztwis?v zQ$&VDOG6=LgOV5*32u{@B0majiSul~a}MWudCviXKp+tOS8|Ik<0t2&zmO;A?FN7% zTksw|cXagiTE0Ci8;?~TMYd2V)w(v(-%EL9a=>sqhk4cC8SL+4%s$k$fnPs?|Mc2; zDLo|Wrk`Bw3up!a5!CPF_mOE4Z!I5 zL|b{s2JUb6DHh+ptVQ3)4FK=X9GOtUT>soaG#kWo_#~aA_5ko{%k2~bfj}S-0Pq3L W{DA4rBNVj&0000