Temperature refactor (#20662)

Co-authored-by: deltanedas <@deltanedas:kde.org>

Content.Server/Temperature/Components/TemperatureComponent.cs

@@ -4,84 +4,80 @@ using Content.Shared.FixedPoint;
 using Robust.Shared.Physics;
 using Robust.Shared.Physics.Components;
 
-namespace Content.Server.Temperature.Components
+namespace Content.Server.Temperature.Components;
+
+/// <summary>
+/// Handles changing temperature,
+/// informing others of the current temperature,
+/// and taking fire damage from high temperature.
+/// </summary>
+[RegisterComponent]
+public sealed partial class TemperatureComponent : Component
 {
+    [DataField, ViewVariables(VVAccess.ReadWrite)]
+    public float CurrentTemperature = Atmospherics.T20C;
+
+    [DataField, ViewVariables(VVAccess.ReadWrite)]
+    public float HeatDamageThreshold = 360f;
+
+    [DataField, ViewVariables(VVAccess.ReadWrite)]
+    public float ColdDamageThreshold = 260f;
+
     /// <summary>
-    /// Handles changing temperature,
-    /// informing others of the current temperature,
-    /// and taking fire damage from high temperature.
+    /// Overrides HeatDamageThreshold if the entity's within a parent with the TemperatureDamageThresholdsComponent component.
     /// </summary>
-    [RegisterComponent]
-    public sealed partial class TemperatureComponent : Component
+    [DataField, ViewVariables(VVAccess.ReadWrite)]
+    public float? ParentHeatDamageThreshold;
+
+    /// <summary>
+    /// Overrides ColdDamageThreshold if the entity's within a parent with the TemperatureDamageThresholdsComponent component.
+    /// </summary>
+    [DataField, ViewVariables(VVAccess.ReadWrite)]
+    public float? ParentColdDamageThreshold;
+
+    /// <summary>
+    /// Heat capacity per kg of mass.
+    /// </summary>
+    [DataField, ViewVariables(VVAccess.ReadWrite)]
+    public float SpecificHeat = 50f;
+
+    /// <summary>
+    /// How well does the air surrounding you merge into your body temperature?
+    /// </summary>
+    [DataField, ViewVariables(VVAccess.ReadWrite)]
+    public float AtmosTemperatureTransferEfficiency = 0.1f;
+
+    [ViewVariables] public float HeatCapacity
     {
-        [ViewVariables(VVAccess.ReadWrite)]
-        [DataField("currentTemperature")]
-        public float CurrentTemperature { get; set; } = Atmospherics.T20C;
-
-        [DataField("heatDamageThreshold")]
-        [ViewVariables(VVAccess.ReadWrite)]
-        public float HeatDamageThreshold = 360f;
-
-        [DataField("coldDamageThreshold")]
-        [ViewVariables(VVAccess.ReadWrite)]
-        public float ColdDamageThreshold = 260f;
-
-        /// <summary>
-        /// Overrides HeatDamageThreshold if the entity's within a parent with the TemperatureDamageThresholdsComponent component.
-        /// </summary>
-        [ViewVariables(VVAccess.ReadWrite)]
-        public float? ParentHeatDamageThreshold;
-
-        /// <summary>
-        /// Overrides ColdDamageThreshold if the entity's within a parent with the TemperatureDamageThresholdsComponent component.
-        /// </summary>
-        [ViewVariables(VVAccess.ReadWrite)]
-        public float? ParentColdDamageThreshold;
-
-        [DataField("specificHeat")]
-        [ViewVariables(VVAccess.ReadWrite)]
-        public float SpecificHeat = 50f;
-
-        /// <summary>
-        ///     How well does the air surrounding you merge into your body temperature?
-        /// </summary>
-        [DataField("atmosTemperatureTransferEfficiency")]
-        [ViewVariables(VVAccess.ReadWrite)]
-        public float AtmosTemperatureTransferEfficiency = 0.1f;
-
-        [ViewVariables] public float HeatCapacity
+        get
         {
-            get
+            if (IoCManager.Resolve<IEntityManager>().TryGetComponent<PhysicsComponent>(Owner, out var physics) && physics.FixturesMass != 0)
             {
-                if (IoCManager.Resolve<IEntityManager>().TryGetComponent<PhysicsComponent>(Owner, out var physics) && physics.FixturesMass != 0)
-                {
-                    return SpecificHeat * physics.FixturesMass;
-                }
-
-                return Atmospherics.MinimumHeatCapacity;
+                return SpecificHeat * physics.FixturesMass;
             }
+
+            return Atmospherics.MinimumHeatCapacity;
         }
-
-        [DataField("coldDamage")]
-        [ViewVariables(VVAccess.ReadWrite)]
-        public DamageSpecifier ColdDamage = new();
-
-        [DataField("heatDamage")]
-        [ViewVariables(VVAccess.ReadWrite)]
-        public DamageSpecifier HeatDamage = new();
-
-        /// <summary>
-        ///     Temperature won't do more than this amount of damage per second.
-        ///
-        ///     Okay it genuinely reaches this basically immediately for a plasma fire.
-        /// </summary>
-        [DataField("damageCap")]
-        [ViewVariables(VVAccess.ReadWrite)]
-        public FixedPoint2 DamageCap = FixedPoint2.New(8);
-
-        /// <summary>
-        ///     Used to keep track of when damage starts/stops. Useful for logs.
-        /// </summary>
-        public bool TakingDamage = false;
     }
+
+    [DataField, ViewVariables(VVAccess.ReadWrite)]
+    public DamageSpecifier ColdDamage = new();
+
+    [DataField, ViewVariables(VVAccess.ReadWrite)]
+    public DamageSpecifier HeatDamage = new();
+
+    /// <summary>
+    /// Temperature won't do more than this amount of damage per second.
+    /// </summary>
+    /// <remarks>
+    /// Okay it genuinely reaches this basically immediately for a plasma fire.
+    /// </summary>
+    [DataField, ViewVariables(VVAccess.ReadWrite)]
+    public FixedPoint2 DamageCap = FixedPoint2.New(8);
+
+    /// <summary>
+    /// Used to keep track of when damage starts/stops. Useful for logs.
+    /// </summary>
+    [DataField]
+    public bool TakingDamage = false;
 }