Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix XLR99 configs, AR2 configs #2454

Merged
merged 1 commit into from
Nov 18, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 9 additions & 5 deletions GameData/RP-1/Tree/ECM-Engines.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,7 @@
ALCE = 250000,RS-25D-E
AMBR-623N = 5000,NTOOxidizer,HydrazineFuel
AR-1 = 27000,StagedKerolox
AR-2 = 5000,XLR42-NA-2
AR-22 = 50000,RS-25D-E
ASCENT = 5544,CatalystRCS
ASRB = 0
Expand Down Expand Up @@ -231,7 +232,7 @@
ISPS = 5000,Model8250,ElectricPumps
ISPS-HDA = ISPS
Isayev-R17 = 5000, S5-2
J-2-200K = 225000, HydroloxPumps, Navaho-TP
J-2-200K = 225000, HydroloxPumps, Navaho-TP, throttlingTP, PumpReignition
J-2-225K = 20000, J-2-200K
J-2-230K = 5000, J-2-225K
J-2S = 80000, J-2
Expand Down Expand Up @@ -321,6 +322,7 @@
LR105-NA-6 = 3000, Navaho-TP-1962, LR105-NA-5
LR105-NA-7-1 = 1200, MA-5-System, LR105-NA-6
LR105-NA-7-2 = 1200, MA-5-System-I, LR105-NA-7-1
LR121-NA-1 = 5000,PumpReignition,throttlingTP
LR129-P-1 = 32474,XLR129-P-1
LR129-P-2 = 173267,LR129-P-1
LR129-P-3 = 25000,LR129-P-2
Expand Down Expand Up @@ -646,7 +648,7 @@
RJ43-MA-3 = 7500
RJ43-MA-5 = 5000,RJ43-MA-3
RL100 = 50000,RL10A-3-3A
RL10A-1 = 37549, HydroloxPumps
RL10A-1 = 37549, HydroloxPumps, PumpReignition
RL10A-3-1 = 15000, RL10A-1
RL10A-3-3 = 20000, RL10A-3-1
RL10A-3-3A = 25000,RL10A-3-3
Expand Down Expand Up @@ -719,7 +721,7 @@
Rubis = 0
Rutherford-SL = 15000, ElectricPumps
RutherfordVac = 5000, Rutherford-SL
S-155 = 10000, Wasserfall
S-155 = 10000,Wasserfall,throttlingTP,PumpReignition
S-3 = 23000, Navaho-TP
S-3D = 2000, Navaho-TP-1958, S-3
S-3FH = 5000,S-3D,Navaho-TP-1962,HydrazineFuel
Expand Down Expand Up @@ -877,9 +879,10 @@
XLR11-RM-5 = 5000,XLR11-RM-3
XLR129-P-1 = 428298,StagedHydrolox
XLR132 = 50000,HypergolicPumps,PumpReignition
XLR25-CW-1 = XLR11-RM-5, 5000
XLR25-CW-1 = 5000,XLR11-RM-5,throttlingTP,PumpReignition
XLR35-RM-1 = 8000,XLR11-RM-5
XLR41 = Navaho-PhaseII-TP
XLR42-NA-2 = 10000
XLR43-NA-1 = 5000, Navaho-PhaseIII-TP
XLR43-NA-3 = 5000,Navaho-PhaseIV-TP
XLR81-BA-11 = Model8096
Expand All @@ -888,8 +891,9 @@
XLR81-BA-5 = Model8048
XLR81-BA-7 = Model8081
XLR81-LF2-SPS = 80000,Model8096
XLR99-RM-2 = 50000, XLR11-RM-3
XLR99-RM-2 = 50000, XLR11-RM-3,throttlingTP,PumpReignition
XLR99-RM-2A = 5000,XLR99-RM-2
XLR99-RM-3 = 50000,XLR99-RM-2A
XM-20 = 6000, SergeantDev
XRJ47-W-5 = 10000,RJ43-MA-3
XRJ55-W-1 = 5000,XRJ47-W-5
Expand Down
1 change: 1 addition & 0 deletions GameData/RP-1/Tree/ECM-Parts.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -706,6 +706,7 @@
ROE-AJ260SLF = AJ260-SL1
ROE-AJ260SLF-BDB = AJ260-SL1
ROE-AJ60 = AJ-60A
ROE-AR2 = XLR42-NA-2
ROE-Aerobee = WAC-Corporal
ROE-Aerobee-Taerobee = WAC-Corporal
ROE-Agena = Model117
Expand Down
193 changes: 192 additions & 1 deletion GameData/RP-1/Tree/TREE-Engines.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -453,6 +453,14 @@
%cost = 0
}

@CONFIG[AR-2]
{
%techRequired = orbitalRocketry1959
%cost = -6
tag = EngineLiquidPF
*@PARTUPGRADE[RFUpgrade_AR-2]/deleteme -= 1
}

