Merge pull request #406 from LucasTheDrgn/health-analyser-mass

Adding Body Mass to Health Analyzer UI
Fansana · Dec 15, 2024 · bb3f178 · bb3f178
2 parents 067ed7d + 72e7a87
commit bb3f178
Show file tree

Hide file tree

Showing 6 changed files with 20 additions and 1 deletion.
diff --git a/Content.Client/HealthAnalyzer/UI/HealthAnalyzerWindow.xaml b/Content.Client/HealthAnalyzer/UI/HealthAnalyzerWindow.xaml
@@ -36,6 +36,8 @@
                 <GridContainer Margin="0 5 0 0" Columns="2">
                     <Label Text="{Loc 'health-analyzer-window-entity-status-text'}" />
                     <Label Name="StatusLabel" />
+                    <Label Text="{Loc 'health-analyzer-window-entity-mass-text'}" />
+                    <Label Name="MassLabel" /> <!-- Floof: Health scanners show body mass -->
                     <Label Text="{Loc 'health-analyzer-window-entity-temperature-text'}" />
                     <Label Name="TemperatureLabel" />
                     <Label Text="{Loc 'health-analyzer-window-entity-blood-level-text'}" />

diff --git a/Content.Client/HealthAnalyzer/UI/HealthAnalyzerWindow.xaml.cs b/Content.Client/HealthAnalyzer/UI/HealthAnalyzerWindow.xaml.cs
@@ -91,6 +91,10 @@ public void Populate(HealthAnalyzerScannedUserMessage msg)
 
             // Basic Diagnostic
 
+            MassLabel.Text = !float.IsNaN(msg.Mass) // Floof: Health scanners show body mass
+                ? $"{msg.Mass:F1} kg"
+                : Loc.GetString("health-analyzer-window-entity-unknown-value-text");
+
             TemperatureLabel.Text = !float.IsNaN(msg.Temperature)
                 ? $"{msg.Temperature - Atmospherics.T0C:F1} °C ({msg.Temperature:F1} K)"
                 : Loc.GetString("health-analyzer-window-entity-unknown-value-text");

diff --git a/Content.Server/Medical/CryoPodSystem.cs b/Content.Server/Medical/CryoPodSystem.cs
@@ -33,6 +33,7 @@
 using Robust.Server.GameObjects;
 using Robust.Shared.Containers;
 using Robust.Shared.Timing;
+using Robust.Shared.Physics.Components;
 using SharedToolSystem = Content.Shared.Tools.Systems.SharedToolSystem;
 
 namespace Content.Server.Medical;
@@ -193,6 +194,7 @@ private void OnActivateUI(Entity<CryoPodComponent> entity, ref AfterActivatableU
         if (!entity.Comp.BodyContainer.ContainedEntity.HasValue)
             return;
 
+        TryComp<PhysicsComponent>(entity.Comp.BodyContainer.ContainedEntity, out var physics); // Floof: Health scanners show body mass
         TryComp<TemperatureComponent>(entity.Comp.BodyContainer.ContainedEntity, out var temp);
         TryComp<BloodstreamComponent>(entity.Comp.BodyContainer.ContainedEntity, out var bloodstream);
 
@@ -206,6 +208,7 @@ private void OnActivateUI(Entity<CryoPodComponent> entity, ref AfterActivatableU
             entity.Owner,
             HealthAnalyzerUiKey.Key,
             new HealthAnalyzerScannedUserMessage(GetNetEntity(entity.Comp.BodyContainer.ContainedEntity),
+            physics?.FixturesMass ?? 0, // Floof: Health scanners show body mass
             temp?.CurrentTemperature ?? 0,
             (bloodstream != null && _solutionContainerSystem.ResolveSolution(entity.Comp.BodyContainer.ContainedEntity.Value,
                 bloodstream.BloodSolutionName, ref bloodstream.BloodSolution, out var bloodSolution))

diff --git a/Content.Server/Medical/HealthAnalyzerSystem.cs b/Content.Server/Medical/HealthAnalyzerSystem.cs
@@ -17,6 +17,7 @@
 using Robust.Shared.Containers;
 using Robust.Shared.Player;
 using Robust.Shared.Timing;
+using Robust.Shared.Physics.Components;
 
 namespace Content.Server.Medical;
 
@@ -181,6 +182,11 @@ public void UpdateScannedUser(EntityUid healthAnalyzer, EntityUid target, bool s
         if (!HasComp<DamageableComponent>(target))
             return;
 
+        var mass = float.NaN; // Floof: Health scanners show body mass
+
+        if (TryComp<PhysicsComponent>(target, out var physics))
+            mass = physics.FixturesMass;
+
         var bodyTemperature = float.NaN;
 
         if (TryComp<TemperatureComponent>(target, out var temp))
@@ -203,6 +209,7 @@ public void UpdateScannedUser(EntityUid healthAnalyzer, EntityUid target, bool s
         */
         _uiSystem.ServerSendUiMessage(healthAnalyzer, HealthAnalyzerUiKey.Key, new HealthAnalyzerScannedUserMessage(
             GetNetEntity(target),
+            mass, // Floof: Health scanners show body mass
             bodyTemperature,
             bloodAmount,
             scanMode,

diff --git a/Content.Shared/MedicalScanner/HealthAnalyzerScannedUserMessage.cs b/Content.Shared/MedicalScanner/HealthAnalyzerScannedUserMessage.cs
@@ -9,15 +9,17 @@ namespace Content.Shared.MedicalScanner;
 public sealed class HealthAnalyzerScannedUserMessage : BoundUserInterfaceMessage
 {
     public readonly NetEntity? TargetEntity;
+    public float Mass; // Floof: Health scanners show body mass
     public float Temperature;
     public float BloodLevel;
     public bool? ScanMode;
     public bool? Bleeding;
     public bool? Unrevivable;
 
-    public HealthAnalyzerScannedUserMessage(NetEntity? targetEntity, float temperature, float bloodLevel, bool? scanMode, bool? bleeding, bool? unrevivable)
+    public HealthAnalyzerScannedUserMessage(NetEntity? targetEntity, float mass, float temperature, float bloodLevel, bool? scanMode, bool? bleeding, bool? unrevivable)
     {
         TargetEntity = targetEntity;
+        Mass = mass; // Floof: Health scanners show body mass
         Temperature = temperature;
         BloodLevel = bloodLevel;
         ScanMode = scanMode;

diff --git a/Resources/Locale/en-US/medical/components/health-analyzer-component.ftl b/Resources/Locale/en-US/medical/components/health-analyzer-component.ftl
@@ -7,6 +7,7 @@ health-analyzer-window-entity-alive-text = Alive
 health-analyzer-window-entity-dead-text = Dead
 health-analyzer-window-entity-critical-text = Critical
 
+health-analyzer-window-entity-mass-text = Mass:
 health-analyzer-window-entity-temperature-text = Temperature:
 health-analyzer-window-entity-blood-level-text = Blood Level:
 health-analyzer-window-entity-status-text = Status: