Merge pull request #1 from SuicidalInsanity/master

Intake fixes
net-lisias-ksp · Jul 3, 2022 · 27df73e · 27df73e
2 parents 26dff6b + d4ba068
commit 27df73e
Show file tree

Hide file tree

Showing 18 changed files with 149 additions and 85 deletions.
diff --git a/GameData/AirplanePlus/Compatibility/FAR.cfg b/GameData/AirplanePlus/Compatibility/FAR.cfg
@@ -387,39 +387,39 @@
 }
 
 //remove lifting values for some non wing parts like cockpits
-@PART[144cockpit]:FOR[FerramAerospaceResearch]
+@PART[144cockpit]:NEEDS[FerramAerospaceResearch]
 {
 	!MODULE[ModuleLiftingSurface] { }
 }
 
-@PART[falconcockpit]:FOR[FerramAerospaceResearch]
+@PART[falconcockpit]:NEEDS[FerramAerospaceResearch]
 {
 	!MODULE[ModuleLiftingSurface] { }
 }
 
-@PART[mk2hAdapter]:FOR[FerramAerospaceResearch]
+@PART[mk2hAdapter]:NEEDS[FerramAerospaceResearch]
 {
 	!MODULE[ModuleLiftingSurface] { }
 }
 
-@PART[mk2hLiquid]:FOR[FerramAerospaceResearch]
+@PART[mk2hLiquid]:NEEDS[FerramAerospaceResearch]
 {
 	!MODULE[ModuleLiftingSurface] { }
 }
 
-@PART[mk2hboom]:FOR[FerramAerospaceResearch]
+@PART[mk2hboom]:NEEDS[FerramAerospaceResearch]
 {
 	!MODULE[ModuleLiftingSurface] { }
 }
 
-@PART[mk2mk2h]:FOR[FerramAerospaceResearch]
+@PART[mk2mk2h]:NEEDS[FerramAerospaceResearch]
 {
 	!MODULE[ModuleLiftingSurface] { }
 }
 
 // add FAR wing configurations
 
-@PART[hanglel]:FOR[FerramAerospaceResearch]
+@PART[hanglel]:NEEDS[FerramAerospaceResearch]
 {
 	@module = Part
 	@maximum_drag = 0
@@ -439,7 +439,7 @@
 	}
 }
 
-@PART[hangles]:FOR[FerramAerospaceResearch]
+@PART[hangles]:NEEDS[FerramAerospaceResearch]
 {
 	@module = Part
 	@maximum_drag = 0
@@ -459,7 +459,7 @@
 	}
 }
 
-@PART[vanglel]:FOR[FerramAerospaceResearch]
+@PART[vanglel]:NEEDS[FerramAerospaceResearch]
 {
 	@module = Part
 	@maximum_drag = 0
@@ -479,7 +479,7 @@
 	}
 }
 
-@PART[vangles]:FOR[FerramAerospaceResearch]
+@PART[vangles]:NEEDS[FerramAerospaceResearch]
 {
 	@module = Part
 	@maximum_drag = 0
@@ -499,7 +499,7 @@
 	}
 }
 
-@PART[bigwing]:FOR[FerramAerospaceResearch]
+@PART[bigwing]:NEEDS[FerramAerospaceResearch]
 {
 	@module = Part
 	@maximum_drag = 0
@@ -519,7 +519,7 @@
 	}
 }
 
-@PART[hlfSrf]:FOR[FerramAerospaceResearch]
+@PART[hlfSrf]:NEEDS[FerramAerospaceResearch]
 {
 	@module = Part
 	@maximum_drag = 0
@@ -545,7 +545,7 @@
 	}
 }
 
-@PART[fatwing0]:FOR[FerramAerospaceResearch]
+@PART[fatwing0]:NEEDS[FerramAerospaceResearch]
 {
 	@module = Part
 	@maximum_drag = 0
@@ -565,7 +565,7 @@
 	}
 }
 
-@PART[fatwing1]:FOR[FerramAerospaceResearch]
+@PART[fatwing1]:NEEDS[FerramAerospaceResearch]
 {
 	@module = Part
 	@maximum_drag = 0
@@ -585,7 +585,7 @@
 	}
 }
 
-@PART[fatwing2]:FOR[FerramAerospaceResearch]
+@PART[fatwing2]:NEEDS[FerramAerospaceResearch]
 {
 	@module = Part
 	@maximum_drag = 0
@@ -605,7 +605,7 @@
 	}
 }
 
-@PART[fatwing3]:FOR[FerramAerospaceResearch]
+@PART[fatwing3]:NEEDS[FerramAerospaceResearch]
 {
 	@module = Part
 	@maximum_drag = 0
@@ -625,7 +625,7 @@
 	}
 }
 
-@PART[fatwing4]:FOR[FerramAerospaceResearch]
+@PART[fatwing4]:NEEDS[FerramAerospaceResearch]
 {
 	@module = Part
 	@maximum_drag = 0
@@ -645,7 +645,7 @@
 	}
 }
 
