Update Contracts for bug fixes and make comms contracts hardware inde…

…pendent
pehvbot · Nov 8, 2021 · 48dc302 · 48dc302
1 parent ef9108d
commit 48dc302
Show file tree

Hide file tree

Showing 62 changed files with 3,000 additions and 1,492 deletions.
diff --git a/GameData/LRTR/KCT/presets/LRTR_25.cfg b/GameData/LRTR/KCT/presets/LRTR_25.cfg
@@ -41,7 +41,7 @@ KCT_Preset
 		ResearchFormula = -1
 		EffectivePartFormula = [PV]*[RV]*[MV]*[C]
 		ProceduralPartFormula = [PV]*[RV]*[MV]*[C]
-		BPFormula = 1/3*(400000 + ((([E]*0.5)^0.85)*2250))
+		BPFormula = 1/4*(400000 + (([E]^0.85)*2250))
 		KSCUpgradeFormula = ((([C]*0.2)^(0.75))*5000*([Adm]+[AC]+[MC]+[RD]+[RW]+[TS]+[SPH]+[VAB]))+(max((((([C]+100000)*0.2)^0.85)*4500-23000000), 750000)*[LP])
 		ReconditioningFormula = 0.5*(abs([RE]-[S])*(([BP]*3-400000) * (0.7 + (([SN]^0.5)*0.05) + (([SP]^0.5)*0.05)) * (([L]+4)^2) * 0.00012)*50)
 		BuildRateFormula = 2.1*(1+([L]*0.25))*(([I]+1)*max(([N]-1), 0)*0.015 + max(0.0001, min(0.1*[N], 0.1)))*sign([L]-[I])

diff --git a/GameData/LRTR/KCT/presets/LRTR_RSS.cfg b/GameData/LRTR/KCT/presets/LRTR_RSS.cfg
@@ -46,7 +46,7 @@ KCT_Preset
 		ResearchFormula = -1
 		EffectivePartFormula = [PV]*[RV]*[MV]*[C]
 		ProceduralPartFormula = [PV]*[RV]*[MV]*[C]
-		BPFormula = 1/3*(400000 + ((([E]*0.5)^0.85)*2250))
+		BPFormula = 1/4*(400000 + (([E]^0.85)*2250))
 		KSCUpgradeFormula = ((([C]*0.2)^(0.75))*5000*([Adm]+[AC]+[MC]+[RD]+[RW]+[TS]+[SPH]+[VAB]))+(max((((([C]+100000)*0.2)^0.85)*4500-23000000), 750000)*[LP])
 		ReconditioningFormula = 0.5*(abs([RE]-[S])*(([BP]*3-400000) * (0.7 + (([SN]^0.5)*0.05) + (([SP]^0.5)*0.05)) * (([L]+4)^2) * 0.00012)*50)
 		BuildRateFormula = (1+([L]*0.25))*(([I]+1)*max(([N]-1), 0)*0.015 + max(0.0001, min(0.1*[N], 0.1)))*sign([L]-[I])

diff --git a/GameData/LRTR/KCT/presets/LRTR_STOCK.cfg b/GameData/LRTR/KCT/presets/LRTR_STOCK.cfg
@@ -46,7 +46,7 @@ KCT_Preset
 		ResearchFormula = -1
 		EffectivePartFormula = [PV]*[RV]*[MV]*[C]
 		ProceduralPartFormula = [PV]*[RV]*[MV]*[C]
-		BPFormula = 1/3*(400000 + ((([E]*0.5)^0.85)*2250))
+		BPFormula = 1/4*(400000 + (([E]^0.85)*2250))
 		KSCUpgradeFormula = ((([C]*0.2)^(0.75))*5000*([Adm]+[AC]+[MC]+[RD]+[RW]+[TS]+[SPH]+[VAB]))+(max((((([C]+100000)*0.2)^0.85)*4500-23000000), 750000)*[LP])
 		ReconditioningFormula = 0.5*(abs([RE]-[S])*(([BP]*3-400000) * (0.7 + (([SN]^0.5)*0.05) + (([SP]^0.5)*0.05)) * (([L]+4)^2) * 0.00012)*50)
 		BuildRateFormula = 3.4*(1+([L]*0.25))*(([I]+1)*max(([N]-1), 0)*0.015 + max(0.0001, min(0.1*[N], 0.1)))*sign([L]-[I])

