diff --git a/Content.Server/_White/AspectsSystem/Aspects/BattledAspect.cs b/Content.Server/_White/AspectsSystem/Aspects/BattledAspect.cs index 8b0d181cb0..5ceb47b97a 100644 --- a/Content.Server/_White/AspectsSystem/Aspects/BattledAspect.cs +++ b/Content.Server/_White/AspectsSystem/Aspects/BattledAspect.cs @@ -18,6 +18,7 @@ public sealed class BattledAspect : AspectSystem [Dependency] private readonly IPrototypeManager _prototypeManager = default!; [Dependency] private readonly SharedHandsSystem _handsSystem = default!; [Dependency] private readonly IRobustRandom _robustRandom = default!; + [Dependency] private readonly ChatHelper _chatHelper = default!; private NonPeacefulRoundItemsPrototype _nonPeacefulRoundItemsPrototype = default!; @@ -32,7 +33,7 @@ public sealed class BattledAspect : AspectSystem { base.Started(uid, component, gameRule, args); - var prototypes = _prototypeManager.EnumeratePrototypes().ToList(); + var prototypes = _prototypeManager.EnumeratePrototypes().ToList(); if (prototypes.Count == 0) ForceEndSelf(uid, gameRule); @@ -43,7 +44,6 @@ public sealed class BattledAspect : AspectSystem while (query.MoveNext(out var ent, out _)) { GiveItem(ent); - ChatHelper.SendAspectDescription(ent, Loc.GetString("battled-aspect-desc")); } } @@ -62,7 +62,7 @@ public sealed class BattledAspect : AspectSystem var mob = ev.Mob; GiveItem(mob); - ChatHelper.SendAspectDescription(mob, Loc.GetString("battled-aspect-desc")); + _chatHelper.SendAspectDescription(mob, Loc.GetString("battled-aspect-desc")); } } @@ -74,10 +74,10 @@ public sealed class BattledAspect : AspectSystem var transform = CompOrNull(player); - if(transform == null) + if (transform == null) return; - if(!HasComp(player)) + if (!HasComp(player)) return; var weaponEntity = EntityManager.SpawnEntity(item, transform.Coordinates); diff --git a/Content.Server/_White/AspectsSystem/Aspects/CatEarsAspect.cs b/Content.Server/_White/AspectsSystem/Aspects/CatEarsAspect.cs index f6ad27f73c..9f366d1b47 100644 --- a/Content.Server/_White/AspectsSystem/Aspects/CatEarsAspect.cs +++ b/Content.Server/_White/AspectsSystem/Aspects/CatEarsAspect.cs @@ -21,6 +21,7 @@ public sealed class CatEarsAspect : AspectSystem [Dependency] private readonly IPrototypeManager _protoMan = default!; [Dependency] private readonly IRobustRandom _random = default!; [Dependency] private readonly ChatSystem _chat = default!; + [Dependency] private readonly ChatHelper _chatHelper = default!; private MarkingPrototype _ears = default!; private MarkingPrototype _tail = default!; @@ -66,7 +67,6 @@ public sealed class CatEarsAspect : AspectSystem while (query.MoveNext(out var ent, out var appearance)) { AddMarkings(ent, appearance); - ChatHelper.SendAspectDescription(ent, Loc.GetString("cat-ears-aspect-desc")); } } @@ -82,7 +82,7 @@ public sealed class CatEarsAspect : AspectSystem return; AddMarkings(ev.Mob); - ChatHelper.SendAspectDescription(ev.Mob, Loc.GetString("cat-ears-aspect-desc")); + _chatHelper.SendAspectDescription(ev.Mob, Loc.GetString("cat-ears-aspect-desc")); } } @@ -96,18 +96,18 @@ public sealed class CatEarsAspect : AspectSystem case "Felinid": return; case "Human": - { - if (!appearance.MarkingSet.TryGetCategory(MarkingCategories.HeadTop, out var markings) || - markings.Count == 0) - AddEars(appearance); + { + if (!appearance.MarkingSet.TryGetCategory(MarkingCategories.HeadTop, out var markings) || + markings.Count == 0) + AddEars(appearance); - if (!appearance.MarkingSet.TryGetCategory(MarkingCategories.Tail, out markings) || markings.Count == 0) - AddTail(appearance); + if (!appearance.MarkingSet.TryGetCategory(MarkingCategories.Tail, out markings) || markings.Count == 0) + AddTail(appearance); - Dirty(uid, appearance); - ChangeEmotesVoice(uid, appearance); - return; - } + Dirty(uid, appearance); + ChangeEmotesVoice(uid, appearance); + return; + } default: AddEars(appearance); AddTail(appearance); diff --git a/Content.Server/_White/AspectsSystem/Aspects/DancingAspect.cs b/Content.Server/_White/AspectsSystem/Aspects/DancingAspect.cs index 7d2ad4e7ac..010bff9145 100644 --- a/Content.Server/_White/AspectsSystem/Aspects/DancingAspect.cs +++ b/Content.Server/_White/AspectsSystem/Aspects/DancingAspect.cs @@ -11,6 +11,8 @@ namespace Content.Server._White.AspectsSystem.Aspects; public sealed class DancingAspect : AspectSystem { + [Dependency] private readonly ChatHelper _chatHelper = default!; + public override void Initialize() { base.Initialize(); @@ -28,7 +30,6 @@ public sealed class DancingAspect : AspectSystem while (query.MoveNext(out var ent, out _, out _)) { EnsureComp(ent); - ChatHelper.SendAspectDescription(ent, Loc.GetString("dancing-aspect-desc")); } } @@ -46,7 +47,7 @@ public sealed class DancingAspect : AspectSystem var mob = ev.Mob; EnsureComp(mob); - ChatHelper.SendAspectDescription(mob, Loc.GetString("dancing-aspect-desc")); + _chatHelper.SendAspectDescription(mob, Loc.GetString("dancing-aspect-desc")); } } } diff --git a/Content.Server/_White/AspectsSystem/Aspects/DrunkAspect.cs b/Content.Server/_White/AspectsSystem/Aspects/DrunkAspect.cs index d5d7c551a6..3f684eac74 100644 --- a/Content.Server/_White/AspectsSystem/Aspects/DrunkAspect.cs +++ b/Content.Server/_White/AspectsSystem/Aspects/DrunkAspect.cs @@ -11,6 +11,7 @@ namespace Content.Server._White.AspectsSystem.Aspects; public sealed class DrunkAspect : AspectSystem { [Dependency] private readonly SharedDrunkSystem _drunkSystem = default!; + [Dependency] private readonly ChatHelper _chatHelper = default!; public override void Initialize() { @@ -27,8 +28,6 @@ public sealed class DrunkAspect : AspectSystem while (query.MoveNext(out var ent, out _)) { _drunkSystem.TryApplyDrunkenness(ent, 50); - - ChatHelper.SendAspectDescription(ent, Loc.GetString("drunk-aspect-desc")); } } @@ -47,8 +46,7 @@ public sealed class DrunkAspect : AspectSystem _drunkSystem.TryApplyDrunkenness(mob, 50); - ChatHelper.SendAspectDescription(mob, Loc.GetString("drunk-aspect-desc")); - + _chatHelper.SendAspectDescription(mob, Loc.GetString("drunk-aspect-desc")); } } } diff --git a/Content.Server/_White/AspectsSystem/Aspects/FastAndFuriousAspect.cs b/Content.Server/_White/AspectsSystem/Aspects/FastAndFuriousAspect.cs index 979ec0463c..57f98479bf 100644 --- a/Content.Server/_White/AspectsSystem/Aspects/FastAndFuriousAspect.cs +++ b/Content.Server/_White/AspectsSystem/Aspects/FastAndFuriousAspect.cs @@ -13,6 +13,7 @@ namespace Content.Server._White.AspectsSystem.Aspects; public sealed class FastAndFuriousAspect : AspectSystem { + [Dependency] private readonly ChatHelper _chatHelper = default!; public override void Initialize() { base.Initialize(); @@ -39,7 +40,6 @@ public sealed class FastAndFuriousAspect : AspectSystem(ent); - ChatHelper.SendAspectDescription(ent, Loc.GetString("fast-and-furious-aspect-desc")); } } @@ -54,7 +54,7 @@ public sealed class FastAndFuriousAspect : AspectSystem { - [Dependency] private readonly SharedContentEyeSystem _eye = default!; [Dependency] private readonly SharedTelescopeSystem _telescope = default!; - [Dependency] private readonly IChatManager _chatManager = default!; - [Dependency] private readonly ISharedPlayerManager _playerManager = default!; + [Dependency] private readonly ChatHelper _chatHelper = default!; public override void Initialize() { @@ -48,7 +43,7 @@ public sealed class ImmersiveAspect : AspectSystem FuckUpEye(entity, 0.6f); AddTelescope(entity); - ChatHelper.SendAspectDescription(entity, Loc.GetString("immersive-aspect-desc")); + _chatHelper.SendAspectDescription(entity, Loc.GetString("immersive-aspect-desc")); } } @@ -81,7 +76,7 @@ public sealed class ImmersiveAspect : AspectSystem FuckUpEye(ev.Mob, 0.6f); AddTelescope(ev.Mob); - ChatHelper.SendAspectDescription(ev.Mob, Loc.GetString("immersive-aspect-desc")); + _chatHelper.SendAspectDescription(ev.Mob, Loc.GetString("immersive-aspect-desc")); } } diff --git a/Content.Server/_White/AspectsSystem/Aspects/RandomAccentAspect.cs b/Content.Server/_White/AspectsSystem/Aspects/RandomAccentAspect.cs index 28e251952e..ab09d3aa27 100644 --- a/Content.Server/_White/AspectsSystem/Aspects/RandomAccentAspect.cs +++ b/Content.Server/_White/AspectsSystem/Aspects/RandomAccentAspect.cs @@ -13,6 +13,7 @@ namespace Content.Server._White.AspectsSystem.Aspects; public sealed class RandomAccentAspect : AspectSystem { [Dependency] private readonly IRobustRandom _random = default!; + [Dependency] private readonly ChatHelper _chatHelper = default!; public override void Initialize() { @@ -28,7 +29,6 @@ public sealed class RandomAccentAspect : AspectSystem { + [Dependency] private readonly ChatHelper _chatHelper = default!; public override void Initialize() { base.Initialize(); - SubscribeLocalEvent(HandleLateJoin, after: new [] {typeof(StationRecordsSystem)}); + SubscribeLocalEvent(HandleLateJoin, after: new[] { typeof(StationRecordsSystem) }); } protected override void Started(EntityUid uid, RandomAppearanceAspectComponent component, GameRuleComponent gameRule, GameRuleStartedEvent args) @@ -24,7 +25,6 @@ public sealed class RandomAppearanceAspect : AspectSystem(ent); - ChatHelper.SendAspectDescription(ent, Loc.GetString("random-appearance-aspect-desc")); } } @@ -42,7 +42,7 @@ public sealed class RandomAppearanceAspect : AspectSystem(mob); - ChatHelper.SendAspectDescription(mob, Loc.GetString("random-appearance-aspect-desc")); + _chatHelper.SendAspectDescription(mob, Loc.GetString("random-appearance-aspect-desc")); } } } diff --git a/Content.Server/_White/AspectsSystem/Aspects/RandomItemAspect.cs b/Content.Server/_White/AspectsSystem/Aspects/RandomItemAspect.cs index 118c2c68d9..92034df319 100644 --- a/Content.Server/_White/AspectsSystem/Aspects/RandomItemAspect.cs +++ b/Content.Server/_White/AspectsSystem/Aspects/RandomItemAspect.cs @@ -14,6 +14,7 @@ public sealed class RandomItemAspect : AspectSystem { [Dependency] private readonly SharedHandsSystem _handsSystem = default!; [Dependency] private readonly RandomGiftSystem _giftSystem = default!; + [Dependency] private readonly ChatHelper _chatHelper = default!; public override void Initialize() { @@ -30,7 +31,6 @@ public sealed class RandomItemAspect : AspectSystem while (query.MoveNext(out var ent, out _)) { GiveItem(ent, component); - ChatHelper.SendAspectDescription(ent, Loc.GetString("random-item-aspect-desc")); } } @@ -49,7 +49,7 @@ public sealed class RandomItemAspect : AspectSystem var mob = ev.Mob; GiveItem(mob, component); - ChatHelper.SendAspectDescription(mob, Loc.GetString("random-item-aspect-desc")); + _chatHelper.SendAspectDescription(mob, Loc.GetString("random-item-aspect-desc")); } } @@ -64,10 +64,10 @@ public sealed class RandomItemAspect : AspectSystem var transform = CompOrNull(player); - if(transform == null) + if (transform == null) return; - if(!HasComp(player)) + if (!HasComp(player)) return; var weaponEntity = EntityManager.SpawnEntity(component.Item, transform.Coordinates); diff --git a/Content.Server/_White/AspectsSystem/Aspects/SkeletonAspect.cs b/Content.Server/_White/AspectsSystem/Aspects/SkeletonAspect.cs index 2b6e0117e0..3abea428ef 100644 --- a/Content.Server/_White/AspectsSystem/Aspects/SkeletonAspect.cs +++ b/Content.Server/_White/AspectsSystem/Aspects/SkeletonAspect.cs @@ -13,6 +13,7 @@ namespace Content.Server._White.AspectsSystem.Aspects; public sealed class SkeletonAspect : AspectSystem { + [Dependency] private readonly ChatHelper _chatHelper = default!; // [Dependency] private readonly IPrototypeManager _protoMan = default!; // [Dependency] private readonly PolymorphSystem _polymorph = default!; // [Dependency] private readonly HumanoidAppearanceSystem _humanoidAppearance = default!; @@ -42,9 +43,8 @@ public sealed class SkeletonAspect : AspectSystem foreach (var ent in entitiesToPolymorph) { PolymorphEntity(ent.Key, ent.Value); - ChatHelper.SendAspectDescription(ent.Key, Loc.GetString("skeleton-aspect-desc")); } - + } private void HandleLateJoin(PlayerSpawnCompleteEvent ev) @@ -60,7 +60,7 @@ public sealed class SkeletonAspect : AspectSystem PolymorphEntity(ev.Mob); - ChatHelper.SendAspectDescription(ev.Mob, Loc.GetString("skeleton-aspect-desc")); + _chatHelper.SendAspectDescription(ev.Mob, Loc.GetString("skeleton-aspect-desc")); } } diff --git a/Content.Server/_White/AspectsSystem/Base/ChatHelper.cs b/Content.Server/_White/AspectsSystem/Base/ChatHelper.cs index f736f46ed1..045ff1fff1 100644 --- a/Content.Server/_White/AspectsSystem/Base/ChatHelper.cs +++ b/Content.Server/_White/AspectsSystem/Base/ChatHelper.cs @@ -1,33 +1,19 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; using Content.Server.Chat.Managers; using Robust.Shared.Player; -namespace Content.Server._White.AspectsSystem.Base +namespace Content.Server._White.AspectsSystem.Base; + +public sealed class ChatHelper : EntitySystem { - public static class ChatHelper + [Dependency] private readonly ISharedPlayerManager _playerManager = default!; + [Dependency] private readonly IChatManager _chatManager = default!; + + public void SendAspectDescription(EntityUid mob, string messageKey) { - [Dependency] private static ISharedPlayerManager _playerManager = default!; - [Dependency] private static IChatManager _chatManager = default!; - - - - - public static void Initialize(ISharedPlayerManager playerManager, IChatManager chatManager) + _playerManager.TryGetSessionByEntity(mob, out var session); + if (session != null) { - _playerManager = playerManager; - _chatManager = chatManager; - } - public static void SendAspectDescription(EntityUid mob, string messageKey) - { - _playerManager.TryGetSessionByEntity(mob, out var session); - if (session != null) - { - _chatManager.DispatchServerMessage(session, Loc.GetString(messageKey)); - } + _chatManager.DispatchServerMessage(session, Loc.GetString(messageKey)); } } } diff --git a/Content.Server/_White/UnsafePseudoIoC.cs b/Content.Server/_White/UnsafePseudoIoC.cs index 88ff739246..e22414eb4a 100644 --- a/Content.Server/_White/UnsafePseudoIoC.cs +++ b/Content.Server/_White/UnsafePseudoIoC.cs @@ -12,7 +12,6 @@ public static class UnsafePseudoIoC // Я НАНАВИЖУ IOCMAANGERRESOLVEPOSH public static void Initialize() { ConfigurationManager = IoCManager.Resolve(); - ChatHelper.Initialize(IoCManager.Resolve(), IoCManager.Resolve());// heh IOCMAANGERRESOLVEPOSHEL NAHUI X2 } } diff --git a/Resources/Locale/ru-RU/_white/aspects.ftl b/Resources/Locale/ru-RU/_white/aspects.ftl index a9ae84c11e..22c9f07c79 100644 --- a/Resources/Locale/ru-RU/_white/aspects.ftl +++ b/Resources/Locale/ru-RU/_white/aspects.ftl @@ -1,10 +1,10 @@ immersive-aspect-desc = Для осмотра своего окружение, нажмите клавишу присмотреться/прицелиться (по умолчанию - Пробел). -skeleton-aspect-desc = Все персонажи стали скелетами. -battled-aspect-desc = Всем игрокам выдано случайное оружие. -cat-ears-aspect-desc = Котячьи ушки! Уиииии!. -dancing-aspect-desc = Все персонажи находятся в танце. -drunk-aspect-desc = Все персонажи пьяны. -fast-and-furious-aspect-desc = Все персонажи ускоряются. -random-accent-aspect-desc = Все персонажи получили случайный акцент. +skeleton-aspect-desc = Из-за обстоятельств на станции - все персонажи стали скелетами. +battled-aspect-desc = Чтобы то ни было ранее, но у вас с собой оказалось случайное оружие. +cat-ears-aspect-desc = Из-за ошибки в системе клонирования на ЦК все члены экипажа стали походить на фелинидов. +dancing-aspect-desc = Федерация Волшебников прокляла всех работников этой станции на танец до смерти. +drunk-aspect-desc = Ваш персонаж слишком хорошо отгулял в своё свободное время. +fast-and-furious-aspect-desc = Из-за обстоятельств на станции - все персонажи передвигаются быстрее обычного. +random-accent-aspect-desc = Из-за обстоятельств на станции - все персонажи получили случайный акцент. random-appearance-aspect-desc = Все персонажи получили случайную внешность. -random-item-aspect-desc = Все персонажи получили случайный предмет. \ No newline at end of file +random-item-aspect-desc = НаноТрейзен выдало всем случайный предмет.