Mk2Expansion .17.35

Patch and part fixes/reworks

Mk2Expansion/Changelog.txt

@@ -1,3 +1,16 @@
+1.7.35
+====================================================
+-Fixes Vector turbojet attach node
+-fixes shrouded solar panel MaxTemp
+-Fixes NUK-3 reactor cooling issue
+-Max level engineers no longer required for full reactor output, bur engineers will provide slight boost to reactor efficiency
+-Added USI compatibility MM patches courtesy of Merkov
+-Fixes MM patch conflict with GTindustries
+-Fixes NFE issue with the Pluto NTR
+-New Part: mk2 Structural tube
+-New custom DragCubes for a few parts, should fix drag issues
+-ModelRework: R-71 cockpit, adds second seat, new IVA
+
 1.7.26
 =====================================================
 -New Part: Shrouded Thermal Control System

Mk2Expansion/GameData/Mk2Expansion/Parts/Aero/Chines/End.cfg

@@ -4,16 +4,16 @@ PART
 	module = Part
 	author = SuicidalInsanity
 	rescaleFactor = 1
-	node_attach = 0.0, 0.0, 0.0, 0.0, 0.0, 1.0, 1
-	node_stack_bottom = 0.0, -0.8343672, 0.2338864, 0.0, -1.0, 0.0, 0
+	node_attach = 0.0, 0.0, 0.0, -1.0, 0.0, 0.0, 1
+	node_stack_bottom = 0.2338864, -0.8343672, 0.0, 0.0, -1.0, 0.0, 0
 	TechRequired = advAerodynamics
 	entryCost = 4800
 	cost = 200
 	category = Aero
 	subcategory = 0
 	title = Chine Cap
 	manufacturer = Insanity Aerospace
-	description = Chine cap for better supersonic performance and to make planes look razor sleek!
+	description = Chine cap for better supersonic performance and to make planes look razor sleek! Use Radial Symmetry for symmetry when using stack nodes.
 	attachRules = 1,1,1,1,0
 	mass = 0.02
 	thermalMassModifier = 8.0 // the dang things are light, so 3200 kJ/tonne-K

Mk2Expansion/GameData/Mk2Expansion/Parts/Aero/Chines/Long.cfg

@@ -4,17 +4,17 @@ PART
 	module = Part
 	author = SuicidalInsanity
 	rescaleFactor = 1
-	node_attach = 0.0, 0.0, 0.0, 0.0, 0.0, 1.0, 1
-	node_stack_bottom = 0.0, -1.872135, 0.2338864, 0.0, -1.0, 0.0, 0
-	node_stack_top = 0.0, 1.872135, 0.2338864, 0.0, 1.0, 0.0, 0
+	node_attach = 0.0, 0.0, 0.0, -1.0, 0.0, 0.0, 1
+	node_stack_bottom = 0.2338864, -1.872135, 0.0, 0.0, -1.0, 0.0, 0
+	node_stack_top = 0.2338864, 1.872135, 0.0, 0.0, 1.0, 0.0, 0
 	TechRequired = advAerodynamics
 	entryCost = 4800
 	cost = 300
 	category = Aero
 	subcategory = 0
 	title = Chine long
 	manufacturer = Insanity Aerospace
-	description = Chine edge for better supersonic performance and to make planes look razor sleek!
+	description = Chine edge for better supersonic performance and to make planes look razor sleek! Use Radial Symmetry for symmetry when using stack nodes.
 	attachRules = 1,1,1,1,0
 	mass = 0.04
 	thermalMassModifier = 8.0 

Mk2Expansion/GameData/Mk2Expansion/Parts/Aero/Chines/RLong.cfg

@@ -4,9 +4,9 @@ PART
 	module = Part
 	author = SuicidalInsanity
 	rescaleFactor = 1
