Merge branch 'Need-more-Ammo' of https://github.com/KaiserMaus/space-…

…station-14 into Need-more-Ammo

Content.Client/Atmos/EntitySystems/GasPressurePumpSystem.cs

@@ -0,0 +1,23 @@
+using Content.Client.Atmos.UI;
+using Content.Shared.Atmos.Components;
+using Content.Shared.Atmos.EntitySystems;
+using Content.Shared.Atmos.Piping.Binary.Components;
+
+namespace Content.Client.Atmos.EntitySystems;
+
+public sealed class GasPressurePumpSystem : SharedGasPressurePumpSystem
+{
+    public override void Initialize()
+    {
+        base.Initialize();
+        SubscribeLocalEvent<GasPressurePumpComponent, AfterAutoHandleStateEvent>(OnPumpUpdate);
+    }
+
+    private void OnPumpUpdate(Entity<GasPressurePumpComponent> ent, ref AfterAutoHandleStateEvent args)
+    {
+        if (UserInterfaceSystem.TryGetOpenUi<GasPressurePumpBoundUserInterface>(ent.Owner, GasPressurePumpUiKey.Key, out var bui))
+        {
+            bui.Update();
+        }
+    }
+}

Content.Client/Atmos/UI/GasPressurePumpBoundUserInterface.cs

@@ -1,65 +1,63 @@
 using Content.Shared.Atmos;
+using Content.Shared.Atmos.Components;
 using Content.Shared.Atmos.Piping.Binary.Components;
+using Content.Shared.IdentityManagement;
 using Content.Shared.Localizations;
 using JetBrains.Annotations;
-using Robust.Client.GameObjects;
 using Robust.Client.UserInterface;
 
