Merge pull request #56 from AscensionGameDev/main

fix: editor NSE for instance type strings (AscensionGameDev#2260)
dhmello · Jul 23, 2024 · 96fd4ed · 96fd4ed
2 parents 310f6d3 + e492c22
commit 96fd4ed
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
@@ -122,7 +122,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.InstanceTypes[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
@@ -50,7 +50,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.InstanceTypes[instanceType]);
         }
         cmbInstanceType.SelectedIndex = (int) mMyCommand.InstanceType;
     }

diff --git a/Intersect.Editor/Localization/Strings.cs b/Intersect.Editor/Localization/Strings.cs
@@ -4195,6 +4195,18 @@ public partial struct MapGrid
 
     }
 
+    public partial struct MapInstance
+    {
+        [JsonProperty(NullValueHandling = NullValueHandling.Ignore)]
+        public static Dictionary<MapInstanceType, LocalizedString> InstanceTypes = new Dictionary<MapInstanceType, LocalizedString>
+        {
+            {MapInstanceType.Overworld, @"Overworld" },
+            {MapInstanceType.Personal, @"Personal" },
+            {MapInstanceType.Guild, @"Guild" },
+            {MapInstanceType.Shared, @"Shared" }
+        };
+    }
+
     public partial struct MapLayers
     {
 
@@ -4247,14 +4259,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?";