-	node_attach = 0.0, 0.0, 0.0, 0.0, 0.0, 1.0, 2
-	node_stack_bottom = 0.0, -1.872135, 0.2338864, 0.0, -1.0, 0.0, 0
-	node_stack_top = 0.0, 1.872135, 0.2338864, 0.0, 1.0, 0.0, 0
+	node_attach = 0.0, 0.0, 0.0, -1.0, 0.0, 0.0, 2
+	node_stack_bottom = 0.2338864, -1.872135, 0.0, 0.0, -1.0, 0.0, 0
+	node_stack_top = 0.2338864, 1.872135, 0.0, 0.0, 1.0, 0.0, 0
 	TechRequired = advAerodynamics
 	entryCost = 4800
 	cost = 200

Mk2Expansion/GameData/Mk2Expansion/Parts/Aero/Chines/RShort.cfg

@@ -4,9 +4,9 @@ PART
 	module = Part
 	author = SuicidalInsanity
 	rescaleFactor = 1
-	node_attach = 0.0, 0.0, 0.0, 0.0, 0.0, 1.0, 2
-	node_stack_bottom = 0.0, -0.9365182, 0.2338864, 0.0, -1.0, 0.0, 0
-	node_stack_top = 0.0, 0.9365182, 0.2338864, 0.0, 1.0, 0.0, 0
+	node_attach = 0.0, 0.0, 0.0, -1.0, 0.0, 0.0, 2
+	node_stack_bottom = 0.2338864, -0.9365182, 0.0, 0.0, -1.0, 0.0, 0
+	node_stack_top = 0.2338864, 0.9365182, 0.0, 0.0, 1.0, 0.0, 0
 	TechRequired = advAerodynamics
 	entryCost = 4800
 	cost = 100

Mk2Expansion/GameData/Mk2Expansion/Parts/Aero/Chines/Radapter.cfg

@@ -4,9 +4,9 @@ PART
 	module = Part
 	author = SuicidalInsanity
 	rescaleFactor = 1
-	node_attach = 0.0, 0.0, 0.0, 0.0, 0.0, 1.0, 2
-	node_stack_bottom = 0.0, -0.3622864, 0.2338864, 0.0, -1.0, 0.0, 0
-	node_stack_top = 0.0, 0.4429303, 0.2338864, 0.0, 1.0, 0.0, 0
+	node_attach = 0.0, 0.0, 0.0, -1.0, 0.0, 0.0, 2
+	node_stack_bottom = 0.2338864, -0.3622864, 0.0, 0.0, -1.0, 0.0, 0
+	node_stack_top = 0.2338864, 0.4429303, 0.0, 0.0, 1.0, 0.0, 0
 	TechRequired = advAerodynamics
 	entryCost = 4800
 	cost = 200

Mk2Expansion/GameData/Mk2Expansion/Parts/Aero/Chines/Short.cfg

@@ -4,17 +4,17 @@ PART
 	module = Part
 	author = SuicidalInsanity
 	rescaleFactor = 1
-	node_attach = 0.0, 0.0, 0.0, 0.0, 0.0, 1.0, 1
-	node_stack_bottom = 0.0, -0.9372618, 0.2338864, 0.0, -1.0, 0.0, 0
-	node_stack_top = 0.0, 0.9372618, 0.2338864, 0.0, 1.0, 0.0, 0
+	node_attach = 0.0, 0.0, 0.0, -1.0, 0.0, 0.0, 1
+	node_stack_bottom = 0.2338864, -0.9372618, 0.0, 0.0, -1.0, 0.0, 0
+	node_stack_top = 0.2338864, 0.9372618, 0.0, 0.0, 1.0, 0.0, 0
 	TechRequired = advAerodynamics
 	entryCost = 4800
 	cost = 150
 	category = Aero
 	subcategory = 0
 	title = Chine Short
 	manufacturer = Insanity Aerospace
-	description = Chine edge for better supersonic performance and to make planes look razor sleek!
+	description = Chine edge for better supersonic performance and to make planes look razor sleek! Use Radial Symmetry for symmetry when using stack nodes.
 	attachRules = 1,1,1,1,0
 	mass = 0.025
 	thermalMassModifier = 8.0

