Removed unnecessary resource

Removed TelescopePayload Changed TelescopePayload requirements to use the new ResearchPayload resource bc it is so similar
KSP-RO · Sep 30, 2024 · 9db0f2c · 9db0f2c
1 parent 12ea277
commit 9db0f2c
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 25 deletions.
diff --git a/GameData/RP-1/Contracts/Great Observatories/GOCrewedServicing.cfg b/GameData/RP-1/Contracts/Great Observatories/GOCrewedServicing.cfg
@@ -130,9 +130,9 @@ CONTRACT_TYPE
 		{
 			name = HasResource
 			type = HasResource
-			resource = TelescopePayload
-			minQuantity = 600 // placeholder, should be at least a few hundred kg, rn is 300 kg worth
-			title = Bring @minQuantity units of TelescopePayload as replacement instruments
+			resource = ResearchPayload
+			minQuantity = 600 // WFPC2 + COSTAR was 571 kg
+			title = Bring @minQuantity units of ResearchPayload as replacement instruments
 		}
 
   		PARAMETER

diff --git a/GameData/RP-1/Contracts/Great Observatories/GOCrewedServicingRepeat.cfg b/GameData/RP-1/Contracts/Great Observatories/GOCrewedServicingRepeat.cfg
@@ -136,9 +136,9 @@ CONTRACT_TYPE
 		{
 			name = HasResource
 			type = HasResource
-			resource = TelescopePayload
-			minQuantity = 600 // placeholder, should be at least a few hundred kg, rn is 300 kg worth
-			title = Bring @minQuantity units of TelescopePayload as replacement instruments
+			resource = ResearchPayload
+			inQuantity = 600 // WFPC2 + COSTAR was 571 kg
+			title = Bring @minQuantity units of ResearchPayload as replacement instruments
 		}
 
   		PARAMETER

diff --git a/GameData/RP-1/Contracts/Great Observatories/GOHeavySpaceTelescope.cfg b/GameData/RP-1/Contracts/Great Observatories/GOHeavySpaceTelescope.cfg
@@ -89,8 +89,8 @@ CONTRACT_TYPE
 				name = HasTelescopePayload
 				type = HasResource
 				resource = TelescopePayload
-				minQuantity = 10000 // 5200 kg mass difference between Compton and Hubble, 10000 units is 5000 kg
-				title = Craft must carry 10000 units of TelescopePayload.
+				minQuantity = 5000 // 5200 kg mass difference between Compton and Hubble
+				title = Craft must carry @minQuantity units of ResearchPayload as additional instrumentation.
 				hideChildren = true
 				disableOnStateChange = true
 			}

diff --git a/GameData/RP-1/Contracts/RP0_Contract_Resources.cfg b/GameData/RP-1/Contracts/RP0_Contract_Resources.cfg
@@ -15,23 +15,6 @@ RESOURCE_DEFINITION
 	}
 }
 
-RESOURCE_DEFINITION
-{
-	name = TelescopePayload
-	density = 0.0005 // placeholder
-	unitCost = 0.0 // placeholder
-	flowMode = NO_FLOW 
-	transfer = NONE
-	isTweakable = true
-	isVisible = true
-	volume = 1
-	RESOURCE_DRAIN_DEFINITION
-	{
-		isDrainable = false
-		showDrainFX = false
-	}
-}
-
 RESOURCE_DEFINITION
 {
 	name = ComSatPayload