Merge branch 'KSP-RO:master' into master

GameData/RP-1/Contracts/Lunar Surface Probes/MoonLandingFarSide.cfg

@@ -29,7 +29,7 @@ CONTRACT_TYPE
 	rewardScience = 0
 	rewardFunds = 0
 	failureFunds = 0
-	rewardReputation = 150
+	rewardReputation = 250
 	failureReputation = 0 // was @rewardReputation
 
 	// ************ REQUIREMENTS ************

GameData/RP-1/Contracts/Lunar Surface Probes/MoonLandingFarSideOptional.cfg

@@ -29,7 +29,7 @@ CONTRACT_TYPE
 	rewardScience = 0
 	rewardFunds = 0
 	failureFunds = 0
-	rewardReputation = 150
+	rewardReputation = 250
 	failureReputation = 0 // was @rewardReputation
 
 	// ************ REQUIREMENTS ************

GameData/RP-1/Contracts/Lunar Surface Probes/MoonLandingReturn.cfg

@@ -29,7 +29,7 @@ CONTRACT_TYPE
 	rewardScience = 0
 	rewardFunds = 0
 	failureFunds = 0
-	rewardReputation = 200
+	rewardReputation = 400
 	failureReputation = 0 // was @rewardReputation
 
 	// ************ REQUIREMENTS ************

GameData/RP-1/RP-1.version

