Replace SpriteStateChange construction action with AppearanceChange (#15914)

Content.Client/ParticleAccelerator/ParticleAcceleratorPartVisualizerSystem.cs

@@ -11,6 +11,9 @@ public sealed class ParticleAcceleratorPartVisualizerSystem : VisualizerSystem<P
         if (args.Sprite == null)
             return;
 
+        if (!args.Sprite.LayerMapTryGet(ParticleAcceleratorVisualLayers.Unlit, out var index))
+            return;
+
         if (!AppearanceSystem.TryGetData<ParticleAcceleratorVisualState>(uid, ParticleAcceleratorVisuals.VisualState, out var state, args.Component))
         {
             state = ParticleAcceleratorVisualState.Unpowered;
@@ -18,12 +21,12 @@ public sealed class ParticleAcceleratorPartVisualizerSystem : VisualizerSystem<P
 
         if (state != ParticleAcceleratorVisualState.Unpowered)
         {
-            args.Sprite.LayerSetVisible(ParticleAcceleratorVisualLayers.Unlit, true);
+            args.Sprite.LayerSetVisible(index, true);
-            args.Sprite.LayerSetState(ParticleAcceleratorVisualLayers.Unlit, comp.StateBase + comp.StatesSuffixes[state]);
+            args.Sprite.LayerSetState(index, comp.StateBase + comp.StatesSuffixes[state]);
         }
         else
         {
-            args.Sprite.LayerSetVisible(ParticleAcceleratorVisualLayers.Unlit, false);
+            args.Sprite.LayerSetVisible(index, false);
         }
     }
 }

Content.Client/ParticleAccelerator/UI/ParticleAcceleratorControlMenu.cs

@@ -259,17 +259,17 @@ namespace Content.Client.ParticleAccelerator.UI
                                                 Children =
                                                 {
                                                     new Control {MinSize = imgSize},
-                                                    (_endCapTexture = Segment("end_cap", "capc")),
+                                                    (_endCapTexture = Segment("end_cap")),
                                                     new Control {MinSize = imgSize},
-                                                    (_controlBoxTexture = Segment("control_box", "boxc")),
+                                                    (_controlBoxTexture = Segment("control_box")),
-                                                    (_fuelChamberTexture = Segment("fuel_chamber", "chamberc")),
+                                                    (_fuelChamberTexture = Segment("fuel_chamber")),
                                                     new Control {MinSize = imgSize},
                                                     new Control {MinSize = imgSize},
-                                                    (_powerBoxTexture = Segment("power_box", "boxc")),
+                                                    (_powerBoxTexture = Segment("power_box")),
                                                     new Control {MinSize = imgSize},
-                                                    (_emitterLeftTexture = Segment("emitter_left", "leftc")),
+                                                    (_emitterLeftTexture = Segment("emitter_left")),
-                                                    (_emitterCenterTexture = Segment("emitter_center", "centerc")),
+                                                    (_emitterCenterTexture = Segment("emitter_center")),
-                                                    (_emitterRightTexture = Segment("emitter_right", "rightc")),
+                                                    (_emitterRightTexture = Segment("emitter_right")),
                                                 }
                                             }
                                         }
@@ -326,9 +326,9 @@ namespace Content.Client.ParticleAccelerator.UI
                 }
             };
 
-            PASegmentControl Segment(string name, string state)
+            PASegmentControl Segment(string name)
             {
-                return new(this, resourceCache, name, state);
+                return new(this, resourceCache, name);
             }
 
             UpdateUI(false, false, false, false);
@@ -470,13 +470,13 @@ namespace Content.Client.ParticleAccelerator.UI
             private readonly TextureRect _unlit;
             private readonly RSI _rsi;
 
-            public PASegmentControl(ParticleAcceleratorControlMenu menu, IResourceCache cache, string name, string state)
+            public PASegmentControl(ParticleAcceleratorControlMenu menu, IResourceCache cache, string name)
             {
                 _menu = menu;
                 _baseState = name;
                 _rsi = cache.GetResource<RSIResource>($"/Textures/Structures/Power/Generation/PA/{name}.rsi").RSI;
 
-                AddChild(_base = new TextureRect {Texture = _rsi[$"{state}"].Frame0});
+                AddChild(_base = new TextureRect {Texture = _rsi[$"completed"].Frame0});
                 AddChild(_unlit = new TextureRect());
                 MinSize = _rsi.Size;
             }

Content.Server/Construction/Completions/AppearanceChange.cs

@@ -0,0 +1,42 @@
+using Content.Server.Construction.Components;
+using Content.Shared.Construction;
+using JetBrains.Annotations;
+using Robust.Server.GameObjects;
+
+namespace Content.Server.Construction.Completions;
+
+[UsedImplicitly]
+[DataDefinition]
+public sealed class AppearanceChange : IGraphAction
+{
+    /// <summary>
+    /// The appearance key to use.
+    /// </summary>
+    [DataField("key")]
+    public Enum Key = ConstructionVisuals.Key;
+
+    /// <summary>
+    /// The enum data to set. If not specified, will set the data to the name of the current edges' target node
+    /// (or the current node). This is because appearance changes are usually associated with reaching a new node.
+    /// </summary>
+    [DataField("data")]
+    public Enum? Data;
+
+    public void PerformAction(EntityUid uid, EntityUid? userUid, IEntityManager entityManager)
+    {
+        if (!entityManager.TryGetComponent(uid, out AppearanceComponent? appearance))
+            return;
+
+        if (Data != null)
+        {
+            entityManager.System<AppearanceSystem>().SetData(uid, Key, Data, appearance);
+            return;
+        }
+
+        var (node, edge) = entityManager.System<ConstructionSystem>().GetCurrentNodeAndEdge(uid);
+        var nodeName = edge?.Target ?? node?.Name;
+
+        if (nodeName != null)
+            entityManager.System<AppearanceSystem>().SetData(uid, Key, nodeName, appearance);
+    }
+}

