From b45bc4ae4a091088012f660afc9f2d6186a22d79 Mon Sep 17 00:00:00 2001 From: Leon Friedrich <60421075+ElectroJr@users.noreply.github.com> Date: Sun, 30 Apr 2023 09:04:31 +1200 Subject: [PATCH] Replace `SpriteStateChange` construction action with `AppearanceChange` (#15914) --- ...ParticleAcceleratorPartVisualizerSystem.cs | 11 ++- .../UI/ParticleAcceleratorControlMenu.cs | 22 +++--- .../Completions/AppearanceChange.cs | 42 +++++++++++ .../Completions/SpriteStateChange.cs | 26 ------- .../Construction/ConstructionSystem.Graph.cs | 17 +++++ .../Construction/ConstructionGraphNode.cs | 4 +- Content.Shared/Construction/Enums.cs | 11 +++ .../Catalog/Cargo/cargo_engines.yml | 2 +- .../Objects/Weapons/Throwable/grenades.yml | 12 ++- .../Structures/Doors/Firelocks/frame.yml | 13 +++- .../Computers/base_structurecomputers.yml | 2 +- .../Structures/Machines/Computers/frame.yml | 31 ++++++-- .../Disposal/high_pressure_machine_frame.yml | 15 +++- .../PA/base_particleaccelerator.yml | 41 ++++++++++ .../Power/Generation/PA/control_box.yml | 12 +-- .../Power/Generation/PA/emitter.yml | 71 ++---------------- .../Power/Generation/PA/end_cap.yml | 17 ++--- .../Power/Generation/PA/fuel_chamber.yml | 23 +----- .../Power/Generation/PA/power_box.yml | 24 +----- .../Structures/Wallmounts/air_alarm.yml | 11 ++- .../Structures/Wallmounts/fire_alarm.yml | 11 ++- .../Construction/Graphs/machines/computer.yml | 17 ++--- .../Graphs/structures/airlock.yml | 2 - .../Graphs/structures/firelock.yml | 12 +-- .../Graphs/structures/shuttle.yml | 2 - .../Graphs/utilities/air_alarms.yml | 12 +-- .../Graphs/utilities/air_sensor.yml | 3 - .../Graphs/utilities/disposal_machines.yml | 18 ++--- .../Graphs/utilities/particle_accelerator.yml | 42 ++++------- .../Graphs/weapons/modular_grenade.yml | 12 +-- .../{boxc.png => completed.png} | Bin .../Generation/PA/control_box.rsi/meta.json | 6 +- .../control_box.rsi/{box.png => unwired.png} | Bin .../control_box.rsi/{boxw.png => wired.png} | Bin .../{centerc.png => completed.png} | Bin .../PA/emitter_center.rsi/meta.json | 6 +- .../{center.png => unwired.png} | Bin .../{centerw.png => wired.png} | Bin .../{leftc.png => completed.png} | Bin .../Generation/PA/emitter_left.rsi/meta.json | 6 +- .../{left.png => unwired.png} | Bin .../emitter_left.rsi/{leftw.png => wired.png} | Bin .../{rightc.png => completed.png} | Bin .../Generation/PA/emitter_right.rsi/meta.json | 6 +- .../{right.png => unwired.png} | Bin .../{rightw.png => wired.png} | Bin .../end_cap.rsi/{capc.png => completed.png} | Bin .../Power/Generation/PA/end_cap.rsi/meta.json | 6 +- .../PA/end_cap.rsi/{cap.png => unwired.png} | Bin .../PA/end_cap.rsi/{capw.png => wired.png} | Bin .../{chamberc.png => completed.png} | Bin .../Generation/PA/fuel_chamber.rsi/meta.json | 6 +- .../{chamber.png => unwired.png} | Bin .../{chamberw.png => wired.png} | Bin .../power_box.rsi/{boxc.png => completed.png} | Bin .../Generation/PA/power_box.rsi/meta.json | 6 +- .../PA/power_box.rsi/{box.png => unwired.png} | Bin .../PA/power_box.rsi/{boxw.png => wired.png} | Bin 58 files changed, 293 insertions(+), 287 deletions(-) create mode 100644 Content.Server/Construction/Completions/AppearanceChange.cs delete mode 100644 Content.Server/Construction/Completions/SpriteStateChange.cs create mode 100644 Content.Shared/Construction/Enums.cs rename Resources/Textures/Structures/Power/Generation/PA/control_box.rsi/{boxc.png => completed.png} (100%) rename Resources/Textures/Structures/Power/Generation/PA/control_box.rsi/{box.png => unwired.png} (100%) rename Resources/Textures/Structures/Power/Generation/PA/control_box.rsi/{boxw.png => wired.png} (100%) rename Resources/Textures/Structures/Power/Generation/PA/emitter_center.rsi/{centerc.png => completed.png} (100%) rename Resources/Textures/Structures/Power/Generation/PA/emitter_center.rsi/{center.png => unwired.png} (100%) rename Resources/Textures/Structures/Power/Generation/PA/emitter_center.rsi/{centerw.png => wired.png} (100%) rename Resources/Textures/Structures/Power/Generation/PA/emitter_left.rsi/{leftc.png => completed.png} (100%) rename Resources/Textures/Structures/Power/Generation/PA/emitter_left.rsi/{left.png => unwired.png} (100%) rename Resources/Textures/Structures/Power/Generation/PA/emitter_left.rsi/{leftw.png => wired.png} (100%) rename Resources/Textures/Structures/Power/Generation/PA/emitter_right.rsi/{rightc.png => completed.png} (100%) rename Resources/Textures/Structures/Power/Generation/PA/emitter_right.rsi/{right.png => unwired.png} (100%) rename Resources/Textures/Structures/Power/Generation/PA/emitter_right.rsi/{rightw.png => wired.png} (100%) rename Resources/Textures/Structures/Power/Generation/PA/end_cap.rsi/{capc.png => completed.png} (100%) rename Resources/Textures/Structures/Power/Generation/PA/end_cap.rsi/{cap.png => unwired.png} (100%) rename Resources/Textures/Structures/Power/Generation/PA/end_cap.rsi/{capw.png => wired.png} (100%) rename Resources/Textures/Structures/Power/Generation/PA/fuel_chamber.rsi/{chamberc.png => completed.png} (100%) rename Resources/Textures/Structures/Power/Generation/PA/fuel_chamber.rsi/{chamber.png => unwired.png} (100%) rename Resources/Textures/Structures/Power/Generation/PA/fuel_chamber.rsi/{chamberw.png => wired.png} (100%) rename Resources/Textures/Structures/Power/Generation/PA/power_box.rsi/{boxc.png => completed.png} (100%) rename Resources/Textures/Structures/Power/Generation/PA/power_box.rsi/{box.png => unwired.png} (100%) rename Resources/Textures/Structures/Power/Generation/PA/power_box.rsi/{boxw.png => wired.png} (100%) diff --git a/Content.Client/ParticleAccelerator/ParticleAcceleratorPartVisualizerSystem.cs b/Content.Client/ParticleAccelerator/ParticleAcceleratorPartVisualizerSystem.cs index 254dc87ffb..bcfcc64e21 100644 --- a/Content.Client/ParticleAccelerator/ParticleAcceleratorPartVisualizerSystem.cs +++ b/Content.Client/ParticleAccelerator/ParticleAcceleratorPartVisualizerSystem.cs @@ -10,7 +10,10 @@ public sealed class ParticleAcceleratorPartVisualizerSystem : VisualizerSystem

(uid, ParticleAcceleratorVisuals.VisualState, out var state, args.Component)) { state = ParticleAcceleratorVisualState.Unpowered; @@ -18,12 +21,12 @@ public sealed class ParticleAcceleratorPartVisualizerSystem : VisualizerSystem

($"/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; } diff --git a/Content.Server/Construction/Completions/AppearanceChange.cs b/Content.Server/Construction/Completions/AppearanceChange.cs new file mode 100644 index 0000000000..4b05281165 --- /dev/null +++ b/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 +{ + ///

+ /// The appearance key to use. + /// + [DataField("key")] + public Enum Key = ConstructionVisuals.Key; + + /// + /// 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. + /// + [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().SetData(uid, Key, Data, appearance); + return; + } + + var (node, edge) = entityManager.System().GetCurrentNodeAndEdge(uid); + var nodeName = edge?.Target ?? node?.Name; + + if (nodeName != null) + entityManager.System().SetData(uid, Key, nodeName, appearance); + } +} diff --git a/Content.Server/Construction/Completions/SpriteStateChange.cs b/Content.Server/Construction/Completions/SpriteStateChange.cs deleted file mode 100644 index f15fd8be13..0000000000 --- a/Content.Server/Construction/Completions/SpriteStateChange.cs +++ /dev/null @@ -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); - } - } -} diff --git a/Content.Server/Construction/ConstructionSystem.Graph.cs b/Content.Server/Construction/ConstructionSystem.Graph.cs index b2be31d836..79a7c5e39c 100644 --- a/Content.Server/Construction/ConstructionSystem.Graph.cs +++ b/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); } + /// + /// Variant of that returns both the node and edge. + /// + 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)); + } + /// /// Gets the construction graph step the entity is currently at, or null. /// diff --git a/Content.Shared/Construction/ConstructionGraphNode.cs b/Content.Shared/Construction/ConstructionGraphNode.cs index c72031cffb..eab54f8a22 100644 --- a/Content.Shared/Construction/ConstructionGraphNode.cs +++ b/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 Actions => _actions; - [DataField("entity")] + [DataField("entity", customTypeSerializer:typeof(PrototypeIdSerializer))] public string? Entity { get; private set; } public ConstructionGraphEdge? GetEdge(string target) diff --git a/Content.Shared/Construction/Enums.cs b/Content.Shared/Construction/Enums.cs new file mode 100644 index 0000000000..0eb949aa50 --- /dev/null +++ b/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, +} diff --git a/Resources/Prototypes/Catalog/Cargo/cargo_engines.yml b/Resources/Prototypes/Catalog/Cargo/cargo_engines.yml index eac6dfcc9b..bdbfd53333 100644 --- a/Resources/Prototypes/Catalog/Cargo/cargo_engines.yml +++ b/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 diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Throwable/grenades.yml b/Resources/Prototypes/Entities/Objects/Weapons/Throwable/grenades.yml index 9a511b5db9..fe469e79c3 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Throwable/grenades.yml +++ b/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 diff --git a/Resources/Prototypes/Entities/Structures/Doors/Firelocks/frame.yml b/Resources/Prototypes/Entities/Structures/Doors/Firelocks/frame.yml index c6a5795070..516fbb4ade 100644 --- a/Resources/Prototypes/Entities/Structures/Doors/Firelocks/frame.yml +++ b/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 diff --git a/Resources/Prototypes/Entities/Structures/Machines/Computers/base_structurecomputers.yml b/Resources/Prototypes/Entities/Structures/Machines/Computers/base_structurecomputers.yml index 6d90c0f2b8..6e5233e625 100644 --- a/Resources/Prototypes/Entities/Structures/Machines/Computers/base_structurecomputers.yml +++ b/Resources/Prototypes/Entities/Structures/Machines/Computers/base_structurecomputers.yml @@ -1,5 +1,5 @@ - type: entity - parent: ComputerFrame + parent: BaseStructureComputer id: BaseComputer name: computer placement: diff --git a/Resources/Prototypes/Entities/Structures/Machines/Computers/frame.yml b/Resources/Prototypes/Entities/Structures/Machines/Computers/frame.yml index b0b2c0ebae..729e06880b 100644 --- a/Resources/Prototypes/Entities/Structures/Machines/Computers/frame.yml +++ b/Resources/Prototypes/Entities/Structures/Machines/Computers/frame.yml @@ -1,8 +1,7 @@ - type: entity - id: ComputerFrame + id: BaseStructureComputer parent: BaseStructure - name: computer frame - description: A computer under construction. + abstract: true 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. diff --git a/Resources/Prototypes/Entities/Structures/Piping/Disposal/high_pressure_machine_frame.yml b/Resources/Prototypes/Entities/Structures/Piping/Disposal/high_pressure_machine_frame.yml index 3d3d6dd16d..f5a94e5cb0 100644 --- a/Resources/Prototypes/Entities/Structures/Piping/Disposal/high_pressure_machine_frame.yml +++ b/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 } diff --git a/Resources/Prototypes/Entities/Structures/Power/Generation/PA/base_particleaccelerator.yml b/Resources/Prototypes/Entities/Structures/Power/Generation/PA/base_particleaccelerator.yml index 034185b18d..aa668fdbbc 100644 --- a/Resources/Prototypes/Entities/Structures/Power/Generation/PA/base_particleaccelerator.yml +++ b/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 diff --git a/Resources/Prototypes/Entities/Structures/Power/Generation/PA/control_box.yml b/Resources/Prototypes/Entities/Structures/Power/Generation/PA/control_box.yml index de0f223933..3aa3393390 100644 --- a/Resources/Prototypes/Entities/Structures/Power/Generation/PA/control_box.yml +++ b/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 ] diff --git a/Resources/Prototypes/Entities/Structures/Power/Generation/PA/emitter.yml b/Resources/Prototypes/Entities/Structures/Power/Generation/PA/emitter.yml index df862ec265..331341adfe 100644 --- a/Resources/Prototypes/Entities/Structures/Power/Generation/PA/emitter.yml +++ b/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 ] diff --git a/Resources/Prototypes/Entities/Structures/Power/Generation/PA/end_cap.yml b/Resources/Prototypes/Entities/Structures/Power/Generation/PA/end_cap.yml index 3622206d7d..676b95b2cc 100644 --- a/Resources/Prototypes/Entities/Structures/Power/Generation/PA/end_cap.yml +++ b/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 - - type: ParticleAcceleratorPart + layers: + - 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 ] diff --git a/Resources/Prototypes/Entities/Structures/Power/Generation/PA/fuel_chamber.yml b/Resources/Prototypes/Entities/Structures/Power/Generation/PA/fuel_chamber.yml index acd3551a7d..63661830c4 100644 --- a/Resources/Prototypes/Entities/Structures/Power/Generation/PA/fuel_chamber.yml +++ b/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 ] diff --git a/Resources/Prototypes/Entities/Structures/Power/Generation/PA/power_box.yml b/Resources/Prototypes/Entities/Structures/Power/Generation/PA/power_box.yml index 669fbdf664..cf98367287 100644 --- a/Resources/Prototypes/Entities/Structures/Power/Generation/PA/power_box.yml +++ b/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 ] + diff --git a/Resources/Prototypes/Entities/Structures/Wallmounts/air_alarm.yml b/Resources/Prototypes/Entities/Structures/Wallmounts/air_alarm.yml index ffa091e288..6c9bf80eff 100644 --- a/Resources/Prototypes/Entities/Structures/Wallmounts/air_alarm.yml +++ b/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 diff --git a/Resources/Prototypes/Entities/Structures/Wallmounts/fire_alarm.yml b/Resources/Prototypes/Entities/Structures/Wallmounts/fire_alarm.yml index 6898037448..03c4d7264c 100644 --- a/Resources/Prototypes/Entities/Structures/Wallmounts/fire_alarm.yml +++ b/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 diff --git a/Resources/Prototypes/Recipes/Construction/Graphs/machines/computer.yml b/Resources/Prototypes/Recipes/Construction/Graphs/machines/computer.yml index 611da0a753..9a05f3daf0 100644 --- a/Resources/Prototypes/Recipes/Construction/Graphs/machines/computer.yml +++ b/Resources/Prototypes/Recipes/Construction/Graphs/machines/computer.yml @@ -14,8 +14,7 @@ - node: frameUnsecured actions: - - !type:SpriteStateChange - state: "0" + - !type:AppearanceChange entity: ComputerFrame edges: - to: boardUnsecured @@ -44,8 +43,7 @@ - node: boardUnsecured actions: - - !type:SpriteStateChange - state: "1" + - !type:AppearanceChange 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 - state: "2" + - !type:AppearanceChange edges: - to: monitorMissing conditions: @@ -85,8 +80,7 @@ entity: ComputerFrame actions: - !type:SetAnchor { } - - !type:SpriteStateChange - state: "3" + - !type:AppearanceChange edges: - to: monitorUnsecured conditions: @@ -107,8 +101,7 @@ - node: monitorUnsecured actions: - - !type:SpriteStateChange - state: "4" + - !type:AppearanceChange entity: ComputerFrame edges: - to: computer diff --git a/Resources/Prototypes/Recipes/Construction/Graphs/structures/airlock.yml b/Resources/Prototypes/Recipes/Construction/Graphs/structures/airlock.yml index 949006ba63..853c86f48e 100644 --- a/Resources/Prototypes/Recipes/Construction/Graphs/structures/airlock.yml +++ b/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: diff --git a/Resources/Prototypes/Recipes/Construction/Graphs/structures/firelock.yml b/Resources/Prototypes/Recipes/Construction/Graphs/structures/firelock.yml index 40f09e947a..9d5b2945a6 100644 --- a/Resources/Prototypes/Recipes/Construction/Graphs/structures/firelock.yml +++ b/Resources/Prototypes/Recipes/Construction/Graphs/structures/firelock.yml @@ -16,8 +16,7 @@ - node: frame1 entity: FirelockFrame actions: - - !type:SpriteStateChange - state: frame1 + - !type:AppearanceChange edges: - to: frame2 conditions: @@ -42,8 +41,7 @@ - node: frame2 actions: - - !type:SpriteStateChange - state: frame2 + - !type:AppearanceChange edges: - to: frame3 conditions: @@ -71,8 +69,7 @@ - node: frame3 actions: - - !type:SpriteStateChange - state: frame3 + - !type:AppearanceChange edges: - to: frame4 conditions: @@ -94,8 +91,7 @@ - node: frame4 entity: FirelockFrame actions: - - !type:SpriteStateChange - state: frame4 + - !type:AppearanceChange edges: - to: Firelock conditions: diff --git a/Resources/Prototypes/Recipes/Construction/Graphs/structures/shuttle.yml b/Resources/Prototypes/Recipes/Construction/Graphs/structures/shuttle.yml index 99e102d6d2..2af75f6afc 100644 --- a/Resources/Prototypes/Recipes/Construction/Graphs/structures/shuttle.yml +++ b/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: diff --git a/Resources/Prototypes/Recipes/Construction/Graphs/utilities/air_alarms.yml b/Resources/Prototypes/Recipes/Construction/Graphs/utilities/air_alarms.yml index afa20ea2ef..ca5cb5f108 100644 --- a/Resources/Prototypes/Recipes/Construction/Graphs/utilities/air_alarms.yml +++ b/Resources/Prototypes/Recipes/Construction/Graphs/utilities/air_alarms.yml @@ -13,8 +13,7 @@ - node: assembly entity: AirAlarmAssembly actions: - - !type:SpriteStateChange - state: alarm_b1 + - !type:AppearanceChange edges: - to: wired steps: @@ -54,8 +53,7 @@ - node: electronics actions: - - !type:SpriteStateChange - state: alarm_b2 + - !type:AppearanceChange edges: - to: air_alarm steps: @@ -92,8 +90,7 @@ - node: assembly entity: FireAlarmAssembly actions: - - !type:SpriteStateChange - state: fire_b1 + - !type:AppearanceChange edges: - to: wired steps: @@ -133,8 +130,7 @@ - node: electronics actions: - - !type:SpriteStateChange - state: fire_b2 + - !type:AppearanceChange edges: - to: fire_alarm steps: diff --git a/Resources/Prototypes/Recipes/Construction/Graphs/utilities/air_sensor.yml b/Resources/Prototypes/Recipes/Construction/Graphs/utilities/air_sensor.yml index 3e10d1ca5e..c100cbefb4 100644 --- a/Resources/Prototypes/Recipes/Construction/Graphs/utilities/air_sensor.yml +++ b/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: diff --git a/Resources/Prototypes/Recipes/Construction/Graphs/utilities/disposal_machines.yml b/Resources/Prototypes/Recipes/Construction/Graphs/utilities/disposal_machines.yml index c722021e7b..2f15133695 100644 --- a/Resources/Prototypes/Recipes/Construction/Graphs/utilities/disposal_machines.yml +++ b/Resources/Prototypes/Recipes/Construction/Graphs/utilities/disposal_machines.yml @@ -29,8 +29,7 @@ - node: frame_cable entity: DisposalMachineFrame actions: - - !type:SpriteStateChange - state: "frame_cables" + - !type:AppearanceChange edges: - to: frame completed: @@ -48,8 +47,7 @@ - node: frame_electronics entity: DisposalMachineFrame actions: - - !type:SpriteStateChange - state: "frame_electronics" + - !type:AppearanceChange edges: - to: frame_cable completed: @@ -75,8 +73,7 @@ - node: frame_unit entity: DisposalMachineFrame actions: - - !type:SpriteStateChange - state: "frame_unit" + - !type:AppearanceChange edges: - to: frame_inlet steps: @@ -106,8 +103,7 @@ - node: frame_mailing entity: DisposalMachineFrame actions: - - !type:SpriteStateChange - state: "frame_unit" + - !type:AppearanceChange edges: - to: frame_electronics steps: @@ -137,8 +133,7 @@ - node: frame_inlet entity: DisposalMachineFrame actions: - - !type:SpriteStateChange - state: "frame_inlet" + - !type:AppearanceChange edges: - to: frame_outlet steps: @@ -168,8 +163,7 @@ - node: frame_outlet entity: DisposalMachineFrame actions: - - !type:SpriteStateChange - state: "frame_outlet" + - !type:AppearanceChange edges: - to: frame_electronics steps: diff --git a/Resources/Prototypes/Recipes/Construction/Graphs/utilities/particle_accelerator.yml b/Resources/Prototypes/Recipes/Construction/Graphs/utilities/particle_accelerator.yml index 053e7b9d3f..1c8c2e75fc 100644 --- a/Resources/Prototypes/Recipes/Construction/Graphs/utilities/particle_accelerator.yml +++ b/Resources/Prototypes/Recipes/Construction/Graphs/utilities/particle_accelerator.yml @@ -5,8 +5,7 @@ - node: start entity: ParticleAcceleratorControlBoxUnfinished actions: - - !type:SpriteStateChange - state: "box" + - !type:AppearanceChange edges: - to: wired conditions: @@ -18,8 +17,7 @@ - node: wired entity: ParticleAcceleratorControlBoxUnfinished actions: - - !type:SpriteStateChange - state: "boxw" + - !type:AppearanceChange edges: - to: completed conditions: @@ -57,8 +55,7 @@ - node: start entity: ParticleAcceleratorPowerBoxUnfinished actions: - - !type:SpriteStateChange - state: "box" + - !type:AppearanceChange edges: - to: wired conditions: @@ -70,8 +67,7 @@ - node: wired entity: ParticleAcceleratorPowerBoxUnfinished actions: - - !type:SpriteStateChange - state: "boxw" + - !type:AppearanceChange edges: - to: completed conditions: @@ -109,8 +105,7 @@ - node: start entity: ParticleAcceleratorFuelChamberUnfinished actions: - - !type:SpriteStateChange - state: "chamber" + - !type:AppearanceChange edges: - to: wired conditions: @@ -122,8 +117,7 @@ - node: wired entity: ParticleAcceleratorFuelChamberUnfinished actions: - - !type:SpriteStateChange - state: "chamberw" + - !type:AppearanceChange edges: - to: completed conditions: @@ -160,8 +154,7 @@ - node: start entity: ParticleAcceleratorEndCapUnfinished actions: - - !type:SpriteStateChange - state: "cap" + - !type:AppearanceChange edges: - to: wired conditions: @@ -173,8 +166,7 @@ - node: wired entity: ParticleAcceleratorEndCapUnfinished actions: - - !type:SpriteStateChange - state: "capw" + - !type:AppearanceChange edges: - to: completed conditions: @@ -211,8 +203,7 @@ - node: start entity: ParticleAcceleratorEmitterLeftUnfinished actions: - - !type:SpriteStateChange - state: "left" + - !type:AppearanceChange edges: - to: wired conditions: @@ -224,8 +215,7 @@ - node: wired entity: ParticleAcceleratorEmitterLeftUnfinished actions: - - !type:SpriteStateChange - state: "leftw" + - !type:AppearanceChange edges: - to: completed conditions: @@ -262,8 +252,7 @@ - node: start entity: ParticleAcceleratorEmitterCenterUnfinished actions: - - !type:SpriteStateChange - state: "center" + - !type:AppearanceChange edges: - to: wired conditions: @@ -275,8 +264,7 @@ - node: wired entity: ParticleAcceleratorEmitterCenterUnfinished actions: - - !type:SpriteStateChange - state: "centerw" + - !type:AppearanceChange edges: - to: completed conditions: @@ -313,8 +301,7 @@ - node: start entity: ParticleAcceleratorEmitterRightUnfinished actions: - - !type:SpriteStateChange - state: "right" + - !type:AppearanceChange edges: - to: wired conditions: @@ -326,8 +313,7 @@ - node: wired entity: ParticleAcceleratorEmitterRightUnfinished actions: - - !type:SpriteStateChange - state: "rightw" + - !type:AppearanceChange edges: - to: completed conditions: diff --git a/Resources/Prototypes/Recipes/Construction/Graphs/weapons/modular_grenade.yml b/Resources/Prototypes/Recipes/Construction/Graphs/weapons/modular_grenade.yml index 7f93512811..020be4e09c 100644 --- a/Resources/Prototypes/Recipes/Construction/Graphs/weapons/modular_grenade.yml +++ b/Resources/Prototypes/Recipes/Construction/Graphs/weapons/modular_grenade.yml @@ -14,8 +14,7 @@ - node: emptyCase entity: ModularGrenade actions: - - !type:SpriteStateChange - state: empty + - !type:AppearanceChange edges: - to: wiredCase steps: @@ -34,8 +33,7 @@ - node: wiredCase entity: ModularGrenade actions: - - !type:SpriteStateChange - state: wired + - !type:AppearanceChange - !type:PlaySound sound: /Audio/Machines/button.ogg edges: @@ -55,8 +53,7 @@ - node: caseWithTrigger actions: - - !type:SpriteStateChange - state: no-payload + - !type:AppearanceChange - !type:PlaySound sound: /Audio/Machines/button.ogg edges: @@ -76,8 +73,7 @@ - node: grenade actions: - - !type:SpriteStateChange - state: complete + - !type:AppearanceChange - !type:PlaySound sound: /Audio/Machines/button.ogg - !type:AdminLog diff --git a/Resources/Textures/Structures/Power/Generation/PA/control_box.rsi/boxc.png b/Resources/Textures/Structures/Power/Generation/PA/control_box.rsi/completed.png similarity index 100% rename from Resources/Textures/Structures/Power/Generation/PA/control_box.rsi/boxc.png rename to Resources/Textures/Structures/Power/Generation/PA/control_box.rsi/completed.png diff --git a/Resources/Textures/Structures/Power/Generation/PA/control_box.rsi/meta.json b/Resources/Textures/Structures/Power/Generation/PA/control_box.rsi/meta.json index e5444a86fb..407803837f 100644 --- a/Resources/Textures/Structures/Power/Generation/PA/control_box.rsi/meta.json +++ b/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 } ] diff --git a/Resources/Textures/Structures/Power/Generation/PA/control_box.rsi/box.png b/Resources/Textures/Structures/Power/Generation/PA/control_box.rsi/unwired.png similarity index 100% rename from Resources/Textures/Structures/Power/Generation/PA/control_box.rsi/box.png rename to Resources/Textures/Structures/Power/Generation/PA/control_box.rsi/unwired.png diff --git a/Resources/Textures/Structures/Power/Generation/PA/control_box.rsi/boxw.png b/Resources/Textures/Structures/Power/Generation/PA/control_box.rsi/wired.png similarity index 100% rename from Resources/Textures/Structures/Power/Generation/PA/control_box.rsi/boxw.png rename to Resources/Textures/Structures/Power/Generation/PA/control_box.rsi/wired.png diff --git a/Resources/Textures/Structures/Power/Generation/PA/emitter_center.rsi/centerc.png b/Resources/Textures/Structures/Power/Generation/PA/emitter_center.rsi/completed.png similarity index 100% rename from Resources/Textures/Structures/Power/Generation/PA/emitter_center.rsi/centerc.png rename to Resources/Textures/Structures/Power/Generation/PA/emitter_center.rsi/completed.png diff --git a/Resources/Textures/Structures/Power/Generation/PA/emitter_center.rsi/meta.json b/Resources/Textures/Structures/Power/Generation/PA/emitter_center.rsi/meta.json index ded24ca946..b7bbfd98d8 100644 --- a/Resources/Textures/Structures/Power/Generation/PA/emitter_center.rsi/meta.json +++ b/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 } ] diff --git a/Resources/Textures/Structures/Power/Generation/PA/emitter_center.rsi/center.png b/Resources/Textures/Structures/Power/Generation/PA/emitter_center.rsi/unwired.png similarity index 100% rename from Resources/Textures/Structures/Power/Generation/PA/emitter_center.rsi/center.png rename to Resources/Textures/Structures/Power/Generation/PA/emitter_center.rsi/unwired.png diff --git a/Resources/Textures/Structures/Power/Generation/PA/emitter_center.rsi/centerw.png b/Resources/Textures/Structures/Power/Generation/PA/emitter_center.rsi/wired.png similarity index 100% rename from Resources/Textures/Structures/Power/Generation/PA/emitter_center.rsi/centerw.png rename to Resources/Textures/Structures/Power/Generation/PA/emitter_center.rsi/wired.png diff --git a/Resources/Textures/Structures/Power/Generation/PA/emitter_left.rsi/leftc.png b/Resources/Textures/Structures/Power/Generation/PA/emitter_left.rsi/completed.png similarity index 100% rename from Resources/Textures/Structures/Power/Generation/PA/emitter_left.rsi/leftc.png rename to Resources/Textures/Structures/Power/Generation/PA/emitter_left.rsi/completed.png diff --git a/Resources/Textures/Structures/Power/Generation/PA/emitter_left.rsi/meta.json b/Resources/Textures/Structures/Power/Generation/PA/emitter_left.rsi/meta.json index 3f83f9ca74..b7bbfd98d8 100644 --- a/Resources/Textures/Structures/Power/Generation/PA/emitter_left.rsi/meta.json +++ b/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 } ] diff --git a/Resources/Textures/Structures/Power/Generation/PA/emitter_left.rsi/left.png b/Resources/Textures/Structures/Power/Generation/PA/emitter_left.rsi/unwired.png similarity index 100% rename from Resources/Textures/Structures/Power/Generation/PA/emitter_left.rsi/left.png rename to Resources/Textures/Structures/Power/Generation/PA/emitter_left.rsi/unwired.png diff --git a/Resources/Textures/Structures/Power/Generation/PA/emitter_left.rsi/leftw.png b/Resources/Textures/Structures/Power/Generation/PA/emitter_left.rsi/wired.png similarity index 100% rename from Resources/Textures/Structures/Power/Generation/PA/emitter_left.rsi/leftw.png rename to Resources/Textures/Structures/Power/Generation/PA/emitter_left.rsi/wired.png diff --git a/Resources/Textures/Structures/Power/Generation/PA/emitter_right.rsi/rightc.png b/Resources/Textures/Structures/Power/Generation/PA/emitter_right.rsi/completed.png similarity index 100% rename from Resources/Textures/Structures/Power/Generation/PA/emitter_right.rsi/rightc.png rename to Resources/Textures/Structures/Power/Generation/PA/emitter_right.rsi/completed.png diff --git a/Resources/Textures/Structures/Power/Generation/PA/emitter_right.rsi/meta.json b/Resources/Textures/Structures/Power/Generation/PA/emitter_right.rsi/meta.json index 5073217309..b7bbfd98d8 100644 --- a/Resources/Textures/Structures/Power/Generation/PA/emitter_right.rsi/meta.json +++ b/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 } ] diff --git a/Resources/Textures/Structures/Power/Generation/PA/emitter_right.rsi/right.png b/Resources/Textures/Structures/Power/Generation/PA/emitter_right.rsi/unwired.png similarity index 100% rename from Resources/Textures/Structures/Power/Generation/PA/emitter_right.rsi/right.png rename to Resources/Textures/Structures/Power/Generation/PA/emitter_right.rsi/unwired.png diff --git a/Resources/Textures/Structures/Power/Generation/PA/emitter_right.rsi/rightw.png b/Resources/Textures/Structures/Power/Generation/PA/emitter_right.rsi/wired.png similarity index 100% rename from Resources/Textures/Structures/Power/Generation/PA/emitter_right.rsi/rightw.png rename to Resources/Textures/Structures/Power/Generation/PA/emitter_right.rsi/wired.png diff --git a/Resources/Textures/Structures/Power/Generation/PA/end_cap.rsi/capc.png b/Resources/Textures/Structures/Power/Generation/PA/end_cap.rsi/completed.png similarity index 100% rename from Resources/Textures/Structures/Power/Generation/PA/end_cap.rsi/capc.png rename to Resources/Textures/Structures/Power/Generation/PA/end_cap.rsi/completed.png diff --git a/Resources/Textures/Structures/Power/Generation/PA/end_cap.rsi/meta.json b/Resources/Textures/Structures/Power/Generation/PA/end_cap.rsi/meta.json index 985c82d7cf..5a1eccdf3d 100644 --- a/Resources/Textures/Structures/Power/Generation/PA/end_cap.rsi/meta.json +++ b/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 } ] diff --git a/Resources/Textures/Structures/Power/Generation/PA/end_cap.rsi/cap.png b/Resources/Textures/Structures/Power/Generation/PA/end_cap.rsi/unwired.png similarity index 100% rename from Resources/Textures/Structures/Power/Generation/PA/end_cap.rsi/cap.png rename to Resources/Textures/Structures/Power/Generation/PA/end_cap.rsi/unwired.png diff --git a/Resources/Textures/Structures/Power/Generation/PA/end_cap.rsi/capw.png b/Resources/Textures/Structures/Power/Generation/PA/end_cap.rsi/wired.png similarity index 100% rename from Resources/Textures/Structures/Power/Generation/PA/end_cap.rsi/capw.png rename to Resources/Textures/Structures/Power/Generation/PA/end_cap.rsi/wired.png diff --git a/Resources/Textures/Structures/Power/Generation/PA/fuel_chamber.rsi/chamberc.png b/Resources/Textures/Structures/Power/Generation/PA/fuel_chamber.rsi/completed.png similarity index 100% rename from Resources/Textures/Structures/Power/Generation/PA/fuel_chamber.rsi/chamberc.png rename to Resources/Textures/Structures/Power/Generation/PA/fuel_chamber.rsi/completed.png diff --git a/Resources/Textures/Structures/Power/Generation/PA/fuel_chamber.rsi/meta.json b/Resources/Textures/Structures/Power/Generation/PA/fuel_chamber.rsi/meta.json index 7094efe3c2..b7bbfd98d8 100644 --- a/Resources/Textures/Structures/Power/Generation/PA/fuel_chamber.rsi/meta.json +++ b/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 } ] diff --git a/Resources/Textures/Structures/Power/Generation/PA/fuel_chamber.rsi/chamber.png b/Resources/Textures/Structures/Power/Generation/PA/fuel_chamber.rsi/unwired.png similarity index 100% rename from Resources/Textures/Structures/Power/Generation/PA/fuel_chamber.rsi/chamber.png rename to Resources/Textures/Structures/Power/Generation/PA/fuel_chamber.rsi/unwired.png diff --git a/Resources/Textures/Structures/Power/Generation/PA/fuel_chamber.rsi/chamberw.png b/Resources/Textures/Structures/Power/Generation/PA/fuel_chamber.rsi/wired.png similarity index 100% rename from Resources/Textures/Structures/Power/Generation/PA/fuel_chamber.rsi/chamberw.png rename to Resources/Textures/Structures/Power/Generation/PA/fuel_chamber.rsi/wired.png diff --git a/Resources/Textures/Structures/Power/Generation/PA/power_box.rsi/boxc.png b/Resources/Textures/Structures/Power/Generation/PA/power_box.rsi/completed.png similarity index 100% rename from Resources/Textures/Structures/Power/Generation/PA/power_box.rsi/boxc.png rename to Resources/Textures/Structures/Power/Generation/PA/power_box.rsi/completed.png diff --git a/Resources/Textures/Structures/Power/Generation/PA/power_box.rsi/meta.json b/Resources/Textures/Structures/Power/Generation/PA/power_box.rsi/meta.json index 71b1a9415e..b7bbfd98d8 100644 --- a/Resources/Textures/Structures/Power/Generation/PA/power_box.rsi/meta.json +++ b/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 } ] diff --git a/Resources/Textures/Structures/Power/Generation/PA/power_box.rsi/box.png b/Resources/Textures/Structures/Power/Generation/PA/power_box.rsi/unwired.png similarity index 100% rename from Resources/Textures/Structures/Power/Generation/PA/power_box.rsi/box.png rename to Resources/Textures/Structures/Power/Generation/PA/power_box.rsi/unwired.png diff --git a/Resources/Textures/Structures/Power/Generation/PA/power_box.rsi/boxw.png b/Resources/Textures/Structures/Power/Generation/PA/power_box.rsi/wired.png similarity index 100% rename from Resources/Textures/Structures/Power/Generation/PA/power_box.rsi/boxw.png rename to Resources/Textures/Structures/Power/Generation/PA/power_box.rsi/wired.png -- 2.51.2