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

Configure Soviet/Russian Hall Effect thrusters #2063

Merged
merged 1 commit into from
Jun 25, 2023
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
10 changes: 9 additions & 1 deletion GameData/RP-1/Tree/ECM-Engines.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -686,10 +686,18 @@
S5-60 = 50000, HypergolicPumps
SNTPPFE100-Hydrogen = 10000, SNTPPFE100-Prototype
SNTPPFE100-Prototype = 135000, Phoebus2N100-Hydrogen
SPT-100 = 10000
SPT-100 = 10000,SPT-70
SPT-100B = 1000,SPT-100
SPT-100D = 5000,SPT-100M
SPT-100M = 1000,SPT-100B
SPT-140 = 15000,SPT-100
SPT-140D = 10000,SPT-140
SPT-50 = 5000,SPT-60
SPT-50M = 5000,SPT-50
SPT-60 = 10000
SPT-70 = 10000,SPT-60
SPT-70M = 5000,SPT-70
SPT-70MK = 1000,SPT-70M
SRMU = 144000,SolidsSegmented,SolidsTVC
STAR-17 = 15000,STARCTPB
STAR-37 = 5000, Altair-III, SolidsPBAN
Expand Down
5 changes: 5 additions & 0 deletions GameData/RP-1/Tree/ECM-Parts.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -619,6 +619,10 @@
RO-SNAP-19-RTG = 50000,RTGlevel3
RO-SNAP-9-RTG = 50000,RTGlevel2
RO-SPT100 = SPT-100
RO-SPT140 = SPT-140
RO-SPT50 = SPT-50
RO-SPT60 = SPT-60
RO-SPT70 = SPT-70
RO-SRLaunchClamp = 1
RO-SSTU-DP-APAS = APAS8995Dock
RO-SSTU-M1-SL = M-1SL
Expand All @@ -637,6 +641,7 @@
RO-X-248 = Altair
RO-X-258 = Altair-II
RO-XLR99 = XLR99
RO-ionSPT60 = SPT-60
RO-jt8d1 = JT8D-1
RO-model304 = Model304-2
RO-nflv-rcs-aero-heavy-1-half = 1
Expand Down
212 changes: 212 additions & 0 deletions GameData/RP-1/Tree/TREE-Engines.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -4515,6 +4515,58 @@
*@PARTUPGRADE[RFUpgrade_SPT-100M]/deleteme -= 1
}

@CONFIG[SPT-140]
{
%techRequired = elecPropulsion1998
%cost = 0
}

@CONFIG[SPT-140D]
{
%techRequired = elecPropulsion2009
%cost = 110
*@PARTUPGRADE[RFUpgrade_SPT-140D]/deleteme -= 1
}

@CONFIG[SPT-50]
{
%techRequired = earlyElecPropulsion
%cost = 0
}

@CONFIG[SPT-50M]
{
%techRequired = elecPropulsion1986
%cost = 24
*@PARTUPGRADE[RFUpgrade_SPT-50M]/deleteme -= 1
}

@CONFIG[SPT-60]
{
%techRequired = earlyElecPropulsion
%cost = 0
}

@CONFIG[SPT-70]
{
%techRequired = elecPropulsion1981
%cost = 0
}

@CONFIG[SPT-70M]
{
%techRequired = elecPropulsion2019
%cost = 0
*@PARTUPGRADE[RFUpgrade_SPT-70M]/deleteme -= 1
}

@CONFIG[SPT-70MK]
{
%techRequired = elecPropulsion2019
%cost = 0
*@PARTUPGRADE[RFUpgrade_SPT-70MK]/deleteme -= 1
}

