Update to M2X 1.8.4

Mk2Expansion/Changelog.txt

@@ -1,4 +1,19 @@
 
+1.8.4
+=============================================
+-KSP 1.7 update
+-New Part: Mk2 battery bank
+-Fixes missing bulkhead profiles
+-Banshee Fans now transition between horiz/vert flight options
+-J Edgar now has standalone variant for radial placement
+-Aerospike performance refactored, slightly more thrust for slightly less ISP
+-Afterburn subsonic performance buffed slightly
+-X and T structural hub now have stack symmetry
+-Fixes Siddeley localization error
+-Fixes Aerospike smokeFX
+-Fixes scaled flag for agency contracts
+-Adds Whitelist for ReStock compatibility
+
 1.8.3.4
 ============================================
 -Fixes B9PS-MFT Servie Tank interaction

Mk2Expansion/GameData/Mk2Expansion/Localization/en-us.cfg

@@ -125,16 +125,20 @@ Localization
     #LOC_M2X_Siddley_description = The Siddeley is a dual mode internally mounted turbofan lifter engine for VTOL applications. Featuring togglable gimballed engine nozzles, this engine can generate either vertical or horizontal thrust for hovering or flight.
     #LOC_M2X_Siddley_tags = m2x mk2 aircraft plane propuls turb jet vtol hover 
 
+    #LOC_M2X_vTOL_Toggle = Toggle Flight Mode
+    #LOC_M2X_VTOL_End = Flight Mode
+    #LOC_M2X_VTOL_Start = Hover Mode
+
     #LOC_M2X_Pegasus_title = R-S3 "Pegasus" VTOL engine
     #LOC_M2X_Pegasus_description = A fuselage mounted turbofan engine for generating vertical thrust for VTOL applications.
     #LOC_M2X_Pegasus_tags = m2x mk2 aircraft plane propuls turb jet vtol hover 
 
-    #LOC_M2X_Hoover_title = H-VR "J Edgar" VTOL Engine
+    #LOC_M2X_Hoover_title = H-VR "J Edgar" VTOL Engine (3 Variants)
     #LOC_M2X_Hoover_description = When questioned about making an engine suitable for V/STOL aircraft, the C7 marketing division initially rejected calls to make one. After being pestered by Jeb for an hour they relented, and had us make this. The J. Edgar H-VR Engine is a high thrust, high response time turbofan suitable for heavy VTOL applications. While users should not expect this engine to push them supersonic, it will permit them to hover. Can be fuselage or stack mounted.
     #LOC_M2X_Hoover_tags = m2x mk2 aircraft plane propuls turb jet vtol hover
-    #LOC_M2X_VTOL_Start = Vertical Thrust
-    #LOC_M2X_VTOL_End = Horizontal Thrust
-    #LOC_M2X_vTOL_Toggle = Toggle Mode
+    #LOC_M2X_JEdgarS = Stack Mount
+    #LOC_M2X_JedgarF = Fuselage Mount
+    #LOC_M2X_JEdgar = Engine Only
 
     #LOC_M2X_Mutt_title = R-44 "Mongrel" Vertical Lift-off/Landing Engine
     #LOC_M2X_Mutt_description = Fuselage mounted ventral rocket engines for vertical lift applications in non-oxygenated atmospheres or vacuum conditions. 
@@ -148,7 +152,9 @@ Localization
     #LOC_M2X_Banshee_description = A 2 meter mounted lift fan for vertical propulsion in atmospheric environments lacking oxygen, this engine is designed to allow VTOL applications on bodies where jets cannot function and rockets would be prohibitively inefficient. Although it is lighter and cheaper than a jet engine, it is also comparatively less powerful. 
     #LOC_M2X_Banshee_tags = m2x mk2 aircraft plane propuls fan vtol hover
     #LOC_M2X_Banshee_Stack = Stack
-    #LOC_M2X_Banshee_Radial = Radial
+    #LOC_M2X_Banshee_Radial = Radial 
+    #LOC_M2X_Banshee_Stack2 = Stack Perpendicular
+    #LOC_M2X_Banshee_Radial2 = Radial Perpendicular
 
     #LOC_M2X_MATTOCK_title = X-44 M.A.T.T.O.C.K. Engine
     #LOC_M2X_MATTOCK_description = The Multi Axis Thrust Toggled Open Cycle Kombustion engine is a cutting-edge experimental aerospace engine featuring advanced gimbal capability and atmospheric and vacuum operational capacity. The ultimate in aerospace propulsion.