Content.Server/Construction/Completions/SpriteStateChange.cs

@@ -1,26 +0,0 @@
-using Content.Shared.Construction;
-using JetBrains.Annotations;
-using Robust.Server.GameObjects;
-
-namespace Content.Server.Construction.Completions
-{
-    [UsedImplicitly]
-    [DataDefinition]
-    public sealed class SpriteStateChange : IGraphAction
-    {
-        [DataField("layer")] public int Layer { get; private set; } = 0;
-        [DataField("state")] public string? State { get; private set; } = string.Empty;
-
-        public void PerformAction(EntityUid uid, EntityUid? userUid, IEntityManager entityManager)
-        {
-            if (string.IsNullOrEmpty(State) || !entityManager.TryGetComponent(uid, out SpriteComponent? sprite))
-                return;
-
-            // That layer doesn't exist, we do nothing.
-            if (sprite.LayerCount <= Layer)
-                return;
-
-            sprite.LayerSetState(Layer, State);
-        }
-    }
-}

Content.Server/Construction/ConstructionSystem.Graph.cs

@@ -90,6 +90,23 @@ namespace Content.Server.Construction
             return GetCurrentNode(uid, construction) is not {} node ? null : GetEdgeFromNode(node, edgeIndex);
         }
 
+        /// <summary>
+        ///     Variant of <see cref="GetCurrentEdge"/> that returns both the node and edge.
+        /// </summary>
+        public (ConstructionGraphNode?, ConstructionGraphEdge?) GetCurrentNodeAndEdge(EntityUid uid, ConstructionComponent? construction = null)
+        {
+            if (!Resolve(uid, ref construction, false))
+                return (null, null);
+
+            if (GetCurrentNode(uid, construction) is not { } node)
+                return (null, null);
+
+            if (construction.EdgeIndex is not {} edgeIndex)
+                return (node, null);
+
+            return (node, GetEdgeFromNode(node, edgeIndex));
+        }
+
         /// <summary>
         ///     Gets the construction graph step the entity is currently at, or null.
         /// </summary>

Content.Shared/Construction/ConstructionGraphNode.cs

@@ -1,4 +1,6 @@
 using System.Diagnostics.CodeAnalysis;
