Skip to content

Commit 4894360

Browse files
JonnyOThanJonnyOThan
committed
Better hookups for Reviva
1 parent 1cbc0ed commit 4894360

File tree

2 files changed

+107
-83
lines changed

2 files changed

+107
-83
lines changed

‎GameData/ProbeControlRoom/MM_MC-Internal.cfg‎

Lines changed: 107 additions & 76 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,8 @@ PROBECONTROLROOM_CONFIG
55
{
66
INTERNAL
77
{
8-
name = MissionControl
8+
name:NEEDS[!ASET/ASET_Props] = MissionControl
9+
name:NEEDS[ASET/ASET_Props] = MissionControl_ASET
910
}
1011

1112
MODULE
@@ -18,97 +19,127 @@ PROBECONTROLROOM_CONFIG
1819
name = RasterPropMonitorComputer
1920
}
2021

21-
MODULE:NEEDS[RevIVA]
22-
{
23-
name = ModuleIVASwitch
24-
internalName = MissionControl
25-
}
26-
MODULE:NEEDS[RevIVA]
27-
{
28-
name = ModuleB9PartSwitch
29-
moduleID = IVASwitch
30-
switcherDescription = IVA
31-
switcherDescriptionPlural = IVAs
32-
switchInFlight = true
33-
uiGroupName = IVASwitch
34-
uiGroupDisplayName = IVA Switch
35-
SUBTYPE {
36-
name = MissionControl
37-
primaryColor = White
38-
secondaryColor = White
39-
descriptionSummary = Default
40-
descriptionDetail = Use Mission Control layout from ProbeControlRoom.
41-
MODULE
42-
{
43-
IDENTIFIER { name = ModuleIVASwitch }
44-
DATA { internalName = MissionControl }
45-
}
46-
}
47-
}
22+
MODULE:NEEDS[RevIVA]
23+
{
24+
name = ModuleIVASwitch
25+
internalName:NEEDS[!ASET/ASET_Props] = MissionControl
26+
internalName:NEEDS[ASET/ASET_Props] = MissionControl_ASET
27+
}
28+
MODULE:NEEDS[RevIVA]
29+
{
30+
name = ModuleB9PartSwitch
31+
moduleID = IVASwitch
32+
switcherDescription = IVA
33+
switcherDescriptionPlural = IVAs
34+
switchInFlight = true
35+
uiGroupName = IVASwitch
36+
uiGroupDisplayName = IVA Switch
37+
SUBTYPE:NEEDS[ASET/ASET_Props]
38+
{
39+
name = MissionControl_ASET
40+
primaryColor = White
41+
secondaryColor = White
42+
descriptionSummary = Default-ASET
43+
descriptionDetail = Use Mission Control layout from ProbeControlRoom using ASET props.
44+
MODULE
45+
{
46+
IDENTIFIER { name = ModuleIVASwitch }
47+
DATA { internalName = MissionControl_ASET }
48+
}
49+
}
50+
SUBTYPE
51+
{
52+
name = MissionControl
53+
primaryColor = White
54+
secondaryColor = White
55+
descriptionSummary = Default
56+
descriptionDetail = Use Mission Control layout from ProbeControlRoom.
57+
MODULE
58+
{
59+
IDENTIFIER { name = ModuleIVASwitch }
60+
DATA { internalName = MissionControl }
61+
}
62+
}
63+
}
4864
}
4965

