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

added Character Setup (#511)

Browse Source 
* added Character Setup

* whoops

* reverted unrelated changes

* Made everything work post-rebase

* Removed unused PreferencesChanged event

* nope, don't need this

* HumanoidProfileEditorPanel -> HumanoidProfileEditor

* Set initial data for hair pickers

* Fixed nullable warning

* Renamed LooksComponent -> HumanoidAppearanceComponent

* Renamed LooksComponentState -> HumanoidAppearanceComponentState

* Final renaming maybe

* Use a human-like dummy instead of a real human

* Change preferences structs back to classes
This commit is contained in:
DamianX
2020-01-18 01:54:13 +01:00
committed by Pieter-Jan Briers
parent d03da83fda
commit a4e369e629
41 changed files with 1423 additions and 756 deletions
Download Patch File Download Diff File Expand all files Collapse all files

109
Content.Shared/GameObjects/Components/Mobs/SharedHairComponent.cs
View File

@@ -1,109 +0,0 @@
using System;
using Content.Shared.Preferences.Appearance;
using Robust.Shared.GameObjects;
using Robust.Shared.Maths;
using Robust.Shared.Serialization;
using Robust.Shared.ViewVariables;
namespace Content.Shared.GameObjects.Components.Mobs
{
public abstract class SharedHairComponent : Component
{
private static readonly Color DefaultHairColor = Color.FromHex("#232323");
private string _facialHairStyleName = HairStyles.DefaultFacialHairStyle;
private string _hairStyleName = HairStyles.DefaultHairStyle;
private Color _hairColor = DefaultHairColor;
private Color _facialHairColor = DefaultHairColor;
public sealed override string Name => "Hair";
public sealed override uint? NetID => ContentNetIDs.HAIR;
public sealed override Type StateType => typeof(HairComponentState);
[ViewVariables(VVAccess.ReadWrite)]
public virtual string HairStyleName
{
get => _hairStyleName;
set
{
_hairStyleName = value;
Dirty();
}
}
[ViewVariables(VVAccess.ReadWrite)]
public virtual string FacialHairStyleName
{
get => _facialHairStyleName;
set
{
_facialHairStyleName = value;
Dirty();
}
}
[ViewVariables(VVAccess.ReadWrite)]
public virtual Color HairColor
{
get => _hairColor;
set
{
_hairColor = value;
Dirty();
}
}
[ViewVariables(VVAccess.ReadWrite)]
public virtual Color FacialHairColor
{
get => _facialHairColor;
set
{
_facialHairColor = value;
Dirty();
}
}
public override ComponentState GetComponentState()
{
return new HairComponentState(HairStyleName, FacialHairStyleName, HairColor, FacialHairColor);
}
public override void HandleComponentState(ComponentState curState, ComponentState nextState)
{
var cast = (HairComponentState) curState;
HairStyleName = cast.HairStyleName;
FacialHairStyleName = cast.FacialHairStyleName;
HairColor = cast.HairColor;
FacialHairColor = cast.FacialHairColor;
}
public override void ExposeData(ObjectSerializer serializer)
{
base.ExposeData(serializer);
serializer.DataField(ref _hairColor, "hairColor", DefaultHairColor);
serializer.DataField(ref _facialHairColor, "facialHairColor", DefaultHairColor);
serializer.DataField(ref _hairStyleName, "hairStyle", HairStyles.DefaultHairStyle);
serializer.DataField(ref _facialHairStyleName, "facialHairStyle", HairStyles.DefaultFacialHairStyle);
}
[Serializable, NetSerializable]
private sealed class HairComponentState : ComponentState
{
public string HairStyleName { get; }
public string FacialHairStyleName { get; }
public Color HairColor { get; }
public Color FacialHairColor { get; }
public HairComponentState(string hairStyleName, string facialHairStyleName, Color hairColor, Color facialHairColor) : base(ContentNetIDs.HAIR)
{
HairStyleName = hairStyleName;
FacialHairStyleName = facialHairStyleName;
HairColor = hairColor;
FacialHairColor = facialHairColor;
}
}
}
}

73
Content.Shared/GameObjects/Components/Mobs/SharedHumanoidAppearanceComponent.cs Normal file
View File

@@ -0,0 +1,73 @@
using System;
using Content.Shared.Preferences;
using Robust.Shared.GameObjects;
using Robust.Shared.Serialization;
using Robust.Shared.ViewVariables;
namespace Content.Shared.GameObjects.Components.Mobs
{
public abstract class SharedHumanoidAppearanceComponent : Component
{
private HumanoidCharacterAppearance _appearance;
private Sex _sex;
public sealed override string Name => "HumanoidAppearance";
public sealed override uint? NetID => ContentNetIDs.HUMANOID_APPEARANCE;
public sealed override Type StateType => typeof(HumanoidAppearanceComponentState);
[ViewVariables(VVAccess.ReadWrite)]
public virtual HumanoidCharacterAppearance Appearance
{
get => _appearance;
set
{
_appearance = value;
Dirty();
}
}
[ViewVariables(VVAccess.ReadWrite)]
public virtual Sex Sex
{
get => _sex;
set
{
_sex = value;
Dirty();
}
}
public override ComponentState GetComponentState()
{
return new HumanoidAppearanceComponentState(Appearance, Sex);
}
public override void HandleComponentState(ComponentState curState, ComponentState nextState)
{
var cast = (HumanoidAppearanceComponentState) curState;
Appearance = cast.Appearance;
Sex = cast.Sex;
}
public void UpdateFromProfile(ICharacterProfile profile)
{
var humanoid = (HumanoidCharacterProfile) profile;
Appearance = (HumanoidCharacterAppearance) humanoid.CharacterAppearance;
Sex = humanoid.Sex;
}
[Serializable]
[NetSerializable]
private sealed class HumanoidAppearanceComponentState : ComponentState
{
public HumanoidAppearanceComponentState(HumanoidCharacterAppearance appearance, Sex sex) : base(ContentNetIDs.HUMANOID_APPEARANCE)
{
Appearance = appearance;
Sex = sex;
}
public HumanoidCharacterAppearance Appearance { get; }
public Sex Sex { get; }
}
}
}

2
Content.Shared/GameObjects/ContentNetIDs.cs
View File

@@ -34,7 +34,7 @@
public const uint ITEMCOOLDOWN = 1029;
public const uint CARGO_ORDER_DATABASE = 1030;
public const uint GALACTIC_MARKET = 1031;
public const uint HAIR = 1032;
public const uint HUMANOID_APPEARANCE = 1032;
public const uint INSTRUMENTS = 1033;
public const uint WELDER = 1034;
public const uint STACK = 1035;