Table fences (#626)

* collision fucks

* map update

Resources/Maps/_CP14/comoss.yml

@@ -54242,12 +54242,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: -13.5832405,20.604366
       parent: 2
-  - uid: 1375
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -16.992306,-28.07278
-      parent: 2
   - uid: 1444
     components:
     - type: Transform
@@ -54378,6 +54372,12 @@ entities:
       rot: -1.5707963267948966 rad
       pos: -7.5784397,-3.351576
       parent: 2
+  - uid: 12883
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -16.322584,-28.195072
+      parent: 2
 - proto: CP14Cloth10
   entities:
   - uid: 4078
@@ -55039,14 +55039,6 @@ entities:
     - type: Transform
       pos: -16.05365,-10.44961
       parent: 2
-- proto: CP14FenceIronGrilleCorner
-  entities:
-  - uid: 1807
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 2.5,-13.5
-      parent: 2
 - proto: CP14FenceIronGrilleGate
   entities:
   - uid: 1334
@@ -55279,6 +55271,95 @@ entities:
       rot: 3.141592653589793 rad
       pos: 6.5,-13.5
       parent: 2
+- proto: CP14FenceIronGrilleWindowStraight
+  entities:
+  - uid: 1425
+    components:
+    - type: Transform
+      pos: -8.5,16.5
+      parent: 2
+  - uid: 2076
+    components:
+    - type: Transform
+      pos: -17.5,-4.5
+      parent: 2
+  - uid: 2116
+    components:
+    - type: Transform
+      pos: -16.5,-4.5
+      parent: 2
+  - uid: 2391
+    components:
+    - type: Transform
+      pos: -6.5,-16.5
+      parent: 2
+  - uid: 2392
+    components:
+    - type: Transform
+      pos: -7.5,-16.5
+      parent: 2
+  - uid: 12873
+    components:
+    - type: Transform
+      pos: -8.5,-16.5
+      parent: 2
+  - uid: 12874
+    components:
+    - type: Transform
+      pos: -9.5,-16.5
+      parent: 2
+  - uid: 12875
+    components:
+    - type: Transform
+      pos: -4.5,-32.5
+      parent: 2
+  - uid: 12876
+    components:
+    - type: Transform
+      pos: -3.5,-32.5
+      parent: 2
+  - uid: 12877
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 15.5,5.5
+      parent: 2
+  - uid: 12878
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 15.5,4.5
+      parent: 2
+  - uid: 12885
+    components:
+    - type: Transform
+      pos: -7.5,16.5
+      parent: 2
+  - uid: 12886
+    components:
+    - type: Transform
+      pos: -6.5,16.5
+      parent: 2
+  - uid: 12887
+    components:
+    - type: Transform
+      pos: -14.5,16.5
+      parent: 2
+  - uid: 12888
+    components:
+    - type: Transform
+      pos: -15.5,16.5
+      parent: 2
+  - uid: 12889
+    components:
+    - type: Transform
+      pos: -17.5,16.5
+      parent: 2
+  - uid: 12890
+    components:
+    - type: Transform
+      pos: -18.5,16.5
+      parent: 2
 - proto: CP14FenceWoodGate
   entities:
   - uid: 934
@@ -58507,6 +58588,24 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 21.5,18.5
       parent: 2
+  - uid: 12880
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -17.5,-27.5
+      parent: 2
+  - uid: 12881
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -16.5,-27.5
+      parent: 2
+  - uid: 12882
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -17.5,-28.5
+      parent: 2
 - proto: CP14TableWoodenCounter
   entities:
   - uid: 547
@@ -59649,6 +59748,13 @@ entities:
       parent: 2
     - type: Fixtures
       fixtures: {}
+  - uid: 1807
+    components:
+    - type: Transform
+      pos: 12.5,5.5
+      parent: 2
+    - type: Fixtures
+      fixtures: {}
   - uid: 1962
     components:
     - type: Transform
@@ -59657,13 +59763,6 @@ entities:
       parent: 2
     - type: Fixtures
       fixtures: {}
-  - uid: 2076
-    components:
-    - type: Transform
-      pos: 15.5,5.5
-      parent: 2
-    - type: Fixtures
-      fixtures: {}
   - uid: 2147
     components:
     - type: Transform
@@ -60052,14 +60151,6 @@ entities:
       parent: 2
     - type: Fixtures
       fixtures: {}
-  - uid: 1235
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -6.5,16.5
-      parent: 2
-    - type: Fixtures
-      fixtures: {}
   - uid: 1239
     components:
     - type: Transform
@@ -60149,7 +60240,7 @@ entities:
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
-      pos: -4.5,-30.5
+      pos: 12.5,3.5
       parent: 2
     - type: Fixtures
       fixtures: {}
@@ -60164,15 +60255,7 @@ entities:
   - uid: 1361
     components:
     - type: Transform
-      pos: -15.5,-27.5
-      parent: 2
-    - type: Fixtures
-      fixtures: {}
-  - uid: 1425
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -8.5,16.5
+      pos: -9.5,15.5
       parent: 2
     - type: Fixtures
       fixtures: {}
@@ -60191,13 +60274,6 @@ entities:
       parent: 2
     - type: Fixtures
       fixtures: {}
-  - uid: 2116
-    components:
-    - type: Transform
-      pos: 12.5,5.5
-      parent: 2
-    - type: Fixtures
-      fixtures: {}
   - uid: 2267
     components:
     - type: Transform
@@ -60264,6 +60340,29 @@ entities:
       parent: 2
     - type: Fixtures
       fixtures: {}
+  - uid: 12879
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -4.5,-34.5
+      parent: 2
+    - type: Fixtures
+      fixtures: {}
+  - uid: 12884
+    components:
+    - type: Transform
+      pos: -16.5,-27.5
+      parent: 2
+    - type: Fixtures
+      fixtures: {}
+  - uid: 12891
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -9.5,17.5
+      parent: 2
+    - type: Fixtures
+      fixtures: {}
 - proto: CP14WallmountOrdersBorder
   entities:
   - uid: 1447
@@ -76117,6 +76216,11 @@ entities:
     - type: Transform
       pos: 5.5,14.5
       parent: 2
+  - uid: 1375
+    components:
+    - type: Transform
+      pos: -17.5,-32.5
+      parent: 2
   - uid: 1767
     components:
     - type: Transform
@@ -76191,6 +76295,11 @@ entities:
       parent: 2
 - proto: CP14WoodenCabinet
   entities:
+  - uid: 1235
+    components:
+    - type: Transform
+      pos: -14.5,-27.5
+      parent: 2
   - uid: 1363
     components:
     - type: Transform

Resources/Prototypes/Entities/Objects/base_item.yml

@@ -34,7 +34,8 @@
           bounds: "-0.25,-0.25,0.25,0.25"
         density: 20
         mask:
-        - ItemMask
+        #- ItemMask # CP14 swap ItemMask to Impassable only
+        - Impassable
         restitution: 0.3  # fite me
         friction: 0.2
   - type: Sprite

Resources/Prototypes/_CP14/Entities/Objects/ores.yml

@@ -47,4 +47,4 @@
     sprite: _CP14/Objects/Materials/gold_ore.rsi
     layers:
       - state: ore1
-        map: ["random"]
+        map: ["random"]

Resources/Prototypes/_CP14/Entities/Structures/Fence/base.yml

@@ -15,6 +15,8 @@
     bodyType: Static
   - type: Transform
     anchored: true
+  - type: PlacementReplacement
+    key: walls
 
 - type: entity
   parent: CP14BaseFence

Resources/Prototypes/_CP14/Entities/Structures/Fence/iron_grille.yml

@@ -41,7 +41,7 @@
       fix1:
         shape:
           !type:PhysShapeAabb
-          bounds: "-0.49,-0.49,0.49,-0.29"
+          bounds: "-0.5,-0.15,0.5,0.15"
         density: 1000
         mask:
         - FullTileMask
@@ -50,42 +50,6 @@
         - LowImpassable
         - WallLayer
 
-- type: entity
-  parent: 
-  - CP14BaseFenceCorner
-  - CP14FenceIronGrilleBase
-  id: CP14FenceIronGrilleCorner
-  suffix: Corner
-  components:
-  - type: Icon
-    state: corner
-  - type: Sprite
-    state: corner
-  - type: Fixtures
-    fixtures:
-      fix1:
-        shape:
-          !type:PhysShapeAabb
-          bounds: "-0.49,-0.49,0.49,-0.29"
-        density: 1000
-        mask:
-        - TableMask
-        layer:
-        - MidImpassable
-        - LowImpassable
-        - WallLayer
-      fix2:
-        shape:
-          !type:PhysShapeAabb
-          bounds: "0.29,-0.49,0.49,0.49"
-        density: 1000
-        mask:
-        - TableMask
-        layer:
-        - MidImpassable
-        - LowImpassable
-        - WallLayer
-
 - type: entity
   parent:
   - CP14BaseFenceDoor
@@ -104,4 +68,17 @@
     openSound:
       collection: MetalScrape
     closeSound:
-      collection: MetalScrape
+      collection: MetalScrape
+  - type: Fixtures
+    fixtures:
+      fix1:
+        shape:
+          !type:PhysShapeAabb
+          bounds: "-0.5,-0.15,0.5,0.15"
+        density: 1000
+        mask:
+        - FullTileMask
+        layer:
+        - MidImpassable
+        - LowImpassable
+        - WallLayer

Resources/Prototypes/_CP14/Entities/Structures/Fence/iron_grille_top.yml

@@ -0,0 +1,50 @@
+- type: entity
+  parent:
+  - CP14BaseFence
+  id: CP14FenceIronGrilleWindowBase
+  name: iron grille window
+  description: A strong barrier made of iron bars welded together. The absence of the bottom part allows you to slip objects through it.
+  abstract: true
+  components:
+  - type: Sprite
+    sprite: _CP14/Structures/Fences/iron_grille_top.rsi
+  - type: Icon
+    sprite: _CP14/Structures/Fences/iron_grille_top.rsi
+  - type: Damageable
+    damageContainer: StructuralInorganic
+    damageModifierSet: StructuralMetallic
+  - type: Destructible
+    thresholds:
+    - trigger:
+        !type:DamageTrigger
+        damage: 250
+      behaviors:
+      - !type:PlaySoundBehavior
+        sound:
+          collection: MetalBreak
+      - !type:DoActsBehavior
+        acts: [ "Destruction" ]
+
+- type: entity
+  parent: 
+  - CP14FenceIronGrilleWindowBase
+  - CP14BaseFenceStraight
+  id: CP14FenceIronGrilleWindowStraight
+  suffix: Straight
+  components:
+  - type: Icon
+    state: straight
+  - type: Sprite
+    state: straight
+  - type: Fixtures
+    fixtures:
+      fix1:
+        shape:
+          !type:PhysShapeAabb
+          bounds: "-0.5,-0.15,0.5,0.15"
+        density: 1000
+        mask:
+        - Impassable
+        layer:
+        - MidImpassable
+        - HighImpassable

Resources/Textures/_CP14/Structures/Fences/iron_grille.rsi/meta.json

@@ -11,10 +11,6 @@
       "name": "straight",
       "directions": 4
     },
-    {
-      "name": "corner",
-      "directions": 4
-    },
     {
       "name": "door_closed",
       "directions": 4

Resources/Textures/_CP14/Structures/Fences/iron_grille_top.rsi/meta.json

@@ -0,0 +1,15 @@
+{
+  "version": 1,
+  "license": "CLA",
+  "copyright": "by TheShuEd (github)",
+  "size": {
+    "x": 32,
+    "y": 96
+  },
+  "states": [
+    {
+      "name": "straight",
+      "directions": 4
+    }
+  ]
+}

Resources/migration.yml

@@ -176,6 +176,7 @@ CP14IronDoorBlacksmith: CP14IronDoorBlacksmith1
 CP14IronDoorMirroredBlacksmith: CP14IronDoorMirroredBlacksmith1
 CP14IronDoorWindowedBlacksmith: CP14IronDoorBlacksmith1
 CP14IronDoorWindowedMirroredBlacksmith: CP14IronDoorMirroredBlacksmith1
+CP14FenceIronGrilleCorner: null
 
 # <---> CrystallEdge migration zone end