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

Add missing DataDefinition constructors (#14603)

Browse Source
This commit is contained in:
Leon Friedrich
2023-03-13 12:37:24 +13:00
committed by GitHub
parent 6e4949af77
commit f0cf4e7a22
6 changed files with 45 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
Content.Server/Fax/FaxMachineComponent.cs
View File

@@ -123,20 +123,24 @@ public sealed class FaxMachineComponent : Component
[DataDefinition] [DataDefinition]
public sealed class FaxPrintout public sealed class FaxPrintout
{ {
[DataField("name")] [DataField("name", required: true)]
public string Name { get; } public string Name { get; } = default!;
[DataField("content")] [DataField("content", required: true)]
public string Content { get; } public string Content { get; } = default!;
[DataField("prototypeId", customTypeSerializer: typeof(PrototypeIdSerializer<EntityPrototype>))] [DataField("prototypeId", customTypeSerializer: typeof(PrototypeIdSerializer<EntityPrototype>), required: true)]
public string PrototypeId { get; } public string PrototypeId { get; } = default!;
[DataField("stampState")] [DataField("stampState")]
public string? StampState { get; } public string? StampState { get; }
[DataField("stampedBy")] [DataField("stampedBy")]
public List<string> StampedBy { get; } public List<string> StampedBy { get; } = new();
private FaxPrintout()
{
}
public FaxPrintout(string content, string name, string? prototypeId, string? stampState = null, List<string>? stampedBy = null) public FaxPrintout(string content, string name, string? prototypeId, string? stampState = null, List<string>? stampedBy = null)
{ {

7
Content.Shared/Humanoid/HumanoidCharacterAppearance.cs
View File

@@ -84,9 +84,7 @@ namespace Content.Shared.Humanoid
return new(HairStyleId, HairColor, FacialHairStyleId, FacialHairColor, EyeColor, SkinColor, newMarkings); return new(HairStyleId, HairColor, FacialHairStyleId, FacialHairColor, EyeColor, SkinColor, newMarkings);
} }
public static HumanoidCharacterAppearance Default() public HumanoidCharacterAppearance() : this(
{
return new(
HairStyles.DefaultHairStyle, HairStyles.DefaultHairStyle,
Color.Black, Color.Black,
HairStyles.DefaultFacialHairStyle, HairStyles.DefaultFacialHairStyle,
@@ -94,7 +92,8 @@ namespace Content.Shared.Humanoid
Color.Black, Color.Black,
Humanoid.SkinColor.ValidHumanSkinTone, Humanoid.SkinColor.ValidHumanSkinTone,
new () new ()
); )
{
} }
public static HumanoidCharacterAppearance DefaultWithSpecies(string species) public static HumanoidCharacterAppearance DefaultWithSpecies(string species)

8
Content.Shared/Humanoid/Markings/Marking.cs
View File

@@ -12,7 +12,11 @@ namespace Content.Shared.Humanoid.Markings
[DataField("markingColor")] [DataField("markingColor")]
private List<Color> _markingColors = new(); private List<Color> _markingColors = new();
private Marking(string markingId, private Marking()
{
}
public Marking(string markingId,
List<Color> markingColors) List<Color> markingColors)
{ {
MarkingId = markingId; MarkingId = markingId;
@@ -45,7 +49,7 @@ namespace Content.Shared.Humanoid.Markings
/// <summary> /// <summary>
/// ID of the marking prototype. /// ID of the marking prototype.
/// </summary> /// </summary>
[DataField("markingId")] [DataField("markingId", required: true)]
public string MarkingId { get; } = default!; public string MarkingId { get; } = default!;
/// <summary> /// <summary>

2
Content.Shared/Humanoid/Prototypes/HumanoidProfilePrototype.cs
View File

@@ -14,5 +14,5 @@ public sealed class HumanoidProfilePrototype : IPrototype
public Dictionary<HumanoidVisualLayers, CustomBaseLayerInfo> CustomBaseLayers = new(); public Dictionary<HumanoidVisualLayers, CustomBaseLayerInfo> CustomBaseLayers = new();
[DataField("profile")] [DataField("profile")]
public HumanoidCharacterProfile Profile { get; } = HumanoidCharacterProfile.Default(); public HumanoidCharacterProfile Profile { get; } = new();
} }

9
Content.Shared/Preferences/HumanoidCharacterProfile.cs
View File

@@ -102,16 +102,14 @@ namespace Content.Shared.Preferences
/// Defaults to <see cref="SharedHumanoidAppearanceSystem.DefaultSpecies"/> for the species. /// Defaults to <see cref="SharedHumanoidAppearanceSystem.DefaultSpecies"/> for the species.
/// </summary> /// </summary>
/// <returns></returns> /// <returns></returns>
public static HumanoidCharacterProfile Default() public HumanoidCharacterProfile() : this(
{
return new(
"John Doe", "John Doe",
"", "",
SharedHumanoidAppearanceSystem.DefaultSpecies, SharedHumanoidAppearanceSystem.DefaultSpecies,
18, 18,
Sex.Male, Sex.Male,
Gender.Male, Gender.Male,
HumanoidCharacterAppearance.Default(), new HumanoidCharacterAppearance(),
ClothingPreference.Jumpsuit, ClothingPreference.Jumpsuit,
BackpackPreference.Backpack, BackpackPreference.Backpack,
new Dictionary<string, JobPriority> new Dictionary<string, JobPriority>
@@ -120,7 +118,8 @@ namespace Content.Shared.Preferences
}, },
PreferenceUnavailableMode.SpawnAsOverflow, PreferenceUnavailableMode.SpawnAsOverflow,
new List<string>(), new List<string>(),
new List<string>()); new List<string>())
{
} }
/// <summary> /// <summary>

2
Content.Tests/Server/Preferences/ServerDbSqliteTests.cs
View File

@@ -106,7 +106,7 @@ namespace Content.Tests.Server.Preferences
var prototypeManager = IoCManager.Resolve<IPrototypeManager>(); var prototypeManager = IoCManager.Resolve<IPrototypeManager>();
prototypeManager.Initialize(); prototypeManager.Initialize();
prototypeManager.LoadFromStream(new StringReader(Prototypes)); prototypeManager.LoadFromStream(new StringReader(Prototypes));
await db.InitPrefsAsync(username, HumanoidCharacterProfile.Default()); await db.InitPrefsAsync(username, new HumanoidCharacterProfile());
await db.SaveCharacterSlotAsync(username, CharlieCharlieson(), 1); await db.SaveCharacterSlotAsync(username, CharlieCharlieson(), 1);
await db.SaveSelectedCharacterIndexAsync(username, 1); await db.SaveSelectedCharacterIndexAsync(username, 1);
await db.SaveCharacterSlotAsync(username, null, 1); await db.SaveCharacterSlotAsync(username, null, 1);