Preliminary support for RealAntenna and support for Firespitter anima…

…tions for Improved TV Camera
pehvbot · Nov 26, 2021 · 76bf405 · 76bf405
1 parent 63da5d8
commit 76bf405
Show file tree

Hide file tree

Showing 14 changed files with 638 additions and 25 deletions.
diff --git a/GameData/LRTR/contracts/Early Satellites/Communications Satellite - Early.cfg b/GameData/LRTR/contracts/Early Satellites/Communications Satellite - Early.cfg
@@ -270,4 +270,13 @@ CONTRACT_TYPE:NEEDS[LRTRContracts]
 		antennaType = RELAY
 		title = Deploy a relay antenna of sufficiant power, such as an HG-5 High Gain Antenna
 	}
+}
+@CONTRACT_TYPE[EarlyComSat]:NEEDS[LRTRContracts,RealSolarSystem,RealAntennas]
+{
+	PARAMETER[HasAntenna]
+	{
+		%type = HasRealAntenna
+		%Gain = 18
+		!title = DEL
+	}
 }
diff --git a/GameData/LRTR/contracts/Early Satellites/Communications Test Satellite.cfg b/GameData/LRTR/contracts/Early Satellites/Communications Test Satellite.cfg
@@ -248,3 +248,13 @@ CONTRACT_TYPE:NEEDS[LRTRContracts]
 		title = Deploy a relay antenna of sufficiant power, such as an HG-5 High Gain Antenna
 	}
 }
+@CONTRACT_TYPE[ComTestSat]:NEEDS[LRTRContracts,RealSolarSystem,RealAntennas]
+{
+	PARAMETER[HasAntenna]
+	{
+		%type = HasRealAntenna
+		%Gain = 18
+		!title = DEL
+	}
+}
+
diff --git a/GameData/LRTR/contracts/Early Satellites/Early CommNet (3 Sat).cfg b/GameData/LRTR/contracts/Early Satellites/Early CommNet (3 Sat).cfg
@@ -242,4 +242,16 @@ CONTRACT_TYPE:NEEDS[LRTRContracts]
 			title = Deploy a relay antenna of sufficiant power, such as an HG-5 High Gain Antenna
 		}
 	}
-}
+}
+@CONTRACT_TYPE[EarlyComNetwork3]:NEEDS[LRTRContracts,RealSolarSystem,RealAntennas]
+{
+	@PARAMETER[CommSat*],*
+	{
+		PARAMETER[HasAntenna]
+		{
+			%type = HasRealAntenna
+			%Gain = 18
+			!title = DEL
+		}
+	}	
+}
diff --git a/GameData/LRTR/contracts/Early Satellites/Early CommNet (4 Sat).cfg b/GameData/LRTR/contracts/Early Satellites/Early CommNet (4 Sat).cfg
@@ -314,4 +314,16 @@ CONTRACT_TYPE:NEEDS[LRTRContracts]
 			title = Deploy a relay antenna of sufficiant power, such as an HG-5 High Gain Antenna
 		}
 	}
-}
+}
+@CONTRACT_TYPE[EarlyComNetwork4]:NEEDS[LRTRContracts,RealSolarSystem,RealAntennas]
+{
+	@PARAMETER[CommSat*],*
+	{
+		PARAMETER[HasAntenna]
+		{
+			%type = HasRealAntenna
+			%Gain = 18
+			!title = DEL
+		}
+	}	
+}
diff --git a/GameData/LRTR/contracts/Early Satellites/First Com Sat.cfg b/GameData/LRTR/contracts/Early Satellites/First Com Sat.cfg
@@ -139,4 +139,16 @@ CONTRACT_TYPE:NEEDS[LRTRContracts]
 			%minAntennaPower = 100000000
 		}
 	}
-}
+}
+@CONTRACT_TYPE[FirstComSat]:NEEDS[LRTRContracts,RealSolarSystem,RealAntennas]
+{
+	@PARAMETER[FirstComSat]
+	{
+		PARAMETER[HasAntenna]
+		{
+			%type = HasRealAntenna
+			%Gain = 18
+			!title = DEL
+		}
+	}	
+}
diff --git a/GameData/LRTR/contracts/Early Satellites/First Nav Sat.cfg b/GameData/LRTR/contracts/Early Satellites/First Nav Sat.cfg
@@ -117,7 +117,6 @@ CONTRACT_TYPE:NEEDS[LRTRContracts]
 	}
 }
 
-
 @CONTRACT_TYPE[FirstNavSat]:NEEDS[LRTRContracts,RealSolarSystem]
 {
 	@PARAMETER[FirstNavSat]
@@ -127,4 +126,16 @@ CONTRACT_TYPE:NEEDS[LRTRContracts]
 			%minAntennaPower = 100000000
 		}
 	}
-}
+}
+@CONTRACT_TYPE[FirstNavSat]:NEEDS[LRTRContracts,RealSolarSystem,RealAntennas]
+{
+	@PARAMETER[FirstNavSat]
+	{
+		PARAMETER[HasAntenna]
+		{
+			%type = HasRealAntenna
+			%Gain = 18
+			!title = DEL
+		}
+	}	
+}
diff --git a/GameData/LRTR/contracts/Early Satellites/Geostationary.cfg b/GameData/LRTR/contracts/Early Satellites/Geostationary.cfg
@@ -144,4 +144,16 @@ CONTRACT_TYPE:NEEDS[LRTRContracts]
 			title = Deploy a relay antenna of sufficiant power, such as an RA-2 Relay Antenna
 		}
 	}
+}
+@CONTRACT_TYPE[first_GEOUncrewed]:NEEDS[LRTRContracts,RealSolarSystem,RealAntennas]
+{
+	@PARAMETER[GeostationarySat]
+	{
+		PARAMETER[HasAntenna]
+		{
+			%type = HasRealAntenna
+			%Gain = 24
+			!title = DEL
+		}
+	}	
 }
