Fix a bug and add missing functionality relating to ExperienceTrait (#45

)
KSP-RO · Jul 3, 2024 · c9ba036 · c9ba036
1 parent b433547
commit c9ba036
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 9 deletions.
diff --git a/source/ContractConfigurator/ExpressionParser/Parsers/Classes/ExperienceTraitParser.cs b/source/ContractConfigurator/ExpressionParser/Parsers/Classes/ExperienceTraitParser.cs
@@ -88,7 +88,7 @@ public override bool EQ(ExperienceTrait a, ExperienceTrait b)
                 return true;
             }
 
-            return a.TypeName == b.TypeName;
+            return a?.TypeName == b?.TypeName;
         }
 
         public override ExperienceTrait ParseIdentifier(Token token)
@@ -110,17 +110,13 @@ public override ExperienceTrait ParseIdentifier(Token token)
                 return null;
             }
 
-            for (int index = 0; index < GameDatabase.Instance.ExperienceConfigs.Categories.Count; ++index)
+            var result = ConfigNodeUtil.ParseExperienceTrait(identifier);
+            if (result == null)
             {
-                if (identifier == GameDatabase.Instance.ExperienceConfigs.Categories[index].Name)
-                {
-                    Type type = KerbalRoster.GetExperienceTraitType(identifier) ?? typeof(ExperienceTrait);
-                    return ExperienceTrait.Create(type, GameDatabase.Instance.ExperienceConfigs.Categories[index], null);
-                }
+                LoggingUtil.LogError(this, StringBuilderCache.Format("Unknown experience trait '{0}'.", identifier));
             }
 
-            LoggingUtil.LogError(this, StringBuilderCache.Format("Unknown experience trait '{0}'.", identifier));
-            return null;
+            return result;
         }
     }
 }
diff --git a/source/ContractConfigurator/ScenarioModules/PersistentDataStore.cs b/source/ContractConfigurator/ScenarioModules/PersistentDataStore.cs
@@ -245,6 +245,10 @@ public static string OutputValue(object value, out Type type)
                 Biome b = (Biome)value;
                 strValue = b.body.name + ";" + b.biome;
             }
+            else if (type == typeof(Experience.ExperienceTrait))
+            {
+                strValue = ((Experience.ExperienceTrait)(value)).TypeName;
+            }
             else if (type.Name == "List`1")
             {
                 strValue = "[ ";

diff --git a/source/ContractConfigurator/Util/ConfigNodeUtil.cs b/source/ContractConfigurator/Util/ConfigNodeUtil.cs
@@ -394,6 +394,10 @@ public static T ParseSingleValue<T>(string key, string stringValue, bool allowEx
             {
                 value = (T)(object)ParseLaunchSiteValue(stringValue);
             }
+            else if (typeof(T) == typeof(Experience.ExperienceTrait))
+            {
+                value = (T)(object)ParseExperienceTrait(stringValue);
+            }
             // Do newline conversions
             else if (typeof(T) == typeof(string))
             {
@@ -1073,6 +1077,20 @@ private static ProtoCrewMember ParseProtoCrewMemberValue(string name)
             return null;
         }
 
+        public static Experience.ExperienceTrait ParseExperienceTrait(string traitName)
+        {
+            for (int index = 0; index < GameDatabase.Instance.ExperienceConfigs.Categories.Count; ++index)
+            {
+                if (traitName == GameDatabase.Instance.ExperienceConfigs.Categories[index].Name)
+                {
+                    Type type = KerbalRoster.GetExperienceTraitType(traitName) ?? typeof(Experience.ExperienceTrait);
+                    return Experience.ExperienceTrait.Create(type, GameDatabase.Instance.ExperienceConfigs.Categories[index], null);
+                }
+            }
+
+            return null;
+        }
+
         private static void AddFoundKey(ConfigNode configNode, string key)
         {
             // Initialize the list