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

Remove LungBehavior and replace with LungComponent/System (#5630)

Browse Source
This commit is contained in:
mirrorcult
2021-11-30 18:25:02 -07:00
committed by GitHub
parent e3af2b5727
commit ccf01d7431
11 changed files with 311 additions and 242 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
Content.Server/Body/Systems/RespiratorSystem.cs
View File

@@ -4,7 +4,6 @@ using System.Linq;
using Content.Server.Administration.Logs;
using Content.Server.Alert;
using Content.Server.Atmos;
using Content.Server.Body.Behavior;
using Content.Server.Body.Components;
using Content.Shared.Alert;
using Content.Shared.Atmos;
@@ -23,6 +22,8 @@ namespace Content.Server.Body.Systems
{
[Dependency] private readonly DamageableSystem _damageableSys = default!;
[Dependency] private readonly AdminLogSystem _logSys = default!;
[Dependency] private readonly BodySystem _bodySystem = default!;
[Dependency] private readonly LungSystem _lungSystem = default!;
public override void Update(float frameTime)
{
@@ -136,10 +137,16 @@ namespace Content.Server.Body.Systems
if (!Resolve(uid, ref bloodstream, ref body, false))
return;
var lungs = body.GetMechanismBehaviors<LungBehavior>().ToArray();
var lungs = _bodySystem.GetComponentsOnMechanisms<LungComponent>(uid, body).ToArray();
var needs = NeedsAndDeficit(respirator, frameTime);
var used = 0f;
foreach (var (lung, mech) in lungs)
{
_lungSystem.UpdateLung(lung.OwnerUid, frameTime, lung, mech);
}
foreach (var (gas, amountNeeded) in needs)
{
var bloodstreamAmount = bloodstream.Air.GetMoles(gas);
@@ -150,9 +157,9 @@ namespace Content.Server.Body.Systems
if (!EntityManager.GetComponent<MobStateComponent>(uid).IsCritical())
{
// Panic inhale
foreach (var lung in lungs)
foreach (var (lung, mech) in lungs)
{
lung.Gasp();
_lungSystem.Gasp(lung.OwnerUid, lung, mech);
}
}