Add gore and item drop on consumption, fix spray crash in debug

TheArturZh · TheArturZh · commit 21c210bfce32 · 2024-01-25T19:58:07.000+03:00
diff --git a/Content.Server/Chemistry/TileReactions/CleanTileReaction.cs b/Content.Server/Chemistry/TileReactions/CleanTileReaction.cs
@@ -4,6 +4,7 @@
 using Content.Shared.Chemistry.Reagent;
 using Content.Shared.FixedPoint;
 using Content.Shared.Fluids.Components;
+using Content.Shared.Tag;
 using Robust.Shared.Map;
 using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype;
 using System.Linq;
@@ -35,13 +36,20 @@ FixedPoint2 ITileReaction.TileReact(TileRef tile, ReagentPrototype reagent, Fixe
     {
         var entMan = IoCManager.Resolve<IEntityManager>();
         var entities = entMan.System<EntityLookupSystem>().GetLocalEntitiesIntersecting(tile, 0f).ToArray();
+        var tags = entMan.System<TagSystem>();
         var puddleQuery = entMan.GetEntityQuery<PuddleComponent>();
         var solutionContainerSystem = entMan.System<SolutionContainerSystem>();
         // Multiply as the amount we can actually purge is higher than the react amount.
         var purgeAmount = reactVolume / CleanAmountMultiplier;
 
         foreach (var entity in entities)
         {
+            if (tags.HasTag(entity, "ReactionCleanable"))
+            {
+                entMan.QueueDeleteEntity(entity);
+                continue;
+            }
+
             if (!puddleQuery.TryGetComponent(entity, out var puddle) ||
                 !solutionContainerSystem.TryGetSolution(entity, puddle.SolutionName, out var puddleSolution, out _))
             {
diff --git a/Content.Server/Fluids/EntitySystems/SpraySystem.cs b/Content.Server/Fluids/EntitySystems/SpraySystem.cs
@@ -5,7 +5,6 @@
 using Content.Server.Fluids.Components;
 using Content.Server.Gravity;
 using Content.Server.Popups;
-using Content.Shared.Disposal.Components;
 using Content.Shared.FixedPoint;
 using Content.Shared.Interaction;
 using Content.Shared.Timing;
@@ -16,6 +15,7 @@
 using Robust.Shared.Physics.Components;
 using Robust.Shared.Prototypes;
 using System.Numerics;
+using Content.Server.Disposal.Unit.Components;
 
 namespace Content.Server.Fluids.EntitySystems;
 
@@ -44,12 +44,14 @@ private void OnAfterInteract(Entity<SprayComponent> entity, ref AfterInteractEve
         if (args.Handled)
             return;
 
+        // SS220 Placeable-Spray begin
         //do not spray on table and disposal unit
         if (HasComp<PlaceableSurfaceComponent>(args.Target)
-            || HasComp<SharedDisposalUnitComponent>(args.Target))
+            || HasComp<DisposalUnitComponent>(args.Target))
         {
             return;
         }
+        // SS220 Placeable-Spray end
 
         args.Handled = true;
 
diff --git a/Content.Server/SS220/DarkReaper/DarkReaperSystem.cs b/Content.Server/SS220/DarkReaper/DarkReaperSystem.cs
@@ -1,4 +1,5 @@
 // © SS220, An EULA/CLA with a hosting restriction, full text: https://raw.githubusercontent.com/SerbiaStrong-220/space-station-14/master/CLA.txt
+using System.Numerics;
 using Content.Server.Actions;
 using Content.Server.AlertLevel;
 using Content.Server.Chat.Systems;
@@ -8,9 +9,12 @@
 using Content.Server.Station.Systems;
 using Content.Shared.Alert;
 using Content.Shared.Damage;
+using Content.Shared.Inventory;
 using Content.Shared.Mobs.Systems;
 using Content.Shared.SS220.DarkReaper;
 using Robust.Shared.Containers;
+using Robust.Shared.Physics.Systems;
+using Robust.Shared.Random;
 using Robust.Shared.Utility;
 
 namespace Content.Server.SS220.DarkReaper;
@@ -28,6 +32,10 @@ public sealed class DarkReaperSystem : SharedDarkReaperSystem
     [Dependency] private readonly StationSystem _station = default!;
     [Dependency] private readonly AlertLevelSystem _alertLevel = default!;
     [Dependency] private readonly ChatSystem _chat = default!;
+    [Dependency] private readonly InventorySystem _inventory = default!;
+    [Dependency] private readonly SharedTransformSystem _transform = default!;
+    [Dependency] private readonly IRobustRandom _random = default!;
+    [Dependency] private readonly SharedPhysicsSystem _physics = default!;
 
     private readonly ISawmill _sawmill = Logger.GetSawmill("DarkReaper");
 
@@ -69,18 +77,47 @@ protected override void OnAfterConsumed(EntityUid uid, DarkReaperComponent comp,
         {
             if (comp.PhysicalForm && target.IsValid() && !EntityManager.IsQueuedForDeletion(target) && _mobState.IsDead(target))
             {
-                if (_container.TryGetContainer(uid, DarkReaperComponent.ConsumedContainerId, out var container))
+                if (!_container.TryGetContainer(uid, DarkReaperComponent.ConsumedContainerId, out var container))
+                    return;
+
+                if (!_container.CanInsert(target, container))
+                    return;
+
+                // spawn gore
+                Spawn(comp.EntityToSpawnAfterConsuming, Transform(target).Coordinates);
+
+                // randomly drop inventory items
+                if (_inventory.TryGetContainerSlotEnumerator(target, out var slots))
                 {
-                    _container.Insert(target, container);
+                    while (slots.MoveNext(out var containerSlot))
+                    {
+                        if (containerSlot.ContainedEntity is not { } containedEntity)
+                            continue;
+
+                        if (!_random.Prob(comp.InventoryDropProbabilityOnConsumed))
+                            continue;
+
+                        if (!_container.TryRemoveFromContainer(containedEntity))
+                            continue;
+
+                        // set random rotation
+                        _transform.SetLocalRotationNoLerp(containedEntity, Angle.FromDegrees(_random.NextDouble(0, 360)));
+
+                        // apply random impulse
+                        var maxAxisImp = comp.SpawnOnDeathImpulseStrength;
+                        var impulseVec = new Vector2(_random.NextFloat(-maxAxisImp, maxAxisImp), _random.NextFloat(-maxAxisImp, maxAxisImp));
+                        _physics.ApplyLinearImpulse(containedEntity, impulseVec);
+                    }
                 }
 
+                _container.Insert(target, container);
                 _damageable.TryChangeDamage(uid, comp.HealPerConsume, true, origin: args.Args.User);
 
                 comp.Consumed++;
-
                 var stageBefore = comp.CurrentStage;
                 UpdateStage(uid, comp);
-                // warn a crew
+
+                // warn a crew if alert stage is reached
                 if (comp.CurrentStage > stageBefore && comp.CurrentStage == comp.AlertStage)
                 {
                     var reaperXform = Transform(uid);
@@ -93,6 +130,7 @@ protected override void OnAfterConsumed(EntityUid uid, DarkReaperComponent comp,
                     _chat.DispatchStationAnnouncement(stationUid ?? uid, announcement, sender, false, Color.Red);
                 }
 
+                // update consoom counter alert
                 UpdateAlert(uid, comp);
                 Dirty(uid, comp);
             }
diff --git a/Content.Shared/SS220/DarkReaper/DarkReaperComponent.cs b/Content.Shared/SS220/DarkReaper/DarkReaperComponent.cs
@@ -1,5 +1,6 @@
 // © 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.Damage;
+using Content.Shared.Decals;
 using Content.Shared.FixedPoint;
 using Robust.Shared.Audio;
 using Robust.Shared.GameStates;
@@ -184,9 +185,23 @@ public sealed partial class DarkReaperComponent : Component
         MaxDistance = 8
     });
 
-    [ViewVariables, DataField]
+    [ViewVariables(VVAccess.ReadOnly), DataField]
     public DamageSpecifier HealPerConsume = new();
 
+    /// <summary>
+    /// Entity that spawns when dark reaper consumes people.
+    /// Intended to be a replacement for giblets, as dark reaper no longer gibs people.
+    /// </summary>
+    [ViewVariables(VVAccess.ReadWrite), DataField]
+    public EntProtoId EntityToSpawnAfterConsuming = "SS220Gore";
+
+    /// <summary>
+    /// Probability than item in inventory slot gets dropped when target is consumed.
+    /// Rolls for each inventory slot.
+    /// </summary>
+    [ViewVariables(VVAccess.ReadWrite), DataField(serverOnly: true)]
+    public float InventoryDropProbabilityOnConsumed = 0.5f;
+
     /// STAGE PROGRESSION
 
     [ViewVariables, DataField, AutoNetworkedField]
diff --git a/Resources/Prototypes/SS220/DemonRofler/gore.yml b/Resources/Prototypes/SS220/DemonRofler/gore.yml
@@ -0,0 +1,22 @@
+- type: entity
+  id: SS220Gore
+  name: кровавые ошмётки
+  description: Страшно даже подумать о том, что стало с их бывшим владельцем.
+  components:
+  - type: Clickable
+  - type: Physics
+    bodyType: Static
+    canCollide: false
+  - type: Fixtures
+    fixtures:
+      fix1:
+        shape:
+          !type:PhysShapeAabb {}
+  - type: Sprite
+    drawdepth: DeadMobs
+    sprite: SS220/DemonRofler/dark_reaper.rsi
+    state: "randomgibs"
+    noRot: true
+  - type: Tag
+    tags:
+    - ReactionCleanable
diff --git a/Resources/Prototypes/SS220/tags.yml b/Resources/Prototypes/SS220/tags.yml
@@ -9,3 +9,6 @@
 
 - type: Tag
   id: SecDogWearable
+
+- type: Tag
+  id: ReactionCleanable
