Skip to content

Commit

Permalink
Fix RD107/RD108, and also update to master (#15)
Browse files Browse the repository at this point in the history
* Add RO Support for ROTanks KatnissTanks

* Add support for Photon Corp RSRM and RSRMV. Waterfall configs only

* Fix Photon Corp WaterFall glow clipping

* ROWaterfall: fix auto-config for derived MEC

* Remove support for ProcFairings pre-v6

Fix PF v6 mass calculations by using the provided decouplerMassMult/decouplerMassBase tooling.  Previously, disabling the decoupler was not giving a mass savings.

* Fix R-4D-11 TF config (KSP-RO#2582)

was using wrong config name in selector

* Add PhotonCorp RealPlume configs for RSRM and RSRMV

* Increase J57-P-8 temp limit (KSP-RO#2589)

Increase the temperature limit of the J57-P-8 to get it a bit closer to it's advertised performance, and more competitive with RD-9B

Also edit J48 description to be less confusing

* Engine config for Filament Wound Casing RSRM (KSP-RO#2587)

* Add source example to Engine Config Template

* Add RSRM FWC-SRM config

* Link PhotonCorp RSRM color to engine config

* Add tagging system for ModuleCargoPart (KSP-RO#2591)

Every part that doesn't have ROCargoConfig tag will be stripped of it's ModuleCargoPart PM.

* Basic configs for KSP 1.11+ kerbals (KSP-RO#2537)

* Revert "Remove kerbalCrewMass (KSP-RO#2290)"

* No, KSP, we don't want you to adjust the mass of our crewed parts

* Configure mass for KSP 1.11+ jetpack and chute

* Make sure only KSP 1.11+ installs get crew mass

* Change EVA fuel to Nitrogen and increase Kerbal Carry Capacity

* Also change EVA fuel resource for 1.10

Co-authored-by: siimav

* Add support for RMM (KSP-RO#2585)

Add engine and Waterfall configs for RMM by EStreetrockets.

* Add P&W Model 304 (KSP-RO#2581)

* Update version to v14.10.0.0

* Added configs for two additional sizes of RCS Blocks

* Configured RCS Blocks with Variants that Squad added in 1.11

* Adjust tank masses when LH2 is loaded (KSP-RO#2578)

Decrease the tankage mass of all tanks except balloon when LH2 is loaded. This is to simulate the fact that LH2 is extremely light, and requires much less structural mass to support.

The 80% mass reduction seems to accurately simulate CBC and SII/SIV, without making smaller stages like DCSS significantly underweight.

* Add restart timer to RD-119, S5.92, update descriptions (KSP-RO#2592)

* Add restart timer to RD-119

Add restart timer to RD-119 to prevent it from staying in pumped idle forever. Due to lack of data, we're going with 90 minutes.

* Add more descriptions

Add restart windows to descriptions of applicable engines, and add restart window to the S5.92 and S5.98M

* Add RO configs for New Tantares Mir station parts revamp. (KSP-RO#2515)

* Change to 1.12's new stock RCS blocks (KSP-RO#2594)

* MLI Settings Use RF+PartUpgrades (KSP-RO#2595)

Remove MLI definitions from tanks, and instead use part upgrades to upgrade all tanks at once.  RF implements default PartUpgrades.  RP-0 PR will address separately.

* Add RCSBlock so older craft still load (KSP-RO#2576)

* Revert "Change to 1.12's new stock RCS blocks (KSP-RO#2594)"

This reverts commit b59d721.

* Fix broken tech transfer F-1->F-1A (can't have spaces)

* Add SolarConfig support for multiple identical solar modules (KSP-RO#2599)

* Rename Integral to Isogrid in part title / description but leave RF tank type Integral so as to not break craft

* ROWaterfall: colorful plumes
April Fools, makes all Waterfall plumes rainbow-colored on April 1st.
To disable (effective on game restart), create an empty file named
`GameData/RealismOverhaul/Plugins/PluginData/DisableRainbowPloom`.

* ROWaterfall: support useRelativeScaling with hybrid plumes

* ROWaterfall: import templates from @Katniss218

* Add RD-0120T, fix RD-0120, 701, 704 (KSP-RO#2549)

* Add Rocketdyne G-1 (KSP-RO#2598)

Add config for Rocketdyne G-1 (NOMAD).

* Add more resource boiling points, move resource prices to RP-1 (KSP-RO#2600)

* Near Future Propulsion updates (KSP-RO#2574)

* SSME variants and triprop support (KSP-RO#2569)

Update configs to use MBEC instead of MEC

* Near future Launch Vehicles Support (KSP-RO#2567)

Add support for Nertea's Near Future Launch Vehicles.

* High Performance Prototypes (KSP-RO#2603)

Add RS-30, RD301 config, update RD-701, 704, and LR129 configs. Add support for ROE LR129, RD301, RD270.

* BDB Keyhole Parachute Fix (KSP-RO#2601)

* Dynamic Part Hider (KSP-RO#2586)

Adds a system to dynamically hide parts in the VAB/SPH and RnD building based on filters.

Implements a filters for hiding speculative parts based on a difficulty setting that is save independent.

* Add speclevel tagging to engines, fix techTransfer (KSP-RO#2606)

Add specLevel tagging to engine configs, and correct the ordering of techTransfer tags.

* Feed 1.12 DLLs to build scripts

* Update .version file script to target KSP 1.12

* Update version to v14.11.0.0

* Fix proton verniers (KSP-RO#2611)

Apply ignition, ullage and pressurefed tags to Proton verniers and 3rd stage

* Finish transfering RO config of ProcParts

Last value that hasn't already been pulled from ProcParts into RO

* Fix cfg syntax errors (KSP-RO#2612)

* Move fuel property data to RF (KSP-RO#2614)

Move thermal data to RF, where it probably belongs, and add tank definitions for liquid Nitrogen and liquid Helium

* Fix cfg error: invalid use of OR inside HAS (KSP-RO#2616)

* Fix Inconsistent CrewCapacity

PART.CrewCapacity not PART.crewCapacity

* Globally set applyKerbalMassModification

Disable KSP 1.12 reducing part mass based on crew capacity by default.  Override if desired in later pass.  This is because RO by convention assigns part masses without the crew, opposite a later KSP/stock assumption.
Based on stock Physics.cfg, set kerbalCrewMass and perSeatReduction to same value (the mass of the kerbal) and perCommandSeatReduction to include jetpack + parachute.
Since RO is 1.12-only, remove older version guards in NEEDS
Warning: don't set perCommandSeatReduction to 0, it breaks code in kerbal jumping resulting in infinte force applied, which crashes KSP after causing a NaN position/orbit.

* Change specparts default to be Speculative

This feels like a reasonable midway between Show All The Things and Show None Of The Things.

* Fix RD-107 and RD-108

Fix various issues in the RD-107 and RD-108 configs, including incorrect masses, and the 11D511/11D512 configs being swapped.

* Fix config names

Fix 11D511/11D512 names since this is savebreaking anyway

Co-authored-by: Dan <papwr17@gmail.com>
Co-authored-by: stonesmileGit <luddeboda99@gmail.com>
Co-authored-by: Alvin Meng <alvin.q.meng@gmail.com>
Co-authored-by: DRVeyl <DRVeyl@gmail.com>
Co-authored-by: Louis-Philippe Gagnon <lpgagnon@gmail.com>
Co-authored-by: Stonesmile <62522391+StonesmileGit@users.noreply.github.com>
Co-authored-by: siimav <siim.aaver@gmail.com>
Co-authored-by: GitHub Actions Bot <>
Co-authored-by: D0m1nu2 <75164010+D0m1nu2@users.noreply.github.com>
Co-authored-by: jimmymcgoochie <58994285+jimmymcgoochie@users.noreply.github.com>
Co-authored-by: NathanKell <nathankell@gmail.com>
Co-authored-by: Vieju17 <101110510+Vieju17@users.noreply.github.com>
Co-authored-by: HebaruSan <HebaruSan@users.noreply.github.com>
  • Loading branch information
13 people authored Apr 2, 2022
1 parent d021f88 commit d5e880b
Show file tree
Hide file tree
Showing 418 changed files with 21,919 additions and 2,171 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/attachReleaseArtifacts.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ jobs:
env:
KSP_ZIP_PASSWORD: ${{ secrets.KSP_ZIP_PASSWORD }}
run: |
curl https://ksp-ro.s3-us-west-2.amazonaws.com/KSPAssemblies-1.10.zip --output /tmp/bins.zip
curl https://ksp-ro.s3-us-west-2.amazonaws.com/KSPAssemblies-1.12.zip --output /tmp/bins.zip
KSP_DLL_PATH="/opt/ksp/assembly"
echo "::set-output name=ksp-dll-path::${KSP_DLL_PATH}"
mkdir -p "${KSP_DLL_PATH}"
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/buildAndTest.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ jobs:
env:
KSP_ZIP_PASSWORD: ${{ secrets.KSP_ZIP_PASSWORD }}
run: |
curl https://ksp-ro.s3-us-west-2.amazonaws.com/KSPAssemblies-1.10.zip --output /tmp/bins.zip
curl https://ksp-ro.s3-us-west-2.amazonaws.com/KSPAssemblies-1.12.zip --output /tmp/bins.zip
KSP_DLL_PATH="/opt/ksp/assembly"
echo "::set-output name=ksp-dll-path::${KSP_DLL_PATH}"
mkdir -p "${KSP_DLL_PATH}"
Expand Down
34 changes: 17 additions & 17 deletions GameData/RealismOverhaul/DMagic_NO_US_Config.cfg
Original file line number Diff line number Diff line change
@@ -1,18 +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]
{
!PART[dmUSMagBoom]:FOR[RealismOverhaul]:NEEDS[!UniversalStorage]
{
}
!PART[dmUSScope]:FOR[RealismOverhaul]:NEEDS[!UniversalStorage]
{
}
!PART[USRPWS]:FOR[RealismOverhaul]:NEEDS[!UniversalStorage]
{
}
!PART[dmUSPresTemp]:FOR[RealismOverhaul]:NEEDS[!UniversalStorage]
{
}
!PART[dmUSMat]:FOR[RealismOverhaul]:NEEDS[!UniversalStorage]
{
}
!PART[dmUSGoo]:FOR[RealismOverhaul]:NEEDS[!UniversalStorage]
{
}
12 changes: 12 additions & 0 deletions GameData/RealismOverhaul/EVA.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,18 @@
@MODULE[KerbalEVA]
{
@linPower /= 5
@propellantResourceName = Nitrogen
}

@RESOURCE[EVA?Propellant]
{
@name = Nitrogen
}

// Set the carry limit to mass of Jetpack + Parachute + 75 kg (value of jetpack + parachute gotten by testing the mass in-game)
@MODULE[ModuleInventoryPart]
{
@massLimit = 0.180
}
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,9 @@

// Sources:

// (1) Source 1
// (2) Source 2

// Wikipedia - Rocket Engine: https://en.wikipedia.org/wiki/Rocket_engine

// Used by:
Expand All @@ -53,6 +56,8 @@
%manufacturer = ???
%description = ???

%specLevel = operational //operational, prototype, concept, speculative, altHist, sciFi

@MODULE[ModuleEngines*]
{
%EngineType = LiquidFuel //LiquidFuel or SolidBooster
Expand All @@ -62,7 +67,7 @@
!RESOURCE,*{}
!MODULE[ModuleEngineConfigs],*{} //This patch should get rid of any moduleEngineConfigs in the part, but you should remove any that are there anyway just in case

//If the engine doesn't have a gimbal, use !MODULE[ModuleGimbal] instead
//If the engine doesn't have a gimbal, use !MODULE[ModuleGimbal]{} instead
//If the original engine doesn't have a gimbal, you must set up a module gimbal for it first
@MODULE[ModuleGimbal]
{
Expand Down Expand Up @@ -99,6 +104,7 @@
{
name = Config_Name_1 //No spaces in config names
description = ???
specLevel = operational //operational, prototype, concept, speculative, altHist, sciFi
minThrust = 1
maxThrust = 1
ratedBurnTime = 120
Expand Down Expand Up @@ -140,6 +146,7 @@
{
name = Config_Name_2
description = ???
specLevel = prototype //operational, prototype, concept, speculative, altHist, sciFi
minThrust = 35.2
maxThrust = 35.2
ratedBurnTime = 120
Expand Down
5 changes: 4 additions & 1 deletion GameData/RealismOverhaul/Engine_Configs/18KS7800_Config.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,9 @@
%title = Aerojet 1.8KS7800
%manufacturer = Aerojet
%description = Small, solid fueled booster, taken from the AIM-7 Sparrow missile. It was used as the third stage on the Aerobee 300 and Aerobee 300A sounding rockets.


%specLevel = operational

@MODULE[ModuleEngines*]
{
%EngineType = SolidBooster
Expand Down Expand Up @@ -72,6 +74,7 @@
CONFIG
{
name = 1_8KS7800
specLevel = operational
minThrust = 34.09116
maxThrust = 34.09116
heatProduction = 100
Expand Down
5 changes: 4 additions & 1 deletion GameData/RealismOverhaul/Engine_Configs/25KS18000_Config.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,9 @@
%title = Aerojet 2.5KS18000
%manufacturer = Aerojet
%description = Small, but powerful solid fueled booster used as the first stage for the Aerobee line of Sounding Rockets.


%specLevel = operational

@MODULE[ModuleEngines*]
{
%EngineType = SolidBooster
Expand Down Expand Up @@ -72,6 +74,7 @@
CONFIG
{
name = 2_5KS18000
specLevel = operational
minThrust = 88.06796
maxThrust = 88.06796
heatProduction = 100
Expand Down
5 changes: 4 additions & 1 deletion GameData/RealismOverhaul/Engine_Configs/A-4_Config.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,8 @@
%manufacturer = Thiel
%description = Thiel Lox/Alcohol rocket engine. Used on V-2 missile. Work began June 1936. Interim design, but went into production. Used 18 x 1.5 tonne thrust chambers, feeding common mixing chamber. Tested from 1939, mass production 1943-1945.

%specLevel = operational

@MODULE[ModuleEngines*]
{
%EngineType = LiquidFuel
Expand Down Expand Up @@ -79,6 +81,7 @@
CONFIG
{
name = A-4
specLevel = operational
maxThrust = 284.68
minThrust = 284.68
maxEngineTemp = 3000
Expand Down Expand Up @@ -128,7 +131,7 @@
minThrust = 288.68
maxEngineTemp = 3000
chamberNominalTemp = 2923
//speculative = fictional
specLevel = speculative

atmosphereCurve
{
Expand Down
3 changes: 3 additions & 0 deletions GameData/RealismOverhaul/Engine_Configs/AJ10_137_Config.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,8 @@
%manufacturer = Aerojet
%description = The Aerojet AJ10-137 was used as the Service Propulsion System (SPS) on the Apollo Service Module. It was designed to operate for up to 750 seconds and could restart 50 times.

%specLevel = operational

@MODULE[ModuleEngines*]
{
%EngineType = LiquidFuel
Expand All @@ -74,6 +76,7 @@
CONFIG
{
name = AJ10-137
specLevel = operational
minThrust = 97.416
maxThrust = 97.416
heatProduction = 38
Expand Down
9 changes: 6 additions & 3 deletions GameData/RealismOverhaul/Engine_Configs/AJ10_190_Config.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,8 @@
%manufacturer = Aerojet Rocketdyne
%description = Low thrust pressure-fed hypergolic engine. It was used on the Space Shuttle for orbital insertion, maneuvering and deorbiting. Currently used by the Orion MPCV.

%specLevel = operational

@MODULE[ModuleEngines*]
{
%EngineType = LiquidFuel
Expand Down Expand Up @@ -89,6 +91,7 @@
CONFIG
{
name = AJ10-190-OMS
specLevel = operational
minThrust = 26.7
maxThrust = 26.7
heatProduction = 28
Expand Down Expand Up @@ -133,13 +136,13 @@
CONFIG
{
name = AJ10-190-Orion
specLevel = operational //technically hasn't flown yet, but design frozen and will soon
minThrust = 33.4
maxThrust = 33.4
massMult = 1.0
ullage = False
pressureFed = True
ignitions = 500
techRequired = specializedCommandModules
IGNITOR_RESOURCE
{
Expand Down Expand Up @@ -201,7 +204,7 @@
ignitionReliabilityEnd = 0.999814
cycleReliabilityStart = 0.996468
cycleReliabilityEnd = 0.999442
techTransfer = AJ10-37,AJ10-42,AJ10-142,AJ10-118,AJ10-118F,AJ10-118K,AJ10-137,AJ10-138:50
techTransfer = AJ10-138,AJ10-137,AJ10-118K,AJ10-118F,AJ10-118,AJ10-142,AJ10-42,AJ10-37:50
}
@MODULE[ModuleEngineConfigs] { @CONFIG[AJ10-190-OMS] { %ratedBurnTime = #$/TESTFLIGHT[AJ10-190-OMS]/ratedBurnTime$ } }
@MODULE[ModuleEngineConfigs] { @CONFIG[AJ10-190-OMS] { %ratedContinuousBurnTime = #$/TESTFLIGHT[AJ10-190-OMS]/ratedContinuousBurnTime$ } }
Expand All @@ -226,7 +229,7 @@
ignitionReliabilityEnd = 0.999814
cycleReliabilityStart = 0.996468
cycleReliabilityEnd = 0.999442
techTransfer = AJ10-37,AJ10-42,AJ10-142,AJ10-118,AJ10-118F,AJ10-118K,AJ10-137,AJ10-138,AJ10-190-OMS:50
techTransfer = AJ10-190-OMS,AJ10-138,AJ10-137,AJ10-118K,AJ10-118F,AJ10-118,AJ10-142,AJ10-42,AJ10-37:50
}
@MODULE[ModuleEngineConfigs] { @CONFIG[AJ10-190-Orion] { %ratedBurnTime = #$/TESTFLIGHT[AJ10-190-Orion]/ratedBurnTime$ } }
@MODULE[ModuleEngineConfigs] { @CONFIG[AJ10-190-Orion] { %ratedContinuousBurnTime = #$/TESTFLIGHT[AJ10-190-Orion]/ratedContinuousBurnTime$ } }
Expand Down
12 changes: 9 additions & 3 deletions GameData/RealismOverhaul/Engine_Configs/AJ10_Adv_Config.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -88,6 +88,8 @@
%manufacturer = Aerojet Rocketdyne
%description = Small pressure-fed hypergolic upper stage engine. Derivative of the first US liquid rocket engine, the AJ10 series is perhaps the longest-lived of any engine series, a part of the US's first satellite launch vehicle, Vanguard, the Apollo CSM, and even one projected Orion service module. This represents advanced era AJ10s with a nozzle extension and restart capability. Used on Transtage as AJ10-138; similar models but back with the -118 designation were used on the Delta F and Delta K upper stages.
%specLevel = operational
@MODULE[ModuleEngines*]
{
%EngineType = LiquidFuel
Expand Down Expand Up @@ -117,6 +119,7 @@
{
name = AJ10-138
description = Upper Stage engine used on the Titan Transtage
specLevel = operational
maxThrust = 35.585
minThrust = 35.585
heatProduction = 100
Expand Down Expand Up @@ -161,6 +164,7 @@
{
name = AJ10-118F
description = Delta-F Upper Stage Engine
specLevel = operational
minThrust = 42.3
maxThrust = 42.3
heatProduction = 100
Expand Down Expand Up @@ -210,6 +214,7 @@
{
name = AJ10-118K
description = Upper stage engine for the Delta-K
specLevel = operational
minThrust = 43.7
maxThrust = 43.7
heatProduction = 100
Expand Down Expand Up @@ -257,6 +262,7 @@
{
name = AJ10-133-LH
description = AJ10 variant burning liquid hydrogen and oxygen, proposed for use on the GE D-2 Apollo vehicle.
specLevel = prototype
minThrust = 26.67
maxThrust = 26.67
heatProduction = 100
Expand Down Expand Up @@ -322,7 +328,7 @@
ignitionReliabilityEnd = 0.997718
cycleReliabilityStart = 0.972634
cycleReliabilityEnd = 0.995679
techTransfer = AJ10-104,AJ10-118E:15 // New dual design lead to many early growing pains issues
techTransfer = AJ10-118E,AJ10-104:15 // New dual design lead to many early growing pains issues
}
@MODULE[ModuleEngineConfigs] { @CONFIG[AJ10-138] { %ratedBurnTime = #$/TESTFLIGHT[AJ10-138]/ratedBurnTime$ } }
}
Expand All @@ -347,7 +353,7 @@
ignitionReliabilityEnd = 0.999414
cycleReliabilityStart = 0.994444
cycleReliabilityEnd = 0.999123
techTransfer = AJ10-138,AJ10-118E:50
techTransfer = AJ10-118E,AJ10-138:50
}
@MODULE[ModuleEngineConfigs] { @CONFIG[AJ10-118F] { %ratedBurnTime = #$/TESTFLIGHT[AJ10-118F]/ratedBurnTime$ } }
}
Expand All @@ -365,7 +371,7 @@
ignitionReliabilityEnd = 0.999414
cycleReliabilityStart = 0.994444
cycleReliabilityEnd = 0.999123
techTransfer = AJ10-138,AJ10-118E,AJ10-118F:50
techTransfer = AJ10-118F,AJ10-118E,AJ10-138:50
}
@MODULE[ModuleEngineConfigs] { @CONFIG[AJ10-118K] { %ratedBurnTime = #$/TESTFLIGHT[AJ10-118K]/ratedBurnTime$ } }
}
Expand Down
Loading

0 comments on commit d5e880b

Please sign in to comment.