Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: KSP-RO/RealismOverhaul
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: d9c82011fd35
Choose a base ref
...
head repository: KSP-RO/RealismOverhaul
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 7a010a07e01f
Choose a head ref
  • 4 commits
  • 5 files changed
  • 2 contributors

Commits on Sep 2, 2018

  1. Copy the full SHA
    8f2c390 View commit details

Commits on Sep 19, 2018

  1. Remove mass and reduce maximum temperature

    * Remove the mass parameter since it breaks some global engine config calculations.
    
    * Reduce the maximum temperature to something saner - 773.15 K (500 °C) and 873.15 K skin temperature (600 °C). 1800 K (1526 °C) is far too high for a rocket motor.
    
    * Do a += description on the RaiderNick US Rockets part to leave in the directions about how to radially place these and to remove the fins as this is important for proper use with his rocket parts.
    Tidal-Stream committed Sep 19, 2018
    Copy the full SHA
    f9032b4 View commit details
  2. Copy the full SHA
    0b3e380 View commit details

Commits on Sep 23, 2018

  1. Merge pull request #1920 from Tidal-Stream/fasa-srb

    Use global configs for Castor 1
    raidernick authored Sep 23, 2018
    Copy the full SHA
    7a010a0 View commit details
37 changes: 28 additions & 9 deletions GameData/RealismOverhaul/Engine_Configs/Castor_1_Config.cfg
Original file line number Diff line number Diff line change
@@ -13,6 +13,10 @@
// Used by:

// Squad
// RealFuels
// FASA
// RN_USRockets
// Bluedog_DB
// ==================================================

@PART[*]:HAS[#engineType[Castor-1]]:FOR[RealismOverhaulEngines]
@@ -21,13 +25,35 @@
%title = Castor 1
%manufacturer = Thiokol
%description = The Castor 1 was first used for a successful suborbital launch of a Scout X-1 rocket on September 2, 1960. Castor 1 stages were also used as strap-on boosters for launch vehicles using Thor first stages, including the Delta-D. Diameter: [0.79 m].
%maxTemp = 773.15
%skinMaxTemp = 873.15

!MODULE[ModuleAlternator],*{}

// FASA gives its Castor a gimbal. Weird.
!MODULE[ModuleGimbal] {}

!RESOURCE,*{}

@MODULE[ModuleEngines*]
{
%EngineType = SolidBooster
@minThrust = 0
@maxThrust = 286
@heatProduction = 100
@atmosphereCurve
{
@key,0 = 0 247
@key,1 = 0 232
}
}
MODULE
{
name = ModuleFuelTanks
volume = 1912.07
type = PSPC
basemass = -1
}

!MODULE[ModuleGimbal],*{}

!MODULE[ModuleEngineConfigs],*{}

@@ -78,13 +104,6 @@
}
}
}

!MODULE[ModuleAlternator],*{}

// FASA gives its Castor a gimbal. Weird.
!MODULE[ModuleGimbal] {}

!RESOURCE,*{}
}

