SpiderSystem refactor and rename

Content.Server/WebPlacer/WebPlacerSystem.cs

@@ -0,0 +1,100 @@
+using System.Linq;
+using Content.Server.Popups;
+using Content.Shared.Maps;
+using Content.Shared.WebPlacer;
+using Content.Shared.Whitelist;
+using Robust.Server.GameObjects;
+using Robust.Shared.Audio;
+using Robust.Shared.Audio.Systems;
+using Robust.Shared.Map;
+using Robust.Shared.Map.Components;
+
+namespace Content.Server.WebPlacer;
+
+/// <summary>
+/// Spawns entities (probably webs) around the component owner. Action handled by <see cref="SharedWebPlacerSystem"/>.
+/// </summary>
+public sealed class WebPlacerSystem : SharedWebPlacerSystem
+{
+    [Dependency] private readonly EntityLookupSystem _lookup = default!;
+    [Dependency] private readonly EntityWhitelistSystem _whitelistSystem = default!;
+    [Dependency] private readonly ITileDefinitionManager _tile = default!;
+    [Dependency] private readonly PopupSystem _popup = default!;
+    [Dependency] private readonly SharedAudioSystem _audio = default!;
+    [Dependency] private readonly SharedMapSystem _map = default!;
+
+    public override void Initialize()
+    {
+        base.Initialize();
+
+        SubscribeLocalEvent<WebPlacerComponent, SpiderWebActionEvent>(OnSpawnNet);
+    }
+
+    private void OnSpawnNet(EntityUid uid, WebPlacerComponent component, SpiderWebActionEvent args)
+    {
+        if (args.Handled)
+            return;
+
+        var transform = Transform(uid);
+        var grid = transform.GridUid;
+
+        // Instantly fail in space
+        if (!TryComp<MapGridComponent>(grid, out var gridComp))
+        {
+            _popup.PopupEntity(Loc.GetString(component.MessageOffGrid), args.Performer, args.Performer);
+            return;
+        }
+
+        var coords = transform.Coordinates;
+        var spawnPos = component.OffsetVectors.Select(v => coords.Offset(v));
+
+        bool success = false;
+        foreach (var pos in spawnPos)
+        {
+            if (!IsValidTile(pos, component.DestinationWhitelist, component.DestinationBlacklist, grid.Value, gridComp))
+                continue;
+
+            Spawn(component.WebPrototype, pos);
+            success = true;
+        }
+
+        // Return if nothing was spawned
+        if (!success)
+        {
+            _popup.PopupEntity(Loc.GetString(component.MessageFail), args.Performer, args.Performer);
+            return;
+        }
+
+        args.Handled = true;
+        _popup.PopupEntity(Loc.GetString(component.MessageSuccess), args.Performer, args.Performer);
+
+        if (component.WebSound != null)
+            _audio.PlayPvs(component.WebSound, uid);
+    }
+
+    private bool IsValidTile(EntityCoordinates coords, EntityWhitelist? whitelist, EntityWhitelist? blacklist, EntityUid grid, MapGridComponent gridComp)
+    {
+        // Don't place webs in space
+        if (!_map.TryGetTileRef(grid, gridComp, coords, out var tileRef) ||
+            tileRef.IsSpace(_tile))
+            return false;
+
+        // Don't place webs on webs
+        if (blacklist != null)
+            foreach (var entity in _lookup.GetEntitiesIntersecting(coords, LookupFlags.Uncontained))
+                if (_whitelistSystem.IsBlacklistPass(blacklist, entity))
+                    return false;
+
+        // Only place webs on webs
+        if (whitelist != null)
+        {
+            foreach (var entity in _lookup.GetEntitiesIntersecting(coords, LookupFlags.Uncontained))
+                if (_whitelistSystem.IsWhitelistPass(whitelist, entity))
+                    return true;
+
+            return false;
+        }
+
+        return true;
+    }
+}

Content.Shared/IgnoreSpiderWeb/IgnoreSpiderWebComponent.cs

@@ -0,0 +1,10 @@
+namespace Content.Shared.IgnoreSpiderWeb;
+
+/// <summary>
+/// Marker component for entities that ignore spiderwebs.
+/// </summary>
+[RegisterComponent]
+public sealed partial class IgnoreSpiderWebComponent : Component
+{
+
+}

