upstream

Content.Client/_CorvaxNext/BluespaceHarvester/BluespaceHarvesterMenu.xaml

@@ -22,8 +22,6 @@
             <Label Name="PowerUsageLabel" Text="0w"/>
             <Label Text="{Loc 'bluespace-harvester-window-power-next'}" StyleClasses="StatusFieldTitle"/>
             <Label Name="PowerUsageNextLabel" Text="0w"/>
-            <Label Text="{Loc 'bluespace-harvester-window-power-surplus'}" StyleClasses="StatusFieldTitle"/>
-            <Label Name="PowerSuppliertLabel" Text="0w"/>
         </GridContainer>
         <Control/>
         <Label Text="{Loc 'bluespace-harvester-window-lable-output'}"/>

Content.Client/_CorvaxNext/BluespaceHarvester/BluespaceHarvesterMenu.xaml.cs

@@ -37,7 +37,6 @@ public void UpdateState(BluespaceHarvesterBoundUserInterfaceState state)
 
         PowerUsageLabel.Text = Loc.GetString("power-monitoring-window-value", ("value", state.PowerUsage));
         PowerUsageNextLabel.Text = Loc.GetString("power-monitoring-window-value", ("value", state.PowerUsageNext));
-        PowerSuppliertLabel.Text = Loc.GetString("power-monitoring-window-value", ("value", state.PowerSuppliert));
 
         AvailablePointsLabel.Text = $"{state.Points}";
         TotalPontsLabel.Text = $"{state.TotalPoints}";