Mk2Expansion/GameData/Mk2Expansion/Parts/Aero/Precooler/part.cfg

@@ -59,7 +59,7 @@ PART
 	{
 		name = ModuleLiftingSurface
 		useInternalDragModel = False
-		deflectionLiftCoeff = 0.25
+		deflectionLiftCoeff = 0.3
 		dragAtMaxAoA = 0.15
 		dragAtMinAoA = 0.1
 	}

Mk2Expansion/GameData/Mk2Expansion/Parts/Aero/mk1Chines/Long.cfg

@@ -4,17 +4,17 @@ PART
 	module = Part
 	author = SuicidalInsanity
 	rescaleFactor = 1
-	node_attach = 0.0, 0.0, 0.2338864, 0.0, 0.0, 1.0, 1
-	node_stack_bottom = 0.0, -1.484396, 0.05, 0.0, -1.0, 0.0, 0
-	node_stack_top = 0.0, 1.484396, 0.05, 0.0, 1.0, 0.0, 0
+	node_attach = 0.1, 0.0, 0.0, -1.0, 0.0, 0.0, 1
+	node_stack_bottom = 0.25, -1.484396, 0.0, 0.0, -1.0, 0.0, 0
+	node_stack_top = 0.25, 1.484396, 0.0, 0.0, 1.0, 0.0, 0
 	TechRequired = heavyAerodynamics
 	entryCost = 5200
 	cost = 600
 	category = Aero
 	subcategory = 0
 	title = Mk1 Chine Long
 	manufacturer = Insanity Aerospace
-	description = Chine edge for better supersonic performance and to make planes look razor sleek! This one fits on a mk1 fuselage.
+	description = Chine edge for better supersonic performance and to make planes look razor sleek! This one fits on a mk1 fuselage. Use Radial Symmetry for symmetry when using stack nodes.
 	attachRules = 1,1,1,1,0
 	mass = 0.08
 	thermalMassModifier = 8.0

Mk2Expansion/GameData/Mk2Expansion/Parts/Aero/mk1Chines/Short.cfg

@@ -4,17 +4,17 @@ PART
 	module = Part
 	author = SuicidalInsanity
 	rescaleFactor = 1
-	node_attach = 0.0, 0.0, 0.2338864, 0.0, 0.0, 1.0, 1
-	node_stack_bottom = 0.0, -0.7412407, 0.05, 0.0, -1.0, 0.0, 0
-	node_stack_top = 0.0, 0.7412407, 0.05, 0.0, 1.0, 0.0, 0
+	node_attach = 0.1, 0.0, 0.0, -1.0, 0.0, 0.0, 1
+	node_stack_bottom = 0.25, -0.7412407, 0.0, 0.0, -1.0, 0.0, 0
+	node_stack_top = 0.25, 0.7412407, 0.0, 0.0, 1.0, 0.0, 0
 	TechRequired = heavyAerodynamics
 	entryCost = 5200
 	cost = 600
 	category = Aero
 	subcategory = 0
 	title = Mk1 Chine Short
 	manufacturer = Insanity Aerospace
-	description = Chine edge for better supersonic performance and to make planes look razor sleek! This one fits on a mk1 fuselage.
+	description = Chine edge for better supersonic performance and to make planes look razor sleek! This one fits on a mk1 fuselage. Use Radial Symmetry for symmetry when using stack nodes.
 	attachRules = 1,1,1,1,0
 	mass = 0.04
 	thermalMassModifier = 8.0

Mk2Expansion/GameData/Mk2Expansion/Parts/Aero/mk1Chines/cap.cfg

@@ -4,16 +4,16 @@ PART
 	module = Part
 	author = SuicidalInsanity
 	rescaleFactor = 1
