From ad592313a96b68a574466b945da2448101425172 Mon Sep 17 00:00:00 2001 From: SlamBamActionman <83650252+SlamBamActionman@users.noreply.github.com> Date: Fri, 23 Aug 2024 11:14:38 +0200 Subject: [PATCH] Add codeword highlighting (#30092) * Added codeword highlighting * Updated to support more codeword roles, color is set serverside * Review feedback * Change to a Component-based system using SessionSpecific * Tidied up CanGetState, set Access restrictions on component * Clean-up * Makes the injection ignore brackets, restore some codewords, remove "Taste/Touch" from adjectives --- Content.Client/Roles/RoleCodewordSystem.cs | 8 +++ .../Systems/Chat/ChatUIController.cs | 18 +++++++ .../GameTicking/Rules/TraitorRuleSystem.cs | 14 +++++- .../Roles/RoleCodeword/RoleCodewordSystem.cs | 8 +++ Content.Shared/Chat/SharedChatSystem.cs | 13 +++++ .../RoleCodeword/RoleCodewordComponent.cs | 37 ++++++++++++++ .../RoleCodeword/SharedRoleCodewordSystem.cs | 49 +++++++++++++++++++ Resources/Prototypes/Datasets/adjectives.yml | 1 - Resources/Prototypes/Datasets/verbs.yml | 3 +- 9 files changed, 146 insertions(+), 5 deletions(-) create mode 100644 Content.Client/Roles/RoleCodewordSystem.cs create mode 100644 Content.Server/Roles/RoleCodeword/RoleCodewordSystem.cs create mode 100644 Content.Shared/Roles/RoleCodeword/RoleCodewordComponent.cs create mode 100644 Content.Shared/Roles/RoleCodeword/SharedRoleCodewordSystem.cs diff --git a/Content.Client/Roles/RoleCodewordSystem.cs b/Content.Client/Roles/RoleCodewordSystem.cs new file mode 100644 index 000000000000..8cc2e93099f0 --- /dev/null +++ b/Content.Client/Roles/RoleCodewordSystem.cs @@ -0,0 +1,8 @@ +using Content.Shared.Roles.RoleCodeword; + +namespace Content.Client.Roles; + +public sealed class RoleCodewordSystem : SharedRoleCodewordSystem +{ + +} diff --git a/Content.Client/UserInterface/Systems/Chat/ChatUIController.cs b/Content.Client/UserInterface/Systems/Chat/ChatUIController.cs index 4bfea889a10e..dd8aeee9f54c 100644 --- a/Content.Client/UserInterface/Systems/Chat/ChatUIController.cs +++ b/Content.Client/UserInterface/Systems/Chat/ChatUIController.cs @@ -9,6 +9,8 @@ using Content.Client.Examine; using Content.Client.Gameplay; using Content.Client.Ghost; +using Content.Client.Mind; +using Content.Client.Roles; using Content.Client.Stylesheets; using Content.Client.UserInterface.Screens; using Content.Client.UserInterface.Systems.Chat.Widgets; @@ -21,6 +23,7 @@ using Content.Shared.Examine; using Content.Shared.Input; using Content.Shared.Radio; +using Content.Shared.Roles.RoleCodeword; using Robust.Client.GameObjects; using Robust.Client.Graphics; using Robust.Client.Input; @@ -62,6 +65,8 @@ public sealed class ChatUIController : UIController [UISystemDependency] private readonly ChatSystem? _chatSys = default; [UISystemDependency] private readonly PsionicChatUpdateSystem? _psionic = default!; //Nyano - Summary: makes the psionic chat available. [UISystemDependency] private readonly TransformSystem? _transform = default; + [UISystemDependency] private readonly MindSystem? _mindSystem = default!; + [UISystemDependency] private readonly RoleCodewordSystem? _roleCodewordSystem = default!; [ValidatePrototypeId] private const string ChatNamePalette = "ChatNames"; @@ -833,6 +838,19 @@ public void ProcessChatMessage(ChatMessage msg, bool speechBubble = true) msg.WrappedMessage = SharedChatSystem.InjectTagInsideTag(msg, "Name", "color", GetNameColor(SharedChatSystem.GetStringInsideTag(msg, "Name"))); } + // Color any codewords for minds that have roles that use them + if (_player.LocalUser != null && _mindSystem != null && _roleCodewordSystem != null) + { + if (_mindSystem.TryGetMind(_player.LocalUser.Value, out var mindId) && _ent.TryGetComponent(mindId, out RoleCodewordComponent? codewordComp)) + { + foreach (var (_, codewordData) in codewordComp.RoleCodewords) + { + foreach (string codeword in codewordData.Codewords) + msg.WrappedMessage = SharedChatSystem.InjectTagAroundString(msg, codeword, "color", codewordData.Color.ToHex()); + } + } + } + // Log all incoming chat to repopulate when filter is un-toggled if (!msg.HideChat) { diff --git a/Content.Server/GameTicking/Rules/TraitorRuleSystem.cs b/Content.Server/GameTicking/Rules/TraitorRuleSystem.cs index f50868e2f5f8..51545c6ce50d 100644 --- a/Content.Server/GameTicking/Rules/TraitorRuleSystem.cs +++ b/Content.Server/GameTicking/Rules/TraitorRuleSystem.cs @@ -12,8 +12,10 @@ using Content.Shared.NPC.Systems; using Content.Shared.Objectives.Components; using Content.Shared.PDA; +using Content.Shared.Radio; using Content.Shared.Roles; using Content.Shared.Roles.Jobs; +using Content.Shared.Roles.RoleCodeword; using Robust.Shared.Prototypes; using Robust.Shared.Random; using System.Linq; @@ -25,6 +27,8 @@ namespace Content.Server.GameTicking.Rules; public sealed class TraitorRuleSystem : GameRuleSystem { + private static readonly Color TraitorCodewordColor = Color.FromHex("#cc3b3b"); + [Dependency] private readonly IPrototypeManager _prototypeManager = default!; [Dependency] private readonly IRobustRandom _random = default!; [Dependency] private readonly NpcFactionSystem _npcFaction = default!; @@ -34,6 +38,7 @@ public sealed class TraitorRuleSystem : GameRuleSystem [Dependency] private readonly SharedRoleSystem _roleSystem = default!; [Dependency] private readonly SharedJobSystem _jobs = default!; [Dependency] private readonly ObjectivesSystem _objectives = default!; + [Dependency] private readonly SharedRoleCodewordSystem _roleCodewordSystem = default!; public override void Initialize() { @@ -120,12 +125,17 @@ public bool MakeTraitor(EntityUid traitor, TraitorRuleComponent component) Briefing = briefing }, mind, true); - // Don't Change the faction, this was stupid. + // Send codewords to only the traitor client + var color = TraitorCodewordColor; // Fall back to a dark red Syndicate color if a prototype is not found + + RoleCodewordComponent codewordComp = EnsureComp(mindId); + _roleCodewordSystem.SetRoleCodewords(codewordComp, "traitor", component.Codewords.ToList(), color); + + // Don't change the faction, this was stupid. //_npcFaction.RemoveFaction(traitor, component.NanoTrasenFaction, false); //_npcFaction.AddFaction(traitor, component.SyndicateFaction); RaiseLocalEvent(traitor, new MoodEffectEvent("TraitorFocused")); - return true; } diff --git a/Content.Server/Roles/RoleCodeword/RoleCodewordSystem.cs b/Content.Server/Roles/RoleCodeword/RoleCodewordSystem.cs new file mode 100644 index 000000000000..a93d0f773b99 --- /dev/null +++ b/Content.Server/Roles/RoleCodeword/RoleCodewordSystem.cs @@ -0,0 +1,8 @@ +using Content.Shared.Roles.RoleCodeword; + +namespace Content.Server.Roles.RoleCodeword; + +public sealed class RoleCodewordSystem : SharedRoleCodewordSystem +{ + +} diff --git a/Content.Shared/Chat/SharedChatSystem.cs b/Content.Shared/Chat/SharedChatSystem.cs index 8b4dfb377fdd..ff2a30ccbdb9 100644 --- a/Content.Shared/Chat/SharedChatSystem.cs +++ b/Content.Shared/Chat/SharedChatSystem.cs @@ -1,4 +1,5 @@ using System.Collections.Frozen; +using System.Text.RegularExpressions; using Content.Shared.Popups; using Content.Shared.Radio; using Content.Shared.Speech; @@ -239,6 +240,18 @@ public static string InjectTagInsideTag(ChatMessage message, string outerTag, st return rawmsg; } + + /// + /// Injects a tag around all found instances of a specific string in a ChatMessage. + /// Excludes strings inside other tags and brackets. + /// + public static string InjectTagAroundString(ChatMessage message, string targetString, string tag, string? tagParameter) + { + var rawmsg = message.WrappedMessage; + rawmsg = Regex.Replace(rawmsg, "(?i)(" + targetString + ")(?-i)(?![^[]*])", $"[{tag}={tagParameter}]$1[/{tag}]"); + return rawmsg; + } + public static string GetStringInsideTag(ChatMessage message, string tag) { var rawmsg = message.WrappedMessage; diff --git a/Content.Shared/Roles/RoleCodeword/RoleCodewordComponent.cs b/Content.Shared/Roles/RoleCodeword/RoleCodewordComponent.cs new file mode 100644 index 000000000000..a1723dbc7ec2 --- /dev/null +++ b/Content.Shared/Roles/RoleCodeword/RoleCodewordComponent.cs @@ -0,0 +1,37 @@ +using Robust.Shared.GameStates; +using Robust.Shared.Prototypes; +using Robust.Shared.Serialization; + +namespace Content.Shared.Roles.RoleCodeword; + +/// +/// Used to display and highlight codewords in chat messages on the client. +/// +[RegisterComponent, NetworkedComponent, AutoGenerateComponentState, Access(typeof(SharedRoleCodewordSystem), Other = AccessPermissions.Read)] +public sealed partial class RoleCodewordComponent : Component +{ + /// + /// Contains the codewords tied to a role. + /// Key string should be unique for the role. + /// + [DataField, AutoNetworkedField] + public Dictionary RoleCodewords = new(); + + public override bool SessionSpecific => true; +} + +[DataDefinition, Serializable, NetSerializable] +public partial struct CodewordsData +{ + [DataField] + public Color Color; + + [DataField] + public List Codewords; + + public CodewordsData(Color color, List codewords) + { + Color = color; + Codewords = codewords; + } +} diff --git a/Content.Shared/Roles/RoleCodeword/SharedRoleCodewordSystem.cs b/Content.Shared/Roles/RoleCodeword/SharedRoleCodewordSystem.cs new file mode 100644 index 000000000000..9f860715fbd7 --- /dev/null +++ b/Content.Shared/Roles/RoleCodeword/SharedRoleCodewordSystem.cs @@ -0,0 +1,49 @@ +using Content.Shared.Mind; +using Robust.Shared.GameStates; +using Robust.Shared.Player; + +namespace Content.Shared.Roles.RoleCodeword; + +public abstract class SharedRoleCodewordSystem : EntitySystem +{ + [Dependency] private readonly SharedMindSystem _mindSystem = default!; + + public override void Initialize() + { + base.Initialize(); + + SubscribeLocalEvent(OnCodewordCompGetStateAttempt); + } + + /// + /// Determines if a codeword component should be sent to the client. + /// + private void OnCodewordCompGetStateAttempt(EntityUid uid, RoleCodewordComponent comp, ref ComponentGetStateAttemptEvent args) + { + args.Cancelled = !CanGetState(args.Player, comp); + } + + /// + /// The criteria that determine whether a codeword component should be sent to a client. + /// Sends the component if its owner is the player mind. + /// + /// The Player the component will be sent to. + /// The component being checked against + /// + private bool CanGetState(ICommonSession? player, RoleCodewordComponent comp) + { + if (!_mindSystem.TryGetMind(player, out EntityUid mindId, out var _)) + return false; + + if (!TryComp(mindId, out RoleCodewordComponent? playerComp) && comp != playerComp) + return false; + + return true; + } + + public void SetRoleCodewords(RoleCodewordComponent comp, string key, List codewords, Color color) + { + var data = new CodewordsData(color, codewords); + comp.RoleCodewords[key] = data; + } +} diff --git a/Resources/Prototypes/Datasets/adjectives.yml b/Resources/Prototypes/Datasets/adjectives.yml index 86fb29095217..fd243a88696d 100644 --- a/Resources/Prototypes/Datasets/adjectives.yml +++ b/Resources/Prototypes/Datasets/adjectives.yml @@ -314,7 +314,6 @@ - slow - swift - young - - Taste/Touch - bitter - delicious - fresh diff --git a/Resources/Prototypes/Datasets/verbs.yml b/Resources/Prototypes/Datasets/verbs.yml index f53c18a71bf7..ce2453702137 100644 --- a/Resources/Prototypes/Datasets/verbs.yml +++ b/Resources/Prototypes/Datasets/verbs.yml @@ -1,4 +1,4 @@ -- type: dataset +- type: dataset id: verbs values: - accept @@ -616,7 +616,6 @@ - whine - whip - whirl - - whisper - whistle - wink - wipe