From 418189c34f826ac520bad94943c792a8ac0dc5f7 Mon Sep 17 00:00:00 2001
From: SierraHotel84 <141287350+SierraHotel84@users.noreply.github.com>
Date: Mon, 11 Sep 2023 15:23:45 -0700
Subject: [PATCH 01/12] Update Programs.cfg

-Lunar Habitation
-Crewed Mars Exploration
---
 GameData/RP-1/Programs/Programs.cfg | 53 +++++++++++++++++++----------
 1 file changed, 35 insertions(+), 18 deletions(-)

diff --git a/GameData/RP-1/Programs/Programs.cfg b/GameData/RP-1/Programs/Programs.cfg
index 08feff9e465..8c045551bc4 100644
--- a/GameData/RP-1/Programs/Programs.cfg
+++ b/GameData/RP-1/Programs/Programs.cfg
@@ -1339,11 +1339,11 @@ RP0_PROGRAM
 	}
 }
 
-disabled_RP0_PROGRAM
+RP0_PROGRAM
 {
 	name = LunarHabitation
-	title = Lunar Habitation (No Content Yet)
-	description = TODO: write up a program description
+	title = Lunar Habitation and Exploration
+	description = Repeat crewed expeditions to the moon have now occurred, but only for limited amounts of time.  Expand on your Crewed Lunar program and develop the capabilities for longer-term habitation away from Low Earth Orbit.  This program will incrementally increase the length of time and number of crew sent to the moon, with the ultimate goal of developing the technologies for future resource extraction.  New hardware and techniques that may be necessary to complete this program include a larger lunar lander capable of holding more crew, long-term habitation modules on the Lunar surface, and the ability to precision land crew next to previously delivered habitats.  
 	requirementsPrettyText = Complete contracts X and Y
 	objectivesPrettyText = Do this and that
 	nominalDurationYears = 10
@@ -1351,22 +1351,27 @@ disabled_RP0_PROGRAM
 	repDeltaOnCompletePerYearEarly = 1505
 	repPenaltyPerYearLate = 1505
 	repToConfidence = 3
-	slots = 5
+	slots = 4
 
 	REQUIREMENTS
 	{
-		ANY
-		{
-			complete_program = EarthSpaceStation
-			complete_program = CrewedLunar
-		}
+		complete_program = CrewedLunar
 	}
 
 	OBJECTIVES
 	{
-		complete_contract = TODO
+		complete_contract = LunarPresupply
+  		complete_contract = crewedLunar14
+  		complete_contract = crewedLunar30
+    		complete_contract = LunarExtraction
 	}
-	
+
+ 	OPTIONALS
+  	{
+   		complete_contract = crewedLunar60
+     		complete_contract = LunarLab
+     		complete_contract = LunarOrbitStation
+       		complete_contract = LunarBase
 	CONFIDENCECOSTS
 	{
 		Normal = 13350
@@ -1374,11 +1379,11 @@ disabled_RP0_PROGRAM
 	}
 }
 
-disabled_RP0_PROGRAM
+RP0_PROGRAM
 {
 	name = CrewedMarsExp
-	title = Crewed Mars Exploration (No Content Yet)
-	description = TODO: write up a program description
+	title = Crewed Mars Exploration
+	description = If stepping on the Moon was one giant leap, stepping on Mars is something far greater.  You've proven your ability to keep crews alive while exploring beyond the orbit of Earth, now it's time to put those skills to the test on a new planet.  Send crews to Mars using the knowledge gained from exploring the Moon, make new discoveries about the origins of our Solar System, investigate the potential for life beyond Earth, and determine just what it takes for space explorers to survive well beyond home. 
 	requirementsPrettyText = Complete contracts X and Y
 	objectivesPrettyText = Do this and that
 	nominalDurationYears = 14
@@ -1390,14 +1395,26 @@ disabled_RP0_PROGRAM
 
 	REQUIREMENTS
 	{
-		complete_program = EarthSpaceStation
+		complete_program = LunarHabitation
 	}
 
 	OBJECTIVES
 	{
-		complete_contract = TODO
-	}
-	
+		complete_contract = MarsPresupply
+  		complete_contract = orbitalShipyard
+    		complete_contract = CrewedMars30
+      		complete_contract = CrewedMars180
+		complete_contract = MarsExtraction
+	}
+
+ 	OPTIONALS
+  	{
+   		complete_contract = CrewedMars365
+     		complete_contract = crewedPhobos
+     		complete_contract = crewedDeimos
+       		complete_contract = MarsBase
+	 	complete_contract = MarsResupply
+   	}
 	CONFIDENCECOSTS
 	{
 		Normal = 28000

From 750067d6036d80115b2c314500556ab574c0b9f8 Mon Sep 17 00:00:00 2001
From: SierraHotel84 <141287350+SierraHotel84@users.noreply.github.com>
Date: Tue, 12 Sep 2023 15:30:26 -0700
Subject: [PATCH 02/12] Update Programs.cfg

---
 GameData/RP-1/Programs/Programs.cfg | 72 +++++++++++++++++++++--------
 1 file changed, 54 insertions(+), 18 deletions(-)

diff --git a/GameData/RP-1/Programs/Programs.cfg b/GameData/RP-1/Programs/Programs.cfg
index 8c045551bc4..824d365fdab 100644
--- a/GameData/RP-1/Programs/Programs.cfg
+++ b/GameData/RP-1/Programs/Programs.cfg
@@ -779,10 +779,10 @@ RP0_PROGRAM
 	}
 }
 
-disabled_RP0_PROGRAM
+RP0_PROGRAM
 {
 	name = EarthSpaceStation
-	title = Earth Space Station (WIP and Very Buggy)
+	title = Earth Space Station
 	description = An Earth space station will enable long-term human exploration of space and provide benefits to people of Earth. This Program tasks you with launching and maintaining Space Stations in Earth orbit and continuously crewing them with an increasingly longer stay durations. By completing the program, you will prove that long-term space habitation is possible which will open up crewed explorations of Venus, Mars, and beyond. NOTE: This program isn't functional enough to be completed and only has two unique contracts. Both of those contracts are also very buggy and may not complete even if the requirements should have been met.
 	requirementsPrettyText = Complete contracts X and Y
 	objectivesPrettyText = Do this and that
@@ -1348,6 +1348,7 @@ RP0_PROGRAM
 	objectivesPrettyText = Do this and that
 	nominalDurationYears = 10
 	baseFunding = 20000000
+ 	fundingCurve = MildMidFundingCurve
 	repDeltaOnCompletePerYearEarly = 1505
 	repPenaltyPerYearLate = 1505
 	repToConfidence = 3
@@ -1368,24 +1369,54 @@ RP0_PROGRAM
 
  	OPTIONALS
   	{
-   		complete_contract = crewedLunar60
-     		complete_contract = LunarLab
-     		complete_contract = LunarOrbitStation
-       		complete_contract = LunarBase
+   		crewedLunar60 = true
+     		LunarLab = true
+     		LunarOrbitStation = true
+       		LunarBase = true
+	 }
 	CONFIDENCECOSTS
 	{
 		Normal = 13350
 		Fast = 26700
 	}
 }