-	node_attach = 0.0, 0.0, 0.2338864, 0.0, 0.0, 1.0, 1
-	node_stack_top = 0.0, -0.4990445, 0.05, 0.0, -1.0, 0.0, 1
+	node_attach = 0.1, 0.0, 0.0, -1.0, 0.0, 0.0, 1
+	node_stack_top = 0.25, -0.4990445, 0.0, 0.0, -1.0, 0.0, 1
 	TechRequired = heavyAerodynamics
 	entryCost = 5200
 	cost = 600
 	category = Aero
 	subcategory = 0
 	title = Mk1 Chine Cap
 	manufacturer = Insanity Aerospace
-	description = Chine edge for better supersonic performance and to make planes look razor sleek! This one fits on a mk1 fuselage.
+	description = Chine edge for better supersonic performance and to make planes look razor sleek! This one fits on a mk1 fuselage. Use Radial Symmetry for symmetry when using stack nodes.
 	attachRules = 1,1,1,1,0
 	mass = 0.04
 	thermalMassModifier = 8.0

Mk2Expansion/GameData/Mk2Expansion/Parts/Command/Raven/part.cfg

@@ -25,17 +25,22 @@ PART
 	skinMaxTemp = 2500
 	emissiveConstant = 0.8
 	vesselType = Ship
-	CrewCapacity = 1
+	CrewCapacity = 2
 	bulkheadProfiles = mk2
 	breakingForce = 50
 	breakingTorque = 50
 	tags = m2x mk2 aero aircraft cmg command control ?eva fly gyro ?iva moment pilot plane react space stab steer torque
+	DRAG_CUBE
+	{
+		cube = Default, 5.307,0.6381,1.345, 5.307,0.6381,1.345, 2.495,0.5278,3.888, 2.495,0.9717,0.1561, 7.483,0.8602,0.8467, 7.483,0.8598,0.8467, 0,0.01563,-1.863E-09, 2.5,3.781,1.5
+	}
 	MODEL
 	{
 		model = Mk2Expansion/Parts/Command/Raven/Model
 		texture = Cockpit, Squad/Parts/Command/mk2CockpitStandard/Cockpit
-		texture = Cockpit_NRM, Squad/Parts/Command/mk2CockpitStandard/Cockpit_NRM
-		texture = Cockpit_LUM, Squad/Parts/Command/mk2CockpitStandard/Cockpit_LUM
+		texture = Cockpit_inline_A, Squad/Parts/Command/mk2CockpitInline/Cockpit_inline_A
+		texture = Cockpit_inline_Emissive, Squad/Parts/Command/mk2CockpitInline/Cockpit_inline_Emissive
+		texture = mk2adapters1m, Squad/Parts/FuelTank/mk2Adapters/mk2adapters1m
 	}
 	INTERNAL
 	{

Mk2Expansion/GameData/Mk2Expansion/Parts/Engines/Turbojet/part.cfg

@@ -5,7 +5,7 @@ PART
 	author = SuicidalInsanity
 	mesh = Model.mu
 	rescaleFactor = 1
-	node_stack_top = 0.0, 0.9379611, 0.0, 0.0, 1.0, 0.0
+	node_stack_top = 0.0, 0.7457381, 0.0, 0.0, 1.0, 0.0
 	CoMOffset = 0.0, 2.7, 0.0
 	TechRequired = supersonicFlight
 	entryCost = 22000

Mk2Expansion/GameData/Mk2Expansion/Parts/FuelTank/SpadeTail/part.cfg

@@ -33,6 +33,10 @@ PART
 		model = Mk2Expansion/Parts/FuelTank/SpadeTail/Model
 		texture = mk2FuselageShort, Squad/Parts/FuelTank/mk2FuselageShort/mk2FuselageShort
 	}
