AdventureTimeSS14 · FaDeOkno · Dec 7, 2024 · Dec 1, 2024 · Dec 6, 2024
diff --git a/Content.Client/ADT/Bark/Systems/HumanoidProfileEditor.Barks.cs b/Content.Client/ADT/Bark/Systems/HumanoidProfileEditor.Barks.cs
@@ -8,7 +8,7 @@ public sealed partial class HumanoidProfileEditor
 {
     private List<BarkPrototype> _barkList = new();
 
-    private void InitializeBarks()
+    private void InitializeBarks()  // У меня случился небольшой затуп. Оно барки в обход кнопки сохраняет, но хотя бы работает                                                                                                                                                             ы
     {
         _barkList = _prototypeManager
             .EnumeratePrototypes<BarkPrototype>()
@@ -20,6 +20,7 @@ private void InitializeBarks()
         {
             BarkProtoButton.SelectId(args.Id);
             SetBarkProto(_barkList[args.Id].ID);
+            UpdateSaveButton();
         };
 
         PitchEdit.OnTextChanged += args =>
@@ -28,6 +29,7 @@ private void InitializeBarks()
                 return;
 
             SetBarkPitch(newPitch);
+            UpdateSaveButton();
         };
 
         DelayVariationMinEdit.OnTextChanged += args =>
@@ -36,6 +38,7 @@ private void InitializeBarks()
                 return;
 
             SetBarkMinVariation(newVar);
+            UpdateSaveButton();
         };
 
         DelayVariationMaxEdit.OnTextChanged += args =>
@@ -44,6 +47,7 @@ private void InitializeBarks()
                 return;
 
             SetBarkMaxVariation(newVar);
+            UpdateSaveButton();
         };
 
         BarkPlayButton.OnPressed += _ => PlayPreviewBark();
@@ -56,9 +60,9 @@ private void UpdateBarkVoicesControls()
 
         BarkProtoButton.Clear();
 
-        PitchEdit.Text = Profile.BarkPitch.ToString();
-        DelayVariationMinEdit.Text = Profile.BarkLowVar.ToString();
-        DelayVariationMaxEdit.Text = Profile.BarkHighVar.ToString();
+        PitchEdit.Text = Profile.Bark.Pitch.ToString();
+        DelayVariationMinEdit.Text = Profile.Bark.MinVar.ToString();
+        DelayVariationMaxEdit.Text = Profile.Bark.MaxVar.ToString();
 
         var firstVoiceChoiceId = 1;
         for (var i = 0; i < _barkList.Count; i++)
@@ -72,7 +76,7 @@ private void UpdateBarkVoicesControls()
                 firstVoiceChoiceId = i;
         }
 
-        var voiceChoiceId = _barkList.FindIndex(x => x.ID == Profile.BarkProto);
+        var voiceChoiceId = _barkList.FindIndex(x => x.ID == Profile.Bark.Proto);
         if (!BarkProtoButton.TrySelectId(voiceChoiceId) &&
             BarkProtoButton.TrySelectId(firstVoiceChoiceId))
         {
@@ -85,6 +89,6 @@ private void PlayPreviewBark()
         if (Profile is null)
             return;
 
-        _entManager.System<SpeechBarksSystem>().PlayDataPrewiew(Profile.BarkProto, Profile.BarkPitch, Profile.BarkLowVar, Profile.BarkHighVar);
+        _entManager.System<SpeechBarksSystem>().PlayDataPrewiew(Profile.Bark.Proto, Profile.Bark.Pitch, Profile.Bark.MinVar, Profile.Bark.MaxVar);
     }
 }
diff --git a/Content.Client/Lobby/UI/HumanoidProfileEditor.xaml b/Content.Client/Lobby/UI/HumanoidProfileEditor.xaml
@@ -91,7 +91,7 @@
                                     <Control HorizontalExpand="True"/>
                                     <OptionButton Name="SpawnPriorityButton" HorizontalAlignment="Right" />
                                 </BoxContainer>
-                                <!-- ADT-Barks-Start -->
+                                <!-- ADT Barks Start -->
                                 <BoxContainer HorizontalExpand="True" Visible="False" Name="BarksContainer">
                                     <Label Text="{Loc 'humanoid-profile-editor-bark-label'}" />
                                     <Control HorizontalExpand="True"/>
@@ -109,7 +109,7 @@
                                     <LineEdit Name="DelayVariationMinEdit" MinSize="40 0" HorizontalAlignment="Right" Margin="2 0 2 0" />
                                     <LineEdit Name="DelayVariationMaxEdit" MinSize="40 0" HorizontalAlignment="Right" Margin="2 0 2 0" />
                                 </BoxContainer>
