Твик рандомных артефактов + Фикс логики лечения кровотечения (#864)

Content.Server/Medical/HealingSystem.cs

@@ -1,21 +1,23 @@
 using Content.Server.Administration.Logs;
 using Content.Server.Body.Components;
 using Content.Server.Body.Systems;
-using Content.Server.Chemistry.Containers.EntitySystems;
 using Content.Server.Medical.Components;
 using Content.Server.Popups;
 using Content.Server.Stack;
+using Content.Shared.Chemistry.EntitySystems;
 using Content.Shared.Audio;
 using Content.Shared.Damage;
 using Content.Shared.Database;
 using Content.Shared.DoAfter;
 using Content.Shared.FixedPoint;
+using Content.Shared.IdentityManagement;
 using Content.Shared.Interaction;
 using Content.Shared.Interaction.Events;
 using Content.Shared.Medical;
 using Content.Shared.Mobs;
 using Content.Shared.Mobs.Components;
 using Content.Shared.Mobs.Systems;
+using Content.Shared.Popups;
 using Content.Shared.Stacks;
 using Robust.Shared.Audio.Systems;
 using Robust.Shared.Random;
@@ -34,7 +36,7 @@ public sealed class HealingSystem : EntitySystem
     [Dependency] private readonly SharedInteractionSystem _interactionSystem = default!;
     [Dependency] private readonly MobThresholdSystem _mobThresholdSystem = default!;
     [Dependency] private readonly PopupSystem _popupSystem = default!;
-    [Dependency] private readonly SolutionContainerSystem _solutionContainerSystem = default!;
+    [Dependency] private readonly SharedSolutionContainerSystem _solutionContainerSystem = default!;
 
     public override void Initialize()
     {
@@ -70,7 +72,6 @@ public sealed class HealingSystem : EntitySystem
             _bloodstreamSystem.TryModifyBleedAmount(entity.Owner, healing.BloodlossModifier);
             if (isBleeding != bloodstream.BleedAmount > 0)
             {
-                dontRepeat = true;
                 _popupSystem.PopupEntity(Loc.GetString("medical-item-stop-bleeding"), entity, args.User);
             }
         }
@@ -114,7 +115,7 @@ public sealed class HealingSystem : EntitySystem
         _audio.PlayPvs(healing.HealingEndSound, entity.Owner, AudioHelpers.WithVariation(0.125f, _random).WithVolume(1f));
 
         // Logic to determine the whether or not to repeat the healing action
-        args.Repeat = (HasDamage(entity.Comp, healing) && !dontRepeat);
+        args.Repeat = ((HasDamage(entity.Comp, healing) || HasBleedingToHeal(entity, healing)) && !dontRepeat); // WD added HasBleedingToHeal()
         if (!args.Repeat && !dontRepeat)
             _popupSystem.PopupEntity(Loc.GetString("medical-item-finished-using", ("item", args.Used)), entity.Owner, args.User);
         args.Handled = true;
@@ -172,6 +173,7 @@ public sealed class HealingSystem : EntitySystem
             return false;
 
         var anythingToDo =
+            HasBleedingToHeal(target, component) || // WD Edit
             HasDamage(targetDamage, component) ||
             component.ModifyBloodLevel > 0 // Special case if healing item can restore lost blood...
                 && TryComp<BloodstreamComponent>(target, out var bloodstream)
@@ -189,6 +191,12 @@ public sealed class HealingSystem : EntitySystem
 
         var isNotSelf = user != target;
 
+        if (isNotSelf)
+        {
+            var msg = Loc.GetString("medical-item-popup-target", ("user", Identity.Entity(user, EntityManager)), ("item", uid));
+            _popupSystem.PopupEntity(msg, target, target, PopupType.Medium);
+        }
+
         var delay = isNotSelf
             ? component.Delay
             : component.Delay * GetScaledHealingPenalty(user, component);
@@ -227,4 +235,21 @@ public sealed class HealingSystem : EntitySystem
         var modifier = percentDamage * (component.SelfHealPenaltyMultiplier - 1) + 1;
         return Math.Max(modifier, 1);
     }
+
+
+    /// <summary>
+    /// WD.
+    /// </summary>
+    private bool HasBleedingToHeal(EntityUid target, HealingComponent healing)
+    {
+        if (healing.BloodlossModifier == float.NegativeZero)
+            return false;
+
+        if (!TryComp<BloodstreamComponent>(target, out var bloodstream))
+            return false;
+
+        var isBleeding = bloodstream.BleedAmount > 0;
+
+        return isBleeding;
+    }
 }

Content.Server/Xenoarchaeology/XenoArtifacts/ArtifactSystem.Nodes.cs

@@ -30,7 +30,7 @@ public sealed partial class ArtifactSystem
 
         _usedNodeIds.Clear();
 
