tommy/tbd-station-14
2
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix and improve bluespace lockers (#13139)

Browse Source 
* add invulnerable plastitanium wall prototype

* fix command ClearBluespaceLockerLinks.cs

* fix and improve BluespaceLockerSystem.cs

* fix normal plastitanium wall suffix

* fix capitalization

* fix capability to create one way lockers
This commit is contained in:
Chief-Engineer
2022-12-24 22:35:03 -06:00
committed by GitHub
parent faca40b8d5
commit b7af5e6109
5 changed files with 142 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

96
Content.Server/Storage/EntitySystems/BluespaceLockerSystem.cs
View File

@@ -1,14 +1,19 @@
using System.Linq;
using Content.Server.Lock;
using Content.Server.Mind.Components;
using Content.Server.Resist;
using Content.Server.Station.Components;
using Content.Server.Storage.Components;
using Content.Server.Tools.Systems;
using Microsoft.Extensions.DependencyModel;
using Content.Shared.Coordinates;
using Robust.Shared.Random;
namespace Content.Server.Storage.EntitySystems;
public sealed class BluespaceLockerSystem : EntitySystem
{
[Dependency] private readonly IEntityManager _entityManager = default!;
[Dependency] private readonly IRobustRandom _robustRandom = default!;
[Dependency] private readonly EntityStorageSystem _entityStorage = default!;
[Dependency] private readonly WeldableSystem _weldableSystem = default!;
[Dependency] private readonly LockSystem _lockSystem = default!;
@@ -17,23 +22,27 @@ public sealed class BluespaceLockerSystem : EntitySystem
{
base.Initialize();
SubscribeLocalEvent<BluespaceLockerComponent, ComponentStartup>(OnStartup);
SubscribeLocalEvent<BluespaceLockerComponent, StorageBeforeOpenEvent>(PreOpen);
SubscribeLocalEvent<BluespaceLockerComponent, StorageAfterCloseEvent>(PostClose);
}
private void OnStartup(EntityUid uid, BluespaceLockerComponent component, ComponentStartup args)
{
GetTargetStorage(component);
}
private void PreOpen(EntityUid uid, BluespaceLockerComponent component, StorageBeforeOpenEvent args)
{
EntityStorageComponent? entityStorageComponent = null;
if (component.BluespaceLinks is not { Count: > 0 })
return;
if (!Resolve(uid, ref entityStorageComponent))
return;
// Select target
var targetContainerStorageComponent = component.BluespaceLinks.ToArray()[new Random().Next(0, component.BluespaceLinks.Count)];
var targetContainerStorageComponent = GetTargetStorage(component);
if (targetContainerStorageComponent == null)
return;
BluespaceLockerComponent? targetContainerBluespaceComponent = null;
// Close target if it is open
@@ -41,8 +50,7 @@ public sealed class BluespaceLockerSystem : EntitySystem
_entityStorage.CloseStorage(targetContainerStorageComponent.Owner, targetContainerStorageComponent);
// Apply bluespace effects if target is not a bluespace locker, otherwise let it handle it
if (!Resolve(targetContainerStorageComponent.Owner, ref targetContainerBluespaceComponent, false) ||
targetContainerBluespaceComponent.BluespaceLinks is not { Count: > 0 })
if (!Resolve(targetContainerStorageComponent.Owner, ref targetContainerBluespaceComponent, false))
{
// Move contained items
if (component.TransportEntities)
@@ -62,18 +70,84 @@ public sealed class BluespaceLockerSystem : EntitySystem
}
}
private bool ValidLink(BluespaceLockerComponent component, EntityStorageComponent link)
{
return link.Owner.Valid && link.LifeStage != ComponentLifeStage.Deleted;
}
private bool ValidAutolink(BluespaceLockerComponent component, EntityStorageComponent link)
{
if (!ValidLink(component, link))
return false;
if (component.PickLinksFromSameMap &&
link.Owner.ToCoordinates().GetMapId(_entityManager) == component.Owner.ToCoordinates().GetMapId(_entityManager))
return false;
if (component.PickLinksFromStationGrids &&
!_entityManager.HasComponent<StationMemberComponent>(link.Owner.ToCoordinates().GetGridUid(_entityManager)))
return false;
if (component.PickLinksFromResistLockers &&
!_entityManager.HasComponent<ResistLockerComponent>(link.Owner))
return false;
return true;
}
private EntityStorageComponent? GetTargetStorage(BluespaceLockerComponent component)
{
while (true)
{
// Ensure MinBluespaceLinks
if (component.BluespaceLinks.Count < component.MinBluespaceLinks)
{
// Get an shuffle the list of all EntityStorages
var storages = _entityManager.EntityQuery<EntityStorageComponent>().ToArray();
_robustRandom.Shuffle(storages);
// Add valid candidates till MinBluespaceLinks is met
foreach (var storage in storages)
{
if (!ValidAutolink(component, storage))
continue;
component.BluespaceLinks.Add(storage);
if (component.AutoLinksBidirectional)
{
_entityManager.EnsureComponent<BluespaceLockerComponent>(storage.Owner, out var targetBluespaceComponent);
targetBluespaceComponent.BluespaceLinks.Add(_entityManager.GetComponent<EntityStorageComponent>(component.Owner));
}
if (component.BluespaceLinks.Count >= component.MinBluespaceLinks)
break;
}
}
// If there are no possible link targets and no links, return null
if (component.BluespaceLinks.Count == 0)
return null;
// Attempt to select, validate, and return a link
var links = component.BluespaceLinks.ToArray();
var link = links[_robustRandom.Next(0, component.BluespaceLinks.Count)];
if (ValidLink(component, link))
return link;
component.BluespaceLinks.Remove(link);
}
}
private void PostClose(EntityUid uid, BluespaceLockerComponent component, StorageAfterCloseEvent args)
{
EntityStorageComponent? entityStorageComponent = null;
if (component.BluespaceLinks is not { Count: > 0 })
return;
if (!Resolve(uid, ref entityStorageComponent))
return;
// Select target
var targetContainerStorageComponent = component.BluespaceLinks.ToArray()[new Random().Next(0, component.BluespaceLinks.Count)];
var targetContainerStorageComponent = GetTargetStorage(component);
if (targetContainerStorageComponent == null)
return;
// Move contained items
if (component.TransportEntities)