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

Японские изменения | Ребаланс #72

Merged
merged 49 commits into from
Nov 4, 2024
Merged
Show file tree
Hide file tree
Changes from 40 commits
Commits
Show all changes
49 commits
Select commit Hold shift + click to select a range
2867d9a
Add files via upload
Chocosasel Nov 4, 2024
09a16d8
Add files via upload
Chocosasel Nov 4, 2024
5723863
Add files via upload
Chocosasel Nov 4, 2024
4459c4d
Add files via upload
Chocosasel Nov 4, 2024
cde3d4a
Add files via upload
Chocosasel Nov 4, 2024
90c3133
Add files via upload
Chocosasel Nov 4, 2024
09b7bb4
Update meal_recipes.yml
Chocosasel Nov 4, 2024
2be3472
Add files via upload
Chocosasel Nov 4, 2024
b64710f
Add files via upload
Chocosasel Nov 4, 2024
6339c48
Delete Resources/Textures/Corvax/Objects/Consumable/Food/ingredients.…
Chocosasel Nov 4, 2024
a32ebc1
Add files via upload
Chocosasel Nov 4, 2024
4b9b544
Delete Resources/Prototypes/Corvax/Entities/Objects/Consumable/Food/j…
Chocosasel Nov 4, 2024
2c4bffa
Add files via upload
Chocosasel Nov 4, 2024
c479b67
Update meal_recipes.yml
Chocosasel Nov 4, 2024
314cae6
Add files via upload
Chocosasel Nov 4, 2024
e6aa280
Delete Resources/Prototypes/Corvax/Entities/Objects/Consumable/Food/j…
Chocosasel Nov 4, 2024
8fedef1
Delete Resources/Prototypes/Corvax/Entities/Objects/Consumable/Food/j…
Chocosasel Nov 4, 2024
88b43a0
Delete Resources/Prototypes/Corvax/Entities/Objects/Consumable/Food/j…
Chocosasel Nov 4, 2024
72ecf6c
Delete Resources/Prototypes/Corvax/Entities/Objects/Consumable/Food/j…
Chocosasel Nov 4, 2024
42fa1e8
Delete Resources/Prototypes/Corvax/Entities/Objects/Consumable/Food/j…
Chocosasel Nov 4, 2024
7cb7d67
Add files via upload
Chocosasel Nov 4, 2024
efa1f81
Delete Resources/Prototypes/Corvax/Entities/Objects/Consumable/Food/j…
Chocosasel Nov 4, 2024
b21435a
Add files via upload
Chocosasel Nov 4, 2024
a592f65
Delete Resources/Prototypes/Corvax/Entities/Objects/Consumable/Food/j…
Chocosasel Nov 4, 2024
56cc651
Delete Resources/Prototypes/Corvax/Entities/Objects/Consumable/Food/j…
Chocosasel Nov 4, 2024
2baa2e8
Delete Resources/Prototypes/Corvax/Entities/Objects/Consumable/Food/j…
Chocosasel Nov 4, 2024
6b9f8b1
Update ingredients.yml
Chocosasel Nov 4, 2024
02a28c5
Update food.yml
Chocosasel Nov 4, 2024
8277bfb
Update japaningredients.ftl
Chocosasel Nov 4, 2024
99494a7
Update japanfoods.ftl
Chocosasel Nov 4, 2024
bf47393
Update food.yml
Chocosasel Nov 4, 2024
095d062
Update meal_recipes.yml
Chocosasel Nov 4, 2024
e77b4bc
Update meal_recipes.yml
Chocosasel Nov 4, 2024
4cffb48
Update food.yml
Chocosasel Nov 4, 2024
3256001
Update japanfoods.ftl
Chocosasel Nov 4, 2024
b937c8a
Update japaningredients.ftl
Chocosasel Nov 4, 2024
3bf2d78
Update food.yml
Chocosasel Nov 4, 2024
cda9b46
Update ingredients.yml
Chocosasel Nov 4, 2024
36a9253
Update food.yml
Chocosasel Nov 4, 2024
839c7d2
Update meal_recipes.yml
Chocosasel Nov 4, 2024
a8c1ab7
Update food.yml
Chocosasel Nov 4, 2024
22b4188
Merge branch 'Corvax-Frontier:master' into japanfood2
Chocosasel Nov 4, 2024
15248bc
Update meal_recipes.yml
Chocosasel Nov 4, 2024
1d60b3e
Update ingredients.yml
Chocosasel Nov 4, 2024
58f6a0b
Update japaningredients.ftl
Chocosasel Nov 4, 2024
8c96b70
Update japanfoods.ftl
Chocosasel Nov 4, 2024
7741dba
Update food.yml
Chocosasel Nov 4, 2024
f5b665b
Update pockypacks.yml
Chocosasel Nov 4, 2024
1c0008a
Update meal_recipes.yml
Chocosasel Nov 4, 2024
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
@@ -1,4 +1,6 @@
ent-Doughdangoball = сырой шарик данго
ent-rawdoughdangoball = сырой шарик данго
.desc = Слепленный шарик из рисового теста.
ent-boileddoughdangoball = отваренный шарик данго
.desc = Отваренный шарик данго, готовый к приготовлению главного блюда.
ent-rawramennoodles = сухая лапша для рамэна
.desc = Даже не думай есть её в таком виде.
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ ent-spicyporkramennoodles = острый рамэн
.desc = Выглядит так горячо... И так аппетитно!
ent-porkramennoodles = свиной рамэн
.desc = А-ах... Вижу вы тоже человек высокой культуры.
ent-ChocolatePockyPack = коробочка шоколадных покки
ent-chocolatepockypack = коробочка шоколадных покки
.desc = Отличное шоколадное печенье для заядлого одиночки или влюбленной парочки.
ent-chocopocky = шоколадная палочка покки
.desc = Вкус беззаботной молодости.

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1,58 @@
- type: entity
name: Boiled Dough Dango Ball
parent: FoodBakingBase
id: boileddoughdangoball
description: A boiled ball of dough.
components:
- type: FlavorProfile
flavors:
- dough
- type: Sprite
sprite: Corvax/Objects/Consumable/Food/ingredients.rsi
state: boileddoughdangoball
- type: SolutionContainerManager
solutions:
food:
maxVol: 10
reagents:
- ReagentId: Nutriment
Quantity: 5

