From 25fc23c275451ba62a7284be9733d0de46262752 Mon Sep 17 00:00:00 2001
From: AwareFoxy <135021509+AwareFoxy@users.noreply.github.com>
Date: Sat, 7 Dec 2024 01:45:50 +0100
Subject: [PATCH 01/18] Audio Admin Panel (#125)
* first
* fix govna
* forgot about using FUCK
---
.../UI/Tabs/AdminTab/AdminTab.xaml | 3 +
.../UI/Audio/AdminAudioPanelEui.cs | 138 ++++++++++++
.../UI/Audio/Widgets/AdminAudioPanel.xaml | 50 +++++
.../UI/Audio/Widgets/AdminAudioPanel.xaml.cs | 185 ++++++++++++++++
.../UI/Audio/AdminAudioPanelEui.cs | 121 +++++++++++
.../UI/Audio/AdminAudioPanelSystem.cs | 204 ++++++++++++++++++
.../Audio/Commands/OpenAudioPanelCommand.cs | 27 +++
.../UI/Audio/AdminAudioPanelEuiState.cs | 75 +++++++
.../audio/widgets/admin-audio-panel.ftl | 10 +
.../tabs/admin-tab/player-actions-window.ftl | 1 +
10 files changed, 814 insertions(+)
create mode 100644 Content.Client/_CorvaxNext/Administration/UI/Audio/AdminAudioPanelEui.cs
create mode 100644 Content.Client/_CorvaxNext/Administration/UI/Audio/Widgets/AdminAudioPanel.xaml
create mode 100644 Content.Client/_CorvaxNext/Administration/UI/Audio/Widgets/AdminAudioPanel.xaml.cs
create mode 100644 Content.Server/_CorvaxNext/Administration/UI/Audio/AdminAudioPanelEui.cs
create mode 100644 Content.Server/_CorvaxNext/Administration/UI/Audio/AdminAudioPanelSystem.cs
create mode 100644 Content.Server/_CorvaxNext/Administration/UI/Audio/Commands/OpenAudioPanelCommand.cs
create mode 100644 Content.Shared/_CorvaxNext/Administration/UI/Audio/AdminAudioPanelEuiState.cs
create mode 100644 Resources/Locale/ru-RU/_CorvaxNext/audio/widgets/admin-audio-panel.ftl
diff --git a/Content.Client/Administration/UI/Tabs/AdminTab/AdminTab.xaml b/Content.Client/Administration/UI/Tabs/AdminTab/AdminTab.xaml
index 8b68487547f..796af9c5735 100644
--- a/Content.Client/Administration/UI/Tabs/AdminTab/AdminTab.xaml
+++ b/Content.Client/Administration/UI/Tabs/AdminTab/AdminTab.xaml
@@ -16,6 +16,9 @@
+
+
+
diff --git a/Content.Client/_CorvaxNext/Administration/UI/Audio/AdminAudioPanelEui.cs b/Content.Client/_CorvaxNext/Administration/UI/Audio/AdminAudioPanelEui.cs
new file mode 100644
index 00000000000..806d55cd407
--- /dev/null
+++ b/Content.Client/_CorvaxNext/Administration/UI/Audio/AdminAudioPanelEui.cs
@@ -0,0 +1,138 @@
+using Content.Client.Eui;
+using Content.Client._CorvaxNext.Administration.UI.Audio.Widgets;
+using Content.Shared.Eui;
+using Content.Shared._CorvaxNext.Administration.UI.Audio;
+using Robust.Shared.Audio.Components;
+using Robust.Shared.Audio.Systems;
+using Robust.Shared.Utility;
+
+namespace Content.Client._CorvaxNext.Administration.UI.Audio;
+
+public sealed partial class AdminAudioPanelEui : BaseEui
+{
+ [Dependency] private readonly IEntitySystemManager _entitySystem = default!;
+ [Dependency] private readonly IEntityManager _entity = default!;
+
+ private SharedAudioSystem _audioSystem;
+
+ private AdminAudioPanelEuiState? _state = null;
+ private AdminAudioPanel? _adminAudioPanel = null;
+
+ public AdminAudioPanelEui() : base()
+ {
+ IoCManager.InjectDependencies(this);
+ _audioSystem = _entitySystem.GetEntitySystem();
+ }
+
+ public override void HandleState(EuiStateBase state)
+ {
+ if (state is AdminAudioPanelEuiState adminAudioPanelState)
+ {
+ _state = adminAudioPanelState;
+ UpdateUI();
+ }
+ }
+
+ public override void Opened()
+ {
+ _adminAudioPanel = new AdminAudioPanel();
+ _adminAudioPanel.OpenCentered();
+
+ _adminAudioPanel.OnPlayButtonEnabled += () => Play();
+ _adminAudioPanel.OnPauseButtonEnabled += () => Pause();
+ _adminAudioPanel.OnStopButtonEnabled += () => Stop();
+ _adminAudioPanel.OnAddTrackPressed += (track) => AddTrack(track);
+ _adminAudioPanel.OnPlaybackReleased += (ratio) => SetPlayback(ratio);
+ _adminAudioPanel.OnGlobalCheckboxToggled += (toggled) => ChangeGlobalToggled(toggled);
+ _adminAudioPanel.OnVolumeLineTextChanged += (volume) => SetVolume(volume);
+ _adminAudioPanel.OnSelectPlayer += (guid) => SelectPlayer(guid);
+ _adminAudioPanel.OnUnselectPlayer += (guid) => UnselectPlayer(guid);
+ }
+
+ public override void Closed()
+ {
+ if (_adminAudioPanel != null)
+ _adminAudioPanel.Close();
+ }
+
+ public void Play()
+ {
+ var message = new AdminAudioPanelEuiMessage.Play();
+ SendMessage(message);
+ }
+
+ public void Stop()
+ {
+ var message = new AdminAudioPanelEuiMessage.Stop();
+ SendMessage(message);
+ }
+
+ public void Pause()
+ {
+ var message = new AdminAudioPanelEuiMessage.Pause();
+ SendMessage(message);
+ }
+
+ public void SetPlayback(float ratio)
+ {
+ var message = new AdminAudioPanelEuiMessage.SetPlaybackPosition(ratio);
+ SendMessage(message);
+ }
+
+ public void AddTrack(string track)
+ {
+ var message = new AdminAudioPanelEuiMessage.AddTrack(track);
+ SendMessage(message);
+ }
+
+ public void ChangeGlobalToggled(bool toggled)
+ {
+ var message = new AdminAudioPanelEuiMessage.GlobalToggled(toggled);
+ SendMessage(message);
+ }
+
+ public void SetVolume(float volume)
+ {
+ var message = new AdminAudioPanelEuiMessage.SetVolume(volume);
+ SendMessage(message);
+ }
+
+ private void SelectPlayer(Guid player)
+ {
+ var message = new AdminAudioPanelEuiMessage.SelectPlayer(player);
+ SendMessage(message);
+ }
+
+ private void UnselectPlayer(Guid player)
+ {
+ var message = new AdminAudioPanelEuiMessage.UnselectPlayer(player);
+ SendMessage(message);
+ }
+
+ private void UpdateUI()
+ {
+ if (_adminAudioPanel is not { })
+ return;
+
+ if (_state is not { })
+ return;
+
+ var audioEntity = _entity.GetEntity(_state.Audio);
+
+ _adminAudioPanel.SetAudioStream(audioEntity);
+ _adminAudioPanel.UpdateGlobalToggled(_state.Global);
+ _adminAudioPanel.UpdatePlayersContainer(_state.Players, _state.SelectedPlayers);
+ _adminAudioPanel.UpdatePlayingState(_state.Playing);
+ _adminAudioPanel.UpdateQueue(_state.Queue);
+ _adminAudioPanel.UpdateVolume(_state.Volume);
+
+ if (_entity.TryGetComponent(audioEntity, out var audio))
+ {
+ _adminAudioPanel.UpdateCurrentTrackLabel(audio.FileName);
+ }
+ else
+ {
+ _adminAudioPanel.UpdateCurrentTrackLabel(Loc.GetString("admin-audio-panel-track-name-nothing-playing"));
+ }
+ }
+}
diff --git a/Content.Client/_CorvaxNext/Administration/UI/Audio/Widgets/AdminAudioPanel.xaml b/Content.Client/_CorvaxNext/Administration/UI/Audio/Widgets/AdminAudioPanel.xaml
new file mode 100644
index 00000000000..79e45b2bc8d
--- /dev/null
+++ b/Content.Client/_CorvaxNext/Administration/UI/Audio/Widgets/AdminAudioPanel.xaml
@@ -0,0 +1,50 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/Content.Client/_CorvaxNext/Administration/UI/Audio/Widgets/AdminAudioPanel.xaml.cs b/Content.Client/_CorvaxNext/Administration/UI/Audio/Widgets/AdminAudioPanel.xaml.cs
new file mode 100644
index 00000000000..21af1696611
--- /dev/null
+++ b/Content.Client/_CorvaxNext/Administration/UI/Audio/Widgets/AdminAudioPanel.xaml.cs
@@ -0,0 +1,185 @@
+using Robust.Client.UserInterface.Controls;
+using Robust.Client.AutoGenerated;
+using Robust.Client.UserInterface.CustomControls;
+using Robust.Client.UserInterface.XAML;
+using Robust.Shared.Utility;
+using System.Linq;
+using Robust.Shared.Timing;
+using Robust.Shared.Audio.Components;
+using Robust.Shared.Audio.Systems;
+
+namespace Content.Client._CorvaxNext.Administration.UI.Audio.Widgets;
+
+[GenerateTypedNameReferences]
+public sealed partial class AdminAudioPanel : DefaultWindow
+{
+ [Dependency] private readonly IEntityManager _entity = default!;
+ [Dependency] private readonly IEntitySystemManager _entitySystem = default!;
+
+ private readonly SharedAudioSystem _audioSystem;
+
+ public event Action? OnPlayButtonEnabled;
+ public event Action? OnStopButtonEnabled;
+ public event Action? OnPauseButtonEnabled;
+ public event Action? OnPlaybackReleased;
+ public event Action? OnVolumeLineTextChanged;
+ public event Action? OnAddTrackPressed;
+ public event Action? OnGlobalCheckboxToggled;
+ public event Action? OnSelectPlayer;
+ public event Action? OnUnselectPlayer;
+
+ private string _volumeLineText = "";
+ private EntityUid _audio;
+
+ public AdminAudioPanel()
+ {
+ RobustXamlLoader.Load(this);
+ IoCManager.InjectDependencies(this);
+
+ _audioSystem = _entitySystem.GetEntitySystem();
+
+ PlayButton.OnToggled += (args) =>
+ {
+ if (args.Button.Pressed)
+ {
+ OnPlayButtonEnabled?.Invoke();
+ }
+ else
+ {
+ PlayButton.Pressed = true;
+ }
+ };
+ StopButton.OnPressed += (args) =>
+ {
+ if (!PlayButton.Pressed)
+ return;
+
+ OnStopButtonEnabled?.Invoke();
+ PlayButton.Pressed = false;
+ };
+ PauseButton.OnPressed += (args) =>
+ {
+ if (!PlayButton.Pressed)
+ return;
+
+ OnPauseButtonEnabled?.Invoke();
+ PlayButton.Pressed = false;
+ };
+ PlaybackSlider.OnReleased += (slider) => OnPlaybackReleased?.Invoke(slider.Value);
+ VolumeLine.OnTextEntered += (args) =>
+ {
+ // performs validation of text the user is typing to field
+ // doesn't let type something that isn't a parsible value
+ if (float.TryParse(args.Text, out var result))
+ {
+ _volumeLineText = args.Text;
+ OnVolumeLineTextChanged?.Invoke(result);
+ }
+ else
+ {
+ args.Control.SetText(_volumeLineText);
+ }
+ };
+ AddTrackButton.OnPressed += (args) =>
+ {
+ OnAddTrackPressed?.Invoke(TrackPathLine.Text);
+ TrackPathLine.SetText("");
+ };
+ GlobalCheckbox.OnToggled += (args) => OnGlobalCheckboxToggled?.Invoke(args.Pressed);
+ }
+
+ public void SetAudioStream(EntityUid audio)
+ {
+ _audio = audio;
+ }
+
+ protected override void FrameUpdate(FrameEventArgs args)
+ {
+ if (_entity.TryGetComponent(_audio, out var audio))
+ {
+ var currentTrackLength = _audioSystem.GetAudioLength(audio.FileName);
+ var playbackPosition = TimeSpan.FromSeconds(audio.PlaybackPosition);
+
+ UpdateDurationLabel(playbackPosition, currentTrackLength);
+ if (!PlaybackSlider.Grabbed)
+ UpdatePlaybackPosition(currentTrackLength, playbackPosition);
+ }
+ }
+
+ public void UpdatePlayersContainer(Dictionary players, HashSet selectedPlayers)
+ {
+ PlayersContainer.RemoveAllChildren();
+
+ foreach (var player in players)
+ {
+ var newButton = new Button
+ {
+ ClipText = true,
+ ToggleMode = true,
+ Text = player.Value,
+ HorizontalExpand = true,
+ Pressed = selectedPlayers.FirstOrNull(selectedPlayer => selectedPlayer == player.Key) != null,
+ Disabled = GlobalCheckbox.Pressed,
+ };
+ newButton.OnToggled += (args) =>
+ {
+ if (args.Pressed)
+ {
+ OnSelectPlayer?.Invoke(player.Key);
+ }
+ else
+ {
+ OnUnselectPlayer?.Invoke(player.Key);
+ }
+ };
+
+ PlayersContainer.AddChild(newButton);
+ }
+ }
+
+ public void UpdatePlayingState(bool playing)
+ {
+ PlayButton.Pressed = playing;
+ }
+
+ public void UpdateGlobalToggled(bool toggled)
+ {
+ GlobalCheckbox.Pressed = toggled;
+ }
+
+ public void UpdatePlaybackPosition(TimeSpan currentTrackLength, TimeSpan playbackPosition)
+ {
+ PlaybackSlider.MaxValue = (float)currentTrackLength.TotalSeconds;
+ PlaybackSlider.SetValueWithoutEvent((float)playbackPosition.TotalSeconds);
+ }
+
+ public void UpdateDurationLabel(TimeSpan playbackPosition, TimeSpan currentTrackLength)
+ {
+ DurationLabel.Text = $@"{playbackPosition:mm\:ss} / {currentTrackLength:mm\:ss}";
+ }
+
+ public void UpdateCurrentTrackLabel(string currentTrack)
+ {
+ TrackName.Text = currentTrack.Split("/").Last();
+ }
+
+ public void UpdateQueue(Queue queue)
+ {
+ TrackList.RemoveAllChildren();
+
+ foreach (var track in queue.ToList())
+ {
+ var label = new Label()
+ {
+ Text = track,
+ };
+ TrackList.AddChild(label);
+ }
+ }
+
+ public void UpdateVolume(float volume)
+ {
+ VolumeLine.SetText(volume.ToString());
+ _volumeLineText = volume.ToString();
+ }
+}
diff --git a/Content.Server/_CorvaxNext/Administration/UI/Audio/AdminAudioPanelEui.cs b/Content.Server/_CorvaxNext/Administration/UI/Audio/AdminAudioPanelEui.cs
new file mode 100644
index 00000000000..b36493970a6
--- /dev/null
+++ b/Content.Server/_CorvaxNext/Administration/UI/Audio/AdminAudioPanelEui.cs
@@ -0,0 +1,121 @@
+using Content.Server.Administration.Managers;
+using Content.Server.EUI;
+using Content.Shared.Administration;
+using Content.Shared.Eui;
+using Content.Shared._CorvaxNext.Administration.UI.Audio;
+using Robust.Server.Player;
+using Robust.Shared.ContentPack;
+using Robust.Shared.Enums;
+using Robust.Shared.Player;
+using Robust.Shared.Utility;
+
+namespace Content.Server._CorvaxNext.Administration.UI.Audio;
+
+public sealed partial class AdminAudioPanelEui : BaseEui
+{
+ [Dependency] private readonly IAdminManager _adminManager = default!;
+ [Dependency] private readonly IPlayerManager _playerManager = default!;
+ [Dependency] private readonly IEntityManager _entityManager = default!;
+ [Dependency] private readonly IResourceManager _resourceManager = default!;
+
+ private Dictionary _availablePlayers = new();
+
+ private readonly AdminAudioPanelSystem _audioPanel;
+
+ public AdminAudioPanelEui() : base()
+ {
+ IoCManager.InjectDependencies(this);
+
+ _audioPanel = IoCManager.Resolve().GetEntitySystem();
+
+ foreach (var player in Filter.Broadcast().Recipients)
+ {
+ _availablePlayers.Add(player.UserId.UserId, player.Name);
+ }
+
+ _audioPanel.AudioUpdated += () => StateDirty();
+
+ _playerManager.PlayerStatusChanged += (object? sender, SessionStatusEventArgs args) =>
+ {
+ switch (args.NewStatus)
+ {
+ case SessionStatus.InGame:
+ _availablePlayers.Add(args.Session.UserId.UserId, args.Session.Name);
+ StateDirty();
+ break;
+ case SessionStatus.Disconnected:
+ _availablePlayers.Remove(args.Session.UserId.UserId);
+ StateDirty();
+ break;
+ }
+ };
+ }
+
+ public override void Opened()
+ {
+ StateDirty();
+ }
+
+ public override AdminAudioPanelEuiState GetNewState()
+ {
+ return new(
+ _audioPanel.Playing,
+ _entityManager.GetNetEntity(_audioPanel.AudioEntity),
+ _audioPanel.AudioParams.Volume,
+ _audioPanel.Queue,
+ _audioPanel.Global,
+ _availablePlayers,
+ _audioPanel.SelectedPlayers
+ );
+ }
+
+ public override void HandleMessage(EuiMessageBase msg)
+ {
+ base.HandleMessage(msg);
+
+ if (msg is not AdminAudioPanelEuiMessage.AdminAudioPanelEuiMessageBase)
+ return;
+
+ if (!_adminManager.HasAdminFlag(Player, AdminFlags.Fun))
+ {
+ Close();
+ return;
+ }
+
+ switch (msg)
+ {
+ case AdminAudioPanelEuiMessage.Play:
+ _audioPanel.Play();
+ break;
+ case AdminAudioPanelEuiMessage.Pause:
+ _audioPanel.Pause();
+ break;
+ case AdminAudioPanelEuiMessage.Stop:
+ _audioPanel.Stop();
+ break;
+ case AdminAudioPanelEuiMessage.AddTrack addTrack:
+ var filename = addTrack.Filename.Trim();
+ if (_resourceManager.ContentFileExists(new ResPath(filename).ToRootedPath()))
+ _audioPanel.AddToQueue(filename);
+ break;
+ case AdminAudioPanelEuiMessage.SetVolume setVolume:
+ _audioPanel.SetVolume(setVolume.Volume);
+ break;
+ case AdminAudioPanelEuiMessage.SetPlaybackPosition setPlayback:
+ _audioPanel.SetPlaybackPosition(setPlayback.Position);
+ break;
+ case AdminAudioPanelEuiMessage.SelectPlayer selectPlayer:
+ _audioPanel.SelectPlayer(selectPlayer.Player);
+ break;
+ case AdminAudioPanelEuiMessage.UnselectPlayer unselectPlayer:
+ _audioPanel.UnselectPlayer(unselectPlayer.Player);
+ break;
+ case AdminAudioPanelEuiMessage.GlobalToggled globalToggled:
+ _audioPanel.SetGlobal(globalToggled.Toggled);
+ break;
+ default:
+ return;
+ }
+ StateDirty();
+ }
+}
diff --git a/Content.Server/_CorvaxNext/Administration/UI/Audio/AdminAudioPanelSystem.cs b/Content.Server/_CorvaxNext/Administration/UI/Audio/AdminAudioPanelSystem.cs
new file mode 100644
index 00000000000..a0d517d635d
--- /dev/null
+++ b/Content.Server/_CorvaxNext/Administration/UI/Audio/AdminAudioPanelSystem.cs
@@ -0,0 +1,204 @@
+using System.Linq;
+using Robust.Server.Player;
+using Robust.Shared.Audio;
+using Robust.Shared.Audio.Components;
+using Robust.Shared.Audio.Systems;
+using Robust.Shared.Player;
+using Robust.Shared.Timing;
+
+namespace Content.Server._CorvaxNext.Administration.UI.Audio;
+
+public sealed partial class AdminAudioPanelSystem : EntitySystem
+{
+ [Dependency] private readonly SharedAudioSystem _audio = default!;
+ [Dependency] private readonly IPlayerManager _playerManager = default!;
+ [Dependency] private readonly IGameTiming _timing = default!;
+
+ private (EntityUid Entity, AudioComponent Audio)? _audioStream;
+ private List _selectedPlayers = new();
+
+ public Action? AudioUpdated;
+
+ public override void Update(float frameTime)
+ {
+ base.Update(frameTime);
+
+ if (!Playing)
+ return;
+
+ if (_audioStream is { } audioStream)
+ {
+ if (Exists(audioStream.Entity) &&
+ (audioStream.Audio.State == AudioState.Playing || audioStream.Audio.State == AudioState.Paused))
+ return;
+ else
+ {
+ _audioStream = null;
+ Queue.TryDequeue(out _);
+ AudioUpdated?.Invoke();
+ }
+ }
+
+ if (CurrentTrack != null)
+ {
+ _audioStream = _audio.PlayGlobal(CurrentTrack, Global ? Filter.Broadcast() : Filter.Empty().AddPlayers(_selectedPlayers), Global, AudioParams);
+ AudioUpdated?.Invoke();
+ }
+ }
+
+ private void SetStreamState(AudioState state)
+ {
+ if (_audioStream != null)
+ _audio.SetState(_audioStream.Value.Entity, state, true, _audioStream.Value.Audio);
+ AudioUpdated?.Invoke();
+ }
+
+ ///
+ /// Stops sound and starts its over with current params with playback position of stopped sound.
+ /// Used, for example, when need to update selected players.
+ ///
+ private void RecreateSound()
+ {
+ if (!Playing)
+ return;
+
+ if (_audioStream is not { } audioStream)
+ return;
+
+ Playing = false;
+
+ var playback = (float)((audioStream.Audio.PauseTime ?? _timing.CurTime) - audioStream.Audio.AudioStart).TotalSeconds;
+
+ _audio.Stop(audioStream.Entity, audioStream.Audio);
+
+ _audioStream = _audio.PlayGlobal(CurrentTrack, Global ? Filter.Broadcast() : Filter.Empty().AddPlayers(_selectedPlayers), Global, AudioParams);
+ _audio.SetPlaybackPosition(_audioStream, playback);
+
+ Playing = true;
+ AudioUpdated?.Invoke();
+ }
+
+ #region Public API
+ public readonly Queue Queue = new();
+ public string? CurrentTrack
+ {
+ get
+ {
+ if (Queue.TryPeek(out var track))
+ return track;
+ return null;
+ }
+ }
+ public AudioParams AudioParams { get; private set; } = AudioParams.Default;
+ public bool Playing { get; private set; } = false;
+ public bool Global { get; private set; } = true;
+ public HashSet SelectedPlayers => _selectedPlayers.Select(player => player.UserId.UserId).ToHashSet();
+ public EntityUid AudioEntity => _audioStream?.Entity ?? EntityUid.Invalid;
+
+ public void AddToQueue(string filename)
+ {
+ Queue.Enqueue(filename);
+ AudioUpdated?.Invoke();
+ }
+
+ public bool Play()
+ {
+ if (_audioStream != null && _audioStream.Value.Audio.State == AudioState.Paused)
+ {
+ return Resume();
+ }
+
+ Playing = true;
+ AudioUpdated?.Invoke();
+ return Playing;
+ }
+
+ public void Pause()
+ {
+ if (_audioStream != null && _audioStream.Value.Audio.State == AudioState.Playing)
+ SetStreamState(AudioState.Paused);
+
+ Playing = false;
+ AudioUpdated?.Invoke();
+ }
+
+ public bool Resume()
+ {
+ if (_audioStream != null && _audioStream.Value.Audio.State == AudioState.Paused)
+ SetStreamState(AudioState.Playing);
+
+ Playing = true;
+ AudioUpdated?.Invoke();
+ return Playing;
+ }
+
+ public bool Stop()
+ {
+ if (_audioStream != null && _audioStream.Value.Audio.State != AudioState.Stopped)
+ {
+ _audio.Stop(_audioStream.Value.Entity, _audioStream.Value.Audio);
+ _audioStream = null;
+ Queue.TryDequeue(out _);
+ }
+
+ Playing = false;
+ AudioUpdated?.Invoke();
+ return !Playing;
+ }
+
+ public void SetVolume(float volume)
+ {
+ AudioParams = AudioParams.WithVolume(volume);
+ if (_audioStream != null)
+ _audio.SetVolume(_audioStream.Value.Entity, volume, _audioStream.Value.Audio);
+ AudioUpdated?.Invoke();
+ }
+
+ public void SelectPlayer(Guid player)
+ {
+ if (SelectedPlayers.Contains(player))
+ return;
+
+ var session = _playerManager.NetworkedSessions.FirstOrDefault(session => session.UserId.UserId == player);
+
+ if (session == null)
+ return;
+
+ _selectedPlayers.Add(session);
+ RecreateSound();
+ AudioUpdated?.Invoke();
+ }
+
+ public void UnselectPlayer(Guid player)
+ {
+ if (!SelectedPlayers.Contains(player))
+ return;
+
+ var session = _playerManager.NetworkedSessions.FirstOrDefault(session => session.UserId.UserId == player);
+
+ if (session == null)
+ return;
+
+ _selectedPlayers.Remove(session);
+ RecreateSound();
+ AudioUpdated?.Invoke();
+ }
+
+ public void SetPlaybackPosition(float position)
+ {
+ if (CurrentTrack != null && _audioStream is { } audioStream)
+ {
+ _audio.SetPlaybackPosition(audioStream, position);
+ }
+ AudioUpdated?.Invoke();
+ }
+
+ public void SetGlobal(bool global)
+ {
+ Global = global;
+ RecreateSound();
+ AudioUpdated?.Invoke();
+ }
+
+ #endregion
+}
diff --git a/Content.Server/_CorvaxNext/Administration/UI/Audio/Commands/OpenAudioPanelCommand.cs b/Content.Server/_CorvaxNext/Administration/UI/Audio/Commands/OpenAudioPanelCommand.cs
new file mode 100644
index 00000000000..7b6b18e32d5
--- /dev/null
+++ b/Content.Server/_CorvaxNext/Administration/UI/Audio/Commands/OpenAudioPanelCommand.cs
@@ -0,0 +1,27 @@
+using Content.Server.Administration;
+using Content.Server.EUI;
+using Content.Shared.Administration;
+using Robust.Shared.Console;
+
+namespace Content.Server._CorvaxNext.Administration.UI.Audio.Commands;
+
+[AdminCommand(AdminFlags.Fun)]
+public sealed class OpenAudioPanelCommand : IConsoleCommand
+{
+ public string Command => "audiopanel";
+ public string Description => "Opens the admin audio panel panel.";
+ public string Help => $"Usage: {Command}";
+
+ public void Execute(IConsoleShell shell, string argStr, string[] args)
+ {
+ if (shell.Player is not { } player)
+ {
+ shell.WriteError(Loc.GetString("shell-cannot-run-command-from-server"));
+ return;
+ }
+
+ var eui = IoCManager.Resolve();
+ var ui = new AdminAudioPanelEui();
+ eui.OpenEui(ui, player);
+ }
+}
diff --git a/Content.Shared/_CorvaxNext/Administration/UI/Audio/AdminAudioPanelEuiState.cs b/Content.Shared/_CorvaxNext/Administration/UI/Audio/AdminAudioPanelEuiState.cs
new file mode 100644
index 00000000000..26e57e1874a
--- /dev/null
+++ b/Content.Shared/_CorvaxNext/Administration/UI/Audio/AdminAudioPanelEuiState.cs
@@ -0,0 +1,75 @@
+using Content.Shared.Eui;
+using Robust.Shared.Serialization;
+
+namespace Content.Shared._CorvaxNext.Administration.UI.Audio;
+
+[Serializable, NetSerializable]
+public sealed partial class AdminAudioPanelEuiState(bool playing, NetEntity audio, float volume, Queue queue, bool global, Dictionary players, HashSet selectedPlayers) : EuiStateBase
+{
+ public bool Playing = playing;
+ public NetEntity Audio = audio;
+ public float Volume = volume;
+ public Queue Queue = queue;
+ public bool Global = global;
+ public Dictionary Players = players;
+ public HashSet SelectedPlayers = selectedPlayers;
+};
+
+public static class AdminAudioPanelEuiMessage
+{
+ [Serializable]
+ public abstract class AdminAudioPanelEuiMessageBase : EuiMessageBase
+ {
+ }
+
+ [Serializable, NetSerializable]
+ public sealed partial class Play : AdminAudioPanelEuiMessageBase
+ {
+ }
+
+ [Serializable, NetSerializable]
+ public sealed partial class Pause : AdminAudioPanelEuiMessageBase
+ {
+ }
+
+ [Serializable, NetSerializable]
+ public sealed partial class Stop : AdminAudioPanelEuiMessageBase
+ {
+ }
+
+ [Serializable, NetSerializable]
+ public sealed partial class AddTrack(string filename) : AdminAudioPanelEuiMessageBase
+ {
+ public string Filename = filename;
+ }
+
+ [Serializable, NetSerializable]
+ public sealed partial class SetVolume(float volume) : AdminAudioPanelEuiMessageBase
+ {
+ public float Volume = volume;
+ }
+
+ [Serializable, NetSerializable]
+ public sealed partial class SetPlaybackPosition(float position) : AdminAudioPanelEuiMessageBase
+ {
+ public float Position = position;
+ }
+
+ [Serializable, NetSerializable]
+ public sealed partial class SelectPlayer(Guid player) : AdminAudioPanelEuiMessageBase
+ {
+ public Guid Player = player;
+ }
+
+ [Serializable, NetSerializable]
+ public sealed partial class UnselectPlayer(Guid player) : AdminAudioPanelEuiMessageBase
+ {
+ public Guid Player = player;
+ }
+
+ [Serializable, NetSerializable]
+ public sealed partial class GlobalToggled(bool toggled) : AdminAudioPanelEuiMessageBase
+ {
+ public bool Toggled = toggled;
+ }
+}
diff --git a/Resources/Locale/ru-RU/_CorvaxNext/audio/widgets/admin-audio-panel.ftl b/Resources/Locale/ru-RU/_CorvaxNext/audio/widgets/admin-audio-panel.ftl
new file mode 100644
index 00000000000..5733003e8f3
--- /dev/null
+++ b/Resources/Locale/ru-RU/_CorvaxNext/audio/widgets/admin-audio-panel.ftl
@@ -0,0 +1,10 @@
+admin-audio-panel-title = Панель управления аудио
+admin-audio-panel-current-track-label = Текущий трек
+admin-audio-panel-button-play-text = Играть
+admin-audio-panel-button-pause-text = Пауза
+admin-audio-panel-button-stop-text = Стоп
+admin-audio-panel-volume-line-placeholder = Громкость
+admin-audio-panel-toggle-global-checkbox-label = Слышат все
+admin-audio-panel-trackpath-line-placeholder = Путь к файлу OGG
+admin-audio-panel-add-track-button-text = Добавить трек
+admin-audio-panel-track-name-nothing-playing = Ничего не играет
diff --git a/Resources/Locale/ru-RU/administration/ui/tabs/admin-tab/player-actions-window.ftl b/Resources/Locale/ru-RU/administration/ui/tabs/admin-tab/player-actions-window.ftl
index 5eb1438b100..f3a59f5d58d 100644
--- a/Resources/Locale/ru-RU/administration/ui/tabs/admin-tab/player-actions-window.ftl
+++ b/Resources/Locale/ru-RU/administration/ui/tabs/admin-tab/player-actions-window.ftl
@@ -8,3 +8,4 @@ admin-player-actions-window-shuttle = Вызвать/отозвать шаттл
admin-player-actions-window-admin-logs = Админ логи
admin-player-actions-window-admin-notes = Админ заметки
admin-player-actions-window-admin-fax = Админ факс
+admin-player-actions-window-audio-panel = Аудио панель
From 2e04efadcc9c87af2fa5953f78985271f94b12c7 Mon Sep 17 00:00:00 2001
From: AwareFoxy
Date: Sat, 7 Dec 2024 07:31:01 +0100
Subject: [PATCH 02/18] NoScope 360 AWP kill
---
Content.Shared/CombatMode/CombatModeComponent.cs | 14 ++++++++++++++
.../CombatMode/SharedCombatModeSystem.cs | 9 ++++++++-
2 files changed, 22 insertions(+), 1 deletion(-)
diff --git a/Content.Shared/CombatMode/CombatModeComponent.cs b/Content.Shared/CombatMode/CombatModeComponent.cs
index 124a682d5c7..b26830ad580 100644
--- a/Content.Shared/CombatMode/CombatModeComponent.cs
+++ b/Content.Shared/CombatMode/CombatModeComponent.cs
@@ -48,5 +48,19 @@ public sealed partial class CombatModeComponent : Component
///
[DataField, AutoNetworkedField]
public bool ToggleMouseRotator = true;
+
+ // Corvax-Next-NoScope-Start
+ ///
+ /// If true, sets to 1 degree and
+ /// to false when the owner enters combatmode. This is currently being tested as of 06.12.24,
+ /// so a simple bool switch should suffice.
+ /// Leaving AutoNetworking just in case shitmins need to disable it for someone. Will only take effect when re-enabling combat mode.
+ ///
+ ///
+ /// No effect if is false.
+ ///
+ [DataField, AutoNetworkedField]
+ public bool SmoothRotation = true;
+ // Corvax-Next-NoScope-End
}
}
diff --git a/Content.Shared/CombatMode/SharedCombatModeSystem.cs b/Content.Shared/CombatMode/SharedCombatModeSystem.cs
index 5eed8ee2423..486694a9f36 100644
--- a/Content.Shared/CombatMode/SharedCombatModeSystem.cs
+++ b/Content.Shared/CombatMode/SharedCombatModeSystem.cs
@@ -94,7 +94,14 @@ private void SetMouseRotatorComponents(EntityUid uid, bool value)
{
if (value)
{
- EnsureComp(uid);
+ var rot = EnsureComp(uid); // Corvax-Next-NoScope
+ // Corvax-Next-NoScope-Start
+ if (TryComp(uid, out var comp) && comp.SmoothRotation) // no idea under which (intended) circumstances this can fail (if any), so i'll avoid Comp<>().
+ {
+ rot.AngleTolerance = Angle.FromDegrees(1); // arbitrary
+ rot.Simple4DirMode = false;
+ }
+ // Corvax-Next-NoScope-End
EnsureComp(uid);
}
else
From 833f0eaffa2ac96db39aad339584e6710a146aea Mon Sep 17 00:00:00 2001
From: AwareFoxy <135021509+AwareFoxy@users.noreply.github.com>
Date: Sat, 7 Dec 2024 09:18:45 +0100
Subject: [PATCH 03/18] Apply suggestions from code review
Co-authored-by: FN <37689533+FireNameFN@users.noreply.github.com>
---
Content.Shared/CombatMode/SharedCombatModeSystem.cs | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Content.Shared/CombatMode/SharedCombatModeSystem.cs b/Content.Shared/CombatMode/SharedCombatModeSystem.cs
index 486694a9f36..134fae45867 100644
--- a/Content.Shared/CombatMode/SharedCombatModeSystem.cs
+++ b/Content.Shared/CombatMode/SharedCombatModeSystem.cs
@@ -94,8 +94,8 @@ private void SetMouseRotatorComponents(EntityUid uid, bool value)
{
if (value)
{
- var rot = EnsureComp(uid); // Corvax-Next-NoScope
// Corvax-Next-NoScope-Start
+ var rot = EnsureComp(uid);
if (TryComp(uid, out var comp) && comp.SmoothRotation) // no idea under which (intended) circumstances this can fail (if any), so i'll avoid Comp<>().
{
rot.AngleTolerance = Angle.FromDegrees(1); // arbitrary
From 7722ced70dd501d915c3303127328c07dd8405cf Mon Sep 17 00:00:00 2001
From: AwareFoxy <135021509+AwareFoxy@users.noreply.github.com>
Date: Sat, 7 Dec 2024 18:34:23 +0100
Subject: [PATCH 04/18] Revert "Audio Admin Panel (#125)" (#135)
This reverts commit 25fc23c275451ba62a7284be9733d0de46262752.
---
.../UI/Tabs/AdminTab/AdminTab.xaml | 3 -
.../UI/Audio/AdminAudioPanelEui.cs | 138 ------------
.../UI/Audio/Widgets/AdminAudioPanel.xaml | 50 -----
.../UI/Audio/Widgets/AdminAudioPanel.xaml.cs | 185 ----------------
.../UI/Audio/AdminAudioPanelEui.cs | 121 -----------
.../UI/Audio/AdminAudioPanelSystem.cs | 204 ------------------
.../Audio/Commands/OpenAudioPanelCommand.cs | 27 ---
.../UI/Audio/AdminAudioPanelEuiState.cs | 75 -------
.../audio/widgets/admin-audio-panel.ftl | 10 -
.../tabs/admin-tab/player-actions-window.ftl | 1 -
10 files changed, 814 deletions(-)
delete mode 100644 Content.Client/_CorvaxNext/Administration/UI/Audio/AdminAudioPanelEui.cs
delete mode 100644 Content.Client/_CorvaxNext/Administration/UI/Audio/Widgets/AdminAudioPanel.xaml
delete mode 100644 Content.Client/_CorvaxNext/Administration/UI/Audio/Widgets/AdminAudioPanel.xaml.cs
delete mode 100644 Content.Server/_CorvaxNext/Administration/UI/Audio/AdminAudioPanelEui.cs
delete mode 100644 Content.Server/_CorvaxNext/Administration/UI/Audio/AdminAudioPanelSystem.cs
delete mode 100644 Content.Server/_CorvaxNext/Administration/UI/Audio/Commands/OpenAudioPanelCommand.cs
delete mode 100644 Content.Shared/_CorvaxNext/Administration/UI/Audio/AdminAudioPanelEuiState.cs
delete mode 100644 Resources/Locale/ru-RU/_CorvaxNext/audio/widgets/admin-audio-panel.ftl
diff --git a/Content.Client/Administration/UI/Tabs/AdminTab/AdminTab.xaml b/Content.Client/Administration/UI/Tabs/AdminTab/AdminTab.xaml
index 796af9c5735..8b68487547f 100644
--- a/Content.Client/Administration/UI/Tabs/AdminTab/AdminTab.xaml
+++ b/Content.Client/Administration/UI/Tabs/AdminTab/AdminTab.xaml
@@ -16,9 +16,6 @@
-
-
-
diff --git a/Content.Client/_CorvaxNext/Administration/UI/Audio/AdminAudioPanelEui.cs b/Content.Client/_CorvaxNext/Administration/UI/Audio/AdminAudioPanelEui.cs
deleted file mode 100644
index 806d55cd407..00000000000
--- a/Content.Client/_CorvaxNext/Administration/UI/Audio/AdminAudioPanelEui.cs
+++ /dev/null
@@ -1,138 +0,0 @@
-using Content.Client.Eui;
-using Content.Client._CorvaxNext.Administration.UI.Audio.Widgets;
-using Content.Shared.Eui;
-using Content.Shared._CorvaxNext.Administration.UI.Audio;
-using Robust.Shared.Audio.Components;
-using Robust.Shared.Audio.Systems;
-using Robust.Shared.Utility;
-
-namespace Content.Client._CorvaxNext.Administration.UI.Audio;
-
-public sealed partial class AdminAudioPanelEui : BaseEui
-{
- [Dependency] private readonly IEntitySystemManager _entitySystem = default!;
- [Dependency] private readonly IEntityManager _entity = default!;
-
- private SharedAudioSystem _audioSystem;
-
- private AdminAudioPanelEuiState? _state = null;
- private AdminAudioPanel? _adminAudioPanel = null;
-
- public AdminAudioPanelEui() : base()
- {
- IoCManager.InjectDependencies(this);
- _audioSystem = _entitySystem.GetEntitySystem();
- }
-
- public override void HandleState(EuiStateBase state)
- {
- if (state is AdminAudioPanelEuiState adminAudioPanelState)
- {
- _state = adminAudioPanelState;
- UpdateUI();
- }
- }
-
- public override void Opened()
- {
- _adminAudioPanel = new AdminAudioPanel();
- _adminAudioPanel.OpenCentered();
-
- _adminAudioPanel.OnPlayButtonEnabled += () => Play();
- _adminAudioPanel.OnPauseButtonEnabled += () => Pause();
- _adminAudioPanel.OnStopButtonEnabled += () => Stop();
- _adminAudioPanel.OnAddTrackPressed += (track) => AddTrack(track);
- _adminAudioPanel.OnPlaybackReleased += (ratio) => SetPlayback(ratio);
- _adminAudioPanel.OnGlobalCheckboxToggled += (toggled) => ChangeGlobalToggled(toggled);
- _adminAudioPanel.OnVolumeLineTextChanged += (volume) => SetVolume(volume);
- _adminAudioPanel.OnSelectPlayer += (guid) => SelectPlayer(guid);
- _adminAudioPanel.OnUnselectPlayer += (guid) => UnselectPlayer(guid);
- }
-
- public override void Closed()
- {
- if (_adminAudioPanel != null)
- _adminAudioPanel.Close();
- }
-
- public void Play()
- {
- var message = new AdminAudioPanelEuiMessage.Play();
- SendMessage(message);
- }
-
- public void Stop()
- {
- var message = new AdminAudioPanelEuiMessage.Stop();
- SendMessage(message);
- }
-
- public void Pause()
- {
- var message = new AdminAudioPanelEuiMessage.Pause();
- SendMessage(message);
- }
-
- public void SetPlayback(float ratio)
- {
- var message = new AdminAudioPanelEuiMessage.SetPlaybackPosition(ratio);
- SendMessage(message);
- }
-
- public void AddTrack(string track)
- {
- var message = new AdminAudioPanelEuiMessage.AddTrack(track);
- SendMessage(message);
- }
-
- public void ChangeGlobalToggled(bool toggled)
- {
- var message = new AdminAudioPanelEuiMessage.GlobalToggled(toggled);
- SendMessage(message);
- }
-
- public void SetVolume(float volume)
- {
- var message = new AdminAudioPanelEuiMessage.SetVolume(volume);
- SendMessage(message);
- }
-
- private void SelectPlayer(Guid player)
- {
- var message = new AdminAudioPanelEuiMessage.SelectPlayer(player);
- SendMessage(message);
- }
-
- private void UnselectPlayer(Guid player)
- {
- var message = new AdminAudioPanelEuiMessage.UnselectPlayer(player);
- SendMessage(message);
- }
-
- private void UpdateUI()
- {
- if (_adminAudioPanel is not { })
- return;
-
- if (_state is not { })
- return;
-
- var audioEntity = _entity.GetEntity(_state.Audio);
-
- _adminAudioPanel.SetAudioStream(audioEntity);
- _adminAudioPanel.UpdateGlobalToggled(_state.Global);
- _adminAudioPanel.UpdatePlayersContainer(_state.Players, _state.SelectedPlayers);
- _adminAudioPanel.UpdatePlayingState(_state.Playing);
- _adminAudioPanel.UpdateQueue(_state.Queue);
- _adminAudioPanel.UpdateVolume(_state.Volume);
-
- if (_entity.TryGetComponent(audioEntity, out var audio))
- {
- _adminAudioPanel.UpdateCurrentTrackLabel(audio.FileName);
- }
- else
- {
- _adminAudioPanel.UpdateCurrentTrackLabel(Loc.GetString("admin-audio-panel-track-name-nothing-playing"));
- }
- }
-}
diff --git a/Content.Client/_CorvaxNext/Administration/UI/Audio/Widgets/AdminAudioPanel.xaml b/Content.Client/_CorvaxNext/Administration/UI/Audio/Widgets/AdminAudioPanel.xaml
deleted file mode 100644
index 79e45b2bc8d..00000000000
--- a/Content.Client/_CorvaxNext/Administration/UI/Audio/Widgets/AdminAudioPanel.xaml
+++ /dev/null
@@ -1,50 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/Content.Client/_CorvaxNext/Administration/UI/Audio/Widgets/AdminAudioPanel.xaml.cs b/Content.Client/_CorvaxNext/Administration/UI/Audio/Widgets/AdminAudioPanel.xaml.cs
deleted file mode 100644
index 21af1696611..00000000000
--- a/Content.Client/_CorvaxNext/Administration/UI/Audio/Widgets/AdminAudioPanel.xaml.cs
+++ /dev/null
@@ -1,185 +0,0 @@
-using Robust.Client.UserInterface.Controls;
-using Robust.Client.AutoGenerated;
-using Robust.Client.UserInterface.CustomControls;
-using Robust.Client.UserInterface.XAML;
-using Robust.Shared.Utility;
-using System.Linq;
-using Robust.Shared.Timing;
-using Robust.Shared.Audio.Components;
-using Robust.Shared.Audio.Systems;
-
-namespace Content.Client._CorvaxNext.Administration.UI.Audio.Widgets;
-
-[GenerateTypedNameReferences]
-public sealed partial class AdminAudioPanel : DefaultWindow
-{
- [Dependency] private readonly IEntityManager _entity = default!;
- [Dependency] private readonly IEntitySystemManager _entitySystem = default!;
-
- private readonly SharedAudioSystem _audioSystem;
-
- public event Action? OnPlayButtonEnabled;
- public event Action? OnStopButtonEnabled;
- public event Action? OnPauseButtonEnabled;
- public event Action? OnPlaybackReleased;
- public event Action? OnVolumeLineTextChanged;
- public event Action? OnAddTrackPressed;
- public event Action? OnGlobalCheckboxToggled;
- public event Action? OnSelectPlayer;
- public event Action? OnUnselectPlayer;
-
- private string _volumeLineText = "";
- private EntityUid _audio;
-
- public AdminAudioPanel()
- {
- RobustXamlLoader.Load(this);
- IoCManager.InjectDependencies(this);
-
- _audioSystem = _entitySystem.GetEntitySystem();
-
- PlayButton.OnToggled += (args) =>
- {
- if (args.Button.Pressed)
- {
- OnPlayButtonEnabled?.Invoke();
- }
- else
- {
- PlayButton.Pressed = true;
- }
- };
- StopButton.OnPressed += (args) =>
- {
- if (!PlayButton.Pressed)
- return;
-
- OnStopButtonEnabled?.Invoke();
- PlayButton.Pressed = false;
- };
- PauseButton.OnPressed += (args) =>
- {
- if (!PlayButton.Pressed)
- return;
-
- OnPauseButtonEnabled?.Invoke();
- PlayButton.Pressed = false;
- };
- PlaybackSlider.OnReleased += (slider) => OnPlaybackReleased?.Invoke(slider.Value);
- VolumeLine.OnTextEntered += (args) =>
- {
- // performs validation of text the user is typing to field
- // doesn't let type something that isn't a parsible value
- if (float.TryParse(args.Text, out var result))
- {
- _volumeLineText = args.Text;
- OnVolumeLineTextChanged?.Invoke(result);
- }
- else
- {
- args.Control.SetText(_volumeLineText);
- }
- };
- AddTrackButton.OnPressed += (args) =>
- {
- OnAddTrackPressed?.Invoke(TrackPathLine.Text);
- TrackPathLine.SetText("");
- };
- GlobalCheckbox.OnToggled += (args) => OnGlobalCheckboxToggled?.Invoke(args.Pressed);
- }
-
- public void SetAudioStream(EntityUid audio)
- {
- _audio = audio;
- }
-
- protected override void FrameUpdate(FrameEventArgs args)
- {
- if (_entity.TryGetComponent(_audio, out var audio))
- {
- var currentTrackLength = _audioSystem.GetAudioLength(audio.FileName);
- var playbackPosition = TimeSpan.FromSeconds(audio.PlaybackPosition);
-
- UpdateDurationLabel(playbackPosition, currentTrackLength);
- if (!PlaybackSlider.Grabbed)
- UpdatePlaybackPosition(currentTrackLength, playbackPosition);
- }
- }
-
- public void UpdatePlayersContainer(Dictionary players, HashSet selectedPlayers)
- {
- PlayersContainer.RemoveAllChildren();
-
- foreach (var player in players)
- {
- var newButton = new Button
- {
- ClipText = true,
- ToggleMode = true,
- Text = player.Value,
- HorizontalExpand = true,
- Pressed = selectedPlayers.FirstOrNull(selectedPlayer => selectedPlayer == player.Key) != null,
- Disabled = GlobalCheckbox.Pressed,
- };
- newButton.OnToggled += (args) =>
- {
- if (args.Pressed)
- {
- OnSelectPlayer?.Invoke(player.Key);
- }
- else
- {
- OnUnselectPlayer?.Invoke(player.Key);
- }
- };
-
- PlayersContainer.AddChild(newButton);
- }
- }
-
- public void UpdatePlayingState(bool playing)
- {
- PlayButton.Pressed = playing;
- }
-
- public void UpdateGlobalToggled(bool toggled)
- {
- GlobalCheckbox.Pressed = toggled;
- }
-
- public void UpdatePlaybackPosition(TimeSpan currentTrackLength, TimeSpan playbackPosition)
- {
- PlaybackSlider.MaxValue = (float)currentTrackLength.TotalSeconds;
- PlaybackSlider.SetValueWithoutEvent((float)playbackPosition.TotalSeconds);
- }
-
- public void UpdateDurationLabel(TimeSpan playbackPosition, TimeSpan currentTrackLength)
- {
- DurationLabel.Text = $@"{playbackPosition:mm\:ss} / {currentTrackLength:mm\:ss}";
- }
-
- public void UpdateCurrentTrackLabel(string currentTrack)
- {
- TrackName.Text = currentTrack.Split("/").Last();
- }
-
- public void UpdateQueue(Queue queue)
- {
- TrackList.RemoveAllChildren();
-
- foreach (var track in queue.ToList())
- {
- var label = new Label()
- {
- Text = track,
- };
- TrackList.AddChild(label);
- }
- }
-
- public void UpdateVolume(float volume)
- {
- VolumeLine.SetText(volume.ToString());
- _volumeLineText = volume.ToString();
- }
-}
diff --git a/Content.Server/_CorvaxNext/Administration/UI/Audio/AdminAudioPanelEui.cs b/Content.Server/_CorvaxNext/Administration/UI/Audio/AdminAudioPanelEui.cs
deleted file mode 100644
index b36493970a6..00000000000
--- a/Content.Server/_CorvaxNext/Administration/UI/Audio/AdminAudioPanelEui.cs
+++ /dev/null
@@ -1,121 +0,0 @@
-using Content.Server.Administration.Managers;
-using Content.Server.EUI;
-using Content.Shared.Administration;
-using Content.Shared.Eui;
-using Content.Shared._CorvaxNext.Administration.UI.Audio;
-using Robust.Server.Player;
-using Robust.Shared.ContentPack;
-using Robust.Shared.Enums;
-using Robust.Shared.Player;
-using Robust.Shared.Utility;
-
-namespace Content.Server._CorvaxNext.Administration.UI.Audio;
-
-public sealed partial class AdminAudioPanelEui : BaseEui
-{
- [Dependency] private readonly IAdminManager _adminManager = default!;
- [Dependency] private readonly IPlayerManager _playerManager = default!;
- [Dependency] private readonly IEntityManager _entityManager = default!;
- [Dependency] private readonly IResourceManager _resourceManager = default!;
-
- private Dictionary _availablePlayers = new();
-
- private readonly AdminAudioPanelSystem _audioPanel;
-
- public AdminAudioPanelEui() : base()
- {
- IoCManager.InjectDependencies(this);
-
- _audioPanel = IoCManager.Resolve().GetEntitySystem();
-
- foreach (var player in Filter.Broadcast().Recipients)
- {
- _availablePlayers.Add(player.UserId.UserId, player.Name);
- }
-
- _audioPanel.AudioUpdated += () => StateDirty();
-
- _playerManager.PlayerStatusChanged += (object? sender, SessionStatusEventArgs args) =>
- {
- switch (args.NewStatus)
- {
- case SessionStatus.InGame:
- _availablePlayers.Add(args.Session.UserId.UserId, args.Session.Name);
- StateDirty();
- break;
- case SessionStatus.Disconnected:
- _availablePlayers.Remove(args.Session.UserId.UserId);
- StateDirty();
- break;
- }
- };
- }
-
- public override void Opened()
- {
- StateDirty();
- }
-
- public override AdminAudioPanelEuiState GetNewState()
- {
- return new(
- _audioPanel.Playing,
- _entityManager.GetNetEntity(_audioPanel.AudioEntity),
- _audioPanel.AudioParams.Volume,
- _audioPanel.Queue,
- _audioPanel.Global,
- _availablePlayers,
- _audioPanel.SelectedPlayers
- );
- }
-
- public override void HandleMessage(EuiMessageBase msg)
- {
- base.HandleMessage(msg);
-
- if (msg is not AdminAudioPanelEuiMessage.AdminAudioPanelEuiMessageBase)
- return;
-
- if (!_adminManager.HasAdminFlag(Player, AdminFlags.Fun))
- {
- Close();
- return;
- }
-
- switch (msg)
- {
- case AdminAudioPanelEuiMessage.Play:
- _audioPanel.Play();
- break;
- case AdminAudioPanelEuiMessage.Pause:
- _audioPanel.Pause();
- break;
- case AdminAudioPanelEuiMessage.Stop:
- _audioPanel.Stop();
- break;
- case AdminAudioPanelEuiMessage.AddTrack addTrack:
- var filename = addTrack.Filename.Trim();
- if (_resourceManager.ContentFileExists(new ResPath(filename).ToRootedPath()))
- _audioPanel.AddToQueue(filename);
- break;
- case AdminAudioPanelEuiMessage.SetVolume setVolume:
- _audioPanel.SetVolume(setVolume.Volume);
- break;
- case AdminAudioPanelEuiMessage.SetPlaybackPosition setPlayback:
- _audioPanel.SetPlaybackPosition(setPlayback.Position);
- break;
- case AdminAudioPanelEuiMessage.SelectPlayer selectPlayer:
- _audioPanel.SelectPlayer(selectPlayer.Player);
- break;
- case AdminAudioPanelEuiMessage.UnselectPlayer unselectPlayer:
- _audioPanel.UnselectPlayer(unselectPlayer.Player);
- break;
- case AdminAudioPanelEuiMessage.GlobalToggled globalToggled:
- _audioPanel.SetGlobal(globalToggled.Toggled);
- break;
- default:
- return;
- }
- StateDirty();
- }
-}
diff --git a/Content.Server/_CorvaxNext/Administration/UI/Audio/AdminAudioPanelSystem.cs b/Content.Server/_CorvaxNext/Administration/UI/Audio/AdminAudioPanelSystem.cs
deleted file mode 100644
index a0d517d635d..00000000000
--- a/Content.Server/_CorvaxNext/Administration/UI/Audio/AdminAudioPanelSystem.cs
+++ /dev/null
@@ -1,204 +0,0 @@
-using System.Linq;
-using Robust.Server.Player;
-using Robust.Shared.Audio;
-using Robust.Shared.Audio.Components;
-using Robust.Shared.Audio.Systems;
-using Robust.Shared.Player;
-using Robust.Shared.Timing;
-
-namespace Content.Server._CorvaxNext.Administration.UI.Audio;
-
-public sealed partial class AdminAudioPanelSystem : EntitySystem
-{
- [Dependency] private readonly SharedAudioSystem _audio = default!;
- [Dependency] private readonly IPlayerManager _playerManager = default!;
- [Dependency] private readonly IGameTiming _timing = default!;
-
- private (EntityUid Entity, AudioComponent Audio)? _audioStream;
- private List _selectedPlayers = new();
-
- public Action? AudioUpdated;
-
- public override void Update(float frameTime)
- {
- base.Update(frameTime);
-
- if (!Playing)
- return;
-
- if (_audioStream is { } audioStream)
- {
- if (Exists(audioStream.Entity) &&
- (audioStream.Audio.State == AudioState.Playing || audioStream.Audio.State == AudioState.Paused))
- return;
- else
- {
- _audioStream = null;
- Queue.TryDequeue(out _);
- AudioUpdated?.Invoke();
- }
- }
-
- if (CurrentTrack != null)
- {
- _audioStream = _audio.PlayGlobal(CurrentTrack, Global ? Filter.Broadcast() : Filter.Empty().AddPlayers(_selectedPlayers), Global, AudioParams);
- AudioUpdated?.Invoke();
- }
- }
-
- private void SetStreamState(AudioState state)
- {
- if (_audioStream != null)
- _audio.SetState(_audioStream.Value.Entity, state, true, _audioStream.Value.Audio);
- AudioUpdated?.Invoke();
- }
-
- ///
- /// Stops sound and starts its over with current params with playback position of stopped sound.
- /// Used, for example, when need to update selected players.
- ///
- private void RecreateSound()
- {
- if (!Playing)
- return;
-
- if (_audioStream is not { } audioStream)
- return;
-
- Playing = false;
-
- var playback = (float)((audioStream.Audio.PauseTime ?? _timing.CurTime) - audioStream.Audio.AudioStart).TotalSeconds;
-
- _audio.Stop(audioStream.Entity, audioStream.Audio);
-
- _audioStream = _audio.PlayGlobal(CurrentTrack, Global ? Filter.Broadcast() : Filter.Empty().AddPlayers(_selectedPlayers), Global, AudioParams);
- _audio.SetPlaybackPosition(_audioStream, playback);
-
- Playing = true;
- AudioUpdated?.Invoke();
- }
-
- #region Public API
- public readonly Queue Queue = new();
- public string? CurrentTrack
- {
- get
- {
- if (Queue.TryPeek(out var track))
- return track;
- return null;
- }
- }
- public AudioParams AudioParams { get; private set; } = AudioParams.Default;
- public bool Playing { get; private set; } = false;
- public bool Global { get; private set; } = true;
- public HashSet SelectedPlayers => _selectedPlayers.Select(player => player.UserId.UserId).ToHashSet();
- public EntityUid AudioEntity => _audioStream?.Entity ?? EntityUid.Invalid;
-
- public void AddToQueue(string filename)
- {
- Queue.Enqueue(filename);
- AudioUpdated?.Invoke();
- }
-
- public bool Play()
- {
- if (_audioStream != null && _audioStream.Value.Audio.State == AudioState.Paused)
- {
- return Resume();
- }
-
- Playing = true;
- AudioUpdated?.Invoke();
- return Playing;
- }
-
- public void Pause()
- {
- if (_audioStream != null && _audioStream.Value.Audio.State == AudioState.Playing)
- SetStreamState(AudioState.Paused);
-
- Playing = false;
- AudioUpdated?.Invoke();
- }
-
- public bool Resume()
- {
- if (_audioStream != null && _audioStream.Value.Audio.State == AudioState.Paused)
- SetStreamState(AudioState.Playing);
-
- Playing = true;
- AudioUpdated?.Invoke();
- return Playing;
- }
-
- public bool Stop()
- {
- if (_audioStream != null && _audioStream.Value.Audio.State != AudioState.Stopped)
- {
- _audio.Stop(_audioStream.Value.Entity, _audioStream.Value.Audio);
- _audioStream = null;
- Queue.TryDequeue(out _);
- }
-
- Playing = false;
- AudioUpdated?.Invoke();
- return !Playing;
- }
-
- public void SetVolume(float volume)
- {
- AudioParams = AudioParams.WithVolume(volume);
- if (_audioStream != null)
- _audio.SetVolume(_audioStream.Value.Entity, volume, _audioStream.Value.Audio);
- AudioUpdated?.Invoke();
- }
-
- public void SelectPlayer(Guid player)
- {
- if (SelectedPlayers.Contains(player))
- return;
-
- var session = _playerManager.NetworkedSessions.FirstOrDefault(session => session.UserId.UserId == player);
-
- if (session == null)
- return;
-
- _selectedPlayers.Add(session);
- RecreateSound();
- AudioUpdated?.Invoke();
- }
-
- public void UnselectPlayer(Guid player)
- {
- if (!SelectedPlayers.Contains(player))
- return;
-
- var session = _playerManager.NetworkedSessions.FirstOrDefault(session => session.UserId.UserId == player);
-
- if (session == null)
- return;
-
- _selectedPlayers.Remove(session);
- RecreateSound();
- AudioUpdated?.Invoke();
- }
-
- public void SetPlaybackPosition(float position)
- {
- if (CurrentTrack != null && _audioStream is { } audioStream)
- {
- _audio.SetPlaybackPosition(audioStream, position);
- }
- AudioUpdated?.Invoke();
- }
-
- public void SetGlobal(bool global)
- {
- Global = global;
- RecreateSound();
- AudioUpdated?.Invoke();
- }
-
- #endregion
-}
diff --git a/Content.Server/_CorvaxNext/Administration/UI/Audio/Commands/OpenAudioPanelCommand.cs b/Content.Server/_CorvaxNext/Administration/UI/Audio/Commands/OpenAudioPanelCommand.cs
deleted file mode 100644
index 7b6b18e32d5..00000000000
--- a/Content.Server/_CorvaxNext/Administration/UI/Audio/Commands/OpenAudioPanelCommand.cs
+++ /dev/null
@@ -1,27 +0,0 @@
-using Content.Server.Administration;
-using Content.Server.EUI;
-using Content.Shared.Administration;
-using Robust.Shared.Console;
-
-namespace Content.Server._CorvaxNext.Administration.UI.Audio.Commands;
-
-[AdminCommand(AdminFlags.Fun)]
-public sealed class OpenAudioPanelCommand : IConsoleCommand
-{
- public string Command => "audiopanel";
- public string Description => "Opens the admin audio panel panel.";
- public string Help => $"Usage: {Command}";
-
- public void Execute(IConsoleShell shell, string argStr, string[] args)
- {
- if (shell.Player is not { } player)
- {
- shell.WriteError(Loc.GetString("shell-cannot-run-command-from-server"));
- return;
- }
-
- var eui = IoCManager.Resolve();
- var ui = new AdminAudioPanelEui();
- eui.OpenEui(ui, player);
- }
-}
diff --git a/Content.Shared/_CorvaxNext/Administration/UI/Audio/AdminAudioPanelEuiState.cs b/Content.Shared/_CorvaxNext/Administration/UI/Audio/AdminAudioPanelEuiState.cs
deleted file mode 100644
index 26e57e1874a..00000000000
--- a/Content.Shared/_CorvaxNext/Administration/UI/Audio/AdminAudioPanelEuiState.cs
+++ /dev/null
@@ -1,75 +0,0 @@
-using Content.Shared.Eui;
-using Robust.Shared.Serialization;
-
-namespace Content.Shared._CorvaxNext.Administration.UI.Audio;
-
-[Serializable, NetSerializable]
-public sealed partial class AdminAudioPanelEuiState(bool playing, NetEntity audio, float volume, Queue queue, bool global, Dictionary players, HashSet selectedPlayers) : EuiStateBase
-{
- public bool Playing = playing;
- public NetEntity Audio = audio;
- public float Volume = volume;
- public Queue Queue = queue;
- public bool Global = global;
- public Dictionary Players = players;
- public HashSet SelectedPlayers = selectedPlayers;
-};
-
-public static class AdminAudioPanelEuiMessage
-{
- [Serializable]
- public abstract class AdminAudioPanelEuiMessageBase : EuiMessageBase
- {
- }
-
- [Serializable, NetSerializable]
- public sealed partial class Play : AdminAudioPanelEuiMessageBase
- {
- }
-
- [Serializable, NetSerializable]
- public sealed partial class Pause : AdminAudioPanelEuiMessageBase
- {
- }
-
- [Serializable, NetSerializable]
- public sealed partial class Stop : AdminAudioPanelEuiMessageBase
- {
- }
-
- [Serializable, NetSerializable]
- public sealed partial class AddTrack(string filename) : AdminAudioPanelEuiMessageBase
- {
- public string Filename = filename;
- }
-
- [Serializable, NetSerializable]
- public sealed partial class SetVolume(float volume) : AdminAudioPanelEuiMessageBase
- {
- public float Volume = volume;
- }
-
- [Serializable, NetSerializable]
- public sealed partial class SetPlaybackPosition(float position) : AdminAudioPanelEuiMessageBase
- {
- public float Position = position;
- }
-
- [Serializable, NetSerializable]
- public sealed partial class SelectPlayer(Guid player) : AdminAudioPanelEuiMessageBase
- {
- public Guid Player = player;
- }
-
- [Serializable, NetSerializable]
- public sealed partial class UnselectPlayer(Guid player) : AdminAudioPanelEuiMessageBase
- {
- public Guid Player = player;
- }
-
- [Serializable, NetSerializable]
- public sealed partial class GlobalToggled(bool toggled) : AdminAudioPanelEuiMessageBase
- {
- public bool Toggled = toggled;
- }
-}
diff --git a/Resources/Locale/ru-RU/_CorvaxNext/audio/widgets/admin-audio-panel.ftl b/Resources/Locale/ru-RU/_CorvaxNext/audio/widgets/admin-audio-panel.ftl
deleted file mode 100644
index 5733003e8f3..00000000000
--- a/Resources/Locale/ru-RU/_CorvaxNext/audio/widgets/admin-audio-panel.ftl
+++ /dev/null
@@ -1,10 +0,0 @@
-admin-audio-panel-title = Панель управления аудио
-admin-audio-panel-current-track-label = Текущий трек
-admin-audio-panel-button-play-text = Играть
-admin-audio-panel-button-pause-text = Пауза
-admin-audio-panel-button-stop-text = Стоп
-admin-audio-panel-volume-line-placeholder = Громкость
-admin-audio-panel-toggle-global-checkbox-label = Слышат все
-admin-audio-panel-trackpath-line-placeholder = Путь к файлу OGG
-admin-audio-panel-add-track-button-text = Добавить трек
-admin-audio-panel-track-name-nothing-playing = Ничего не играет
diff --git a/Resources/Locale/ru-RU/administration/ui/tabs/admin-tab/player-actions-window.ftl b/Resources/Locale/ru-RU/administration/ui/tabs/admin-tab/player-actions-window.ftl
index f3a59f5d58d..5eb1438b100 100644
--- a/Resources/Locale/ru-RU/administration/ui/tabs/admin-tab/player-actions-window.ftl
+++ b/Resources/Locale/ru-RU/administration/ui/tabs/admin-tab/player-actions-window.ftl
@@ -8,4 +8,3 @@ admin-player-actions-window-shuttle = Вызвать/отозвать шаттл
admin-player-actions-window-admin-logs = Админ логи
admin-player-actions-window-admin-notes = Админ заметки
admin-player-actions-window-admin-fax = Админ факс
-admin-player-actions-window-audio-panel = Аудио панель
From fef23994087dfa80c8750a936a46ef635b215710 Mon Sep 17 00:00:00 2001
From: Kill_Me_I_Noobs <118206719+Vonsant@users.noreply.github.com>
Date: Sun, 8 Dec 2024 01:25:43 +0300
Subject: [PATCH 05/18] =?UTF-8?q?=D0=98=D1=85=20=D1=80=D0=B0=D0=B7=D1=8B?=
=?UTF-8?q?=D1=81=D0=BA=D0=B8=D0=B2=D0=B0=D0=B5=D1=82=20=D0=9F=D0=BE=D0=BB?=
=?UTF-8?q?=D0=B8=D1=86=D0=B8=D1=8F.=20(#114)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
* Sec always watching
* Убран статус "Подозревается"
* Wanted and Detained
---
.../Cartridges/SecWatchEntryControl.xaml | 19 +++++
.../Cartridges/SecWatchEntryControl.xaml.cs | 21 +++++
.../CartridgeLoader/Cartridges/SecWatchUi.cs | 27 +++++++
.../Cartridges/SecWatchUiFragment.xaml | 13 ++++
.../Cartridges/SecWatchUiFragment.xaml.cs | 25 ++++++
.../Cartridges/SecWatchCartridgeComponent.cs | 23 ++++++
.../Cartridges/SecWatchCartridgeSystem.cs | 73 ++++++++++++++++++
.../Cartridges/SecWatchUiState.cs | 24 ++++++
.../_corvaxnext/cartridge-loader/secwatch.ftl | 5 ++
.../_corvaxnext/cartridge-loader/secwatch.ftl | 5 ++
.../entities/objects/devices/cartriges.ftl | 2 +
.../Entities/Objects/Devices/pda.yml | 4 +
.../Entities/Objects/Devices/cartridges.yml | 20 +++++
.../Devices/cartridge.rsi/cart-cri.png | Bin 0 -> 2980 bytes
.../Objects/Devices/cartridge.rsi/meta.json | 14 ++++
15 files changed, 275 insertions(+)
create mode 100644 Content.Client/_CorvaxNext/CartridgeLoader/Cartridges/SecWatchEntryControl.xaml
create mode 100644 Content.Client/_CorvaxNext/CartridgeLoader/Cartridges/SecWatchEntryControl.xaml.cs
create mode 100644 Content.Client/_CorvaxNext/CartridgeLoader/Cartridges/SecWatchUi.cs
create mode 100644 Content.Client/_CorvaxNext/CartridgeLoader/Cartridges/SecWatchUiFragment.xaml
create mode 100644 Content.Client/_CorvaxNext/CartridgeLoader/Cartridges/SecWatchUiFragment.xaml.cs
create mode 100644 Content.Server/_CorvaxNext/CartridgeLoader/Cartridges/SecWatchCartridgeComponent.cs
create mode 100644 Content.Server/_CorvaxNext/CartridgeLoader/Cartridges/SecWatchCartridgeSystem.cs
create mode 100644 Content.Shared/_CorvaxNext/CartridgeLoader/Cartridges/SecWatchUiState.cs
create mode 100644 Resources/Locale/en-US/_corvaxnext/cartridge-loader/secwatch.ftl
create mode 100644 Resources/Locale/ru-RU/_corvaxnext/cartridge-loader/secwatch.ftl
create mode 100644 Resources/Locale/ru-RU/ss14-ru/prototypes/_corvaxnext/entities/objects/devices/cartriges.ftl
create mode 100644 Resources/Prototypes/_CorvaxNext/Entities/Objects/Devices/cartridges.yml
create mode 100644 Resources/Textures/_CorvaxNext/Objects/Devices/cartridge.rsi/cart-cri.png
create mode 100644 Resources/Textures/_CorvaxNext/Objects/Devices/cartridge.rsi/meta.json
diff --git a/Content.Client/_CorvaxNext/CartridgeLoader/Cartridges/SecWatchEntryControl.xaml b/Content.Client/_CorvaxNext/CartridgeLoader/Cartridges/SecWatchEntryControl.xaml
new file mode 100644
index 00000000000..12440db5d9b
--- /dev/null
+++ b/Content.Client/_CorvaxNext/CartridgeLoader/Cartridges/SecWatchEntryControl.xaml
@@ -0,0 +1,19 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/Content.Client/_CorvaxNext/CartridgeLoader/Cartridges/SecWatchEntryControl.xaml.cs b/Content.Client/_CorvaxNext/CartridgeLoader/Cartridges/SecWatchEntryControl.xaml.cs
new file mode 100644
index 00000000000..0b3bd362d2c
--- /dev/null
+++ b/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");
+ }
+}
\ No newline at end of file
diff --git a/Content.Client/_CorvaxNext/CartridgeLoader/Cartridges/SecWatchUi.cs b/Content.Client/_CorvaxNext/CartridgeLoader/Cartridges/SecWatchUi.cs
new file mode 100644
index 00000000000..838f4395c73
--- /dev/null
+++ b/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);
+ }
+}
\ No newline at end of file
diff --git a/Content.Client/_CorvaxNext/CartridgeLoader/Cartridges/SecWatchUiFragment.xaml b/Content.Client/_CorvaxNext/CartridgeLoader/Cartridges/SecWatchUiFragment.xaml
new file mode 100644
index 00000000000..4ebea90f59c
--- /dev/null
+++ b/Content.Client/_CorvaxNext/CartridgeLoader/Cartridges/SecWatchUiFragment.xaml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/Content.Client/_CorvaxNext/CartridgeLoader/Cartridges/SecWatchUiFragment.xaml.cs b/Content.Client/_CorvaxNext/CartridgeLoader/Cartridges/SecWatchUiFragment.xaml.cs
new file mode 100644
index 00000000000..068ff2c8a38
--- /dev/null
+++ b/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));
+ }
+ }
+}
\ No newline at end of file
diff --git a/Content.Server/_CorvaxNext/CartridgeLoader/Cartridges/SecWatchCartridgeComponent.cs b/Content.Server/_CorvaxNext/CartridgeLoader/Cartridges/SecWatchCartridgeComponent.cs
new file mode 100644
index 00000000000..c0ca5ad9dee
--- /dev/null
+++ b/Content.Server/_CorvaxNext/CartridgeLoader/Cartridges/SecWatchCartridgeComponent.cs
@@ -0,0 +1,23 @@
+using Content.Shared.Security;
+
+namespace Content.Server.CartridgeLoader.Cartridges;
+
+[RegisterComponent, Access(typeof(SecWatchCartridgeSystem))]
+public sealed partial class SecWatchCartridgeComponent : Component
+{
+ ///
+ /// Only show people with these statuses.
+ ///
+ [DataField]
+ public List Statuses = new()
+ {
+ SecurityStatus.Wanted,
+ SecurityStatus.Detained
+ };
+
+ ///
+ /// Station entity thats getting its records checked.
+ ///
+ [DataField]
+ public EntityUid? Station;
+}
diff --git a/Content.Server/_CorvaxNext/CartridgeLoader/Cartridges/SecWatchCartridgeSystem.cs b/Content.Server/_CorvaxNext/CartridgeLoader/Cartridges/SecWatchCartridgeSystem.cs
new file mode 100644
index 00000000000..2b46637da12
--- /dev/null
+++ b/Content.Server/_CorvaxNext/CartridgeLoader/Cartridges/SecWatchCartridgeSystem.cs
@@ -0,0 +1,73 @@
+using Content.Server.Station.Systems;
+using Content.Server.StationRecords;
+using Content.Server.StationRecords.Systems;
+using Content.Shared.CartridgeLoader;
+using Content.Shared.CartridgeLoader.Cartridges;
+using Content.Shared.CriminalRecords;
+using Content.Shared.StationRecords;
+
+namespace Content.Server.CartridgeLoader.Cartridges;
+
+public sealed class SecWatchCartridgeSystem : EntitySystem
+{
+ [Dependency] private readonly CartridgeLoaderSystem _cartridgeLoader = default!;
+ [Dependency] private readonly StationRecordsSystem _records = default!;
+ [Dependency] private readonly StationSystem _station = default!;
+
+ public override void Initialize()
+ {
+ base.Initialize();
+
+ SubscribeLocalEvent(OnRecordModified);
+
+ SubscribeLocalEvent(OnUiReady);
+ }
+
+ private void OnRecordModified(RecordModifiedEvent args)
+ {
+ // when a record is modified update the ui of every loaded cartridge tuned to the same station
+ var query = EntityQueryEnumerator();
+ while (query.MoveNext(out var uid, out var comp, out var cartridge))
+ {
+ if (cartridge.LoaderUid is not {} loader || comp.Station != args.Station)
+ continue;
+
+ UpdateUI((uid, comp), loader);
+ }
+ }
+
+ private void OnUiReady(Entity ent, ref CartridgeUiReadyEvent args)
+ {
+ UpdateUI(ent, args.Loader);
+ }
+
+ private void UpdateUI(Entity ent, EntityUid loader)
+ {
+ // if the loader is on a grid, update the station
+ // if it is off grid use the cached station
+ if (_station.GetOwningStation(loader) is {} station)
+ ent.Comp.Station = station;
+
+ if (!TryComp(ent.Comp.Station, out var records))
+ return;
+
+ station = ent.Comp.Station.Value;
+
+ var entries = new List();
+ foreach (var (id, criminal) in _records.GetRecordsOfType(station, records))
+ {
+ if (!ent.Comp.Statuses.Contains(criminal.Status))
+ continue;
+
+ var key = new StationRecordKey(id, station);
+ if (!_records.TryGetRecord(key, out var general, records))
+ continue;
+
+ var status = criminal.Status;
+ entries.Add(new SecWatchEntry(general.Name, general.JobTitle, criminal.Status, criminal.Reason));
+ }
+
+ var state = new SecWatchUiState(entries);
+ _cartridgeLoader.UpdateCartridgeUiState(loader, state);
+ }
+}
\ No newline at end of file
diff --git a/Content.Shared/_CorvaxNext/CartridgeLoader/Cartridges/SecWatchUiState.cs b/Content.Shared/_CorvaxNext/CartridgeLoader/Cartridges/SecWatchUiState.cs
new file mode 100644
index 00000000000..29720630c43
--- /dev/null
+++ b/Content.Shared/_CorvaxNext/CartridgeLoader/Cartridges/SecWatchUiState.cs
@@ -0,0 +1,24 @@
+using Content.Shared.Security;
+using Robust.Shared.Serialization;
+
+namespace Content.Shared.CartridgeLoader.Cartridges;
+
+///
+/// Show a list of wanted and suspected people from criminal records.
+///
+[Serializable, NetSerializable]
+public sealed class SecWatchUiState : BoundUserInterfaceState
+{
+ public readonly List Entries;
+
+ public SecWatchUiState(List entries)
+ {
+ Entries = entries;
+ }
+}
+
+///
+/// Entry for a person who is wanted or suspected.
+///
+[Serializable, NetSerializable]
+public record struct SecWatchEntry(string Name, string Job, SecurityStatus Status, string? Reason);
\ No newline at end of file
diff --git a/Resources/Locale/en-US/_corvaxnext/cartridge-loader/secwatch.ftl b/Resources/Locale/en-US/_corvaxnext/cartridge-loader/secwatch.ftl
new file mode 100644
index 00000000000..ca18db233aa
--- /dev/null
+++ b/Resources/Locale/en-US/_corvaxnext/cartridge-loader/secwatch.ftl
@@ -0,0 +1,5 @@
+sec-watch-program-name = SecWatch
+sec-watch-title = SecWatch 1.0
+sec-watch-no-entries = Everything's calm. Why not enjoy a Monkin Donut?
+sec-watch-entry = {$name}
+sec-watch-no-reason = None given???
\ No newline at end of file
diff --git a/Resources/Locale/ru-RU/_corvaxnext/cartridge-loader/secwatch.ftl b/Resources/Locale/ru-RU/_corvaxnext/cartridge-loader/secwatch.ftl
new file mode 100644
index 00000000000..bd9a5070cb0
--- /dev/null
+++ b/Resources/Locale/ru-RU/_corvaxnext/cartridge-loader/secwatch.ftl
@@ -0,0 +1,5 @@
+sec-watch-program-name = ОКО СБ
+sec-watch-title = ОКО СБ 1.0
+sec-watch-no-entries = Полный порядок. Безопасность превыше всего.
+sec-watch-entry = {$name}
+sec-watch-no-reason = Причина не уточнена.
\ No newline at end of file
diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/_corvaxnext/entities/objects/devices/cartriges.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/_corvaxnext/entities/objects/devices/cartriges.ftl
new file mode 100644
index 00000000000..427dadde5e1
--- /dev/null
+++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/_corvaxnext/entities/objects/devices/cartriges.ftl
@@ -0,0 +1,2 @@
+ent-SecWatchCartridge = картридж "око сб"
+ .desc = Картридж, отслеживающий статус разыскиваемых службой безопасности лиц.
\ No newline at end of file
diff --git a/Resources/Prototypes/Entities/Objects/Devices/pda.yml b/Resources/Prototypes/Entities/Objects/Devices/pda.yml
index 4febc87b90f..8b13d2598bb 100644
--- a/Resources/Prototypes/Entities/Objects/Devices/pda.yml
+++ b/Resources/Prototypes/Entities/Objects/Devices/pda.yml
@@ -76,6 +76,7 @@
- CrewManifestCartridge
- NotekeeperCartridge
- NewsReaderCartridge
+ - SecWatchCartridge # Corvax-Next-SecWatch
cartridgeSlot:
priority: -1
name: device-pda-slot-component-slot-name-cartridge
@@ -138,6 +139,7 @@
- NotekeeperCartridge
- NewsReaderCartridge
- MedTekCartridge
+ - SecWatchCartridge # Corvax-Next-SecWatch
- type: entity
parent: BasePDA
@@ -408,6 +410,7 @@
- NotekeeperCartridge
- NewsReaderCartridge
- AstroNavCartridge
+ - SecWatchCartridge # Corvax-Next-SecWatch
- type: entity
parent: BasePDA
@@ -773,6 +776,7 @@
- WantedListCartridge
- MedTekCartridge
- AstroNavCartridge
+ - SecWatchCartridge # Corvax-Next-SecWatch
- type: entity
parent: CentcomPDA
diff --git a/Resources/Prototypes/_CorvaxNext/Entities/Objects/Devices/cartridges.yml b/Resources/Prototypes/_CorvaxNext/Entities/Objects/Devices/cartridges.yml
new file mode 100644
index 00000000000..b271eb6378f
--- /dev/null
+++ b/Resources/Prototypes/_CorvaxNext/Entities/Objects/Devices/cartridges.yml
@@ -0,0 +1,20 @@
+- type: entity
+ parent: BaseItem
+ id: SecWatchCartridge
+ name: sec watch cartridge
+ description: A cartridge that tracks the status of currently wanted individuals.
+ components:
+ - type: Sprite
+ sprite: _CorvaxNext/Objects/Devices/cartridge.rsi
+ state: cart-cri
+ - type: Icon
+ sprite: _CorvaxNext/Objects/Devices/cartridge.rsi
+ state: cart-cri
+ - type: UIFragment
+ ui: !type:SecWatchUi
+ - type: Cartridge
+ programName: sec-watch-program-name
+ icon:
+ sprite: Objects/Weapons/Melee/stunbaton.rsi
+ state: stunbaton_on
+ - type: SecWatchCartridge
\ No newline at end of file
diff --git a/Resources/Textures/_CorvaxNext/Objects/Devices/cartridge.rsi/cart-cri.png b/Resources/Textures/_CorvaxNext/Objects/Devices/cartridge.rsi/cart-cri.png
new file mode 100644
index 0000000000000000000000000000000000000000..4da4343e58455a723ad5030373db49c84d546651
GIT binary patch
literal 2980
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
Date: Sun, 8 Dec 2024 11:34:46 +0300
Subject: [PATCH 06/18] icon
---
Resources/Prototypes/Alerts/alerts.yml | 2 +-
.../Alerts/offer_item.rsi/meta.json | 14 ------------
.../Alerts/offer_item.rsi/offer_item.png | Bin 745 -> 0 bytes
.../Interface/Alerts/offer_item.rsi/meta.json | 20 ++++++++++++++++++
.../Alerts/offer_item.rsi/offer_item.png | Bin 0 -> 1465 bytes
5 files changed, 21 insertions(+), 15 deletions(-)
delete mode 100644 Resources/Textures/_CorvaxNext/Alerts/offer_item.rsi/meta.json
delete mode 100644 Resources/Textures/_CorvaxNext/Alerts/offer_item.rsi/offer_item.png
create mode 100644 Resources/Textures/_CorvaxNext/Interface/Alerts/offer_item.rsi/meta.json
create mode 100644 Resources/Textures/_CorvaxNext/Interface/Alerts/offer_item.rsi/offer_item.png
diff --git a/Resources/Prototypes/Alerts/alerts.yml b/Resources/Prototypes/Alerts/alerts.yml
index e5f2c638318..390bec95b68 100644
--- a/Resources/Prototypes/Alerts/alerts.yml
+++ b/Resources/Prototypes/Alerts/alerts.yml
@@ -97,7 +97,7 @@
id: Offer
clickEvent: !type:AcceptOfferAlertEvent
icons:
- - sprite: /Textures/_CorvaxNext/Alerts/offer_item.rsi
+ - sprite: /Textures/_CorvaxNext/Interface/Alerts/offer_item.rsi
state: offer_item
name: alerts-offer-name
description: alerts-offer-desc
diff --git a/Resources/Textures/_CorvaxNext/Alerts/offer_item.rsi/meta.json b/Resources/Textures/_CorvaxNext/Alerts/offer_item.rsi/meta.json
deleted file mode 100644
index 0513aeb3e06..00000000000
--- a/Resources/Textures/_CorvaxNext/Alerts/offer_item.rsi/meta.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
- "version": 1,
- "license": "CC-BY-SA-3.0",
- "copyright": "Original icon taken from https://github.com/ss220-space/Paradise/blob/master220/icons/mob/screen_alert.dmi, modified by Mocho, resprited by AwareFoxy",
- "size": {
- "x": 32,
- "y": 32
- },
- "states": [
- {
- "name": "offer_item"
- }
- ]
-}
diff --git a/Resources/Textures/_CorvaxNext/Alerts/offer_item.rsi/offer_item.png b/Resources/Textures/_CorvaxNext/Alerts/offer_item.rsi/offer_item.png
deleted file mode 100644
index 6215d2e53ff3a450c60ab851fef947a933c38c34..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 745
zcmVPx%qe(k%SFx+9pjEr5BnQJ7&>3ilW5FO)Hf}|J9i@R)^94bzVzb)*XT$@IuA
z7_7jcED9j1(1}A>!rKp?#lqTL)0M5}>iLgv3M-@R?>&Bd
z(Qp>h)2M0;RgJNjO*0YC{uqk@fGmfQ+^YT{!mR5m1y!Z@s>2vb9>dR<7*_(~AZ`FZfK-JL9nk
z09e*v9B03kU*5l3YA%;J85)*;fmK!64wDfQ#yO`{@4z!{8pgjoZ}+li-6-e%*LXg
zHhR%;M3>Gm_Px)b4f%&RA_~;460Mqen>~;4udfTxR
zy3yn%rsLO0<1c?x1{na@4M#ii!O+EE=q@mKy9@ryG4^)58NJ~LArDWs6O;=Hyq~A
zJW-^hfGzPwX$1hl!0jh0VBq#ML5mL{
z7a$SNgR)Wv0EF`Z{?$LC_3&}xbT=5fVx!q&or5E7HgAJJQvqpm0BAqjfJLf*Wc7A|-<&7TNB6o$pXQSo?HyF8xT;7x(#!V}uADvIoKj~q8y~)CPp!F@|H)>qtl@*;`9)H5p
zZaDZ91PLel1493zxM>wGV#~=3Zd&rFy4l{AHlKnZbBe3VA4d`LxYcinqXe|>bMFCw#j%sf+mE)e+1^GRg@yh_{6?)N
z@~Vd-YUd5o_
z)621d<`7oK@6Wu_HlQ7VvRuZW*#^l-*Momg|CB-SKD-k(&IJHb<6L+j-ig-3#|b-C
z2u~N(s{BCt3ZFNg$DauR3EifUvp@4tw;N3D$-UjKd??}fLViGD|6-o1#
z$xinWKmGa}YJ628RrsZK6ov_B9r0&>hPAu**~REg*bOH$ela@3+THu?>f`&;k5BLU
zRrrg9o7Q4|YB-=xNWDSI<6i|J3Na7#7bB`%eS8mYTH2dgZd!@S=ZUVDtMcawV@Bfs
z09f7r6!FUzDC#ZBEU@~^>d!n(FURts0}PEXDr0+c^^DFZ@+lJHlW8z&
zJo6DW0V->nTsRNFO^Z?4E_MM6v_-vepJS(cDBA_d-r%GwpoqVU=vqj{$m5qDwHk+2
zPhN9ztIopUGt|ig)h;e52mlzj>VVQRcEic60Y&@(L|HKC7_BaL{>+16)R?gdjFw-v
zfNu5V+{6p_`G3BtAz#kT1a6wIh<_
Date: Mon, 9 Dec 2024 08:41:01 +0400
Subject: [PATCH 07/18] Night and thermal vision device (#104)
* first
* fix
* fix
* Apply suggestions from code review
Co-authored-by: FN <37689533+FireNameFN@users.noreply.github.com>
* fix
* Apply suggestions from code review
* fix
---------
Co-authored-by: AwareFoxy <135021509+AwareFoxy@users.noreply.github.com>
Co-authored-by: FN <37689533+FireNameFN@users.noreply.github.com>
---
.../Overlays/BaseSwitchableOverlay.cs | 47 +++++++
.../_CorvaxNext/Overlays/NightVisionSystem.cs | 85 ++++++++++++
.../Overlays/ThermalVisionOverlay.cs | 130 ++++++++++++++++++
.../Overlays/ThermalVisionSystem.cs | 81 +++++++++++
.../_CorvaxNext/Overlays/NightVisionSystem.cs | 5 +
.../Overlays/ThermalVisionSystem.cs | 5 +
.../ClothingGrantComponentComponent.cs | 14 ++
.../Components/ClothingGrantTagComponent.cs | 10 ++
.../Systems/ClothingGrantingSystem.cs | 92 +++++++++++++
.../Overlays/BaseOverlayComponent.cs | 16 +++
.../Overlays/NightVisionComponent.cs | 15 ++
.../Overlays/SwitchableOverlayComponent.cs | 24 ++++
.../Overlays/SwitchableOverlaySystem.cs | 52 +++++++
.../Overlays/ThermalInvisibilityComponent.cs | 7 +
.../Overlays/ThermalVisionComponent.cs | 14 ++
.../_CorvaxNext/Items/Goggles/activate.ogg | Bin 0 -> 12048 bytes
.../Items/Goggles/attributions.yml | 9 ++
.../_CorvaxNext/Items/Goggles/deactivate.ogg | Bin 0 -> 12424 bytes
.../_corvaxnext/store/uplink-catalog.ftl | 5 +
.../entities/clothing/eyes/goggles.ftl | 15 ++
.../_CorvaxNext/prototypes/actions/types.ftl | 5 +
.../_CorvaxNext/store/uplink-catalog.ftl | 5 +
.../Mobs/Cyborgs/base_borg_chassis.yml | 1 +
.../Entities/Mobs/Player/admin_ghost.yml | 1 +
.../Entities/Structures/Machines/lathe.yml | 8 +-
.../Prototypes/_CorvaxNext/Actions/types.yml | 25 ++++
.../_CorvaxNext/Catalog/uplink_catalog.yml | 63 +++++++++
.../Entities/Clothing/Eyes/goggles.yml | 71 ++++++++++
.../_CorvaxNext/Research/experimental.yml | 2 +
.../_CorvaxNext/Shaders/shaders.yml | 4 +
.../nightvision.rsi/equipped-EYES-off.png | Bin 0 -> 452 bytes
.../Goggles/nightvision.rsi/equipped-EYES.png | Bin 0 -> 719 bytes
.../Eyes/Goggles/nightvision.rsi/icon.png | Bin 0 -> 218 bytes
.../Goggles/nightvision.rsi/inhand-left.png | Bin 0 -> 385 bytes
.../Goggles/nightvision.rsi/inhand-right.png | Bin 0 -> 410 bytes
.../Eyes/Goggles/nightvision.rsi/meta.json | 48 +++++++
.../Goggles/thermal.rsi/equipped-EYES.png | Bin 0 -> 524 bytes
.../Eyes/Goggles/thermal.rsi/icon.png | Bin 0 -> 510 bytes
.../Eyes/Goggles/thermal.rsi/inhand-left.png | Bin 0 -> 327 bytes
.../Eyes/Goggles/thermal.rsi/inhand-right.png | Bin 0 -> 325 bytes
.../Eyes/Goggles/thermal.rsi/meta.json | 26 ++++
.../_CorvaxNext/Shaders/nightvision.swsl | 40 ++++++
42 files changed, 922 insertions(+), 3 deletions(-)
create mode 100644 Content.Client/_CorvaxNext/Overlays/BaseSwitchableOverlay.cs
create mode 100644 Content.Client/_CorvaxNext/Overlays/NightVisionSystem.cs
create mode 100644 Content.Client/_CorvaxNext/Overlays/ThermalVisionOverlay.cs
create mode 100644 Content.Client/_CorvaxNext/Overlays/ThermalVisionSystem.cs
create mode 100644 Content.Server/_CorvaxNext/Overlays/NightVisionSystem.cs
create mode 100644 Content.Server/_CorvaxNext/Overlays/ThermalVisionSystem.cs
create mode 100644 Content.Shared/_CorvaxNext/Clothing/Components/ClothingGrantComponentComponent.cs
create mode 100644 Content.Shared/_CorvaxNext/Clothing/Components/ClothingGrantTagComponent.cs
create mode 100644 Content.Shared/_CorvaxNext/Clothing/Systems/ClothingGrantingSystem.cs
create mode 100644 Content.Shared/_CorvaxNext/Overlays/BaseOverlayComponent.cs
create mode 100644 Content.Shared/_CorvaxNext/Overlays/NightVisionComponent.cs
create mode 100644 Content.Shared/_CorvaxNext/Overlays/SwitchableOverlayComponent.cs
create mode 100644 Content.Shared/_CorvaxNext/Overlays/SwitchableOverlaySystem.cs
create mode 100644 Content.Shared/_CorvaxNext/Overlays/ThermalInvisibilityComponent.cs
create mode 100644 Content.Shared/_CorvaxNext/Overlays/ThermalVisionComponent.cs
create mode 100644 Resources/Audio/_CorvaxNext/Items/Goggles/activate.ogg
create mode 100644 Resources/Audio/_CorvaxNext/Items/Goggles/attributions.yml
create mode 100644 Resources/Audio/_CorvaxNext/Items/Goggles/deactivate.ogg
create mode 100644 Resources/Locale/en-US/_corvaxnext/store/uplink-catalog.ftl
create mode 100644 Resources/Locale/ru-RU/_CorvaxNext/entities/clothing/eyes/goggles.ftl
create mode 100644 Resources/Locale/ru-RU/_CorvaxNext/prototypes/actions/types.ftl
create mode 100644 Resources/Locale/ru-RU/_CorvaxNext/store/uplink-catalog.ftl
create mode 100644 Resources/Prototypes/_CorvaxNext/Actions/types.yml
create mode 100644 Resources/Prototypes/_CorvaxNext/Catalog/uplink_catalog.yml
create mode 100644 Resources/Prototypes/_CorvaxNext/Entities/Clothing/Eyes/goggles.yml
create mode 100644 Resources/Prototypes/_CorvaxNext/Shaders/shaders.yml
create mode 100644 Resources/Textures/_CorvaxNext/Clothing/Eyes/Goggles/nightvision.rsi/equipped-EYES-off.png
create mode 100644 Resources/Textures/_CorvaxNext/Clothing/Eyes/Goggles/nightvision.rsi/equipped-EYES.png
create mode 100644 Resources/Textures/_CorvaxNext/Clothing/Eyes/Goggles/nightvision.rsi/icon.png
create mode 100644 Resources/Textures/_CorvaxNext/Clothing/Eyes/Goggles/nightvision.rsi/inhand-left.png
create mode 100644 Resources/Textures/_CorvaxNext/Clothing/Eyes/Goggles/nightvision.rsi/inhand-right.png
create mode 100644 Resources/Textures/_CorvaxNext/Clothing/Eyes/Goggles/nightvision.rsi/meta.json
create mode 100644 Resources/Textures/_CorvaxNext/Clothing/Eyes/Goggles/thermal.rsi/equipped-EYES.png
create mode 100644 Resources/Textures/_CorvaxNext/Clothing/Eyes/Goggles/thermal.rsi/icon.png
create mode 100644 Resources/Textures/_CorvaxNext/Clothing/Eyes/Goggles/thermal.rsi/inhand-left.png
create mode 100644 Resources/Textures/_CorvaxNext/Clothing/Eyes/Goggles/thermal.rsi/inhand-right.png
create mode 100644 Resources/Textures/_CorvaxNext/Clothing/Eyes/Goggles/thermal.rsi/meta.json
create mode 100644 Resources/Textures/_CorvaxNext/Shaders/nightvision.swsl
diff --git a/Content.Client/_CorvaxNext/Overlays/BaseSwitchableOverlay.cs b/Content.Client/_CorvaxNext/Overlays/BaseSwitchableOverlay.cs
new file mode 100644
index 00000000000..5910ae4a836
--- /dev/null
+++ b/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 : 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("NightVision").Instance().Duplicate();
+ }
+
+ protected override void Draw(in OverlayDrawArgs args)
+ {
+ if (ScreenTexture is null
+ || _player.LocalEntity is null
+ || !_entity.TryGetComponent(_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);
+ }
+}
diff --git a/Content.Client/_CorvaxNext/Overlays/NightVisionSystem.cs b/Content.Client/_CorvaxNext/Overlays/NightVisionSystem.cs
new file mode 100644
index 00000000000..1b8909a1540
--- /dev/null
+++ b/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
+{
+ [Dependency] private readonly IPlayerManager _player = default!;
+ [Dependency] private readonly IOverlayManager _overlayMan = default!;
+ [Dependency] private readonly ILightManager _lightManager = default!;
+
+ private BaseSwitchableOverlay _overlay = default!;
+
+ public override void Initialize()
+ {
+ base.Initialize();
+
+ SubscribeLocalEvent(OnPlayerAttached);
+ SubscribeLocalEvent(OnPlayerDetached);
+ SubscribeLocalEvent(OnRestart);
+
+ _overlay = new BaseSwitchableOverlay();
+ }
+
+ 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(_player.LocalEntity.Value, out var component) && component.IsActive;
+
+ if (active)
+ _overlayMan.AddOverlay(_overlay);
+ else
+ _overlayMan.RemoveOverlay(_overlay);
+ }
+}
diff --git a/Content.Client/_CorvaxNext/Overlays/ThermalVisionOverlay.cs b/Content.Client/_CorvaxNext/Overlays/ThermalVisionOverlay.cs
new file mode 100644
index 00000000000..6d7018a73b5
--- /dev/null
+++ b/Content.Client/_CorvaxNext/Overlays/ThermalVisionOverlay.cs
@@ -0,0 +1,130 @@
+using System.Linq;
+using System.Numerics;
+using Content.Client.Stealth;
+using Content.Shared._CorvaxNext.Overlays;
+using Content.Shared.Body.Components;
+using Content.Shared.Stealth.Components;
+using Robust.Client.GameObjects;
+using Robust.Client.Graphics;
+using Robust.Client.Player;
+using Robust.Shared.Enums;
+using Robust.Shared.Map;
+
+namespace Content.Client._CorvaxNext.Overlays;
+
+public sealed class ThermalVisionOverlay : Overlay
+{
+ [Dependency] private readonly IEntityManager _entity = default!;
+ [Dependency] private readonly IPlayerManager _players = default!;
+
+ private readonly TransformSystem _transform;
+ private readonly OccluderSystem _occluder;
+ private readonly StealthSystem _stealth;
+ private readonly ContainerSystem _container;
+
+ public override bool RequestScreenTexture => true;
+ public override OverlaySpace Space => OverlaySpace.WorldSpace;
+
+ private readonly List _entries = [];
+
+ public ThermalVisionOverlay()
+ {
+ IoCManager.InjectDependencies(this);
+
+ _container = _entity.System();
+ _transform = _entity.System();
+ _occluder = _entity.System();
+ _stealth = _entity.System();
+
+ ZIndex = -1;
+ }
+
+ protected override void Draw(in OverlayDrawArgs args)
+ {
+ if (ScreenTexture is null
+ || _players.LocalEntity is null
+ || !_entity.TryGetComponent(_players.LocalEntity.Value, out var component)
+ || !component.IsActive)
+ return;
+
+ var worldHandle = args.WorldHandle;
+ var eye = args.Viewport.Eye;
+
+ if (eye is null)
+ return;
+
+ var mapId = eye.Position.MapId;
+ var eyeRot = eye.Rotation;
+
+ _entries.Clear();
+ var entities = _entity.EntityQueryEnumerator();
+ while (entities.MoveNext(out var uid, out var body, out var sprite, out var xform))
+ {
+ if (!CanSee(uid, sprite, body))
+ continue;
+
+ var entity = uid;
+
+ if (_container.TryGetOuterContainer(uid, xform, out var container))
+ {
+ var owner = container.Owner;
+ if (_entity.TryGetComponent(owner, out var ownerSprite)
+ && _entity.TryGetComponent(owner, out var ownerXform))
+ {
+ entity = owner;
+ sprite = ownerSprite;
+ xform = ownerXform;
+ }
+ }
+
+ if (_entries.Any(e => e.Ent.Item1 == entity))
+ continue;
+
+ _entries.Add(new ThermalVisionRenderEntry((entity, sprite, xform, body), mapId, eyeRot));
+ }
+
+ foreach (var entry in _entries)
+ {
+ Render(entry.Ent, entry.Map, worldHandle, entry.EyeRot);
+ }
+
+ worldHandle.SetTransform(Matrix3x2.Identity);
+ }
+
+ private void Render(Entity ent,
+ MapId? map,
+ DrawingHandleWorld handle,
+ Angle eyeRot)
+ {
+ var (uid, sprite, xform, body) = ent;
+ if (xform.MapID != map || HasOccluders(uid) || !CanSee(uid, sprite, body))
+ return;
+
+ var position = _transform.GetWorldPosition(xform);
+ var rotation = _transform.GetWorldRotation(xform);
+
+ sprite.Render(handle, eyeRot, rotation, position: position);
+ }
+
+ private bool CanSee(EntityUid uid, SpriteComponent sprite, BodyComponent body)
+ {
+ return sprite.Visible
+ && !_entity.HasComponent(uid)
+ && (!_entity.TryGetComponent(uid, out StealthComponent? stealth)
+ || _stealth.GetVisibility(uid, stealth) > 0.5f);
+ }
+
+ private bool HasOccluders(EntityUid uid)
+ {
+ var mapCoordinates = _transform.GetMapCoordinates(uid);
+ var occluders = _occluder.QueryAabb(mapCoordinates.MapId,
+ Box2.CenteredAround(mapCoordinates.Position, new Vector2(0.3f, 0.3f)));
+
+ return occluders.Any(o => o.Component.Enabled);
+ }
+}
+
+public record struct ThermalVisionRenderEntry(
+ (EntityUid, SpriteComponent, TransformComponent, BodyComponent) Ent,
+ MapId? Map,
+ Angle EyeRot);
diff --git a/Content.Client/_CorvaxNext/Overlays/ThermalVisionSystem.cs b/Content.Client/_CorvaxNext/Overlays/ThermalVisionSystem.cs
new file mode 100644
index 00000000000..ce3713c4be3
--- /dev/null
+++ b/Content.Client/_CorvaxNext/Overlays/ThermalVisionSystem.cs
@@ -0,0 +1,81 @@
+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 ThermalVisionSystem : SwitchableOverlaySystem
+{
+ [Dependency] private readonly IPlayerManager _player = default!;
+ [Dependency] private readonly IOverlayManager _overlayMan = default!;
+
+ private ThermalVisionOverlay _thermalOverlay = default!;
+ private BaseSwitchableOverlay _overlay = default!;
+
+ public override void Initialize()
+ {
+ base.Initialize();
+
+ SubscribeLocalEvent(OnPlayerAttached);
+ SubscribeLocalEvent(OnPlayerDetached);
+ SubscribeLocalEvent(OnRestart);
+
+ _thermalOverlay = new ThermalVisionOverlay();
+ _overlay = new BaseSwitchableOverlay();
+ }
+
+ private void OnPlayerAttached(EntityUid uid, ThermalVisionComponent component, PlayerAttachedEvent args)
+ {
+ if (!component.IsActive)
+ return;
+
+ UpdateVision(args.Player, component.IsActive);
+ }
+
+ private void OnPlayerDetached(EntityUid uid, ThermalVisionComponent component, PlayerDetachedEvent args)
+ {
+ UpdateVision(args.Player, false);
+ }
+
+ private void OnRestart(RoundRestartCleanupEvent ev)
+ {
+ _overlayMan.RemoveOverlay(_thermalOverlay);
+ _overlayMan.RemoveOverlay(_overlay);
+ }
+
+ protected override void UpdateVision(EntityUid uid, bool active)
+ {
+ if (_player.LocalSession?.AttachedEntity != uid)
+ return;
+
+ UpdateOverlay(active, _thermalOverlay);
+ UpdateOverlay(active, _overlay);
+ }
+
+ private void UpdateVision(ICommonSession player, bool active)
+ {
+ if (_player.LocalSession != player)
+ return;
+
+ UpdateOverlay(active, _thermalOverlay);
+ UpdateOverlay(active, _overlay);
+ }
+
+ private void UpdateOverlay(bool active, Overlay overlay)
+ {
+ if (_player.LocalEntity == null)
+ {
+ _overlayMan.RemoveOverlay(overlay);
+ return;
+ }
+
+ active |= TryComp(_player.LocalEntity.Value, out var component) && component.IsActive;
+
+ if (active)
+ _overlayMan.AddOverlay(overlay);
+ else
+ _overlayMan.RemoveOverlay(overlay);
+ }
+}
diff --git a/Content.Server/_CorvaxNext/Overlays/NightVisionSystem.cs b/Content.Server/_CorvaxNext/Overlays/NightVisionSystem.cs
new file mode 100644
index 00000000000..b38deb2d0b7
--- /dev/null
+++ b/Content.Server/_CorvaxNext/Overlays/NightVisionSystem.cs
@@ -0,0 +1,5 @@
+using Content.Shared._CorvaxNext.Overlays;
+
+namespace Content.Server._CorvaxNext.Overlays;
+
+public sealed class NightVisionSystem : SwitchableOverlaySystem;
diff --git a/Content.Server/_CorvaxNext/Overlays/ThermalVisionSystem.cs b/Content.Server/_CorvaxNext/Overlays/ThermalVisionSystem.cs
new file mode 100644
index 00000000000..6cffd8314d9
--- /dev/null
+++ b/Content.Server/_CorvaxNext/Overlays/ThermalVisionSystem.cs
@@ -0,0 +1,5 @@
+using Content.Shared._CorvaxNext.Overlays;
+
+namespace Content.Server._CorvaxNext.Overlays;
+
+public sealed class ThermalVisionSystem : SwitchableOverlaySystem;
diff --git a/Content.Shared/_CorvaxNext/Clothing/Components/ClothingGrantComponentComponent.cs b/Content.Shared/_CorvaxNext/Clothing/Components/ClothingGrantComponentComponent.cs
new file mode 100644
index 00000000000..ff2e2a2cbca
--- /dev/null
+++ b/Content.Shared/_CorvaxNext/Clothing/Components/ClothingGrantComponentComponent.cs
@@ -0,0 +1,14 @@
+using Robust.Shared.Prototypes;
+
+namespace Content.Shared._CorvaxNext.Clothing
+{
+ [RegisterComponent]
+ public sealed partial class ClothingGrantComponentComponent : Component
+ {
+ [DataField("component")]
+ [AlwaysPushInheritance]
+ public ComponentRegistry Components { get; private set; } = new();
+
+ public bool IsActive = false;
+ }
+}
diff --git a/Content.Shared/_CorvaxNext/Clothing/Components/ClothingGrantTagComponent.cs b/Content.Shared/_CorvaxNext/Clothing/Components/ClothingGrantTagComponent.cs
new file mode 100644
index 00000000000..27190765295
--- /dev/null
+++ b/Content.Shared/_CorvaxNext/Clothing/Components/ClothingGrantTagComponent.cs
@@ -0,0 +1,10 @@
+namespace Content.Shared._CorvaxNext.Clothing;
+
+[RegisterComponent]
+public sealed partial class ClothingGrantTagComponent : Component
+{
+ [DataField("tag")]
+ public string Tag = "";
+
+ public bool IsActive = false;
+}
diff --git a/Content.Shared/_CorvaxNext/Clothing/Systems/ClothingGrantingSystem.cs b/Content.Shared/_CorvaxNext/Clothing/Systems/ClothingGrantingSystem.cs
new file mode 100644
index 00000000000..97044a34030
--- /dev/null
+++ b/Content.Shared/_CorvaxNext/Clothing/Systems/ClothingGrantingSystem.cs
@@ -0,0 +1,92 @@
+using Content.Shared.Clothing.Components;
+using Content.Shared.Inventory.Events;
+using Robust.Shared.Serialization.Manager;
+using Content.Shared.Tag;
+
+namespace Content.Shared._CorvaxNext.Clothing;
+
+public sealed class ClothingGrantingSystem : EntitySystem
+{
+ [Dependency] private readonly IComponentFactory _componentFactory = default!;
+ [Dependency] private readonly ISerializationManager _serializationManager = default!;
+ [Dependency] private readonly TagSystem _tagSystem = default!;
+
+ public override void Initialize()
+ {
+ base.Initialize();
+
+ SubscribeLocalEvent(OnCompEquip);
+ SubscribeLocalEvent(OnCompUnequip);
+
+ SubscribeLocalEvent(OnTagEquip);
+ SubscribeLocalEvent(OnTagUnequip);
+ }
+
+ private void OnCompEquip(EntityUid uid, ClothingGrantComponentComponent component, GotEquippedEvent args)
+ {
+ if (!TryComp(uid, out var clothing)) return;
+
+ if (!clothing.Slots.HasFlag(args.SlotFlags)) return;
+
+ if (component.Components.Count > 1)
+ {
+ Logger.Error("Although a component registry supports multiple components, we cannot bookkeep more than 1 component for ClothingGrantComponent at this time.");
+ return;
+ }
+
+ foreach (var (name, data) in component.Components)
+ {
+ var newComp = (Component) _componentFactory.GetComponent(name);
+
+ if (HasComp(args.Equipee, newComp.GetType()))
+ continue;
+
+ newComp.Owner = args.Equipee;
+
+ var temp = (object) newComp;
+ _serializationManager.CopyTo(data.Component, ref temp);
+ EntityManager.AddComponent(args.Equipee, (Component)temp!);
+
+ component.IsActive = true;
+ }
+ }
+
+ private void OnCompUnequip(EntityUid uid, ClothingGrantComponentComponent component, GotUnequippedEvent args)
+ {
+ if (!component.IsActive) return;
+
+ foreach (var (name, data) in component.Components)
+ {
+ var newComp = (Component) _componentFactory.GetComponent(name);
+
+ RemComp(args.Equipee, newComp.GetType());
+ }
+
+ component.IsActive = false;
+ }
+
+
+ private void OnTagEquip(EntityUid uid, ClothingGrantTagComponent component, GotEquippedEvent args)
+ {
+ if (!TryComp(uid, out var clothing))
+ return;
+
+ if (!clothing.Slots.HasFlag(args.SlotFlags))
+ return;
+
+ EnsureComp(args.Equipee);
+ _tagSystem.AddTag(args.Equipee, component.Tag);
+
+ component.IsActive = true;
+ }
+
+ private void OnTagUnequip(EntityUid uid, ClothingGrantTagComponent component, GotUnequippedEvent args)
+ {
+ if (!component.IsActive)
+ return;
+
+ _tagSystem.RemoveTag(args.Equipee, component.Tag);
+
+ component.IsActive = false;
+ }
+}
diff --git a/Content.Shared/_CorvaxNext/Overlays/BaseOverlayComponent.cs b/Content.Shared/_CorvaxNext/Overlays/BaseOverlayComponent.cs
new file mode 100644
index 00000000000..4d5ad8b4727
--- /dev/null
+++ b/Content.Shared/_CorvaxNext/Overlays/BaseOverlayComponent.cs
@@ -0,0 +1,16 @@
+namespace Content.Shared._CorvaxNext.Overlays;
+
+public abstract partial class BaseOverlayComponent : Component
+{
+ [DataField, ViewVariables(VVAccess.ReadOnly)]
+ public virtual Vector3 Tint { get; set; } = new(0.3f, 0.3f, 0.3f);
+
+ [DataField, ViewVariables(VVAccess.ReadOnly)]
+ public virtual float Strength { get; set; } = 2f;
+
+ [DataField, ViewVariables(VVAccess.ReadOnly)]
+ public virtual float Noise { get; set; } = 0.5f;
+
+ [DataField, ViewVariables(VVAccess.ReadOnly)]
+ public virtual Color Color { get; set; } = Color.White;
+}
diff --git a/Content.Shared/_CorvaxNext/Overlays/NightVisionComponent.cs b/Content.Shared/_CorvaxNext/Overlays/NightVisionComponent.cs
new file mode 100644
index 00000000000..084f7448568
--- /dev/null
+++ b/Content.Shared/_CorvaxNext/Overlays/NightVisionComponent.cs
@@ -0,0 +1,15 @@
+using Content.Shared.Actions;
+using Robust.Shared.Audio;
+using Robust.Shared.GameStates;
+
+namespace Content.Shared._CorvaxNext.Overlays;
+
+[RegisterComponent, NetworkedComponent]
+public sealed partial class NightVisionComponent : SwitchableOverlayComponent
+{
+ public override string? ToggleAction { get; set; } = "ToggleNightVision";
+
+ public override Color Color { get; set; } = Color.FromHex("#98FB98");
+}
+
+public sealed partial class ToggleNightVisionEvent : InstantActionEvent;
diff --git a/Content.Shared/_CorvaxNext/Overlays/SwitchableOverlayComponent.cs b/Content.Shared/_CorvaxNext/Overlays/SwitchableOverlayComponent.cs
new file mode 100644
index 00000000000..89a99a283f0
--- /dev/null
+++ b/Content.Shared/_CorvaxNext/Overlays/SwitchableOverlayComponent.cs
@@ -0,0 +1,24 @@
+using Robust.Shared.Audio;
+using Robust.Shared.GameStates;
+
+namespace Content.Shared._CorvaxNext.Overlays;
+
+public abstract partial class SwitchableOverlayComponent : BaseOverlayComponent
+{
+ [DataField, AutoNetworkedField]
+ public bool IsActive = true;
+
+ [DataField]
+ public virtual SoundSpecifier? ActivateSound { get; set; } =
+ new SoundPathSpecifier("/Audio/_CorvaxNext/Items/Goggles/activate.ogg");
+
+ [DataField]
+ public virtual SoundSpecifier? DeactivateSound { get; set; } =
+ new SoundPathSpecifier("/Audio/_CorvaxNext/Items/Goggles/deactivate.ogg");
+
+ [DataField]
+ public virtual string? ToggleAction { get; set; }
+
+ [ViewVariables]
+ public EntityUid? ToggleActionEntity;
+}
diff --git a/Content.Shared/_CorvaxNext/Overlays/SwitchableOverlaySystem.cs b/Content.Shared/_CorvaxNext/Overlays/SwitchableOverlaySystem.cs
new file mode 100644
index 00000000000..062fa177264
--- /dev/null
+++ b/Content.Shared/_CorvaxNext/Overlays/SwitchableOverlaySystem.cs
@@ -0,0 +1,52 @@
+using Content.Shared.Actions;
+using Robust.Shared.Audio.Systems;
+using Robust.Shared.Network;
+using Robust.Shared.Player;
+using Robust.Shared.Timing;
+
+namespace Content.Shared._CorvaxNext.Overlays;
+
+public abstract class SwitchableOverlaySystem : EntitySystem
+ where TComp : SwitchableOverlayComponent
+ where TEvent : InstantActionEvent
+{
+ [Dependency] private readonly SharedAudioSystem _audio = default!;
+ [Dependency] private readonly SharedActionsSystem _actions = default!;
+ [Dependency] private readonly IGameTiming _timing = default!;
+ [Dependency] private readonly INetManager _net = default!;
+
+ public override void Initialize()
+ {
+ SubscribeLocalEvent(OnToggle);
+ SubscribeLocalEvent(OnInit);
+ SubscribeLocalEvent(OnRemove);
+ }
+
+ private void OnRemove(EntityUid uid, TComp component, ComponentRemove args)
+ {
+ _actions.RemoveAction(uid, component.ToggleActionEntity);
+ UpdateVision(uid, false);
+ }
+
+ private void OnInit(EntityUid uid, TComp component, ComponentInit args)
+ {
+ _actions.AddAction(uid, ref component.ToggleActionEntity, component.ToggleAction);
+ UpdateVision(uid, component.IsActive);
+ }
+
+ protected virtual void UpdateVision(EntityUid uid, bool active) { }
+
+ private void OnToggle(EntityUid uid, TComp component, TEvent args)
+ {
+ if (!_timing.IsFirstTimePredicted)
+ return;
+
+ component.IsActive = !component.IsActive;
+
+ if (_net.IsClient)
+ _audio.PlayEntity(component.IsActive ? component.ActivateSound : component.DeactivateSound, Filter.Local(), uid, false);
+
+ args.Handled = true;
+ UpdateVision(uid, component.IsActive);
+ }
+}
diff --git a/Content.Shared/_CorvaxNext/Overlays/ThermalInvisibilityComponent.cs b/Content.Shared/_CorvaxNext/Overlays/ThermalInvisibilityComponent.cs
new file mode 100644
index 00000000000..924fa8ef63f
--- /dev/null
+++ b/Content.Shared/_CorvaxNext/Overlays/ThermalInvisibilityComponent.cs
@@ -0,0 +1,7 @@
+using Robust.Shared.GameStates;
+
+namespace Content.Shared._CorvaxNext.Overlays;
+
+[RegisterComponent, NetworkedComponent]
+public sealed partial class ThermalInvisibilityComponent : SwitchableOverlayComponent;
+
diff --git a/Content.Shared/_CorvaxNext/Overlays/ThermalVisionComponent.cs b/Content.Shared/_CorvaxNext/Overlays/ThermalVisionComponent.cs
new file mode 100644
index 00000000000..65eb94d9221
--- /dev/null
+++ b/Content.Shared/_CorvaxNext/Overlays/ThermalVisionComponent.cs
@@ -0,0 +1,14 @@
+using Content.Shared.Actions;
+using Robust.Shared.GameStates;
+
+namespace Content.Shared._CorvaxNext.Overlays;
+
+[RegisterComponent, NetworkedComponent]
+public sealed partial class ThermalVisionComponent : SwitchableOverlayComponent
+{
+ public override string? ToggleAction { get; set; } = "ToggleThermalVision";
+
+ public override Color Color { get; set; } = Color.FromHex("#C26E4A");
+}
+
+public sealed partial class ToggleThermalVisionEvent : InstantActionEvent;
diff --git a/Resources/Audio/_CorvaxNext/Items/Goggles/activate.ogg b/Resources/Audio/_CorvaxNext/Items/Goggles/activate.ogg
new file mode 100644
index 0000000000000000000000000000000000000000..96cdb288fe07d0e1d3c0f38774cb7ffe01624724
GIT binary patch
literal 12048
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
literal 0
HcmV?d00001
diff --git a/Resources/Audio/_CorvaxNext/Items/Goggles/attributions.yml b/Resources/Audio/_CorvaxNext/Items/Goggles/attributions.yml
new file mode 100644
index 00000000000..7b1121f5423
--- /dev/null
+++ b/Resources/Audio/_CorvaxNext/Items/Goggles/attributions.yml
@@ -0,0 +1,9 @@
+- files: ["activate.ogg"]
+ license: "CC-BY-NC-SA-3.0"
+ copyright: "Taken from TGstation"
+ source: "https://github.com/tgstation/tgstation"
+
+- files: ["deactivate.ogg"]
+ license: "CC-BY-NC-SA-3.0"
+ copyright: "Taken from TGstation"
+ source: "https://github.com/tgstation/tgstation"
\ No newline at end of file
diff --git a/Resources/Audio/_CorvaxNext/Items/Goggles/deactivate.ogg b/Resources/Audio/_CorvaxNext/Items/Goggles/deactivate.ogg
new file mode 100644
index 0000000000000000000000000000000000000000..e1e8f4fd82fcfa0b0c01c28b4ec93f53bbb2c2de
GIT binary patch
literal 12424
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