Skip to content

Commit

Permalink
Добавлены шоколадные батончики (AdventureTimeSS14#153)
Browse files Browse the repository at this point in the history
<!-- ЭТО ШАБЛОН ВАШЕГО PULL REQUEST. Текст между стрелками - это
комментарии - они не будут видны в PR. -->

## Описание PR
Перенос AdventureTimeSS14/space_station#332

**Проверки**
<!-- Выполнение всех следующих действий, если это приемлемо для вида
изменений сильно ускорит разбор вашего PR -->
- [x] PR полностью завершён и мне не нужна помощь чтобы его закончить.
- [x] Я внимательно просмотрел все свои изменения и багов в них не
нашёл.
- [x] Я запускал локальный сервер со своими изменениями и всё
протестировал.
- [x] Я добавил скриншот/видео демонстрации PR в игре, **или** этот PR
этого не требует.

---------

Co-authored-by: 1Stepka1 <[email protected]>
Co-authored-by: 1Stepka1 <[email protected]>
  • Loading branch information
3 people committed Jul 31, 2024
1 parent 8c6b232 commit 870372a
Show file tree
Hide file tree
Showing 23 changed files with 405 additions and 1 deletion.
Original file line number Diff line number Diff line change
Expand Up @@ -52,3 +52,61 @@ ent-ADTFoodPacketHorseTrash = пустая упаковка от сушеной
ent-ADTFoodPacketPigTrash = пустая упаковка от вяленой свинины
.desc = Мусор
# Батончики упакованный

ent-ADTFoodSnackChocolateBarChocoPack = шоколадный батончик
.desc = Батончик с начинкой из молочного крема, покрытый шоколадом.
ent-ADTFoodSnackChocolateBarCoconutPack = кокосовый батончик
.desc = Батончик с мякотью кокоса, покрытая лёгким молочным шоколадом.
ent-ADTFoodSnackChocolateBarEnergyPack = энергетический батончик
.desc = Питательный батончик, из смеси злаков, фруктов и орехов, хороший перекус для спорта. НЕ ТОРМОЗИ!
ent-ADTFoodSnackChocolateBarNutsPack = шоколадный батончик с орехами
.desc = Батончик с начинкой из молочного крема с арахисом, покрытый шоколадом.
ent-ADTFoodSnackChocolateBarPinkPack = розовый шоколадный батончик
.desc = Белый молочный шоколад со вкусом клубники обволакивает легкое молочное кремовое наполнение.
ent-ADTFoodSnackChocolateBarTwoPack = двойной батончик
.desc = Выбирай, на чьей ты стороне?
# Батончики
ent-ADTFoodSnackChocolateBarChoco = шоколадный батончик
.desc = Батончик с начинкой из молочного крема, покрытый шоколадом.
ent-ADTFoodSnackChocolateBarCoconut = кокосовый батончик
.desc = Батончик с мякотью кокоса, покрытая лёгким молочным шоколадом.
ent-ADTFoodSnackChocolateBarEnergy = энергетический батончик
.desc = Питательный батончик, из смеси злаков, фруктов и орехов, хороший перекус для спорта. НЕ ТОРМОЗИ!
ent-ADTFoodSnackChocolateBarNuts = шоколадный батончик с орехами
.desc = Батончик с начинкой из молочного крема с арахисом, покрытый шоколадом.
ent-ADTFoodSnackChocolateBarPink = розовый шоколадный батончик
.desc = Белый молочный шоколад со вкусом клубники обволакивает легкое молочное кремовое наполнение.
ent-ADTFoodSnackChocolateBarTwo = двойной батончик
.desc = Выбирай, на чьей ты стороне?
# Обертки
ent-ADTFoodSnackChocolateTrashChoco = обертка от шоколадного батончика
.desc = Мусор
ent-ADTFoodSnackChocolateTrashCoconut = обертка от Кокосового батончика
.desc = Мусор
ent-ADTFoodSnackChocolateTrashEnergy = обертка от Энергетического батончика
.desc = Мусор
ent-ADTFoodSnackChocolateTrashNuts = обертка от Шоколадного батончика с орехами
.desc = Мусор
ent-ADTFoodSnackChocolateTrashPink = обертка от Розовый шоколадного батончика
.desc = Мусор
ent-ADTFoodSnackChocolateTrashTwo = обертка от Двойного батончика
.desc = Мусор
261 changes: 260 additions & 1 deletion Resources/Prototypes/ADT/Entities/Objects/Consumable/Food/snacks.yml
Original file line number Diff line number Diff line change
Expand Up @@ -230,4 +230,263 @@
description: This is rubbish.
components:
- type: Sprite
state: pig-trash
state: pig-trash

#Chocolate packing

- type: entity
name: chocolate bar
parent: FoodSnackChocolate
id: ADTFoodSnackChocolateBarsBase
description: Tastes like cardboard.
abstract: true
components:
- type: Sprite
sprite: ADT/Objects/Consumable/Food/Chocolate/packing.rsi
state: choco-packed
- type: Item
heldPrefix: chocolatebar
size: Tiny
- type: Tag
tags:
- FoodSnack
- type: SpawnItemsOnUse
items:
- id: FoodPacketChocolateTrash
- id: FoodSnackChocolateBar
sound:
path: /Audio/Effects/unwrap.ogg

- type: entity
name: chocolate bar
parent: ADTFoodSnackChocolateBarsBase
id: ADTFoodSnackChocolateBarChocoPack
description: Tastes like cardboard.
components:
- type: Sprite
state: choco-packed
- type: Tag
- type: SpawnItemsOnUse
items:
- id: ADTFoodPacketChocolateTrashChoco
- id: ADTFoodSnackChocolateBarCoconut

- type: entity
name: chocolate bar
parent: ADTFoodSnackChocolateBarsBase
id: ADTFoodSnackChocolateBarCoconutPack
description: Tastes like cardboard.
components:
- type: Sprite
state: coconut-packed
- type: Tag
- type: SpawnItemsOnUse
items:
- id: ADTFoodPacketChocolateTrashCoconut
- id: ADTFoodSnackChocolateBarCoconut

- type: entity
name: chocolate bar
parent: ADTFoodSnackChocolateBarsBase
id: ADTFoodSnackChocolateBarEnergyPack
description: Tastes like cardboard.
components:
- type: Sprite
state: energy-packed
- type: Tag
- type: SpawnItemsOnUse
items:
- id: ADTFoodPacketChocolateTrashEnergy
- id: ADTFoodSnackChocolateBarEnergy

- type: entity
name: chocolate bar
parent: ADTFoodSnackChocolateBarsBase
id: ADTFoodSnackChocolateBarNutsPack
description: Tastes like cardboard.
components:
- type: Sprite
state: nuts-packed
- type: Tag
- type: SpawnItemsOnUse
items:
- id: ADTFoodPacketChocolateTrashNuts
- id: ADTFoodSnackChocolateBarNuts

- type: entity
name: chocolate bar
parent: ADTFoodSnackChocolateBarsBase
id: ADTFoodSnackChocolateBarPinkPack
description: Tastes like cardboard.
components:
- type: Sprite
state: pink-packed
- type: Tag
- type: SpawnItemsOnUse
items:
- id: ADTFoodPacketChocolateTrashPink
- id: ADTFoodSnackChocolateBarPink

- type: entity
name: chocolate bar
parent: ADTFoodSnackChocolateBarsBase
id: ADTFoodSnackChocolateBarTwoPack
description: Tastes like cardboard.
components:
- type: Sprite
state: two-packed
- type: Tag
- type: SpawnItemsOnUse
items:
- id: ADTFoodPacketChocolateTrashTwo
- id: ADTFoodSnackChocolateBarTwo
#Chocolate bars
- type: entity
name: chocolate bar
parent: FoodSnackChocolateBar
id: ADTFoodSnackChocolateBarBase
description: Tastes like cardboard.
abstract: true
components:
- type: FlavorProfile
flavors:
- chocolate
- type: Sprite
sprite: ADT/Objects/Consumable/Food/Chocolate/bars.rsi
state: bar-choco
- type: Item
- type: SolutionContainerManager
solutions:
food:
maxVol: 30
reagents:
- ReagentId: Nutriment
Quantity: 10
- ReagentId: Theobromine
Quantity: 3
- ReagentId: CocoaPowder
Quantity: 1
- type: Extractable
grindableSolutionName: food

- type: entity
name: chocolate bar
parent: ADTFoodSnackChocolateBarBase
id: ADTFoodSnackChocolateBarChoco
description: Tastes like cardboard.
components:
- type: Sprite
state: bar-choco

- type: entity
name: chocolate bar
parent: ADTFoodSnackChocolateBarBase
id: ADTFoodSnackChocolateBarCoconut
description: Tastes like cardboard.
components:
- type: Sprite
state: bar-coconut

- type: entity
name: chocolate bar
parent: ADTFoodSnackChocolateBarBase
id: ADTFoodSnackChocolateBarEnergy
description: Tastes like cardboard.
components:
- type: Sprite
state: bar-energy

- type: entity
name: chocolate bar
parent: ADTFoodSnackChocolateBarBase
id: ADTFoodSnackChocolateBarNuts
description: Tastes like cardboard.
components:
- type: Sprite
state: bar-nuts

- type: entity
name: chocolate bar
parent: ADTFoodSnackChocolateBarBase
id: ADTFoodSnackChocolateBarPink
description: Tastes like cardboard.
components:
- type: Sprite
state: bar-pink

- type: entity
name: chocolate bar
parent: ADTFoodSnackChocolateBarBase
id: ADTFoodSnackChocolateBarTwo
description: Tastes like cardboard.
components:
- type: Sprite
state: bar-two

#Trash

- type: entity
noSpawn: true
parent: FoodPacketChocolateTrash
id: ADTFoodPacketChocolateTrash
name: chocolate wrapper
abstract: true
components:
- type: Sprite
sprite: ADT/Objects/Consumable/Food/Chocolate/trash.rsi
state: choco-trash
- type: Item

- type: entity
noSpawn: true
parent: ADTFoodPacketChocolateTrash
id: ADTFoodPacketChocolateTrashChoco
name: chocolate wrapper
components:
- type: Sprite
state: choco-trash

- type: entity
noSpawn: true
parent: ADTFoodPacketChocolateTrash
id: ADTFoodPacketChocolateTrashCoconut
name: chocolate wrapper
components:
- type: Sprite
state: coconut-trash

- type: entity
noSpawn: true
parent: ADTFoodPacketChocolateTrash
id: ADTFoodPacketChocolateTrashEnergy
name: chocolate wrapper
components:
- type: Sprite
state: energy-trash

- type: entity
noSpawn: true
parent: ADTFoodPacketChocolateTrash
id: ADTFoodPacketChocolateTrashNuts
name: chocolate wrapper
components:
- type: Sprite
state: nuts-trash

- type: entity
noSpawn: true
parent: ADTFoodPacketChocolateTrash
id: ADTFoodPacketChocolateTrashPink
name: chocolate wrapper
components:
- type: Sprite
state: pink-trash

- type: entity
noSpawn: true
parent: ADTFoodPacketChocolateTrash
id: ADTFoodPacketChocolateTrashTwo
name: chocolate wrapper
components:
- type: Sprite
state: two-trash
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "Created by discord:prazat911",
"size": {
"x": 32,
"y": 32
},
"states": [
{
"name": "bar-choco"
},
{
"name": "bar-coconut"
},
{
"name": "bar-energy"
},
{
"name": "bar-nuts"
},
{
"name": "bar-pink"
},
{
"name": "bar-two"
}
]
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "Created by discord:prazat911",
"size": {
"x": 32,
"y": 32
},
"states": [
{
"name": "choco-packed"
},
{
"name": "coconut-packed"
},
{
"name": "energy-packed"
},
{
"name": "nuts-packed"
},
{
"name": "pink-packed"
},
{
"name": "two-packed"
}
]
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading

0 comments on commit 870372a

Please sign in to comment.