+using Robust.Shared.Prototypes;
+using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype;
 
 namespace Content.Shared.Construction
 {
@@ -21,7 +23,7 @@ namespace Content.Shared.Construction
         [ViewVariables]
         public IReadOnlyList<IGraphAction> Actions => _actions;
 
-        [DataField("entity")]
+        [DataField("entity", customTypeSerializer:typeof(PrototypeIdSerializer<EntityPrototype>))]
         public string? Entity { get; private set; }
 
         public ConstructionGraphEdge? GetEdge(string target)

Content.Shared/Construction/Enums.cs

@@ -0,0 +1,11 @@
+using Robust.Shared.Serialization;
+
+namespace Content.Shared.Construction;
+
+[Serializable, NetSerializable]
+public enum ConstructionVisuals : byte
+{
+    Key,
+    Layer,
+    Wired,
+}

Resources/Prototypes/Catalog/Cargo/cargo_engines.yml

@@ -74,7 +74,7 @@
   id: EngineParticleAccelerator
   icon:
     sprite: Structures/Power/Generation/PA/control_box.rsi
-    state: boxc
+    state: completed
   product: CrateEngineeringParticleAccelerator
   cost: 2000
   category: Engineering

Resources/Prototypes/Entities/Objects/Weapons/Throwable/grenades.yml

@@ -143,7 +143,9 @@
   components:
   - type: Sprite
     sprite: Objects/Weapons/Grenades/modular.rsi
-    state: empty
+    layers:
+    - state: empty
+      map: [ "enum.ConstructionVisuals.Layer" ]
   - type: Item
     size: 8
   - type: PayloadCase
@@ -168,6 +170,14 @@
       states:
         enum.Trigger.TriggerVisualState.Primed: primed
         enum.Trigger.TriggerVisualState.Unprimed: complete
+  - type: GenericVisualizer
+    visuals:
+      enum.ConstructionVisuals.Key:
+        enum.ConstructionVisuals.Layer:
+          emptyCase: { state: empty }
+          wiredCase: { state: wired }
+          caseWithTrigger: { state: no-payload }
+          grenade: { state: complete }
   - type: StaticPrice
     price: 25
 

Resources/Prototypes/Entities/Structures/Doors/Firelocks/frame.yml

@@ -6,7 +6,18 @@
   components:
   - type: Sprite
     sprite: Structures/Doors/Airlocks/Standard/firelock.rsi
-    state: frame1
+    layers:
+    - state: frame1
+      map: [ "enum.ConstructionVisuals.Layer" ]
+  - type: Appearance
+  - type: GenericVisualizer
+    visuals:
+      enum.ConstructionVisuals.Key:
+        enum.ConstructionVisuals.Layer:
+          frame1: { state: frame1 }
+          frame2: { state: frame2 }
+          frame3: { state: frame3 }
+          frame4: { state: frame4 }
   - type: Construction
     graph: Firelock
     node: frame1

Resources/Prototypes/Entities/Structures/Machines/Computers/base_structurecomputers.yml

@@ -1,5 +1,5 @@
 - type: entity
-  parent: ComputerFrame
+  parent: BaseStructureComputer
   id: BaseComputer
   name: computer
   placement:

Resources/Prototypes/Entities/Structures/Machines/Computers/frame.yml

@@ -1,8 +1,7 @@
 - type: entity
-  id: ComputerFrame
+  id: BaseStructureComputer
   parent: BaseStructure
-  name: computer frame
+  abstract: true
-  description: A computer under construction.
   components:
   - type: Physics
     bodyType: Static
@@ -23,9 +22,7 @@
     graph: Computer
     node: frameUnsecured
   - type: Sprite
-    sprite: Structures/Machines/parts.rsi
     drawdepth: Objects
-    state: 0
   - type: Damageable
     damageContainer: Inorganic
     damageModifierSet: Metallic
@@ -44,7 +41,29 @@
         acts: ["Destruction"]
 
 - type: entity
-  parent: ComputerFrame
+  id: ComputerFrame
+  parent: BaseStructureComputer
+  name: computer frame
+  description: A computer under construction.
+  components:
+  - type: Sprite
+    sprite: Structures/Machines/parts.rsi
+    layers:
+    - state: 0
+      map: [ "enum.ConstructionVisuals.Layer" ]
+  - type: Appearance
+  - type: GenericVisualizer
+    visuals:
+      enum.ConstructionVisuals.Key:
+        enum.ConstructionVisuals.Layer:
+          frameUnsecured: { state: 0 }
+          boardUnsecured: { state: 1 }
+          missingWires: { state: 2 }
+          monitorMissing: { state: 3 }
+          monitorUnsecured: { state: 4 }
+
+- type: entity
+  parent: BaseStructureComputer
   id: ComputerBroken
   name: broken computer
   description: This computer has seen better days.

Resources/Prototypes/Entities/Structures/Piping/Disposal/high_pressure_machine_frame.yml

@@ -42,4 +42,17 @@
               acts: [ "Destruction" ]
     - type: Sprite
       sprite: Structures/Piping/high_pressure_machine_frame.rsi
-      state: frame
+      layers:
+      - state: frame
+        map: [ "enum.ConstructionVisuals.Layer" ]
+    - type: Appearance
+    - type: GenericVisualizer
+      visuals:
+        enum.ConstructionVisuals.Key:
+          enum.ConstructionVisuals.Layer:
+            frame_cable: { state: frame_cables }
+            frame_electronics: { state: frame_electronics }
+            frame_unit: { state: frame_unit }
+            frame_mailing: { state: frame_unit } # not a typo, there is no frame_mailing state.
+            frame_inlet: { state: frame_inlet }
+            frame_outlet: { state: frame_outlet }

Resources/Prototypes/Entities/Structures/Power/Generation/PA/base_particleaccelerator.yml

@@ -24,3 +24,44 @@
       noRot: false
     - type: Pullable
     - type: Clickable
+    - type: GuideHelp
+      guides: [ Singularity, Power ]
+    - type: Appearance
+
+- type: entity
+  id: ParticleAcceleratorFinishedPart
+  parent: ParticleAcceleratorBase
+  abstract: true
+  components:
+  - type: Sprite
+    layers:
+    - state: completed
+      map: [ "enum.ParticleAcceleratorVisualLayers.Base" ]
+    - state: unlitp
+      map: [ "enum.ParticleAcceleratorVisualLayers.Unlit" ]
+      shader: unshaded
+      visible: false
+  - type: ParticleAcceleratorPart
+  - type: ParticleAcceleratorPartVisuals
+    stateBase: unlit
+  - type: Construction
+    node: completed
+
+- type: entity
+  id: ParticleAcceleratorUnfinishedBase
+  parent: ParticleAcceleratorBase
+  abstract: true
+  components:
+  - type: Sprite
+    layers:
+    - state: unwired
+      map: [ "enum.ConstructionVisuals.Layer" ]
+  - type: GenericVisualizer
+    visuals:
+      enum.ConstructionVisuals.Key:
+        enum.ConstructionVisuals.Layer:
+          start: { state: unwired}
+          wired: { state: wired}
+  - type: Construction
+    node: start
+    defaultTarget: completed

Resources/Prototypes/Entities/Structures/Power/Generation/PA/control_box.yml

@@ -7,7 +7,7 @@
     - type: Sprite
       sprite: Structures/Power/Generation/PA/control_box.rsi
       layers:
-        - state: boxc
+        - state: completed
           map: [ "enum.ParticleAcceleratorVisualLayers.Base" ]
         - state: unlitp
           map: [ "enum.ParticleAcceleratorVisualLayers.Unlit" ]
@@ -35,14 +35,11 @@
     - type: Wires
       BoardName: "Mk2 Particle Accelerator"
       LayoutId: ParticleAccelerator
-    - type: GuideHelp
-      guides: [ Singularity, Power ]
-      
       
 # Unfinished
 
 - type: entity
-  parent: ParticleAcceleratorBase
+  parent: ParticleAcceleratorUnfinishedBase
   id: ParticleAcceleratorControlBoxUnfinished
   name: PA control computer
   suffix: Unfinished
@@ -52,10 +49,5 @@
       bodyType: Dynamic
     - type: Sprite
       sprite: Structures/Power/Generation/PA/control_box.rsi
-      state: box
     - type: Construction
       graph: ParticleAcceleratorControlBox
-      node: start
-      defaultTarget: completed
-    - type: GuideHelp
-      guides: [ Singularity, Power ]

Resources/Prototypes/Entities/Structures/Power/Generation/PA/emitter.yml

@@ -1,88 +1,46 @@
 - type: entity
-  parent: ParticleAcceleratorBase
+  parent: ParticleAcceleratorFinishedPart
   id: ParticleAcceleratorEmitterLeft
   name: PA containment emitter L
   description: This launchs the Alpha particles, might not want to stand near this end.
   components:
     - type: Sprite
       sprite: Structures/Power/Generation/PA/emitter_left.rsi
-      layers:
-        - state: leftc
-          map: [ "enum.ParticleAcceleratorVisualLayers.Base" ]
-        - state: unlitp
-          map: [ "enum.ParticleAcceleratorVisualLayers.Unlit" ]
-          shader: unshaded
-          visible: false
-    - type: Appearance
-    - type: ParticleAcceleratorPartVisuals
-      stateBase: unlit
-    - type: ParticleAcceleratorPart
     - type: ParticleAcceleratorEmitter
       emitterType: Left
     - type: Construction
       graph: ParticleAcceleratorEmitterLeft
-      node: completed
-    - type: GuideHelp
-      guides: [ Singularity, Power ]
-
 
 - type: entity
-  parent: ParticleAcceleratorBase
+  parent: ParticleAcceleratorFinishedPart
   id: ParticleAcceleratorEmitterCenter
   name: PA containment emitter C
   description: This launchs the Alpha particles, might not want to stand near this end.
   components:
     - type: Sprite
       sprite: Structures/Power/Generation/PA/emitter_center.rsi
-      layers:
-        - state: centerc
-          map: [ "enum.ParticleAcceleratorVisualLayers.Base" ]
-        - state: unlitp
-          map: [ "enum.ParticleAcceleratorVisualLayers.Unlit" ]
-          shader: unshaded
-          visible: false
-    - type: Appearance
-    - type: ParticleAcceleratorPartVisuals
-      stateBase: unlit
-    - type: ParticleAcceleratorPart
     - type: ParticleAcceleratorEmitter
       emitterType: Center
+    - type: Construction
       graph: ParticleAcceleratorEmitterCenter
-      node: completed
-    - type: GuideHelp
-      guides: [ Singularity, Power ]
 
 - type: entity
-  parent: ParticleAcceleratorBase
+  parent: ParticleAcceleratorFinishedPart
   id: ParticleAcceleratorEmitterRight
   name: PA containment emitter R
   description: This launchs the Alpha particles, might not want to stand near this end.
   components:
     - type: Sprite
       sprite: Structures/Power/Generation/PA/emitter_right.rsi
-      layers:
-        - state: rightc
-          map: [ "enum.ParticleAcceleratorVisualLayers.Base" ]
-        - state: unlitp
-          map: [ "enum.ParticleAcceleratorVisualLayers.Unlit" ]
-          shader: unshaded
-          visible: false
-    - type: Appearance
-    - type: ParticleAcceleratorPartVisuals
-      stateBase: unlit
-    - type: ParticleAcceleratorPart
     - type: ParticleAcceleratorEmitter
       emitterType: Right
     - type: Construction
       graph: ParticleAcceleratorEmitterRight
-      node: completed
-    - type: GuideHelp
-      guides: [ Singularity, Power ]
 
 # Unfinished
 
 - type: entity
-  parent: ParticleAcceleratorBase
+  parent: ParticleAcceleratorUnfinishedBase
   id: ParticleAcceleratorEmitterLeftUnfinished
   name: PA containment emitter L
   suffix: Unfinished, Left
@@ -92,16 +50,11 @@
       bodyType: Dynamic
     - type: Sprite
       sprite: Structures/Power/Generation/PA/emitter_left.rsi
-      state: left
     - type: Construction
       graph: ParticleAcceleratorEmitterLeft
-      node: start
-      defaultTarget: completed
-    - type: GuideHelp
-      guides: [ Singularity, Power ]
 
 - type: entity
-  parent: ParticleAcceleratorBase
+  parent: ParticleAcceleratorUnfinishedBase
   id: ParticleAcceleratorEmitterCenterUnfinished
   name: PA containment emitter C
   suffix: Unfinished
@@ -111,16 +64,11 @@
       bodyType: Dynamic
     - type: Sprite
       sprite: Structures/Power/Generation/PA/emitter_center.rsi
-      state: center
     - type: Construction
       graph: ParticleAcceleratorEmitterCenter
-      node: start
-      defaultTarget: completed
-    - type: GuideHelp
-      guides: [ Singularity, Power ]
 
 - type: entity
-  parent: ParticleAcceleratorBase
+  parent: ParticleAcceleratorUnfinishedBase
   id: ParticleAcceleratorEmitterRightUnfinished
   name: PA containment emitter R
   suffix: Unfinished
@@ -130,10 +78,5 @@
       bodyType: Dynamic
     - type: Sprite
       sprite: Structures/Power/Generation/PA/emitter_right.rsi
-      state: right
     - type: Construction
       graph: ParticleAcceleratorEmitterRight
-      node: start
-      defaultTarget: completed
-    - type: GuideHelp
-      guides: [ Singularity, Power ]

Resources/Prototypes/Entities/Structures/Power/Generation/PA/end_cap.yml

@@ -1,24 +1,22 @@
 - type: entity
-  parent: ParticleAcceleratorBase
+  parent: ParticleAcceleratorFinishedPart
   id: ParticleAcceleratorEndCap
   name: PA end-cap
   description: Formally known as the Alpha Particle Generation Array. This is where Alpha particles are generated from [REDACTED].
   components:
     - type: Sprite
       sprite: Structures/Power/Generation/PA/end_cap.rsi
-      state: capc
+      layers:
-    - type: ParticleAcceleratorPart
+      - state: completed
+        map: [ "enum.ParticleAcceleratorVisualLayers.Base" ]
     - type: ParticleAcceleratorEndCap
     - type: Construction
       graph: ParticleAcceleratorEndCap
-      node: completed
-    - type: GuideHelp
-      guides: [ Singularity, Power ]
 
 # Unfinished
 
 - type: entity
-  parent: ParticleAcceleratorBase
+  parent: ParticleAcceleratorUnfinishedBase
   id: ParticleAcceleratorEndCapUnfinished
   name: PA end-cap
   suffix: Unfinished
@@ -28,10 +26,5 @@
       bodyType: Dynamic
     - type: Sprite
       sprite: Structures/Power/Generation/PA/end_cap.rsi
-      state: cap
     - type: Construction
       graph: ParticleAcceleratorEndCap
-      node: start
-      defaultTarget: completed
-    - type: GuideHelp
-      guides: [ Singularity, Power ]

Resources/Prototypes/Entities/Structures/Power/Generation/PA/fuel_chamber.yml

@@ -1,33 +1,19 @@
 - type: entity
-  parent: ParticleAcceleratorBase
+  parent: ParticleAcceleratorFinishedPart
   id: ParticleAcceleratorFuelChamber
   name: PA fuel chamber
   description: Formally known as the EM Acceleration Chamber. This is where the Alpha particles are accelerated to radical speeds.
   components:
     - type: Sprite
       sprite: Structures/Power/Generation/PA/fuel_chamber.rsi
-      layers:
-        - state: chamberc
-          map: [ "enum.ParticleAcceleratorVisualLayers.Base" ]
-        - state: unlitp
-          map: [ "enum.ParticleAcceleratorVisualLayers.Unlit" ]
-          shader: unshaded
-          visible: false
-    - type: Appearance
-    - type: ParticleAcceleratorPartVisuals
-      stateBase: unlit
-    - type: ParticleAcceleratorPart
     - type: ParticleAcceleratorFuelChamber
     - type: Construction
       graph: ParticleAcceleratorFuelChamber
-      node: completed
-    - type: GuideHelp
-      guides: [ Singularity, Power ]
 
 # Unfinished
 
 - type: entity
-  parent: ParticleAcceleratorBase
+  parent: ParticleAcceleratorUnfinishedBase
   id: ParticleAcceleratorFuelChamberUnfinished
   name: PA fuel chamber
   suffix: Unfinished
@@ -37,10 +23,5 @@
       bodyType: Dynamic
     - type: Sprite
       sprite: Structures/Power/Generation/PA/fuel_chamber.rsi
-      state: chamber
     - type: Construction
       graph: ParticleAcceleratorFuelChamber
-      node: start
-      defaultTarget: completed
-    - type: GuideHelp
-      guides: [ Singularity, Power ]

Resources/Prototypes/Entities/Structures/Power/Generation/PA/power_box.yml

@@ -1,22 +1,11 @@
 - type: entity
-  parent: ParticleAcceleratorBase
+  parent: ParticleAcceleratorFinishedPart
   id: ParticleAcceleratorPowerBox
   name: PA power box
   description: Formally known as the Particle Focusing EM Lens. This uses electromagnetic waves to focus the Alpha-Particles.
   components:
     - type: Sprite
       sprite: Structures/Power/Generation/PA/power_box.rsi
-      layers:
-        - state: boxc
-          map: [ "enum.ParticleAcceleratorVisualLayers.Base" ]
-        - state: unlitp
-          map: [ "enum.ParticleAcceleratorVisualLayers.Unlit" ]
-          shader: unshaded
-          visible: false
-    - type: Appearance
-    - type: ParticleAcceleratorPartVisuals
-      stateBase: unlit
-    - type: ParticleAcceleratorPart
     - type: ParticleAcceleratorPowerBox
     - type: PowerConsumer
       voltage: High
@@ -28,12 +17,9 @@
           nodeGroupID: HVPower
     - type: Construction
       graph: ParticleAcceleratorPowerBox
-      node: completed
-    - type: GuideHelp
-      guides: [ Singularity, Power ]
 
 - type: entity
-  parent: ParticleAcceleratorBase
+  parent: ParticleAcceleratorUnfinishedBase
   id: ParticleAcceleratorPowerBoxUnfinished
   name: PA power box
   suffix: Unfinished
@@ -43,10 +29,6 @@
       bodyType: Dynamic
     - type: Sprite
       sprite: Structures/Power/Generation/PA/power_box.rsi
-      state: box
     - type: Construction
       graph: ParticleAcceleratorPowerBox
-      node: start
+
-      defaultTarget: completed
-    - type: GuideHelp
-      guides: [ Singularity, Power ]

Resources/Prototypes/Entities/Structures/Wallmounts/air_alarm.yml

@@ -99,7 +99,16 @@
   - type: InteractionOutline
   - type: Sprite
     sprite: Structures/Wallmounts/air_monitors.rsi
-    state: alarm_b1
+    layers:
+    - state: alarm_b1
+      map: [ "enum.ConstructionVisuals.Layer" ]
+  - type: Appearance
+  - type: GenericVisualizer
+    visuals:
+      enum.ConstructionVisuals.Key:
+        enum.ConstructionVisuals.Layer:
+          assembly: { state: alarm_b1 }
+          electronics: { state: alarm_b1 }
   - type: Construction
     graph: AirAlarm
     node: assembly

Resources/Prototypes/Entities/Structures/Wallmounts/fire_alarm.yml

@@ -110,7 +110,16 @@
   - type: InteractionOutline
   - type: Sprite
     sprite: Structures/Wallmounts/air_monitors.rsi
-    state: fire_b1
+    layers:
+    - state: fire_b1
+      map: [ "enum.ConstructionVisuals.Layer" ]
+  - type: Appearance
+  - type: GenericVisualizer
+    visuals:
+      enum.ConstructionVisuals.Key:
+        enum.ConstructionVisuals.Layer:
+          assembly: { state: fire_b1 }
+          electronics: { state: fire_b2 }
   - type: Construction
     graph: FireAlarm
     node: assembly

Resources/Prototypes/Recipes/Construction/Graphs/machines/computer.yml

@@ -14,8 +14,7 @@
 
     - node: frameUnsecured
       actions:
-        - !type:SpriteStateChange
+      - !type:AppearanceChange
-          state: "0"
       entity: ComputerFrame
       edges:
         - to: boardUnsecured
@@ -44,8 +43,7 @@
 
     - node: boardUnsecured
       actions:
-        - !type:SpriteStateChange
+      - !type:AppearanceChange
-          state: "1"
       edges:
         - to: missingWires
           conditions:
@@ -58,15 +56,12 @@
             - !type:EntityAnchored { }
           completed:
             - !type:EmptyAllContainers {}
-            - !type:SpriteStateChange
-              state: 0
           steps:
             - tool: Prying
 
     - node: missingWires
       actions:
-        - !type:SpriteStateChange
+      - !type:AppearanceChange
-          state: "2"
       edges:
         - to: monitorMissing
           conditions:
@@ -85,8 +80,7 @@
       entity: ComputerFrame
       actions:
         - !type:SetAnchor { }
-        - !type:SpriteStateChange
+        - !type:AppearanceChange
-          state: "3"
       edges:
         - to: monitorUnsecured
           conditions:
@@ -107,8 +101,7 @@
 
     - node: monitorUnsecured
       actions:
-        - !type:SpriteStateChange
+      - !type:AppearanceChange
-          state: "4"
       entity: ComputerFrame
       edges:
         - to: computer

Resources/Prototypes/Recipes/Construction/Graphs/structures/airlock.yml

@@ -16,8 +16,6 @@
   - node: assembly
     entity: AirlockAssembly
     actions:
-    - !type:SpriteStateChange
-      state: assembly
     - !type:SnapToGrid {}
     - !type:SetAnchor {}
     edges:

Resources/Prototypes/Recipes/Construction/Graphs/structures/firelock.yml

@@ -16,8 +16,7 @@
     - node: frame1
       entity: FirelockFrame
       actions:
-        - !type:SpriteStateChange
+      - !type:AppearanceChange
-          state: frame1
       edges:
         - to: frame2
           conditions:
@@ -42,8 +41,7 @@
 
     - node: frame2
       actions:
-        - !type:SpriteStateChange
+      - !type:AppearanceChange
-          state: frame2
       edges:
         - to: frame3
           conditions:
@@ -71,8 +69,7 @@
 
     - node: frame3
       actions:
-        - !type:SpriteStateChange
+      - !type:AppearanceChange
-          state: frame3
       edges:
         - to: frame4
           conditions:
@@ -94,8 +91,7 @@
     - node: frame4
       entity: FirelockFrame
       actions:
-        - !type:SpriteStateChange
+      - !type:AppearanceChange
-          state: frame4
       edges:
         - to: Firelock
           conditions:

Resources/Prototypes/Recipes/Construction/Graphs/structures/shuttle.yml

@@ -16,8 +16,6 @@
   - node: assembly
     entity: AirlockShuttleAssembly
     actions:
-#    - !type:SpriteStateChange
-#      state: assembly # TODO Need assembly sprite
     - !type:SnapToGrid {}
     - !type:SetAnchor {}
     edges:

Resources/Prototypes/Recipes/Construction/Graphs/utilities/air_alarms.yml

@@ -13,8 +13,7 @@
   - node: assembly
     entity: AirAlarmAssembly
     actions:
-    - !type:SpriteStateChange
+    - !type:AppearanceChange
-      state: alarm_b1
     edges:
     - to: wired
       steps:
@@ -54,8 +53,7 @@
 
   - node: electronics
     actions:
-    - !type:SpriteStateChange
+    - !type:AppearanceChange
-      state: alarm_b2
     edges:
     - to: air_alarm
       steps:
@@ -92,8 +90,7 @@
   - node: assembly
     entity: FireAlarmAssembly
     actions:
-    - !type:SpriteStateChange
+    - !type:AppearanceChange
-      state: fire_b1
     edges:
     - to: wired
       steps:
@@ -133,8 +130,7 @@
 
   - node: electronics
     actions:
-    - !type:SpriteStateChange
+    - !type:AppearanceChange
-      state: fire_b2
     edges:
     - to: fire_alarm
       steps:

Resources/Prototypes/Recipes/Construction/Graphs/utilities/air_sensor.yml

@@ -11,9 +11,6 @@
              doAfter: 1
     - node: assembly
       entity: AirSensorAssembly
-      actions:
-        - !type:SpriteStateChange
-          state: gsensor0
       edges:
         - to: start
           conditions:

Resources/Prototypes/Recipes/Construction/Graphs/utilities/disposal_machines.yml

@@ -29,8 +29,7 @@
     - node: frame_cable
       entity: DisposalMachineFrame
       actions:
-        - !type:SpriteStateChange
+      - !type:AppearanceChange
-          state: "frame_cables"
       edges:
         - to: frame
           completed:
@@ -48,8 +47,7 @@
     - node: frame_electronics
       entity: DisposalMachineFrame
       actions:
-        - !type:SpriteStateChange
+      - !type:AppearanceChange
-          state: "frame_electronics"
       edges:
         - to: frame_cable
           completed:
@@ -75,8 +73,7 @@
     - node: frame_unit
       entity: DisposalMachineFrame
       actions:
-        - !type:SpriteStateChange
+      - !type:AppearanceChange
-          state: "frame_unit"
       edges:
         - to: frame_inlet
           steps:
@@ -106,8 +103,7 @@
     - node: frame_mailing
       entity: DisposalMachineFrame
       actions:
-        - !type:SpriteStateChange
+      - !type:AppearanceChange
-          state: "frame_unit"
       edges:
         - to: frame_electronics
           steps:
@@ -137,8 +133,7 @@
     - node: frame_inlet
       entity: DisposalMachineFrame
       actions:
-        - !type:SpriteStateChange
+      - !type:AppearanceChange
-          state: "frame_inlet"
       edges:
         - to: frame_outlet
           steps:
@@ -168,8 +163,7 @@
     - node: frame_outlet
       entity: DisposalMachineFrame
       actions:
-        - !type:SpriteStateChange
+      - !type:AppearanceChange
-          state: "frame_outlet"
       edges:
         - to: frame_electronics
           steps:

Resources/Prototypes/Recipes/Construction/Graphs/utilities/particle_accelerator.yml

@@ -5,8 +5,7 @@
     - node: start
       entity: ParticleAcceleratorControlBoxUnfinished
       actions:
-        - !type:SpriteStateChange
+      - !type:AppearanceChange
-          state: "box"
       edges:
         - to: wired
           conditions:
@@ -18,8 +17,7 @@
     - node: wired
       entity: ParticleAcceleratorControlBoxUnfinished
       actions:
-        - !type:SpriteStateChange
+      - !type:AppearanceChange
-          state: "boxw"
       edges:
         - to: completed
           conditions:
@@ -57,8 +55,7 @@
     - node: start
       entity: ParticleAcceleratorPowerBoxUnfinished
       actions:
-        - !type:SpriteStateChange
+      - !type:AppearanceChange
-          state: "box"
       edges:
         - to: wired
           conditions:
@@ -70,8 +67,7 @@
     - node: wired
       entity: ParticleAcceleratorPowerBoxUnfinished
       actions:
-        - !type:SpriteStateChange
+      - !type:AppearanceChange
-          state: "boxw"
       edges:
         - to: completed
           conditions:
@@ -109,8 +105,7 @@
     - node: start
       entity: ParticleAcceleratorFuelChamberUnfinished
       actions:
-        - !type:SpriteStateChange
+      - !type:AppearanceChange
-          state: "chamber"
       edges:
         - to: wired
           conditions:
@@ -122,8 +117,7 @@
     - node: wired
       entity: ParticleAcceleratorFuelChamberUnfinished
       actions:
-        - !type:SpriteStateChange
+      - !type:AppearanceChange
-          state: "chamberw"
       edges:
         - to: completed
           conditions:
@@ -160,8 +154,7 @@
     - node: start
       entity: ParticleAcceleratorEndCapUnfinished
       actions:
-        - !type:SpriteStateChange
+      - !type:AppearanceChange
-          state: "cap"
       edges:
         - to: wired
           conditions:
@@ -173,8 +166,7 @@
     - node: wired
       entity: ParticleAcceleratorEndCapUnfinished
       actions:
-        - !type:SpriteStateChange
+      - !type:AppearanceChange
-          state: "capw"
       edges:
         - to: completed
           conditions:
@@ -211,8 +203,7 @@
     - node: start
       entity: ParticleAcceleratorEmitterLeftUnfinished
       actions:
-        - !type:SpriteStateChange
+      - !type:AppearanceChange
-          state: "left"
       edges:
         - to: wired
           conditions:
@@ -224,8 +215,7 @@
     - node: wired
       entity: ParticleAcceleratorEmitterLeftUnfinished
       actions:
-        - !type:SpriteStateChange
+      - !type:AppearanceChange
-          state: "leftw"
       edges:
         - to: completed
           conditions:
@@ -262,8 +252,7 @@
     - node: start
       entity: ParticleAcceleratorEmitterCenterUnfinished
       actions:
-        - !type:SpriteStateChange
+      - !type:AppearanceChange
-          state: "center"
       edges:
         - to: wired
           conditions:
@@ -275,8 +264,7 @@
     - node: wired
       entity: ParticleAcceleratorEmitterCenterUnfinished
       actions:
-        - !type:SpriteStateChange
+      - !type:AppearanceChange
-          state: "centerw"
       edges:
         - to: completed
           conditions:
@@ -313,8 +301,7 @@
     - node: start
       entity: ParticleAcceleratorEmitterRightUnfinished
       actions:
-        - !type:SpriteStateChange
+      - !type:AppearanceChange
-          state: "right"
       edges:
         - to: wired
           conditions:
@@ -326,8 +313,7 @@
     - node: wired
       entity: ParticleAcceleratorEmitterRightUnfinished
       actions:
-        - !type:SpriteStateChange
+      - !type:AppearanceChange
-          state: "rightw"
       edges:
         - to: completed
           conditions:

Resources/Prototypes/Recipes/Construction/Graphs/weapons/modular_grenade.yml

@@ -14,8 +14,7 @@
   - node: emptyCase
     entity: ModularGrenade      
     actions:
-    - !type:SpriteStateChange
+    - !type:AppearanceChange
-      state: empty
     edges:
     - to: wiredCase
       steps:
@@ -34,8 +33,7 @@
   - node: wiredCase
     entity: ModularGrenade      
     actions:
-    - !type:SpriteStateChange
+    - !type:AppearanceChange
-      state: wired
     - !type:PlaySound
       sound: /Audio/Machines/button.ogg
     edges:
@@ -55,8 +53,7 @@
 
   - node: caseWithTrigger
     actions:
-    - !type:SpriteStateChange
+    - !type:AppearanceChange
-      state: no-payload
     - !type:PlaySound
       sound: /Audio/Machines/button.ogg
     edges:
@@ -76,8 +73,7 @@
 
   - node: grenade
     actions:
-    - !type:SpriteStateChange
+    - !type:AppearanceChange
-      state: complete
     - !type:PlaySound
       sound: /Audio/Machines/button.ogg
     - !type:AdminLog

Resources/Textures/Structures/Power/Generation/PA/control_box.rsi/meta.json

@@ -8,10 +8,10 @@
   },
   "states": [
     {
-      "name": "box"
+      "name": "unwired"
     },
     {
-      "name": "boxc",
+      "name": "completed",
       "directions": 4
     },
     {
@@ -41,7 +41,7 @@
       ]
     },
     {
-      "name": "boxw",
+      "name": "wired",
       "directions": 4
     }
   ]

