Skip to content

Commit 5fe0c2a

Browse files
dani0105dani0105
committed
Merge branch 'developer'
2 parents 43e1d74 + 92e696e commit 5fe0c2a

File tree

7 files changed

+24
-646
lines changed

7 files changed

+24
-646
lines changed

‎MoreParts/Buildings/AntennaComponent.cs‎

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,10 +39,22 @@ private void Awake()
3939
this._hasTelecommunicationDish = false;
4040
this.ShowTelecommunicationLines = false;
4141
this._enableTelecomunicationLines = KeySettings.Main.Show_Telecommunication_lines;
42-
this._sunPlanet = Base.planetLoader.planets["Sun"];
42+
this._sunPlanet = this.getPrimaryPlanet();
4343
this._lineColor = new Color(0.25f, 0.74f, 0.3f, 0.4f);
4444
}
4545

46+
private Planet getPrimaryPlanet()
47+
{
48+
foreach(Planet planet in Base.planetLoader.planets.Values)
49+
{
50+
if (planet.parentBody == null)
51+
{
52+
return planet;
53+
}
54+
}
55+
return null;
56+
}
57+
4658
private void Start()
4759
{
4860
if (GameManager.main == null)

‎MoreParts/Parts/ScannerModule.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ private void Start()
3434

3535
private void Update()
3636
{
37-
if(GameManager.main == null || !this._active.Value || this.Location == null || this.Location.planet == null)
37+
if(GameManager.main == null || !this._active.Value || this.Location == null || this.Location.planet == null || this.Rocket.location == null)
3838
{
3939
return;
4040
}

‎MoreParts/Patches/RocketManagerPatcher.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ private static void ClearLaunchPad(Double2 point)
6969

7070
foreach(Rocket rocket in rockets)
7171
{
72-
RocketManager.DestroyRocket(rocket, DestructionReason.Intentional, false);
72+
RocketManager.DestroyRocket(rocket, DestructionReason.Intentional);
7373
}
7474
}
7575

‎Toolkit/Construction Cargo/Construction Cargo.prefab‎

Lines changed: 4 additions & 214 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,6 @@ GameObject:
1414
- component: {fileID: 7980923611345833196}
1515
- component: {fileID: 7980923611345833188}
1616
- component: {fileID: 7980923611345833115}
17-
- component: {fileID: 7980923611345833191}
18-
- component: {fileID: 7980923611345833187}
19-
- component: {fileID: 7980923611345833186}
2017
- component: {fileID: 7728655759003707832}
2118
- component: {fileID: 4766226082050590372}
2219
- component: {fileID: 4702744935720890528}
@@ -182,14 +179,18 @@ MonoBehaviour:
182179
attachmentSurfaces: 1
183180
dragSurfaces: 1
184181
colliderArea: 1
182+
physicsCollider: 0
185183
clickArea: 1
186184
baseDepth: 0
187185
composedBaseDepth:
188186
variables: {fileID: 0}
189187
input:
190188
isComposedDepth: 0
191189
depthMultiplier: 1
190+
advancedCut: 0
192191
cut: 0
192+
advancedCutData:
193+
cuts: []
193194
reduceResolution: 0
194195
width_a:
195196
variables: {fileID: 7980923611345833196}
@@ -238,217 +239,6 @@ MonoBehaviour:
238239
centerCover: 0
239240
rightCover: 0
240241
separatorRing: 0
241-
--- !u!114 &7980923611345833191
242-
MonoBehaviour:
243-
m_ObjectHideFlags: 0
244-
m_CorrespondingSourceObject: {fileID: 0}
245-
m_PrefabInstance: {fileID: 0}
246-
m_PrefabAsset: {fileID: 0}
247-
m_GameObject: {fileID: 7980923611345833113}
248-
m_Enabled: 1
249-
m_EditorHideFlags: 0
250-
m_Script: {fileID: 11500000, guid: 6ec10b9375b46f049ae5f1dea9294f6b, type: 3}
251-
m_Name:
252-
m_EditorClassIdentifier:
253-
points:
254-
- position:
255-
variables: {fileID: 7980923611345833196}
256-
x:
257-
variables: {fileID: 7980923611345833196}
258-
input: 0
259-
y:
260-
variables: {fileID: 7980923611345833196}
261-
input: 0
262-
- position:
263-
variables: {fileID: 7980923611345833196}
264-
x:
265-
variables: {fileID: 7980923611345833196}
266-
input: 0
267-
y:
268-
variables: {fileID: 7980923611345833196}
269-
input: height
270-
snapPoints:
271-
- variables: {fileID: 7980923611345833196}
272-
x:
273-
variables: {fileID: 7980923611345833196}
274-
input: 0
275-
y:
276-
variables: {fileID: 7980923611345833196}
277-
input: 0
278-
- variables: {fileID: 7980923611345833196}
279-
x:
280-
variables: {fileID: 7980923611345833196}
281-
input: 0
282-
y:
283-
variables: {fileID: 7980923611345833196}
284-
input: height
285-
--- !u!114 &7980923611345833187
286-
MonoBehaviour:
287-
m_ObjectHideFlags: 0
288-
m_CorrespondingSourceObject: {fileID: 0}
289-
m_PrefabInstance: {fileID: 0}
290-
m_PrefabAsset: {fileID: 0}
291-
m_GameObject: {fileID: 7980923611345833113}
292-
m_Enabled: 1
293-
m_EditorHideFlags: 0
294-
m_Script: {fileID: 11500000, guid: 9e6816d1b05c0ac48bfc5b847420486e, type: 3}
295-
m_Name:
296-
m_EditorClassIdentifier:
297-
adaptPoints:
298-
- reciverType: 0
299-
position:
300-
variables: {fileID: 7980923611345833196}
301-
x:
302-
variables: {fileID: 7980923611345833196}
303-
input: 0
304-
y:
305-
variables: {fileID: 7980923611345833196}
306-
input: 0
307-
normal: {x: 0, y: -1}
308-
adaptRange:
309-
min:
310-
variables: {fileID: 7980923611345833196}
311-
input: width_original - 3.5
312-
max:
313-
variables: {fileID: 7980923611345833196}
314-
input: width_original + 3.5
315-
type: 0
316-
priority:
317-
inputArea:
318-
variables: {fileID: 7980923611345833196}
319-
position:
320-
variables: {fileID: 7980923611345833196}
321-
x:
322-
variables: {fileID: 7980923611345833196}
323-
input:
324-
y:
325-
variables: {fileID: 7980923611345833196}
326-
input:
327-
size:
328-
variables: {fileID: 7980923611345833196}
329-
x:
330-
variables: {fileID: 7980923611345833196}
331-
input:
332-
y:
333-
variables: {fileID: 7980923611345833196}
334-
input:
335-
defaultOutput:
336-
variables: {fileID: 7980923611345833196}
337-
input: width_original
338-
outputOffset: 0
339-
output:
340-
variableName: width_a
341-
referenceToVariables: {fileID: 7980923611345833196}
342-
localValue: 0
343-
isOccupied:
344-
variableName:
345-
referenceToVariables: {fileID: 7980923611345833196}
346-
localValue: 0
347-
differenceX:
348-
variableName:
349-
referenceToVariables: {fileID: 7980923611345833196}
350-
localValue: 0
351-
differenceY:
352-
variableName:
353-
referenceToVariables: {fileID: 7980923611345833196}
354-
localValue: 0
355-
- reciverType: 0
356-
position:
357-
variables: {fileID: 7980923611345833196}
358-
x:
359-
variables: {fileID: 7980923611345833196}
360-
input: 0
361-
y:
362-
variables: {fileID: 7980923611345833196}
363-
input: height
364-
normal: {x: 0, y: 1}
365-
adaptRange:
366-
min:
367-
variables: {fileID: 7980923611345833196}
368-
input: width_original - 3.5
369-
max:
370-
variables: {fileID: 7980923611345833196}
371-
input: width_original + 3.5
372-
type: 0
373-
priority:
374-
inputArea:
375-
variables: {fileID: 7980923611345833196}
376-
position:
377-
variables: {fileID: 7980923611345833196}
378-
x:
379-
variables: {fileID: 7980923611345833196}
380-
input:
381-
y:
382-
variables: {fileID: 7980923611345833196}
383-
input:
384-
size:
385-
variables: {fileID: 7980923611345833196}
386-
x:
387-
variables: {fileID: 7980923611345833196}
388-
input:
389-
y:
390-
variables: {fileID: 7980923611345833196}
391-
input:
392-
defaultOutput:
393-
variables: {fileID: 7980923611345833196}
394-
input: width_original
395-
outputOffset: 0
396-
output:
397-
variableName: width_b
398-
referenceToVariables: {fileID: 7980923611345833196}
399-
localValue: 0
400-
isOccupied:
401-
variableName:
402-
referenceToVariables: {fileID: 7980923611345833196}
403-
localValue: 0
404-
differenceX:
405-
variableName:
406-
referenceToVariables: {fileID: 7980923611345833196}
407-
localValue: 0
408-
differenceY:
409-
variableName:
410-
referenceToVariables: {fileID: 7980923611345833196}
411-
localValue: 0
412-
ignoreOccupied: 0
413-
--- !u!114 &7980923611345833186
414-
MonoBehaviour:
415-
m_ObjectHideFlags: 0
416-
m_CorrespondingSourceObject: {fileID: 0}
417-
m_PrefabInstance: {fileID: 0}
418-
m_PrefabAsset: {fileID: 0}
419-
m_GameObject: {fileID: 7980923611345833113}
420-
m_Enabled: 1
421-
m_EditorHideFlags: 0
422-
m_Script: {fileID: 11500000, guid: 641659d31fdc50c4aa71e2efbc218dd3, type: 3}
423-
m_Name:
424-
m_EditorClassIdentifier:
425-
points:
426-
- position:
427-
variables: {fileID: 7980923611345833196}
428-
x:
429-
variables: {fileID: 7980923611345833196}
430-
input: 0
431-
y:
432-
variables: {fileID: 7980923611345833196}
433-
input: 0
434-
normal: {x: 0, y: -1}
435-
type: 0
436-
output:
437-
variables: {fileID: 7980923611345833196}
438-
input: width_a
439-
- position:
440-
variables: {fileID: 7980923611345833196}
441-
x:
442-
variables: {fileID: 7980923611345833196}
443-
input: 0
444-
y:
445-
variables: {fileID: 7980923611345833196}
446-
input: height
447-
normal: {x: 0, y: 1}
448-
type: 0
449-
output:
450-
variables: {fileID: 7980923611345833196}
451-
input: width_b
452242
--- !u!114 &7728655759003707832
453243
MonoBehaviour:
454244
m_ObjectHideFlags: 0

0 commit comments

Comments
 (0)