Cinka/OldThink
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Atmos pipe rework (#3833)

Browse Source 
* Initial

* Cleanup a bunch of things

* some changes dunno

* RequireAnchored

* a

* stuff

* more work

* Lots of progress

* delete pipe visualizer

* a

* b

* pipenet and pipenode cleanup

* Fixes

* Adds GasValve

* Adds GasMiner

* Fix stuff, maybe?

* More fixes

* Ignored components on the client

* Adds thermomachine behavior, change a bunch of stuff

* Remove Anchored

* some work, but it's shitcode

* significantly more ECS

* ECS AtmosDevices

* Cleanup

* fix appearance

* when the pipe direction is sus

* Gas tanks and canisters

* pipe anchoring and stuff

* coding is my passion

* Unsafe pipes take longer to unanchor

* turns out we're no longer using eris canisters

* Gas canister inserted tank appearance, improvements

* Work on a bunch of appearances

* Scrubber appearance

* Reorganize AtmosphereSystem.Piping into a bunch of different systems

* Appearance for vent/scrubber/pump turns off when leaving atmosphere

* ThermoMachine appearance

* Cleanup gas tanks

* Remove passive gate unused imports

* remove old canister UI functionality

* PipeNode environment air, make everything use AssumeAir instead of merging manually

* a

* Reorganize atmos to follow new structure

* ?????

* Canister UI, restructure client

* Restructure shared

* Fix build tho

* listen, at least the canister UI works entirely...

* fix build : )

* Atmos device prototypes have names and descriptions

* gas canister ui slider doesn't jitter

* trinary prototypes

* sprite for miners

* ignore components

* fix YAML

* Fix port system doing useless thing

* Fix build

* fix thinking moment

* fix build again because

* canister direction

* pipenode is a word

* GasTank Air will throw on invalid states

* fix build....

* Unhardcode volume pump thresholds

* Volume pump and filter take time into account

* Rename Join/Leave atmosphere events to AtmosDeviceEnabled/Disabled Event

* Gas tank node volume is set by initial mixtuer

* I love node container
This commit is contained in:
Vera Aguilera Puerto
2021-06-19 13:25:05 +02:00
committed by GitHub
parent cfc3f2e7fc
commit a2b737d945
250 changed files with 3964 additions and 3163 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
Content.Server/Atmos/Piping/Unary/Components/GasOutletInjectorComponent.cs Normal file
View File

@@ -0,0 +1,26 @@
using Robust.Shared.GameObjects;
using Robust.Shared.Serialization.Manager.Attributes;
using Robust.Shared.ViewVariables;
namespace Content.Server.Atmos.Piping.Unary.Components
{
[RegisterComponent]
public class GasOutletInjectorComponent : Component
{
public override string Name => "GasOutletInjector";
[ViewVariables(VVAccess.ReadWrite)]
public bool Enabled { get; set; } = true;
[ViewVariables(VVAccess.ReadWrite)]
public bool Injecting { get; set; } = false;
[ViewVariables(VVAccess.ReadWrite)]
public float VolumeRate { get; set; } = 50f;
[DataField("inlet")]
public string InletName { get; set; } = "pipe";
// TODO ATMOS: Inject method.
}
}

14
Content.Server/Atmos/Piping/Unary/Components/GasPassiveVentComponent.cs Normal file
View File

@@ -0,0 +1,14 @@
using Robust.Shared.GameObjects;
using Robust.Shared.Serialization.Manager.Attributes;
namespace Content.Server.Atmos.Piping.Unary.Components
{
[RegisterComponent]
public class GasPassiveVentComponent : Component
{
public override string Name => "GasPassiveVent";
[DataField("inlet")]
public string InletName = "pipe";
}
}

16
Content.Server/Atmos/Piping/Unary/Components/GasPortableComponent.cs Normal file
View File

@@ -0,0 +1,16 @@
using Robust.Shared.GameObjects;
using Robust.Shared.Serialization.Manager.Attributes;
using Robust.Shared.ViewVariables;
namespace Content.Server.Atmos.Piping.Unary.Components
{
[RegisterComponent]
public class GasPortableComponent : Component
{
public override string Name => "GasPortable";
[ViewVariables(VVAccess.ReadWrite)]
[DataField("port")]
public string PortName { get; set; } = "port";
}
}

90
Content.Server/Atmos/Piping/Unary/Components/GasThermoMachineComponent.cs Normal file
View File