@CONFIG[AR-22]
{
%techRequired = FRSC2019
Expand Down Expand Up @@ -2068,6 +2076,14 @@
*@PARTUPGRADE[RFUpgrade_LR105-NA-7.2]/deleteme -= 1
}

@CONFIG[LR121-NA-1]
{
%techRequired = orbitalRocketry1963
%cost = -4
tag = EngineLiquidTurbo
*@PARTUPGRADE[RFUpgrade_LR121-NA-1]/deleteme -= 1
}

@CONFIG[LR129-P-1]
{
%techRequired = FRSC1976
Expand Down Expand Up @@ -5763,6 +5779,13 @@
%description = Americanized version of the V-2 Model 39 (A-4). It was very similar to its predecessor, but was built using American SAE components rather than Metric components, and featured several minor upgrades.
}

@CONFIG[XLR42-NA-2]
{
%techRequired = orbitalRocketry1956
%cost = 0
tag = EngineLiquidPF
}

@CONFIG[XLR43-NA-1]
{
%techRequired = earlyRocketry
Expand Down Expand Up @@ -5828,7 +5851,15 @@
@CONFIG[XLR99-RM-2A]
{
%techRequired = orbitalRocketry1962
%cost = 50
%cost = 10
*@PARTUPGRADE[RFUpgrade_XLR99-RM-2A]/deleteme -= 1
}

@CONFIG[XLR99-RM-3]
{
%techRequired = orbitalRocketry1966
%cost = 27
*@PARTUPGRADE[RFUpgrade_XLR99-RM-3]/deleteme -= 1
}

@CONFIG[XM-20]
Expand Down Expand Up @@ -7391,6 +7422,46 @@ PART
{
}

PARTUPGRADE
{
name = RFUpgrade_AR-2
partIcon = RO-H1-RS27 // FIXME Once we get dedicated model
techRequired = orbitalRocketry1959
entryCost = 0
cost = 0
title = AR2 Engine Upgrade: AR-2 Config
basicInfo = Engine Performance Upgrade
manufacturer = Engine Upgrade
deleteme = 1
description = The AR2 Engine now supports the AR-2 configuration for increased performance. Unlock it in the VAB/SPH through the engine configs interface.\n\n
}

PART
{
name = RFUpgrade_engineConfigSource_AR-2
engineType = AR2
}

@PART[RFUpgrade_engineConfigSource_AR-2]:AFTER[RealismOverhaulEngines]
{
%MODULE[Module*EngineConfigs] {
@name = ModuleEngineConfigs
%CONFIG[AR-2] {
&specLevel = operational
}
}
}

@PARTUPGRADE[RFUpgrade_AR-2]:AFTER[RealismOverhaulEngines]
{
%description = #$description$\nAvailable at specLevel $@PART[RFUpgrade_engineConfigSource_AR-2]/MODULE[ModuleEngineConfigs]/CONFIG[AR-2]/specLevel$
// TODO: could add any number of other useful fields from the CONFIG here. cost? description?
}

!PART[RFUpgrade_engineConfigSource_AR-2]:AFTER[RealismOverhaulEngines]
{
}

PARTUPGRADE
{
name = RFUpgrade_ASCENT
Expand Down Expand Up @@ -12591,6 +12662,46 @@ PART
{
}

PARTUPGRADE
{
name = RFUpgrade_LR121-NA-1
partIcon = RO-H1-RS27 // FIXME Once we get dedicated model
techRequired = orbitalRocketry1963
entryCost = 0
cost = 0
title = AR2 Engine Upgrade: LR121-NA-1 Config
basicInfo = Engine Performance Upgrade
manufacturer = Engine Upgrade
deleteme = 1
description = The AR2 Engine now supports the LR121-NA-1 configuration for increased performance. Unlock it in the VAB/SPH through the engine configs interface.\n\n
}

PART
{
name = RFUpgrade_engineConfigSource_LR121-NA-1
engineType = AR2
}

@PART[RFUpgrade_engineConfigSource_LR121-NA-1]:AFTER[RealismOverhaulEngines]
{
%MODULE[Module*EngineConfigs] {
@name = ModuleEngineConfigs
%CONFIG[LR121-NA-1] {
&specLevel = operational
}
}
}

@PARTUPGRADE[RFUpgrade_LR121-NA-1]:AFTER[RealismOverhaulEngines]
{
%description = #$description$\nAvailable at specLevel $@PART[RFUpgrade_engineConfigSource_LR121-NA-1]/MODULE[ModuleEngineConfigs]/CONFIG[LR121-NA-1]/specLevel$
// TODO: could add any number of other useful fields from the CONFIG here. cost? description?
}

!PART[RFUpgrade_engineConfigSource_LR121-NA-1]:AFTER[RealismOverhaulEngines]
{
}

PARTUPGRADE
{
name = RFUpgrade_LR129-P-1
Expand Down Expand Up @@ -24550,3 +24661,83 @@ PART
!PART[RFUpgrade_engineConfigSource_XLR81-LF2-SPS]:AFTER[RealismOverhaulEngines]
{
}

PARTUPGRADE
{
name = RFUpgrade_XLR99-RM-2A
partIcon = RO-H1-RS27 // FIXME Once we get dedicated model
techRequired = orbitalRocketry1962
entryCost = 0
cost = 0
title = XLR99 Engine Upgrade: XLR99-RM-2A Config
basicInfo = Engine Performance Upgrade
manufacturer = Engine Upgrade
deleteme = 1
description = The XLR99 Engine now supports the XLR99-RM-2A configuration for increased performance. Unlock it in the VAB/SPH through the engine configs interface.\n\n
}

PART
{
name = RFUpgrade_engineConfigSource_XLR99-RM-2A
engineType = XLR99
}

@PART[RFUpgrade_engineConfigSource_XLR99-RM-2A]:AFTER[RealismOverhaulEngines]
{
%MODULE[Module*EngineConfigs] {
@name = ModuleEngineConfigs
%CONFIG[XLR99-RM-2A] {
&specLevel = operational
}
}
}

@PARTUPGRADE[RFUpgrade_XLR99-RM-2A]:AFTER[RealismOverhaulEngines]
{
%description = #$description$\nAvailable at specLevel $@PART[RFUpgrade_engineConfigSource_XLR99-RM-2A]/MODULE[ModuleEngineConfigs]/CONFIG[XLR99-RM-2A]/specLevel$
// TODO: could add any number of other useful fields from the CONFIG here. cost? description?
}

!PART[RFUpgrade_engineConfigSource_XLR99-RM-2A]:AFTER[RealismOverhaulEngines]
{
}

PARTUPGRADE
{
name = RFUpgrade_XLR99-RM-3
partIcon = RO-H1-RS27 // FIXME Once we get dedicated model
techRequired = orbitalRocketry1966
entryCost = 0
cost = 0
title = XLR99 Engine Upgrade: XLR99-RM-3 Config
basicInfo = Engine Performance Upgrade
manufacturer = Engine Upgrade
deleteme = 1
description = The XLR99 Engine now supports the XLR99-RM-3 configuration for increased performance. Unlock it in the VAB/SPH through the engine configs interface.\n\n
}

PART
{
name = RFUpgrade_engineConfigSource_XLR99-RM-3
engineType = XLR99
}

@PART[RFUpgrade_engineConfigSource_XLR99-RM-3]:AFTER[RealismOverhaulEngines]
{
%MODULE[Module*EngineConfigs] {
@name = ModuleEngineConfigs
%CONFIG[XLR99-RM-3] {
&specLevel = operational
}
}
}

@PARTUPGRADE[RFUpgrade_XLR99-RM-3]:AFTER[RealismOverhaulEngines]
{
%description = #$description$\nAvailable at specLevel $@PART[RFUpgrade_engineConfigSource_XLR99-RM-3]/MODULE[ModuleEngineConfigs]/CONFIG[XLR99-RM-3]/specLevel$
// TODO: could add any number of other useful fields from the CONFIG here. cost? description?
}

!PART[RFUpgrade_engineConfigSource_XLR99-RM-3]:AFTER[RealismOverhaulEngines]
{
}
17 changes: 14 additions & 3 deletions GameData/RP-1/Tree/TREE-Parts.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -7222,7 +7222,7 @@
@PART[RO-XLR99]:FOR[xxxRP0]
{
%TechRequired = orbitalRocketry1959
%cost = 315
%cost = 333
%entryCost = 0
RP0conf = true
@description ^=:$: <b><color=green>From Stock (RO Config) mod</color></b>
Expand Down Expand Up @@ -10031,6 +10031,17 @@

%MODULE[ModuleTagList] { tag = EngineSolid }

}
@PART[ROE-AR2]:FOR[xxxRP0]
{
%TechRequired = orbitalRocketry1956
%cost = 91
%entryCost = 0
RP0conf = true
@description ^=:$: <b><color=green>From ROEnginesExtended mod</color></b>

%MODULE[ModuleTagList] { tag = EngineLiquidTurbo }

}
@PART[ROE-Aerobee]:FOR[xxxRP0]
{
Expand Down Expand Up @@ -13234,7 +13245,7 @@
@PART[ROE-XLR99]:FOR[xxxRP0]
{
%TechRequired = orbitalRocketry1959
%cost = 315
%cost = 333
%entryCost = 0
RP0conf = true
@description ^=:$: <b><color=green>From ROEngines mod</color></b>
Expand Down Expand Up @@ -13934,7 +13945,7 @@
@PART[ROEE-XLR99A]:FOR[xxxRP0]
{
%TechRequired = orbitalRocketry1962
%cost = 315
%cost = 333
%entryCost = 0
RP0conf = true
@description ^=:$: <b><color=green>From ROEnginesExtended mod</color></b>
Expand Down
Loading
Loading