[ADD]Софт-крит и обновленный энд-раунд

Content.Client/HealthAnalyzer/UI/HealthAnalyzerControl.xaml.cs

@@ -190,6 +190,7 @@ private static string GetStatus(MobState mobState)
         return mobState switch
         {
             MobState.Alive => Loc.GetString("health-analyzer-window-entity-alive-text"),
+            MobState.SoftCritical => Loc.GetString("health-analyzer-window-entity-soft-critical-text"), // ADT-Tweak
             MobState.Critical => Loc.GetString("health-analyzer-window-entity-critical-text"),
             MobState.Dead => Loc.GetString("health-analyzer-window-entity-dead-text"),
             _ => Loc.GetString("health-analyzer-window-entity-unknown-text"),

Content.Client/Overlays/EntityHealthBarOverlay.cs

@@ -140,7 +140,9 @@ protected override void Draw(in OverlayDrawArgs args)
         var totalDamage = _damageable.GetTotalDamage((uid, dmg));
         if (_mobStateSystem.IsAlive(uid, component))
         {
-            if (!_mobThresholdSystem.TryGetThresholdForState(uid, MobState.Critical, out var threshold, thresholds) &&
+            // ADT-Tweak
+            if (!_mobThresholdSystem.TryGetThresholdForState(uid, MobState.SoftCritical, out var threshold, thresholds) &&
+                !_mobThresholdSystem.TryGetThresholdForState(uid, MobState.Critical, out threshold, thresholds) &&
                 !_mobThresholdSystem.TryGetThresholdForState(uid, MobState.Dead, out threshold, thresholds))
                 return (1, false);
 
@@ -150,8 +152,10 @@ protected override void Draw(in OverlayDrawArgs args)
 
         if (_mobStateSystem.IsCritical(uid, component))
         {
-            if (!_mobThresholdSystem.TryGetThresholdForState(uid, MobState.Critical, out var critThreshold, thresholds) ||
-                !_mobThresholdSystem.TryGetThresholdForState(uid, MobState.Dead, out var deadThreshold, thresholds))
+            // ADT-Tweak
+            if ((!_mobThresholdSystem.TryGetThresholdForState(uid, MobState.SoftCritical, out var critThreshold, thresholds)
+                    && !_mobThresholdSystem.TryGetThresholdForState(uid, MobState.Critical, out critThreshold, thresholds))
+                || !_mobThresholdSystem.TryGetThresholdForState(uid, MobState.Dead, out var deadThreshold, thresholds))
             {
                 return (1, true);
             }

Content.Client/RoundEnd/RoundEndSummaryUIController.cs

@@ -40,7 +40,8 @@ public void OpenRoundEndSummaryWindow(RoundEndMessageEvent message)
             return;
 
         _window = new RoundEndSummaryWindow(message.GamemodeTitle, message.RoundEndText,
-            message.RoundDuration, message.RoundId, message.AllPlayersEndInfo, EntityManager);
+            message.RoundDuration, message.RoundId, message.AllPlayersEndInfo, EntityManager,
+            message.RoundReport, message.SpeciesCensus);
     }
 
     public void OnSystemLoaded(ClientGameTicker system)

Content.Client/RoundEnd/RoundEndSummaryWindow.cs

@@ -8,21 +8,28 @@
 using static Robust.Client.UserInterface.Controls.BoxContainer;
 // Goob Station - End of Round Screen
 using Content.Client.Stylesheets;
+using Content.Shared.ADT.RoundEnd; // ADT-Tweak
 using Content.Shared.Mobs;
 
 namespace Content.Client.RoundEnd
 {
     public sealed class RoundEndSummaryWindow : DefaultWindow
     {
-        private readonly IEntityManager _entityManager;
-        public int RoundId;
+    private readonly IEntityManager _entityManager;
+    private readonly List<RoundEndStatEntry> _roundReport;
+    private readonly Dictionary<string, int> _speciesCensus;
+    public int RoundId;
 
         public RoundEndSummaryWindow(string gm, string roundEnd, TimeSpan roundTimeSpan, int roundId,
-            RoundEndMessageEvent.RoundEndPlayerInfo[] info, IEntityManager entityManager)
+            RoundEndMessageEvent.RoundEndPlayerInfo[] info, IEntityManager entityManager,
+            List<RoundEndStatEntry>? roundReport = null,
+            Dictionary<string, int>? speciesCensus = null)
         {
             _entityManager = entityManager;
+            _roundReport = roundReport ?? new List<RoundEndStatEntry>();
+            _speciesCensus = speciesCensus ?? new Dictionary<string, int>();
 
-            MinSize = SetSize = new Vector2(520, 580);
+            MinSize = SetSize = new Vector2(560, 620);
 
             Title = Loc.GetString("round-end-summary-window-title");
 
@@ -36,6 +43,8 @@ public RoundEndSummaryWindow(string gm, string roundEnd, TimeSpan roundTimeSpan,
             var roundEndTabs = new TabContainer();
             roundEndTabs.AddChild(MakeRoundEndSummaryTab(gm, roundEnd, roundTimeSpan, roundId));
             roundEndTabs.AddChild(MakePlayerManifestTab(info));
+            roundEndTabs.AddChild(MakeCrewTableTab(info)); // ADT-Tweak
+            roundEndTabs.AddChild(MakeStatsTab(gm, roundTimeSpan, roundId)); // ADT-Tweak
 
             ContentsContainer.AddChild(roundEndTabs);
 
@@ -92,7 +101,7 @@ private BoxContainer MakeRoundEndSummaryTab(string gamemode, string roundEnd, Ti
             return roundEndSummaryTab;
         }
 
-        //ADT-tweak-start
+        // ADT-Tweak-start
         //всё в этом регионе сильно модифицировано
         [Obsolete("This is only used for the end of round summary, and is not intended to be used for anything else. It will be removed once we have a better way to track this information.")]
         private BoxContainer MakePlayerManifestTab(RoundEndMessageEvent.RoundEndPlayerInfo[] playersInfo)
@@ -328,11 +337,248 @@ private BoxContainer MakePlayerManifestTab(RoundEndMessageEvent.RoundEndPlayerIn
                 playerInfoContainer.AddChild(panel);
             }
 
-            playerInfoContainerScrollbox.AddChild(playerInfoContainer);
-            playerManifestTab.AddChild(playerInfoContainerScrollbox);
+        playerInfoContainerScrollbox.AddChild(playerInfoContainer);
+        playerManifestTab.AddChild(playerInfoContainerScrollbox);
 
-            return playerManifestTab;
+        return playerManifestTab;
+    }
+
+    // ADT-Tweak-start
+    private BoxContainer MakeStatsTab(string gamemode, TimeSpan roundDuration, int roundId)
+    {
+        var statsTab = new BoxContainer
+        {
+            Orientation = LayoutOrientation.Vertical,
+            Name = Loc.GetString("round-end-report-tab-title")
+        };
+
+        var scroll = new ScrollContainer
+        {
+            VerticalExpand = true,
+            Margin = new Thickness(10)
+        };
+
+        var container = new BoxContainer
+        {
+            Orientation = LayoutOrientation.Vertical,
+            SeparationOverride = 2
+        };
+
+        AddReportLine(container, Loc.GetString("round-end-report-round-id", ("roundId", roundId)));
+        AddReportLine(container, Loc.GetString("round-end-report-gamemode", ("gamemode", gamemode)));
+        AddReportLine(container, Loc.GetString("round-end-report-duration",
+            ("hours", roundDuration.Hours),
+            ("minutes", roundDuration.Minutes),
+            ("seconds", roundDuration.Seconds)));
+
+        AddReportCategory(container, RoundEndStatCategory.Summary, "round-end-report-category-summary");
+        AddReportCategory(container, RoundEndStatCategory.FirstDeath, "round-end-report-category-first-death");
+        AddReportCategory(container, RoundEndStatCategory.Economy, "round-end-report-category-economy");
+        AddReportCategory(container, RoundEndStatCategory.Misc, "round-end-report-category-misc");
+        AddSpeciesCensus(container);
+
+        scroll.AddChild(container);
+        statsTab.AddChild(scroll);
+
+        return statsTab;
+    }
+
+    private void AddReportCategory(BoxContainer container, RoundEndStatCategory category, string headerLocId)
+    {
+        var entries = _roundReport
+            .Where(e => e.Category == category)
+            .OrderBy(e => e.Order)
+            .ToArray();
+
+        if (entries.Length == 0)
+            return;
+
+        AddCategoryHeader(container, headerLocId);
+
+        foreach (var entry in entries)
+        {
+            AddReportLine(container, FormatReportEntry(entry), 8);
+        }
+    }
+
+    private void AddReportLine(BoxContainer container, string markup, int indent = 0)
+    {
+        var label = new RichTextLabel { Margin = new Thickness(indent, 0, 0, 0) };
+        label.SetMarkup(markup);
+        container.AddChild(label);
+    }
+
+    private void AddCategoryHeader(BoxContainer container, string headerLocId)
+    {
+        var label = new Label
+        {
+            Text = Loc.GetString(headerLocId),
+            StyleClasses = { StyleNano.StyleClassLabelHeading },
+            Margin = new Thickness(0, 8, 0, 2)
+        };
+        container.AddChild(label);
+    }
+
+    /// <summary>
+    ///     Resolves a report line, translating any locale-id arguments client-side.
+    /// </summary>
+    private static string FormatReportEntry(RoundEndStatEntry entry)
+    {
+        var args = new List<(string, object)>();
+
+        foreach (var (key, value) in entry.Args)
+            args.Add((key, value));
+
+        foreach (var (key, locId) in entry.LocArgs)
+            args.Add((key, Loc.GetString(locId)));
+
+        return Loc.GetString(entry.LocId, args.ToArray());
+    }
+
+    private void AddSpeciesCensus(BoxContainer container)
+    {
+        if (_speciesCensus.Count == 0)
+            return;
+
+        AddCategoryHeader(container, "round-end-report-category-census");
+
+        AddReportLine(container, Loc.GetString("round-end-report-species-header",
+            ("count", _speciesCensus.Count)), 8);
+
+        foreach (var (species, count) in _speciesCensus.OrderByDescending(p => p.Value))
+        {
+            var name = Loc.TryGetString($"species-name-{species.ToLowerInvariant()}", out var localized)
+                ? localized
+                : species;
+
+            AddReportLine(container, Loc.GetString("round-end-report-species-line",
+                ("species", name), ("count", count)), 16);
         }
     }
-    //ADT-tweak-end
+    // ADT-Tweak-end
+
+    // ADT-Tweak-start
+    private BoxContainer MakeCrewTableTab(RoundEndMessageEvent.RoundEndPlayerInfo[] playersInfo)
+    {
+        var crewTab = new BoxContainer
+        {
+            Orientation = LayoutOrientation.Vertical,
+            Name = Loc.GetString("round-end-summary-window-crew-tab-title")
+        };
+
+        var scroll = new ScrollContainer
+        {
+            VerticalExpand = true,
+            Margin = new Thickness(10)
+        };
+
+        var container = new BoxContainer
+        {
+            Orientation = LayoutOrientation.Vertical
+        };
+
+        var crew = playersInfo.Where(p => !p.Observer).ToArray();
+        var observers = playersInfo.Where(p => p.Observer).ToArray();
+
+        var alive = crew.Count(p => p.EntMobState != MobState.Dead && p.EntMobState != MobState.Invalid);
+        var dead = crew.Count(p => p.EntMobState == MobState.Dead);
+        var escaped = crew.Count(p => p.Escaped && p.EntMobState != MobState.Dead);
+
+        var summaryLabel = new RichTextLabel { Margin = new Thickness(0, 0, 0, 8) };
+        summaryLabel.SetMarkup(Loc.GetString("round-end-summary-window-crew-summary",
+            ("alive", alive), ("dead", dead), ("escaped", escaped), ("total", crew.Length)));
+        container.AddChild(summaryLabel);
+
+        var grid = new GridContainer
+        {
+            Columns = 3,
+            HorizontalExpand = true
+        };
+
+        void AddHeader(string text)
+        {
+            var label = new Label
+            {
+                Text = text,
+                StyleClasses = { StyleNano.StyleClassLabelHeading },
+                Margin = new Thickness(4, 2)
+            };
+            grid.AddChild(label);
+        }
+
+        AddHeader(Loc.GetString("round-end-summary-window-crew-name-header"));
+        AddHeader(Loc.GetString("round-end-summary-window-crew-role-header"));
+        AddHeader(Loc.GetString("round-end-summary-window-crew-status-header"));
+
+        var sorted = crew
+            .OrderBy(p => p.EntMobState == MobState.Dead)
+            .ThenBy(p => p.PlayerICName ?? p.PlayerOOCName)
+            .Concat(observers.OrderBy(p => p.PlayerICName ?? p.PlayerOOCName));
+
+        foreach (var player in sorted)
+        {
+            var name = player.PlayerICName ?? player.PlayerOOCName;
+
+            var nameLabel = new Label
+            {
+                Text = player.Antag ? $"{name} [?]" : name,
+                FontColorOverride = player.Antag ? Color.Red : (player.Observer ? Color.Gray : Color.White),
+                Margin = new Thickness(4, 1)
+            };
+            grid.AddChild(nameLabel);
+
+            var roleLabel = new Label
+            {
+                Text = Loc.GetString(player.Role),
+                FontColorOverride = player.Observer ? Color.Gray : Color.LightGray,
+                Margin = new Thickness(4, 1)
+            };
+            grid.AddChild(roleLabel);
+
+            string status;
+            Color statusColor;
+            if (player.Observer)
+            {
+                status = Loc.GetString("round-end-summary-window-crew-status-observer");
+                statusColor = Color.Gray;
+            }
+            else if (player.EntMobState == MobState.Dead)
+            {
+                status = Loc.GetString("round-end-summary-window-crew-status-dead");
+                statusColor = Color.Red;
+            }
+            else if (player.EntMobState == MobState.Invalid)
+            {
+                status = Loc.GetString("round-end-summary-window-crew-status-nobody");
+                statusColor = Color.Gray;
+            }
+            else if (player.Escaped)
+            {
+                status = Loc.GetString("round-end-summary-window-crew-status-escaped");
+                statusColor = Color.Green;
+            }
+            else
+            {
+                status = Loc.GetString("round-end-summary-window-crew-status-alive");
+                statusColor = Color.Yellow;
+            }
+
+            var statusLabel = new Label
+            {
+                Text = status,
+                FontColorOverride = statusColor,
+                Margin = new Thickness(4, 1)
+            };
+            grid.AddChild(statusLabel);
+        }
+
+        container.AddChild(grid);
+        scroll.AddChild(container);
+        crewTab.AddChild(scroll);
+
+        return crewTab;
+    }
+    // ADT-Tweak-end
+    }
+    // ADT-Tweak-end
 }

Content.Client/UserInterface/Systems/DamageOverlays/DamageOverlayUiController.cs

@@ -131,6 +131,7 @@ private void UpdateOverlays(EntityUid entity, MobStateComponent? mobState, Damag
                 _overlay.DeadLevel = 0;
                 break;
             }
+            case MobState.SoftCritical: // ADT-Tweak
             case MobState.Critical:
             {
                 if (!_mobThresholdSystem.TryGetDeadPercentage(entity,

Content.Client/UserInterface/Systems/DamageOverlays/Overlays/DamageOverlay.cs

@@ -171,7 +171,7 @@ protected override void Draw(in OverlayDrawArgs args)
             _oldPainLevel = PainLevel;
         }
 
-        level = State != MobState.Critical ? _oldOxygenLevel : 1f;
+        level = State is MobState.SoftCritical or MobState.Critical ? 1f : _oldOxygenLevel; // ADT-Tweak
 
         if (level > 0f)
         {

Content.IntegrationTests/Tests/Medical/DefibrillatorTest.cs

@@ -51,7 +51,7 @@ public async Task KillAndReviveTest()
         });
 
         // Get the damage needed to kill or crit the target.
-        var critThreshold = mobThresholdsSystem.GetThresholdForState(STarget.Value, MobState.Critical);
+        var critThreshold = mobThresholdsSystem.GetThresholdForState(STarget.Value, MobState.SoftCritical); // ADT-Tweak
         var deathThreshold = mobThresholdsSystem.GetThresholdForState(STarget.Value, MobState.Dead);
         var critDamage = new DamageSpecifier(ProtoMan.Index(BluntDamageTypeId), (critThreshold + deathThreshold) / 2);
         var deathDamage = new DamageSpecifier(ProtoMan.Index(BluntDamageTypeId), deathThreshold);
@@ -96,7 +96,7 @@ public async Task KillAndReviveTest()
         await RunSeconds((float)cooldown.TotalSeconds);
         await Interact();
 
-        // The target should be revived, but in crit.
-        Assert.That(targetMobState.CurrentState, Is.EqualTo(MobState.Critical), "Target mob was not revived from being defibrillated.");
+        // The target should be revived, but in soft crit.
+        Assert.That(targetMobState.CurrentState, Is.EqualTo(MobState.SoftCritical), "Target mob was not revived from being defibrillated."); // ADT-Tweak
     }
 }

Content.Server/ADT/Economy/BankCardSystem.cs

@@ -1,4 +1,4 @@
-using System.Diagnostics.CodeAnalysis;
+using System.Diagnostics.CodeAnalysis;
 using System.Linq;
 using Content.Server.Access.Systems;
 using Content.Server.Cargo.Components;
@@ -245,6 +245,8 @@ public bool TryGetAccount(int accountId, [NotNullWhen(true)] out BankAccount? ac
         return account != null;
     }
 
+    public IReadOnlyList<BankAccount> GetAllAccounts() => _accounts;
+
     public int GetBalance(int accountId)
     {
         if (!TryGetAccount(accountId, out var account))