Merge branch 'KSP-RO:master' into CrewedMars

KSP-RO · Oct 1, 2024 · 5b40fd7 · 5b40fd7
2 parents 3a69513 + be9523c
commit 5b40fd7
Show file tree

Hide file tree

Showing 26 changed files with 479 additions and 322 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -115,7 +115,7 @@ jobs:
           cp -v -R "${{ github.workspace }}/LICENSE.md" "${RELEASE_DIR}/GameData/RP-1/LICENSE.md"
 
       - name: Upload artifacts
-        uses: actions/upload-artifact@v1
+        uses: actions/upload-artifact@v4
         with:
           name: RP-1
           path: ${{ steps.assemble-release.outputs.release-dir }}
diff --git a/GameData/RP-1/Contracts/Early Satellites (Heavy)/FirstPolarSat-Heavy.cfg b/GameData/RP-1/Contracts/Early Satellites (Heavy)/FirstPolarSat-Heavy.cfg
@@ -43,6 +43,13 @@ CONTRACT_TYPE
 		program = EarlySatellites-Heavy
 	}
 
+	REQUIREMENT
+	{
+		name = CompleteContract
+		type = CompleteContract
+		contractType = FirstSatellite-Heavy
+	}
+
 	REQUIREMENT
 	{
 		name = AcceptContract

diff --git a/GameData/RP-1/RP-1.version b/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.12.0.0/RP-1-v3.12.0.0.zip",
+    "DOWNLOAD": "https://github.com/KSP-RO/RP-1/releases/download/v3.13.0.0/RP-1-v3.13.0.0.zip",
     "HOMEPAGE": "https://github.com/KSP-RO/RP-1/",
     "VERSION": {
         "MAJOR": 3,
-        "MINOR": 12,
+        "MINOR": 13,
         "PATCH": 0,
         "BUILD": 0
     },

diff --git a/GameData/RP-1/SCMData/CostModifiers.cfg b/GameData/RP-1/SCMData/CostModifiers.cfg
@@ -43,7 +43,7 @@ KCTTAGS
         displayName = Human-Rated
         partMult = 1.25
         globalMult = 1.25
-		isHumanRating = True
+        isHumanRating = True
         desc = Has human-rated equipment that requires more time for integration and testing of the entire craft.
     }
     VALUE
@@ -96,6 +96,12 @@ KCTTAGS
         desc = Has toxic propellants that need to be handled carefully prior to launch.
     }
     VALUE
+    {
+        name = Hydrolox
+        displayName = Hydrolox
+        desc = Currently, no effect on launch cost.
+    }
+    VALUE
     {
         name = Cryogenic
         displayName = Cryo Propellants

diff --git a/GameData/RP-1/Science/Experiments/CrewScience/BasicCapsuleExperiments.cfg b/GameData/RP-1/Science/Experiments/CrewScience/BasicCapsuleExperiments.cfg
@@ -36,8 +36,8 @@ EXPERIMENT_DEFINITION
   	{
 		// sample mass in tons. if undefined or 0, the experiment produce a file
 		SampleMass = 0
-            // Body restrictions, multiple lines allowed (just don't use confictiong combinations).
-	      BodyAllowed = HomeBody
+        // Body restrictions, multiple lines allowed (just don't use confictiong combinations).
+	    BodyAllowed = HomeBody
 		IncludeExperiment = 
  	}
 }
@@ -87,8 +87,8 @@ EXPERIMENT_DEFINITION
   	{
 		// sample mass in tons. if undefined or 0, the experiment produce a file
 		SampleMass = 0
-	      // Body restrictions, multiple lines allowed (just don't use confictiong combinations).
-	      BodyAllowed = HomeBody
+	    // Body restrictions, multiple lines allowed (just don't use confictiong combinations).
+	    BodyAllowed = HomeBody
 		IncludeExperiment = 
  	}
 }
@@ -138,8 +138,8 @@ EXPERIMENT_DEFINITION
   	{
 		// sample mass in tons. if undefined or 0, the experiment produce a file
 		SampleMass = 0
-	      // Body restrictions, multiple lines allowed (just don't use confictiong combinations).
-	      BodyAllowed = HomeBody
+	    // Body restrictions, multiple lines allowed (just don't use confictiong combinations).
+	    BodyAllowed = HomeBody
 		IncludeExperiment = 
   	}
 }