diff --git a/GameData/LRTR/contracts/Early Satellites/Molniya Satellite.cfg b/GameData/LRTR/contracts/Early Satellites/Molniya Satellite.cfg
@@ -131,4 +131,17 @@ CONTRACT_TYPE:NEEDS[LRTRContracts]
 			title = Deploy a relay antenna of sufficiant power, such as an HG-5 High Gain Antenna
 		}
 	}
-}
+}
+@CONTRACT_TYPE[FirstMolniyaSat]:NEEDS[LRTRContracts,RealSolarSystem,RealAntennas]
+{
+	@PARAMETER[VesselGroup]
+	{
+		PARAMETER[HasAntenna]
+		{
+			%type = HasRealAntenna
+			%Gain = 24
+			!title = DEL
+		}
+	}	
+}
+
diff --git a/GameData/LRTR/contracts/Early Satellites/Tundra Satellite.cfg b/GameData/LRTR/contracts/Early Satellites/Tundra Satellite.cfg
@@ -133,3 +133,15 @@ CONTRACT_TYPE:NEEDS[LRTRContracts]
 		}
 	}
 }
+@CONTRACT_TYPE[FirstTundraSat]:NEEDS[LRTRContracts,RealSolarSystem,RealAntennas]
+{
+	@PARAMETER[VesselGroup]
+	{
+		PARAMETER[HasAntenna]
+		{
+			%type = HasRealAntenna
+			%Gain = 18
+			!title = DEL
+		}
+	}	
+}
diff --git a/GameData/LRTR/parts/Science/VI03-ImprovedTVCamera.cfg b/GameData/LRTR/parts/Science/VI03-ImprovedTVCamera.cfg
@@ -20,6 +20,7 @@ PART
 	module = Part
 	author = Akron, Pap
 
+	RSSROConfig = True
 
 	MODEL
 	{
@@ -56,30 +57,63 @@ PART
 	PhysicsSignificance = 1
 
 	tags = coatl ca science camera visible tv television imaging mariner mercury
-
-	//MODULE
-	//{
-	//	name = FSmeshSwitch
-	//	moduleID = 0
-	//	buttonName = Next variant
-	//	previousButtonName = Previous variant
-	//	objectDisplayNames = Angle Mount;Straight Mount
-	//	showPreviousButton = true
-	//	useFuelSwitchModule = false
-	//	objects = vorona_mount;straight_mount
-	//	updateSymmetry = true
-	//	//selectedObject = 0
-	//	affectColliders = true
-	//	showInfo = true
-	//	debugMode = false
-	//}
-
+
 	MODULE
 	{
 		name = ModuleCargoPart
 		packedVolume = 125
 	}
+}
+
+@PART[RO-ImprovedTVCamera]:NEEDS[Firespitter]:AFTER[LRTR]
+{
+	MODULE
+	{
+		name = FSmeshSwitch
+		moduleID = 0
+		buttonName = Next variant
+		previousButtonName = Previous variant
+		objectDisplayNames = Angle Mount;Straight Mount
+		showPreviousButton = true
+		useFuelSwitchModule = false
+		objects = vorona_mount;straight_mount
+		updateSymmetry = true
+		//selectedObject = 0
+		affectColliders = true
+		showInfo = true
+		debugMode = false
+	}
+}
+
+@PART[RO-ImprovedTVCamera]:NEEDS[!Kerbalism]:AFTER[LRTR]
+{
+	@description ^=:$: \n\nThe images can be transmitted for full science value. Level 3 Visible Imaging Experiment can gather 50% of Visible Imaging Science.
+}
+
+@PART[RO-ImprovedTVCamera]:NEEDS[SCANsat]:AFTER[LRTR]
+{
+	MODULE
+	{
+		name = SCANsat
+		sensorType = 12 //2^2 + 2^3
+		fov = 0.5
+		min_alt = 0
+		max_alt = 20000000
+		best_alt = 0
+		requireLight = True
+		scanName = Visual
+		RESOURCE
+		{
+			name	= ElectricCharge
+			rate	= 0.031
+		}
+	}
 
+	MODULE
+	{
+		name = SCANexperiment
+		experimentType	= SCANsatVisual
+	}
 }
 
 

diff --git a/GameData/LRTR/plugins/CC_LRTR.dll b/GameData/LRTR/plugins/CC_LRTR.dll
diff --git a/GameData/LRTR/settings/breakingGround/features.cfg b/GameData/LRTR/settings/breakingGround/features.cfg
@@ -62,7 +62,6 @@
 		Biome = Highlands
 		Biome = Midlands
 	}
-
 }
 @ROC_DEFINITION:HAS[#Type[BopGravelPile]]:NEEDS[LRTRBreakingGround]
 {

diff --git a/GameData/LRTR/support/modularlaunchpads.cfg b/GameData/LRTR/support/modularlaunchpads.cfg
@@ -0,0 +1,7 @@
+@TRAININGTIMES
+{
+	AM-MLP-GeneralCrewArm = Passenger
+	AM-MLP-GeneralCrewArmSmallMount = Passenger
+	AM-MLP-SoyuzLaunchBaseElevator = Passenger
+	AM-MLP-SoyuzLaunchBaseGantry = Passenger
+}
-Original file line number
+Diff line change
@@ Expand Up / @@ -62,7 +62,6 @@ @@
     		Biome = Highlands
     		Biome = Midlands
     	}
     }
     @ROC_DEFINITION:HAS[#Type[BopGravelPile]]:NEEDS[LRTRBreakingGround]
     {
@@ Expand Down @@