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.

Sign up for GitHub

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

Switch to new NFE models and configure new ones #2434

Merged
merged 1 commit into from
Sep 15, 2024
Merged

Switch to new NFE models and configure new ones #2434

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
7 changes: 7 additions & 0 deletions GameData/RP-1/Tree/ECM-Parts.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -475,7 +475,10 @@
RO-nupit = NuPIT-6000
RO-rangerSolarPanel = 1000, solarTL2, solarDeployable
RO-reactor-BES5 = 100000,PowerReactors
RO-reactor-RAPIDL = 400000,RO-reactor-snap8
RO-reactor-SAFE400 = 500000,RO-reactor-snap50-300
RO-reactor-TOPAZI = 200000,PowerReactors
RO-reactor-TOPAZII = 75000,RO-reactor-TOPAZI
RO-reactor-kilopower = 10000,RO-reactor-snap10a
RO-reactor-prometheus = 1000000,RO-reactor-snap50-300
RO-reactor-snap10a = 15000,PowerReactors
Expand Down Expand Up @@ -1588,6 +1591,10 @@
nfa-turbojet-25-1 = GE4-J5P
nfa-vtol-0625-1 = RB162-31
nfa-vtol-125-1 = RB162-31
nfe-rtg-asrg-1 = 35156,RTGlevel6
nfe-rtg-gphs-1 = 50000,RTGlevel5
nfe-rtg-mmrtg-1 = 50000,RTGlevel5
nfe-rtg-snap27-1 = 50000,RTGlevel3
nflv-engine-ar1-1 = AR-1
nflv-engine-ar1c-1 = AR-1
nflv-engine-m1d-1 = Merlin1D
Expand Down
102 changes: 91 additions & 11 deletions GameData/RP-1/Tree/TREE-Parts.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7371,6 +7371,28 @@

