From 2867d9adf4c072e23100ae006479033213e006d8 Mon Sep 17 00:00:00 2001 From: Chocosasel Date: Mon, 4 Nov 2024 07:36:45 +0400 Subject: [PATCH 01/48] Add files via upload --- .../Consumable/Food/japanfood/onigiri.yml | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/Resources/Prototypes/Corvax/Entities/Objects/Consumable/Food/japanfood/onigiri.yml b/Resources/Prototypes/Corvax/Entities/Objects/Consumable/Food/japanfood/onigiri.yml index c37070ca7fe..3a42a177571 100644 --- a/Resources/Prototypes/Corvax/Entities/Objects/Consumable/Food/japanfood/onigiri.yml +++ b/Resources/Prototypes/Corvax/Entities/Objects/Consumable/Food/japanfood/onigiri.yml @@ -4,6 +4,9 @@ id: onigiri description: Best fried geometric shape in the galaxy components: + - type: FlavorProfile + flavors: + - meaty - type: Item storedRotation: -90 - type: Food @@ -13,7 +16,18 @@ - type: SolutionContainerManager solutions: food: - maxVol: 25 + maxVol: 35 reagents: - ReagentId: Nutriment - Quantity: 20 \ No newline at end of file + Quantity: 20 + - ReagentId: Protein + Quantity: 5 + - ReagentId: Mayo + Quantity: 2 + - ReagentId: Rice + Quantity: 3 + - ReagentId: Flavorol + Quantity: 5 + - type: Tag + tags: + - Meat \ No newline at end of file From 09a16d8dedd0ae8188f1113c3c4d65a862908a0b Mon Sep 17 00:00:00 2001 From: Chocosasel Date: Mon, 4 Nov 2024 07:37:32 +0400 Subject: [PATCH 02/48] Add files via upload --- .../Consumable/Food/japanfood/chocopocky.yml | 3 +++ .../Consumable/Food/japanfood/hanamidango.yml | 17 +++++++++++++++-- .../Consumable/Food/japanfood/mitarasidango.yml | 11 +++++++++-- .../Food/japanfood/porkramennoodles.yml | 14 ++++++++++---- .../Food/japanfood/spicyporkramen.yml | 11 ++++++++--- 5 files changed, 45 insertions(+), 11 deletions(-) diff --git a/Resources/Prototypes/Corvax/Entities/Objects/Consumable/Food/japanfood/chocopocky.yml b/Resources/Prototypes/Corvax/Entities/Objects/Consumable/Food/japanfood/chocopocky.yml index 87a7652f7b1..f4515a56e41 100644 --- a/Resources/Prototypes/Corvax/Entities/Objects/Consumable/Food/japanfood/chocopocky.yml +++ b/Resources/Prototypes/Corvax/Entities/Objects/Consumable/Food/japanfood/chocopocky.yml @@ -4,6 +4,9 @@ id: chocopocky description: Don't forget to play the game with your date... components: + - type: FlavorProfile + flavors: + - sweet - type: Item storedRotation: -90 - type: Food diff --git a/Resources/Prototypes/Corvax/Entities/Objects/Consumable/Food/japanfood/hanamidango.yml b/Resources/Prototypes/Corvax/Entities/Objects/Consumable/Food/japanfood/hanamidango.yml index f0121078605..c952923f733 100644 --- a/Resources/Prototypes/Corvax/Entities/Objects/Consumable/Food/japanfood/hanamidango.yml +++ b/Resources/Prototypes/Corvax/Entities/Objects/Consumable/Food/japanfood/hanamidango.yml @@ -6,6 +6,9 @@ components: - type: Item storedRotation: -90 + - type: FlavorProfile + flavors: + - sweet - type: Food - type: Sprite sprite: Corvax/Objects/Consumable/Food/japanfood.rsi @@ -13,7 +16,17 @@ - type: SolutionContainerManager solutions: food: - maxVol: 20 + maxVol: 30 reagents: - ReagentId: Nutriment - Quantity: 15 \ No newline at end of file + Quantity: 15 + - ReagentId: Rice + Quantity: 5 + - ReagentId: Sugar + Quantity: 2 + - ReagentId: Vitamin + Quantity: 2 + - ReagentId: GreenTea + Quantity: 2 + - ReagentId: MelonLiquor + Quantity: 2 \ No newline at end of file diff --git a/Resources/Prototypes/Corvax/Entities/Objects/Consumable/Food/japanfood/mitarasidango.yml b/Resources/Prototypes/Corvax/Entities/Objects/Consumable/Food/japanfood/mitarasidango.yml index c57264538cb..0e653a97dd5 100644 --- a/Resources/Prototypes/Corvax/Entities/Objects/Consumable/Food/japanfood/mitarasidango.yml +++ b/Resources/Prototypes/Corvax/Entities/Objects/Consumable/Food/japanfood/mitarasidango.yml @@ -6,6 +6,9 @@ components: - type: Item storedRotation: -90 + - type: FlavorProfile + flavors: + - sweet - type: Food - type: Sprite sprite: Corvax/Objects/Consumable/Food/japanfood.rsi @@ -13,7 +16,11 @@ - type: SolutionContainerManager solutions: food: - maxVol: 20 + maxVol: 30 reagents: - ReagentId: Nutriment - Quantity: 15 \ No newline at end of file + Quantity: 15 + - ReagentId: Rice + Quantity: 5 + - ReagentId: Sugar + Quantity: 2 \ No newline at end of file diff --git a/Resources/Prototypes/Corvax/Entities/Objects/Consumable/Food/japanfood/porkramennoodles.yml b/Resources/Prototypes/Corvax/Entities/Objects/Consumable/Food/japanfood/porkramennoodles.yml index a610145ea8a..de90f3852bb 100644 --- a/Resources/Prototypes/Corvax/Entities/Objects/Consumable/Food/japanfood/porkramennoodles.yml +++ b/Resources/Prototypes/Corvax/Entities/Objects/Consumable/Food/japanfood/porkramennoodles.yml @@ -4,24 +4,30 @@ id: porkramennoodles 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: 30 + maxVol: 35 reagents: - - ReagentId: Nutriment - Quantity: 10 + - ReagentId: Nutriment + Quantity: 20 - ReagentId: Protein - Quantity: 3 + Quantity: 5 - ReagentId: Flavorol Quantity: 5 - ReagentId: Soysauce Quantity: 2 + - ReagentId: CapsaicinOil + Quantity: 2 - type: Tag tags: - Meat diff --git a/Resources/Prototypes/Corvax/Entities/Objects/Consumable/Food/japanfood/spicyporkramen.yml b/Resources/Prototypes/Corvax/Entities/Objects/Consumable/Food/japanfood/spicyporkramen.yml index aaf76defda6..03939cfa7df 100644 --- a/Resources/Prototypes/Corvax/Entities/Objects/Consumable/Food/japanfood/spicyporkramen.yml +++ b/Resources/Prototypes/Corvax/Entities/Objects/Consumable/Food/japanfood/spicyporkramen.yml @@ -4,20 +4,25 @@ id: spicyporkramennoodles 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: 30 + maxVol: 40 reagents: - ReagentId: Nutriment - Quantity: 10 + Quantity: 25 - ReagentId: Protein - Quantity: 3 + Quantity: 5 - ReagentId: Flavorol Quantity: 5 - ReagentId: CapsaicinOil From 57238634641d5800afd4a65e623e3d5ff753d635 Mon Sep 17 00:00:00 2001 From: Chocosasel Date: Mon, 4 Nov 2024 07:55:13 +0400 Subject: [PATCH 03/48] Add files via upload --- .../Food/japanfood/Ingredients/rawramennoodles.yml | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/Resources/Prototypes/Corvax/Entities/Objects/Consumable/Food/japanfood/Ingredients/rawramennoodles.yml b/Resources/Prototypes/Corvax/Entities/Objects/Consumable/Food/japanfood/Ingredients/rawramennoodles.yml index 26f87c249e8..4ecdaa36b4c 100644 --- a/Resources/Prototypes/Corvax/Entities/Objects/Consumable/Food/japanfood/Ingredients/rawramennoodles.yml +++ b/Resources/Prototypes/Corvax/Entities/Objects/Consumable/Food/japanfood/Ingredients/rawramennoodles.yml @@ -7,4 +7,11 @@ - type: FlavorProfile - type: Sprite sprite: Corvax/Objects/Consumable/Food/ingredients.rsi - state: rawramennoodles \ No newline at end of file + state: rawramennoodles + - type: SolutionContainerManager + solutions: + food: + maxVol: 5 + reagents: + - ReagentId: Nutriment + Quantity: 1 \ No newline at end of file From 4459c4d6982f7c86d5a9450687801124462bb065 Mon Sep 17 00:00:00 2001 From: Chocosasel Date: Mon, 4 Nov 2024 07:56:42 +0400 Subject: [PATCH 04/48] Add files via upload --- .../Corvax/Recipes/Cooking/JapanFood/meal_recipes.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/Resources/Prototypes/Corvax/Recipes/Cooking/JapanFood/meal_recipes.yml b/Resources/Prototypes/Corvax/Recipes/Cooking/JapanFood/meal_recipes.yml index 7b413493641..6319d5fbac8 100644 --- a/Resources/Prototypes/Corvax/Recipes/Cooking/JapanFood/meal_recipes.yml +++ b/Resources/Prototypes/Corvax/Recipes/Cooking/JapanFood/meal_recipes.yml @@ -41,12 +41,13 @@ id: Recipeonigiri name: onigiri recipe result: onigiri - time: 20 + time: 15 reagents: Mayo: 5 Rice: 10 + OilOlive: 5 solids: - FoodMeatChicken: 1 + FoodMeatChickenCutletCooked: 3 recipeType: Oven # Frontier - type: microwaveMealRecipe From cde3d4ae4cfae59934aaabae45d789a912e787ad Mon Sep 17 00:00:00 2001 From: Chocosasel Date: Mon, 4 Nov 2024 07:56:59 +0400 Subject: [PATCH 05/48] Add files via upload --- .../Corvax/Recipes/Cooking/JapanFood/ingredients/food.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Prototypes/Corvax/Recipes/Cooking/JapanFood/ingredients/food.yml b/Resources/Prototypes/Corvax/Recipes/Cooking/JapanFood/ingredients/food.yml index 66ec7faf70d..2b975ae6e65 100644 --- a/Resources/Prototypes/Corvax/Recipes/Cooking/JapanFood/ingredients/food.yml +++ b/Resources/Prototypes/Corvax/Recipes/Cooking/JapanFood/ingredients/food.yml @@ -21,7 +21,7 @@ conserveEnergy: false reactants: Flour: - amount: 10 + amount: 5 TableSalt: amount: 5 OilOlive: From 90c31339b542a4416b20a2bcf82cf041da7a9900 Mon Sep 17 00:00:00 2001 From: Chocosasel Date: Mon, 4 Nov 2024 08:17:54 +0400 Subject: [PATCH 06/48] Add files via upload --- .../Entities/Objects/Consumable/Food/japanfood/onigiri.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Resources/Prototypes/Corvax/Entities/Objects/Consumable/Food/japanfood/onigiri.yml b/Resources/Prototypes/Corvax/Entities/Objects/Consumable/Food/japanfood/onigiri.yml index 3a42a177571..7396273eb99 100644 --- a/Resources/Prototypes/Corvax/Entities/Objects/Consumable/Food/japanfood/onigiri.yml +++ b/Resources/Prototypes/Corvax/Entities/Objects/Consumable/Food/japanfood/onigiri.yml @@ -19,13 +19,13 @@ maxVol: 35 reagents: - ReagentId: Nutriment - Quantity: 20 + Quantity: 20 + - ReagentId: Rice + Quantity: 5 - ReagentId: Protein Quantity: 5 - ReagentId: Mayo Quantity: 2 - - ReagentId: Rice - Quantity: 3 - ReagentId: Flavorol Quantity: 5 - type: Tag From 09b7bb4a25217c21435b94647e56af010b96a85a Mon Sep 17 00:00:00 2001 From: Chocosasel Date: Mon, 4 Nov 2024 08:41:23 +0400 Subject: [PATCH 07/48] Update meal_recipes.yml --- .../Corvax/Recipes/Cooking/JapanFood/meal_recipes.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/Resources/Prototypes/Corvax/Recipes/Cooking/JapanFood/meal_recipes.yml b/Resources/Prototypes/Corvax/Recipes/Cooking/JapanFood/meal_recipes.yml index 6319d5fbac8..f70f2031669 100644 --- a/Resources/Prototypes/Corvax/Recipes/Cooking/JapanFood/meal_recipes.yml +++ b/Resources/Prototypes/Corvax/Recipes/Cooking/JapanFood/meal_recipes.yml @@ -2,7 +2,7 @@ id: Recipeporkramen name: pork ramen recipe result: porkramennoodles - time: 15 + time: 30 solids: FoodMeatCutlet: 3 FoodBowlBig: 1 @@ -17,7 +17,7 @@ id: Recipehanamidango name: dango hanami recipe result: hanamidango - time: 10 + time: 15 reagents: GreenTea: 5 JuiceWatermelon: 5 @@ -29,7 +29,7 @@ id: Recipemitarashidango name: dango mitarashi recipe result: mitarashidango - time: 10 + time: 15 reagents: Soysauce: 5 Sugar: 5 @@ -44,17 +44,17 @@ time: 15 reagents: Mayo: 5 - Rice: 10 OilOlive: 5 solids: FoodMeatChickenCutletCooked: 3 + FoodRiceBoiled: 1 recipeType: Oven # Frontier - type: microwaveMealRecipe id: Recipespicyramen name: spicy ramen recipe result: spicyporkramennoodles - time: 20 + time: 30 solids: FoodMeatCutlet: 3 FoodBowlBig: 1 From 2be347230cde365f5611f59d27002197b5f77224 Mon Sep 17 00:00:00 2001 From: Chocosasel Date: Mon, 4 Nov 2024 10:55:16 +0400 Subject: [PATCH 08/48] Add files via upload --- .../Food/ingredients.rsi/boileddoughdangoball.png | Bin 0 -> 246 bytes .../Consumable/Food/ingredients.rsi/meta.json | 5 ++++- .../Food/ingredients.rsi/rawdoughdangoball.png | Bin 0 -> 251 bytes 3 files changed, 4 insertions(+), 1 deletion(-) create mode 100644 Resources/Textures/Corvax/Objects/Consumable/Food/ingredients.rsi/boileddoughdangoball.png create mode 100644 Resources/Textures/Corvax/Objects/Consumable/Food/ingredients.rsi/rawdoughdangoball.png diff --git a/Resources/Textures/Corvax/Objects/Consumable/Food/ingredients.rsi/boileddoughdangoball.png b/Resources/Textures/Corvax/Objects/Consumable/Food/ingredients.rsi/boileddoughdangoball.png new file mode 100644 index 0000000000000000000000000000000000000000..da652b5a21502159faba9c27bac67fa293b44f4d GIT binary patch literal 246 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyjKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCij?1AIbULp)th?B4SD;hksCo;|#Keb>r`K$)4U35S6cdr6RA@P9C1kn(1B z0}62#ctjR6Fz_7&Va6R3v)=**!#!ObLoEE?Uf9TYK!L+GaLu9r^_%!pG_qb?IC9e3 z(}vmW(?!_k zUi02apcrR?M`SSr1K(i~W;~w1A_XWI;pyTSV&VVxf+Jsp0f);)#+;r1dtFz1&J5XY zP<}T(+BML7IwCL+;WEFBsRjsZ=Sbuh4hkPyEI4$YsiR$s@c= lZ5gMZlxNeu@QdqC`9}w7(Yb3a#DR7&c)I$ztaD0e0szV9Ty6jW literal 0 HcmV?d00001 From b64710fad4cc4772585dd34b541c05841e889c03 Mon Sep 17 00:00:00 2001 From: Chocosasel Date: Mon, 4 Nov 2024 10:56:12 +0400 Subject: [PATCH 09/48] Add files via upload --- .../food/japanfood/ingredients/japaningredients.ftl | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/Resources/Locale/ru-RU/corvax/_nf/prototypes/entities/objects/consumable/food/japanfood/ingredients/japaningredients.ftl b/Resources/Locale/ru-RU/corvax/_nf/prototypes/entities/objects/consumable/food/japanfood/ingredients/japaningredients.ftl index 63afbefe8f8..15b45a1ced6 100644 --- a/Resources/Locale/ru-RU/corvax/_nf/prototypes/entities/objects/consumable/food/japanfood/ingredients/japaningredients.ftl +++ b/Resources/Locale/ru-RU/corvax/_nf/prototypes/entities/objects/consumable/food/japanfood/ingredients/japaningredients.ftl @@ -1,4 +1,6 @@ -ent-Doughdangoball = сырой шарик данго +ent-rawdoughdangoball = сырой шарик данго .desc = Слепленный шарик из рисового теста. +ent-boileddoughdangoball = отваренный шарик данго + .desc = Отваренный шарик данго, готовый к приготовлению главного блюда. ent-rawramennoodles = сухая лапша для рамэна - .desc = Даже не думай есть её в таком виде. + .desc = Даже не думай есть её в таком виде. \ No newline at end of file From 6339c48ebd31fa9c995148868e6ae8493cad195d Mon Sep 17 00:00:00 2001 From: Chocosasel Date: Mon, 4 Nov 2024 10:57:05 +0400 Subject: [PATCH 10/48] Delete Resources/Textures/Corvax/Objects/Consumable/Food/ingredients.rsi/doughdangoball.png --- .../Food/ingredients.rsi/doughdangoball.png | Bin 270 -> 0 bytes 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 Resources/Textures/Corvax/Objects/Consumable/Food/ingredients.rsi/doughdangoball.png diff --git a/Resources/Textures/Corvax/Objects/Consumable/Food/ingredients.rsi/doughdangoball.png b/Resources/Textures/Corvax/Objects/Consumable/Food/ingredients.rsi/doughdangoball.png deleted file mode 100644 index 61607a9a45f28ab1c77e512d6646fd81ca9e4b07..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 270 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}>pWc?Ln2y} z6C_v{Cy4Yk1sYspRNg5yJ!I)W`^uke%s_DX$=UXkX6-qr=jY7+{r~aHxBuRlooL-+%8rWmof;}X#2e5nzhX}-P;T0k}j5QD&_;K?A$)78&qol`;+ E0GKgn(*OVf From a32ebc1a823421a1444d3b4f39d4659b41c6f765 Mon Sep 17 00:00:00 2001 From: Chocosasel Date: Mon, 4 Nov 2024 10:58:21 +0400 Subject: [PATCH 11/48] Add files via upload --- .../Ingredients/boileddangodough.yml | 19 +++++++++++++++++++ .../japanfood/Ingredients/rawdangodough.yml | 19 +++++++++++++++++++ 2 files changed, 38 insertions(+) create mode 100644 Resources/Prototypes/Corvax/Entities/Objects/Consumable/Food/japanfood/Ingredients/boileddangodough.yml create mode 100644 Resources/Prototypes/Corvax/Entities/Objects/Consumable/Food/japanfood/Ingredients/rawdangodough.yml diff --git a/Resources/Prototypes/Corvax/Entities/Objects/Consumable/Food/japanfood/Ingredients/boileddangodough.yml b/Resources/Prototypes/Corvax/Entities/Objects/Consumable/Food/japanfood/Ingredients/boileddangodough.yml new file mode 100644 index 00000000000..6492889402c --- /dev/null +++ b/Resources/Prototypes/Corvax/Entities/Objects/Consumable/Food/japanfood/Ingredients/boileddangodough.yml @@ -0,0 +1,19 @@ +- 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 \ No newline at end of file diff --git a/Resources/Prototypes/Corvax/Entities/Objects/Consumable/Food/japanfood/Ingredients/rawdangodough.yml b/Resources/Prototypes/Corvax/Entities/Objects/Consumable/Food/japanfood/Ingredients/rawdangodough.yml new file mode 100644 index 00000000000..acece4ab879 --- /dev/null +++ b/Resources/Prototypes/Corvax/Entities/Objects/Consumable/Food/japanfood/Ingredients/rawdangodough.yml @@ -0,0 +1,19 @@ +- 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 \ No newline at end of file From 4b9b54435e3f3a7f1199f7d723036e7c679e28f2 Mon Sep 17 00:00:00 2001 From: Chocosasel Date: Mon, 4 Nov 2024 10:59:52 +0400 Subject: [PATCH 12/48] Delete Resources/Prototypes/Corvax/Entities/Objects/Consumable/Food/japanfood/Ingredients/dangodough.yml --- .../Food/japanfood/Ingredients/dangodough.yml | 12 ------------ 1 file changed, 12 deletions(-) delete mode 100644 Resources/Prototypes/Corvax/Entities/Objects/Consumable/Food/japanfood/Ingredients/dangodough.yml diff --git a/Resources/Prototypes/Corvax/Entities/Objects/Consumable/Food/japanfood/Ingredients/dangodough.yml b/Resources/Prototypes/Corvax/Entities/Objects/Consumable/Food/japanfood/Ingredients/dangodough.yml deleted file mode 100644 index 5ffe3c7b2af..00000000000 --- a/Resources/Prototypes/Corvax/Entities/Objects/Consumable/Food/japanfood/Ingredients/dangodough.yml +++ /dev/null @@ -1,12 +0,0 @@ -- type: entity - name: Dough Dango Ball - parent: FoodBakingBase - id: Doughdangoball - description: A ball of dough. - components: - - type: FlavorProfile - flavors: - - dough - - type: Sprite - sprite: Corvax/Objects/Consumable/Food/ingredients.rsi - state: doughdangoball \ No newline at end of file From 2c4bffa97c5dbb2d3a3be424e792d9a90dead8f6 Mon Sep 17 00:00:00 2001 From: Chocosasel Date: Mon, 4 Nov 2024 11:04:31 +0400 Subject: [PATCH 13/48] Add files via upload --- .../Recipes/Cooking/JapanFood/meal_recipes.yml | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/Resources/Prototypes/Corvax/Recipes/Cooking/JapanFood/meal_recipes.yml b/Resources/Prototypes/Corvax/Recipes/Cooking/JapanFood/meal_recipes.yml index f70f2031669..9fb1488c88f 100644 --- a/Resources/Prototypes/Corvax/Recipes/Cooking/JapanFood/meal_recipes.yml +++ b/Resources/Prototypes/Corvax/Recipes/Cooking/JapanFood/meal_recipes.yml @@ -22,8 +22,8 @@ GreenTea: 5 JuiceWatermelon: 5 solids: - Doughdangoball: 3 - recipeType: Oven # Frontier + boileddoughdangoball: 3 + recipeType: Assembler # Frontier - type: microwaveMealRecipe id: Recipemitarashidango @@ -34,8 +34,8 @@ Soysauce: 5 Sugar: 5 solids: - Doughdangoball: 3 - recipeType: Oven # Frontier + boileddoughdangoball: 3 + recipeType: Assembler # Frontier - type: microwaveMealRecipe id: Recipeonigiri @@ -67,3 +67,13 @@ Hotsauce: 5 recipeType: Oven # Frontier +- type: microwaveMealRecipe + id: Recipboileddoughdangoball + name: boiled dough dango ball recipe + result: boileddoughdangoball + time: 10 + solids: + rawdoughdangoball: 1 + reagents: + Water: 5 + recipeType: Oven # Frontier \ No newline at end of file From c479b6767af484b9d4bdda51e163af7764d968f9 Mon Sep 17 00:00:00 2001 From: Chocosasel Date: Mon, 4 Nov 2024 11:05:35 +0400 Subject: [PATCH 14/48] Update meal_recipes.yml --- .../Corvax/Recipes/Cooking/JapanFood/meal_recipes.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Resources/Prototypes/Corvax/Recipes/Cooking/JapanFood/meal_recipes.yml b/Resources/Prototypes/Corvax/Recipes/Cooking/JapanFood/meal_recipes.yml index 9fb1488c88f..31fab7ffaa6 100644 --- a/Resources/Prototypes/Corvax/Recipes/Cooking/JapanFood/meal_recipes.yml +++ b/Resources/Prototypes/Corvax/Recipes/Cooking/JapanFood/meal_recipes.yml @@ -17,7 +17,7 @@ id: Recipehanamidango name: dango hanami recipe result: hanamidango - time: 15 + time: 10 reagents: GreenTea: 5 JuiceWatermelon: 5 @@ -29,7 +29,7 @@ id: Recipemitarashidango name: dango mitarashi recipe result: mitarashidango - time: 15 + time: 10 reagents: Soysauce: 5 Sugar: 5 @@ -76,4 +76,4 @@ rawdoughdangoball: 1 reagents: Water: 5 - recipeType: Oven # Frontier \ No newline at end of file + recipeType: Oven # Frontier From 314cae6e928384820bf89596c5abcfeafebab086 Mon Sep 17 00:00:00 2001 From: Chocosasel Date: Mon, 4 Nov 2024 11:30:15 +0400 Subject: [PATCH 15/48] Add files via upload --- .../Corvax/Recipes/Cooking/JapanFood/ingredients/food.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Resources/Prototypes/Corvax/Recipes/Cooking/JapanFood/ingredients/food.yml b/Resources/Prototypes/Corvax/Recipes/Cooking/JapanFood/ingredients/food.yml index 2b975ae6e65..80fc82b10b2 100644 --- a/Resources/Prototypes/Corvax/Recipes/Cooking/JapanFood/ingredients/food.yml +++ b/Resources/Prototypes/Corvax/Recipes/Cooking/JapanFood/ingredients/food.yml @@ -1,5 +1,5 @@ - type: reaction - id: CreateDangoDough + id: CreateRawDangoDough impact: Low quantized: true conserveEnergy: false @@ -12,7 +12,7 @@ amount: 5 effects: - !type:CreateEntityReactionEffect - entity: Doughdangoball + entity: rawdoughdangoball - type: reaction id: CreateRawRamen From e6aa280819eeb8a3e1cf5b1e9d6d3b3638ca8fdf Mon Sep 17 00:00:00 2001 From: Chocosasel Date: Mon, 4 Nov 2024 13:05:44 +0400 Subject: [PATCH 16/48] Delete Resources/Prototypes/Corvax/Entities/Objects/Consumable/Food/japanfood/chocopocky.yml --- .../Consumable/Food/japanfood/chocopocky.yml | 33 ------------------- 1 file changed, 33 deletions(-) delete mode 100644 Resources/Prototypes/Corvax/Entities/Objects/Consumable/Food/japanfood/chocopocky.yml diff --git a/Resources/Prototypes/Corvax/Entities/Objects/Consumable/Food/japanfood/chocopocky.yml b/Resources/Prototypes/Corvax/Entities/Objects/Consumable/Food/japanfood/chocopocky.yml deleted file mode 100644 index f4515a56e41..00000000000 --- a/Resources/Prototypes/Corvax/Entities/Objects/Consumable/Food/japanfood/chocopocky.yml +++ /dev/null @@ -1,33 +0,0 @@ -- type: entity - name: Chocolate Pocky - parent: FoodBakedBase - id: chocopocky - 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 \ No newline at end of file From 8fedef16fdf5ad9aebbd8941599122062783eca6 Mon Sep 17 00:00:00 2001 From: Chocosasel Date: Mon, 4 Nov 2024 13:05:52 +0400 Subject: [PATCH 17/48] Delete Resources/Prototypes/Corvax/Entities/Objects/Consumable/Food/japanfood/hanamidango.yml --- .../Consumable/Food/japanfood/hanamidango.yml | 32 ------------------- 1 file changed, 32 deletions(-) delete mode 100644 Resources/Prototypes/Corvax/Entities/Objects/Consumable/Food/japanfood/hanamidango.yml diff --git a/Resources/Prototypes/Corvax/Entities/Objects/Consumable/Food/japanfood/hanamidango.yml b/Resources/Prototypes/Corvax/Entities/Objects/Consumable/Food/japanfood/hanamidango.yml deleted file mode 100644 index c952923f733..00000000000 --- a/Resources/Prototypes/Corvax/Entities/Objects/Consumable/Food/japanfood/hanamidango.yml +++ /dev/null @@ -1,32 +0,0 @@ -- type: entity - name: Tricolor Dango - parent: FoodBakedBase - id: hanamidango - description: You like that colors, don't you? - components: - - type: Item - 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 \ No newline at end of file From 88b43a02ec229530bd9667c6f87e0ce13d6467fa Mon Sep 17 00:00:00 2001 From: Chocosasel Date: Mon, 4 Nov 2024 13:06:00 +0400 Subject: [PATCH 18/48] Delete Resources/Prototypes/Corvax/Entities/Objects/Consumable/Food/japanfood/mitarasidango.yml --- .../Food/japanfood/mitarasidango.yml | 26 ------------------- 1 file changed, 26 deletions(-) delete mode 100644 Resources/Prototypes/Corvax/Entities/Objects/Consumable/Food/japanfood/mitarasidango.yml diff --git a/Resources/Prototypes/Corvax/Entities/Objects/Consumable/Food/japanfood/mitarasidango.yml b/Resources/Prototypes/Corvax/Entities/Objects/Consumable/Food/japanfood/mitarasidango.yml deleted file mode 100644 index 0e653a97dd5..00000000000 --- a/Resources/Prototypes/Corvax/Entities/Objects/Consumable/Food/japanfood/mitarasidango.yml +++ /dev/null @@ -1,26 +0,0 @@ -- type: entity - name: Mitarashi Dango - parent: FoodBakedBase - id: mitarashidango - description: Rice sweetness that beckons - components: - - type: Item - 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 \ No newline at end of file From 72ecf6cc59560c7d845fd44056916dbf127332b9 Mon Sep 17 00:00:00 2001 From: Chocosasel Date: Mon, 4 Nov 2024 13:06:06 +0400 Subject: [PATCH 19/48] Delete Resources/Prototypes/Corvax/Entities/Objects/Consumable/Food/japanfood/onigiri.yml --- .../Consumable/Food/japanfood/onigiri.yml | 33 ------------------- 1 file changed, 33 deletions(-) delete mode 100644 Resources/Prototypes/Corvax/Entities/Objects/Consumable/Food/japanfood/onigiri.yml diff --git a/Resources/Prototypes/Corvax/Entities/Objects/Consumable/Food/japanfood/onigiri.yml b/Resources/Prototypes/Corvax/Entities/Objects/Consumable/Food/japanfood/onigiri.yml deleted file mode 100644 index 7396273eb99..00000000000 --- a/Resources/Prototypes/Corvax/Entities/Objects/Consumable/Food/japanfood/onigiri.yml +++ /dev/null @@ -1,33 +0,0 @@ -- type: entity - name: Onigiri - parent: FoodBakedBase - id: onigiri - description: Best fried geometric shape in the galaxy - components: - - type: FlavorProfile - flavors: - - meaty - - type: Item - 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 \ No newline at end of file From 42fa1e843675c35a14afb6c9ba3a33693b67da72 Mon Sep 17 00:00:00 2001 From: Chocosasel Date: Mon, 4 Nov 2024 13:06:14 +0400 Subject: [PATCH 20/48] Delete Resources/Prototypes/Corvax/Entities/Objects/Consumable/Food/japanfood/porkramennoodles.yml --- .../Food/japanfood/porkramennoodles.yml | 34 ------------------- 1 file changed, 34 deletions(-) delete mode 100644 Resources/Prototypes/Corvax/Entities/Objects/Consumable/Food/japanfood/porkramennoodles.yml diff --git a/Resources/Prototypes/Corvax/Entities/Objects/Consumable/Food/japanfood/porkramennoodles.yml b/Resources/Prototypes/Corvax/Entities/Objects/Consumable/Food/japanfood/porkramennoodles.yml deleted file mode 100644 index de90f3852bb..00000000000 --- a/Resources/Prototypes/Corvax/Entities/Objects/Consumable/Food/japanfood/porkramennoodles.yml +++ /dev/null @@ -1,34 +0,0 @@ -- type: entity - name: Pork Ramen - parent: FoodBowlBase - id: porkramennoodles - 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 \ No newline at end of file From 7cb7d67815530b34402bc4e4bad3f68deb1c354b Mon Sep 17 00:00:00 2001 From: Chocosasel Date: Mon, 4 Nov 2024 13:06:38 +0400 Subject: [PATCH 21/48] Add files via upload --- .../Consumable/Food/japanfood/food.yml | 198 ++++++++++++++++++ 1 file changed, 198 insertions(+) create mode 100644 Resources/Prototypes/Corvax/Entities/Objects/Consumable/Food/japanfood/food.yml diff --git a/Resources/Prototypes/Corvax/Entities/Objects/Consumable/Food/japanfood/food.yml b/Resources/Prototypes/Corvax/Entities/Objects/Consumable/Food/japanfood/food.yml new file mode 100644 index 00000000000..98876955ab8 --- /dev/null +++ b/Resources/Prototypes/Corvax/Entities/Objects/Consumable/Food/japanfood/food.yml @@ -0,0 +1,198 @@ +- type: entity + name: Chocolate Pocky + parent: FoodBakedBase + id: chocopocky + 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 + description: You like that colors, don't you? + components: + - type: Item + 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 + description: Rice sweetness that beckons + components: + - type: Item + 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 + description: Best fried geometric shape in the galaxy + components: + - type: FlavorProfile + flavors: + - meaty + - type: Item + 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 + 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 + 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 \ No newline at end of file From efa1f81b4e2c114faee5c0d26ad5b79ca6682b0b Mon Sep 17 00:00:00 2001 From: Chocosasel Date: Mon, 4 Nov 2024 13:07:12 +0400 Subject: [PATCH 22/48] Delete Resources/Prototypes/Corvax/Entities/Objects/Consumable/Food/japanfood/spicyporkramen.yml --- .../Food/japanfood/spicyporkramen.yml | 35 ------------------- 1 file changed, 35 deletions(-) delete mode 100644 Resources/Prototypes/Corvax/Entities/Objects/Consumable/Food/japanfood/spicyporkramen.yml diff --git a/Resources/Prototypes/Corvax/Entities/Objects/Consumable/Food/japanfood/spicyporkramen.yml b/Resources/Prototypes/Corvax/Entities/Objects/Consumable/Food/japanfood/spicyporkramen.yml deleted file mode 100644 index 03939cfa7df..00000000000 --- a/Resources/Prototypes/Corvax/Entities/Objects/Consumable/Food/japanfood/spicyporkramen.yml +++ /dev/null @@ -1,35 +0,0 @@ -- type: entity - name: Spicy Ramen - parent: FoodBowlBase - id: spicyporkramennoodles - 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 \ No newline at end of file From b21435ae280d963913d63acf701b698176ad1630 Mon Sep 17 00:00:00 2001 From: Chocosasel Date: Mon, 4 Nov 2024 13:07:48 +0400 Subject: [PATCH 23/48] Add files via upload --- .../japanfood/Ingredients/ingredients.yml | 58 +++++++++++++++++++ 1 file changed, 58 insertions(+) create mode 100644 Resources/Prototypes/Corvax/Entities/Objects/Consumable/Food/japanfood/Ingredients/ingredients.yml diff --git a/Resources/Prototypes/Corvax/Entities/Objects/Consumable/Food/japanfood/Ingredients/ingredients.yml b/Resources/Prototypes/Corvax/Entities/Objects/Consumable/Food/japanfood/Ingredients/ingredients.yml new file mode 100644 index 00000000000..919ef39bce1 --- /dev/null +++ b/Resources/Prototypes/Corvax/Entities/Objects/Consumable/Food/japanfood/Ingredients/ingredients.yml @@ -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 + From a592f65395ee54e9f572e3a2869e9ed698e94cd0 Mon Sep 17 00:00:00 2001 From: Chocosasel Date: Mon, 4 Nov 2024 13:08:03 +0400 Subject: [PATCH 24/48] Delete Resources/Prototypes/Corvax/Entities/Objects/Consumable/Food/japanfood/Ingredients/boileddangodough.yml --- .../Ingredients/boileddangodough.yml | 19 ------------------- 1 file changed, 19 deletions(-) delete mode 100644 Resources/Prototypes/Corvax/Entities/Objects/Consumable/Food/japanfood/Ingredients/boileddangodough.yml diff --git a/Resources/Prototypes/Corvax/Entities/Objects/Consumable/Food/japanfood/Ingredients/boileddangodough.yml b/Resources/Prototypes/Corvax/Entities/Objects/Consumable/Food/japanfood/Ingredients/boileddangodough.yml deleted file mode 100644 index 6492889402c..00000000000 --- a/Resources/Prototypes/Corvax/Entities/Objects/Consumable/Food/japanfood/Ingredients/boileddangodough.yml +++ /dev/null @@ -1,19 +0,0 @@ -- 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 \ No newline at end of file From 56cc6515b5ec95a594543d76b413db7ecf2ce89e Mon Sep 17 00:00:00 2001 From: Chocosasel Date: Mon, 4 Nov 2024 13:08:10 +0400 Subject: [PATCH 25/48] Delete Resources/Prototypes/Corvax/Entities/Objects/Consumable/Food/japanfood/Ingredients/rawdangodough.yml --- .../japanfood/Ingredients/rawdangodough.yml | 19 ------------------- 1 file changed, 19 deletions(-) delete mode 100644 Resources/Prototypes/Corvax/Entities/Objects/Consumable/Food/japanfood/Ingredients/rawdangodough.yml diff --git a/Resources/Prototypes/Corvax/Entities/Objects/Consumable/Food/japanfood/Ingredients/rawdangodough.yml b/Resources/Prototypes/Corvax/Entities/Objects/Consumable/Food/japanfood/Ingredients/rawdangodough.yml deleted file mode 100644 index acece4ab879..00000000000 --- a/Resources/Prototypes/Corvax/Entities/Objects/Consumable/Food/japanfood/Ingredients/rawdangodough.yml +++ /dev/null @@ -1,19 +0,0 @@ -- 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 \ No newline at end of file From 2baa2e80f01c46ddb4766118179d2cbee5e339cf Mon Sep 17 00:00:00 2001 From: Chocosasel Date: Mon, 4 Nov 2024 13:08:18 +0400 Subject: [PATCH 26/48] Delete Resources/Prototypes/Corvax/Entities/Objects/Consumable/Food/japanfood/Ingredients/rawramennoodles.yml --- .../japanfood/Ingredients/rawramennoodles.yml | 17 ----------------- 1 file changed, 17 deletions(-) delete mode 100644 Resources/Prototypes/Corvax/Entities/Objects/Consumable/Food/japanfood/Ingredients/rawramennoodles.yml diff --git a/Resources/Prototypes/Corvax/Entities/Objects/Consumable/Food/japanfood/Ingredients/rawramennoodles.yml b/Resources/Prototypes/Corvax/Entities/Objects/Consumable/Food/japanfood/Ingredients/rawramennoodles.yml deleted file mode 100644 index 4ecdaa36b4c..00000000000 --- a/Resources/Prototypes/Corvax/Entities/Objects/Consumable/Food/japanfood/Ingredients/rawramennoodles.yml +++ /dev/null @@ -1,17 +0,0 @@ -- 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 \ No newline at end of file From 6b9f8b1b9907a67264ebece935df90e390559391 Mon Sep 17 00:00:00 2001 From: Chocosasel Date: Mon, 4 Nov 2024 13:21:10 +0400 Subject: [PATCH 27/48] Update ingredients.yml --- .../Consumable/Food/japanfood/Ingredients/ingredients.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Resources/Prototypes/Corvax/Entities/Objects/Consumable/Food/japanfood/Ingredients/ingredients.yml b/Resources/Prototypes/Corvax/Entities/Objects/Consumable/Food/japanfood/Ingredients/ingredients.yml index 919ef39bce1..eb4c9cc49ff 100644 --- a/Resources/Prototypes/Corvax/Entities/Objects/Consumable/Food/japanfood/Ingredients/ingredients.yml +++ b/Resources/Prototypes/Corvax/Entities/Objects/Consumable/Food/japanfood/Ingredients/ingredients.yml @@ -1,7 +1,7 @@ - type: entity name: Boiled Dough Dango Ball parent: FoodBakingBase - id: boileddoughdangoball + id: BoiledDoughDangoBall description: A boiled ball of dough. components: - type: FlavorProfile @@ -21,7 +21,7 @@ - type: entity name: Raw Dough Dango Ball parent: FoodBakingBase - id: rawdoughdangoball + id: RawDoughDangoBall description: A raw ball of dough. components: - type: FlavorProfile @@ -41,7 +41,7 @@ - type: entity name: Raw Ramen Noodles parent: FoodBakingBase - id: rawramennoodles + id: RawRamenNoodles description: A raw ramen. components: - type: FlavorProfile From 02a28c55302848f3dfcb49237f7bdab5c6b0a1ea Mon Sep 17 00:00:00 2001 From: Chocosasel Date: Mon, 4 Nov 2024 13:23:22 +0400 Subject: [PATCH 28/48] Update food.yml --- .../Objects/Consumable/Food/japanfood/food.yml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/Resources/Prototypes/Corvax/Entities/Objects/Consumable/Food/japanfood/food.yml b/Resources/Prototypes/Corvax/Entities/Objects/Consumable/Food/japanfood/food.yml index 98876955ab8..b6c800ae795 100644 --- a/Resources/Prototypes/Corvax/Entities/Objects/Consumable/Food/japanfood/food.yml +++ b/Resources/Prototypes/Corvax/Entities/Objects/Consumable/Food/japanfood/food.yml @@ -1,7 +1,7 @@ - type: entity name: Chocolate Pocky parent: FoodBakedBase - id: chocopocky + id: ChocoPocky description: Don't forget to play the game with your date... components: - type: FlavorProfile @@ -35,7 +35,7 @@ - type: entity name: Tricolor Dango parent: FoodBakedBase - id: hanamidango + id: HanamiDango description: You like that colors, don't you? components: - type: Item @@ -68,7 +68,7 @@ - type: entity name: Mitarashi Dango parent: FoodBakedBase - id: mitarashidango + id: MitarashiDango description: Rice sweetness that beckons components: - type: Item @@ -95,7 +95,7 @@ - type: entity name: Onigiri parent: FoodBakedBase - id: onigiri + id: Onigiri description: Best fried geometric shape in the galaxy components: - type: FlavorProfile @@ -129,7 +129,7 @@ - type: entity name: Pork Ramen parent: FoodBowlBase - id: porkramennoodles + id: PorkRamenNoodles description: Ah, I See You're a Man of Culture As Well... components: - type: FlavorProfile @@ -164,7 +164,7 @@ - type: entity name: Spicy Ramen parent: FoodBowlBase - id: spicyporkramennoodles + id: SpicyPorkRamenNoodles description: So hot and so cute! components: - type: FlavorProfile @@ -195,4 +195,4 @@ - type: Tag tags: - Meat - - Soup \ No newline at end of file + - Soup From 8277bfbd29b23b31ca43c82be3a38dade7f7fb60 Mon Sep 17 00:00:00 2001 From: Chocosasel Date: Mon, 4 Nov 2024 13:27:56 +0400 Subject: [PATCH 29/48] Update japaningredients.ftl --- .../food/japanfood/ingredients/japaningredients.ftl | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Resources/Locale/ru-RU/corvax/_nf/prototypes/entities/objects/consumable/food/japanfood/ingredients/japaningredients.ftl b/Resources/Locale/ru-RU/corvax/_nf/prototypes/entities/objects/consumable/food/japanfood/ingredients/japaningredients.ftl index 15b45a1ced6..8c50c93b438 100644 --- a/Resources/Locale/ru-RU/corvax/_nf/prototypes/entities/objects/consumable/food/japanfood/ingredients/japaningredients.ftl +++ b/Resources/Locale/ru-RU/corvax/_nf/prototypes/entities/objects/consumable/food/japanfood/ingredients/japaningredients.ftl @@ -1,6 +1,6 @@ -ent-rawdoughdangoball = сырой шарик данго +ent-RawDoughDangoBall = сырой шарик данго .desc = Слепленный шарик из рисового теста. -ent-boileddoughdangoball = отваренный шарик данго +ent-BoiledDoughDangoBall = отваренный шарик данго .desc = Отваренный шарик данго, готовый к приготовлению главного блюда. -ent-rawramennoodles = сухая лапша для рамэна - .desc = Даже не думай есть её в таком виде. \ No newline at end of file +ent-RawRamenNoodles = сухая лапша для рамэна + .desc = Даже не думай есть её в таком виде. From 99494a752b7c884ed70bfb314d8ed11223541254 Mon Sep 17 00:00:00 2001 From: Chocosasel Date: Mon, 4 Nov 2024 13:30:15 +0400 Subject: [PATCH 30/48] Update japanfoods.ftl --- .../objects/consumable/food/japanfood/japanfoods.ftl | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/Resources/Locale/ru-RU/corvax/_nf/prototypes/entities/objects/consumable/food/japanfood/japanfoods.ftl b/Resources/Locale/ru-RU/corvax/_nf/prototypes/entities/objects/consumable/food/japanfood/japanfoods.ftl index 4e3c0cead2b..2f27e0a8f7e 100644 --- a/Resources/Locale/ru-RU/corvax/_nf/prototypes/entities/objects/consumable/food/japanfood/japanfoods.ftl +++ b/Resources/Locale/ru-RU/corvax/_nf/prototypes/entities/objects/consumable/food/japanfood/japanfoods.ftl @@ -1,14 +1,14 @@ -ent-hanamidango = трёхцветное данго +ent-HanamiDango = трёхцветное данго .desc = Тебе нравятся разные цвета, не так ли? -ent-mitarashidango = митараши данго +ent-MitarashiDango = митараши данго .desc = Рисовая сладость, манящая своим сладким соевым соусом. -ent-onigiri = онигири +ent-Onigiri = онигири .desc = Лучший рисовый треугольник в галактике. -ent-spicyporkramennoodles = острый рамэн +ent-SpicyPorkRamenNoodles = острый рамэн .desc = Выглядит так горячо... И так аппетитно! -ent-porkramennoodles = свиной рамэн +ent-PorkRamenNoodles = свиной рамэн .desc = А-ах... Вижу вы тоже человек высокой культуры. ent-ChocolatePockyPack = коробочка шоколадных покки .desc = Отличное шоколадное печенье для заядлого одиночки или влюбленной парочки. -ent-chocopocky = шоколадная палочка покки +ent-ChocoPocky = шоколадная палочка покки .desc = Вкус беззаботной молодости. From bf47393dd186715516623844353a20235073a7f8 Mon Sep 17 00:00:00 2001 From: Chocosasel Date: Mon, 4 Nov 2024 13:32:59 +0400 Subject: [PATCH 31/48] Update food.yml --- .../Corvax/Recipes/Cooking/JapanFood/ingredients/food.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Resources/Prototypes/Corvax/Recipes/Cooking/JapanFood/ingredients/food.yml b/Resources/Prototypes/Corvax/Recipes/Cooking/JapanFood/ingredients/food.yml index 80fc82b10b2..c80e944af3f 100644 --- a/Resources/Prototypes/Corvax/Recipes/Cooking/JapanFood/ingredients/food.yml +++ b/Resources/Prototypes/Corvax/Recipes/Cooking/JapanFood/ingredients/food.yml @@ -12,7 +12,7 @@ amount: 5 effects: - !type:CreateEntityReactionEffect - entity: rawdoughdangoball + entity: RawDoughDangoBall - type: reaction id: CreateRawRamen @@ -32,4 +32,4 @@ amount: 5 effects: - !type:CreateEntityReactionEffect - entity: rawramennoodles \ No newline at end of file + entity: RawRamenNoodles From 095d06207403931e2c4633f771b9ff7847565a5b Mon Sep 17 00:00:00 2001 From: Chocosasel Date: Mon, 4 Nov 2024 13:34:02 +0400 Subject: [PATCH 32/48] Update meal_recipes.yml --- .../Recipes/Cooking/JapanFood/meal_recipes.yml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/Resources/Prototypes/Corvax/Recipes/Cooking/JapanFood/meal_recipes.yml b/Resources/Prototypes/Corvax/Recipes/Cooking/JapanFood/meal_recipes.yml index 31fab7ffaa6..12b5fe2fdb1 100644 --- a/Resources/Prototypes/Corvax/Recipes/Cooking/JapanFood/meal_recipes.yml +++ b/Resources/Prototypes/Corvax/Recipes/Cooking/JapanFood/meal_recipes.yml @@ -1,7 +1,7 @@ - type: microwaveMealRecipe id: Recipeporkramen name: pork ramen recipe - result: porkramennoodles + result: PorkRamenNoodles time: 30 solids: FoodMeatCutlet: 3 @@ -16,8 +16,8 @@ - type: microwaveMealRecipe id: Recipehanamidango name: dango hanami recipe - result: hanamidango - time: 10 + result: HanamiDango + time: 15 reagents: GreenTea: 5 JuiceWatermelon: 5 @@ -28,8 +28,8 @@ - type: microwaveMealRecipe id: Recipemitarashidango name: dango mitarashi recipe - result: mitarashidango - time: 10 + result: MitarashiDango + time: 15 reagents: Soysauce: 5 Sugar: 5 @@ -40,7 +40,7 @@ - type: microwaveMealRecipe id: Recipeonigiri name: onigiri recipe - result: onigiri + result: Onigiri time: 15 reagents: Mayo: 5 @@ -53,7 +53,7 @@ - type: microwaveMealRecipe id: Recipespicyramen name: spicy ramen recipe - result: spicyporkramennoodles + result: SpicyPorkRamenNoodles time: 30 solids: FoodMeatCutlet: 3 @@ -70,7 +70,7 @@ - type: microwaveMealRecipe id: Recipboileddoughdangoball name: boiled dough dango ball recipe - result: boileddoughdangoball + result: BoiledDoughDangoBall time: 10 solids: rawdoughdangoball: 1 From e77b4bc75e32b9ea3d2cd6d4e85369133df80af6 Mon Sep 17 00:00:00 2001 From: Chocosasel Date: Mon, 4 Nov 2024 13:42:53 +0400 Subject: [PATCH 33/48] Update meal_recipes.yml --- .../Recipes/Cooking/JapanFood/meal_recipes.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/Resources/Prototypes/Corvax/Recipes/Cooking/JapanFood/meal_recipes.yml b/Resources/Prototypes/Corvax/Recipes/Cooking/JapanFood/meal_recipes.yml index 12b5fe2fdb1..c671e117570 100644 --- a/Resources/Prototypes/Corvax/Recipes/Cooking/JapanFood/meal_recipes.yml +++ b/Resources/Prototypes/Corvax/Recipes/Cooking/JapanFood/meal_recipes.yml @@ -1,7 +1,7 @@ - type: microwaveMealRecipe id: Recipeporkramen name: pork ramen recipe - result: PorkRamenNoodles + result: porkramennoodles time: 30 solids: FoodMeatCutlet: 3 @@ -16,7 +16,7 @@ - type: microwaveMealRecipe id: Recipehanamidango name: dango hanami recipe - result: HanamiDango + result: hanamidango time: 15 reagents: GreenTea: 5 @@ -28,7 +28,7 @@ - type: microwaveMealRecipe id: Recipemitarashidango name: dango mitarashi recipe - result: MitarashiDango + result: mitarashidango time: 15 reagents: Soysauce: 5 @@ -40,7 +40,7 @@ - type: microwaveMealRecipe id: Recipeonigiri name: onigiri recipe - result: Onigiri + result: onigiri time: 15 reagents: Mayo: 5 @@ -53,7 +53,7 @@ - type: microwaveMealRecipe id: Recipespicyramen name: spicy ramen recipe - result: SpicyPorkRamenNoodles + result: spicyporkramennoodles time: 30 solids: FoodMeatCutlet: 3 @@ -70,7 +70,7 @@ - type: microwaveMealRecipe id: Recipboileddoughdangoball name: boiled dough dango ball recipe - result: BoiledDoughDangoBall + result: boileddoughdangoball time: 10 solids: rawdoughdangoball: 1 From 4cffb48b9b80a1e172b540db31efeddd6a863439 Mon Sep 17 00:00:00 2001 From: Chocosasel Date: Mon, 4 Nov 2024 13:43:36 +0400 Subject: [PATCH 34/48] Update food.yml --- .../Corvax/Recipes/Cooking/JapanFood/ingredients/food.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Resources/Prototypes/Corvax/Recipes/Cooking/JapanFood/ingredients/food.yml b/Resources/Prototypes/Corvax/Recipes/Cooking/JapanFood/ingredients/food.yml index c80e944af3f..a56b394a3af 100644 --- a/Resources/Prototypes/Corvax/Recipes/Cooking/JapanFood/ingredients/food.yml +++ b/Resources/Prototypes/Corvax/Recipes/Cooking/JapanFood/ingredients/food.yml @@ -1,5 +1,5 @@ - type: reaction - id: CreateRawDangoDough + id: createrawdangodough impact: Low quantized: true conserveEnergy: false @@ -12,10 +12,10 @@ amount: 5 effects: - !type:CreateEntityReactionEffect - entity: RawDoughDangoBall + entity: rawdoughdangoball - type: reaction - id: CreateRawRamen + id: createrawramen impact: Low quantized: true conserveEnergy: false @@ -32,4 +32,4 @@ amount: 5 effects: - !type:CreateEntityReactionEffect - entity: RawRamenNoodles + entity: rawramennoodles From 3256001f38b3e34eb50be6a4c7ef56348ff849c2 Mon Sep 17 00:00:00 2001 From: Chocosasel Date: Mon, 4 Nov 2024 13:44:22 +0400 Subject: [PATCH 35/48] Update japanfoods.ftl --- .../consumable/food/japanfood/japanfoods.ftl | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/Resources/Locale/ru-RU/corvax/_nf/prototypes/entities/objects/consumable/food/japanfood/japanfoods.ftl b/Resources/Locale/ru-RU/corvax/_nf/prototypes/entities/objects/consumable/food/japanfood/japanfoods.ftl index 2f27e0a8f7e..d447e42c1f3 100644 --- a/Resources/Locale/ru-RU/corvax/_nf/prototypes/entities/objects/consumable/food/japanfood/japanfoods.ftl +++ b/Resources/Locale/ru-RU/corvax/_nf/prototypes/entities/objects/consumable/food/japanfood/japanfoods.ftl @@ -1,14 +1,14 @@ -ent-HanamiDango = трёхцветное данго +ent-hanamidango = трёхцветное данго .desc = Тебе нравятся разные цвета, не так ли? -ent-MitarashiDango = митараши данго +ent-mitarashidango = митараши данго .desc = Рисовая сладость, манящая своим сладким соевым соусом. -ent-Onigiri = онигири +ent-onigiri = онигири .desc = Лучший рисовый треугольник в галактике. -ent-SpicyPorkRamenNoodles = острый рамэн +ent-spicyporkramennoodles = острый рамэн .desc = Выглядит так горячо... И так аппетитно! -ent-PorkRamenNoodles = свиной рамэн +ent-porkramennoodles = свиной рамэн .desc = А-ах... Вижу вы тоже человек высокой культуры. -ent-ChocolatePockyPack = коробочка шоколадных покки +ent-chocolatepockypack = коробочка шоколадных покки .desc = Отличное шоколадное печенье для заядлого одиночки или влюбленной парочки. -ent-ChocoPocky = шоколадная палочка покки +ent-chocopocky = шоколадная палочка покки .desc = Вкус беззаботной молодости. From b937c8a6b6bd517ab322a4c4c9d0b5dc126c6b7c Mon Sep 17 00:00:00 2001 From: Chocosasel Date: Mon, 4 Nov 2024 13:45:00 +0400 Subject: [PATCH 36/48] Update japaningredients.ftl --- .../food/japanfood/ingredients/japaningredients.ftl | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Resources/Locale/ru-RU/corvax/_nf/prototypes/entities/objects/consumable/food/japanfood/ingredients/japaningredients.ftl b/Resources/Locale/ru-RU/corvax/_nf/prototypes/entities/objects/consumable/food/japanfood/ingredients/japaningredients.ftl index 8c50c93b438..06aa4f9efec 100644 --- a/Resources/Locale/ru-RU/corvax/_nf/prototypes/entities/objects/consumable/food/japanfood/ingredients/japaningredients.ftl +++ b/Resources/Locale/ru-RU/corvax/_nf/prototypes/entities/objects/consumable/food/japanfood/ingredients/japaningredients.ftl @@ -1,6 +1,6 @@ -ent-RawDoughDangoBall = сырой шарик данго +ent-rawdoughdangoball = сырой шарик данго .desc = Слепленный шарик из рисового теста. -ent-BoiledDoughDangoBall = отваренный шарик данго +ent-boileddoughdangoball = отваренный шарик данго .desc = Отваренный шарик данго, готовый к приготовлению главного блюда. -ent-RawRamenNoodles = сухая лапша для рамэна +ent-rawramennoodles = сухая лапша для рамэна .desc = Даже не думай есть её в таком виде. From 3bf2d7872031fe01a1163b51ba99b4ab0f3a2e93 Mon Sep 17 00:00:00 2001 From: Chocosasel Date: Mon, 4 Nov 2024 13:45:53 +0400 Subject: [PATCH 37/48] Update food.yml --- .../Objects/Consumable/Food/japanfood/food.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/Resources/Prototypes/Corvax/Entities/Objects/Consumable/Food/japanfood/food.yml b/Resources/Prototypes/Corvax/Entities/Objects/Consumable/Food/japanfood/food.yml index b6c800ae795..d9ec67b1bdc 100644 --- a/Resources/Prototypes/Corvax/Entities/Objects/Consumable/Food/japanfood/food.yml +++ b/Resources/Prototypes/Corvax/Entities/Objects/Consumable/Food/japanfood/food.yml @@ -1,7 +1,7 @@ - type: entity name: Chocolate Pocky parent: FoodBakedBase - id: ChocoPocky + id: chocopocky description: Don't forget to play the game with your date... components: - type: FlavorProfile @@ -35,7 +35,7 @@ - type: entity name: Tricolor Dango parent: FoodBakedBase - id: HanamiDango + id: hanamidango description: You like that colors, don't you? components: - type: Item @@ -68,7 +68,7 @@ - type: entity name: Mitarashi Dango parent: FoodBakedBase - id: MitarashiDango + id: mitarashidango description: Rice sweetness that beckons components: - type: Item @@ -95,7 +95,7 @@ - type: entity name: Onigiri parent: FoodBakedBase - id: Onigiri + id: onigiri description: Best fried geometric shape in the galaxy components: - type: FlavorProfile @@ -129,7 +129,7 @@ - type: entity name: Pork Ramen parent: FoodBowlBase - id: PorkRamenNoodles + id: porkramennoodles description: Ah, I See You're a Man of Culture As Well... components: - type: FlavorProfile @@ -164,7 +164,7 @@ - type: entity name: Spicy Ramen parent: FoodBowlBase - id: SpicyPorkRamenNoodles + id: spicyporkramennoodles description: So hot and so cute! components: - type: FlavorProfile From cda9b4619709ec44c1c4b484188707268f26ca60 Mon Sep 17 00:00:00 2001 From: Chocosasel Date: Mon, 4 Nov 2024 13:46:30 +0400 Subject: [PATCH 38/48] Update ingredients.yml --- .../Consumable/Food/japanfood/Ingredients/ingredients.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Resources/Prototypes/Corvax/Entities/Objects/Consumable/Food/japanfood/Ingredients/ingredients.yml b/Resources/Prototypes/Corvax/Entities/Objects/Consumable/Food/japanfood/Ingredients/ingredients.yml index eb4c9cc49ff..919ef39bce1 100644 --- a/Resources/Prototypes/Corvax/Entities/Objects/Consumable/Food/japanfood/Ingredients/ingredients.yml +++ b/Resources/Prototypes/Corvax/Entities/Objects/Consumable/Food/japanfood/Ingredients/ingredients.yml @@ -1,7 +1,7 @@ - type: entity name: Boiled Dough Dango Ball parent: FoodBakingBase - id: BoiledDoughDangoBall + id: boileddoughdangoball description: A boiled ball of dough. components: - type: FlavorProfile @@ -21,7 +21,7 @@ - type: entity name: Raw Dough Dango Ball parent: FoodBakingBase - id: RawDoughDangoBall + id: rawdoughdangoball description: A raw ball of dough. components: - type: FlavorProfile @@ -41,7 +41,7 @@ - type: entity name: Raw Ramen Noodles parent: FoodBakingBase - id: RawRamenNoodles + id: rawramennoodles description: A raw ramen. components: - type: FlavorProfile From 36a92530f680a934d5b6390d80369fd71a8843f1 Mon Sep 17 00:00:00 2001 From: Chocosasel Date: Mon, 4 Nov 2024 17:29:45 +0400 Subject: [PATCH 39/48] Update food.yml --- .../Corvax/Entities/Objects/Consumable/Food/japanfood/food.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Resources/Prototypes/Corvax/Entities/Objects/Consumable/Food/japanfood/food.yml b/Resources/Prototypes/Corvax/Entities/Objects/Consumable/Food/japanfood/food.yml index d9ec67b1bdc..72daa8d0715 100644 --- a/Resources/Prototypes/Corvax/Entities/Objects/Consumable/Food/japanfood/food.yml +++ b/Resources/Prototypes/Corvax/Entities/Objects/Consumable/Food/japanfood/food.yml @@ -39,6 +39,7 @@ description: You like that colors, don't you? components: - type: Item + size: Small storedRotation: -90 - type: FlavorProfile flavors: @@ -72,6 +73,7 @@ description: Rice sweetness that beckons components: - type: Item + size: Small storedRotation: -90 - type: FlavorProfile flavors: @@ -102,6 +104,7 @@ flavors: - meaty - type: Item + size: Small storedRotation: -90 - type: Food - type: Sprite From 839c7d27dbcde4a083dba220ae4647acd1169099 Mon Sep 17 00:00:00 2001 From: Chocosasel Date: Mon, 4 Nov 2024 17:58:56 +0400 Subject: [PATCH 40/48] Update meal_recipes.yml --- .../Corvax/Recipes/Cooking/JapanFood/meal_recipes.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Prototypes/Corvax/Recipes/Cooking/JapanFood/meal_recipes.yml b/Resources/Prototypes/Corvax/Recipes/Cooking/JapanFood/meal_recipes.yml index c671e117570..cc302770f84 100644 --- a/Resources/Prototypes/Corvax/Recipes/Cooking/JapanFood/meal_recipes.yml +++ b/Resources/Prototypes/Corvax/Recipes/Cooking/JapanFood/meal_recipes.yml @@ -75,5 +75,5 @@ solids: rawdoughdangoball: 1 reagents: - Water: 5 + Water: 10 recipeType: Oven # Frontier From a8c1ab70b1f419223e15f52ef841cd1d62d6f1d8 Mon Sep 17 00:00:00 2001 From: Chocosasel Date: Mon, 4 Nov 2024 19:44:27 +0400 Subject: [PATCH 41/48] Update food.yml --- .../Objects/Consumable/Food/japanfood/food.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/Resources/Prototypes/Corvax/Entities/Objects/Consumable/Food/japanfood/food.yml b/Resources/Prototypes/Corvax/Entities/Objects/Consumable/Food/japanfood/food.yml index 72daa8d0715..d4c22575625 100644 --- a/Resources/Prototypes/Corvax/Entities/Objects/Consumable/Food/japanfood/food.yml +++ b/Resources/Prototypes/Corvax/Entities/Objects/Consumable/Food/japanfood/food.yml @@ -1,7 +1,7 @@ - type: entity name: Chocolate Pocky parent: FoodBakedBase - id: chocopocky + id: ChocoPocky description: Don't forget to play the game with your date... components: - type: FlavorProfile @@ -35,7 +35,7 @@ - type: entity name: Tricolor Dango parent: FoodBakedBase - id: hanamidango + id: HanamiDango description: You like that colors, don't you? components: - type: Item @@ -69,7 +69,7 @@ - type: entity name: Mitarashi Dango parent: FoodBakedBase - id: mitarashidango + id: MitarashiDango description: Rice sweetness that beckons components: - type: Item @@ -97,7 +97,7 @@ - type: entity name: Onigiri parent: FoodBakedBase - id: onigiri + id: Onigiri description: Best fried geometric shape in the galaxy components: - type: FlavorProfile @@ -132,7 +132,7 @@ - type: entity name: Pork Ramen parent: FoodBowlBase - id: porkramennoodles + id: PorkRamenNoodles description: Ah, I See You're a Man of Culture As Well... components: - type: FlavorProfile @@ -167,7 +167,7 @@ - type: entity name: Spicy Ramen parent: FoodBowlBase - id: spicyporkramennoodles + id: SpicyPorkRamenNoodles description: So hot and so cute! components: - type: FlavorProfile From 15248bc00ac62d11c7501cdcd9ae76c19dbd5a6a Mon Sep 17 00:00:00 2001 From: Chocosasel Date: Mon, 4 Nov 2024 20:20:25 +0400 Subject: [PATCH 42/48] Update meal_recipes.yml --- .../Recipes/Cooking/JapanFood/meal_recipes.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/Resources/Prototypes/Corvax/Recipes/Cooking/JapanFood/meal_recipes.yml b/Resources/Prototypes/Corvax/Recipes/Cooking/JapanFood/meal_recipes.yml index cc302770f84..ee7103788ea 100644 --- a/Resources/Prototypes/Corvax/Recipes/Cooking/JapanFood/meal_recipes.yml +++ b/Resources/Prototypes/Corvax/Recipes/Cooking/JapanFood/meal_recipes.yml @@ -1,7 +1,7 @@ - type: microwaveMealRecipe id: Recipeporkramen name: pork ramen recipe - result: porkramennoodles + result: PorkRamenNoodles time: 30 solids: FoodMeatCutlet: 3 @@ -16,7 +16,7 @@ - type: microwaveMealRecipe id: Recipehanamidango name: dango hanami recipe - result: hanamidango + result: HanamiDango time: 15 reagents: GreenTea: 5 @@ -28,7 +28,7 @@ - type: microwaveMealRecipe id: Recipemitarashidango name: dango mitarashi recipe - result: mitarashidango + result: MitarashiDango time: 15 reagents: Soysauce: 5 @@ -40,7 +40,7 @@ - type: microwaveMealRecipe id: Recipeonigiri name: onigiri recipe - result: onigiri + result: Onigiri time: 15 reagents: Mayo: 5 @@ -53,7 +53,7 @@ - type: microwaveMealRecipe id: Recipespicyramen name: spicy ramen recipe - result: spicyporkramennoodles + result: SpicyPorkRamenNoodles time: 30 solids: FoodMeatCutlet: 3 @@ -70,7 +70,7 @@ - type: microwaveMealRecipe id: Recipboileddoughdangoball name: boiled dough dango ball recipe - result: boileddoughdangoball + result: BoiledDoughDangoBall time: 10 solids: rawdoughdangoball: 1 From 1d60b3ec2f8f75380141edff056facf959be161c Mon Sep 17 00:00:00 2001 From: Chocosasel Date: Mon, 4 Nov 2024 20:21:18 +0400 Subject: [PATCH 43/48] Update ingredients.yml --- .../Consumable/Food/japanfood/Ingredients/ingredients.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Resources/Prototypes/Corvax/Entities/Objects/Consumable/Food/japanfood/Ingredients/ingredients.yml b/Resources/Prototypes/Corvax/Entities/Objects/Consumable/Food/japanfood/Ingredients/ingredients.yml index 919ef39bce1..eb4c9cc49ff 100644 --- a/Resources/Prototypes/Corvax/Entities/Objects/Consumable/Food/japanfood/Ingredients/ingredients.yml +++ b/Resources/Prototypes/Corvax/Entities/Objects/Consumable/Food/japanfood/Ingredients/ingredients.yml @@ -1,7 +1,7 @@ - type: entity name: Boiled Dough Dango Ball parent: FoodBakingBase - id: boileddoughdangoball + id: BoiledDoughDangoBall description: A boiled ball of dough. components: - type: FlavorProfile @@ -21,7 +21,7 @@ - type: entity name: Raw Dough Dango Ball parent: FoodBakingBase - id: rawdoughdangoball + id: RawDoughDangoBall description: A raw ball of dough. components: - type: FlavorProfile @@ -41,7 +41,7 @@ - type: entity name: Raw Ramen Noodles parent: FoodBakingBase - id: rawramennoodles + id: RawRamenNoodles description: A raw ramen. components: - type: FlavorProfile From 58f6a0bad3d80404d6254b25d156319a319fc221 Mon Sep 17 00:00:00 2001 From: Chocosasel Date: Mon, 4 Nov 2024 20:22:12 +0400 Subject: [PATCH 44/48] Update japaningredients.ftl --- .../food/japanfood/ingredients/japaningredients.ftl | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Resources/Locale/ru-RU/corvax/_nf/prototypes/entities/objects/consumable/food/japanfood/ingredients/japaningredients.ftl b/Resources/Locale/ru-RU/corvax/_nf/prototypes/entities/objects/consumable/food/japanfood/ingredients/japaningredients.ftl index 06aa4f9efec..8c50c93b438 100644 --- a/Resources/Locale/ru-RU/corvax/_nf/prototypes/entities/objects/consumable/food/japanfood/ingredients/japaningredients.ftl +++ b/Resources/Locale/ru-RU/corvax/_nf/prototypes/entities/objects/consumable/food/japanfood/ingredients/japaningredients.ftl @@ -1,6 +1,6 @@ -ent-rawdoughdangoball = сырой шарик данго +ent-RawDoughDangoBall = сырой шарик данго .desc = Слепленный шарик из рисового теста. -ent-boileddoughdangoball = отваренный шарик данго +ent-BoiledDoughDangoBall = отваренный шарик данго .desc = Отваренный шарик данго, готовый к приготовлению главного блюда. -ent-rawramennoodles = сухая лапша для рамэна +ent-RawRamenNoodles = сухая лапша для рамэна .desc = Даже не думай есть её в таком виде. From 8c96b70266f149d67ff4391c72a9f5e2c5caeda7 Mon Sep 17 00:00:00 2001 From: Chocosasel Date: Mon, 4 Nov 2024 20:23:07 +0400 Subject: [PATCH 45/48] Update japanfoods.ftl --- .../consumable/food/japanfood/japanfoods.ftl | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/Resources/Locale/ru-RU/corvax/_nf/prototypes/entities/objects/consumable/food/japanfood/japanfoods.ftl b/Resources/Locale/ru-RU/corvax/_nf/prototypes/entities/objects/consumable/food/japanfood/japanfoods.ftl index d447e42c1f3..2f27e0a8f7e 100644 --- a/Resources/Locale/ru-RU/corvax/_nf/prototypes/entities/objects/consumable/food/japanfood/japanfoods.ftl +++ b/Resources/Locale/ru-RU/corvax/_nf/prototypes/entities/objects/consumable/food/japanfood/japanfoods.ftl @@ -1,14 +1,14 @@ -ent-hanamidango = трёхцветное данго +ent-HanamiDango = трёхцветное данго .desc = Тебе нравятся разные цвета, не так ли? -ent-mitarashidango = митараши данго +ent-MitarashiDango = митараши данго .desc = Рисовая сладость, манящая своим сладким соевым соусом. -ent-onigiri = онигири +ent-Onigiri = онигири .desc = Лучший рисовый треугольник в галактике. -ent-spicyporkramennoodles = острый рамэн +ent-SpicyPorkRamenNoodles = острый рамэн .desc = Выглядит так горячо... И так аппетитно! -ent-porkramennoodles = свиной рамэн +ent-PorkRamenNoodles = свиной рамэн .desc = А-ах... Вижу вы тоже человек высокой культуры. -ent-chocolatepockypack = коробочка шоколадных покки +ent-ChocolatePockyPack = коробочка шоколадных покки .desc = Отличное шоколадное печенье для заядлого одиночки или влюбленной парочки. -ent-chocopocky = шоколадная палочка покки +ent-ChocoPocky = шоколадная палочка покки .desc = Вкус беззаботной молодости. From 7741dba382efffc325c50ac5b0ec4c5cd8460abb Mon Sep 17 00:00:00 2001 From: Chocosasel Date: Mon, 4 Nov 2024 20:24:05 +0400 Subject: [PATCH 46/48] Update food.yml --- .../Corvax/Recipes/Cooking/JapanFood/ingredients/food.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Resources/Prototypes/Corvax/Recipes/Cooking/JapanFood/ingredients/food.yml b/Resources/Prototypes/Corvax/Recipes/Cooking/JapanFood/ingredients/food.yml index a56b394a3af..127013fcecc 100644 --- a/Resources/Prototypes/Corvax/Recipes/Cooking/JapanFood/ingredients/food.yml +++ b/Resources/Prototypes/Corvax/Recipes/Cooking/JapanFood/ingredients/food.yml @@ -12,7 +12,7 @@ amount: 5 effects: - !type:CreateEntityReactionEffect - entity: rawdoughdangoball + entity: RawDoughDangoBall - type: reaction id: createrawramen @@ -32,4 +32,4 @@ amount: 5 effects: - !type:CreateEntityReactionEffect - entity: rawramennoodles + entity: RawRamenNoodles From f5b665b31dd79a1f24a38a08b71a2e3a7bf96b40 Mon Sep 17 00:00:00 2001 From: Chocosasel Date: Mon, 4 Nov 2024 20:32:18 +0400 Subject: [PATCH 47/48] Update pockypacks.yml --- .../Objects/Consumable/Food/japanfood/pockypack/pockypacks.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Prototypes/Corvax/Entities/Objects/Consumable/Food/japanfood/pockypack/pockypacks.yml b/Resources/Prototypes/Corvax/Entities/Objects/Consumable/Food/japanfood/pockypack/pockypacks.yml index 0328729b286..7ae19adc0e0 100644 --- a/Resources/Prototypes/Corvax/Entities/Objects/Consumable/Food/japanfood/pockypack/pockypacks.yml +++ b/Resources/Prototypes/Corvax/Entities/Objects/Consumable/Food/japanfood/pockypack/pockypacks.yml @@ -39,7 +39,7 @@ - 0,0,4,1 - type: StorageFill contents: - - id: chocopocky + - id: ChocoPocky amount: 10 - type: ItemCounter count: From 1c0008a0ea33dafa37951fb3a38e4077da7b0359 Mon Sep 17 00:00:00 2001 From: Chocosasel Date: Mon, 4 Nov 2024 20:36:23 +0400 Subject: [PATCH 48/48] Update meal_recipes.yml --- .../Corvax/Recipes/Cooking/JapanFood/meal_recipes.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/Resources/Prototypes/Corvax/Recipes/Cooking/JapanFood/meal_recipes.yml b/Resources/Prototypes/Corvax/Recipes/Cooking/JapanFood/meal_recipes.yml index ee7103788ea..21ccac6415c 100644 --- a/Resources/Prototypes/Corvax/Recipes/Cooking/JapanFood/meal_recipes.yml +++ b/Resources/Prototypes/Corvax/Recipes/Cooking/JapanFood/meal_recipes.yml @@ -7,7 +7,7 @@ FoodMeatCutlet: 3 FoodBowlBig: 1 FoodGarlic: 1 - rawramennoodles: 1 + RawRamenNoodles: 1 reagents: Water: 15 Egg: 6 @@ -22,7 +22,7 @@ GreenTea: 5 JuiceWatermelon: 5 solids: - boileddoughdangoball: 3 + BoiledDoughDangoBall: 3 recipeType: Assembler # Frontier - type: microwaveMealRecipe @@ -34,7 +34,7 @@ Soysauce: 5 Sugar: 5 solids: - boileddoughdangoball: 3 + BoiledDoughDangoBall: 3 recipeType: Assembler # Frontier - type: microwaveMealRecipe @@ -59,7 +59,7 @@ FoodMeatCutlet: 3 FoodBowlBig: 1 FoodGarlic: 1 - rawramennoodles: 1 + RawRamenNoodles: 1 FoodChiliPepper: 1 reagents: Water: 15 @@ -73,7 +73,7 @@ result: BoiledDoughDangoBall time: 10 solids: - rawdoughdangoball: 1 + RawDoughDangoBall: 1 reagents: Water: 10 recipeType: Oven # Frontier