-@PART[fatwing5]:FOR[FerramAerospaceResearch]
+@PART[fatwing5]:NEEDS[FerramAerospaceResearch]
 {
 	@module = Part
 	@maximum_drag = 0
@@ -665,7 +665,7 @@
 	}
 }
 
-@PART[fatwing6]:FOR[FerramAerospaceResearch]
+@PART[fatwing6]:NEEDS[FerramAerospaceResearch]
 {
 	@module = Part
 	@maximum_drag = 0
@@ -685,7 +685,7 @@
 	}
 }
 
-@PART[migfin]:FOR[FerramAerospaceResearch]
+@PART[migfin]:NEEDS[FerramAerospaceResearch]
 {
 	@module = Part
 	@maximum_drag = 0
@@ -707,7 +707,7 @@
 	}
 }
 
-@PART[warhawkfin]:FOR[FerramAerospaceResearch]
+@PART[warhawkfin]:NEEDS[FerramAerospaceResearch]
 {
 	@module = Part
 	@maximum_drag = 0
@@ -732,7 +732,7 @@
 
 
 // FAR supports only one controllable surface we have to combine both slats together
-@PART[doublefowlerflap]:FOR[FerramAerospaceResearch]
+@PART[doublefowlerflap]:NEEDS[FerramAerospaceResearch]
 {
 	@module = Part
 	@maximum_drag = 0
@@ -757,7 +757,7 @@
 	}
 }
 
-@PART[fowlerflap]:FOR[FerramAerospaceResearch]
+@PART[fowlerflap]:NEEDS[FerramAerospaceResearch]
 {
 	@module = Part
 	@maximum_drag = 0
@@ -781,7 +781,7 @@
 	}
 }
 
-@PART[kruegerflap]:FOR[FerramAerospaceResearch]
+@PART[kruegerflap]:NEEDS[FerramAerospaceResearch]
 {
 	@module = Part
 	@maximum_drag = 0
@@ -805,7 +805,7 @@
 	}
 }
 
-@PART[spoilerflap]:FOR[FerramAerospaceResearch]
+@PART[spoilerflap]:NEEDS[FerramAerospaceResearch]
 {
 	@module = Part
 	@maximum_drag = 0
@@ -829,7 +829,7 @@
 	}
 }
 
-@PART[straightslat]:FOR[FerramAerospaceResearch]
+@PART[straightslat]:NEEDS[FerramAerospaceResearch]
 {
 	@module = Part
 	@maximum_drag = 0
@@ -853,7 +853,7 @@
 	}
 }
 
-@PART[roundwinglet]:FOR[FerramAerospaceResearch]
+@PART[roundwinglet]:NEEDS[FerramAerospaceResearch]
 {
 	@module = Part
 	@maximum_drag = 0
@@ -876,7 +876,7 @@
 	}
 }
 
-@PART[elevon2b]:FOR[FerramAerospaceResearch]
+@PART[elevon2b]:NEEDS[FerramAerospaceResearch]
 {
 	@module = Part
 	@maximum_drag = 0
@@ -902,7 +902,7 @@
 	}
 }
 
-@PART[smallwingConnector1]:FOR[FerramAerospaceResearch]
+@PART[smallwingConnector1]:NEEDS[FerramAerospaceResearch]
 {
 	@module = Part
 	@maximum_drag = 0
@@ -921,7 +921,7 @@
 	}
 }
 
-@PART[smallwingConnector2]:FOR[FerramAerospaceResearch]
+@PART[smallwingConnector2]:NEEDS[FerramAerospaceResearch]
 {
 	@module = Part
 	@maximum_drag = 0
@@ -941,7 +941,7 @@
 	}
 }
 
-@PART[smallwingConnector3]:FOR[FerramAerospaceResearch]
+@PART[smallwingConnector3]:NEEDS[FerramAerospaceResearch]
 {
 	@module = Part
 	@maximum_drag = 0
@@ -960,7 +960,7 @@
 	}
 }
 
-@PART[smallwingConnector4]:FOR[FerramAerospaceResearch]
+@PART[smallwingConnector4]:NEEDS[FerramAerospaceResearch]
 {
 	@module = Part
 	@maximum_drag = 0
@@ -979,7 +979,7 @@
 	}
 }
 
-@PART[smallwingConnector5]:FOR[FerramAerospaceResearch]
+@PART[smallwingConnector5]:NEEDS[FerramAerospaceResearch]
 {
 	@module = Part
 	@maximum_drag = 0
@@ -998,7 +998,7 @@
 	}
 }
 
-@PART[smallwingConnector6]:FOR[FerramAerospaceResearch]
+@PART[smallwingConnector6]:NEEDS[FerramAerospaceResearch]
 {
 	@module = Part
 	@maximum_drag = 0
@@ -1017,7 +1017,7 @@
 	}
 }
 
