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

Replace string data fields with LocId where relevant (#20883)

Browse Source
This commit is contained in:
DrSmugleaf
2023-10-10 20:06:24 -07:00
committed by GitHub
parent ef233cf0fe
commit 9bcf67753a
69 changed files with 265 additions and 286 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
Content.Shared/Examine/GroupExamineComponent.cs
View File

@@ -12,8 +12,8 @@ namespace Content.Shared.Examine
/// <summary>
/// A list of ExamineGroups.
/// </summary>
[DataField("group")]
public List<ExamineGroup> ExamineGroups = new()
[DataField]
public List<ExamineGroup> Group = new()
{
// TODO Remove hardcoded component names.
new ExamineGroup()
@@ -33,14 +33,14 @@ namespace Content.Shared.Examine
/// <summary>
/// The title of the Examine Group. Localized string that gets added to the examine tooltip.
/// </summary>
[DataField("title")]
[DataField]
[ViewVariables(VVAccess.ReadWrite)]
public string? Title;
/// <summary>
/// A list of ExamineEntries, containing which component it belongs to, which priority it has, and what FormattedMessage it holds.
/// </summary>
[DataField("entries")]
[DataField]
public List<ExamineEntry> Entries = new();
// TODO custom type serializer, or just make this work via some other automatic grouping process that doesn't
@@ -48,25 +48,25 @@ namespace Content.Shared.Examine
/// <summary>
/// A list of all components this ExamineGroup encompasses.
/// </summary>
[DataField("components")]
[DataField]
public List<string> Components = new();
/// <summary>
/// The icon path for the Examine Group.
/// </summary>
[DataField("icon")]
[DataField]
public SpriteSpecifier Icon = new SpriteSpecifier.Texture(new("/Textures/Interface/examine-star.png"));
/// <summary>
/// The text shown in the context verb menu.
/// </summary>
[DataField("contextText")]
public string ContextText = "verb-examine-group-other";
[DataField]
public LocId ContextText = "verb-examine-group-other";
/// <summary>
/// Details shown when hovering over the button.
/// </summary>
[DataField("hoverMessage")]
[DataField]
public string HoverMessage = string.Empty;
}
@@ -79,25 +79,25 @@ namespace Content.Shared.Examine
/// <summary>
/// Which component does this entry relate to?
/// </summary>
[DataField("component", required: true)]
public string ComponentName;
[DataField(required: true)]
public string Component;
/// <summary>
/// What priority has this entry - entries are sorted high to low.
/// </summary>
[DataField("priority")]
[DataField]
public float Priority = 0f;
/// <summary>
/// The FormattedMessage of this entry.
/// </summary>
[DataField("message", required: true)]
[DataField(required: true)]
public FormattedMessage Message;
/// <param name="componentName">Should be set to _componentFactory.GetComponentName(component.GetType()) to properly function.</param>
public ExamineEntry(string componentName, float priority, FormattedMessage message)
/// <param name="component">Should be set to _componentFactory.GetComponentName(component.GetType()) to properly function.</param>
public ExamineEntry(string component, float priority, FormattedMessage message)
{
ComponentName = componentName;
Component = component;
Priority = priority;
Message = message;
}
@@ -106,7 +106,7 @@ namespace Content.Shared.Examine
{
// parameterless ctor is required for data-definition serialization
Message = default!;
ComponentName = default!;
Component = default!;
}
}