Merge pull request #127 from GarwelGarwel/dev

Fixed error when calculating training level

Author: GarwelGarwel

Core.cs

@@ -321,7 +321,7 @@ public static string GetString(this ConfigNode n, string key, string defaultValu
             n.HasValue(key) ? n.GetValue(key) : defaultValue;
 
         public static double GetDouble(this ConfigNode n, string key, double defaultValue = 0) =>
-            double.TryParse(n.GetValue(key), out double res) ? res : defaultValue;
+            double.TryParse(n.GetValue(key), out double res) && !double.IsNaN(res) ? res : defaultValue;
 
         public static int GetInt(this ConfigNode n, string key, int defaultValue = 0) =>
             int.TryParse(n.GetValue(key), out int res) ? res : defaultValue;

Factors/ConditionsFactor.cs

@@ -25,7 +25,7 @@ public override double ChangePerDay(ProtoCrewMember pcm)
             double res = 0;
             foreach (HealthCondition hc in khs.Conditions)
                 res += hc.HPChangePerDay * KerbalHealthQuirkSettings.Instance.ConditionsEffect;
-            Core.Log($"Conditions HP chande per day: {res}");
+            Core.Log($"Conditions HP change per day: {res}");
             return Core.IsInEditor ? (IsEnabledInEditor() ? res : 0) : res;
         }
     }

GameData/KerbalHealth/KerbalHealth.dll

@@ -466,7 +466,7 @@ public double TrainingLevel
                 {
                     double totalTraining = TrainingFor.Sum(tp => TrainingLevels[tp.Id] * tp.Complexity);
                     double totalComplexity = TrainingFor.Sum(tp => tp.Complexity);
-                    totalTraining = Math.Min(totalTraining / totalComplexity, Core.TrainingCap);
+                    totalTraining = (totalComplexity != 0) ? totalTraining / totalComplexity : Core.TrainingCap;
                     if (TrainingVessel != null)
                         TrainedVessels[TrainingVessel] = totalTraining;
                     return totalTraining;
@@ -960,12 +960,9 @@ public double HealthChangePerDay()
             int crewCount = Core.GetCrewCount(pcm);
             foreach (HealthFactor f in Core.Factors.Where(f => recalculateCache || !f.Cachable))
             {
-                double c = f.ChangePerDay(pcm) * mods.GetMultiplier(f.Name, crewCount) * mods.GetMultiplier("All", crewCount);
-                if (Core.IsLogging())
-                {
-                    Core.Log($"Multiplier for {f.Name} is {mods.GetMultiplier(f.Name, crewCount)} * {mods.FreeMultipliers[f.Name]} (bonus sum: {mods.BonusSums[f.Name]}; multipliers: {mods.MinMultipliers[f.Name]}..{mods.MaxMultipliers[f.Name]})");
-                    Core.Log($"{f.Name}'s effect on {Name} is {c} HP/day.");
-                }
+                double baseChange = f.ChangePerDay(pcm), factorMultiplier = mods.GetMultiplier(f.Name, crewCount), freeMultiplier = mods.GetMultiplier("All", crewCount);
+                double c = baseChange * factorMultiplier * freeMultiplier;
+                Core.Log($"{f.Name}'s effect on {Name}: {c:D2} = {baseChange:D2} * {factorMultiplier} * {freeMultiplier}");
                 Factors[f.Name] = c;
                 if (f.Cachable)
                     CachedChange += c;