Skip to content

Commit 76d3c8f

Browse files
linuxgurugamerlinuxgurugamer
authored
Merge branch 'master' into fix-Mod_NearFutureTechnologies.cfg
2 parents e3c4a1d + 0dd6661 commit 76d3c8f

18 files changed

Lines changed: 1647 additions & 1013 deletions

‎GameData/000_FilterExtensions/Icons/Autoloaded_Icons_Mods/CRE.dds‎

640 Bytes
Binary file not shown.

‎GameData/000_FilterExtensions/Icons/Autoloaded_Icons_Mods/CRE_selected.dds‎

640 Bytes
Binary file not shown.

‎GameData/000_FilterExtensions_Configs/Default/00_Fuel.cfg‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,12 @@ CATEGORY
1919
list = 9,LFO Size 4 [5 m]
2020
list = 10,LFO Size 5+ [7.5 m+]
2121
list = 11,Radial Tank
22-
list = 12,Liquid Fuel Tank
23-
list = 13,Oxidizer Tank
24-
list = 14,Monopropellant Tank
22+
list:NEEDS[!REFUSE] = 12,Liquid Fuel Tank
23+
list:NEEDS[!REFUSE] = 13,Oxidizer Tank
24+
list:NEEDS[!REFUSE] = 14,Monopropellant Tank
25+
list:NEEDS[REFUSE] = 12,Kerosene Tank
26+
list:NEEDS[REFUSE] = 13,Liquid Oxygen Tank
27+
list:NEEDS[REFUSE] = 14,HTP Tank
2528
list = 15,Xenon Gas Tank
2629
}
2730
}

‎GameData/000_FilterExtensions_Configs/Default/07_Electrical.cfg‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,8 @@ CATEGORY
99
{
1010
list = 0, Solar Panels
1111
list = 1, Generators
12-
list = 2, Power Storage
13-
list = 3, Lights
12+
list = 2, Radioisotope Generators
13+
list = 3, Power Storage
14+
list = 4, Lights
1415
}
1516
}

‎GameData/000_FilterExtensions_Configs/Default/08_Science.cfg‎

Lines changed: 19 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,16 @@ CATEGORY
88
SUBCATEGORIES:NEEDS[!RemoteTech]
99
{
1010
list = 0, Data Transmitter
11-
list = 1, Data Transmitter (Direct)
12-
list = 2, Data Transmitter (Relay)
13-
list = 3, Experiments
14-
list = 4, Sensors
15-
list = 5, Labs
16-
list = 6, Scanners
17-
list = 7, GPS
11+
list = 1, Data Transmitter (Internal)
12+
list = 2, Data Transmitter (Direct)
13+
list = 3, Data Transmitter (Omni)
14+
list = 4, Data Transmitter (Relay)
15+
list = 5, Data Transmitter (Dish)
16+
list = 6, Experiments
17+
list = 7, Sensors
18+
list = 8, Labs
19+
list = 9, Scanners
20+
list = 10, GPS
1821
}
1922
SUBCATEGORIES:NEEDS[RemoteTech]
2023
{
@@ -27,4 +30,12 @@ CATEGORY
2730
list = 6, Scanners
2831
list = 7, GPS
2932
}
30-
}
33+
}
34+
35+
@CATEGORY:HAS[#name[Science?Parts]]:NEEDS[Kerbalism,FeatureScience]
36+
{
37+
@SUBCATEGORIES
38+
{
39+
list = 8, Sample slots
40+
}
41+
}

‎GameData/000_FilterExtensions_Configs/Default/Mod_CRE.cfg‎

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
CATEGORY:NEEDS[CRE]
2+
{
3+
name = Commonwealth Rockets / CRE
4+
icon = CRE
5+
colour = #FFF0F0F0
6+
all = true
7+
8+
FILTER
9+
{
10+
CHECK
11+
{
12+
type = folder
13+
value = CRE
14+
}
15+
}
16+
17+
SUBCATEGORIES
18+
{
19+
list = 0,Pods
20+
list = 1,Fuel Tanks
21+
list = 2,Engines
22+
list = 3,Command and Control
23+
list = 4,Structural
24+
list = 5,Coupling
25+
list = 6,Payload
26+
list = 7,Aerodynamics
27+
list = 8,Ground
28+
list = 9,Thermal
29+
list = 10,Electrical
30+
list = 11,Communications
31+
list = 12,Science
32+
list = 13,Utility
33+
list = 14,Undefined
34+
}
35+
}

‎GameData/000_FilterExtensions_Configs/Default/Mod_NearFutureTechnologies.cfg‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
12
CATEGORY:NEEDS[NearFutureAeronautics|NearFutureConstruction|NearFutureElectrical|NearFutureExploration|NearFutureLaunchVehicles|NearFuturePropulsion|NearFutureSolar|NearFutureSpacecraft|HeatControl|CryoEngines|CryoTanks|SystemHeat]
23
{
34
name = Near Future Technologies
@@ -10,6 +11,7 @@ CATEGORY:NEEDS[NearFutureAeronautics|NearFutureConstruction|NearFutureElectrical
1011
CHECK
1112
{
1213
type = folder
14+
1315
value = NearFutureAeronautics, NearFutureConstruction, NearFutureElectrical, NearFutureExploration, NearFutureLaunchVehicles, NearFuturePropulsion, NearFutureSolar, NearFutureSpacecraft, HeatControl, CryoEngines, CryoTanks, KerbalAtomics, SystemHeat
1416
}
1517
}

‎GameData/000_FilterExtensions_Configs/Default/Mod_Tantares.cfg‎

Lines changed: 111 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
CATEGORY:NEEDS[Tantares,!TantaresLV]
1+
CATEGORY:NEEDS[Tantares,!TantaresLV,!Eisenhower-Astronautics]
22
{
33
name = Tantares Space Technologies
44
icon = Tantares
@@ -34,7 +34,7 @@ CATEGORY:NEEDS[Tantares,!TantaresLV]
3434
}
3535
}
3636

37-
CATEGORY:NEEDS[!Tantares,TantaresLV]
37+
CATEGORY:NEEDS[!Tantares,TantaresLV,!Eisenhower-Astronautics]
3838
{
3939
name = Tantares Space Technologies
4040
icon = Tantares
@@ -70,7 +70,7 @@ CATEGORY:NEEDS[!Tantares,TantaresLV]
7070
}
7171
}
7272

