voicemask can select speech verb (#25768)
* add Name field to SpeechVerbPrototype * extra locale for voice mask ui * SpeechVerb ui and handling * raaaaaaaaa * reeeeeeeeal Co-authored-by: Tayrtahn <tayrtahn@gmail.com> * fix sort * did you hear john syndicate died of ligma * Update Content.Client/VoiceMask/VoiceMaskNameChangeWindow.xaml --------- Co-authored-by: deltanedas <@deltanedas:kde.org> Co-authored-by: Tayrtahn <tayrtahn@gmail.com> Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
This commit is contained in:
@@ -21,6 +21,7 @@ public sealed partial class VoiceMaskSystem
|
||||
|
||||
var comp = EnsureComp<VoiceMaskComponent>(user);
|
||||
comp.VoiceName = component.LastSetName;
|
||||
comp.SpeechVerb = component.LastSpeechVerb;
|
||||
|
||||
_actions.AddAction(user, ref component.ActionEntity, component.Action, uid);
|
||||
}
|
||||
@@ -30,15 +31,23 @@ public sealed partial class VoiceMaskSystem
|
||||
RemComp<VoiceMaskComponent>(args.Equipee);
|
||||
}
|
||||
|
||||
private void TrySetLastKnownName(EntityUid maskWearer, string lastName)
|
||||
private VoiceMaskerComponent? TryGetMask(EntityUid user)
|
||||
{
|
||||
if (!HasComp<VoiceMaskComponent>(maskWearer)
|
||||
|| !_inventory.TryGetSlotEntity(maskWearer, MaskSlot, out var maskEntity)
|
||||
|| !TryComp<VoiceMaskerComponent>(maskEntity, out var maskComp))
|
||||
{
|
||||
return;
|
||||
}
|
||||
if (!HasComp<VoiceMaskComponent>(user) || !_inventory.TryGetSlotEntity(user, MaskSlot, out var maskEntity))
|
||||
return null;
|
||||
|
||||
maskComp.LastSetName = lastName;
|
||||
return CompOrNull<VoiceMaskerComponent>(maskEntity);
|
||||
}
|
||||
|
||||
private void TrySetLastKnownName(EntityUid user, string name)
|
||||
{
|
||||
if (TryGetMask(user) is {} comp)
|
||||
comp.LastSetName = name;
|
||||
}
|
||||
|
||||
private void TrySetLastSpeechVerb(EntityUid user, string? verb)
|
||||
{
|
||||
if (TryGetMask(user) is {} comp)
|
||||
comp.LastSpeechVerb = verb;
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user