Merge pull request Simple-Station#114 from FoxxoTrystan/Upstream-Merg…

…e-08/16/2024

Upstream Merge 08/16/2024

Content.Client/Psionics/GlimmerMonitor/GlimmerMonitorUi.cs → Content.Client/CartridgeLoader/Cartridges/GlimmerMonitorUi.cs

@@ -1,11 +1,9 @@
-using Robust.Client.GameObjects;
-using Robust.Client.UserInterface;
-using Content.Client.Psionics.UI;
+using Robust.Client.UserInterface;
 using Content.Client.UserInterface.Fragments;
 using Content.Shared.CartridgeLoader.Cartridges;
 using Content.Shared.CartridgeLoader;
 
-namespace Content.Client.Psionics.GlimmerMonitor;
+namespace Content.Client.CartridgeLoader.Cartridges;
 
 public sealed partial class GlimmerMonitorUi : UIFragment
 {

Content.Client/Psionics/GlimmerMonitor/GlimmerMonitorUiFragment.xaml → Content.Client/CartridgeLoader/Cartridges/GlimmerMonitorUiFragment.xaml

@@ -1,9 +1,8 @@
-<cartridges:GlimmerMonitorUiFragment xmlns:cartridges="clr-namespace:Content.Client.Psionics.GlimmerMonitor"
+<cartridges:GlimmerMonitorUiFragment xmlns:cartridges="clr-namespace:Content.Client.CartridgeLoader.Cartridges"
                                  xmlns="https://spacestation14.io" Margin="1 0 2 0">
     <PanelContainer StyleClasses="BackgroundDark"></PanelContainer>
     <BoxContainer Name="SettingsBox" Orientation="Horizontal" HorizontalExpand="True" VerticalExpand="False">
         <Label Text="{Loc 'glimmer-monitor-interval'}"/>
-        <Button Name="IntervalButton6s" Access="Public" Text="6s" StyleClasses="OpenRight"/>
         <Button Name="IntervalButton1" Access="Public" Text="1m" StyleClasses="OpenRight"/>
         <Button Name="IntervalButton5" Access="Public" Text="5m" StyleClasses="OpenBoth"/>
         <Button Name="IntervalButton10" Access="Public" Text="10m" StyleClasses="OpenLeft"/>

Content.Client/Psionics/GlimmerMonitor/GlimmerMonitorUiFragment.xaml.cs → Content.Client/CartridgeLoader/Cartridges/GlimmerMonitorUiFragment.xaml.cs

@@ -1,12 +1,12 @@
 using System.Linq;
 using System.Numerics;
-using Content.Client.Psionics.UI;
+using Content.Client.UserInterface;
 using Robust.Client.AutoGenerated;
 using Robust.Client.ResourceManagement;
 using Robust.Client.UserInterface.Controls;
 using Robust.Client.UserInterface.XAML;
 
-namespace Content.Client.Psionics.GlimmerMonitor;
+namespace Content.Client.CartridgeLoader.Cartridges;
 
 [GenerateTypedNameReferences]
 public sealed partial class GlimmerMonitorUiFragment : BoxContainer
@@ -26,14 +26,12 @@ public GlimmerMonitorUiFragment()
         VerticalExpand = true;
 
         var intervalGroup = new ButtonGroup();
-        IntervalButton6s.Group = intervalGroup;
         IntervalButton1.Group = intervalGroup;
         IntervalButton5.Group = intervalGroup;
         IntervalButton10.Group = intervalGroup;
 
-        IntervalButton6s.Pressed = true;
+        IntervalButton1.Pressed = true;
 
-        IntervalButton6s.OnPressed += _ => UpdateState(_cachedValues);
         IntervalButton1.OnPressed += _ => UpdateState(_cachedValues);
         IntervalButton5.OnPressed += _ => UpdateState(_cachedValues);
         IntervalButton10.OnPressed += _ => UpdateState(_cachedValues);
@@ -64,12 +62,14 @@ private List<int> FormatGlimmerValues(List<int> glimmerValues)
     {
         var returnList = glimmerValues;
 
-        if (IntervalButton1.Pressed)
-            returnList = GetAveragedList(glimmerValues, 10);
-        else if (IntervalButton5.Pressed)
-            returnList = GetAveragedList(glimmerValues, 50);
+        if (IntervalButton5.Pressed)
+        {
+            returnList = GetAveragedList(glimmerValues, 5);
+        }
         else if (IntervalButton10.Pressed)
-            returnList = GetAveragedList(glimmerValues, 100);
+        {
+            returnList = GetAveragedList(glimmerValues, 10);
+        }
 
         return ClipToFifteen(returnList);
     }

Content.Client/Psionics/Telepathy/PsionicChatUpdateSystem.cs → Content.Client/Chat/PsionicChatUpdateSystem.cs

@@ -1,8 +1,8 @@
-using Content.Shared.Psionics.Abilities;
+using Content.Shared.Abilities.Psionics;
 using Content.Client.Chat.Managers;
 using Robust.Client.Player;
 
-namespace Content.Client.Psionics.Chat
+namespace Content.Client.Chat
 {
     public sealed class PsionicChatUpdateSystem : EntitySystem
     {

Content.Client/DeltaV/CartridgeLoader/Cartridges/CrimeAssistUi.cs

@@ -18,6 +18,15 @@ public override Control GetUIFragmentRoot()
     public override void Setup(BoundUserInterface userInterface, EntityUid? fragmentOwner)
     {
         _fragment = new CrimeAssistUiFragment();
+
+        _fragment.OnSync += _ => SendSyncMessage(userInterface);
+    }
+
+    private void SendSyncMessage(BoundUserInterface userInterface)
+    {
+        var syncMessage = new CrimeAssistSyncMessageEvent();
+        var message = new CartridgeUiMessage(syncMessage);
+        userInterface.SendMessage(message);
     }
 
     public override void UpdateState(BoundUserInterfaceState state)

Content.Client/DeltaV/CartridgeLoader/Cartridges/CrimeAssistUiFragment.xaml.cs

@@ -1,6 +1,7 @@
 using Content.Client.Message;
 using Content.Shared.DeltaV.CartridgeLoader.Cartridges;
 using Robust.Client.AutoGenerated;
+using Robust.Client.ResourceManagement;
 using Robust.Client.UserInterface.Controls;
 using Robust.Client.UserInterface.XAML;
 using Robust.Shared.Prototypes;
@@ -12,7 +13,9 @@ namespace Content.Client.DeltaV.CartridgeLoader.Cartridges;
 public sealed partial class CrimeAssistUiFragment : BoxContainer
 {
     [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
+    [Dependency] private readonly IResourceCache _resourceCache = default!;
 
+    public event Action<bool>? OnSync;
     private CrimeAssistPage _currentPage;
     private List<CrimeAssistPage>? _pages;
 

Content.Client/Eye/PenLight/UI/PenLightBoundUserInterface.cs

@@ -0,0 +1,47 @@
+using Content.Shared.Medical;
+using JetBrains.Annotations;
+using Robust.Client.GameObjects;
+
+namespace Content.Client.Eye.PenLight.UI
+{
+    [UsedImplicitly]
+    public sealed class PenLightBoundUserInterface : BoundUserInterface
+    {
+        [ViewVariables]
+        private PenLightWindow? _window;
+
+        public PenLightBoundUserInterface(EntityUid owner, Enum uiKey) : base(owner, uiKey) { }
+
+        protected override void Open()
+        {
+            base.Open();
+            _window = new PenLightWindow
+            {
+                Title = EntMan.GetComponent<MetaDataComponent>(Owner).EntityName,
+            };
+            _window.OnClose += Close;
+            _window.OpenCentered();
+        }
+
+        protected override void ReceiveMessage(BoundUserInterfaceMessage message)
+        {
+            if (_window == null
+                || message is not PenLightUserMessage cast)
+                return;
+
+            _window.Diagnose(cast);
+        }
+
+        protected override void Dispose(bool disposing)
+        {
+            base.Dispose(disposing);
+            if (!disposing)
+                return;
+
+            if (_window != null)
+                _window.OnClose -= Close;
+
+            _window?.Dispose();
+        }
+    }
+}

Content.Client/Eye/PenLight/UI/PenLightWindow.xaml

@@ -0,0 +1,11 @@
+<controls:FancyWindow xmlns="https://spacestation14.io"
+    xmlns:controls="clr-namespace:Content.Client.UserInterface.Controls"
+    Title="{Loc 'pen-light-exam-title'}"
+    SetSize="0 -300">
+    <ScrollContainer VerticalExpand="True">
+        <BoxContainer Name="RootContainer" Orientation="Vertical" HorizontalExpand="True">
+            <Label Name="NoPatientDataText" Text="{Loc 'pen-light-window-no-patient-data-text'}" Visible="False"/>
+            <Label Name="ExamDataLabel"/>
+        </BoxContainer>
+    </ScrollContainer>
+</controls:FancyWindow>

Content.Client/Eye/PenLight/UI/PenLightWindow.xaml.cs

@@ -0,0 +1,78 @@
+using Content.Client.UserInterface.Controls;
+using Content.Shared.Damage;
+using Content.Shared.IdentityManagement;
+using Content.Shared.Medical;
+using Robust.Client.AutoGenerated;
+using Robust.Client.UserInterface.XAML;
+using System.Text;
+
+
+namespace Content.Client.Eye.PenLight.UI
+{
+    [GenerateTypedNameReferences]
+    public sealed partial class PenLightWindow : FancyWindow
+    {
+        private readonly IEntityManager _entityManager;
+        private const int LightHeight = 150;
+        private const int LightWidth = 900;
+
+        public PenLightWindow()
+        {
+            RobustXamlLoader.Load(this);
+
+            var dependencies = IoCManager.Instance!;
+            _entityManager = dependencies.Resolve<IEntityManager>();
+        }
+        public void Diagnose(PenLightUserMessage msg)
+        {
+            var target = _entityManager.GetEntity(msg.TargetEntity);
+
+            if (target == null || !_entityManager.TryGetComponent<DamageableComponent>(target, out var damageable))
+            {
+                NoPatientDataText.Visible = true;
+                ExamDataLabel.Text = string.Empty;
+                return;
+            }
+
+            NoPatientDataText.Visible = false;
+
+
+            string entityName = Loc.GetString("pen-light-window-entity-unknown-text");
+            if (_entityManager.HasComponent<MetaDataComponent>(target.Value))
+                entityName = Identity.Name(target.Value, _entityManager);
+
+            var sb = new StringBuilder();
+            sb.AppendLine(Loc.GetString("pen-light-window-entity-eyes-text", ("entityName", entityName)));
+
+            // Check if Blind and return early if true
+            if (msg.Blind == true)
+            {
+                sb.AppendLine(Loc.GetString("pen-light-exam-blind-text"));
+                ExamDataLabel.Text = sb.ToString();
+                SetHeight = LightHeight;
+                SetWidth = LightWidth;
+                return;
+            }
+            // EyeDamage
+            if (msg.EyeDamage == true)
+                sb.AppendLine(Loc.GetString("pen-light-exam-eyedamage-text"));
+
+            // Drunk
+            if (msg.Drunk == true)
+                sb.AppendLine(Loc.GetString("pen-light-exam-drunk-text"));
+
+            // Hallucinating
+            if (msg.SeeingRainbows == true)
+                sb.AppendLine(Loc.GetString("pen-light-exam-hallucinating-text"));
+
+            // Healthy
+            if (msg.Healthy == true)
+                sb.AppendLine(Loc.GetString("pen-light-exam-healthy-text"));
+
+            ExamDataLabel.Text = sb.ToString();
+
+            SetHeight = LightHeight;
+            SetWidth = LightWidth;
+        }
+    }
+}

Content.Client/Flash/FlashSystem.cs

@@ -38,8 +38,10 @@ private void OnFlashableHandleState(EntityUid uid, FlashableComponent component,
             // Few things here:
             // 1. If a shorter duration flash is applied then don't do anything
             // 2. If the client-side time is later than when the flash should've ended don't do anything
+            var calculatedStateDuration = state.Duration * state.DurationMultiplier;
+
             var currentTime = _gameTiming.CurTime.TotalSeconds;
-            var newEndTime = state.Time.TotalSeconds + state.Duration;
+            var newEndTime = state.Time.TotalSeconds + calculatedStateDuration;
             var currentEndTime = component.LastFlash.TotalSeconds + component.Duration;
 
             if (currentEndTime > newEndTime)
@@ -53,7 +55,7 @@ private void OnFlashableHandleState(EntityUid uid, FlashableComponent component,
             }
 
             component.LastFlash = state.Time;
-            component.Duration = state.Duration;
+            component.Duration = calculatedStateDuration;
 
             var overlay = _overlayManager.GetOverlay<FlashOverlay>();
             overlay.ReceiveFlash(component.Duration);