[TWEAK] Обнова КПБ - визуал и звуки

Content.Client/ADT/Lobby/UI/QuirksWindow.xaml.cs

@@ -41,7 +41,12 @@ public void Populate(HumanoidCharacterProfile profile)
         else
             SelectedQuirksLabel.SetMessage(Loc.GetString("quirks-window-selected-none"), null, Color.White);
 
-        var protoList = _proto.EnumeratePrototypes<TraitPrototype>().Where(x => x.Quirk && !x.SpeciesBlacklist.Contains(profile.Species)).ToList();
+        var protoList = _proto.EnumeratePrototypes<TraitPrototype>()
+            .Where(x => x.Quirk
+                        && (x.SpeciesWhitelist.Count == 0 || x.SpeciesWhitelist.Contains(profile.Species))
+                        && !x.SpeciesBlacklist.Contains(profile.Species))
+            .ToList();
+
         protoList.Sort((x, y) => Loc.GetString(x.Name)[0].CompareTo(Loc.GetString(y.Name)[0]));
         protoList.Sort((x, y) => x.Cost.CompareTo(y.Cost));
 

Content.Client/ADT/MidroundCustomization/MidroundCustomizationBoundUserInterface.cs

@@ -22,6 +22,7 @@ protected override void Open()
         _window.OnSlotColorChanged += args => SendMessage(new MidroundCustomizationChangeColorMessage(args.Category, args.Colors, args.Slot));
         _window.OnSlotAdded += args => SendMessage(new MidroundCustomizationAddSlotMessage(args));
         _window.OnSlotRemoved += args => SendMessage(new MidroundCustomizationRemoveSlotMessage(args.Category, args.Slot));
+        _window.OnPointLightColorToggled += enabled => SendMessage(new MidroundCustomizationPointLightColorToggleMessage(enabled));
 
         _window.OnVoiceChanged += voiceId => SendMessage(new MidroundCustomizationChangeVoiceMessage(voiceId, voiceId));
         _window.OnBarkProtoChanged += proto => SendMessage(new MidroundCustomizationChangeBarkProtoMessage(proto));

Content.Client/ADT/MidroundCustomization/MidroundCustomizationWindow.xaml

@@ -5,7 +5,7 @@
     <ScrollContainer HorizontalExpand="True" VerticalExpand="True" HScrollEnabled="False">
         <BoxContainer Name="VoiceContainer" Orientation="Vertical" Margin="8">
             <BoxContainer Orientation="Vertical" Margin="4" >
-                <Label Text="{Loc 'humanoid-profile-editor-voice-label'}" />
+                <Label Text="{Loc 'humanoid-profile-editor-voice-tab'}" />
                 <BoxContainer Orientation="Horizontal" Margin="0 4 0 0">
                     <OptionButton Name="VoiceButton" HorizontalExpand="True" />
                     <Button Name="VoicePlayButton" Text="{Loc 'humanoid-profile-editor-voice-play'}" MaxWidth="80" />
@@ -19,6 +19,7 @@
             <ScrollContainer HorizontalExpand="True" VerticalExpand="True" VScrollEnabled="False" HScrollEnabled="True">
                 <BoxContainer Name="MarkingsContainer" VerticalExpand="True" HorizontalExpand="True" Orientation="Horizontal" Margin="4"/>
             </ScrollContainer>
+            <CheckBox Name="PointLightColorCheckBox" Text="{Loc 'midround-customization-pointlight-color'}" Margin="8 12 8 8"/>
         </BoxContainer>
     </ScrollContainer>
 </DefaultWindow>

Content.Client/ADT/MidroundCustomization/MidroundCustomizationWindow.xaml.cs

@@ -29,6 +29,7 @@ public sealed partial class MidroundCustomizationWindow : DefaultWindow
     public Action<(MarkingCategories Category, int Slot, List<Color> Colors)>? OnSlotColorChanged;
     public Action<(MarkingCategories Category, int Slot)>? OnSlotRemoved;
     public Action<MarkingCategories>? OnSlotAdded;
+    public Action<bool>? OnPointLightColorToggled;
 
     public Action<string>? OnVoiceChanged;
     public Action<string>? OnBarkProtoChanged;
@@ -75,6 +76,10 @@ public MidroundCustomizationWindow()
 
         BarkProtoButton.OnPressed += _ => OpenBarkWindow();
         BarkPlayButton.OnPressed += _ => PlayPreviewBark();
+        PointLightColorCheckBox.OnToggled += args =>
+        {
+            OnPointLightColorToggled?.Invoke(args.Pressed);
+        };
 
         _voiceList = _prototypeManager
             .EnumeratePrototypes<TTSVoicePrototype>()
@@ -177,6 +182,12 @@ public void UpdateState(MidroundCustomizationUiState state)
             MarkingsContainer.AddChild(picker);
         }
 
+        PointLightColorCheckBox.Visible = state.PointLightColor;
+        if (state.PointLightColor)
+        {
+            PointLightColorCheckBox.Pressed = state.PointLightColorEnabled;
+        }
+
         if (state.TTS != null)
         {
             _currentVoice = state.TTS;

Content.Server/ADT/MidroundCustomization/MidroundCustomizationComponent.cs

@@ -2,12 +2,32 @@
 using Content.Shared.Humanoid.Markings;
 using Robust.Shared.Audio;
 using Robust.Shared.Prototypes;
+using Content.Shared.Mobs;
 
 namespace Content.Server.ADT.MidroundCustomization;
 
 /// <summary>
 /// Allows humanoids to change their appearance mid-round.
 /// </summary>
+[DataDefinition]
+public sealed partial class ChangeSlotOnStateEntry
+{
+    [DataField(required: true)]
+    public MobState State { get; set; }
+
+    [DataField(required: true)]
+    public MarkingCategories Category { get; set; }
+
+    [DataField(required: true)]
+    public int Slot { get; set; }
+
+    [DataField(required: true)]
+    public string Marking { get; set; } = string.Empty;
+
+    [DataField]
+    public List<Color> Colors { get; set; } = new();
+}
+
 [RegisterComponent]
 public sealed partial class MidroundCustomizationComponent : Component
 {
@@ -74,4 +94,20 @@ public sealed partial class MidroundCustomizationComponent : Component
     [DataField, AutoNetworkedField]
     public EntityUid? ActionEntity;
 
+    /// <summary>
+    /// Changes slot on state.
+    /// </summary>
+    [DataField]
+    public List<ChangeSlotOnStateEntry> ChangeSlotOnState { get; set; } = new();
+
+    [DataField]
+    public bool PointLightColor = false;
+
+    [DataField, AutoNetworkedField]
+    public bool PointLightColorEnabled;
+
+    public Color OriginalPointLightColor = Color.White;
+
+    public Dictionary<MarkingCategories, (string Marking, List<Color> Colors)> RemovedMarkingsBuffer { get; set; } = new();
+    public Dictionary<(MarkingCategories Category, int Slot), (string Marking, List<Color> Colors)> OriginalMarkings = new();
 }