@PART[*]:HAS[@MODULE[ModuleEngineConfigs]:HAS[@CONFIG[Castor-1]],!MODULE[TestFlightInterop]]:BEFORE[zTestFlight]
25 changes: 0 additions & 25 deletions GameData/RealismOverhaul/RO_DependentMods/RO_RealFuels_Engines.cfg
Original file line number Diff line number Diff line change
@@ -111,33 +111,8 @@
@node_stack_bottom = 0.0, -2.9578846, 0.0, 0.0, -1.0, 0.0, 1
@node_stack_top = 0.0, 2.961952, 0.0, 0.0, 1.0, 0.0, 1
@node_attach = 0.0, 0.0, -0.40132, 0.0, 0.0, 1.0
@title = Castor I
%manufacturer = Thiokol
@description = The motor used in the Sergeant tactical missile, the Castor (later Castor I) has been used in many applications: a set of four were used in Little Joe, the Mercury test vehicle; they were used as strap-on boosters for Thor-Delta and Thor-Agena; they were used as the second stage in the all-solid Scout launch vehicle; and they were used in many other minor applications. Burn time 27s. Other models have reported burn times of 37s, so set thrust limiter to 73 to simulate those. [0.8 m]
@attachRules = 1,1,1,1,0
@mass = 0.535
@maxTemp = 1800
@MODULE[ModuleEngines*]
{
@minThrust = 0
@maxThrust = 286
@heatProduction = 100
@atmosphereCurve
{
@key,0 = 0 247
@key,1 = 0 232
}
}
!RESOURCE[SolidFuel]
{
}
MODULE
{
name = ModuleFuelTanks
volume = 1912.07
type = PSPC
basemass = -1
}
%engineType = Castor-1
}
@PART[solidBoosterSmall]:FOR[RealismOverhaul]:NEEDS[!RftS,!RealFuels_StockEngines]
Original file line number Diff line number Diff line change
@@ -629,27 +629,7 @@
scale = 1.50, 1.50, 1.50
}
%node_attach = 0.0, 0.0, -0.40, 0.0, 0.0, 1.0, 1
@maxTemp = 1800
@mass = 0.535
!RESOURCE[SolidFuel]
{
}
MODULE
{
name = ModuleFuelTanks
volume = 1912.07
basemass = -1
type = PSPC
}
@MODULE[ModuleEngines*]
{
%maxThrust = 286
@atmosphereCurve
{
@key,0 = 0 247
@key,1 = 1 232
}
}
%engineType = Castor-1
}
65 changes: 1 addition & 64 deletions GameData/RealismOverhaul/RO_SuggestedMods/FASA/RO_FASA_Other.cfg
Original file line number Diff line number Diff line change
@@ -1,71 +1,8 @@
@PART[FASADeltaCastorSrb]:FOR[RealismOverhaul]
{
%RSSROConfig = True
@title = Castor 1 Solid Rocket Motor
@description = A booster motor for the Delta D rocket.
@mass = 0.535
@maxTemp = 1973.15
!RESOURCE[SolidFuel]
{
}
@MODULE[ModuleEngines*]
{
@minThrust = 0
@maxThrust = 286
@heatProduction = 100
%allowShutdown = False
@atmosphereCurve
{
@key,0 = 0 247
@key,1 = 1 232
}
}
MODULE
{
name = ModuleFuelTanks
volume = 1874
type = HTPB
basemass = -1
}
MODULE
{
name = ModuleEngineConfigs
type = ModuleEngines
configuration = SolidFuel
modded = false
CONFIG
{
name = SolidFuel
maxThrust = 286
heatProduction = 100
PROPELLANT
{
name = HTPB
ratio = 1
DrawGauge = True
}
atmosphereCurve
{
key = 0 247
key = 1 232
}
curveResource = HTPB
// guesses (note: max is above nominal * thrust_curve_max)
chamberNominalTemp = 1500
maxEngineTemp = 1745
thrustCurve
{
key = 0 0.2 0.6566457 0.6566457
key = 0.08 0.7826234 11.38028 11.38028
key = 0.12 1.091428 0 0
key = 0.177 1.072238 -0.3012535 -0.3012535
key = 0.832 0.9977316 0.2489114 0.2489114
key = 0.91 1.052388 1.565168 1.565168
key = 0.9730649 1.160696 0 0
key = 1 0.93 -4.794868 -6.284284
}
}
}
%engineType = Castor-1
}
@PART[FASADeltaMB3LFE]:FOR[RealismOverhaul]
{
Original file line number Diff line number Diff line change
@@ -4586,79 +4586,13 @@
@PART[rn_thor_castor]:FOR[RealismOverhaul]
{
%RSSROConfig = True
@title = Castor-1 Solid Rocket Motor
@manufacturer = Aerojet
@description = Castor 1 SRB for the Thor-Able/Delta D rocket. Put three of these radially around the core stage. Remove the fins on the core stage before using this.
@mass = 0.886 //0.887-0.001
@maxTemp = 773.15
%skinMaxTemp = 873.15
!RESOURCE[SolidFuel]
{
}
@MODULE[ModuleEngines*]
{
@minThrust = 0
@maxThrust = 286
@heatProduction = 100
%allowShutdown = False
@atmosphereCurve
{
@key,0 = 0 247
@key,1 = 1 232
}
}
MODULE
{
name = ModuleFuelTanks
volume = 1912.069
type = PSPC
basemass = -1
TANK
{
name = PSPC
amount = 1912.069
maxAmount = 1912.069
}
}
MODULE
{
name = ModuleEngineConfigs
type = ModuleEngines
configuration = Castor-1
modded = false
CONFIG
{
name = Castor-1
maxThrust = 286
heatProduction = 100
PROPELLANT
{
name = PSPC
ratio = 1
DrawGauge = True
}
atmosphereCurve
{
key = 0 247
key = 1 232
}
curveResource = PSPC
// guesses (note: max is above nominal * thrust_curve_max)
chamberNominalTemp = 1500
maxEngineTemp = 1745
thrustCurve
{
key = 0 0.2 0.6566457 0.6566457
key = 0.08 0.7826234 11.38028 11.38028
key = 0.12 1.091428 0 0
key = 0.177 1.072238 -0.3012535 -0.3012535
key = 0.832 0.9977316 0.2489114 0.2489114
key = 0.91 1.052388 1.565168 1.565168
key = 0.9730649 1.160696 0 0
key = 1 0.93 -4.794868 -6.284284
}
}
}
%engineType = Castor-1
}

@PART[rn_thor_castor]:AFTER[RealismOverhaulEngines]
{
@description ^=:$: Put three of these radially around the core stage. Remove the fins on the core stage before using this.
}

//Thor Able Stages