Cleanup

Resources/Prototypes/_NF/Entities/Structures/Walls/diagonal_walls.yml

@@ -1,9 +1,7 @@
-# entities list: WallReinforcedDiagonal, WallWoodDiagona, GrilleDiagona, WindowReinforcedDiagonal
+# entities list: WallReinforcedDiagonal, WallWoodDiagonal, WallUraniumDiagonal
 - type: entity
-  parent: WallSolidDiagonal
+  parent: [WallReinforced, WallSolidDiagonal]
   id: WallReinforcedDiagonal
-  name: reinforced wall
-  suffix: diagonal
   placement:
     mode: SnapgridCenter
     snap:
@@ -20,30 +18,25 @@
   - type: Icon
     sprite: _NF/Structures/Walls/solid_reinforced_diagonal.rsi
     state: state0
-  - type: Destructible
-    thresholds:
-    - trigger:
-        !type:DamageTrigger
-        damage: 1200 #excess damage (nuke?). avoid computational cost of spawning entities.
-      behaviors:
-      - !type:DoActsBehavior
-        acts: ["Destruction"]
-    - trigger:
-        !type:DamageTrigger
-        damage: 600
-      behaviors:
-      - !type:ChangeConstructionNodeBehavior
-        node: girder
-      - !type:DoActsBehavior
-        acts: ["Destruction"]
-  - type: Reflect
-    reflectProb: 0
+  - type: Fixtures
+    fixtures:
+      fix1:
+        shape:
+          !type:PolygonShape
+            vertices:
+            - "-0.5,-0.5"
+            - "0.5,0.5"
+            - "0.5,-0.5"
+        mask:
+        - FullTileMask
+        layer:
+        - WallLayer
+  - type: Occluder
+    enabled: false
 
 - type: entity
-  parent: WallSolidDiagonal
+  parent: [WallWood, WallSolidDiagonal]
   id: WallWoodDiagonal
-  name: wood wall
-  suffix: diagonal
   placement:
     mode: SnapgridCenter
     snap:
@@ -60,14 +53,25 @@
   - type: Icon
     sprite: _NF/Structures/Walls/wood_diagonal.rsi
     state: state0
-  - type: Reflect
-    reflectProb: 0
+  - type: Fixtures
+    fixtures:
+      fix1:
+        shape:
+          !type:PolygonShape
+            vertices:
+            - "-0.5,-0.5"
+            - "0.5,0.5"
+            - "0.5,-0.5"
+        mask:
+        - FullTileMask
+        layer:
+        - WallLayer
+  - type: Occluder
+    enabled: false
 
 - type: entity
-  parent: WallSolidDiagonal
+  parent: [WallUranium, WallSolidDiagonal]
   id: WallUraniumDiagonal
-  name: uranium wall
-  suffix: diagonal
   placement:
     mode: SnapgridCenter
     snap:
@@ -84,5 +88,18 @@
   - type: Icon
     sprite: _NF/Structures/Walls/uranium_diagonal.rsi
     state: state0
-  - type: Reflect
-    reflectProb: 0
+  - type: Fixtures
+    fixtures:
+      fix1:
+        shape:
+          !type:PolygonShape
+            vertices:
+            - "-0.5,-0.5"
+            - "0.5,0.5"
+            - "0.5,-0.5"
+        mask:
+        - FullTileMask
+        layer:
+        - WallLayer
+  - type: Occluder
+    enabled: false

Resources/Prototypes/_NF/Entities/Structures/Walls/grille_diagonal.yml

@@ -1,14 +1,12 @@
+# entities list: GrilleDiagonal
 - type: entity
-  parent: WallShuttleDiagonal
+  parent: [Grille, WallSolidDiagonal]
   id: GrilleDiagonal
-  name: grille
-  suffix: diagonal
   placement:
     mode: SnapgridCenter
     snap:
     - Wall
   components:
-  - type: CanBuildWindowOnTop
   - type: Sprite
     drawdepth: Walls
     sprite: _NF/Structures/Walls/grille_diagonal.rsi
@@ -20,33 +18,6 @@
   - type: Icon
     sprite: _NF/Structures/Walls/grille_diagonal.rsi
     state: state0
-  - type: Tag
-    tags:
-    - RCDDeconstructWhitelist
-  - type: Damageable
-    damageContainer: Inorganic
-    damageModifierSet: PerforatedMetallic
-  - type: Reflect
-    reflectProb: 0
-  - type: PowerConsumer
-    showInMonitor: false
-  - type: Electrified
-    requirePower: true
-    noWindowInTile: true
-    highVoltageNode: high
-    mediumVoltageNode: medium
-    lowVoltageNode: low
-  - type: NodeContainer
-    nodes:
-      high:
-        !type:CableDeviceNode
-        nodeGroupID: HVPower
-      medium:
-        !type:CableDeviceNode
-        nodeGroupID: MVPower
-      low:
-        !type:CableDeviceNode
-        nodeGroupID: Apc
   - type: Fixtures
     fixtures:
       fix1:
@@ -60,3 +31,5 @@
         - FullTileMask
         layer:
         - GlassLayer
+  - type: Occluder
+    enabled: false

Resources/Prototypes/_NF/Entities/Structures/Windows/window_diagonal.yml

@@ -1,15 +1,14 @@
+# entities list: WindowDiagonal, WindowReinforcedDiagonal, WindowPlasmaDiagonal, WindowPlasmaReinforcedDiagonal
 - type: entity
-  parent: Window
+  parent: [Window, WallShuttleDiagonal]
   id: WindowDiagonal
-  name: window
-  suffix: diagonal
   placement:
     mode: SnapgridCenter
     snap:
     - Window
   components:
   - type: Sprite
-    drawdepth: WallTops
+    drawdepth: Walls
     sprite: _NF/Structures/Windows/window_diagonal.rsi
     state: state0
   - type: Icon
@@ -34,17 +33,15 @@
         - GlassLayer
 
 - type: entity
-  parent: ReinforcedWindow
+  parent: [ReinforcedWindow, WindowDiagonal]
   id: WindowReinforcedDiagonal
-  name: reinforced window
-  suffix: diagonal
   placement:
     mode: SnapgridCenter
     snap:
     - Window
   components:
   - type: Sprite
-    drawdepth: WallTops
+    drawdepth: Walls
     sprite: _NF/Structures/Windows/reinforced_window_diagonal.rsi
     state: state0
   - type: Icon
@@ -69,17 +66,15 @@
         - GlassLayer
 
 - type: entity
-  parent: PlasmaWindow
+  parent: [PlasmaWindow, WindowDiagonal]
   id: WindowPlasmaDiagonal
-  name: plasma window
-  suffix: diagonal
   placement:
     mode: SnapgridCenter
     snap:
     - Window
   components:
   - type: Sprite
-    drawdepth: WallTops
+    drawdepth: Walls
     sprite: _NF/Structures/Windows/plasma_window_diagonal.rsi
     state: state0
   - type: Icon
@@ -104,17 +99,15 @@
         - GlassLayer
 
 - type: entity
-  parent: ReinforcedPlasmaWindow
+  parent: [ReinforcedPlasmaWindow, WindowDiagonal]
   id: WindowPlasmaReinforcedDiagonal
-  name: reinforced plasma window
-  suffix: diagonal
   placement:
     mode: SnapgridCenter
     snap:
     - Window
   components:
   - type: Sprite
-    drawdepth: WallTops
+    drawdepth: Walls
     sprite: _NF/Structures/Windows/reinforced_plasma_window_diagonal.rsi
     state: state0
   - type: Icon