Merge pull request #290 from cake-pie/fix-trait

Replace localized pcm.experienceTrait.*
UmbraSpaceIndustries · Apr 16, 2019 · 847f2e3 · 847f2e3
2 parents f9a2723 + b5235b0
commit 847f2e3
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 9 deletions.
diff --git a/Source/USILifeSupport/Converters/USILS_LifeSupportExtenderConverterAddon.cs b/Source/USILifeSupport/Converters/USILS_LifeSupportExtenderConverterAddon.cs
@@ -47,7 +47,7 @@ public override void PostProcess(ConverterResults result, double deltaTime)
             for (int i = 0; i < count; ++i)
             {
                 var c = crew[i];
-                if (string.IsNullOrEmpty(RestrictedToClass) || c.experienceTrait.Title == RestrictedToClass)
+                if (string.IsNullOrEmpty(RestrictedToClass) || c.experienceTrait.Config.Name == RestrictedToClass)
                     kerbals.Add(c);
             }
 

diff --git a/Source/USILifeSupport/LifeSupportManager.cs b/Source/USILifeSupport/LifeSupportManager.cs
@@ -118,7 +118,7 @@ public LifeSupportStatus FetchKerbal(ProtoCrewMember crew)
                 k.PreviousVesselId = "??UNKNOWN??";
                 k.LastUpdate = Planetarium.GetUniversalTime();
                 k.IsGrouchy = false;
-                k.OldTrait = crew.experienceTrait.Title;
+                k.OldTrait = crew.experienceTrait.Config.Name;
                 TrackKerbal(k);
             }
 

diff --git a/Source/USILifeSupport/ModuleLifeSupportSystem.cs b/Source/USILifeSupport/ModuleLifeSupportSystem.cs
@@ -325,7 +325,7 @@ public void FixedUpdate()
                                     LifeSupportManager.GetNoHomeEffect(trackedKerbal.KerbalName),
                                     "homesickness");
                             }
-                            else if (crewMember.experienceTrait.Title != trackedKerbal.OldTrait && !isAnyGrouch)
+                            else if (crewMember.experienceTrait.Config.Name != trackedKerbal.OldTrait && !isAnyGrouch)
                             {
                                 RemoveGrouchiness(crewMember, trackedKerbal);
                             }
@@ -389,7 +389,7 @@ private bool IsAtHomeForEva(Vessel evaKerbal)
 
         private void ApplyEVAEffect(LifeSupportStatus trackedKerbal, ProtoCrewMember crewMember, Vessel vessel, int effectId)
         {
-            if (crewMember.type == ProtoCrewMember.KerbalType.Tourist || crewMember.experienceTrait.Title == "Tourist")
+            if (crewMember.type == ProtoCrewMember.KerbalType.Tourist || crewMember.experienceTrait.Config.Name == "Tourist")
                 return;
 
             /* SIDE EFFECTS:
@@ -410,7 +410,7 @@ private void ApplyEVAEffect(LifeSupportStatus trackedKerbal, ProtoCrewMember cre
                     if (crewMember.type != ProtoCrewMember.KerbalType.Tourist)
                     {
                         screenMessage = string.Format("{0} refuses to work", crewMember.name);
-                        trackedKerbal.OldTrait = crewMember.experienceTrait.TypeName;
+                        trackedKerbal.OldTrait = crewMember.experienceTrait.Config.Name;
                         crewMember.type = ProtoCrewMember.KerbalType.Tourist;
                         KerbalRoster.SetExperienceTrait(crewMember, "Tourist");
                         trackedKerbal.IsGrouchy = true;
@@ -420,7 +420,7 @@ private void ApplyEVAEffect(LifeSupportStatus trackedKerbal, ProtoCrewMember cre
                 case 2:  //Mutinous
                     {
                         screenMessage = string.Format("{0} has become mutinous", crewMember.name);
-                        trackedKerbal.OldTrait = crewMember.experienceTrait.TypeName;
+                        trackedKerbal.OldTrait = crewMember.experienceTrait.Config.Name;
                         crewMember.type = ProtoCrewMember.KerbalType.Tourist;
                         KerbalRoster.SetExperienceTrait(crewMember, "Tourist");
                         trackedKerbal.IsGrouchy = true;
@@ -767,7 +767,7 @@ private bool CheckECSideEffects(LifeSupportStatus trackedKerbal)
         private void ApplyEffect(LifeSupportStatus trackedKerbal, ProtoCrewMember crewMember, int effectId, string reason)
         {
             //Tourists are immune to effects
-            if (crewMember.type == ProtoCrewMember.KerbalType.Tourist || crewMember.experienceTrait.Title == "Tourist")
+            if (crewMember.type == ProtoCrewMember.KerbalType.Tourist || crewMember.experienceTrait.Config.Name == "Tourist")
                 return;
 
             /* SIDE EFFECTS:
@@ -786,15 +786,15 @@ private void ApplyEffect(LifeSupportStatus trackedKerbal, ProtoCrewMember crewMe
                     return; // No need to print
                 case 1: //Grouchy
                     msg = string.Format("{0} refuses to work {1}", crewMember.name, reason);
-                    trackedKerbal.OldTrait = crewMember.experienceTrait.TypeName;
+                    trackedKerbal.OldTrait = crewMember.experienceTrait.Config.Name;
                     crewMember.type = ProtoCrewMember.KerbalType.Tourist;
                     KerbalRoster.SetExperienceTrait(crewMember, "Tourist");
                     trackedKerbal.IsGrouchy = true;
                     LifeSupportManager.Instance.TrackKerbal(trackedKerbal);
                     break;
                 case 2:  //Mutinous
                     msg = string.Format("{0} has become mutinous due to {1}", crewMember.name, reason);
-                    trackedKerbal.OldTrait = crewMember.experienceTrait.TypeName;
+                    trackedKerbal.OldTrait = crewMember.experienceTrait.Config.Name;
                     crewMember.type = ProtoCrewMember.KerbalType.Tourist;
                     KerbalRoster.SetExperienceTrait(crewMember, "Tourist");
                     trackedKerbal.IsGrouchy = true;