@@ -311,6 +317,10 @@ Localization
     #LOC_M2X_ServiceBay_XEEC = Xe/Ec
     #LOC_M2X_ServiceBay_MPXE = Xe/Mp
 
+    #LOC_M2X_Battery_title = z-2400 Rechargeable Battery Bank
+    #LOC_M2X_Battery_description = A custom built battery bank for the mk2  form factor, with 24 times the power capacity of the z-100.
+    #LOC_M2X_Battery_tags = m2x mk2 capacitor cell charge e/c elect pack power volt watt
+
     #LOC_M2X_Reactor_title = NUK-3 Aerospace Fission Reactor
     #LOC_M2X_Reactor_description = A stripped down experimental fission reactor intended for use aboard aerospace assets. The unit comes with basic surface mounted radiators, but additional radiators are recommended for optimum performance. Produces 300 Ec/s.
     #LOC_M2X_Reactor_tags = m2x mk2 active atom charge e/c elect energ generat nuclear nuke power radio rtg thermo volt watt 

Mk2Expansion/GameData/Mk2Expansion/M2X.restockwhitelist

@@ -0,0 +1,59 @@
+Squad/Parts/FuelTank/mk2Adapters/mk2adapters1m.dds
+Squad/Parts/Structural/mk1Parts/Mk1Structural.dds
+Squad/Parts/Structural/mk1Parts/Mk1StructuralHeat.dds
+Squad/Parts/Utility/mk2CargoBay/mk2CargoBay.dds
+Squad/Parts/FuelTank/mk2FuselageShort/mk2FuselageShort.dds
+Squad/Parts/Aero/wings/Wings.dds
+Squad/Parts/Aero/circularIntake/CircluarIntakes.dds
+Squad/Parts/Aero/circularIntake/CircluarIntakes_Heat.dds
+Squad/Parts/Aero/ramAirIntake/RampIntake.dds
+Squad/Parts/Aero/ramAirIntake/RampIntake_Heat.dds
+Squad/Parts/Command/mk2CockpitStandard/Cockpit.dds
+Squad/Parts/Command/mk2CockpitStandard/Cockpit_Lum.dds
+Squad/Parts/Command/mk2CockpitInline/Cockpit_inline_A.dds
+Squad/Parts/Command/mk2CockpitInline/Cockpit_inline_Emissive.dds
+Squad/Parts/Engine/solidBoosterRT-10/model000.dds
+Squad/Parts/Engine/solidBoosterRT-10/model002.dds
+Squad/Parts/Engine/solidBoosterBACC/model000.dds
+Squad/Parts/Engine/solidBoosterBACC/model002.dds
+Squad/Parts/Engine/liquidEngineMainsail/model002.dds
+Squad/Parts/Engine/liquidEngineMainsail/model004.dds
+Squad/Parts/Engine/jetEngines/Jet Engines.dds
+Squad/Parts/Engine/jetEngines/Jet_Heat.dds
+Squad/Parts/Utility/mk3CargoBay/Mk3CargoBay.dds
+Squad/Parts/Engine/rapierEngine/rapierDiffuse.dds
+Squad/Parts/Engine/rapierEngine/rapieremit.dds
+Squad/Parts/Aero/airIntakeRadialXM-G50/RadialIntake.dds
+Squad/Parts/Engine/liquidEngineLV-909/engine3.dds
+Squad/Parts/Engine/liquidEngineLV-909/engine3_emissive.dds
+Squad/Parts/Engine/liquidEngineLV-N/model003.dds
+Squad/Parts/Engine/liquidEngineLV-N/model000.dds
+Squad/Parts/Wheel/roverWheelS2/model000.dds
+Squad/Parts/FuelTank/adapterTanks/Mk3Adapters.dds
+Squad/Parts/FuelTank/mk3Fuselage/Mk3Fuselage.dds
+Squad/Parts/FuelTank/xenonTankRadial/ksp_r_xenonTank_diff.dds
+Squad/Parts/Coupling/Assets/Decouplers.dds
+Squad/Parts/Command/cupola/ksp_l_cupola_diff.dds
+Squad/Parts/FuelTank/mk2FuselageLong/mk2Fuselage.dds
+Squad/Parts/Utility/dockingPort/model000.dds
+Squad/Parts/Utility/spotLightMk1/light1.dds
+Squad/Parts/Utility/spotLightMk1/light1_em.dds
+Squad/Parts/Utility/mk2CrewCabin/mk2CrewCabin.dds
+Squad/Parts/Utility/mk2CrewCabin/mk2CrewCabin_LUM.dds
+Squad/Parts/Science/LargeCrewedLab/Large_Crewed_Lab.dds
+Squad/Parts/Science/LargeCrewedLab/Large_Crewed_Lab_glow.dds
+Squad/Parts/Engine/OMSEngine/engineoms 1.dds
+Squad/Parts/Thermal/FoldingRadiators/radiator.dds
+Squad/Parts/Resources/MiniISRU/ksp_s_processorSmall_diff.dds
+Squad/Parts/Command/mk2DroneCore/mk2Dronecore.dds
+Squad/Parts/Command/inlineAdvancedStabilizer/model000.dds
+Squad/Parts/Engine/liquidEngineLV-N/model002.dds
+Squad/Parts/Thermal/RadiatorPanels/radPanel.dds
+Squad/Parts/Utility/ServiceBay/ServiceBay.dds
+Squad/Parts/Electrical/z-400Battery/model000.dds
+Squad/Parts/Wheel/LandingGear/LandingGear.dds
+Squad/Parts/Electrical/gigantorXlSolarArray/panel.dds
+Squad/Parts/Electrical/z-4kBattery/ksp_l_batteryPack_diff
+Squad/Parts/Electrical/z-4kBattery/ksp_l_batteryPack_normal
+
+

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

