- tweak: Nerf blight. (#263)

* - tweak: Nerf blight.

* - tweak: ... But bible no longer works.

Content.Server/Bible/BibleSystem.cs

@@ -119,7 +119,7 @@ namespace Content.Server.Bible
             }
 
             // WD START
-            if (HasComp<BlightComponent>(args.Target.Value))
+            /*if (HasComp<BlightComponent>(args.Target.Value))
             {
                 var othersMessage = Loc.GetString(component.LocPrefix + "-blight-success-others", ("user", Identity.Entity(args.User, EntityManager)), ("target", Identity.Entity(args.Target.Value, EntityManager)), ("bible", uid));
                 _popupSystem.PopupEntity(othersMessage, args.User, Filter.PvsExcept(args.User), true, PopupType.Medium);
@@ -130,7 +130,7 @@ namespace Content.Server.Bible
                 _delay.TryResetDelay((uid, useDelay));
                 RemCompDeferred<BlightComponent>(args.Target.Value);
                 return;
-            }
+            }*/
             // WD END
 
             // This only has a chance to fail if the target is not wearing anything on their head and is not a familiar.

Content.Server/Revenant/Components/BlightComponent.cs

@@ -16,7 +16,7 @@ public sealed partial class BlightComponent : Component
     public float Delay;
 
     [ViewVariables(VVAccess.ReadWrite)]
-    public TimeSpan SleepingCureTime = TimeSpan.FromSeconds(25);
+    public TimeSpan SleepingCureTime = TimeSpan.FromSeconds(15);
 
     [ViewVariables(VVAccess.ReadWrite)]
     public float SleepDelay;

Content.Server/Revenant/Components/CureBlight.cs

@@ -0,0 +1,19 @@
+using Content.Shared.Chemistry.Reagent;
+using JetBrains.Annotations;
+using Robust.Shared.Prototypes;
+
+namespace Content.Server.Revenant.Components;
+
+[UsedImplicitly]
+public sealed partial class CureBlight : ReagentEffect
+{
+    protected override string? ReagentEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys)
+    {
+        return null;
+    }
+
+    public override void Effect(ReagentEffectArgs args)
+    {
+        args.EntityManager.RemoveComponentDeferred<BlightComponent>(args.SolutionEntity);
+    }
+}

Content.Server/Revenant/EntitySystems/BlightSystem.cs

@@ -92,6 +92,6 @@ public sealed class BlightSystem : EntitySystem
 
     private void SetDelay(BlightComponent comp)
     {
-        comp.MaxDelay = TimeSpan.FromSeconds(_random.Next(10, 30));
+        comp.MaxDelay = TimeSpan.FromSeconds(_random.Next(20, 50));
     }
 }

Content.Server/Revenant/EntitySystems/RevenantSystem.Abilities.cs

@@ -15,9 +15,9 @@ using Content.Shared.Item;
 using Content.Shared.Bed.Sleep;
 using System.Linq;
 using System.Numerics;
-using Content.Server.Bible.Components;
 using Content.Server.Maps;
 using Content.Server.Revenant.Components;
+using Content.Shared._White.Cult.Components;
 using Content.Shared.DoAfter;
 using Content.Shared.Emag.Systems;
 using Content.Shared.FixedPoint;
@@ -334,10 +334,11 @@ public sealed partial class RevenantSystem
         args.Handled = true;
 
         // WD START
-        var query = GetEntityQuery<BibleUserComponent>();
+        var cultistQuery = GetEntityQuery<CultistComponent>();
+        var humanoidQuery = GetEntityQuery<HumanoidAppearanceComponent>();
         foreach (var e in _lookup.GetEntitiesInRange(uid, component.BlightRadius))
         {
-            if (!_mobState.IsAlive(e) || query.HasComponent(e))
+            if (!humanoidQuery.HasComponent(e) || !_mobState.IsAlive(e) || cultistQuery.HasComponent(e))
                 continue;
 
             var blight = EnsureComp<BlightComponent>(e);

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

@@ -16,6 +16,7 @@ using Content.Server.Chemistry.Components;
 using Content.Server.Chemistry.Containers.EntitySystems;
 using Content.Server.Fluids.Components;
 using Content.Server.Ghost;
+using Content.Server.Revenant.Components;
 using Content.Shared._White.Chaplain;
 using Content.Shared.Chemistry.Components.SolutionManager;
 using Content.Shared.Cuffs.Components;
@@ -547,6 +548,8 @@ public sealed partial class CultSystem : EntitySystem
 
         _statusEffectsSystem.TryRemoveStatusEffect(target, "Muted");
 
+        RemCompDeferred<BlightComponent>(target);
+
         return true;
     }
 

Content.Shared/Revenant/Components/CorporealComponent.cs

@@ -11,5 +11,5 @@ public sealed partial class CorporealComponent : Component
     /// The debuff applied when the component is present.
     /// </summary>
     [ViewVariables(VVAccess.ReadWrite)]
-    public float MovementSpeedDebuff = 0.66f;
+    public float MovementSpeedDebuff = 0.4f; // WD EDIT
 }

Resources/Prototypes/Reagents/medicine.yml

@@ -1032,6 +1032,7 @@
             Heat: -0.2
             Shock: -0.2
             Cold: -0.2
+      - !type:CureBlight
       - !type:DeconvertCultist
         conditions:
           - !type:ReagentThreshold