- type: entity
name: Raw Dough Dango Ball
parent: FoodBakingBase
id: rawdoughdangoball
description: A raw ball of dough.
components:
- type: FlavorProfile
flavors:
- dough
- type: Sprite
sprite: Corvax/Objects/Consumable/Food/ingredients.rsi
state: rawdoughdangoball
- type: SolutionContainerManager
solutions:
food:
maxVol: 5
reagents:
- ReagentId: Nutriment
Quantity: 1

- type: entity
name: Raw Ramen Noodles
parent: FoodBakingBase
id: rawramennoodles
description: A raw ramen.
components:
- type: FlavorProfile
- type: Sprite
sprite: Corvax/Objects/Consumable/Food/ingredients.rsi
state: rawramennoodles
- type: SolutionContainerManager
solutions:
food:
maxVol: 5
reagents:
- ReagentId: Nutriment
Quantity: 1

This file was deleted.

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1,201 @@
- type: entity
name: Chocolate Pocky
parent: FoodBakedBase
id: chocopocky
Zekins3366 marked this conversation as resolved.
Show resolved Hide resolved
description: Don't forget to play the game with your date...
components:
- type: FlavorProfile
flavors:
- sweet
- type: Item
storedRotation: -90
- type: Food
- type: Sprite
sprite: Corvax/Objects/Consumable/Food/japanfood.rsi
state: chocopocky
- type: SolutionContainerManager
solutions:
food:
maxVol: 15
reagents:
- ReagentId: Nutriment
Quantity: 10
- ReagentId: Theobromine
Quantity: 3
- ReagentId: CocoaPowder
Quantity: 1
- type: Tag
tags:
- Cigarette
- type: Clothing
sprite: Corvax\Objects\Consumable\Food\pockypacks.rsi
slots: [ mask ]
equippedPrefix: unlit