@@ -47,6 +47,7 @@ thermalMassModifier = 6.0
 	crashTolerance = 12
 	maxTemp = 2400 // = 3400
 	fuelCrossFeed = True
+	bulkheadProfiles = size1, mk2
 	tags = #LOC_M2X_Aeromount_tags 
 
 	DRAG_CUBE

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

@@ -28,6 +28,7 @@ PART
 	maxTemp = 2400 // = 3400
 	explosionPotential = 0.1
 	fuelCrossFeed = True
+	bulkheadProfiles = srf
 	tags = #LOC_M2X_RChine_tags
 	MODEL
 	{

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

@@ -46,6 +46,7 @@ thermalMassModifier = 8.0
 	crashTolerance = 12
 	maxTemp = 2400 // = 3400
 	fuelCrossFeed = True
+	bulkheadProfiles = mk2
 	tags = #LOC_M2X_MantaIntake_tags
 MODULE
 	{

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

@@ -28,6 +28,7 @@ PART
 	maxTemp = 2400 // = 3400
 	explosionPotential = 0.1
 	fuelCrossFeed = True
+	bulkheadProfiles = srf
 	tags = #LOC_M2X_MChine_tags
 	MODEL
 	{

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

@@ -60,7 +60,7 @@ PART
 				speed = 0.0 0.25
 				speed = 1.0 1.0
 				localOffset = 0, 0, 0
-				localRotation = 1, 0, 0, -90
+				localRotation = 1, 0, 0, 90
 			}
 			MODEL_MULTI_PARTICLE
 			{
@@ -111,7 +111,7 @@ PART
 		exhaustDamage = True
 		ignitionThreshold = 0.1
 		minThrust = 0
-		maxThrust = 320
+		maxThrust = 380
 		heatProduction = 143
 		fxOffset = 0, 0, 0
 		EngineType = LiquidFuel
@@ -130,10 +130,10 @@ PART
 		}
 		atmosphereCurve
 		{
-			key = 0 340 -50 -73.71224
-			key = 1 290 -21.23404 -21.23404
-			key = 5 230 -10.54119 -10.54119
-			key = 10 170 -13.59091 -13.59091
+			key = 0 320 -50 -73.71224
+			key = 1 280 -21.23404 -21.23404
+			key = 5 210 -10.54119 -10.54119
+			key = 10 150 -13.59091 -13.59091
 			key = 20 0.001
 		}
 	}

Mk2Expansion/GameData/Mk2Expansion/Parts/Engines/LiftFan/fuselage.cfg

@@ -334,7 +334,31 @@ MODULE
 		fxMax = 0.5
 		maxDistance = 20
 		falloff = 2
-		thrustTransformName = smokePoint
+		thrustTransformName = thrustTransform
+	}
+	MODULE
+	{
+		name = ModuleJettison
+		jettisonName = Fairing
+		bottomNodeName = bottom
+		isFairing = True
+		jettisonedObjectMass = 0.1
+		jettisonForce = 5
+		jettisonDirection = 0 0 1
+	}
+	MODULE
+	{
+		name = ModuleControlSurface
+		useInternalDragModel = True
+		dragCoeff = 0.0
+		deflectionLiftCoeff = 0.00	// 6m^2 * 1.2 / 3.5
+		ctrlSurfaceRange = 60
+		ctrlSurfaceArea = 0
+		actuatorSpeed = 40
+		transformName = Gimbal
+		ignorePitch = true
+		ignoreYaw = true
+		ignoreRoll = true
 	}
 	EFFECTS
 	{

Mk2Expansion/GameData/Mk2Expansion/Parts/Engines/LiftFan/stack.cfg

@@ -6,6 +6,7 @@ author = SuicidalInsanity
 rescaleFactor = 1
 node_stack_top = 0.0, 1.294664, 0.0, 0.0, 1.0, 0.0
 node_attach = 0, 1.25, 0.0, 0.0, 1.0, 0.0, 1
+mirrorRefAxis = 1, 0, 0
 // --- editor parameters ---
 TechRequired = aviation
 entryCost = 3700
@@ -17,7 +18,7 @@ manufacturer = #LOC_M2X_manufacturer_IA_title
 description = #LOC_M2X_Banshee_description 
 
 	attachRules = 1,1,1,0,0
-	mass = 0.7
+	mass = 0.6
 	heatConductivity = 0.06 // half default
 	emissiveConstant = 0.8 // engine nozzles are good at radiating.
 	dragModelType = default
@@ -36,23 +37,6 @@ description = #LOC_M2X_Banshee_description
 		texture = fandisc, Mk2Expansion/Parts/Engines/LiftFan/fandisc
 	}
 	MODULE