73-
CATEGORY:NEEDS[Tantares,TantaresLV]
73+
CATEGORY:NEEDS[Tantares,TantaresLV,!Eisenhower-Astronautics]
7474
{
7575
name = Tantares Space Technologies
7676
icon = Tantares
@@ -86,6 +86,114 @@ CATEGORY:NEEDS[Tantares,TantaresLV]
8686
}
8787
}
8888

89+
SUBCATEGORIES
90+
{
91+
list = 0,Pods
92+
list = 1,Fuel Tanks
93+
list = 2,Engines
94+
list = 3,Command and Control
95+
list = 4,Structural
96+
list = 5,Coupling
97+
list = 6,Payload
98+
list = 7,Aerodynamics
99+
list = 8,Ground
100+
list = 9,Thermal
101+
list = 10,Electrical
102+
list = 11,Communications
103+
list = 12,Science
104+
list = 13,Utility
105+
list = 14,Undefined
106+
}
107+
}
108+
109+
CATEGORY:NEEDS[Tantares,!TantaresLV,Eisenhower-Astronautics]
110+
{
111+
name = Tantares Space Technologies
112+
icon = Tantares
113+
colour = #FFF0F0F0
114+
all = true
115+
116+
FILTER
117+
{
118+
CHECK
119+
{
120+
type = folder
121+
value = Tantares,Eisenhower-Astronautics
122+
}
123+
}
124+
125+
SUBCATEGORIES
126+
{
127+
list = 0,Pods
128+
list = 1,Fuel Tanks
129+
list = 2,Engines
130+
list = 3,Command and Control
131+
list = 4,Structural
132+
list = 5,Coupling
133+
list = 6,Payload
134+
list = 7,Aerodynamics
135+
list = 8,Ground
136+
list = 9,Thermal
137+
list = 10,Electrical
138+
list = 11,Communications
139+
list = 12,Science
140+
list = 13,Utility
141+
list = 14,Undefined
142+
}
143+
}
144+
145+
CATEGORY:NEEDS[!Tantares,TantaresLV,Eisenhower-Astronautics]
146+
{
147+
name = Tantares Space Technologies
148+
icon = Tantares
149+
colour = #FFF0F0F0
150+
all = true
151+
152+
FILTER
153+
{
154+
CHECK
155+
{
156+
type = folder
157+
value = TantaresLV,Eisenhower-Astronautics
158+
}
159+
}
160+
161+
SUBCATEGORIES
162+
{
163+
list = 0,Pods
164+
list = 1,Fuel Tanks
165+
list = 2,Engines
166+
list = 3,Command and Control
167+
list = 4,Structural
168+
list = 5,Coupling
169+
list = 6,Payload
170+
list = 7,Aerodynamics
171+
list = 8,Ground
172+
list = 9,Thermal
173+
list = 10,Electrical
174+
list = 11,Communications
175+
list = 12,Science
176+
list = 13,Utility
177+
list = 14,Undefined
178+
}
179+
}
180+
181+
CATEGORY:NEEDS[Tantares,TantaresLV,Eisenhower-Astronautics]
182+
{
183+
name = Tantares Space Technologies
184+
icon = Tantares
185+
colour = #FFF0F0F0
186+
all = true
187+
188+
FILTER
189+
{
190+
CHECK
191+
{
192+
type = folder
193+
value = Tantares,TantaresLV,Eisenhower-Astronautics
194+
}
195+
}
196+
89197
SUBCATEGORIES
90198
{
91199
list = 0,Pods

‎GameData/000_FilterExtensions_Configs/Default/Mod_UniversalStorage.cfg‎

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ CATEGORY:NEEDS[UniversalStorage]
3131
CATEGORY:NEEDS[UniversalStorage2]
3232
{
3333
name = UniversalStorage2
34-
icon = UniversalStorage
34+
icon = UniversalStorage2
3535
colour = #FFF0F0F0
3636
all = true
3737

@@ -43,6 +43,14 @@ CATEGORY:NEEDS[UniversalStorage2]
4343
value = UniversalStorage2
4444
}
4545
}
46+
FILTER
47+
{
48+
CHECK
49+
{
50+
type = title
51+
value = Univ. Storage, Universal Storage
52+
}
53+
}
4654

4755
SUBCATEGORIES
4856
{
@@ -57,6 +65,6 @@ CATEGORY:NEEDS[UniversalStorage2]
5765
list = 8,Electrical
5866
list = 9,Science
5967
list = 10,Utility
60-
list = 11,Undefined
68+
list = 11,Undefined
6169
}
6270
}