@@ -48,7 +47,7 @@ public void UpdateState(BluespaceHarvesterBoundUserInterfaceState state)
         {
             var child = new BluespaceHarvesterCategory(category, state.Points >= category.Cost);
 
-            child.CategoryButton.OnButtonDown += (args) =>
+            child.CategoryButton.OnButtonDown += _ =>
             {
                 _owner.SendBuy(category.Type);
             };

Content.Client/_CorvaxNext/CartridgeLoader/Cartridges/SecWatchEntryControl.xaml

@@ -0,0 +1,19 @@
+<BoxContainer xmlns="https://spacestation14.io"
+        xmlns:cartridges="clr-namespace:Content.Client._CorvaxNext.CartridgeLoader.Cartridges"
+        xmlns:customControls="clr-namespace:Content.Client.Administration.UI.CustomControls"
+        HorizontalExpand="True"
+        VerticalExpand="True"
+        Margin="5">
+    <!-- All labels populated in constructor -->
+    <BoxContainer Orientation="Horizontal" HorizontalAlignment="Left">
+        <BoxContainer Orientation="Vertical">
+            <Label Name="Status"/>
+            <Label Text="{Loc 'criminal-records-console-reason'}"/>
+        </BoxContainer>
+        <customControls:VSeparator StyleClasses="LowDivider" Margin="8 0"/>
+        <BoxContainer Orientation="Vertical">
+            <Label Name="Title"/>
+	        <Label Name="Reason"/>
+        </BoxContainer>
+    </BoxContainer>
+</BoxContainer>

Content.Client/_CorvaxNext/CartridgeLoader/Cartridges/SecWatchEntryControl.xaml.cs

@@ -0,0 +1,21 @@
+using Content.Shared.CartridgeLoader.Cartridges;
+using Robust.Client.AutoGenerated;
+using Robust.Client.UserInterface;
+using Robust.Client.UserInterface.Controls;
+using Robust.Client.UserInterface.XAML;
+
+namespace Content.Client._CorvaxNext.CartridgeLoader.Cartridges;
+
+[GenerateTypedNameReferences]
+public sealed partial class SecWatchEntryControl : BoxContainer
+{
+    public SecWatchEntryControl(SecWatchEntry entry)
+    {
+        RobustXamlLoader.Load(this);
+
+        Status.Text = Loc.GetString($"criminal-records-status-{entry.Status.ToString().ToLower()}");
+        Title.Text = Loc.GetString("sec-watch-entry", ("name", entry.Name), ("job", entry.Job));
+
+        Reason.Text = entry.Reason ?? Loc.GetString("sec-watch-no-reason");
+    }
+}

Content.Client/_CorvaxNext/CartridgeLoader/Cartridges/SecWatchUi.cs

@@ -0,0 +1,27 @@
+using Content.Client.UserInterface.Fragments;
+using Content.Shared.CartridgeLoader;
+using Content.Shared.CartridgeLoader.Cartridges;
+using Robust.Client.UserInterface;
+
+namespace Content.Client._CorvaxNext.CartridgeLoader.Cartridges;
+
+public sealed partial class SecWatchUi : UIFragment
+{
+    private SecWatchUiFragment? _fragment;
+
+    public override Control GetUIFragmentRoot()
+    {
+        return _fragment!;
+    }
+
+    public override void Setup(BoundUserInterface ui, EntityUid? owner)
+    {
+        _fragment = new SecWatchUiFragment();
+    }
+
+    public override void UpdateState(BoundUserInterfaceState state)
+    {
+        if (state is SecWatchUiState cast)
+            _fragment?.UpdateState(cast);
+    }
+}

Content.Client/_CorvaxNext/CartridgeLoader/Cartridges/SecWatchUiFragment.xaml

@@ -0,0 +1,13 @@
+<cartridges:SecWatchUiFragment xmlns="https://spacestation14.io"
+        xmlns:cartridges="clr-namespace:Content.Client._CorvaxNext.CartridgeLoader.Cartridges"
+        Margin="5"
+        VerticalExpand="True">
+    <BoxContainer Orientation="Vertical" HorizontalExpand="True" VerticalExpand="True">
+        <Label Text="{Loc 'sec-watch-title'}" HorizontalExpand="True" HorizontalAlignment="Center"/>
+        <Label Name="NoEntries" Text="{Loc 'sec-watch-no-entries'}" HorizontalExpand="True" HorizontalAlignment="Center" Visible="False"/>
+        <ScrollContainer HorizontalExpand="True" VerticalExpand="True">
+            <!-- Populated when state received -->
+            <BoxContainer Name="Entries" Orientation="Vertical" VerticalAlignment="Top"/>
+        </ScrollContainer>
+    </BoxContainer>
+</cartridges:SecWatchUiFragment>

Content.Client/_CorvaxNext/CartridgeLoader/Cartridges/SecWatchUiFragment.xaml.cs

@@ -0,0 +1,25 @@
+using Content.Shared.CartridgeLoader.Cartridges;
+using Robust.Client.AutoGenerated;
+using Robust.Client.UserInterface.Controls;
+using Robust.Client.UserInterface.XAML;
+
+namespace Content.Client._CorvaxNext.CartridgeLoader.Cartridges;
+
+[GenerateTypedNameReferences]
+public sealed partial class SecWatchUiFragment : BoxContainer
+{
+    public SecWatchUiFragment()
+    {
+        RobustXamlLoader.Load(this);
+    }
+
+    public void UpdateState(SecWatchUiState state)
+    {
+        NoEntries.Visible = state.Entries.Count == 0;
+        Entries.RemoveAllChildren();
+        foreach (var entry in state.Entries)
+        {
+            Entries.AddChild(new SecWatchEntryControl(entry));
+        }
+    }
+}

Content.Client/_CorvaxNext/Overlays/BaseSwitchableOverlay.cs

@@ -0,0 +1,47 @@
+using Content.Shared._CorvaxNext.Overlays;
+using Robust.Client.Graphics;
+using Robust.Client.Player;
+using Robust.Shared.Enums;
+using Robust.Shared.Prototypes;
+using System.Numerics;
+
+namespace Content.Client._CorvaxNext.Overlays;
+
+public class BaseSwitchableOverlay<TComp> : Overlay
+    where TComp : SwitchableOverlayComponent
+{
+    [Dependency] private readonly IPrototypeManager _prototype = default!;
+    [Dependency] private readonly IPlayerManager _player = default!;
+    [Dependency] private readonly IEntityManager _entity = default!;
+
+    public override bool RequestScreenTexture => true;
+    public override OverlaySpace Space => OverlaySpace.WorldSpace;
+    private readonly ShaderInstance _shader;
+
+    public BaseSwitchableOverlay()
+    {
+        IoCManager.InjectDependencies(this);
+        _shader = _prototype.Index<ShaderPrototype>("NightVision").Instance().Duplicate();
+    }
+
+    protected override void Draw(in OverlayDrawArgs args)
+    {
+        if (ScreenTexture is null
+            || _player.LocalEntity is null
+            || !_entity.TryGetComponent<TComp>(_player.LocalEntity.Value, out var component)
+            || !component.IsActive)
+            return;
+
+        _shader.SetParameter("SCREEN_TEXTURE", ScreenTexture);
+        _shader.SetParameter("tint", component.Tint);
+        _shader.SetParameter("luminance_threshold", component.Strength);
+        _shader.SetParameter("noise_amount", component.Noise);
+
+        var worldHandle = args.WorldHandle;
+
+        worldHandle.SetTransform(Matrix3x2.Identity);
+        worldHandle.UseShader(_shader);
+        worldHandle.DrawRect(args.WorldBounds, component.Color);
+        worldHandle.UseShader(null);
+    }
+}

Content.Client/_CorvaxNext/Overlays/NightVisionSystem.cs

@@ -0,0 +1,85 @@
+using Content.Shared._CorvaxNext.Overlays;
+using Content.Shared.GameTicking;
+using Robust.Client.Graphics;
+using Robust.Client.Player;
+using Robust.Shared.Player;
+
+namespace Content.Client._CorvaxNext.Overlays;
+
+public sealed class NightVisionSystem : SwitchableOverlaySystem<NightVisionComponent, ToggleNightVisionEvent>
+{
+    [Dependency] private readonly IPlayerManager _player = default!;
+    [Dependency] private readonly IOverlayManager _overlayMan = default!;
+    [Dependency] private readonly ILightManager _lightManager = default!;
+
+    private BaseSwitchableOverlay<NightVisionComponent> _overlay = default!;
+
+    public override void Initialize()
+    {
+        base.Initialize();
+
+        SubscribeLocalEvent<NightVisionComponent, PlayerAttachedEvent>(OnPlayerAttached);
+        SubscribeLocalEvent<NightVisionComponent, PlayerDetachedEvent>(OnPlayerDetached);
+        SubscribeLocalEvent<RoundRestartCleanupEvent>(OnRestart);
+
+        _overlay = new BaseSwitchableOverlay<NightVisionComponent>();
+    }
+
+    private void OnPlayerAttached(EntityUid uid, NightVisionComponent component, PlayerAttachedEvent args)
+    {
+        if (!component.IsActive)
+            return;
+
+        UpdateVision(args.Player, component.IsActive);
+    }
+
+    private void OnPlayerDetached(EntityUid uid, NightVisionComponent component, PlayerDetachedEvent args)
+    {
+        UpdateVision(args.Player, false);
+    }
+
+    private void OnRestart(RoundRestartCleanupEvent ev)
+    {
+        _overlayMan.RemoveOverlay(_overlay);
+        _lightManager.DrawLighting = true;
+    }
+
+    protected override void UpdateVision(EntityUid uid, bool active)
+    {
+        if (_player.LocalSession?.AttachedEntity != uid)
+            return;
+
+        UpdateOverlay(active);
+        UpdateNightVision(active);
+    }
+
+    private void UpdateVision(ICommonSession player, bool active)
+    {
+        if (_player.LocalSession != player)
+            return;
+
+        UpdateOverlay(active);
+        UpdateNightVision(active);
+    }
+
+    private void UpdateNightVision(bool active)
+    {
+        _lightManager.DrawLighting = !active;
+    }
+
+    private void UpdateOverlay(bool active)
+    {
+        if (_player.LocalEntity == null)
+        {
+            _overlayMan.RemoveOverlay(_overlay);
+            return;
+        }
+
+        active |= TryComp<NightVisionComponent>(_player.LocalEntity.Value, out var component) && component.IsActive;
+
+        if (active)
+            _overlayMan.AddOverlay(_overlay);
+        else
+            _overlayMan.RemoveOverlay(_overlay);
+    }
+}