From 416c0ed8bd3263b30e5cd01bac2a62c9426e83eb Mon Sep 17 00:00:00 2001 From: Vigers Ray Date: Fri, 30 Jan 2026 06:27:41 +0100 Subject: [PATCH] =?UTF-8?q?Revert=20"=D1=84=D0=BE=D1=82=D0=BE=D0=B0=D0=BF?= =?UTF-8?q?=D0=B0=D1=80=D0=B0=D1=82=20=D0=B8=20=D0=B4=D0=BE=D1=80=D0=B0?= =?UTF-8?q?=D0=B1=D0=BE=D1=82=D0=BA=D0=B0=20=D0=BC=D0=B5=D1=81=D0=B5=D0=BD?= =?UTF-8?q?=D0=B6=D0=B5=D1=80=D0=B0"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit 5f3f836fe5d9ee98650c3d1d635522c6ccc5af57. --- .../Cartridges/MessagePanel.xaml | 37 +- .../Cartridges/MessagePanel.xaml.cs | 107 ----- .../CartridgeLoader/Cartridges/MessengerUi.cs | 11 +- .../Cartridges/MessengerUiFragment.xaml | 6 - .../Cartridges/MessengerUiFragment.xaml.cs | 99 +---- .../Cartridges/PhotoCaptureOverlay.cs | 74 ---- .../Cartridges/PhotoCartridgeClientSystem.cs | 228 ----------- .../CartridgeLoader/Cartridges/PhotoUi.cs | 65 --- .../Cartridges/PhotoUiFragment.xaml | 50 --- .../Cartridges/PhotoUiFragment.xaml.cs | 386 ------------------ .../MessengerCartridgeSystem.Connection.cs | 4 +- .../MessengerCartridgeSystem.Messaging.cs | 42 +- ...MessengerCartridgeSystem.PacketHandlers.cs | 15 +- .../Cartridges/MessengerCartridgeSystem.UI.cs | 5 +- .../Cartridges/MessengerCartridgeSystem.cs | 22 - .../Cartridges/PhotoCartridgeSystem.cs | 324 --------------- .../Messenger/MessengerServerSystem.Groups.cs | 25 +- .../MessengerServerSystem.Messages.cs | 61 +-- .../MessengerServerSystem.Queries.cs | 9 +- .../MessengerServerSystem.UserRegistration.cs | 20 +- .../_Sunrise/NetTexturesCleanupSystem.cs | 25 -- Content.Server/_Sunrise/NetTexturesManager.cs | 190 ++++----- .../CartridgeLoaderComponent.cs | 2 +- .../Cartridges/MessengerUiMessageEvent.cs | 8 +- .../Cartridges/MessengerUiState.cs | 9 +- .../Cartridges/PdaPhotoCaptureMessage.cs | 44 -- .../Cartridges/PhotoCartridgeComponent.cs | 65 --- .../Cartridges/PhotoUiMessageEvent.cs | 45 -- .../Cartridges/PhotoUiState.cs | 42 -- .../_Sunrise/Messenger/MessengerMessage.cs | 19 +- Resources/Audio/_Sunrise/camera_shot.ogg | Bin 8495 -> 0 bytes .../entities/objects/devices/cartridges.ftl | 4 +- .../_strings/cartridge-loader/cartridges.ftl | 3 +- .../entities/objects/devices/cartridges.ftl | 4 +- .../_sunrise/cartridge-loader/cartridges.ftl | 7 - .../_strings/cartridge-loader/cartridges.ftl | 4 +- .../_strings/cartridge-loader/messenger.ftl | 4 - .../Entities/Objects/Devices/pda.yml | 15 +- .../_Sunrise/Entities/Effects/photo.yml | 13 - .../Objects/Devices/Prison/pda/doctor.yml | 1 - .../Objects/Devices/Prison/pda/engineer.yml | 1 - .../Devices/Prison/pda/headofprison.yml | 1 - .../Objects/Devices/Prison/pda/pilot.yml | 1 - .../Objects/Devices/Prison/pda/prisoner.yml | 1 - .../Objects/Devices/Prison/pda/scientist.yml | 1 - .../Objects/Devices/Prison/pda/worker.yml | 1 - .../Entities/Objects/Devices/cartridges.yml | 21 +- .../_Sunrise/Entities/Objects/Devices/pda.yml | 2 - .../Structures/Machines/messenger_server.yml | 4 +- .../Misc/program_icons.rsi/flash_snap.png | Bin 565 -> 0 bytes .../Misc/program_icons.rsi/games.png | Bin 534 -> 0 bytes .../Misc/program_icons.rsi/meta.json | 8 +- .../Misc/program_icons.rsi/robust_chat.png | Bin 536 -> 0 bytes 53 files changed, 150 insertions(+), 1985 deletions(-) delete mode 100644 Content.Client/_Sunrise/CartridgeLoader/Cartridges/PhotoCaptureOverlay.cs delete mode 100644 Content.Client/_Sunrise/CartridgeLoader/Cartridges/PhotoCartridgeClientSystem.cs delete mode 100644 Content.Client/_Sunrise/CartridgeLoader/Cartridges/PhotoUi.cs delete mode 100644 Content.Client/_Sunrise/CartridgeLoader/Cartridges/PhotoUiFragment.xaml delete mode 100644 Content.Client/_Sunrise/CartridgeLoader/Cartridges/PhotoUiFragment.xaml.cs delete mode 100644 Content.Server/_Sunrise/CartridgeLoader/Cartridges/PhotoCartridgeSystem.cs delete mode 100644 Content.Server/_Sunrise/NetTexturesCleanupSystem.cs delete mode 100644 Content.Shared/_Sunrise/CartridgeLoader/Cartridges/PdaPhotoCaptureMessage.cs delete mode 100644 Content.Shared/_Sunrise/CartridgeLoader/Cartridges/PhotoCartridgeComponent.cs delete mode 100644 Content.Shared/_Sunrise/CartridgeLoader/Cartridges/PhotoUiMessageEvent.cs delete mode 100644 Content.Shared/_Sunrise/CartridgeLoader/Cartridges/PhotoUiState.cs delete mode 100644 Resources/Audio/_Sunrise/camera_shot.ogg delete mode 100644 Resources/Prototypes/_Sunrise/Entities/Effects/photo.yml delete mode 100644 Resources/Textures/_Sunrise/Interface/Misc/program_icons.rsi/flash_snap.png delete mode 100644 Resources/Textures/_Sunrise/Interface/Misc/program_icons.rsi/games.png delete mode 100644 Resources/Textures/_Sunrise/Interface/Misc/program_icons.rsi/robust_chat.png diff --git a/Content.Client/_Sunrise/CartridgeLoader/Cartridges/MessagePanel.xaml b/Content.Client/_Sunrise/CartridgeLoader/Cartridges/MessagePanel.xaml index 1071494fe4..1a6110da59 100644 --- a/Content.Client/_Sunrise/CartridgeLoader/Cartridges/MessagePanel.xaml +++ b/Content.Client/_Sunrise/CartridgeLoader/Cartridges/MessagePanel.xaml @@ -40,34 +40,23 @@ StyleClasses="LabelSubText" /> - - - - - - - - + MinSize="0,20" /> + + diff --git a/Content.Client/_Sunrise/CartridgeLoader/Cartridges/MessagePanel.xaml.cs b/Content.Client/_Sunrise/CartridgeLoader/Cartridges/MessagePanel.xaml.cs index a130ec292c..a732ef3e89 100644 --- a/Content.Client/_Sunrise/CartridgeLoader/Cartridges/MessagePanel.xaml.cs +++ b/Content.Client/_Sunrise/CartridgeLoader/Cartridges/MessagePanel.xaml.cs @@ -1,4 +1,3 @@ -using System.Numerics; using Content.Client._Sunrise.Messenger; using Content.Client.Resources; using Content.Client.Stylesheets; @@ -9,7 +8,6 @@ using Robust.Client.GameObjects; using Robust.Client.Graphics; using Robust.Client.ResourceManagement; using Robust.Client.UserInterface.Controls; -using Robust.Client.UserInterface.CustomControls; using Robust.Client.UserInterface.RichText; using Robust.Client.UserInterface.XAML; using Robust.Shared.Prototypes; @@ -23,7 +21,6 @@ public sealed partial class MessagePanel : PanelContainer [Dependency] private readonly IResourceCache _resourceCache = default!; [Dependency] private readonly IEntitySystemManager _entitySystemManager = default!; [Dependency] private readonly IPrototypeManager _prototypeManager = default!; - [Dependency] private readonly NetTexturesManager _netTexturesManager = default!; private ClientEmojiSystem? EmojiSystem => _entitySystemManager.GetEntitySystemOrNull(); private SpriteSystem GetSpriteSystem() => _entitySystemManager.GetEntitySystem(); @@ -48,36 +45,10 @@ public sealed partial class MessagePanel : PanelContainer { IoCManager.InjectDependencies(this); RobustXamlLoader.Load(this); - _netTexturesManager.ResourceLoaded += OnResourceLoaded; - ImageButton.OnPressed += _ => ShowFullImage(); - - ImageBorder.PanelOverride = new StyleBoxFlat - { - BackgroundColor = Color.Transparent, - BorderColor = Color.Transparent, - BorderThickness = new Thickness(2) - }; - - ImageButton.OnMouseEntered += _ => - { - if (ImageBorder.PanelOverride is StyleBoxFlat style) - { - style.BorderColor = Color.White.WithAlpha(0.6f); - } - }; - - ImageButton.OnMouseExited += _ => - { - if (ImageBorder.PanelOverride is StyleBoxFlat style) - { - style.BorderColor = Color.Transparent; - } - }; } public event Action? OnDeleteMessage; private Button? _deleteButton; - private string? _currentImagePath; public void UpdateMessage(MessengerMessage message, bool isOwnMessage, bool isPersonalChat, string? currentUserId) { @@ -89,7 +60,6 @@ public sealed partial class MessagePanel : PanelContainer var parsedContent = EmojiSystem?.ParseEmojis(message.Content) ?? message.Content; ContentLabel.SetMessage(FormattedMessage.FromMarkupPermissive(parsedContent), MessageTagsAllowed); - ContentLabel.Visible = !string.IsNullOrWhiteSpace(message.Content); if (isOwnMessage && _deleteButton == null) { @@ -146,83 +116,6 @@ public sealed partial class MessagePanel : PanelContainer { ReadStatusIcon.Visible = false; } - - UpdateImagePreview(message.ImagePath); - } - - private void UpdateImagePreview(string? imagePath) - { - if (string.IsNullOrWhiteSpace(imagePath)) - { - ImageButton.Visible = false; - _currentImagePath = null; - return; - } - - _currentImagePath = imagePath; - - var isAvailable = _netTexturesManager.EnsureResource(imagePath); - - if (isAvailable) - { - LoadImageTexture(imagePath); - } - else - { - ImageButton.Visible = false; - } - } - - private void ShowFullImage() - { - if (ImagePreview.Texture == null) - return; - - var window = new DefaultWindow - { - Title = Loc.GetString("messenger-image-preview-title"), - MinSize = new Vector2(600, 600) - }; - - var textureRect = new TextureRect - { - Texture = ImagePreview.Texture, - Stretch = TextureRect.StretchMode.KeepAspect, - HorizontalExpand = true, - VerticalExpand = true - }; - - window.Contents.AddChild(textureRect); - window.OpenCentered(); - } - - private void OnResourceLoaded(string resourcePath) - { - if (_currentImagePath == resourcePath) - { - LoadImageTexture(resourcePath); - } - } - - private void LoadImageTexture(string imagePath) - { - try - { - var uploadedPath = _netTexturesManager.GetUploadedPath(imagePath); - if (_resourceCache.TryGetResource(uploadedPath, out var textureResource)) - { - ImagePreview.Texture = textureResource.Texture; - ImageButton.Visible = true; - } - else - { - ImageButton.Visible = false; - } - } - catch - { - ImageButton.Visible = false; - } } /// diff --git a/Content.Client/_Sunrise/CartridgeLoader/Cartridges/MessengerUi.cs b/Content.Client/_Sunrise/CartridgeLoader/Cartridges/MessengerUi.cs index b904cb49d1..d16160847c 100644 --- a/Content.Client/_Sunrise/CartridgeLoader/Cartridges/MessengerUi.cs +++ b/Content.Client/_Sunrise/CartridgeLoader/Cartridges/MessengerUi.cs @@ -17,8 +17,8 @@ public sealed partial class MessengerUi : UIFragment public override void Setup(BoundUserInterface userInterface, EntityUid? fragmentOwner) { _fragment = new MessengerUiFragment(); - _fragment.OnSendMessage += (recipientId, groupId, content, imagePath) => - SendMessengerMessage(MessengerUiAction.SendMessage, userInterface, recipientId: recipientId, groupId: groupId, content: content, imagePath: imagePath); + _fragment.OnSendMessage += (recipientId, groupId, content) => + SendMessengerMessage(MessengerUiAction.SendMessage, userInterface, recipientId: recipientId, groupId: groupId, content: content); _fragment.OnCreateGroup += (groupName) => SendMessengerMessage(MessengerUiAction.CreateGroup, userInterface, groupName: groupName); _fragment.OnAddToGroup += (groupId, userId) => @@ -39,8 +39,6 @@ public sealed partial class MessengerUi : UIFragment SendMessengerMessage(MessengerUiAction.DeleteMessage, userInterface, chatId: chatId, messageId: messageId); _fragment.OnTogglePin += (chatId) => SendMessengerMessage(MessengerUiAction.TogglePin, userInterface, chatId: chatId); - _fragment.OnRequestPhotos += () => - SendMessengerMessage(MessengerUiAction.RequestPhotos, userInterface); } public override void UpdateState(BoundUserInterfaceState state) @@ -61,10 +59,9 @@ public sealed partial class MessengerUi : UIFragment string? userId = null, string? chatId = null, bool? isMuted = null, - long? messageId = null, - string? imagePath = null) + long? messageId = null) { - var messengerMessage = new MessengerUiMessageEvent(action, recipientId, groupId, content, groupName, userId, chatId, isMuted, messageId, imagePath); + var messengerMessage = new MessengerUiMessageEvent(action, recipientId, groupId, content, groupName, userId, chatId, isMuted, messageId); var message = new CartridgeUiMessage(messengerMessage); userInterface.SendMessage(message); } diff --git a/Content.Client/_Sunrise/CartridgeLoader/Cartridges/MessengerUiFragment.xaml b/Content.Client/_Sunrise/CartridgeLoader/Cartridges/MessengerUiFragment.xaml index 992c5c8fa4..e6d9920aee 100644 --- a/Content.Client/_Sunrise/CartridgeLoader/Cartridges/MessengerUiFragment.xaml +++ b/Content.Client/_Sunrise/CartridgeLoader/Cartridges/MessengerUiFragment.xaml @@ -149,12 +149,6 @@ HorizontalExpand="True" Name="MessageInput" PlaceHolder="{Loc 'messenger-message-placeholder'}" /> - public sealed partial class MessengerCartridgeSystem { - private void UpdateUiState(EntityUid uid, EntityUid loaderUid, MessengerCartridgeComponent? component, Dictionary? photoGallery = null) + private void UpdateUiState(EntityUid uid, EntityUid loaderUid, MessengerCartridgeComponent? component) { if (!Resolve(uid, ref component)) return; @@ -57,8 +57,7 @@ public sealed partial class MessengerCartridgeSystem component.MutedGroupChats, unreadCounts, component.ActiveInvites, - component.PinnedChats, - photoGallery + component.PinnedChats ); _cartridgeLoader.UpdateCartridgeUiState(loaderUid, state); diff --git a/Content.Server/_Sunrise/CartridgeLoader/Cartridges/MessengerCartridgeSystem.cs b/Content.Server/_Sunrise/CartridgeLoader/Cartridges/MessengerCartridgeSystem.cs index bbdf9adfd0..a60331b639 100644 --- a/Content.Server/_Sunrise/CartridgeLoader/Cartridges/MessengerCartridgeSystem.cs +++ b/Content.Server/_Sunrise/CartridgeLoader/Cartridges/MessengerCartridgeSystem.cs @@ -1,4 +1,3 @@ -using System.Linq; using Content.Server.DeviceNetwork.Systems; using Content.Server.CartridgeLoader; using Content.Server.PDA.Ringer; @@ -130,25 +129,4 @@ public sealed partial class MessengerCartridgeSystem : EntitySystem _deviceNetwork.SetTransmitFrequency(loaderUid, originalFrequency.Value, deviceNetwork); } } - - /// - /// Пытается найти станцию для КПК. Если КПК не на станции, ищет любую станцию на той же карте. - /// - private EntityUid? GetBestStation(EntityUid pdaUid) - { - var station = _stationSystem.GetOwningStation(pdaUid); - if (station != null) - return station; - - var xform = Transform(pdaUid); - var mapId = xform.MapID; - - foreach (var s in _stationSystem.GetStations()) - { - if (Transform(s).MapID == mapId) - return s; - } - - return _stationSystem.GetStations().FirstOrDefault(); - } } diff --git a/Content.Server/_Sunrise/CartridgeLoader/Cartridges/PhotoCartridgeSystem.cs b/Content.Server/_Sunrise/CartridgeLoader/Cartridges/PhotoCartridgeSystem.cs deleted file mode 100644 index 99b82eea2f..0000000000 --- a/Content.Server/_Sunrise/CartridgeLoader/Cartridges/PhotoCartridgeSystem.cs +++ /dev/null @@ -1,324 +0,0 @@ -using System.Linq; -using Content.Server.CartridgeLoader; -using Content.Server.DeviceNetwork.Systems; -using Content.Server._Sunrise; -using Content.Server._Sunrise.Messenger; -using Content.Server.Station.Systems; -using Content.Shared.CartridgeLoader; -using Content.Shared.DeviceNetwork; -using Content.Shared.DeviceNetwork.Components; -using Content.Shared.Inventory; -using Content.Shared.PDA; -using Content.Shared._Sunrise.CartridgeLoader.Cartridges; -using Content.Shared._Sunrise.Messenger; -using Robust.Server.Player; -using Robust.Shared.Network; -using Robust.Shared.Player; -using Robust.Shared.Random; -using Robust.Shared.Timing; -using Robust.Shared.Audio.Systems; - -namespace Content.Server._Sunrise.CartridgeLoader.Cartridges; - -public sealed class PhotoCartridgeSystem : EntitySystem -{ - [Dependency] private readonly CartridgeLoaderSystem _cartridgeLoader = default!; - [Dependency] private readonly NetTexturesManager _netTexturesManager = default!; - [Dependency] private readonly DeviceNetworkSystem _deviceNetwork = default!; - [Dependency] private readonly IGameTiming _gameTiming = default!; - [Dependency] private readonly IRobustRandom _random = default!; - [Dependency] private readonly ILogManager _logManager = default!; - [Dependency] private readonly MessengerServerSystem _messengerServer = default!; - [Dependency] private readonly StationSystem _stationSystem = default!; - [Dependency] private readonly SingletonDeviceNetServerSystem _singletonServer = default!; - [Dependency] private readonly IServerNetManager _netManager = default!; - [Dependency] private readonly IPlayerManager _playerManager = default!; - [Dependency] private readonly InventorySystem _inventory = default!; - [Dependency] private readonly SharedAudioSystem _audio = default!; - [Dependency] private readonly SharedTransformSystem _transform = default!; - - private ISawmill _sawmill = default!; - - private const int MaxPhotosPerUser = 50; - private const int MaxPhotoSizeBytes = 2 * 1024 * 1024; - private const double MinTimeBetweenCapturesSeconds = 1.0; - private const int MaxPhotoWidth = 512; - private const int MaxPhotoHeight = 512; - - private readonly Dictionary _lastCaptureTimes = new(); - - public override void Initialize() - { - base.Initialize(); - - _sawmill = _logManager.GetSawmill("photo.cartridge"); - - SubscribeLocalEvent(OnUiMessage); - SubscribeLocalEvent(OnUiReady); - - _netManager.RegisterNetMessage(OnPhotoCaptureMessage, accept: NetMessageAccept.Server); - } - - private void OnUiMessage(EntityUid uid, PhotoCartridgeComponent component, CartridgeMessageEvent args) - { - if (args is not PhotoUiMessageEvent photoMessage) - return; - - var loaderUid = GetEntity(args.LoaderUid); - if (loaderUid == EntityUid.Invalid) - return; - - switch (photoMessage.Action) - { - case PhotoUiAction.CapturePhoto: - HandleCapturePhoto(uid, component, loaderUid); - break; - case PhotoUiAction.SendPhotoToMessenger: - HandleSendPhotoToMessenger(uid, component, loaderUid, photoMessage.PhotoId, photoMessage.RecipientId, photoMessage.GroupId); - break; - case PhotoUiAction.RequestGallery: - UpdateUiState(uid, loaderUid, component); - break; - case PhotoUiAction.DeletePhoto: - HandleDeletePhoto(uid, component, loaderUid, photoMessage.PhotoId); - break; - case PhotoUiAction.ToggleFlash: - if (photoMessage.FlashEnabled.HasValue) - { - component.FlashEnabled = photoMessage.FlashEnabled.Value; - UpdateUiState(uid, loaderUid, component); - } - break; - } - } - - private void HandleDeletePhoto(EntityUid uid, PhotoCartridgeComponent component, EntityUid loaderUid, string? photoId) - { - if (string.IsNullOrEmpty(photoId) || !component.PhotoGallery.TryGetValue(photoId, out var metadata)) - return; - - component.PhotoGallery.Remove(photoId); - - UpdateUiState(uid, loaderUid, component); - } - - private void OnUiReady(EntityUid uid, PhotoCartridgeComponent component, CartridgeUiReadyEvent args) - { - UpdateUiState(uid, args.Loader, component); - } - - private void HandleCapturePhoto(EntityUid uid, PhotoCartridgeComponent component, EntityUid loaderUid) - { - if (component.PhotoGallery.Count >= MaxPhotosPerUser) - { - UpdateUiState(uid, loaderUid, component, errorMessage: Loc.GetString("photo-cartridge-limit-reached")); - return; - } - - if (component.FlashEnabled) - { - Spawn(component.FlashEffect, _transform.GetMapCoordinates(loaderUid)); - } - - _audio.PlayPvs(component.Sound, loaderUid); - - UpdateUiState(uid, loaderUid, component); - } - - /// - /// Обработчик сетевого сообщения с захваченным изображением от клиента - /// - private void OnPhotoCaptureMessage(PdaPhotoCaptureMessage msg) - { - if (!_playerManager.TryGetSessionByChannel(msg.MsgChannel, out var session)) - return; - - if (_lastCaptureTimes.TryGetValue(session, out var lastCapture)) - { - var timeSinceLastCapture = _gameTiming.CurTime - lastCapture; - if (timeSinceLastCapture.TotalSeconds < MinTimeBetweenCapturesSeconds) - { - _sawmill.Debug($"Photo capture rejected: cooldown active ({timeSinceLastCapture.TotalSeconds:F2}s < {MinTimeBetweenCapturesSeconds}s)"); - return; - } - } - - if (msg.ImageData.Length > MaxPhotoSizeBytes) - { - _sawmill.Warning($"Photo capture rejected: image too large ({msg.ImageData.Length} bytes > {MaxPhotoSizeBytes} bytes)"); - return; - } - - if (msg.Width <= 0 || msg.Height <= 0 || msg.Width > MaxPhotoWidth || msg.Height > MaxPhotoHeight) - { - _sawmill.Warning($"Photo capture rejected: invalid dimensions ({msg.Width}x{msg.Height})"); - return; - } - - var pdaUid = FindPlayerPda(session); - if (pdaUid == null) - { - _sawmill.Warning($"Photo capture rejected: no PDA found for player {session.Name}"); - return; - } - - if (!_cartridgeLoader.TryGetProgram(pdaUid.Value, out var cartridgeUid, out var photoComponent)) - { - _sawmill.Warning($"Photo capture rejected: photo cartridge not found in PDA {ToPrettyString(pdaUid.Value)}"); - return; - } - - if (photoComponent.PhotoGallery.Count >= MaxPhotosPerUser) - { - UpdateUiState(cartridgeUid.Value, pdaUid.Value, photoComponent, errorMessage: Loc.GetString("photo-cartridge-limit-reached")); - return; - } - - var photoId = Guid.NewGuid().ToString(); - var imagePath = $"/NetTextures/Messenger/{photoId}.png"; - - _netTexturesManager.RegisterDynamicResource(imagePath, msg.ImageData); - - var timestamp = _gameTiming.CurTime; - var metadata = new PhotoMetadata(photoId, imagePath, timestamp); - photoComponent.PhotoGallery[photoId] = metadata; - - _lastCaptureTimes[session] = timestamp; - - _sawmill.Info($"Photo captured from {session.Name}: {photoId}, path: {imagePath}, size: {msg.Width}x{msg.Height}, {msg.ImageData.Length} bytes"); - - UpdateUiState(cartridgeUid.Value, pdaUid.Value, photoComponent); - } - - /// - /// Находит КПК игрока по его сессии - /// - private EntityUid? FindPlayerPda(ICommonSession session) - { - if (session.AttachedEntity == null) - return null; - - var playerEntity = session.AttachedEntity.Value; - - if (_inventory.TryGetSlotEntity(playerEntity, "idcard", out var idCardEntity) && - TryComp(idCardEntity, out _)) - { - return idCardEntity; - } - - if (_inventory.TryGetSlotEntity(playerEntity, "belt", out var beltEntity) && - TryComp(beltEntity, out _)) - { - return beltEntity; - } - - var pdaQuery = EntityQueryEnumerator(); - while (pdaQuery.MoveNext(out var uid, out var pda)) - { - if (pda.PdaOwner == playerEntity) - { - return uid; - } - } - - return null; - } - - private void HandleSendPhotoToMessenger(EntityUid uid, PhotoCartridgeComponent component, EntityUid loaderUid, string? photoId, string? recipientId, string? groupId) - { - if (string.IsNullOrWhiteSpace(photoId)) - return; - - if (!component.PhotoGallery.TryGetValue(photoId, out var photoMetadata)) - { - UpdateUiState(uid, loaderUid, component, errorMessage: Loc.GetString("photo-cartridge-photo-not-found")); - return; - } - - var messengerServer = FindMessengerServer(loaderUid); - if (messengerServer == null) - { - UpdateUiState(uid, loaderUid, component, errorMessage: Loc.GetString("photo-cartridge-messenger-unavailable")); - return; - } - - if (!TryComp(loaderUid, out var pdaDevice)) - return; - - var userId = pdaDevice.Address; - if (string.IsNullOrEmpty(userId)) - return; - - var timestamp = _gameTiming.CurTime; - var content = Loc.GetString("photo-cartridge-photo-text"); - - if (!string.IsNullOrWhiteSpace(groupId)) - { - _messengerServer.SendGroupMessageWithImage(messengerServer.Value, userId, groupId, content, photoMetadata.ImagePath, timestamp); - } - else if (!string.IsNullOrWhiteSpace(recipientId)) - { - _messengerServer.SendPersonalMessageWithImage(messengerServer.Value, userId, recipientId, content, photoMetadata.ImagePath, timestamp); - } - else - { - UpdateUiState(uid, loaderUid, component, errorMessage: Loc.GetString("photo-cartridge-recipient-not-specified")); - return; - } - - UpdateUiState(uid, loaderUid, component); - } - - private EntityUid? FindMessengerServer(EntityUid pdaUid) - { - var station = _stationSystem.GetOwningStation(pdaUid); - if (station == null) - { - var xform = Transform(pdaUid); - var mapId = xform.MapID; - foreach (var s in _stationSystem.GetStations()) - { - if (Transform(s).MapID == mapId) - { - station = s; - break; - } - } - } - - if (station == null) - station = _stationSystem.GetStations().FirstOrDefault(); - - if (station == null) - return null; - - if (!_singletonServer.TryGetActiveServerAddress(station.Value, out var serverAddress)) - return null; - - var serverQuery = EntityQueryEnumerator(); - while (serverQuery.MoveNext(out var uid, out _, out var deviceNetwork)) - { - if (deviceNetwork.Address == serverAddress && _singletonServer.IsActiveServer(uid)) - { - return uid; - } - } - return null; - } - - private void UpdateUiState(EntityUid uid, EntityUid loaderUid, PhotoCartridgeComponent component, string? errorMessage = null) - { - var state = new PhotoUiState( - photos: component.PhotoGallery, - cameraReady: component.PhotoGallery.Count < MaxPhotosPerUser, - flashEnabled: component.FlashEnabled, - errorMessage: errorMessage - ); - _cartridgeLoader.UpdateCartridgeUiState(loaderUid, state); - } - - private EntityUid GetEntity(NetEntity netEntity) - { - return EntityManager.GetEntity(netEntity); - } -} diff --git a/Content.Server/_Sunrise/Messenger/MessengerServerSystem.Groups.cs b/Content.Server/_Sunrise/Messenger/MessengerServerSystem.Groups.cs index 5b906a0499..83f97e7384 100644 --- a/Content.Server/_Sunrise/Messenger/MessengerServerSystem.Groups.cs +++ b/Content.Server/_Sunrise/Messenger/MessengerServerSystem.Groups.cs @@ -101,12 +101,14 @@ public sealed partial class MessengerServerSystem if (group.Members.Contains(userId)) return; + // Проверяем, нет ли уже активного инвайта if (component.ActiveInvites.TryGetValue(userId, out var existingInvites)) { if (existingInvites.Any(inv => inv.GroupId == groupId)) return; } + // Создаем инвайт var invite = new MessengerGroupInvite( groupId, group.Name, @@ -142,10 +144,12 @@ public sealed partial class MessengerServerSystem _deviceNetwork.QueuePacket(uid, userId, invitePayload); } + // Отправляем обновленный список инвайтов SendInvitesList(uid, component, userId, serverDevice, pdaFrequency); return; } + // Для автоматических групп сохраняем старую логику (если разрешено) if (group.AutoGroupPrototypeId != null) { if (_prototypeManager.TryIndex(group.AutoGroupPrototypeId, out var autoGroupProto)) @@ -203,8 +207,7 @@ public sealed partial class MessengerServerSystem ["group_id"] = groupId, ["recipient_id"] = string.Empty, ["is_read"] = false, - ["message_id"] = systemMessage.MessageId, - ["image_path"] = systemMessage.ImagePath ?? string.Empty + ["message_id"] = systemMessage.MessageId }; foreach (var memberId in group.Members) @@ -270,9 +273,7 @@ public sealed partial class MessengerServerSystem ["group_id"] = msg.GroupId ?? string.Empty, ["recipient_id"] = msg.RecipientId ?? string.Empty, ["is_read"] = msg.IsRead, - ["message_id"] = msg.MessageId, - ["sender_job_icon_id"] = msg.SenderJobIconId?.Id ?? string.Empty, - ["image_path"] = msg.ImagePath ?? string.Empty + ["message_id"] = msg.MessageId }); } @@ -376,9 +377,7 @@ public sealed partial class MessengerServerSystem ["timestamp"] = timestamp.TotalSeconds, ["group_id"] = groupId, ["recipient_id"] = string.Empty, - ["is_read"] = false, - ["message_id"] = systemMessage.MessageId, - ["image_path"] = systemMessage.ImagePath ?? string.Empty + ["is_read"] = false }; foreach (var memberId in group.Members) @@ -464,8 +463,7 @@ public sealed partial class MessengerServerSystem ["group_id"] = groupId, ["recipient_id"] = string.Empty, ["is_read"] = false, - ["message_id"] = systemMessage.MessageId, - ["image_path"] = systemMessage.ImagePath ?? string.Empty + ["message_id"] = systemMessage.MessageId }; foreach (var memberId in group.Members) @@ -531,9 +529,7 @@ public sealed partial class MessengerServerSystem ["group_id"] = msg.GroupId ?? string.Empty, ["recipient_id"] = msg.RecipientId ?? string.Empty, ["is_read"] = msg.IsRead, - ["message_id"] = msg.MessageId, - ["sender_job_icon_id"] = msg.SenderJobIconId?.Id ?? string.Empty, - ["image_path"] = msg.ImagePath ?? string.Empty + ["message_id"] = msg.MessageId }); } @@ -726,8 +722,7 @@ public sealed partial class MessengerServerSystem ["group_id"] = groupId, ["recipient_id"] = string.Empty, ["is_read"] = false, - ["message_id"] = systemMessage.MessageId, - ["image_path"] = systemMessage.ImagePath ?? string.Empty + ["message_id"] = systemMessage.MessageId }; foreach (var memberId in group.Members) diff --git a/Content.Server/_Sunrise/Messenger/MessengerServerSystem.Messages.cs b/Content.Server/_Sunrise/Messenger/MessengerServerSystem.Messages.cs index fcc022ddcd..0a9c6fd542 100644 --- a/Content.Server/_Sunrise/Messenger/MessengerServerSystem.Messages.cs +++ b/Content.Server/_Sunrise/Messenger/MessengerServerSystem.Messages.cs @@ -16,16 +16,7 @@ public sealed partial class MessengerServerSystem if (!args.Data.TryGetValue(MessengerCommands.CmdSendMessage, out NetworkPayload? messageData)) return; - if (!messageData.TryGetValue("content", out string? content)) - return; - - string? imagePath = null; - if (messageData.TryGetValue("image_path", out string? imgPath) && !string.IsNullOrWhiteSpace(imgPath)) - { - imagePath = imgPath; - } - - if (string.IsNullOrWhiteSpace(content) && string.IsNullOrWhiteSpace(imagePath)) + if (!messageData.TryGetValue("content", out string? content) || string.IsNullOrWhiteSpace(content)) return; if (!component.Users.TryGetValue(args.SenderAddress, out var sender)) @@ -37,21 +28,21 @@ public sealed partial class MessengerServerSystem if (messageData.TryGetValue("group_id", out string? groupId) && !string.IsNullOrWhiteSpace(groupId)) { - SendGroupMessage(uid, component, sender, groupId, content, timestamp, imagePath); + SendGroupMessage(uid, component, sender, groupId, content, timestamp); } else if (messageData.TryGetValue("recipient_id", out string? recipientId) && !string.IsNullOrWhiteSpace(recipientId)) { - SendPersonalMessage(uid, component, sender, recipientId, content, timestamp, imagePath); + SendPersonalMessage(uid, component, sender, recipientId, content, timestamp); } } - private void SendPersonalMessage(EntityUid uid, MessengerServerComponent component, MessengerUser sender, string recipientId, string content, TimeSpan timestamp, string? imagePath = null) + private void SendPersonalMessage(EntityUid uid, MessengerServerComponent component, MessengerUser sender, string recipientId, string content, TimeSpan timestamp) { if (!component.Users.ContainsKey(recipientId)) return; var messageId = GetNextMessageId(uid, component); - var message = new MessengerMessage(sender.UserId, sender.Name, content, timestamp, null, recipientId, isRead: false, messageId, sender.JobIconId, imagePath); + var message = new MessengerMessage(sender.UserId, sender.Name, content, timestamp, null, recipientId, isRead: false, messageId, sender.JobIconId); var chatId = GetPersonalChatId(sender.UserId, recipientId); if (!component.MessageHistory.TryGetValue(chatId, out var history)) @@ -100,8 +91,7 @@ public sealed partial class MessengerServerSystem ["recipient_id"] = message.RecipientId ?? string.Empty, ["is_read"] = message.IsRead, ["message_id"] = message.MessageId, - ["sender_job_icon_id"] = message.SenderJobIconId?.Id ?? string.Empty, - ["image_path"] = message.ImagePath ?? string.Empty + ["sender_job_icon_id"] = message.SenderJobIconId?.Id ?? string.Empty }; if (pdaFrequency.HasValue) @@ -131,9 +121,7 @@ public sealed partial class MessengerServerSystem ["group_id"] = message.GroupId ?? string.Empty, ["recipient_id"] = message.RecipientId ?? string.Empty, ["is_read"] = message.IsRead, - ["message_id"] = message.MessageId, - ["sender_job_icon_id"] = message.SenderJobIconId?.Id ?? string.Empty, - ["image_path"] = message.ImagePath ?? string.Empty + ["message_id"] = message.MessageId } }, ["chat_id"] = chatId @@ -142,7 +130,7 @@ public sealed partial class MessengerServerSystem } } - private void SendGroupMessage(EntityUid uid, MessengerServerComponent component, MessengerUser sender, string groupId, string content, TimeSpan timestamp, string? imagePath = null) + private void SendGroupMessage(EntityUid uid, MessengerServerComponent component, MessengerUser sender, string groupId, string content, TimeSpan timestamp) { if (!component.Groups.TryGetValue(groupId, out var group)) return; @@ -151,7 +139,7 @@ public sealed partial class MessengerServerSystem return; var messageId = GetNextMessageId(uid, component); - var message = new MessengerMessage(sender.UserId, sender.Name, content, timestamp, groupId, null, false, messageId, sender.JobIconId, imagePath); + var message = new MessengerMessage(sender.UserId, sender.Name, content, timestamp, groupId, null, false, messageId, sender.JobIconId); if (!component.MessageHistory.TryGetValue(groupId, out var history)) { @@ -201,8 +189,7 @@ public sealed partial class MessengerServerSystem ["recipient_id"] = message.RecipientId ?? string.Empty, ["is_read"] = message.IsRead, ["message_id"] = message.MessageId, - ["sender_job_icon_id"] = message.SenderJobIconId?.Id ?? string.Empty, - ["image_path"] = message.ImagePath ?? string.Empty + ["sender_job_icon_id"] = message.SenderJobIconId?.Id ?? string.Empty }; foreach (var memberId in group.Members) @@ -218,34 +205,6 @@ public sealed partial class MessengerServerSystem } } - /// - /// Отправляет личное сообщение с изображением (используется PhotoCartridgeSystem) - /// - public void SendPersonalMessageWithImage(EntityUid uid, string senderUserId, string recipientId, string content, string imagePath, TimeSpan timestamp) - { - if (!TryComp(uid, out var component)) - return; - - if (!component.Users.TryGetValue(senderUserId, out var sender)) - return; - - SendPersonalMessage(uid, component, sender, recipientId, content, timestamp, imagePath); - } - - /// - /// Отправляет групповое сообщение с изображением (используется PhotoCartridgeSystem) - /// - public void SendGroupMessageWithImage(EntityUid uid, string senderUserId, string groupId, string content, string imagePath, TimeSpan timestamp) - { - if (!TryComp(uid, out var component)) - return; - - if (!component.Users.TryGetValue(senderUserId, out var sender)) - return; - - SendGroupMessage(uid, component, sender, groupId, content, timestamp, imagePath); - } - /// /// Обрабатывает удаление сообщения пользователем /// diff --git a/Content.Server/_Sunrise/Messenger/MessengerServerSystem.Queries.cs b/Content.Server/_Sunrise/Messenger/MessengerServerSystem.Queries.cs index 920f3d251e..d42e2f4889 100644 --- a/Content.Server/_Sunrise/Messenger/MessengerServerSystem.Queries.cs +++ b/Content.Server/_Sunrise/Messenger/MessengerServerSystem.Queries.cs @@ -210,8 +210,7 @@ public sealed partial class MessengerServerSystem ["recipient_id"] = msg.RecipientId ?? string.Empty, ["is_read"] = msg.IsRead, ["message_id"] = msg.MessageId, - ["sender_job_icon_id"] = msg.SenderJobIconId?.Id ?? string.Empty, - ["image_path"] = msg.ImagePath ?? string.Empty + ["sender_job_icon_id"] = msg.SenderJobIconId?.Id ?? string.Empty }); } } @@ -254,8 +253,7 @@ public sealed partial class MessengerServerSystem ["recipient_id"] = msg.RecipientId ?? string.Empty, ["is_read"] = msg.IsRead, ["message_id"] = msg.MessageId, - ["sender_job_icon_id"] = msg.SenderJobIconId?.Id ?? string.Empty, - ["image_path"] = msg.ImagePath ?? string.Empty + ["sender_job_icon_id"] = msg.SenderJobIconId?.Id ?? string.Empty }); } @@ -304,8 +302,7 @@ public sealed partial class MessengerServerSystem ["recipient_id"] = message.RecipientId ?? string.Empty, ["is_read"] = message.IsRead, ["message_id"] = message.MessageId, - ["sender_job_icon_id"] = message.SenderJobIconId?.Id ?? string.Empty, - ["image_path"] = message.ImagePath ?? string.Empty + ["sender_job_icon_id"] = message.SenderJobIconId?.Id ?? string.Empty }); } diff --git a/Content.Server/_Sunrise/Messenger/MessengerServerSystem.UserRegistration.cs b/Content.Server/_Sunrise/Messenger/MessengerServerSystem.UserRegistration.cs index fcd5058704..6c427fe06f 100644 --- a/Content.Server/_Sunrise/Messenger/MessengerServerSystem.UserRegistration.cs +++ b/Content.Server/_Sunrise/Messenger/MessengerServerSystem.UserRegistration.cs @@ -59,15 +59,6 @@ public sealed partial class MessengerServerSystem } var station = _stationSystem.GetOwningStation(args.Mob); - if (station == null) - { - var mobXform = Transform(args.Mob); - station = _stationSystem.GetStations().FirstOrDefault(s => Transform(s).MapID == mobXform.MapID); - } - - if (station == null) - station = _stationSystem.GetStations().FirstOrDefault(); - if (station == null) { Sawmill.Warning($"No station found for player: {ToPrettyString(args.Mob)}"); @@ -193,6 +184,7 @@ public sealed partial class MessengerServerSystem _deviceNetwork.QueuePacket(uid, userId, response, frequency: pdaFrequency, network: serverDevice.DeviceNetId); } + // Отправляем список пользователей новому пользователю var usersPayload = new NetworkPayload { [DeviceNetworkConstants.Command] = MessengerCommands.CmdUsersList, @@ -211,6 +203,7 @@ public sealed partial class MessengerServerSystem _deviceNetwork.QueuePacket(uid, userId, usersPayload, frequency: pdaFrequency, network: serverDevice.DeviceNetId); } + // Отправляем список групп новому пользователю var groupsList = component.Groups.Values.ToList(); var groupsData = new List>(); @@ -277,6 +270,7 @@ public sealed partial class MessengerServerSystem _deviceNetwork.QueuePacket(uid, userId, groupsPayload, frequency: pdaFrequency, network: serverDevice.DeviceNetId); } + // Регистрируем картридж мессенджера как фоновую программу, если он еще не зарегистрирован if (_cartridgeLoader.TryGetProgram(pdaUid, out var cartridgeUid, out _)) { if (TryComp(pdaUid, out var loader) && @@ -509,8 +503,7 @@ public sealed partial class MessengerServerSystem ["group_id"] = autoGroupProto.GroupId, ["recipient_id"] = string.Empty, ["is_read"] = false, - ["message_id"] = systemMessage.MessageId, - ["image_path"] = systemMessage.ImagePath ?? string.Empty + ["message_id"] = systemMessage.MessageId }; foreach (var memberId in group.Members) @@ -558,9 +551,7 @@ public sealed partial class MessengerServerSystem ["group_id"] = msg.GroupId ?? string.Empty, ["recipient_id"] = msg.RecipientId ?? string.Empty, ["is_read"] = msg.IsRead, - ["message_id"] = msg.MessageId, - ["sender_job_icon_id"] = msg.SenderJobIconId?.Id ?? string.Empty, - ["image_path"] = msg.ImagePath ?? string.Empty + ["message_id"] = msg.MessageId }); } @@ -651,6 +642,7 @@ public sealed partial class MessengerServerSystem user.DepartmentId = departmentId; user.JobIconId = jobIconId; + // Отправляем обновленный список пользователей всем клиентам if (!TryComp(uid, out var serverDevice)) return; diff --git a/Content.Server/_Sunrise/NetTexturesCleanupSystem.cs b/Content.Server/_Sunrise/NetTexturesCleanupSystem.cs deleted file mode 100644 index c9e47836d9..0000000000 --- a/Content.Server/_Sunrise/NetTexturesCleanupSystem.cs +++ /dev/null @@ -1,25 +0,0 @@ -using Content.Shared.GameTicking; -using Robust.Shared.GameObjects; -using Robust.Shared.IoC; - -namespace Content.Server._Sunrise; - -/// -/// A small system that handles event-based cleanup for the NetTexturesManager. -/// Since NetTexturesManager is a standalone manager, it cannot safely subscribe to broadcast events. -/// -public sealed class NetTexturesCleanupSystem : EntitySystem -{ - [Dependency] private readonly NetTexturesManager _netTexturesManager = default!; - - public override void Initialize() - { - base.Initialize(); - SubscribeLocalEvent(OnRoundRestart); - } - - private void OnRoundRestart(RoundRestartCleanupEvent ev) - { - _netTexturesManager.ClearDynamicResources(); - } -} diff --git a/Content.Server/_Sunrise/NetTexturesManager.cs b/Content.Server/_Sunrise/NetTexturesManager.cs index 525d9535b0..18e4a75f21 100644 --- a/Content.Server/_Sunrise/NetTexturesManager.cs +++ b/Content.Server/_Sunrise/NetTexturesManager.cs @@ -11,8 +11,6 @@ using Robust.Shared.Network.Transfer; using Robust.Shared.Player; using Robust.Shared.Upload; using Robust.Shared.Utility; -using Robust.Shared.GameObjects; -using Content.Shared.GameTicking; using ByteHelpers = Robust.Shared.Utility.ByteHelpers; namespace Content.Server._Sunrise; @@ -22,7 +20,7 @@ namespace Content.Server._Sunrise; /// Uses High Bandwidth Transfer (WebSocket) to avoid blocking main game traffic. /// Textures are loaded into MemoryContentRoot on the client. /// - public sealed class NetTexturesManager +public sealed class NetTexturesManager { /// /// Transfer key for server -> client texture downloads via WebSocket @@ -34,40 +32,25 @@ namespace Content.Server._Sunrise; [Dependency] private readonly IPlayerManager _playerManager = default!; [Dependency] private readonly ILogManager _logManager = default!; [Dependency] private readonly ITransferManager _transferManager = default!; - [Dependency] private readonly IEntityManager _entityManager = default!; private ISawmill _sawmill = default!; private const string AllowedPrefix = "/NetTextures/"; - /// - /// Dynamically registered in-memory resources that are not present on disk. - /// Key is the relative upload path used on the client (e.g. "NetTextures/Messenger/photo_123.png"). - /// - private readonly Dictionary _dynamicResources = new(); - public void Initialize() { _sawmill = _logManager.GetSawmill("network.textures"); _netManager.RegisterNetMessage(OnRequestNetworkResource); + // Register transfer key for High Bandwidth Transfer (WebSocket) _transferManager.RegisterTransferMessage(TransferKeyNetTextures); } - /// - /// Clears all dynamically registered in-memory resources. - /// Used during round restarts to prevent memory leaks. - /// - public void ClearDynamicResources() - { - _dynamicResources.Clear(); - _sawmill.Info("Cleared all dynamic NetTexture resources due to round restart."); - } - private void OnRequestNetworkResource(RequestNetworkResourceMessage msg) { if (!_playerManager.TryGetSessionByChannel(msg.MsgChannel, out var session)) return; + // Normalize the path - ensure it's rooted var resourcePath = msg.ResourcePath; ResPath resPath; @@ -80,8 +63,10 @@ namespace Content.Server._Sunrise; resPath = new ResPath("/") / resourcePath; } + // Clean the path to remove any .. sequences resPath = resPath.Clean(); + // Validate the path to prevent path traversal attacks if (!ValidateResourcePath(resPath, out var errorMessage)) { _sawmill.Warning($"Rejected resource request from {session.Name}: {errorMessage} (path: {msg.ResourcePath})"); @@ -99,12 +84,15 @@ namespace Content.Server._Sunrise; { errorMessage = null; + // Path must be rooted if (!path.IsRooted) { errorMessage = "Path must be rooted"; return false; } + // Check for dangerous path traversal sequences in the original string representation + // Even after Clean(), we should verify the path doesn't contain .. in segments var pathStr = path.ToString(); if (pathStr.Contains("../") || pathStr.Contains("..\\") || pathStr.StartsWith("..")) { @@ -112,12 +100,16 @@ namespace Content.Server._Sunrise; return false; } + // Only allow paths that start with /NetTextures/ + // This ensures clients can only access resources from the NetTextures directory if (!pathStr.StartsWith(AllowedPrefix, StringComparison.Ordinal)) { errorMessage = $"Path must start with {AllowedPrefix}"; return false; } + // Additional check: ensure the cleaned path doesn't escape the allowed directory + // by checking that it still starts with the allowed prefix after cleaning var relativePath = path.ToRelativePath(); var relativePathStr = relativePath.ToString(); @@ -140,60 +132,60 @@ namespace Content.Server._Sunrise; var startTime = DateTime.UtcNow; _sawmill.Debug($"[NetTextures] Starting transfer of {resourcePath} to {session.Name}"); + // Collect all files to send var filesToSend = new List<(ResPath Relative, byte[] Data)>(); - var relativeUploadPath = resourcePath.ToRelativePath(); - if (_dynamicResources.TryGetValue(relativeUploadPath, out var dynamicData)) + // Check if it's a directory (RSI files are directories) + // Try to find files in the directory first + var files = _resourceManager.ContentFindFiles(resourcePath).ToList(); + + if (files.Count == 0) { - filesToSend.Add((relativeUploadPath, dynamicData)); + // No files found in directory, try as single file + if (!_resourceManager.ContentFileExists(resourcePath)) + { + _sawmill.Warning($"Resource not found: {resourcePath}"); + return; + } + + if (!CollectSingleFile(resourcePath, filesToSend)) + return; } else { - - var files = _resourceManager.ContentFindFiles(resourcePath).ToList(); - - if (files.Count == 0) + // Directory - collect all files + foreach (var filePath in files) { - if (!_resourceManager.ContentFileExists(resourcePath)) + if (!filePath.TryRelativeTo(resourcePath, out var relativePath)) + continue; + + // relativePath is guaranteed to be non-null here because TryRelativeTo returned true + var relativePathValue = relativePath.Value; + + if (!_resourceManager.TryContentFileRead(filePath, out var stream)) { - _sawmill.Warning($"Resource not found: {resourcePath}"); - return; + _sawmill.Warning($"Failed to read file: {filePath}"); + continue; } - if (!CollectSingleFile(resourcePath, filesToSend)) - return; - } - else - { - foreach (var filePath in files) + using (stream) { - if (!filePath.TryRelativeTo(resourcePath, out var relativePath)) - continue; + var data = new byte[stream.Length]; + stream.Read(data, 0, data.Length); - var relativePathValue = relativePath.Value; + // Calculate uploaded path: preserve the original path structure relative to Resources root + // Remove leading / and use as relative path for MemoryContentRoot + var relativeUploadPath = resourcePath.ToRelativePath(); + var uploadedPath = relativeUploadPath / relativePathValue; - if (!_resourceManager.TryContentFileRead(filePath, out var stream)) - { - _sawmill.Warning($"Failed to read file: {filePath}"); - continue; - } - - using (stream) - { - var data = new byte[stream.Length]; - stream.Read(data, 0, data.Length); - - var relativeUploadPath2 = resourcePath.ToRelativePath(); - var uploadedPath = relativeUploadPath2 / relativePathValue; - - filesToSend.Add((uploadedPath, data)); - } + filesToSend.Add((uploadedPath, data)); } - - _sawmill.Debug($"Collected resource directory {resourcePath} ({files.Count} files) for {session.Name}"); } + + _sawmill.Debug($"Collected resource directory {resourcePath} ({files.Count} files) for {session.Name}"); } + // Send via High Bandwidth Transfer (WebSocket) to avoid blocking main game traffic try { var transferStartTime = DateTime.UtcNow; @@ -213,6 +205,7 @@ namespace Content.Server._Sunrise; catch (Exception ex) { _sawmill.Warning($"Failed to send resource via High Bandwidth Transfer to {session.Name}: {ex.Message}"); + // Fallback to regular network message if WebSocket transfer fails SendResourceFallback(session, filesToSend); } } @@ -233,6 +226,7 @@ namespace Content.Server._Sunrise; var data = new byte[stream.Length]; stream.Read(data, 0, data.Length); + // Calculate uploaded path: preserve the original path structure relative to Resources root var relativeUploadPath = filePath.ToRelativePath(); filesToSend.Add((relativeUploadPath, data)); } @@ -264,72 +258,28 @@ namespace Content.Server._Sunrise; var first = true; - foreach (var (relative, data) in files) - { - if (!first) + foreach (var (relative, data) in files) { - continueByte[0] = 1; - await stream.WriteAsync(continueByte); + if (!first) + { + continueByte[0] = 1; + await stream.WriteAsync(continueByte); + } + + first = false; + + BinaryPrimitives.WriteUInt32LittleEndian(lengthBytes, (uint)Encoding.UTF8.GetByteCount(relative.CanonPath)); + await stream.WriteAsync(lengthBytes); + + BinaryPrimitives.WriteUInt32LittleEndian(lengthBytes, (uint)data.Length); + await stream.WriteAsync(lengthBytes); + + await stream.WriteAsync(Encoding.UTF8.GetBytes(relative.CanonPath)); + await stream.WriteAsync(data); } - first = false; - - BinaryPrimitives.WriteUInt32LittleEndian(lengthBytes, (uint)Encoding.UTF8.GetByteCount(relative.CanonPath)); - await stream.WriteAsync(lengthBytes); - - BinaryPrimitives.WriteUInt32LittleEndian(lengthBytes, (uint)data.Length); - await stream.WriteAsync(lengthBytes); - - await stream.WriteAsync(Encoding.UTF8.GetBytes(relative.CanonPath)); - await stream.WriteAsync(data); - } - - continueByte[0] = 0; - await stream.WriteAsync(continueByte); - } - - /// - /// Registers a dynamic in-memory network texture that is not present on disk. - /// The resourcePath must point inside /NetTextures/ and will be validated by . - /// - /// Rooted resource path, e.g. "/NetTextures/Messenger/photo_123.png". - /// Raw file bytes (PNG, WEBP, etc.). - public void RegisterDynamicResource(string resourcePath, byte[] data) - { - var path = resourcePath.StartsWith("/") - ? new ResPath(resourcePath) - : new ResPath("/") / resourcePath; - - path = path.Clean(); - - if (!ValidateResourcePath(path, out var error)) - { - _sawmill.Warning($"Failed to register dynamic NetTexture {resourcePath}: {error}"); - return; - } - - var relativeUploadPath = path.ToRelativePath(); - _dynamicResources[relativeUploadPath] = data; - _sawmill.Debug($"Registered dynamic NetTexture resource: {relativeUploadPath}"); - } - - /// - /// Unregisters a dynamic in-memory network texture. - /// - /// Rooted resource path, e.g. "/NetTextures/Messenger/photo_123.png". - public void UnregisterDynamicResource(string resourcePath) - { - var path = resourcePath.StartsWith("/") - ? new ResPath(resourcePath) - : new ResPath("/") / resourcePath; - - path = path.Clean(); - var relativeUploadPath = path.ToRelativePath(); - - if (_dynamicResources.Remove(relativeUploadPath)) - { - _sawmill.Debug($"Unregistered dynamic NetTexture resource: {relativeUploadPath}"); - } + continueByte[0] = 0; + await stream.WriteAsync(continueByte); } } diff --git a/Content.Shared/CartridgeLoader/CartridgeLoaderComponent.cs b/Content.Shared/CartridgeLoader/CartridgeLoaderComponent.cs index 4cd10a6b8e..f47112c794 100644 --- a/Content.Shared/CartridgeLoader/CartridgeLoaderComponent.cs +++ b/Content.Shared/CartridgeLoader/CartridgeLoaderComponent.cs @@ -33,7 +33,7 @@ public sealed partial class CartridgeLoaderComponent : Component /// The maximum amount of programs that can be installed on the cartridge loader entity /// [DataField] - public int DiskSpace = 12; // Sunrise-Edit + public int DiskSpace = 8; /// /// Controls whether the cartridge loader will play notifications if it supports it at all diff --git a/Content.Shared/_Sunrise/CartridgeLoader/Cartridges/MessengerUiMessageEvent.cs b/Content.Shared/_Sunrise/CartridgeLoader/Cartridges/MessengerUiMessageEvent.cs index d411d58004..60a2d5c60a 100644 --- a/Content.Shared/_Sunrise/CartridgeLoader/Cartridges/MessengerUiMessageEvent.cs +++ b/Content.Shared/_Sunrise/CartridgeLoader/Cartridges/MessengerUiMessageEvent.cs @@ -18,7 +18,6 @@ public sealed class MessengerUiMessageEvent : CartridgeMessageEvent public readonly string? ChatId; public readonly bool? IsMuted; public readonly long? MessageId; - public readonly string? ImagePath; public MessengerUiMessageEvent( MessengerUiAction action, @@ -29,8 +28,7 @@ public sealed class MessengerUiMessageEvent : CartridgeMessageEvent string? userId = null, string? chatId = null, bool? isMuted = null, - long? messageId = null, - string? imagePath = null) + long? messageId = null) { Action = action; RecipientId = recipientId; @@ -41,7 +39,6 @@ public sealed class MessengerUiMessageEvent : CartridgeMessageEvent ChatId = chatId; IsMuted = isMuted; MessageId = messageId; - ImagePath = imagePath; } } @@ -63,6 +60,5 @@ public enum MessengerUiAction DeclineInvite, LeaveGroup, DeleteMessage, - TogglePin, - RequestPhotos + TogglePin } diff --git a/Content.Shared/_Sunrise/CartridgeLoader/Cartridges/MessengerUiState.cs b/Content.Shared/_Sunrise/CartridgeLoader/Cartridges/MessengerUiState.cs index 0151b1011b..bbda25a9c9 100644 --- a/Content.Shared/_Sunrise/CartridgeLoader/Cartridges/MessengerUiState.cs +++ b/Content.Shared/_Sunrise/CartridgeLoader/Cartridges/MessengerUiState.cs @@ -64,11 +64,6 @@ public sealed class MessengerUiState : BoundUserInterfaceState /// public HashSet PinnedChats { get; } - /// - /// Галерея фотографий для выбора (опционально) - /// - public Dictionary? PhotoGallery { get; } - public MessengerUiState( bool isRegistered, bool serverAvailable, @@ -80,8 +75,7 @@ public sealed class MessengerUiState : BoundUserInterfaceState HashSet mutedGroupChats, Dictionary unreadCounts, List activeInvites, - HashSet pinnedChats, - Dictionary? photoGallery = null) + HashSet pinnedChats) { IsRegistered = isRegistered; ServerAvailable = serverAvailable; @@ -94,6 +88,5 @@ public sealed class MessengerUiState : BoundUserInterfaceState UnreadCounts = unreadCounts; ActiveInvites = activeInvites; PinnedChats = pinnedChats; - PhotoGallery = photoGallery; } } diff --git a/Content.Shared/_Sunrise/CartridgeLoader/Cartridges/PdaPhotoCaptureMessage.cs b/Content.Shared/_Sunrise/CartridgeLoader/Cartridges/PdaPhotoCaptureMessage.cs deleted file mode 100644 index 5b925fd628..0000000000 --- a/Content.Shared/_Sunrise/CartridgeLoader/Cartridges/PdaPhotoCaptureMessage.cs +++ /dev/null @@ -1,44 +0,0 @@ -using Lidgren.Network; -using Robust.Shared.Network; -using Robust.Shared.Serialization; - -namespace Content.Shared._Sunrise.CartridgeLoader.Cartridges; - -/// -/// Сообщение для отправки захваченного изображения с клиента на сервер -/// -public sealed class PdaPhotoCaptureMessage : NetMessage -{ - public override MsgGroups MsgGroup => MsgGroups.String; - - /// - /// Байты изображения (PNG или WebP) - /// - public byte[] ImageData { get; set; } = Array.Empty(); - - /// - /// Ширина изображения в пикселях - /// - public int Width { get; set; } - - /// - /// Высота изображения в пикселях - /// - public int Height { get; set; } - - public override void ReadFromBuffer(NetIncomingMessage buffer, IRobustSerializer serializer) - { - Width = buffer.ReadInt32(); - Height = buffer.ReadInt32(); - var dataLength = buffer.ReadInt32(); - ImageData = buffer.ReadBytes(dataLength); - } - - public override void WriteToBuffer(NetOutgoingMessage buffer, IRobustSerializer serializer) - { - buffer.Write(Width); - buffer.Write(Height); - buffer.Write(ImageData.Length); - buffer.Write(ImageData); - } -} diff --git a/Content.Shared/_Sunrise/CartridgeLoader/Cartridges/PhotoCartridgeComponent.cs b/Content.Shared/_Sunrise/CartridgeLoader/Cartridges/PhotoCartridgeComponent.cs deleted file mode 100644 index 94822d67e6..0000000000 --- a/Content.Shared/_Sunrise/CartridgeLoader/Cartridges/PhotoCartridgeComponent.cs +++ /dev/null @@ -1,65 +0,0 @@ -using Robust.Shared.Serialization; -using Robust.Shared.Audio; -using Robust.Shared.Prototypes; - -namespace Content.Shared._Sunrise.CartridgeLoader.Cartridges; - -/// -/// Компонент фото-картриджа для КПК -/// -[RegisterComponent] -public sealed partial class PhotoCartridgeComponent : Component -{ - /// - /// Галерея фотографий пользователя (PhotoId -> PhotoMetadata) - /// - [ViewVariables] - public Dictionary PhotoGallery = new(); - - /// - /// Звук срабатывания затвора - /// - [DataField] - public SoundSpecifier Sound = new SoundPathSpecifier("/Audio/_Sunrise/camera_shot.ogg"); - - /// - /// Эффект вспышки - /// - [DataField] - public EntProtoId FlashEffect = "PhotoFlashEffect"; - - /// - /// Включена ли вспышка (пользовательская настройка) - /// - [DataField] - public bool FlashEnabled = true; -} - -/// -/// Метаданные фотографии в галерее -/// -[Serializable, NetSerializable] -public sealed class PhotoMetadata -{ - /// - /// Уникальный идентификатор фотографии (GUID) - /// - public string PhotoId { get; set; } - - /// - /// Путь к сетевому ресурсу изображения (например, "/NetTextures/Messenger/photo_123.png") - /// - public string ImagePath { get; set; } - - /// - /// Время создания фотографии (относительно начала раунда) - /// - public TimeSpan Timestamp { get; set; } - - public PhotoMetadata(string photoId, string imagePath, TimeSpan timestamp) - { - PhotoId = photoId; - ImagePath = imagePath; - Timestamp = timestamp; - } -} diff --git a/Content.Shared/_Sunrise/CartridgeLoader/Cartridges/PhotoUiMessageEvent.cs b/Content.Shared/_Sunrise/CartridgeLoader/Cartridges/PhotoUiMessageEvent.cs deleted file mode 100644 index ed7d411994..0000000000 --- a/Content.Shared/_Sunrise/CartridgeLoader/Cartridges/PhotoUiMessageEvent.cs +++ /dev/null @@ -1,45 +0,0 @@ -using Content.Shared.CartridgeLoader; -using Robust.Shared.Serialization; - -namespace Content.Shared._Sunrise.CartridgeLoader.Cartridges; - -/// -/// Событие сообщения UI фото-картриджа -/// -[Serializable, NetSerializable] -public sealed class PhotoUiMessageEvent : CartridgeMessageEvent -{ - public readonly PhotoUiAction Action; - public readonly string? PhotoId; - public readonly string? RecipientId; - public readonly string? GroupId; - - public PhotoUiMessageEvent( - PhotoUiAction action, - string? photoId = null, - string? recipientId = null, - string? groupId = null, - bool? flashEnabled = null) - { - Action = action; - PhotoId = photoId; - RecipientId = recipientId; - GroupId = groupId; - FlashEnabled = flashEnabled; - } - - public bool? FlashEnabled { get; } -} - -/// -/// Действия UI фото-картриджа -/// -[Serializable, NetSerializable] -public enum PhotoUiAction -{ - CapturePhoto, - SendPhotoToMessenger, - RequestGallery, - DeletePhoto, - ToggleFlash -} diff --git a/Content.Shared/_Sunrise/CartridgeLoader/Cartridges/PhotoUiState.cs b/Content.Shared/_Sunrise/CartridgeLoader/Cartridges/PhotoUiState.cs deleted file mode 100644 index 92b72f3ac4..0000000000 --- a/Content.Shared/_Sunrise/CartridgeLoader/Cartridges/PhotoUiState.cs +++ /dev/null @@ -1,42 +0,0 @@ -using Robust.Shared.Serialization; - -namespace Content.Shared._Sunrise.CartridgeLoader.Cartridges; - -/// -/// Состояние UI фото-картриджа -/// -[Serializable, NetSerializable] -public sealed class PhotoUiState : BoundUserInterfaceState -{ - /// - /// Список фотографий в галерее (PhotoId -> PhotoMetadata) - /// - public Dictionary Photos { get; } - - /// - /// Статус камеры (готовность к съемке) - /// - public bool CameraReady { get; } - - /// - /// Включена ли вспышка - /// - public bool FlashEnabled { get; } - - /// - /// Сообщение об ошибке (если есть) - /// - public string? ErrorMessage { get; } - - public PhotoUiState( - Dictionary photos, - bool cameraReady, - bool flashEnabled, - string? errorMessage = null) - { - Photos = photos; - CameraReady = cameraReady; - FlashEnabled = flashEnabled; - ErrorMessage = errorMessage; - } -} diff --git a/Content.Shared/_Sunrise/Messenger/MessengerMessage.cs b/Content.Shared/_Sunrise/Messenger/MessengerMessage.cs index b3ae859bb6..f256006884 100644 --- a/Content.Shared/_Sunrise/Messenger/MessengerMessage.cs +++ b/Content.Shared/_Sunrise/Messenger/MessengerMessage.cs @@ -55,23 +55,7 @@ public sealed class MessengerMessage /// public ProtoId? SenderJobIconId { get; set; } - /// - /// Путь к сетевому изображению, если сообщение содержит картинку. - /// Например: "/NetTextures/Messenger/photo_123.png" - /// - public string? ImagePath { get; set; } - - public MessengerMessage( - string senderId, - string senderName, - string content, - TimeSpan timestamp, - string? groupId = null, - string? recipientId = null, - bool isRead = false, - long messageId = 0, - ProtoId? senderJobIconId = null, - string? imagePath = null) + public MessengerMessage(string senderId, string senderName, string content, TimeSpan timestamp, string? groupId = null, string? recipientId = null, bool isRead = false, long messageId = 0, ProtoId? senderJobIconId = null) { SenderId = senderId; SenderName = senderName; @@ -82,6 +66,5 @@ public sealed class MessengerMessage IsRead = isRead; MessageId = messageId; SenderJobIconId = senderJobIconId; - ImagePath = imagePath; } } diff --git a/Resources/Audio/_Sunrise/camera_shot.ogg b/Resources/Audio/_Sunrise/camera_shot.ogg deleted file mode 100644 index 00beda9593b3746ad621b5630411f1e3aa70d64c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 8495 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 MKk0)sJ@8=pe_sL8&Hw-a diff --git a/Resources/Locale/en-US/_prototypes/entities/objects/devices/cartridges.ftl b/Resources/Locale/en-US/_prototypes/entities/objects/devices/cartridges.ftl index 5c29a2cf4e..79f320d4ef 100644 --- a/Resources/Locale/en-US/_prototypes/entities/objects/devices/cartridges.ftl +++ b/Resources/Locale/en-US/_prototypes/entities/objects/devices/cartridges.ftl @@ -19,6 +19,4 @@ ent-AstroNavCartridge = AstroNav cartridge ent-NavigatorCartridge = navigator cartridge .desc = A program for viewing the station map for navigation purposes. ent-MessengerCartridge = messenger cartridge - .desc = A program for messaging between PDAs. -ent-PhotoCartridge = camera cartridge - .desc = A program for taking photos and managing a photo gallery. + .desc = A program for messaging between PDAs. \ No newline at end of file diff --git a/Resources/Locale/en-US/_strings/cartridge-loader/cartridges.ftl b/Resources/Locale/en-US/_strings/cartridge-loader/cartridges.ftl index 091b7da42b..f24940e20c 100644 --- a/Resources/Locale/en-US/_strings/cartridge-loader/cartridges.ftl +++ b/Resources/Locale/en-US/_strings/cartridge-loader/cartridges.ftl @@ -6,8 +6,7 @@ nano-task-program-name = NanoTask news-read-program-name = Station news crew-manifest-program-name = Crew manifest -messenger-program-name = RobustChat -photo-program-name = FlashSnap +messenger-program-name = Messenger MAX crew-manifest-cartridge-loading = Loading ... net-probe-program-name = NetProbe diff --git a/Resources/Locale/ru-RU/_prototypes/entities/objects/devices/cartridges.ftl b/Resources/Locale/ru-RU/_prototypes/entities/objects/devices/cartridges.ftl index b0c987fd4b..42eea5f658 100644 --- a/Resources/Locale/ru-RU/_prototypes/entities/objects/devices/cartridges.ftl +++ b/Resources/Locale/ru-RU/_prototypes/entities/objects/devices/cartridges.ftl @@ -19,6 +19,4 @@ ent-AstroNavCartridge = Картридж АстроНав ent-NavigatorCartridge = картридж навигатора .desc = Программа для просмотра карты станции в целях навигации. ent-MessengerCartridge = картридж мессенджера - .desc = Программа для обмена сообщениями между КПК. -ent-PhotoCartridge = картридж фотоаппарата - .desc = Программа для съемки фотографий и управления галереей. \ No newline at end of file + .desc = Программа для обмена сообщениями между КПК. \ No newline at end of file diff --git a/Resources/Locale/ru-RU/_strings/_sunrise/cartridge-loader/cartridges.ftl b/Resources/Locale/ru-RU/_strings/_sunrise/cartridge-loader/cartridges.ftl index 376ce4f981..3bd69bef5c 100644 --- a/Resources/Locale/ru-RU/_strings/_sunrise/cartridge-loader/cartridges.ftl +++ b/Resources/Locale/ru-RU/_strings/_sunrise/cartridge-loader/cartridges.ftl @@ -2,10 +2,3 @@ plant-analyzer-program-name = БотаТек ent-PlantAnalyzerCartridge = картридж БотаТек .desc = Программа, предоставляющая инструменты для анализа растений ботаникам. - -photo-cartridge-photos-count = Фотографий: {$count}/{$max} -photo-cartridge-limit-reached = Достигнут лимит фотографий -photo-cartridge-photo-not-found = Фотография не найдена -photo-cartridge-messenger-unavailable = Сервер мессенджера недоступен -photo-cartridge-recipient-not-specified = Не указан получатель -photo-cartridge-photo-text = [Фото] diff --git a/Resources/Locale/ru-RU/_strings/cartridge-loader/cartridges.ftl b/Resources/Locale/ru-RU/_strings/cartridge-loader/cartridges.ftl index 056fafc6fd..a2f1465363 100644 --- a/Resources/Locale/ru-RU/_strings/cartridge-loader/cartridges.ftl +++ b/Resources/Locale/ru-RU/_strings/cartridge-loader/cartridges.ftl @@ -4,7 +4,7 @@ notekeeper-program-name = Заметки nano-task-program-name = NanoTask news-read-program-name = Новости станции crew-manifest-program-name = Манифест экипажа -messenger-program-name = RobustChat +messenger-program-name = Мессенджер МАХ crew-manifest-cartridge-loading = Загрузка... net-probe-program-name = Зонд сетей net-probe-scan = Просканирован { $device }! @@ -26,8 +26,6 @@ astro-nav-program-name = АстроНав navigator-program-name = Навигатор navigator-cartridge-loading = Загрузка карты... -photo-program-name = FlashSnap - med-tek-program-name = МедТек # Wanted list cartridge wanted-list-program-name = Список разыскиваемых diff --git a/Resources/Locale/ru-RU/_strings/cartridge-loader/messenger.ftl b/Resources/Locale/ru-RU/_strings/cartridge-loader/messenger.ftl index 57d92e3cb3..9634bd8050 100644 --- a/Resources/Locale/ru-RU/_strings/cartridge-loader/messenger.ftl +++ b/Resources/Locale/ru-RU/_strings/cartridge-loader/messenger.ftl @@ -59,7 +59,3 @@ messenger-invite-user-to-group-title = Пригласить в { $groupName } messenger-delete-message = Удалить сообщение messenger-system-user-joined = { $userName } присоединился(ась) к группе messenger-system-user-left = { $userName } покинул(а) группу -messenger-photo-button-tooltip = Отправить фотографию -messenger-photo-picker-title = Выберите фотографию -messenger-image-preview-title = Просмотр изображения -messenger-photo-flash-label = Вспышка diff --git a/Resources/Prototypes/Entities/Objects/Devices/pda.yml b/Resources/Prototypes/Entities/Objects/Devices/pda.yml index 12360be3a2..90fc8b7db6 100644 --- a/Resources/Prototypes/Entities/Objects/Devices/pda.yml +++ b/Resources/Prototypes/Entities/Objects/Devices/pda.yml @@ -78,7 +78,7 @@ prefix: device-address-prefix-console savableAddress: false - type: WirelessNetworkConnection - range: 2000 # Sunrise-Edit + range: 500 - type: CartridgeLoader uiKey: enum.PdaUiKey.Key preinstalled: @@ -89,7 +89,6 @@ # Sunrise-Start - NavigatorCartridge - MessengerCartridge - - PhotoCartridge # Sunrise-End cartridgeSlot: priority: -1 @@ -171,7 +170,6 @@ # Sunrise-Start - NavigatorCartridge - MessengerCartridge - - PhotoCartridge # Sunrise-End - type: entity @@ -190,7 +188,6 @@ # Sunrise-Start - NavigatorCartridge - MessengerCartridge - - PhotoCartridge # Sunrise-End - type: entity @@ -366,7 +363,6 @@ - PlantAnalyzerCartridge - NavigatorCartridge - MessengerCartridge - - PhotoCartridge # Sunrise-End - type: entity @@ -552,7 +548,6 @@ # Sunrise-Start - NavigatorCartridge - MessengerCartridge - - PhotoCartridge # Sunrise-End - type: entity @@ -606,7 +601,6 @@ # Sunrise-Start - NavigatorCartridge - MessengerCartridge - - PhotoCartridge # Sunrise-End - type: entity @@ -1028,7 +1022,6 @@ # Sunrise-Start - NavigatorCartridge - MessengerCartridge - - PhotoCartridge # Sunrise-End - type: entity @@ -1115,7 +1108,6 @@ # Sunrise-Start - NavigatorCartridge - MessengerCartridge - - PhotoCartridge # Sunrise-End - type: entity @@ -1168,7 +1160,6 @@ # Sunrise-Start - NavigatorCartridge - MessengerCartridge - - PhotoCartridge # Sunrise-End - type: Tag # Ignore Chameleon tags tags: @@ -1422,7 +1413,6 @@ # Sunrise-Start - NavigatorCartridge - MessengerCartridge - - PhotoCartridge # Sunrise-End - type: entity @@ -1612,7 +1602,6 @@ # Sunrise-Start - NavigatorCartridge - MessengerCartridge - - PhotoCartridge # Sunrise-End - type: entity @@ -1647,7 +1636,6 @@ # Sunrise-Start - NavigatorCartridge - MessengerCartridge - - PhotoCartridge # Sunrise-End - type: entity @@ -1815,7 +1803,6 @@ - NavigatorCartridge - AstroNavCartridge - MessengerCartridge - - PhotoCartridge # Sunrise-end - type: entity diff --git a/Resources/Prototypes/_Sunrise/Entities/Effects/photo.yml b/Resources/Prototypes/_Sunrise/Entities/Effects/photo.yml deleted file mode 100644 index 4e28dce404..0000000000 --- a/Resources/Prototypes/_Sunrise/Entities/Effects/photo.yml +++ /dev/null @@ -1,13 +0,0 @@ -- type: entity - id: PhotoFlashEffect - categories: [ HideSpawnMenu ] - components: - - type: PointLight - enabled: true - radius: 10 - energy: 10 - netsync: false - - type: LightFade - duration: 0.5 - - type: TimedDespawn - lifetime: 0.5 diff --git a/Resources/Prototypes/_Sunrise/Entities/Objects/Devices/Prison/pda/doctor.yml b/Resources/Prototypes/_Sunrise/Entities/Objects/Devices/Prison/pda/doctor.yml index bc4f83f353..c5bfe61c7e 100644 --- a/Resources/Prototypes/_Sunrise/Entities/Objects/Devices/Prison/pda/doctor.yml +++ b/Resources/Prototypes/_Sunrise/Entities/Objects/Devices/Prison/pda/doctor.yml @@ -26,7 +26,6 @@ - MedTekCartridge - NavigatorCartridge - MessengerCartridge - - PhotoCartridge - type: PdaAnimationVisuals animatedState: pda-space-prison-doctor idInsertedLayerState: id_inserted-space-prison diff --git a/Resources/Prototypes/_Sunrise/Entities/Objects/Devices/Prison/pda/engineer.yml b/Resources/Prototypes/_Sunrise/Entities/Objects/Devices/Prison/pda/engineer.yml index e84b9a9ab2..bcb75527d7 100644 --- a/Resources/Prototypes/_Sunrise/Entities/Objects/Devices/Prison/pda/engineer.yml +++ b/Resources/Prototypes/_Sunrise/Entities/Objects/Devices/Prison/pda/engineer.yml @@ -21,7 +21,6 @@ - NetProbeCartridge - NavigatorCartridge - MessengerCartridge - - PhotoCartridge - type: entity parent: PrisonEngineerPDA diff --git a/Resources/Prototypes/_Sunrise/Entities/Objects/Devices/Prison/pda/headofprison.yml b/Resources/Prototypes/_Sunrise/Entities/Objects/Devices/Prison/pda/headofprison.yml index cf97729edc..95b0d076f6 100644 --- a/Resources/Prototypes/_Sunrise/Entities/Objects/Devices/Prison/pda/headofprison.yml +++ b/Resources/Prototypes/_Sunrise/Entities/Objects/Devices/Prison/pda/headofprison.yml @@ -27,7 +27,6 @@ - NewsReaderCartridge - NavigatorCartridge - MessengerCartridge - - PhotoCartridge - type: entity parent: SecurityMetusPDA diff --git a/Resources/Prototypes/_Sunrise/Entities/Objects/Devices/Prison/pda/pilot.yml b/Resources/Prototypes/_Sunrise/Entities/Objects/Devices/Prison/pda/pilot.yml index 7400507bd2..7bc6e42821 100644 --- a/Resources/Prototypes/_Sunrise/Entities/Objects/Devices/Prison/pda/pilot.yml +++ b/Resources/Prototypes/_Sunrise/Entities/Objects/Devices/Prison/pda/pilot.yml @@ -31,7 +31,6 @@ - AstroNavCartridge - NavigatorCartridge - MessengerCartridge - - PhotoCartridge - type: PdaAnimationVisuals animatedState: pda-space-prison-pilot idInsertedLayerState: id_inserted-space-prison diff --git a/Resources/Prototypes/_Sunrise/Entities/Objects/Devices/Prison/pda/prisoner.yml b/Resources/Prototypes/_Sunrise/Entities/Objects/Devices/Prison/pda/prisoner.yml index 79b7b52c20..e6007da494 100644 --- a/Resources/Prototypes/_Sunrise/Entities/Objects/Devices/Prison/pda/prisoner.yml +++ b/Resources/Prototypes/_Sunrise/Entities/Objects/Devices/Prison/pda/prisoner.yml @@ -37,7 +37,6 @@ - NewsReaderCartridge - NavigatorCartridge - MessengerCartridge - - PhotoCartridge - type: entity parent: PlanetPrisonerPDA diff --git a/Resources/Prototypes/_Sunrise/Entities/Objects/Devices/Prison/pda/scientist.yml b/Resources/Prototypes/_Sunrise/Entities/Objects/Devices/Prison/pda/scientist.yml index 304f6447e7..51cf8ff1d0 100644 --- a/Resources/Prototypes/_Sunrise/Entities/Objects/Devices/Prison/pda/scientist.yml +++ b/Resources/Prototypes/_Sunrise/Entities/Objects/Devices/Prison/pda/scientist.yml @@ -26,7 +26,6 @@ - AstroNavCartridge - NavigatorCartridge - MessengerCartridge - - PhotoCartridge - type: PdaAnimationVisuals animatedState: pda-space-prison-scientist idInsertedLayerState: id_inserted-space-prison diff --git a/Resources/Prototypes/_Sunrise/Entities/Objects/Devices/Prison/pda/worker.yml b/Resources/Prototypes/_Sunrise/Entities/Objects/Devices/Prison/pda/worker.yml index 9b824650f9..6b586239a3 100644 --- a/Resources/Prototypes/_Sunrise/Entities/Objects/Devices/Prison/pda/worker.yml +++ b/Resources/Prototypes/_Sunrise/Entities/Objects/Devices/Prison/pda/worker.yml @@ -26,7 +26,6 @@ - AstroNavCartridge - NavigatorCartridge - MessengerCartridge - - PhotoCartridge - type: PdaAnimationVisuals animatedState: pda-space-prison-worker idInsertedLayerState: id_inserted-space-prison diff --git a/Resources/Prototypes/_Sunrise/Entities/Objects/Devices/cartridges.yml b/Resources/Prototypes/_Sunrise/Entities/Objects/Devices/cartridges.yml index 39c0f22d63..c2f0209d3c 100644 --- a/Resources/Prototypes/_Sunrise/Entities/Objects/Devices/cartridges.yml +++ b/Resources/Prototypes/_Sunrise/Entities/Objects/Devices/cartridges.yml @@ -1,4 +1,4 @@ -- type: entity +- type: entity parent: BaseItem id: PlantAnalyzerCartridge name: PlantAnalyzerCartridge @@ -52,22 +52,5 @@ programName: messenger-program-name icon: sprite: _Sunrise/Interface/Misc/program_icons.rsi - state: robust_chat + state: max_logo2 - type: MessengerCartridge - -- type: entity - parent: BasePDACartridge - id: PhotoCartridge - name: photo cartridge - description: A program for taking photos and managing a photo gallery. - components: - - type: Sprite - state: cart-y - - type: UIFragment - ui: !type:PhotoUi - - type: Cartridge - programName: photo-program-name - icon: - sprite: _Sunrise/Interface/Misc/program_icons.rsi - state: flash_snap - - type: PhotoCartridge diff --git a/Resources/Prototypes/_Sunrise/Entities/Objects/Devices/pda.yml b/Resources/Prototypes/_Sunrise/Entities/Objects/Devices/pda.yml index 238e2de213..3b522b523d 100644 --- a/Resources/Prototypes/_Sunrise/Entities/Objects/Devices/pda.yml +++ b/Resources/Prototypes/_Sunrise/Entities/Objects/Devices/pda.yml @@ -187,7 +187,6 @@ - AstroNavCartridge - NavigatorCartridge - MessengerCartridge - - PhotoCartridge - type: entity parent: CaptainPDA @@ -426,7 +425,6 @@ - AstroNavCartridge - NavigatorCartridge - MessengerCartridge - - PhotoCartridge - type: entity parent: BasePDA diff --git a/Resources/Prototypes/_Sunrise/Structures/Machines/messenger_server.yml b/Resources/Prototypes/_Sunrise/Structures/Machines/messenger_server.yml index d2646a9f08..6df67ce1d5 100644 --- a/Resources/Prototypes/_Sunrise/Structures/Machines/messenger_server.yml +++ b/Resources/Prototypes/_Sunrise/Structures/Machines/messenger_server.yml @@ -36,7 +36,9 @@ receiveFrequencyId: Messenger autoConnect: false - type: WirelessNetworkConnection - range: 2000 + range: 500 + - type: StationLimitedNetwork + allowNonStationPackets: true - type: ApcPowerReceiver powerLoad: 200 - type: DeviceNetworkRequiresPower diff --git a/Resources/Textures/_Sunrise/Interface/Misc/program_icons.rsi/flash_snap.png b/Resources/Textures/_Sunrise/Interface/Misc/program_icons.rsi/flash_snap.png deleted file mode 100644 index 7ed184b32b1c1a1ebf1701332e39774eab9c66e7..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 565 zcmV-50?Pe~P)Px$?@2^KR9J=Wmp^O5Kp4g!OQ$ZnxQK&Gps1LBfI`8oL(`#<3_^!ag?@#O?IfjB z!Kq8>pj-U_g|3A{wJJguhjL31%%H0sQpj7(mfm8v zOtZ#*8uOF-1pr_;a+j5|k;3FfWD2e7#5J}=Ql@ZNpaifrp{IO_0 z8czbxgI+%oV8*`j`rJaLY-D10K~$77s+zU6??u1>z}tII+DIl+87ZFwWNbSYz?DE3 zNC{xj>-)x{DD|o!(g3{qXgmoS5kS?fDM17P&g*7m^L5(YkonWyYP)^>F#j77BB~)p zIOU_5%!{QwilsanXC{n77Pez)^+6&4A6ci}_00j`ck+kNuT>L@5VEDv8b)Nk326gt zN?HJ$ie3tUudD4?xVdeCP3NKST;>J(C2kie1CZ#%vmFcfk1t@;IoNa#mw6#`6-gaL zwqv2w?g9YHhb13^7jG^by)-}^1Y*XqN+y(M0YOBW@cUmy%F~b{r)-dP>K_7dnHNfF zoW$v;JC6O!A%7v=w&*$*0Kl4?aFSFHCfz?VJ8eb(9P1@36b98i00000NkvXXu0mjf D(R}yx diff --git a/Resources/Textures/_Sunrise/Interface/Misc/program_icons.rsi/games.png b/Resources/Textures/_Sunrise/Interface/Misc/program_icons.rsi/games.png deleted file mode 100644 index 60621537e629310196cad98423a0fc2f3c86624c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 534 zcmV+x0_pvUP)Px$&`Cr=R9J=WRy%IOKoEUK^r5Drv4m_yI6y9tGayk=M6^*vn<7#w6w#s-6hs^# zmAh0v03Zh;(NMW2CrGMsX4f?bau z(lA&60B&vv#@sMo8S`o=Q1?@!(d-$0B<_M!5fyPx$(n&-?R9J=Wmc2{EKp4i~ihK7?E&*wmf*>8-Iyw0V6gzY%T{}1hI|!MM(oKs) z2WtlrhfHolK^zJl6dMXzI%RX{;2ekg#=FaXrtMT8IP!A2yXTk7eY^nw+I8hrFK0m* zXC1gybd+PG_EqM!Mk}j7%z`jBfe-?q`DoCWcD#9fQx05fw2UB90JM4Z^)2mKJUmbW z0Mv~j7ywgq6RiOC5PPD^b5RDUmj3T-FTDfBH0PFAzrbP_FO-W+syfyjI`=z}a*Y_>b#6!MHAE#6!S zz^(;$09m$NYqU}jbY5wiDKnY{VT{G3ZMjm7uOG%qDOajSeK#hAz@js^pAtg|j5AI9 aPU#2Ou_+(eZXhK90000