@@ -1,11 +1,11 @@
 {
     "NAME": "Realistic Progression One",
     "URL": "https://raw.githubusercontent.com/KSP-RO/RP-1/master/GameData/RP-1/RP-1.version",
-    "DOWNLOAD": "https://github.com/KSP-RO/RP-1/releases/download/v3.9.0.0/RP-1-v3.9.0.0.zip",
+    "DOWNLOAD": "https://github.com/KSP-RO/RP-1/releases/download/v3.10.0.0/RP-1-v3.10.0.0.zip",
     "HOMEPAGE": "https://github.com/KSP-RO/RP-1/",
     "VERSION": {
         "MAJOR": 3,
-        "MINOR": 9,
+        "MINOR": 10,
         "PATCH": 0,
         "BUILD": 0
     },

GameData/RP-1/changelog.cfg

@@ -5,6 +5,30 @@ KERBALCHANGELOG
 	author = KSP-RO team
 	website = github.com/KSP-RO/RP-1
 	VERSION
+	{
+		version = 3.10.0.0
+		versionKSP = 1.12.3
+		CHANGE
+		{
+			change = What's Changed
+			subchange = Enable comms ground station(s) only for active launch site(s)
+			subchange = Change pad reconditioning to be independent from other LC operations
+			subchange = Buff Molniya repeatable contract reward
+			subchange = Buff reward of far side landing optional and sample return contracts
+			subchange = Add support for RA TL10 (Tracking Station lvl 11)
+			subchange = Improve NFEX configs
+			subchange = Recalculate build rates when needed
+			subchange = Fix contract, program and part descriptions
+			subchange = Fix optional Lunar Landing (Uncrewed) contract description
+			subchange = Run Parts Browser queued changes in reverse
+			subchange = Stop overriding RSS space threshold for the moon
+			subchange = Fix airlaunch costs not getting reflected in budget calcs
+			subchange = Rewrite Ops time/efficiency prediction to match VBP version
+			subchange = Set supersonic jet trainer antenna to TL0
+			subchange = Fix KSCSwitcher Harmony patch using improper KSC name
+		}
+	}
+	VERSION
 	{
 		version = 3.9.0.0
 		versionKSP = 1.12.3

README.md

@@ -4,7 +4,7 @@
 <p align="center">
  <a href="https://nightly.link/KSP-RO/RP-1/workflows/build/master/RP-1.zip" rel="nofollow"><img src="https://badgen.net/badge/Nightly%20build/download/blue"></a>
  <a href="https://discord.gg/V73jjNd" rel="nofollow"><img src="https://badgen.net/discord/online-members/V73jjNd?icon=discord"></a>
- <a href="https://github.com/KSP-RO/RP-1/compare/v3.9.0.0...master" rel="nofollow"><img src="https://img.shields.io/github/commits-since/KSP-RO/RP-1/latest"></a>
+ <a href="https://github.com/KSP-RO/RP-1/compare/v3.10.0.0...master" rel="nofollow"><img src="https://img.shields.io/github/commits-since/KSP-RO/RP-1/latest"></a>
 </p>
 
 Welcome to Realistic Progression One, the heavyweight career addon for Kerbal Space Program's Realism Overhaul.

Source/RP0/ModIntegrations/KSCSwitcherInterop.cs

@@ -1,4 +1,5 @@
 using System;
+using System.Collections.Generic;
 using System.Linq;
 using System.Reflection;
 
@@ -7,10 +8,12 @@ namespace RP0
     public static class KSCSwitcherInterop
     {
         private static bool? _isKSCSwitcherInstalled = null;
-        private static FieldInfo _fiKSCSwInstance;
-        private static FieldInfo _fiKSCSwSites;
         private static FieldInfo _fiKSCSwLastSite;
         private static FieldInfo _fiKSCSwDefaultSite;
+        private static MethodInfo _miKSCSwGetSiteByName;
+        private static object _kscLoaderInstance;    // this is a static singleton
+        private static object _sites;                // instance field in KSCLoader instance but in practice is never changed after parent object creation
+        private static Dictionary<string, string> _groundStationNameDict = new Dictionary<string, string>();
 
         public const string LegacyDefaultKscId = "Stock";
         public const string DefaultKscId = "us_cape_canaveral";
@@ -26,14 +29,17 @@ public static bool IsKSCSwitcherInstalled
                     if (_isKSCSwitcherInstalled.Value)
                     {
                         Type t = a.GetType("regexKSP.KSCLoader");
-                        _fiKSCSwInstance = t?.GetField("instance", BindingFlags.Public | BindingFlags.Static);
-                        _fiKSCSwSites = t?.GetField("Sites", BindingFlags.Public | BindingFlags.Instance | BindingFlags.FlattenHierarchy);
+                         var fiKSCSwInstance = t?.GetField("instance", BindingFlags.Public | BindingFlags.Static);
+                        _kscLoaderInstance = fiKSCSwInstance?.GetValue(null);
+                        var fiKSCSwSites = t?.GetField("Sites", BindingFlags.Public | BindingFlags.Instance | BindingFlags.FlattenHierarchy);
+                        _sites = fiKSCSwSites.GetValue(_kscLoaderInstance);
 
                         t = a.GetType("regexKSP.KSCSiteManager");
                         _fiKSCSwLastSite = t?.GetField("lastSite", BindingFlags.Public | BindingFlags.Instance | BindingFlags.FlattenHierarchy);
                         _fiKSCSwDefaultSite = t?.GetField("defaultSite", BindingFlags.Public | BindingFlags.Instance | BindingFlags.FlattenHierarchy);
+                        _miKSCSwGetSiteByName = t?.GetMethod("GetSiteByName", BindingFlags.Public | BindingFlags.Instance | BindingFlags.FlattenHierarchy);
 
-                        if (_fiKSCSwInstance == null || _fiKSCSwSites == null || _fiKSCSwLastSite == null || _fiKSCSwDefaultSite == null)
+                        if (_kscLoaderInstance == null || _sites == null || _fiKSCSwLastSite == null || _fiKSCSwDefaultSite == null || _miKSCSwGetSiteByName == null)
                         {
                             RP0Debug.LogError("Failed to bind to KSCSwitcher");
                             _isKSCSwitcherInstalled = false;
@@ -48,18 +54,26 @@ public static string GetActiveRSSKSC()
         {
             if (!IsKSCSwitcherInstalled) return null;
 
-            // get the LastKSC.KSCLoader.instance object
             // check the Sites object (KSCSiteManager) for the lastSite, if "" then get defaultSite
-
-            object loaderInstance = _fiKSCSwInstance.GetValue(null);
-            if (loaderInstance == null)
-                return null;
-            object sites = _fiKSCSwSites.GetValue(loaderInstance);
-            string lastSite = _fiKSCSwLastSite.GetValue(sites) as string;
+            string lastSite = _fiKSCSwLastSite.GetValue(_sites) as string;
 
             if (lastSite == string.Empty)
-                lastSite = _fiKSCSwDefaultSite.GetValue(sites) as string;
+                lastSite = _fiKSCSwDefaultSite.GetValue(_sites) as string;
             return lastSite;
         }
+
+        public static string GetGroundStationForKSC(string kscName)
+        {
+            if (!IsKSCSwitcherInstalled) return null;
+
+            if (!_groundStationNameDict.TryGetValue(kscName, out string groundStationName))
+            {
+                var cn = _miKSCSwGetSiteByName.Invoke(_sites, new object[] { kscName }) as ConfigNode;
+                groundStationName = cn?.GetValue("groundStation");
+                _groundStationNameDict[kscName] = groundStationName;
+            }
+
+            return groundStationName;
+        }
     }
 }

Source/RP0/Properties/AssemblyInfo.cs

@@ -45,6 +45,7 @@
 
 [assembly: KSPAssemblyDependency("ModularFlightIntegrator", 1, 0)]
 [assembly: KSPAssemblyDependency("RealFuels", 15, 7)]
+[assembly: KSPAssemblyDependency("RealAntennas", 2, 4)]
 [assembly: KSPAssemblyDependency("ROUtils", 1, 0, 1)]
 [assembly: KSPAssemblyDependency("ClickThroughBlocker", 1, 8)]
 [assembly: KSPAssemblyDependency("ContractConfigurator", 2, 6)]

Source/RP0/RP0.csproj

@@ -314,6 +314,9 @@
     <Reference Include="ModularFlightIntegrator">
       <Private>False</Private>
     </Reference>
+    <Reference Include="RealAntennas">
+      <Private>False</Private>
+    </Reference>
     <Reference Include="RealFuels">
       <Private>False</Private>
     </Reference>

Source/RP0/SpaceCenter/LaunchComplex/LCSpaceCenter.cs

@@ -20,7 +20,6 @@ public class LCSpaceCenter : IConfigNode
         public PersistentObservableList<LCConstructionProject> LCConstructions = new PersistentObservableList<LCConstructionProject>();
         [Persistent]
         public PersistentObservableList<FacilityUpgradeProject> FacilityUpgrades = new PersistentObservableList<FacilityUpgradeProject>();
-
 
         public List<ConstructionProject> Constructions = new List<ConstructionProject>();
 
@@ -29,6 +28,8 @@ public class LCSpaceCenter : IConfigNode
         public const int HangarIndex = 0;
         public LaunchComplex Hangar => LaunchComplexes[HangarIndex];
 
+        public string AssociatedGroundStation => KSCSwitcherInterop.GetGroundStationForKSC(KSCName);
+
         void added(int idx, ConstructionProject item) { Constructions.Add(item); }
         void removed(int idx, ConstructionProject item) { Constructions.Remove(item); }
         void updated()

Source/RP0/SpaceCenter/SpaceCenterManagement.cs

@@ -97,7 +97,7 @@ public static void ClearVesselEditMode()
         [KSPField(isPersistant = true)] public bool DontShowFirstRunAgain = false;
         #endregion
 
-        public const int VERSION = 8;
+        public const int VERSION = 9;
         [KSPField(isPersistant = true)] public int LoadedSaveVersion = VERSION;
 
         [KSPField(isPersistant = true)] public bool IsFirstStart = true;
@@ -540,9 +540,15 @@ public override void OnLoad(ConfigNode node)
                 // Prune bad or inactive KSCs.
                 for (int i = KSCs.Count; i-- > 0;)
                 {
+                    bool any = false;
                     LCSpaceCenter ksc = KSCs[i];
                     if (ksc.KSCName == null || ksc.KSCName.Length == 0 || (ksc.IsEmpty && ksc != ActiveSC))
+                    {
                         KSCs.RemoveAt(i);
+                        any = true;
+                    }
+
+                    if (any) KCTUtilities.RefreshGroundStationActiveState();
                 }
 
                 foreach (var vp in BuildPlans.Values)
@@ -556,6 +562,11 @@ public override void OnLoad(ConfigNode node)
 
                 if (LoadedSaveVersion < VERSION)
                 {
+                    if (LoadedSaveVersion < 9)
+                    {
+                        KCTUtilities.RefreshGroundStationActiveState();
+                    }
+
                     // This upgrades to new payloads
                     // NOTE this upgrade has to come before other upgrades
                     // that touch ship nodes, because they will do the UpgradePipeline
@@ -888,6 +899,7 @@ public void SetActiveKSC(string site)
                     newKsc = new LCSpaceCenter(site);
                     newKsc.EnsureStartingLaunchComplexes();
                     KSCs.Add(newKsc);
+                    KCTUtilities.RefreshGroundStationActiveState();
                 }
 
                 SetActiveKSC(newKsc);

Source/RP0/Utilities/KCTUtilities.cs

@@ -3,6 +3,7 @@
 using KSP.UI.Screens;
 using ROUtils;
 using System;
+using System.Collections;
 using System.Collections.Generic;
 using System.IO;
 using System.Reflection;
@@ -1517,6 +1518,47 @@ public static void SetFacilityLevel(SpaceCenterFacility scf, int level)
             }
         }
 
+        public static void RefreshGroundStationActiveState()
+        {
+            var scInstance = SpaceCenterManagement.Instance;
+            if (scInstance == null)
+            {
+                RP0Debug.LogError("SpaceCenterManagement.Instance is null");
+                return;
+            }
+
+            if (!RealAntennas.HomeNodeTypes.initialized)
+            {
+                static IEnumerator DelayedRefreshRoutine()
+                {
+                    yield return new WaitForEndOfFrame();
+                    RefreshGroundStationActiveState_Internal();
+                }
+                scInstance.StartCoroutine(DelayedRefreshRoutine());
+            }
+            else
+            {
+                RefreshGroundStationActiveState_Internal();
+            }
+        }
+
+        private static void RefreshGroundStationActiveState_Internal()
+        {
+            if (RealAntennas.HomeNodeTypes.HomeDict.TryGetValue("LaunchSite", out List<RealAntennas.Network.RACommNetHome> lsHomes))
+            {
+                RP0Debug.Log("RefreshGroundStationActiveState");
+                var allActiveKSCStations = SpaceCenterManagement.Instance.KSCs.Select(ksc => ksc.AssociatedGroundStation).ToList();
+                foreach (RealAntennas.Network.RACommNetHome home in lsHomes)
+                {
+                    home.enabled = allActiveKSCStations.Contains(home.nodeName);
+                }
+            }
+            else
+            {
+                RP0Debug.LogError("Failed to update RA LaunchSite active state");
+            }
+        }
+
         private static void ClobberRACommnet()
         {
             var mInf = CommNetScenario.Instance?.GetType().GetMethod("ApplyTSLevelChange", BindingFlags.Instance | BindingFlags.NonPublic | BindingFlags.FlattenHierarchy);