Merge pull request #1512 from space-syndicate/upstream-sync

Upstream sync

Content.Client/Administration/UI/Tabs/PlayerTab/PlayerTab.xaml.cs

@@ -150,7 +150,7 @@ private int Compare(PlayerInfo x, PlayerInfo y)
                 Header.Character => Compare(x.CharacterName, y.CharacterName),
                 Header.Job => Compare(x.StartingJob, y.StartingJob),
                 Header.Antagonist => x.Antag.CompareTo(y.Antag),
-                Header.Playtime => Compare(x.PlaytimeString, y.PlaytimeString),
+                Header.Playtime => TimeSpan.Compare(x.OverallPlaytime ?? default, y.OverallPlaytime ?? default),
                 _ => 1
             };
         }

Content.Client/Antag/AntagStatusIconSystem.cs

@@ -1,16 +1,16 @@
+using Content.Shared.Ghost;
 using Content.Shared.StatusIcon;
 using Content.Shared.StatusIcon.Components;
-using Robust.Shared.Prototypes;
-using Content.Shared.Ghost;
 using Robust.Client.Player;
+using Robust.Shared.Prototypes;
 
 namespace Content.Client.Antag;
 
 /// <summary>
 /// Used for assigning specified icons for antags.
 /// </summary>
 public abstract class AntagStatusIconSystem<T> : SharedStatusIconSystem
-    where T : Component
+    where T : IComponent
 {
     [Dependency] private readonly IPrototypeManager _prototype = default!;
     [Dependency] private readonly IPlayerManager _player = default!;

Content.Client/Eye/EyeLerpingSystem.cs

@@ -132,7 +132,7 @@ private Vector2 UpdateZoom(EntityUid uid, float frameTime, EyeComponent? eye = n
             return content.TargetZoom;
         }
 
-        var change = diff * 8f * frameTime;
+        var change = diff * Math.Min(8f * frameTime, 1);
 
         return eye.Zoom + change;
     }

Content.Client/Guidebook/Controls/GuideTechDisciplineEmbed.xaml

@@ -0,0 +1,4 @@
+<BoxContainer xmlns="https://spacestation14.io"
+              Orientation="Vertical">
+    <BoxContainer Name="DisciplineContainer" Orientation="Vertical"/>
+</BoxContainer>

Content.Client/Guidebook/Controls/GuideTechDisciplineEmbed.xaml.cs

@@ -0,0 +1,60 @@
+using System.Diagnostics.CodeAnalysis;
+using System.Linq;
+using Content.Client.Guidebook.Richtext;
+using Content.Shared.Research.Prototypes;
+using JetBrains.Annotations;
+using Robust.Client.AutoGenerated;
+using Robust.Client.UserInterface;
+using Robust.Client.UserInterface.Controls;
+using Robust.Client.UserInterface.XAML;
+using Robust.Shared.Prototypes;
+
+namespace Content.Client.Guidebook.Controls;
+
+/// <summary>
+///     Control for embedding all the technologies in a discipline into a guidebook.
+/// </summary>
+[UsedImplicitly, GenerateTypedNameReferences]
+public sealed partial class GuideTechDisciplineEmbed : BoxContainer, IDocumentTag
+{
+    [Dependency] private readonly IPrototypeManager _prototype = default!;
+
+    public GuideTechDisciplineEmbed()
+    {
+        RobustXamlLoader.Load(this);
+        IoCManager.InjectDependencies(this);
+        MouseFilter = MouseFilterMode.Stop;
+    }
+
+    public GuideTechDisciplineEmbed(string group) : this()
+    {
+        var prototypes = _prototype.EnumeratePrototypes<TechnologyPrototype>()
+            .Where(p => p.Discipline.Equals(group)).OrderBy(p => p.Tier).ThenBy(p => Loc.GetString(p.Name));
+        foreach (var tech in prototypes)
+        {
+            var embed = new GuideTechnologyEmbed(tech);
+            DisciplineContainer.AddChild(embed);
+        }
+    }
+
+    public bool TryParseTag(Dictionary<string, string> args, [NotNullWhen(true)] out Control? control)
+    {
+        control = null;
+        if (!args.TryGetValue("Discipline", out var group))
+        {
+            Logger.Error("Technology discipline embed tag is missing discipline argument");
+            return false;
+        }
+
+        var prototypes = _prototype.EnumeratePrototypes<TechnologyPrototype>()
+            .Where(p => p.Discipline.Equals(group)).OrderBy(p => p.Tier).ThenBy(p => Loc.GetString(p.Name));
+        foreach (var tech in prototypes)
+        {
+            var embed = new GuideTechnologyEmbed(tech);
+            DisciplineContainer.AddChild(embed);
+        }
+
+        control = this;
+        return true;
+    }
+}

Content.Client/Guidebook/Controls/GuideTechnologyEmbed.xaml