-namespace Content.Client.Atmos.UI
+namespace Content.Client.Atmos.UI;
+
+/// <summary>
+/// Initializes a <see cref="GasPressurePumpWindow"/> and updates it when new server messages are received.
+/// </summary>
+[UsedImplicitly]
+public sealed class GasPressurePumpBoundUserInterface : BoundUserInterface
 {
-    /// <summary>
-    /// Initializes a <see cref="GasPressurePumpWindow"/> and updates it when new server messages are received.
-    /// </summary>
-    [UsedImplicitly]
-    public sealed class GasPressurePumpBoundUserInterface : BoundUserInterface
-    {
-        [ViewVariables]
-        private const float MaxPressure = Atmospherics.MaxOutputPressure;
+    [ViewVariables]
+    private const float MaxPressure = Atmospherics.MaxOutputPressure;
+
+    [ViewVariables]
+    private GasPressurePumpWindow? _window;
 
-        [ViewVariables]
-        private GasPressurePumpWindow? _window;
+    public GasPressurePumpBoundUserInterface(EntityUid owner, Enum uiKey) : base(owner, uiKey)
+    {
+    }
 
-        public GasPressurePumpBoundUserInterface(EntityUid owner, Enum uiKey) : base(owner, uiKey)
-        {
-        }
+    protected override void Open()
+    {
+        base.Open();
 
-        protected override void Open()
-        {
-            base.Open();
+        _window = this.CreateWindow<GasPressurePumpWindow>();
 
-            _window = this.CreateWindow<GasPressurePumpWindow>();
+        _window.ToggleStatusButtonPressed += OnToggleStatusButtonPressed;
+        _window.PumpOutputPressureChanged += OnPumpOutputPressurePressed;
+        Update();
+    }
 
-            _window.ToggleStatusButtonPressed += OnToggleStatusButtonPressed;
-            _window.PumpOutputPressureChanged += OnPumpOutputPressurePressed;
-        }
+    public void Update()
+    {
+        if (_window == null)
+            return;
 
-        private void OnToggleStatusButtonPressed()
-        {
-            if (_window is null) return;
-            SendMessage(new GasPressurePumpToggleStatusMessage(_window.PumpStatus));
-        }
+        _window.Title = Identity.Name(Owner, EntMan);
 
-        private void OnPumpOutputPressurePressed(string value)
-        {
-            var pressure = UserInputParser.TryFloat(value, out var parsed) ? parsed : 0f;
-            if (pressure > MaxPressure) pressure = MaxPressure;
+        if (!EntMan.TryGetComponent(Owner, out GasPressurePumpComponent? pump))
+            return;
 
-            SendMessage(new GasPressurePumpChangeOutputPressureMessage(pressure));
-        }
+        _window.SetPumpStatus(pump.Enabled);
+        _window.MaxPressure = pump.MaxTargetPressure;
+        _window.SetOutputPressure(pump.TargetPressure);
+    }
 
-        /// <summary>
-        /// Update the UI state based on server-sent info
-        /// </summary>
-        /// <param name="state"></param>
-        protected override void UpdateState(BoundUserInterfaceState state)
-        {
-            base.UpdateState(state);
-            if (_window == null || state is not GasPressurePumpBoundUserInterfaceState cast)
-                return;
+    private void OnToggleStatusButtonPressed()
+    {
+        if (_window is null) return;
+        SendPredictedMessage(new GasPressurePumpToggleStatusMessage(_window.PumpStatus));
+    }
 
-            _window.Title = (cast.PumpLabel);
-            _window.SetPumpStatus(cast.Enabled);
-            _window.SetOutputPressure(cast.OutputPressure);
-        }
+    private void OnPumpOutputPressurePressed(float value)
+    {
+        SendPredictedMessage(new GasPressurePumpChangeOutputPressureMessage(value));
     }
 }

Content.Client/Atmos/UI/GasPressurePumpWindow.xaml

@@ -1,22 +1,18 @@
-<DefaultWindow xmlns="https://spacestation14.io"
+<controls:FancyWindow xmlns="https://spacestation14.io"
             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-            MinSize="200 120" Title="Pressure Pump">
+            xmlns:controls="clr-namespace:Content.Client.UserInterface.Controls"
+            SetSize="340 110" MinSize="340 110" Title="Pressure Pump">
     <BoxContainer Orientation="Vertical" Margin="5 5 5 5" SeparationOverride="10">
         <BoxContainer Orientation="Horizontal" HorizontalExpand="True">
-            <Label Text="{Loc comp-gas-pump-ui-pump-status}"/>
-            <Control MinSize="5 0" />
+            <Label Text="{Loc comp-gas-pump-ui-pump-status}" Margin="0 0 5 0"/>
             <Button Name="ToggleStatusButton"/>
+            <Control HorizontalExpand="True"/>
+            <Button HorizontalAlignment="Right" Name="SetOutputPressureButton" Text="{Loc comp-gas-pump-ui-pump-set-rate}" Disabled="True" Margin="0 0 5 0"/>
+            <Button Name="SetMaxPressureButton" Text="{Loc comp-gas-pump-ui-pump-set-max}" />
         </BoxContainer>
-
         <BoxContainer Orientation="Horizontal" HorizontalExpand="True">
             <Label Text="{Loc comp-gas-pump-ui-pump-output-pressure}"/>
-            <Control MinSize="5 0" />
-            <LineEdit Name="PumpPressureOutputInput" MinSize="70 0" />
-            <Control MinSize="5 0" />
-            <Button Name="SetMaxPressureButton" Text="{Loc comp-gas-pump-ui-pump-set-max}" />
-            <Control MinSize="5 0" />
-            <Control HorizontalExpand="True" />
-            <Button Name="SetOutputPressureButton" Text="{Loc comp-gas-pump-ui-pump-set-rate}" HorizontalAlignment="Right" Disabled="True"/>
+            <FloatSpinBox HorizontalExpand="True" Name="PumpPressureOutputInput" MinSize="70 0" />
         </BoxContainer>
     </BoxContainer>
-</DefaultWindow>
+</controls:FancyWindow>

Content.Client/Atmos/UI/GasPressurePumpWindow.xaml.cs

@@ -1,27 +1,34 @@
-using System;
-using System.Collections.Generic;
-using System.Globalization;
-using Content.Client.Atmos.EntitySystems;
+using Content.Client.UserInterface.Controls;
 using Content.Shared.Atmos;
-using Content.Shared.Atmos.Prototypes;
 using Robust.Client.AutoGenerated;
-using Robust.Client.UserInterface.Controls;
 using Robust.Client.UserInterface.CustomControls;
 using Robust.Client.UserInterface.XAML;
-using Robust.Shared.Localization;
 
 namespace Content.Client.Atmos.UI
 {
     /// <summary>
     /// Client-side UI used to control a gas pressure pump.
     /// </summary>
     [GenerateTypedNameReferences]
-    public sealed partial class GasPressurePumpWindow : DefaultWindow
+    public sealed partial class GasPressurePumpWindow : FancyWindow
     {
         public bool PumpStatus = true;
 
         public event Action? ToggleStatusButtonPressed;
-        public event Action<string>? PumpOutputPressureChanged;
+        public event Action<float>? PumpOutputPressureChanged;
+
+        public float MaxPressure
+        {
+            get => _maxPressure;
+            set
+            {
+                _maxPressure = value;
+
+                PumpPressureOutputInput.Value = MathF.Min(value, PumpPressureOutputInput.Value);
+            }
+        }
+
+        private float _maxPressure = Atmospherics.MaxOutputPressure;
 
         public GasPressurePumpWindow()
         {
@@ -30,23 +37,25 @@ public GasPressurePumpWindow()
             ToggleStatusButton.OnPressed += _ => SetPumpStatus(!PumpStatus);
             ToggleStatusButton.OnPressed += _ => ToggleStatusButtonPressed?.Invoke();
 
-            PumpPressureOutputInput.OnTextChanged += _ => SetOutputPressureButton.Disabled = false;
+            PumpPressureOutputInput.OnValueChanged += _ => SetOutputPressureButton.Disabled = false;
+
             SetOutputPressureButton.OnPressed += _ =>
             {
-                PumpOutputPressureChanged?.Invoke(PumpPressureOutputInput.Text ??= "");
+                PumpPressureOutputInput.Value = Math.Clamp(PumpPressureOutputInput.Value, 0f, _maxPressure);
+                PumpOutputPressureChanged?.Invoke(PumpPressureOutputInput.Value);
                 SetOutputPressureButton.Disabled = true;
             };
 
             SetMaxPressureButton.OnPressed += _ =>
             {
-                PumpPressureOutputInput.Text = Atmospherics.MaxOutputPressure.ToString(CultureInfo.CurrentCulture);
+                PumpPressureOutputInput.Value = _maxPressure;
                 SetOutputPressureButton.Disabled = false;
             };
         }
 
         public void SetOutputPressure(float pressure)
         {
-            PumpPressureOutputInput.Text = pressure.ToString(CultureInfo.CurrentCulture);
+            PumpPressureOutputInput.Value = pressure;
         }
 
         public void SetPumpStatus(bool enabled)

Content.Client/Input/ContentContexts.cs

@@ -58,6 +58,7 @@ public static void SetupContexts(IInputContextContainer contexts)
             human.AddFunction(ContentKeyFunctions.SwapHands);
             human.AddFunction(ContentKeyFunctions.Drop);
             human.AddFunction(ContentKeyFunctions.UseItemInHand);
+            human.AddFunction(ContentKeyFunctions.CockGun);
             human.AddFunction(ContentKeyFunctions.AltUseItemInHand);
             human.AddFunction(ContentKeyFunctions.OpenCharacterMenu);
             human.AddFunction(ContentKeyFunctions.OpenEmotesMenu);
@@ -102,6 +103,7 @@ public static void SetupContexts(IInputContextContainer contexts)
             aghost.AddFunction(ContentKeyFunctions.SwapHands);
             aghost.AddFunction(ContentKeyFunctions.Drop);
             aghost.AddFunction(ContentKeyFunctions.UseItemInHand);
+            aghost.AddFunction(ContentKeyFunctions.CockGun);
             aghost.AddFunction(ContentKeyFunctions.AltUseItemInHand);
             aghost.AddFunction(ContentKeyFunctions.ActivateItemInWorld);
             aghost.AddFunction(ContentKeyFunctions.ThrowItemInHand);

Content.Client/Options/UI/Tabs/KeyRebindTab.xaml.cs

@@ -177,6 +177,7 @@ void AddCheckBox(string checkBoxName, bool currentState, Action<BaseButton.Butto
             AddButton(EngineKeyFunctions.UseSecondary);
             AddButton(ContentKeyFunctions.UseItemInHand);
             AddButton(ContentKeyFunctions.AltUseItemInHand);
+            AddButton(ContentKeyFunctions.CockGun);
             AddButton(ContentKeyFunctions.ActivateItemInWorld);
             AddButton(ContentKeyFunctions.AltActivateItemInWorld);
             AddButton(ContentKeyFunctions.Drop);

Content.Client/Weapons/Ranged/Systems/GunSystem.AmmoCounter.cs

@@ -311,15 +311,16 @@ private void FillBulletRow(int currentIndex, bool?[] bullets, Control container,
                 {
                     MinSize = texture.Size * scale,
                 };
-                if (i == currentIndex)
-                {
-                    box.AddChild(new TextureRect
-                    {
-                        Texture = texture,
-                        TextureScale = new Vector2(scale, scale),
-                        ModulateSelfOverride = Color.LimeGreen,
-                    });
-                }
+                // Sunrise-Edit: А как играть в рускую рулетку с этой хуйней?
+                // if (i == currentIndex)
+                // {
+                //     box.AddChild(new TextureRect
+                //     {
+                //         Texture = texture,
+                //         TextureScale = new Vector2(scale, scale),
+                //         ModulateSelfOverride = Color.LimeGreen,
+                //     });
+                // }
                 Color color;
                 Texture bulletTexture = texture;
 

Content.Client/Weapons/Ranged/Systems/GunSystem.cs

@@ -322,6 +322,27 @@ public override void Shoot(EntityUid gunUid, GunComponent gun, List<(EntityUid?
                         Audio.PlayPredicted(gun.SoundEmpty, gunUid, user);
                     }
 
+                    if (IsClientSide(ent!.Value))
+                        Del(ent.Value);
+
+                    break;
+                case HitScanCartridgeAmmoComponent hitScanCartridge:
+                    if (!hitScanCartridge.Spent)
+                    {
+                        SetHitscanCartridgeSpent(ent!.Value, hitScanCartridge, true);
+                        MuzzleFlash(gunUid, hitScanCartridge, worldAngle, user);
+                        Audio.PlayPredicted(gun.SoundGunshotModified, gunUid, user);
+                        Recoil(user, direction, gun.CameraRecoilScalarModified);
+                        // TODO: Can't predict entity deletions.
+                        //if (cartridge.DeleteOnSpawn)
+                        //    Del(cartridge.Owner);
+                    }
+                    else
+                    {
+                        userImpulse = false;
+                        Audio.PlayPredicted(gun.SoundEmpty, gunUid, user);
+                    }
+
                     if (IsClientSide(ent!.Value))
                         Del(ent.Value);
 

Content.Server/Atmos/Monitor/Systems/AtmosMonitoringSystem.cs

@@ -11,6 +11,7 @@
 using Content.Server.Power.EntitySystems;
 using Content.Shared.Atmos;
 using Content.Shared.Atmos.Monitor;
+using Content.Shared.Atmos.Piping.Components;
 using Content.Shared.DeviceNetwork;
 using Content.Shared.Power;
 using Content.Shared.Tag;