Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Сумки можно прятать под плитки пола. #115

Merged
merged 7 commits into from
Dec 4, 2024
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
namespace Content.Server._CorvaxNext.Storage;

/// <summary>
/// This is used for restricting anchor operations on storage (one bag max per tile)
/// and ejecting sapient contents on anchor.
/// </summary>
[RegisterComponent]
public sealed partial class AnchorableStorageComponent : Component;
113 changes: 113 additions & 0 deletions Content.Server/_CorvaxNext/Storage/AnchorableStorageSystem.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,113 @@
using System.Linq;
using Content.Server.Popups;
using Content.Shared.Construction.Components;
using Content.Shared.Mind.Components;
using Content.Shared.Storage;
using JetBrains.Annotations;
using Robust.Server.GameObjects;
using Robust.Shared.Containers;
using Robust.Shared.Map.Components;

namespace Content.Server._CorvaxNext.Storage;

/// <summary>
/// This is used for restricting anchor operations on storage (one bag max per tile)
/// and ejecting living contents on anchor.
/// </summary>
public sealed class AnchorableStorageSystem : EntitySystem
{
[Dependency] private readonly MapSystem _map = default!;
[Dependency] private readonly PopupSystem _popup = default!;
[Dependency] private readonly TransformSystem _xform = default!;
[Dependency] private readonly SharedContainerSystem _container = default!;

/// <inheritdoc/>
public override void Initialize()
{
SubscribeLocalEvent<AnchorableStorageComponent, AnchorStateChangedEvent>(OnAnchorStateChanged);
SubscribeLocalEvent<AnchorableStorageComponent, AnchorAttemptEvent>(OnAnchorAttempt);
SubscribeLocalEvent<AnchorableStorageComponent, ContainerIsInsertingAttemptEvent>(OnInsertAttempt);
}

private void OnAnchorStateChanged(Entity<AnchorableStorageComponent> ent, ref AnchorStateChangedEvent args)
{
if (!args.Anchored)
return;

if (CheckOverlap((ent, ent.Comp, Transform(ent))))
Vonsant marked this conversation as resolved.
Show resolved Hide resolved
{
_popup.PopupEntity(Loc.GetString("anchored-storage-already-present"), ent);
_xform.Unanchor(ent, Transform(ent));
Vonsant marked this conversation as resolved.
Show resolved Hide resolved
return;
}

// Eject any sapient creatures inside the storage.
// Does not recurse down into bags in bags - player characters are the largest concern, and they'll only fit in duffelbags.
if (!TryComp(ent.Owner, out StorageComponent? storage))
return;

var entsToRemove = storage.StoredItems.Keys.Where(storedItem =>
HasComp<MindContainerComponent>(storedItem)
).ToList();
Vonsant marked this conversation as resolved.
Show resolved Hide resolved

foreach (var removeUid in entsToRemove)
_container.RemoveEntity(ent.Owner, removeUid);
}

private void OnAnchorAttempt(Entity<AnchorableStorageComponent> ent, ref AnchorAttemptEvent args)
{
if (args.Cancelled)
return;

// Nothing around? We can anchor without issue.
if (!CheckOverlap((ent, ent.Comp, Transform(ent))))
return;

_popup.PopupEntity(Loc.GetString("anchored-storage-already-present"), ent, args.User);
args.Cancel();
}

private void OnInsertAttempt(Entity<AnchorableStorageComponent> ent, ref ContainerIsInsertingAttemptEvent args)
{
if (args.Cancelled)
return;

// Check for living things, they should not insert when anchored.
if (!HasComp<MindContainerComponent>(args.EntityUid))
return;

if (Transform(ent.Owner).Anchored)
args.Cancel();
}

[PublicAPI]
public bool CheckOverlap(EntityUid uid)
{
if (!TryComp(uid, out AnchorableStorageComponent? comp))
return false;

return CheckOverlap((uid, comp, Transform(uid)));
}
Vonsant marked this conversation as resolved.
Show resolved Hide resolved

public bool CheckOverlap(Entity<AnchorableStorageComponent, TransformComponent> ent)
{
Vonsant marked this conversation as resolved.
Show resolved Hide resolved
if (ent.Comp2.GridUid is not { } grid || !TryComp<MapGridComponent>(grid, out var gridComp))
return false;

var indices = _map.TileIndicesFor(grid, gridComp, ent.Comp2.Coordinates);
var enumerator = _map.GetAnchoredEntitiesEnumerator(grid, gridComp, indices);

while (enumerator.MoveNext(out var otherEnt))
{
// Don't match yourself.
if (otherEnt == ent.Owner)
continue;

// Is another storage entity is already anchored here?
if (HasComp<AnchorableStorageComponent>(otherEnt))
return true;
}

return false;
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
anchored-storage-already-present = There's already a bag anchored here!
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
anchored-storage-already-present = Здесь уже что-то спрятано!
10 changes: 10 additions & 0 deletions Resources/Prototypes/Entities/Clothing/Back/backpacks.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,16 @@
delay: 0.5
- type: ExplosionResistance
damageCoefficient: 0.9
# Corvax-Next-Stashes Start
Vonsant marked this conversation as resolved.
Show resolved Hide resolved
- type: Appearance
- type: SubFloorHide
- type: Anchorable
- type: CollideOnAnchor
enable: false
- type: Transform
anchored: false
- type: AnchorableStorage
# Corvax-Next-Stashes End
Vonsant marked this conversation as resolved.
Show resolved Hide resolved

- type: entity
parent: ClothingBackpack
Expand Down
Loading