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

Fix thermoregulation + rebalance/refactor FlammableComponent (#5406)

Browse Source 
Co-authored-by: Paul Ritter <ritter.paul1@googlemail.com>
Co-authored-by: Tomeno <tomeno@lulzsec.co.uk>
This commit is contained in:
Tomeno
2021-11-19 17:54:01 +01:00
committed by GitHub
parent 2397f14f34
commit 8c71099fa2
5 changed files with 50 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
Content.Server/Body/Components/RespiratorComponent.cs
View File

@@ -30,9 +30,6 @@ namespace Content.Server.Body.Components
private float _accumulatedFrameTime;
private bool _isShivering;
private bool _isSweating;
[ViewVariables] [DataField("needsGases")] public Dictionary<Gas, float> NeedsGases { get; set; } = new();
[ViewVariables] [DataField("producesGases")] public Dictionary<Gas, float> ProducesGases { get; set; } = new();
@@ -253,52 +250,28 @@ namespace Content.Server.Body.Components
{
totalMetabolismTempChange += Math.Min(targetHeat, ImplicitHeatRegulation);
}
temperatureSystem.ChangeHeat(Owner.Uid, totalMetabolismTempChange, true, temperatureComponent);
// recalc difference and target heat
tempDiff = Math.Abs(temperatureComponent.CurrentTemperature - NormalBodyTemperature);
targetHeat = tempDiff * temperatureComponent.HeatCapacity;
temperatureSystem.ChangeHeat(Owner.Uid, totalMetabolismTempChange, true, temperatureComponent);
// if body temperature is not within comfortable, thermal regulation
// processes starts
if (tempDiff < ThermalRegulationTemperatureThreshold)
{
if (_isShivering || _isSweating)
{
Owner.PopupMessage(Loc.GetString("metabolism-component-is-comfortable"));
}
_isShivering = false;
_isSweating = false;
if (tempDiff > ThermalRegulationTemperatureThreshold)
return;
}
var actionBlocker = EntitySystem.Get<ActionBlockerSystem>();
if (temperatureComponent.CurrentTemperature > NormalBodyTemperature)
{
if (!actionBlocker.CanSweat(OwnerUid)) return;
if (!_isSweating)
{
Owner.PopupMessage(Loc.GetString("metabolism-component-is-sweating"));
_isSweating = true;
}
// creadth: sweating does not help in airless environment
if (EntitySystem.Get<AtmosphereSystem>().GetTileMixture(Owner.Transform.Coordinates) is not {})
{
temperatureSystem.ChangeHeat(OwnerUid, -Math.Min(targetHeat, SweatHeatRegulation), true, temperatureComponent);
}
temperatureSystem.ChangeHeat(OwnerUid, -Math.Min(targetHeat, SweatHeatRegulation), true, temperatureComponent);
}
else
{
if (!actionBlocker.CanShiver(OwnerUid)) return;
if (!_isShivering)
{
Owner.PopupMessage(Loc.GetString("metabolism-component-is-shivering"));
_isShivering = true;
}
temperatureSystem.ChangeHeat(OwnerUid, Math.Min(targetHeat, ShiveringHeatRegulation), true, temperatureComponent);
}
}