Merge pull request #69 from GarwelGarwel/dev

1.3.1 update

Author: GarwelGarwel

Core.cs

@@ -496,6 +496,24 @@ public static bool GetBool(ConfigNode n, string key, bool defaultValue = false)
         /// <returns></returns>
         public static string SignValue(double v, string format) => ((v > 0) ? "+" : "") + v.ToString(format);
 
+        static string[] prefixes = { "", "K", "M", "G", "T" };
+
+        /// <summary>
+        /// Converts a number into a string with a multiplicative character (K, M, G or T), if applicable
+        /// </summary>
+        /// <param name="value">The value to convert</param>
+        /// <param name="allowedDigits">Max number of digits to allow before the prefix (must be 3 or more)</param>
+        /// <returns></returns>
+        public static string PrefixFormat(double value, int allowedDigits = 3, bool mandatorySign = false)
+        {
+            double v = Math.Abs(value);
+            if (v < 0.5) return "0";
+            int n, m = (int)Math.Pow(10, allowedDigits);
+            for (n = 0; (v >= m) && (n < prefixes.Length - 1); n++)
+                v /= 1000;
+            return (value < 0 ? "-" : (mandatorySign ? "+" : "")) + v.ToString("N0") + prefixes[n];
+        }
+
         /// <summary>
         /// Returns the number of occurences of a character in a string
         /// </summary>

GameData/KerbalHealth/KerbalHealth.cfg

@@ -1,4 +1,6 @@
-// Do NOT delete the two conditions below (Exhausted and Frozen). They are hard-coded and needed for Kerbal Health to function
+//// HEALTH CONDITIONS ////
+
+// Do NOT delete the two conditions below (Exhausted and Frozen). They are hard-coded and needed for Kerbal Health to function
 
 HEALTH_CONDITION
 {
@@ -261,6 +263,8 @@ HEALTH_CONDITION
 	}
 }
 
+//// RADIATION SHIELDING ////
+
 RESOURCE_SHIELDING
 {
 	name = RadiationShielding
@@ -297,6 +301,8 @@ RESOURCE_SHIELDING
 	shielding = 0.5
 }
 
+//// QUIRKS ////
+
 HEALTH_QUIRK
 {
 	name = Acrobat
@@ -539,6 +545,8 @@ HEALTH_QUIRK
 	}
 }
 
+//// CUSTOM COFIGS FOR CELESTIAL BODIES ////
+
 PLANET_HEALTH_CONFIG
 {
 	name = Eve
@@ -577,16 +585,37 @@ PLANET_HEALTH_CONFIG
 	magnetosphere = 0.2
 }
 
+// OPM configs
+
 PLANET_HEALTH_CONFIG
 {
 	name = Sarnus
 	magnetosphere = 2
 }
 
+PLANET_HEALTH_CONFIG
+{
+	name = Hale
+	magnetosphere = 0.2
+}
+
 PLANET_HEALTH_CONFIG
 {
 	name = Slate
-	magnetosphere = 0.25
+	magnetosphere = 0.5
+}
+
+PLANET_HEALTH_CONFIG
+{
+	name = Tekto
+	atmosphericAbsorption = 1.5
+}
+
+PLANET_HEALTH_CONFIG
+{
+	name = Thatmo
+	atmosphericAbsorption = 0.25
+	radioactivity = 1000
 }
 
 PLANET_HEALTH_CONFIG

GameData/KerbalHealth/KerbalHealth.dll

