Фиксы культа

Content.Server/_White/Cult/Runes/Systems/CultSystem.Rune.cs

@@ -306,16 +306,14 @@ public sealed partial class CultSystem : EntitySystem
 
     private void HandleCollision(EntityUid uid, CultRuneBaseComponent component, ref StartCollideEvent args)
     {
-        if (!TryComp<SolutionContainerManagerComponent>(args.OtherEntity, out var solution))
+        if (!TryComp<SolutionContainerManagerComponent>(args.OtherEntity, out var solution) || solution.Solutions == null)
         {
             return;
         }
-#pragma warning disable RA0002
+        if (solution.Solutions.TryGetValue("vapor", out var vapor) && vapor.Contents.Any(x => x.Reagent.Prototype == "HolyWater"))
-        if (solution.Solutions!.TryGetValue("vapor", out var vapor) && vapor.Contents.Any(x => x.Reagent.Prototype == "HolyWater"))
         {
             Del(uid);
         }
-#pragma warning restore RA0002
     }
 
     //Erasing end

Content.Server/_White/Cult/Structures/RunicGirderComponent.cs

@@ -1,11 +0,0 @@
-namespace Content.Server.White.Cult.Structures;
-
-[RegisterComponent]
-public sealed partial class RunicGirderComponent : Component
-{
-    [ViewVariables(VVAccess.ReadOnly)]
-    public string UsedItemID = "RitualDagger";
-
-    [ViewVariables(VVAccess.ReadOnly)]
-    public string DropItemID = "CultRunicMetal1";
-}

Content.Server/_White/Cult/Structures/RunicGirderSystem.cs

@@ -1,30 +0,0 @@
-using Content.Shared.Interaction;
-using Content.Shared.White.Cult;
-
-namespace Content.Server.White.Cult.Structures;
-
-public sealed class RunicGirderSystem : EntitySystem
-{
-    [Dependency] private readonly EntityManager _entMan = default!;
-
-    public override void Initialize()
-    {
-        base.Initialize();
-
-        SubscribeLocalEvent<RunicGirderComponent, AfterInteractUsingEvent>(OnInteract);
-    }
-
-    private void OnInteract(EntityUid uid, RunicGirderComponent component, AfterInteractUsingEvent args)
-    {
-        if (!HasComp<CultistComponent>(args.User))
-            return;
-        if (MetaData(args.Used).EntityPrototype?.ID != component.UsedItemID)
-            return;
-        if (args.Target == null)
-            return;
-
-        var pos = Transform(args.Target.Value).Coordinates;
-        _entMan.DeleteEntity(args.Target.Value);
-        _entMan.SpawnEntity(component.DropItemID, pos);
-    }
-}

Content.Shared/Chemistry/Components/SolutionManager/SolutionContainerManagerComponent.cs

@@ -32,5 +32,7 @@ public sealed partial class SolutionContainerManagerComponent : Component
     /// Should be null after mapinit.
     /// </remarks>
     [DataField, AutoNetworkedField]
+    [Access(typeof(SharedSolutionContainerSystem), Friend = AccessPermissions.ReadWriteExecute,
+        Other = AccessPermissions.ReadExecute)]
     public Dictionary<string, Solution>? Solutions = null;
 }

Resources/Prototypes/Entities/Objects/Weapons/Melee/cult.yml

@@ -37,6 +37,9 @@
     interfaces:
       - key: enum.ListViewSelectorUiKey.Key
         type: ListViewSelectorBUI
+  - type: Tool
+    qualities:
+    - Dagger
 
 - type: entity
   name: eldritch blade

Resources/Prototypes/Entities/Structures/Walls/walls.yml

@@ -198,11 +198,11 @@
     thresholds:
     - trigger:
         !type:DamageTrigger
-        damage: 300
+        damage: 600
       behaviors:
       - !type:SpawnEntitiesBehavior
         spawn:
-          Girder:
+          CultGirder:
             min: 1
             max: 1
       - !type:DoActsBehavior
