Implement major/minor program support. (#2074)

* Implement major/minor program support.
* Programs now have a 'slots' field.
*Admin Building now has a slot limit rather than program limit
* Apply slots field to all existing programs
* Add upgrade script to handle transition from pre-2.4 Admin.

* Redo slots for more granularity, fix slots to be public (no need for getter)

GameData/RP-1/CustomBarnKit.cfg

@@ -90,11 +90,11 @@
 	}
 	@ADMINISTRATION
 	{
-		@levels = 3
-		@upgradesVisual = 1, 2, 3
-		@upgrades = 25000, 250000, 750000
-		@activeStrategyLimit = 2, 3, 4
-		@strategyCommitRange = 0, 0, 0
+		@levels = 9
+		@upgradesVisual = 1, 1, 2, 2, 2, 3, 3, 3, 3
+		@upgrades = 25000, 40000, 140000, 250000, 400000, 500000, 500000, 500000, 500000
+		@activeStrategyLimit = 5, 6, 7, 8, 9, 10, 11, 12, 13
+		@strategyCommitRange = 0, 0, 0, 0, 0, 0, 0, 0, 0
 	}
 	@RESEARCH
 	{

GameData/RP-1/Localization/en-us.cfg

@@ -3,11 +3,11 @@
 	RP0conf = True
 	en-us
 	{
-		#autoLOC_439627 = Active Programs: <<1>> [Max: <<2>>]
-		#autoLOC_900144 = Max Active Programs: [StrategyCount]
+		#autoLOC_439627 = Program Slots: <<1>> [Max: <<2>>]
+		#autoLOC_900144 = Max Program Slots: [StrategyCount]
 		#autoLOC_900268 = Active Programs
 		#autoLOC_6001741 = Programs
-		#autoLOC_6002231 = Max Active Programs:
+		#autoLOC_6002231 = Max Program Slots:
 		#autoLOC_304887 = Leader can be removed
 
 		#autoLOC_304890 = Leader: Cannot be removed as they have not yet served the minimum time.

GameData/RP-1/Programs/Programs.cfg

@@ -9,6 +9,7 @@ RP0_PROGRAM
 	fundingCurve = BackloadedFundingCurve
 	repDeltaOnCompletePerYearEarly = 30
 	repPenaltyPerYearLate = 30
+	slots = 2
 
 	OBJECTIVES
 	{
@@ -66,6 +67,7 @@ RP0_PROGRAM
 	baseFunding = 210000
 	repDeltaOnCompletePerYearEarly = 20
 	repPenaltyPerYearLate = 20
+	slots = 2
 
 	OBJECTIVES
 	{
@@ -98,6 +100,7 @@ RP0_PROGRAM
 	baseFunding = 210000
 	repDeltaOnCompletePerYearEarly = 20
 	repPenaltyPerYearLate = 20
+	slots = 2
 
 	OBJECTIVES
 	{
@@ -150,6 +153,7 @@ RP0_PROGRAM
 	fundingCurve = MildBackloadedFundingCurve
 	repDeltaOnCompletePerYearEarly = 50
 	repPenaltyPerYearLate = 50
+	slots = 2
 
 	REQUIREMENTS
 	{
@@ -199,6 +203,7 @@ RP0_PROGRAM
 	baseFunding = 875000
 	repDeltaOnCompletePerYearEarly = 75
 	repPenaltyPerYearLate = 75
+	slots = 3
 
 	REQUIREMENTS
 	{
@@ -245,6 +250,7 @@ RP0_PROGRAM
 	baseFunding = 360000
 	repDeltaOnCompletePerYearEarly = 100
 	repPenaltyPerYearLate = 100
+	slots = 1
 
 	REQUIREMENTS
 	{
@@ -289,6 +295,7 @@ RP0_PROGRAM
 	baseFunding = 400000
 	repDeltaOnCompletePerYearEarly = 100
 	repPenaltyPerYearLate = 100
+	slots = 1
 
 	REQUIREMENTS
 	{
@@ -327,6 +334,7 @@ RP0_PROGRAM
 	fundingCurve = MildBackloadedFundingCurve
 	repDeltaOnCompletePerYearEarly = 400
 	repPenaltyPerYearLate = 400
+	slots = 2
 
 	REQUIREMENTS
 	{
@@ -361,6 +369,7 @@ RP0_PROGRAM
 	baseFunding = 800000
 	repDeltaOnCompletePerYearEarly = 200
 	repPenaltyPerYearLate = 200
+	slots = 2
 
 	REQUIREMENTS
 	{	
@@ -403,6 +412,7 @@ RP0_PROGRAM
 	fundingCurve = MildBackloadedFundingCurve
 	repDeltaOnCompletePerYearEarly = 400
 	repPenaltyPerYearLate = 400
+	slots = 2
 
 	REQUIREMENTS
 	{
@@ -445,6 +455,7 @@ RP0_PROGRAM
 	repDeltaOnCompletePerYearEarly = 400
 	repPenaltyPerYearLate = 400
 	repToConfidence = 3
+	slots = 3
 	
 	REQUIREMENTS
 	{
@@ -495,6 +506,7 @@ RP0_PROGRAM
 	fundingCurve = BackloadedFundingCurve
 	repDeltaOnCompletePerYearEarly = 400
 	repPenaltyPerYearLate = 400
+	slots = 3
 
 	REQUIREMENTS
 	{
@@ -539,6 +551,7 @@ RP0_PROGRAM
 	repDeltaOnCompletePerYearEarly = 300
 	repPenaltyPerYearLate = 300
 	repToConfidence = 2
+	slots = 2
 
 	REQUIREMENTS
 	{
@@ -577,6 +590,7 @@ RP0_PROGRAM
 	repDeltaOnCompletePerYearEarly = 800
 	repPenaltyPerYearLate = 800
 	repToConfidence = 2
+	slots = 4
 
 	REQUIREMENTS
 	{
@@ -630,6 +644,7 @@ disabled_RP0_PROGRAM
 	baseFunding = 15000000
 	repDeltaOnCompletePerYearEarly = 750
 	repPenaltyPerYearLate = 750
+	slots = 3
 
 	REQUIREMENTS
 	{
@@ -663,6 +678,7 @@ RP0_PROGRAM
 	repDeltaOnCompletePerYearEarly = 800
 	repPenaltyPerYearLate = 800
 	repToConfidence = 2
+	slots = 3
 
 	REQUIREMENTS
 	{
@@ -705,6 +721,7 @@ RP0_PROGRAM
 	repDeltaOnCompletePerYearEarly = 800
 	repPenaltyPerYearLate = 800
 	repToConfidence = 2
+	slots = 3
 
 	REQUIREMENTS
 	{
@@ -741,6 +758,7 @@ RP0_PROGRAM
 	baseFunding = 4000000
 	repDeltaOnCompletePerYearEarly = 600
 	repPenaltyPerYearLate = 600
+	slots = 2
 
 	REQUIREMENTS
 	{
@@ -777,6 +795,7 @@ RP0_PROGRAM
 	repDeltaOnCompletePerYearEarly = 600
 	repPenaltyPerYearLate = 600
 	repToConfidence = 3
+	slots = 3
 
 	REQUIREMENTS
 	{
@@ -813,6 +832,7 @@ RP0_PROGRAM
 	repDeltaOnCompletePerYearEarly = 600
 	repPenaltyPerYearLate = 600
 	repToConfidence = 3
+	slots = 2
 
 	REQUIREMENTS
 	{
@@ -850,6 +870,7 @@ RP0_PROGRAM
 	repDeltaOnCompletePerYearEarly = 600
 	repPenaltyPerYearLate = 600
 	repToConfidence = 3
+	slots = 3
 
 	REQUIREMENTS
 	{
@@ -896,6 +917,7 @@ disabled_RP0_PROGRAM
 	baseFunding = 14400000
 	repDeltaOnCompletePerYearEarly = 800
 	repPenaltyPerYearLate = 800
+	slots = 4
 
 	REQUIREMENTS
 	{
@@ -926,6 +948,7 @@ RP0_PROGRAM
 	repDeltaOnCompletePerYearEarly = 600
 	repPenaltyPerYearLate = 600
 	repToConfidence = 3
+	slots = 3
 
 	REQUIREMENTS
 	{
@@ -979,6 +1002,7 @@ disabled_RP0_PROGRAM
 	baseFunding = 21600000
 	repDeltaOnCompletePerYearEarly = 800
 	repPenaltyPerYearLate = 800
+	slots = 4
 
 	REQUIREMENTS
 	{
@@ -1009,6 +1033,7 @@ RP0_PROGRAM
 	repDeltaOnCompletePerYearEarly = 600
 	repPenaltyPerYearLate = 600
 	repToConfidence = 2
+	slots = 3
 
 	REQUIREMENTS
 	{
@@ -1052,6 +1077,7 @@ RP0_PROGRAM
 	repDeltaOnCompletePerYearEarly = 1000
 	repPenaltyPerYearLate = 1000
 	repToConfidence = 3
+	slots = 4
 
 	REQUIREMENTS
 	{
@@ -1106,6 +1132,7 @@ RP0_PROGRAM
 	baseFunding = 25200000
 	repDeltaOnCompletePerYearEarly = 1200
 	repPenaltyPerYearLate = 1200
+	slots = 4
 
 	REQUIREMENTS
 	{
@@ -1142,6 +1169,7 @@ disabled_RP0_PROGRAM
 	baseFunding = 20000000
 	repDeltaOnCompletePerYearEarly = 1500
 	repPenaltyPerYearLate = 1500
+	slots = 5
 
 	REQUIREMENTS
 	{
@@ -1175,6 +1203,7 @@ disabled_RP0_PROGRAM
 	baseFunding = 42000000
 	repDeltaOnCompletePerYearEarly = 2000
 	repPenaltyPerYearLate = 2000
+	slots = 5
 
 	REQUIREMENTS
 	{
@@ -1204,6 +1233,7 @@ disabled_RP0_PROGRAM
 	baseFunding = 15000000
 	repDeltaOnCompletePerYearEarly = 2000
 	repPenaltyPerYearLate = 2000
+	slots = 4
 
 	REQUIREMENTS
 	{
@@ -1233,6 +1263,7 @@ disabled_RP0_PROGRAM
 	baseFunding = 60000000
 	repDeltaOnCompletePerYearEarly = 2500
 	repPenaltyPerYearLate = 2500
+	slots = 6
 
 	REQUIREMENTS
 	{

Source/Harmony/Administration.cs

@@ -19,8 +19,8 @@ internal class PatchAdministration
         internal static void FixProgramCounts(Administration __instance)
         {
             // We need to reset the strategy count because we only want to track programs, not leaders too.
-            __instance.activeStrategyCount = ProgramHandler.Instance.ActivePrograms.Count;
-            __instance.maxActiveStrategies = ProgramHandler.Instance.ActiveProgramLimit;
+            __instance.activeStrategyCount = ProgramHandler.Instance.ActiveProgramSlots;
+            __instance.maxActiveStrategies = ProgramHandler.Instance.MaxProgramSlots;
         }
 
         [HarmonyPrefix]
@@ -252,7 +252,7 @@ internal static bool Prefix_CreateActiveStratList(Administration __instance)
             _strategies.Clear();
 
             FixProgramCounts(__instance);
-            __instance.activeStratCount.text = Localizer.Format("#autoLOC_439627", ProgramHandler.Instance.ActivePrograms.Count, ProgramHandler.Instance.ActiveProgramLimit);
+            __instance.UpdateStrategyCount();
 
             return false;
         }
@@ -386,8 +386,10 @@ internal static void OnActivateProgramConfirm()
             {
                 var newActiveStrat = Administration.Instance.SelectedWrapper.strategy;
                 AdminExtender.Instance.SetTabView(AdministrationActiveTabView.Active);
-                Administration.StrategyWrapper selectedStrategy = Administration.Instance.AddActiveStratItem(Administration.Instance.SelectedWrapper.strategy);
-                Administration.Instance.SetSelectedStrategy(selectedStrategy);
+                Administration.Instance.scrollListActive.AddItem(Administration.Instance.CreateActiveStratItem(Administration.Instance.SelectedWrapper.strategy, out var wrapper));
+                Administration.Instance.SetSelectedStrategy(wrapper);
+                FixProgramCounts(Administration.Instance);
+                Administration.Instance.UpdateStrategyCount();
                 // Reset program speeds - safe because we early-out if a program is active or complete.
                 foreach (var strat in StrategySystem.Instance.Strategies)
                 {
@@ -531,7 +533,7 @@ internal static void Prefix_OnAcceptConfirm(Administration __instance)
         [HarmonyPatch("UpdateStrategyCount")]
         internal static bool Prefix_UpdateStrategyCount(Administration __instance)
         {
-            __instance.activeStratCount.text = Localizer.Format("#autoLOC_439627", ProgramHandler.Instance.ActivePrograms.Count, ProgramHandler.Instance.ActiveProgramLimit);
+            __instance.activeStratCount.text = Localizer.Format("#autoLOC_439627", ProgramHandler.Instance.ActiveProgramSlots, ProgramHandler.Instance.MaxProgramSlots);
             return false;
         }
     }

Source/Harmony/Strategy.cs

@@ -82,7 +82,7 @@ internal static void Prefix_CanBeActivated(Strategies.Strategy __instance)
         [HarmonyPatch("CanBeActivated")]
         internal static void Postfix_CanBeActivated()
         {
-            KSP.UI.Screens.Administration.Instance.activeStrategyCount = ProgramHandler.Instance.ActivePrograms.Count;
+            KSP.UI.Screens.Administration.Instance.activeStrategyCount = ProgramHandler.Instance.ActiveProgramSlots;
         }
 
         // For our Strategy class, replace the basic Activate with a virtual one.

Source/Programs/Program.cs

@@ -126,9 +126,12 @@ public static double RepPenaltyPerYearLateCalc(Speed spd, double pen)
         }
 
         [Persistent(isPersistant = false)]
-        public float repToConfidence = -1f;
+        private float repToConfidence = -1f;
         public float RepToConfidence => repToConfidence >= 0f ? repToConfidence : ProgramHandler.Settings.repToConfidence;
 
+        [Persistent(isPersistant = false)]
+        public int slots = 2;
+
         public List<string> programsToDisableOnAccept = new List<string>();
 
         public List<string> optionalContracts = new List<string>();
@@ -191,6 +194,7 @@ public Program(Program toCopy) : this()
             speed = toCopy.speed;
             confidenceCosts = toCopy.confidenceCosts;
             repToConfidence = toCopy.repToConfidence;
+            slots = toCopy.slots;
         }
 
         public override string ToString() => $"{name} ({(IsComplete ? "Complete" : IsActive ? "Active" : "Inactive")})";
@@ -464,6 +468,8 @@ public string GetDescription(bool extendedInfo)
                     text += $"\n\n{Localizer.Format("#rp0_Admin_Program_ConfidenceRequired", DisplayConfidenceCost.ToString("N0"))}";
                 }
 
+                text = $"Slots Taken: {slots}\n\n{text}";
+
                 var leadersUnlockedByThis = StrategySystem.Instance.SystemConfig.Strategies
                     .OfType<StrategyConfigRP0>()
                     .Where(s => s.DepartmentName != "Programs" &&