5066
// RevIVA setup for known IVA mods
51-
@PROBECONTROLROOM_CONFIG:NEEDS[DE_IVAExtension] {
52-
@MODULE[ModuleB9PartSwitch] {
53-
+SUBTYPE[MissionControl] {
54-
@name = DE_MissionControl
55-
@primaryColor = Red
56-
@secondaryColor = White
57-
@descriptionSummary = DE IVA
58-
@descriptionDetail = Use Mission Control layout from DE IVA Extension
59-
@MODULE
60-
{
61-
@DATA { @internalName = DE_MissionControl }
62-
}
63-
}
64-
}
67+
@PROBECONTROLROOM_CONFIG:NEEDS[DE_IVAExtension]
68+
{
69+
@MODULE[ModuleB9PartSwitch]
70+
{
71+
SUBTYPE
72+
{
73+
// note the DE name here matches what Reviva uses internally and has some interactions with DE_IVA:
74+
// https://github.com/JonnyOThan/DE_IVAExtension/blob/6a649dd3ba6fd61397b3e423c6f89d642be6ab79/GameData/DE_IVAExtension/Parts.cfg#L135
75+
name = DE
76+
primaryColor = Red
77+
secondaryColor = White
78+
descriptionSummary = DE IVA
79+
descriptionDetail = Use Mission Control layout from DE IVA Extension
80+
MODULE
81+
{
82+
IDENTIFIER { name = ModuleIVASwitch }
83+
DATA { internalName = DE_MissionControl }
84+
}
85+
}
86+
}
6587
}
6688

67-
@PROBECONTROLROOM_CONFIG:NEEDS[KSA] {
68-
@MODULE[ModuleB9PartSwitch] {
69-
+SUBTYPE[MissionControl] {
70-
@name = KSA_MissionControl
71-
@primaryColor = Blue
72-
@secondaryColor = White
73-
@descriptionSummary = KSA
74-
@descriptionDetail = Use Mission Control layout from KSA
75-
@MODULE
76-
{
77-
@DATA { @internalName = KSA_MissionControl }
78-
}
79-
}
80-
}
89+
@PROBECONTROLROOM_CONFIG:NEEDS[KSA]
90+
{
91+
@MODULE[ModuleB9PartSwitch]
92+
{
93+
SUBTYPE
94+
{
95+
name = KSA_MissionControl
96+
primaryColor = Blue
97+
secondaryColor = White
98+
descriptionSummary = KSA
99+
descriptionDetail = Use Mission Control layout from KSA
100+
MODULE
101+
{
102+
IDENTIFIER { name = ModuleIVASwitch }
103+
DATA { internalName = KSA_MissionControl }
104+
}
105+
}
106+
}
81107
}
82108

83-
@PROBECONTROLROOM_CONFIG:NEEDS[PCRIVAPLUS] {
84-
@MODULE[ModuleB9PartSwitch] {
85-
+SUBTYPE[MissionControl] {
86-
@name = PCRIVAPLUS_MissionControl_RETRO
87-
@primaryColor = Blue
88-
@secondaryColor = Red
89-
@descriptionSummary = Retro
90-
@descriptionDetail = Use Old school NASA-style layout from PCRIVAPLUS
91-
@MODULE
92-
{
93-
@DATA { @internalName = PCRIVAPLUS_MissionControl_RETRO }
94-
}
95-
}
96-
}
109+
@PROBECONTROLROOM_CONFIG:NEEDS[PCRIVAPLUS]
110+
{
111+
@MODULE[ModuleB9PartSwitch]
112+
{
113+
SUBTYPE
114+
{
115+
name = PCRIVAPLUS_MissionControl_RETRO
116+
primaryColor = Blue
117+
secondaryColor = Red
118+
descriptionSummary = Retro
119+
descriptionDetail = Use Old school NASA-style layout from PCRIVAPLUS
120+
MODULE
121+
{
122+
IDENTIFIER { name = ModuleIVASwitch }
123+
DATA { internalName = PCRIVAPLUS_MissionControl_RETRO }
124+
}
125+
}
126+
}
97127
}
98128

99129
// Add the mission control INTERNAL to every probe that does not yet have an INTERNAL
100-
@PART[*]:HAS[@MODULE[ModuleCommand],!INTERNAL[*]]:LAST[ProbeControlRoom]
130+
@PART:HAS[@MODULE[ModuleCommand],!INTERNAL]:FOR[ProbeControlRoom]
101131
{
102-
#@PROBECONTROLROOM_CONFIG/MODULE[*] {}
103-
#@PROBECONTROLROOM_CONFIG/INTERNAL {}
132+
#@PROBECONTROLROOM_CONFIG/MODULE[ProbeControlRoomPart] {}
133+
#@PROBECONTROLROOM_CONFIG/MODULE[RasterPropMonitorComputer]:NEEDS[RasterPropMonitor] {}
134+
#@PROBECONTROLROOM_CONFIG/INTERNAL {}
104135
}
105136

106137
// Add the RevIVA support to any probe that has PCR support but no IVA switch.
107138
// Needed to support existing IVA mods that support PCR but not RevIVA
108-
@PART[*]:HAS[@MODULE[ProbeControlRoomPart],!MODULE[ModuleB9PartSwitch]:HAS[#moduleID[IVASwitch]]]:LAST[ProbeControlRoom]:NEEDS[RevIVA]
139+
@PART:HAS[@MODULE[ProbeControlRoomPart],!MODULE[ModuleB9PartSwitch]:HAS[#moduleID[IVASwitch]]]:FOR[ProbeControlRoom]:NEEDS[RevIVA]
109140
{
110-
#@PROBECONTROLROOM_CONFIG/MODULE[ModuleB9PartSwitch]:HAS[#moduleID[IVASwitch]] {}
111-
#@PROBECONTROLROOM_CONFIG/MODULE[ModuleIVASwitch] {}
141+
#@PROBECONTROLROOM_CONFIG/MODULE[ModuleB9PartSwitch]:HAS[#moduleID[IVASwitch]] {}
142+
#@PROBECONTROLROOM_CONFIG/MODULE[ModuleIVASwitch] {}
112143
}
113144

114145

‎GameData/ProbeControlRoom/Spaces/MissionControl/ASET_Patch.cfg‎

Lines changed: 0 additions & 7 deletions
This file was deleted.

0 commit comments

Comments
 (0)