-@PART[smallwingConnectortip]:FOR[FerramAerospaceResearch]
+@PART[smallwingConnectortip]:NEEDS[FerramAerospaceResearch]
 {
 	@module = Part
 	@maximum_drag = 0

diff --git a/GameData/AirplanePlus/Plus/Aero/mk0ramp/IntakesEmis.png b/GameData/AirplanePlus/Plus/Aero/mk0ramp/IntakesEmis.png
diff --git a/GameData/AirplanePlus/Plus/Aero/mk0ramp/IntakesUV.png b/GameData/AirplanePlus/Plus/Aero/mk0ramp/IntakesUV.png
diff --git a/GameData/AirplanePlus/Plus/Aero/mk0ramp/intakes_master.tga b/GameData/AirplanePlus/Plus/Aero/mk0ramp/intakes_master.tga
diff --git a/GameData/AirplanePlus/Plus/Aero/mk0ramp/model.mu b/GameData/AirplanePlus/Plus/Aero/mk0ramp/model.mu
diff --git a/GameData/AirplanePlus/Plus/Aero/mk0ramp/part.cfg b/GameData/AirplanePlus/Plus/Aero/mk0ramp/part.cfg
@@ -15,13 +15,13 @@ PART
 
 	title = Mk0 Ramp Intake
 	manufacturer = Kerbal Standard
-	description = Beta Parts!!! Mass and Intake Air will be changed
+	description = A large radial intake modified to double as a nacelle for size0 engines. Optimized for supersonic flight.
 
 	attachRules = 1,1,1,1,1
 	stackSymmetry = 2
-	node_stack_bottom = 0.0, -0.4, -1.55, 0.0, 0.0, -90.0
-
-	mass = 0.15
+	node_stack_bottom = 0.3125, -1.2891, 0.0, 0.0, -1.0, 0.0
+	node_attach = 0.0, 0.0, 0.0, -1.0, 0, 0.0, 1
+	mass = 0.05
 	thermalMassModifier = 8.0
 	// heatConductivity = 0.06 // half default
 	emissiveConstant = 0.55
@@ -42,15 +42,16 @@ PART
 		name = ModuleResourceIntake
 		resourceName = IntakeAir
 		checkForOxygen = true
-		area = 0.05
-		intakeSpeed = 15
+		area = 0.004
+		intakeSpeed = 10
 		intakeTransformName = intakeTransform
 		machCurve
 		{
+			key = 0 0.85 0 0
 			key = 1 1 0 0
-			key = 1.5 0.9 -0.4312553 -0.4312553
-			key = 2.5 0.45 -0.5275364 -0.5275364
-			key = 3.5 0.1 0 0
+			key = 2 0.95 -0.08751557 -0.08751557
+			key = 4 0.5 -0.4034287 -0.4034287
+			key = 8 0.01 0 0
 		}
 	}
 	RESOURCE
@@ -59,9 +60,15 @@ PART
 		amount = 2
 		maxAmount = 2
 	}
-//	MODULE
-//	{
-//		name = ModuleAnimateHeat
-//		ThermalAnim = 
-//	}
+	MODULE
+	{
+		name = ModuleCargoPart
+		packedVolume = 2500
+	}
+
+	MODULE
+	{
+		name = ModuleAnimateHeat
+		ThermalAnim = radialHeat
+	}
 }
diff --git a/GameData/AirplanePlus/Plus/Aero/mk3s1scoop/part.cfg b/GameData/AirplanePlus/Plus/Aero/mk3s1scoop/part.cfg
@@ -17,10 +17,11 @@ PART
 	manufacturer = Kerbal Standard
 	description = Beta Parts!!! Mass and Intake Air will be changed
 
+	node_attach = 0.0, 0.0, 0.0, 0.0, 1.0, 0.0
 	attachRules = 1,1,1,1,1
 	stackSymmetry = 2
 
-	mass = 0.07
+	mass = 0.02
 	thermalMassModifier = 8.0
 	// heatConductivity = 0.06 // half default
 	emissiveConstant = 0.55
@@ -41,7 +42,7 @@ PART
 		name = ModuleResourceIntake
 		resourceName = IntakeAir
 		checkForOxygen = true
-		area = 0.05
+		area = 0.002
 		intakeSpeed = 15
 		intakeTransformName = intakeTransform
 		machCurve
@@ -55,9 +56,15 @@ PART
 	RESOURCE
 	{
 		name = IntakeAir
-		amount = 2
-		maxAmount = 2
+		amount = 1
+		maxAmount = 1
 	}
+	MODULE
+	{
+		name = ModuleCargoPart
+		packedVolume = 1000
+	}
+
 //	MODULE
 //	{
 //		name = ModuleAnimateHeat

diff --git a/GameData/AirplanePlus/Plus/Aero/shorterramp/IntakesEmis.dds b/GameData/AirplanePlus/Plus/Aero/shorterramp/IntakesEmis.dds
diff --git a/GameData/AirplanePlus/Plus/Aero/shorterramp/IntakesUV.dds b/GameData/AirplanePlus/Plus/Aero/shorterramp/IntakesUV.dds
diff --git a/GameData/AirplanePlus/Plus/Aero/shorterramp/intakes_master.tga b/GameData/AirplanePlus/Plus/Aero/shorterramp/intakes_master.tga
diff --git a/GameData/AirplanePlus/Plus/Aero/shorterramp/model.mu b/GameData/AirplanePlus/Plus/Aero/shorterramp/model.mu