Dreamer

Content.Client/UserInterface/Systems/Character/CharacterUIController.cs

@@ -5,6 +5,8 @@
 using Content.Client.UserInterface.Systems.Character.Controls;
 using Content.Client.UserInterface.Systems.Character.Windows;
 using Content.Client.UserInterface.Systems.Objectives.Controls;
+using Content.Shared._Lfwb.Skills;
+using Content.Shared._Lfwb.Stats;
 using Content.Shared.Input;
 using JetBrains.Annotations;
 using Robust.Client.GameObjects;
@@ -23,12 +25,20 @@ namespace Content.Client.UserInterface.Systems.Character;
 public sealed class CharacterUIController : UIController, IOnStateEntered<GameplayState>, IOnStateExited<GameplayState>, IOnSystemChanged<CharacterInfoSystem>
 {
     [Dependency] private readonly IPlayerManager _player = default!;
+    [Dependency] private readonly IEntityManager _entityManager = default!;
+    [Dependency] private readonly IPlayerManager _playerManager = default!;
     [UISystemDependency] private readonly CharacterInfoSystem _characterInfo = default!;
     [UISystemDependency] private readonly SpriteSystem _sprite = default!;
 
     private CharacterWindow? _window;
     private MenuButton? CharacterButton => UIManager.GetActiveUIWidgetOrNull<MenuBar.Widgets.GameTopMenuBar>()?.CharacterButton;
 
+    public override void Initialize()
+    {
+        base.Initialize();
+        IoCManager.InjectDependencies(this);
+    }
+
     public void OnStateEntered(GameplayState state)
     {
         DebugTools.Assert(_window == null);
@@ -184,6 +194,71 @@ private void CharacterUpdated(CharacterData data)
 
         _window.RolePlaceholder.Visible = briefing == null && controls.Count == 0 && objectives.Count == 0;
         _window.MemoriesPlaceholder.Visible = memories.Count == 0;
+
+        FillStat();
+        FillSkills();
+    }
+
+    private void FillStat()
+    {
+        _window?.StatsLabel.RemoveAllChildren();
+
+        var playerEntity = _playerManager.LocalPlayer!.ControlledEntity;
+
+        if (!playerEntity.HasValue)
+            return;
+
+        if (!_entityManager.TryGetComponent<StatsComponent>(playerEntity, out var stats))
+        {
+            _window?.StatsLabel.SetMessage("");
+            return;
+        }
+
+        var msg = new FormattedMessage();
+
+        msg.Clear();
+
+        msg.PushNewline();
+
+        foreach (var stat in stats.Stats)
+        {
+            if (stat.Key == Stat.Luck)
+                continue;
+
+            var statLoc = Loc.GetString($"stat-{stat.Key}");
+            msg.AddMarkup($"[color=#7980ad]{statLoc}[/color]: [color=yellow]{stat.Value}[/color]\n");
+        }
+
+        _window?.StatsLabel.SetMessage(msg);
+    }
+
+    private void FillSkills()
+    {
+        _window?.SkillsLabel.RemoveAllChildren();
+
+        var playerEntity = _playerManager.LocalPlayer!.ControlledEntity;
+
+        if (!playerEntity.HasValue)
+            return;
+
+        if (!_entityManager.TryGetComponent<SkillsComponent>(playerEntity, out var skills))
+        {
+            _window?.SkillsLabel.SetMessage("");
+            return;
+        }
+
+        var msg = new FormattedMessage();
+
+        msg.Clear();
+
+        msg.PushNewline();
+
+        foreach (var skill in skills.Skills)
+        {
+            msg.AddMarkup($"[color=#7980ad]{skill.Key.ToString()}[/color]: [color=yellow]{skill.Value.Item1.ToString()}[/color]\n");
+        }
+
+        _window?.SkillsLabel.SetMessage(msg);
     }
 
     private void CharacterDetached(EntityUid uid)

Content.Client/UserInterface/Systems/Character/Windows/CharacterWindow.xaml

@@ -16,13 +16,19 @@
             </BoxContainer>
 
             <!-- WD EDIT -->
-            <Label Text="{Loc 'character-info-memories-label'}" HorizontalAlignment="Center" />
+            <Label Text="Память:" HorizontalAlignment="Center" />
             <BoxContainer Orientation="Vertical" Name="Memories" Access="Public" />
             <cc:Placeholder Name="MemoriesPlaceholder" Access="Public"
                             PlaceholderText="{Loc 'character-info-memories-placeholder-text'}" />
             <!-- WD EDIT END -->
 
-            <Label Name="ObjectivesLabel" Access="Public" Text="{Loc 'character-info-objectives-label'}"
+            <Label Text="Статы:" HorizontalAlignment="Center" />
+            <RichTextLabel Name="StatsLabel" Access="Public" HorizontalAlignment="Left" HorizontalExpand="True"/>
+
+            <Label Text="Скиллы:" HorizontalAlignment="Center" />
+            <RichTextLabel Name="SkillsLabel" Access="Public" HorizontalAlignment="Left" HorizontalExpand="True"/>
+
+            <Label Name="ObjectivesLabel" Access="Public" Text="Цели:"
                    HorizontalAlignment="Center" />
             <BoxContainer Orientation="Vertical" Name="Objectives" Access="Public" />
             <cc:Placeholder Name="RolePlaceholder" Access="Public"

Content.Client/_Lfwb/CombatMusic.cs

@@ -0,0 +1,111 @@
+using Content.Client.Audio;
+using Content.Client.CombatMode;
+using Content.Shared.CombatMode;
+using Content.Shared.GameTicking;
+using Robust.Client.Player;
+using Robust.Client.ResourceManagement;
+using Robust.Shared.Audio;
+using Robust.Shared.Audio.Systems;
+using Robust.Shared.Player;
+using Robust.Shared.Prototypes;
+
+namespace Content.Client._Lfwb;
+
+public sealed class CombatMusic : EntitySystem
+{
+    #region Values
+
+    private EntityUid? _combatMusicStream;
+
+    #endregion
+
+    #region Dependencies
+
+    [Dependency] private readonly SharedAudioSystem _audio = default!;
+    [Dependency] private readonly ContentAudioSystem _contentAudio = default!;
+    [Dependency] private readonly CombatModeSystem _combat = default!;
+    [Dependency] private readonly IResourceCache _resource = default!;
+    [Dependency] private readonly IPrototypeManager _proto = default!;
+    [Dependency] private readonly IPlayerManager _playerManager = default!;
+
+    #endregion
+
+    #region Event Handling
+
+    public override void Initialize()
+    {
+        base.Initialize();
+
+        PreloadTracks();
+
+        SubscribeLocalEvent<CombatModeComponent, PlayerDetachedEvent>(OnPlayerDetached);
+
+        SubscribeLocalEvent<RoundRestartCleanupEvent>(OnRestart);
+
+        _combat.LocalPlayerCombatModeUpdated += OnCombatModeUpdated;
+    }
+
+    public override void Shutdown()
+    {
+        base.Shutdown();
+
+        _combat.LocalPlayerCombatModeUpdated -= OnCombatModeUpdated;
+
+        _audio.Stop(_combatMusicStream);
+    }
+
+    #endregion
+
+
+    #region Main Process
+
+    private void OnCombatModeUpdated(bool inCombatMode)
+    {
+        (inCombatMode ? (Action) StartCombatMusic : StopCombatMusic).Invoke();
+    }
+
+    private void OnPlayerDetached(EntityUid uid, CombatModeComponent component, PlayerDetachedEvent args)
+    {
+        if (args.Player != _playerManager.LocalSession)
+            return;
+
+        StopCombatMusic();
+    }
+
+    private void OnRestart(RoundRestartCleanupEvent args)
+    {
+        StopCombatMusic();
+    }
+
+    #endregion
+
+
+    #region Helpers
+
+    private void PreloadTracks()
+    {
+        foreach (var audio in _proto.Index<SoundCollectionPrototype>("CombatMusic").PickFiles)
+        {
+            _resource.GetResource<AudioResource>(audio.ToString());
+        }
+    }
+
+    private void StartCombatMusic()
+    {
+        var stream = _audio.PlayGlobal(new SoundCollectionSpecifier("CombatMusic"), Filter.Local(), false, AudioParams.Default.WithLoop(true).WithVolume(-4));
+
+        if (!stream.HasValue)
+            return;
+
+        _combatMusicStream = stream.Value.Entity;
+        _contentAudio.FadeIn(_combatMusicStream, stream.Value.Component, 3f);
+    }
+
+    private void StopCombatMusic()
+    {
+        _contentAudio.FadeOut(_combatMusicStream);
+        _combatMusicStream = null;
+    }
+
+    #endregion
+}

Content.Server/Chat/Managers/ChatManager.cs

@@ -19,6 +19,7 @@
 using Robust.Server.Player;
 using Robust.Shared.Asynchronous;
 using Robust.Shared.Configuration;
+using Robust.Shared.Console;
 using Robust.Shared.Network;
 using Robust.Shared.Player;
 using Robust.Shared.Replays;
@@ -58,6 +59,7 @@ internal sealed partial class ChatManager : IChatManager
         [Dependency] private readonly IGameTiming _timing = default!;
         [Dependency] private readonly ReputationManager _repManager = default!;
         [Dependency] private readonly ITaskManager _taskManager = default!;
+        [Dependency] private readonly IConsoleHost _consoleHost = default!;
         /// WD-EDIT
 
         /// <summary>
@@ -407,6 +409,18 @@ public void ChatMessageToOne(ChatChannel channel, string message, string wrapped
             }
         }
 