+	DRAG_CUBE
+	{
+		cube = Default, 2.958,0.5665,1.345, 2.958,0.5625,1.345, 2.478,0.9633,0.2243, 2.495,0.2827,3.989, 9.732,0.9439,0.8267, 9.732,0.9442,0.8267, 0,-0.5455,0, 2.5,3.885,1.5
+	}
 	MODULE
      {
 		name = InterstellarMeshSwitch

Mk2Expansion/GameData/Mk2Expansion/Parts/Structural/StructuralTube/part.cfg

@@ -0,0 +1,49 @@
+PART
+{
+	name = M2X_StructuralTube
+	module = Part
+	author = SuicidalInsanity
+	rescaleFactor = 1
+	node_stack_top = 0.0, 1.0, 0.0, 0.0, 1.0, 0.0, 1
+	node_stack_bottom = 0.0, -1.0, 0.0, 0.0, -1.0, 0.0, 1
+	TechRequired = generalConstruction
+	entryCost = 5500
+	cost = 500
+	category = Structural
+	subcategory = 0
+	title = Mk2 Structural Fuselage
+	manufacturer = Insanity Aerospace
+	description = A standard fuselage. Carries no fuel; is there merely as a structural element. As such, it's lighter and more solid due to reinforcements.
+	attachRules = 1,0,1,1,1
+	mass = 0.2
+	dragModelType = default
+	maximum_drag = 0.2
+	minimum_drag = 0.3
+	angularDrag = 1
+	crashTolerance = 65
+	breakingForce = 50
+	breakingTorque = 50
+	maxTemp = 2500 // = 3000
+	emissiveConstant = 0.8
+	fuelCrossFeed = True
+	bulkheadProfiles = mk2
+	tags = m2x mk2 aircraft airplane hollow jet mk1 pipe plane tube
+	MODEL
+	{
+		model = Mk2Expansion/Parts/Structural/StructuralTube/Model
+		texture = mk2CargoBay, Squad/Parts/Utility/mk2CargoBay/mk2CargoBay
+		texture = mk2FuselageShort, Squad/Parts/FuelTank/mk2FuselageShort/mk2FuselageShort
+	}
+	DRAG_CUBE
+	{
+		cube = Default, 2.815,0.5649,1.324, 2.815,0.5649,1.324, 2.495,0.9716,1.554, 2.495,0.9716,1.212, 4.688,0.9015,0.7, 4.688,0.9015,0.7, 0,0,0, 2.5,1.875,1.5
+	}
+	MODULE
+	{
+		name = ModuleLiftingSurface
+		useInternalDragModel = False
+		deflectionLiftCoeff = 0.35
+		dragAtMaxAoA = 0.15
+		dragAtMinAoA = 0.1
+	}
+}

Mk2Expansion/GameData/Mk2Expansion/Parts/Utility/RCS/CBlock.cfg

@@ -5,9 +5,9 @@ PART
 	author = SuicidalInsanity
 	mesh = CBlock.mu
 	rescaleFactor = 1
-	node_attach = 0, 0, 0, 1.0, 0.0, 0.0
-	node_stack_bottom = -0.2338864, -0.1876422, 0.0, 0.0, -1.0, 0.0, 0
-	node_stack_top = -0.2338864, 0.1876422, 0.0, 0.0, 1.0, 0.0, 0
+	node_attach = 0.0, 0.0, 0.0, -1.0, 0.0, 0.0, 1
+	node_stack_bottom = 0.2338864, -0.1876422, 0.0, 0.0, -1.0, 0.0, 0
+	node_stack_top = 0.2338864, 0.1876422, 0.0, 0.0, 1.0, 0.0, 0
 	TechRequired = specializedControl
 	entryCost = 3400
 	cost = 620

Mk2Expansion/GameData/Mk2Expansion/Parts/Utility/RCS/EBlock.cfg

@@ -5,8 +5,8 @@ PART
 	author = SuicidalInsanity
 	mesh = EBlock.mu
 	rescaleFactor = 1
-	node_stack_bottom = -0.2338864, -0.1394405, 0.0, 0.0, -1.0, 0.0, 0
-	node_attach = 0, 0, 0, 1.0, 0.0, 0.0
+	node_stack_bottom = 0.2338864, -0.1394405, 0.0, 0.0, -1.0, 0.0, 0
+	node_attach = 0.0, 0.0, 0.0, -1.0, 0.0, 0.0, 1
 	TechRequired = specializedControl
 	entryCost = 3400
 	cost = 620

Mk2Expansion/GameData/Mk2Expansion/Parts/Utility/Reactor/part.cfg

@@ -72,8 +72,8 @@ MODEL
 		TemperatureModifier
 		{
 			key = 0 100000
-			key = 750 50000
-			key = 1000 40000
+			key = 650 50000
+			key = 1000 10000
 			key = 1250 30000	
 			key = 2000 50000	
 			key = 4000 100000
@@ -90,8 +90,8 @@ MODEL
 			key = 2250 0 0 0
 		}
 		UseSpecialistBonus = true
-		SpecialistEfficiencyFactor = 0.2
-		SpecialistBonusBase = 0.05
+		SpecialistEfficiencyFactor = 0.04
+		SpecialistBonusBase = 1.0
 		Specialty = Engineer
 		EfficiencyBonus = 1
 
@@ -153,18 +153,18 @@ MODEL
 	{
 		name = ModuleCoreHeat
 		CoreTempGoal = 1250					//Internal temp goal - we don't transfer till we hit this point
-		CoreToPartRatio = 0.4				//Scale back cooling if the part is this % of core temp
+		CoreToPartRatio = 0.33				//Scale back cooling if the part is this % of core temp
 		CoreTempGoalAdjustment = 0			//Dynamic goal adjustment
-		CoreEnergyMultiplier = 0.5			//What percentage of our core energy do we transfer to the part
+		CoreEnergyMultiplier = 0.33			//What percentage of our core energy do we transfer to the part
 		HeatRadiantMultiplier = 0.2		//If the core is hotter, how much heat radiates?
 		CoolingRadiantMultiplier = 0		//If the core is colder, how much radiates?
 		HeatTransferMultiplier = 0			//If the part is hotter, how much heat transfers in?
 		CoolantTransferMultiplier = 0.01	//If the part is colder, how much of our energy can we transfer?
 		radiatorCoolingFactor = 1			//How much energy we pull from core with an active radiator?  >= 1
-		radiatorHeatingFactor = 0.01		//How much energy we push to the active radiator
+		radiatorHeatingFactor = 0.02		//How much energy we push to the active radiator
 		MaxCalculationWarp = 1000			//Based on how dramatic the changes are, this is the max rate of change
 		CoreShutdownTemp = 2000				//At what core temperature do we shut down all generators on this part?
-		MaxCoolant = 500					//Maximum amount of radiator capacity we can consume - 50 = 1 small
+		MaxCoolant = 1200					//Maximum amount of radiator capacity we can consume - 50 = 1 small
 	}
 
 }

Mk2Expansion/GameData/Mk2Expansion/Parts/Utility/SolarPanel/part.cfg

@@ -21,7 +21,7 @@ PART
 	minimum_drag = 0.2
 	angularDrag = 1
 	crashTolerance = 8
-	maxTemp = 1200 // = 3200
+	maxTemp = 2000 // = 3200
 	bulkheadProfiles = srf
 	thermalMassModifier = 2.0
 	emissiveConstant = 0.95

Mk2Expansion/GameData/Mk2Expansion/Patches/M2X_RPM_ASET.cfg

@@ -12,13 +12,7 @@
 		@name = BladeCockpitASET
 	}
 }
-@PART[*]:HAS[@INTERNAL[RPM_RavenCockpit]]:NEEDS[ASET]:Final
-{
-	@INTERNAL 
-	{
-		@name = ASET_RavenCockpit
-	}
-}
+
 @PART[*]:HAS[@INTERNAL[TunaCockpit]]:NEEDS[ASET]:Final
 {
 	@INTERNAL