Суп из опилок (#793)

* суп из опилок * игра не видит доски как часть рецепта * final * fix
space-sunrise · Dec 6, 2024 · 92479a4 · 92479a4
1 parent 592ed52
commit 92479a4
Show file tree

Hide file tree

Showing 10 changed files with 77 additions and 3 deletions.
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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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