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

feat(inventory): Add secondary smart-equip star (#25696)

Browse Source 
* feat(inventory): Add secondary quick-remove star

* style: Fix end of file newline

* feat(inventory): Change secondary smart-equip star to silver star

* feat(inventory): Decrease secondary quick-equip star luminosity to better match the primary
This commit is contained in:
exincore
2024-03-02 17:57:42 -06:00
committed by GitHub
parent 10cf94859b
commit c8cc806a8f
4 changed files with 33 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
Content.Client/UserInterface/Systems/Storage/Controls/ItemGridPiece.cs
View File

@@ -18,7 +18,7 @@ public sealed class ItemGridPiece : Control
public readonly EntityUid Entity;
public ItemStorageLocation Location;
public bool Marked = false;
public ItemGridPieceMarks? Marked;
public event Action<GUIBoundKeyEventArgs, ItemGridPiece>? OnPiecePressed;
public event Action<GUIBoundKeyEventArgs, ItemGridPiece>? OnPieceUnpressed;
@@ -42,8 +42,10 @@ public sealed class ItemGridPiece : Control
private Texture? _bottomLeftTexture;
private readonly string _bottomRightTexturePath = "Storage/piece_bottomRight";
private Texture? _bottomRightTexture;
private readonly string _markedTexturePath = "Storage/marked";
private Texture? _markedTexture;
private readonly string _markedFirstTexturePath = "Storage/marked_first";
private Texture? _markedFirstTexture;
private readonly string _markedSecondTexturePath = "Storage/marked_second";
private Texture? _markedSecondTexture;
#endregion
public ItemGridPiece(Entity<ItemComponent> entity, ItemStorageLocation location, IEntityManager entityManager)
@@ -88,7 +90,8 @@ public sealed class ItemGridPiece : Control
_topRightTexture = Theme.ResolveTextureOrNull(_topRightTexturePath)?.Texture;
_bottomLeftTexture = Theme.ResolveTextureOrNull(_bottomLeftTexturePath)?.Texture;
_bottomRightTexture = Theme.ResolveTextureOrNull(_bottomRightTexturePath)?.Texture;
_markedTexture = Theme.ResolveTextureOrNull(_markedTexturePath)?.Texture;
_markedFirstTexture = Theme.ResolveTextureOrNull(_markedFirstTexturePath)?.Texture;
_markedSecondTexture = Theme.ResolveTextureOrNull(_markedSecondTexturePath)?.Texture;
}
protected override void Draw(DrawingHandleScreen handle)
@@ -113,7 +116,7 @@ public sealed class ItemGridPiece : Control
//yeah, this coloring is kinda hardcoded. deal with it. B)
Color? colorModulate = hovering ? null : Color.FromHex("#a8a8a8");
var marked = Marked;
var marked = Marked != null;
Vector2i? maybeMarkedPos = null;
_texturesPositions.Clear();
@@ -189,9 +192,19 @@ public sealed class ItemGridPiece : Control
overrideDirection: Direction.South);
}
if (maybeMarkedPos is {} markedPos && _markedTexture != null)
if (maybeMarkedPos is {} markedPos)
{
handle.DrawTextureRect(_markedTexture, new UIBox2(markedPos, markedPos + size));
var markedTexture = Marked switch
{
ItemGridPieceMarks.First => _markedFirstTexture,
ItemGridPieceMarks.Second => _markedSecondTexture,
_ => null,
};
if (markedTexture != null)
{
handle.DrawTextureRect(markedTexture, new UIBox2(markedPos, markedPos + size));
}
}
}
@@ -275,3 +288,9 @@ public sealed class ItemGridPiece : Control
return actualSize * new Vector2i(8, 8);
}
}
public enum ItemGridPieceMarks
{
First,
Second,
}