Add internal temperatures for cooking meats (#20659)
This commit is contained in:
@@ -0,0 +1,48 @@
|
||||
using Content.Server.Temperature.Systems;
|
||||
|
||||
namespace Content.Server.Temperature.Components;
|
||||
|
||||
/// <summary>
|
||||
/// Entity has an internal temperature which conducts heat from its surface.
|
||||
/// Requires <see cref="TemperatureComponent"/> to function.
|
||||
/// </summary>
|
||||
/// <remarks>
|
||||
/// Currently this is only used for cooking but animal metabolism could use it too.
|
||||
/// Too hot? Suffering heatstroke, start sweating to cool off and increase thirst.
|
||||
/// Too cold? Suffering hypothermia, start shivering to warm up and increase hunger.
|
||||
/// </remarks>
|
||||
[RegisterComponent, Access(typeof(TemperatureSystem))]
|
||||
public sealed partial class InternalTemperatureComponent : Component
|
||||
{
|
||||
/// <summary>
|
||||
/// Internal temperature which is modified by surface temperature.
|
||||
/// This gets set to <see cref="TemperatureComponent.CurrentTemperature"/> on mapinit.
|
||||
/// </summary>
|
||||
[DataField, ViewVariables(VVAccess.ReadWrite)]
|
||||
public float Temperature;
|
||||
|
||||
/// <summary>
|
||||
/// Thermal conductivity of the material in W/m/K.
|
||||
/// Higher conductivity means its insides will heat up faster.
|
||||
/// </summary>
|
||||
[DataField, ViewVariables(VVAccess.ReadWrite)]
|
||||
public float Conductivity = 0.5f;
|
||||
|
||||
/// <summary>
|
||||
/// Average thickness between the surface and the inside.
|
||||
/// For meats and such this is constant.
|
||||
/// Thicker materials take longer for heat to dissipate.
|
||||
/// </summary>
|
||||
[DataField(required: true), ViewVariables(VVAccess.ReadWrite)]
|
||||
public float Thickness;
|
||||
|
||||
/// <summary>
|
||||
/// Surface area in m^2 for the purpose of conducting surface temperature to the inside.
|
||||
/// Larger surface area means it takes longer to heat up/cool down
|
||||
/// </summary>
|
||||
/// <remarks>
|
||||
/// For meats etc this should just be the area of the cooked surface not the whole thing as it's only getting heat from one side usually.
|
||||
/// </remarks>
|
||||
[DataField(required: true), ViewVariables(VVAccess.ReadWrite)]
|
||||
public float Area;
|
||||
}
|
||||
@@ -1,8 +1,7 @@
|
||||
using Content.Server.Temperature.Systems;
|
||||
using Content.Shared.Atmos;
|
||||
using Content.Shared.Damage;
|
||||
using Content.Shared.FixedPoint;
|
||||
using Robust.Shared.Physics;
|
||||
using Robust.Shared.Physics.Components;
|
||||
|
||||
namespace Content.Server.Temperature.Components;
|
||||
|
||||
@@ -14,6 +13,9 @@ namespace Content.Server.Temperature.Components;
|
||||
[RegisterComponent]
|
||||
public sealed partial class TemperatureComponent : Component
|
||||
{
|
||||
/// <summary>
|
||||
/// Surface temperature which is modified by the environment.
|
||||
/// </summary>
|
||||
[DataField, ViewVariables(VVAccess.ReadWrite)]
|
||||
public float CurrentTemperature = Atmospherics.T20C;
|
||||
|
||||
@@ -47,16 +49,12 @@ public sealed partial class TemperatureComponent : Component
|
||||
[DataField, ViewVariables(VVAccess.ReadWrite)]
|
||||
public float AtmosTemperatureTransferEfficiency = 0.1f;
|
||||
|
||||
[ViewVariables] public float HeatCapacity
|
||||
[Obsolete("Use system method")]
|
||||
public float HeatCapacity
|
||||
{
|
||||
get
|
||||
{
|
||||
if (IoCManager.Resolve<IEntityManager>().TryGetComponent<PhysicsComponent>(Owner, out var physics) && physics.FixturesMass != 0)
|
||||
{
|
||||
return SpecificHeat * physics.FixturesMass;
|
||||
}
|
||||
|
||||
return Atmospherics.MinimumHeatCapacity;
|
||||
return IoCManager.Resolve<IEntityManager>().System<TemperatureSystem>().GetHeatCapacity(Owner, this);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -12,6 +12,7 @@ using Content.Shared.Inventory;
|
||||
using Content.Shared.Rejuvenate;
|
||||
using Content.Shared.Temperature;
|
||||
using Robust.Server.GameObjects;
|
||||
using Robust.Shared.Physics.Components;
|
||||
|
||||
namespace Content.Server.Temperature.Systems;
|
||||
|
||||
@@ -19,8 +20,8 @@ public sealed class TemperatureSystem : EntitySystem
|
||||
{
|
||||
[Dependency] private readonly AlertsSystem _alerts = default!;
|
||||
[Dependency] private readonly AtmosphereSystem _atmosphere = default!;
|
||||
[Dependency] private readonly IAdminLogManager _adminLogger = default!;
|
||||
[Dependency] private readonly DamageableSystem _damageable = default!;
|
||||
[Dependency] private readonly IAdminLogManager _adminLogger = default!;
|
||||
[Dependency] private readonly TransformSystem _transform = default!;
|
||||
|
||||
/// <summary>
|
||||
@@ -43,6 +44,8 @@ public sealed class TemperatureSystem : EntitySystem
|
||||
SubscribeLocalEvent<TemperatureProtectionComponent, InventoryRelayedEvent<ModifyChangedTemperatureEvent>>(
|
||||
OnTemperatureChangeAttempt);
|
||||
|
||||
SubscribeLocalEvent<InternalTemperatureComponent, MapInitEvent>(OnInit);
|
||||
|
||||
// Allows overriding thresholds based on the parent's thresholds.
|
||||
SubscribeLocalEvent<TemperatureComponent, EntParentChangedMessage>(OnParentChange);
|
||||
SubscribeLocalEvent<ContainerTemperatureDamageThresholdsComponent, ComponentStartup>(
|
||||
@@ -55,6 +58,34 @@ public sealed class TemperatureSystem : EntitySystem
|
||||
{
|
||||
base.Update(frameTime);
|
||||
|
||||
// conduct heat from the surface to the inside of entities with internal temperatures
|
||||
var query = EntityQueryEnumerator<InternalTemperatureComponent, TemperatureComponent>();
|
||||
while (query.MoveNext(out var uid, out var comp, out var temp))
|
||||
{
|
||||
// don't do anything if they equalised
|
||||
var diff = Math.Abs(temp.CurrentTemperature - comp.Temperature);
|
||||
if (diff < 0.1f)
|
||||
continue;
|
||||
|
||||
// heat flow in W/m^2 as per fourier's law in 1D.
|
||||
var q = comp.Conductivity * diff / comp.Thickness;
|
||||
|
||||
// convert to J then K
|
||||
var joules = q * comp.Area * frameTime;
|
||||
var degrees = joules / GetHeatCapacity(uid, temp);
|
||||
if (temp.CurrentTemperature < comp.Temperature)
|
||||
degrees *= -1;
|
||||
|
||||
// exchange heat between inside and surface
|
||||
comp.Temperature += degrees;
|
||||
ForceChangeTemperature(uid, temp.CurrentTemperature - degrees, temp);
|
||||
}
|
||||
|
||||
UpdateDamage(frameTime);
|
||||
}
|
||||
|
||||
private void UpdateDamage(float frameTime)
|
||||
{
|
||||
_accumulatedFrametime += frameTime;
|
||||
|
||||
if (_accumulatedFrametime < UpdateInterval)
|
||||
@@ -104,7 +135,7 @@ public sealed class TemperatureSystem : EntitySystem
|
||||
}
|
||||
|
||||
float lastTemp = temperature.CurrentTemperature;
|
||||
temperature.CurrentTemperature += heatAmount / temperature.HeatCapacity;
|
||||
temperature.CurrentTemperature += heatAmount / GetHeatCapacity(uid, temperature);
|
||||
float delta = temperature.CurrentTemperature - lastTemp;
|
||||
|
||||
RaiseLocalEvent(uid, new OnTemperatureChangeEvent(temperature.CurrentTemperature, lastTemp, delta), true);
|
||||
@@ -114,6 +145,7 @@ public sealed class TemperatureSystem : EntitySystem
|
||||
ref AtmosExposedUpdateEvent args)
|
||||
{
|
||||
var transform = args.Transform;
|
||||
|
||||
if (transform.MapUid == null)
|
||||
return;
|
||||
|
||||
@@ -122,11 +154,30 @@ public sealed class TemperatureSystem : EntitySystem
|
||||
var temperatureDelta = args.GasMixture.Temperature - temperature.CurrentTemperature;
|
||||
var tileHeatCapacity =
|
||||
_atmosphere.GetTileHeatCapacity(transform.GridUid, transform.MapUid.Value, position);
|
||||
var heat = temperatureDelta * (tileHeatCapacity * temperature.HeatCapacity /
|
||||
(tileHeatCapacity + temperature.HeatCapacity));
|
||||
var heatCapacity = GetHeatCapacity(uid, temperature);
|
||||
var heat = temperatureDelta * (tileHeatCapacity * heatCapacity /
|
||||
(tileHeatCapacity + heatCapacity));
|
||||
ChangeHeat(uid, heat * temperature.AtmosTemperatureTransferEfficiency, temperature: temperature);
|
||||
}
|
||||
|
||||
public float GetHeatCapacity(EntityUid uid, TemperatureComponent? comp = null, PhysicsComponent? physics = null)
|
||||
{
|
||||
if (!Resolve(uid, ref comp) || !Resolve(uid, ref physics, false) || physics.FixturesMass <= 0)
|
||||
{
|
||||
return Atmospherics.MinimumHeatCapacity;
|
||||
}
|
||||
|
||||
return comp.SpecificHeat * physics.FixturesMass;
|
||||
}
|
||||
|
||||
private void OnInit(EntityUid uid, InternalTemperatureComponent comp, MapInitEvent args)
|
||||
{
|
||||
if (!TryComp<TemperatureComponent>(uid, out var temp))
|
||||
return;
|
||||
|
||||
comp.Temperature = temp.CurrentTemperature;
|
||||
}
|
||||
|
||||
private void OnRejuvenate(EntityUid uid, TemperatureComponent comp, RejuvenateEvent args)
|
||||
{
|
||||
ForceChangeTemperature(uid, Atmospherics.T20C, comp);
|
||||
|
||||
Reference in New Issue
Block a user