Third update of special sounds

Content.Server/SS220/Speech/SpecialSoundsSystem.cs

@@ -0,0 +1,86 @@
+// © SS220, An EULA/CLA with a hosting restriction, full text: https://raw.githubusercontent.com/SerbiaStrong-220/space-station-14/master/CLA.txt
+using Content.Shared.SS220.Speech;
+using Content.Shared.Verbs;
+using Content.Server.Popups;
+
+namespace Content.Server.SS220.Speech;
+
+public sealed class SpecialSoundsSystem : EntitySystem
+{
+
+    [Dependency] private readonly PopupSystem _popupSystem = default!;
+    public override void Initialize()
+    {
+        base.Initialize();
+
+        SubscribeLocalEvent<SpecialSoundsComponent, GetVerbsEvent<Verb>>(OnVerb);
+    }
+
+    private void OnVerb(EntityUid uid, SpecialSoundsComponent component, GetVerbsEvent<Verb> args)
+    {
+        // standard interaction checks
+        if (!args.CanAccess || !args.CanInteract || args.Hands == null)
+            return;
+
+        args.Verbs.UnionWith(new[]
+        {
+            CreateVerb(uid, component, args.User, SpecialSoundMode.SpecialSoundOff),
+            CreateVerb(uid, component, args.User, SpecialSoundMode.SpecialSoundOn),
+        });
+    }
+
+    private Verb CreateVerb(EntityUid uid, SpecialSoundsComponent component, EntityUid userUid, SpecialSoundMode mode)
+    {
+        return new Verb()
+        {
+            Text = GetModeName(mode),
+            Disabled = component.Mode == mode,
+            Priority = -(int) mode, // sort them in descending order
+            Category = VerbCategory.SetSoundMode,
+            Act = () => SetSoundMode(uid, mode, userUid, component)
+        };
+    }
+    private string GetModeName(SpecialSoundMode mode)
+    {
+        string name;
+        switch (mode)
+        {
+            case SpecialSoundMode.SpecialSoundOff:
+                name = "verb-categories-special-sounds-mode-off";
+                break;
+            case SpecialSoundMode.SpecialSoundOn:
+                name = "verb-categories-special-sounds-mode-on";
+                break;
+            default:
+                return "";
+        }
+
+        return Loc.GetString(name);
+    }
+    public void SetSoundMode(EntityUid uid, SpecialSoundMode mode, EntityUid? userUid = null,
+    SpecialSoundsComponent? component = null)
+    {
+        if (!Resolve(uid, ref component))
+            return;
+
+        component.Mode = mode;
+
+        if (userUid != null)
+        {
+            var msg = Loc.GetString("special-sounds-mode-state", ("mode", GetModeName(mode)));
+            _popupSystem.PopupEntity(msg, uid, userUid.Value);
+
+            switch (mode)
+            {
+                case SpecialSoundMode.SpecialSoundOff:
+                    RaiseLocalEvent((EntityUid) userUid, new UnloadSpecialSoundsEvent(uid));
+                    break;
+                case SpecialSoundMode.SpecialSoundOn:
+                    RaiseLocalEvent((EntityUid) userUid, new InitSpecialSoundsEvent(uid));
+                    break;
+                default:
+                    return;
+            }
+        }
+    }
+}

Content.Server/Speech/EntitySystems/VocalSystem.cs

@@ -30,7 +30,7 @@ public override void Initialize()
         SubscribeLocalEvent<VocalComponent, SexChangedEvent>(OnSexChanged);
         SubscribeLocalEvent<VocalComponent, EmoteEvent>(OnEmote);
         SubscribeLocalEvent<VocalComponent, ScreamActionEvent>(OnScreamAction);
-        SubscribeLocalEvent<VocalComponent, HasSpecialSoundsEvent>(HasSpecialSounds);// SS220 Chat-Special-Emote
+        SubscribeLocalEvent<VocalComponent, InitSpecialSoundsEvent>(InitSpecialSounds);// SS220 Chat-Special-Emote
         SubscribeLocalEvent<VocalComponent, UnloadSpecialSoundsEvent>(UnloadSpecialSounds);// SS220 Chat-Special-Emote
     }
 
