Voice Mask refactor (#30798)
* First commit * Added base.Initialize() * Voice wire fix (Electricty name) * Various minor cleanups * Localized default voice mask name * Added VoiceOverride stuff * Removed unused stuff * Typo * Better localized stuff * Typo / spelling stuff / comments * Blessed
This commit is contained in:
beck-thompson
@@ -1,113 +1,103 @@
|
||||
using Content.Server.Administration.Logs;
|
||||
using Content.Server.Chat.Systems;
|
||||
using Content.Server.Popups;
|
||||
using Content.Shared.Actions;
|
||||
using Content.Shared.Administration.Logs;
|
||||
using Content.Shared.Chat;
|
||||
using Content.Shared.Clothing;
|
||||
using Content.Shared.Database;
|
||||
using Content.Shared.Inventory;
|
||||
using Content.Shared.Popups;
|
||||
using Content.Shared.Preferences;
|
||||
using Content.Shared.Speech;
|
||||
using Content.Shared.VoiceMask;
|
||||
using Robust.Server.GameObjects;
|
||||
using Robust.Shared.Player;
|
||||
using Robust.Shared.Prototypes;
|
||||
|
||||
namespace Content.Server.VoiceMask;
|
||||
|
||||
public sealed partial class VoiceMaskSystem : EntitySystem
|
||||
{
|
||||
[Dependency] private readonly UserInterfaceSystem _uiSystem = default!;
|
||||
[Dependency] private readonly PopupSystem _popupSystem = default!;
|
||||
[Dependency] private readonly IAdminLogManager _adminLogger = default!;
|
||||
[Dependency] private readonly SharedUserInterfaceSystem _uiSystem = default!;
|
||||
[Dependency] private readonly SharedPopupSystem _popupSystem = default!;
|
||||
[Dependency] private readonly ISharedAdminLogManager _adminLogger = default!;
|
||||
[Dependency] private readonly IPrototypeManager _proto = default!;
|
||||
[Dependency] private readonly SharedActionsSystem _actions = default!;
|
||||
|
||||
public override void Initialize()
|
||||
{
|
||||
SubscribeLocalEvent<VoiceMaskComponent, TransformSpeakerNameEvent>(OnSpeakerNameTransform);
|
||||
base.Initialize();
|
||||
SubscribeLocalEvent<VoiceMaskComponent, InventoryRelayedEvent<TransformSpeakerNameEvent>>(OnTransformSpeakerName);
|
||||
SubscribeLocalEvent<VoiceMaskComponent, VoiceMaskChangeNameMessage>(OnChangeName);
|
||||
SubscribeLocalEvent<VoiceMaskComponent, VoiceMaskChangeVerbMessage>(OnChangeVerb);
|
||||
SubscribeLocalEvent<VoiceMaskComponent, WearerMaskToggledEvent>(OnMaskToggled);
|
||||
SubscribeLocalEvent<VoiceMaskerComponent, ClothingGotEquippedEvent>(OnEquip);
|
||||
SubscribeLocalEvent<VoiceMaskerComponent, ClothingGotUnequippedEvent>(OnUnequip);
|
||||
SubscribeLocalEvent<VoiceMaskSetNameEvent>(OnSetName);
|
||||
// SubscribeLocalEvent<VoiceMaskerComponent, GetVerbsEvent<AlternativeVerb>>(GetVerbs);
|
||||
SubscribeLocalEvent<VoiceMaskComponent, ClothingGotEquippedEvent>(OnEquip);
|
||||
SubscribeLocalEvent<VoiceMaskSetNameEvent>(OpenUI);
|
||||
}
|
||||
|
||||
private void OnSetName(VoiceMaskSetNameEvent ev)
|
||||
private void OnTransformSpeakerName(Entity<VoiceMaskComponent> entity, ref InventoryRelayedEvent<TransformSpeakerNameEvent> args)
|
||||
{
|
||||
OpenUI(ev.Performer);
|
||||
args.Args.VoiceName = GetCurrentVoiceName(entity);
|
||||
args.Args.SpeechVerb = entity.Comp.VoiceMaskSpeechVerb ?? args.Args.SpeechVerb;
|
||||
}
|
||||
|
||||
private void OnChangeName(EntityUid uid, VoiceMaskComponent component, VoiceMaskChangeNameMessage message)
|
||||
#region User inputs from UI
|
||||
private void OnChangeVerb(Entity<VoiceMaskComponent> entity, ref VoiceMaskChangeVerbMessage msg)
|
||||
{
|
||||
if (msg.Verb is { } id && !_proto.HasIndex<SpeechVerbPrototype>(id))
|
||||
return;
|
||||
|
||||
entity.Comp.VoiceMaskSpeechVerb = msg.Verb;
|
||||
// verb is only important to metagamers so no need to log as opposed to name
|
||||
|
||||
_popupSystem.PopupEntity(Loc.GetString("voice-mask-popup-success"), entity, msg.Actor);
|
||||
|
||||
UpdateUI(entity);
|
||||
}
|
||||
|
||||
private void OnChangeName(Entity<VoiceMaskComponent> entity, ref VoiceMaskChangeNameMessage message)
|
||||
{
|
||||
if (message.Name.Length > HumanoidCharacterProfile.MaxNameLength || message.Name.Length <= 0)
|
||||
{
|
||||
_popupSystem.PopupEntity(Loc.GetString("voice-mask-popup-failure"), uid, message.Actor, PopupType.SmallCaution);
|
||||
_popupSystem.PopupEntity(Loc.GetString("voice-mask-popup-failure"), entity, message.Actor, PopupType.SmallCaution);
|
||||
return;
|
||||
}
|
||||
|
||||
component.VoiceName = message.Name;
|
||||
_adminLogger.Add(LogType.Action, LogImpact.Medium, $"{ToPrettyString(message.Actor):player} set voice of {ToPrettyString(uid):mask}: {component.VoiceName}");
|
||||
entity.Comp.VoiceMaskName = message.Name;
|
||||
_adminLogger.Add(LogType.Action, LogImpact.Medium, $"{ToPrettyString(message.Actor):player} set voice of {ToPrettyString(entity):mask}: {entity.Comp.VoiceMaskName}");
|
||||
|
||||
_popupSystem.PopupEntity(Loc.GetString("voice-mask-popup-success"), uid, message.Actor);
|
||||
_popupSystem.PopupEntity(Loc.GetString("voice-mask-popup-success"), entity, message.Actor);
|
||||
|
||||
TrySetLastKnownName(uid, message.Name);
|
||||
UpdateUI(entity);
|
||||
}
|
||||
#endregion
|
||||
|
||||
UpdateUI(uid, component);
|
||||
#region UI
|
||||
private void OnEquip(EntityUid uid, VoiceMaskComponent component, ClothingGotEquippedEvent args)
|
||||
{
|
||||
_actions.AddAction(args.Wearer, ref component.ActionEntity, component.Action, uid);
|
||||
}
|
||||
|
||||
private void OnChangeVerb(Entity<VoiceMaskComponent> ent, ref VoiceMaskChangeVerbMessage msg)
|
||||
private void OpenUI(VoiceMaskSetNameEvent ev)
|
||||
{
|
||||
if (msg.Verb is {} id && !_proto.HasIndex<SpeechVerbPrototype>(id))
|
||||
var maskEntity = ev.Action.Comp.Container;
|
||||
|
||||
if (!TryComp<VoiceMaskComponent>(maskEntity, out var voiceMaskComp))
|
||||
return;
|
||||
|
||||
ent.Comp.SpeechVerb = msg.Verb;
|
||||
// verb is only important to metagamers so no need to log as opposed to name
|
||||
|
||||
_popupSystem.PopupEntity(Loc.GetString("voice-mask-popup-success"), ent, msg.Actor);
|
||||
|
||||
TrySetLastSpeechVerb(ent, msg.Verb);
|
||||
|
||||
UpdateUI(ent, ent.Comp);
|
||||
}
|
||||
|
||||
private void OnSpeakerNameTransform(EntityUid uid, VoiceMaskComponent component, TransformSpeakerNameEvent args)
|
||||
{
|
||||
if (component.Enabled)
|
||||
{
|
||||
/*
|
||||
args.Name = _idCard.TryGetIdCard(uid, out var card) && !string.IsNullOrEmpty(card.FullName)
|
||||
? card.FullName
|
||||
: Loc.GetString("voice-mask-unknown");
|
||||
*/
|
||||
|
||||
args.Name = component.VoiceName;
|
||||
if (component.SpeechVerb != null)
|
||||
args.SpeechVerb = component.SpeechVerb;
|
||||
}
|
||||
}
|
||||
|
||||
private void OnMaskToggled(Entity<VoiceMaskComponent> ent, ref WearerMaskToggledEvent args)
|
||||
{
|
||||
ent.Comp.Enabled = !args.IsToggled;
|
||||
}
|
||||
|
||||
private void OpenUI(EntityUid player)
|
||||
{
|
||||
if (!_uiSystem.HasUi(player, VoiceMaskUIKey.Key))
|
||||
if (!_uiSystem.HasUi(maskEntity.Value, VoiceMaskUIKey.Key))
|
||||
return;
|
||||
|
||||
_uiSystem.OpenUi(player, VoiceMaskUIKey.Key, player);
|
||||
UpdateUI(player);
|
||||
_uiSystem.OpenUi(maskEntity.Value, VoiceMaskUIKey.Key, ev.Performer);
|
||||
UpdateUI((maskEntity.Value, voiceMaskComp));
|
||||
}
|
||||
|
||||
private void UpdateUI(EntityUid owner, VoiceMaskComponent? component = null)
|
||||
private void UpdateUI(Entity<VoiceMaskComponent> entity)
|
||||
{
|
||||
if (!Resolve(owner, ref component))
|
||||
{
|
||||
return;
|
||||
}
|
||||
|
||||
if (_uiSystem.HasUi(owner, VoiceMaskUIKey.Key))
|
||||
_uiSystem.SetUiState(owner, VoiceMaskUIKey.Key, new VoiceMaskBuiState(component.VoiceName, component.SpeechVerb));
|
||||
if (_uiSystem.HasUi(entity, VoiceMaskUIKey.Key))
|
||||
_uiSystem.SetUiState(entity.Owner, VoiceMaskUIKey.Key, new VoiceMaskBuiState(GetCurrentVoiceName(entity), entity.Comp.VoiceMaskSpeechVerb));
|
||||
}
|
||||
#endregion
|
||||
|
||||
#region Helper functions
|
||||
private string GetCurrentVoiceName(Entity<VoiceMaskComponent> entity)
|
||||
{
|
||||
return entity.Comp.VoiceMaskName ?? Loc.GetString("voice-mask-default-name-override");
|
||||
}
|
||||
#endregion
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user