Gas Station Sushi (new-frontiers-14#2101)

* Sushi+

* Update sushi.yml

* Update sushi.yml

* Griff edit

* Update box.yml

* Update box.yml

* Update food.yml

* sushi with lid

* Print

* fiddle with the tray sprites

* sushi fills

* reduce space in gas station soosh

* tray inhand sprites, remove tiles.yml (my mistake)

* box open noises, inhand sprite fix

* fix scale

* Craftable sushi tray is full of good looking sushi

---------

Co-authored-by: Whatstone <[email protected]>
Co-authored-by: Whatstone <[email protected]>

Resources/Locale/en-US/_NF/lathe/recipes.ftl

@@ -21,4 +21,7 @@ lathe-recipe-NFFoodBoxPizza-name  = pizza box (empty)
 lathe-recipe-NFFoodBoxDonutEmpty-name  = donut box (empty)
 lathe-recipe-NFFoodBoxNuggetEmpty-name = chicken nuggets (empty)
 lathe-recipe-NFFoodContainerEggEmpty-name  = egg carton (empty)
-lathe-recipe-NFBoxMREEmpty-name = M.R.E. (empty)
+lathe-recipe-NFBoxMREEmpty-name = M.R.E. (empty)
+
+# Plastic
+lathe-recipe-NFFoodBoxSushi-name = sushi tray (empty)

Resources/Prototypes/_NF/Catalog/Fills/Lockers/food.yml

@@ -0,0 +1,9 @@
+- type: entity
+  id: LockerFreezerSushi
+  parent: LockerFreezerBase
+  suffix: Filled, Sushi
+  components:
+  - type: StorageFill
+    contents:
+    - id: FoodBoxSushiBad
+      amount: 2

Resources/Prototypes/_NF/Entities/Objects/Consumable/Food/Containers/box.yml

@@ -214,6 +214,132 @@
 #    - id: FoodCondimentPacketPepper
     - id: FoodCondimentPacketSalt
 
+- type: entity
+  parent: [BaseStorageItem, BaseBagOpenClose]
+  id: FoodBoxSushi
+  name: sushi tray
+  description: Plastic sushi container with lid.
+  components:
+  - type: Sprite
+    sprite: _NF/Objects/Consumable/Food/sushi.rsi
+    scale: 0.8, 0.8
+    state: tray
+    layers:
+    - state: tray
+    - state: goodtray6
+      map: ["tray6"]
+      visible: false
+    - state: goodtray5
+      map: ["tray5"]
+      visible: false
+    - state: goodtray4
+      map: ["tray4"]
+      visible: false
+    - state: goodtray3
+      map: ["tray3"]
+      visible: false
+    - state: goodtray2
+      map: ["tray2"]
+      visible: false
+    - state: goodtray1
+      map: ["tray1"]
+      visible: false
+    - state: label
+      map: ["closeLayer"]
+      visible: false
+  - type: Item
+    sprite: _NF/Objects/Consumable/Food/sushi.rsi
+    size: Normal
+    inhandVisuals:
+      left:
+      - state: tray-inhand-left
+      right:
+      - state: tray-inhand-right
+  - type: Storage
+    grid:
+    - 0,0,1,2
+    whitelist:
+      tags:
+        - Sushi
+    storageOpenSound: /Audio/Effects/packetrip.ogg
+    hideStackVisualsWhenClosed: false
+  - type: ItemCounter
+    count:
+      tags: [Sushi]
+    composite: true
+    layerStates:
+    - tray1
+    - tray2
+    - tray3
+    - tray4
+    - tray5
+    - tray6
+
+- type: entity
+  parent: FoodBoxSushi
+  id: FoodBoxSushiBad
+  suffix: Bad
+  components:
+  - type: Sprite
+    sprite: _NF/Objects/Consumable/Food/sushi.rsi
+    scale: 0.8, 0.8
+    state: tray
+    layers:
+    - state: tray
+    - state: tray6
+      map: ["tray6"]
+      visible: false
+    - state: tray5
+      map: ["tray5"]
+      visible: false
+    - state: tray4
+      map: ["tray4"]
+      visible: false
+    - state: tray3
+      map: ["tray3"]
+      visible: false
+    - state: tray2
+      map: ["tray2"]
+      visible: false
+    - state: tray1
+      map: ["tray1"]
+      visible: false
+    - state: label
+      map: ["closeLayer"]
+      visible: false
+  - type: StorageFill
+    contents:
+    # Slice1
+    - id: FoodMealGasSafeSushiSlice
+      orGroup: Slice1
+    - id: FoodMealGasBadSushiSlice
+      orGroup: Slice1
+    # Slice2
+    - id: FoodMealGasSafeSushiSlice
+      orGroup: Slice2
+    - id: FoodMealGasBadSushiSlice
+      orGroup: Slice2
+    # Slice3
+    - id: FoodMealGasSafeSushiSlice
+      orGroup: Slice3
+    - id: FoodMealGasBadSushiSlice
+      orGroup: Slice3
+    # Slice4
+    - id: FoodMealGasSafeSushiSlice
+      orGroup: Slice4
+    - id: FoodMealGasBadSushiSlice
+      orGroup: Slice4
+    # Slice5
+    - id: FoodMealGasSafeSushiSlice
+      orGroup: Slice5
+    - id: FoodMealGasBadSushiSlice
+      orGroup: Slice5
+    # Slice6
+    - id: FoodMealGasSafeSushiSlice
+      orGroup: Slice6
+    - id: FoodMealGasBadSushiSlice
+      orGroup: Slice6
+
 # Empty
 - type: entity
   id: BoxMREEmpty

Resources/Prototypes/_NF/Entities/Objects/Consumable/Food/sushi.yml

@@ -1,6 +1,16 @@
+- type: entity
+  id: FoodBaseSushi
+  abstract: true
+  components:
+  - type: Sprite
+    sprite: _NF/Objects/Consumable/Food/sushi.rsi
+  - type: Tag
+    tags:
+      - Sushi
+
 - type: entity
   name: avocado sushi
-  parent: FoodMealBase
+  parent: [FoodBaseSushi, FoodMealBase]
   id: FoodMealAvocadoSushi
   description: Where did the seaweed come from?
   components:
@@ -9,26 +19,23 @@
       - cucumber
       - avocado
   - type: Sprite
-    sprite: _NF/Objects/Consumable/Food/sushi.rsi
     state: avocadosushi
   - type: SolutionContainerManager
     solutions:
       food:
-        maxVol: 40
+        maxVol: 42
         reagents:
         - ReagentId: Nutriment
-          Quantity: 20
-        - ReagentId: Flavorol
-          Quantity: 10
+          Quantity: 30
         - ReagentId: CucumberWater
-          Quantity: 2
+          Quantity: 3
   - type: SliceableFood
-    count: 5
+    count: 6
     slice: FoodMealAvocadoSushiSlice
 
 - type: entity
   name: avocado sushi
-  parent: FoodInjectableBase
+  parent: [FoodBaseSushi, FoodInjectableBase]
   id: FoodMealAvocadoSushiSlice
   description: Where did the seaweed come from?
   components:
@@ -37,23 +44,22 @@
       - cucumber
       - avocado
   - type: Sprite
-    sprite: _NF/Objects/Consumable/Food/sushi.rsi
     state: avocadosushislice
   - type: SolutionContainerManager
     solutions:
       food:
-        maxVol: 8
+        maxVol: 7
         reagents:
         - ReagentId: Nutriment
-          Quantity: 4
-        - ReagentId: Flavorol
-          Quantity: 2
+          Quantity: 5
         - ReagentId: CucumberWater
-          Quantity: .4
+          Quantity: .5
+  - type: Item
+    size: Tiny
 
 - type: entity
   name: carp sushi
-  parent: FoodMealBase
+  parent: [FoodBaseSushi, FoodMealBase]
   id: FoodMealCarpSushi
   description: Certainly worth the risk.
   components:
@@ -62,28 +68,25 @@
       - cucumber
       - fishy
   - type: Sprite
-    sprite: _NF/Objects/Consumable/Food/sushi.rsi
     state: carpsushi
   - type: SolutionContainerManager
     solutions:
       food:
-        maxVol: 45
+        maxVol: 48
         reagents:
         - ReagentId: Nutriment
-          Quantity: 20
-        - ReagentId: Flavorol
-          Quantity: 10
+          Quantity: 30
         - ReagentId: CarpoToxin
-          Quantity: 5
+          Quantity: 6
         - ReagentId: CucumberWater
-          Quantity: 2
+          Quantity: 3
   - type: SliceableFood
-    count: 5
+    count: 6
     slice: FoodMealCarpSushiSlice
 
 - type: entity
   name: carp sushi
-  parent: FoodInjectableBase
+  parent: [FoodBaseSushi, FoodInjectableBase]
   id: FoodMealCarpSushiSlice
   description: Certainly worth the smaller risk.
   components:
@@ -92,18 +95,54 @@
       - cucumber
       - fishy
   - type: Sprite
-    sprite: _NF/Objects/Consumable/Food/sushi.rsi
     state: carpsushislice
   - type: SolutionContainerManager
     solutions:
       food:
-        maxVol: 9
+        maxVol: 8
         reagents:
         - ReagentId: Nutriment
-          Quantity: 4
-        - ReagentId: Flavorol
-          Quantity: 2
+          Quantity: 5
         - ReagentId: CarpoToxin
           Quantity: 1
         - ReagentId: CucumberWater
-          Quantity: .4
+          Quantity: .5
+  - type: Item
+    size: Tiny
+
+- type: entity
+  name: gas station sushi
+  parent: [FoodBaseSushi, FoodInjectableBase]
+  id: FoodMealGasSafeSushiSlice
+  suffix: Safe
+  description: Is it worth the risk?
+  components:
+  - type: FlavorProfile
+    flavors:
+      - fishy
+      - cheap
+      - bitter
+  - type: Sprite
+    state: gassushislice
+  - type: SolutionContainerManager
+    solutions:
+      food:
+        maxVol: 5
+        reagents:
+        - ReagentId: Nutriment
+          Quantity: 5
+  - type: Item
+    size: Tiny
+
+- type: entity
+  parent: [FoodBaseSushi, FoodMealGasSafeSushiSlice]
+  id: FoodMealGasBadSushiSlice
+  suffix: Bad
+  components:
+  - type: SolutionContainerManager
+    solutions:
+      food:
+        maxVol: 5
+        reagents:
+        - ReagentId: GastroToxin
+          Quantity: 5

Resources/Prototypes/_NF/Entities/Structures/Machines/lathe.yml

@@ -165,6 +165,7 @@
       - NFFoodBoxDonutEmpty
       - NFFoodBoxNuggetEmpty
       - NFFoodContainerEggEmpty
+      - NFFoodBoxSushi
     ## Basic parts
       - CableStack
       - LightTube

Resources/Prototypes/_NF/Recipes/Lathes/storage.yml

@@ -179,4 +179,14 @@
   completetime: 1
   applyMaterialDiscount: false
   materials:
-    Cardboard: 100
+    Cardboard: 100
+
+- type: latheRecipe
+  id: NFFoodBoxSushi
+  result: FoodBoxSushi
+  name: lathe-recipe-NFFoodBoxSushi-name
+  category: StorageNF
+  completetime: 1
+  applyMaterialDiscount: false
+  materials:
+    Plastic: 100

Resources/Prototypes/_NF/tags.yml

@@ -95,4 +95,7 @@
   id: SmallThrusterMachineCircuitboard
 
 - type: Tag
-  id: BrassKnucklesNF
+  id: BrassKnucklesNF
+
+- type: Tag
+  id: Sushi