+RPO_PROGRAM
+{
+	name = NuclearProp	
+ 	title = Nuclear Propulsion Development
+  	description = The atomic age ushered in an era of wild ideas, far-fetched dreams, and unthinkable horrors.  Put atomic energy to a peaceful purpose and put to use decades of research into harnessing its power for drastically efficient space propulsion.  The dangers are numerous, shielding flight crews and support personnel from deadly radiation chief among them, but the payoff could be significantly reduced travel times with significantly more payload than chemical rockets can provide for the same flightpath.  This program will develop the skills and techniques for alternative propulsion systems that can be used on future missions.  
+	requirementsPrettyText = Complete Advanced Crewed Orbit program.
+ 	objectivesPrettyText = Develop nuclear propulsion systems and test them within the Earth/Moon system.
+  	nominalDurationYears = 5
+   	baseFunding = 5000000
+    	fundingCurve = MildMidFundingCurve
+	repDeltaOnCompletePerYearEarly = 2585
+	repPenaltyPerYearLate = 2585
+	repToConfidence = 3
+	slots = 3
+
+ 	REQUIREMENTS
+  	{
+   		complete_program = CrewedOrbitAdv
+     
+     	}
+
+      	OBJECTIVES
+       	{
+		complete_contract = uncrewedNuclear
+  		complete_contract = crewedNuclear
+      		complete_contract = NuclearTug
+    		complete_contract = NuclearDisposal
+      	}
+
 
 RP0_PROGRAM
 {
 	name = CrewedMarsExp
 	title = Crewed Mars Exploration
-	description = If stepping on the Moon was one giant leap, stepping on Mars is something far greater.  You've proven your ability to keep crews alive while exploring beyond the orbit of Earth, now it's time to put those skills to the test on a new planet.  Send crews to Mars using the knowledge gained from exploring the Moon, make new discoveries about the origins of our Solar System, investigate the potential for life beyond Earth, and determine just what it takes for space explorers to survive well beyond home. 
-	requirementsPrettyText = Complete contracts X and Y
-	objectivesPrettyText = Do this and that
+	description = If stepping on the Moon was one giant leap, stepping on Mars is something far greater.  You've proven your ability to keep crews alive while exploring beyond the orbit of Earth, now it's time to put those skills to the test on a new planet.  Send crews to Mars using the knowledge gained from exploring the Moon, make new discoveries about the origins of our Solar System, investigate the potential for life beyond Earth, and potentially colonize another planet. 
+	requirementsPrettyText = Complete Lunar Habitation Program.
+	objectivesPrettyText = Send a crewed mission to land on Mars.
 	nominalDurationYears = 14
 	baseFunding = 42000000
 	repDeltaOnCompletePerYearEarly = 2585
@@ -1401,19 +1432,24 @@ RP0_PROGRAM
 	OBJECTIVES
 	{
 		complete_contract = MarsPresupply
-  		complete_contract = orbitalShipyard
-    		complete_contract = CrewedMars30
-      		complete_contract = CrewedMars180
-		complete_contract = MarsExtraction
+        	complete_contract = MarsResources
+    		ANY
+      		{
+    			complete_contract = CrewedMars30
+	 		complete_contract = CrewedMars500
+    		}
 	}
 
  	OPTIONALS
   	{
-   		complete_contract = CrewedMars365
-     		complete_contract = crewedPhobos
-     		complete_contract = crewedDeimos
-       		complete_contract = MarsBase
-	 	complete_contract = MarsResupply
+   		ATLEAST
+     		{
+       			count = 2
+     			crewedPhobos = true
+     			crewedDeimos = true
+       			MarsBase = true
+	 		MarsResupply = true
+    		}
    	}
 	CONFIDENCECOSTS
 	{

From 762f4e3e0c47cf16a3d471fb3998855538d08edc Mon Sep 17 00:00:00 2001
From: SierraHotel84 <141287350+SierraHotel84@users.noreply.github.com>
Date: Tue, 12 Sep 2023 19:53:45 -0500
Subject: [PATCH 03/12] Update Programs.cfg

---
 GameData/RP-1/Programs/Programs.cfg | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/GameData/RP-1/Programs/Programs.cfg b/GameData/RP-1/Programs/Programs.cfg
index 824d365fdab..46506e56f1a 100644
--- a/GameData/RP-1/Programs/Programs.cfg
+++ b/GameData/RP-1/Programs/Programs.cfg
@@ -1369,10 +1369,14 @@ RP0_PROGRAM
 
  	OPTIONALS
   	{
-   		crewedLunar60 = true
-     		LunarLab = true
-     		LunarOrbitStation = true
-       		LunarBase = true
+   		ATLEAST
+     		{
+       			count = 2
+   			crewedLunar60 = true
+     			LunarLab = true
+     			LunarOrbitStation = true
+       			LunarBase = true
+	  	}
 	 }
 	CONFIDENCECOSTS
 	{

From 1d1e37013957fe6711409784ff960bd6c7810985 Mon Sep 17 00:00:00 2001
From: SierraHotel84 <141287350+SierraHotel84@users.noreply.github.com>
Date: Tue, 12 Sep 2023 19:57:49 -0500
Subject: [PATCH 04/12] Update Programs.cfg

---
 GameData/RP-1/Programs/Programs.cfg | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

diff --git a/GameData/RP-1/Programs/Programs.cfg b/GameData/RP-1/Programs/Programs.cfg
index 46506e56f1a..e11692eccec 100644
--- a/GameData/RP-1/Programs/Programs.cfg
+++ b/GameData/RP-1/Programs/Programs.cfg
@@ -1384,6 +1384,7 @@ RP0_PROGRAM
 		Fast = 26700
 	}
 }
+
 RPO_PROGRAM
 {
 	name = NuclearProp	
@@ -1402,17 +1403,21 @@ RPO_PROGRAM
  	REQUIREMENTS
   	{
    		complete_program = CrewedOrbitAdv
-     
-     	}
+       	}
 
       	OBJECTIVES
        	{
-		complete_contract = uncrewedNuclear
-  		complete_contract = crewedNuclear
-      		complete_contract = NuclearTug
-    		complete_contract = NuclearDisposal
+		uncrewedNuclear = true
+  		crewedNuclear = true
+      		NuclearTug = true
+    		NuclearDisposal = true
       	}
-
+	CONFIDENCECOSTS
+	{
+		Normal = 28000
+		Fast = 56000
+	}
+}
 
 RP0_PROGRAM
 {

From 6c48384d890bdcf6ffb66764ce4e39197bca75a0 Mon Sep 17 00:00:00 2001
From: SierraHotel84 <141287350+SierraHotel84@users.noreply.github.com>
Date: Tue, 12 Sep 2023 20:04:21 -0500
Subject: [PATCH 05/12] Update Programs.cfg

---
 GameData/RP-1/Programs/Programs.cfg | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/GameData/RP-1/Programs/Programs.cfg b/GameData/RP-1/Programs/Programs.cfg
index e11692eccec..e5c2ff7e4a0 100644
--- a/GameData/RP-1/Programs/Programs.cfg
+++ b/GameData/RP-1/Programs/Programs.cfg
@@ -779,7 +779,7 @@ RP0_PROGRAM
 	}
 }
 