@@ -142,7 +142,7 @@ private void LoadSpecialSounds(EntityUid uid, VocalComponent component, EntityUi
 
         component.SpecialEmoteSounds.Add(itemUid, itemComponent.EmoteSounds);
     }
-    private void HasSpecialSounds(EntityUid uid, VocalComponent component, HasSpecialSoundsEvent args)
+    private void InitSpecialSounds(EntityUid uid, VocalComponent component, InitSpecialSoundsEvent args)
     {
         _entities.TryGetComponent<VocalComponent>(args.Item, out var itemComponent);
 

Content.Shared/Inventory/InventorySystem.Equip.cs

@@ -56,7 +56,7 @@ private void OnEntRemoved(EntityUid uid, InventoryComponent component, EntRemove
         RaiseLocalEvent(args.Entity, gotUnequippedEvent, true);
 
         // SS220 Chat-Special-Emote begin
-        if (_entManager.TryGetComponent<SpecialSoundsComponent>(args.Entity, out var soundcomp))
+        if (_entManager.TryGetComponent<SpecialSoundsComponent>(args.Entity, out var soundcomp) && (soundcomp.Mode == SpecialSoundMode.SpecialSoundOn))
         {
             RaiseLocalEvent(uid, new UnloadSpecialSoundsEvent(args.Entity));
         }
@@ -75,9 +75,9 @@ private void OnEntInserted(EntityUid uid, InventoryComponent component, EntInser
         RaiseLocalEvent(args.Entity, gotEquippedEvent, true);
 
         // SS220 Chat-Special-Emote begin
-        if (_entManager.TryGetComponent<SpecialSoundsComponent>(args.Entity, out var soundcomp))
+        if (_entManager.TryGetComponent<SpecialSoundsComponent>(args.Entity, out var soundcomp) && (soundcomp.Mode == SpecialSoundMode.SpecialSoundOn))
         {
-            RaiseLocalEvent(uid, new HasSpecialSoundsEvent(args.Entity));
+            RaiseLocalEvent(uid, new InitSpecialSoundsEvent(args.Entity));
         }
         // SS220 Chat-Special-Emote end
     }

Content.Shared/SS220/Speech/SpecialSoundsComponent.cs

@@ -1,23 +1,32 @@
 // © SS220, An EULA/CLA with a hosting restriction, full text: https://raw.githubusercontent.com/SerbiaStrong-220/space-station-14/master/CLA.txt
-
+using Robust.Shared.Serialization;
 namespace Content.Shared.SS220.Speech;
 
 /// <summary>
-/// Marks, that this item has the VocalComponent
+/// Marks, if this item has the VocalComponent
 /// </summary>
 
 [RegisterComponent]
 public sealed partial class SpecialSoundsComponent : Component
 {
     [ByRefEvent]
-    public readonly record struct HasSpecialSoundsEvent();
+    public readonly record struct InitSpecialSoundsEvent();
+
+    [ByRefEvent]
+    public readonly record struct UnloadSpecialSoundsEvent();
+
+    /// <summary>
+    ///     Current sensor mode. Can be switched by user verbs.
+    /// </summary>
+    [DataField("mode")]
+    public SpecialSoundMode Mode = SpecialSoundMode.SpecialSoundOn;
 }
 
-public sealed class HasSpecialSoundsEvent : EntityEventArgs
+public sealed class InitSpecialSoundsEvent : EntityEventArgs
 {
     public EntityUid Item;
 
-    public HasSpecialSoundsEvent(EntityUid item)
+    public InitSpecialSoundsEvent(EntityUid item)
     {
         Item = item;
     }
@@ -31,3 +40,11 @@ public UnloadSpecialSoundsEvent(EntityUid item)
         Item = item;
     }
 }
+
+[Serializable, NetSerializable]
+public enum SpecialSoundMode : byte
+{
+    SpecialSoundOff = 0,
+
+    SpecialSoundOn = 1
+}

Content.Shared/Verbs/VerbCategory.cs

@@ -89,5 +89,9 @@ public VerbCategory(string text, string? icon, bool iconsOnly = false)
 
         public static readonly VerbCategory DeattachCart = new("verb-categories-deattach-cart", null);
         //SS220-Cart-system end
+
+        //SS220-SpecialSound-system start
+        public static readonly VerbCategory SetSoundMode = new("verb-categories-special-sounds", "/Textures/SS220/Interface/VerbIcons/special_emote.svg.192dpi.png");
+        //SS220-SpecialSound-system  end
     }
 }

