bedroll rework

Resources/Maps/N14/MercerIslandSurface.yml

@@ -44397,7 +44397,7 @@ entities:
     - type: Transform
       pos: 24.5,100.5
       parent: 2
-- proto: N14BedrollItem
+- proto: N14BedrollFolded
   entities:
   - uid: 1251
     components:

Resources/Maps/N14/SunnyvaleSurface.yml

@@ -407379,7 +407379,7 @@ entities:
     - type: Transform
       pos: 200.5,55.5
       parent: 1
-- proto: N14BedrollItem
+- proto: N14BedrollFolded
   entities:
   - uid: 12893
     components:

Resources/Prototypes/_Nuclear14/Entities/Structures/Furniture/beds.yml

@@ -35,64 +35,71 @@
 
 # TODO: Reduce the healing rate of all these at some point compared to a proper bed.   
 - type: entity
-  parent: N14Bed
   id: N14Bedroll
-  name: Bedroll
-  description: A bed roll good for caravaning with. Not very comfy.
+  parent: RollerBed
+  name: bedroll
+  description: A bedroll for sleeping on the road. Not very comfy.
   components:
-  - type: Sprite
-    state: bedroll_unrolled
-  - type: Construction
-    graph: N14Bed
-    node: bedroll
-  - type: Destructible
-    thresholds:
-    - trigger:
-        !type:DamageTrigger
-        damage: 10
-      behaviors:
-      - !type:DoActsBehavior
-        acts: ["Destruction"]
-      - !type:SpawnEntitiesBehavior
-        spawn:
-          N14BedrollItem:
-            min: 1
-            max: 1
-    - trigger:
-        !type:DamageTrigger
-        damage: 50
-      behaviors:
-      - !type:DoActsBehavior
-        acts: ["Destruction"]
-      - !type:SpawnEntitiesBehavior
-        spawn:
-          MaterialCloth1:
-            min: 0
-            max: 2
-
+    - type: HealOnBuckle
+      damage:
+        types:
+          Poison: -0.05
+          Blunt: -0.05
+    - type: Sprite
+      sprite: _Nuclear14/Structures/Furniture/bedsandchairs.rsi
+      noRot: true
+      layers:
+      - state: bedroll_unrolled
+        map: ["unfoldedLayer"]
+      - state: bedroll_rolled
+        map: ["foldedLayer"]
+      - state: bedroll_unrolled
+        map: ["buckledLayer"]
+        visible: false
+    - type: Appearance
+    - type: Fixtures
+      fixtures:
+        fix1:
+          shape:
+            !type:PhysShapeCircle
+            radius: 0.2
+          density: 100
+          mask:
+          - TableMask
+    - type: Destructible
+      thresholds:
+        - trigger:
+            !type:DamageTrigger
+            damage: 50
+          behaviors:
+            - !type:DoActsBehavior
+              acts: ["Destruction"]
+            - !type:SpawnEntitiesBehavior
+              spawn:
+                MaterialCloth1:
+                  min: 0
+                  max: 2
+    - type: Strap
+      position: Down
+      rotation: -90
+      buckleOffset: "0.05,-0.10"
+    - type: Construction
+      graph: N14Bed
+      node: bedroll
+
 - type: entity
-  parent: BaseItem
-  id: N14BedrollItem
-  name: Bedroll
-  description: A rolled up bed for travelling light. Lay it down somewhere to rest.
+  parent: N14Bedroll
+  id: N14BedrollFolded
+  suffix: rolled
   components:
-  - type: Sprite
-    sprite: _Nuclear14/Structures/Furniture/bedsandchairs.rsi
-    state: bedroll_rolled
-  - type: Construction
-    graph: N14BedrollItem
-    node: bedroll
-  - type: Tag
-    tags:
-    - Bedroll
-  - type: Item
-    size: Huge
+  - type: Foldable
+    folded: true
 
 - type: entity
   parent: N14Bed
   id: N14BedMattress0
   name: Mattress
-  description: A matress on the floor. Better than nothing.
+  description: A mattress on the floor. Better than nothing.
   components:
   - type: Sprite
     state: mattress0
@@ -104,7 +111,7 @@
   parent: N14Bed
   id: N14BedMattressDirty1
   name: Mattress
-  description: A matress on the floor. A little rough.
+  description: A mattress on the floor. A little rough.
   components:
   - type: Sprite
     state: mattress1
@@ -114,7 +121,7 @@
   parent: N14BedMattressDirty1
   id: N14BedMattressDirty2
   name: Mattress