diff --git a/GameData/LRTR/config.cfg b/GameData/LRTR/config.cfg
@@ -3,8 +3,10 @@
 // there are dependencies between features.  I've tried to clean them up but use at your own risk.
 //
 // it uses the directory name NOT the mod name.  This is to force these changes before ModuleManager patches.
+// you can add 'enabledBy = <mod directory name>' to any of these features to enable them based on your install
 // you can add 'disabledBy = <mod directory name>' to any of these features to disabled them based on your install
-// you can also add 'disabledBy = !<mod directory name>' to disable a feature without the needed mod
+// you can also add 'disabledBy = !<mod directory name>' to disable a feature without the needed mod (does not work with enabledBy)
+// disabledBy superseeds enabledBy
 //
 LRTRCONFIG
 {	
@@ -23,8 +25,9 @@ LRTRCONFIG
 	}
 	Rescale
 	{
-	    enabled = true
-	    disabledBy = !RealSolarSystem
+	    enabled = false
+	    enabledBy = RealSolarSystem
+	    disabledBy = SMURFF
 	}
 	CustomBarnKit
 	{
@@ -36,17 +39,17 @@ LRTRCONFIG
 	}
 	BreakingGround
 	{
-		enabled = false //work in progress, leave disabled.
+		enabled = true //work in progress, leave disabled.
 	}
 	BGRobotics
 	{
 		//Rescaled Breaking Ground robotic parts have a serious bug when using symmetry mode on 1.9.1 or less
 		//Recommend leaving disabled on older versions so robotic parts are not rescaled.
-		enabled = true   
+		enabled = false   
 	}
 	SimpleISRU
 	{
-		//reverts resources to just Ore for stock game, ore, water, and oxygen for LRTRKerbalism
-		enabled = true
+		//reverts resources to just Ore for stock game, ore, water, and oxygen for LRTRKerbalism Simple config
+		enabled = false
 	}
 }
diff --git a/GameData/LRTR/contracts/Advanced Satellites/GEO Communications Satellites.cfg b/GameData/LRTR/contracts/Advanced Satellites/GEO Communications Satellites.cfg
@@ -180,14 +180,6 @@ CONTRACT_TYPE:NEEDS[LRTRContracts]
 			hideChildren = true
 		}
 		PARAMETER
-		{
-			name = HasComSatPayload
-			type = PartValidation
-			part = RelayAntenna50
-			title = Have an RA-15 Relay Antenna.
-			hideChildren = true
-		}
-		PARAMETER
 		{
 			name = ReachSpecificOrbit
 			type = ReachSpecificOrbit
@@ -234,3 +226,32 @@ CONTRACT_TYPE:NEEDS[LRTRContracts]
 		}
 	}
 }
+
+@CONTRACT_TYPE[GEORepeatComSats]:NEEDS[LRTRContracts,!RealSolarSystem]
+{
+	@PARAMETER[AdvComSat]
+	{
+		PARAMETER
+		{
+			name = HasAntenna
+			type = HasAntenna
+			minAntennaPower = 15000000000
+			antennaType = RELAY
+			title = Have a relay antenna of sufficiant power, such as an RA-15 Relay Antenna
+		}
+	}
+}
+@CONTRACT_TYPE[GEORepeatComSats]:NEEDS[LRTRContracts,RealSolarSystem]
+{
+	@PARAMETER[AdvComSat]
+	{
+		PARAMETER
+		{
+			name = HasAntenna
+			type = HasAntenna
+			minAntennaPower = 300000000000
+			antennaType = RELAY
+			title = Have a relay antenna of sufficiant power, such as an RA-15 Relay Antenna
+		}
+	}
+}
diff --git a/GameData/LRTR/contracts/Advanced Satellites/Geostationary Communications Network.cfg b/GameData/LRTR/contracts/Advanced Satellites/Geostationary Communications Network.cfg
@@ -116,14 +116,6 @@ CONTRACT_TYPE:NEEDS[LRTRContracts]
 
             vessel = GEO CommSat IV
         }
