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..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,4 +1,6 @@ -ent-Doughdangoball = сырой шарик данго +ent-RawDoughDangoBall = сырой шарик данго .desc = Слепленный шарик из рисового теста. -ent-rawramennoodles = сухая лапша для рамэна +ent-BoiledDoughDangoBall = отваренный шарик данго + .desc = Отваренный шарик данго, готовый к приготовлению главного блюда. +ent-RawRamenNoodles = сухая лапша для рамэна .desc = Даже не думай есть её в таком виде. 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 = Вкус беззаботной молодости. 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 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..eb4c9cc49ff --- /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 + 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 26f87c249e8..00000000000 --- a/Resources/Prototypes/Corvax/Entities/Objects/Consumable/Food/japanfood/Ingredients/rawramennoodles.yml +++ /dev/null @@ -1,10 +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 \ No newline at end of file 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 87a7652f7b1..00000000000 --- a/Resources/Prototypes/Corvax/Entities/Objects/Consumable/Food/japanfood/chocopocky.yml +++ /dev/null @@ -1,30 +0,0 @@ -- type: entity - name: Chocolate Pocky - parent: FoodBakedBase - id: chocopocky - description: Don't forget to play the game with your date... - components: - - 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 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..d4c22575625 --- /dev/null +++ b/Resources/Prototypes/Corvax/Entities/Objects/Consumable/Food/japanfood/food.yml @@ -0,0 +1,201 @@ +- 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 + 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 + 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 + 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 + 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 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 f0121078605..00000000000 --- a/Resources/Prototypes/Corvax/Entities/Objects/Consumable/Food/japanfood/hanamidango.yml +++ /dev/null @@ -1,19 +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: Food - - type: Sprite - sprite: Corvax/Objects/Consumable/Food/japanfood.rsi - state: hanamidango - - type: SolutionContainerManager - solutions: - food: - maxVol: 20 - reagents: - - ReagentId: Nutriment - Quantity: 15 \ 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 deleted file mode 100644 index c57264538cb..00000000000 --- a/Resources/Prototypes/Corvax/Entities/Objects/Consumable/Food/japanfood/mitarasidango.yml +++ /dev/null @@ -1,19 +0,0 @@ -- type: entity - name: Mitarashi Dango - parent: FoodBakedBase - id: mitarashidango - description: Rice sweetness that beckons - components: - - type: Item - storedRotation: -90 - - type: Food - - type: Sprite - sprite: Corvax/Objects/Consumable/Food/japanfood.rsi - state: mitarashidango - - type: SolutionContainerManager - solutions: - food: - maxVol: 20 - reagents: - - ReagentId: Nutriment - Quantity: 15 \ No newline at end of file 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 c37070ca7fe..00000000000 --- a/Resources/Prototypes/Corvax/Entities/Objects/Consumable/Food/japanfood/onigiri.yml +++ /dev/null @@ -1,19 +0,0 @@ -- type: entity - name: Onigiri - parent: FoodBakedBase - id: onigiri - description: Best fried geometric shape in the galaxy - components: - - type: Item - storedRotation: -90 - - type: Food - - type: Sprite - sprite: Corvax/Objects/Consumable/Food/japanfood.rsi - state: onigiri - - type: SolutionContainerManager - solutions: - food: - maxVol: 25 - reagents: - - ReagentId: Nutriment - Quantity: 20 \ No newline at end of file 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: 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 a610145ea8a..00000000000 --- a/Resources/Prototypes/Corvax/Entities/Objects/Consumable/Food/japanfood/porkramennoodles.yml +++ /dev/null @@ -1,28 +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: Item - - type: Food - - type: Sprite - sprite: Corvax/Objects/Consumable/Food/japanfood.rsi - state: porkramen - - type: SolutionContainerManager - solutions: - food: - maxVol: 30 - reagents: - - ReagentId: Nutriment - Quantity: 10 - - ReagentId: Protein - Quantity: 3 - - ReagentId: Flavorol - Quantity: 5 - - ReagentId: Soysauce - Quantity: 2 - - type: Tag - tags: - - Meat - - Soup \ No newline at end of file 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 aaf76defda6..00000000000 --- a/Resources/Prototypes/Corvax/Entities/Objects/Consumable/Food/japanfood/spicyporkramen.yml +++ /dev/null @@ -1,30 +0,0 @@ -- type: entity - name: Spicy Ramen - parent: FoodBowlBase - id: spicyporkramennoodles - description: So hot and so cute! - components: - - type: Item - - type: Food - - type: Sprite - sprite: Corvax/Objects/Consumable/Food/japanfood.rsi - state: spicyporkramen - - type: SolutionContainerManager - solutions: - food: - maxVol: 30 - reagents: - - ReagentId: Nutriment - Quantity: 10 - - ReagentId: Protein - Quantity: 3 - - ReagentId: Flavorol - Quantity: 5 - - ReagentId: CapsaicinOil - Quantity: 2 - - ReagentId: Soysauce - Quantity: 2 - - type: Tag - tags: - - Meat - - Soup \ No newline at end of file diff --git a/Resources/Prototypes/Corvax/Recipes/Cooking/JapanFood/ingredients/food.yml b/Resources/Prototypes/Corvax/Recipes/Cooking/JapanFood/ingredients/food.yml index 66ec7faf70d..127013fcecc 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,16 +12,16 @@ amount: 5 effects: - !type:CreateEntityReactionEffect - entity: Doughdangoball + entity: RawDoughDangoBall - type: reaction - id: CreateRawRamen + id: createrawramen impact: Low quantized: true conserveEnergy: false reactants: Flour: - amount: 10 + amount: 5 TableSalt: amount: 5 OilOlive: @@ -32,4 +32,4 @@ amount: 5 effects: - !type:CreateEntityReactionEffect - entity: rawramennoodles \ No newline at end of file + entity: RawRamenNoodles diff --git a/Resources/Prototypes/Corvax/Recipes/Cooking/JapanFood/meal_recipes.yml b/Resources/Prototypes/Corvax/Recipes/Cooking/JapanFood/meal_recipes.yml index 7b413493641..21ccac6415c 100644 --- a/Resources/Prototypes/Corvax/Recipes/Cooking/JapanFood/meal_recipes.yml +++ b/Resources/Prototypes/Corvax/Recipes/Cooking/JapanFood/meal_recipes.yml @@ -1,13 +1,13 @@ - type: microwaveMealRecipe id: Recipeporkramen name: pork ramen recipe - result: porkramennoodles - time: 15 + result: PorkRamenNoodles + time: 30 solids: FoodMeatCutlet: 3 FoodBowlBig: 1 FoodGarlic: 1 - rawramennoodles: 1 + RawRamenNoodles: 1 reagents: Water: 15 Egg: 6 @@ -16,49 +16,50 @@ - type: microwaveMealRecipe id: Recipehanamidango name: dango hanami recipe - result: hanamidango - time: 10 + result: HanamiDango + time: 15 reagents: GreenTea: 5 JuiceWatermelon: 5 solids: - Doughdangoball: 3 - recipeType: Oven # Frontier + BoiledDoughDangoBall: 3 + recipeType: Assembler # Frontier - type: microwaveMealRecipe id: Recipemitarashidango name: dango mitarashi recipe - result: mitarashidango - time: 10 + result: MitarashiDango + time: 15 reagents: Soysauce: 5 Sugar: 5 solids: - Doughdangoball: 3 - recipeType: Oven # Frontier + BoiledDoughDangoBall: 3 + recipeType: Assembler # Frontier - type: microwaveMealRecipe id: Recipeonigiri name: onigiri recipe - result: onigiri - time: 20 + result: Onigiri + time: 15 reagents: Mayo: 5 - Rice: 10 + OilOlive: 5 solids: - FoodMeatChicken: 1 + FoodMeatChickenCutletCooked: 3 + FoodRiceBoiled: 1 recipeType: Oven # Frontier - type: microwaveMealRecipe id: Recipespicyramen name: spicy ramen recipe - result: spicyporkramennoodles - time: 20 + result: SpicyPorkRamenNoodles + time: 30 solids: FoodMeatCutlet: 3 FoodBowlBig: 1 FoodGarlic: 1 - rawramennoodles: 1 + RawRamenNoodles: 1 FoodChiliPepper: 1 reagents: Water: 15 @@ -66,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: 10 + recipeType: Oven # Frontier 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 00000000000..da652b5a215 Binary files /dev/null and b/Resources/Textures/Corvax/Objects/Consumable/Food/ingredients.rsi/boileddoughdangoball.png differ 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 61607a9a45f..00000000000 Binary files a/Resources/Textures/Corvax/Objects/Consumable/Food/ingredients.rsi/doughdangoball.png and /dev/null differ diff --git a/Resources/Textures/Corvax/Objects/Consumable/Food/ingredients.rsi/meta.json b/Resources/Textures/Corvax/Objects/Consumable/Food/ingredients.rsi/meta.json index 60dc9729881..2d99d5df7ac 100644 --- a/Resources/Textures/Corvax/Objects/Consumable/Food/ingredients.rsi/meta.json +++ b/Resources/Textures/Corvax/Objects/Consumable/Food/ingredients.rsi/meta.json @@ -8,10 +8,13 @@ }, "states": [ { - "name": "doughdangoball" + "name": "rawdoughdangoball" }, { "name": "rawramennoodles" + }, + { + "name": "boileddoughdangoball" } ] } diff --git a/Resources/Textures/Corvax/Objects/Consumable/Food/ingredients.rsi/rawdoughdangoball.png b/Resources/Textures/Corvax/Objects/Consumable/Food/ingredients.rsi/rawdoughdangoball.png new file mode 100644 index 00000000000..fab796f81a5 Binary files /dev/null and b/Resources/Textures/Corvax/Objects/Consumable/Food/ingredients.rsi/rawdoughdangoball.png differ