Resources/Audio/SS220/Voice/Bandit/attributions.yml

@@ -0,0 +1,7 @@
+- files:
+  - male_bandit_laugh_1.ogg
+  - male_bandit_laugh_2.ogg
+  - male_bandit_laugh_3.ogg
+  license: "CC0-1.0"
+  copyright: "Modified by SkaldetSkaeg (Github), shortened, cleaned from background sounds, converted to OGG."
+  source: "https://zvukipro.com/games/2272-zvuki-s-frazami-banditov-iz-igry-stalker-stalker.html"

Resources/Audio/SS220/Voice/Evil/attributions.yml

@@ -15,3 +15,12 @@
   license: "CC0-1.0"
   copyright: "Modified by SkaldetSkaeg (Github), shortened, cleaned from background sounds, converted to OGG."
   source: "https://www.youtube.com/watch?v=kk4pf-Hk5hA"
+
+- files:
+  - female_evil_laugh_1.ogg
+  - female_evil_laugh_2.ogg
+  - female_evil_laugh_3.ogg
+  license: "CC0-1.0"
+  copyright: "Modified by SkaldetSkaeg (Github), shortened, cleaned from background sounds, converted to OGG."
+  source: "https://www.youtube.com/watch?v=JTJh9M54d8k"
+

Resources/Audio/SS220/Voice/Whitemane/attributions.yml

@@ -0,0 +1,10 @@
+- files:
+  - whitemane_giggle_1.ogg
+  - whitemane_giggle_2.ogg
+  - whitemane_laugh_1.ogg
+  - whitemane_laugh_2.ogg
+  - whitemane_laugh_3.ogg
+  - whitemane_laugh_4.ogg
+  license: "CC-BY-4.0"
+  copyright: "Modified by SkaldetSkaeg (Github), shortened, converted to OGG."
+  source: "https://www.youtube.com/watch?v=o3R2KpXHK1w"

Resources/Locale/ru-RU/ss220/special-sounds.ftl

@@ -0,0 +1,6 @@
+verb-categories-special-sounds = Спец. эмоции
+verb-categories-special-sounds-mode-on = Вкл
+verb-categories-special-sounds-mode-off = Выкл
+
+## Popups
+special-sounds-mode-state = Спец. эмоции: {$mode}

Resources/Prototypes/Corvax/Entities/Clothing/Neck/pins.yml

@@ -130,6 +130,7 @@
   - type: Vocal
     sounds:
       Male: MaleEvil
+      Female: FemaleEvil
       Unsexed: MaleEvil
   #ss220 special_sounds end
 

Resources/Prototypes/Entities/Clothing/Head/hats.yml

@@ -757,6 +757,7 @@
   - type: Vocal
     sounds:
       Male: MaleDoctor
+      Female: FemaleDoctor
       Unsexed: MaleDoctor
   #ss220 special_sounds end
 
@@ -796,6 +797,13 @@
     sprite: Clothing/Head/Hats/syndiecap.rsi
   - type: Clothing
     sprite: Clothing/Head/Hats/syndiecap.rsi
+  #ss220 special_sounds start
+  - type: SpecialSounds
+  - type: Vocal
+    sounds:
+      Male: MaleBandit
+      Unsexed: MaleBandit
+  #ss220 special_sounds end
 
 - type: entity
   parent: ClothingHeadBase

Resources/Prototypes/Entities/Clothing/Masks/masks.yml

@@ -61,6 +61,7 @@
   - type: Vocal
     sounds:
       Male: MaleEvil
+      Female: FemaleEvil
       Unsexed: MaleEvil
   #ss220 special_sounds end
 

Resources/Prototypes/Entities/Clothing/Neck/cloaks.yml

@@ -63,6 +63,14 @@
     sprite: Clothing/Neck/Cloaks/rd.rsi
   - type: StealTarget
     stealGroup: HeadCloak
