Skip to content

Commit

Permalink
Merge pull request #1685 from KSP-RO/master
Browse files Browse the repository at this point in the history 
Combine
  • Loading branch information
@pap1723
pap1723 committed Jun 18, 2017
2 parents 5a0cd06 + c14a798 commit b989bdf
Show file tree
Hide file tree
Showing 13 changed files with 151 additions and 60 deletions.
18 changes: 18 additions & 0 deletions GameData/RealismOverhaul/DMagic_NO_US_Config.cfg
View file
@@ -0,0 +1,18 @@
!PART[dmUSMagBoom]:FOR[RealismOverhaul,DMagic]:NEEDS[!UniversalStorage]
{
}
!PART[dmUSScope]:FOR[RealismOverhaul,DMagic]:NEEDS[!UniversalStorage]
{
}
!PART[USRPWS]:FOR[RealismOverhaul,DMagic]:NEEDS[!UniversalStorage]
{
}
!PART[dmUSPresTemp]:FOR[RealismOverhaul,DMagic]:NEEDS[!UniversalStorage]
{
}
!PART[dmUSMat]:FOR[RealismOverhaul,DMagic]:NEEDS[!UniversalStorage]
{
}
!PART[dmUSGoo]:FOR[RealismOverhaul,DMagic]:NEEDS[!UniversalStorage]
{
}
15 changes: 8 additions & 7 deletions GameData/RealismOverhaul/Engine_Configs/Merlin1_Config.cfg
View file
Expand Up @@ -4,7 +4,7 @@
// Gross Mass: 760 Kg (baseline Merlin 1 variant)
// Throttle Range: 39% to 100% (throttleable variants)
// O/F Ratio: ~2.17 (differs between versions)
// Burn Time: ~170 s (ASL variants), ~400 s (VAC variants)
// Burn Time: ~240 s (single mission, ASL variants), ~400 s (VAC variants)

// Sources:

Expand All @@ -15,6 +15,7 @@
// [5] https://twitter.com/elonmusk/status/728753234811060224 (min thrust of Merlin1D+ is ~40%)
// [6] http://www.spacex.com/press/2012/12/19/spacex-falcon-9-upper-stage-engine-successfully-completes-full-mission-duration
// [7] http://www.spacex.com/press/2012/12/19/spacex-completes-development-merlin-regeneratively-cooled-rocket-engine
// [8] https://www.youtube.com/watch?v=rUDLxFUMC9c (eyeballed burn times)

// Used by:

Expand Down Expand Up @@ -616,7 +617,7 @@
TESTFLIGHT
{
name = Merlin1A
ratedBurnTime = 170
ratedBurnTime = 300
ignitionReliabilityStart = 0.98
ignitionReliabilityEnd = 0.995
cycleReliabilityStart = 0.98
Expand All @@ -629,7 +630,7 @@
TESTFLIGHT
{
name = Merlin1B
ratedBurnTime = 170
ratedBurnTime = 300
ignitionReliabilityStart = 0.98
ignitionReliabilityEnd = 0.995
cycleReliabilityStart = 0.98
Expand Down Expand Up @@ -657,7 +658,7 @@
TESTFLIGHT
{
name = Merlin1C
ratedBurnTime = 170
ratedBurnTime = 300
ignitionReliabilityStart = 0.98
ignitionReliabilityEnd = 0.995
cycleReliabilityStart = 0.98
Expand Down Expand Up @@ -685,7 +686,7 @@
TESTFLIGHT
{
name = Merlin1D
ratedBurnTime = 180
ratedBurnTime = 350
ignitionReliabilityStart = 0.98
ignitionReliabilityEnd = 0.995
cycleReliabilityStart = 0.98
Expand All @@ -699,7 +700,7 @@
TESTFLIGHT
{
name = Merlin1D+
ratedBurnTime = 162
ratedBurnTime = 350
ignitionReliabilityStart = 0.98
ignitionReliabilityEnd = 0.995
cycleReliabilityStart = 0.98
Expand All @@ -713,7 +714,7 @@
TESTFLIGHT
{
name = Merlin1D++
ratedBurnTime = 162
ratedBurnTime = 350
ignitionReliabilityStart = 0.98
ignitionReliabilityEnd = 0.995
cycleReliabilityStart = 0.98
Expand Down
2 changes: 1 addition & 1 deletion GameData/RealismOverhaul/Engine_Configs/XLR11_Config.cfg
View file
Expand Up @@ -42,7 +42,7 @@
{
TESTFLIGHT
{
name = XRL11
name = XLR11
ratedBurnTime = 360
ignitionReliabilityStart = 0.9
ignitionReliabilityEnd = 0.987
Expand Down
4 changes: 2 additions & 2 deletions GameData/RealismOverhaul/RO_Physics.cfg
View file
Expand Up @@ -47,7 +47,7 @@
// Hypersonic Convection
@machConvectionDensityExponent = 0.5
@machConvectionVelocityExponent = 3.0
@machConvectionFactor = 1.72
@machConvectionFactor = 1.05 // lowered from 1.72 for KSP 1.2.2
@machTemperatureScalar = 7.5 // ~6000 at 7.3km/sec
@machTemperatureVelocityExponent = 0.75

Expand All @@ -59,7 +59,7 @@
// CONDUCTION
@conductionFactor = 5
@skinSkinConductionFactor = 0.06
@skinInternalConductionFactor = 0.25
@skinInternalConductionFactor = 0.2 // lowered from 0.25 for KSP 1.2.2
@shieldedConductionFactor = 0.01

// RADIATION
Expand Down
101 changes: 82 additions & 19 deletions GameData/RealismOverhaul/RO_RecommendedMods/Procedurals/RO_ProceduralParts.cfg
View file
@@ -1,7 +1,14 @@
@PART[proceduralBattery]:FOR[RealismOverhaul]
{
%RSSROConfig = True
%title = Battery [Procedural]

%category = Electrical
@title = Battery [Procedural]
@manufacturer = Generic

@maxTemp = 673.15
%skinMaxTemp = 773.15

@MODULE[TankContentSwitcher]
{
@TANK_TYPE_OPTION[Electric]
Expand All @@ -17,31 +24,56 @@
@PART[proceduralStructural]:FOR[RealismOverhaul]
{
%RSSROConfig = True
%title = Structure [Procedural]
!MODULE[ModuleConnectedLivingSpace],*
{
}

@title = Structure [Procedural]
@manufacturer = Generic

@maxTemp = 673.15
%skinMaxTemp = 773.15

!MODULE[ModuleConnectedLivingSpace],*{}
}
@PART[proceduralStackDecoupler]:FOR[RealismOverhaul]
{
%RSSROConfig = True
%title = Decoupler [Procedural]

@title = Decoupler [Procedural]
%category = Coupling
@manufacturer = Generic

@maxTemp = 673.15
%skinMaxTemp = 773.15
}
@PART[proceduralNoseCone]:FOR[RealismOverhaul]
{
%RSSROConfig = True
%title = Nose Cone [Procedural]

@title = Nose Cone [Procedural]
@manufacturer = Generic

@attachRules = 1,1,1,1,0 // allow surface attachment
}
@PART[proceduralHeatshield]:FOR[RealismOverhaul]
{
%RSSROConfig = False
%title = Heat Shield [Procedural]

%category = Thermal
@title = Heat Shield [Procedural]
@manufacturer = Generic

@maxTemp = 3673.15
%skinMaxTemp = 3773.15
}
@PART[proceduralSRBRealFuels]:FOR[RealismOverhaul]
{
%RSSROConfig = True
%title = Solid Rocket Motor [Procedural]

@title = Solid Rocket Motor [Procedural]
@manufacturer = Generic

@maxTemp = 673.15
%skinMaxTemp = 773.15

@MODULE[ModuleGimbal]
{
%gimbalRange = 5.0
Expand All @@ -63,10 +95,14 @@
@PART[proceduralTankRealFuels]:FOR[RealismOverhaul]
{
%RSSROConfig = True
%title = Tank [Procedural]

@title = Tank [Procedural]
@manufacturer = Generic
@description = Switchable procedural tank. Comes in various levels of insulation, rigid/balloon, and pressurized/highly-pressurized forms. Defaults to type Default but can be switched to other types in the part popup menu.
@maxTemp = 800
%skinMaxTemp = 900

@maxTemp = 773.15
%skinMaxTemp = 873.15

@MODULE[ModuleFuelTanks]:HAS[~typeAvailable[ElectricPropulsion]]
{
typeAvailable = ElectricPropulsion
Expand All @@ -79,11 +115,16 @@
+PART[proceduralTankRealFuels]:FOR[RealismOverhaul]
{
%RSSROConfig = True

@name = RO-ProcTankSpaceplane
%title = Tank [Procedural, Shielded]

@title = Tank [Procedural, Shielded]
@manufacturer = Generic
@description = Heat-shielded switchable procedural tank with heat shielded Includes normal (Structural), highly pressurized (Fuselage), and cryogenic tank options. Rated for LEO reentries on a spaceplane.
@maxTemp = 1500
%skinMaxTemp = 2500

@maxTemp = 1473.14
%skinMaxTemp = 2473.15

@MODULE[ModuleFuelTanks]
{
@type = Structural
Expand All @@ -95,12 +136,23 @@
@PART[proceduralTankKethane]:FOR[RealismOverhaul]
{
%RSSROConfig = True
%title = Tank - Kethane [Procedural]

@title = Tank - Kethane [Procedural]
@manufacturer = Generic

@maxTemp = 773.15
%skinMaxTemp = 873.15
}
@PART[proceduralTankTAC]:FOR[RealismOverhaul]
{
%RSSROConfig = True
%title = Tank - Life Support [Procedural]

@title = Tank - Life Support [Procedural]
@manufacturer = Generic

@maxTemp = 673.15
%skinMaxTemp = 773.15

@MODULE[TankContentSwitcher]
{
@TANK_TYPE_OPTION[LifeSupport]
Expand Down Expand Up @@ -170,7 +222,12 @@
@PART[proceduralTankOre]:FOR[RealismOverhaul]
{
%RSSROConfig = True
%title = Tank - Ore [Procedural]

@title = Tank - Ore [Procedural]
@manufacturer = Generic

@maxTemp = 673.15
%skinMaxTemp = 773.15
}
// Extend procedural structural parts to create Procedural Crew Tubes - Parts that can be internals traversed as understood by ConnectedLivingSpace. The parts are more massive than the structural equivalent and more expensive to reflect the additional shielding etc in the part. They also have a minimum diameter of 0.8m. CLS support is removed form the regular structural parts.
+PART[proceduralStructural]:NEEDS[ProceduralParts]:BEFORE[RealismOverhaul] // could maybe be FIRST but we want to catch any prior changes.
Expand All @@ -180,11 +237,17 @@
@PART[proceduralCrewTube]:FOR[RealismOverhaul] // do our patching here.
{
@title = Crew Tube [Procedural]
%description = Air tight pressure hull protected by a thick layer of Kevlar and carbon nanofiber blankets to provide protection against micro-meteorites as well as thermal insulation and limited radiation shielding. These parts provide safe and structurally intact internal spaces to allow crew to move between crewed parts.
@manufacturer = Generic
@description = Air tight pressure hull protected by a thick layer of Kevlar and carbon nanofiber blankets to provide protection against micro-meteorites as well as thermal insulation and limited radiation shielding. These parts provide safe and structurally intact internal spaces to allow crew to move between crewed parts.

@maxTemp = 673.15
%skinMaxTemp = 773.15

@cost *= 5
@entryCost *= 3.5
%TechRequired = spaceExploration
%RSSROConfig = True

@MODULE[ProceduralPart]
{
!TECHLIMIT,*
Expand Down

0 comments on commit b989bdf

Please sign in to comment.