-                                <!-- ADT-Barks-End -->
+                                <!-- ADT Barks End -->
 
                                 <!-- Corvax-TTS-Start -->
                                 <BoxContainer HorizontalExpand="True" Visible="False" Name="TTSContainer">

diff --git a/Content.Client/Lobby/UI/HumanoidProfileEditor.xaml.cs b/Content.Client/Lobby/UI/HumanoidProfileEditor.xaml.cs
@@ -1237,7 +1237,7 @@ private void SetVoice(string newVoice)
             IsDirty = true;
         }
         // Corvax-TTS-End
-
+        // ADT Barks start
         private void SetBarkProto(string prototype)
         {
             Profile = Profile?.WithBarkProto(prototype);
@@ -1254,17 +1254,18 @@ private void SetBarkPitch(float pitch)
 
         private void SetBarkMinVariation(float variation)
         {
-            Profile = Profile?.WithBarkMinVariation(Math.Clamp(variation, _cfgManager.GetCVar(ADTCCVars.BarksMinDelay), Profile.BarkHighVar));
+            Profile = Profile?.WithBarkMinVariation(Math.Clamp(variation, _cfgManager.GetCVar(ADTCCVars.BarksMinDelay), Profile.Bark.MaxVar));
             ReloadPreview();
             SetDirty();
         }
 
         private void SetBarkMaxVariation(float variation)
         {
-            Profile = Profile?.WithBarkMaxVariation(Math.Clamp(variation, Profile.BarkLowVar, _cfgManager.GetCVar(ADTCCVars.BarksMaxDelay)));
+            Profile = Profile?.WithBarkMaxVariation(Math.Clamp(variation, Profile.Bark.MinVar, _cfgManager.GetCVar(ADTCCVars.BarksMaxDelay)));
             ReloadPreview();
             SetDirty();
         }
+        // ADT Barks end
 
         private void SetSpecies(string newSpecies)
         {

diff --git a/Content.Server/ADT/Bark/Systems/SpeechBarksSystem.cs b/Content.Server/ADT/Bark/Systems/SpeechBarksSystem.cs
@@ -39,19 +39,17 @@ public override void Initialize()
     }
     private void OnMapInit(EntityUid uid, SpeechBarksComponent comp, MapInitEvent args)
     {
-        if (comp.BarkPrototype != null && comp.BarkPrototype != String.Empty)
-        {
-            var proto = _proto.Index(comp.BarkPrototype.Value);
-            comp.Sound = proto.Sound;
-        }
+        if (comp.Data.Sound != String.Empty)
+            return;
+        comp.Data.Sound = _proto.Index(comp.Data.Proto).Sound;
     }
 
     private void OnEntitySpoke(EntityUid uid, SpeechBarksComponent component, EntitySpokeEvent args)
     {
         if (!_isEnabled)
             return;
 
-        var ev = new TransformSpeakerBarkEvent(uid, component.Sound, component.BarkPitch);
+        var ev = new TransformSpeakerBarkEvent(uid, component.Data.Copy());
         RaiseLocalEvent(uid, ev);
 
         var message = args.ObfuscatedMessage ?? args.Message;
@@ -64,10 +62,10 @@ private void OnEntitySpoke(EntityUid uid, SpeechBarksComponent component, Entity
             RaiseNetworkEvent(new PlaySpeechBarksEvent(
                         GetNetEntity(uid),
                         message,
-                        ev.Sound,
-                        ev.Pitch,
-                        component.BarkLowVar,
-                        component.BarkHighVar,
+                        ev.Data.Sound,
+                        ev.Data.Pitch,
+                        ev.Data.MinVar,
+                        ev.Data.MaxVar,
                         args.Whisper), mind.Session);
         }
     }

diff --git a/Content.Server/ADT/Bark/Systems/VoiceMaskSystem.Barks.cs b/Content.Server/ADT/Bark/Systems/VoiceMaskSystem.Barks.cs
@@ -19,12 +19,11 @@ private void InitializeBarks()
 
     private void OnSpeakerVoiceTransform(EntityUid uid, VoiceMaskComponent component, ref InventoryRelayedEvent<TransformSpeakerBarkEvent> args)
     {
-        args.Args.Pitch = Math.Clamp(component.BarkPitch, _cfg.GetCVar(ADTCCVars.BarksMinPitch), _cfg.GetCVar(ADTCCVars.BarksMaxPitch));
-
         if (!_proto.TryIndex<BarkPrototype>(component.BarkId, out var proto))
             return;
 
-        args.Args.Sound = proto.Sound;
+        args.Args.Data.Pitch = Math.Clamp(component.BarkPitch, _cfg.GetCVar(ADTCCVars.BarksMinPitch), _cfg.GetCVar(ADTCCVars.BarksMaxPitch));
+        args.Args.Data.Sound = proto.Sound;
     }
 
     private void OnChangeBark(EntityUid uid, VoiceMaskComponent component, VoiceMaskChangeBarkMessage message)

diff --git a/Content.Server/ADT/Bark/Systems/VoiceOverrideSystem.Barks.cs b/Content.Server/ADT/Bark/Systems/VoiceOverrideSystem.Barks.cs
@@ -16,7 +16,6 @@ private void OnTransformSpeakerBark(Entity<VoiceOverrideComponent> entity, ref T
         if (!entity.Comp.Enabled)
             return;
 
-        args.Sound = entity.Comp.BarkSound ?? args.Sound;
-        args.Pitch = entity.Comp.BarkPitch ?? args.Pitch;
+        args.Data = entity.Comp.Bark ?? args.Data;
     }
 }
