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

Fix categories (#10683)

Browse Source
This commit is contained in:
Morb
2022-08-18 17:27:46 -07:00
committed by GitHub
parent de7895ca82
commit 86d7a1fbb9
6 changed files with 16 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Content.Client/Construction/UI/ConstructionMenuPresenter.cs
View File

@@ -167,7 +167,7 @@ namespace Content.Client.Construction.UI
continue; continue;
} }
if (!string.IsNullOrEmpty(category) && category != Loc.GetString("construction-presenter-category-all")) if (!string.IsNullOrEmpty(category) && category != Loc.GetString("construction-category-all"))
{ {
if (recipe.Category != category) if (recipe.Category != category)
continue; continue;
@@ -191,11 +191,11 @@ namespace Content.Client.Construction.UI
var uniqueCategories = new HashSet<string>(); var uniqueCategories = new HashSet<string>();
// hard-coded to show all recipes // hard-coded to show all recipes
uniqueCategories.Add(Loc.GetString("construction-presenter-category-all")); uniqueCategories.Add(Loc.GetString("construction-category-all"));
foreach (var prototype in _prototypeManager.EnumeratePrototypes<ConstructionPrototype>()) foreach (var prototype in _prototypeManager.EnumeratePrototypes<ConstructionPrototype>())
{ {
var category = Loc.GetString(prototype.Category); var category = prototype.Category;
if (!string.IsNullOrEmpty(category)) if (!string.IsNullOrEmpty(category))
uniqueCategories.Add(category); uniqueCategories.Add(category);

9
Content.Shared/Construction/Prototypes/ConstructionPrototype.cs
View File

@@ -8,6 +8,8 @@ namespace Content.Shared.Construction.Prototypes
[Prototype("construction")] [Prototype("construction")]
public sealed class ConstructionPrototype : IPrototype public sealed class ConstructionPrototype : IPrototype
{ {
private string _category = string.Empty;
[DataField("conditions")] private List<IConstructionCondition> _conditions = new(); [DataField("conditions")] private List<IConstructionCondition> _conditions = new();
/// <summary> /// <summary>
@@ -52,7 +54,12 @@ namespace Content.Shared.Construction.Prototypes
[DataField("canBuildInImpassable")] [DataField("canBuildInImpassable")]
public bool CanBuildInImpassable { get; private set; } public bool CanBuildInImpassable { get; private set; }
[DataField("category")] public string Category { get; private set; } = string.Empty; [DataField("category")]
public string Category
{
get => _category;
private set => _category = Loc.GetString(value);
}
[DataField("objectType")] public ConstructionType Type { get; private set; } = ConstructionType.Structure; [DataField("objectType")] public ConstructionType Type { get; private set; } = ConstructionType.Structure;

3
Resources/Locale/en-US/construction/construction-categories.ftl
View File

@@ -1,4 +1,5 @@
construction-category-furniture = Furniture construction-category-all = All
construction-category-furniture = Furniture
construction-category-storage = Storage construction-category-storage = Storage
construction-category-tools = Tools construction-category-tools = Tools
construction-category-materials = Materials construction-category-materials = Materials

3
Resources/Locale/en-US/construction/ui/construction-menu-presenter.ftl
View File

@@ -1,5 +1,4 @@
construction-presenter-category-all = All construction-presenter-to-craft = To craft this item, you need to:
construction-presenter-to-craft = To craft this item, you need to:
construction-presenter-to-build = To build this, first you need to: construction-presenter-to-build = To build this, first you need to:
construction-presenter-step-wrapper = {$step-number}. {$text} construction-presenter-step-wrapper = {$step-number}. {$text}

2
Resources/Prototypes/Recipes/Construction/utilities.yml
View File

@@ -142,7 +142,7 @@
graph: DisposalMachine graph: DisposalMachine
startNode: start startNode: start
targetNode: mailing_unit targetNode: mailing_unit
category: Utilities category: construction-category-utilities
placementMode: SnapgridCenter placementMode: SnapgridCenter
canBuildInImpassable: false canBuildInImpassable: false
icon: icon:

2
Resources/Prototypes/Recipes/Crafting/improvised.yml
View File

@@ -67,7 +67,7 @@
graph: flowercrown graph: flowercrown
startNode: start startNode: start
targetNode: flowercrown targetNode: flowercrown
category: Misc category: construction-category-misc
description: "A coronet of fresh and fragrant flowers." description: "A coronet of fresh and fragrant flowers."
icon: icon:
sprite: Clothing/Head/Misc/flower-crown.rsi sprite: Clothing/Head/Misc/flower-crown.rsi