@@ -0,0 +1,22 @@
+<BoxContainer xmlns="https://spacestation14.io"
+              xmlns:gfx="clr-namespace:Robust.Client.Graphics;assembly=Robust.Client"
+              xmlns:customControls="clr-namespace:Content.Client.Administration.UI.CustomControls"
+              Orientation="Vertical"
+              Margin="5 5 5 5">
+    <PanelContainer HorizontalExpand="True">
+        <PanelContainer.PanelOverride>
+            <gfx:StyleBoxFlat BorderThickness="1" BorderColor="#777777"/>
+        </PanelContainer.PanelOverride>
+        <BoxContainer Orientation="Vertical">
+            <PanelContainer Name="DisciplineColorBackground" HorizontalExpand="True" VerticalExpand="False" MinHeight="15"/>
+            <BoxContainer Orientation="Vertical" Margin="5 5 5 5">
+                <BoxContainer Orientation="Horizontal" HorizontalExpand="True">
+                    <RichTextLabel Name="NameLabel" VerticalAlignment="Bottom" HorizontalExpand="True"/>
+                    <TextureRect Name="TechTexture" VerticalAlignment="Center"  HorizontalAlignment="Right"/>
+                </BoxContainer>
+                <customControls:HSeparator Margin="10 5 10 10"/>
+                <RichTextLabel Name="DescriptionLabel"/>
+            </BoxContainer>
+        </BoxContainer>
+    </PanelContainer>
+</BoxContainer>

Content.Client/Guidebook/Controls/GuideTechnologyEmbed.xaml.cs

@@ -0,0 +1,93 @@
+using System.Diagnostics.CodeAnalysis;
+using Content.Client.Guidebook.Richtext;
+using Content.Client.Message;
+using Content.Client.Research;
+using Content.Client.UserInterface.ControlExtensions;
+using Content.Shared.Research.Prototypes;
+using JetBrains.Annotations;
+using Robust.Client.AutoGenerated;
+using Robust.Client.GameObjects;
+using Robust.Client.Graphics;
+using Robust.Client.UserInterface;
+using Robust.Client.UserInterface.Controls;
+using Robust.Client.UserInterface.XAML;
+using Robust.Shared.Prototypes;
+
+namespace Content.Client.Guidebook.Controls;
+
+/// <summary>
+///     Control for embedding a research technology into a guidebook.
+/// </summary>
+[UsedImplicitly, GenerateTypedNameReferences]
+public sealed partial class GuideTechnologyEmbed : BoxContainer, IDocumentTag, ISearchableControl
+{
+    [Dependency] private readonly IEntitySystemManager _systemManager = default!;
+    [Dependency] private readonly IPrototypeManager _prototype = default!;
+
+    private readonly ResearchSystem _research;
+    private readonly SpriteSystem _sprite;
+
+    public GuideTechnologyEmbed()
+    {
+        RobustXamlLoader.Load(this);
+        IoCManager.InjectDependencies(this);
+        _research = _systemManager.GetEntitySystem<ResearchSystem>();
+        _sprite = _systemManager.GetEntitySystem<SpriteSystem>();
+        MouseFilter = MouseFilterMode.Stop;
+    }
+
+    public GuideTechnologyEmbed(string technology) : this()
+    {
+        GenerateControl(_prototype.Index<TechnologyPrototype>(technology));
+    }
+
+    public GuideTechnologyEmbed(TechnologyPrototype technology) : this()
+    {
+        GenerateControl(technology);
+    }
+
+    public bool CheckMatchesSearch(string query)
+    {
+        return this.ChildrenContainText(query);
+    }
+
+    public void SetHiddenState(bool state, string query)
+    {
+        Visible = CheckMatchesSearch(query) ? state : !state;
+    }
+
+    public bool TryParseTag(Dictionary<string, string> args, [NotNullWhen(true)] out Control? control)
+    {
+        control = null;
+        if (!args.TryGetValue("Technology", out var id))
+        {
+            Logger.Error("Technology embed tag is missing technology prototype argument");
+            return false;
+        }
+
+        if (!_prototype.TryIndex<TechnologyPrototype>(id, out var technology))
+        {
+            Logger.Error($"Specified technology prototype \"{id}\" is not a valid technology prototype");
+            return false;
+        }
+
+        GenerateControl(technology);
+
+        control = this;
+        return true;
+    }
+
+    private void GenerateControl(TechnologyPrototype technology)
+    {
+        var discipline = _prototype.Index(technology.Discipline);
+
+        NameLabel.SetMarkup($"[bold]{Loc.GetString(technology.Name)}[/bold]");
+        DescriptionLabel.SetMessage(_research.GetTechnologyDescription(technology, includePrereqs: true, disciplinePrototype: discipline));
+        TechTexture.Texture = _sprite.Frame0(technology.Icon);
+
+        DisciplineColorBackground.PanelOverride = new StyleBoxFlat
+        {
+            BackgroundColor = discipline.Color
+        };
+    }
+}