diff --git a/Content.Server/ADT/Changeling/Systems/ChangelingSystem.Useful.cs b/Content.Server/ADT/Changeling/Systems/ChangelingSystem.Useful.cs
@@ -184,14 +184,15 @@ private void OnAbsorbDoAfter(EntityUid uid, ChangelingComponent component, Absor
                 {
                     _store.TryAddCurrency(new Dictionary<string, FixedPoint2> { { "EvolutionPoints", component.AbsorbedChangelingPointsAmount } }, uid, store);
                     _store.UpdateUserInterface(uid, uid, store);
+                    component.ChangelingsAbsorbed++;
                 }
             }
             else  // Если это не был генокрад, получаем возможность "сброса"
             {
                 var selfMessage = Loc.GetString("changeling-dna-success", ("target", Identity.Entity(target, EntityManager)));
                 _popup.PopupEntity(selfMessage, uid, uid, PopupType.Medium);
                 component.CanRefresh = true;
-                component.AbsorbedDnaModifier += 1;
+                component.AbsorbedDnaModifier++;
             }
         }
 

diff --git a/Content.Server/ADT/Changeling/Systems/ChangelingSystem.cs b/Content.Server/ADT/Changeling/Systems/ChangelingSystem.cs
@@ -5,7 +5,6 @@
 using Content.Shared.Changeling.Components;
 using Content.Shared.Popups;
 using Content.Shared.Store;
-using Content.Server.Traitor.Uplink;
 using Content.Shared.Mobs.Systems;
 using Content.Shared.FixedPoint;
 using Content.Shared.Humanoid;
@@ -29,7 +28,6 @@
 using Robust.Shared.Player;
 using System.Linq;
 using Content.Shared.Preferences;
-using Content.Server.Humanoid;
 using Robust.Shared.Utility;
 using Content.Shared.Humanoid.Markings;
 using Content.Shared.Store.Components;
@@ -43,13 +41,12 @@
 using Content.Server.Cuffs;
 using Robust.Shared.Timing;
 using Content.Server.ADT.Hallucinations;
-using Content.Shared.Gibbing.Systems;
 using Content.Shared.Mobs;
 using Content.Server.Stealth;
 using Content.Server.ADT.Store;
 using Robust.Server.Containers;
-using Content.Server.Ghost;
 using Content.Shared.ADT.Stealth.Components;
+using Content.Shared.Sirena.CollectiveMind;
 
 namespace Content.Server.Changeling.EntitySystems;
 
@@ -59,25 +56,20 @@ public sealed partial class ChangelingSystem : EntitySystem
     [Dependency] private readonly SharedPopupSystem _popup = default!;
     [Dependency] private readonly StoreSystem _store = default!;
     [Dependency] private readonly ActionsSystem _action = default!;
-    [Dependency] private readonly UplinkSystem _uplink = default!;
     [Dependency] private readonly MobStateSystem _mobState = default!;
     [Dependency] private readonly PolymorphSystem _polymorph = default!;
-    [Dependency] private readonly MetaDataSystem _metaData = default!;
     [Dependency] private readonly ISerializationManager _serialization = default!;
     [Dependency] private readonly ActionContainerSystem _actionContainer = default!;
     [Dependency] private readonly AlertsSystem _alerts = default!;
     [Dependency] private readonly TagSystem _tagSystem = default!;
     [Dependency] private readonly StatusEffectsSystem _status = default!;