Content.Shared/WebPlacer/SharedWebPlacerSystem.cs

@@ -0,0 +1,23 @@
+using Content.Shared.Actions;
+
+namespace Content.Shared.WebPlacer;
+
+/// <summary>
+/// Gives the component owner (probably a spider) an action to spawn entites around itself. Spawning handled by <see cref="WebPlacerSystem"/>.
+/// </summary>
+public abstract class SharedWebPlacerSystem : EntitySystem
+{
+    [Dependency] private readonly SharedActionsSystem _action = default!;
+
+    public override void Initialize()
+    {
+        base.Initialize();
+
+        SubscribeLocalEvent<WebPlacerComponent, MapInitEvent>(OnInit);
+    }
+
+    private void OnInit(EntityUid uid, WebPlacerComponent component, MapInitEvent args)
+    {
+        _action.AddAction(uid, ref component.ActionEntity, component.SpawnWebAction, uid);
+    }
+}

Content.Shared/WebPlacer/WebPlacerComponent.cs

@@ -0,0 +1,81 @@
+using Content.Shared.Actions;
+using Content.Shared.Whitelist;
+using Robust.Shared.Audio;
+using Robust.Shared.GameStates;
+using Robust.Shared.Prototypes;
+
+namespace Content.Shared.WebPlacer;
+
+/// <summary>
+/// Gives the entity (probably a spider) an ability to spawn entites (probably webs) around itself.
+/// </summary>
+[RegisterComponent, NetworkedComponent]
+[Access(typeof(SharedWebPlacerSystem))]
+public sealed partial class WebPlacerComponent : Component
+{
+    /// <summary>
+    /// Id of the entity getting spawned.
+    /// </summary>
+    [DataField]
+    public EntProtoId WebPrototype = "SpiderWeb";
+
+    /// <summary>
+    /// Id of the action that will be given.
+    /// </summary>
+    [ViewVariables(VVAccess.ReadOnly)]
+    [DataField]
+    public EntProtoId SpawnWebAction = "ActionSpiderWeb";
+
+    /// <summary>
+    /// Action given to the player.
+    /// </summary>
+    //[ViewVariables]
+    public EntityUid? ActionEntity;
+
+    /// <summary>
+    /// Whitelist of entities proto will only spawn on.
+    /// </summary>
+    [DataField]
+    public EntityWhitelist? DestinationWhitelist;
+
+    /// <summary>
+    /// Blacklist of entities proto won't spawn on.
+    /// </summary>
+    [DataField]
+    public EntityWhitelist? DestinationBlacklist;
+
+    /// <summary>
+    /// Sound played when successfully spawning something.
+    /// </summary>
+    [DataField]
+    public SoundSpecifier? WebSound =
+            new SoundPathSpecifier("/Audio/Effects/spray3.ogg")
+            {
+                Params = AudioParams.Default.WithVariation(0.125f),
+            };
+
+    /// <summary>
+    /// Vectors determining where the entities will spawn.
+    /// </summary>
+    [DataField]
+    public List<Vector2i> OffsetVectors = new()
+    {
+        Vector2i.Zero,
+        Vector2i.Up,
+        Vector2i.Down,
+        Vector2i.Left,
+        Vector2i.Right,
+    };
+
+    // Localization files for popup text.
+    [DataField]
+    public LocId MessageOffGrid = "spider-web-action-nogrid";
+    [DataField]
+    public LocId MessageSuccess = "spider-web-action-success";
+    [DataField]
+    public LocId MessageFail = "spider-web-action-fail";
+}
+
+public sealed partial class SpiderWebActionEvent : InstantActionEvent
+{
+}

Resources/Locale/en-US/actions/actions/spider.ftl

@@ -1,5 +1,5 @@
 spider-web-action-nogrid = There is no floor under you!
-spider-web-action-success = You place webs around you.
-spider-web-action-fail = You can't place webs here! All cardinal directions already have webs!
+spider-web-action-success = You spin webs around you.
+spider-web-action-fail = There is no room to spin your webs!
 
 sericulture-failure-hunger = Your stomach is too empty to make any more webs!

Resources/Prototypes/Actions/spider.yml

@@ -1,3 +1,4 @@
+# Default prototype used by WebPlacerComponent
 - type: entity
   id: ActionSpiderWeb
   name: Spider Web