From f658970f3ef0268dbae53701c83a70879e56f676 Mon Sep 17 00:00:00 2001
From: Alekshhh <44923899+Alekshhh@users.noreply.github.com>
Date: Wed, 20 Sep 2023 11:26:16 +0300
Subject: [PATCH] U-Shape Rails (#19485)

Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
---
 .../Entities/Structures/Walls/railing.yml     |  73 ++++++++++++++++++
 .../Graphs/structures/railing.yml             |  21 +++++
 .../Recipes/Construction/structures.yml       |  17 ++++
 .../Structures/Walls/railing.rsi/meta.json    |   4 +
 .../Structures/Walls/railing.rsi/round.png    | Bin 0 -> 4958 bytes
 Resources/mapping_actions.yml                 |  14 ++++
 6 files changed, 129 insertions(+)
 create mode 100644 Resources/Textures/Structures/Walls/railing.rsi/round.png

diff --git a/Resources/Prototypes/Entities/Structures/Walls/railing.yml b/Resources/Prototypes/Entities/Structures/Walls/railing.yml
index dbb3aaabcf..b083771ea9 100644
--- a/Resources/Prototypes/Entities/Structures/Walls/railing.yml
+++ b/Resources/Prototypes/Entities/Structures/Walls/railing.yml
@@ -180,3 +180,76 @@
   - type: Construction
     graph: Railing
     node: railingCornerSmall
+
+- type: entity
+  parent: BaseStructure
+  id: RailingRound
+  name: railing
+  description: Basic railing meant to protect idiots like you from falling.
+  components:
+  - type: Sprite
+    drawdepth: WallTops
+    sprite: Structures/Walls/railing.rsi
+    state: round
+  - type: Physics
+    bodyType: Static
+  - type: Fixtures
+    fixtures:
+      fix1:
+        shape:
+          !type:PhysShapeAabb
+          bounds: "-0.49,-0.49,0.49,-0.25"
+        density: 1000
+        mask:
+          - TableMask
+        layer:
+          - TableLayer
+      fix2:
+        shape:
+          !type:PhysShapeAabb
+          bounds: "-0.49,-0.49,-0.25,0.49"
+        density: 1000
+        mask:
+          - TableMask
+        layer:
+          - TableLayer
+      fix3:
+        shape:
+          !type:PhysShapeAabb
+          bounds: "0.25,-0.49,0.49,0.49"
+        density: 1000
+        mask:
+          - TableMask
+        layer:
+          - TableLayer
+  - type: InteractionOutline
+  - type: Repairable
+  - type: Damageable
+    damageContainer: Inorganic
+    damageModifierSet: FlimsyMetallic
+  - type: Destructible
+    thresholds:
+    - trigger:
+        !type:DamageTrigger
+        damage: 100
+      behaviors:
+        - !type:DoActsBehavior
+          acts: [ "Destruction" ]
+    - trigger:
+        !type:DamageTrigger
+        damage: 20
+      behaviors:
+      - !type:PlaySoundBehavior
+        sound:
+          path: /Audio/Effects/metalbreak.ogg
+      - !type:SpawnEntitiesBehavior
+        spawn:
+          PartRodMetal1:
+            min: 0
+            max: 2
+      - !type:DoActsBehavior
+        acts: [ "Destruction" ]
+  - type: Climbable
+  - type: Construction
+    graph: Railing
+    node: railingRound
diff --git a/Resources/Prototypes/Recipes/Construction/Graphs/structures/railing.yml b/Resources/Prototypes/Recipes/Construction/Graphs/structures/railing.yml
index 897685fd4a..f050c65c42 100644
--- a/Resources/Prototypes/Recipes/Construction/Graphs/structures/railing.yml
+++ b/Resources/Prototypes/Recipes/Construction/Graphs/structures/railing.yml
@@ -28,6 +28,14 @@
             - material: MetalRod
               amount: 1
               doAfter: 2
+        - to: railingRound
+          completed:
+            - !type:SnapToGrid
+              southRotation: true
+          steps:
+            - material: MetalRod
+              amount: 2
+              doAfter: 2
 
     - node: railing
       entity: Railing
@@ -67,3 +75,16 @@
           steps:
             - tool: Screwing
               doAfter: 0.25
+
+    - node: railingRound
+      entity: RailingRound
+      edges:
+        - to: start
+          completed:
+            - !type:SpawnPrototype
+              prototype: PartRodMetal1
+              amount: 2
+            - !type:DeleteEntity
+          steps:
+            - tool: Screwing
+              doAfter: 0.5
diff --git a/Resources/Prototypes/Recipes/Construction/structures.yml b/Resources/Prototypes/Recipes/Construction/structures.yml
index a5045d8134..3539cc2065 100644
--- a/Resources/Prototypes/Recipes/Construction/structures.yml
+++ b/Resources/Prototypes/Recipes/Construction/structures.yml
@@ -627,6 +627,23 @@
   conditions:
   - !type:TileNotBlocked
 
+- type: construction
+  name: railing round
+  id: RailingRound
+  graph: Railing
+  startNode: start
+  targetNode: railingRound
+  category: construction-category-structures
+  description: Basic railing meant to protect idiots like you from falling.
+  icon:
+    sprite: Structures/Walls/railing.rsi
+    state: round
+  objectType: Structure
+  placementMode: SnapgridCenter
+  canBuildInImpassable: false
+  conditions:
+  - !type:TileNotBlocked
+
 # Chain link fencing
 - type: construction
   name: chain link fence
diff --git a/Resources/Textures/Structures/Walls/railing.rsi/meta.json b/Resources/Textures/Structures/Walls/railing.rsi/meta.json
index 3d1553e971..0858e0a1b2 100644
--- a/Resources/Textures/Structures/Walls/railing.rsi/meta.json
+++ b/Resources/Textures/Structures/Walls/railing.rsi/meta.json
@@ -18,6 +18,10 @@
     {
         "name": "corner_small",
         "directions": 4
+    },
+    {
+        "name": "round",
+        "directions": 4
     }
   ]
 }
diff --git a/Resources/Textures/Structures/Walls/railing.rsi/round.png b/Resources/Textures/Structures/Walls/railing.rsi/round.png
new file mode 100644
index 0000000000000000000000000000000000000000..440ac177989763b460d0dd6ab4c3d46e394bd175
GIT binary patch
literal 4958
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
KbTDY~ivIwDRa=Gt

literal 0
HcmV?d00001

diff --git a/Resources/mapping_actions.yml b/Resources/mapping_actions.yml
index 9bd170ee35..918333adfb 100644
--- a/Resources/mapping_actions.yml
+++ b/Resources/mapping_actions.yml
@@ -688,6 +688,20 @@
   - 5: 8
   name: RailingCornerSmall
 - action: !type:InstantActionComponent
+    icon:
+      entity: RailingRound
+    name: RailingRound
+    keywords: []
+    clientExclusive: True
+    autoPopulate: False
+    temporary: True
+    event: !type:StartPlacementActionEvent
+      placementOption: SnapgridCenter
+      entityType: RailingRound
+  assignments:
+  - 5: 9
+- action: !type:InstantAction
+    checkCanInteract: False
     icon:
       entity: AirlockMaintLocked
     keywords: []
-- 
2.51.2