-  description: A matress on the floor. Filthy.
+  description: A mattress on the floor. Filthy.
   components:
   - type: Sprite
     state: mattress2
@@ -123,7 +130,7 @@
   parent: N14BedMattressDirty1
   id: N14BedMattressDirty3
   name: Mattress
-  description: A matress on the floor. Is that blood?
+  description: A mattress on the floor. Is that blood?
   components:
   - type: Sprite
     state: mattress3
@@ -132,7 +139,7 @@
   parent: N14BedMattressDirty1
   id: N14BedMattressDirty4
   name: Mattress
-  description: A matress on the floor. That's definitely blood.
+  description: A mattress on the floor. That's definitely blood.
   components:
   - type: Sprite
     state: mattress4
@@ -142,7 +149,7 @@
   id: N14BedMattressDirty5
   suffix: mouldy
   name: Mattress
-  description: A matress on the floor. I'm not sleeping on that.
+  description: A mattress on the floor. I'm not sleeping on that.
   components:
   - type: Sprite
     state: mattress5

Resources/Prototypes/_Nuclear14/Recipes/Construction/Graphs/furniture.yml

@@ -30,12 +30,9 @@
           completed:
             - !type:SnapToGrid { }
           steps:
-            - tag: Bedroll
-              name: a bedroll
-              icon:
-                sprite: _Nuclear14/Structures/Furniture/bedsandchairs.rsi
-                state: bedroll_rolled
-              doAfter: 1
+            - material: Cloth
+              amount: 3
+              doAfter: 2
         - to: mattress
           completed:
             - !type:SnapToGrid { }
@@ -104,7 +101,7 @@
               prototype: MaterialCloth1
               amount: 3
           steps:
-            - tool: Cutting
+            - tool: Slicing
               doAfter: 1
     - node: mattress
       entity: N14BedMattress0

Resources/Prototypes/_Nuclear14/Recipes/Construction/furniture.yml

@@ -55,8 +55,8 @@
 
 - type: construction
   id: N14Bedroll
-  name: bed roll
-  description: A basic cloth bedroll for sleeping in while travelling. Make one using the rolled up crafting recipe.
+  name: bedroll
+  description: A bedroll for sleeping on the road. Not very comfy.
   graph: N14Bed
   startNode: start
   targetNode: bedroll

Resources/Prototypes/_Nuclear14/Recipes/Crafting/Graphs/items.yml

@@ -1,24 +1,24 @@
-- type: constructionGraph
-  id: N14BedrollItem
-  start: start
-  graph:
-    - node: start
-      edges:
-        - to: bedroll
-          steps:
-            - material: Cloth 
-              amount: 3
-              doAfter: 3
+# - type: constructionGraph
+#   id: N14BedrollFolded
+#   start: start
+#   graph:
+#     - node: start
+#       edges:
+#         - to: bedroll
+#           steps:
+#             - material: Cloth 
+#               amount: 3
+#               doAfter: 3
 
-    - node: bedroll
-      entity: N14BedrollItem
-      edges:
-        - to: start
-          steps:
-            - tool: Cutting
-              doAfter: 3
-          completed:
-            - !type:SpawnPrototype
-              prototype: MaterialCloth1
-              amount: 2
-            - !type:DeleteEntity
+#     - node: bedroll
+#       entity: N14BedrollFolded
+#       edges:
+#         - to: start
+#           steps:
+#             - tool: Cutting
+#               doAfter: 3
+#           completed:
+#             - !type:SpawnPrototype
+#               prototype: MaterialCloth1
+#               amount: 2
+#             - !type:DeleteEntity

Resources/Prototypes/_Nuclear14/Recipes/Crafting/items.yml

@@ -1,14 +1,14 @@
 # Bedroll
-- type: construction
-  name: bedroll
-  id: N14BedrollItem
-  graph: N14BedrollItem
-  startNode: start
-  targetNode: bedroll
-  category: construction-category-furniture
-  description: A bedroll for sleeping in. Place it with construction.
-  hide: false
-  icon:
-    sprite: _Nuclear14/Structures/Furniture/bedsandchairs.rsi
-    state: bedroll_rolled
-  objectType: Item
+#- type: construction
+#  name: bedroll
+#  id: N14BedrollFolded
+#  graph: N14BedrollFolded
+#  startNode: start
+#  targetNode: bedroll
+#  category: construction-category-furniture
+#  description: A bedroll for sleeping in. Place it with construction.
+#  hide: false
+#  icon:
+#    sprite: _Nuclear14/Structures/Furniture/bedsandchairs.rsi
+#    state: bedroll_rolled
+#  objectType: Item