-        var uninitializedNodes = new List<ArtifactNode> { new(){ Id = GetValidNodeId() } };
+        var uninitializedNodes = new List<ArtifactNode> { new() { Id = GetValidNodeId() } };
         var createdNodes = 1;
 
         while (uninitializedNodes.Count > 0)
@@ -50,7 +50,7 @@ public sealed partial class ArtifactSystem
                     break;
                 }
 
-                var child = new ArtifactNode {Id = GetValidNodeId(), Depth = node.Depth + 1};
+                var child = new ArtifactNode { Id = GetValidNodeId(), Depth = node.Depth + 1 };
                 node.Edges.Add(child.Id);
                 child.Edges.Add(node.Id);
 
@@ -240,4 +240,67 @@ public sealed partial class ArtifactSystem
     {
         return nodes.First(x => x.Id == id);
     }
+
+    /// <summary>
+    /// WD.
+    /// Generate an Artifact tree with fully developed nodes.
+    /// </summary>
+    private void GenerateSafeArtifactNodeTree(EntityUid artifact, List<ArtifactNode> allNodes, int nodesToCreate)
+    {
+        if (nodesToCreate < 1)
+        {
+            Log.Error($"nodesToCreate {nodesToCreate} is less than 1. Aborting artifact tree generation.");
+            return;
+        }
+
+        _usedNodeIds.Clear();
+
+        var uninitializedNodes = new List<ArtifactNode> { new() { Id = GetValidNodeId() } };
+        var createdNodes = 1;
+
+        while (uninitializedNodes.Count > 0)
+        {
+            var node = uninitializedNodes[0];
+            uninitializedNodes.Remove(node);
+
+            node.Trigger = GetRandomTrigger(artifact, ref node);
+            node.Effect = GetSafeRandomEffect(artifact, ref node);
+
+            var maxChildren = _random.Next(1, MaxEdgesPerNode - 1);
+
+            for (var i = 0; i < maxChildren; i++)
+            {
+                if (nodesToCreate <= createdNodes)
+                {
+                    break;
+                }
+
+                var child = new ArtifactNode { Id = GetValidNodeId(), Depth = node.Depth + 1 };
+                node.Edges.Add(child.Id);
+                child.Edges.Add(node.Id);
+
+                uninitializedNodes.Add(child);
+                createdNodes++;
+            }
+
+            allNodes.Add(node);
+        }
+    }
+
+    /// <summary>
+    /// WD.
+    /// </summary>
+    private string GetSafeRandomEffect(EntityUid artifact, ref ArtifactNode node)
+    {
+        var allEffects = _prototype.EnumeratePrototypes<ArtifactEffectPrototype>()
+            .Where(x => (x.Whitelist?.IsValid(artifact, EntityManager) ?? true) && (!x.Blacklist?.IsValid(artifact, EntityManager) ?? true) && x.Safe).ToList();
+        var validDepth = allEffects.Select(x => x.TargetDepth).Distinct().ToList();
+
+        var weights = GetDepthWeights(validDepth, node.Depth);
+        var selectedRandomTargetDepth = GetRandomTargetDepth(weights);
+        var targetEffects = allEffects
+            .Where(x => x.TargetDepth == selectedRandomTargetDepth).ToList();
+
+        return _random.Pick(targetEffects).ID;
+    }
 }

Content.Server/Xenoarchaeology/XenoArtifacts/ArtifactSystem.cs

@@ -295,4 +295,18 @@ public sealed partial class ArtifactSystem : EntitySystem
     {
         return allNodes.First(n => n.Depth == 0);
     }
+
+    /// <summary>
+    /// WD. Randomize a given artifact.
+    /// </summary>
+    [PublicAPI]
+    public void SafeRandomizeArtifact(EntityUid uid, ArtifactComponent component)
+    {
+        component.NodesMax = 5;
+        var nodeAmount = _random.Next(component.NodesMin, component.NodesMax);
+
+        GenerateSafeArtifactNodeTree(uid, component.NodeTree, nodeAmount);
+        var firstNode = GetRootNode(component.NodeTree);
+        EnterNode(uid, ref firstNode, component);
+    }
 }

Content.Server/_White/RandomArtifacts/RandomArtifactsSystem.cs

@@ -3,6 +3,8 @@ using Content.Server.Station.Components;
 using Content.Server.Station.Systems;
 using Content.Server.Xenoarchaeology.XenoArtifacts;
 using Content.Shared._White;
+using Content.Shared.Damage;
+using Content.Shared.Stacks;
 using Content.Shared.Item;
 using Robust.Shared.Configuration;
 using Robust.Shared.Random;