‎GameData/000_FilterExtensions_Configs/SubCategories_Antannae.cfg‎

Lines changed: 27 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ SUBCATEGORY:NEEDS[!RemoteTech]
77
CHECK
88
{
99
type = moduleName
10-
value = ModuleLimitedDataTransmitter, ModuleRTAntenna, ModuleSPUPassive, ModuleDataTransmitter
10+
value = ModuleLimitedDataTransmitter, ModuleRTAntenna, ModuleSPUPassive, ModuleDataTransmitter, ModuleDataTransmitterFeedeable
1111
}
1212
CHECK
1313
{
@@ -40,6 +40,19 @@ SUBCATEGORY:NEEDS[!RemoteTech]
4040
value = ModuleDataTransmitter,antennaType,DIRECT
4141
}
4242
}
43+
FILTER:NEEDS[NearFutureExploration]
44+
{
45+
CHECK
46+
{
47+
type = moduleName
48+
value = ModuleDataTransmitterFeedeable
49+
}
50+
CHECK
51+
{
52+
type = field
53+
value = ModuleDataTransmitterFeedeable,antennaType,DIRECT
54+
}
55+
}
4356
}
4457

4558
SUBCATEGORY:NEEDS[!RemoteTech]
@@ -59,4 +72,17 @@ SUBCATEGORY:NEEDS[!RemoteTech]
5972
value = ModuleDataTransmitter,antennaType,RELAY
6073
}
6174
}
75+
FILTER:NEEDS[NearFutureExploration]
76+
{
77+
CHECK
78+
{
79+
type = moduleName
80+
value = ModuleDataTransmitterFeedeable
81+
}
82+
CHECK
83+
{
84+
type = field
85+
value = ModuleDataTransmitterFeedeable,antennaType,RELAY
86+
}
87+
}
6288
}

0 commit comments

Comments
 (0)