Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Хачапуре ТЗ от Дубика #400

Merged
Merged
Show file tree
Hide file tree
Changes from 12 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
ent-ADTFoodMealKhachapuri = хачапури
.desc = Большая лепешка, которую дополняет рассольный сыр и свежее яйцо.
Original file line number Diff line number Diff line change
Expand Up @@ -51,4 +51,4 @@ ent-FoodMealEnchiladas = энчилада
ent-FoodSaladWatermelonFruitBowl = фруктовый арбузный боул
.desc = Единственный салат, в котором можно съесть миску.
ent-FoodMealCornInButter = кукуруза в сливочном масле
.desc = Маслянистенько.
.desc = Маслянистенько.
Original file line number Diff line number Diff line change
@@ -0,0 +1,49 @@
# When adding new food also add to random spawner located in Resources\Prototypes\Entities\Markers\Spawners\Random\Food_Drinks\food_meal.yml
# A bunch of different meals. This stuff doesn't come off their plates because
# it's assembled on them. Or they just don't have plates.

# Base

- type: entity
parent: FoodInjectableBase
id: ADTFoodMealBase
abstract: true
description: A delicious meal, cooked with love.
components:
- type: Item
storedRotation: -90
- type: Food
- type: Sprite
sprite: ADT\Objects\Consumable\Food\meals.rsi
Inconnu1337 marked this conversation as resolved.
Show resolved Hide resolved
- type: SolutionContainerManager
solutions:
food:
maxVol: 26
reagents:
- ReagentId: Nutriment
Quantity: 20

# Tastes like egg, cheese.
- type: entity
name: Khachapuri
parent: ADTFoodMealBase
id: ADTFoodMealKhachapuri
description: A large flatbread that complements pickled cheese, fresh egg.
components:
- type: FlavorProfile
flavors:
- egg
- salty
- milk
- cheesy
- type: Sprite
state: khachapuri
- type: SolutionContainerManager
solutions:
food:
maxVol: 13
reagents:
- ReagentId: Nutriment
Quantity: 10
- ReagentId: TableSalt
Quantity: 3
1 change: 0 additions & 1 deletion Resources/Prototypes/ADT/Recipes/Cooking/fill.txt

This file was deleted.

12 changes: 12 additions & 0 deletions Resources/Prototypes/ADT/Recipes/Cooking/meal_recipes.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
- type: microwaveMealRecipe
id: ADTKhachapuri
name: Khachapuri recipe
result: ADTFoodMealKhachapuri
time: 15
reagents:
Egg: 12
TableSalt: 5
Milk: 5
solids:
FoodCheeseSlice: 1
FoodBreadPlainSlice: 1
Original file line number Diff line number Diff line change
Expand Up @@ -404,7 +404,6 @@
tags:
- Meat
# Tastes like egg, cheese.

- type: entity
FaDeOkno marked this conversation as resolved.
Show resolved Hide resolved
name: fried egg
parent: FoodMealBase
Expand Down
15 changes: 14 additions & 1 deletion Resources/Prototypes/Recipes/Cooking/meal_recipes.yml
Original file line number Diff line number Diff line change
Expand Up @@ -705,7 +705,20 @@
Water: 10
solids:
FoodBowlBig: 1


- type: microwaveMealRecipe
Inconnu1337 marked this conversation as resolved.
Show resolved Hide resolved
id: Khachapuri
name: Khachapuri recipe
result: FoodMealKhachapuri
time: 15
reagents:
Egg: 12
TableSalt: 5
Milk: 5
solids:
FoodCheeseSlice: 1
FoodBreadPlainSlice: 1

Inconnu1337 marked this conversation as resolved.
Show resolved Hide resolved
- type: microwaveMealRecipe
id: RecipeRicePudding
name: rice pudding recipe
Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
14 changes: 14 additions & 0 deletions Resources/Textures/ADT/Objects/Consumable/Food/meals.rsi/meta.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
{
"version": 1,
"size": {
"x": 32,
"y": 32
},
"license": "CC-BY-SA-3.0",
"copyright": "Created by Adventure Times MRP",
"states": [
{
"name": "khachapuri"
}
]
}
Loading