@@ -210,6 +210,9 @@
   - type: IconSmooth
     key: walls
     base: cult
+  - type: Construction
+    graph: CultGirder
+    node: wall
 
 - type: entity
   parent: BaseWall

Resources/Prototypes/White/Mobs/Species/harpy.yml

@@ -30,6 +30,14 @@
         type: HumanoidMarkingModifierBoundUserInterface
       - key: enum.StrippingUiKey.Key
         type: StrippableBoundUserInterface
+      # WD-EDIT
+      - key: enum.NameSelectorUIKey.Key
+        type: NameSelectorBUI
+      - key: enum.RuneTeleporterUiKey.Key
+        type: TeleportRunesListWindowBUI
+      - key: enum.SummonCultistUiKey.Key
+        type: SummonCultistListWindowBUI
+      # WD-EDIT END
   - type: Sprite
     scale: 0.9, 0.9
     layers:

Resources/Prototypes/_White/Construction/Cult/graphs.yml

@@ -1,4 +1,4 @@
-- type: constructionGraph
+- type: constructionGraph
   id: CultGirder
   start: start
   graph:
@@ -24,8 +24,7 @@
           conditions:
             - !type:EntityAnchored
           steps:
-            - tool: Screwing
+            - tool: Dagger
-              doAfter: 2
         - to: wall
           completed:
             - !type:SnapToGrid
@@ -45,8 +44,7 @@
               prototype: CultRunicMetal1
               amount: 1
           steps:
-            - tool: Welding
+            - tool: Dagger
-              doAfter: 10
 
 - type: constructionGraph
   id: AirlockGlassCult

Resources/Prototypes/_White/Entities/Cult/Items/tome_craft.yml

@@ -35,6 +35,16 @@
       sprite: Clothing/Eyes/Misc/blindfold.rsi
     - type: FlashImmunity
     - type: EyeProtection
+    - type: ClothingGrantComponent
+      component:
+      - type: NightVision
+        color: White
+      - type: ShowWhiteHealthBars
+        damageContainers:
+        - Biological
+    - type: ShowHealthIcons
+      damageContainers:
+      - Biological
 
 - type: entity
   name: veil shifter
@@ -148,7 +158,6 @@
         - runic
         - runic_2
         - runic_3
-      sizeMultiplier: 0.17
     - type: Appearance
     - type: RunicMetal
     - type: UserInterface
@@ -156,6 +165,7 @@
         - key: enum.CultStructureCraftUiKey.Key
           type: StructureCraftBoundUserInterface
     - type: Item
+      size: Normal
 
 - type: entity
   parent: CultRunicMetal
@@ -166,9 +176,6 @@
       state: runic
     - type: Stack
       count: 1
-      sizeMultiplier: 0.17
-    - type: Item
-      size: 1
 
 - type: entity
   parent: CultRunicMetal
@@ -179,6 +186,3 @@
       state: runic
     - type: Stack
       count: 20
-      sizeMultiplier: 0.17
-    - type: Item
-      size: 3

Resources/Prototypes/_White/Entities/Cult/other_structures.yml

@@ -89,4 +89,3 @@
     - type: Construction
       graph: CultGirder
       node: girder
-    - type: RunicGirder

Resources/Prototypes/_White/Object/wetstone.yml

@@ -1,4 +1,4 @@
-- type: entity
+- type: entity
   id: WetStone
   parent: BaseItem
   name: wet stone
@@ -11,7 +11,7 @@
       size: 1
       state: sharpener
     - type: Item
-      size: 10
+      size: Small
       sprite: White/Items/Misc/wetstone.rsi
 
 - type: entity

Resources/Prototypes/_White/tool_qualities.yml

@@ -0,0 +1,6 @@
+- type: tool
+  id: Dagger
+  name: ritual dagger
+  toolName: ritual dagger
+  spawn: RitualDagger
+  icon: { sprite: Objects/Weapons/Melee/cult_dagger.rsi, state: icon }