- type: entity
name: Tricolor Dango
parent: FoodBakedBase
id: hanamidango
Zekins3366 marked this conversation as resolved.
Show resolved Hide resolved
description: You like that colors, don't you?
components:
- type: Item
size: Small
storedRotation: -90
- type: FlavorProfile
flavors:
- sweet
- type: Food
- type: Sprite
sprite: Corvax/Objects/Consumable/Food/japanfood.rsi
state: hanamidango
- type: SolutionContainerManager
solutions:
food:
maxVol: 30
reagents:
- ReagentId: Nutriment
Quantity: 15
- ReagentId: Rice
Quantity: 5
- ReagentId: Sugar
Quantity: 2
- ReagentId: Vitamin
Quantity: 2
- ReagentId: GreenTea
Quantity: 2
- ReagentId: MelonLiquor
Quantity: 2

- type: entity
name: Mitarashi Dango
parent: FoodBakedBase
id: mitarashidango
Zekins3366 marked this conversation as resolved.
Show resolved Hide resolved
description: Rice sweetness that beckons
components:
- type: Item
size: Small
storedRotation: -90
- type: FlavorProfile
flavors:
- sweet
- type: Food
- type: Sprite
sprite: Corvax/Objects/Consumable/Food/japanfood.rsi
state: mitarashidango
- type: SolutionContainerManager
solutions:
food:
maxVol: 30
reagents:
- ReagentId: Nutriment
Quantity: 15
- ReagentId: Rice
Quantity: 5
- ReagentId: Sugar
Quantity: 2

- type: entity
name: Onigiri
parent: FoodBakedBase
id: onigiri
Zekins3366 marked this conversation as resolved.
Show resolved Hide resolved
description: Best fried geometric shape in the galaxy
components:
- type: FlavorProfile
flavors:
- meaty
- type: Item
size: Small
storedRotation: -90
- type: Food
- type: Sprite
sprite: Corvax/Objects/Consumable/Food/japanfood.rsi
state: onigiri
- type: SolutionContainerManager
solutions:
food:
maxVol: 35
reagents:
- ReagentId: Nutriment
Quantity: 20
- ReagentId: Rice
Quantity: 5
- ReagentId: Protein
Quantity: 5
- ReagentId: Mayo
Quantity: 2
- ReagentId: Flavorol
Quantity: 5
- type: Tag
tags:
- Meat

- type: entity
name: Pork Ramen
parent: FoodBowlBase
id: porkramennoodles
Zekins3366 marked this conversation as resolved.
Show resolved Hide resolved
description: Ah, I See You're a Man of Culture As Well...
components:
- type: FlavorProfile
flavors:
- oily
- type: Item
- type: Food
utensil: Fork
- type: Sprite
sprite: Corvax/Objects/Consumable/Food/japanfood.rsi
state: porkramen
- type: SolutionContainerManager
solutions:
food:
maxVol: 35
reagents:
- ReagentId: Nutriment
Quantity: 20
- ReagentId: Protein
Quantity: 5
- ReagentId: Flavorol
Quantity: 5
- ReagentId: Soysauce
Quantity: 2
- ReagentId: CapsaicinOil
Quantity: 2
- type: Tag
tags:
- Meat
- Soup

- type: entity
name: Spicy Ramen
parent: FoodBowlBase
id: spicyporkramennoodles
Zekins3366 marked this conversation as resolved.
Show resolved Hide resolved
description: So hot and so cute!
components:
- type: FlavorProfile
flavors:
- spicy
- oily
- type: Item
- type: Food
utensil: Fork
- type: Sprite
sprite: Corvax/Objects/Consumable/Food/japanfood.rsi
state: spicyporkramen
- type: SolutionContainerManager
solutions:
food:
maxVol: 40
reagents:
- ReagentId: Nutriment
Quantity: 25
- ReagentId: Protein
Quantity: 5
- ReagentId: Flavorol
Quantity: 5
- ReagentId: CapsaicinOil
Quantity: 2
- ReagentId: Soysauce
Quantity: 2
- type: Tag
tags:
- Meat
- Soup

This file was deleted.

This file was deleted.

This file was deleted.

Loading
Loading