tommy/tbd-station-14
2
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Make disposal pipes use generic visualizer (#9672)

Browse Source
This commit is contained in:
Leon Friedrich
2022-07-15 04:04:23 +12:00
committed by GitHub
parent a480b2e2fd
commit 9541eeb189
3 changed files with 79 additions and 119 deletions
Download Patch File Download Diff File Expand all files Collapse all files

67
Content.Client/Disposal/Visualizers/DisposalVisualizer.cs
View File

@@ -1,67 +0,0 @@
using System;
using Content.Shared.Disposal.Components;
using Content.Shared.SubFloor;
using JetBrains.Annotations;
using Robust.Client.GameObjects;
using Robust.Shared.GameObjects;
using Robust.Shared.IoC;
using Robust.Shared.Serialization.Manager.Attributes;
namespace Content.Client.Disposal.Visualizers
{
[UsedImplicitly]
public sealed class DisposalVisualizer : AppearanceVisualizer
{
[DataField("state_free")]
private string? _stateFree;
[DataField("state_anchored")]
private string? _stateAnchored;
private void ChangeState(AppearanceComponent appearance)
{
var entities = IoCManager.Resolve<IEntityManager>();
if (!entities.TryGetComponent(appearance.Owner, out ISpriteComponent? sprite))
{
return;
}
if (!appearance.TryGetData(DisposalTubeVisuals.VisualState, out DisposalTubeVisualState state))
{
return;
}
var texture = state switch
{
DisposalTubeVisualState.Free => _stateFree,
DisposalTubeVisualState.Anchored => _stateAnchored,
_ => throw new ArgumentOutOfRangeException()
};
sprite.LayerSetState(0, texture);
if (state == DisposalTubeVisualState.Anchored)
{
appearance.Owner.EnsureComponent<SubFloorHideComponent>();
}
else if (entities.HasComponent<SubFloorHideComponent>(appearance.Owner))
{
entities.RemoveComponent<SubFloorHideComponent>(appearance.Owner);
}
}
public override void InitializeEntity(EntityUid entity)
{
base.InitializeEntity(entity);
var entityManager = IoCManager.Resolve<IEntityManager>();
var appearance = entityManager.EnsureComponent<ClientAppearanceComponent>(entity);
ChangeState(appearance);
}
public override void OnChangeData(AppearanceComponent component)
{
base.OnChangeData(component);
ChangeState(component);
}
}
}

8
Content.Server/Disposal/Tube/Components/DisposalTubeComponent.cs
View File

@@ -26,11 +26,6 @@ namespace Content.Server.Disposal.Tube.Components
[ViewVariables]
public Container Contents { get; private set; } = default!;
[ViewVariables]
private bool Anchored =>
!_entMan.TryGetComponent(Owner, out PhysicsComponent? physics) ||
physics.BodyType == BodyType.Static;
/// <summary>
/// The directions that this tube can connect to others from
/// </summary>
@@ -99,7 +94,8 @@ namespace Content.Server.Disposal.Tube.Components
return;
}
var state = Anchored
// TODO this should just generalized into some anchored-visuals system/comp, this has nothing to do with disposal tubes.
var state = _entMan.GetComponent<TransformComponent>(Owner).Anchored
? DisposalTubeVisualState.Anchored
: DisposalTubeVisualState.Free;

103
Resources/Prototypes/Entities/Structures/Piping/Disposal/pipes.yml
View File