+        public void ChatMessageToManyButHueta(Filter filter, string message)
+        {
+            if (!filter.Recipients.Any())
+                return;
+
+            var clients = filter.Recipients.ToList();
+            foreach (var client in clients)
+            {
+                _consoleHost.RemoteExecuteCommand(client, $"notice [font size=15][color=#890000]{message}[/color][/font]");
+            }
+        }
+
         public void ChatMessageToMany(ChatChannel channel, string message, string wrappedMessage, EntityUid source, bool hideChat, bool recordReplay, IEnumerable<INetChannel> clients, Color? colorOverride = null, string? audioPath = null, float audioVolume = 0, NetUserId? author = null)
         {
             ChatMessageToMany(channel, message, wrappedMessage, source, hideChat, recordReplay, clients.ToList(),

Content.Server/Chat/Managers/IChatManager.cs

@@ -35,6 +35,8 @@ public interface IChatManager
         void ChatMessageToOne(ChatChannel channel, string message, string wrappedMessage, EntityUid source, bool hideChat,
             INetChannel client, Color? colorOverride = null, bool recordReplay = false, string? audioPath = null, float audioVolume = 0, NetUserId? author = null);
 
+        void ChatMessageToManyButHueta(Filter filter, string message);
+
         void ChatMessageToMany(ChatChannel channel, string message, string wrappedMessage, EntityUid source, bool hideChat, bool recordReplay,
             IEnumerable<INetChannel> clients, Color? colorOverride = null, string? audioPath = null, float audioVolume = 0, NetUserId? author = null);
 

Content.Server/HealthExaminable/HealthExaminableSystem.cs

@@ -1,4 +1,5 @@
-using Content.Shared.Damage;
+using Content.Shared._Lfwb.Skills;
+using Content.Shared.Damage;
 using Content.Shared.Examine;
 using Content.Shared.FixedPoint;
 using Content.Shared.IdentityManagement;
@@ -10,6 +11,7 @@ namespace Content.Server.HealthExaminable;
 public sealed class HealthExaminableSystem : EntitySystem
 {
     [Dependency] private readonly ExamineSystemShared _examineSystem = default!;
+    [Dependency] private readonly SharedSkillsSystem _skillsSystem = default!;
 
     public override void Initialize()
     {
@@ -20,6 +22,10 @@ public override void Initialize()
 
     private void OnGetExamineVerbs(EntityUid uid, HealthExaminableComponent component, GetVerbsEvent<ExamineVerb> args)
     {
+        var skillLevel = _skillsSystem.GetSkillLevel(args.User, Skill.Medicine);
+        if (skillLevel < SkillLevel.Skilled)
+            return;
+
         if (!TryComp<DamageableComponent>(uid, out var damage))
             return;
 

Content.Server/Medical/DefibrillatorSystem.cs

@@ -7,6 +7,8 @@
 using Content.Server.Popups;
 using Content.Server.PowerCell;
 using Content.Server.Traits.Assorted;
+using Content.Shared._Lfwb.Skills;
+using Content.Shared._Lfwb.Stats;
 using Content.Shared.Damage;
 using Content.Shared.DoAfter;
 using Content.Shared.Interaction;
@@ -46,6 +48,8 @@ public sealed class DefibrillatorSystem : EntitySystem
     [Dependency] private readonly SharedAudioSystem _audio = default!;
     [Dependency] private readonly UseDelaySystem _useDelay = default!;
     [Dependency] private readonly SharedMindSystem _mind = default!;
+    [Dependency] private readonly SharedSkillsSystem _skillsSystem = default!;
+    [Dependency] private readonly SharedStatsSystem _statsSystem = default!;
 
     /// <inheritdoc/>
     public override void Initialize()
@@ -174,7 +178,7 @@ public bool TryStartZap(EntityUid uid, EntityUid target, EntityUid user, Defibri
             return false;
 
         _audio.PlayPvs(component.ChargeSound, uid);
-        return _doAfter.TryStartDoAfter(new DoAfterArgs(EntityManager, user, component.DoAfterDuration, new DefibrillatorZapDoAfterEvent(),
+        return _doAfter.TryStartDoAfter(new DoAfterArgs(EntityManager, user, _skillsSystem.SkillLevelToDelay[_skillsSystem.GetSkillLevel(user, Skill.Medicine)], new DefibrillatorZapDoAfterEvent(),
             uid, target, uid)
             {
                 BlockDuplicate = true,
@@ -188,11 +192,17 @@ public void Zap(EntityUid uid, EntityUid target, EntityUid user, DefibrillatorCo
         if (!Resolve(uid, ref component) || !Resolve(target, ref mob, ref thresholds, false))
             return;
 
-        // clowns zap themselves
-        if (HasComp<ClumsyComponent>(user) && user != target)
+        if (_skillsSystem.GetSkillLevel(user, Skill.Medicine) == SkillLevel.Weak)
         {
-            Zap(uid, user, user, component);
-            return;
+            var intStat = _statsSystem.GetStat(user, Stat.Intelligence);
+            var (_, response, result) = _statsSystem.D20(intStat);
+
+            if (!result)
+            {
+                _popup.PopupEntity(response, user, user);
+                _electrocution.TryDoElectrocution(user, null, component.ZapDamage, component.WritheDuration, true, ignoreInsulation: true);
+                return;
+            }
         }
 
         if (!_powerCell.TryUseActivatableCharge(uid, user: user))
@@ -251,6 +261,8 @@ public void Zap(EntityUid uid, EntityUid target, EntityUid user, DefibrillatorCo
             : component.SuccessSound;
         _audio.PlayPvs(sound, uid);
 
+        _skillsSystem.ApplySkillThreshold(user, Skill.Medicine, 10);
+
         // if we don't have enough power left for another shot, turn it off
         if (!_powerCell.HasActivatableCharge(uid))
             TryDisable(uid, component);