@CONFIG[SRMU]
{
%techRequired = solids1986
Expand Down Expand Up @@ -20146,6 +20198,166 @@ PART
{
}

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

PART
{
name = RFUpgrade_engineConfigSource_SPT-140D
engineType = SPT140
}

@PART[RFUpgrade_engineConfigSource_SPT-140D]:AFTER[RealismOverhaulEngines]
{
%MODULE[Module*EngineConfigs] {
@name = ModuleEngineConfigs
%CONFIG[SPT-140D] {
&specLevel = operational
}
}
}

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

!PART[RFUpgrade_engineConfigSource_SPT-140D]:AFTER[RealismOverhaulEngines]
{
}

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

PART
{
name = RFUpgrade_engineConfigSource_SPT-50M
engineType = SPT50
}

@PART[RFUpgrade_engineConfigSource_SPT-50M]:AFTER[RealismOverhaulEngines]
{
%MODULE[Module*EngineConfigs] {
@name = ModuleEngineConfigs
%CONFIG[SPT-50M] {
&specLevel = operational
}
}
}

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

!PART[RFUpgrade_engineConfigSource_SPT-50M]:AFTER[RealismOverhaulEngines]
{
}

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

PART
{
name = RFUpgrade_engineConfigSource_SPT-70M
engineType = SPT70
}

@PART[RFUpgrade_engineConfigSource_SPT-70M]:AFTER[RealismOverhaulEngines]
{
%MODULE[Module*EngineConfigs] {
@name = ModuleEngineConfigs
%CONFIG[SPT-70M] {
&specLevel = operational
}
}
}

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

!PART[RFUpgrade_engineConfigSource_SPT-70M]:AFTER[RealismOverhaulEngines]
{
}

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

PART
{
name = RFUpgrade_engineConfigSource_SPT-70MK
engineType = SPT70
}

@PART[RFUpgrade_engineConfigSource_SPT-70MK]:AFTER[RealismOverhaulEngines]
{
%MODULE[Module*EngineConfigs] {
@name = ModuleEngineConfigs
%CONFIG[SPT-70MK] {
&specLevel = operational
}
}
}

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

!PART[RFUpgrade_engineConfigSource_SPT-70MK]:AFTER[RealismOverhaulEngines]
{
}

PARTUPGRADE
{
name = RFUpgrade_Sapphire203
Expand Down
55 changes: 55 additions & 0 deletions GameData/RP-1/Tree/TREE-Parts.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -10522,6 +10522,50 @@

%MODULE[ModuleTagList] { tag = EngineLiquidPF }

}
@PART[RO-SPT140]:FOR[xxxRP0]
{
%TechRequired = elecPropulsion1998
%cost = 520
%entryCost = 0
RP0conf = true
@description ^=:$: <b><color=green>From Near Future Propulsion mod</color></b>

%MODULE[ModuleTagList] { tag = EngineLiquidPF }

}
@PART[RO-SPT50]:FOR[xxxRP0]
{
%TechRequired = earlyElecPropulsion
%cost = 140
%entryCost = 0
RP0conf = true
@description ^=:$: <b><color=green>From Near Future Propulsion mod</color></b>

%MODULE[ModuleTagList] { tag = EngineLiquidPF }

}
@PART[RO-SPT60]:FOR[xxxRP0]
{
%TechRequired = earlyElecPropulsion
%cost = 226
%entryCost = 0
RP0conf = true
@description ^=:$: <b><color=green>From Near Future Propulsion mod</color></b>

%MODULE[ModuleTagList] { tag = EngineLiquidPF }

}
@PART[RO-SPT70]:FOR[xxxRP0]
{
%TechRequired = elecPropulsion1981
%cost = 242
%entryCost = 0
RP0conf = true
@description ^=:$: <b><color=green>From Near Future Propulsion mod</color></b>

%MODULE[ModuleTagList] { tag = EngineLiquidPF }

}
@PART[RO-SRLaunchClamp]:FOR[xxxRP0]
{
Expand Down Expand Up @@ -10761,6 +10805,17 @@

%MODULE[ModuleTagList] { tag = EngineLiquidTurbo }

}
@PART[RO-ionSPT60]:FOR[xxxRP0]
{
%TechRequired = earlyElecPropulsion
%cost = 226
%entryCost = 0
RP0conf = true
@description ^=:$: <b><color=green>From Stock (RO Addition) mod</color></b>

%MODULE[ModuleTagList] { tag = EngineLiquidPF }

}
@PART[RO-jt8d1]:FOR[xxxRP0]
{
Expand Down
6 changes: 6 additions & 0 deletions GameData/RP-1/Tree/identicalParts.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -858,6 +858,12 @@
@PART[ROSmallSpinMotor]:FOR[xxxRP0] { %identicalParts = ROSmallSpinMotor }
@PART[bluedog_Apollo_Block3_ServiceEngine]:FOR[xxxRP0] { %identicalParts = ROC-ApolloEngineBlockIII,bluedog_Apollo_Block3_ServiceEngine }
@PART[ROC-ApolloEngineBlockIII]:FOR[xxxRP0] { %identicalParts = ROC-ApolloEngineBlockIII,bluedog_Apollo_Block3_ServiceEngine }
@PART[RO-SPT100]:FOR[xxxRP0] { %identicalParts = RO-SPT100 }
@PART[RO-SPT140]:FOR[xxxRP0] { %identicalParts = RO-SPT140 }
@PART[RO-SPT50]:FOR[xxxRP0] { %identicalParts = RO-SPT50 }
@PART[RO-ionSPT60]:FOR[xxxRP0] { %identicalParts = RO-SPT60,RO-ionSPT60 }
@PART[RO-SPT60]:FOR[xxxRP0] { %identicalParts = RO-SPT60,RO-ionSPT60 }
@PART[RO-SPT70]:FOR[xxxRP0] { %identicalParts = RO-SPT70 }
@PART[probeCoreSphere_v2]:FOR[xxxRP0] { %identicalParts = SXTSputnik,probeCoreSphere_v2,sputnik1 }
@PART[sputnik1]:FOR[xxxRP0] { %identicalParts = SXTSputnik,probeCoreSphere_v2,sputnik1 }
@PART[SXTSputnik]:FOR[xxxRP0] { %identicalParts = SXTSputnik,probeCoreSphere_v2,sputnik1 }
Expand Down
Loading