@@ -11,6 +11,7 @@
- type: Sprite
netsync: false
visible: false
- type: Appearance
- type: SubFloorHide
- type: Clickable
- type: InteractionOutline
@@ -67,6 +68,8 @@
- type: Sprite
drawdepth: ThickPipe
sprite: Structures/Piping/disposal.rsi
layers:
- map: [ "pipe" ]
state: pipe-b
- type: Construction
graph: DisposalPipe
@@ -81,13 +84,16 @@
- type: Sprite
drawdepth: ThickPipe
sprite: Structures/Piping/disposal.rsi
layers:
- map: [ "pipe" ]
state: conpipe-s
- type: DisposalTransit
- type: Appearance
- type: GenericVisualizer
visuals:
- type: DisposalVisualizer
state_free: conpipe-s
state_anchored: pipe-s
enum.DisposalTubeVisuals.VisualState:
pipe:
Free: { state: conpipe-s }
Anchored: { state: pipe-s }
- type: Construction
graph: DisposalPipe
node: pipe
@@ -101,13 +107,16 @@
- type: Sprite
drawdepth: ThickPipe
sprite: Structures/Piping/disposal.rsi
layers:
- map: [ "pipe" ]
state: conpipe-tagger
- type: DisposalTagger
- type: Appearance
- type: GenericVisualizer
visuals:
- type: DisposalVisualizer
state_free: conpipe-tagger
state_anchored: pipe-tagger
enum.DisposalTubeVisuals.VisualState:
pipe:
Free: { state: conpipe-tagger }
Anchored: { state: pipe-tagger }
- type: ActivatableUI
key: enum.DisposalTaggerUiKey.Key
- type: UserInterface
@@ -127,13 +136,16 @@
- type: Sprite
drawdepth: ThickPipe
sprite: Structures/Piping/disposal.rsi
layers:
- map: [ "pipe" ]
state: conpipe-t
- type: DisposalEntry
- type: Appearance
- type: GenericVisualizer
visuals:
- type: DisposalVisualizer
state_free: conpipe-t
state_anchored: pipe-t
enum.DisposalTubeVisuals.VisualState:
pipe:
Free: { state: conpipe-t }
Anchored: { state: pipe-t }
- type: Fixtures
fixtures:
- shape:
@@ -154,17 +166,20 @@
- type: Sprite
drawdepth: ThickPipe
sprite: Structures/Piping/disposal.rsi
layers:
- map: [ "pipe" ]
state: conpipe-j1s
- type: DisposalRouter
degrees:
- 0
- -90
- 180
- type: Appearance
- type: GenericVisualizer
visuals:
- type: DisposalVisualizer
state_free: conpipe-j1s
state_anchored: pipe-j1s
enum.DisposalTubeVisuals.VisualState:
pipe:
Free: { state: conpipe-j1s }
Anchored: { state: pipe-j1s }
- type: Flippable
mirrorEntity: DisposalRouterFlipped
- type: ActivatableUI
@@ -192,17 +207,20 @@
- type: Sprite
drawdepth: ThickPipe
sprite: Structures/Piping/disposal.rsi
layers:
- map: [ "pipe" ]
state: conpipe-j2s
- type: DisposalRouter
degrees:
- 0
- 90
- 180
- type: Appearance
- type: GenericVisualizer
visuals:
- type: DisposalVisualizer
state_free: conpipe-j2s
state_anchored: pipe-j2s
enum.DisposalTubeVisuals.VisualState:
pipe:
Free: { state: conpipe-j2s }
Anchored: { state: pipe-j2s }
- type: Flippable
mirrorEntity: DisposalRouter
- type: Fixtures
@@ -222,17 +240,21 @@
- type: Sprite
drawdepth: ThickPipe
sprite: Structures/Piping/disposal.rsi
layers:
- map: [ "pipe" ]
state: conpipe-j1
visible: true
- type: DisposalJunction
degrees:
- 0
- -90
- 180
- type: Appearance
- type: GenericVisualizer
visuals:
- type: DisposalVisualizer
state_free: conpipe-j1
state_anchored: pipe-j1
enum.DisposalTubeVisuals.VisualState:
pipe:
Free: { state: conpipe-j1 }
Anchored: { state: pipe-j1 }
- type: Flippable
mirrorEntity: DisposalJunctionFlipped
- type: Fixtures
@@ -254,17 +276,20 @@
- type: Sprite
drawdepth: ThickPipe
sprite: Structures/Piping/disposal.rsi
layers:
- map: [ "pipe" ]
state: conpipe-j2
- type: DisposalJunction
degrees:
- 0
- 90
- 180
- type: Appearance
- type: GenericVisualizer
visuals:
- type: DisposalVisualizer
state_free: conpipe-j2
state_anchored: pipe-j2
enum.DisposalTubeVisuals.VisualState:
pipe:
Free: { state: conpipe-j2 }
Anchored: { state: pipe-j2 }
- type: Flippable
mirrorEntity: DisposalJunction
- type: Fixtures
@@ -284,17 +309,20 @@
- type: Sprite
drawdepth: ThickPipe
sprite: Structures/Piping/disposal.rsi
layers:
- map: [ "pipe" ]
state: conpipe-y
- type: DisposalJunction
degrees:
- 0
- 90
- -90
- type: Appearance
- type: GenericVisualizer
visuals:
- type: DisposalVisualizer
state_free: conpipe-y
state_anchored: pipe-y
enum.DisposalTubeVisuals.VisualState:
pipe:
Free: { state: conpipe-y }
Anchored: { state: pipe-y }
- type: Fixtures
fixtures:
- shape:
@@ -315,13 +343,16 @@
- type: Sprite
drawdepth: ThickPipe
sprite: Structures/Piping/disposal.rsi
layers:
- map: [ "pipe" ]
state: conpipe-c
- type: DisposalBend
- type: Appearance
- type: GenericVisualizer
visuals:
- type: DisposalVisualizer
state_free: conpipe-c
state_anchored: pipe-c
enum.DisposalTubeVisuals.VisualState:
pipe:
Free: { state: conpipe-c }
Anchored: { state: pipe-c }
- type: Fixtures
fixtures:
- shape: