AdventureTimeSS14 · Schrodinger71 · Mar 18, 2024 · Mar 18, 2024
diff --git a/Content.Server/ADT/Changeling/EntitySystems/ChangelingSlugSystem.Abilities.cs b/Content.Server/ADT/Changeling/EntitySystems/ChangelingSlugSystem.Abilities.cs
@@ -80,6 +80,7 @@ private void OnLayEggs(EntityUid uid, LingSlugComponent component, LingEggAction
 
     }
 
+    public ProtoId<DamageGroupPrototype> GeneticDamageGroup = "Genetic";
     private void OnLayEggsDoAfter(EntityUid uid, LingSlugComponent component, LingEggDoAfterEvent args)
     {
         if (args.Handled || args.Args.Target == null)
@@ -98,6 +99,11 @@ private void OnLayEggsDoAfter(EntityUid uid, LingSlugComponent component, LingEg
         else
         {
             var holderComp = EnsureComp<LingEggsHolderComponent>(target);
+
+            holderComp.Stomach = ContainerSystem.EnsureContainer<Container>(target, "stomach");
+            var damage_genetic = new DamageSpecifier(_proto.Index(GeneticDamageGroup), holderComp.DamageAmount);
+            _damageableSystem.TryChangeDamage(target, damage_genetic);    /// To be sure that target is dead
+
             var lingComp = EnsureComp<ChangelingComponent>(target);
             var xform = Transform(target);
             var selfMessage = Loc.GetString("changeling-eggs-self-success", ("target", Identity.Entity(target, EntityManager)));

diff --git a/...ling/EntitySystems/ChangelingEggSystem.cs → .../EntitySystems/ChangelingSyntEggSystem.cs b/...ling/EntitySystems/ChangelingEggSystem.cs → .../EntitySystems/ChangelingSyntEggSystem.cs
@@ -7,10 +7,12 @@
 using Content.Shared.Mind;
 using Content.Shared.Alert;
 using Robust.Shared.Containers;
+using Robust.Server.GameObjects;
+using Content.Server.Resist;
 
 namespace Content.Server.Changeling.EntitySystems;
 
-public sealed partial class ChangelingEggSystem : EntitySystem
+public sealed partial class ChangelingSyntEggSystem : EntitySystem
 {
     [Dependency] private readonly ActionsSystem _action = default!;
     [Dependency] private readonly MetaDataSystem _metaData = default!;
@@ -19,29 +21,44 @@ public sealed partial class ChangelingEggSystem : EntitySystem
     [Dependency] private readonly SharedPopupSystem _popup = default!;
     [Dependency] private readonly IPrototypeManager _proto = default!;
     [Dependency] private readonly SharedMindSystem _mindSystem = default!;
-    [Dependency] private readonly AlertsSystem _alertsSystem = default!;
+    [Dependency] private readonly TransformSystem _transform = default!;
     [Dependency] protected readonly SharedContainerSystem ContainerSystem = default!;
 
     public override void Initialize()
     {
         base.Initialize();
 
-        SubscribeLocalEvent<LingEggsHolderComponent, MapInitEvent>(OnInit);
-        SubscribeLocalEvent<LingEggsHolderComponent, ComponentShutdown>(OnShutdown);
+        SubscribeLocalEvent<SyntLingEggsHolderComponent, MapInitEvent>(OnInit);
+        SubscribeLocalEvent<SyntLingEggsHolderComponent, ComponentShutdown>(OnShutdown);
 
     }
+    public const string LingSlugId = "ChangelingHeadslug";
     public ProtoId<DamageGroupPrototype> BruteDamageGroup = "Genetic";
-    private void OnInit(EntityUid uid, LingEggsHolderComponent component, MapInitEvent args)
+    private void OnInit(EntityUid uid, SyntLingEggsHolderComponent component, MapInitEvent args)
     {
+        var slug = Spawn(LingSlugId, Transform(uid).Coordinates);
+        var slugComp = EnsureComp<LingSlugComponent>(slug);
+        slugComp.EggLing = uid;
+        var xform = Transform(uid);
+        _transform.SetParent(slug, xform.ParentUid);
+        _transform.SetCoordinates(slug, xform.Coordinates);
         component.Stomach = ContainerSystem.EnsureContainer<Container>(uid, "stomach");
+        ContainerSystem.Insert(slug, component.Stomach);
+        RemComp<CanEscapeInventoryComponent>(slug);
+
+        if (_mindSystem.TryGetMind(uid, out var mindId, out var mind))
+            _mindSystem.TransferTo(mindId, slug, mind: mind);
+        _action.RemoveAction(slug, slugComp.LayEggsActionEntity);   /// Яйца откладываются только один раз
+        _action.AddAction(slug, ref component.ChangelingHatchActionEntity, component.ChangelingHatchAction);
+
         var damage_burn = new DamageSpecifier(_proto.Index(BruteDamageGroup), component.DamageAmount);
         _damageableSystem.TryChangeDamage(uid, damage_burn);    /// To be sure that target is dead
         var newLing = EnsureComp<ChangelingComponent>(uid);
         newLing.EggedBody = true;       /// To make egged person into a ling
         var selfMessage = Loc.GetString("changeling-eggs-inform");
         _popup.PopupEntity(selfMessage, uid, uid, PopupType.LargeCaution);      /// Popup
     }
-    private void OnShutdown(EntityUid uid, LingEggsHolderComponent component, ComponentShutdown args)
+    private void OnShutdown(EntityUid uid, SyntLingEggsHolderComponent component, ComponentShutdown args)
     {
         RemComp<ChangelingComponent>(uid);
         //_action.RemoveAction(uid, component.ChangelingHatchActionEntity);

diff --git a/Content.Server/ADT/Changeling/EntitySystems/ChangelingSystem.Abilities.cs b/Content.Server/ADT/Changeling/EntitySystems/ChangelingSystem.Abilities.cs
@@ -24,6 +24,7 @@
 using Content.Shared.Mobs;
 using Content.Server.Destructible;
 using Content.Server.Ghost.Components;
+using Content.Shared.Alert;
 
 namespace Content.Server.Changeling.EntitySystems;
 
@@ -54,7 +55,6 @@ private void InitializeLingAbilities()
         SubscribeLocalEvent<ChangelingComponent, StasisDeathActionEvent>(OnStasisDeathAction);
         SubscribeLocalEvent<ChangelingComponent, BlindStingEvent>(OnBlindSting);
         SubscribeLocalEvent<ChangelingComponent, AdrenalineActionEvent>(OnAdrenaline);
-        SubscribeLocalEvent<ChangelingComponent, ChangelingRefreshActionEvent>(OnRefresh);
         SubscribeLocalEvent<ChangelingComponent, OmniHealActionEvent>(OnOmniHeal);
         SubscribeLocalEvent<ChangelingComponent, MuteStingEvent>(OnMuteSting);
         SubscribeLocalEvent<ChangelingComponent, DrugStingEvent>(OnDrugSting);
@@ -203,6 +203,7 @@ private void OnAbsorbDoAfter(EntityUid uid, ChangelingComponent component, Absor
                 var selfMessage = Loc.GetString("changeling-dna-success", ("target", Identity.Entity(target, EntityManager)));
                 _popup.PopupEntity(selfMessage, uid, uid, PopupType.Medium);
                 component.CanRefresh = true;
+                _alertsSystem.ShowAlert(uid, AlertType.ADTAlertLingRefresh);
                 component.AbsorbedDnaModifier = component.AbsorbedDnaModifier + 1;
             }
         }
@@ -941,31 +942,6 @@ private void OnOmniHeal(EntityUid uid, ChangelingComponent component, OmniHealAc
 
     }
 
-    private void OnRefresh(EntityUid uid, ChangelingComponent component, ChangelingRefreshActionEvent args)
-    {
-        if (args.Handled)
-            return;
-
-        if (component.LesserFormActive)
-        {
-            var selfMessage = Loc.GetString("changeling-transform-fail-lesser-form");
-            _popup.PopupEntity(selfMessage, uid, uid);
-            return;
-        }
-
-        if (!TryUseAbility(uid, component, component.ChemicalsCostFree))
-            return;
-
-        if (Refresh(uid, component))
-        {
-            args.Handled = true;
-
-            var selfMessage = Loc.GetString("changeling-refresh-self-success");
-            _popup.PopupEntity(selfMessage, uid, uid, PopupType.MediumCaution);
-        }
-
-    }
-
     private void OnMuscles(EntityUid uid, ChangelingComponent component, ChangelingMusclesActionEvent args)
     {
         if (args.Handled)

diff --git a/Content.Server/ADT/Changeling/EntitySystems/ChangelingSystem.cs b/Content.Server/ADT/Changeling/EntitySystems/ChangelingSystem.cs
@@ -58,7 +58,7 @@ public sealed partial class ChangelingSystem : EntitySystem
     [Dependency] private readonly DamageableSystem _damageableSystem = default!;
     [Dependency] private readonly GibbingSystem _gibbingSystem = default!;
     [Dependency] private readonly SharedMindSystem _mindSystem = default!;
-    [Dependency] private readonly SharedCombatModeSystem _combat = default!;
+    [Dependency] private readonly AlertsSystem _alertsSystem = default!;
 
     public override void Initialize()
     {
@@ -152,7 +152,7 @@ private void OnMapInit(EntityUid uid, ChangelingComponent component, MapInitEven
         _action.AddAction(uid, ref component.ChangelingDNAStingActionEntity, component.ChangelingDNAStingAction);
         _action.AddAction(uid, ref component.ChangelingDNACycleActionEntity, component.ChangelingDNACycleAction);
         _action.AddAction(uid, ref component.ChangelingTransformActionEntity, component.ChangelingTransformAction);
-        _action.AddAction(uid, ref component.ChangelingRefreshActionEntity, component.ChangelingRefreshAction);
+        //_action.AddAction(uid, ref component.ChangelingRefreshActionEntity, component.ChangelingRefreshAction);
     }
 
     private void OnShutdown(EntityUid uid, ChangelingComponent component, ComponentShutdown args)
@@ -163,7 +163,7 @@ private void OnShutdown(EntityUid uid, ChangelingComponent component, ComponentS
         _action.RemoveAction(uid, component.ChangelingDNAStingActionEntity);
         _action.RemoveAction(uid, component.ChangelingDNACycleActionEntity);
         _action.RemoveAction(uid, component.ChangelingTransformActionEntity);
-        _action.RemoveAction(uid, component.ChangelingRefreshActionEntity);
+        //_action.RemoveAction(uid, component.ChangelingRefreshActionEntity);
     }
     private void OnShop(EntityUid uid, ChangelingComponent component, ChangelingEvolutionMenuActionEvent args)
     {
@@ -530,6 +530,14 @@ public bool Refresh(EntityUid uid, ChangelingComponent component)   /// Очис
             _popup.PopupEntity(selfMessage, uid, uid, PopupType.MediumCaution);
             return false;
         }
+
+        if (component.LesserFormActive)
+        {
+            var selfMessage = Loc.GetString("changeling-transform-fail-lesser-form");
+            _popup.PopupEntity(selfMessage, uid, uid);
+            return false;
+        }
+
         else
         {
             component.StoredDNA = new List<PolymorphHumanoidData>();    /// Создание нового ДНК списка
@@ -541,22 +549,11 @@ public bool Refresh(EntityUid uid, ChangelingComponent component)   /// Очис
 
             /// Удаление всех способностей - нихуя не понял, потом сделаю. Надеюсь.
 
-            ///_action.RemoveAction(uid, component.ChangelingArmBladeActionEntity);
-            ///_action.RemoveAction(uid, component.ChangelingArmorActionActionEntity);
-            ///_action.RemoveAction(uid, component.ChangelingInvisibleActionEntity);
-            ///_action.RemoveAction(uid, component.ChangelingEMPActionEntity);
-            ///_action.RemoveAction(uid, component.ChangelingStasisDeathActionEntity);
-            ///_action.RemoveAction(uid, component.ChangelingBlindStingActionEntity);
-            ///_action.RemoveAction(uid, component.ChangelingAdrenalineActionEntity);
-            ///_action.RemoveAction(uid, component.ChangelingOmniHealActionEntity);
-            ///_action.RemoveAction(uid, component.ChangelingMuteStingActionEntity);
-
-            /// Всё ещё не работает, закомменчу что вышло, надо разобраться как при покупке использовать вместо
-            /// _action.AddAction(uid, component.Action);
-            /// _action.AddAction(uid, ref component.ActionEntity, component.Action);
             component.CanRefresh = false;
-
+            _alertsSystem.ClearAlert(uid, AlertType.ADTAlertLingRefresh);
             component.SelectedDNA = 0;
+            var selfMessage = Loc.GetString("changeling-refresh-self-success");
+            _popup.PopupEntity(selfMessage, uid, uid, PopupType.MediumCaution);
             return true;
         }
 

diff --git a/Content.Server/ADT/Changeling/EntitySystems/DNARefresh.cs b/Content.Server/ADT/Changeling/EntitySystems/DNARefresh.cs
@@ -0,0 +1,19 @@
+using Content.Shared.Alert;
+using Content.Server.Abilities.Mime;
+using Content.Shared.Changeling.Components;
+
+namespace Content.Server.Changeling.EntitySystems;
+
+[DataDefinition]
+public sealed partial class DNARefresh : IAlertClick
+{
+    public void AlertClicked(EntityUid player)
+    {
+        var entManager = IoCManager.Resolve<IEntityManager>();
+        if (entManager.TryGetComponent(player, out ChangelingComponent? component))
+        {
+            entManager.System<ChangelingSystem>().Refresh(player, component);
+        }
+    }
+}
+
diff --git a/Content.Server/Chemistry/ReagentEffects/LingEggs.cs b/Content.Server/Chemistry/ReagentEffects/LingEggs.cs
@@ -5,7 +5,7 @@
 
 namespace Content.Server.Chemistry.ReagentEffects;
 
-public sealed partial class LingEggs : ReagentEffect
+public sealed partial class LingEggs : ReagentEffect 
 {
     protected override string? ReagentEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys)
   => Loc.GetString("reagent-effect-guidebook-missing", ("chance", Probability));
@@ -14,6 +14,6 @@ public sealed partial class LingEggs : ReagentEffect
     public override void Effect(ReagentEffectArgs args)
     {
         var entityManager = args.EntityManager;
-        entityManager.EnsureComponent<LingEggsHolderComponent>(args.SolutionEntity);
+        entityManager.EnsureComponent<SyntLingEggsHolderComponent>(args.SolutionEntity);
     }
 }
diff --git a/Content.Shared/ADT/Changeling/Components/ChangelingComponent.cs b/Content.Shared/ADT/Changeling/Components/ChangelingComponent.cs
@@ -406,7 +406,7 @@ public sealed partial class ChangelingComponent : Component
     public float MuteAmount = 20f;
 
     [ViewVariables(VVAccess.ReadWrite), DataField("drugAmount")]
-    public float SpaceDrugsAmount = 20f;
+    public float SpaceDrugsAmount = 35f;
 
     #endregion
 

diff --git a/Content.Shared/ADT/Changeling/Components/SyntLingEggsHolder.cs b/Content.Shared/ADT/Changeling/Components/SyntLingEggsHolder.cs
@@ -0,0 +1,20 @@
+using Robust.Shared.Prototypes;
+using Robust.Shared.Containers;
+
+namespace Content.Shared.Changeling.Components;
+
+[RegisterComponent]
+[AutoGenerateComponentState(true)]
+public sealed partial class SyntLingEggsHolderComponent : Component
+{
+    [DataField]
+    public EntProtoId ChangelingHatchAction = "ActionLingHatch";
+
+    [DataField, AutoNetworkedField]
+    public EntityUid? ChangelingHatchActionEntity;
+
+    [DataField]
+    public float DamageAmount = 500f;    /// Damage gain to die
+
+    public Container Stomach = default!;
+}
diff --git a/Content.Shared/Alert/AlertType.cs b/Content.Shared/Alert/AlertType.cs
@@ -58,7 +58,8 @@ public enum AlertType : byte
         Chemicals,
         PainKiller,
         ADTAlertPolymorph,
-        ADTAlertApathy
+        ADTAlertApathy,
+        ADTAlertLingRefresh
     }
 
 }
diff --git a/Resources/Locale/ru-RU/ADT/alerts.ftl b/Resources/Locale/ru-RU/ADT/alerts.ftl
@@ -3,4 +3,6 @@ alerts-polymorph-desc = [color=#b26de3]С вашим телом происход
 alerts-painkiller-name = [color=yellow]На болеутоляющих[/color]
 alerts-painkiller-desc = Вас ничего не сковывает. 
 alerts-apathy-name = Апатия
-alerts-apathy-desc = Ваши эмоции стали блёклыми, а отношение к окружающему вас миру более равнодушным.
+alerts-apathy-desc = Ваши эмоции стали блёклыми, а отношение к окружающему вас миру более равнодушным.
+alerts-ling-refresh-name = Очистить ДНК
+alerts-ling-refresh-desc = Нажмите, чтобы очистить все сохранённые цепочки ДНК и получить 2 очка эволюции.
diff --git a/Resources/Prototypes/ADT/Alerts/alerts.yml b/Resources/Prototypes/ADT/Alerts/alerts.yml
@@ -22,3 +22,10 @@
       state: apathy
   name: alerts-apathy-name
   description: alerts-apathy-desc
+
+- type: alert
+  id: ADTAlertLingRefresh
+  icons: [ /Textures/Interface/Alerts/ling-refresh.png ]
+  name: alerts-ling-refresh-name
+  onClick: !type:DNARefresh  { }
+  description: alerts-ling-refresh-desc
diff --git a/Resources/Textures/Interface/Alerts/ling-refresh.png b/Resources/Textures/Interface/Alerts/ling-refresh.png