-
Notifications
You must be signed in to change notification settings - Fork 50
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #10 from PyotrIgn/oktoberfest
Октоберфест, часть 1
- Loading branch information
Showing
19 changed files
with
288 additions
and
10 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
27 changes: 27 additions & 0 deletions
27
Resources/Locale/ru-RU/ADT/Objects/Consumable/Food/oktoberfest.ftl
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,27 @@ | ||
ent-ADTFoodWeissWurst = вайсвурст | ||
.desc = Традиционная белая баварская колбаска из говядины, сала и специй. | ||
.suffix = { "Октоберфест" } | ||
ent-ADTFoodBratWurst = братвурст | ||
.desc = Зажаренная колбаска из свинины, очень жирная и аппетитная. | ||
.suffix = { "Октоберфест" } | ||
ent-ADTFoodBreadBrezel = брецель | ||
.desc = Обычный крендель, популярная закуска на Октоберфесте. | ||
.suffix = { "Октоберфест" } | ||
ent-ADTFoodBreadBrezelPoppySeeds = брецель с маком | ||
.desc = Крендель с маковой посыпкой, популярная закуская на Октоберфесте. | ||
.suffix = { "Октоберфест" } | ||
ent-ADTFoodBreadBrezelSalt = брецель с солью | ||
.desc = Крендель с солью, популярная закуска на Октоберфесте. | ||
.suffix = { "Октоберфест" } | ||
ent-ADTFoodBreadBrezelChocolate = брецель с шоколадом | ||
.desc = Крендель с шоколадной глазурью. Десет для посиделок с пивом на Октоберфесте. | ||
.suffix = { "Октоберфест" } | ||
ent-ADTFoodBreadBrezelVanilla = брецель с ванилью | ||
.desc = Крендель с ванильной глазурью. Десет для посиделок с пивом на Октоберфесте. | ||
.suffix = { "Октоберфест" } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
186 changes: 186 additions & 0 deletions
186
Resources/Prototypes/ADT/Entities/Objects/Consumable/Food/oktoberfest.yml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,186 @@ | ||
- type: entity | ||
name: weisswurst | ||
parent: FoodMeatBase | ||
id: ADTFoodWeissWurst | ||
description: Traditional white Bavarian sausage made of veal, lard and spices. | ||
suffix: Oktoberfest | ||
components: | ||
- type: Tag | ||
tags: | ||
- Cooked | ||
- type: Sprite | ||
sprite: ADT/Objects/Consumable/Food/oktoberfest.rsi #спрайт от Празата | ||
state: weisswurst | ||
- type: FlavorProfile | ||
flavors: | ||
- meaty | ||
- type: SolutionContainerManager | ||
solutions: | ||
food: | ||
maxVol: 30 | ||
reagents: | ||
- ReagentId: Nutriment | ||
Quantity: 8 | ||
- ReagentId: Protein | ||
Quantity: 8 | ||
- ReagentId: Vitamin | ||
Quantity: 8 | ||
|
||
- type: entity | ||
name: bratwurst | ||
parent: FoodMeatBase | ||
id: ADTFoodBratWurst | ||
description: Fried pork sausage, very appetizing, but greasy. | ||
suffix: Oktoberfest | ||
components: | ||
- type: Tag | ||
tags: | ||
- Cooked | ||
- type: Sprite | ||
sprite: ADT/Objects/Consumable/Food/oktoberfest.rsi #спрайт от Празата | ||
state: bratwurst | ||
- type: FlavorProfile | ||
flavors: | ||
- meaty | ||
- type: SolutionContainerManager | ||
solutions: | ||
food: | ||
maxVol: 30 | ||
reagents: | ||
- ReagentId: Nutriment | ||
Quantity: 8 | ||
- ReagentId: Protein | ||
Quantity: 8 | ||
- ReagentId: Vitamin | ||
Quantity: 8 | ||
|
||
- type: entity | ||
name: brezel | ||
parent: FoodBreadSliceBase | ||
id: ADTFoodBreadBrezel | ||
description: The usual pretzel, a popular snack at Oktoberfest. | ||
suffix: Oktoberfest | ||
components: | ||
- type: Food | ||
- type: Sprite | ||
sprite: ADT/Objects/Consumable/Food/oktoberfest.rsi #спрайты от празата | ||
layers: | ||
- state: brezel | ||
- type: FlavorProfile | ||
flavors: | ||
- bun | ||
- type: SolutionContainerManager | ||
solutions: | ||
food: | ||
maxVol: 15 | ||
reagents: | ||
- ReagentId: Nutriment | ||
Quantity: 8 | ||
- ReagentId: Vitamin | ||
Quantity: 3 | ||
|
||
- type: entity | ||
name: brezel with poppy seeds | ||
parent: FoodBreadSliceBase | ||
id: ADTFoodBreadBrezelPoppySeeds | ||
description: The brezel with poppy seeds, a popular snack at Oktoberfest. | ||
suffix: Oktoberfest | ||
components: | ||
- type: Food | ||
- type: Sprite | ||
sprite: ADT/Objects/Consumable/Food/oktoberfest.rsi #спрайты от празата | ||
layers: | ||
- state: brezel_poppy | ||
- type: FlavorProfile | ||
flavors: | ||
- bun | ||
- adt_poppy | ||
- type: SolutionContainerManager | ||
solutions: | ||
food: | ||
maxVol: 15 | ||
reagents: | ||
- ReagentId: Nutriment | ||
Quantity: 8 | ||
- ReagentId: Vitamin | ||
Quantity: 3 | ||
|
||
- type: entity | ||
name: brezel with salt | ||
parent: FoodBreadSliceBase | ||
id: ADTFoodBreadBrezelSalt | ||
description: The brezel with salt, a popular snack at Oktoberfest. | ||
suffix: Oktoberfest | ||
components: | ||
- type: Food | ||
- type: Sprite | ||
sprite: ADT/Objects/Consumable/Food/oktoberfest.rsi #спрайты от празата | ||
layers: | ||
- state: brezel_salt | ||
- type: FlavorProfile | ||
flavors: | ||
- bun | ||
- salty | ||
- type: SolutionContainerManager | ||
solutions: | ||
food: | ||
maxVol: 15 | ||
reagents: | ||
- ReagentId: Nutriment | ||
Quantity: 8 | ||
- ReagentId: Vitamin | ||
Quantity: 3 | ||
|
||
- type: entity | ||
name: brezel with chocolate | ||
parent: FoodBreadSliceBase | ||
id: ADTFoodBreadBrezelChocolate | ||
description: The brezel with chocolate, a sweet snack for Oktoberfest. | ||
suffix: Oktoberfest | ||
components: | ||
- type: Food | ||
- type: Sprite | ||
sprite: ADT/Objects/Consumable/Food/oktoberfest.rsi #спрайты от празата | ||
layers: | ||
- state: brezel_chocolate | ||
- type: FlavorProfile | ||
flavors: | ||
- bun | ||
- chocolate | ||
- sweet | ||
- type: SolutionContainerManager | ||
solutions: | ||
food: | ||
maxVol: 15 | ||
reagents: | ||
- ReagentId: Nutriment | ||
Quantity: 8 | ||
- ReagentId: Vitamin | ||
Quantity: 3 | ||
|
||
- type: entity | ||
name: brezel with vanilla | ||
parent: FoodBreadSliceBase | ||
id: ADTFoodBreadBrezelVanilla | ||
description: Brezel with vanilla glaze, a sweet snack for Oktoberfest | ||
suffix: Oktoberfest | ||
components: | ||
- type: Food | ||
- type: Sprite | ||
sprite: ADT/Objects/Consumable/Food/oktoberfest.rsi #спрайты от празата | ||
layers: | ||
- state: brezel_vanilla | ||
- type: FlavorProfile | ||
flavors: | ||
- bun | ||
- sweet | ||
- adt_vanilla | ||
- type: SolutionContainerManager | ||
solutions: | ||
food: | ||
maxVol: 15 | ||
reagents: | ||
- ReagentId: Nutriment | ||
Quantity: 8 | ||
- ReagentId: Vitamin | ||
Quantity: 3 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Binary file added
BIN
+624 Bytes
Resources/Textures/ADT/Objects/Consumable/Food/oktoberfest.rsi/bratwurst.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added
BIN
+530 Bytes
Resources/Textures/ADT/Objects/Consumable/Food/oktoberfest.rsi/brezel.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added
BIN
+660 Bytes
...urces/Textures/ADT/Objects/Consumable/Food/oktoberfest.rsi/brezel_chocolate.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added
BIN
+613 Bytes
Resources/Textures/ADT/Objects/Consumable/Food/oktoberfest.rsi/brezel_poppy.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added
BIN
+612 Bytes
Resources/Textures/ADT/Objects/Consumable/Food/oktoberfest.rsi/brezel_salt.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added
BIN
+680 Bytes
Resources/Textures/ADT/Objects/Consumable/Food/oktoberfest.rsi/brezel_vanilla.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
33 changes: 33 additions & 0 deletions
33
Resources/Textures/ADT/Objects/Consumable/Food/oktoberfest.rsi/meta.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,33 @@ | ||
{ | ||
"version": 1, | ||
"license": "CC-BY-SA-3.0", | ||
"copyright": "Created by discord:Празат Д.В. aka [767Sikon] (prazat911)", | ||
"size": { | ||
"x": 32, | ||
"y": 32 | ||
}, | ||
"states": [ | ||
{ | ||
"name": "weisswurst" | ||
}, | ||
{ | ||
"name": "bratwurst" | ||
}, | ||
{ | ||
"name": "brezel" | ||
}, | ||
{ | ||
"name": "brezel_poppy" | ||
}, | ||
{ | ||
"name": "brezel_salt" | ||
}, | ||
{ | ||
"name": "brezel_chocolate" | ||
}, | ||
{ | ||
"name": "brezel_vanilla" | ||
} | ||
] | ||
} | ||
|
Binary file added
BIN
+537 Bytes
Resources/Textures/ADT/Objects/Consumable/Food/oktoberfest.rsi/weisswurst.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Oops, something went wrong.