Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix air devices ignoring settings after power cycle #34887

Open
wants to merge 8 commits into
base: master
Choose a base branch
from
Open

Fix air devices ignoring settings after power cycle #34887

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
a47e7d8
add powered variable to vent components
VerinSenpai Feb 5, 2025
2e066e6
add checks for powered to vent systems
VerinSenpai Feb 5, 2025
d1ffc42
removed powered from components
VerinSenpai Feb 5, 2025
d258a5b
Use ApcPowerReceieverComponent for power state.
VerinSenpai Feb 5, 2025
b086908
removed unneeded code from OnPowerChanged
VerinSenpai Feb 5, 2025
cdcfa9a
Merge branch 'space-wizards:master' into fix-air-devices-ignoring-set…
VerinSenpai Feb 5, 2025
1c5ff93
document what enabled is used for in components
VerinSenpai Feb 6, 2025
254fbf1
Merge branch 'master' into fix-air-devices-ignoring-settings-after-po…
VerinSenpai Feb 6, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion Content.Server/Atmos/Piping/Unary/Components/GasVentPumpComponent.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,11 @@ namespace Content.Server.Atmos.Piping.Unary.Components
[RegisterComponent]
public sealed partial class GasVentPumpComponent : Component
{
[DataField]
public bool Powered { get; set; } = false;

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Use the power components please.

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

pretend I'm stupid. don't suppose theres an example of this >.>

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm running myself ragged trying to find an existing powered component. The only thing I'm seeing that has a powered variable is ApcPowerReceiverComponent. Is that what you're referring to? I also noticed that the particle accelerator is enabling/disabling power in a similar manner.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I believe for the most part you can do a trycomp to check power like so.

TryComp<ApcPowerReceiverComponent>(uid, out var power) && power.Powered

You can see an example in GasPressurePumpSystem, where we check if the device is not powered, if so we stop making sound and return early.

private void OnPumpUpdated(EntityUid uid, GasPressurePumpComponent pump, ref AtmosDeviceUpdateEvent args)
    {
        if (!pump.Enabled
            || (TryComp<ApcPowerReceiverComponent>(uid, out var power) && !power.Powered)
            || !_nodeContainer.TryGetNodes(uid, pump.InletName, pump.OutletName, out PipeNode? inlet, out PipeNode? outlet))
        {
            _ambientSoundSystem.SetAmbience(uid, false);
            return;
        }

Here's an example for checking if a scrubber is powered:

            else if (!scrubber.Enabled || TryComp<ApcPowerReceiverComponent>(uid, out var power) && !power.Powered)
            {
                _ambientSoundSystem.SetAmbience(uid, false);
                _appearance.SetData(uid, ScrubberVisuals.State, ScrubberState.Off, appearance);
            }

That might work. Feel free to shoot me if it doesn't sloth (godo)

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I thought it may be something along those lines but thought that may be a bit bloated. I'll write it up and give it a shot. Thanks Roomba.

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think I've got it right? Do I have to use an if statement for the trycomp in OnPowerChanged? That bugs me a tad.

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ignore that last message, we're no longer setting anything but the visual state in OnPowerChange.

[ViewVariables(VVAccess.ReadWrite)]
public bool Enabled { get; set; } = false;
public bool Enabled { get; set; } = true;
Partmedia marked this conversation as resolved.
Show resolved Hide resolved

[ViewVariables]
public bool IsDirty { get; set; } = false;
Expand Down
5 changes: 4 additions & 1 deletion Content.Server/Atmos/Piping/Unary/Components/GasVentScrubberComponent.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,10 @@ namespace Content.Server.Atmos.Piping.Unary.Components
public sealed partial class GasVentScrubberComponent : Component
{
[DataField]
public bool Enabled { get; set; } = false;
public bool Powered { get; set; } = false;

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

As above.

[DataField]
public bool Enabled { get; set; } = true;
Partmedia marked this conversation as resolved.
Show resolved Hide resolved

[DataField]
public bool IsDirty { get; set; } = false;
Expand Down
7 changes: 5 additions & 2 deletions Content.Server/Atmos/Piping/Unary/EntitySystems/GasVentPumpSystem.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,9 @@ private void OnGasVentPumpUpdated(EntityUid uid, GasVentPumpComponent vent, ref
_ => throw new ArgumentOutOfRangeException()
};

if (!vent.Powered)
return;

if (!vent.Enabled || !_nodeContainer.TryGetNode(uid, nodeName, out PipeNode? pipe))
{
return;
Expand Down Expand Up @@ -207,7 +210,7 @@ private void OnAtmosAlarm(EntityUid uid, GasVentPumpComponent component, AtmosAl

private void OnPowerChanged(EntityUid uid, GasVentPumpComponent component, ref PowerChangedEvent args)
{
component.Enabled = args.Powered;
component.Powered = args.Powered;
UpdateState(uid, component);
}

Expand Down Expand Up @@ -277,7 +280,7 @@ private void UpdateState(EntityUid uid, GasVentPumpComponent vent, AppearanceCom
_ambientSoundSystem.SetAmbience(uid, false);
_appearance.SetData(uid, VentPumpVisuals.State, VentPumpState.Welded, appearance);
}
else if (!vent.Enabled)
else if (!vent.Enabled || !vent.Powered)
{
_ambientSoundSystem.SetAmbience(uid, false);
_appearance.SetData(uid, VentPumpVisuals.State, VentPumpState.Off, appearance);
Expand Down
7 changes: 5 additions & 2 deletions Content.Server/Atmos/Piping/Unary/EntitySystems/GasVentScrubberSystem.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,9 @@ private void OnVentScrubberUpdated(EntityUid uid, GasVentScrubberComponent scrub

var timeDelta = args.dt;

if (!scrubber.Powered)
return;

if (!scrubber.Enabled || !_nodeContainer.TryGetNode(uid, scrubber.OutletName, out PipeNode? outlet))
return;

Expand Down Expand Up @@ -138,7 +141,7 @@ private void OnAtmosAlarm(EntityUid uid, GasVentScrubberComponent component, Atm

private void OnPowerChanged(EntityUid uid, GasVentScrubberComponent component, ref PowerChangedEvent args)
{
component.Enabled = args.Powered;
component.Powered = args.Powered;
UpdateState(uid, component);
}

Expand Down Expand Up @@ -185,7 +188,7 @@ private void UpdateState(EntityUid uid, GasVentScrubberComponent scrubber,
_ambientSoundSystem.SetAmbience(uid, false);
_appearance.SetData(uid, ScrubberVisuals.State, ScrubberState.Welded, appearance);
}
else if (!scrubber.Enabled)
else if (!scrubber.Powered || !scrubber.Enabled)
{
_ambientSoundSystem.SetAmbience(uid, false);
_appearance.SetData(uid, ScrubberVisuals.State, ScrubberState.Off, appearance);
Expand Down
Loading