fix smoke not transferring (#21332)

diff --git a/Resources/Prototypes/Entities/Effects/chemistry_effects.yml b/Resources/Prototypes/Entities/Effects/chemistry_effects.yml
index dfa2fb113a5763793d31abce1f52fe2e849b4cb9..a8e28a1ef731bd931275dfd7cdaa0ccde53d683e 100644 (file)
--- a/Resources/Prototypes/Entities/Effects/chemistry_effects.yml
+++ b/Resources/Prototypes/Entities/Effects/chemistry_effects.yml
@@ -1,17 +1,26 @@
 - type: entity
-  id: Smoke
-  name: smoke
-  noSpawn: true
+  id: BaseFoam
+  abstract: true
   components:
-  - type: Occluder
   - type: Sprite
     drawdepth: Effects
-    sprite: Effects/chemsmoke.rsi
-    state: chemsmoke
   - type: Appearance
+  - type: AnimationPlayer
   - type: SmokeVisuals
   - type: Transform
     anchored: true
+  - type: Physics
+  - type: Fixtures
+    fixtures:
+      fix1:
+        hard: false
+        shape:
+          !type:PhysShapeAabb
+          bounds: "-0.4,-0.4,0.4,0.4"
+        mask:
+        - ItemMask
+        layer:
+        - SlipLayer
   - type: Smoke
   - type: ActiveEdgeSpreader
   - type: EdgeSpreader
@@ -21,65 +30,50 @@
       solutionArea:
         maxVol: 600
         canReact: false
+
+- type: entity
+  parent: BaseFoam
+  id: Smoke
+  name: smoke
+  noSpawn: true
+  components:
+  - type: Occluder
+  - type: Sprite
+    sprite: Effects/chemsmoke.rsi
+    state: chemsmoke
   - type: TimedDespawn
     lifetime: 10
   - type: Tag
     tags:
-      - HideContextMenu
+    - HideContextMenu
 
 - type: entity
+  parent: BaseFoam
   id: Foam
   name: foam
   noSpawn: true
   components:
   - type: Sprite
-    drawdepth: Effects
     color: "#ffffffcc"
     sprite: Effects/foam.rsi
     layers:
-      - state: foam
-        map: ["enum.FoamVisualLayers.Base"]
-      - map: [ "enum.EdgeLayer.South" ]
-        state: foam-south
-      - map: [ "enum.EdgeLayer.East" ]
-        state: foam-east
-      - map: [ "enum.EdgeLayer.North" ]
-        state: foam-north
-      - map: [ "enum.EdgeLayer.West" ]
-        state: foam-west
-  - type: AnimationPlayer
-  - type: Appearance
+    - state: foam
+      map: ["enum.FoamVisualLayers.Base"]
+    - map: [ "enum.EdgeLayer.South" ]
+      state: foam-south
+    - map: [ "enum.EdgeLayer.East" ]
+      state: foam-east
+    - map: [ "enum.EdgeLayer.North" ]
+      state: foam-north
+    - map: [ "enum.EdgeLayer.West" ]
+      state: foam-west
   - type: SmoothEdge
   - type: IconSmooth
     key: walls
     mode: NoSprite
-  - type: SmokeVisuals
   - type: FoamVisuals
     animationTime: 0.6
     animationState: foam-dissolve
-  - type: Transform
-    anchored: true
-  - type: Physics
-  - type: Fixtures
-    fixtures:
-      fix1:
-        hard: false
-        shape:
-          !type:PhysShapeAabb
-          bounds: "-0.4,-0.4,0.4,0.4"
-        mask:
-        - ItemMask
-        layer:
-        - SlipLayer
-  - type: Smoke
-  - type: ActiveEdgeSpreader
-  - type: EdgeSpreader
-    id: Smoke
-  - type: SolutionContainerManager
-    solutions:
-      solutionArea:
-        maxVol: 600
-        canReact: false
   - type: Slippery
   - type: StepTrigger
 
@@ -90,26 +84,22 @@
   parent: Foam
   components:
   - type: Sprite
-    drawdepth: Effects
     color: "#ffffffcc"
     sprite: Effects/foam.rsi
     layers:
-      - state: m_foam
-        map: ["enum.FoamVisualLayers.Base"]
-      - map: [ "enum.EdgeLayer.South" ]
-        state: m_foam-south
-      - map: [ "enum.EdgeLayer.East" ]
-        state: m_foam-east
-      - map: [ "enum.EdgeLayer.North" ]
-        state: m_foam-north
-      - map: [ "enum.EdgeLayer.West" ]
-        state: m_foam-west
-  - type: Appearance
-  - type: SmokeVisuals
+    - state: m_foam
+      map: ["enum.FoamVisualLayers.Base"]
+    - map: [ "enum.EdgeLayer.South" ]
+      state: m_foam-south
+    - map: [ "enum.EdgeLayer.East" ]
+      state: m_foam-east
+    - map: [ "enum.EdgeLayer.North" ]
+      state: m_foam-north
+    - map: [ "enum.EdgeLayer.West" ]
+      state: m_foam-west
   - type: FoamVisuals
     animationTime: 0.6
     animationState: m_foam-dissolve
-  - type: Smoke
 
 - type: entity
   id: IronMetalFoam
@@ -136,11 +126,11 @@
   placement:
     mode: SnapgridCenter
     snap:
-      - Wall
+    - Wall
   components:
   - type: Tag
     tags:
-      - RCDDeconstructWhitelist
+    - RCDDeconstructWhitelist
   - type: Clickable
   - type: InteractionOutline
   - type: Sprite
@@ -187,16 +177,16 @@
     color: "#ffffffcc"
     sprite: Effects/foam.rsi
     layers:
-      - state: iron_foam
-        map: ["enum.FoamVisualLayers.Base"]
-      - map: [ "enum.EdgeLayer.South" ]
-        state: iron_foam-south
-      - map: [ "enum.EdgeLayer.East" ]
-        state: iron_foam-east
-      - map: [ "enum.EdgeLayer.North" ]
-        state: iron_foam-north
-      - map: [ "enum.EdgeLayer.West" ]
-        state: iron_foam-west
+    - state: iron_foam
+      map: ["enum.FoamVisualLayers.Base"]
+    - map: [ "enum.EdgeLayer.South" ]
+      state: iron_foam-south
+    - map: [ "enum.EdgeLayer.East" ]
+      state: iron_foam-east
+    - map: [ "enum.EdgeLayer.North" ]
+      state: iron_foam-north
+    - map: [ "enum.EdgeLayer.West" ]
+      state: iron_foam-west
 
 - type: entity
   id: FoamedAluminiumMetal
@@ -209,13 +199,13 @@
     color: "#ffffffcc"
     sprite: Effects/foam.rsi
     layers:
-      - state: metal_foam
-        map: ["enum.FoamVisualLayers.Base"]
-      - map: [ "enum.EdgeLayer.South" ]
-        state: metal_foam-south
-      - map: [ "enum.EdgeLayer.East" ]
-        state: metal_foam-east
-      - map: [ "enum.EdgeLayer.North" ]
-        state: metal_foam-north
-      - map: [ "enum.EdgeLayer.West" ]
-        state: metal_foam-west
+    - state: metal_foam
+      map: ["enum.FoamVisualLayers.Base"]
+    - map: [ "enum.EdgeLayer.South" ]
+      state: metal_foam-south
+    - map: [ "enum.EdgeLayer.East" ]
+      state: metal_foam-east
+    - map: [ "enum.EdgeLayer.North" ]
+      state: metal_foam-north
+    - map: [ "enum.EdgeLayer.West" ]
+      state: metal_foam-west