@@ -0,0 +1,90 @@
using System;
using System.Collections.Generic;
using Content.Server.Construction;
using Content.Server.Construction.Components;
using Content.Shared.Atmos;
using Robust.Shared.GameObjects;
using Robust.Shared.Serialization;
using Robust.Shared.Serialization.Manager.Attributes;
using Robust.Shared.ViewVariables;
namespace Content.Server.Atmos.Piping.Unary.Components
{
[RegisterComponent]
public class GasThermoMachineComponent : Component, IRefreshParts, ISerializationHooks
{
public override string Name => "GasThermoMachine";
[DataField("inlet")]
public string InletName { get; set; } = "pipe";
[ViewVariables(VVAccess.ReadWrite)]
public bool Enabled { get; set; } = true;
[ViewVariables(VVAccess.ReadWrite)]
public float HeatCapacity { get; set; } = 0;
[ViewVariables(VVAccess.ReadWrite)]
public float TargetTemperature { get; set; } = Atmospherics.T20C;
[DataField("mode")]
[ViewVariables(VVAccess.ReadWrite)]
public ThermoMachineMode Mode { get; set; } = ThermoMachineMode.Freezer;
[DataField("minTemperature")]
[ViewVariables(VVAccess.ReadWrite)]
public float MinTemperature { get; set; } = Atmospherics.T20C;
[DataField("maxTemperature")]
[ViewVariables(VVAccess.ReadWrite)]
public float MaxTemperature { get; set; } = Atmospherics.T20C;
public float InitialMinTemperature { get; private set; }
public float InitialMaxTemperature { get; private set; }
void IRefreshParts.RefreshParts(IEnumerable<MachinePartComponent> parts)
{
var matterBinRating = 0;
var laserRating = 0;
foreach (var part in parts)
{
switch (part.PartType)
{
case MachinePart.MatterBin:
matterBinRating += part.Rating;
break;
case MachinePart.Laser:
laserRating += part.Rating;
break;
}
}
HeatCapacity = 5000 * MathF.Pow((matterBinRating - 1), 2);
switch (Mode)
{
// 573.15K with stock parts.
case ThermoMachineMode.Heater:
MaxTemperature = Atmospherics.T20C + (InitialMaxTemperature * laserRating);
break;
// 73.15K with stock parts.
case ThermoMachineMode.Freezer:
MinTemperature = MathF.Max(Atmospherics.T0C - InitialMinTemperature + laserRating * 15f, Atmospherics.TCMB);
break;
}
}
void ISerializationHooks.AfterDeserialization()
{
InitialMinTemperature = MinTemperature;
InitialMaxTemperature = MaxTemperature;
}
}
public enum ThermoMachineMode : byte
{
Freezer = 0,
Heater = 1,
}
}

50
Content.Server/Atmos/Piping/Unary/Components/GasVentPumpComponent.cs Normal file
View File

@@ -0,0 +1,50 @@
using System;
using Content.Shared.Atmos;
using Robust.Shared.GameObjects;
using Robust.Shared.Serialization.Manager.Attributes;
using Robust.Shared.ViewVariables;
namespace Content.Server.Atmos.Piping.Unary.Components
{
[RegisterComponent]
public class GasVentPumpComponent : Component
{
public override string Name => "GasVentPump";
[ViewVariables(VVAccess.ReadWrite)]
public bool Enabled { get; set; } = true;
[ViewVariables(VVAccess.ReadWrite)]
public bool Welded { get; set; } = false;
[ViewVariables(VVAccess.ReadWrite)]
[DataField("inlet")]
public string InletName { get; set; } = "pipe";
[ViewVariables(VVAccess.ReadWrite)]
public VentPumpDirection PumpDirection { get; set; } = VentPumpDirection.Releasing;
[ViewVariables(VVAccess.ReadWrite)]
public VentPressureBound PressureChecks { get; set; } = VentPressureBound.ExternalBound;
[ViewVariables(VVAccess.ReadWrite)]
public float ExternalPressureBound { get; set; } = Atmospherics.OneAtmosphere;
[ViewVariables(VVAccess.ReadWrite)]
public float InternalPressureBound { get; set; } = 0f;
}
public enum VentPumpDirection : sbyte
{
Siphoning = 0,
Releasing = 1,
}
[Flags]
public enum VentPressureBound : sbyte
{
NoBound = 0,
InternalBound = 1,
ExternalBound = 2,
}
}

45
Content.Server/Atmos/Piping/Unary/Components/GasVentScrubberComponent.cs Normal file
View File

@@ -0,0 +1,45 @@
using System.Collections.Generic;
using Content.Shared.Atmos;
using Robust.Shared.GameObjects;
using Robust.Shared.Serialization.Manager.Attributes;
using Robust.Shared.ViewVariables;
namespace Content.Server.Atmos.Piping.Unary.Components
{
[RegisterComponent]
public class GasVentScrubberComponent : Component
{
public override string Name => "GasVentScrubber";
[ViewVariables(VVAccess.ReadWrite)]
public bool Enabled { get; set; } = true;
[ViewVariables(VVAccess.ReadWrite)]
public bool Welded { get; set; } = false;
[ViewVariables(VVAccess.ReadWrite)]
[DataField("outlet")]
public string OutletName { get; set; } = "pipe";
[ViewVariables]
public readonly HashSet<Gas> FilterGases = new()
{
Gas.CarbonDioxide
};
[ViewVariables(VVAccess.ReadWrite)]
public ScrubberPumpDirection PumpDirection { get; set; } = ScrubberPumpDirection.Scrubbing;
[ViewVariables(VVAccess.ReadWrite)]
public float VolumeRate { get; set; } = 200f;
[ViewVariables(VVAccess.ReadWrite)]
public bool WideNet { get; set; } = false;
}
public enum ScrubberPumpDirection : sbyte
{
Siphoning = 0,
Scrubbing = 1,
}
}