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

Use ECS prototype-reload events (#22613)

Browse Source 
* Use ECS prototype-reload events

* better constructors

* Maybe this fixes tests?
This commit is contained in:
Leon Friedrich
2023-12-22 09:13:45 -05:00
committed by GitHub
parent 053c1e877f
commit b6bd82caa6
23 changed files with 135 additions and 242 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
Content.Shared/Humanoid/Markings/MarkingManager.cs
View File

@@ -1,4 +1,6 @@
using System.Collections.Frozen;
using System.Diagnostics.CodeAnalysis;
using System.Linq;
using Content.Shared.Humanoid.Prototypes;
using Robust.Shared.Prototypes;
@@ -9,33 +11,41 @@ namespace Content.Shared.Humanoid.Markings
[Dependency] private readonly IPrototypeManager _prototypeManager = default!;
private readonly List<MarkingPrototype> _index = new();
private readonly Dictionary<MarkingCategories, Dictionary<string, MarkingPrototype>> _markingDict = new();
private readonly Dictionary<string, MarkingPrototype> _markings = new();
public FrozenDictionary<MarkingCategories, FrozenDictionary<string, MarkingPrototype>> CategorizedMarkings = default!;
public FrozenDictionary<string, MarkingPrototype> Markings = default!;
public void Initialize()
{
_prototypeManager.PrototypesReloaded += OnPrototypeReload;
CachePrototypes();
}
private void CachePrototypes()
{
_index.Clear();
var markingDict = new Dictionary<MarkingCategories, Dictionary<string, MarkingPrototype>>();
foreach (var category in Enum.GetValues<MarkingCategories>())
{
_markingDict.Add(category, new Dictionary<string, MarkingPrototype>());
markingDict.Add(category, new());
}
foreach (var prototype in _prototypeManager.EnumeratePrototypes<MarkingPrototype>())
{
_index.Add(prototype);
_markingDict[prototype.MarkingCategory].Add(prototype.ID, prototype);
_markings.Add(prototype.ID, prototype);
markingDict[prototype.MarkingCategory].Add(prototype.ID, prototype);
}
Markings = _prototypeManager.EnumeratePrototypes<MarkingPrototype>().ToFrozenDictionary(x => x.ID);
CategorizedMarkings = markingDict.ToFrozenDictionary(
x => x.Key,
x => x.Value.ToFrozenDictionary());
}
public IReadOnlyDictionary<string, MarkingPrototype> Markings => _markings;
public IReadOnlyDictionary<MarkingCategories, Dictionary<string, MarkingPrototype>> CategorizedMarkings => _markingDict;
public IReadOnlyDictionary<string, MarkingPrototype> MarkingsByCategory(MarkingCategories category)
public FrozenDictionary<string, MarkingPrototype> MarkingsByCategory(MarkingCategories category)
{
// all marking categories are guaranteed to have a dict entry
return _markingDict[category];
return CategorizedMarkings[category];
}
/// <summary>
@@ -143,7 +153,7 @@ namespace Content.Shared.Humanoid.Markings
public bool TryGetMarking(Marking marking, [NotNullWhen(true)] out MarkingPrototype? markingResult)
{
return _markings.TryGetValue(marking.MarkingId, out markingResult);
return Markings.TryGetValue(marking.MarkingId, out markingResult);
}
/// <summary>
@@ -178,17 +188,8 @@ namespace Content.Shared.Humanoid.Markings
private void OnPrototypeReload(PrototypesReloadedEventArgs args)
{
if(!args.ByType.TryGetValue(typeof(MarkingPrototype), out var set))
return;
_index.RemoveAll(i => set.Modified.ContainsKey(i.ID));
foreach (var prototype in set.Modified.Values)
{
var markingPrototype = (MarkingPrototype) prototype;
_index.Add(markingPrototype);
}
if (args.WasModified<MarkingPrototype>())
CachePrototypes();
}
public bool CanBeApplied(string species, Sex sex, Marking marking, IPrototypeManager? prototypeManager = null)