Cinka/OldThink
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

Fix slime hair translucent (#14478)

Browse Source 
* fix

* move
This commit is contained in:
csqrb
2023-03-12 03:04:58 +06:00
committed by GitHub
parent 71272a81f7
commit b3a327988f
6 changed files with 16 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Content.Client/Humanoid/HumanoidAppearanceSystem.cs
View File

@@ -160,13 +160,13 @@ public sealed class HumanoidAppearanceSystem : SharedHumanoidAppearanceSystem
//markings.RemoveCategory(MarkingCategories.FacialHair);
// We need to ensure hair before applying it or coloring can try depend on markings that can be invalid
var hairColor = _markingManager.MustMatchSkin(profile.Species, HumanoidVisualLayers.Hair, _prototypeManager)
? profile.Appearance.SkinColor : profile.Appearance.HairColor;
var hairColor = _markingManager.MustMatchSkin(profile.Species, HumanoidVisualLayers.Hair, out var hairAlpha, _prototypeManager)
? profile.Appearance.SkinColor.WithAlpha(hairAlpha) : profile.Appearance.HairColor;
var hair = new Marking(profile.Appearance.HairStyleId,
new[] { hairColor });
var facialHairColor = _markingManager.MustMatchSkin(profile.Species, HumanoidVisualLayers.FacialHair, _prototypeManager)
? profile.Appearance.SkinColor : profile.Appearance.FacialHairColor;
var facialHairColor = _markingManager.MustMatchSkin(profile.Species, HumanoidVisualLayers.FacialHair, out var facialHairAlpha, _prototypeManager)
? profile.Appearance.SkinColor.WithAlpha(facialHairAlpha) : profile.Appearance.FacialHairColor;
var facialHair = new Marking(profile.Appearance.FacialHairStyleId,
new[] { facialHairColor });

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

@@ -431,7 +431,7 @@ public sealed partial class MarkingPicker : Control
markingSet.AddBack(MarkingCategories.FacialHair, FacialHairMarking);
}
if (!_markingManager.MustMatchSkin(_currentSpecies, marking.BodyPart, _prototypeManager))
if (!_markingManager.MustMatchSkin(_currentSpecies, marking.BodyPart, out var _, _prototypeManager))
{
// Do default coloring
var colors = MarkingColoring.GetMarkingLayerColors(