-RP0_PROGRAM
+disabled_RP0_PROGRAM
 {
 	name = EarthSpaceStation
 	title = Earth Space Station

From 5a46d0db250773b62764592846cd727e9fe514b7 Mon Sep 17 00:00:00 2001
From: SierraHotel84 <141287350+SierraHotel84@users.noreply.github.com>
Date: Tue, 12 Sep 2023 20:06:17 -0500
Subject: [PATCH 06/12] Add files via upload

---
 .../InitialLunarHabitation.cfg                | 386 ++++++++++++++++++
 1 file changed, 386 insertions(+)
 create mode 100644 GameData/RP-1/Contracts/Lunar Habitation/InitialLunarHabitation.cfg

diff --git a/GameData/RP-1/Contracts/Lunar Habitation/InitialLunarHabitation.cfg b/GameData/RP-1/Contracts/Lunar Habitation/InitialLunarHabitation.cfg
new file mode 100644
index 00000000000..8519ef2565d
--- /dev/null
+++ b/GameData/RP-1/Contracts/Lunar Habitation/InitialLunarHabitation.cfg	
@@ -0,0 +1,386 @@
+CONTRACT_TYPE
+{
+	name = crewedLunar14
+	title = Crewed 14-Day Lunar Mission
+	group = Development
+
+	description = <b>Program: Crewed Lunar Habitation</b><br><br>Previous crewed lunar mission requirements were short in duration, no more than a few days.  Much longer stays will be required in order to one day place a permanent installation on the Moon.  This mission will conduct the first long-duration planetary habitat experiment to validate the technology for further afar crewed exploration in the future.<br><br>This mission can be completed in numerous ways.  Whether Apollo-style with a Lunar Orbit Rendezvous, as a Lunar Direct mission with no orbiter, or by sending a separate presupply mission ahead of your crew, the choice is yours.  However, follow-on missions will require longer stays and larger crews, so plan accordingly.  A separate pre-supply mission is available should you choose to use that mission profile.
+
+	synopsis = Land a crew on the Moon, stay for 14 days, then return them safely to Earth
+
+	completedMessage = Congratulations! You have completed the first step to a lasting crewed presence on the Moon. 
+
+	cancellable = true
+	declinable = false
+	autoAccept = false
+	minExpiry = 0
+	maxExpiry = 0
+	maxCompletions = 1
+	maxSimultaneous = 1
+	deadline = 0
+
+	targetBody = Moon
+
+
+	// ************ REWARDS ************
+	prestige = Trivial       // 1.0x
+	advanceFunds = 0
+	rewardScience = 0
+	rewardFunds = 0
+	failureFunds = 0
+	rewardReputation = 1500	// was 400
+	failureReputation = 0 // was @rewardReputation	// was 400
+
+
+
+	// ************ REQUIREMENTS ************
+
+	REQUIREMENT
+	{
+		name = ProgramActive
+		type = ProgramActive
+		program = LunarHabitation
+	}
+
+	PARAMETER
+	{
+		name = VesselGroup
+		type = VesselParameterGroup
+		title = Extended Duration Moon Landing
+		define = ExtendedMoonLanding
+	
+		PARAMETER
+		{
+			name = NewVessel
+			type = NewVessel
+			title = Launch a new vessel
+			hideChildren = true
+		}
+		PARAMETER
+		{
+			name = TwoCrew
+			type = HasCrew
+			minCrew = 3
+			maxCrew = 99
+			title = Have at least 3 crew on board
+			hideChildren = true
+		}
+
+		PARAMETER
+		{
+			name = LandCrewed
+			type = All
+			title = Land the crewed lander
+			disableOnStateChange = true
+			
+			PARAMETER
+			{
+				name = TwoCrew
+				type = HasCrew
+				minCrew = 2
+				maxCrew = 99
+				title = Land with at least 2 crew
+				hideChildren = true
+			}
+
+			PARAMETER
+			{
+				name = OrbitWrapper
+				title = Stay on the Moon for the specified duration
+				type = All
+				disableOnStateChange = true
+				completeInSequence = true
+
+				PARAMETER
+				{
+					name = LandOnMoon
+					type = ReachState
+					targetBody = Moon
+					situation = LANDED
+				}
+
+				PARAMETER
+				{
+					name = Duration
+					type = Duration
+					duration = 14d
+					preWaitText = Land on the moon
+					WaitingText = Exploring...
+					completionText = Exploration complete, you may return to Earth when ready.
+				}
+			}
+		}
+		PARAMETER
+		{
+			name = ReturnHome
+			type = RP1ReturnHome
+			title = Return home safely
+			hideChildren = true
+			completeInSequence = true
+		}
+	}
+}
+
+CONTRACT_TYPE
+{
+	name = crewedLunar30
+	title = Crewed 30-Day Lunar Mission
+	group = Development
+
+	description = <b>Program: Crewed Lunar Habitation</b><br><br>With a 14-day crewed Lunar mission now complete, it's time to extend the time a crew spends on the moon.  Send at least 2 crew to the Moon for 30 days.  Previously landed infrastructure can be used, and a resupply mission can be sent if your mission profile requires it. 
+
+	synopsis = Land a crew on the Moon, stay for 30 days, then return them safely to Earth
+
+	completedMessage = Congratulations! You have completed the first step to a lasting crewed presence on the Moon. 
+
+	cancellable = true
+	declinable = false
+	autoAccept = false
+	minExpiry = 0
+	maxExpiry = 0
+	maxCompletions = 1
+	maxSimultaneous = 1
+	deadline = 0
+
+	targetBody = Moon
+
+
+	// ************ REWARDS ************
+	prestige = Trivial       // 1.0x
+	advanceFunds = 0
+	rewardScience = 0
+	rewardFunds = 0
+	failureFunds = 0
+	rewardReputation = 1500	// was 400
+	failureReputation = 0 // was @rewardReputation	// was 400
+
+
+
+	// ************ REQUIREMENTS ************
+
+	REQUIREMENT
+	{
+		name = ProgramActive
+		type = ProgramActive
+		program = LunarHabitation
+	}
+
+	PARAMETER
+	{
+		name = VesselGroup
+		type = VesselParameterGroup
+		title = Extended Duration Moon Landing
+		define = ExtendedMoonLanding
+	
+		PARAMETER
+		{
+			name = NewVessel
+			type = NewVessel
+			title = Launch a new vessel
+			hideChildren = true
+		}
+		PARAMETER
+		{
+			name = TwoCrew
+			type = HasCrew
+			minCrew = 2
+			maxCrew = 99
+			title = Have at least 2 crew on board
+			hideChildren = true
+		}
+
+		PARAMETER
+		{
+			name = LandCrewed
+			type = All
+			title = Land the crewed lander
+			disableOnStateChange = true
+			
+			PARAMETER
+			{
+				name = TwoCrew
+				type = HasCrew
+				minCrew = 2
+				maxCrew = 99
+				title = Land with at least 2 crew
+				hideChildren = true
+			}
+
+			PARAMETER
+			{
+				name = OrbitWrapper
+				title = Stay on the Moon for the specified duration
+				type = All
+				disableOnStateChange = true
+				completeInSequence = true
+
+				PARAMETER
+				{
+					name = LandOnMoon
+					type = ReachState
+					targetBody = Moon
+					situation = LANDED
+				}
+
+				PARAMETER
+				{
+					name = Duration
+					type = Duration
+					duration = 30d
+					preWaitText = Land on the moon
+					WaitingText = Exploring...
+					completionText = Exploration complete, you may return to Earth when ready.
+				}
+			}
+		}
+
+		PARAMETER
+		{
+			name = ReturnHome
+			type = RP1ReturnHome
+			title = Return home safely
+			hideChildren = true
+			completeInSequence = true
+		}
+	}
+}
+
+CONTRACT_TYPE
+{
+	name = LunarPresupply
+	title = Presupply Mission for Crewed Lunar Habitation
+	group = Development
+
+	description = <b>Program: Crewed Lunar Habitation</b><br><br>Crewed Lunar Habitation mission design may dictate sending supplies and habitation modules separate from the crew.  These missions will sustain a longer-duration Lunar presence as procedures and technology are developed for crewed missions beyond the Moon.  <br><br><b>Number of Contracts Completed: @index / @maxCompletions</b>
+	
+	genericDescription = Launch an uncrewed supply vessel to the Moon to provide resources for a crewed mission.
+
+	synopsis = Land a supply craft on the Moon.
+
+	completedMessage = Congratulations, our crewed mission will now have supplies for their extended exploration mission.
+
+	cancellable = true
+	declinable = true
+	autoAccept = false
+	minExpiry = 0
+	maxExpiry = 0
+	maxCompletions = 3
+	maxSimultaneous = 1
+	deadline = 0
+
+	targetBody = Moon
+
+	// ************ REWARDS ************ 
+	prestige = Trivial       // 1.0x
+	advanceFunds = 0
+	rewardScience = 0
+	rewardFunds = 0
+	failureFunds = 0
+	rewardReputation = 250
+	failureReputation = 0 
+
+
+
+	// ************ REQUIREMENTS ************
+
+	REQUIREMENT
+	{
+		name = ProgramActive
+		type = ProgramActive
+		program = LunarHabitation
+	}
+
+	REQUIREMENT
+	{
+		ALL
+		{
+			name = CompleteContract
+			type = CompleteContract
+			contractType = crewedLunar14
+			invertRequirement = true
+			hidden = true
+		}
+		{
+			name = CompleteContract
+			type = CompleteContract
+			contractType = crewedLunar30
+			invertRequirement = true
+			hidden = true
+		}
+
+	REQUIREMENT
+	{
+		ANY		
+		{
+			name = AcceptContract
+			type = AcceptContract
+			contractType = crewedLunar14
+		}
+		{
+			name = AcceptContract
+			type = AcceptContract
+			contractType = crewedLunar30
+		}
+		{
+			name = AcceptContract
+			type = AcceptContract
+			contractType = crewedLunar60
+		}
+
+	DATA
+	{
+		type = int
+		index = $RepeatMoonSupply_Count + 0
+	}
+
+	BEHAVIOUR
+	{
+		name = IncrementTheCount
+		type = Expression
+		
+		CONTRACT_COMPLETED_SUCCESS
+		{
+			RepeatMoonSupply_Count = $RepeatMoonSupply_Count + 1
+		}
+	}
+
+	// ************ PARAMETERS ************
+	
+	PARAMETER
+	{
+		name = vesselGroup
+		type = VesselParameterGroup
+		title = Uncrewed Presupply Mission 
+		define = LunarPressupply
+		defineList = LunarSupply
+		disableOnStateChange = true
+
+		PARAMETER
+		{
+			name = NoCrew
+			type = HasCrew
+			minCrew = 0
+			maxCrew = 0
+			title = Uncrewed
+			hideChildren = true
+		}
+
+		PARAMETER
+		{
+			name = LandUncrewed
+			type = All
+			title = Land the uncrewed lander
+			disableOnStateChange = true
+
+			PARAMETER
+			{
+
+				name = ReachState
+				type = ReachState
+				targetBody = Moon
+				situation = LANDED
+
+			}
+		}
+	}
+}

From 328bebe401fa07ff3f905b6d60767bd26cd6e1e0 Mon Sep 17 00:00:00 2001
From: SierraHotel84 <141287350+SierraHotel84@users.noreply.github.com>
Date: Thu, 31 Oct 2024 11:43:46 -0500
Subject: [PATCH 07/12] Lunar Habitation program added

---
 GameData/RP-1/Programs/Programs.cfg | 589 ++++++++++++++++++++--------
 1 file changed, 426 insertions(+), 163 deletions(-)

diff --git a/GameData/RP-1/Programs/Programs.cfg b/GameData/RP-1/Programs/Programs.cfg
index 9d5816ae21d..2e82c9fa6ab 100644
--- a/GameData/RP-1/Programs/Programs.cfg
+++ b/GameData/RP-1/Programs/Programs.cfg
@@ -1,18 +1,24 @@
 RP0_PROGRAM
 {
 	name = EarlyXPlanes
+	isHSF = true
 	title = X-Plane Research
 	description = This program tasks the space agency with the development of experimental aircraft to test aerodynamic behavior at velocities and altitudes previously unreachable by crewed craft.
 	objectivesPrettyText = Complete X-Planes (Mach 2 Supersonic) and X-Planes (Karman Line) contracts.
 	nominalDurationYears = 9
 	baseFunding = 800000
-	fundingCurve = BimodalBackloadedFundingCurve
+	fundingCurve = BimodalBackloaded
 	repDeltaOnCompletePerYearEarly = 130
 	repPenaltyPerYearLate = 130
 	slots = 2
 
 	OBJECTIVES
 	{
+		FACILITY_LEVEL
+		{
+			facility = AstronautComplex
+			level = 2
+		}
 		COMPLETE_CONTRACT
 		{
 			name = BreakSoundBarrier
@@ -42,8 +48,8 @@ RP0_PROGRAM
 	OPTIONALS
 	{
 		XPlanesSupersonicOptionalLow = true
-  		XPlanesSupersonicOptionalHigh = true
-  		XPlanesStratosphericResearchOptional = true
+		XPlanesSupersonicOptionalHigh = true
+		XPlanesStratosphericResearchOptional = true
 		RocketPlaneDevelopmentOptional = true
 		XPlanesHighAltitudeOptional = true
 		XPlanesSuborbital = true
@@ -62,9 +68,10 @@ RP0_PROGRAM
 	name = SuborbRocketDev
 	title = Early Rocket Development
 	description = The first step in developing orbit capable rockets. This programs requires progressively developing suborbital rockets with increasing capabilities.
-	objectivesPrettyText = Complete Karman Line, Reach a Suborbital Trajectory & Return (uncrewed), and Downrange Milestone (4500 km) contracts.
+	objectivesPrettyText = Complete Karman Line, Reach a Suborbital Trajectory & Return (uncrewed), and Downrange Milestone (5000 km) contracts.
 	nominalDurationYears = 6
 	baseFunding = 210000
+	fundingCurve = SlowRampup
 	repDeltaOnCompletePerYearEarly = 45
 	repPenaltyPerYearLate = 45
 	slots = 2
@@ -98,6 +105,7 @@ RP0_PROGRAM
 	objectivesPrettyText = Complete Karman Line, Film Return, Bio Return, and Advanced Bio Return contracts.
 	nominalDurationYears = 6
 	baseFunding = 210000
+	fundingCurve = SlowRampup
 	repDeltaOnCompletePerYearEarly = 45
 	repPenaltyPerYearLate = 45
 	slots = 2
@@ -150,7 +158,7 @@ RP0_PROGRAM
 	objectivesPrettyText = Launch the first satellite, a science sat, an atmospheric analysis sat, the first sat in a polar orbit, and the first solar powered sat.
 	nominalDurationYears = 4
 	baseFunding = 532000
-	fundingCurve = MildBackloadedFundingCurve
+	fundingCurve = MildBackloaded
 	repDeltaOnCompletePerYearEarly = 140
 	repPenaltyPerYearLate = 140
 	slots = 2
@@ -246,7 +254,8 @@ RP0_PROGRAM
 RP0_PROGRAM
 {
 	name = TargetedSats
-	title = Targeted Satellites
+	isDisabled = True
+	title = Targeted Satellites (Deprecated)
 	description = Once you have proven that you can send satellites into orbit, the next step is to send them into more useful orbits. The goal of this program is to put satellites with different payload requirements into specific and more challenging orbits. A geostationary orbit will require approximately 13,650 m/s of delta-v if launching from Cape Canaveral.
 	requirementsPrettyText = Complete Targeted Satellites
 	objectivesPrettyText = Launch satellites to analyze weather and assist in navigation and reach a variety of specific orbits, including geostationary.
@@ -287,11 +296,112 @@ RP0_PROGRAM
 		Fast = 600
 	}
 }
+RP0_PROGRAM
+{
+	name = EarthObservationScience1
+	title = Early Earth Observation Satellites
+	description = Now that you have proven the ability to send satellites into orbit, the next step is to send them into more useful orbits with more beneficial payloads. This program will focus on satellites for observing the Earth and the space environment around it. This will advance scientific knowledge of not just physical processes within our atmosphere, but also those in space, all of which influence our lives here on Earth. 
+	requirementsPrettyText = Complete Early Satellites program
+	objectivesPrettyText = Launch satellites to photograph the Earth, analyze weather, measure solar wind and cosmic rays, and determine the extent of the magnetosphere.
+	nominalDurationYears = 4
+	baseFunding = 560000
+	fundingCurve = MildRampup
+	repDeltaOnCompletePerYearEarly = 145
+	repPenaltyPerYearLate = 145
+	slots = 1
+
+	REQUIREMENTS
+	{
+		ANY
+		{
+			complete_program = EarlySatellites
+			complete_program = EarlySatellites-Heavy
+		}
+	}
+
+	OBJECTIVES
+	{
+		complete_contract = EOSCosmicRay1
+		complete_contract = EOSCherenkov
+		complete_contract = EOSMagScan1
+		complete_contract = EOSIRRad1
+		complete_contract = first_OrbitRecover
+		complete_contract = EOSCorona
+	}
+	
+	OPTIONALS
+	{
+		EOSGrav1 = true
+		EOSCoronaRep = true
+		EOSIRRad2 = true
+		EOSIRRad3 = true
+	}
+
+	CONFIDENCECOSTS
+	{
+		Normal = 350
+		Fast = 900
+	}
+}
+
+RP0_PROGRAM
+{
+	name = CommercialApplications1
+	title = Early Commercial Applications
+	description = Although the earliest satellites were launched through government programs, commercial uses had been envisioned for a long time. Through this program, you will launch the earliest iterations of commercial-use satellites. With wildly varying needs, each satellite is dedicated to a specific requirement, typically with far more focused requirements than the earlier, broader scientific satellites. 
+	requirementsPrettyText = Complete Early Satellites program
+	objectivesPrettyText = Launch the first commercial-use satellites and build a satellite communication network. 
+	nominalDurationYears = 4
+	baseFunding = 560000
+	fundingCurve = MildRampup
+	repDeltaOnCompletePerYearEarly = 145
+	repPenaltyPerYearLate = 145
+	slots = 1
+
+	REQUIREMENTS
+	{
+		ANY
+		{
+			complete_program = EarlySatellites
+			complete_program = EarlySatellites-Heavy
+		}
+	}
+	OBJECTIVES
+	{
+		complete_contract = FirstNavSat-CA
+		complete_contract = FirstComSat-CA
+		complete_contract = FirstMolniyaSat-CA
+		ANY
+		{
+			complete_contract = EarlyNavNetwork3
+			complete_contract = EarlyNavNetwork4
+		}
+		ANY
+		{
+			complete_contract = EarlyComNetwork3-CA
+			complete_contract = EarlyComNetwork4-CA
+		}
+	}
+	
+	OPTIONALS
+	{
+		EarlyComSat-CA = true
+		EarlyNavSat-CA = true
+		EarlyMolniyaSat = true
+	}
+
+	CONFIDENCECOSTS
+	{
+		Normal = 350
+		Fast = 900
+	}
+}
 
 RP0_PROGRAM
 {
 	name = CommNetwork
-	title = Communication Network
+	isDisabled = True
+	title = Communication Network (Deprecated)
 	description = Communicating with our satellites, and eventually our crewed craft, can be difficult at times. Unless we have line of sight to a tracking station, communication isn't possible. This program tasks you with creating a communications network of 3 or 4 satellites that will provide much better communications coverage. Each satellite will require 125 units of ComSatPayload, and the orbits are fairly high.
 	requirementsPrettyText = Complete Communication Network
 	objectivesPrettyText = Create a network of either 3 or 4 communications satellites.
@@ -336,25 +446,34 @@ RP0_PROGRAM
 RP0_PROGRAM
 {
 	name = GEOCommNetwork
+	isDisabled = true
 	title = Geostationary Communication Network 
 	description = With geostationary orbits, satellites can be placed at specific spots over the equator where they will stay. This allows communications satellites to be put exactly where they will have the greatest benefit. This program tasks you with creating a 4-satellite Geostationary Network for communication. Each satellite will require 315 units of ComSatPayload.
 	requirementsPrettyText = Complete the Targeted Satellites Program
 	objectivesPrettyText = Complete the Geostationary Communications Network.
 	nominalDurationYears = 2
 	baseFunding = 700000
-	fundingCurve = MildBackloadedFundingCurve
+	fundingCurve = MildBackloaded
 	repDeltaOnCompletePerYearEarly = 420
 	repPenaltyPerYearLate = 420
 	slots = 2
 
 	REQUIREMENTS
 	{
-		complete_program = TargetedSats
+		ANY
+		{
+			complete_program = TargetedSats
+			complete_program = CommercialApplications1
+		}
 	}
 
 	OBJECTIVES
 	{
-		complete_contract = GeoComSatNetwork
+		ANY
+		{
+			complete_contract = GeoComSatNetwork3
+			complete_contract = GeoComSatNetwork4
+		}
 	}
 	
 	OPTIONALS
@@ -368,6 +487,58 @@ RP0_PROGRAM
 		Fast = 900
 	}
 }
+RP0_PROGRAM
+{
+	name = CommercialApplications2
+	title = Advanced Commercial Applications
+	description = Geosynchronous, Geostationary, Molniya, and Tundra orbits have the potential to improve satellite coverage and simplify ground antenna tracking. This program tasks you with testing these orbits, launching satellites into them for commercial customers, and creating a 3 or 4 satellite Geostationary or Molniya Network for communication.
+	requirementsPrettyText = Complete the Early Commercial Applications Program
+	objectivesPrettyText = Complete a Geostationary or Molniya Communications Network.
+	nominalDurationYears = 3
+	baseFunding = 800000
+	fundingCurve = MildBackloaded
+	repDeltaOnCompletePerYearEarly = 270
+	repPenaltyPerYearLate = 270
+	slots = 2
+
+	REQUIREMENTS
+	{
+		ANY
+		{
+			complete_program = TargetedSats
+			complete_program = CommercialApplications1
+		}
+	}
+
+	OBJECTIVES
+	{
+		complete_contract = FirstGEOSat
+		complete_contract = FirstTargetedGeo
+		complete_contract = FirstTargetedTundra
+		ANY
+		{
+			complete_contract = GeoComSatNetwork3
+			complete_contract = GeoComSatNetwork4
+			complete_contract = MolniyaNetwork3
+		}
+	}
+
+	OPTIONALS
+	{
+		FirstTargetedMolniya = true
+		FirstGeosync = true
+		FirstTundraSat = true
+		GEORepeatComSats = true
+		MolniyaRepeatComSats = true
+		TundraRepeatComSats = true
+	}
+
+	CONFIDENCECOSTS
+	{
+		Normal = 550
+		Fast = 1100
+	}
+}
 
 RP0_PROGRAM
 {
@@ -429,10 +600,10 @@ RP0_PROGRAM
 	requirementsPrettyText = Complete the Early Lunar Probes program
 	objectivesPrettyText = Land probes on the Moon.
 	nominalDurationYears = 5
-	baseFunding = 1500000
-	fundingCurve = MildBackloadedFundingCurve
-	repDeltaOnCompletePerYearEarly = 345
-	repPenaltyPerYearLate = 345
+	baseFunding = 1375000
+	fundingCurve = MildBackloaded
+	repDeltaOnCompletePerYearEarly = 315
+	repPenaltyPerYearLate = 315
 	repToConfidence = 3
 	slots = 2
 
@@ -459,8 +630,8 @@ RP0_PROGRAM
 	
 	CONFIDENCECOSTS
 	{
-		Normal = 1000
-		Fast = 2000
+		Normal = 900
+		Fast = 1800
 	}
 }
 
@@ -468,13 +639,14 @@ RP0_PROGRAM
 {
 	name = CrewedOrbit
 	isDisabled = true
+	isHSF = true
 	title = Crewed Orbit (Deprecated)
 	description = Sending machines to space as a proxy for human beings was never the final goal. This program requires you to safely put astronauts into orbit and return them, test a variety of crewed maneuvers, and prove that humanity can survive in the most hostile environment nature has given us the opportunity of exploring. You will need to research Early Docking Procedures and Second Generation Capsules to complete this program.
 	requirementsPrettyText = Complete one of the Early Satellites Programs
 	objectivesPrettyText = Complete the program by successfully docking 2 craft.
 	nominalDurationYears = 8
 	baseFunding = 5200000
-	fundingCurve = BackloadedFundingCurve
+	fundingCurve = Backloaded
 	repDeltaOnCompletePerYearEarly = 895
 	repPenaltyPerYearLate = 895
 	repToConfidence = 3
@@ -494,7 +666,7 @@ RP0_PROGRAM
 		FACILITY_LEVEL
 		{
 			facility = AstronautComplex
-			level = 2
+			level = 4
 		}
 		complete_contract = first_OrbitRecover
 		complete_contract = OrbitalTestFlight
@@ -525,15 +697,16 @@ RP0_PROGRAM
 RP0_PROGRAM
 {
 	name = CrewedOrbitEarly
+	isHSF = true
 	title = Crewed Orbit
-	description = Sending machines to space as a proxy for human beings was never the final goal. This program requires you to safely put astronauts into orbit and return them to the Earth, proving that humanity can survive in the most hostile environment nature has given us the opportunity to explore.
+	description = Sending machines to space as a proxy for human beings was never the final goal. This program requires you to safely put astronauts into orbit and return them to the Earth, proving that humanity can survive in the most hostile environment nature has given us the opportunity to explore. You will need to upgrade your Astronaut Complex to level three so you can train your astronauts for the rigors of spaceflight. Make sure you start to train your crew about a year before you launch.
 	requirementsPrettyText = Complete one of the Early Satellites Programs
 	objectivesPrettyText = Complete the program by putting an astronaut into orbit and returning them.
 	nominalDurationYears = 4
-	baseFunding = 1300000
-	fundingCurve = MildBackloadedFundingCurve
-	repDeltaOnCompletePerYearEarly = 340
-	repPenaltyPerYearLate = 340
+	baseFunding = 1200000
+	fundingCurve = MildBackloaded
+	repDeltaOnCompletePerYearEarly = 315
+	repPenaltyPerYearLate = 315
 	repToConfidence = 3
 	slots = 3
 	
@@ -548,6 +721,11 @@ RP0_PROGRAM
 
 	OBJECTIVES
 	{
+		FACILITY_LEVEL
+		{
+			facility = AstronautComplex
+			level = 3
+		}
 		complete_contract = first_OrbitRecover
 		complete_contract = OrbitalTestFlight
 		complete_contract = first_OrbitCrewed
@@ -556,8 +734,8 @@ RP0_PROGRAM
 	
 	CONFIDENCECOSTS
 	{
-		Normal = 850
-		Fast = 1700
+		Normal = 800
+		Fast = 1600
 	}
 
 	OPTIONALS
@@ -575,15 +753,16 @@ RP0_PROGRAM
 RP0_PROGRAM
 {
 	name = CrewedOrbitAdv
+	isHSF = true
 	title = Advanced Crewed Orbit
 	description = Human spaceflight should involve more than mere spam in a can. Both the hardware and skills required for maneuvering, EVA, rendezvous, and docking must be tested if humans are to do more than exist in space as passengers. You will need to research Early Docking Procedures and Second Generation Capsules to complete this program.
 	requirementsPrettyText = Complete Crewed Orbit Program
 	objectivesPrettyText = Complete the program by successfully docking 2 craft.
 	nominalDurationYears = 4
-	baseFunding = 2500000
-	fundingCurve = MildBackloadedFundingCurve
-	repDeltaOnCompletePerYearEarly = 655
-	repPenaltyPerYearLate = 655
+	baseFunding = 2200000
+	fundingCurve = MildBackloaded
+	repDeltaOnCompletePerYearEarly = 575
+	repPenaltyPerYearLate = 575
 	repToConfidence = 3
 	slots = 3
 	
@@ -594,10 +773,10 @@ RP0_PROGRAM
 
 	OBJECTIVES
 	{
- 		FACILITY_LEVEL
+		FACILITY_LEVEL
 		{
 			facility = AstronautComplex
-			level = 2
+			level = 4
 		}
 		complete_contract = first_EVA
 		complete_contract = Rendezvous
@@ -606,8 +785,8 @@ RP0_PROGRAM
 	
 	CONFIDENCECOSTS
 	{
-		Normal = 1650
-		Fast = 3300
+		Normal = 1450
+		Fast = 2900
 	}
 
 	OPTIONALS
@@ -620,6 +799,7 @@ RP0_PROGRAM
 RP0_PROGRAM
 {
 	name = CrewedSpaceplaneDev
+	isHSF = true
 	isDisabled = true
 	title = Crewed Spaceplane Development
 	description = Spaceplanes potentially offer considerable advantages over capsules as a way to send people to orbit; in particular the controlled reentry and runway landing makes recovery much simpler and cheaper. Proponents also cite the possibility of using aerodynamic lift to perform plane changes with less propellant. NOTE: This has contracts, but they have not been tested or balanced.
@@ -627,7 +807,7 @@ RP0_PROGRAM
 	objectivesPrettyText = Complete the program by successfully docking a spaceplane to another vessel in orbit.
 	nominalDurationYears = 10
 	baseFunding = 4000000
-	fundingCurve = BackloadedFundingCurve
+	fundingCurve = Backloaded
 	repDeltaOnCompletePerYearEarly = 605
 	repPenaltyPerYearLate = 605
 	repToConfidence = 3
@@ -671,10 +851,10 @@ RP0_PROGRAM
 	requirementsPrettyText = Complete contracts X and Y
 	objectivesPrettyText = Orbit Venus and Mars.
 	nominalDurationYears = 7
-	baseFunding = 2800000
-	fundingCurve = FrontloadedFundingCurve
-	repDeltaOnCompletePerYearEarly = 525
-	repPenaltyPerYearLate = 525
+	baseFunding = 2100000
+	fundingCurve = Frontloaded
+	repDeltaOnCompletePerYearEarly = 390
+	repPenaltyPerYearLate = 390
 	slots = 2
 
 	REQUIREMENTS
@@ -697,8 +877,8 @@ RP0_PROGRAM
 	
 	CONFIDENCECOSTS
 	{
-		Normal = 1500
-		Fast = 3000
+		Normal = 1300
+		Fast = 2600
 	}
 	
 	OPTIONALS
@@ -711,13 +891,14 @@ RP0_PROGRAM
 RP0_PROGRAM
 {
 	name = CrewedLunar
+	isHSF = true
 	title = Crewed Lunar Exploration
-	description = You are tasked with sending to the Moon, 240,000 miles away from the control station in Houston, a giant rocket more than 300 feet tall, made of new metal alloys, some of which have not yet been invented, capable of standing heat and stresses several times more than have ever been experienced, fitted together with a precision better than the finest watch, carrying all the equipment needed for propulsion, guidance, control, communications, food, and survival, on an untried mission, to an unknown celestial body, and then return it safely to earth, reentering the atmosphere at speeds of over 25,000 miles per hour, causing heat about half that of the temperature of the sun. Alternatively, this could be an opportunity for some command chair antics. But a proper rocket is probably your best bet. You will need to upgrade your astronaut complex to level three to plant a flag on the Moon and complete the first crewed landing contract.
+	description = You are tasked with sending to the Moon, 240,000 miles away from the control station in Houston, a giant rocket more than 300 feet tall, made of new metal alloys, some of which have not yet been invented, capable of standing heat and stresses several times more than have ever been experienced, fitted together with a precision better than the finest watch, carrying all the equipment needed for propulsion, guidance, control, communications, food, and survival, on an untried mission, to an unknown celestial body, and then return it safely to earth, reentering the atmosphere at speeds of over 25,000 miles per hour, causing heat about half that of the temperature of the sun. Alternatively, this could be an opportunity for some command chair antics. But a proper rocket is probably your best bet. You will need to upgrade your astronaut complex to level five to plant a flag on the Moon and complete the first crewed landing contract.
 	requirementsPrettyText = Complete contracts X and Y
 	objectivesPrettyText = Send crew to flyby, orbit, and land on the Moon. 
 	nominalDurationYears = 12
 	baseFunding = 15720000
-	fundingCurve = MildMidFundingCurve
+	fundingCurve = StrongFrontloaded
 	repDeltaOnCompletePerYearEarly = 1060
 	repPenaltyPerYearLate = 1060
 	repToConfidence = 3
@@ -742,7 +923,7 @@ RP0_PROGRAM
 		FACILITY_LEVEL
 		{
 			facility = AstronautComplex
-			level = 3
+			level = 5
 		}
 		COMPLETE_CONTRACT
 		{
@@ -775,44 +956,135 @@ RP0_PROGRAM
 	
 	OPTIONALS
 	{
+		CrewedLunarOrbitRepeat = true
 		MoonExtendedStayCrew = true
 	}
 }
 
-disabled_RP0_PROGRAM
+RP0_PROGRAM_MODIFIER
 {
-	name = EarthSpaceStation
-	title = Earth Space Station
-	description = An Earth space station will enable long-term human exploration of space and provide benefits to people of Earth. This Program tasks you with launching and maintaining Space Stations in Earth orbit and continuously crewing them with an increasingly longer stay durations. By completing the program, you will prove that long-term space habitation is possible which will open up crewed explorations of Venus, Mars, and beyond. NOTE: This program isn't functional enough to be completed and only has two unique contracts. Both of those contracts are also very buggy and may not complete even if the requirements should have been met.
-	requirementsPrettyText = Complete contracts X and Y
-	objectivesPrettyText = Do this and that
-	nominalDurationYears = 10
-	baseFunding = 15000000
-	repDeltaOnCompletePerYearEarly = 1130
-	repPenaltyPerYearLate = 1130
+	srcProgram = EarlyEarthSpaceStation
+	tgtProgram = CrewedLunar
+	nominalDurationYears = 7
+	baseFunding = 8050000
+	fundingCurve = Mid
+	repDeltaOnCompletePerYearEarly = 750
+	repPenaltyPerYearLate = 750
+
+	CONFIDENCECOSTS
+	{
+		Normal = 3500
+		Fast = 7000
+	}
+}
+
+RP0_PROGRAM
+{
+	name = EarlyEarthSpaceStation
+	isHSF = true
+	title = Early Earth Space Stations
+	description = An Earth space station will enable long-term human exploration of space and provide benefits to people of Earth. This Program tasks you with the exploration of prototypal and later, more mature solutions for low earth orbit long term space habitat. You will have to complete long term experiments, recrew and refill your station(s) or send new ones when needed.
+	requirementsPrettyText = Have accepted or completed the Advanced Crewed Orbit program.
+	objectivesPrettyText = Complete the Multi-Week and Multi-Month Space Habitation experiments.
+	nominalDurationYears = 13
+	baseFunding = 14300000
+	fundingCurve = Mid
+	repDeltaOnCompletePerYearEarly = 920
+	repPenaltyPerYearLate = 920
 	repToConfidence = 3
 	slots = 4
 
 	REQUIREMENTS
 	{
-		complete_program = CrewedOrbitEarly
+		ANY
+		{
+			active_program = CrewedOrbitAdv
+			complete_program = CrewedOrbitAdv
+		}
 	}
 
 	OBJECTIVES
 	{
 		complete_contract = first_spaceStation
-		complete_contract = improved_spaceStation
-		complete_contract = first_ISScrew
-		complete_contract = second_ISScrew
+		complete_contract = CollectProtoStationScience
+		complete_contract = secondGen_spaceStation
+		complete_contract = CollectSecondGenerationStationScience
 	}
 	
 	CONFIDENCECOSTS
 	{
-		Normal = 5000
-		Fast = 10000
+		Normal = 4775
+		Fast = 9550 //Based on program funding relative to Crewed Lunar
+	}
+	OPTIONALS
+	{
+		supplySecondGenerationStation = true
+		supplyProtoStation = true
+		prototype_spaceStation_launch = true
 	}
 }
 
+RP0_PROGRAM_MODIFIER
+{
+	srcProgram = CrewedLunar
+	tgtProgram = EarlyEarthSpaceStation
+	nominalDurationYears = 7
+	baseFunding = 6300000
+	fundingCurve = Flat
+	repDeltaOnCompletePerYearEarly = 590
+	repPenaltyPerYearLate = 590
+
+	CONFIDENCECOSTS
+	{
+		Normal = 3000
+		Fast = 6000
+	}
+}
+
+
+RP0_PROGRAM
+{
+	name = LunarHabitation
+	isHSF = true
+	title = Longterm Lunar Habitation
+	description = The Apollo program proved humans could safely land on another planetary body in the solar system, operate there for a short period of time, and return home.  This program further develops the technology required to spend longer periods of time on the Lunar surface before attempting a crewed Mars surface mission.
+	requirementsPrettyText = Have completed the Crewed Lunar Expedition
+	objectivesPrettyText = Complete Lunar surface experiments and exploration
+	nominalDurationYears = 10
+	baseFunding = 20000000
+	repDeltaOnCompletePerYearEarly = 1505
+	repPenaltyPerYearLate = 1505
+	repToConfidence = 3
+	slots = 4
+
+	REQUIREMENTS
+	{
+		ANY
+		{
+			complete_program = EarlyEarthSpaceStation
+			complete_program = CrewedLunar
+		}
+	}
+	OBJECTIVES
+	{
+		complete_contract = LEMShelter
+		complete_contract = LargeLunarShelter
+		complete_contract = Lunar90
+	}
+	
+	OPTIONALS
+	{
+		Lunar180 = true
+		LunarGateway = true
+		NuclearTug = true
+	}
+	
+	CONFIDENCECOSTS
+	{
+		Normal = 13350
+		Fast = 26700
+	}
+}
 RP0_PROGRAM
 {
 	name = MarsSurfaceExp
@@ -853,6 +1125,8 @@ RP0_PROGRAM
 		probeMars = true
 		samplesPhobos = true
 		MarsOrbitRepeatable = true
+		landingMarsRepeatable = true
+		roverMarsRepeatable = true
 	}
 	
 }
@@ -879,7 +1153,6 @@ RP0_PROGRAM
 	OBJECTIVES
 	{
 		complete_contract = landingVenus
-		minCount = 3
 	}
 	
 	CONFIDENCECOSTS
@@ -892,6 +1165,7 @@ RP0_PROGRAM
 	{
 		probeVenus = true
 		VenusOrbitRepeatable = true
+		landingVenusRepeatable = true
 	}
 }
 
@@ -965,6 +1239,7 @@ RP0_PROGRAM
 	OPTIONALS
 	{
 		orbitMercury_Rep = true
+		landingMercuryRepeatable = true
 		roverMercury = true
 	}
 }
@@ -1198,6 +1473,7 @@ disabled_RP0_PROGRAM
 	OPTIONALS
 	{
 		orbitSaturn_Rep = true
+		roverTitan = true
 	}
 }
 
@@ -1250,7 +1526,7 @@ RP0_PROGRAM
 	name = OuterGasGiantSurvey
 	title = Outer Gas Giant Survey 
 	description = Pictures can help expand our knowledge of the outer Solar System, but scientific instruments and dwell times much longer than a hasty flyby are necessary to increase our understanding of these distant neighbors. Send orbiters to the two furthest gas giants and probe their atmospheres. While in the furthest reaches of our system, explore the moons of these giants as well. An upgraded Tracking Station and higher level comm tech will be necessary in order to receive scientific data over such great distances.
- 	requirementsPrettyText = Complete contracts X and Y
+	requirementsPrettyText = Complete contracts X and Y
 	objectivesPrettyText = Do this and that
 	nominalDurationYears = 18
 	baseFunding = 10800000
@@ -1301,132 +1577,134 @@ RP0_PROGRAM
 	}
 }
 
-RP0_PROGRAM
+disabled_RP0_PROGRAM
 {
-	name = PlutoLandings
-	title = Plutonian Landings 
-	description = The only known double planetary system in the Solar System, Pluto and Charon have been tidally locked in orbit of each other in the darkest, coldest reaches of our system for eons. It is now time for you to land on them, quite possibly within a century of their discovery. Very little is known about these distant, icy worlds. Historically, even our most advanced probes have returned relatively little data compared to what we know about our closer neighbors. Explore the furthest reaches of the Solar System and land on this intriguing pair of dwarf planets.
+	name = UranusMoonLandings
+	title = Uranian Moon Landings (WIP)
+	description = Land on some of Uranus's moons. TODO: write up a program description
 	requirementsPrettyText = Complete contracts X and Y
-	objectivesPrettyText = Land on Pluto and Charon.
-	nominalDurationYears = 21
-	baseFunding = 25200000
-	repDeltaOnCompletePerYearEarly = 1215
-	repPenaltyPerYearLate = 1215
-	repToConfidence = 3
+	objectivesPrettyText = Do this and that
+	nominalDurationYears = 12
+	baseFunding = 14400000
+	repDeltaOnCompletePerYearEarly = 975
+	repPenaltyPerYearLate = 975
 	slots = 4
 
 	REQUIREMENTS
 	{
-		complete_program = OuterPlanetFlyby
+		complete_program = OuterGasGiantSurvey
 	}
-
+	
 	OBJECTIVES
 	{
-		complete_contract = orbitPluto
-		complete_contract = landingPluto
-		complete_contract = landingCharon
+		ATLEAST
+		{
+			count = 3
+			complete_contract = landingAriel
+			complete_contract = landingMiranda
+			complete_contract = landingTitania
+			complete_contract = landingUmbriel
+   			complete_contract = landingOberon
+		}
 	}
 	
 	CONFIDENCECOSTS
 	{
-		Normal = 16800
-		Fast = 33600
+		Normal = 9600
+		Fast = 19200
 	}
 	
 	OPTIONALS
 	{
-		roverPluto = true
-		roverCharon = true
+		orbitUranus_Rep = true
 	}
 }
 
-RP0_PROGRAM
+disabled_RP0_PROGRAM
 {
-	name = LunarHabitation
-	title = Lunar Habitation and Exploration
-	description = Repeat crewed expeditions to the moon have now occurred, but only for limited amounts of time.  Expand on your Crewed Lunar program and develop the capabilities for longer-term habitation away from Low Earth Orbit.  This program will incrementally increase the length of time and number of crew sent to the moon, with the ultimate goal of developing the technologies for future resource extraction.  New hardware and techniques that may be necessary to complete this program include a larger lunar lander capable of holding more crew, long-term habitation modules on the Lunar surface, and the ability to precision land crew next to previously delivered habitats.  
+	name = NeptuneMoonLandings
+	title = Neptunian Moon Landings (WIP)
+	description = Land on Neptune's moon Triton. TODO: write up a program description
 	requirementsPrettyText = Complete contracts X and Y
 	objectivesPrettyText = Do this and that
-	nominalDurationYears = 10
-	baseFunding = 20000000
- 	fundingCurve = MildMidFundingCurve
-	repDeltaOnCompletePerYearEarly = 1505
-	repPenaltyPerYearLate = 1505
-	repToConfidence = 3
+	nominalDurationYears = 12
+	baseFunding = 14400000
+	repDeltaOnCompletePerYearEarly = 975
+	repPenaltyPerYearLate = 975
 	slots = 4
 
 	REQUIREMENTS
 	{
-		complete_program = CrewedLunar
+		complete_program = OuterGasGiantSurvey
 	}
-
+	
 	OBJECTIVES
 	{
-		complete_contract = LunarPresupply
-  		complete_contract = crewedLunar14
-  		complete_contract = crewedLunar30
-    		complete_contract = LunarExtraction
-	}
-
- 	OPTIONALS
-  	{
-   		ATLEAST
-     		{
-       			count = 2
-   			crewedLunar60 = true
-     			LunarLab = true
-     			LunarOrbitStation = true
-       			LunarBase = true
-	  	}
-	 }
+		complete_contract = landingTriton
+	}
+	
 	CONFIDENCECOSTS
 	{
-		Normal = 13350
-		Fast = 26700
+		Normal = 9600
+		Fast = 19200
+	}
+	
+	OPTIONALS
+	{
+		orbitNeptune_Rep = true
 	}
 }
 
-RPO_PROGRAM
+RP0_PROGRAM
 {
-	name = NuclearProp	
- 	title = Nuclear Propulsion Development
-  	description = The atomic age ushered in an era of wild ideas, far-fetched dreams, and unthinkable horrors.  Put atomic energy to a peaceful purpose and put to use decades of research into harnessing its power for drastically efficient space propulsion.  The dangers are numerous, shielding flight crews and support personnel from deadly radiation chief among them, but the payoff could be significantly reduced travel times with significantly more payload than chemical rockets can provide for the same flightpath.  This program will develop the skills and techniques for alternative propulsion systems that can be used on future missions.  
-	requirementsPrettyText = Complete Advanced Crewed Orbit program.
- 	objectivesPrettyText = Develop nuclear propulsion systems and test them within the Earth/Moon system.
-  	nominalDurationYears = 5
-   	baseFunding = 5000000
-    	fundingCurve = MildMidFundingCurve
-	repDeltaOnCompletePerYearEarly = 2585
-	repPenaltyPerYearLate = 2585
+	name = PlutoLandings
+	title = Plutonian Landings 
+	description = The only known double planetary system in the Solar System, Pluto and Charon have been tidally locked in orbit of each other in the darkest, coldest reaches of our system for eons. It is now time for you to land on them, quite possibly within a century of their discovery. Very little is known about these distant, icy worlds. Historically, even our most advanced probes have returned relatively little data compared to what we know about our closer neighbors. Explore the furthest reaches of the Solar System and land on this intriguing pair of dwarf planets.
+	requirementsPrettyText = Complete contracts X and Y
+	objectivesPrettyText = Land on Pluto and Charon.
+	nominalDurationYears = 21
+	baseFunding = 25200000
+	repDeltaOnCompletePerYearEarly = 1215
+	repPenaltyPerYearLate = 1215
 	repToConfidence = 3
-	slots = 3
+	slots = 4
 
- 	REQUIREMENTS
-  	{
-   		complete_program = CrewedOrbitAdv
-       	}
-
-      	OBJECTIVES
-       	{
-		uncrewedNuclear = true
-  		crewedNuclear = true
-      		NuclearTug = true
-    		NuclearDisposal = true
-      	}
+	REQUIREMENTS
+	{
+		complete_program = OuterPlanetFlyby
+	}
+
+	OBJECTIVES
+	{
+		complete_contract = orbitPluto
+		complete_contract = landingPluto
+		complete_contract = landingCharon
+	}
+	
 	CONFIDENCECOSTS
 	{
-		Normal = 28000
-		Fast = 56000
+		Normal = 16800
+		Fast = 33600
+	}
+	
+	OPTIONALS
+	{
+		roverPluto = true
+		roverCharon = true
+		landingPlutoRepeat = true
+		landingCharonRepeat = true
 	}
 }
 
-RP0_PROGRAM
+
+disabled_RP0_PROGRAM
 {
 	name = CrewedMarsExp
-	title = Crewed Mars Exploration
-	description = If stepping on the Moon was one giant leap, stepping on Mars is something far greater.  You've proven your ability to keep crews alive while exploring beyond the orbit of Earth, now it's time to put those skills to the test on a new planet.  Send crews to Mars using the knowledge gained from exploring the Moon, make new discoveries about the origins of our Solar System, investigate the potential for life beyond Earth, and potentially colonize another planet. 
-	requirementsPrettyText = Complete Lunar Habitation Program.
-	objectivesPrettyText = Send a crewed mission to land on Mars.
+	isHSF = true
+	title = Crewed Mars Exploration (No Content Yet)
+	description = TODO: write up a program description
+	requirementsPrettyText = Complete contracts X and Y
+	objectivesPrettyText = Do this and that
 	nominalDurationYears = 14
 	baseFunding = 42000000
 	repDeltaOnCompletePerYearEarly = 2585
@@ -1436,31 +1714,14 @@ RP0_PROGRAM
 
 	REQUIREMENTS
 	{
-		complete_program = LunarHabitation
+		complete_program = EarthSpaceStation
 	}
 
 	OBJECTIVES
 	{
-		complete_contract = MarsPresupply
-        	complete_contract = MarsResources
-    		ANY
-      		{
-    			complete_contract = CrewedMars30
-	 		complete_contract = CrewedMars500
-    		}
-	}
-
- 	OPTIONALS
-  	{
-   		ATLEAST
-     		{
-       			count = 2
-     			crewedPhobos = true
-     			crewedDeimos = true
-       			MarsBase = true
-	 		MarsResupply = true
-    		}
-   	}
+		complete_contract = TODO
+	}
+	
 	CONFIDENCECOSTS
 	{
 		Normal = 28000
@@ -1471,6 +1732,7 @@ RP0_PROGRAM
 disabled_RP0_PROGRAM
 {
 	name = CrewedVenusExp
+	isHSF = true
 	title = Crewed Venus Exploration (No Content Yet)
 	description = TODO: write up a program description
 	requirementsPrettyText = Complete contracts X and Y
@@ -1502,6 +1764,7 @@ disabled_RP0_PROGRAM
 disabled_RP0_PROGRAM
 {
 	name = CrewedExploration
+	isHSF = true
 	title = Crewed Solar System Exploration (No Content Yet)
 	description = TODO: write up a program description
 	requirementsPrettyText = Complete contracts X and Y

From a26bb9f56d8039e3ff90a7769dd85d41eadebac2 Mon Sep 17 00:00:00 2001
From: SierraHotel84 <141287350+SierraHotel84@users.noreply.github.com>
Date: Thu, 31 Oct 2024 11:50:51 -0500
Subject: [PATCH 08/12] Update InitialLunarHabitation.cfg

---
 .../InitialLunarHabitation.cfg                | 144 +-----------------
 1 file changed, 2 insertions(+), 142 deletions(-)

diff --git a/GameData/RP-1/Contracts/Lunar Habitation/InitialLunarHabitation.cfg b/GameData/RP-1/Contracts/Lunar Habitation/InitialLunarHabitation.cfg
index 8519ef2565d..b9a17ac697a 100644
--- a/GameData/RP-1/Contracts/Lunar Habitation/InitialLunarHabitation.cfg	
+++ b/GameData/RP-1/Contracts/Lunar Habitation/InitialLunarHabitation.cfg	
@@ -58,7 +58,7 @@ CONTRACT_TYPE
 		}
 		PARAMETER
 		{
-			name = TwoCrew
+			name = ThreeCrew
 			type = HasCrew
 			minCrew = 3
 			maxCrew = 99
@@ -129,7 +129,7 @@ CONTRACT_TYPE
 
 	description = <b>Program: Crewed Lunar Habitation</b><br><br>With a 14-day crewed Lunar mission now complete, it's time to extend the time a crew spends on the moon.  Send at least 2 crew to the Moon for 30 days.  Previously landed infrastructure can be used, and a resupply mission can be sent if your mission profile requires it. 
 
-	synopsis = Land a crew on the Moon, stay for 30 days, then return them safely to Earth
+	synopsis = Land a crew on the Moon, complete 30 days of science experimentation and exploration, then return them safely to Earth
 
 	completedMessage = Congratulations! You have completed the first step to a lasting crewed presence on the Moon. 
 
@@ -244,143 +244,3 @@ CONTRACT_TYPE
 		}
 	}
 }
-
-CONTRACT_TYPE
-{
-	name = LunarPresupply
-	title = Presupply Mission for Crewed Lunar Habitation
-	group = Development
-
-	description = <b>Program: Crewed Lunar Habitation</b><br><br>Crewed Lunar Habitation mission design may dictate sending supplies and habitation modules separate from the crew.  These missions will sustain a longer-duration Lunar presence as procedures and technology are developed for crewed missions beyond the Moon.  <br><br><b>Number of Contracts Completed: @index / @maxCompletions</b>
-	
-	genericDescription = Launch an uncrewed supply vessel to the Moon to provide resources for a crewed mission.
-
-	synopsis = Land a supply craft on the Moon.
-
-	completedMessage = Congratulations, our crewed mission will now have supplies for their extended exploration mission.
-
-	cancellable = true
-	declinable = true
-	autoAccept = false
-	minExpiry = 0
-	maxExpiry = 0
-	maxCompletions = 3
-	maxSimultaneous = 1
-	deadline = 0
-
-	targetBody = Moon
-
-	// ************ REWARDS ************ 
-	prestige = Trivial       // 1.0x
-	advanceFunds = 0
-	rewardScience = 0
-	rewardFunds = 0
-	failureFunds = 0
-	rewardReputation = 250
-	failureReputation = 0 
-
-
-
-	// ************ REQUIREMENTS ************
-
-	REQUIREMENT
-	{
-		name = ProgramActive
-		type = ProgramActive
-		program = LunarHabitation
-	}
-
-	REQUIREMENT
-	{
-		ALL
-		{
-			name = CompleteContract
-			type = CompleteContract
-			contractType = crewedLunar14
-			invertRequirement = true
-			hidden = true
-		}
-		{
-			name = CompleteContract
-			type = CompleteContract
-			contractType = crewedLunar30
-			invertRequirement = true
-			hidden = true
-		}
-
-	REQUIREMENT
-	{
-		ANY		
-		{
-			name = AcceptContract
-			type = AcceptContract
-			contractType = crewedLunar14
-		}
-		{
-			name = AcceptContract
-			type = AcceptContract
-			contractType = crewedLunar30
-		}
-		{
-			name = AcceptContract
-			type = AcceptContract
-			contractType = crewedLunar60
-		}
-
-	DATA
-	{
-		type = int
-		index = $RepeatMoonSupply_Count + 0
-	}
-
-	BEHAVIOUR
-	{
-		name = IncrementTheCount
-		type = Expression
-		
-		CONTRACT_COMPLETED_SUCCESS
-		{
-			RepeatMoonSupply_Count = $RepeatMoonSupply_Count + 1
-		}
-	}
-
-	// ************ PARAMETERS ************
-	
-	PARAMETER
-	{
-		name = vesselGroup
-		type = VesselParameterGroup
-		title = Uncrewed Presupply Mission 
-		define = LunarPressupply
-		defineList = LunarSupply
-		disableOnStateChange = true
-
-		PARAMETER
-		{
-			name = NoCrew
-			type = HasCrew
-			minCrew = 0
-			maxCrew = 0
-			title = Uncrewed
-			hideChildren = true
-		}
-
-		PARAMETER
-		{
-			name = LandUncrewed
-			type = All
-			title = Land the uncrewed lander
-			disableOnStateChange = true
-
-			PARAMETER
-			{
-
-				name = ReachState
-				type = ReachState
-				targetBody = Moon
-				situation = LANDED
-
-			}
-		}
-	}
-}

From bdf8611b544cc400a9b04995f304a74415b895b6 Mon Sep 17 00:00:00 2001
From: SierraHotel84 <141287350+SierraHotel84@users.noreply.github.com>
Date: Thu, 31 Oct 2024 11:53:30 -0500
Subject: [PATCH 09/12] Update Groups.cfg

---
 GameData/RP-1/Contracts/Groups.cfg | 40 +++++++++++++++---------------
 1 file changed, 20 insertions(+), 20 deletions(-)

diff --git a/GameData/RP-1/Contracts/Groups.cfg b/GameData/RP-1/Contracts/Groups.cfg
index 4a61ca9f6a7..29f53831164 100644
--- a/GameData/RP-1/Contracts/Groups.cfg
+++ b/GameData/RP-1/Contracts/Groups.cfg
@@ -144,11 +144,19 @@ CONTRACT_GROUP
 		agent = Stations
 	}
 	CONTRACT_GROUP
+	{
+		name = LunarHabitation
+		displayName = Lunar Habitation
+		minVersion = 1.12.2
+		sortKey = 27
+		agent = Base Construction
+	}	
+ 	CONTRACT_GROUP
 	{
 		name = MartianSurfaceExploration
 		displayName = Mars Surface Exploration
 		minVersion = 1.12.2
-		sortKey = 27
+		sortKey = 28
 		agent = Exploration
 	}
 	CONTRACT_GROUP
@@ -156,7 +164,7 @@ CONTRACT_GROUP
 		name = VenusSurfaceExp
 		displayName = Venus Surface Exploration
 		minVersion = 1.12.2
-		sortKey = 28
+		sortKey = 29
 		agent = Exploration
 	}
 	CONTRACT_GROUP
@@ -165,14 +173,14 @@ CONTRACT_GROUP
 		displayName = Small Bodies Flyby
 		agent = Exploration
 		minVersion = 1.12.2
-		sortKey = 29
+		sortKey = 30
 	}
 	CONTRACT_GROUP
 	{
 		name = MercuryExploration
 		displayName = Mercury Exploration
 		minVersion = 1.12.2
-		sortKey = 30
+		sortKey = 31
 		agent = Exploration
 	}
 	CONTRACT_GROUP
@@ -180,7 +188,7 @@ CONTRACT_GROUP
 		name = AsteroidExploration
 		displayName = Asteroid Exploration
 		minVersion = 1.12.2
-		sortKey = 31
+		sortKey = 32
 		agent = Exploration
 	}
 	CONTRACT_GROUP
@@ -188,7 +196,7 @@ CONTRACT_GROUP
 		name = JupiterObservation
 		displayName = Jupiter Observation
 		minVersion = 1.12.2
-		sortKey = 32
+		sortKey = 33
 		agent = Exploration
 	}
 	CONTRACT_GROUP
@@ -196,7 +204,7 @@ CONTRACT_GROUP
 		name = JupiterMoonLandings
 		displayName = Jovian Moon Landings
 		minVersion = 1.12.2
-		sortKey = 33
+		sortKey = 34
 		agent = Surveys
 	}
 	CONTRACT_GROUP
@@ -204,7 +212,7 @@ CONTRACT_GROUP
 		name = SaturnObservation
 		displayName = Saturn Observation
 		minVersion = 1.12.2
-		sortKey = 34
+		sortKey = 35
 		agent = Exploration
 	}
 	CONTRACT_GROUP
@@ -212,7 +220,7 @@ CONTRACT_GROUP
 		name = SaturnMoonLandings
 		displayName = Saturine Moon Landings
 		minVersion = 1.12.2
-		sortKey = 35
+		sortKey = 36
 		agent = Surveys
 	}
 	CONTRACT_GROUP
