Remove field: from DataField attributes (#3932)

This commit is contained in:
DrSmugleaf
2021-05-04 15:37:16 +02:00
committed by GitHub
parent 85f3871536
commit ad3b7fe97d
84 changed files with 228 additions and 242 deletions

View File

@@ -17,7 +17,7 @@ namespace Content.Shared.Prototypes.Cargo
[DataField("description")] private string _description = string.Empty;
[ViewVariables]
[field: DataField("id", required: true)]
[DataField("id", required: true)]
public string ID { get; } = default!;
/// <summary>
@@ -64,35 +64,35 @@ namespace Content.Shared.Prototypes.Cargo
/// Texture path used in the CargoConsole GUI.
/// </summary>
[ViewVariables]
[field: DataField("icon")]
[DataField("icon")]
public SpriteSpecifier Icon { get; } = SpriteSpecifier.Invalid;
/// <summary>
/// The prototype name of the product.
/// </summary>
[ViewVariables]
[field: DataField("product")]
[DataField("product")]
public string Product { get; } = string.Empty;
/// <summary>
/// The point cost of the product.
/// </summary>
[ViewVariables]
[field: DataField("cost")]
[DataField("cost")]
public int PointCost { get; }
/// <summary>
/// The prototype category of the product. (e.g. Engineering, Medical)
/// </summary>
[ViewVariables]
[field: DataField("category")]
[DataField("category")]
public string Category { get; } = string.Empty;
/// <summary>
/// The prototype group of the product. (e.g. Contraband)
/// </summary>
[ViewVariables]
[field: DataField("group")]
[DataField("group")]
public string Group { get; } = string.Empty;
}
}

View File

@@ -10,9 +10,9 @@ namespace Content.Shared.Prototypes
public class DatasetPrototype : IPrototype
{
[ViewVariables]
[field: DataField("id", required: true)]
[DataField("id", required: true)]
public string ID { get; } = default!;
[field: DataField("values")] public IReadOnlyList<string> Values { get; } = new List<string>();
[DataField("values")] public IReadOnlyList<string> Values { get; } = new List<string>();
}
}

View File

@@ -12,11 +12,11 @@ namespace Content.Shared.Prototypes.EntityList
public class EntityListPrototype : IPrototype
{
[ViewVariables]
[field: DataField("id", required: true)]
[DataField("id", required: true)]
public string ID { get; } = default!;
[ViewVariables]
[field: DataField("entities", customTypeSerializer: typeof(PrototypeIdListSerializer<EntityPrototype>))]
[DataField("entities", customTypeSerializer: typeof(PrototypeIdListSerializer<EntityPrototype>))]
public ImmutableList<string> EntityIds { get; } = ImmutableList<string>.Empty;
public IEnumerable<EntityPrototype> Entities(IPrototypeManager? prototypeManager = null)

View File

@@ -6,13 +6,13 @@ namespace Content.Shared.Prototypes.HUD
[Prototype("hudTheme")]
public class HudThemePrototype : IPrototype
{
[field: DataField("name", required: true)]
[DataField("name", required: true)]
public string Name { get; } = string.Empty;
[field: DataField("id", required: true)]
[DataField("id", required: true)]
public string ID { get; } = string.Empty;
[field: DataField("path", required: true)]
[DataField("path", required: true)]
public string Path { get; } = string.Empty;
}
}

View File

@@ -14,7 +14,7 @@ namespace Content.Shared.Prototypes.Kitchen
public class FoodRecipePrototype : IPrototype
{
[ViewVariables]
[field: DataField("id", required: true)]
[DataField("id", required: true)]
public string ID { get; } = default!;
[DataField("name")]
@@ -26,10 +26,10 @@ namespace Content.Shared.Prototypes.Kitchen
[DataField("solids")]
private readonly Dictionary<string, int> _ingsSolids = new ();
[field: DataField("result")]
[DataField("result")]
public string Result { get; } = string.Empty;
[field: DataField("time")]
[DataField("time")]
public int CookTime { get; } = 5;
public string Name => Loc.GetString(_name);

View File

@@ -10,22 +10,22 @@ namespace Content.Shared.Prototypes.PDA
public class UplinkStoreListingPrototype : IPrototype
{
[ViewVariables]
[field: DataField("id", required: true)]
[DataField("id", required: true)]
public string ID { get; } = default!;
[field: DataField("itemId")]
[DataField("itemId")]
public string ItemId { get; } = string.Empty;
[field: DataField("price")]
[DataField("price")]
public int Price { get; } = 5;
[field: DataField("category")]
[DataField("category")]
public UplinkCategory Category { get; } = UplinkCategory.Utility;
[field: DataField("description")]
[DataField("description")]
public string Description { get; } = string.Empty;
[field: DataField("listingName")]
[DataField("listingName")]
public string ListingName { get; } = string.Empty;
}
}

View File

@@ -14,7 +14,7 @@ namespace Content.Shared.Prototypes.Tag
public class TagPrototype : IPrototype
{
[ViewVariables]
[field: DataField("id", required: true)]
[DataField("id", required: true)]
public string ID { get; } = default!;
}
}