%MODULE[ModuleTagList] { tag = Nuclear }

}
@PART[RO-reactor-RAPIDL]:FOR[xxxRP0]
{
%TechRequired = advModernNuclearPower
%cost = 15000
%entryCost = 0
RP0conf = true
@description ^=:$: <b><color=green>From Near Future Electrical mod</color></b>

%MODULE[ModuleTagList] { tag = Nuclear }

}
@PART[RO-reactor-SAFE400]:FOR[xxxRP0]
{
%TechRequired = modernNuclearPower
%cost = 19115
%entryCost = 0
RP0conf = true
@description ^=:$: <b><color=green>From Near Future Electrical mod</color></b>

%MODULE[ModuleTagList] { tag = Nuclear }

}
@PART[RO-reactor-TOPAZI]:FOR[xxxRP0]
{
Expand All @@ -7382,6 +7404,17 @@

%MODULE[ModuleTagList] { tag = Nuclear }

}
@PART[RO-reactor-TOPAZII]:FOR[xxxRP0]
{
%TechRequired = advancedNuclearPower
%cost = 1503
%entryCost = 0
RP0conf = true
@description ^=:$: <b><color=green>From Near Future Electrical mod</color></b>

%MODULE[ModuleTagList] { tag = Nuclear }

}
@PART[RO-reactor-kilopower]:FOR[xxxRP0]
{
Expand All @@ -7401,6 +7434,9 @@
%entryCost = 0
RP0conf = true
@description ^=:$: <b><color=green>From Near Future Electrical mod</color></b>

%MODULE[ModuleTagList] { tag = Nuclear }

}
@PART[RO-reactor-snap10a]:FOR[xxxRP0]
{
Expand Down Expand Up @@ -17368,6 +17404,17 @@

%MODULE[ModuleTagList] { tag = Instruments }

}
@PART[RelayAntenna3m]:FOR[xxxRP0]
{
%TechRequired = deepSpaceComms
%cost = 40
%entryCost = 4000
RP0conf = true
@description ^=:$: <b><color=green>From Stock (RO Config) mod</color></b>

%MODULE[ModuleTagList] { tag = Instruments }

}
@PART[RelayAntenna5]:FOR[xxxRP0]
{
Expand Down Expand Up @@ -25943,6 +25990,50 @@
RP0conf = true
@description ^=:$: <b><color=green>From Near Future Aeronautics mod</color></b>
}
@PART[nfe-rtg-asrg-1]:FOR[xxxRP0]
{
%TechRequired = modernNuclearPower
%cost = 3550
%entryCost = 0
RP0conf = true
@description ^=:$: <b><color=green>From Near Future Electrical mod</color></b>

%MODULE[ModuleTagList] { tag = NuclearRTG }

}
@PART[nfe-rtg-gphs-1]:FOR[xxxRP0]
{
%TechRequired = gphsRTG
%cost = 5130
%entryCost = 0
RP0conf = true
@description ^=:$: <b><color=green>From Near Future Electrical mod</color></b>

%MODULE[ModuleTagList] { tag = NuclearRTG }

}
@PART[nfe-rtg-mmrtg-1]:FOR[xxxRP0]
{
%TechRequired = modernNuclearPower
%cost = 2500
%entryCost = 0
RP0conf = true
@description ^=:$: <b><color=green>From Near Future Electrical mod</color></b>

%MODULE[ModuleTagList] { tag = NuclearRTG }

}
@PART[nfe-rtg-snap27-1]:FOR[xxxRP0]
{
%TechRequired = improvedRTG
%cost = 2700
%entryCost = 0
RP0conf = true
@description ^=:$: <b><color=green>From Near Future Electrical mod</color></b>

%MODULE[ModuleTagList] { tag = NuclearRTG }

}
@PART[nfex-antenna-deploy-wv3-1]:FOR[xxxRP0]
{
%TechRequired = interplanetaryComms
Expand Down Expand Up @@ -34083,15 +34174,4 @@
MODULE
{ name = ModuleUnpressurizedCockpit }

}
@PART[RelayAntenna3m]:FOR[xxxRP0]
{
%TechRequired = deepSpaceComms
%cost = 40
%entryCost = 4000
RP0conf = true
@description ^=:$: <b><color=green>From Stock (RO Config) mod</color></b>

%MODULE[ModuleTagList] { tag = Instruments }

}
22 changes: 18 additions & 4 deletions GameData/RP-1/Tree/identicalParts.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -163,6 +163,8 @@
@PART[nflv-engine-ar1-1]:FOR[xxxRP0] { %identicalParts = nflv-engine-ar1-1,nflv-engine-ar1c-1 }
@PART[nflv-engine-ar1c-1]:FOR[xxxRP0] { %identicalParts = nflv-engine-ar1-1,nflv-engine-ar1c-1 }
@PART[ROEE-AR1]:FOR[xxxRP0] { %identicalParts = ROEE-AR1 }
@PART[nfe-rtg-asrg-1]:FOR[xxxRP0] { %identicalParts = nfe-rtg-asrg-1,rtg-0625 }
@PART[rtg-0625]:FOR[xxxRP0] { %identicalParts = nfe-rtg-asrg-1,rtg-0625 }
@PART[bluedog_Diamant_Asterix]:FOR[xxxRP0] { %identicalParts = DiamantAsterix,bluedog_Diamant_Asterix }
@PART[DiamantAsterix]:FOR[xxxRP0] { %identicalParts = DiamantAsterix,bluedog_Diamant_Asterix }
@PART[rn_junoii_sgt]:FOR[xxxRP0] { %identicalParts = ROBabySergeant,ROE-BabySergeant,ROE-BabySergeant-RN,rn_junoii_sgt }
Expand Down Expand Up @@ -272,10 +274,11 @@
@PART[ROC-GeminiFlightPackContSurf]:FOR[xxxRP0] { %identicalParts = ROC-GeminiFlightPackContSurf }
@PART[ROC-GeminiWing]:FOR[xxxRP0] { %identicalParts = ROC-GeminiWing }
@PART[ROE-GEM46]:FOR[xxxRP0] { %identicalParts = ROE-GEM46 }
@PART[ca_mer_rtg]:FOR[xxxRP0] { %identicalParts = SXTDepolyRTGI,SXTDepolyRTGII,ca_mer_rtg,ca_rtg8200 }
@PART[ca_rtg8200]:FOR[xxxRP0] { %identicalParts = SXTDepolyRTGI,SXTDepolyRTGII,ca_mer_rtg,ca_rtg8200 }
@PART[SXTDepolyRTGI]:FOR[xxxRP0] { %identicalParts = SXTDepolyRTGI,SXTDepolyRTGII,ca_mer_rtg,ca_rtg8200 }
@PART[SXTDepolyRTGII]:FOR[xxxRP0] { %identicalParts = SXTDepolyRTGI,SXTDepolyRTGII,ca_mer_rtg,ca_rtg8200 }
@PART[ca_mer_rtg]:FOR[xxxRP0] { %identicalParts = SXTDepolyRTGI,SXTDepolyRTGII,ca_mer_rtg,ca_rtg8200,nfe-rtg-gphs-1 }
@PART[ca_rtg8200]:FOR[xxxRP0] { %identicalParts = SXTDepolyRTGI,SXTDepolyRTGII,ca_mer_rtg,ca_rtg8200,nfe-rtg-gphs-1 }
@PART[nfe-rtg-gphs-1]:FOR[xxxRP0] { %identicalParts = SXTDepolyRTGI,SXTDepolyRTGII,ca_mer_rtg,ca_rtg8200,nfe-rtg-gphs-1 }
@PART[SXTDepolyRTGI]:FOR[xxxRP0] { %identicalParts = SXTDepolyRTGI,SXTDepolyRTGII,ca_mer_rtg,ca_rtg8200,nfe-rtg-gphs-1 }
@PART[SXTDepolyRTGII]:FOR[xxxRP0] { %identicalParts = SXTDepolyRTGI,SXTDepolyRTGII,ca_mer_rtg,ca_rtg8200,nfe-rtg-gphs-1 }
@PART[bluedog_Delta2_RS27]:FOR[xxxRP0] { %identicalParts = RO-H1-RS27,ROE-H1C,ROE-H1C-SSTU,ROE-H1D,ROE-H1D-SSTU,ROE-RS27,RSBengineH1,bluedog_Delta2_RS27,bluedog_H1C,bluedog_H1D,restock-engine-torch }
@PART[bluedog_H1C]:FOR[xxxRP0] { %identicalParts = RO-H1-RS27,ROE-H1C,ROE-H1C-SSTU,ROE-H1D,ROE-H1D-SSTU,ROE-RS27,RSBengineH1,bluedog_Delta2_RS27,bluedog_H1C,bluedog_H1D,restock-engine-torch }
@PART[bluedog_H1D]:FOR[xxxRP0] { %identicalParts = RO-H1-RS27,ROE-H1C,ROE-H1C-SSTU,ROE-H1D,ROE-H1D-SSTU,ROE-RS27,RSBengineH1,bluedog_Delta2_RS27,bluedog_H1C,bluedog_H1D,restock-engine-torch }
Expand Down Expand Up @@ -384,6 +387,9 @@
@PART[nflv-engine-m1d-vac-1]:FOR[xxxRP0] { %identicalParts = ROE-Merlin1DV,nflv-engine-m1d-vac-1 }
@PART[ROE-Merlin1DV]:FOR[xxxRP0] { %identicalParts = ROE-Merlin1DV,nflv-engine-m1d-vac-1 }
@PART[RO-Micrometeorite]:FOR[xxxRP0] { %identicalParts = RO-Micrometeorite }
@PART[nfe-rtg-mmrtg-1]:FOR[xxxRP0] { %identicalParts = RLA_mmrtg,RO-MMRTG,nfe-rtg-mmrtg-1 }
@PART[RLA_mmrtg]:FOR[xxxRP0] { %identicalParts = RLA_mmrtg,RO-MMRTG,nfe-rtg-mmrtg-1 }
@PART[RO-MMRTG]:FOR[xxxRP0] { %identicalParts = RLA_mmrtg,RO-MMRTG,nfe-rtg-mmrtg-1 }
@PART[ROE-Agena8096C]:FOR[xxxRP0] { %identicalParts = ROE-Agena8096C }
@PART[dockingPort2]:FOR[xxxRP0] { %identicalParts = ROC-CSTNDSActive,ROC-CSTNDSPassive,dockingPort2,ndsport1,ndsport3,sspx-docking-125-1 }
@PART[ndsport1]:FOR[xxxRP0] { %identicalParts = ROC-CSTNDSActive,ROC-CSTNDSPassive,dockingPort2,ndsport1,ndsport3,sspx-docking-125-1 }
Expand Down Expand Up @@ -421,6 +427,8 @@
@PART[bluedog_rangerCore]:FOR[xxxRP0] { %identicalParts = bluedog_rangerCore }
@PART[RO-RangerRetro]:FOR[xxxRP0] { %identicalParts = RO-RangerRetro,ROE-RangerRetro }
@PART[ROE-RangerRetro]:FOR[xxxRP0] { %identicalParts = RO-RangerRetro,ROE-RangerRetro }
@PART[reactor-25]:FOR[xxxRP0] { %identicalParts = RO-reactor-RAPIDL,reactor-25 }
@PART[RO-reactor-RAPIDL]:FOR[xxxRP0] { %identicalParts = RO-reactor-RAPIDL,reactor-25 }
@PART[RCSBlock_1100]:FOR[xxxRP0] { %identicalParts = RCSBlock_1100,RO_RCSBlock_restock_1100 }
@PART[RO_RCSBlock_restock_1100]:FOR[xxxRP0] { %identicalParts = RCSBlock_1100,RO_RCSBlock_restock_1100 }
@PART[RCSBlock_138]:FOR[xxxRP0] { %identicalParts = RCSBlock_138,RO_RCSBlock_restock_138,RO_RCSBlock_restock_mini_138 }
Expand Down Expand Up @@ -587,6 +595,8 @@
@PART[rn_brizm_me]:FOR[xxxRP0] { %identicalParts = NP_S598M,ROE-S598M,ROE-S598M-NicheParts,delphini_us_engine_s1_1,rn_brizm_me }
@PART[ROE-S598M]:FOR[xxxRP0] { %identicalParts = NP_S598M,ROE-S598M,ROE-S598M-NicheParts,delphini_us_engine_s1_1,rn_brizm_me }
@PART[ROE-S598M-NicheParts]:FOR[xxxRP0] { %identicalParts = NP_S598M,ROE-S598M,ROE-S598M-NicheParts,delphini_us_engine_s1_1,rn_brizm_me }
@PART[reactor-0625]:FOR[xxxRP0] { %identicalParts = RO-reactor-SAFE400,reactor-0625 }
@PART[RO-reactor-SAFE400]:FOR[xxxRP0] { %identicalParts = RO-reactor-SAFE400,reactor-0625 }
@PART[s1_lsolar]:FOR[xxxRP0] { %identicalParts = s1_lsolar,s1_rsolar }
@PART[s1_rsolar]:FOR[xxxRP0] { %identicalParts = s1_lsolar,s1_rsolar }
@PART[RSBtankSaturnSIC8]:FOR[xxxRP0] { %identicalParts = RSBtankSaturnSIC8 }
Expand Down Expand Up @@ -646,6 +656,8 @@
@PART[RFSM-II]:FOR[xxxRP0] { %identicalParts = RFSM-II }
@PART[RFSM-III]:FOR[xxxRP0] { %identicalParts = RFSM-III }
@PART[RFSM-IV]:FOR[xxxRP0] { %identicalParts = RFSM-IV }
@PART[nfe-rtg-snap27-1]:FOR[xxxRP0] { %identicalParts = ROC-LEMFoldingSNAP27BDB,nfe-rtg-snap27-1 }
@PART[ROC-LEMFoldingSNAP27BDB]:FOR[xxxRP0] { %identicalParts = ROC-LEMFoldingSNAP27BDB,nfe-rtg-snap27-1 }
@PART[ca_rtg2000]:FOR[xxxRP0] { %identicalParts = RO-SNAP-19-RTG,ca_rtg2000 }
@PART[RO-SNAP-19-RTG]:FOR[xxxRP0] { %identicalParts = RO-SNAP-19-RTG,ca_rtg2000 }
@PART[ROE-SNTPPFE100]:FOR[xxxRP0] { %identicalParts = ROE-SNTPPFE100,SNTPPFE100 }
Expand Down Expand Up @@ -712,6 +724,8 @@
@PART[ROE-TD339-NicheParts]:FOR[xxxRP0] { %identicalParts = RO-SurveyorVernier,ROE-TD339,ROE-TD339-NicheParts,TD339,ca_landv_vernier,rn_surveyor_s_engine }
@PART[TD339]:FOR[xxxRP0] { %identicalParts = RO-SurveyorVernier,ROE-TD339,ROE-TD339-NicheParts,TD339,ca_landv_vernier,rn_surveyor_s_engine }
@PART[sensorThermometer]:FOR[xxxRP0] { %identicalParts = sensorThermometer }
@PART[reactor-125]:FOR[xxxRP0] { %identicalParts = RO-reactor-TOPAZII,reactor-125 }
@PART[RO-reactor-TOPAZII]:FOR[xxxRP0] { %identicalParts = RO-reactor-TOPAZII,reactor-125 }
@PART[trussAdapter]:FOR[xxxRP0] { %identicalParts = trussAdapter,trussPiece1x }
@PART[trussPiece1x]:FOR[xxxRP0] { %identicalParts = trussAdapter,trussPiece1x }
@PART[rn_ua1205_dec]:FOR[xxxRP0] { %identicalParts = ROE-120XDecoupler,rn_ua1205_dec,rn_ua1206_dec,rn_ua1207_dec }
Expand Down
Loading
Loading