Fix the three erroring contracts, and move HSF repeatables to their o…

…wn group. Also make orbitRecover maxCompletions follow its description (3 completes)
KSP-RO · Jun 29, 2017 · 4251727 · 4251727
1 parent fdd020b
commit 4251727
Show file tree

Hide file tree

Showing 8 changed files with 18 additions and 8 deletions.
diff --git a/GameData/RP-0/Contracts/Early Satellites/Molniya Satellite.cfg b/GameData/RP-0/Contracts/Early Satellites/Molniya Satellite.cfg
@@ -30,7 +30,7 @@ CONTRACT_TYPE
 	advanceFunds = 7500
 	rewardScience = 0
 	rewardReputation = 5
-	rewardFunds = 20000 + @TestComSat/HasComSatBus/minQuantity
+	rewardFunds = 20000 + @VesselGroup/HasComSatBus/minQuantity
 	failureReputation = 2
 	failureFunds = 5000
 

diff --git a/GameData/RP-0/Contracts/Groups.cfg b/GameData/RP-0/Contracts/Groups.cfg
@@ -83,6 +83,14 @@ CONTRACT_GROUP
 		agent = Federation Aeronautique Internationale
     }
 	CONTRACT_GROUP
+    {
+        name = HumanContracts
+        displayName = Human Contracts
+        minVersion = 1.22.2
+		sortKey = 65
+		agent = Federation Aeronautique Internationale
+    }
+	CONTRACT_GROUP
     {
         name = MoonExploration
         displayName = Lunar Exploration Contracts

diff --git a/...cts/Human Milestones/Orbit Repeatable.cfg → ...acts/Human Contracts/Orbit Repeatable.cfg b/...cts/Human Milestones/Orbit Repeatable.cfg → ...acts/Human Contracts/Orbit Repeatable.cfg
@@ -2,11 +2,13 @@ CONTRACT_TYPE
 {
 	name = HSFOrbitalLEO1Repeatable
 	title = Orbital Flight (One Crew)
-	group = HumanMilestones
+	group = HumanContracts
 
 
 	description = Single-person orbital spacecraft are fairly rare in history but serve an important role in proving future technologies, with Mercury (1962, 1.4 tons, Atlas LV-3B) and Vostok (1961, 4.7 tons, Vostok-K) being the only examples. Design, build, and launch one that remains for @/NoOfOrbits orbits and return the crew safely back to Earth.
 	genericDescription = Launch a crewed single-person spacecraft into orbit for a routine mission completing the specified number of orbits and return safely home.
+
+	genericDescription = Launch a crewed spacecraft with at least one person aboard into a suborbital trajectory of at least the given apogee and return safely home.
 
 	synopsis = Fly a single-person LEO Orbital mission.
 

diff --git a/...ts/Human Milestones/Suborbital Crewed.cfg → ...cts/Human Contracts/Suborbital Crewed.cfg b/...ts/Human Milestones/Suborbital Crewed.cfg → ...cts/Human Contracts/Suborbital Crewed.cfg
@@ -2,10 +2,10 @@ CONTRACT_TYPE
 {
 	name = CrewedSuborbital
 	title = Suborbital Flight (Crewed)
-	group = HumanMilestones
+	group = HumanContracts
 
 
-	description = Crewed suborbital flights are used as a safer prelude to an orbital mission, for research, or to set non-orbital altitude records. Send any number of crew above @/minAltitude meters to satisfy the requirements of this mission. Historical missions used the Mercury capsule (1961, Mercury-Redstone), the X-15 (1963, B-52), and SpaceShipOne (2004, White Knight).
+	description = Crewed suborbital flights are used as a safer prelude to an orbital mission, for research, or to set non-orbital altitude records. Send any number of crew above @VesselGroup/ReachAlt/minAltitude meters to satisfy the requirements of this mission. Historical missions used the Mercury capsule (1961, Mercury-Redstone), the X-15 (1963, B-52), and SpaceShipOne (2004, White Knight).
 
 	synopsis = Send a crewed vessel on a suborbital flight
 

diff --git a/...ilestones/Three Crew Orbit Repeatable.cfg → ...Contracts/Three Crew Orbit Repeatable.cfg b/...ilestones/Three Crew Orbit Repeatable.cfg → ...Contracts/Three Crew Orbit Repeatable.cfg
@@ -2,7 +2,7 @@ CONTRACT_TYPE
 {
 	name = HSFOrbitalLEO3Repeatable
 	title = Orbital Flight with at Least Three Crew
-	group = HumanMilestones
+	group = HumanContracts
 
 
 	description = The goal and realization of putting three (or more) crew on orbit at the same time begins the era of the space taxi and ready access to LEO. Depending on the politics and economy of the originating nation these craft will either be noted predecessors to later craft or become so ubiquitous and reliable in the role that they are still flying 50 years after their first. These craft should be able to support at least three crew and prove that they can stay in orbit for @/DurationText days. The Soviet Voskhod 1 (1964, 5.3 tons, modified Molniya) and Soyuz (1967, 6.5 tons, Soyuz), and the U.S. Apollo CSM (1968, 14.7 - 21 tons for LEO, Saturn 1B) are examples of these craft.

diff --git a/... Milestones/Two Crew Orbit Repeatable.cfg → ...n Contracts/Two Crew Orbit Repeatable.cfg b/... Milestones/Two Crew Orbit Repeatable.cfg → ...n Contracts/Two Crew Orbit Repeatable.cfg
@@ -2,7 +2,7 @@ CONTRACT_TYPE
 {
 	name = HSFOrbitalLEO2Repeatable
 	title = Orbital Flight with Two Crew
-	group = HumanMilestones
+	group = HumanContracts
 
 
 	description = Putting two people into space in the same capsule opens the door to a range of new activities and opportunities. Such a spacecraft must remain in orbit with its crew @/DurationText days and return them safely to Earth. Only two spacecraft were ever specifically created for this task, the Soviet Voskhod 2, a refit of the 3-seat Voskhod 1 (1965, 5.7 tons, modified Molniya) and the U.S. Gemini (1965, 3.2 - 3.8 tons, Gemini-Titan II).

diff --git a/GameData/RP-0/Contracts/Milestones/Orbital Recovery.cfg b/GameData/RP-0/Contracts/Milestones/Orbital Recovery.cfg
@@ -18,7 +18,7 @@ CONTRACT_TYPE
 	autoAccept = false
 	minExpiry = 0
 	maxExpiry = 0
-	maxCompletions = 2
+	maxCompletions = 3
 	maxSimultaneous = 1
 	deadline = 365  // 1 year
 

diff --git a/GameData/RP-0/Contracts/X-Planes/CrewedHighAtmoLate.cfg b/GameData/RP-0/Contracts/X-Planes/CrewedHighAtmoLate.cfg
@@ -1,7 +1,7 @@
 CONTRACT_TYPE
 {
 	name = CrewedSpaceLate
-	group = X-PlaneContracts
+	group = X-Planes
 
 	title = X-Planes (Suborbital)