Merge pull request #111 from snjo/DEVELOP

RI from DEV

For release/Firespitter/Firespitter.version

@@ -4,7 +4,7 @@
   "VERSION": {
     "MAJOR": 7,
     "MINOR": 1,
-	"PATCH": 1
+	"PATCH": 2
   },
   "KSP_VERSION": {
     "MAJOR": 1,

For release/Firespitter/Parts/Aero/FS_bomberWing/part.cfg

@@ -15,6 +15,7 @@ rescaleFactor = 1
 // --- editor parameters ---
 TechRequired = highAltitudeFlight
 cost = 2000
+entryCost = 4000
 category = Aero
 subcategory = 0
 title = FS1BW Firespitter Bomber Wing

For release/Firespitter/Parts/Aero/FS_bomberWingExtender/part.cfg

@@ -15,6 +15,7 @@ rescaleFactor = 1
 // --- editor parameters ---
 TechRequired = highAltitudeFlight
 cost = 2000
+entryCost = 4000
 category = Aero
 subcategory = 0
 title = FS1BW Firespitter Bomber Wing

For release/Firespitter/Parts/Aero/FS_fighterJetElevator/part.cfg

@@ -15,6 +15,7 @@ rescaleFactor = 1.0
 // --- editor parameters ---
 TechRequired = supersonicFlight
 cost = 600
+entryCost = 2000
 category = Aero
 subcategory = 0
 title = FS1F86E-S Fighter Jet Elevator

For release/Firespitter/Parts/Aero/FS_fighterJetRudder/part.cfg

@@ -15,6 +15,7 @@ rescaleFactor = 1.0
 // --- editor parameters ---
 TechRequired = supersonicFlight
 cost = 600
+entryCost = 2000
 category = Aero
 subcategory = 0
 title = FS1F86R-S Fighter Jet Rudder

For release/Firespitter/Parts/Aero/FS_fighterJetWing/part.cfg

@@ -14,6 +14,7 @@ rescaleFactor = 1.0
 // --- editor parameters ---
 TechRequired = supersonicFlight
 cost = 1000
+entryCost = 3000
 category = Aero
 subcategory = 0
 title = FS1F86-S Fighet Jet Wing

For release/Firespitter/Parts/Aero/FS_fighterWing/part.cfg

@@ -26,6 +26,7 @@ rescaleFactor = 1
 // --- editor parameters ---
 TechRequired = aerodynamicSystems
 cost = 1000
+entryCost = 3000
 category = Aero
 subcategory = 0
 title = FS1W Firespitter Wing

For release/Firespitter/Parts/Aero/FS_oblongNoseIntake/part.cfg

@@ -21,6 +21,7 @@ node_attach = 0.0, -0.236, 0.0, 0.0, -1.0, 0.0, 1
 // --- editor parameters ---
 TechRequired = supersonicFlight
 cost = 550
+entryCost = 1400
 category = Aero
 subcategory = 0
 title = FS1ONI Oblong Nose Intake

For release/Firespitter/Parts/Aero/FS_tailWing/part.cfg

@@ -15,6 +15,7 @@ rescaleFactor = 1.5
 // --- editor parameters ---
 TechRequired = stability
 cost = 600
+entryCost = 1400
 category = Aero
 subcategory = 0
 title = FS1TW2 Tail Wing

For release/Firespitter/Parts/Aero/FS_tailWingLarge/part.cfg

@@ -15,6 +15,7 @@ rescaleFactor = 1.5
 // --- editor parameters ---
 TechRequired = stability
 cost = 600
+entryCost = 1300
 category = Aero
 subcategory = 0
 title = FS1TW3 Large Tail Wing

For release/Firespitter/Parts/Aero/FS_winglet/part.cfg

@@ -15,6 +15,7 @@ rescaleFactor = 1.4
 // --- editor parameters ---
 TechRequired = stability
 cost = 600
+entryCost = 1500
 category = Aero
 subcategory = 0
 title = FS1TW1 Tail Winglet

For release/Firespitter/Parts/Command/FS_apacheCockpit/part.cfg

@@ -20,6 +20,7 @@ node_attach = 0.0, 0.0, 0.512, 0.0, 0.0, -1.0, 1
 // --- editor parameters ---
 TechRequired = advAerodynamics
 cost = 1600
+entryCost = 3200
 category = Pods
 subcategory = 0
 title = FS2OC Attack Helicopter Cockpit

For release/Firespitter/Parts/Command/FS_bomberCockpit/part.cfg

@@ -23,6 +23,7 @@ node_stack_bottom = 0.0, -1.92, 0.0, 0.0, -1.0, 0.0
 // --- editor parameters ---
 TechRequired = highAltitudeFlight
 cost = 1800
+entryCost = 4200
 category = Pods
 subcategory = 0
 title = FS1FH Bomber Cockpit

For release/Firespitter/Parts/Command/FS_copterCockpit/part.cfg

@@ -20,6 +20,7 @@ node_stack_bottom = 0.0, -0.711, 0.0, 0.0, -1.0, 0.0, 1
 // --- editor parameters ---
 TechRequired = advAerodynamics
 cost = 1800
+entryCost = 4200
 category = Pods
 subcategory = 0
 title = FS2CP Helicopter Cockpit

For release/Firespitter/Parts/Command/FS_fighterCockpit/part.cfg

@@ -20,6 +20,7 @@ node_attach = 0.0, 0.0, 0.512, 0.0, 0.0, -1.0, 1
 // --- editor parameters ---
 TechRequired = aerodynamicSystems
 cost = 1600
+entryCost = 3200
 category = Pods
 subcategory = 0
 title = FS1OC Fighter Inline Cockpit

For release/Firespitter/Parts/Engine/FS_PROpeller/part.cfg

@@ -22,6 +22,7 @@ node_stack_top = 0.0, 0.0, 0.0, 0.0, -1.0, 0.0
 // --- editor parameters ---
 TechRequired = aerodynamicSystems
 cost = 950
+entryCost = 2200
 category = Propulsion
 subcategory = 0
 title = FS1PRO Customizable Propeller engine

For release/Firespitter/Parts/Engine/FS_PROpellerElectric/part.cfg

@@ -22,6 +22,7 @@ node_stack_top = 0.0, 0.0, 0.0, 0.0, -1.0, 0.0
 // --- editor parameters ---
 TechRequired = aerodynamicSystems
 cost = 950
+entryCost = 2200
 category = Propulsion
 subcategory = 0
 title = FS1PRE Customizable Electric Propeller engine

For release/Firespitter/Parts/Engine/FS_VTOLengine/part.cfg

@@ -35,6 +35,7 @@ sound_explosion_low = flameout
 // --- editor parameters ---
 TechRequired = advAerodynamics
 cost = 950
+entryCost = 2200
 category = Propulsion
 subcategory = 0
 title = FS2V VTOL engine
@@ -80,8 +81,8 @@ MODULE
 	exhaustDamage = False
 	ignitionThreshold = 0.1
 	minThrust = 0
-	maxThrust = 45
-	heatProduction = 300
+	maxThrust = 3.75
+	heatProduction = 30
 	useEngineResponseTime = True
 	engineAccelerationSpeed = 20
 	engineDecelerationSpeed = 20
@@ -278,8 +279,8 @@ MODULE
 	exhaustDamage = False
 	ignitionThreshold = 0.1
 	minThrust = 0
-	maxThrust = 150
-	heatProduction = 300
+	maxThrust = 12.5
+	heatProduction = 30
 	useEngineResponseTime = True
 	engineAccelerationSpeed = 20
 	engineDecelerationSpeed = 20

For release/Firespitter/Parts/Engine/FS_copterRotorFenestron/part.cfg

@@ -29,6 +29,7 @@ fx_exhaustSparks_flameout = 0.0, 0.0, 0.0, 0.0, 1.0, 0.0, flameout
 // --- editor parameters ---
 TechRequired = advAerodynamics
 cost = 450
+entryCost = 1200
 category = Control
 subcategory = 0
 title = FS2F helicopter Fenestron

For release/Firespitter/Parts/Engine/FS_copterRotorMain/part.cfg

@@ -41,6 +41,7 @@ EFFECTS
 // --- editor parameters ---
 TechRequired = advAerodynamics
 cost = 950
+entryCost = 1200
 category = Propulsion
 subcategory = 0
 title = FS Helicopter Main Rotor, Tweakable

For release/Firespitter/Parts/Engine/FS_copterRotorMainElectric/part.cfg

@@ -28,6 +28,7 @@ fx_exhaustSparks_flameout = 0.0, 0.0, 0.0, 0.0, 1.0, 0.0, flameout
 // --- editor parameters ---
 TechRequired = advAerodynamics
 cost = 1200
+entryCost = 2800
 category = Propulsion
 subcategory = 0
 title = FS2ME Electric Helicopter Main Rotor

For release/Firespitter/Parts/Engine/FS_copterRotorTail/part.cfg

@@ -37,6 +37,7 @@ EFFECTS
 // --- editor parameters ---
 TechRequired = advAerodynamics
 cost = 950
+entryCost = 2200
 category = Propulsion
 subcategory = 0
 title = FS test tail engine

For release/Firespitter/Parts/Engine/FS_lancasterEngine/ogear.cfg

@@ -36,6 +36,7 @@ sound_explosion_low = flameout
 // --- editor parameters ---
 TechRequired = highAltitudeFlight
 cost = 950
+entryCost = 2200
 category = Propulsion
 subcategory = 0
 title = FS1LEG Lancaster Engine
@@ -156,8 +157,8 @@ MODULE
 	exhaustDamage = False
 	ignitionThreshold = 0.1
 	minThrust = 0
-	maxThrust = 150
-	heatProduction = 300
+	maxThrust = 37.5
+	heatProduction = 30
 	useEngineResponseTime = True
 	engineAccelerationSpeed = 5.0
 	engineDecelerationSpeed = 5.0
@@ -166,6 +167,7 @@ MODULE
 	{
 		name = LiquidFuel
 		ratio = 1
+		resourceFlowMode = STAGE_PRIORITY_FLOW
 		DrawGauge = True
 	}
 	PROPELLANT

For release/Firespitter/Parts/Engine/FS_lancasterEngine/part.cfg

@@ -33,6 +33,7 @@ sound_explosion_low = flameout
 // --- editor parameters ---
 TechRequired = highAltitudeFlight
 cost = 950
+entryCost = 2200
 category = Propulsion
 subcategory = 0
 title = FS1LEG Lancaster Engine
@@ -82,8 +83,8 @@ MODULE
 	exhaustDamage = False
 	ignitionThreshold = 0.1
 	minThrust = 0
-	maxThrust = 150
-	heatProduction = 300
+	maxThrust = 37.5
+	heatProduction = 30
 	useEngineResponseTime = True
 	engineAccelerationSpeed = 5.0
 	engineDecelerationSpeed = 5.0
@@ -97,6 +98,7 @@ MODULE
 	PROPELLANT
 	{
 		name = IntakeAir
+		resourceFlowMode = STAGE_PRIORITY_FLOW		
 		ratio = 15
 	}
     atmosphereCurve

For release/Firespitter/Parts/Engine/FS_noseEngine/part.cfg

@@ -29,6 +29,7 @@ sound_explosion_low = flameout
 // --- editor parameters ---
 TechRequired = aerodynamicSystems
 cost = 950
+entryCost = 2200
 category = Propulsion
 subcategory = 0
 title = FS1EN Nose Mounted Engine
@@ -74,8 +75,8 @@ MODULE
 	exhaustDamage = False
 	ignitionThreshold = 0.1
 	minThrust = 0
-	maxThrust = 45
-	heatProduction = 300
+	maxThrust = 11.25
+	heatProduction = 30
 	useEngineResponseTime = True
 	engineAccelerationSpeed = 20
 	engineDecelerationSpeed = 20

For release/Firespitter/Parts/Engine/FS_noseEngineElectric/part.cfg

@@ -31,6 +31,7 @@ fx_exhaustSparks_flameout = 0.0, 0.0, 0.0, 0.0, 1.0, 0.0, flameout
 // --- editor parameters ---
 TechRequired = electrics
 cost = 950
+entryCost = 2200
 category = Propulsion
 subcategory = 0
 title = FS1ENE Nose Mounted Electric Engine
@@ -76,7 +77,7 @@ MODULE
 	ignitionThreshold = 0.1
 	minThrust = 0
 	maxThrust = 40
-	heatProduction = 300
+	heatProduction = 30
 	useEngineResponseTime = True
 	engineAccelerationSpeed = 20
 	engineDecelerationSpeed = 20

For release/Firespitter/Parts/Engine/FS_oblongTailJet/part.cfg

@@ -33,6 +33,7 @@ sound_explosion_low = flameout
 // --- editor parameters ---
 TechRequired = supersonicFlight
 cost = 800
+entryCost = 2200
 category = Propulsion
 subcategory = 0
 title = FS1OJ Oblong Tail Jet
@@ -43,7 +44,7 @@ description = An inline tail jet for old school jet fighters
 attachRules = 1,1,1,1,0
 
 // --- standard part parameters ---
-mass = 0.6
+mass = 1.3
 dragModelType = default
 maximum_drag = 0.2
 minimum_drag = 0.3
@@ -61,8 +62,8 @@ MODULE
 	exhaustDamage = True
 	ignitionThreshold = 0.1
 	minThrust = 0
-	maxThrust = 150
-	heatProduction = 700
+	maxThrust = 35
+	heatProduction = 100
 	useEngineResponseTime = True
 	engineAccelerationSpeed = 0.5
 	engineDecelerationSpeed = 1
@@ -77,20 +78,38 @@ MODULE
 	PROPELLANT
 	{
 		name = IntakeAir
-		ratio = 15
+		ignoreForIsp = True
+		ratio = 25
 	}
 	atmosphereCurve
- 	{
-		key = 0 1000
-		key = 0.3 1800
-		key = 1 2000
- 	}
-	velocityCurve
-	{
-		key = 1000 0 0 0
-		key = 850 0.2 0 0
-		key = 0 1 0 0
-	}
+		{
+			key = 0 8000 0 0 
+		}
+		// Jet params
+		atmChangeFlow = True
+		useVelCurve = True
+		useAtmCurve = True
+		machLimit = 1.5
+		machHeatMult = 6.0
+		velCurve
+		{
+			key = 0 1 0 0.08333334
+			key = 0.2 1 0.42074 0.42074
+			key = 0.7 2.2 2.290406 2.290406
+			key = 1.4 2.6 3.887193 3.887193
+			key = 3.75 1.8 0 0
+			key = 4.5 1.0 -2.831749 -2.831749
+			key = 5.5 0.4 -5.260566 -5.260566
+			key = 6 0 -0.02420209 0
+		}
+		atmCurve
+		{
+			key = 0 0 0 0
+			key = 0.045 0.166 4.304647 4.304647
+			key = 0.8 0.5 0.5779132 0.5779132
+			key = 0.6 0.6 0.4809403 0.4809403
+			key = 1 1 1.013946 0
+		}
 }
 
 //MODULE

For release/Firespitter/Parts/Engine/FS_propellerFolding/part.cfg

@@ -32,6 +32,7 @@ fx_exhaustSparks_flameout = 0.0, 0.0, 0.0, 0.0, 1.0, 0.0, flameout
 // --- editor parameters ---
 TechRequired = electrics
 cost = 950
+entryCost = 2200
 category = Propulsion
 subcategory = 0
 title = FS1FPE Folding Electric Propeller

For release/Firespitter/Parts/Engine/FS_swampEngine/part.cfg

@@ -34,6 +34,7 @@ sound_explosion_low = flameout
 // --- editor parameters ---
 TechRequired = specializedControl
 cost = 950
+entryCost = 2200
 category = Propulsion
 subcategory = 0
 title = FS3SE Swamp Engine
@@ -79,7 +80,7 @@ MODULE
 	exhaustDamage = False
 	ignitionThreshold = 0.1
 	minThrust = 0
-	maxThrust = 45
+	maxThrust = 3.75
 	heatProduction = 300
 	useEngineResponseTime = True
 	engineAccelerationSpeed = 0.25