From 6b3ed03f7dd9bef6390a3b1b15c06d7e67fe048d Mon Sep 17 00:00:00 2001 From: saintmuntzer Date: Mon, 23 Sep 2024 20:21:23 -0500 Subject: [PATCH 1/3] bedroll rework --- Resources/Maps/N14/MercerIslandSurface.yml | 2 +- Resources/Maps/N14/SunnyvaleSurface.yml | 2 +- .../Entities/Structures/Furniture/beds.yml | 119 ++++++++++-------- .../Recipes/Construction/Graphs/furniture.yml | 11 +- .../Recipes/Construction/furniture.yml | 4 +- .../Recipes/Crafting/Graphs/items.yml | 46 +++---- .../_Nuclear14/Recipes/Crafting/items.yml | 26 ++-- .../bedsandchairs.rsi/bedroll_rolled.png | Bin 347 -> 317 bytes .../bedsandchairs.rsi/bedroll_unrolled.png | Bin 401 -> 397 bytes 9 files changed, 109 insertions(+), 101 deletions(-) diff --git a/Resources/Maps/N14/MercerIslandSurface.yml b/Resources/Maps/N14/MercerIslandSurface.yml index d7b4c8b4f4e..1d2a7256561 100644 --- a/Resources/Maps/N14/MercerIslandSurface.yml +++ b/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: diff --git a/Resources/Maps/N14/SunnyvaleSurface.yml b/Resources/Maps/N14/SunnyvaleSurface.yml index 4f14e4a089c..cee7d6b75f0 100644 --- a/Resources/Maps/N14/SunnyvaleSurface.yml +++ b/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: diff --git a/Resources/Prototypes/_Nuclear14/Entities/Structures/Furniture/beds.yml b/Resources/Prototypes/_Nuclear14/Entities/Structures/Furniture/beds.yml index 93b673bd326..6715d9ae5c8 100644 --- a/Resources/Prototypes/_Nuclear14/Entities/Structures/Furniture/beds.yml +++ b/Resources/Prototypes/_Nuclear14/Entities/Structures/Furniture/beds.yml @@ -35,64 +35,75 @@ # 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" + buckleOnInteractHand: False + - 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: Strap + enabled: False + - 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 +115,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 +125,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 +134,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 +143,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 +153,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 diff --git a/Resources/Prototypes/_Nuclear14/Recipes/Construction/Graphs/furniture.yml b/Resources/Prototypes/_Nuclear14/Recipes/Construction/Graphs/furniture.yml index 4dc3cd725e1..c6c4c0df580 100644 --- a/Resources/Prototypes/_Nuclear14/Recipes/Construction/Graphs/furniture.yml +++ b/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 diff --git a/Resources/Prototypes/_Nuclear14/Recipes/Construction/furniture.yml b/Resources/Prototypes/_Nuclear14/Recipes/Construction/furniture.yml index 97899d74818..2830706a484 100644 --- a/Resources/Prototypes/_Nuclear14/Recipes/Construction/furniture.yml +++ b/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 diff --git a/Resources/Prototypes/_Nuclear14/Recipes/Crafting/Graphs/items.yml b/Resources/Prototypes/_Nuclear14/Recipes/Crafting/Graphs/items.yml index c1846375b65..474d71acb10 100644 --- a/Resources/Prototypes/_Nuclear14/Recipes/Crafting/Graphs/items.yml +++ b/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 \ No newline at end of file +# - node: bedroll +# entity: N14BedrollFolded +# edges: +# - to: start +# steps: +# - tool: Cutting +# doAfter: 3 +# completed: +# - !type:SpawnPrototype +# prototype: MaterialCloth1 +# amount: 2 +# - !type:DeleteEntity \ No newline at end of file diff --git a/Resources/Prototypes/_Nuclear14/Recipes/Crafting/items.yml b/Resources/Prototypes/_Nuclear14/Recipes/Crafting/items.yml index f7721cc06f8..f4212fead60 100644 --- a/Resources/Prototypes/_Nuclear14/Recipes/Crafting/items.yml +++ b/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 \ No newline at end of file +#- 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 \ No newline at end of file diff --git a/Resources/Textures/_Nuclear14/Structures/Furniture/bedsandchairs.rsi/bedroll_rolled.png b/Resources/Textures/_Nuclear14/Structures/Furniture/bedsandchairs.rsi/bedroll_rolled.png index b2d46516006b4866fe63f89ca5468bf408c85e97..e2b58b9ac5959768b0736fcc0aaedded54502038 100644 GIT binary patch delta 291 zcmV+;0o?xE0=)u|BYyz|Nkl zT2a=Z8nM|PSZA{~DW#hAD(*Dg?N2wcy9h~8?R*)ds;ZCY4}UoV)WF3W4Qn)#G=FJ6 zk3;UUd;x0Uu8XpUHM&iMnrFw7Eihv5bZ}=*5=ol3&AIUd9ti-CFL#@}moGb(Uh#Vi zxDvEZ(!8zt#_uISGk=z#_^r{uO&|(`-izo;Py&nD1WKvqs{%mxt@lY#{61swzJ%}O p=%?f}2KKL*8yqRYeTIS{2v_0!mP7Y4wp{=K002ovPDHLkV1m#rh86$- delta 321 zcmdnXbem~{ay}AEbCso zRVgB}(_BEu#yRhy=$a$a9A)<$wrmt)$<{s?a_o{@(!WD3CxuuNo6gp7?0%#6Gyng) zoXP)mm<<>ZsDR<)mg!p;Pm_+w^%FVIc9gsR`x8%_D)eni RzZ?S)c)I$ztaD0e0sy&jf(8Hp diff --git a/Resources/Textures/_Nuclear14/Structures/Furniture/bedsandchairs.rsi/bedroll_unrolled.png b/Resources/Textures/_Nuclear14/Structures/Furniture/bedsandchairs.rsi/bedroll_unrolled.png index 2828cf96d0e7eaa870aa2762d833399ccecd8259..bd1f076e009a8f8c33e1046cb660b7f93fdc09ff 100644 GIT binary patch delta 371 zcmV-(0gV2U1C0ZaBYy!@Nkl=>yH`tU5jCy4$f_mG=H!9ad26Wb%hYZb^&n8 zSoW-=G_UBpR^tDSKGPO)L)t zy-dCOi~k2tdM|rRPWG?qh9;J~J+|}I`6TmxSHN@5HMMrqgwhLM)*cBip_YJ2@Yq7? zE)WH*f?fiwfNadQ3BAA`i6)kZYiLzsB`q0_qXbwQ9y3G%o2~uZGBPRN(-NFDoQGkY z(8N;f&%NT^D1M;CR&RlqsYgy8Adj5)(0um}6aWxH*bY0tfMr>VzlfW$!v}9HL%7u$ RlrI1P002ovPDHLkV1hB)s;vM3 delta 375 zcmV--0f_#M1CaxeBYyx1a7bBm000ie000ie0hKEb8vp`@8(Ex5r-0vaIwD zSt0=iVm#`%oa0vo^}1K}5fCYuYy*h(KGNND+> Date: Mon, 23 Sep 2024 20:53:00 -0500 Subject: [PATCH 2/3] fix non-existent field error --- .../Prototypes/_Nuclear14/Entities/Structures/Furniture/beds.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/Resources/Prototypes/_Nuclear14/Entities/Structures/Furniture/beds.yml b/Resources/Prototypes/_Nuclear14/Entities/Structures/Furniture/beds.yml index 6715d9ae5c8..236f6df55af 100644 --- a/Resources/Prototypes/_Nuclear14/Entities/Structures/Furniture/beds.yml +++ b/Resources/Prototypes/_Nuclear14/Entities/Structures/Furniture/beds.yml @@ -83,7 +83,6 @@ position: Down rotation: -90 buckleOffset: "0.05,-0.10" - buckleOnInteractHand: False - type: Construction graph: N14Bed node: bedroll From 47492559009adbaa4e00eb047ee188771898e3fa Mon Sep 17 00:00:00 2001 From: saintmuntzer Date: Mon, 23 Sep 2024 21:03:29 -0500 Subject: [PATCH 3/3] fix non-existent field error pt 2 --- .../_Nuclear14/Entities/Structures/Furniture/beds.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/Resources/Prototypes/_Nuclear14/Entities/Structures/Furniture/beds.yml b/Resources/Prototypes/_Nuclear14/Entities/Structures/Furniture/beds.yml index 236f6df55af..f7060f35dec 100644 --- a/Resources/Prototypes/_Nuclear14/Entities/Structures/Furniture/beds.yml +++ b/Resources/Prototypes/_Nuclear14/Entities/Structures/Furniture/beds.yml @@ -94,9 +94,6 @@ components: - type: Foldable folded: true - - type: Strap - enabled: False - - type: entity parent: N14Bed