Cinka/OldThink
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

- tweak: Nerf blight. (#263)

Browse Source 
* - tweak: Nerf blight.

* - tweak: ... But bible no longer works.
This commit is contained in:
Aviu00
2024-04-02 23:18:05 +09:00
committed by GitHub
parent b635d4efaf
commit b5cede485d
8 changed files with 32 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Content.Server/Revenant/Components/BlightComponent.cs
View File

@@ -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;

19
Content.Server/Revenant/Components/CureBlight.cs Normal file
View File

@@ -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);
}
}

2
Content.Server/Revenant/EntitySystems/BlightSystem.cs
View File

@@ -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));
}
}

7
Content.Server/Revenant/EntitySystems/RevenantSystem.Abilities.cs
View File

@@ -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);