fix: editor NSE for instance type strings

AscensionGameDev · May 25, 2024 · f1f97e9 · f1f97e9
1 parent 26bd1e5
commit f1f97e9
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 10 deletions.
diff --git a/Intersect.Editor/Forms/DockingElements/frmMapLayers.cs b/Intersect.Editor/Forms/DockingElements/frmMapLayers.cs
@@ -128,7 +128,7 @@ public void Init()
             // We do not want to iterate over the "NoChange" enum
             foreach (MapInstanceType instanceType in Enum.GetValues(typeof(MapInstanceType)))
             {
-                cmbInstanceType.Items.Add(instanceType.ToString());
+                cmbInstanceType.Items.Add(Strings.MapInstance.Type[(int)instanceType]);
             }
             cmbInstanceType.SelectedIndex = 0;
 

diff --git a/Intersect.Editor/Forms/Editors/Events/Event Commands/EventCommand_Warp.cs b/Intersect.Editor/Forms/Editors/Events/Event Commands/EventCommand_Warp.cs
@@ -53,7 +53,7 @@ public EventCommandWarp(WarpCommand refCommand, FrmEvent editor)
             // We do not want to iterate over the "NoChange" enum
             foreach (MapInstanceType instanceType in Enum.GetValues(typeof(MapInstanceType)))
             {
-                cmbInstanceType.Items.Add(instanceType.ToString());
+                cmbInstanceType.Items.Add(Strings.MapInstance.Type[(int)instanceType]);
             }
             cmbInstanceType.SelectedIndex = (int) mMyCommand.InstanceType;
         }

diff --git a/Intersect.Editor/Localization/Strings.cs b/Intersect.Editor/Localization/Strings.cs
@@ -4197,6 +4197,18 @@ public partial struct MapGrid
 
         }
 
+        public partial struct MapInstance
+        {
+            [JsonProperty(NullValueHandling = NullValueHandling.Ignore)]
+            public static Dictionary<int, LocalizedString> Type = new Dictionary<int, LocalizedString>
+            {
+                {(int) MapInstanceType.Overworld, @"Overworld"},
+                {(int) MapInstanceType.Personal, @"Personal"},
+                {(int) MapInstanceType.Guild, @"Guild"},
+                {(int) MapInstanceType.Shared, @"Shared"},
+            };
+        }
+
         public partial struct MapLayers
         {
 
@@ -4249,14 +4261,6 @@ public partial struct MapList
 
         public partial struct Mapping
         {
-            public static LocaleDictionary<MapInstanceType, LocalizedString> InstanceTypes = new LocaleDictionary<MapInstanceType, LocalizedString>()
-            {
-                {MapInstanceType.Overworld, @"Overworld"},
-                {MapInstanceType.Personal, @"Personal"},
-                {MapInstanceType.Guild, @"Guild"},
-                {MapInstanceType.Shared, @"Shared"},
-            };
-
             public static LocalizedString createmap = @"Create new map.";
 
             public static LocalizedString createmapdialogue = @"Do you want to create a map here?";