From a772443c811db67709976cf2d37571c32dc91caf Mon Sep 17 00:00:00 2001 From: Noah Pilarski Date: Thu, 1 Sep 2022 07:18:53 -0400 Subject: [PATCH] Forgor curiosity name --- NewHorizons/Builder/ShipLog/RumorModeBuilder.cs | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/NewHorizons/Builder/ShipLog/RumorModeBuilder.cs b/NewHorizons/Builder/ShipLog/RumorModeBuilder.cs index a5c18d78..ebeed076 100644 --- a/NewHorizons/Builder/ShipLog/RumorModeBuilder.cs +++ b/NewHorizons/Builder/ShipLog/RumorModeBuilder.cs @@ -2,6 +2,7 @@ using NewHorizons.External.Configs; using NewHorizons.External.Modules; using NewHorizons.Handlers; using NewHorizons.Utility; +using OWML.Utils; using System; using System.Collections.Generic; using System.Xml.Linq; @@ -13,14 +14,12 @@ namespace NewHorizons.Builder.ShipLog { private static Dictionary _curiosityColors; private static Dictionary _curiosityHighlightColors; - private static Dictionary _rawNameToCuriosityName; private static Dictionary _entryIdToRawName; public static void Init() { _curiosityColors = new Dictionary(); _curiosityHighlightColors = new Dictionary(); - _rawNameToCuriosityName = new Dictionary(); _entryIdToRawName = new Dictionary(); } @@ -28,10 +27,9 @@ namespace NewHorizons.Builder.ShipLog { foreach (ShipLogModule.CuriosityColorInfo newColor in newColors) { - if (_rawNameToCuriosityName.ContainsKey(newColor.id) == false) + if (!EnumUtils.IsDefined(newColor.id)) { - CuriosityName newName = (CuriosityName)8 + _rawNameToCuriosityName.Count; - _rawNameToCuriosityName.Add(newColor.id, newName); + CuriosityName newName = EnumUtilities.Create(newColor.id); _curiosityColors.Add(newName, newColor.color.ToColor()); _curiosityHighlightColors.Add(newName, newColor.highlightColor.ToColor()); } @@ -192,9 +190,9 @@ namespace NewHorizons.Builder.ShipLog if (_entryIdToRawName.ContainsKey(entry._id)) { var raw = _entryIdToRawName[entry._id]; - if (_rawNameToCuriosityName.ContainsKey(raw)) + if (EnumUtils.IsDefined(raw)) { - entry._curiosity = _rawNameToCuriosityName[raw]; + entry._curiosity = EnumUtils.Parse(raw); } else {