Merge pull request #368 from Chocosasel/japanfood

Финальный PR японской еды.

Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/objects/consumable/food/japanfood/ingredients/japaningredients.ftl

@@ -0,0 +1,4 @@
+ent-Doughdangoball = шарик данго
+    .desc = Выглядит как шарик из теста.
+ent-rawnoodles = сухая лапша для рамэна
+    .desc = Сухая лапша.

Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/objects/consumable/food/japanfood/japanfoods.ftl

@@ -0,0 +1,13 @@
+ent-hanamidango = трёхцветное данго
+    .desc = Похоже что тебе нравятся разные цвета, не так ли?
+ent-mitarashidango = митараши данго
+    .desc = Рисовая сладость, манящая за собой
+ent-onigiri = онигири
+    .desc = Лучший рис в галактике!
+ent-spicyporkramennoodles = острый рамэн
+    .desc = Выглядит так горячо... И так аппетитно!
+ent-porkramennoodles = свиной рамэн
+    .desc = Оу, да я вижу вы человек высокой культуры...
+ent-ChocolatePockyPack = коробочка шоколадных покки
+ent-chocopocky = шоколадная палочка покки
+    .desc = Не забудьте поиграть в игру со своим спутником...

Resources/Prototypes/Catalog/VendingMachines/Inventories/chang.yml

@@ -8,4 +8,5 @@
     FoodSnackChowMein: 3
     FoodSnackDanDanNoodles: 3
     PairedChopsticks: 3
+    ChocolatePockyPack: 3 #CorvaxFrontier
 # rice?

Resources/Prototypes/_NF/Entities/Objects/Consumable/Food/JapanFood/Ingredients/dangodough.yml

@@ -1,12 +1,12 @@
 - type: entity
-  name: шарик данго
+  name: Dough Dango Ball
   parent: FoodBakingBase
   id: Doughdangoball
-  description: Выглядит как шарик из теста.
+  description: A ball of dough.
   components:
   - type: FlavorProfile
     flavors:
       - dough
   - type: Sprite
     sprite: Corvax/Objects/Consumable/Food/ingredients.rsi
-    state: doughdangoball
+    state: doughdangoball

Resources/Prototypes/_NF/Entities/Objects/Consumable/Food/JapanFood/Ingredients/rawramennoodles.yml

@@ -1,10 +1,10 @@
 - type: entity
-  name: сухая лапша для рамэна
+  name: Raw Ramen Noodles
   parent: FoodBakingBase
   id: rawnoodles
-  description: Сухая лапша.
+  description: A raw ramen.
   components:
   - type: FlavorProfile
   - type: Sprite
     sprite: Corvax/Objects/Consumable/Food/ingredients.rsi
-    state: rawnoodles
+    state: rawnoodles

Resources/Prototypes/_NF/Entities/Objects/Consumable/Food/JapanFood/chocopocky.yml

@@ -0,0 +1,30 @@
+- 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

Resources/Prototypes/_NF/Entities/Objects/Consumable/Food/JapanFood/hanamidango.yml

@@ -1,8 +1,8 @@
 - type: entity
-  name: трёхцветное данго
+  name: Tricolor Dango
   parent: FoodBakedBase
   id: hanamidango
-  description: Похоже что тебе нравятся разные цвета, не так ли?
+  description: You like that colors, don't you?
   components:
   - type: Item
     storedRotation: -90
@@ -16,4 +16,4 @@
         maxVol: 20
         reagents:
           - ReagentId: Nutriment
-            Quantity: 15
+            Quantity: 15

Resources/Prototypes/_NF/Entities/Objects/Consumable/Food/JapanFood/mitarasidango.yml

@@ -1,8 +1,8 @@
 - type: entity
-  name: митараши данго
+  name: Mitarashi Dango
   parent: FoodBakedBase
   id: mitarashidango
-  description: Рисовая сладость, манящая за собой
+  description: Rice sweetness that beckons
   components:
   - type: Item
     storedRotation: -90
@@ -16,4 +16,4 @@
         maxVol: 20
         reagents:
           - ReagentId: Nutriment
-            Quantity: 15
+            Quantity: 15

Resources/Prototypes/_NF/Entities/Objects/Consumable/Food/JapanFood/onigiri.yml

@@ -1,8 +1,8 @@
 - type: entity
-  name: онигири
+  name: Onigiri
   parent: FoodBakedBase
   id: onigiri
-  description: Лучший рис в галактике!
+  description: Best fried geometric shape in the galaxy
   components:
   - type: Item
     storedRotation: -90
@@ -16,4 +16,4 @@
         maxVol: 25
         reagents:
           - ReagentId: Nutriment