Resources/Textures/Structures/Power/Generation/PA/emitter_center.rsi/meta.json

@@ -8,11 +8,11 @@
   },
   "states": [
     {
-      "name": "center",
+      "name": "unwired",
       "directions": 4
     },
     {
-      "name": "centerc",
+      "name": "completed",
       "directions": 4
     },
     {
@@ -36,7 +36,7 @@
       "directions": 4
     },
     {
-      "name": "centerw",
+      "name": "wired",
       "directions": 4
     }
   ]

Resources/Textures/Structures/Power/Generation/PA/emitter_left.rsi/meta.json

@@ -8,11 +8,11 @@
   },
   "states": [
     {
-      "name": "left",
+      "name": "unwired",
       "directions": 4
     },
     {
-      "name": "leftc",
+      "name": "completed",
       "directions": 4
     },
     {
@@ -36,7 +36,7 @@
       "directions": 4
     },
     {
-      "name": "leftw",
+      "name": "wired",
       "directions": 4
     }
   ]

Resources/Textures/Structures/Power/Generation/PA/emitter_right.rsi/meta.json

@@ -8,11 +8,11 @@
   },
   "states": [
     {
-      "name": "right",
+      "name": "unwired",
       "directions": 4
     },
     {
-      "name": "rightc",
+      "name": "completed",
       "directions": 4
     },
     {
@@ -36,7 +36,7 @@
       "directions": 4
     },
     {
-      "name": "rightw",
+      "name": "wired",
       "directions": 4
     }
   ]