@@ -220,7 +228,7 @@ CONTRACT_GROUP
 		name = OuterPlanetFlyby
 		displayName = Outer Planet Flybys
 		minVersion = 1.12.2
-		sortKey = 36
+		sortKey = 37
 		agent = Exploration
 	}
 	CONTRACT_GROUP
@@ -228,7 +236,7 @@ CONTRACT_GROUP
 		name = OuterGasGiantSurvey
 		displayName = Outer Gas Giant Survey
 		minVersion = 1.12.2
-		sortKey = 37
+		sortKey = 38
 		agent = Surveys
 	}
 	CONTRACT_GROUP
@@ -236,16 +244,8 @@ CONTRACT_GROUP
 		name = PlutoLandings
 		displayName = Plutonian Landings
 		minVersion = 1.12.2
-		sortKey = 38
-		agent = Surveys
-	}
-	CONTRACT_GROUP
-	{
-		name = LunarHabitation
-		displayName = Lunar Habitation
-		minVersion = 1.12.2
 		sortKey = 39
-		agent = Base Construction
+		agent = Surveys
 	}
 	CONTRACT_GROUP
 	{

From 9bffe3b0a04140255a151cfbb73f730b7e8e4516 Mon Sep 17 00:00:00 2001
From: SierraHotel84 <141287350+SierraHotel84@users.noreply.github.com>
Date: Thu, 31 Oct 2024 11:54:18 -0500
Subject: [PATCH 10/12] Update InitialLunarHabitation.cfg

---
 .../Contracts/Lunar Habitation/InitialLunarHabitation.cfg     | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/GameData/RP-1/Contracts/Lunar Habitation/InitialLunarHabitation.cfg b/GameData/RP-1/Contracts/Lunar Habitation/InitialLunarHabitation.cfg
index b9a17ac697a..b3579ae135c 100644
--- a/GameData/RP-1/Contracts/Lunar Habitation/InitialLunarHabitation.cfg	
+++ b/GameData/RP-1/Contracts/Lunar Habitation/InitialLunarHabitation.cfg	
@@ -2,7 +2,7 @@ CONTRACT_TYPE
 {
 	name = crewedLunar14
 	title = Crewed 14-Day Lunar Mission
-	group = Development
+	group = LunarHabitation
 
 	description = <b>Program: Crewed Lunar Habitation</b><br><br>Previous crewed lunar mission requirements were short in duration, no more than a few days.  Much longer stays will be required in order to one day place a permanent installation on the Moon.  This mission will conduct the first long-duration planetary habitat experiment to validate the technology for further afar crewed exploration in the future.<br><br>This mission can be completed in numerous ways.  Whether Apollo-style with a Lunar Orbit Rendezvous, as a Lunar Direct mission with no orbiter, or by sending a separate presupply mission ahead of your crew, the choice is yours.  However, follow-on missions will require longer stays and larger crews, so plan accordingly.  A separate pre-supply mission is available should you choose to use that mission profile.
 
@@ -125,7 +125,7 @@ CONTRACT_TYPE
 {
 	name = crewedLunar30
 	title = Crewed 30-Day Lunar Mission
-	group = Development
+	group = LunarHabitation
 
 	description = <b>Program: Crewed Lunar Habitation</b><br><br>With a 14-day crewed Lunar mission now complete, it's time to extend the time a crew spends on the moon.  Send at least 2 crew to the Moon for 30 days.  Previously landed infrastructure can be used, and a resupply mission can be sent if your mission profile requires it. 
 

From da7328fa6bd19659e50e597d4d326f85ef21db83 Mon Sep 17 00:00:00 2001
From: SierraHotel84 <141287350+SierraHotel84@users.noreply.github.com>
Date: Thu, 31 Oct 2024 11:55:59 -0500
Subject: [PATCH 11/12] Matched lunar program and contract names

---
 GameData/RP-1/Programs/Programs.cfg | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/GameData/RP-1/Programs/Programs.cfg b/GameData/RP-1/Programs/Programs.cfg
index 2e82c9fa6ab..95b4d528faf 100644
--- a/GameData/RP-1/Programs/Programs.cfg
+++ b/GameData/RP-1/Programs/Programs.cfg
@@ -1067,14 +1067,13 @@ RP0_PROGRAM
 	}
 	OBJECTIVES
 	{
-		complete_contract = LEMShelter
-		complete_contract = LargeLunarShelter
-		complete_contract = Lunar90
+		complete_contract = crewedLunar14
+		complete_contract = crewedLunar30
 	}
 	
 	OPTIONALS
 	{
-		Lunar180 = true
+		crewedLunar180 = true
 		LunarGateway = true
 		NuclearTug = true
 	}

From 6870ba0e2c5637a2ff539ffe2079b405428d7f0d Mon Sep 17 00:00:00 2001
From: SierraHotel84 <141287350+SierraHotel84@users.noreply.github.com>
Date: Fri, 1 Nov 2024 14:29:45 -0500
Subject: [PATCH 12/12] Update Programs.cfg

---
 GameData/RP-1/Programs/Programs.cfg | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/GameData/RP-1/Programs/Programs.cfg b/GameData/RP-1/Programs/Programs.cfg
index 95b4d528faf..de5e5f99c83 100644
--- a/GameData/RP-1/Programs/Programs.cfg
+++ b/GameData/RP-1/Programs/Programs.cfg
@@ -1041,7 +1041,6 @@ RP0_PROGRAM_MODIFIER
 	}
 }
 
-
 RP0_PROGRAM
 {
 	name = LunarHabitation
@@ -1084,6 +1083,7 @@ RP0_PROGRAM
 		Fast = 26700
 	}
 }
+
 RP0_PROGRAM
 {
 	name = MarsSurfaceExp
@@ -1695,7 +1695,6 @@ RP0_PROGRAM
 	}
 }
 
-
 disabled_RP0_PROGRAM
 {
 	name = CrewedMarsExp