+  #ss220 special_sounds start
+  - type: SpecialSounds
+    mode: 0
+  - type: Vocal
+    sounds:
+      Male: MaleScientist
+      Unsexed: MaleScientist
+  #ss220 special_sounds end
 
 - type: entity
   parent: ClothingNeckBase
@@ -188,6 +196,14 @@
       toggleable-clothing: !type:ContainerSlot {}
   - type: TypingIndicatorClothing
     proto: moth
+  #ss220 special_sounds start
+  - type: SpecialSounds
+  - type: Vocal
+    sounds:
+      Male: UnisexMoth
+      Female: UnisexMoth
+      Unsexed: UnisexMoth
+  #ss220 special_sounds end
 
 - type: entity
   parent: ClothingNeckBase

Resources/Prototypes/Entities/Clothing/OuterClothing/hardsuits.yml

@@ -524,6 +524,7 @@
   - type: Vocal
     sounds:
       Male: MaleEvil
+      Female: FemaleEvil
       Unsexed: MaleEvil
   #ss220 special_sounds end
 
@@ -598,6 +599,7 @@
   - type: Vocal
     sounds:
       Male: MaleEvil
+      Female: FemaleEvil
       Unsexed: MaleEvil
   #ss220 special_sounds end
 
@@ -638,6 +640,7 @@
   - type: Vocal
     sounds:
       Male: MaleEvil
+      Female: FemaleEvil
       Unsexed: MaleEvil
   #ss220 special_sounds end
 
@@ -680,6 +683,7 @@
   - type: Vocal
     sounds:
       Male: MaleEvil
+      Female: FemaleEvil
       Unsexed: MaleEvil
   #ss220 special_sounds end
 

Resources/Prototypes/Entities/Clothing/OuterClothing/softsuits.yml

@@ -34,6 +34,7 @@
   - type: Vocal
     sounds:
       Male: MaleEvil
+      Female: FemaleEvil
       Unsexed: MaleEvil
   #ss220 special_sounds end
 

Resources/Prototypes/SS220/SoundCollections/emotes.yml

@@ -81,6 +81,13 @@
     - /Audio/SS220/Voice/Evil/male_evil_laugh_2.ogg
     - /Audio/SS220/Voice/Evil/male_evil_laugh_3.ogg
 
+- type: soundCollection
+  id: FemaleEvilLaugh
+  files:
+    - /Audio/SS220/Voice/Evil/female_evil_laugh_1.ogg
+    - /Audio/SS220/Voice/Evil/female_evil_laugh_2.ogg
+    - /Audio/SS220/Voice/Evil/female_evil_laugh_3.ogg
+
 - type: soundCollection
   id: MaleScientistChoke
   files:
@@ -106,3 +113,24 @@
     - /Audio/SS220/Voice/Doctor/male_doctor_laugh_1.ogg
     - /Audio/SS220/Voice/Doctor/male_doctor_laugh_2.ogg
     - /Audio/SS220/Voice/Doctor/male_doctor_laugh_3.ogg
+
+- type: soundCollection
+  id: MaleBanditLaugh
+  files:
+    - /Audio/SS220/Voice/Bandit/male_bandit_laugh_1.ogg
+    - /Audio/SS220/Voice/Bandit/male_bandit_laugh_2.ogg
+    - /Audio/SS220/Voice/Bandit/male_bandit_laugh_3.ogg
+
+- type: soundCollection
+  id: FemaleWhitemaneLaugh
+  files:
+    - /Audio/SS220/Voice/Whitemane/whitemane_laugh_1.ogg
+    - /Audio/SS220/Voice/Whitemane/whitemane_laugh_2.ogg
+    - /Audio/SS220/Voice/Whitemane/whitemane_laugh_3.ogg
+    - /Audio/SS220/Voice/Whitemane/whitemane_laugh_4.ogg
+
+- type: soundCollection
+  id: FemaleWhitemaneGiggle
+  files:
+    - /Audio/SS220/Voice/Whitemane/whitemane_giggle_1.ogg
+    - /Audio/SS220/Voice/Whitemane/whitemane_giggle_2.ogg