Resources/Textures/Structures/Power/Generation/PA/end_cap.rsi/meta.json

@@ -8,15 +8,15 @@
   },
   "states": [
     {
-      "name": "cap",
+      "name": "unwired",
       "directions": 4
     },
     {
-      "name": "capc",
+      "name": "completed",
       "directions": 4
     },
     {
-      "name": "capw",
+      "name": "wired",
       "directions": 4
     }
   ]

Resources/Textures/Structures/Power/Generation/PA/fuel_chamber.rsi/meta.json

@@ -8,11 +8,11 @@
   },
   "states": [
     {
-      "name": "chamber",
+      "name": "unwired",
       "directions": 4
     },
     {
-      "name": "chamberc",
+      "name": "completed",
       "directions": 4
     },
     {
@@ -36,7 +36,7 @@
       "directions": 4
     },
     {
-      "name": "chamberw",
+      "name": "wired",
       "directions": 4
     }
   ]

Resources/Textures/Structures/Power/Generation/PA/power_box.rsi/meta.json

@@ -8,11 +8,11 @@
   },
   "states": [
     {
-      "name": "box",
+      "name": "unwired",
       "directions": 4
     },
     {
-      "name": "boxc",
+      "name": "completed",
       "directions": 4
     },
     {
@@ -36,7 +36,7 @@
       "directions": 4
     },
     {
-      "name": "boxw",
+      "name": "wired",
       "directions": 4
     }
   ]