@@ -5,17 +5,17 @@
   "VERSION": {
     "MAJOR": 1,
     "MINOR": 3,
-    "PATCH": 0,
+    "PATCH": 1,
     "BUILD": 0
   },
   "KSP_VERSION": {
     "MAJOR": 1,
-    "MINOR": 4,
-    "PATCH": 5
+    "MINOR": 5,
+    "PATCH": 0
   },
   "KSP_VERSION_MIN": {
     "MAJOR": 1,
-    "MINOR": 4,
+    "MINOR": 5,
     "PATCH": 0
   },
   "GITHUB": {

GameData/KerbalHealth/KerbalHealth.version

@@ -1,4 +1,4 @@
-@PART[*]:HAS[#CrewCapacity[>0],!MODULE[ModuleKerbalHealth],!MODULE[KerbalSeat]]:AFTER[KerbalHealth]
+@PART[*]:HAS[#CrewCapacity[>0],!MODULE[ModuleKerbalHealth],!MODULE[KerbalSeat]]:FINAL
 {
 	MODULE
 	{
@@ -7,7 +7,7 @@
 	}
 }
 
-@PART[*]:HAS[#CrewCapacity[>0],~name[*Cockpit*],~name[Cockpit*],~name[*Cockpit],~name[*cupola*],~name[cupola*],~name[*cupola],~name[cupola],!RESOURCE[RadiationShielding],!MODULE[KerbalSeat]]:AFTER[KerbalHealth]
+@PART[*]:HAS[#CrewCapacity[>0],~name[*Cockpit*],~name[Cockpit*],~name[*Cockpit],~name[*cupola*],~name[cupola*],~name[*cupola],~name[cupola],!RESOURCE[RadiationShielding],!MODULE[KerbalSeat]]:FINAL
 {
 	RESOURCE
 	{

GameData/KerbalHealth/Patches/General.cfg

@@ -491,7 +491,8 @@ public void Update()
                     gridContents[(i + 1) * colNumMain + 3].SetOptionText(formatTag + (100 * khs.Health).ToString("F2") + "% (" + khs.HP.ToString("F2") + ")" + formatUntag);
                     gridContents[(i + 1) * colNumMain + 4].SetOptionText(formatTag + ((frozen || (khs.Health >= 1)) ? "—" : (((ch > 0) ? "+" : "") + ch.ToString("F2"))) + formatUntag);
                     gridContents[(i + 1) * colNumMain + 5].SetOptionText(formatTag + s + formatUntag);
-                    gridContents[(i + 1) * colNumMain + 6].SetOptionText(formatTag + khs.Dose.ToString("N0") + (khs.Radiation != 0 ? " (+" + khs.Radiation.ToString("N0") + "/day)" : "") + formatUntag);
+                    gridContents[(i + 1) * colNumMain + 6].SetOptionText(formatTag + Core.PrefixFormat(khs.Dose, 5) + (khs.Radiation != 0 ? " (" + Core.PrefixFormat(khs.Radiation, 4, true) + "/day)" : "") + formatUntag);
+                    //gridContents[(i + 1) * colNumMain + 6].SetOptionText(formatTag + khs.Dose.ToString("N0") + (khs.Radiation != 0 ? " (+" + khs.Radiation.ToString("N0") + "/day)" : "") + formatUntag);
                 }
             }
             else  // Showing details for one particular kerbal

KerbalHealthScenario.cs

@@ -582,13 +582,22 @@ public static double GetCosmicRadiation(Vessel v)
                 cosmicRadiationRate *= occlusionCoefficient;
             }
             else distanceToSun = v.altitude + Sun.Instance.sun.Radius;
+            double naturalRadiation = Core.PlanetConfigs[v.mainBody].Radioactivity * Core.Sqr(v.mainBody.Radius / (v.mainBody.Radius + v.altitude));
             Core.Log("Solar Radiation Quoficient = " + cosmicRadiationRate);
             Core.Log("Distance to Sun = " + distanceToSun + " (" + (distanceToSun / FlightGlobals.GetHomeBody().orbit.radius) + " AU)");
             Core.Log("Nominal Solar Radiation @ Vessel's Location = " + GetSolarRadiationAtDistance(distanceToSun));
             Core.Log("Nominal Galactic Radiation = " + Core.GalacticRadiation);
-            return cosmicRadiationRate * (GetSolarRadiationAtDistance(distanceToSun) + Core.GalacticRadiation);
+            Core.Log("Body's natural radiation = " + naturalRadiation);
+            return cosmicRadiationRate * (GetSolarRadiationAtDistance(distanceToSun) + Core.GalacticRadiation) + naturalRadiation;
         }
 
+        /// <summary>
+        /// Body-emitted radiation reaching the given vessel
+        /// </summary>
+        /// <param name="v"></param>
+        /// <returns></returns>
+        public static double GetNaturalRadiation(Vessel v) => Core.PlanetConfigs[v.mainBody].Radioactivity * Core.Sqr(v.mainBody.Radius / (v.mainBody.Radius + v.altitude));
+
         #endregion
         #region HEALTH UPDATE
 

KerbalHealthStatus.cs

@@ -17,7 +17,7 @@ public override void OnStart(StartState state)
                 case "radiation":
                     Fields["displayData"].guiName = "Radiation";
                     Fields["displayData"].guiUnits = "/day";
-                    Fields["displayData"].guiFormat = "F0";
+                    Fields["displayData"].guiFormat = "N0";
                     break;
                 case "magnetosphere":
                     Fields["displayData"].guiName = "Magnetosphere Shielding";

ModuleHealthEnvironmentSensor.cs

@@ -1,5 +1,8 @@
 namespace KerbalHealth
 {
+    /// <summary>
+    /// Used for custom configuration of celestial bodies' radiation shielding & emission
+    /// </summary>
     public class PlanetHealthConfig
     {
         /// <summary>
@@ -22,6 +25,11 @@ public class PlanetHealthConfig
         /// </summary>
         public double AtmosphericAbsorption { get; set; } = 1;
 
+        /// <summary>
+        /// Natural radiation level at sea level
+        /// </summary>
+        public double Radioactivity { get; set; } = 0;
+
         public ConfigNode ConfigNode
         {
             set
@@ -35,10 +43,11 @@ public ConfigNode ConfigNode
                 if (Body == null) Core.Log("Body '" + Name + "' not found.", Core.LogLevel.Important);
                 Magnetosphere = Core.GetDouble(value, "magnetosphere", Magnetosphere);
                 AtmosphericAbsorption = Core.GetDouble(value, "atmosphericAbsorption", AtmosphericAbsorption);
+                Radioactivity = Core.GetDouble(value, "radioactivity", Radioactivity);
             }
         }
 
-        public override string ToString() => Name + "\r\nMagnetosphere: " + Magnetosphere.ToString("F2") + "\r\nAtmospheric Absorption: " + AtmosphericAbsorption.ToString("F2");
+        public override string ToString() => Name + "\r\nMagnetosphere: " + Magnetosphere.ToString("F2") + "\r\nAtmospheric Absorption: " + AtmosphericAbsorption.ToString("F2") + "\r\nRadioactivity: " + Radioactivity.ToString("F0");
 
         public PlanetHealthConfig(CelestialBody body)
         {

PlanetHealthConfig.cs

@@ -33,7 +33,7 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.3.0.0")]
-[assembly: AssemblyFileVersion("1.3.0.0")]
+[assembly: AssemblyVersion("1.3.1.0")]
+[assembly: AssemblyFileVersion("1.3.1.0")]
 [assembly: NeutralResourcesLanguage("en")]