Content.Client/Research/UI/MiniTechnologyCardControl.xaml.cs

@@ -2,6 +2,7 @@
 using Robust.Client.AutoGenerated;
 using Robust.Client.GameObjects;
 using Robust.Client.UserInterface;
+using Robust.Client.UserInterface.CustomControls;
 using Robust.Client.UserInterface.XAML;
 using Robust.Shared.Prototypes;
 using Robust.Shared.Utility;
@@ -15,10 +16,13 @@ public MiniTechnologyCardControl(TechnologyPrototype technology, IPrototypeManag
     {
         RobustXamlLoader.Load(this);
 
-        var discipline = prototypeManager.Index<TechDisciplinePrototype>(technology.Discipline);
+        var discipline = prototypeManager.Index(technology.Discipline);
         Background.ModulateSelfOverride = discipline.Color;
         Texture.Texture = spriteSys.Frame0(technology.Icon);
         NameLabel.SetMessage(Loc.GetString(technology.Name));
-        Main.ToolTip = description.ToString();
+
+        var tooltip = new Tooltip();
+        tooltip.SetMessage(description);
+        Main.TooltipSupplier = _ => tooltip;
     }
 }

Content.Client/Research/UI/ResearchConsoleMenu.xaml.cs

@@ -27,7 +27,7 @@ public sealed partial class ResearchConsoleMenu : FancyWindow
     private readonly TechnologyDatabaseComponent? _technologyDatabase;
     private readonly ResearchSystem _research;
     private readonly SpriteSystem _sprite;
-    private readonly AccessReaderSystem _accessReader = default!;
+    private readonly AccessReaderSystem _accessReader;
 
     public readonly EntityUid Entity;
 
@@ -55,7 +55,7 @@ public void  UpdatePanels(ResearchConsoleBoundInterfaceState state)
 
         foreach (var tech in allTech)
         {
-            var mini = new MiniTechnologyCardControl(tech, _prototype, _sprite, GetTechnologyDescription(tech, false));
+            var mini = new MiniTechnologyCardControl(tech, _prototype, _sprite, _research.GetTechnologyDescription(tech));
             AvailableCardsContainer.AddChild(mini);
         }
 
@@ -74,45 +74,19 @@ public void  UpdatePanels(ResearchConsoleBoundInterfaceState state)
         foreach (var techId in _technologyDatabase.CurrentTechnologyCards)
         {
             var tech = _prototype.Index<TechnologyPrototype>(techId);
-            var cardControl = new TechnologyCardControl(tech, _prototype, _sprite, GetTechnologyDescription(tech), state.Points, hasAccess);
+            var cardControl = new TechnologyCardControl(tech, _prototype, _sprite, _research.GetTechnologyDescription(tech, includeTier: false), state.Points, hasAccess);
             cardControl.OnPressed += () => OnTechnologyCardPressed?.Invoke(techId);
             TechnologyCardsContainer.AddChild(cardControl);
         }
 
         foreach (var unlocked in _technologyDatabase.UnlockedTechnologies)
         {
             var tech = _prototype.Index<TechnologyPrototype>(unlocked);
-            var cardControl = new MiniTechnologyCardControl(tech, _prototype, _sprite, GetTechnologyDescription(tech, false));
+            var cardControl = new MiniTechnologyCardControl(tech, _prototype, _sprite, _research.GetTechnologyDescription(tech, false));
             UnlockedCardsContainer.AddChild(cardControl);
         }
     }
 
-    public FormattedMessage GetTechnologyDescription(TechnologyPrototype technology, bool includeCost = true)
-    {
-        var description = new FormattedMessage();
-        if (includeCost)
-        {
-            description.AddMarkup(Loc.GetString("research-console-cost", ("amount", technology.Cost)));
-            description.PushNewline();
-        }
-        description.AddMarkup(Loc.GetString("research-console-unlocks-list-start"));
-        foreach (var recipe in technology.RecipeUnlocks)
-        {
-            var recipeProto = _prototype.Index<LatheRecipePrototype>(recipe);
-            description.PushNewline();
-            description.AddMarkup(Loc.GetString("research-console-unlocks-list-entry",
-                ("name",recipeProto.Name)));
-        }
-        foreach (var generic in technology.GenericUnlocks)
-        {
-            description.PushNewline();
-            description.AddMarkup(Loc.GetString("research-console-unlocks-list-entry-generic",
-                ("name", Loc.GetString(generic.UnlockDescription))));
-        }
-
-        return description;
-    }
-
     public void UpdateInformationPanel(ResearchConsoleBoundInterfaceState state)
     {
         var amountMsg = new FormattedMessage();