-            Quantity: 20
+            Quantity: 20

Resources/Prototypes/_NF/Entities/Objects/Consumable/Food/JapanFood/pockypack/pockypacks.yml

@@ -0,0 +1,65 @@
+- type: entity
+  id: PockyPackBase
+  parent: [ BaseStorageItem, BaseBagOpenClose ]
+  name: Pocky Pack
+  abstract: true
+  components:
+  - type: Sprite
+    layers:
+    - state: closed
+    - state: open
+      map: ["openLayer"]
+      visible: false
+    - state: pok1
+      map: ["pok1"]
+      sprite: Corvax/Objects/Consumable/Food/pokvisualizer.rsi
+      visible: false
+    - state: pok2
+      map: ["pok2"]
+      sprite: Corvax/Objects/Consumable/Food/pokvisualizer.rsi
+      visible: false
+    - state: pok3
+      map: ["pok3"]
+      sprite: Corvax/Objects/Consumable/Food/pokvisualizer.rsi
+      visible: false
+  - type: Tag
+    tags:
+    - CigPack
+    - Trash
+  - type: PhysicalComposition
+    materialComposition:
+      Steel: 50
+  - type: SpaceGarbage
+  - type: Item
+    size: Tiny
+    shape: # Yes, this is cursed, but it breaks otherwise, dont question it.
+    - 0,0,0,1
+  - type: Storage
+    grid:
+    - 0,0,4,1
+  - type: StorageFill
+    contents:
+    - id: chocopocky
+      amount: 10
+  - type: ItemCounter
+    count:
+      tags: [Cigarette]
+    composite: true
+    layerStates:
+    - pok1
+    - pok2
+    - pok3
+  - type: Appearance
+  - type: StaticPrice
+    price: 150
+
+- type: entity
+  id: ChocolatePockyPack
+  parent: PockyPackBase
+  name: Chocolate Pocky Pack
+  description:
+  components:
+  - type: Sprite
+    sprite: Corvax/Objects/Consumable/Food/pockypacks.rsi
+  - type: Item
+    sprite: Corvax/Objects/Consumable/Food/pockypacks.rsi

Resources/Prototypes/_NF/Entities/Objects/Consumable/Food/JapanFood/porkramennoodles.yml

@@ -1,8 +1,8 @@
 - type: entity
-  name: свиной рамэн
+  name: Pork Ramen
   parent: FoodBowlBase
   id: porkramennoodles
-  description: Оу, да я вижу вы человек высокой культуры...
+  description: Ah, I See You're a Man of Culture As Well...
   components:
   - type: Item
   - type: Food
@@ -25,4 +25,4 @@
   - type: Tag
     tags:
     - Meat
-    - Soup
+    - Soup

Resources/Prototypes/_NF/Entities/Objects/Consumable/Food/JapanFood/spicyporkramen.yml

@@ -1,8 +1,8 @@
 - type: entity
-  name: острый рамэн
+  name: Spicy Ramen
   parent: FoodBowlBase
   id: spicyporkramennoodles
-  description: Выглядит так горячо... И так аппетитно!
+  description: So hot and so cute!
   components:
   - type: Item
   - type: Food
@@ -27,4 +27,4 @@
   - type: Tag
     tags:
     - Meat
-    - Soup
+    - Soup

Resources/Textures/Corvax/Objects/Consumable/Food/japanfood.rsi/meta.json

@@ -29,6 +29,9 @@
     },
 	{
 	  "name": "onigiri"
-	}
+	},
+    {
+	  "name": "chocopocky"
+    }
   ]
 }

Resources/Textures/Corvax/Objects/Consumable/Food/pockypacks.rsi/meta.json

@@ -0,0 +1,33 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Taken from cev-eris at commit https://github.com/discordia-space/CEV-Eris/commit/f18aa05685f13c8b424867e4219a1e727019c026",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "closed"
+    },
+    {
+      "name": "open"
+    },
+    {
+      "name": "inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "inhand-right",
+      "directions": 4
+    },
+    {
+      "name": "equipped-BELT",
+      "directions": 4
+    },
+	{
+	  "name": "unlit-equipped-MASK",
+      "directions": 4
+    }
+  ]
+}

Resources/Textures/Corvax/Objects/Consumable/Food/pokvisualizer.rsi/meta.json

@@ -0,0 +1,20 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Taken from cev-eris at commit https://github.com/discordia-space/CEV-Eris/commit/f18aa05685f13c8b424867e4219a1e727019c026",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "pok1"
+    },
+    {
+      "name": "pok2"
+    },
+    {
+      "name": "pok3"
+    }
+  ]
+}