Moves Sliceable to ECS (#5552)

2021-11-30 13:20:13 +03:00
parent c1cc9ff676
commit 9db2fbefe1
7 changed files with 162 additions and 102 deletions
--- a/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/bread.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/bread.yml
@@ -28,7 +28,7 @@
        maxVol: 8
        reagents:
        - ReagentId: Nutriment
-          Quantity: 7
+          Quantity: 4

 # Custom Bread Example

--- a/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/cake.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/cake.yml
@@ -32,7 +32,7 @@
        maxVol: 8
        reagents:
        - ReagentId: Nutriment
-          Quantity: 7
+          Quantity: 4

 # Custom Cake Example

@@ -279,10 +279,10 @@
  - type: SolutionContainerManager
    solutions:
      food:
-        maxVol: 10 # There is something weird about SliceBase: SliceableFoodComp has 5 default slices, which leads to total volume of 40, but CakeBase has only 26 total volume
+        maxVol: 8
        reagents:
        - ReagentId: Nutriment
-          Quantity: 7 # TODO: Recalculate volumes and nutrition for sliceable food
+          Quantity: 4
        - ReagentId: Theobromine
          Quantity: 1
 # Tastes like sweetness, cake, chocolate.
--- a/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/pie.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/pie.yml
@@ -13,10 +13,10 @@
  - type: SolutionContainerManager
    solutions:
      food:
-        maxVol: 20
+        maxVol: 24
        reagents:
        - ReagentId: Nutriment
-          Quantity: 15
+          Quantity: 20
  - type: SliceableFood
    count: 4
  - type: Tag
@@ -24,13 +24,16 @@
    - NoSpinOnThrow

 - type: entity
-  parent: FoodPieBase
+  parent: FoodInjectableBase # Not sliceable
  id: FoodPieSliceBase
  abstract: true
  description: A slice of pie. Tasty!
  components:
  - type: Food
    trash: FoodPlateSmall
+  - type: Sprite
+    sprite: Objects/Consumable/Food/Baked/pie.rsi
+    netsync: false
  - type: SolutionContainerManager
    solutions:
      food:
@@ -38,6 +41,9 @@
        reagents:
        - ReagentId: Nutriment
          Quantity: 5
+  - type: Tag
+    tags:
+    - NoSpinOnThrow

 # Pie

--- a/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/pizza.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/pizza.yml
@@ -13,12 +13,12 @@
  - type: SolutionContainerManager
    solutions:
      food:
-        maxVol: 20
+        maxVol: 36
        reagents:
        - ReagentId: Nutriment
-          Quantity: 15
+          Quantity: 30
  - type: SliceableFood
-    count: 8
+    count: 6
  - type: Item
    size: 8
  - type: Tag
@@ -26,12 +26,15 @@
    - Pizza

 - type: entity
-  parent: FoodPizzaBase
+  parent: FoodInjectableBase # Not sliceable
  id: FoodPizzaSliceBase
  abstract: true
  components:
  - type: Food
    trash: FoodPlateSmall
+  - type: Sprite
+    sprite: Objects/Consumable/Food/Baked/pizza.rsi
+    netsync: false
  - type: SolutionContainerManager
    solutions:
      food:
--- a/Resources/Prototypes/Entities/Objects/Consumable/Food/ingredients.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/ingredients.yml
@@ -314,7 +314,7 @@
  - type: SolutionContainerManager
    solutions:
      food:
-        maxVol: 15
+        maxVol: 18
        reagents:
        - ReagentId: Nutriment
          Quantity: 15
@@ -433,6 +433,13 @@
  components:
  - type: Sprite
    state: cheesewedge
+  - type: SolutionContainerManager
+    solutions:
+      food:
+        maxVol: 6
+        reagents:
+        - ReagentId: Nutriment
+          Quantity: 5

 - type: entity
  name: burned mess