Make projectiles not hit crates unless clicked on (#28072)

diff --git a/Content.Shared/Damage/Components/RequireProjectileTargetComponent.cs b/Content.Shared/Damage/Components/RequireProjectileTargetComponent.cs
new file mode 100644 (file)
index 0000000..5bd8292
--- /dev/null
+++ b/Content.Shared/Damage/Components/RequireProjectileTargetComponent.cs
@@ -0,0 +1,14 @@
+using Robust.Shared.GameStates;
+
+namespace Content.Shared.Damage.Components;
+
+/// <summary>
+/// Prevent the object from getting hit by projetiles unless you target the object.
+/// </summary>
+[RegisterComponent, NetworkedComponent, AutoGenerateComponentState]
+[Access(typeof(RequireProjectileTargetSystem))]
+public sealed partial class RequireProjectileTargetComponent : Component
+{
+    [DataField, AutoNetworkedField]
+    public bool Active = true;
+}

diff --git a/Content.Shared/Damage/Systems/RequireProjectileTargetSystem.cs b/Content.Shared/Damage/Systems/RequireProjectileTargetSystem.cs
new file mode 100644 (file)
index 0000000..79b374a
--- /dev/null
+++ b/Content.Shared/Damage/Systems/RequireProjectileTargetSystem.cs
@@ -0,0 +1,51 @@
+using Content.Shared.Projectiles;
+using Content.Shared.Weapons.Ranged.Components;
+using Content.Shared.Standing;
+using Robust.Shared.Physics.Events;
+
+namespace Content.Shared.Damage.Components;
+
+public sealed class RequireProjectileTargetSystem : EntitySystem
+{
+    public override void Initialize()
+    {
+        SubscribeLocalEvent<RequireProjectileTargetComponent, PreventCollideEvent>(PreventCollide);
+        SubscribeLocalEvent<RequireProjectileTargetComponent, StoodEvent>(StandingBulletHit);
+        SubscribeLocalEvent<RequireProjectileTargetComponent, DownedEvent>(LayingBulletPass);
+    }
+
+    private void PreventCollide(Entity<RequireProjectileTargetComponent> ent, ref PreventCollideEvent args)
+    {
+        if (args.Cancelled)
+          return;
+
+        if (!ent.Comp.Active)
+            return;
+
+        var other = args.OtherEntity;
+        if (HasComp<ProjectileComponent>(other) &&
+            CompOrNull<TargetedProjectileComponent>(other)?.Target != ent)
+        {
+            args.Cancelled = true;
+        }
+    }
+
+    private void SetActive(Entity<RequireProjectileTargetComponent> ent, bool value)
+    {
+        if (ent.Comp.Active == value)
+            return;
+
+        ent.Comp.Active = value;
+        Dirty(ent);
+    }
+
+    private void StandingBulletHit(Entity<RequireProjectileTargetComponent> ent, ref StoodEvent args)
+    {
+        SetActive(ent, false);
+    }
+
+    private void LayingBulletPass(Entity<RequireProjectileTargetComponent> ent, ref DownedEvent args)
+    {
+        SetActive(ent, true);
+    }
+}

diff --git a/Content.Shared/Mobs/Systems/MobStateSystem.Subscribers.cs b/Content.Shared/Mobs/Systems/MobStateSystem.Subscribers.cs
index ee747554e14bdc70db441e8adc8f97d3bb7d0374..08b351e61e85e7221dbf281bea1166d4d5e8c2a2 100644 (file)
--- a/Content.Shared/Mobs/Systems/MobStateSystem.Subscribers.cs
+++ b/Content.Shared/Mobs/Systems/MobStateSystem.Subscribers.cs
@@ -46,7 +46,6 @@ public partial class MobStateSystem
         SubscribeLocalEvent<MobStateComponent, TryingToSleepEvent>(OnSleepAttempt);
         SubscribeLocalEvent<MobStateComponent, CombatModeShouldHandInteractEvent>(OnCombatModeShouldHandInteract);
         SubscribeLocalEvent<MobStateComponent, AttemptPacifiedAttackEvent>(OnAttemptPacifiedAttack);
-        SubscribeLocalEvent<MobStateComponent, PreventCollideEvent>(OnPreventCollide);
     }
 
     private void OnStateExitSubscribers(EntityUid target, MobStateComponent component, MobState state)
@@ -179,21 +178,5 @@ public partial class MobStateSystem
         args.Cancelled = true;
     }
 
-    private void OnPreventCollide(Entity<MobStateComponent> ent, ref PreventCollideEvent args)
-    {
-        if (args.Cancelled)
-            return;
-
-        if (IsAlive(ent, ent))
-            return;
-
-        var other = args.OtherEntity;
-        if (HasComp<ProjectileComponent>(other) &&
-            CompOrNull<TargetedProjectileComponent>(other)?.Target != ent.Owner)
-        {
-            args.Cancelled = true;
-        }
-    }
-
     #endregion
 }

diff --git a/Resources/Prototypes/Entities/Mobs/base.yml b/Resources/Prototypes/Entities/Mobs/base.yml
index 0a2b68d0a1dadec0fefbe711436843baa9546a38..fae47113107d8c5a98e95f47d7cebb538247eaa2 100644 (file)
--- a/Resources/Prototypes/Entities/Mobs/base.yml
+++ b/Resources/Prototypes/Entities/Mobs/base.yml
@@ -1,4 +1,4 @@
-# The progenitor. This should only container the most basic components possible.
+# The progenitor. This should only container the most basic components possible.
 # Only put things on here if every mob *must* have it. This includes ghosts.
 - type: entity
   save: false
@@ -43,6 +43,8 @@
   - type: MovementSpeedModifier
   - type: Polymorphable
   - type: StatusIcon
+  - type: RequireProjectileTarget
+    active: False
 
 # Used for mobs that have health and can take damage.
 - type: entity

diff --git a/Resources/Prototypes/Entities/Structures/Storage/Crates/base_structurecrates.yml b/Resources/Prototypes/Entities/Structures/Storage/Crates/base_structurecrates.yml
index 2d84541231eb3d5f0259f79e9e8f19ae7ab03f0a..01c226cb0fd064b0e3320010e9cf01b2e4bcc875 100644 (file)
--- a/Resources/Prototypes/Entities/Structures/Storage/Crates/base_structurecrates.yml
+++ b/Resources/Prototypes/Entities/Structures/Storage/Crates/base_structurecrates.yml
@@ -89,6 +89,7 @@
     node: crategenericsteel
     containers:
       - entity_storage
+  - type: RequireProjectileTarget
 
 - type: entity
   parent: CrateGeneric