-	{
-		name = ModuleB9PartSwitch
-		switcherDescription = Variant
-		SUBTYPE
-		{
-			name = #LOC_M2X_Banshee_Stack
-			transform = LiftFan
-			transform = AdapterMount
-		}
-		SUBTYPE
-		{
-			name = #LOC_M2X_Banshee_Radial
-			transform = LiftFan
-			transform = RingMount
-		}
-	}
-	MODULE
 	{
 		name = ModuleResourceIntake
 		resourceName = FanIntakeAir
@@ -134,7 +118,6 @@ key = 12 3.5 0.1484847 0.1484847
 			key = 90 18.4188
 		}
 	}	
-
 	MODULE
 	{
 		name = FXModuleAnimateThrottle
@@ -177,6 +160,25 @@ key = 12 3.5 0.1484847 0.1484847
   		isTweakable = false
 		hideFlow = true
 	}
+	MODULE
+	{
+		name = ModuleB9PartSwitch
+		switcherDescription = Variant
+		SUBTYPE
+		{
+			name = #LOC_M2X_Banshee_Stack
+			transform = Engine_base_radial
+			transform = LiftFan
+			addedMass = 0.125
+		}
+		SUBTYPE
+		{
+			name = #LOC_M2X_Banshee_Radial
+			transform = Engine_mount
+			transform = LiftFan	
+		}
+
+	}
 	RESOURCE
 	{
 	name = FanIntakeAir
@@ -333,11 +335,25 @@ key = 12 3.5 0.1484847 0.1484847
 	MODULE
 	{
 		name = ModuleSurfaceFX
-		thrustProviderModuleIndex = 2
+		thrustProviderModuleIndex = 1
 		fxMax = 0.5
-		maxDistance = 40
+		maxDistance = 30
 		falloff = 2
-		thrustTransformName = smokePoint
+		thrustTransformName = thrustTransform
+	}
+	MODULE
+	{
+		name = ModuleControlSurface
+		useInternalDragModel = True
+		dragCoeff = 0.0
+		deflectionLiftCoeff = 0.00	// 6m^2 * 1.2 / 3.5
+		ctrlSurfaceRange = 60
+		ctrlSurfaceArea = 0
+		actuatorSpeed = 40
+		transformName = LiftFan
+		ignorePitch = true
+		ignoreYaw = true
+		ignoreRoll = true
 	}
 	EFFECTS
 	{

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

@@ -85,11 +85,11 @@ PART
 		velCurve
 		{
 			// low efficiency at subsonic, best performance mach3-4
-			key = 0 1.03337 0.1409437 0.1409437
-			key = 0.579666 1.210206 0.5284932 0.4213456
-			key = 1.655355 2.461601 1.833221 1.763641
-			key = 2.731029 4.490742 1.06566 1.035065
-			key = 3.997403 4.518501 -0.8614474 -0.9294368
+			key = 0 1.0 0.1409437 0.1409437
+			key = 0.66 1.210206 0.5284932 0.4213456
+			key = 1.66 2.461601 1.833221 1.763641
+			key = 2.75 4.490742 1.06566 1.035065
+			key = 4.0 4.518501 -0.8614474 -0.9294368
 			key = 6 0.00560081 -2.456088 -0.6683283
 		}
 		atmCurve