@@ -16,7 +18,7 @@ public sealed class RandomArtifactsSystem : EntitySystem
     [Dependency] private readonly IConfigurationManager _configurationManager = default!;
     [Dependency] private readonly StationSystem _station = default!;
 
-    private float _itemToArtifactRatio; // from 0 to 100. In % percents. Default is 0.7%
+    private float _itemToArtifactRatio; // from 0 to 100. In % percents. Default is 0.4%
     private bool _artifactsEnabled;
 
     public override void Initialize()
@@ -34,11 +36,12 @@ public sealed class RandomArtifactsSystem : EntitySystem
         if (!_artifactsEnabled)
             return;
 
-        // Removing old artifact-items and replace it with new funny stealthy items
+        // No we don't
-        foreach (var oldArtifact in EntityQuery<ArtifactComponent>())
+        // // Removing old artifact-items and replace it with new funny stealthy items
-        {
+        // foreach (var oldArtifact in EntityQuery<ArtifactComponent>())
-            QueueDel(oldArtifact.Owner);
+        // {
-        }
+        //     QueueDel(oldArtifact.Owner);
+        // }
 
         var items = EntityQuery<ItemComponent>().ToList();
         _random.Shuffle(items);
@@ -55,8 +58,13 @@ public sealed class RandomArtifactsSystem : EntitySystem
             if (!HasComp<StationDataComponent>(station))
                 continue;
 
+            if (HasComp<StackComponent>(entity))
+                continue;
+
             var artifactComponent = EnsureComp<ArtifactComponent>(entity);
-            _artifactsSystem.RandomizeArtifact(entity, artifactComponent);
+            _artifactsSystem.SafeRandomizeArtifact(entity, artifactComponent);
+
+            EnsureComp<DamageableComponent>(entity);
         }
     }
 

Content.Shared/Xenoarchaeology/XenoArtifacts/ArtifactEffectPrototype.cs

@@ -41,4 +41,10 @@ public sealed partial class ArtifactEffectPrototype : IPrototype
 
     [DataField("blacklist")]
     public EntityWhitelist? Blacklist;
+
+    /// <summary>
+    /// WD. Is it safe for random items?
+    /// </summary>
+    [DataField]
+    public bool Safe = false;
 }

Resources/Locale/ru-RU/medical/components/healing-component.ftl

@@ -1,3 +1,4 @@
 medical-item-finished-using = Вы закончили исцеление с помощью { $item }
 medical-item-cant-use = Нет никаких повреждений, которые вы могли бы залечить с помощью { $item }
-medical-item-stop-bleeding = Оно перестало кровоточить
+medical-item-stop-bleeding = Кровотечение было остановлено
+medical-item-popup-target = { CAPITALIZE($user) } пытается лечить вас при помощи { $item }!

Resources/Prototypes/XenoArch/Effects/normal_effects.yml

@@ -2,6 +2,7 @@
   id: EffectBadFeeling
   targetDepth: 0
   effectHint: artifact-effect-hint-mental
+  safe: true # WD
   components:
   - type: TelepathicArtifact
     messages:
@@ -32,6 +33,7 @@
   id: EffectGoodFeeling
   targetDepth: 0
   effectHint: artifact-effect-hint-mental
+  safe: true # WD
   components:
   - type: TelepathicArtifact
     messages:
@@ -61,6 +63,7 @@
   id: EffectJunkSpawn
   targetDepth: 0
   effectHint: artifact-effect-hint-creation
+  safe: true # WD
   components:
   - type: SpawnArtifact
     maxSpawns: 10
@@ -100,12 +103,14 @@
   id: EffectLightFlicker
   targetDepth: 0
   effectHint: artifact-effect-hint-electrical-interference
+  safe: true # WD
   components:
   - type: LightFlickerArtifact
 
 - type: artifactEffect
   id: EffectPointLight
   targetDepth: 0
+  safe: true # WD
   components:
   - type: PointLight
     radius: 8
@@ -119,6 +124,7 @@
   id: EffectBananaSpawn
   targetDepth: 0
   effectHint: artifact-effect-hint-creation
+  safe: true # WD
   components:
   - type: SpawnArtifact
     maxSpawns: 20
@@ -137,6 +143,7 @@
   id: EffectFloraSpawn
   targetDepth: 1
   effectHint: artifact-effect-hint-creation
+  safe: true # WD
   components:
   - type: SpawnArtifact
     maxSpawns: 3
@@ -186,6 +193,7 @@
   id: EffectCold
   targetDepth: 1
   effectHint: artifact-effect-hint-consumption
+  safe: true # WD
   components:
   - type: TemperatureArtifact
     targetTemp: 50
@@ -221,6 +229,7 @@
   id: EffectInstrumentSpawn
   targetDepth: 1
   effectHint: artifact-effect-hint-creation
