Skip to content

Commit

Permalink
RealEngines and EntryCostMods Fixes, SSTU Booster Tanks Re-Added
Browse files Browse the repository at this point in the history
SSTU Booster Tanks are re-added to the game. They accidentally got removed in an update.

With the way the RealEngines parts are named, they were causing circular references for the ECM's which caused crashes for players.

* All RealEngines parts have been duplicated and the new parts have been renamed and added to the tree.
* The old partnames are no longer included in the tree and are now considered non-RP0. They have not been removed so that crafts and save games are not ruined, but I STRONGLY encourage you to change them out for the new versions of the crafts.
pap1723 committed Jan 1, 2019
1 parent a952437 commit c2b52e1
Showing 6 changed files with 884 additions and 658 deletions.
116 changes: 116 additions & 0 deletions GameData/RP-0/Parts/RealEnginesFixes.cfg
Original file line number Diff line number Diff line change
@@ -0,0 +1,116 @@
// ===========================================================================
// RP-0 fix to RealEngines
//
// Some of the names of the RealEngines were causing circular reference errors
// with the Engine_Configs because they had the same name. This was affecting
// all ECM's and causing crashes.
//
// ===========================================================================
// AMERICAN
+PART[A7]:FOR[RP-0]
{ @name = RO-RE-A7 }
+PART[AJ10_37]:FOR[RP-0]
{ @name = RO-RE-AJ10-37 }
+PART[AJ10_104]:FOR[RP-0]
{ @name = RO-RE-AJ10-104 }
+PART[AJ10_137]:FOR[RP-0]
{ @name = RO-RE-AJ10-137 }
+PART[AJ10_190]:FOR[RP-0]
{ @name = RO-RE-AJ10-190 }
+PART[J2]:FOR[RP-0]
{ @name = RO-RE-J2 }
+PART[LMAE]:FOR[RP-0]
{ @name = RO-RE-LMAE }
+PART[LMDE]:FOR[RP-0]
{ @name = RO-RE-LMDE }
+PART[Raptor_engine]:FOR[RP-0]
{ @name = RO-RE-Raptor }
+PART[Raptor_Vacuum]:FOR[RP-0]
{ @name = RO-RE-RaptorVac }
+PART[SSME_Engine]:FOR[RP-0]
{ @name = RO-RE-SSME }
+PART[SuperDrago]:FOR[RP-0]
{ @name = RO-RE-SuperDraco }
// RUSSIAN
+PART[NK33engine]:FOR[RP-0]
{ @name = RO-RE-NK33 }
+PART[NK43engine]:FOR[RP-0]
{ @name = RO-RE-NK43 }
+PART[RD58]:FOR[RP-0]
{ @name = RO-RE-RD58 }
+PART[rd100]:FOR[RP-0]
{ @name = RO-RE-RD100 }
+PART[RD107]:FOR[RP-0]
{ @name = RO-RE-RD107 }
+PART[RD108]:FOR[RP-0]
{ @name = RO-RE-RD018 }
+PART[RD0110engine]:FOR[RP-0]
{ @name = RO-RE-RD0110 }
+PART[rd0120]:FOR[RP-0]
{ @name = RO-RE-RD0120 }
+PART[RD0124engine]:FOR[RP-0]
{ @name = RO-RE-RD0124 }
+PART[RD0124Aengine]:FOR[RP-0]
{ @name = RO-RE-RD0124A }
+PART[RD0146engine]:FOR[RP-0]
{ @name = RO-RE-RD0146 }
+PART[RD170engine]:FOR[RP-0]
{ @name = RO-RE-RD170 }
+PART[RD180engine]:FOR[RP-0]
{ @name = RO-RE-RD180 }
+PART[RD191engine]:FOR[RP-0]
{ @name = RO-RE-RD191 }
+PART[RD0210]:FOR[RP-0]
{ @name = RO-RE-RD0210 }
+PART[RD0212]:FOR[RP-0]
{ @name = RO-RE-RD0212 }
+PART[RD275]:FOR[RP-0]
{ @name = RO-RE-RD275 }
+PART[S5_92fversion]:FOR[RP-0]
{ @name = RO-RE-S5-92F }
+PART[S5_98M]:FOR[RP-0]
{ @name = RO-RE-S5-98M }
+PART[STEERING_MOTOR_RD0110engine]:FOR[RP-0]
{ @name = RO-RE-RD0110 }
// UKRANIAN
+PART[RD8]:FOR[RP-0]
{ @name = RO-RE-RD8 }
+PART[RD120]:FOR[RP-0]
{ @name = RO-RE-RD120 }
61 changes: 32 additions & 29 deletions GameData/RP-0/Tree/ECM-Parts.cfg
Original file line number Diff line number Diff line change
@@ -17,11 +17,6 @@
2-5-Heatshield = heatshieldsLEO
45DegreeRCS = 1000, rcsMult
625mBonny = 1
A7 = 5000, HydyneFuel
AJ10-104 = 25000, AJ10-101A
AJ10-137 = 5000, AJ10_138
AJ10-190 = 10000, AJ10-137
AJ10-37 = 8000, AJ10-27
Angledpanel = 1
B9-Aero-Wing-ControlSurface-SH-4mProcedural = 1
B9-Aero-Wing-Procedural-TypeA = wingsSpaceplane
@@ -127,7 +122,6 @@
HeavyRcs = 1000, rcsMult
HorizonAeronautics-PF-Side = 1
Interceptor Cockpit = 1
J2 = 30000, J-2-200klbf
KIWIA24 = KIWIA24-Hydrogen
KIWIB48 = KIWIB48-Hydrogen
KK-ATK-Castor30A = Castor-30A
@@ -237,9 +231,7 @@
NERVA-XE = NERVA_XE-Hydrogen
NK33 = NK-15
NK33-StockVersion = NK-15
NK33engine = NK-15
NK43-StockVersion = NK-15V
NK43engine = NK-15V
NP-S598M = S5.98M
NP-lfe-25m-Orbitalbertha-Mini = XLR99
OscarDtank = 1
@@ -265,30 +257,15 @@
RC-cone-double = 1
RC-radial = 1
RC-stack = 1
RD0110engine = RD-0107
RD0120-StockVersion = RD-0120
RD0124 = RD-0124
RD0124Aengine = RD-0124
RD0124-StockVersion = RD-0124
RD0124engine = RD-0124
RD0146-StockVersion = RD-0146
RD0146engine = RD-0146
RD0210 = RD-0210
RD0212 = RD-0212
RD0410MID = RD-0410MID-Hydrogen
RD107 = RD-107-8D74
RD108 = RD-108-8D75
RD120 = RD-120
RD120attachment-styleZenit2st = RD-8-SI
RD170engine = RD-170
RD171-StockVersion = RD-170
RD180-StockVersion = RD-180
RD180engine = RD-180
RD191-StockVersion = RD-151
RD191engine = RD-151
RD275 = RD-253
RD58 = 11D33
RD8 = RD-805
RD-0110 = RD-0107
RFSM-I = SM-LevelI
RFSM-II = SM-LevelII
@@ -346,6 +323,35 @@
RO-QuadropoleMassSpectrometer = 2500, RO-MIMS
RO-RD-0210 = RD-0210
RO-RD-253 = RD-253
RO-RE-A7 = 5000, HydyneFuel
RO-RE-AJ10-104 = 25000, AJ10-101A
RO-RE-AJ10-137 = 5000, AJ10_138
RO-RE-AJ10-190 = 10000, AJ10-137
RO-RE-AJ10-37 = 8000, AJ10-27
RO-RE-J2 = 30000, J-2-200klbf
RO-RE-NK33 = NK-15
RO-RE-NK43 = NK-15V
RO-RE-RD0110 = RD-0107
RO-RE-RD0110 = RD-0110-Vernier
RO-RE-RD0120 = RD-0120
RO-RE-RD0124 = RD-0124
RO-RE-RD0124A = RD-0124
RO-RE-RD0146 = RD-0146
RO-RE-RD0210 = RD-0210
RO-RE-RD0212 = RD-0212
RO-RE-RD100 = RD-100
RO-RE-RD107 = RD-107-8D74
RO-RE-RD108 = RD-108-8D75
RO-RE-RD120 = RD-120
RO-RE-RD170 = RD-170
RO-RE-RD180 = RD-180
RO-RE-RD191 = RD-151
RO-RE-RD275 = RD-253
RO-RE-RD58 = 11D33
RO-RE-RD8 = RD-805
RO-RE-S5-92F = S5.92-BT
RO-RE-S5-98M = S5.98M
RO-RE-SSME = RS-25
RO-RPWS = 2500,RO-SWPlasmaAnalyzer
RO-RealEngines-NK9 = NK-9
RO-RealEngines-NK9V = NK-9V
@@ -427,8 +433,6 @@
RT2 = Castor-2
RTShortAntenna1 = 1
S200-Block = 1000, rcsMult
S5-92fversion = S5.92-BT
S5-98M = S5.98M
SHIP-E1 = E-1
SHIP-HG-3-SL = HG3
SHIP-HG-3-VAC = HG3
@@ -441,7 +445,6 @@
SNTPPFE100 = SNTPPFE100-Hydrogen
SOYUZ-HEAT-SHIELD = heatshieldsLEO
SSME = RS-25
SSME-Engine = RS-25
SSTU-A-Tank-II = Tanks-LevelII
SSTU-A-Tank-III = Tanks-LevelIII
SSTU-A-Tank-III-Balloon = Tanks-LevelIII-Balloon
@@ -453,6 +456,9 @@
SSTU-AJ10-CustomAdvanced = AJ10-118F
SSTU-AJ10-CustomEarly = AJ10-37
SSTU-AJ10-CustomMid = AJ10-104
SSTU-D-Tank-II = Tanks-LevelII
SSTU-D-Tank-III = Tanks-LevelIII
SSTU-D-Tank-IV = Tanks-LevelIV
SSTU-SC-ENG-AJ10-137 = AJ10-137
SSTU-SC-ENG-AJ10-190 = AJ10-190
SSTU-SC-ENG-F1 = F-1
@@ -493,7 +499,6 @@
SSTU-SC-GEN-RCS-6A-T = 1000, rcsMult
SSTU-SC-GEN-RCS-8A-T = 1000, rcsMult
SSTU-SC-TANK-MFT-A = 1
STEERING-MOTOR-RD0110engine = RD-0110-Vernier
SXTAJ10 = AJ10-37
SXTAJ10Adv = AJ10-118F
SXTAJ10Mid = AJ10-104
@@ -693,8 +698,6 @@
radialEngineMini = LR101-NA-3
radialLiquidEngine1-2 = RD-855
radr = 50000,RTGlevel3
rd0120 = RD-0120
rd100 = RD-100
rn-aj10-37 = AJ10-37
rn-brizm-me = S5.98M
rn-centaurt-rl10-l = RL10A-4
Loading

3 comments on commit c2b52e1

@PhineasFreak
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If the new RealEngines naming convention works then I'll fold the part name changes into RO directly (would be bad to try and open a craft with just RO installed).

@pap1723
Copy link
Contributor Author

@pap1723 pap1723 commented on c2b52e1 Jan 1, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hey @PhineasFreak I will let you know if it works. We should probably move them into RO, I agree. Are there any other save-breaking updates? If no, then we should leave them in as renames and modify the other ones to have the name of Engine (Deprecated).

@PhineasFreak
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You mean about RO? Not yet but there will be once we add support for the new parts/variants.

Please sign in to comment.