-		PARAMETER
-		{
-			name = HasComSatPayload
-			type = PartValidation
-			part = RelayAntenna5
-			title = Have an RA-2 Relay Antenna.
-			hideChildren = true
-		}
 		PARAMETER
 		{
 			name = ReachSpecificOrbit
@@ -183,14 +175,6 @@ CONTRACT_TYPE:NEEDS[LRTRContracts]
             name = KSCConnectivity
             type = KSCConnectivity
         }
-		PARAMETER
-		{
-			name = HasComSatPayload
-			type = PartValidation
-			part = RelayAntenna5
-			title = Have an RA-2 Relay Antenna.
-			hideChildren = true
-		}
 		PARAMETER
 		{
 			name = ReachSpecificOrbit
@@ -250,14 +234,6 @@ CONTRACT_TYPE:NEEDS[LRTRContracts]
             name = KSCConnectivity
             type = KSCConnectivity
         }
-		PARAMETER
-		{
-			name = HasComSatPayload
-			type = PartValidation
-			part = RelayAntenna5
-			title = Have an RA-2 Relay Antenna.
-			hideChildren = true
-		}
 		PARAMETER
 		{
 			name = ReachSpecificOrbit
@@ -317,14 +293,6 @@ CONTRACT_TYPE:NEEDS[LRTRContracts]
             name = KSCConnectivity
             type = KSCConnectivity
         }
-		PARAMETER
-		{
-			name = HasComSatPayload
-			type = PartValidation
-			part = RelayAntenna5
-			title = Have an RA-2 Relay Antenna.
-			hideChildren = true
-		}
 		PARAMETER
 		{
 			name = ReachSpecificOrbit
@@ -367,3 +335,33 @@ CONTRACT_TYPE:NEEDS[LRTRContracts]
         coverage = 0.8
     }
 }
+
+@CONTRACT_TYPE[GeoComSatNetwork]:NEEDS[LRTRContracts,!RealSolarSystem]
+{
+	@PARAMETER[GEOCommSat*],*
+	{
+		PARAMETER
+		{
+			name = HasAntenna
+			type = HasAntenna
+			minAntennaPower = 2000000000
+			antennaType = RELAY
+			title = Have a relay antenna of sufficiant power, such as an RA-2 Relay Antenna
+		}
+	}
+}
+@CONTRACT_TYPE[GeoComSatNetwork]:NEEDS[LRTRContracts,RealSolarSystem]
+{
+	@PARAMETER[GEOCommSat*],*
+	{
+		PARAMETER
+		{
+			name = HasAntenna
+			type = HasAntenna
+			minAntennaPower = 40000000000
+			antennaType = RELAY
+			title = Have a relay antenna of sufficiant power, such as an RA-2 Relay Antenna
+		}
+	}
+}
+
diff --git a/GameData/LRTR/contracts/Advanced Satellites/Molniya Communications Satellites.cfg b/GameData/LRTR/contracts/Advanced Satellites/Molniya Communications Satellites.cfg
@@ -54,12 +54,6 @@ CONTRACT_TYPE:NEEDS[LRTRContracts]
 		title = Complete 'Commercial Communications Satellite (Early)' contract at least @minCount times
 	}
 
-    REQUIREMENT
-    {
-        name = PartUnlocked
-        type = PartUnlocked
-        part = RelayAntenna5
-    }
 	REQUIREMENT
 	{
 		name = AcceptContract
@@ -186,14 +180,6 @@ CONTRACT_TYPE:NEEDS[LRTRContracts]
 			hideChildren = true
 		}
 		PARAMETER
-		{
-			name = HasComSatPayload
-			type = PartValidation
-			part = RelayAntenna5
-			title = Have an RA-2 Relay Antenna.
-			hideChildren = true
-		}
-		PARAMETER
 		{
 			name = ReachSpecificOrbit
 			type = ReachSpecificOrbit
@@ -240,3 +226,32 @@ CONTRACT_TYPE:NEEDS[LRTRContracts]
 		}
 	}
 }
