Changed planetparent name property to simply parentname since it woul…

…d work better with the system hierarchy
thorwin99 · Mar 22, 2021 · aea5d7e · aea5d7e
1 parent e64cd5a
commit aea5d7e
Showing 1 changed file with 23 additions and 15 deletions.
diff --git a/SEWorldGenPlugin/Generator/MyStarSystemGenerator.Naming.cs b/SEWorldGenPlugin/Generator/MyStarSystemGenerator.Naming.cs
@@ -1,10 +1,18 @@
-using SEWorldGenPlugin.ObjectBuilders;
-using SEWorldGenPlugin.Utilities;
+using SEWorldGenPlugin.Utilities;
 
 namespace SEWorldGenPlugin.Generator
 {
     public partial class MyStarSystemGenerator
     {
+        public static readonly string PROP_OBJ_NUMBER = "ObjectNumber";
+        public static readonly string PROP_OBJ_NUMBER_GREEK = "ObjectNumberGreek";
+        public static readonly string PROP_OBJ_NUMBER_ROMAN = "ObjectNumberRoman";
+        public static readonly string PROP_OBJ_LETTER_LOWER = "ObjectLetterLower";
+        public static readonly string PROP_OBJ_LETTER_UPPER = "ObjectLetterUpper";
+        public static readonly string PROP_OBJ_ID = "ObjectId";
+        public static readonly string PROP_OBJ_PARENT = "ParentName";
+
+
         /// <summary>
         /// Generates a name for the planet based on the naming scheme
         /// defined in the global settings file
@@ -16,12 +24,12 @@ private string GetPlanetName(int planetIndex, string subtypeId)
         {
             string namingScheme = MySettings.Static.Settings.PlanetNameFormat;
 
-            string name = namingScheme.SetProperty("ObjectNumber", planetIndex + 1)
-                                      .SetProperty("ObjectNumberGreek", MyNamingUtils.GREEK_LETTERS[planetIndex % MyNamingUtils.GREEK_LETTERS.Length])
-                                      .SetProperty("ObjectNumberRoman", MyNamingUtils.ConvertNumberToRoman(planetIndex + 1))
-                                      .SetProperty("ObjectLetterLower", (char)('a' + (planetIndex % 26)))
-                                      .SetProperty("ObjectLetterUpper", (char)('A' + (planetIndex % 26)))
-                                      .SetProperty("ObjectId", subtypeId);
+            string name = namingScheme.SetProperty(PROP_OBJ_NUMBER, planetIndex + 1)
+                                      .SetProperty(PROP_OBJ_NUMBER_GREEK, MyNamingUtils.GREEK_LETTERS[planetIndex % MyNamingUtils.GREEK_LETTERS.Length])
+                                      .SetProperty(PROP_OBJ_NUMBER_ROMAN, MyNamingUtils.ConvertNumberToRoman(planetIndex + 1))
+                                      .SetProperty(PROP_OBJ_LETTER_LOWER, (char)('a' + (planetIndex % 26)))
+                                      .SetProperty(PROP_OBJ_LETTER_UPPER, (char)('A' + (planetIndex % 26)))
+                                      .SetProperty(PROP_OBJ_ID, subtypeId);
 
             return name;
         }
@@ -38,13 +46,13 @@ private string GetMoonName(int moonIndex, string subtypeId, string parentPlanetN
         {
             string namingScheme = MySettings.Static.Settings.MoonNameFormat;
 
-            string name = namingScheme.SetProperty("ObjectNumber", moonIndex + 1)
-                                      .SetProperty("ObjectNumberGreek", MyNamingUtils.GREEK_LETTERS[moonIndex % MyNamingUtils.GREEK_LETTERS.Length])
-                                      .SetProperty("ObjectNumberRoman", MyNamingUtils.ConvertNumberToRoman(moonIndex + 1))
-                                      .SetProperty("ObjectLetterLower", (char)('a' + (moonIndex % 26)))
-                                      .SetProperty("ObjectLetterUpper", (char)('A' + (moonIndex % 26)))
-                                      .SetProperty("ObjectId", subtypeId)
-                                      .SetProperty("MoonPlanetName", parentPlanetName);
+            string name = namingScheme.SetProperty(PROP_OBJ_NUMBER, moonIndex + 1)
+                                      .SetProperty(PROP_OBJ_NUMBER_GREEK, MyNamingUtils.GREEK_LETTERS[moonIndex % MyNamingUtils.GREEK_LETTERS.Length])
+                                      .SetProperty(PROP_OBJ_NUMBER_ROMAN, MyNamingUtils.ConvertNumberToRoman(moonIndex + 1))
+                                      .SetProperty(PROP_OBJ_LETTER_LOWER, (char)('a' + (moonIndex % 26)))
+                                      .SetProperty(PROP_OBJ_LETTER_UPPER, (char)('A' + (moonIndex % 26)))
+                                      .SetProperty(PROP_OBJ_ID, subtypeId)
+                                      .SetProperty(PROP_OBJ_PARENT, parentPlanetName);
 
             return name;
         }