-    [Dependency] private readonly EntityManager _entityManager = default!;
     [Dependency] private readonly MovementSpeedModifierSystem _movementSpeedModifierSystem = default!;
     [Dependency] private readonly StaminaSystem _stamina = default!;
     [Dependency] private readonly DamageableSystem _damageableSystem = default!;
     [Dependency] private readonly EntityLookupSystem _lookup = default!;
     [Dependency] private readonly SharedMindSystem _mindSystem = default!;
-    [Dependency] private readonly AlertsSystem _alertsSystem = default!;
     [Dependency] private readonly StunSystem _stun = default!;
     [Dependency] private readonly FlashSystem _flashSystem = default!;
-    [Dependency] private readonly HumanoidAppearanceSystem _humanoid = default!;
     [Dependency] private readonly IPrototypeManager _proto = default!;
     [Dependency] private readonly HandsSystem _handsSystem = default!;
     [Dependency] private readonly InventorySystem _inventorySystem = default!;
@@ -140,9 +132,6 @@ public override void Update(float frameTime)
 
     private void OnStartup(EntityUid uid, ChangelingComponent component, ComponentStartup args)
     {
-        //RemComp<ActivatableUIComponent>(uid);     // TODO: Исправить проблему с волосами слаймов
-        //RemComp<UserInterfaceComponent>(uid);
-        //RemComp<SlimeHairComponent>(uid);
         StealDNA(uid, component);
 
         RemComp<HungerComponent>(uid);
@@ -156,6 +145,7 @@ private void OnStartup(EntityUid uid, ChangelingComponent component, ComponentSt
 
     private void OnMapInit(EntityUid uid, ChangelingComponent component, MapInitEvent args)
     {
+        EnsureComp<CollectiveMindComponent>(uid);
         if (component.GainedActions)
             return;
         _action.AddAction(uid, ref component.ChangelingEvolutionMenuActionEntity, component.ChangelingEvolutionMenuAction);
@@ -282,7 +272,7 @@ private void OnRefresh(EntityUid uid, ChangelingComponent component, ChangelingR
 
         component.BoughtActions.Clear();
 
-        _store.TrySetCurrency(new Dictionary<ProtoId<CurrencyPrototype>, FixedPoint2> { { "EvolutionPoints", 10 } }, uid);
+        _store.TrySetCurrency(new Dictionary<ProtoId<CurrencyPrototype>, FixedPoint2> { { "EvolutionPoints", 10 + (5 * component.ChangelingsAbsorbed) } }, uid);
         _store.TryRefreshStoreStock(uid);
         component.CanRefresh = false;
 
@@ -341,6 +331,7 @@ public void CopyLing(EntityUid from, EntityUid to, ChangelingComponent? comp = n
 
         newLingComponent.AbsorbedDnaModifier = comp.AbsorbedDnaModifier;
         newLingComponent.DNAStolen = comp.DNAStolen;
+        newLingComponent.ChangelingsAbsorbed = comp.ChangelingsAbsorbed;
         newLingComponent.LastResortUsed = comp.LastResortUsed;
         newLingComponent.CanRefresh = comp.CanRefresh;
 

diff --git a/Content.Server/ADT/TapeRecorder/TapeRecorderSystem.cs b/Content.Server/ADT/TapeRecorder/TapeRecorderSystem.cs
@@ -49,8 +49,7 @@ protected override void ReplayMessagesInSegment(Entity<TapeRecorderComponent> en
             if (message.Bark != null)
             {
                 var barkOverride = EnsureComp<SpeechBarksComponent>(ent);
-                barkOverride.BarkPrototype = message.Bark;
-                barkOverride.BarkPitch = message.BarkPitch;
+                barkOverride.Data = message.Bark;
             }
             if (message.TTS.HasValue)
             {
@@ -97,15 +96,14 @@ private void OnListen(Entity<TapeRecorderComponent> ent, ref ListenEvent args)
         //Add a new entry to the tape
         var name = nameEv.VoiceName;
         var verb = _chat.GetSpeechVerb(args.Source, args.Message);
-        var barkPitch = 1f;
-        string? bark = null;
+
+        BarkData? bark = null;
         ProtoId<TTSVoicePrototype>? tts = null;
         if (TryComp<SpeechBarksComponent>(args.Source, out var barksComponent))
         {
-            var barkEv = new TransformSpeakerBarkEvent(args.Source, barksComponent.Sound, barksComponent.BarkPitch);
+            var barkEv = new TransformSpeakerBarkEvent(args.Source, barksComponent.Data.Copy());
             RaiseLocalEvent(args.Source, barkEv);
-            bark = barkEv.Sound;
-            barkPitch = barkEv.Pitch;
+            bark = barkEv.Data;
         }
         if (TryComp<TTSComponent>(args.Source, out var ttsComp) && ttsComp.VoicePrototypeId != null)
         {
@@ -114,7 +112,7 @@ private void OnListen(Entity<TapeRecorderComponent> ent, ref ListenEvent args)
             tts = ttsEv.VoiceId;
         }
 
-        cassette.Comp.Buffer.Add(new TapeCassetteRecordedMessage(cassette.Comp.CurrentPosition, name, verb, bark, barkPitch, tts, _language.GetCurrentLanguage(args.Source), args.Message));
+        cassette.Comp.Buffer.Add(new TapeCassetteRecordedMessage(cassette.Comp.CurrentPosition, name, verb, bark, tts, _language.GetCurrentLanguage(args.Source), args.Message));
     }
 
     private void OnPrintMessage(Entity<TapeRecorderComponent> ent, ref PrintTapeRecorderMessage args)

diff --git a/Content.Server/Database/ServerDbBase.cs b/Content.Server/Database/ServerDbBase.cs
@@ -271,10 +271,7 @@ private static HumanoidCharacterProfile ConvertProfiles(Profile profile)
                 traits.ToHashSet(),
                 loadouts,
                 // ADT Barks start
-                profile.BarkProto,
-                profile.BarkPitch,
-                profile.LowBarkVar,
-                profile.HighBarkVar
+                new BarkData(profile.BarkProto, profile.BarkPitch, profile.LowBarkVar, profile.HighBarkVar)
                 // ADT Barks end
             );
         }
@@ -357,10 +354,10 @@ private static Profile ConvertProfiles(HumanoidCharacterProfile humanoid, int sl
                 profile.Loadouts.Add(dz);
             }
             // ADT Barks start
-            profile.BarkProto = humanoid.BarkProto;
-            profile.BarkPitch = humanoid.BarkPitch;
-            profile.LowBarkVar = humanoid.BarkLowVar;
-            profile.HighBarkVar = humanoid.BarkHighVar;
+            profile.BarkProto = humanoid.Bark.Proto;
+            profile.BarkPitch = humanoid.Bark.Pitch;
+            profile.LowBarkVar = humanoid.Bark.MinVar;
+            profile.HighBarkVar = humanoid.Bark.MaxVar;
             // ADT Barks end
 
             return profile;

diff --git a/Content.Server/Humanoid/Systems/HumanoidAppearanceSystem.cs b/Content.Server/Humanoid/Systems/HumanoidAppearanceSystem.cs
@@ -59,6 +59,7 @@ public void SetAppearance(HumanoidAppearanceComponent sourceHumanoid, HumanoidAp
         targetHumanoid.CustomBaseLayers = new(sourceHumanoid.CustomBaseLayers);
         targetHumanoid.MarkingSet = new(sourceHumanoid.MarkingSet);
         SetTTSVoice(targetHumanoid.Owner, sourceHumanoid.Voice, targetHumanoid); // Corvax-TTS
+        SetBarkData(targetHumanoid.Owner, sourceHumanoid.Bark, targetHumanoid);  // ADT Barks
 
         targetHumanoid.Gender = sourceHumanoid.Gender;
         if (TryComp<GrammarComponent>(targetHumanoid.Owner, out var grammar))

diff --git a/Content.Server/Speech/Components/VoiceOverrideComponent.cs b/Content.Server/Speech/Components/VoiceOverrideComponent.cs
@@ -1,3 +1,4 @@
+using Content.Shared.ADT.SpeechBarks;
 using Content.Shared.Corvax.TTS;
 using Content.Shared.Speech;
 using Robust.Shared.Prototypes;
@@ -36,11 +37,7 @@ public sealed partial class VoiceOverrideComponent : Component
 
     // ADT start
     [DataField]
-    public string? BarkSound;
-
-    [DataField]
-    [ViewVariables(VVAccess.ReadWrite)]
-    public float? BarkPitch;
+    public BarkData? Bark;
 
     [DataField]
     public ProtoId<TTSVoicePrototype>? TTS;

diff --git a/Content.Server/Speech/EntitySystems/VoiceOverrideSystem.cs b/Content.Server/Speech/EntitySystems/VoiceOverrideSystem.cs
@@ -9,6 +9,9 @@ public override void Initialize()
     {
         base.Initialize();
         SubscribeLocalEvent<VoiceOverrideComponent, TransformSpeakerNameEvent>(OnTransformSpeakerName);
+
+        InitializeTTS();    // ADT TTS
+        InitializeBarks();  // ADT Barks
     }
 
     private void OnTransformSpeakerName(Entity<VoiceOverrideComponent> entity, ref TransformSpeakerNameEvent args)