Cult update (#220)

* - tweak: Cult door not bump openable.

* - tweak: Better summoning and Narsie

* - tweak: Construct update.

* - tweak: Eldrich blade fits in suit storage.

* - tweak: More spell limit.

* - fix: Fix pylon desc.

* - tweak: Teleport works on cuffed targets.

* - tweak: More popups if target is holy.

* - fix: No rune drawing using fingers.

* - tweak: Better pylon placement & less pylon healing range.

* - tweak: More blood rites charge.

* - fix: Fix max spell amount.

* - tweak: Less cult door and wall health.

* - fix: Constructs are dead IC.

* - add: Revive rune now notifies player.

* - add: Narsie summon rune eui.

* - fix: Fix narsie summon sound not playing for reapers.

* - tweak: Whatever.

* - add: Conceal presence spell.

* - tweak: Tweakz.

* - add: Blood spear.

* - add: Blood boil barrage.

* - tweak: Artificer flies.

* - tweak: Blood bolt color tweaks.

* - tweak: Runic door is bump openable again.

* - fix: Fix concealed door outline.

* - add: Update concealable name and desc.

* - tweak: Remove the unremoveable.

* - tweak: Gift ignore.

* - add: Organs regenerate on rejuvenate.

* - tweak: Brainless cultist is fine.

* - add: Added more fun.

* - add: Add rune descriptions.

* - fix: Fixes.

* - tweak: Blood rites now uses verb.

* - tweak: Bring it back.

Content.Client/_White/Cult/UI/StructureRadial/CultPylonPlacementHijack.cs

@@ -0,0 +1,82 @@
+using System.Linq;
+using Content.Client.Construction;
+using Content.Shared.Construction.Prototypes;
+using Content.Shared.Popups;
+using Robust.Client.Placement;
+using Robust.Client.Utility;
+using Robust.Shared.Map;
+
+namespace Content.Client._White.Cult.UI.StructureRadial;
+
+public sealed class CultPylonPlacementHijack : PlacementHijack
+{
+    private readonly ConstructionSystem _constructionSystem;
+    private readonly IEntityManager _entMan;
+    private readonly ConstructionPrototype? _prototype;
+    private readonly EntityUid _player;
+
+    public override bool CanRotate { get; }
+
+    public CultPylonPlacementHijack(ConstructionPrototype? prototype, IEntityManager entMan, EntityUid player)
+    {
+        _prototype = prototype;
+        _entMan = entMan;
+        _player = player;
+        _constructionSystem = entMan.System<ConstructionSystem>();
+        CanRotate = prototype?.CanRotate ?? true;
+    }
+
+    /// <inheritdoc />
+    public override bool HijackPlacementRequest(EntityCoordinates coordinates)
+    {
+        if (_prototype == null)
+            return true;
+
+        if (CheckForStructure(coordinates))
+        {
+            var popup = _entMan.System<SharedPopupSystem>();
+            popup.PopupClient(Loc.GetString("cult-structure-craft-another-structure-nearby"), _player, _player);
+            return true;
+        }
+
+        _constructionSystem.ClearAllGhosts();
+        var dir = Manager.Direction;
+        _constructionSystem.SpawnGhost(_prototype, coordinates, dir);
+
+        return true;
+    }
+
+    private bool CheckForStructure(EntityCoordinates coordinates)
+    {
+        var lookupSystem = _entMan.System<EntityLookupSystem>();
+        var entities = lookupSystem.GetEntitiesInRange(coordinates, 10f);
+        foreach (var ent in entities)
+        {
+            if (!_entMan.TryGetComponent<MetaDataComponent>(ent, out var metadata))
+                continue;
+
+            if (metadata.EntityPrototype?.ID is "CultPylon")
+                return true;
+        }
+
+        return false;
+    }
+
+    /// <inheritdoc />
+    public override bool HijackDeletion(EntityUid entity)
+    {
+        if (IoCManager.Resolve<IEntityManager>().HasComponent<ConstructionGhostComponent>(entity))
+        {
+            _constructionSystem.ClearGhost(entity.GetHashCode());
+        }
+
+        return true;
+    }
+
+    /// <inheritdoc />
+    public override void StartHijack(PlacementManager manager)
+    {
+        base.StartHijack(manager);
+        manager.CurrentTextures = _prototype?.Layers.Select(sprite => sprite.DirFrame0()).ToList();
+    }
+}

Content.Client/_White/Cult/UI/StructureRadial/StructureCraftBoundUserInterface.cs

@@ -86,43 +86,23 @@ public sealed class StructureCraftBoundUserInterface : BoundUserInterface
         if (construct == null)
             return;
 
-        var player = _player.LocalPlayer?.ControlledEntity;
+        var player = _player.LocalEntity;
 
         if (player == null)
             return;
 
-        if (construct.ID == "CultPylon" && CheckForStructure(player, id))
-        {
-            var popup = _entMan.System<SharedPopupSystem>();
-            popup.PopupClient(Loc.GetString("cult-structure-craft-another-structure-nearby"), player.Value, player.Value);
-            return;
-        }
+        PlacementHijack hijack;
 
-        var constructSystem = _systemManager.GetEntitySystem<ConstructionSystem>();
-        var hijack = new ConstructionPlacementHijack(constructSystem, construct);
+        if (construct.ID == "CultPylon")
+        {
+            hijack = new CultPylonPlacementHijack(construct, _entMan, player.Value);
+        }
+        else
+        {
+            var constructSystem = _systemManager.GetEntitySystem<ConstructionSystem>();
+            hijack = new ConstructionPlacementHijack(constructSystem, construct);
+        }
 
         _placement.BeginPlacing(newObj, hijack);
     }
-
-    private bool CheckForStructure(EntityUid? uid, string id)
-    {
-        if (uid == null)
-            return false;
-
-        if (!_entMan.TryGetComponent<TransformComponent>(uid, out var transform))
-            return false;
-
-        var lookupSystem = _entMan.System<EntityLookupSystem>();
-        var entities = lookupSystem.GetEntitiesInRange(transform.Coordinates, 15f);
-        foreach (var ent in entities)
-        {
-            if (!_entMan.TryGetComponent<MetaDataComponent>(ent, out var metadata))
-                continue;
-
-            if (metadata.EntityPrototype?.ID == id)
-                return true;
-        }
-
-        return false;
-    }
 }