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

Stack and storage enhancements (#16405)

Browse Source
This commit is contained in:
metalgearsloth
2023-05-15 12:24:45 +10:00
committed by GitHub
parent b20cc6f4d3
commit a9c0007c77
6 changed files with 127 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
Content.Client/Storage/UI/StorageWindow.cs
View File

@@ -5,7 +5,9 @@ using Robust.Client.UserInterface.CustomControls;
using Content.Client.Items.Components;
using Content.Client.Stylesheets;
using Content.Client.UserInterface.Controls;
using Content.Shared.IdentityManagement;
using Content.Shared.Item;
using Content.Shared.Stacks;
using Robust.Client.UserInterface;
using static Robust.Client.UserInterface.Controls.BoxContainer;
using static Content.Shared.Storage.SharedStorageComponent;
@@ -28,7 +30,7 @@ namespace Content.Client.Storage.UI
public StorageWindow(IEntityManager entityManager)
{
_entityManager = entityManager;
SetSize = (200, 320);
SetSize = (240, 320);
Title = Loc.GetString("comp-storage-window-title");
RectClipContent = true;
@@ -112,6 +114,9 @@ namespace Content.Client.Storage.UI
_entityManager.TryGetComponent(entity, out SpriteComponent? sprite);
_entityManager.TryGetComponent(entity, out ItemComponent? item);
_entityManager.TryGetComponent(entity, out StackComponent? stack);
var count = stack?.Count ?? 1;
var size = item?.Size;
button.AddChild(new BoxContainer
{
@@ -131,12 +136,13 @@ namespace Content.Client.Storage.UI
{
HorizontalExpand = true,
ClipText = true,
Text = _entityManager.GetComponent<MetaDataComponent>(entity).EntityName
Text = _entityManager.GetComponent<MetaDataComponent>(Identity.Entity(entity, _entityManager)).EntityName +
(count > 1 ? $" x {count}" : string.Empty),
},
new Label
{
Align = Label.AlignMode.Right,
Text = item?.Size.ToString() ?? Loc.GetString("comp-storage-no-item-size"),
Text = size.ToString() ?? Loc.GetString("comp-storage-no-item-size"),
}
}
});