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

Markings tweaks (#8394)

Browse Source 
* fixes issue with indexing into colors on multi-sprite markings

* should rebuild the dummy upon character profile switch in client

* markings, when selected, should now default to the current character's skin color

* whoops, missed one

* adds a type serializer into marking points

* that has to be a list serializer, oops
This commit is contained in:
Flipp Syder
2022-05-23 18:55:43 -07:00
committed by GitHub
parent 5c44abc3f2
commit 2b45894879
3 changed files with 23 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Content.Client/Preferences/UI/HumanoidProfileEditor.xaml.cs
View File

@@ -555,6 +555,7 @@ namespace Content.Client.Preferences.UI
var color = Color.FromHsv(new Vector4(hue / 360, sat / 100, val / 100, 1.0f));
CMarkings.CurrentSkinColor = color;
Profile = Profile.WithCharacterAppearance(Profile.Appearance.WithSkinColor(color));
break;
}
@@ -567,6 +568,8 @@ namespace Content.Client.Preferences.UI
}
var color = new Color(_rgbSkinColorSelector.Color.R, _rgbSkinColorSelector.Color.G, _rgbSkinColorSelector.Color.B);
CMarkings.CurrentSkinColor = color;
Profile = Profile.WithCharacterAppearance(Profile.Appearance.WithSkinColor(color));
break;
}
@@ -584,6 +587,7 @@ namespace Content.Client.Preferences.UI
newColor.Y = .1f;
color = Color.FromHsv(newColor);
CMarkings.CurrentSkinColor = color;
Profile = Profile.WithCharacterAppearance(Profile.Appearance.WithSkinColor(color));
break;
}
@@ -834,7 +838,7 @@ namespace Content.Client.Preferences.UI
return;
}
CMarkings.SetData(Profile.Appearance.Markings, Profile.Species);
CMarkings.SetData(Profile.Appearance.Markings, Profile.Species, Profile.Appearance.SkinColor);
}
private void UpdateSpecies()
@@ -945,7 +949,7 @@ namespace Content.Client.Preferences.UI
UpdateAntagPreferences();
UpdateMarkings();
_needUpdatePreview = true;
NeedsDummyRebuild = true;
_preferenceUnavailableButton.SelectId((int) Profile.PreferenceUnavailable);
}