+
+@CONTRACT_TYPE[MolniyaRepeatComSats]:NEEDS[LRTRContracts,!RealSolarSystem]
+{
+	@PARAMETER[AdvComSat]
+	{
+		PARAMETER
+		{
+			name = HasAntenna
+			type = HasAntenna
+			minAntennaPower = 2000000000
+			antennaType = RELAY
+			title = Have a relay antenna of sufficiant power, such as an RA-2 Relay Antenna
+		}
+	}
+}
+@CONTRACT_TYPE[MolniyaRepeatComSats]:NEEDS[LRTRContracts,RealSolarSystem]
+{
+	@PARAMETER[AdvComSat]
+	{
+		PARAMETER
+		{
+			name = HasAntenna
+			type = HasAntenna
+			minAntennaPower = 40000000000
+			antennaType = RELAY
+			title = Have a relay antenna of sufficiant power, such as an RA-2 Relay Antenna
+		}
+	}
+}
diff --git a/GameData/LRTR/contracts/Advanced Satellites/Tundra Communications Satellites.cfg b/GameData/LRTR/contracts/Advanced Satellites/Tundra Communications Satellites.cfg
@@ -45,12 +45,6 @@ CONTRACT_TYPE:NEEDS[LRTRContracts]
 		type = CompleteContract
 		contractType = FirstTundraSat
 	}
-    REQUIREMENT
-    {
-        name = PartUnlocked
-        type = PartUnlocked
-        part = RelayAntenna5
-    }
 	REQUIREMENT
 	{
 		name = CompleteContract
@@ -186,14 +180,6 @@ CONTRACT_TYPE:NEEDS[LRTRContracts]
 			hideChildren = true
 		}
 		PARAMETER
-		{
-			name = HasComSatPayload
-			type = PartValidation
-			part = RelayAntenna5
-			title = Have an RA-2 Relay Antenna.
-			hideChildren = true
-		}
-		PARAMETER
 		{
 			name = ReachSpecificOrbit
 			type = ReachSpecificOrbit
@@ -240,3 +226,32 @@ CONTRACT_TYPE:NEEDS[LRTRContracts]
 		}
 	}
 }
+
+@CONTRACT_TYPE[TundraRepeatComSats]:NEEDS[LRTRContracts,!RealSolarSystem]
+{
+	@PARAMETER[AdvComSat]
+	{
+		PARAMETER
+		{
+			name = HasAntenna
+			type = HasAntenna
+			minAntennaPower = 2000000000
+			antennaType = RELAY
+			title = Have a relay antenna of sufficiant power, such as an RA-2 Relay Antenna
+		}
+	}
+}
+@CONTRACT_TYPE[TundraRepeatComSats]:NEEDS[LRTRContracts,RealSolarSystem]
+{
+	@PARAMETER[AdvComSat]
+	{
+		PARAMETER
+		{
+			name = HasAntenna
+			type = HasAntenna
+			minAntennaPower = 40000000000
+			antennaType = RELAY
+			title = Have a relay antenna of sufficiant power, such as an RA-2 Relay Antenna
+		}
+	}
+}
diff --git a/GameData/LRTR/contracts/Early Satellites/Atmosphere Analysis.cfg b/GameData/LRTR/contracts/Early Satellites/Atmosphere Analysis.cfg
@@ -79,17 +79,6 @@ CONTRACT_TYPE:NEEDS[LRTRContracts]
 			minApA = Round(Random( Round(HomeWorld().AtmosphereAltitude() * 3, 50000), Round(HomeWorld().AtmosphereAltitude() * 3.5, 50000)), 1000)
 			disableOnStateChange = true
 			title = Reach orbit within the parameters
-		}
-		PARAMETER
-		{
-			name = CollectScience
-			type = CollectScience
-			situation = InSpaceLow
-			experiment = barometerScan
-			experiment = temperatureScan
-			recoveryMethod = RecoverOrTransmit
-			title = Run a Temperature Scan and Barometer Scan and return the science to the KSC
-
 			PARAMETER
 			{
 				name = Duration
@@ -102,5 +91,16 @@ CONTRACT_TYPE:NEEDS[LRTRContracts]
 				completionText = Stable Orbit: Confirmed
 			}
 		}
+		PARAMETER
+		{
+			name = CollectScience
+			type = CollectScience
+			situation = InSpaceLow
+			experiment = barometerScan
+			experiment = temperatureScan
+			recoveryMethod = RecoverOrTransmit
+			title = Run a Temperature Scan and Barometer Scan and return the science to the KSC
+
+		}
 	}
 }