+  safe: true # WD
   components:
   - type: SpawnArtifact
     maxSpawns: 5
@@ -231,6 +240,7 @@
   id: EffectMonkeySpawn
   targetDepth: 1
   effectHint: artifact-effect-hint-creation
+  safe: true # WD
   components:
   - type: SpawnArtifact
     spawns:
@@ -245,6 +255,7 @@
   id: EffectChargeBatteries
   targetDepth: 1
   effectHint: artifact-effect-hint-release
+  safe: true # WD
   components:
   - type: ChargeBatteryArtifact
   - type: TelepathicArtifact
@@ -264,6 +275,7 @@
   id: EffectKnock
   targetDepth: 1
   effectHint: artifact-effect-hint-electrical-interference
+  safe: true # WD
   components:
     - type: KnockArtifact
 
@@ -291,6 +303,7 @@
   id: EffectInvisibility
   targetDepth: 2
   effectHint: artifact-effect-hint-visual
+  safe: true # WD
   components:
   - type: Stealth
     hadOutline: true
@@ -317,6 +330,7 @@
   id: EffectRareMaterialSpawn
   targetDepth: 2
   effectHint: artifact-effect-hint-creation
+  safe: true # WD
   components:
   - type: SpawnArtifact
     spawns:
@@ -414,6 +428,7 @@
   id: EffectCashSpawn
   targetDepth: 2
   effectHint: artifact-effect-hint-creation
+  safe: true # WD
   components:
   - type: SpawnArtifact
     maxSpawns: 10
@@ -461,6 +476,7 @@
   id: EffectBlink
   targetDepth: 2
   effectHint: artifact-effect-hint-displacement
+  safe: true # WD
   components:
   - type: RandomTeleportArtifact
 
@@ -592,6 +608,7 @@
   id: EffectHealAll
   targetDepth: 3
   effectHint: artifact-effect-hint-environment
+  safe: true # WD
   components:
   - type: DamageNearbyArtifact
     damageChance: 1
@@ -617,6 +634,7 @@
   id: EffectMaterialSpawn
   targetDepth: 3
   effectHint: artifact-effect-hint-creation
+  safe: true # WD
   components:
   - type: SpawnArtifact
     maxSpawns: 5

Resources/Prototypes/XenoArch/Effects/utility_effects.yml

@@ -4,6 +4,7 @@
   id: EffectIntercom
   targetDepth: 2
   effectHint: artifact-effect-hint-communication
+  safe: true # WD
   permanentComponents:
   - type: RadioMicrophone
     powerRequired: false
@@ -31,6 +32,7 @@
   id: EffectRandomInstrument
   targetDepth: 2
   effectHint: artifact-effect-hint-mental
+  safe: true # WD
   permanentComponents:
   - type: Instrument
   - type: ActivatableUI
@@ -43,6 +45,7 @@
   id: EffectStorage
   targetDepth: 2
   effectHint: artifact-effect-hint-storage
+  safe: true # WD
   whitelist:
     components:
     - Item # it doesnt necessarily have to be restricted from structures, but i think it'll be better that way
@@ -62,6 +65,7 @@
   id: EffectPhasing
   targetDepth: 2
   effectHint: artifact-effect-hint-phasing
+  safe: true # WD
   permanentComponents:
   - type: PhasingArtifact
 
@@ -83,6 +87,7 @@
   id: EffectSolutionStorage
   targetDepth: 2
   effectHint: artifact-effect-hint-storage
+  safe: true # WD
   whitelist:
     components:
     - Item
@@ -112,6 +117,7 @@
   id: EffectSpeedUp
   targetDepth: 2
   effectHint: artifact-effect-hint-displacement
+  safe: true # WD
   whitelist:
     components:
     - Item
@@ -124,6 +130,7 @@
   id: EffectDrill
   targetDepth: 3
   effectHint: artifact-effect-hint-drill
+  safe: true # WD
   whitelist:
     components:
     - Item
@@ -142,6 +149,7 @@
   id: EffectPowerGen20K
   targetDepth: 3
   effectHint: artifact-effect-hint-release
+  safe: true # WD
   blacklist:
     components:
     - Item
@@ -159,6 +167,7 @@
   id: EffectBigIron
   targetDepth: 3
   effectHint: artifact-effect-hint-gun
+  safe: true # WD
   whitelist:
     components:
     - Item
@@ -192,6 +201,7 @@
   id: EffectSentience
   targetDepth: 3
   effectHint: artifact-effect-hint-sentience
+  safe: true # WD
   permanentComponents:
   - type: GhostRole
     allowMovement: true
@@ -208,6 +218,7 @@
   id: EffectMultitool
   targetDepth: 3
   effectHint: artifact-effect-hint-multitool
+  safe: true # WD
   whitelist:
     components:
     - Item