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

Makes storage insertion failure more explicit (#9465)

Browse Source
This commit is contained in:
ike709
2022-07-06 19:45:00 -05:00
committed by GitHub
parent 83a9e314cc
commit 4645dbb33c
3 changed files with 28 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Content.Server/PneumaticCannon/PneumaticCannonSystem.cs
View File

@@ -135,7 +135,7 @@ namespace Content.Server.PneumaticCannon
if (EntityManager.TryGetComponent<SharedItemComponent?>(args.Used, out var item) if (EntityManager.TryGetComponent<SharedItemComponent?>(args.Used, out var item)
&& EntityManager.TryGetComponent<ServerStorageComponent?>(component.Owner, out var storage)) && EntityManager.TryGetComponent<ServerStorageComponent?>(component.Owner, out var storage))
{ {
if (_storageSystem.CanInsert(component.Owner, args.Used, storage)) if (_storageSystem.CanInsert(component.Owner, args.Used, out _, storage))
{ {
_storageSystem.Insert(component.Owner, args.Used, storage); _storageSystem.Insert(component.Owner, args.Used, storage);
args.User.PopupMessage(Loc.GetString("pneumatic-cannon-component-insert-item-success", args.User.PopupMessage(Loc.GetString("pneumatic-cannon-component-insert-item-success",

28
Content.Server/Storage/EntitySystems/StorageSystem.cs
View File

@@ -474,29 +474,49 @@ namespace Content.Server.Storage.EntitySystems
/// Verifies if an entity can be stored and if it fits /// Verifies if an entity can be stored and if it fits
/// </summary> /// </summary>
/// <param name="entity">The entity to check</param> /// <param name="entity">The entity to check</param>
/// <param name="reason">If returning false, the reason displayed to the player</param>
/// <returns>true if it can be inserted, false otherwise</returns> /// <returns>true if it can be inserted, false otherwise</returns>
public bool CanInsert(EntityUid uid, EntityUid insertEnt, ServerStorageComponent? storageComp = null) public bool CanInsert(EntityUid uid, EntityUid insertEnt, out string? reason, ServerStorageComponent? storageComp = null)
{ {
if (!Resolve(uid, ref storageComp)) if (!Resolve(uid, ref storageComp))
{
reason = null;
return false; return false;
}
if (TryComp(insertEnt, out ServerStorageComponent? storage) && if (TryComp(insertEnt, out ServerStorageComponent? storage) &&
storage.StorageCapacityMax >= storageComp.StorageCapacityMax) storage.StorageCapacityMax >= storageComp.StorageCapacityMax)
{
reason = "comp-storage-insufficient-capacity";
return false; return false;
}
if (TryComp(insertEnt, out SharedItemComponent? itemComp) && if (TryComp(insertEnt, out SharedItemComponent? itemComp) &&
itemComp.Size > storageComp.StorageCapacityMax - storageComp.StorageUsed) itemComp.Size > storageComp.StorageCapacityMax - storageComp.StorageUsed)
{
reason = "comp-storage-insufficient-capacity";
return false; return false;
}
if (storageComp.Whitelist?.IsValid(insertEnt, EntityManager) == false) if (storageComp.Whitelist?.IsValid(insertEnt, EntityManager) == false)
{
reason = "comp-storage-invalid-container";
return false; return false;
}
if (storageComp.Blacklist?.IsValid(insertEnt, EntityManager) == true) if (storageComp.Blacklist?.IsValid(insertEnt, EntityManager) == true)
{
reason = "comp-storage-invalid-container";
return false; return false;
}
if (TryComp(insertEnt, out TransformComponent? transformComp) && transformComp.Anchored) if (TryComp(insertEnt, out TransformComponent? transformComp) && transformComp.Anchored)
{
reason = "comp-storage-anchored-failure";
return false; return false;
}
reason = null;
return true; return true;
} }
@@ -510,7 +530,7 @@ namespace Content.Server.Storage.EntitySystems
if (!Resolve(uid, ref storageComp)) if (!Resolve(uid, ref storageComp))
return false; return false;
if (!CanInsert(uid, insertEnt, storageComp) || storageComp.Storage?.Insert(insertEnt) == false) if (!CanInsert(uid, insertEnt, out _, storageComp) || storageComp.Storage?.Insert(insertEnt) == false)
return false; return false;
if (storageComp.StorageInsertSound is not null) if (storageComp.StorageInsertSound is not null)
@@ -550,9 +570,9 @@ namespace Content.Server.Storage.EntitySystems
var toInsert = hands.ActiveHandEntity; var toInsert = hands.ActiveHandEntity;
if (!CanInsert(uid, toInsert.Value, storageComp) || !_sharedHandsSystem.TryDrop(player, toInsert.Value, handsComp: hands)) if (!CanInsert(uid, toInsert.Value, out var reason, storageComp) || !_sharedHandsSystem.TryDrop(player, toInsert.Value, handsComp: hands))
{ {
Popup(uid, player, "comp-storage-cant-insert", storageComp); Popup(uid, player, reason ?? "comp-storage-cant-insert", storageComp);
return false; return false;
} }

3
Resources/Locale/en-US/components/storage-component.ftl
View File

@@ -1,5 +1,8 @@
comp-storage-no-item-size = None comp-storage-no-item-size = None
comp-storage-cant-insert = Can't insert. comp-storage-cant-insert = Can't insert.
comp-storage-insufficient-capacity = Insufficient capacity.
comp-storage-invalid-container = Invalid container for this item.
comp-storage-anchored-failure = Can't insert an anchored item.
comp-storage-window-title = Storage Item comp-storage-window-title = Storage Item
comp-storage-window-volume = Items: { $itemCount }, Stored: { $usedVolume }/{ $maxVolume } comp-storage-window-volume = Items: { $itemCount }, Stored: { $usedVolume }/{ $maxVolume }
comp-storage-window-volume-unlimited = Items: { $itemCount } comp-storage-window-volume-unlimited = Items: { $itemCount }