Fix Rocket Plane Development (#2223)

Apologies--I really thought I'd tested this after the last time I touched it.

GameData/RP-1/Contracts/X-Plane Research/RocketPlaneDevelopmentOptional.cfg

@@ -5,7 +5,7 @@ CONTRACT_TYPE
 
 	title = Experimental Rocketplanes - Optional
 
-	description = <b>Program: X-Plane Research<br>Type: <color=blue>Optional</color></b><br><br>Design, build, and launch a crewed rocketplane to achieve an altitude of @/altitudeKm km, a velocity of @/velocity m/s and return home safely. Optionally, landing back at the runway will award extra reputation. If playing from the Cape, the Space Shuttle runway provided by the RSS-CanaveralHD mod is also a valid landing target.<br><br>The reward of this contract will slowly increase over time but will be reset to 0 after each completion.<br><b>Current reward is at @rewardFactorPercent % of its nominal value. Elapsed/Expected Days: @elapsedDays / @RP0:expectedDays_RocketPlaneDevelopmentOptional</b><br><br>This is a series of @maxCompletions contracts, of which @index have been completed.<br><br><b><color="red">This contract will no longer be offered once you complete 'X-Planes (High Altitude)'!</color></b>
+	description = <b>Program: X-Plane Research<br>Type: <color=blue>Optional</color></b><br><br>Design, build, and launch a crewed rocketplane to achieve an altitude of @/altitudeKm km, a velocity of @/velocity m/s and return home safely. Optionally, landing back at the runway will award extra reputation. If playing from the Cape, the Space Shuttle runway provided by the RSS-CanaveralHD mod is also a valid landing target.<br><br>This is a series of @maxCompletions contracts, of which @index have been completed.<br><br><b><color="red">This contract will no longer be offered once you complete 'X-Planes (High Altitude)'!</color></b>
 	genericDescription = Design, build and launch a crewed rocketplane to achieve a combination of altitude + velocity and return home safely.
 
 	synopsis = Launch a crewed vessel to @/altitudeKm km.
@@ -50,33 +50,14 @@ CONTRACT_TYPE
 		type = CompleteContract
 		contractType = BreakSoundBarrier
 	}
-
-	REQUIREMENT
-	{
-		name = AcceptContract
-		type = AcceptContract
-		contractType = RocketPlaneDevelopment
-		invertRequirement = true
-	}
 
 	REQUIREMENT
 	{
-		name = NotRPD
-		type = Any
-		REQUIREMENT
-		{
-			name = RocketPlaneDevelopment
-			type = CompleteContract
-			contractType = RocketPlaneDevelopment
-		}
-		REQUIREMENT
-		{
-			name = NotCompletedRPDO
-			type = CompleteContract
-			contractType = RocketPlaneDevelopmentOptional
-			minCount = 3
-			invertRequirement = true
-		}
+		name = NotCompletedRPDO
+		type = CompleteContract
+		contractType = RocketPlaneDevelopmentOptional
+		minCount = 3
+		invertRequirement = true
 	}
 
 	REQUIREMENT