@@ -189,8 +189,8 @@ EXPERIMENT_DEFINITION
   	{
 		// sample mass in tons. if undefined or 0, the experiment produce a file
 		SampleMass = 0.002
-	      // Body restrictions, multiple lines allowed (just don't use confictiong combinations).
-	      BodyAllowed = HomeBody
+	    // Body restrictions, multiple lines allowed (just don't use confictiong combinations).
+	    BodyAllowed = HomeBody
 		IncludeExperiment = 
   	}
 }

diff --git a/GameData/RP-1/Science/Experiments/CrewScience/MatureCapsuleExperiments.cfg b/GameData/RP-1/Science/Experiments/CrewScience/MatureCapsuleExperiments.cfg
@@ -37,6 +37,8 @@ EXPERIMENT_DEFINITION
   	{
 		// sample mass in tons. if undefined or 0, the experiment produce a file
 		SampleMass = 0
+		// Body restrictions, multiple lines allowed (just don't use confictiong combinations).
+		BodyAllowed = HomeBodyAndMoons
 		IncludeExperiment = 
   	}
 }
@@ -86,6 +88,8 @@ EXPERIMENT_DEFINITION
   	{
 		// sample mass in tons. if undefined or 0, the experiment produce a file
 		SampleMass = 0
+		// Body restrictions, multiple lines allowed (just don't use confictiong combinations).
+		BodyAllowed = HomeBody
 		IncludeExperiment = 
   	}
 }
@@ -135,6 +139,8 @@ EXPERIMENT_DEFINITION
   	{
 		// sample mass in tons. if undefined or 0, the experiment produce a file
 		SampleMass = 0
+		// Body restrictions, multiple lines allowed (just don't use confictiong combinations).
+		BodyAllowed = HomeBody
 		IncludeExperiment = 
   	}
 }
@@ -184,6 +190,8 @@ EXPERIMENT_DEFINITION
   	{
 		// sample mass in tons. if undefined or 0, the experiment produce a file
 		SampleMass = 0.0001
+		// Body restrictions, multiple lines allowed (just don't use confictiong combinations).
+		BodyAllowed = HomeBody
 		IncludeExperiment = 
   	}
 }
@@ -195,7 +203,7 @@ EXPERIMENT_DEFINITION
 		experiment_id = RP0TerrainPhotography
 		ec_rate = 0
 		data_rate = 50
-		@data_rate /= 129600 // 3 days
+		@data_rate /= 129600 // 1.5 days
 		%sample_amount = 1
             @sample_amount /= 3
 		requires = CrewMin:2
@@ -235,6 +243,8 @@ EXPERIMENT_DEFINITION
   	{
 		// sample mass in tons. if undefined or 0, the experiment produce a file
 		SampleMass = 0.0001
+		// Body restrictions, multiple lines allowed (just don't use confictiong combinations).
+		BodyAllowed = HomeBody
 		IncludeExperiment = 
   	}
 }
@@ -246,7 +256,7 @@ EXPERIMENT_DEFINITION
 		experiment_id = RP0WeatherPhotography
 		ec_rate = 0
 		data_rate = 50
-		@data_rate /= 129600 // 3 days
+		@data_rate /= 129600 // 1.5 days
 		%sample_amount = 1
             @sample_amount /= 3
 		requires = CrewMin:2

diff --git a/GameData/RP-1/Science/Experiments/CrewScience/SecondGenExperiments.cfg b/GameData/RP-1/Science/Experiments/CrewScience/SecondGenExperiments.cfg
@@ -36,8 +36,8 @@ EXPERIMENT_DEFINITION
   	{
   		// sample mass in tons. if undefined or 0, the experiment produce a file
 		SampleMass = 0
-	      // Body restrictions, multiple lines allowed (just don't use confictiong combinations).
-	      BodyAllowed = HomeBody
+	    // Body restrictions, multiple lines allowed (just don't use confictiong combinations).
+	    BodyAllowed = HomeBody
 		IncludeExperiment = 
   	}
 }
@@ -87,6 +87,8 @@ EXPERIMENT_DEFINITION
   	{
 		// sample mass in tons. if undefined or 0, the experiment produce a file
 		SampleMass = 0
+		// Body restrictions, multiple lines allowed (just don't use confictiong combinations).
+		BodyAllowed = HomeBodyAndMoons
 		IncludeExperiment = 
   	}
 }
