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

PORT: Allows Markings to Set Custom Layers for Specific Sprites (#2516)

Browse Source 
* multilayer markings

* vestigial reptilian tail sprites added

* i fix :)

---------

Co-authored-by: mq <113324899+mqole@users.noreply.github.com>
This commit is contained in:
hivehum
2025-05-25 20:57:56 -04:00
committed by hereelabs
parent b2ffe70f8f
commit 9f39c112ad
20 changed files with 377 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
Content.Client/Humanoid/MarkingPicker.xaml.cs
View File

@@ -408,12 +408,37 @@ public sealed partial class MarkingPicker : Control
List<ColorSelectorSliders> colorSliders = new();
for (int i = 0; i < prototype.Sprites.Count; i++)
{
// first, check if the coloration is parented to another marking
// and if so, just kinda sorta dont display it
var skipdraw = false;
if (prototype.ColorLinks?.Count > 0)
{
var name = prototype.Sprites[i] switch
{
SpriteSpecifier.Rsi rsi => rsi.RsiState,
SpriteSpecifier.Texture texture => texture.TexturePath.Filename,
_ => null
};
if (name != null && prototype.ColorLinks.ContainsKey(name))
{
// dont show it, cus its parented to another marking
skipdraw = true;
}
}
var colorContainer = new BoxContainer
{
Orientation = LayoutOrientation.Vertical,
};
CMarkingColors.AddChild(colorContainer);
// so.
// the color selector sliders decide which destination color to modify
// based on its index in the list of color selectors.
// this is a problem if we, say, want to *not* show a certain slider
// cus then it'll modify the wrong color, unless the color happened to
// be in index 0.
if(!skipdraw)
CMarkingColors.AddChild(colorContainer);
ColorSelectorSliders colorSelector = new ColorSelectorSliders();
colorSelector.SelectorType = ColorSelectorSliders.ColorSelectorType.Hsv; // defaults color selector to HSV