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

big cardboard box improvements (#16418)

Browse Source
This commit is contained in:
Ilya246
2023-05-14 16:46:19 +04:00
committed by GitHub
parent f4c8f5751f
commit 6f19075be9
2 changed files with 29 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
Content.Server/CardboardBox/CardboardBoxSystem.cs
View File

@@ -31,12 +31,28 @@ public sealed class CardboardBoxSystem : SharedCardboardBoxSystem
SubscribeLocalEvent<CardboardBoxComponent, StorageAfterOpenEvent>(AfterStorageOpen);
SubscribeLocalEvent<CardboardBoxComponent, StorageBeforeOpenEvent>(BeforeStorageOpen);
SubscribeLocalEvent<CardboardBoxComponent, StorageAfterCloseEvent>(AfterStorageClosed);
SubscribeLocalEvent<CardboardBoxComponent, ActivateInWorldEvent>(OnInteracted);
SubscribeLocalEvent<CardboardBoxComponent, InteractedNoHandEvent>(OnNoHandInteracted);
SubscribeLocalEvent<CardboardBoxComponent, EntInsertedIntoContainerMessage>(OnEntInserted);
SubscribeLocalEvent<CardboardBoxComponent, EntRemovedFromContainerMessage>(OnEntRemoved);
SubscribeLocalEvent<CardboardBoxComponent, DamageChangedEvent>(OnDamage);
}
private void OnInteracted(EntityUid uid, CardboardBoxComponent component, ActivateInWorldEvent args)
{
if (!TryComp<EntityStorageComponent>(uid, out var box))
return;
args.Handled = true;
_storage.ToggleOpen(args.User, uid, box);
if (box.Contents.Contains(args.User) && !box.Open)
{
_mover.SetRelay(args.User, uid);
component.Mover = args.User;
}
}
private void OnNoHandInteracted(EntityUid uid, CardboardBoxComponent component, InteractedNoHandEvent args)
{
@@ -49,6 +65,9 @@ public sealed class CardboardBoxSystem : SharedCardboardBoxSystem
private void BeforeStorageOpen(EntityUid uid, CardboardBoxComponent component, ref StorageBeforeOpenEvent args)
{
if (component.Quiet)
return;
//Play effect & sound
if (component.Mover != null)
{
@@ -91,17 +110,11 @@ public sealed class CardboardBoxSystem : SharedCardboardBoxSystem
if (!TryComp(args.Entity, out MobMoverComponent? mover))
return;
if (component.Mover != null)
if (component.Mover == null)
{
// player movers take priority
if (HasComp<ActorComponent>(component.Mover) || !HasComp<ActorComponent>(args.Entity))
return;
RemComp<RelayInputMoverComponent>(component.Mover.Value);
_mover.SetRelay(args.Entity, uid);
component.Mover = args.Entity;
}
_mover.SetRelay(args.Entity, uid);
component.Mover = args.Entity;
}
/// <summary>