@@ -136,6 +138,8 @@ EXPERIMENT_DEFINITION
   	{
 		// sample mass in tons. if undefined or 0, the experiment produce a file
 		SampleMass = 0
+		// Body restrictions, multiple lines allowed (just don't use confictiong combinations).
+		BodyAllowed = HomeBodyAndMoons
 		IncludeExperiment = 
   	}
 }
@@ -185,8 +189,8 @@ EXPERIMENT_DEFINITION
   	{
 		// sample mass in tons. if undefined or 0, the experiment produce a file
 		SampleMass = 0
-	      // Body restrictions, multiple lines allowed (just don't use confictiong combinations).
-	      BodyAllowed = HomeBody
+	    // Body restrictions, multiple lines allowed (just don't use confictiong combinations).
+	    BodyAllowed = HomeBody
 		IncludeExperiment = 
   	}
 }
@@ -236,8 +240,8 @@ EXPERIMENT_DEFINITION
   	{
 		// sample mass in tons. if undefined or 0, the experiment produce a file
 		SampleMass = 0.0005
-  	      // Body restrictions, multiple lines allowed (just don't use confictiong combinations).
-	      BodyAllowed = HomeBody
+  	    // Body restrictions, multiple lines allowed (just don't use confictiong combinations).
+	    BodyAllowed = HomeBody
 		IncludeExperiment = 
   	}
 }
@@ -288,6 +292,8 @@ EXPERIMENT_DEFINITION
   	{
 		// sample mass in tons. if undefined or 0, the experiment produce a file
 		SampleMass = 0.0005
+		// Body restrictions, multiple lines allowed (just don't use confictiong combinations).
+		BodyAllowed = HomeBodyAndMoons
 		IncludeExperiment = 
   	}
 }
@@ -338,8 +344,8 @@ EXPERIMENT_DEFINITION
   	{
 		// sample mass in tons. if undefined or 0, the experiment produce a file
 		SampleMass = 0
-	      // Body restrictions, multiple lines allowed (just don't use confictiong combinations).
-	      BodyAllowed = HomeBody
+	    // Body restrictions, multiple lines allowed (just don't use confictiong combinations).
+	    BodyAllowed = HomeBody
 		IncludeExperiment = 
   	}
 }
@@ -389,8 +395,8 @@ EXPERIMENT_DEFINITION
   	{
 		// sample mass in tons. if undefined or 0, the experiment produce a file
 		SampleMass = 0
-	      // Body restrictions, multiple lines allowed (just don't use confictiong combinations).
-	      BodyAllowed = HomeBody
+	    // Body restrictions, multiple lines allowed (just don't use confictiong combinations).
+	    BodyAllowed = HomeBody
 		IncludeExperiment = 
   	}
 }
@@ -440,8 +446,8 @@ EXPERIMENT_DEFINITION
   	{
 		// sample mass in tons. if undefined or 0, the experiment produce a file
 		SampleMass = 0
-	      // Body restrictions, multiple lines allowed (just don't use confictiong combinations).
-	      BodyAllowed = HomeBody
+	    // Body restrictions, multiple lines allowed (just don't use confictiong combinations).
+	    BodyAllowed = HomeBody
 		IncludeExperiment = 
   	}
 }
@@ -491,6 +497,8 @@ EXPERIMENT_DEFINITION
   	{
 		// sample mass in tons. if undefined or 0, the experiment produce a file
 		SampleMass = 0
+		// Body restrictions, multiple lines allowed (just don't use confictiong combinations).
+		BodyAllowed = HomeBodyAndMoons
 		IncludeExperiment = 
   	}
 }
@@ -540,8 +548,8 @@ EXPERIMENT_DEFINITION
   	{
 		// sample mass in tons. if undefined or 0, the experiment produce a file
 		SampleMass = 0.004
-	      // Body restrictions, multiple lines allowed (just don't use confictiong combinations).
-	      BodyAllowed = HomeBody
+	    // Body restrictions, multiple lines allowed (just don't use confictiong combinations).
+	    BodyAllowed = HomeBody
 		IncludeExperiment = 
   	}
 }
@@ -592,8 +600,8 @@ EXPERIMENT_DEFINITION
   	{
 		// sample mass in tons. if undefined or 0, the experiment produce a file
 		SampleMass = 0
-	      // Body restrictions, multiple lines allowed (just don't use confictiong combinations).
-	      BodyAllowed = HomeBody
+	    // Body restrictions, multiple lines allowed (just don't use confictiong combinations).
+	    BodyAllowed = HomeBody
 		IncludeExperiment = 
   	}
 }