ECS usedelay (#6348)
This commit is contained in:
@@ -1,5 +1,4 @@
|
||||
using System;
|
||||
using System.Diagnostics.CodeAnalysis;
|
||||
using System.Linq;
|
||||
using System.Threading.Tasks;
|
||||
using Content.Server.Administration.Logs;
|
||||
@@ -7,6 +6,7 @@ using Content.Server.CombatMode;
|
||||
using Content.Server.Hands.Components;
|
||||
using Content.Server.Pulling;
|
||||
using Content.Server.Storage.Components;
|
||||
using Content.Server.Timing;
|
||||
using Content.Shared.ActionBlocker;
|
||||
using Content.Shared.Database;
|
||||
using Content.Shared.DragDrop;
|
||||
@@ -14,18 +14,16 @@ using Content.Shared.Input;
|
||||
using Content.Shared.Interaction;
|
||||
using Content.Shared.Interaction.Helpers;
|
||||
using Content.Shared.Item;
|
||||
using Content.Shared.Popups;
|
||||
using Content.Shared.Pulling.Components;
|
||||
using Content.Shared.Timing;
|
||||
using Content.Shared.Weapons.Melee;
|
||||
using JetBrains.Annotations;
|
||||
using Robust.Server.GameObjects;
|
||||
using Robust.Server.Player;
|
||||
using Robust.Shared.Containers;
|
||||
using Robust.Shared.GameObjects;
|
||||
using Robust.Shared.Input;
|
||||
using Robust.Shared.Input.Binding;
|
||||
using Robust.Shared.IoC;
|
||||
using Robust.Shared.Localization;
|
||||
using Robust.Shared.Log;
|
||||
using Robust.Shared.Map;
|
||||
using Robust.Shared.Players;
|
||||
@@ -41,6 +39,7 @@ namespace Content.Server.Interaction
|
||||
[Dependency] private readonly ActionBlockerSystem _actionBlockerSystem = default!;
|
||||
[Dependency] private readonly PullingSystem _pullSystem = default!;
|
||||
[Dependency] private readonly AdminLogSystem _adminLogSystem = default!;
|
||||
[Dependency] private readonly UseDelaySystem _useDelay = default!;
|
||||
|
||||
public override void Initialize()
|
||||
{
|
||||
@@ -87,6 +86,11 @@ namespace Content.Server.Interaction
|
||||
return storage.SubscribedSessions.Contains(actor.PlayerSession);
|
||||
}
|
||||
|
||||
protected override void BeginDelay(UseDelayComponent? component = null)
|
||||
{
|
||||
_useDelay.BeginDelay(component);
|
||||
}
|
||||
|
||||
#region Drag drop
|
||||
private void HandleDragDropRequestEvent(DragDropRequestEvent msg, EntitySessionEventArgs args)
|
||||
{
|
||||
|
||||
@@ -202,7 +202,7 @@ namespace Content.Server.Nutrition.EntitySystems
|
||||
}
|
||||
|
||||
if (string.IsNullOrEmpty(food.TrashPrototype))
|
||||
EntityManager.QueueDeleteEntity((food).Owner);
|
||||
EntityManager.QueueDeleteEntity(food.Owner);
|
||||
else
|
||||
DeleteAndSpawnTrash(food, user);
|
||||
|
||||
@@ -231,7 +231,7 @@ namespace Content.Server.Nutrition.EntitySystems
|
||||
return;
|
||||
}
|
||||
|
||||
EntityManager.QueueDeleteEntity((component).Owner);
|
||||
EntityManager.QueueDeleteEntity(component.Owner);
|
||||
}
|
||||
|
||||
private void AddEatVerb(EntityUid uid, FoodComponent component, GetInteractionVerbsEvent ev)
|
||||
|
||||
90
Content.Server/Timing/UseDelaySystem.cs
Normal file
90
Content.Server/Timing/UseDelaySystem.cs
Normal file
@@ -0,0 +1,90 @@
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Threading;
|
||||
using Content.Shared.Cooldown;
|
||||
using Content.Shared.Timing;
|
||||
using Robust.Shared.GameObjects;
|
||||
using Robust.Shared.IoC;
|
||||
using Robust.Shared.Timing;
|
||||
using Robust.Shared.Utility;
|
||||
|
||||
namespace Content.Server.Timing;
|
||||
|
||||
public sealed class UseDelaySystem : EntitySystem
|
||||
{
|
||||
[Dependency] private readonly IGameTiming _gameTiming = default!;
|
||||
|
||||
private HashSet<UseDelayComponent> _activeDelays = new();
|
||||
|
||||
public override void Update(float frameTime)
|
||||
{
|
||||
base.Update(frameTime);
|
||||
|
||||
var toRemove = new RemQueue<UseDelayComponent>();
|
||||
|
||||
foreach (var delay in _activeDelays)
|
||||
{
|
||||
MetaDataComponent? metaData = null;
|
||||
|
||||
if (Deleted(delay.Owner, metaData) ||
|
||||
delay.CancellationTokenSource?.Token.IsCancellationRequested == true)
|
||||
{
|
||||
toRemove.Add(delay);
|
||||
continue;
|
||||
}
|
||||
|
||||
if (Paused(delay.Owner, metaData)) continue;
|
||||
|
||||
delay.Elapsed += frameTime;
|
||||
|
||||
if (delay.Elapsed < delay.Delay) continue;
|
||||
|
||||
toRemove.Add(delay);
|
||||
|
||||
}
|
||||
|
||||
foreach (var delay in toRemove)
|
||||
{
|
||||
delay.CancellationTokenSource = null;
|
||||
delay.Elapsed = 0f;
|
||||
_activeDelays.Remove(delay);
|
||||
}
|
||||
}
|
||||
|
||||
public void BeginDelay(UseDelayComponent? component = null)
|
||||
{
|
||||
if (component == null ||
|
||||
component.ActiveDelay ||
|
||||
Deleted(component.Owner)) return;
|
||||
|
||||
component.CancellationTokenSource = new CancellationTokenSource();
|
||||
|
||||
DebugTools.Assert(!_activeDelays.Contains(component));
|
||||
_activeDelays.Add(component);
|
||||
|
||||
var currentTime = _gameTiming.CurTime;
|
||||
component.LastUseTime = currentTime;
|
||||
|
||||
var cooldown = EnsureComp<ItemCooldownComponent>(component.Owner);
|
||||
cooldown.CooldownStart = currentTime;
|
||||
cooldown.CooldownEnd = currentTime + TimeSpan.FromSeconds(component.Delay);
|
||||
}
|
||||
|
||||
public void Cancel(UseDelayComponent component)
|
||||
{
|
||||
component.CancellationTokenSource?.Cancel();
|
||||
component.CancellationTokenSource = null;
|
||||
|
||||
if (TryComp<ItemCooldownComponent>(component.Owner, out var cooldown))
|
||||
{
|
||||
cooldown.CooldownEnd = _gameTiming.CurTime;
|
||||
}
|
||||
}
|
||||
|
||||
public void Restart(UseDelayComponent component)
|
||||
{
|
||||
component.CancellationTokenSource?.Cancel();
|
||||
component.CancellationTokenSource = null;
|
||||
BeginDelay(component);
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user